locales: separate unicode from other locales

Unicode locales are maintained and to evolved in cldr.
Generating the other locales from the unicode gets more and more painful
over the time.

Let's freeze the other locales to cldr 34.0.

1 files changed, 59 insertions, 146 deletions

diff --git a/share/msgdef/Makefile b/share/msgdef/Makefile
index d58d9f61314e..497c094ffdd7 100644
--- a/share/msgdef/Makefile
+++ b/share/msgdef/Makefile
@@ -1,6 +1,4 @@
 # $FreeBSD$
-# Warning: Do not edit. This file is automatically generated from the
-# tools in /usr/src/tools/tools/locale.
 
 LOCALEDIR=	${SHAREDIR}/locale
 FILESNAME=	LC_MESSAGES
@@ -9,94 +7,51 @@ FILESNAME=	LC_MESSAGES
 .src.out:
 	grep -v -E '^(#$$|#[ ])' < ${.IMPSRC} > ${.TARGET}
 
-LOCALES+=	am_ET.UTF-8
-LOCALES+=	ar_SA.UTF-8
 LOCALES+=	be_BY.CP1131
 LOCALES+=	be_BY.CP1251
 LOCALES+=	be_BY.ISO8859-5
-LOCALES+=	be_BY.UTF-8
 LOCALES+=	bg_BG.CP1251
-LOCALES+=	cs_CZ.UTF-8
-LOCALES+=	de_DE.UTF-8
 LOCALES+=	el_GR.ISO8859-7
-LOCALES+=	el_GR.UTF-8
-LOCALES+=	en_US.UTF-8
 LOCALES+=	es_MX.ISO8859-1
-LOCALES+=	es_MX.UTF-8
-LOCALES+=	et_EE.UTF-8
-LOCALES+=	eu_ES.UTF-8
 LOCALES+=	fi_FI.ISO8859-15
-LOCALES+=	fi_FI.UTF-8
-LOCALES+=	fr_FR.UTF-8
-LOCALES+=	ga_IE.UTF-8
-LOCALES+=	he_IL.UTF-8
 LOCALES+=	hi_IN.ISCII-DEV
-LOCALES+=	hi_IN.UTF-8
-LOCALES+=	hu_HU.UTF-8
 LOCALES+=	hy_AM.ARMSCII-8
-LOCALES+=	hy_AM.UTF-8
 LOCALES+=	is_IS.ISO8859-15
-LOCALES+=	is_IS.UTF-8
 LOCALES+=	it_IT.ISO8859-15
-LOCALES+=	it_IT.UTF-8
 LOCALES+=	ja_JP.SJIS
-LOCALES+=	ja_JP.UTF-8
 LOCALES+=	ja_JP.eucJP
-LOCALES+=	kk_KZ.UTF-8
-LOCALES+=	ko_KR.UTF-8
 LOCALES+=	ko_KR.eucKR
-LOCALES+=	lt_LT.UTF-8
 LOCALES+=	lv_LV.ISO8859-13
-LOCALES+=	lv_LV.UTF-8
-LOCALES+=	mn_MN.UTF-8
-LOCALES+=	nb_NO.UTF-8
-LOCALES+=	nl_NL.UTF-8
-LOCALES+=	nn_NO.UTF-8
-LOCALES+=	pl_PL.UTF-8
 LOCALES+=	pt_PT.ISO8859-15
-LOCALES+=	pt_PT.UTF-8
-LOCALES+=	ro_RO.UTF-8
 LOCALES+=	ru_RU.CP1251
 LOCALES+=	ru_RU.CP866
 LOCALES+=	ru_RU.ISO8859-5
 LOCALES+=	ru_RU.KOI8-R
-LOCALES+=	ru_RU.UTF-8
-LOCALES+=	se_NO.UTF-8
 LOCALES+=	sk_SK.ISO8859-2
-LOCALES+=	sk_SK.UTF-8
 LOCALES+=	sr_RS.ISO8859-5
-LOCALES+=	sr_RS.UTF-8
-LOCALES+=	sr_RS.UTF-8@latin
-LOCALES+=	sv_SE.UTF-8
 LOCALES+=	tr_TR.ISO8859-9
-LOCALES+=	tr_TR.UTF-8
 LOCALES+=	uk_UA.CP1251
 LOCALES+=	uk_UA.ISO8859-5
 LOCALES+=	uk_UA.KOI8-U
-LOCALES+=	uk_UA.UTF-8
 LOCALES+=	zh_CN.GB2312
 LOCALES+=	zh_CN.GBK
-LOCALES+=	zh_CN.UTF-8
-LOCALES+=	zh_HK.UTF-8
 LOCALES+=	zh_TW.Big5
-LOCALES+=	zh_TW.UTF-8
+LOCALES+=	nl_NL.ISO8859-15
+LOCALES+=	cs_CZ.ISO8859-2
+LOCALES+=	sv_SE.ISO8859-15
+LOCALES+=	de_DE.ISO8859-15
+LOCALES+=	en_US.US-ASCII
+LOCALES+=	et_EE.ISO8859-15
+LOCALES+=	eu_ES.ISO8859-15
+LOCALES+=	fr_FR.ISO8859-15
+LOCALES+=	hu_HU.ISO8859-2
+LOCALES+=	ro_RO.ISO8859-2
+LOCALES+=	nb_NO.ISO8859-15
+LOCALES+=	lt_LT.ISO8859-13
+LOCALES+=	pl_PL.ISO8859-2
 
-
-
-SAME+=		nl_NL.UTF-8 nl_NL.ISO8859-15
-SAME+=		nl_NL.UTF-8 nl_NL.ISO8859-1
-SAME+=		nl_NL.UTF-8 nl_BE.UTF-8
-SAME+=		nl_NL.UTF-8 nl_BE.ISO8859-15
-SAME+=		nl_NL.UTF-8 nl_BE.ISO8859-1
-SAME+=		nl_NL.UTF-8 af_ZA.UTF-8
-SAME+=		nl_NL.UTF-8 af_ZA.ISO8859-15
-SAME+=		nl_NL.UTF-8 af_ZA.ISO8859-1
-SAME+=		ar_SA.UTF-8 ar_QA.UTF-8
-SAME+=		ar_SA.UTF-8 ar_MA.UTF-8
-SAME+=		ar_SA.UTF-8 ar_JO.UTF-8
-SAME+=		ar_SA.UTF-8 ar_EG.UTF-8
-SAME+=		ar_SA.UTF-8 ar_AE.UTF-8
-SAME+=		sr_RS.UTF-8 bg_BG.UTF-8
+SAME+=		nl_NL.ISO8859-15 af_ZA.ISO8859-15
+SAME+=		nl_NL.ISO8859-15 af_ZA.ISO8859-1
 SAME+=		es_MX.ISO8859-1 es_ES.ISO8859-15
 SAME+=		es_MX.ISO8859-1 es_ES.ISO8859-1
 SAME+=		es_MX.ISO8859-1 es_AR.ISO8859-1
@@ -108,99 +63,57 @@ SAME+=		es_MX.ISO8859-1 ca_ES.ISO8859-15
 SAME+=		es_MX.ISO8859-1 ca_ES.ISO8859-1
 SAME+=		es_MX.ISO8859-1 ca_AD.ISO8859-15
 SAME+=		es_MX.ISO8859-1 ca_AD.ISO8859-1
-SAME+=		es_MX.UTF-8 es_ES.UTF-8
-SAME+=		es_MX.UTF-8 es_CR.UTF-8
-SAME+=		es_MX.UTF-8 es_AR.UTF-8
-SAME+=		es_MX.UTF-8 ca_IT.UTF-8
-SAME+=		es_MX.UTF-8 ca_FR.UTF-8
-SAME+=		es_MX.UTF-8 ca_ES.UTF-8
-SAME+=		es_MX.UTF-8 ca_AD.UTF-8
-SAME+=		cs_CZ.UTF-8 cs_CZ.ISO8859-2
-SAME+=		sv_SE.UTF-8 sv_SE.ISO8859-15
-SAME+=		sv_SE.UTF-8 sv_SE.ISO8859-1
-SAME+=		sv_SE.UTF-8 sv_FI.UTF-8
-SAME+=		sv_SE.UTF-8 sv_FI.ISO8859-15
-SAME+=		sv_SE.UTF-8 sv_FI.ISO8859-1
-SAME+=		sv_SE.UTF-8 da_DK.UTF-8
-SAME+=		sv_SE.UTF-8 da_DK.ISO8859-15
-SAME+=		sv_SE.UTF-8 da_DK.ISO8859-1
-SAME+=		de_DE.UTF-8 de_DE.ISO8859-15
-SAME+=		de_DE.UTF-8 de_DE.ISO8859-1
-SAME+=		de_DE.UTF-8 de_CH.UTF-8
-SAME+=		de_DE.UTF-8 de_CH.ISO8859-15
-SAME+=		de_DE.UTF-8 de_CH.ISO8859-1
-SAME+=		de_DE.UTF-8 de_AT.UTF-8
-SAME+=		de_DE.UTF-8 de_AT.ISO8859-15
-SAME+=		de_DE.UTF-8 de_AT.ISO8859-1
-SAME+=		en_US.UTF-8 en_ZA.UTF-8
-SAME+=		en_US.UTF-8 en_ZA.US-ASCII
-SAME+=		en_US.UTF-8 en_ZA.ISO8859-15
-SAME+=		en_US.UTF-8 en_ZA.ISO8859-1
-SAME+=		en_US.UTF-8 en_US.US-ASCII
-SAME+=		en_US.UTF-8 en_US.ISO8859-15
-SAME+=		en_US.UTF-8 en_US.ISO8859-1
-SAME+=		en_US.UTF-8 en_SG.UTF-8
-SAME+=		en_US.UTF-8 en_SG.ISO8859-1
-SAME+=		en_US.UTF-8 en_PH.UTF-8
-SAME+=		en_US.UTF-8 en_NZ.UTF-8
-SAME+=		en_US.UTF-8 en_NZ.US-ASCII
-SAME+=		en_US.UTF-8 en_NZ.ISO8859-15
-SAME+=		en_US.UTF-8 en_NZ.ISO8859-1
-SAME+=		en_US.UTF-8 en_IE.UTF-8
-SAME+=		en_US.UTF-8 en_IE.ISO8859-15
-SAME+=		en_US.UTF-8 en_IE.ISO8859-1
-SAME+=		en_US.UTF-8 en_HK.UTF-8
-SAME+=		en_US.UTF-8 en_HK.ISO8859-1
-SAME+=		en_US.UTF-8 en_GB.UTF-8
-SAME+=		en_US.UTF-8 en_GB.US-ASCII
-SAME+=		en_US.UTF-8 en_GB.ISO8859-15
-SAME+=		en_US.UTF-8 en_GB.ISO8859-1
-SAME+=		en_US.UTF-8 en_CA.UTF-8
-SAME+=		en_US.UTF-8 en_CA.US-ASCII
-SAME+=		en_US.UTF-8 en_CA.ISO8859-15
-SAME+=		en_US.UTF-8 en_CA.ISO8859-1
-SAME+=		en_US.UTF-8 en_AU.UTF-8
-SAME+=		en_US.UTF-8 en_AU.US-ASCII
-SAME+=		en_US.UTF-8 en_AU.ISO8859-15
-SAME+=		en_US.UTF-8 en_AU.ISO8859-1
-SAME+=		et_EE.UTF-8 et_EE.ISO8859-15
-SAME+=		et_EE.UTF-8 et_EE.ISO8859-1
-SAME+=		eu_ES.UTF-8 eu_ES.ISO8859-15
-SAME+=		eu_ES.UTF-8 eu_ES.ISO8859-1
+SAME+=		sv_SE.ISO8859-15 sv_SE.ISO8859-1
+SAME+=		sv_SE.ISO8859-15 sv_FI.ISO8859-15
+SAME+=		sv_SE.ISO8859-15 sv_FI.ISO8859-1
+SAME+=		sv_SE.ISO8859-15 da_DK.ISO8859-15
+SAME+=		sv_SE.ISO8859-15 da_DK.ISO8859-1
+SAME+=		de_DE.ISO8859-15 de_DE.ISO8859-1
+SAME+=		de_DE.ISO8859-15 de_CH.ISO8859-15
+SAME+=		de_DE.ISO8859-15 de_CH.ISO8859-1
+SAME+=		de_DE.ISO8859-15 de_AT.ISO8859-15
+SAME+=		de_DE.ISO8859-15 de_AT.ISO8859-1
+SAME+=		en_US.US-ASCII en_ZA.US-ASCII
+SAME+=		en_US.US-ASCII en_ZA.ISO8859-15
+SAME+=		en_US.US-ASCII en_ZA.ISO8859-1
+SAME+=		en_US.US-ASCII en_US.ISO8859-15
+SAME+=		en_US.US-ASCII en_US.ISO8859-1
+SAME+=		en_US.US-ASCII en_SG.ISO8859-1
+SAME+=		en_US.US-ASCII en_NZ.US-ASCII
+SAME+=		en_US.US-ASCII en_NZ.ISO8859-15
+SAME+=		en_US.US-ASCII en_NZ.ISO8859-1
+SAME+=		en_US.US-ASCII en_IE.ISO8859-15
+SAME+=		en_US.US-ASCII en_IE.ISO8859-1
+SAME+=		en_US.US-ASCII en_HK.ISO8859-1
+SAME+=		en_US.US-ASCII en_GB.US-ASCII
+SAME+=		en_US.US-ASCII en_GB.ISO8859-15
+SAME+=		en_US.US-ASCII en_GB.ISO8859-1
+SAME+=		en_US.US-ASCII en_CA.US-ASCII
+SAME+=		en_US.US-ASCII en_CA.ISO8859-15
+SAME+=		en_US.US-ASCII en_CA.ISO8859-1
+SAME+=		en_US.US-ASCII en_AU.US-ASCII
+SAME+=		en_US.US-ASCII en_AU.ISO8859-15
+SAME+=		en_US.US-ASCII en_AU.ISO8859-1
+SAME+=		et_EE.ISO8859-15 et_EE.ISO8859-1
+SAME+=		eu_ES.ISO8859-15 eu_ES.ISO8859-1
 SAME+=		fi_FI.ISO8859-15 fi_FI.ISO8859-1
-SAME+=		fr_FR.UTF-8 fr_FR.ISO8859-15
-SAME+=		fr_FR.UTF-8 fr_FR.ISO8859-1
-SAME+=		fr_FR.UTF-8 fr_CH.UTF-8
-SAME+=		fr_FR.UTF-8 fr_CH.ISO8859-15
-SAME+=		fr_FR.UTF-8 fr_CH.ISO8859-1
-SAME+=		fr_FR.UTF-8 fr_CA.UTF-8
-SAME+=		fr_FR.UTF-8 fr_CA.ISO8859-15
-SAME+=		fr_FR.UTF-8 fr_CA.ISO8859-1
-SAME+=		fr_FR.UTF-8 fr_BE.UTF-8
-SAME+=		fr_FR.UTF-8 fr_BE.ISO8859-15
-SAME+=		fr_FR.UTF-8 fr_BE.ISO8859-1
-SAME+=		sr_RS.UTF-8@latin sr_RS.ISO8859-2
-SAME+=		sr_RS.UTF-8@latin sl_SI.UTF-8
-SAME+=		sr_RS.UTF-8@latin sl_SI.ISO8859-2
-SAME+=		sr_RS.UTF-8@latin hr_HR.UTF-8
-SAME+=		sr_RS.UTF-8@latin hr_HR.ISO8859-2
-SAME+=		hu_HU.UTF-8 hu_HU.ISO8859-2
+SAME+=		fr_FR.ISO8859-15 fr_FR.ISO8859-1
+SAME+=		fr_FR.ISO8859-15 fr_CH.ISO8859-15
+SAME+=		fr_FR.ISO8859-15 fr_CH.ISO8859-1
+SAME+=		fr_FR.ISO8859-15 fr_CA.ISO8859-15
+SAME+=		fr_FR.ISO8859-15 fr_CA.ISO8859-1
+SAME+=		fr_FR.ISO8859-15 fr_BE.ISO8859-15
+SAME+=		fr_FR.ISO8859-15 fr_BE.ISO8859-1
+SAME+=		sr_RS.ISO8859-2 sl_SI.ISO8859-2
 SAME+=		is_IS.ISO8859-15 is_IS.ISO8859-1
 SAME+=		it_IT.ISO8859-15 it_IT.ISO8859-1
 SAME+=		it_IT.ISO8859-15 it_CH.ISO8859-15
 SAME+=		it_IT.ISO8859-15 it_CH.ISO8859-1
-SAME+=		it_IT.UTF-8 it_CH.UTF-8
-SAME+=		lt_LT.UTF-8 lt_LT.ISO8859-13
-SAME+=		nb_NO.UTF-8 nb_NO.ISO8859-15
-SAME+=		nb_NO.UTF-8 nb_NO.ISO8859-1
-SAME+=		nn_NO.UTF-8 nn_NO.ISO8859-15
-SAME+=		nn_NO.UTF-8 nn_NO.ISO8859-1
-SAME+=		pl_PL.UTF-8 pl_PL.ISO8859-2
+SAME+=		nb_NO.ISO8859-15 nb_NO.ISO8859-1
+SAME+=		nn_NO.ISO8859-15 nn_NO.ISO8859-15
+SAME+=		nn_NO.ISO8859-15 nn_NO.ISO8859-1
 SAME+=		pt_PT.ISO8859-15 pt_PT.ISO8859-1
 SAME+=		pt_PT.ISO8859-15 pt_BR.ISO8859-1
-SAME+=		pt_PT.UTF-8 pt_BR.UTF-8
-SAME+=		ro_RO.UTF-8 ro_RO.ISO8859-2
-SAME+=		se_NO.UTF-8 se_FI.UTF-8
 SAME+=		zh_CN.GBK zh_CN.GB18030
 SAME+=		zh_CN.GBK zh_CN.eucCN
 SAME+=		ko_KR.eucKR ko_KR.CP949	# legacy (same charset)