Regenerate locales after readding ISO8859-1 for locales that have ISO8859-15

Requested by:	arche

15 files changed, 374 insertions, 196 deletions

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 644341b..be5e9c7 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -49,69 +49,6 @@ OLD_FILES+=usr/share/locale/zh_TW.UTF-8/zh_Hant_TW.UTF-8
 # 20151107: String collation improvements
 OLD_FILES+=usr/share/locale/UTF-8/LC_CTYPE
 OLD_DIRS+=usr/share/locale/UTF-8
-OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_CTYPE
-OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_MONETARY
-OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_NUMERIC
-OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_MESSAGES
-OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_COLLATE
-OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_TIME
-OLD_DIRS+=usr/share/locale/af_ZA.ISO8859-15
-OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_TIME
-OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_NUMERIC
-OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_MESSAGES
-OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_CTYPE
-OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_COLLATE
-OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_MONETARY
-OLD_DIRS+=usr/share/locale/ca_AD.ISO8859-1
-OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_MESSAGES
-OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_COLLATE
-OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_MONETARY
-OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_TIME
-OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_NUMERIC
-OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_CTYPE
-OLD_DIRS+=usr/share/locale/ca_FR.ISO8859-1
-OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_MONETARY
-OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_COLLATE
-OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_CTYPE
-OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_MESSAGES
-OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_NUMERIC
-OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_TIME
-OLD_DIRS+=usr/share/locale/ca_ES.ISO8859-1
-OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_MONETARY
-OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_NUMERIC
-OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_TIME
-OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_CTYPE
-OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_MESSAGES
-OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_COLLATE
-OLD_DIRS+=usr/share/locale/ca_IT.ISO8859-1
-OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_TIME
-OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_COLLATE
-OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_MESSAGES
-OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_NUMERIC
-OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_MONETARY
-OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_CTYPE
-OLD_DIRS+=usr/share/locale/da_DK.ISO8859-1
-OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_MONETARY
-OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_COLLATE
-OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_TIME
-OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_MESSAGES
-OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_CTYPE
-OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_NUMERIC
-OLD_DIRS+=usr/share/locale/de_AT.ISO8859-1
-OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_MONETARY
-OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_TIME
-OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_COLLATE
-OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_MESSAGES
-OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_CTYPE
-OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_NUMERIC
-OLD_DIRS+=usr/share/locale/de_CH.ISO8859-1
-OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_MONETARY
-OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_TIME
-OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_CTYPE
-OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_COLLATE
-OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_MESSAGES
-OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_NUMERIC
-OLD_DIRS+=usr/share/locale/de_DE.ISO8859-1
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_TIME
@@ -126,13 +63,6 @@ OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_MONETARY
 OLD_DIRS+=usr/share/locale/en_AU.ISO8859-15
-OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_CTYPE
-OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_TIME
-OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_COLLATE
-OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_MESSAGES
-OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_NUMERIC
-OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_MONETARY
-OLD_DIRS+=usr/share/locale/en_GB.ISO8859-1
 OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_COLLATE
@@ -140,20 +70,6 @@ OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_NUMERIC
 OLD_DIRS+=usr/share/locale/en_US.ISO8859-15
-OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_MONETARY
-OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_COLLATE
-OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_TIME
-OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_MESSAGES
-OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_CTYPE
-OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_NUMERIC
-OLD_DIRS+=usr/share/locale/es_ES.ISO8859-1
-OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_CTYPE
-OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_NUMERIC
-OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_MESSAGES
-OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_COLLATE
-OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_TIME
-OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_MONETARY
-OLD_DIRS+=usr/share/locale/eu_ES.ISO8859-1
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_TIME
@@ -161,20 +77,6 @@ OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_CTYPE
 OLD_DIRS+=usr/share/locale/en_NZ.ISO8859-15
-OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_TIME
-OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_CTYPE
-OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_NUMERIC
-OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_MONETARY
-OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_COLLATE
-OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_MESSAGES
-OLD_DIRS+=usr/share/locale/fi_FI.ISO8859-1
-OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_CTYPE
-OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_MONETARY
-OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_COLLATE
-OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_TIME
-OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_MESSAGES
-OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_NUMERIC
-OLD_DIRS+=usr/share/locale/fr_BE.ISO8859-1
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_CTYPE
@@ -182,41 +84,6 @@ OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_MONETARY
 OLD_DIRS+=usr/share/locale/fr_CA.ISO8859-15
-OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_NUMERIC
-OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_TIME
-OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_MESSAGES
-OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_COLLATE
-OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_CTYPE
-OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_MONETARY
-OLD_DIRS+=usr/share/locale/fr_CH.ISO8859-1
-OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_MONETARY
-OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_NUMERIC
-OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_TIME
-OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_CTYPE
-OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_MESSAGES
-OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_COLLATE
-OLD_DIRS+=usr/share/locale/fr_FR.ISO8859-1
-OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_MONETARY
-OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_COLLATE
-OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_MESSAGES
-OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_CTYPE
-OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_NUMERIC
-OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_TIME
-OLD_DIRS+=usr/share/locale/it_CH.ISO8859-1
-OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_MESSAGES
-OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_TIME
-OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_COLLATE
-OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_MONETARY
-OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_CTYPE
-OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_NUMERIC
-OLD_DIRS+=usr/share/locale/is_IS.ISO8859-1
-OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_CTYPE
-OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_TIME
-OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_COLLATE
-OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_MESSAGES
-OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_NUMERIC
-OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_MONETARY
-OLD_DIRS+=usr/share/locale/it_IT.ISO8859-1
 OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_COLLATE
 OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_CTYPE
 OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_MESSAGES
@@ -268,34 +135,6 @@ OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/mn_MN.UTF-8
-OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_TIME
-OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_NUMERIC
-OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_MONETARY
-OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_COLLATE
-OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_MESSAGES
-OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_CTYPE
-OLD_DIRS+=usr/share/locale/nb_NO.ISO8859-1
-OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_MONETARY
-OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_NUMERIC
-OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_CTYPE
-OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_MESSAGES
-OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_TIME
-OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_COLLATE
-OLD_DIRS+=usr/share/locale/nl_BE.ISO8859-1
-OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_MONETARY
-OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_TIME
-OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_COLLATE
-OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_MESSAGES
-OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_NUMERIC
-OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_CTYPE
-OLD_DIRS+=usr/share/locale/nl_NL.ISO8859-1
-OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_CTYPE
-OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_MESSAGES
-OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_COLLATE
-OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_TIME
-OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_MONETARY
-OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_NUMERIC
-OLD_DIRS+=usr/share/locale/nn_NO.ISO8859-1
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_MESSAGES
@@ -317,13 +156,6 @@ OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/no_NO.UTF-8
-OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_MESSAGES
-OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_TIME
-OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_NUMERIC
-OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_MONETARY
-OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_CTYPE
-OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_COLLATE
-OLD_DIRS+=usr/share/locale/pt_PT.ISO8859-1
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_COLLATE
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_TIME
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_CTYPE
@@ -345,13 +177,6 @@ OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_MESSAGES
 OLD_DIRS+=usr/share/locale/sr_YU.UTF-8
-OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_MONETARY
-OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_NUMERIC
-OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_TIME
-OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_MESSAGES
-OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_COLLATE
-OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_CTYPE
-OLD_DIRS+=usr/share/locale/sv_SE.ISO8859-1
 OLD_FILES+=usr/bin/colldef
 OLD_FILES+=usr/share/man/man1/colldef.1.gz
 OLD_FILES+=usr/bin/mklocale
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 6834a52..eb68221 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -543,12 +543,20 @@
             ..
             bg_BG.UTF-8
             ..
+            ca_AD.ISO8859-1
+            ..
             ca_AD.ISO8859-15
             ..
+            ca_ES.ISO8859-1
+            ..
             ca_ES.ISO8859-15
             ..
+            ca_FR.ISO8859-1
+            ..
             ca_FR.ISO8859-15
             ..
+            ca_IT.ISO8859-1
+            ..
             ca_IT.ISO8859-15
             ..
             ca_AD.UTF-8
@@ -563,18 +571,26 @@
             ..
             cs_CZ.UTF-8
             ..
+            da_DK.ISO8859-1
+            ..
             da_DK.ISO8859-15
             ..
             da_DK.UTF-8
             ..
+            de_AT.ISO8859-1
+            ..
             de_AT.ISO8859-15
             ..
             de_AT.UTF-8
             ..
+            de_CH.ISO8859-1
+            ..
             de_CH.ISO8859-15
             ..
             de_CH.UTF-8
             ..
+            de_DE.ISO8859-1
+            ..
             de_DE.ISO8859-15
             ..
             de_DE.UTF-8
@@ -595,6 +611,8 @@
             ..
             en_CA.UTF-8
             ..
+            en_GB.ISO8859-1
+            ..
             en_GB.ISO8859-15
             ..
             en_GB.US-ASCII
@@ -605,6 +623,8 @@
             ..
             en_HK.UTF-8
             ..
+            en_IE.ISO8859-1
+            ..
             en_IE.ISO8859-15
             ..
             en_IE.UTF-8
@@ -639,6 +659,8 @@
             ..
             es_CR.UTF-8
             ..
+            es_ES.ISO8859-1
+            ..
             es_ES.ISO8859-15
             ..
             es_ES.UTF-8
@@ -647,18 +669,26 @@
             ..
             es_MX.UTF-8
             ..
+            et_EE.ISO8859-1
+            ..
             et_EE.ISO8859-15
             ..
             et_EE.UTF-8
             ..
+            eu_ES.ISO8859-1
+            ..
             eu_ES.ISO8859-15
             ..
             eu_ES.UTF-8
             ..
+            fi_FI.ISO8859-1
+            ..
             fi_FI.ISO8859-15
             ..
             fi_FI.UTF-8
             ..
+            fr_BE.ISO8859-1
+            ..
             fr_BE.ISO8859-15
             ..
             fr_BE.UTF-8
@@ -667,10 +697,14 @@
             ..
             fr_CA.UTF-8
             ..
+            fr_CH.ISO8859-1
+            ..
             fr_CH.ISO8859-15
             ..
             fr_CH.UTF-8
             ..
+            fr_FR.ISO8859-1
+            ..
             fr_FR.ISO8859-15
             ..
             fr_FR.UTF-8
@@ -693,14 +727,20 @@
             ..
             hy_AM.UTF-8
             ..
+            is_IS.ISO8859-1
+            ..
             is_IS.ISO8859-15
             ..
             is_IS.UTF-8
             ..
+            it_CH.ISO8859-1
+            ..
             it_CH.ISO8859-15
             ..
             it_CH.UTF-8
             ..
+            it_IT.ISO8859-1
+            ..
             it_IT.ISO8859-15
             ..
             it_IT.UTF-8
@@ -729,18 +769,26 @@
             ..
             mn_Cyrl_MN.UTF-8
             ..
+            nb_NO.ISO8859-1
+            ..
             nb_NO.ISO8859-15
             ..
             nb_NO.UTF-8
             ..
+            nl_BE.ISO8859-1
+            ..
             nl_BE.ISO8859-15
             ..
             nl_BE.UTF-8
             ..
+            nl_NL.ISO8859-1
+            ..
             nl_NL.ISO8859-15
             ..
             nl_NL.UTF-8
             ..
+            nn_NO.ISO8859-1
+            ..
             nn_NO.ISO8859-15
             ..
             nn_NO.UTF-8
@@ -753,6 +801,8 @@
             ..
             pt_BR.UTF-8
             ..
+            pt_PT.ISO8859-1
+            ..
             pt_PT.ISO8859-15
             ..
             pt_PT.UTF-8
@@ -791,10 +841,14 @@
             ..
             sr_Latn_RS.UTF-8
             ..
+            sv_FI.ISO8859-1
+            ..
             sv_FI.ISO8859-15
             ..
             sv_FI.UTF-8
             ..
+            sv_SE.ISO8859-1
+            ..
             sv_SE.ISO8859-15
             ..
             sv_SE.UTF-8
@@ -1239,22 +1293,8 @@
             ..
             ko_KR.eucKR
             ..
-            la_LN.ISO8859-1
-            ..
-            la_LN.ISO8859-13
-            ..
-            la_LN.ISO8859-15
-            ..
-            la_LN.ISO8859-2
-            ..
-            la_LN.ISO8859-4
-            ..
-            la_LN.US-ASCII
-            ..
             lt_LT.ISO8859-13
             ..
-            lt_LT.ISO8859-4
-            ..
             lt_LT.UTF-8
             ..
             lv_LV.ISO8859-13
diff --git a/share/colldef/Makefile b/share/colldef/Makefile
index 308163d..47074f9 100644
--- a/share/colldef/Makefile
+++ b/share/colldef/Makefile
@@ -67,39 +67,54 @@ SAME+=		ru_RU.UTF-8:bg_BG.UTF-8
 SAME+=		ru_RU.UTF-8:bg_BG.CP1251
 SAME+=		ca_AD.UTF-8:ca_IT.UTF-8
 SAME+=		ca_AD.UTF-8:ca_IT.ISO8859-15
+SAME+=		ca_AD.UTF-8:ca_IT.ISO8859-1
 SAME+=		ca_AD.UTF-8:ca_FR.UTF-8
 SAME+=		ca_AD.UTF-8:ca_FR.ISO8859-15
+SAME+=		ca_AD.UTF-8:ca_FR.ISO8859-1
 SAME+=		ca_AD.UTF-8:ca_ES.UTF-8
 SAME+=		ca_AD.UTF-8:ca_ES.ISO8859-15
+SAME+=		ca_AD.UTF-8:ca_ES.ISO8859-1
 SAME+=		ca_AD.UTF-8:ca_AD.ISO8859-15
+SAME+=		ca_AD.UTF-8:ca_AD.ISO8859-1
 SAME+=		cs_CZ.UTF-8:cs_CZ.ISO8859-2
 SAME+=		da_DK.UTF-8:da_DK.ISO8859-15
+SAME+=		da_DK.UTF-8:da_DK.ISO8859-1
 SAME+=		en_US.UTF-8:sr_Latn_RS.UTF-8
 SAME+=		en_US.UTF-8:sr_Latn_RS.ISO8859-2
 SAME+=		en_US.UTF-8:pt_PT.UTF-8
 SAME+=		en_US.UTF-8:pt_PT.ISO8859-15
+SAME+=		en_US.UTF-8:pt_PT.ISO8859-1
 SAME+=		en_US.UTF-8:pt_BR.UTF-8
 SAME+=		en_US.UTF-8:pt_BR.ISO8859-1
 SAME+=		en_US.UTF-8:nn_NO.UTF-8
 SAME+=		en_US.UTF-8:nn_NO.ISO8859-15
+SAME+=		en_US.UTF-8:nn_NO.ISO8859-1
 SAME+=		en_US.UTF-8:nl_NL.UTF-8
 SAME+=		en_US.UTF-8:nl_NL.ISO8859-15
+SAME+=		en_US.UTF-8:nl_NL.ISO8859-1
 SAME+=		en_US.UTF-8:nl_BE.UTF-8
 SAME+=		en_US.UTF-8:nl_BE.ISO8859-15
+SAME+=		en_US.UTF-8:nl_BE.ISO8859-1
 SAME+=		en_US.UTF-8:it_IT.UTF-8
 SAME+=		en_US.UTF-8:it_IT.ISO8859-15
+SAME+=		en_US.UTF-8:it_IT.ISO8859-1
 SAME+=		en_US.UTF-8:it_CH.UTF-8
 SAME+=		en_US.UTF-8:it_CH.ISO8859-15
+SAME+=		en_US.UTF-8:it_CH.ISO8859-1
 SAME+=		en_US.UTF-8:fr_FR.UTF-8
 SAME+=		en_US.UTF-8:fr_FR.ISO8859-15
+SAME+=		en_US.UTF-8:fr_FR.ISO8859-1
 SAME+=		en_US.UTF-8:fr_CH.UTF-8
 SAME+=		en_US.UTF-8:fr_CH.ISO8859-15
+SAME+=		en_US.UTF-8:fr_CH.ISO8859-1
 SAME+=		en_US.UTF-8:fr_CA.UTF-8
 SAME+=		en_US.UTF-8:fr_CA.ISO8859-1
 SAME+=		en_US.UTF-8:fr_BE.UTF-8
 SAME+=		en_US.UTF-8:fr_BE.ISO8859-15
+SAME+=		en_US.UTF-8:fr_BE.ISO8859-1
 SAME+=		en_US.UTF-8:eu_ES.UTF-8
 SAME+=		en_US.UTF-8:eu_ES.ISO8859-15
+SAME+=		en_US.UTF-8:eu_ES.ISO8859-1
 SAME+=		en_US.UTF-8:en_ZA.UTF-8
 SAME+=		en_US.UTF-8:en_ZA.US-ASCII
 SAME+=		en_US.UTF-8:en_ZA.ISO8859-1
@@ -113,11 +128,13 @@ SAME+=		en_US.UTF-8:en_NZ.US-ASCII
 SAME+=		en_US.UTF-8:en_NZ.ISO8859-1
 SAME+=		en_US.UTF-8:en_IE.UTF-8
 SAME+=		en_US.UTF-8:en_IE.ISO8859-15
+SAME+=		en_US.UTF-8:en_IE.ISO8859-1
 SAME+=		en_US.UTF-8:en_HK.UTF-8
 SAME+=		en_US.UTF-8:en_HK.ISO8859-1
 SAME+=		en_US.UTF-8:en_GB.UTF-8
 SAME+=		en_US.UTF-8:en_GB.US-ASCII
 SAME+=		en_US.UTF-8:en_GB.ISO8859-15
+SAME+=		en_US.UTF-8:en_GB.ISO8859-1
 SAME+=		en_US.UTF-8:en_CA.UTF-8
 SAME+=		en_US.UTF-8:en_CA.US-ASCII
 SAME+=		en_US.UTF-8:en_CA.ISO8859-1
@@ -126,38 +143,48 @@ SAME+=		en_US.UTF-8:en_AU.US-ASCII
 SAME+=		en_US.UTF-8:en_AU.ISO8859-1
 SAME+=		en_US.UTF-8:de_DE.UTF-8
 SAME+=		en_US.UTF-8:de_DE.ISO8859-15
+SAME+=		en_US.UTF-8:de_DE.ISO8859-1
 SAME+=		en_US.UTF-8:de_CH.UTF-8
 SAME+=		en_US.UTF-8:de_CH.ISO8859-15
+SAME+=		en_US.UTF-8:de_CH.ISO8859-1
 SAME+=		en_US.UTF-8:de_AT.UTF-8
 SAME+=		en_US.UTF-8:de_AT.ISO8859-15
+SAME+=		en_US.UTF-8:de_AT.ISO8859-1
 SAME+=		el_GR.UTF-8:el_GR.ISO8859-7
 SAME+=		es_MX.UTF-8:es_MX.ISO8859-1
 SAME+=		es_MX.UTF-8:es_ES.UTF-8
 SAME+=		es_MX.UTF-8:es_ES.ISO8859-15
+SAME+=		es_MX.UTF-8:es_ES.ISO8859-1
 SAME+=		es_MX.UTF-8:es_CR.UTF-8
 SAME+=		es_MX.UTF-8:es_AR.UTF-8
 SAME+=		es_MX.UTF-8:es_AR.ISO8859-1
 SAME+=		et_EE.UTF-8:et_EE.ISO8859-15
+SAME+=		et_EE.UTF-8:et_EE.ISO8859-1
 SAME+=		fi_FI.UTF-8:fi_FI.ISO8859-15
+SAME+=		fi_FI.UTF-8:fi_FI.ISO8859-1
 SAME+=		hi_IN.UTF-8:hi_IN.ISCII-DEV
 SAME+=		hr_HR.UTF-8:hr_HR.ISO8859-2
 SAME+=		hu_HU.UTF-8:hu_HU.ISO8859-2
 SAME+=		hy_AM.UTF-8:hy_AM.ARMSCII-8
 SAME+=		is_IS.UTF-8:is_IS.ISO8859-15
+SAME+=		is_IS.UTF-8:is_IS.ISO8859-1
 SAME+=		ja_JP.UTF-8:ja_JP.SJIS
 SAME+=		ja_JP.UTF-8:ja_JP.eucJP
 SAME+=		ko_KR.UTF-8:ko_KR.eucKR
 SAME+=		lt_LT.UTF-8:lt_LT.ISO8859-13
 SAME+=		lv_LV.UTF-8:lv_LV.ISO8859-13
 SAME+=		nb_NO.UTF-8:nb_NO.ISO8859-15
+SAME+=		nb_NO.UTF-8:nb_NO.ISO8859-1
 SAME+=		pl_PL.UTF-8:pl_PL.ISO8859-2
 SAME+=		ro_RO.UTF-8:ro_RO.ISO8859-2
 SAME+=		se_NO.UTF-8:se_FI.UTF-8
 SAME+=		sk_SK.UTF-8:sk_SK.ISO8859-2
 SAME+=		sl_SI.UTF-8:sl_SI.ISO8859-2
 SAME+=		sv_SE.UTF-8:sv_SE.ISO8859-15
+SAME+=		sv_SE.UTF-8:sv_SE.ISO8859-1
 SAME+=		sv_SE.UTF-8:sv_FI.UTF-8
 SAME+=		sv_SE.UTF-8:sv_FI.ISO8859-15
+SAME+=		sv_SE.UTF-8:sv_FI.ISO8859-1
 SAME+=		tr_TR.UTF-8:tr_TR.ISO8859-9
 SAME+=		uk_UA.UTF-8:uk_UA.KOI8-U
 SAME+=		uk_UA.UTF-8:uk_UA.ISO8859-5
diff --git a/share/ctypedef/Makefile b/share/ctypedef/Makefile
index 21d3820..56a5607 100644
--- a/share/ctypedef/Makefile
+++ b/share/ctypedef/Makefile
@@ -13,6 +13,7 @@ MAPLOC=		${.CURDIR}/../../tools/tools/locale/etc/final-maps
 	-i ${.IMPSRC} ${.OBJDIR}/${.IMPSRC:T:R}  || true
 
 LOCALES+=	be_BY.CP1131
+LOCALES+=	ca_IT.ISO8859-1
 LOCALES+=	ca_IT.ISO8859-15
 LOCALES+=	el_GR.ISO8859-7
 LOCALES+=	en_GB.ISO8859-15
@@ -117,21 +118,47 @@ SAME+=		en_US.UTF-8:ar_EG.UTF-8
 SAME+=		en_US.UTF-8:ar_AE.UTF-8
 SAME+=		en_US.UTF-8:am_ET.UTF-8
 SAME+=		en_US.UTF-8:af_ZA.UTF-8
+SAME+=		en_US.ISO8859-1:sv_SE.ISO8859-1
+SAME+=		en_US.ISO8859-1:sv_FI.ISO8859-1
+SAME+=		en_US.ISO8859-1:pt_PT.ISO8859-1
 SAME+=		en_US.ISO8859-1:pt_BR.ISO8859-1
+SAME+=		en_US.ISO8859-1:nn_NO.ISO8859-1
+SAME+=		en_US.ISO8859-1:nl_NL.ISO8859-1
+SAME+=		en_US.ISO8859-1:nl_BE.ISO8859-1
+SAME+=		en_US.ISO8859-1:nb_NO.ISO8859-1
+SAME+=		en_US.ISO8859-1:it_IT.ISO8859-1
+SAME+=		en_US.ISO8859-1:it_CH.ISO8859-1
+SAME+=		en_US.ISO8859-1:is_IS.ISO8859-1
+SAME+=		en_US.ISO8859-1:fr_FR.ISO8859-1
+SAME+=		en_US.ISO8859-1:fr_CH.ISO8859-1
 SAME+=		en_US.ISO8859-1:fr_CA.ISO8859-1
+SAME+=		en_US.ISO8859-1:fr_BE.ISO8859-1
+SAME+=		en_US.ISO8859-1:fi_FI.ISO8859-1
+SAME+=		en_US.ISO8859-1:eu_ES.ISO8859-1
+SAME+=		en_US.ISO8859-1:et_EE.ISO8859-1
 SAME+=		en_US.ISO8859-1:es_MX.ISO8859-1
+SAME+=		en_US.ISO8859-1:es_ES.ISO8859-1
 SAME+=		en_US.ISO8859-1:es_AR.ISO8859-1
 SAME+=		en_US.ISO8859-1:en_ZA.ISO8859-1
 SAME+=		en_US.ISO8859-1:en_SG.ISO8859-1
 SAME+=		en_US.ISO8859-1:en_NZ.ISO8859-1
+SAME+=		en_US.ISO8859-1:en_IE.ISO8859-1
 SAME+=		en_US.ISO8859-1:en_HK.ISO8859-1
+SAME+=		en_US.ISO8859-1:en_GB.ISO8859-1
 SAME+=		en_US.ISO8859-1:en_CA.ISO8859-1
 SAME+=		en_US.ISO8859-1:en_AU.ISO8859-1
+SAME+=		en_US.ISO8859-1:de_DE.ISO8859-1
+SAME+=		en_US.ISO8859-1:de_CH.ISO8859-1
+SAME+=		en_US.ISO8859-1:de_AT.ISO8859-1
+SAME+=		en_US.ISO8859-1:da_DK.ISO8859-1
 SAME+=		en_US.ISO8859-1:af_ZA.ISO8859-1
 SAME+=		ru_RU.CP1251:bg_BG.CP1251
 SAME+=		ru_RU.CP1251:be_BY.CP1251
 SAME+=		ru_RU.ISO8859-5:sr_Cyrl_RS.ISO8859-5
 SAME+=		ru_RU.ISO8859-5:be_BY.ISO8859-5
+SAME+=		ca_IT.ISO8859-1:ca_FR.ISO8859-1
+SAME+=		ca_IT.ISO8859-1:ca_ES.ISO8859-1
+SAME+=		ca_IT.ISO8859-1:ca_AD.ISO8859-1
 SAME+=		ca_IT.ISO8859-15:ca_FR.ISO8859-15
 SAME+=		ca_IT.ISO8859-15:ca_ES.ISO8859-15
 SAME+=		ca_IT.ISO8859-15:ca_AD.ISO8859-15
@@ -184,22 +211,23 @@ SYMLINKS+=	../${f:C/:.*$//}/${FILESNAME} \
 FILESDIR_${f}.LC_CTYPE= ${LOCALEDIR}/${f}
 .endfor
 
+SYMPAIRS+=	ca_IT.ISO8859-1.src:ca_IT.ISO8859-15.src
 SYMPAIRS+=	be_BY.CP1131.src:ru_RU.CP1251.src
 SYMPAIRS+=	be_BY.CP1131.src:ru_RU.CP866.src
 SYMPAIRS+=	be_BY.CP1131.src:ru_RU.ISO8859-5.src
 SYMPAIRS+=	be_BY.CP1131.src:ru_RU.KOI8-R.src
 SYMPAIRS+=	uk_UA.CP1251.src:uk_UA.ISO8859-5.src
 SYMPAIRS+=	uk_UA.CP1251.src:uk_UA.KOI8-U.src
-SYMPAIRS+=	zh_Hans_CN.GB18030.src:zh_Hans_CN.GB2312.src
-SYMPAIRS+=	zh_Hans_CN.GB18030.src:zh_Hans_CN.GBK.src
-SYMPAIRS+=	zh_Hans_CN.GB18030.src:zh_Hans_CN.eucCN.src
+SYMPAIRS+=	zh_Hans_CN.eucCN.src:zh_Hans_CN.GB18030.src
+SYMPAIRS+=	zh_Hans_CN.eucCN.src:zh_Hans_CN.GB2312.src
+SYMPAIRS+=	zh_Hans_CN.eucCN.src:zh_Hans_CN.GBK.src
 SYMPAIRS+=	zh_Hant_HK.Big5HKSCS.src:zh_Hant_TW.Big5.src
 SYMPAIRS+=	en_GB.ISO8859-15.src:en_US.ISO8859-1.src
 SYMPAIRS+=	en_GB.ISO8859-15.src:en_US.US-ASCII.src
 SYMPAIRS+=	en_GB.ISO8859-15.src:lv_LV.ISO8859-13.src
 SYMPAIRS+=	en_GB.ISO8859-15.src:sr_Latn_RS.ISO8859-2.src
 SYMPAIRS+=	en_GB.ISO8859-15.src:tr_TR.ISO8859-9.src
-SYMPAIRS+=	ja_JP.SJIS.src:ja_JP.eucJP.src
+SYMPAIRS+=	ja_JP.eucJP.src:ja_JP.SJIS.src
 
 .for PAIR in ${SYMPAIRS}
 ${PAIR:C/^.*://:S/src$/LC_CTYPE/}: ${PAIR:C/:.*//}
diff --git a/share/ctypedef/ca_IT.ISO8859-15.src b/share/ctypedef/ca_IT.ISO8859-1.src
index aa3608e..aa3608e 100644
--- a/share/ctypedef/ca_IT.ISO8859-15.src
+++ b/share/ctypedef/ca_IT.ISO8859-1.src
diff --git a/share/ctypedef/ja_JP.SJIS.src b/share/ctypedef/ja_JP.eucJP.src
index 73b93d8..73b93d8 100644
--- a/share/ctypedef/ja_JP.SJIS.src
+++ b/share/ctypedef/ja_JP.eucJP.src
diff --git a/share/ctypedef/zh_Hans_CN.GB18030.src b/share/ctypedef/zh_Hans_CN.eucCN.src
index e70b37b..e70b37b 100644
--- a/share/ctypedef/zh_Hans_CN.GB18030.src
+++ b/share/ctypedef/zh_Hans_CN.eucCN.src
diff --git a/share/monetdef/Makefile b/share/monetdef/Makefile
index 5e758e6..12397a3 100644
--- a/share/monetdef/Makefile
+++ b/share/monetdef/Makefile
@@ -25,6 +25,7 @@ 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
@@ -32,6 +33,7 @@ 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
@@ -70,6 +72,7 @@ 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
@@ -83,11 +86,11 @@ LOCALES+=	ru_RU.ISO8859-5
 LOCALES+=	ru_RU.KOI8-R
 LOCALES+=	ru_RU.UTF-8
 LOCALES+=	se_NO.UTF-8
-LOCALES+=	sk_SK.ISO8859-2
 LOCALES+=	sk_SK.UTF-8
 LOCALES+=	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
@@ -108,6 +111,16 @@ LOCALES+=	zh_Hant_TW.UTF-8
 
 SAME+=		en_ZA.ISO8859-1: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
@@ -130,13 +143,17 @@ 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-1
 SAME+=		en_CA.UTF-8:en_CA.US-ASCII
 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
@@ -147,6 +164,12 @@ SAME+=		en_US.UTF-8:en_US.US-ASCII
 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
@@ -157,15 +180,19 @@ 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_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+=		sk_SK.ISO8859-2:lt_LT.ISO8859-13
+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)
 
diff --git a/share/monetdef/de_AT.ISO8859-1.src b/share/monetdef/de_AT.ISO8859-1.src
new file mode 100644
index 0000000..2fc7d45
--- /dev/null
+++ b/share/monetdef/de_AT.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
+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/en_IE.ISO8859-1.src b/share/monetdef/en_IE.ISO8859-1.src
new file mode 100644
index 0000000..0f45ca6
--- /dev/null
+++ b/share/monetdef/en_IE.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
+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/nl_NL.ISO8859-1.src b/share/monetdef/nl_NL.ISO8859-1.src
new file mode 100644
index 0000000..fff1387
--- /dev/null
+++ b/share/monetdef/nl_NL.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
+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/sk_SK.ISO8859-2.src b/share/monetdef/sv_FI.ISO8859-1.src
index 9f91793..9f91793 100644
--- a/share/monetdef/sk_SK.ISO8859-2.src
+++ b/share/monetdef/sv_FI.ISO8859-1.src
diff --git a/share/msgdef/Makefile b/share/msgdef/Makefile
index 136ad8c..a303dcc 100644
--- a/share/msgdef/Makefile
+++ b/share/msgdef/Makefile
@@ -84,8 +84,10 @@ LOCALES+=	zh_Hant_TW.Big5
 LOCALES+=	zh_Hant_TW.UTF-8
 
 SAME+=		nl_NL.UTF-8:nl_NL.ISO8859-15
+SAME+=		nl_NL.UTF-8:nl_NL.ISO8859-1
 SAME+=		nl_NL.UTF-8:nl_BE.UTF-8
 SAME+=		nl_NL.UTF-8:nl_BE.ISO8859-15
+SAME+=		nl_NL.UTF-8:nl_BE.ISO8859-1
 SAME+=		nl_NL.UTF-8:af_ZA.UTF-8
 SAME+=		nl_NL.UTF-8:af_ZA.ISO8859-1
 SAME+=		ar_SA.UTF-8:ar_QA.UTF-8
@@ -94,11 +96,16 @@ SAME+=		ar_SA.UTF-8:ar_JO.UTF-8
 SAME+=		ar_SA.UTF-8:ar_EG.UTF-8
 SAME+=		ar_SA.UTF-8:ar_AE.UTF-8
 SAME+=		es_MX.ISO8859-1:es_ES.ISO8859-15
+SAME+=		es_MX.ISO8859-1:es_ES.ISO8859-1
 SAME+=		es_MX.ISO8859-1:es_AR.ISO8859-1
 SAME+=		es_MX.ISO8859-1:ca_IT.ISO8859-15
+SAME+=		es_MX.ISO8859-1:ca_IT.ISO8859-1
 SAME+=		es_MX.ISO8859-1:ca_FR.ISO8859-15
+SAME+=		es_MX.ISO8859-1:ca_FR.ISO8859-1
 SAME+=		es_MX.ISO8859-1:ca_ES.ISO8859-15
+SAME+=		es_MX.ISO8859-1:ca_ES.ISO8859-1
 SAME+=		es_MX.ISO8859-1:ca_AD.ISO8859-15
+SAME+=		es_MX.ISO8859-1:ca_AD.ISO8859-1
 SAME+=		es_MX.UTF-8:es_ES.UTF-8
 SAME+=		es_MX.UTF-8:es_CR.UTF-8
 SAME+=		es_MX.UTF-8:es_AR.UTF-8
@@ -108,15 +115,21 @@ SAME+=		es_MX.UTF-8:ca_ES.UTF-8
 SAME+=		es_MX.UTF-8:ca_AD.UTF-8
 SAME+=		cs_CZ.UTF-8:cs_CZ.ISO8859-2
 SAME+=		sv_SE.UTF-8:sv_SE.ISO8859-15
+SAME+=		sv_SE.UTF-8:sv_SE.ISO8859-1
 SAME+=		sv_SE.UTF-8:sv_FI.UTF-8
 SAME+=		sv_SE.UTF-8:sv_FI.ISO8859-15
+SAME+=		sv_SE.UTF-8:sv_FI.ISO8859-1
 SAME+=		sv_SE.UTF-8:da_DK.UTF-8
 SAME+=		sv_SE.UTF-8:da_DK.ISO8859-15
+SAME+=		sv_SE.UTF-8:da_DK.ISO8859-1
 SAME+=		de_DE.UTF-8:de_DE.ISO8859-15
+SAME+=		de_DE.UTF-8:de_DE.ISO8859-1
 SAME+=		de_DE.UTF-8:de_CH.UTF-8
 SAME+=		de_DE.UTF-8:de_CH.ISO8859-15
+SAME+=		de_DE.UTF-8:de_CH.ISO8859-1
 SAME+=		de_DE.UTF-8:de_AT.UTF-8
 SAME+=		de_DE.UTF-8:de_AT.ISO8859-15
+SAME+=		de_DE.UTF-8:de_AT.ISO8859-1
 SAME+=		en_US.UTF-8:en_ZA.UTF-8
 SAME+=		en_US.UTF-8:en_ZA.US-ASCII
 SAME+=		en_US.UTF-8:en_ZA.ISO8859-1
@@ -130,11 +143,13 @@ SAME+=		en_US.UTF-8:en_NZ.US-ASCII
 SAME+=		en_US.UTF-8:en_NZ.ISO8859-1
 SAME+=		en_US.UTF-8:en_IE.UTF-8
 SAME+=		en_US.UTF-8:en_IE.ISO8859-15
+SAME+=		en_US.UTF-8:en_IE.ISO8859-1
 SAME+=		en_US.UTF-8:en_HK.UTF-8
 SAME+=		en_US.UTF-8:en_HK.ISO8859-1
 SAME+=		en_US.UTF-8:en_GB.UTF-8
 SAME+=		en_US.UTF-8:en_GB.US-ASCII
 SAME+=		en_US.UTF-8:en_GB.ISO8859-15
+SAME+=		en_US.UTF-8:en_GB.ISO8859-1
 SAME+=		en_US.UTF-8:en_CA.UTF-8
 SAME+=		en_US.UTF-8:en_CA.US-ASCII
 SAME+=		en_US.UTF-8:en_CA.ISO8859-1
@@ -142,24 +157,36 @@ SAME+=		en_US.UTF-8:en_AU.UTF-8
 SAME+=		en_US.UTF-8:en_AU.US-ASCII
 SAME+=		en_US.UTF-8:en_AU.ISO8859-1
 SAME+=		et_EE.UTF-8:et_EE.ISO8859-15
+SAME+=		et_EE.UTF-8:et_EE.ISO8859-1
 SAME+=		eu_ES.UTF-8:eu_ES.ISO8859-15
+SAME+=		eu_ES.UTF-8:eu_ES.ISO8859-1
+SAME+=		fi_FI.ISO8859-15:fi_FI.ISO8859-1
 SAME+=		fr_FR.UTF-8:fr_FR.ISO8859-15
+SAME+=		fr_FR.UTF-8:fr_FR.ISO8859-1
 SAME+=		fr_FR.UTF-8:fr_CH.UTF-8
 SAME+=		fr_FR.UTF-8:fr_CH.ISO8859-15
+SAME+=		fr_FR.UTF-8:fr_CH.ISO8859-1
 SAME+=		fr_FR.UTF-8:fr_CA.UTF-8
 SAME+=		fr_FR.UTF-8:fr_CA.ISO8859-1
 SAME+=		fr_FR.UTF-8:fr_BE.UTF-8
 SAME+=		fr_FR.UTF-8:fr_BE.ISO8859-15
+SAME+=		fr_FR.UTF-8:fr_BE.ISO8859-1
 SAME+=		sl_SI.UTF-8:sl_SI.ISO8859-2
 SAME+=		sl_SI.UTF-8:hr_HR.UTF-8
 SAME+=		sl_SI.UTF-8:hr_HR.ISO8859-2
 SAME+=		hu_HU.UTF-8:hu_HU.ISO8859-2
+SAME+=		is_IS.ISO8859-15:is_IS.ISO8859-1
+SAME+=		it_IT.ISO8859-15:it_IT.ISO8859-1
 SAME+=		it_IT.ISO8859-15:it_CH.ISO8859-15
+SAME+=		it_IT.ISO8859-15:it_CH.ISO8859-1
 SAME+=		it_IT.UTF-8:it_CH.UTF-8
 SAME+=		lt_LT.UTF-8:lt_LT.ISO8859-13
 SAME+=		nb_NO.UTF-8:nb_NO.ISO8859-15
+SAME+=		nb_NO.UTF-8:nb_NO.ISO8859-1
 SAME+=		nn_NO.UTF-8:nn_NO.ISO8859-15
+SAME+=		nn_NO.UTF-8:nn_NO.ISO8859-1
 SAME+=		pl_PL.UTF-8:pl_PL.ISO8859-2
+SAME+=		pt_PT.ISO8859-15:pt_PT.ISO8859-1
 SAME+=		pt_PT.ISO8859-15:pt_BR.ISO8859-1
 SAME+=		pt_PT.UTF-8:pt_BR.UTF-8
 SAME+=		ro_RO.UTF-8:ro_RO.ISO8859-2
diff --git a/share/numericdef/Makefile b/share/numericdef/Makefile
index 02e81d0..727fe33 100644
--- a/share/numericdef/Makefile
+++ b/share/numericdef/Makefile
@@ -29,21 +29,29 @@ LOCALES+=	zh_Hant_TW.Big5
 
 SAME+=		uk_UA.ISO8859-5:uk_UA.CP1251
 SAME+=		uk_UA.ISO8859-5:sv_SE.ISO8859-15
+SAME+=		uk_UA.ISO8859-5:sv_SE.ISO8859-1
 SAME+=		uk_UA.ISO8859-5:sv_FI.ISO8859-15
+SAME+=		uk_UA.ISO8859-5:sv_FI.ISO8859-1
 SAME+=		uk_UA.ISO8859-5:sk_SK.ISO8859-2
 SAME+=		uk_UA.ISO8859-5:ru_RU.ISO8859-5
 SAME+=		uk_UA.ISO8859-5:ru_RU.CP1251
 SAME+=		uk_UA.ISO8859-5:pt_PT.ISO8859-15
+SAME+=		uk_UA.ISO8859-5:pt_PT.ISO8859-1
 SAME+=		uk_UA.ISO8859-5:pl_PL.ISO8859-2
 SAME+=		uk_UA.ISO8859-5:nn_NO.ISO8859-15
+SAME+=		uk_UA.ISO8859-5:nn_NO.ISO8859-1
 SAME+=		uk_UA.ISO8859-5:nb_NO.ISO8859-15
+SAME+=		uk_UA.ISO8859-5:nb_NO.ISO8859-1
 SAME+=		uk_UA.ISO8859-5:lv_LV.ISO8859-13
 SAME+=		uk_UA.ISO8859-5:lt_LT.ISO8859-13
 SAME+=		uk_UA.ISO8859-5:hu_HU.ISO8859-2
 SAME+=		uk_UA.ISO8859-5:fr_FR.ISO8859-15
+SAME+=		uk_UA.ISO8859-5:fr_FR.ISO8859-1
 SAME+=		uk_UA.ISO8859-5:fr_CA.ISO8859-1
 SAME+=		uk_UA.ISO8859-5:fi_FI.ISO8859-15
+SAME+=		uk_UA.ISO8859-5:fi_FI.ISO8859-1
 SAME+=		uk_UA.ISO8859-5:et_EE.ISO8859-15
+SAME+=		uk_UA.ISO8859-5:et_EE.ISO8859-1
 SAME+=		uk_UA.ISO8859-5:en_ZA.ISO8859-1
 SAME+=		uk_UA.ISO8859-5:cs_CZ.ISO8859-2
 SAME+=		uk_UA.ISO8859-5:bg_BG.CP1251
@@ -98,11 +106,13 @@ SAME+=		en_US.UTF-8:en_NZ.US-ASCII
 SAME+=		en_US.UTF-8:en_NZ.ISO8859-1
 SAME+=		en_US.UTF-8:en_IE.UTF-8
 SAME+=		en_US.UTF-8:en_IE.ISO8859-15
+SAME+=		en_US.UTF-8:en_IE.ISO8859-1
 SAME+=		en_US.UTF-8:en_HK.UTF-8
 SAME+=		en_US.UTF-8:en_HK.ISO8859-1
 SAME+=		en_US.UTF-8:en_GB.UTF-8
 SAME+=		en_US.UTF-8:en_GB.US-ASCII
 SAME+=		en_US.UTF-8:en_GB.ISO8859-15
+SAME+=		en_US.UTF-8:en_GB.ISO8859-1
 SAME+=		en_US.UTF-8:en_CA.UTF-8
 SAME+=		en_US.UTF-8:en_CA.US-ASCII
 SAME+=		en_US.UTF-8:en_CA.ISO8859-1
@@ -123,20 +133,27 @@ SAME+=		tr_TR.UTF-8:pt_BR.UTF-8
 SAME+=		tr_TR.UTF-8:pt_BR.ISO8859-1
 SAME+=		tr_TR.UTF-8:nl_NL.UTF-8
 SAME+=		tr_TR.UTF-8:nl_NL.ISO8859-15
+SAME+=		tr_TR.UTF-8:nl_NL.ISO8859-1
 SAME+=		tr_TR.UTF-8:nl_BE.UTF-8
 SAME+=		tr_TR.UTF-8:nl_BE.ISO8859-15
+SAME+=		tr_TR.UTF-8:nl_BE.ISO8859-1
 SAME+=		tr_TR.UTF-8:it_IT.UTF-8
 SAME+=		tr_TR.UTF-8:it_IT.ISO8859-15
+SAME+=		tr_TR.UTF-8:it_IT.ISO8859-1
 SAME+=		tr_TR.UTF-8:is_IS.UTF-8
 SAME+=		tr_TR.UTF-8:is_IS.ISO8859-15
+SAME+=		tr_TR.UTF-8:is_IS.ISO8859-1
 SAME+=		tr_TR.UTF-8:hr_HR.UTF-8
 SAME+=		tr_TR.UTF-8:hr_HR.ISO8859-2
 SAME+=		tr_TR.UTF-8:fr_BE.UTF-8
 SAME+=		tr_TR.UTF-8:fr_BE.ISO8859-15
+SAME+=		tr_TR.UTF-8:fr_BE.ISO8859-1
 SAME+=		tr_TR.UTF-8:eu_ES.UTF-8
 SAME+=		tr_TR.UTF-8:eu_ES.ISO8859-15
+SAME+=		tr_TR.UTF-8:eu_ES.ISO8859-1
 SAME+=		tr_TR.UTF-8:es_ES.UTF-8
 SAME+=		tr_TR.UTF-8:es_ES.ISO8859-15
+SAME+=		tr_TR.UTF-8:es_ES.ISO8859-1
 SAME+=		tr_TR.UTF-8:es_CR.UTF-8
 SAME+=		tr_TR.UTF-8:es_AR.UTF-8
 SAME+=		tr_TR.UTF-8:es_AR.ISO8859-1
@@ -144,23 +161,33 @@ SAME+=		tr_TR.UTF-8:el_GR.UTF-8
 SAME+=		tr_TR.UTF-8:el_GR.ISO8859-7
 SAME+=		tr_TR.UTF-8:de_DE.UTF-8
 SAME+=		tr_TR.UTF-8:de_DE.ISO8859-15
+SAME+=		tr_TR.UTF-8:de_DE.ISO8859-1
 SAME+=		tr_TR.UTF-8:de_AT.UTF-8
 SAME+=		tr_TR.UTF-8:de_AT.ISO8859-15
+SAME+=		tr_TR.UTF-8:de_AT.ISO8859-1
 SAME+=		tr_TR.UTF-8:da_DK.UTF-8
 SAME+=		tr_TR.UTF-8:da_DK.ISO8859-15
+SAME+=		tr_TR.UTF-8:da_DK.ISO8859-1
 SAME+=		tr_TR.UTF-8:ca_IT.UTF-8
 SAME+=		tr_TR.UTF-8:ca_IT.ISO8859-15
+SAME+=		tr_TR.UTF-8:ca_IT.ISO8859-1
 SAME+=		tr_TR.UTF-8:ca_FR.UTF-8
 SAME+=		tr_TR.UTF-8:ca_FR.ISO8859-15
+SAME+=		tr_TR.UTF-8:ca_FR.ISO8859-1
 SAME+=		tr_TR.UTF-8:ca_ES.UTF-8
 SAME+=		tr_TR.UTF-8:ca_ES.ISO8859-15
+SAME+=		tr_TR.UTF-8:ca_ES.ISO8859-1
 SAME+=		tr_TR.UTF-8:ca_AD.UTF-8
 SAME+=		tr_TR.UTF-8:ca_AD.ISO8859-15
+SAME+=		tr_TR.UTF-8:ca_AD.ISO8859-1
 SAME+=		tr_TR.UTF-8:ar_MA.UTF-8
 SAME+=		ru_RU.CP866:be_BY.CP1131
 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+=		fr_CH.ISO8859-15:fr_CH.ISO8859-1
 SAME+=		hi_IN.UTF-8:hi_IN.ISCII-DEV
 SAME+=		hy_AM.UTF-8:hy_AM.ARMSCII-8
 SAME+=		uk_UA.KOI8-U:ru_RU.KOI8-R
diff --git a/share/timedef/Makefile b/share/timedef/Makefile
index c078dc8..fbbe7e1 100644
--- a/share/timedef/Makefile
+++ b/share/timedef/Makefile
@@ -2,7 +2,7 @@
 # Warning: Do not edit. This file is automatically generated from the
 # tools in /usr/src/tools/tools/locale.
 
-LOCALEDIR=	/usr/share/locale
+LOCALEDIR=	${SHAREDIR}/locale
 FILESNAME=	LC_TIME
 .SUFFIXES:	.src .out
 
@@ -136,13 +136,21 @@ SAME+=		af_ZA.UTF-8:af_ZA.ISO8859-1
 SAME+=		ar_SA.UTF-8:ar_QA.UTF-8
 SAME+=		ar_SA.UTF-8:ar_EG.UTF-8
 SAME+=		ar_SA.UTF-8:ar_AE.UTF-8
+SAME+=		ca_IT.ISO8859-15:ca_IT.ISO8859-1
 SAME+=		ca_IT.ISO8859-15:ca_FR.ISO8859-15
+SAME+=		ca_IT.ISO8859-15:ca_FR.ISO8859-1
 SAME+=		ca_IT.ISO8859-15:ca_ES.ISO8859-15
+SAME+=		ca_IT.ISO8859-15:ca_ES.ISO8859-1
 SAME+=		ca_IT.ISO8859-15:ca_AD.ISO8859-15
+SAME+=		ca_IT.ISO8859-15:ca_AD.ISO8859-1
 SAME+=		ca_IT.UTF-8:ca_FR.UTF-8
 SAME+=		ca_IT.UTF-8:ca_ES.UTF-8
 SAME+=		ca_IT.UTF-8:ca_AD.UTF-8
+SAME+=		da_DK.ISO8859-15:da_DK.ISO8859-1
+SAME+=		de_AT.ISO8859-15:de_AT.ISO8859-1
+SAME+=		de_DE.ISO8859-15:de_DE.ISO8859-1
 SAME+=		de_DE.ISO8859-15:de_CH.ISO8859-15
+SAME+=		de_DE.ISO8859-15:de_CH.ISO8859-1
 SAME+=		de_DE.UTF-8:de_CH.UTF-8
 SAME+=		en_HK.UTF-8:en_HK.ISO8859-1
 SAME+=		en_HK.UTF-8:en_AU.UTF-8
@@ -152,7 +160,9 @@ SAME+=		en_CA.UTF-8:en_CA.US-ASCII
 SAME+=		en_CA.UTF-8:en_CA.ISO8859-1
 SAME+=		en_GB.UTF-8:en_GB.US-ASCII
 SAME+=		en_GB.UTF-8:en_GB.ISO8859-15
+SAME+=		en_GB.UTF-8:en_GB.ISO8859-1
 SAME+=		en_IE.UTF-8:en_IE.ISO8859-15
+SAME+=		en_IE.UTF-8:en_IE.ISO8859-1
 SAME+=		en_SG.UTF-8:en_SG.ISO8859-1
 SAME+=		en_SG.UTF-8:en_NZ.UTF-8
 SAME+=		en_SG.UTF-8:en_NZ.US-ASCII
@@ -162,10 +172,27 @@ SAME+=		en_US.UTF-8:en_US.ISO8859-1
 SAME+=		en_ZA.UTF-8:en_ZA.US-ASCII
 SAME+=		en_ZA.UTF-8:en_ZA.ISO8859-1
 SAME+=		es_CR.UTF-8:es_AR.UTF-8
+SAME+=		es_ES.ISO8859-15:es_ES.ISO8859-1
+SAME+=		et_EE.ISO8859-15:et_EE.ISO8859-1
 SAME+=		eu_ES.UTF-8:eu_ES.ISO8859-15
+SAME+=		eu_ES.UTF-8:eu_ES.ISO8859-1
+SAME+=		fi_FI.ISO8859-15:fi_FI.ISO8859-1
+SAME+=		fr_BE.ISO8859-15:fr_BE.ISO8859-1
+SAME+=		fr_CH.ISO8859-15:fr_CH.ISO8859-1
+SAME+=		fr_FR.ISO8859-15:fr_FR.ISO8859-1
+SAME+=		is_IS.ISO8859-15:is_IS.ISO8859-1
+SAME+=		it_CH.ISO8859-15:it_CH.ISO8859-1
+SAME+=		it_IT.ISO8859-15:it_IT.ISO8859-1
+SAME+=		nb_NO.ISO8859-15:nb_NO.ISO8859-1
 SAME+=		nl_BE.UTF-8:nl_BE.ISO8859-15
+SAME+=		nl_BE.UTF-8:nl_BE.ISO8859-1
 SAME+=		nl_NL.UTF-8:nl_NL.ISO8859-15
+SAME+=		nl_NL.UTF-8:nl_NL.ISO8859-1
+SAME+=		nn_NO.ISO8859-15:nn_NO.ISO8859-1
+SAME+=		pt_PT.ISO8859-15:pt_PT.ISO8859-1
 SAME+=		sr_Latn_RS.UTF-8:sr_Cyrl_RS.UTF-8
+SAME+=		sv_FI.ISO8859-15:sv_FI.ISO8859-1
+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)