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