Bring back a couple of ISO8859-15 locales:

- af_ZA.ISO8859-15
- en_AU.ISO8859-15
- en_CA.ISO8859-15
- en_NZ.ISO8859-15
- en_US.ISO8859-15
- fr_CA.ISO8859-15

14 files changed, 121 insertions, 70 deletions

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index be5e9c7..4e69783 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -49,41 +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/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
-OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_CTYPE
-OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_COLLATE
-OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_MONETARY
-OLD_DIRS+=usr/share/locale/en_CA.ISO8859-15
-OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_COLLATE
-OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_CTYPE
-OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_MESSAGES
-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_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
-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/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
-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/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
-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/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
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index eb68221..3fced30 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -515,6 +515,8 @@
         locale
             af_ZA.ISO8859-1
             ..
+            af_ZA.ISO8859-15
+            ..
             af_ZA.UTF-8
             ..
             ar_AE.UTF-8
@@ -601,12 +603,16 @@
             ..
             en_AU.ISO8859-1
             ..
+            en_AU.ISO8859-15
+            ..
             en_AU.US-ASCII
             ..
             en_AU.UTF-8
             ..
             en_CA.ISO8859-1
             ..
+            en_CA.ISO8859-15
+            ..
             en_CA.US-ASCII
             ..
             en_CA.UTF-8
@@ -631,6 +637,8 @@
             ..
             en_NZ.ISO8859-1
             ..
+            en_NZ.ISO8859-15
+            ..
             en_NZ.US-ASCII
             ..
             en_NZ.UTF-8
@@ -643,12 +651,16 @@
             ..
             en_US.ISO8859-1
             ..
+            en_US.ISO8859-15
+            ..
             en_US.US-ASCII
             ..
             en_US.UTF-8
             ..
             en_ZA.ISO8859-1
             ..
+            en_ZA.ISO8859-15
+            ..
             en_ZA.US-ASCII
             ..
             en_ZA.UTF-8
@@ -695,6 +707,8 @@
             ..
             fr_CA.ISO8859-1
             ..
+            fr_CA.ISO8859-15
+            ..
             fr_CA.UTF-8
             ..
             fr_CH.ISO8859-1
diff --git a/share/colldef/Makefile b/share/colldef/Makefile
index 47074f9..6f48c01 100644
--- a/share/colldef/Makefile
+++ b/share/colldef/Makefile
@@ -47,6 +47,7 @@ LOCALES+=	uk_UA.UTF-8
 LOCALES+=	zh_Hans_CN.UTF-8
 LOCALES+=	zh_Hant_TW.UTF-8
 
+SAME+=		af_ZA.UTF-8:af_ZA.ISO8859-15
 SAME+=		af_ZA.UTF-8:af_ZA.ISO8859-1
 SAME+=		ar_SA.UTF-8:ar_QA.UTF-8
 SAME+=		ar_SA.UTF-8:ar_MA.UTF-8
@@ -108,6 +109,7 @@ 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-15
 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
@@ -117,14 +119,17 @@ 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-15
 SAME+=		en_US.UTF-8:en_ZA.ISO8859-1
 SAME+=		en_US.UTF-8:en_US.US-ASCII
+SAME+=		en_US.UTF-8:en_US.ISO8859-15
 SAME+=		en_US.UTF-8:en_US.ISO8859-1
 SAME+=		en_US.UTF-8:en_SG.UTF-8
 SAME+=		en_US.UTF-8:en_SG.ISO8859-1
 SAME+=		en_US.UTF-8:en_PH.UTF-8
 SAME+=		en_US.UTF-8:en_NZ.UTF-8
 SAME+=		en_US.UTF-8:en_NZ.US-ASCII
+SAME+=		en_US.UTF-8:en_NZ.ISO8859-15
 SAME+=		en_US.UTF-8:en_NZ.ISO8859-1
 SAME+=		en_US.UTF-8:en_IE.UTF-8
 SAME+=		en_US.UTF-8:en_IE.ISO8859-15
@@ -137,9 +142,11 @@ SAME+=		en_US.UTF-8:en_GB.ISO8859-15
 SAME+=		en_US.UTF-8:en_GB.ISO8859-1
 SAME+=		en_US.UTF-8:en_CA.UTF-8
 SAME+=		en_US.UTF-8:en_CA.US-ASCII
+SAME+=		en_US.UTF-8:en_CA.ISO8859-15
 SAME+=		en_US.UTF-8:en_CA.ISO8859-1
 SAME+=		en_US.UTF-8:en_AU.UTF-8
 SAME+=		en_US.UTF-8:en_AU.US-ASCII
+SAME+=		en_US.UTF-8:en_AU.ISO8859-15
 SAME+=		en_US.UTF-8:en_AU.ISO8859-1
 SAME+=		en_US.UTF-8:de_DE.UTF-8
 SAME+=		en_US.UTF-8:de_DE.ISO8859-15
diff --git a/share/ctypedef/Makefile b/share/ctypedef/Makefile
index 56a5607..4a75970 100644
--- a/share/ctypedef/Makefile
+++ b/share/ctypedef/Makefile
@@ -16,8 +16,8 @@ LOCALES+=	be_BY.CP1131
 LOCALES+=	ca_IT.ISO8859-1
 LOCALES+=	ca_IT.ISO8859-15
 LOCALES+=	el_GR.ISO8859-7
-LOCALES+=	en_GB.ISO8859-15
 LOCALES+=	en_US.ISO8859-1
+LOCALES+=	en_US.ISO8859-15
 LOCALES+=	en_US.US-ASCII
 LOCALES+=	en_US.UTF-8
 LOCALES+=	hi_IN.ISCII-DEV
@@ -152,6 +152,35 @@ 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+=		en_US.ISO8859-15:en_GB.ISO8859-15
+SAME+=		en_US.ISO8859-15:sv_SE.ISO8859-15
+SAME+=		en_US.ISO8859-15:sv_FI.ISO8859-15
+SAME+=		en_US.ISO8859-15:pt_PT.ISO8859-15
+SAME+=		en_US.ISO8859-15:nn_NO.ISO8859-15
+SAME+=		en_US.ISO8859-15:nl_NL.ISO8859-15
+SAME+=		en_US.ISO8859-15:nl_BE.ISO8859-15
+SAME+=		en_US.ISO8859-15:nb_NO.ISO8859-15
+SAME+=		en_US.ISO8859-15:it_IT.ISO8859-15
+SAME+=		en_US.ISO8859-15:it_CH.ISO8859-15
+SAME+=		en_US.ISO8859-15:is_IS.ISO8859-15
+SAME+=		en_US.ISO8859-15:fr_FR.ISO8859-15
+SAME+=		en_US.ISO8859-15:fr_CH.ISO8859-15
+SAME+=		en_US.ISO8859-15:fr_CA.ISO8859-15
+SAME+=		en_US.ISO8859-15:fr_BE.ISO8859-15
+SAME+=		en_US.ISO8859-15:fi_FI.ISO8859-15
+SAME+=		en_US.ISO8859-15:eu_ES.ISO8859-15
+SAME+=		en_US.ISO8859-15:et_EE.ISO8859-15
+SAME+=		en_US.ISO8859-15:es_ES.ISO8859-15
+SAME+=		en_US.ISO8859-15:en_ZA.ISO8859-15
+SAME+=		en_US.ISO8859-15:en_NZ.ISO8859-15
+SAME+=		en_US.ISO8859-15:en_IE.ISO8859-15
+SAME+=		en_US.ISO8859-15:en_CA.ISO8859-15
+SAME+=		en_US.ISO8859-15:en_AU.ISO8859-15
+SAME+=		en_US.ISO8859-15:de_DE.ISO8859-15
+SAME+=		en_US.ISO8859-15:de_CH.ISO8859-15
+SAME+=		en_US.ISO8859-15:de_AT.ISO8859-15
+SAME+=		en_US.ISO8859-15:da_DK.ISO8859-15
+SAME+=		en_US.ISO8859-15:af_ZA.ISO8859-15
 SAME+=		ru_RU.CP1251:bg_BG.CP1251
 SAME+=		ru_RU.CP1251:be_BY.CP1251
 SAME+=		ru_RU.ISO8859-5:sr_Cyrl_RS.ISO8859-5
@@ -169,28 +198,6 @@ SAME+=		sr_Latn_RS.ISO8859-2:pl_PL.ISO8859-2
 SAME+=		sr_Latn_RS.ISO8859-2:hu_HU.ISO8859-2
 SAME+=		sr_Latn_RS.ISO8859-2:hr_HR.ISO8859-2
 SAME+=		sr_Latn_RS.ISO8859-2:cs_CZ.ISO8859-2
-SAME+=		en_GB.ISO8859-15:sv_SE.ISO8859-15
-SAME+=		en_GB.ISO8859-15:sv_FI.ISO8859-15
-SAME+=		en_GB.ISO8859-15:pt_PT.ISO8859-15
-SAME+=		en_GB.ISO8859-15:nn_NO.ISO8859-15
-SAME+=		en_GB.ISO8859-15:nl_NL.ISO8859-15
-SAME+=		en_GB.ISO8859-15:nl_BE.ISO8859-15
-SAME+=		en_GB.ISO8859-15:nb_NO.ISO8859-15
-SAME+=		en_GB.ISO8859-15:it_IT.ISO8859-15
-SAME+=		en_GB.ISO8859-15:it_CH.ISO8859-15
-SAME+=		en_GB.ISO8859-15:is_IS.ISO8859-15
-SAME+=		en_GB.ISO8859-15:fr_FR.ISO8859-15
-SAME+=		en_GB.ISO8859-15:fr_CH.ISO8859-15
-SAME+=		en_GB.ISO8859-15:fr_BE.ISO8859-15
-SAME+=		en_GB.ISO8859-15:fi_FI.ISO8859-15
-SAME+=		en_GB.ISO8859-15:eu_ES.ISO8859-15
-SAME+=		en_GB.ISO8859-15:et_EE.ISO8859-15
-SAME+=		en_GB.ISO8859-15:es_ES.ISO8859-15
-SAME+=		en_GB.ISO8859-15:en_IE.ISO8859-15
-SAME+=		en_GB.ISO8859-15:de_DE.ISO8859-15
-SAME+=		en_GB.ISO8859-15:de_CH.ISO8859-15
-SAME+=		en_GB.ISO8859-15:de_AT.ISO8859-15
-SAME+=		en_GB.ISO8859-15:da_DK.ISO8859-15
 SAME+=		en_US.US-ASCII:en_ZA.US-ASCII
 SAME+=		en_US.US-ASCII:en_NZ.US-ASCII
 SAME+=		en_US.US-ASCII:en_GB.US-ASCII
@@ -222,11 +229,11 @@ 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+=	en_US.ISO8859-1.src:en_US.ISO8859-15.src
+SYMPAIRS+=	en_US.ISO8859-1.src:en_US.US-ASCII.src
+SYMPAIRS+=	en_US.ISO8859-1.src:lv_LV.ISO8859-13.src
+SYMPAIRS+=	en_US.ISO8859-1.src:sr_Latn_RS.ISO8859-2.src
+SYMPAIRS+=	en_US.ISO8859-1.src:tr_TR.ISO8859-9.src
 SYMPAIRS+=	ja_JP.eucJP.src:ja_JP.SJIS.src
 
 .for PAIR in ${SYMPAIRS}
diff --git a/share/ctypedef/en_GB.ISO8859-15.src b/share/ctypedef/en_US.ISO8859-1.src
index 135c6d9..135c6d9 100644
--- a/share/ctypedef/en_GB.ISO8859-15.src
+++ b/share/ctypedef/en_US.ISO8859-1.src
diff --git a/share/monetdef/Makefile b/share/monetdef/Makefile
index 12397a3..2fb532c 100644
--- a/share/monetdef/Makefile
+++ b/share/monetdef/Makefile
@@ -40,13 +40,13 @@ LOCALES+=	en_NZ.UTF-8
 LOCALES+=	en_PH.UTF-8
 LOCALES+=	en_SG.UTF-8
 LOCALES+=	en_US.UTF-8
-LOCALES+=	en_ZA.ISO8859-1
+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-1
+LOCALES+=	fr_CA.ISO8859-15
 LOCALES+=	fr_CA.UTF-8
 LOCALES+=	fr_CH.ISO8859-15
 LOCALES+=	fr_CH.UTF-8
@@ -109,7 +109,9 @@ LOCALES+=	zh_Hant_HK.UTF-8
 LOCALES+=	zh_Hant_TW.Big5
 LOCALES+=	zh_Hant_TW.UTF-8
 
-SAME+=		en_ZA.ISO8859-1:af_ZA.ISO8859-1
+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
@@ -150,17 +152,21 @@ 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
@@ -180,6 +186,7 @@ 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
diff --git a/share/monetdef/en_ZA.ISO8859-1.src b/share/monetdef/en_ZA.ISO8859-15.src
index 9f2ba68..9f2ba68 100644
--- a/share/monetdef/en_ZA.ISO8859-1.src
+++ b/share/monetdef/en_ZA.ISO8859-15.src
diff --git a/share/monetdef/fr_CA.ISO8859-1.src b/share/monetdef/fr_CA.ISO8859-15.src
index 65c6b07..65c6b07 100644
--- a/share/monetdef/fr_CA.ISO8859-1.src
+++ b/share/monetdef/fr_CA.ISO8859-15.src
diff --git a/share/msgdef/Makefile b/share/msgdef/Makefile
index a303dcc..d6425da 100644
--- a/share/msgdef/Makefile
+++ b/share/msgdef/Makefile
@@ -89,6 +89,7 @@ SAME+=		nl_NL.UTF-8:nl_BE.UTF-8
 SAME+=		nl_NL.UTF-8:nl_BE.ISO8859-15
 SAME+=		nl_NL.UTF-8:nl_BE.ISO8859-1
 SAME+=		nl_NL.UTF-8:af_ZA.UTF-8
+SAME+=		nl_NL.UTF-8:af_ZA.ISO8859-15
 SAME+=		nl_NL.UTF-8:af_ZA.ISO8859-1
 SAME+=		ar_SA.UTF-8:ar_QA.UTF-8
 SAME+=		ar_SA.UTF-8:ar_MA.UTF-8
@@ -132,14 +133,17 @@ SAME+=		de_DE.UTF-8:de_AT.ISO8859-15
 SAME+=		de_DE.UTF-8:de_AT.ISO8859-1
 SAME+=		en_US.UTF-8:en_ZA.UTF-8
 SAME+=		en_US.UTF-8:en_ZA.US-ASCII
+SAME+=		en_US.UTF-8:en_ZA.ISO8859-15
 SAME+=		en_US.UTF-8:en_ZA.ISO8859-1
 SAME+=		en_US.UTF-8:en_US.US-ASCII
+SAME+=		en_US.UTF-8:en_US.ISO8859-15
 SAME+=		en_US.UTF-8:en_US.ISO8859-1
 SAME+=		en_US.UTF-8:en_SG.UTF-8
 SAME+=		en_US.UTF-8:en_SG.ISO8859-1
 SAME+=		en_US.UTF-8:en_PH.UTF-8
 SAME+=		en_US.UTF-8:en_NZ.UTF-8
 SAME+=		en_US.UTF-8:en_NZ.US-ASCII
+SAME+=		en_US.UTF-8:en_NZ.ISO8859-15
 SAME+=		en_US.UTF-8:en_NZ.ISO8859-1
 SAME+=		en_US.UTF-8:en_IE.UTF-8
 SAME+=		en_US.UTF-8:en_IE.ISO8859-15
@@ -152,9 +156,11 @@ SAME+=		en_US.UTF-8:en_GB.ISO8859-15
 SAME+=		en_US.UTF-8:en_GB.ISO8859-1
 SAME+=		en_US.UTF-8:en_CA.UTF-8
 SAME+=		en_US.UTF-8:en_CA.US-ASCII
+SAME+=		en_US.UTF-8:en_CA.ISO8859-15
 SAME+=		en_US.UTF-8:en_CA.ISO8859-1
 SAME+=		en_US.UTF-8:en_AU.UTF-8
 SAME+=		en_US.UTF-8:en_AU.US-ASCII
+SAME+=		en_US.UTF-8:en_AU.ISO8859-15
 SAME+=		en_US.UTF-8:en_AU.ISO8859-1
 SAME+=		et_EE.UTF-8:et_EE.ISO8859-15
 SAME+=		et_EE.UTF-8:et_EE.ISO8859-1
@@ -167,6 +173,7 @@ SAME+=		fr_FR.UTF-8:fr_CH.UTF-8
 SAME+=		fr_FR.UTF-8:fr_CH.ISO8859-15
 SAME+=		fr_FR.UTF-8:fr_CH.ISO8859-1
 SAME+=		fr_FR.UTF-8:fr_CA.UTF-8
+SAME+=		fr_FR.UTF-8:fr_CA.ISO8859-15
 SAME+=		fr_FR.UTF-8:fr_CA.ISO8859-1
 SAME+=		fr_FR.UTF-8:fr_BE.UTF-8
 SAME+=		fr_FR.UTF-8:fr_BE.ISO8859-15
diff --git a/share/numericdef/Makefile b/share/numericdef/Makefile
index 727fe33..2220216 100644
--- a/share/numericdef/Makefile
+++ b/share/numericdef/Makefile
@@ -47,16 +47,19 @@ 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-15
 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-15
 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
 SAME+=		uk_UA.ISO8859-5:be_BY.ISO8859-5
 SAME+=		uk_UA.ISO8859-5:be_BY.CP1251
+SAME+=		uk_UA.ISO8859-5:af_ZA.ISO8859-15
 SAME+=		uk_UA.ISO8859-5:af_ZA.ISO8859-1
 SAME+=		uk_UA.UTF-8:sv_SE.UTF-8
 SAME+=		uk_UA.UTF-8:sv_FI.UTF-8
@@ -97,12 +100,14 @@ SAME+=		en_US.UTF-8:he_IL.UTF-8
 SAME+=		en_US.UTF-8:es_MX.UTF-8
 SAME+=		en_US.UTF-8:es_MX.ISO8859-1
 SAME+=		en_US.UTF-8:en_US.US-ASCII
+SAME+=		en_US.UTF-8:en_US.ISO8859-15
 SAME+=		en_US.UTF-8:en_US.ISO8859-1
 SAME+=		en_US.UTF-8:en_SG.UTF-8
 SAME+=		en_US.UTF-8:en_SG.ISO8859-1
 SAME+=		en_US.UTF-8:en_PH.UTF-8
 SAME+=		en_US.UTF-8:en_NZ.UTF-8
 SAME+=		en_US.UTF-8:en_NZ.US-ASCII
+SAME+=		en_US.UTF-8:en_NZ.ISO8859-15
 SAME+=		en_US.UTF-8:en_NZ.ISO8859-1
 SAME+=		en_US.UTF-8:en_IE.UTF-8
 SAME+=		en_US.UTF-8:en_IE.ISO8859-15
@@ -115,9 +120,11 @@ SAME+=		en_US.UTF-8:en_GB.ISO8859-15
 SAME+=		en_US.UTF-8:en_GB.ISO8859-1
 SAME+=		en_US.UTF-8:en_CA.UTF-8
 SAME+=		en_US.UTF-8:en_CA.US-ASCII
+SAME+=		en_US.UTF-8:en_CA.ISO8859-15
 SAME+=		en_US.UTF-8:en_CA.ISO8859-1
 SAME+=		en_US.UTF-8:en_AU.UTF-8
 SAME+=		en_US.UTF-8:en_AU.US-ASCII
+SAME+=		en_US.UTF-8:en_AU.ISO8859-15
 SAME+=		en_US.UTF-8:en_AU.ISO8859-1
 SAME+=		en_US.UTF-8:am_ET.UTF-8
 SAME+=		ar_SA.UTF-8:ar_QA.UTF-8
diff --git a/share/timedef/Makefile b/share/timedef/Makefile
index fbbe7e1..dde32a2 100644
--- a/share/timedef/Makefile
+++ b/share/timedef/Makefile
@@ -53,7 +53,7 @@ LOCALES+=	fi_FI.ISO8859-15
 LOCALES+=	fi_FI.UTF-8
 LOCALES+=	fr_BE.ISO8859-15
 LOCALES+=	fr_BE.UTF-8
-LOCALES+=	fr_CA.ISO8859-1
+LOCALES+=	fr_CA.ISO8859-15
 LOCALES+=	fr_CA.UTF-8
 LOCALES+=	fr_CH.ISO8859-15
 LOCALES+=	fr_CH.UTF-8
@@ -132,6 +132,7 @@ LOCALES+=	zh_Hant_HK.UTF-8
 LOCALES+=	zh_Hant_TW.Big5
 LOCALES+=	zh_Hant_TW.UTF-8
 
+SAME+=		af_ZA.UTF-8:af_ZA.ISO8859-15
 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
@@ -155,8 +156,10 @@ 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
 SAME+=		en_HK.UTF-8:en_AU.US-ASCII
+SAME+=		en_HK.UTF-8:en_AU.ISO8859-15
 SAME+=		en_HK.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.UTF-8:en_GB.US-ASCII
 SAME+=		en_GB.UTF-8:en_GB.ISO8859-15
@@ -166,10 +169,13 @@ 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
+SAME+=		en_SG.UTF-8:en_NZ.ISO8859-15
 SAME+=		en_SG.UTF-8:en_NZ.ISO8859-1
 SAME+=		en_US.UTF-8:en_US.US-ASCII
+SAME+=		en_US.UTF-8:en_US.ISO8859-15
 SAME+=		en_US.UTF-8:en_US.ISO8859-1
 SAME+=		en_ZA.UTF-8:en_ZA.US-ASCII
+SAME+=		en_ZA.UTF-8:en_ZA.ISO8859-15
 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
@@ -178,6 +184,7 @@ 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_CA.ISO8859-15:fr_CA.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
diff --git a/share/timedef/fr_CA.ISO8859-1.src b/share/timedef/fr_CA.ISO8859-15.src
index 1fb71de..1fb71de 100644
--- a/share/timedef/fr_CA.ISO8859-1.src
+++ b/share/timedef/fr_CA.ISO8859-15.src
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 694a774..1ef88ff 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -4505,6 +4505,12 @@ OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_COLLATE
+OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_CTYPE
+OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_MESSAGES
+OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_MONETARY
+OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_NUMERIC
+OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/en_AU.US-ASCII/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_AU.US-ASCII/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_AU.US-ASCII/LC_MESSAGES
@@ -4523,6 +4529,12 @@ OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_COLLATE
+OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_CTYPE
+OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_MESSAGES
+OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_MONETARY
+OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_NUMERIC
+OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/en_CA.US-ASCII/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_CA.US-ASCII/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_CA.US-ASCII/LC_MESSAGES
@@ -4595,6 +4607,12 @@ OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_COLLATE
+OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_CTYPE
+OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_MESSAGES
+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_TIME
 OLD_FILES+=usr/share/locale/en_NZ.US-ASCII/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_NZ.US-ASCII/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_NZ.US-ASCII/LC_MESSAGES
@@ -4631,6 +4649,12 @@ OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_COLLATE
+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_MONETARY
+OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_NUMERIC
+OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/en_US.US-ASCII/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_US.US-ASCII/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_US.US-ASCII/LC_MESSAGES
@@ -4787,6 +4811,12 @@ OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_COLLATE
+OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_CTYPE
+OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_MESSAGES
+OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_MONETARY
+OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_NUMERIC
+OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/fr_CA.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/fr_CA.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/fr_CA.UTF-8/LC_MESSAGES
diff --git a/tools/tools/locale/etc/charmaps.xml b/tools/tools/locale/etc/charmaps.xml
index 3d74b8d..0b6551a 100644
--- a/tools/tools/locale/etc/charmaps.xml
+++ b/tools/tools/locale/etc/charmaps.xml
@@ -28,7 +28,7 @@
 
 	-->
 	<language name="af"
-		encoding="ISO8859-1"
+		encoding="ISO8859-1 ISO8859-15"
 		countries="ZA" />
 	<language name="am"
 		countries="ET" />		<!-- UTF-8 only -->
@@ -60,7 +60,7 @@
 		encoding="ISO8859-1 ISO8859-15 US-ASCII"
 		countries="GB" />
 	<language name="en"
-		encoding="ISO8859-1 US-ASCII"
+		encoding="ISO8859-1 ISO8859-15 US-ASCII"
 		countries="AU CA NZ US ZA" />
 	<language name="en"
 		encoding="ISO8859-1 ISO8859-15"
@@ -91,7 +91,7 @@
 		encoding="ISO8859-1 ISO8859-15"
 		countries="BE CH FR" />
 	<language name="fr"
-		encoding="ISO8859-1"
+		encoding="ISO8859-1 ISO8859-15"
 		countries="CA" />
 	<language name="he"
 		countries="IL" />