You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2024/11/06 15:14:38 UTC

(tomcat) branch 10.1.x updated (78ef256d74 -> 97b82788af)

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

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


    from 78ef256d74 Remove interim ByteBuddy update
     new b166a67f8f Fix order
     new 5945ad2a0c Improvements to German translations. (remm)
     new 97b82788af Remove blank line

The 3 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:
 java/org/apache/catalina/filters/LocalStrings.properties        | 2 +-
 java/org/apache/catalina/servlets/LocalStrings.properties       | 2 +-
 java/org/apache/catalina/servlets/LocalStrings_zh_CN.properties | 1 -
 java/org/apache/tomcat/util/http/LocalStrings.properties        | 2 +-
 java/org/apache/tomcat/util/scan/LocalStrings_de.properties     | 2 +-
 webapps/docs/changelog.xml                                      | 3 +++
 6 files changed, 7 insertions(+), 5 deletions(-)


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


(tomcat) 01/03: Fix order

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit b166a67f8f362725d3f4f19eded02728919fd6f3
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Nov 6 15:13:19 2024 +0000

    Fix order
---
 java/org/apache/catalina/filters/LocalStrings.properties  | 2 +-
 java/org/apache/catalina/servlets/LocalStrings.properties | 2 +-
 java/org/apache/tomcat/util/http/LocalStrings.properties  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/catalina/filters/LocalStrings.properties b/java/org/apache/catalina/filters/LocalStrings.properties
index 6a4f97cd5a..73ce1c15d3 100644
--- a/java/org/apache/catalina/filters/LocalStrings.properties
+++ b/java/org/apache/catalina/filters/LocalStrings.properties
@@ -37,10 +37,10 @@ csrfPrevention.unsupportedPattern=Unsupported pattern [{0}]
 expiresFilter.cacheControlNoStore=Request [{0}] with response status [{1}] content-type [{2}], Cache-Control: no-store header already defined
 expiresFilter.exceptionProcessingParameter=Exception processing configuration parameter [{0}]:[{1}]
 expiresFilter.expirationHeaderAlreadyDefined=Request [{0}] with response status [{1}] content-type [{2}], Expires header already defined
-expiresFilter.invalidMethod=Request [{0}] with request method [{1}], non-cacheable method
 expiresFilter.filterInitialized=Filter initialized with configuration [{0}]
 expiresFilter.invalidDurationNumber=Invalid duration (number) [{0}] in directive [{1}]
 expiresFilter.invalidDurationUnit=Invalid duration unit (years|months|weeks|days|hours|minutes|seconds) [{0}] in directive [{1}]
+expiresFilter.invalidMethod=Request [{0}] with request method [{1}], non-cacheable method
 expiresFilter.noDurationFound=Duration not found in directive [{0}]
 expiresFilter.noDurationUnitAfterAmount=Duration unit not found after amount [{0}] in directive [{1}]
 expiresFilter.noExpirationConfigured=Request [{0}] with response status [{1}] content-type [{2}], no expiration configured
diff --git a/java/org/apache/catalina/servlets/LocalStrings.properties b/java/org/apache/catalina/servlets/LocalStrings.properties
index ae3d0f047b..fecf44bbcb 100644
--- a/java/org/apache/catalina/servlets/LocalStrings.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings.properties
@@ -59,6 +59,6 @@ webdavservlet.externalEntityIgnored=The request included a reference to an exter
 webdavservlet.inputstreamclosefail=Failed to close the inputStream of [{0}]
 webdavservlet.jaxpfailed=JAXP initialization failed
 webdavservlet.memorystore=Non persistent memory storage will be used for dead properties; the 'propertyStore' init parameter of the Servlet may be used to configure a custom store implementing the 'WebdavServlet.PropertyStore' interface
-webdavservlet.nonWildcardMapping=The mapping [{0}] is not a wildcard mapping and should not be used for the WebDAV Servlet
 webdavservlet.noStoreParameter=Init parameter [{0}] with value [{1}] was not found on the configured store
+webdavservlet.nonWildcardMapping=The mapping [{0}] is not a wildcard mapping and should not be used for the WebDAV Servlet
 webdavservlet.storeError=Error creating store of class [{0}], the default memory store will be used instead
diff --git a/java/org/apache/tomcat/util/http/LocalStrings.properties b/java/org/apache/tomcat/util/http/LocalStrings.properties
index b84e00d174..12b74fdb1c 100644
--- a/java/org/apache/tomcat/util/http/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/http/LocalStrings.properties
@@ -49,5 +49,5 @@ rfc6265CookieProcessor.invalidCharInValue=An invalid character [{0}] was present
 rfc6265CookieProcessor.invalidDomain=An invalid domain [{0}] was specified for this cookie
 rfc6265CookieProcessor.invalidPath=An invalid path [{0}] was specified for this cookie
 
-webdavifheader.unexpectedCharacter=Unexpected character [{0}] in state [{1}], expected any of [{2}]
 webdavifheader.ioError=IO Problem catching up to any of [{0}]
+webdavifheader.unexpectedCharacter=Unexpected character [{0}] in state [{1}], expected any of [{2}]


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


(tomcat) 03/03: Remove blank line

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 97b82788afd3705989aae02ef08d0e825860d8c0
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Nov 6 15:14:16 2024 +0000

    Remove blank line
---
 java/org/apache/catalina/servlets/LocalStrings_zh_CN.properties | 1 -
 1 file changed, 1 deletion(-)

diff --git a/java/org/apache/catalina/servlets/LocalStrings_zh_CN.properties b/java/org/apache/catalina/servlets/LocalStrings_zh_CN.properties
index 7a0bbbc6b6..72ee5c9266 100644
--- a/java/org/apache/catalina/servlets/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings_zh_CN.properties
@@ -53,7 +53,6 @@ defaultServlet.skipfail=读取失败,因为只有[{0}]个字节可用,但需
 defaultServlet.unknownBomConfig=为useBomIfPresent初始化参数提供的[{0}]值无法识别
 defaultServlet.xslError=XSL转换器错误
 
-
 webdavservlet.externalEntityIgnored=请求包含对PublicID[{0}]和SystemID[{1}]的外部实体的引用,该引用被忽略。
 webdavservlet.inputstreamclosefail=无法关闭[{0}]的输入流
 webdavservlet.jaxpfailed=JAXP 初始化失败


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


(tomcat) 02/03: Improvements to German translations. (remm)

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 5945ad2a0c1b5bcc98afc5c7590bbeb5ffaf2bc1
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Nov 6 15:14:07 2024 +0000

    Improvements to German translations. (remm)
---
 java/org/apache/tomcat/util/scan/LocalStrings_de.properties | 2 +-
 webapps/docs/changelog.xml                                  | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/scan/LocalStrings_de.properties b/java/org/apache/tomcat/util/scan/LocalStrings_de.properties
index 36839e1f45..12e381ea86 100644
--- a/java/org/apache/tomcat/util/scan/LocalStrings_de.properties
+++ b/java/org/apache/tomcat/util/scan/LocalStrings_de.properties
@@ -17,6 +17,6 @@
 # To edit translations see: https://tomcat.apache.org/getinvolved.html#Translations
 
 jarScan.classPath.badEntry=Der Classpath Eintrag [{0}] konnte nicht in eine URL gewandelt werden
-jarScan.classloaderFail=Fehler beim Scannen von [{0}] aus der Classloader Historie
+jarScan.classloaderFail=Fehler beim Scannen von [{0}] aus der Classloader-Hierarchie
 jarScan.classloaderJarNoScan=Werde auf Datei [{0}] aus dem Classpath kein JAR Scanning durchführen
 jarScan.webinflibStart=Durchsuche /WEB-INF/lib nach JARs
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d0fbd6bf34..e7c3a5b02a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -329,6 +329,9 @@
       <update>
         Update CheckStyle to 10.20.0. (markt)
       </update>
+      <add>
+        Improvements to German translations. (remm)
+      </add>
     </changelog>
   </subsection>
 </section>


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