From 4f1e1a09ce4daed860e35d359ce2fceccb0764e8 Mon Sep 17 00:00:00 2001 From: Apple Date: Tue, 18 Jun 2019 01:08:18 +0000 Subject: [PATCH] ICU-62123.0.1.tar.gz --- icuSources/data/curr/ar.txt | 12 ++++ icuSources/data/curr/ca.txt | 8 +++ icuSources/data/curr/cs.txt | 10 +++ icuSources/data/curr/da.txt | 10 ++- icuSources/data/curr/de.txt | 8 +++ icuSources/data/curr/el.txt | 8 +++ icuSources/data/curr/en.txt | 8 +++ icuSources/data/curr/es.txt | 8 +++ icuSources/data/curr/es_MX.txt | 16 +++++ icuSources/data/curr/fi.txt | 16 +++-- icuSources/data/curr/fr.txt | 8 +++ icuSources/data/curr/he.txt | 10 +++ icuSources/data/curr/hi.txt | 8 +++ icuSources/data/curr/hr.txt | 9 +++ icuSources/data/curr/hu.txt | 8 +++ icuSources/data/curr/id.txt | 7 +++ icuSources/data/curr/it.txt | 8 +++ icuSources/data/curr/ja.txt | 7 +++ icuSources/data/curr/ko.txt | 7 +++ icuSources/data/curr/ms.txt | 7 +++ icuSources/data/curr/nb.txt | 8 +++ icuSources/data/curr/nl.txt | 8 +++ icuSources/data/curr/pl.txt | 10 +++ icuSources/data/curr/pt.txt | 8 +++ icuSources/data/curr/pt_PT.txt | 8 +++ icuSources/data/curr/ro.txt | 9 +++ icuSources/data/curr/ru.txt | 10 +++ icuSources/data/curr/sk.txt | 10 +++ icuSources/data/curr/sv.txt | 8 +++ icuSources/data/curr/th.txt | 7 +++ icuSources/data/curr/tr.txt | 8 +++ icuSources/data/curr/uk.txt | 10 +++ icuSources/data/curr/vi.txt | 7 +++ icuSources/data/curr/yue.txt | 7 +++ icuSources/data/curr/yue_Hans.txt | 7 +++ icuSources/data/curr/zh.txt | 7 +++ icuSources/data/curr/zh_Hant.txt | 7 +++ icuSources/data/curr/zh_Hant_HK.txt | 4 ++ icuSources/data/locales/es_MX.txt | 3 + icuSources/data/misc/currencyNumericCodes.txt | 1 + icuSources/data/misc/supplementalData.txt | 7 ++- icuSources/data/region/ar.txt | 8 +-- icuSources/data/region/ar_SA.txt | 4 -- icuSources/data/region/ca.txt | 8 +-- icuSources/data/region/cs.txt | 8 +-- icuSources/data/region/da.txt | 8 +-- icuSources/data/region/de.txt | 8 +-- icuSources/data/region/el.txt | 8 +-- icuSources/data/region/en.txt | 8 +-- icuSources/data/region/es.txt | 8 +-- icuSources/data/region/es_419.txt | 1 + icuSources/data/region/fi.txt | 8 +-- icuSources/data/region/fr.txt | 8 +-- icuSources/data/region/he.txt | 8 +-- icuSources/data/region/hi.txt | 8 +-- icuSources/data/region/hr.txt | 8 +-- icuSources/data/region/hu.txt | 8 +-- icuSources/data/region/id.txt | 8 +-- icuSources/data/region/it.txt | 8 +-- icuSources/data/region/ja.txt | 8 +-- icuSources/data/region/ko.txt | 8 +-- icuSources/data/region/ms.txt | 8 +-- icuSources/data/region/nb.txt | 8 +-- icuSources/data/region/nl.txt | 8 +-- icuSources/data/region/nn.txt | 8 +-- icuSources/data/region/pl.txt | 8 +-- icuSources/data/region/pt.txt | 8 +-- icuSources/data/region/ro.txt | 8 +-- icuSources/data/region/ru.txt | 8 +-- icuSources/data/region/sk.txt | 8 +-- icuSources/data/region/sv.txt | 8 +-- icuSources/data/region/th.txt | 8 +-- icuSources/data/region/tr.txt | 8 +-- icuSources/data/region/uk.txt | 8 +-- icuSources/data/region/vi.txt | 8 +-- icuSources/data/region/yue.txt | 6 +- icuSources/data/region/yue_Hans.txt | 8 +-- icuSources/data/region/zh.txt | 8 +-- icuSources/data/region/zh_Hant.txt | 8 +-- icuSources/i18n/measunit.cpp | 45 +++++++------- icuSources/test/cintltst/cbiapts.c | 17 +++-- icuSources/test/cintltst/cdattst.c | 8 +++ icuSources/test/cintltst/cloctst.c | 31 ++++++---- icuSources/test/intltest/loctest.cpp | 16 ++--- makefile | 62 ++++++++++--------- 85 files changed, 544 insertions(+), 263 deletions(-) diff --git a/icuSources/data/curr/ar.txt b/icuSources/data/curr/ar.txt index 96555057..104adf1f 100644 --- a/icuSources/data/curr/ar.txt +++ b/icuSources/data/curr/ar.txt @@ -900,6 +900,10 @@ ar{ } VEF{ "VEF", + "بوليفار فنزويلي - 2008–2018", + } + VES{ + "VES", "بوليفار فنزويلي", } VND{ @@ -2329,6 +2333,14 @@ ar{ zero{"سوم أوزبكستاني"} } VEF{ + few{"بوليفار فنزويلي - 2008–2018"} + many{"بوليفار فنزويلي - 2008–2018"} + one{"بوليفار فنزويلي - 2008–2018"} + other{"بوليفار فنزويلي - 2008–2018"} + two{"بوليفار فنزويلي - 2008–2018"} + zero{"بوليفار فنزويلي - 2008–2018"} + } + VES{ few{"بوليفار فنزويلي"} many{"بوليفار فنزويلي"} one{"بوليفار فنزويلي"} diff --git a/icuSources/data/curr/ca.txt b/icuSources/data/curr/ca.txt index 2ec70e49..a506f9b3 100644 --- a/icuSources/data/curr/ca.txt +++ b/icuSources/data/curr/ca.txt @@ -1041,6 +1041,10 @@ ca{ } VEF{ "VEF", + "bolívar veneçolà (2008–2018)", + } + VES{ + "VES", "bolívar veneçolà", } VND{ @@ -2334,6 +2338,10 @@ ca{ other{"bolívars veneçolans (1871–2008)"} } VEF{ + one{"bolívar veneçolà (2008–2018)"} + other{"bolívars veneçolans (2008–2018)"} + } + VES{ one{"bolívar veneçolà"} other{"bolívars veneçolans"} } diff --git a/icuSources/data/curr/cs.txt b/icuSources/data/curr/cs.txt index c3cb35c3..ce21f7bc 100644 --- a/icuSources/data/curr/cs.txt +++ b/icuSources/data/curr/cs.txt @@ -1044,6 +1044,10 @@ cs{ } VEF{ "VEF", + "venezuelský bolívar (2008–2018)", + } + VES{ + "VES", "venezuelský bolívar", } VND{ @@ -2873,6 +2877,12 @@ cs{ other{"venezuelských bolívarů (1871–2008)"} } VEF{ + few{"venezuelské bolívary (2008–2018)"} + many{"venezuelského bolívaru (2008–2018)"} + one{"venezuelský bolívar (2008–2018)"} + other{"venezuelských bolívarů (2008–2018)"} + } + VES{ few{"venezuelské bolívary"} many{"venezuelského bolívaru"} one{"venezuelský bolívar"} diff --git a/icuSources/data/curr/da.txt b/icuSources/data/curr/da.txt index 1ce34767..1dee0527 100644 --- a/icuSources/data/curr/da.txt +++ b/icuSources/data/curr/da.txt @@ -948,6 +948,10 @@ da{ } VEF{ "VEF", + "venezuelansk bolivar (2008–2018)", + } + VES{ + "VES", "venezuelansk bolivar", } VND{ @@ -2133,8 +2137,12 @@ da{ other{"Venezuelanske bolivar (1871–2008)"} } VEF{ + one{"venezuelansk bolivar (2008–2018)"} + other{"venezuelanske bolivarer (2008–2018)"} + } + VES{ one{"venezuelansk bolivar"} - other{"venezuelanske bolivar"} + other{"venezuelanske bolivarer"} } VND{ one{"vietnamesisk dong"} diff --git a/icuSources/data/curr/de.txt b/icuSources/data/curr/de.txt index 012d29ca..0e569783 100644 --- a/icuSources/data/curr/de.txt +++ b/icuSources/data/curr/de.txt @@ -1044,6 +1044,10 @@ de{ } VEF{ "VEF", + "Venezolanischer Bolívar (2008–2018)", + } + VES{ + "VES", "Venezolanischer Bolívar", } VND{ @@ -2351,6 +2355,10 @@ de{ other{"Venezolanische Bolívares (1871–2008)"} } VEF{ + one{"Venezolanischer Bolívar (2008–2018)"} + other{"Venezolanische Bolívares (2008–2018)"} + } + VES{ one{"Venezolanischer Bolívar"} other{"Venezolanische Bolívares"} } diff --git a/icuSources/data/curr/el.txt b/icuSources/data/curr/el.txt index 69b197ed..a7d66594 100644 --- a/icuSources/data/curr/el.txt +++ b/icuSources/data/curr/el.txt @@ -965,6 +965,10 @@ el{ } VEF{ "VEF", + "Μπολιβάρ Βενεζουέλας (2008–2018)", + } + VES{ + "VES", "Μπολιβάρ Βενεζουέλας", } VND{ @@ -2134,6 +2138,10 @@ el{ other{"μπολιβάρ Βενεζουέλας (1871–2008)"} } VEF{ + one{"μπολιβάρ Βενεζουέλας (2008–2018)"} + other{"μπολιβάρ Βενεζουέλας (2008–2018)"} + } + VES{ one{"μπολιβάρ Βενεζουέλας"} other{"μπολιβάρ Βενεζουέλας"} } diff --git a/icuSources/data/curr/en.txt b/icuSources/data/curr/en.txt index 8049c200..13727fa4 100644 --- a/icuSources/data/curr/en.txt +++ b/icuSources/data/curr/en.txt @@ -1044,6 +1044,10 @@ en{ } VEF{ "VEF", + "Venezuelan Bolívar (2008–2018)", + } + VES{ + "VES", "Venezuelan Bolívar", } VND{ @@ -2249,6 +2253,10 @@ en{ other{"Venezuelan bolívars (1871–2008)"} } VEF{ + one{"Venezuelan bolívar (2008–2018)"} + other{"Venezuelan bolívars (2008–2018)"} + } + VES{ one{"Venezuelan bolívar"} other{"Venezuelan bolívars"} } diff --git a/icuSources/data/curr/es.txt b/icuSources/data/curr/es.txt index 8809d982..5e68700e 100644 --- a/icuSources/data/curr/es.txt +++ b/icuSources/data/curr/es.txt @@ -972,6 +972,10 @@ es{ } VEF{ "VEF", + "bolívar venezolano (2008–2018)", + } + VES{ + "VES", "bolívar venezolano", } VND{ @@ -2109,6 +2113,10 @@ es{ other{"bolívares venezolanos (1871–2008)"} } VEF{ + one{"bolívar venezolano (2008–2018)"} + other{"bolívares venezolanos (2008–2018)"} + } + VES{ one{"bolívar venezolano"} other{"bolívares venezolanos"} } diff --git a/icuSources/data/curr/es_MX.txt b/icuSources/data/curr/es_MX.txt index f7812b14..9cd2eb96 100644 --- a/icuSources/data/curr/es_MX.txt +++ b/icuSources/data/curr/es_MX.txt @@ -31,6 +31,14 @@ es_MX{ "UZS", "sum", } + VEF{ + "VEF", + "bolívar venezolano (2008–2018)", + } + VES{ + "VES", + "bolívar venezolano", + } ZMW{ "ZMW", "kwacha zambiano", @@ -71,6 +79,14 @@ es_MX{ one{"sum"} other{"sums"} } + VEF{ + one{"bolívar venezolano (2008–2018)"} + other{"bolívares venezolanos (2008–2018)"} + } + VES{ + one{"bolívar venezolano"} + other{"bolivares venezolanos"} + } XXX{ one{"(moneda desconocida)"} } diff --git a/icuSources/data/curr/fi.txt b/icuSources/data/curr/fi.txt index fdf8b8ed..87891f41 100644 --- a/icuSources/data/curr/fi.txt +++ b/icuSources/data/curr/fi.txt @@ -1040,11 +1040,15 @@ fi{ } VEB{ "VEB", - "Venezuelan bolivar (1871–2008)", + "Venezuelan bolívar (1871–2008)", } VEF{ "VEF", - "Venezuelan bolivar", + "Venezuelan bolívar (2008–2018)", + } + VES{ + "VES", + "Venezuelan suvereeni bolívar", } VND{ "VND", @@ -2352,8 +2356,12 @@ fi{ other{"Venezuelan bolivaria (1871–2008)"} } VEF{ - one{"Venezuelan bolivar"} - other{"Venezuelan bolivaria"} + one{"Venezuelan bolívar (2008–2018)"} + other{"Venezuelan bolívaria (2008–2018)"} + } + VES{ + one{"Venezuelan suvereeni bolívar"} + other{"Venezuelan suvereenia bolívaria"} } VND{ one{"Vietnamin dong"} diff --git a/icuSources/data/curr/fr.txt b/icuSources/data/curr/fr.txt index 00f985ad..7df6acda 100644 --- a/icuSources/data/curr/fr.txt +++ b/icuSources/data/curr/fr.txt @@ -976,6 +976,10 @@ fr{ } VEF{ "VEF", + "bolivar vénézuélien (2008–2018)", + } + VES{ + "VES", "bolivar vénézuélien", } VND{ @@ -2197,6 +2201,10 @@ fr{ other{"bolivar vénézuélien (1871–2008)"} } VEF{ + one{"bolivar vénézuélien (2008–2018)"} + other{"bolivars vénézuéliens (2008–2018)"} + } + VES{ one{"bolivar vénézuélien"} other{"bolivars vénézuéliens"} } diff --git a/icuSources/data/curr/he.txt b/icuSources/data/curr/he.txt index fd37871e..8595a625 100644 --- a/icuSources/data/curr/he.txt +++ b/icuSources/data/curr/he.txt @@ -812,6 +812,10 @@ he{ } VEF{ "VEF", + "בוליבר ונצואלי (2008–2018)", + } + VES{ + "VES", "בוליבר ונצואלי", } VND{ @@ -1910,6 +1914,12 @@ he{ two{"סום אוזבקי"} } VEF{ + many{"בוליבר ונצואלי (2008–2018)"} + one{"בוליבר ונצואלי (2008–2018)"} + other{"בוליבר ונצואלי (2008–2018)"} + two{"בוליבר ונצואלי (2008–2018)"} + } + VES{ many{"בוליבר ונצואלי"} one{"בוליבר ונצואלי"} other{"בוליבר ונצואלי"} diff --git a/icuSources/data/curr/hi.txt b/icuSources/data/curr/hi.txt index be48ef98..3b846cef 100644 --- a/icuSources/data/curr/hi.txt +++ b/icuSources/data/curr/hi.txt @@ -688,6 +688,10 @@ hi{ } VEF{ "VEF", + "वेनेज़ुएला बोलिवर (2008–2018)", + } + VES{ + "VES", "वेनेज़ुएला बोलिवर", } VND{ @@ -1437,6 +1441,10 @@ hi{ other{"उज़्बेकिस्तान सोम"} } VEF{ + one{"वेनेज़ुएला बोलिवर (2008–2018)"} + other{"वेनेज़ुएला बोलिवर (2008–2018)"} + } + VES{ one{"वेनेज़ुएला बोलिवर"} other{"वेनेज़ुएला बोलिवर"} } diff --git a/icuSources/data/curr/hr.txt b/icuSources/data/curr/hr.txt index 90870816..aeb05907 100644 --- a/icuSources/data/curr/hr.txt +++ b/icuSources/data/curr/hr.txt @@ -1044,6 +1044,10 @@ hr{ } VEF{ "VEF", + "venezuelanski bolivar (2008. – 2018.)", + } + VES{ + "VES", "venezuelanski bolivar", } VND{ @@ -2601,6 +2605,11 @@ hr{ other{"venezuelanskih bolivara (1871.–2008.)"} } VEF{ + few{"venezuelanska bolivara (2008. – 2018.)"} + one{"venezuelanski bolivar (2008. – 2018.)"} + other{"venezuelanskih bolivara (2008. – 2018.)"} + } + VES{ few{"venezuelanska bolivara"} one{"venezuelanski bolivar"} other{"venezuelanskih bolivara"} diff --git a/icuSources/data/curr/hu.txt b/icuSources/data/curr/hu.txt index b5c303e1..58e1bf3b 100644 --- a/icuSources/data/curr/hu.txt +++ b/icuSources/data/curr/hu.txt @@ -972,6 +972,10 @@ hu{ } VEF{ "VEF", + "venezuelai bolivar (2008–2018)", + } + VES{ + "VES", "venezuelai bolivar", } VND{ @@ -1949,6 +1953,10 @@ hu{ other{"Venezuelai bolivar (1871–2008)"} } VEF{ + one{"venezuelai bolivar (2008–2018)"} + other{"venezuelai bolivar (2008–2018)"} + } + VES{ one{"venezuelai bolivar"} other{"venezuelai bolivar"} } diff --git a/icuSources/data/curr/id.txt b/icuSources/data/curr/id.txt index 813d4a73..f295dabc 100644 --- a/icuSources/data/curr/id.txt +++ b/icuSources/data/curr/id.txt @@ -1036,6 +1036,10 @@ id{ } VEF{ "VEF", + "Bolivar Venezuela (2008–2018)", + } + VES{ + "VES", "Bolivar Venezuela", } VND{ @@ -1862,6 +1866,9 @@ id{ other{"Bolivar Venezuela (1871–2008)"} } VEF{ + other{"Bolivar Venezuela (2008–2018)"} + } + VES{ other{"Bolivar Venezuela"} } VND{ diff --git a/icuSources/data/curr/it.txt b/icuSources/data/curr/it.txt index 7cffeab0..bcf25ffe 100644 --- a/icuSources/data/curr/it.txt +++ b/icuSources/data/curr/it.txt @@ -957,6 +957,10 @@ it{ } VEF{ "VEF", + "bolívar venezuelano (2008–2018)", + } + VES{ + "VES", "bolívar venezuelano", } VND{ @@ -1814,6 +1818,10 @@ it{ other{"bolivares venezuelani (1871–2008)"} } VEF{ + one{"bolívar venezuelano (2008–2018)"} + other{"bolívares venezuelani (2008–2018)"} + } + VES{ one{"bolívar venezuelano"} other{"bolívares venezuelani"} } diff --git a/icuSources/data/curr/ja.txt b/icuSources/data/curr/ja.txt index 1b4a6382..68a3a1f6 100644 --- a/icuSources/data/curr/ja.txt +++ b/icuSources/data/curr/ja.txt @@ -1044,6 +1044,10 @@ ja{ } VEF{ "VEF", + "ベネズエラ ボリバル (2008–2018)", + } + VES{ + "VES", "ベネズエラ ボリバル", } VND{ @@ -2090,6 +2094,9 @@ ja{ other{"ベネズエラ ボリバル (1871–2008)"} } VEF{ + other{"ベネズエラ ボリバル (2008–2018)"} + } + VES{ other{"ベネズエラ ボリバル"} } VND{ diff --git a/icuSources/data/curr/ko.txt b/icuSources/data/curr/ko.txt index deec9567..87c083c4 100644 --- a/icuSources/data/curr/ko.txt +++ b/icuSources/data/curr/ko.txt @@ -1016,6 +1016,10 @@ ko{ } VEF{ "VEF", + "베네수엘라 볼리바르 (2008–2018)", + } + VES{ + "VES", "베네수엘라 볼리바르", } VND{ @@ -1716,6 +1720,9 @@ ko{ other{"우즈베키스탄 숨"} } VEF{ + other{"베네수엘라 볼리바르 (2008–2018)"} + } + VES{ other{"베네수엘라 볼리바르"} } VND{ diff --git a/icuSources/data/curr/ms.txt b/icuSources/data/curr/ms.txt index b26b8260..f28661a8 100644 --- a/icuSources/data/curr/ms.txt +++ b/icuSources/data/curr/ms.txt @@ -604,6 +604,10 @@ ms{ } VEF{ "VEF", + "Bolivar Venezuela (2008–2018)", + } + VES{ + "VES", "Bolivar Venezuela", } VND{ @@ -1203,6 +1207,9 @@ ms{ other{"Som Uzbekistan"} } VEF{ + other{"Bolivar Venezuela (2008–2018)"} + } + VES{ other{"Bolivar Venezuela"} } VND{ diff --git a/icuSources/data/curr/nb.txt b/icuSources/data/curr/nb.txt index 020ff85a..9a113234 100644 --- a/icuSources/data/curr/nb.txt +++ b/icuSources/data/curr/nb.txt @@ -1044,6 +1044,10 @@ nb{ } VEF{ "VEF", + "venezuelanske bolivar (2008–2018)", + } + VES{ + "VES", "venezuelanske bolivar", } VND{ @@ -2343,6 +2347,10 @@ nb{ other{"venezuelanske bolivar (1871–2008)"} } VEF{ + one{"venezuelansk bolivar (2008–2018)"} + other{"venezuelanske bolivar (2008–2018)"} + } + VES{ one{"venezuelansk bolivar"} other{"venezuelanske bolivar"} } diff --git a/icuSources/data/curr/nl.txt b/icuSources/data/curr/nl.txt index 3632cc53..54bc350f 100644 --- a/icuSources/data/curr/nl.txt +++ b/icuSources/data/curr/nl.txt @@ -1044,6 +1044,10 @@ nl{ } VEF{ "VEF", + "Venezolaanse bolivar (2008–2018)", + } + VES{ + "VES", "Venezolaanse bolivar", } VND{ @@ -2351,6 +2355,10 @@ nl{ other{"Venezolaanse bolivar (1871–2008)"} } VEF{ + one{"Venezolaanse bolivar (2008–2018)"} + other{"Venezolaanse bolivar (2008–2018)"} + } + VES{ one{"Venezolaanse bolivar"} other{"Venezolaanse bolivar"} } diff --git a/icuSources/data/curr/pl.txt b/icuSources/data/curr/pl.txt index 9fa16f17..68e1ab3d 100644 --- a/icuSources/data/curr/pl.txt +++ b/icuSources/data/curr/pl.txt @@ -936,6 +936,10 @@ pl{ } VEF{ "VEF", + "boliwar wenezuelski (2008–2018)", + } + VES{ + "VES", "boliwar wenezuelski", } VND{ @@ -2237,6 +2241,12 @@ pl{ other{"boliwary wenezuelskiego (1871–2008)"} } VEF{ + few{"boliwary wenezuelskie (2008–2018)"} + many{"boliwarów wenezuelskich (2008–2018)"} + one{"boliwar wenezuelski (2008–2018)"} + other{"boliwara wenezuelskiego (2008–2018)"} + } + VES{ few{"boliwary wenezuelskie"} many{"boliwarów wenezuelskich"} one{"boliwar wenezuelski"} diff --git a/icuSources/data/curr/pt.txt b/icuSources/data/curr/pt.txt index 4a0b45dc..ab235570 100644 --- a/icuSources/data/curr/pt.txt +++ b/icuSources/data/curr/pt.txt @@ -1040,6 +1040,10 @@ pt{ } VEF{ "VEF", + "Bolívar venezuelano (2008–2018)", + } + VES{ + "VES", "Bolívar venezuelano", } VND{ @@ -2333,6 +2337,10 @@ pt{ other{"Bolívares venezuelanos (1871–2008)"} } VEF{ + one{"Bolívar venezuelano (2008–2018)"} + other{"Bolívares venezuelanos (2008–2018)"} + } + VES{ one{"Bolívar venezuelano"} other{"Bolívares venezuelanos"} } diff --git a/icuSources/data/curr/pt_PT.txt b/icuSources/data/curr/pt_PT.txt index 5e7ecc48..b45b7239 100644 --- a/icuSources/data/curr/pt_PT.txt +++ b/icuSources/data/curr/pt_PT.txt @@ -457,6 +457,10 @@ pt_PT{ } VEF{ "VEF", + "bolívar (2008–2018)", + } + VES{ + "VES", "bolívar", } VUV{ @@ -910,6 +914,10 @@ pt_PT{ other{"Sons do Uzbequistão"} } VEF{ + one{"bolívar (2008–2018)"} + other{"bolívares (2008–2018)"} + } + VES{ one{"bolívar"} other{"bolívares"} } diff --git a/icuSources/data/curr/ro.txt b/icuSources/data/curr/ro.txt index 09431c28..bb2e219d 100644 --- a/icuSources/data/curr/ro.txt +++ b/icuSources/data/curr/ro.txt @@ -864,6 +864,10 @@ ro{ } VEF{ "VEF", + "bolivar venezuelean (2008–2018)", + } + VES{ + "VES", "bolivar venezuelean", } VND{ @@ -2110,6 +2114,11 @@ ro{ other{"bolivari Venezuela (1871–2008)"} } VEF{ + few{"bolivari venezueleni (2008–2018)"} + one{"bolivar venezuelean (2008–2018)"} + other{"bolivari venezueleni (2008–2018)"} + } + VES{ few{"bolivari venezueleni"} one{"bolivar venezuelean"} other{"bolivari venezueleni"} diff --git a/icuSources/data/curr/ru.txt b/icuSources/data/curr/ru.txt index 7e706b1a..d8d7be48 100644 --- a/icuSources/data/curr/ru.txt +++ b/icuSources/data/curr/ru.txt @@ -972,6 +972,10 @@ ru{ } VEF{ "VEF", + "венесуэльский боливар (2008–2018)", + } + VES{ + "VES", "венесуэльский боливар", } VND{ @@ -2142,6 +2146,12 @@ ru{ other{"узбекского сума"} } VEF{ + few{"венесуэльских боливара (2008–2018)"} + many{"венесуэльских боливаров (2008–2018)"} + one{"венесуэльский боливар (2008–2018)"} + other{"венесуэльского боливара (2008–2018)"} + } + VES{ few{"венесуэльских боливара"} many{"венесуэльских боливаров"} one{"венесуэльский боливар"} diff --git a/icuSources/data/curr/sk.txt b/icuSources/data/curr/sk.txt index 87ee33fd..746e5b60 100644 --- a/icuSources/data/curr/sk.txt +++ b/icuSources/data/curr/sk.txt @@ -1044,6 +1044,10 @@ sk{ } VEF{ "VEF", + "venezuelský bolívar (2008–2018)", + } + VES{ + "VES", "venezuelský bolívar", } VND{ @@ -2874,6 +2878,12 @@ sk{ other{"venezuelských bolívarov (1871 – 2008)"} } VEF{ + few{"venezuelské bolívary (2008–2018)"} + many{"venezuelského bolívaru (2008–2018)"} + one{"venezuelský bolívar (2008–2018)"} + other{"venezuelských bolívarov (2008–2018)"} + } + VES{ few{"venezuelské bolívary"} many{"venezuelského bolívaru"} one{"venezuelský bolívar"} diff --git a/icuSources/data/curr/sv.txt b/icuSources/data/curr/sv.txt index e950cfd8..257ff803 100644 --- a/icuSources/data/curr/sv.txt +++ b/icuSources/data/curr/sv.txt @@ -1044,6 +1044,10 @@ sv{ } VEF{ "VEF", + "venezuelansk bolívar (2008–2018)", + } + VES{ + "VES", "venezuelansk bolívar", } VND{ @@ -2350,6 +2354,10 @@ sv{ other{"venezuelanska bolivar (1871–2008)"} } VEF{ + one{"venezuelansk bolívar (2008–2018)"} + other{"venezuelanska bolívar (2008–2018)"} + } + VES{ one{"venezuelansk bolívar"} other{"venezuelanska bolívar"} } diff --git a/icuSources/data/curr/th.txt b/icuSources/data/curr/th.txt index dbc2685a..de9af15e 100644 --- a/icuSources/data/curr/th.txt +++ b/icuSources/data/curr/th.txt @@ -1026,6 +1026,10 @@ th{ "VEF", "โบลิวาร์เวเนซุเอลา", } + VES{ + "VES", + "โบลีวาร์เวเนซุเอลา", + } VND{ "₫", "ดองเวียดนาม", @@ -1748,6 +1752,9 @@ th{ VEF{ other{"โบลิวาร์เวเนซุเอลา"} } + VES{ + other{"โบลีวาร์แห่งเวเนซุเอลา"} + } VND{ other{"ดองเวียดนาม"} } diff --git a/icuSources/data/curr/tr.txt b/icuSources/data/curr/tr.txt index 0345bc63..9acb96b2 100644 --- a/icuSources/data/curr/tr.txt +++ b/icuSources/data/curr/tr.txt @@ -1049,6 +1049,10 @@ tr{ } VEF{ "VEF", + "Venezuela Bolivarı (2008–2018)", + } + VES{ + "VES", "Venezuela Bolivarı", } VND{ @@ -2284,6 +2288,10 @@ tr{ other{"Venezuela Bolivarı (1871–2008)"} } VEF{ + one{"Venezuela bolivarı (2008–2018)"} + other{"Venezuela bolivarı (2008–2018)"} + } + VES{ one{"Venezuela bolivarı"} other{"Venezuela bolivarı"} } diff --git a/icuSources/data/curr/uk.txt b/icuSources/data/curr/uk.txt index 4637afba..84096679 100644 --- a/icuSources/data/curr/uk.txt +++ b/icuSources/data/curr/uk.txt @@ -972,6 +972,10 @@ uk{ } VEF{ "VEF", + "венесуельський болівар (2008–2018)", + } + VES{ + "VES", "венесуельський болівар", } VND{ @@ -2208,6 +2212,12 @@ uk{ other{"узбецького сума"} } VEF{ + few{"венесуельські болівари (2008–2018)"} + many{"венесуельських боліварів (2008–2018)"} + one{"венесуельський болівар (2008–2018)"} + other{"венесуельського болівара (2008–2018)"} + } + VES{ few{"венесуельські болівари"} many{"венесуельських боліварів"} one{"венесуельський болівар"} diff --git a/icuSources/data/curr/vi.txt b/icuSources/data/curr/vi.txt index ad6dd70f..1a6b7ae7 100644 --- a/icuSources/data/curr/vi.txt +++ b/icuSources/data/curr/vi.txt @@ -1024,6 +1024,10 @@ vi{ } VEF{ "VEF", + "Bolívar Venezuela (2008–2018)", + } + VES{ + "VES", "Bolívar Venezuela", } VND{ @@ -1731,6 +1735,9 @@ vi{ other{"Som Uzbekistan"} } VEF{ + other{"Bolívar Venezuela (2008–2018)"} + } + VES{ other{"Bolívar Venezuela"} } VND{ diff --git a/icuSources/data/curr/yue.txt b/icuSources/data/curr/yue.txt index 547427cf..0e815e42 100644 --- a/icuSources/data/curr/yue.txt +++ b/icuSources/data/curr/yue.txt @@ -1044,6 +1044,10 @@ yue{ } VEF{ "VEF", + "委內瑞拉玻利瓦 (VEF)", + } + VES{ + "VES", "委內瑞拉玻利瓦", } VND{ @@ -2088,6 +2092,9 @@ yue{ other{"委內瑞拉玻利瓦 (1871–2008)"} } VEF{ + other{"委內瑞拉玻利瓦 (VEF)"} + } + VES{ other{"委內瑞拉玻利瓦"} } VND{ diff --git a/icuSources/data/curr/yue_Hans.txt b/icuSources/data/curr/yue_Hans.txt index 41e30cde..3ce8a4c1 100644 --- a/icuSources/data/curr/yue_Hans.txt +++ b/icuSources/data/curr/yue_Hans.txt @@ -1045,6 +1045,10 @@ yue_Hans{ } VEF{ "VEF", + "委内瑞拉玻利瓦 (2008–2018)", + } + VES{ + "VES", "委内瑞拉玻利瓦", } VND{ @@ -2089,6 +2093,9 @@ yue_Hans{ other{"委内瑞拉玻利瓦 (1871–2008)"} } VEF{ + other{"委内瑞拉玻利瓦 (2008–2018)"} + } + VES{ other{"委内瑞拉玻利瓦"} } VND{ diff --git a/icuSources/data/curr/zh.txt b/icuSources/data/curr/zh.txt index f2575303..c0c178a0 100644 --- a/icuSources/data/curr/zh.txt +++ b/icuSources/data/curr/zh.txt @@ -1040,6 +1040,10 @@ zh{ } VEF{ "VEF", + "委内瑞拉玻利瓦尔 (2008–2018)", + } + VES{ + "VES", "委内瑞拉玻利瓦尔", } VND{ @@ -2061,6 +2065,9 @@ zh{ other{"委内瑞拉玻利瓦尔 (1871–2008)"} } VEF{ + other{"委内瑞拉玻利瓦尔 (2008–2018)"} + } + VES{ other{"委内瑞拉玻利瓦尔"} } VND{ diff --git a/icuSources/data/curr/zh_Hant.txt b/icuSources/data/curr/zh_Hant.txt index 8660f9cb..76d01968 100644 --- a/icuSources/data/curr/zh_Hant.txt +++ b/icuSources/data/curr/zh_Hant.txt @@ -1045,6 +1045,10 @@ zh_Hant{ } VEF{ "VEF", + "委內瑞拉玻利瓦 (2008–2018)", + } + VES{ + "VES", "委內瑞拉玻利瓦", } VND{ @@ -2086,6 +2090,9 @@ zh_Hant{ other{"委內瑞拉玻利瓦 (1871–2008)"} } VEF{ + other{"委內瑞拉玻利瓦 (2008–2018)"} + } + VES{ other{"委內瑞拉玻利瓦"} } VND{ diff --git a/icuSources/data/curr/zh_Hant_HK.txt b/icuSources/data/curr/zh_Hant_HK.txt index 9088a692..b1d99bf0 100644 --- a/icuSources/data/curr/zh_Hant_HK.txt +++ b/icuSources/data/curr/zh_Hant_HK.txt @@ -238,6 +238,10 @@ zh_Hant_HK{ "TZS", "坦桑尼亞先令", } + VES{ + "VES", + "VES", + } VUV{ "VUV", "瓦努阿圖瓦圖", diff --git a/icuSources/data/locales/es_MX.txt b/icuSources/data/locales/es_MX.txt index 8bdd7836..06f37500 100644 --- a/icuSources/data/locales/es_MX.txt +++ b/icuSources/data/locales/es_MX.txt @@ -5,6 +5,9 @@ es_MX{ MoreInformation{"[...]"} NumberElements{ latn{ + patterns{ + percentFormat{"#,##0%"} + } patternsLong{ decimalFormat{ 1000000000000{ diff --git a/icuSources/data/misc/currencyNumericCodes.txt b/icuSources/data/misc/currencyNumericCodes.txt index fd8d1e33..19d0bbf5 100644 --- a/icuSources/data/misc/currencyNumericCodes.txt +++ b/icuSources/data/misc/currencyNumericCodes.txt @@ -273,6 +273,7 @@ currencyNumericCodes:table(nofallback){ UZS:int{860} VEB:int{862} VEF:int{937} + VES:int{928} VNC:int{704} VND:int{704} VUV:int{548} diff --git a/icuSources/data/misc/supplementalData.txt b/icuSources/data/misc/supplementalData.txt index 5de3becb..5fc791b0 100644 --- a/icuSources/data/misc/supplementalData.txt +++ b/icuSources/data/misc/supplementalData.txt @@ -3990,6 +3990,10 @@ supplementalData:table(nofallback){ "VEF", "937", } + { + "VES", + "928", + } { "VND", "704", @@ -4195,6 +4199,7 @@ supplementalData:table(nofallback){ "UYI", "UYP", "VEB", + "VEF", "VNN", "XAG", "XAU", @@ -4366,7 +4371,7 @@ supplementalData:table(nofallback){ "USD", "UYU", "UZS", - "VEF", + "VES", "VND", "VUV", "WST", diff --git a/icuSources/data/region/ar.txt b/icuSources/data/region/ar.txt index 4cd23237..2c534cf3 100644 --- a/icuSources/data/region/ar.txt +++ b/icuSources/data/region/ar.txt @@ -81,7 +81,7 @@ ar{ CK{"جزر كوك"} CL{"تشيلي"} CM{"الكاميرون"} - CN{"الصين"} + CN{"بر الصين الرئيسي"} CO{"كولومبيا"} CP{"جزيرة كليبيرتون"} CR{"كوستاريكا"} @@ -133,7 +133,7 @@ ar{ GU{"غوام"} GW{"غينيا بيساو"} GY{"غيانا"} - HK{"هونغ كونغ (الصين)"} + HK{"هونج كونج"} HM{"جزيرة هيرد وجزر ماكدونالد"} HN{"هندوراس"} HR{"كرواتيا"} @@ -187,7 +187,7 @@ ar{ ML{"مالي"} MM{"ميانمار (بورما)"} MN{"منغوليا"} - MO{"مكاو (الصين)"} + MO{"ماكاو"} MP{"جزر ماريانا الشمالية"} MQ{"جزر المارتينيك"} MR{"موريتانيا"} @@ -297,8 +297,6 @@ ar{ } Countries%short{ GB{"المملكة المتحدة"} - HK{"هونغ كونغ"} - MO{"مكاو"} PS{"فلسطين"} UN{"الأمم المتحدة"} US{"الولايات المتحدة"} diff --git a/icuSources/data/region/ar_SA.txt b/icuSources/data/region/ar_SA.txt index a0865507..92f73b1f 100644 --- a/icuSources/data/region/ar_SA.txt +++ b/icuSources/data/region/ar_SA.txt @@ -5,14 +5,10 @@ ar_SA{ AC{"جزيرة أسينشين"} BS{"جزر البهاما"} EA{"سبتة ومليلية"} - MO{"ماكاو الصينية (منطقة إدارية خاصة)"} MS{"مونتيسيرات"} PM{"سان بيير وميكولون"} UY{"أوروغواي"} } - Countries%short{ - MO{"ماكاو"} - } Countries%variant{ CZ{"التشيك"} } diff --git a/icuSources/data/region/ca.txt b/icuSources/data/region/ca.txt index db3db26e..bc1faa9e 100644 --- a/icuSources/data/region/ca.txt +++ b/icuSources/data/region/ca.txt @@ -81,7 +81,7 @@ ca{ CK{"Illes Cook"} CL{"Xile"} CM{"Camerun"} - CN{"Xina"} + CN{"Xina continental"} CO{"Colòmbia"} CP{"Illa Clipperton"} CR{"Costa Rica"} @@ -133,7 +133,7 @@ ca{ GU{"Guam"} GW{"Guinea Bissau"} GY{"Guyana"} - HK{"Hong Kong (Xina)"} + HK{"Hong Kong"} HM{"Illa Heard i Illes McDonald"} HN{"Hondures"} HR{"Croàcia"} @@ -187,7 +187,7 @@ ca{ ML{"Mali"} MM{"Myanmar (Birmània)"} MN{"Mongòlia"} - MO{"Macau (Xina)"} + MO{"Macau"} MP{"Illes Mariannes del Nord"} MQ{"Martinica"} MR{"Mauritània"} @@ -297,8 +297,6 @@ ca{ } Countries%short{ GB{"RU"} - HK{"Hong Kong"} - MO{"Macau"} PS{"Palestina"} UN{"ONU"} US{"EUA"} diff --git a/icuSources/data/region/cs.txt b/icuSources/data/region/cs.txt index 777870bd..c8818275 100644 --- a/icuSources/data/region/cs.txt +++ b/icuSources/data/region/cs.txt @@ -81,7 +81,7 @@ cs{ CK{"Cookovy ostrovy"} CL{"Chile"} CM{"Kamerun"} - CN{"Čína"} + CN{"Čína – kontinentální"} CO{"Kolumbie"} CP{"Clippertonův ostrov"} CR{"Kostarika"} @@ -133,7 +133,7 @@ cs{ GU{"Guam"} GW{"Guinea-Bissau"} GY{"Guyana"} - HK{"Hongkong - Čína"} + HK{"Hongkong"} HM{"Heardův ostrov a McDonaldovy ostrovy"} HN{"Honduras"} HR{"Chorvatsko"} @@ -187,7 +187,7 @@ cs{ ML{"Mali"} MM{"Myanmar (Barma)"} MN{"Mongolsko"} - MO{"Macao – Čína"} + MO{"Macao"} MP{"Severní Mariany"} MQ{"Martinik"} MR{"Mauritánie"} @@ -297,8 +297,6 @@ cs{ } Countries%short{ GB{"GB"} - HK{"Hongkong"} - MO{"Macao"} PS{"Palestina"} UN{"OSN"} US{"USA"} diff --git a/icuSources/data/region/da.txt b/icuSources/data/region/da.txt index feeaaa84..6cc96009 100644 --- a/icuSources/data/region/da.txt +++ b/icuSources/data/region/da.txt @@ -81,7 +81,7 @@ da{ CK{"Cookøerne"} CL{"Chile"} CM{"Cameroun"} - CN{"Kina"} + CN{"Kina, fastlandet"} CO{"Colombia"} CP{"Clippertonøen"} CR{"Costa Rica"} @@ -133,7 +133,7 @@ da{ GU{"Guam"} GW{"Guinea-Bissau"} GY{"Guyana"} - HK{"Hongkong (Kina)"} + HK{"Hongkong"} HM{"Heard Island og McDonald Islands"} HN{"Honduras"} HR{"Kroatien"} @@ -187,7 +187,7 @@ da{ ML{"Mali"} MM{"Myanmar (Burma)"} MN{"Mongoliet"} - MO{"Macau (Kina)"} + MO{"Macao"} MP{"Nordmarianerne"} MQ{"Martinique"} MR{"Mauretanien"} @@ -297,8 +297,6 @@ da{ } Countries%short{ GB{"UK"} - HK{"Hongkong"} - MO{"Macao"} PS{"Palæstina"} UN{"FN"} US{"USA"} diff --git a/icuSources/data/region/de.txt b/icuSources/data/region/de.txt index 75681a8b..82b192e9 100644 --- a/icuSources/data/region/de.txt +++ b/icuSources/data/region/de.txt @@ -80,7 +80,7 @@ de{ CK{"Cookinseln"} CL{"Chile"} CM{"Kamerun"} - CN{"China"} + CN{"China, Festland"} CO{"Kolumbien"} CP{"Clipperton-Insel"} CR{"Costa Rica"} @@ -132,7 +132,7 @@ de{ GU{"Guam"} GW{"Guinea-Bissau"} GY{"Guyana"} - HK{"Hongkong (China)"} + HK{"Hongkong"} HM{"Heard und McDonaldinseln"} HN{"Honduras"} HR{"Kroatien"} @@ -186,7 +186,7 @@ de{ ML{"Mali"} MM{"Myanmar"} MN{"Mongolei"} - MO{"Macau (China)"} + MO{"Macao"} MP{"Nördliche Marianen"} MQ{"Martinique"} MR{"Mauretanien"} @@ -296,8 +296,6 @@ de{ } Countries%short{ GB{"GB"} - HK{"Hongkong"} - MO{"Macau"} PS{"Palästina"} UN{"UN"} US{"USA"} diff --git a/icuSources/data/region/el.txt b/icuSources/data/region/el.txt index bfb225bf..ec2fe2a4 100644 --- a/icuSources/data/region/el.txt +++ b/icuSources/data/region/el.txt @@ -81,7 +81,7 @@ el{ CK{"Νήσοι Κουκ"} CL{"Χιλή"} CM{"Καμερούν"} - CN{"Κίνα"} + CN{"Κίνα ηπειρωτική"} CO{"Κολομβία"} CP{"Νήσος Κλίπερτον"} CR{"Κόστα Ρίκα"} @@ -133,7 +133,7 @@ el{ GU{"Γκουάμ"} GW{"Γουινέα Μπισάου"} GY{"Γουιάνα"} - HK{"Χονγκ Κονγκ (Κίνα)"} + HK{"Χονγκ Κονγκ"} HM{"Νήσοι Χερντ και Μακντόναλντ"} HN{"Ονδούρα"} HR{"Κροατία"} @@ -187,7 +187,7 @@ el{ ML{"Μάλι"} MM{"Μιανμάρ (Βιρμανία)"} MN{"Μογγολία"} - MO{"Μακάο (Κίνα)"} + MO{"Μακάο"} MP{"Νήσοι Βόρειες Μαριάνες"} MQ{"Μαρτινίκα"} MR{"Μαυριτανία"} @@ -297,8 +297,6 @@ el{ } Countries%short{ GB{"ΗΒ"} - HK{"Χονγκ Κονγκ"} - MO{"Μακάο"} PS{"Παλαιστίνη"} UN{"ΟΗΕ"} US{"ΗΠΑ"} diff --git a/icuSources/data/region/en.txt b/icuSources/data/region/en.txt index bdb5b134..a02c5b00 100644 --- a/icuSources/data/region/en.txt +++ b/icuSources/data/region/en.txt @@ -81,7 +81,7 @@ en{ CK{"Cook Islands"} CL{"Chile"} CM{"Cameroon"} - CN{"China"} + CN{"China mainland"} CO{"Colombia"} CP{"Clipperton Island"} CR{"Costa Rica"} @@ -133,7 +133,7 @@ en{ GU{"Guam"} GW{"Guinea-Bissau"} GY{"Guyana"} - HK{"Hong Kong (China)"} + HK{"Hong Kong"} HM{"Heard & McDonald Islands"} HN{"Honduras"} HR{"Croatia"} @@ -187,7 +187,7 @@ en{ ML{"Mali"} MM{"Myanmar (Burma)"} MN{"Mongolia"} - MO{"Macau (China)"} + MO{"Macau"} MP{"Northern Mariana Islands"} MQ{"Martinique"} MR{"Mauritania"} @@ -298,9 +298,7 @@ en{ Countries%short{ BA{"Bosnia"} GB{"UK"} - HK{"Hong Kong"} MM{"Myanmar"} - MO{"Macau"} PS{"Palestine"} UN{"UN"} US{"US"} diff --git a/icuSources/data/region/es.txt b/icuSources/data/region/es.txt index e3c99390..35c53a53 100644 --- a/icuSources/data/region/es.txt +++ b/icuSources/data/region/es.txt @@ -81,7 +81,7 @@ es{ CK{"Islas Cook"} CL{"Chile"} CM{"Camerún"} - CN{"China"} + CN{"China continental"} CO{"Colombia"} CP{"Isla Clipperton"} CR{"Costa Rica"} @@ -133,7 +133,7 @@ es{ GU{"Guam"} GW{"Guinea-Bisáu"} GY{"Guyana"} - HK{"Hong Kong (China)"} + HK{"Hong Kong"} HM{"Islas Heard y McDonald"} HN{"Honduras"} HR{"Croacia"} @@ -187,7 +187,7 @@ es{ ML{"Mali"} MM{"Myanmar (Birmania)"} MN{"Mongolia"} - MO{"Macao (China)"} + MO{"Macao"} MP{"Islas Marianas del Norte"} MQ{"Martinica"} MR{"Mauritania"} @@ -297,8 +297,6 @@ es{ } Countries%short{ GB{"RU"} - HK{"Hong Kong"} - MO{"Macao"} PS{"Palestina"} US{"EE. UU."} } diff --git a/icuSources/data/region/es_419.txt b/icuSources/data/region/es_419.txt index 53bba86d..ce19aa27 100644 --- a/icuSources/data/region/es_419.txt +++ b/icuSources/data/region/es_419.txt @@ -20,6 +20,7 @@ es_419{ CI{"Costa de Marfil"} EZ{"Eurozona"} GG{"Guernesey"} + HK{"Hong-Kong"} IC{"Islas Canarias"} QO{"Islas Ultramarinas"} TA{"Tristán da Cunha"} diff --git a/icuSources/data/region/fi.txt b/icuSources/data/region/fi.txt index 82795d94..a006a401 100644 --- a/icuSources/data/region/fi.txt +++ b/icuSources/data/region/fi.txt @@ -81,7 +81,7 @@ fi{ CK{"Cookinsaaret"} CL{"Chile"} CM{"Kamerun"} - CN{"Kiina"} + CN{"Kiina, manner-"} CO{"Kolumbia"} CP{"Clippertoninsaari"} CR{"Costa Rica"} @@ -133,7 +133,7 @@ fi{ GU{"Guam"} GW{"Guinea-Bissau"} GY{"Guyana"} - HK{"Hongkong (Kiina)"} + HK{"Hongkong"} HM{"Heard ja McDonaldinsaaret"} HN{"Honduras"} HR{"Kroatia"} @@ -187,7 +187,7 @@ fi{ ML{"Mali"} MM{"Myanmar (Burma)"} MN{"Mongolia"} - MO{"Macao (Kiina)"} + MO{"Macao"} MP{"Pohjois-Mariaanit"} MQ{"Martinique"} MR{"Mauritania"} @@ -297,8 +297,6 @@ fi{ } Countries%short{ GB{"Britannia"} - HK{"Hongkong"} - MO{"Macao"} PS{"Palestiina"} UN{"YK"} US{"USA"} diff --git a/icuSources/data/region/fr.txt b/icuSources/data/region/fr.txt index 663a65dd..04d2d6be 100644 --- a/icuSources/data/region/fr.txt +++ b/icuSources/data/region/fr.txt @@ -81,7 +81,7 @@ fr{ CK{"Îles Cook"} CL{"Chili"} CM{"Cameroun"} - CN{"Chine"} + CN{"Chine continentale"} CO{"Colombie"} CP{"Île Clipperton"} CR{"Costa Rica"} @@ -133,7 +133,7 @@ fr{ GU{"Guam"} GW{"Guinée-Bissau"} GY{"Guyana"} - HK{"Hong Kong (Chine)"} + HK{"Hong Kong"} HM{"Îles Heard et McDonald"} HN{"Honduras"} HR{"Croatie"} @@ -187,7 +187,7 @@ fr{ ML{"Mali"} MM{"Myanmar (Birmanie)"} MN{"Mongolie"} - MO{"Macao (Chine)"} + MO{"Macao"} MP{"Îles Mariannes du Nord"} MQ{"Martinique"} MR{"Mauritanie"} @@ -297,8 +297,6 @@ fr{ } Countries%short{ GB{"R.-U."} - HK{"Hong Kong"} - MO{"Macao"} PS{"Palestine"} UN{"NU"} US{"É.-U."} diff --git a/icuSources/data/region/he.txt b/icuSources/data/region/he.txt index 69c68e05..22112b16 100644 --- a/icuSources/data/region/he.txt +++ b/icuSources/data/region/he.txt @@ -81,7 +81,7 @@ he{ CK{"איי קוק"} CL{"צ׳ילה"} CM{"קמרון"} - CN{"סין"} + CN{"סין היבשתית"} CO{"קולומביה"} CP{"האי קליפרטון"} CR{"קוסטה ריקה"} @@ -133,7 +133,7 @@ he{ GU{"גואם"} GW{"גינאה-ביסאו"} GY{"גיאנה"} - HK{"הונג קונג (סין)"} + HK{"הונג קונג"} HM{"איי הרד ומקדונלד"} HN{"הונדורס"} HR{"קרואטיה"} @@ -187,7 +187,7 @@ he{ ML{"מאלי"} MM{"מיאנמר (בורמה)"} MN{"מונגוליה"} - MO{"מקאו (סין)"} + MO{"מקאו"} MP{"איי מריאנה הצפוניים"} MQ{"מרטיניק"} MR{"מאוריטניה"} @@ -297,8 +297,6 @@ he{ } Countries%short{ GB{"בריטניה"} - HK{"הונג קונג"} - MO{"מקאו"} PS{"פלסטין"} US{"ארה״ב"} } diff --git a/icuSources/data/region/hi.txt b/icuSources/data/region/hi.txt index 5370ffa8..a1c19c17 100644 --- a/icuSources/data/region/hi.txt +++ b/icuSources/data/region/hi.txt @@ -81,7 +81,7 @@ hi{ CK{"कुक द्वीपसमूह"} CL{"चिली"} CM{"कैमरून"} - CN{"चीन"} + CN{"चीन मुख्यभूमि"} CO{"कोलंबिया"} CP{"क्लिपर्टन द्वीप"} CR{"कोस्टा रीका"} @@ -133,7 +133,7 @@ hi{ GU{"गुआम"} GW{"गिनी-बिसाउ"} GY{"गुयाना"} - HK{"हाँग काँग (चीन)"} + HK{"हाँग काँग"} HM{"हर्ड द्वीप और मैकडोनॉल्ड द्वीपसमूह"} HN{"होंडूरास"} HR{"क्रोएशिया"} @@ -187,7 +187,7 @@ hi{ ML{"माली"} MM{"म्यांमार (बर्मा)"} MN{"मंगोलिया"} - MO{"मकाऊ (चीन)"} + MO{"मकाओ"} MP{"उत्तरी मारियाना द्वीपसमूह"} MQ{"मार्टीनिक"} MR{"मॉरिटानिया"} @@ -297,8 +297,6 @@ hi{ } Countries%short{ GB{"यू॰के॰"} - HK{"हाँग काँग"} - MO{"मकाऊ"} PS{"फ़िलिस्तीन"} UN{"संयुक्त राष्ट्र"} US{"यू॰एस॰"} diff --git a/icuSources/data/region/hr.txt b/icuSources/data/region/hr.txt index 64fcac01..a8a27e5d 100644 --- a/icuSources/data/region/hr.txt +++ b/icuSources/data/region/hr.txt @@ -81,7 +81,7 @@ hr{ CK{"Cookovi Otoci"} CL{"Čile"} CM{"Kamerun"} - CN{"Kina"} + CN{"Kina, kontinentalna"} CO{"Kolumbija"} CP{"Otok Clipperton"} CR{"Kostarika"} @@ -133,7 +133,7 @@ hr{ GU{"Guam"} GW{"Gvineja Bisau"} GY{"Gvajana"} - HK{"Hong Kong (Kina)"} + HK{"Hong Kong"} HM{"Otoci Heard i McDonald"} HN{"Honduras"} HR{"Hrvatska"} @@ -187,7 +187,7 @@ hr{ ML{"Mali"} MM{"Mjanmar (Burma)"} MN{"Mongolija"} - MO{"Makao (Kina)"} + MO{"Makao"} MP{"Sjevernomarijanski otoci"} MQ{"Martinique"} MR{"Mauretanija"} @@ -297,8 +297,6 @@ hr{ } Countries%short{ GB{"UK"} - HK{"Hong Kong"} - MO{"Makao"} PS{"Palestina"} UN{"UN"} US{"SAD"} diff --git a/icuSources/data/region/hu.txt b/icuSources/data/region/hu.txt index a8e76401..a9212a25 100644 --- a/icuSources/data/region/hu.txt +++ b/icuSources/data/region/hu.txt @@ -81,7 +81,7 @@ hu{ CK{"Cook-szigetek"} CL{"Chile"} CM{"Kamerun"} - CN{"Kína"} + CN{"Kína - kontinentális"} CO{"Kolumbia"} CP{"Clipperton-sziget"} CR{"Costa Rica"} @@ -133,7 +133,7 @@ hu{ GU{"Guam"} GW{"Bissau-Guinea"} GY{"Guyana"} - HK{"Hongkong (Kína)"} + HK{"Hongkong"} HM{"Heard-sziget és McDonald-szigetek"} HN{"Honduras"} HR{"Horvátország"} @@ -187,7 +187,7 @@ hu{ ML{"Mali"} MM{"Mianmar (Burma)"} MN{"Mongólia"} - MO{"Makaó (Kína)"} + MO{"Makaó"} MP{"Északi Mariana-szigetek"} MQ{"Martinique"} MR{"Mauritánia"} @@ -297,8 +297,6 @@ hu{ } Countries%short{ GB{"UK"} - HK{"Hongkong"} - MO{"Makaó"} PS{"Palesztina"} UN{"ENSZ"} US{"USA"} diff --git a/icuSources/data/region/id.txt b/icuSources/data/region/id.txt index 3e696729..ac35bce2 100644 --- a/icuSources/data/region/id.txt +++ b/icuSources/data/region/id.txt @@ -81,7 +81,7 @@ id{ CK{"Kepulauan Cook"} CL{"Cile"} CM{"Kamerun"} - CN{"Tiongkok"} + CN{"Tiongkok daratan"} CO{"Kolombia"} CP{"Pulau Clipperton"} CR{"Kosta Rika"} @@ -133,7 +133,7 @@ id{ GU{"Guam"} GW{"Guinea-Bissau"} GY{"Guyana"} - HK{"Hong Kong (Tiongkok)"} + HK{"Hong Kong"} HM{"Pulau Heard dan Kepulauan McDonald"} HN{"Honduras"} HR{"Kroasia"} @@ -187,7 +187,7 @@ id{ ML{"Mali"} MM{"Myanmar (Burma)"} MN{"Mongolia"} - MO{"Makau (Tiongkok)"} + MO{"Makau"} MP{"Kepulauan Mariana Utara"} MQ{"Martinik"} MR{"Mauritania"} @@ -297,8 +297,6 @@ id{ } Countries%short{ GB{"UK"} - HK{"Hong Kong"} - MO{"Makau"} PS{"Palestina"} UN{"PBB"} US{"A.S."} diff --git a/icuSources/data/region/it.txt b/icuSources/data/region/it.txt index 0d53635f..c188c8c2 100644 --- a/icuSources/data/region/it.txt +++ b/icuSources/data/region/it.txt @@ -81,7 +81,7 @@ it{ CK{"Isole Cook"} CL{"Cile"} CM{"Camerun"} - CN{"Cina"} + CN{"Cina continentale"} CO{"Colombia"} CP{"Isola di Clipperton"} CR{"Costa Rica"} @@ -133,7 +133,7 @@ it{ GU{"Guam"} GW{"Guinea-Bissau"} GY{"Guyana"} - HK{"Hong Kong (Cina)"} + HK{"Hong Kong"} HM{"Isole Heard e McDonald"} HN{"Honduras"} HR{"Croazia"} @@ -187,7 +187,7 @@ it{ ML{"Mali"} MM{"Myanmar (Birmania)"} MN{"Mongolia"} - MO{"Macao (Cina)"} + MO{"Macao"} MP{"Isole Marianne settentrionali"} MQ{"Martinica"} MR{"Mauritania"} @@ -297,8 +297,6 @@ it{ } Countries%short{ GB{"UK"} - HK{"Hong Kong"} - MO{"Macao"} PS{"Palestina"} UN{"ONU"} US{"USA"} diff --git a/icuSources/data/region/ja.txt b/icuSources/data/region/ja.txt index c6a046d0..a3871e7a 100644 --- a/icuSources/data/region/ja.txt +++ b/icuSources/data/region/ja.txt @@ -81,7 +81,7 @@ ja{ CK{"クック諸島"} CL{"チリ"} CM{"カメルーン"} - CN{"中国"} + CN{"中国大陸"} CO{"コロンビア"} CP{"クリッパートン島"} CR{"コスタリカ"} @@ -133,7 +133,7 @@ ja{ GU{"グアム"} GW{"ギニアビサウ"} GY{"ガイアナ"} - HK{"香港（中国）"} + HK{"香港"} HM{"ハード島・マクドナルド諸島"} HN{"ホンジュラス"} HR{"クロアチア"} @@ -187,7 +187,7 @@ ja{ ML{"マリ"} MM{"ミャンマー (ビルマ)"} MN{"モンゴル"} - MO{"マカオ（中国）"} + MO{"マカオ"} MP{"北マリアナ諸島"} MQ{"マルティニーク"} MR{"モーリタニア"} @@ -297,8 +297,6 @@ ja{ } Countries%short{ GB{"英国"} - HK{"香港"} - MO{"マカオ"} PS{"パレスチナ"} UN{"国連"} US{"アメリカ"} diff --git a/icuSources/data/region/ko.txt b/icuSources/data/region/ko.txt index b6e66e83..6fdc5ba4 100644 --- a/icuSources/data/region/ko.txt +++ b/icuSources/data/region/ko.txt @@ -81,7 +81,7 @@ ko{ CK{"쿡 제도"} CL{"칠레"} CM{"카메룬"} - CN{"중국"} + CN{"중국 본토"} CO{"콜롬비아"} CP{"클립퍼튼 섬"} CR{"코스타리카"} @@ -133,7 +133,7 @@ ko{ GU{"괌"} GW{"기니비사우"} GY{"가이아나"} - HK{"홍콩(중국)"} + HK{"홍콩"} HM{"허드 맥도널드 제도"} HN{"온두라스"} HR{"크로아티아"} @@ -187,7 +187,7 @@ ko{ ML{"말리"} MM{"미얀마"} MN{"몽골"} - MO{"마카오(중국)"} + MO{"마카오"} MP{"북마리아나제도"} MQ{"마르티니크"} MR{"모리타니"} @@ -297,8 +297,6 @@ ko{ } Countries%short{ GB{"영국"} - HK{"홍콩"} - MO{"마카오"} PS{"팔레스타인"} UN{"유엔"} US{"미국"} diff --git a/icuSources/data/region/ms.txt b/icuSources/data/region/ms.txt index 40587f4e..098a4cdd 100644 --- a/icuSources/data/region/ms.txt +++ b/icuSources/data/region/ms.txt @@ -81,7 +81,7 @@ ms{ CK{"Kepulauan Cook"} CL{"Chile"} CM{"Cameroon"} - CN{"China"} + CN{"China, Tanah Besar"} CO{"Colombia"} CP{"Pulau Clipperton"} CR{"Costa Rica"} @@ -133,7 +133,7 @@ ms{ GU{"Guam"} GW{"Guinea Bissau"} GY{"Guyana"} - HK{"Hong Kong (China)"} + HK{"Hong Kong"} HM{"Kepulauan Heard & McDonald"} HN{"Honduras"} HR{"Croatia"} @@ -187,7 +187,7 @@ ms{ ML{"Mali"} MM{"Myanmar (Burma)"} MN{"Mongolia"} - MO{"Macau (China)"} + MO{"Macau"} MP{"Kepulauan Mariana Utara"} MQ{"Martinique"} MR{"Mauritania"} @@ -297,8 +297,6 @@ ms{ } Countries%short{ GB{"UK"} - HK{"Hong Kong"} - MO{"Macau"} PS{"Palestin"} UN{"PBB"} US{"A.S"} diff --git a/icuSources/data/region/nb.txt b/icuSources/data/region/nb.txt index d1d68c8c..01f773a7 100644 --- a/icuSources/data/region/nb.txt +++ b/icuSources/data/region/nb.txt @@ -81,7 +81,7 @@ nb{ CK{"Cookøyene"} CL{"Chile"} CM{"Kamerun"} - CN{"Kina"} + CN{"Kina, fastlandet"} CO{"Colombia"} CP{"Clippertonøya"} CR{"Costa Rica"} @@ -133,7 +133,7 @@ nb{ GU{"Guam"} GW{"Guinea-Bissau"} GY{"Guyana"} - HK{"Hongkong (Kina)"} + HK{"Hongkong"} HM{"Heard- og McDonaldøyene"} HN{"Honduras"} HR{"Kroatia"} @@ -187,7 +187,7 @@ nb{ ML{"Mali"} MM{"Myanmar (Burma)"} MN{"Mongolia"} - MO{"Macao (Kina)"} + MO{"Macao"} MP{"Nord-Marianene"} MQ{"Martinique"} MR{"Mauritania"} @@ -297,8 +297,6 @@ nb{ } Countries%short{ GB{"Storbritannia"} - HK{"Hongkong"} - MO{"Macao"} PS{"Palestina"} UN{"FN"} US{"USA"} diff --git a/icuSources/data/region/nl.txt b/icuSources/data/region/nl.txt index c8df92a5..d8619fc6 100644 --- a/icuSources/data/region/nl.txt +++ b/icuSources/data/region/nl.txt @@ -81,7 +81,7 @@ nl{ CK{"Cookeilanden"} CL{"Chili"} CM{"Kameroen"} - CN{"China"} + CN{"China, vasteland"} CO{"Colombia"} CP{"Clipperton"} CR{"Costa Rica"} @@ -133,7 +133,7 @@ nl{ GU{"Guam"} GW{"Guinee-Bissau"} GY{"Guyana"} - HK{"Hongkong (China)"} + HK{"Hongkong"} HM{"Heard en McDonaldeilanden"} HN{"Honduras"} HR{"Kroatië"} @@ -187,7 +187,7 @@ nl{ ML{"Mali"} MM{"Myanmar (Birma)"} MN{"Mongolië"} - MO{"Macau (China)"} + MO{"Macau"} MP{"Noordelijke Marianen"} MQ{"Martinique"} MR{"Mauritanië"} @@ -297,8 +297,6 @@ nl{ } Countries%short{ GB{"VK"} - HK{"Hongkong"} - MO{"Macau"} PS{"Palestina"} UN{"VN"} US{"VS"} diff --git a/icuSources/data/region/nn.txt b/icuSources/data/region/nn.txt index c5121d47..1cf3fa54 100644 --- a/icuSources/data/region/nn.txt +++ b/icuSources/data/region/nn.txt @@ -80,7 +80,7 @@ nn{ CK{"Cookøyane"} CL{"Chile"} CM{"Kamerun"} - CN{"Kina"} + CN{"Kina, fastlandet"} CO{"Colombia"} CP{"Clippertonøya"} CR{"Costa Rica"} @@ -132,7 +132,7 @@ nn{ GU{"Guam"} GW{"Guinea-Bissau"} GY{"Guyana"} - HK{"Hongkong S.A.R. Kina"} + HK{"Hongkong"} HM{"Heardøya og McDonaldøyane"} HN{"Honduras"} HR{"Kroatia"} @@ -186,7 +186,7 @@ nn{ ML{"Mali"} MM{"Myanmar (Burma)"} MN{"Mongolia"} - MO{"Macao S.A.R. Kina"} + MO{"Macao"} MP{"Nord-Marianane"} MQ{"Martinique"} MR{"Mauritania"} @@ -296,8 +296,6 @@ nn{ } Countries%short{ GB{"Storbritannia"} - HK{"Hongkong"} - MO{"Macao"} PS{"Palestina"} US{"USA"} } diff --git a/icuSources/data/region/pl.txt b/icuSources/data/region/pl.txt index ed4610a8..11258cdd 100644 --- a/icuSources/data/region/pl.txt +++ b/icuSources/data/region/pl.txt @@ -81,7 +81,7 @@ pl{ CK{"Wyspy Cooka"} CL{"Chile"} CM{"Kamerun"} - CN{"Chiny"} + CN{"Chiny kontynentalne"} CO{"Kolumbia"} CP{"Clipperton"} CR{"Kostaryka"} @@ -133,7 +133,7 @@ pl{ GU{"Guam"} GW{"Gwinea Bissau"} GY{"Gujana"} - HK{"Hongkong (Chiny)"} + HK{"Hongkong"} HM{"Wyspy Heard i McDonalda"} HN{"Honduras"} HR{"Chorwacja"} @@ -187,7 +187,7 @@ pl{ ML{"Mali"} MM{"Mjanma (Birma)"} MN{"Mongolia"} - MO{"Makau (Chiny)"} + MO{"Makau"} MP{"Mariany Północne"} MQ{"Martynika"} MR{"Mauretania"} @@ -297,8 +297,6 @@ pl{ } Countries%short{ GB{"Wlk. Bryt."} - HK{"Hongkong"} - MO{"Makau"} PS{"Palestyna"} UN{"ONZ"} US{"USA"} diff --git a/icuSources/data/region/pt.txt b/icuSources/data/region/pt.txt index 58de32c1..6a6f7b29 100644 --- a/icuSources/data/region/pt.txt +++ b/icuSources/data/region/pt.txt @@ -80,7 +80,7 @@ pt{ CK{"Ilhas Cook"} CL{"Chile"} CM{"Camarões"} - CN{"China"} + CN{"China continental"} CO{"Colômbia"} CP{"Ilha de Clipperton"} CR{"Costa Rica"} @@ -132,7 +132,7 @@ pt{ GU{"Guam"} GW{"Guiné-Bissau"} GY{"Guiana"} - HK{"Hong Kong (China)"} + HK{"Hong Kong"} HM{"Ilhas Heard e McDonald"} HN{"Honduras"} HR{"Croácia"} @@ -186,7 +186,7 @@ pt{ ML{"Mali"} MM{"Mianmar (Birmânia)"} MN{"Mongólia"} - MO{"Macau (China)"} + MO{"Macau"} MP{"Ilhas Marianas do Norte"} MQ{"Martinica"} MR{"Mauritânia"} @@ -296,8 +296,6 @@ pt{ } Countries%short{ GB{"Reino Unido"} - HK{"Hong Kong"} - MO{"Macau"} PS{"Palestina"} UN{"ONU"} US{"EUA"} diff --git a/icuSources/data/region/ro.txt b/icuSources/data/region/ro.txt index 49370f7d..cf01f7db 100644 --- a/icuSources/data/region/ro.txt +++ b/icuSources/data/region/ro.txt @@ -81,7 +81,7 @@ ro{ CK{"Insulele Cook"} CL{"Chile"} CM{"Camerun"} - CN{"China"} + CN{"China continentală"} CO{"Columbia"} CP{"Insula Clipperton"} CR{"Costa Rica"} @@ -133,7 +133,7 @@ ro{ GU{"Guam"} GW{"Guineea-Bissau"} GY{"Guyana"} - HK{"Hong Kong (China)"} + HK{"Hong Kong"} HM{"Insula Heard și Insulele McDonald"} HN{"Honduras"} HR{"Croația"} @@ -187,7 +187,7 @@ ro{ ML{"Mali"} MM{"Myanmar (Birmania)"} MN{"Mongolia"} - MO{"Macao (China)"} + MO{"Macao"} MP{"Insulele Mariane de Nord"} MQ{"Martinica"} MR{"Mauritania"} @@ -297,8 +297,6 @@ ro{ } Countries%short{ GB{"Regatul Unit"} - HK{"Hong Kong"} - MO{"Macao"} PS{"Palestina"} UN{"ONU"} US{"S.U.A."} diff --git a/icuSources/data/region/ru.txt b/icuSources/data/region/ru.txt index 4587b587..ba21aa12 100644 --- a/icuSources/data/region/ru.txt +++ b/icuSources/data/region/ru.txt @@ -81,7 +81,7 @@ ru{ CK{"Острова Кука"} CL{"Чили"} CM{"Камерун"} - CN{"Китай"} + CN{"Китай континентальный"} CO{"Колумбия"} CP{"о-в Клиппертон"} CR{"Коста-Рика"} @@ -133,7 +133,7 @@ ru{ GU{"Гуам"} GW{"Гвинея-Бисау"} GY{"Гайана"} - HK{"Гонконг (Китай)"} + HK{"Гонконг"} HM{"о-ва Херд и Макдональд"} HN{"Гондурас"} HR{"Хорватия"} @@ -187,7 +187,7 @@ ru{ ML{"Мали"} MM{"Мьянма (Бирма)"} MN{"Монголия"} - MO{"Макао (Китай)"} + MO{"Макао"} MP{"Северные Марианские о-ва"} MQ{"Мартиника"} MR{"Мавритания"} @@ -297,8 +297,6 @@ ru{ } Countries%short{ GB{"Британия"} - HK{"Гонконг"} - MO{"Макао"} PS{"Палестина"} UN{"ООН"} US{"США"} diff --git a/icuSources/data/region/sk.txt b/icuSources/data/region/sk.txt index 91246fb4..da3897d3 100644 --- a/icuSources/data/region/sk.txt +++ b/icuSources/data/region/sk.txt @@ -81,7 +81,7 @@ sk{ CK{"Cookove ostrovy"} CL{"Čile"} CM{"Kamerun"} - CN{"Čína"} + CN{"Čína – kontinentálna"} CO{"Kolumbia"} CP{"Clipperton"} CR{"Kostarika"} @@ -133,7 +133,7 @@ sk{ GU{"Guam"} GW{"Guinea-Bissau"} GY{"Guyana"} - HK{"Hongkong (Čína)"} + HK{"Hong Kong"} HM{"Heardov ostrov a Macdonaldove ostrovy"} HN{"Honduras"} HR{"Chorvátsko"} @@ -187,7 +187,7 @@ sk{ ML{"Mali"} MM{"Mjanmarsko"} MN{"Mongolsko"} - MO{"Macao (Čína)"} + MO{"Macau"} MP{"Severné Mariány"} MQ{"Martinik"} MR{"Mauritánia"} @@ -297,8 +297,6 @@ sk{ } Countries%short{ GB{"UK"} - HK{"Hongkong"} - MO{"Macao"} PS{"Palestínska samospráva"} UN{"OSN"} US{"USA"} diff --git a/icuSources/data/region/sv.txt b/icuSources/data/region/sv.txt index b7642884..a5483fb7 100644 --- a/icuSources/data/region/sv.txt +++ b/icuSources/data/region/sv.txt @@ -81,7 +81,7 @@ sv{ CK{"Cooköarna"} CL{"Chile"} CM{"Kamerun"} - CN{"Kina"} + CN{"Kina, fastlandet"} CO{"Colombia"} CP{"Clippertonön"} CR{"Costa Rica"} @@ -133,7 +133,7 @@ sv{ GU{"Guam"} GW{"Guinea-Bissau"} GY{"Guyana"} - HK{"Hongkong (Kina)"} + HK{"Hongkong"} HM{"Heardön och McDonaldöarna"} HN{"Honduras"} HR{"Kroatien"} @@ -187,7 +187,7 @@ sv{ ML{"Mali"} MM{"Myanmar (Burma)"} MN{"Mongoliet"} - MO{"Macao (Kina)"} + MO{"Macau"} MP{"Nordmarianerna"} MQ{"Martinique"} MR{"Mauretanien"} @@ -297,8 +297,6 @@ sv{ } Countries%short{ GB{"Storbritannien"} - HK{"Hongkong"} - MO{"Macao"} PS{"Palestina"} UN{"FN"} US{"USA"} diff --git a/icuSources/data/region/th.txt b/icuSources/data/region/th.txt index 16ab6b4a..871e91bf 100644 --- a/icuSources/data/region/th.txt +++ b/icuSources/data/region/th.txt @@ -81,7 +81,7 @@ th{ CK{"หมู่เกาะคุก"} CL{"ชิลี"} CM{"แคเมอรูน"} - CN{"จีน"} + CN{"จีนแผ่นดินใหญ่"} CO{"โคลอมเบีย"} CP{"เกาะคลิปเปอร์ตัน"} CR{"คอสตาริกา"} @@ -133,7 +133,7 @@ th{ GU{"กวม"} GW{"กินี-บิสเซา"} GY{"กายอานา"} - HK{"ฮ่องกง (จีน)"} + HK{"ฮ่องกง"} HM{"เกาะเฮิร์ดและหมู่เกาะแมกดอนัลด์"} HN{"ฮอนดูรัส"} HR{"โครเอเชีย"} @@ -187,7 +187,7 @@ th{ ML{"มาลี"} MM{"เมียนมาร์ (พม่า)"} MN{"มองโกเลีย"} - MO{"มาเก๊า (จีน)"} + MO{"มาเก๊า"} MP{"หมู่เกาะนอร์เทิร์นมาเรียนา"} MQ{"มาร์ตินีก"} MR{"มอริเตเนีย"} @@ -297,8 +297,6 @@ th{ } Countries%short{ GB{"อังกฤษ"} - HK{"ฮ่องกง"} - MO{"มาเก๊า"} PS{"ปาเลสไตน์"} UN{"สหประชาชาติ"} US{"สหรัฐฯ"} diff --git a/icuSources/data/region/tr.txt b/icuSources/data/region/tr.txt index 09af056e..f8b86f73 100644 --- a/icuSources/data/region/tr.txt +++ b/icuSources/data/region/tr.txt @@ -81,7 +81,7 @@ tr{ CK{"Cook Adaları"} CL{"Şili"} CM{"Kamerun"} - CN{"Çin"} + CN{"Çin anakarası"} CO{"Kolombiya"} CP{"Clipperton Adası"} CR{"Kosta Rika"} @@ -133,7 +133,7 @@ tr{ GU{"Guam"} GW{"Gine-Bissau"} GY{"Guyana"} - HK{"Hong Kong (Çin)"} + HK{"Hong Kong"} HM{"Heard Adası ve McDonald Adaları"} HN{"Honduras"} HR{"Hırvatistan"} @@ -187,7 +187,7 @@ tr{ ML{"Mali"} MM{"Myanmar (Burma)"} MN{"Moğolistan"} - MO{"Makao (Çin)"} + MO{"Makao"} MP{"Kuzey Mariana Adaları"} MQ{"Martinik"} MR{"Moritanya"} @@ -297,8 +297,6 @@ tr{ } Countries%short{ GB{"BK"} - HK{"Hong Kong"} - MO{"Makao"} PS{"Filistin"} UN{"BM"} US{"ABD"} diff --git a/icuSources/data/region/uk.txt b/icuSources/data/region/uk.txt index a90135ff..135af190 100644 --- a/icuSources/data/region/uk.txt +++ b/icuSources/data/region/uk.txt @@ -81,7 +81,7 @@ uk{ CK{"Острови Кука"} CL{"Чілі"} CM{"Камерун"} - CN{"Китай"} + CN{"Китай материковий"} CO{"Колумбія"} CP{"Острів Кліппертон"} CR{"Коста-Ріка"} @@ -133,7 +133,7 @@ uk{ GU{"Ґуам"} GW{"Гвінея-Бісау"} GY{"Ґайана"} - HK{"Гонконґ (Китай)"} + HK{"Гонконг"} HM{"острів Герд і острови Макдоналд"} HN{"Гондурас"} HR{"Хорватія"} @@ -187,7 +187,7 @@ uk{ ML{"Малі"} MM{"Мʼянма (Бірма)"} MN{"Монголія"} - MO{"Макао (Китай)"} + MO{"Макао"} MP{"Північні Маріанські Острови"} MQ{"Мартініка"} MR{"Мавританія"} @@ -297,8 +297,6 @@ uk{ } Countries%short{ GB{"Велика Британія"} - HK{"Гонконг"} - MO{"Макао"} PS{"Палестина"} UN{"ООН"} US{"США"} diff --git a/icuSources/data/region/vi.txt b/icuSources/data/region/vi.txt index fd6a0c22..982da084 100644 --- a/icuSources/data/region/vi.txt +++ b/icuSources/data/region/vi.txt @@ -81,7 +81,7 @@ vi{ CK{"Quần đảo Cook"} CL{"Chile"} CM{"Cameroon"} - CN{"Trung Quốc"} + CN{"Trung Quốc đại lục"} CO{"Colombia"} CP{"Đảo Clipperton"} CR{"Costa Rica"} @@ -133,7 +133,7 @@ vi{ GU{"Guam"} GW{"Guinea-Bissau"} GY{"Guyana"} - HK{"Hồng Kông (Trung Quốc)"} + HK{"Hồng Kông"} HM{"Quần đảo Heard và McDonald"} HN{"Honduras"} HR{"Croatia"} @@ -187,7 +187,7 @@ vi{ ML{"Mali"} MM{"Myanmar (Miến Điện)"} MN{"Mông Cổ"} - MO{"Macao (Trung Quốc)"} + MO{"Ma Cao"} MP{"Quần đảo Bắc Mariana"} MQ{"Martinique"} MR{"Mauritania"} @@ -297,8 +297,6 @@ vi{ } Countries%short{ GB{"Vương quốc Anh"} - HK{"Hồng Kông"} - MO{"Macao"} PS{"Palestine"} UN{"Liên hiệp quốc"} US{"Hoa Kỳ"} diff --git a/icuSources/data/region/yue.txt b/icuSources/data/region/yue.txt index cba2f7f3..c19738b8 100644 --- a/icuSources/data/region/yue.txt +++ b/icuSources/data/region/yue.txt @@ -132,7 +132,7 @@ yue{ GU{"關島"} GW{"幾內亞比索"} GY{"蓋亞那"} - HK{"中華人民共和國香港特別行政區"} + HK{"香港"} HM{"赫德島同麥克唐納群島"} HN{"宏都拉斯"} HR{"克羅埃西亞"} @@ -186,7 +186,7 @@ yue{ ML{"馬利"} MM{"緬甸"} MN{"蒙古"} - MO{"中華人民共和國澳門特別行政區"} + MO{"澳門"} MP{"北馬里亞納群島"} MQ{"馬丁尼克島"} MR{"茅利塔尼亞"} @@ -296,8 +296,6 @@ yue{ } Countries%short{ GB{"英國"} - HK{"香港"} - MO{"澳門"} PS{"巴勒斯坦"} US{"美國"} } diff --git a/icuSources/data/region/yue_Hans.txt b/icuSources/data/region/yue_Hans.txt index 4c75fd94..741d2756 100644 --- a/icuSources/data/region/yue_Hans.txt +++ b/icuSources/data/region/yue_Hans.txt @@ -81,7 +81,7 @@ yue_Hans{ CK{"库克群岛"} CL{"智利"} CM{"喀麦隆"} - CN{"中华人民共和国"} + CN{"中国大陆"} CO{"哥伦比亚"} CP{"克里派顿岛"} CR{"哥斯大黎加"} @@ -133,7 +133,7 @@ yue_Hans{ GU{"关岛"} GW{"几内亚比索"} GY{"盖亚那"} - HK{"中华人民共和国香港特别行政区"} + HK{"香港"} HM{"赫德岛同麦克唐纳群岛"} HN{"宏都拉斯"} HR{"克罗埃西亚"} @@ -187,7 +187,7 @@ yue_Hans{ ML{"马利"} MM{"缅甸"} MN{"蒙古"} - MO{"中华人民共和国澳门特别行政区"} + MO{"澳门"} MP{"北马里亚纳群岛"} MQ{"马丁尼克岛"} MR{"茅利塔尼亚"} @@ -297,8 +297,6 @@ yue_Hans{ } Countries%short{ GB{"英国"} - HK{"香港"} - MO{"澳门"} PS{"巴勒斯坦"} US{"美国"} } diff --git a/icuSources/data/region/zh.txt b/icuSources/data/region/zh.txt index 35ab2ca1..48254070 100644 --- a/icuSources/data/region/zh.txt +++ b/icuSources/data/region/zh.txt @@ -81,7 +81,7 @@ zh{ CK{"库克群岛"} CL{"智利"} CM{"喀麦隆"} - CN{"中国"} + CN{"中国大陆"} CO{"哥伦比亚"} CP{"克利珀顿岛"} CR{"哥斯达黎加"} @@ -133,7 +133,7 @@ zh{ GU{"关岛"} GW{"几内亚比绍"} GY{"圭亚那"} - HK{"香港（中国）"} + HK{"香港"} HM{"赫德岛和麦克唐纳群岛"} HN{"洪都拉斯"} HR{"克罗地亚"} @@ -187,7 +187,7 @@ zh{ ML{"马里"} MM{"缅甸"} MN{"蒙古"} - MO{"澳门（中国）"} + MO{"澳门"} MP{"北马里亚纳群岛"} MQ{"马提尼克"} MR{"毛里塔尼亚"} @@ -297,8 +297,6 @@ zh{ } Countries%short{ GB{"英国"} - HK{"香港"} - MO{"澳门"} PS{"巴勒斯坦"} UN{"联合国"} US{"美国"} diff --git a/icuSources/data/region/zh_Hant.txt b/icuSources/data/region/zh_Hant.txt index 5961f352..b5df6732 100644 --- a/icuSources/data/region/zh_Hant.txt +++ b/icuSources/data/region/zh_Hant.txt @@ -82,7 +82,7 @@ zh_Hant{ CK{"庫克群島"} CL{"智利"} CM{"喀麥隆"} - CN{"中國"} + CN{"中國大陸"} CO{"哥倫比亞"} CP{"克里派頓島"} CR{"哥斯大黎加"} @@ -134,7 +134,7 @@ zh_Hant{ GU{"關島"} GW{"幾內亞比索"} GY{"蓋亞那"} - HK{"香港（中國）"} + HK{"香港"} HM{"赫德島及麥唐納群島"} HN{"宏都拉斯"} HR{"克羅埃西亞"} @@ -188,7 +188,7 @@ zh_Hant{ ML{"馬利"} MM{"緬甸"} MN{"蒙古"} - MO{"澳門（中國）"} + MO{"澳門"} MP{"北馬利安納群島"} MQ{"馬丁尼克"} MR{"茅利塔尼亞"} @@ -298,8 +298,6 @@ zh_Hant{ } Countries%short{ GB{"英國"} - HK{"香港"} - MO{"澳門"} PS{"巴勒斯坦"} UN{"聯合國"} US{"美國"} diff --git a/icuSources/i18n/measunit.cpp b/icuSources/i18n/measunit.cpp index 211d9591..667c7399 100644 --- a/icuSources/i18n/measunit.cpp +++ b/icuSources/i18n/measunit.cpp @@ -41,21 +41,21 @@ static const int32_t gOffsets[] = { 16, 20, 24, - 321, - 331, - 342, - 346, - 352, - 356, - 376, + 322, + 332, + 343, + 347, + 353, + 357, 377, - 388, - 391, - 397, - 402, - 406, - 410, - 435 + 378, + 389, + 392, + 398, + 403, + 407, + 411, + 436 }; static const int32_t gIndexes[] = { @@ -391,6 +391,7 @@ static const char * const gSubTypes[] = { "UZS", "VEB", "VEF", + "VES", "VNC", "VND", "VUV", @@ -547,14 +548,14 @@ static const char * const gSubTypes[] = { // Must be sorted by first value and then second value. static int32_t unitPerUnitToSingleUnit[][4] = { - {363, 333, 17, 0}, - {365, 339, 17, 2}, - {367, 333, 17, 3}, - {367, 424, 4, 2}, - {367, 425, 4, 3}, - {382, 422, 3, 1}, - {385, 11, 16, 4}, - {427, 363, 4, 1} + {364, 334, 17, 0}, + {366, 340, 17, 2}, + {368, 334, 17, 3}, + {368, 425, 4, 2}, + {368, 426, 4, 3}, + {383, 423, 3, 1}, + {386, 11, 16, 4}, + {428, 364, 4, 1} }; // Shortcuts to the base unit in order to make the default constructor fast diff --git a/icuSources/test/cintltst/cbiapts.c b/icuSources/test/cintltst/cbiapts.c index 451116a8..cd75269d 100644 --- a/icuSources/test/cintltst/cbiapts.c +++ b/icuSources/test/cintltst/cbiapts.c @@ -1192,18 +1192,23 @@ static void TestBreakIteratorSuppressions(void) { #if APPLE_ADDITIONS #include -#include -#include "unicode/urbtok.h" -#include "cstring.h" #if U_PLATFORM_IS_DARWIN_BASED +#include #include #define GET_START() mach_absolute_time() #define GET_DURATION(start, info) ((mach_absolute_time() - start) * info.numer)/info.denom -#else +#elif !U_PLATFORM_HAS_WIN32_API +#include #include "putilimp.h" #define GET_START() (uint64_t)uprv_getUTCtime() #define GET_DURATION(start, info) ((uint64_t)uprv_getUTCtime() - start) +#else +#include "putilimp.h" +#define GET_START() (unsigned long long)uprv_getUTCtime() +#define GET_DURATION(start, info) ((unsigned long long)uprv_getUTCtime() - start) #endif +#include "unicode/urbtok.h" +#include "cstring.h" typedef struct { RuleBasedTokenRange token; @@ -2230,7 +2235,11 @@ static void handleTokResults(const char* testItem, const char* tokClass, const c static void TestRuleBasedTokenizer(void) { const TokRulesAndTests* ruleTypePtr; +#if !U_PLATFORM_HAS_WIN32_API uint64_t start, duration; +#else + unsigned long long start, duration; +#endif #if U_PLATFORM_IS_DARWIN_BASED mach_timebase_info_data_t info; diff --git a/icuSources/test/cintltst/cdattst.c b/icuSources/test/cintltst/cdattst.c index 37e5ec2f..ca4ae88d 100644 --- a/icuSources/test/cintltst/cdattst.c +++ b/icuSources/test/cintltst/cdattst.c @@ -32,7 +32,9 @@ #include "cdattst.h" #include "cformtst.h" #include "cmemory.h" +#if !U_PLATFORM_HAS_WIN32_API #include "unicode/uatimeunitformat.h" /* Apple-specific */ +#endif #include @@ -46,7 +48,9 @@ static void TestFormatForFields(void); static void TestStandardPatterns(void); static void TestApplyPatnOverridesTimeSep(void); static void Test12HrFormats(void); +#if !U_PLATFORM_HAS_WIN32_API static void TestTimeUnitFormat(void); /* Apple-specific */ +#endif static void TestRemapPatternWithOpts(void); /* Apple-specific */ void addDateForTest(TestNode** root); @@ -70,7 +74,9 @@ void addDateForTest(TestNode** root) TESTCASE(TestStandardPatterns); TESTCASE(TestApplyPatnOverridesTimeSep); TESTCASE(Test12HrFormats); +#if !U_PLATFORM_HAS_WIN32_API TESTCASE(TestTimeUnitFormat); /* Apple-specific */ +#endif TESTCASE(TestRemapPatternWithOpts); /* Apple-specific */ } /* Testing the DateFormat API */ @@ -2151,6 +2157,7 @@ static void Test12HrFormats(void) { } } +#if !U_PLATFORM_HAS_WIN32_API /* *** */ typedef struct { @@ -2235,6 +2242,7 @@ static void TestTimeUnitFormat(void) { /* Apple-specific */ } } +#endif typedef enum RemapTesttype { REMAP_TESTTYPE_FULL = UDAT_FULL, // 0 diff --git a/icuSources/test/cintltst/cloctst.c b/icuSources/test/cintltst/cloctst.c index ea59ec22..662af053 100644 --- a/icuSources/test/cintltst/cloctst.c +++ b/icuSources/test/cintltst/cloctst.c @@ -40,7 +40,9 @@ #include "unicode/uldnames.h" #include "unicode/parseerr.h" /* may not be included with some uconfig switches */ #include "udbgutil.h" +#if !U_PLATFORM_HAS_WIN32_API #include "unicode/ualoc.h" /* Apple-specific */ +#endif static void TestNullDefault(void); static void TestNonexistentLanguageExemplars(void); @@ -55,9 +57,11 @@ static void TestIsRightToLeft(void); static void TestBadLocaleIDs(void); static void TestUldnNameVariants(void); +#if !U_PLATFORM_HAS_WIN32_API static void TestGetLanguagesForRegion(void); static void TestGetAppleParent(void); static void TestAppleLocalizationsToUse(void); +#endif void PrintDataTable(); @@ -92,12 +96,12 @@ static const char* const rawData2[LOCALE_INFO_SIZE][LOCALE_SIZE] = { /* display script code (English) */ { "", "", "", "", "", "Simplified Han", "", "", "" }, /* display country (English) */ - { "United States", "France", "Spain", "Greece", "Norway", "China", "Germany", "", "Japan" }, + { "United States", "France", "Spain", "Greece", "Norway", "China mainland", "Germany", "", "Japan" }, /* display variant (English) */ { "", "", "", "", "NY", "", "", "", "" }, /* display name (English) */ { "English (United States)", "French (France)", "Catalan (Spain)", - "Greek (Greece)", "Norwegian (Norway, NY)", "Chinese (Simplified, China)", + "Greek (Greece)", "Norwegian (Norway, NY)", "Chinese (Simplified, China mainland)", "German (Germany, Sort Order=Phonebook Sort Order)", "Spanish (Sort Order=Traditional Sort Order)", "Japanese (Japan, Calendar=Japanese Calendar)" }, /* display language (French) */ @@ -105,12 +109,12 @@ static const char* const rawData2[LOCALE_INFO_SIZE][LOCALE_SIZE] = { /* display script code (French) */ { "", "", "", "", "", "sinogrammes simplifi\\u00e9s", "", "", "" }, /* display country (French) */ - { "\\u00C9tats-Unis", "France", "Espagne", "Gr\\u00E8ce", "Norv\\u00E8ge", "Chine", "Allemagne", "", "Japon" }, + { "\\u00C9tats-Unis", "France", "Espagne", "Gr\\u00E8ce", "Norv\\u00E8ge", "Chine continentale", "Allemagne", "", "Japon" }, /* display variant (French) */ { "", "", "", "", "NY", "", "", "", "" }, /* display name (French) */ { "anglais (\\u00C9tats-Unis)", "fran\\u00E7ais (France)", "catalan (Espagne)", - "grec (Gr\\u00E8ce)", "norv\\u00E9gien (Norv\\u00E8ge, NY)", "chinois (simplifi\\u00e9, Chine)", + "grec (Gr\\u00E8ce)", "norv\\u00E9gien (Norv\\u00E8ge, NY)", "chinois (simplifi\\u00e9, Chine continentale)", "allemand (Allemagne, ordre de tri=ordre de l\\u2019annuaire)", "espagnol (ordre de tri=ordre traditionnel)", "japonais (Japon, calendrier=calendrier japonais)" }, /* display language (Catalan) */ @@ -118,12 +122,12 @@ static const char* const rawData2[LOCALE_INFO_SIZE][LOCALE_SIZE] = { /* display script code (Catalan) */ { "", "", "", "", "", "han simplificat", "", "", "" }, /* display country (Catalan) */ - { "Estats Units", "Fran\\u00E7a", "Espanya", "Gr\\u00E8cia", "Noruega", "Xina", "Alemanya", "", "Jap\\u00F3" }, + { "Estats Units", "Fran\\u00E7a", "Espanya", "Gr\\u00E8cia", "Noruega", "Xina continental", "Alemanya", "", "Jap\\u00F3" }, /* display variant (Catalan) */ { "", "", "", "", "NY", "", "", "", "" }, /* display name (Catalan) */ { "angl\\u00E8s (Estats Units)", "franc\\u00E8s (Fran\\u00E7a)", "catal\\u00E0 (Espanya)", - "grec (Gr\\u00E8cia)", "noruec (Noruega, NY)", "xin\\u00E8s (simplificat, Xina)", + "grec (Gr\\u00E8cia)", "noruec (Noruega, NY)", "xin\\u00E8s (simplificat, Xina continental)", "alemany (Alemanya, ordenaci\\u00F3=ordre de la guia telef\\u00F2nica)", "espanyol (ordenaci\\u00F3=ordre tradicional)", "japon\\u00E8s (Jap\\u00F3, calendari=calendari japon\\u00e8s)" }, /* display language (Greek) */ @@ -148,7 +152,7 @@ static const char* const rawData2[LOCALE_INFO_SIZE][LOCALE_SIZE] = { "\\u0399\\u03c3\\u03c0\\u03b1\\u03bd\\u03af\\u03b1", "\\u0395\\u03bb\\u03bb\\u03ac\\u03b4\\u03b1", "\\u039d\\u03bf\\u03c1\\u03b2\\u03b7\\u03b3\\u03af\\u03b1", - "\\u039A\\u03AF\\u03BD\\u03B1", + "\\u039A\\u03AF\\u03BD\\u03B1 \\u03B7\\u03C0\\u03B5\\u03B9\\u03C1\\u03C9\\u03C4\\u03B9\\u03BA\\u03AE", "\\u0393\\u03B5\\u03C1\\u03BC\\u03B1\\u03BD\\u03AF\\u03B1", "", "\\u0399\\u03B1\\u03C0\\u03C9\\u03BD\\u03AF\\u03B1" @@ -162,7 +166,7 @@ static const char* const rawData2[LOCALE_INFO_SIZE][LOCALE_SIZE] = { "\\u039a\\u03b1\\u03c4\\u03b1\\u03bb\\u03b1\\u03bd\\u03b9\\u03ba\\u03ac (\\u0399\\u03c3\\u03c0\\u03b1\\u03bd\\u03af\\u03b1)", "\\u0395\\u03bb\\u03bb\\u03b7\\u03bd\\u03b9\\u03ba\\u03ac (\\u0395\\u03bb\\u03bb\\u03ac\\u03b4\\u03b1)", "\\u039d\\u03bf\\u03c1\\u03b2\\u03b7\\u03b3\\u03b9\\u03ba\\u03ac (\\u039d\\u03bf\\u03c1\\u03b2\\u03b7\\u03b3\\u03af\\u03b1, NY)", - "\\u039A\\u03B9\\u03BD\\u03B5\\u03B6\\u03B9\\u03BA\\u03AC (\\u0391\\u03c0\\u03bb\\u03bf\\u03c0\\u03bf\\u03b9\\u03b7\\u03bc\\u03ad\\u03bd\\u03b1, \\u039A\\u03AF\\u03BD\\u03B1)", + "\\u039A\\u03B9\\u03BD\\u03B5\\u03B6\\u03B9\\u03BA\\u03AC (\\u0391\\u03c0\\u03bb\\u03bf\\u03c0\\u03bf\\u03b9\\u03b7\\u03bc\\u03ad\\u03bd\\u03b1, \\u039A\\u03AF\\u03BD\\u03B1 \\u03B7\\u03C0\\u03B5\\u03B9\\u03C1\\u03C9\\u03C4\\u03B9\\u03BA\\u03AE)", "\\u0393\\u03b5\\u03c1\\u03bc\\u03b1\\u03bd\\u03b9\\u03ba\\u03ac (\\u0393\\u03b5\\u03c1\\u03bc\\u03b1\\u03bd\\u03af\\u03b1, \\u03a3\\u03b5\\u03b9\\u03c1\\u03ac \\u03c4\\u03b1\\u03be\\u03b9\\u03bd\\u03cc\\u03bc\\u03b7\\u03c3\\u03b7\\u03c2=\\u03a3\\u03b5\\u03b9\\u03c1\\u03ac \\u03c4\\u03b1\\u03be\\u03b9\\u03bd\\u03cc\\u03bc\\u03b7\\u03c3\\u03b7\\u03c2 \\u03c4\\u03b7\\u03bb\\u03b5\\u03c6\\u03c9\\u03bd\\u03b9\\u03ba\\u03bf\\u03cd \\u03ba\\u03b1\\u03c4\\u03b1\\u03bb\\u03cc\\u03b3\\u03bf\\u03c5)", "\\u0399\\u03c3\\u03c0\\u03b1\\u03bd\\u03b9\\u03ba\\u03ac (\\u03a3\\u03b5\\u03b9\\u03c1\\u03ac \\u03c4\\u03b1\\u03be\\u03b9\\u03bd\\u03cc\\u03bc\\u03b7\\u03c3\\u03b7\\u03c2=\\u03a0\\u03b1\\u03c1\\u03b1\\u03b4\\u03bf\\u03c3\\u03b9\\u03b1\\u03ba\\u03ae \\u03c3\\u03b5\\u03b9\\u03c1\\u03ac \\u03c4\\u03b1\\u03be\\u03b9\\u03bd\\u03cc\\u03bc\\u03b7\\u03c3\\u03b7\\u03c2)", "\\u0399\\u03b1\\u03c0\\u03c9\\u03bd\\u03b9\\u03ba\\u03ac (\\u0399\\u03b1\\u03c0\\u03c9\\u03bd\\u03af\\u03b1, \\u0397\\u03bc\\u03b5\\u03c1\\u03bf\\u03bb\\u03cc\\u03b3\\u03b9\\u03bf=\\u0399\\u03b1\\u03c0\\u03c9\\u03bd\\u03b9\\u03ba\\u03cc \\u03b7\\u03bc\\u03b5\\u03c1\\u03bf\\u03bb\\u03cc\\u03b3\\u03b9\\u03bf)" @@ -269,9 +273,11 @@ void addLocaleTest(TestNode** root) TESTCASE(TestToLegacyType); TESTCASE(TestBadLocaleIDs); TESTCASE(TestUldnNameVariants); +#if !U_PLATFORM_HAS_WIN32_API TESTCASE(TestGetLanguagesForRegion); TESTCASE(TestGetAppleParent); TESTCASE(TestAppleLocalizationsToUse); +#endif } @@ -6411,7 +6417,7 @@ static const UldnItem en_StdMidLong[] = { { "US", TEST_ULDN_REGION, "United States" }, { "CA", TEST_ULDN_REGION, "Canada" }, { "GB", TEST_ULDN_REGION, "United Kingdom" }, - { "HK", TEST_ULDN_REGION, "Hong Kong (China)" }, + { "HK", TEST_ULDN_REGION, "Hong Kong" }, }; static const UldnItem en_StdMidShrt[] = { @@ -6451,7 +6457,7 @@ static const UldnItem en_DiaMidLong[] = { { "US", TEST_ULDN_REGION, "United States" }, { "CA", TEST_ULDN_REGION, "Canada" }, { "GB", TEST_ULDN_REGION, "United Kingdom" }, - { "HK", TEST_ULDN_REGION, "Hong Kong (China)" }, + { "HK", TEST_ULDN_REGION, "Hong Kong" }, }; static const UldnItem en_DiaMidShrt[] = { @@ -6477,7 +6483,7 @@ static const UldnItem en_DiaMidShrt[] = { static const UldnItem fr_StdMidLong[] = { { "en_US", TEST_ULDN_LOCALE, "anglais (\\u00C9.-U.)" }, { "US", TEST_ULDN_REGION, "\\u00C9tats-Unis" }, - { "HK", TEST_ULDN_REGION, "Hong Kong (Chine)" }, + { "HK", TEST_ULDN_REGION, "Hong Kong" }, }; static const UldnItem fr_StdMidShrt[] = { @@ -6580,6 +6586,7 @@ static void TestUldnNameVariants() { } } +#if !U_PLATFORM_HAS_WIN32_API /* Apple-specific, test for Apple-specific function ualoc_getAppleParent */ static const char* localesAndAppleParent[] = { "en", "root", @@ -7588,4 +7595,4 @@ static void TestAppleLocalizationsToUse() { } } } - +#endif diff --git a/icuSources/test/intltest/loctest.cpp b/icuSources/test/intltest/loctest.cpp index 708c27c5..caee27e9 100644 --- a/icuSources/test/intltest/loctest.cpp +++ b/icuSources/test/intltest/loctest.cpp @@ -48,25 +48,25 @@ static const char* const rawData[33][8] = { // display script (English) { "", "", "", "", "", "", "", "Simplified Han" }, // display country (English) - { "United States", "France", "Spain", "Greece", "Norway", "", "YY", "China" }, + { "United States", "France", "Spain", "Greece", "Norway", "", "YY", "China mainland" }, // display variant (English) { "", "", "", "", "NY", "", "", ""}, // display name (English) // Updated no_NO_NY English display name for new pattern-based algorithm // (part of Euro support). - { "English (United States)", "French (France)", "Catalan (Spain)", "Greek (Greece)", "Norwegian (Norway, NY)", "Italian", "xx (YY)", "Chinese (Simplified, China)" }, + { "English (United States)", "French (France)", "Catalan (Spain)", "Greek (Greece)", "Norwegian (Norway, NY)", "Italian", "xx (YY)", "Chinese (Simplified, China mainland)" }, // display langage (French) { "anglais", "fran\\u00E7ais", "catalan", "grec", "norv\\u00E9gien", "italien", "xx", "chinois" }, // display script (French) { "", "", "", "", "", "", "", "sinogrammes simplifi\\u00E9s" }, // display country (French) - { "\\u00C9tats-Unis", "France", "Espagne", "Gr\\u00E8ce", "Norv\\u00E8ge", "", "YY", "Chine" }, + { "\\u00C9tats-Unis", "France", "Espagne", "Gr\\u00E8ce", "Norv\\u00E8ge", "", "YY", "Chine continentale" }, // display variant (French) { "", "", "", "", "NY", "", "", "" }, // display name (French) //{ "anglais (Etats-Unis)", "francais (France)", "catalan (Espagne)", "grec (Grece)", "norvegien (Norvege,Nynorsk)", "italien", "xx (YY)" }, - { "anglais (\\u00C9tats-Unis)", "fran\\u00E7ais (France)", "catalan (Espagne)", "grec (Gr\\u00E8ce)", "norv\\u00E9gien (Norv\\u00E8ge, NY)", "italien", "xx (YY)", "chinois (simplifi\\u00E9, Chine)" }, + { "anglais (\\u00C9tats-Unis)", "fran\\u00E7ais (France)", "catalan (Espagne)", "grec (Gr\\u00E8ce)", "norv\\u00E9gien (Norv\\u00E8ge, NY)", "italien", "xx (YY)", "chinois (simplifi\\u00E9, Chine continentale)" }, /* display language (Catalan) */ @@ -74,11 +74,11 @@ static const char* const rawData[33][8] = { /* display script (Catalan) */ { "", "", "", "", "", "", "", "han simplificat" }, /* display country (Catalan) */ - { "Estats Units", "Fran\\u00E7a", "Espanya", "Gr\\u00E8cia", "Noruega", "", "", "Xina" }, + { "Estats Units", "Fran\\u00E7a", "Espanya", "Gr\\u00E8cia", "Noruega", "", "", "Xina continental" }, /* display variant (Catalan) */ { "", "", "", "", "NY", "", "" }, /* display name (Catalan) */ - { "angl\\u00E8s (Estats Units)", "franc\\u00E8s (Fran\\u00E7a)", "catal\\u00E0 (Espanya)", "grec (Gr\\u00E8cia)", "noruec (Noruega, NY)", "itali\\u00E0", "", "xin\\u00E8s (simplificat, Xina)" }, + { "angl\\u00E8s (Estats Units)", "franc\\u00E8s (Fran\\u00E7a)", "catal\\u00E0 (Espanya)", "grec (Gr\\u00E8cia)", "noruec (Noruega, NY)", "itali\\u00E0", "", "xin\\u00E8s (simplificat, Xina continental)" }, // display langage (Greek)[actual values listed below] { "\\u0391\\u03b3\\u03b3\\u03bb\\u03b9\\u03ba\\u03ac", @@ -100,7 +100,7 @@ static const char* const rawData[33][8] = { "\\u039d\\u03bf\\u03c1\\u03b2\\u03b7\\u03b3\\u03af\\u03b1", "", "", - "\\u039A\\u03AF\\u03BD\\u03B1" + "\\u039A\\u03AF\\u03BD\\u03B1 \\u03B7\\u03C0\\u03B5\\u03B9\\u03C1\\u03C9\\u03C4\\u03B9\\u03BA\\u03AE" }, // display variant (Greek) { "", "", "", "", "NY", "", "" }, @@ -112,7 +112,7 @@ static const char* const rawData[33][8] = { "\\u039d\\u03bf\\u03c1\\u03b2\\u03b7\\u03b3\\u03b9\\u03ba\\u03ac (\\u039d\\u03bf\\u03c1\\u03b2\\u03b7\\u03b3\\u03af\\u03b1, NY)", "\\u0399\\u03c4\\u03b1\\u03bb\\u03b9\\u03ba\\u03ac", "", - "\\u039A\\u03B9\\u03BD\\u03B5\\u03B6\\u03B9\\u03BA\\u03AC (\\u0391\\u03c0\\u03bb\\u03bf\\u03c0\\u03bf\\u03b9\\u03b7\\u03bc\\u03ad\\u03bd\\u03b1, \\u039A\\u03AF\\u03BD\\u03B1)" + "\\u039A\\u03B9\\u03BD\\u03B5\\u03B6\\u03B9\\u03BA\\u03AC (\\u0391\\u03c0\\u03bb\\u03bf\\u03c0\\u03bf\\u03b9\\u03b7\\u03bc\\u03ad\\u03bd\\u03b1, \\u039A\\u03AF\\u03BD\\u03B1 \\u03B7\\u03C0\\u03B5\\u03B9\\u03C1\\u03C9\\u03C4\\u03B9\\u03BA\\u03AE)" }, // display langage () diff --git a/makefile b/makefile index ac867c0d..6d1483ad 100644 --- a/makefile +++ b/makefile @@ -58,7 +58,9 @@ # Either this should be run indirectly from the VS command prompt via the # BuildICUForAAS script or project, using the instructions there (which build # both 32-bit and 64-bit), or it should be run from within Cygwin using the -# following instructions or equivalent (different steps for 32-bit or 64-bit): +# following instructions or equivalent (different steps for 32-bit or 64-bit +# targets, details may also differ if you have the 32-bit cygwin install vs the +# 64-bit one, i.e. cygwin vs cygwin64): # # 1. From VS command prompt, run vcvarsall.bat to set various environment variables. # For a 32-bit build: @@ -66,7 +68,7 @@ # For a 64-bit build: # > "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 # -# 2. Launch Cygwin, e.g. +# 2. Launch Cygwin, e.g. for the 64-bit cygwin install: # > C:\cygwin64\cygwin.bat # # 3. Within cygwin, cd to the top level of the ICU sources directory, e.g. @@ -113,6 +115,7 @@ ifdef RC_PROJECTSOURCEVERSION RC_ProjectSourceVersion=$(RC_PROJECTSOURCEVERSION) endif endif +$(info # RC_XBS=$(RC_XBS)) $(info # RC_ARCHS=$(RC_ARCHS)) $(info # RC_ProjectName=$(RC_ProjectName)) $(info # RC_ProjectSourceVersion=$(RC_ProjectSourceVersion)) @@ -233,10 +236,10 @@ $(info # SDKPATH=$(SDKPATH)) # ifneq "$(RC_ProjectSourceVersion)" "" ifeq "$(WINDOWS)" "YES" - ICU_BUILD_AA := $(shell echo $(RC_ProjectSourceVersion) | sed -r -e 's/([0-9]+)([0-9]{2})(\.([0-9])([0-9])?(\.([0-9]{1,2}))?)?/\2/') - ICU_BUILD_B1 := $(shell echo $(RC_ProjectSourceVersion) | sed -r -e 's/([0-9]+)([0-9]{2})(\.([0-9])([0-9])?(\.([0-9]{1,2}))?)?/\4/') - ICU_BUILD_B2 := $(shell echo $(RC_ProjectSourceVersion) | sed -r -e 's/([0-9]+)([0-9]{2})(\.([0-9])([0-9])?(\.([0-9]{1,2}))?)?/\5/') - ICU_TRAIN_CODE := $(shell echo $(RC_ProjectSourceVersion) | sed -r -e 's/([0-9]+)([0-9]{2})(\.([0-9])([0-9])?(\.([0-9]{1,2}))?)?/\7/') + ICU_BUILD_AA := $(shell echo $(RC_ProjectSourceVersion) | /usr/bin/sed -r -e 's/([0-9]+)([0-9]{2})(\.([0-9])([0-9])?(\.([0-9]{1,2}))?)?/\2/') + ICU_BUILD_B1 := $(shell echo $(RC_ProjectSourceVersion) | /usr/bin/sed -r -e 's/([0-9]+)([0-9]{2})(\.([0-9])([0-9])?(\.([0-9]{1,2}))?)?/\4/') + ICU_BUILD_B2 := $(shell echo $(RC_ProjectSourceVersion) | /usr/bin/sed -r -e 's/([0-9]+)([0-9]{2})(\.([0-9])([0-9])?(\.([0-9]{1,2}))?)?/\5/') + ICU_TRAIN_CODE := $(shell echo $(RC_ProjectSourceVersion) | /usr/bin/sed -r -e 's/([0-9]+)([0-9]{2})(\.([0-9])([0-9])?(\.([0-9]{1,2}))?)?/\7/') else ICU_BUILD_AA := $(shell echo $(RC_ProjectSourceVersion) | sed -E -e 's/([0-9]+)([0-9]{2})(\.([0-9])([0-9])?(\.([0-9]{1,2}))?)?/\2/') ICU_BUILD_B1 := $(shell echo $(RC_ProjectSourceVersion) | sed -E -e 's/([0-9]+)([0-9]{2})(\.([0-9])([0-9])?(\.([0-9]{1,2}))?)?/\4/') @@ -877,19 +880,19 @@ LIBOVERRIDES=LIBICUDT="-L$(OBJROOT_CURRENT) -l$(LIB_NAME)" \ # options here and also the update the LINK.EXE lines in the TARGETS section below. ifeq "$(WINDOWS)" "YES" ifeq "$(ARCH64)" "YES" - ENV= CFLAGS="/O2 /Ob2 /MD /GF /GS /Zi /nologo /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES" \ - CXXFLAGS="/O2 /Ob2 /MD /GF /GS /Zi /nologo /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES /EHsc /Zc:wchar_t" \ + ENV= CFLAGS="/utf-8 /O2 /Ob2 /MD /GF /GS /Zi /nologo /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES" \ + CXXFLAGS="/utf-8 /O2 /Ob2 /MD /GF /GS /Zi /nologo /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES /EHsc /Zc:wchar_t /DU_SHOW_CPLUSPLUS_API=1" \ LDFLAGS="/NXCOMPAT /DYNAMICBASE /DEBUG /OPT:REF" else - ENV= CFLAGS="/O2 /Ob2 /MD /GF /GS /Zi /nologo /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES" \ - CXXFLAGS="/O2 /Ob2 /MD /GF /GS /Zi /nologo /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES /EHsc /Zc:wchar_t" \ + ENV= CFLAGS="/utf-8 /O2 /Ob2 /MD /GF /GS /Zi /nologo /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES" \ + CXXFLAGS="/utf-8 /O2 /Ob2 /MD /GF /GS /Zi /nologo /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES /EHsc /Zc:wchar_t /DU_SHOW_CPLUSPLUS_API=1" \ LDFLAGS="/NXCOMPAT /SAFESEH /DYNAMICBASE /DEBUG /OPT:REF" endif ENV_CONFIGURE= CPPFLAGS="-DU_DISABLE_RENAMING=1 $(DEFINE_BUILD_LEVEL)" \ - CFLAGS="/O2 /Ob2 /MD /GF /GS /nologo /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES" \ - CXXFLAGS="/O2 /Ob2 /MD /GF /GS /nologo /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES /EHsc /Zc:wchar_t" - ENV_DEBUG= CFLAGS="/O2 /Ob2 /MDd /GF /GS /Zi /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES" \ - CXXFLAGS="/O2 /Ob2 /MDd /GF /GS /Zi /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES /EHsc" \ + CFLAGS="/utf-8 /O2 /Ob2 /MD /GF /GS /nologo /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES" \ + CXXFLAGS="/utf-8 /O2 /Ob2 /MD /GF /GS /nologo /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES /EHsc /Zc:wchar_t /DU_SHOW_CPLUSPLUS_API=1" + ENV_DEBUG= CFLAGS="/utf-8 /O2 /Ob2 /MDd /GF /GS /Zi /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES" \ + CXXFLAGS="/utf-8 /O2 /Ob2 /MDd /GF /GS /Zi /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES /EHsc /DU_SHOW_CPLUSPLUS_API=1" \ LDFLAGS="/DEBUG /DYNAMICBASE" ENV_PROFILE= else ifeq "$(LINUX)" "YES" @@ -1062,12 +1065,13 @@ crossbuildhost icutztoolsforsdk # # The various patchconfig files should assume the current directory is icuSources. # -# Note that if sources have been installed by installsrc (only run as part of buildit -# or B&I builds), then -# $(SRCROOT)/.git is not present, and +# Note that if sources have been installed by installsrc (only run as part of buildit or +# submitproject for Apple platforms, not for Windows/Linux), then +# $(SRCROOT)/installsrcNotRunFlag is not present, and # ADJUST_SOURCES has already have been run. -# Otherwise, if we are doing a local build (e.g. make check, make install), then -# $(SRCROOT)/.git is present, and +# Otherwise, if we are doing a local build (e.g. make check, make install), or if +# sources were submitted using submitproject for non-Apple platforms (Windows/Linux) then +# $(SRCROOT)/installsrcNotRunFlag is present, and # ADJUST_SOURCES has not been run (run it after copying sources to OBJROOT_CURRENT) # @@ -1207,7 +1211,7 @@ crossbuildhost : $(CROSSHOST_OBJROOT)/Makefile icutztoolsforsdk : $(OBJROOT_CURRENT)/Makefile echo "# make icutztoolsforsdk"; (cd $(OBJROOT_CURRENT); \ - if test ! -d $(SRCROOT)/.git ; then patch -N -p1 <$(SRCROOT)/crosshostpatchconfig.txt; fi; \ + if test ! -e $(SRCROOT)/installsrcNotRunFlag ; then patch -N -p1 <$(SRCROOT)/crosshostpatchconfig.txt; fi; \ $(MAKE) $($(ENV)) || exit 1; \ echo '# build' $(TOOLS_DYLIB_FORTOOLS) 'linked against' $(LIB_NAME) ; \ $($(ENV)) $(CXX) -current_version $(ICU_VERS).$(ICU_SUBVERS) -compatibility_version 1 -dynamiclib -dynamic \ @@ -1269,7 +1273,7 @@ endif fi; cp -Rpf $(SRCROOT)/icuSources/* $(OBJROOT_CURRENT)/; (cd $(OBJROOT_CURRENT); \ - if test -d $(SRCROOT)/.git ; then $(ADJUST_SOURCES); fi; \ + if test -e $(SRCROOT)/installsrcNotRunFlag ; then $(ADJUST_SOURCES); fi; \ if test -f $(TZAUXFILESDIR)/metaZones.txt ; then cp -p $(TZAUXFILESDIR)/metaZones.txt data/misc/; fi; \ if test -f $(TZAUXFILESDIR)/timezoneTypes.txt ; then cp -p $(TZAUXFILESDIR)/timezoneTypes.txt data/misc/; fi; \ if test -f $(TZAUXFILESDIR)/windowsZones.txt ; then cp -p $(TZAUXFILESDIR)/windowsZones.txt data/misc/; fi; \ @@ -1300,7 +1304,7 @@ $(CROSSHOST_OBJROOT)/Makefile : fi; cp -Rpf $(SRCROOT)/icuSources/* $(CROSSHOST_OBJROOT); (cd $(CROSSHOST_OBJROOT); \ - if test -d $(SRCROOT)/.git; then $(ADJUST_SOURCES); fi; \ + if test -e $(SRCROOT)/installsrcNotRunFlag; then $(ADJUST_SOURCES); fi; \ if test -f $(TZAUXFILESDIR)/metaZones.txt ; then cp -p $(TZAUXFILESDIR)/metaZones.txt data/misc/; fi; \ if test -f $(TZAUXFILESDIR)/timezoneTypes.txt ; then cp -p $(TZAUXFILESDIR)/timezoneTypes.txt data/misc/; fi; \ if test -f $(TZAUXFILESDIR)/windowsZones.txt ; then cp -p $(TZAUXFILESDIR)/windowsZones.txt data/misc/; fi; \ @@ -1319,8 +1323,8 @@ $(CROSSHOST_OBJROOT)/Makefile : # Since our sources are in icuSources (ignore the ICU subdirectory for now), we wish to # copy them to somewhere else. We tar it to stdout, cd to the appropriate directory, and -# untar from stdin. We then look for all the CVS directories and remove them. We may have -# to remove the .cvsignore files also. +# untar from stdin. +# Do NOT include installsrcNotRunFlag in the list of files to tar up, that defeats the purpose. installsrc : if test ! -d $(SRCROOT); then mkdir $(SRCROOT); fi; @@ -1342,12 +1346,14 @@ endif MKINSTALLDIRS=$(SHELL) $(SRCROOT)/icuSources/mkinstalldirs INSTALL_DATA=${INSTALL} -m 644 -ifeq "$(RC_XBS)" "YES" -installhdrsint : -else +ifneq "$(ICU_FOR_APPLE_PLATFORMS)" "YES" +installhdrsint : $(OBJROOT_CURRENT)/Makefile +else ifneq "$(RC_XBS)" "YES" installhdrsint : $(OBJROOT_CURRENT)/Makefile +else +installhdrsint : endif - (if test -d $(SRCROOT)/.git; then cd $(OBJROOT_CURRENT); else cd $(SRCROOT)/icuSources/; fi; \ + (if test -e $(SRCROOT)/installsrcNotRunFlag; then cd $(OBJROOT_CURRENT); else cd $(SRCROOT)/icuSources/; fi; \ $(MKINSTALLDIRS) $(DSTROOT)/$(PRIVATE_HDR_PREFIX)/include/unicode/; \ for subdir in $(HDR_MAKE_SUBDIR); do \ echo "# Subdir $$subdir"; \ -- 2.45.2