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 1066162b5b997e52f468cd11927141d009ea9438
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Aug 15 16:19:19 2019 +0100
Additions and corrections to the Russian i18n messages
---
.../catalina/core/LocalStrings_ru.properties | 19 +++++++++++++++++++
.../catalina/ha/deploy/LocalStrings_ru.properties | 18 ++++++++++++++++++
.../catalina/loader/LocalStrings_ru.properties | 16 ++++++++++++++++
.../catalina/manager/LocalStrings_ru.properties | 2 +-
.../catalina/realm/LocalStrings_ru.properties | 18 ++++++++++++++++++
.../catalina/startup/LocalStrings_ru.properties | 22 ++++++++++++++++++++++
.../catalina/util/LocalStrings_ru.properties | 16 ++++++++++++++++
.../catalina/valves/LocalStrings_ru.properties | 21 +++++++++++++++++++++
.../coyote/http11/LocalStrings_ru.properties | 16 ++++++++++++++++
.../jasper/resources/LocalStrings_ru.properties | 22 ++++++++++++++++++++++
.../apache/tomcat/util/LocalStrings_ru.properties | 16 ++++++++++++++++
.../tomcat/util/http/LocalStrings_ru.properties | 16 ++++++++++++++++
.../tomcat/websocket/LocalStrings_ru.properties | 20 ++++++++++++++++++++
webapps/docs/changelog.xml | 4 ++++
.../WEB-INF/classes/LocalStrings_ru.properties | 16 ++++++++++++++++
15 files changed, 241 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/core/LocalStrings_ru.properties
b/java/org/apache/catalina/core/LocalStrings_ru.properties
new file mode 100644
index 0000000..14414b4
--- /dev/null
+++ b/java/org/apache/catalina/core/LocalStrings_ru.properties
@@ -0,0 +1,19 @@
+# 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.
+
+applicationContext.addListener.iae.cnfe=Невозможно создать экземпляр типа [{0}]
+applicationContext.setAttribute.namenull=Имя не может быть пустым
+
+standardWrapper.isUnavailable=Сервлет [{0}] временно недоступен
diff --git a/java/org/apache/catalina/ha/deploy/LocalStrings_ru.properties
b/java/org/apache/catalina/ha/deploy/LocalStrings_ru.properties
new file mode 100644
index 0000000..113715a
--- /dev/null
+++ b/java/org/apache/catalina/ha/deploy/LocalStrings_ru.properties
@@ -0,0 +1,18 @@
+# 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.
+
+farmWarDeployer.modInstall=Установка веб приложения [{0}] из [{1}]
+
+warWatcher.checkingWar=Проверяем WAR файл [{}]
diff --git a/java/org/apache/catalina/loader/LocalStrings_ru.properties
b/java/org/apache/catalina/loader/LocalStrings_ru.properties
new file mode 100644
index 0000000..a851ce0
--- /dev/null
+++ b/java/org/apache/catalina/loader/LocalStrings_ru.properties
@@ -0,0 +1,16 @@
+# 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.
+
+webappClassLoader.checkThreadLocalsForLeaks.unknown=Неизвестно
diff --git a/java/org/apache/catalina/manager/LocalStrings_ru.properties
b/java/org/apache/catalina/manager/LocalStrings_ru.properties
index db7ce89..f742471 100644
--- a/java/org/apache/catalina/manager/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_ru.properties
@@ -152,7 +152,7 @@ managerServlet.sessiondefaultmax=Стандартный максимальный
managerServlet.sessions=OK - Информация о сеансах приложения по пути контекста
[{0}]
managerServlet.sessiontimeout=Неактивные [{0}] минут: [{1}] сеанс(ов)
managerServlet.sessiontimeout.expired=Неактивные [{0}] минут: [{1}] сеанс(ов)
были завершены
-managerServlet.sessiontimeout.unlimited=Неограниченное время: [{0}] сеанс(ов)
+managerServlet.sessiontimeout.unlimited=Неограниченное время: [{0}] сеансов
managerServlet.sslConnectorCerts=OK - Информация о цепочке сертификатов
managerServlet.sslConnectorCiphers=OK - Информация о шифровании SSL
managerServlet.sslConnectorTrustedCerts=OK - Информация о доверенном
сертификате безопасности
diff --git a/java/org/apache/catalina/realm/LocalStrings_ru.properties
b/java/org/apache/catalina/realm/LocalStrings_ru.properties
new file mode 100644
index 0000000..7e9601c
--- /dev/null
+++ b/java/org/apache/catalina/realm/LocalStrings_ru.properties
@@ -0,0 +1,18 @@
+# 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.
+
+lockOutRealm.authLockedUser=Заблокированный пользователь [{0}] совершил
попытку авторизоваться
+
+realmBase.forbidden=Доступ к запрашиваемому ресурсу был заблокирован
diff --git a/java/org/apache/catalina/startup/LocalStrings_ru.properties
b/java/org/apache/catalina/startup/LocalStrings_ru.properties
new file mode 100644
index 0000000..7a537a8
--- /dev/null
+++ b/java/org/apache/catalina/startup/LocalStrings_ru.properties
@@ -0,0 +1,22 @@
+# 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.
+
+catalina.serverStartFail=Томкат не смог запуститься из-за того что
обязательный компонент не смог запуститься
+
+contextConfig.defaultPosition=Произошло в строке [{0}] столбце [{1}]
+
+hostConfig.deployDir=Установка веб приложения в папку [{0}]
+
+userConfig.database=Ошибка при загрузке базы данных пользователей
diff --git a/java/org/apache/catalina/util/LocalStrings_ru.properties
b/java/org/apache/catalina/util/LocalStrings_ru.properties
new file mode 100644
index 0000000..e969e51
--- /dev/null
+++ b/java/org/apache/catalina/util/LocalStrings_ru.properties
@@ -0,0 +1,16 @@
+# 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.
+
+introspection.classLoadFailed=Не возможно закрузить класс [{0}]
diff --git a/java/org/apache/catalina/valves/LocalStrings_ru.properties
b/java/org/apache/catalina/valves/LocalStrings_ru.properties
new file mode 100644
index 0000000..ebffdf1
--- /dev/null
+++ b/java/org/apache/catalina/valves/LocalStrings_ru.properties
@@ -0,0 +1,21 @@
+# 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.
+
+http.403.desc=Сервер получил запрос, но отказался его авторизовать.
+http.404.reason=Не найдено
+http.423.reason=Заблокирован
+http.426.reason=Требуется обновление
+http.429.reason=Слишком много запросов
+http.511.desc=Клиенты должны пройти аутентификацию для получения доступа к
сети.
diff --git a/java/org/apache/coyote/http11/LocalStrings_ru.properties
b/java/org/apache/coyote/http11/LocalStrings_ru.properties
new file mode 100644
index 0000000..856c26b
--- /dev/null
+++ b/java/org/apache/coyote/http11/LocalStrings_ru.properties
@@ -0,0 +1,16 @@
+# 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.
+
+http11processor.request.process=Ошибка при обработке запроса
diff --git a/java/org/apache/jasper/resources/LocalStrings_ru.properties
b/java/org/apache/jasper/resources/LocalStrings_ru.properties
new file mode 100644
index 0000000..696a4e8
--- /dev/null
+++ b/java/org/apache/jasper/resources/LocalStrings_ru.properties
@@ -0,0 +1,22 @@
+# 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.
+
+jsp.error.attribute.deferredmix=Невозможно использовать одновременно ${} и #{}
EL выражения в значении атрибута
+jsp.error.attribute.noequal=Необходим символ равенства
+jsp.error.data.file.processing=Ошибка при обработке файла [{0}]
+jsp.error.outputfolder=Не указана выходная папка
+jsp.error.parse.xml=XML файл [{0}] содержит ошибки
+jsp.error.unknown_attribute_type=Неизвестный тип [{1}] для атрибута [{0}]
+jsp.exception=Произошла ошибка при обработке [{0}] в строке [{1}]
diff --git a/java/org/apache/tomcat/util/LocalStrings_ru.properties
b/java/org/apache/tomcat/util/LocalStrings_ru.properties
new file mode 100644
index 0000000..535f393
--- /dev/null
+++ b/java/org/apache/tomcat/util/LocalStrings_ru.properties
@@ -0,0 +1,16 @@
+# 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.
+
+diagnostics.threadDumpTitle=Сброс полной нити
diff --git a/java/org/apache/tomcat/util/http/LocalStrings_ru.properties
b/java/org/apache/tomcat/util/http/LocalStrings_ru.properties
new file mode 100644
index 0000000..e9b5d51
--- /dev/null
+++ b/java/org/apache/tomcat/util/http/LocalStrings_ru.properties
@@ -0,0 +1,16 @@
+# 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.
+
+parameters.copyFail=Невозможно создать копию оригинальных значений параметров
для логгирования
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_ru.properties
b/java/org/apache/tomcat/websocket/LocalStrings_ru.properties
new file mode 100644
index 0000000..5f90282
--- /dev/null
+++ b/java/org/apache/tomcat/websocket/LocalStrings_ru.properties
@@ -0,0 +1,20 @@
+# 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.
+
+caseInsensitiveKeyMap.nullKey=Пустое значение ключей запрещено
+
+wsHandshakeRequest.invalidUri=Строка [{0}] не может быть использована для
создания корректного URI
+
+wsSession.doClose=Закрытие WebSocket сессии [{1}]
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c1c1ca7..b749b64 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -172,6 +172,10 @@
Back-port various corrections and improvements to the Japanese i18n
messages. (markt)
</fix>
+ <fix>
+ Back-port various corrections and improvements to the Russian i18n
+ messages. (markt)
+ </fix>
</changelog>
</subsection>
</section>
diff --git a/webapps/examples/WEB-INF/classes/LocalStrings_ru.properties
b/webapps/examples/WEB-INF/classes/LocalStrings_ru.properties
new file mode 100644
index 0000000..7dba9f4
--- /dev/null
+++ b/webapps/examples/WEB-INF/classes/LocalStrings_ru.properties
@@ -0,0 +1,16 @@
+# 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.
+
+requestparams.title=Пример параметров запроса
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
