This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 0eb525f09bcfa231a0e89c4796a0e17dbe82d09f
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jul 24 10:48:35 2019 +0100
Polish. Align i18n with 8.5.x
---
java/org/apache/catalina/connector/CoyoteAdapter.java | 8 +++-----
.../apache/catalina/connector/LocalStrings.properties | 4 ++--
.../catalina/connector/LocalStrings_es.properties | 2 +-
.../catalina/connector/LocalStrings_fr.properties | 10 ++++++++++
.../catalina/connector/LocalStrings_ja.properties | 10 ++++++++++
.../catalina/connector/LocalStrings_ru.properties | 17 +++++++++++++++++
6 files changed, 43 insertions(+), 8 deletions(-)
diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index 2f42ef1..882ca47 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -109,8 +109,7 @@ public class CoyoteAdapter implements Adapter {
/**
* The string manager for this package.
*/
- protected static final StringManager sm =
- StringManager.getManager(Constants.Package);
+ protected static final StringManager sm =
StringManager.getManager(CoyoteAdapter.class);
/**
@@ -268,8 +267,7 @@ public class CoyoteAdapter implements Adapter {
Response response = (Response) res.getNote(ADAPTER_NOTES);
if (request == null) {
- throw new IllegalStateException(
- "Dispatch may only happen on an existing request.");
+ throw new
IllegalStateException(sm.getString("coyoteAdapter.nullRequest"));
}
boolean comet = false;
boolean success = true;
@@ -374,7 +372,7 @@ public class CoyoteAdapter implements Adapter {
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
success = false;
- log.error(sm.getString("coyoteAdapter.service"), t);
+ log.error(sm.getString("coyoteAdapter.asyncDispatch"), t);
} finally {
req.getRequestProcessor().setWorkerThreadName(null);
// Recycle the wrapper request and response
diff --git a/java/org/apache/catalina/connector/LocalStrings.properties
b/java/org/apache/catalina/connector/LocalStrings.properties
index 6aee67a..c432a9a 100644
--- a/java/org/apache/catalina/connector/LocalStrings.properties
+++ b/java/org/apache/catalina/connector/LocalStrings.properties
@@ -16,14 +16,14 @@
cometEvent.nullRequest=The event object has been recycled and is no longer
associated with a request
coyoteAdapter.accesslogFail=Exception while attempting to add an entry to the
access log
+coyoteAdapter.asyncDispatch=Exception while processing an asynchronous request
coyoteAdapter.authenticate=Authenticated user [{0}] provided by connector
coyoteAdapter.authorize=Authorizing user [{0}] using Tomcat''s Realm
coyoteAdapter.checkRecycled.request=Encountered a non-recycled request and
recycled it forcedly.
coyoteAdapter.checkRecycled.response=Encountered a non-recycled response and
recycled it forcedly.
coyoteAdapter.debug=The variable [{0}] has value [{1}]
+coyoteAdapter.nullRequest=An asynchronous dispatch may only happen on an
existing request
coyoteAdapter.parsePathParam=Unable to parse the path parameters using
encoding [{0}]. The path parameters in the URL will be ignored.
-coyoteAdapter.read=The servlet did not read all available bytes during the
processing of the read event
-coyoteAdapter.service=An exception or error occurred in the container during
the request processing
coyoteConnector.MapperRegistration=register Mapper: {0}
coyoteConnector.cannotRegisterProtocol=Cannot register MBean for the Protocol
diff --git a/java/org/apache/catalina/connector/LocalStrings_es.properties
b/java/org/apache/catalina/connector/LocalStrings_es.properties
index 82ed8c4..872cc69 100644
--- a/java/org/apache/catalina/connector/LocalStrings_es.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_es.properties
@@ -16,9 +16,9 @@
cometEvent.nullRequest=El objeto de evento ha sido reciclado y ya no está
asociado con este requerimiento
coyoteAdapter.accesslogFail=Excepción al intentar añadir una entrada al
historial de acceso
+coyoteAdapter.checkRecycled.response=Se encontró una respuesta no reciclable y
se crecicló a la fuerza
coyoteAdapter.debug=La variable [{0}] tiene el valor [{1}]
coyoteAdapter.parsePathParam=No puedo analizar los parámetros de ruta mediante
la codificación [{0}]. Se ignoran los parámetros de la URL.
-coyoteAdapter.read=El servlet no leyó todos los bytes disponibles durante el
procesamiento del evento de lectura
coyoteConnector.MapperRegistration=Mapeador de registro: {0}
coyoteConnector.cannotRegisterProtocol=No puedo registrar MBean para el
Protocolo
diff --git a/java/org/apache/catalina/connector/LocalStrings_fr.properties
b/java/org/apache/catalina/connector/LocalStrings_fr.properties
index 4520a86..468f66c 100644
--- a/java/org/apache/catalina/connector/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_fr.properties
@@ -13,6 +13,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+coyoteAdapter.accesslogFail=Exception lors d'une tentative d'ajout d'une
entrée au journal d'accès (access log)
+coyoteAdapter.asyncDispatch=Exception lors du traitement d'une requête
asynchrone
+coyoteAdapter.authenticate=L''utilisateur authentifié [{0}] a été fourni par
le connecteur
+coyoteAdapter.authorize=Autorisation de l''utilisateur [{0}] en utilisant le
Realm de Tomcat
+coyoteAdapter.checkRecycled.request=Trouvé une requête non recyclée dont le
recyclage a été forcé
+coyoteAdapter.checkRecycled.response=Trouvé une réponse non recyclée, et forcé
son recyclage
+coyoteAdapter.debug=La variable [{0}] a la valeur [{1}]
+coyoteAdapter.nullRequest=Un dispatch asynchrone peut seulement se produire
sur une requête existante
+coyoteAdapter.parsePathParam=Impossible de parser les paramètres du chemin en
utilisant l''encodage [{0}]. Les paramètres du chemin (path) dans le URL seront
ignorés.
+
coyoteConnector.cannotRegisterProtocol=Impossible d''enregistrer le MBean pour
le Protocol
coyoteConnector.protocolHandlerDestroyFailed=La destruction du gestionnaire de
protocole a échoué
coyoteConnector.protocolHandlerInitializationFailed=L''initialisation du
gestionnaire de protocole a échoué
diff --git a/java/org/apache/catalina/connector/LocalStrings_ja.properties
b/java/org/apache/catalina/connector/LocalStrings_ja.properties
index 7f7ecd7..d03828c 100644
--- a/java/org/apache/catalina/connector/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_ja.properties
@@ -13,6 +13,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+coyoteAdapter.accesslogFail=アクセスログにエントリを追加する際の例外
+coyoteAdapter.asyncDispatch=非同期リクエストの処理中の例外
+coyoteAdapter.authenticate=コネクターから認証済みユーザー [{0}] を取得しました。
+coyoteAdapter.authorize=Tomcat のRealmでユーザー [{0}] を認証します。
+coyoteAdapter.checkRecycled.request=リサイクルされていないリクエストに遭遇しました。強制的にリサイクルしました。
+coyoteAdapter.checkRecycled.response=リサイクルされていないレスポンスが発生、強制的にリサイクルされました。
+coyoteAdapter.debug=変数[{0}]に値[{1}]があります
+coyoteAdapter.nullRequest=非同期ディスパッチは、既存のリクエストでのみ発生する可能性があります
+coyoteAdapter.parsePathParam=エンコード[{0}]を使用してパスパラメータを解析できません。
URLのパスパラメータは無視されます。
+
coyoteConnector.cannotRegisterProtocol=そのプロトコルにMBeanを登録できません
coyoteConnector.protocolHandlerDestroyFailed=プロトコルハンドラの廃棄に失敗しました
coyoteConnector.protocolHandlerInitializationFailed=プロトコルハンドラの初期化に失敗しました
diff --git a/java/org/apache/catalina/connector/LocalStrings_ru.properties
b/java/org/apache/catalina/connector/LocalStrings_ru.properties
new file mode 100644
index 0000000..5f7d005
--- /dev/null
+++ b/java/org/apache/catalina/connector/LocalStrings_ru.properties
@@ -0,0 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+coyoteAdapter.debug=Переменная [{0}] имеет значение [{1}]
+coyoteAdapter.parsePathParam=Невозможно разобрать параметры пути используя
кодировку [{0}]. Параметры будут проигнорированы.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
