From owner-dev-commits-src-main@freebsd.org Fri Jul 23 15:06:59 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9FF33673E3B; Fri, 23 Jul 2021 15:06:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GWXjH3qS6z545B; Fri, 23 Jul 2021 15:06:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6A8C126E63; Fri, 23 Jul 2021 15:06:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16NF6xGC044251; Fri, 23 Jul 2021 15:06:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16NF6v2h044248; Fri, 23 Jul 2021 15:06:57 GMT (envelope-from git) Date: Fri, 23 Jul 2021 15:06:57 GMT Message-Id: <202107231506.16NF6v2h044248@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 0a36787e4c1f - main - locales: separate unicode from other locales MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0a36787e4c1fa0cf77dcf83be0867178476e372b Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Jul 2021 15:06:59 -0000 The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=0a36787e4c1fa0cf77dcf83be0867178476e372b commit 0a36787e4c1fa0cf77dcf83be0867178476e372b Author: Baptiste Daroussin AuthorDate: 2021-07-22 17:02:49 +0000 Commit: Baptiste Daroussin CommitDate: 2021-07-23 14:58:20 +0000 locales: separate unicode from other locales Unicode locales are maintained and to evolved in cldr. Generating the other locales from the unicode gets more and more painful over the time. Let's freeze the other locales to cldr 34.0. --- share/Makefile | 8 +- share/colldef/Makefile | 271 +- .../{af_ZA.UTF-8.src => af_ZA.ISO8859-1.src} | 0 .../{be_BY.UTF-8.src => be_BY.ISO8859-5.src} | 0 share/colldef/ca_IT.ISO8859-15.src | 2433 ++ .../{el_GR.UTF-8.src => el_GR.ISO8859-7.src} | 0 .../{es_MX.UTF-8.src => es_MX.ISO8859-1.src} | 0 .../{et_EE.UTF-8.src => et_EE.ISO8859-15.src} | 0 .../{fi_FI.UTF-8.src => fi_FI.ISO8859-15.src} | 0 .../{fr_CA.UTF-8.src => fr_CA.ISO8859-15.src} | 0 .../{hi_IN.UTF-8.src => hi_IN.ISCII-DEV.src} | 0 .../{hy_AM.UTF-8.src => hy_AM.ARMSCII-8.src} | 0 .../{is_IS.UTF-8.src => is_IS.ISO8859-15.src} | 0 share/colldef/{ja_JP.UTF-8.src => ja_JP.SJIS.src} | 0 share/colldef/{ko_KR.UTF-8.src => ko_KR.eucKR.src} | 0 .../{lt_LT.UTF-8.src => lt_LT.ISO8859-13.src} | 0 .../{lv_LV.UTF-8.src => lv_LV.ISO8859-13.src} | 0 .../{pl_PL.UTF-8.src => pl_PL.ISO8859-2.src} | 0 .../{en_US.UTF-8.src => pt_PT.ISO8859-15.src} | 0 .../{ro_RO.UTF-8.src => ro_RO.ISO8859-2.src} | 0 .../colldef/{ru_RU.UTF-8.src => ru_RU.KOI8-R.src} | 0 .../{sl_SI.UTF-8.src => sl_SI.ISO8859-2.src} | 0 .../{sv_SE.UTF-8.src => sv_SE.ISO8859-15.src} | 0 .../{tr_TR.UTF-8.src => tr_TR.ISO8859-9.src} | 0 .../colldef/{uk_UA.UTF-8.src => uk_UA.KOI8-U.src} | 0 share/colldef_unicode/Makefile | 122 + share/colldef_unicode/af_ZA.UTF-8.src | 2430 ++ share/{colldef => colldef_unicode}/am_ET.UTF-8.src | 0 share/{colldef => colldef_unicode}/ar_SA.UTF-8.src | 0 share/colldef_unicode/be_BY.UTF-8.src | 1068 + share/colldef_unicode/ca_AD.UTF-8.src | 2433 ++ share/{colldef => colldef_unicode}/cs_CZ.UTF-8.src | 0 share/{colldef => colldef_unicode}/da_DK.UTF-8.src | 0 share/colldef_unicode/el_GR.UTF-8.src | 831 + share/colldef_unicode/en_US.UTF-8.src | 2430 ++ share/colldef_unicode/es_MX.UTF-8.src | 2434 ++ share/colldef_unicode/et_EE.UTF-8.src | 2446 ++ share/colldef_unicode/fi_FI.UTF-8.src | 2448 ++ share/colldef_unicode/fr_CA.UTF-8.src | 2430 ++ share/{colldef => colldef_unicode}/he_IL.UTF-8.src | 0 share/colldef_unicode/hi_IN.UTF-8.src | 699 + share/{colldef => colldef_unicode}/hu_HU.UTF-8.src | 0 share/colldef_unicode/hy_AM.UTF-8.src | 522 + share/colldef_unicode/is_IS.UTF-8.src | 2454 ++ share/colldef_unicode/ja_JP.UTF-8.src | 22135 +++++++++++++++++++ share/{colldef => colldef_unicode}/kk_KZ.UTF-8.src | 0 share/colldef_unicode/ko_KR.UTF-8.src | 20853 +++++++++++++++++ share/colldef_unicode/lt_LT.UTF-8.src | 2442 ++ share/colldef_unicode/lv_LV.UTF-8.src | 2450 ++ share/{colldef => colldef_unicode}/nn_NO.UTF-8.src | 0 share/colldef_unicode/pl_PL.UTF-8.src | 2450 ++ share/colldef_unicode/ro_RO.UTF-8.src | 2440 ++ share/colldef_unicode/ru_RU.UTF-8.src | 1062 + share/{colldef => colldef_unicode}/se_NO.UTF-8.src | 0 share/{colldef => colldef_unicode}/sk_SK.UTF-8.src | 0 share/colldef_unicode/sl_SI.UTF-8.src | 2442 ++ share/{colldef => colldef_unicode}/sr_RS.UTF-8.src | 0 .../sr_RS.UTF-8@latin.src | 0 share/colldef_unicode/sv_SE.UTF-8.src | 2446 ++ share/colldef_unicode/tr_TR.UTF-8.src | 2442 ++ share/colldef_unicode/uk_UA.UTF-8.src | 1075 + share/{colldef => colldef_unicode}/zh_CN.UTF-8.src | 0 share/{colldef => colldef_unicode}/zh_TW.UTF-8.src | 0 share/ctypedef/Makefile | 4 - share/monetdef/Makefile | 129 +- .../{da_DK.UTF-8.src => da_DK.ISO8859-15.src} | 0 .../{en_AU.UTF-8.src => en_AU.US-ASCII.src} | 0 .../{en_CA.UTF-8.src => en_CA.US-ASCII.src} | 0 .../{zh_HK.UTF-8.src => en_HK.ISO8859-1.src} | 0 .../{en_NZ.UTF-8.src => en_NZ.US-ASCII.src} | 0 .../{en_SG.UTF-8.src => en_SG.ISO8859-1.src} | 0 .../{en_US.UTF-8.src => en_US.US-ASCII.src} | 0 .../{es_AR.UTF-8.src => es_AR.ISO8859-1.src} | 0 .../{es_MX.UTF-8.src => es_MX.ISO8859-1.src} | 0 .../{hr_HR.UTF-8.src => hr_HR.ISO8859-2.src} | 0 .../{is_IS.UTF-8.src => is_IS.ISO8859-15.src} | 0 .../{pt_BR.UTF-8.src => pt_BR.ISO8859-1.src} | 0 .../{ro_RO.UTF-8.src => ro_RO.ISO8859-2.src} | 0 .../{sr_RS.UTF-8@latin.src => sr_RS.ISO8859-2.src} | 0 share/monetdef_unicode/Makefile | 104 + share/monetdef_unicode/Makefile.depend | 11 + .../{monetdef => monetdef_unicode}/am_ET.UTF-8.src | 0 .../{monetdef => monetdef_unicode}/ar_AE.UTF-8.src | 0 .../{monetdef => monetdef_unicode}/ar_EG.UTF-8.src | 0 .../{monetdef => monetdef_unicode}/ar_JO.UTF-8.src | 0 .../{monetdef => monetdef_unicode}/ar_MA.UTF-8.src | 0 .../{monetdef => monetdef_unicode}/ar_QA.UTF-8.src | 0 .../{monetdef => monetdef_unicode}/ar_SA.UTF-8.src | 0 .../{monetdef => monetdef_unicode}/be_BY.UTF-8.src | 0 .../{monetdef => monetdef_unicode}/bg_BG.UTF-8.src | 0 .../{monetdef => monetdef_unicode}/cs_CZ.UTF-8.src | 0 share/monetdef_unicode/da_DK.UTF-8.src | 50 + share/monetdef_unicode/en_AU.UTF-8.src | 50 + share/monetdef_unicode/en_CA.UTF-8.src | 50 + .../{monetdef => monetdef_unicode}/en_GB.UTF-8.src | 0 share/monetdef_unicode/en_NZ.UTF-8.src | 50 + .../{monetdef => monetdef_unicode}/en_PH.UTF-8.src | 0 share/monetdef_unicode/en_SG.UTF-8.src | 50 + share/monetdef_unicode/en_US.UTF-8.src | 50 + .../{monetdef => monetdef_unicode}/en_ZA.UTF-8.src | 0 share/monetdef_unicode/es_AR.UTF-8.src | 50 + .../{monetdef => monetdef_unicode}/es_CR.UTF-8.src | 0 share/monetdef_unicode/es_MX.UTF-8.src | 50 + .../{monetdef => monetdef_unicode}/fr_CA.UTF-8.src | 0 .../{monetdef => monetdef_unicode}/fr_CH.UTF-8.src | 0 .../{monetdef => monetdef_unicode}/fr_FR.UTF-8.src | 0 .../{monetdef => monetdef_unicode}/ga_IE.UTF-8.src | 0 .../{monetdef => monetdef_unicode}/he_IL.UTF-8.src | 0 .../{monetdef => monetdef_unicode}/hi_IN.UTF-8.src | 0 share/monetdef_unicode/hr_HR.UTF-8.src | 50 + .../{monetdef => monetdef_unicode}/hu_HU.UTF-8.src | 0 .../{monetdef => monetdef_unicode}/hy_AM.UTF-8.src | 0 share/monetdef_unicode/is_IS.UTF-8.src | 50 + .../{monetdef => monetdef_unicode}/it_CH.UTF-8.src | 0 .../{monetdef => monetdef_unicode}/it_IT.UTF-8.src | 0 .../{monetdef => monetdef_unicode}/ja_JP.UTF-8.src | 0 .../{monetdef => monetdef_unicode}/kk_KZ.UTF-8.src | 0 .../{monetdef => monetdef_unicode}/ko_KR.UTF-8.src | 0 .../{monetdef => monetdef_unicode}/mn_MN.UTF-8.src | 0 .../{monetdef => monetdef_unicode}/nb_NO.UTF-8.src | 0 .../{monetdef => monetdef_unicode}/nl_BE.UTF-8.src | 0 .../{monetdef => monetdef_unicode}/nl_NL.UTF-8.src | 0 .../{monetdef => monetdef_unicode}/pl_PL.UTF-8.src | 0 share/monetdef_unicode/pt_BR.UTF-8.src | 50 + share/monetdef_unicode/ro_RO.UTF-8.src | 50 + .../{monetdef => monetdef_unicode}/ru_RU.UTF-8.src | 0 .../{monetdef => monetdef_unicode}/se_NO.UTF-8.src | 0 .../{monetdef => monetdef_unicode}/sk_SK.UTF-8.src | 0 .../{monetdef => monetdef_unicode}/sl_SI.UTF-8.src | 0 share/monetdef_unicode/sr_RS.UTF-8@latin.src | 50 + .../{monetdef => monetdef_unicode}/sv_FI.UTF-8.src | 0 .../{monetdef => monetdef_unicode}/sv_SE.UTF-8.src | 0 .../{monetdef => monetdef_unicode}/tr_TR.UTF-8.src | 0 .../{monetdef => monetdef_unicode}/uk_UA.UTF-8.src | 0 .../{monetdef => monetdef_unicode}/zh_CN.UTF-8.src | 0 share/monetdef_unicode/zh_HK.UTF-8.src | 50 + .../{monetdef => monetdef_unicode}/zh_TW.UTF-8.src | 0 share/msgdef/Makefile | 205 +- .../{cs_CZ.UTF-8.src => cs_CZ.ISO8859-2.src} | 0 .../{de_DE.UTF-8.src => de_DE.ISO8859-15.src} | 0 .../msgdef/{en_US.UTF-8.src => en_US.US-ASCII.src} | 0 .../{et_EE.UTF-8.src => et_EE.ISO8859-15.src} | 0 .../{eu_ES.UTF-8.src => eu_ES.ISO8859-15.src} | 0 .../{fr_FR.UTF-8.src => fr_FR.ISO8859-15.src} | 0 .../{hu_HU.UTF-8.src => hu_HU.ISO8859-2.src} | 0 .../{lt_LT.UTF-8.src => lt_LT.ISO8859-13.src} | 0 .../{nb_NO.UTF-8.src => nb_NO.ISO8859-15.src} | 0 .../{nl_NL.UTF-8.src => nl_NL.ISO8859-15.src} | 0 .../{pl_PL.UTF-8.src => pl_PL.ISO8859-2.src} | 0 .../{ro_RO.UTF-8.src => ro_RO.ISO8859-2.src} | 0 .../{sv_SE.UTF-8.src => sv_SE.ISO8859-15.src} | 0 share/msgdef_unicode/Makefile | 104 + share/msgdef_unicode/Makefile.depend | 11 + share/{msgdef => msgdef_unicode}/am_ET.UTF-8.src | 0 share/{msgdef => msgdef_unicode}/ar_SA.UTF-8.src | 0 share/{msgdef => msgdef_unicode}/be_BY.UTF-8.src | 0 share/msgdef_unicode/cs_CZ.UTF-8.src | 17 + share/msgdef_unicode/de_DE.UTF-8.src | 17 + share/{msgdef => msgdef_unicode}/el_GR.UTF-8.src | 0 share/msgdef_unicode/en_US.UTF-8.src | 17 + share/{msgdef => msgdef_unicode}/es_MX.UTF-8.src | 0 share/msgdef_unicode/et_EE.UTF-8.src | 17 + share/msgdef_unicode/eu_ES.UTF-8.src | 17 + share/{msgdef => msgdef_unicode}/fi_FI.UTF-8.src | 0 share/msgdef_unicode/fr_FR.UTF-8.src | 17 + share/{msgdef => msgdef_unicode}/ga_IE.UTF-8.src | 0 share/{msgdef => msgdef_unicode}/he_IL.UTF-8.src | 0 share/{msgdef => msgdef_unicode}/hi_IN.UTF-8.src | 0 share/msgdef_unicode/hu_HU.UTF-8.src | 17 + share/{msgdef => msgdef_unicode}/hy_AM.UTF-8.src | 0 share/{msgdef => msgdef_unicode}/is_IS.UTF-8.src | 0 share/{msgdef => msgdef_unicode}/it_IT.UTF-8.src | 0 share/{msgdef => msgdef_unicode}/ja_JP.UTF-8.src | 0 share/{msgdef => msgdef_unicode}/kk_KZ.UTF-8.src | 0 share/{msgdef => msgdef_unicode}/ko_KR.UTF-8.src | 0 share/msgdef_unicode/lt_LT.UTF-8.src | 17 + share/{msgdef => msgdef_unicode}/lv_LV.UTF-8.src | 0 share/{msgdef => msgdef_unicode}/mn_MN.UTF-8.src | 0 share/msgdef_unicode/nb_NO.UTF-8.src | 17 + share/msgdef_unicode/nl_NL.UTF-8.src | 17 + share/{msgdef => msgdef_unicode}/nn_NO.UTF-8.src | 0 share/msgdef_unicode/pl_PL.UTF-8.src | 17 + share/{msgdef => msgdef_unicode}/pt_PT.UTF-8.src | 0 share/msgdef_unicode/ro_RO.UTF-8.src | 17 + share/{msgdef => msgdef_unicode}/ru_RU.UTF-8.src | 0 share/{msgdef => msgdef_unicode}/se_NO.UTF-8.src | 0 share/{msgdef => msgdef_unicode}/sk_SK.UTF-8.src | 0 share/{msgdef => msgdef_unicode}/sr_RS.UTF-8.src | 0 .../sr_RS.UTF-8@latin.src | 0 share/msgdef_unicode/sv_SE.UTF-8.src | 17 + share/{msgdef => msgdef_unicode}/tr_TR.UTF-8.src | 0 share/{msgdef => msgdef_unicode}/uk_UA.UTF-8.src | 0 share/{msgdef => msgdef_unicode}/zh_CN.UTF-8.src | 0 share/{msgdef => msgdef_unicode}/zh_HK.UTF-8.src | 0 share/{msgdef => msgdef_unicode}/zh_TW.UTF-8.src | 0 share/numericdef/Makefile | 201 +- .../{en_US.UTF-8.src => en_US.US-ASCII.src} | 0 .../{hi_IN.UTF-8.src => hi_IN.ISCII-DEV.src} | 0 .../{tr_TR.UTF-8.src => tr_TR.ISO8859-9.src} | 0 share/numericdef/zh_CN.GBK.src | 14 + share/numericdef_unicode/Makefile | 106 + share/numericdef_unicode/Makefile.depend | 11 + .../ar_SA.UTF-8.src | 0 share/numericdef_unicode/en_US.UTF-8.src | 14 + .../fr_FR.UTF-8.src | 0 share/numericdef_unicode/hi_IN.UTF-8.src | 14 + .../it_CH.UTF-8.src | 0 share/numericdef_unicode/tr_TR.UTF-8.src | 14 + .../uk_UA.UTF-8.src | 0 209 files changed, 88982 insertions(+), 577 deletions(-) diff --git a/share/Makefile b/share/Makefile index c4e12b05f7db..dfa5ff1a65a2 100644 --- a/share/Makefile +++ b/share/Makefile @@ -53,11 +53,11 @@ _i18n= i18n .endif .if ${MK_LOCALES} != "no" -_colldef= colldef +_colldef= colldef colldef_unicode +_monetdef= monetdef monetdef_unicode _ctypedef= ctypedef -_monetdef= monetdef -_msgdef= msgdef -_numericdef= numericdef +_msgdef= msgdef msgdef_unicode +_numericdef= numericdef numericdef_unicode _timedef= timedef .endif diff --git a/share/colldef/Makefile b/share/colldef/Makefile index e7c93d300c91..89454f84a5e4 100644 --- a/share/colldef/Makefile +++ b/share/colldef/Makefile @@ -1,6 +1,4 @@ # $FreeBSD$ -# Warning: Do not edit. This file is automatically generated from the -# tools in /usr/src/tools/tools/locale. LOCALEDIR= ${SHAREDIR}/locale FILESNAME= LC_COLLATE @@ -16,141 +14,101 @@ CLDR_VERSION= "34.0" -V ${CLDR_VERSION} \ -f ${MAPLOC}/map.${.TARGET:T:R:E:C/@.*//} ${.OBJDIR}/${.IMPSRC:T:R} -LOCALES+= af_ZA.UTF-8 -LOCALES+= am_ET.UTF-8 -LOCALES+= ar_SA.UTF-8 -LOCALES+= be_BY.UTF-8 -LOCALES+= ca_AD.UTF-8 -LOCALES+= cs_CZ.UTF-8 -LOCALES+= da_DK.UTF-8 -LOCALES+= el_GR.UTF-8 -LOCALES+= en_US.UTF-8 -LOCALES+= es_MX.UTF-8 -LOCALES+= et_EE.UTF-8 -LOCALES+= fi_FI.UTF-8 -LOCALES+= fr_CA.UTF-8 -LOCALES+= he_IL.UTF-8 -LOCALES+= hi_IN.UTF-8 -LOCALES+= hu_HU.UTF-8 -LOCALES+= hy_AM.UTF-8 -LOCALES+= is_IS.UTF-8 -LOCALES+= ja_JP.UTF-8 -LOCALES+= kk_KZ.UTF-8 -LOCALES+= ko_KR.UTF-8 -LOCALES+= lt_LT.UTF-8 -LOCALES+= lv_LV.UTF-8 -LOCALES+= nn_NO.UTF-8 -LOCALES+= pl_PL.UTF-8 -LOCALES+= ro_RO.UTF-8 -LOCALES+= ru_RU.UTF-8 -LOCALES+= se_NO.UTF-8 -LOCALES+= sk_SK.UTF-8 -LOCALES+= sl_SI.UTF-8 -LOCALES+= sr_RS.UTF-8 -LOCALES+= sr_RS.UTF-8@latin -LOCALES+= sv_SE.UTF-8 -LOCALES+= tr_TR.UTF-8 -LOCALES+= uk_UA.UTF-8 -LOCALES+= zh_CN.UTF-8 -LOCALES+= zh_TW.UTF-8 - -LOCALES_MAPPED+= af_ZA.UTF-8 af_ZA.ISO8859-15 -LOCALES_MAPPED+= af_ZA.UTF-8 af_ZA.ISO8859-1 -LOCALES_MAPPED+= be_BY.UTF-8 be_BY.ISO8859-5 -LOCALES_MAPPED+= be_BY.UTF-8 be_BY.CP1251 -LOCALES_MAPPED+= be_BY.UTF-8 be_BY.CP1131 -LOCALES_MAPPED+= ru_RU.UTF-8 ru_RU.KOI8-R -LOCALES_MAPPED+= ru_RU.UTF-8 ru_RU.ISO8859-5 -LOCALES_MAPPED+= ru_RU.UTF-8 ru_RU.CP866 -LOCALES_MAPPED+= ru_RU.UTF-8 ru_RU.CP1251 -LOCALES_MAPPED+= ru_RU.UTF-8 bg_BG.CP1251 -LOCALES_MAPPED+= ca_AD.UTF-8 ca_IT.ISO8859-15 -LOCALES_MAPPED+= ca_AD.UTF-8 ca_IT.ISO8859-1 -LOCALES_MAPPED+= ca_AD.UTF-8 ca_FR.ISO8859-15 -LOCALES_MAPPED+= ca_AD.UTF-8 ca_FR.ISO8859-1 -LOCALES_MAPPED+= ca_AD.UTF-8 ca_ES.ISO8859-15 -LOCALES_MAPPED+= ca_AD.UTF-8 ca_ES.ISO8859-1 -LOCALES_MAPPED+= ca_AD.UTF-8 ca_AD.ISO8859-15 -LOCALES_MAPPED+= ca_AD.UTF-8 ca_AD.ISO8859-1 -LOCALES_MAPPED+= en_US.UTF-8 pt_PT.ISO8859-15 -LOCALES_MAPPED+= en_US.UTF-8 pt_PT.ISO8859-1 -LOCALES_MAPPED+= en_US.UTF-8 pt_BR.ISO8859-1 -LOCALES_MAPPED+= en_US.UTF-8 nl_NL.ISO8859-15 -LOCALES_MAPPED+= en_US.UTF-8 nl_NL.ISO8859-1 -LOCALES_MAPPED+= en_US.UTF-8 nl_BE.ISO8859-15 -LOCALES_MAPPED+= en_US.UTF-8 nl_BE.ISO8859-1 -LOCALES_MAPPED+= en_US.UTF-8 it_IT.ISO8859-15 -LOCALES_MAPPED+= en_US.UTF-8 it_IT.ISO8859-1 -LOCALES_MAPPED+= en_US.UTF-8 it_CH.ISO8859-15 -LOCALES_MAPPED+= en_US.UTF-8 it_CH.ISO8859-1 -LOCALES_MAPPED+= en_US.UTF-8 fr_FR.ISO8859-15 -LOCALES_MAPPED+= en_US.UTF-8 fr_FR.ISO8859-1 -LOCALES_MAPPED+= en_US.UTF-8 fr_CH.ISO8859-15 -LOCALES_MAPPED+= en_US.UTF-8 fr_CH.ISO8859-1 -LOCALES_MAPPED+= en_US.UTF-8 fr_BE.ISO8859-15 -LOCALES_MAPPED+= en_US.UTF-8 fr_BE.ISO8859-1 -LOCALES_MAPPED+= en_US.UTF-8 eu_ES.ISO8859-15 -LOCALES_MAPPED+= en_US.UTF-8 eu_ES.ISO8859-1 -LOCALES_MAPPED+= en_US.UTF-8 en_ZA.US-ASCII -LOCALES_MAPPED+= en_US.UTF-8 en_ZA.ISO8859-15 -LOCALES_MAPPED+= en_US.UTF-8 en_ZA.ISO8859-1 -LOCALES_MAPPED+= en_US.UTF-8 en_US.US-ASCII -LOCALES_MAPPED+= en_US.UTF-8 en_US.ISO8859-15 -LOCALES_MAPPED+= en_US.UTF-8 en_US.ISO8859-1 -LOCALES_MAPPED+= en_US.UTF-8 en_SG.ISO8859-1 -LOCALES_MAPPED+= en_US.UTF-8 en_NZ.US-ASCII -LOCALES_MAPPED+= en_US.UTF-8 en_NZ.ISO8859-15 -LOCALES_MAPPED+= en_US.UTF-8 en_NZ.ISO8859-1 -LOCALES_MAPPED+= en_US.UTF-8 en_IE.ISO8859-15 -LOCALES_MAPPED+= en_US.UTF-8 en_IE.ISO8859-1 -LOCALES_MAPPED+= en_US.UTF-8 en_HK.ISO8859-1 -LOCALES_MAPPED+= en_US.UTF-8 en_GB.US-ASCII -LOCALES_MAPPED+= en_US.UTF-8 en_GB.ISO8859-15 -LOCALES_MAPPED+= en_US.UTF-8 en_GB.ISO8859-1 -LOCALES_MAPPED+= en_US.UTF-8 en_CA.US-ASCII -LOCALES_MAPPED+= en_US.UTF-8 en_CA.ISO8859-15 -LOCALES_MAPPED+= en_US.UTF-8 en_CA.ISO8859-1 -LOCALES_MAPPED+= en_US.UTF-8 en_AU.US-ASCII -LOCALES_MAPPED+= en_US.UTF-8 en_AU.ISO8859-15 -LOCALES_MAPPED+= en_US.UTF-8 en_AU.ISO8859-1 -LOCALES_MAPPED+= en_US.UTF-8 de_DE.ISO8859-15 -LOCALES_MAPPED+= en_US.UTF-8 de_DE.ISO8859-1 -LOCALES_MAPPED+= en_US.UTF-8 de_CH.ISO8859-15 -LOCALES_MAPPED+= en_US.UTF-8 de_CH.ISO8859-1 -LOCALES_MAPPED+= en_US.UTF-8 de_AT.ISO8859-15 -LOCALES_MAPPED+= en_US.UTF-8 de_AT.ISO8859-1 -LOCALES_MAPPED+= el_GR.UTF-8 el_GR.ISO8859-7 -LOCALES_MAPPED+= es_MX.UTF-8 es_MX.ISO8859-1 -LOCALES_MAPPED+= es_MX.UTF-8 es_ES.ISO8859-15 -LOCALES_MAPPED+= es_MX.UTF-8 es_ES.ISO8859-1 -LOCALES_MAPPED+= es_MX.UTF-8 es_AR.ISO8859-1 -LOCALES_MAPPED+= et_EE.UTF-8 et_EE.ISO8859-15 -LOCALES_MAPPED+= et_EE.UTF-8 et_EE.ISO8859-1 -LOCALES_MAPPED+= fi_FI.UTF-8 fi_FI.ISO8859-15 -LOCALES_MAPPED+= fi_FI.UTF-8 fi_FI.ISO8859-1 -LOCALES_MAPPED+= fr_CA.UTF-8 fr_CA.ISO8859-15 -LOCALES_MAPPED+= fr_CA.UTF-8 fr_CA.ISO8859-1 -LOCALES_MAPPED+= hi_IN.UTF-8 hi_IN.ISCII-DEV -LOCALES_MAPPED+= sr_RS.UTF-8@latin hr_HR.UTF-8 -LOCALES_MAPPED+= hy_AM.UTF-8 hy_AM.ARMSCII-8 -LOCALES_MAPPED+= is_IS.UTF-8 is_IS.ISO8859-15 -LOCALES_MAPPED+= is_IS.UTF-8 is_IS.ISO8859-1 -LOCALES_MAPPED+= ja_JP.UTF-8 ja_JP.SJIS -LOCALES_MAPPED+= ko_KR.UTF-8 ko_KR.eucKR -LOCALES_MAPPED+= lt_LT.UTF-8 lt_LT.ISO8859-13 -LOCALES_MAPPED+= lv_LV.UTF-8 lv_LV.ISO8859-13 -LOCALES_MAPPED+= pl_PL.UTF-8 pl_PL.ISO8859-2 -LOCALES_MAPPED+= ro_RO.UTF-8 ro_RO.ISO8859-2 -LOCALES_MAPPED+= sl_SI.UTF-8 sl_SI.ISO8859-2 -LOCALES_MAPPED+= sv_SE.UTF-8 sv_SE.ISO8859-15 -LOCALES_MAPPED+= sv_SE.UTF-8 sv_SE.ISO8859-1 -LOCALES_MAPPED+= sv_SE.UTF-8 sv_FI.ISO8859-15 -LOCALES_MAPPED+= sv_SE.UTF-8 sv_FI.ISO8859-1 -LOCALES_MAPPED+= tr_TR.UTF-8 tr_TR.ISO8859-9 -LOCALES_MAPPED+= uk_UA.UTF-8 uk_UA.KOI8-U -LOCALES_MAPPED+= uk_UA.UTF-8 uk_UA.ISO8859-5 -LOCALES_MAPPED+= uk_UA.UTF-8 uk_UA.CP1251 +LOCALES_MAPPED+= af_ZA.ISO8859-1 af_ZA.ISO8859-15 +LOCALES_MAPPED+= be_BY.ISO8859-5 be_BY.CP1251 +LOCALES_MAPPED+= be_BY.ISO8859-5 be_BY.CP1131 +LOCALES_MAPPED+= ru_RU.KOI8-R ru_RU.ISO8859-5 +LOCALES_MAPPED+= ru_RU.KOI8-R RU.CP866 +LOCALES_MAPPED+= ru_RU.KOI8-R ru_RU.CP1251 +LOCALES_MAPPED+= ru_RU.KOI8-R bg_BG.CP1251 +LOCALES_MAPPED+= ca_IT.ISO8859-15 ca_IT.ISO8859-1 +LOCALES_MAPPED+= ca_IT.ISO8859-15 ca_FR.ISO8859-15 +LOCALES_MAPPED+= ca_IT.ISO8859-15 ca_FR.ISO8859-1 +LOCALES_MAPPED+= ca_IT.ISO8859-15 ca_ES.ISO8859-15 +LOCALES_MAPPED+= ca_IT.ISO8859-15 ca_ES.ISO8859-1 +LOCALES_MAPPED+= ca_IT.ISO8859-15 ca_AD.ISO8859-15 +LOCALES_MAPPED+= ca_IT.ISO8859-15 ca_AD.ISO8859-1 +LOCALES_MAPPED+= pt_PT.ISO8859-15 pt_PT.ISO8859-1 +LOCALES_MAPPED+= pt_PT.ISO8859-15 pt_BR.ISO8859-1 +LOCALES_MAPPED+= pt_PT.ISO8859-15 nl_NL.ISO8859-15 +LOCALES_MAPPED+= pt_PT.ISO8859-15 nl_NL.ISO8859-1 +LOCALES_MAPPED+= pt_PT.ISO8859-15 nl_BE.ISO8859-15 +LOCALES_MAPPED+= pt_PT.ISO8859-15 nl_BE.ISO8859-1 +LOCALES_MAPPED+= pt_PT.ISO8859-15 it_IT.ISO8859-15 +LOCALES_MAPPED+= pt_PT.ISO8859-15 it_IT.ISO8859-1 +LOCALES_MAPPED+= pt_PT.ISO8859-15 it_CH.ISO8859-15 +LOCALES_MAPPED+= pt_PT.ISO8859-15 it_CH.ISO8859-1 +LOCALES_MAPPED+= pt_PT.ISO8859-15 fr_FR.ISO8859-15 +LOCALES_MAPPED+= pt_PT.ISO8859-15 fr_FR.ISO8859-1 +LOCALES_MAPPED+= pt_PT.ISO8859-15 fr_CH.ISO8859-15 +LOCALES_MAPPED+= pt_PT.ISO8859-15 fr_CH.ISO8859-1 +LOCALES_MAPPED+= pt_PT.ISO8859-15 fr_BE.ISO8859-15 +LOCALES_MAPPED+= pt_PT.ISO8859-15 fr_BE.ISO8859-1 +LOCALES_MAPPED+= pt_PT.ISO8859-15 eu_ES.ISO8859-15 +LOCALES_MAPPED+= pt_PT.ISO8859-15 eu_ES.ISO8859-1 +LOCALES_MAPPED+= pt_PT.ISO8859-15 en_ZA.US-ASCII +LOCALES_MAPPED+= pt_PT.ISO8859-15 en_ZA.ISO8859-15 +LOCALES_MAPPED+= pt_PT.ISO8859-15 en_ZA.ISO8859-1 +LOCALES_MAPPED+= pt_PT.ISO8859-15 en_US.US-ASCII +LOCALES_MAPPED+= pt_PT.ISO8859-15 en_US.ISO8859-15 +LOCALES_MAPPED+= pt_PT.ISO8859-15 en_US.ISO8859-1 +LOCALES_MAPPED+= pt_PT.ISO8859-15 en_SG.ISO8859-1 +LOCALES_MAPPED+= pt_PT.ISO8859-15 en_NZ.US-ASCII +LOCALES_MAPPED+= pt_PT.ISO8859-15 en_NZ.ISO8859-15 +LOCALES_MAPPED+= pt_PT.ISO8859-15 en_NZ.ISO8859-1 +LOCALES_MAPPED+= pt_PT.ISO8859-15 en_IE.ISO8859-15 +LOCALES_MAPPED+= pt_PT.ISO8859-15 en_IE.ISO8859-1 +LOCALES_MAPPED+= pt_PT.ISO8859-15 en_HK.ISO8859-1 +LOCALES_MAPPED+= pt_PT.ISO8859-15 en_GB.US-ASCII +LOCALES_MAPPED+= pt_PT.ISO8859-15 en_GB.ISO8859-15 +LOCALES_MAPPED+= pt_PT.ISO8859-15 en_GB.ISO8859-1 +LOCALES_MAPPED+= pt_PT.ISO8859-15 en_CA.US-ASCII +LOCALES_MAPPED+= pt_PT.ISO8859-15 en_CA.ISO8859-15 +LOCALES_MAPPED+= pt_PT.ISO8859-15 en_CA.ISO8859-1 +LOCALES_MAPPED+= pt_PT.ISO8859-15 en_AU.US-ASCII +LOCALES_MAPPED+= pt_PT.ISO8859-15 en_AU.ISO8859-15 +LOCALES_MAPPED+= pt_PT.ISO8859-15 en_AU.ISO8859-1 +LOCALES_MAPPED+= pt_PT.ISO8859-15 de_DE.ISO8859-15 +LOCALES_MAPPED+= pt_PT.ISO8859-15 de_DE.ISO8859-1 +LOCALES_MAPPED+= pt_PT.ISO8859-15 de_CH.ISO8859-15 +LOCALES_MAPPED+= pt_PT.ISO8859-15 de_CH.ISO8859-1 +LOCALES_MAPPED+= pt_PT.ISO8859-15 de_AT.ISO8859-15 +LOCALES_MAPPED+= pt_PT.ISO8859-15 de_AT.ISO8859-1 +LOCALES_MAPPED+= es_MX.ISO8859-1 es_ES.ISO8859-15 +LOCALES_MAPPED+= es_MX.ISO8859-1 es_ES.ISO8859-1 +LOCALES_MAPPED+= es_MX.ISO8859-1 es_AR.ISO8859-1 +LOCALES_MAPPED+= et_EE.ISO8859-15 et_EE.ISO8859-1 +LOCALES_MAPPED+= fi_FI.ISO8859-15 fi_FI.ISO8859-1 +LOCALES_MAPPED+= fr_CA.ISO8859-15 fr_CA.ISO8859-1 +LOCALES_MAPPED+= is_IS.ISO8859-15 is_IS.ISO8859-1 +LOCALES_MAPPED+= sv_SE.ISO8859-15 sv_SE.ISO8859-1 +LOCALES_MAPPED+= sv_SE.ISO8859-15 sv_FI.ISO8859-15 +LOCALES_MAPPED+= sv_SE.ISO8859-15 sv_FI.ISO8859-1 +LOCALES_MAPPED+= uk_UA.KOI8-U uk_UA.ISO8859-5 +LOCALES_MAPPED+= uk_UA.KOI8-U uk_UA.CP1251 +LOCALES+= ko_KR.eucKR +LOCALES+= lt_LT.ISO8859-13 +LOCALES+= lv_LV.ISO8859-13 +LOCALES+= pl_PL.ISO8859-2 +LOCALES+= ro_RO.ISO8859-2 +LOCALES+= sl_SI.ISO8859-2 +LOCALES+= sv_SE.ISO8859-15 +LOCALES+= tr_TR.ISO8859-9 +LOCALES+= uk_UA.KOI8-U +LOCALES+= ja_JP.SJIS +LOCALES+= is_IS.ISO8859-15 +LOCALES+= hy_AM.ARMSCII-8 +LOCALES+= hi_IN.ISCII-DEV +LOCALES+= fr_CA.ISO8859-15 +LOCALES+= fi_FI.ISO8859-15 +LOCALES+= et_EE.ISO8859-15 +LOCALES+= es_MX.ISO8859-1 +LOCALES+= af_ZA.ISO8859-1 +LOCALSE+= be_BY.ISO8859-5 +LOCALES+= pt_PT.ISO8859-15 +LOCALES+= el_GR.ISO8859-7 +LOCALES+= ru_RU.KOI8-R LOCALES+= cs_CZ.ISO8859-2 LOCALES+= da_DK.ISO8859-1 LOCALES+= da_DK.ISO8859-15 @@ -170,47 +128,6 @@ LOCALES+= ja_JP.eucJP LOCALES+= nn_NO.ISO8859-15 LOCALES+= nn_NO.ISO8859-1 - -SAME+= ar_SA.UTF-8 ar_QA.UTF-8 -SAME+= ar_SA.UTF-8 ar_MA.UTF-8 -SAME+= ar_SA.UTF-8 ar_JO.UTF-8 -SAME+= ar_SA.UTF-8 ar_EG.UTF-8 -SAME+= ar_SA.UTF-8 ar_AE.UTF-8 -SAME+= ru_RU.UTF-8 mn_MN.UTF-8 -SAME+= ru_RU.UTF-8 bg_BG.UTF-8 -SAME+= ca_AD.UTF-8 ca_IT.UTF-8 -SAME+= ca_AD.UTF-8 ca_FR.UTF-8 -SAME+= ca_AD.UTF-8 ca_ES.UTF-8 -SAME+= en_US.UTF-8 pt_PT.UTF-8 -SAME+= en_US.UTF-8 pt_BR.UTF-8 -SAME+= en_US.UTF-8 nl_NL.UTF-8 -SAME+= en_US.UTF-8 nl_BE.UTF-8 -SAME+= en_US.UTF-8 it_IT.UTF-8 -SAME+= en_US.UTF-8 it_CH.UTF-8 -SAME+= en_US.UTF-8 ga_IE.UTF-8 -SAME+= en_US.UTF-8 fr_FR.UTF-8 -SAME+= en_US.UTF-8 fr_CH.UTF-8 -SAME+= en_US.UTF-8 fr_BE.UTF-8 -SAME+= en_US.UTF-8 eu_ES.UTF-8 -SAME+= en_US.UTF-8 en_ZA.UTF-8 -SAME+= en_US.UTF-8 en_SG.UTF-8 -SAME+= en_US.UTF-8 en_PH.UTF-8 -SAME+= en_US.UTF-8 en_NZ.UTF-8 -SAME+= en_US.UTF-8 en_IE.UTF-8 -SAME+= en_US.UTF-8 en_HK.UTF-8 -SAME+= en_US.UTF-8 en_GB.UTF-8 -SAME+= en_US.UTF-8 en_CA.UTF-8 -SAME+= en_US.UTF-8 en_AU.UTF-8 -SAME+= en_US.UTF-8 de_DE.UTF-8 -SAME+= en_US.UTF-8 de_CH.UTF-8 -SAME+= en_US.UTF-8 de_AT.UTF-8 -SAME+= es_MX.UTF-8 es_ES.UTF-8 -SAME+= es_MX.UTF-8 es_CR.UTF-8 -SAME+= es_MX.UTF-8 es_AR.UTF-8 -SAME+= nn_NO.UTF-8 nb_NO.UTF-8 -SAME+= se_NO.UTF-8 se_FI.UTF-8 -SAME+= sv_SE.UTF-8 sv_FI.UTF-8 -SAME+= zh_TW.UTF-8 zh_HK.UTF-8 SAME+= ko_KR.eucKR ko_KR.CP949 # legacy (same charset) FILES= ${LOCALES:S/$/.LC_COLLATE/} diff --git a/share/colldef/af_ZA.UTF-8.src b/share/colldef/af_ZA.ISO8859-1.src similarity index 100% rename from share/colldef/af_ZA.UTF-8.src rename to share/colldef/af_ZA.ISO8859-1.src diff --git a/share/colldef/be_BY.UTF-8.src b/share/colldef/be_BY.ISO8859-5.src similarity index 100% rename from share/colldef/be_BY.UTF-8.src rename to share/colldef/be_BY.ISO8859-5.src diff --git a/share/colldef/ca_IT.ISO8859-15.src b/share/colldef/ca_IT.ISO8859-15.src new file mode 100644 index 000000000000..1b5dbf8869c5 --- /dev/null +++ b/share/colldef/ca_IT.ISO8859-15.src @@ -0,0 +1,2433 @@ +# Warning: Do not edit. This file is automatically extracted from the +# tools in /usr/src/tools/tools/locale. The data is obtained from the +# CLDR project, obtained from http://cldr.unicode.org/ +# ----------------------------------------------------------------------------- +comment_char * +escape_char / +LC_COLLATE +************* + + + +* Define collation weights as symbols + +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol *** 89966 LINES SKIPPED ***