From e9bb3e440e318898b1e7eea5d4471921c80d982f Mon Sep 17 00:00:00 2001 From: Peter Edberg Date: Tue, 23 Feb 2021 16:06:41 -0800 Subject: [PATCH] ICU-21480 integrate CLDR release-39-alpha3 to ICU trunk --- icu4c/source/data/locales/nn.txt | 4 +--- icu4c/source/data/unit/eu.txt | 4 ++-- icu4c/source/data/unit/fr.txt | 4 ++-- icu4c/source/data/unit/ro.txt | 4 ++-- icu4j/main/shared/data/icudata.jar | 4 ++-- icu4j/main/shared/data/icutzdata.jar | 2 +- 6 files changed, 10 insertions(+), 12 deletions(-) diff --git a/icu4c/source/data/locales/nn.txt b/icu4c/source/data/locales/nn.txt index 09e3098e4eb..ee014c49acf 100644 --- a/icu4c/source/data/locales/nn.txt +++ b/icu4c/source/data/locales/nn.txt @@ -3,9 +3,7 @@ // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nn{ %%Parent{"no"} - AuxExemplarCharacters{"[á ǎ ä č ç đ è ê ń ñ ŋ ö š ŧ ü ž]"} - ExemplarCharacters{"[a à å æ b c d e é f g h i j k l m n o ó ò ô ø p q r s t u v w x y z]"} - ExemplarCharactersIndex{"[A Å Æ B C D E F G H I J K L M N O Ø P Q R S T U V W X Y Z]"} + AuxExemplarCharacters{"[á ǎ č ç đ è ê ń ñ ŋ š ŧ ü ž ä ö]"} ExemplarCharactersPunctuation{ "[\\- ‐ ‑ – — , ; \\: ! ? . … ' ‘ ’ \u0022 “ ” ( ) \\[ \\] § @ * / \\& # † ‡ " "′ ″]" diff --git a/icu4c/source/data/unit/eu.txt b/icu4c/source/data/unit/eu.txt index 00aa028ad1b..1e1e363121c 100644 --- a/icu4c/source/data/unit/eu.txt +++ b/icu4c/source/data/unit/eu.txt @@ -1069,7 +1069,7 @@ eu{ 1024p7{"Zi{0}"} 1024p8{"Yi{0}"} per{"{0}/{1}"} - times{"{0}{1}"} + times{"{0}-{1}"} } concentr{ percent{ @@ -1372,7 +1372,7 @@ eu{ 1024p7{"Zi{0}"} 1024p8{"Yi{0}"} per{"{0}/{1}"} - times{"{0}{1}"} + times{"{0}-{1}"} } concentr{ karat{ diff --git a/icu4c/source/data/unit/fr.txt b/icu4c/source/data/unit/fr.txt index 497bcaec897..8ef8c420d61 100644 --- a/icu4c/source/data/unit/fr.txt +++ b/icu4c/source/data/unit/fr.txt @@ -1178,7 +1178,7 @@ fr{ } compound{ per{"{0}/{1}"} - times{"{0}{1}"} + times{"{0}-{1}"} } concentr{ percent{ @@ -1665,7 +1665,7 @@ fr{ } compound{ per{"{0}/{1}"} - times{"{0}{1}"} + times{"{0}-{1}"} } concentr{ karat{ diff --git a/icu4c/source/data/unit/ro.txt b/icu4c/source/data/unit/ro.txt index dce34aede8c..d82808dfc9d 100644 --- a/icu4c/source/data/unit/ro.txt +++ b/icu4c/source/data/unit/ro.txt @@ -1311,7 +1311,7 @@ ro{ 10p6{"M{0}"} 10p9{"G{0}"} per{"{0}/{1}"} - times{"{0}{1}"} + times{"{0} {1}"} } concentr{ percent{ @@ -1848,7 +1848,7 @@ ro{ 10p6{"M{0}"} 10p9{"G{0}"} per{"{0}/{1}"} - times{"{0}{1}"} + times{"{0} {1}"} } concentr{ karat{ diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar index ee4713a0a7d..c05281012ac 100644 --- a/icu4j/main/shared/data/icudata.jar +++ b/icu4j/main/shared/data/icudata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aebd0c04ef6afb8216af2311390705a5442122de92b9e6498e3edb0567ee865e -size 13303001 +oid sha256:9f438270baa10fbae595a2c84184276867437c2c414331ccdc0939e1af530cd3 +size 13302830 diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar index 5e9a8f70411..b81adfed869 100644 --- a/icu4j/main/shared/data/icutzdata.jar +++ b/icu4j/main/shared/data/icutzdata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c5b1243d882ac085227f99d8e25b75639e481694d4a027c57b42fbbd73957cd +oid sha256:7ca9c9bb368c6d12e8c5e0a973f8147bb3a5b69282b273b7f676174386face31 size 95094