svn commit: r1853349 [1/2] - in /tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager: ./ host/

Mon, 11 Feb 2019 04:04:16 -0800 

Author: kkolinko
Date: Mon Feb 11 12:04:07 2019
New Revision: 1853349

URL: http://svn.apache.org/viewvc?rev=1853349&view=rev
Log:
Sort translation keys for Manager and Host Manager applications in alphabetic 
order.

Modified:
    
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties
    
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties
    
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties
    
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties
    
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_ja.properties
    
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties
    
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties
    
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/LocalStrings_es.properties
    
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/LocalStrings_ru.properties

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties?rev=1853349&r1=1853348&r2=1853349&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties 
Mon Feb 11 12:04:07 2019
@@ -14,24 +14,36 @@
 # limitations under the License.
 
 htmlManagerServlet.appsAvailable=Running
+htmlManagerServlet.appsExpire=Expire sessions
 htmlManagerServlet.appsName=Display Name
 htmlManagerServlet.appsPath=Path
 htmlManagerServlet.appsReload=Reload
-htmlManagerServlet.appsUndeploy=Undeploy
-htmlManagerServlet.appsVersion=Version
-htmlManagerServlet.appsExpire=Expire sessions
 htmlManagerServlet.appsSessions=Sessions
 htmlManagerServlet.appsStart=Start
 htmlManagerServlet.appsStop=Stop
 htmlManagerServlet.appsTasks=Commands
 htmlManagerServlet.appsTitle=Applications
-htmlManagerServlet.noVersion=None specified
-htmlManagerServlet.expire.explain=with idle ≥
-htmlManagerServlet.expire.unit=minutes
-htmlManagerServlet.helpHtmlManager=HTML Manager Help
-htmlManagerServlet.helpHtmlManagerFile=../docs/html-manager-howto.html
-htmlManagerServlet.helpManager=Manager Help
-htmlManagerServlet.helpManagerFile=../docs/manager-howto.html
+htmlManagerServlet.appsUndeploy=Undeploy
+htmlManagerServlet.appsVersion=Version
+htmlManagerServlet.connectorStateAliveSocketCount=Keep alive sockets count:
+htmlManagerServlet.connectorStateBytesRecieved=Bytes received:
+htmlManagerServlet.connectorStateBytesSent=Bytes sent:
+htmlManagerServlet.connectorStateErrorCount=Error count:
+htmlManagerServlet.connectorStateHint=P: Parse and prepare request S: Service 
F: Finishing R: Ready K: Keepalive
+htmlManagerServlet.connectorStateMaxProcessingTime=Max processing time:
+htmlManagerServlet.connectorStateMaxThreads=Max threads:
+htmlManagerServlet.connectorStateProcessingTime=Processing time:
+htmlManagerServlet.connectorStateRequestCount=Request count:
+htmlManagerServlet.connectorStateTableTitleBRecv=B Recv
+htmlManagerServlet.connectorStateTableTitleBSent=B Sent
+htmlManagerServlet.connectorStateTableTitleClientAct=Client (Actual)
+htmlManagerServlet.connectorStateTableTitleClientForw=Client (Forwarded)
+htmlManagerServlet.connectorStateTableTitleRequest=Request
+htmlManagerServlet.connectorStateTableTitleStage=Stage
+htmlManagerServlet.connectorStateTableTitleTime=Time
+htmlManagerServlet.connectorStateTableTitleVHost=VHost
+htmlManagerServlet.connectorStateThreadBusy=Current thread busy:
+htmlManagerServlet.connectorStateThreadCount=Current thread count:
 htmlManagerServlet.deployButton=Deploy
 htmlManagerServlet.deployConfig=XML Configuration file URL:
 htmlManagerServlet.deployPath=Context Path (required):
@@ -41,23 +53,46 @@ htmlManagerServlet.deployUpload=WAR file
 htmlManagerServlet.deployUploadFail=FAIL - Deploy Upload Failed, Exception: {0}
 htmlManagerServlet.deployUploadFile=Select WAR file to upload
 htmlManagerServlet.deployUploadInServerXml=FAIL - War file \"{0}\" cannot be 
uploaded if context is defined in server.xml
-htmlManagerServlet.deployUploadNotWar=FAIL - File uploaded \"{0}\" must be a 
.war
 htmlManagerServlet.deployUploadNoFile=FAIL - File upload failed, no file
+htmlManagerServlet.deployUploadNotWar=FAIL - File uploaded \"{0}\" must be a 
.war
 htmlManagerServlet.deployUploadWarExists=FAIL - War file \"{0}\" already 
exists on server
 htmlManagerServlet.deployWar=WAR or Directory URL:
 htmlManagerServlet.diagnosticsLeak=Check to see if a web application has 
caused a memory leak on stop, reload or undeploy
 htmlManagerServlet.diagnosticsLeakButton=Find leaks
 htmlManagerServlet.diagnosticsLeakWarning=This diagnostic check will trigger a 
full garbage collection. Use it with extreme caution on production systems.
 htmlManagerServlet.diagnosticsTitle=Diagnostics
+htmlManagerServlet.expire.explain=with idle ≥
+htmlManagerServlet.expire.unit=minutes
 htmlManagerServlet.findleaksList=\
   The following web applications were stopped (reloaded, undeployed), but 
their\n\
   classes from previous runs are still loaded in memory, thus causing a 
memory\n\
   leak (use a profiler to confirm):\n
 htmlManagerServlet.findleaksNone=No web applications appear to have triggered 
a memory leak on stop, reload or undeploy.
+htmlManagerServlet.helpHtmlManager=HTML Manager Help
+htmlManagerServlet.helpHtmlManagerFile=../docs/html-manager-howto.html
+htmlManagerServlet.helpManager=Manager Help
+htmlManagerServlet.helpManagerFile=../docs/manager-howto.html
+htmlManagerServlet.jvmFreeMemory=Free Memory:
+htmlManagerServlet.jvmMaxMemory=Max Memory:
+htmlManagerServlet.jvmTableTitleInitial=Initial
+htmlManagerServlet.jvmTableTitleMaximum=Maximum
+htmlManagerServlet.jvmTableTitleMemoryPool=Memory Pool
+htmlManagerServlet.jvmTableTitleTotal=Total
+htmlManagerServlet.jvmTableTitleType=Type
+htmlManagerServlet.jvmTableTitleUsed=Used
+htmlManagerServlet.jvmTotalMemory=Total Memory:
 htmlManagerServlet.list=List Applications
 htmlManagerServlet.manager=Manager
 htmlManagerServlet.messageLabel=Message:
 htmlManagerServlet.noManager=-
+htmlManagerServlet.noVersion=None specified
+htmlManagerServlet.osAvailableMemory=Available memory:
+htmlManagerServlet.osFreePageFile=Free page file:
+htmlManagerServlet.osKernelTime=Process kernel time:
+htmlManagerServlet.osMemoryLoad=Memory load:
+htmlManagerServlet.osPhysicalMemory=Physical memory:
+htmlManagerServlet.osTotalPageFile=Total page file:
+htmlManagerServlet.osUserTime=Process user time:
 htmlManagerServlet.serverHostname=Hostname
 htmlManagerServlet.serverIPAddress=IP Address
 htmlManagerServlet.serverJVMVendor=JVM Vendor
@@ -68,13 +103,14 @@ htmlManagerServlet.serverOSVersion=OS Ve
 htmlManagerServlet.serverTitle=Server Information
 htmlManagerServlet.serverVersion=Tomcat Version
 htmlManagerServlet.title=Tomcat Web Application Manager
+
 managerServlet.alreadyContext=FAIL - Application already exists at path {0}
 managerServlet.alreadyDocBase=FAIL - Directory {0} is already in use
 managerServlet.configured=OK - Deployed application from context file {0}
 managerServlet.deleteFail=FAIL - Unable to delete [{0}]. The continued 
presence of this file may cause problems.
 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.deployFailed=FAIL - Failed to deploy application at context 
path {0}
 managerServlet.exception=FAIL - Encountered exception {0}
 managerServlet.findleaksFail=FAIL - Find leaks failed: Host not instance of 
StandardHost
 managerServlet.findleaksList=OK - Found potential memory leaks in the 
following applications:
@@ -97,21 +133,21 @@ managerServlet.noReload=FAIL - Reload no
 managerServlet.noRename=FAIL - Cannot deploy uploaded WAR for path {0}
 managerServlet.noRole=FAIL - User does not possess role {0}
 managerServlet.noSelf=FAIL - The manager can not reload, undeploy, stop, or 
undeploy itself
-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.noWrapper=Container has not called setWrapper() for this servlet
 managerServlet.objectNameFail=FAIL - Unable to register object name [{0}] for 
Manager Servlet
 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.resourcesAll=OK - Listed global resources of all types
 managerServlet.resourcesType=OK - Listed global resources of type {0}
-managerServlet.saveFail=FAIL - Configuration save failed: {0}
 managerServlet.saved=OK - Server configuration saved
 managerServlet.savedContext=OK - Context {0} configuration saved
+managerServlet.saveFail=FAIL - Configuration save failed: {0}
 managerServlet.sessiondefaultmax=Default maximum session inactive interval {0} 
minutes
+managerServlet.sessions=OK - Session information for application at context 
path {0}
 managerServlet.sessiontimeout={0} minutes: {1} sessions
-managerServlet.sessiontimeout.unlimited=unlimited time: {0} sessions
 managerServlet.sessiontimeout.expired={0} minutes: {1} sessions were expired
-managerServlet.sessions=OK - Session information for application at context 
path {0}
+managerServlet.sessiontimeout.unlimited=unlimited time: {0} sessions
 managerServlet.started=OK - Started application at context path {0}
 managerServlet.startFailed=FAIL - Application at context path {0} could not be 
started
 managerServlet.stopped=OK - Stopped application at context path {0}
@@ -121,40 +157,6 @@ managerServlet.unknownCommand=FAIL - Unk
 managerServlet.userDatabaseError=FAIL - Cannot resolve user database reference
 managerServlet.userDatabaseMissing=FAIL - No user database is available
 managerServlet.vminfo=OK - VM info
-statusServlet.title=Server Status
+
 statusServlet.complete=Complete Server Status
-htmlManagerServlet.osPhysicalMemory=Physical memory:
-htmlManagerServlet.osAvailableMemory=Available memory:
-htmlManagerServlet.osTotalPageFile=Total page file:
-htmlManagerServlet.osFreePageFile=Free page file:
-htmlManagerServlet.osMemoryLoad=Memory load:
-htmlManagerServlet.osKernelTime=Process kernel time:
-htmlManagerServlet.osUserTime=Process user time:
-htmlManagerServlet.jvmFreeMemory=Free Memory:
-htmlManagerServlet.jvmMaxMemory=Max Memory:
-htmlManagerServlet.jvmTotalMemory=Total Memory:
-htmlManagerServlet.jvmTableTitleMemoryPool=Memory Pool
-htmlManagerServlet.jvmTableTitleType=Type
-htmlManagerServlet.jvmTableTitleInitial=Initial
-htmlManagerServlet.jvmTableTitleTotal=Total
-htmlManagerServlet.jvmTableTitleMaximum=Maximum
-htmlManagerServlet.jvmTableTitleUsed=Used
-htmlManagerServlet.connectorStateMaxThreads=Max threads:
-htmlManagerServlet.connectorStateThreadCount=Current thread count:
-htmlManagerServlet.connectorStateThreadBusy=Current thread busy:
-htmlManagerServlet.connectorStateAliveSocketCount=Keep alive sockets count:
-htmlManagerServlet.connectorStateMaxProcessingTime=Max processing time:
-htmlManagerServlet.connectorStateProcessingTime=Processing time:
-htmlManagerServlet.connectorStateRequestCount=Request count:
-htmlManagerServlet.connectorStateErrorCount=Error count:
-htmlManagerServlet.connectorStateBytesRecieved=Bytes received:
-htmlManagerServlet.connectorStateBytesSent=Bytes sent:
-htmlManagerServlet.connectorStateTableTitleStage=Stage
-htmlManagerServlet.connectorStateTableTitleTime=Time
-htmlManagerServlet.connectorStateTableTitleBSent=B Sent
-htmlManagerServlet.connectorStateTableTitleBRecv=B Recv
-htmlManagerServlet.connectorStateTableTitleClientForw=Client (Forwarded)
-htmlManagerServlet.connectorStateTableTitleClientAct=Client (Actual)
-htmlManagerServlet.connectorStateTableTitleVHost=VHost
-htmlManagerServlet.connectorStateTableTitleRequest=Request
-htmlManagerServlet.connectorStateHint=P: Parse and prepare request S: Service 
F: Finishing R: Ready K: Keepalive
+statusServlet.title=Server Status

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties?rev=1853349&r1=1853348&r2=1853349&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties
 Mon Feb 11 12:04:07 2019
@@ -14,22 +14,16 @@
 # limitations under the License.
 
 htmlManagerServlet.appsAvailable=Verf\u00fcgbar
+htmlManagerServlet.appsExpire=L\u00f6sche Sitzungen
 htmlManagerServlet.appsName=Anzeigename
 htmlManagerServlet.appsPath=Kontext Pfad
 htmlManagerServlet.appsReload=Neu laden
-htmlManagerServlet.appsUndeploy=Entfernen
-htmlManagerServlet.appsExpire=L\u00f6sche Sitzungen
 htmlManagerServlet.appsSessions=Sitzungen
 htmlManagerServlet.appsStart=Start
 htmlManagerServlet.appsStop=Stop
 htmlManagerServlet.appsTasks=Kommandos
 htmlManagerServlet.appsTitle=Anwendungen
-htmlManagerServlet.expire.explain=mit Inaktivit\u00e4t ≥
-htmlManagerServlet.expire.unit=Minuten
-htmlManagerServlet.helpHtmlManager=Hilfeseite HTML Manager (englisch)
-htmlManagerServlet.helpHtmlManagerFile=../docs/html-manager-howto.html
-htmlManagerServlet.helpManager=Hilfeseite Manager (englisch)
-htmlManagerServlet.helpManagerFile=../docs/manager-howto.html
+htmlManagerServlet.appsUndeploy=Entfernen
 htmlManagerServlet.deployButton=Installieren
 htmlManagerServlet.deployConfig=XML Konfigurationsdatei URL:
 htmlManagerServlet.deployPath=Kontext Pfad (optional):
@@ -38,10 +32,16 @@ htmlManagerServlet.deployTitle=Installie
 htmlManagerServlet.deployUpload=Lokale WAR Datei zur Installation hochladen
 htmlManagerServlet.deployUploadFail=FEHLER - Hochladen zur Installation 
fehlgeschlagen, Ausnahme: {0}
 htmlManagerServlet.deployUploadFile=WAR Datei ausw\u00e4hlen
-htmlManagerServlet.deployUploadNotWar=FEHLER - Hochgeladene Datei \"{0}\" muss 
ein .war sein
 htmlManagerServlet.deployUploadNoFile=FEHLER - Hochladen fehlgeschlagen, keine 
Datei vorhanden
+htmlManagerServlet.deployUploadNotWar=FEHLER - Hochgeladene Datei \"{0}\" muss 
ein .war sein
 htmlManagerServlet.deployUploadWarExists=FEHLER - WAR Datei \"{0}\" existiert 
bereits auf Server
 htmlManagerServlet.deployWar=WAR oder Verzeichnis URL:
+htmlManagerServlet.expire.explain=mit Inaktivit\u00e4t ≥
+htmlManagerServlet.expire.unit=Minuten
+htmlManagerServlet.helpHtmlManager=Hilfeseite HTML Manager (englisch)
+htmlManagerServlet.helpHtmlManagerFile=../docs/html-manager-howto.html
+htmlManagerServlet.helpManager=Hilfeseite Manager (englisch)
+htmlManagerServlet.helpManagerFile=../docs/manager-howto.html
 htmlManagerServlet.list=Anwendungen auflisten
 htmlManagerServlet.manager=Manager
 htmlManagerServlet.messageLabel=Nachricht:
@@ -53,6 +53,7 @@ htmlManagerServlet.serverOSVersion=OS Ve
 htmlManagerServlet.serverTitle=Server Informationen
 htmlManagerServlet.serverVersion=Tomcat Version
 htmlManagerServlet.title=Tomcat Webanwendungs-Manager
+
 managerServlet.alreadyContext=FEHLER - Anwendung existiert bereits f\u00fcr 
Kontext Pfad {0}
 managerServlet.alreadyDocBase=FEHLER - Verzeichnis {0} bereits in Benutzung
 managerServlet.configured=OK - Anwendung von Kontext-Datei {0} installiert
@@ -78,11 +79,11 @@ managerServlet.resourcesAll=OK - Auflist
 managerServlet.resourcesType=OK - Auflistung globaler Ressourcen von Typ {0}
 managerServlet.saveFail=FEHLER - Speichern der Konfiguration fehlgeschlagen: 
{0}
 managerServlet.sessiondefaultmax=Voreingestellter Sitzungsablauf nach maximal 
{0} Minuten Inaktivit\u00e4t
+managerServlet.sessions=OK - Sitzungs-Informationen f\u00fcr Anwendung mit 
Kontext Pfad {0}
 #TODO: Please review the following three messages. These are displayed when 
"Expire sessions" button is pressed in the Manager webapp:
 managerServlet.sessiontimeout={0} Minuten: {1} Sitzungen
-managerServlet.sessiontimeout.unlimited=unlimited Minuten: {0} Sitzungen
 managerServlet.sessiontimeout.expired={0} Minuten: expired {1} Sitzungen
-managerServlet.sessions=OK - Sitzungs-Informationen f\u00fcr Anwendung mit 
Kontext Pfad {0}
+managerServlet.sessiontimeout.unlimited=unlimited Minuten: {0} Sitzungen
 managerServlet.started=OK - Anwendung mit Kontext Pfad {0} gestartet
 managerServlet.startFailed=FEHLER - Anwendung mit Kontext Pfad {0} konnte 
nicht gestartet werden
 managerServlet.stopped=OK - Anwendung mit Kontext Pfad {0} gestoppt
@@ -91,5 +92,5 @@ managerServlet.unknownCommand=FEHLER - U
 managerServlet.userDatabaseError=FEHLER - Kann Referenz auf Benutzerdatendank 
nicht aufl\u00f6sen
 managerServlet.userDatabaseMissing=FEHLER - Keine Benutzerdatenbank vorhanden
 
-statusServlet.title=Server Status
 statusServlet.complete=Ausf\u00fchrlicher Server Status
+statusServlet.title=Server Status

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties?rev=1853349&r1=1853348&r2=1853349&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties
 Mon Feb 11 12:04:07 2019
@@ -14,24 +14,17 @@
 # limitations under the License.
 
 htmlManagerServlet.appsAvailable = Ejecut\u00E1ndose
+htmlManagerServlet.appsExpire = Expirar sesiones
 htmlManagerServlet.appsName = Nombre a Mostrar
 htmlManagerServlet.appsPath = Trayectoria
 htmlManagerServlet.appsReload = Recargar
-htmlManagerServlet.appsUndeploy = Replegar
-htmlManagerServlet.appsVersion = Versi\u00F3n
-htmlManagerServlet.appsExpire = Expirar sesiones
 htmlManagerServlet.appsSessions = Sesiones
 htmlManagerServlet.appsStart = Arrancar
 htmlManagerServlet.appsStop = Parar
 htmlManagerServlet.appsTasks = Comandos
 htmlManagerServlet.appsTitle = Aplicaciones
-htmlManagerServlet.noVersion = Ninguno especificado
-htmlManagerServlet.expire.explain = sin trabajar ≥
-htmlManagerServlet.expire.unit = minutos
-htmlManagerServlet.helpHtmlManager = Ayuda HTML de Gestor
-htmlManagerServlet.helpHtmlManagerFile = ../docs/html-manager-howto.html
-htmlManagerServlet.helpManager = Ayuda de Gestor
-htmlManagerServlet.helpManagerFile = ../docs/manager-howto.html
+htmlManagerServlet.appsUndeploy = Replegar
+htmlManagerServlet.appsVersion = Versi\u00F3n
 htmlManagerServlet.deployButton = Desplegar
 htmlManagerServlet.deployConfig = URL de archivo de Configuraci\u00F3n XML\:
 htmlManagerServlet.deployPath = Trayectoria de Contexto (opcional)\:
@@ -41,20 +34,27 @@ htmlManagerServlet.deployUpload = Archiv
 htmlManagerServlet.deployUploadFail = FALLO - Fall\u00F3 Carga de Despliegue, 
Excepci\u00F3n\: {0}
 htmlManagerServlet.deployUploadFile = Seleccione archivo WAR a cargar
 htmlManagerServlet.deployUploadInServerXml = FALLO - El fichero war "{0}" no 
se puede cargar si se define el contexto en server.xml
-htmlManagerServlet.deployUploadNotWar = FALLO - El fichero cargado "{0}" debe 
de ser un .war
 htmlManagerServlet.deployUploadNoFile = FALLO - Fall\u00F3 la carga del 
fichero, no hay fichero
+htmlManagerServlet.deployUploadNotWar = FALLO - El fichero cargado "{0}" debe 
de ser un .war
 htmlManagerServlet.deployUploadWarExists = FALLO - El fichero war "{0}" ya 
existe en el servidor
 htmlManagerServlet.deployWar = URL de WAR o Directorio\:
 htmlManagerServlet.diagnosticsLeak = Revisa a ver si una aplicaci\u00F3n web 
ha causado fallos de memoria al parar, recargar o replegarse.
 htmlManagerServlet.diagnosticsLeakButton = Halla fallos de memoria
 htmlManagerServlet.diagnosticsLeakWarning = Este chequeo de diagn\u00F3stico 
disparar\u00E1 una colecci\u00F3n completa de basura. Util\u00EDzalo con 
extremo cuidado en sistemas en producci\u00F3n.
 htmlManagerServlet.diagnosticsTitle = Diagn\u00F3sticos
+htmlManagerServlet.expire.explain = sin trabajar ≥
+htmlManagerServlet.expire.unit = minutos
 htmlManagerServlet.findleaksList = Las siguientes aplicaciones web fueron 
paradas (recargadas, replegadas), pero sus clases de las ejecuciones previas 
a\u00FAn se encuentran en memoria, causando as\u00ED un fallo de memoria (usa 
un perfilador para confirmarlo)\:\n
 htmlManagerServlet.findleaksNone = No parece haber aplicaciones web que hayan 
disparado un fallo de memoria al ser paradas, recargadas o replegadas.
+htmlManagerServlet.helpHtmlManager = Ayuda HTML de Gestor
+htmlManagerServlet.helpHtmlManagerFile = ../docs/html-manager-howto.html
+htmlManagerServlet.helpManager = Ayuda de Gestor
+htmlManagerServlet.helpManagerFile = ../docs/manager-howto.html
 htmlManagerServlet.list = Listar Aplicaciones
 htmlManagerServlet.manager = Gestor
 htmlManagerServlet.messageLabel = Mensaje\:
 htmlManagerServlet.noManager = -
+htmlManagerServlet.noVersion = Ninguno especificado
 htmlManagerServlet.serverHostname = NombreDeM\u00E1quina
 htmlManagerServlet.serverIPAddress = Direcci\u00F3n IP
 htmlManagerServlet.serverJVMVendor = Vendedor JVM
@@ -65,13 +65,14 @@ htmlManagerServlet.serverOSVersion = Ver
 htmlManagerServlet.serverTitle = Informaci\u00F3n de Servidor
 htmlManagerServlet.serverVersion = Versi\u00F3n de Tomcat
 htmlManagerServlet.title = Gestor de Aplicaciones Web de Tomcat
+
 managerServlet.alreadyContext = FALLO - Ya existe la aplicaci\u00F3n en la 
trayectoria {0}
 managerServlet.alreadyDocBase = FALLO - Directorio {0} ya est\u00E1 siendo 
usado
 managerServlet.configured = OK - Desplegada aplicaci\u00F3n desde archivo de 
contexto {0}
 managerServlet.deleteFail = FALLO - No pude borrar [{0}]. La presencia 
continua de este fichero puede causar problemas.
 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.deployedButNotStarted = FALLO - Apliaci\u00F3n desplegada en la 
ruta de contexto {0}, pero el contexto no pudo arrancar
+managerServlet.deployFailed = FALLO - No pude desplegar la aplicaci\u00F3n en 
ruta de contexto {0}
 managerServlet.exception = FALLO - Encontrada excepci\u00F3n {0}
 managerServlet.findleaksFail = FALLO - Ha fallado la b\u00FAsqueda de fallos\: 
La M\u00E1quina no es una instancia de StandardHost
 managerServlet.findleaksList = OK - Hallados fallos potenciales de memoria en 
las siguientes aplicaciones\:
@@ -92,22 +93,22 @@ managerServlet.noReload = FALLO - Recarg
 managerServlet.noRename = FALLO - No pudeo desplegar WAR cargado para 
trayectoria {0}
 managerServlet.noRole = FALLO - El usuario no desempe\u00F1a el papel de {0}
 managerServlet.noSelf = FALLO - El gestor no puede recargarse, replegarse, 
pararse o replegarse a s\u00ED mismo
-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.noWrapper = El Contenedor no ha llamado a setWrapper() para 
este servlet
 managerServlet.objectNameFail = FALLO - No pude registrar objeto de nombre 
[{0}] para Gestor de Servlet
 managerServlet.postCommand = FALLO - Intent\u00E9 usar el comando {0} v\u00EDa 
un requerimiento GET pero se necesita POST
 managerServlet.reloaded = OK - Recargada 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.saveFail = FAIL - Fallo al guardar la configuraci\u00F3n\: {0}
 managerServlet.saved = OK - Configuraci\u00F3n de Servidor guardada
 managerServlet.savedContext = OK - Configuraci\u00F3n de Contexto {0} guardada
+managerServlet.saveFail = FAIL - Fallo al guardar la configuraci\u00F3n\: {0}
 managerServlet.sessiondefaultmax = Intervalo m\u00E1ximo por defecto de 
sesi\u00F3n inactiva {0} minutos
+managerServlet.sessions = OK - Informaci\u00F3n de sesi\u00F3n para 
aplicaci\u00F3n en trayectoria de contexto {0}
 #TODO: Please review the following three messages. These are displayed when 
"Expire sessions" button is pressed in the Manager webapp:
 managerServlet.sessiontimeout = {0} minutos\: {1} sesiones
 managerServlet.sessiontimeout.unlimited = unlimited minutos\: {0} sesiones
 managerServlet.sessiontimeout.expired = {0} minutos\: expired {1} sesiones
-managerServlet.sessions = OK - Informaci\u00F3n de sesi\u00F3n para 
aplicaci\u00F3n en trayectoria de contexto {0}
 managerServlet.started = OK - Arrancada aplicaci\u00F3n en trayectoria de 
contexto {0}
 managerServlet.startFailed = FALLO - No se pudo arrancar la aplicaci\u00F3n en 
trayectoria de contexto {0}
 managerServlet.stopped = OK - Parada aplicaci\u00F3n en trayectoria de 
contexto {0}
@@ -115,5 +116,6 @@ managerServlet.undeployed = OK - Replega
 managerServlet.unknownCommand = FALLO - Comando desconocido {0}
 managerServlet.userDatabaseError = FALLO - No puedo resolver referencia de 
base de datos de usuario
 managerServlet.userDatabaseMissing = FALLO - No se encuentra disponible base 
de datos de usuario
-statusServlet.title = Estado de Servidor
+
 statusServlet.complete = Estado Completo de Servidor
+statusServlet.title = Estado de Servidor

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties?rev=1853349&r1=1853348&r2=1853349&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties
 Mon Feb 11 12:04:07 2019
@@ -14,22 +14,16 @@
 # limitations under the License.
 
 htmlManagerServlet.appsAvailable=Fonctionnelle
+htmlManagerServlet.appsExpire=Expirer les sessions
 htmlManagerServlet.appsName=Nom d''affichage
 htmlManagerServlet.appsPath=Chemin
 htmlManagerServlet.appsReload=Recharger
-htmlManagerServlet.appsUndeploy=Retirer
-htmlManagerServlet.appsExpire=Expirer les sessions
 htmlManagerServlet.appsSessions=Sessions
 htmlManagerServlet.appsStart=D\u00e9marrer
 htmlManagerServlet.appsStop=Arr\u00eater
 htmlManagerServlet.appsTasks=Commandes
 htmlManagerServlet.appsTitle=Applications
-htmlManagerServlet.expire.explain=inactives depuis ≥
-htmlManagerServlet.expire.unit=minutes
-htmlManagerServlet.helpHtmlManager=Aide HTML Gestionnaire
-htmlManagerServlet.helpHtmlManagerFile=../docs/html-manager-howto.html
-htmlManagerServlet.helpManager=Aide Gestionnaire
-htmlManagerServlet.helpManagerFile=../docs/manager-howto.html
+htmlManagerServlet.appsUndeploy=Retirer
 htmlManagerServlet.deployButton=Deployer
 htmlManagerServlet.deployConfig=URL du fichier XML de configuration:
 htmlManagerServlet.deployPath=Chemin de context (requis):
@@ -39,10 +33,16 @@ htmlManagerServlet.deployUpload=Fichier
 htmlManagerServlet.deployUploadFail=ECHEC - T\u00e9l\u00e9versement pour 
d\u00e9ploiement a \u00e9chou\u00e9, exception: {0}
 htmlManagerServlet.deployUploadFile=Choisir le fichier WAR \u00e0 
t\u00e9l\u00e9verser
 htmlManagerServlet.deployUploadInServerXml=ECHEC - Fichier WAR \"{0}\" ne peut 
\u00eatre t\u00e9l\u00e9vers\u00e9 lorsque le contexte est d\u00e9fini dans 
server.xml
-htmlManagerServlet.deployUploadNotWar=ECHEC - Fichier \u00e0 
t\u00e9l\u00e9verser, \"{0}\", doit \u00eatre un .war
 htmlManagerServlet.deployUploadNoFile=ECHEC - T\u00e9l\u00e9versement a 
\u00e9chou\u00e9, aucun fichier
+htmlManagerServlet.deployUploadNotWar=ECHEC - Fichier \u00e0 
t\u00e9l\u00e9verser, \"{0}\", doit \u00eatre un .war
 htmlManagerServlet.deployUploadWarExists=ECHEC - Fichier War \"{0}\" 
d\u00e9j\u00ea existant sur le serveur
 htmlManagerServlet.deployWar=URL vers WAR ou r\u00e9pertoire:
+htmlManagerServlet.expire.explain=inactives depuis ≥
+htmlManagerServlet.expire.unit=minutes
+htmlManagerServlet.helpHtmlManager=Aide HTML Gestionnaire
+htmlManagerServlet.helpHtmlManagerFile=../docs/html-manager-howto.html
+htmlManagerServlet.helpManager=Aide Gestionnaire
+htmlManagerServlet.helpManagerFile=../docs/manager-howto.html
 htmlManagerServlet.list=Lister les applications
 htmlManagerServlet.manager=Gestionnaire
 htmlManagerServlet.messageLabel=Message:
@@ -55,12 +55,13 @@ htmlManagerServlet.serverOSVersion=Versi
 htmlManagerServlet.serverTitle=Serveur
 htmlManagerServlet.serverVersion=Version de serveur
 htmlManagerServlet.title=Gestionnaire d''applications WEB Tomcat
+
 managerServlet.alreadyContext=ECHEC - l''application existe d\u00e9j\u00e0 
dans le chemin {0}
 managerServlet.alreadyDocBase=ECHEC - Le r\u00e9pertoire {0} est 
d\u00e9j\u00e0 utilis\u00e9
 managerServlet.configured=OK - Application configur\u00e9e depuis le fichier 
contexte {0}
 managerServlet.deployed=OK - Application d\u00e9ploy\u00e9e pour le chemin de 
contexte {0}
-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.deployFailed=ECHEC - Echec au d\u00e9ploiement de 
l''application pour le chemin de contexte {0}
 managerServlet.exception=ECHEC - L''exception {0} a \u00e9t\u00e9 
rencontr\u00e9e
 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
@@ -77,30 +78,30 @@ managerServlet.noReload=ECHEC - Recharge
 managerServlet.noRename=ECHEC - Impossible de d\u00e9ployer un WAR 
t\u00e9l\u00e9charg\u00e9 pour le chemin {0}
 managerServlet.noRole=ECHEC - L''utilisateur ne poss\u00e8de pas le r\u00f4le 
{0}
 managerServlet.noSelf=ECHEC - Le gestionnaire ne peut se recharger, se 
retirer, s''arr\u00eater, ou se d\u00e9ployer lui-m\u00eame
-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.noWrapper=Le conteneur n''a pas appel\u00e9 "setWrapper()" pour 
cette servlet
 managerServlet.reloaded=OK - L''application associ\u00e9e au chemin de 
contexte {0} a \u00e9t\u00e9 recharg\u00e9e
 managerServlet.resourcesAll=OK - Liste des ressources globales de tout type
 managerServlet.resourcesType=OK - Liste des ressources globales de type {0}
-managerServlet.saveFail=ECHEC - La sauvegarde de la configuration a 
\u00e9chou\u00e9: {0}
 managerServlet.saved=OK - Configuration serveur sauvegard\u00e9e
 managerServlet.savedContext=OK - Configuration du contexte {0} sauvegard\u00e9e
+managerServlet.saveFail=ECHEC - La sauvegarde de la configuration a 
\u00e9chou\u00e9: {0}
 managerServlet.sessiondefaultmax=Interval par d\u00e9faut de maximum de 
session inactive {0} minutes
+managerServlet.sessions=OK - Information de session pour l''application au 
chemin de contexte {0}
 #TODO: Please review the following three messages. These are displayed when 
"Expire sessions" button is pressed in the Manager webapp:
 managerServlet.sessiontimeout={0} minutes: {1} sessions
-managerServlet.sessiontimeout.unlimited=unlimited time: {0} sessions
 managerServlet.sessiontimeout.expired={0} minutes: {1} sessions were expired
-managerServlet.sessions=OK - Information de session pour l''application au 
chemin de contexte {0}
+managerServlet.sessiontimeout.unlimited=unlimited time: {0} sessions
 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 - L''application associ\u00e9e 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 \u00eatre d\u00e9marr\u00e9e
 managerServlet.stopped=OK - Application arr\u00eat\u00e9e pour le chemin de 
contexte {0}
+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}
+managerServlet.undeployed=OK - L''application associ\u00e9e au chemin de 
contexte {0} a \u00e9t\u00e9 retir\u00e9e
 managerServlet.unknownCommand=ECHEC - Commande inconnue {0}
 managerServlet.userDatabaseError=ECHEC - Impossible de r\u00e9soudre la base 
de donn\u00e9es utilisateurs de r\u00e9f\u00e9rence
 managerServlet.userDatabaseMissing=ECHEC - Aucune base de donn\u00e9es 
utilisateurs n''est disponible
 
-statusServlet.title=Etat du serveur
 statusServlet.complete=Etat complet du serveur
+statusServlet.title=Etat du serveur

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_ja.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_ja.properties?rev=1853349&r1=1853348&r2=1853349&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_ja.properties
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_ja.properties
 Mon Feb 11 12:04:07 2019
@@ -17,16 +17,12 @@ htmlManagerServlet.appsAvailable=\u5b9f\
 htmlManagerServlet.appsName=\u8868\u793a\u540d
 htmlManagerServlet.appsPath=\u30d1\u30b9
 htmlManagerServlet.appsReload=\u518d\u30ed\u30fc\u30c9
-htmlManagerServlet.appsUndeploy=\u914d\u5099\u89e3\u9664
 htmlManagerServlet.appsSessions=\u30bb\u30c3\u30b7\u30e7\u30f3
 htmlManagerServlet.appsStart=\u8d77\u52d5
 htmlManagerServlet.appsStop=\u505c\u6b62
 htmlManagerServlet.appsTasks=\u30b3\u30de\u30f3\u30c9
 htmlManagerServlet.appsTitle=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3
-htmlManagerServlet.helpHtmlManager=HTML\u30de\u30cd\u30fc\u30b8\u30e3\u30d8\u30eb\u30d7
-htmlManagerServlet.helpHtmlManagerFile=../docs/html-manager-howto.html
-htmlManagerServlet.helpManager=\u30de\u30cd\u30fc\u30b8\u30e3\u30d8\u30eb\u30d7
-htmlManagerServlet.helpManagerFile=../docs/manager-howto.html
+htmlManagerServlet.appsUndeploy=\u914d\u5099\u89e3\u9664
 htmlManagerServlet.deployButton=\u914d\u5099
 
htmlManagerServlet.deployConfig=XML\u8a2d\u5b9a\u30d5\u30a1\u30a4\u30eb\u306eURL:
 htmlManagerServlet.deployPath=\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 
(\u7701\u7565\u53ef):
@@ -35,10 +31,14 @@ htmlManagerServlet.deployTitle=\u914d\u5
 htmlManagerServlet.deployUpload=WAR\u30d5\u30a1\u30a4\u30eb\u306e\u914d\u5099
 htmlManagerServlet.deployUploadFail=FAIL - 
\u914d\u5099\u306e\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u304c\u5931\u6557\u3057\u307e\u3057\u305f\u3001\u4f8b\u5916:
 {0}
 
htmlManagerServlet.deployUploadFile=\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u3059\u308bWAR\u30d5\u30a1\u30a4\u30eb\u306e\u9078\u629e
-htmlManagerServlet.deployUploadNotWar=FAIL - 
\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u3059\u308b\u30d5\u30a1\u30a4\u30eb 
\"{0}\" 
\u306fWAR\u30d5\u30a1\u30a4\u30eb\u3067\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093
 htmlManagerServlet.deployUploadNoFile=FAIL - 
\u30d5\u30a1\u30a4\u30eb\u306e\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u304c\u5931\u6557\u3057\u307e\u3057\u305f\u3001\u30d5\u30a1\u30a4\u30eb\u304c\u5b58\u5728\u3057\u307e\u305b\u3093
+htmlManagerServlet.deployUploadNotWar=FAIL - 
\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u3059\u308b\u30d5\u30a1\u30a4\u30eb 
\"{0}\" 
\u306fWAR\u30d5\u30a1\u30a4\u30eb\u3067\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093
 htmlManagerServlet.deployUploadWarExists=FAIL - WAR\u30d5\u30a1\u30a4\u30eb 
\"{0}\" 
\u306f\u65e2\u306b\u30b5\u30fc\u30d0\u4e0a\u306b\u5b58\u5728\u3057\u307e\u3059
 
htmlManagerServlet.deployWar=WAR\u30d5\u30a1\u30a4\u30eb\u53c8\u306f\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306eURL:
+htmlManagerServlet.helpHtmlManager=HTML\u30de\u30cd\u30fc\u30b8\u30e3\u30d8\u30eb\u30d7
+htmlManagerServlet.helpHtmlManagerFile=../docs/html-manager-howto.html
+htmlManagerServlet.helpManager=\u30de\u30cd\u30fc\u30b8\u30e3\u30d8\u30eb\u30d7
+htmlManagerServlet.helpManagerFile=../docs/manager-howto.html
 
htmlManagerServlet.list=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u4e00\u89a7
 htmlManagerServlet.manager=\u30de\u30cd\u30fc\u30b8\u30e3
 htmlManagerServlet.messageLabel=\u30e1\u30c3\u30bb\u30fc\u30b8
@@ -50,6 +50,7 @@ htmlManagerServlet.serverOSVersion=OS\u3
 htmlManagerServlet.serverTitle=\u30b5\u30fc\u30d0\u60c5\u5831
 htmlManagerServlet.serverVersion=Tomcat\u30d0\u30fc\u30b8\u30e7\u30f3
 htmlManagerServlet.title=Tomcat 
Web\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30de\u30cd\u30fc\u30b8\u30e3
+
 managerServlet.alreadyContext=FAIL - 
\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306f\u3001\u65e2\u306b\u30d1\u30b9
 {0} \u306b\u5b58\u5728\u3057\u307e\u3059
 managerServlet.alreadyDocBase=FAIL - \u30c7\u30a3\u30ec\u30af\u30c8\u30ea {0} 
\u306f\u65e2\u306b\u4f7f\u7528\u3055\u308c\u3066\u3044\u307e\u3059
 
managerServlet.cannotInvoke=\u30a4\u30f3\u30dc\u30fc\u30ab\u3067\u30de\u30cd\u30fc\u30b8\u30e3\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u3092\u8d77\u52d5\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f
@@ -74,15 +75,15 @@ managerServlet.noWrapper=\u30b3\u30f3\u3
 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.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.saveFail=FAIL - 
\u8a2d\u5b9a\u306e\u4fdd\u5b58\u306b\u5931\u6557\u3057\u307e\u3057\u305f: {0}
 managerServlet.saved=OK - 
\u30b5\u30fc\u30d0\u306e\u8a2d\u5b9a\u3092\u4fdd\u5b58\u3057\u307e\u3057\u305f
 managerServlet.savedContext=OK - \u30b3\u30f3\u30c6\u30ad\u30b9\u30c8 {0} 
\u306e\u8a2d\u5b9a\u3092\u4fdd\u5b58\u3057\u307e\u3057\u305f
+managerServlet.saveFail=FAIL - 
\u8a2d\u5b9a\u306e\u4fdd\u5b58\u306b\u5931\u6557\u3057\u307e\u3057\u305f: {0}
 
managerServlet.sessiondefaultmax=\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u6700\u5927\u30bb\u30c3\u30b7\u30e7\u30f3\u505c\u6b62\u9593\u9694\u306f{0}\u5206\u3067\u3059
+managerServlet.sessions=OK - \u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 
{0} 
\u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u30bb\u30c3\u30b7\u30e7\u30f3\u60c5\u5831\u3067\u3059
 #TODO: Please review the following three messages. These are displayed when 
"Expire sessions" button is pressed in the Manager webapp:
 managerServlet.sessiontimeout={0}\u5206: {1}\u30bb\u30c3\u30b7\u30e7\u30f3
 managerServlet.sessiontimeout.unlimited=unlimited \u5206: 
{0}\u30bb\u30c3\u30b7\u30e7\u30f3
 managerServlet.sessiontimeout.expired={0}\u5206: expired 
{1}\u30bb\u30c3\u30b7\u30e7\u30f3
-managerServlet.sessions=OK - \u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 
{0} 
\u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u30bb\u30c3\u30b7\u30e7\u30f3\u60c5\u5831\u3067\u3059
 managerServlet.started=OK - \u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 
{0} 
\u3067\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u8d77\u52d5\u3057\u307e\u3057\u305f
 managerServlet.startFailed=FAIL - 
\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 {0} 
\u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u304c\u8d77\u52d5\u3067\u304d\u307e\u305b\u3093
 managerServlet.stopped=OK - \u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 
{0} 
\u3067\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u505c\u6b62\u3057\u307e\u3057\u305f
@@ -90,5 +91,6 @@ managerServlet.undeployed=OK - \u30b3\u3
 managerServlet.unknownCommand=FAIL - 
\u672a\u77e5\u306e\u30b3\u30de\u30f3\u30c9 {0} \u3067\u3059
 managerServlet.userDatabaseError=FAIL - 
\u30e6\u30fc\u30b6\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u53c2\u7167\u3092\u89e3\u6c7a\u3067\u304d\u307e\u305b\u3093
 managerServlet.userDatabaseMissing=FAIL - 
\u30e6\u30fc\u30b6\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u304c\u5229\u7528\u3067\u304d\u307e\u305b\u3093
-statusServlet.title=\u30b5\u30fc\u30d0\u306e\u72b6\u614b
+
 statusServlet.complete=\u30b5\u30fc\u30d0\u306e\u5168\u72b6\u614b
+statusServlet.title=\u30b5\u30fc\u30d0\u306e\u72b6\u614b

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties?rev=1853349&r1=1853348&r2=1853349&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties
 Mon Feb 11 12:04:07 2019
@@ -14,28 +14,40 @@
 # limitations under the License.
 
 
htmlManagerServlet.appsAvailable=\u0417\u0430\u043f\u0443\u0449\u0435\u043d\u043e
+htmlManagerServlet.appsExpire=\u041f\u0440\u0438\u043e\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c
 htmlManagerServlet.appsName=\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435
 htmlManagerServlet.appsPath=\u041f\u0443\u0442\u044c
 
htmlManagerServlet.appsReload=\u041f\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0430
-htmlManagerServlet.appsUndeploy=\u0420\u0430\u0437\u0432\u0435\u0440\u043d\u0443\u0442\u044c
-htmlManagerServlet.appsVersion=\u0412\u0435\u0440\u0441\u0438\u044f
-htmlManagerServlet.appsExpire=\u041f\u0440\u0438\u043e\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c
 htmlManagerServlet.appsSessions=\u0043\u0435\u0430\u043d\u0441
 htmlManagerServlet.appsStart=\u0421\u0442\u0430\u0440\u0442
 htmlManagerServlet.appsStop=\u0421\u0442\u043e\u043f
 htmlManagerServlet.appsTasks=\u041a\u043e\u043c\u0430\u043d\u0434\u044b
 
htmlManagerServlet.appsTitle=\u041f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f
-htmlManagerServlet.noVersion=\u041d\u0435 
\u0443\u043a\u0430\u0437\u0430\u043d\u043e
-htmlManagerServlet.expire.explain=\u0441 
\u0431\u0435\u0437\u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0435\u043c ≥
-htmlManagerServlet.expire.unit=\u043c\u0438\u043d\u0443\u0442
-htmlManagerServlet.helpHtmlManager=\u0421\u043f\u0440\u0430\u0432\u043e\u0447\u043d\u0438\u043a
 \u0438\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u0430
-htmlManagerServlet.helpHtmlManagerFile=../docs/html-manager-howto.html
-htmlManagerServlet.helpManager=\u0421\u043f\u0440\u0430\u0432\u043e\u0447\u043d\u0438\u043a
 \u043c\u0435\u043d\u0435\u0434\u0436\u0435\u0440\u0430 
\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0439
-htmlManagerServlet.helpManagerFile=../docs/manager-howto.html
-htmlManagerServlet.configTitle=\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f
-htmlManagerServlet.configSslReloadTitle=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c
 \u0054\u004c\u0053 
\u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e 
\u0444\u0430\u0439\u043b\u043e\u0432
-htmlManagerServlet.configSslHostName=\u0418\u043c\u044f \u0054\u004c\u0053 
\u0445\u043e\u0441\u0442\u0430
+htmlManagerServlet.appsUndeploy=\u0420\u0430\u0437\u0432\u0435\u0440\u043d\u0443\u0442\u044c
+htmlManagerServlet.appsVersion=\u0412\u0435\u0440\u0441\u0438\u044f
 
htmlManagerServlet.configReloadButton=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c
+htmlManagerServlet.configSslHostName=\u0418\u043c\u044f \u0054\u004c\u0053 
\u0445\u043e\u0441\u0442\u0430
+htmlManagerServlet.configSslReloadTitle=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c
 \u0054\u004c\u0053 
\u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e 
\u0444\u0430\u0439\u043b\u043e\u0432
+htmlManagerServlet.configTitle=\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f
+htmlManagerServlet.connectorStateAliveSocketCount=\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E
 \u0432\u0441\u0451 \u0435\u0449\u0451 \u0436\u0438\u0432\u044B\u0445 
\u0441\u043E\u043A\u0435\u0442\u043E\u0432:
+htmlManagerServlet.connectorStateBytesRecieved=\u0411\u0430\u0439\u0442\u043E\u0432
 \u043F\u043E\u043B\u0443\u0447\u0435\u043D\u043E:
+htmlManagerServlet.connectorStateBytesSent=\u0411\u0430\u0439\u0442\u043E\u0432
 \u043E\u0442\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043E:
+htmlManagerServlet.connectorStateErrorCount=\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E
 \u043E\u0448\u0438\u0431\u043E\u043A:
+htmlManagerServlet.connectorStateHint=P: 
\u0420\u0430\u0437\u0431\u0438\u0440\u0430\u0435\u0442\u0441\u044F \u0438 
\u0433\u043E\u0442\u043E\u0432\u0438\u0442\u0441\u044F \u043A 
\u043E\u0442\u043F\u0440\u0430\u0432\u043A\u0438 S: 
\u0421\u0435\u0440\u0432\u0438\u0441 F: 
\u0417\u0430\u0432\u0435\u0440\u0448\u0435\u043D\u0438\u0435 R: 
\u0413\u043E\u0442\u043E\u0432 K: 
\u041F\u0440\u043E\u0434\u043E\u043B\u0436\u0430\u0435\u0442 
\u0441\u0443\u0449\u0435\u0441\u0442\u0432\u043E\u0432\u0430\u0442\u044C
+htmlManagerServlet.connectorStateMaxProcessingTime=\u041C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u044C\u043D\u043E\u0435
 \u043F\u0440\u043E\u0446\u0435\u0441\u0441\u043E\u0440\u043D\u043E\u0435 
\u0432\u0440\u0435\u043C\u044F:
+htmlManagerServlet.connectorStateMaxThreads=\u041C\u0430\u043A\u0441\u0438\u043C\u0443\u043C
 \u043F\u0440\u043E\u0446\u0435\u0441\u0441\u043E\u0432:
+htmlManagerServlet.connectorStateProcessingTime=\u041F\u0440\u043E\u0446\u0435\u0441\u0441\u043E\u0440\u043D\u043E\u0435
 \u0432\u0440\u0435\u043C\u044F:
+htmlManagerServlet.connectorStateRequestCount=\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E
 \u0437\u0430\u043F\u0440\u043E\u0441\u043E\u0432:
+htmlManagerServlet.connectorStateTableTittleBRecv=\u0411 
\u041F\u043E\u043B\u0443\u0447\u0435\u043D\u043E
+htmlManagerServlet.connectorStateTableTittleBSent=\u0411 
\u041E\u0442\u043F\u0440\u0432\u043B\u0435\u043D\u043E
+htmlManagerServlet.connectorStateTableTittleClientAct=\u041A\u043B\u0438\u0435\u043D\u0442
 (\u041D\u0430\u0441\u0442\u043E\u044F\u0449\u0438\u0439)
+htmlManagerServlet.connectorStateTableTittleClientForw=\u041A\u043B\u0438\u0435\u043D\u0442
 (\u041E\u0442\u043E\u0441\u043B\u0430\u043D\u044B\u0439)
+htmlManagerServlet.connectorStateTableTittleRequest=\u0417\u0430\u043F\u0440\u043E\u0441\u044B
+htmlManagerServlet.connectorStateTableTittleStage=\u042D\u0442\u0430\u043F
+htmlManagerServlet.connectorStateTableTittleTime=\u0412\u0440\u0435\u043C\u044F
+htmlManagerServlet.connectorStateTableTittleVHost=\u0412\u0425\u043E\u0441\u0442
+htmlManagerServlet.connectorStateThreadBusy=\u041D\u044B\u043D\u0435\u0448\u043D\u0435\u0435
 \u0447\u0438\u0441\u043B\u043E \u0437\u0430\u043D\u044F\u0442\u044B\u0445 
\u043F\u0440\u043E\u0446\u0435\u0441\u0441\u043E\u0432:
+htmlManagerServlet.connectorStateThreadCount=\u041D\u044B\u043D\u0435\u0448\u043D\u0435\u0435
 \u0447\u0438\u0441\u043B\u043E 
\u043F\u0440\u043E\u0446\u0435\u0441\u0441\u043E\u0432:
 
htmlManagerServlet.deployButton=\u0420\u0430\u0437\u0432\u0435\u0440\u043d\u0443\u0442\u044c
 
htmlManagerServlet.deployConfig=\u0420\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435
 \u0444\u0430\u0439\u043b\u0430 
\u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043a  XML:
 htmlManagerServlet.deployPath=\u041f\u0443\u0442\u044c:
@@ -45,8 +57,8 @@ htmlManagerServlet.deployUpload=WAR \u04
 htmlManagerServlet.deployUploadFail=\u041e\u0428\u0418\u0411\u041a\u0410 - 
\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 
\u0440\u0430\u0437\u0432\u0435\u0440\u0442\u044b\u0432\u0430\u043d\u0438\u0438: 
[{0}]
 
htmlManagerServlet.deployUploadFile=\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435
 WAR \u0444\u0430\u0439\u043b \u0434\u043b\u044f 
\u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0438
 
htmlManagerServlet.deployUploadInServerXml=\u041e\u0428\u0418\u0411\u041a\u0410 
- War \u0444\u0430\u0439\u043b [{0}]  \u043d\u0435 
\u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c 
\u0437\u0430\u0433\u0440\u0443\u0436\u0435\u043d \u0065\u0441\u043b\u0438 
\u043e\u043d \u0437\u0430\u0434\u0430\u043d \u0432  server.xml
-htmlManagerServlet.deployUploadNotWar=\u041e\u0428\u0418\u0411\u041a\u0410 - 
\u0417\u0430\u0433\u0440\u0443\u0436\u0430\u0435\u043c\u044b\u0439 
\u0444\u0430\u0439\u043b \u0434\u043e\u043b\u0436\u0435\u043d 
\u0431\u044b\u0442\u044c \u0441 
\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u0435\u043c 
\u002e\u0077\u0061\u0072
 htmlManagerServlet.deployUploadNoFile=\u041e\u0428\u0418\u0411\u041a\u0410 - 
\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 
\u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0435 
\u0444\u0430\u0439\u043b\u0430\u002e \u0424\u0430\u0439\u043b\u0430 
\u043d\u0435\u0442
+htmlManagerServlet.deployUploadNotWar=\u041e\u0428\u0418\u0411\u041a\u0410 - 
\u0417\u0430\u0433\u0440\u0443\u0436\u0430\u0435\u043c\u044b\u0439 
\u0444\u0430\u0439\u043b \u0434\u043e\u043b\u0436\u0435\u043d 
\u0431\u044b\u0442\u044c \u0441 
\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u0435\u043c 
\u002e\u0077\u0061\u0072
 htmlManagerServlet.deployUploadWarExists=\u041e\u0428\u0418\u0411\u041a\u0410 
- War  \u0444\u0430\u0439\u043b [{0}] \u0443\u0436\u0435 
\u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442 \u043d\u0430 
\u0441\u0435\u0440\u0432\u0435\u0440\u0435
 htmlManagerServlet.deployVersion=\u0412\u0435\u0440\u0441\u0438\u044f:
 htmlManagerServlet.deployWar=WAR \u0438\u043b\u0438 \u043f\u0443\u0442\u044c 
\u0434\u043e \u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u0438:
@@ -54,22 +66,45 @@ htmlManagerServlet.diagnosticsLeak=\u042
 htmlManagerServlet.diagnosticsLeakButton=\u041d\u0430\u0439\u0442\u0438 
\u0443\u0442\u0435\u0447\u043a\u0438 \u043f\u0430\u043c\u044f\u0442\u0438
 
htmlManagerServlet.diagnosticsLeakWarning=\u0414\u0438\u0430\u0433\u043d\u043e\u0441\u0442\u0438\u043a\u0430
 \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u0438\u0442 
\u0441\u043f\u0438\u0441\u043e\u043a \u0432\u0441\u0435\u0445 
\u043e\u0448\u0438\u0431\u043e\u043a
 htmlManagerServlet.diagnosticsSsl=TLS 
\u0434\u0438\u0430\u0433\u043d\u043e\u0441\u0442\u0438\u043a\u0430 
\u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438 
\u043a\u043e\u043d\u043d\u0435\u043a\u0442\u043e\u0440\u0430
-htmlManagerServlet.diagnosticsSslConnectorCipherButton=\u0428\u0438\u0444\u0440
-htmlManagerServlet.diagnosticsSslConnectorCipherText=\u0421\u043f\u0438\u0441\u043e\u043a
 \u0432\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u044b\u0445 
\u0054\u004c\u0053 \u0445\u043e\u0441\u0442\u043e\u0432 \u0438 \u0438\u0445 
\u0448\u0438\u0444\u0440\u044b
 
htmlManagerServlet.diagnosticsSslConnectorCertsButton=\u0421\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u044b
 \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u0438
 
htmlManagerServlet.diagnosticsSslConnectorCertsText=\u0421\u043f\u0438\u0441\u043e\u043a
 \u0432\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u044b\u0445 
\u0054\u004c\u0053 \u0445\u043e\u0441\u0442\u043e\u0432 \u0438 \u0438\u0445 
\u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0432 
\u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u0438
+htmlManagerServlet.diagnosticsSslConnectorCipherButton=\u0428\u0438\u0444\u0440
+htmlManagerServlet.diagnosticsSslConnectorCipherText=\u0421\u043f\u0438\u0441\u043e\u043a
 \u0432\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u044b\u0445 
\u0054\u004c\u0053 \u0445\u043e\u0441\u0442\u043e\u0432 \u0438 \u0438\u0445 
\u0448\u0438\u0444\u0440\u044b
 
htmlManagerServlet.diagnosticsSslConnectorTrustedCertsButton=\u0414\u043e\u0432\u0435\u0440\u0435\u043d\u043d\u044b\u0435
 \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u044b
 
htmlManagerServlet.diagnosticsSslConnectorTrustedCertsText=\u0421\u043f\u0438\u0441\u043e\u043a
 \u0432\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u044b\u0445 
\u0054\u004c\u0053 \u0445\u043e\u0441\u0442\u043e\u0432 \u0438 \u0438\u0445 
\u0434\u043e\u0432\u0435\u0440\u0435\u043d\u043d\u044b\u0435 
\u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u044b 
\u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u0438
 
htmlManagerServlet.diagnosticsTitle=\u0414\u0438\u0430\u0433\u043d\u043e\u0441\u0442\u0438\u043a\u0430
+htmlManagerServlet.expire.explain=\u0441 
\u0431\u0435\u0437\u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0435\u043c ≥
+htmlManagerServlet.expire.unit=\u043c\u0438\u043d\u0443\u0442
 htmlManagerServlet.findleaksList=\
   The following web applications were stopped (reloaded, undeployed), but 
their\n\
   classes from previous runs are still loaded in memory, thus causing a 
memory\n\
   leak (use a profiler to confirm):\n
 
htmlManagerServlet.findleaksNone=\u041a\u0430\u0436\u0435\u0442\u0441\u044f\u002c
 \u0447\u0442\u043e 
\u0432\u0435\u0431\u002d\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f
 \u043d\u0435 \u0432\u044b\u0437\u0432\u0430\u043b\u0438 
\u0443\u0442\u0435\u0447\u043a\u0443 \u043f\u0430\u043c\u044f\u0442\u0438 
\u043f\u0440\u0438 \u043e\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0435\u002c 
\u043f\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0435 
\u0438\u043b\u0438 \u0440\u0430\u0441\u043f\u0430\u043a\u0435\u002e
+htmlManagerServlet.helpHtmlManager=\u0421\u043f\u0440\u0430\u0432\u043e\u0447\u043d\u0438\u043a
 \u0438\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u0430
+htmlManagerServlet.helpHtmlManagerFile=../docs/html-manager-howto.html
+htmlManagerServlet.helpManager=\u0421\u043f\u0440\u0430\u0432\u043e\u0447\u043d\u0438\u043a
 \u043c\u0435\u043d\u0435\u0434\u0436\u0435\u0440\u0430 
\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0439
+htmlManagerServlet.helpManagerFile=../docs/manager-howto.html
+htmlManagerServlet.jvmFreeMemory=\u0421\u0432\u043E\u0431\u043E\u0434\u043D\u0430\u044F
 \u041F\u0430\u043C\u044F\u0442\u044C:
+htmlManagerServlet.jvmMaxMemory=\u041C\u0430\u043A\u0441\u0438\u043C\u0443\u043C
 \u043F\u0430\u043C\u044F\u0442\u0438:
+htmlManagerServlet.jvmTableTitleInitial=\u0418\u0437\u043D\u0430\u0447\u0430\u043B\u044C\u043D\u043E
+htmlManagerServlet.jvmTableTitleMaximum=\u041C\u0430\u043A\u0441\u0438\u043C\u0443\u043C
+htmlManagerServlet.jvmTableTitleMemoryPool=\u041E\u0431\u043B\u0430\u0441\u0442\u0438
 \u043F\u0430\u043C\u044F\u0442\u0438
+htmlManagerServlet.jvmTableTitleTotal=\u0412\u0441\u0435\u0433\u043E
+htmlManagerServlet.jvmTableTitleType=\u0422\u0438\u043F
+htmlManagerServlet.jvmTableTitleUsed=\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u0442\u0441\u044F
+htmlManagerServlet.jvmTotalMemory=\u0412\u0441\u044F 
\u043F\u0430\u043C\u044F\u0442\u044C:
 htmlManagerServlet.list=\u0421\u043f\u0438\u0441\u043e\u043a 
\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0439
 htmlManagerServlet.manager=\u041c\u0435\u043d\u0435\u0434\u0436\u0435\u0440
 
htmlManagerServlet.messageLabel=\u0421\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0435:
 htmlManagerServlet.noManager=-
+htmlManagerServlet.noVersion=\u041d\u0435 
\u0443\u043a\u0430\u0437\u0430\u043d\u043e
+htmlManagerServlet.osAvailableMemory=\u0414\u043E\u0441\u0442\u0443\u043F\u043D\u0430\u044F
 \u043F\u0430\u043C\u044F\u0442\u044C:
+htmlManagerServlet.osFreePageFile=\u0421\u0432\u043E\u0431\u043E\u0434\u043D\u044B\u0435
 \u0444\u0430\u0439\u043B\u043E\u0432\u044B\u0435 
\u0441\u0442\u0440\u0430\u043D\u0438\u0446\u044B:
+htmlManagerServlet.osKernelTime=\u0412\u0440\u0435\u043C\u044F 
\u041E\u0431\u0440\u0430\u0431\u043E\u0442\u043A\u0438 
\u043F\u0440\u043E\u0446\u0435\u0441\u0441\u0430 \u044F\u0434\u0440\u043E\u043C:
+htmlManagerServlet.osMemoryLoad=\u041F\u0430\u043C\u044F\u0442\u0438 
\u0417\u0430\u0433\u0440\u0443\u0436\u0435\u043D\u043E:
+htmlManagerServlet.osPhysicalMemory=\u0424\u0438\u0437\u0438\u0447\u0435\u0441\u043A\u0430\u044F
 \u043F\u0430\u043C\u044F\u0442\u044C:
+htmlManagerServlet.osTotalPageFile=\u0412\u0441\u0435\u0433\u043E 
\u0444\u0430\u0439\u043B\u043E\u0432\u044B\u0445 
\u0441\u0442\u0440\u0430\u043D\u0438\u0446:
+htmlManagerServlet.osUserTime=\u0412\u0440\u0435\u043C\u044F 
\u043E\u0431\u0440\u0430\u0431\u043E\u0442\u043A\u0438 
\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F:
 htmlManagerServlet.serverHostname=\u0418\u043c\u044f 
\u0445\u043e\u0441\u0442\u0430
 htmlManagerServlet.serverIPAddress=IP \u0410\u0434\u0440\u0435\u0441
 
htmlManagerServlet.serverJVMVendor=\u041f\u043e\u0441\u0442\u0430\u0432\u0449\u0438\u043a
 \u004a\u0056\u004d
@@ -80,12 +115,13 @@ htmlManagerServlet.serverOSVersion=\u041
 
htmlManagerServlet.serverTitle=\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f
 \u043e \u0441\u0435\u0440\u0432\u0435\u0440\u0435
 htmlManagerServlet.serverVersion=\u0412\u0435\u0440\u0441\u0438\u044f Tomcat
 
htmlManagerServlet.title=\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435
 
\u0432\u0435\u0431\u002d\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f\u043c\u0438
 \u0054\u006f\u006d\u0063\u0061\u0074
+
 managerServlet.alreadyContext=\u041e\u0428\u0418\u0411\u041a\u0410 - 
\u041f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u0443\u0436\u0435 
\u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442 \u043d\u0430 
\u043f\u0443\u0442\u0438 [{0}]
 
managerServlet.certsNotAvailable=\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f
 \u043e \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u0435 
\u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c 
\u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0430 \u0432\u043e 
\u0432\u0440\u0435\u043c\u044f \u0440\u0430\u0431\u043e\u0442\u044b
 managerServlet.deleteFail=\u041e\u0428\u0418\u0411\u041a\u0410 - \u041d\u0435 
\u0443\u0434\u0430\u043b\u043e\u0441\u044c 
\u0443\u0434\u0430\u043b\u0438\u0442\u044c [{0}].
 managerServlet.deployed=OK - 
\u0420\u0430\u0437\u0432\u0435\u0440\u043d\u0443\u0442\u043e\u0435 
\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u0432 
\u043a\u043e\u043d\u0442\u0435\u043a\u0441\u0442\u043d\u043e\u043c 
\u043f\u0443\u0442\u0438 [{0}]
-managerServlet.deployFailed=\u041e\u0428\u0418\u0411\u041a\u0410 - 
\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c 
\u0440\u0430\u0437\u0432\u0435\u0440\u043d\u0443\u0442\u044c 
\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u043d\u0430  
\u043a\u043e\u043d\u0442\u0435\u043a\u0441\u0442\u043e\u043c 
\u043f\u0443\u0442\u0438 [{0}]
 managerServlet.deployedButNotStarted=\u041e\u0428\u0418\u0411\u041a\u0410 - 
\u0420\u0430\u0437\u0432\u0435\u0440\u043d\u0443\u0442\u043e\u0435 
\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u0432 
\u043a\u043e\u043d\u0442\u0435\u043a\u0441\u0442\u043d\u043e\u043c 
\u043f\u0443\u0442\u0438 [{0}] \u043d\u043e \u043e\u043d \u043d\u0435 
\u0437\u0430\u043f\u0443\u0441\u0442\u0438\u043b\u0441\u044f
+managerServlet.deployFailed=\u041e\u0428\u0418\u0411\u041a\u0410 - 
\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c 
\u0440\u0430\u0437\u0432\u0435\u0440\u043d\u0443\u0442\u044c 
\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u043d\u0430  
\u043a\u043e\u043d\u0442\u0435\u043a\u0441\u0442\u043e\u043c 
\u043f\u0443\u0442\u0438 [{0}]
 managerServlet.exception=\u041e\u0428\u0418\u0411\u041a\u0410 - 
\u0412\u0441\u0442\u0440\u0435\u0442\u0438\u043b\u043e\u0441\u044c 
\u0438\u0441\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435[{0}]
 managerServlet.findleaksFail=\u041e\u0428\u0418\u0411\u041a\u0410 - 
\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c 
\u043d\u0430\u0439\u0442\u0438 \u0443\u0442\u0435\u0447\u043a\u0438 
\u043f\u0430\u043c\u044f\u0442\u0438: Host not instance of StandardHost
 managerServlet.findleaksList=OK - \u041d\u0430\u0439\u0434\u0435\u043d\u044b 
\u043f\u043e\u0442\u0435\u043d\u0446\u0438\u0430\u043b\u044c\u043d\u044b\u0435 
\u043e\u0448\u0438\u0431\u043a\u0438 \u0432 
\u043f\u0430\u043c\u044f\u0442\u0438 \u0432 
\u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0445 
\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f\u0445:
@@ -101,25 +137,25 @@ managerServlet.noContext=\u041e\u0428\u0
 managerServlet.noGlobal=\u041e\u0428\u0418\u0411\u041a\u0410 - 
\u0413\u043b\u043e\u0431\u0430\u043b\u044c\u043d\u044b\u0435 
\u0440\u0435\u0441\u0443\u0440\u0441\u044b \u004a\u004e\u0044\u0049 
\u043d\u0435\u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b
 managerServlet.noManager=\u041e\u0428\u0418\u0411\u041a\u0410 - 
\u041e\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u0435\u0442 
\u043c\u0435\u043d\u0435\u0434\u0436\u0435\u0440 \u0434\u043b\u044f 
\u043f\u0443\u0442\u0438 [{0}]
 managerServlet.noSelf=\u041e\u0428\u0418\u0411\u041a\u0410 - 
\u041c\u0435\u043d\u0435\u0434\u0436\u0435\u0440 \u043d\u0435 
\u043c\u043e\u0436\u0435\u0442 
\u043f\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c\u002c
 \u0440\u0430\u0437\u0432\u0435\u0440\u043d\u0443\u0442\u044c\u002c 
\u043e\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u0438\u043b\u0438 
\u0440\u0430\u0437\u0432\u0435\u0440\u043d\u0443\u0442\u044c 
\u0441\u0435\u0431\u044f
-managerServlet.noWrapper=\u041a\u043e\u043d\u0442\u0435\u0439\u043d\u0435\u0440
 \u043d\u0435 \u0432\u044b\u0437\u0432\u0430\u043b setWrapper() 
\u0434\u043b\u044f \u044d\u0442\u043e\u0433\u043e 
\u0441\u0435\u0440\u0432\u043b\u0435\u0442\u0430
 managerServlet.notDeployed=\u041e\u0428\u0418\u0411\u041a\u0410 -  [{0}] 
\u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d \u0432 
\u0444\u0430\u0439\u043b\u0435 
\u0073\u0065\u0072\u0076\u0065\u0072\u002e\u0078\u006d\u006c \u0438 
\u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c 
\u0440\u0430\u0437\u0432\u0451\u0440\u043d\u0443\u0442
 managerServlet.notSslConnector=SSL \u0434\u043b\u044f 
\u044d\u0442\u043e\u0433\u043e 
\u043a\u043e\u043d\u043d\u0435\u043a\u0442\u043e\u0440\u0430 \u043d\u0435 
\u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d
+managerServlet.noWrapper=\u041a\u043e\u043d\u0442\u0435\u0439\u043d\u0435\u0440
 \u043d\u0435 \u0432\u044b\u0437\u0432\u0430\u043b setWrapper() 
\u0434\u043b\u044f \u044d\u0442\u043e\u0433\u043e 
\u0441\u0435\u0440\u0432\u043b\u0435\u0442\u0430
 managerServlet.objectNameFail=\u041e\u0428\u0418\u0411\u041a\u0410 - 
\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c 
\u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c
 \u0438\u043c\u044f \u043e\u0431\u044a\u0435\u043a\u0442\u0430 [{0}] 
\u0434\u043b\u044f Manager Servlet
 managerServlet.postCommand=\u041e\u0428\u0418\u0411\u041a\u0410 - 
\u041f\u043e\u043f\u044b\u0442\u043a\u0430 
\u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c 
\u043a\u043e\u043c\u0430\u043d\u0434\u0443 [{0}] \u0447\u0435\u0440\u0435\u0437 
\u0437\u0430\u043f\u0440\u043e\u0441 GET \u043d\u043e 
\u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f POST
 managerServlet.reloaded=OK - 
\u041f\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0436\u0435\u043d\u043d\u043e\u0435
 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u0432 
\u043f\u0443\u0442\u0438 \u043a\u043e\u043d\u0442\u0435\u043a\u0441\u0442\u0430 
[{0}]
 managerServlet.renameFail=\u041e\u0428\u0418\u0411\u041a\u0410 - 
\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e 
\u043f\u0435\u0440\u0435\u0438\u043c\u0435\u043d\u043e\u0432\u0430\u0442\u044c  
[{0}] \u0432 [{1}]. \u042d\u0442\u043e \u043c\u043e\u0436\u0435\u0442 
\u0432\u044b\u0437\u0432\u0430\u0442\u044c 
\u043f\u0440\u043e\u0431\u043b\u0435\u043c\u044b \u0434\u043b\u044f 
\u0431\u0443\u0434\u0443\u0449\u0438\u0445 
\u0440\u0430\u0437\u0432\u0435\u0440\u0442\u044b\u0432\u0430\u043d\u0438\u0439.
 managerServlet.resourcesAll=OK - 
\u041f\u0435\u0440\u0435\u0447\u0438\u0441\u043b\u0435\u043d\u044b 
\u0440\u0435\u0441\u0443\u0440\u0441\u044b \u0432\u0441\u0435\u0445 
\u0432\u0438\u0434\u043e\u0432
 managerServlet.resourcesType=OK - 
\u041f\u0435\u0440\u0435\u0447\u0438\u0441\u043b\u0435\u043d\u044b 
\u0440\u0435\u0441\u0443\u0440\u0441\u044b \u0432\u0438\u0434\u0430 [{0}]
-managerServlet.saveFail=\u041e\u0428\u0418\u0411\u041a\u0410 - \u041d\u0435 
\u0443\u0434\u0430\u043b\u043e\u0441\u044c 
\u0441\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c 
\u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438: [{0}]
 managerServlet.saved=OK - 
\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f 
\u0441\u0435\u0440\u0432\u0435\u0440\u0430 
\u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u0430
 managerServlet.savedContext=OK - 
\u041a\u043e\u043d\u0442\u0435\u043a\u0441\u0442\u043d\u044b\u0435 
\u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 
\u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u044b
+managerServlet.saveFail=\u041e\u0428\u0418\u0411\u041a\u0410 - \u041d\u0435 
\u0443\u0434\u0430\u043b\u043e\u0441\u044c 
\u0441\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c 
\u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438: [{0}]
 
managerServlet.sessiondefaultmax=\u0421\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u044b\u0439
 \u043c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u044b\u0439 
\u043f\u0435\u0440\u0438\u043e\u0434 
\u043d\u0435\u0430\u043a\u0442\u0438\u0432\u043d\u043e\u0439 
\u0441\u0435\u0441\u0441\u0438\u0438 [{0}] \u043c\u0438\u043d\u0443\u0442\u044b
+managerServlet.sessions=OK - 
\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f \u043e 
\u0441\u0435\u0430\u043d\u0441\u0435 
\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u043d\u0430 
\u043f\u0443\u0442\u0438 \u043a\u043e\u043d\u0442\u0435\u043a\u0441\u0442\u0430 
[{0}]
 managerServlet.sessiontimeout=[{0}] \u043c\u0438\u043d\u0443\u0442\u044b: 
[{1}] \u0441\u0435\u0441\u0441\u0438\u0438
-managerServlet.sessiontimeout.unlimited=\u043d\u0435\u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u043d\u043e\u0435
 \u0432\u0440\u0435\u043c\u044f: [{0}] \u0441\u0435\u0441\u0441\u0438\u0438
 managerServlet.sessiontimeout.expired=[{0}] 
\u043c\u0438\u043d\u0443\u0442\u044b: [{1}] 
\u0441\u0435\u0441\u0441\u0438\u0438 \u0438\u0441\u0442\u0435\u043a\u043b\u0438
-managerServlet.sessions=OK - 
\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f \u043e 
\u0441\u0435\u0430\u043d\u0441\u0435 
\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u043d\u0430 
\u043f\u0443\u0442\u0438 \u043a\u043e\u043d\u0442\u0435\u043a\u0441\u0442\u0430 
[{0}]
-managerServlet.sslConnectorCiphers=OK -  
\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f \u043e 
\u0448\u0438\u0444\u0440\u043e\u0432\u0430\u043d\u0438\u0438 \u0053\u0053\u004c
+managerServlet.sessiontimeout.unlimited=\u043d\u0435\u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u043d\u043e\u0435
 \u0432\u0440\u0435\u043c\u044f: [{0}] \u0441\u0435\u0441\u0441\u0438\u0438
 managerServlet.sslConnectorCerts=OK - 
\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f \u043e 
\u0446\u0435\u043f\u043e\u0447\u043a\u0435 
\u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0432
+managerServlet.sslConnectorCiphers=OK -  
\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f \u043e 
\u0448\u0438\u0444\u0440\u043e\u0432\u0430\u043d\u0438\u0438 \u0053\u0053\u004c
 managerServlet.sslConnectorTrustedCerts=OK -  
\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f \u043e 
\u0434\u043e\u0432\u0435\u0440\u0435\u043d\u043d\u043e\u043c 
\u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u0435 
\u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u0438
 managerServlet.sslReload=OK - 
\u041f\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0430 
\u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438 
\u0054\u004c\u0053 \u0434\u043b\u044f [{0}]
 managerServlet.sslReloadAll=OK - 
\u041f\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0430 
\u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438 
\u0054\u004c\u0053 \u0434\u043b\u044f \u0432\u0441\u0435\u0445 
\u0432\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u044b\u0445 
\u0445\u043e\u0441\u0442\u043e\u0432 \u0054\u004c\u0053
@@ -134,40 +170,6 @@ managerServlet.trustedCertsNotConfigured
 managerServlet.undeployed=OK - 
\u041d\u0435\u0440\u0430\u0437\u0432\u0435\u0440\u043d\u0443\u0442\u043e\u0435 
\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u0432 
\u043a\u043e\u043d\u0442\u0435\u043a\u0441\u0442\u0435 \u043f\u0443\u0442\u0438 
[{0}]
 managerServlet.unknownCommand=\u041e\u0428\u0418\u0411\u041a\u0410 - 
\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u0430\u044f 
\u043a\u043e\u043c\u0430\u043d\u0434\u0430 [{0}]
 managerServlet.vminfo=OK - \u0056\u004d \u0438\u043d\u0444\u043e
-statusServlet.title=\u0421\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u0435 
\u0441\u0435\u0440\u0432\u0435\u0440\u0430
+
 statusServlet.complete=\u0421\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u0435 
\u0441\u0435\u0440\u0432\u0435\u0440\u0430
-htmlManagerServlet.osPhysicalMemory=\u0424\u0438\u0437\u0438\u0447\u0435\u0441\u043A\u0430\u044F
 \u043F\u0430\u043C\u044F\u0442\u044C:
-htmlManagerServlet.osAvailableMemory=\u0414\u043E\u0441\u0442\u0443\u043F\u043D\u0430\u044F
 \u043F\u0430\u043C\u044F\u0442\u044C:
-htmlManagerServlet.osTotalPageFile=\u0412\u0441\u0435\u0433\u043E 
\u0444\u0430\u0439\u043B\u043E\u0432\u044B\u0445 
\u0441\u0442\u0440\u0430\u043D\u0438\u0446:
-htmlManagerServlet.osFreePageFile=\u0421\u0432\u043E\u0431\u043E\u0434\u043D\u044B\u0435
 \u0444\u0430\u0439\u043B\u043E\u0432\u044B\u0435 
\u0441\u0442\u0440\u0430\u043D\u0438\u0446\u044B:
-htmlManagerServlet.osMemoryLoad=\u041F\u0430\u043C\u044F\u0442\u0438 
\u0417\u0430\u0433\u0440\u0443\u0436\u0435\u043D\u043E:
-htmlManagerServlet.osKernelTime=\u0412\u0440\u0435\u043C\u044F 
\u041E\u0431\u0440\u0430\u0431\u043E\u0442\u043A\u0438 
\u043F\u0440\u043E\u0446\u0435\u0441\u0441\u0430 \u044F\u0434\u0440\u043E\u043C:
-htmlManagerServlet.osUserTime=\u0412\u0440\u0435\u043C\u044F 
\u043E\u0431\u0440\u0430\u0431\u043E\u0442\u043A\u0438 
\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F:
-htmlManagerServlet.jvmFreeMemory=\u0421\u0432\u043E\u0431\u043E\u0434\u043D\u0430\u044F
 \u041F\u0430\u043C\u044F\u0442\u044C:
-htmlManagerServlet.jvmMaxMemory=\u041C\u0430\u043A\u0441\u0438\u043C\u0443\u043C
 \u043F\u0430\u043C\u044F\u0442\u0438:
-htmlManagerServlet.jvmTotalMemory=\u0412\u0441\u044F 
\u043F\u0430\u043C\u044F\u0442\u044C:
-htmlManagerServlet.jvmTableTitleMemoryPool=\u041E\u0431\u043B\u0430\u0441\u0442\u0438
 \u043F\u0430\u043C\u044F\u0442\u0438
-htmlManagerServlet.jvmTableTitleType=\u0422\u0438\u043F
-htmlManagerServlet.jvmTableTitleInitial=\u0418\u0437\u043D\u0430\u0447\u0430\u043B\u044C\u043D\u043E
-htmlManagerServlet.jvmTableTitleTotal=\u0412\u0441\u0435\u0433\u043E
-htmlManagerServlet.jvmTableTitleMaximum=\u041C\u0430\u043A\u0441\u0438\u043C\u0443\u043C
-htmlManagerServlet.jvmTableTitleUsed=\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u0442\u0441\u044F
-htmlManagerServlet.connectorStateMaxThreads=\u041C\u0430\u043A\u0441\u0438\u043C\u0443\u043C
 \u043F\u0440\u043E\u0446\u0435\u0441\u0441\u043E\u0432:
-htmlManagerServlet.connectorStateThreadCount=\u041D\u044B\u043D\u0435\u0448\u043D\u0435\u0435
 \u0447\u0438\u0441\u043B\u043E 
\u043F\u0440\u043E\u0446\u0435\u0441\u0441\u043E\u0432:
-htmlManagerServlet.connectorStateThreadBusy=\u041D\u044B\u043D\u0435\u0448\u043D\u0435\u0435
 \u0447\u0438\u0441\u043B\u043E \u0437\u0430\u043D\u044F\u0442\u044B\u0445 
\u043F\u0440\u043E\u0446\u0435\u0441\u0441\u043E\u0432:
-htmlManagerServlet.connectorStateAliveSocketCount=\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E
 \u0432\u0441\u0451 \u0435\u0449\u0451 \u0436\u0438\u0432\u044B\u0445 
\u0441\u043E\u043A\u0435\u0442\u043E\u0432:
-htmlManagerServlet.connectorStateMaxProcessingTime=\u041C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u044C\u043D\u043E\u0435
 \u043F\u0440\u043E\u0446\u0435\u0441\u0441\u043E\u0440\u043D\u043E\u0435 
\u0432\u0440\u0435\u043C\u044F:
-htmlManagerServlet.connectorStateProcessingTime=\u041F\u0440\u043E\u0446\u0435\u0441\u0441\u043E\u0440\u043D\u043E\u0435
 \u0432\u0440\u0435\u043C\u044F:
-htmlManagerServlet.connectorStateRequestCount=\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E
 \u0437\u0430\u043F\u0440\u043E\u0441\u043E\u0432:
-htmlManagerServlet.connectorStateErrorCount=\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E
 \u043E\u0448\u0438\u0431\u043E\u043A:
-htmlManagerServlet.connectorStateBytesRecieved=\u0411\u0430\u0439\u0442\u043E\u0432
 \u043F\u043E\u043B\u0443\u0447\u0435\u043D\u043E:
-htmlManagerServlet.connectorStateBytesSent=\u0411\u0430\u0439\u0442\u043E\u0432
 \u043E\u0442\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043E:
-htmlManagerServlet.connectorStateTableTittleStage=\u042D\u0442\u0430\u043F
-htmlManagerServlet.connectorStateTableTittleTime=\u0412\u0440\u0435\u043C\u044F
-htmlManagerServlet.connectorStateTableTittleBSent=\u0411 
\u041E\u0442\u043F\u0440\u0432\u043B\u0435\u043D\u043E
-htmlManagerServlet.connectorStateTableTittleBRecv=\u0411 
\u041F\u043E\u043B\u0443\u0447\u0435\u043D\u043E
-htmlManagerServlet.connectorStateTableTittleClientForw=\u041A\u043B\u0438\u0435\u043D\u0442
 (\u041E\u0442\u043E\u0441\u043B\u0430\u043D\u044B\u0439)
-htmlManagerServlet.connectorStateTableTittleClientAct=\u041A\u043B\u0438\u0435\u043D\u0442
 (\u041D\u0430\u0441\u0442\u043E\u044F\u0449\u0438\u0439)
-htmlManagerServlet.connectorStateTableTittleVHost=\u0412\u0425\u043E\u0441\u0442
-htmlManagerServlet.connectorStateTableTittleRequest=\u0417\u0430\u043F\u0440\u043E\u0441\u044B
-htmlManagerServlet.connectorStateHint=P: 
\u0420\u0430\u0437\u0431\u0438\u0440\u0430\u0435\u0442\u0441\u044F \u0438 
\u0433\u043E\u0442\u043E\u0432\u0438\u0442\u0441\u044F \u043A 
\u043E\u0442\u043F\u0440\u0430\u0432\u043A\u0438 S: 
\u0421\u0435\u0440\u0432\u0438\u0441 F: 
\u0417\u0430\u0432\u0435\u0440\u0448\u0435\u043D\u0438\u0435 R: 
\u0413\u043E\u0442\u043E\u0432 K: 
\u041F\u0440\u043E\u0434\u043E\u043B\u0436\u0430\u0435\u0442 
\u0441\u0443\u0449\u0435\u0441\u0442\u0432\u043E\u0432\u0430\u0442\u044C
+statusServlet.title=\u0421\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u0435 
\u0441\u0435\u0440\u0432\u0435\u0440\u0430

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties?rev=1853349&r1=1853348&r2=1853349&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties
 Mon Feb 11 12:04:07 2019
@@ -13,72 +13,72 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+hostManagerServlet.add=add: Adding host [{0}]
+hostManagerServlet.add=OK - Host {0} added
+hostManagerServlet.addFailed=FAIL - Failed to add host {0}
+hostManagerServlet.alreadyHost=FAIL - Host already exists with host name {0}
 hostManagerServlet.alreadyStarted=FAIL - Host [{0}] is already started
 hostManagerServlet.alreadyStopped=FAIL - Host [{0}] is already stopped
 hostManagerServlet.appBaseCreateFail=FAIL - Failed to create appBase [{0}] for 
host [{1}]
+hostManagerServlet.cannotRemoveOwnHost=FAIL - Cannot remove own host {0}
+hostManagerServlet.cannotStartOwnHost=FAIL - Cannot start own host {0}
+hostManagerServlet.cannotStopOwnHost=FAIL - Cannot stop own host {0}
 hostManagerServlet.configBaseCreateFail=FAIL - Failed to identify configBase 
for host [{0}]
-hostManagerServlet.noCommand=FAIL - No command was specified
-hostManagerServlet.postCommand=FAIL - Tried to use command {0} via a GET 
request but POST is required
-hostManagerServlet.unknownCommand=FAIL - Unknown command {0}
-hostManagerServlet.noWrapper=Container has not called setWrapper() for this 
servlet
+hostManagerServlet.exception=FAIL - Encountered exception {0}
 hostManagerServlet.invalidHostName=FAIL - Invalid host name {0} was specified
-hostManagerServlet.noHost=FAIL - Host name {0} does not exist
-hostManagerServlet.alreadyHost=FAIL - Host already exists with host name {0}
+hostManagerServlet.list=list: Listing hosts for engine [{0}]
+hostManagerServlet.listed=OK - Listed hosts
+hostManagerServlet.listitem={0}:{1}
 hostManagerServlet.managerXml=FAIL - Couldn't install manager.xml
-hostManagerServlet.exception=FAIL - Encountered exception {0}
-hostManagerServlet.add=OK - Host {0} added
-hostManagerServlet.addFailed=FAIL - Failed to add host {0}
-hostManagerServlet.cannotRemoveOwnHost=FAIL - Cannot remove own host {0}
+hostManagerServlet.noCommand=FAIL - No command was specified
+hostManagerServlet.noHost=FAIL - Host name {0} does not exist
+hostManagerServlet.noWrapper=Container has not called setWrapper() for this 
servlet
+hostManagerServlet.postCommand=FAIL - Tried to use command {0} via a GET 
request but POST is required
 hostManagerServlet.remove=OK - Removed host {0}
+hostManagerServlet.remove=remove: Removing host [{0}]
 hostManagerServlet.removeFailed=FAIL - Failed to remove host {0}
-hostManagerServlet.listed=OK - Listed hosts
-hostManagerServlet.listitem={0}:{1}
-hostManagerServlet.cannotStartOwnHost=FAIL - Cannot start own host {0}
+hostManagerServlet.start=start: Starting host with name [{0}]
 hostManagerServlet.started=OK - Host {0} started
 hostManagerServlet.startFailed=FAIL - Failed to start host {0}
-hostManagerServlet.cannotStopOwnHost=FAIL - Cannot stop own host {0}
-hostManagerServlet.stopped=OK - Host {0} stopped
-hostManagerServlet.stopFailed=FAIL - Failed to stop host {0}
-hostManagerServlet.add=add: Adding host [{0}]
-hostManagerServlet.remove=remove: Removing host [{0}]
-hostManagerServlet.list=list: Listing hosts for engine [{0}]
-hostManagerServlet.start=start: Starting host with name [{0}]
 hostManagerServlet.stop=stop: Stopping host with name [{0}]
+hostManagerServlet.stopFailed=FAIL - Failed to stop host {0}
+hostManagerServlet.stopped=OK - Host {0} stopped
+hostManagerServlet.unknownCommand=FAIL - Unknown command {0}
 
-htmlHostManagerServlet.title=Tomcat Virtual Host Manager
-htmlHostManagerServlet.messageLabel=Message:
-htmlHostManagerServlet.manager=Host Manager
-htmlHostManagerServlet.list=List Virtual Hosts
-htmlHostManagerServlet.helpHtmlManagerFile=../docs/html-host-manager-howto.html
-htmlHostManagerServlet.helpHtmlManager=HTML Host Manager Help
-htmlHostManagerServlet.helpManagerFile=../docs/host-manager-howto.html
-htmlHostManagerServlet.helpManager=Host Manager Help
-htmlHostManagerServlet.hostName=Host name
-htmlHostManagerServlet.hostAliases=Host aliases
-htmlHostManagerServlet.hostTasks=Commands
-htmlHostManagerServlet.hostsStart=Start
-htmlHostManagerServlet.hostsStop=Stop
-htmlHostManagerServlet.hostsRemove=Remove
-htmlHostManagerServlet.hostThis=Host Manager installed - commands disabled
-htmlHostManagerServlet.addTitle=Add Virtual Host
-htmlHostManagerServlet.addHost=Host
-htmlHostManagerServlet.addName=Name:
 htmlHostManagerServlet.addAliases=Aliases:
 htmlHostManagerServlet.addAppBase=App base:
-htmlHostManagerServlet.addManager=Manager App
 htmlHostManagerServlet.addAutoDeploy=AutoDeploy
+htmlHostManagerServlet.addButton=Add
+htmlHostManagerServlet.addCopyXML=CopyXML
 htmlHostManagerServlet.addDeployOnStartup=DeployOnStartup
 htmlHostManagerServlet.addDeployXML=DeployXML
+htmlHostManagerServlet.addHost=Host
+htmlHostManagerServlet.addManager=Manager App
+htmlHostManagerServlet.addName=Name:
+htmlHostManagerServlet.addTitle=Add Virtual Host
 htmlHostManagerServlet.addUnpackWARs=UnpackWARs
-htmlHostManagerServlet.addCopyXML=CopyXML
-htmlHostManagerServlet.addButton=Add
-htmlHostManagerServlet.serverTitle=Server Information
-htmlHostManagerServlet.serverVersion=Tomcat Version
-htmlHostManagerServlet.serverJVMVersion=JVM Version
+htmlHostManagerServlet.helpHtmlManager=HTML Host Manager Help
+htmlHostManagerServlet.helpHtmlManagerFile=../docs/html-host-manager-howto.html
+htmlHostManagerServlet.helpManager=Host Manager Help
+htmlHostManagerServlet.helpManagerFile=../docs/host-manager-howto.html
+htmlHostManagerServlet.hostAliases=Host aliases
+htmlHostManagerServlet.hostName=Host name
+htmlHostManagerServlet.hostsRemove=Remove
+htmlHostManagerServlet.hostsStart=Start
+htmlHostManagerServlet.hostsStop=Stop
+htmlHostManagerServlet.hostTasks=Commands
+htmlHostManagerServlet.hostThis=Host Manager installed - commands disabled
+htmlHostManagerServlet.list=List Virtual Hosts
+htmlHostManagerServlet.manager=Host Manager
+htmlHostManagerServlet.messageLabel=Message:
 htmlHostManagerServlet.serverJVMVendor=JVM Vendor
+htmlHostManagerServlet.serverJVMVersion=JVM Version
+htmlHostManagerServlet.serverOSArch=OS Architecture
 htmlHostManagerServlet.serverOSName=OS Name
 htmlHostManagerServlet.serverOSVersion=OS Version
-htmlHostManagerServlet.serverOSArch=OS Architecture
+htmlHostManagerServlet.serverTitle=Server Information
+htmlHostManagerServlet.serverVersion=Tomcat Version
+htmlHostManagerServlet.title=Tomcat Virtual Host Manager
 
-statusServlet.title=Server Status
 statusServlet.complete=Complete Server Status
+statusServlet.title=Server Status

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/LocalStrings_es.properties?rev=1853349&r1=1853348&r2=1853349&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/LocalStrings_es.properties
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/LocalStrings_es.properties
 Mon Feb 11 12:04:07 2019
@@ -44,38 +44,40 @@ hostManagerServlet.remove = quitar\: Qui
 hostManagerServlet.list = listar\: Listando m\u00E1quinas para motor [{0}]
 hostManagerServlet.start = arrancar\: Arrancando m\u00E1quina con nombre [{0}]
 hostManagerServlet.stop = parar\: Parando m\u00E1quina con nombre [{0}]
-htmlHostManagerServlet.title = Gestor de M\u00E1quina Virtual de Tomcat
-htmlHostManagerServlet.messageLabel = Mensaje\:
-htmlHostManagerServlet.manager = Gestor de M\u00E1quina
-htmlHostManagerServlet.list = Lista de M\u00E1quinas Virtuales
-htmlHostManagerServlet.helpHtmlManagerFile = html-host-manager-howto.html
-htmlHostManagerServlet.helpHtmlManager = Ayuda de Gestor de M\u00E1quina HTML 
(\u00A1En breve\!)
-htmlHostManagerServlet.helpManagerFile = ../docs/host-manager-howto.html
-htmlHostManagerServlet.helpManager = Ayuda de Gestor de M\u00E1quina
-htmlHostManagerServlet.hostName = Nombre de M\u00E1quina
-htmlHostManagerServlet.hostAliases = Aliases de M\u00E1quina
-htmlHostManagerServlet.hostTasks = Comandos
-htmlHostManagerServlet.hostsStart = Iniciar
-htmlHostManagerServlet.hostsStop = Parar
-htmlHostManagerServlet.hostsRemove = Quitar
-htmlHostManagerServlet.hostThis = Instalado Gestor de M\u00E1quinas - comandos 
deactivados
-htmlHostManagerServlet.addTitle = A\u00F1adir M\u00E1quina Virtual
-htmlHostManagerServlet.addHost = M\u00E1quina
-htmlHostManagerServlet.addName = Nombre\:
+
 htmlHostManagerServlet.addAliases = Aliases\:
 htmlHostManagerServlet.addAppBase = App base\:
-htmlHostManagerServlet.addManager = App de Gestor
 htmlHostManagerServlet.addAutoDeploy = AutoDeploy
+htmlHostManagerServlet.addButton = A\u00F1adir
 htmlHostManagerServlet.addDeployOnStartup = DeployOnStartup
 htmlHostManagerServlet.addDeployXML = DeployXML
+htmlHostManagerServlet.addHost = M\u00E1quina
+htmlHostManagerServlet.addManager = App de Gestor
+htmlHostManagerServlet.addName = Nombre\:
+htmlHostManagerServlet.addTitle = A\u00F1adir M\u00E1quina Virtual
 htmlHostManagerServlet.addUnpackWARs = UnpackWARs
-htmlHostManagerServlet.addButton = A\u00F1adir
-htmlHostManagerServlet.serverTitle = Informaci\u00F3n de Servidor
-htmlHostManagerServlet.serverVersion = Versi\u00F3n de Tomcat
-htmlHostManagerServlet.serverJVMVersion = Versi\u00F3n de JVM
+htmlHostManagerServlet.helpHtmlManager = Ayuda de Gestor de M\u00E1quina HTML 
(\u00A1En breve\!)
+htmlHostManagerServlet.helpHtmlManagerFile = html-host-manager-howto.html
+htmlHostManagerServlet.helpManager = Ayuda de Gestor de M\u00E1quina
+htmlHostManagerServlet.helpManagerFile = ../docs/host-manager-howto.html
+htmlHostManagerServlet.hostAliases = Aliases de M\u00E1quina
+htmlHostManagerServlet.hostName = Nombre de M\u00E1quina
+htmlHostManagerServlet.hostsRemove = Quitar
+htmlHostManagerServlet.hostsStart = Iniciar
+htmlHostManagerServlet.hostsStop = Parar
+htmlHostManagerServlet.hostTasks = Comandos
+htmlHostManagerServlet.hostThis = Instalado Gestor de M\u00E1quinas - comandos 
deactivados
+htmlHostManagerServlet.list = Lista de M\u00E1quinas Virtuales
+htmlHostManagerServlet.manager = Gestor de M\u00E1quina
+htmlHostManagerServlet.messageLabel = Mensaje\:
 htmlHostManagerServlet.serverJVMVendor = Vendedor JVM
+htmlHostManagerServlet.serverJVMVersion = Versi\u00F3n de JVM
+htmlHostManagerServlet.serverOSArch = Arquitectura de SO
 htmlHostManagerServlet.serverOSName = Nombre de SO
 htmlHostManagerServlet.serverOSVersion = Versi\u00F3n de SO
-htmlHostManagerServlet.serverOSArch = Arquitectura de SO
-statusServlet.title = Estado de Servidor
+htmlHostManagerServlet.serverTitle = Informaci\u00F3n de Servidor
+htmlHostManagerServlet.serverVersion = Versi\u00F3n de Tomcat
+htmlHostManagerServlet.title = Gestor de M\u00E1quina Virtual de Tomcat
+
 statusServlet.complete = Completar Estado de Servidor
+statusServlet.title = Estado de Servidor



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

Reply via email to