12 files changed, 225 insertions, 1 deletions

diff --git a/share/msgdef/Makefile b/share/msgdef/Makefile
index 531ba64782d4e..6a525128b942e 100644
--- a/share/msgdef/Makefile
+++ b/share/msgdef/Makefile
@@ -8,12 +8,15 @@ LOCALES=	af_ZA.ISO8859-1 \
 		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 \
 		cs_CZ.ISO8859-2 \
 		da_DK.ISO8859-1 \
 		de_DE.ISO8859-1 \
 		el_GR.ISO8859-7 \
+		el_GR.UTF-8 \
 		en_CA.ISO8859-1 \
 		en_GB.ISO8859-1 \
 		en_US.ISO8859-1 \
@@ -27,9 +30,11 @@ LOCALES=	af_ZA.ISO8859-1 \
 		hr_HR.ISO8859-2 \
 		hu_HU.ISO8859-2 \
 		hy_AM.ARMSCII-8 \
+		hy_AM.UTF-8 \
 		is_IS.ISO8859-1 \
 		it_IT.ISO8859-1 \
 		kk_KZ.PT154 \
+		kk_KZ.UTF-8 \
 		lt_LT.ISO8859-13 \
 		nl_NL.ISO8859-1 \
 		no_NO.ISO8859-1 \
@@ -40,20 +45,26 @@ LOCALES=	af_ZA.ISO8859-1 \
 		ru_RU.CP866 \
 		ru_RU.ISO8859-5 \
 		ru_RU.KOI8-R \
+		ru_RU.UTF-8 \
 		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.ISO8859-5 \
 		uk_UA.KOI8-U \
+		uk_UA.UTF-8 \
 		ko_KR.eucKR \
 		ja_JP.eucJP \
 		ja_JP.SJIS \
+		ja_JP.UTF-8 \
 		zh_CN.eucCN \
 		zh_CN.GB18030 \
 		zh_CN.GB2312 \
-		zh_TW.Big5
+		zh_CN.UTF-8 \
+		zh_TW.Big5 \
+		zh_TW.UTF-8
 
 LOCALEDIR=	${DESTDIR}/usr/share/locale
 
@@ -61,6 +72,13 @@ ASCIILINKS=	en_CA en_GB en_US
 LATIN15LINKS=   af_ZA ca_ES da_DK de_DE en_CA en_GB en_US es_ES fi_FI fr_BE \
 		fr_CH fr_FR is_IS it_IT nl_NL no_NO pt_PT sv_SE
 
+UTF8_LATIN1LINKS=	af_ZA ca_ES da_DK de_DE en_CA en_GB en_US es_ES fi_FI \
+			fr_BE fr_CH fr_FR is_IS it_IT nl_NL no_NO pt_PT sv_SE
+UTF8_LATIN2LINKS=	cs_CZ hr_HR hu_HU pl_PL ro_RO sl_SI
+UTF8_LATIN9LINKS=	tr_TR
+UTF8_LATIN13LINKS=	lt_LT
+UTF8_LATIN15LINKS=	et_EE
+
 GB_LINKS=	en_AU en_NZ
 FR_LINKS=	fr_CA
 DE_LINKS=	de_AT de_CH
@@ -135,5 +153,59 @@ afterinstall:
 		${LOCALEDIR}/ko_KR.CP949/LC_MESSAGES
 	ln -sf ../zh_CN.GB2312/LC_MESSAGES \
 		${LOCALEDIR}/zh_CN.GBK/LC_MESSAGES
+.for link in ${UTF8_LATIN1LINKS}
+	ln -sf ../${link}.ISO8859-1/LC_MESSAGES \
+	       ${LOCALEDIR}/${link}.UTF-8/LC_MESSAGES
+.endfor
+.for link in ${UTF8_LATIN2LINKS}
+	ln -sf ../${link}.ISO8859-2/LC_MESSAGES \
+	       ${LOCALEDIR}/${link}.UTF-8/LC_MESSAGES
+.endfor
+.for link in ${UTF8_LATIN9LINKS}
+	ln -sf ../${link}.ISO8859-9/LC_MESSAGES \
+	       ${LOCALEDIR}/${link}.UTF-8/LC_MESSAGES
+.endfor
+.for link in ${UTF8_LATIN13LINKS}
+	ln -sf ../${link}.ISO8859-13/LC_MESSAGES \
+	       ${LOCALEDIR}/${link}.UTF-8/LC_MESSAGES
+.endfor
+.for link in ${UTF8_LATIN15LINKS}
+	ln -sf ../${link}.ISO8859-15/LC_MESSAGES \
+	       ${LOCALEDIR}/${link}.UTF-8/LC_MESSAGES
+.endfor
+.for link in ${GB_LINKS}
+	ln -sf ../en_GB.UTF-8/LC_MESSAGES \
+		${LOCALEDIR}/${link}.UTF-8/LC_MESSAGES
+.endfor
+	ln -sf ../en_GB.UTF-8/LC_MESSAGES \
+		${LOCALEDIR}/en_IE.UTF-8/LC_MESSAGES
+.for link in ${FR_LINKS}
+	ln -sf ../fr_FR.UTF-8/LC_MESSAGES \
+		${LOCALEDIR}/${link}.UTF-8/LC_MESSAGES
+.endfor
+.for link in ${DE_LINKS}
+	ln -sf ../de_DE.UTF-8/LC_MESSAGES \
+		${LOCALEDIR}/${link}.UTF-8/LC_MESSAGES
+.endfor
+.for link in ${IT_LINKS}
+	ln -sf ../it_IT.UTF-8/LC_MESSAGES \
+		${LOCALEDIR}/${link}.UTF-8/LC_MESSAGES
+.endfor
+.for link in ${NL_LINKS}
+	ln -sf ../nl_NL.UTF-8/LC_MESSAGES \
+		${LOCALEDIR}/${link}.UTF-8/LC_MESSAGES
+.endfor
+.for link in ${CZ_LINKS}
+	ln -sf ../cs_CZ.UTF-8/LC_MESSAGES \
+		${LOCALEDIR}/${link}.UTF-8/LC_MESSAGES
+.endfor
+.for link in ${PT_LINKS}
+	ln -sf ../pt_PT.UTF-8/LC_MESSAGES \
+		${LOCALEDIR}/${link}.UTF-8/LC_MESSAGES
+.endfor
+	ln -sf ../ko_KR.eucKR/LC_MESSAGES \
+		${LOCALEDIR}/ko_KR.UTF-8/LC_MESSAGES
+	ln -sf ../zh_TW.UTF-8/LC_MESSAGES \
+		${LOCALEDIR}/zh_HK.UTF-8/LC_MESSAGES
 
 .include <bsd.prog.mk>
diff --git a/share/msgdef/be_BY.UTF-8.src b/share/msgdef/be_BY.UTF-8.src
new file mode 100644
index 0000000000000..8d23237784f7e
--- /dev/null
+++ b/share/msgdef/be_BY.UTF-8.src
@@ -0,0 +1,13 @@
+# $FreeBSD$
+# WARNING: spaces may be essential at the end of lines
+# WARNING: empty lines are essential too
+#
+# yesexpr
+^[тТyY].*
+# noexpr
+^[нНnN].*
+# yesstr
+так
+# nostr
+не
+# EOF
diff --git a/share/msgdef/bg_BG.UTF-8.src b/share/msgdef/bg_BG.UTF-8.src
new file mode 100644
index 0000000000000..72dca12b49a97
--- /dev/null
+++ b/share/msgdef/bg_BG.UTF-8.src
@@ -0,0 +1,14 @@
+# $FreeBSD$
+#
+# WARNING: spaces may be essential at the end of lines
+# WARNING: empty lines are essential too
+#
+# yesexpr
+^[дДyY].*
+# noexpr
+^[нНnN].*
+# yesstr
+да
+# nostr
+не
+# EOF
diff --git a/share/msgdef/el_GR.UTF-8.src b/share/msgdef/el_GR.UTF-8.src
new file mode 100644
index 0000000000000..560675e005c0e
--- /dev/null
+++ b/share/msgdef/el_GR.UTF-8.src
@@ -0,0 +1,14 @@
+# $FreeBSD$
+#
+# WARNING: spaces may be essential at the end of lines
+# WARNING: empty lines are essential too
+#
+# yesexpr
+^[νΝyY].*
+# noexpr
+^[οΟnN].*
+# yesstr
+ΝΑΙ
+# nostr
+ΟΧΙ
+# EOF
diff --git a/share/msgdef/hy_AM.UTF-8.src b/share/msgdef/hy_AM.UTF-8.src
new file mode 100644
index 0000000000000..749637de33c3b
--- /dev/null
+++ b/share/msgdef/hy_AM.UTF-8.src
@@ -0,0 +1,17 @@
+# $FreeBSD$
+#
+# msgdef 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
+#
+# yesexpr
+^[աԱyY].*
+# noexpr
+^[ոՈnN].*
+# yesstr
+Այո
+# nostr
+Ոչ
+# EOF
diff --git a/share/msgdef/ja_JP.UTF-8.src b/share/msgdef/ja_JP.UTF-8.src
new file mode 100644
index 0000000000000..476ef44b3d62f
--- /dev/null
+++ b/share/msgdef/ja_JP.UTF-8.src
@@ -0,0 +1,10 @@
+# $FreeBSD$
+#
+# WARNING: spaces may be essential at the end of lines
+# WARNING: empty lines are essential too
+#
+# yesexpr
+^[yYｙＹはハ].*
+# noexpr
+^[nNｎＮいイ].*
+# EOF
diff --git a/share/msgdef/kk_KZ.UTF-8.src b/share/msgdef/kk_KZ.UTF-8.src
new file mode 100644
index 0000000000000..23cd9cbb88a79
--- /dev/null
+++ b/share/msgdef/kk_KZ.UTF-8.src
@@ -0,0 +1,14 @@
+# $FreeBSD$
+#
+# WARNING: spaces may be essential at the end of lines
+# WARNING: empty lines are essential too
+#
+# yesexpr
+^[иИyY].*
+# noexpr
+^[жЖnN].*
+# yesstr
+ия
+# nostr
+жок
+# EOF
diff --git a/share/msgdef/ru_RU.UTF-8.src b/share/msgdef/ru_RU.UTF-8.src
new file mode 100644
index 0000000000000..a6a2b17259fa6
--- /dev/null
+++ b/share/msgdef/ru_RU.UTF-8.src
@@ -0,0 +1,14 @@
+# $FreeBSD$
+#
+# WARNING: spaces may be essential at the end of lines
+# WARNING: empty lines are essential too
+#
+# yesexpr
+^[дДyY].*
+# noexpr
+^[нНnN].*
+# yesstr
+да
+# nostr
+н╜т
+# EOF
diff --git a/share/msgdef/sr_YU.UTF-8.src b/share/msgdef/sr_YU.UTF-8.src
new file mode 100644
index 0000000000000..72dca12b49a97
--- /dev/null
+++ b/share/msgdef/sr_YU.UTF-8.src
@@ -0,0 +1,14 @@
+# $FreeBSD$
+#
+# WARNING: spaces may be essential at the end of lines
+# WARNING: empty lines are essential too
+#
+# yesexpr
+^[дДyY].*
+# noexpr
+^[нНnN].*
+# yesstr
+да
+# nostr
+не
+# EOF
diff --git a/share/msgdef/uk_UA.UTF-8.src b/share/msgdef/uk_UA.UTF-8.src
new file mode 100644
index 0000000000000..cfc5a2e64bc06
--- /dev/null
+++ b/share/msgdef/uk_UA.UTF-8.src
@@ -0,0 +1,14 @@
+# $FreeBSD$
+#
+# WARNING: spaces may be essential at the end of lines
+# WARNING: empty lines are essential too
+#
+# yesexpr
+^[тТyY].*
+# noexpr
+^[нНnN].*
+# yesstr
+так
+# nostr
+ні
+# EOF
diff --git a/share/msgdef/zh_CN.UTF-8.src b/share/msgdef/zh_CN.UTF-8.src
new file mode 100644
index 0000000000000..975134e8173ef
--- /dev/null
+++ b/share/msgdef/zh_CN.UTF-8.src
@@ -0,0 +1,14 @@
+# $FreeBSD$
+#
+# WARNING: spaces may be essential at the end of lines
+# WARNING: empty lines are essential too
+#
+# yesexpr
+^[yYｙＹ是].*
+# noexpr
+^[nNｎＮ不否].*
+# yesstr
+是
+# nostr
+否
+# EOF
diff --git a/share/msgdef/zh_TW.UTF-8.src b/share/msgdef/zh_TW.UTF-8.src
new file mode 100644
index 0000000000000..975134e8173ef
--- /dev/null
+++ b/share/msgdef/zh_TW.UTF-8.src
@@ -0,0 +1,14 @@
+# $FreeBSD$
+#
+# WARNING: spaces may be essential at the end of lines
+# WARNING: empty lines are essential too
+#
+# yesexpr
+^[yYｙＹ是].*
+# noexpr
+^[nNｎＮ不否].*
+# yesstr
+是
+# nostr
+否
+# EOF