summaryrefslogtreecommitdiff
path: root/nls/locale.alias.pre
diff options
context:
space:
mode:
Diffstat (limited to 'nls/locale.alias.pre')
-rw-r--r--nls/locale.alias.pre8
1 files changed, 4 insertions, 4 deletions
diff --git a/nls/locale.alias.pre b/nls/locale.alias.pre
index e33ea45..2a669de 100644
--- a/nls/locale.alias.pre
+++ b/nls/locale.alias.pre
@@ -1,3 +1,4 @@
+XCOMM $XdotOrg: lib/X11/nls/locale.alias.pre,v 1.1.4.3 2003-12-20 00:28:22 kaleb Exp $
XCOMM $Xorg: locale.alias,v 1.3 2000/08/17 19:46:48 cpqbld Exp $
XCOMM
XCOMM This file contains alias name of locale.
@@ -5,7 +6,7 @@ XCOMM Each alias name is described within one line.
XCOMM The first word is the alias name (simplified locale name)
XCOMM the second word is full locale name.
XCOMM
-XCOMM $XFree86: xc/nls/locale.alias,v 1.63 2003/08/06 14:04:00 eich Exp $
+XCOMM $XFree86: xc/nls/locale.alias,v 1.64 2003/12/18 04:14:22 dawes Exp $
XCOMM
POSIX: C
@@ -676,14 +677,13 @@ yi_US.cp1255: yi_US.CP1255
yi_US.microsoftcp1255: yi_US.CP1255
yi_US.microsoft-cp1255: yi_US.CP1255
yi_US.MICROSOFT-CP1255: yi_US.CP1255
-zh_CN: zh_CN.gbk
+zh_CN: zh_CN.gb2312
zh_CN.Big5: zh_TW.big5
zh_CN.EUC: zh_CN.eucCN
-zh_CN.GB2312: zh_CN.eucCN
+zh_CN.GB2312: zh_CN.gb2312
zh_CN.GBK: zh_CN.gbk
zh_CN.big5: zh_TW.big5
zh_CN.euc: zh_CN.eucCN
-zh_CN.gb2312: zh_CN.eucCN
zh_CN.utf8: zh_CN.UTF-8
zh_HK: zh_HK.big5hkscs
zh_HK.Big5hkscs: zh_HK.big5hkscs