Update.

	* iconvdata/gconv-modules: Add some of the charset name aliases
	used in Internet standards.

1998-12-16  Ulrich Drepper  <drepper@cygnus.com>

4 files changed, 75 insertions, 228 deletions

diff --git a/ChangeLog b/ChangeLog
index 56e127deb6..69cabf6de9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 1998-12-16  Ulrich Drepper  <drepper@cygnus.com>
 
+	* iconvdata/gconv-modules: Add some of the charset name aliases
+	used in Internet standards.
+
+1998-12-16  Ulrich Drepper  <drepper@cygnus.com>
+
 	* version.h (VERSION): Bump to 2.0.107.
 
 	* sysdeps/i386/i486/bits/string.h: Pretty printing.
diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules
index f8f252d726..971c7d0960 100644
--- a/iconvdata/gconv-modules
+++ b/iconvdata/gconv-modules
@@ -44,6 +44,7 @@ alias	US-ASCII//		ANSI_X3.4-1968//
 alias	US//			ANSI_X3.4-1968//
 alias	IBM367//		ANSI_X3.4-1968//
 alias	CP367//			ANSI_X3.4-1968//
+alias	CSASCII//		ANSI_X3.4-1968//
 alias	OSF00010020//		ANSI_X3.4-1968//
 module	ANSI_X3.4-1968//	INTERNAL		ISO646		2
 module	INTERNAL		ANSI_X3.4-1968//	ISO646		2
@@ -52,6 +53,7 @@ alias	ISO-IR-4//		BS_4730//
 alias	ISO646-GB//		BS_4730//
 alias	GB//			BS_4730//
 alias	UK//			BS_4730//
+alias	CSISO4UNITEDKINGDOM//	BS_4730//
 module	BS_4730//		INTERNAL		ISO646		2
 module	INTERNAL		BS_4730//		ISO646		2
 
@@ -59,18 +61,21 @@ alias	ISO-IR-121//		CSA_Z243.4-1985-1//
 alias	ISO646-CA//		CSA_Z243.4-1985-1//
 alias	CSA7-1//		CSA_Z243.4-1985-1//
 alias	CA//			CSA_Z243.4-1985-1//
+alias	CSISO121CANADIAN1//	CSA_Z243.4-1985-1//
 module	CSA_Z243.4-1985-1//	INTERNAL		ISO646		2
 module	INTERNAL		CSA_Z243.4-1985-1//	ISO646		2
 
 alias	ISO-IR-122//		CSA_Z243.4-1985-2//
 alias	ISO646-CA2//		CSA_Z243.4-1985-2//
 alias	CSA7-2//		CSA_Z243.4-1985-2//
+alias	CSISO122CANADIAN2//	CSA_Z243.4-1985-2//
 module	CSA_Z243.4-1985-2//	INTERNAL		ISO646		2
 module	INTERNAL		CSA_Z243.4-1985-2//	ISO646		2
 
 alias	ISO-IR-21//		DIN_66003//
 alias	DE//			DIN_66003//
 alias	ISO646-DE//		DIN_66003//
+alias	CSISO21GERMAN//		DIN_66003//
 module	DIN_66003//		INTERNAL		ISO646		2
 module	INTERNAL		DIN_66003//		ISO646		2
 
@@ -82,34 +87,40 @@ module	INTERNAL		DS_2089//		ISO646		2
 
 alias	ISO-IR-17//		ES//
 alias	ISO646-ES//		ES//
+alias	CSISO17SPANISH//	ES//
 module	ES//			INTERNAL		ISO646		2
 module	INTERNAL		ES//			ISO646		2
 
 alias	ISO-IR-85//		ES2//
 alias	ISO646-ES2//		ES2//
+alias	CSISO85SPANISH2//	ES2//
 module	ES2//			INTERNAL		ISO646		2
 module	INTERNAL		ES2//			ISO646		2
 
 alias	ISO-IR-57//		GB_1988-80//
 alias	CN//			GB_1988-80//
 alias	ISO646-CN//		GB_1988-80//
+alias	CSISO58GB1988//		GB_1988-80//
 module	GB_1988-80//		INTERNAL		ISO646		2
 module	INTERNAL		GB_1988-80//		ISO646		2
 
 alias	ISO-IR-15//		IT//
 alias	ISO646-IT//		IT//
+alias	CSISO15ITALIAN//	IT//
 module	IT//			INTERNAL		ISO646		2
 module	INTERNAL		IT//			ISO646		2
 
 alias	ISO-IR-14//		JIS_C6220-1969-RO//
 alias	JP//			JIS_C6220-1969-RO//
 alias	ISO646-JP//		JIS_C6220-1969-RO//
+alias	CSISO14JISC6220RO//	JIS_C6220-1969-RO//
 module	JIS_C6220-1969-RO//	INTERNAL		ISO646		2
 module	INTERNAL		JIS_C6220-1969-RO//	ISO646		2
 
 alias	ISO-IR-92//		JIS_C6229-1984-B//
 alias	ISO646-JP-OCR-B//	JIS_C6229-1984-B//
 alias	JP-OCR-B//		JIS_C6229-1984-B//
+alias	CSISO92JISC62991984B//	JIS_C6229-1984-B//
 module	JIS_C6229-1984-B//	INTERNAL		ISO646		2
 module	INTERNAL		JIS_C6229-1984-B//	ISO646		2
 
@@ -117,6 +128,7 @@ alias	ISO-IR-141//		JUS_I.B1.002//
 alias	ISO646-YU//		JUS_I.B1.002//
 alias	JS//			JUS_I.B1.002//
 alias	YU//			JUS_I.B1.002//
+alias	CSISO141JUSIB1002//	JUS_I.B1.002//
 module	JUS_I.B1.002//		INTERNAL		ISO646		2
 module	INTERNAL		JUS_I.B1.002//		ISO646		2
 
@@ -127,6 +139,7 @@ module	INTERNAL		KSC5636//		ISO646		2
 alias	ISO-IR-86//		MSZ_7795.3//
 alias	ISO646-HU//		MSZ_7795.3//
 alias	HU//			MSZ_7795.3//
+alias	CSISO86HUNGARIAN//	MSZ_7795.3//
 module	MSZ_7795.3//		INTERNAL		ISO646		2
 module	INTERNAL		MSZ_7795.3//		ISO646		2
 
@@ -134,40 +147,48 @@ alias	CUBA//			NC_NC00-10//
 alias	NC_NC00-10:81//		NC_NC00-10//
 alias	ISO-IR-151//		NC_NC00-10//
 alias	ISO646-CU//		NC_NC00-10//
+alias	CSISO151CUBA//		NC_NC00-10//
 module	NC_NC00-10//		INTERNAL		ISO646		2
 module	INTERNAL		NC_NC00-10//		ISO646		2
 
 alias	ISO-IR-69//		NF_Z_62-010//
 alias	ISO646-FR//		NF_Z_62-010//
 alias	FR//			NF_Z_62-010//
+alias	CSISO69FRENCH//		NF_Z_62-010//
 module	NF_Z_62-010//		INTERNAL		ISO646		2
 module	INTERNAL		NF_Z_62-010//		ISO646		2
 
-alias	ISO-IR-25//		NF_Z_62-010_(1973)//
-alias	ISO646-FR1//		NF_Z_62-010_(1973)//
-alias	NF_Z_62-010_1973//	NF_Z_62-010_(1973)//
-module	NF_Z_62-010_(1973)//	INTERNAL		ISO646		2
-module	INTERNAL		NF_Z_62-010_(1973)//	ISO646		2
+alias	ISO-IR-25//		NF_Z_62-010_1973//
+alias	ISO646-FR1//		NF_Z_62-010_1973//
+alias	NF_Z_62-010_(1973)//	NF_Z_62-010_1973//
+alias	CSISO25FRENCH//		NF_Z_62-010_1973//
+module	NF_Z_62-010_1973//	INTERNAL		ISO646		2
+module	INTERNAL		NF_Z_62-010_1973//	ISO646		2
 
 alias	ISO-IR-60//		NS_4551-1//
 alias	ISO646-NO//		NS_4551-1//
 alias	NO//			NS_4551-1//
+alias	CSISO60DANISHNORWEGIAN// NS_4551-1//
+alias	CSISO60NORWEGIAN1//	NS_4551-1//
 module	NS_4551-1//		INTERNAL		ISO646		2
 module	INTERNAL		NS_4551-1//		ISO646		2
 
 alias	ISO646-NO2//		NS_4551-2//
 alias	ISO-IR-61//		NS_4551-2//
 alias	NO2//			NS_4551-2//
+alias	CSISO61NORWEGIAN2//	NS_4551-2//
 module	NS_4551-2//		INTERNAL		ISO646		2
 module	INTERNAL		NS_4551-2//		ISO646		2
 
 alias	ISO-IR-16//		PT//
 alias	ISO646-PT//		PT//
+alias	CSISO16PORTUGESE//	PT//
 module	PT//			INTERNAL		ISO646		2
 module	INTERNAL		PT//			ISO646		2
 
 alias	ISO-IR-84//		PT2//
 alias	ISO646-PT2		PT2//
+alias	CSISO84PORTUGUESE2//	PT2//
 module	PT2//			INTERNAL		ISO646		2
 module	INTERNAL		PT2//			ISO646		2
 
@@ -176,6 +197,7 @@ alias	FI//			SEN_850200_B//
 alias	ISO646-FI//		SEN_850200_B//
 alias	ISO646-SE//		SEN_850200_B//
 alias	SE//			SEN_850200_B//
+alias	CSISO10SWEDISH//	SEN_850200_B//
 alias	SS636127//		SEN_850200_B//
 module	SEN_850200_B//		INTERNAL		ISO646		2
 module	INTERNAL		SEN_850200_B//		ISO646		2
@@ -183,6 +205,7 @@ module	INTERNAL		SEN_850200_B//		ISO646		2
 alias	ISO-IR-11//		SEN_850200_C//
 alias	ISO646-SE2//		SEN_850200_C//
 alias	SE2//			SEN_850200_C//
+alias	CSISO11SWEDISHFORNAMES// SEN_850200_C//
 module	SEN_850200_C//		INTERNAL		ISO646		2
 module	INTERNAL		SEN_850200_C//		ISO646		2
 
@@ -194,6 +217,7 @@ alias	LATIN1//		ISO-8859-1//
 alias	L1//			ISO-8859-1//
 alias	IBM819//		ISO-8859-1//
 alias	CP819//			ISO-8859-1//
+alias	CSISOLATIN1//		ISO-8859-1//
 alias	8859_1//		ISO-8859-1//
 alias	OSF00010001//		ISO-8859-1//
 module	ISO-8859-1//		INTERNAL		ISO8859-1	1
@@ -205,6 +229,7 @@ alias	ISO_8859-2:1987//	ISO-8859-2//
 alias	ISO_8859-2//		ISO-8859-2//
 alias	LATIN2//		ISO-8859-2//
 alias	L2//			ISO-8859-2//
+alias	CSISOLATIN2//		ISO-8859-2//
 alias	8859_2//		ISO-8859-2//
 alias	OSF00010002//		ISO-8859-2//
 module	ISO-8859-2//		INTERNAL		ISO8859-2	1
@@ -216,6 +241,7 @@ alias	ISO_8859-3:1988//	ISO-8859-3//
 alias	ISO_8859-3//		ISO-8859-3//
 alias	LATIN3//		ISO-8859-3//
 alias	L3//			ISO-8859-3//
+alias	CSISOLATIN3//		ISO-8859-3//
 alias	8859_3//		ISO-8859-3//
 alias	OSF00010003//		ISO-8859-3//
 module	ISO-8859-3//		INTERNAL		ISO8859-3	1
@@ -227,6 +253,7 @@ alias	ISO_8859-4:1988//	ISO-8859-4//
 alias	ISO_8859-4//		ISO-8859-4//
 alias	LATIN4//		ISO-8859-4//
 alias	L4//			ISO-8859-4//
+alias	CSISOLATIN4//		ISO-8859-4//
 alias	8859_4//		ISO-8859-4//
 alias	OSF00010004//		ISO-8859-4//
 module	ISO-8859-4//		INTERNAL		ISO8859-4	1
@@ -237,6 +264,7 @@ alias	ISO-IR-144//		ISO-8859-5//
 alias	ISO_8859-5:1988//	ISO-8859-5//
 alias	ISO_8859-5//		ISO-8859-5//
 alias	CYRILLIC//		ISO-8859-5//
+alias	CSISOLATINCYRILLIC//	ISO-8859-5//
 alias	8859_5//		ISO-8859-5//
 alias	OSF00010005//		ISO-8859-5//
 module	ISO-8859-5//		INTERNAL		ISO8859-5	1
@@ -249,6 +277,7 @@ alias	ISO_8859-6//		ISO-8859-6//
 alias	ECMA-114//		ISO-8859-6//
 alias	ASMO-708//		ISO-8859-6//
 alias	ARABIC//		ISO-8859-6//
+alias	CSISOLATINARABIC//	ISO-8859-6//
 alias	8859_6//		ISO-8859-6//
 alias	OSF00010006//		ISO-8859-6//
 module	ISO-8859-6//		INTERNAL		ISO8859-6	1
@@ -262,6 +291,7 @@ alias	ELOT_928//		ISO-8859-7//
 alias	ECMA-118//		ISO-8859-7//
 alias	GREEK//			ISO-8859-7//
 alias	GREEK8//		ISO-8859-7//
+alias	CSISOLATINGREEK//	ISO-8859-7//
 alias	8859_7//		ISO-8859-7//
 alias	OSF00010007//		ISO-8859-7//
 module	ISO-8859-7//		INTERNAL		ISO8859-7	1
@@ -272,6 +302,7 @@ alias	ISO-IR-138//		ISO-8859-8//
 alias	ISO_8859-8:1988//	ISO-8859-8//
 alias	ISO_8859-8//		ISO-8859-8//
 alias	HEBREW//		ISO-8859-8//
+alias	CSISOLATINHEBREW//	ISO-8859-8//
 alias	8859_8//		ISO-8859-8//
 alias	OSF00010008//		ISO-8859-8//
 module	ISO-8859-8//		INTERNAL		ISO8859-8	1
@@ -283,6 +314,7 @@ alias	ISO_8859-9:1989//	ISO-8859-9//
 alias	ISO_8859-9//		ISO-8859-9//
 alias	LATIN5//		ISO-8859-9//
 alias	L5//			ISO-8859-9//
+alias	CSISOLATIN5//		ISO-8859-9//
 alias	8859_9//		ISO-8859-9//
 alias	OSF00010009//		ISO-8859-9//
 module	ISO-8859-9//		INTERNAL		ISO8859-9	1
@@ -294,6 +326,7 @@ alias	ISO_8859-10:1993//	ISO-8859-10//
 alias	ISO_8859-10//		ISO-8859-10//
 alias	LATIN6//		ISO-8859-10//
 alias	L6//			ISO-8859-10//
+alias	CSISOLATIN6//		ISO-8859-10//
 alias	OSF0001000A//		ISO-8859-10//
 module	ISO-8859-10//		INTERNAL		ISO8859-10	1
 module	INTERNAL		ISO-8859-10//		ISO8859-10	1
@@ -324,6 +357,7 @@ module	INTERNAL		ISO-8859-15//		ISO8859-15	1
 #	from			to			module		cost
 alias	T.61//			T.61-8BIT//
 alias	ISO-IR-103//		T.61-8BIT//
+alias	CSISO103T618BIT//	T.61-8BIT//
 module	T.61-8BIT//		INTERNAL		T.61		1
 module	INTERNAL		T.61-8BIT//		T.61		1
 
@@ -338,6 +372,7 @@ module	INTERNAL		ISO_6937//		ISO_6937	1
 #	from			to			module		cost
 alias	ISO-IR-90//		ISO_6937-2//
 alias	ISO_6937-2:1983//	ISO_6937-2//
+alias	CSISO90//		ISO_6937-2//
 module	ISO_6937-2//		INTERNAL		ISO_6937-2	1
 module	INTERNAL		ISO_6937-2//		ISO_6937-2	1
 
@@ -357,11 +392,13 @@ module	INTERNAL		KOI8-R//		KOI8-R		1
 
 #	from			to			module		cost
 alias	ISO-IR-19//		LATIN-GREEK//
+alias	CSISO19LATINGREEK//	LATIN-GREEK//
 module	LATIN-GREEK//		INTERNAL		LATIN-GREEK	1
 module	INTERNAL		LATIN-GREEK//		LATIN-GREEK	1
 
 #	from			to			module		cost
-alias	ISO-IR-27//		LATIN-GREEK//
+alias	ISO-IR-27//		LATIN-GREEK-1//
+alias	CSISO27LATINGREEK1//	LATIN-GREEK-1//
 module	LATIN-GREEK-1//		INTERNAL		LATIN-GREEK-1	1
 module	INTERNAL		LATIN-GREEK-1//		LATIN-GREEK-1	1
 
@@ -746,6 +783,7 @@ module	INTERNAL		IBM1047//		IBM1047		1
 
 #	from			to			module		cost
 alias	EUCKR//			EUC-KR//
+alias	CSEUCKR//		EUC-KR//
 alias	OSF0004000a//		EUC-KR//
 module	EUC-KR//		INTERNAL		EUC-KR		1
 module	INTERNAL		EUC-KR//		EUC-KR		1
@@ -845,13 +883,17 @@ module	CP775//			INTERNAL		CP775		1
 module	INTERNAL		CP775//			CP775		1
 
 #	from			to			module		cost
+alias	CSISO2022JP//		ISO-2022-JP//
 module	ISO-2022-JP//		INTERNAL		ISO-2022-JP	1
 module	INTERNAL		ISO-2022-JP//		ISO-2022-JP	1
 
+#	from			to			module		cost
+alias	CSISO2022JP2//		ISO-2022-JP-2//
 module	ISO-2022-JP-2//		INTERNAL		ISO-2022-JP	1
 module	INTERNAL		ISO-2022-JP-2//		ISO-2022-JP	1
 
 #	from			to			module		cost
+alias	CSISO2022KR//		ISO-2022-KR//
 module	ISO-2022-KR//		INTERNAL		ISO-2022-KR	1
 module	INTERNAL		ISO-2022-KR//		ISO-2022-KR	1
 
@@ -862,6 +904,7 @@ module	INTERNAL		MACINTOSH//		MACINTOSH	1
 
 #	from			to			module		cost
 alias	ISO-IR-143//		IEC_P27-1//
+alias	CSISO143IECP271//	IEC_P27-1//
 module	IEC_P27-1//		INTERNAL		IEC_P27-1	1
 module	INTERNAL		IEC_P27-1//		IEC_P27-1	1
 
@@ -874,6 +917,7 @@ module	INTERNAL		BALTIC//		BALTIC		1
 alias	ISO_9036//		ASMO_449//
 alias	ARABIC7//		ASMO_449//
 alias	ISO-IR-89//		ASMO_449//
+alias	CSISO89ASMO449//	ASMO_449//
 module	ASMO_449//		INTERNAL		ASMO_449	1
 module	INTERNAL		ASMO_449//		ASMO_449	1
 
@@ -883,11 +927,13 @@ alias	ISO-IR-99//		ANSI_X3.110//
 alias	CSA_T500-1983//		ANSI_X3.110//
 alias	CSA_T500//		ANSI_X3.110//
 alias	NAPLPS//		ANSI_X3.110//
+alias	CSISO99NAPLPS//		ANSI_X3.110//
 module	ANSI_X3.110//		INTERNAL		ANSI_X3.110	1
 module	INTERNAL		ANSI_X3.110//		ANSI_X3.110	1
 
 #	from			to			module		cost
 alias	ISO-IR-139//		CSN_369103//
+alias	CSISO139CSN369103//	CSN_369103//
 module	CSN_369103//		INTERNAL		CSN_369103	1
 module	INTERNAL		CSN_369103//		CSN_369103	1
 
@@ -904,6 +950,7 @@ module	INTERNAL		DEC-MCS//		DEC-MCS		1
 
 #	from			to			module		cost
 alias	ISO-IR-111//		ECMA-CYRILLIC//
+alias	CSISO111ECMACYRILLIC//	ECMA-CYRILLIC//
 module	ECMA-CYRILLIC//		INTERNAL		ECMA-CYRILLIC	1
 module	INTERNAL		ECMA-CYRILLIC//		ECMA-CYRILLIC	1
 
@@ -911,36 +958,44 @@ module	INTERNAL		ECMA-CYRILLIC//		ECMA-CYRILLIC	1
 alias	ST_SEV_358-88//		GOST_19768-74//
 alias	GOST_19768//		GOST_19768-74//
 alias	ISO-IR-153//		GOST_19768-74//
+alias	CSISO153GOST1976874//	GOST_19768-74//
 module	GOST_19768-74//		INTERNAL		GOST_19768-74	1
 module	INTERNAL		GOST_19768-74//		GOST_19768-74	1
 
 #	from			to			module		cost
 alias	ISO-IR-150//		GREEK-CCITT//
+alias	CSISO150//		GREEK-CCITT//
+alias	CSISO150GREEKCCITT//	GREEK-CCITT//
 module	GREEK-CCITT//		INTERNAL		GREEK-CCITT	1
 module	INTERNAL		GREEK-CCITT//		GREEK-CCITT	1
 
 #	from			to			module		cost
 alias	ISO-IR-88//		GREEK7//
+alias	CSISO88GREEK7//		GREEK7//
 module	GREEK7//		INTERNAL		GREEK7		1
 module	INTERNAL		GREEK7//		GREEK7		1
 
 #	from			to			module		cost
 alias	ISO-IR-18//		GREEK7-OLD//
+alias	CSISO18GREEK7OLD//	GREEK7-OLD//
 module	GREEK7-OLD//		INTERNAL		GREEK7-OLD	1
 module	INTERNAL		GREEK7-OLD//		GREEK7-OLD	1
 
 #	from			to			module		cost
 alias	ISO-IR-49//		INIS//
+alias	CSISO49INIS//		INIS//
 module	INIS//			INTERNAL		INIS		1
 module	INTERNAL		INIS//			INIS		1
 
 #	from			to			module		cost
 alias	ISO-IR-50//		INIS-8//
+alias	CSISO50INIS8//		INIS-8//
 module	INIS-8//		INTERNAL		INIS-8		1
 module	INTERNAL		INIS-8//		INIS-8		1
 
 #	from			to			module		cost
 alias	ISO-IR-51//		INIS-CYRILLIC//
+alias	CSISO51INISCYRILLIC//	INIS-CYRILLIC//
 module	INIS-CYRILLIC//		INTERNAL		INIS-CYRILLIC	1
 module	INTERNAL		INIS-CYRILLIC//		INIS-CYRILLIC	1
 
@@ -948,29 +1003,34 @@ module	INTERNAL		INIS-CYRILLIC//		INIS-CYRILLIC	1
 alias	ISO-IR-98//		ISO_2033//
 alias	ISO_2033-1983//		ISO_2033//
 alias	E13B/			ISO_2033//
+alias	CSISO2033//		ISO_2033//
 module	ISO_2033//		INTERNAL		ISO_2033	1
 module	INTERNAL		ISO_2033//		ISO_2033	1
 
 #	from			to			module		cost
 alias	ISO-IR-37//		ISO_5427//
 alias	KOI-7//			ISO_5427//
+alias	CSISO5427CYRILLIC//	ISO_5427//
 module	ISO_5427//		INTERNAL		ISO_5427	1
 module	INTERNAL		ISO_5427//		ISO_5427	1
 
 #	from			to			module		cost
 alias	ISO-IR-54//		ISO_5427-EXT//
 alias	ISO_5427:1981//		ISO_5427-EXT//
+alias	CSISO5427CYRILLIC1981//	ISO_5427-EXT//
 module	ISO_5427-EXT//		INTERNAL		ISO_5427-EXT	1
 module	INTERNAL		ISO_5427-EXT//		ISO_5427-EXT	1
 
 #	from			to			module		cost
 alias	ISO-IR-55//		ISO_5428//
 alias	ISO_5428:1980//		ISO_5428//
+alias	CSISO5428GREEK//	ISO_5428//
 module	ISO_5428//		INTERNAL		ISO_5428	1
 module	INTERNAL		ISO_5428//		ISO_5428	1
 
 #	from			to			module		cost
 alias	ISO-IR-155//		ISO_10367-BOX//
+alias	CSISO10367BOX//		ISO_10367-BOX//
 module	ISO_10367-BOX//		INTERNAL		ISO_10367-BOX	1
 module	INTERNAL		ISO_10367-BOX//		ISO_10367-BOX	1
 
@@ -984,10 +1044,12 @@ module	INTERNAL		MAC-UK//		MAC-UK		1
 
 #	from			to			module		cost
 alias	ISO-IR-9-1//		NATS-DANO//
+alias	CSNATSDANO//		NATS-DANO//
 module	NATS-DANO//		INTERNAL		NATS-DANO	1
 module	INTERNAL		NATS-DANO//		NATS-DANO	1
 
 #	from			to			module		cost
 alias	ISO-IR-8-1//		NATS-SEFI//
+alias	CSNATSSEFI//		NATS-SEFI//
 module	NATS-SEFI//		INTERNAL		NATS-SEFI	1
 module	INTERNAL		NATS-SEFI//		NATS-SEFI	1
diff --git a/localedata/charmaps/NF_Z_62-010-1973 b/localedata/charmaps/NF_Z_62-010-1973
index 8496c02358..b853d9e3d6 100644
--- a/localedata/charmaps/NF_Z_62-010-1973
+++ b/localedata/charmaps/NF_Z_62-010-1973
@@ -1,6 +1,8 @@
 <code_set_name> NF_Z_62-010_(1973)
 <comment_char> %
 <escape_char> /
+% version: 1.0
+% repertoiremap: mnemonic,ds
 %  source: ECMA registry
 
 % alias ISO-IR-25
diff --git a/localedata/charmaps/NF_Z_62-010_(1973) b/localedata/charmaps/NF_Z_62-010_(1973)
deleted file mode 100644
index b853d9e3d6..0000000000
--- a/localedata/charmaps/NF_Z_62-010_(1973)
+++ /dev/null
@@ -1,222 +0,0 @@
-<code_set_name> NF_Z_62-010_(1973)
-<comment_char> %
-<escape_char> /
-% version: 1.0
-% repertoiremap: mnemonic,ds
-%  source: ECMA registry
-
-% alias ISO-IR-25
-% alias ISO646-FR1
-CHARMAP
-<NU>                   /x00   <U0000> NULL (NUL)
-<SH>                   /x01   <U0001> START OF HEADING (SOH)
-<SX>                   /x02   <U0002> START OF TEXT (STX)
-<EX>                   /x03   <U0003> END OF TEXT (ETX)
-<ET>                   /x04   <U0004> END OF TRANSMISSION (EOT)
-<EQ>                   /x05   <U0005> ENQUIRY (ENQ)
-<AK>                   /x06   <U0006> ACKNOWLEDGE (ACK)
-<BL>                   /x07   <U0007> BELL (BEL)
-<BS>                   /x08   <U0008> BACKSPACE (BS)
-<HT>                   /x09   <U0009> CHARACTER TABULATION (HT)
-<LF>                   /x0A   <U000A> LINE FEED (LF)
-<VT>                   /x0B   <U000B> LINE TABULATION (VT)
-<FF>                   /x0C   <U000C> FORM FEED (FF)
-<CR>                   /x0D   <U000D> CARRIAGE RETURN (CR)
-<SO>                   /x0E   <U000E> SHIFT OUT (SO)
-<SI>                   /x0F   <U000F> SHIFT IN (SI)
-<DL>                   /x10   <U0010> DATALINK ESCAPE (DLE)
-<D1>                   /x11   <U0011> DEVICE CONTROL ONE (DC1)
-<D2>                   /x12   <U0012> DEVICE CONTROL TWO (DC2)
-<D3>                   /x13   <U0013> DEVICE CONTROL THREE (DC3)
-<D4>                   /x14   <U0014> DEVICE CONTROL FOUR (DC4)
-<NK>                   /x15   <U0015> NEGATIVE ACKNOWLEDGE (NAK)
-<SY>                   /x16   <U0016> SYNCHRONOUS IDLE (SYN)
-<EB>                   /x17   <U0017> END OF TRANSMISSION BLOCK (ETB)
-<CN>                   /x18   <U0018> CANCEL (CAN)
-<EM>                   /x19   <U0019> END OF MEDIUM (EM)
-<SB>                   /x1A   <U001A> SUBSTITUTE (SUB)
-<EC>                   /x1B   <U001B> ESCAPE (ESC)
-<FS>                   /x1C   <U001C> FILE SEPARATOR (IS4)
-<GS>                   /x1D   <U001D> GROUP SEPARATOR (IS3)
-<RS>                   /x1E   <U001E> RECORD SEPARATOR (IS2)
-<US>                   /x1F   <U001F> UNIT SEPARATOR (IS1)
-<SP>                   /x20   <U0020> SPACE
-<!>                    /x21   <U0021> EXCLAMATION MARK
-<">                    /x22   <U0022> QUOTATION MARK
-<Pd>                   /x23   <U00A3> POUND SIGN
-<DO>                   /x24   <U0024> DOLLAR SIGN
-<%>                    /x25   <U0025> PERCENT SIGN
-<&>                    /x26   <U0026> AMPERSAND
-<'>                    /x27   <U0027> APOSTROPHE
-<(>                    /x28   <U0028> LEFT PARENTHESIS
-<)>                    /x29   <U0029> RIGHT PARENTHESIS
-<*>                    /x2A   <U002A> ASTERISK
-<+>                    /x2B   <U002B> PLUS SIGN
-<,>                    /x2C   <U002C> COMMA
-<->                    /x2D   <U002D> HYPHEN-MINUS
-<.>                    /x2E   <U002E> FULL STOP
-<//>                   /x2F   <U002F> SOLIDUS
-<0>                    /x30   <U0030> DIGIT ZERO
-<1>                    /x31   <U0031> DIGIT ONE
-<2>                    /x32   <U0032> DIGIT TWO
-<3>                    /x33   <U0033> DIGIT THREE
-<4>                    /x34   <U0034> DIGIT FOUR
-<5>                    /x35   <U0035> DIGIT FIVE
-<6>                    /x36   <U0036> DIGIT SIX
-<7>                    /x37   <U0037> DIGIT SEVEN
-<8>                    /x38   <U0038> DIGIT EIGHT
-<9>                    /x39   <U0039> DIGIT NINE
-<:>                    /x3A   <U003A> COLON
-<;>                    /x3B   <U003B> SEMICOLON
-<<>                    /x3C   <U003C> LESS-THAN SIGN
-<=>                    /x3D   <U003D> EQUALS SIGN
-</>>                   /x3E   <U003E> GREATER-THAN SIGN
-<?>                    /x3F   <U003F> QUESTION MARK
-<a!>                   /x40   <U00E0> LATIN SMALL LETTER A WITH GRAVE
-<A>                    /x41   <U0041> LATIN CAPITAL LETTER A
-<B>                    /x42   <U0042> LATIN CAPITAL LETTER B
-<C>                    /x43   <U0043> LATIN CAPITAL LETTER C
-<D>                    /x44   <U0044> LATIN CAPITAL LETTER D
-<E>                    /x45   <U0045> LATIN CAPITAL LETTER E
-<F>                    /x46   <U0046> LATIN CAPITAL LETTER F
-<G>                    /x47   <U0047> LATIN CAPITAL LETTER G
-<H>                    /x48   <U0048> LATIN CAPITAL LETTER H
-<I>                    /x49   <U0049> LATIN CAPITAL LETTER I
-<J>                    /x4A   <U004A> LATIN CAPITAL LETTER J
-<K>                    /x4B   <U004B> LATIN CAPITAL LETTER K
-<L>                    /x4C   <U004C> LATIN CAPITAL LETTER L
-<M>                    /x4D   <U004D> LATIN CAPITAL LETTER M
-<N>                    /x4E   <U004E> LATIN CAPITAL LETTER N
-<O>                    /x4F   <U004F> LATIN CAPITAL LETTER O
-<P>                    /x50   <U0050> LATIN CAPITAL LETTER P
-<Q>                    /x51   <U0051> LATIN CAPITAL LETTER Q
-<R>                    /x52   <U0052> LATIN CAPITAL LETTER R
-<S>                    /x53   <U0053> LATIN CAPITAL LETTER S
-<T>                    /x54   <U0054> LATIN CAPITAL LETTER T
-<U>                    /x55   <U0055> LATIN CAPITAL LETTER U
-<V>                    /x56   <U0056> LATIN CAPITAL LETTER V
-<W>                    /x57   <U0057> LATIN CAPITAL LETTER W
-<X>                    /x58   <U0058> LATIN CAPITAL LETTER X
-<Y>                    /x59   <U0059> LATIN CAPITAL LETTER Y
-<Z>                    /x5A   <U005A> LATIN CAPITAL LETTER Z
-<DG>                   /x5B   <U00B0> DEGREE SIGN
-<c,>                   /x5C   <U00E7> LATIN SMALL LETTER C WITH CEDILLA
-<SE>                   /x5D   <U00A7> SECTION SIGN
-<'/>>                  /x5E   <U005E> CIRCUMFLEX ACCENT
-<_>                    /x5F   <U005F> LOW LINE
-<'!>                   /x60   <U0060> GRAVE ACCENT
-<a>                    /x61   <U0061> LATIN SMALL LETTER A
-<b>                    /x62   <U0062> LATIN SMALL LETTER B
-<c>                    /x63   <U0063> LATIN SMALL LETTER C
-<d>                    /x64   <U0064> LATIN SMALL LETTER D
-<e>                    /x65   <U0065> LATIN SMALL LETTER E
-<f>                    /x66   <U0066> LATIN SMALL LETTER F
-<g>                    /x67   <U0067> LATIN SMALL LETTER G
-<h>                    /x68   <U0068> LATIN SMALL LETTER H
-<i>                    /x69   <U0069> LATIN SMALL LETTER I
-<j>                    /x6A   <U006A> LATIN SMALL LETTER J
-<k>                    /x6B   <U006B> LATIN SMALL LETTER K
-<l>                    /x6C   <U006C> LATIN SMALL LETTER L
-<m>                    /x6D   <U006D> LATIN SMALL LETTER M
-<n>                    /x6E   <U006E> LATIN SMALL LETTER N
-<o>                    /x6F   <U006F> LATIN SMALL LETTER O
-<p>                    /x70   <U0070> LATIN SMALL LETTER P
-<q>                    /x71   <U0071> LATIN SMALL LETTER Q
-<r>                    /x72   <U0072> LATIN SMALL LETTER R
-<s>                    /x73   <U0073> LATIN SMALL LETTER S
-<t>                    /x74   <U0074> LATIN SMALL LETTER T
-<u>                    /x75   <U0075> LATIN SMALL LETTER U
-<v>                    /x76   <U0076> LATIN SMALL LETTER V
-<w>                    /x77   <U0077> LATIN SMALL LETTER W
-<x>                    /x78   <U0078> LATIN SMALL LETTER X
-<y>                    /x79   <U0079> LATIN SMALL LETTER Y
-<z>                    /x7A   <U007A> LATIN SMALL LETTER Z
-<e'>                   /x7B   <U00E9> LATIN SMALL LETTER E WITH ACUTE
-<u!>                   /x7C   <U00F9> LATIN SMALL LETTER U WITH GRAVE
-<e!>                   /x7D   <U00E8> LATIN SMALL LETTER E WITH GRAVE
-<':>                   /x7E   <U00A8> DIAERESIS
-<DT>                   /x7F   <U007F> DELETE (DEL)
-<NUL>                  /x00   <U0000> NUL
-<SOH>                  /x01   <U0001> START OF HEADING (SOH)
-<STX>                  /x02   <U0002> START OF TEXT (STX)
-<ETX>                  /x03   <U0003> END OF TEXT (ETX)
-<EOT>                  /x04   <U0004> END OF TRANSMISSION (EOT)
-<ENQ>                  /x05   <U0005> ENQUIRY (ENQ)
-<ACK>                  /x06   <U0006> ACKNOWLEDGE (ACK)
-<alert>                /x07   <U0007> BELL (BEL)
-<BEL>                  /x07   <U0007> BELL (BEL)
-<backspace>            /x08   <U0008> BACKSPACE (BS)
-<tab>                  /x09   <U0009> CHARACTER TABULATION (HT)
-<newline>              /x0A   <U000A> LINE FEED (LF)
-<vertical-tab>         /x0B   <U000B> LINE TABULATION (VT)
-<form-feed>            /x0C   <U000C> FORM FEED (FF)
-<carriage-return>      /x0D   <U000D> CARRIAGE RETURN (CR)
-<DLE>                  /x10   <U0010> DATALINK ESCAPE (DLE)
-<DC1>                  /x11   <U0011> DEVICE CONTROL ONE (DC1)
-<DC2>                  /x12   <U0012> DEVICE CONTROL TWO (DC2)
-<DC3>                  /x13   <U0013> DEVICE CONTROL THREE (DC3)
-<DC4>                  /x14   <U0014> DEVICE CONTROL FOUR (DC4)
-<NAK>                  /x15   <U0015> NEGATIVE ACKNOWLEDGE (NAK)
-<SYN>                  /x16   <U0016> SYNCHRONOUS IDLE (SYN)
-<ETB>                  /x17   <U0017> END OF TRANSMISSION BLOCK (ETB)
-<CAN>                  /x18   <U0018> CANCEL (CAN)
-<SUB>                  /x1A   <U001A> SUBSTITUTE (SUB)
-<ESC>                  /x1B   <U001B> ESCAPE (ESC)
-<IS4>                  /x1C   <U001C> FILE SEPARATOR (IS4)
-<IS3>                  /x1D   <U001D> GROUP SEPARATOR (IS3)
-<intro>                /x1D   <U001D> GROUP SEPARATOR (IS3)
-<IS2>                  /x1E   <U001E> RECORD SEPARATOR (IS2)
-<IS1>                  /x1F   <U001F> UNIT SEPARATOR (IS1)
-<DEL>                  /x7F   <U007F> DELETE (DEL)
-<space>                /x20   <U0020> SPACE
-<exclamation-mark>     /x21   <U0021> EXCLAMATION MARK
-<quotation-mark>       /x22   <U0022> QUOTATION MARK
-<number-sign>          /x00   <U0023> NUMBER SIGN
-<dollar-sign>          /x24   <U0024> DOLLAR SIGN
-<percent-sign>         /x25   <U0025> PERCENT SIGN
-<ampersand>            /x26   <U0026> AMPERSAND
-<apostrophe>           /x27   <U0027> APOSTROPHE
-<left-parenthesis>     /x28   <U0028> LEFT PARENTHESIS
-<right-parenthesis>    /x29   <U0029> RIGHT PARENTHESIS
-<asterisk>             /x2A   <U002A> ASTERISK
-<plus-sign>            /x2B   <U002B> PLUS SIGN
-<comma>                /x2C   <U002C> COMMA
-<hyphen>               /x2D   <U002D> HYPHEN-MINUS
-<hyphen-minus>         /x2D   <U002D> HYPHEN-MINUS
-<period>               /x2E   <U002E> FULL STOP
-<full-stop>            /x2E   <U002E> FULL STOP
-<slash>                /x2F   <U002F> SOLIDUS
-<solidus>              /x2F   <U002F> SOLIDUS
-<zero>                 /x30   <U0030> DIGIT ZERO
-<one>                  /x31   <U0031> DIGIT ONE
-<two>                  /x32   <U0032> DIGIT TWO
-<three>                /x33   <U0033> DIGIT THREE
-<four>                 /x34   <U0034> DIGIT FOUR
-<five>                 /x35   <U0035> DIGIT FIVE
-<six>                  /x36   <U0036> DIGIT SIX
-<seven>                /x37   <U0037> DIGIT SEVEN
-<eight>                /x38   <U0038> DIGIT EIGHT
-<nine>                 /x39   <U0039> DIGIT NINE
-<colon>                /x3A   <U003A> COLON
-<semicolon>            /x3B   <U003B> SEMICOLON
-<less-than-sign>       /x3C   <U003C> LESS-THAN SIGN
-<equals-sign>          /x3D   <U003D> EQUALS SIGN
-<greater-than-sign>    /x3E   <U003E> GREATER-THAN SIGN
-<question-mark>        /x3F   <U003F> QUESTION MARK
-<commercial-at>        /x00   <U0040> COMMERCIAL AT
-<left-square-bracket>  /x00   <U005B> LEFT SQUARE BRACKET
-<backslash>            /x00   <U005C> REVERSE SOLIDUS
-<reverse-solidus>      /x00   <U005C> REVERSE SOLIDUS
-<right-square-bracket> /x00   <U005D> RIGHT SQUARE BRACKET
-<circumflex>           /x5E   <U005E> CIRCUMFLEX ACCENT
-<circumflex-accent>    /x5E   <U005E> CIRCUMFLEX ACCENT
-<underscore>           /x5F   <U005F> LOW LINE
-<low-line>             /x5F   <U005F> LOW LINE
-<grave-accent>         /x60   <U0060> GRAVE ACCENT
-<left-brace>           /x00   <U007B> LEFT CURLY BRACKET
-<left-curly-bracket>   /x00   <U007B> LEFT CURLY BRACKET
-<vertical-line>        /x00   <U007C> VERTICAL LINE
-<right-brace>          /x00   <U007D> RIGHT CURLY BRACKET
-<right-curly-bracket>  /x00   <U007D> RIGHT CURLY BRACKET
-<tilde>                /x00   <U007E> TILDE
-END CHARMAP