Merge jdk8u162-b10

Tue, 05 Dec 2017 13:43:32 -0800

author
asaha
date
Tue, 05 Dec 2017 13:43:32 -0800
changeset 1730
3505b1729e79
parent 1727
52da6a9595db
parent 1729
b9dc3724ec4b
child 1731
45db970740d3

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Mon Dec 04 16:18:57 2017 -0800
     1.2 +++ b/.hgtags	Tue Dec 05 13:43:32 2017 -0800
     1.3 @@ -812,6 +812,7 @@
     1.4  08a44c164993e0ce82ed3787478fa2e9b024c79d jdk8u161-b07
     1.5  375c6ab2b4efa63f4d69cbec2db2a179fb5be546 jdk8u161-b08
     1.6  8f1e31692eaefa31a83d629d3de65c6d518e35fc jdk8u161-b09
     1.7 +3105b0c6ced161bbd3378c2f3514be42434192b3 jdk8u161-b10
     1.8  2e5a470691f23ebf8d1f0f0dea8ef7de9a70a943 jdk8u122-b00
     1.9  cbb8efe139275a4e7c541f9e45eb410c27a5ea61 jdk8u122-b01
    1.10  e279f24557d43d8edfe313cb1a53add7ac6ceb2c jdk8u122-b02
     2.1 --- a/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java	Mon Dec 04 16:18:57 2017 -0800
     2.2 +++ b/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java	Tue Dec 05 13:43:32 2017 -0800
     2.3 @@ -1022,7 +1022,7 @@
     2.4       "\u5C6C\u6027: {0}"},
     2.5  
     2.6      { ER_NULL_ENTITY_RESOLVER,
     2.7 -     "\u7A7A\u503C\u500B\u9AD4\u89E3\u6790\u5668"},
     2.8 +     "\u7A7A\u503C\u5BE6\u9AD4\u89E3\u6790\u5668"},
     2.9  
    2.10      { ER_NULL_DTD_HANDLER,
    2.11       "\u7A7A\u503C DTD \u8655\u7406\u7A0B\u5F0F"},
    2.12 @@ -1356,8 +1356,8 @@
    2.13    { "optionLXCIN", "   [-LXCIN compiledStylesheetFileNameIn]"},
    2.14    { "optionLXCOUT", "   [-LXCOUT compiledStylesheetFileNameOutOut]"},
    2.15    { "optionPARSER", "   [-PARSER \u5256\u6790\u5668\u806F\u7D61\u7684\u5B8C\u6574\u985E\u5225\u540D\u7A31]"},
    2.16 -  {  "optionE", "   [-E (\u52FF\u5C55\u958B\u500B\u9AD4\u53C3\u7167)]"},
    2.17 -  {  "optionV",  "   [-E (\u52FF\u5C55\u958B\u500B\u9AD4\u53C3\u7167)]"},
    2.18 +  {  "optionE", "   [-E (\u52FF\u5C55\u958B\u5BE6\u9AD4\u53C3\u7167)]"},
    2.19 +  {  "optionV",  "   [-E (\u52FF\u5C55\u958B\u5BE6\u9AD4\u53C3\u7167)]"},
    2.20    {  "optionQC", "   [-QC (\u975C\u97F3\u6A23\u5F0F\u885D\u7A81\u8B66\u544A)]"},
    2.21    {  "optionQ", "   [-Q  (\u975C\u97F3\u6A21\u5F0F)]"},
    2.22    {  "optionLF", "   [-LF (\u8F38\u51FA\u4E0A\u50C5\u4F7F\u7528\u63DB\u884C\u5B57\u5143 {\u9810\u8A2D\u70BA CR/LF})]"},
    2.23 @@ -1381,7 +1381,7 @@
    2.24    { "noParsermsg4", "\u82E5\u7121 IBM \u7684 XML Parser for Java\uFF0C\u53EF\u4E0B\u8F09\u81EA"},
    2.25    { "noParsermsg5", "IBM \u7684 AlphaWorks: http://www.alphaworks.ibm.com/formula/xml"},
    2.26    { "optionURIRESOLVER", "   [-URIRESOLVER \u5B8C\u6574\u985E\u5225\u540D\u7A31 (\u7528\u4F86\u89E3\u6790 URI \u7684 URIResolver)]"},
    2.27 -  { "optionENTITYRESOLVER",  "   [-ENTITYRESOLVER \u5B8C\u6574\u985E\u5225\u540D\u7A31 (\u7528\u4F86\u89E3\u6790\u500B\u9AD4\u7684 EntityResolver )]"},
    2.28 +  { "optionENTITYRESOLVER",  "   [-ENTITYRESOLVER \u5B8C\u6574\u985E\u5225\u540D\u7A31 (\u7528\u4F86\u89E3\u6790\u5BE6\u9AD4\u7684 EntityResolver )]"},
    2.29    { "optionCONTENTHANDLER",  "   [-CONTENTHANDLER \u5B8C\u6574\u985E\u5225\u540D\u7A31 (\u7528\u4F86\u5E8F\u5217\u5316\u8F38\u51FA\u7684 ContentHandler)]"},
    2.30    {  "optionLINENUMBERS",  "   [-L \u4F7F\u7528\u884C\u865F\u65BC\u4F86\u6E90\u6587\u4EF6]"},
    2.31    { "optionSECUREPROCESSING", "   [-SECURE (\u5C07\u5B89\u5168\u8655\u7406\u529F\u80FD\u8A2D\u70BA\u771F\u3002)]"},

mercurial