Author: markt
Date: Fri Nov 23 09:44:51 2018
New Revision: 1847236
URL: http://svn.apache.org/viewvc?rev=1847236&view=rev
Log:
Simplified Chinese translation updates
Modified:
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/tribes/io/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/users/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/util/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/coyote/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/coyote/http11/filters/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/naming/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/tomcat/util/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/tomcat/util/scan/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings_zh_CN.properties
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/examples/WEB-INF/classes/LocalStrings_zh_CN.properties
Modified:
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
(original)
+++
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
Fri Nov 23 09:44:51 2018
@@ -32,6 +32,9 @@ coyoteRequest.noMultipartConfig=ç±ä
coyoteRequest.setAttribute.namenull=ä¸è½å¨ä¸ä¸ªç©ºçååä¸è°ç¨setAttribute
coyoteResponse.encoding.invalid=JREæ æ³è¯å«ç¼ç [{0}]
+coyoteResponse.sendRedirect.note=<html><body><p>éå®åå°<a
href="{0}">{0}</a></p></body></html>
+
+request.asyncNotSupported=å½åé¾ççéå¨æservletä¸æ¯æå¼æ¥æä½ã
requestFacade.nullRequest=请æ±å¯¹è±¡å·²è¢«åæ¶ï¼ä¸åä¸æ¤facadeå
³è
Modified:
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
Fri Nov 23 09:44:51 2018
@@ -16,6 +16,7 @@
applicationContext.addJspFile.iae=JSP æ件 [{0}] ä¸å¯ç¨
applicationContext.addListener.iae.cnfe=æ æ³å建类å为 [{0}] çå®ä¾
applicationContext.addListener.iae.wrongType=æå®çç±»å[{0}]ä¸æ¯é¢æç侦å¬å¨ç±»åä¹ä¸
+applicationContext.attributeEvent=å±æ§äºä»¶çå¬å¨å¼åçå¼å¸¸
applicationContext.invalidServletName=ç±äºservletå称[{0}]æ æï¼æ
æ³æ·»å 对åºservletçå®ä¹ã
applicationContext.mapping.error=æ å°ä¸.çé误
applicationContext.setAttribute.namenull=Name ä¸è½ä¸º null
@@ -28,12 +29,15 @@ applicationDispatcher.specViolation.resp
applicationFilterRegistration.nullInitParams=ç±äºnameå(æ)value为nullï¼æ
æ³ä¸ºè¿æ»¤å¨è®¾ç½®åå§ååæ°ãname为 [{0}]ï¼value为 [{1}]
applicationPushBuilder.methodNotToken=HTTPæ¹æ³å¿
é¡»æ¯ä»¤ç(token)ï¼ä½
[{0}] å
å«é令çå符
+applicationPushBuilder.noCoyoteRequest=æ
æ³ä»è¯¥ç±»å[{0}]请æ±ä¸è·ååºå±Coyoteç请æ±ç对象ï¼è¿ä¸ªå¯¹è±¡è¢«ç¨æ¥å建ä¸ä¸ªæ¨é请æ±ï¼
aprListener.aprInitError=åºäºAPRçæ¬å°åºå 载失败.é误æ¥å为[{0}]
+aprListener.initializeFIPSSuccess=æåçè¿å
¥FIPS 模å¼
aprListener.initializingFIPS=åå§åFIPS模å¼...
aprListener.tooLateForSSLRandomSeed=æ æ³è®¾ç½®
SSLRandomSeedï¼SSLå·²ç»åå§å
containerBase.backgroundProcess.error=å¤çåå°çº¿ç¨å¼å¸¸
+containerBase.backgroundProcess.unexpectedThreadDeath=åå°çº¿ç¨[{0}]æå¤ç»æ
containerBase.nullName=容å¨å称ä¸è½ä¸ºnull
containerBase.threadedStartFailed=å容å¨å¯å¨å¤±è´¥
@@ -49,6 +53,7 @@ naming.invalidEnvEntryType=ç¯å¢�
naming.wsdlFailed=æªæ¾å° wsdl æ件ï¼[{0}]
standardContext.backgroundProcess.resources=å¼å¸¸å¤çèµæº[{0}]
åå°è¿ç¨
+standardContext.cookieProcessor.null=ä¸å
许å°ä¸ä¸æçCookieProcessor
设置为null
standardContext.errorPage.required=ErrorPageä¸è½ä¸ºnull
standardContext.errorPage.warning=è¦åï¼å¨Servlet 2.4ä¸ï¼é误页ä½ç½®
[{0}] å¿
须以"/"å¼å¤´
standardContext.filterMap.either=è¿æ»¤å¨æ å°å¿
é¡»æå® <url-pattern> æ
<servlet-name>
@@ -61,15 +66,23 @@ standardContext.loginConfig.errorPage=è
standardContext.loginConfig.errorWarning=è¦åï¼Servlet
2.4ä¸ï¼è¡¨åé误页[{0}]å¿
须以"/"å¼å§
standardContext.loginConfig.loginPage=表åç»å½é¡µé¢ [{0}] å¿
须以''/''å¼å¤´
standardContext.managerFail=ä¼è¯ç®¡çå¨æ æ³å¯å¨
+standardContext.namingResource.init.fail=æªè½åå§åæ°çå½åèµæº
standardContext.parameter.duplicate=éå¤çä¸ä¸æåå§ååæ°[{0}]
standardContext.predestroy.duplicate=ç±» [{0}] ç @PreDestroy
æ¹æ³å®ä¹éå¤
+standardContext.resourcesStart=å¯å¨éæèµæºåºé
standardContext.resourcesStop=åæ¢éæèµæºæ¶åºé
standardContext.securityConstraint.mixHttpMethod=å¨ç¸åçwebèµæºéåä¸ä¸å
许混ç¨: <http-method> å <http-method-omission>
standardContext.securityConstraint.pattern=å®å
¨çº¦æä¸ç<url-pattern>
[{0}] æ æ
standardContext.servletFail=å¯å¨æ¶æ æ³å è½½ä¸ä¸ªæå¤ä¸ªServletã å
¨é¨ç详ç»ä¿¡æ¯å¯å¨ç¸åºç容å¨æ¥å¿æ件ä¸æ¾å°
+standardContext.stoppingContext=å¼å¸¸åæ¢çä¸ä¸æ使ç¨å为[{0}]
standardContext.unknownCookieEncoding=为setCookieEncoding(String)æå®äºæªç¥ç¼ç
[{0}]ï¼å æ¤å°ä½¿ç¨é»è®¤çUTF-8ã
+standardContextValve.acknowledgeException=以100ï¼ç»§ç»ï¼ååºç¡®è®¤è¯·æ±å¤±è´¥
+
+standardEngine.notParent=å¼æä¸è½æç¶å®¹å¨
+
standardHost.noContext=没æé
ç½®ä¸ä¸ææ¥å¤çæ¤è¯·æ±
+standardHost.notContext=主æºçåèç¹å¿
é¡»æä¸ä¸æ
standardServer.accept.timeout=å¨è°ç¨accept()æ¹æ³ä¹åï¼ä¾¦å¬shutdownå½ä»¤çå¥æ¥åç»åäºæå¤çè¶
æ¶[{0}]毫ç§ã è¿æ¯bug 56684çä¸ä¸ªä¾åï¼
Modified:
tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings_zh_CN.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings_zh_CN.properties
Fri Nov 23 09:44:51 2018
@@ -16,3 +16,4 @@
namingResources.cleanupCloseSecurity=æ
æ³æ£ç´¢å®¹å¨[{2}]ä¸çèµæº[{1}]çæ¹æ³[{0}]ï¼å
æ¤æ²¡æ对该èµæºè¿è¡æ¸
ç
namingResources.ejbLookupLink=EJBçå¼ç¨[{0}]åæ¶æå®äºejb-linkålookup-name
namingResources.envEntryLookupValue=ç¯å¢åæ° [{0}] æå®æ¥è¯¢å称åå¼
+namingResources.resourceTypeFail=å为[{0}]çJNDIèµæºæ¯ç±»å[{1}]ï¼ä½æ¯è¯¥ç±»åä¸ä¸ºè¯¥èµæºé
ç½®ç注å
¥ç®æ çç±»åä¸ä¸è´
Modified:
tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
(original)
+++
tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
Fri Nov 23 09:44:51 2018
@@ -17,6 +17,7 @@ farmWarDeployer.hostOnly=FarmWarDeployer
farmWarDeployer.modInstall=ä» [{1}] å®è£
webapp [{0}]
farmWarDeployer.modInstallFail=æ æ³å®è£
WAR æ件
farmWarDeployer.msgIoe=æ æ³è¯»åæå¡å¨åºé¨ç½²æ件æ¶æ¯ã
+farmWarDeployer.msgRxUndeploy=ä»è·¯å¾[{0}]æ¥æ¶æªé¨ç½²ç¾¤é
farmWarDeployer.removeFailRemote=æ¬å°ä»[{0}]å é¤å¤±è´¥ï¼å
¶ä»ç»çæappå¨æå¡ï¼
farmWarDeployer.removeLocalFail=æ æ³ç§»é¤WARæ件
farmWarDeployer.servicingUndeploy=æ£å¨å¤çåºç¨ç¨åº[{0}]ï¼æ
æ³ä»å¤ä»½ç¾¤éèç¹ä¸å é¤å®
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties
(original)
+++
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties
Fri Nov 23 09:44:51 2018
@@ -19,6 +19,7 @@ deltaManager.createSession.newSession=ç
deltaManager.foundMasterMember=å¤å¶ä¸»master
æåå¨ä¸ä¸æä¸è¢«åç°.\n
deltaManager.loading.cnfe=å è½½æä¹
åä¼è¯ [{0}]
æ¶åºç°ClassNotFoundException
deltaManager.loading.ioe=å è½½æä¹
session æ¶åºç° IOExceptionï¼[{0}]
+deltaManager.noSessionState=管çè
[{0}]ï¼æ²¡ææ¶å°[{1}]åéçä¼è¯ç¶æï¼å¨[{2}]毫ç§ä¹åè¶
æ¶ã
deltaManager.receiveMessage.expired=管çå¨[{0}]: æ¥æ¶å°çä¼è¯ [{1}]
å·²è¿æã
deltaManager.receiveMessage.unloadingBegin=管çå¨[{0}]: å¼å§å¸è½½ä¼è¯
deltaManager.sendMessage.newSession=\ 管çå¨ [{0}] åéæ°çä¼è¯ [{1}]
Modified:
tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_zh_CN.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_zh_CN.properties
Fri Nov 23 09:44:51 2018
@@ -19,4 +19,5 @@ ReplicationValve.session.found=ä¸ä�
simpleTcpCluster.clustermanager.notImplement=è¿æ¥å¨ [{0}] ä¸è½ç»§æ¿
ClusterManagerï¼é¤éé群被åæ¢ã
simpleTcpCluster.member.addFailed=æ æ³è¿æ¥å°å¤å¶ç³»ç»ã
simpleTcpCluster.member.disappeared=æ¶å°æåæ¶å¤±:[{0}]
+simpleTcpCluster.member.removeFailed=æ æ³ä»å¤å¶ç³»ç»ä¸ç§»é¤é群èç¹
simpleTcpCluster.stopUnable=æ æ³åæ¢é群
Modified:
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
Fri Nov 23 09:44:51 2018
@@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+webappClassLoader.addTransformer=å°ç±»æ件转æ¢å¨[{0}]æ·»å
å°Webåºç¨ç¨åº[{1}]ã
webappClassLoader.checkThreadLocalsForLeaks.badValue=æ æ³ç¡®å®ç±»å为
[{0}] çå¼çå符串表示形å¼
webappClassLoader.checkThreadLocalsForLeaks.unknown=:)æªç¥
webappClassLoader.checkThreadLocalsForLeaksNone=webåºç¨ç¨åº [{0}]
å建äº1个ThreadLocalåé(é®ï¼[{2}] (ç±»å[{1}])
ï¼å¼ï¼[{4}](ç±»å[{3}]) )ãé®ä»
被ThreadLocal
Mapå¼±å¼ç¨ï¼æ以ä¸æ¯å
åæ³é²ã
Modified:
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
Fri Nov 23 09:44:51 2018
@@ -23,6 +23,7 @@ htmlManagerServlet.configReloadButton=é
htmlManagerServlet.configSslReloadTitle=éæ°è¯»å TLS é
ç½®æ件
htmlManagerServlet.connectorStateBytesSent=åé.åè:
htmlManagerServlet.connectorStateProcessingTime=å¤çæ¶é´ï¼
+htmlManagerServlet.connectorStateTableTitleClientForw=客æ·ç«¯ï¼è½¬åï¼
htmlManagerServlet.connectorStateTableTitleRequest=请æ±
htmlManagerServlet.connectorStateTableTitleTime=æ¶é´
htmlManagerServlet.connectorStateTableTitleVHost=èæ主æº
@@ -37,12 +38,15 @@ htmlManagerServlet.diagnosticsLeak=�
htmlManagerServlet.diagnosticsSslConnectorCertsText=ååºå·²é
ç½®çTLSèæ主æºä»¥ååèªçè¯ä¹¦é¾
htmlManagerServlet.diagnosticsSslConnectorCipherButton=å¯.ç
htmlManagerServlet.diagnosticsTitle=è¯æ
+htmlManagerServlet.expire.unit=åé
+htmlManagerServlet.helpHtmlManager=HTML管çå¨å¸®å©
htmlManagerServlet.jvmFreeMemory=å©ä½å
åï¼
htmlManagerServlet.jvmTableTitleMaximum=æ大.å¼
htmlManagerServlet.jvmTableTitleMemoryPool=å
å.æ±
htmlManagerServlet.jvmTotalMemory=æ»å
å
htmlManagerServlet.manager=管çå¨
htmlManagerServlet.noManager=-
+htmlManagerServlet.noVersion=æªæå®
htmlManagerServlet.serverHostname=主æºå
htmlManagerServlet.serverIPAddress=IPå°å
htmlManagerServlet.serverJVMVersion=JVM.çæ¬
Modified:
tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_zh_CN.properties
(original)
+++
tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_zh_CN.properties
Fri Nov 23 09:44:51 2018
@@ -31,6 +31,7 @@ hostManagerServlet.stopFailed=失è´
hostManagerServlet.stopped=OK - ä¸»æº [{0}] å·²åæ¢
hostManagerServlet.unknownCommand=FAIL - æªç¥å½ä»¤ [{0}]
+htmlHostManagerServlet.addAppBase=åºç¨ç¨åºåºï¼
htmlHostManagerServlet.addAutoDeploy=èªå¨.é¨ç½²
htmlHostManagerServlet.addCopyXML=æ·è´XML
htmlHostManagerServlet.addDeployOnStartup=å¯å¨.é¨ç½²
@@ -50,4 +51,5 @@ htmlHostManagerServlet.serverOSArch=OS �
htmlHostManagerServlet.serverTitle=æå¡å¨ä¿¡æ¯
htmlHostManagerServlet.title=Tomcatèæ主æºç®¡çå
+statusServlet.complete=æå¡å¨å
¨é¨ç¶æ
statusServlet.title=æå¡å¨ç¶æ
Modified:
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
Fri Nov 23 09:44:51 2018
@@ -22,6 +22,7 @@ jaasCallback.username=è¿åç¨
jaasRealm.authenticateSuccess=ç¨æ·å [{0}] 已被æå认è¯ä¸ºèº«ä»½
[{1}] -- 主ä½ä¹å·²å建
jaasRealm.failedLogin=ç±äºç»å½å¤±è´¥ï¼ç¨æ·å [{0}] æ æ³ææ
+jaasRealm.loginContextCreated=为ç¨æ·åå建çJAAS ç»éä¸ä¸æ[{0}]
jndiRealm.authenticateSuccess=ç¨æ·å[{0}]æå认è¯
jndiRealm.cipherSuites=å¯ç¨ [{0}] ä½ä¸º TLS è¿æ¥çå å¯å¥ä»¶ã
Modified:
tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_zh_CN.properties
(original)
+++
tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_zh_CN.properties
Fri Nov 23 09:44:51 2018
@@ -18,6 +18,7 @@ cgiServlet.find.location=å¨ [{0}] æ
cgiServlet.runHeaderReaderFail=I/O é®é¢å
³é请æ±å¤´è¯»æä½
cgiServlet.runInvalidStatus=æ æç¶æ [{0}]
cgiServlet.runOutputStreamFail=å
³éè¾åºæµæ¶åçI/Oé®é¢
+cgiServlet.runReaderInterrupt=对äºæ åé误ç读线ç¨ï¼ä¸æ并çå¾
ã
directory.size=大å°
Modified:
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
Fri Nov 23 09:44:51 2018
@@ -23,10 +23,14 @@ managerBase.createSession.ise=createSess
persistentManager.storeSizeException=æ æ³ç¡®å® session
åå¨åºçä¼è¯æ°ï¼åå®åå¨åºä¸ºç©º
persistentManager.swapIn=å¨è¡¨ååå¨ä¸,交æ¢ä¼è¯[{0}]
+persistentManager.swapMaxIdle=交æ¢ä¼è¯[{0}]以åå¨ï¼ç©ºé²ä¸º[{1}]ç§
+persistentManager.swapTooManyActive=太å¤æ´»è·ä¼è¯,æ¿æ¢é²ç½® [{1}]
ç§çä¼è¯ [{0}]
standardManager.loading.exception=å è½½æä¹
åä¼è¯æ¶åçå¼å¸¸
standardManager.managerLoad=ä»æä¹
ååå¨å è½½ä¼è¯åçå¼å¸¸
+standardSession.getIdleTime.ise=getIdleTime: 已失æçä¼è¯
+standardSession.getLastAccessedTime.ise=getLastAccessedTime: ä¼è¯å·²å¤±æ
standardSession.getValueNames.ise=getValueNamesï¼ä¼è¯å·²ç»å¤±æ
standardSession.logoutfail=å½åè¯å°è¿æç»åºç¨æ·å¼å¸¸
standardSession.notDeserializable=æ æ³ååºååä¼è¯ [{1}] çå±æ§
[{0}]
Modified:
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
Fri Nov 23 09:44:51 2018
@@ -36,6 +36,7 @@ contextConfig.role.runas=<run-as> ä¸
contextConfig.tomcatWebXmlError=å¤ç /WEB-INF/tomcat-web.xml åçé误
engineConfig.cce=çå½å¨æäºä»¶æ°æ®å¯¹è±¡[{0}]ä¸æ¯ä¸ä¸ªå¼æ(Engine)
+engineConfig.stop=é
ç½®å¼æï¼å¤çè¿ç¨åæ¢ã
expandWar.copy=é误çæ·è´[{0}] to [{1}]
expandWar.createFailed=æ æ³å建æ件夹[{0}]ã
@@ -43,8 +44,10 @@ expandWar.deleteFailed=[{0}] æ æ³�
expandWar.deleteOld=åç°ä¸ä¸ªå±å¼çç®å½[{0}],å®çæåä¿®æ¹æ¶é´ä¸å
³èçWARä¸ä¸è´.å®å°è¢«å é¤.
expandWar.missingJarEntry=æ æ³è·å¾ JarEntry [{0}] çè¾å
¥æµ - WAR
æ件æ¯å¦å·²æå?
+hostConfig.appBase=主æº[{0}]çåºç¨ç¨åºåºç¡[{1}]ä¸åå¨æä¸æ¯ç®å½ãdeployOnStartUpåautoDebug已设置为falseï¼ä»¥é²æ¢é¨ç½²é误ãå
¶ä»é误ä»ç¶å¯è½åçã
hostConfig.deployDir=é¨ç½² web åºç¨ç¨åºç®å½ [{0}]
hostConfig.deployWar.error=é¨ç½² Web åºç¨ç¨åº archive [{0}] æ¶åºé
+hostConfig.docBaseUrlInvalid=ææä¾çé¨ç½²ç®å½æ æ³ç¨URLæ¥è¡¨ç¤º
hostConfig.expanding=æ©å±å·²åç°ç web åºç¨ç¨åº archive
hostConfig.stop=:)Hosté
ç½®:åæ¢å¤ç
@@ -58,6 +61,7 @@ userConfig.error=为ç¨æ· [{0}
userConfig.start=ç¨æ·é
ç½®ï¼å¤çå¼å§
versionLoggerListener.catalina.home=CATALINA_HOME: {0}
+versionLoggerListener.java.home=Java ç¯å¢åé: {0}
versionLoggerListener.os.arch=ç».é : {0}
versionLoggerListener.os.version=OS.çæ¬: {0}
versionLoggerListener.prop=ç³»ç»å±æ§: {0} = {1}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
Fri Nov 23 09:44:51 2018
@@ -14,6 +14,7 @@
# limitations under the License.
domainFilterInterceptor.member.refused=æå被æç»å å
¥é群 cluster[{0}]
+domainFilterInterceptor.message.refused=ä»é群[{0}]ä¸æ¥æ¶çæ¶æ¯è¢«æç»
encryptInterceptor.decrypt.error.short-message=失败ç解å¯æ¶æ¯:
æåç»æçç»å°¾æ¶æ¯
encryptInterceptor.encrypt.failed=æ æ³å å¯ä¿¡æ¯
@@ -44,6 +45,7 @@ staticMembershipInterceptor.no.pingInter
staticMembershipInterceptor.sendShutdown.failed=å
³ééç¥å¤±è´¥ã
tcpFailureDetector.failureDetection.failed=æ
æ³è¿è¡å¤±è´¥çæµï¼åå®æåå®æºã[{0}]
+tcpFailureDetector.heartbeat.failed=TCPå¿è·³æ£æµå¨æ æ³æ§è¡å¿è·³
tcpFailureDetector.still.alive=éªè¯å®æãæå [{0}] ä»ç¶åæ´»
tcpPingInterceptor.ping.failed=æ æ³åé TCP ping
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/io/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/io/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/io/LocalStrings_zh_CN.properties
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/io/LocalStrings_zh_CN.properties
Fri Nov 23 09:44:51 2018
@@ -17,6 +17,7 @@ objectReader.retrieveFailed.socketReceiv
replicationStream.conflict=åéå
¬å¼æ¥å£ç±»å è½½å¨å²çª
+xByteBuffer.no.package=XByteBufferä¸ä¸åå¨æ°æ®å
xByteBuffer.size.larger.buffer=大å°æ¯ç°æç¼å²åºå¤§ã
xByteBuffer.unableCreate=ä¸è½å建æ°æ®å
ï¼ buffer 太å°
xByteBuffer.wrong.class=æ¶æ¯å¯¹åºç±»ä¸ç¬¦åè¦æ±ã
å®åºè¯¥å®ç°Serializableï¼èä¸æ¯ï¼[{0}]ã
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings_zh_CN.properties
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings_zh_CN.properties
Fri Nov 23 09:44:51 2018
@@ -16,6 +16,8 @@
mcastService.missing.property=McastServiceï¼ç¼ºå°å¿
éå±æ§ [{0}]ã
mcastServiceImpl.invalid.startLevel=æ
æçå¯å¨çº§å«ãåªæ¥å以ä¸çº§å«ï¼Channel.MBR_RX_SEQæ
Channel.MBR_TX_SEQ
+mcastServiceImpl.recovery=家ææåï¼è¿è¡æ¢å¤çº¿ç¨ï¼å¹¿æä¸æ¯åè½ã
+mcastServiceImpl.recovery.stopFailed=æ¢å¤çº¿ç¨æªè½åæ¢æåæå¡ã
mcastServiceImpl.send.running=McastService.sendå·²ç»è¿è¡
mcastServiceImpl.unable.join=æ æ³å å
¥å¤æç»ï¼è¯·ç¡®ä¿ä½
çç³»ç»å·²å¯ç¨å¤æã
mcastServiceImpl.unableReceive.broadcastMessage=æ æ³æ¥æ¶å¹¿ææ¶æ¯ã
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_zh_CN.properties
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_zh_CN.properties
Fri Nov 23 09:44:51 2018
@@ -18,3 +18,6 @@ abstractStream.fileNotFound=æªæ¾
abstractStream.trustManagerError=æ æ³ä¸º{0}å建信任管çå¨
cloudMembershipService.stopFail=æ æ³åæ¢éææåèµæ
¼æå¡ï¼çº§å«ä¸ºï¼[{0}]
+
+kubernetesMembershipProvider.memberError=å建æåé误
+kubernetesMembershipProvider.noNamespace=å½å空é´æªè®¾ç½®
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
Fri Nov 23 09:44:51 2018
@@ -17,8 +17,11 @@ abstractReplicatedMap.broadcast.noReplie
abstractReplicatedMap.leftOver.ignored=æ¶æ¯[{0}]被忽ç¥
abstractReplicatedMap.transferState.noReplies=ä¼
è¾ç¶æï¼0ååºï¼ä¹è®¸æ¯è¶
æ¶ã
abstractReplicatedMap.unable.get=æ æ³å¤å¶ AbstractReplicatedMap.get
æä½çæ°æ®
+abstractReplicatedMap.unableSend.startMessage=æ æ³åémapå¯å¨æ¶æ¯ã
lazyReplicatedMap.unableReplicate.proxy=ä¸è½å¤å¶proxy
key:[{0}]å°å¤ä»½:[{1}]. åå æ¯:[{2}]
+mapMessage.deserialize.error.value=MapMessage.valueçååºåå误差
+
replicatedMap.relocate.complete=map æ¡ç®çéå®ä½å¨ [{0}] mså
å®æã
replicatedMap.unable.relocate=ä¸è½ä¸ºä¸ä¸ªæ°çå¤ä»½èç¹éå¯å®ä½[{0}]
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings_zh_CN.properties
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings_zh_CN.properties
Fri Nov 23 09:44:51 2018
@@ -14,6 +14,7 @@
# limitations under the License.
bioReceiver.socket.closeFailed=socket.å
³é失败
+bioReceiver.threadpool.fail=线ç¨æ± å¯ä»¥åå§åã侦å¬å¨æªå¯å¨
bioReplicationTask.reader.closeFailed=æ æ³å
³éreader
bioReplicationTask.socket.closeFailed=æ æ³å
³éå¥æ¥å
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/LocalStrings_zh_CN.properties
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/LocalStrings_zh_CN.properties
Fri Nov 23 09:44:51 2018
@@ -14,8 +14,10 @@
# limitations under the License.
nioReceiver.alreadyStarted=ServerSocketChannelå·²ç»è¢«å¯å¨
+nioReceiver.cleanup.fail=æ æ³æ¸
é¤å
³éçéæ©å¨
nioReceiver.clientDisconnect=å¤å¶å®¢æ·ç«¯å·²æå¼è¿æ¥ï¼è½®è¯¢å¯é¥æ¶åºéã忽ç¥å®¢æ·ç«¯ã
nioReceiver.start.fail=æ æ³å¯å¨é群æ¥æ¶å¨
+nioReceiver.stop.fail=æ æ³å
³éé群æ¥æ¶çéæ©å¨
nioReceiver.threadpool.fail=ThreadPool æ æ³åå§åã çå¬å¨æªå¯å¨ã
nioReplicationTask.process.clusterMsg.failed=å¤çé群æ¶æ¯å¤±è´¥
Modified:
tomcat/trunk/java/org/apache/catalina/users/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/users/LocalStrings_zh_CN.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/users/LocalStrings_zh_CN.properties
Fri Nov 23 09:44:51 2018
@@ -21,3 +21,4 @@ memoryUserDatabase.readOnly=ç¨æ·
memoryUserDatabase.reloadError=ä»æ´æ°åçæº [{1}] éæ°å è½½å
åç¨æ·æ°æ®åº [{0}] æ¶åºé
memoryUserDatabase.renameNew=æ æ³å°æ°æ件éå½å为 [{0}]
memoryUserDatabase.renameOld=åæ件æ æ³æ¹å为[{0}]
+memoryUserDatabase.restoreOrig=æ æ³å¾åå§æ件ä¸ä¿å[{0}]
Modified:
tomcat/trunk/java/org/apache/catalina/util/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/LocalStrings_zh_CN.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/util/LocalStrings_zh_CN.properties
Fri Nov 23 09:44:51 2018
@@ -19,6 +19,7 @@ extensionValidator.extension-not-found-e
extensionValidator.web-application-manifest=web åºç¨ç¨åºæ¸
å
hexUtil.bad=åçåå
è¿å¶æ°å
+hexUtil.odd=å¥æ°çåå
è¿å¶æ°å
introspection.classLoadFailed=å è½½ class [{0}] 失败
@@ -26,3 +27,5 @@ lifecycleBase.initFail=åå§å�
netmask.cidrNegative=CIDR [{0}]为è´æ°ã
netmask.invalidAddress=å°å [{0}] æ æ
+
+sessionIdGeneratorBase.randomProvider=使ç¨ç¨åºæä¾çåå§åéæºæ°çæå¨å¼å¸¸[{0}]
Modified:
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
Fri Nov 23 09:44:51 2018
@@ -31,14 +31,17 @@ http.403.reason=被ç¦æ¢
http.404.reason=Not Found
http.405.desc=请æ±è¡ä¸æ¥æ¶çæ¹æ³ç±æºæå¡å¨ç¥éï¼ä½ç®æ
èµæºä¸æ¯æ
http.407.reason=代çéè¦è®¤è¯
+http.412.desc=å¨æå¡å¨ä¸æµè¯æ¶ï¼è¯·æ±å¤´å段ä¸ç»åºçä¸ä¸ªæå¤ä¸ªæ¡ä»¶è¢«è¯ä¼°ä¸ºfalseã
http.412.reason=åç½®æ¡ä»¶å¤±è´¥
http.413.reason=ææè½½è·è¿å¤§
+http.415.desc=æºæå¡å¨æç»æå¡è¯·æ±ï¼å 为ææè´è½½çæ
¼å¼å¨ç®æ èµæºä¸æ¤æ¹æ³ä¸æ¯æã
http.415.reason=ä¸æ¯æçåªä½ç±»å
http.423.reason=å·²éå®
http.426.reason=éè¦å级
http.428.desc=åå§æå¡å¨è¦æ±è¯·æ±æ¯ææ¡ä»¶çã
http.429.reason=请æ±è¿å¤
http.431.reason=请æ±å¤´çå段太大
+http.500.desc=æå¡å¨éå°ä¸ä¸ªæå¤çæ
åµï¼é»æ¢å®å®æ请æ±ã
http.502.desc=æå¡å¨å¨å
å½ç½å
³æ代çæ¶, å¨å°è¯å®æ请æ±æ¶,
ä»å®è®¿é®çå
¥ç«æå¡å¨æ¶å°æ æååºã
http.503.desc=ç±äºä¸´æ¶è¿è½½æ计åç»´æ¤ï¼æå¡å¨å½åæ
æ³å¤ç请æ±ï¼è¿å¯è½ä¼å¨ä¸äºå»¶è¿åå¾å°ç¼è§£ã
http.505.reason=HTTP çæ¬ä¸æ¯æ
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings_zh_CN.properties
(original)
+++
tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings_zh_CN.properties
Fri Nov 23 09:44:51 2018
@@ -23,4 +23,5 @@ jarResource.getUrlFail=æ æ³ç¡�
standardRoot.checkStateNotStarted=å¦æå½åæªå¯å¨èµæºï¼åå¯è½æ
æ³è®¿é®è¿äºèµæº
standardRoot.createUnknownType=æ
æ³ä¸ºæªç¥ç±»å[{0}]å建WebResourceSetã
+standardRoot.noContext=å°æªä¸ºWebResourceRooté
ç½®ä¸ä¸æ
standardRoot.startInvalidMain=æå®ç主èµæºé [{0}] æ æ
Modified: tomcat/trunk/java/org/apache/coyote/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/LocalStrings_zh_CN.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/LocalStrings_zh_CN.properties Fri Nov
23 09:44:51 2018
@@ -17,6 +17,7 @@ abstractConnectionHandler.ioexception.de
abstractProcessor.hostInvalid=[{0}] æ¯æ æ主æº
abstractProcessor.httpupgrade.notsupported=æ¤åè®®ä¸æ¯æHTTPå级ï¼upgradeï¼ã
+abstractProcessor.socket.ssl=è·åSSLå±æ§å¼å¸¸
abstractProtocolHandler.asyncTimeoutError=é误çå¤çå¼æ¥è¶
æ¶
abstractProtocolHandler.destroy=æ£å¨æ§æ¯åè®®å¤çå¨ [{0}]
Modified: tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties
(original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties Fri
Nov 23 09:44:51 2018
@@ -16,4 +16,6 @@
ajpmessage.null=ä¸è½èµç©ºå¼
ajpmessage.overflow=å¨ç¼å²åº[{1}]ä½ç½®æ·»å
[{0}]åèæ¶åç溢åºé误
+ajpprocessor.header.error=头é¨ä¿¡æ¯è§£æ失败
+
ajpprotocol.noUpgrade=AJP ä¸æ¯æå级ã[{0}] çå级åè®®é
置被忽ç¥ã
Modified:
tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties
Fri Nov 23 09:44:51 2018
@@ -14,6 +14,7 @@
# limitations under the License.
http11processor.header.parse=解æ HTTP è¯·æ± header é误
+http11processor.request.inconsistentHosts=请æ±è¡ä¸æå®ç主æºä¸ä¸»æºå¤´ä¸ä¸è´ã
http11processor.request.invalidUserInfo=HTTP 请æ±å
å«å¸¦ææ æ userinfo
çç»å¯¹ URI
http11processor.request.prepare=åå¤è¯·æ±æ¶åºé
http11processor.request.process=é误çå¤ç请æ±
Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/filters/LocalStrings_zh_CN.properties
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/filters/LocalStrings_zh_CN.properties
Fri Nov 23 09:44:51 2018
@@ -15,5 +15,7 @@
chunkedInputFilter.eosTrailer=读å trailer 头æ¶åºç°æå¤çæµç»æ
chunkedInputFilter.invalidCrlfNoCR=æ
æçè¡å°¾ç»æ符åºå(LFå缺å°CR)
+chunkedInputFilter.maxExtension=è¶
è¿æ大æ©å±æ°
+chunkedInputFilter.maxTrailer=è¶
è¿æ大æ°
inputFilter.maxSwallow=æ大åå½æ°æ®å¤§å°è¶
åºå¼å¸¸
Modified:
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties Fri
Nov 23 09:44:51 2018
@@ -13,6 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+abstractStream.windowSizeInc=è¿æ¥ [{0}], æµ [{1}], å¢å
æµéæ§å¶çªå£[{2}] å° [{3}]
+
connectionPrefaceParser.mismatch=请æ±äºæ°çè¿ç¨æµID[{0}]ï¼ä½ææè¿ç¨æµé½å¿
须使ç¨å¥æ°æ è¯ç¬¦ã
connectionSettings.debug=è¿æ¥[{0}]ï¼åæ°ç±»å[{1}]设置为[{2}]
@@ -20,6 +22,12 @@ connectionSettings.headerTableSizeLimit=
hpack.invalidCharacter=代ç ç¹[{1}]å¤çUnicodeå符[{0}]æ æ³ç¼ç ï¼å
为å®è¶
åºäºå
许ç0å°255èå´ã
+hpackdecoder.tableSizeUpdateNotAtStart=ä»»ä½è¡¨å¤§å°çæ´æ°é½å¿
é¡»å¨å¤´åå¼å§æ¶åéã
+
+http2Parser.headers.wrongStream=è¿æ¥[{0}],
头é¨ä¿¡æ¯å¯¹äºæµ[{1}]æ£å¨è¿è¡ä½å¯¹äºæµ[{2}]çä¸å¸§å·²ç»æ¶å°äºã
+http2Parser.nonZeroPadding=è¿æ¥[{0}]ï¼æµ[{1}]ï¼éé¶å¡«å
+http2Parser.processFrameData.window=è¿æ¥[{0}]ï¼å®¢æ·ç«¯åéçæ°æ®æ¯æµçªå£å
许çå¤
+http2Parser.processFramePriority.invalidPayloadSize=以[{0}]æ
æçææè´è½½å¤§å°æ¥æ¶çä¼å
级帧ï¼åºè¯¥æ¯5ï¼
http2Parser.processFramePushPromise=请æ±äºæ°çè¿ç¨æµID[{0}]ï¼ä½ææè¿ç¨æµé½å¿
须使ç¨å¥æ°æ è¯ç¬¦\n\
\n
@@ -27,6 +35,7 @@ stream.inputBuffer.reset=æµ.éç
streamProcessor.service.error=请æ±å¤çæé´åºé
+upgradeHandler.ioerror=è¿æ¥[{0}]
upgradeHandler.pingFailed=对客æ·ç«¯åéping é¾æ¥å¤±è´¥.
upgradeHandler.socketCloseFailed=å
³é socket é误
upgradeHandler.stream.even=\
请æ±äºæ°çè¿ç¨æµID[{0}]ï¼ä½ææè¿ç¨æµé½å¿
须使ç¨å¥æ°æ
è¯ç¬¦\n\
Modified:
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
Fri Nov 23 09:44:51 2018
@@ -18,8 +18,10 @@ jasper.error.emptybodycontent.nonempty=�
jsp.error.attempt_to_clear_flushed_buffer=é误ï¼å°è¯æ¸
空已å·æ°çç¼å²åº
jsp.error.attribute.deferredmix=ä¸è½å¨åä¸å±æ§å¼ä¸åæ¶ä½¿ç¨ ${}
å #{} EL 表达å¼
jsp.error.attribute.noequal=ææç符å·æ¯çå·
+jsp.error.attribute.noescape=å±æ§å¼[{0}]å¼ç¨[{1}]ï¼å¨å¼å
使ç¨æ¶å¿
须被转ä¹ã
jsp.error.attribute.nowhitespace=JSP è§èè¦æ±ä¸ä¸ªå±æ§åååæç©ºæ ¼
jsp.error.bad.scratch.dir=ä½ æå®ç scratchDirï¼[{0}] ä¸å¯ç¨ã
+jsp.error.beans.noproperty=å¨[{1}]ç±»åbeanä¸æ¾ä¸å°ä»»ä½æå
³å±æ§[{0}]çä¿¡æ¯
jsp.error.compiler=没æå¯ç¨çJavaç¼è¯å¨
jsp.error.corresponding.servlet=çæçservleté误:\n\
\n
@@ -30,6 +32,7 @@ jsp.error.fallback.invalidUse=jsp:fallba
jsp.error.file.cannot.read=æ æ³è¯»åæ件 [{0}]
jsp.error.file.not.found=æ.件[{0}] æªæ¾å°
jsp.error.file.not.registered=æ件[{0}] ä¸åå¨
+jsp.error.include.exception=æ æ³å
å«[{0}]
jsp.error.include.tag=æ æçjsp:includeæ ç¾
jsp.error.internal.filenotfound=å
é¨é误ï¼æ¾ä¸å°æ件 [{0}]
jsp.error.internal.tldinit=æ æ³åå§å TldLocationsCache: [{0}]
@@ -38,11 +41,15 @@ jsp.error.invalid.version=为æ ç
jsp.error.ise_on_clear=å½ç¼å大å°çäº0æ¶è°ç¨clear()å½æ°æ¯éæ³ç
jsp.error.jspbody.required=å¦æä½¿ç¨ jsp:attributeï¼åå¿
须使ç¨
jsp:body 为 [{0}] æå®æ è®°æ£æã
jsp.error.jspelement.missing.name=XML强å¶æ§çº¦æï¼å±æ§name缺失ã
+jsp.error.jspoutput.doctypenamesystem=<jsp:output>:
'doctype-root-element' å 'doctype-system' å¿
é¡»ä¸èµ·åºç°
jsp.error.jsproot.version.invalid=çæ¬å· [{0}] æ æï¼çæ¬å·å¿
é¡»æ¯"1.2"ã"2.0"ã"2.1"ã"2.2"ã"2.3"ä¸çä¸ä¸ª
jsp.error.lastModified=æ æ³ç¡®å®æ件 [{0}] çæåä¿®æ¹æ¥æ
+jsp.error.loadclass.taghandler=æ æ³ä¸ºTAG [{1}]å è½½æ
è®°å¤çç¨åºç±»[{0}]
jsp.error.location=è¡.: [{0}], å: [{1}]
jsp.error.mandatory.attribute=[{0}]: 强å¶æ§å±æ§ [{1}] 缺失ã
jsp.error.multiple.jsp=ä¸è½æ.å¤ä¸ªè§æ ¼
+jsp.error.nested.jspbody=JSPï¼ä½æ åå¨ä½ä¸è½åµå¥å¨å¦ä¸ä¸ªjsp:body
æè
jsp:å±æ§æ åå¨ä½ä¸
+jsp.error.nested_jsproot=åµå¥ç<jsp:root>
jsp.error.no.scratch.dir=JSPå¼ææªé
ç½®scratchæ件夹ã\n\
请å¨å¯¹åºä¸ä¸æContextçservlets.propertiesæ件ä¸æ·»å
"jsp.initparams=scratchdir=<dir-name>"ã
jsp.error.no.scriptlets=èæ¬( <%!, <jsp:declaration, <%=,
<jsp:expression, <%, <jsp:scriptlet )ä¸å
许åºç°å¨è¿é
@@ -50,16 +57,25 @@ jsp.error.noFunction=æ æ³ä½¿�
jsp.error.not.in.template=å¨æ¨¡æ¿ææ¬ä½ä¸, [{0}] æ¯ä¸å
许ç.
jsp.error.outputfolder=æ è¾åºç®å½
jsp.error.overflow=é误ï¼JSPç¼å²åºæº¢åº
+jsp.error.page.conflict.errorpage=页æ令ï¼ä¸åå¼çå¤æ¬¡åºç°âerrorPageâçéæ³å¼ï¼æ§:[{0}],æ°:[{1}]ï¼
+jsp.error.page.invalid.deferredsyntaxallowedasliteral=页é¢æ令ï¼deferredSyntaxAllowedAsLiteralçå¼æ
æ
+jsp.error.page.invalid.info=页æ令ï¼ä¿¡æ¯çå¼æ æ
+jsp.error.page.invalid.iselignored=页é¢æ令ï¼å¿½ç¥çæ æå¼
+jsp.error.page.invalid.session=页é¢æ示ï¼sessionå¼æ æ
+jsp.error.page.multi.pageencoding=页æ令ä¸è½æå¤æ¬¡åºç°ç页ç¼ç
jsp.error.param.invalidUse=jsp:param
ä¸è½å¨jsp:includeãjsp:forwardæjsp:paramsçå
ç´ å¤ä½¿ç¨
jsp.error.parse.xml=æ æ³è§£æ XML æ件 [{0}]
jsp.error.parse.xml.invalidPublicId=æ æç PUBLIC ID: [{0}]
jsp.error.plugin.wrongRootElement=[{0}] ä¸çæ ¹å
ç´ çåç§°ä¸ [{1}]
çä¸å
+jsp.error.prolog_pagedir_encoding_mismatch=æå®å¨XMLè¯è¨[{0}]çç½é¡µç¼ç
æ¯ä¸åäºæå®å¨ç½é¡µçæ令[{1}]ã
jsp.error.quotes.unterminated=æªç»ç»çå¼å·
jsp.error.scripting.variable.missing_name=æ
æ³ä»å±æ§[{0}]ç¡®å®èæ¬åéå称
jsp.error.servlet.invalid.method=JSP åªå
许 GETãPOST æ HEADãJasper
è¿å
许 OPTIONS
+jsp.error.simpletag.badbodycontent=对äºä¸ä¸ç®åçæ
记符ï¼ç¨äºç±»[{0}]çæ è®°æ述符æå®äºä¸ä¸ªæ æçbodyå
容ï¼JSPï¼ä¸
jsp.error.single.line.number=JSPæ件ï¼[{1}] ç第 [{0}]
è¡åçäºä¸ä¸ªé误
jsp.error.stream.close.failed=æµ.å
³é失败
jsp.error.stream.closed=æµ.å
³é
+jsp.error.tag.invalid.trimdirectivewhitespaces=TAGæ令ï¼trimDirectiveWhitespacesçå¼æ
æ
jsp.error.tagfile.nameFrom.badAttribute=\n\
\ å±æ§æ令ï¼å¨è¡[{1}]ä¸å£°æ并ä¸å
¶nameå±æ§ä¸º[{0}]ï¼æ¤name-from-attributeå±æ§çå¼ï¼å¿
é¡»æ¯java.lang.Stringç±»åï¼æ¯ârequiredâèä¸æ¯ä¸ä¸ªârtexprvalueâã
jsp.error.taglibDirective.absUriCannotBeResolved=æ
æ³å¨web.xmlæ使ç¨æ¤åºç¨ç¨åºé¨ç½²çjaræ件ä¸è§£æç»å¯¹uriï¼[{0}]
@@ -78,15 +94,19 @@ jsp.error.variable.either.name=å¿
é�
jsp.error.xml.encodingDeclInvalid=ç¼ç å称[{0}]æ æã
jsp.error.xml.invalidCharInPI=å¤çæ令æ¶åç°ä¸ä¸ªæ
æçXMLå符(Unicode: 0x[{0}])
jsp.error.xml.pseudoAttrNameExpected=éè¦ä¸ä¸ªä¼ªå±æ§.å称ã
+jsp.error.xml.quoteRequiredInXMLDecl=[{0}]对åºçå¼å¨XMLæ件ä¸ç声æå¿
é¡»æ¯å¼ç¨å符串
jsp.error.xml.versionNotSupported=XMLçæ¬ [{0}] ä¸è¢«æ¯æï¼åªæ¯æXML
1.0ã
jsp.error.xml.xmlDeclUnterminated=XML声æå¿
须以âï¼>âç»å°¾ã
jsp.exception=å¨ [{1}] è¡å¤ç [{0}] æ¶åçå¼å¸¸
jsp.info.ignoreSetting=å 为 SecurityManager 被å¯ç¨ï¼å¿½ç¥ [{1}] ç
[{0}] ç设置
jsp.message.jsp_queue_update=å¨ä¸ä¸æ[{1}]éåä¸æ´æ°è·¯å¾ä¸º[{0}]çJSP
+jsp.message.jsp_removed_excess=ä»ä¸ä¸æ[{1}]çéåä¸ç§»é¤é¢å¤å¨è·¯å¾[{0}]ä¸JSPï¼
jsp.tldCache.noTldSummary=è³å°æä¸ä¸ªJAR被æ«æç¨äºTLDä½å°æªå
å«TLDã
为æ¤è®°å½å¨å¯ç¨è°è¯æ¥å¿è®°å½ï¼ä»¥è·åå·²æ«æä½æªå¨å
¶ä¸æ¾å°TLDçå®æ´JARå表ã
å¨æ«ææé´è·³è¿ä¸éè¦çJARå¯ä»¥ç¼©çå¯å¨æ¶é´åJSPç¼è¯æ¶é´ã
jsp.tldCache.tldInDir=å¨ç®å½ [{0}]ä¸æ¾å°äºTLDæ件ã
jsp.warning.compiler.classfile.delete.fail.unknown=å
é¤çæçclassæ件失败
+jsp.warning.dumpSmap=è¦åï¼åå§åå å
åçå¼æ
æãå°ä½¿ç¨âfalseâçé»è®¤å¼
jsp.warning.enablePooling=è¦åï¼initParam enablePoolingçå¼æ
æãå°ä½¿ç¨é»è®¤å¼âtrueâ
+jsp.warning.fork=è¦åï¼initParamçå¼æ
æãå°ä½¿ç¨âtrueâçé»è®¤å¼
jsp.warning.unknown.element.in.attribute=å±æ§ä¸çæªç¥å
ç´ [{0}]
jsp.warning.unknown.element.in.tag=æ ç¾ä¸çæªç¥å
ç´ [{0}]
jsp.warning.unknown.element.in.tagfile=æ ç¾æ件ä¸çæªç¥å
ç´ [{0}]
@@ -133,6 +153,7 @@ jsp.æ件å¨åª\n\
\ -target <version> 设置-target.åæ°å°ç¼è¯å¨(é»è®¤1.8)\n\
\ -threadCount <count> ç¼è¯ä½¿ç¨ç线ç¨æ°.\n\
\ ("2.0C" æå³çæ¯ä¸ªå
æ ¸æ两个线ç¨)
+jspc.webfrg.footer=</web-fragment>
jspc.webfrg.header=<?xml version="1.0" encoding="{0}"?>\n\
<web-fragment xmlns="http://xmlns.jcp.org/xml/ns/javaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
@@ -145,12 +166,16 @@ jspc.webfrg.header=<?xml version="1.0" e
<!--\n\
ç± Apache Tomcat JspC èªå¨çæã\n\
-->
+jspc.webinc.footer=<!--\n\
+ç±Apache Tomcat JSPCèªå¨å建çå
容ç»æã\n\
+-->
jspc.webinc.insertEnd=<!-- JSPC servlet æ å°ç»æ -->
jspc.webinc.insertStart=<!-- JSPC servlet æ å°å¼å§ -->
jspc.webxml.footer=</web-app>\n\
\n
org.apache.jasper.compiler.TldCache.servletContextNull=æä¾ç
ServletContext 为 null
+org.apache.jasper.servlet.TldScanner.webxmlAdd=ä»èµæºè·¯å¾[{0} ]å
è½½URI[{1}]çTLD
org.apache.jasper.servlet.TldScanner.webxmlFailPathDoesNotExist=æ
æ³ä½¿ç¨è·¯å¾ [{0}] å URI [{1}] å¤çTLDãæå®çè·¯å¾ä¸åå¨ã
xmlParser.skipBomFail=解æXMLè¾å
¥æµæ¶ï¼è·³è¿BOM失败ã
Modified: tomcat/trunk/java/org/apache/naming/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/LocalStrings_zh_CN.properties (original)
+++ tomcat/trunk/java/org/apache/naming/LocalStrings_zh_CN.properties Fri Nov
23 09:44:51 2018
@@ -16,3 +16,4 @@
contextBindings.unknownContext=æªç¥.ä¸ä¸æå:[{0}]
namingContext.contextExpected=ä¸ä¸æContextæªç»å®å称name
+namingContext.failResolvingReference=解æå¼ç¨æ¶æå¤å¼å¸¸
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/LocalStrings_zh_CN.properties
(original)
+++
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/LocalStrings_zh_CN.properties
Fri Nov 23 09:44:51 2018
@@ -16,3 +16,5 @@
poolableConnection.validate.fastFail=æ¤è¿æ¥ä¸é¢å
æåºäºè´å½ç
SQLExceptionã
poolingDataSource.factoryConfig=PoolableConnectionFactory æªè¿æ¥å°è¿æ¥æ±
ã请è°ç¨ setPool() ä¿®å¤æ¤é
ç½®ã
+
+swallowedExceptionLogger.onSwallowedException=ä¸ä¸ªå
é¨å¯¹è±¡æ±
å并äºä¸ä¸ªå¼å¸¸ã
Modified: tomcat/trunk/java/org/apache/tomcat/util/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/LocalStrings_zh_CN.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/LocalStrings_zh_CN.properties Fri
Nov 23 09:44:51 2018
@@ -15,6 +15,7 @@
diagnostics.threadDumpTitle=æå°å
¨é¨çº¿ç¨
diagnostics.vmInfoClassCompilation=:)classæ±ç¼
+diagnostics.vmInfoClassLoading=ç±»å è½½ä¸
diagnostics.vmInfoLogger=æ¥å¿è®°å½å¨ï¼Loggerï¼ä¿¡æ¯
diagnostics.vmInfoOs=æä½ç³»ç»ä¿¡æ¯
diagnostics.vmInfoRuntime=è¿è¡æ¶ä¿¡æ¯
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings_zh_CN.properties
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings_zh_CN.properties
Fri Nov 23 09:44:51 2018
@@ -20,6 +20,8 @@ webRuleSet.postconstruct.duplicate=class
webXml.duplicateFilter=éå¤çè¿æ»¤å¨å称 [{0}]
webXml.duplicateServletMapping=å为 [{0}]å [{1}] çservletä¸è½æ
å°ä¸ºä¸ä¸ªurl模å¼(url-pattern) [{2}]
+webXml.mergeConflictDisplayName=æ¾ç¤ºå称å¨å¤ä¸ªç段ä¸è¢«å®ä¹ï¼è¿äºç段å
å«ä¸åçå¼ï¼å
æ¬ä½äº[{1}]ç[{0}]çç段ã
webXml.mergeConflictSessionCookieName=ä¼è¯cookieå称å¨å¤ä¸ªå
·æä¸åå¼çç段ä¸å®ä¹ä¸ä¸è´ï¼å
æ¬ä½äº [{1}] çç段 [{0}]
+webXml.mergeConflictSessionTimeout=ä¼è¯è¶
æ¶ä»¥ä¸åå¼çå¤ä¸ªç段ä¸ä¸è´å°å®ä¹ï¼è¿äºç段å
æ¬ä½äº[{1}]çå
·æå称[{0}]çç段ã
webXml.mergeConflictSessionTrackingMode=ä¼è¯è·è¸ªæ¨¡å¼å¨å¤ä¸ªç段ä¸å®ä¹ä¸ä¸è´ï¼å
æ¬ä½äº[{1}]çå称为[{0}]çç段
webXml.version.unknown=æªç¥çæ¬å符串 [{0}]ãå°ä½¿ç¨é»è®¤çæ¬ã
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings_zh_CN.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings_zh_CN.properties
Fri Nov 23 09:44:51 2018
@@ -14,6 +14,7 @@
# limitations under the License.
cookies.invalidCookieToken=Cookieï¼cookieæ æãå¼ä¸æ¯ä»¤çæå¼ç¨å¼
+cookies.invalidSpecial=Cookiesï¼æªç¥ç¹æ®çCookie
parameters.copyFail=æ
æ³å建以è°è¯æ¥å¿è®°å½ä¸ºç®ççåå§åæ°å¼çå¯æ¬
parameters.decodeFail.debug=å符解ç 失败.åæ° [{0}]åå¼
[{1}]被忽ç¥
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties
Fri Nov 23 09:44:51 2018
@@ -25,6 +25,8 @@ http.invalidCharacterDomain.afterPeriod=
http.invalidCharacterDomain.atEnd=å符 [{0}] å¨ååæ«å°¾æ æã
http.invalidCharacterDomain.atStart=å符 [{0}] å¨ååå¼å¤´æ æã
http.invalidHextet=hextetæ æã hextetå¿
é¡»å
å«4个ææ´å°çåå
è¿å¶å符ã
+http.invalidLeadingZero=éé¶çIPv4å符å¯è½ä¸å
å«å导é¶ã
+http.invalidOctet=æ æå符[{0}].IPv4å符çææèå´ä¸º0ï½255ã
http.singleColonEnd=IPv6å°åä¸è½ä»¥å个â.âç»å°¾ã
http.singleColonStart=ä¸ä¸ªIPv6å°åä¹è®¸ä¸æ¯ä»¥å个åå·":"å¼å¤´çã
http.tooManyColons=IPv6å°åä¸è½å
å«è¶
è¿2个è¿ç»åå·å符ã
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
Fri Nov 23 09:44:51 2018
@@ -14,6 +14,7 @@
# limitations under the License.
channel.nio.ssl.closing=é¢éå¤äºæ£å¨å
³é(closing)çç¶æ
+channel.nio.ssl.foundHttp=æ¾å°ä¸ä¸ªææHTTP请æ±ï¼å®åºè¯¥æ¯ä¸ä¸ªå
å¯çTLSè¿æ¥
channel.nio.ssl.invalidCloseState=æ æçå
³éç¶æï¼ä¸ä¼åéç½ç»æ°æ®ã
channel.nio.ssl.sniHostName=è¿æ¥ [{0}]
channel.nio.ssl.timeoutDuringHandshake=æ¡ææé´è¶
æ¶ã
@@ -24,11 +25,14 @@ endpoint.apr.applyConf=æ£å°OpenS
endpoint.apr.checkConf=æ£æ¥é
ç½®OpenSSLConf
endpoint.apr.errApplyConf=ä¸è½å¯¹SSLä¸ä¸æåºç¨OpenSSLConf é
ç½®
endpoint.apr.errMakeConf=æ æ³å建OpenSSLConf ä¸ä¸æ
+endpoint.apr.pollAddInvalid=æ æä¼å¾åä¸ä¸ªè½®è¯¢å¨ä¸æ·»å
ä¸ä¸ªå¥æ¥å[{0}]
endpoint.debug.channelCloseFail=å
³éé¢é失败
endpoint.debug.destroySocket=å°éæ¯socket [{0}]
endpoint.debug.socket=socket [{0}]
endpoint.debug.socketCloseFail=å
³é socket 失败
endpoint.debug.unlock.localNone=æ æ³è§£é¤ [{0}] çæ¥åå¨ï¼å
为æ¬å°å°åä¸å¯ç¨
+endpoint.err.close=æä½å¼å¸¸è¯å¾å
³ésocket
+endpoint.err.unexpected=å¤çå¥æ¥åæ¶æå¤é误
endpoint.init.notavail=APR.ä¸å¯ç¨
endpoint.invalidJmxNameSslHostCert=对äºSSLHostConfigCertificateå
³èç主æº[{0}]åè¯ä¹¦ç±»å[{1}]ï¼æ æ³çæææçXML对象å称
endpoint.nio.stopLatchAwaitInterrupted=å¨çå¾
轮询å¨åæ¢æ¶ï¼è¯¥çº¿ç¨è¢«ä¸æ
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_zh_CN.properties
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_zh_CN.properties
Fri Nov 23 09:44:51 2018
@@ -20,3 +20,4 @@ jsse.pemParseError=æ æ³ä» [{
jsseSupport.certTranslationError=é误ç转æ¢è¯ä¹¦[{0}]
jsseSupport.clientCertError=å°è¯ä»å®¢æ·ç«¯è·åè¯ä¹¦æ¶åºé
+jsseSupport.noCertWant=æ éåé客æ·ç«¯è¯ä¹¦
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings_zh_CN.properties
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings_zh_CN.properties
Fri Nov 23 09:44:51 2018
@@ -15,6 +15,7 @@
engine.ciphersFailure=è·åå¯ç å表失败
engine.emptyCipherSuite=空å¯ç å¥ä»¶
+engine.engineClosed=å¼æå·²ç»å
³é
engine.handshakeFailure=æ¡æ失败ï¼[{0}]
engine.noSession=æ æçSSLä¼è¯ID
engine.openSSLError=OpenSSL é误ï¼[{0}] ä¿¡æ¯: [{1}]
@@ -28,5 +29,6 @@ openssl.errMakeConf=æ æ³åå
openssl.trustManagerMissing=没ææ¾å°.信任管çè
opensslconf.checkFailed=æ£æ¥OpenSSLConfæ¶å¤±è´¥ã
+opensslconf.finishFailed=OpenSSLConf é
置失败ç»æ为 [{0}]
sessionContext.nullTicketKeys=Null keys
Modified:
tomcat/trunk/java/org/apache/tomcat/util/scan/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/scan/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/scan/LocalStrings_zh_CN.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/scan/LocalStrings_zh_CN.properties
Fri Nov 23 09:44:51 2018
@@ -16,6 +16,7 @@
jarScan.classPath.badEntry=classè·¯å¾[{0}]ä¸è½è¢«è½¬åæURL
jarScan.classloaderFail=å¨å¤çº§ç±»å è½½å¨ä¸æ«æ[{0}]失败
jarScan.classloaderJarNoScan=è·³è¿classpathè·¯å¾[{0}]ä¸çjarå
æ«æã
+jarScan.classloaderStart=å¨ç±»å è½½å¨å±æ¬¡ç»æä¸æ«æJAR
jarScan.jarUrlStart=æ£å¨æ«æURL [{0}] ä¸çJARæ件
jarScan.webinfclassesFail=æ æ³æ«æ/WEB-INF/classes
jarScan.webinflibJarNoScan=没ææ«æå°/WEB-INF/libç®å½ä¸çJAR [{0}]
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
Fri Nov 23 09:44:51 2018
@@ -13,17 +13,27 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+asyncChannelWrapperSecure.eof=æå¤çæµç»å°¾
+
caseInsensitiveKeyMap.nullKey=ä¸å
许 Key æ¯ Null
+perMessageDeflate.deflateFailed=æ æ³å缩è¿ä¸ªWebSocketå缩ç»æ
+
util.notToken=ä¸ä¸ªéæ³çæ©å±åæ°è¢«æå®ä¸ºå称[{0}]åå¼[{0}]
+util.unknownDecoderType=æ æ³è¯å«è¯¥è§£ç å¨ç±»å[{0}]
+wsFrame.byteToLongFail=æä¾äºå¤ªå¤åè([{0}])ï¼è½¬æ¢æä¸ä¸ªé¿çåèã
wsFrame.closed=å¨ä¸ä¸ªå
³éçæ§å¶å¸§ååå°äºä¸ä¸ªæ°ç帧.
+wsFrame.controlFragmented=æ¥æ¶å°å段çæ§å¶å¸§ï¼ä½æ§å¶å¸§å¯è½ä¸è¢«åå²ã
+wsFrame.controlNoFin=åéä¸ä¸ªæ²¡æ设置çæ§å¶å¸§ãæ§å¶å¸§ä¸å
许使ç¨è¿ç»å¸§ã
wsFrame.partialHeaderComplete=æ¥æ¶å°WebSocket帧. fin [{0}], rsv [{1}],
OpCode [{2}], payload é¿åº¦ [{3}]
wsFrame.sessionClosed=æ æ³å¤ç客æ·ç«¯æ°æ®ï¼å 为ä¼è¯å·²è¢«å
³é
wsFrame.wrongRsv=对äºå
·æopCode
[{1}]çæ¶æ¯ï¼å®¢æ·ç«¯å¸§å°ä¿çä½è®¾ç½®ä¸º[{0}]ï¼æ¤ç«¯ç¹ä¸æ¯æ
wsHandshakeRequest.invalidUri=å符串 [{0}]
ä¸è½ç¨æ¥ç»æä¸ä¸ªææçURI
+wsRemoteEndpoint.acquireTimeout=å½åæ¶æ¯æ²¡æå¨æå®çè¶
æ¶å
å®å
¨åé
+wsRemoteEndpoint.changeType=åéå段æ¶æ¯æ¶ï¼ææç段å¿
é¡»æ¯ç¸åç±»åçã
wsRemoteEndpoint.closed=ç±äº WebSocket session å·²å
³éï¼æ¶æ¯å°ä¸ä¼è¢«åé
wsRemoteEndpoint.closedDuringMessage=å 为 WebSocket session 被å
³éï¼æ¶æ¯çå©ä½é¨åå°ä¸ä¼è¢«éè¾¾
wsRemoteEndpoint.flushOnCloseFailed=ä¼è¯å
³éåä»ç¶å¯ç¨æ¹å¤çæ¶æ¯ãæ æ³å·æ°å©ä½çæ¹éæ¶æ¯
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings_zh_CN.properties
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings_zh_CN.properties
Fri Nov 23 09:44:51 2018
@@ -17,4 +17,5 @@ pojoEndpointServer.getPojoInstanceFail=�
pojoMessageHandlerWhole.decodeIoFail=解ç æ¶æ¯æ¶åºç°IOé误
+pojoMethodMapping.duplicateLastParam=ç¨OnMessage注éçç±»[{1}]çæ¹æ³[{0}]ä¸åå¨å¤ä¸ªå¸å°åæ°ï¼æåçï¼
pojoMethodMapping.invalidDecoder=è¿ä¸ªç¹å®ç±»åç解ç å¨[{0}]æ
æ³è¢«å®ä¾å
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings_zh_CN.properties
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings_zh_CN.properties
Fri Nov 23 09:44:51 2018
@@ -21,3 +21,4 @@ upgradeUtil.incompatibleRsv=æå®
uriTemplate.invalidPath=è·¯å¾ [{0}] æ æã
wsFrameServer.bytesRead=å°[{0}]个åè读å
¥è¾å
¥ç¼å²åºï¼åå¤è¿è¡å¤ç
+wsFrameServer.onDataAvailable=è¿å
¥æ¹æ³
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Nov 23 09:44:51 2018
@@ -178,8 +178,8 @@
Tomcat. Includes contributions from Darren Luo, syseal, Winsonzhao,
è¢å®æ°, Lanranzi, ZhangJieWen, Jerry, yinzhili001, å®æè¯,
shawn, lavender,
Zheng Feng, zengwc, RichardHo, mm, gingshi huang, Bob, geekwang, zheng,
- Deanzhg, Tianfengjingjing, Panblack, oking, Dave Newman, Cnfnss, Jim Ma
- and 852394875. (markt)
+ Deanzhg, Tianfengjingjing, Panblack, oking, Dave Newman, Cnfnss, Jim
Ma,
+ 852394875 and huxing. (markt)
</add>
<add>
Add Korean translations to Apache Tomcat. Includes contributions from
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/LocalStrings_zh_CN.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/LocalStrings_zh_CN.properties
(original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/LocalStrings_zh_CN.properties
Fri Nov 23 09:44:51 2018
@@ -23,6 +23,7 @@ requestheader.title=è¯·æ± Header
requestinfo.label.method=æ¹æ³ï¼
requestinfo.label.protocol=åè®®ï¼
requestinfo.label.remoteaddr=è¿ç¨å°åï¼
+requestinfo.title=请æ±ä¿¡æ¯èä¾
requestparams.firstname=å§ï¼
requestparams.no-params=没æåæ°ï¼è¯·è¾å
¥ä¸äº
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
