############################################################################### # Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved. # # Permission is hereby granted, free of charge, to any person obtaining a # copy of this software and associated documentation files (the "Software"), # to deal in the Software without restriction, including without limitation # the rights to use, copy, modify, merge, publish, distribute, sublicense, # and/or sell copies of the Software, and to permit persons to whom the # Software is furnished to do so, subject to the following conditions: # # The above copyright notice and this permission notice (including the next # paragraph) shall be included in all copies or substantial portions of the # Software. # # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # DEALINGS IN THE SOFTWARE. # --- a/nls/locale.alias.pre 2022-10-06 08:47:57.468546005 -0700 +++ b/nls/locale.alias.pre 2022-10-06 08:52:01.742963433 -0700 @@ -121,7 +121,7 @@ be_BY.utf8: be_BY.UTF-8 be_BY.utf8@latin: be_BY.UTF-8@latin bg: bg_BG.CP1251 -bg_BG: bg_BG.CP1251 +bg_BG: bg_BG.ISO8859-5 bg_BG.cp1251: bg_BG.CP1251 bg_BG.microsoftcp1251: bg_BG.CP1251 bg_BG.microsoft-cp1251: bg_BG.CP1251 @@ -1097,15 +1097,18 @@ yi_US.microsoftcp1255: yi_US.CP1255 yi_US.microsoft-cp1255: yi_US.CP1255 yi_US.MICROSOFT-CP1255: yi_US.CP1255 -zh_CN: zh_CN.gb2312 +zh: zh_CN.eucCN +zh_CN: zh_CN.eucCN zh_CN.Big5: zh_TW.big5 zh_CN.EUC: zh_CN.eucCN zh_CN.GB2312: zh_CN.gb2312 zh_CN.GBK: zh_CN.gbk +zh.GBK: zh_CN.gbk zh_CN.GB18030: zh_CN.gb18030 zh_CN.big5: zh_TW.big5 zh_CN.euc: zh_CN.eucCN zh_CN.utf8: zh_CN.UTF-8 +zh.UTF-8: zh_CN.UTF-8 zh_HK: zh_HK.big5hkscs zh_HK.BIG5HK: zh_HK.big5hkscs zh_HK.Big5hkscs: zh_HK.big5hkscs @@ -1120,7 +1123,7 @@ zh_HK.Big5HKSCS: zh_HK.big5hkscs zh_HK.Big5: zh_HK.big5 zh_HK.utf8: zh_HK.UTF-8 -zh_TW: zh_TW.big5 +zh_TW: zh_TW.eucTW zh_TW.Big5: zh_TW.big5 zh_TW.BIG5: zh_TW.big5 zh_TW.EUC: zh_TW.eucTW