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 2019/07/01 20:19:54 UTC
[tomcat] 02/02: Align with 8.5.x. Remove unused keys,
update/add translations
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 07b0f952b4d5cd5db10780bff1c78c2d8f03577a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jul 1 09:23:44 2019 +0100
Align with 8.5.x. Remove unused keys, update/add translations
---
java/org/apache/catalina/servlets/DefaultServlet.java | 4 ++--
.../apache/catalina/servlets/LocalStrings.properties | 17 ++++++-----------
.../catalina/servlets/LocalStrings_es.properties | 17 ++++++-----------
.../catalina/servlets/LocalStrings_fr.properties | 18 ++++++++++--------
.../catalina/servlets/LocalStrings_ja.properties | 15 ++++++++-------
5 files changed, 32 insertions(+), 39 deletions(-)
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java b/java/org/apache/catalina/servlets/DefaultServlet.java
index 8171ac0..6821f66 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -337,7 +337,7 @@ public class DefaultServlet extends HttpServlet {
}
if (resources == null) {
- throw new UnavailableException("No resources");
+ throw new UnavailableException(sm.getString("defaultServlet.noResources"));
}
if (getServletConfig().getInitParameter("showServerInfo") != null) {
@@ -2328,7 +2328,7 @@ public class DefaultServlet extends HttpServlet {
return e;
}
if (skipped < start) {
- return new IOException(sm.getString("defaultservlet.skipfail",
+ return new IOException(sm.getString("defaultServlet.skipfail",
Long.valueOf(skipped), Long.valueOf(start)));
}
diff --git a/java/org/apache/catalina/servlets/LocalStrings.properties b/java/org/apache/catalina/servlets/LocalStrings.properties
index ff2eff7..22adaa8 100644
--- a/java/org/apache/catalina/servlets/LocalStrings.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings.properties
@@ -38,20 +38,15 @@ cgiServlet.runStdErrFail=I/O problems with stderr
defaultServlet.blockExternalEntity=Blocked access to external entity with publicId [{0}] and systemId [{0}]
defaultServlet.blockExternalEntity2=Blocked access to external entity with name [{0}], publicId [{1}], baseURI [{2}] and systemId [{3}]
defaultServlet.blockExternalSubset=Blocked access to external subset with name [{0}] and baseURI [{1}]
-defaultServlet.missingResource=The requested resource ({0}) is not available
-
-defaultservlet.directorylistingfor=Directory Listing for:
-defaultservlet.files=Files:
-defaultservlet.skipfail=Only skipped [{0}] bytes when [{1}] were requested
-defaultservlet.subdirectories=Subdirectories:
-defaultservlet.upto=Up to:
+defaultServlet.missingResource=The requested resource [{0}] is not available
+defaultServlet.noResources=No static resources were found
+defaultServlet.skipfail=Read failed because only [{0}] bytes were available but needed to skip [{1}] bytes to reach the start of the requested range
directory.filename=Filename
directory.lastModified=Last Modified
-directory.parent=Up To {0}
+directory.parent=Up To [{0}]
directory.size=Size
-directory.title=Directory Listing For {0}
-directory.version=Tomcat Catalina version 4.0
+directory.title=Directory Listing For [{0}]
-webdavservlet.enternalEntityIgnored=The request included a reference to an external entity with PublicID {0} and SystemID {1} which was ignored
+webdavservlet.enternalEntityIgnored=The request included a reference to an external entity with PublicID [{0}] and SystemID [{1}] which was ignored
webdavservlet.jaxpfailed=JAXP initialization failed
diff --git a/java/org/apache/catalina/servlets/LocalStrings_es.properties b/java/org/apache/catalina/servlets/LocalStrings_es.properties
index af9bceb..c96df05 100644
--- a/java/org/apache/catalina/servlets/LocalStrings_es.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings_es.properties
@@ -22,20 +22,15 @@ cgiServlet.runOutputStreamFail=Errores I/O cerrando el flujo de salida
cgiServlet.runReaderInterrupt=Detenido esperando por el hilo lector stderr
cgiServlet.runStdErrFail=Problemas de I/O con stderr
-defaultServlet.missingResource=El recurso requerido {0} no se encuentra disponible
-
-defaultservlet.directorylistingfor=Listado de Directorio para:
-defaultservlet.files=Ficheros:
-defaultservlet.skipfail=Sólo se han saltado [{0}] cuando se requirieron [{1}]
-defaultservlet.subdirectories=Subdirectorios:
-defaultservlet.upto=Atrás a:
+defaultServlet.blockExternalSubset=Se bloqueó el acceso al subconjunt externo con nombre [{0}] y URI base [{1}]\n
+defaultServlet.missingResource=El recurso requerido [{0}] no se encuentra disponible
+defaultServlet.skipfail=Sólo se han saltado [{0}] cuando se requirieron [{1}]
directory.filename=Nombre de Fichero:
directory.lastModified=Última Modificación
-directory.parent=Atrás A {0}
+directory.parent=Atrás A [{0}]
directory.size=Medida
-directory.title=Listado de Directorio Para {0}
-directory.version=Tomcat Catalina versión 4.0
+directory.title=Listado de Directorio Para [{0}]
-webdavservlet.enternalEntityIgnored=El requerimiento incluía una referencia a una entidad externa con PublicID {0} y SystemID {1} que fue ignorada
+webdavservlet.enternalEntityIgnored=El requerimiento incluía una referencia a una entidad externa con PublicID [{0}] y SystemID [{1}] que fue ignorada
webdavservlet.jaxpfailed=Falló la inicialización de JAXP
diff --git a/java/org/apache/catalina/servlets/LocalStrings_fr.properties b/java/org/apache/catalina/servlets/LocalStrings_fr.properties
index fba2435..4ee5781 100644
--- a/java/org/apache/catalina/servlets/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings_fr.properties
@@ -35,16 +35,18 @@ cgiServlet.runStdErr=ligne stderr: [{0}]
cgiServlet.runStdErrCount=Reçues [{0}] lignes sur le stderr
cgiServlet.runStdErrFail=Problème d'entrée sortie pour le stderr
-defaultservlet.directorylistingfor=Liste du répertoire pour :
-defaultservlet.files=Fichiers:
-defaultservlet.subdirectories=Sous-répertoires:
-defaultservlet.upto=Jusqu''à:
+defaultServlet.blockExternalEntity=L''accès aux entités externes avec le publicId [{0}] et le systemId [{1}] est bloqué
+defaultServlet.blockExternalEntity2=L''accès à l''entité externe nommée [{0}], publicId [{1}], baseURI [{2}], systemId [{3}] a été bloqué
+defaultServlet.blockExternalSubset=L''accès au sous-ensemble externe de nom [{0}] et de baseURI [{1}] a été bloqué
+defaultServlet.missingResource=La ressource demandée [{0}] n''est pas disponible
+defaultServlet.noResources=Pas de ressources statiques
+defaultServlet.skipfail=La lecture a échouée parce que seuls [{0}] octets étaient disponibles alors qu''il était nécessaire d''en sauter [{1}] pour atteindre le début de la plage demandée
directory.filename=Nom de fichier
directory.lastModified=Dernière modification
-directory.parent=Jusqu''à {0}
+directory.parent=Jusqu''à [{0}]
directory.size=Taille
-directory.title=Liste du répertoire pour {0}
-directory.version=Tomcat Catalina version 4.0
+directory.title=Liste du répertoire pour [{0}]
-webdavservlet.jaxpfailed=Erreur d''initialisation de JAXP
+webdavservlet.enternalEntityIgnored=La requête a inclus une référence à une entité externe avec publicId [{0}] et systemId [{1}] qui a été ignorée
+webdavservlet.jaxpfailed=Erreur d'initialisation de JAXP
diff --git a/java/org/apache/catalina/servlets/LocalStrings_ja.properties b/java/org/apache/catalina/servlets/LocalStrings_ja.properties
index 85ad7c0..7105faf 100644
--- a/java/org/apache/catalina/servlets/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings_ja.properties
@@ -33,16 +33,17 @@ cgiServlet.runStdErr=標準エラー 行：[{0}]
cgiServlet.runStdErrCount=stderrの[{0}]行を受信しました。
cgiServlet.runStdErrFail=stderrでI/O問題
-defaultservlet.directorylistingfor=ディレクトリの一覧:
-defaultservlet.files=ファイル:
-defaultservlet.subdirectories=サブディレクトリ:
-defaultservlet.upto=親ディレクトリ:
+defaultServlet.blockExternalEntity=publicId [{0}]およびsystemId [{0}]を持つ外部エンティティへのブロックされたアクセス
+defaultServlet.blockExternalEntity2=外部エンティティへのアクセスを抑止しました。エンティティ名 [{0}]、publicId [{1}]、ベースURI [{2}]、systemId [{3}]
+defaultServlet.blockExternalSubset=名前[{0}]およびベースURI [{1}]を持つ外部サブセットへのブロックされたアクセス
+defaultServlet.missingResource=要求されたリソース [{0}] は利用できません。
+defaultServlet.noResources=静的リソースが見つかりません。
+defaultServlet.skipfail=[{0}]バイトしか利用できなかったため、[{1}]バイトをスキップして要求された範囲の先頭に到達する必要があったため、読み取りに失敗しました。
directory.filename=ファイル名
directory.lastModified=最終更新
-directory.parent={0} に移動
+directory.parent=[{0}] に移動
directory.size=サイズ
-directory.title={0} のディレクトリの一覧
-directory.version=Tomcat Catalina バージョン 4.0
+directory.title=[{0}] のディレクトリの一覧
webdavservlet.jaxpfailed=JAXPの初期化に失敗しました
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org