Switch to new locale names

29 files changed, 36 insertions, 339 deletions

diff --git a/share/msgdef/Makefile b/share/msgdef/Makefile
index 4f720bcf39e6..30e5b66e5caa 100644
--- a/share/msgdef/Makefile
+++ b/share/msgdef/Makefile
@@ -3,45 +3,45 @@
 NOMAN=YES
 CLEANFILES+= ${LOCALES:S/$/.out/g}
 
-LOCALES=	af_ZA.ISO_8859-1 \
-		cs_CZ.ISO_8859-2 \
-		da_DK.ISO_8859-1 \
-		de_DE.ISO_8859-1 \
-		el_GR.ISO_8859-7 \
-		en_CA.ISO_8859-1 \
-		en_GB.ISO_8859-1 \
-		en_US.ISO_8859-1 \
-		es_ES.ISO_8859-1 \
-		et_EE.ISO_8859-15 \
-		fi_FI.ISO_8859-1 \
-		fr_CH.ISO_8859-1 \
-		fr_FR.ISO_8859-1 \
-		hr_HR.ISO_8859-2 \
-		hu_HU.ISO_8859-2 \
-		is_IS.ISO_8859-1 \
-		it_IT.ISO_8859-1 \
-		nl_NL.ISO_8859-1 \
-		no_NO.ISO_8859-1 \
-		pl_PL.ISO_8859-2 \
-		pt_PT.ISO_8859-1 \
+LOCALES=        af_ZA.ISO8859-1 \
+		cs_CZ.ISO8859-2 \
+		da_DK.ISO8859-1 \
+		de_DE.ISO8859-1 \
+		el_GR.ISO8859-7 \
+		en_CA.ISO8859-1 \
+		en_GB.ISO8859-1 \
+		en_US.ISO8859-1 \
+		es_ES.ISO8859-1 \
+		et_EE.ISO8859-15 \
+		fi_FI.ISO8859-1 \
+		fr_CH.ISO8859-1 \
+		fr_FR.ISO8859-1 \
+		hr_HR.ISO8859-2 \
+		hu_HU.ISO8859-2 \
+		is_IS.ISO8859-1 \
+		it_IT.ISO8859-1 \
+		nl_NL.ISO8859-1 \
+		no_NO.ISO8859-1 \
+		pl_PL.ISO8859-2 \
+		pt_PT.ISO8859-1 \
 		ru_RU.CP866 \
-		ru_RU.ISO_8859-5 \
+		ru_RU.ISO8859-5 \
 		ru_RU.KOI8-R \
-		sl_SI.ISO_8859-2 \
-		sv_SE.ISO_8859-1 \
-		tr_TR.ISO_8859-9 \
+		sl_SI.ISO8859-2 \
+		sv_SE.ISO8859-1 \
+		tr_TR.ISO8859-9 \
 		uk_UA.KOI8-U \
-		ko_KR.EUC \
-		ja_JP.EUC \
+		ko_KR.eucKR \
+		ja_JP.eucJP \
 		zh_TW.Big5 \
-		zh_CN.EUC
+		zh_CN.eucCN
 
-ENGLISH=	en_GB.ISO_8859-1
-ENGLISHLINKS=	en_AU.ISO_8859-1 en_NZ.ISO_8859-1
-FRENCH=		fr_FR.ISO_8859-1
-FRENCHLINKS=	fr_CA.ISO_8859-1
-GERMAN=		de_DE.ISO_8859-1
-GERMANLINKS=	de_AT.ISO_8859-1
+ENGLISH=        en_GB.ISO8859-1
+ENGLISHLINKS=   en_AU.ISO8859-1 en_NZ.ISO8859-1
+FRENCH=         fr_FR.ISO8859-1
+FRENCHLINKS=    fr_CA.ISO8859-1
+GERMAN=         de_DE.ISO8859-1
+GERMANLINKS=    de_AT.ISO8859-1
 
 LOCALEDIR=      ${DESTDIR}/usr/share/locale
 
@@ -66,5 +66,7 @@ afterinstall:
 .for link in ${GERMANLINKS}
 	ln -sf ../${GERMAN}/LC_MESSAGES ${LOCALEDIR}/${link}/LC_MESSAGES
 .endfor
+	ln -fs ../en_US.ISO8859-1/LC_MESSAGES \
+		${LOCALEDIR}/en_US.US-ASCII/LC_MESSAGES
 
 .include <bsd.prog.mk>
diff --git a/share/msgdef/af_ZA.ISO_8859-1.src b/share/msgdef/af_ZA.ISO_8859-1.src
deleted file mode 100644
index a87da07feee2..000000000000
--- a/share/msgdef/af_ZA.ISO_8859-1.src
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# yesexpr
-^[jJyY].*
-# noexpr
-^[nN].*
-# EOF
diff --git a/share/msgdef/cs_CZ.ISO_8859-2.src b/share/msgdef/cs_CZ.ISO_8859-2.src
deleted file mode 100644
index a6fc83634397..000000000000
--- a/share/msgdef/cs_CZ.ISO_8859-2.src
+++ /dev/null
@@ -1,14 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# yesexpr
-^[aAyY].*
-# noexpr
-^[nN].*
-# yesstr
-ano
-# nostr
-ne
-# EOF
diff --git a/share/msgdef/da_DK.ISO_8859-1.src b/share/msgdef/da_DK.ISO_8859-1.src
deleted file mode 100644
index a87da07feee2..000000000000
--- a/share/msgdef/da_DK.ISO_8859-1.src
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# yesexpr
-^[jJyY].*
-# noexpr
-^[nN].*
-# EOF
diff --git a/share/msgdef/de_DE.ISO_8859-1.src b/share/msgdef/de_DE.ISO_8859-1.src
deleted file mode 100644
index a87da07feee2..000000000000
--- a/share/msgdef/de_DE.ISO_8859-1.src
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# yesexpr
-^[jJyY].*
-# noexpr
-^[nN].*
-# EOF
diff --git a/share/msgdef/el_GR.ISO_8859-7.src b/share/msgdef/el_GR.ISO_8859-7.src
deleted file mode 100644
index 85d433e990cf..000000000000
--- a/share/msgdef/el_GR.ISO_8859-7.src
+++ /dev/null
@@ -1,14 +0,0 @@
-# $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/en_CA.ISO_8859-1.src b/share/msgdef/en_CA.ISO_8859-1.src
deleted file mode 100644
index 7a66f558ef57..000000000000
--- a/share/msgdef/en_CA.ISO_8859-1.src
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# yesexpr
-^[yYoO].*
-# noexpr
-^[nN].*
-# EOF
diff --git a/share/msgdef/en_GB.ISO_8859-1.src b/share/msgdef/en_GB.ISO_8859-1.src
deleted file mode 100644
index f80c8facd17b..000000000000
--- a/share/msgdef/en_GB.ISO_8859-1.src
+++ /dev/null
@@ -1,10 +0,0 @@
-# $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/en_US.ISO_8859-1.src b/share/msgdef/en_US.ISO_8859-1.src
deleted file mode 100644
index bc2594ded3df..000000000000
--- a/share/msgdef/en_US.ISO_8859-1.src
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# yesexpr
-^[yYsS].*
-# noexpr
-^[nN].*
-# EOF
diff --git a/share/msgdef/es_ES.ISO_8859-1.src b/share/msgdef/es_ES.ISO_8859-1.src
deleted file mode 100644
index e839a0a217ba..000000000000
--- a/share/msgdef/es_ES.ISO_8859-1.src
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# yesexpr
-^[sSyY].*
-# noexpr
-^[nN].*
-# EOF
diff --git a/share/msgdef/et_EE.ISO_8859-15.src b/share/msgdef/et_EE.ISO_8859-15.src
deleted file mode 100644
index 0d31afd0a2ec..000000000000
--- a/share/msgdef/et_EE.ISO_8859-15.src
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# yesexpr
-^[1JjYy].*
-# noexpr
-^[0EeNn].*
-# EOF
diff --git a/share/msgdef/fi_FI.ISO_8859-1.src b/share/msgdef/fi_FI.ISO_8859-1.src
deleted file mode 100644
index ac0092a84b3f..000000000000
--- a/share/msgdef/fi_FI.ISO_8859-1.src
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# yesexpr
-^[kKjJyY].*
-# noexpr
-^[nNeE].*
-# EOF
diff --git a/share/msgdef/fr_CH.ISO_8859-1.src b/share/msgdef/fr_CH.ISO_8859-1.src
deleted file mode 100644
index 4af763873c0d..000000000000
--- a/share/msgdef/fr_CH.ISO_8859-1.src
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# yesexpr
-^[oOjJsSyY].*
-# noexpr
-^[nN].*
-# EOF
diff --git a/share/msgdef/fr_FR.ISO_8859-1.src b/share/msgdef/fr_FR.ISO_8859-1.src
deleted file mode 100644
index 80d0218e78e6..000000000000
--- a/share/msgdef/fr_FR.ISO_8859-1.src
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# yesexpr
-^[oOyY].*
-# noexpr
-^[nN].*
-# EOF
diff --git a/share/msgdef/hr_HR.ISO_8859-2.src b/share/msgdef/hr_HR.ISO_8859-2.src
deleted file mode 100644
index a711ff76db9d..000000000000
--- a/share/msgdef/hr_HR.ISO_8859-2.src
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# yesexpr
-^[dDyY].*
-# noexpr
-^[nN].*
-# EOF
diff --git a/share/msgdef/hu_HU.ISO_8859-2.src b/share/msgdef/hu_HU.ISO_8859-2.src
deleted file mode 100644
index 4f009c700567..000000000000
--- a/share/msgdef/hu_HU.ISO_8859-2.src
+++ /dev/null
@@ -1,14 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# yesexpr
-^[iIyY].*
-# noexpr
-^[nN].*
-# yesstr
-igen
-# nostr
-nem
-# EOF
diff --git a/share/msgdef/is_IS.ISO_8859-1.src b/share/msgdef/is_IS.ISO_8859-1.src
deleted file mode 100644
index a87da07feee2..000000000000
--- a/share/msgdef/is_IS.ISO_8859-1.src
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# yesexpr
-^[jJyY].*
-# noexpr
-^[nN].*
-# EOF
diff --git a/share/msgdef/it_IT.ISO_8859-1.src b/share/msgdef/it_IT.ISO_8859-1.src
deleted file mode 100644
index e839a0a217ba..000000000000
--- a/share/msgdef/it_IT.ISO_8859-1.src
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# yesexpr
-^[sSyY].*
-# noexpr
-^[nN].*
-# EOF
diff --git a/share/msgdef/ja_JP.EUC.src b/share/msgdef/ja_JP.EUC.src
deleted file mode 100644
index 2f06e015abae..000000000000
--- a/share/msgdef/ja_JP.EUC.src
+++ /dev/null
@@ -1,10 +0,0 @@
-# $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/ko_KR.EUC.src b/share/msgdef/ko_KR.EUC.src
deleted file mode 100644
index e839a0a217ba..000000000000
--- a/share/msgdef/ko_KR.EUC.src
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# yesexpr
-^[sSyY].*
-# noexpr
-^[nN].*
-# EOF
diff --git a/share/msgdef/nl_NL.ISO_8859-1.src b/share/msgdef/nl_NL.ISO_8859-1.src
deleted file mode 100644
index a87da07feee2..000000000000
--- a/share/msgdef/nl_NL.ISO_8859-1.src
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# yesexpr
-^[jJyY].*
-# noexpr
-^[nN].*
-# EOF
diff --git a/share/msgdef/no_NO.ISO_8859-1.src b/share/msgdef/no_NO.ISO_8859-1.src
deleted file mode 100644
index a87da07feee2..000000000000
--- a/share/msgdef/no_NO.ISO_8859-1.src
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# yesexpr
-^[jJyY].*
-# noexpr
-^[nN].*
-# EOF
diff --git a/share/msgdef/pl_PL.ISO_8859-2.src b/share/msgdef/pl_PL.ISO_8859-2.src
deleted file mode 100644
index a7acd2adf1f0..000000000000
--- a/share/msgdef/pl_PL.ISO_8859-2.src
+++ /dev/null
@@ -1,14 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# yesexpr
-^[tTyY].*
-# noexpr
-^[nN].*
-# yesstr
-tak
-# nostr
-nie
-# EOF
diff --git a/share/msgdef/pt_PT.ISO_8859-1.src b/share/msgdef/pt_PT.ISO_8859-1.src
deleted file mode 100644
index e839a0a217ba..000000000000
--- a/share/msgdef/pt_PT.ISO_8859-1.src
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# yesexpr
-^[sSyY].*
-# noexpr
-^[nN].*
-# EOF
diff --git a/share/msgdef/ru_RU.ISO_8859-5.src b/share/msgdef/ru_RU.ISO_8859-5.src
deleted file mode 100644
index 360485e980e4..000000000000
--- a/share/msgdef/ru_RU.ISO_8859-5.src
+++ /dev/null
@@ -1,14 +0,0 @@
-# $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/sl_SI.ISO_8859-2.src b/share/msgdef/sl_SI.ISO_8859-2.src
deleted file mode 100644
index 9686b4f232fc..000000000000
--- a/share/msgdef/sl_SI.ISO_8859-2.src
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# yesexpr
-^[YyJj].*
-# noexpr
-^[Nn].*
-# EOF
diff --git a/share/msgdef/sv_SE.ISO_8859-1.src b/share/msgdef/sv_SE.ISO_8859-1.src
deleted file mode 100644
index a87da07feee2..000000000000
--- a/share/msgdef/sv_SE.ISO_8859-1.src
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# yesexpr
-^[jJyY].*
-# noexpr
-^[nN].*
-# EOF
diff --git a/share/msgdef/tr_TR.ISO_8859-9.src b/share/msgdef/tr_TR.ISO_8859-9.src
deleted file mode 100644
index 47329944b040..000000000000
--- a/share/msgdef/tr_TR.ISO_8859-9.src
+++ /dev/null
@@ -1,11 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# yesexpr
-# XXX: I with dot above also should be included to yesexpr
-^[IiYy].*
-# noexpr
-^[nN].*
-# EOF
diff --git a/share/msgdef/zh_CN.EUC.src b/share/msgdef/zh_CN.EUC.src
deleted file mode 100644
index 6e9cd83e04e3..000000000000
--- a/share/msgdef/zh_CN.EUC.src
+++ /dev/null
@@ -1,14 +0,0 @@
-# $FreeBSD$
-#
-# WARNING: spaces may be essential at the end of lines
-# WARNING: empty lines are essential too
-#
-# yesexpr
-^[yY£ù£ÙÊÇ].*
-# noexpr
-^[nN£î£Î²»·ñ].*
-# yesstr
-ÊÇ
-# nostr
-·ñ
-# EOF