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 2020/06/30 10:35:18 UTC

[tomcat] branch 8.5.x updated (64781c1 -> 3003d7b)

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 64781c1  Fix BZ 64560 Don't clear DeltaRequest when changing session ID
     new f059c04  Import updated French translations from POEditor
     new 3003d7b  Correct order

The 2 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/session/LocalStrings_fr.properties        | 1 +
 java/org/apache/catalina/valves/rewrite/LocalStrings_fr.properties | 2 ++
 java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties    | 6 +++---
 java/org/apache/tomcat/util/net/jsse/LocalStrings_ja.properties    | 6 +++---
 java/org/apache/tomcat/util/net/jsse/LocalStrings_ko.properties    | 6 +++---
 java/org/apache/tomcat/util/net/jsse/LocalStrings_zh_CN.properties | 6 +++---
 webapps/docs/changelog.xml                                         | 4 ++++
 7 files changed, 19 insertions(+), 12 deletions(-)


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


[tomcat] 01/02: Import updated French translations from POEditor

Posted by ma...@apache.org.
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 f059c048397e391b205419985dc1b3d13bf431c2
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jun 30 11:32:18 2020 +0100

    Import updated French translations from POEditor
---
 java/org/apache/catalina/session/LocalStrings_fr.properties        | 1 +
 java/org/apache/catalina/valves/rewrite/LocalStrings_fr.properties | 2 ++
 webapps/docs/changelog.xml                                         | 4 ++++
 3 files changed, 7 insertions(+)

diff --git a/java/org/apache/catalina/session/LocalStrings_fr.properties b/java/org/apache/catalina/session/LocalStrings_fr.properties
index b2fca5f..a4a88c3 100644
--- a/java/org/apache/catalina/session/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/session/LocalStrings_fr.properties
@@ -29,6 +29,7 @@ JDBCStore.wrongDataSource=Impossible d''ouvrir la DataSource JNDI [{0}]
 fileStore.createFailed=Impossible de créer le répertoire [{0}] pour stocker les données de session
 fileStore.deleteFailed=Impossible d''effacer le fichier [{0}] qui empêche la création du support de stockage de sessions
 fileStore.deleteSessionFailed=Impossible d''effacer le fichier [{0}] qui n''est plus nécessaire
+fileStore.invalid=Fichier de persistance [{0}] invalide pour la session avec id [{1}]
 fileStore.loading=Chargement de la Session [{0}] depuis le fichier [{1}]
 fileStore.removing=Retrait de la Session [{0}] du fichier [{1}]
 fileStore.saving=Sauvegarde de la Session [{0}] vers le fichier [{1}]
diff --git a/java/org/apache/catalina/valves/rewrite/LocalStrings_fr.properties b/java/org/apache/catalina/valves/rewrite/LocalStrings_fr.properties
index aac8da4..f2dc9f7 100644
--- a/java/org/apache/catalina/valves/rewrite/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/valves/rewrite/LocalStrings_fr.properties
@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+quotedStringTokenizer.tokenizeError=Erreur de découpage du texte [{0}] après la position [{1}] en utilisant le mode [{2}]
+
 rewriteValve.closeError=Erreur lors de la fermeture de la configuration
 rewriteValve.invalidFlags=Indicateur invalide dans [{0}] indicateurs [{1}]
 rewriteValve.invalidLine=Ligne invalide [{0}]
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c92a982..1ba0273 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -144,6 +144,10 @@
         <bug>64522</bug>: Package jars in effective dependency order. Pull
         request provided by Raymond Augé. (markt)
       </fix>
+      <add>
+        Improve the quality and expand the coverage of the French translations
+        provided with Apache Tomcat. (remm)
+      </add>
     </changelog>
   </subsection>
 </section>


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


[tomcat] 02/02: Correct order

Posted by ma...@apache.org.
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 3003d7b2cebd72d5c5add650637a5b00b084bc8b
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jun 30 11:32:28 2020 +0100

    Correct order
---
 java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties    | 6 +++---
 java/org/apache/tomcat/util/net/jsse/LocalStrings_ja.properties    | 6 +++---
 java/org/apache/tomcat/util/net/jsse/LocalStrings_ko.properties    | 6 +++---
 java/org/apache/tomcat/util/net/jsse/LocalStrings_zh_CN.properties | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

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 98f523b..ed9a7ee 100644
--- a/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties
@@ -13,12 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-jsseUtil.excludeProtocol=Le protocole SSL [{0}] qui est supporté par ce JRE a été exclu des protocoles disponibles dans Tomcat
-jsseUtil.noDefaultProtocols=Impossible de déterminer un défaut pour sslEnabledProtocols de [{0}], indiquez une valeur explicite pour permettre le démarrage du connecteur
-
 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.excludeProtocol=Le protocole SSL [{0}] qui est supporté par ce JRE a été exclu des protocoles disponibles dans Tomcat
+jsseUtil.noDefaultProtocols=Impossible de déterminer un défaut pour sslEnabledProtocols de [{0}], indiquez une valeur explicite pour permettre le démarrage du connecteur
+
 pemFile.noMultiPrimes=Le certificat PKCS#1 est dans un format mutli-prime et Java ne fournit pas d'API pour construire une clé privée RSA à partir de ce format
 pemFile.notValidRFC5915=La fichier de clé fourni ne se conforme pas à la RFC 5915
 pemFile.parseError=Impossible de parser la clé de [{0}]
diff --git a/java/org/apache/tomcat/util/net/jsse/LocalStrings_ja.properties b/java/org/apache/tomcat/util/net/jsse/LocalStrings_ja.properties
index 24066d2..b0b83b0 100644
--- a/java/org/apache/tomcat/util/net/jsse/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/net/jsse/LocalStrings_ja.properties
@@ -13,12 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-jsseUtil.excludeProtocol=JRE は SSL プロトコル [{0}] に対応しています。しかし Tomcat の利用可能プロトコルからは除外されています。
-jsseUtil.noDefaultProtocols=sslEnableProtocols の既定値を取得できません。コネクターを開始できるよう明示的に値を設定してください。
-
 jsseSupport.certTranslationError=証明書の翻訳中にエラーが発生しました[{0}]
 jsseSupport.clientCertError=クライアント証明書を取得中のエラー
 
+jsseUtil.excludeProtocol=JRE は SSL プロトコル [{0}] に対応しています。しかし Tomcat の利用可能プロトコルからは除外されています。
+jsseUtil.noDefaultProtocols=sslEnableProtocols の既定値を取得できません。コネクターを開始できるよう明示的に値を設定してください。
+
 pemFile.noMultiPrimes=PKCS#1 証明書は multi-prime RSA フォーマットですが、Java はそのようなフォーマットに対する RSA 秘密鍵を構築する API を提供していません
 pemFile.notValidRFC5915=与えられたキーファイルは RFC 5915 に準拠していません
 pemFile.parseError=秘密鍵ファイル [{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 822dbf8..1882888 100644
--- a/java/org/apache/tomcat/util/net/jsse/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/util/net/jsse/LocalStrings_ko.properties
@@ -13,12 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-jsseUtil.excludeProtocol=이 JRE에서 지원되는 해당 SSL 프로토콜 [{0}]이(가), Tomcat의 가용 프로토콜 목록에서 제외되어 있습니다.
-jsseUtil.noDefaultProtocols=sslEnabledProtocols의 기본값을 결정할 수 없습니다. Connector가 제대로 시작되는지 보증하려면 명시적으로 값을 설정하십시오.
-
 jsseSupport.certTranslationError=인증서 [{0}]에 대한 인증서 변환을 하는 중 오류 발생
 jsseSupport.clientCertError=클라이언트로부터 인증서를 구하려 시도하는 중 오류 발생
 
+jsseUtil.excludeProtocol=이 JRE에서 지원되는 해당 SSL 프로토콜 [{0}]이(가), Tomcat의 가용 프로토콜 목록에서 제외되어 있습니다.
+jsseUtil.noDefaultProtocols=sslEnabledProtocols의 기본값을 결정할 수 없습니다. Connector가 제대로 시작되는지 보증하려면 명시적으로 값을 설정하십시오.
+
 pemFile.noMultiPrimes=해당 PKCS#1 인증서는 multi-prime 포맷으로 되어 있는데, 자바는 해당 포맷으로부터 RSA 개인 키 객체를 생성할 API를 제공하지 않습니다.
 pemFile.notValidRFC5915=제공된 키는 RFC 5915를 따르지 않습니다
 pemFile.parseError=[{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 19095ec..fc763bb 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,12 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-jsseUtil.excludeProtocol=此JRE支持的SSL协议[{0}]已从Tomcat可用的协议中排除
-jsseUtil.noDefaultProtocols=无法确定sslEnabledProtocols的默认值。设置显式值以确保连接器可以启动。
-
 jsseSupport.certTranslationError=错误的转换证书[{0}]
 jsseSupport.clientCertError=尝试从客户端获取证书时出错
 
+jsseUtil.excludeProtocol=此JRE支持的SSL协议[{0}]已从Tomcat可用的协议中排除
+jsseUtil.noDefaultProtocols=无法确定sslEnabledProtocols的默认值。设置显式值以确保连接器可以启动。
+
 pemFile.noMultiPrimes=PKCS#1证书是多素数格式的,Java不提供从该格式构造RSA私钥对象的API
 pemFile.notValidRFC5915=提供的key文件不符合RFC 5915
 pemFile.parseError=无法从 [{0}] 解析 key


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