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 2023/12/07 12:06:35 UTC

(tomcat) branch 9.0.x updated (be48ff50e7 -> a57fc265e3)

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 be48ff50e7 Improve error handling
     new 0d30483d74 Format and ordering fixes - triggered by i18n backport process
     new f1dfbc04ab Improvements to French translations. (remm)
     new 59e732fe0e Improvements to Japanese translations by tak7iji.
     new c1f8e70d74 Improvements to Portuguese (BR) translations by John William Vicente
     new 42e86f61ae Improvements to Russian translations by usmazat and remm
     new a57fc265e3 Fix output alignment

The 6 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/javax/el/LocalStrings.properties                       |  1 -
 .../catalina/authenticator/LocalStrings_fr.properties       |  3 +++
 .../catalina/authenticator/LocalStrings_ja.properties       |  3 +++
 .../apache/catalina/connector/LocalStrings_ru.properties    |  2 +-
 java/org/apache/catalina/core/LocalStrings_ru.properties    |  6 +++++-
 java/org/apache/catalina/manager/LocalStrings_fr.properties |  1 +
 java/org/apache/catalina/manager/LocalStrings_ja.properties |  1 +
 java/org/apache/catalina/manager/LocalStrings_ru.properties |  2 +-
 .../apache/catalina/manager/host/LocalStrings_ru.properties |  2 +-
 java/org/apache/catalina/mbeans/LocalStrings_fr.properties  |  1 +
 java/org/apache/catalina/mbeans/LocalStrings_ja.properties  |  1 +
 java/org/apache/catalina/realm/LocalStrings_fr.properties   |  3 +++
 java/org/apache/catalina/realm/LocalStrings_ja.properties   |  3 +++
 .../org/apache/catalina/security/LocalStrings_fr.properties |  4 ++++
 .../org/apache/catalina/security/LocalStrings_ja.properties |  4 ++++
 .../org/apache/catalina/servlets/LocalStrings_ru.properties |  2 ++
 java/org/apache/catalina/session/LocalStrings_ru.properties |  2 ++
 java/org/apache/catalina/startup/LocalStrings_ru.properties |  4 ++++
 .../tribes/group/interceptors/LocalStrings_ru.properties    |  2 ++
 .../catalina/tribes/membership/LocalStrings_ru.properties   |  2 +-
 .../tribes/membership/cloud/LocalStrings_fr.properties      |  1 +
 .../tribes/membership/cloud/LocalStrings_ja.properties      |  1 +
 .../apache/catalina/tribes/tipis/LocalStrings_ru.properties |  2 +-
 .../tribes/transport/nio/LocalStrings_ru.properties         |  2 ++
 java/org/apache/coyote/LocalStrings_ru.properties           |  2 ++
 java/org/apache/coyote/http11/LocalStrings_ru.properties    |  1 +
 .../apache/coyote/http11/filters/LocalStrings_fr.properties |  3 +++
 .../apache/coyote/http11/filters/LocalStrings_ja.properties |  3 +++
 java/org/apache/jasper/resources/LocalStrings_fr.properties |  3 +++
 java/org/apache/jasper/resources/LocalStrings_ja.properties |  3 +++
 .../apache/jasper/resources/LocalStrings_pt_BR.properties   |  1 +
 java/org/apache/tomcat/util/LocalStrings_ru.properties      |  2 +-
 java/org/apache/tomcat/util/buf/LocalStrings_fr.properties  |  1 +
 java/org/apache/tomcat/util/buf/LocalStrings_ja.properties  |  1 +
 .../tomcat/util/descriptor/web/LocalStrings_ru.properties   |  1 +
 java/org/apache/tomcat/util/http/LocalStrings_fr.properties |  1 +
 java/org/apache/tomcat/util/http/LocalStrings_ja.properties |  1 +
 .../session => tomcat/util/json}/LocalStrings_ru.properties |  2 +-
 .../apache/tomcat/util/modeler/LocalStrings_fr.properties   |  1 +
 .../apache/tomcat/util/modeler/LocalStrings_ja.properties   |  1 +
 .../util/modeler/modules}/LocalStrings_fr.properties        |  2 +-
 .../util/modeler/modules}/LocalStrings_ja.properties        |  2 +-
 java/org/apache/tomcat/util/net/LocalStrings_fr.properties  |  1 +
 java/org/apache/tomcat/util/net/LocalStrings_ja.properties  |  1 +
 java/org/apache/tomcat/util/net/LocalStrings_ru.properties  |  1 +
 .../org/apache/tomcat/util/net/jsse/LocalStrings.properties |  4 ++--
 .../util/net/openssl/ciphers/LocalStrings_fr.properties     |  1 +
 .../util/net/openssl/ciphers/LocalStrings_ja.properties     |  1 +
 .../apache/tomcat/util/threads/LocalStrings_fr.properties   |  2 ++
 .../apache/tomcat/util/threads/LocalStrings_ja.properties   |  2 ++
 java/org/apache/tomcat/websocket/LocalStrings_fr.properties |  2 ++
 java/org/apache/tomcat/websocket/LocalStrings_ja.properties |  2 ++
 java/org/apache/tomcat/websocket/LocalStrings_ru.properties |  2 +-
 webapps/docs/changelog.xml                                  | 13 +++++++++++++
 webapps/examples/WEB-INF/classes/LocalStrings_ru.properties |  2 +-
 55 files changed, 105 insertions(+), 15 deletions(-)
 copy java/org/apache/{catalina/ha/session => tomcat/util/json}/LocalStrings_ru.properties (86%)
 copy java/org/apache/{naming/factory/webservices => tomcat/util/modeler/modules}/LocalStrings_fr.properties (88%)
 copy java/org/apache/{naming/factory/webservices => tomcat/util/modeler/modules}/LocalStrings_ja.properties (88%)


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


(tomcat) 02/06: Improvements to French 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 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit f1dfbc04ab70b26652ec7f62d139e60f445a5ff4
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Dec 7 11:49:59 2023 +0000

    Improvements to French translations. (remm)
---
 java/org/apache/catalina/authenticator/LocalStrings_fr.properties     | 3 +++
 java/org/apache/catalina/manager/LocalStrings_fr.properties           | 1 +
 java/org/apache/catalina/mbeans/LocalStrings_fr.properties            | 1 +
 java/org/apache/catalina/realm/LocalStrings_fr.properties             | 3 +++
 java/org/apache/catalina/security/LocalStrings_fr.properties          | 4 ++++
 .../catalina/tribes/membership/cloud/LocalStrings_fr.properties       | 1 +
 java/org/apache/coyote/http11/filters/LocalStrings_fr.properties      | 3 +++
 java/org/apache/jasper/resources/LocalStrings_fr.properties           | 3 +++
 java/org/apache/tomcat/util/buf/LocalStrings_fr.properties            | 1 +
 java/org/apache/tomcat/util/http/LocalStrings_fr.properties           | 1 +
 java/org/apache/tomcat/util/modeler/LocalStrings_fr.properties        | 1 +
 .../openssl/ciphers => modeler/modules}/LocalStrings_fr.properties    | 3 +--
 java/org/apache/tomcat/util/net/LocalStrings_fr.properties            | 1 +
 .../apache/tomcat/util/net/openssl/ciphers/LocalStrings_fr.properties | 1 +
 java/org/apache/tomcat/util/threads/LocalStrings_fr.properties        | 2 ++
 java/org/apache/tomcat/websocket/LocalStrings_fr.properties           | 2 ++
 webapps/docs/changelog.xml                                            | 3 +++
 17 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/authenticator/LocalStrings_fr.properties b/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
index df9f284cf8..41db2efdf2 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
@@ -32,7 +32,10 @@ authenticator.sessionExpired=Le temps alloué au processus de login est échu.
 authenticator.tomcatPrincipalLogoutFail=La déconnection avec l'instance de TomcatPrincipal a échoué
 authenticator.unauthorized=Impossible d'authentifier avec les crédits fournis (provided credentials)
 
+basicAuthenticator.invalidAuthorization=L''autorisation est invalide: [{0}]
 basicAuthenticator.invalidCharset=Les seules valeurs permises sont null, la chaîne vide, ou des caractères UTF-8
+basicAuthenticator.notBase64=Les informations d'identification Basic ne sont pas encodées en Base64
+basicAuthenticator.notBasic=La méthode d'authentification n'est pas ''Basic''
 
 digestAuthenticator.cacheRemove=Une entrée valide du cache de nonce des clients a été enlevée pour faire de la place pour de nouvelles entrées, ce qui rend possible une attaque par répétition ; pour éviter cela, il est possible de reduire nonceValidity ou d'augmenter nonceCacheSize ; les avertissements de ce type ne se reproduiront pas avant 5 minutes
 digestAuthenticator.invalidAlgorithm=Impossible de configurer l''authentification DIGEST avec l''algorithme [{0}] car il n''est pas autorisé par la RFC 7616
diff --git a/java/org/apache/catalina/manager/LocalStrings_fr.properties b/java/org/apache/catalina/manager/LocalStrings_fr.properties
index 399b584b68..d8c506cc45 100644
--- a/java/org/apache/catalina/manager/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_fr.properties
@@ -127,6 +127,7 @@ managerServlet.deployed=OK - Application déployée pour le chemin de contexte [
 managerServlet.deployedButNotStarted=ECHEC - Application déployée pour le chemin de contexte [{0}] mais le démarrage du contexte a échoué
 managerServlet.error.deploy=Erreur lors du déploiement de [{0}]
 managerServlet.error.idleParam=Impossible d''analyser le paramètre de temps d''attente maximum [{0}] qui devrait être un nombre entier
+managerServlet.error.jmx=Erreur JMX
 managerServlet.error.reload=Erreur lors du rechargement de [{0}]
 managerServlet.error.resources=Erreur lors de l''affichage des ressources de type [{0}]
 managerServlet.error.serverInfo=Erreur lors de l'affichage des informations sur le serveur
diff --git a/java/org/apache/catalina/mbeans/LocalStrings_fr.properties b/java/org/apache/catalina/mbeans/LocalStrings_fr.properties
index 9dba63f1fd..c3fea7c0bf 100644
--- a/java/org/apache/catalina/mbeans/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/mbeans/LocalStrings_fr.properties
@@ -36,6 +36,7 @@ mBeanFactory.contextDestroyError=Erreur lors de la destruction du contexte [{0}]
 mBeanFactory.contextRemove.addServicedFail=Impossible de supprimer le contexte [{0}] car un autre composant est en train d''effectuer des opérations de service avec ce nom
 mBeanFactory.managerContext=Un gestionnaire de sessions ne peut être ajouté qu'à un contexte
 mBeanFactory.noDeployer=Un déployeur n''a pas été trouvé pour l''hôte [{0}]
+mBeanFactory.noParent=Aucun parent n''a été trouvé avec le nom d''objet [{0}]
 mBeanFactory.noService=Un Service ayant le domaine [{0}] n''a pas été trouvé
 mBeanFactory.notServer=Le conteneur n'est pas un serveur
 
diff --git a/java/org/apache/catalina/realm/LocalStrings_fr.properties b/java/org/apache/catalina/realm/LocalStrings_fr.properties
index 75679b9016..57db0e7eae 100644
--- a/java/org/apache/catalina/realm/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_fr.properties
@@ -32,6 +32,7 @@ dataSourceRealm.commit=Exception lors du commit de la connection avant sa fermet
 dataSourceRealm.exception=Exception lors de l'anthentification
 dataSourceRealm.getPassword.exception=Exception lors de la récupération du mot de passe pour [{0}]
 dataSourceRealm.getRoles.exception=Exception lors de la récupération des rôles de [{0}]
+dataSourceRealm.noNamingContext=Impossible d'accéder au serveur pour obtenir le contexte JNDI
 
 jaasCallback.username=Nom d''utilisateur renvoyé [{0}]
 
@@ -76,6 +77,7 @@ jndiRealm.emptyCipherSuites=Une chaîne vide est donnée comme suite de chiffres
 jndiRealm.exception=Exception pendant le traitement de l'authentification
 jndiRealm.exception.retry=Erreur pendant l'authentification, nouvel essai
 jndiRealm.invalidHostnameVerifier=[{0}] n''est pas un nom de classe valide pour un HostnameVerifier
+jndiRealm.invalidName=La recherche a retourné un nom absolu qui ne peut pas être traité: [{0}]
 jndiRealm.invalidSslProtocol=Le protocole fourni [{0}] est invalide, il doit être parmi [{1}]
 jndiRealm.invalidSslSocketFactory=[{0}] n''est pas un nom de classe valide pour une SSLSocketFactory
 jndiRealm.multipleEntries=Le nom d''utilisateur [{0}] a plusieurs entrées
@@ -118,3 +120,4 @@ realmBase.unknownAllRolesMode=Le mode [{0}] est inconnu, il doit être : strict,
 
 userDatabaseRealm.lookup=Exception lors de la recherche dans la base de données utilisateurs avec la clé [{0}]
 userDatabaseRealm.noDatabase=Aucun composant base de données utilisateurs trouvé pour la clé [{0}]
+userDatabaseRealm.noNamingContext=Impossible d'accéder au serveur pour obtenir le contexte JNDI
diff --git a/java/org/apache/catalina/security/LocalStrings_fr.properties b/java/org/apache/catalina/security/LocalStrings_fr.properties
index 27a11adea3..a0b2f7e4f2 100644
--- a/java/org/apache/catalina/security/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/security/LocalStrings_fr.properties
@@ -22,3 +22,7 @@ SecurityListener.checkUserWarning=Tentative de démarrage avec l''utilisateur [{
 SecurityUtil.doAsPrivilege=Une exception s'est produite lors de l'exécution du bloc "PrivilegedExceptionAction".
 
 listener.notServer=Ce listener ne peut être ajouté qu''à des éléments Server, mais est dans [{0}]
+
+tlsCertRenewalListener.notRenewed=[{0}], hôte virtuel TLS [{1}] avec nom [{2}] qui expire le [{3}] nécessite un renouvellement
+tlsCertRenewalListener.reloadFailed=[{0}], hôte virtuel TLS [{1}] le redémarrage de la configuration TLS a échoué
+tlsCertRenewalListener.reloadSuccess=[{0}], hôte virtuel TLS [{1}] la configuration TLS a été redémarrée
diff --git a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_fr.properties b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_fr.properties
index a389b01d6d..0f90efa37a 100644
--- a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_fr.properties
@@ -27,6 +27,7 @@ kubernetesMembershipProvider.invalidPod=Le pod manque des attributs nécessaires
 kubernetesMembershipProvider.invalidPodsList=La liste de pods est invalide : [{0}]
 kubernetesMembershipProvider.jsonError=Erreur JSON
 kubernetesMembershipProvider.memberError=Erreur de création d'un membre
+kubernetesMembershipProvider.noKey=La clé du certificat client n'a pas été spécifiée dans l'environnement
 kubernetesMembershipProvider.noNamespace=L'espace de noms n'est pas paramétré
 kubernetesMembershipProvider.streamError=Échec d'ouverture du flux
 
diff --git a/java/org/apache/coyote/http11/filters/LocalStrings_fr.properties b/java/org/apache/coyote/http11/filters/LocalStrings_fr.properties
index 2529b62323..a2d5bd3099 100644
--- a/java/org/apache/coyote/http11/filters/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/http11/filters/LocalStrings_fr.properties
@@ -13,6 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+bufferedInputFilter.bodySize=Le corps de la requête est trop grand pour le tampon: [{0}]
+bufferedInputFilter.maxSwallowSize=Le corps de la requête qui dépassé maxSwallowSize a été ingoré
+
 chunkedInputFilter.eos=Fin du flux inattendue durant la lecture du corps de la requête
 chunkedInputFilter.eosTrailer=Fin inattendue de flux lors de la lecture des en-têtes de fin (trailer headers)
 chunkedInputFilter.error=Aucune donnée disponible suite à l'erreur précédente
diff --git a/java/org/apache/jasper/resources/LocalStrings_fr.properties b/java/org/apache/jasper/resources/LocalStrings_fr.properties
index 908b64a2c3..ae60058277 100644
--- a/java/org/apache/jasper/resources/LocalStrings_fr.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_fr.properties
@@ -88,8 +88,10 @@ jsp.error.invalid.directive=Directive incorrecte
 jsp.error.invalid.expression=[{0}] contient d''incorrecte(s) expression(s) : [{1}]
 jsp.error.invalid.implicit=Le TLD implicite est invalide pour le fichier tag [{0}]
 jsp.error.invalid.implicit.version=La version JSP déclarée dans le TLD implicite pour le fichier de tag à [{0}] est invalide
+jsp.error.invalid.name=Le fichier [{0}] utilise le nom [{1}] dans jsp:getProperty pour un bean qui n''a pas été déclaré conformément à JSP.5.3
 jsp.error.invalid.scope=La valeur de l''attribut "scope" est invalide : [{0}] (elle doit être "page", "request", "session" ou "application")
 jsp.error.invalid.tagdir=Le répertoire du fichier Tag [{0}] ne commence pas par "/WEB-INF/tags"
+jsp.error.invalid.varscope=L''étendue [{0}] de la variable est invalide
 jsp.error.invalid.version=Version JSP invalide pour le fichier tag [{0}]
 jsp.error.ise_on_clear=Il est interdit d'utiliser clear() quand la taille de tampon== 0
 jsp.error.java.line.number=Une erreur s''est produite à la ligne : [{0}] dans le fichier Java généré : [{1}]
@@ -210,6 +212,7 @@ jsp.error.tag.invalid.iselignored=Directive Tag : isELIgnored a une valeur inval
 jsp.error.tag.invalid.trimdirectivewhitespaces=Directive Tag : trimDirectiveWhitespaces a une valeur invalide
 jsp.error.tag.language.nonjava=Directive de tag : attribut language invalide
 jsp.error.tag.multi.pageencoding=La directive de tag ne doit pas avoir plusieurs occurences de pageencoding
+jsp.error.tagHandlerPool=Impossible de créer un pool [{0}] pour le tag
 jsp.error.tagdirective.badbodycontent=Contenu de corps (body-content) [{0}] invalide dans la directive tag
 jsp.error.tagfile.badSuffix=Le suffixe ".tag"  est manquant dans le chemin du fichier tag [{0}]
 jsp.error.tagfile.illegalPath=Le chemin du fichier de tag [{0}] est invalide, il doit commencer par "/WEB-INF/tags" ou "/META-INF/tags"
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties b/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
index 38af8c80fa..a26ad5143b 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
@@ -30,6 +30,7 @@ hexUtils.fromHex.oddDigits=L'entrée doit contenir un nombre pair de chiffres h
 messageBytes.illegalCharacter=Le caractère Unicode [{0}] ayant le code point [{1}] ne peut être encodé, parce qu''il est en-dehors de l''éventail permis 0-255.
 
 uDecoder.eof=Fin de fichier (EOF)
+uDecoder.isHexDigit=L'encodage hexadécimal est invalide
 uDecoder.noSlash=Un caractère slash encodé n'est pas autorisé
 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/http/LocalStrings_fr.properties b/java/org/apache/tomcat/util/http/LocalStrings_fr.properties
index a704cb11c1..6d9a30ae0a 100644
--- a/java/org/apache/tomcat/util/http/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/http/LocalStrings_fr.properties
@@ -26,6 +26,7 @@ parameters.bytes=Début du traitement avec les données [{0}]
 parameters.copyFail=Echec de la copie des valeurs de paramètres originaux pour raisons de journalisation du déboguage
 parameters.decodeFail.debug=Echec de décodage de caractère, le paramètre [{0}] de valeur [{1}] a été ignoré
 parameters.decodeFail.info=Echec de décodage de caractère, le paramètre [{0}] avec la valeur [{1}] a été ignoré ; le nom et la valeur mentionnés ici peuvent avoir été corrompus à cause de l''erreur de décodage, utilisez le niveau debug pour voir les originaux
+parameters.duplicateFail=Impossible de créer une copie des paramètres de la requête
 parameters.emptyChunk=Le bloc de paramètres vide a été ignoré
 parameters.fallToDebug=\n\
 \ Note : les occurrences suivantes d'erreurs de Paramètres seront enregistrées au niveau DEBUG.
diff --git a/java/org/apache/tomcat/util/modeler/LocalStrings_fr.properties b/java/org/apache/tomcat/util/modeler/LocalStrings_fr.properties
index 8d7c3b5931..6dd9e38fd0 100644
--- a/java/org/apache/tomcat/util/modeler/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/modeler/LocalStrings_fr.properties
@@ -38,6 +38,7 @@ modules.digesterParseError=Erreur lors de l'analyse des données du registre
 modules.readDescriptorsError=Erreur lors de la lecture des descripteurs
 
 registry.initError=Erreur lors de l''initialisation [{0}]
+registry.invalidSource=Une source invalide a été specifiée, elle doit être URL, File Class ou InputStream
 registry.loadError=Impossible de charger les descripteurs à partir de [{0}]
 registry.noDisable=Le registre des MBeans ne peut pas être désactivé car il a déjà été initialisé
 registry.noMetadata=Impossible de trouver les métadonnées pour l''objet [{0}]
diff --git a/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_fr.properties b/java/org/apache/tomcat/util/modeler/modules/LocalStrings_fr.properties
similarity index 81%
copy from java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_fr.properties
copy to java/org/apache/tomcat/util/modeler/modules/LocalStrings_fr.properties
index 6739fbcd93..6e2b81342a 100644
--- a/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/modeler/modules/LocalStrings_fr.properties
@@ -13,5 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-opensslCipherConfigurationParser.effectiveCiphers=Chiffres utilisés : [{0}]
-opensslCipherConfigurationParser.unknownElement=Elément inconnu dans la chaîne de chiffres : [{0}]
+source.introspectionError=Erreur d''introspection lors de la création du MBean pour la classe [{0}]
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_fr.properties b/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
index a463648996..5578507a28 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
@@ -184,6 +184,7 @@ sslUtilBase.noCrlSupport=Le truststoreProvider [{0}] ne supporte pas d''option d
 sslUtilBase.noKeys=Aucun alias pour les clés privées n'a été trouvé dans la base de clés
 sslUtilBase.noVerificationDepth=Le truststoreProvider [{0}] ne supporte pas l''option de configuration certificateVerificationDepth
 sslUtilBase.noneSupported=Aucun des [{0}] spécifiés n''est supporté par le moteur SSL : [{1}]
+sslUtilBase.skipped=Tomcat interprête l''attribut [{0}] de manière à être cohérent ave la dernière branche de développement d''OpenSSL. Certains de ceux qui ont été spéifiés [{0}] ne sont pas suportés par le moteur SSL configré pour ce connecteur (qui pourrait utiliser JSSE ou une version antérieure d''OpenSSL) et ont été ignorés: [{1}]
 sslUtilBase.ssl3=SSLv3 a été explicitement activé.  Ce protocole est connu comme non-sécurisé.
 sslUtilBase.tls13.auth=L’implémentation JSSE de TLS 1.3 ne supporte pas l'authentification après la négociation initiale, elle est donc incompatible avec l’authentification optionnelle du client
 sslUtilBase.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/openssl/ciphers/LocalStrings_fr.properties b/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_fr.properties
index 6739fbcd93..c880b9bc06 100644
--- a/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_fr.properties
@@ -15,3 +15,4 @@
 
 opensslCipherConfigurationParser.effectiveCiphers=Chiffres utilisés : [{0}]
 opensslCipherConfigurationParser.unknownElement=Elément inconnu dans la chaîne de chiffres : [{0}]
+opensslCipherConfigurationParser.unknownProfile=Impossible d''utiliser OpenSSL pour obtenir le profil [{0}], celui ci sera utilisé en tant que liste d''algorithme de chiffrage
diff --git a/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties b/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
index 8d0d122744..77e0529823 100644
--- a/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties
@@ -15,5 +15,7 @@
 
 taskQueue.notRunning=L'exécuteur n'a pas été démarré, impossible d'ajouter une commande à la file d'attente
 
+threadPoolExecutor.invalidKeepAlive=Les threads principaux doivent avoir un temps d'inactivité positif
 threadPoolExecutor.queueFull=La file d'attente est pleine
+threadPoolExecutor.taskRejected=La tâche [{0}] a été rejetée par [{1}]
 threadPoolExecutor.threadStoppedToAvoidPotentialLeak=Arrêt du thread [{0}] pour éviter de potentielles fuites de mémoire après l''arrêt d''un contexte
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_fr.properties b/java/org/apache/tomcat/websocket/LocalStrings_fr.properties
index 1ef4c34f67..43d9c226d0 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_fr.properties
@@ -40,6 +40,8 @@ caseInsensitiveKeyMap.nullKey=Les clés nulles ne sont pas admises
 clientEndpointHolder.instanceCreationFailed=Echec de la création du WebSocketEndpoint
 clientEndpointHolder.instanceRegistrationFailed=Echec de l'enregistrement de l'instance de l'Endpoint dans l'InstanceManager
 
+digestAuthenticator.algorithm=Impossible de générer l''abrégé (digest) pour la requête [{0}]
+
 futureToSendHandler.timeout=Le délai d''attente de l''opération est dépassé après avoir attendu [{0}] [{1}] pour qu''elle se termine
 
 perMessageDeflate.alreadyClosed=Le transformateur a été fermé et ne peut plus être utilisé
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 17a855e5b1..e883e920c1 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -158,6 +158,9 @@
       <update>
         Update Derby to 10.17.1. (markt)
       </update>
+      <add>
+        Improvements to French 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


(tomcat) 01/06: Format and ordering fixes - triggered by i18n backport process

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 0d30483d747b34ee546cb3e3ecb4fe8bb558c606
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Dec 7 11:49:17 2023 +0000

    Format and ordering fixes - triggered by i18n backport process
---
 java/javax/el/LocalStrings.properties                        | 1 -
 java/org/apache/tomcat/util/net/jsse/LocalStrings.properties | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/java/javax/el/LocalStrings.properties b/java/javax/el/LocalStrings.properties
index 02ce32b154..e0d7a33cc5 100644
--- a/java/javax/el/LocalStrings.properties
+++ b/java/javax/el/LocalStrings.properties
@@ -43,7 +43,6 @@ propertyNotReadable=Property [{1}] not readable on type [{0}]
 propertyNotWritable=Property [{1}] not writable on type [{0}]
 propertyReadError=Error reading [{1}] on type [{0}]
 propertyWriteError=Error writing [{1}] on type [{0}]
-
 resolverNotWritable=ELResolver not writable for type [{0}]
 
 staticFieldELResolver.methodNotFound=No matching public static method named [{0}] found on class [{1}]
diff --git a/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties b/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties
index 888a2a6761..9a21160bd7 100644
--- a/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties
@@ -20,10 +20,10 @@ jsseUtil.excludeProtocol=The SSL protocol [{0}] which is supported in this JRE w
 jsseUtil.noDefaultProtocols=Unable to determine a default for sslEnabledProtocols. Set an explicit value to ensure the connector can start.
 
 pemFile.noMultiPrimes=The PKCS#1 certificate is in multi-prime format and Java does not provide an API for constructing an RSA private key object from that format
-pemFile.notValidRFC5915=The provided key file does not conform to RFC 5915
 pemFile.notPbkdf2=The OID [{0}] is not the correct OID for PKBDF2 which is the only permitted KDF for PBES2
+pemFile.notValidRFC5915=The provided key file does not conform to RFC 5915
 pemFile.parseError=Unable to parse the key from [{0}]
 pemFile.unknownEncryptedFormat=The format [{0}] is not a recognised encrypted PEM file format
 pemFile.unknownEncryptionAlgorithm=The encryption algorithm with DER encoded OID of [{0}] was not recognised
+pemFile.unknownPkcs8Algorithm=The PKCS#8 encryption algorithm with DER encoded OID of [{0}] was not recognised
 pemFile.unknownPrfAlgorithm=The pseudo random function with DER encoded OID of [{0}] was not recognised
-pemFile.unknownPkcs8Algorithm=The PKCS#8 encryption algorithm with DER encoded OID of [{0}] was not recognised
\ No newline at end of file


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


(tomcat) 04/06: Improvements to Portuguese (BR) translations by John William Vicente

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 c1f8e70d746fad80faee4ff3856f37879881d515
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Dec 7 11:52:35 2023 +0000

    Improvements to Portuguese (BR) translations by John William Vicente
---
 java/org/apache/jasper/resources/LocalStrings_pt_BR.properties | 1 +
 webapps/docs/changelog.xml                                     | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/java/org/apache/jasper/resources/LocalStrings_pt_BR.properties b/java/org/apache/jasper/resources/LocalStrings_pt_BR.properties
index a2270b2eb8..e13694e193 100644
--- a/java/org/apache/jasper/resources/LocalStrings_pt_BR.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_pt_BR.properties
@@ -17,6 +17,7 @@ jsp.error.attribute.nowhitespace=A especificação JSP requer que o nome de atri
 jsp.error.data.file.processing=Erro a processar arquivo [{0}]
 jsp.error.el.template.deferred=#{...} não é permitido no texto do template
 jsp.error.fallback.invalidUse=jsp:fallback precisa ser um filho direto do jsp:plugin
+jsp.error.invalid.varscope=escopo de variável invalida [{0}]
 jsp.error.no.scriptlets=Elementos de script ( &lt;%!, &lt;jsp:declaration, &lt;%=, &lt;jsp:expression, &lt;%, &lt;jsp:scriptlet ) não são permitidos aqui.
 jsp.error.not.in.template=[{0}] não é permitido  no template do texto do body
 jsp.error.outputfolder=Sem diretório de saída
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2d948af539..6bd0641159 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -164,6 +164,10 @@
       <add>
         Improvements to Japanese translations by tak7iji. (markt)
       </add>
+      <add>
+        Improvements to Brazilian Portuguese translations by John William
+        Vicente. (markt)
+      </add>
     </changelog>
   </subsection>
 </section>


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


(tomcat) 03/06: Improvements to Japanese translations by tak7iji.

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 59e732fe0e5ea96563920a3e859756263b99365b
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Dec 7 11:52:10 2023 +0000

    Improvements to Japanese translations by tak7iji.
---
 java/org/apache/catalina/authenticator/LocalStrings_ja.properties     | 3 +++
 java/org/apache/catalina/manager/LocalStrings_ja.properties           | 1 +
 java/org/apache/catalina/mbeans/LocalStrings_ja.properties            | 1 +
 java/org/apache/catalina/realm/LocalStrings_ja.properties             | 3 +++
 java/org/apache/catalina/security/LocalStrings_ja.properties          | 4 ++++
 .../catalina/tribes/membership/cloud/LocalStrings_ja.properties       | 1 +
 java/org/apache/coyote/http11/filters/LocalStrings_ja.properties      | 3 +++
 java/org/apache/jasper/resources/LocalStrings_ja.properties           | 3 +++
 java/org/apache/tomcat/util/buf/LocalStrings_ja.properties            | 1 +
 java/org/apache/tomcat/util/http/LocalStrings_ja.properties           | 1 +
 java/org/apache/tomcat/util/modeler/LocalStrings_ja.properties        | 1 +
 .../openssl/ciphers => modeler/modules}/LocalStrings_ja.properties    | 3 +--
 java/org/apache/tomcat/util/net/LocalStrings_ja.properties            | 1 +
 .../apache/tomcat/util/net/openssl/ciphers/LocalStrings_ja.properties | 1 +
 java/org/apache/tomcat/util/threads/LocalStrings_ja.properties        | 2 ++
 java/org/apache/tomcat/websocket/LocalStrings_ja.properties           | 2 ++
 webapps/docs/changelog.xml                                            | 3 +++
 17 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
index 8b4d51240c..10f1fa3c7e 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
@@ -32,7 +32,10 @@ authenticator.sessionExpired=ログインプロセスに認められていた時
 authenticator.tomcatPrincipalLogoutFail=TomcatPrincipal インスタンスによるログアウトが失敗しました。
 authenticator.unauthorized=提供された証明書で認証できません
 
+basicAuthenticator.invalidAuthorization=無効な認証: [{0}]
 basicAuthenticator.invalidCharset=指定できる値は、null、空の文字列またはUTF-8です。
+basicAuthenticator.notBase64=Basic認証の資格情報がBase64ではありません
+basicAuthenticator.notBasic=認証ヘッダメソッドが ''Basic'' ではありません
 
 digestAuthenticator.cacheRemove=有効なエントリがクライアントのnonceキャッシュから削除され、新しいエントリのためのスペースが確保されました。 リプレイ攻撃が可能になりました。 リプレイ攻撃の可能性を防ぐには、nonceValidityを減らすか、nonceCacheSizeを増やしてください。 このタイプの警告は5分間表示されなくなります。
 digestAuthenticator.invalidAlgorithm=RFC 7616 で許可されていないため、アルゴリズム [{0}] を使用するように DIGEST 認証を構成できません。
diff --git a/java/org/apache/catalina/manager/LocalStrings_ja.properties b/java/org/apache/catalina/manager/LocalStrings_ja.properties
index bf3ebc1f92..8cb2f1f3e5 100644
--- a/java/org/apache/catalina/manager/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_ja.properties
@@ -129,6 +129,7 @@ managerServlet.deployed=OK - コンテキストパス [{0}] でアプリケー
 managerServlet.deployedButNotStarted=FAIL - コンテキストパス [{0}] にアプリケーションを配備しましたが、コンテキストを開始できませんでした
 managerServlet.error.deploy=[{0}]の配備中のエラー
 managerServlet.error.idleParam=アイドルパラメータ [{0}] を整数として解析できませんでした
+managerServlet.error.jmx=JMXエラー
 managerServlet.error.reload=[{0}]の再読み込みエラー
 managerServlet.error.resources=タイプ [{0}] のリソース表示中のエラー
 managerServlet.error.serverInfo=サーバー情報表示中のエラー
diff --git a/java/org/apache/catalina/mbeans/LocalStrings_ja.properties b/java/org/apache/catalina/mbeans/LocalStrings_ja.properties
index 180e8ede70..edf8533808 100644
--- a/java/org/apache/catalina/mbeans/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/mbeans/LocalStrings_ja.properties
@@ -36,6 +36,7 @@ mBeanFactory.contextDestroyError=コンテキスト [{0}] 破棄中のエラー
 mBeanFactory.contextRemove.addServicedFail=別のコンポーネントが現在そのコンテキストを処理しているため、コンテキスト [{0}] を削除できません
 mBeanFactory.managerContext=ManagerコンポーネントはContextにのみ追加できます。
 mBeanFactory.noDeployer=ホスト [{0}] Deployer が見つかりません。
+mBeanFactory.noParent=オブジェクト名 [{0}] の親が見つかりません
 mBeanFactory.noService=ドメイン [{0}] にサービスがありません。
 mBeanFactory.notServer=コンテナは Server ではありません。
 
diff --git a/java/org/apache/catalina/realm/LocalStrings_ja.properties b/java/org/apache/catalina/realm/LocalStrings_ja.properties
index e572a0f274..b3384b4968 100644
--- a/java/org/apache/catalina/realm/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_ja.properties
@@ -32,6 +32,7 @@ dataSourceRealm.commit=クローズ前に接続をコミットした際に例外
 dataSourceRealm.exception=認証を実行中の例外です
 dataSourceRealm.getPassword.exception=[{0}] のパスワードを取得中に例外が発生しました。
 dataSourceRealm.getRoles.exception=[{0}] のロールを取得中に例外が発生しました。
+dataSourceRealm.noNamingContext=ネーミングコンテキストを取得するためにサーバーにアクセスできません
 
 jaasCallback.username=返されたユーザー名[{0}]
 
@@ -76,6 +77,7 @@ jndiRealm.emptyCipherSuites=指定された暗号スイートの空の文字列
 jndiRealm.exception=認証実行中の例外です
 jndiRealm.exception.retry=認証中に例外が発生しました。再試行します...
 jndiRealm.invalidHostnameVerifier=[{0}]はHostnameVerifierの有効なクラス名ではありません。
+jndiRealm.invalidName=検索で解析できない絶対名が返されました: [{0}]
 jndiRealm.invalidSslProtocol=指定されたプロトコル[{0}]は無効です。 [{1}]のいずれかでなければなりません。
 jndiRealm.invalidSslSocketFactory=[{0}]はSSLSocketFactoryの有効なクラス名ではありません
 jndiRealm.multipleEntries=ユーザ名 [{0}] は複数のエントリを持っています
@@ -118,3 +120,4 @@ realmBase.unknownAllRolesMode=未知のモード [{0}]。strict、authOnly、str
 
 userDatabaseRealm.lookup=キー [{0}] でユーザデータベースを検索中の例外です
 userDatabaseRealm.noDatabase=キー [{0}] でユーザデータベースコンポーネントが見つかりません
+userDatabaseRealm.noNamingContext=ネーミングコンテキストを取得するためにサーバーにアクセスできません
diff --git a/java/org/apache/catalina/security/LocalStrings_ja.properties b/java/org/apache/catalina/security/LocalStrings_ja.properties
index df0614f353..33ff55df49 100644
--- a/java/org/apache/catalina/security/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/security/LocalStrings_ja.properties
@@ -22,3 +22,7 @@ SecurityListener.checkUserWarning=ユーザー[{0}]として実行中に開始
 SecurityUtil.doAsPrivilege=PrivilegedExceptionActionブロックを実行中に例外が発生しました。
 
 listener.notServer=このlistenerはServer要素内にのみネストする必要がありますが、[{0}] にあります。
+
+tlsCertRenewalListener.notRenewed=[{0}]、[{3}] に期限切れになる名前 [{2}] の TLS 仮想ホスト [{1}] は更新期限を過ぎています
+tlsCertRenewalListener.reloadFailed=[{0}]、TLS 仮想ホスト [{1}] が TLS 構成のリロードに失敗しました
+tlsCertRenewalListener.reloadSuccess=[{0}]、TLS 仮想ホスト [{1}] が TLS 構成をリロードしました
diff --git a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_ja.properties b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_ja.properties
index eb5d509671..46ddd96527 100644
--- a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_ja.properties
@@ -27,6 +27,7 @@ kubernetesMembershipProvider.invalidPod=Pod に必要な属性がありません
 kubernetesMembershipProvider.invalidPodsList=不正な Pod リストです: [{0}]
 kubernetesMembershipProvider.jsonError=JSONエラー
 kubernetesMembershipProvider.memberError=メンバー作成中のエラー
+kubernetesMembershipProvider.noKey=クライアント証明書キーが環境変数に指定されていませんでした
 kubernetesMembershipProvider.noNamespace=Namespace が未指定です。
 kubernetesMembershipProvider.streamError=ストリームのオープンに失敗しました
 
diff --git a/java/org/apache/coyote/http11/filters/LocalStrings_ja.properties b/java/org/apache/coyote/http11/filters/LocalStrings_ja.properties
index 5192834c29..35a7b11b46 100644
--- a/java/org/apache/coyote/http11/filters/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/http11/filters/LocalStrings_ja.properties
@@ -13,6 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+bufferedInputFilter.bodySize=リクエスト本文がバッファに対して大きすぎます: [{0}]
+bufferedInputFilter.maxSwallowSize=無視された本文が maxSwallowSize を超えました
+
 chunkedInputFilter.eos=リクエストボディの読み取り中に予期せぬストリームの終端が見つかりました。
 chunkedInputFilter.eosTrailer=トレーラーヘッダーの読み込み中に突然ストリームが終了しました。
 chunkedInputFilter.error=以前のエラーのため利用できるデータがありません。
diff --git a/java/org/apache/jasper/resources/LocalStrings_ja.properties b/java/org/apache/jasper/resources/LocalStrings_ja.properties
index 67044ae461..ebee8f6b33 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ja.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ja.properties
@@ -89,8 +89,10 @@ jsp.error.invalid.directive=無効なディレクティブ
 jsp.error.invalid.expression=[{0}] は無効な式を含んでいます: [{1}]
 jsp.error.invalid.implicit=[{0}]のタグファイルの暗黙のTLDが無効です
 jsp.error.invalid.implicit.version=[{0}]のタグファイルの暗黙のTLDで無効なJSPバージョンが定義されています。
+jsp.error.invalid.name=ファイル [{0}] は、jsp:getProperty で bean の名前として、JSP.5.3 に従って事前に導入されていない [{1}] を使用しています
 jsp.error.invalid.scope=''scope''属性の値が無効です: [{0}] ("page"、"request"、"session"または"application"のどれかでなければいけません)
 jsp.error.invalid.tagdir=タグファイルディレクトリ [{0}] が"/WEB-INF/tags"で始まっていません
+jsp.error.invalid.varscope=無効な変数スコープ [{0}]
 jsp.error.invalid.version=タグファイル [{0}] には無効な JSP のバージョンが指定されています。
 jsp.error.ise_on_clear=バッファサイズが0の時にclear()を実行しても無効です
 jsp.error.java.line.number=生成されたJavaファイル: [{1}] の [{0}] 行でエラーが発生しました
@@ -211,6 +213,7 @@ jsp.error.tag.invalid.iselignored=Tagディレクティブ: isELIgnoredに無効
 jsp.error.tag.invalid.trimdirectivewhitespaces=Tagディレクティブ: trimDirectiveWhitespaces の値は不正です
 jsp.error.tag.language.nonjava=Tagディレクティブ: 無効なlanguage属性です
 jsp.error.tag.multi.pageencoding=Tagディレクティブは複数のpageencodingを持つことはできません
+jsp.error.tagHandlerPool=タグハンドラプール [{0}] が作成できません
 jsp.error.tagdirective.badbodycontent=tagディレクティブ中の無効なbody-content [{0}]です
 jsp.error.tagfile.badSuffix=タグファイルパス [{0}] の中に".tag" 拡張子がありません
 jsp.error.tagfile.illegalPath=不正なタグファイルパスです: [{0}]、これは"/WEB-INF/tags"または"/META-INF/tags"で始まらなければいけません
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties b/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties
index 1309663770..1b7bd8a696 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties
@@ -30,6 +30,7 @@ hexUtils.fromHex.oddDigits=入力は、偶数の16進数で構成する必要が
 messageBytes.illegalCharacter=コードポイント [{1}] のユニコード文字 [{0}] は有効範囲 0 から 255 の範囲外のため、エンコードできません。
 
 uDecoder.eof=予期せぬ場所で終端に達しました。
+uDecoder.isHexDigit=16進エンコーディングが無効です
 uDecoder.noSlash="/" を符号化して含めることはできません。
 uDecoder.urlDecode.conversionError=文字セット [{1}] を使用した [{0}] のデコードに失敗しました
 uDecoder.urlDecode.missingDigit=%文字の後ろに2つの16進数字が続く必要があるため、[{0}]のデコードに失敗しました。
diff --git a/java/org/apache/tomcat/util/http/LocalStrings_ja.properties b/java/org/apache/tomcat/util/http/LocalStrings_ja.properties
index 4c4e75919e..b0a186adc8 100644
--- a/java/org/apache/tomcat/util/http/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/http/LocalStrings_ja.properties
@@ -26,6 +26,7 @@ parameters.bytes=入力[{0}]で処理を開始します。
 parameters.copyFail=デバッグログの目的で元のパラメータ値のコピーを作成できませんでした
 parameters.decodeFail.debug=文字列のデコードに失敗しました。パラメーター [{0}] (値 [{1}]) は無視しました。
 parameters.decodeFail.info=文字のデコードに失敗しました。 値 [{1}] のパラメータ [{0}] は無視されました。 ここで引用された名前と値は、デコードに失敗したために破損している可能性があることに注意してください。 デバッグレベルのログを使用して、破損していない元の値を確認してください。
+parameters.duplicateFail=クエリパラメータのコピー作成に失敗しました
 parameters.emptyChunk=空のパラメータチャンクが無視されます。
 parameters.fallToDebug=\n\
 \ 注: 以降のパラメータエラーの発生はDEBUGレベルでログに出力されます。
diff --git a/java/org/apache/tomcat/util/modeler/LocalStrings_ja.properties b/java/org/apache/tomcat/util/modeler/LocalStrings_ja.properties
index 2d326b1656..9da59d52de 100644
--- a/java/org/apache/tomcat/util/modeler/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/modeler/LocalStrings_ja.properties
@@ -38,6 +38,7 @@ modules.digesterParseError=レジストリデータ解析中のエラー
 modules.readDescriptorsError=記述子読み取り中のエラー
 
 registry.initError=[{0}]初期化中のエラー
+registry.invalidSource=無効なソースが指定されました。ソースは、URL、ファイル、クラス、または入力ストリームのいずれかである必要があります
 registry.loadError=[{0}] に配置した MBean 記述子の読み込み中のエラー
 registry.noDisable=MBean レジストリはすでに初期化されているため無効にすることができません
 registry.noMetadata=オブジェクト [{0}] のメタ情報がありません。
diff --git a/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_ja.properties b/java/org/apache/tomcat/util/modeler/modules/LocalStrings_ja.properties
similarity index 82%
copy from java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_ja.properties
copy to java/org/apache/tomcat/util/modeler/modules/LocalStrings_ja.properties
index 2fb406ebf6..1436d5000c 100644
--- a/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/modeler/modules/LocalStrings_ja.properties
@@ -13,5 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-opensslCipherConfigurationParser.effectiveCiphers=使用された暗号:[{0}]
-opensslCipherConfigurationParser.unknownElement=暗号文字列の不明な要素:[{0}]
+source.introspectionError=クラス [{0}] の MBean 作成時のイントロスペクションエラー
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_ja.properties b/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
index 9c8ec6d60c..3d2ec12b13 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
@@ -184,6 +184,7 @@ sslUtilBase.noCrlSupport=トラストストアプロバイダー [{0}] は設定
 sslUtilBase.noKeys=キーストアで見つかった秘密キーのエイリアスがありません。
 sslUtilBase.noVerificationDepth=トラストストアプロバイダー [{0}] は設定項目 certificateVerificationDepth に未対応です。
 sslUtilBase.noneSupported=指定された [{0}] のどれもSSLエンジンでサポートされていません: [{1}]
+sslUtilBase.skipped=Tomcat は、最新の OpenSSL 開発ブランチと一貫した方法で [{0}] 属性を解釈します。 指定された [{0}] の一部は、このコネクタ用に構成された SSL エンジン (JSSE または古い OpenSSL バージョンを使用している可能性があります) ではサポートされていないため、スキップされました: [{1}]
 sslUtilBase.ssl3=SSLv3 が明示的に有効化化されています。このプロトコルは安全ではありません。
 sslUtilBase.tls13.auth=JSSE TLS 1.3実装は、初期ハンドシェイク後の認証をサポートしていないため、オプションのクライアント認証と互換性がありません。
 sslUtilBase.trustedCertNotChecked=エイリアス [{0}] を持つ信頼できる証明書の有効期限は、証明書が不明な型であるためチェックされませんでした
diff --git a/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_ja.properties b/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_ja.properties
index 2fb406ebf6..5f8784b3df 100644
--- a/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_ja.properties
@@ -15,3 +15,4 @@
 
 opensslCipherConfigurationParser.effectiveCiphers=使用された暗号:[{0}]
 opensslCipherConfigurationParser.unknownElement=暗号文字列の不明な要素:[{0}]
+opensslCipherConfigurationParser.unknownProfile=OpenSSL を使用してプロファイル [{0}] を解決することはできません。プロファイルは暗号スイートとして渡されます。
diff --git a/java/org/apache/tomcat/util/threads/LocalStrings_ja.properties b/java/org/apache/tomcat/util/threads/LocalStrings_ja.properties
index 8f45eb5d49..b260a60f8b 100644
--- a/java/org/apache/tomcat/util/threads/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/threads/LocalStrings_ja.properties
@@ -15,5 +15,7 @@
 
 taskQueue.notRunning=Executor が動作していないため、コマンドを強制的にキューへ登録できません
 
+threadPoolExecutor.invalidKeepAlive=コアスレッドは正のキープアライブ時間が必要です
 threadPoolExecutor.queueFull=キューが一杯です
+threadPoolExecutor.taskRejected=タスク [{0}] が [{1}] から拒否されました
 threadPoolExecutor.threadStoppedToAvoidPotentialLeak=コンテキストが停止した後の潜在的なメモリリークを防ぐため、スレッド [{0}] を停止しています。
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_ja.properties b/java/org/apache/tomcat/websocket/LocalStrings_ja.properties
index 7db27f76f2..f54d6b433e 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_ja.properties
@@ -40,6 +40,8 @@ caseInsensitiveKeyMap.nullKey=null 値はキーに使用できません。
 clientEndpointHolder.instanceCreationFailed=WebSocketEndpointの作成に失敗しました
 clientEndpointHolder.instanceRegistrationFailed=エンドポイントインスタンスをInstanceManagerに登録できませんでした
 
+digestAuthenticator.algorithm=リクエストダイジェストを生成できません [{0}]
+
 futureToSendHandler.timeout=完了を [{0}] [{1}] 待機後に、操作がタイムアウトしました
 
 perMessageDeflate.alreadyClosed=transformer はクローズされました。これ以上使用されません
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e883e920c1..2d948af539 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -161,6 +161,9 @@
       <add>
         Improvements to French translations. (remm)
       </add>
+      <add>
+        Improvements to Japanese translations by tak7iji. (markt)
+      </add>
     </changelog>
   </subsection>
 </section>


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


(tomcat) 05/06: Improvements to Russian translations by usmazat and remm

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 42e86f61ae68e67b83664c7faec1e3d507c1c954
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Dec 7 11:52:57 2023 +0000

    Improvements to Russian translations by usmazat and remm
---
 java/org/apache/catalina/connector/LocalStrings_ru.properties       | 2 +-
 java/org/apache/catalina/core/LocalStrings_ru.properties            | 6 +++++-
 java/org/apache/catalina/manager/LocalStrings_ru.properties         | 2 +-
 java/org/apache/catalina/manager/host/LocalStrings_ru.properties    | 2 +-
 java/org/apache/catalina/servlets/LocalStrings_ru.properties        | 2 ++
 java/org/apache/catalina/session/LocalStrings_ru.properties         | 2 ++
 java/org/apache/catalina/startup/LocalStrings_ru.properties         | 4 ++++
 .../catalina/tribes/group/interceptors/LocalStrings_ru.properties   | 2 ++
 .../apache/catalina/tribes/membership/LocalStrings_ru.properties    | 2 +-
 java/org/apache/catalina/tribes/tipis/LocalStrings_ru.properties    | 2 +-
 .../apache/catalina/tribes/transport/nio/LocalStrings_ru.properties | 2 ++
 java/org/apache/coyote/LocalStrings_ru.properties                   | 2 ++
 java/org/apache/coyote/http11/LocalStrings_ru.properties            | 1 +
 java/org/apache/tomcat/util/LocalStrings_ru.properties              | 2 +-
 .../apache/tomcat/util/descriptor/web/LocalStrings_ru.properties    | 1 +
 .../transport/nio => tomcat/util/json}/LocalStrings_ru.properties   | 2 +-
 java/org/apache/tomcat/util/net/LocalStrings_ru.properties          | 1 +
 java/org/apache/tomcat/websocket/LocalStrings_ru.properties         | 2 +-
 webapps/docs/changelog.xml                                          | 3 +++
 webapps/examples/WEB-INF/classes/LocalStrings_ru.properties         | 2 +-
 20 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/catalina/connector/LocalStrings_ru.properties b/java/org/apache/catalina/connector/LocalStrings_ru.properties
index ded8982253..5de1419b09 100644
--- a/java/org/apache/catalina/connector/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_ru.properties
@@ -22,5 +22,5 @@ coyoteConnector.parseBodyMethodNoTrace=Метод TRACE НЕ ДОЛЖЕН вкл
 
 coyoteInputStream.nbNotready=В неблокирующем режиме невозможно читать из ServletInputStream до тех пор пока не завершится предыдущее чтение и IsReady() не вернёт true
 
-coyoteRequest.sendfileNotCanonical=Невозможно определить каноническок имя файла [{0}]] указанное для использования с sendfile
+coyoteRequest.sendfileNotCanonical=Невозможно определить каноническое имя файла [{0}] указанное для использования с sendfile
 coyoteRequest.sessionEndAccessFail=Исключение вызвало прекращение доступа к сессии при очистке запроса
diff --git a/java/org/apache/catalina/core/LocalStrings_ru.properties b/java/org/apache/catalina/core/LocalStrings_ru.properties
index 719b01b9fa..3e04a3df2d 100644
--- a/java/org/apache/catalina/core/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ru.properties
@@ -22,15 +22,19 @@ applicationContext.setAttribute.namenull=Имя не может быть пус
 
 applicationDispatcher.specViolation.response=Оригинальный ServletResponse или обернутый оригинальный ServletResponse не передан в Request Dispatcher в нарушение SRV.8.2 и SRV.14.2.5.1
 
+applicationHttpRequest.sessionEndAccessFail=Исключение вызвало прекращение доступа к сессии при очистке запроса
+
 aprListener.initializingFIPS=Инициализируется режим FIPS...
 
 filterChain.filter=При выполнении фильтра выброшено исключение
 
+naming.unbindFailed=Ошибка при отвязывании объекта: [{0}]
 naming.wsdlFailed=wsdl файл не найден: [{0}]
 
 standardContext.filterStart=Ошибка при старте фильтра [{0}]
 standardContext.invalidWrapperClass=[{0}] не является подклассом StandardWrapper
 standardContext.parameter.duplicate=Дублированный параметр инициализации контекста [{0}]
+standardContext.predestroy.duplicate=Дублированное определение метода  @PreDestroy для класса [{0}]
 standardContext.securityConstraint.mixHttpMethod=Запрещено смешивать <http-method> и <http-method-omission> в одной и той же коллекции веб-ресурсов
 standardContext.startingContext=Ошибка запуска контекста с именем [{0}]
 
@@ -52,5 +56,5 @@ standardWrapper.serviceException=Servlet.service() для сервлета [{0}]
 standardWrapper.serviceExceptionRoot=Servlet.service() для сервлета [{0}] в контексте с путем [{1}] выбросил исключение [{2}] с первопричиной
 standardWrapper.unavailable=Выделенный сервлет [{0}] недоступен
 standardWrapper.unloadException=Сервлет [{0}] выбросил исключение unload()
-standardWrapper.unloading=Невозможно выделить сервлет [{0}] потому что он еще заугружается
+standardWrapper.unloading=Невозможно выделить сервлет [{0}] потому что он еще загружается
 standardWrapper.waiting=Ожидание для [{0}] экземпляра(ов) которые нужно освободить для сервлета [{1}]
diff --git a/java/org/apache/catalina/manager/LocalStrings_ru.properties b/java/org/apache/catalina/manager/LocalStrings_ru.properties
index 2cd1b6a14f..3bed1409a5 100644
--- a/java/org/apache/catalina/manager/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_ru.properties
@@ -161,7 +161,7 @@ managerServlet.sslReloadFail=ОШИБКА - Не удалось перезагр
 managerServlet.startFailed=ОШИБКА - Приложение по контекстному пути [{0}] не запустилось
 managerServlet.started=OK - Запущено приложение по пути контекста [{0}]
 managerServlet.stopped=OK - Остановлено приложение по пути контекста [{0}]
-managerServlet.storeConfig.noMBean=ОШИБКА - Нет StoreConfig MBean, зарегистрированный на [{0}]
+managerServlet.storeConfig.noMBean=ОШИБКА - Нет StoreConfig MBean, зарегистрированного на [{0}]. Регистрация обычно проводится StoreConfigLifecycleListener.
 managerServlet.threaddump=OK - JVM thread dump
 managerServlet.trustedCertsNotConfigured=Для этого виртуального хоста не настроены доверенные сертификаты безопасности
 managerServlet.undeployed=OK - Удалено приложение по пути контекста [{0}]
diff --git a/java/org/apache/catalina/manager/host/LocalStrings_ru.properties b/java/org/apache/catalina/manager/host/LocalStrings_ru.properties
index d2691e4179..8a9b557db2 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/manager/host/LocalStrings_ru.properties
@@ -71,7 +71,7 @@ htmlHostManagerServlet.hostsRemove=Удалить
 htmlHostManagerServlet.hostsStart=Старт
 htmlHostManagerServlet.hostsStop=Стоп
 htmlHostManagerServlet.list=Список виртуальных серверов
-htmlHostManagerServlet.manager=Управление cервером
+htmlHostManagerServlet.manager=Управление сервером
 htmlHostManagerServlet.messageLabel=Сообщение:
 htmlHostManagerServlet.persistAll=Сохраняет текущие настройки (включая виртуальные хосты) в файл server.xml и в файлы context.xml для веб-приложений
 htmlHostManagerServlet.persistAllButton=Сохранить всё
diff --git a/java/org/apache/catalina/servlets/LocalStrings_ru.properties b/java/org/apache/catalina/servlets/LocalStrings_ru.properties
index 7e629da599..dbdf38152b 100644
--- a/java/org/apache/catalina/servlets/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings_ru.properties
@@ -15,3 +15,5 @@
 
 cgiServlet.expandFail=Невозможно развернуть скрипт [{0}] в [{1}]
 cgiServlet.runInvalidStatus=Неверный статус [{0}]
+
+defaultServlet.skipfail=Чтение завершилось ошибкой, потому что только [{0}] байт было доступно, а требовалось пропустить [{1}] байт, чтобы достигнуть начала требуемоего диапазона
diff --git a/java/org/apache/catalina/session/LocalStrings_ru.properties b/java/org/apache/catalina/session/LocalStrings_ru.properties
index 2f43bf3c2e..8ad4243c72 100644
--- a/java/org/apache/catalina/session/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/session/LocalStrings_ru.properties
@@ -16,3 +16,5 @@
 JDBCStore.connectError=Не возможно подключиться к базе данных [{0}]
 
 managerBase.contextNull=Перед использованием Менеджера контексту необходимо присвоить не пустое значение
+
+persistentManager.deserializeError=Ошибка десериализации Сессии [{0}]
diff --git a/java/org/apache/catalina/startup/LocalStrings_ru.properties b/java/org/apache/catalina/startup/LocalStrings_ru.properties
index bd56a68a3e..ef37bf0feb 100644
--- a/java/org/apache/catalina/startup/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_ru.properties
@@ -32,7 +32,11 @@ userConfig.error=Ошибка развертывания web-приложени
 
 versionLoggerListener.catalina.base=CATALINA_BASE:         {0}
 versionLoggerListener.catalina.home=CATALINA_HOME:         {0}
+versionLoggerListener.java.home=Java Home:             {0}
 versionLoggerListener.os.arch=Архитектура:           {0}
 versionLoggerListener.os.version=Версия ОС:             {0}
+versionLoggerListener.serverInfo.server.built=Сервер собран:   {0}
+versionLoggerListener.serverInfo.server.number=Номер версии сервера: {0}
+versionLoggerListener.serverInfo.server.version=Имя версии сервера:   {0}
 versionLoggerListener.vm.vendor=Производитель JVM:     {0}
 versionLoggerListener.vm.version=Версия JVM:            {0}
diff --git a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_ru.properties b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_ru.properties
index 340ee06d3a..49fd7b19e6 100644
--- a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_ru.properties
@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+domainFilterInterceptor.member.refused=Участнику [{0}] было отказано в присоединении к кластеру
+
 encryptInterceptor.decrypt.error.short-message=Невозможно расшифровать сообщение: слишком мало символов
 
 nonBlockingCoordinator.memberAlive.failed=Невозможно проверить участника, считаем что упал
diff --git a/java/org/apache/catalina/tribes/membership/LocalStrings_ru.properties b/java/org/apache/catalina/tribes/membership/LocalStrings_ru.properties
index 227ebbae16..1f331b858b 100644
--- a/java/org/apache/catalina/tribes/membership/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/tribes/membership/LocalStrings_ru.properties
@@ -15,4 +15,4 @@
 
 mcastServiceImpl.send.running=McastService.send уже запущен
 
-staticMembershipProvider.leftOver.ignored=Сообщение[{0}] проигнорированно.
+staticMembershipProvider.leftOver.ignored=Сообщение[{0}] проигнорировано.
diff --git a/java/org/apache/catalina/tribes/tipis/LocalStrings_ru.properties b/java/org/apache/catalina/tribes/tipis/LocalStrings_ru.properties
index 6fede4ed86..bd15295ad4 100644
--- a/java/org/apache/catalina/tribes/tipis/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/tribes/tipis/LocalStrings_ru.properties
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-abstractReplicatedMap.leftOver.ignored=Сообщение[{0}] проигнорированно.
+abstractReplicatedMap.leftOver.ignored=Сообщение[{0}] проигнорировано.
diff --git a/java/org/apache/catalina/tribes/transport/nio/LocalStrings_ru.properties b/java/org/apache/catalina/tribes/transport/nio/LocalStrings_ru.properties
index 2520ddb720..d552e117e6 100644
--- a/java/org/apache/catalina/tribes/transport/nio/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/tribes/transport/nio/LocalStrings_ru.properties
@@ -13,4 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+nioReplicationTask.error.register.key=Ошибка регистрации ключа для чтения:[{0}]
+
 pooledParallelSender.sender.disconnected=Отправитель не подключен
diff --git a/java/org/apache/coyote/LocalStrings_ru.properties b/java/org/apache/coyote/LocalStrings_ru.properties
index 3a27f2b2f5..31874ff6a2 100644
--- a/java/org/apache/coyote/LocalStrings_ru.properties
+++ b/java/org/apache/coyote/LocalStrings_ru.properties
@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+abstractConnectionHandler.processorPop=процессор [{0}] вынут из кэша
+
 abstractProcessor.httpupgrade.notsupported=Обновление HTTP не поддерживается данным протоколом
 
 abstractProtocolHandler.init=Инициализация ProtocolHandler [{0}]
diff --git a/java/org/apache/coyote/http11/LocalStrings_ru.properties b/java/org/apache/coyote/http11/LocalStrings_ru.properties
index 6f4579cee6..afb79f47c6 100644
--- a/java/org/apache/coyote/http11/LocalStrings_ru.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_ru.properties
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+http11processor.request.invalidUri=HTTP запрос содержал некорректный URI
 http11processor.request.prepare=Ошибка при подготовке запроса
 http11processor.request.process=Ошибка при обработке запроса
 http11processor.socket.info=Ошибка при получении информации о сокете
diff --git a/java/org/apache/tomcat/util/LocalStrings_ru.properties b/java/org/apache/tomcat/util/LocalStrings_ru.properties
index 3b6867f94b..ea9ea5ef04 100644
--- a/java/org/apache/tomcat/util/LocalStrings_ru.properties
+++ b/java/org/apache/tomcat/util/LocalStrings_ru.properties
@@ -14,4 +14,4 @@
 # limitations under the License.
 
 diagnostics.threadDumpTitle=Полный дамп потоков
-diagnostics.vmInfoClassCompilation=Компиляция класа
+diagnostics.vmInfoClassCompilation=Компиляция класса
diff --git a/java/org/apache/tomcat/util/descriptor/web/LocalStrings_ru.properties b/java/org/apache/tomcat/util/descriptor/web/LocalStrings_ru.properties
index 9fbd19264f..a4339fffb5 100644
--- a/java/org/apache/tomcat/util/descriptor/web/LocalStrings_ru.properties
+++ b/java/org/apache/tomcat/util/descriptor/web/LocalStrings_ru.properties
@@ -17,3 +17,4 @@ filterDef.invalidFilterName=Некорректный <filter-name> [{0}] в оп
 
 webXml.duplicateFilter=Дублированное имя фильтра [{0}]
 webXml.duplicateServletMapping=Сервлеты названные [{0}] и [{1}] оба привязаны к URL-ратерну [{2}], что не разрешено
+webXml.multipleOther=Несколько элементов <others> вложено в элемент <ordering>
diff --git a/java/org/apache/catalina/tribes/transport/nio/LocalStrings_ru.properties b/java/org/apache/tomcat/util/json/LocalStrings_ru.properties
similarity index 86%
copy from java/org/apache/catalina/tribes/transport/nio/LocalStrings_ru.properties
copy to java/org/apache/tomcat/util/json/LocalStrings_ru.properties
index 2520ddb720..e8e95d6fd0 100644
--- a/java/org/apache/catalina/tribes/transport/nio/LocalStrings_ru.properties
+++ b/java/org/apache/tomcat/util/json/LocalStrings_ru.properties
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-pooledParallelSender.sender.disconnected=Отправитель не подключен
+parser.expectedEOF=Ожидался  EOF, но всё еще имелось содержимое для разбора
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_ru.properties b/java/org/apache/tomcat/util/net/LocalStrings_ru.properties
index a290383abe..7b8ea54101 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_ru.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_ru.properties
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+channel.nio.ssl.closing=Канал в состоянии закрытия.
 channel.nio.ssl.sniHostName=Имя хоста SNI извлеченное для соединения [{0}] было [{1}]
 channel.nio.ssl.unwrapFail=Невозможно развернуть данные, некорректный статус [{0}]
 
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_ru.properties b/java/org/apache/tomcat/websocket/LocalStrings_ru.properties
index 98ac9c8a1f..e27c7a6017 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_ru.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_ru.properties
@@ -20,7 +20,7 @@ caseInsensitiveKeyMap.nullKey=Пустое значение ключей зап
 perMessageDeflate.invalidState=Некорректное состояние
 
 wsFrame.bufferTooSmall=Нет поддержки асинхронных сообщений и буфере слишком мал. Размер буфера: [{0}], Размер сообщения:[{1}]
-wsFrame.byteToLongFail=Cлишком много байт ([{0}]) было предоставлено для преобразования в  long
+wsFrame.byteToLongFail=Слишком много байт ([{0}]) было предоставлено для преобразования в  long
 wsFrame.messageTooBig=Сообщение было длиной [{0}], но MessageHandler имеет предел равный [{1}] байт
 
 wsFrameClient.ioe=Ошибка чтения данных отправленных сервером
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 6bd0641159..c60e4d6659 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -168,6 +168,9 @@
         Improvements to Brazilian Portuguese translations by John William
         Vicente. (markt)
       </add>
+      <add>
+        Improvements to Russian translations by usmazat and remm. (markt)
+      </add>
     </changelog>
   </subsection>
 </section>
diff --git a/webapps/examples/WEB-INF/classes/LocalStrings_ru.properties b/webapps/examples/WEB-INF/classes/LocalStrings_ru.properties
index dbf7e7ba74..b674ee55a8 100644
--- a/webapps/examples/WEB-INF/classes/LocalStrings_ru.properties
+++ b/webapps/examples/WEB-INF/classes/LocalStrings_ru.properties
@@ -43,5 +43,5 @@ sessions.data=В вашей сессии находятся следующие 
 sessions.dataname=Имя атрибута сессии:
 sessions.datavalue=Значение атрибута сессии:
 sessions.id=ID Сессии:
-sessions.lastaccessed=Последне обращение:
+sessions.lastaccessed=Последнее обращение:
 sessions.title=Пример сессий


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


(tomcat) 06/06: Fix output alignment

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 a57fc265e33876a014c91654b560a36cd37d5c17
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Dec 7 12:06:07 2023 +0000

    Fix output alignment
---
 java/org/apache/catalina/startup/LocalStrings_ru.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/catalina/startup/LocalStrings_ru.properties b/java/org/apache/catalina/startup/LocalStrings_ru.properties
index ef37bf0feb..2bccc93260 100644
--- a/java/org/apache/catalina/startup/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_ru.properties
@@ -35,8 +35,8 @@ versionLoggerListener.catalina.home=CATALINA_HOME:         {0}
 versionLoggerListener.java.home=Java Home:             {0}
 versionLoggerListener.os.arch=Архитектура:           {0}
 versionLoggerListener.os.version=Версия ОС:             {0}
-versionLoggerListener.serverInfo.server.built=Сервер собран:   {0}
-versionLoggerListener.serverInfo.server.number=Номер версии сервера: {0}
-versionLoggerListener.serverInfo.server.version=Имя версии сервера:   {0}
+versionLoggerListener.serverInfo.server.built=Сервер собран:         {0}
+versionLoggerListener.serverInfo.server.number=Номер версии сервера:  {0}
+versionLoggerListener.serverInfo.server.version=Имя версии сервера:    {0}
 versionLoggerListener.vm.vendor=Производитель JVM:     {0}
 versionLoggerListener.vm.version=Версия JVM:            {0}


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