[tomcat] 01/02: Fix order

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 415a7380b448d6d0f1f16d542a243ed7b28501ba
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Mar 30 12:47:26 2020 +0100

    Fix order
---
 java/org/apache/coyote/ajp/LocalStrings_fr.properties    | 2 +-
 java/org/apache/coyote/ajp/LocalStrings_ko.properties    | 2 +-
 java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/coyote/ajp/LocalStrings_fr.properties 
b/java/org/apache/coyote/ajp/LocalStrings_fr.properties
index 5acecf3..c741323 100644
--- a/java/org/apache/coyote/ajp/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings_fr.properties
@@ -28,6 +28,6 @@ ajpprocessor.request.prepare=Erreur lors de la préparation de 
la requête
 ajpprocessor.request.process=Erreur de traitement de la requête
 
 ajpprotocol.noSSL=SSL n''est pas supporté par AJP, la configuration de l''hôte 
SSL pour [{0}] a été ignorée
+ajpprotocol.noSecret=Le connecteur AJP est configuré avec 
secretRequired="true" mais l'attribut secret est soit null soit "", cette 
combinaison n'est pas valide
 ajpprotocol.noUpgrade=L''upgrade n''est pas supporté par AJP.  La 
configuration UpgradeProtocol pour [{0}] a été ignorée
 ajpprotocol.noUpgradeHandler=AJP ne supporte pas la mise à niveau (upgrade) de 
HTTP/1.1, le HttpUpgradeHandler [{0}] ne peut pas être utilisé
-ajpprotocol.noSecret=Le connecteur AJP est configuré avec 
secretRequired="true" mais l'attribut secret est soit null soit "", cette 
combinaison n'est pas valide
diff --git a/java/org/apache/coyote/ajp/LocalStrings_ko.properties 
b/java/org/apache/coyote/ajp/LocalStrings_ko.properties
index b896c47..b8927d8 100644
--- a/java/org/apache/coyote/ajp/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings_ko.properties
@@ -28,6 +28,6 @@ ajpprocessor.request.prepare=요청을 준비하는 중 오류 발생
 ajpprocessor.request.process=요청 처리 중 오류 발생
 
 ajpprotocol.noSSL=AJP와 함께 SSL은 지원되지 않습니다. [{0}]을(를) 위한 SSL 호스트 설정은 무시되었습니다.
+ajpprotocol.noSecret=AJP 연결자는 secretRequired="true"로 구성되었으나 보안 속성이 널 또는 ""입니다. 
이 조합은 유효하지 않습니다.
 ajpprotocol.noUpgrade=AJP에서 프로토콜 업그레이드는 지원되지 않습니다. [{0}]을(를) 위한 
UpgradeProtocol 설정은 무시됩니다.
 ajpprotocol.noUpgradeHandler=AJP를 사용할 때, 업그레이드는 지원되지 않습니다. HttpUpgradeHandler 
[{0}]은(는) 처리될 수 없습니다.
-ajpprotocol.noSecret=AJP 연결자는 secretRequired="true"로 구성되었으나 보안 속성이 널 또는 ""입니다. 
이 조합은 유효하지 않습니다.
diff --git a/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties 
b/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties
index 244c366..a3b791e 100644
--- a/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties
@@ -23,5 +23,5 @@ ajpprocessor.readtimeout=从Socket读取数据超时
 ajpprocessor.request.prepare=准备请求错误
 ajpprocessor.request.process=处理请求错误
 
-ajpprotocol.noUpgrade=AJP 不支持升级。[{0}] 的升级协议配置被忽略。
 
ajpprotocol.noSecret=AJP连接器配置secretRequired="true",但是属性secret确实空或者空字符串，这样的组合是无效的。
+ajpprotocol.noUpgrade=AJP 不支持升级。[{0}] 的升级协议配置被忽略。


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