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:32:59 UTC

[tomcat] branch 9.0.x updated (47d7674 -> e2ce6a9)

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

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


    from 47d7674  Fix path
     new 11cf65a  Import updated French translations from POEditor
     new e2ce6a9  Extend the list of keys known to differ between versions

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 | 4 ++++
 java/org/apache/tomcat/buildutil/translate/BackportEnglish.java    | 1 +
 webapps/docs/changelog.xml                                         | 4 ++++
 4 files changed, 10 insertions(+)


---------------------------------------------------------------------
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 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 11cf65ad089b48ae3ee7adf3b6e6e80bfa39a699
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jun 30 11:26:49 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 | 4 ++++
 webapps/docs/changelog.xml                                         | 4 ++++
 3 files changed, 9 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..110661d 100644
--- a/java/org/apache/catalina/valves/rewrite/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/valves/rewrite/LocalStrings_fr.properties
@@ -13,6 +13,10 @@
 # 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}]
+
+rewriteMap.tooManyParameters=Cette map ne supporte pas plusieurs paramètres
+
 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 ac97228..e75f367 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -180,6 +180,10 @@
         <bug>64544</bug>: Add built libs to the bnd classpath for introspection.
         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: Extend the list of keys known to differ between versions

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

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

commit e2ce6a9ced7205cf7997ffc05332b2dfc1ec167b
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jun 30 11:27:42 2020 +0100

    Extend the list of keys known to differ between versions
---
 java/org/apache/tomcat/buildutil/translate/BackportEnglish.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
index 023aa3f..31b279b 100644
--- a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
+++ b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
@@ -37,6 +37,7 @@ public class BackportEnglish extends BackportBase {
         keysToExclude.add("java.org.apache.catalina.manager.zzz.htmlManagerServlet.deployPath");
         keysToExclude.add("java.org.apache.catalina.mbeans.zzz.jmxRemoteLifecycleListener.deprecated");
         keysToExclude.add("java.org.apache.catalina.startup.zzz.catalina.stopServer.connectException");
+        keysToExclude.add("java.org.apache.jasper.resources.zzz.jsp.error.jsproot.version.invalid");
         keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.usage");
         keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.webfrg.header");
         keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.webxml.header");


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