diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-08 14:29:46 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-08 14:50:37 +0200 |
| commit | 72ec0e3bb2d7fc6b77b2a75873792f781679da6a (patch) | |
| tree | 0a736ab9a8c26276929ab077dc661e3625b54884 /libX11/nls/zh_HK.UTF-8 | |
| parent | 5e865910f0ce672295bd60460631339be5e311a0 (diff) | |
| parent | 990bc3f015a4f8fce2eb918375defcd44980a845 (diff) | |
| download | vcxsrv-72ec0e3bb2d7fc6b77b2a75873792f781679da6a.tar.gz vcxsrv-72ec0e3bb2d7fc6b77b2a75873792f781679da6a.tar.bz2 vcxsrv-72ec0e3bb2d7fc6b77b2a75873792f781679da6a.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
fontconfig/.gitignore
libX11/src/ConvSel.c
libX11/src/CrGlCur.c
libX11/src/CrWindow.c
libX11/src/GetDflt.c
libX11/src/Window.c
libX11/src/xlibi18n/XimProto.h
libX11/src/xlibi18n/lcDynamic.c
libxcb/src/.gitignore
libxcb/src/xcb_ext.c
libxcb/src/xcb_xid.c
mesalib/src/glsl/.gitignore
mesalib/src/glsl/glcpp/.gitignore
mesalib/src/mapi/glapi/gen/glX_API.xml
mesalib/src/mapi/glapi/glapi_getproc.c
mesalib/src/mesa/main/.gitignore
mesalib/src/mesa/main/syncobj.c
mesalib/src/mesa/program/.gitignore
xkbcomp/listing.c
xkbcomp/xkbpath.c
xorg-server/.gitignore
xorg-server/Xext/xvmain.c
xorg-server/dix/dispatch.c
xorg-server/hw/xwin/glx/winpriv.h
xorg-server/hw/xwin/winprefsyacc.y
xorg-server/hw/xwin/winscrinit.c
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/mlv_s.sh
xorg-server/xkeyboard-config/rules/compat/.gitignore
Diffstat (limited to 'libX11/nls/zh_HK.UTF-8')
| -rw-r--r-- | libX11/nls/zh_HK.UTF-8/XI18N_OBJS | 14 | ||||
| -rw-r--r-- | libX11/nls/zh_HK.UTF-8/XLC_LOCALE.pre | 192 |
2 files changed, 103 insertions, 103 deletions
diff --git a/libX11/nls/zh_HK.UTF-8/XI18N_OBJS b/libX11/nls/zh_HK.UTF-8/XI18N_OBJS index e9d5ef8ad..8fb0b1be0 100644 --- a/libX11/nls/zh_HK.UTF-8/XI18N_OBJS +++ b/libX11/nls/zh_HK.UTF-8/XI18N_OBJS @@ -1,7 +1,7 @@ -# CATEGORY(XLC|XIM|OM) SHARED_LIBRARY_NAME FUNCTION_NAME -# -# XI18N objects table for zh_HK.UTF-8 locale -# -XLC common/xlcUTF8Load _XlcUtf8Loader # XLC_open -XIM common/ximcp _XimOpenIM _XimRegisterIMInstantiateCallback _XimUnRegisterIMInstantiateCallback # XIM_open XIM_register XIM_unregister -XOM common/xomGeneric _XomGenericOpenOM # XOM_open +# CATEGORY(XLC|XIM|OM) SHARED_LIBRARY_NAME FUNCTION_NAME
+#
+# XI18N objects table for zh_HK.UTF-8 locale
+#
+XLC common/xlcUTF8Load _XlcUtf8Loader # XLC_open
+XIM common/ximcp _XimOpenIM _XimRegisterIMInstantiateCallback _XimUnRegisterIMInstantiateCallback # XIM_open XIM_register XIM_unregister
+XOM common/xomGeneric _XomGenericOpenOM # XOM_open
diff --git a/libX11/nls/zh_HK.UTF-8/XLC_LOCALE.pre b/libX11/nls/zh_HK.UTF-8/XLC_LOCALE.pre index c08803258..7eac192c7 100644 --- a/libX11/nls/zh_HK.UTF-8/XLC_LOCALE.pre +++ b/libX11/nls/zh_HK.UTF-8/XLC_LOCALE.pre @@ -1,96 +1,96 @@ -XCOMM XFree86 NLS for Chinese locale zh_HK.UTF-8 -XCOMM Modified from xc/nls/XLC_LOCALE/en_US.UTF-8 -XCOMM by James Su <suzhe@turbolinux.com.cn> - -XCOMM -XCOMM XLC_FONTSET category -XCOMM -XLC_FONTSET - -on_demand_loading True - -object_name generic - -XCOMM We leave the legacy encodings in for the moment, because we don't -XCOMM have that many ISO10646 fonts yet. -XCOMM fs0 class (7 bit ASCII) -fs0 { - charset { - name ISO8859-1:GL - } - font { - primary ISO8859-1:GL - vertical_rotate all - } -} - -XCOMM fs1 class (ISO8859 families) -fs1 { - charset { - name ISO8859-1:GR - } - font { - primary ISO8859-1:GR - } -} - -XCOMM fs2 class -fs2 { - charset { - name BIG5HKSCS-0:GLGR - } - font { - primary BIG5HKSCS-0:GLGR - substitute BIG5-0:GLGR - } -} - -XCOMM fs3 class -fs3 { - charset { - name ISO10646-1 - } - font { - primary ISO10646-1 - } -} -END XLC_FONTSET - -XCOMM -XCOMM XLC_XLOCALE category -XCOMM -XLC_XLOCALE - -encoding_name UTF-8 -mb_cur_max 6 -state_depend_encoding False - -XCOMM cs0 class -cs0 { - side GL:Default - length 1 - ct_encoding ISO8859-1:GL -} - -XCOMM cs1 class -cs1 { - side GR:Default - length 1 - ct_encoding ISO8859-1:GR -} - -XCOMM cs2 class -cs2 { - side none - length 2 - ct_encoding BIG5HKSCS-0:GLGR -} - -XCOMM cs3 class -cs3 { - side none - ct_encoding ISO10646-1 -} - -END XLC_XLOCALE - +XCOMM XFree86 NLS for Chinese locale zh_HK.UTF-8
+XCOMM Modified from xc/nls/XLC_LOCALE/en_US.UTF-8
+XCOMM by James Su <suzhe@turbolinux.com.cn>
+
+XCOMM
+XCOMM XLC_FONTSET category
+XCOMM
+XLC_FONTSET
+
+on_demand_loading True
+
+object_name generic
+
+XCOMM We leave the legacy encodings in for the moment, because we don't
+XCOMM have that many ISO10646 fonts yet.
+XCOMM fs0 class (7 bit ASCII)
+fs0 {
+ charset {
+ name ISO8859-1:GL
+ }
+ font {
+ primary ISO8859-1:GL
+ vertical_rotate all
+ }
+}
+
+XCOMM fs1 class (ISO8859 families)
+fs1 {
+ charset {
+ name ISO8859-1:GR
+ }
+ font {
+ primary ISO8859-1:GR
+ }
+}
+
+XCOMM fs2 class
+fs2 {
+ charset {
+ name BIG5HKSCS-0:GLGR
+ }
+ font {
+ primary BIG5HKSCS-0:GLGR
+ substitute BIG5-0:GLGR
+ }
+}
+
+XCOMM fs3 class
+fs3 {
+ charset {
+ name ISO10646-1
+ }
+ font {
+ primary ISO10646-1
+ }
+}
+END XLC_FONTSET
+
+XCOMM
+XCOMM XLC_XLOCALE category
+XCOMM
+XLC_XLOCALE
+
+encoding_name UTF-8
+mb_cur_max 6
+state_depend_encoding False
+
+XCOMM cs0 class
+cs0 {
+ side GL:Default
+ length 1
+ ct_encoding ISO8859-1:GL
+}
+
+XCOMM cs1 class
+cs1 {
+ side GR:Default
+ length 1
+ ct_encoding ISO8859-1:GR
+}
+
+XCOMM cs2 class
+cs2 {
+ side none
+ length 2
+ ct_encoding BIG5HKSCS-0:GLGR
+}
+
+XCOMM cs3 class
+cs3 {
+ side none
+ ct_encoding ISO10646-1
+}
+
+END XLC_XLOCALE
+
|