aboutsummaryrefslogtreecommitdiff
path: root/libX11/nls/zh_CN.gbk/XLC_LOCALE.pre
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-11-19 10:38:33 +0100
committermarha <marha@users.sourceforge.net>2012-11-19 10:38:33 +0100
commit24635abae6008bef13e30d798b3f33abab412770 (patch)
treee799fbde24e0fd935af76b0bc48d30ef69f75d54 /libX11/nls/zh_CN.gbk/XLC_LOCALE.pre
parente0844ae8b5ef87049537a7e0ebff81acc2695256 (diff)
parent6ce1d8f0f8c23e186175a7c84c21d7bfbe168dc5 (diff)
downloadvcxsrv-24635abae6008bef13e30d798b3f33abab412770.tar.gz
vcxsrv-24635abae6008bef13e30d798b3f33abab412770.tar.bz2
vcxsrv-24635abae6008bef13e30d798b3f33abab412770.zip
Merge remote-tracking branch 'origin/released'
* origin/released: Changed file permissions dos -> unix Conflicts: libX11/include/X11/Xregion.h libX11/src/ConvSel.c libX11/src/CrGlCur.c libX11/src/CrWindow.c libX11/src/GetDflt.c libX11/src/StrKeysym.c libX11/src/Window.c libX11/src/xkb/XKBBind.c libX11/src/xkb/XKBGetMap.c libX11/src/xkb/XKBSetGeom.c libX11/src/xkb/XKBUse.c libX11/src/xlibi18n/XimProto.h libX11/src/xlibi18n/lcDynamic.c libXdmcp/Key.c libXdmcp/Write.c libxcb/src/xcb_windefs.h xkbcomp/keycodes.c xkbcomp/xkbpath.c xorg-server/hw/xwin/glx/winpriv.h xorg-server/xkeyboard-config/rules/bin/ml1_s.sh xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh xorg-server/xkeyboard-config/rules/bin/ml_s.sh xorg-server/xkeyboard-config/rules/bin/mln_s.sh xorg-server/xkeyboard-config/rules/bin/mlnvn_s.sh xorg-server/xkeyboard-config/rules/bin/mlv_s.sh xorg-server/xkeyboard-config/rules/compat/.gitignore
Diffstat (limited to 'libX11/nls/zh_CN.gbk/XLC_LOCALE.pre')
-rw-r--r--libX11/nls/zh_CN.gbk/XLC_LOCALE.pre140
1 files changed, 70 insertions, 70 deletions
diff --git a/libX11/nls/zh_CN.gbk/XLC_LOCALE.pre b/libX11/nls/zh_CN.gbk/XLC_LOCALE.pre
index b43dbec97..302818bca 100644
--- a/libX11/nls/zh_CN.gbk/XLC_LOCALE.pre
+++ b/libX11/nls/zh_CN.gbk/XLC_LOCALE.pre
@@ -1,70 +1,70 @@
-XCOMM
-XCOMM X11R6 L10N for Chinese GBK Encoding.
-XCOMM modified from xc/nls/XLC_LOCALE/zh_TW.Big5
-XCOMM by Sean Chen <seanc@turbolinux.com>
-XCOMM
-
-XCOMM
-XCOMM XLC_FONTSET category
-XCOMM
-XLC_FONTSET
-XCOMM fs0 class (7 bit ASCII)
-fs0 {
- charset {
- name ISO8859-1:GL
- }
- font {
- primary ISO8859-1:GL
- vertical_rotate all
- }
-}
-XCOMM fs1 class
-fs1 {
- charset {
- name GBK-0:GLGR
- }
- font {
- primary GBK-0:GLGR
- substitute GB13000.1993-1:GLGR
- }
-}
-END XLC_FONTSET
-
-XCOMM
-XCOMM XLC_XLOCALE category
-XCOMM
-XLC_XLOCALE
-
-encoding_name zh_CN.GBK
-mb_cur_max 2
-state_depend_encoding False
-
-wc_encoding_mask \x00008000
-wc_shift_bits 8
-
-use_stdc_env True
-force_convert_to_mb True
-
-XCOMM cs0 class
-cs0 {
- side GL:Default
- length 1
- wc_encoding \x00000000
- ct_encoding ISO8859-1:GL
-}
-
-XCOMM cs1 class
-cs1 {
- side none
- length 2
- byte1 \x81,\xfe
- byte2 \x40,\x7e;\x80,\xfe
-
- wc_encoding \x00008000
- ct_encoding GBK-0:GLGR:\x1b\x25\x2f\x32
-
- mb_conversion [\x8140,\xfefe]->\x0140
- ct_conversion [\x0140,\x7efe]->\x8140
-}
-
-END XLC_XLOCALE
+XCOMM
+XCOMM X11R6 L10N for Chinese GBK Encoding.
+XCOMM modified from xc/nls/XLC_LOCALE/zh_TW.Big5
+XCOMM by Sean Chen <seanc@turbolinux.com>
+XCOMM
+
+XCOMM
+XCOMM XLC_FONTSET category
+XCOMM
+XLC_FONTSET
+XCOMM fs0 class (7 bit ASCII)
+fs0 {
+ charset {
+ name ISO8859-1:GL
+ }
+ font {
+ primary ISO8859-1:GL
+ vertical_rotate all
+ }
+}
+XCOMM fs1 class
+fs1 {
+ charset {
+ name GBK-0:GLGR
+ }
+ font {
+ primary GBK-0:GLGR
+ substitute GB13000.1993-1:GLGR
+ }
+}
+END XLC_FONTSET
+
+XCOMM
+XCOMM XLC_XLOCALE category
+XCOMM
+XLC_XLOCALE
+
+encoding_name zh_CN.GBK
+mb_cur_max 2
+state_depend_encoding False
+
+wc_encoding_mask \x00008000
+wc_shift_bits 8
+
+use_stdc_env True
+force_convert_to_mb True
+
+XCOMM cs0 class
+cs0 {
+ side GL:Default
+ length 1
+ wc_encoding \x00000000
+ ct_encoding ISO8859-1:GL
+}
+
+XCOMM cs1 class
+cs1 {
+ side none
+ length 2
+ byte1 \x81,\xfe
+ byte2 \x40,\x7e;\x80,\xfe
+
+ wc_encoding \x00008000
+ ct_encoding GBK-0:GLGR:\x1b\x25\x2f\x32
+
+ mb_conversion [\x8140,\xfefe]->\x0140
+ ct_conversion [\x0140,\x7efe]->\x8140
+}
+
+END XLC_XLOCALE