Merging XORG-CURRENT into trunk

1 files changed, 682 insertions, 59 deletions

diff --git a/nls/locale.alias.pre b/nls/locale.alias.pre
index ed5009a1..c00e1413 100644
--- a/nls/locale.alias.pre
+++ b/nls/locale.alias.pre
@@ -1,10 +1,14 @@
-XCOMM	$Xorg: locale.alias,v 1.4 2000/12/12 13:00:42 coskrey Exp $
+XCOMM	$XdotOrg: lib/X11/nls/locale.alias.pre,v 1.2 2004-04-23 18:44:33 eich Exp $
+XCOMM	$Xorg: locale.alias,v 1.3 2000/08/17 19:46:48 cpqbld Exp $
 XCOMM
 XCOMM	This file contains alias name of locale.
 XCOMM	Each alias name is described within one line.
 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.65 2004/01/03 03:31:00 dawes Exp $
+XCOMM
+
 POSIX:						C
 POSIX-UTF2:					C
 C_C.C:						C
@@ -13,142 +17,483 @@ C.iso88591:					en_US.ISO8859-1
 Cextend:					en_US.ISO8859-1
 Cextend.en:					en_US.ISO8859-1
 English_United-States.437:			C
-XCOMM
+af:						af_ZA.ISO8859-1
+af_ZA:						af_ZA.ISO8859-1
+af_ZA.iso88591:					af_ZA.ISO8859-1
+am:						am_ET.UTF-8
 ar:						ar_AA.ISO8859-6
 ar_AA:						ar_AA.ISO8859-6
+AR_AA:						ar_AA.ISO8859-6
+Ar_AA:						ar_AA.ISO8859-6
+AR_AA.UTF-8:					ar_AA.UTF-8
+ar_AA.iso88596:					ar_AA.ISO8859-6
+ar_AE:						ar_AE.ISO8859-6
+ar_AE.utf8:					ar_AE.UTF-8
+ar_BH:						ar_BH.ISO8859-6
+ar_BH.utf8:					ar_BH.UTF-8
+ar_DZ:						ar_DZ.ISO8859-6
+ar_DZ.utf8:					ar_DZ.UTF-8
+ar_EG:						ar_EG.ISO8859-6
+ar_EG.iso88596:					ar_EG.ISO8859-6
+ar_EG.utf8:					ar_EG.UTF-8
+ar_IQ:						ar_IQ.ISO8859-6
+ar_IQ.utf8:					ar_IQ.UTF-8
+ar_JO:						ar_JO.ISO8859-6
+ar_JO.utf8:					ar_JO.UTF-8
+ar_KW:						ar_KW.ISO8859-6
+ar_KW.utf8:					ar_KW.UTF-8
+ar_LB:						ar_LB.ISO8859-6
+ar_LB.utf8:					ar_LB.UTF-8
+ar_LY:						ar_LY.ISO8859-6
+ar_LY.utf8:					ar_LY.UTF-8
+ar_MA:						ar_MA.ISO8859-6
+ar_MA.utf8:					ar_MA.UTF-8
+ar_OM:						ar_OM.ISO8859-6
+ar_OM.utf8:					ar_OM.UTF-8
+ar_QA:						ar_QA.ISO8859-6
+ar_QA.utf8:					ar_QA.UTF-8
+ar_SA:						ar_SA.ISO8859-6
 ar_SA.iso88596:					ar_SA.ISO8859-6
-bg:						bg_BG.ISO8859-5
-bg_BG:						bg_BG.ISO8859-5
+ar_SA.utf8:					ar_SA.UTF-8
+ar_SD:						ar_SD.ISO8859-6
+ar_SD.utf8:					ar_SD.UTF-8
+ar_SY:						ar_SY.ISO8859-6
+ar_SY.utf8:					ar_SY.UTF-8
+ar_TN:						ar_TN.ISO8859-6
+ar_TN.utf8:					ar_TN.UTF-8
+ar_YE:						ar_YE.ISO8859-6
+ar_YE.utf8:					ar_YE.UTF-8
+az:						az_AZ.ISO8859-9E
+az_AZ:						az_AZ.ISO8859-9E
+az_AZ.iso88599e:				az_AZ.ISO8859-9E
+a3:						a3_AZKOI8-C
+a3_AZ:						a3_AZ.KOI8-C
+a3_AZ.koi8c:					a3_AZ.KOI8-C
+be:						be_BY.CP1251
+be_BY:						be_BY.CP1251
+be_BY.cp1251:					be_BY.CP1251
+be_BY.microsoftcp1251:				be_BY.CP1251
+be_BY.microsoft-cp1251:				be_BY.CP1251
+be_BY.MICROSOFT-CP1251:				be_BY.CP1251
+be_BY.utf8:					be_BY.UTF-8
 bg_BG.iso88595:					bg_BG.ISO8859-5
+bg:						bg_BG.CP1251
+bg_BG:						bg_BG.CP1251
+bg_BG.cp1251:					bg_BG.CP1251
+bg_BG.microsoftcp1251:				bg_BG.CP1251
+bg_BG.microsoft-cp1251:				bg_BG.CP1251
+bg_BG.MICROSOFT-CP1251:				bg_BG.CP1251
+bg_BG.iso88595:					bg_BG.ISO8859-5
+bg_BG.koi8r:					bg_BG.KOI8-R
+be_BG.utf8:					be_BG.UTF-8
+br:						br_FR.ISO8859-1
+br_FR:						br_FR.ISO8859-1
+br_FR.iso88591:					br_FR.ISO8859-1
+br_FR.iso885914:				br_FR.ISO8859-14
+br_FR.iso885915:				br_FR.ISO8859-15
+br_FR@euro:					br_FR.ISO8859-15
+ca:						ca_ES.ISO8859-1
+ca_ES:						ca_ES.ISO8859-1
+ca_ES.iso88591:					ca_ES.ISO8859-1
+ca_ES.ISO-8859-1:				ca_ES.ISO8859-1
+ca_ES.iso885915:				ca_ES.ISO8859-15
+ca_ES@euro:					ca_ES.ISO8859-15
+ca_ES.utf8:					ca_ES.UTF-8
 cs:						cs_CZ.ISO8859-2
 cs_CS:						cs_CZ.ISO8859-2
 cs_CS.ISO8859-2:				cs_CZ.ISO8859-2
 cs_CZ:						cs_CZ.ISO8859-2
 cs_CZ.iso88592:					cs_CZ.ISO8859-2
-cz:						cz_CZ.ISO8859-2
-cz_CZ:						cz_CZ.ISO8859-2
+cs_CZ.ISO-8859-2:				cs_CZ.ISO8859-2
+cs_CZ.ISO_8859-2:				cs_CZ.ISO8859-2
+cs_CZ.utf8:					cs_CZ.UTF-8
+XCOMM cz is old name for cs, should be deleted in the future:
+cz:						cs_CZ.ISO8859-2
+cz_CZ:						cs_CZ.ISO8859-2
+cy:						cy_GB.ISO8859-1
+cy_GB:						cy_GB.ISO8859-1
+cy_GB.iso88591:					cy_GB.ISO8859-1
+cy_GB.iso885914:				cy_GB.ISO8859-14
+cy_GB.iso885915:				cy_GB.ISO8859-15
 da:						da_DK.ISO8859-1
 da_DK:						da_DK.ISO8859-1
+DA_DK:						da_DK.ISO8859-1
 da_DK.88591:					da_DK.ISO8859-1
 da_DK.88591.en:					da_DK.ISO8859-1
 da_DK.iso88591:					da_DK.ISO8859-1
+da_DK.ISO-8859-1:				da_DK.ISO8859-1
 da_DK.ISO_8859-1:				da_DK.ISO8859-1
+da_DK.iso885915:				da_DK.ISO8859-15
+da_DK.8859-15:					da_DK.ISO8859-15
+da_DK.utf8:					da_DK.UTF-8
+DA_DK.UTF-8:					da_DK.UTF-8
 de:						de_DE.ISO8859-1
 de_AT:						de_AT.ISO8859-1
+de_AT.iso88591:					de_AT.ISO8859-1
 de_AT.ISO_8859-1:				de_AT.ISO8859-1
+de_AT.iso885915:				de_AT.ISO8859-15
+de_AT@euro:					de_AT.ISO8859-15
+de_AT.utf8:					de_AT.UTF-8
+de_BE:						de_BE.ISO8859-1
+de_BE.iso88591:					de_BE.ISO8859-1
+de_BE.ISO_8859-1:				de_BE.ISO8859-1
+de_BE.ISO-8859-1:				de_BE.ISO8859-1
+de_BE.iso885915:				de_BE.ISO8859-15
+de_BE.ISO_8859-15:				de_BE.ISO8859-15
+de_BE.ISO-8859-15:				de_BE.ISO8859-15
+de_BE@euro:					de_BE.ISO8859-15
 de_CH:						de_CH.ISO8859-1
+de_CH.iso88591:					de_CH.ISO8859-1
 de_CH.ISO_8859-1:				de_CH.ISO8859-1
+de_CH.ISO-8859-1:				de_CH.ISO8859-1
+de_CH.iso885915:				de_CH.ISO8859-15
+de_CH.ISO_8859-15:				de_CH.ISO8859-15
+de_CH.ISO-8859-15:				de_CH.ISO8859-15
+de_CH.utf8:					de_CH.UTF-8
 de_DE:						de_DE.ISO8859-1
 de_DE.88591:					de_DE.ISO8859-1
 de_DE.88591.en:					de_DE.ISO8859-1
 de_DE.iso88591:					de_DE.ISO8859-1
+de_DE.ISO-8859-1:				de_DE.ISO8859-1
 de_DE.ISO_8859-1:				de_DE.ISO8859-1
+de_DE.iso885915:				de_DE.ISO8859-15
+de_DE.ISO-8859-15:				de_DE.ISO8859-15
+de_DE.ISO_8859-15:				de_DE.ISO8859-15
+de_DE.8859-15:					de_DE.ISO8859-15
+de_DE.8859-15@euro:				de_DE.ISO8859-15
+de_DE@euro:					de_DE.ISO8859-15
+de_DE.utf8:					de_DE.UTF-8
+de_LU:						de_LU.ISO8859-1
+de_LU.iso88591:					de_LU.ISO8859-1
+de_LU.ISO_8859-1:				de_LU.ISO8859-1
+de_LU.ISO-8859-1:				de_LU.ISO8859-1
+de_LU.iso885915:				de_LU.ISO8859-15
+de_LU.ISO_8859-15:				de_LU.ISO8859-15
+de_LU.ISO-8859-15:				de_LU.ISO8859-15
+de_LU@euro:					de_LU.ISO8859-15
+de_LU.utf8:					de_LU.UTF-8
 GER_DE.8859:					de_DE.ISO8859-1
 GER_DE.8859.in:					de_DE.ISO8859-1
 ee:						ee_EE.ISO8859-4
+ee_EE:						ee_EE.ISO8859-4
+ee_EE.iso88594:					ee_EE.ISO8859-4
 el:						el_GR.ISO8859-7
 el_GR:						el_GR.ISO8859-7
 el_GR.iso88597:					el_GR.ISO8859-7
+el_GR.ISO-8859-7:				el_GR.ISO8859-7
+el_GR@euro:					el_GR.ISO8859-15
+el_GR.utf8:					el_GR.UTF-8
 en:						en_US.ISO8859-1
+en.ISO-8859-1:					en_US.ISO8859-1
 en_AU:						en_AU.ISO8859-1
+en_AU.iso88591:					en_AU.ISO8859-1
+en_AU.ISO-8859-1:				en_AU.ISO8859-1
 en_AU.ISO_8859-1:				en_AU.ISO8859-1
+en_AU.utf8:					en_AU.UTF-8
+en_BE:						en_BE.ISO8859-1
+en_BE@euro:					en_BE.ISO8859-15
+en_BE.utf8:					en_BE.UTF-8
+en_BW:						en_BW.ISO8859-1
 en_CA:						en_CA.ISO8859-1
+en_CA.iso88591:					en_CA.ISO8859-1
+en_CA.ISO-8859-1:				en_CA.ISO8859-1
 en_CA.ISO_8859-1:				en_CA.ISO8859-1
+en_CA.utf8:					en_CA.UTF-8
 en_GB:						en_GB.ISO8859-1
 en_GB.88591:					en_GB.ISO8859-1
 en_GB.88591.en:					en_GB.ISO8859-1
 en_GB.iso88591:					en_GB.ISO8859-1
+en_GB.iso885915:				en_GB.ISO8859-15
+en_GB.ISO-8859-1:				en_GB.ISO8859-1
 en_GB.ISO_8859-1:				en_GB.ISO8859-1
+en_GB.utf8:					en_GB.UTF-8
 en_UK:						en_GB.ISO8859-1
 ENG_GB.8859:					en_GB.ISO8859-1
 ENG_GB.8859.in:					en_GB.ISO8859-1
+en_HK:						en_HK.ISO8859-1
 en_IE:						en_IE.ISO8859-1
+en_IE.iso88591:					en_IE.ISO8859-1
+en_IE.iso885915:				en_IE.ISO8859-15
+en_IE@euro:					en_IE.ISO8859-15
+en_IE.utf8:					en_IE.UTF-8
+en_IN:						en_IN.ISO8859-1
 en_NZ:						en_NZ.ISO8859-1
+en_NZ.iso88591:					en_NZ.ISO8859-1
+en_NZ.utf8:					en_NZ.UTF-8
+en_PH:						en_PH.ISO8859-1
+en_SG:						en_SG.ISO8859-1
 en_US:						en_US.ISO8859-1
+EN_US:						en_US.ISO8859-1
 en_US.88591:					en_US.ISO8859-1
 en_US.88591.en:					en_US.ISO8859-1
 en_US.iso88591:					en_US.ISO8859-1
+en_US.ISO-8859-1:				en_US.ISO8859-1
 en_US.ISO_8859-1:				en_US.ISO8859-1
-en_US.UTF-8:					en_US.UTF-8
+en_US.iso885915:				en_US.ISO8859-15
+en_US.8859-15:					en_US.ISO8859-15
+en_US.ISO8859-15@euro:				en_US.ISO8859-15
+en_US.utf8:					en_US.UTF-8
+EN_US.UTF-8:					en_US.UTF-8
+en_US.88591.en:					en_US.ISO8859-1
+en_US.iso88591:					en_US.ISO8859-1
+en_US.ISO-8859-1:				en_US.ISO8859-1
+en_US.ISO_8859-1:				en_US.ISO8859-1
+en_US.iso885915:				en_US.ISO8859-15
+en_US.8859-15:					en_US.ISO8859-15
+en_US.ISO8859-15@euro:				en_US.ISO8859-15
+en_US.utf8:					en_US.UTF-8
+EN_US.UTF-8:					en_US.UTF-8
+en_ZA:						en_ZA.ISO8859-1
+en_ZA.88591:					en_ZA.ISO8859-1
+en_ZA.88591.en:					en_ZA.ISO8859-1
+en_ZA.iso88591:					en_ZA.ISO8859-1
+en_ZA.ISO-8859-1:				en_ZA.ISO8859-1
+en_ZA.ISO_8859-1:				en_ZA.ISO8859-1
+en_ZA.ISO-8859-15:				en_ZA.ISO8859-15
+en_ZA.iso885915:				en_ZA.ISO8859-15
+en_ZA.utf8:					en_ZA.UTF-8
+en_ZW:						en_ZW.ISO8859-1
+eo:						eo_XX.ISO8859-3
+eo_EO:						eo_EO.ISO8859-3
+eo_EO.ISO8859-3:				eo_EO.ISO8859-3
+eo_XX:						eo_XX.ISO8859-3
+eo_XX.ISO8859-3:				eo_XX.ISO8859-3
 es:						es_ES.ISO8859-1
 es_AR:						es_AR.ISO8859-1
+es_AR.iso88591:					es_AR.ISO8859-1
+es_AR.utf8:					es_AR.UTF-8
 es_BO:						es_BO.ISO8859-1
+es_BO.iso88591:					es_BO.ISO8859-1
+es_BO.utf8:					es_BO.UTF-8
 es_CL:						es_CL.ISO8859-1
+es_CL.iso88591:					es_CL.ISO8859-1
+es_CL.utf8:					es_CL.UTF-8
 es_CO:						es_CO.ISO8859-1
+es_CO.iso88591:					es_CO.ISO8859-1
+es_CO.utf8:					es_CO.UTF-8
 es_CR:						es_CR.ISO8859-1
+es_CR.iso88591:					es_CR.ISO8859-1
+es_CR.utf8:					es_CR.UTF-8
+es_DO:						es_DO.ISO8859-1
+es_DO.iso88591:					es_DO.ISO8859-1
+es_DO.utf8:					es_DO.UTF-8
 es_EC:						es_EC.ISO8859-1
+es_EC.iso88591:					es_EC.ISO8859-1
+es_EC.utf8:					es_EC.UTF-8
 es_ES:						es_ES.ISO8859-1
 es_ES.88591:					es_ES.ISO8859-1
 es_ES.88591.en:					es_ES.ISO8859-1
 es_ES.iso88591:					es_ES.ISO8859-1
+es_ES.ISO-8859-1:				es_ES.ISO8859-1
 es_ES.ISO_8859-1:				es_ES.ISO8859-1
+es_ES.iso885915:				es_ES.ISO8859-15
+es_ES@euro:					es_ES.ISO8859-15
+es_ES.utf8:					es_ES.UTF-8
 es_GT:						es_GT.ISO8859-1
+es_GT.iso88591:					es_GT.ISO8859-1
+es_GT.utf8:					es_GT.UTF-8
+es_HN:						es_HN.ISO8859-1
+es_HN.iso88591:					es_HN.ISO8859-1
+es_HN.utf8:					es_HN.UTF-8
 es_MX:						es_MX.ISO8859-1
+es_MX.iso88591:					es_MX.ISO8859-1
+es_MX.utf8:					es_MX.UTF-8
 es_NI:						es_NI.ISO8859-1
+es_NI.iso88591:					es_NI.ISO8859-1
+es_NI.utf8:					es_NI.UTF-8
 es_PA:						es_PA.ISO8859-1
+es_PA.iso88591:					es_PA.ISO8859-1
+es_PA.iso885915:				es_PA.ISO8859-15
+es_PA.utf8:					es_PA.UTF-8
 es_PE:						es_PE.ISO8859-1
+es_PE.iso88591:					es_PE.ISO8859-1
+es_PE.iso885915:				es_PE.ISO8859-15
+es_PE.utf8:					es_PE.UTF-8
+es_PR:						es_PR.ISO8859-1
+es_PR.iso88591:					es_PR.ISO8859-1
+es_PR.utf8:					es_PR.UTF-8
 es_PY:						es_PY.ISO8859-1
+es_PY.iso88591:					es_PY.ISO8859-1
+es_PY.iso885915:				es_PY.ISO8859-15
+es_PY.utf8:					es_PY.UTF-8
 es_SV:						es_SV.ISO8859-1
+es_SV.iso88591:					es_SV.ISO8859-1
+es_SV.iso885915:				es_SV.ISO8859-15
+es_SV.utf8:					es_SV.UTF-8
+es_US:						es_US.ISO8859-1
 es_UY:						es_UY.ISO8859-1
+es_UY.iso88591:					es_UY.ISO8859-1
+es_UY.iso885915:				es_UY.ISO8859-15
+es_UY.utf8:					es_UY.UTF-8
 es_VE:						es_VE.ISO8859-1
+es_VE.iso88591:					es_VE.ISO8859-1
+es_VE.iso885915:				es_VE.ISO8859-15
+es_VE.utf8:					es_VE.UTF-8
 #if defined(SVR4) && defined(sun)
 XCOMM Sun Solaris 2.6 has erroneously specified Estonian as a Latin-1
 XCOMM language; however this is clearly incorrect according to ISO8859.
 #endif
-et:						et_EE.ISO8859-4
-et_EE:						et_EE.ISO8859-4
-fi:						fi_FI.ISO8859-1
-fi_FI:						fi_FI.ISO8859-1
+XCOMM According to Estonian local standards, ISO8859-4 is not recommended
+XCOMM charset. EVS8:2000 specifies ISO8859-15 as base charset.
+et:						et_EE.ISO8859-15
+et_EE:						et_EE.ISO8859-15
+et_EE.iso88591:					et_EE.ISO8859-1
+et_EE.ISO-8859-1:				et_EE.ISO8859-1
+et_EE.iso88594:					et_EE.ISO8859-4
+et_EE.iso885913:				et_EE.ISO8859-13
+et_EE.iso885915:				et_EE.ISO8859-15
+et_EE.utf8:					et_EE.UTF-8
+eu:						eu_ES.ISO8859-1
+eu_ES:						eu_ES.ISO8859-1
+eu_ES.iso88591:					eu_ES.ISO8859-1
+eu_ES.iso885915:				eu_ES.ISO8859-15
+eu_ES@euro:					eu_ES.ISO8859-15
+fa:						fa_IR.UTF-8
+fa_IR:						fa_IR.UTF-8
+fa_IR.isiri3342:				fa_IR.ISIRI-3342
+fa_IR.utf8:					fa_IR.UTF-8
+fi:						fi_FI.ISO8859-15
+fi_FI:						fi_FI.ISO8859-15
 fi_FI.88591:					fi_FI.ISO8859-1
 fi_FI.88591.en:					fi_FI.ISO8859-1
 fi_FI.iso88591:					fi_FI.ISO8859-1
+fi_FI.ISO-8859-1:				fi_FI.ISO8859-1
 fi_FI.ISO_8859-1:				fi_FI.ISO8859-1
+fi_FI.iso885915:				fi_FI.ISO8859-15
+fi_FI@euro:					fi_FI.ISO8859-15
+fi_FI.utf8:					fi_FI.UTF-8
+fi_FI.UTF-8@euro:				fi_FI.UTF-8
+fo:						fo_FO.ISO8859-1
+fo_FO:						fo_FO.ISO8859-1
+fo_FO.iso88591:					fo_FO.ISO8859-1
+fo_FO.iso885915:				fo_FO.ISO8859-15
+fo_FO.utf8:					fo_FO.UTF-8
 fr:						fr_FR.ISO8859-1
 fr_BE:						fr_BE.ISO8859-1
 fr_BE.88591:					fr_BE.ISO8859-1
 fr_BE.88591.en:					fr_BE.ISO8859-1
 fr_BE.ISO_8859-1:				fr_BE.ISO8859-1
+fr_BE.iso885915:				fr_BE.ISO8859-15
+fr_BE@euro:					fr_BE.ISO8859-15
+fr_BE.utf8:					fr_BE.UTF-8
 fr_CA:						fr_CA.ISO8859-1
 fr_CA.88591:					fr_CA.ISO8859-1
 fr_CA.88591.en:					fr_CA.ISO8859-1
 fr_CA.iso88591:					fr_CA.ISO8859-1
 fr_CA.ISO_8859-1:				fr_CA.ISO8859-1
+fr_CA.iso885915:				fr_CA.ISO8859-15
+fr_CA.utf8:					fr_CA.UTF-8
 fr_CH:						fr_CH.ISO8859-1
 fr_CH.88591:					fr_CH.ISO8859-1
 fr_CH.88591.en:					fr_CH.ISO8859-1
 fr_CH.ISO_8859-1:				fr_CH.ISO8859-1
+fr_CH.iso885915:				fr_CH.ISO8859-15
+fr_CH.utf8:					fr_CH.UTF-8
 fr_FR:						fr_FR.ISO8859-1
 fr_FR.88591:					fr_FR.ISO8859-1
 fr_FR.88591.en:					fr_FR.ISO8859-1
 fr_FR.iso88591:					fr_FR.ISO8859-1
+fr_FR.ISO-8859-1:				fr_FR.ISO8859-1
 fr_FR.ISO_8859-1:				fr_FR.ISO8859-1
+fr_FR.iso885915:				fr_FR.ISO8859-15
+fr_FR@euro:					fr_FR.ISO8859-15
+fr_FR.utf8:					fr_FR.UTF-8
+fr_LU:						fr_LU.ISO8859-1
+fr_LU.88591:					fr_LU.ISO8859-1
+fr_LU.88591.en:					fr_LU.ISO8859-1
+fr_LU.iso88591:					fr_LU.ISO8859-1
+fr_LU.ISO-8859-1:				fr_LU.ISO8859-1
+fr_LU.ISO_8859-1:				fr_LU.ISO8859-1
+fr_LU.iso885915:				fr_LU.ISO8859-15
+fr_LU@euro:					fr_LU.ISO8859-15
+fr_LU.utf8:					fr_LU.UTF-8
 FRE_FR.8859:					fr_FR.ISO8859-1
 FRE_FR.8859.in:					fr_FR.ISO8859-1
+ga:						ga_IE.ISO8859-1
+ga_IE:						ga_IE.ISO8859-1
+ga_IE.iso88591:					ga_IE.ISO8859-1
+ga_IE.iso885914:				ga_IE.ISO8859-14
+ga_IE.iso885915:				ga_IE.ISO8859-15
+ga_IE@euro:					ga_IE.ISO8859-15
+ga_IE.utf8:					ga_IE.UTF-8
+gd:						gd_GB.ISO8859-1
+gd_GB:						gd_GB.ISO8859-1
+gd_GB.iso88591:					gd_GB.ISO8859-1
+gd_GB.iso885914:				gd_GB.ISO8859-14
+gd_GB.iso885915:				gd_GB.ISO8859-15
+gl:						gl_ES.ISO8859-1
+gl_ES:						gl_ES.ISO8859-1
+gl_ES.iso88591:					gl_ES.ISO8859-1
+gl_ES.ISO-8859-1:				gl_ES.ISO8859-1
+gl_ES.iso885915:				gl_ES.ISO8859-15
+gl_ES@euro:					gl_ES.ISO8859-15
+gl_ES.utf8:					gl_ES.UTF-8
+gv:						gv_GB.ISO8859-1
+gv_GB:						gv_GB.ISO8859-1
+gv_GB.iso88591:					gv_GB.ISO8859-1
+gv_GB.iso885914:				gv_GB.ISO8859-14
+gv_GB.iso885915:				gv_GB.ISO8859-15
+he:						he_IL.ISO8859-8
+he_IL:						he_IL.ISO8859-8
+HE_IL:						he_IL.ISO8859-8
+he_IL.iso88598:					he_IL.ISO8859-8
+he_IL.cp1255:					he_IL.CP1255
+he_IL.microsoftcp1255:				he_IL.CP1255
+he_IL.microsoft-cp1255:				he_IL.CP1255
+he_IL.MICROSOFT-CP1255:				he_IL.CP1255
+he_IL.utf8:					he_IL.UTF-8
+HE_IL.UTF-8:					he_IL.UTF-8
+hi:						hi_IN.ISCII-DEV
+hi_IN:						hi_IN.ISCII-DEV
+HI_IN:						hi_IN.ISCII-DEV
+hi_IN.isciidev:					hi_IN.ISCII-DEV
+hi_IN.utf8:					hi_IN.UTF-8
+HI_IN.UTF-8:					hi_IN.UTF-8
 hr:						hr_HR.ISO8859-2
 hr_HR:						hr_HR.ISO8859-2
 hr_HR.iso88592:					hr_HR.ISO8859-2
+hr_HR.ISO-8859-2:				hr_HR.ISO8859-2
 hr_HR.ISO_8859-2:				hr_HR.ISO8859-2
+hr_HR.utf8:					hr_HR.UTF-8
 hu:						hu_HU.ISO8859-2
 hu_HU:						hu_HU.ISO8859-2
 hu_HU.iso88592:					hu_HU.ISO8859-2
+hu_HU.ISO-8859-2:				hu_HU.ISO8859-2
+XCOMM those lines should be deleted in a near future:
+in:						id_ID.ISO8859-1
+in_ID:						id_ID.ISO8859-1
 is:						is_IS.ISO8859-1
 is_IS:						is_IS.ISO8859-1
 is_IS.iso88591:					is_IS.ISO8859-1
+is_IS.ISO-8859-1:				is_IS.ISO8859-1
 is_IS.ISO_8859-1:				is_IS.ISO8859-1
+is_IS.iso885915:				is_IS.ISO8859-15
+is_IS.utf8:					is_IS.UTF-8
 it:						it_IT.ISO8859-1
 it_CH:						it_CH.ISO8859-1
+it_CH.iso88591:					it_CH.ISO8859-1
 it_CH.ISO_8859-1:				it_CH.ISO8859-1
+it_CH.iso885915:				it_CH.ISO8859-15
+it_CH.utf8:					it_CH.UTF-8
 it_IT:						it_IT.ISO8859-1
 it_IT.88591:					it_IT.ISO8859-1
 it_IT.88591.en:					it_IT.ISO8859-1
 it_IT.iso88591:					it_IT.ISO8859-1
+it_IT.ISO-8859-1:				it_IT.ISO8859-1
 it_IT.ISO_8859-1:				it_IT.ISO8859-1
-iw:						iw_IL.ISO8859-8
-iw_IL:						iw_IL.ISO8859-8
-iw_IL.iso88598:					iw_IL.ISO8859-8
-ja:						ja_JP.eucJP
-ja.JIS:						ja_JP.JIS7
-ja.SJIS:					ja_JP.SJIS
+it_IT.iso885915:				it_IT.ISO8859-15
+it_IT@euro:					it_IT.ISO8859-15
+it_IT.utf8:					it_IT.UTF-8
+iu:						iu_CA.NUNACOM-8
+iu_CA:						iu_CA.NUNACOM-8
+iu_CA.nunacom8:					iu_CA.NUNACOM-8
+XCOMM iw was the old iso code for hebrew (now he)
+XCOMM those lines should be deleted in a near future
+iw:						he_IL.ISO8859-8
+iw_IL:						he_IL.ISO8859-8
+Iw_IL:						he_IL.ISO8859-8
+iw_IL.iso88598:					he_IL.ISO8859-8
+iw_IL.ISO-8859-8:				he_IL.ISO8859-8
 #ifndef __uxp__
 ja_JP:						ja_JP.eucJP
 #else /* __uxp__ */
@@ -156,97 +501,353 @@ ja_JP:						ja_JP.U90
 ja_JP.U90:					ja_JP.U90
 ja_JP.S90:					ja_JP.S90
 #endif /* __uxp__ */
+ja:						ja_JP.eucJP
+ja.JIS:						ja_JP.JIS7
+ja.SJIS:					ja_JP.SJIS
+ja_JP:						ja_JP.eucJP
 ja_JP.ujis:					ja_JP.eucJP
-ja_JP.eucJP:					ja_JP.eucJP
+ja_JP.eucjp:					ja_JP.eucJP
 Jp_JP:						ja_JP.eucJP
 ja_JP.AJEC:					ja_JP.eucJP
 ja_JP.EUC:					ja_JP.eucJP
+ja_JP.EUC-JP:					ja_JP.eucJP
+ja_JP.EUC_JP:					ja_JP.eucJP
+ja_JP.eucjp:					ja_JP.eucJP
 ja_JP.ISO-2022-JP:				ja_JP.JIS7
 ja_JP.JIS:					ja_JP.JIS7
 ja_JP.jis7:					ja_JP.JIS7
 ja_JP.mscode:					ja_JP.SJIS
 ja_JP.SJIS:					ja_JP.SJIS
+ja_JP.sjis:					ja_JP.SJIS
+ja_JP.utf8:					ja_JP.UTF-8
+JA_JP.utf8:					ja_JP.UTF-8
+ka:						ka_GE.GEORGIAN-ACADEMY
+ka_GE:						ka_GE.GEORGIAN-ACADEMY
+ka_GE.georgianacademy:				ka_GE.GEORGIAN-ACADEMY
+ka_GE.georgianrs:				ka_GE.GEORGIAN-ACADEMY
+ka_GE.georgianps:				ka_GE.GEORGIAN-PS
+kl:						kl_GL.ISO8859-1
+kl_GL:						kl_GL.ISO8859-1
+kl_GL.iso88591:					kl_GL.ISO8859-1
+kl_GL.iso885915:				kl_GL.ISO8859-15
+kl_GL.utf8:					kl_GL.UTF-8
 ko:						ko_KR.eucKR
 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
-#if defined(__FreeBSD__)
+ko_KR.euckr:					ko_KR.eucKR
+ko_KR.utf8:					ko_KR.UTF-8
+KO_KR.UTF-8:					ko_KR.UTF-8
+kw:						kw_GB.ISO8859-1
+kw_GB:						kw_GB.ISO8859-1
+kw_GB.iso88591:					kw_GB.ISO8859-1
+kw_GB.iso885914:				kw_GB.ISO8859-14
+kw_GB.iso885915:				kw_GB.ISO8859-15
+lo:						lo_LA.MULELAO-1
+lo_LA:						lo_LA.MULELAO-1
+lo_LA.cp1133:					lo_LA.IBM-CP1133
+lo_LA.ibmcp1133:				lo_LA.IBM-CP1133
+lo_LA.mulelao1:					lo_LA.MULELAO-1
+#if defined(VeryOldFreeBSD)
 XCOMM most locales in FreeBSD 2.1.[56] do not work, allow use of FreeBSD's
-XCOMM generic latin-1 locale name. N.B. "lt" is a bad code to use for a 
-XCOMM generic Latin-1 locale anyway because it is the country code for 
-XCOMM Lithuania, which by default uses Latin-4.
+XCOMM generic latin-1 locale name. N.B. "lt" is a bad code to use for a
+XCOMM generic Latin-1 locale anyway because it is the country code for
+XCOMM Lithuania, which by default uses Latin-7 (ISO-8859-13).
 lt_LN.ISO_8859-1:				lt_LN.ISO8859-1
 #endif
-lt:						lt_LT.ISO8859-4
-lv:						lv_LV.ISO8859-4
+lt:						lt_LT.ISO8859-13
+lt_LT:						lt_LT.ISO8859-13
+lt_LT.iso88594:					lt_LT.ISO8859-4
+lt_LT.ISO_8859-4:				lt_LT.ISO8859-4
+lt_LT.iso885913:				lt_LT.ISO8859-13
+lt_LT.ISO-8859-13:				lt_LT.ISO8859-13
+lt_LT.ISO_8859-13:				lt_LT.ISO8859-13
+lt_LT.utf8:					lt_LT.UTF-8
+lv:						lv_LV.ISO8859-13
+lv_LV:						lv_LV.ISO8859-13
+lv_LV.iso88594:					lv_LV.ISO8859-4
+lv_LV.iso885913:				lv_LV.ISO8859-13
+lv_LV.ISO-8859-13:				lv_LV.ISO8859-13
+lv_LV.ISO_8859-13:				lv_LV.ISO8859-13
+lv_LV.utf8:					lv_LV.UTF-8
+mi:						mi_NZ.ISO8859-1
+mi_NZ:						mi_NZ.ISO8859-1
+mi_NZ.iso88591:					mi_NZ.ISO8859-1
 mk:						mk_MK.ISO8859-5
 mk_MK:						mk_MK.ISO8859-5
+mk_MK.iso88595:					mk_MK.ISO8859-5
+mk_MK.cp1251:					mk_MK.CP1251
+mk_MK.microsoftcp1251:				mk_MK.CP1251
+mk_MK.microsoft-cp1251:				mk_MK.CP1251
+mk_MK.MICROSOFT-CP1251:				mk_MK.CP1251
+mk_MK.utf8:					mk_MK.UTF-8
+mr_IN.utf8:					mr_IN.UTF-8
+ms:						ms_MY.ISO8859-1
+ms_MY:						ms_MY.ISO8859-1
+ms_MY.iso88591:					ms_MY.ISO8859-1
+mt:						mt_MT.ISO8859-3
+mt_MT:						mt_MT.ISO8859-3
+mt_MT.ISO8859-3:				mt_MT.ISO8859-3
+nb:						nb_NO.ISO8859-1
+nb_NO:						nb_NO.ISO8859-1
+nb_NO.88591:					nb_NO.ISO8859-1
+nb_NO.ISO-8859-1:				nb_NO.ISO8859-1
+nb_NO.iso885915:				nb_NO.ISO8859-15
 nl:						nl_NL.ISO8859-1
 nl_BE:						nl_BE.ISO8859-1
 nl_BE.88591:					nl_BE.ISO8859-1
 nl_BE.88591.en:					nl_BE.ISO8859-1
+nl_BE.iso88591:					nl_BE.ISO8859-1
 nl_BE.ISO_8859-1:				nl_BE.ISO8859-1
+nl_BE.iso885915:				nl_BE.ISO8859-15
+nl_BE@euro:					nl_BE.ISO8859-15
+nl_BE.utf8:					nl_BE.UTF-8
 nl_NL:						nl_NL.ISO8859-1
 nl_NL.88591:					nl_NL.ISO8859-1
 nl_NL.88591.en:					nl_NL.ISO8859-1
 nl_NL.iso88591:					nl_NL.ISO8859-1
+nl_NL.ISO-8859-1:				nl_NL.ISO8859-1
 nl_NL.ISO_8859-1:				nl_NL.ISO8859-1
+nl_NL.iso885915:				nl_NL.ISO8859-15
+nl_NL@euro:					nl_NL.ISO8859-15
+nl_NL.utf8:					nl_NL.UTF-8
+nn:						nn_NO.ISO8859-1
+nn_NO:						nn_NO.ISO8859-1
+nn_NO.88591:					nn_NO.ISO8859-1
+nn_NO.ISO_8859-1:				nn_NO.ISO8859-1
+nn_NO.iso885915:				nn_NO.ISO8859-15
 no:						no_NO.ISO8859-1
 no_NO:						no_NO.ISO8859-1
 no_NO.88591:					no_NO.ISO8859-1
 no_NO.88591.en:					no_NO.ISO8859-1
 no_NO.iso88591:					no_NO.ISO8859-1
-no_NO.ISO_8859-1:				no_NO.ISO8859-1
+no_NO.ISO-8859-1:				no_NO.ISO8859-1
+no_NO.iso885915:				no_NO.ISO8859-15
+no_NO.utf8:					no_NO.UTF-8
+ny:						ny_NO.ISO8859-1
+ny_NO:						ny_NO.ISO8859-1
+ny_NO.88591:					ny_NO.ISO8859-1
+ny_NO.ISO_8859-1:				ny_NO.ISO8859-1
+ny_NO.iso885915:				ny_NO.ISO8859-15
+no@nynorsk:					ny_NO.ISO8859-1
+nynorsk:					nn_NO.ISO8859-1
+oc:						oc_FR.ISO8859-1
+oc_FR:						oc_FR.ISO8859-1
+oc_FR.iso88591:					oc_FR.ISO8859-1
+oc_FR.iso885915:				oc_FR.ISO8859-15
+oc_FR@euro:					oc_FR.ISO8859-15
+pd:						pd_US.ISO8859-1
+pd_DE:						pd_DE.ISO8859-1
+pd_US:						pd_US.ISO8859-1
+pd_DE.iso88591:					pd_DE.ISO8859-1
+pd_US.iso88591:					pd_US.ISO8859-1
+pd_DE.iso885915:				pd_DE.ISO8859-15
+pd_US.iso885915:				pd_US.ISO8859-15
+ph:						ph_PH.ISO8859-1
+ph_PH:						ph_PH.ISO8859-1
+ph_PH.iso88591:					ph_PH.ISO8859-1
 pl:						pl_PL.ISO8859-2
 pl_PL:						pl_PL.ISO8859-2
 pl_PL.iso88592:					pl_PL.ISO8859-2
+pl_PL.ISO-8859-2:				pl_PL.ISO8859-2
+pl_PL.utf8:					pl_PL.UTF-8
+pp:						pp_AN.ISO8859-1
+pp_AN:						pp_AN.ISO8859-1
+pp_AN.iso88591:					pp_AN.ISO8859-1
 pt:						pt_PT.ISO8859-1
 pt_BR:						pt_BR.ISO8859-1
+pt_BR.88591:					pt_BR.ISO8859-1
+pt_BR.88591.en:					pt_BR.ISO8859-1
+pt_BR.iso88591:					pt_BR.ISO8859-1
+pt_BR.ISO-8859-1:				pt_BR.ISO8859-1
+pt_BR.ISO_8859-1:				pt_BR.ISO8859-1
+pt_BR.iso885915:				pt_BR.ISO8859-15
+pt_BR.utf8:					pt_BR.UTF-8
 pt_PT:						pt_PT.ISO8859-1
 pt_PT.88591:					pt_PT.ISO8859-1
 pt_PT.88591.en:					pt_PT.ISO8859-1
 pt_PT.iso88591:					pt_PT.ISO8859-1
+pt_PT.ISO-8859-1:				pt_PT.ISO8859-1
 pt_PT.ISO_8859-1:				pt_PT.ISO8859-1
+pt_PT.iso885915:				pt_PT.ISO8859-15
+pt_PT@euro:					pt_PT.ISO8859-15
+pt_PT.utf8:					pt_PT.UTF-8
+pt_PT.UTF-8@euro:				pt_PT.UTF-8
 ro:						ro_RO.ISO8859-2
 ro_RO:						ro_RO.ISO8859-2
 ro_RO.iso88592:					ro_RO.ISO8859-2
-ru:						ru_RU.ISO8859-5
-ru_RU:						ru_RU.ISO8859-5
+ro_RO.ISO-8859-2:				ro_RO.ISO8859-2
+ro_RO.utf8:					ro_RO.UTF-8
+ru:						ru_RU.KOI8-R
+ru_RU:						ru_RU.KOI8-R
 ru_RU.iso88595:					ru_RU.ISO8859-5
-ru_SU:						ru_RU.ISO8859-5
+ru_RU.ISO-8859-5:				ru_RU.ISO8859-5
+ru_RU.koi8r:					ru_RU.KOI8-R
+ru_RU.cp1251:					ru_RU.CP1251
+ru_RU.microsoftcp1251:				ru_RU.CP1251
+ru_RU.microsoft-cp1251:				ru_RU.CP1251
+ru_RU.MICROSOFT-CP1251:				ru_RU.CP1251
+#if defined(INCLUDE_ru_SU)
+XCOMM ru_SU is redundant now
+ru_SU:						ru_RU.KOI8-R
 ru_SU.ISO8859-5:				ru_RU.ISO8859-5
 ru_SU.KOI8-R:					ru_RU.KOI8-R
+#endif
+ru_UA:						ru_UA.KOI8-U
+ru_UA.koi8u:					ru_UA.KOI8-U
+ru_UA.cp1251:					ru_UA.CP1251
+ru_UA.microsoftcp1251:				ru_UA.CP1251
+ru_UA.microsoft-cp1251:				ru_UA.CP1251
+ru_UA.MICROSOFT-CP1251:				ru_UA.CP1251
+se_NO:						se_NO.UTF-8
+se_NO.utf8:					se_NO.UTF-8
 sh:						sh_YU.ISO8859-2
 sh_HR.iso88592:					sh_HR.ISO8859-2
-sh_YU:						sh_YU.ISO8859-2
 sh_SP:						sh_YU.ISO8859-2
+sh_YU:						sh_YU.ISO8859-2
+sh_YU.utf8:					sh_YU.UTF-8
 sk:						sk_SK.ISO8859-2
 sk_SK:						sk_SK.ISO8859-2
-sk_sK.iso88592:					sk_SK.ISO8859-2
-sl:						sl_CS.ISO8859-2
-sl_CS:						sl_CS.ISO8859-2
+sk_SK.iso88592:					sk_SK.ISO8859-2
+sk_SK.ISO-8859-2:				sk_SK.ISO8859-2
+sk_SK.utf8:					sk_SK.UTF-8
+sl:						sl_SI.ISO8859-2
 sl_SI:						sl_SI.ISO8859-2
 sl_SI.iso88592:					sl_SI.ISO8859-2
+sl_SI.ISO-8859-2:				sl_SI.ISO8859-2
+sl_SI.utf8:					sl_SI.UTF-8
 sp:						sp_YU.ISO8859-5
 sp_YU:						sp_YU.ISO8859-5
+sq:						sq_AL.ISO8859-2
+sq_AL:						sq_AL.ISO8859-2
+sq_AL.iso88592:					sq_AL.ISO8859-2
+sq_AL.utf8:					sq_AL.UTF-8
 sr_SP:						sr_SP.ISO8859-2
+sr:						sr_YU.ISO8859-5
+sr_YU:						sr_YU.ISO8859-5
+sr_YU.iso88592:					sr_YU.ISO8859-2
+sr_YU.iso88595:					sr_YU.ISO8859-5
+sr@cyrillic:					sr_YU.ISO8859-5
+sr_YU@cyrillic:					sr_YU.ISO8859-5
+sr_YU.iso88595@cyrillic:			sr_YU.ISO8859-5
+sr_YU.ISO8859-5@cyrillic:			sr_YU.ISO8859-5
+sr_YU.cp1251@cyrillic:				sr_YU.CP1251
+sr_YU.CP1251@cyrillic:				sr_YU.CP1251
+sr_YU.microsoftcp1251@cyrillic:			sr_YU.CP1251
+sr_YU.microsoft-cp1251@cyrillic:		sr_YU.CP1251
+sr_YU.MICROSOFT-CP1251@cyrillic:		sr_YU.CP1251
+sr_YU.utf8:					sr_YU.UTF-8
+sr_YU.UTF-8@cyrillic:				sr_YU.UTF-8
 sv:						sv_SE.ISO8859-1
+sv_FI:						sv_FI.ISO8859-1
+sv_FI.iso88591:					sv_FI.ISO8859-1
+sv_FI.iso885915:				sv_FI.ISO8859-15
+sv_FI@euro:					sv_FI.ISO8859-15
+sv_FI.utf8:					sv_FI.UTF-8
 sv_SE:						sv_SE.ISO8859-1
 sv_SE.88591:					sv_SE.ISO8859-1
 sv_SE.88591.en:					sv_SE.ISO8859-1
 sv_SE.iso88591:					sv_SE.ISO8859-1
+sv_SE.ISO-8859-1:				sv_SE.ISO8859-1
 sv_SE.ISO_8859-1:				sv_SE.ISO8859-1
-th_TH:						th_TH.TACTIS
-th_TH.tis620:					th_TH.TACTIS
+sv_SE.iso885915:				sv_SE.ISO8859-15
+sv_SE@euro:					sv_SE.ISO8859-15
+sv_SE.utf8:					sv_SE.UTF-8
+ta:						ta_IN.TSCII-0
+ta_IN:						ta_IN.TSCII-0
+ta_IN.tscii:					ta_IN.TSCII-0
+ta_IN.tscii0:					ta_IN.TSCII-0
+tg:						tg_TJ.KOI8-C
+tg_TJ:						tg_TJ.KOI8-C
+tg_TJ.koi8c:					tg_TJ.KOI8-C
+th:						th_TH.ISO8859-11
+th_TH:						th_TH.ISO8859-11
+th_TH.ISO-8859-11:				th_TH.ISO8859-11
+th_TH.tis620:					th_TH.TIS620
+th_TH.TIS-620:					th_TH.TIS620
+th_TH.TACTIS:					th_TH.TIS620
+th_TH.utf8:					th_TH.UTF-8
+tl:						tl_PH.ISO8859-1
+tl_PH:						tl_PH.ISO8859-1
+tl_PH.iso88591:					tl_PH.ISO8859-1
 tr:						tr_TR.ISO8859-9
 tr_TR:						tr_TR.ISO8859-9
+TR_TR:						tr_TR.ISO8859-9
 tr_TR.iso88599:					tr_TR.ISO8859-9
-zh:						zh_CN.eucCN
-zh_CN:						zh_CN.eucCN
+tr_TR.ISO-8859-9:				tr_TR.ISO8859-9
+tr_TR.utf8:					tr_TR.UTF-8
+TR_TR.utf8:					tr_TR.UTF-8
+tt:						tt_RU.TATAR-CYR
+tt_RU:						tt_RU.TATAR-CYR
+tt_RU.tatarcyr:					tt_RU.TATAR-CYR
+tt_RU.koi8c:					tt_RU.KOI8-C
+uk:						uk_UA.KOI8-U
+uk_UA:						uk_UA.KOI8-U
+uk_UA.iso88595:					uk_UA.ISO8859-5
+uk_UA.koi8u:					uk_UA.KOI8-U
+uk_UA.cp1251:					uk_UA.CP1251
+uk_UA.microsoftcp1251:				uk_UA.CP1251
+uk_UA.microsoft-cp1251:				uk_UA.CP1251
+uk_UA.MICROSOFT-CP1251:				uk_UA.CP1251
+uk_UA.utf8:					uk_UA.UTF-8
+ur:						ur_PK.CP1256
+ur_PK:						ur_PK.CP1256
+ur_PK.cp1256:					ur_PK.CP1256
+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
+VI_VN:						vi_VN.TCVN
+vi_VN.tcvn:					vi_VN.TCVN
+vi_VN.tcvn5712:					vi_VN.TCVN
+vi_VN.viscii:					vi_VN.VISCII
+vi_VN.viscii111:				vi_VN.VISCII
+vi_VN.utf8:					vi_VN.UTF-8
+VI_VN.UTF-8:					vi_VN.UTF-8
+wa:						wa_BE.ISO8859-1
+wa_BE:						wa_BE.ISO8859-1
+wa_BE.iso88591:					wa_BE.ISO8859-1
+wa_BE.iso885915:				wa_BE.ISO8859-15
+wa_BE@euro:					wa_BE.ISO8859-15
+yi:						yi_US.CP1255
+yi_US:						yi_US.CP1255
+yi_US.cp1255:					yi_US.CP1255
+yi_US.microsoftcp1255:				yi_US.CP1255
+yi_US.microsoft-cp1255:				yi_US.CP1255
+yi_US.MICROSOFT-CP1255:				yi_US.CP1255
+zh_CN:						zh_CN.gb2312
+zh_CN.Big5:					zh_TW.big5
 zh_CN.EUC:					zh_CN.eucCN
-zh_TW:						zh_TW.eucTW
+zh_CN.GB2312:					zh_CN.gb2312
+zh_CN.GBK:					zh_CN.gbk
+zh_CN.big5:					zh_TW.big5
+zh_CN.euc:					zh_CN.eucCN
+zh_CN.utf8:					zh_CN.UTF-8
+ZH_CN.UTF-8:					zh_CN.UTF-8
+zh_HK:						zh_HK.big5hkscs
+zh_HK.Big5hkscs:				zh_HK.big5hkscs
+zh_HK.Big5-hkscs:				zh_HK.big5hkscs
+zh_HK.Big5_hkscs:				zh_HK.big5hkscs
+zh_HK.Big5HKSCS:				zh_HK.big5hkscs
+zh_HK.BIG5-HKSCS:				zh_HK.big5hkscs
+zh_HK.BIG5_HKSCS:				zh_HK.big5hkscs
+zh_HK.Big5:					zh_HK.big5
+zh_HK.utf8:					zh_HK.UTF-8
+ZH_HK.UTF-8:					zh_CN.UTF-8
+ZH_SG.UTF-8:					zh_SG.UTF-8
+zh_TW:						zh_TW.big5
+zh_TW.Big5:					zh_TW.big5
+Zh_TW.big5:					zh_TW.big5
 zh_TW.EUC:					zh_TW.eucTW
-zh_CN.big5:					zh_TW.eucTW
+zh_TW.utf8:					zh_TW.UTF-8
+ZH_TW.UTF-8:					zh_TW.UTF-8
+
 XCOMM The following locale names are used in SCO 3.0
 english_uk.8859:				en_GB.ISO8859-1
 english_us.8859:				en_US.ISO8859-1
@@ -258,47 +859,75 @@ spanish_spain.8859:				es_ES.ISO8859-1
 XCOMM The following locale names are used in HPUX 9.x
 american.iso88591:				en_US.ISO8859-1
 arabic.iso88596:				ar_AA.ISO8859-6
-bulgarian:					bg_BG.ISO8859-5
+bokmal:						nb_NO.ISO8859-1
+bokmċl:						nb_NO.ISO8859-1
+bulgarian:					bg_BG.CP1251
 c-french.iso88591:				fr_CA.ISO8859-1
+catalan:					ca_ES.ISO8859-1
 chinese-s:					zh_CN.eucCN
 chinese-t:					zh_TW.eucTW
 croatian:					hr_HR.ISO8859-2
-czech:						cs_CS.ISO8859-2
+czech:						cs_CZ.ISO8859-2
+danish:						da_DK.ISO8859-1
+dansk:						da_DK.ISO8859-1
 danish.iso88591:				da_DK.ISO8859-1
+deutsch:					de_DE.ISO8859-1
+dutch:						nl_NL.ISO8859-1
 dutch.iso88591:					nl_BE.ISO8859-1
+eesti:						et_EE.ISO8859-1
 english.iso88591:				en_EN.ISO8859-1
+estonian:					et_EE.ISO8859-1
+finnish:					fi_FI.ISO8859-1
 finnish.iso88591:				fi_FI.ISO8859-1
+français:					fr_FR.ISO8859-1
+french:						fr_FR.ISO8859-1
 french.iso88591:				fr_CH.ISO8859-1
+galego:						gl_ES.ISO8859-1
+galician:					gl_ES.ISO8859-1
+german:						de_DE.ISO8859-1
 german.iso88591:				de_CH.ISO8859-1
+greek:						el_GR.ISO8859-7
 greek.iso88597:					el_GR.ISO8859-7
+hebrew:						iw_IL.ISO8859-8
 hebrew.iso88598:				iw_IL.ISO8859-8
+hrvatski:					hr_HR.ISO8859-2
 hungarian:					hu_HU.ISO8859-2
 icelandic.iso88591:				is_IS.ISO8859-1
+icelandic:					is_IS.ISO8859-1
+italian:					it_IT.ISO8859-1
 italian.iso88591:				it_IT.ISO8859-1
-#if ! (defined(SVR4) && defined(sun))
-japanese:					ja_JP.SJIS
-#else
 japanese:					ja_JP.eucJP
-#endif
 japanese.euc:					ja_JP.eucJP
+japanese.sjis:					ja_JP.SJIS
 korean:						ko_KR.eucKR
+korean.euc:					ko_KR.eucKR
+lithuanian:					lt_LT.ISO8859-13
+norwegian:					no_NO.ISO8859-1
 norwegian.iso88591:				no_NO.ISO8859-1
 polish:						pl_PL.ISO8859-2
+portuguese:					pt_PT.ISO8859-1
 portuguese.iso88591:				pt_PT.ISO8859-1
+romanian:					ro_RO.ISO8859-2
 rumanian:					ro_RO.ISO8859-2
-russian:					ru_SU.ISO8859-5
+russian:					ru_RU.ISO8859-5
 serbocroatian:					sh_YU.ISO8859-2
 slovak:						sk_SK.ISO8859-2
-slovene:					sl_CS.ISO8859-2
+slovene:					sl_SI.ISO8859-2
+slovenian:					sl_SI.ISO8859-2
+spanish:					es_ES.ISO8859-1
 spanish.iso88591:				es_ES.ISO8859-1
+swedish:					sv_SE.ISO8859-1
 swedish.iso88591:				sv_SE.ISO8859-1
+turkish:					tr_TR.ISO8859-9
 turkish.iso88599:				tr_TR.ISO8859-9
-univ.utf8:					en_US.utf
+thai:						th_TH.ISO8859-11
+univ.utf8:					en_US.UTF-8
 XCOMM Digital Unix utf
-universal.utf8@ucs4:				en_US.utf
-XCOMM Solaris 2.6
-XCOMM Solaris and SunOS have iso_8859_1 LC_CTYPES to augment LANG=C
+universal.utf8@ucs4:				en_US.UTF-8
+XCOMM Solaris and SunOS have iso_8859_1 and iso_8859_15 LC_CTYPES 
+XCOMM to augment LANG=C
 iso_8859_1:					en_US.ISO8859-1
+iso_8859_15:					en_US.ISO8859-15
 #ifdef WIN32
 XCOMM Microsoft Windows/NT 4.0 SP3
 XCOMM parser doesn't grok embedded spaces in locale name
@@ -358,7 +987,7 @@ Spanish_Puerto Rico.1252:			es_PR.iso8859-1
 Spanish_El Salvador.1252:			es_SV.iso8859-1
 Spanish_Uruguay.1252:				es_UY.iso8859-1
 Spanish_Venezuela.1252:				es_VE.iso8859-1
-Estonian_Estonia.1257				et_EE.iso8859-4
+Estonian_Estonia.1257:				et_EE.iso8859-13
 Basque_Spain.1252:				eu_ES.iso8859-1
 Finnish_Finland.1252:				fi_FI.iso8859-1
 French_Belgium.1252:				fr_BE.iso8859-1
@@ -376,8 +1005,8 @@ Italian_Switzerland.1252:			it_CH.iso8859-1
 Italian_Italy.1252:				it_IT.iso8859-1
 Japanese_Japan.932:				ja_JP.SJIS
 Korean_Korea.949:				ko_KR.EUC
-Lithuanian_Lithuania.1257			lt_LT.iso8859-4
-Latvian_Latvia.1257:				lv_LV.iso8859-4
+Lithuanian_Lithuania.1257:			lt_LT.iso8859-13
+Latvian_Latvia.1257:				lv_LV.iso8859-13
 Dutch_Belgium.1252:				nl_BE.iso8859-1
 Dutch_Netherlands.1252:				nl_NL.iso8859-1
 Norwegian (Nynorsk)_Norway.1252:		no_NO.iso8859-1
@@ -409,9 +1038,3 @@ japan:						ja_JP.eucJP
 japan:						ja_JP.U90
 #endif
 Japanese-EUC:					ja_JP.eucJP
-
-XCOMM Added by Sun
-ja_JP.PCK:					ja_JP.SJIS
-zh_CN.GBK:					zh.GBK
-zh.GBK:						zh.GBK
-zh_TW.BIG5:					zh_TW.BIG5