MFH r289384-r293170

Sponsored by:	The FreeBSD Foundation

149 files changed, 4066 insertions, 2264 deletions

diff --git a/share/monetdef/Makefile b/share/monetdef/Makefile
index 165e8793e05f..ad0c33cc9e30 100644
--- a/share/monetdef/Makefile
+++ b/share/monetdef/Makefile
@@ -1,146 +1,218 @@
 # $FreeBSD$
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale.
 
-LOCALES=	af_ZA.ISO8859-1 \
-		am_ET.UTF-8 \
-		be_BY.CP1131 \
-		be_BY.CP1251 \
-		be_BY.ISO8859-5 \
-		be_BY.UTF-8 \
-		bg_BG.CP1251 \
-		bg_BG.UTF-8 \
-		ca_ES.ISO8859-1 \
-		ca_ES.UTF-8 \
-		cs_CZ.ISO8859-2 \
-		cs_CZ.UTF-8 \
-		da_DK.ISO8859-1 \
-		de_AT.ISO8859-1 \
-		de_AT.UTF-8 \
-		de_CH.ISO8859-1 \
-		de_DE.ISO8859-1 \
-		de_DE.UTF-8 \
-		el_GR.ISO8859-7 \
-		el_GR.UTF-8 \
-		en_AU.ISO8859-1 \
-		en_CA.ISO8859-1 \
-		en_GB.ISO8859-1 \
-		en_GB.UTF-8 \
-		en_IE.UTF-8 \
-		en_NZ.ISO8859-1 \
-		en_US.ISO8859-1 \
-		es_ES.ISO8859-1 \
-		es_ES.UTF-8 \
-		et_EE.ISO8859-15 \
-		fi_FI.ISO8859-1 \
-		fi_FI.UTF-8 \
-		fr_BE.ISO8859-1 \
-		fr_BE.UTF-8 \
-		fr_CA.ISO8859-1 \
-		fr_FR.ISO8859-1 \
-		fr_FR.UTF-8 \
-		he_IL.UTF-8 \
-		hi_IN.ISCII-DEV \
-		hr_HR.ISO8859-2 \
-		hu_HU.ISO8859-2 \
-		hy_AM.ARMSCII-8 \
-		hy_AM.UTF-8 \
-		is_IS.ISO8859-1 \
-		it_IT.ISO8859-1 \
-		it_IT.UTF-8 \
-		ja_JP.eucJP \
-		ja_JP.UTF-8 \
-		kk_KZ.PT154 \
-		kk_KZ.UTF-8 \
-		ko_KR.eucKR \
-		ko_KR.UTF-8 \
-		lt_LT.ISO8859-13 \
-		lv_LV.ISO8859-13 \
-		mn_MN.UTF-8 \
-		nl_BE.ISO8859-1 \
-		nl_BE.UTF-8 \
-		nl_NL.ISO8859-1 \
-		nl_NL.UTF-8 \
-		no_NO.ISO8859-1 \
-		pl_PL.ISO8859-2 \
-		pl_PL.UTF-8 \
-		pt_BR.ISO8859-1 \
-		pt_PT.ISO8859-1 \
-		pt_PT.ISO8859-15 \
-		pt_PT.UTF-8 \
-		ro_RO.ISO8859-2 \
-		ru_RU.CP1251 \
-		ru_RU.CP866 \
-		ru_RU.ISO8859-5 \
-		ru_RU.KOI8-R \
-		ru_RU.UTF-8 \
-		sk_SK.ISO8859-2 \
-		sl_SI.ISO8859-2 \
-		sr_YU.ISO8859-2 \
-		sr_YU.ISO8859-5 \
-		sr_YU.UTF-8 \
-		sv_SE.ISO8859-1 \
-		tr_TR.ISO8859-9 \
-		uk_UA.CP1251 \
-		uk_UA.ISO8859-5 \
-		uk_UA.KOI8-U \
-		uk_UA.UTF-8 \
-		zh_CN.eucCN \
-		zh_CN.GB18030 \
-		zh_CN.GB2312 \
-		zh_CN.UTF-8 \
-		zh_HK.UTF-8 \
-		zh_TW.Big5
-
-LOCALEDIR=	/usr/share/locale
-
-.SUFFIXES: .src .out
+LOCALEDIR=	${SHAREDIR}/locale
+FILESNAME=	LC_MONETARY
+.SUFFIXES:	.src .out
 
 .src.out:
-	grep -v '^#' < ${.IMPSRC} > ${.TARGET}
+	grep -v -E '^(#$$|#[ ])' < ${.IMPSRC} > ${.TARGET}
 
-FILES=		${LOCALES:S/$/.out/}
-FILESNAME=	LC_MONETARY
+LOCALES+=	am_ET.UTF-8
+LOCALES+=	ar_AE.UTF-8
+LOCALES+=	ar_EG.UTF-8
+LOCALES+=	ar_JO.UTF-8
+LOCALES+=	ar_MA.UTF-8
+LOCALES+=	ar_QA.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+=	bg_BG.UTF-8
+LOCALES+=	cs_CZ.ISO8859-2
+LOCALES+=	cs_CZ.UTF-8
+LOCALES+=	da_DK.UTF-8
+LOCALES+=	de_AT.ISO8859-1
+LOCALES+=	de_AT.ISO8859-15
+LOCALES+=	de_AT.UTF-8
+LOCALES+=	en_AU.UTF-8
+LOCALES+=	en_CA.UTF-8
+LOCALES+=	en_GB.ISO8859-15
+LOCALES+=	en_GB.US-ASCII
+LOCALES+=	en_GB.UTF-8
+LOCALES+=	en_IE.ISO8859-1
+LOCALES+=	en_IE.ISO8859-15
+LOCALES+=	en_IE.UTF-8
+LOCALES+=	en_NZ.UTF-8
+LOCALES+=	en_PH.UTF-8
+LOCALES+=	en_SG.UTF-8
+LOCALES+=	en_US.UTF-8
+LOCALES+=	en_ZA.ISO8859-15
+LOCALES+=	en_ZA.US-ASCII
+LOCALES+=	en_ZA.UTF-8
+LOCALES+=	es_AR.UTF-8
+LOCALES+=	es_CR.UTF-8
+LOCALES+=	es_MX.UTF-8
+LOCALES+=	fr_CA.ISO8859-15
+LOCALES+=	fr_CA.UTF-8
+LOCALES+=	fr_CH.ISO8859-15
+LOCALES+=	fr_CH.UTF-8
+LOCALES+=	he_IL.UTF-8
+LOCALES+=	hi_IN.ISCII-DEV
+LOCALES+=	hi_IN.UTF-8
+LOCALES+=	hr_HR.UTF-8
+LOCALES+=	hu_HU.ISO8859-2
+LOCALES+=	hu_HU.UTF-8
+LOCALES+=	hy_AM.ARMSCII-8
+LOCALES+=	hy_AM.UTF-8
+LOCALES+=	is_IS.UTF-8
+LOCALES+=	it_CH.UTF-8
+LOCALES+=	ja_JP.SJIS
+LOCALES+=	ja_JP.UTF-8
+LOCALES+=	ja_JP.eucJP
+LOCALES+=	kk_Cyrl_KZ.UTF-8
+LOCALES+=	ko_KR.UTF-8
+LOCALES+=	ko_KR.eucKR
+LOCALES+=	lv_LV.ISO8859-13
+LOCALES+=	lv_LV.UTF-8
+LOCALES+=	mn_Cyrl_MN.UTF-8
+LOCALES+=	nb_NO.ISO8859-15
+LOCALES+=	nb_NO.UTF-8
+LOCALES+=	nl_BE.ISO8859-15
+LOCALES+=	nl_NL.ISO8859-1
+LOCALES+=	nl_NL.ISO8859-15
+LOCALES+=	nl_NL.UTF-8
+LOCALES+=	nn_NO.ISO8859-15
+LOCALES+=	pl_PL.ISO8859-2
+LOCALES+=	pl_PL.UTF-8
+LOCALES+=	pt_BR.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.UTF-8
+LOCALES+=	sl_SI.ISO8859-2
+LOCALES+=	sl_SI.UTF-8
+LOCALES+=	sr_Latn_RS.UTF-8
+LOCALES+=	sv_FI.ISO8859-1
+LOCALES+=	sv_FI.ISO8859-15
+LOCALES+=	sv_FI.UTF-8
+LOCALES+=	sv_SE.ISO8859-15
+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_Hans_CN.GB2312
+LOCALES+=	zh_Hans_CN.GBK
+LOCALES+=	zh_Hans_CN.UTF-8
+LOCALES+=	zh_Hans_CN.eucCN
+LOCALES+=	zh_Hant_HK.UTF-8
+LOCALES+=	zh_Hant_TW.Big5
+LOCALES+=	zh_Hant_TW.UTF-8
 
-.for lang in ${LOCALES}
-FILESDIR_${lang}.out= ${LOCALEDIR}/${lang}
-.endfor
+SAME+=		en_ZA.ISO8859-15 en_ZA.ISO8859-1
+SAME+=		en_ZA.ISO8859-15 af_ZA.ISO8859-15
+SAME+=		en_ZA.ISO8859-15 af_ZA.ISO8859-1
+SAME+=		en_ZA.UTF-8 af_ZA.UTF-8
+SAME+=		sl_SI.ISO8859-2 nl_BE.ISO8859-1
+SAME+=		sl_SI.ISO8859-2 it_IT.ISO8859-1
+SAME+=		sl_SI.ISO8859-2 fr_BE.ISO8859-1
+SAME+=		sl_SI.ISO8859-2 eu_ES.ISO8859-1
+SAME+=		sl_SI.ISO8859-2 es_ES.ISO8859-1
+SAME+=		sl_SI.ISO8859-2 de_DE.ISO8859-1
+SAME+=		sl_SI.ISO8859-2 ca_IT.ISO8859-1
+SAME+=		sl_SI.ISO8859-2 ca_FR.ISO8859-1
+SAME+=		sl_SI.ISO8859-2 ca_ES.ISO8859-1
+SAME+=		sl_SI.ISO8859-2 ca_AD.ISO8859-1
+SAME+=		nl_BE.ISO8859-15 it_IT.ISO8859-15
+SAME+=		nl_BE.ISO8859-15 fr_BE.ISO8859-15
+SAME+=		nl_BE.ISO8859-15 eu_ES.ISO8859-15
+SAME+=		nl_BE.ISO8859-15 es_ES.ISO8859-15
+SAME+=		nl_BE.ISO8859-15 el_GR.ISO8859-7
+SAME+=		nl_BE.ISO8859-15 de_DE.ISO8859-15
+SAME+=		nl_BE.ISO8859-15 ca_IT.ISO8859-15
+SAME+=		nl_BE.ISO8859-15 ca_FR.ISO8859-15
+SAME+=		nl_BE.ISO8859-15 ca_ES.ISO8859-15
+SAME+=		nl_BE.ISO8859-15 ca_AD.ISO8859-15
+SAME+=		sl_SI.UTF-8 nl_BE.UTF-8
+SAME+=		sl_SI.UTF-8 it_IT.UTF-8
+SAME+=		sl_SI.UTF-8 fr_BE.UTF-8
+SAME+=		sl_SI.UTF-8 eu_ES.UTF-8
+SAME+=		sl_SI.UTF-8 es_ES.UTF-8
+SAME+=		sl_SI.UTF-8 el_GR.UTF-8
+SAME+=		sl_SI.UTF-8 de_DE.UTF-8
+SAME+=		sl_SI.UTF-8 ca_IT.UTF-8
+SAME+=		sl_SI.UTF-8 ca_FR.UTF-8
+SAME+=		sl_SI.UTF-8 ca_ES.UTF-8
+SAME+=		sl_SI.UTF-8 ca_AD.UTF-8
+SAME+=		da_DK.UTF-8 da_DK.ISO8859-15
+SAME+=		da_DK.UTF-8 da_DK.ISO8859-1
+SAME+=		it_CH.UTF-8 it_CH.ISO8859-15
+SAME+=		it_CH.UTF-8 it_CH.ISO8859-1
+SAME+=		it_CH.UTF-8 de_CH.UTF-8
+SAME+=		it_CH.UTF-8 de_CH.ISO8859-15
+SAME+=		it_CH.UTF-8 de_CH.ISO8859-1
+SAME+=		en_AU.UTF-8 en_AU.US-ASCII
+SAME+=		en_AU.UTF-8 en_AU.ISO8859-15
+SAME+=		en_AU.UTF-8 en_AU.ISO8859-1
+SAME+=		en_CA.UTF-8 en_CA.US-ASCII
+SAME+=		en_CA.UTF-8 en_CA.ISO8859-15
+SAME+=		en_CA.UTF-8 en_CA.ISO8859-1
+SAME+=		en_GB.ISO8859-15 en_GB.ISO8859-1
+SAME+=		zh_Hant_HK.UTF-8 zh_Hant_HK.Big5HKSCS
+SAME+=		zh_Hant_HK.UTF-8 en_HK.UTF-8
+SAME+=		zh_Hant_HK.UTF-8 en_HK.ISO8859-1
+SAME+=		en_NZ.UTF-8 en_NZ.US-ASCII
+SAME+=		en_NZ.UTF-8 en_NZ.ISO8859-15
+SAME+=		en_NZ.UTF-8 en_NZ.ISO8859-1
+SAME+=		en_SG.UTF-8 en_SG.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+=		es_AR.UTF-8 es_AR.ISO8859-1
+SAME+=		es_MX.UTF-8 es_MX.ISO8859-1
+SAME+=		sv_FI.ISO8859-1 sk_SK.ISO8859-2
+SAME+=		sv_FI.ISO8859-1 pt_PT.ISO8859-1
+SAME+=		sv_FI.ISO8859-1 lt_LT.ISO8859-13
+SAME+=		sv_FI.ISO8859-1 fr_FR.ISO8859-1
+SAME+=		sv_FI.ISO8859-1 fi_FI.ISO8859-1
+SAME+=		sv_FI.ISO8859-1 et_EE.ISO8859-1
+SAME+=		sv_FI.ISO8859-15 pt_PT.ISO8859-15
+SAME+=		sv_FI.ISO8859-15 fr_FR.ISO8859-15
+SAME+=		sv_FI.ISO8859-15 fi_FI.ISO8859-15
+SAME+=		sv_FI.ISO8859-15 et_EE.ISO8859-15
+SAME+=		sk_SK.UTF-8 pt_PT.UTF-8
+SAME+=		sk_SK.UTF-8 fr_FR.UTF-8
+SAME+=		sk_SK.UTF-8 et_EE.UTF-8
+SAME+=		sv_FI.UTF-8 se_FI.UTF-8
+SAME+=		sv_FI.UTF-8 lt_LT.UTF-8
+SAME+=		sv_FI.UTF-8 fi_FI.UTF-8
+SAME+=		fr_CA.ISO8859-15 fr_CA.ISO8859-1
+SAME+=		fr_CH.ISO8859-15 fr_CH.ISO8859-1
+SAME+=		hr_HR.UTF-8 hr_HR.ISO8859-2
+SAME+=		is_IS.UTF-8 is_IS.ISO8859-15
+SAME+=		is_IS.UTF-8 is_IS.ISO8859-1
+SAME+=		nb_NO.ISO8859-15 nb_NO.ISO8859-1
+SAME+=		nn_NO.ISO8859-15 nn_NO.ISO8859-1
+SAME+=		se_NO.UTF-8 nn_NO.UTF-8
+SAME+=		pt_BR.UTF-8 pt_BR.ISO8859-1
+SAME+=		ro_RO.UTF-8 ro_RO.ISO8859-2
+SAME+=		sr_Latn_RS.UTF-8 sr_Latn_RS.ISO8859-2
+SAME+=		sr_Latn_RS.UTF-8 sr_Cyrl_RS.UTF-8
+SAME+=		sr_Latn_RS.UTF-8 sr_Cyrl_RS.ISO8859-5
+SAME+=		sv_SE.ISO8859-15 sv_SE.ISO8859-1
+SAME+=		zh_Hans_CN.GBK zh_Hans_CN.GB18030
+SAME+=		ko_KR.eucKR ko_KR.CP949	# legacy (same charset)
 
+FILES=		${LOCALES:S/$/.out/}
 CLEANFILES=	${FILES}
 
-ENCODINGS=	Big5 Big5HKSCS CP949 eucJP eucKR GB2312 GBK \
-		ISO8859-1 ISO8859-2 ISO8859-4 ISO8859-7 ISO8859-9 \
-		ISO8859-13 ISO8859-15 SJIS US-ASCII UTF-8
-
-Big5_UTF-8=	zh_TW
-eucJP_SJIS=	ja_JP
-eucKR_CP949=	ko_KR
-GB2312_GBK=	zh_CN
-ISO8859-1_ISO8859-1= ca_ES:ca_AD ca_ES:ca_FR ca_ES:ca_IT es_ES:eu_ES \
-		de_CH:fr_CH de_CH:it_CH no_NO:nb_NO no_NO:nn_NO
-ISO8859-1_ISO8859-15= af_ZA ca_AD ca_ES ca_FR ca_IT da_DK de_AT de_CH de_DE \
-		en_AU en_CA en_GB en_NZ en_US es_ES \
-		fi_FI fr_BE fr_CA fr_CH fr_FR \
-		is_IS it_IT it_CH nl_BE nl_NL nb_NO nn_NO no_NO sv_SE
-ISO8859-1_US-ASCII= en_AU en_CA en_GB en_NZ en_US
-ISO8859-1_UTF-8= af_ZA da_DK de_CH en_AU en_CA en_NZ en_US \
-		fr_CA is_IS nb_NO nn_NO no_NO pt_BR sv_SE
-ISO8859-2_UTF-8= hr_HR hu_HU ro_RO sk_SK sl_SI
-ISO8859-9_UTF-8= tr_TR
-ISO8859-13_ISO8859-4= lt_LT
-ISO8859-13_UTF-8= lt_LT lv_LV
-ISO8859-15_ISO8859-15= es_ES:eu_ES
-ISO8859-15_UTF-8= et_EE
-UTF-8_Big5HKSCS= zh_HK
-UTF-8_UTF-8=	ca_ES:ca_AD ca_ES:ca_FR ca_ES:ca_IT \
-		es_ES:eu_ES de_CH:fr_CH de_CH:it_CH
-
-SYMLINKS=
-.for enc1 in ${ENCODINGS}
-.for enc2 in ${ENCODINGS}
-.for lang_terr in ${${enc1}_${enc2}}
-SYMLINKS+=	../${lang_terr:C/:.*$//}.${enc1}/${FILESNAME} \
-		${LOCALEDIR}/${lang_terr:C/^.*://}.${enc2}/${FILESNAME}
-.endfor
+.for f t in ${SAME}
+SYMLINKS+=	../$f/${FILESNAME} \
+    ${LOCALEDIR}/$t/${FILESNAME}
 .endfor
+
+.for f in ${LOCALES}
+FILESDIR_${f}.out= ${LOCALEDIR}/${f}
 .endfor
 
 .include <bsd.prog.mk>
diff --git a/share/monetdef/af_ZA.ISO8859-1.src b/share/monetdef/af_ZA.ISO8859-1.src
deleted file mode 100644
index 4a17750e0a0f..000000000000
--- a/share/monetdef/af_ZA.ISO8859-1.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-ZAR 
-# currency_symbol
-R
-# mon_decimal_point
-,
-# mon_thousands_sep
-.
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-2
-# frac_digits
-2
-# p_cs_precedes
-1
-# p_sep_by_space
-0
-# n_cs_precedes
-1
-# n_sep_by_space
-0
-# p_sign_posn
-1
-# n_sign_posn
-1
-# EOF
diff --git a/share/monetdef/am_ET.UTF-8.src b/share/monetdef/am_ET.UTF-8.src
index dfabaec0e553..ab4fd623f467 100644
--- a/share/monetdef/am_ET.UTF-8.src
+++ b/share/monetdef/am_ET.UTF-8.src
@@ -1,36 +1,50 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
 #
 # int_curr_symbol (last character always SPACE)
 ETB 
+#
 # currency_symbol
-$
+ብር
+#
 # mon_decimal_point
 .
+#
 # mon_thousands_sep
 ,
-# mon_grouping, separated by ;
-3;3
+#
+# mon_grouping
+3
+#
 # positive_sign
 
+#
 # negative_sign
 -
+#
 # int_frac_digits
 2
+#
 # frac_digits
 2
+#
 # p_cs_precedes
 1
+#
 # p_sep_by_space
 0
+#
 # n_cs_precedes
 1
+#
 # n_sep_by_space
 0
+#
 # p_sign_posn
 1
+#
 # n_sign_posn
 1
 # EOF
diff --git a/share/monetdef/ar_AE.UTF-8.src b/share/monetdef/ar_AE.UTF-8.src
new file mode 100644
index 000000000000..ce1043b930eb
--- /dev/null
+++ b/share/monetdef/ar_AE.UTF-8.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+AED 
+#
+# currency_symbol
+د.إ.‏
+#
+# mon_decimal_point
+٫
+#
+# mon_thousands_sep
+٬
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+‏-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+1
+#
+# p_sep_by_space
+1
+#
+# n_cs_precedes
+1
+#
+# n_sep_by_space
+1
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/ar_EG.UTF-8.src b/share/monetdef/ar_EG.UTF-8.src
new file mode 100644
index 000000000000..3cb4abb48dc6
--- /dev/null
+++ b/share/monetdef/ar_EG.UTF-8.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+EGP 
+#
+# currency_symbol
+ج.م.‏
+#
+# mon_decimal_point
+٫
+#
+# mon_thousands_sep
+٬
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+‏-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+1
+#
+# p_sep_by_space
+1
+#
+# n_cs_precedes
+1
+#
+# n_sep_by_space
+1
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/ar_JO.UTF-8.src b/share/monetdef/ar_JO.UTF-8.src
new file mode 100644
index 000000000000..86ed0194fccb
--- /dev/null
+++ b/share/monetdef/ar_JO.UTF-8.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+JOD 
+#
+# currency_symbol
+د.أ.‏
+#
+# mon_decimal_point
+٫
+#
+# mon_thousands_sep
+٬
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+‏-
+#
+# int_frac_digits
+3
+#
+# frac_digits
+3
+#
+# p_cs_precedes
+1
+#
+# p_sep_by_space
+1
+#
+# n_cs_precedes
+1
+#
+# n_sep_by_space
+1
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/ar_MA.UTF-8.src b/share/monetdef/ar_MA.UTF-8.src
new file mode 100644
index 000000000000..40922c9aba42
--- /dev/null
+++ b/share/monetdef/ar_MA.UTF-8.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+MAD 
+#
+# currency_symbol
+د.م.‏
+#
+# mon_decimal_point
+,
+#
+# mon_thousands_sep
+.
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+‎-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+1
+#
+# p_sep_by_space
+1
+#
+# n_cs_precedes
+1
+#
+# n_sep_by_space
+1
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/ar_QA.UTF-8.src b/share/monetdef/ar_QA.UTF-8.src
new file mode 100644
index 000000000000..ad4f18e2267c
--- /dev/null
+++ b/share/monetdef/ar_QA.UTF-8.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+QAR 
+#
+# currency_symbol
+ر.ق.‏
+#
+# mon_decimal_point
+٫
+#
+# mon_thousands_sep
+٬
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+‏-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+1
+#
+# p_sep_by_space
+1
+#
+# n_cs_precedes
+1
+#
+# n_sep_by_space
+1
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/ar_SA.UTF-8.src b/share/monetdef/ar_SA.UTF-8.src
new file mode 100644
index 000000000000..4aaf87585675
--- /dev/null
+++ b/share/monetdef/ar_SA.UTF-8.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+SAR 
+#
+# currency_symbol
+ر.س.‏
+#
+# mon_decimal_point
+٫
+#
+# mon_thousands_sep
+٬
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+‏-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+1
+#
+# p_sep_by_space
+1
+#
+# n_cs_precedes
+1
+#
+# n_sep_by_space
+1
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/be_BY.CP1131.src b/share/monetdef/be_BY.CP1131.src
index a39e5f30d514..380ee34ffa6e 100644
--- a/share/monetdef/be_BY.CP1131.src
+++ b/share/monetdef/be_BY.CP1131.src
@@ -1,35 +1,50 @@
-# $FreeBSD$
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
 #
 # int_curr_symbol (last character always SPACE)
 BYR 
+#
 # currency_symbol
-��.
+�.
+#
 # mon_decimal_point
 ,
+#
 # mon_thousands_sep
- 
+�
+#
 # mon_grouping
-3;3
+3
+#
 # positive_sign
 
+#
 # negative_sign
 -
+#
 # int_frac_digits
-2
+0
+#
 # frac_digits
-2
-# p_cs_precedes
 0
-# p_sep_by_space
+#
+# p_cs_precedes
 1
-# n_cs_precedes
+#
+# p_sep_by_space
 0
-# n_sep_by_space
+#
+# n_cs_precedes
 1
+#
+# n_sep_by_space
+0
+#
 # p_sign_posn
 1
+#
 # n_sign_posn
 1
 # EOF
diff --git a/share/monetdef/be_BY.CP1251.src b/share/monetdef/be_BY.CP1251.src
index ec4f95f63b1d..e8d96d858771 100644
--- a/share/monetdef/be_BY.CP1251.src
+++ b/share/monetdef/be_BY.CP1251.src
@@ -1,35 +1,50 @@
-# $FreeBSD$
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
 #
 # int_curr_symbol (last character always SPACE)
 BYR 
+#
 # currency_symbol
-���.
+�.
+#
 # mon_decimal_point
 ,
+#
 # mon_thousands_sep
- 
+�
+#
 # mon_grouping
-3;3
+3
+#
 # positive_sign
 
+#
 # negative_sign
 -
+#
 # int_frac_digits
-2
+0
+#
 # frac_digits
-2
-# p_cs_precedes
 0
-# p_sep_by_space
+#
+# p_cs_precedes
 1
-# n_cs_precedes
+#
+# p_sep_by_space
 0
-# n_sep_by_space
+#
+# n_cs_precedes
 1
+#
+# n_sep_by_space
+0
+#
 # p_sign_posn
 1
+#
 # n_sign_posn
 1
 # EOF
diff --git a/share/monetdef/be_BY.ISO8859-5.src b/share/monetdef/be_BY.ISO8859-5.src
index e49691c93c3f..767477a25865 100644
--- a/share/monetdef/be_BY.ISO8859-5.src
+++ b/share/monetdef/be_BY.ISO8859-5.src
@@ -1,35 +1,50 @@
-# $FreeBSD$
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
 #
 # int_curr_symbol (last character always SPACE)
 BYR 
+#
 # currency_symbol
-���.
+�.
+#
 # mon_decimal_point
 ,
+#
 # mon_thousands_sep
- 
+�
+#
 # mon_grouping
-3;3
+3
+#
 # positive_sign
 
+#
 # negative_sign
 -
+#
 # int_frac_digits
-2
+0
+#
 # frac_digits
-2
-# p_cs_precedes
 0
-# p_sep_by_space
+#
+# p_cs_precedes
 1
-# n_cs_precedes
+#
+# p_sep_by_space
 0
-# n_sep_by_space
+#
+# n_cs_precedes
 1
+#
+# n_sep_by_space
+0
+#
 # p_sign_posn
 1
+#
 # n_sign_posn
 1
 # EOF
diff --git a/share/monetdef/be_BY.UTF-8.src b/share/monetdef/be_BY.UTF-8.src
index a103547f787d..d9bdb99c7b35 100644
--- a/share/monetdef/be_BY.UTF-8.src
+++ b/share/monetdef/be_BY.UTF-8.src
@@ -1,35 +1,50 @@
-# $FreeBSD$
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
 #
 # int_curr_symbol (last character always SPACE)
 BYR 
+#
 # currency_symbol
-руб.
+р.
+#
 # mon_decimal_point
 ,
+#
 # mon_thousands_sep
- 
+ 
+#
 # mon_grouping
-3;3
+3
+#
 # positive_sign
 
+#
 # negative_sign
 -
+#
 # int_frac_digits
-2
+0
+#
 # frac_digits
-2
-# p_cs_precedes
 0
-# p_sep_by_space
+#
+# p_cs_precedes
 1
-# n_cs_precedes
+#
+# p_sep_by_space
 0
-# n_sep_by_space
+#
+# n_cs_precedes
 1
+#
+# n_sep_by_space
+0
+#
 # p_sign_posn
 1
+#
 # n_sign_posn
 1
 # EOF
diff --git a/share/monetdef/bg_BG.CP1251.src b/share/monetdef/bg_BG.CP1251.src
index 4d8efffa438d..e4ea1c59bf65 100644
--- a/share/monetdef/bg_BG.CP1251.src
+++ b/share/monetdef/bg_BG.CP1251.src
@@ -1,36 +1,50 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
 #
 # int_curr_symbol (last character always SPACE)
 BGN 
+#
 # currency_symbol
 ��.
+#
 # mon_decimal_point
 ,
+#
 # mon_thousands_sep
- 
+�
+#
 # mon_grouping
-3;3
+3
+#
 # positive_sign
 
+#
 # negative_sign
 -
+#
 # int_frac_digits
 2
+#
 # frac_digits
 2
+#
 # p_cs_precedes
 0
+#
 # p_sep_by_space
 1
+#
 # n_cs_precedes
 0
+#
 # n_sep_by_space
 1
+#
 # p_sign_posn
 1
+#
 # n_sign_posn
 1
 # EOF
diff --git a/share/monetdef/bg_BG.UTF-8.src b/share/monetdef/bg_BG.UTF-8.src
index be1d6882f18d..0aca5c3336d5 100644
--- a/share/monetdef/bg_BG.UTF-8.src
+++ b/share/monetdef/bg_BG.UTF-8.src
@@ -1,36 +1,50 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
 #
 # int_curr_symbol (last character always SPACE)
 BGN 
+#
 # currency_symbol
 лв.
+#
 # mon_decimal_point
 ,
+#
 # mon_thousands_sep
- 
+ 
+#
 # mon_grouping
-3;3
+3
+#
 # positive_sign
 
+#
 # negative_sign
 -
+#
 # int_frac_digits
 2
+#
 # frac_digits
 2
+#
 # p_cs_precedes
 0
+#
 # p_sep_by_space
 1
+#
 # n_cs_precedes
 0
+#
 # n_sep_by_space
 1
+#
 # p_sign_posn
 1
+#
 # n_sign_posn
 1
 # EOF
diff --git a/share/monetdef/ca_ES.ISO8859-1.src b/share/monetdef/ca_ES.ISO8859-1.src
deleted file mode 100644
index c6b2a13345b9..000000000000
--- a/share/monetdef/ca_ES.ISO8859-1.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-EUR 
-# currency_symbol
-Eu
-# mon_decimal_point
-,
-# mon_thousands_sep
-.
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-0
-# frac_digits
-0
-# p_cs_precedes
-1
-# p_sep_by_space
-1
-# n_cs_precedes
-1
-# n_sep_by_space
-1
-# p_sign_posn
-1
-# n_sign_posn
-1
-# EOF
diff --git a/share/monetdef/ca_ES.UTF-8.src b/share/monetdef/ca_ES.UTF-8.src
deleted file mode 100644
index 4c6c7ff725b2..000000000000
--- a/share/monetdef/ca_ES.UTF-8.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-EUR 
-# currency_symbol
-€
-# mon_decimal_point
-,
-# mon_thousands_sep
-.
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-0
-# frac_digits
-0
-# p_cs_precedes
-1
-# p_sep_by_space
-1
-# n_cs_precedes
-1
-# n_sep_by_space
-1
-# p_sign_posn
-1
-# n_sign_posn
-1
-# EOF
diff --git a/share/monetdef/cs_CZ.ISO8859-2.src b/share/monetdef/cs_CZ.ISO8859-2.src
index 2ca0f33b8f6b..1157dc869f09 100644
--- a/share/monetdef/cs_CZ.ISO8859-2.src
+++ b/share/monetdef/cs_CZ.ISO8859-2.src
@@ -1,36 +1,50 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
 #
 # int_curr_symbol (last character always SPACE)
 CZK 
+#
 # currency_symbol
 K�
+#
 # mon_decimal_point
 ,
+#
 # mon_thousands_sep
- 
+�
+#
 # mon_grouping
-3;3
+3
+#
 # positive_sign
 
+#
 # negative_sign
 -
+#
 # int_frac_digits
 2
+#
 # frac_digits
 2
+#
 # p_cs_precedes
 0
+#
 # p_sep_by_space
 1
+#
 # n_cs_precedes
 0
+#
 # n_sep_by_space
 1
+#
 # p_sign_posn
 1
+#
 # n_sign_posn
 1
 # EOF
diff --git a/share/monetdef/cs_CZ.UTF-8.src b/share/monetdef/cs_CZ.UTF-8.src
index cc10a621212e..a4e4d498b120 100644
--- a/share/monetdef/cs_CZ.UTF-8.src
+++ b/share/monetdef/cs_CZ.UTF-8.src
@@ -1,36 +1,50 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
 #
 # int_curr_symbol (last character always SPACE)
 CZK 
+#
 # currency_symbol
 Kč
+#
 # mon_decimal_point
 ,
+#
 # mon_thousands_sep
- 
+ 
+#
 # mon_grouping
-3;3
+3
+#
 # positive_sign
 
+#
 # negative_sign
 -
+#
 # int_frac_digits
 2
+#
 # frac_digits
 2
+#
 # p_cs_precedes
 0
+#
 # p_sep_by_space
 1
+#
 # n_cs_precedes
 0
+#
 # n_sep_by_space
 1
+#
 # p_sign_posn
 1
+#
 # n_sign_posn
 1
 # EOF
diff --git a/share/monetdef/da_DK.ISO8859-1.src b/share/monetdef/da_DK.ISO8859-1.src
deleted file mode 100644
index a18b4cb4b014..000000000000
--- a/share/monetdef/da_DK.ISO8859-1.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-DKK 
-# currency_symbol
-kr
-# mon_decimal_point
-,
-# mon_thousands_sep
-.
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-2
-# frac_digits
-2
-# p_cs_precedes
-1
-# p_sep_by_space
-2
-# n_cs_precedes
-1
-# n_sep_by_space
-2
-# p_sign_posn
-4
-# n_sign_posn
-4
-# EOF
diff --git a/share/monetdef/da_DK.UTF-8.src b/share/monetdef/da_DK.UTF-8.src
new file mode 100644
index 000000000000..3985d4b6b8d1
--- /dev/null
+++ b/share/monetdef/da_DK.UTF-8.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+DKK 
+#
+# currency_symbol
+kr.
+#
+# mon_decimal_point
+,
+#
+# mon_thousands_sep
+.
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+0
+#
+# p_sep_by_space
+1
+#
+# n_cs_precedes
+0
+#
+# n_sep_by_space
+1
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/de_AT.ISO8859-1.src b/share/monetdef/de_AT.ISO8859-1.src
index 63f77740326f..2fc7d4586520 100644
--- a/share/monetdef/de_AT.ISO8859-1.src
+++ b/share/monetdef/de_AT.ISO8859-1.src
@@ -1,36 +1,50 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
 #
 # int_curr_symbol (last character always SPACE)
 EUR 
+#
 # currency_symbol
 Eu
+#
 # mon_decimal_point
 ,
+#
 # mon_thousands_sep
- 
-# mon_grouping, separated by ;
-3;3
+.
+#
+# mon_grouping
+3
+#
 # positive_sign
 
+#
 # negative_sign
 -
+#
 # int_frac_digits
 2
+#
 # frac_digits
 2
+#
 # p_cs_precedes
 1
+#
 # p_sep_by_space
 1
+#
 # n_cs_precedes
 1
+#
 # n_sep_by_space
 1
+#
 # p_sign_posn
 1
+#
 # n_sign_posn
 1
 # EOF
diff --git a/share/monetdef/de_AT.ISO8859-15.src b/share/monetdef/de_AT.ISO8859-15.src
new file mode 100644
index 000000000000..54f270eb63a7
--- /dev/null
+++ b/share/monetdef/de_AT.ISO8859-15.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+EUR 
+#
+# currency_symbol
+�
+#
+# mon_decimal_point
+,
+#
+# mon_thousands_sep
+.
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+1
+#
+# p_sep_by_space
+1
+#
+# n_cs_precedes
+1
+#
+# n_sep_by_space
+1
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/de_AT.UTF-8.src b/share/monetdef/de_AT.UTF-8.src
index 00da141f1bdb..a3021cfe7330 100644
--- a/share/monetdef/de_AT.UTF-8.src
+++ b/share/monetdef/de_AT.UTF-8.src
@@ -1,36 +1,50 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
 #
 # int_curr_symbol (last character always SPACE)
 EUR 
+#
 # currency_symbol
 €
+#
 # mon_decimal_point
 ,
+#
 # mon_thousands_sep
- 
-# mon_grouping, separated by ;
-3;3
+.
+#
+# mon_grouping
+3
+#
 # positive_sign
 
+#
 # negative_sign
 -
+#
 # int_frac_digits
 2
+#
 # frac_digits
 2
+#
 # p_cs_precedes
 1
+#
 # p_sep_by_space
 1
+#
 # n_cs_precedes
 1
+#
 # n_sep_by_space
 1
+#
 # p_sign_posn
 1
+#
 # n_sign_posn
 1
 # EOF
diff --git a/share/monetdef/de_CH.ISO8859-1.src b/share/monetdef/de_CH.ISO8859-1.src
deleted file mode 100644
index d07e97ca7124..000000000000
--- a/share/monetdef/de_CH.ISO8859-1.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-CHF 
-# currency_symbol
-Fr.
-# mon_decimal_point
-.
-# mon_thousands_sep
-'
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-2
-# frac_digits
-2
-# p_cs_precedes
-1
-# p_sep_by_space
-1
-# n_cs_precedes
-1
-# n_sep_by_space
-1
-# p_sign_posn
-4
-# n_sign_posn
-4
-# EOF
diff --git a/share/monetdef/de_DE.ISO8859-1.src b/share/monetdef/de_DE.ISO8859-1.src
deleted file mode 100644
index c95cd1e9612f..000000000000
--- a/share/monetdef/de_DE.ISO8859-1.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-EUR 
-# currency_symbol
-Eu
-# mon_decimal_point
-,
-# mon_thousands_sep
-.
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-2
-# frac_digits
-2
-# p_cs_precedes
-1
-# p_sep_by_space
-0
-# n_cs_precedes
-1
-# n_sep_by_space
-0
-# p_sign_posn
-1
-# n_sign_posn
-1
-# EOF
diff --git a/share/monetdef/de_DE.UTF-8.src b/share/monetdef/de_DE.UTF-8.src
deleted file mode 100644
index 42179e16a1ba..000000000000
--- a/share/monetdef/de_DE.UTF-8.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-EUR 
-# currency_symbol
-€
-# mon_decimal_point
-,
-# mon_thousands_sep
-.
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-2
-# frac_digits
-2
-# p_cs_precedes
-1
-# p_sep_by_space
-0
-# n_cs_precedes
-1
-# n_sep_by_space
-0
-# p_sign_posn
-1
-# n_sign_posn
-1
-# EOF
diff --git a/share/monetdef/en_AU.ISO8859-1.src b/share/monetdef/en_AU.ISO8859-1.src
deleted file mode 100644
index 32c429836410..000000000000
--- a/share/monetdef/en_AU.ISO8859-1.src
+++ /dev/null
@@ -1,48 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-AUD 
-# currency_symbol
-$
-# mon_decimal_point
-.
-# mon_thousands_sep
-,
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-2
-# frac_digits
-2
-# p_cs_precedes
-1
-# p_sep_by_space
-0
-# n_cs_precedes
-1
-# n_sep_by_space
-0
-# p_sign_posn
-1
-# n_sign_posn
-1
-# int_p_cs_precedes
-1
-# int_n_cs_precedes;
-1
-# int_p_sep_by_space;
-0
-# int_n_sep_by_space;
-0
-# int_p_sign_posn;
-1
-# int_n_sign_posn;
-1
-# EOF
diff --git a/share/monetdef/en_AU.UTF-8.src b/share/monetdef/en_AU.UTF-8.src
new file mode 100644
index 000000000000..d575632f51a4
--- /dev/null
+++ b/share/monetdef/en_AU.UTF-8.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+AUD 
+#
+# currency_symbol
+$
+#
+# mon_decimal_point
+.
+#
+# mon_thousands_sep
+,
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+1
+#
+# p_sep_by_space
+0
+#
+# n_cs_precedes
+1
+#
+# n_sep_by_space
+0
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/en_CA.ISO8859-1.src b/share/monetdef/en_CA.ISO8859-1.src
deleted file mode 100644
index 75e31f60cc5d..000000000000
--- a/share/monetdef/en_CA.ISO8859-1.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-CAD 
-# currency_symbol
-$
-# mon_decimal_point
-.
-# mon_thousands_sep
-,
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-2
-# frac_digits
-2
-# p_cs_precedes
-1
-# p_sep_by_space
-0
-# n_cs_precedes
-1
-# n_sep_by_space
-0
-# p_sign_posn
-1
-# n_sign_posn
-1
-# EOF
diff --git a/share/monetdef/en_CA.UTF-8.src b/share/monetdef/en_CA.UTF-8.src
new file mode 100644
index 000000000000..c5ccb89feec3
--- /dev/null
+++ b/share/monetdef/en_CA.UTF-8.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+CAD 
+#
+# currency_symbol
+$
+#
+# mon_decimal_point
+.
+#
+# mon_thousands_sep
+,
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+1
+#
+# p_sep_by_space
+0
+#
+# n_cs_precedes
+1
+#
+# n_sep_by_space
+0
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/en_GB.ISO8859-1.src b/share/monetdef/en_GB.ISO8859-1.src
deleted file mode 100644
index a0472d307968..000000000000
--- a/share/monetdef/en_GB.ISO8859-1.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-GBP 
-# currency_symbol
-�
-# mon_decimal_point
-.
-# mon_thousands_sep
-,
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-2
-# frac_digits
-2
-# p_cs_precedes
-1
-# p_sep_by_space
-0
-# n_cs_precedes
-1
-# n_sep_by_space
-0
-# p_sign_posn
-1
-# n_sign_posn
-1
-# EOF
diff --git a/share/monetdef/en_GB.ISO8859-15.src b/share/monetdef/en_GB.ISO8859-15.src
new file mode 100644
index 000000000000..869ddf754511
--- /dev/null
+++ b/share/monetdef/en_GB.ISO8859-15.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+GBP 
+#
+# currency_symbol
+�
+#
+# mon_decimal_point
+.
+#
+# mon_thousands_sep
+,
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+1
+#
+# p_sep_by_space
+0
+#
+# n_cs_precedes
+1
+#
+# n_sep_by_space
+0
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/en_GB.US-ASCII.src b/share/monetdef/en_GB.US-ASCII.src
new file mode 100644
index 000000000000..b9e88de73fa5
--- /dev/null
+++ b/share/monetdef/en_GB.US-ASCII.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+GBP 
+#
+# currency_symbol
+GBP
+#
+# mon_decimal_point
+.
+#
+# mon_thousands_sep
+,
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+1
+#
+# p_sep_by_space
+0
+#
+# n_cs_precedes
+1
+#
+# n_sep_by_space
+0
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/en_GB.UTF-8.src b/share/monetdef/en_GB.UTF-8.src
index e187d8c0cee3..73f2f42a0e7e 100644
--- a/share/monetdef/en_GB.UTF-8.src
+++ b/share/monetdef/en_GB.UTF-8.src
@@ -1,36 +1,50 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
 #
 # int_curr_symbol (last character always SPACE)
 GBP 
+#
 # currency_symbol
 £
+#
 # mon_decimal_point
 .
+#
 # mon_thousands_sep
 ,
-# mon_grouping, separated by ;
-3;3
+#
+# mon_grouping
+3
+#
 # positive_sign
 
+#
 # negative_sign
 -
+#
 # int_frac_digits
 2
+#
 # frac_digits
 2
+#
 # p_cs_precedes
 1
+#
 # p_sep_by_space
 0
+#
 # n_cs_precedes
 1
+#
 # n_sep_by_space
 0
+#
 # p_sign_posn
 1
+#
 # n_sign_posn
 1
 # EOF
diff --git a/share/monetdef/el_GR.ISO8859-7.src b/share/monetdef/en_IE.ISO8859-1.src
index 8b1a9a503a5a..0f45ca65a815 100644
--- a/share/monetdef/el_GR.ISO8859-7.src
+++ b/share/monetdef/en_IE.ISO8859-1.src
@@ -1,36 +1,50 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
 #
 # int_curr_symbol (last character always SPACE)
 EUR 
+#
 # currency_symbol
 Eu
+#
 # mon_decimal_point
-,
-# mon_thousands_sep
 .
+#
+# mon_thousands_sep
+,
+#
 # mon_grouping
-3;3
+3
+#
 # positive_sign
 
+#
 # negative_sign
 -
+#
 # int_frac_digits
 2
+#
 # frac_digits
 2
+#
 # p_cs_precedes
-0
-# p_sep_by_space
 1
-# n_cs_precedes
+#
+# p_sep_by_space
 0
-# n_sep_by_space
+#
+# n_cs_precedes
 1
+#
+# n_sep_by_space
+0
+#
 # p_sign_posn
 1
+#
 # n_sign_posn
 1
 # EOF
diff --git a/share/monetdef/en_IE.ISO8859-15.src b/share/monetdef/en_IE.ISO8859-15.src
new file mode 100644
index 000000000000..81d1443a31fd
--- /dev/null
+++ b/share/monetdef/en_IE.ISO8859-15.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+EUR 
+#
+# currency_symbol
+�
+#
+# mon_decimal_point
+.
+#
+# mon_thousands_sep
+,
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+1
+#
+# p_sep_by_space
+0
+#
+# n_cs_precedes
+1
+#
+# n_sep_by_space
+0
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/en_IE.UTF-8.src b/share/monetdef/en_IE.UTF-8.src
index 1ddcc5ccaf68..c5bdc6707ae1 100644
--- a/share/monetdef/en_IE.UTF-8.src
+++ b/share/monetdef/en_IE.UTF-8.src
@@ -1,36 +1,50 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
 #
 # int_curr_symbol (last character always SPACE)
 EUR 
+#
 # currency_symbol
 €
+#
 # mon_decimal_point
 .
+#
 # mon_thousands_sep
 ,
-# mon_grouping, separated by ;
-3;3
+#
+# mon_grouping
+3
+#
 # positive_sign
 
+#
 # negative_sign
 -
+#
 # int_frac_digits
 2
+#
 # frac_digits
 2
+#
 # p_cs_precedes
 1
+#
 # p_sep_by_space
 0
+#
 # n_cs_precedes
 1
+#
 # n_sep_by_space
 0
+#
 # p_sign_posn
 1
+#
 # n_sign_posn
 1
 # EOF
diff --git a/share/monetdef/en_NZ.ISO8859-1.src b/share/monetdef/en_NZ.ISO8859-1.src
deleted file mode 100644
index 1cb82617599f..000000000000
--- a/share/monetdef/en_NZ.ISO8859-1.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-NZD 
-# currency_symbol
-$
-# mon_decimal_point
-.
-# mon_thousands_sep
-,
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-2
-# frac_digits
-2
-# p_cs_precedes
-1
-# p_sep_by_space
-0
-# n_cs_precedes
-1
-# n_sep_by_space
-0
-# p_sign_posn
-1
-# n_sign_posn
-1
-# EOF
diff --git a/share/monetdef/en_NZ.UTF-8.src b/share/monetdef/en_NZ.UTF-8.src
new file mode 100644
index 000000000000..d1db38293199
--- /dev/null
+++ b/share/monetdef/en_NZ.UTF-8.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+NZD 
+#
+# currency_symbol
+$
+#
+# mon_decimal_point
+.
+#
+# mon_thousands_sep
+,
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+1
+#
+# p_sep_by_space
+0
+#
+# n_cs_precedes
+1
+#
+# n_sep_by_space
+0
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/en_PH.UTF-8.src b/share/monetdef/en_PH.UTF-8.src
new file mode 100644
index 000000000000..c52d067e38e4
--- /dev/null
+++ b/share/monetdef/en_PH.UTF-8.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+PHP 
+#
+# currency_symbol
+₱
+#
+# mon_decimal_point
+.
+#
+# mon_thousands_sep
+,
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+1
+#
+# p_sep_by_space
+0
+#
+# n_cs_precedes
+1
+#
+# n_sep_by_space
+0
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/en_SG.UTF-8.src b/share/monetdef/en_SG.UTF-8.src
new file mode 100644
index 000000000000..6e8a6eb10fdc
--- /dev/null
+++ b/share/monetdef/en_SG.UTF-8.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+SGD 
+#
+# currency_symbol
+$
+#
+# mon_decimal_point
+.
+#
+# mon_thousands_sep
+,
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+1
+#
+# p_sep_by_space
+0
+#
+# n_cs_precedes
+1
+#
+# n_sep_by_space
+0
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/en_US.ISO8859-1.src b/share/monetdef/en_US.ISO8859-1.src
deleted file mode 100644
index faf42e5ae780..000000000000
--- a/share/monetdef/en_US.ISO8859-1.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-USD 
-# currency_symbol
-$
-# mon_decimal_point
-.
-# mon_thousands_sep
-,
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-2
-# frac_digits
-2
-# p_cs_precedes
-1
-# p_sep_by_space
-0
-# n_cs_precedes
-1
-# n_sep_by_space
-0
-# p_sign_posn
-1
-# n_sign_posn
-1
-# EOF
diff --git a/share/monetdef/en_US.UTF-8.src b/share/monetdef/en_US.UTF-8.src
new file mode 100644
index 000000000000..6fb1bf4e9649
--- /dev/null
+++ b/share/monetdef/en_US.UTF-8.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+USD 
+#
+# currency_symbol
+$
+#
+# mon_decimal_point
+.
+#
+# mon_thousands_sep
+,
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+1
+#
+# p_sep_by_space
+0
+#
+# n_cs_precedes
+1
+#
+# n_sep_by_space
+0
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/en_ZA.ISO8859-15.src b/share/monetdef/en_ZA.ISO8859-15.src
new file mode 100644
index 000000000000..9f2ba68c0953
--- /dev/null
+++ b/share/monetdef/en_ZA.ISO8859-15.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+ZAR 
+#
+# currency_symbol
+R
+#
+# mon_decimal_point
+,
+#
+# mon_thousands_sep
+�
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+1
+#
+# p_sep_by_space
+0
+#
+# n_cs_precedes
+1
+#
+# n_sep_by_space
+0
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/en_ZA.US-ASCII.src b/share/monetdef/en_ZA.US-ASCII.src
new file mode 100644
index 000000000000..6756cfaff99e
--- /dev/null
+++ b/share/monetdef/en_ZA.US-ASCII.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+ZAR 
+#
+# currency_symbol
+R
+#
+# mon_decimal_point
+,
+#
+# mon_thousands_sep
+ 
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+1
+#
+# p_sep_by_space
+0
+#
+# n_cs_precedes
+1
+#
+# n_sep_by_space
+0
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/en_ZA.UTF-8.src b/share/monetdef/en_ZA.UTF-8.src
new file mode 100644
index 000000000000..e460df01c483
--- /dev/null
+++ b/share/monetdef/en_ZA.UTF-8.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+ZAR 
+#
+# currency_symbol
+R
+#
+# mon_decimal_point
+,
+#
+# mon_thousands_sep
+ 
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+1
+#
+# p_sep_by_space
+0
+#
+# n_cs_precedes
+1
+#
+# n_sep_by_space
+0
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/es_AR.UTF-8.src b/share/monetdef/es_AR.UTF-8.src
new file mode 100644
index 000000000000..05322ae377ab
--- /dev/null
+++ b/share/monetdef/es_AR.UTF-8.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+ARS 
+#
+# currency_symbol
+$
+#
+# mon_decimal_point
+,
+#
+# mon_thousands_sep
+.
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+1
+#
+# p_sep_by_space
+0
+#
+# n_cs_precedes
+1
+#
+# n_sep_by_space
+0
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/es_CR.UTF-8.src b/share/monetdef/es_CR.UTF-8.src
new file mode 100644
index 000000000000..8d59b699707c
--- /dev/null
+++ b/share/monetdef/es_CR.UTF-8.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+CRC 
+#
+# currency_symbol
+₡
+#
+# mon_decimal_point
+,
+#
+# mon_thousands_sep
+.
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+0
+#
+# frac_digits
+0
+#
+# p_cs_precedes
+1
+#
+# p_sep_by_space
+0
+#
+# n_cs_precedes
+1
+#
+# n_sep_by_space
+0
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/es_ES.ISO8859-1.src b/share/monetdef/es_ES.ISO8859-1.src
deleted file mode 100644
index 81d7a600a037..000000000000
--- a/share/monetdef/es_ES.ISO8859-1.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-EUR 
-# currency_symbol
-Eu
-# mon_decimal_point
-,
-# mon_thousands_sep
-.
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-2
-# frac_digits
-2
-# p_cs_precedes
-1
-# p_sep_by_space
-1
-# n_cs_precedes
-1
-# n_sep_by_space
-1
-# p_sign_posn
-1
-# n_sign_posn
-1
-# EOF
diff --git a/share/monetdef/es_ES.UTF-8.src b/share/monetdef/es_ES.UTF-8.src
deleted file mode 100644
index 75da5ccfbc45..000000000000
--- a/share/monetdef/es_ES.UTF-8.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-EUR 
-# currency_symbol
-€
-# mon_decimal_point
-,
-# mon_thousands_sep
-.
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-2
-# frac_digits
-2
-# p_cs_precedes
-1
-# p_sep_by_space
-1
-# n_cs_precedes
-1
-# n_sep_by_space
-1
-# p_sign_posn
-1
-# n_sign_posn
-1
-# EOF
diff --git a/share/monetdef/es_MX.UTF-8.src b/share/monetdef/es_MX.UTF-8.src
new file mode 100644
index 000000000000..c65dce11043a
--- /dev/null
+++ b/share/monetdef/es_MX.UTF-8.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+MXN 
+#
+# currency_symbol
+$
+#
+# mon_decimal_point
+.
+#
+# mon_thousands_sep
+,
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+1
+#
+# p_sep_by_space
+0
+#
+# n_cs_precedes
+1
+#
+# n_sep_by_space
+0
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/et_EE.ISO8859-15.src b/share/monetdef/et_EE.ISO8859-15.src
deleted file mode 100644
index a03ad1a2afbf..000000000000
--- a/share/monetdef/et_EE.ISO8859-15.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-EEK 
-# currency_symbol
-kr
-# mon_decimal_point
-.
-# mon_thousands_sep
- 
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-2
-# frac_digits
-2
-# p_cs_precedes
-0
-# p_sep_by_space
-1
-# n_cs_precedes
-0
-# n_sep_by_space
-1
-# p_sign_posn
-1
-# n_sign_posn
-1
-# EOF
diff --git a/share/monetdef/fi_FI.ISO8859-1.src b/share/monetdef/fi_FI.ISO8859-1.src
deleted file mode 100644
index 372e77b3facd..000000000000
--- a/share/monetdef/fi_FI.ISO8859-1.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-EUR 
-# currency_symbol
-Eu
-# mon_decimal_point
-,
-# mon_thousands_sep
-.
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-2
-# frac_digits
-2
-# p_cs_precedes
-0
-# p_sep_by_space
-2
-# n_cs_precedes
-0
-# n_sep_by_space
-2
-# p_sign_posn
-1
-# n_sign_posn
-2
-# EOF
diff --git a/share/monetdef/fi_FI.UTF-8.src b/share/monetdef/fi_FI.UTF-8.src
deleted file mode 100644
index dbd23b235866..000000000000
--- a/share/monetdef/fi_FI.UTF-8.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-EUR 
-# currency_symbol
-€
-# mon_decimal_point
-,
-# mon_thousands_sep
-.
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-2
-# frac_digits
-2
-# p_cs_precedes
-0
-# p_sep_by_space
-2
-# n_cs_precedes
-0
-# n_sep_by_space
-2
-# p_sign_posn
-1
-# n_sign_posn
-2
-# EOF
diff --git a/share/monetdef/fr_BE.ISO8859-1.src b/share/monetdef/fr_BE.ISO8859-1.src
deleted file mode 100644
index 23c0fcdfded6..000000000000
--- a/share/monetdef/fr_BE.ISO8859-1.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-EUR 
-# currency_symbol
-Eu
-# mon_decimal_point
-,
-# mon_thousands_sep
-.
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-2
-# frac_digits
-2
-# p_cs_precedes
-0
-# p_sep_by_space
-1
-# n_cs_precedes
-0
-# n_sep_by_space
-1
-# p_sign_posn
-1
-# n_sign_posn
-1
-# EOF
diff --git a/share/monetdef/fr_BE.UTF-8.src b/share/monetdef/fr_BE.UTF-8.src
deleted file mode 100644
index 26548c73c33d..000000000000
--- a/share/monetdef/fr_BE.UTF-8.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-EUR 
-# currency_symbol
-€
-# mon_decimal_point
-,
-# mon_thousands_sep
-.
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-2
-# frac_digits
-2
-# p_cs_precedes
-0
-# p_sep_by_space
-1
-# n_cs_precedes
-0
-# n_sep_by_space
-1
-# p_sign_posn
-1
-# n_sign_posn
-1
-# EOF
diff --git a/share/monetdef/fr_CA.ISO8859-1.src b/share/monetdef/fr_CA.ISO8859-1.src
deleted file mode 100644
index 64ff444dae09..000000000000
--- a/share/monetdef/fr_CA.ISO8859-1.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-CAD 
-# currency_symbol
-$
-# mon_decimal_point
-,
-# mon_thousands_sep
- 
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-2
-# frac_digits
-2
-# p_cs_precedes
-0
-# p_sep_by_space
-1
-# n_cs_precedes
-0
-# n_sep_by_space
-1
-# p_sign_posn
-1
-# n_sign_posn
-2
-# EOF
diff --git a/share/monetdef/fr_CA.ISO8859-15.src b/share/monetdef/fr_CA.ISO8859-15.src
new file mode 100644
index 000000000000..65c6b0727979
--- /dev/null
+++ b/share/monetdef/fr_CA.ISO8859-15.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+CAD 
+#
+# currency_symbol
+$
+#
+# mon_decimal_point
+,
+#
+# mon_thousands_sep
+�
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+0
+#
+# p_sep_by_space
+1
+#
+# n_cs_precedes
+0
+#
+# n_sep_by_space
+1
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/fr_CA.UTF-8.src b/share/monetdef/fr_CA.UTF-8.src
new file mode 100644
index 000000000000..4e45ac96b373
--- /dev/null
+++ b/share/monetdef/fr_CA.UTF-8.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+CAD 
+#
+# currency_symbol
+$
+#
+# mon_decimal_point
+,
+#
+# mon_thousands_sep
+ 
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+0
+#
+# p_sep_by_space
+1
+#
+# n_cs_precedes
+0
+#
+# n_sep_by_space
+1
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/fr_CH.ISO8859-15.src b/share/monetdef/fr_CH.ISO8859-15.src
new file mode 100644
index 000000000000..13919009384f
--- /dev/null
+++ b/share/monetdef/fr_CH.ISO8859-15.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+CHF 
+#
+# currency_symbol
+CHF
+#
+# mon_decimal_point
+.
+#
+# mon_thousands_sep
+�
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+1
+#
+# p_sep_by_space
+1
+#
+# n_cs_precedes
+1
+#
+# n_sep_by_space
+0
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+4
+# EOF
diff --git a/share/monetdef/fr_CH.UTF-8.src b/share/monetdef/fr_CH.UTF-8.src
new file mode 100644
index 000000000000..3056638b6b99
--- /dev/null
+++ b/share/monetdef/fr_CH.UTF-8.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+CHF 
+#
+# currency_symbol
+CHF
+#
+# mon_decimal_point
+.
+#
+# mon_thousands_sep
+ 
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+1
+#
+# p_sep_by_space
+1
+#
+# n_cs_precedes
+1
+#
+# n_sep_by_space
+0
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+4
+# EOF
diff --git a/share/monetdef/fr_FR.ISO8859-1.src b/share/monetdef/fr_FR.ISO8859-1.src
deleted file mode 100644
index 8211d1449dc7..000000000000
--- a/share/monetdef/fr_FR.ISO8859-1.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-EUR 
-# currency_symbol
-Eu
-# mon_decimal_point
-,
-# mon_thousands_sep
- 
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-2
-# frac_digits
-2
-# p_cs_precedes
-0
-# p_sep_by_space
-1
-# n_cs_precedes
-0
-# n_sep_by_space
-1
-# p_sign_posn
-1
-# n_sign_posn
-2
-# EOF
diff --git a/share/monetdef/fr_FR.UTF-8.src b/share/monetdef/fr_FR.UTF-8.src
deleted file mode 100644
index 55ab9358b108..000000000000
--- a/share/monetdef/fr_FR.UTF-8.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-EUR 
-# currency_symbol
-€
-# mon_decimal_point
-,
-# mon_thousands_sep
- 
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-2
-# frac_digits
-2
-# p_cs_precedes
-0
-# p_sep_by_space
-1
-# n_cs_precedes
-0
-# n_sep_by_space
-1
-# p_sign_posn
-1
-# n_sign_posn
-2
-# EOF
diff --git a/share/monetdef/he_IL.UTF-8.src b/share/monetdef/he_IL.UTF-8.src
index 746845757237..ffe7ee059561 100644
--- a/share/monetdef/he_IL.UTF-8.src
+++ b/share/monetdef/he_IL.UTF-8.src
@@ -1,36 +1,50 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
 #
 # int_curr_symbol (last character always SPACE)
 ILS 
+#
 # currency_symbol
 ₪
+#
 # mon_decimal_point
 .
+#
 # mon_thousands_sep
 ,
-# mon_grouping, separated by ;
-3;3
+#
+# mon_grouping
+3
+#
 # positive_sign
 
+#
 # negative_sign
--
+‎-
+#
 # int_frac_digits
 2
+#
 # frac_digits
 2
+#
 # p_cs_precedes
-1
+0
+#
 # p_sep_by_space
 1
+#
 # n_cs_precedes
-1
+0
+#
 # n_sep_by_space
 1
+#
 # p_sign_posn
 1
+#
 # n_sign_posn
 1
 # EOF
diff --git a/share/monetdef/hi_IN.ISCII-DEV.src b/share/monetdef/hi_IN.ISCII-DEV.src
index cc6de7446dfe..0f58fd6e9461 100644
--- a/share/monetdef/hi_IN.ISCII-DEV.src
+++ b/share/monetdef/hi_IN.ISCII-DEV.src
@@ -1,36 +1,50 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
 #
 # int_curr_symbol (last character always SPACE)
 INR 
+#
 # currency_symbol
-��Ȭ 
+�
+#
 # mon_decimal_point
 .
+#
 # mon_thousands_sep
 ,
-# mon_grouping, separated by ;
-3;2;0
+#
+# mon_grouping
+3;2
+#
 # positive_sign
 
+#
 # negative_sign
 -
+#
 # int_frac_digits
 2
+#
 # frac_digits
 2
+#
 # p_cs_precedes
 1
+#
 # p_sep_by_space
 0
+#
 # n_cs_precedes
 1
+#
 # n_sep_by_space
 0
+#
 # p_sign_posn
 1
+#
 # n_sign_posn
 1
 # EOF
diff --git a/share/monetdef/hi_IN.UTF-8.src b/share/monetdef/hi_IN.UTF-8.src
new file mode 100644
index 000000000000..ff3fb6790f63
--- /dev/null
+++ b/share/monetdef/hi_IN.UTF-8.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+INR 
+#
+# currency_symbol
+₹
+#
+# mon_decimal_point
+.
+#
+# mon_thousands_sep
+,
+#
+# mon_grouping
+3;2
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+1
+#
+# p_sep_by_space
+0
+#
+# n_cs_precedes
+1
+#
+# n_sep_by_space
+0
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/hr_HR.ISO8859-2.src b/share/monetdef/hr_HR.ISO8859-2.src
deleted file mode 100644
index ea1cc94f0829..000000000000
--- a/share/monetdef/hr_HR.ISO8859-2.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-HRK 
-# currency_symbol
-Kn
-# mon_decimal_point
-,
-# mon_thousands_sep
- 
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-0
-# frac_digits
-0
-# p_cs_precedes
-1
-# p_sep_by_space
-1
-# n_cs_precedes
-1
-# n_sep_by_space
-1
-# p_sign_posn
-1
-# n_sign_posn
-1
-# EOF
diff --git a/share/monetdef/hr_HR.UTF-8.src b/share/monetdef/hr_HR.UTF-8.src
new file mode 100644
index 000000000000..05a75c9b53e1
--- /dev/null
+++ b/share/monetdef/hr_HR.UTF-8.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+HRK 
+#
+# currency_symbol
+HRK
+#
+# mon_decimal_point
+,
+#
+# mon_thousands_sep
+.
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+0
+#
+# p_sep_by_space
+1
+#
+# n_cs_precedes
+0
+#
+# n_sep_by_space
+1
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/hu_HU.ISO8859-2.src b/share/monetdef/hu_HU.ISO8859-2.src
index 183f155d2c3e..90a631d0a176 100644
--- a/share/monetdef/hu_HU.ISO8859-2.src
+++ b/share/monetdef/hu_HU.ISO8859-2.src
@@ -1,36 +1,50 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
 #
 # int_curr_symbol (last character always SPACE)
 HUF 
+#
 # currency_symbol
-Ft
+HUF
+#
 # mon_decimal_point
 ,
+#
 # mon_thousands_sep
- 
+�
+#
 # mon_grouping
-3;3
+3
+#
 # positive_sign
 
+#
 # negative_sign
 -
+#
 # int_frac_digits
 2
+#
 # frac_digits
 2
+#
 # p_cs_precedes
-1
+0
+#
 # p_sep_by_space
-2
-# n_cs_precedes
 1
+#
+# n_cs_precedes
+0
+#
 # n_sep_by_space
-2
+1
+#
 # p_sign_posn
-4
+1
+#
 # n_sign_posn
-4
+1
 # EOF
diff --git a/share/monetdef/hu_HU.UTF-8.src b/share/monetdef/hu_HU.UTF-8.src
new file mode 100644
index 000000000000..a97103e5b34f
--- /dev/null
+++ b/share/monetdef/hu_HU.UTF-8.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+HUF 
+#
+# currency_symbol
+HUF
+#
+# mon_decimal_point
+,
+#
+# mon_thousands_sep
+ 
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+0
+#
+# p_sep_by_space
+1
+#
+# n_cs_precedes
+0
+#
+# n_sep_by_space
+1
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/hy_AM.ARMSCII-8.src b/share/monetdef/hy_AM.ARMSCII-8.src
index 5d8ed16090c9..d16803253d5c 100644
--- a/share/monetdef/hy_AM.ARMSCII-8.src
+++ b/share/monetdef/hy_AM.ARMSCII-8.src
@@ -1,39 +1,50 @@
-# $FreeBSD$
-#
-# LC_MONETARY source for ARMSCII-8 locale for FreeBSD
-# Made available by Vahe Khachikyan <vahe@khachikyan.de>
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
 #
 # int_curr_symbol (last character always SPACE)
 AMD 
+#
 # currency_symbol
-��  
+��.
+#
 # mon_decimal_point
-.
-# mon_thousands_sep
 ,
-# mon_grouping, separated by ;
-3;3
+#
+# mon_thousands_sep
+.
+#
+# mon_grouping
+-1
+#
 # positive_sign
 
+#
 # negative_sign
 -
+#
 # int_frac_digits
-2
+0
+#
 # frac_digits
-2
+0
+#
 # p_cs_precedes
 0
+#
 # p_sep_by_space
 1
+#
 # n_cs_precedes
 0
+#
 # n_sep_by_space
 1
+#
 # p_sign_posn
 1
+#
 # n_sign_posn
 1
 # EOF
diff --git a/share/monetdef/hy_AM.UTF-8.src b/share/monetdef/hy_AM.UTF-8.src
index 80396b1e982d..d097084d052b 100644
--- a/share/monetdef/hy_AM.UTF-8.src
+++ b/share/monetdef/hy_AM.UTF-8.src
@@ -1,39 +1,50 @@
-# $FreeBSD$
-#
-# LC_MONETARY source for ARMSCII-8 locale for FreeBSD
-# Made available by Vahe Khachikyan <vahe@khachikyan.de>
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
 #
 # int_curr_symbol (last character always SPACE)
 AMD 
+#
 # currency_symbol
-ԴՐ  
+֏
+#
 # mon_decimal_point
-.
-# mon_thousands_sep
 ,
-# mon_grouping, separated by ;
-3;3
+#
+# mon_thousands_sep
+.
+#
+# mon_grouping
+-1
+#
 # positive_sign
 
+#
 # negative_sign
 -
+#
 # int_frac_digits
-2
+0
+#
 # frac_digits
-2
+0
+#
 # p_cs_precedes
 0
+#
 # p_sep_by_space
 1
+#
 # n_cs_precedes
 0
+#
 # n_sep_by_space
 1
+#
 # p_sign_posn
 1
+#
 # n_sign_posn
 1
 # EOF
diff --git a/share/monetdef/is_IS.ISO8859-1.src b/share/monetdef/is_IS.ISO8859-1.src
deleted file mode 100644
index 66a80374e449..000000000000
--- a/share/monetdef/is_IS.ISO8859-1.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-ISK 
-# currency_symbol
-kr
-# mon_decimal_point
-,
-# mon_thousands_sep
-.
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-2
-# frac_digits
-2
-# p_cs_precedes
-0
-# p_sep_by_space
-1
-# n_cs_precedes
-0
-# n_sep_by_space
-1
-# p_sign_posn
-1
-# n_sign_posn
-1
-# EOF
diff --git a/share/monetdef/is_IS.UTF-8.src b/share/monetdef/is_IS.UTF-8.src
new file mode 100644
index 000000000000..aa054fd1856a
--- /dev/null
+++ b/share/monetdef/is_IS.UTF-8.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+ISK 
+#
+# currency_symbol
+ISK
+#
+# mon_decimal_point
+,
+#
+# mon_thousands_sep
+.
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+0
+#
+# frac_digits
+0
+#
+# p_cs_precedes
+0
+#
+# p_sep_by_space
+1
+#
+# n_cs_precedes
+0
+#
+# n_sep_by_space
+1
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/it_CH.UTF-8.src b/share/monetdef/it_CH.UTF-8.src
new file mode 100644
index 000000000000..527926f0dc2a
--- /dev/null
+++ b/share/monetdef/it_CH.UTF-8.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+CHF 
+#
+# currency_symbol
+CHF
+#
+# mon_decimal_point
+.
+#
+# mon_thousands_sep
+'
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+1
+#
+# p_sep_by_space
+1
+#
+# n_cs_precedes
+1
+#
+# n_sep_by_space
+0
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+4
+# EOF
diff --git a/share/monetdef/it_IT.ISO8859-1.src b/share/monetdef/it_IT.ISO8859-1.src
deleted file mode 100644
index c6b2a13345b9..000000000000
--- a/share/monetdef/it_IT.ISO8859-1.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-EUR 
-# currency_symbol
-Eu
-# mon_decimal_point
-,
-# mon_thousands_sep
-.
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-0
-# frac_digits
-0
-# p_cs_precedes
-1
-# p_sep_by_space
-1
-# n_cs_precedes
-1
-# n_sep_by_space
-1
-# p_sign_posn
-1
-# n_sign_posn
-1
-# EOF
diff --git a/share/monetdef/it_IT.UTF-8.src b/share/monetdef/it_IT.UTF-8.src
deleted file mode 100644
index 4c6c7ff725b2..000000000000
--- a/share/monetdef/it_IT.UTF-8.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-EUR 
-# currency_symbol
-€
-# mon_decimal_point
-,
-# mon_thousands_sep
-.
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-0
-# frac_digits
-0
-# p_cs_precedes
-1
-# p_sep_by_space
-1
-# n_cs_precedes
-1
-# n_sep_by_space
-1
-# p_sign_posn
-1
-# n_sign_posn
-1
-# EOF
diff --git a/share/monetdef/ja_JP.SJIS.src b/share/monetdef/ja_JP.SJIS.src
new file mode 100644
index 000000000000..25e84b0c7806
--- /dev/null
+++ b/share/monetdef/ja_JP.SJIS.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+JPY 
+#
+# currency_symbol
+��
+#
+# mon_decimal_point
+.
+#
+# mon_thousands_sep
+,
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+0
+#
+# frac_digits
+0
+#
+# p_cs_precedes
+1
+#
+# p_sep_by_space
+0
+#
+# n_cs_precedes
+1
+#
+# n_sep_by_space
+0
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/ja_JP.UTF-8.src b/share/monetdef/ja_JP.UTF-8.src
index fce3288abd00..83f6d4b29a7e 100644
--- a/share/monetdef/ja_JP.UTF-8.src
+++ b/share/monetdef/ja_JP.UTF-8.src
@@ -1,36 +1,50 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
 #
 # int_curr_symbol (last character always SPACE)
 JPY 
+#
 # currency_symbol
-¥
+￥
+#
 # mon_decimal_point
 .
+#
 # mon_thousands_sep
 ,
-# mon_grouping, separated by ;
-3;3
+#
+# mon_grouping
+3
+#
 # positive_sign
 
+#
 # negative_sign
 -
+#
 # int_frac_digits
 0
+#
 # frac_digits
 0
+#
 # p_cs_precedes
 1
+#
 # p_sep_by_space
 0
+#
 # n_cs_precedes
 1
+#
 # n_sep_by_space
 0
+#
 # p_sign_posn
 1
+#
 # n_sign_posn
-4
+1
 # EOF
diff --git a/share/monetdef/ja_JP.eucJP.src b/share/monetdef/ja_JP.eucJP.src
index 462a88dc286c..332d772c1e79 100644
--- a/share/monetdef/ja_JP.eucJP.src
+++ b/share/monetdef/ja_JP.eucJP.src
@@ -1,36 +1,50 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
 #
 # int_curr_symbol (last character always SPACE)
 JPY 
+#
 # currency_symbol
-\
+��
+#
 # mon_decimal_point
 .
+#
 # mon_thousands_sep
 ,
-# mon_grouping, separated by ;
-3;3
+#
+# mon_grouping
+3
+#
 # positive_sign
 
+#
 # negative_sign
 -
+#
 # int_frac_digits
 0
+#
 # frac_digits
 0
+#
 # p_cs_precedes
 1
+#
 # p_sep_by_space
 0
+#
 # n_cs_precedes
 1
+#
 # n_sep_by_space
 0
+#
 # p_sign_posn
 1
+#
 # n_sign_posn
-4
+1
 # EOF
diff --git a/share/monetdef/kk_Cyrl_KZ.UTF-8.src b/share/monetdef/kk_Cyrl_KZ.UTF-8.src
new file mode 100644
index 000000000000..a5dc90cbe856
--- /dev/null
+++ b/share/monetdef/kk_Cyrl_KZ.UTF-8.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+KZT 
+#
+# currency_symbol
+₸
+#
+# mon_decimal_point
+,
+#
+# mon_thousands_sep
+ 
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+0
+#
+# p_sep_by_space
+1
+#
+# n_cs_precedes
+0
+#
+# n_sep_by_space
+1
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/kk_KZ.PT154.src b/share/monetdef/kk_KZ.PT154.src
deleted file mode 100644
index 8b61e8097330..000000000000
--- a/share/monetdef/kk_KZ.PT154.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-KZT 
-# currency_symbol
-��.
-# mon_decimal_point
-,
-# mon_thousands_sep
- 
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-2
-# frac_digits
-2
-# p_cs_precedes
-0
-# p_sep_by_space
-1
-# n_cs_precedes
-0
-# n_sep_by_space
-1
-# p_sign_posn
-1
-# n_sign_posn
-1
-# EOF
diff --git a/share/monetdef/kk_KZ.UTF-8.src b/share/monetdef/kk_KZ.UTF-8.src
deleted file mode 100644
index ddf0353e8239..000000000000
--- a/share/monetdef/kk_KZ.UTF-8.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-KZT 
-# currency_symbol
-тг.
-# mon_decimal_point
-,
-# mon_thousands_sep
- 
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-2
-# frac_digits
-2
-# p_cs_precedes
-0
-# p_sep_by_space
-1
-# n_cs_precedes
-0
-# n_sep_by_space
-1
-# p_sign_posn
-1
-# n_sign_posn
-1
-# EOF
diff --git a/share/monetdef/ko_KR.UTF-8.src b/share/monetdef/ko_KR.UTF-8.src
index 5d69ac5fdc7e..ed338688b1de 100644
--- a/share/monetdef/ko_KR.UTF-8.src
+++ b/share/monetdef/ko_KR.UTF-8.src
@@ -1,36 +1,50 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
 #
 # int_curr_symbol (last character always SPACE)
 KRW 
+#
 # currency_symbol
 ₩
+#
 # mon_decimal_point
 .
+#
 # mon_thousands_sep
 ,
-# mon_grouping, separated by ;
-3;3
+#
+# mon_grouping
+3
+#
 # positive_sign
 
+#
 # negative_sign
 -
+#
 # int_frac_digits
 0
+#
 # frac_digits
 0
+#
 # p_cs_precedes
 1
+#
 # p_sep_by_space
 0
+#
 # n_cs_precedes
 1
+#
 # n_sep_by_space
 0
+#
 # p_sign_posn
 1
+#
 # n_sign_posn
-4
+1
 # EOF
diff --git a/share/monetdef/ko_KR.eucKR.src b/share/monetdef/ko_KR.eucKR.src
index 0723dfa24596..2305b17c3b1c 100644
--- a/share/monetdef/ko_KR.eucKR.src
+++ b/share/monetdef/ko_KR.eucKR.src
@@ -1,36 +1,50 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
 #
 # int_curr_symbol (last character always SPACE)
 KRW 
+#
 # currency_symbol
 \
+#
 # mon_decimal_point
 .
+#
 # mon_thousands_sep
 ,
-# mon_grouping, separated by ;
-3;3
+#
+# mon_grouping
+3
+#
 # positive_sign
 
+#
 # negative_sign
 -
+#
 # int_frac_digits
 0
+#
 # frac_digits
 0
+#
 # p_cs_precedes
 1
+#
 # p_sep_by_space
 0
+#
 # n_cs_precedes
 1
+#
 # n_sep_by_space
 0
+#
 # p_sign_posn
 1
+#
 # n_sign_posn
-4
+1
 # EOF
diff --git a/share/monetdef/lt_LT.ISO8859-13.src b/share/monetdef/lt_LT.ISO8859-13.src
deleted file mode 100644
index 790e0c9a41c3..000000000000
--- a/share/monetdef/lt_LT.ISO8859-13.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-LTL 
-# currency_symbol
-Lt
-# mon_decimal_point
-,
-# mon_thousands_sep
- 
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-2
-# frac_digits
-2
-# p_cs_precedes
-0
-# p_sep_by_space
-1
-# n_cs_precedes
-0
-# n_sep_by_space
-1
-# p_sign_posn
-1
-# n_sign_posn
-1
-# EOF
diff --git a/share/monetdef/lv_LV.ISO8859-13.src b/share/monetdef/lv_LV.ISO8859-13.src
index 647c4e699356..b8f5b1bb900c 100644
--- a/share/monetdef/lv_LV.ISO8859-13.src
+++ b/share/monetdef/lv_LV.ISO8859-13.src
@@ -1,36 +1,50 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
 #
 # int_curr_symbol (last character always SPACE)
-LVL 
+EUR 
+#
 # currency_symbol
-Ls
+Eu
+#
 # mon_decimal_point
 ,
+#
 # mon_thousands_sep
- 
-# mon_grouping, separated by ;
-3;3
+�
+#
+# mon_grouping
+-1
+#
 # positive_sign
 
+#
 # negative_sign
 -
+#
 # int_frac_digits
 2
+#
 # frac_digits
 2
+#
 # p_cs_precedes
-0
-# p_sep_by_space
 1
-# n_cs_precedes
+#
+# p_sep_by_space
 0
-# n_sep_by_space
+#
+# n_cs_precedes
 1
+#
+# n_sep_by_space
+0
+#
 # p_sign_posn
 1
+#
 # n_sign_posn
 1
 # EOF
diff --git a/share/monetdef/lv_LV.UTF-8.src b/share/monetdef/lv_LV.UTF-8.src
new file mode 100644
index 000000000000..c542c5ae0c34
--- /dev/null
+++ b/share/monetdef/lv_LV.UTF-8.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+EUR 
+#
+# currency_symbol
+€
+#
+# mon_decimal_point
+,
+#
+# mon_thousands_sep
+ 
+#
+# mon_grouping
+-1
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+1
+#
+# p_sep_by_space
+0
+#
+# n_cs_precedes
+1
+#
+# n_sep_by_space
+0
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/mn_Cyrl_MN.UTF-8.src b/share/monetdef/mn_Cyrl_MN.UTF-8.src
new file mode 100644
index 000000000000..3706866dcba6
--- /dev/null
+++ b/share/monetdef/mn_Cyrl_MN.UTF-8.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+MNT 
+#
+# currency_symbol
+₮
+#
+# mon_decimal_point
+.
+#
+# mon_thousands_sep
+,
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+0
+#
+# frac_digits
+0
+#
+# p_cs_precedes
+1
+#
+# p_sep_by_space
+1
+#
+# n_cs_precedes
+1
+#
+# n_sep_by_space
+1
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/mn_MN.UTF-8.src b/share/monetdef/mn_MN.UTF-8.src
deleted file mode 100644
index a2638a734bf1..000000000000
--- a/share/monetdef/mn_MN.UTF-8.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-MNT 
-# currency_symbol
-₮
-# mon_decimal_point
-.
-# mon_thousands_sep
-,
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-2
-# frac_digits
-2
-# p_cs_precedes
-1
-# p_sep_by_space
-0
-# n_cs_precedes
-1
-# n_sep_by_space
-0
-# p_sign_posn
-1
-# n_sign_posn
-1
-# EOF
diff --git a/share/monetdef/nb_NO.ISO8859-15.src b/share/monetdef/nb_NO.ISO8859-15.src
new file mode 100644
index 000000000000..a6483cf4046e
--- /dev/null
+++ b/share/monetdef/nb_NO.ISO8859-15.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+NOK 
+#
+# currency_symbol
+kr
+#
+# mon_decimal_point
+,
+#
+# mon_thousands_sep
+�
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+1
+#
+# p_sep_by_space
+1
+#
+# n_cs_precedes
+1
+#
+# n_sep_by_space
+1
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/nb_NO.UTF-8.src b/share/monetdef/nb_NO.UTF-8.src
new file mode 100644
index 000000000000..36b023f127bb
--- /dev/null
+++ b/share/monetdef/nb_NO.UTF-8.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+NOK 
+#
+# currency_symbol
+kr
+#
+# mon_decimal_point
+,
+#
+# mon_thousands_sep
+ 
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+−
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+1
+#
+# p_sep_by_space
+1
+#
+# n_cs_precedes
+1
+#
+# n_sep_by_space
+1
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/nl_BE.ISO8859-1.src b/share/monetdef/nl_BE.ISO8859-1.src
deleted file mode 100644
index 23c0fcdfded6..000000000000
--- a/share/monetdef/nl_BE.ISO8859-1.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-EUR 
-# currency_symbol
-Eu
-# mon_decimal_point
-,
-# mon_thousands_sep
-.
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-2
-# frac_digits
-2
-# p_cs_precedes
-0
-# p_sep_by_space
-1
-# n_cs_precedes
-0
-# n_sep_by_space
-1
-# p_sign_posn
-1
-# n_sign_posn
-1
-# EOF
diff --git a/share/monetdef/nl_BE.ISO8859-15.src b/share/monetdef/nl_BE.ISO8859-15.src
new file mode 100644
index 000000000000..34f343226766
--- /dev/null
+++ b/share/monetdef/nl_BE.ISO8859-15.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+EUR 
+#
+# currency_symbol
+�
+#
+# mon_decimal_point
+,
+#
+# mon_thousands_sep
+.
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+0
+#
+# p_sep_by_space
+1
+#
+# n_cs_precedes
+0
+#
+# n_sep_by_space
+1
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/nl_BE.UTF-8.src b/share/monetdef/nl_BE.UTF-8.src
deleted file mode 100644
index 26548c73c33d..000000000000
--- a/share/monetdef/nl_BE.UTF-8.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-EUR 
-# currency_symbol
-€
-# mon_decimal_point
-,
-# mon_thousands_sep
-.
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-2
-# frac_digits
-2
-# p_cs_precedes
-0
-# p_sep_by_space
-1
-# n_cs_precedes
-0
-# n_sep_by_space
-1
-# p_sign_posn
-1
-# n_sign_posn
-1
-# EOF
diff --git a/share/monetdef/nl_NL.ISO8859-1.src b/share/monetdef/nl_NL.ISO8859-1.src
index b5a0992b36c9..fff138740428 100644
--- a/share/monetdef/nl_NL.ISO8859-1.src
+++ b/share/monetdef/nl_NL.ISO8859-1.src
@@ -1,36 +1,50 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
 #
 # int_curr_symbol (last character always SPACE)
 EUR 
+#
 # currency_symbol
 Eu
+#
 # mon_decimal_point
 ,
+#
 # mon_thousands_sep
- 
-# mon_grouping, separated by ;
-3;3
+.
+#
+# mon_grouping
+3
+#
 # positive_sign
 
+#
 # negative_sign
 -
+#
 # int_frac_digits
 2
+#
 # frac_digits
 2
+#
 # p_cs_precedes
 1
+#
 # p_sep_by_space
 1
+#
 # n_cs_precedes
 1
+#
 # n_sep_by_space
-1
+2
+#
 # p_sign_posn
 1
+#
 # n_sign_posn
-2
+4
 # EOF
diff --git a/share/monetdef/nl_NL.ISO8859-15.src b/share/monetdef/nl_NL.ISO8859-15.src
new file mode 100644
index 000000000000..91b136d4475e
--- /dev/null
+++ b/share/monetdef/nl_NL.ISO8859-15.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+EUR 
+#
+# currency_symbol
+�
+#
+# mon_decimal_point
+,
+#
+# mon_thousands_sep
+.
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+1
+#
+# p_sep_by_space
+1
+#
+# n_cs_precedes
+1
+#
+# n_sep_by_space
+2
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+4
+# EOF
diff --git a/share/monetdef/nl_NL.UTF-8.src b/share/monetdef/nl_NL.UTF-8.src
index aab90ca55e34..0015248b64f1 100644
--- a/share/monetdef/nl_NL.UTF-8.src
+++ b/share/monetdef/nl_NL.UTF-8.src
@@ -1,36 +1,50 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
 #
 # int_curr_symbol (last character always SPACE)
 EUR 
+#
 # currency_symbol
 €
+#
 # mon_decimal_point
 ,
+#
 # mon_thousands_sep
- 
-# mon_grouping, separated by ;
-3;3
+.
+#
+# mon_grouping
+3
+#
 # positive_sign
 
+#
 # negative_sign
 -
+#
 # int_frac_digits
 2
+#
 # frac_digits
 2
+#
 # p_cs_precedes
 1
+#
 # p_sep_by_space
 1
+#
 # n_cs_precedes
 1
+#
 # n_sep_by_space
-1
+2
+#
 # p_sign_posn
 1
+#
 # n_sign_posn
-2
+4
 # EOF
diff --git a/share/monetdef/nn_NO.ISO8859-15.src b/share/monetdef/nn_NO.ISO8859-15.src
new file mode 100644
index 000000000000..c886f4743ae9
--- /dev/null
+++ b/share/monetdef/nn_NO.ISO8859-15.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+NOK 
+#
+# currency_symbol
+kr
+#
+# mon_decimal_point
+,
+#
+# mon_thousands_sep
+�
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+0
+#
+# p_sep_by_space
+1
+#
+# n_cs_precedes
+0
+#
+# n_sep_by_space
+1
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/no_NO.ISO8859-1.src b/share/monetdef/no_NO.ISO8859-1.src
deleted file mode 100644
index 181953389aa1..000000000000
--- a/share/monetdef/no_NO.ISO8859-1.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-NOK 
-# currency_symbol
-kr
-# mon_decimal_point
-,
-# mon_thousands_sep
-.
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-2
-# frac_digits
-2
-# p_cs_precedes
-1
-# p_sep_by_space
-0
-# n_cs_precedes
-1
-# n_sep_by_space
-0
-# p_sign_posn
-4
-# n_sign_posn
-4
-# EOF
diff --git a/share/monetdef/pl_PL.ISO8859-2.src b/share/monetdef/pl_PL.ISO8859-2.src
index b749031e9960..9d94ff299350 100644
--- a/share/monetdef/pl_PL.ISO8859-2.src
+++ b/share/monetdef/pl_PL.ISO8859-2.src
@@ -1,36 +1,50 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
 #
 # int_curr_symbol (last character always SPACE)
 PLN 
+#
 # currency_symbol
 z�
+#
 # mon_decimal_point
 ,
+#
 # mon_thousands_sep
- 
+�
+#
 # mon_grouping
-3;3
+3
+#
 # positive_sign
 
+#
 # negative_sign
 -
+#
 # int_frac_digits
 2
+#
 # frac_digits
 2
+#
 # p_cs_precedes
-1
+0
+#
 # p_sep_by_space
-2
-# n_cs_precedes
 1
+#
+# n_cs_precedes
+0
+#
 # n_sep_by_space
-2
+1
+#
 # p_sign_posn
-4
+1
+#
 # n_sign_posn
-4
+1
 # EOF
diff --git a/share/monetdef/pl_PL.UTF-8.src b/share/monetdef/pl_PL.UTF-8.src
index 5138186d82dd..11f033e5a92b 100644
--- a/share/monetdef/pl_PL.UTF-8.src
+++ b/share/monetdef/pl_PL.UTF-8.src
@@ -1,36 +1,50 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
 #
 # int_curr_symbol (last character always SPACE)
 PLN 
+#
 # currency_symbol
 zł
+#
 # mon_decimal_point
 ,
+#
 # mon_thousands_sep
- 
+ 
+#
 # mon_grouping
-3;3
+3
+#
 # positive_sign
 
+#
 # negative_sign
 -
+#
 # int_frac_digits
 2
+#
 # frac_digits
 2
+#
 # p_cs_precedes
-1
+0
+#
 # p_sep_by_space
-2
-# n_cs_precedes
 1
+#
+# n_cs_precedes
+0
+#
 # n_sep_by_space
-2
+1
+#
 # p_sign_posn
-4
+1
+#
 # n_sign_posn
-4
+1
 # EOF
diff --git a/share/monetdef/pt_BR.ISO8859-1.src b/share/monetdef/pt_BR.ISO8859-1.src
deleted file mode 100644
index 0614e9fcba24..000000000000
--- a/share/monetdef/pt_BR.ISO8859-1.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-BRL 
-# currency_symbol
-R$
-# mon_decimal_point (possibly incorrect for pt_BR)
-,
-# mon_thousands_sep
-.
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-2
-# frac_digits
-2
-# p_cs_precedes
-0
-# p_sep_by_space
-1
-# n_cs_precedes
-0
-# n_sep_by_space
-1
-# p_sign_posn
-1
-# n_sign_posn
-1
-# EOF
diff --git a/share/monetdef/pt_BR.UTF-8.src b/share/monetdef/pt_BR.UTF-8.src
new file mode 100644
index 000000000000..e487eaba1c84
--- /dev/null
+++ b/share/monetdef/pt_BR.UTF-8.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+BRL 
+#
+# currency_symbol
+R$
+#
+# mon_decimal_point
+,
+#
+# mon_thousands_sep
+.
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+1
+#
+# p_sep_by_space
+0
+#
+# n_cs_precedes
+1
+#
+# n_sep_by_space
+0
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/pt_PT.ISO8859-1.src b/share/monetdef/pt_PT.ISO8859-1.src
deleted file mode 100644
index 23c0fcdfded6..000000000000
--- a/share/monetdef/pt_PT.ISO8859-1.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-EUR 
-# currency_symbol
-Eu
-# mon_decimal_point
-,
-# mon_thousands_sep
-.
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-2
-# frac_digits
-2
-# p_cs_precedes
-0
-# p_sep_by_space
-1
-# n_cs_precedes
-0
-# n_sep_by_space
-1
-# p_sign_posn
-1
-# n_sign_posn
-1
-# EOF
diff --git a/share/monetdef/pt_PT.ISO8859-15.src b/share/monetdef/pt_PT.ISO8859-15.src
deleted file mode 100644
index 03c551c8f397..000000000000
--- a/share/monetdef/pt_PT.ISO8859-15.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-EUR 
-# currency_symbol
-�
-# mon_decimal_point
-,
-# mon_thousands_sep
-.
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-2
-# frac_digits
-2
-# p_cs_precedes
-0
-# p_sep_by_space
-1
-# n_cs_precedes
-0
-# n_sep_by_space
-1
-# p_sign_posn
-1
-# n_sign_posn
-1
-# EOF
diff --git a/share/monetdef/pt_PT.UTF-8.src b/share/monetdef/pt_PT.UTF-8.src
deleted file mode 100644
index 26548c73c33d..000000000000
--- a/share/monetdef/pt_PT.UTF-8.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-EUR 
-# currency_symbol
-€
-# mon_decimal_point
-,
-# mon_thousands_sep
-.
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-2
-# frac_digits
-2
-# p_cs_precedes
-0
-# p_sep_by_space
-1
-# n_cs_precedes
-0
-# n_sep_by_space
-1
-# p_sign_posn
-1
-# n_sign_posn
-1
-# EOF
diff --git a/share/monetdef/ro_RO.ISO8859-2.src b/share/monetdef/ro_RO.ISO8859-2.src
deleted file mode 100644
index 4f543c4a2ad3..000000000000
--- a/share/monetdef/ro_RO.ISO8859-2.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-ROL 
-# currency_symbol
-Lei
-# mon_decimal_point
-,
-# mon_thousands_sep
- 
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-2
-# frac_digits
-2
-# p_cs_precedes
-0
-# p_sep_by_space
-1
-# n_cs_precedes
-0
-# n_sep_by_space
-1
-# p_sign_posn
-1
-# n_sign_posn
-1
-# EOF
diff --git a/share/monetdef/ro_RO.UTF-8.src b/share/monetdef/ro_RO.UTF-8.src
new file mode 100644
index 000000000000..37a8d88f89ec
--- /dev/null
+++ b/share/monetdef/ro_RO.UTF-8.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+RON 
+#
+# currency_symbol
+RON
+#
+# mon_decimal_point
+,
+#
+# mon_thousands_sep
+.
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+0
+#
+# p_sep_by_space
+1
+#
+# n_cs_precedes
+0
+#
+# n_sep_by_space
+1
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/ru_RU.CP1251.src b/share/monetdef/ru_RU.CP1251.src
index e02ea16d3373..e0607bf8061e 100644
--- a/share/monetdef/ru_RU.CP1251.src
+++ b/share/monetdef/ru_RU.CP1251.src
@@ -1,36 +1,50 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
 #
 # int_curr_symbol (last character always SPACE)
 RUB 
+#
 # currency_symbol
 ���.
+#
 # mon_decimal_point
 ,
+#
 # mon_thousands_sep
- 
-# mon_grouping, separated by ;
-3;3
+�
+#
+# mon_grouping
+3
+#
 # positive_sign
 
+#
 # negative_sign
 -
+#
 # int_frac_digits
 2
+#
 # frac_digits
 2
+#
 # p_cs_precedes
 0
+#
 # p_sep_by_space
 1
+#
 # n_cs_precedes
 0
+#
 # n_sep_by_space
 1
+#
 # p_sign_posn
 1
+#
 # n_sign_posn
 1
 # EOF
diff --git a/share/monetdef/ru_RU.CP866.src b/share/monetdef/ru_RU.CP866.src
index 26473b35236d..bbb0d5ab057b 100644
--- a/share/monetdef/ru_RU.CP866.src
+++ b/share/monetdef/ru_RU.CP866.src
@@ -1,36 +1,50 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
 #
 # int_curr_symbol (last character always SPACE)
 RUB 
+#
 # currency_symbol
 ��.
+#
 # mon_decimal_point
 ,
+#
 # mon_thousands_sep
- 
-# mon_grouping, separated by ;
-3;3
+�
+#
+# mon_grouping
+3
+#
 # positive_sign
 
+#
 # negative_sign
 -
+#
 # int_frac_digits
 2
+#
 # frac_digits
 2
+#
 # p_cs_precedes
 0
+#
 # p_sep_by_space
 1
+#
 # n_cs_precedes
 0
+#
 # n_sep_by_space
 1
+#
 # p_sign_posn
 1
+#
 # n_sign_posn
 1
 # EOF
diff --git a/share/monetdef/ru_RU.ISO8859-5.src b/share/monetdef/ru_RU.ISO8859-5.src
index 82b1e53ab244..c78317e0a834 100644
--- a/share/monetdef/ru_RU.ISO8859-5.src
+++ b/share/monetdef/ru_RU.ISO8859-5.src
@@ -1,36 +1,50 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
 #
 # int_curr_symbol (last character always SPACE)
 RUB 
+#
 # currency_symbol
 ���.
+#
 # mon_decimal_point
 ,
+#
 # mon_thousands_sep
- 
-# mon_grouping, separated by ;
-3;3
+�
+#
+# mon_grouping
+3
+#
 # positive_sign
 
+#
 # negative_sign
 -
+#
 # int_frac_digits
 2
+#
 # frac_digits
 2
+#
 # p_cs_precedes
 0
+#
 # p_sep_by_space
 1
+#
 # n_cs_precedes
 0
+#
 # n_sep_by_space
 1
+#
 # p_sign_posn
 1
+#
 # n_sign_posn
 1
 # EOF
diff --git a/share/monetdef/ru_RU.KOI8-R.src b/share/monetdef/ru_RU.KOI8-R.src
index 168caf7ec569..3aed472900d2 100644
--- a/share/monetdef/ru_RU.KOI8-R.src
+++ b/share/monetdef/ru_RU.KOI8-R.src
@@ -1,36 +1,50 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
 #
 # int_curr_symbol (last character always SPACE)
 RUB 
+#
 # currency_symbol
 ���.
+#
 # mon_decimal_point
 ,
+#
 # mon_thousands_sep
- 
-# mon_grouping, separated by ;
-3;3
+�
+#
+# mon_grouping
+3
+#
 # positive_sign
 
+#
 # negative_sign
 -
+#
 # int_frac_digits
 2
+#
 # frac_digits
 2
+#
 # p_cs_precedes
 0
+#
 # p_sep_by_space
 1
+#
 # n_cs_precedes
 0
+#
 # n_sep_by_space
 1
+#
 # p_sign_posn
 1
+#
 # n_sign_posn
 1
 # EOF
diff --git a/share/monetdef/ru_RU.UTF-8.src b/share/monetdef/ru_RU.UTF-8.src
index fe823caa842e..929d05e00cfb 100644
--- a/share/monetdef/ru_RU.UTF-8.src
+++ b/share/monetdef/ru_RU.UTF-8.src
@@ -1,36 +1,50 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
 #
 # int_curr_symbol (last character always SPACE)
 RUB 
+#
 # currency_symbol
 руб.
+#
 # mon_decimal_point
 ,
+#
 # mon_thousands_sep
- 
-# mon_grouping, separated by ;
-3;3
+ 
+#
+# mon_grouping
+3
+#
 # positive_sign
 
+#
 # negative_sign
 -
+#
 # int_frac_digits
 2
+#
 # frac_digits
 2
+#
 # p_cs_precedes
 0
+#
 # p_sep_by_space
 1
+#
 # n_cs_precedes
 0
+#
 # n_sep_by_space
 1
+#
 # p_sign_posn
 1
+#
 # n_sign_posn
 1
 # EOF
diff --git a/share/monetdef/se_NO.UTF-8.src b/share/monetdef/se_NO.UTF-8.src
new file mode 100644
index 000000000000..cffc007f5d07
--- /dev/null
+++ b/share/monetdef/se_NO.UTF-8.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+NOK 
+#
+# currency_symbol
+kr
+#
+# mon_decimal_point
+,
+#
+# mon_thousands_sep
+ 
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+−
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+0
+#
+# p_sep_by_space
+1
+#
+# n_cs_precedes
+0
+#
+# n_sep_by_space
+1
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/sk_SK.ISO8859-2.src b/share/monetdef/sk_SK.ISO8859-2.src
deleted file mode 100644
index dc2ac34f5564..000000000000
--- a/share/monetdef/sk_SK.ISO8859-2.src
+++ /dev/null
@@ -1,38 +0,0 @@
-# $FreeBSD$
-#
-# Slovak monetary definition by Juraj Bednar <juraj@bednar.sk>
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-SKK
-# currency_symbol
-Sk
-# mon_decimal_point
-,
-# mon_thousands_sep
- 
-# mon_grouping
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-2
-# frac_digits
-2
-# p_cs_precedes
-1
-# p_sep_by_space
-2
-# n_cs_precedes
-1
-# n_sep_by_space
-2
-# p_sign_posn
-4
-# n_sign_posn
-4
-# EOF
diff --git a/share/monetdef/sk_SK.UTF-8.src b/share/monetdef/sk_SK.UTF-8.src
new file mode 100644
index 000000000000..68378a463141
--- /dev/null
+++ b/share/monetdef/sk_SK.UTF-8.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+EUR 
+#
+# currency_symbol
+€
+#
+# mon_decimal_point
+,
+#
+# mon_thousands_sep
+ 
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+0
+#
+# p_sep_by_space
+1
+#
+# n_cs_precedes
+0
+#
+# n_sep_by_space
+1
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/sl_SI.ISO8859-2.src b/share/monetdef/sl_SI.ISO8859-2.src
index 2448e452bc53..e58bb7512708 100644
--- a/share/monetdef/sl_SI.ISO8859-2.src
+++ b/share/monetdef/sl_SI.ISO8859-2.src
@@ -1,36 +1,50 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
 #
 # int_curr_symbol (last character always SPACE)
-SIT 
+EUR 
+#
 # currency_symbol
-SIT
+Eu
+#
 # mon_decimal_point
 ,
+#
 # mon_thousands_sep
- 
-# mon_grouping, separated by ;
-3;3
+.
+#
+# mon_grouping
+3
+#
 # positive_sign
 
+#
 # negative_sign
 -
+#
 # int_frac_digits
 2
+#
 # frac_digits
 2
+#
 # p_cs_precedes
 0
+#
 # p_sep_by_space
-2
+1
+#
 # n_cs_precedes
 0
+#
 # n_sep_by_space
-2
+1
+#
 # p_sign_posn
-2
+1
+#
 # n_sign_posn
-2
+1
 # EOF
diff --git a/share/monetdef/el_GR.UTF-8.src b/share/monetdef/sl_SI.UTF-8.src
index 9bbf58d4c1b7..f1786606186a 100644
--- a/share/monetdef/el_GR.UTF-8.src
+++ b/share/monetdef/sl_SI.UTF-8.src
@@ -1,36 +1,50 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
 #
 # int_curr_symbol (last character always SPACE)
 EUR 
+#
 # currency_symbol
 €
+#
 # mon_decimal_point
 ,
+#
 # mon_thousands_sep
 .
+#
 # mon_grouping
-3;3
+3
+#
 # positive_sign
 
+#
 # negative_sign
 -
+#
 # int_frac_digits
 2
+#
 # frac_digits
 2
+#
 # p_cs_precedes
 0
+#
 # p_sep_by_space
 1
+#
 # n_cs_precedes
 0
+#
 # n_sep_by_space
 1
+#
 # p_sign_posn
 1
+#
 # n_sign_posn
 1
 # EOF
diff --git a/share/monetdef/sr_Latn_RS.UTF-8.src b/share/monetdef/sr_Latn_RS.UTF-8.src
new file mode 100644
index 000000000000..d81f538b2627
--- /dev/null
+++ b/share/monetdef/sr_Latn_RS.UTF-8.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+RSD ""RSD 
+#
+# currency_symbol
+RSD""RSD
+#
+# mon_decimal_point
+,"",
+#
+# mon_thousands_sep
+."".
+#
+# mon_grouping
+33
+#
+# positive_sign
+""
+#
+# negative_sign
+-""-
+#
+# int_frac_digits
+00
+#
+# frac_digits
+00
+#
+# p_cs_precedes
+00
+#
+# p_sep_by_space
+11
+#
+# n_cs_precedes
+00
+#
+# n_sep_by_space
+11
+#
+# p_sign_posn
+11
+#
+# n_sign_posn
+11
+# EOF
diff --git a/share/monetdef/sr_YU.ISO8859-2.src b/share/monetdef/sr_YU.ISO8859-2.src
deleted file mode 100644
index b706e29154e0..000000000000
--- a/share/monetdef/sr_YU.ISO8859-2.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-YUD 
-# currency_symbol
-din
-# mon_decimal_point
-,
-# mon_thousands_sep
- 
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-2
-# frac_digits
-2
-# p_cs_precedes
-0
-# p_sep_by_space
-2
-# n_cs_precedes
-0
-# n_sep_by_space
-2
-# p_sign_posn
-2
-# n_sign_posn
-2
-# EOF
diff --git a/share/monetdef/sr_YU.ISO8859-5.src b/share/monetdef/sr_YU.ISO8859-5.src
deleted file mode 100644
index e5e9f4c967ae..000000000000
--- a/share/monetdef/sr_YU.ISO8859-5.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-YUD 
-# currency_symbol
-���
-# mon_decimal_point
-,
-# mon_thousands_sep
- 
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-2
-# frac_digits
-2
-# p_cs_precedes
-0
-# p_sep_by_space
-1
-# n_cs_precedes
-0
-# n_sep_by_space
-1
-# p_sign_posn
-1
-# n_sign_posn
-1
-# EOF
diff --git a/share/monetdef/sr_YU.UTF-8.src b/share/monetdef/sr_YU.UTF-8.src
deleted file mode 100644
index 6e8b013707e2..000000000000
--- a/share/monetdef/sr_YU.UTF-8.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-YUD 
-# currency_symbol
-дин
-# mon_decimal_point
-,
-# mon_thousands_sep
- 
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-2
-# frac_digits
-2
-# p_cs_precedes
-0
-# p_sep_by_space
-1
-# n_cs_precedes
-0
-# n_sep_by_space
-1
-# p_sign_posn
-1
-# n_sign_posn
-1
-# EOF
diff --git a/share/monetdef/sv_FI.ISO8859-1.src b/share/monetdef/sv_FI.ISO8859-1.src
new file mode 100644
index 000000000000..9f917938654f
--- /dev/null
+++ b/share/monetdef/sv_FI.ISO8859-1.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+EUR 
+#
+# currency_symbol
+Eu
+#
+# mon_decimal_point
+,
+#
+# mon_thousands_sep
+�
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+0
+#
+# p_sep_by_space
+1
+#
+# n_cs_precedes
+0
+#
+# n_sep_by_space
+1
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/sv_FI.ISO8859-15.src b/share/monetdef/sv_FI.ISO8859-15.src
new file mode 100644
index 000000000000..1fb4f64026ac
--- /dev/null
+++ b/share/monetdef/sv_FI.ISO8859-15.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+EUR 
+#
+# currency_symbol
+�
+#
+# mon_decimal_point
+,
+#
+# mon_thousands_sep
+�
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+0
+#
+# p_sep_by_space
+1
+#
+# n_cs_precedes
+0
+#
+# n_sep_by_space
+1
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/sv_FI.UTF-8.src b/share/monetdef/sv_FI.UTF-8.src
new file mode 100644
index 000000000000..ec0c63e9fd4b
--- /dev/null
+++ b/share/monetdef/sv_FI.UTF-8.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+EUR 
+#
+# currency_symbol
+€
+#
+# mon_decimal_point
+,
+#
+# mon_thousands_sep
+ 
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+−
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+0
+#
+# p_sep_by_space
+1
+#
+# n_cs_precedes
+0
+#
+# n_sep_by_space
+1
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/sv_SE.ISO8859-1.src b/share/monetdef/sv_SE.ISO8859-1.src
deleted file mode 100644
index a835567ef9be..000000000000
--- a/share/monetdef/sv_SE.ISO8859-1.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-SEK 
-# currency_symbol
-kr
-# mon_decimal_point
-,
-# mon_thousands_sep
- 
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-2
-# frac_digits
-2
-# p_cs_precedes
-0
-# p_sep_by_space
-1
-# n_cs_precedes
-0
-# n_sep_by_space
-1
-# p_sign_posn
-1
-# n_sign_posn
-1
-# EOF
diff --git a/share/monetdef/sv_SE.ISO8859-15.src b/share/monetdef/sv_SE.ISO8859-15.src
new file mode 100644
index 000000000000..184ed4d25cb1
--- /dev/null
+++ b/share/monetdef/sv_SE.ISO8859-15.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+SEK 
+#
+# currency_symbol
+kr
+#
+# mon_decimal_point
+,
+#
+# mon_thousands_sep
+�
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+0
+#
+# p_sep_by_space
+1
+#
+# n_cs_precedes
+0
+#
+# n_sep_by_space
+1
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/sv_SE.UTF-8.src b/share/monetdef/sv_SE.UTF-8.src
new file mode 100644
index 000000000000..309eb2289828
--- /dev/null
+++ b/share/monetdef/sv_SE.UTF-8.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+SEK 
+#
+# currency_symbol
+kr
+#
+# mon_decimal_point
+,
+#
+# mon_thousands_sep
+ 
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+−
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+0
+#
+# p_sep_by_space
+1
+#
+# n_cs_precedes
+0
+#
+# n_sep_by_space
+1
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/tr_TR.ISO8859-9.src b/share/monetdef/tr_TR.ISO8859-9.src
index 41d45477cd93..ea8eec8ccd31 100644
--- a/share/monetdef/tr_TR.ISO8859-9.src
+++ b/share/monetdef/tr_TR.ISO8859-9.src
@@ -1,36 +1,50 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
 #
 # int_curr_symbol (last character always SPACE)
-TRL 
+TRY 
+#
 # currency_symbol
-L
+TL
+#
 # mon_decimal_point
 ,
+#
 # mon_thousands_sep
 .
-# mon_grouping, separated by ;
-3;3
+#
+# mon_grouping
+3
+#
 # positive_sign
 
+#
 # negative_sign
 -
+#
 # int_frac_digits
 2
+#
 # frac_digits
 2
+#
 # p_cs_precedes
-1
+0
+#
 # p_sep_by_space
 1
+#
 # n_cs_precedes
-1
+0
+#
 # n_sep_by_space
 1
+#
 # p_sign_posn
 1
+#
 # n_sign_posn
 1
 # EOF
diff --git a/share/monetdef/tr_TR.UTF-8.src b/share/monetdef/tr_TR.UTF-8.src
new file mode 100644
index 000000000000..e86498d09519
--- /dev/null
+++ b/share/monetdef/tr_TR.UTF-8.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+TRY 
+#
+# currency_symbol
+₺
+#
+# mon_decimal_point
+,
+#
+# mon_thousands_sep
+.
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+0
+#
+# p_sep_by_space
+1
+#
+# n_cs_precedes
+0
+#
+# n_sep_by_space
+1
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/uk_UA.CP1251.src b/share/monetdef/uk_UA.CP1251.src
index 807dded42272..a0c5fd0de9b0 100644
--- a/share/monetdef/uk_UA.CP1251.src
+++ b/share/monetdef/uk_UA.CP1251.src
@@ -1,36 +1,50 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
 #
 # int_curr_symbol (last character always SPACE)
 UAH 
+#
 # currency_symbol
-���.
+���
+#
 # mon_decimal_point
 ,
+#
 # mon_thousands_sep
- 
-# mon_grouping, separated by ;
-3;3
+�
+#
+# mon_grouping
+3
+#
 # positive_sign
 
+#
 # negative_sign
 -
+#
 # int_frac_digits
 2
+#
 # frac_digits
 2
+#
 # p_cs_precedes
 0
+#
 # p_sep_by_space
 1
+#
 # n_cs_precedes
 0
+#
 # n_sep_by_space
 1
+#
 # p_sign_posn
 1
+#
 # n_sign_posn
 1
 # EOF
diff --git a/share/monetdef/uk_UA.ISO8859-5.src b/share/monetdef/uk_UA.ISO8859-5.src
index b95e3bd3be7f..0e085d56bf95 100644
--- a/share/monetdef/uk_UA.ISO8859-5.src
+++ b/share/monetdef/uk_UA.ISO8859-5.src
@@ -1,36 +1,50 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
 #
 # int_curr_symbol (last character always SPACE)
 UAH 
+#
 # currency_symbol
-���.
+���
+#
 # mon_decimal_point
 ,
+#
 # mon_thousands_sep
- 
-# mon_grouping, separated by ;
-3;3
+�
+#
+# mon_grouping
+3
+#
 # positive_sign
 
+#
 # negative_sign
 -
+#
 # int_frac_digits
 2
+#
 # frac_digits
 2
+#
 # p_cs_precedes
 0
+#
 # p_sep_by_space
 1
+#
 # n_cs_precedes
 0
+#
 # n_sep_by_space
 1
+#
 # p_sign_posn
 1
+#
 # n_sign_posn
 1
 # EOF
diff --git a/share/monetdef/uk_UA.KOI8-U.src b/share/monetdef/uk_UA.KOI8-U.src
index 5464d142d093..104f78a8c436 100644
--- a/share/monetdef/uk_UA.KOI8-U.src
+++ b/share/monetdef/uk_UA.KOI8-U.src
@@ -1,36 +1,50 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
 #
 # int_curr_symbol (last character always SPACE)
 UAH 
+#
 # currency_symbol
-���.
+���
+#
 # mon_decimal_point
 ,
+#
 # mon_thousands_sep
- 
-# mon_grouping, separated by ;
-3;3
+�
+#
+# mon_grouping
+3
+#
 # positive_sign
 
+#
 # negative_sign
 -
+#
 # int_frac_digits
 2
+#
 # frac_digits
 2
+#
 # p_cs_precedes
 0
+#
 # p_sep_by_space
 1
+#
 # n_cs_precedes
 0
+#
 # n_sep_by_space
 1
+#
 # p_sign_posn
 1
+#
 # n_sign_posn
 1
 # EOF
diff --git a/share/monetdef/uk_UA.UTF-8.src b/share/monetdef/uk_UA.UTF-8.src
index 842c02f176a1..95f9d762027b 100644
--- a/share/monetdef/uk_UA.UTF-8.src
+++ b/share/monetdef/uk_UA.UTF-8.src
@@ -1,36 +1,50 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
 #
 # int_curr_symbol (last character always SPACE)
 UAH 
+#
 # currency_symbol
-грн.
+₴
+#
 # mon_decimal_point
 ,
+#
 # mon_thousands_sep
- 
-# mon_grouping, separated by ;
-3;3
+ 
+#
+# mon_grouping
+3
+#
 # positive_sign
 
+#
 # negative_sign
 -
+#
 # int_frac_digits
 2
+#
 # frac_digits
 2
+#
 # p_cs_precedes
 0
+#
 # p_sep_by_space
 1
+#
 # n_cs_precedes
 0
+#
 # n_sep_by_space
 1
+#
 # p_sign_posn
 1
+#
 # n_sign_posn
 1
 # EOF
diff --git a/share/monetdef/zh_CN.GB18030.src b/share/monetdef/zh_CN.GB18030.src
deleted file mode 100644
index 3f5fc2409c1e..000000000000
--- a/share/monetdef/zh_CN.GB18030.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-CNY 
-# currency_symbol
-��
-# mon_decimal_point
-.
-# mon_thousands_sep
-,
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-0
-# frac_digits
-0
-# p_cs_precedes
-1
-# p_sep_by_space
-0
-# n_cs_precedes
-1
-# n_sep_by_space
-0
-# p_sign_posn
-1
-# n_sign_posn
-4
-# EOF
diff --git a/share/monetdef/zh_CN.GB2312.src b/share/monetdef/zh_CN.GB2312.src
deleted file mode 100644
index 3f5fc2409c1e..000000000000
--- a/share/monetdef/zh_CN.GB2312.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-CNY 
-# currency_symbol
-��
-# mon_decimal_point
-.
-# mon_thousands_sep
-,
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-0
-# frac_digits
-0
-# p_cs_precedes
-1
-# p_sep_by_space
-0
-# n_cs_precedes
-1
-# n_sep_by_space
-0
-# p_sign_posn
-1
-# n_sign_posn
-4
-# EOF
diff --git a/share/monetdef/zh_CN.UTF-8.src b/share/monetdef/zh_CN.UTF-8.src
deleted file mode 100644
index c1305951920e..000000000000
--- a/share/monetdef/zh_CN.UTF-8.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-CNY 
-# currency_symbol
-￥
-# mon_decimal_point
-.
-# mon_thousands_sep
-,
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-2
-# frac_digits
-2
-# p_cs_precedes
-1
-# p_sep_by_space
-0
-# n_cs_precedes
-1
-# n_sep_by_space
-0
-# p_sign_posn
-1
-# n_sign_posn
-4
-# EOF
diff --git a/share/monetdef/zh_CN.eucCN.src b/share/monetdef/zh_CN.eucCN.src
deleted file mode 100644
index 3f5fc2409c1e..000000000000
--- a/share/monetdef/zh_CN.eucCN.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-CNY 
-# currency_symbol
-��
-# mon_decimal_point
-.
-# mon_thousands_sep
-,
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-0
-# frac_digits
-0
-# p_cs_precedes
-1
-# p_sep_by_space
-0
-# n_cs_precedes
-1
-# n_sep_by_space
-0
-# p_sign_posn
-1
-# n_sign_posn
-4
-# EOF
diff --git a/share/monetdef/zh_HK.UTF-8.src b/share/monetdef/zh_HK.UTF-8.src
deleted file mode 100644
index 64921a9e56dc..000000000000
--- a/share/monetdef/zh_HK.UTF-8.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-HKD
-# currency_symbol
-HK$
-# mon_decimal_point
-.
-# mon_thousands_sep
-,
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-2
-# frac_digits
-2
-# p_cs_precedes
-1
-# p_sep_by_space
-0
-# n_cs_precedes
-1
-# n_sep_by_space
-0
-# p_sign_posn
-1
-# n_sign_posn
-0
-# EOF
diff --git a/share/monetdef/zh_Hans_CN.GB2312.src b/share/monetdef/zh_Hans_CN.GB2312.src
new file mode 100644
index 000000000000..98bbbf1f8297
--- /dev/null
+++ b/share/monetdef/zh_Hans_CN.GB2312.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+#C#N#Y!!
+#
+# currency_symbol
+#$
+#
+# mon_decimal_point
+#.
+#
+# mon_thousands_sep
+#,
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+#-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+1
+#
+# p_sep_by_space
+1
+#
+# n_cs_precedes
+1
+#
+# n_sep_by_space
+1
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/zh_Hans_CN.GBK.src b/share/monetdef/zh_Hans_CN.GBK.src
new file mode 100644
index 000000000000..03faef2242ce
--- /dev/null
+++ b/share/monetdef/zh_Hans_CN.GBK.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+CNY 
+#
+# currency_symbol
+��
+#
+# mon_decimal_point
+.
+#
+# mon_thousands_sep
+,
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+1
+#
+# p_sep_by_space
+1
+#
+# n_cs_precedes
+1
+#
+# n_sep_by_space
+1
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/zh_Hans_CN.UTF-8.src b/share/monetdef/zh_Hans_CN.UTF-8.src
new file mode 100644
index 000000000000..e1c1ce8e40cd
--- /dev/null
+++ b/share/monetdef/zh_Hans_CN.UTF-8.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+CNY 
+#
+# currency_symbol
+￥
+#
+# mon_decimal_point
+.
+#
+# mon_thousands_sep
+,
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+1
+#
+# p_sep_by_space
+1
+#
+# n_cs_precedes
+1
+#
+# n_sep_by_space
+1
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/zh_Hans_CN.eucCN.src b/share/monetdef/zh_Hans_CN.eucCN.src
new file mode 100644
index 000000000000..1919a037b959
--- /dev/null
+++ b/share/monetdef/zh_Hans_CN.eucCN.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+�ãΣ١�
+#
+# currency_symbol
+��
+#
+# mon_decimal_point
+��
+#
+# mon_thousands_sep
+��
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+��
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+1
+#
+# p_sep_by_space
+1
+#
+# n_cs_precedes
+1
+#
+# n_sep_by_space
+1
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/zh_Hant_HK.UTF-8.src b/share/monetdef/zh_Hant_HK.UTF-8.src
new file mode 100644
index 000000000000..faf104e580f9
--- /dev/null
+++ b/share/monetdef/zh_Hant_HK.UTF-8.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+HKD 
+#
+# currency_symbol
+HK$
+#
+# mon_decimal_point
+.
+#
+# mon_thousands_sep
+,
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+1
+#
+# p_sep_by_space
+0
+#
+# n_cs_precedes
+1
+#
+# n_sep_by_space
+0
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/zh_Hant_TW.Big5.src b/share/monetdef/zh_Hant_TW.Big5.src
new file mode 100644
index 000000000000..9c371509439b
--- /dev/null
+++ b/share/monetdef/zh_Hant_TW.Big5.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+���ҡ@
+#
+# currency_symbol
+�ܢ�C
+#
+# mon_decimal_point
+�D
+#
+# mon_thousands_sep
+�A
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+��
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+1
+#
+# p_sep_by_space
+0
+#
+# n_cs_precedes
+1
+#
+# n_sep_by_space
+0
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/zh_Hant_TW.UTF-8.src b/share/monetdef/zh_Hant_TW.UTF-8.src
new file mode 100644
index 000000000000..80109b99c31a
--- /dev/null
+++ b/share/monetdef/zh_Hant_TW.UTF-8.src
@@ -0,0 +1,50 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# int_curr_symbol (last character always SPACE)
+TWD 
+#
+# currency_symbol
+NT$
+#
+# mon_decimal_point
+.
+#
+# mon_thousands_sep
+,
+#
+# mon_grouping
+3
+#
+# positive_sign
+
+#
+# negative_sign
+-
+#
+# int_frac_digits
+2
+#
+# frac_digits
+2
+#
+# p_cs_precedes
+1
+#
+# p_sep_by_space
+0
+#
+# n_cs_precedes
+1
+#
+# n_sep_by_space
+0
+#
+# p_sign_posn
+1
+#
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/zh_TW.Big5.src b/share/monetdef/zh_TW.Big5.src
deleted file mode 100644
index 1e86417df204..000000000000
--- a/share/monetdef/zh_TW.Big5.src
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# int_curr_symbol (last character always SPACE)
-TWD 
-# currency_symbol
-NT$
-# mon_decimal_point
-.
-# mon_thousands_sep
-,
-# mon_grouping, separated by ;
-3;3
-# positive_sign
-
-# negative_sign
--
-# int_frac_digits
-0
-# frac_digits
-0
-# p_cs_precedes
-1
-# p_sep_by_space
-0
-# n_cs_precedes
-1
-# n_sep_by_space
-0
-# p_sign_posn
-1
-# n_sign_posn
-4
-# EOF