Clean up duplicates and unused strings

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@892198 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/manager/LocalStrings.properties b/java/org/apache/catalina/manager/LocalStrings.properties
index aadb2bd..867d3f8 100644 (file)
--- a/java/org/apache/catalina/manager/LocalStrings.properties
+++ b/java/org/apache/catalina/manager/LocalStrings.properties
@@ -64,7 +64,6 @@ managerServlet.deployed=OK - Deployed application at context path {0}
 managerServlet.deployFailed=FAIL - Failed to deploy application at context path {0}
 managerServlet.deployedButNotStarted=FAIL - Deployed application at context path {0} but context failed to start
 managerServlet.exception=FAIL - Encountered exception {0}
-managerServlet.deployed=OK - Deployed application at context path {0}
 managerServlet.invalidPath=FAIL - Invalid context path {0} was specified
 managerServlet.invalidWar=FAIL - Invalid application URL {0} was specified
 managerServlet.listed=OK - Listed applications for virtual host {0}
@@ -84,7 +83,6 @@ managerServlet.noWrapper=Container has not called setWrapper() for this servlet
 managerServlet.notDeployed=FAIL - Context {0} is defined in server.xml and may not be undeployed
 managerServlet.postCommand=FAIL - Tried to use command {0} via a GET request but POST is required
 managerServlet.reloaded=OK - Reloaded application at context path {0}
-managerServlet.undeployd=OK - Undeployed application at context path {0}
 managerServlet.resourcesAll=OK - Listed global resources of all types
 managerServlet.resourcesType=OK - Listed global resources of type {0}
 managerServlet.rolesList=OK - Listed security roles

diff --git a/java/org/apache/catalina/manager/LocalStrings_de.properties b/java/org/apache/catalina/manager/LocalStrings_de.properties
index 2eac8f3..1963ba5 100644 (file)
--- a/java/org/apache/catalina/manager/LocalStrings_de.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_de.properties
@@ -58,7 +58,6 @@ managerServlet.alreadyDocBase=FEHLER - Verzeichnis {0} bereits in Benutzung
 managerServlet.configured=OK - Anwendung von Kontext-Datei {0} installiert
 managerServlet.deployed=OK - Anwendung mit Kontext Pfad {0} installiert
 managerServlet.exception=FEHLER - Ausnahme aufgetreten {0}
-managerServlet.deployed=OK - Anwendung mit Kontext Pfad {0} installiert
 managerServlet.invalidPath=FEHLER - Ung\u00fcltiger Kontext Pfad {0} angegeben
 managerServlet.invalidWar=FEHLER - Ung\u00fcltige URL {0} f\u00fcr Anwendung angegeben
 managerServlet.listed=OK - Auflistung der Webanwendungen f\u00fcr virtuellen Server {0}
@@ -75,7 +74,6 @@ managerServlet.noRole=FEHLER - Benutzer nicht in Rolle {0}
 managerServlet.noSelf=FEHLER - Manager-Kommandos k\u00f6nnen nicht auf die Manager-Anwendung selbst angewendet werden
 managerServlet.noWrapper=Container hat setWrapper() f\u00fcr dieses Servlet nicht aufgerufen
 managerServlet.reloaded=OK - Anwendung mit Kontext Pfad {0} neu geladen
-managerServlet.undeployd=OK - Anwendung mit Kontext Pfad {0} entfernt
 managerServlet.resourcesAll=OK - Auflistung globaler Ressourcen (alle Typen)
 managerServlet.resourcesType=OK - Auflistung globaler Ressourcen von Typ {0}
 managerServlet.rolesList=OK - Auflistung der Sicherheits-Rollen

diff --git a/java/org/apache/catalina/manager/LocalStrings_es.properties b/java/org/apache/catalina/manager/LocalStrings_es.properties
index 75b72fb..0609cb7 100644 (file)
--- a/java/org/apache/catalina/manager/LocalStrings_es.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_es.properties
@@ -61,7 +61,6 @@ managerServlet.configured = OK - Desplegada aplicaci\u00F3n desde archivo de con
 managerServlet.deployed = OK - Desplegada aplicaci\u00F3n en trayectoria de contexto {0}
 managerServlet.deployFailed = FALLO - No pude desplegar la aplicaci\u00F3n en ruta de contexto {0}
 managerServlet.exception = FALLO - Encontrada excepci\u00F3n {0}
-managerServlet.deployed = OK - Aplicaci\u00F3n desplegada en ruta de contexto {0}
 managerServlet.invalidPath = FALLO - Se ha especificado una trayectoria inv\u00E1lida de contexto {0}
 managerServlet.invalidWar = FALLO - Se ha especificado una URL de aplicaci\u00F3n inv\u00E1lida {0}
 managerServlet.listed = OK - Aplicaciones listadas para m\u00E1quinda virutal {0}
@@ -80,7 +79,6 @@ managerServlet.noSelf = FALLO - El gestor no puede recargarse, replegarse, parar
 managerServlet.noWrapper = El Contenedor no ha llamado a setWrapper() para este servlet
 managerServlet.notDeployed = FALLO - El contexto {0} est\u00E1 definido en server.xml y puede que no est\u00E9 desplegado
 managerServlet.reloaded = OK - Recargada aplicaci\u00F3n en trayectoria de contexto {0}
-managerServlet.undeployd = OK - Replegada aplicaci\u00F3n en trayectoria de contexto {0}
 managerServlet.resourcesAll = OK - Listados recursos globales de todos los tipos
 managerServlet.resourcesType = OK - Listados recursos globales de tipo {0}
 managerServlet.rolesList = OK - Listados papeles de seguridad

diff --git a/java/org/apache/catalina/manager/LocalStrings_fr.properties b/java/org/apache/catalina/manager/LocalStrings_fr.properties
index 7a345da..dd9ca1a 100644 (file)
--- a/java/org/apache/catalina/manager/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_fr.properties
@@ -62,7 +62,6 @@ managerServlet.deployed=OK - Application d\u00e9ploy\u00e9e pour le chemin de co
 managerServlet.deployFailed=ECHEC - Echec au d\u00e9ploiement de l''application pour le chemin de contexte {0}
 managerServlet.deployedButNotStarted=ECHEC - Application d\u00e9ploy\u00e9e pour le chemin de contexte {0} mais le d\u00e9marrage du contexte a \u00e9chou\u00e9
 managerServlet.exception=ECHEC - L''exception {0} a \u00e9t\u00e9 rencontr\u00e9e
-managerServlet.deployed=OK - Application install\u00e9e pour le chemin de contexte {0}
 managerServlet.invalidPath=ECHEC - Un chemin de contexte invalide {0} a \u00e9t\u00e9 sp\u00e9cifi\u00e9
 managerServlet.invalidWar=ECHEC - Une URL d''application invalide {0} a \u00e9t\u00e9 sp\u00e9cifi\u00e9e
 managerServlet.listed=OK - Applications list\u00e9es pour l''h\u00f4te virtuel (virtual host) {0}
@@ -81,7 +80,6 @@ managerServlet.noSelf=ECHEC - Le gestionnaire ne peut recharger, retirer, arr\u0
 managerServlet.noWrapper=Le conteneur n''a pas appel\u00e9 "setWrapper()" pour cette servlet
 managerServlet.notDeployed=ECHEC - Le contexte {0} est d\u00e9fini dans server.xml et ne peut \u00eatre retir\u00e9
 managerServlet.reloaded=OK - Application associ\u00e9 au chemin de contexte {0} a \u00e9t\u00e9 recharg\u00e9e
-managerServlet.undeployd=OK - Application associ\u00e9 au chemin de contexte {0} a \u00e9t\u00e9 retir\u00e9e
 managerServlet.resourcesAll=OK - Liste des ressources globales de tout type
 managerServlet.resourcesType=OK - Liste des ressources globales de type {0}
 managerServlet.rolesList=OK - Liste de r\u00f4les de securit\u00e9
@@ -94,7 +92,7 @@ managerServlet.sessions=OK - Information de session pour l''application au chemi
 managerServlet.started=OK - Application d\u00e9marr\u00e9e pour le chemin de contexte {0}
 managerServlet.startFailed=ECHEC - L''application pour le chemin de contexte {0} n''a pas pu \u00eatre d\u00e9marr\u00e9e
 managerServlet.stopped=OK - Application arr\u00eat\u00e9e pour le chemin de contexte {0}
-managerServlet.undeployed=OK - Application retir\u00e9e pour le chemin de contexte {0}
+managerServlet.undeployed=OK - Application associ\u00e9 au chemin de contexte {0} a \u00e9t\u00e9 retir\u00e9e
 managerServlet.startFailed=ECHEC - L''application pour le chemin de contexte {0} n''a pas pu\u00eatred\u00e9marr\u00e9e
 managerServlet.stopped=OK - Application arr\u00eat\u00e9e pour le chemin de contexte {0}
 managerServlet.undeployed=OK - Application non-d\u00e9ploy\u00e9e pour le chemin de contexte {0}

diff --git a/java/org/apache/catalina/manager/LocalStrings_ja.properties b/java/org/apache/catalina/manager/LocalStrings_ja.properties
index 23711d1..3e496f6 100644 (file)
--- a/java/org/apache/catalina/manager/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_ja.properties
@@ -56,7 +56,6 @@ managerServlet.cannotInvoke=\u30a4\u30f3\u30dc\u30fc\u30ab\u3067\u30de\u30cd\u30
 managerServlet.configured=OK - \u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d5\u30a1\u30a4\u30eb {0} \u304b\u3089\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057\u307e\u3057\u305f
 managerServlet.deployed=OK - \u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 {0} \u3067\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u914d\u5099\u3057\u307e\u3057\u305f
 managerServlet.exception=FAIL - \u4f8b\u5916 {0} \u304c\u767a\u751f\u3057\u307e\u3057\u305f
-managerServlet.deployed=OK - \u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 {0} \u306b\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057\u307e\u3057\u305f
 managerServlet.invalidPath=FAIL - \u7121\u52b9\u306a\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 {0} \u304c\u6307\u5b9a\u3055\u308c\u307e\u3057\u305f
 managerServlet.invalidWar=FAIL - \u7121\u52b9\u306a\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306eURL {0} \u304c\u6307\u5b9a\u3055\u308c\u307e\u3057\u305f
 managerServlet.listed=OK - \u30d0\u30fc\u30c1\u30e3\u30eb\u30db\u30b9\u30c8 {0} \u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u4e00\u89a7\u3067\u3059
@@ -73,7 +72,6 @@ managerServlet.noRole=FAIL - \u30e6\u30fc\u30b6\u306f\u30ed\u30fc\u30eb {0} \u30
 managerServlet.noSelf=FAIL - \u30de\u30cd\u30fc\u30b8\u30e3\u81ea\u8eab\u3092\u518d\u30ed\u30fc\u30c9\u3001\u524a\u9664\u3001\u505c\u6b62\u3001\u53c8\u306f\u914d\u5099\u89e3\u9664\u3067\u304d\u307e\u305b\u3093
 managerServlet.noWrapper=\u30b3\u30f3\u30c6\u30ca\u306f\u3053\u306e\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u306b\u5bfe\u3057\u3066\u547c\u3073\u51fa\u3055\u308c\u305fsetWrapper()\u3092\u6301\u3063\u3066\u3044\u307e\u305b\u3093
 managerServlet.reloaded=OK - \u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 {0} \u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u518d\u30ed\u30fc\u30c9\u3057\u307e\u3057\u305f
-managerServlet.undeployd=OK - \u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 {0} \u304b\u3089\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u914d\u5099\u89e3\u9664\u3057\u307e\u3057\u305f
 managerServlet.resourcesAll=OK - \u3059\u3079\u3066\u306e\u30bf\u30a4\u30d7\u306e\u30b0\u30ed\u30fc\u30d0\u30eb\u30ea\u30bd\u30fc\u30b9\u3092\u5217\u6319\u3057\u307e\u3057\u305f
 managerServlet.resourcesType=OK - \u30bf\u30a4\u30d7 {0} \u306e\u30b0\u30ed\u30fc\u30d0\u30eb\u30ea\u30bd\u30fc\u30b9\u3092\u5217\u6319\u3057\u307e\u3057\u305f
 managerServlet.rolesList=OK - \u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30ed\u30fc\u30eb\u3092\u5217\u6319\u3057\u307e\u3057\u305f