[Xorg-commit] xc/nls compose.dir,1.1.4.2,1.1.4.3 locale.alias,1.1.4.5,1.1.4.6 locale.dir,1.1.4.4,1.1.4.5

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/nls
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/nls

Modified Files:
      Tag: XORG-CURRENT
	compose.dir locale.alias locale.dir 
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214


Index: compose.dir
===================================================================
RCS file: /cvs/xorg/xc/nls/compose.dir,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/compose.dir	26 Nov 2003 22:48:40 -0000	1.1.4.2
+++ b/compose.dir	23 Feb 2004 21:34:50 -0000	1.1.4.3
@@ -4,7 +4,7 @@
 XCOMM	The first word is the compose table file name and
 XCOMM	the second word is full locale name.
 XCOMM
-XCOMM $XFree86: xc/nls/compose.dir,v 1.24 2003/08/06 14:04:00 eich Exp $
+XCOMM $XFree86: xc/nls/compose.dir,v 1.25 2004/02/09 01:35:16 dawes Exp $
 XCOMM
 iso8859-1/Compose:		C
 iso8859-1/Compose:		af_ZA.ISO8859-1
@@ -345,6 +345,7 @@
 en_US.UTF-8/Compose:		tt_RU.UTF-8
 en_US.UTF-8/Compose:		uk_UA.UTF-8
 en_US.UTF-8/Compose:		ur_PK.UTF-8
+en_US.UTF-8/Compose:		uz_UZ.UTF-8
 en_US.UTF-8/Compose:		vi_VN.UTF-8
 en_US.UTF-8/Compose:		wa_BE.UTF-8
 en_US.UTF-8/Compose:		yi_US.UTF-8

Index: locale.alias
===================================================================
RCS file: /cvs/xorg/xc/nls/locale.alias,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -d -r1.1.4.5 -r1.1.4.6
--- a/locale.alias	18 Feb 2004 22:17:02 -0000	1.1.4.5
+++ b/locale.alias	23 Feb 2004 21:34:50 -0000	1.1.4.6
@@ -6,7 +6,7 @@
 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.64 2003/12/18 04:14:22 dawes Exp $
+XCOMM	$XFree86: xc/nls/locale.alias,v 1.66 2004/02/09 01:35:17 dawes Exp $
 XCOMM
 
 POSIX:						C
@@ -535,6 +535,7 @@
 ko_KR:						ko_KR.eucKR
 KO_KR:						ko_KR.eucKR
 ko_KR.EUC:					ko_KR.eucKR
+ko_KR.EUC-KR:					ko_KR.eucKR
 ko_KR.euc:					ko_KR.eucKR
 ko_KR.euckr:					ko_KR.eucKR
 ko_KR.utf8:					ko_KR.UTF-8
@@ -797,6 +798,8 @@
 ur_PK.microsoftcp1256:				ur_PK.CP1256
 ur_PK.microsoft-cp1256:				ur_PK.CP1256
 ur_PK.MICROSOFT-CP1256:				ur_PK.CP1256
+uz:						uz_UZ.UTF-8
+uz_UZ:						uz_UZ.UTF-8
 vi:						vi_VN.TCVN
 vi_VN:						vi_VN.TCVN
 Vi_VN:						vi_VN.TCVN

Index: locale.dir
===================================================================
RCS file: /cvs/xorg/xc/nls/locale.dir,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/locale.dir	18 Feb 2004 22:17:02 -0000	1.1.4.4
+++ b/locale.dir	23 Feb 2004 21:34:50 -0000	1.1.4.5
@@ -5,7 +5,7 @@
 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.44 2003/12/18 04:14:22 dawes Exp $
+XCOMM	$XFree86: xc/nls/locale.dir,v 1.45 2004/02/09 01:35:18 dawes Exp $
 XCOMM
 
 C/XLC_LOCALE:				C
@@ -378,6 +378,7 @@
 en_US.UTF-8/XLC_LOCALE:			tt_RU.UTF-8
 en_US.UTF-8/XLC_LOCALE:			uk_UA.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ur_PK.UTF-8
+en_US.UTF-8/XLC_LOCALE:			uz_UZ.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