diff options
| author | marha <marha@users.sourceforge.net> | 2009-08-04 13:28:10 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-08-04 13:28:10 +0000 |
| commit | 831699826511697d669a358eba7b5d4f4f876873 (patch) | |
| tree | 18853f1b5785b0a865bd9b227a4e0fd4aea06d48 /xorg-server | |
| parent | 8f394f07cb21d8fd5d55beec4c238cd98e0ad8ad (diff) | |
| download | vcxsrv-831699826511697d669a358eba7b5d4f4f876873.tar.gz vcxsrv-831699826511697d669a358eba7b5d4f4f876873.tar.bz2 vcxsrv-831699826511697d669a358eba7b5d4f4f876873.zip | |
- Some files in the locale directory are now create from libX11/nls
- sync-ed locale.dir locale.alias and locale.dir files with the one in libX11/nls
Diffstat (limited to 'xorg-server')
| -rw-r--r-- | xorg-server/locale/C/XLC_LOCALE | 63 | ||||
| -rw-r--r-- | xorg-server/locale/compose.dir | 2 | ||||
| -rw-r--r-- | xorg-server/locale/locale.alias | 10 | ||||
| -rw-r--r-- | xorg-server/locale/locale.dir | 1 | ||||
| -rw-r--r-- | xorg-server/locale/locale.dir.bak | 11 |
5 files changed, 6 insertions, 81 deletions
diff --git a/xorg-server/locale/C/XLC_LOCALE b/xorg-server/locale/C/XLC_LOCALE deleted file mode 100644 index 13f3acd90..000000000 --- a/xorg-server/locale/C/XLC_LOCALE +++ /dev/null @@ -1,63 +0,0 @@ -# $Xorg: C,v 1.3 2000/08/17 19:46:59 cpqbld Exp $ -# XLocale Database Sample for C. -# $XFree86: xc/nls/XLC_LOCALE/C,v 1.3 2000/02/25 21:02:32 dawes Exp $ -# - -# -# XLC_FONTSET category -# -XLC_FONTSET -# fs0 class (7 bit ASCII) -fs0 { - charset { - name ISO8859-1:GL - } - font { - primary ISO8859-1:GL - vertical_rotate all - } -} -END XLC_FONTSET - -# -# XLC_XLOCALE category -# -XLC_XLOCALE - -encoding_name STRING -mb_cur_max 1 -state_depend_encoding False - -wc_encoding_mask \x30000000 -wc_shift_bits 7 - - - - - - -use_stdc_env True -force_convert_to_mb True - - -# cs0 class -cs0 { - side GL:Default - length 1 - wc_encoding \x00000000 - ct_encoding ISO8859-1:GL -} - -# cs1 class -cs1 { - side GR:Default - length 1 - - wc_encoding \x30000000 - - - - ct_encoding ISO8859-1:GR -} - -END XLC_XLOCALE diff --git a/xorg-server/locale/compose.dir b/xorg-server/locale/compose.dir index 75a598b0f..22391882f 100644 --- a/xorg-server/locale/compose.dir +++ b/xorg-server/locale/compose.dir @@ -6,4 +6,4 @@ # # $XFree86: xc/nls/compose.dir,v 1.24 2003/08/06 14:04:00 eich Exp $ # -iso8859-1/Compose C +iso8859-1/Compose: C diff --git a/xorg-server/locale/locale.alias b/xorg-server/locale/locale.alias index 053da33ad..da9751406 100644 --- a/xorg-server/locale/locale.alias +++ b/xorg-server/locale/locale.alias @@ -9,8 +9,8 @@ # $XFree86: xc/nls/locale.alias,v 1.65 2004/01/03 03:31:00 dawes Exp $ # -POSIX C -POSIX-UTF2 C -C_C.C C -C.en C -English_United-States.437 C +POSIX: C +POSIX-UTF2: C +C_C.C: C +C.en: C +English_United-States.437: C diff --git a/xorg-server/locale/locale.dir b/xorg-server/locale/locale.dir index c5b0b9c7a..116fdf818 100644 --- a/xorg-server/locale/locale.dir +++ b/xorg-server/locale/locale.dir @@ -8,5 +8,4 @@ # $XFree86: xc/nls/locale.dir,v 1.44 2003/12/18 04:14:22 dawes Exp $ # -C/XLC_LOCALE C C/XLC_LOCALE: C diff --git a/xorg-server/locale/locale.dir.bak b/xorg-server/locale/locale.dir.bak deleted file mode 100644 index 59b3dde5f..000000000 --- a/xorg-server/locale/locale.dir.bak +++ /dev/null @@ -1,11 +0,0 @@ -# $XdotOrg: lib/X11/nls/locale.dir.pre,v 1.10 2005-09-30 07:52:46 daniels Exp $ -# $Xorg: locale.dir,v 1.3 2000/08/17 19:46:48 cpqbld Exp $ -# -# This file contains locale database file names -# The first word is the locale database file name and -# the second word is the full locale name. -# -# $XFree86: xc/nls/locale.dir,v 1.44 2003/12/18 04:14:22 dawes Exp $ -# - -C/XLC_LOCALE C |