locales polish: Remove ISO8859-15 from 8 non-European places
authorJohn Marino <draco@marino.st>
Mon, 10 Aug 2015 14:13:22 +0000 (16:13 +0200)
committerJohn Marino <draco@marino.st>
Mon, 10 Aug 2015 15:51:05 +0000 (17:51 +0200)
Let's limit usage of the "obsolete" ISO-8859-15 to countries in
Europe.  Users of the eight locales affected should use UTF-8 instead.

13 files changed:
Makefile_upgrade.inc
etc/mtree/BSD.local.dist
etc/mtree/BSD.usr.dist
share/colldef/Makefile
share/ctypedef/Makefile
share/ctypedef/en_GB.ISO8859-15.src [moved from share/ctypedef/en_US.ISO8859-15.src with 100% similarity]
share/locale-links/Makefile
share/monetdef/Makefile
share/msgdef/Makefile
share/numericdef/Makefile
share/timedef/Makefile
tools/tools/locale/etc/charmaps.xml
tools/tools/locale/tools/cldr2def.pl

index 80c64ae..80db59f 100644 (file)
@@ -2166,6 +2166,18 @@ TO_REMOVE+=/usr/share/tmac/mdoc/ru.KOI8-R
 TO_REMOVE+=/usr/bin/colldef
 TO_REMOVE+=/usr/share/locale/*.ISO-8859-15@euro
 TO_REMOVE+=/usr/share/locale/lt_LT.ISO8859-4
+TO_REMOVE+=/usr/share/locale/??_ZA.ISO8859-15
+TO_REMOVE+=/usr/share/locale/??_ZA@euro
+TO_REMOVE+=/usr/share/locale/en_AU.ISO8859-15
+TO_REMOVE+=/usr/share/locale/en_AU@euro
+TO_REMOVE+=/usr/share/locale/??_CA.ISO8859-15
+TO_REMOVE+=/usr/share/locale/??_CA@euro
+TO_REMOVE+=/usr/share/locale/en_NZ.ISO8859-15
+TO_REMOVE+=/usr/share/locale/en_NZ@euro
+TO_REMOVE+=/usr/share/locale/en_US.ISO8859-15
+TO_REMOVE+=/usr/share/locale/en_US@euro
+TO_REMOVE+=/usr/share/locale/pt_BR.ISO8859-15
+TO_REMOVE+=/usr/share/locale/pt_BR@euro
 
 .if ${MACHINE_ARCH} == "x86_64"
 TO_REMOVE+=/usr/sbin/kgzip
index 8e3edc8..954de39 100644 (file)
             ..
             af_ZA.ISO8859-1
             ..
-            af_ZA.ISO8859-15
-            ..
             af_ZA.UTF-8
             ..
             am_ET.UTF-8
             ..
             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
             ..
             en_NZ.ISO8859-1
             ..
-            en_NZ.ISO8859-15
-            ..
             en_NZ.US-ASCII
             ..
             en_NZ.UTF-8
             ..
             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
             ..
             fr_CA.ISO8859-1
             ..
-            fr_CA.ISO8859-15
-            ..
             fr_CA.UTF-8
             ..
             fr_CH.ISO8859-1
             ..
             pt_BR.ISO8859-1
             ..
-            pt_BR.ISO8859-15
-            ..
             pt_BR.UTF-8
             ..
             pt_PT.ISO8859-1
index 1eba132..5334cf7 100644 (file)
         locale
             af_ZA.ISO8859-1
             ..
-            af_ZA.ISO8859-15
-            ..
             af_ZA.UTF-8
             ..
             am_ET.UTF-8
             ..
             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
             ..
             en_NZ.ISO8859-1
             ..
-            en_NZ.ISO8859-15
-            ..
             en_NZ.US-ASCII
             ..
             en_NZ.UTF-8
             ..
             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
             ..
             fr_CA.ISO8859-1
             ..
-            fr_CA.ISO8859-15
-            ..
             fr_CA.UTF-8
             ..
             fr_CH.ISO8859-1
             ..
             pt_BR.ISO8859-1
             ..
-            pt_BR.ISO8859-15
-            ..
             pt_BR.UTF-8
             ..
             pt_PT.ISO8859-1
index 1b8dae5..ae56e12 100644 (file)
@@ -45,7 +45,6 @@ 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+=         be_BY.UTF-8:be_BY.ISO8859-5
 SAME+=         be_BY.UTF-8:be_BY.CP1251
@@ -79,7 +78,6 @@ 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-15
 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
@@ -103,7 +101,6 @@ 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
@@ -113,10 +110,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-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
@@ -124,7 +119,6 @@ SAME+=              en_US.UTF-8:en_PH.UTF-8
 SAME+=         en_US.UTF-8:en_PH.ISO8859-1
 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
@@ -136,11 +130,9 @@ 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
index 103b954..a29e1ba 100644 (file)
@@ -18,8 +18,8 @@ LOCALES+=     ca_IT.ISO8859-15
 LOCALES+=      ca_IT.UTF-8
 LOCALES+=      el_GR.ISO8859-7
 LOCALES+=      el_GR.UTF-8
+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+=      he_IL.UTF-8
@@ -136,36 +136,6 @@ 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: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:pt_BR.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_GB.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.UTF-8:sr_Cyrl_RS.UTF-8
 SAME+=         ru_RU.UTF-8:mn_Cyrl_MN.UTF-8
 SAME+=         ru_RU.UTF-8:kk_Cyrl_KZ.UTF-8
@@ -191,6 +161,28 @@ 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
index ad36d78..428db5e 100644 (file)
@@ -40,7 +40,6 @@ SYMLINKS=     lt_LT.ISO8859-13 ${LOCALEDIR}/lt_LT \
                el_GR.ISO8859-7  ${LOCALEDIR}/el_GR \
                lv_LV.ISO8859-13 ${LOCALEDIR}/lv_LV \
                en_US.ISO8859-1  ${LOCALEDIR}/en_US.ISO-8859-1 \
-               en_US.ISO8859-15 ${LOCALEDIR}/en_US.ISO-8859-15 \
                ja_JP.eucJP      ${LOCALEDIR}/ja_JP.eucjp
 
 .for symdir in ${STD1}
index 5b3d30f..2d70186 100644 (file)
@@ -103,9 +103,7 @@ LOCALES+=   zh_Hans_CN.eucCN
 LOCALES+=      zh_Hant_TW.Big5
 LOCALES+=      zh_Hant_TW.UTF-8
 
-SAME+=         af_ZA.ISO8859-1:af_ZA.ISO8859-15
 SAME+=         af_ZA.ISO8859-1:en_ZA.ISO8859-1
-SAME+=         af_ZA.ISO8859-1:en_ZA.ISO8859-15
 SAME+=         af_ZA.UTF-8:en_ZA.UTF-8
 SAME+=         ca_AD.ISO8859-1:ca_ES.ISO8859-1
 SAME+=         ca_AD.ISO8859-1:ca_FR.ISO8859-1
@@ -145,21 +143,17 @@ SAME+=            de_CH.ISO8859-1:de_CH.UTF-8
 SAME+=         de_CH.ISO8859-1:it_CH.ISO8859-1
 SAME+=         de_CH.ISO8859-1:it_CH.ISO8859-15
 SAME+=         de_CH.ISO8859-1:it_CH.UTF-8
-SAME+=         en_AU.ISO8859-1:en_AU.ISO8859-15
 SAME+=         en_AU.ISO8859-1:en_AU.US-ASCII
 SAME+=         en_AU.ISO8859-1:en_AU.UTF-8
-SAME+=         en_CA.ISO8859-1:en_CA.ISO8859-15
 SAME+=         en_CA.ISO8859-1:en_CA.US-ASCII
 SAME+=         en_CA.ISO8859-1:en_CA.UTF-8
 SAME+=         en_GB.ISO8859-1:en_GB.ISO8859-15
 SAME+=         en_HK.ISO8859-1:en_HK.UTF-8
 SAME+=         en_HK.ISO8859-1:zh_Hant_HK.Big5HKSCS
 SAME+=         en_HK.ISO8859-1:zh_Hant_HK.UTF-8
-SAME+=         en_NZ.ISO8859-1:en_NZ.ISO8859-15
 SAME+=         en_NZ.ISO8859-1:en_NZ.US-ASCII
 SAME+=         en_NZ.ISO8859-1:en_NZ.UTF-8
 SAME+=         en_SG.ISO8859-1:en_SG.UTF-8
-SAME+=         en_US.ISO8859-1:en_US.ISO8859-15
 SAME+=         en_US.ISO8859-1:en_US.US-ASCII
 SAME+=         en_US.ISO8859-1:en_US.UTF-8
 SAME+=         es_AR.ISO8859-1:es_AR.UTF-8
@@ -179,7 +173,6 @@ SAME+=              fi_FI.ISO8859-1:sv_FI.ISO8859-1
 SAME+=         fi_FI.UTF-8:lt_LT.UTF-8
 SAME+=         fi_FI.UTF-8:se_FI.UTF-8
 SAME+=         fi_FI.UTF-8:sv_FI.UTF-8
-SAME+=         fr_CA.ISO8859-1:fr_CA.ISO8859-15
 SAME+=         fr_CH.ISO8859-1:fr_CH.ISO8859-15
 SAME+=         hr_HR.ISO8859-2:hr_HR.UTF-8
 SAME+=         is_IS.ISO8859-1:is_IS.ISO8859-15
@@ -187,7 +180,6 @@ SAME+=              is_IS.ISO8859-1:is_IS.UTF-8
 SAME+=         nb_NO.ISO8859-1:nb_NO.ISO8859-15
 SAME+=         nn_NO.ISO8859-1:nn_NO.ISO8859-15
 SAME+=         nn_NO.UTF-8:se_NO.UTF-8
-SAME+=         pt_BR.ISO8859-1:pt_BR.ISO8859-15
 SAME+=         pt_BR.ISO8859-1:pt_BR.UTF-8
 SAME+=         ro_RO.ISO8859-2:ro_RO.UTF-8
 SAME+=         sr_Cyrl_RS.ISO8859-5:sr_Cyrl_RS.UTF-8
index 9604fd3..e219c12 100644 (file)
@@ -81,7 +81,6 @@ LOCALES+=     zh_Hant_HK.UTF-8
 LOCALES+=      zh_Hant_TW.Big5
 LOCALES+=      zh_Hant_TW.UTF-8
 
-SAME+=         af_ZA.ISO8859-1:af_ZA.ISO8859-15
 SAME+=         af_ZA.ISO8859-1:af_ZA.UTF-8
 SAME+=         af_ZA.ISO8859-1:nl_BE.ISO8859-1
 SAME+=         af_ZA.ISO8859-1:nl_BE.ISO8859-15
@@ -125,11 +124,9 @@ SAME+=             de_AT.ISO8859-1:de_CH.UTF-8
 SAME+=         de_AT.ISO8859-1:de_DE.ISO8859-1
 SAME+=         de_AT.ISO8859-1:de_DE.ISO8859-15
 SAME+=         de_AT.ISO8859-1:de_DE.UTF-8
-SAME+=         en_AU.ISO8859-1:en_AU.ISO8859-15
 SAME+=         en_AU.ISO8859-1:en_AU.US-ASCII
 SAME+=         en_AU.ISO8859-1:en_AU.UTF-8
 SAME+=         en_AU.ISO8859-1:en_CA.ISO8859-1
-SAME+=         en_AU.ISO8859-1:en_CA.ISO8859-15
 SAME+=         en_AU.ISO8859-1:en_CA.US-ASCII
 SAME+=         en_AU.ISO8859-1:en_CA.UTF-8
 SAME+=         en_AU.ISO8859-1:en_GB.ISO8859-1
@@ -141,7 +138,6 @@ SAME+=              en_AU.ISO8859-1:en_HK.UTF-8
 SAME+=         en_AU.ISO8859-1:en_IE.ISO8859-15
 SAME+=         en_AU.ISO8859-1:en_IE.UTF-8
 SAME+=         en_AU.ISO8859-1:en_NZ.ISO8859-1
-SAME+=         en_AU.ISO8859-1:en_NZ.ISO8859-15
 SAME+=         en_AU.ISO8859-1:en_NZ.US-ASCII
 SAME+=         en_AU.ISO8859-1:en_NZ.UTF-8
 SAME+=         en_AU.ISO8859-1:en_PH.ISO8859-1
@@ -149,11 +145,9 @@ SAME+=             en_AU.ISO8859-1:en_PH.UTF-8
 SAME+=         en_AU.ISO8859-1:en_SG.ISO8859-1
 SAME+=         en_AU.ISO8859-1:en_SG.UTF-8
 SAME+=         en_AU.ISO8859-1:en_US.ISO8859-1
-SAME+=         en_AU.ISO8859-1:en_US.ISO8859-15
 SAME+=         en_AU.ISO8859-1:en_US.US-ASCII
 SAME+=         en_AU.ISO8859-1:en_US.UTF-8
 SAME+=         en_AU.ISO8859-1:en_ZA.ISO8859-1
-SAME+=         en_AU.ISO8859-1:en_ZA.ISO8859-15
 SAME+=         en_AU.ISO8859-1:en_ZA.US-ASCII
 SAME+=         en_AU.ISO8859-1:en_ZA.UTF-8
 SAME+=         et_EE.ISO8859-15:et_EE.UTF-8
@@ -163,7 +157,6 @@ SAME+=              fi_FI.ISO8859-1:fi_FI.ISO8859-15
 SAME+=         fr_BE.ISO8859-1:fr_BE.ISO8859-15
 SAME+=         fr_BE.ISO8859-1:fr_BE.UTF-8
 SAME+=         fr_BE.ISO8859-1:fr_CA.ISO8859-1
-SAME+=         fr_BE.ISO8859-1:fr_CA.ISO8859-15
 SAME+=         fr_BE.ISO8859-1:fr_CA.UTF-8
 SAME+=         fr_BE.ISO8859-1:fr_CH.ISO8859-1
 SAME+=         fr_BE.ISO8859-1:fr_CH.ISO8859-15
@@ -186,7 +179,6 @@ SAME+=              nb_NO.ISO8859-1:nb_NO.UTF-8
 SAME+=         nn_NO.ISO8859-1:nn_NO.ISO8859-15
 SAME+=         nn_NO.ISO8859-1:nn_NO.UTF-8
 SAME+=         pl_PL.ISO8859-2:pl_PL.UTF-8
-SAME+=         pt_BR.ISO8859-1:pt_BR.ISO8859-15
 SAME+=         pt_BR.ISO8859-1:pt_PT.ISO8859-1
 SAME+=         pt_BR.ISO8859-1:pt_PT.ISO8859-15
 SAME+=         pt_BR.UTF-8:pt_PT.UTF-8
index 20f2bf8..5798ccd 100644 (file)
@@ -25,18 +25,15 @@ LOCALES+=   zh_Hans_CN.GB2312
 LOCALES+=      zh_Hans_CN.eucCN
 LOCALES+=      zh_Hant_TW.Big5
 
-SAME+=         af_ZA.ISO8859-1:af_ZA.ISO8859-15
 SAME+=         af_ZA.ISO8859-1:be_BY.CP1251
 SAME+=         af_ZA.ISO8859-1:be_BY.ISO8859-5
 SAME+=         af_ZA.ISO8859-1:bg_BG.CP1251
 SAME+=         af_ZA.ISO8859-1:cs_CZ.ISO8859-2
 SAME+=         af_ZA.ISO8859-1:en_ZA.ISO8859-1
-SAME+=         af_ZA.ISO8859-1:en_ZA.ISO8859-15
 SAME+=         af_ZA.ISO8859-1:et_EE.ISO8859-15
 SAME+=         af_ZA.ISO8859-1:fi_FI.ISO8859-1
 SAME+=         af_ZA.ISO8859-1:fi_FI.ISO8859-15
 SAME+=         af_ZA.ISO8859-1:fr_CA.ISO8859-1
-SAME+=         af_ZA.ISO8859-1:fr_CA.ISO8859-15
 SAME+=         af_ZA.ISO8859-1:fr_FR.ISO8859-1
 SAME+=         af_ZA.ISO8859-1:fr_FR.ISO8859-15
 SAME+=         af_ZA.ISO8859-1:hu_HU.ISO8859-2
@@ -82,11 +79,9 @@ SAME+=               af_ZA.UTF-8:sv_FI.UTF-8
 SAME+=         af_ZA.UTF-8:sv_SE.UTF-8
 SAME+=         af_ZA.UTF-8:uk_UA.UTF-8
 SAME+=         am_ET.UTF-8:en_AU.ISO8859-1
-SAME+=         am_ET.UTF-8:en_AU.ISO8859-15
 SAME+=         am_ET.UTF-8:en_AU.US-ASCII
 SAME+=         am_ET.UTF-8:en_AU.UTF-8
 SAME+=         am_ET.UTF-8:en_CA.ISO8859-1
-SAME+=         am_ET.UTF-8:en_CA.ISO8859-15
 SAME+=         am_ET.UTF-8:en_CA.US-ASCII
 SAME+=         am_ET.UTF-8:en_CA.UTF-8
 SAME+=         am_ET.UTF-8:en_GB.ISO8859-1
@@ -98,7 +93,6 @@ SAME+=                am_ET.UTF-8:en_HK.UTF-8
 SAME+=         am_ET.UTF-8:en_IE.ISO8859-15
 SAME+=         am_ET.UTF-8:en_IE.UTF-8
 SAME+=         am_ET.UTF-8:en_NZ.ISO8859-1
-SAME+=         am_ET.UTF-8:en_NZ.ISO8859-15
 SAME+=         am_ET.UTF-8:en_NZ.US-ASCII
 SAME+=         am_ET.UTF-8:en_NZ.UTF-8
 SAME+=         am_ET.UTF-8:en_PH.ISO8859-1
@@ -106,7 +100,6 @@ SAME+=              am_ET.UTF-8:en_PH.UTF-8
 SAME+=         am_ET.UTF-8:en_SG.ISO8859-1
 SAME+=         am_ET.UTF-8:en_SG.UTF-8
 SAME+=         am_ET.UTF-8:en_US.ISO8859-1
-SAME+=         am_ET.UTF-8:en_US.ISO8859-15
 SAME+=         am_ET.UTF-8:en_US.US-ASCII
 SAME+=         am_ET.UTF-8:en_US.UTF-8
 SAME+=         am_ET.UTF-8:es_MX.ISO8859-1
@@ -175,7 +168,6 @@ SAME+=              ca_AD.ISO8859-1:nl_NL.ISO8859-1
 SAME+=         ca_AD.ISO8859-1:nl_NL.ISO8859-15
 SAME+=         ca_AD.ISO8859-1:nl_NL.UTF-8
 SAME+=         ca_AD.ISO8859-1:pt_BR.ISO8859-1
-SAME+=         ca_AD.ISO8859-1:pt_BR.ISO8859-15
 SAME+=         ca_AD.ISO8859-1:pt_BR.UTF-8
 SAME+=         ca_AD.ISO8859-1:ro_RO.ISO8859-2
 SAME+=         ca_AD.ISO8859-1:ro_RO.UTF-8
index 4559530..4135a19 100644 (file)
@@ -128,7 +128,6 @@ LOCALES+=   zh_Hant_HK.UTF-8
 LOCALES+=      zh_Hant_TW.Big5
 LOCALES+=      zh_Hant_TW.UTF-8
 
-SAME+=         af_ZA.ISO8859-1:af_ZA.ISO8859-15
 SAME+=         af_ZA.ISO8859-1:af_ZA.UTF-8
 SAME+=         ca_AD.ISO8859-1:ca_AD.ISO8859-15
 SAME+=         ca_AD.ISO8859-1:ca_ES.ISO8859-1
@@ -146,28 +145,23 @@ SAME+=            de_CH.ISO8859-1:de_CH.ISO8859-15
 SAME+=         de_CH.ISO8859-1:de_DE.ISO8859-1
 SAME+=         de_CH.ISO8859-1:de_DE.ISO8859-15
 SAME+=         de_CH.UTF-8:de_DE.UTF-8
-SAME+=         en_AU.ISO8859-1:en_AU.ISO8859-15
 SAME+=         en_AU.ISO8859-1:en_AU.US-ASCII
 SAME+=         en_AU.ISO8859-1:en_AU.UTF-8
 SAME+=         en_AU.ISO8859-1:en_HK.ISO8859-1
 SAME+=         en_AU.ISO8859-1:en_HK.UTF-8
-SAME+=         en_CA.ISO8859-1:en_CA.ISO8859-15
 SAME+=         en_CA.ISO8859-1:en_CA.US-ASCII
 SAME+=         en_CA.ISO8859-1:en_CA.UTF-8
 SAME+=         en_GB.ISO8859-1:en_GB.ISO8859-15
 SAME+=         en_GB.ISO8859-1:en_GB.US-ASCII
 SAME+=         en_GB.ISO8859-1:en_GB.UTF-8
 SAME+=         en_IE.ISO8859-15:en_IE.UTF-8
-SAME+=         en_NZ.ISO8859-1:en_NZ.ISO8859-15
 SAME+=         en_NZ.ISO8859-1:en_NZ.US-ASCII
 SAME+=         en_NZ.ISO8859-1:en_NZ.UTF-8
 SAME+=         en_NZ.ISO8859-1:en_SG.ISO8859-1
 SAME+=         en_NZ.ISO8859-1:en_SG.UTF-8
 SAME+=         en_PH.ISO8859-1:en_PH.UTF-8
-SAME+=         en_US.ISO8859-1:en_US.ISO8859-15
 SAME+=         en_US.ISO8859-1:en_US.US-ASCII
 SAME+=         en_US.ISO8859-1:en_US.UTF-8
-SAME+=         en_ZA.ISO8859-1:en_ZA.ISO8859-15
 SAME+=         en_ZA.ISO8859-1:en_ZA.US-ASCII
 SAME+=         en_ZA.ISO8859-1:en_ZA.UTF-8
 SAME+=         es_AR.ISO8859-1:es_CR.ISO8859-1
@@ -177,7 +171,6 @@ SAME+=              eu_ES.ISO8859-1:eu_ES.ISO8859-15
 SAME+=         eu_ES.ISO8859-1:eu_ES.UTF-8
 SAME+=         fi_FI.ISO8859-1:fi_FI.ISO8859-15
 SAME+=         fr_BE.ISO8859-1:fr_BE.ISO8859-15
-SAME+=         fr_CA.ISO8859-1:fr_CA.ISO8859-15
 SAME+=         fr_CH.ISO8859-1:fr_CH.ISO8859-15
 SAME+=         fr_FR.ISO8859-1:fr_FR.ISO8859-15
 SAME+=         is_IS.ISO8859-1:is_IS.ISO8859-15
@@ -189,7 +182,6 @@ SAME+=              nl_BE.ISO8859-1:nl_BE.UTF-8
 SAME+=         nl_NL.ISO8859-1:nl_NL.ISO8859-15
 SAME+=         nl_NL.ISO8859-1:nl_NL.UTF-8
 SAME+=         nn_NO.ISO8859-1:nn_NO.ISO8859-15
-SAME+=         pt_BR.ISO8859-1:pt_BR.ISO8859-15
 SAME+=         pt_PT.ISO8859-1:pt_PT.ISO8859-15
 SAME+=         sr_Cyrl_RS.UTF-8:sr_Latn_RS.UTF-8
 SAME+=         sv_FI.ISO8859-1:sv_FI.ISO8859-15
index 96d7627..6ce8115 100644 (file)
@@ -28,7 +28,7 @@
 
        -->
        <language name="af"
-               encoding="ISO8859-1 ISO8859-15"
+               encoding="ISO8859-1"
                countries="ZA" />
        <language name="am"
                countries="ET" />               <!-- UTF-8 only -->
                countries="GR" />
        <language name="en"
                encoding="ISO8859-1 ISO8859-15 US-ASCII"
-               countries="AU CA GB NZ US ZA" />
+               countries="GB" />
+       <language name="en"
+               encoding="ISO8859-1 US-ASCII"
+               countries="AU CA NZ US ZA" />
        <language name="en"
                encoding="ISO8859-15"
                countries="IE" />
                countries="FI" />
        <language name="fr"
                encoding="ISO8859-1 ISO8859-15"
-               countries="BE CA CH FR" />
+               countries="BE CH FR" />
+       <language name="fr"
+               encoding="ISO8859-1"
+               countries="CA" />
        <language name="he"
                countries="IL" />
        <language name="hi"
                countries="PL" />
        <language name="pt"
                encoding="ISO8859-1 ISO8859-15"
-               countries="PT BR" />
+               countries="PT" />
+       <language name="pt"
+               encoding="ISO8859-1"
+               countries="BR" />
        <language name="ro"
                encoding="ISO8859-2"
                countries="RO" />
index 3be828c..1fc155e 100755 (executable)
@@ -826,8 +826,10 @@ EOF
                } elsif ($TYPE eq "ctypedef") {
                        @files = sort {
                                if ($a =~ /^en_x_US/ ||
+                                   $a =~ /^en_x_GB.ISO8859-15/ ||
                                    $a =~ /^ru_x_RU/) { return -1; }
                                elsif ($b =~ /^en_x_US/ ||
+                                      $b =~ /^en_x_GB.ISO8859-15/ ||
                                       $b =~ /ru_x_RU/) { return 1; }
                                else { return uc($b) cmp uc($a); }