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 12:00:18 UTC
[tomcat] branch 8.5.x updated (f12339c -> f0976b0)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from f12339c Ensure Windows signing uses sha256 hash
new e50d45a Backport French translations
new 1d44d30 Back-port Korean translations
new 8d299fa Backport improvements to Russian translations
new f0976b0 Back-port updates to Chinese translations
The 4 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/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 +-
java/org/apache/catalina/valves/LocalStrings_fr.properties | 1 +
java/org/apache/catalina/valves/LocalStrings_ko.properties | 1 +
.../apache/{catalina/ha/tcp => coyote}/LocalStrings_ru.properties | 2 +-
java/org/apache/coyote/http2/LocalStrings_ru.properties | 1 +
java/org/apache/jasper/resources/LocalStrings_ru.properties | 4 ++++
.../{coyote/http11/upgrade => naming}/LocalStrings_ru.properties | 2 +-
java/org/apache/tomcat/util/LocalStrings_ru.properties | 2 +-
.../tcp => tomcat/util/descriptor/web}/LocalStrings_ru.properties | 2 +-
.../util/http/parser/LocalStrings_ru.properties} | 1 +
java/org/apache/tomcat/util/net/LocalStrings_ru.properties | 2 +-
java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties | 3 +++
webapps/docs/changelog.xml | 7 ++++++-
17 files changed, 31 insertions(+), 10 deletions(-)
copy java/org/apache/{catalina/ha/tcp => coyote}/LocalStrings_ru.properties (85%)
copy java/org/apache/{coyote/http11/upgrade => naming}/LocalStrings_ru.properties (90%)
copy java/org/apache/{catalina/ha/tcp => tomcat/util/descriptor/web}/LocalStrings_ru.properties (87%)
copy java/org/apache/{catalina/core/RestrictedListeners.properties => tomcat/util/http/parser/LocalStrings_ru.properties} (94%)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 03/04: Backport 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 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 8d299fa514e465169cecb6418982c06ccc31e01c
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jan 26 11:58:16 2021 +0000
Backport 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, 24 insertions(+), 10 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 0cd21dd..237ca9a 100644
--- a/java/org/apache/catalina/manager/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_ru.properties
@@ -117,7 +117,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}]
@@ -157,7 +157,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 42f5afb..2bcce2f 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_ru.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_ru.properties
@@ -19,4 +19,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 a06b0c1..88d3b8e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -239,6 +239,10 @@
<update>
Update to Commons Daemon 1.2.4. (markt)
</update>
+ <add>
+ Improvements to Russian translations. Provided by Polina and Azat.
+ (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] 02/04: Back-port 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 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 1d44d30321bedc11e80553a2a0e87eec714ba044
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jan 26 11:57:42 2021 +0000
Back-port Korean translations
---
java/org/apache/catalina/valves/LocalStrings_ko.properties | 1 +
1 file changed, 1 insertion(+)
diff --git a/java/org/apache/catalina/valves/LocalStrings_ko.properties b/java/org/apache/catalina/valves/LocalStrings_ko.properties
index 48a04ed..bd8918f 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}](으)로 이름을 변경하지 못했습니다.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 04/04: Back-port updates 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 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit f0976b0279f1ecd6d4409ebab58fc2fef6b48236
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jan 26 11:59:35 2021 +0000
Back-port updates 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 00a8524..08ab3df 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
@@ -131,6 +131,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 88d3b8e..5f2734d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -209,7 +209,8 @@
<subsection name="Other">
<changelog>
<add>
- Improvements to Chinese translations. Provided by leeyazhou. (markt)
+ Improvements to Chinese translations. Provided by leeyazhou and 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] 01/04: Backport 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 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit e50d45a56c6b371f74870ffc48059b5a0ffe0ede
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jan 26 11:57:21 2021 +0000
Backport French translations
---
java/org/apache/catalina/valves/LocalStrings_fr.properties | 1 +
1 file changed, 1 insertion(+)
diff --git a/java/org/apache/catalina/valves/LocalStrings_fr.properties b/java/org/apache/catalina/valves/LocalStrings_fr.properties
index 1c56a74..bafd479 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}]
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org