From 81ac56d6a3f579c3dd38baf236b532b67600c8ba Mon Sep 17 00:00:00 2001 From: John Marino Date: Mon, 10 Aug 2015 17:48:40 +0200 Subject: [PATCH] locales polish: Remove ISO-8859-1 encoding from 27 locales 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) --- Makefile_upgrade.inc | 20 +++ etc/mtree/BSD.local.dist | 54 +------- etc/mtree/BSD.usr.dist | 54 -------- share/colldef/Makefile | 27 ---- share/ctypedef/Makefile | 27 ---- share/ctypedef/ca_IT.ISO8859-1.src | 1 - share/monetdef/Makefile | 59 +++------ ..._DK.ISO8859-1.src => da_DK.ISO8859-15.src} | 0 share/monetdef/de_AT.ISO8859-1.src | 50 ------- ..._CH.ISO8859-1.src => de_CH.ISO8859-15.src} | 0 ..._GB.ISO8859-1.src => en_GB.ISO8859-15.src} | 0 share/monetdef/en_PH.ISO8859-1.src | 50 ------- share/monetdef/es_CR.ISO8859-1.src | 50 ------- ..._CH.ISO8859-1.src => fr_CH.ISO8859-15.src} | 0 ..._IS.ISO8859-1.src => is_IS.ISO8859-15.src} | 0 ..._FI.ISO8859-1.src => lt_LT.ISO8859-13.src} | 0 ..._NO.ISO8859-1.src => nb_NO.ISO8859-15.src} | 0 share/monetdef/nl_NL.ISO8859-1.src | 50 ------- ..._NO.ISO8859-1.src => nn_NO.ISO8859-15.src} | 0 ...a_AD.ISO8859-1.src => sl_SI.ISO8859-2.src} | 0 ..._SE.ISO8859-1.src => sv_SE.ISO8859-15.src} | 0 share/msgdef/Makefile | 101 ++++++-------- ..._AD.ISO8859-1.src => ca_AD.ISO8859-15.src} | 0 ..._DK.ISO8859-1.src => da_DK.ISO8859-15.src} | 0 ..._AT.ISO8859-1.src => de_AT.ISO8859-15.src} | 0 ..._ES.ISO8859-1.src => eu_ES.ISO8859-15.src} | 0 ..._FI.ISO8859-1.src => fi_FI.ISO8859-15.src} | 0 ..._BE.ISO8859-1.src => fr_BE.ISO8859-15.src} | 0 ..._IS.ISO8859-1.src => is_IS.ISO8859-15.src} | 0 ..._CH.ISO8859-1.src => it_CH.ISO8859-15.src} | 0 ..._NO.ISO8859-1.src => nb_NO.ISO8859-15.src} | 0 ..._NO.ISO8859-1.src => nn_NO.ISO8859-15.src} | 0 share/numericdef/Makefile | 123 +++++++----------- ..._AD.ISO8859-1.src => ca_AD.ISO8859-15.src} | 0 ..._CH.ISO8859-1.src => de_CH.ISO8859-15.src} | 0 ..._CH.ISO8859-1.src => fr_CH.ISO8859-15.src} | 0 share/timedef/Makefile | 89 +++++-------- ..._AD.ISO8859-1.src => ca_AD.ISO8859-15.src} | 0 ..._DK.ISO8859-1.src => da_DK.ISO8859-15.src} | 0 ..._AT.ISO8859-1.src => de_AT.ISO8859-15.src} | 0 ..._CH.ISO8859-1.src => de_CH.ISO8859-15.src} | 0 ..._GB.ISO8859-1.src => en_GB.ISO8859-15.src} | 0 .../{en_PH.ISO8859-1.src => en_PH.UTF-8.src} | 0 ..._ES.ISO8859-1.src => es_ES.ISO8859-15.src} | 0 ..._ES.ISO8859-1.src => eu_ES.ISO8859-15.src} | 0 ..._FI.ISO8859-1.src => fi_FI.ISO8859-15.src} | 0 ..._BE.ISO8859-1.src => fr_BE.ISO8859-15.src} | 0 ..._CH.ISO8859-1.src => fr_CH.ISO8859-15.src} | 0 ..._FR.ISO8859-1.src => fr_FR.ISO8859-15.src} | 0 ..._IS.ISO8859-1.src => is_IS.ISO8859-15.src} | 0 ..._CH.ISO8859-1.src => it_CH.ISO8859-15.src} | 0 ..._IT.ISO8859-1.src => it_IT.ISO8859-15.src} | 0 ..._NO.ISO8859-1.src => nb_NO.ISO8859-15.src} | 0 ..._BE.ISO8859-1.src => nl_BE.ISO8859-15.src} | 0 ..._NL.ISO8859-1.src => nl_NL.ISO8859-15.src} | 0 ..._NO.ISO8859-1.src => nn_NO.ISO8859-15.src} | 0 ..._PT.ISO8859-1.src => pt_PT.ISO8859-15.src} | 0 ..._FI.ISO8859-1.src => sv_FI.ISO8859-15.src} | 0 ..._SE.ISO8859-1.src => sv_SE.ISO8859-15.src} | 0 tools/tools/locale/etc/charmaps.xml | 38 +++--- 60 files changed, 177 insertions(+), 616 deletions(-) delete mode 120000 share/ctypedef/ca_IT.ISO8859-1.src rename share/monetdef/{da_DK.ISO8859-1.src => da_DK.ISO8859-15.src} (100%) delete mode 100644 share/monetdef/de_AT.ISO8859-1.src rename share/monetdef/{de_CH.ISO8859-1.src => de_CH.ISO8859-15.src} (100%) rename share/monetdef/{en_GB.ISO8859-1.src => en_GB.ISO8859-15.src} (100%) delete mode 100644 share/monetdef/en_PH.ISO8859-1.src delete mode 100644 share/monetdef/es_CR.ISO8859-1.src rename share/monetdef/{fr_CH.ISO8859-1.src => fr_CH.ISO8859-15.src} (100%) rename share/monetdef/{is_IS.ISO8859-1.src => is_IS.ISO8859-15.src} (100%) rename share/monetdef/{fi_FI.ISO8859-1.src => lt_LT.ISO8859-13.src} (100%) rename share/monetdef/{nb_NO.ISO8859-1.src => nb_NO.ISO8859-15.src} (100%) delete mode 100644 share/monetdef/nl_NL.ISO8859-1.src rename share/monetdef/{nn_NO.ISO8859-1.src => nn_NO.ISO8859-15.src} (100%) rename share/monetdef/{ca_AD.ISO8859-1.src => sl_SI.ISO8859-2.src} (100%) rename share/monetdef/{sv_SE.ISO8859-1.src => sv_SE.ISO8859-15.src} (100%) rename share/msgdef/{ca_AD.ISO8859-1.src => ca_AD.ISO8859-15.src} (100%) rename share/msgdef/{da_DK.ISO8859-1.src => da_DK.ISO8859-15.src} (100%) rename share/msgdef/{de_AT.ISO8859-1.src => de_AT.ISO8859-15.src} (100%) rename share/msgdef/{eu_ES.ISO8859-1.src => eu_ES.ISO8859-15.src} (100%) rename share/msgdef/{fi_FI.ISO8859-1.src => fi_FI.ISO8859-15.src} (100%) rename share/msgdef/{fr_BE.ISO8859-1.src => fr_BE.ISO8859-15.src} (100%) rename share/msgdef/{is_IS.ISO8859-1.src => is_IS.ISO8859-15.src} (100%) rename share/msgdef/{it_CH.ISO8859-1.src => it_CH.ISO8859-15.src} (100%) rename share/msgdef/{nb_NO.ISO8859-1.src => nb_NO.ISO8859-15.src} (100%) rename share/msgdef/{nn_NO.ISO8859-1.src => nn_NO.ISO8859-15.src} (100%) rename share/numericdef/{ca_AD.ISO8859-1.src => ca_AD.ISO8859-15.src} (100%) rename share/numericdef/{de_CH.ISO8859-1.src => de_CH.ISO8859-15.src} (100%) rename share/numericdef/{fr_CH.ISO8859-1.src => fr_CH.ISO8859-15.src} (100%) rename share/timedef/{ca_AD.ISO8859-1.src => ca_AD.ISO8859-15.src} (100%) rename share/timedef/{da_DK.ISO8859-1.src => da_DK.ISO8859-15.src} (100%) rename share/timedef/{de_AT.ISO8859-1.src => de_AT.ISO8859-15.src} (100%) rename share/timedef/{de_CH.ISO8859-1.src => de_CH.ISO8859-15.src} (100%) rename share/timedef/{en_GB.ISO8859-1.src => en_GB.ISO8859-15.src} (100%) rename share/timedef/{en_PH.ISO8859-1.src => en_PH.UTF-8.src} (100%) rename share/timedef/{es_ES.ISO8859-1.src => es_ES.ISO8859-15.src} (100%) rename share/timedef/{eu_ES.ISO8859-1.src => eu_ES.ISO8859-15.src} (100%) rename share/timedef/{fi_FI.ISO8859-1.src => fi_FI.ISO8859-15.src} (100%) rename share/timedef/{fr_BE.ISO8859-1.src => fr_BE.ISO8859-15.src} (100%) rename share/timedef/{fr_CH.ISO8859-1.src => fr_CH.ISO8859-15.src} (100%) rename share/timedef/{fr_FR.ISO8859-1.src => fr_FR.ISO8859-15.src} (100%) rename share/timedef/{is_IS.ISO8859-1.src => is_IS.ISO8859-15.src} (100%) rename share/timedef/{it_CH.ISO8859-1.src => it_CH.ISO8859-15.src} (100%) rename share/timedef/{it_IT.ISO8859-1.src => it_IT.ISO8859-15.src} (100%) rename share/timedef/{nb_NO.ISO8859-1.src => nb_NO.ISO8859-15.src} (100%) rename share/timedef/{nl_BE.ISO8859-1.src => nl_BE.ISO8859-15.src} (100%) rename share/timedef/{nl_NL.ISO8859-1.src => nl_NL.ISO8859-15.src} (100%) rename share/timedef/{nn_NO.ISO8859-1.src => nn_NO.ISO8859-15.src} (100%) rename share/timedef/{pt_PT.ISO8859-1.src => pt_PT.ISO8859-15.src} (100%) rename share/timedef/{sv_FI.ISO8859-1.src => sv_FI.ISO8859-15.src} (100%) rename share/timedef/{sv_SE.ISO8859-1.src => sv_SE.ISO8859-15.src} (100%) diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc index 80db59f2e6..3a51da7907 100644 --- a/Makefile_upgrade.inc +++ b/Makefile_upgrade.inc @@ -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 diff --git a/etc/mtree/BSD.local.dist b/etc/mtree/BSD.local.dist index 954de393fa..07cac4bc9a 100644 --- a/etc/mtree/BSD.local.dist +++ b/etc/mtree/BSD.local.dist @@ -289,8 +289,6 @@ .. bg_BG.UTF-8 .. - ca_ES.ISO8859-1 - .. ca_ES.ISO8859-15 .. ca_ES.UTF-8 @@ -299,26 +297,18 @@ .. 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 @@ -339,8 +329,6 @@ .. en_CA.UTF-8 .. - en_GB.ISO8859-1 - .. en_GB.ISO8859-15 .. en_GB.US-ASCII @@ -361,8 +349,6 @@ .. en_NZ.UTF-8 .. - en_PH.ISO8859-1 - .. en_PH.UTF-8 .. en_SG.ISO8859-1 @@ -385,12 +371,8 @@ .. es_AR.UTF-8 .. - es_CR.ISO8859-1 - .. es_CR.UTF-8 .. - es_ES.ISO8859-1 - .. es_ES.ISO8859-15 .. es_ES.UTF-8 @@ -403,24 +385,14 @@ .. 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 @@ -429,14 +401,10 @@ .. 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 @@ -459,20 +427,14 @@ .. 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 @@ -495,24 +457,22 @@ .. 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 @@ -521,8 +481,6 @@ .. pt_BR.UTF-8 .. - pt_PT.ISO8859-1 - .. pt_PT.ISO8859-15 .. pt_PT.UTF-8 @@ -561,14 +519,10 @@ .. 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 diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 5334cf7eb7..45cdffb3ab 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -399,14 +399,6 @@ .. 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 @@ -427,26 +419,18 @@ .. 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 @@ -467,8 +451,6 @@ .. en_CA.UTF-8 .. - en_GB.ISO8859-1 - .. en_GB.ISO8859-15 .. en_GB.US-ASCII @@ -489,8 +471,6 @@ .. en_NZ.UTF-8 .. - en_PH.ISO8859-1 - .. en_PH.UTF-8 .. en_SG.ISO8859-1 @@ -513,12 +493,8 @@ .. es_AR.UTF-8 .. - es_CR.ISO8859-1 - .. es_CR.UTF-8 .. - es_ES.ISO8859-1 - .. es_ES.ISO8859-15 .. es_ES.UTF-8 @@ -531,20 +507,14 @@ .. 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 @@ -553,14 +523,10 @@ .. 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 @@ -583,20 +549,14 @@ .. 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 @@ -625,26 +585,18 @@ .. 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 @@ -657,8 +609,6 @@ .. pt_BR.UTF-8 .. - pt_PT.ISO8859-1 - .. pt_PT.ISO8859-15 .. pt_PT.UTF-8 @@ -697,14 +647,10 @@ .. 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 diff --git a/share/colldef/Makefile b/share/colldef/Makefile index ae56e12a22..71afe87a5e 100644 --- a/share/colldef/Makefile +++ b/share/colldef/Makefile @@ -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 diff --git a/share/ctypedef/Makefile b/share/ctypedef/Makefile index a29e1ba783..660b0e2b13 100644 --- a/share/ctypedef/Makefile +++ b/share/ctypedef/Makefile @@ -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 index af5dfd9059..0000000000 --- a/share/ctypedef/ca_IT.ISO8859-1.src +++ /dev/null @@ -1 +0,0 @@ -ca_IT.UTF-8.src \ No newline at end of file diff --git a/share/monetdef/Makefile b/share/monetdef/Makefile index 2d70186563..842b13ed88 100644 --- a/share/monetdef/Makefile +++ b/share/monetdef/Makefile @@ -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/da_DK.ISO8859-1.src b/share/monetdef/da_DK.ISO8859-15.src similarity index 100% rename from share/monetdef/da_DK.ISO8859-1.src rename to share/monetdef/da_DK.ISO8859-15.src diff --git a/share/monetdef/de_AT.ISO8859-1.src b/share/monetdef/de_AT.ISO8859-1.src deleted file mode 100644 index 2fc7d45865..0000000000 --- a/share/monetdef/de_AT.ISO8859-1.src +++ /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/de_CH.ISO8859-1.src b/share/monetdef/de_CH.ISO8859-15.src similarity index 100% rename from share/monetdef/de_CH.ISO8859-1.src rename to share/monetdef/de_CH.ISO8859-15.src diff --git a/share/monetdef/en_GB.ISO8859-1.src b/share/monetdef/en_GB.ISO8859-15.src similarity index 100% rename from share/monetdef/en_GB.ISO8859-1.src rename to share/monetdef/en_GB.ISO8859-15.src diff --git a/share/monetdef/en_PH.ISO8859-1.src b/share/monetdef/en_PH.ISO8859-1.src deleted file mode 100644 index 406db40989..0000000000 --- a/share/monetdef/en_PH.ISO8859-1.src +++ /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 index ccf419bc62..0000000000 --- a/share/monetdef/es_CR.ISO8859-1.src +++ /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/fr_CH.ISO8859-1.src b/share/monetdef/fr_CH.ISO8859-15.src similarity index 100% rename from share/monetdef/fr_CH.ISO8859-1.src rename to share/monetdef/fr_CH.ISO8859-15.src diff --git a/share/monetdef/is_IS.ISO8859-1.src b/share/monetdef/is_IS.ISO8859-15.src similarity index 100% rename from share/monetdef/is_IS.ISO8859-1.src rename to share/monetdef/is_IS.ISO8859-15.src diff --git a/share/monetdef/fi_FI.ISO8859-1.src b/share/monetdef/lt_LT.ISO8859-13.src similarity index 100% rename from share/monetdef/fi_FI.ISO8859-1.src rename to share/monetdef/lt_LT.ISO8859-13.src diff --git a/share/monetdef/nb_NO.ISO8859-1.src b/share/monetdef/nb_NO.ISO8859-15.src similarity index 100% rename from share/monetdef/nb_NO.ISO8859-1.src rename to share/monetdef/nb_NO.ISO8859-15.src diff --git a/share/monetdef/nl_NL.ISO8859-1.src b/share/monetdef/nl_NL.ISO8859-1.src deleted file mode 100644 index fff1387404..0000000000 --- a/share/monetdef/nl_NL.ISO8859-1.src +++ /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 diff --git a/share/monetdef/nn_NO.ISO8859-1.src b/share/monetdef/nn_NO.ISO8859-15.src similarity index 100% rename from share/monetdef/nn_NO.ISO8859-1.src rename to share/monetdef/nn_NO.ISO8859-15.src diff --git a/share/monetdef/ca_AD.ISO8859-1.src b/share/monetdef/sl_SI.ISO8859-2.src similarity index 100% rename from share/monetdef/ca_AD.ISO8859-1.src rename to share/monetdef/sl_SI.ISO8859-2.src diff --git a/share/monetdef/sv_SE.ISO8859-1.src b/share/monetdef/sv_SE.ISO8859-15.src similarity index 100% rename from share/monetdef/sv_SE.ISO8859-1.src rename to share/monetdef/sv_SE.ISO8859-15.src diff --git a/share/msgdef/Makefile b/share/msgdef/Makefile index e219c12a0d..5e6ce0ff53 100644 --- a/share/msgdef/Makefile +++ b/share/msgdef/Makefile @@ -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 diff --git a/share/msgdef/ca_AD.ISO8859-1.src b/share/msgdef/ca_AD.ISO8859-15.src similarity index 100% rename from share/msgdef/ca_AD.ISO8859-1.src rename to share/msgdef/ca_AD.ISO8859-15.src diff --git a/share/msgdef/da_DK.ISO8859-1.src b/share/msgdef/da_DK.ISO8859-15.src similarity index 100% rename from share/msgdef/da_DK.ISO8859-1.src rename to share/msgdef/da_DK.ISO8859-15.src diff --git a/share/msgdef/de_AT.ISO8859-1.src b/share/msgdef/de_AT.ISO8859-15.src similarity index 100% rename from share/msgdef/de_AT.ISO8859-1.src rename to share/msgdef/de_AT.ISO8859-15.src diff --git a/share/msgdef/eu_ES.ISO8859-1.src b/share/msgdef/eu_ES.ISO8859-15.src similarity index 100% rename from share/msgdef/eu_ES.ISO8859-1.src rename to share/msgdef/eu_ES.ISO8859-15.src diff --git a/share/msgdef/fi_FI.ISO8859-1.src b/share/msgdef/fi_FI.ISO8859-15.src similarity index 100% rename from share/msgdef/fi_FI.ISO8859-1.src rename to share/msgdef/fi_FI.ISO8859-15.src diff --git a/share/msgdef/fr_BE.ISO8859-1.src b/share/msgdef/fr_BE.ISO8859-15.src similarity index 100% rename from share/msgdef/fr_BE.ISO8859-1.src rename to share/msgdef/fr_BE.ISO8859-15.src diff --git a/share/msgdef/is_IS.ISO8859-1.src b/share/msgdef/is_IS.ISO8859-15.src similarity index 100% rename from share/msgdef/is_IS.ISO8859-1.src rename to share/msgdef/is_IS.ISO8859-15.src diff --git a/share/msgdef/it_CH.ISO8859-1.src b/share/msgdef/it_CH.ISO8859-15.src similarity index 100% rename from share/msgdef/it_CH.ISO8859-1.src rename to share/msgdef/it_CH.ISO8859-15.src diff --git a/share/msgdef/nb_NO.ISO8859-1.src b/share/msgdef/nb_NO.ISO8859-15.src similarity index 100% rename from share/msgdef/nb_NO.ISO8859-1.src rename to share/msgdef/nb_NO.ISO8859-15.src diff --git a/share/msgdef/nn_NO.ISO8859-1.src b/share/msgdef/nn_NO.ISO8859-15.src similarity index 100% rename from share/msgdef/nn_NO.ISO8859-1.src rename to share/msgdef/nn_NO.ISO8859-15.src diff --git a/share/numericdef/Makefile b/share/numericdef/Makefile index 5798ccd662..0a920e68f9 100644 --- a/share/numericdef/Makefile +++ b/share/numericdef/Makefile @@ -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 diff --git a/share/numericdef/ca_AD.ISO8859-1.src b/share/numericdef/ca_AD.ISO8859-15.src similarity index 100% rename from share/numericdef/ca_AD.ISO8859-1.src rename to share/numericdef/ca_AD.ISO8859-15.src diff --git a/share/numericdef/de_CH.ISO8859-1.src b/share/numericdef/de_CH.ISO8859-15.src similarity index 100% rename from share/numericdef/de_CH.ISO8859-1.src rename to share/numericdef/de_CH.ISO8859-15.src diff --git a/share/numericdef/fr_CH.ISO8859-1.src b/share/numericdef/fr_CH.ISO8859-15.src similarity index 100% rename from share/numericdef/fr_CH.ISO8859-1.src rename to share/numericdef/fr_CH.ISO8859-15.src diff --git a/share/timedef/Makefile b/share/timedef/Makefile index 4135a19aec..f4c95255a5 100644 --- a/share/timedef/Makefile +++ b/share/timedef/Makefile @@ -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) diff --git a/share/timedef/ca_AD.ISO8859-1.src b/share/timedef/ca_AD.ISO8859-15.src similarity index 100% rename from share/timedef/ca_AD.ISO8859-1.src rename to share/timedef/ca_AD.ISO8859-15.src diff --git a/share/timedef/da_DK.ISO8859-1.src b/share/timedef/da_DK.ISO8859-15.src similarity index 100% rename from share/timedef/da_DK.ISO8859-1.src rename to share/timedef/da_DK.ISO8859-15.src diff --git a/share/timedef/de_AT.ISO8859-1.src b/share/timedef/de_AT.ISO8859-15.src similarity index 100% rename from share/timedef/de_AT.ISO8859-1.src rename to share/timedef/de_AT.ISO8859-15.src diff --git a/share/timedef/de_CH.ISO8859-1.src b/share/timedef/de_CH.ISO8859-15.src similarity index 100% rename from share/timedef/de_CH.ISO8859-1.src rename to share/timedef/de_CH.ISO8859-15.src diff --git a/share/timedef/en_GB.ISO8859-1.src b/share/timedef/en_GB.ISO8859-15.src similarity index 100% rename from share/timedef/en_GB.ISO8859-1.src rename to share/timedef/en_GB.ISO8859-15.src diff --git a/share/timedef/en_PH.ISO8859-1.src b/share/timedef/en_PH.UTF-8.src similarity index 100% rename from share/timedef/en_PH.ISO8859-1.src rename to share/timedef/en_PH.UTF-8.src diff --git a/share/timedef/es_ES.ISO8859-1.src b/share/timedef/es_ES.ISO8859-15.src similarity index 100% rename from share/timedef/es_ES.ISO8859-1.src rename to share/timedef/es_ES.ISO8859-15.src diff --git a/share/timedef/eu_ES.ISO8859-1.src b/share/timedef/eu_ES.ISO8859-15.src similarity index 100% rename from share/timedef/eu_ES.ISO8859-1.src rename to share/timedef/eu_ES.ISO8859-15.src diff --git a/share/timedef/fi_FI.ISO8859-1.src b/share/timedef/fi_FI.ISO8859-15.src similarity index 100% rename from share/timedef/fi_FI.ISO8859-1.src rename to share/timedef/fi_FI.ISO8859-15.src diff --git a/share/timedef/fr_BE.ISO8859-1.src b/share/timedef/fr_BE.ISO8859-15.src similarity index 100% rename from share/timedef/fr_BE.ISO8859-1.src rename to share/timedef/fr_BE.ISO8859-15.src diff --git a/share/timedef/fr_CH.ISO8859-1.src b/share/timedef/fr_CH.ISO8859-15.src similarity index 100% rename from share/timedef/fr_CH.ISO8859-1.src rename to share/timedef/fr_CH.ISO8859-15.src diff --git a/share/timedef/fr_FR.ISO8859-1.src b/share/timedef/fr_FR.ISO8859-15.src similarity index 100% rename from share/timedef/fr_FR.ISO8859-1.src rename to share/timedef/fr_FR.ISO8859-15.src diff --git a/share/timedef/is_IS.ISO8859-1.src b/share/timedef/is_IS.ISO8859-15.src similarity index 100% rename from share/timedef/is_IS.ISO8859-1.src rename to share/timedef/is_IS.ISO8859-15.src diff --git a/share/timedef/it_CH.ISO8859-1.src b/share/timedef/it_CH.ISO8859-15.src similarity index 100% rename from share/timedef/it_CH.ISO8859-1.src rename to share/timedef/it_CH.ISO8859-15.src diff --git a/share/timedef/it_IT.ISO8859-1.src b/share/timedef/it_IT.ISO8859-15.src similarity index 100% rename from share/timedef/it_IT.ISO8859-1.src rename to share/timedef/it_IT.ISO8859-15.src diff --git a/share/timedef/nb_NO.ISO8859-1.src b/share/timedef/nb_NO.ISO8859-15.src similarity index 100% rename from share/timedef/nb_NO.ISO8859-1.src rename to share/timedef/nb_NO.ISO8859-15.src diff --git a/share/timedef/nl_BE.ISO8859-1.src b/share/timedef/nl_BE.ISO8859-15.src similarity index 100% rename from share/timedef/nl_BE.ISO8859-1.src rename to share/timedef/nl_BE.ISO8859-15.src diff --git a/share/timedef/nl_NL.ISO8859-1.src b/share/timedef/nl_NL.ISO8859-15.src similarity index 100% rename from share/timedef/nl_NL.ISO8859-1.src rename to share/timedef/nl_NL.ISO8859-15.src diff --git a/share/timedef/nn_NO.ISO8859-1.src b/share/timedef/nn_NO.ISO8859-15.src similarity index 100% rename from share/timedef/nn_NO.ISO8859-1.src rename to share/timedef/nn_NO.ISO8859-15.src diff --git a/share/timedef/pt_PT.ISO8859-1.src b/share/timedef/pt_PT.ISO8859-15.src similarity index 100% rename from share/timedef/pt_PT.ISO8859-1.src rename to share/timedef/pt_PT.ISO8859-15.src diff --git a/share/timedef/sv_FI.ISO8859-1.src b/share/timedef/sv_FI.ISO8859-15.src similarity index 100% rename from share/timedef/sv_FI.ISO8859-1.src rename to share/timedef/sv_FI.ISO8859-15.src diff --git a/share/timedef/sv_SE.ISO8859-1.src b/share/timedef/sv_SE.ISO8859-15.src similarity index 100% rename from share/timedef/sv_SE.ISO8859-1.src rename to share/timedef/sv_SE.ISO8859-15.src diff --git a/tools/tools/locale/etc/charmaps.xml b/tools/tools/locale/etc/charmaps.xml index 6ce81156fd..5d40b9e0b5 100644 --- a/tools/tools/locale/etc/charmaps.xml +++ b/tools/tools/locale/etc/charmaps.xml @@ -40,22 +40,22 @@ countries="BG" /> + countries="HK SG" /> + + + countries="AR MX" />