locales polish: Remove ISO-8859-1 encoding from 27 locales
authorJohn Marino <draco@marino.st>
Mon, 10 Aug 2015 15:48:40 +0000 (17:48 +0200)
committerJohn Marino <draco@marino.st>
Mon, 10 Aug 2015 15:51:05 +0000 (17:51 +0200)
The ISO-8859-1 encoding is considered obsolete compared to ISO-8859-19
(which in itself is obsolete compared to UTF-8).  To help avoid some
potential mismatches, remove the ISO-8859-1 encoding in the following
cases:

1) European localities that already have ISO-8859-15 (25 of 27)
   * ca_(AD|ES|FR|IT)
   * da_dk
   * de_(AT|CH|DE)
   * en_GB
   * (es|eu)_ES
   * fi_FI
   * fr_(BE|CH|FR)
   * is_IS
   * it_(CH|IT)
   * (nb|nn)_NO
   * nl_(BE|NL)
   * pt_PT
   * sv_(FI|SE)

2) Localities where ISO-8859-1 can't represent local currency symbol
   * en_PH (PH Peso)
   * es_CR (Colon)

60 files changed:
Makefile_upgrade.inc
etc/mtree/BSD.local.dist
etc/mtree/BSD.usr.dist
share/colldef/Makefile
share/ctypedef/Makefile
share/ctypedef/ca_IT.ISO8859-1.src [deleted symlink]
share/monetdef/Makefile
share/monetdef/da_DK.ISO8859-15.src [moved from share/monetdef/da_DK.ISO8859-1.src with 100% similarity]
share/monetdef/de_AT.ISO8859-1.src [deleted file]
share/monetdef/de_CH.ISO8859-15.src [moved from share/monetdef/de_CH.ISO8859-1.src with 100% similarity]
share/monetdef/en_GB.ISO8859-15.src [moved from share/monetdef/en_GB.ISO8859-1.src with 100% similarity]
share/monetdef/en_PH.ISO8859-1.src [deleted file]
share/monetdef/es_CR.ISO8859-1.src [deleted file]
share/monetdef/fr_CH.ISO8859-15.src [moved from share/monetdef/fr_CH.ISO8859-1.src with 100% similarity]
share/monetdef/is_IS.ISO8859-15.src [moved from share/monetdef/is_IS.ISO8859-1.src with 100% similarity]
share/monetdef/lt_LT.ISO8859-13.src [moved from share/monetdef/fi_FI.ISO8859-1.src with 100% similarity]
share/monetdef/nb_NO.ISO8859-15.src [moved from share/monetdef/nb_NO.ISO8859-1.src with 100% similarity]
share/monetdef/nl_NL.ISO8859-1.src [deleted file]
share/monetdef/nn_NO.ISO8859-15.src [moved from share/monetdef/nn_NO.ISO8859-1.src with 100% similarity]
share/monetdef/sl_SI.ISO8859-2.src [moved from share/monetdef/ca_AD.ISO8859-1.src with 100% similarity]
share/monetdef/sv_SE.ISO8859-15.src [moved from share/monetdef/sv_SE.ISO8859-1.src with 100% similarity]
share/msgdef/Makefile
share/msgdef/ca_AD.ISO8859-15.src [moved from share/msgdef/ca_AD.ISO8859-1.src with 100% similarity]
share/msgdef/da_DK.ISO8859-15.src [moved from share/msgdef/da_DK.ISO8859-1.src with 100% similarity]
share/msgdef/de_AT.ISO8859-15.src [moved from share/msgdef/de_AT.ISO8859-1.src with 100% similarity]
share/msgdef/eu_ES.ISO8859-15.src [moved from share/msgdef/eu_ES.ISO8859-1.src with 100% similarity]
share/msgdef/fi_FI.ISO8859-15.src [moved from share/msgdef/fi_FI.ISO8859-1.src with 100% similarity]
share/msgdef/fr_BE.ISO8859-15.src [moved from share/msgdef/fr_BE.ISO8859-1.src with 100% similarity]
share/msgdef/is_IS.ISO8859-15.src [moved from share/msgdef/is_IS.ISO8859-1.src with 100% similarity]
share/msgdef/it_CH.ISO8859-15.src [moved from share/msgdef/it_CH.ISO8859-1.src with 100% similarity]
share/msgdef/nb_NO.ISO8859-15.src [moved from share/msgdef/nb_NO.ISO8859-1.src with 100% similarity]
share/msgdef/nn_NO.ISO8859-15.src [moved from share/msgdef/nn_NO.ISO8859-1.src with 100% similarity]
share/numericdef/Makefile
share/numericdef/ca_AD.ISO8859-15.src [moved from share/numericdef/ca_AD.ISO8859-1.src with 100% similarity]
share/numericdef/de_CH.ISO8859-15.src [moved from share/numericdef/de_CH.ISO8859-1.src with 100% similarity]
share/numericdef/fr_CH.ISO8859-15.src [moved from share/numericdef/fr_CH.ISO8859-1.src with 100% similarity]
share/timedef/Makefile
share/timedef/ca_AD.ISO8859-15.src [moved from share/timedef/ca_AD.ISO8859-1.src with 100% similarity]
share/timedef/da_DK.ISO8859-15.src [moved from share/timedef/da_DK.ISO8859-1.src with 100% similarity]
share/timedef/de_AT.ISO8859-15.src [moved from share/timedef/de_AT.ISO8859-1.src with 100% similarity]
share/timedef/de_CH.ISO8859-15.src [moved from share/timedef/de_CH.ISO8859-1.src with 100% similarity]
share/timedef/en_GB.ISO8859-15.src [moved from share/timedef/en_GB.ISO8859-1.src with 100% similarity]
share/timedef/en_PH.UTF-8.src [moved from share/timedef/en_PH.ISO8859-1.src with 100% similarity]
share/timedef/es_ES.ISO8859-15.src [moved from share/timedef/es_ES.ISO8859-1.src with 100% similarity]
share/timedef/eu_ES.ISO8859-15.src [moved from share/timedef/eu_ES.ISO8859-1.src with 100% similarity]
share/timedef/fi_FI.ISO8859-15.src [moved from share/timedef/fi_FI.ISO8859-1.src with 100% similarity]
share/timedef/fr_BE.ISO8859-15.src [moved from share/timedef/fr_BE.ISO8859-1.src with 100% similarity]
share/timedef/fr_CH.ISO8859-15.src [moved from share/timedef/fr_CH.ISO8859-1.src with 100% similarity]
share/timedef/fr_FR.ISO8859-15.src [moved from share/timedef/fr_FR.ISO8859-1.src with 100% similarity]
share/timedef/is_IS.ISO8859-15.src [moved from share/timedef/is_IS.ISO8859-1.src with 100% similarity]
share/timedef/it_CH.ISO8859-15.src [moved from share/timedef/it_CH.ISO8859-1.src with 100% similarity]
share/timedef/it_IT.ISO8859-15.src [moved from share/timedef/it_IT.ISO8859-1.src with 100% similarity]
share/timedef/nb_NO.ISO8859-15.src [moved from share/timedef/nb_NO.ISO8859-1.src with 100% similarity]
share/timedef/nl_BE.ISO8859-15.src [moved from share/timedef/nl_BE.ISO8859-1.src with 100% similarity]
share/timedef/nl_NL.ISO8859-15.src [moved from share/timedef/nl_NL.ISO8859-1.src with 100% similarity]
share/timedef/nn_NO.ISO8859-15.src [moved from share/timedef/nn_NO.ISO8859-1.src with 100% similarity]
share/timedef/pt_PT.ISO8859-15.src [moved from share/timedef/pt_PT.ISO8859-1.src with 100% similarity]
share/timedef/sv_FI.ISO8859-15.src [moved from share/timedef/sv_FI.ISO8859-1.src with 100% similarity]
share/timedef/sv_SE.ISO8859-15.src [moved from share/timedef/sv_SE.ISO8859-1.src with 100% similarity]
tools/tools/locale/etc/charmaps.xml

index 80db59f..3a51da7 100644 (file)
@@ -2178,6 +2178,26 @@ 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
+TO_REMOVE+=/usr/share/locale/en_US.ISO-8859-15
+TO_REMOVE+=/usr/share/locale/ca_??.ISO8859-1
+TO_REMOVE+=/usr/share/locale/d?_??.ISO8859-1
+TO_REMOVE+=/usr/share/locale/en_GB.ISO8859-1
+TO_REMOVE+=/usr/share/locale/en_PH.ISO8859-1
+TO_REMOVE+=/usr/share/locale/en_CR.ISO8859-1
+TO_REMOVE+=/usr/share/locale/en_ES.ISO8859-1
+TO_REMOVE+=/usr/share/locale/es_CR.ISO8859-1
+TO_REMOVE+=/usr/share/locale/es_ES.ISO8859-1
+TO_REMOVE+=/usr/share/locale/eu_ES.ISO8859-1
+TO_REMOVE+=/usr/share/locale/fi_FI.ISO8859-1
+TO_REMOVE+=/usr/share/locale/fr_BE.ISO8859-1
+TO_REMOVE+=/usr/share/locale/fr_CH.ISO8859-1
+TO_REMOVE+=/usr/share/locale/fr_FR.ISO8859-1
+TO_REMOVE+=/usr/share/locale/is_IS.ISO8859-1
+TO_REMOVE+=/usr/share/locale/it_??.ISO8859-1
+TO_REMOVE+=/usr/share/locale/n?_NO.ISO8859-1
+TO_REMOVE+=/usr/share/locale/nl_??.ISO8859-1
+TO_REMOVE+=/usr/share/locale/pt_PT.ISO8859-1
+TO_REMOVE+=/usr/share/locale/sv_??.ISO8859-1
 
 .if ${MACHINE_ARCH} == "x86_64"
 TO_REMOVE+=/usr/sbin/kgzip
index 954de39..07cac4b 100644 (file)
             ..
             bg_BG.UTF-8
             ..
-            ca_ES.ISO8859-1
-            ..
             ca_ES.ISO8859-15
             ..
             ca_ES.UTF-8
             ..
             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
             ..
             en_CA.UTF-8
             ..
-            en_GB.ISO8859-1
-            ..
             en_GB.ISO8859-15
             ..
             en_GB.US-ASCII
             ..
             en_NZ.UTF-8
             ..
-            en_PH.ISO8859-1
-            ..
             en_PH.UTF-8
             ..
             en_SG.ISO8859-1
             ..
             es_AR.UTF-8
             ..
-            es_CR.ISO8859-1
-            ..
             es_CR.UTF-8
             ..
-            es_ES.ISO8859-1
-            ..
             es_ES.ISO8859-15
             ..
             es_ES.UTF-8
             ..
             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
             ..
-            fo_FO.ISO8859-1
-            ..
-            fo_FO.UTF-8
-            ..
-            fr_BE.ISO8859-1
-            ..
             fr_BE.ISO8859-15
             ..
             fr_BE.UTF-8
             ..
             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
             ..
             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
             ..
             lt_LT.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-15
+            ..
+            nn_NO.UTF-8
+            ..
             pl_PL.ISO8859-2
             ..
             pl_PL.UTF-8
             ..
             pt_BR.UTF-8
             ..
-            pt_PT.ISO8859-1
-            ..
             pt_PT.ISO8859-15
             ..
             pt_PT.UTF-8
             ..
             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
index 5334cf7..45cdffb 100644 (file)
             ..
             bg_BG.UTF-8
             ..
-            ca_AD.ISO8859-1
-            ..
-            ca_ES.ISO8859-1
-            ..
-            ca_FR.ISO8859-1
-            ..
-            ca_IT.ISO8859-1
-            ..
             ca_AD.ISO8859-15
             ..
             ca_ES.ISO8859-15
             ..
             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
             ..
             en_CA.UTF-8
             ..
-            en_GB.ISO8859-1
-            ..
             en_GB.ISO8859-15
             ..
             en_GB.US-ASCII
             ..
             en_NZ.UTF-8
             ..
-            en_PH.ISO8859-1
-            ..
             en_PH.UTF-8
             ..
             en_SG.ISO8859-1
             ..
             es_AR.UTF-8
             ..
-            es_CR.ISO8859-1
-            ..
             es_CR.UTF-8
             ..
-            es_ES.ISO8859-1
-            ..
             es_ES.ISO8859-15
             ..
             es_ES.UTF-8
             ..
             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
             ..
             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
             ..
             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
             ..
             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
             ..
             pt_BR.UTF-8
             ..
-            pt_PT.ISO8859-1
-            ..
             pt_PT.ISO8859-15
             ..
             pt_PT.UTF-8
             ..
             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
index ae56e12..71afe87 100644 (file)
@@ -60,54 +60,39 @@ 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
@@ -116,7 +101,6 @@ 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_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-1
@@ -127,7 +111,6 @@ 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
@@ -136,48 +119,38 @@ 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_CR.ISO8859-1
 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+=         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
index a29e1ba..660b0e2 100644 (file)
@@ -13,7 +13,6 @@ MAPLOC=               ${.CURDIR}/../../tools/tools/locale/etc/final-maps
 
 LOCALES+=      am_ET.UTF-8
 LOCALES+=      be_BY.CP1131
-LOCALES+=      ca_IT.ISO8859-1
 LOCALES+=      ca_IT.ISO8859-15
 LOCALES+=      ca_IT.UTF-8
 LOCALES+=      el_GR.ISO8859-7
@@ -102,39 +101,16 @@ SAME+=            en_US.UTF-8:de_AT.UTF-8
 SAME+=         en_US.UTF-8:da_DK.UTF-8
 SAME+=         en_US.UTF-8:cs_CZ.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:es_MX.ISO8859-1
-SAME+=         en_US.ISO8859-1:es_ES.ISO8859-1
-SAME+=         en_US.ISO8859-1:es_CR.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_PH.ISO8859-1
 SAME+=         en_US.ISO8859-1:en_NZ.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.UTF-8:sr_Cyrl_RS.UTF-8
 SAME+=         ru_RU.UTF-8:mn_Cyrl_MN.UTF-8
@@ -148,9 +124,6 @@ SAME+=              ru_RU.ISO8859-5:be_BY.ISO8859-5
 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+=         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
diff --git a/share/ctypedef/ca_IT.ISO8859-1.src b/share/ctypedef/ca_IT.ISO8859-1.src
deleted file mode 120000 (symlink)
index af5dfd9..0000000
+++ /dev/null
@@ -1 +0,0 @@
-ca_IT.UTF-8.src
\ No newline at end of file
index 2d70186..842b13e 100644 (file)
@@ -17,41 +17,36 @@ LOCALES+=   be_BY.ISO8859-5
 LOCALES+=      be_BY.UTF-8
 LOCALES+=      bg_BG.CP1251
 LOCALES+=      bg_BG.UTF-8
-LOCALES+=      ca_AD.ISO8859-1
 LOCALES+=      ca_AD.ISO8859-15
 LOCALES+=      ca_AD.UTF-8
 LOCALES+=      cs_CZ.ISO8859-2
 LOCALES+=      cs_CZ.UTF-8
-LOCALES+=      da_DK.ISO8859-1
-LOCALES+=      de_AT.ISO8859-1
+LOCALES+=      da_DK.ISO8859-15
 LOCALES+=      de_AT.ISO8859-15
 LOCALES+=      de_AT.UTF-8
-LOCALES+=      de_CH.ISO8859-1
+LOCALES+=      de_CH.ISO8859-15
 LOCALES+=      en_AU.ISO8859-1
 LOCALES+=      en_CA.ISO8859-1
-LOCALES+=      en_GB.ISO8859-1
+LOCALES+=      en_GB.ISO8859-15
 LOCALES+=      en_GB.US-ASCII
 LOCALES+=      en_GB.UTF-8
 LOCALES+=      en_HK.ISO8859-1
 LOCALES+=      en_IE.ISO8859-15
 LOCALES+=      en_IE.UTF-8
 LOCALES+=      en_NZ.ISO8859-1
-LOCALES+=      en_PH.ISO8859-1
 LOCALES+=      en_PH.UTF-8
 LOCALES+=      en_SG.ISO8859-1
 LOCALES+=      en_US.ISO8859-1
 LOCALES+=      en_ZA.US-ASCII
 LOCALES+=      es_AR.ISO8859-1
-LOCALES+=      es_CR.ISO8859-1
 LOCALES+=      es_CR.UTF-8
 LOCALES+=      es_MX.ISO8859-1
 LOCALES+=      et_EE.ISO8859-15
 LOCALES+=      et_EE.UTF-8
-LOCALES+=      fi_FI.ISO8859-1
 LOCALES+=      fi_FI.UTF-8
 LOCALES+=      fr_CA.ISO8859-1
 LOCALES+=      fr_CA.UTF-8
-LOCALES+=      fr_CH.ISO8859-1
+LOCALES+=      fr_CH.ISO8859-15
 LOCALES+=      fr_CH.UTF-8
 LOCALES+=      he_IL.UTF-8
 LOCALES+=      hi_IN.ISCII-DEV
@@ -61,22 +56,22 @@ LOCALES+=   hu_HU.ISO8859-2
 LOCALES+=      hu_HU.UTF-8
 LOCALES+=      hy_AM.ARMSCII-8
 LOCALES+=      hy_AM.UTF-8
-LOCALES+=      is_IS.ISO8859-1
+LOCALES+=      is_IS.ISO8859-15
 LOCALES+=      ja_JP.SJIS
 LOCALES+=      ja_JP.UTF-8
 LOCALES+=      ja_JP.eucJP
 LOCALES+=      kk_Cyrl_KZ.UTF-8
 LOCALES+=      ko_KR.UTF-8
 LOCALES+=      ko_KR.eucKR
+LOCALES+=      lt_LT.ISO8859-13
 LOCALES+=      lv_LV.ISO8859-13
 LOCALES+=      lv_LV.UTF-8
 LOCALES+=      mn_Cyrl_MN.UTF-8
-LOCALES+=      nb_NO.ISO8859-1
+LOCALES+=      nb_NO.ISO8859-15
 LOCALES+=      nb_NO.UTF-8
-LOCALES+=      nl_NL.ISO8859-1
 LOCALES+=      nl_NL.ISO8859-15
 LOCALES+=      nl_NL.UTF-8
-LOCALES+=      nn_NO.ISO8859-1
+LOCALES+=      nn_NO.ISO8859-15
 LOCALES+=      nn_NO.UTF-8
 LOCALES+=      pl_PL.ISO8859-2
 LOCALES+=      pl_PL.UTF-8
@@ -87,8 +82,9 @@ LOCALES+=     ru_RU.CP866
 LOCALES+=      ru_RU.ISO8859-5
 LOCALES+=      ru_RU.KOI8-R
 LOCALES+=      ru_RU.UTF-8
+LOCALES+=      sl_SI.ISO8859-2
 LOCALES+=      sr_Cyrl_RS.ISO8859-5
-LOCALES+=      sv_SE.ISO8859-1
+LOCALES+=      sv_SE.ISO8859-15
 LOCALES+=      sv_SE.UTF-8
 LOCALES+=      tr_TR.ISO8859-9
 LOCALES+=      tr_TR.UTF-8
@@ -105,16 +101,6 @@ LOCALES+=  zh_Hant_TW.UTF-8
 
 SAME+=         af_ZA.ISO8859-1:en_ZA.ISO8859-1
 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
-SAME+=         ca_AD.ISO8859-1:ca_IT.ISO8859-1
-SAME+=         ca_AD.ISO8859-1:de_DE.ISO8859-1
-SAME+=         ca_AD.ISO8859-1:es_ES.ISO8859-1
-SAME+=         ca_AD.ISO8859-1:eu_ES.ISO8859-1
-SAME+=         ca_AD.ISO8859-1:fr_BE.ISO8859-1
-SAME+=         ca_AD.ISO8859-1:it_IT.ISO8859-1
-SAME+=         ca_AD.ISO8859-1:nl_BE.ISO8859-1
-SAME+=         ca_AD.ISO8859-1:sl_SI.ISO8859-2
 SAME+=         ca_AD.ISO8859-15:ca_ES.ISO8859-15
 SAME+=         ca_AD.ISO8859-15:ca_FR.ISO8859-15
 SAME+=         ca_AD.ISO8859-15:ca_IT.ISO8859-15
@@ -136,18 +122,14 @@ SAME+=            ca_AD.UTF-8:fr_BE.UTF-8
 SAME+=         ca_AD.UTF-8:it_IT.UTF-8
 SAME+=         ca_AD.UTF-8:nl_BE.UTF-8
 SAME+=         ca_AD.UTF-8:sl_SI.UTF-8
-SAME+=         da_DK.ISO8859-1:da_DK.ISO8859-15
-SAME+=         da_DK.ISO8859-1:da_DK.UTF-8
-SAME+=         de_CH.ISO8859-1:de_CH.ISO8859-15
-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+=         da_DK.ISO8859-15:da_DK.UTF-8
+SAME+=         de_CH.ISO8859-15:de_CH.UTF-8
+SAME+=         de_CH.ISO8859-15:it_CH.ISO8859-15
+SAME+=         de_CH.ISO8859-15:it_CH.UTF-8
 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.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
@@ -165,27 +147,18 @@ SAME+=            et_EE.ISO8859-15:sv_FI.ISO8859-15
 SAME+=         et_EE.UTF-8:fr_FR.UTF-8
 SAME+=         et_EE.UTF-8:pt_PT.UTF-8
 SAME+=         et_EE.UTF-8:sk_SK.UTF-8
-SAME+=         fi_FI.ISO8859-1:fr_FR.ISO8859-1
-SAME+=         fi_FI.ISO8859-1:lt_LT.ISO8859-13
-SAME+=         fi_FI.ISO8859-1:pt_PT.ISO8859-1
-SAME+=         fi_FI.ISO8859-1:sk_SK.ISO8859-2
-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_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
-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+=         is_IS.ISO8859-15:is_IS.UTF-8
+SAME+=         lt_LT.ISO8859-13:sk_SK.ISO8859-2
 SAME+=         nn_NO.UTF-8:se_NO.UTF-8
 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
 SAME+=         sr_Cyrl_RS.ISO8859-5:sr_Latn_RS.ISO8859-2
 SAME+=         sr_Cyrl_RS.ISO8859-5:sr_Latn_RS.UTF-8
-SAME+=         sv_SE.ISO8859-1:sv_SE.ISO8859-15
 SAME+=         zh_Hans_CN.GB18030:zh_Hans_CN.GBK
 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
deleted file mode 100644 (file)
index 2fc7d45..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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_PH.ISO8859-1.src b/share/monetdef/en_PH.ISO8859-1.src
deleted file mode 100644 (file)
index 406db40..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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)
-PHP 
-#
-# currency_symbol
-#
-# 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/es_CR.ISO8859-1.src b/share/monetdef/es_CR.ISO8859-1.src
deleted file mode 100644 (file)
index ccf419b..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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)
-CRC 
-#
-# currency_symbol
-#
-# mon_decimal_point
-,
-#
-# mon_thousands_sep
-.
-#
-# mon_grouping
-3
-#
-# positive_sign
-
-#
-# negative_sign
--
-#
-# int_frac_digits
-0
-#
-# frac_digits
-0
-#
-# 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
deleted file mode 100644 (file)
index fff1387..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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
index e219c12..5e6ce0f 100644 (file)
@@ -16,19 +16,19 @@ LOCALES+=   be_BY.ISO8859-5
 LOCALES+=      be_BY.UTF-8
 LOCALES+=      bg_BG.CP1251
 LOCALES+=      bg_BG.UTF-8
-LOCALES+=      ca_AD.ISO8859-1
+LOCALES+=      ca_AD.ISO8859-15
 LOCALES+=      ca_AD.UTF-8
 LOCALES+=      cs_CZ.ISO8859-2
-LOCALES+=      da_DK.ISO8859-1
-LOCALES+=      de_AT.ISO8859-1
+LOCALES+=      da_DK.ISO8859-15
+LOCALES+=      de_AT.ISO8859-15
 LOCALES+=      el_GR.ISO8859-7
 LOCALES+=      el_GR.UTF-8
 LOCALES+=      en_AU.ISO8859-1
 LOCALES+=      et_EE.ISO8859-15
-LOCALES+=      eu_ES.ISO8859-1
-LOCALES+=      fi_FI.ISO8859-1
+LOCALES+=      eu_ES.ISO8859-15
+LOCALES+=      fi_FI.ISO8859-15
 LOCALES+=      fi_FI.UTF-8
-LOCALES+=      fr_BE.ISO8859-1
+LOCALES+=      fr_BE.ISO8859-15
 LOCALES+=      he_IL.UTF-8
 LOCALES+=      hi_IN.ISCII-DEV
 LOCALES+=      hi_IN.UTF-8
@@ -36,9 +36,9 @@ LOCALES+=     hr_HR.ISO8859-2
 LOCALES+=      hu_HU.ISO8859-2
 LOCALES+=      hy_AM.ARMSCII-8
 LOCALES+=      hy_AM.UTF-8
-LOCALES+=      is_IS.ISO8859-1
+LOCALES+=      is_IS.ISO8859-15
 LOCALES+=      is_IS.UTF-8
-LOCALES+=      it_CH.ISO8859-1
+LOCALES+=      it_CH.ISO8859-15
 LOCALES+=      it_CH.UTF-8
 LOCALES+=      ja_JP.SJIS
 LOCALES+=      ja_JP.UTF-8
@@ -50,8 +50,8 @@ LOCALES+=     lt_LT.ISO8859-13
 LOCALES+=      lv_LV.ISO8859-13
 LOCALES+=      lv_LV.UTF-8
 LOCALES+=      mn_Cyrl_MN.UTF-8
-LOCALES+=      nb_NO.ISO8859-1
-LOCALES+=      nn_NO.ISO8859-1
+LOCALES+=      nb_NO.ISO8859-15
+LOCALES+=      nn_NO.ISO8859-15
 LOCALES+=      pl_PL.ISO8859-2
 LOCALES+=      pt_BR.ISO8859-1
 LOCALES+=      pt_BR.UTF-8
@@ -82,24 +82,16 @@ LOCALES+=   zh_Hant_TW.Big5
 LOCALES+=      zh_Hant_TW.UTF-8
 
 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
 SAME+=         af_ZA.ISO8859-1:nl_BE.UTF-8
-SAME+=         af_ZA.ISO8859-1:nl_NL.ISO8859-1
 SAME+=         af_ZA.ISO8859-1:nl_NL.ISO8859-15
 SAME+=         af_ZA.ISO8859-1:nl_NL.UTF-8
-SAME+=         ca_AD.ISO8859-1:ca_AD.ISO8859-15
-SAME+=         ca_AD.ISO8859-1:ca_ES.ISO8859-1
-SAME+=         ca_AD.ISO8859-1:ca_ES.ISO8859-15
-SAME+=         ca_AD.ISO8859-1:ca_FR.ISO8859-1
-SAME+=         ca_AD.ISO8859-1:ca_FR.ISO8859-15
-SAME+=         ca_AD.ISO8859-1:ca_IT.ISO8859-1
-SAME+=         ca_AD.ISO8859-1:ca_IT.ISO8859-15
-SAME+=         ca_AD.ISO8859-1:es_AR.ISO8859-1
-SAME+=         ca_AD.ISO8859-1:es_CR.ISO8859-1
-SAME+=         ca_AD.ISO8859-1:es_ES.ISO8859-1
-SAME+=         ca_AD.ISO8859-1:es_ES.ISO8859-15
-SAME+=         ca_AD.ISO8859-1:es_MX.ISO8859-1
+SAME+=         ca_AD.ISO8859-15:ca_ES.ISO8859-15
+SAME+=         ca_AD.ISO8859-15:ca_FR.ISO8859-15
+SAME+=         ca_AD.ISO8859-15:ca_IT.ISO8859-15
+SAME+=         ca_AD.ISO8859-15:es_AR.ISO8859-1
+SAME+=         ca_AD.ISO8859-15:es_ES.ISO8859-15
+SAME+=         ca_AD.ISO8859-15:es_MX.ISO8859-1
 SAME+=         ca_AD.UTF-8:ca_ES.UTF-8
 SAME+=         ca_AD.UTF-8:ca_FR.UTF-8
 SAME+=         ca_AD.UTF-8:ca_IT.UTF-8
@@ -108,28 +100,21 @@ SAME+=            ca_AD.UTF-8:es_CR.UTF-8
 SAME+=         ca_AD.UTF-8:es_ES.UTF-8
 SAME+=         ca_AD.UTF-8:es_MX.UTF-8
 SAME+=         cs_CZ.ISO8859-2:cs_CZ.UTF-8
-SAME+=         da_DK.ISO8859-1:da_DK.ISO8859-15
-SAME+=         da_DK.ISO8859-1:da_DK.UTF-8
-SAME+=         da_DK.ISO8859-1:sv_FI.ISO8859-1
-SAME+=         da_DK.ISO8859-1:sv_FI.ISO8859-15
-SAME+=         da_DK.ISO8859-1:sv_FI.UTF-8
-SAME+=         da_DK.ISO8859-1:sv_SE.ISO8859-1
-SAME+=         da_DK.ISO8859-1:sv_SE.ISO8859-15
-SAME+=         da_DK.ISO8859-1:sv_SE.UTF-8
-SAME+=         de_AT.ISO8859-1:de_AT.ISO8859-15
-SAME+=         de_AT.ISO8859-1:de_AT.UTF-8
-SAME+=         de_AT.ISO8859-1:de_CH.ISO8859-1
-SAME+=         de_AT.ISO8859-1:de_CH.ISO8859-15
-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+=         da_DK.ISO8859-15:da_DK.UTF-8
+SAME+=         da_DK.ISO8859-15:sv_FI.ISO8859-15
+SAME+=         da_DK.ISO8859-15:sv_FI.UTF-8
+SAME+=         da_DK.ISO8859-15:sv_SE.ISO8859-15
+SAME+=         da_DK.ISO8859-15:sv_SE.UTF-8
+SAME+=         de_AT.ISO8859-15:de_AT.UTF-8
+SAME+=         de_AT.ISO8859-15:de_CH.ISO8859-15
+SAME+=         de_AT.ISO8859-15:de_CH.UTF-8
+SAME+=         de_AT.ISO8859-15:de_DE.ISO8859-15
+SAME+=         de_AT.ISO8859-15:de_DE.UTF-8
 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.US-ASCII
 SAME+=         en_AU.ISO8859-1:en_CA.UTF-8
-SAME+=         en_AU.ISO8859-1:en_GB.ISO8859-1
 SAME+=         en_AU.ISO8859-1:en_GB.ISO8859-15
 SAME+=         en_AU.ISO8859-1:en_GB.US-ASCII
 SAME+=         en_AU.ISO8859-1:en_GB.UTF-8
@@ -140,7 +125,6 @@ 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.US-ASCII
 SAME+=         en_AU.ISO8859-1:en_NZ.UTF-8
-SAME+=         en_AU.ISO8859-1:en_PH.ISO8859-1
 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
@@ -151,35 +135,24 @@ SAME+=            en_AU.ISO8859-1:en_ZA.ISO8859-1
 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
-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_BE.ISO8859-1:fr_BE.UTF-8
-SAME+=         fr_BE.ISO8859-1:fr_CA.ISO8859-1
-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
-SAME+=         fr_BE.ISO8859-1:fr_CH.UTF-8
-SAME+=         fr_BE.ISO8859-1:fr_FR.ISO8859-1
-SAME+=         fr_BE.ISO8859-1:fr_FR.ISO8859-15
-SAME+=         fr_BE.ISO8859-1:fr_FR.UTF-8
+SAME+=         eu_ES.ISO8859-15:eu_ES.UTF-8
+SAME+=         fr_BE.ISO8859-15:fr_BE.UTF-8
+SAME+=         fr_BE.ISO8859-15:fr_CA.ISO8859-1
+SAME+=         fr_BE.ISO8859-15:fr_CA.UTF-8
+SAME+=         fr_BE.ISO8859-15:fr_CH.ISO8859-15
+SAME+=         fr_BE.ISO8859-15:fr_CH.UTF-8
+SAME+=         fr_BE.ISO8859-15:fr_FR.ISO8859-15
+SAME+=         fr_BE.ISO8859-15:fr_FR.UTF-8
 SAME+=         hr_HR.ISO8859-2:hr_HR.UTF-8
 SAME+=         hr_HR.ISO8859-2:sl_SI.ISO8859-2
 SAME+=         hr_HR.ISO8859-2:sl_SI.UTF-8
 SAME+=         hu_HU.ISO8859-2:hu_HU.UTF-8
-SAME+=         is_IS.ISO8859-1:is_IS.ISO8859-15
-SAME+=         it_CH.ISO8859-1:it_CH.ISO8859-15
-SAME+=         it_CH.ISO8859-1:it_IT.ISO8859-1
-SAME+=         it_CH.ISO8859-1:it_IT.ISO8859-15
+SAME+=         it_CH.ISO8859-15:it_IT.ISO8859-15
 SAME+=         it_CH.UTF-8:it_IT.UTF-8
 SAME+=         lt_LT.ISO8859-13:lt_LT.UTF-8
-SAME+=         nb_NO.ISO8859-1:nb_NO.ISO8859-15
-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+=         nb_NO.ISO8859-15:nb_NO.UTF-8
+SAME+=         nn_NO.ISO8859-15:nn_NO.UTF-8
 SAME+=         pl_PL.ISO8859-2:pl_PL.UTF-8
-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
 SAME+=         ro_RO.ISO8859-2:ro_RO.UTF-8
index 5798ccd..0a920e6 100644 (file)
@@ -12,10 +12,10 @@ LOCALES+=   af_ZA.ISO8859-1
 LOCALES+=      af_ZA.UTF-8
 LOCALES+=      am_ET.UTF-8
 LOCALES+=      be_BY.CP1131
-LOCALES+=      ca_AD.ISO8859-1
-LOCALES+=      de_CH.ISO8859-1
+LOCALES+=      ca_AD.ISO8859-15
+LOCALES+=      de_CH.ISO8859-15
 LOCALES+=      en_ZA.US-ASCII
-LOCALES+=      fr_CH.ISO8859-1
+LOCALES+=      fr_CH.ISO8859-15
 LOCALES+=      fr_CH.UTF-8
 LOCALES+=      hi_IN.ISCII-DEV
 LOCALES+=      hy_AM.ARMSCII-8
@@ -31,27 +31,20 @@ 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: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_FR.ISO8859-1
 SAME+=         af_ZA.ISO8859-1:fr_FR.ISO8859-15
 SAME+=         af_ZA.ISO8859-1:hu_HU.ISO8859-2
 SAME+=         af_ZA.ISO8859-1:lt_LT.ISO8859-13
 SAME+=         af_ZA.ISO8859-1:lv_LV.ISO8859-13
-SAME+=         af_ZA.ISO8859-1:nb_NO.ISO8859-1
 SAME+=         af_ZA.ISO8859-1:nb_NO.ISO8859-15
-SAME+=         af_ZA.ISO8859-1:nn_NO.ISO8859-1
 SAME+=         af_ZA.ISO8859-1:nn_NO.ISO8859-15
 SAME+=         af_ZA.ISO8859-1:pl_PL.ISO8859-2
-SAME+=         af_ZA.ISO8859-1:pt_PT.ISO8859-1
 SAME+=         af_ZA.ISO8859-1:pt_PT.ISO8859-15
 SAME+=         af_ZA.ISO8859-1:ru_RU.CP1251
 SAME+=         af_ZA.ISO8859-1:ru_RU.ISO8859-5
 SAME+=         af_ZA.ISO8859-1:sk_SK.ISO8859-2
-SAME+=         af_ZA.ISO8859-1:sv_FI.ISO8859-1
 SAME+=         af_ZA.ISO8859-1:sv_FI.ISO8859-15
-SAME+=         af_ZA.ISO8859-1:sv_SE.ISO8859-1
 SAME+=         af_ZA.ISO8859-1:sv_SE.ISO8859-15
 SAME+=         af_ZA.ISO8859-1:uk_UA.CP1251
 SAME+=         af_ZA.ISO8859-1:uk_UA.ISO8859-5
@@ -84,7 +77,6 @@ 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.US-ASCII
 SAME+=         am_ET.UTF-8:en_CA.UTF-8
-SAME+=         am_ET.UTF-8:en_GB.ISO8859-1
 SAME+=         am_ET.UTF-8:en_GB.ISO8859-15
 SAME+=         am_ET.UTF-8:en_GB.US-ASCII
 SAME+=         am_ET.UTF-8:en_GB.UTF-8
@@ -95,7 +87,6 @@ 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.US-ASCII
 SAME+=         am_ET.UTF-8:en_NZ.UTF-8
-SAME+=         am_ET.UTF-8:en_PH.ISO8859-1
 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
@@ -118,69 +109,51 @@ SAME+=            am_ET.UTF-8:zh_Hant_HK.Big5HKSCS
 SAME+=         am_ET.UTF-8:zh_Hant_HK.UTF-8
 SAME+=         am_ET.UTF-8:zh_Hant_TW.UTF-8
 SAME+=         be_BY.CP1131:ru_RU.CP866
-SAME+=         ca_AD.ISO8859-1:ca_AD.ISO8859-15
-SAME+=         ca_AD.ISO8859-1:ca_AD.UTF-8
-SAME+=         ca_AD.ISO8859-1:ca_ES.ISO8859-1
-SAME+=         ca_AD.ISO8859-1:ca_ES.ISO8859-15
-SAME+=         ca_AD.ISO8859-1:ca_ES.UTF-8
-SAME+=         ca_AD.ISO8859-1:ca_FR.ISO8859-1
-SAME+=         ca_AD.ISO8859-1:ca_FR.ISO8859-15
-SAME+=         ca_AD.ISO8859-1:ca_FR.UTF-8
-SAME+=         ca_AD.ISO8859-1:ca_IT.ISO8859-1
-SAME+=         ca_AD.ISO8859-1:ca_IT.ISO8859-15
-SAME+=         ca_AD.ISO8859-1:ca_IT.UTF-8
-SAME+=         ca_AD.ISO8859-1:da_DK.ISO8859-1
-SAME+=         ca_AD.ISO8859-1:da_DK.ISO8859-15
-SAME+=         ca_AD.ISO8859-1:da_DK.UTF-8
-SAME+=         ca_AD.ISO8859-1:de_AT.ISO8859-1
-SAME+=         ca_AD.ISO8859-1:de_AT.ISO8859-15
-SAME+=         ca_AD.ISO8859-1:de_AT.UTF-8
-SAME+=         ca_AD.ISO8859-1:de_DE.ISO8859-1
-SAME+=         ca_AD.ISO8859-1:de_DE.ISO8859-15
-SAME+=         ca_AD.ISO8859-1:de_DE.UTF-8
-SAME+=         ca_AD.ISO8859-1:el_GR.ISO8859-7
-SAME+=         ca_AD.ISO8859-1:el_GR.UTF-8
-SAME+=         ca_AD.ISO8859-1:es_AR.ISO8859-1
-SAME+=         ca_AD.ISO8859-1:es_AR.UTF-8
-SAME+=         ca_AD.ISO8859-1:es_CR.ISO8859-1
-SAME+=         ca_AD.ISO8859-1:es_CR.UTF-8
-SAME+=         ca_AD.ISO8859-1:es_ES.ISO8859-1
-SAME+=         ca_AD.ISO8859-1:es_ES.ISO8859-15
-SAME+=         ca_AD.ISO8859-1:es_ES.UTF-8
-SAME+=         ca_AD.ISO8859-1:eu_ES.ISO8859-1
-SAME+=         ca_AD.ISO8859-1:eu_ES.ISO8859-15
-SAME+=         ca_AD.ISO8859-1:eu_ES.UTF-8
-SAME+=         ca_AD.ISO8859-1:fr_BE.ISO8859-1
-SAME+=         ca_AD.ISO8859-1:fr_BE.ISO8859-15
-SAME+=         ca_AD.ISO8859-1:fr_BE.UTF-8
-SAME+=         ca_AD.ISO8859-1:hr_HR.ISO8859-2
-SAME+=         ca_AD.ISO8859-1:hr_HR.UTF-8
-SAME+=         ca_AD.ISO8859-1:is_IS.ISO8859-1
-SAME+=         ca_AD.ISO8859-1:is_IS.ISO8859-15
-SAME+=         ca_AD.ISO8859-1:is_IS.UTF-8
-SAME+=         ca_AD.ISO8859-1:it_IT.ISO8859-1
-SAME+=         ca_AD.ISO8859-1:it_IT.ISO8859-15
-SAME+=         ca_AD.ISO8859-1:it_IT.UTF-8
-SAME+=         ca_AD.ISO8859-1:nl_BE.ISO8859-1
-SAME+=         ca_AD.ISO8859-1:nl_BE.ISO8859-15
-SAME+=         ca_AD.ISO8859-1:nl_BE.UTF-8
-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.UTF-8
-SAME+=         ca_AD.ISO8859-1:ro_RO.ISO8859-2
-SAME+=         ca_AD.ISO8859-1:ro_RO.UTF-8
-SAME+=         ca_AD.ISO8859-1:sl_SI.ISO8859-2
-SAME+=         ca_AD.ISO8859-1:sl_SI.UTF-8
-SAME+=         ca_AD.ISO8859-1:tr_TR.ISO8859-9
-SAME+=         ca_AD.ISO8859-1:tr_TR.UTF-8
-SAME+=         de_CH.ISO8859-1:de_CH.ISO8859-15
-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+=         fr_CH.ISO8859-1:fr_CH.ISO8859-15
+SAME+=         ca_AD.ISO8859-15:ca_AD.UTF-8
+SAME+=         ca_AD.ISO8859-15:ca_ES.ISO8859-15
+SAME+=         ca_AD.ISO8859-15:ca_ES.UTF-8
+SAME+=         ca_AD.ISO8859-15:ca_FR.ISO8859-15
+SAME+=         ca_AD.ISO8859-15:ca_FR.UTF-8
+SAME+=         ca_AD.ISO8859-15:ca_IT.ISO8859-15
+SAME+=         ca_AD.ISO8859-15:ca_IT.UTF-8
+SAME+=         ca_AD.ISO8859-15:da_DK.ISO8859-15
+SAME+=         ca_AD.ISO8859-15:da_DK.UTF-8
+SAME+=         ca_AD.ISO8859-15:de_AT.ISO8859-15
+SAME+=         ca_AD.ISO8859-15:de_AT.UTF-8
+SAME+=         ca_AD.ISO8859-15:de_DE.ISO8859-15
+SAME+=         ca_AD.ISO8859-15:de_DE.UTF-8
+SAME+=         ca_AD.ISO8859-15:el_GR.ISO8859-7
+SAME+=         ca_AD.ISO8859-15:el_GR.UTF-8
+SAME+=         ca_AD.ISO8859-15:es_AR.ISO8859-1
+SAME+=         ca_AD.ISO8859-15:es_AR.UTF-8
+SAME+=         ca_AD.ISO8859-15:es_CR.UTF-8
+SAME+=         ca_AD.ISO8859-15:es_ES.ISO8859-15
+SAME+=         ca_AD.ISO8859-15:es_ES.UTF-8
+SAME+=         ca_AD.ISO8859-15:eu_ES.ISO8859-15
+SAME+=         ca_AD.ISO8859-15:eu_ES.UTF-8
+SAME+=         ca_AD.ISO8859-15:fr_BE.ISO8859-15
+SAME+=         ca_AD.ISO8859-15:fr_BE.UTF-8
+SAME+=         ca_AD.ISO8859-15:hr_HR.ISO8859-2
+SAME+=         ca_AD.ISO8859-15:hr_HR.UTF-8
+SAME+=         ca_AD.ISO8859-15:is_IS.ISO8859-15
+SAME+=         ca_AD.ISO8859-15:is_IS.UTF-8
+SAME+=         ca_AD.ISO8859-15:it_IT.ISO8859-15
+SAME+=         ca_AD.ISO8859-15:it_IT.UTF-8
+SAME+=         ca_AD.ISO8859-15:nl_BE.ISO8859-15
+SAME+=         ca_AD.ISO8859-15:nl_BE.UTF-8
+SAME+=         ca_AD.ISO8859-15:nl_NL.ISO8859-15
+SAME+=         ca_AD.ISO8859-15:nl_NL.UTF-8
+SAME+=         ca_AD.ISO8859-15:pt_BR.ISO8859-1
+SAME+=         ca_AD.ISO8859-15:pt_BR.UTF-8
+SAME+=         ca_AD.ISO8859-15:ro_RO.ISO8859-2
+SAME+=         ca_AD.ISO8859-15:ro_RO.UTF-8
+SAME+=         ca_AD.ISO8859-15:sl_SI.ISO8859-2
+SAME+=         ca_AD.ISO8859-15:sl_SI.UTF-8
+SAME+=         ca_AD.ISO8859-15:tr_TR.ISO8859-9
+SAME+=         ca_AD.ISO8859-15:tr_TR.UTF-8
+SAME+=         de_CH.ISO8859-15:de_CH.UTF-8
+SAME+=         de_CH.ISO8859-15:it_CH.ISO8859-15
+SAME+=         de_CH.ISO8859-15:it_CH.UTF-8
 SAME+=         hi_IN.ISCII-DEV:hi_IN.UTF-8
 SAME+=         hy_AM.ARMSCII-8:hy_AM.UTF-8
 SAME+=         ru_RU.KOI8-R:uk_UA.KOI8-U
index 4135a19..f4c9525 100644 (file)
@@ -16,44 +16,44 @@ LOCALES+=   be_BY.ISO8859-5
 LOCALES+=      be_BY.UTF-8
 LOCALES+=      bg_BG.CP1251
 LOCALES+=      bg_BG.UTF-8
-LOCALES+=      ca_AD.ISO8859-1
+LOCALES+=      ca_AD.ISO8859-15
 LOCALES+=      ca_AD.UTF-8
 LOCALES+=      cs_CZ.ISO8859-2
 LOCALES+=      cs_CZ.UTF-8
-LOCALES+=      da_DK.ISO8859-1
+LOCALES+=      da_DK.ISO8859-15
 LOCALES+=      da_DK.UTF-8
-LOCALES+=      de_AT.ISO8859-1
+LOCALES+=      de_AT.ISO8859-15
 LOCALES+=      de_AT.UTF-8
-LOCALES+=      de_CH.ISO8859-1
+LOCALES+=      de_CH.ISO8859-15
 LOCALES+=      de_CH.UTF-8
 LOCALES+=      el_GR.ISO8859-7
 LOCALES+=      el_GR.UTF-8
 LOCALES+=      en_AU.ISO8859-1
 LOCALES+=      en_CA.ISO8859-1
-LOCALES+=      en_GB.ISO8859-1
+LOCALES+=      en_GB.ISO8859-15
 LOCALES+=      en_IE.ISO8859-15
 LOCALES+=      en_NZ.ISO8859-1
-LOCALES+=      en_PH.ISO8859-1
+LOCALES+=      en_PH.UTF-8
 LOCALES+=      en_US.ISO8859-1
 LOCALES+=      en_ZA.ISO8859-1
 LOCALES+=      es_AR.ISO8859-1
 LOCALES+=      es_AR.UTF-8
-LOCALES+=      es_ES.ISO8859-1
+LOCALES+=      es_ES.ISO8859-15
 LOCALES+=      es_ES.UTF-8
 LOCALES+=      es_MX.ISO8859-1
 LOCALES+=      es_MX.UTF-8
 LOCALES+=      et_EE.ISO8859-15
 LOCALES+=      et_EE.UTF-8
-LOCALES+=      eu_ES.ISO8859-1
-LOCALES+=      fi_FI.ISO8859-1
+LOCALES+=      eu_ES.ISO8859-15
+LOCALES+=      fi_FI.ISO8859-15
 LOCALES+=      fi_FI.UTF-8
-LOCALES+=      fr_BE.ISO8859-1
+LOCALES+=      fr_BE.ISO8859-15
 LOCALES+=      fr_BE.UTF-8
 LOCALES+=      fr_CA.ISO8859-1
 LOCALES+=      fr_CA.UTF-8
-LOCALES+=      fr_CH.ISO8859-1
+LOCALES+=      fr_CH.ISO8859-15
 LOCALES+=      fr_CH.UTF-8
-LOCALES+=      fr_FR.ISO8859-1
+LOCALES+=      fr_FR.ISO8859-15
 LOCALES+=      fr_FR.UTF-8
 LOCALES+=      he_IL.UTF-8
 LOCALES+=      hi_IN.ISCII-DEV
@@ -64,11 +64,11 @@ LOCALES+=   hu_HU.ISO8859-2
 LOCALES+=      hu_HU.UTF-8
 LOCALES+=      hy_AM.ARMSCII-8
 LOCALES+=      hy_AM.UTF-8
-LOCALES+=      is_IS.ISO8859-1
+LOCALES+=      is_IS.ISO8859-15
 LOCALES+=      is_IS.UTF-8
-LOCALES+=      it_CH.ISO8859-1
+LOCALES+=      it_CH.ISO8859-15
 LOCALES+=      it_CH.UTF-8
-LOCALES+=      it_IT.ISO8859-1
+LOCALES+=      it_IT.ISO8859-15
 LOCALES+=      it_IT.UTF-8
 LOCALES+=      ja_JP.SJIS
 LOCALES+=      ja_JP.UTF-8
@@ -81,17 +81,17 @@ LOCALES+=   lt_LT.UTF-8
 LOCALES+=      lv_LV.ISO8859-13
 LOCALES+=      lv_LV.UTF-8
 LOCALES+=      mn_Cyrl_MN.UTF-8
-LOCALES+=      nb_NO.ISO8859-1
+LOCALES+=      nb_NO.ISO8859-15
 LOCALES+=      nb_NO.UTF-8
-LOCALES+=      nl_BE.ISO8859-1
-LOCALES+=      nl_NL.ISO8859-1
-LOCALES+=      nn_NO.ISO8859-1
+LOCALES+=      nl_BE.ISO8859-15
+LOCALES+=      nl_NL.ISO8859-15
+LOCALES+=      nn_NO.ISO8859-15
 LOCALES+=      nn_NO.UTF-8
 LOCALES+=      pl_PL.ISO8859-2
 LOCALES+=      pl_PL.UTF-8
 LOCALES+=      pt_BR.ISO8859-1
 LOCALES+=      pt_BR.UTF-8
-LOCALES+=      pt_PT.ISO8859-1
+LOCALES+=      pt_PT.ISO8859-15
 LOCALES+=      pt_PT.UTF-8
 LOCALES+=      ro_RO.ISO8859-2
 LOCALES+=      ro_RO.UTF-8
@@ -109,9 +109,9 @@ LOCALES+=   sl_SI.UTF-8
 LOCALES+=      sr_Cyrl_RS.ISO8859-5
 LOCALES+=      sr_Cyrl_RS.UTF-8
 LOCALES+=      sr_Latn_RS.ISO8859-2
-LOCALES+=      sv_FI.ISO8859-1
+LOCALES+=      sv_FI.ISO8859-15
 LOCALES+=      sv_FI.UTF-8
-LOCALES+=      sv_SE.ISO8859-1
+LOCALES+=      sv_SE.ISO8859-15
 LOCALES+=      sv_SE.UTF-8
 LOCALES+=      tr_TR.ISO8859-9
 LOCALES+=      tr_TR.UTF-8
@@ -129,21 +129,13 @@ LOCALES+= zh_Hant_TW.Big5
 LOCALES+=      zh_Hant_TW.UTF-8
 
 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
-SAME+=         ca_AD.ISO8859-1:ca_ES.ISO8859-15
-SAME+=         ca_AD.ISO8859-1:ca_FR.ISO8859-1
-SAME+=         ca_AD.ISO8859-1:ca_FR.ISO8859-15
-SAME+=         ca_AD.ISO8859-1:ca_IT.ISO8859-1
-SAME+=         ca_AD.ISO8859-1:ca_IT.ISO8859-15
+SAME+=         ca_AD.ISO8859-15:ca_ES.ISO8859-15
+SAME+=         ca_AD.ISO8859-15:ca_FR.ISO8859-15
+SAME+=         ca_AD.ISO8859-15:ca_IT.ISO8859-15
 SAME+=         ca_AD.UTF-8:ca_ES.UTF-8
 SAME+=         ca_AD.UTF-8:ca_FR.UTF-8
 SAME+=         ca_AD.UTF-8:ca_IT.UTF-8
-SAME+=         da_DK.ISO8859-1:da_DK.ISO8859-15
-SAME+=         de_AT.ISO8859-1:de_AT.ISO8859-15
-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.ISO8859-15:de_DE.ISO8859-15
 SAME+=         de_CH.UTF-8:de_DE.UTF-8
 SAME+=         en_AU.ISO8859-1:en_AU.US-ASCII
 SAME+=         en_AU.ISO8859-1:en_AU.UTF-8
@@ -151,41 +143,22 @@ 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.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_GB.ISO8859-15:en_GB.US-ASCII
+SAME+=         en_GB.ISO8859-15:en_GB.UTF-8
 SAME+=         en_IE.ISO8859-15:en_IE.UTF-8
 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.US-ASCII
 SAME+=         en_US.ISO8859-1:en_US.UTF-8
 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
 SAME+=         es_AR.UTF-8:es_CR.UTF-8
-SAME+=         es_ES.ISO8859-1:es_ES.ISO8859-15
-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_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
-SAME+=         it_CH.ISO8859-1:it_CH.ISO8859-15
-SAME+=         it_IT.ISO8859-1:it_IT.ISO8859-15
-SAME+=         nb_NO.ISO8859-1:nb_NO.ISO8859-15
-SAME+=         nl_BE.ISO8859-1:nl_BE.ISO8859-15
-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_PT.ISO8859-1:pt_PT.ISO8859-15
+SAME+=         eu_ES.ISO8859-15:eu_ES.UTF-8
+SAME+=         nl_BE.ISO8859-15:nl_BE.UTF-8
+SAME+=         nl_NL.ISO8859-15:nl_NL.UTF-8
 SAME+=         sr_Cyrl_RS.UTF-8:sr_Latn_RS.UTF-8
-SAME+=         sv_FI.ISO8859-1:sv_FI.ISO8859-15
-SAME+=         sv_SE.ISO8859-1:sv_SE.ISO8859-15
 SAME+=         zh_Hans_CN.GB18030:zh_Hans_CN.GBK
 SAME+=         ko_KR.eucKR:ko_KR.CP949 # legacy (same charset)
 
index 6ce8115..5d40b9e 100644 (file)
                countries="BG" />
        <language name="ca"
                fallback="ca_ES"
-               encoding="ISO8859-1 ISO8859-15"
+               encoding="ISO8859-15"
                countries="AD ES FR IT" />      <!-- only ca_ES defined -->
        <language name="cs"
                encoding="ISO8859-2"
                countries="CZ" />
        <language name="da"
-               encoding="ISO8859-1 ISO8859-15"
+               encoding="ISO8859-15"
                countries="DK" />
        <language name="de"
-               encoding="ISO8859-1 ISO8859-15"
+               encoding="ISO8859-15"
                countries="AT CH DE" />
        <language name="el"
                encoding="ISO8859-7"
                countries="GR" />
        <language name="en"
-               encoding="ISO8859-1 ISO8859-15 US-ASCII"
+               encoding="ISO8859-15 US-ASCII"
                countries="GB" />
        <language name="en"
                encoding="ISO8859-1 US-ASCII"
                countries="IE" />
        <language name="en"
                encoding="ISO8859-1"
-               countries="HK PH SG" />
+               countries="HK SG" />
+       <language name="en"
+               countries="PH" />               <!-- UTF-8 only -->
        <language name="es"
-               encoding="ISO8859-1 ISO8859-15"
+               countries="CR" />               <!-- UTF-8 only -->
+       <language name="es"
+               encoding="ISO8859-15"
                countries="ES" />
        <language name="es"
                encoding="ISO8859-1"
-               countries="AR CR MX" />
+               countries="AR MX" />
        <language name="et"
                encoding="ISO8859-15"
                countries="EE" />
        <language name="eu"
-               encoding="ISO8859-1 ISO8859-15"
+               encoding="ISO8859-15"
                countries="ES" />
        <language name="fi"
-               encoding="ISO8859-1 ISO8859-15"
+               encoding="ISO8859-15"
                countries="FI" />
        <language name="fr"
-               encoding="ISO8859-1 ISO8859-15"
+               encoding="ISO8859-15"
                countries="BE CH FR" />
        <language name="fr"
                encoding="ISO8859-1"
                encoding="ARMSCII-8"
                countries="AM" />
        <language name="is"
-               encoding="ISO8859-1 ISO8859-15"
+               encoding="ISO8859-15"
                countries="IS" />
        <language name="it"
-               encoding="ISO8859-1 ISO8859-15"
+               encoding="ISO8859-15"
                countries="CH IT" />
        <language name="ja"
                encoding="SJIS eucJP"
                family="Cyrl"
                countries="MN" />
        <language name="nb"
-               encoding="ISO8859-1 ISO8859-15"
+               encoding="ISO8859-15"
                countries="NO" />
        <language name="nl"
-               encoding="ISO8859-1 ISO8859-15"
+               encoding="ISO8859-15"
                countries="BE NL" />
        <language name="nn"
-               encoding="ISO8859-1 ISO8859-15"
+               encoding="ISO8859-15"
                countries="NO" />
        <language name="pl"
                encoding="ISO8859-2"
                countries="PL" />
        <language name="pt"
-               encoding="ISO8859-1 ISO8859-15"
+               encoding="ISO8859-15"
                countries="PT" />
        <language name="pt"
                encoding="ISO8859-1"
                encoding="ISO8859-5"
                countries="RS" />
        <language name="sv"
-               encoding="ISO8859-1 ISO8859-15"
+               encoding="ISO8859-15"
                countries="SE FI" />
        <language name="tr"
                encoding="ISO8859-9"