1 ############################################################################### |
1 ############################################################################### |
2 # Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved. |
2 # Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved. |
3 # |
3 # |
4 # Permission is hereby granted, free of charge, to any person obtaining a |
4 # Permission is hereby granted, free of charge, to any person obtaining a |
5 # copy of this software and associated documentation files (the "Software"), |
5 # copy of this software and associated documentation files (the "Software"), |
6 # to deal in the Software without restriction, including without limitation |
6 # to deal in the Software without restriction, including without limitation |
7 # the rights to use, copy, modify, merge, publish, distribute, sublicense, |
7 # the rights to use, copy, modify, merge, publish, distribute, sublicense, |
19 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
19 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
20 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
21 # DEALINGS IN THE SOFTWARE. |
21 # DEALINGS IN THE SOFTWARE. |
22 # |
22 # |
23 |
23 |
24 diff -urp -x '*~' -x '*.orig' nls/locale.alias.pre nls/locale.alias.pre |
24 diff --git a/nls/locale.alias.pre b/nls/locale.alias.pre |
25 --- nls/locale.alias.pre 2010-10-29 00:21:12.000000000 -0700 |
25 index 7b35460..069b011 100644 |
26 +++ nls/locale.alias.pre 2010-11-21 18:48:27.884466309 -0800 |
26 --- a/nls/locale.alias.pre |
27 @@ -121,7 +121,7 @@ be_BY.MICROSOFT-CP1251: be_BY.CP1251 |
27 +++ b/nls/locale.alias.pre |
|
28 @@ -119,7 +119,7 @@ be_BY.MICROSOFT-CP1251: be_BY.CP1251 |
28 be_BY.utf8: be_BY.UTF-8 |
29 be_BY.utf8: be_BY.UTF-8 |
29 be_BY.utf8@latin: be_BY.UTF-8@latin |
30 be_BY.utf8@latin: be_BY.UTF-8@latin |
30 bg: bg_BG.CP1251 |
31 bg: bg_BG.CP1251 |
31 -bg_BG: bg_BG.CP1251 |
32 -bg_BG: bg_BG.CP1251 |
32 +bg_BG: bg_BG.ISO8859-5 |
33 +bg_BG: bg_BG.ISO8859-5 |
33 bg_BG.cp1251: bg_BG.CP1251 |
34 bg_BG.cp1251: bg_BG.CP1251 |
34 bg_BG.microsoftcp1251: bg_BG.CP1251 |
35 bg_BG.microsoftcp1251: bg_BG.CP1251 |
35 bg_BG.microsoft-cp1251: bg_BG.CP1251 |
36 bg_BG.microsoft-cp1251: bg_BG.CP1251 |
36 @@ -1154,16 +1154,19 @@ yi_US.cp1255: yi_US.CP1255 |
37 @@ -1135,16 +1135,19 @@ yi_US.cp1255: yi_US.CP1255 |
37 yi_US.microsoftcp1255: yi_US.CP1255 |
38 yi_US.microsoftcp1255: yi_US.CP1255 |
38 yi_US.microsoft-cp1255: yi_US.CP1255 |
39 yi_US.microsoft-cp1255: yi_US.CP1255 |
39 yi_US.MICROSOFT-CP1255: yi_US.CP1255 |
40 yi_US.MICROSOFT-CP1255: yi_US.CP1255 |
40 -zh_CN: zh_CN.gb2312 |
41 -zh_CN: zh_CN.gb2312 |
41 +zh: zh_CN.eucCN |
42 +zh: zh_CN.eucCN |
52 ZH_CN.UTF-8: zh_CN.UTF-8 |
53 ZH_CN.UTF-8: zh_CN.UTF-8 |
53 +zh.UTF-8: zh_CN.UTF-8 |
54 +zh.UTF-8: zh_CN.UTF-8 |
54 zh_HK: zh_HK.big5hkscs |
55 zh_HK: zh_HK.big5hkscs |
55 zh_HK.BIG5HK: zh_HK.big5hkscs |
56 zh_HK.BIG5HK: zh_HK.big5hkscs |
56 zh_HK.Big5hkscs: zh_HK.big5hkscs |
57 zh_HK.Big5hkscs: zh_HK.big5hkscs |
57 @@ -1176,7 +1179,7 @@ zh_HK.Big5: zh_HK.big5 |
58 @@ -1157,7 +1160,7 @@ zh_HK.Big5: zh_HK.big5 |
58 zh_HK.utf8: zh_HK.UTF-8 |
59 zh_HK.utf8: zh_HK.UTF-8 |
59 ZH_HK.UTF-8: zh_HK.UTF-8 |
60 ZH_HK.UTF-8: zh_HK.UTF-8 |
60 ZH_SG.UTF-8: zh_SG.UTF-8 |
61 ZH_SG.UTF-8: zh_SG.UTF-8 |
61 -zh_TW: zh_TW.big5 |
62 -zh_TW: zh_TW.big5 |
62 +zh_TW: zh_TW.eucTW |
63 +zh_TW: zh_TW.eucTW |