[tomcat] branch 8.5.x updated (45b3f9b -> d5a6da8)

classic Classic list List threaded Threaded
19 messages Options
Reply | Threaded
Open this post in threaded view
|

[tomcat] branch 8.5.x updated (45b3f9b -> d5a6da8)

markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


    from 45b3f9b  Polish. Spacing.
     new 3dabb92  fix typo
     new a877a97  fix typo
     new 0ab842e  fix typo
     new 87e7de4  fix typo
     new f809fb9  add JASPIC 1.1 Javadoc
     new 31cb355  Remove unused i18n messages (re3moval of translations to follow)
     new 91fece3  Fix typo
     new 402cbb3  fix typo
     new ae9741a  fix typo
     new 89d573a  Fix typo
     new 0263a83  fix typo (an ssl)
     new ad7563b  fix typo
     new 3795213  fix typo(an sql)
     new 50b4075  Fix typo
     new 11fec6f  Fix typo
     new 2b8f0b6  Add link to newly added JASPIC docs
     new c8ecb01  Update changelog for PR from KangZhiDong
     new d5a6da8  Remove translated entries for keys that have been removed

The 18 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 build.xml                                          | 21 ++++++++++++++++
 conf/server.xml                                    |  4 +--
 java/javax/servlet/http/HttpServletRequest.java    |  2 +-
 .../servlet/http/LocalStrings_zh_CN.properties     |  3 ++-
 java/javax/servlet/resources/web-app_2_5.xsd       |  2 +-
 java/javax/servlet/resources/web-common_3_0.xsd    |  2 +-
 java/javax/servlet/resources/web-common_3_1.xsd    |  2 +-
 .../catalina/ant/jmx/JMXAccessorGetTask.java       |  2 +-
 .../catalina/ant/jmx/JMXAccessorSetTask.java       |  2 +-
 .../ant/jmx/JMXAccessorUnregisterTask.java         |  2 +-
 java/org/apache/catalina/ant/jmx/package.html      |  4 +--
 .../authenticator/LocalStrings_zh_CN.properties    |  1 +
 .../catalina/connector/LocalStrings.properties     |  1 -
 .../catalina/connector/LocalStrings_de.properties  |  1 -
 .../catalina/connector/LocalStrings_es.properties  |  1 -
 .../catalina/connector/LocalStrings_fr.properties  |  1 -
 .../catalina/connector/LocalStrings_ja.properties  |  1 -
 .../catalina/connector/LocalStrings_ko.properties  |  1 -
 .../catalina/connector/LocalStrings_ru.properties  |  1 -
 .../connector/LocalStrings_zh_CN.properties        |  4 ++-
 java/org/apache/catalina/connector/Request.java    |  2 +-
 .../apache/catalina/core/LocalStrings.properties   |  2 --
 .../catalina/core/LocalStrings_es.properties       |  3 ---
 .../catalina/core/LocalStrings_fr.properties       |  2 --
 .../catalina/core/LocalStrings_ja.properties       |  2 --
 .../catalina/core/LocalStrings_ko.properties       |  2 --
 .../catalina/core/LocalStrings_zh_CN.properties    | 10 ++++++--
 .../catalina/deploy/LocalStrings_zh_CN.properties  |  1 +
 java/org/apache/catalina/filters/CorsFilter.java   |  2 +-
 .../catalina/filters/LocalStrings.properties       |  4 +--
 .../catalina/filters/LocalStrings_fr.properties    |  2 ++
 .../catalina/filters/LocalStrings_ko.properties    |  2 ++
 .../catalina/filters/LocalStrings_zh_CN.properties |  1 +
 .../ha/deploy/LocalStrings_zh_CN.properties        |  2 ++
 .../apache/catalina/ha/session/BackupManager.java  |  2 +-
 .../ha/session/LocalStrings_zh_CN.properties       |  3 +++
 .../catalina/ha/tcp/LocalStrings_zh_CN.properties  |  1 +
 .../apache/catalina/loader/LocalStrings.properties |  9 -------
 .../catalina/loader/LocalStrings_de.properties     |  1 -
 .../catalina/loader/LocalStrings_es.properties     |  8 ------
 .../catalina/loader/LocalStrings_fr.properties     |  9 -------
 .../catalina/loader/LocalStrings_ja.properties     |  9 -------
 .../catalina/loader/LocalStrings_ko.properties     |  9 -------
 .../catalina/loader/LocalStrings_zh_CN.properties  |  6 +----
 .../catalina/manager/LocalStrings.properties       |  1 -
 .../catalina/manager/LocalStrings_fr.properties    |  1 -
 .../catalina/manager/LocalStrings_ja.properties    |  1 -
 .../catalina/manager/LocalStrings_ko.properties    |  1 -
 .../catalina/manager/LocalStrings_ru.properties    |  3 ---
 .../catalina/manager/LocalStrings_zh_CN.properties |  1 -
 .../catalina/manager/host/LocalStrings.properties  |  1 -
 .../manager/host/LocalStrings_fr.properties        |  1 -
 .../manager/host/LocalStrings_ja.properties        |  1 -
 .../manager/host/LocalStrings_ko.properties        |  1 -
 .../manager/host/LocalStrings_ru.properties        |  1 -
 .../manager/host/LocalStrings_zh_CN.properties     |  1 -
 .../LocalStrings_zh_CN.properties                  |  2 +-
 java/org/apache/catalina/realm/JDBCRealm.java      |  6 ++---
 .../apache/catalina/realm/LocalStrings.properties  |  4 +--
 .../catalina/realm/LocalStrings_de.properties      |  1 -
 .../catalina/realm/LocalStrings_es.properties      |  1 -
 .../catalina/realm/LocalStrings_fr.properties      |  3 +--
 .../catalina/realm/LocalStrings_ja.properties      |  2 --
 .../catalina/realm/LocalStrings_ko.properties      |  3 +--
 .../catalina/servlet4preview/http/PushBuilder.java |  4 +--
 .../catalina/session/LocalStrings_zh_CN.properties |  1 +
 .../catalina/ssi/ResponseIncludeWrapper.java       |  2 +-
 .../catalina/startup/CertificateCreateRule.java    |  2 +-
 .../catalina/startup/LocalStrings.properties       |  6 -----
 .../catalina/startup/LocalStrings_es.properties    |  4 ---
 .../catalina/startup/LocalStrings_fr.properties    |  6 -----
 .../catalina/startup/LocalStrings_ja.properties    |  6 -----
 .../catalina/startup/LocalStrings_ko.properties    |  6 -----
 .../catalina/startup/LocalStrings_zh_CN.properties | 29 +++++++++++++++++++++-
 .../tribes/group/LocalStrings_zh_CN.properties     |  1 +
 .../interceptors/LocalStrings_zh_CN.properties     |  1 +
 .../membership/LocalStrings_zh_CN.properties       |  1 +
 .../tribes/transport/LocalStrings_es.properties    |  9 -------
 .../tribes/transport/LocalStrings_zh_CN.properties |  1 +
 .../transport/bio/LocalStrings_zh_CN.properties    |  2 ++
 .../transport/nio/LocalStrings_zh_CN.properties    |  3 ++-
 .../catalina/util/LocalStrings_zh_CN.properties    |  2 ++
 .../catalina/util/SessionIdGeneratorBase.java      |  2 +-
 .../catalina/valves/LocalStrings_fr.properties     |  2 ++
 .../catalina/valves/LocalStrings_ja.properties     |  2 +-
 .../catalina/valves/LocalStrings_ko.properties     |  2 ++
 .../catalina/valves/LocalStrings_zh_CN.properties  | 19 ++++++++++++++
 .../catalina/valves/rewrite/RewriteRule.java       |  4 +--
 .../catalina/webresources/LocalStrings.properties  |  2 --
 .../webresources/LocalStrings_es.properties        |  2 --
 .../webresources/LocalStrings_fr.properties        |  2 --
 .../webresources/LocalStrings_ja.properties        |  2 --
 .../webresources/LocalStrings_ko.properties        |  2 --
 .../webresources/LocalStrings_zh_CN.properties     |  4 +--
 .../apache/coyote/LocalStrings_zh_CN.properties    |  2 +-
 java/org/apache/coyote/ajp/Constants.java          |  2 +-
 java/org/apache/coyote/ajp/LocalStrings.properties |  2 --
 .../apache/coyote/ajp/LocalStrings_es.properties   |  3 ---
 .../apache/coyote/ajp/LocalStrings_fr.properties   |  2 --
 .../apache/coyote/ajp/LocalStrings_ja.properties   |  2 --
 .../apache/coyote/ajp/LocalStrings_ko.properties   |  2 --
 .../coyote/ajp/LocalStrings_zh_CN.properties       |  1 -
 .../apache/coyote/http11/LocalStrings.properties   |  3 ---
 .../coyote/http11/LocalStrings_de.properties       |  1 -
 .../coyote/http11/LocalStrings_es.properties       |  3 ---
 .../coyote/http11/LocalStrings_fr.properties       |  5 ++--
 .../coyote/http11/LocalStrings_ja.properties       |  3 ---
 .../coyote/http11/LocalStrings_ko.properties       |  5 ++--
 .../coyote/http11/LocalStrings_zh_CN.properties    |  3 ++-
 .../apache/coyote/http2/LocalStrings.properties    |  7 ------
 .../apache/coyote/http2/LocalStrings_es.properties |  1 -
 .../apache/coyote/http2/LocalStrings_fr.properties |  8 +-----
 .../apache/coyote/http2/LocalStrings_ja.properties |  7 ------
 .../apache/coyote/http2/LocalStrings_ko.properties |  8 +-----
 .../coyote/http2/LocalStrings_zh_CN.properties     | 19 +++++++++++---
 .../apache/jasper/compiler/ELFunctionMapper.java   |  2 +-
 java/org/apache/jasper/compiler/JspConfig.java     |  2 +-
 .../compiler/tagplugin/TagPluginContext.java       |  4 +--
 .../jasper/resources/LocalStrings.properties       |  2 --
 .../jasper/resources/LocalStrings_de.properties    |  1 -
 .../jasper/resources/LocalStrings_es.properties    |  2 --
 .../jasper/resources/LocalStrings_fr.properties    |  2 --
 .../jasper/resources/LocalStrings_ja.properties    |  2 --
 .../jasper/resources/LocalStrings_ko.properties    |  2 --
 .../jasper/resources/LocalStrings_zh_CN.properties | 21 +++++++++++++---
 .../naming/factory/LocalStrings_zh_CN.properties   |  2 ++
 .../org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java |  4 +--
 .../apache/tomcat/dbcp/dbcp2/SQLExceptionList.java |  2 +-
 java/org/apache/tomcat/jni/SSL.java                |  6 ++---
 java/org/apache/tomcat/jni/SSLConf.java            |  2 +-
 java/org/apache/tomcat/jni/SSLContext.java         |  6 ++---
 java/org/apache/tomcat/jni/SSLSocket.java          |  6 ++---
 .../apache/tomcat/util/buf/LocalStrings.properties |  1 -
 .../tomcat/util/buf/LocalStrings_es.properties     |  2 --
 .../tomcat/util/buf/LocalStrings_fr.properties     |  1 -
 .../tomcat/util/buf/LocalStrings_ja.properties     |  1 -
 .../tomcat/util/buf/LocalStrings_ko.properties     |  1 -
 .../tomcat/util/buf/LocalStrings_zh_CN.properties  |  1 -
 .../util/compat/LocalStrings_zh_CN.properties      |  2 ++
 .../util/descriptor/tagplugin/TagPluginParser.java |  2 +-
 .../tomcat/util/descriptor/tld/TldParser.java      |  2 +-
 .../descriptor/web/LocalStrings_zh_CN.properties   |  3 +++
 java/org/apache/tomcat/util/digester/package.html  |  4 +--
 .../tomcat/util/http/FastHttpDateFormat.java       |  4 +--
 .../tomcat/util/http/LocalStrings_zh_CN.properties |  3 ++-
 java/org/apache/tomcat/util/http/parser/Host.java  |  4 +--
 .../util/http/parser/LocalStrings.properties       |  1 -
 .../util/http/parser/LocalStrings_fr.properties    |  1 -
 .../util/http/parser/LocalStrings_ja.properties    |  1 -
 .../util/http/parser/LocalStrings_ko.properties    |  1 -
 .../apache/tomcat/util/http/parser/MediaType.java  |  2 +-
 java/org/apache/tomcat/util/modeler/Registry.java  |  2 +-
 .../apache/tomcat/util/modeler/RegistryMBean.java  |  2 +-
 java/org/apache/tomcat/util/modeler/package.html   |  2 +-
 .../apache/tomcat/util/net/LocalStrings.properties |  3 ---
 .../tomcat/util/net/LocalStrings_es.properties     |  2 --
 .../tomcat/util/net/LocalStrings_fr.properties     |  3 ---
 .../tomcat/util/net/LocalStrings_ja.properties     |  3 ---
 .../tomcat/util/net/LocalStrings_ko.properties     |  3 ---
 .../tomcat/util/net/LocalStrings_zh_CN.properties  |  4 +++
 java/org/apache/tomcat/util/net/Nio2Channel.java   |  2 +-
 java/org/apache/tomcat/util/net/NioChannel.java    |  2 +-
 java/org/apache/tomcat/util/net/SSLHostConfig.java |  2 +-
 .../apache/tomcat/util/net/SecureNio2Channel.java  |  2 +-
 .../apache/tomcat/util/net/SecureNioChannel.java   |  2 +-
 .../tomcat/util/net/jsse/LocalStrings.properties   |  5 ----
 .../util/net/jsse/LocalStrings_de.properties       |  2 --
 .../util/net/jsse/LocalStrings_es.properties       |  2 --
 .../util/net/jsse/LocalStrings_fr.properties       |  5 ----
 .../util/net/jsse/LocalStrings_ja.properties       |  5 ----
 .../util/net/jsse/LocalStrings_ko.properties       |  5 ----
 .../util/net/jsse/LocalStrings_zh_CN.properties    |  6 ++---
 .../util/net/openssl/LocalStrings.properties       |  5 ----
 .../util/net/openssl/LocalStrings_de.properties    |  3 ---
 .../util/net/openssl/LocalStrings_es.properties    |  2 --
 .../util/net/openssl/LocalStrings_fr.properties    |  5 ----
 .../util/net/openssl/LocalStrings_ja.properties    |  5 ----
 .../util/net/openssl/LocalStrings_ko.properties    |  5 ----
 .../util/net/openssl/LocalStrings_zh_CN.properties |  3 ---
 .../tomcat/websocket/LocalStrings.properties       |  1 -
 .../tomcat/websocket/LocalStrings_fr.properties    |  1 -
 .../tomcat/websocket/LocalStrings_ja.properties    |  1 -
 .../tomcat/websocket/LocalStrings_ko.properties    |  1 -
 .../tomcat/websocket/LocalStrings_zh_CN.properties |  4 +++
 .../websocket/pojo/LocalStrings_zh_CN.properties   |  3 +++
 .../websocket/server/LocalStrings.properties       |  3 ---
 .../websocket/server/LocalStrings_de.properties    |  1 -
 .../websocket/server/LocalStrings_es.properties    |  1 -
 .../websocket/server/LocalStrings_fr.properties    |  3 ---
 .../websocket/server/LocalStrings_ja.properties    |  3 ---
 .../websocket/server/LocalStrings_ko.properties    |  3 ---
 .../websocket/server/LocalStrings_zh_CN.properties |  2 +-
 .../tomcat/websocket/server/UpgradeUtil.java       |  2 +-
 modules/jdbc-pool/doc/jdbc-pool.xml                |  2 +-
 .../apache/tomcat/jdbc/pool/PoolConfiguration.java |  4 +--
 .../org/apache/tomcat/jdbc/pool/TrapException.java |  2 +-
 .../apache/tomcat/jdbc/pool/mbeans-descriptors.xml |  4 +--
 .../catalina/valves/rewrite/TestRewriteValve.java  |  2 +-
 .../TestWsWebSocketContainerWithProxy.java         |  2 +-
 .../docs/architecture/startup/serverStartup.txt    |  2 +-
 webapps/docs/changelog.xml                         | 10 +++++++-
 webapps/docs/config/ajp.xml                        |  2 +-
 webapps/docs/config/cluster-valve.xml              |  2 +-
 webapps/docs/config/http.xml                       |  2 +-
 webapps/docs/connectors.xml                        |  2 +-
 webapps/docs/funcspecs/index.xml                   |  2 +-
 webapps/docs/{elapi => jaspicapi}/index.html       |  6 ++---
 webapps/docs/mbeans-descriptors-howto.xml          |  2 +-
 webapps/docs/project.xml                           |  1 +
 webapps/docs/rewrite.xml                           |  6 ++---
 webapps/docs/ssl-howto.xml                         | 12 ++++-----
 211 files changed, 282 insertions(+), 417 deletions(-)
 copy java/org/apache/catalina/{ha/authenticator => mbeans}/LocalStrings_zh_CN.properties (89%)
 copy webapps/docs/{elapi => jaspicapi}/index.html (90%)


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

[tomcat] 01/18: fix typo

markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 3dabb929cf1c1be4c9363d9282c3c6191c4d663c
Author: kangzhidong <[hidden email]>
AuthorDate: Wed Aug 21 23:59:54 2019 +0800

    fix typo
---
 java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java        | 2 +-
 java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java        | 2 +-
 java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java | 2 +-
 java/org/apache/catalina/ant/jmx/package.html                   | 4 ++--
 java/org/apache/tomcat/util/modeler/package.html                | 2 +-
 webapps/docs/mbeans-descriptors-howto.xml                       | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java b/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java
index a538ea6..5f1bc83 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java
@@ -35,7 +35,7 @@ import org.apache.tools.ant.BuildException;
  * <p>
  * Examples:
  * <br>
- * Get a Mbean IDataSender attribute nrOfRequests and create a new ant property <em>IDataSender.9025.nrOfRequests</em>
+ * Get an Mbean IDataSender attribute nrOfRequests and create a new ant property <em>IDataSender.9025.nrOfRequests</em>
  * </p>
  * <pre>
  *   &lt;jmx:get
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java b/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java
index c81e9d0..74f2201 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java
@@ -37,7 +37,7 @@ import org.apache.tools.ant.BuildException;
  * </ul>
  * <p>
  * Examples:
- * Set a Mbean Manager attribute maxActiveSessions.
+ * Set an Mbean Manager attribute maxActiveSessions.
  * Set this attribute with fresh jmx connection without save reference
  * </p>
  * <pre>
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java b/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java
index 62f1728..ba1ac1e 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java
@@ -22,7 +22,7 @@ import javax.management.ObjectName;
 import org.apache.tools.ant.BuildException;
 
 /**
- * unregister a MBean at <em>JMX</em> JSR 160 MBeans Server.
+ * unregister an MBean at <em>JMX</em> JSR 160 MBeans Server.
  * <ul>
  * <li>unregister Mbeans</li>
  * </ul>
diff --git a/java/org/apache/catalina/ant/jmx/package.html b/java/org/apache/catalina/ant/jmx/package.html
index 121dfad..9277039 100644
--- a/java/org/apache/catalina/ant/jmx/package.html
+++ b/java/org/apache/catalina/ant/jmx/package.html
@@ -41,13 +41,13 @@ existing one. The following attribute are exists in every tasks:</p>
   <tr>
     <td>username</td>
     <td>
-      The username of a MBeanServer auth, when configured.
+      The username of an MBeanServer auth, when configured.
     </td>
   </tr>
   <tr>
     <td>password</td>
     <td>
-      The password of a MBeanServer auth, when configured.
+      The password of an MBeanServer auth, when configured.
     </td>
   </tr>
   <tr>
diff --git a/java/org/apache/tomcat/util/modeler/package.html b/java/org/apache/tomcat/util/modeler/package.html
index a64f08a..c60fb52 100644
--- a/java/org/apache/tomcat/util/modeler/package.html
+++ b/java/org/apache/tomcat/util/modeler/package.html
@@ -215,7 +215,7 @@ registry metadata by hand, using the <code>addManagedBean()</code> and
 the standard support for loading a configuration file to be convenient
 and sufficient.</p>
 
-<p>Modeler will also look for a mbeans-descriptors.xml in the same package
+<p>Modeler will also look for an mbeans-descriptors.xml in the same package
 with the class being registered and in its parent. If no metadata is found,
 modeler will use a number of simple patterns, similar with the ones used by
 ant, to determine a reasonable metadata</p>
diff --git a/webapps/docs/mbeans-descriptors-howto.xml b/webapps/docs/mbeans-descriptors-howto.xml
index a32e4f5..d9a7be2 100644
--- a/webapps/docs/mbeans-descriptors-howto.xml
+++ b/webapps/docs/mbeans-descriptors-howto.xml
@@ -49,7 +49,7 @@ in order to avoid a "ManagedBean is not found" exception.</p>
 <section name="Adding MBean descriptions">
 
 <p>You may also add MBean descriptions for custom components in
-a mbeans-descriptors.xml file, located in the same package as the class files
+an mbeans-descriptors.xml file, located in the same package as the class files
 it describes.</p>
 
 <p>The permitted syntax for the mbeans-descriptors.xml is defined by


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

[tomcat] 02/18: fix typo

markt
In reply to this post by markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit a877a975ecd7ec26b57336d184cdbedf0cee5369
Author: 康智冬 <[hidden email]>
AuthorDate: Sat Aug 24 23:30:23 2019 +0800

    fix typo
   
    fix typo
---
 webapps/docs/funcspecs/index.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/funcspecs/index.xml b/webapps/docs/funcspecs/index.xml
index 953833c..e754c8a 100644
--- a/webapps/docs/funcspecs/index.xml
+++ b/webapps/docs/funcspecs/index.xml
@@ -59,7 +59,7 @@ still useful, because it provides an introduction to <strong>what</strong>
 Catalina does, without being as concerned with <strong>how</strong> this is
 accomplished.</p>
 
-<p><strong>TODO</strong> - Obviously, this area has a long ways to go before
+<p><strong>TODO</strong> - Obviously, this area has a long way to go before
 it is complete.  Contributions are welcome!</p>
 
 </section>


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

[tomcat] 03/18: fix typo

markt
In reply to this post by markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 0ab842e3c7cdc235a0272a30aee606cb4e3f8172
Author: kangzhidong <[hidden email]>
AuthorDate: Sat Aug 24 23:41:25 2019 +0800

    fix typo
---
 java/org/apache/jasper/compiler/ELFunctionMapper.java           | 2 +-
 java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java | 4 ++--
 java/org/apache/tomcat/util/modeler/Registry.java               | 2 +-
 java/org/apache/tomcat/util/modeler/RegistryMBean.java          | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/jasper/compiler/ELFunctionMapper.java b/java/org/apache/jasper/compiler/ELFunctionMapper.java
index 8271783..ed004d9 100644
--- a/java/org/apache/jasper/compiler/ELFunctionMapper.java
+++ b/java/org/apache/jasper/compiler/ELFunctionMapper.java
@@ -295,7 +295,7 @@ public class ELFunctionMapper {
         }
 
         /*
-         * @return An unique name for a function mapper.
+         * @return A unique name for a function mapper.
          */
         private String getMapName() {
             return "_jspx_fnmap_" + currFunc++;
diff --git a/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java b/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java
index 16ea265..03159ea 100644
--- a/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java
+++ b/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java
@@ -37,7 +37,7 @@ public interface TagPluginContext {
     boolean isAttributeSpecified(String attribute);
 
     /**
-     * @return An unique temporary variable name that the plugin can use.
+     * @return A unique temporary variable name that the plugin can use.
      */
     String getTemporaryVariableName();
 
@@ -50,7 +50,7 @@ public interface TagPluginContext {
     /**
      * Generate a declaration in the of the generated class.  This can be
      * used to declare an inner class, a method, or a class variable.
-     * @param id An unique ID identifying the declaration.  It is not
+     * @param id A unique ID identifying the declaration.  It is not
      *           part of the declaration, and is used to ensure that the
      *           declaration will only appear once.  If this method is
      *           invoked with the same id more than once in the translation
diff --git a/java/org/apache/tomcat/util/modeler/Registry.java b/java/org/apache/tomcat/util/modeler/Registry.java
index bedd91c..0be0aff 100644
--- a/java/org/apache/tomcat/util/modeler/Registry.java
+++ b/java/org/apache/tomcat/util/modeler/Registry.java
@@ -283,7 +283,7 @@ public class Registry implements RegistryMBean, MBeanRegistration  {
      *
      * @param domain Namespace
      * @param name Type of the notification
-     * @return An unique id for the domain:name combination
+     * @return A unique id for the domain:name combination
      * @since 1.1
      */
     @Override
diff --git a/java/org/apache/tomcat/util/modeler/RegistryMBean.java b/java/org/apache/tomcat/util/modeler/RegistryMBean.java
index 17317ea..dd2debf 100644
--- a/java/org/apache/tomcat/util/modeler/RegistryMBean.java
+++ b/java/org/apache/tomcat/util/modeler/RegistryMBean.java
@@ -103,7 +103,7 @@ public interface RegistryMBean {
       *
       * @param domain Namespace
       * @param name  Type of the notification
-      * @return  An unique id for the domain:name combination
+      * @return  A unique id for the domain:name combination
       * @since 1.1
       */
     public int getId(String domain, String name);


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

[tomcat] 04/18: fix typo

markt
In reply to this post by markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 87e7de4f77f800f9cb6107c54e542ef6ff17211d
Author: kangzhidong <[hidden email]>
AuthorDate: Sun Aug 25 00:12:22 2019 +0800

    fix typo
---
 java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java | 2 +-
 java/org/apache/tomcat/util/descriptor/tld/TldParser.java             | 2 +-
 webapps/docs/architecture/startup/serverStartup.txt                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java b/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java
index c098dc2..1fb48ea 100644
--- a/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java
+++ b/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java
@@ -62,7 +62,7 @@ public class TagPluginParser {
             if (!handler.getWarnings().isEmpty() || !handler.getErrors().isEmpty()) {
                 handler.logFindings(log, source.getSystemId());
                 if (!handler.getErrors().isEmpty()) {
-                    // throw the first to indicate there was a error during processing
+                    // throw the first to indicate there was an error during processing
                     throw handler.getErrors().iterator().next();
                 }
             }
diff --git a/java/org/apache/tomcat/util/descriptor/tld/TldParser.java b/java/org/apache/tomcat/util/descriptor/tld/TldParser.java
index 1c59516..e31c2fe 100644
--- a/java/org/apache/tomcat/util/descriptor/tld/TldParser.java
+++ b/java/org/apache/tomcat/util/descriptor/tld/TldParser.java
@@ -77,7 +77,7 @@ public class TldParser {
             if (!handler.getWarnings().isEmpty() || !handler.getErrors().isEmpty()) {
                 handler.logFindings(log, source.getSystemId());
                 if (!handler.getErrors().isEmpty()) {
-                    // throw the first to indicate there was a error during processing
+                    // throw the first to indicate there was an error during processing
                     throw handler.getErrors().iterator().next();
                 }
             }
diff --git a/webapps/docs/architecture/startup/serverStartup.txt b/webapps/docs/architecture/startup/serverStartup.txt
index 716c8d0..c7c8c0d 100644
--- a/webapps/docs/architecture/startup/serverStartup.txt
+++ b/webapps/docs/architecture/startup/serverStartup.txt
@@ -77,7 +77,7 @@ What it does:
         c2) Starts the services under <Server> which are:
             StandardService -> starts Engine (ContainerBase -> Realm,Cluster etc)
         c3) StandardHost (started by the service)
-                Configures a ErrorReportValvem to do proper HTML output for different HTTP
+                Configures an ErrorReportValve to do proper HTML output for different HTTP
                 errors codes
                 Starts the Valves in the pipeline (at least the ErrorReportValve)
                 Configures the StandardHostValve,


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

[tomcat] 05/18: add JASPIC 1.1 Javadoc

markt
In reply to this post by markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit f809fb9bbae1ce325380e75af406feebca8cdd28
Author: kangzhidong <[hidden email]>
AuthorDate: Sun Aug 25 02:52:03 2019 +0800

    add JASPIC 1.1 Javadoc
---
 build.xml                         | 20 ++++++++++++++++++++
 webapps/docs/jaspicapi/index.html | 34 ++++++++++++++++++++++++++++++++++
 webapps/docs/project.xml          |  1 +
 3 files changed, 55 insertions(+)

diff --git a/build.xml b/build.xml
index 8b93675..04397b6 100644
--- a/build.xml
+++ b/build.xml
@@ -1934,6 +1934,26 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
         <path location="${ant.core.lib}"/>
       </classpath>
     </javadoc>
+    <javadoc packagenames="javax.security.auth.message.*"
+      sourcepath="${tomcat.dist}/src/java"
+      destdir="${tomcat.dist}/webapps/docs/jaspicapi"
+      version="true"
+      windowtitle="JASPIC 1.1 API Documentation - Apache Tomcat ${version}"
+      doctitle="JASPIC 1.1 API - Apache Tomcat ${version}"
+      header="&lt;b&gt;JASPIC 1.1 - Apache Tomcat ${version}&lt;/b&gt;"
+      bottom="Copyright &amp;#169; 2000-${year} Apache Software Foundation. All Rights Reserved."
+      encoding="UTF-8"
+      docencoding="UTF-8"
+      charset="UTF-8"
+      additionalparam="-breakiterator -notimestamp"
+      maxmemory="512m"
+      failonerror="true"
+      failonwarning="true">
+      <classpath>
+        <path refid="compile.classpath"/>
+        <path location="${ant.core.lib}"/>
+      </classpath>
+    </javadoc>
     <javadoc packagenames="org.apache.*"
       destdir="${tomcat.dist}/webapps/docs/api"
       version="true"
diff --git a/webapps/docs/jaspicapi/index.html b/webapps/docs/jaspicapi/index.html
new file mode 100644
index 0000000..e4f31a2
--- /dev/null
+++ b/webapps/docs/jaspicapi/index.html
@@ -0,0 +1,34 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8" />
+    <title>API docs</title>
+</head>
+
+<body>
+
+The JASPIC Javadoc is not installed by default. Download and install
+the "fulldocs" package to get it.
+
+You can also access the javadoc online in the Tomcat
+<a href="https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/">
+    documentation bundle</a>.
+
+</body>
+</html>
diff --git a/webapps/docs/project.xml b/webapps/docs/project.xml
index 880c3a8..09cb4df 100644
--- a/webapps/docs/project.xml
+++ b/webapps/docs/project.xml
@@ -87,6 +87,7 @@
         <item name="EL 3.0 Javadocs"       href="elapi/index.html"/>
         <item name="WebSocket 1.1 Javadocs"
               href="websocketapi/index.html"/>
+        <item name="JASPIC 1.1 Javadocs"   href="jaspicapi/index.html"/>
         <item name="JK 1.2 Documentation"
               href="https://tomcat.apache.org/connectors-doc/"/>
     </menu>


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

[tomcat] 06/18: Remove unused i18n messages (re3moval of translations to follow)

markt
In reply to this post by markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 31cb35549d5d3976af3e8cd0440147efddc6e7fa
Author: Mark Thomas <[hidden email]>
AuthorDate: Wed Sep 11 13:20:57 2019 +0100

    Remove unused i18n messages (re3moval of translations to follow)
---
 java/org/apache/catalina/connector/LocalStrings.properties      | 1 -
 java/org/apache/catalina/core/LocalStrings.properties           | 2 --
 java/org/apache/catalina/loader/LocalStrings.properties         | 9 ---------
 java/org/apache/catalina/manager/LocalStrings.properties        | 1 -
 java/org/apache/catalina/manager/host/LocalStrings.properties   | 1 -
 java/org/apache/catalina/realm/LocalStrings.properties          | 2 --
 java/org/apache/catalina/startup/LocalStrings.properties        | 6 ------
 java/org/apache/catalina/webresources/LocalStrings.properties   | 2 --
 java/org/apache/coyote/ajp/LocalStrings.properties              | 2 --
 java/org/apache/coyote/http11/LocalStrings.properties           | 3 ---
 java/org/apache/coyote/http2/LocalStrings.properties            | 7 -------
 java/org/apache/jasper/resources/LocalStrings.properties        | 2 --
 java/org/apache/tomcat/util/buf/LocalStrings.properties         | 1 -
 java/org/apache/tomcat/util/http/parser/LocalStrings.properties | 1 -
 java/org/apache/tomcat/util/net/LocalStrings.properties         | 3 ---
 java/org/apache/tomcat/util/net/jsse/LocalStrings.properties    | 5 -----
 java/org/apache/tomcat/util/net/openssl/LocalStrings.properties | 5 -----
 java/org/apache/tomcat/websocket/LocalStrings.properties        | 1 -
 java/org/apache/tomcat/websocket/server/LocalStrings.properties | 3 ---
 19 files changed, 57 deletions(-)

diff --git a/java/org/apache/catalina/connector/LocalStrings.properties b/java/org/apache/catalina/connector/LocalStrings.properties
index c6ea9a4..cdb98ed 100644
--- a/java/org/apache/catalina/connector/LocalStrings.properties
+++ b/java/org/apache/catalina/connector/LocalStrings.properties
@@ -21,7 +21,6 @@ coyoteAdapter.checkRecycled.request=Encountered a non-recycled request and recyc
 coyoteAdapter.checkRecycled.response=Encountered a non-recycled response and recycled it forcedly.
 coyoteAdapter.debug=The variable [{0}] has value [{1}]
 coyoteAdapter.nullRequest=An asynchronous dispatch may only happen on an existing request
-coyoteAdapter.parsePathParam=Unable to parse the path parameters using encoding [{0}]. The path parameters in the URL will be ignored.
 
 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
diff --git a/java/org/apache/catalina/core/LocalStrings.properties b/java/org/apache/catalina/core/LocalStrings.properties
index 8f943c5..f0ed527 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -178,7 +178,6 @@ standardContext.manager=Configured a manager of class [{0}]
 standardContext.managerFail=The session manager failed to start
 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
 standardContext.parameter.duplicate=Duplicate context initialization parameter [{0}]
@@ -205,7 +204,6 @@ standardContext.startingContext=Exception starting Context with name [{0}]
 standardContext.stop.asyncWaitInterrupted=Interrupt received while waiting unloadDelay milliseconds for in-flight asynchronous requests to complete. Context stop will continue without further delay.
 standardContext.stoppingContext=Exception stopping Context with name [{0}]
 standardContext.threadBindingListenerError=An error occurred in the thread binding listener configured for Context [{0}]
-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.workCreateException=Failed to determine absolute work directory from directory [{0}] and CATALINA_HOME [{1}] for context [{2}]
diff --git a/java/org/apache/catalina/loader/LocalStrings.properties b/java/org/apache/catalina/loader/LocalStrings.properties
index cea4b46..f1b1bf7 100644
--- a/java/org/apache/catalina/loader/LocalStrings.properties
+++ b/java/org/apache/catalina/loader/LocalStrings.properties
@@ -30,13 +30,10 @@ 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.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.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}]
@@ -53,18 +50,12 @@ webappClassLoader.stopTimerThreadFail=Failed to terminate TimerThread named [{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.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}])
 
 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.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
diff --git a/java/org/apache/catalina/manager/LocalStrings.properties b/java/org/apache/catalina/manager/LocalStrings.properties
index e41c483..fac641c 100644
--- a/java/org/apache/catalina/manager/LocalStrings.properties
+++ b/java/org/apache/catalina/manager/LocalStrings.properties
@@ -167,7 +167,6 @@ managerServlet.sslReloadFail=FAIL - Failed to reload TLS configuration
 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.
 managerServlet.threaddump=OK - JVM thread dump
 managerServlet.trustedCertsNotConfigured=No trusted certificates are configured for this virtual host
diff --git a/java/org/apache/catalina/manager/host/LocalStrings.properties b/java/org/apache/catalina/manager/host/LocalStrings.properties
index 7949717..60dbb67 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings.properties
+++ b/java/org/apache/catalina/manager/host/LocalStrings.properties
@@ -68,7 +68,6 @@ htmlHostManagerServlet.hostAliases=Host aliases
 htmlHostManagerServlet.hostName=Host name
 htmlHostManagerServlet.hostTasks=Commands
 htmlHostManagerServlet.hostThis=Host Manager installed - commands disabled
-htmlHostManagerServlet.hostsPersist=Persist
 htmlHostManagerServlet.hostsRemove=Remove
 htmlHostManagerServlet.hostsStart=Start
 htmlHostManagerServlet.hostsStop=Stop
diff --git a/java/org/apache/catalina/realm/LocalStrings.properties b/java/org/apache/catalina/realm/LocalStrings.properties
index 09d0408..ba0de03 100644
--- a/java/org/apache/catalina/realm/LocalStrings.properties
+++ b/java/org/apache/catalina/realm/LocalStrings.properties
@@ -23,7 +23,6 @@ combinedRealm.realmStartFail=Failed to start [{0}] realm
 combinedRealm.unexpectedMethod=An unexpected call was made to a method on the combined realm
 
 credentialHandler.invalidStoredCredential=The invalid stored credential string [{0}] was provided by the Realm to match with the user provided credentials
-credentialHandler.unableToMutateUserCredential=Failed to mutate user provided credentials. This typically means the CredentialHandler configuration is invalid
 
 dataSourceRealm.authenticateFailure=Username [{0}] NOT successfully authenticated
 dataSourceRealm.authenticateSuccess=Username [{0}] successfully authenticated
@@ -90,7 +89,6 @@ realmBase.authenticateSuccess=Username [{0}] successfully authenticated
 realmBase.cannotGetRoles=Cannot get roles from principal [{0}]
 realmBase.createUsernameRetriever.ClassCastException=Class [{0}] is not an X509UsernameRetriever.
 realmBase.createUsernameRetriever.newInstance=Cannot create object of type [{0}].
-realmBase.credentialHandler.customCredentialHandler=Unable to set the property [{0}] to value [{1}] as a custom CredentialHandler has been configured
 realmBase.credentialNotDelegated=Credential for user [{0}] has not been delegated though storing was requested
 realmBase.delegatedCredentialFail=Unable to obtain delegated credential for user [{0}]
 realmBase.digest=Error digesting user credentials
diff --git a/java/org/apache/catalina/startup/LocalStrings.properties b/java/org/apache/catalina/startup/LocalStrings.properties
index 306b35e..23fa2d2 100644
--- a/java/org/apache/catalina/startup/LocalStrings.properties
+++ b/java/org/apache/catalina/startup/LocalStrings.properties
@@ -35,7 +35,6 @@ contextConfig.authenticatorInstantiate=Cannot instantiate an authenticator of cl
 contextConfig.authenticatorMissing=Cannot configure an authenticator for method [{0}]
 contextConfig.authenticatorResources=Cannot load authenticators mapping list
 contextConfig.badUrl=Unable to process context descriptor [{0}]
-contextConfig.baseError=Unable to determine location of global configuration (usually $CATALINA_BASE/conf)
 contextConfig.cce=Lifecycle event data object [{0}] is not a Context
 contextConfig.contextClose=Error closing context.xml
 contextConfig.contextMissing=Missing context.xml: [{0}]
@@ -51,7 +50,6 @@ contextConfig.inputStreamFile=Unable to process file [{0}] for annotations
 contextConfig.inputStreamJar=Unable to process Jar entry [{0}] from Jar [{1}] for annotations
 contextConfig.inputStreamJndi=Unable to process resource element [{0}] for annotations
 contextConfig.inputStreamWebResource=Unable to process web resource [{0}] for annotations
-contextConfig.invalidSci=The ServletContentInitializer [{0}] could not be created
 contextConfig.invalidSciHandlesTypes=Unable to load class [{0}] to check against the @HandlesTypes annotation of one or more ServletContentInitializers.
 contextConfig.jarFile=Unable to process Jar [{0}] for annotations
 contextConfig.jndiUrl=Unable to process JNDI URL [{0}] for annotations
@@ -74,11 +72,8 @@ contextConfig.stop=ContextConfig: Processing STOP
 contextConfig.unavailable=Marking this application unavailable due to previous error(s)
 contextConfig.unknownUrlProtocol=The URL protocol [{0}] was not recognised during annotation processing. URL [{1}] was ignored.
 contextConfig.urlPatternValue=Both the urlPatterns and value attributes were set for the [{0}] annotation on class [{1}]
-contextConfig.webinfClassesUrl=Unable to determine URL for [{0}]
 contextConfig.xmlSettings=Context [{0}] will parse web.xml and web-fragment.xml files with validation:[{1}] and namespaceAware:[{2}]
 
-embedded.authenticatorNotInstanceOfValve=Specified Authenticator is not a Valve
-embedded.noEngines=No engines have been defined yet
 embedded.notmp=Cannot find specified temporary folder at [{0}]
 
 engineConfig.cce=Lifecycle event data object [{0}] is not an Engine
@@ -122,7 +117,6 @@ hostConfig.deploying=Deploying discovered web applications
 hostConfig.docBaseUrlInvalid=The provided docBase cannot be expressed as a URL
 hostConfig.expand=Expanding web application archive [{0}]
 hostConfig.expand.error=Exception while expanding web application archive [{0}]
-hostConfig.expanding=Expanding discovered web application archives
 hostConfig.ignorePath=Ignoring path [{0}] in appBase for automatic deployment
 hostConfig.illegalWarName=The war name [{0}] is invalid. The archive will be ignored.
 hostConfig.jmx.register=Register context [{0}] failed
diff --git a/java/org/apache/catalina/webresources/LocalStrings.properties b/java/org/apache/catalina/webresources/LocalStrings.properties
index 5b3f8b8..a69c178 100644
--- a/java/org/apache/catalina/webresources/LocalStrings.properties
+++ b/java/org/apache/catalina/webresources/LocalStrings.properties
@@ -41,7 +41,6 @@ fileResource.getUrlFail=Unable to determine a URL for the resource [{0}]
 fileResourceSet.notFile=The file specified by base and internal path [{0}]{1}[{2}] does not exist.
 
 jarResource.getInputStreamFail=Unable to obtain an InputStream for the resource [{0}] located in the JAR [{1}]
-jarResource.getUrlFail=Unable to determine a URL for the resource [{0}] located in the JAR [{1}]
 
 jarResourceRoot.invalidWebAppPath=This resource always refers to a directory so the supplied webAppPath must end with / but the provided webAppPath was [{0}]
 
@@ -49,7 +48,6 @@ jarWarResourceSet.codingError=Coding error
 
 standardRoot.checkStateNotStarted=The resources may not be accessed if they are not currently started
 standardRoot.createInvalidFile=Unable to create WebResourceSet from [{0}]
-standardRoot.createNoFileResourceSet=The FileResourceSet feature has not yet been implemented
 standardRoot.createUnknownType=Unable to create WebResourceSet of unknown type [{0}]
 standardRoot.invalidPath=The resource path [{0}] is not valid
 standardRoot.invalidPathNormal=The resource path [{0}] has been normalized to [{1}] which is not valid
diff --git a/java/org/apache/coyote/ajp/LocalStrings.properties b/java/org/apache/coyote/ajp/LocalStrings.properties
index cd547d6..124f257 100644
--- a/java/org/apache/coyote/ajp/LocalStrings.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings.properties
@@ -24,8 +24,6 @@ ajpnioprotocol.releaseEnd=Done iterating through our connections to release a so
 ajpnioprotocol.releaseStart=Iterating through our connections to release a socket channel [{0}]
 
 ajpprocessor.certs.fail=Certificate conversion failed
-ajpprocessor.failedread=Socket read failed
-ajpprocessor.failedsend=Failed to send AJP message
 ajpprocessor.header.error=Header message parsing failed
 ajpprocessor.header.tooLong=Header message of length [{0}] received but the packetSize is only [{1}]
 ajpprocessor.readtimeout=Timeout attempting to read data from the socket
diff --git a/java/org/apache/coyote/http11/LocalStrings.properties b/java/org/apache/coyote/http11/LocalStrings.properties
index f39bb91..40a037c 100644
--- a/java/org/apache/coyote/http11/LocalStrings.properties
+++ b/java/org/apache/coyote/http11/LocalStrings.properties
@@ -20,7 +20,6 @@ abstractHttp11Protocol.httpUpgradeConfigured=The [{0}] connector has been config
 http11processor.fallToDebug=\n\
 \ Note: further occurrences of HTTP request parsing errors will be logged at DEBUG level.
 http11processor.header.parse=Error parsing HTTP request header
-http11processor.neverused=This method should never be used
 http11processor.request.finish=Error finishing request
 http11processor.request.inconsistentHosts=The host specified in the request line is not consistent with the host header
 http11processor.request.invalidScheme=The HTTP request contained an absolute URI with an invalid scheme
@@ -49,9 +48,7 @@ iib.invalidmethod=Invalid character found in method name. HTTP method names must
 iib.parseheaders.ise.error=Unexpected state: headers already parsed. Buffer not recycled?
 iib.readtimeout=Timeout attempting to read data from the socket
 iib.requestheadertoolarge.error=Request header is too large
-iib.socketClosed=The socket has been closed in another thread
 
 iob.failedwrite=Failed write
 iob.failedwrite.ack=Failed to send HTTP 100 continue response
-iob.illegalreset=The response may not be reset once it has been committed
 iob.responseheadertoolarge.error=An attempt was made to write more data to the response headers than there was room available in the buffer. Increase maxHttpHeaderSize on the connector or write less data into the response headers.
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties b/java/org/apache/coyote/http2/LocalStrings.properties
index 84fae85..7b57d2c 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -61,19 +61,14 @@ http2Parser.processFrame.unexpectedType=Expected frame type [{0}] but received f
 http2Parser.processFrameContinuation.notExpected=Connection [{0}], Continuation frame received for stream [{1}] when no headers were in progress
 http2Parser.processFrameData.lengths=Connection [{0}], Stream [{1}], Data length, [{2}], Padding length [{3}]
 http2Parser.processFrameData.window=Connection [{0}], Client sent more data than stream window allowed
-http2Parser.processFrameGoaway.payloadTooSmall=Connection [{0}]: Goaway payload size was [{1}] which is less than the minimum 8
 http2Parser.processFrameHeaders.decodingDataLeft=Data left over after HPACK decoding - it should have been consumed
 http2Parser.processFrameHeaders.decodingFailed=There was an error during the HPACK decoding of HTTP headers
 http2Parser.processFrameHeaders.payload=Connection [{0}], Stream [{1}], Processing headers payload of size [{2}]
-http2Parser.processFramePing.invalidPayloadSize=Settings frame received with an invalid payload size of [{0}] (should be 8)
 http2Parser.processFramePriority.invalidParent=Connection [{0}], Stream [{1}], A stream may not depend on itself
-http2Parser.processFramePriority.invalidPayloadSize=Priority frame received with an invalid payload size of [{0}] (should be 5)
 http2Parser.processFramePushPromise=Connection [{0}], Stream [{1}], Push promise frames should not be sent by the client
 http2Parser.processFrameSettings.ackWithNonZeroPayload=Settings frame received with the ACK flag set and payload present
-http2Parser.processFrameSettings.invalidPayloadSize=Settings frame received with a payload size of [{0}] which is not a multiple of 6
 http2Parser.processFrameWindowUpdate.debug=Connection [{0}], Stream [{1}], Window size increment [{2}]
 http2Parser.processFrameWindowUpdate.invalidIncrement=Window update frame received with an invalid increment size of [{0}]
-http2Parser.processFrameWindowUpdate.invalidPayloadSize=Window update frame received with an invalid payload size of [{0}]
 http2Parser.swallow.debug=Connection [{0}], Stream [{1}], Swallowed [{2}] bytes
 
 pingManager.roundTripTime=Connection [{0}] Round trip time measured as [{1}]ns
@@ -113,7 +108,6 @@ streamProcessor.service.error=Error during request processing
 
 streamStateMachine.debug.change=Connection [{0}], Stream [{1}], State changed from [{2}] to [{3}]
 streamStateMachine.invalidFrame=Connection [{0}], Stream [{1}], State [{2}], Frame type [{3}]
-streamStateMachine.invalidReset=Connection [{0}], Stream [{1}], State [{2}], Reset is not permitted in this state
 
 upgradeHandler.allocate.debug=Connection [{0}], Stream [{1}], allocated [{2}] bytes
 upgradeHandler.allocate.left=Connection [{0}], Stream [{1}], [{2}] bytes unallocated - trying to allocate to children
@@ -145,7 +139,6 @@ upgradeHandler.stream.old=A new remote stream ID of [{0}] was requested but the
 upgradeHandler.tooManyRemoteStreams=The client attempted to use more than [{0}] active streams
 upgradeHandler.tooMuchOverhead=Connection [{0}], Too much overhead so the connection will be closed
 upgradeHandler.unexpectedAck=Connection [{0}], Stream [{1}], A settings acknowledgement was received when not expected
-upgradeHandler.unexpectedEos=Unexpected end of stream
 upgradeHandler.upgrade=Connection [{0}], HTTP/1.1 upgrade to stream [1]
 upgradeHandler.upgrade.fail=Connection [{0}], HTTP/1.1 upgrade failed
 upgradeHandler.upgradeDispatch.entry=Entry, Connection [{0}], SocketStatus [{1}]
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties b/java/org/apache/jasper/resources/LocalStrings.properties
index d9c1ce1..b770462 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -157,13 +157,11 @@ jsp.error.params.emptyBody=jsp:params must contain at least one nested jsp:param
 jsp.error.params.invalidUse=jsp:params must be a direct child of jsp:plugin
 jsp.error.parse.error.in.TLD=Parse Error in the tag library descriptor: [{0}]
 jsp.error.parse.xml=XML parsing error on file [{0}]
-jsp.error.parse.xml.invalidPublicId=Invalid PUBLIC ID: [{0}]
 jsp.error.parse.xml.line=XML parsing error on file [{0}]: (line [{1}], col [{2}])
 jsp.error.parse.xml.scripting.invalid.body=Body of [{0}] element must not contain any XML elements
 jsp.error.plugin.badtype=Illegal value for 'type' attribute in jsp:plugin: must be 'bean' or 'applet'
 jsp.error.plugin.nocode=code not declared in jsp:plugin
 jsp.error.plugin.notype=type not declared in jsp:plugin
-jsp.error.plugin.wrongRootElement=Name of root element in [{0}] different from [{1}]
 jsp.error.prefix.refined=Attempt to redefine the prefix [{0}] to [{1}], when it was already defined as [{2}] in the current scope.
 jsp.error.prefix.use_before_dcl=The prefix [{0}] specified in this tag directive has been previously used by an action in file [{1}] line [{2}].
 jsp.error.prolog_config_encoding_mismatch=Page-encoding specified in XML prolog [{0}] is different from that specified in jsp-property-group [{1}]
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings.properties b/java/org/apache/tomcat/util/buf/LocalStrings.properties
index 9f2c9fa..226c041 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings.properties
@@ -25,7 +25,6 @@ c2bConverter.recycleFailed=Failed to recycle the C2B Converter. Creating new Buf
 hexUtils.fromHex.nonHex=The input must consist only of hex digits
 hexUtils.fromHex.oddDigits=The input must consist of an even number of hex digits
 
-uDecoder.convertHexDigit.notHex=[{0}] is not a hexadecimal digit
 uDecoder.urlDecode.conversionError=Failed to decode [{0}] using character set [{1}]
 uDecoder.urlDecode.missingDigit=Failed to decode [{0}] because the % character must be followed by two hexademical digits
 uDecoder.urlDecode.uee=Unable to URL decode the specified input since the encoding [{0}] is not supported.
diff --git a/java/org/apache/tomcat/util/http/parser/LocalStrings.properties b/java/org/apache/tomcat/util/http/parser/LocalStrings.properties
index e4cc162..e9d54bb 100644
--- a/java/org/apache/tomcat/util/http/parser/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/http/parser/LocalStrings.properties
@@ -41,4 +41,3 @@ http.tooFewHextets=An IPv6 address must consist of 8 hextets but this address co
 http.tooManyColons=An IPv6 address may not contain more than 2 sequential colon characters.
 http.tooManyDoubleColons=An IPv6 address may only contain a single '::' sequence.
 http.tooManyHextets=The IPv6 address contains [{0}] hextets but a valid IPv6 address may not have more than 8.
-http.wrongOctetCount=An IPv4 address should have exactly 4 octets, not [{0}].
diff --git a/java/org/apache/tomcat/util/net/LocalStrings.properties b/java/org/apache/tomcat/util/net/LocalStrings.properties
index 995f9d4..8abe55e 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings.properties
@@ -45,14 +45,12 @@ endpoint.accept.fail=Socket accept failed
 endpoint.alpn.fail=Failed to configure endpoint for ALPN using [{0}]
 endpoint.alpn.negotiated=Negotiated [{0}] protocol using ALPN
 endpoint.apr.applyConf=Applying OpenSSLConfCmd to SSL context
-endpoint.apr.assignConf=Assigning SSL context to OpenSSLConfCmd context
 endpoint.apr.checkConf=Checking OpenSSLConf
 endpoint.apr.errApplyConf=Could not apply OpenSSLConf to SSL context
 endpoint.apr.errCheckConf=Error during OpenSSLConf check
 endpoint.apr.errMakeConf=Could not create OpenSSLConf context
 endpoint.apr.failSslContextMake=Unable to create SSLContext. Check that SSLEngine is enabled in the AprLifecycleListener, the AprLifecycleListener has initialised correctly and that a valid SSLProtocol has been specified
 endpoint.apr.invalidSslProtocol=An invalid value [{0}] was provided for the SSLProtocol attribute
-endpoint.apr.makeConf=Creating OpenSSLConf context
 endpoint.apr.maxConnections.running=The APR endpoint does not support the setting of maxConnections while it is running. The existing value of [{0}] will continue to be used.
 endpoint.apr.maxConnections.unlimited=The APR endpoint does not support unlimited connections. The existing value of [{0}] will continue to be used.
 endpoint.apr.noSendfileWithSSL=Sendfile is not supported for the APR/native connector when SSL is enabled
@@ -120,7 +118,6 @@ endpoint.warn.noLocalPort=Unable to determine local port for socket [{0}]
 endpoint.warn.noRemoteAddr=Unable to determine remote address for socket [{0}]
 endpoint.warn.noRemoteHost=Unable to determine remote host name for socket [{0}]
 endpoint.warn.noRemotePort=Unable to determine remote port for socket [{0}]
-endpoint.warn.noSendfileWithSSL=Sendfile is not supported for the connector when SSL is enabled
 endpoint.warn.unlockAcceptorFailed=Acceptor thread [{0}] failed to unlock. Forcing hard socket shutdown.
 
 jsse.invalid_truststore_password=The provided trust store password could not be used to unlock and/or validate the trust store. Retrying to access the trust store with a null password which will skip validation.
diff --git a/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties b/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties
index bae8f03..0877d81 100644
--- a/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties
@@ -14,13 +14,9 @@
 # limitations under the License.
 
 jsse.alias_no_key_entry=Alias name [{0}] does not identify a key entry
-jsse.enableable_ciphers=Specified SSL ciphers that are supported and enableable are : [{0}]
-jsse.exceptionOnClose=Failure to close socket.
 jsse.excludeProtocol=The SSL protocol [{0}] which is supported in this JRE was excluded from the protocols available to Tomcat
 jsse.invalidTrustManagerClassName=The trustManagerClassName provided [{0}] does not implement javax.net.ssl.TrustManager
-jsse.invalid_ssl_conf=SSL configuration is invalid due to [{0}]
 jsse.noCertFile=SSLHostConfig attribute certificateFile must be defined when using an SSL connector
-jsse.noDefaultCiphers=Unable to determine a default for ciphers for [{0}]. Set an explicit value to ensure the connector can start.
 jsse.noDefaultProtocols=Unable to determine a default for sslEnabledProtocols. Set an explicit value to ensure the connector can start.
 jsse.noKeys=No aliases for private keys found in key store
 jsse.openssl.effectiveCiphers=Ciphers used: [{0}]
@@ -30,7 +26,6 @@ jsse.pemParseError=Unable to parse the key from [{0}]
 jsseSupport.certTranslationError=Error translating certificate [{0}]
 jsseSupport.clientCertError=Error trying to obtain a certificate from the client
 
-jsseUtil.invalidTrustCert=The certificate for [{0}] in the trust store is not valid and has, therefore, been excluded in the list of certificates sent to the client
 jsseUtil.noCrlSupport=The truststoreProvider [{0}] does not support the certificateRevocationFile configuration option
 jsseUtil.noVerificationDepth=The truststoreProvider [{0}] does not support the certificateVerificationDepth configuration option
 jsseUtil.trustedCertNotChecked=The validity dates of the trusted certificate with alias [{0}] were not checked as the certificate was of an unknown type
diff --git a/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties b/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties
index eb037b9..2b5e31f 100644
--- a/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties
@@ -17,7 +17,6 @@ engine.ciphersFailure=Failed getting cipher list
 engine.emptyCipherSuite=Empty cipher suite
 engine.engineClosed=Engine is closed
 engine.failedCipherSuite=Failed to enable cipher suite [{0}]
-engine.handshakeFailure=Failed handshake: [{0}]
 engine.inboundClose=Inbound closed before receiving peer's close_notify
 engine.invalidBufferArray=offset: [{0}], length: [{1}] (expected: offset <= offset + length <= srcs.length [{2}])
 engine.noSSLContext=No SSL context
@@ -29,15 +28,11 @@ engine.nullName=Null value name
 engine.nullValue=Null value
 engine.openSSLError=OpenSSL error: [{0}] message: [{1}]
 engine.oversizedPacket=Encrypted packet is oversized
-engine.renegotiationUnsupported=Renegotiation is not supported
 engine.unsupportedCipher=Unsupported cipher suite: [{0}] [{1}]
 engine.unsupportedProtocol=Protocol [{0}] is not supported
 engine.unverifiedPeer=Peer unverified
 engine.writeToSSLFailed=Failed writing to SSL, returned: [{0}]
 
-keyManager.nullCertificateChain=Null certificate chain
-keyManager.nullPrivateKey=Null private key
-
 openssl.X509FactoryError=Error getting X509 factory instance
 openssl.addedClientCaCert=Added client CA cert: [{0}]
 openssl.applyConf=Applying OpenSSLConfCmd to SSL context
diff --git a/java/org/apache/tomcat/websocket/LocalStrings.properties b/java/org/apache/tomcat/websocket/LocalStrings.properties
index 820f06c..4f6f3b7 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings.properties
@@ -109,7 +109,6 @@ wsSession.duplicateHandlerBinary=A binary message handler has already been confi
 wsSession.duplicateHandlerPong=A pong message handler has already been configured
 wsSession.duplicateHandlerText=A text message handler has already been configured
 wsSession.flushFailOnClose=Failed to flush batched messages on session close
-wsSession.instanceDestroy=Endpoint instance unregistration failed
 wsSession.instanceNew=Endpoint instance registration failed
 wsSession.invalidHandlerTypePong=A pong message handler must implement MessageHandler.Whole
 wsSession.messageFailed=Unable to write the complete message as the WebSocket connection has been closed
diff --git a/java/org/apache/tomcat/websocket/server/LocalStrings.properties b/java/org/apache/tomcat/websocket/server/LocalStrings.properties
index d76f79c..005c2f1 100644
--- a/java/org/apache/tomcat/websocket/server/LocalStrings.properties
+++ b/java/org/apache/tomcat/websocket/server/LocalStrings.properties
@@ -19,9 +19,6 @@ serverContainer.duplicatePaths=Multiple Endpoints may not be deployed to the sam
 serverContainer.encoderFail=Unable to create encoder of type [{0}]
 serverContainer.failedDeployment=Deployment of WebSocket Endpoints to the web application with path [{0}] in host [{1}] is not permitted due to the failure of a previous deployment
 serverContainer.missingAnnotation=Cannot deploy POJO class [{0}] as it is not annotated with @ServerEndpoint
-serverContainer.missingEndpoint=An Endpoint instance has been request for path [{0}] but no matching Endpoint class was found
-serverContainer.pojoDeploy=POJO class [{0}] deploying to path [{1}] in ServletContext [{2}]
-serverContainer.servletContextMismatch=Attempted to register a POJO annotated for WebSocket at path [{0}] in the ServletContext with context path [{1}] when the WebSocket ServerContainer is allocated to the ServletContext with context path [{2}]
 serverContainer.servletContextMissing=No ServletContext was specified
 
 upgradeUtil.incompatibleRsv=Extensions were specified that have incompatible RSV bit usage


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

[tomcat] 07/18: Fix typo

markt
In reply to this post by markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 91fece3efba50ddb8efc96b592ebd23548029fab
Author: 康智冬 <[hidden email]>
AuthorDate: Sat Aug 31 16:52:30 2019 +0800

    Fix typo
---
 java/org/apache/catalina/connector/Request.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/connector/Request.java b/java/org/apache/catalina/connector/Request.java
index c58cda1..3b49e55 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -276,7 +276,7 @@ public class Request implements org.apache.catalina.servlet4preview.http.HttpSer
 
 
     /**
-     * Using writer flag.
+     * Using reader flag.
      */
     protected boolean usingReader = false;
 


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

[tomcat] 08/18: fix typo

markt
In reply to this post by markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 402cbb3969f67a053946d41723338ca7e879a2f5
Author: KangZhiDong <[hidden email]>
AuthorDate: Sun Sep 1 03:34:01 2019 +0800

    fix typo
---
 java/javax/servlet/http/HttpServletRequest.java   | 2 +-
 java/org/apache/jasper/compiler/JspConfig.java    | 2 +-
 java/org/apache/tomcat/util/digester/package.html | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/javax/servlet/http/HttpServletRequest.java b/java/javax/servlet/http/HttpServletRequest.java
index fd9b44f..9c98fa2 100644
--- a/java/javax/servlet/http/HttpServletRequest.java
+++ b/java/javax/servlet/http/HttpServletRequest.java
@@ -308,7 +308,7 @@ public interface HttpServletRequest extends ServletRequest {
      * <td>/xyz
      * </table>
      * <p>
-     * To reconstruct an URL with a scheme and host, use
+     * To reconstruct a URL with a scheme and host, use
      * {@link #getRequestURL}.
      *
      * @return a <code>String</code> containing the part of the URL from the
diff --git a/java/org/apache/jasper/compiler/JspConfig.java b/java/org/apache/jasper/compiler/JspConfig.java
index 493c8fb..373db7c 100644
--- a/java/org/apache/jasper/compiler/JspConfig.java
+++ b/java/org/apache/jasper/compiler/JspConfig.java
@@ -377,7 +377,7 @@ public class JspConfig {
     }
 
     /**
-     * To find out if an uri matches an url pattern in jsp config.  If so,
+     * To find out if a uri matches a url pattern in jsp config.  If so,
      * then the uri is a JSP page.  This is used primarily for jspc.
      * @param uri The path to check
      * @return <code>true</code> if the path denotes a JSP page
diff --git a/java/org/apache/tomcat/util/digester/package.html b/java/org/apache/tomcat/util/digester/package.html
index 0a16423..4438ac5 100644
--- a/java/org/apache/tomcat/util/digester/package.html
+++ b/java/org/apache/tomcat/util/digester/package.html
@@ -1008,9 +1008,9 @@ The <code><em>public-identifier</em></code> is an additional free identifier whi
 </p>
 <p>
 In practice, the weakness with a <code><em>system-identifier</em></code> is that most parsers
-will attempt to interpret this URI as an URL, try to download the resource directly
+will attempt to interpret this URI as a URL, try to download the resource directly
 from the URL and stop the parsing if this download fails. So, this means that
-almost always the URI will have to be an URL from which the declaration
+almost always the URI will have to be a URL from which the declaration
 can be downloaded.
 </p>
 <p>


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

[tomcat] 09/18: fix typo

markt
In reply to this post by markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit ae9741ab9d19b4023e024fbc62867f77e436dc73
Author: KangZhiDong <[hidden email]>
AuthorDate: Sun Sep 1 04:21:45 2019 +0800

    fix typo
---
 java/javax/servlet/resources/web-app_2_5.xsd                      | 2 +-
 java/javax/servlet/resources/web-common_3_0.xsd                   | 2 +-
 java/javax/servlet/resources/web-common_3_1.xsd                   | 2 +-
 java/org/apache/catalina/filters/CorsFilter.java                  | 2 +-
 java/org/apache/catalina/filters/LocalStrings.properties          | 4 ++--
 java/org/apache/catalina/servlet4preview/http/PushBuilder.java    | 4 ++--
 java/org/apache/catalina/ssi/ResponseIncludeWrapper.java          | 2 +-
 java/org/apache/catalina/valves/rewrite/RewriteRule.java          | 4 ++--
 java/org/apache/tomcat/util/http/FastHttpDateFormat.java          | 4 ++--
 java/org/apache/tomcat/util/http/parser/Host.java                 | 4 ++--
 java/org/apache/tomcat/util/http/parser/MediaType.java            | 2 +-
 java/org/apache/tomcat/websocket/server/UpgradeUtil.java          | 2 +-
 test/org/apache/catalina/valves/rewrite/TestRewriteValve.java     | 2 +-
 .../tomcat/websocket/TestWsWebSocketContainerWithProxy.java       | 2 +-
 webapps/docs/config/cluster-valve.xml                             | 2 +-
 webapps/docs/connectors.xml                                       | 2 +-
 webapps/docs/rewrite.xml                                          | 6 +++---
 webapps/docs/ssl-howto.xml                                        | 8 ++++----
 18 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/java/javax/servlet/resources/web-app_2_5.xsd b/java/javax/servlet/resources/web-app_2_5.xsd
index f01830f..72a0f6a 100644
--- a/java/javax/servlet/resources/web-app_2_5.xsd
+++ b/java/javax/servlet/resources/web-app_2_5.xsd
@@ -471,7 +471,7 @@ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd
     <xsd:simpleType name="http-methodType">
         <xsd:annotation>
             <xsd:documentation>
-                A HTTP method type as defined in HTTP 1.1 section 2.2.
+                An HTTP method type as defined in HTTP 1.1 section 2.2.
             </xsd:documentation>
         </xsd:annotation>
         <xsd:restriction base="xsd:token">
diff --git a/java/javax/servlet/resources/web-common_3_0.xsd b/java/javax/servlet/resources/web-common_3_0.xsd
index 8382e3e..6d5d875 100644
--- a/java/javax/servlet/resources/web-common_3_0.xsd
+++ b/java/javax/servlet/resources/web-common_3_0.xsd
@@ -593,7 +593,7 @@
     <xsd:annotation>
       <xsd:documentation>
 
-        A HTTP method type as defined in HTTP 1.1 section 2.2.
+        An HTTP method type as defined in HTTP 1.1 section 2.2.
 
       </xsd:documentation>
     </xsd:annotation>
diff --git a/java/javax/servlet/resources/web-common_3_1.xsd b/java/javax/servlet/resources/web-common_3_1.xsd
index fc0529b..c006c3b 100644
--- a/java/javax/servlet/resources/web-common_3_1.xsd
+++ b/java/javax/servlet/resources/web-common_3_1.xsd
@@ -566,7 +566,7 @@
     <xsd:annotation>
       <xsd:documentation>
 
-        A HTTP method type as defined in HTTP 1.1 section 2.2.
+        An HTTP method type as defined in HTTP 1.1 section 2.2.
 
       </xsd:documentation>
     </xsd:annotation>
diff --git a/java/org/apache/catalina/filters/CorsFilter.java b/java/org/apache/catalina/filters/CorsFilter.java
index f5ac0fa..c32bd30 100644
--- a/java/org/apache/catalina/filters/CorsFilter.java
+++ b/java/org/apache/catalina/filters/CorsFilter.java
@@ -1063,7 +1063,7 @@ public class CorsFilter implements Filter {
          */
         SIMPLE,
         /**
-         * A HTTP request that needs to be pre-flighted.
+         * An HTTP request that needs to be pre-flighted.
          */
         ACTUAL,
         /**
diff --git a/java/org/apache/catalina/filters/LocalStrings.properties b/java/org/apache/catalina/filters/LocalStrings.properties
index 3f2b136..649fde6 100644
--- a/java/org/apache/catalina/filters/LocalStrings.properties
+++ b/java/org/apache/catalina/filters/LocalStrings.properties
@@ -20,8 +20,8 @@ corsFilter.invalidSupportsCredentials=It is not allowed to configure supportsCre
 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}]
+corsFilter.wrongType1=Expects an HttpServletRequest object of type [{0}]
+corsFilter.wrongType2=Expects an HttpServletRequest object of type [{0}] or [{1}]
 
 csrfPrevention.invalidRandomClass=Unable to create Random source using class [{0}]
 
diff --git a/java/org/apache/catalina/servlet4preview/http/PushBuilder.java b/java/org/apache/catalina/servlet4preview/http/PushBuilder.java
index 991d446..f5f6426 100644
--- a/java/org/apache/catalina/servlet4preview/http/PushBuilder.java
+++ b/java/org/apache/catalina/servlet4preview/http/PushBuilder.java
@@ -84,7 +84,7 @@ public interface PushBuilder {
     PushBuilder sessionId(String sessionId);
 
     /**
-     * Sets a HTTP header on the request. Any existing headers of the same name
+     * Sets an HTTP header on the request. Any existing headers of the same name
      * are first remove.
      *
      * @param name  The name of the header to set
@@ -95,7 +95,7 @@ public interface PushBuilder {
     PushBuilder setHeader(String name, String value);
 
     /**
-     * Adds a HTTP header to the request.
+     * Adds an HTTP header to the request.
      *
      * @param name  The name of the header to add
      * @param value The value of the header to add
diff --git a/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java b/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
index 2d5c208..4f9fd85 100644
--- a/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
+++ b/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
@@ -32,7 +32,7 @@ import javax.servlet.http.HttpServletResponseWrapper;
 import org.apache.tomcat.util.ExceptionUtils;
 
 /**
- * A HttpServletResponseWrapper, used from
+ * An HttpServletResponseWrapper, used from
  * <code>SSIServletExternalResolver</code>
  *
  * @author Bip Thelin
diff --git a/java/org/apache/catalina/valves/rewrite/RewriteRule.java b/java/org/apache/catalina/valves/rewrite/RewriteRule.java
index 450877d..29f23d9 100644
--- a/java/org/apache/catalina/valves/rewrite/RewriteRule.java
+++ b/java/org/apache/catalina/valves/rewrite/RewriteRule.java
@@ -201,14 +201,14 @@ public class RewriteRule {
 
     /**
      *  This forces the current URL to be forbidden, i.e., it immediately sends
-     *  back a HTTP response of 403 (FORBIDDEN). Use this flag in conjunction
+     *  back an HTTP response of 403 (FORBIDDEN). Use this flag in conjunction
      *  with appropriate RewriteConds to conditionally block some URLs.
      */
     protected boolean forbidden = false;
 
     /**
      *  This forces the current URL to be gone, i.e., it immediately sends
-     *  back a HTTP response of 410 (GONE). Use this flag to mark pages which
+     *  back an HTTP response of 410 (GONE). Use this flag to mark pages which
      *  no longer exist as gone.
      */
     protected boolean gone = false;
diff --git a/java/org/apache/tomcat/util/http/FastHttpDateFormat.java b/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
index 1fdb9f6..a546ee6 100644
--- a/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
+++ b/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
@@ -145,7 +145,7 @@ public final class FastHttpDateFormat {
 
 
     /**
-     * Try to parse the given date as a HTTP date.
+     * Try to parse the given date as an HTTP date.
      * @param value The HTTP date
      * @param threadLocalformats Ignored. The local array of
      *                           ConcurrentDateFormat will always be used.
@@ -161,7 +161,7 @@ public final class FastHttpDateFormat {
 
 
     /**
-     * Try to parse the given date as a HTTP date.
+     * Try to parse the given date as an HTTP date.
      * @param value The HTTP date
      * @return the date as a long or <code>-1</code> if the value cannot be
      *         parsed
diff --git a/java/org/apache/tomcat/util/http/parser/Host.java b/java/org/apache/tomcat/util/http/parser/Host.java
index 1400de1..b774ef2 100644
--- a/java/org/apache/tomcat/util/http/parser/Host.java
+++ b/java/org/apache/tomcat/util/http/parser/Host.java
@@ -26,7 +26,7 @@ import org.apache.tomcat.util.buf.MessageBytes;
 public class Host {
 
     /**
-     * Parse the given input as a HTTP Host header value.
+     * Parse the given input as an HTTP Host header value.
      *
      * @param mb The host header value
      *
@@ -42,7 +42,7 @@ public class Host {
 
 
     /**
-     * Parse the given input as a HTTP Host header value.
+     * Parse the given input as an HTTP Host header value.
      *
      * @param string The host header value
      *
diff --git a/java/org/apache/tomcat/util/http/parser/MediaType.java b/java/org/apache/tomcat/util/http/parser/MediaType.java
index 9bacef2..b4b84ae 100644
--- a/java/org/apache/tomcat/util/http/parser/MediaType.java
+++ b/java/org/apache/tomcat/util/http/parser/MediaType.java
@@ -124,7 +124,7 @@ public class MediaType {
     }
 
     /**
-     * Parses a MediaType value, either from a HTTP header or from an application.
+     * Parses a MediaType value, either from an HTTP header or from an application.
      *
      * @param input a reader over the header text
      * @return a MediaType parsed from the input, or null if not valid
diff --git a/java/org/apache/tomcat/websocket/server/UpgradeUtil.java b/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
index b1cf697..d522283 100644
--- a/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
+++ b/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
@@ -68,7 +68,7 @@ public class UpgradeUtil {
      * @param request  The request to check if it is an HTTP upgrade request for
      *                 a WebSocket connection
      * @param response The response associated with the request
-     * @return <code>true</code> if the request includes a HTTP Upgrade request
+     * @return <code>true</code> if the request includes an HTTP Upgrade request
      *         for the WebSocket protocol, otherwise <code>false</code>
      */
     public static boolean isWebSocketUpgradeRequest(ServletRequest request,
diff --git a/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java b/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
index 8e2e3f2..29c2961 100644
--- a/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
+++ b/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
@@ -35,7 +35,7 @@ import org.apache.tomcat.util.buf.ByteChunk;
 /*
  * Implementation note:
  *
- * A number of these tests involve the rewrite valve returning a HTTP Location
+ * A number of these tests involve the rewrite valve returning an HTTP Location
  * header that include un-encoded UTF-8 bytes. How the HTTP client handles these
  * depends on the default character encoding configured for the JVM running the
  * test. The tests expect the client to be configured with UTF-8 as the default
diff --git a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerWithProxy.java b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerWithProxy.java
index a269b6e..e1d5535 100644
--- a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerWithProxy.java
+++ b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerWithProxy.java
@@ -25,7 +25,7 @@ public class TestWsWebSocketContainerWithProxy extends TestWsWebSocketContainer
 
     @BeforeClass
     public static void init() {
-        // Set the system properties for a HTTP proxy on 192.168.0.100:80
+        // Set the system properties for an HTTP proxy on 192.168.0.100:80
         // I used an httpd instance configured as an open forward proxy for this
         // Update the IP/hostname as required
         System.setProperty("http.proxyHost", "192.168.0.100");
diff --git a/webapps/docs/config/cluster-valve.xml b/webapps/docs/config/cluster-valve.xml
index ae99ed3..d930ae2 100644
--- a/webapps/docs/config/cluster-valve.xml
+++ b/webapps/docs/config/cluster-valve.xml
@@ -46,7 +46,7 @@
 </section>
 
 <section name="org.apache.catalina.ha.tcp.ReplicationValve">
-  The <code>ReplicationValve</code> will notify the cluster at the end of a HTTP request
+  The <code>ReplicationValve</code> will notify the cluster at the end of an HTTP request
   so that the cluster can make a decision whether there is data to be replicated or not.
   <subsection name="Attributes">
     <attributes>
diff --git a/webapps/docs/connectors.xml b/webapps/docs/connectors.xml
index 3848d34..c449e6c 100644
--- a/webapps/docs/connectors.xml
+++ b/webapps/docs/connectors.xml
@@ -46,7 +46,7 @@ hopefully help you make the right choice according to your needs.</p>
 <p>The HTTP connector is setup by default with Tomcat, and is ready to use. This
 connector features the lowest latency and best overall performance.</p>
 
-<p>For clustering, a HTTP load balancer <b>with support for web sessions stickiness</b>
+<p>For clustering, an HTTP load balancer <b>with support for web sessions stickiness</b>
 must be installed to direct the traffic to the Tomcat servers. Tomcat supports mod_proxy
 (on Apache HTTP Server 2.x, and included by default in Apache HTTP Server 2.2) as the load balancer.
 It should be noted that the performance of HTTP proxying is usually lower than the
diff --git a/webapps/docs/rewrite.xml b/webapps/docs/rewrite.xml
index 645f4f2..4e2160e 100644
--- a/webapps/docs/rewrite.xml
+++ b/webapps/docs/rewrite.xml
@@ -591,7 +591,7 @@ cannot use <code>$N</code> in the substitution string!
         <li>'<strong><code>forbidden|F</code></strong>' (force URL
         to be <strong>f</strong>orbidden)<br />
         This forces the current URL to be forbidden - it immediately
-        sends back a HTTP response of 403 (FORBIDDEN).
+        sends back an HTTP response of 403 (FORBIDDEN).
         Use this flag in conjunction with
         appropriate RewriteConds to conditionally block some
         URLs.</li>
@@ -599,7 +599,7 @@ cannot use <code>$N</code> in the substitution string!
         <li>'<strong><code>gone|G</code></strong>' (force URL to be
         <strong>g</strong>one)<br />
         This forces the current URL to be gone - it
-        immediately sends back a HTTP response of 410 (GONE). Use
+        immediately sends back an HTTP response of 410 (GONE). Use
         this flag to mark pages which no longer exist as gone.</li>
 
         <li>
@@ -691,7 +691,7 @@ cannot use <code>$N</code> in the substitution string!
           Prefix <em>Substitution</em> with
           <code>http://thishost[:thisport]/</code> (which makes the
           new URL a URI) to force a external redirection. If no
-          <em>code</em> is given, a HTTP response of 302 (FOUND, previously MOVED
+          <em>code</em> is given, an HTTP response of 302 (FOUND, previously MOVED
           TEMPORARILY) will be returned. If you want to use other response
           codes in the range 300-399, simply specify the appropriate number
           or use one of the following symbolic names:
diff --git a/webapps/docs/ssl-howto.xml b/webapps/docs/ssl-howto.xml
index 7dff058..dfa5fdf 100644
--- a/webapps/docs/ssl-howto.xml
+++ b/webapps/docs/ssl-howto.xml
@@ -277,12 +277,12 @@ in the <b>protocol</b> attribute of the <a href="config/http.html">Connector</a>
 
 <p>To define a Java (JSSE) connector, regardless of whether the APR library is
 loaded or not, use one of the following:</p>
-<source><![CDATA[<!-- Define a HTTP/1.1 Connector on port 8443, JSSE NIO implementation -->
+<source><![CDATA[<!-- Define an HTTP/1.1 Connector on port 8443, JSSE NIO implementation -->
 <Connector protocol="org.apache.coyote.http11.Http11NioProtocol"
            sslImplementationName="org.apache.tomcat.util.net.jsse.JSSEImplementation"
            port="8443" .../>
 
-<!-- Define a HTTP/1.1 Connector on port 8443, JSSE NIO2 implementation -->
+<!-- Define an HTTP/1.1 Connector on port 8443, JSSE NIO2 implementation -->
 <Connector protocol="org.apache.coyote.http11.Http11Nio2Protocol"
            sslImplementationName="org.apache.tomcat.util.net.jsse.JSSEImplementation"
            port="8443" .../>]]></source>
@@ -293,13 +293,13 @@ allows enabling it. When using the OpenSSL JSSE implementation, the configuratio
 either the JSSE attributes or
 the OpenSSL attributes (as used for the APR connector), but must not mix attributes from
 both types in the same SSLHostConfig or Connector element.</p>
-<source><![CDATA[<!-- Define a HTTP/1.1 Connector on port 8443, JSSE NIO implementation and OpenSSL -->
+<source><![CDATA[<!-- Define an HTTP/1.1 Connector on port 8443, JSSE NIO implementation and OpenSSL -->
 <Connector protocol="org.apache.coyote.http11.Http11NioProtocol" port="8443"
            sslImplementationName="org.apache.tomcat.util.net.openssl.OpenSSLImplementation"
            .../>]]></source>
 
 <p>Alternatively, to specify an APR connector (the APR library must be available) use:</p>
-<source><![CDATA[<!-- Define a HTTP/1.1 Connector on port 8443, APR implementation -->
+<source><![CDATA[<!-- Define an HTTP/1.1 Connector on port 8443, APR implementation -->
 <Connector protocol="org.apache.coyote.http11.Http11AprProtocol"
            port="8443" .../>]]></source>
 


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

[tomcat] 10/18: Fix typo

markt
In reply to this post by markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 89d573a1f1a0956ef88795f6748b2fcb99ab2339
Author: 康智冬 <[hidden email]>
AuthorDate: Tue Sep 3 21:48:48 2019 +0800

    Fix typo
   
    fix typo
---
 java/org/apache/coyote/ajp/Constants.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/ajp/Constants.java b/java/org/apache/coyote/ajp/Constants.java
index 2fb6c34..245404b 100644
--- a/java/org/apache/coyote/ajp/Constants.java
+++ b/java/org/apache/coyote/ajp/Constants.java
@@ -84,7 +84,7 @@ public final class Constants {
     // Ajp13 specific -  needs refactoring for the new model
 
     /**
-     * Default maximum total byte size for a AJP packet
+     * Default maximum total byte size for an AJP packet
      */
     public static final int MAX_PACKET_SIZE = 8192;
     /**


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

[tomcat] 11/18: fix typo (an ssl)

markt
In reply to this post by markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 0263a8397c540969ba6f3a4e91612821d41cc7c6
Author: KangZhiDong <[hidden email]>
AuthorDate: Wed Sep 4 22:48:23 2019 +0800

    fix typo (an ssl)
---
 conf/server.xml                                             | 4 ++--
 java/org/apache/catalina/realm/LocalStrings.properties      | 2 +-
 java/org/apache/catalina/startup/CertificateCreateRule.java | 2 +-
 java/org/apache/tomcat/jni/SSL.java                         | 6 +++---
 java/org/apache/tomcat/jni/SSLConf.java                     | 2 +-
 java/org/apache/tomcat/jni/SSLContext.java                  | 6 +++---
 java/org/apache/tomcat/jni/SSLSocket.java                   | 6 +++---
 java/org/apache/tomcat/util/net/Nio2Channel.java            | 2 +-
 java/org/apache/tomcat/util/net/NioChannel.java             | 2 +-
 java/org/apache/tomcat/util/net/SecureNio2Channel.java      | 2 +-
 java/org/apache/tomcat/util/net/SecureNioChannel.java       | 2 +-
 webapps/docs/changelog.xml                                  | 2 +-
 webapps/docs/config/ajp.xml                                 | 2 +-
 webapps/docs/config/http.xml                                | 2 +-
 webapps/docs/ssl-howto.xml                                  | 4 ++--
 15 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/conf/server.xml b/conf/server.xml
index fce8922..2cd78df 100644
--- a/conf/server.xml
+++ b/conf/server.xml
@@ -76,7 +76,7 @@
                connectionTimeout="20000"
                redirectPort="8443" />
     -->
-    <!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443
+    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443
          This connector uses the NIO implementation. The default
          SSLImplementation will depend on the presence of the APR/native
          library and the useOpenSSL attribute of the
@@ -93,7 +93,7 @@
         </SSLHostConfig>
     </Connector>
     -->
-    <!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
+    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
          This connector uses the APR/native implementation which always uses
          OpenSSL for TLS.
          Either JSSE or OpenSSL style configuration may be used. OpenSSL style
diff --git a/java/org/apache/catalina/realm/LocalStrings.properties b/java/org/apache/catalina/realm/LocalStrings.properties
index ba0de03..ffffe7d 100644
--- a/java/org/apache/catalina/realm/LocalStrings.properties
+++ b/java/org/apache/catalina/realm/LocalStrings.properties
@@ -64,7 +64,7 @@ jndiRealm.exception=Exception performing authentication
 jndiRealm.exception.retry=Exception performing authentication. Retrying...
 jndiRealm.invalidHostnameVerifier=[{0}] not a valid class name for a HostnameVerifier
 jndiRealm.invalidSslProtocol=Given protocol [{0}] is invalid. It has to be one of [{1}]
-jndiRealm.invalidSslSocketFactory=[{0}] not a valid class name for a SSLSocketFactory
+jndiRealm.invalidSslSocketFactory=[{0}] not a valid class name for an SSLSocketFactory
 jndiRealm.negotiatedTls=Negotiated tls connection using protocol [{0}]
 jndiRealm.open=Exception opening directory server connection
 jndiRealm.tlsClose=Exception closing tls response
diff --git a/java/org/apache/catalina/startup/CertificateCreateRule.java b/java/org/apache/catalina/startup/CertificateCreateRule.java
index 6e49e19..1db3c70 100644
--- a/java/org/apache/catalina/startup/CertificateCreateRule.java
+++ b/java/org/apache/catalina/startup/CertificateCreateRule.java
@@ -23,7 +23,7 @@ import org.apache.tomcat.util.net.SSLHostConfigCertificate.Type;
 import org.xml.sax.Attributes;
 
 /**
- * Rule implementation that creates a SSLHostConfigCertificate.
+ * Rule implementation that creates an SSLHostConfigCertificate.
  */
 public class CertificateCreateRule extends Rule {
 
diff --git a/java/org/apache/tomcat/jni/SSL.java b/java/org/apache/tomcat/jni/SSL.java
index 6c3f2b4..06b6090 100644
--- a/java/org/apache/tomcat/jni/SSL.java
+++ b/java/org/apache/tomcat/jni/SSL.java
@@ -140,7 +140,7 @@ public final class SSL {
     /* Set on servers to choose the cipher according to the server's
      * preferences */
     public static final int SSL_OP_CIPHER_SERVER_PREFERENCE         = 0x00400000;
-    /* If set, a server will allow a client to issue a SSLv3.0 version number
+    /* If set, a server will allow a client to issue an SSLv3.0 version number
      * as latest version supported in the premaster secret, even when TLSv1.0
      * (version 3.1) was announced in the client hello. Normally this is
      * forbidden to prevent version rollback attacks. */
@@ -647,7 +647,7 @@ public final class SSL {
      * Authentication. Notice that this directive can be used both in per-server
      * and per-directory context. In per-server context it applies to the client
      * authentication process used in the standard SSL handshake when a connection
-     * is established. In per-directory context it forces a SSL renegotiation with
+     * is established. In per-directory context it forces an SSL renegotiation with
      * the reconfigured client verification level after the HTTP request was read
      * but before the HTTP response is sent.
      * <br>
@@ -704,7 +704,7 @@ public final class SSL {
      * is permitted to negotiate in the SSL handshake phase. Notice that this
      * directive can be used both in per-server and per-directory context.
      * In per-server context it applies to the standard SSL handshake when a
-     * connection is established. In per-directory context it forces a SSL
+     * connection is established. In per-directory context it forces an SSL
      * renegotiation with the reconfigured Cipher Suite after the HTTP request
      * was read but before the HTTP response is sent.
      * @param ssl the SSL instance (SSL *)
diff --git a/java/org/apache/tomcat/jni/SSLConf.java b/java/org/apache/tomcat/jni/SSLConf.java
index 272c0a1..ede4565 100644
--- a/java/org/apache/tomcat/jni/SSLConf.java
+++ b/java/org/apache/tomcat/jni/SSLConf.java
@@ -73,7 +73,7 @@ public final class SSLConf {
     public static native int check(long cctx, String name, String value) throws Exception;
 
     /**
-     * Assign an SSL context to a SSL_CONF context.
+     * Assign an SSL context to an SSL_CONF context.
      * All following calls to {@link #apply(long, String, String)} will be
      * applied to this SSL context.
      *
diff --git a/java/org/apache/tomcat/jni/SSLContext.java b/java/org/apache/tomcat/jni/SSLContext.java
index 45fcc48..e0759b3 100644
--- a/java/org/apache/tomcat/jni/SSLContext.java
+++ b/java/org/apache/tomcat/jni/SSLContext.java
@@ -126,7 +126,7 @@ public final class SSLContext {
      * <b>mode</b>. SSL objects created from <b>ctx</b> inherit the
      * <b>mode</b> valid at the time and may be 0 or 1.
      * <br>
-     * Normally when a SSL connection is finished, the parties must send out
+     * Normally when an SSL connection is finished, the parties must send out
      * "close notify" alert messages using L&lt;SSL_shutdown(3)|SSL_shutdown(3)&gt;
      * for a clean shutdown.
      * <br>
@@ -150,7 +150,7 @@ public final class SSLContext {
      * is permitted to negotiate in the SSL handshake phase. Notice that this
      * directive can be used both in per-server and per-directory context.
      * In per-server context it applies to the standard SSL handshake when a
-     * connection is established. In per-directory context it forces a SSL
+     * connection is established. In per-directory context it forces an SSL
      * renegotiation with the reconfigured Cipher Suite after the HTTP request
      * was read but before the HTTP response is sent.
      * @param ctx Server or Client context to use.
@@ -368,7 +368,7 @@ public final class SSLContext {
      * Authentication. Notice that this directive can be used both in per-server
      * and per-directory context. In per-server context it applies to the client
      * authentication process used in the standard SSL handshake when a connection
-     * is established. In per-directory context it forces a SSL renegotiation with
+     * is established. In per-directory context it forces an SSL renegotiation with
      * the reconfigured client verification level after the HTTP request was read
      * but before the HTTP response is sent.
      * <br>
diff --git a/java/org/apache/tomcat/jni/SSLSocket.java b/java/org/apache/tomcat/jni/SSLSocket.java
index c8108a0..2cc42f7 100644
--- a/java/org/apache/tomcat/jni/SSLSocket.java
+++ b/java/org/apache/tomcat/jni/SSLSocket.java
@@ -24,7 +24,7 @@ package org.apache.tomcat.jni;
 public class SSLSocket {
 
     /**
-     * Attach APR socket on a SSL connection.
+     * Attach APR socket on an SSL connection.
      * @param ctx SSLContext to use.
      * @param sock APR Socket that already did physical connect or accept.
      * @return APR_STATUS code.
@@ -34,14 +34,14 @@ public class SSLSocket {
         throws Exception;
 
     /**
-     * Do a SSL handshake.
+     * Do an SSL handshake.
      * @param thesocket The socket to use
      * @return the handshake status
      */
     public static native int handshake(long thesocket);
 
     /**
-     * Do a SSL renegotiation.
+     * Do an SSL renegotiation.
      * SSL supports per-directory re-configuration of SSL parameters.
      * This is implemented by performing an SSL renegotiation of the
      * re-configured parameters after the request is read, but before the
diff --git a/java/org/apache/tomcat/util/net/Nio2Channel.java b/java/org/apache/tomcat/util/net/Nio2Channel.java
index 3437ed0..bc5a8b3 100644
--- a/java/org/apache/tomcat/util/net/Nio2Channel.java
+++ b/java/org/apache/tomcat/util/net/Nio2Channel.java
@@ -28,7 +28,7 @@ import java.util.concurrent.TimeoutException;
 
 /**
  * Base class for a SocketChannel wrapper used by the endpoint.
- * This way, logic for a SSL socket channel remains the same as for
+ * This way, logic for an SSL socket channel remains the same as for
  * a non SSL, making sure we don't need to code for any exception cases.
  */
 public class Nio2Channel implements AsynchronousByteChannel {
diff --git a/java/org/apache/tomcat/util/net/NioChannel.java b/java/org/apache/tomcat/util/net/NioChannel.java
index bfe6f07..29e2c2a 100644
--- a/java/org/apache/tomcat/util/net/NioChannel.java
+++ b/java/org/apache/tomcat/util/net/NioChannel.java
@@ -28,7 +28,7 @@ import org.apache.tomcat.util.res.StringManager;
 
 /**
  * Base class for a SocketChannel wrapper used by the endpoint.
- * This way, logic for a SSL socket channel remains the same as for
+ * This way, logic for an SSL socket channel remains the same as for
  * a non SSL, making sure we don't need to code for any exception cases.
  *
  * @version 1.0
diff --git a/java/org/apache/tomcat/util/net/SecureNio2Channel.java b/java/org/apache/tomcat/util/net/SecureNio2Channel.java
index c352143..11f31a0 100644
--- a/java/org/apache/tomcat/util/net/SecureNio2Channel.java
+++ b/java/org/apache/tomcat/util/net/SecureNio2Channel.java
@@ -563,7 +563,7 @@ public class SecureNio2Channel extends Nio2Channel  {
     }
 
     /**
-     * Sends a SSL close message, will not physically close the connection here.<br>
+     * Sends an SSL close message, will not physically close the connection here.<br>
      * To close the connection, you could do something like
      * <pre><code>
      *   close();
diff --git a/java/org/apache/tomcat/util/net/SecureNioChannel.java b/java/org/apache/tomcat/util/net/SecureNioChannel.java
index dc8c5a0..d972492 100644
--- a/java/org/apache/tomcat/util/net/SecureNioChannel.java
+++ b/java/org/apache/tomcat/util/net/SecureNioChannel.java
@@ -503,7 +503,7 @@ public class SecureNioChannel extends NioChannel  {
     }
 
     /**
-     * Sends a SSL close message, will not physically close the connection here.
+     * Sends an SSL close message, will not physically close the connection here.
      * <br>To close the connection, you could do something like
      * <pre><code>
      *   close();
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 6cec550..38b2241 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -2658,7 +2658,7 @@
         mechanism. (markt)
       </fix>
       <fix>
-        <bug>61914</bug>: Possible NPE with Java 9 when creating a SSL engine.
+        <bug>61914</bug>: Possible NPE with Java 9 when creating an SSL engine.
         Patch submitted by Evgenij Ryazanov. (remm)
       </fix>
       <fix>
diff --git a/webapps/docs/config/ajp.xml b/webapps/docs/config/ajp.xml
index 45bd7bd..bc63c89 100644
--- a/webapps/docs/config/ajp.xml
+++ b/webapps/docs/config/ajp.xml
@@ -232,7 +232,7 @@
       calls to <code>request.isSecure()</code> to return <code>true</code>
       for requests received by this Connector. You would want this on an
       SSL Connector or a non SSL connector that is receiving data from a
-      SSL accelerator, like a crypto card, a SSL appliance or even a webserver.
+      SSL accelerator, like a crypto card, an SSL appliance or even a webserver.
       The default value is <code>false</code>.</p>
     </attribute>
 
diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index 14c0cae..2ae9b6e 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -232,7 +232,7 @@
       calls to <code>request.isSecure()</code> to return <code>true</code>
       for requests received by this Connector. You would want this on an
       SSL Connector or a non SSL connector that is receiving data from a
-      SSL accelerator, like a crypto card, a SSL appliance or even a webserver.
+      SSL accelerator, like a crypto card, an SSL appliance or even a webserver.
       The default value is <code>false</code>.</p>
     </attribute>
 
diff --git a/webapps/docs/ssl-howto.xml b/webapps/docs/ssl-howto.xml
index dfa5fdf..91b5dd2 100644
--- a/webapps/docs/ssl-howto.xml
+++ b/webapps/docs/ssl-howto.xml
@@ -333,7 +333,7 @@ for an SSL connector is included in the default <code>server.xml</code>
 file installed with Tomcat. To configure an SSL connector that uses JSSE, you
 will need to remove the comments and edit it so it looks something like
 this:</p>
-<source><![CDATA[<!-- Define a SSL Coyote HTTP/1.1 Connector on port 8443 -->
+<source><![CDATA[<!-- Define an SSL Coyote HTTP/1.1 Connector on port 8443 -->
 <Connector
            protocol="org.apache.coyote.http11.Http11NioProtocol"
            port="8443" maxThreads="200"
@@ -347,7 +347,7 @@ this:</p>
 <p>
   The APR connector uses different attributes for many SSL settings,
   particularly keys and certificates. An example of an APR configuration is:</p>
-<source><![CDATA[<!-- Define a SSL Coyote HTTP/1.1 Connector on port 8443 -->
+<source><![CDATA[<!-- Define an SSL Coyote HTTP/1.1 Connector on port 8443 -->
 <Connector
            protocol="org.apache.coyote.http11.Http11AprProtocol"
            port="8443" maxThreads="200"


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

[tomcat] 12/18: fix typo

markt
In reply to this post by markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit ad7563b50a0780a09b71aed51c204cc7aa6e3bd9
Author: KangZhiDong <[hidden email]>
AuthorDate: Wed Sep 4 22:51:13 2019 +0800

    fix typo
---
 java/org/apache/tomcat/util/net/SSLHostConfig.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/net/SSLHostConfig.java b/java/org/apache/tomcat/util/net/SSLHostConfig.java
index 57a17eb..7545272 100644
--- a/java/org/apache/tomcat/util/net/SSLHostConfig.java
+++ b/java/org/apache/tomcat/util/net/SSLHostConfig.java
@@ -55,7 +55,7 @@ public class SSLHostConfig implements Serializable {
     protected static final Set<String> SSL_PROTO_ALL_SET = new HashSet<>();
 
     static {
-        /* Default used if protocols is not configured, also used if
+        /* Default used if protocols are not configured, also used if
          * protocols="All"
          */
         SSL_PROTO_ALL_SET.add(Constants.SSL_PROTO_SSLv2Hello);


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

[tomcat] 13/18: fix typo(an sql)

markt
In reply to this post by markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 3795213a021e2b17b8357ba42d9cd56c5a4e69ba
Author: KangZhiDong <[hidden email]>
AuthorDate: Fri Sep 6 22:53:51 2019 +0800

    fix typo(an sql)
---
 java/org/apache/catalina/realm/JDBCRealm.java                       | 6 +++---
 java/org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java                 | 4 ++--
 java/org/apache/tomcat/dbcp/dbcp2/SQLExceptionList.java             | 2 +-
 modules/jdbc-pool/doc/jdbc-pool.xml                                 | 2 +-
 .../main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java    | 4 ++--
 .../src/main/java/org/apache/tomcat/jdbc/pool/TrapException.java    | 2 +-
 .../main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml    | 4 ++--
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/java/org/apache/catalina/realm/JDBCRealm.java b/java/org/apache/catalina/realm/JDBCRealm.java
index 3321b39..9f6c663 100644
--- a/java/org/apache/catalina/realm/JDBCRealm.java
+++ b/java/org/apache/catalina/realm/JDBCRealm.java
@@ -314,7 +314,7 @@ public class JDBCRealm
         // This needs rewritten with better pooling support, the existing code
         // needs signature changes since the Prepared statements needs cached
         // with the connections.
-        // The code below will try twice if there is a SQLException so the
+        // The code below will try twice if there is an SQLException so the
         // connection may try to be opened again. On normal conditions (including
         // invalid login - the above is only used once.
         int numberOfTries = 2;
@@ -525,7 +525,7 @@ public class JDBCRealm
         // This needs rewritten with better pooling support, the existing code
         // needs signature changes since the Prepared statements needs cached
         // with the connections.
-        // The code below will try twice if there is a SQLException so the
+        // The code below will try twice if there is an SQLException so the
         // connection may try to be opened again. On normal conditions (including
         // invalid login - the above is only used once.
         int numberOfTries = 2;
@@ -597,7 +597,7 @@ public class JDBCRealm
         // This needs rewritten wuth better pooling support, the existing code
         // needs signature changes since the Prepared statements needs cached
         // with the connections.
-        // The code below will try twice if there is a SQLException so the
+        // The code below will try twice if there is an SQLException so the
         // connection may try to be opened again. On normal conditions (including
         // invalid login - the above is only used once.
         int numberOfTries = 2;
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java b/java/org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java
index eb0d09d..0cb852a 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java
@@ -415,7 +415,7 @@ public class Jdbc41Bridge {
      * Delegates to {@link Statement#closeOnCompletion()} without throwing a {@link AbstractMethodError}.
      * <p>
      * If the JDBC driver does not implement {@link Statement#closeOnCompletion()}, then just check that the connection
-     * is closed to then throw a SQLException.
+     * is closed to then throw an SQLException.
      * </p>
      *
      * @param statement
@@ -438,7 +438,7 @@ public class Jdbc41Bridge {
      * Delegates to {@link Statement#isCloseOnCompletion()} without throwing a {@link AbstractMethodError}.
      * <p>
      * If the JDBC driver does not implement {@link Statement#isCloseOnCompletion()}, then just check that the
-     * connection is closed to then throw a SQLException.
+     * connection is closed to then throw an SQLException.
      * </p>
      *
      * @param statement
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/SQLExceptionList.java b/java/org/apache/tomcat/dbcp/dbcp2/SQLExceptionList.java
index 6f24f04..3f8d1af 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/SQLExceptionList.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/SQLExceptionList.java
@@ -21,7 +21,7 @@ import java.sql.SQLException;
 import java.util.List;
 
 /**
- * A SQLException based on a list of Throwable causes.
+ * An SQLException based on a list of Throwable causes.
  * <p>
  * The first exception in the list is used as this exception's cause and is accessible with the usual
  * {@link #getCause()} while the complete list is accessible with {@link #getCauseList()}.
diff --git a/modules/jdbc-pool/doc/jdbc-pool.xml b/modules/jdbc-pool/doc/jdbc-pool.xml
index 0249108..59c979d 100644
--- a/modules/jdbc-pool/doc/jdbc-pool.xml
+++ b/modules/jdbc-pool/doc/jdbc-pool.xml
@@ -119,7 +119,7 @@
   <subsection name="Additional features">
     <p>The Tomcat connection pool offers a few additional features over what most other pools let you do:</p>
     <ul>
-      <li><code>initSQL</code> - the ability to run a SQL statement exactly once, when the connection is created</li>
+      <li><code>initSQL</code> - the ability to run an SQL statement exactly once, when the connection is created</li>
       <li><code>validationInterval</code> - in addition to running validations on connections, avoid running them too frequently.</li>
       <li><code>jdbcInterceptors</code> - flexible and pluggable interceptors to create any customizations around the pool,
           the query execution and the result set handling. More on this in the advanced section.</li>
diff --git a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
index 2359fc8..4ce7708 100644
--- a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
+++ b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
@@ -501,7 +501,7 @@ public interface PoolConfiguration {
      * The SQL query that will be used to validate connections from this
      * pool before returning them to the caller or pool.
      * If specified, this query does not have to return any data,
-     * it just can't throw a SQLException.
+     * it just can't throw an SQLException.
      * The default value is null.
      * Example values are SELECT 1(mysql),
      * select 1 from dual(oracle),
@@ -514,7 +514,7 @@ public interface PoolConfiguration {
      * The SQL query that will be used to validate connections from this
      * pool before returning them to the caller or pool.
      * If specified, this query does not have to return any data,
-     * it just can't throw a SQLException.
+     * it just can't throw an SQLException.
      * The default value is null.
      * Example values are SELECT 1(mysql),
      * select 1 from dual(oracle),
diff --git a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/TrapException.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/TrapException.java
index ccbbbf9..2789e72 100644
--- a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/TrapException.java
+++ b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/TrapException.java
@@ -23,7 +23,7 @@ import java.lang.reflect.Method;
 import java.sql.SQLException;
 /**
  * Interceptor that traps any unhandled exception types and throws an exception that has been declared by the method
- * called, or throw a SQLException if it is declared.
+ * called, or throw an SQLException if it is declared.
  * If the caught exception is not declared, and the method doesn't throw SQLException, then this interceptor will
  * throw a RuntimeException
  *
diff --git a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml
index 7dfd1c3..aa38a15 100644
--- a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml
+++ b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml
@@ -117,7 +117,7 @@
              writeable="false"/>
 
     <attribute    name="maxWait"
-           description="The time to wait in milliseconds before a SQLException is thrown when a connection is requested"
+           description="The time to wait in milliseconds before an SQLException is thrown when a connection is requested"
                   type="java.lang.Integer"
              writeable="false"/>
 
@@ -214,7 +214,7 @@
              writeable="false"/>
 
     <attribute    name="initSQL"
-           description="A SQL executed once per connection, when it is established"
+           description="An SQL executed once per connection, when it is established"
                   type="java.lang.String"
              writeable="false"/>
 


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

[tomcat] 14/18: Fix typo

markt
In reply to this post by markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 50b4075c96040777d9919a32f26ebb85f20a6438
Author: 康智冬 <[hidden email]>
AuthorDate: Wed Sep 11 09:05:04 2019 +0800

    Fix typo
   
    remove extra ‘a’
---
 java/org/apache/catalina/util/SessionIdGeneratorBase.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/util/SessionIdGeneratorBase.java b/java/org/apache/catalina/util/SessionIdGeneratorBase.java
index ca3d636..c0a2a2f 100644
--- a/java/org/apache/catalina/util/SessionIdGeneratorBase.java
+++ b/java/org/apache/catalina/util/SessionIdGeneratorBase.java
@@ -44,7 +44,7 @@ public abstract class SessionIdGeneratorBase extends LifecycleBase
      * identifiers. If the queue is empty when a random number generator is
      * required, a new random number generator object is created. This is
      * designed this way since random number generators use a sync to make them
-     * thread-safe and the sync makes using a a single object slow(er).
+     * thread-safe and the sync makes using a single object slow(er).
      */
     private final Queue<SecureRandom> randoms = new ConcurrentLinkedQueue<>();
 


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

[tomcat] 15/18: Fix typo

markt
In reply to this post by markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 11fec6f5b7a72926ff8df856737c33dc33277288
Author: 康智冬 <[hidden email]>
AuthorDate: Wed Sep 11 10:13:46 2019 +0800

    Fix typo
   
    add missing javadoc
---
 java/org/apache/catalina/ha/session/BackupManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/ha/session/BackupManager.java b/java/org/apache/catalina/ha/session/BackupManager.java
index 1f5944b..1f4fa21 100644
--- a/java/org/apache/catalina/ha/session/BackupManager.java
+++ b/java/org/apache/catalina/ha/session/BackupManager.java
@@ -53,7 +53,7 @@ public class BackupManager extends ClusterManagerBase
     protected String name;
 
     /**
-     *
+     * Flag for how this map sends messages.
      */
     private int mapSendOptions = Channel.SEND_OPTIONS_SYNCHRONIZED_ACK|Channel.SEND_OPTIONS_USE_ACK;
 


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

[tomcat] 16/18: Add link to newly added JASPIC docs

markt
In reply to this post by markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 2b8f0b650d08320bad57c2f21f7461e27f14e022
Author: Mark Thomas <[hidden email]>
AuthorDate: Wed Sep 11 11:46:07 2019 +0100

    Add link to newly added JASPIC docs
---
 build.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.xml b/build.xml
index 04397b6..54fb967 100644
--- a/build.xml
+++ b/build.xml
@@ -1978,6 +1978,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
       <link href="../jspapi"/>
       <link href="../elapi"/>
       <link href="../websocketapi"/>
+        <link href="../jaspicapi"/>
       <link href="https://docs.oracle.com/javase/7/docs/api/"/>
       <link href="https://docs.oracle.com/javaee/7/api/"/>
       <packageset dir="${tomcat.dist}/src/java/">


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

[tomcat] 17/18: Update changelog for PR from KangZhiDong

markt
In reply to this post by markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit c8ecb013705f6b19d1722b292d1eb12f449619e7
Author: Mark Thomas <[hidden email]>
AuthorDate: Wed Sep 11 11:50:44 2019 +0100

    Update changelog for PR from KangZhiDong
---
 webapps/docs/changelog.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 38b2241..2365c9b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -95,6 +95,10 @@
         application to enable release builds to be built with Java 10 onwards.
         (markt)
       </fix>
+      <fix>
+        Fix a large number of Javadoc and documentation typos. Patch provided by
+        KangZhiDong. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Other">
@@ -154,6 +158,10 @@
         the registry entires are added to the 64-bit registry when using a
         64-bit JVM. (markt)
       </fix>
+      <fix>
+        Remove unused i18n messages and associated translations. Patch provided
+        by KangZhiDong. (markt)
+      </fix>
     </changelog>
   </subsection>
 </section>


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

[tomcat] 18/18: Remove translated entries for keys that have been removed

markt
In reply to this post by markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit d5a6da88aa55bd6a9c6ef867905a2a2fa2be9d98
Author: Mark Thomas <[hidden email]>
AuthorDate: Wed Sep 11 15:16:26 2019 +0100

    Remove translated entries for keys that have been removed
---
 .../servlet/http/LocalStrings_zh_CN.properties     |  3 ++-
 .../authenticator/LocalStrings_zh_CN.properties    |  1 +
 .../catalina/connector/LocalStrings_de.properties  |  1 -
 .../catalina/connector/LocalStrings_es.properties  |  1 -
 .../catalina/connector/LocalStrings_fr.properties  |  1 -
 .../catalina/connector/LocalStrings_ja.properties  |  1 -
 .../catalina/connector/LocalStrings_ko.properties  |  1 -
 .../catalina/connector/LocalStrings_ru.properties  |  1 -
 .../connector/LocalStrings_zh_CN.properties        |  4 ++-
 .../catalina/core/LocalStrings_es.properties       |  3 ---
 .../catalina/core/LocalStrings_fr.properties       |  2 --
 .../catalina/core/LocalStrings_ja.properties       |  2 --
 .../catalina/core/LocalStrings_ko.properties       |  2 --
 .../catalina/core/LocalStrings_zh_CN.properties    | 10 ++++++--
 .../catalina/deploy/LocalStrings_zh_CN.properties  |  1 +
 .../catalina/filters/LocalStrings_fr.properties    |  2 ++
 .../catalina/filters/LocalStrings_ko.properties    |  2 ++
 .../catalina/filters/LocalStrings_zh_CN.properties |  1 +
 .../ha/deploy/LocalStrings_zh_CN.properties        |  2 ++
 .../ha/session/LocalStrings_zh_CN.properties       |  3 +++
 .../catalina/ha/tcp/LocalStrings_zh_CN.properties  |  1 +
 .../catalina/loader/LocalStrings_de.properties     |  1 -
 .../catalina/loader/LocalStrings_es.properties     |  8 ------
 .../catalina/loader/LocalStrings_fr.properties     |  9 -------
 .../catalina/loader/LocalStrings_ja.properties     |  9 -------
 .../catalina/loader/LocalStrings_ko.properties     |  9 -------
 .../catalina/loader/LocalStrings_zh_CN.properties  |  6 +----
 .../catalina/manager/LocalStrings_fr.properties    |  1 -
 .../catalina/manager/LocalStrings_ja.properties    |  1 -
 .../catalina/manager/LocalStrings_ko.properties    |  1 -
 .../catalina/manager/LocalStrings_ru.properties    |  3 ---
 .../catalina/manager/LocalStrings_zh_CN.properties |  1 -
 .../manager/host/LocalStrings_fr.properties        |  1 -
 .../manager/host/LocalStrings_ja.properties        |  1 -
 .../manager/host/LocalStrings_ko.properties        |  1 -
 .../manager/host/LocalStrings_ru.properties        |  1 -
 .../manager/host/LocalStrings_zh_CN.properties     |  1 -
 .../mbeans}/LocalStrings_zh_CN.properties          |  3 +--
 .../catalina/realm/LocalStrings_de.properties      |  1 -
 .../catalina/realm/LocalStrings_es.properties      |  1 -
 .../catalina/realm/LocalStrings_fr.properties      |  3 +--
 .../catalina/realm/LocalStrings_ja.properties      |  2 --
 .../catalina/realm/LocalStrings_ko.properties      |  3 +--
 .../catalina/session/LocalStrings_zh_CN.properties |  1 +
 .../catalina/startup/LocalStrings_es.properties    |  4 ---
 .../catalina/startup/LocalStrings_fr.properties    |  6 -----
 .../catalina/startup/LocalStrings_ja.properties    |  6 -----
 .../catalina/startup/LocalStrings_ko.properties    |  6 -----
 .../catalina/startup/LocalStrings_zh_CN.properties | 29 +++++++++++++++++++++-
 .../tribes/group/LocalStrings_zh_CN.properties     |  1 +
 .../interceptors/LocalStrings_zh_CN.properties     |  1 +
 .../membership/LocalStrings_zh_CN.properties       |  1 +
 .../tribes/transport/LocalStrings_es.properties    |  9 -------
 .../tribes/transport/LocalStrings_zh_CN.properties |  1 +
 .../transport/bio/LocalStrings_zh_CN.properties    |  2 ++
 .../transport/nio/LocalStrings_zh_CN.properties    |  3 ++-
 .../catalina/util/LocalStrings_zh_CN.properties    |  2 ++
 .../catalina/valves/LocalStrings_fr.properties     |  2 ++
 .../catalina/valves/LocalStrings_ja.properties     |  2 +-
 .../catalina/valves/LocalStrings_ko.properties     |  2 ++
 .../catalina/valves/LocalStrings_zh_CN.properties  | 19 ++++++++++++++
 .../webresources/LocalStrings_es.properties        |  2 --
 .../webresources/LocalStrings_fr.properties        |  2 --
 .../webresources/LocalStrings_ja.properties        |  2 --
 .../webresources/LocalStrings_ko.properties        |  2 --
 .../webresources/LocalStrings_zh_CN.properties     |  4 +--
 .../apache/coyote/LocalStrings_zh_CN.properties    |  2 +-
 .../apache/coyote/ajp/LocalStrings_es.properties   |  3 ---
 .../apache/coyote/ajp/LocalStrings_fr.properties   |  2 --
 .../apache/coyote/ajp/LocalStrings_ja.properties   |  2 --
 .../apache/coyote/ajp/LocalStrings_ko.properties   |  2 --
 .../coyote/ajp/LocalStrings_zh_CN.properties       |  1 -
 .../coyote/http11/LocalStrings_de.properties       |  1 -
 .../coyote/http11/LocalStrings_es.properties       |  3 ---
 .../coyote/http11/LocalStrings_fr.properties       |  5 ++--
 .../coyote/http11/LocalStrings_ja.properties       |  3 ---
 .../coyote/http11/LocalStrings_ko.properties       |  5 ++--
 .../coyote/http11/LocalStrings_zh_CN.properties    |  3 ++-
 .../apache/coyote/http2/LocalStrings_es.properties |  1 -
 .../apache/coyote/http2/LocalStrings_fr.properties |  8 +-----
 .../apache/coyote/http2/LocalStrings_ja.properties |  7 ------
 .../apache/coyote/http2/LocalStrings_ko.properties |  8 +-----
 .../coyote/http2/LocalStrings_zh_CN.properties     | 19 +++++++++++---
 .../jasper/resources/LocalStrings_de.properties    |  1 -
 .../jasper/resources/LocalStrings_es.properties    |  2 --
 .../jasper/resources/LocalStrings_fr.properties    |  2 --
 .../jasper/resources/LocalStrings_ja.properties    |  2 --
 .../jasper/resources/LocalStrings_ko.properties    |  2 --
 .../jasper/resources/LocalStrings_zh_CN.properties | 21 +++++++++++++---
 .../naming/factory/LocalStrings_zh_CN.properties   |  2 ++
 .../tomcat/util/buf/LocalStrings_es.properties     |  2 --
 .../tomcat/util/buf/LocalStrings_fr.properties     |  1 -
 .../tomcat/util/buf/LocalStrings_ja.properties     |  1 -
 .../tomcat/util/buf/LocalStrings_ko.properties     |  1 -
 .../tomcat/util/buf/LocalStrings_zh_CN.properties  |  1 -
 .../util/compat/LocalStrings_zh_CN.properties      |  2 ++
 .../descriptor/web/LocalStrings_zh_CN.properties   |  3 +++
 .../tomcat/util/http/LocalStrings_zh_CN.properties |  3 ++-
 .../util/http/parser/LocalStrings_fr.properties    |  1 -
 .../util/http/parser/LocalStrings_ja.properties    |  1 -
 .../util/http/parser/LocalStrings_ko.properties    |  1 -
 .../tomcat/util/net/LocalStrings_es.properties     |  2 --
 .../tomcat/util/net/LocalStrings_fr.properties     |  3 ---
 .../tomcat/util/net/LocalStrings_ja.properties     |  3 ---
 .../tomcat/util/net/LocalStrings_ko.properties     |  3 ---
 .../tomcat/util/net/LocalStrings_zh_CN.properties  |  4 +++
 .../util/net/jsse/LocalStrings_de.properties       |  2 --
 .../util/net/jsse/LocalStrings_es.properties       |  2 --
 .../util/net/jsse/LocalStrings_fr.properties       |  5 ----
 .../util/net/jsse/LocalStrings_ja.properties       |  5 ----
 .../util/net/jsse/LocalStrings_ko.properties       |  5 ----
 .../util/net/jsse/LocalStrings_zh_CN.properties    |  6 ++---
 .../util/net/openssl/LocalStrings_de.properties    |  3 ---
 .../util/net/openssl/LocalStrings_es.properties    |  2 --
 .../util/net/openssl/LocalStrings_fr.properties    |  5 ----
 .../util/net/openssl/LocalStrings_ja.properties    |  5 ----
 .../util/net/openssl/LocalStrings_ko.properties    |  5 ----
 .../util/net/openssl/LocalStrings_zh_CN.properties |  3 ---
 .../tomcat/websocket/LocalStrings_fr.properties    |  1 -
 .../tomcat/websocket/LocalStrings_ja.properties    |  1 -
 .../tomcat/websocket/LocalStrings_ko.properties    |  1 -
 .../tomcat/websocket/LocalStrings_zh_CN.properties |  4 +++
 .../websocket/pojo/LocalStrings_zh_CN.properties   |  3 +++
 .../websocket/server/LocalStrings_de.properties    |  1 -
 .../websocket/server/LocalStrings_es.properties    |  1 -
 .../websocket/server/LocalStrings_fr.properties    |  3 ---
 .../websocket/server/LocalStrings_ja.properties    |  3 ---
 .../websocket/server/LocalStrings_ko.properties    |  3 ---
 .../websocket/server/LocalStrings_zh_CN.properties |  2 +-
 129 files changed, 161 insertions(+), 270 deletions(-)

diff --git a/java/javax/servlet/http/LocalStrings_zh_CN.properties b/java/javax/servlet/http/LocalStrings_zh_CN.properties
index c471410..fbbd569 100644
--- a/java/javax/servlet/http/LocalStrings_zh_CN.properties
+++ b/java/javax/servlet/http/LocalStrings_zh_CN.properties
@@ -14,9 +14,10 @@
 # limitations under the License.
 
 err.cookie_name_blank=Cookie名称不能为null或零长度
+err.io.nullArray=Null在write方法中传递给字节数组
 err.io.short_read=短.读
 
-http.method_delete_not_supported=此URL不支持Http方法DELETE
+http.method_delete_not_supported=当前URL不支持HTTP的DELETE方法
 http.method_get_not_supported=此URL不支持Http方法GET
 http.method_not_implemented=这个servlet没有为这个URI实现方法[{0}]
 http.method_post_not_supported=此URL不支持Http方法POST
diff --git a/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties b/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
index e4d7a05..75cbdb7 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
@@ -36,6 +36,7 @@ digestAuthenticator.cacheRemove=已从客户端 nonce 缓存中删除有效条
 
 singleSignOn.debug.cookieCheck=SSO检查SSO cookie
 singleSignOn.debug.cookieNotFound=SSO没有找到SSO cookie
+singleSignOn.debug.principalCheck=SSO为SSO会话[{0}]寻找缓存的Principal
 singleSignOn.debug.principalFound=SSO 找到了带着认证类型的缓存代理
 singleSignOn.debug.removeSession=SSO 从 SSO session [{1}] 中删除应用程序会话 [{0}]
 singleSignOn.debug.update=SSO 更新SSO 会话[{0}] 对认证 类型[{1}]
diff --git a/java/org/apache/catalina/connector/LocalStrings_de.properties b/java/org/apache/catalina/connector/LocalStrings_de.properties
index d1826ce..94f6405 100644
--- a/java/org/apache/catalina/connector/LocalStrings_de.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_de.properties
@@ -15,7 +15,6 @@
 
 coyoteAdapter.checkRecycled.response=Eine nicht recycelte Antwort wurde erkannt und recylet
 coyoteAdapter.debug=Die Variable [{0}] hat den Wert [{1}]
-coyoteAdapter.parsePathParam=Das Parsen der Pfadparameter ist schlug mit der Kodierung [{0}] fehl. Die Parameter im Pfad werden ignoriert
 
 coyoteConnector.invalidEncoding=Das Encoding [{0}] wird von der JRE nicht erkannt. Der Konnektor wird weiterhin [{1}] nutzen
 coyoteConnector.invalidPort=Der Konnektor kann nicht starten, da der als Port angegebene Wert [{0}] nicht gültig ist.
diff --git a/java/org/apache/catalina/connector/LocalStrings_es.properties b/java/org/apache/catalina/connector/LocalStrings_es.properties
index f0dca0b..12f7b6a 100644
--- a/java/org/apache/catalina/connector/LocalStrings_es.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_es.properties
@@ -16,7 +16,6 @@
 coyoteAdapter.accesslogFail=Excepción al intentar añadir una entrada al historial de acceso
 coyoteAdapter.checkRecycled.response=Se encontró una respuesta no reciclable y se crecicló a la fuerza
 coyoteAdapter.debug=La variable [{0}] tiene el valor [{1}]
-coyoteAdapter.parsePathParam=No puedo analizar los parámetros de ruta mediante la codificación [{0}]. Se ignoran los parámetros de la URL.
 
 coyoteConnector.invalidEncoding=La codificación  [{0}]  no esta reconocida por  JRE. El conector continuará usando [{1}]\n
 coyoteConnector.invalidPort=El conector no puede inciar debido a que el valor del puerto especificado [{0}] no es válido
diff --git a/java/org/apache/catalina/connector/LocalStrings_fr.properties b/java/org/apache/catalina/connector/LocalStrings_fr.properties
index 8d1bbd4..d93b398 100644
--- a/java/org/apache/catalina/connector/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_fr.properties
@@ -21,7 +21,6 @@ coyoteAdapter.checkRecycled.request=Trouvé une requête non recyclée dont le r
 coyoteAdapter.checkRecycled.response=Trouvé une réponse non recyclée, et forcé son recyclage
 coyoteAdapter.debug=La variable [{0}] a la valeur [{1}]
 coyoteAdapter.nullRequest=Un dispatch asynchrone peut seulement se produire sur une requête existante
-coyoteAdapter.parsePathParam=Impossible de parser les paramètres du chemin en utilisant l''encodage [{0}]. Les paramètres du chemin (path) dans le URL seront ignorés.
 
 coyoteConnector.invalidEncoding=L''encodage [{0}] n''est pas reconnu par la JRE. Le connecteur (Connector) continuera à utiliser [{1}]
 coyoteConnector.invalidPort=Le connecteur ne peut pas démarrer, parce que la valeur spécifiée du port [{0}] n''est pas valide
diff --git a/java/org/apache/catalina/connector/LocalStrings_ja.properties b/java/org/apache/catalina/connector/LocalStrings_ja.properties
index c94659b..5188b63 100644
--- a/java/org/apache/catalina/connector/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_ja.properties
@@ -21,7 +21,6 @@ coyoteAdapter.checkRecycled.request=リサイクルされていないリクエ
 coyoteAdapter.checkRecycled.response=リサイクルされていないレスポンスが発生、強制的にリサイクルされました。
 coyoteAdapter.debug=変数[{0}]に値[{1}]があります
 coyoteAdapter.nullRequest=非同期ディスパッチは、既存のリクエストでのみ発生する可能性があります
-coyoteAdapter.parsePathParam=エンコード[{0}]を使用してパスパラメータを解析できません。 URLのパスパラメータは無視されます。
 
 coyoteConnector.invalidEncoding=[{0}] は JRE の理解できない符号化方式です。Connector は [{1}] で処理を続行します。
 coyoteConnector.invalidPort=[{0}]の指定されたポート値が無効であるため、コネクタを開始できません
diff --git a/java/org/apache/catalina/connector/LocalStrings_ko.properties b/java/org/apache/catalina/connector/LocalStrings_ko.properties
index ee5c308..3081646 100644
--- a/java/org/apache/catalina/connector/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_ko.properties
@@ -21,7 +21,6 @@ coyoteAdapter.checkRecycled.request=참조 해제 되지않은 요청을 발견
 coyoteAdapter.checkRecycled.response=참조 해제되지 않은 응답이 발견되어 강제로 참조 해제합니다.
 coyoteAdapter.debug=변수 [{0}]이(가) 값 [{1}]을(를) 가지고 있습니다.
 coyoteAdapter.nullRequest=비동기 디스패치는, 기존 요청에 대해 오직 한번만 일어나야 합니다.
-coyoteAdapter.parsePathParam=인코딩 [{0}]을(를) 사용하여 경로 파라미터들을 파싱할 수 없습니다. URL 내의 경로 파라미터들은 무시될 것입니다.
 
 coyoteConnector.invalidEncoding=인코딩 [{0}]은(는) JRE에 의해 인식되지 않습니다. Connector는 [{1}]을(를) 계속 사용할 것입니다.
 coyoteConnector.invalidPort=지정된 포트 번호, [{0}]이(가) 유효하지 않기 때문에, Connector가 시작될 수 없습니다.
diff --git a/java/org/apache/catalina/connector/LocalStrings_ru.properties b/java/org/apache/catalina/connector/LocalStrings_ru.properties
index 5f7d005..9cf2f86 100644
--- a/java/org/apache/catalina/connector/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_ru.properties
@@ -14,4 +14,3 @@
 # limitations under the License.
 
 coyoteAdapter.debug=Переменная [{0}] имеет значение [{1}]
-coyoteAdapter.parsePathParam=Невозможно разобрать параметры пути используя кодировку [{0}]. Параметры будут проигнорированы.
diff --git a/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties b/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
index fbd1f02..edf59b3 100644
--- a/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
@@ -15,7 +15,6 @@
 
 coyoteAdapter.checkRecycled.response=遇到非回收的相应并强行回收。
 coyoteAdapter.debug=变量[{0}]的值为[{1}]。
-coyoteAdapter.parsePathParam=无法使用编码[{0}]解析地址参数,url中的该地址参数将被忽略
 
 coyoteConnector.invalidEncoding=编码 [{0}] 不能被 JRE 识别,Connector 将继续使用 [{1}]
 coyoteConnector.invalidPort=连接器不能启动,因为指定的端口 [{0}]无效
@@ -31,9 +30,12 @@ coyoteRequest.chunkedPostTooLarge=由于请求参数数据太大,导致参数
 coyoteRequest.filterAsyncSupportUnknown=无法确定是否有任何过滤器不支持异步处理
 coyoteRequest.gssLifetimeFail=为用户主体 [{0}] 获取剩余生命期失败
 coyoteRequest.noMultipartConfig=由于没有提供multi-part配置,无法处理parts
+coyoteRequest.sendfileNotCanonical=无法确定指定用于sendfile的文件[{0}]的规范名称
+coyoteRequest.sessionEndAccessFail=在回收请求时,异常触发了对会话的结束访问。
 coyoteRequest.setAttribute.namenull=不能在一个空的名字上调用setAttribute
 
 coyoteResponse.encoding.invalid=JRE无法识别编码[{0}]
+coyoteResponse.sendError.ise=响应提交后无法调用sendError()
 coyoteResponse.sendRedirect.note=<html><body><p>重定向到<a href="{0}">{0}</a></p></body></html>
 
 request.asyncNotSupported=当前链的筛选器或servlet不支持异步操作。
diff --git a/java/org/apache/catalina/core/LocalStrings_es.properties b/java/org/apache/catalina/core/LocalStrings_es.properties
index 12d48e6..a2291ae 100644
--- a/java/org/apache/catalina/core/LocalStrings_es.properties
+++ b/java/org/apache/catalina/core/LocalStrings_es.properties
@@ -75,7 +75,6 @@ defaultInstanceManager.invalidInjection=Método inválido para el recurso de ins
 defaultInstanceManager.restrictedContainerServlet=El acceso a la clase [{0}] esta prohibido. Esta es una clase restringida  ( implementa la interface ContainerServlet ). Una applicación web debe ser configurada como privilegiada para ser capaz de cargarla
 defaultInstanceManager.restrictedFiltersResource=No se ha hallado el fichero de propiedades restringidas de filtros
 defaultInstanceManager.restrictedListenersResource=No se ha hallado el fichero de propiedades restringidas de escuchadores
-defaultInstanceManager.restrictedListenersResources=No se ha hallado el fichero de propiedades restringidas de escuchadores
 defaultInstanceManager.restrictedServletsResource=No se ha hallado el fichero de propiedades restringidas de servlets
 
 filterChain.filter=La ejecución del Filtro lanzó una excepción
@@ -122,7 +121,6 @@ standardContext.manager=Configurado un gestor de la clase [{0}]
 standardContext.managerFail=El manejador de sesiones falló al iniciar
 standardContext.namingResource.destroy.fail=No pude destruir recursos de viejo nombre
 standardContext.namingResource.init.fail=No pude inicializar recursos de nuevo nombre
-standardContext.noResourceJar=Los JARs de recurso no están soportados. El JAR hallado en [{0}] no se utilizará para proveer de contenido estático para el contexto con nombre [{1}]
 standardContext.notStarted=Aún no se ha arrancado el Contexto [{0}]
 standardContext.notWrapper=El Hijo de un Contexto debe de ser un Arropador (Wrapper)
 standardContext.parameter.duplicate=Duplicado parámetro de inicialización de contexto [{0}]
@@ -140,7 +138,6 @@ standardContext.servletMap.pattern=<url-pattern> [{0}] inválida en mapeo de ser
 standardContext.startFailed=Falló en arranque del Contexto [{0}] debido a errores previos
 standardContext.startingContext=Excepción arrancando Contexto con nombre [{0}]
 standardContext.stoppingContext=Excepción parando Context [{0}]
-standardContext.unknownCookieEncoding=La codificación desconocida [{0}] fue especificada para setCookieEncoding(String) por lo cual la default UTF-8 será usada en su lugar
 standardContext.urlPattern.patternWarning=AVISO: el patrón URL [{0}] debe de comenzar con ''/'' en Servlet 2.4
 standardContext.workCreateException=No pude determinar directorio absoluto de trabajo a partir del directorio [{0}] y  CATALINA_HOME [{1}] para el contexto [{2}]
 standardContext.workCreateFail=No pude crear el directorio de trabajo [{0}] para el contexto [{1}]
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties b/java/org/apache/catalina/core/LocalStrings_fr.properties
index dd4e98d..b530a22 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -177,7 +177,6 @@ standardContext.manager=Configuré un gestionnaire de la classe [{0}]
 standardContext.managerFail=Echec lors du démarrage du gestionnaire de sessions
 standardContext.namingResource.destroy.fail=Echec de destruction des anciennes ressources JNDI
 standardContext.namingResource.init.fail=Echec d'initialisation des nouvelles ressources JNDI
-standardContext.noResourceJar=Les JARs de ressources ne sont pas supportés, le JAR trouvé à [{0}] ne sera pas utilisé pour fournir des ressources statiques pour le contexte nommé [{1}]
 standardContext.notStarted=Le contexte [{0}] n''a pas encore été démarré
 standardContext.notWrapper=Le fils du contexte (child of context) doit être un enrobeur (wrapper)
 standardContext.parameter.duplicate=Paramètre d''initialisation de contexte dupliqué [{0}]
@@ -204,7 +203,6 @@ standardContext.startingContext=Exception lors du démarrage du contexte [{0}]
 standardContext.stop.asyncWaitInterrupted=Une interruption a été reçue en attendant unloadDelay millisecondes pour permettre aux requêtes asynchrones en cours de se terminer, l'arrêt du contexte va se poursuivre sans délai supplémentaire
 standardContext.stoppingContext=Exception à l''arrêt du Context [{0}]
 standardContext.threadBindingListenerError=Une erreur s''est produite dans l''écouteur de l’''association de thread configuré pour le contexte [{0}]
-standardContext.unknownCookieEncoding=L''encodage inconnu [{0}] a été spécifié pour setCookieEncoding(String) dont le défaut UTF-8 sera utilisé à la place
 standardContext.urlPattern.patternWarning=WARNING: Le modèle (pattern) d''URL [{0}] doit commencer par un ''/'' dans l''API Servlet 2.4
 standardContext.webappClassLoader.missingProperty=Impossible de fixer la propriété [{0}] du chargeur de classes de l''application web à [{1}] car cette propriété n''existe pas
 standardContext.workCreateException=Impossible de déterminer le chemin absolu pour le répertoire de travail à partir du répertoire [{0}] et de CATALINA_HOME [{1}] pour le contexte [{2}]
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties b/java/org/apache/catalina/core/LocalStrings_ja.properties
index c002e4f..5488628 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -174,7 +174,6 @@ standardContext.manager=クラス [{0}] をManagerとして構成しました。
 standardContext.managerFail=セッションマネージャーを開始できません。
 standardContext.namingResource.destroy.fail=以前の名前付きリソースを破棄できませんでした。
 standardContext.namingResource.init.fail=新しいネーミングリソースの初期化に失敗しました。
-standardContext.noResourceJar=リソースJARはサポートされていません。 [{0}]で見つかったJARは、名前[{1}]を持つコンテキストの静的コンテンツを提供するために使用されません。
 standardContext.notStarted=コンテキストはまだ起動されていません
 standardContext.notWrapper=コンテキストの子供はラッパでなければいけません
 standardContext.parameter.duplicate=コンテキスト初期化パラメタ [{0}] が重複しています
@@ -201,7 +200,6 @@ standardContext.startingContext=名前[{0}]のコンテキストを開始する
 standardContext.stop.asyncWaitInterrupted=実行中の非同期要求が完了するのをunloadDelayミリ秒待っている間に割り込みを受信しました。 コンテキスト停止はさらに遅れることなく続行されます。
 standardContext.stoppingContext=ローダを停止中の例外です
 standardContext.threadBindingListenerError=コンテキスト [{0}] に構成されたリスナーを束縛するスレッドで異常が発生しました。
-standardContext.unknownCookieEncoding=setCookieEncoding(String) に不明なエンコーディング [{0}] が指定されたため、代わりに UTF-8 を使用します。
 standardContext.urlPattern.patternWarning=警告: Servlet 2.4ではURLパターン [{0}] は''/''で始まらなければいけません
 standardContext.webappClassLoader.missingProperty=プロパティが存在しないため、Webアプリケーションクラスローダプロパティ[{0}]を[{1}]に設定できません。
 standardContext.workCreateException=コンテキスト[{2}]のディレクトリ[{0}]とCATALINA_HOME [{1}]からの絶対workディレクトリを特定できませんでした
diff --git a/java/org/apache/catalina/core/LocalStrings_ko.properties b/java/org/apache/catalina/core/LocalStrings_ko.properties
index 50a7792..3a4f915 100644
--- a/java/org/apache/catalina/core/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ko.properties
@@ -177,7 +177,6 @@ standardContext.manager=클래스 [{0}]의 매니저 객체를 설정했습니
 standardContext.managerFail=세션 매니저가 시작하지 못했습니다.
 standardContext.namingResource.destroy.fail=이전 Naming 리소스를 소멸시키지 못했습니다.
 standardContext.namingResource.init.fail=새로운 Naming 리소스들을 초기화하지 못했습니다.
-standardContext.noResourceJar=리소스 JAR들은 지원되지 않습니다. [{0}]에서 발견된 JAR는, 이름이 [{1}]인 컨텍스트를 위한 정적 컨텐트를 제공하는 데에 사용되지 않을 것입니다.
 standardContext.notStarted=[{0}](이)라는 이름을 가진 컨텍스트는 아직 시작되지 않았습니다.
 standardContext.notWrapper=컨텍스트의 자식은 반드시 Wrapper여야 합니다.
 standardContext.parameter.duplicate=중복된 컨텍스트 초기화 파라미터: [{0}]
@@ -204,7 +203,6 @@ standardContext.startingContext=이름이 [{0}]인 컨텍스트를 시작하는
 standardContext.stop.asyncWaitInterrupted=처리 중인 비동기 요청이 완료되기를 기다리기 위해 unloadDelay 밀리초를 대기하는 동안 인터럽트를 받았습니다. 더 이상의 지체 없이 컨텍스트 중지 작업을 계속할 것입니다.
 standardContext.stoppingContext=이름이 [{0}]인 컨텍스트를 중지시키는 중 예외 발생
 standardContext.threadBindingListenerError=컨텍스트 [{0}]을(를) 위해 설정된 쓰레드 바인딩 리스너에서 오류가 발생했습니다.
-standardContext.unknownCookieEncoding=알 수 없는 인코딩 [{0}]이(가) setCookieEncoding(String)을 위해 지정되었으므로, 기본 인코딩인 UTF-8이 대신 사용될 것입니다.
 standardContext.urlPattern.patternWarning=경고: Servlet 2.4에서 URL 패턴 [{0}]은(는) 반드시 ''/''로 시작해야 합니다.
 standardContext.webappClassLoader.missingProperty=해당 프로퍼티가 존재하지 않기에, 웹 애플리케이션 클래스로더 프로퍼티 [{0}]을(를) [{1}](으)로 설정할 수 없습니다.
 standardContext.workCreateException=디렉토리 [{0}]와(과) CATALINA_HOME [{1}](으)로부터, 컨텍스트 [{2}]을(를) 위한 작업 디렉토리의 절대 경로를 결정하지 못했습니다.
diff --git a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
index 401d11e..23ce5f1 100644
--- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
@@ -36,14 +36,20 @@ applicationPushBuilder.methodNotToken=HTTP方法必须是令牌(token),但 [{0
 aprListener.aprInitError=基于APR的本地库加载失败.错误报告为[{0}]
 aprListener.initializeFIPSSuccess=成功的进入FIPS 模式
 aprListener.initializingFIPS=初始化FIPS模式...
+aprListener.tcnVersion=安装了基于APR的Apache Tomcat Native库的旧版本[{0}],而Tomcat建议使用[{1}]的最低版本
+aprListener.tooLateForFIPSMode=无法设置FIPSMode:SSL已初始化
 aprListener.tooLateForSSLRandomSeed=无法设置 SSLRandomSeed:SSL已经初始化
 
+asyncContextImpl.requestEnded=AsyncContext关联的请求已经完成处理。
+
+containerBase.backgroundProcess.cluster=异常处理集群[{0}]后台进程
 containerBase.backgroundProcess.unexpectedThreadDeath=后台线程[{0}]意外结束
 containerBase.nullName=容器名称不能为null
 containerBase.threadedStartFailed=子容器启动失败
 
 defaultInstanceManager.invalidInjection=方法资源注入注解无效
 defaultInstanceManager.restrictedContainerServlet=禁止访问类 [{0}]。 它是一个受限制的类(实现了 ContainerServlet 接口)。 必须将 Web 应用程序配置为特权才能加载它
+defaultInstanceManager.restrictedFiltersResource=找不到受限制的过滤器属性文件[{0}]
 defaultInstanceManager.restrictedListenersResource=无法找到RestrictedListener的配置文件[{0}]
 
 filterChain.filter=Filter 执行抛出一个异常
@@ -60,6 +66,7 @@ standardContext.backgroundProcess.resources=异常处理资源[{0}] 后台进程
 standardContext.cookieProcessor.null=不允许将上下文的CookieProcessor 设置为null
 standardContext.errorPage.required=ErrorPage不能为null
 standardContext.errorPage.warning=警告:在Servlet 2.4中,错误页位置 [{0}] 必须以"/"开头
+standardContext.extensionValidationError=尝试校验必需的应用程序扩展时发生错误
 standardContext.filterMap.either=过滤器映射必须指定 <url-pattern> 或 <servlet-name>
 standardContext.filterMap.name=Filter mapping 指定了一个未知的 filter名称 [{0}]
 standardContext.filterMap.pattern=过滤器映射中的<url-pattern> [{0}] 无效
@@ -73,7 +80,7 @@ standardContext.loginConfig.loginPage=表单登录页面 [{0}] 必须以''/''开
 standardContext.manager=配置类为[{0}]的管理器
 standardContext.managerFail=会话管理器无法启动
 standardContext.namingResource.init.fail=未能初始化新的命名资源
-standardContext.notStarted=名为[{0}]的上下文还没有被启动
+standardContext.notStarted=名称为[{0}]的上下文还没有启动
 standardContext.parameter.duplicate=重复的上下文初始化参数[{0}]
 standardContext.predestroy.duplicate=类 [{0}] 的 @PreDestroy 方法定义重复
 standardContext.resourcesInit=初始化静态变量错误
@@ -85,7 +92,6 @@ standardContext.servletFail=启动时无法加载一个或多个Servlet。 全
 standardContext.startingContext=启动Context[{0}]出现异常
 standardContext.stop.asyncWaitInterrupted=等待卸载延迟毫秒以完成飞行中的异步请求时收到中断。上下文停止将继续,不会有进一步的延迟。
 standardContext.stoppingContext=异常停止的上下文使用名为[{0}]
-standardContext.unknownCookieEncoding=为setCookieEncoding(String)指定了未知编码[{0}],因此将使用默认的UTF-8。
 standardContext.workCreateFail=无法为上下文[{1}]创建工作目录[{0}]
 
 standardContextValve.acknowledgeException=以100(继续)响应确认请求失败
diff --git a/java/org/apache/catalina/deploy/LocalStrings_zh_CN.properties b/java/org/apache/catalina/deploy/LocalStrings_zh_CN.properties
index 471ab8b..93eee7a 100644
--- a/java/org/apache/catalina/deploy/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/deploy/LocalStrings_zh_CN.properties
@@ -14,6 +14,7 @@
 # limitations under the License.
 
 namingResources.cleanupCloseSecurity=无法检索容器[{2}]中的资源[{1}]的方法[{0}],因此没有对该资源进行清理
+namingResources.cleanupNoClose=容器[{1}]中的资源[{0}]没有[{2}]方法,因此没有对该资源执行清理
 namingResources.ejbLookupLink=EJB的引用[{0}]同时指定了ejb-link和lookup-name
 namingResources.envEntryLookupValue=环境参数 [{0}] 指定查询名称和值
 namingResources.mbeanDestroyFail=失败的销毁命名资源[{0}]为MBean
diff --git a/java/org/apache/catalina/filters/LocalStrings_fr.properties b/java/org/apache/catalina/filters/LocalStrings_fr.properties
index e2bfee6..11cdc1e 100644
--- a/java/org/apache/catalina/filters/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/filters/LocalStrings_fr.properties
@@ -55,6 +55,8 @@ httpHeaderSecurityFilter.committed=Impossible d'ajouter les en-têtes HTTP car l
 remoteCidrFilter.invalid=Une configuration invalide a été fournie pour [{0}], voir les précédents messages pour les détails
 remoteCidrFilter.noRemoteIp=Le client n'a pas d'adresse IP.  Requête rejetée.
 
+remoteIpFilter.invalidHostHeader=La valeur invalide [{0}] a été trouvée pour le Host dans l''en-tête HTTP [{1}]
+remoteIpFilter.invalidHostWithPort=La valeur de Host [{0}] dans l''en-tête HTTP [{1}] contenait un numéro de port qui sera ingnoré
 remoteIpFilter.invalidNumber=Nombre invalide pour le paramètre [{0}]: [{1}]
 
 requestFilter.deny=Requête refusée pour [{0}] basée sur la propriété [{1}]
diff --git a/java/org/apache/catalina/filters/LocalStrings_ko.properties b/java/org/apache/catalina/filters/LocalStrings_ko.properties
index 859c7c1..bf28787 100644
--- a/java/org/apache/catalina/filters/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/filters/LocalStrings_ko.properties
@@ -55,6 +55,8 @@ httpHeaderSecurityFilter.committed=HttpHeaderSecurityFilter에 진입할 때에,
 remoteCidrFilter.invalid=[{0}]을(를) 위해, 유효하지 않은 설정이 제공되었습니다. 상세 정보는 이전 메시지들을 확인하십시오.
 remoteCidrFilter.noRemoteIp=클라이언트가 IP 주소를 가지고 있지 않습니다. 요청이 거절되었습니다.
 
+remoteIpFilter.invalidHostHeader=HTTP 헤더 [{1}] 내에 유효하지 않은 값이 발견되었습니다: [{0}]
+remoteIpFilter.invalidHostWithPort=HTTP 헤더 [{1}] 내의 호스트 값 [{0}]이(가) 포트 번호를 포함하고 있는데, 이는 무시될 것입니다.
 remoteIpFilter.invalidNumber=파라미터 [{0}]을(를) 위해 불허되는 숫자입니다: [{1}]
 
 requestFilter.deny=프로퍼티 [{1}]에 기반하여, [{0}]을(를) 위한 요청이 거부되었습니다.
diff --git a/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties b/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
index 13bd995..be687e8 100644
--- a/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
@@ -20,6 +20,7 @@ corsFilter.onlyHttp=CORS不支持非HTTP请求或响应
 
 csrfPrevention.invalidRandomClass=不能使用class [{0}]创建随机源.
 
+expiresFilter.noExpirationConfigured=请求[{0}],其响应状态为[{1}]内容类型[{2}],未配置到期日期
 expiresFilter.noExpirationConfiguredForContentType=没有为 content-type [{0}] 找到过期配置
 expiresFilter.startingPointInvalid=在指令[{1}]中无效的起点(访问|现在|修改|a<秒>|m<秒>)[{0}]
 expiresFilter.unsupportedStartingPoint=不支持的起始点 [{0}]
diff --git a/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties b/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
index e26c113..3fb38bd 100644
--- a/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
@@ -17,10 +17,12 @@ farmWarDeployer.hostOnly=FarmWarDeployer 只有做为 host cluster 的子元素
 farmWarDeployer.modInstall=从 [{1}] 安装 webapp [{0}]
 farmWarDeployer.modInstallFail=无法安装 WAR 文件
 farmWarDeployer.msgIoe=无法读取服务器场部署文件消息。
+farmWarDeployer.msgRxDeploy=接收集群部署路径[{0}],战争[{1}]
 farmWarDeployer.msgRxUndeploy=从路径[{0}]接收未部署群集
 farmWarDeployer.removeFailLocal=从[{0}]本地移除失败
 farmWarDeployer.removeFailRemote=本地从[{0}]删除失败,其他经理有app在服务!
 farmWarDeployer.removeLocalFail=无法移除WAR文件
+farmWarDeployer.sendFragment=将群集战争片段路径[{0}],战争[{1}]发送到[{2}]
 farmWarDeployer.servicingUndeploy=正在处理应用程序[{0}],无法从备份群集节点中删除它
 farmWarDeployer.undeployEnd=从[{0}]取消部署完成。
 farmWarDeployer.undeployLocal=不能部署本地上下文[{0}]
diff --git a/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties b/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties
index 4b3fe53..0c63eb3 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties
@@ -22,12 +22,14 @@ deltaManager.createSession.newSession=用id[{0}]创建一个扩展会话(DeltaSe
 deltaManager.foundMasterMember=复制主master 成员在上下文中被发现.\n
 deltaManager.loading.cnfe=加载持久化会话 [{0}] 时出现ClassNotFoundException
 deltaManager.loading.ioe=加载持久 session 时出现 IOException:[{0}]
+deltaManager.noContextManager=管理器[{0}]:回复[{1}]发送的“获取所有会话数据”消息,在[{2}] ms后收到“无匹配的上下文管理器”消息
 deltaManager.noSessionState=管理者[{0}]:没有收到[{1}]发送的会话状态,在[{2}]毫秒之后超时。
 deltaManager.receiveMessage.allSessionDataAfter=Manager [{0}]: session 状态反序列化
 deltaManager.receiveMessage.allSessionDataBegin=管理者[{0}]:接收到所有会话数据状态
 deltaManager.receiveMessage.delta.unknown=管理器[{0}]:未知会话的接收会话增量[{1}]
 deltaManager.receiveMessage.expired=管理器[{0}]: 接收到的会话 [{1}] 已过期。
 deltaManager.receiveMessage.unloadingBegin=管理器[{0}]: 开始卸载会话
+deltaManager.registerCluster=将管理器[{0}]注册到名为[{2}]的集群元素[{1}]
 deltaManager.sendMessage.newSession=\ 管理器 [{0}] 发送新的会话 [{1}]
 deltaManager.unableSerializeSessionID=无法序列化会话ID [{0}]
 deltaManager.unloading.ioe=当保存永久回话:[{0}] 时,抛出 IOException
@@ -39,4 +41,5 @@ deltaRequest.wrongPrincipalClass=ClusterManager仅支持GenericPrincipal。 你
 deltaSession.writeSession=writeObject()存储会话[{0}]
 
 jvmRoute.changeSession=会话从[{0}]切换到[{1}]
+jvmRoute.missingJvmRouteAttribute=没有配置引擎jvmRoute属性!
 jvmRoute.notFoundManager=没有在 [{0}] 找到Cluster Manager
diff --git a/java/org/apache/catalina/ha/tcp/LocalStrings_zh_CN.properties b/java/org/apache/catalina/ha/tcp/LocalStrings_zh_CN.properties
index 1e06d3e..3b38ffd 100644
--- a/java/org/apache/catalina/ha/tcp/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/ha/tcp/LocalStrings_zh_CN.properties
@@ -15,6 +15,7 @@
 
 ReplicationValve.filter.failure=无法编译 filter = [{0}]
 ReplicationValve.session.found=上下文[{0}]:找到会话[{1}]但它不是ClusterSession。
+ReplicationValve.session.invalid=上下文[{0}]:请求的会话[{1}]在此节点上无效,已删除或未复制。
 
 simpleTcpCluster.clustermanager.notImplement=连接器 [{0}] 不能继承 ClusterManager,除非集群被停止。
 simpleTcpCluster.member.addFailed=无法连接到复制系统。
diff --git a/java/org/apache/catalina/loader/LocalStrings_de.properties b/java/org/apache/catalina/loader/LocalStrings_de.properties
index ef2aa92..a5cbe64 100644
--- a/java/org/apache/catalina/loader/LocalStrings_de.properties
+++ b/java/org/apache/catalina/loader/LocalStrings_de.properties
@@ -16,4 +16,3 @@
 webappClassLoader.checkThreadLocalsForLeaks.unknown=Unbekannt
 webappClassLoader.readError=Fehler beim Lesen einer Ressource: Konnte [{0}] nicht laden
 webappClassLoader.superCloseFail=Fehler beim Aufruf von close() auf der Super-Klasse
-webappClassLoader.validationErrorJarPath=Kann JAR-Eintrag mit Namen [{0}] nicht validieren
diff --git a/java/org/apache/catalina/loader/LocalStrings_es.properties b/java/org/apache/catalina/loader/LocalStrings_es.properties
index de0c736..db9f329 100644
--- a/java/org/apache/catalina/loader/LocalStrings_es.properties
+++ b/java/org/apache/catalina/loader/LocalStrings_es.properties
@@ -21,11 +21,8 @@ webappClassLoader.checkThreadLocalsForLeaksFail=No pude revisar las referencias
 webappClassLoader.checkThreadLocalsForLeaksNull=La aplicación web [{0}] creó un ThreadLocal con clave del tipo [{1}] (valor [{2}]). El Threadlocal ha sido puesto correctamente a nulo y la clave será qutada por el GC.
 webappClassLoader.checkThreadsHttpClient=Hallado hilo keep-alive de HttpClient usando cargador de clase de aplicación web. Fijado por el hilo de conmutación al cargador de la clase padre.
 webappClassLoader.clearJdbc=La aplicación web [{0}] registró el conductor JDBC [{1}] pero falló al anular el registro mientras la aplicación web estaba parada. Para prevenir un fallo de memoria, se ha anulado el registro del conductor JDBC por la fuerza.
-webappClassLoader.clearReferencesResourceBundlesCount=Quitadas las referencias del Resourcebundle  [{0}] desde la caché para la aplicación web [{1}]
-webappClassLoader.clearReferencesResourceBundlesFail=No puede limpiar las referencisa de ResourceBundle para la aplicación web [{0}]
 webappClassLoader.clearRmiFail=No pude limpiar el cargador del contexto de clase referenciado desde sun.rmi.transport.Target para la aplicación web [{0}]
 webappClassLoader.clearRmiInfo=No pude hallar la clase sun.rmi.transport.Target para limpiar el cargador de contexto de clase para la aplicación web [{0}]. Esto es lo esperado em máquinas que no son de Sun.
-webappClassLoader.illegalJarPath=Detectada entrada ilegal de JAR con nombre [{0}]
 webappClassLoader.jarsRemoved=Uno o más JARs han sido eliminados de la aplicación web [{0}]\n
 webappClassLoader.jdbcRemoveFailed=Ha fallado el desregistro del conductor JDBC para la aplicación web [{0}]
 webappClassLoader.readError=Error de lectura de recurso: No pude cargar [{0}].
@@ -33,15 +30,10 @@ webappClassLoader.stopThreadFail=No pude terminar el hilo con nombre [{0}] para
 webappClassLoader.stopTimerThreadFail=No pude terminar TimerThread con nombre [{0}] para la aplicación web [{1}]
 webappClassLoader.stopped=Acceso ilegal: esta instancia de aplicación web ya ha sido parada.  Could not load [{0}].  La eventual traza de pila que sigue ha sido motivada por un error lanzado con motivos de depuración así como para intentar terminar el hilo que motivó el acceso ilegal y no tiene impacto funcional.
 webappClassLoader.superCloseFail=Fallo a llamar close() en la clase super
-webappClassLoader.validationErrorJarPath=no pude validar entrada JAR con nombre [{0}]
 webappClassLoader.warnTimerThread=La aplicación web [{0}] parece haber arrancado un TimerThread con nombre [{1}] vía de la API java.util.Timer, pero no ha podido pararlo. Para prevenir un fallo de memoria, el cronómetro (y el hilo asociado) hasido cancelado a la fuerza.
 webappClassLoader.wrongVersion=(no puedo cargar clase [{0}])
 
-webappLoader.classDeploy=Despliegue de archivos de clase [{0}] en [{1}]
-webappLoader.copyFailure=No pude copiar los recursos
 webappLoader.deploy=Desplegando repositorios de clase en directorio de trabajo [{0}]
-webappLoader.jarDeploy=Despliegue del JAR [{0}] en [{1}]
-webappLoader.mkdirFailure=No pude crear directorio de destino para copiar los recursos
 webappLoader.reloadable=No puedo poner la propiedad recargable a [{0}]
 webappLoader.setContext.ise=No esta permitido fijar el Contexto mientras el cargador esta iniciado.\n
 webappLoader.starting=Arrancando este Cargador
diff --git a/java/org/apache/catalina/loader/LocalStrings_fr.properties b/java/org/apache/catalina/loader/LocalStrings_fr.properties
index 7cba29f..bc90876 100644
--- a/java/org/apache/catalina/loader/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/loader/LocalStrings_fr.properties
@@ -30,13 +30,10 @@ webappClassLoader.checkThreadLocalsForLeaksNull=L''application web [{0}] a crée
 webappClassLoader.checkThreadsHttpClient=Trouvé une thread utilisé par HttpClient pour maintenir les connections actives, corrigé en associant le thread avec le chargeur de classe parent
 webappClassLoader.clearJdbc=L''application web [{0}] a enregistré un pilote JDBC [{1}], mais ne l''a pas désenregistré avant l''arrêt de l''application.  Pour éviter une fuite de mémoire, le pilote JDBC a été désenregistré de force.
 webappClassLoader.clearObjectStreamClassCachesFail=Impossible d''effacer les références faibles de ObjectStreamClass$Caches pour l''application web [{0}]
-webappClassLoader.clearReferencesResourceBundlesCount=[{0}] références à un bundle de ressources (ResourceBundle) ont été retirées du cache de l''application web [{1}].
-webappClassLoader.clearReferencesResourceBundlesFail=Echec du nettoyage des références de ResourceBundle pour l''application web [{0}]
 webappClassLoader.clearRmi=Trouvé une cible RMI avec une classe squelette de classe [{0}] et une valeur [{1}], celle ci a été enlevée de force pour prévenir ue fuite de mémoir
 webappClassLoader.clearRmiFail=Impossible d''effacer le chargeur de classes de contexte référencé depuis sun.rmi.transport.Target pour l''application web [{0}]
 webappClassLoader.clearRmiInfo=Impossible de trouver la classe sun.rmi.transport.Target pour nettoyer le chargeur de classes du contexte pour l''application web [{0}], c''est normal pour les JVMs non Oracle
 webappClassLoader.getThreadGroupError=Impossible d''obtenir le parent pour le ThreadGroup [{0}], il ne sera pas possible de vérifier tous les threads pour des fuites de mémoire
-webappClassLoader.illegalJarPath=Une entrée invalide du JAR a été détectée avec le nom [{0}]
 webappClassLoader.jarsAdded=Un ou plusieurs JARs ont été ajoutés à l''application web [{0}]
 webappClassLoader.jarsModified=Un ou plusieurs JARs ont été modifiés dans l''application web [{0}]
 webappClassLoader.jarsRemoved=Un ou plusieurs JARs ont été enlevés de l''application web [{0}]
@@ -53,18 +50,12 @@ webappClassLoader.stopTimerThreadFail=Echec de l''arrêt du TimerThread nommé [
 webappClassLoader.stopped=Impossible de charger [{0}], ce chargeur de classes a déjà été arrêté
 webappClassLoader.superCloseFail=Echec lors de l'appel de close() dans la superclasse
 webappClassLoader.transformError=Erreur d''instrumentation: impossible de transformer la classe [{0}] parce que son format est illégal
-webappClassLoader.validationErrorJarPath=Incapable de valider l''entrée de JAR de nom [{0}]
 webappClassLoader.warnTimerThread=L''application [{0}] semble avoir démarré un TimerThread nommé [{1}] en utilisant java.util.Timer mais ne l''a pas stoppé, le timer ainsi que le thread associé ont été arrêtés pour éviter une fuite de mémoire
 webappClassLoader.wrongVersion=(impossible de charger la classe [{0}])
 
 webappClassLoaderParallel.registrationFailed=L'enregistrement de org.apache.catalina.loader.ParallelWebappClassLoader comme pouvant charger des classes en parallèle a échoué
 
-webappLoader.classDeploy=Déploiement des fichiers classes [{0}] vers [{1}]
-webappLoader.copyFailure=Echec lors de la copie des ressources
 webappLoader.deploy=Déploiement des classes des réceptacles (class repositories) vers le répertoire de travail [{0}]
-webappLoader.jarDeploy=Déploiement du JAR [{0}] vers [{1}]
-webappLoader.mkdirFailure=Impossible de créer le répertoire de destination pour copier les ressources
-webappLoader.readFailure=Impossible de lire la ressource [{0}]
 webappLoader.reloadable=Impossible de mettre la propriété rechargeable à [{0}]
 webappLoader.setContext.ise=Il est interdit de définir le Context lorsque le chargeur de classes a déjà été démarré
 webappLoader.starting=Démarrage de ce chargeur (loader)
diff --git a/java/org/apache/catalina/loader/LocalStrings_ja.properties b/java/org/apache/catalina/loader/LocalStrings_ja.properties
index b6066a2..1f26d0e 100644
--- a/java/org/apache/catalina/loader/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/loader/LocalStrings_ja.properties
@@ -30,13 +30,10 @@ webappClassLoader.checkThreadLocalsForLeaksNull=Webアプリケーション[{0}]
 webappClassLoader.checkThreadsHttpClient=Webアプリケーションクラスローダーを使用しているHttpClientキープアライブスレッドを検出しました。 スレッドを親クラスローダに切り替えることで修正されました。
 webappClassLoader.clearJdbc=Web アプリケーション [{0}] は自身で登録した JDBC ドライバー [{1}] を停止時に解除できませんでした。メモリーリークの発生を防ぐには JDBC ドライバーを強制的に解除してください。
 webappClassLoader.clearObjectStreamClassCachesFail=Web アプリケーション [{0}] の ObjectStreamClass$Caches についてソフト参照を除去できません。
-webappClassLoader.clearReferencesResourceBundlesCount=削除したリソースバンドル [{0}] を Web アプリケーション [{1}] がキャッシュから参照しています。
-webappClassLoader.clearReferencesResourceBundlesFail=Web アプリケーション [{0}] はリソースバンドルの参照を解放できません。
 webappClassLoader.clearRmi=クラス [{0}] 値 [{1}] のスタブクラスを持つ RMI ターゲットを発見しました。メモリーリークを防ぐため発見した RMI ターゲットは強制的に削除します。
 webappClassLoader.clearRmiFail=Webアプリケーション[{0}]のsun.rmi.transport.Targetから参照されるコンテキストクラスローダーのクリアに失敗しました。
 webappClassLoader.clearRmiInfo=Web アプリケーション [{0}] のコンテキストクラスローダーをきれいにするための sun.rmi.transport.Target クラスが見つかりません。Sun 以外の JVM で実行している可能性があります。
 webappClassLoader.getThreadGroupError=スレッドグループ [{0}] の親スレッドグループを取得できません。潜在的なメモリリークをすべてのスレッドでチェックすることはできません。
-webappClassLoader.illegalJarPath=不正なJARエントリが名前[{0}]で検出されました
 webappClassLoader.jarsAdded=1つ以上のJARがWebアプリケーション[{0}]に追加されました。
 webappClassLoader.jarsModified=1つ以上のJARがWebアプリケーション[{0}]で変更されました。
 webappClassLoader.jarsRemoved=Web アプリケーション [{0}] から 1 つ以上の JAR が削除されました。
@@ -53,18 +50,12 @@ webappClassLoader.stopTimerThreadFail=Webアプリケーション[{1}]の[{0}]
 webappClassLoader.stopped=不正なアクセス: このWebアプリケーションのインスタンスは既に停止されています  Could not load [{0}]. 不正なアクセスを引き起こしたスレッドを終了させ、投げられたエラーによりデバッグ用に次のスタックトレースが生成されましたが,機能に影響はありません
 webappClassLoader.superCloseFail=基底クラスで close() の呼び出しに失敗しました。
 webappClassLoader.transformError=計測エラー:クラスファイル形式が正当でないため、クラス[{0}]を変換できませんでした。
-webappClassLoader.validationErrorJarPath=名前[{0}]のJARエントリを検証できません
 webappClassLoader.warnTimerThread=Web アプリケーション [{0}] が java.util.Timer API で開始した TimerThread [{1}] を停止できません。メモリーリークを防ぐにはタイマー(関連付けられたスレッドも)を強制的にキャンセルしてください。
 webappClassLoader.wrongVersion=(クラス[{0}]をロードできません)
 
 webappClassLoaderParallel.registrationFailed=並列にクラスをロードできるorg.apache.catalina.loader.ParallelWebappClassLoaderの登録に失敗しました。
 
-webappLoader.classDeploy=クラスファイル [{0}] を [{1}] に配備します
-webappLoader.copyFailure=リソースをコピーできません。
 webappLoader.deploy=クラスリポジトリを作業ディレクトリ [{0}] に配備します
-webappLoader.jarDeploy=JAR [{0}] を [{1}] に配備します
-webappLoader.mkdirFailure=リソースをコピーする宛先ディレクトリを作成できません。
-webappLoader.readFailure=リソース[{0}]を読み取ることができません
 webappLoader.reloadable=reloadableプロパティを [{0}] に設定できません
 webappLoader.setContext.ise=クラスローダーが開始したあとは Context を構成することはできません。
 webappLoader.starting=このローダを起動します
diff --git a/java/org/apache/catalina/loader/LocalStrings_ko.properties b/java/org/apache/catalina/loader/LocalStrings_ko.properties
index 6c1a0f3..adb2b26 100644
--- a/java/org/apache/catalina/loader/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/loader/LocalStrings_ko.properties
@@ -30,13 +30,10 @@ webappClassLoader.checkThreadLocalsForLeaksNull=웹 애플리케이션 [{0}]이(
 webappClassLoader.checkThreadsHttpClient=웹 애플리케이션 클래스로더를 사용하는 HttpClient keep-alive 쓰레드를 발견했습니다. 쓰레드의 클래스로더를 부모 클래스로더로 전환시켰습니다.
 webappClassLoader.clearJdbc=웹 애플리케이션 [{0}]이(가) JDBC 드라이버 [{1}]을(를) 등록했지만, 웹 애플리케이션이 중지될 때, 해당 JDBC 드라이버의 등록을 제거하지 못했습니다. 메모리 누수를 방지하기 위하여, 등록을 강제로 제거했습니다.
 webappClassLoader.clearObjectStreamClassCachesFail=웹 애플리케이션 [{0}]을(를) 위해, ObjectStreamClass$Caches로부터 soft references를 폐기하지 못했습니다.
-webappClassLoader.clearReferencesResourceBundlesCount=웹 애플리케이션 [{1}]을(를) 위한 캐시로부터, ResourceBundle [{0}]에 대한 참조들을 제거했습니다.
-webappClassLoader.clearReferencesResourceBundlesFail=웹 애플리케이션 [{0}]을(를) 위한 ResourceBundle 참조들을 폐기하지 못했습니다.
 webappClassLoader.clearRmi=스텁 클래스 [{0}]와(과) 값 [{1}]을(를) 가진 RMI Target을 발견했습니다. 이 RMI Target은 메모리 누수를 방지하기 위하여 강제로 제거되었습니다.
 webappClassLoader.clearRmiFail=sun.rmi.transport.Target으로부터 참조된 컨텍스트 클래스로더를, 웹 애플리케이션 [{0}]을(를) 위해, 폐기하지 못했습니다.
 webappClassLoader.clearRmiInfo=웹 애플리케이션 [{0}]을(를) 위한 컨텍스트 클래스로더를 폐기하기 위한, 클래스 sun.rmi.transport.Target을 찾지 못했습니다. 이는 Sun JVM들이 아닌 환경에서 발생할 수 있습니다.
 webappClassLoader.getThreadGroupError=ThreadGroup [{0}]의 부모 ThreadGroup을 얻을 수 없습니다. 잠재적인 메모리 누수 문제를 찾기 위해 모든 쓰레드들을 점검하는 것이 불가능합니다.
-webappClassLoader.illegalJarPath=[{0}](이)라는 이름을 가진, 불허되는 JAR 엔트리가 탐지되었습니다.
 webappClassLoader.jarsAdded=하나 이상의 JAR들이 웹 애플리케이션 [{0}]에 추가됐습니다.
 webappClassLoader.jarsModified=웹 애플리케이션 [{0}]에서 하나 이상의 JAR 파일(들)이 변경되었습니다.
 webappClassLoader.jarsRemoved=하나 이상의 JAR들이 웹 애플리케이션 [{0}](으)로부터 제거되었습니다.
@@ -53,18 +50,12 @@ webappClassLoader.stopTimerThreadFail=웹 애플리케이션 [{1}]을(를) 위
 webappClassLoader.stopped=불허되는 접근: 이 웹 애플리케이션 인스턴스는 이미 중지되었습니다. [{0}]을(를) 로드할 수 없습니다. 디버그 목적 및 불허되는 접근을 발생시킨 해당 쓰레드를 종료시키기 위한 시도로서, 다음 스택 트레이스가 생성됩니다.
 webappClassLoader.superCloseFail=부모 클래스의 close() 호출 시 실패 발생
 webappClassLoader.transformError=Instrumentation 오류: 클래스 파일 포맷이 규약을 따르지 않기 때문에, 클래스 [{0}]을(를) 변환시킬 수 없었습니다.
-webappClassLoader.validationErrorJarPath=[{0}](이)라는 이름의 엔트리를 JAR 파일 내에서 찾을 수 없습니다.
 webappClassLoader.warnTimerThread=웹 애플리케이션 [{0}]이(가) java.util.Timer API를 통해 [{1}](이)라는 이름을 가진 TimerThread를 시작한 것으로 보이지만, 그 쓰레드를 중지시키지 못했습니다. 메모리 누수를 방지하기 위해, 타이머가 (연관된 쓰레드와 함께) 강제로 취소되었습니다.
 webappClassLoader.wrongVersion=(클래스 [{0}]을(를) 로드할 수 없습니다)
 
 webappClassLoaderParallel.registrationFailed=org.apache.catalina.loader.ParallelWebappClassLoader를 병렬 클래스 로딩이 가능하게 등록하려 했지만 실패했습니다.
 
-webappLoader.classDeploy=클래스 파일들 [{0}]을(를) [{1}](으)로 배치합니다.
-webappLoader.copyFailure=리소스들을 복사하지 못했습니다.
 webappLoader.deploy=작업 디렉토리 [{0}]에 클래스 레파지토리들을 배치합니다.
-webappLoader.jarDeploy=JAR [{0}]을(를) [{1}]에 배치합니다.
-webappLoader.mkdirFailure=리소스들을 복사할 대상 디렉토리를 생성하지 못했습니다.
-webappLoader.readFailure=리소스 [{0}]을(를) 읽을 수 없습니다.
 webappLoader.reloadable=reloadable 프로퍼티를 [{0}](으)로 설정할 수 없습니다.
 webappLoader.setContext.ise=웹 애플리케이션 로더가 시작되고 있는 동안, 컨텍스트를 설정하는 것은 허용되지 않습니다.
 webappLoader.starting=이 로더를 시작합니다.
diff --git a/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties b/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
index 9140be0..f6cff43 100644
--- a/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
@@ -18,15 +18,11 @@ webappClassLoader.checkThreadLocalsForLeaks.badValue=无法确定类型为 [{0}]
 webappClassLoader.checkThreadLocalsForLeaks.unknown=:)未知
 webappClassLoader.checkThreadLocalsForLeaksNone=web应用程序 [{0}] 创建了1个ThreadLocal变量(键:[{2}] (类型[{1}]) ,值:[{4}](类型[{3}]) )。键仅被ThreadLocal Map弱引用,所以不是内存泄露。
 webappClassLoader.clearJdbc=Web应用程序 [{0}] 注册了JDBC驱动程序 [{1}],但在Web应用程序停止时无法注销它。 为防止内存泄漏,JDBC驱动程序已被强制取消注册。
-webappClassLoader.clearReferencesResourceBundlesCount=从Web应用[{1}]的缓存中删除了[{0}] ResourceBundle引用
-webappClassLoader.clearReferencesResourceBundlesFail=无法清除Web应用程序 [{0}] 的ResourceBundle引用
 webappClassLoader.jarsRemoved=一个或多个 JAR 已被从 Web 应用程序 [{0}] 中删除
 webappClassLoader.jdbcRemoveFailed=Web应用程序 [{0}] 的JDBC驱动程序注销失败
 webappClassLoader.readError=资源读取错误:不能加载 [{0}].
 webappClassLoader.superCloseFail=调用父类的close()方法出现异常。
-webappClassLoader.validationErrorJarPath=无法验证名称为 [{0}] 的 JAR 条目
+webappClassLoader.warnTimerThread=Web应用程序[{0}]似乎已通过java.util.Timer API启动了名为[{1}]的TimerThread,但未能将其停止。 为防止内存泄漏,计时器(以及相关联的线程)已被强制取消。
 webappClassLoader.wrongVersion=(无法载入的.类 [{0}])
 
-webappLoader.copyFailure=无法复制资源
-webappLoader.mkdirFailure=无法创建目标目录以复制资源
 webappLoader.setContext.ise=当加载器启动的时候设置上下文是不被允许的
diff --git a/java/org/apache/catalina/manager/LocalStrings_fr.properties b/java/org/apache/catalina/manager/LocalStrings_fr.properties
index a164d9d..03ce4d1 100644
--- a/java/org/apache/catalina/manager/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_fr.properties
@@ -165,7 +165,6 @@ managerServlet.sslReloadFail=ECHEC - Echec lors du rechargement de la configurat
 managerServlet.startFailed=ECHEC - L''application pour le chemin de contexte [{0}] n''a pas pu être démarrée
 managerServlet.started=OK - Application démarrée pour le chemin de contexte [{0}]
 managerServlet.stopped=OK - Application arrêtée pour le chemin de contexte [{0}]
-managerServlet.storeConfig.invalidMBean=ECHEC - Le mbean de StoreConfig n''a pas pu être trouvé, [{0}] n''est pas un nom valide
 managerServlet.storeConfig.noMBean=ECHEC - Pas de mbean StoreConfig enregistré à [{0}], l''enregistrement est effectué par StoreConfigLifecycleListener
 managerServlet.threaddump=OK - Etat des threads de la JVM
 managerServlet.trustedCertsNotConfigured=Aucun certificat de confiance n'est configuré pour cet hôte virtuel
diff --git a/java/org/apache/catalina/manager/LocalStrings_ja.properties b/java/org/apache/catalina/manager/LocalStrings_ja.properties
index 0563ad6..8007ddf 100644
--- a/java/org/apache/catalina/manager/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_ja.properties
@@ -167,7 +167,6 @@ managerServlet.sslReloadFail=FAIL  -  TLS設定を再ロードできませんで
 managerServlet.startFailed=FAIL - コンテキストパス [{0}] のアプリケーションが起動できません
 managerServlet.started=OK - コンテキストパス [{0}] でアプリケーションを起動しました
 managerServlet.stopped=OK - コンテキストパス [{0}] でアプリケーションを停止しました
-managerServlet.storeConfig.invalidMBean=FAIL - StoreConfig Mbean がありません。[{3}] は不正な Mbean 名です。
 managerServlet.storeConfig.noMBean=FAIL - [{0}] に StoreConfig Mbean が登録されていません。一般的には StoreConfigLifecycleListener が登録します。
 managerServlet.threaddump=OK - JVMスレッドダンプ
 managerServlet.trustedCertsNotConfigured=この仮想ホストには信頼できる証明書が構成されていません。
diff --git a/java/org/apache/catalina/manager/LocalStrings_ko.properties b/java/org/apache/catalina/manager/LocalStrings_ko.properties
index 1167620..9d34ac1 100644
--- a/java/org/apache/catalina/manager/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_ko.properties
@@ -165,7 +165,6 @@ managerServlet.sslReloadFail=실패 - TLS 설정을 다시 로드하지 못했
 managerServlet.startFailed=실패 - 컨텍스트 경로 [{0}]의 애플리케이션이 시작될 수 없었습니다.
 managerServlet.started=OK - 컨텍스트 경로 [{0}]의 애플리케이션이 시작되었습니다.
 managerServlet.stopped=OK - 컨텍스트 경로 [{0}]의 애플리케이션을 중지시켰습니다.
-managerServlet.storeConfig.invalidMBean=실패 - StoreConfig Mbean을 찾을 수 없습니다. [{0}]은(는) MBean을 위한 유효한 이름이 아닙니다.
 managerServlet.storeConfig.noMBean=실패 - [{0}]에서 등록된 StoreConfig MBean이 없습니다. 보통 StoreConfigLifecycleListener에 의해 등록이 수행됩니다.
 managerServlet.threaddump=OK - JVM 쓰레드 덤프
 managerServlet.trustedCertsNotConfigured=이 가상 호스트를 위한 신뢰되는 인증서들이 설정되어 있지 않습니다.
diff --git a/java/org/apache/catalina/manager/LocalStrings_ru.properties b/java/org/apache/catalina/manager/LocalStrings_ru.properties
index f742471..4f0ab23 100644
--- a/java/org/apache/catalina/manager/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_ru.properties
@@ -60,7 +60,6 @@ htmlManagerServlet.deployUploadInServerXml=ОШИБКА - War файл [{0}] н
 htmlManagerServlet.deployUploadNoFile=ОШИБКА - Ошибка при загрузке файла. Файла нет
 htmlManagerServlet.deployUploadNotWar=ОШИБКА - Загружаемый файл должен быть с расширением .war
 htmlManagerServlet.deployUploadWarExists=ОШИБКА - War файл [{0}] уже существует на сервере
-htmlManagerServlet.deployVersion=Версия (при параллельном развёртывании):
 htmlManagerServlet.deployWar=WAR или путь до директории:
 htmlManagerServlet.diagnosticsLeak=Проверяет, произошла ли утечка памяти после остановки, перезагрузки или удаления веб-приложений
 htmlManagerServlet.diagnosticsLeakButton=Найти утечки памяти
@@ -142,7 +141,6 @@ managerServlet.notSslConnector=Протокол SSL/TLS для этого кон
 managerServlet.objectNameFail=ОШИБКА - Не удалось зарегистрировать имя объекта [{0}] для Manager Servlet
 managerServlet.postCommand=ОШИБКА - Попытка использовать команду [{0}] через запрос GET но требуется POST
 managerServlet.reloaded=OK - Приложение по пути контекста [{0}] было перезагружено
-managerServlet.renameFail=ОШИБКА - Невозможно переименовать [{0}] в [{1}]. Это может вызвать проблемы для будущих развертываний.
 managerServlet.resourcesAll=OK - Перечислены глобальные ресурсы всех видов
 managerServlet.resourcesType=OK - Перечислены глобальные ресурсы вида [{0}]
 managerServlet.saveFail=ОШИБКА - Не удалось сохранить настройки: [{0}]
@@ -162,7 +160,6 @@ managerServlet.sslReloadFail=ОШИБКА - Не удалось перезагр
 managerServlet.startFailed=ОШИБКА - Application at context path [{0}] could not be started
 managerServlet.started=OK - Запущено приложение по пути контекста [{0}]
 managerServlet.stopped=OK - Остановлено приложение по пути контекста [{0}]
-managerServlet.storeConfig.invalidMBean=ОШИБКА - Не удалось найти StoreConfig Mbean
 managerServlet.storeConfig.noMBean=ОШИБКА - Нет StoreConfig MBean, зарегистрированный на [{0}]
 managerServlet.threaddump=OK - JVM thread dump
 managerServlet.trustedCertsNotConfigured=Для этого виртуального хоста не настроены доверенные сертификаты безопасности
diff --git a/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties b/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
index 0aa8734..93d1a00 100644
--- a/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
@@ -164,7 +164,6 @@ managerServlet.sslReloadFail=FAIL - 重新加载TLS配制失败
 managerServlet.startFailed=失败 - 上下文路径[{0}]下,应用程序无法启动
 managerServlet.started=OK - 在上下文路径[{0}]下启动应用程序
 managerServlet.stopped=OK - 上下文路径[{0}]下停止应用程序
-managerServlet.storeConfig.invalidMBean=失败 - 未能找到StoreConfig Mbean。对MBean来说,[{0}]是无效的名称。
 managerServlet.storeConfig.noMBean=失败 - [{0}]未发现注册的StoreConfig MBean,注册一般是由StoreConfigLifecycleListener执行的。
 managerServlet.threaddump=OK - JVM线程转储
 managerServlet.trustedCertsNotConfigured=没有为此虚拟主机配置受信任的证书
diff --git a/java/org/apache/catalina/manager/host/LocalStrings_fr.properties b/java/org/apache/catalina/manager/host/LocalStrings_fr.properties
index 1efcdc9..e0e4ca8 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/manager/host/LocalStrings_fr.properties
@@ -68,7 +68,6 @@ htmlHostManagerServlet.hostAliases=Alias de l'hôte
 htmlHostManagerServlet.hostName=Nom d'hôte
 htmlHostManagerServlet.hostTasks=Commandes
 htmlHostManagerServlet.hostThis=Gestionnaire d'Hôtes installé, commandes désactivées
-htmlHostManagerServlet.hostsPersist=Persister
 htmlHostManagerServlet.hostsRemove=Retirer
 htmlHostManagerServlet.hostsStart=Démarrer
 htmlHostManagerServlet.hostsStop=Arrêt
diff --git a/java/org/apache/catalina/manager/host/LocalStrings_ja.properties b/java/org/apache/catalina/manager/host/LocalStrings_ja.properties
index b535e39..b6ac16c 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/manager/host/LocalStrings_ja.properties
@@ -68,7 +68,6 @@ htmlHostManagerServlet.hostAliases=Hostエイリアス
 htmlHostManagerServlet.hostName=ホスト名
 htmlHostManagerServlet.hostTasks=コマンド
 htmlHostManagerServlet.hostThis=Host Managerがインストールされています - コマンドが無効です
-htmlHostManagerServlet.hostsPersist=永続化
 htmlHostManagerServlet.hostsRemove=削除
 htmlHostManagerServlet.hostsStart=起動
 htmlHostManagerServlet.hostsStop=停止
diff --git a/java/org/apache/catalina/manager/host/LocalStrings_ko.properties b/java/org/apache/catalina/manager/host/LocalStrings_ko.properties
index 31c6bf3..70a627f 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/manager/host/LocalStrings_ko.properties
@@ -68,7 +68,6 @@ htmlHostManagerServlet.hostAliases=호스트의 별칭들
 htmlHostManagerServlet.hostName=호스트 이름
 htmlHostManagerServlet.hostTasks=명령들
 htmlHostManagerServlet.hostThis=호스트 매니저가 설치되었습니다 - 명령들은 사용 불능 상태입니다.
-htmlHostManagerServlet.hostsPersist=저장
 htmlHostManagerServlet.hostsRemove=제거
 htmlHostManagerServlet.hostsStart=시작
 htmlHostManagerServlet.hostsStop=중지
diff --git a/java/org/apache/catalina/manager/host/LocalStrings_ru.properties b/java/org/apache/catalina/manager/host/LocalStrings_ru.properties
index a6631ca..13d97fe 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/manager/host/LocalStrings_ru.properties
@@ -68,7 +68,6 @@ htmlHostManagerServlet.hostAliases=Псевдонимы сервера
 htmlHostManagerServlet.hostName=Имя сервера
 htmlHostManagerServlet.hostTasks=Управление
 htmlHostManagerServlet.hostThis=Приложение Host Manager установлено здесь - команды управления не поддерживаются
-htmlHostManagerServlet.hostsPersist=Сохранить
 htmlHostManagerServlet.hostsRemove=Удалить
 htmlHostManagerServlet.hostsStart=Старт
 htmlHostManagerServlet.hostsStop=Стоп
diff --git a/java/org/apache/catalina/manager/host/LocalStrings_zh_CN.properties b/java/org/apache/catalina/manager/host/LocalStrings_zh_CN.properties
index fae906d..06fd955 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/manager/host/LocalStrings_zh_CN.properties
@@ -68,7 +68,6 @@ htmlHostManagerServlet.hostAliases=主机别名
 htmlHostManagerServlet.hostName=主机名
 htmlHostManagerServlet.hostTasks=命令
 htmlHostManagerServlet.hostThis=主机管理器已安装 - 命令不可用
-htmlHostManagerServlet.hostsPersist=持久化
 htmlHostManagerServlet.hostsRemove=移除
 htmlHostManagerServlet.hostsStart=启动
 htmlHostManagerServlet.hostsStop=停止
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties b/java/org/apache/catalina/mbeans/LocalStrings_zh_CN.properties
similarity index 85%
copy from java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties
copy to java/org/apache/catalina/mbeans/LocalStrings_zh_CN.properties
index 6d0140e..1440a1e 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/mbeans/LocalStrings_zh_CN.properties
@@ -13,5 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-uDecoder.convertHexDigit.notHex=[{0}] 不是十六进制数字
-uDecoder.urlDecode.conversionError=使用编码[{1}]解码[{0}]失败
+jmxRemoteLifecycleListener.invalidURL=为[{0}]服务器[{1}]请求的JMX服务URL无效
diff --git a/java/org/apache/catalina/realm/LocalStrings_de.properties b/java/org/apache/catalina/realm/LocalStrings_de.properties
index 938b795..bf923bf 100644
--- a/java/org/apache/catalina/realm/LocalStrings_de.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_de.properties
@@ -42,7 +42,6 @@ memoryRealm.loadExist=Datei [{0}] für Memory Database kann nicht gelesen werden
 realmBase.authenticateFailure=Benutzername [{0}] konnte NICHT authentifiziert werden
 realmBase.authenticateSuccess=Benutzername [{0}] konnte erfolgreich authentifiziert werden
 realmBase.createUsernameRetriever.ClassCastException=Klasse [{0}] ist keine X509UsernameRetriever Klasse.
-realmBase.credentialHandler.customCredentialHandler=Konnte die Property [{0}] nicht auf den Wert [{1}] setzen, da ein CredentialHandler konfiguriert wurde
 realmBase.digest=Fehler beim Anwenden des Digest auf die Benutzer-Credentials
 realmBase.forbidden=Zugriff auf die gewünschte Resource wurde verweigert.
 realmBase.gotX509Username=Benutzername aus dem X.509 Zertifikate extrahiert: [{0}]
diff --git a/java/org/apache/catalina/realm/LocalStrings_es.properties b/java/org/apache/catalina/realm/LocalStrings_es.properties
index 574d1ee..49e521e 100644
--- a/java/org/apache/catalina/realm/LocalStrings_es.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_es.properties
@@ -73,7 +73,6 @@ realmBase.algorithm=El algoritmo resumen (digest) [{0}] es inválido
 realmBase.authenticateFailure=Nombre de usuario [{0}] NO autenticado con éxito
 realmBase.authenticateSuccess=Nombre de usuario [{0}] autenticado con éxito
 realmBase.createUsernameRetriever.ClassCastException=La clase [{0}] no es una X509UsernameRetriever.
-realmBase.credentialHandler.customCredentialHandler=Incapz de fijar propiedad [{0}] al valor [{1}] como una personalización. Una CredentialHandler ha sido configurada
 realmBase.delegatedCredentialFail=No pude obtener credenciales de delegado para el usuario [{0}]
 realmBase.digest=Error procesando las credenciales del usuario
 realmBase.forbidden=El acceso al recurso pedido ha sido denegado
diff --git a/java/org/apache/catalina/realm/LocalStrings_fr.properties b/java/org/apache/catalina/realm/LocalStrings_fr.properties
index 9608bb2..f046e8c 100644
--- a/java/org/apache/catalina/realm/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_fr.properties
@@ -23,7 +23,6 @@ combinedRealm.realmStartFail=Impossible de démarrer le royaume [{0}]
 combinedRealm.unexpectedMethod=Un appel de méthode inattendu à été effectué sur le royaumes combiné
 
 credentialHandler.invalidStoredCredential=Le royaume a fourni des identifiants [{0}] invalides à comparer avec ceux fournis par le client
-credentialHandler.unableToMutateUserCredential=Impossible de muter les identifiants fournis par l'utilisateur, cela veut habituellement dire que la configuration de CredentialHandler est invalide
 
 dataSourceRealm.authenticateFailure=Le nom d''utilisateur [{0}] n''a pas été authentifié
 dataSourceRealm.authenticateSuccess=Le nom d''utilisateur [{0}] a été authentifié avec succès
@@ -90,7 +89,7 @@ realmBase.authenticateSuccess=Le nom d''utilisateur [{0}] a été authentifié a
 realmBase.cannotGetRoles=Impossible d''obtenir les rôles du principal [{0}]
 realmBase.createUsernameRetriever.ClassCastException=La classe [{0}] n''est pas un X509UsernameRetriever.
 realmBase.createUsernameRetriever.newInstance=Impossible de créer un objet du type [{0}]
-realmBase.credentialHandler.customCredentialHandler=Impossible donner la valeur [{1}] à la propriété [{0}] cas un CredentialHandler personnalisé a été configuré
+realmBase.credentialNotDelegated=Les identifiants de l'utilisateur [{0}} n'ont pas été délégués alors que leur stockage a été requis
 realmBase.delegatedCredentialFail=Impossible d''obtenir les identifiants délégués pour l''utilisateur [{0}]
 realmBase.digest=Erreur lors du hachage de l''identifiant utilisateur
 realmBase.forbidden=L'accès à la ressource demandée a été interdit
diff --git a/java/org/apache/catalina/realm/LocalStrings_ja.properties b/java/org/apache/catalina/realm/LocalStrings_ja.properties
index 22f5c9b..c500b91 100644
--- a/java/org/apache/catalina/realm/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_ja.properties
@@ -23,7 +23,6 @@ combinedRealm.realmStartFail=Realm[{0}]の開始に失敗しました。
 combinedRealm.unexpectedMethod=Combined Realmについて予期せぬメソッド呼び出しが発生しました。
 
 credentialHandler.invalidStoredCredential=ユーザ提供の資格情報とマッチするためにRealm によって提供された無効な格納された資格情報文字列[[{0}]
-credentialHandler.unableToMutateUserCredential=ユーザーの提供した認証情報を変更できません。CredentialHandler の構成に誤りがあるかもしれません。
 
 dataSourceRealm.authenticateFailure=ユーザ名 [{0}] は認証に失敗しました
 dataSourceRealm.authenticateSuccess=ユーザ名 [{0}] は認証に成功しました
@@ -90,7 +89,6 @@ realmBase.authenticateSuccess=ユーザ名 [{0}] は認証に成功しました
 realmBase.cannotGetRoles=プリンシパル[{0}]からロールを取得できません
 realmBase.createUsernameRetriever.ClassCastException=クラス[{0}]はX509UsernameRetrieverではありません。
 realmBase.createUsernameRetriever.newInstance=タイプ[{0}]のオブジェクトを作成できません。
-realmBase.credentialHandler.customCredentialHandler=カスタムCredentialHandlerが設定されているため、プロパティ[{0}]を値[{1}]に設定できません。
 realmBase.delegatedCredentialFail=ユーザー[{0}]の委任された資格情報を取得できません
 realmBase.digest=ユーザの証明書のダイジェストエラー
 realmBase.forbidden=要求されたリソースへのアクセスが拒否されました
diff --git a/java/org/apache/catalina/realm/LocalStrings_ko.properties b/java/org/apache/catalina/realm/LocalStrings_ko.properties
index 7023a65..e48df55 100644
--- a/java/org/apache/catalina/realm/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_ko.properties
@@ -23,7 +23,6 @@ combinedRealm.realmStartFail=[{0}] realm을 시작하지 못했습니다.
 combinedRealm.unexpectedMethod=CombinedRealm의 메소드에 예기치 않은 호출이었습니다.
 
 credentialHandler.invalidStoredCredential=사용자가 제공한 credentials과 부합하는지 검사하기 위하여, 유효하지 않은 저장된 credentials 문자열 [{0}]이(가), Realm에 의해 제공되었습니다.
-credentialHandler.unableToMutateUserCredential=사용자가 제공한 credentials에 변경을 가하지 못했습니다. 이는 보통 CredentialHandler 설정이 유효하지 않음을 의미합니다.
 
 dataSourceRealm.authenticateFailure=사용자명 [{0}]은(는) 성공적으로 인증되지 않았습니다.
 dataSourceRealm.authenticateSuccess=사용자명 [{0}]이(가) 성공적으로 인증되었습니다.
@@ -90,7 +89,7 @@ realmBase.authenticateSuccess=사용자명 [{0}]이(가) 성공적으로 인증
 realmBase.cannotGetRoles=Principal [{0}](으)로부터 역할들을 얻을 수 없습니다.
 realmBase.createUsernameRetriever.ClassCastException=클래스 [{0}]이(가) X509UsernameRetriever 타입이 아닙니다.
 realmBase.createUsernameRetriever.newInstance=타입이 [{0}]인 객체를 생성할 수 없습니다.
-realmBase.credentialHandler.customCredentialHandler=커스텀 CredentialHandler가 설정되어 있기에, 프로퍼티 [{0}]을(를) 값 [{1}](으)로 설정할 수 없습니다.
+realmBase.credentialNotDelegated=인증서 저장 옵션이 요청되었지만, 사용자 [{0}]을(를) 위한 인증서 대리 처리가 사용 가능하지 않습니다.
 realmBase.delegatedCredentialFail=사용자 [{0}]을(를) 위한 대리 인증서를 얻을 수 없습니다.
 realmBase.digest=사용자의 credentials를 digest하는 중 오류 발생
 realmBase.forbidden=요청된 리소스에 대한 접근이 거부되었습니다.
diff --git a/java/org/apache/catalina/session/LocalStrings_zh_CN.properties b/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
index 1e7bf91..06d37b6 100644
--- a/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
@@ -21,6 +21,7 @@ fileStore.deleteFailed=无法删除阻止创建会话存储位置的文件 [{0}]
 
 managerBase.contextNull=使用 Manager 之前,必须将 Context 设置为非 null 值
 managerBase.createSession.ise=createSession:活跃session过多
+managerBase.setContextNotNew=如果Manager未处于NEW状态,则调用setContext()以更改与Manager关联的Context是非法的
 
 persistentManager.deserializeError=错误反序列化会话[{0}]: [{1}]
 persistentManager.storeKeysException=不能从 session存储中获取session ID 的列表,假设存储为空
diff --git a/java/org/apache/catalina/startup/LocalStrings_es.properties b/java/org/apache/catalina/startup/LocalStrings_es.properties
index d9e180f..e27d107 100644
--- a/java/org/apache/catalina/startup/LocalStrings_es.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_es.properties
@@ -44,7 +44,6 @@ contextConfig.inputStreamFile=No puedo procesar el fichero [{0}] para las anotac
 contextConfig.inputStreamJar=No puedo procesar la entrada de Jar [{0}] desde el Jar [{1}] para las anotaciones
 contextConfig.inputStreamJndi=No puedo procesar el elemento de recurso [{0}] para las anotaciones
 contextConfig.inputStreamWebResource=Imposible procesar el recurso web [{0}] para anotaciones
-contextConfig.invalidSci=No se pudo crear el ServletContentInitializer [{0}]
 contextConfig.invalidSciHandlesTypes=No puedo cargar la clase [{0}] para revisar contra la anotación  @HandlesTypes de uno o más ServletContentInitializers.
 contextConfig.jndiUrl=No puedo procesar la URL JNDI [{0}] para las anotaciones
 contextConfig.jndiUrlNotDirContextConn=La conexión creada para la URL [{0}] no era una DirContextURLConnection
@@ -62,11 +61,8 @@ contextConfig.stop="ContextConfig": Procesando "STOP"
 contextConfig.unavailable=Esta aplicación está marcada como no disponible debido a los errores precedentes
 contextConfig.unknownUrlProtocol=El protocolo de URL [{0}] no fue reconocido durante el proceso de anotaciones. Se ignoró la URL [{1}].
 contextConfig.urlPatternValue=Ambis valores de urlPatterns y atributo fuerno puestos para anotación de [{0}] de la clase [{1}]
-contextConfig.webinfClassesUrl=No pude determinar la URL para WEB-INF/classes
 contextConfig.xmlSettings=El contexto [{0}] analizará los ficheros web.xml y web-fragment.xml con validación:[{1}] y namespaceAware:[{2}]
 
-embedded.authenticatorNotInstanceOfValve=El Autenticado especificado no es un Válvula
-embedded.noEngines=Algún motor (engine) no ha sido aún definido
 embedded.notmp=No puedo hallar carpeta temporal especificada en [{0}]
 
 engineConfig.cce=El objeto de los datos de evento de ciclo de vida (Lifecycle event data object) [{0}] no es un motor (engine)
diff --git a/java/org/apache/catalina/startup/LocalStrings_fr.properties b/java/org/apache/catalina/startup/LocalStrings_fr.properties
index b736089..28e560e 100644
--- a/java/org/apache/catalina/startup/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_fr.properties
@@ -34,7 +34,6 @@ contextConfig.authenticatorInstantiate=Impossible d''instancier un authentificat
 contextConfig.authenticatorMissing=Impossible de configurer un authentificateur (authenticator) pour la méthode [{0}]
 contextConfig.authenticatorResources=Impossible de charger la liste de correspondance des authentificateurs (authenticators)
 contextConfig.badUrl=Impossible de traiter le descripteur de contexte [{0}]
-contextConfig.baseError=Impossible de déterminer la localisation de la configuration globale, habituellement $CATALINA_BASE/conf
 contextConfig.cce=L''objet donnée évènement cycle de vie (Lifecycle event data object) [{0}] n''est pas un Contexte
 contextConfig.contextClose=Erreur lors de la fermeture de context.xml
 contextConfig.contextMissing=context.xml manquant: [{0}]
@@ -49,7 +48,6 @@ contextConfig.init=ContextConfig: Initialisation
 contextConfig.inputStreamFile=Impossible de traiter les annotations du fichier [{0}]
 contextConfig.inputStreamJar=Impossible de traiter l''entrée [{0}] du JAR [{1}] pour les annotations
 contextConfig.inputStreamWebResource=Incapable de traiter les annotations de la ressource web [{0}]
-contextConfig.invalidSci=Le ServletContainerInitializer [{0}] n''a pas pu être crée
 contextConfig.invalidSciHandlesTypes=Impossible de charger la classe [{0}] pour la vérifier avec l''annotation @HandlesTypes d''un ou plusieurs ServletContainerInitializer
 contextConfig.jarFile=Impossible de traiter les annotations du JAR [{0}]
 contextConfig.jspFile.error=Le fichier JSP [{0}] doit commencer par un ''/''
@@ -70,11 +68,8 @@ contextConfig.stop="ContextConfig": Traitement du "STOP"
 contextConfig.unavailable=Cette application est marquée comme non disponible suite aux erreurs précédentes
 contextConfig.unknownUrlProtocol=Le protocole de l''URL [{0}] n''a pas été reconnu pendant le traitement des annotations, l''URL [{1}] a été ignorée
 contextConfig.urlPatternValue=A la fois les attributs urlPatterns et la valeur ont été fixés pour l''annotation [{0}] de la classe [{1}]
-contextConfig.webinfClassesUrl=Impossible de déterminer l''URL pour [{0}]
 contextConfig.xmlSettings=Le contexte [{0}] va traiter les fichiers web.xml et le web-fragment.xml avec la validation [{1}] et namespaceAware [{2}]
 
-embedded.authenticatorNotInstanceOfValve=L'Authenticator spécifié n'est pas une valve
-embedded.noEngines=Aucun moteur (engine) n'a encore été défini
 embedded.notmp=Impossible de trouver le répertoire temporaire à [{0}]
 
 engineConfig.cce=L''objet donnée évènement cycle de vie (Lifecycle event data object) [{0}] n''est pas un moteur (engine)
@@ -118,7 +113,6 @@ hostConfig.deploying=Déploiement des applications web trouvées
 hostConfig.docBaseUrlInvalid=La "docBase" fournie ne peut pas être exprimée comme URL
 hostConfig.expand=Décompression de l''archive [{0}] de l''application web
 hostConfig.expand.error=Exception lors de la décompression de l''archive d''application web [{0}]
-hostConfig.expanding=Explosion des fichiers d'archive d'application web trouvés
 hostConfig.ignorePath=Le chemin [{0}] est ignoré pour le déploiement automatique dans appBase
 hostConfig.illegalWarName=Le nom du war [{0}] est invalide, l''archive sera ignorée
 hostConfig.jmx.register=Echec d''enregistrement du contexte [{0}]
diff --git a/java/org/apache/catalina/startup/LocalStrings_ja.properties b/java/org/apache/catalina/startup/LocalStrings_ja.properties
index d768da0..64b394d 100644
--- a/java/org/apache/catalina/startup/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_ja.properties
@@ -34,7 +34,6 @@ contextConfig.authenticatorInstantiate=クラス [{0}] のオーセンティケ
 contextConfig.authenticatorMissing=メソッド [{0}] のオーセンティケータを設定できません
 contextConfig.authenticatorResources=Authenticators のマップリストをロードできません。
 contextConfig.badUrl=コンテキスト記述子 [{0}] を処理できません。
-contextConfig.baseError=共通設定を取得できません。通常は $CATALINA_BASE/conf にあります。
 contextConfig.cce=ライフサイクルイベントデータオブジェクト [{0}] はコンテキストではありません
 contextConfig.contextClose=context.xmlを閉じる際のエラー
 contextConfig.contextMissing=context.xml が見つかりません: [{0}]
@@ -49,7 +48,6 @@ contextConfig.init=ContextConfig: 初期化中\n
 contextConfig.inputStreamFile=アノテーションのファイル[{0}]を処理できません
 contextConfig.inputStreamJar=アノテーションのJar [{1}]からJarエントリ[{0}]を処理できません。
 contextConfig.inputStreamWebResource=アノテーションのWebリソース[{0}]を処理できません
-contextConfig.invalidSci=ServletContentInitializer [{0}]を作成できませんでした。
 contextConfig.invalidSciHandlesTypes=1つ以上のServletContentInitializersの@HandlesTypesアノテーションに対してチェックするためにクラス[{0}]をロードできません。
 contextConfig.jarFile=アノテーションのためにJar [{0}]を処理できません。
 contextConfig.jspFile.error=JSPファイル [{0}] は''/''で始まらなければいけません
@@ -70,11 +68,8 @@ contextConfig.stop=ContextConfig: 処理を停止します
 contextConfig.unavailable=前のエラーのためにこのアプリケーションは利用できないようにマークします
 contextConfig.unknownUrlProtocol=アノテーション処理中にURLプロトコル[{0}]が認識されませんでした。 URL [{1}]は無視されました。
 contextConfig.urlPatternValue=urlPatterns属性とvalue属性の両方が、クラス[{1}]の[{0}]アノテーションに対して設定されています。
-contextConfig.webinfClassesUrl=[{0}]のURLを特定できません
 contextConfig.xmlSettings=Context[{0}]は、validation:[{1}]およびnamespaceAware:[{2}]を使用してweb.xmlおよびweb-fragment.xmlファイルを解析します
 
-embedded.authenticatorNotInstanceOfValve=指定されたAuthenticator はValveではありません
-embedded.noEngines=まだエンジンが定義されていません
 embedded.notmp=[{0}]に指定された一時フォルダが見つかりません
 
 engineConfig.cce=ライフサイクルイベントデータオブジェクト [{0}] はエンジンではありません
@@ -118,7 +113,6 @@ hostConfig.deploying=発見されたWebアプリケーションの展開
 hostConfig.docBaseUrlInvalid=docBase に指定された文字列は URL として解釈できません。
 hostConfig.expand=Web アプリケーションアーカイブ [{0}] を展開します。
 hostConfig.expand.error=Web アプリケーションアーカイヴ [{0}] の展開中に異常が発生しました。
-hostConfig.expanding=発見した Web アプリケーションアーカイブを展開します。
 hostConfig.ignorePath=自動デプロイでは appBase 内のパス [{0}] を無視します。
 hostConfig.illegalWarName=War名[{0}]は無効です。 アーカイブは無視されます。
 hostConfig.jmx.register=コンテキスト[{0}]を登録できませんでした
diff --git a/java/org/apache/catalina/startup/LocalStrings_ko.properties b/java/org/apache/catalina/startup/LocalStrings_ko.properties
index 18db899..2b5559f 100644
--- a/java/org/apache/catalina/startup/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_ko.properties
@@ -34,7 +34,6 @@ contextConfig.authenticatorInstantiate=클래스 [{0}]의 Authenticator 인스
 contextConfig.authenticatorMissing=인증 메소드 [{0}]을(를) 위한 Authenticator를 설정할 수 없습니다.
 contextConfig.authenticatorResources=Authenticator들의 매핑 목록을 로드할 수 없습니다.
 contextConfig.badUrl=컨텍스트 descriptor [{0}]을(를) 처리할 수 없습니다.
-contextConfig.baseError=글로벌 설정의 위치를 결정할 수 없습니다. (통상 $CATALINA_BASE/conf)
 contextConfig.cce=Lifecycle 이벤트 데이터 객체 [{0}]이(가) Context 객체가 아닙니다.
 contextConfig.contextClose=context.xml을 닫는 중 오류 발생
 contextConfig.contextMissing=context.xml이 존재하지 않습니다: [{0}]
@@ -49,7 +48,6 @@ contextConfig.init=ContextConfig: 초기화 중
 contextConfig.inputStreamFile=파일 [{0}]에 대하여 annotation들을 처리할 수 없습니다.
 contextConfig.inputStreamJar=Annotation들을 스캔하기 위해, Jar [{1}](으)로부터의 Jar 엔트리 [{0}]을(를) 처리할 수 없습니다.
 contextConfig.inputStreamWebResource=Annotation들을 위해 웹 리소스 [{0}]을(를) 처리할 수 없습니다.
-contextConfig.invalidSci=ServletContentInitializer [{0}]이(가) 생성될 수 없었습니다.
 contextConfig.invalidSciHandlesTypes=하나 이상의 ServletContentInitializer들의 @HandlesTypes annotation에 대한 점검을 위해, 클래스 [{0}]을(를) 로드할 수 없습니다.
 contextConfig.jarFile=Annotation들을 위해 Jar [{0}]을(를) 처리할 수 없습니다.
 contextConfig.jspFile.error=JSP 파일 [{0}]은(는) 반드시 ''/''로 시작해야 합니다.
@@ -70,11 +68,8 @@ contextConfig.stop=ContextConfig: STOP 처리 중
 contextConfig.unavailable=이전 오류(들)로 인하여, 이 애플리케이션이 가용하지 않은 것으로 표시합니다.
 contextConfig.unknownUrlProtocol=Annotation 처리 중, 인식되지 않는 프로토콜 [{0}]을(를) 포함하여, URL [{1}]이(가) 무시되었습니다.
 contextConfig.urlPatternValue=클래스 [{1}]의 [{0}] annotation을 위해, urlPatterns와 value 속성, 둘 다 설정되었습니다.
-contextConfig.webinfClassesUrl=[{0}]을(를) 위한 URL을 결정할 수 없습니다.
 contextConfig.xmlSettings=컨텍스트 [{0}]이(가), validation:[{1}]와(과) namespaceAware:[{2}]을 사용하여, web.xml과 web-fragment.xml 파일들을 파싱합니다.
 
-embedded.authenticatorNotInstanceOfValve=지정된 Authenticator는 Valve가 아닙니다.
-embedded.noEngines=엔진들이 아직 정의되지 않았습니다.
 embedded.notmp=[{0}] 위치로 지정된 임시 폴더를 찾을 수 없습니다.
 
 engineConfig.cce=Lifecycle 이벤트 데이터 객체 [{0}]이(가) Engine 객체가 아닙니다.
@@ -118,7 +113,6 @@ hostConfig.deploying=발견된 웹 애플리케이션들을 배치합니다.
 hostConfig.docBaseUrlInvalid=제공된 docBase는 URL로서 표현될 수 없습니다.
 hostConfig.expand=웹 애플리케이션 아카이브 [{0}]의 압축을 풉니다.
 hostConfig.expand.error=웹 애플리케이션 아카이브 [{0}]의 압축을 푸는 중 예외 발생
-hostConfig.expanding=발견된 웹 애플리케이션 아카이브들의 압축을 풉니다.
 hostConfig.ignorePath=자동 배치를 위해 appBase내의 [{0}] 경로를 무시합니다.
 hostConfig.illegalWarName=War 이름[{0}]이(가) 유효하지 않습니다. 이 아카이브는 무시될 것입니다.
 hostConfig.jmx.register=컨텍스트 [{0}]을(를) 등록하지 못했습니다.
diff --git a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
index 92a1f74..563065c 100644
--- a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
@@ -16,24 +16,47 @@
 catalina.serverStartFail=所必需的服务组件启动失败,所以无法启动Tomcat
 
 contextConfig.altDDNotFound=未找到 alt-dd 文件 [{0}]
+contextConfig.applicationMissing=web.xml文件丢失,只使用默认。
+contextConfig.applicationParse=解析应用程序的web.xml错误,位置:[{0}]
+contextConfig.applicationPosition=发生在第[{0}]行,属性[{1}]
 contextConfig.applicationStart=正在解析应用程序 web.xml 文件 [{0}]
 contextConfig.applicationUrl=无法确定应用程序 web.xml 的URL
 contextConfig.authenticatorConfigured=为方法 [{0}] 配置了验证器
+contextConfig.authenticatorInstantiate=无法实例化认证类[{0}]
 contextConfig.authenticatorMissing=不能配置一个认证为方法[{0}]
+contextConfig.authenticatorResources=无法加载认证者映射列表
 contextConfig.badUrl=不能处理上下文描述符[{0}]
 contextConfig.cce=生命周期事件数据对象[{0}] 不是一个上下文
+contextConfig.contextClose=关闭context.xml错误
 contextConfig.contextMissing=缺少 context.xml:[{0}]
+contextConfig.contextParse=解析context.xml错误,[{0}]
+contextConfig.defaultError=处理默认web.xml错误,名称:[{0}],位置:[{1}]
 contextConfig.defaultMissing=未找到全局 web.xml
 contextConfig.defaultPosition=发生在 [{0}] 行 [{1}] 列
+contextConfig.destroy=ContextConfig:正在销毁
+contextConfig.fileUrl=无法从URL[{0}]创建文件对象
 contextConfig.fixDocBase=上下文[{0}]的异常修复docBase
 contextConfig.init=上下文配置: 正在初始化
 contextConfig.inputStreamFile=无法为注解处理文件[{0}]
+contextConfig.inputStreamJar=无法处理Jar实体[{0}]的注解,Jar:[{1}]
 contextConfig.inputStreamWebResource=不能处理注释的Web资源[{0}]
+contextConfig.invalidSciHandlesTypes=无法为核对一个或多个ServletContentInitializers的注解@HandlesTypes而加载类[{0}]
+contextConfig.jarFile=无法处理Jar[{0}]的注解
 contextConfig.jspFile.error=JSP文件[{0}]必须以''/''开头。
+contextConfig.jspFile.warning=警告:在Servlet 2.4 中,JSP文件[{0}]必须以‘/’开头
+contextConfig.missingRealm=对应的认证领域未配置
 contextConfig.processAnnotationsDir.debug=使用注解 [{0}]扫描目录中的类文件
+contextConfig.processAnnotationsJar.debug=扫描jar文件中注解[{0}]的类文件
 contextConfig.processAnnotationsWebDir.debug=扫描 web 应用程序目录下含有 [{0}] 注解的 class 文件
 contextConfig.role.auth=在标签<auth-constraint>的子标签<security-role>中没有定义角色名[{0}]
+contextConfig.role.link=<role-link>中使用的安全角色[{0}]未被定义在<security-role>中
 contextConfig.role.runas=<run-as> 中使用的安全角色名 [{0}],未在 <security-role> 中定义
+contextConfig.servletContainerInitializerFail=无法检测到上下文名称为[{0}]的ServletContainerInitializers
+contextConfig.start=ContextConfig:开始处理
+contextConfig.stop=ContextConfig:停止处理
+contextConfig.unavailable=由于之前的错误,标记当前应用程序不可用
+contextConfig.unknownUrlProtocol=注解解析过程中,URL协议[{0}]未识别。忽略URL[{1}]。
+contextConfig.urlPatternValue=类文件[{1}]的urlPatterns和值属性上同时设置了注解[{0}]
 
 engineConfig.cce=生命周期事件数据对象[{0}]不是一个引擎(Engine)
 engineConfig.stop=配置引擎,处理进程停止。
@@ -42,13 +65,17 @@ expandWar.copy=错误的拷贝[{0}] to [{1}]
 expandWar.createFailed=无法创建文件夹[{0}]。
 expandWar.deleteFailed=[{0}] 无法被彻底删除。其余残留文件可能会导致问题
 expandWar.deleteOld=发现一个展开的目录[{0}],它的最后修改时间与关联的WAR不一致.它将被删除.
+expandWar.illegalPath=归档[{0}]格式错误,将被忽略:条目包含非扩展到[{2}]的非法路径[{1}],因为它超出了定义的docBase [{3}]
 expandWar.missingJarEntry=无法获得 JarEntry [{0}] 的输入流 - WAR 文件是否已损坏?
 
 hostConfig.appBase=主机[{0}]的应用程序基础[{1}]不存在或不是目录。deployOnStartUp和autoDebug已设置为false,以防止部署错误。其他错误仍然可能发生。
+hostConfig.deployDescriptor.error=部署描述符[{0}]时出错
 hostConfig.deployDir=把web 应用程序部署到目录 [{0}]
 hostConfig.deployWar.error=部署 Web 应用程序 archive [{0}] 时出错
+hostConfig.deployWar.hiddenDir=将忽略目录[{0}],因为WAR [{1}]优先,unpackWAR为false
 hostConfig.docBaseUrlInvalid=所提供的部署目录无法用URL来表示
-hostConfig.expanding=扩展已发现的 web 应用程序 archive
+hostConfig.ignorePath=忽略appBase中的路径[{0}]以进行自动部署
+hostConfig.jmx.unregister=移除注册上下文[{0}]失败
 hostConfig.stop=:)Host配置:停止处理
 
 tomcat.addWebapp.conflictChild=无法在[{0}]处部署到上下文路径[{1}],因为存在上下文[{2}]
diff --git a/java/org/apache/catalina/tribes/group/LocalStrings_zh_CN.properties b/java/org/apache/catalina/tribes/group/LocalStrings_zh_CN.properties
index 3b953d5..d67a4c3 100644
--- a/java/org/apache/catalina/tribes/group/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/tribes/group/LocalStrings_zh_CN.properties
@@ -17,3 +17,4 @@ channelCoordinator.alreadyStarted=通道已经启动,级别:[{0}]
 channelCoordinator.invalid.startLevel=启动级别无效,有效级别为:SND_RX_SEQ,SND_TX_SEQ,MBR_TX_SEQ,MBR_RX_SEQ
 
 groupChannel.listener.alreadyExist=侦听器已存在:[{0}][{1}]
+groupChannel.unable.sendHeartbeat=无法通过Tribes拦截器堆栈发送心跳。 会再试一次。
diff --git a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
index 21d88e1..39faafa 100644
--- a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
@@ -36,6 +36,7 @@ tcpFailureDetector.failureDetection.failed=无法进行失败监测,假定成
 tcpFailureDetector.heartbeat.failed=TCP心跳检测器无法执行心跳
 tcpFailureDetector.member.disappeared=认证完成。成员消失[{0}]
 tcpFailureDetector.still.alive=验证完成。成员 [{0}] 仍然存活
+tcpFailureDetector.suspectMember.alive=验证可疑成员服务器还活着。[{0}]
 
 tcpPingInterceptor.ping.failed=无法发送 TCP ping
 tcpPingInterceptor.pingFailed.pingThread=不能从ping 线程发送ping
diff --git a/java/org/apache/catalina/tribes/membership/LocalStrings_zh_CN.properties b/java/org/apache/catalina/tribes/membership/LocalStrings_zh_CN.properties
index e9da97a..a45f68a 100644
--- a/java/org/apache/catalina/tribes/membership/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/tribes/membership/LocalStrings_zh_CN.properties
@@ -15,6 +15,7 @@
 
 mcastService.missing.property=McastService:缺少必需属性 [{0}]。
 
+mcastServiceImpl.bind=尝试将多播套接字绑定到 [{0}:{1}]
 mcastServiceImpl.invalid.startLevel=无效的启动级别。只接受以下级别:Channel.MBR_RX_SEQ或 Channel.MBR_TX_SEQ
 mcastServiceImpl.recovery=家族成员,运行恢复线程,广播不是功能。
 mcastServiceImpl.recovery.stopFailed=恢复线程未能停止成员服务。
diff --git a/java/org/apache/catalina/tribes/transport/LocalStrings_es.properties b/java/org/apache/catalina/tribes/transport/LocalStrings_es.properties
index 4b162f3..263a891 100644
--- a/java/org/apache/catalina/tribes/transport/LocalStrings_es.properties
+++ b/java/org/apache/catalina/tribes/transport/LocalStrings_es.properties
@@ -15,15 +15,6 @@
 
 PooledSender.senderDisconnectFail=No pude desconectar al remitente
 
-bioSender.ack.eof=EOF alcanzado en puerto local [{0}:{1,number,integer}]
-bioSender.ack.missing=No puedo leer reconocimiento desde [{0}:{1,number,integer}] en {2,number,integer} ms. Desconectando conector e intentando otra vez.
-bioSender.ack.wrong=Falta ACK correcto tras 10 bytes leídos en puerto local [{0}:{1,number,integer}]
-bioSender.closeSocket=El remitente cerró el conector con [{0}:{1,number,integer}] (contador de cierre {2,number,integer})
-bioSender.disconnect=Remitente desconectado de [{0}:{1,number,integer}] (contador de desconexión {2,number,integer})
-bioSender.openSocket=Remitente abrió conector con [{0}:{1,number,integer}] (contador de apertura {2,number,integer})
-bioSender.openSocket.failure=¡No pude abrir conector de remitente [{0}:{1,number,integer}]! (contador de fallo de apertura {2,number,integer})
-bioSender.send.again=Enviar datos de nuevo a [{0}:{1,number,integer}]
-
 receiverBase.bind.failed=Fallo al atachar el escuchador de replicación en la dirección: [{0}]\n
 receiverBase.unable.bind=Imposible vincular el socket del servidor a:[{0}]  lanzando error.
 receiverBase.unable.bind.udp=Imposible atar el socket UDP a:[{0}] lanzando error.\n
diff --git a/java/org/apache/catalina/tribes/transport/LocalStrings_zh_CN.properties b/java/org/apache/catalina/tribes/transport/LocalStrings_zh_CN.properties
index ad0dcc5..bd74dd2 100644
--- a/java/org/apache/catalina/tribes/transport/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/tribes/transport/LocalStrings_zh_CN.properties
@@ -18,3 +18,4 @@ PooledSender.senderDisconnectFail=与 sender 断开连接失败
 receiverBase.bind.failed=对内容类型[{2}]返回[{3}]使用[{0}]匹配[{1}]
 receiverBase.socket.bind=服务器套接字接收器绑定到:[{0}]
 receiverBase.unable.bind=无法绑定套接字端口:{{0}},出现异常
+receiverBase.unable.bind.udp=无法将UDP套接字绑定到:[{0}]抛出错误。
diff --git a/java/org/apache/catalina/tribes/transport/bio/LocalStrings_zh_CN.properties b/java/org/apache/catalina/tribes/transport/bio/LocalStrings_zh_CN.properties
index 31947bd..379e6fc 100644
--- a/java/org/apache/catalina/tribes/transport/bio/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/tribes/transport/bio/LocalStrings_zh_CN.properties
@@ -23,4 +23,6 @@ bioReplicationTask.unable.service=不能服务bio套接字
 
 bioSender.ack.missing=不能读确认表格:[{0}] {1,number,integer}] in {2,number,integer} 毫秒, 失去socket连接, 重试连接.
 bioSender.ack.wrong=在本地端口[{0}:{1,number,integer}]读取10个字节后丢失正确的ACK
+bioSender.closeSocket=发件人关闭套接字到[{0}:{1,number,integer}](关闭计数{2,数字,整数})
+bioSender.openSocket=发件人打开套接字到[{0}:{1,number,integer}](打开计数{2,数字,整数})
 bioSender.send.again=再次发送数据到 [{0}:{1,number,integer}]
diff --git a/java/org/apache/catalina/tribes/transport/nio/LocalStrings_zh_CN.properties b/java/org/apache/catalina/tribes/transport/nio/LocalStrings_zh_CN.properties
index f935ce4..a00ec84 100644
--- a/java/org/apache/catalina/tribes/transport/nio/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/tribes/transport/nio/LocalStrings_zh_CN.properties
@@ -22,13 +22,14 @@ nioReceiver.start.fail=无法启动集群接收器
 nioReceiver.stop.fail=无法关闭集群接收的选择器
 nioReceiver.threadpool.fail=ThreadPool 无法初始化。 监听器未启动。
 
-nioReplicationTask.error.register.key=错误的注册key被读取了
+nioReplicationTask.error.register.key=错误的注册key被读取:[{0}]
 nioReplicationTask.process.clusterMsg.failed=处理集群消息失败
 nioReplicationTask.unable.ack=不能通过channel发送ack,channel已经断开?[{0}]
 
 nioSender.not.connected=NioSender未连接,这是不应该发生的。
 nioSender.unknown.state=数据处于未知状态。readyOps = [{0}]
 
+parallelNioSender.send.fail.retrying=成员发送失败:[{0}]; 设置为怀疑并重试。
 parallelNioSender.send.failed=并行的NIO.发送失败。
 parallelNioSender.sendFailed.attempt=发送失败,尝试: [{0}] 最大: [{1}]
 parallelNioSender.sender.disconnected.sendFailed=发送失败且sender已断开连接,不再重试。
diff --git a/java/org/apache/catalina/util/LocalStrings_zh_CN.properties b/java/org/apache/catalina/util/LocalStrings_zh_CN.properties
index 34a3987..f652bef 100644
--- a/java/org/apache/catalina/util/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/util/LocalStrings_zh_CN.properties
@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+SecurityUtil.doAsPrivilege=运行PrivilegedExceptionAction块时发生异常。
+
 customObjectInputStream.logRequired=使用日志记录进行类名过滤需要一个有效的日志记录器
 customObjectInputStream.nomatch=类不能匹配合适的表达式,因为类被允许反序列化
 
diff --git a/java/org/apache/catalina/valves/LocalStrings_fr.properties b/java/org/apache/catalina/valves/LocalStrings_fr.properties
index 6d866a8..8ca93f8 100644
--- a/java/org/apache/catalina/valves/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_fr.properties
@@ -128,6 +128,8 @@ jdbcAccessLogValve.exception=Exception en insérant l'entrée de l'accès
 remoteCidrValve.invalid=La configuration fournie pour [{0}] est invalide, voir les précédents messages pour plus de détails
 remoteCidrValve.noRemoteIp=Le client n'a pas d'adresse IP, requête interdite
 
+remoteIpValve.invalidHostHeader=La valeur invalide [{0}] a été trouvée pour le Host dans l''en-tête HTTP [{1}]
+remoteIpValve.invalidHostWithPort=La valeur de Host [{0}] dans l''en-tête HTTP [{1}] contenait un numéro de port qui sera ingnoré
 remoteIpValve.invalidPortHeader=La valeur de port [{0}] trouvée dans l''en-tête HTTP [{1}] est invalide
 
 requestFilterValve.configInvalid=Un ou plusieurs paramètres de configuration spécifiés pour ce Remote[Addr|Host]Valve ont empêché la Valve et le conteneur parent de démarrer
diff --git a/java/org/apache/catalina/valves/LocalStrings_ja.properties b/java/org/apache/catalina/valves/LocalStrings_ja.properties
index 77b1b79..99b184d 100644
--- a/java/org/apache/catalina/valves/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_ja.properties
@@ -125,7 +125,7 @@ http.511.reason=Network Authentication Required
 jdbcAccessLogValve.close=データベースのクローズに失敗しました。
 jdbcAccessLogValve.exception=アクセスエントリの挿入を実行中の例外です
 
-remoteCidrValve.invalid=[{0}] に不正な値が指定されました。詳細は前のメッセージを参照してください。
+remoteCidrValve.invalid="[{0}]" に不正な値が指定されました。詳細は前のメッセージを参照してください。
 remoteCidrValve.noRemoteIp=クライアントの IP アドレスを取得できません。リクエストを拒否します。
 
 remoteIpValve.invalidPortHeader=HTTP ヘッダー [{1}] に不正なポート番号 [{0}] が指定されました。
diff --git a/java/org/apache/catalina/valves/LocalStrings_ko.properties b/java/org/apache/catalina/valves/LocalStrings_ko.properties
index db2437d..317c256 100644
--- a/java/org/apache/catalina/valves/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_ko.properties
@@ -128,6 +128,8 @@ jdbcAccessLogValve.exception=접근 엔트리를 추가하는 중 예외 발생
 remoteCidrValve.invalid=[{0}]을(를) 위해 유효하지 않은 설정이 제공되었습니다. 상세 정보를 보시려면 이전 메시지들을 확인하십시오.
 remoteCidrValve.noRemoteIp=클라이언트가 IP 주소를 가지고 있지 않습니다. 요청은 거절되었습니다.
 
+remoteIpValve.invalidHostHeader=HTTP 헤더 [{1}] 내에 유효하지 않은 값이 발견되었습니다: [{0}]
+remoteIpValve.invalidHostWithPort=HTTP 헤더 [{1}] 내의 호스트 값 [{0}]이(가) 포트 번호를 포함했는데, 이는 무시될 것입니다.
 remoteIpValve.invalidPortHeader=HTTP 헤더 [{1}] 내에 유효하지 않은 포트 번호 값입니다: [{0}]
 
 requestFilterValve.configInvalid=Remote[Addr|Host]Valve를 위해 하나 이상의 유효하지 않은 설정이 제공되었는데, 이는 해당 Valve와 부모 컨테이너들이 시작되지 못하게 했습니다.
diff --git a/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties b/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
index ccbedc6..7c6c464 100644
--- a/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
@@ -25,17 +25,31 @@ errorReportValve.message=消息
 errorReportValve.rootCauseInLogs=主要问题的全部 stack 信息可以在 server logs 里查看
 errorReportValve.unknownReason=未知的原因
 
+http.400.desc=由于被认为是客户端对错误(例如:畸形的请求语法、无效的请求信息帧或者虚拟的请求路由),服务器无法或不会处理当前请求。
 http.400.reason=错误的请求
+http.401.desc=因为当前请求缺少对目标资源对有效的认证信息,所以它不会实施。
 http.401.reason=未经授权的
 http.402.desc=这个状态码时为未来使用预留的.
+http.402.reason=需要支付
 http.403.desc=服务器理解该请求但拒绝授权。
 http.403.reason=被禁止
+http.404.desc=源服务器未能找到目标资源的表示或者是不愿公开一个已经存在的资源表示。
 http.404.reason=未找到
 http.405.desc=请求行中接收的方法由源服务器知道,但目标资源不支持
+http.405.reason=方法不允许
+http.406.desc=根据请求中接收到的主动协商头字段,目标资源没有用户代理可以接受的当前表示,而且服务器不愿意提供缺省表示。
+http.406.reason=不可接收
+http.407.desc=状态码和401(未授权的)类似,但是表示客户端为了使用代理需要对它自身进行认证。
 http.407.reason=代理需要认证
+http.408.desc=在预分配的等待时间内,服务器未收到完整的请求信息。
+http.408.reason=请求超时
+http.409.desc=由于和目标资源对当前状态发生冲突,所以请求无法完成。
+http.409.reason=冲突
+http.410.desc=原始服务器上不再可以访问目标资源,并且此条件可能是永久性的。
 http.412.desc=在服务器上测试时,请求头字段中给出的一个或多个条件被评估为false。
 http.412.reason=前置条件失败
 http.413.reason=有效载荷过大
+http.414.desc=服务器拒绝为请求提供服务,因为请求目标比服务器愿意解释的要长。
 http.415.desc=源服务器拒绝服务请求,因为有效负载的格式在目标资源上此方法不支持。
 http.415.reason=不支持的媒体类型
 http.416.reason=范围不满足
@@ -57,4 +71,9 @@ http.511.desc=客户端需要进行身份验证才能获得网络访问权限。
 
 remoteCidrValve.noRemoteIp=客户端没有IP地址。请求被拒绝。
 
+remoteIpValve.invalidPortHeader=HTTP标头[{1}]中的端口找到的值[{0}]无效
+
+requestFilterValve.configInvalid=为Remote [Addr | Host]阀门提供了一个或多个无效配置设置,阻止Valve及其父容器启动
 requestFilterValve.deny=根据[{1}]配置拒绝[{0}]的请求
+
+sslValve.invalidProvider=与此{[0}]请求关联的连接器上指定的SSL提供程序无效。 无法处理证书数据。
diff --git a/java/org/apache/catalina/webresources/LocalStrings_es.properties b/java/org/apache/catalina/webresources/LocalStrings_es.properties
index 0a2c28c..323028d 100644
--- a/java/org/apache/catalina/webresources/LocalStrings_es.properties
+++ b/java/org/apache/catalina/webresources/LocalStrings_es.properties
@@ -19,6 +19,4 @@ dirResourceSet.notDirectory=El directorio especificado por la base y el camino i
 
 extractingRoot.targetFailed=Fallo al crear directorio [{0}] para los archivos JAR extraidos
 
-jarResource.getUrlFail=Imposible determinar una URL para el recurso [{0}] ubicado en el JAR [{1}]
-
 standardRoot.createUnknownType=Imposible crear  WebResourceSet de tipo desconocido [{0}]\n
diff --git a/java/org/apache/catalina/webresources/LocalStrings_fr.properties b/java/org/apache/catalina/webresources/LocalStrings_fr.properties
index 5a562f8..9939f5a 100644
--- a/java/org/apache/catalina/webresources/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/webresources/LocalStrings_fr.properties
@@ -41,7 +41,6 @@ fileResource.getUrlFail=Impossible de déterminer l''URL pour la ressource [{0}]
 fileResourceSet.notFile=Le fichier spécifié par ses chemins de base et internes [{0}]{1}[{2}] n''existe pas
 
 jarResource.getInputStreamFail=Impossible d''obtenir une InputStream pour la ressource [{0}] située dans le JAR [{1}]
-jarResource.getUrlFail=Impossible de déterminer une URL pour la ressource [{0}] dans le JAR [{1}]
 
 jarResourceRoot.invalidWebAppPath=Cette ressource se réfère toujours à un répertoire donc le webAppPath fourni doit se terminer avec ''/'' mais il était [{0}]
 
@@ -49,7 +48,6 @@ jarWarResourceSet.codingError=Erreur de programmation
 
 standardRoot.checkStateNotStarted=Les resources ne peuvent pas être accédées tant qu'elles ne sont pas démarrées
 standardRoot.createInvalidFile=Impossible de créer WebResourceSet à partir de [{0}]
-standardRoot.createNoFileResourceSet=la fonctionnalité FileResourceSet n'a pas encore été implémentée
 standardRoot.createUnknownType=Impossible de créer un WebResourceSet pour le type inconnu [{0}]
 standardRoot.invalidPath=Le chemin de ressources [{0}] est invalide
 standardRoot.invalidPathNormal=Le chemin de ressource [{0}] a été normalisé en [{1}] ce qui est invalide
diff --git a/java/org/apache/catalina/webresources/LocalStrings_ja.properties b/java/org/apache/catalina/webresources/LocalStrings_ja.properties
index f3f1b30..699b29b 100644
--- a/java/org/apache/catalina/webresources/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/webresources/LocalStrings_ja.properties
@@ -41,7 +41,6 @@ fileResource.getUrlFail=リソース [{0}] の URL を取得できません。
 fileResourceSet.notFile=基本パスおよび内部パスで指定されたファイル [{0}]{1}[{2}] がありません。
 
 jarResource.getInputStreamFail=JAR ファイル [{1}] のリソース [{0}] の入力ストリームを取得できません。
-jarResource.getUrlFail=JAR [{1}]にあるリソース[{0}]のURLを特定できません
 
 jarResourceRoot.invalidWebAppPath=このリソースは常にディレクトリを参照するため、指定されたwebAppPathは/で終了する必要がありますが、指定されたwebAppPathは[{0}]です。
 
@@ -49,7 +48,6 @@ jarWarResourceSet.codingError=コーディングエラー
 
 standardRoot.checkStateNotStarted=リソースは、現在起動されていない場合はアクセスできない場合があります
 standardRoot.createInvalidFile=[{0}]からWebResourceSetを作成できません。
-standardRoot.createNoFileResourceSet=FileResourceSet機能はまだ実装されていません。
 standardRoot.createUnknownType=未知のクラス [{0}] の WebResourceSet を作成できません。
 standardRoot.invalidPath=不正なリソースパス [{0}]
 standardRoot.invalidPathNormal=リソースパス[{0}]は有効ではない[{1}]に正規化されています。
diff --git a/java/org/apache/catalina/webresources/LocalStrings_ko.properties b/java/org/apache/catalina/webresources/LocalStrings_ko.properties
index f80d190..e0d288e 100644
--- a/java/org/apache/catalina/webresources/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/webresources/LocalStrings_ko.properties
@@ -41,7 +41,6 @@ fileResource.getUrlFail=리소스 [{0}]을(를) 위한 URL을 결정할 수 없
 fileResourceSet.notFile=base와 내부 경로 [{0}]{1}[{2}]에 의해 지정된 파일이 존재하지 않습니다.
 
 jarResource.getInputStreamFail=JAR [{1}] 내의 리소스 [{0}]을(를) 위한 InputStream을 얻을 수 없습니다.
-jarResource.getUrlFail=JAR [{1}] 내에 위치한 리소스 [{0}]을(를) 위한 URL을 결정할 수 없습니다.
 
 jarResourceRoot.invalidWebAppPath=이 리소스는 언제나 디렉토리를 가리켜서, 제공된 webAppPath가 반드시 ''/'' 로 끝나야 하지만, 제공된 webAppPath는 [{0}]이었습니다.
 
@@ -49,7 +48,6 @@ jarWarResourceSet.codingError=코딩 오류
 
 standardRoot.checkStateNotStarted=현재 시작되어 있는 상태가 아니라면, 리소스들은 접근될 수 없습니다.
 standardRoot.createInvalidFile=[{0}](으)로부터 WebResourceSet을 생성할 수 없습니다.
-standardRoot.createNoFileResourceSet=FileResourceSet 기능들이 아직 구현되지 않았습니다.
 standardRoot.createUnknownType=알 수 없는 타입 [{0}]의 WebResourceSet을 생성할 수 없습니다.
 standardRoot.invalidPath=리소스 경로 [{0}]은(는) 유효하지 않습니다.
 standardRoot.invalidPathNormal=리소스 경로 [{0}]이(가) [{1}](으)로 정규화되어 있는데, 이는 유효하지 않습니다.
diff --git a/java/org/apache/catalina/webresources/LocalStrings_zh_CN.properties b/java/org/apache/catalina/webresources/LocalStrings_zh_CN.properties
index 0201a68..792ac78 100644
--- a/java/org/apache/catalina/webresources/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/webresources/LocalStrings_zh_CN.properties
@@ -15,13 +15,13 @@
 
 cache.addFail=无法将位于[{0}]的资源添加到Web应用程序[{1}]的缓存中,因为在清除过期缓存条目后可用空间仍不足 - 请考虑增加缓存的最大空间。
 
+dirResourceSet.notDirectory=基本和内部路径[{0}] {1} [{2}]指定的目录不存在。
+
 extractingRoot.jarFailed=解压JAR文件[{0}]失败
 extractingRoot.targetFailed=无法为提取的 JAR 文件创建目录 [{0}]
 
 fileResource.getUrlFail=不能决定一个url 为资源[{0}]
 
-jarResource.getUrlFail=无法确定JAR[{1}]中的资源[{0}]的URL
-
 standardRoot.checkStateNotStarted=如果当前未启动资源,则可能无法访问这些资源
 standardRoot.createUnknownType=无法为未知类型[{0}]创建WebResourceSet。
 standardRoot.noContext=尚未为WebResourceRoot配置上下文
diff --git a/java/org/apache/coyote/LocalStrings_zh_CN.properties b/java/org/apache/coyote/LocalStrings_zh_CN.properties
index e83ba61..816027c 100644
--- a/java/org/apache/coyote/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/LocalStrings_zh_CN.properties
@@ -16,7 +16,7 @@
 abstractConnectionHandler.ioexception.debug=正常的 IOException,忽略
 abstractConnectionHandler.processorPop=从缓存中弹出的处理器[{0}]
 
-abstractProcessor.fallToDebug=注意:进一步出现的请求解析错误将在DEBUG级别进行记录。
+abstractProcessor.fallToDebug=注意:更多的请求解析错误将以DEBUG级别日志进行记录。
 abstractProcessor.hostInvalid=[{0}] 是无效主机
 abstractProcessor.httpupgrade.notsupported=此协议不支持HTTP升级(upgrade)。
 abstractProcessor.socket.ssl=获取SSL属性异常
diff --git a/java/org/apache/coyote/ajp/LocalStrings_es.properties b/java/org/apache/coyote/ajp/LocalStrings_es.properties
index bcb67a6..947ebc2 100644
--- a/java/org/apache/coyote/ajp/LocalStrings_es.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings_es.properties
@@ -18,11 +18,8 @@ ajpmessage.null=No puedo añadir valor nulo
 ajpmessage.overflow=Error de desbordamiento en búfer al añadir [{0}] bytes en posición [{1}]
 
 ajpprocessor.certs.fail=Fallo en conversión de Certificado
-ajpprocessor.failedread=Fallo en lectura de Conector
-ajpprocessor.failedsend=No pude enviar mensaje AJP
 ajpprocessor.header.error=Fallo en análisis de mensaje de cabecera
 ajpprocessor.request.prepare=Error preparando requerimiento
 ajpprocessor.request.process=Error procesando requerimiento
 
 ajpprotocol.noUpgrade=Actualización (upgrade) no esta soportada para AJP. Se ha ignorado la configuración UpgradeProtocol para [{0}]
-ajpprotocol.proto.error=Error leyendo requerimiento, ignorado
diff --git a/java/org/apache/coyote/ajp/LocalStrings_fr.properties b/java/org/apache/coyote/ajp/LocalStrings_fr.properties
index 4ad6f41..ebd69bd 100644
--- a/java/org/apache/coyote/ajp/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings_fr.properties
@@ -21,8 +21,6 @@ ajpmessage.null=Impossible d'ajouter une valeur nulle.
 ajpmessage.overflow=Débordement du tampon en ajoutant [{0}] octets à la position [{1}]
 
 ajpprocessor.certs.fail=La conversion du certificat a échouée
-ajpprocessor.failedread=La lecture sur le socket a échoué
-ajpprocessor.failedsend=Impossible d'envoyer le message AJP
 ajpprocessor.header.error=Erreur de traitement du message d'en-tête
 ajpprocessor.header.tooLong=Un en-tête de message de taille [{0}] a été reçu mais la packtSize est de seulement [{1}]
 ajpprocessor.readtimeout=Timeout lors de la lecture de données sur le socket
diff --git a/java/org/apache/coyote/ajp/LocalStrings_ja.properties b/java/org/apache/coyote/ajp/LocalStrings_ja.properties
index 895a496..8df6a32 100644
--- a/java/org/apache/coyote/ajp/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings_ja.properties
@@ -21,8 +21,6 @@ ajpmessage.null=null 値は追加できません。
 ajpmessage.overflow=バッファーの位置 [{1}] へ [{0}] バイトのデータを追加しようとして、オーバーフローエラーが発生しました。
 
 ajpprocessor.certs.fail=証明書変換に失敗しました。
-ajpprocessor.failedread=ソケット読み取りに失敗しました
-ajpprocessor.failedsend=AJP メッセージを送信できません。
 ajpprocessor.header.error=ヘッダーメッセージの解析に失敗しました
 ajpprocessor.header.tooLong=受信したヘッダーに指定されたメッセージ長は [{0}] ですがpacketSize は [{1}] しかありません。
 ajpprocessor.readtimeout=ソケットからのデータの読み取りをタイムアウトにします。
diff --git a/java/org/apache/coyote/ajp/LocalStrings_ko.properties b/java/org/apache/coyote/ajp/LocalStrings_ko.properties
index 9088c3e..1b6d542 100644
--- a/java/org/apache/coyote/ajp/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings_ko.properties
@@ -21,8 +21,6 @@ ajpmessage.null=널 값을 추가할 수 없습니다.
 ajpmessage.overflow=버퍼에 [{0}] 바이트들을 위치 [{1}]에 추가하는 동안 오버플로우 오류 발생
 
 ajpprocessor.certs.fail=인증서를 변환시키지 못했습니다.
-ajpprocessor.failedread=소켓 읽기가 실패했습니다.
-ajpprocessor.failedsend=AJP 메시지를 전송하지 못했습니다.
 ajpprocessor.header.error=헤더 메시지를 파싱하지 못했습니다.
 ajpprocessor.header.tooLong=길이가 [{0}]인 헤더 메시지를 받았지만, 패킷 크기는 단지 [{1}]입니다.
 ajpprocessor.readtimeout=소켓으로부터 데이터를 읽으려는 시도가 제한 시간 초과되었습니다.
diff --git a/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties b/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties
index d028884..d69f014 100644
--- a/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties
@@ -16,7 +16,6 @@
 ajpmessage.null=不能赋空值
 ajpmessage.overflow=在缓冲区[{1}]位置添加[{0}]字节时发生溢出错误
 
-ajpprocessor.failedsend=失败的发送AJP消息
 ajpprocessor.header.error=头部信息解析失败
 
 ajpprotocol.noUpgrade=AJP 不支持升级。[{0}] 的升级协议配置被忽略。
diff --git a/java/org/apache/coyote/http11/LocalStrings_de.properties b/java/org/apache/coyote/http11/LocalStrings_de.properties
index b8dcbbe..577c224 100644
--- a/java/org/apache/coyote/http11/LocalStrings_de.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_de.properties
@@ -20,4 +20,3 @@ http11processor.socket.info=Ausnahme beim Lesen der Informationen zum Socket
 iib.invalidmethod=Ungültiges Zeichen in Methoden Namen gefunden. HTTP Methoden Namen müssen Token nach RFC-7230 sein
 
 iob.failedwrite=Fehlgeschlagener Schreibvorgang
-iob.illegalreset=Die Server-Antwort kann nicht zurück gesetzt werden nachdem sie schon freigegeben wurde.
diff --git a/java/org/apache/coyote/http11/LocalStrings_es.properties b/java/org/apache/coyote/http11/LocalStrings_es.properties
index ab2f17c..422a2ad 100644
--- a/java/org/apache/coyote/http11/LocalStrings_es.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_es.properties
@@ -14,13 +14,11 @@
 # limitations under the License.
 
 http11processor.header.parse=Error analizando cabecera de requerimiento HTTP
-http11processor.neverused=Este método no debería de usarse nunca
 http11processor.request.finish=Error acabando requerimiento
 http11processor.request.prepare=Error preparando solicitud
 http11processor.request.process=Error procesando requerimiento
 http11processor.response.finish=Error acabando respuesta
 http11processor.socket.info=Excepción obteniendo información de conector
-http11processor.socket.sslreneg=Excepción renegociando la conexión SSL
 
 iib.eof.error=Inesperado Fin De Archivo (EOF) leído en el enchufe (socket)
 iib.invalidmethod=Se encontró un carácter inválido en el nombre del método. Los nombres de métodos HTTP deben ser tokens
@@ -28,5 +26,4 @@ iib.parseheaders.ise.error=Estado inesperado: las cabeceras ya fueron parseadas.
 iib.requestheadertoolarge.error=La cabecera del requerimiento es demasido grande
 
 iob.failedwrite=Fallo de escritura
-iob.illegalreset=La respuesta no podrá cambiarse una vez que ha sido enviada
 iob.responseheadertoolarge.error=Un intento para escribir más datos en las cabeceras de respuesta escribir fue hecho, sin embargo no hay más espacio disponible en el bufer. Aumente el parámetro maxHttpHeaderSize en el conector o escribe menos datos en las respuestas de las cabeceras.\n
diff --git a/java/org/apache/coyote/http11/LocalStrings_fr.properties b/java/org/apache/coyote/http11/LocalStrings_fr.properties
index 0a004e0..cdc2d50 100644
--- a/java/org/apache/coyote/http11/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_fr.properties
@@ -19,14 +19,15 @@ abstractHttp11Protocol.httpUpgradeConfigured=Le connecteur [{0}] a été configu
 
 http11processor.fallToDebug=\ Note: toutes les occurrences suivantes d'erreurs d'analyse des requêtes HTTP seront enregistrées au niveau DEBUG
 http11processor.header.parse=Erreur lors de l'analyse d'un en-tête de requête HTTP
-http11processor.neverused=Cette méthode ne devrait jamais être utilisée
 http11processor.request.finish=Erreur en terminant la requête
 http11processor.request.inconsistentHosts=L'hôte spécifié dans la ligne de requête ne correspond pas à celui de l'en-tête hôte
 http11processor.request.invalidScheme=La requête HTTP contenait une URi absolue avec un schéma invalide
 http11processor.request.invalidUri==La requête HTTP contenait une URI invalide
 http11processor.request.invalidUserInfo=La requête HTTP contenait un URI absolu avec un composant "userinfo" invalide
+http11processor.request.multipleContentLength=La requête contenait plusieurs en-têtes content-length
 http11processor.request.multipleHosts=La requête contenait plusieurs en-têtes hôtes
 http11processor.request.noHostHeader=La requ6ete HTTP/1.1 ne contient pas d'en-tête host
+http11processor.request.nonNumericContentLength=La requête contenait un en-tête content-length avec une valeur non numérique
 http11processor.request.prepare=Echec de préparation de la requête
 http11processor.request.process=Erreur de traitement de la requête
 http11processor.response.finish=Erreur en finissant la réponse
@@ -44,9 +45,7 @@ iib.invalidmethod=Caractère invalide trouvé dans le nom de méthode.  Les noms
 iib.parseheaders.ise.error=Etat inattendu, les en-êtres ont déjà été traités, il est possible que le buffer n'ait pas été recyclé
 iib.readtimeout=Délai d'attente dépassé en lisant des données du socket
 iib.requestheadertoolarge.error=L'entête de requête est trop important
-iib.socketClosed=Le socket a été fermé dans un autre thread
 
 iob.failedwrite=Echec d'écriture
 iob.failedwrite.ack=Echec d'envoi de la réponse HTTP 100 Continue
-iob.illegalreset=La réponse ne peut être modifiée après avoir été finalisée ("committed")
 iob.responseheadertoolarge.error=Essai d'écriture de plus de données dans les en-t^tes de réponse, qu'il n'y a de place disponible dans le tampon.  Augmentez maxHttpHeaderSize pour le connecteur, ou écrivez moins de données dans les en-têtes de réponse.
diff --git a/java/org/apache/coyote/http11/LocalStrings_ja.properties b/java/org/apache/coyote/http11/LocalStrings_ja.properties
index 1460337..82b5580 100644
--- a/java/org/apache/coyote/http11/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_ja.properties
@@ -19,7 +19,6 @@ abstractHttp11Protocol.httpUpgradeConfigured=コネクタ[{0}]は、[{1}]へのH
 
 http11processor.fallToDebug=注:HTTPリクエスト構文解析エラーがさらに発生すると、DEBUGレベルでログに記録されます。
 http11processor.header.parse=HTTP リクエストヘッダーを解釈できませんでした。
-http11processor.neverused=このメソッドは決して使用されません。
 http11processor.request.finish=リクエスト終了処理エラー
 http11processor.request.inconsistentHosts=リクエストラインに指定されたホストが Host ヘッダーの値と矛盾しています。
 http11processor.request.invalidScheme=HTTP リクエストに不正なスキーマを指定した完全 URI が含まれています。
@@ -44,9 +43,7 @@ iib.invalidmethod=HTTP メソッド名に不正な文字が含まれています
 iib.parseheaders.ise.error=予期しない状態:ヘッダがすでに解析されています。 バッファはリサイクルされていませんか?
 iib.readtimeout=ソケットからデータを読み取ろうとしている際のタイムアウト
 iib.requestheadertoolarge.error=リクエストヘッダが長すぎます
-iib.socketClosed=このソケットは他のスレッドにより切断されています。
 
 iob.failedwrite=書き込みが失敗しました。
 iob.failedwrite.ack=HTTP 100 continue レスポンスの送信に失敗しました
-iob.illegalreset=1度でもコミットしたレスポンスはリセットできません。
 iob.responseheadertoolarge.error=レスポンスヘッダーにバッファー領域より大きなデータの書き込みが発生しました。データを小さくするか Connector の maxHttpHeaderSize を大きくしてください。
diff --git a/java/org/apache/coyote/http11/LocalStrings_ko.properties b/java/org/apache/coyote/http11/LocalStrings_ko.properties
index 235c194..af5e5cb 100644
--- a/java/org/apache/coyote/http11/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_ko.properties
@@ -20,14 +20,15 @@ abstractHttp11Protocol.httpUpgradeConfigured=[{0}] connector가, [{1}](으)로 H
 http11processor.fallToDebug=\n\
 비고: HTTP 요청 파싱 오류들이 더 발생하는 경우 DEBUG 레벨 로그로 기록될 것입니다.
 http11processor.header.parse=HTTP 요청 헤더를 파싱하는 중 오류 발생
-http11processor.neverused=이 메소드는 절대 사용되서는 안됩니다.
 http11processor.request.finish=요청을 완료하는 중 오류 발생
 http11processor.request.inconsistentHosts=요청 행(request line)에 지정된 호스트가, 호스트 헤더와 일관되지 않습니다.
 http11processor.request.invalidScheme=HTTP 요청이 유효하지 않은 스킴을 가진 절대 URI를 포함했습니다.
 http11processor.request.invalidUri==HTTP 요청이 유효하지 않은 URI를 포함했습니다.
 http11processor.request.invalidUserInfo=HTTP 요청이, 유효하지 않은 userinfo를 가진 절대 URI를 포함했습니다.
+http11processor.request.multipleContentLength=해당 요청이 복수 개의 Content-Length 헤더들을 포함했습니다.
 http11processor.request.multipleHosts=요청이 여러 개의 호스트 헤더들을 포함했습니다.
 http11processor.request.noHostHeader=HTTP/1.1 요청이 호스트 헤더를 제공하지 않았습니다.
+http11processor.request.nonNumericContentLength=해당 요청이 숫자가 아닌 Content-Length 헤더 값을 포함했습니다.
 http11processor.request.prepare=요청을 준비하는 중 오류 발생
 http11processor.request.process=요청 처리 중 오류 발생
 http11processor.response.finish=응답을 완료하는 중 오류 발생
@@ -45,9 +46,7 @@ iib.invalidmethod=메소드 이름에 유효하지 않은 문자가 발견되었
 iib.parseheaders.ise.error=예기치 않은 상태: 헤더들이 이미 파싱되었습니다. 버퍼가 참조 해제되지 않았었나요?
 iib.readtimeout=소켓으로부터 데이터를 읽으려 시도하는 중 제한 시간 초과
 iib.requestheadertoolarge.error=요청 헤더가 너무 큽니다.
-iib.socketClosed=소켓이 다른 쓰레드에서 이미 닫혔습니다.
 
 iob.failedwrite=쓰기 실패
 iob.failedwrite.ack=HTTP 100 continue 응답을 보내지 못했습니다.
-iob.illegalreset=응답이 한번 커밋되면, 응답에 대한 재설정(reset)은 허용되지 않습니다.
 iob.responseheadertoolarge.error=응답 헤더들에 가용한 버퍼 공간을 초과하는 데이터를 쓰려는 시도가 발생했습니다. 해당 Connector의 maxHttpHeaderSize를 증가시키거나, 응답 헤더들에 보다 적은 데이터를 쓰도록 하십시오.
diff --git a/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties b/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties
index 9afd03b..74776f4 100644
--- a/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties
@@ -26,7 +26,8 @@ iib.eof.error=套接字读取到意外的EOF
 iib.filter.npe=你不能添加空过滤器(null)
 iib.invalidheader=HTTP header行 [{0}] 不符合RFC 7230并且已被忽略。
 iib.invalidmethod=在方法名称中发现无效的字符串, HTTP 方法名必须是有效的符号.
+iib.parseheaders.ise.error=意外状态:已解析标头。 缓冲池不回收?
 iib.readtimeout=从套接字读取数据超时
 
 iob.failedwrite=写入.失败
-iob.illegalreset=response一旦提交不允许被重置
+iob.responseheadertoolarge.error=尝试将更多数据写入响应标头,而不是缓冲区中有可用空间。 增加连接器上的maxHttpHeaderSize或将更少的数据写入响应头。
diff --git a/java/org/apache/coyote/http2/LocalStrings_es.properties b/java/org/apache/coyote/http2/LocalStrings_es.properties
index 9370a58..df04f64 100644
--- a/java/org/apache/coyote/http2/LocalStrings_es.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_es.properties
@@ -43,7 +43,6 @@ stream.reprioritisation.debug=Conexión [{0}], Flujo [{1}], Exclusivo [{2}], Pad
 streamProcessor.error.connection=Conexión [{0}], Flujo [{1}], Ha ocurrido un error el procesamiento que fue fatal para la conexión
 
 streamStateMachine.debug.change=Conexión [{0}], Flujo [{1}], Estado cambió de [{2}] a [{3}]
-streamStateMachine.invalidReset=Conexión [{0}], Flujo [{1}], Estado [{2}], No se permite Reset en este estado
 
 upgradeHandler.allocate.left=Conexión [{0}], Flujo [{1}], [{2}] bytes no asignados -  tratando de asignar en el hijo
 upgradeHandler.allocate.recipient=Conexión [{0}], Flujo [{1}], recipiente potencial [{2}] con peso [{3}]
diff --git a/java/org/apache/coyote/http2/LocalStrings_fr.properties b/java/org/apache/coyote/http2/LocalStrings_fr.properties
index 17dbc81..ba99928 100644
--- a/java/org/apache/coyote/http2/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_fr.properties
@@ -44,6 +44,7 @@ hpackdecoder.tableSizeUpdateNotAtStart=Toute mise à jour de la taille de la tab
 hpackdecoder.zeroNotValidHeaderTableIndex=Zéro n'est pas un index valide dans la table des en-têtes
 
 hpackhuffman.huffmanEncodedHpackValueDidNotEndWithEOS=La valeur encodée en Huffman dans les en-têtes HPACK n'avait pas de données tampon d'EOS
+hpackhuffman.stringLiteralEOS=La valeur encodée en Huffman dans les en-têtes HPACK contenait le symbole d'EOS
 hpackhuffman.stringLiteralTooMuchPadding=Plus de 7 bits de données tampon de fin de flux ont été fournis à la fin d'une chaîne encodée avec Huffman
 
 http2Parser.headerLimitCount=Connection [{0}], Slux [{1}], Trop d''en-têtes
@@ -60,19 +61,14 @@ http2Parser.processFrame.unexpectedType=Attendu une trame de type [{0}] mais re
 http2Parser.processFrameContinuation.notExpected=Connection [{0}], La trame de continuation a été reçue pour le flux [{1}] alors qu''aucun trainement d''en-têtes n''était en cours
 http2Parser.processFrameData.lengths=Connection [{0}], Flux [{1}], Taille des données, [{2}], Taille des données tampon [{3}]
 http2Parser.processFrameData.window=Connection [{0}], le client a envoyé plus de données que la "stream window" ne le permet
-http2Parser.processFrameGoaway.payloadTooSmall=Connection [{0}]: La taille de données du Goaway était [{1}] ce qui est moins que le minimum de 8
 http2Parser.processFrameHeaders.decodingDataLeft=Des données restent après le décodage de HPACK, elles auraient dû être consommées
 http2Parser.processFrameHeaders.decodingFailed=Une erreur de décodage HPACK des en-têtes HTTP s'est produite
 http2Parser.processFrameHeaders.payload=Connection [{0}], Flux [{1}], Traitement des en-têtes avec une taille de données de [{2}]
-http2Parser.processFramePing.invalidPayloadSize=Une trame de paramètres avec une taille de données invalide de [{0}] a été reçue (elle devrait être de 8)
 http2Parser.processFramePriority.invalidParent=Connection [{0}], Flux [{1}], Un flux ne peut pas dépendre de lui-même
-http2Parser.processFramePriority.invalidPayloadSize=Trame prioritaire recue avec une charge utile de taille [{0}] (devrait être 5)
 http2Parser.processFramePushPromise=Connexion [{0}], Flux (Stream) [{1}], les trames de promesse d''envoi ("Push promise frames") ne doivent pas être envoyées par le client.
 http2Parser.processFrameSettings.ackWithNonZeroPayload=La trame de paramètres a été reçue avec un indicateur ACK activé et des données présentes
-http2Parser.processFrameSettings.invalidPayloadSize=La trame de paramètres a été reçue avec une taille de données de [{0}] qui n''est pas un multiple de 6
 http2Parser.processFrameWindowUpdate.debug=Connection [{0}], Flux [{1}], Incrémentation de [{2}] de la taille de fenêtre
 http2Parser.processFrameWindowUpdate.invalidIncrement=La trame de mise à jour de la fenêtre a été reçue avec un incrément invalide [{0}]
-http2Parser.processFrameWindowUpdate.invalidPayloadSize=La trame de mise à jour de la fenêtre a été reçue avec une taille de données invalide de [{0}]
 http2Parser.swallow.debug=Connection [{0}], Flux [{1}], Avalé [{2}] octets
 
 pingManager.roundTripTime=Connection [{0}] Le temps d''aller retour est de [{1}]ns
@@ -112,7 +108,6 @@ streamProcessor.service.error=Erreur durant le traitement de la requête
 
 streamStateMachine.debug.change=Connection [{0}], Flux [{1}], L’état a changé de [{2}] vers [{3}]
 streamStateMachine.invalidFrame=Connection [{0}], Flux [{1}], Etat [{2}], Type de trame [{3}]
-streamStateMachine.invalidReset=Connection [{0}], Stream [{1}], Etat [{2}], Reset n''est pas permitted dans cet Etat
 
 upgradeHandler.allocate.debug=Connection [{0}], Flux [{1}], [{2}] octets alloués
 upgradeHandler.allocate.left=Connection [{0}], Flux [{1}], [{2}] octets désalloués, essai d''allocation aux enfants
@@ -144,7 +139,6 @@ upgradeHandler.stream.old=Un nouveau flux distant avec l''ID [{0}] a été deman
 upgradeHandler.tooManyRemoteStreams=Le client a essayé d''utiliser plus de [{0}] flux actifs
 upgradeHandler.tooMuchOverhead=Connection [{0}], Le traitement est trop coûteux donc la connection sera fermée
 upgradeHandler.unexpectedAck=Connection [{0}], Flux [{1}], Une notification de réception de paramètres a été reçue alors qu''aucune n''était attendue
-upgradeHandler.unexpectedEos=Fin de flux inattendue
 upgradeHandler.upgrade=Connexion [{0}], HTTP/1.1 transformée en flux [1]
 upgradeHandler.upgrade.fail=Connection [{0}], Echec de l''upgrade de HTTP/1.1
 upgradeHandler.upgradeDispatch.entry=Entrée, Connection [{0}], SocketStatus [{1}]
diff --git a/java/org/apache/coyote/http2/LocalStrings_ja.properties b/java/org/apache/coyote/http2/LocalStrings_ja.properties
index 5d1e1ff..dd92f46 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ja.properties
@@ -58,19 +58,14 @@ http2Parser.processFrame.unexpectedType=予想されるフレームタイプ[{0}
 http2Parser.processFrameContinuation.notExpected=コネクション[{0}]、進行中のヘッダーがないときにストリーム[{1}]のContinuationフレームが受信されました
 http2Parser.processFrameData.lengths=コネクション[{0}]、ストリーム[{1}]、データ長、[{2}]、パディング長[{3}]
 http2Parser.processFrameData.window=コネクション [{0}]、クライアントはストリームウインドウサイズより大きなデータを送信しました。
-http2Parser.processFrameGoaway.payloadTooSmall=コネクション [{0}]: GoAway のペイロードサイズ [{1}] が最小値の 8 より小さい。
 http2Parser.processFrameHeaders.decodingDataLeft=HPAC をデコードしたのにデータが残っています。すべて使用するべきです。
 http2Parser.processFrameHeaders.decodingFailed=HTTP ヘッダーの HPACK 復号化中にエラーが発生しました。
 http2Parser.processFrameHeaders.payload=コネクション[{0}]、ストリーム[{1}]、サイズ[{2}]のヘッダーペイロードを処理中
-http2Parser.processFramePing.invalidPayloadSize=無効なペイロードサイズ[{0}]で受信されたSettings フレーム(8である必要があります)
 http2Parser.processFramePriority.invalidParent=コネクション[{0}]、ストリーム[{1}]、ストリーム自体に依存しない可能性があります。
-http2Parser.processFramePriority.invalidPayloadSize=不正なペイロードサイズ [{0}] (5になるべき) のPriority フレームを受信しました。
 http2Parser.processFramePushPromise=コネクション [{0}]、ストリーム [{1}]、クライアントから PUSH_PROMISE フレームを送信するべきではありません。
 http2Parser.processFrameSettings.ackWithNonZeroPayload=ACKフラグがセットされ、ペイロードが存在する状態で受信されたSettingsフレーム
-http2Parser.processFrameSettings.invalidPayloadSize=受信したSettings フレームのペイロードサイズ [{0}] は6の倍数ではありません。
 http2Parser.processFrameWindowUpdate.debug=コネクション [{0}]、ストリーム [{1}]、ウインドウサイズを [{2}] に拡大します。
 http2Parser.processFrameWindowUpdate.invalidIncrement=無効な増分サイズ[{0}]で受信されたWindow Updateフレーム
-http2Parser.processFrameWindowUpdate.invalidPayloadSize=無効なペイロードサイズ[{0}]で受信されたウィンドウ更新フレーム
 http2Parser.swallow.debug=コネクション[{0}]、ストリーム[{1}]、飲み込まれた[{2}]バイト
 
 pingManager.roundTripTime=コネクション [{0}] の往復時間は [{1}] ns でした。
@@ -109,7 +104,6 @@ streamProcessor.service.error=リクエスト処理中のエラー
 
 streamStateMachine.debug.change=コネクション [{0}]、ストリーム [{1}]、状態を [{2}] から [{3}] へ変更しました。
 streamStateMachine.invalidFrame=コネクション [{0}]、ストリーム [{1}]、状態 [{2}]、フレーム種類 [{3}]
-streamStateMachine.invalidReset=コネクション[{0}]、ストリーム[{1}]、状態[{2}]、リセットはこの状態では許可されていません
 
 upgradeHandler.allocate.debug=コネクション[{0}]、ストリーム[{1}]、割り当てられた[{2}]バイト
 upgradeHandler.allocate.left=コネクション[{0}]、ストリーム[{1}]、[{2}]バイトが未割り当て - 子への割り当てを試みています。
@@ -140,7 +134,6 @@ upgradeHandler.stream.old=新しいリモートストリーム ID [{0}] を要
 upgradeHandler.tooManyRemoteStreams=クライアントは[{0}]以上のアクティブなストリームを使用しようとしました
 upgradeHandler.tooMuchOverhead=Connection [{0}]、オーバーヘッドが多すぎるため、接続が閉じられます。
 upgradeHandler.unexpectedAck=コネクション[{0}]、ストリーム[{1}]、予期しないときにsettings ackを受信しました。
-upgradeHandler.unexpectedEos=予期しないストリームの終わり
 upgradeHandler.upgrade=コネクション[{0}]、ストリーム[1]へのHTTP / 1.1 upgrade
 upgradeHandler.upgrade.fail=コネクション[{0}]、HTTP / 1.1のアップグレードに失敗しました
 upgradeHandler.upgradeDispatch.entry=エントリ、コネクション[{0}]、ソケット状態 [{1}]
diff --git a/java/org/apache/coyote/http2/LocalStrings_ko.properties b/java/org/apache/coyote/http2/LocalStrings_ko.properties
index 5d04078..c78ed8f 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ko.properties
@@ -44,6 +44,7 @@ hpackdecoder.tableSizeUpdateNotAtStart=테이블 크기 변경은, 반드시 헤
 hpackdecoder.zeroNotValidHeaderTableIndex=0은 유효한 헤더 테이블 인덱스가 아닙니다.
 
 hpackhuffman.huffmanEncodedHpackValueDidNotEndWithEOS=HPACK 헤더들 내의 Huffman 알고리즘으로 인코딩된 값이, EOS padding으로 끝나지 않았습니다.
+hpackhuffman.stringLiteralEOS=HPACK 헤더들 내의 Huffman 알고리즘으로 인코딩된 값이, EOS 부호를 포함했습니다.
 hpackhuffman.stringLiteralTooMuchPadding=Huffman 알고리즘으로 인코딩된 문자열의 끝에 7 비트를 초과한 EOS padding입니다.
 
 http2Parser.headerLimitCount=연결 [{0}], 스트림 [{1}], 너무 많은 헤더들이 있음
@@ -60,19 +61,14 @@ http2Parser.processFrame.unexpectedType=프레임 타입 [{0}]이(가) 요구되
 http2Parser.processFrameContinuation.notExpected=연결 [{0}]: 헤더들이 아무 것도 진행되지 않은 상태에서, 스트림 [{1}]을(를) 위한 Continuation 프레임을 받았습니다.
 http2Parser.processFrameData.lengths=연결 [{0}], 스트림 [{1}], 데이터 길이, [{2}], Padding 길이 [{3}]
 http2Parser.processFrameData.window=연결 [{0}]: 클라이언트가 스트림 윈도우가 허용하는 데이터 크기보다 더 많은 데이터를 전송했습니다.
-http2Parser.processFrameGoaway.payloadTooSmall=연결 [{0}]: Goaway payload 크기가 [{1}]였는데, 이는 최소값인 8보다 적습니다.
 http2Parser.processFrameHeaders.decodingDataLeft=HPACK 디코딩 후 남아있는 데이터 - 반드시 소비되었어야 합니다.
 http2Parser.processFrameHeaders.decodingFailed=HTTP 헤더들의 HPACK 디코딩 과정에서 오류가 있었습니다.
 http2Parser.processFrameHeaders.payload=연결 [{0}], 스트림 [{1}], 크기가 [{2}]인 헤더들의 payload를 처리합니다.
-http2Parser.processFramePing.invalidPayloadSize=유효하지 않은 payload 크기 [{0}]의 Settings 프레임을 받았습니다. (크기는 8이어야 합니다.)
 http2Parser.processFramePriority.invalidParent=연결 [{0}], 스트림 [{1}], 스트림이 그 자신을 의존할 수는 없습니다.
-http2Parser.processFramePriority.invalidPayloadSize=유효하지 않은 payload 크기 [{0}]와(과) 함께 Priority 프레임을 받았습니다. (5이어야 합니다.)
 http2Parser.processFramePushPromise=연결 [{0}], 스트림 [{1}], Push promise 프레임들이 클라이언트에 의해 전송되어서는 안됩니다.
 http2Parser.processFrameSettings.ackWithNonZeroPayload=ACK 플래그가 설정되고 payload가 존재하는, Settings 프레임을 받았습니다.
-http2Parser.processFrameSettings.invalidPayloadSize=Payload 크기가, 6의 배수가 아니라, [{0}]인 Settings 프레임을 받았습니다.
 http2Parser.processFrameWindowUpdate.debug=연결 [{0}], 스트림 [{1}], 윈도우 크기를 [{2}] 만큼 증가 시킵니다.
 http2Parser.processFrameWindowUpdate.invalidIncrement=유효하지 않은 증분 크기인 [{0}]와(과) 함께, 윈도우 변경 프레임을 받았습니다.
-http2Parser.processFrameWindowUpdate.invalidPayloadSize=유효하지 않은 크기([{0}])의 payload를 가진 윈도우 변경 프레임을 받았습니다.
 http2Parser.swallow.debug=연결 [{0}], 스트림 [{1}], [{2}] 바이트를 처리하지 않고 건너뛰었습니다.
 
 pingManager.roundTripTime=연결 [{0}]: 라운드 트립 시간이 [{1}] 나노초(ns)로 측정되었습니다.
@@ -112,7 +108,6 @@ streamProcessor.service.error=요청 처리 중 오류 발생
 
 streamStateMachine.debug.change=연결 [{0}], 스트림 [{1}], 상태가 [{2}]에서 [{3}](으)로 변경됨.
 streamStateMachine.invalidFrame=연결 [{0}], 스트림 [{1}], 상태 [{2}], 프레임 타입 [{3}]
-streamStateMachine.invalidReset=연결 [{0}], 스트림 [{1}], 상태 [{2}], 이 상태에서 재설정(reset)은 허용되지 않습니다.
 
 upgradeHandler.allocate.debug=연결 [{0}], 스트림 [{1}], [{2}] 바이트를 할당함.
 upgradeHandler.allocate.left=연결 [{0}], 스트림 [{1}], [{2}] 바이트들이 할당 해제되었습니다 - 자식들에 할당하려 시도합니다.
@@ -144,7 +139,6 @@ upgradeHandler.stream.old=새로운 원격 스트림 ID [{0}]이(가) 요청되
 upgradeHandler.tooManyRemoteStreams=클라이언트가, 활성화된 스트림들을 [{0}]개를 초과하여 사용하려 시도했습니다.
 upgradeHandler.tooMuchOverhead=연결 [{0}]: 너무 많은 오버헤드로 인하여 연결이 닫힐 것입니다.
 upgradeHandler.unexpectedAck=연결 [{0}], 스트림 [{1}], 예기치 않은 상황에서 settings acknowledgement를 받았습니다.
-upgradeHandler.unexpectedEos=예기치 않은 스트림의 끝
 upgradeHandler.upgrade=연결 [{0}]: HTTP/1.1이 스트림 [1](으)로 업그레이드됩니다.
 upgradeHandler.upgrade.fail=연결 [{0}], HTTP/1.1 업그레이드 실패
 upgradeHandler.upgradeDispatch.entry=엔트리, 연결 [{0}], SocketStatus [{1}]
diff --git a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
index 900f3fe..1ea4638 100644
--- a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
@@ -20,6 +20,10 @@ connectionPrefaceParser.mismatch=请求了新的远程流ID[{0}],但所有远
 connectionSettings.debug=连接[{0}],参数类型[{1}]设置为[{2}]
 connectionSettings.headerTableSizeLimit=连接 [{0}],尝试将 header 表大小设置为 [{1}],但限制为 16k
 connectionSettings.maxFrameSizeInvalid=连接[{0}],请求的最大帧大小[{1}]在[{2}]到[{3}]的允许范围之外
+connectionSettings.unknown=连接[{0}],标识为[{1}]和值为[{2}]的未知设置被忽略
+
+frameType.checkPayloadSize=对帧类型[{1}]来说,负载[{0}]是无效的
+frameType.checkStream=无效的帧类型[{0}]
 
 hpack.invalidCharacter=代码点[{1}]处的Unicode字符[{0}]无法编码,因为它超出了允许的0到255范围。
 
@@ -31,28 +35,37 @@ http2Parser.nonZeroPadding=连接[{0}],流[{1}],非零填充
 http2Parser.preface.invalid=出现无效连接
 http2Parser.processFrameData.window=连接[{0}],客户端发送的数据比流窗口允许的多
 http2Parser.processFrameHeaders.decodingDataLeft=数据在HPACK解码后依然保留 - 它本应该被消费掉
-http2Parser.processFramePriority.invalidPayloadSize=以[{0}]无效的有效负载大小接收的优先级帧(应该是5)
 http2Parser.processFramePushPromise=请求了新的远程流ID[{0}],但所有远程流都必须使用奇数标识符\n\
 \n
 
+stream.closed=连接[{0}],流[{1}],一旦关闭就无法写入流
+stream.header.debug=连接[{0}],流[{1}],HTTP标头[{2}],值[{3}]
+stream.header.noPath=连接[{0}],流[{1}],[:path]伪标头为空
+stream.header.unknownPseudoHeader=收到连接[{0}],流[{1}],未知伪标头[{2}]
 stream.inputBuffer.readTimeout=等待从客户端读取数据超时
 stream.inputBuffer.reset=流.重置
+stream.inputBuffer.signal=读线程在等待时,数据被添加到inBuffer中。 发信号通知该线程继续
+stream.reprioritisation.debug=连接[{0}],流[{1}],独占[{2}],父[{3}],权重[{4}]
 stream.writeTimeout=等待客户端增加流控制窗口以允许写入流数据的超时
 
 streamProcessor.cancel=连接到[{0}],Stream [{1}],
 streamProcessor.error.connection=连接[{0}],Stream[{0}],处理中发生错误,对连接来说是致命的。
 streamProcessor.service.error=请求处理期间出错
 
-streamStateMachine.invalidReset=连接[{0}],流[{1}],状态[{2}],在这种状态下不允许重置
-
+upgradeHandler.allocate.left=连接[{0}],流[{1}],[{2}]字节未分配 - 尝试分配给子项
 upgradeHandler.ioerror=连接[{0}]
 upgradeHandler.pingFailed=对客户端发送ping 链接失败.
+upgradeHandler.prefaceReceived=连接[{0}],从客户端收到连接准备。
+upgradeHandler.pruneIncomplete=连接[{0}],流[{1}],无法完全修剪连接,因为有[{2}]个活动流太多
+upgradeHandler.prunedPriority=连接[{0}]已经成为了属于优先级树中未使用的流[{1}]
+upgradeHandler.rst.debug=连接[{0}],流[{1}],错误[{2}],消息[{3}],RST(关闭流)
 upgradeHandler.sendPrefaceFail=连接[{0}],给客户端发送前言失败
 upgradeHandler.socketCloseFailed=关闭 socket 错误
 upgradeHandler.stream.even=\ 请求了新的远程流ID[{0}],但所有远程流都必须使用奇数标识符\n\
 \n
 upgradeHandler.tooMuchOverhead=连接[{0}],开销过大,连接将关闭
 upgradeHandler.upgrade=连接[{0}], HTTP/1.1 升级到流[1]
+upgradeHandler.upgradeDispatch.entry=条目,连接[{0}],SocketStatus [{1}]
 upgradeHandler.upgradeDispatch.exit=退出,连接[{0}], SocketState[{1}]
 upgradeHandler.writeBody=连接 [{0}],数据流[{1}], 数据长度[{2}]
 upgradeHandler.writeHeaders=连接 [{0}],流 [{1}]
diff --git a/java/org/apache/jasper/resources/LocalStrings_de.properties b/java/org/apache/jasper/resources/LocalStrings_de.properties
index c84f68e..826a08b 100644
--- a/java/org/apache/jasper/resources/LocalStrings_de.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_de.properties
@@ -42,7 +42,6 @@ jsp.error.noFunction=Die Funktion [{0}] kann mit dem angegebenen Prefix nicht ge
 jsp.error.not.in.template=[{0}] ist nicht im Body des Template Textes erlaubt
 jsp.error.outputfolder=kein Ausgabeordner
 jsp.error.parse.xml=Fehler bei der Verarbeitung der XML Datei [{0}]
-jsp.error.plugin.wrongRootElement=Der Name des Wurzel Elementes in [{0}] ist unterschiedlich zu dem von [{1}]
 jsp.error.scripting.variable.missing_name=Kann den Namen der Skript Variable vom Attribut [{0}] ableiten
 jsp.error.simpletag.badbodycontent=Die TLD für Klasse [{0}] spezifiziert einen ungültigen Body-Content (JSP) für ein SimpleTag.
 jsp.error.taglibDirective.absUriCannotBeResolved=Die absolute URI: [{0}] kann weder durch web.xml noch durch die JAR-Files dieser Anwendung aufgelöst werden
diff --git a/java/org/apache/jasper/resources/LocalStrings_es.properties b/java/org/apache/jasper/resources/LocalStrings_es.properties
index fac9213..41dda9b 100644
--- a/java/org/apache/jasper/resources/LocalStrings_es.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_es.properties
@@ -156,13 +156,11 @@ jsp.error.params.emptyBody=jsp:params debe de contener al menos un jsp:param ani
 jsp.error.params.invalidUse=jsp:params debe de ser un hijo directo de jsp:plugin
 jsp.error.parse.error.in.TLD=Error de análisis en el descriptor de biblioteca de tags: [{0}]
 jsp.error.parse.xml=Error de análisis XML en archivo [{0}]
-jsp.error.parse.xml.invalidPublicId=PUBLIC ID incorrecta: [{0}]
 jsp.error.parse.xml.line=Error de análisis XML en archivo [{0}]: (línea [{1}], col [{2}])
 jsp.error.parse.xml.scripting.invalid.body=El cuerpo de elemento [{0}] no debe de contener elementos XML
 jsp.error.plugin.badtype=Valor ilegal para atributo 'type' en jsp:plugin: debe de ser 'bean' o 'applet'
 jsp.error.plugin.nocode=Código no declarado en jsp:plugin
 jsp.error.plugin.notype=Tipo no declarado en jsp:plugin
-jsp.error.plugin.wrongRootElement=El nombre del elemento raíz en [{0}] difiere de [{1}]
 jsp.error.prefix.refined=Intento de redefinir el prefijo [{0}] por [{1}], cuando ya estaba definido como [{2}] en el ámbito en curso.
 jsp.error.prefix.use_before_dcl=El prefijo [{0}] especificado en esta directiva de marca ha sido usado previamente mediante un fichero de acción [{1}] línea [{2}].
 jsp.error.prolog_config_encoding_mismatch=El Page-encoding especificado en XML prolog [{0}] difiere del especificado en jsp-property-group [{1}]
diff --git a/java/org/apache/jasper/resources/LocalStrings_fr.properties b/java/org/apache/jasper/resources/LocalStrings_fr.properties
index e29cb96..4a0ab2b 100644
--- a/java/org/apache/jasper/resources/LocalStrings_fr.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_fr.properties
@@ -157,13 +157,11 @@ jsp.error.params.emptyBody=jsp:params doit inclure au moins un jsp:param
 jsp.error.params.invalidUse=jsp:params doit être directement inclus dans jsp:plugin
 jsp.error.parse.error.in.TLD=Erreur d''évaluation (parse) dans le descripteur de la bibliothèque de tag (TLD): [{0}]
 jsp.error.parse.xml=Erreur d''évaluation XML sur le fichier [{0}]
-jsp.error.parse.xml.invalidPublicId=PUBLIC ID invalide: [{0}]
 jsp.error.parse.xml.line=Erreur d''évaluation XML sur le fichier  [{0}]: (ligne [{1}], col [{2}])
 jsp.error.parse.xml.scripting.invalid.body=Le corps de l''élément [{0}] ne doit contenir aucun éléments XML
 jsp.error.plugin.badtype=Valeur invalide pour l'attribut 'type' dans jsp:plugin: la valeur doit être 'bean' ou 'applet'
 jsp.error.plugin.nocode=code non déclaré dans jsp:plugin
 jsp.error.plugin.notype=type non déclaré dans jsp:plugin
-jsp.error.plugin.wrongRootElement=Le nom de l''élément racine (root) dans [{0}] est différent de [{1}]
 jsp.error.prefix.refined=Tentative de redéfinition du préfixe [{0}] en [{1}] alors qu''il a déjà été défini comme [{2}] dans la portée actuelle
 jsp.error.prefix.use_before_dcl=Le préfixe [{0}] spécifié dans cette directive de tag a déjà été utilisé par une action dans le fichier [{1}] ligne [{2}]
 jsp.error.prolog_config_encoding_mismatch=Le page-encoding spécifié dans le prologue XML [{0}] est différent de celui spécifié dans le jsp-property-group [{1}]
diff --git a/java/org/apache/jasper/resources/LocalStrings_ja.properties b/java/org/apache/jasper/resources/LocalStrings_ja.properties
index cf7969c..7c77773 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ja.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ja.properties
@@ -157,13 +157,11 @@ jsp.error.params.emptyBody=jsp:paramsは少なくとも一つのネストしたj
 jsp.error.params.invalidUse=jsp:paramsはjsp:pluginの直接の子供でなければいけません
 jsp.error.parse.error.in.TLD=タグライブラリ記述子 [{0}] 中の解析エラーです
 jsp.error.parse.xml=ファイル[{0}]のXML解析エラー
-jsp.error.parse.xml.invalidPublicId=無効なPUBLIC ID: [{0}]
 jsp.error.parse.xml.line=ファイル[{0}]のXML解析エラー: (行 [{1}], 列 [{2}])
 jsp.error.parse.xml.scripting.invalid.body=[{0}] 要素のボディはXML要素を含んではいけません
 jsp.error.plugin.badtype=jsp:pluginの 'type'属性の値が無効です: 'bean'又は'applet'でなければいけません
 jsp.error.plugin.nocode=jsp:pluginでcode属性が宣言されていません
 jsp.error.plugin.notype=jsp:pluginでtype属性が宣言されていません
-jsp.error.plugin.wrongRootElement=[{0}] の中のルート要素の名前は [{1}] ではありません
 jsp.error.prefix.refined=プリフィックス [{0}] が現在のスコープ中で既に [{2}] と定義されているので [{1}] に再定義しました
 jsp.error.prefix.use_before_dcl=このタグディレクティブで指定されているプリフィックス [{0}] は、すでにファイル [{1}] の [{2}] 行目のアクションで使用されています
 jsp.error.prolog_config_encoding_mismatch=XML導入部で指定されたpage-encoding [{0}] がjsp-property-group中の指定と違います [{1}]
diff --git a/java/org/apache/jasper/resources/LocalStrings_ko.properties b/java/org/apache/jasper/resources/LocalStrings_ko.properties
index fbac6f0..caca55d 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ko.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ko.properties
@@ -156,13 +156,11 @@ jsp.error.params.emptyBody=jsp:params는 반드시 적어도 하나 이상의 js
 jsp.error.params.invalidUse=jsp:params는 반드시 jsp:plugin의 직계 자식이어야 합니다.
 jsp.error.parse.error.in.TLD=태그 라이브러리 descriptor 내에서 파싱 오류 발생: [{0}]
 jsp.error.parse.xml=[{0}] 파일에서 XML 파싱 오류 발생
-jsp.error.parse.xml.invalidPublicId=유효하지 않은 PUBLIC ID: [{0}]
 jsp.error.parse.xml.line=파일 [{0}]에서 XML 파싱 오류 발생: (행: [{1}], 열: [{2}])
 jsp.error.parse.xml.scripting.invalid.body=[{0}] 엘리먼트의 body 내에서는, 반드시 어떠한 XML 엘리먼트들도 포함해서는 안됩니다.
 jsp.error.plugin.badtype=jsp:plugin: 내의 'type' 속성을 위해 불허되는 값입니다. 반드시 'bean' 또는 'applet'이어야 합니다.
 jsp.error.plugin.nocode=jsp:plugin에 code가 선언 안됨
 jsp.error.plugin.notype=jsp:plugin에 type이 선언되지 않았습니다.
-jsp.error.plugin.wrongRootElement=[{0}] 내의 루트 엘리먼트의 이름이 [{1}]와(과) 다릅니다.
 jsp.error.prefix.refined=현재 범위에서 이미 [{2}](으)로서 정의되어 있는데, prefix를 [{0}]에서 [{1}](으)로 재정의하려는 시도입니다.
 jsp.error.prefix.use_before_dcl=이 태그 지시어에 지정된 prefix [{0}]은(는), 이전에 파일 [{1}] 내의 [{2}] 행에 있는 액션에 의해 사용된 적이 있습니다.
 jsp.error.prolog_config_encoding_mismatch=XML 프롤로그 [{0}]에 지정된 페이지 인코딩이, jsp-property-group [{1}]에 지정된 것과 다릅니다.
diff --git a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
index 45148d4..fbecd9d 100644
--- a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
@@ -25,11 +25,14 @@ jsp.error.bad.scratch.dir=你指定的 scratchDir:[{0}] 不可用。
 jsp.error.bad_attribute=属性[{0}]无效为tag[{1}] 通过TLD
 jsp.error.beans.noproperty=在[{1}]类型bean中找不到任何有关属性[{0}]的信息
 jsp.error.beans.nullbean=尝试获取一个bean 操作在一个空对象上.
+jsp.error.beans.property.conversion=无法将字符串[{0}]转换为属性[{2}]的类[{1}]:[{3}]
 jsp.error.compiler=没有可用的Java编译器
 jsp.error.corresponding.servlet=生成的servlet错误:\n
 jsp.error.could.not.add.taglibraries=不能增加一个或者多个tag 库.
 jsp.error.data.file.processing=处理文件 [{0}] 错误
+jsp.error.duplicate.name.jspattribute=标准或自定义操作中指定的属性[{0}]也显示为随附的jsp:属性中name属性的值
 jsp.error.el.template.deferred=#{...} 不允许出现在模板文本中
+jsp.error.el_interpreter_class.instantiation=加载或实例化ELInterpreter类[{0}]失败
 jsp.error.fallback.invalidUse=jsp:fallback必须是jsp:plugin的直接子代
 jsp.error.file.cannot.read=无法读取文件 [{0}]
 jsp.error.file.not.found=文.件[{0}] 未找到
@@ -42,12 +45,15 @@ jsp.error.ise_on_clear=当缓存大小等于0时调用clear()函数是非法的
 jsp.error.jspbody.emptybody.only=标签[{}]的标签体内智能包含jsp:attribute
 jsp.error.jspbody.required=如果使用 jsp:attribute,则必须使用 jsp:body 为 [{0}] 指定标记正文。
 jsp.error.jspelement.missing.name=XML强制性约束:属性name缺失。
+jsp.error.jspoutput.conflict=&lt; jsp:output&gt;:非法使多个[{0}]出现不同的值(旧:[{1}],新:[{2}])
 jsp.error.jspoutput.doctypenamesystem=&lt;jsp:output&gt;: 'doctype-root-element' 和 'doctype-system' 必须一起出现
 jsp.error.jsproot.version.invalid=版本号 [{0}] 无效,版本号必须是"1.2"、"2.0"、"2.1"、"2.2"、"2.3"中的一个
+jsp.error.jsptext.badcontent='&lt;',当出现在&lt; jsp:text&gt;的主体中时,必须封装在CDATA中
 jsp.error.lastModified=无法确定文件 [{0}] 的最后修改日期
 jsp.error.loadclass.taghandler=无法为TAG [{1}]加载标记处理程序类[{0}]
 jsp.error.location=行.: [{0}], 列: [{1}]
 jsp.error.mandatory.attribute=[{0}]: 强制性属性 [{1}] 缺失。
+jsp.error.missing_attribute=根据TLD或标记文件,标记[{1}]必须使用属性[{0}]
 jsp.error.nested.jspbody=JSP:体标准动作不能嵌套在另一个jsp:body 或者 jsp:属性标准动作中
 jsp.error.nested_jsproot=嵌套的&lt;jsp:root&gt;
 jsp.error.no.scratch.dir=JSP引擎未配置scratch文件夹。\n\
@@ -57,7 +63,9 @@ jsp.error.noFunction=无法使用指定的前缀找到函数[{0}]
 jsp.error.not.in.template=在模板文本体中, [{0}] 是不允许的.
 jsp.error.outputfolder=无输出目录
 jsp.error.overflow=错误:JSP缓冲区溢出
+jsp.error.page.conflict.contenttype=Page指令:非法出现多次出现的''contentType''具有不同的值(old:[{0}],new:[{1}])
 jsp.error.page.conflict.errorpage=页指令:不同值的多次出现“errorPage”的非法值(旧:[{0}],新:[{1}])
+jsp.error.page.conflict.session=Page指令:多次出现具有不同值的''session''非法(old:[{0}],new:[{1}])
 jsp.error.page.invalid.deferredsyntaxallowedasliteral=页面指令:deferredSyntaxAllowedAsLiteral的值无效
 jsp.error.page.invalid.import=网页指令:无效引用
 jsp.error.page.invalid.iselignored=页面指令:忽略的无效值
@@ -67,28 +75,33 @@ jsp.error.param.invalidUse=jsp:param 不能在jsp:include、jsp:forward或jsp:pa
 jsp.error.paramexpected=使用“name”和“value”属性期望“jsp:param”标准操作
 jsp.error.params.invalidUse=参数jsp:params必须是jsp:plugin的直接孩子参数
 jsp.error.parse.xml=无法解析 XML 文件 [{0}]
-jsp.error.parse.xml.invalidPublicId=无效的 PUBLIC ID: [{0}]
 jsp.error.plugin.nocode=代码未定义在jsp:plugin中
 jsp.error.plugin.notype=jsp:plugin中未声明type
-jsp.error.plugin.wrongRootElement=[{0}] 中的根元素的名称与 [{1}] 的不同
+jsp.error.prolog_config_encoding_mismatch=XML prolog [{0}]中指定的页面编码与jsp-property-group [{1}]中指定的页面编码不同
 jsp.error.prolog_pagedir_encoding_mismatch=指定在XML语言[{0}]的网页编码是不同于指定在网页的指令[{1}]。
 jsp.error.quotes.unterminated=未终结的引号
 jsp.error.scripting.variable.missing_name=无法从属性[{0}]确定脚本变量名称
+jsp.error.signature.classnotfound=无法找到TLD中方法签名中为函数[{1}]指定的类[{0}]。[{2}]
 jsp.error.simpletag.badbodycontent=对于一下简单的标记符,用于类[{0}]的标记描述符指定了一个无效的body内容(JSP)中
 jsp.error.single.line.number=JSP文件:[{1}] 的第 [{0}] 行发生了一个错误
 jsp.error.stream.close.failed=流.关闭失败
 jsp.error.stream.closed=流.关闭
+jsp.error.tag.conflict.language=标签指令:非法出现多次出现的具有不同值的“语言”(旧:[{0}],新:[{1}])
 jsp.error.tag.invalid.trimdirectivewhitespaces=TAG指令:trimDirectiveWhitespaces的值无效
 jsp.error.tagfile.nameFrom.badAttribute=\n\
 \ 属性指令(在行[{1}]中声明并且其name属性为[{0}],此name-from-attribute属性的值)必须是java.lang.String类型,是“required”而不是一个“rtexprvalue”。
+jsp.error.tagfile.nameFrom.noAttribute=找不到具有值[{0}]的name属性的属性指令,该属性是name-from-attribute属性的值。
 jsp.error.taglibDirective.absUriCannotBeResolved=无法在web.xml或使用此应用程序部署的jar文件中解析绝对uri:[{0}]
 jsp.error.taglibDirective.missing.location='uri'和'tagdir' 属性均未指定。
 jsp.error.taglibDirective.uriInvalid=为标签库[{0}]提供的URI不是有效的URI
+jsp.error.tei.invalid.attributes=来自TagExtraInfo的[{0}]的验证错误消息
 jsp.error.teiclass.instantiation=无法加载或实例化TagExtraInfo类:[{0}]。
+jsp.error.text.has_subelement=&LT; JSP:文本&GT; 不得有任何子元素
+jsp.error.tld.fn.invalid.signature=TLD中函数签名的语法无效。 标签库:[{0}],功能:[{1}]
 jsp.error.tld.mandatory.element.missing=TLD [{1}] 中强制 TLD 元素 [{0}] 不存在或为空
-jsp.error.unable.deleteClassFile=无法删除class文件
+jsp.error.unable.deleteClassFile=无法删除class文件[{0}]
 jsp.error.unable.load=无法加载JSP的相关类
-jsp.error.unable.renameClassFile=无法重命名类文件
+jsp.error.unable.renameClassFile=无法重命名类文件[{0}]为[{1}]
 jsp.error.unable.to_find_method=不能为属性:[{0}]找到setter 方法.
 jsp.error.unavailable=JSP已被标记为不可用
 jsp.error.unbalanced.endtag=结束标签&lt;/{0}不对称
diff --git a/java/org/apache/naming/factory/LocalStrings_zh_CN.properties b/java/org/apache/naming/factory/LocalStrings_zh_CN.properties
index 814ed8d..6bfb29f 100644
--- a/java/org/apache/naming/factory/LocalStrings_zh_CN.properties
+++ b/java/org/apache/naming/factory/LocalStrings_zh_CN.properties
@@ -14,5 +14,7 @@
 # limitations under the License.
 
 lookupFactory.createFailed=无法创建JNDI查找工厂类实例
+lookupFactory.typeMismatch=期望JNDI引用[{0}]的类型为[{1}],但查找[{2}]返回类型为[{3}]的对象
 
 resourceLinkFactory.nullType=引用全局资源 [{1}] 的本地资源链接 [{0}] 未指定所需的属性类型
+resourceLinkFactory.unknownType=引用全局资源[{1}]的本地资源链接[{0}]指定了未知类型[{2}]
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_es.properties b/java/org/apache/tomcat/util/buf/LocalStrings_es.properties
index a513aca..3037648 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_es.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_es.properties
@@ -14,5 +14,3 @@
 # limitations under the License.
 
 b2cConverter.unknownEncoding=La codificación de carácter [{0}] no está soportada
-
-uDecoder.convertHexDigit.notHex=[{0}] no es un número hexadecimal\n
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties b/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
index 245d5fe..10dbae1 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
@@ -23,6 +23,5 @@ byteBufferUtils.cleaner=Impossible d'utiliser le nettoyeur de ByteBuffers direct
 hexUtils.fromHex.nonHex=L'entrée doit être uniquement des chiffres héxadécimaux
 hexUtils.fromHex.oddDigits=L'entrée doit contenir un nombre pair de chiffres héxadécimaux
 
-uDecoder.convertHexDigit.notHex=[{0}] n''est pas un chiffre hexadécimal
 uDecoder.urlDecode.conversionError=Echec de décodage [{0}] en utilisant le jeu de caractères [{1}]
 uDecoder.urlDecode.missingDigit=Impossible de décoder [{0}] parce que le caractère % doit être suivi de deux chiffres héxadécimaux
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties b/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties
index 0aeeb7b..a78e204 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties
@@ -20,6 +20,5 @@ byteBufferUtils.cleaner=直接ByteBufferクリーナーを使用することは
 hexUtils.fromHex.nonHex=入力は16進数でなければなりません
 hexUtils.fromHex.oddDigits=入力は、偶数の16進数で構成する必要があります。
 
-uDecoder.convertHexDigit.notHex=[{0}] は16 進数ではありません。
 uDecoder.urlDecode.conversionError=文字セット[{1}]を使用して[{0}]のデコードに失敗しました
 uDecoder.urlDecode.missingDigit=%文字の後ろに2つの16進数字が続く必要があるため、[{0}]のデコードに失敗しました。
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_ko.properties b/java/org/apache/tomcat/util/buf/LocalStrings_ko.properties
index 9d2db60..08e5b3a 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_ko.properties
@@ -23,6 +23,5 @@ byteBufferUtils.cleaner=직접적인 ByteBuffer cleaner를 사용할 수 없습
 hexUtils.fromHex.nonHex=입력은 오직 16진수 숫자로만 이루어져야 합니다.
 hexUtils.fromHex.oddDigits=입력은 반드시 짝수 개의 16진수 숫자들로 이루어져야 합니다.
 
-uDecoder.convertHexDigit.notHex=[{0}]은(는) 16진수 숫자가 아닙니다.
 uDecoder.urlDecode.conversionError=문자셋 [{1}]을(를) 사용하여 [{0}]을(를) 디코드하지 못했습니다.
 uDecoder.urlDecode.missingDigit=% 문자 뒤에 두 개의 16진수 숫자들이 이어져야 하기 때문에, [{0}]을(를) 디코드하지 못했습니다.
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties
index 6d0140e..0d7c874 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties
@@ -13,5 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-uDecoder.convertHexDigit.notHex=[{0}] 不是十六进制数字
 uDecoder.urlDecode.conversionError=使用编码[{1}]解码[{0}]失败
diff --git a/java/org/apache/tomcat/util/compat/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/util/compat/LocalStrings_zh_CN.properties
index c37fc6f..fb12e92 100644
--- a/java/org/apache/tomcat/util/compat/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/compat/LocalStrings_zh_CN.properties
@@ -13,4 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+jre9Compat.invalidModuleUri=提供的模块URI [{0}]无法转换为JarScanner要处理的URL
+
 jreCompat.noApplicationProtocol=Java 运行时不支持 SSLEngine.getApplicationProtocol()。要使用该功能你必须使用 Java 9。
diff --git a/java/org/apache/tomcat/util/descriptor/web/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/util/descriptor/web/LocalStrings_zh_CN.properties
index df1fe90..267723b 100644
--- a/java/org/apache/tomcat/util/descriptor/web/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/descriptor/web/LocalStrings_zh_CN.properties
@@ -15,6 +15,8 @@
 
 filterDef.invalidFilterName=过滤器定义中的<filter-name> [{0}] 无效。
 
+securityConstraint.uncoveredHttpOmittedMethod=对于URL模式[{0}]的安全性约束,将发现HTTP方法[{1}]。
+
 webRuleSet.nameCount=<name>元素只能出现1次
 webRuleSet.postconstruct.duplicate=class [{0}] 有重复的 post 构造方法声明
 
@@ -24,4 +26,5 @@ webXml.mergeConflictDisplayName=显示名称在多个片段中被定义,这些
 webXml.mergeConflictSessionCookieName=会话cookie名称在多个具有不同值的片段中定义不一致,包括位于 [{1}] 的片段 [{0}]
 webXml.mergeConflictSessionTimeout=会话超时以不同值的多个片段不一致地定义,这些片段包括位于[{1}]的具有名称[{0}]的片段。
 webXml.mergeConflictSessionTrackingMode=会话跟踪模式在多个片段中定义不一致,包括位于[{1}]的名称为[{0}]的片段
+webXml.reservedName=使用保留名称[{0}]检测到web.xml文件。 此片段将忽略name元素。
 webXml.version.unknown=未知版本字符串 [{0}]。将使用默认版本。
diff --git a/java/org/apache/tomcat/util/http/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/util/http/LocalStrings_zh_CN.properties
index 72df1c5..6362387 100644
--- a/java/org/apache/tomcat/util/http/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/http/LocalStrings_zh_CN.properties
@@ -19,7 +19,8 @@ cookies.invalidSpecial=Cookies:未知特殊的Cookie
 parameters.bytes=开始处理输入[{0}]
 parameters.copyFail=无法创建以调试日志记录为目的的原始参数值的副本
 parameters.decodeFail.debug=字符解码失败.参数 [{0}]和值 [{1}]被忽略
-parameters.fallToDebug=注:将在DEBUG级别记录更多参数错误。
+parameters.fallToDebug=注:更多的参数错误将以DEBUG级别日志进行记录。
+parameters.maxCountFail=检测到单个请求([{0}])的最大请求参数数(GET加POST)。 超出此限制的任何参数都被忽略。 要更改此限制,请在Connector上设置maxParameterCount属性。
 parameters.maxCountFail.fallToDebug=注意:更多的错误信息只在debug级别日志中记录
 
 rfc6265CookieProcessor.invalidPath=这个cookie被指定了一个无效的路径 [{0}]
diff --git a/java/org/apache/tomcat/util/http/parser/LocalStrings_fr.properties b/java/org/apache/tomcat/util/http/parser/LocalStrings_fr.properties
index d486b92..92f8347 100644
--- a/java/org/apache/tomcat/util/http/parser/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/http/parser/LocalStrings_fr.properties
@@ -36,4 +36,3 @@ http.tooFewHextets=Une adresse IPv6 doit être constitué de 8 groupes de 4 octe
 http.tooManyColons=Une adresse IPv6 ne peut pas contenir plus de deux caractères deux-points à la suite
 http.tooManyDoubleColons=Une adresse IPv6 ne peut contenir qu'une seule séquence "::"
 http.tooManyHextets=L''adresse IPv6 contient [{0}] groupes de 4 octets mais une adresse IPv6 valide ne doit pas en avoir plus de 8
-http.wrongOctetCount=Une adresse IPv4 doit faire exactement 4 octets et non [{0}]
diff --git a/java/org/apache/tomcat/util/http/parser/LocalStrings_ja.properties b/java/org/apache/tomcat/util/http/parser/LocalStrings_ja.properties
index af7f122..46bc755 100644
--- a/java/org/apache/tomcat/util/http/parser/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/http/parser/LocalStrings_ja.properties
@@ -36,4 +36,3 @@ http.tooFewHextets=IPv6 アドレスは 8 個のヘクステットで構成し
 http.tooManyColons=IPv6 アドレスでは文字 : を 2 つ以上連続することはできません。
 http.tooManyDoubleColons=IPv6アドレスは単一の '::'シーケンスのみを含むことができます。
 http.tooManyHextets=IPv6 アドレスは [{0}] ヘクステットで構成されていますが、正常な IPv6 アドレスなら 8 ヘクステット以上になりません。
-http.wrongOctetCount=IPv4アドレスは[{0}]ではなく、正確に4オクテットでなければなりません。
diff --git a/java/org/apache/tomcat/util/http/parser/LocalStrings_ko.properties b/java/org/apache/tomcat/util/http/parser/LocalStrings_ko.properties
index 5dec1d2..2a06496 100644
--- a/java/org/apache/tomcat/util/http/parser/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/util/http/parser/LocalStrings_ko.properties
@@ -37,4 +37,3 @@ http.tooFewHextets=IPv6 주소는 반드시 8개의 헥스텟(hextet)들로 이
 http.tooManyColons=IPv6 주소는 연속으로 두 개를 초과한 콜론 문자('':'')들을 포함할 수 없습니다.
 http.tooManyDoubleColons=IPv6 주소는 단일한 '::' 시퀀스만을 포함해야 합니다.
 http.tooManyHextets=IPv6 주소가 [{0}]개의 헥스텟(hextet)들을 포함하고 있지만, 유효한 IPv6 주소는 8개를 초과할 수 없습니다.
-http.wrongOctetCount=IPv4 주소는 반드시, [{0}]개가 아니라, 정확히 4개의 옥텟(octet)들을 가져야 합니다.
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_es.properties b/java/org/apache/tomcat/util/net/LocalStrings_es.properties
index a2eb7f4..5bf1a36 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_es.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_es.properties
@@ -25,7 +25,6 @@ endpoint.apr.checkConf=Verificando OpenSSLConf
 endpoint.apr.errMakeConf=No se pudo crear el contexto OpenSSLConf\n
 endpoint.apr.invalidSslProtocol=Se ha proporcionado un valor inválido [{0}] para el atributo SSLProtocol
 endpoint.apr.maxConnections.running=El endpoint APR no soporta cambiar el parámetro  maxConnections mientras está corriendo. Se continuará usando el valor existente  [{0}].
-endpoint.apr.noSslCertFile=El atribiuto del conector SSLCertificateFile debe de ser definido al usar SSL con APR
 endpoint.apr.pollAddInvalid=Intento no válido de adicionar el socket [{0}] a la encuesta\n
 endpoint.apr.tooManyCertFiles=Fueron configurados más archivos de ceritificados que los que AprEndpoint puede manejar
 endpoint.debug.channelCloseFail=No puede cerrar el canal
@@ -54,7 +53,6 @@ endpoint.serverSocket.closeFailed=Fallo al cerrar el socket del servidor para [{
 endpoint.setAttribute=Fijando [{0}] a [{1}]\n
 endpoint.warn.executorShutdown=El ejecutor asociado con el hilo del pool [{0}] no fue totalmente apagado. Algunos hilos de la aplicación pudieran estar corriendo aún.
 endpoint.warn.incorrectConnectionCount=Conteo de conexión errónea, hay varias llamadas a socket.close en el mismo socket
-endpoint.warn.noInsecureReneg=La renegociación segura no está soportada por la biblioteca SSL [{0}]
 endpoint.warn.noLocalName=Imposible determinar el nombre de la máquina local para el socket [{0}]\n
 endpoint.warn.noLocalPort=Uncapaz de determinar el puerto local para el socket [{0}]\n
 endpoint.warn.unlockAcceptorFailed=El hilo aceptador [{0}] falló al desbloquear. Forzando apagado de enchufe (socket).
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_fr.properties b/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
index 3ddb6c1..2389028 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
@@ -45,14 +45,12 @@ endpoint.accept.fail=Aucun socket n'a pu être accepté
 endpoint.alpn.fail=Erreur de configuration de la terminaison pour ALPN en utilisant [{0}]
 endpoint.alpn.negotiated=Le protocole [{0}] a été négocié en utilisant ALPN
 endpoint.apr.applyConf=Application de OpenSSLConfCmd au contexte SSL
-endpoint.apr.assignConf=Assignation du contexte SSL au contexte de la OpenSSLConfCmd
 endpoint.apr.checkConf=Vérification de OpenSSLConf en cours
 endpoint.apr.errApplyConf=Impossible d'appliquer OpenSSLConf au contexte SSL
 endpoint.apr.errCheckConf=Erreur pendant la vérification de OpenSSLConf
 endpoint.apr.errMakeConf=Impossible de créer le contexte de OpenSSLConf
 endpoint.apr.failSslContextMake=Incapable de créer un SSLContext. Vérifier que SSLEngine est activé dans l'AprLifecycleListener, que l'AprLifecycleListener a été correctement initialisé et qu'un protocole SSL valide a été spécifié.
 endpoint.apr.invalidSslProtocol=Un valeur invalide [{0}] a été donnée pour l''attribut SSLProtocol
-endpoint.apr.makeConf=Création du contexte de OpenSSLConf
 endpoint.apr.maxConnections.running=La terminaison APR ne permet pas de fixer maxConnections pendant son exécution, la valeur existante [{0}] continuera à être utilisée
 endpoint.apr.maxConnections.unlimited=La terminaison APR ne supporte pas un nombre illimité de connections, la valeur existante [{0}] va continuer à être utilisée
 endpoint.apr.noSendfileWithSSL=Sendfile n'est pas supporté avec le connecteur APR lorsque SSL est active
@@ -119,7 +117,6 @@ endpoint.warn.noLocalPort=Impossible de déterminer le port local pour le socket
 endpoint.warn.noRemoteAddr=Impossible de déterminer l''adresse distante pour le socket [{0}]
 endpoint.warn.noRemoteHost=Impossible de déterminer le nom d''hôte distant pour le socket [{0}]
 endpoint.warn.noRemotePort=Impossible de déterminer le port distant pour le socket [{0}]
-endpoint.warn.noSendfileWithSSL=Sendfile n'est pas supporté par le connecteur quand SSL est activé
 endpoint.warn.unlockAcceptorFailed=Le thread qui accepte les sockets [{0}] n''a pu être débloqué, arrêt forcé su socket serveur
 
 jsse.invalid_truststore_password=Le mot de passe de la base de confiance n'a pas pu être utilisé pour déverrouiller et ou valider celle ci, nouvel essai en utilisant un mot de passe null pour passer la validation
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_ja.properties b/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
index c886058..7559199 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
@@ -45,14 +45,12 @@ endpoint.accept.fail=ソケット受け付け失敗
 endpoint.alpn.fail=[{0}]を使用してALPNのエンドポイントを設定できませんでした。
 endpoint.alpn.negotiated=ALPNを使用して交渉された[{0}]プロトコル
 endpoint.apr.applyConf=OpenSSLConfCmdを SSL contextに適用します。
-endpoint.apr.assignConf=SSLコンテキストをOpenSSLConfCmdコンテキストに割り当てます
 endpoint.apr.checkConf=OpenSSLConfの確認中
 endpoint.apr.errApplyConf=OpenSSLConfをSSLコンテキストに適用できませんでした。
 endpoint.apr.errCheckConf=OpenSSLConfチェック中のエラー
 endpoint.apr.errMakeConf=OpenSSLConfコンテキストを作成できませんでした。
 endpoint.apr.failSslContextMake=SSLContextを作成できません。 SSLEngineがAprLifecycleListenerで有効になっていること、AprLifecycleListenerが正しく初期化されていること、有効なSSLProtocolが指定されていることを確認して下さい
 endpoint.apr.invalidSslProtocol=SSLProtocol属性に無効な値[{0}]が指定されました
-endpoint.apr.makeConf=OpenSSLConfコンテキストの作成
 endpoint.apr.maxConnections.running=APR エンドポイントは実行中に maxConnection の値を変更できません。現在の値 [{0}] をそのまま使用します。
 endpoint.apr.maxConnections.unlimited=APRエンドポイントは、無制限の接続をサポートしていません。 [{0}]の既存の値は引き続き使用されます。
 endpoint.apr.noSendfileWithSSL=SSLが有効な場合、APR /nativeコネクタでSendfileはサポートされていません。
@@ -119,7 +117,6 @@ endpoint.warn.noLocalPort=ソケット [{0}] のローカルポートが取得
 endpoint.warn.noRemoteAddr=ソケット [{0}] のリモートアドレスを取得できません。
 endpoint.warn.noRemoteHost=ソケット [{0}] のリモートホスト名を取得できません。
 endpoint.warn.noRemotePort=ソケット[{0}] のリモートポート番号を取得できません。
-endpoint.warn.noSendfileWithSSL=SSLが有効な場合、コネクタでSendfileはサポートされていません。
 endpoint.warn.unlockAcceptorFailed=Acceptor スレッド[{0}]のロックを解除できませんでした。 強制的にハードソケットをシャットダウンします。
 
 jsse.invalid_truststore_password=提供されたトラストストアパスワードは、トラストストアのロック解除および検証に使用できませんでした。 検証をスキップするnullパスワードでトラストストアにアクセスしようとしました。
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_ko.properties b/java/org/apache/tomcat/util/net/LocalStrings_ko.properties
index 58840c4..22a3fcc 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_ko.properties
@@ -45,14 +45,12 @@ endpoint.accept.fail=소켓 accept 실패
 endpoint.alpn.fail=[{0}]을(를) 사용하여 ALPN을 위한 엔드포인트를 설정하지 못했습니다.
 endpoint.alpn.negotiated=ALPN을 사용하여 [{0}] 프로토콜로 negotiate 했습니다.
 endpoint.apr.applyConf=OpenSSLConfCmd를 SSL 컨텍스트에 적용합니다.
-endpoint.apr.assignConf=SSL 컨텍스트를 OpenSSLConfCmd 컨텍스트로 설정합니다.
 endpoint.apr.checkConf=OpenSSLConf를 점검합니다.
 endpoint.apr.errApplyConf=OpenSSLConf를 SSL 컨텍스트에 적용할 수 없었습니다.
 endpoint.apr.errCheckConf=OpenSSLConf 점검 중 오류 발생
 endpoint.apr.errMakeConf=OpenSSLConf 컨텍스트를 생성할 수 없었습니다.
 endpoint.apr.failSslContextMake=SSLContext를 생성할 수 없습니다. AprLifecycleListener에서 SSLEngine이 사용가능 상태로 설정되었는지, AprLifecycleListener가 올바로 초기화되었는지, 그리고 유효한 SSLProtocol이 지정되었는지 점검하십시오.
 endpoint.apr.invalidSslProtocol=SSLProtocol 속성을 위해 유효하지 않은 값 [{0}]이(가) 제공되었습니다.
-endpoint.apr.makeConf=OpenSSLConf 컨텍스트를 생성합니다.
 endpoint.apr.maxConnections.running=APR 엔드포인트는 실행 중 maxConnections 설정을 지원하지 않습니다. 기존 값인 [{0}]이(가) 계속해서 사용될 것입니다.
 endpoint.apr.maxConnections.unlimited=APR 엔드포인트는 무제한 연결들을 지원하지 않습니다. 기존 값 [{0}]이(가) 계속해서 사용될 것입니다.
 endpoint.apr.noSendfileWithSSL=SSL이 사용가능 상태로 설정되어 있을 때에는, APR/native connector를 위한 sendfile이 지원되지 않습니다.
@@ -119,7 +117,6 @@ endpoint.warn.noLocalPort=소켓 [{0}]을(를) 위한 로컬 포트를 결정할
 endpoint.warn.noRemoteAddr=소켓 [{0}]을(를) 위한 원격 주소를 결정할 수 없습니다.
 endpoint.warn.noRemoteHost=소켓 [{0}]을(를) 위한 원격 호스트 이름을 결정할 수 없습니다.
 endpoint.warn.noRemotePort=소켓 [{0}]을(를) 위한 원격 포트를 결정할 수 없습니다.
-endpoint.warn.noSendfileWithSSL=SSL이 사용가능 상태일 때에는, sendfile이 Connector를 위해 지원되지 않습니다.
 endpoint.warn.unlockAcceptorFailed=Acceptor 쓰레드 [{0}]이(가) 잠금을 풀지 못했습니다. 강제로 소켓을 셧다운합니다.
 
 jsse.invalid_truststore_password=Trust 저장소를 잠금을 풀거나 유효한지 확인하는 용도로, 제공된 Trust 저장소 비밀번호를 사용할 수 없었습니다. 널 비밀번호를 사용하여, 해당 Trust 저장소에 대한 접근을 다시 시도합니다. 이는 유효한지 확인하는 작업을 건너뛸 것입니다.
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
index c64b846..4f3c7c2 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
@@ -20,6 +20,7 @@ channel.nio.ssl.notHandshaking=握手认证期间NOT_HANDSHAKING
 channel.nio.ssl.sniDefault=无法缓冲足够的数据来确定请求的SNI主机名。使用默认值
 channel.nio.ssl.sniHostName=连接[{0}]中提取的SNI主机名称是[{1}]
 channel.nio.ssl.timeoutDuringHandshake=握手期间超时。
+channel.nio.ssl.unexpectedStatusDuringWrap=握手WRAP期间出现意外状态[{0}]。
 channel.nio.ssl.unwrapFail=无法解包数据,无效状态 [{0}]
 channel.nio.ssl.unwrapFailResize=由于缓冲区太小无法解包数据,无效状态 [{0}]
 
@@ -27,6 +28,7 @@ endpoint.apr.applyConf=正将OpenSSLConfCmd应用在SSL Context上。
 endpoint.apr.checkConf=检查配置OpenSSLConf
 endpoint.apr.errApplyConf=不能对SSL上下文应用OpenSSLConf  配置
 endpoint.apr.errMakeConf=无法创建OpenSSLConf 上下文
+endpoint.apr.invalidSslProtocol=为SSLProtocol属性提供了无效值[{0}]
 endpoint.apr.pollAddInvalid=无效企图向一个轮询器中添加一个套接字[{0}]
 endpoint.apr.tooManyCertFiles=证书文件配置超过了
 endpoint.debug.channelCloseFail=关闭频道失败
@@ -43,6 +45,7 @@ endpoint.nio.stopLatchAwaitInterrupted=在等待轮询器停止时,该线程
 endpoint.nio.timeoutCme=处理超时异常. 这段代码已经被重复检查并且没有并发修改发现。如果你能重现这个错误,请提交一个tomcat bug, 提供重现步骤.
 endpoint.noSslHostConfig=没有找到带有hostName[{0}]的SSLHostConfig元素,以匹配连接器[{1}]的默认SSLHostConfigName
 endpoint.noSslHostName=SSL主机中没有被提供主机名
+endpoint.poll.fail=严重轮询器故障(重新启动轮询器)[{0}] [{1}]
 endpoint.poll.limitedpollsize=创建轮询器失败,大小:[{0}]
 endpoint.process.fail=分配 socket 处理器出错
 endpoint.processing.fail=运行.套接字处理器出错
@@ -52,6 +55,7 @@ endpoint.sendfile.error=未知的sendfile异常。
 endpoint.serverSocket.closeFailed=无法为 [{0}] 关闭服务器 socket
 endpoint.setAttribute=设置. [{0}] 到 [{1}]
 endpoint.timeout.err=处理套接字超时出错
+endpoint.warn.executorShutdown=与线程池[{0}]关联的执行程序尚未完全关闭。 某些应用程序线程可能仍在运行。
 endpoint.warn.incorrectConnectionCount=连接数不正确,在同一个套接字上调用多个socket.close。
 endpoint.warn.noLocalAddr=无法确定套接字 [{0}] 的本地地址
 endpoint.warn.noLocalName=无法确定 socket [{0}] 的本地主机名
diff --git a/java/org/apache/tomcat/util/net/jsse/LocalStrings_de.properties b/java/org/apache/tomcat/util/net/jsse/LocalStrings_de.properties
index e26182a..29d63b1 100644
--- a/java/org/apache/tomcat/util/net/jsse/LocalStrings_de.properties
+++ b/java/org/apache/tomcat/util/net/jsse/LocalStrings_de.properties
@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-jsse.invalid_ssl_conf=SSL Konfiguration ist ungültig wegen [{0}]
-jsse.noDefaultCiphers=Kann keinen Standard Cipher für [{0}] ermitteln. Setze einen expliziten Wert um sicher zu stellen, dass der Connektor starten kann.
 jsse.openssl.effectiveCiphers=Verwendete Ciphers: [{0}]
 jsse.pemParseError=Der Schlüssel konnte nicht aus [{0}] geparst werden.
 
diff --git a/java/org/apache/tomcat/util/net/jsse/LocalStrings_es.properties b/java/org/apache/tomcat/util/net/jsse/LocalStrings_es.properties
index f4ac9af..d6432ad 100644
--- a/java/org/apache/tomcat/util/net/jsse/LocalStrings_es.properties
+++ b/java/org/apache/tomcat/util/net/jsse/LocalStrings_es.properties
@@ -15,8 +15,6 @@
 
 jsse.alias_no_key_entry=El nombre de Alias [{0}] no identifica una entrada de clave
 jsse.invalidTrustManagerClassName=El trustManagerClassName suministrado [{0}] no implementa  javax.net.ssl.TrustManager
-jsse.invalid_ssl_conf=La configuración SSL no es válida debido a [{0}]
-jsse.noDefaultCiphers=Incapáz de determinar un varlor por defecto para los cifrados de  [{0}]. Fije un valor explicito para asegurar que el conector pueda iniciar.
 jsse.openssl.effectiveCiphers=Cifradores usados: [{0}]
 jsse.pemParseError=Imposible parsear la clave desde [{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 36dae5f..89ca814 100644
--- a/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties
@@ -14,13 +14,9 @@
 # limitations under the License.
 
 jsse.alias_no_key_entry=Le nom alias [{0}] n''identifie pas une entrée de clé
-jsse.enableable_ciphers=Les chiffres SSL spécifiés qui sont supportés et activables sont: [{0}]
-jsse.exceptionOnClose=Echec de fermeture du socket
 jsse.excludeProtocol=Le protocole SSL [{0}] qui est supporté par ce JRE a été exclu des protocoles disponibles dans Tomcat
 jsse.invalidTrustManagerClassName=Le trustManagerClassName fourni [{0}] n''implémente pas javax.net.ssl.TrustManager
-jsse.invalid_ssl_conf=La configuration SSL est invalide, dû à [{0}]
 jsse.noCertFile=L'attribut certificateFile de SSLHostConfig doit être défini lorsqu'un connecteur SSL est utilisé
-jsse.noDefaultCiphers=Impossible de déterminer un défaut pour le mode de chiffrement de [{0}], indiquez une valeur explicite pour permettre le démarrage du connecteur
 jsse.noDefaultProtocols=Impossible de déterminer un défaut pour sslEnabledProtocols de [{0}], indiquez une valeur explicite pour permettre le démarrage du connecteur
 jsse.noKeys=Aucun alias pour les clés privées n'a été trouvé dans la base de clés
 jsse.openssl.effectiveCiphers=Chiffres utilisés: [{0}]
@@ -30,7 +26,6 @@ jsse.pemParseError=Impossible de parser la clé de [{0}]
 jsseSupport.certTranslationError=Erreur lors de la traduction du certificat [{0}]
 jsseSupport.clientCertError=Echec de l'obtention d'un certificat de la part du client
 
-jsseUtil.invalidTrustCert=Le certificat pour [{0}] dans la base de confiance n''est pas valide et est donc exclu de la liste des certificats envoyés au client
 jsseUtil.noCrlSupport=Le truststoreProvider [{0}] ne supporte pas d''option de configuration certificateRevocationFile
 jsseUtil.noVerificationDepth=Le truststoreProvider [{0}] ne supporte pas l''option de configuration certificateVerificationDepth
 jsseUtil.trustedCertNotChecked=Les dates de validité du certificat de confiance dont l''alias est [{0}] n''ont pas été vérifiées car sont type est inconnu
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 00f2d36..c0e5e56 100644
--- a/java/org/apache/tomcat/util/net/jsse/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/net/jsse/LocalStrings_ja.properties
@@ -14,13 +14,9 @@
 # limitations under the License.
 
 jsse.alias_no_key_entry=別名 [{0}] はキーエントリを発見できません
-jsse.enableable_ciphers=サポートされ、有効になっている指定されたSSL暗号は次のとおりです。[{0}]
-jsse.exceptionOnClose=ソケットを切断できません。
 jsse.excludeProtocol=JRE は SSL プロトコル [{0}] に対応しています。しかし Tomcat の利用可能プロトコルからは除外されています。
 jsse.invalidTrustManagerClassName=[{0}]が提供するtrustManagerClassNameはjavax.net.ssl.TrustManagerを実装していません。
-jsse.invalid_ssl_conf=[{0}]のためSSL設定が無効です。
 jsse.noCertFile=SSLコネクタを使用する場合は、SSLHostConfigのcertificateFile属性を定義する必要があります。
-jsse.noDefaultCiphers=[{0}]の暗号のデフォルトを判別できません。 コネクターを開始できるように、明示的な値を設定してください。
 jsse.noDefaultProtocols=sslEnableProtocols の初期値を取得できません。コネクターを開始できるよう明示的に値を設定してください。
 jsse.noKeys=キーストアで見つかった秘密キーのエイリアスがありません。
 jsse.openssl.effectiveCiphers=使用された暗号:[{0}]
@@ -30,7 +26,6 @@ jsse.pemParseError=秘密鍵ファイル [{0}] を解析できませんでした
 jsseSupport.certTranslationError=証明書の翻訳中にエラーが発生しました[{0}]
 jsseSupport.clientCertError=クライアントから証明書を取得できません。
 
-jsseUtil.invalidTrustCert=トラストストアに登録された証明書 [{0}] は妥当ではありません。クライアントに送信する証明書から除外します。
 jsseUtil.noCrlSupport=トラストストアプロバイダー [{0}] は設定項目 certificateRevocationFile に対応していません。
 jsseUtil.noVerificationDepth=トラストストアプロバイダー [{0}] は設定項目 certificateVerificationDepth に未対応です。
 jsseUtil.trustedCertNotChecked=エイリアス[{0}]を持つ信頼できる証明書の有効期限は、証明書が不明な型であるためチェックされませんでした。
diff --git a/java/org/apache/tomcat/util/net/jsse/LocalStrings_ko.properties b/java/org/apache/tomcat/util/net/jsse/LocalStrings_ko.properties
index b5abc6a..c3d02d4 100644
--- a/java/org/apache/tomcat/util/net/jsse/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/util/net/jsse/LocalStrings_ko.properties
@@ -14,13 +14,9 @@
 # limitations under the License.
 
 jsse.alias_no_key_entry=별칭 이름 [{0}]을(를) 사용하여 키 엔트리를 식별해낼 수 없습니다.
-jsse.enableable_ciphers=지원되고 사용 가능한, 지정된 SSL cipher들: [{0}]
-jsse.exceptionOnClose=소켓 닫기 실패
 jsse.excludeProtocol=이 JRE에서 지원되는 해당 SSL 프로토콜 [{0}]이(가), Tomcat의 가용 프로토콜 목록에서 제외되어 있습니다.
 jsse.invalidTrustManagerClassName=trustManagerClassName에 의해 제공된 클래스 [{0}]은(는) javax.net.ssl.TrustManager를 구현하지 않았습니다.
-jsse.invalid_ssl_conf=SSL 설정이 [{0}](으)로 인하여 유효하지 않습니다.
 jsse.noCertFile=SSLHostConfig의 속성인 certificateFile은, 반드시 SSL connector를 사용할 때에만 정의되어야 합니다.
-jsse.noDefaultCiphers=[{0}]을(를) 위한 기본 cipher들을 결정할 수 없습니다. Connector가 시작될 수 있도록 명시적으로 값을 지정하십시오.
 jsse.noDefaultProtocols=sslEnabledProtocols의 기본값을 결정할 수 없습니다. Connector가 제대로 시작되는지 보증하려면 명시적으로 값을 설정하십시오.
 jsse.noKeys=개인 키들에 대한 별칭들이 키 저장소에 없습니다.
 jsse.openssl.effectiveCiphers=사용되는 Cipher들: [{0}]
@@ -30,7 +26,6 @@ jsse.pemParseError=[{0}](으)로부터 키를 파싱할 수 없습니다.
 jsseSupport.certTranslationError=인증서 [{0}]에 대한 인증서 변환을 하는 중 오류 발생
 jsseSupport.clientCertError=클라이언트로부터 인증서를 구하려 시도하는 중 오류 발생
 
-jsseUtil.invalidTrustCert=Trust 저장소 내의 [{0}]을(를) 위한 인증서가 유효하지 않아, 클라이언트에 전송되는 인증서 목록에서 제외되었습니다.
 jsseUtil.noCrlSupport=truststoreProvider [{0}]은(는) certificateRevocationFile 설정 옵션을 지원하지 않습니다.
 jsseUtil.noVerificationDepth=truststoreProvider [{0}]은(는) certificateVerificationDepth 설정 옵션을 지원하지 않습니다.
 jsseUtil.trustedCertNotChecked=인증서가 알 수 없는 타입이라서, 별칭이 [{0}]인 신뢰되는 인증서의 유효일자들이 점검되지 않았습니다.
diff --git a/java/org/apache/tomcat/util/net/jsse/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/util/net/jsse/LocalStrings_zh_CN.properties
index 514bc76..7b9e41e 100644
--- a/java/org/apache/tomcat/util/net/jsse/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/net/jsse/LocalStrings_zh_CN.properties
@@ -13,10 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-jsse.exceptionOnClose=无法关闭套接字
-jsse.invalid_ssl_conf=SSL configuration i无效,原因为 [{0}]。
-jsse.noDefaultCiphers=无法确定 [{0}] 的密码默认值。 设置显式值以确保连接器可以启动。
+jsse.openssl.effectiveCiphers=使用的密码:[{0}]
 jsse.pemParseError=无法从 [{0}] 解析 key
 
 jsseSupport.certTranslationError=错误的转换证书[{0}]
 jsseSupport.clientCertError=尝试从客户端获取证书时出错
+
+jsseUtil.trustedCertNotValid=由于[{2}],别名为[{0}]且DN [{1}]的可信证书无效。 将接受由此可信证书签署的证书
diff --git a/java/org/apache/tomcat/util/net/openssl/LocalStrings_de.properties b/java/org/apache/tomcat/util/net/openssl/LocalStrings_de.properties
index 044b3e0..bdb8259 100644
--- a/java/org/apache/tomcat/util/net/openssl/LocalStrings_de.properties
+++ b/java/org/apache/tomcat/util/net/openssl/LocalStrings_de.properties
@@ -18,11 +18,8 @@ engine.emptyCipherSuite=leere Cipher-Suite
 engine.inboundClose=Die eingehende Verbindung wurde vor einer close_notify Nachricht der Gegenstelle geschlossen
 engine.noSession=SSL Session-ID nicht vorhanden
 engine.openSSLError=OpenSSL Fehler: [{0}] Nachricht: [{1}]
-engine.renegotiationUnsupported=Renegotiation wird nicht unterstützt
 engine.unsupportedProtocol=Protokoll [{0}] ist nicht unterstützt
 
-keyManager.nullCertificateChain=Leere Zertifikatskette
-
 openssl.addedClientCaCert=Client CA Zertifikat hinzugefügt: [{0}]
 openssl.certificateVerificationFailed=Zertifikatsprüfung fehlgeschlagen
 openssl.errApplyConf=Die OpenSSLConf konnte nicht auf den SSL Context angewandt werden
diff --git a/java/org/apache/tomcat/util/net/openssl/LocalStrings_es.properties b/java/org/apache/tomcat/util/net/openssl/LocalStrings_es.properties
index ee9f792..ea47f45 100644
--- a/java/org/apache/tomcat/util/net/openssl/LocalStrings_es.properties
+++ b/java/org/apache/tomcat/util/net/openssl/LocalStrings_es.properties
@@ -19,8 +19,6 @@ engine.noSession=El identificador de la sesión SSL no está disponible
 engine.openSSLError=Error de OpenSSL: [{0}] mensage: [{1}]\n
 engine.writeToSSLFailed=Fallo al escribir hacia SSL, resultado: [{0}]
 
-keyManager.nullCertificateChain=Cadena de certificado nulo
-
 openssl.addedClientCaCert=Ceritifcado CA de cliente adicionado: [{0}]
 openssl.trustManagerMissing=No se encontró un manejador confiable
 
diff --git a/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties b/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties
index ecdf34a..7f65bf6 100644
--- a/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties
@@ -17,7 +17,6 @@ engine.ciphersFailure=Echec en essayant d'obtenir la liste des chiffres
 engine.emptyCipherSuite=La suite de chiffrement (cipher suite) est vide
 engine.engineClosed=Le moteur a déjà été fermé
 engine.failedCipherSuite=Impossible d''activer la suite de chiffres [{0}]
-engine.handshakeFailure=Echec de négociation: [{0}]
 engine.inboundClose=L'entrée a été fermée avant d'avoir reçu le close_notify du pair
 engine.invalidBufferArray=offset: [{0}], length: [{1}] (attendu: offset <= offset + length <= srcs.length [{2}])
 engine.noSSLContext=Pas de contexte SSL
@@ -29,15 +28,11 @@ engine.nullName=La valeur du nom est null
 engine.nullValue=La valeur est null
 engine.openSSLError=Erreur OpenSSL : [{0}] message : [{1}]
 engine.oversizedPacket=Le paquet crypté est trop gros
-engine.renegotiationUnsupported=La renégociation n'est pas supportée
 engine.unsupportedCipher=Suite de chiffres non supportée: [{0}] [{1}]
 engine.unsupportedProtocol=Le protocole [{0}] n''est pas supporté
 engine.unverifiedPeer=Le pair n'est pas vérifié
 engine.writeToSSLFailed=Echec d''écriture vers SSL, code de retour: [{0}]
 
-keyManager.nullCertificateChain=La chaîne de certificats est nulle
-keyManager.nullPrivateKey=La clé privée est null
-
 openssl.X509FactoryError=Impossible d'obtenir l'instance de la fabrique X509
 openssl.addedClientCaCert=Ajout du certificat CA du client: [{0}]
 openssl.applyConf=Application de OpenSSLConfCmd au contexte SSL
diff --git a/java/org/apache/tomcat/util/net/openssl/LocalStrings_ja.properties b/java/org/apache/tomcat/util/net/openssl/LocalStrings_ja.properties
index e61d134..b202cb7 100644
--- a/java/org/apache/tomcat/util/net/openssl/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/net/openssl/LocalStrings_ja.properties
@@ -17,7 +17,6 @@ engine.ciphersFailure=暗号リストを取得できません。
 engine.emptyCipherSuite=暗号スイートがありません。
 engine.engineClosed=エンジンが閉じられています
 engine.failedCipherSuite=暗号スイート[{0}]を有効にできませんでした。
-engine.handshakeFailure=ハンドシェイクに失敗しました: [{0}]
 engine.inboundClose=ピアのclose_notifyを受信する前のインバウンドクローズ
 engine.invalidBufferArray=オフセット: [{0}], 長さ: [{1}] (期待値: offset <= offset + length <= srcs.length [{2}])
 engine.noSSLContext=SSLコンテキストがありません
@@ -29,15 +28,11 @@ engine.nullName=Null値名
 engine.nullValue=Null値
 engine.openSSLError=OpenSSLエラー:[{0}] メッセージ:[{1}]
 engine.oversizedPacket=暗号化パケットのサイズが超過しています。
-engine.renegotiationUnsupported=再ネゴシエーションには対応していません。
 engine.unsupportedCipher=サポートされていない暗号スイート:[{0}] [{1}]
 engine.unsupportedProtocol=プロトコル [{0}] には対応していません。
 engine.unverifiedPeer=未確認のピア
 engine.writeToSSLFailed=SSLへの書き込みに失敗しました。返却値:[{0}]
 
-keyManager.nullCertificateChain=Nullの証明書チェーン
-keyManager.nullPrivateKey=Null 秘密鍵
-
 openssl.X509FactoryError=X509ファクトリインスタンスの取得エラー
 openssl.addedClientCaCert=クライアント CA 証明書を登録しました: [{0}]
 openssl.applyConf=OpenSSLConfCmdをSSLコンテキストに適用します。
diff --git a/java/org/apache/tomcat/util/net/openssl/LocalStrings_ko.properties b/java/org/apache/tomcat/util/net/openssl/LocalStrings_ko.properties
index d28af63..4b403e1 100644
--- a/java/org/apache/tomcat/util/net/openssl/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/util/net/openssl/LocalStrings_ko.properties
@@ -17,7 +17,6 @@ engine.ciphersFailure=Cipher들의 목록을 얻지 못했습니다.
 engine.emptyCipherSuite=CipherSuite 이름이 존재하지 않습니다.
 engine.engineClosed=엔진이 닫혀 있습니다.
 engine.failedCipherSuite=Cipher suite [{0}]을(를) 사용가능 상태로 설정하지 못했습니다.
-engine.handshakeFailure=Handshake 실패: [{0}]
 engine.inboundClose=Peer의 close_notify를 받기 전에, Inbound가 닫혔습니다.
 engine.invalidBufferArray=offset: [{0}], 길이: [{1}] (요구사항: offset <= offset + length <= srcs.length [{2}])
 engine.noSSLContext=SSL 컨텍스트가 없음.
@@ -29,15 +28,11 @@ engine.nullName=name이 널입니다.
 engine.nullValue=널 값
 engine.openSSLError=OpenSSL 오류: [{0}], 메시지: [{1}]
 engine.oversizedPacket=암호화된 패킷이 너무 큽니다.
-engine.renegotiationUnsupported=Renegotiation은 지원되지 않습니다.
 engine.unsupportedCipher=지원되지 않는 cipher suite: [{0}] [{1}]
 engine.unsupportedProtocol=프로토콜 [{0}]은(는) 지원되지 않습니다.
 engine.unverifiedPeer=검증되지 않은 Peer
 engine.writeToSSLFailed=SSL에 쓰기 실패, 반환 값: [{0}]
 
-keyManager.nullCertificateChain=널 인증서 체인입니다.
-keyManager.nullPrivateKey=개인 키가 널임
-
 openssl.X509FactoryError=X509 팩토리 인스턴스를 얻는 중 오류 발생
 openssl.addedClientCaCert=클라이언트 CA 인증서를 추가했습니다: [{0}]
 openssl.applyConf=OpenSSLConfCmd를 SSL 컨텍스트에 적용합니다.
diff --git a/java/org/apache/tomcat/util/net/openssl/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/util/net/openssl/LocalStrings_zh_CN.properties
index aaeda54..92e1245 100644
--- a/java/org/apache/tomcat/util/net/openssl/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/net/openssl/LocalStrings_zh_CN.properties
@@ -16,13 +16,10 @@
 engine.ciphersFailure=获取密码列表失败
 engine.emptyCipherSuite=空密码套件
 engine.engineClosed=引擎已经关闭
-engine.handshakeFailure=握手失败:[{0}]
 engine.noSession=SSL会话ID不可用
 engine.openSSLError=OpenSSL 错误:[{0}] 信息: [{1}]
 engine.writeToSSLFailed=写入SSL失败,返回:[{0}]
 
-keyManager.nullCertificateChain=证书链.为空
-
 openssl.X509FactoryError=获取X509工厂实例时出错
 openssl.addedClientCaCert=添加了客户端 CA 证书:[{0}]
 openssl.errMakeConf=无法创建OpenSSLConf上下文
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_fr.properties b/java/org/apache/tomcat/websocket/LocalStrings_fr.properties
index 94268f0..33a2f9e 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_fr.properties
@@ -99,7 +99,6 @@ wsSession.duplicateHandlerBinary=Un gestionnaire de message binaire a déjà ét
 wsSession.duplicateHandlerPong=Un gestionnaire de messages pong a déjà été configuré
 wsSession.duplicateHandlerText=Un gestionnaire de message texte a déjà été configuré
 wsSession.flushFailOnClose=Impossible d'envoyer la file de messages lors de la fermeture de la session
-wsSession.instanceDestroy=Le désenregistrement de l'instance de la terminaison a échoué
 wsSession.instanceNew=L'enregistrement de l'instance de la terminaison a échoué
 wsSession.invalidHandlerTypePong=Un gestionnaire de message pong doit implémenter MessageHandler.Whole
 wsSession.messageFailed=Impossible d'écrire le message WebSocket complet car la connection a été fermée
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_ja.properties b/java/org/apache/tomcat/websocket/LocalStrings_ja.properties
index 0de45af..6107fee 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_ja.properties
@@ -99,7 +99,6 @@ wsSession.duplicateHandlerBinary=バイナリメッセージハンドラは既
 wsSession.duplicateHandlerPong=pongメッセージハンドラは既に設定されています。
 wsSession.duplicateHandlerText=テキストメッセージハンドラはすでに構成されています。
 wsSession.flushFailOnClose=セッション切断時にバッチメッセージをフラッシュできませんでした。
-wsSession.instanceDestroy=エンドポイントインスタンスの登録解除に失敗しました。
 wsSession.instanceNew=エンドポイントインスタンスの登録に失敗しました。
 wsSession.invalidHandlerTypePong=pongメッセージハンドラはMessageHandler.Wholeを実装する必要があります。
 wsSession.messageFailed=WebSocket コネクションが切断されているため、完了メッセージを送信できません。
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_ko.properties b/java/org/apache/tomcat/websocket/LocalStrings_ko.properties
index 3b36be5..7ace6fa 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_ko.properties
@@ -99,7 +99,6 @@ wsSession.duplicateHandlerBinary=바이너리 메시지 핸들러가 이미 설
 wsSession.duplicateHandlerPong=Pong 메시지 핸들러가 이미 설정되었습니다.
 wsSession.duplicateHandlerText=텍스트 메시지 핸들러가 이미 설정되어 있습니다.
 wsSession.flushFailOnClose=세션이 닫힐 때, 배치에 쌓인 메시지들을 배출하지 못했습니다.
-wsSession.instanceDestroy=엔드포인트 인스턴스에 대한 등록을 제거하지 못했습니다.
 wsSession.instanceNew=엔드포인트 인스턴스 등록 실패
 wsSession.invalidHandlerTypePong=Pong 메시지 핸들러는 반드시 MessageHandler.Whole을 구현해야 합니다.
 wsSession.messageFailed=웹소켓 연결이 이미 닫혔기 때문에, 완전한 메시지를 쓸 수 없습니다.
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
index beef591..bcb0742 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
@@ -19,6 +19,7 @@ caseInsensitiveKeyMap.nullKey=不允许 Key 是 Null
 
 perMessageDeflate.deflateFailed=无法压缩这个WebSocket压缩结构
 perMessageDeflate.duplicateParameter=重复定义的扩展参数[{0}]
+perMessageDeflate.invalidWindowSize=为[{0}]指定了[{1}]大小的无效窗口。 有效值是从8到15(包括8和15)的整数。
 
 util.notToken=一个非法的扩展参数被指定为名称[{0}]和值[{0}]
 util.unknownDecoderType=无法识别该解码器类型[{0}]
@@ -27,6 +28,7 @@ wsFrame.byteToLongFail=提供了太多字节([{0}]),转换成一个长的字
 wsFrame.closed=在一个关闭的控制帧后受到了一个新的帧.
 wsFrame.controlFragmented=接收到分段的控制帧,但控制帧可能不被分割。
 wsFrame.controlNoFin=发送一个没有设置的控制帧。控制帧不允许使用连续帧。
+wsFrame.notMasked=客户端帧未被屏蔽,但必须屏蔽所有客户端帧
 wsFrame.partialHeaderComplete=接收到WebSocket帧. fin [{0}], rsv [{1}], OpCode [{2}], payload 长度 [{3}]
 wsFrame.sessionClosed=无法处理客户端数据,因为会话已被关闭
 wsFrame.wrongRsv=对于具有opCode [{1}]的消息,客户端帧将保留位设置为[{0}],此端点不支持
@@ -40,9 +42,11 @@ wsRemoteEndpoint.closedDuringMessage=因为 WebSocket session 被关闭,消息
 wsRemoteEndpoint.flushOnCloseFailed=会话关闭后仍然启用批处理消息。无法刷新剩余的批量消息
 wsRemoteEndpoint.noEncoder=没有为类 [{0}] 的对象指定编码器
 wsRemoteEndpoint.nullData=无效空的data 参数
+wsRemoteEndpoint.sendInterrupt=当前线程在等待阻塞发送完成时被中断
 wsRemoteEndpoint.tooMuchData=ping或pong不应该发送超过125字节
 wsRemoteEndpoint.wrongState=远程 endpoint 处于 [{0}] 状态,是被调用方法的无效状态
 
+wsSession.closed=WebSocket会话[{0}]已关闭,并且在关闭的会话上不能调用任何方法(除了close())
 wsSession.created=创建WebSocket session [{0}]。
 wsSession.doClose=关闭 WebSocket session [{1}]
 wsSession.duplicateHandlerText=已配置文本消息处理器
diff --git a/java/org/apache/tomcat/websocket/pojo/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/websocket/pojo/LocalStrings_zh_CN.properties
index 370535e..2fcfc60 100644
--- a/java/org/apache/tomcat/websocket/pojo/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/websocket/pojo/LocalStrings_zh_CN.properties
@@ -13,12 +13,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+pojoEndpointBase.onOpenFail=无法为类型为[{0}]的POJO调用POJO端点的onOpen方法
+
 pojoEndpointServer.getPojoInstanceFail=创建类型为 [{0}] 的 POJO 实例失败
 
 pojoMessageHandlerWhole.decodeIoFail=解码消息时出现IO错误
 
 pojoMethodMapping.duplicateAnnotation=类[{1}]上存在的重复注释[{0}]
 pojoMethodMapping.duplicateLastParam=用OnMessage注释的类[{1}]的方法[{0}]上存在多个布尔参数(最后的)
+pojoMethodMapping.duplicatePongMessageParam=使用OnMessage注释的类[{1}]的方法[{0}]上存在多个PongMessage参数
 pojoMethodMapping.invalidDecoder=这个特定类型的解码器[{0}]无法被实例化
 pojoMethodMapping.noDecoder=在用onMessage注释的类[{1}]的方法[{0}]上找不到消息参数的解码器。
 
diff --git a/java/org/apache/tomcat/websocket/server/LocalStrings_de.properties b/java/org/apache/tomcat/websocket/server/LocalStrings_de.properties
index fb9036b..cd4a292 100644
--- a/java/org/apache/tomcat/websocket/server/LocalStrings_de.properties
+++ b/java/org/apache/tomcat/websocket/server/LocalStrings_de.properties
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 serverContainer.missingAnnotation=Die POJO Klasse [{0}] kann nicht deployed werden da sie nicht mit @ServerEndpoint annotiert ist.
-serverContainer.pojoDeploy=POJO Klasse [{0}] wird unter  [{1}] im ServletContext [{2}] deployed
 serverContainer.servletContextMissing=Es wurde kein ServletContext angegeben
 
 upgradeUtil.incompatibleRsv=Es wurden Erweiterungen spezifiziert, die eine inkompatible RSV Bit Konstellation erzeugen
diff --git a/java/org/apache/tomcat/websocket/server/LocalStrings_es.properties b/java/org/apache/tomcat/websocket/server/LocalStrings_es.properties
index 14e6af2..c56272f 100644
--- a/java/org/apache/tomcat/websocket/server/LocalStrings_es.properties
+++ b/java/org/apache/tomcat/websocket/server/LocalStrings_es.properties
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 serverContainer.configuratorFail=Fallo al crear configurador de tipo [{0}] para el POJO de tipo [{1}]
-serverContainer.pojoDeploy=Clase  POJO [{0}] desplegado en la ruta [{1}] en ServletContext [{2}]\n
 
 uriTemplate.invalidPath=El camino [{0}] no es válido.\n
 
diff --git a/java/org/apache/tomcat/websocket/server/LocalStrings_fr.properties b/java/org/apache/tomcat/websocket/server/LocalStrings_fr.properties
index 1e7d3ce..8803fd9 100644
--- a/java/org/apache/tomcat/websocket/server/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/websocket/server/LocalStrings_fr.properties
@@ -19,9 +19,6 @@ serverContainer.duplicatePaths=Plusieurs terminaisons ne peuvent pas être dépl
 serverContainer.encoderFail=Impossible de créer un encodeur de type [{0}]
 serverContainer.failedDeployment=Le déploiement de terminaisons WebSocket dans l''application web au chemin [{0}] dans l''hôte [{1}] n''est pas autorisé à cause de l''échec lors d''un précédent déploiement
 serverContainer.missingAnnotation=Impossible de déployer la classe POJO [{0}] car elle n''a pas été annotée avec @ServerEndpoint
-serverContainer.missingEndpoint=Une instance d''une terminaison a été demandée pour le chemin [{0}] mais aucune classe de terminaison correspondante n''a été trouvée
-serverContainer.pojoDeploy=La classe d''objet (POJO) [{0}] est déployée au chemin [{1}] dans le contexte [{2}]
-serverContainer.servletContextMismatch=Tentative d''enregistrer un POJO annoté pour WebSocket au chemin [{0}] dans le ServletContext qui a un chemin de contexte [{1}], alors que le ServerContainer est alloué au ServletContext avec le chemin de contexte [{2}]
 serverContainer.servletContextMissing=Aucun ServletContext n'a été spécifié
 
 upgradeUtil.incompatibleRsv=Des extensions qui ont été spécifiées ont une utilisation incompatible du bit RSV
diff --git a/java/org/apache/tomcat/websocket/server/LocalStrings_ja.properties b/java/org/apache/tomcat/websocket/server/LocalStrings_ja.properties
index dd411bb..f1cc316 100644
--- a/java/org/apache/tomcat/websocket/server/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/websocket/server/LocalStrings_ja.properties
@@ -19,9 +19,6 @@ serverContainer.duplicatePaths=複数のエンドポイントを同じパス[{0}
 serverContainer.encoderFail=タイプ[{0}]のエンコーダを作成できません
 serverContainer.failedDeployment=以前のデプロイメントが失敗したため、ホスト[{1}]内のパス[{0}]を持つWebアプリケーションへのWebSocketエンドポイントのデプロイメントは許可されていません。
 serverContainer.missingAnnotation=POJOクラス[{0}]は@ServerEndpointでアノテーション付けされていないため、デプロイ出来ません。
-serverContainer.missingEndpoint=エンドポイントインスタンスがパス[{0}]を要求しましたが、一致するエンドポイントクラスが見つかりませんでした。
-serverContainer.pojoDeploy=ServletContext [{2}] のパス [{1}] へ POJO クラス [{0}] をデプロイします。
-serverContainer.servletContextMismatch=WebSocket ServerContainerがコンテキストパス[{2}]でServletContextに割り当てられている場合、ServletContextのパス[{0}]にアノテーション付きPOJOをコンテキストパス[{1}]で登録を試みました。
 serverContainer.servletContextMissing=ServletContextが指定されていません
 
 upgradeUtil.incompatibleRsv=互換性のないRSVビットの使用法を持つ拡張が指定されました
diff --git a/java/org/apache/tomcat/websocket/server/LocalStrings_ko.properties b/java/org/apache/tomcat/websocket/server/LocalStrings_ko.properties
index 19e2eeb..912de07 100644
--- a/java/org/apache/tomcat/websocket/server/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/websocket/server/LocalStrings_ko.properties
@@ -19,9 +19,6 @@ serverContainer.duplicatePaths=여러 개의 엔드포인트들이 동일한 경
 serverContainer.encoderFail=타입이 [{0}]인 인코더를 생성할 수 없습니다.
 serverContainer.failedDeployment=이전 배치의 실패로 인하여, 호스트 [{1}] 내에 경로 [{0}]의 웹 애플리케이션에 대한 웹소켓 엔드포인트들의 배치가 허용되지 않습니다.
 serverContainer.missingAnnotation=클래스가 @ServerEndpoint로 annotate되어 있지 않기에, POJO 클래스 [{0}]을(를) 배치할 수 없습니다.
-serverContainer.missingEndpoint=경로 [{0}]을(를) 위한 엔드포인트 인스턴스가 요청되었지만, 부합되는 엔드포인트 클래스를 찾지 못했습니다.
-serverContainer.pojoDeploy=POJO 클래스인 [{0}]을(를) 서블릿 컨텍스트 [{2}]의 [{1}] 경로에 배치합니다.
-serverContainer.servletContextMismatch=컨텍스트 경로가 [{2}]인 ServletContext에 할당되어 있는 상황에서, 웹소켓 ServerContainer가, 컨텍스트 경로가 [{1}]인 ServletContext에서 경로 [{0}]에 있는 WebSocket을 위해, annotate된 POJO를 등록하려 시도했습니다.
 serverContainer.servletContextMissing=지정된 ServletContext가 없습니다.
 
 upgradeUtil.incompatibleRsv=호환되지 않는 RSV 비트를 사용하여, Extension들이 지정되었습니다.
diff --git a/java/org/apache/tomcat/websocket/server/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/websocket/server/LocalStrings_zh_CN.properties
index 7f65c7e..2514775 100644
--- a/java/org/apache/tomcat/websocket/server/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/websocket/server/LocalStrings_zh_CN.properties
@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+serverContainer.configuratorFail=无法为[{1}]类型的POJO创建类型[{0}]的配置程序
 serverContainer.failedDeployment=由于以前的部署失败,不允许将WebSocket终结点部署到主机[{1}]中路径为[{0}]的Web应用程序
-serverContainer.pojoDeploy=POJO 类 [{0}] 在 ServletContext [{2}] 中部署到路径 [{1}]
 serverContainer.servletContextMissing=没有指定ServletContext
 
 upgradeUtil.incompatibleRsv=指定扩展名具有不兼容的RSV位使用


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]