diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-12-20 00:28:22 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-12-20 00:28:22 +0000 |
| commit | 86c0fe5f7e97685a1d24770eaa30fd0d0eba64d4 (patch) | |
| tree | f5ff7ba9dbf4b6066976183e9a242a929637d4c3 /nls/locale.dir.pre | |
| parent | 2f9610b97f7af0b2be8651399f972b7e7ba2f015 (diff) | |
merge XFree86 RC2 (4.3.99.902) from vendor branchXEVIE-BASE
Diffstat (limited to 'nls/locale.dir.pre')
| -rw-r--r-- | nls/locale.dir.pre | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nls/locale.dir.pre b/nls/locale.dir.pre index d3db1b4..38a3170 100644 --- a/nls/locale.dir.pre +++ b/nls/locale.dir.pre @@ -1,10 +1,11 @@ +XCOMM $XdotOrg: lib/X11/nls/locale.dir.pre,v 1.1.4.3 2003-12-20 00:28:22 kaleb Exp $ XCOMM $Xorg: locale.dir,v 1.3 2000/08/17 19:46:48 cpqbld Exp $ XCOMM XCOMM This file contains locale database file names XCOMM The first word is the locale database file name and XCOMM the second word is the full locale name. XCOMM -XCOMM $XFree86: xc/nls/locale.dir,v 1.43 2003/08/06 14:04:00 eich Exp $ +XCOMM $XFree86: xc/nls/locale.dir,v 1.44 2003/12/18 04:14:22 dawes Exp $ XCOMM C/XLC_LOCALE: C @@ -218,9 +219,8 @@ iso8859-1/XLC_LOCALE: wa_BE.ISO8859-1 iso8859-15/XLC_LOCALE: wa_BE.ISO8859-15 microsoft-cp1255/XLC_LOCALE: yi_US.CP1255 zh_CN/XLC_LOCALE: zh_CN.eucCN -zh_CN/XLC_LOCALE: zh_CN.GB2312 +zh_CN/XLC_LOCALE: zh_CN.gb2312 zh_CN.gbk/XLC_LOCALE: zh_CN.gbk -zh_CN.UTF-8/XLC_LOCALE: zh_CN.UTF-8 zh_HK.big5/XLC_LOCALE: zh_HK.big5 zh_HK.big5hkscs/XLC_LOCALE: zh_HK.big5-hkscs zh_HK.big5hkscs/XLC_LOCALE: zh_HK.Big5-HKSCS @@ -369,7 +369,7 @@ en_US.UTF-8/XLC_LOCALE: ur_PK.UTF-8 en_US.UTF-8/XLC_LOCALE: vi_VN.UTF-8 en_US.UTF-8/XLC_LOCALE: wa_BE.UTF-8 en_US.UTF-8/XLC_LOCALE: yi_US.UTF-8 -en_US.UTF-8/XLC_LOCALE: zh_CN.UTF-8 +zh_CN.UTF-8/XLC_LOCALE: zh_CN.UTF-8 zh_TW.UTF-8/XLC_LOCALE: zh_TW.UTF-8 #ifdef __uxp__ ja.U90/XLC_LOCALE: ja_JP.U90 |