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 2021/01/26 11:54:39 UTC
[tomcat] branch 9.0.x updated (766f662 -> 2f71d3b)
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 766f662 Refactor to reduce code duplication
new 1f4133f Backport updates to French translations
new c60d006 Backport updates to Korean translations
new 96a9cc1 Improvements to Brazilian Portuguese translations
new e4e2db5 Improvements to Russian translations
new 2f71d3b Improvements to Chinese translations
The 5 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/connector/LocalStrings_ru.properties | 3 +++
java/org/apache/catalina/core/LocalStrings_pt_BR.properties | 4 ++++
java/org/apache/catalina/ha/tcp/LocalStrings_ru.properties | 2 +-
.../org/apache/catalina/manager/LocalStrings_pt_BR.properties | 2 ++
java/org/apache/catalina/manager/LocalStrings_ru.properties | 4 ++--
.../catalina/manager/host/LocalStrings_pt_BR.properties | 3 +++
java/org/apache/catalina/realm/LocalStrings_pt_BR.properties | 2 ++
.../org/apache/catalina/session/LocalStrings_pt_BR.properties | 1 +
java/org/apache/catalina/session/LocalStrings_ru.properties | 2 ++
.../org/apache/catalina/startup/LocalStrings_pt_BR.properties | 2 ++
.../tribes/group/interceptors/LocalStrings_pt_BR.properties | 7 ++++---
.../catalina/tribes/tipis/LocalStrings_pt_BR.properties | 3 +++
java/org/apache/catalina/util/LocalStrings_ru.properties | 2 +-
java/org/apache/catalina/valves/LocalStrings_fr.properties | 1 +
java/org/apache/catalina/valves/LocalStrings_ko.properties | 1 +
java/org/apache/catalina/valves/LocalStrings_pt_BR.properties | 1 +
.../{catalina/connector => coyote}/LocalStrings_ru.properties | 2 +-
java/org/apache/coyote/ajp/LocalStrings_pt_BR.properties | 2 +-
java/org/apache/coyote/http2/LocalStrings_ru.properties | 1 +
.../org/apache/jasper/resources/LocalStrings_pt_BR.properties | 1 +
java/org/apache/jasper/resources/LocalStrings_ru.properties | 4 ++++
.../{catalina/connector => naming}/LocalStrings_ru.properties | 2 +-
.../jaspic => naming/factory}/LocalStrings_pt_BR.properties | 2 +-
java/org/apache/tomcat/util/LocalStrings_ru.properties | 2 +-
java/org/apache/tomcat/util/compat/LocalStrings_fr.properties | 4 ++++
java/org/apache/tomcat/util/compat/LocalStrings_ko.properties | 4 ++++
.../util/descriptor/web}/LocalStrings_ru.properties | 2 +-
.../util/http/parser/LocalStrings_ru.properties} | 3 +--
java/org/apache/tomcat/util/net/LocalStrings_pt_BR.properties | 1 +
java/org/apache/tomcat/util/net/LocalStrings_ru.properties | 2 +-
java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties | 3 +++
.../websocket/pojo}/LocalStrings_pt_BR.properties | 2 +-
webapps/docs/changelog.xml | 11 ++++++++++-
33 files changed, 70 insertions(+), 18 deletions(-)
copy java/org/apache/{catalina/connector => coyote}/LocalStrings_ru.properties (85%)
copy java/org/apache/{catalina/connector => naming}/LocalStrings_ru.properties (90%)
copy java/org/apache/{catalina/authenticator/jaspic => naming/factory}/LocalStrings_pt_BR.properties (84%)
copy java/org/apache/{catalina/connector => tomcat/util/descriptor/web}/LocalStrings_ru.properties (87%)
copy java/org/apache/{catalina/util/CharsetMapperDefault.properties => tomcat/util/http/parser/LocalStrings_ru.properties} (94%)
copy java/org/apache/{catalina/deploy => tomcat/websocket/pojo}/LocalStrings_pt_BR.properties (88%)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/05: Backport updates to French translations
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 1f4133fe722286c04607f1f54621311d54342261
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jan 26 11:49:50 2021 +0000
Backport updates to French translations
---
java/org/apache/catalina/valves/LocalStrings_fr.properties | 1 +
java/org/apache/tomcat/util/compat/LocalStrings_fr.properties | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/java/org/apache/catalina/valves/LocalStrings_fr.properties b/java/org/apache/catalina/valves/LocalStrings_fr.properties
index 459fa2c..01eb334 100644
--- a/java/org/apache/catalina/valves/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_fr.properties
@@ -18,6 +18,7 @@ accessLogValve.closeFail=Échec de fermeture du fichier de journal d'accès
accessLogValve.deleteFail=Impossible d''effacer l''ancien journal d''accès [{0}]
accessLogValve.invalidLocale=Impossible de définir les paramètres régionaux sur [{0}]
accessLogValve.invalidPortType=Type de port [{0}] invalide, utilisation du port (local) de serveur
+accessLogValve.invalidRemoteAddressType=Le type [{0}] d''adresse distante est invalide, l''adresse distante classique sera utilisée et non celle du pair
accessLogValve.openDirFail=Echec de création du répertoire [{0}] pour les journaux d''accès
accessLogValve.openFail=Echec à l''ouverture du journal d''accès [{0}]
accessLogValve.renameFail=Échec de renommage du journal d''accès de [{0}] en [{1}]
diff --git a/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties b/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
index 998e08b..cfb8a96 100644
--- a/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
@@ -13,9 +13,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+jre16Compat.javaPre16=Le code est considéré être exécuté sur une JVM antérieure à Java 16 car la classe n'a pas été trouvée
+jre16Compat.unexpected=Impossible de créer les références vers les classes et méthodes de Java 16
+
jre9Compat.invalidModuleUri=L''URI du module fournie [{0}] n''a pas pu être convertie en URL pour être traitée par le JarScanner
jre9Compat.javaPre9=Le code est considéré être exécuté sur une JVM antérieure à Java 9 car la classe n'a pas été trouvée
jre9Compat.unexpected=Impossible de créer les références vers les classes et méthodes de Java 9
jreCompat.noApplicationProtocol=Le Java Runtime utilisé ne supporte pas SSLEngine.getApplicationProtocol(). Il faut Java 9 pour utiliser cette option.
jreCompat.noApplicationProtocols=L'environnement Java ne supporte pas SSLParameters.setApplicationProtocols(), cette fonctionnalité demande Java 9
+jreCompat.noUnixDomainSocket=L'environnement Java ne supporte pas les sockets de domaine de Unix, cette fonctionnalité demande Java 16
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 03/05: Improvements to Brazilian Portuguese translations
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 96a9cc1fb285e0be3e14d96b43879bc65816f36a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jan 26 11:52:56 2021 +0000
Improvements to Brazilian Portuguese translations
---
java/org/apache/catalina/core/LocalStrings_pt_BR.properties | 4 ++++
java/org/apache/catalina/manager/LocalStrings_pt_BR.properties | 2 ++
.../apache/catalina/manager/host/LocalStrings_pt_BR.properties | 3 +++
java/org/apache/catalina/realm/LocalStrings_pt_BR.properties | 2 ++
java/org/apache/catalina/session/LocalStrings_pt_BR.properties | 1 +
java/org/apache/catalina/startup/LocalStrings_pt_BR.properties | 2 ++
.../tribes/group/interceptors/LocalStrings_pt_BR.properties | 7 ++++---
.../apache/catalina/tribes/tipis/LocalStrings_pt_BR.properties | 3 +++
java/org/apache/catalina/valves/LocalStrings_pt_BR.properties | 1 +
java/org/apache/coyote/ajp/LocalStrings_pt_BR.properties | 2 +-
java/org/apache/jasper/resources/LocalStrings_pt_BR.properties | 1 +
.../{coyote/ajp => naming/factory}/LocalStrings_pt_BR.properties | 2 +-
java/org/apache/tomcat/util/net/LocalStrings_pt_BR.properties | 1 +
.../host => tomcat/websocket/pojo}/LocalStrings_pt_BR.properties | 3 +--
webapps/docs/changelog.xml | 8 ++++++++
15 files changed, 35 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/catalina/core/LocalStrings_pt_BR.properties b/java/org/apache/catalina/core/LocalStrings_pt_BR.properties
index 6782781..82e2ed5 100644
--- a/java/org/apache/catalina/core/LocalStrings_pt_BR.properties
+++ b/java/org/apache/catalina/core/LocalStrings_pt_BR.properties
@@ -24,6 +24,10 @@ defaultInstanceManager.restrictedListenersResource=Arquivo de propriedades de li
filterChain.filter=Filtro de execuçõ lançou uma exceção
+naming.wsdlFailed=Falha ao buscar arquivo wsdl [{0}].
+
standardContext.listenerStart=Exceção ao enviar evento de contexto iniciado para instância listener da classe [{0}]
standardContext.loginConfig.errorWarning=AVISO: Página de erro de formulário [{0}] precisa iniciar com "/" no Servle 2.4
standardContext.securityConstraint.mixHttpMethod=Não é permitido misturar <http-method> e <http-method-omission> na mesma coleção de recursos web
+
+standardWrapper.unloading=Impossível alocar servlet [{0}] pois está sendo descarregado.
diff --git a/java/org/apache/catalina/manager/LocalStrings_pt_BR.properties b/java/org/apache/catalina/manager/LocalStrings_pt_BR.properties
index da6495c..4babdbc 100644
--- a/java/org/apache/catalina/manager/LocalStrings_pt_BR.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_pt_BR.properties
@@ -19,3 +19,5 @@ htmlManagerServlet.serverIPAddress=Endereço IP
managerServlet.copyError=Não foi possível copiar o arquivo de configuração do caminho [{0}]
managerServlet.deployed=OK - Instalada aplicação no path de contexto [{0}]
+managerServlet.mkdirFail=FALHA - Incapaz de criar o diretório [{0}]
+managerServlet.resourcesAll=Recursos de todos os tipos, listados.
diff --git a/java/org/apache/catalina/manager/host/LocalStrings_pt_BR.properties b/java/org/apache/catalina/manager/host/LocalStrings_pt_BR.properties
index 9a414e6..eaaa194 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings_pt_BR.properties
+++ b/java/org/apache/catalina/manager/host/LocalStrings_pt_BR.properties
@@ -13,5 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+hostManagerServlet.managerXml=FALHA - Não foi possível instalar manager.xml
+
htmlHostManagerServlet.addHost=Host
+htmlHostManagerServlet.addManager=Aplicativo gerenciador.
htmlHostManagerServlet.hostName=Host
diff --git a/java/org/apache/catalina/realm/LocalStrings_pt_BR.properties b/java/org/apache/catalina/realm/LocalStrings_pt_BR.properties
index 2d4903a..8ad30ad 100644
--- a/java/org/apache/catalina/realm/LocalStrings_pt_BR.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_pt_BR.properties
@@ -19,5 +19,7 @@ jaasMemoryLoginModule.unknownAuthenticationMethod=Método de autenticação desc
lockOutRealm.authLockedUser=Foi feita uma tentativa de autenticação do usuário já bloqueado [{0}]
+memoryRealm.loadExist=Arquivo de banco de dados de memória [{0}] ilegível.
+
realmBase.authenticateFailure=Usuário [{0}] NÃO autenticado
realmBase.createUsernameRetriever.ClassCastException=Classe [{0}} não é um X509UsernameRetriever
diff --git a/java/org/apache/catalina/session/LocalStrings_pt_BR.properties b/java/org/apache/catalina/session/LocalStrings_pt_BR.properties
index 879a9d9..459885e 100644
--- a/java/org/apache/catalina/session/LocalStrings_pt_BR.properties
+++ b/java/org/apache/catalina/session/LocalStrings_pt_BR.properties
@@ -16,3 +16,4 @@
persistentManager.isLoadedError=Erro ao checar ser a sessão [{0}] foi carregada na memória
persistentManager.removeError=Erro ao remover a sessão [{0}] do armazenamento
persistentManager.storeSizeException=Impossível determinar o número de sessões no cache de sessão, assumindo que o cache está vazio
+persistentManager.swapTooManyActive=Trocando sessão [{0}], ocioso por [{1}] segundos, há muitas sessões ativas.
diff --git a/java/org/apache/catalina/startup/LocalStrings_pt_BR.properties b/java/org/apache/catalina/startup/LocalStrings_pt_BR.properties
index 0c0d842..9d69ef9 100644
--- a/java/org/apache/catalina/startup/LocalStrings_pt_BR.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_pt_BR.properties
@@ -18,3 +18,5 @@ catalina.serverStartFail=O componente Server requerido falhou ao iniciar, por is
contextConfig.altDDNotFound=arquivo alt-dd [{0}] não encontrado
hostConfig.deployDir=Diretório de instalação da aplicação web [{0}]
+
+userConfig.database=Exceção ao carregar banco de dados do usuário.
diff --git a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_pt_BR.properties b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_pt_BR.properties
index e173b2a..f145232 100644
--- a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_pt_BR.properties
+++ b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_pt_BR.properties
@@ -17,6 +17,7 @@ encryptInterceptor.decrypt.error.short-message=Falha ao decriptar mensagem: fim
nonBlockingCoordinator.memberAlive.failed=Impossível realizar verificação de membros ativos, assumindo membro está down
+staticMembershipInterceptor.no.pingInterceptor=Não há TcpPingInterceptor, portanto, a verificação de "saúde" dos membros estáticos não funcionam. Por favor, defina TcpPingInterceptor.
staticMembershipInterceptor.sendShutdown.failed=Notificação de desligamento falhou.
tcpFailureDetector.failureDetection.failed=Impossível realizar detecção de falha, assumindo que membro [{0}] está down
@@ -25,13 +26,13 @@ tcpFailureDetector.still.alive=A verificação completa. O Membro esta ativo [{0
tcpPingInterceptor.ping.failed=Imposível enviar ping TCP
throughputInterceptor.report=ThroughputInterceptor Report[\n\
-\tMsg Tx:{0} menssagens\n\
+\tMsg Tx:{0} mensagens\n\
\tEnviado:{1} MB (total)\n\
\tEnviado:{2} MB (aplicação)\n\
\tTempo:{3} segundos\n\
\tTaxa Tx:{4} MB/seg (total)\n\
\tTaxa Tx:{5} MB/seg (aplicação)\n\
\tMsgs erro:{6}\n\
-\tRx Msg:{7} menssagens\n\
-\tTaxa Rx:{8} MB/seg (desde a primeira msg)\n\
+\tRx Msg:{7} mensagens\n\
+\tTaxa Rx:{8} MB/seg (desde a primeira mensagem)\n\
\tRecebido:{9} MB]
diff --git a/java/org/apache/catalina/tribes/tipis/LocalStrings_pt_BR.properties b/java/org/apache/catalina/tribes/tipis/LocalStrings_pt_BR.properties
index 9661511..6cec62e 100644
--- a/java/org/apache/catalina/tribes/tipis/LocalStrings_pt_BR.properties
+++ b/java/org/apache/catalina/tribes/tipis/LocalStrings_pt_BR.properties
@@ -14,5 +14,8 @@
# limitations under the License.
abstractReplicatedMap.leftOver.ignored=Mensagem[{0}] é ignorada
+abstractReplicatedMap.unable.get=Impossível replicar dados para uma operação AbstractReplicatedMap.get.
+
+lazyReplicatedMap.unableReplicate.proxy=Impossível replicar a chave de proxy [{0}] ao backup [{1}], pois: [{2}]
replicatedMap.unable.relocate=Impossível realocar [{0}] para um novo nó de backup
diff --git a/java/org/apache/catalina/valves/LocalStrings_pt_BR.properties b/java/org/apache/catalina/valves/LocalStrings_pt_BR.properties
index fb95d44..9044f5a 100644
--- a/java/org/apache/catalina/valves/LocalStrings_pt_BR.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_pt_BR.properties
@@ -16,6 +16,7 @@
errorReportValve.rootCauseInLogs=A pilha de erros completa da causa principal está disponível nos logs do servidor.
http.404.reason=Não Encontrado
+http.407.reason=Exige-se autenticação ao proxy.
http.415.reason=Media Type não suportado
http.426.reason=Atualização Requerida
http.502.desc=O servidor recebeu uma resposta inválida enquanto atuava como gateway ou proxy
diff --git a/java/org/apache/coyote/ajp/LocalStrings_pt_BR.properties b/java/org/apache/coyote/ajp/LocalStrings_pt_BR.properties
index a2d187a..b48197e 100644
--- a/java/org/apache/coyote/ajp/LocalStrings_pt_BR.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings_pt_BR.properties
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-ajpprotocol.noUpgrade=Atualização não é suportada pelo AJP. A configuração UpgradeProtocol para [{0}] foi ignorada
+ajpprotocol.noUpgrade=Atualização não é suportada com AJP. A configuração UpgradeProtocol para [{0}] foi ignorada
diff --git a/java/org/apache/jasper/resources/LocalStrings_pt_BR.properties b/java/org/apache/jasper/resources/LocalStrings_pt_BR.properties
index 05fa3fa..a2270b2 100644
--- a/java/org/apache/jasper/resources/LocalStrings_pt_BR.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_pt_BR.properties
@@ -26,6 +26,7 @@ jsp.error.taglibDirective.absUriCannotBeResolved=A uri absoluta [{0}] não pode
jsp.error.tld.mandatory.element.missing=Elemento TLD mandatório [{0}] faltando ou vazio no TLD [{1}]
jsp.error.unknown_attribute_type=Tipo de atributo [{1}] inválido para atributo [{0}]
jsp.info.ignoreSetting=Ignorada configuraçõ para [{0}] de [{1}] porque um SecurityManager foi habilitado
+jsp.message.jsp_removed_excess=Removendo excesso de JSP para o caminho [{0}] da fila de contexto [{1}].
jsp.warning.enablePooling=Aviso: valor inválido para o initParam enablePooling. Será usado o valor padrão "true"
jspc.webfrg.footer=\n\
diff --git a/java/org/apache/coyote/ajp/LocalStrings_pt_BR.properties b/java/org/apache/naming/factory/LocalStrings_pt_BR.properties
similarity index 84%
copy from java/org/apache/coyote/ajp/LocalStrings_pt_BR.properties
copy to java/org/apache/naming/factory/LocalStrings_pt_BR.properties
index a2d187a..6def3de 100644
--- a/java/org/apache/coyote/ajp/LocalStrings_pt_BR.properties
+++ b/java/org/apache/naming/factory/LocalStrings_pt_BR.properties
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-ajpprotocol.noUpgrade=Atualização não é suportada pelo AJP. A configuração UpgradeProtocol para [{0}] foi ignorada
+resourceLinkFactory.nullType=A ligação do recurso local [{0}] que referencia o recurso global [{1}] não especifica o tipo de atributo exigido.
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_pt_BR.properties b/java/org/apache/tomcat/util/net/LocalStrings_pt_BR.properties
index 54ba755..bd294bf 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_pt_BR.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_pt_BR.properties
@@ -15,6 +15,7 @@
channel.nio.ssl.sniHostName=O nome do host SSI extraíd para conexão [{0}] foi [{1}]
+endpoint.invalidJmxNameSslHostCert=Impossível gerar um nome de objeto JMX válido para SSLHostConfigCertificate associado ao host [{0}] e tipo de certificado [{1}].
endpoint.serverSocket.closeFailed=Falha ao fechar socket de servidor para [{0}]
socket.apr.closed=O socket [{0}] associado com est conexão foi fechado
diff --git a/java/org/apache/catalina/manager/host/LocalStrings_pt_BR.properties b/java/org/apache/tomcat/websocket/pojo/LocalStrings_pt_BR.properties
similarity index 88%
copy from java/org/apache/catalina/manager/host/LocalStrings_pt_BR.properties
copy to java/org/apache/tomcat/websocket/pojo/LocalStrings_pt_BR.properties
index 9a414e6..8b2885e 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings_pt_BR.properties
+++ b/java/org/apache/tomcat/websocket/pojo/LocalStrings_pt_BR.properties
@@ -13,5 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-htmlHostManagerServlet.addHost=Host
-htmlHostManagerServlet.hostName=Host
+pojoMethodMapping.invalidDecoder=O decodificador especificado de tipo [{0}] não pôde ser instanciado.
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b617a4f..d91a83c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -250,6 +250,14 @@
<update>
Update to Commons Daemon 1.2.4. (markt)
</update>
+ <add>
+ Improvements to Brazilian Portuguese translations. Provided by Rual
+ Zaninetti Rosa and Lucas. (markt)
+ </add>
+ <add>
+ Improvements to Brazilian Portuguese translations. Provided by Rual
+ Zaninetti Rosa and Lucas. (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/05: Improvements to Chinese translations
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 2f71d3ba4ca5de129f865e310c0d43f7cfa66f89
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jan 26 11:54:11 2021 +0000
Improvements to Chinese translations
---
java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties | 3 +++
webapps/docs/changelog.xml | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
index 159c72e..b5c32c8 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
@@ -154,6 +154,9 @@ socket.apr.write.error=将数据写入APR/native socket[{1}]时出现意外错
socket.closed=与此连接关联的套接字已关闭。
socket.sslreneg=重新协商SSL连接时出现异常
+socketWrapper.readTimeout=读取超时
+socketWrapper.writeTimeout=写入超时
+
sslHostConfig.certificate.notype=指定了多个证书，并且至少有一个证书缺少必需的属性类型
sslHostConfig.certificateVerificationInvalid=证书认证值[{0}]未识别
sslHostConfig.fileNotFound=配置文件 [{0}] 不存在
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index cc29de5..5b8a41a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -220,7 +220,8 @@
<subsection name="Other">
<changelog>
<add>
- Improvements to Chinese translations. Provided by leeyazhou. (markt)
+ Improvements to Chinese translations. Provided by leeyazhouand Yi Shen.
+ (markt)
</add>
<add>
Improvements to French translations. (remm)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/05: Backport updates to Korean translations
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 c60d00620e1021453deaad4c8069b646a9595ac7
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jan 26 11:50:26 2021 +0000
Backport updates to Korean translations
---
java/org/apache/catalina/valves/LocalStrings_ko.properties | 1 +
java/org/apache/tomcat/util/compat/LocalStrings_ko.properties | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/java/org/apache/catalina/valves/LocalStrings_ko.properties b/java/org/apache/catalina/valves/LocalStrings_ko.properties
index 4a46de4..55502ce 100644
--- a/java/org/apache/catalina/valves/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_ko.properties
@@ -18,6 +18,7 @@ accessLogValve.closeFail=접근 로그 파일을 닫지 못했습니다.
accessLogValve.deleteFail=이전 접근 로그 파일 [{0}]을(를) 삭제하지 못했습니다.
accessLogValve.invalidLocale=로케일을 [{0}](으)로 설정하지 못했습니다.
accessLogValve.invalidPortType=유효하지 않은 포트 타입 [{0}]. 서버 (로컬) 포트를 사용합니다.
+accessLogValve.invalidRemoteAddressType=유효하지 않은 원격 주소 타입 [{0}]. Peer가 아닌 원격 주소로 간주합니다.
accessLogValve.openDirFail=접근 로그 파일(들)을 위한 디렉토리 [{0}]을(를) 생성하지 못했습니다.
accessLogValve.openFail=접근 로그 파일 [{0}]을(를) 열지 못했습니다.
accessLogValve.renameFail=접근 로그 파일을 [{0}]에서 [{1}](으)로 이름을 변경하지 못했습니다.
diff --git a/java/org/apache/tomcat/util/compat/LocalStrings_ko.properties b/java/org/apache/tomcat/util/compat/LocalStrings_ko.properties
index c24992f..b5666eb 100644
--- a/java/org/apache/tomcat/util/compat/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/util/compat/LocalStrings_ko.properties
@@ -13,9 +13,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+jre16Compat.javaPre16=클래스가 발견되지 않습니다. 자바 16 이전의 JVM에서 실행 중인 것으로 보입니다.
+jre16Compat.unexpected=자바 16 클래스들과 메소드들을 참조할 수 없습니다.
+
jre9Compat.invalidModuleUri=[{0}](으)로 제공된 모듈 URI는 JarScanner가 처리할 수 있는 URL로 변환될 수 없습니다.
jre9Compat.javaPre9=Java 9 클래스가 발견되지 않습니다. Java 9 이전 버전에서 동작하고 있는 것으로 보입니다.
jre9Compat.unexpected=Java 9 클래스들과 메소드들을 참조할 수 없습니다.
jreCompat.noApplicationProtocol=자바 런타임이 SSLEngine.getApplicationProtocol()을 지원하지 않습니다. 이 기능을 사용하려면 Java 9를 사용해야 합니다.
jreCompat.noApplicationProtocols=자바 런타임이 SSLParameters.setApplicationProtocols()을 지원하지 않습니다. 이 기능을 사용하려면 Java 9를 사용해야 합니다.
+jreCompat.noUnixDomainSocket=자바 런타임이 Unix 도메인 소켓을 지원하지 않습니다. 이 기능을 사용하려면 자바 16을 사용해야 합니다.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 04/05: Improvements to Russian translations
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 e4e2db516d7078064e4ebf918de341f513f0d517
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jan 26 11:53:42 2021 +0000
Improvements to Russian translations
---
java/org/apache/catalina/connector/LocalStrings_ru.properties | 3 +++
java/org/apache/catalina/ha/tcp/LocalStrings_ru.properties | 2 +-
java/org/apache/catalina/manager/LocalStrings_ru.properties | 4 ++--
java/org/apache/catalina/session/LocalStrings_ru.properties | 2 ++
java/org/apache/catalina/util/LocalStrings_ru.properties | 2 +-
.../apache/{catalina/connector => coyote}/LocalStrings_ru.properties | 2 +-
java/org/apache/coyote/http2/LocalStrings_ru.properties | 1 +
java/org/apache/jasper/resources/LocalStrings_ru.properties | 4 ++++
.../apache/{catalina/connector => naming}/LocalStrings_ru.properties | 2 +-
java/org/apache/tomcat/util/LocalStrings_ru.properties | 2 +-
.../util/descriptor/web}/LocalStrings_ru.properties | 2 +-
.../connector => tomcat/util/http/parser}/LocalStrings_ru.properties | 2 +-
java/org/apache/tomcat/util/net/LocalStrings_ru.properties | 2 +-
webapps/docs/changelog.xml | 4 ++--
14 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/java/org/apache/catalina/connector/LocalStrings_ru.properties b/java/org/apache/catalina/connector/LocalStrings_ru.properties
index 9cf2f86..7aacaec 100644
--- a/java/org/apache/catalina/connector/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_ru.properties
@@ -14,3 +14,6 @@
# limitations under the License.
coyoteAdapter.debug=Переменная [{0}] имеет значение [{1}]
+
+coyoteConnector.invalidEncoding=\n\
+Кодировка [{0}] не распознана JRE. Коннектор продолжит использовать [{1}]
diff --git a/java/org/apache/catalina/ha/tcp/LocalStrings_ru.properties b/java/org/apache/catalina/ha/tcp/LocalStrings_ru.properties
index 08673fa..9d21e49 100644
--- a/java/org/apache/catalina/ha/tcp/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/ha/tcp/LocalStrings_ru.properties
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-ReplicationValve.filter.failure=Не возможно скомпилировать фильтрr=[{0}]
+ReplicationValve.filter.failure=Не возможно скомпилировать фильтр=[{0}]
diff --git a/java/org/apache/catalina/manager/LocalStrings_ru.properties b/java/org/apache/catalina/manager/LocalStrings_ru.properties
index 386b452..afa1e9d 100644
--- a/java/org/apache/catalina/manager/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_ru.properties
@@ -118,7 +118,7 @@ htmlManagerServlet.title=Управление веб-приложениями To
managerServlet.alreadyContext=ОШИБКА - Приложение уже существует на пути [{0}]
managerServlet.certsNotAvailable=Информация о сертификате не может быть получена во время работы
managerServlet.deleteFail=ОШИБКА - Не удалось удалить [{0}].
-managerServlet.deployFailed=ОШИБКА - Не удалось развернуть приложение на контекстом пути [{0}]
+managerServlet.deployFailed=ОШИБКА - Не удалось развернуть приложение на контекстном пути [{0}]
managerServlet.deployed=OK - Приложение успешно развёрнуто в контекстном пути [{0}]
managerServlet.deployedButNotStarted=ОШИБКА - Приложение было развёрнуто в контекстном пути [{0}], но не стартовало
managerServlet.exception=ОШИБКА - Встретилось исключение [{0}]
@@ -158,7 +158,7 @@ managerServlet.sslConnectorTrustedCerts=OK - Информация о довер
managerServlet.sslReload=OK - Перезагрузка конфигурации TLS для [{0}]
managerServlet.sslReloadAll=OK - Перезагрузка конфигурации TLS для всех виртуальных хостов TLS
managerServlet.sslReloadFail=ОШИБКА - Не удалось перезагрузить конфигурацию TLS
-managerServlet.startFailed=ОШИБКА - Application at context path [{0}] could not be started
+managerServlet.startFailed=ОШИБКА - Приложение по контекстному пути [{0}] не запустилось
managerServlet.started=OK - Запущено приложение по пути контекста [{0}]
managerServlet.stopped=OK - Остановлено приложение по пути контекста [{0}]
managerServlet.storeConfig.noMBean=ОШИБКА - Нет StoreConfig MBean, зарегистрированный на [{0}]
diff --git a/java/org/apache/catalina/session/LocalStrings_ru.properties b/java/org/apache/catalina/session/LocalStrings_ru.properties
index badde70..2f43bf3 100644
--- a/java/org/apache/catalina/session/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/session/LocalStrings_ru.properties
@@ -14,3 +14,5 @@
# limitations under the License.
JDBCStore.connectError=Не возможно подключиться к базе данных [{0}]
+
+managerBase.contextNull=Перед использованием Менеджера контексту необходимо присвоить не пустое значение
diff --git a/java/org/apache/catalina/util/LocalStrings_ru.properties b/java/org/apache/catalina/util/LocalStrings_ru.properties
index 803ec1f..1a64b87 100644
--- a/java/org/apache/catalina/util/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/util/LocalStrings_ru.properties
@@ -15,4 +15,4 @@
extensionValidator.extension-not-found-error=ExtensionValidator[{0}][{1}]: требуемое расширение [{2}] не найдено.
-introspection.classLoadFailed=Не возможно закрузить класс [{0}]
+introspection.classLoadFailed=Не возможно загрузить класс [{0}]
diff --git a/java/org/apache/catalina/connector/LocalStrings_ru.properties b/java/org/apache/coyote/LocalStrings_ru.properties
similarity index 85%
copy from java/org/apache/catalina/connector/LocalStrings_ru.properties
copy to java/org/apache/coyote/LocalStrings_ru.properties
index 9cf2f86..718487e 100644
--- a/java/org/apache/catalina/connector/LocalStrings_ru.properties
+++ b/java/org/apache/coyote/LocalStrings_ru.properties
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-coyoteAdapter.debug=Переменная [{0}] имеет значение [{1}]
+abstractProcessor.httpupgrade.notsupported=Обновление HTTP не поддерживается данным протоколом
diff --git a/java/org/apache/coyote/http2/LocalStrings_ru.properties b/java/org/apache/coyote/http2/LocalStrings_ru.properties
index cf33a47..e3f507e 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ru.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ru.properties
@@ -14,3 +14,4 @@
# limitations under the License.
upgradeHandler.pingFailed=Соединение [{0}], ошибка при передаче ping''а клиенту
+upgradeHandler.socketCloseFailed=Ошибка при закрытии сокета
diff --git a/java/org/apache/jasper/resources/LocalStrings_ru.properties b/java/org/apache/jasper/resources/LocalStrings_ru.properties
index 11b5982..d821574 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ru.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ru.properties
@@ -20,8 +20,12 @@ jsp.error.attribute.noequal=Необходим символ равенства
jsp.error.data.file.processing=Ошибка при обработке файла [{0}]
jsp.error.el.template.deferred=#{...} не допускается в тексте шаблона
jsp.error.fallback.invalidUse=jsp:fallback должен быть прямым потомком jsp:plugin
+jsp.error.invalid.tagdir=Директория файла тегов [{0}] не начинается с "/WEB-INF/tags"
jsp.error.jspbody.required=Для указания тела тега для [{0}] должно быть использовано jsp: body если используется jsp: attribute.
+jsp.error.jspelement.missing.name=Обязательный атрибут 'name' в XML-стиле отсутствует
jsp.error.outputfolder=Не указана выходная папка
jsp.error.parse.xml=XML файл [{0}] содержит ошибки
jsp.error.unknown_attribute_type=Неизвестный тип [{1}] для атрибута [{0}]
jsp.exception=Произошла ошибка при обработке [{0}] в строке [{1}]
+
+jspc.webxml.footer=</web-app>
diff --git a/java/org/apache/catalina/connector/LocalStrings_ru.properties b/java/org/apache/naming/LocalStrings_ru.properties
similarity index 90%
copy from java/org/apache/catalina/connector/LocalStrings_ru.properties
copy to java/org/apache/naming/LocalStrings_ru.properties
index 9cf2f86..7fcce74 100644
--- a/java/org/apache/catalina/connector/LocalStrings_ru.properties
+++ b/java/org/apache/naming/LocalStrings_ru.properties
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-coyoteAdapter.debug=Переменная [{0}] имеет значение [{1}]
+namingContext.contextExpected=Имя не привязано к контексту
diff --git a/java/org/apache/tomcat/util/LocalStrings_ru.properties b/java/org/apache/tomcat/util/LocalStrings_ru.properties
index 6a6a0f6..3b6867f 100644
--- a/java/org/apache/tomcat/util/LocalStrings_ru.properties
+++ b/java/org/apache/tomcat/util/LocalStrings_ru.properties
@@ -13,5 +13,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-diagnostics.threadDumpTitle=Сброс полной нити
+diagnostics.threadDumpTitle=Полный дамп потоков
diagnostics.vmInfoClassCompilation=Компиляция класа
diff --git a/java/org/apache/catalina/connector/LocalStrings_ru.properties b/java/org/apache/tomcat/util/descriptor/web/LocalStrings_ru.properties
similarity index 87%
copy from java/org/apache/catalina/connector/LocalStrings_ru.properties
copy to java/org/apache/tomcat/util/descriptor/web/LocalStrings_ru.properties
index 9cf2f86..0f65459 100644
--- a/java/org/apache/catalina/connector/LocalStrings_ru.properties
+++ b/java/org/apache/tomcat/util/descriptor/web/LocalStrings_ru.properties
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-coyoteAdapter.debug=Переменная [{0}] имеет значение [{1}]
+filterDef.invalidFilterName=Некорректный <filter-name> [{0}] в определении фильтра.
diff --git a/java/org/apache/catalina/connector/LocalStrings_ru.properties b/java/org/apache/tomcat/util/http/parser/LocalStrings_ru.properties
similarity index 90%
copy from java/org/apache/catalina/connector/LocalStrings_ru.properties
copy to java/org/apache/tomcat/util/http/parser/LocalStrings_ru.properties
index 9cf2f86..788e928 100644
--- a/java/org/apache/catalina/connector/LocalStrings_ru.properties
+++ b/java/org/apache/tomcat/util/http/parser/LocalStrings_ru.properties
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-coyoteAdapter.debug=Переменная [{0}] имеет значение [{1}]
+cookie.valueNotPresent=отсутствует
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_ru.properties b/java/org/apache/tomcat/util/net/LocalStrings_ru.properties
index a27751b..16752be 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_ru.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_ru.properties
@@ -18,4 +18,4 @@ endpoint.warn.incorrectConnectionCount=Неверное количество п
sslHostConfig.fileNotFound=Сконфигурированный файл [{0}] не существует
-sslUtilBase.noneSupported=Ни один из указанных [{0}] не поддерживается движком SSL: ч[{1}]
+sslUtilBase.noneSupported=Ни один из указанных [{0}] не поддерживается движком SSL: [{1}]
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d91a83c..cc29de5 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -255,8 +255,8 @@
Zaninetti Rosa and Lucas. (markt)
</add>
<add>
- Improvements to Brazilian Portuguese translations. Provided by Rual
- Zaninetti Rosa and Lucas. (markt)
+ Improvements to Russian translations. Provided by Polina and Azat.
+ (markt)
</add>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org