diff --git a/icu4c/source/data/curr/bg.txt b/icu4c/source/data/curr/bg.txt index e7d85f98b21..9621cfa647a 100644 --- a/icu4c/source/data/curr/bg.txt +++ b/icu4c/source/data/curr/bg.txt @@ -1990,5 +1990,5 @@ bg{ one{"{0} {1}"} other{"{0} {1}"} } - Version{"2.0.95.33"} + Version{"2.0.97.18"} } diff --git a/icu4c/source/data/curr/bm.txt b/icu4c/source/data/curr/bm.txt index b0ca26d976a..dd357bd9e8b 100755 --- a/icu4c/source/data/curr/bm.txt +++ b/icu4c/source/data/curr/bm.txt @@ -236,5 +236,5 @@ bm{ "zimbabuwe Dolar", } } - Version{"2.0.92.87"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/curr/cs.txt b/icu4c/source/data/curr/cs.txt index d982824a3cd..897b5713f6f 100644 --- a/icu4c/source/data/curr/cs.txt +++ b/icu4c/source/data/curr/cs.txt @@ -2658,5 +2658,5 @@ cs{ one{"{0} {1}"} other{"{0} {1}"} } - Version{"2.0.96.24"} + Version{"2.0.97.50"} } diff --git a/icu4c/source/data/curr/de.txt b/icu4c/source/data/curr/de.txt index b60c2fd2211..6659e11986c 100644 --- a/icu4c/source/data/curr/de.txt +++ b/icu4c/source/data/curr/de.txt @@ -2206,5 +2206,5 @@ de{ one{"{0} {1}"} other{"{0} {1}"} } - Version{"2.0.96.40"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/curr/el.txt b/icu4c/source/data/curr/el.txt index d4a28a7bc26..127d2b816e8 100644 --- a/icu4c/source/data/curr/el.txt +++ b/icu4c/source/data/curr/el.txt @@ -2135,5 +2135,5 @@ el{ one{"{0} {1}"} other{"{0} {1}"} } - Version{"2.0.95.37"} + Version{"2.0.97.50"} } diff --git a/icu4c/source/data/curr/en.txt b/icu4c/source/data/curr/en.txt index c3fd4e7a1a2..bfd2b6e477c 100644 --- a/icu4c/source/data/curr/en.txt +++ b/icu4c/source/data/curr/en.txt @@ -2394,5 +2394,5 @@ en{ one{"{0} {1}"} other{"{0} {1}"} } - Version{"2.0.96.5"} + Version{"2.0.97.54"} } diff --git a/icu4c/source/data/curr/es.txt b/icu4c/source/data/curr/es.txt index 4244f30e9ef..db10c7af2ba 100644 --- a/icu4c/source/data/curr/es.txt +++ b/icu4c/source/data/curr/es.txt @@ -2090,5 +2090,5 @@ es{ one{"{0} {1}"} other{"{0} {1}"} } - Version{"2.0.96.40"} + Version{"2.0.97.9"} } diff --git a/icu4c/source/data/curr/ff.txt b/icu4c/source/data/curr/ff.txt index ff5e3d4c36f..3e4fb23edb8 100755 --- a/icu4c/source/data/curr/ff.txt +++ b/icu4c/source/data/curr/ff.txt @@ -232,5 +232,5 @@ ff{ "Dolaar Simbaabuwe", } } - Version{"2.0.92.87"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/curr/fi.txt b/icu4c/source/data/curr/fi.txt index 9aa3754ddb7..bf243b8575a 100644 --- a/icu4c/source/data/curr/fi.txt +++ b/icu4c/source/data/curr/fi.txt @@ -2370,5 +2370,5 @@ fi{ one{"{0} {1}"} other{"{0} {1}"} } - Version{"2.0.95.33"} + Version{"2.0.97.50"} } diff --git a/icu4c/source/data/curr/fr.txt b/icu4c/source/data/curr/fr.txt index 90749c7b7ff..cd52fa72e93 100644 --- a/icu4c/source/data/curr/fr.txt +++ b/icu4c/source/data/curr/fr.txt @@ -2222,5 +2222,5 @@ fr{ one{"{0} {1}"} other{"{0} {1}"} } - Version{"2.0.96.40"} + Version{"2.0.97.9"} } diff --git a/icu4c/source/data/curr/gl.txt b/icu4c/source/data/curr/gl.txt index 66a86816c86..c067f2d91d7 100644 --- a/icu4c/source/data/curr/gl.txt +++ b/icu4c/source/data/curr/gl.txt @@ -1083,5 +1083,5 @@ gl{ one{"{0} {1}"} other{"{0} {1}"} } - Version{"2.0.96.24"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/curr/gsw.txt b/icu4c/source/data/curr/gsw.txt index 60806005881..50655941c77 100644 --- a/icu4c/source/data/curr/gsw.txt +++ b/icu4c/source/data/curr/gsw.txt @@ -2138,5 +2138,5 @@ gsw{ one{"{0} {1}"} other{"{0} {1}"} } - Version{"2.0.95.33"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/curr/he.txt b/icu4c/source/data/curr/he.txt index 5d4eaa2872e..f462dc66854 100644 --- a/icu4c/source/data/curr/he.txt +++ b/icu4c/source/data/curr/he.txt @@ -1022,5 +1022,5 @@ he{ other{"{0} {1}"} two{"{0} {1}"} } - Version{"2.0.95.33"} + Version{"2.0.97.17"} } diff --git a/icu4c/source/data/curr/hi.txt b/icu4c/source/data/curr/hi.txt index 56b91bf2bbd..5cdfe1f616f 100644 --- a/icu4c/source/data/curr/hi.txt +++ b/icu4c/source/data/curr/hi.txt @@ -1366,5 +1366,5 @@ hi{ one{"{0} {1}"} other{"{0} {1}"} } - Version{"2.0.95.34"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/curr/hr.txt b/icu4c/source/data/curr/hr.txt index 47d592f79d6..c0b9ed0b47d 100644 --- a/icu4c/source/data/curr/hr.txt +++ b/icu4c/source/data/curr/hr.txt @@ -2525,5 +2525,5 @@ hr{ one{"{0} {1}"} other{"{0} {1}"} } - Version{"2.0.95.37"} + Version{"2.0.97.50"} } diff --git a/icu4c/source/data/curr/id.txt b/icu4c/source/data/curr/id.txt index b4a441eae03..4995be76c3b 100644 --- a/icu4c/source/data/curr/id.txt +++ b/icu4c/source/data/curr/id.txt @@ -1642,5 +1642,5 @@ id{ CurrencyUnitPatterns{ other{"{0} {1}"} } - Version{"2.0.95.60"} + Version{"2.0.97.50"} } diff --git a/icu4c/source/data/curr/kab.txt b/icu4c/source/data/curr/kab.txt index 7a22e4bee9d..ef1a5f7874e 100755 --- a/icu4c/source/data/curr/kab.txt +++ b/icu4c/source/data/curr/kab.txt @@ -232,5 +232,5 @@ kab{ "Adular Azimbabwi", } } - Version{"2.0.92.87"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/curr/khq.txt b/icu4c/source/data/curr/khq.txt index 2cb6d1335ab..ccc4c0a65c8 100755 --- a/icu4c/source/data/curr/khq.txt +++ b/icu4c/source/data/curr/khq.txt @@ -236,5 +236,5 @@ khq{ "Zimbabwe Dollar", } } - Version{"2.0.92.87"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/curr/lt.txt b/icu4c/source/data/curr/lt.txt index cca64455228..6952e7a2b8c 100644 --- a/icu4c/source/data/curr/lt.txt +++ b/icu4c/source/data/curr/lt.txt @@ -2954,5 +2954,5 @@ lt{ one{"{0} {1}"} other{"{0} {1}"} } - Version{"2.0.95.38"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/curr/mfe.txt b/icu4c/source/data/curr/mfe.txt index 7d3d0e7adf9..d09c49b21ea 100755 --- a/icu4c/source/data/curr/mfe.txt +++ b/icu4c/source/data/curr/mfe.txt @@ -236,5 +236,5 @@ mfe{ "dolar zimbawe", } } - Version{"2.0.92.75"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/curr/mg.txt b/icu4c/source/data/curr/mg.txt index d61dd869cb9..83ea38d2f00 100755 --- a/icu4c/source/data/curr/mg.txt +++ b/icu4c/source/data/curr/mg.txt @@ -236,5 +236,5 @@ mg{ "Dôlara Zimbaboeanina", } } - Version{"2.0.92.87"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/curr/mk.txt b/icu4c/source/data/curr/mk.txt index e28f4b72af8..aaf81250439 100644 --- a/icu4c/source/data/curr/mk.txt +++ b/icu4c/source/data/curr/mk.txt @@ -1530,5 +1530,5 @@ mk{ one{"{0} {1}"} other{"{0} {1}"} } - Version{"2.0.95.33"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/curr/nb.txt b/icu4c/source/data/curr/nb.txt index 989b9cf6551..11eab613c81 100644 --- a/icu4c/source/data/curr/nb.txt +++ b/icu4c/source/data/curr/nb.txt @@ -2370,5 +2370,5 @@ nb{ one{"{0} {1}"} other{"{0} {1}"} } - Version{"2.0.95.33"} + Version{"2.0.97.50"} } diff --git a/icu4c/source/data/curr/nl.txt b/icu4c/source/data/curr/nl.txt index cc7c40df1b4..f26f2b5c419 100644 --- a/icu4c/source/data/curr/nl.txt +++ b/icu4c/source/data/curr/nl.txt @@ -2354,5 +2354,5 @@ nl{ one{"{0} {1}"} other{"{0} {1}"} } - Version{"2.0.95.37"} + Version{"2.0.97.50"} } diff --git a/icu4c/source/data/curr/nmg.txt b/icu4c/source/data/curr/nmg.txt index 66ab0744ad4..b68176b2869 100755 --- a/icu4c/source/data/curr/nmg.txt +++ b/icu4c/source/data/curr/nmg.txt @@ -236,5 +236,5 @@ nmg{ "Dɔ́llɔ Zimbabwǝ (1980–2008)", } } - Version{"2.0.92.87"} + Version{"2.0.97.39"} } diff --git a/icu4c/source/data/curr/pl.txt b/icu4c/source/data/curr/pl.txt index a2889ae8ad0..5fc2bf770ad 100644 --- a/icu4c/source/data/curr/pl.txt +++ b/icu4c/source/data/curr/pl.txt @@ -2184,5 +2184,5 @@ pl{ one{"{0} {1}"} other{"{0} {1}"} } - Version{"2.0.95.37"} + Version{"2.0.97.50"} } diff --git a/icu4c/source/data/curr/pt.txt b/icu4c/source/data/curr/pt.txt index 641dd8322e0..1105e532b15 100644 --- a/icu4c/source/data/curr/pt.txt +++ b/icu4c/source/data/curr/pt.txt @@ -2370,5 +2370,5 @@ pt{ one{"{0} {1}"} other{"{0} {1}"} } - Version{"2.0.95.37"} + Version{"2.0.97.50"} } diff --git a/icu4c/source/data/curr/rm.txt b/icu4c/source/data/curr/rm.txt index 7d4c1b46499..cf7161ea773 100755 --- a/icu4c/source/data/curr/rm.txt +++ b/icu4c/source/data/curr/rm.txt @@ -1164,5 +1164,5 @@ rm{ one{"{0} {1}"} other{"{0} {1}"} } - Version{"2.0.95.33"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/curr/root.txt b/icu4c/source/data/curr/root.txt index ed249074a7c..c631db12d3b 100644 --- a/icu4c/source/data/curr/root.txt +++ b/icu4c/source/data/curr/root.txt @@ -99,7 +99,7 @@ root{ CurrencyUnitPatterns{ other{"{0} {1}"} } - Version{"2.0.95.34"} + Version{"2.0.97.37"} currencySpacing{ afterCurrency{ currencyMatch{"[:^S:]"} diff --git a/icu4c/source/data/curr/ru.txt b/icu4c/source/data/curr/ru.txt index 76e19519c71..074748527b6 100644 --- a/icu4c/source/data/curr/ru.txt +++ b/icu4c/source/data/curr/ru.txt @@ -1110,820 +1110,983 @@ ru{ } CurrencyPlurals{ ADP{ + few{"андоррские песеты"} many{"андоррская песета"} one{"андоррская песета"} other{"андоррских песет"} } AED{ + few{"дирхама (ОАЭ)"} many{"дирхамов (ОАЭ)"} one{"дирхам (ОАЭ)"} other{"дирхама (ОАЭ)"} } AFN{ + few{"афганских афгани"} many{"афганских афгани"} one{"афганский афгани"} other{"афганского афгани"} } ALL{ + few{"албанских лека"} many{"албанских леков"} one{"албанский лек"} other{"албанских леков"} } AMD{ + few{"армянских драма"} many{"армянских драмов"} one{"армянский драм"} other{"армянских драмов"} } ANG{ + few{"нидерландских антильских гульдена"} many{"нидерландских антильских гульденов"} one{"нидерландский антильский гульден"} other{"идерландского антильского гульдена"} } AOA{ + few{"ангольские кванзы"} many{"ангольских кванз"} one{"ангольская кванза"} other{"ангольской кванзы"} } AOK{ + few{"ангольские кванзы (1977-1991)"} many{"ангольских кванз (1977–1991)"} one{"ангольских кванз (1977–1991)"} other{"ангольских кванз (1977–1991)"} } AOR{ + few{"ангольские кванзы реюстадо (1995-1999)"} many{"ангольских кванз реюстадо (1995–1999)"} one{"ангольских кванз реюстадо (1995–1999)"} other{"ангольских кванз реюстадо (1995–1999)"} } ARS{ + few{"аргентинских песо"} many{"аргентинских песо"} one{"аргентинское песо"} other{"аргентинского песо"} } AUD{ + few{"австралийских доллара"} many{"австралийских долларов"} one{"австралийский доллар"} other{"австралийского доллара"} } AWG{ + few{"арубанских флорина"} many{"арубанских флоринов"} one{"арубанский флорин"} other{"арубанского флорина"} } AZN{ + few{"азербайджанских маната"} many{"азербайджанских манатов"} one{"азербайджанский манат"} other{"азербайджанского маната"} } BAM{ + few{"боснийские конвертируемые марки"} many{"боснийских конвертируемых марок"} one{"боснийская конвертируемая марка"} other{"боснийской конвертируемой марки"} } BBD{ + few{"барбадосских доллара"} many{"барбадосских долларов"} one{"барбадосский доллар"} other{"барбадосского доллара"} } BDT{ + few{"бангладешских таки"} many{"бангладешских так"} one{"бангладешская така"} other{"бангладешской таки"} } BGN{ + few{"болгарских лева"} many{"болгарских левов"} one{"болгарский лев"} other{"болгарского лева"} } BHD{ + few{"бахрейнских динара"} many{"бахрейнских динаров"} one{"бахрейнский динар"} other{"бахрейнского динара"} } BIF{ + few{"бурундийских франка"} many{"бурундийских франков"} one{"бурундийский франк"} other{"бурундийского франка"} } BMD{ + few{"бермудских доллара"} many{"бермудских долларов"} one{"бермудский доллар"} other{"бермудского доллара"} } BND{ + few{"брунейских доллара"} many{"брунейских долларов"} one{"брунейский доллар"} other{"брунейского доллара"} } BOB{ + few{"боливиано"} many{"боливиано"} one{"боливиано"} other{"боливиано"} } BRL{ + few{"бразильских реала"} many{"бразильских реалов"} one{"бразильский реал"} other{"бразильского реала"} } BSD{ + few{"багамских доллара"} many{"багамских долларов"} one{"багамский доллар"} other{"багамского доллара"} } BTN{ + few{"нгултрума"} many{"нгултрумов"} one{"нгултрум"} other{"нгултрума"} } BWP{ + few{"ботсванских пулы"} many{"ботсванских пул"} one{"ботсванская пула"} other{"ботсванской пулы"} } BYR{ + few{"белорусских рубля"} many{"белорусских рублей"} one{"белорусский рубль"} other{"белорусского рубля"} } BZD{ + few{"белизских доллара"} many{"белизских долларов"} one{"белизский доллар"} other{"белизского доллара"} } CAD{ + few{"канадских доллара"} many{"канадских долларов"} one{"канадский доллар"} other{"канадского доллара"} } CDF{ + few{"конголезских франка"} many{"конголезских франков"} one{"конголезский франк"} other{"конголезского франка"} } CHF{ + few{"швейцарских франка"} many{"швейцарских франков"} one{"швейцарский франк"} other{"швейцарского франка"} } CLP{ + few{"чилийских песо"} many{"чилийских песо"} one{"чилийское песо"} other{"чилийского песо"} } CNY{ + few{"китайских юаня"} many{"китайских юаней"} one{"китайский юань"} other{"китайского юаня"} } COP{ + few{"колумбийских песо"} many{"колумбийских песо"} one{"колумбийское песо"} other{"колумбийского песо"} } CRC{ + few{"костариканских колона"} many{"костариканских колонов"} one{"костариканский колон"} other{"костариканского колона"} } CUC{ + few{"кубинских конвертируемых песо"} many{"кубинских конвертируемых песо"} one{"кубинское конвертируемое песо"} other{"кубинского конвертируемого песо"} } CUP{ + few{"кубинских песо"} many{"кубинских песо"} one{"кубинское песо"} other{"кубинского песо"} } CVE{ + few{"эскудо Кабо-Верде"} many{"эскудо Кабо-Верде"} one{"эскудо Кабо-Верде"} other{"эскудо Кабо-Верде"} } CZK{ + few{"чешские кроны"} many{"чешских крон"} one{"чешская крона"} other{"чешской кроны"} } DJF{ + few{"франка Джибути"} many{"франков Джибути"} one{"франк Джибути"} other{"франка Джибути"} } DKK{ + few{"датские кроны"} many{"датских крон"} one{"датская крона"} other{"датской кроны"} } DOP{ + few{"доминиканских песо"} many{"доминиканских песо"} one{"доминиканское песо"} other{"доминиканского песо"} } DZD{ + few{"алжирских динара"} many{"алжирских динаров"} one{"алжирский динар"} other{"алжирского динара"} } EGP{ + few{"египетских фунта"} many{"египетских фунтов"} one{"египетский фунт"} other{"египетского фунта"} } ERN{ + few{"эритрейские накфы"} many{"эритрейских накф"} one{"эритрейская накфа"} other{"эритрейской накфы"} } ETB{ + few{"эфиопских быра"} many{"эфиопских быров"} one{"эфиопский быр"} other{"эфиопского быра"} } EUR{ + few{"евро"} many{"евро"} one{"евро"} other{"евро"} } FJD{ + few{"доллара Фиджи"} many{"долларов Фиджи"} one{"доллар Фиджи"} other{"доллара Фиджи"} } FKP{ + few{"фунта Фолклендских островов"} many{"фунтов Фолклендских островов"} one{"фунт Фолклендских островов"} other{"фунта Фолклендских островов"} } GBP{ + few{"английских фунта стерлингов"} many{"английских фунтов стерлингов"} one{"английский фунт стерлингов"} other{"английского фунта стерлингов"} } GEL{ + few{"грузинских лари"} many{"грузинских лари"} one{"грузинский лари"} other{"грузинского лари"} } GHS{ + few{"ганских седи"} many{"ганских седи"} one{"ганский седи"} other{"ганского седи"} } GIP{ + few{"гибралтарских фунта"} many{"гибралтарских фунтов"} one{"гибралтарский фунт"} other{"гибралтарского фунта"} } GMD{ + few{"гамбийских даласи"} many{"гамбийских даласи"} one{"гамбийский даласи"} other{"гамбийского даласи"} } GNF{ + few{"гвинейских франка"} many{"гвинейских франков"} one{"гвинейский франк"} other{"гвинейского франка"} } GTQ{ + few{"гватемальских кетсаля"} many{"гватемальских кетсалей"} one{"гватемальский кетсаль"} other{"гватемальского кетсаля"} } GYD{ + few{"гайанских доллара"} many{"гайанских долларов"} one{"гайанский доллар"} other{"гайанского доллара"} } HKD{ + few{"гонконгских доллара"} many{"гонконгских долларов"} one{"гонконгский доллар"} other{"гонконгского доллара"} } HNL{ + few{"гондурасские лемпиры"} many{"гондурасских лемпир"} one{"гондурасская лемпира"} other{"гондурасской лемпиры"} } HRK{ + few{"хорватских куны"} many{"хорватских кун"} one{"хорватская куна"} other{"хорватской куны"} } HTG{ + few{"гаитянских гурда"} many{"гаитянских гурдов"} one{"гаитянский гурд"} other{"гаитянского гурда"} } HUF{ + few{"венгерских форинта"} many{"венгерских форинтов"} one{"венгерский форинт"} other{"венгерского форинта"} } IDR{ + few{"индонезийские рупии"} many{"индонезийских рупий"} one{"индонезийская рупия"} other{"индонезийской рупии"} } ILS{ + few{"новых израильских шекеля"} many{"новых израильских шекелей"} one{"новый израильский шекель"} other{"нового израильского шекеля"} } INR{ + few{"индийские рупии"} many{"индийских рупий"} one{"индийская рупия"} other{"индийской рупии"} } IQD{ + few{"иракских динара"} many{"иракских динаров"} one{"иракский динар"} other{"иракского динара"} } IRR{ + few{"иранских риала"} many{"иранских риалов"} one{"иранский риал"} other{"иранского риала"} } ISK{ + few{"исландские кроны"} many{"исландских крон"} one{"исландская крона"} other{"исландской кроны"} } JMD{ + few{"ямайских доллара"} many{"ямайских долларов"} one{"ямайский доллар"} other{"ямайского доллара"} } JOD{ + few{"иорданских динара"} many{"иорданских динаров"} one{"иорданский динар"} other{"иорданского динара"} } JPY{ + few{"японские иены"} many{"японских иен"} one{"японская иена"} other{"японской иены"} } KES{ + few{"кенийских шиллинга"} many{"кенийских шиллингов"} one{"кенийский шиллинг"} other{"кенийского шиллинга"} } KGS{ + few{"киргизских сома"} many{"киргизских сома"} one{"киргизский сом"} other{"киргизского сома"} } KHR{ + few{"камбоджийских риеля"} many{"камбоджийских риелей"} one{"камбоджийский риель"} other{"камбоджийского риеля"} } KMF{ + few{"франка Коморских островов"} many{"франков Коморских островов"} one{"франк Коморских островов"} other{"франка Коморских островов"} } KPW{ + few{"северокорейские воны"} many{"северокорейских вон"} one{"северокорейская вона"} other{"северокорейской воны"} } KRW{ + few{"южнокорейские воны"} many{"южнокорейских вон"} one{"южнокорейская вона"} other{"южнокорейской воны"} } KWD{ + few{"кувейтских динара"} many{"кувейтских динаров"} one{"кувейтский динар"} other{"кувейтского динара"} } KYD{ + few{"доллара Каймановых островов"} many{"долларов Каймановых островов"} one{"доллар Каймановых островов"} other{"доллара Каймановых островов"} } KZT{ + few{"казахских тенге"} many{"казахских тенге"} one{"казахский тенге"} other{"казахского тенге"} } LAK{ + few{"лаосских кипа"} many{"лаосских кипов"} one{"лаосский кип"} other{"лаосского кипа"} } LBP{ + few{"ливанских фунта"} many{"ливанских фунтов"} one{"ливанский фунт"} other{"ливанского фунта"} } LKR{ + few{"шри-ланкийские рупии"} many{"шри-ланкийских рупий"} one{"шри-ланкийская рупия"} other{"шри-ланкийской рупии"} } LRD{ + few{"либерийских доллара"} many{"либерийских долларов"} one{"либерийский доллар"} other{"либерийского доллара"} } LTL{ + few{"литовских лита"} many{"литовских литов"} one{"литовский лит"} other{"литовского лита"} } LVL{ + few{"латвийских лата"} many{"латвийских латов"} one{"латвийский лат"} other{"латвийского лата"} } LYD{ + few{"ливийских динара"} many{"ливийских динаров"} one{"ливийский динар"} other{"ливийского динара"} } MAD{ + few{"марокканских дирхама"} many{"марокканских дирхамов"} one{"марокканский дирхам"} other{"марокканского дирхама"} } MDL{ + few{"молдавских лея"} many{"молдавских леев"} one{"молдавский лей"} other{"молдавского лея"} } MGA{ + few{"малагасийских ариари"} many{"малагасийских ариари"} one{"малагасийский ариари"} other{"малагасийского ариари"} } MKD{ + few{"македонских динара"} many{"македонских динаров"} one{"македонский динар"} other{"македонского динара"} } MMK{ + few{"мьянманских чата"} many{"мьянманских чатов"} one{"мьянманский чат"} other{"мьянманского чата"} } MNT{ + few{"монгольских тугрика"} many{"монгольских тугриков"} one{"монгольский тугрик"} other{"монгольского тугрика"} } MOP{ + few{"патаки Макао"} many{"патак Макао"} one{"патака Макао"} other{"патаки Макао"} } MRO{ + few{"мавританские угии"} many{"мавританских угий"} one{"мавританская угия"} other{"мавританской угии"} } MUR{ + few{"маврикийские рупии"} many{"маврикийских рупий"} one{"маврикийская рупия"} other{"маврикийской рупии"} } MVR{ + few{"мальдивские руфии"} many{"мальдивских руфий"} one{"мальдивская руфия"} other{"мальдивской руфии"} } MWK{ + few{"малавийские квачи"} many{"малавийских квач"} one{"малавийская квача"} other{"малавийской квачи"} } MXN{ + few{"мексиканских песо"} many{"мексиканских песо"} one{"мексиканское песо"} other{"мексиканского песо"} } MYR{ + few{"малайзийских ринггита"} many{"малайзийских ринггитов"} one{"малайзийский ринггит"} other{"малайзийского ринггита"} } MZN{ + few{"мозамбикских метикала"} many{"мозамбикских метикалов"} one{"мозамбикский метикал"} other{"мозамбикского метикала"} } NAD{ + few{"доллара Намибии"} many{"долларов Намибии"} one{"доллар Намибии"} other{"доллара Намибии"} } NGN{ + few{"нигерийские найры"} many{"нигерийских найр"} one{"нигерийская найра"} other{"нигерийской найры"} } NIO{ + few{"никарагуанские кордобы"} many{"никарагуанских кордоб"} one{"никарагуанская кордоба"} other{"никарагуанской кордобы"} } NOK{ + few{"норвежские кроны"} many{"норвежских крон"} one{"норвежская крона"} other{"норвежской кроны"} } NPR{ + few{"непальские рупии"} many{"непальских рупий"} one{"непальская рупия"} other{"непальской рупии"} } NZD{ + few{"новозеландских доллара"} many{"новозеландских долларов"} one{"новозеландский доллар"} other{"новозеландского доллара"} } OMR{ + few{"оманских риала"} many{"оманских риалов"} one{"оманский риал"} other{"оманского риала"} } PAB{ + few{"панамских бальбоа"} many{"панамских бальбоа"} one{"панамский бальбоа"} other{"панамского бальбоа"} } PEN{ + few{"перуанских новых соля"} many{"перуанских новый солей"} one{"перуанский новый соль"} other{"перуанского нового соля"} } PGK{ + few{"кины"} many{"кин"} one{"кина"} other{"кины"} } PHP{ + few{"филиппинских песо"} many{"филиппинских песо"} one{"филиппинское песо"} other{"филиппинского песо"} } PKR{ + few{"пакистанские рупии"} many{"пакистанских рупий"} one{"пакистанская рупия"} other{"пакистанской рупии"} } PLN{ + few{"польских злотых"} many{"польских злотых"} one{"польский злотый"} other{"польского злотого"} } PYG{ + few{"парагвайских гуарани"} many{"парагвайских гуарани"} one{"парагвайский гуарани"} other{"парагвайского гуарани"} } QAR{ + few{"катарских риала"} many{"катарских риалов"} one{"катарский риал"} other{"катарского риала"} } RON{ + few{"румынских лея"} many{"румынских леев"} one{"румынский лей"} other{"румынского лея"} } RSD{ + few{"сербских динара"} many{"сербских динаров"} one{"сербский динар"} other{"сербского динара"} } RUB{ + few{"российских рубля"} many{"российских рублей"} one{"российский рубль"} other{"российского рубля"} } RWF{ + few{"франка Руанды"} many{"франков Руанды"} one{"франк Руанды"} other{"франка Руанды"} } SAR{ + few{"саудовских риала"} many{"саудовских риалов"} one{"саудовский риал"} other{"саудовского риала"} } SBD{ + few{"доллара Соломоновых островов"} many{"долларов Соломоновых островов"} one{"доллар Соломоновых островов"} other{"доллара Соломоновых островов"} } SCR{ + few{"сейшельские рупии"} many{"сейшельских рупий"} one{"сейшельская рупия"} other{"сейшельской рупии"} } SDG{ + few{"суданских фунта"} many{"суданских фунтов"} one{"суданский фунт"} other{"суданского фунта"} } SEK{ + few{"шведские кроны"} many{"шведских крон"} one{"шведская крона"} other{"шведской кроны"} } SGD{ + few{"сингапурских доллара"} many{"сингапурских долларов"} one{"сингапурский доллар"} other{"сингапурского доллара"} } SHP{ + few{"фунта острова Святой Елены"} many{"фунтов острова Святой Елены"} one{"фунт острова Святой Елены"} other{"фунта острова Святой Елены"} } SLL{ + few{"леоне"} many{"леоне"} one{"леоне"} other{"леоне"} } SOS{ + few{"сомалийских шиллинга"} many{"сомалийских шиллингов"} one{"сомалийский шиллинг"} other{"сомалийского шиллинга"} } SRD{ + few{"суринамских доллара"} many{"суринамских долларов"} one{"суринамский доллар"} other{"суринамского доллара"} } SSP{ + few{"южносуданских фунта"} many{"южносуданских фунтов"} one{"Южносуданский фунт"} other{"Южносуданский фунт"} } STD{ + few{"добры Сан-Томе и Принсипи"} many{"добр Сан-Томе и Принсипи"} one{"добра Сан-Томе и Принсипи"} other{"добры Сан-Томе и Принсипи"} } SYP{ + few{"сирийских фунта"} many{"сирийских фунтов"} one{"сирийский фунт"} other{"сирийского фунта"} } SZL{ + few{"свазилендских эмалангени"} many{"свазилендских лилангени"} one{"свазилендский лилангени"} other{"свазилендского лилангени"} } THB{ + few{"таиландских бата"} many{"таиландских батов"} one{"таиландский бат"} other{"таиландского бата"} } TJS{ + few{"таджикских сомони"} many{"таджикских сомони"} one{"таджикский сомони"} other{"таджикского сомони"} } TMT{ + few{"туркменских новых маната"} many{"туркменских новых манатов"} one{"туркменский новый манат"} other{"туркменского нового маната"} } TND{ + few{"тунисских динара"} many{"тунисских динаров"} one{"тунисский динар"} other{"тунисского динара"} } TOP{ + few{"паанги"} many{"паанг"} one{"паанга"} other{"паанга"} } TRL{ + few{"турецкие лиры"} many{"турецких лир"} one{"туркцкая лира"} other{"турецких лир"} } TRY{ + few{"новые турецкие лиры"} many{"новых турецких лир"} one{"новая турецкая лира"} other{"новой турецкой лиры"} } TTD{ + few{"доллара Тринидада и Тобаго"} many{"долларов Тринидада и Тобаго"} one{"доллар Тринидада и Тобаго"} other{"доллара Тринидада и Тобаго"} } TWD{ + few{"новых тайваньских доллара"} many{"новых тайваньских долларов"} one{"новый тайваньский доллар"} other{"нового тайваньского доллара"} } TZS{ + few{"танзанийских шиллинга"} many{"танзанийских шиллингов"} one{"танзанийский шиллинг"} other{"танзанийского шиллинга"} } UAH{ + few{"украинские гривны"} many{"украинских гривен"} one{"украинская гривна"} other{"украинской гривны"} } UGX{ + few{"угандийских шиллинга"} many{"угандийских шиллингов"} one{"угандийский шиллинг"} other{"угандийского шиллинга"} } USD{ + few{"доллара США"} many{"долларов США"} one{"доллар США"} other{"доллара США"} } UYU{ + few{"уругвайских песо"} many{"уругвайских песо"} one{"уругвайское песо"} other{"уругвайского песо"} } UZS{ + few{"узбекских сума"} many{"узбекских сумов"} one{"узбекский сум"} other{"узбекского сума"} } VEF{ + few{"венесуэльских боливара"} many{"венесуэльских боливара"} one{"венесуэльский боливар"} other{"венесуэльского боливара"} } VND{ + few{"вьетнамских донга"} many{"вьетнамских донгов"} one{"вьетнамский донг"} other{"вьетнамского донга"} } VUV{ + few{"вату"} many{"вату"} one{"вату"} other{"вату"} } WST{ + few{"талы"} many{"тал"} one{"тала"} other{"талы"} } XAF{ + few{"франка КФА ВЕАС"} many{"франков КФА ВЕАС"} one{"франк КФА ВЕАС"} other{"франка КФА ВЕАС"} } XCD{ + few{"восточно-карибских доллара"} many{"восточно-карибских доллара"} one{"восточно-карибский доллар"} other{"восточно-карибского доллара"} } XOF{ + few{"франка КФА ВСЕА"} many{"франков КФА ВСЕА"} one{"франк КФА ВСЕА"} other{"франка КФА ВСЕА"} } XPF{ + few{"французских тихоокеанских франка"} many{"франков КФП"} one{"французский тихоокеанский франк"} other{"французского тихоокеанского франка"} } XXX{ + few{"Неизвестная или недействительная валюта"} many{"Неизвестная или недействительная валюта"} one{"Неизвестная или недействительная валюта"} other{"Неизвестная или недействительная валюта"} } YER{ + few{"йеменских риала"} many{"йеменских риалов"} one{"йеменский риал"} other{"йеменского риала"} } ZAR{ + few{"южноафриканских рэнда"} many{"южноафриканских рэндов"} one{"южноафриканский рэнд"} other{"южноафриканского рэнда"} } ZMK{ + few{"замбийские квачи (1968-2012)"} many{"замбийских квач (1968–2012)"} one{"замбийская квача (1968–2012)"} other{"замбийской квачи (1968–2012)"} } ZMW{ + few{"замбийские квачи"} many{"замбийских квач"} one{"замбийская квача"} other{"замбийской квачи"} } } CurrencyUnitPatterns{ + few{"{0} {1}"} many{"{0} {1}"} one{"{0} {1}"} other{"{0} {1}"} } - Version{"2.0.95.59"} + Version{"2.0.97.50"} } diff --git a/icu4c/source/data/curr/ses.txt b/icu4c/source/data/curr/ses.txt index 51b734e3efd..7f2c8ae5554 100755 --- a/icu4c/source/data/curr/ses.txt +++ b/icu4c/source/data/curr/ses.txt @@ -236,5 +236,5 @@ ses{ "Zimbabwe Dollar", } } - Version{"2.0.92.87"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/curr/sg.txt b/icu4c/source/data/curr/sg.txt index 5c033b42ea2..464760c224f 100755 --- a/icu4c/source/data/curr/sg.txt +++ b/icu4c/source/data/curr/sg.txt @@ -232,5 +232,5 @@ sg{ "dolära tî Zimbäbwe", } } - Version{"2.0.92.87"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/curr/shi.txt b/icu4c/source/data/curr/shi.txt index fcdaa07a977..70a1c31507b 100755 --- a/icu4c/source/data/curr/shi.txt +++ b/icu4c/source/data/curr/shi.txt @@ -236,5 +236,5 @@ shi{ "ⴰⴷⵓⵍⴰⵔ ⵏ ⵣⵉⵎⴱⴰⴱⵡⵉ", } } - Version{"2.0.92.87"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/curr/shi_Latn.txt b/icu4c/source/data/curr/shi_Latn.txt index 848dab59674..9c0667a7af2 100755 --- a/icu4c/source/data/curr/shi_Latn.txt +++ b/icu4c/source/data/curr/shi_Latn.txt @@ -237,5 +237,5 @@ shi_Latn{ "adular n zimbabwi", } } - Version{"2.0.92.87"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/curr/sq.txt b/icu4c/source/data/curr/sq.txt index 8ef1158aafd..a2f0419345c 100644 --- a/icu4c/source/data/curr/sq.txt +++ b/icu4c/source/data/curr/sq.txt @@ -1274,5 +1274,5 @@ sq{ one{"{0} {1}"} other{"{0} {1}"} } - Version{"2.0.92.87"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/curr/sr.txt b/icu4c/source/data/curr/sr.txt index 46d1c256bef..b8bd23e6f73 100644 --- a/icu4c/source/data/curr/sr.txt +++ b/icu4c/source/data/curr/sr.txt @@ -2521,5 +2521,5 @@ sr{ one{"{0} {1}"} other{"{0} {1}"} } - Version{"2.0.96.25"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/curr/sr_Latn.txt b/icu4c/source/data/curr/sr_Latn.txt index 33890906daf..09c42890c13 100644 --- a/icu4c/source/data/curr/sr_Latn.txt +++ b/icu4c/source/data/curr/sr_Latn.txt @@ -2522,5 +2522,5 @@ sr_Latn{ one{"{0} {1}"} other{"{0} {1}"} } - Version{"2.0.96.25"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/curr/supplementalData.txt b/icu4c/source/data/curr/supplementalData.txt index 5f405782a81..7ed00d2e505 100644 --- a/icu4c/source/data/curr/supplementalData.txt +++ b/icu4c/source/data/curr/supplementalData.txt @@ -4819,6 +4819,12 @@ supplementalData:table(nofallback){ 0, 0, } + CZK:intvector{ + 2, + 0, + 0, + 0, + } DEFAULT:intvector{ 2, 0, @@ -5071,6 +5077,12 @@ supplementalData:table(nofallback){ 0, 0, } + UYI:intvector{ + 0, + 0, + 0, + 0, + } UZS:intvector{ 0, 0, diff --git a/icu4c/source/data/curr/sv.txt b/icu4c/source/data/curr/sv.txt index 9ab112b6376..7c1b28f419b 100644 --- a/icu4c/source/data/curr/sv.txt +++ b/icu4c/source/data/curr/sv.txt @@ -2370,5 +2370,5 @@ sv{ one{"{0} {1}"} other{"{0} {1}"} } - Version{"2.0.95.66"} + Version{"2.0.97.50"} } diff --git a/icu4c/source/data/curr/sw.txt b/icu4c/source/data/curr/sw.txt index acd716c26da..0666b52b4df 100644 --- a/icu4c/source/data/curr/sw.txt +++ b/icu4c/source/data/curr/sw.txt @@ -682,5 +682,5 @@ sw{ one{"{0} {1}"} other{"{0} {1}"} } - Version{"2.0.92.87"} + Version{"2.0.97.40"} } diff --git a/icu4c/source/data/curr/tr.txt b/icu4c/source/data/curr/tr.txt index db753295ebc..a9fa7bcd90f 100644 --- a/icu4c/source/data/curr/tr.txt +++ b/icu4c/source/data/curr/tr.txt @@ -1747,5 +1747,5 @@ tr{ one{"{0} {1}"} other{"{0} {1}"} } - Version{"2.0.95.37"} + Version{"2.0.97.50"} } diff --git a/icu4c/source/data/curr/uk.txt b/icu4c/source/data/curr/uk.txt index 0770c026f39..ab077c7b0c3 100644 --- a/icu4c/source/data/curr/uk.txt +++ b/icu4c/source/data/curr/uk.txt @@ -2160,5 +2160,5 @@ uk{ one{"{0} {1}"} other{"{0} {1}"} } - Version{"2.0.95.37"} + Version{"2.0.97.50"} } diff --git a/icu4c/source/data/curr/zh.txt b/icu4c/source/data/curr/zh.txt index ee84174f55f..d76c95c06fe 100644 --- a/icu4c/source/data/curr/zh.txt +++ b/icu4c/source/data/curr/zh.txt @@ -1648,5 +1648,5 @@ zh{ CurrencyUnitPatterns{ other{"{0}{1}"} } - Version{"2.0.96.40"} + Version{"2.0.97.32"} } diff --git a/icu4c/source/data/curr/zh_Hant.txt b/icu4c/source/data/curr/zh_Hant.txt index 3a8c0f67fbd..2b9019e8495 100644 --- a/icu4c/source/data/curr/zh_Hant.txt +++ b/icu4c/source/data/curr/zh_Hant.txt @@ -2009,5 +2009,5 @@ zh_Hant{ CurrencyUnitPatterns{ other{"{0} {1}"} } - Version{"2.0.96.40"} + Version{"2.0.97.32"} } diff --git a/icu4c/source/data/lang/bg.txt b/icu4c/source/data/lang/bg.txt index ca83b00a363..b0e45cd327e 100644 --- a/icu4c/source/data/lang/bg.txt +++ b/icu4c/source/data/lang/bg.txt @@ -811,7 +811,7 @@ bg{ VALENCIA{"Валенсиански"} WADEGILE{"Уейд-Джайлс романизация"} } - Version{"2.0.95.33"} + Version{"2.0.97.18"} codePatterns{ language{"Език: {0}"} script{"Писменост: {0}"} diff --git a/icu4c/source/data/lang/bm.txt b/icu4c/source/data/lang/bm.txt index c5b5e054136..b66c22ccd9e 100755 --- a/icu4c/source/data/lang/bm.txt +++ b/icu4c/source/data/lang/bm.txt @@ -57,5 +57,5 @@ bm{ zh{"siniwakan"} zu{"zulukan"} } - Version{"2.0.92.87"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/lang/cs.txt b/icu4c/source/data/lang/cs.txt index 54b1285b0fc..00bf3fac164 100644 --- a/icu4c/source/data/lang/cs.txt +++ b/icu4c/source/data/lang/cs.txt @@ -871,7 +871,7 @@ cs{ SCOTLAND{"angličtina (Skotsko)"} WADEGILE{"Wade-Giles"} } - Version{"2.0.96.24"} + Version{"2.0.97.50"} codePatterns{ language{"Jazyk: {0}"} script{"Písmo: {0}"} diff --git a/icu4c/source/data/lang/de.txt b/icu4c/source/data/lang/de.txt index 0aec1d65c9c..57579524d15 100644 --- a/icu4c/source/data/lang/de.txt +++ b/icu4c/source/data/lang/de.txt @@ -889,7 +889,7 @@ de{ VALENCIA{"Valencianisch"} WADEGILE{"Wade-Giles"} } - Version{"2.0.96.40"} + Version{"2.0.97.28"} codePatterns{ language{"Sprache: {0}"} script{"Schrift: {0}"} diff --git a/icu4c/source/data/lang/el.txt b/icu4c/source/data/lang/el.txt index adcf28f2979..43afd052b5a 100644 --- a/icu4c/source/data/lang/el.txt +++ b/icu4c/source/data/lang/el.txt @@ -899,7 +899,7 @@ el{ VALENCIA{"Βαλενθιανά"} WADEGILE{"Εκλατινισμένα Γουάντ-Γκιλς"} } - Version{"2.0.95.37"} + Version{"2.0.97.50"} codePatterns{ language{"Γλώσσα: {0}"} script{"Σύστημα γραφής: {0}"} diff --git a/icu4c/source/data/lang/en.txt b/icu4c/source/data/lang/en.txt index 6427b74def2..29cc3e3520f 100644 --- a/icu4c/source/data/lang/en.txt +++ b/icu4c/source/data/lang/en.txt @@ -873,6 +873,7 @@ en{ greklow{"Greek Lowercase Numerals"} gujr{"Gujarati Digits"} guru{"Gurmukhi Digits"} + hanidays{"Chinese Calendar Day-of-Month Numerals"} hanidec{"Chinese Decimal Numerals"} hans{"Simplified Chinese Numerals"} hansfin{"Simplified Chinese Financial Numerals"} @@ -969,7 +970,7 @@ en{ VALENCIA{"Valencian"} WADEGILE{"Wade-Giles Romanization"} } - Version{"2.0.96.5"} + Version{"2.0.97.54"} codePatterns{ language{"Language: {0}"} script{"Script: {0}"} diff --git a/icu4c/source/data/lang/es.txt b/icu4c/source/data/lang/es.txt index ec3c7a6069e..7565f3ce298 100644 --- a/icu4c/source/data/lang/es.txt +++ b/icu4c/source/data/lang/es.txt @@ -860,7 +860,7 @@ es{ VALENCIA{"Valenciano"} WADEGILE{"Romanización Wade-Giles"} } - Version{"2.0.96.40"} + Version{"2.0.97.9"} codePatterns{ language{"Idioma: {0}"} script{"Dialecto: {0}"} diff --git a/icu4c/source/data/lang/ff.txt b/icu4c/source/data/lang/ff.txt index 50a20290513..ce24e1d3d33 100755 --- a/icu4c/source/data/lang/ff.txt +++ b/icu4c/source/data/lang/ff.txt @@ -57,5 +57,5 @@ ff{ zh{"Sinuwaare"} zu{"Suluŋkoore"} } - Version{"2.0.92.87"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/lang/fi.txt b/icu4c/source/data/lang/fi.txt index ddabade4ccd..728ca5a7050 100644 --- a/icu4c/source/data/lang/fi.txt +++ b/icu4c/source/data/lang/fi.txt @@ -970,7 +970,7 @@ fi{ VALLADER{"reoromaanin vallader-muoto"} WADEGILE{"kiinan Wade-Giles-latinaistus"} } - Version{"2.0.95.33"} + Version{"2.0.97.50"} codePatterns{ language{"kieli: {0}"} script{"kirjoitusjärjestelmä: {0}"} diff --git a/icu4c/source/data/lang/fr.txt b/icu4c/source/data/lang/fr.txt index ec01f3d3d05..a73a6964279 100644 --- a/icu4c/source/data/lang/fr.txt +++ b/icu4c/source/data/lang/fr.txt @@ -899,7 +899,7 @@ fr{ VALENCIA{"valencien"} WADEGILE{"Wade-Giles"} } - Version{"2.0.96.40"} + Version{"2.0.97.9"} codePatterns{ language{"langue : {0}"} script{"écriture : {0}"} diff --git a/icu4c/source/data/lang/gl.txt b/icu4c/source/data/lang/gl.txt index d8d690710d7..fe22616a1d0 100644 --- a/icu4c/source/data/lang/gl.txt +++ b/icu4c/source/data/lang/gl.txt @@ -407,7 +407,7 @@ gl{ vaii{"Díxitos Vai"} } } - Version{"2.0.96.24"} + Version{"2.0.97.28"} codePatterns{ language{"Idioma: {0}"} script{"Alfabeto: {0}"} diff --git a/icu4c/source/data/lang/gsw.txt b/icu4c/source/data/lang/gsw.txt index 22b191f88ab..dbff608feb5 100644 --- a/icu4c/source/data/lang/gsw.txt +++ b/icu4c/source/data/lang/gsw.txt @@ -695,7 +695,7 @@ gsw{ SOLBA{"Solbica-Mundart"} TARASK{"Taraskievica-Rächtschriibig"} } - Version{"2.0.95.33"} + Version{"2.0.97.28"} codePatterns{ language{"Schpraach: {0}"} script{"Schrift: {0}"} diff --git a/icu4c/source/data/lang/he.txt b/icu4c/source/data/lang/he.txt index ddaab0b610c..85869164b2e 100644 --- a/icu4c/source/data/lang/he.txt +++ b/icu4c/source/data/lang/he.txt @@ -800,7 +800,7 @@ he{ POSIX{"מחשב"} SCOTLAND{"אנגלית סקוטית סטנדרטית"} } - Version{"2.0.95.33"} + Version{"2.0.97.17"} codePatterns{ language{"שפה:‏ {0}"} script{"כתב: {0}"} diff --git a/icu4c/source/data/lang/hi.txt b/icu4c/source/data/lang/hi.txt index fe0caf0358b..7318baba819 100644 --- a/icu4c/source/data/lang/hi.txt +++ b/icu4c/source/data/lang/hi.txt @@ -804,7 +804,7 @@ hi{ POSIX{"कम्प्यूटर"} REVISED{"संशोधित वर्तनी"} } - Version{"2.0.95.34"} + Version{"2.0.97.28"} codePatterns{ language{"भाषा: {0}"} script{"लिपि: {0}"} diff --git a/icu4c/source/data/lang/hr.txt b/icu4c/source/data/lang/hr.txt index eda5a197827..36a5962671f 100644 --- a/icu4c/source/data/lang/hr.txt +++ b/icu4c/source/data/lang/hr.txt @@ -930,7 +930,7 @@ hr{ VALENCIA{"valencijski"} WADEGILE{"Wade-Giles romanizacija"} } - Version{"2.0.95.37"} + Version{"2.0.97.50"} codePatterns{ language{"Jezik: {0}"} script{"Pismo: {0}"} diff --git a/icu4c/source/data/lang/id.txt b/icu4c/source/data/lang/id.txt index 51fd8dbd75e..23a38590f83 100644 --- a/icu4c/source/data/lang/id.txt +++ b/icu4c/source/data/lang/id.txt @@ -946,7 +946,7 @@ id{ VALENCIA{"Valencia"} WADEGILE{"Wade-Giles Latin"} } - Version{"2.0.95.60"} + Version{"2.0.97.50"} codePatterns{ language{"Bahasa: {0}"} script{"Skrip: {0}"} diff --git a/icu4c/source/data/lang/kab.txt b/icu4c/source/data/lang/kab.txt index 00197404649..a8fa067a5f2 100755 --- a/icu4c/source/data/lang/kab.txt +++ b/icu4c/source/data/lang/kab.txt @@ -57,5 +57,5 @@ kab{ zh{"Tacinwat, Tamundarint"} zu{"Tazulut"} } - Version{"2.0.92.87"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/lang/khq.txt b/icu4c/source/data/lang/khq.txt index 8c94150a3ac..46e9424eba7 100755 --- a/icu4c/source/data/lang/khq.txt +++ b/icu4c/source/data/lang/khq.txt @@ -57,5 +57,5 @@ khq{ zh{"Sinuwa senni, Mandareŋ"} zu{"Julu senni"} } - Version{"2.0.92.87"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/lang/lt.txt b/icu4c/source/data/lang/lt.txt index dda85983ed5..b71d74b9c48 100644 --- a/icu4c/source/data/lang/lt.txt +++ b/icu4c/source/data/lang/lt.txt @@ -898,7 +898,7 @@ lt{ VALENCIA{"Valenciečiai"} WADEGILE{"Wade-Giles Romanization"} } - Version{"2.0.95.38"} + Version{"2.0.97.28"} codePatterns{ language{"Kalba: {0}"} script{"Rašmenys: {0}"} diff --git a/icu4c/source/data/lang/mfe.txt b/icu4c/source/data/lang/mfe.txt index ebd5ab3651c..df5a8efd637 100755 --- a/icu4c/source/data/lang/mfe.txt +++ b/icu4c/source/data/lang/mfe.txt @@ -57,5 +57,5 @@ mfe{ zh{"sinwa, mandarin"} zu{"zoulou"} } - Version{"2.0.92.75"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/lang/mg.txt b/icu4c/source/data/lang/mg.txt index f53d670976b..5534bb6f9b1 100755 --- a/icu4c/source/data/lang/mg.txt +++ b/icu4c/source/data/lang/mg.txt @@ -57,5 +57,5 @@ mg{ zh{"Sinoa, Mandarin"} zu{"Zolò"} } - Version{"2.0.92.87"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/lang/mk.txt b/icu4c/source/data/lang/mk.txt index 3560b77be65..6bf19594a76 100644 --- a/icu4c/source/data/lang/mk.txt +++ b/icu4c/source/data/lang/mk.txt @@ -713,7 +713,7 @@ mk{ PINYIN{"Пинјин романизација"} WADEGILE{"Вејд-Џајлс романизација"} } - Version{"2.0.95.33"} + Version{"2.0.97.28"} codePatterns{ language{"Јазик: {0}"} script{"Писмо: {0}"} diff --git a/icu4c/source/data/lang/nb.txt b/icu4c/source/data/lang/nb.txt index 1f73001b64e..d47bfde669c 100644 --- a/icu4c/source/data/lang/nb.txt +++ b/icu4c/source/data/lang/nb.txt @@ -975,7 +975,7 @@ nb{ VALLADER{"vallader"} WADEGILE{"Wade-Giles"} } - Version{"2.0.95.33"} + Version{"2.0.97.50"} codePatterns{ language{"Språk: {0}"} script{"Skrift: {0}"} diff --git a/icu4c/source/data/lang/nl.txt b/icu4c/source/data/lang/nl.txt index ab4f27c36c1..90df3df3660 100644 --- a/icu4c/source/data/lang/nl.txt +++ b/icu4c/source/data/lang/nl.txt @@ -952,7 +952,7 @@ nl{ VALLADER{"Vallader"} WADEGILE{"Wade-Giles-romanisering"} } - Version{"2.0.95.37"} + Version{"2.0.97.50"} codePatterns{ language{"Taal: {0}"} script{"Schrift: {0}"} diff --git a/icu4c/source/data/lang/nmg.txt b/icu4c/source/data/lang/nmg.txt index ed4409807c8..4bd98be9a1f 100755 --- a/icu4c/source/data/lang/nmg.txt +++ b/icu4c/source/data/lang/nmg.txt @@ -56,5 +56,5 @@ nmg{ zh{"Kiɛl bó chinois"} zu{"Zulu"} } - Version{"2.0.92.87"} + Version{"2.0.97.39"} } diff --git a/icu4c/source/data/lang/pl.txt b/icu4c/source/data/lang/pl.txt index a05339d191f..a469f312fe1 100644 --- a/icu4c/source/data/lang/pl.txt +++ b/icu4c/source/data/lang/pl.txt @@ -897,7 +897,7 @@ pl{ VALENCIA{"walencki"} WADEGILE{"latynizacja Wade'a i Gilesa"} } - Version{"2.0.95.37"} + Version{"2.0.97.50"} codePatterns{ language{"Język: {0}"} script{"Pismo: {0}"} diff --git a/icu4c/source/data/lang/pt.txt b/icu4c/source/data/lang/pt.txt index 0af6855ed39..2d0088db077 100644 --- a/icu4c/source/data/lang/pt.txt +++ b/icu4c/source/data/lang/pt.txt @@ -126,7 +126,7 @@ pt{ chp{"chipewyan"} chr{"cherokee"} chy{"cheiene"} - ckb{"Sorâni curdo"} + ckb{"sorâni curdo"} cmc{"idioma chamic"} co{"córsico"} cop{"copta"} @@ -353,7 +353,7 @@ pt{ mdr{"mandar"} men{"mende"} mer{"meru"} - mfe{"Morisyen"} + mfe{"morisyen"} mg{"malgaxe"} mga{"irlandês médio"} mgh{"macua"} @@ -903,7 +903,7 @@ pt{ VALENCIA{"valenciano"} WADEGILE{"romanização Wade-Giles"} } - Version{"2.0.95.37"} + Version{"2.0.97.50"} codePatterns{ language{"Idioma: {0}"} script{"Alfabeto: {0}"} diff --git a/icu4c/source/data/lang/rm.txt b/icu4c/source/data/lang/rm.txt index 49c422c0334..988a5f55243 100755 --- a/icu4c/source/data/lang/rm.txt +++ b/icu4c/source/data/lang/rm.txt @@ -703,7 +703,7 @@ rm{ TARASK{"ortografia taraskievica"} VALENCIA{"valencian"} } - Version{"2.0.95.33"} + Version{"2.0.97.28"} codePatterns{ language{"Lingua: {0}"} script{"Scrittira: {0}"} diff --git a/icu4c/source/data/lang/root.txt b/icu4c/source/data/lang/root.txt index 4b686461c5e..e9ed42bdb29 100644 --- a/icu4c/source/data/lang/root.txt +++ b/icu4c/source/data/lang/root.txt @@ -10,7 +10,7 @@ * ICU source: /common/main/root.xml */ root{ - Version{"2.0.95.34"} + Version{"2.0.97.37"} codePatterns{ language{"{0}"} script{"{0}"} diff --git a/icu4c/source/data/lang/ru.txt b/icu4c/source/data/lang/ru.txt index ca4ae092318..287936bc14b 100644 --- a/icu4c/source/data/lang/ru.txt +++ b/icu4c/source/data/lang/ru.txt @@ -934,7 +934,7 @@ ru{ VALENCIA{"Валенсийский"} WADEGILE{"Система Уэйда – Джайлза"} } - Version{"2.0.95.59"} + Version{"2.0.97.50"} codePatterns{ language{"Язык: {0}"} script{"Написание: {0}"} diff --git a/icu4c/source/data/lang/ses.txt b/icu4c/source/data/lang/ses.txt index edc23ddc2bc..9bb9048a8a2 100755 --- a/icu4c/source/data/lang/ses.txt +++ b/icu4c/source/data/lang/ses.txt @@ -57,5 +57,5 @@ ses{ zh{"Sinuwa senni, Mandareŋ"} zu{"Zulu senni"} } - Version{"2.0.92.87"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/lang/sg.txt b/icu4c/source/data/lang/sg.txt index 852d0e097d9..dc6f520edc8 100755 --- a/icu4c/source/data/lang/sg.txt +++ b/icu4c/source/data/lang/sg.txt @@ -57,5 +57,5 @@ sg{ zh{"Shinuäa"} zu{"Zûlu"} } - Version{"2.0.92.87"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/lang/shi.txt b/icu4c/source/data/lang/shi.txt index 37249bb4f6b..158c1ff8e3d 100755 --- a/icu4c/source/data/lang/shi.txt +++ b/icu4c/source/data/lang/shi.txt @@ -57,5 +57,5 @@ shi{ zh{"ⵜⴰⵛⵉⵏⵡⵉⵜ"} zu{"ⵜⴰⵣⵓⵍⵓⵜ"} } - Version{"2.0.92.87"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/lang/shi_Latn.txt b/icu4c/source/data/lang/shi_Latn.txt index 8b3924e2a9f..c5f50e40329 100755 --- a/icu4c/source/data/lang/shi_Latn.txt +++ b/icu4c/source/data/lang/shi_Latn.txt @@ -58,5 +58,5 @@ shi_Latn{ zh{"tacinwit"} zu{"tazulut"} } - Version{"2.0.92.87"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/lang/sq.txt b/icu4c/source/data/lang/sq.txt index 9775842ac73..5c5e5b74a5b 100644 --- a/icu4c/source/data/lang/sq.txt +++ b/icu4c/source/data/lang/sq.txt @@ -260,7 +260,7 @@ sq{ tibt{"Shifra tibetiane"} } } - Version{"2.0.92.87"} + Version{"2.0.97.28"} codePatterns{ language{"Gjuha: {0}"} script{"Shkrimi: {0}"} diff --git a/icu4c/source/data/lang/sr.txt b/icu4c/source/data/lang/sr.txt index c91672fdfd3..2e35c4cf93a 100644 --- a/icu4c/source/data/lang/sr.txt +++ b/icu4c/source/data/lang/sr.txt @@ -824,7 +824,7 @@ sr{ TARASK{"Тараскијевичка ортографија"} VALENCIA{"Валенцијска"} } - Version{"2.0.96.25"} + Version{"2.0.97.28"} codePatterns{ language{"Језик: {0}"} script{"Скрипт: {0}"} diff --git a/icu4c/source/data/lang/sr_Latn.txt b/icu4c/source/data/lang/sr_Latn.txt index 8292b87ed0f..67e61e4c47b 100644 --- a/icu4c/source/data/lang/sr_Latn.txt +++ b/icu4c/source/data/lang/sr_Latn.txt @@ -825,7 +825,7 @@ sr_Latn{ TARASK{"Taraskijevička ortografija"} VALENCIA{"Valencijska"} } - Version{"2.0.96.25"} + Version{"2.0.97.28"} codePatterns{ language{"Jezik: {0}"} script{"Skript: {0}"} diff --git a/icu4c/source/data/lang/sv.txt b/icu4c/source/data/lang/sv.txt index a9d2815f8f8..ba9ad34c667 100644 --- a/icu4c/source/data/lang/sv.txt +++ b/icu4c/source/data/lang/sv.txt @@ -979,7 +979,7 @@ sv{ VALLADER{"vallader-dialekt"} WADEGILE{"Wade-Giles"} } - Version{"2.0.95.66"} + Version{"2.0.97.50"} codePatterns{ language{"språk: {0}"} script{"skrift: {0}"} diff --git a/icu4c/source/data/lang/sw.txt b/icu4c/source/data/lang/sw.txt index baf84f4fc61..3ba827b1587 100644 --- a/icu4c/source/data/lang/sw.txt +++ b/icu4c/source/data/lang/sw.txt @@ -366,7 +366,7 @@ sw{ vaii{"Dijiti za Vai"} } } - Version{"2.0.92.87"} + Version{"2.0.97.40"} codePatterns{ language{"{0}"} script{"{0}"} diff --git a/icu4c/source/data/lang/tr.txt b/icu4c/source/data/lang/tr.txt index 6525985629c..d1a8f592ac3 100644 --- a/icu4c/source/data/lang/tr.txt +++ b/icu4c/source/data/lang/tr.txt @@ -943,7 +943,7 @@ tr{ VALENCIA{"Valensiyaca"} WADEGILE{"Wade-Giles (Latin Alfabesinde Yazımı)"} } - Version{"2.0.95.37"} + Version{"2.0.97.50"} codePatterns{ language{"Dil: {0}"} script{"Alfabe: {0}"} diff --git a/icu4c/source/data/lang/uk.txt b/icu4c/source/data/lang/uk.txt index 6608210ec40..055d71779f8 100644 --- a/icu4c/source/data/lang/uk.txt +++ b/icu4c/source/data/lang/uk.txt @@ -879,7 +879,7 @@ uk{ VALENCIA{"Валенсійська"} WADEGILE{"Романізація Вейда-Джайлза"} } - Version{"2.0.95.37"} + Version{"2.0.97.50"} codePatterns{ language{"Мова: {0}"} script{"Система письма: {0}"} diff --git a/icu4c/source/data/lang/zh.txt b/icu4c/source/data/lang/zh.txt index 404f9e09c76..a051530c988 100644 --- a/icu4c/source/data/lang/zh.txt +++ b/icu4c/source/data/lang/zh.txt @@ -963,7 +963,7 @@ zh{ VALLADER{"瑞士瓦勒德方言"} WADEGILE{"WG 威氏拼音法"} } - Version{"2.0.96.40"} + Version{"2.0.97.32"} codePatterns{ language{"语言：{0}"} script{"文字：{0}"} diff --git a/icu4c/source/data/lang/zh_Hant.txt b/icu4c/source/data/lang/zh_Hant.txt index b02e867dcac..366339423bd 100644 --- a/icu4c/source/data/lang/zh_Hant.txt +++ b/icu4c/source/data/lang/zh_Hant.txt @@ -961,7 +961,7 @@ zh_Hant{ VALLADER{"瑞士瓦勒德方言"} WADEGILE{"威妥瑪式拼音"} } - Version{"2.0.96.40"} + Version{"2.0.97.32"} codePatterns{ language{"語言：{0}"} script{"文字：{0}"} diff --git a/icu4c/source/data/locales/bg.txt b/icu4c/source/data/locales/bg.txt index a45591d48e0..7951e03af7d 100644 --- a/icu4c/source/data/locales/bg.txt +++ b/icu4c/source/data/locales/bg.txt @@ -157,7 +157,7 @@ bg{ } } } - Version{"2.0.95.33"} + Version{"2.0.97.18"} calendar{ generic{ DateTimePatterns{ @@ -178,18 +178,23 @@ bg{ availableFormats{ Ed{"E, d"} Gy{"y 'г'. G"} - GyMMM{"MMM y 'г'. G"} - GyMMMEd{"E, d MMM y 'г'. G"} - GyMMMd{"d MMM y 'г'. G"} + GyMMM{"MM.y 'г'. G"} + GyMMMEd{"E, d.MM.y 'г'. G"} + GyMMMM{"MMMM y 'г'. G"} + GyMMMMEd{"E, d MMMM y 'г'. G"} + GyMMMMd{"d MMMM y 'г'. G"} + GyMMMd{"d.MM.y 'г'. G"} H{"HH"} Hm{"HH:mm"} Hms{"HH:mm:ss"} M{"M"} MEd{"E, d.MM"} - MMM{"MMM"} - MMMEd{"E, d MMM"} + MMM{"MM"} + MMMEd{"E, d.MM"} + MMMM{"LLLL"} + MMMMEd{"E, d MMMM"} MMMMd{"d MMMM"} - MMMd{"d MMM"} + MMMd{"d.MM"} Md{"d.MM"} d{"d"} h{"h"} @@ -200,10 +205,12 @@ bg{ yyyy{"y 'г'. G"} yyyyM{"M.y 'г'. G"} yyyyMEd{"E, d.MM.y 'г'. G"} - yyyyMMM{"MMM y 'г'. G"} - yyyyMMMEd{"E, d MMM y 'г'. G"} + yyyyMMM{"MM.y 'г'. G"} + yyyyMMMEd{"E, d.MM.y 'г'. G"} yyyyMMMM{"MMMM y 'г'. G"} - yyyyMMMd{"d MMM y 'г'. G"} + yyyyMMMMEd{"E, d MMMM y 'г'. G"} + yyyyMMMMd{"d MMMM y 'г'. G"} + yyyyMMMd{"d.MM.y 'г'. G"} yyyyMd{"d.MM.y 'г'. G"} yyyyQQQ{"QQQ y 'г'. G"} yyyyQQQQ{"QQQQ y 'г'. G"} @@ -231,15 +238,26 @@ bg{ d{"E, d.MM – E, d.MM"} } MMM{ - M{"MMM – MMM"} + M{"MM – MM"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d.MM – E, d.MM"} + d{"E, d.MM – E, d.MM"} + } + MMMM{ + M{"LLLL – LLLL"} + } + MMMMEd{ + M{"E, d MMMM – E, d MMMM"} + d{"E, d MMMM – E, d MMMM"} + } + MMMMd{ + M{"d MMMM – d MMMM"} + d{"d – d MMMM"} } MMMd{ - M{"d MMM – d MMM"} - d{"d – d MMM"} + M{"d.MM – d.MM"} + d{"d.MM – d.MM"} } Md{ M{"d.MM – d.MM"} @@ -280,22 +298,32 @@ bg{ y{"E, d.MM.y 'г'. – E, d.MM.y 'г'. G"} } yMMM{ - M{"MMM – MMM y 'г'. G"} - y{"MMM y 'г'. – MMM y 'г'. G"} + M{"MM – MM.y 'г'. G"} + y{"MM 'г'. – MM.y 'г'. G"} } yMMMEd{ - M{"E, d MMM – E, d MMM y 'г'. G"} - d{"E, d MMM – E, d MMM y 'г'. G"} - y{"E, d MMM y 'г'. – E, d MMM y 'г'. G"} + M{"E, d.MM – E, d.MM.y 'г'. G"} + d{"E, d.MM – E, d.MM.y 'г'. G"} + y{"E, d.MM.y 'г'. – E, d.MM.y 'г'. G"} } yMMMM{ M{"MMMM – MMMM y 'г'. G"} y{"MMMM y 'г'. – MMMM y 'г'. G"} } + yMMMMEd{ + M{"E, d MMMM – E, d MMMM y 'г'. G"} + d{"E, d MMMM – E, d MMMM y 'г'. G"} + y{"E, d MMMM y 'г'. – E, d MMMM y 'г'. G"} + } + yMMMMd{ + M{"d MMMM – d MMMM y 'г'. G"} + d{"d – d MMMM y 'г'. G"} + y{"d MMMM y 'г'. – d MMMM y 'г'. G"} + } yMMMd{ - M{"d MMM – d MMM y 'г'. G"} - d{"d – d MMM y 'г'. G"} - y{"d MMM y 'г'. – d MMM y 'г'. G"} + M{"d.MM – d.MM.y 'г'. G"} + d{"d.MM – d.MM.y 'г'. G"} + y{"d.MM.y 'г'. – d.MM.y 'г'. G"} } yMd{ M{"d.MM – d.MM.y 'г'. G"} @@ -334,19 +362,24 @@ bg{ Ehm{"E, h:mm a"} Ehms{"E h:mm:ss a"} Gy{"y 'г'. G"} - GyMMM{"MMM y 'г'. G"} - GyMMMEd{"E, d MMM y 'г'. G"} - GyMMMd{"d MMM y 'г'. G"} + GyMMM{"MM.y 'г'. G"} + GyMMMEd{"E, d.MM.y 'г'. G"} + GyMMMM{"MMMM y 'г'. G"} + GyMMMMEd{"E, d MMMM y 'г'. G"} + GyMMMMd{"d MMMM y 'г'. G"} + GyMMMd{"d.MM.y 'г'. G"} H{"H"} Hm{"H:mm"} Hms{"H:mm:ss"} M{"L"} MEd{"E, d.MM"} - MMM{"LLL"} - MMMEd{"E, d MMM"} + MMM{"MM"} + MMMEd{"E, d.MM"} + MMMM{"LLLL"} + MMMMEd{"E, d MMMM"} MMMMd{"d MMMM"} MMMMdd{"d MMMM"} - MMMd{"d MMM"} + MMMd{"d.MM"} Md{"d.MM"} d{"d"} h{"h a"} @@ -356,10 +389,12 @@ bg{ y{"y 'г'."} yM{"M.y 'г'."} yMEd{"E, d.MM.y 'г'."} - yMMM{"MMM y 'г'."} - yMMMEd{"E, d MMM y 'г'."} + yMMM{"MM.y 'г'."} + yMMMEd{"E, d.MM.y 'г'."} yMMMM{"MMMM y 'г'."} - yMMMd{"d MMM y 'г'."} + yMMMMEd{"E, d MMMM y 'г'."} + yMMMMd{"d MMMM y 'г'."} + yMMMd{"d.MM.y 'г'."} yMd{"d.MM.y 'г'."} yQQQ{"QQQ y 'г'."} yQQQQ{"QQQQ y 'г'."} @@ -479,15 +514,26 @@ bg{ d{"E, d.MM – E, d.MM"} } MMM{ - M{"MMM – MMM"} + M{"MM – MM"} } MMMEd{ - M{"E, d MMM – E, d MMM"} - d{"E, d MMM – E, d MMM"} + M{"E, d.MM – E, d.MM"} + d{"E, d.MM – E, d.MM"} + } + MMMM{ + M{"LLLL – LLLL"} + } + MMMMEd{ + M{"E, d MMMM – E, d MMMM"} + d{"E, d MMMM – E, d MMMM"} + } + MMMMd{ + M{"d MMMM – d MMMM"} + d{"d – d MMMM"} } MMMd{ - M{"d MMM – d MMM"} - d{"d – d MMM"} + M{"d.MM – d.MM"} + d{"d.MM – d.MM"} } Md{ M{"d.MM – d.MM"} @@ -528,22 +574,32 @@ bg{ y{"E, d.MM.y 'г'. – E, d.MM.y 'г'."} } yMMM{ - M{"MMM – MMM y 'г'."} - y{"MMM y 'г'. – MMM y 'г'."} + M{"MM.y 'г'. – MM.y 'г'."} + y{"MM.y 'г'. – MM.y 'г'."} } yMMMEd{ - M{"E, d MMM – E, d MMM y 'г'."} - d{"E, d MMM – E, d MMM y 'г'."} - y{"E, d MMM y 'г'. – E, d MMM y 'г'."} + M{"E, d.MM – E, d.MM.y 'г'."} + d{"E, d.MM – E, d.MM.y 'г'."} + y{"E, d.MM.y 'г'. – E, d.MM.y 'г'."} } yMMMM{ M{"MMMM – MMMM y 'г'."} y{"MMMM y 'г'. – MMMM y 'г'."} } + yMMMMEd{ + M{"E, d MMMM – E, d MMMM y 'г'."} + d{"E, d MMMM – E, d MMMM y 'г'."} + y{"E, d MMMM y 'г'. – E, d MMMM y 'г'."} + } + yMMMMd{ + M{"d MMMM – d MMMM y 'г'."} + d{"d – d MMMM y 'г'."} + y{"d MMMM y 'г'. – d MMMM y 'г'."} + } yMMMd{ - M{"d MMM – d MMM y 'г'."} - d{"d – d MMM y 'г'."} - y{"d MMM y 'г'. – d MMM y 'г'."} + M{"d.MM – d.MM.y 'г'."} + d{"d.MM – d.MM.y 'г'."} + y{"d.MM.y 'г'. – d.MM.y 'г'."} } yMd{ M{"d.MM – d.MM.y 'г'."} diff --git a/icu4c/source/data/locales/bm.txt b/icu4c/source/data/locales/bm.txt index 45d4bf5c381..3bf20667316 100755 --- a/icu4c/source/data/locales/bm.txt +++ b/icu4c/source/data/locales/bm.txt @@ -24,7 +24,7 @@ bm{ } } } - Version{"2.0.92.87"} + Version{"2.0.97.28"} calendar{ generic{ DateTimePatterns{ @@ -49,7 +49,6 @@ bm{ MMMMEd{"E d MMMM"} MMMMd{"d MMMM"} MMMd{"d MMM"} - MMMdd{"dd MMM"} MMd{"d/MM"} MMdd{"dd/MM"} Md{"d/M"} @@ -90,7 +89,6 @@ bm{ MMMMEd{"E d MMMM"} MMMMd{"d MMMM"} MMMd{"d MMM"} - MMMdd{"dd MMM"} MMd{"d/MM"} MMdd{"dd/MM"} Md{"d/M"} diff --git a/icu4c/source/data/locales/chr.txt b/icu4c/source/data/locales/chr.txt index 9d758bcea98..84b46f82274 100755 --- a/icu4c/source/data/locales/chr.txt +++ b/icu4c/source/data/locales/chr.txt @@ -156,6 +156,7 @@ chr{ "{1} {0}", "{1} {0}", } + NoonMarker{"ᎢᎦ"} availableFormats{ Gy{"y G"} GyMMM{"MMM y G"} diff --git a/icu4c/source/data/locales/cs.txt b/icu4c/source/data/locales/cs.txt index 70f1e313aaa..6f3d16c9dbc 100644 --- a/icu4c/source/data/locales/cs.txt +++ b/icu4c/source/data/locales/cs.txt @@ -208,7 +208,7 @@ cs{ } } } - Version{"2.0.96.24"} + Version{"2.0.97.50"} calendar{ buddhist{ eras{ @@ -833,7 +833,7 @@ cs{ 1, 0, } - tense:intvector{ + relative:intvector{ 1, 1, } diff --git a/icu4c/source/data/locales/da.txt b/icu4c/source/data/locales/da.txt index 47ae3c8e08d..5ff042b508e 100644 --- a/icu4c/source/data/locales/da.txt +++ b/icu4c/source/data/locales/da.txt @@ -330,6 +330,8 @@ da{ "{1} {0}", "{1} {0}", } + NoonMarker{"middag"} + NoonMarkerNarrow{"middag"} appendItems{ Timezone{"{0} {1}"} } diff --git a/icu4c/source/data/locales/de.txt b/icu4c/source/data/locales/de.txt index fd308bea68e..d2fce0517f4 100644 --- a/icu4c/source/data/locales/de.txt +++ b/icu4c/source/data/locales/de.txt @@ -163,7 +163,7 @@ de{ } } } - Version{"2.0.96.40"} + Version{"2.0.97.28"} calendar{ buddhist{ eras{ @@ -388,6 +388,7 @@ de{ "{1} {0}", "{1} {0}", } + NoonMarker{"Mittag"} appendItems{ Timezone{"{0} {1}"} } @@ -409,7 +410,6 @@ de{ MMM{"LLL"} MMMEd{"E, d. MMM"} MMMMEd{"E, d. MMMM"} - MMMMdd{"dd. MMMM"} MMMd{"d. MMM"} MMd{"d.MM."} MMdd{"dd.MM."} diff --git a/icu4c/source/data/locales/el.txt b/icu4c/source/data/locales/el.txt index d90d39b3925..95946492e49 100644 --- a/icu4c/source/data/locales/el.txt +++ b/icu4c/source/data/locales/el.txt @@ -163,7 +163,7 @@ el{ native{"latn"} traditional{"grek"} } - Version{"2.0.95.37"} + Version{"2.0.97.50"} calendar{ buddhist{ eras{ @@ -745,7 +745,7 @@ el{ } } contextTransforms{ - tense:intvector{ + relative:intvector{ 1, 1, } diff --git a/icu4c/source/data/locales/en.txt b/icu4c/source/data/locales/en.txt index d39776e2891..e23ed600098 100644 --- a/icu4c/source/data/locales/en.txt +++ b/icu4c/source/data/locales/en.txt @@ -154,7 +154,7 @@ en{ } } } - Version{"2.0.96.5"} + Version{"2.0.97.54"} calendar{ buddhist{ eras{ @@ -547,6 +547,8 @@ en{ "{1}, {0}", "{1}, {0}", } + NoonMarker{"noon"} + NoonMarkerNarrow{"n"} appendItems{ Day{"{0} ({2}: {1})"} Day-Of-Week{"{0} {1}"} @@ -863,11 +865,15 @@ en{ 1, 1, } - tense:intvector{ + keyValue:intvector{ 1, 1, } - type:intvector{ + number-spellout:intvector{ + 1, + 1, + } + relative:intvector{ 1, 1, } @@ -1486,8 +1492,8 @@ en{ } temperature{ celsius{ - one{"{0}°C"} - other{"{0}°C"} + one{"{0}°"} + other{"{0}°"} } fahrenheit{ one{"{0}°"} diff --git a/icu4c/source/data/locales/es.txt b/icu4c/source/data/locales/es.txt index 742caed8e90..83cd3d6f92c 100644 --- a/icu4c/source/data/locales/es.txt +++ b/icu4c/source/data/locales/es.txt @@ -161,7 +161,7 @@ es{ } } } - Version{"2.0.96.40"} + Version{"2.0.97.9"} calendar{ buddhist{ eras{ @@ -1433,8 +1433,8 @@ es{ } temperature{ celsius{ - one{"{0} °C"} - other{"{0} °C"} + one{"{0} °"} + other{"{0} °"} } fahrenheit{ one{"{0} °F"} diff --git a/icu4c/source/data/locales/fa.txt b/icu4c/source/data/locales/fa.txt index 3eeeece1914..486fc03afdf 100644 --- a/icu4c/source/data/locales/fa.txt +++ b/icu4c/source/data/locales/fa.txt @@ -377,6 +377,7 @@ fa{ "{1}،‏ {0}", "{1}،‏ {0}", } + NoonMarker{"ظهر"} appendItems{ Day-Of-Week{"{1} {0}"} Timezone{"{0} ({1})"} diff --git a/icu4c/source/data/locales/ff.txt b/icu4c/source/data/locales/ff.txt index 72557544760..c52d3a670c3 100755 --- a/icu4c/source/data/locales/ff.txt +++ b/icu4c/source/data/locales/ff.txt @@ -27,7 +27,7 @@ ff{ } } } - Version{"2.0.92.87"} + Version{"2.0.97.28"} calendar{ generic{ DateTimePatterns{ @@ -52,7 +52,6 @@ ff{ MMMMEd{"E d MMMM"} MMMMd{"d MMMM"} MMMd{"d MMM"} - MMMdd{"dd MMM"} MMd{"d/MM"} MMdd{"dd/MM"} Md{"d/M"} @@ -96,7 +95,6 @@ ff{ MMMMEd{"E d MMMM"} MMMMd{"d MMMM"} MMMd{"d MMM"} - MMMdd{"dd MMM"} MMd{"d/MM"} MMdd{"dd/MM"} Md{"d/M"} diff --git a/icu4c/source/data/locales/fi.txt b/icu4c/source/data/locales/fi.txt index ab43c8e1c85..f012ac095bb 100644 --- a/icu4c/source/data/locales/fi.txt +++ b/icu4c/source/data/locales/fi.txt @@ -157,7 +157,7 @@ fi{ } } } - Version{"2.0.95.33"} + Version{"2.0.97.50"} calendar{ buddhist{ eras{ @@ -860,7 +860,7 @@ fi{ 1, 0, } - tense:intvector{ + relative:intvector{ 0, 1, } diff --git a/icu4c/source/data/locales/fr.txt b/icu4c/source/data/locales/fr.txt index 6da5b301247..adbd698a2e4 100644 --- a/icu4c/source/data/locales/fr.txt +++ b/icu4c/source/data/locales/fr.txt @@ -161,7 +161,7 @@ fr{ } } } - Version{"2.0.96.40"} + Version{"2.0.97.9"} calendar{ buddhist{ DateTimePatterns{ @@ -533,7 +533,7 @@ fr{ "PM", } AmPmMarkersNarrow{ - "AM", + "a", "p", } DateTimePatterns{ @@ -551,6 +551,8 @@ fr{ "{1} {0}", "{1} {0}", } + NoonMarker{"midi"} + NoonMarkerNarrow{"midi"} appendItems{ Timezone{"{0} {1}"} } @@ -1806,8 +1808,8 @@ fr{ } temperature{ celsius{ - one{"{0}°C"} - other{"{0}°C"} + one{"{0}°"} + other{"{0}°"} } fahrenheit{ one{"{0}°F"} diff --git a/icu4c/source/data/locales/gl.txt b/icu4c/source/data/locales/gl.txt index 85ae885d371..bc9cdf8f772 100644 --- a/icu4c/source/data/locales/gl.txt +++ b/icu4c/source/data/locales/gl.txt @@ -158,7 +158,7 @@ gl{ } } } - Version{"2.0.96.24"} + Version{"2.0.97.28"} calendar{ generic{ DateTimePatterns{ @@ -191,7 +191,6 @@ gl{ MMMEd{"E d MMM"} MMMMEd{"E d MMMM"} MMMMd{"d MMMM"} - MMMMdd{"dd MMMM"} MMMd{"d MMM"} MMdd{"dd/MM"} Md{"d/M"} @@ -363,7 +362,6 @@ gl{ MMMEd{"E d MMM"} MMMMEd{"E d MMMM"} MMMMd{"d MMMM"} - MMMMdd{"dd MMMM"} MMMd{"d MMM"} MMdd{"dd/MM"} Md{"d-M"} diff --git a/icu4c/source/data/locales/gsw.txt b/icu4c/source/data/locales/gsw.txt index 04379869474..e4f433742d8 100644 --- a/icu4c/source/data/locales/gsw.txt +++ b/icu4c/source/data/locales/gsw.txt @@ -37,7 +37,7 @@ gsw{ } } } - Version{"2.0.95.33"} + Version{"2.0.97.28"} calendar{ buddhist{ DateTimePatterns{ @@ -84,7 +84,6 @@ gsw{ MMMEd{"E d. MMM"} MMMMEd{"E d. MMMM"} MMMMd{"d. MMMM"} - MMMMdd{"dd. MMMM"} MMMd{"d. MMM"} MMd{"d.MM."} MMdd{"dd.MM."} @@ -234,7 +233,6 @@ gsw{ MMMEd{"E d. MMM"} MMMMEd{"E d. MMMM"} MMMMd{"d. MMMM"} - MMMMdd{"dd. MMMM"} MMMd{"d. MMM"} MMd{"d.MM."} MMdd{"dd.MM."} diff --git a/icu4c/source/data/locales/he.txt b/icu4c/source/data/locales/he.txt index 64c6feeac35..f7aa78aaf99 100644 --- a/icu4c/source/data/locales/he.txt +++ b/icu4c/source/data/locales/he.txt @@ -211,7 +211,7 @@ he{ native{"latn"} traditional{"hebr"} } - Version{"2.0.95.33"} + Version{"2.0.97.17"} calendar{ generic{ DateTimePatterns{ @@ -599,18 +599,18 @@ he{ monthNames{ format{ abbreviated{ - "ינו", - "פבר", + "ינו׳", + "פבר׳", "מרץ", - "אפר", + "אפר׳", "מאי", - "יונ", - "יול", - "אוג", - "ספט", - "אוק", - "נוב", - "דצמ", + "יוני", + "יולי", + "אוג׳", + "ספט׳", + "אוק׳", + "נוב׳", + "דצמ׳", } narrow{ "1", @@ -648,8 +648,8 @@ he{ "מרץ", "אפר׳", "מאי", - "יונ׳", - "יול׳", + "יוני", + "יולי", "אוג׳", "ספט׳", "אוק׳", diff --git a/icu4c/source/data/locales/hi.txt b/icu4c/source/data/locales/hi.txt index cf929a1a556..8ffc02d7800 100644 --- a/icu4c/source/data/locales/hi.txt +++ b/icu4c/source/data/locales/hi.txt @@ -165,7 +165,7 @@ hi{ } native{"deva"} } - Version{"2.0.95.34"} + Version{"2.0.97.28"} calendar{ ethiopic{ monthNames{ @@ -380,7 +380,6 @@ hi{ MMMMEd{"E, d MMMM"} MMMMd{"d MMMM"} MMMd{"d MMM"} - MMMdd{"dd MMM"} MMdd{"dd-MM"} Md{"d/M"} d{"d"} diff --git a/icu4c/source/data/locales/hr.txt b/icu4c/source/data/locales/hr.txt index f3b27dcebf0..d0603311db0 100644 --- a/icu4c/source/data/locales/hr.txt +++ b/icu4c/source/data/locales/hr.txt @@ -184,7 +184,7 @@ hr{ } } } - Version{"2.0.95.37"} + Version{"2.0.97.50"} calendar{ buddhist{ eras{ @@ -241,7 +241,6 @@ hr{ MMMEd{"E, d. MMM"} MMMMEd{"E, d. MMMM"} MMMMd{"d. MMMM"} - MMMMdd{"dd. MMMM"} MMMd{"d. MMM"} Md{"d. M."} d{"d."} @@ -377,6 +376,8 @@ hr{ "{1} {0}", "{1} {0}", } + NoonMarker{"podne"} + NoonMarkerNarrow{"n"} appendItems{ Timezone{"{0} {1}"} } @@ -399,7 +400,6 @@ hr{ MMMEd{"E, d. MMM"} MMMMEd{"E, d. MMMM"} MMMMd{"d. MMMM"} - MMMMdd{"dd. MMMM"} MMMd{"d. MMM"} MMdd{"dd. MM."} Md{"d. M."} @@ -809,7 +809,7 @@ hr{ 1, 0, } - tense:intvector{ + relative:intvector{ 1, 1, } diff --git a/icu4c/source/data/locales/id.txt b/icu4c/source/data/locales/id.txt index bc94abdeaf6..d4a135818fc 100644 --- a/icu4c/source/data/locales/id.txt +++ b/icu4c/source/data/locales/id.txt @@ -134,7 +134,7 @@ id{ } } } - Version{"2.0.95.60"} + Version{"2.0.97.50"} calendar{ buddhist{ DateTimePatterns{ @@ -1806,7 +1806,7 @@ id{ } } contextTransforms{ - tense:intvector{ + relative:intvector{ 1, 1, } diff --git a/icu4c/source/data/locales/ja.txt b/icu4c/source/data/locales/ja.txt index ef3d05c1d48..5b42262cdd4 100644 --- a/icu4c/source/data/locales/ja.txt +++ b/icu4c/source/data/locales/ja.txt @@ -1217,6 +1217,8 @@ ja{ "{1} {0}", "{1} {0}", } + NoonMarker{"正午"} + NoonMarkerNarrow{"正午"} appendItems{ Timezone{"{0} {1}"} } diff --git a/icu4c/source/data/locales/kab.txt b/icu4c/source/data/locales/kab.txt index ce10706eec3..23ff22f272f 100755 --- a/icu4c/source/data/locales/kab.txt +++ b/icu4c/source/data/locales/kab.txt @@ -27,7 +27,7 @@ kab{ } } } - Version{"2.0.92.87"} + Version{"2.0.97.28"} calendar{ generic{ DateTimePatterns{ @@ -52,7 +52,6 @@ kab{ MMMMEd{"E d MMMM"} MMMMd{"d MMMM"} MMMd{"d MMM"} - MMMdd{"dd MMM"} MMd{"d/MM"} MMdd{"dd/MM"} Md{"d/M"} @@ -96,7 +95,6 @@ kab{ MMMMEd{"E d MMMM"} MMMMd{"d MMMM"} MMMd{"d MMM"} - MMMdd{"dd MMM"} MMd{"d/MM"} MMdd{"dd/MM"} Md{"d/M"} diff --git a/icu4c/source/data/locales/khq.txt b/icu4c/source/data/locales/khq.txt index 6f8ac893395..ad06d47dc76 100755 --- a/icu4c/source/data/locales/khq.txt +++ b/icu4c/source/data/locales/khq.txt @@ -26,7 +26,7 @@ khq{ } } } - Version{"2.0.92.87"} + Version{"2.0.97.28"} calendar{ generic{ DateTimePatterns{ @@ -51,7 +51,6 @@ khq{ MMMMEd{"E d MMMM"} MMMMd{"d MMMM"} MMMd{"d MMM"} - MMMdd{"dd MMM"} MMd{"d/MM"} MMdd{"dd/MM"} Md{"d/M"} @@ -95,7 +94,6 @@ khq{ MMMMEd{"E d MMMM"} MMMMd{"d MMMM"} MMMd{"d MMM"} - MMMdd{"dd MMM"} MMd{"d/MM"} MMdd{"dd/MM"} Md{"d/M"} diff --git a/icu4c/source/data/locales/lt.txt b/icu4c/source/data/locales/lt.txt index d6d544b5387..b1fb9109224 100644 --- a/icu4c/source/data/locales/lt.txt +++ b/icu4c/source/data/locales/lt.txt @@ -212,7 +212,7 @@ lt{ } } } - Version{"2.0.95.38"} + Version{"2.0.97.28"} calendar{ buddhist{ eras{ @@ -381,7 +381,6 @@ lt{ MMM{"LLL"} MMMEd{"MMM-d, E"} MMMd{"MMM-d"} - MMMdd{"MMM-dd"} MMdd{"MM.dd"} Md{"MM-dd"} d{"d"} @@ -537,7 +536,6 @@ lt{ MMM{"LLL"} MMMEd{"MMM d, E"} MMMd{"MMM d"} - MMMdd{"MMM dd"} MMdd{"MM-dd"} Md{"MM-d"} d{"dd"} diff --git a/icu4c/source/data/locales/mfe.txt b/icu4c/source/data/locales/mfe.txt index 2a5addb9720..72e8b2abadb 100755 --- a/icu4c/source/data/locales/mfe.txt +++ b/icu4c/source/data/locales/mfe.txt @@ -22,7 +22,7 @@ mfe{ } } } - Version{"2.0.92.75"} + Version{"2.0.97.28"} calendar{ generic{ DateTimePatterns{ @@ -47,7 +47,6 @@ mfe{ MMMMEd{"E d MMMM"} MMMMd{"d MMMM"} MMMd{"d MMM"} - MMMdd{"dd MMM"} MMd{"d/MM"} MMdd{"dd/MM"} Md{"d/M"} @@ -87,7 +86,6 @@ mfe{ MMMMEd{"E d MMMM"} MMMMd{"d MMMM"} MMMd{"d MMM"} - MMMdd{"dd MMM"} MMd{"d/MM"} MMdd{"dd/MM"} Md{"d/M"} diff --git a/icu4c/source/data/locales/mg.txt b/icu4c/source/data/locales/mg.txt index de312560ee3..8837d8526f6 100755 --- a/icu4c/source/data/locales/mg.txt +++ b/icu4c/source/data/locales/mg.txt @@ -23,7 +23,7 @@ mg{ } } } - Version{"2.0.92.87"} + Version{"2.0.97.28"} calendar{ generic{ DateTimePatterns{ @@ -49,7 +49,6 @@ mg{ MMMMEd{"E d MMMM"} MMMMd{"d MMMM"} MMMd{"d MMM"} - MMMdd{"dd MMM"} MMd{"d/MM"} MMdd{"dd/MM"} Md{"d/M"} @@ -90,7 +89,6 @@ mg{ MMMMEd{"E d MMMM"} MMMMd{"d MMMM"} MMMd{"d MMM"} - MMMdd{"dd MMM"} MMd{"d/MM"} MMdd{"dd/MM"} Md{"d/M"} diff --git a/icu4c/source/data/locales/mk.txt b/icu4c/source/data/locales/mk.txt index b836a5fb54b..25a859caa43 100644 --- a/icu4c/source/data/locales/mk.txt +++ b/icu4c/source/data/locales/mk.txt @@ -157,7 +157,7 @@ mk{ } } } - Version{"2.0.95.33"} + Version{"2.0.97.28"} calendar{ generic{ DateTimePatterns{ @@ -350,7 +350,6 @@ mk{ MMMEd{"E d MMM"} MMMMEd{"E d MMMM"} MMMMd{"d MMMM"} - MMMMdd{"dd MMMM"} MMMd{"d MMM"} Md{"d.M"} Mdd{"dd.M"} diff --git a/icu4c/source/data/locales/nb.txt b/icu4c/source/data/locales/nb.txt index a5f5e2e8171..6f0050b09e3 100644 --- a/icu4c/source/data/locales/nb.txt +++ b/icu4c/source/data/locales/nb.txt @@ -158,7 +158,7 @@ nb{ } } } - Version{"2.0.95.33"} + Version{"2.0.97.50"} calendar{ buddhist{ eras{ @@ -738,7 +738,7 @@ nb{ } } contextTransforms{ - tense:intvector{ + relative:intvector{ 0, 1, } diff --git a/icu4c/source/data/locales/nl.txt b/icu4c/source/data/locales/nl.txt index 863bbc4d3ae..b18a6671561 100644 --- a/icu4c/source/data/locales/nl.txt +++ b/icu4c/source/data/locales/nl.txt @@ -164,7 +164,7 @@ nl{ } } } - Version{"2.0.95.37"} + Version{"2.0.97.50"} calendar{ buddhist{ DateTimePatterns{ @@ -925,6 +925,8 @@ nl{ "{1} {0}", "{1} {0}", } + NoonMarker{"12 uur 's middags"} + NoonMarkerNarrow{"n"} appendItems{ Timezone{"{0} {1}"} } @@ -2061,7 +2063,7 @@ nl{ 1, 1, } - tense:intvector{ + relative:intvector{ 1, 1, } diff --git a/icu4c/source/data/locales/nmg.txt b/icu4c/source/data/locales/nmg.txt index 22f6313ddd8..214f35280f8 100755 --- a/icu4c/source/data/locales/nmg.txt +++ b/icu4c/source/data/locales/nmg.txt @@ -12,9 +12,9 @@ nmg{ AuxExemplarCharacters{"[q x z]"} ExemplarCharacters{ - "[a á ă â ä ā b ɓ c d e é ĕ ê ē ǝ {ǝ\u0301} {ǝ\u0306} {ǝ\u0302} {ǝ\u0304} ɛ {" - "ɛ\u0301} {ɛ\u0306} {ɛ\u0302} {ɛ\u0304} f g h i í ĭ î ï ī j k l m n ń ŋ o ó ŏ" - " ô ö ō ɔ {ɔ\u0301} {ɔ\u0306} {ɔ\u0302} {ɔ\u0304} p r ŕ s t u ú ŭ û ū v w y]" + "[a á ǎ â ä ā b ɓ c d e é ě ê ē ǝ {ǝ\u0301} {ǝ\u030C} {ǝ\u0302} {ǝ\u0304} ɛ {" + "ɛ\u0301} {ɛ\u030C} {ɛ\u0302} {ɛ\u0304} f g h i í ǐ î ï ī j k l m n ń ŋ o ó ǒ" + " ô ö ō ɔ {ɔ\u0301} {ɔ\u030C} {ɔ\u0302} {ɔ\u0304} p r ŕ s t u ú ǔ û ū v w y]" } ExemplarCharactersIndex{"[A B Ɓ C D E Ǝ Ɛ F G H I J K L M N Ŋ O Ɔ P R S T U V W Y]"} LocaleScript{ @@ -33,7 +33,7 @@ nmg{ } } } - Version{"2.0.92.87"} + Version{"2.0.97.39"} calendar{ generic{ DateTimePatterns{ @@ -190,7 +190,7 @@ nmg{ "ngwɛn lɔmbi", "ngwɛn rɛbvuâ", "ngwɛn wum", - "ngwɛn wum navŭr", + "ngwɛn wum navǔr", "krísimin", } } diff --git a/icu4c/source/data/locales/pl.txt b/icu4c/source/data/locales/pl.txt index 38c411d101f..1f599f31a13 100644 --- a/icu4c/source/data/locales/pl.txt +++ b/icu4c/source/data/locales/pl.txt @@ -209,7 +209,7 @@ pl{ } } } - Version{"2.0.95.37"} + Version{"2.0.97.50"} calendar{ buddhist{ eras{ @@ -600,6 +600,7 @@ pl{ "{1}, {0}", "{1}, {0}", } + NoonMarker{"w południe"} appendItems{ Timezone{"{0} {1}"} } @@ -1276,7 +1277,7 @@ pl{ } } contextTransforms{ - tense:intvector{ + relative:intvector{ 1, 1, } diff --git a/icu4c/source/data/locales/pt.txt b/icu4c/source/data/locales/pt.txt index bcc027659bd..b99d0eb65ae 100644 --- a/icu4c/source/data/locales/pt.txt +++ b/icu4c/source/data/locales/pt.txt @@ -162,7 +162,7 @@ pt{ } native{"latn"} } - Version{"2.0.95.37"} + Version{"2.0.97.50"} calendar{ buddhist{ eras{ @@ -581,6 +581,7 @@ pt{ "{1} {0}", "{1} {0}", } + NoonMarker{"meio-dia"} appendItems{ Timezone{"{0} {1}"} } @@ -1184,7 +1185,7 @@ pt{ 1, 1, } - tense:intvector{ + relative:intvector{ 1, 1, } diff --git a/icu4c/source/data/locales/rm.txt b/icu4c/source/data/locales/rm.txt index 7bf7c3ede24..94f062b9c7c 100644 --- a/icu4c/source/data/locales/rm.txt +++ b/icu4c/source/data/locales/rm.txt @@ -38,7 +38,7 @@ rm{ } } } - Version{"2.0.95.33"} + Version{"2.0.97.28"} calendar{ generic{ DateTimePatterns{ @@ -68,7 +68,6 @@ rm{ MMMEd{"E d. MMM"} MMMMEd{"E d. MMMM"} MMMMd{"d. MMMM"} - MMMMdd{"dd. MMMM"} MMMd{"d. MMM"} MMd{"d.MM."} MMdd{"dd.MM."} @@ -201,7 +200,6 @@ rm{ MMMEd{"E d. MMM"} MMMMEd{"E d. MMMM"} MMMMd{"d. MMMM"} - MMMMdd{"dd. MMMM"} MMMd{"d. MMM"} MMd{"d.MM."} MMdd{"dd.MM."} diff --git a/icu4c/source/data/locales/root.txt b/icu4c/source/data/locales/root.txt index 3d0fe6d7e87..84d863abb63 100644 --- a/icu4c/source/data/locales/root.txt +++ b/icu4c/source/data/locales/root.txt @@ -182,11 +182,14 @@ root{ } native{"latn"} } - Version{"2.0.95.34"} + Version{"2.0.97.37"} calendar{ buddhist{ AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"} + AmPmMarkersNarrow:alias{"/LOCALE/calendar/gregorian/AmPmMarkersNarrow"} DateTimePatterns:alias{"/LOCALE/calendar/generic/DateTimePatterns"} + NoonMarker:alias{"/LOCALE/calendar/gregorian/NoonMarker"} + NoonMarkerNarrow:alias{"/LOCALE/calendar/gregorian/NoonMarkerNarrow"} appendItems:alias{"/LOCALE/calendar/generic/appendItems"} availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"} dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"} @@ -203,6 +206,7 @@ root{ } chinese{ AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"} + AmPmMarkersNarrow:alias{"/LOCALE/calendar/gregorian/AmPmMarkersNarrow"} DateTimePatterns{ "HH:mm:ss zzzz", "HH:mm:ss z", @@ -218,6 +222,8 @@ root{ "{1} {0}", "{1} {0}", } + NoonMarker:alias{"/LOCALE/calendar/gregorian/NoonMarker"} + NoonMarkerNarrow:alias{"/LOCALE/calendar/gregorian/NoonMarkerNarrow"} appendItems{ Day{"{0} ({2}: {1})"} Day-Of-Week{"{0} {1}"} @@ -520,7 +526,10 @@ root{ } coptic{ AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"} + AmPmMarkersNarrow:alias{"/LOCALE/calendar/gregorian/AmPmMarkersNarrow"} DateTimePatterns:alias{"/LOCALE/calendar/generic/DateTimePatterns"} + NoonMarker:alias{"/LOCALE/calendar/gregorian/NoonMarker"} + NoonMarkerNarrow:alias{"/LOCALE/calendar/gregorian/NoonMarkerNarrow"} appendItems:alias{"/LOCALE/calendar/generic/appendItems"} availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"} dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"} @@ -577,7 +586,10 @@ root{ } dangi{ AmPmMarkers:alias{"/LOCALE/calendar/chinese/AmPmMarkers"} + AmPmMarkersNarrow:alias{"/LOCALE/calendar/chinese/AmPmMarkersNarrow"} DateTimePatterns:alias{"/LOCALE/calendar/chinese/DateTimePatterns"} + NoonMarker:alias{"/LOCALE/calendar/chinese/NoonMarker"} + NoonMarkerNarrow:alias{"/LOCALE/calendar/chinese/NoonMarkerNarrow"} appendItems:alias{"/LOCALE/calendar/chinese/appendItems"} availableFormats:alias{"/LOCALE/calendar/chinese/availableFormats"} cyclicNameSets:alias{"/LOCALE/calendar/chinese/cyclicNameSets"} @@ -590,7 +602,10 @@ root{ default{"gregorian"} ethiopic{ AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"} + AmPmMarkersNarrow:alias{"/LOCALE/calendar/gregorian/AmPmMarkersNarrow"} DateTimePatterns:alias{"/LOCALE/calendar/generic/DateTimePatterns"} + NoonMarker:alias{"/LOCALE/calendar/gregorian/NoonMarker"} + NoonMarkerNarrow:alias{"/LOCALE/calendar/gregorian/NoonMarkerNarrow"} appendItems:alias{"/LOCALE/calendar/generic/appendItems"} availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"} dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"} @@ -647,7 +662,10 @@ root{ } ethiopic-amete-alem{ AmPmMarkers:alias{"/LOCALE/calendar/ethiopic/AmPmMarkers"} + AmPmMarkersNarrow:alias{"/LOCALE/calendar/ethiopic/AmPmMarkersNarrow"} DateTimePatterns:alias{"/LOCALE/calendar/ethiopic/DateTimePatterns"} + NoonMarker:alias{"/LOCALE/calendar/ethiopic/NoonMarker"} + NoonMarkerNarrow:alias{"/LOCALE/calendar/ethiopic/NoonMarkerNarrow"} appendItems:alias{"/LOCALE/calendar/ethiopic/appendItems"} availableFormats:alias{"/LOCALE/calendar/ethiopic/availableFormats"} dayNames:alias{"/LOCALE/calendar/ethiopic/dayNames"} @@ -664,6 +682,7 @@ root{ } generic{ AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"} + AmPmMarkersNarrow:alias{"/LOCALE/calendar/gregorian/AmPmMarkersNarrow"} DateTimePatterns{ "HH:mm:ss zzzz", "HH:mm:ss z", @@ -679,6 +698,8 @@ root{ "{1} {0}", "{1} {0}", } + NoonMarker:alias{"/LOCALE/calendar/gregorian/NoonMarker"} + NoonMarkerNarrow:alias{"/LOCALE/calendar/gregorian/NoonMarkerNarrow"} appendItems{ Day{"{0} ({2}: {1})"} Day-Of-Week{"{0} {1}"} @@ -876,6 +897,10 @@ root{ "AM", "PM", } + AmPmMarkersNarrow{ + "a", + "p", + } DateTimePatterns{ "HH:mm:ss zzzz", "HH:mm:ss z", @@ -891,6 +916,8 @@ root{ "{1} {0}", "{1} {0}", } + NoonMarker{"noon"} + NoonMarkerNarrow{"n"} appendItems{ Day{"{0} ({2}: {1})"} Day-Of-Week{"{0} {1}"} @@ -1134,7 +1161,10 @@ root{ } hebrew{ AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"} + AmPmMarkersNarrow:alias{"/LOCALE/calendar/gregorian/AmPmMarkersNarrow"} DateTimePatterns:alias{"/LOCALE/calendar/generic/DateTimePatterns"} + NoonMarker:alias{"/LOCALE/calendar/gregorian/NoonMarker"} + NoonMarkerNarrow:alias{"/LOCALE/calendar/gregorian/NoonMarkerNarrow"} appendItems:alias{"/LOCALE/calendar/generic/appendItems"} availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"} dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"} @@ -1192,7 +1222,10 @@ root{ } indian{ AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"} + AmPmMarkersNarrow:alias{"/LOCALE/calendar/gregorian/AmPmMarkersNarrow"} DateTimePatterns:alias{"/LOCALE/calendar/generic/DateTimePatterns"} + NoonMarker:alias{"/LOCALE/calendar/gregorian/NoonMarker"} + NoonMarkerNarrow:alias{"/LOCALE/calendar/gregorian/NoonMarkerNarrow"} appendItems:alias{"/LOCALE/calendar/generic/appendItems"} availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"} dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"} @@ -1246,7 +1279,10 @@ root{ } islamic{ AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"} + AmPmMarkersNarrow:alias{"/LOCALE/calendar/gregorian/AmPmMarkersNarrow"} DateTimePatterns:alias{"/LOCALE/calendar/generic/DateTimePatterns"} + NoonMarker:alias{"/LOCALE/calendar/gregorian/NoonMarker"} + NoonMarkerNarrow:alias{"/LOCALE/calendar/gregorian/NoonMarkerNarrow"} appendItems:alias{"/LOCALE/calendar/generic/appendItems"} availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"} dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"} @@ -1313,7 +1349,10 @@ root{ } islamic-civil{ AmPmMarkers:alias{"/LOCALE/calendar/islamic/AmPmMarkers"} + AmPmMarkersNarrow:alias{"/LOCALE/calendar/islamic/AmPmMarkersNarrow"} DateTimePatterns:alias{"/LOCALE/calendar/islamic/DateTimePatterns"} + NoonMarker:alias{"/LOCALE/calendar/islamic/NoonMarker"} + NoonMarkerNarrow:alias{"/LOCALE/calendar/islamic/NoonMarkerNarrow"} appendItems:alias{"/LOCALE/calendar/islamic/appendItems"} availableFormats:alias{"/LOCALE/calendar/islamic/availableFormats"} dayNames:alias{"/LOCALE/calendar/islamic/dayNames"} @@ -1324,7 +1363,10 @@ root{ } islamic-rgsa{ AmPmMarkers:alias{"/LOCALE/calendar/islamic/AmPmMarkers"} + AmPmMarkersNarrow:alias{"/LOCALE/calendar/islamic/AmPmMarkersNarrow"} DateTimePatterns:alias{"/LOCALE/calendar/islamic/DateTimePatterns"} + NoonMarker:alias{"/LOCALE/calendar/islamic/NoonMarker"} + NoonMarkerNarrow:alias{"/LOCALE/calendar/islamic/NoonMarkerNarrow"} appendItems:alias{"/LOCALE/calendar/islamic/appendItems"} availableFormats:alias{"/LOCALE/calendar/islamic/availableFormats"} dayNames:alias{"/LOCALE/calendar/islamic/dayNames"} @@ -1335,7 +1377,10 @@ root{ } islamic-tbla{ AmPmMarkers:alias{"/LOCALE/calendar/islamic/AmPmMarkers"} + AmPmMarkersNarrow:alias{"/LOCALE/calendar/islamic/AmPmMarkersNarrow"} DateTimePatterns:alias{"/LOCALE/calendar/islamic/DateTimePatterns"} + NoonMarker:alias{"/LOCALE/calendar/islamic/NoonMarker"} + NoonMarkerNarrow:alias{"/LOCALE/calendar/islamic/NoonMarkerNarrow"} appendItems:alias{"/LOCALE/calendar/islamic/appendItems"} availableFormats:alias{"/LOCALE/calendar/islamic/availableFormats"} dayNames:alias{"/LOCALE/calendar/islamic/dayNames"} @@ -1346,7 +1391,10 @@ root{ } islamic-umalqura{ AmPmMarkers:alias{"/LOCALE/calendar/islamic/AmPmMarkers"} + AmPmMarkersNarrow:alias{"/LOCALE/calendar/islamic/AmPmMarkersNarrow"} DateTimePatterns:alias{"/LOCALE/calendar/islamic/DateTimePatterns"} + NoonMarker:alias{"/LOCALE/calendar/islamic/NoonMarker"} + NoonMarkerNarrow:alias{"/LOCALE/calendar/islamic/NoonMarkerNarrow"} appendItems:alias{"/LOCALE/calendar/islamic/appendItems"} availableFormats:alias{"/LOCALE/calendar/islamic/availableFormats"} dayNames:alias{"/LOCALE/calendar/islamic/dayNames"} @@ -1357,7 +1405,10 @@ root{ } japanese{ AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"} + AmPmMarkersNarrow:alias{"/LOCALE/calendar/gregorian/AmPmMarkersNarrow"} DateTimePatterns:alias{"/LOCALE/calendar/generic/DateTimePatterns"} + NoonMarker:alias{"/LOCALE/calendar/gregorian/NoonMarker"} + NoonMarkerNarrow:alias{"/LOCALE/calendar/gregorian/NoonMarkerNarrow"} appendItems:alias{"/LOCALE/calendar/generic/appendItems"} availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"} dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"} @@ -1846,7 +1897,10 @@ root{ } persian{ AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"} + AmPmMarkersNarrow:alias{"/LOCALE/calendar/gregorian/AmPmMarkersNarrow"} DateTimePatterns:alias{"/LOCALE/calendar/generic/DateTimePatterns"} + NoonMarker:alias{"/LOCALE/calendar/gregorian/NoonMarker"} + NoonMarkerNarrow:alias{"/LOCALE/calendar/gregorian/NoonMarkerNarrow"} appendItems:alias{"/LOCALE/calendar/generic/appendItems"} availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"} dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"} @@ -1900,7 +1954,10 @@ root{ } roc{ AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"} + AmPmMarkersNarrow:alias{"/LOCALE/calendar/gregorian/AmPmMarkersNarrow"} DateTimePatterns:alias{"/LOCALE/calendar/generic/DateTimePatterns"} + NoonMarker:alias{"/LOCALE/calendar/gregorian/NoonMarker"} + NoonMarkerNarrow:alias{"/LOCALE/calendar/gregorian/NoonMarkerNarrow"} appendItems:alias{"/LOCALE/calendar/generic/appendItems"} availableFormats:alias{"/LOCALE/calendar/generic/availableFormats"} dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"} diff --git a/icu4c/source/data/locales/ru.txt b/icu4c/source/data/locales/ru.txt index 31ccb39e16b..9e56dcdae53 100644 --- a/icu4c/source/data/locales/ru.txt +++ b/icu4c/source/data/locales/ru.txt @@ -47,61 +47,73 @@ ru{ patternsLong{ decimalFormat{ 1000{ + few{"0 тысячи"} many{"0 тысяч"} one{"0 тысяча"} other{"0 тысячи"} } 10000{ + few{"00 тысячи"} many{"00 тысяч"} one{"00 тысяча"} other{"00 тысячи"} } 100000{ + few{"000 тысячи"} many{"000 тысяч"} one{"000 тысяча"} other{"000 тысячи"} } 1000000{ + few{"0 миллиона"} many{"0 миллионов"} one{"0 миллион"} other{"0 миллиона"} } 10000000{ + few{"00 миллиона"} many{"00 миллионов"} one{"00 миллион"} other{"00 миллиона"} } 100000000{ + few{"000 миллиона"} many{"000 миллионов"} one{"000 миллион"} other{"000 миллиона"} } 1000000000{ + few{"0 миллиарда"} many{"0 миллиардов"} one{"0 миллиард"} other{"0 миллиарда"} } 10000000000{ + few{"00 миллиарда"} many{"00 миллиардов"} one{"00 миллиард"} other{"00 миллиарда"} } 100000000000{ + few{"000 миллиарда"} many{"000 миллиардов"} one{"000 миллиард"} other{"000 миллиарда"} } 1000000000000{ + few{"0 триллиона"} many{"0 триллионов"} one{"0 триллион"} other{"0 триллиона"} } 10000000000000{ + few{"00 триллиона"} many{"00 триллионов"} one{"00 триллион"} other{"00 триллиона"} } 100000000000000{ + few{"000 триллиона"} many{"000 триллионов"} one{"000 триллион"} other{"000 триллиона"} @@ -111,61 +123,73 @@ ru{ patternsShort{ decimalFormat{ 1000{ + few{"0 тыс'.'"} many{"0 тыс'.'"} one{"0 тыс'.'"} other{"0 тыс'.'"} } 10000{ + few{"00 тыс'.'"} many{"00 тыс'.'"} one{"00 тыс'.'"} other{"00 тыс'.'"} } 100000{ + few{"000 тыс'.'"} many{"000 тыс'.'"} one{"000 тыс'.'"} other{"000 тыс'.'"} } 1000000{ + few{"0 млн"} many{"0 млн"} one{"0 млн"} other{"0 млн"} } 10000000{ + few{"00 млн"} many{"00 млн"} one{"00 млн"} other{"00 млн"} } 100000000{ + few{"000 млн"} many{"000 млн"} one{"000 млн"} other{"000 млн"} } 1000000000{ + few{"0 млрд"} many{"0 млрд"} one{"0 млрд"} other{"0 млрд"} } 10000000000{ + few{"00 млрд"} many{"00 млрд"} one{"00 млрд"} other{"00 млрд"} } 100000000000{ + few{"000 млрд"} many{"000 млрд"} one{"000 млрд"} other{"000 млрд"} } 1000000000000{ + few{"0 трлн"} many{"0 трлн"} one{"0 трлн"} other{"0 трлн"} } 10000000000000{ + few{"00 трлн"} many{"00 трлн"} one{"00 трлн"} other{"00 трлн"} } 100000000000000{ + few{"000 трлн"} many{"000 трлн"} one{"000 трлн"} other{"000 трлн"} @@ -187,7 +211,7 @@ ru{ } } } - Version{"2.0.95.59"} + Version{"2.0.97.50"} calendar{ buddhist{ eras{ @@ -638,7 +662,7 @@ ru{ "H:mm", "EEEE, d MMMM y 'г'.", "d MMMM y 'г'.", - "dd MMM y 'г'.", + "d MMM y 'г'.", "dd.MM.yy", "{1}, {0}", "{1}, {0}", @@ -1569,6 +1593,10 @@ ru{ } } contextTransforms{ + currencyName:intvector{ + 1, + 1, + } day-format-except-narrow:intvector{ 1, 1, @@ -1577,10 +1605,6 @@ ru{ 1, 1, } - displayName:intvector{ - 1, - 1, - } era-abbr:intvector{ 1, 1, @@ -1589,6 +1613,10 @@ ru{ 1, 1, } + keyValue:intvector{ + 1, + 1, + } languages:intvector{ 1, 1, @@ -1601,18 +1629,14 @@ ru{ 1, 1, } + relative:intvector{ + 1, + 1, + } script:intvector{ 1, 1, } - tense:intvector{ - 1, - 1, - } - type:intvector{ - 1, - 1, - } } delimiters{ alternateQuotationEnd{"“"} @@ -1637,11 +1661,13 @@ ru{ } relativeTime{ future{ + few{"Через {0} дня"} many{"Через {0} дней"} one{"Через {0} день"} other{"Через {0} дня"} } past{ + few{"{0} дня назад"} many{"{0} дней назад"} one{"{0} день назад"} other{"{0} дня назад"} @@ -1665,11 +1691,13 @@ ru{ dn{"Час"} relativeTime{ future{ + few{"Через {0} часа"} many{"Через {0} часов"} one{"Через {0} час"} other{"Через {0} часа"} } past{ + few{"{0} часа назад"} many{"{0} часов назад"} one{"{0} час назад"} other{"{0} часа назад"} @@ -1680,11 +1708,13 @@ ru{ dn{"Минута"} relativeTime{ future{ + few{"Через {0} минуты"} many{"Через {0} минут"} one{"Через {0} минуту"} other{"Через {0} минуты"} } past{ + few{"{0} минуты назад"} many{"{0} минут назад"} one{"{0} минуту назад"} other{"{0} минуты назад"} @@ -1707,11 +1737,13 @@ ru{ } relativeTime{ future{ + few{"Через {0} месяца"} many{"Через {0} месяцев"} one{"Через {0} месяц"} other{"Через {0} месяца"} } past{ + few{"{0} месяца назад"} many{"{0} месяцев назад"} one{"{0} месяц назад"} other{"{0} месяца назад"} @@ -1732,11 +1764,13 @@ ru{ } relativeTime{ future{ + few{"Через {0} секунды"} many{"Через {0} секунд"} one{"Через {0} секунду"} other{"Через {0} секунды"} } past{ + few{"{0} секунды назад"} many{"{0} секунд назад"} one{"{0} секунду назад"} other{"{0} секунды назад"} @@ -1780,11 +1814,13 @@ ru{ } relativeTime{ future{ + few{"Через {0} недели"} many{"Через {0} недель"} one{"Через {0} неделю"} other{"Через {0} недели"} } past{ + few{"{0} недели назад"} many{"{0} недель назад"} one{"{0} неделю назад"} other{"{0} недели назад"} @@ -1803,11 +1839,13 @@ ru{ } relativeTime{ future{ + few{"Через {0} года"} many{"Через {0} лет"} one{"Через {0} год"} other{"Через {0} года"} } past{ + few{"{0} года назад"} many{"{0} лет назад"} one{"{0} год назад"} other{"{0} года назад"} @@ -1832,17 +1870,17 @@ ru{ start{"{0}, {1}"} } unit-narrow{ - 2{"{0} {1}"} - end{"{0}, {1}"} - middle{"{0}, {1}"} - start{"{0}, {1}"} - } - unit-short{ 2{"{0} {1}"} end{"{0} {1}"} middle{"{0} {1}"} start{"{0} {1}"} } + unit-short{ + 2{"{0}, {1}"} + end{"{0}, {1}"} + middle{"{0}, {1}"} + start{"{0}, {1}"} + } } measurementSystemNames{ UK{"Английская"} @@ -1864,6 +1902,7 @@ ru{ units{ acceleration{ g-force{ + few{"{0} G"} many{"{0} G"} one{"{0} G"} other{"{0} G"} @@ -1871,16 +1910,19 @@ ru{ } angle{ arc-minute{ + few{"{0} минуты"} many{"{0}минут"} one{"{0}минута"} other{"{0}минуты"} } arc-second{ + few{"{0} секунды"} many{"{0}секунд"} one{"{0}секунда"} other{"{0}секунды"} } degree{ + few{"{0} градуса"} many{"{0} градусов"} one{"{0}градус"} other{"{0} градуса"} @@ -1888,31 +1930,37 @@ ru{ } area{ acre{ + few{"{0} акра"} many{"{0} акров"} one{"{0} акр"} other{"{0} акра"} } hectare{ + few{"{0} гектара"} many{"{0} гектар"} one{"{0} гектар"} other{"{0} гектара"} } square-foot{ + few{"{0} квадратных фута"} many{"{0} квадратных футов"} one{"{0} квадратный фут"} other{"{0} квадратных фута"} } square-kilometer{ + few{"{0} квадратных километра"} many{"{0} квадратных километров"} one{"{0} квадратный километр"} other{"{0} квадратных километра"} } square-meter{ + few{"{0} квадратных метра"} many{"{0} квадратных метров"} one{"{0} квадратный метр"} other{"{0} квадратных метра"} } square-mile{ + few{"{0} квадратных мили"} many{"{0} квадратных миль"} one{"{0} квадратная миля"} other{"{0} квадратных мили"} @@ -1923,41 +1971,49 @@ ru{ } duration{ day{ + few{"{0} дня"} many{"{0} дней"} one{"{0} день"} other{"{0} дня"} } hour{ + few{"{0} часа"} many{"{0} часов"} one{"{0} час"} other{"{0} часа"} } millisecond{ + few{"{0} миллисекунды"} many{"{0} миллисекунды"} one{"{0} миллисекунда"} other{"{0} миллисекунды"} } minute{ + few{"{0} минуты"} many{"{0} минут"} one{"{0} минута"} other{"{0} минуты"} } month{ + few{"{0} месяца"} many{"{0} месяцев"} one{"{0} месяц"} other{"{0} месяца"} } second{ + few{"{0} секунды"} many{"{0} секунд"} one{"{0} секунда"} other{"{0} секунды"} } week{ + few{"{0} недели"} many{"{0} недель"} one{"{0} неделя"} other{"{0} недели"} } year{ + few{"{0} года"} many{"{0} лет"} one{"{0} год"} other{"{0} года"} @@ -1965,51 +2021,61 @@ ru{ } length{ centimeter{ + few{"{0} сантиметра"} many{"{0} сантиметров"} one{"{0} сантиметр"} other{"{0} сантиметра"} } foot{ + few{"{0} фута"} many{"{0} футов"} one{"{0} фут"} other{"{0} фута"} } inch{ + few{"{0} дюйма"} many{"{0} дюймов"} one{"{0} дюйм"} other{"{0} дюйма"} } kilometer{ + few{"{0} километра"} many{"{0} километров"} one{"{0} километр"} other{"{0} километра"} } light-year{ + few{"{0} световых года"} many{"{0} световых лет"} one{"{0} световой год"} other{"{0} световых года"} } meter{ + few{"{0} метра"} many{"{0} метров"} one{"{0} метр"} other{"{0} метра"} } mile{ + few{"{0} мили"} many{"{0} миль"} one{"{0} миля"} other{"{0} мили"} } millimeter{ + few{"{0} миллиметра"} many{"{0} миллиметров"} one{"{0} миллиметр"} other{"{0} миллиметра"} } picometer{ + few{"{0} пикометра"} many{"{0} пикометров"} one{"{0} пикометр"} other{"{0} пикометра"} } yard{ + few{"{0} ярда"} many{"{0} ярдов"} one{"{0} ярд"} other{"{0} ярда"} @@ -2017,21 +2083,25 @@ ru{ } mass{ gram{ + few{"{0} грамма"} many{"{0} грамм"} one{"{0} грамм"} other{"{0} грамма"} } kilogram{ + few{"{0} килограмма"} many{"{0} килограмм"} one{"{0} килограмм"} other{"{0} килограмма"} } ounce{ + few{"{0} унции"} many{"{0} унций"} one{"{0} унция"} other{"{0} унции"} } pound{ + few{"{0} фунта"} many{"{0} фунтов"} one{"{0} фунт"} other{"{0} фунта"} @@ -2039,16 +2109,19 @@ ru{ } power{ horsepower{ + few{"{0} лошадиных силы"} many{"{0} лошадиных сил"} one{"{0} лошадиная сила"} other{"{0} лошадиных сил"} } kilowatt{ + few{"{0} киловатта"} many{"{0} киловатт"} one{"{0} киловатт"} other{"{0} киловатта"} } watt{ + few{"{0} ватта"} many{"{0} ватт"} one{"{0} ватт"} other{"{0} ватта"} @@ -2056,16 +2129,19 @@ ru{ } pressure{ hectopascal{ + few{"{0} гектопаскаля"} many{"{0} гектопаскалей"} one{"{0} гектопаскаль"} other{"{0} гектопаскаля"} } inch-hg{ + few{"{0} дюйма ртутного столба"} many{"{0} дюймов ртутного столба"} one{"{0} дюйм ртутного столба"} other{"{0}дюйма ртутного столба"} } millibar{ + few{"{0} миллибара"} many{"{0} миллибар"} one{"{0} миллибар"} other{"{0} миллибара"} @@ -2073,16 +2149,19 @@ ru{ } speed{ kilometer-per-hour{ + few{"{0} километра в час"} many{"{0} километров в час"} one{"{0} километр в час"} other{"{0} километра в час"} } meter-per-second{ + few{"{0} метра в секундыу"} many{"{0} метров в секунду"} one{"{0} метр в секунду"} other{"{0} метра в секунду"} } mile-per-hour{ + few{"{0} мили в час"} many{"{0} миль в час"} one{"{0} миля в час"} other{"{0} миль в час"} @@ -2090,11 +2169,13 @@ ru{ } temperature{ celsius{ + few{"{0} градуса Цельсия"} many{"{0}градусов Цельсия"} one{"{0}градус Цельсия"} other{"{0}градуса Цельсия"} } fahrenheit{ + few{"{0} градуса по Фаренгейту"} many{"{0}градусов по Фаренгейту"} one{"{0}градус по Фаренгейту"} other{"{0}градуса по Фаренгейту"} @@ -2102,16 +2183,19 @@ ru{ } volume{ cubic-kilometer{ + few{"{0} кубических километра"} many{"{0} кубических километров"} one{"{0} кубический километр"} other{"{0} кубических километра"} } cubic-mile{ + few{"{0} кубических мили"} many{"{0} кубических мили"} one{"{0} кубическая миля"} other{"{0} кубических мили"} } liter{ + few{"{0} литра"} many{"{0} литра"} one{"{0} литр"} other{"{0} литра"} @@ -2121,6 +2205,7 @@ ru{ unitsNarrow{ acceleration{ g-force{ + few{"{0} G"} many{"{0} G"} one{"{0} G"} other{"{0} G"} @@ -2128,16 +2213,19 @@ ru{ } angle{ arc-minute{ + few{"{0}′"} many{"{0}′"} one{"{0}′"} other{"{0}′"} } arc-second{ + few{"{0}″"} many{"{0}″"} one{"{0}″"} other{"{0}″"} } degree{ + few{"{0}°"} many{"{0}°"} one{"{0}°"} other{"{0}°"} @@ -2145,31 +2233,37 @@ ru{ } area{ acre{ + few{"{0} акра"} many{"{0} акров"} one{"{0} акр"} other{"{0} акра"} } hectare{ + few{"{0} га"} many{"{0} га"} one{"{0} га"} other{"{0} га"} } square-foot{ + few{"{0} кв. фута"} many{"{0} кв. футов"} one{"{0} кв. фут"} other{"{0} кв. фута"} } square-kilometer{ + few{"{0} км²"} many{"{0} км²"} one{"{0} км²"} other{"{0} км²"} } square-meter{ + few{"{0} м²"} many{"{0} м²"} one{"{0} м²"} other{"{0} м²"} } square-mile{ + few{"{0} кв. мили"} many{"{0} кв. миль"} one{"{0} кв. миля"} other{"{0} кв. мили"} @@ -2180,41 +2274,49 @@ ru{ } duration{ day{ + few{"{0} д."} many{"{0} д."} one{"{0} д."} other{"{0} д."} } hour{ + few{"{0} ч"} many{"{0} ч"} one{"{0} ч"} other{"{0} ч"} } millisecond{ + few{"{0} мс"} many{"{0} мс"} one{"{0} мс"} other{"{0} мс"} } minute{ + few{"{0} мин"} many{"{0} мин"} one{"{0} м."} other{"{0} мин"} } month{ + few{"{0} м."} many{"{0} м."} one{"{0} м."} other{"{0} м."} } second{ + few{"{0} с"} many{"{0} с"} one{"{0} с"} other{"{0} с"} } week{ + few{"{0} н."} many{"{0} н."} one{"{0} н."} other{"{0} н."} } year{ + few{"{0} л."} many{"{0} л."} one{"{0} г."} other{"{0} г."} @@ -2222,51 +2324,61 @@ ru{ } length{ centimeter{ + few{"{0} см"} many{"{0} см"} one{"{0} см"} other{"{0} см"} } foot{ + few{"{0} фута"} many{"{0} футов"} one{"{0} фут"} other{"{0} фута"} } inch{ + few{"{0} дюйма"} many{"{0} дюймов"} one{"{0} дюйм"} other{"{0} дюйма"} } kilometer{ + few{"{0} км"} many{"{0} км"} one{"{0} км"} other{"{0} км"} } light-year{ + few{"{0} св. л."} many{"{0} св. л."} one{"{0} св. г."} other{"{0} св. г."} } meter{ + few{"{0} м"} many{"{0} м"} one{"{0} м"} other{"{0} м"} } mile{ + few{"{0} миль"} many{"{0} миль"} one{"{0} миля"} other{"{0} мили"} } millimeter{ + few{"{0} мм"} many{"{0} мм"} one{"{0} мм"} other{"{0} мм"} } picometer{ + few{"{0} pm"} many{"{0} pm"} one{"{0} pm"} other{"{0} pm"} } yard{ + few{"{0} ярда"} many{"{0} ярдов"} one{"{0} ярд"} other{"{0} ярда"} @@ -2274,21 +2386,25 @@ ru{ } mass{ gram{ + few{"{0} гр"} many{"{0} гр"} one{"{0} гр"} other{"{0} гр"} } kilogram{ + few{"{0} кг"} many{"{0} кг"} one{"{0} кг"} other{"{0} кг"} } ounce{ + few{"{0} oz"} many{"{0} oz"} one{"{0} oz"} other{"{0} oz"} } pound{ + few{"{0} lb"} many{"{0} lb"} one{"{0} lb"} other{"{0} lb"} @@ -2296,16 +2412,19 @@ ru{ } power{ horsepower{ + few{"{0} л.с."} many{"{0} л.с."} one{"{0} л.с."} other{"{0} л.с."} } kilowatt{ + few{"{0} кВт"} many{"{0} кВт"} one{"{0} кВт"} other{"{0} кВт"} } watt{ + few{"{0} Вт"} many{"{0} Вт"} one{"{0} Вт"} other{"{0} Вт"} @@ -2313,16 +2432,19 @@ ru{ } pressure{ hectopascal{ + few{"{0} гПа"} many{"{0} гПа"} one{"{0} гПа"} other{"{0} гПа"} } inch-hg{ + few{"{0} inHg"} many{"{0} inHg"} one{"{0} inHg"} other{"{0} inHg"} } millibar{ + few{"{0} мбар"} many{"{0} мбар"} one{"{0} мбар"} other{"{0} мбар"} @@ -2330,16 +2452,19 @@ ru{ } speed{ kilometer-per-hour{ + few{"{0} км/ч"} many{"{0} км/ч"} one{"{0} км/ч"} other{"{0} км/ч"} } meter-per-second{ + few{"{0} м/с"} many{"{0} м/с"} one{"{0} м/с"} other{"{0} м/с"} } mile-per-hour{ + few{"{0} миль/ч"} many{"{0} миль/ч"} one{"{0} миль/ч"} other{"{0} миль/ч"} @@ -2347,11 +2472,13 @@ ru{ } temperature{ celsius{ + few{"{0} °"} many{"{0} °"} one{"{0} °"} other{"{0} °"} } fahrenheit{ + few{"{0}°F"} many{"{0}°F"} one{"{0}°F"} other{"{0}°F"} @@ -2359,16 +2486,19 @@ ru{ } volume{ cubic-kilometer{ + few{"{0} км³"} many{"{0} км³"} one{"{0} км³"} other{"{0} км³"} } cubic-mile{ + few{"{0} куб. мили"} many{"{0} куб. мили"} one{"{0} куб. миля"} other{"{0} куб. мили"} } liter{ + few{"{0} л"} many{"{0} л"} one{"{0} л"} other{"{0} л"} @@ -2378,6 +2508,7 @@ ru{ unitsShort{ acceleration{ g-force{ + few{"{0} G"} many{"{0} G"} one{"{0} G"} other{"{0} G"} @@ -2385,16 +2516,19 @@ ru{ } angle{ arc-minute{ + few{"{0}′"} many{"{0}′"} one{"{0}′"} other{"{0}′"} } arc-second{ + few{"{0}″"} many{"{0}″"} one{"{0}″"} other{"{0}″"} } degree{ + few{"{0}°"} many{"{0}°"} one{"{0}°"} other{"{0}°"} @@ -2402,31 +2536,37 @@ ru{ } area{ acre{ + few{"{0} акра"} many{"{0} акров"} one{"{0} акр"} other{"{0} акра"} } hectare{ + few{"{0} га"} many{"{0} га"} one{"{0} га"} other{"{0} га"} } square-foot{ + few{"{0} кв. фута"} many{"{0} кв. футов"} one{"{0} кв. фут"} other{"{0} кв. фута"} } square-kilometer{ + few{"{0} км²"} many{"{0} км²"} one{"{0} км²"} other{"{0} км²"} } square-meter{ + few{"{0} м²"} many{"{0} м²"} one{"{0} м²"} other{"{0} м²"} } square-mile{ + few{"{0} кв. мили"} many{"{0} кв. миль"} one{"{0} кв. миля"} other{"{0} кв. мили"} @@ -2437,41 +2577,49 @@ ru{ } duration{ day{ + few{"{0} дн"} many{"{0} дн"} one{"{0} дн"} other{"{0} дн"} } hour{ + few{"{0} ч"} many{"{0} ч"} one{"{0} ч"} other{"{0} ч"} } millisecond{ + few{"{0} мс"} many{"{0} мс"} one{"{0} мс"} other{"{0} мс"} } minute{ + few{"{0} мин"} many{"{0} мин"} one{"{0} мин"} other{"{0} мин"} } month{ + few{"{0} мес"} many{"{0} мес"} one{"{0} мес"} other{"{0} мес"} } second{ + few{"{0} с"} many{"{0} с"} one{"{0} с"} other{"{0} с"} } week{ + few{"{0} нед"} many{"{0} нед"} one{"{0} нед"} other{"{0} нед"} } year{ + few{"{0} года"} many{"{0} лет"} one{"{0} г."} other{"{0} г."} @@ -2479,51 +2627,61 @@ ru{ } length{ centimeter{ + few{"{0} см"} many{"{0} см"} one{"{0} см"} other{"{0} см"} } foot{ + few{"{0} фута"} many{"{0} футов"} one{"{0} фут"} other{"{0} фута"} } inch{ + few{"{0} дюйма"} many{"{0} дюймов"} one{"{0} дюйм"} other{"{0} дюйма"} } kilometer{ + few{"{0} км"} many{"{0} км"} one{"{0} км"} other{"{0} км"} } light-year{ + few{"{0} св. л."} many{"{0} св. л."} one{"{0} св. г."} other{"{0} св. г."} } meter{ + few{"{0} м"} many{"{0} м"} one{"{0} м"} other{"{0} м"} } mile{ + few{"{0} мили"} many{"{0} миль"} one{"{0} миля"} other{"{0} мили"} } millimeter{ + few{"{0} мм"} many{"{0} мм"} one{"{0} мм"} other{"{0} мм"} } picometer{ + few{"{0} pm"} many{"{0} pm"} one{"{0} pm"} other{"{0} pm"} } yard{ + few{"{0} ярда"} many{"{0} ярдов"} one{"{0} ярд"} other{"{0} ярда"} @@ -2531,21 +2689,25 @@ ru{ } mass{ gram{ + few{"{0} гр"} many{"{0} гр"} one{"{0} гр"} other{"{0} гр"} } kilogram{ + few{"{0} кг"} many{"{0} кг"} one{"{0} кг"} other{"{0} кг"} } ounce{ + few{"{0} oz"} many{"{0} oz"} one{"{0} oz"} other{"{0} oz"} } pound{ + few{"{0} lb"} many{"{0} lb"} one{"{0} lb"} other{"{0} lb"} @@ -2553,16 +2715,19 @@ ru{ } power{ horsepower{ + few{"{0} л.с."} many{"{0} л.с."} one{"{0} л.с."} other{"{0} л.с."} } kilowatt{ + few{"{0} кВт"} many{"{0} кВт"} one{"{0} кВт"} other{"{0} кВт"} } watt{ + few{"{0} Вт"} many{"{0} Вт"} one{"{0} Вт"} other{"{0} Вт"} @@ -2570,16 +2735,19 @@ ru{ } pressure{ hectopascal{ + few{"{0} гПа"} many{"{0} гПа"} one{"{0} гПа"} other{"{0} гПа"} } inch-hg{ + few{"{0} дюйма рт. ст"} many{"{0} дюймов рт. ст"} one{"{0} дюйм рт. ст"} other{"{0} дюйма рт. ст"} } millibar{ + few{"{0} мбар"} many{"{0} мбар"} one{"{0} мбар"} other{"{0} мбар"} @@ -2587,16 +2755,19 @@ ru{ } speed{ kilometer-per-hour{ + few{"{0} км/ч"} many{"{0} км/ч"} one{"{0} км/ч"} other{"{0} км/ч"} } meter-per-second{ + few{"{0} м/с"} many{"{0} м/с"} one{"{0} м/с"} other{"{0} м/с"} } mile-per-hour{ + few{"{0} мили/час"} many{"{0} миль/час"} one{"{0} миль/час"} other{"{0} миль/час"} @@ -2604,11 +2775,13 @@ ru{ } temperature{ celsius{ + few{"{0} °C"} many{"{0} °C"} one{"{0} °C"} other{"{0} °C"} } fahrenheit{ + few{"{0}°F"} many{"{0}°F"} one{"{0}°F"} other{"{0}°F"} @@ -2616,16 +2789,19 @@ ru{ } volume{ cubic-kilometer{ + few{"{0} км³"} many{"{0} км³"} one{"{0} км³"} other{"{0} км³"} } cubic-mile{ + few{"{0} куб. мили"} many{"{0} куб. мили"} one{"{0} куб. миля"} other{"{0} куб. мили"} } liter{ + few{"{0} л"} many{"{0} л"} one{"{0} л"} other{"{0} л"} diff --git a/icu4c/source/data/locales/ses.txt b/icu4c/source/data/locales/ses.txt index 27c576bea83..0226248fa0a 100755 --- a/icu4c/source/data/locales/ses.txt +++ b/icu4c/source/data/locales/ses.txt @@ -26,7 +26,7 @@ ses{ } } } - Version{"2.0.92.87"} + Version{"2.0.97.28"} calendar{ generic{ DateTimePatterns{ @@ -51,7 +51,6 @@ ses{ MMMMEd{"E d MMMM"} MMMMd{"d MMMM"} MMMd{"d MMM"} - MMMdd{"dd MMM"} MMd{"d/MM"} MMdd{"dd/MM"} Md{"d/M"} @@ -95,7 +94,6 @@ ses{ MMMMEd{"E d MMMM"} MMMMd{"d MMMM"} MMMd{"d MMM"} - MMMdd{"dd MMM"} MMd{"d/MM"} MMdd{"dd/MM"} Md{"d/M"} diff --git a/icu4c/source/data/locales/sg.txt b/icu4c/source/data/locales/sg.txt index cbdd4f2952e..f3336932257 100755 --- a/icu4c/source/data/locales/sg.txt +++ b/icu4c/source/data/locales/sg.txt @@ -27,7 +27,7 @@ sg{ } } } - Version{"2.0.92.87"} + Version{"2.0.97.28"} calendar{ generic{ DateTimePatterns{ @@ -52,7 +52,6 @@ sg{ MMMMEd{"E d MMMM"} MMMMd{"d MMMM"} MMMd{"d MMM"} - MMMdd{"dd MMM"} MMd{"d/MM"} MMdd{"dd/MM"} Md{"d/M"} @@ -94,7 +93,6 @@ sg{ MMMMEd{"E d MMMM"} MMMMd{"d MMMM"} MMMd{"d MMM"} - MMMdd{"dd MMM"} MMd{"d/MM"} MMdd{"dd/MM"} Md{"d/M"} diff --git a/icu4c/source/data/locales/shi.txt b/icu4c/source/data/locales/shi.txt index ac0446e5597..8019c1ea487 100755 --- a/icu4c/source/data/locales/shi.txt +++ b/icu4c/source/data/locales/shi.txt @@ -26,7 +26,7 @@ shi{ } } } - Version{"2.0.92.87"} + Version{"2.0.97.28"} calendar{ generic{ DateTimePatterns{ @@ -51,7 +51,6 @@ shi{ MMMMEd{"E d MMMM"} MMMMd{"d MMMM"} MMMd{"d MMM"} - MMMdd{"dd MMM"} MMd{"d/MM"} MMdd{"dd/MM"} Md{"d/M"} @@ -93,7 +92,6 @@ shi{ MMMMEd{"E d MMMM"} MMMMd{"d MMMM"} MMMd{"d MMM"} - MMMdd{"dd MMM"} MMd{"d/MM"} MMdd{"dd/MM"} Md{"d/M"} diff --git a/icu4c/source/data/locales/shi_Latn.txt b/icu4c/source/data/locales/shi_Latn.txt index 63e72e05bcc..074bffebb25 100755 --- a/icu4c/source/data/locales/shi_Latn.txt +++ b/icu4c/source/data/locales/shi_Latn.txt @@ -28,7 +28,7 @@ shi_Latn{ } } } - Version{"2.0.92.87"} + Version{"2.0.97.28"} calendar{ generic{ DateTimePatterns{ @@ -53,7 +53,6 @@ shi_Latn{ MMMMEd{"E d MMMM"} MMMMd{"d MMMM"} MMMd{"d MMM"} - MMMdd{"dd MMM"} MMd{"d/MM"} MMdd{"dd/MM"} Md{"d/M"} @@ -95,7 +94,6 @@ shi_Latn{ MMMMEd{"E d MMMM"} MMMMd{"d MMMM"} MMMd{"d MMM"} - MMMdd{"dd MMM"} MMd{"d/MM"} MMdd{"dd/MM"} Md{"d/M"} diff --git a/icu4c/source/data/locales/sq.txt b/icu4c/source/data/locales/sq.txt index 4ec19153c86..3521ad5039f 100644 --- a/icu4c/source/data/locales/sq.txt +++ b/icu4c/source/data/locales/sq.txt @@ -158,7 +158,7 @@ sq{ } } } - Version{"2.0.92.87"} + Version{"2.0.97.28"} calendar{ generic{ DateTimePatterns{ @@ -320,7 +320,6 @@ sq{ MMMEd{"E d MMM"} MMMMEd{"E d MMMM"} MMMMd{"d MMMM"} - MMMMdd{"dd MMMM"} MMMd{"d MMM"} MMdd{"dd/MM"} Md{"d/M"} diff --git a/icu4c/source/data/locales/sr.txt b/icu4c/source/data/locales/sr.txt index b4d6fce83cd..e9071d66e1b 100644 --- a/icu4c/source/data/locales/sr.txt +++ b/icu4c/source/data/locales/sr.txt @@ -182,7 +182,7 @@ sr{ } } } - Version{"2.0.96.25"} + Version{"2.0.97.28"} calendar{ buddhist{ eras{ @@ -264,7 +264,6 @@ sr{ MMMEd{"E d. MMM"} MMMMEd{"E d. MMMM"} MMMMd{"d. MMMM"} - MMMMdd{"dd. MMMM"} MMMd{"d. MMM"} MMMdd{"dd.MMM"} MMdd{"MM-dd"} @@ -426,7 +425,6 @@ sr{ MMMEd{"E d. MMM"} MMMMEd{"E d. MMMM"} MMMMd{"d. MMMM"} - MMMMdd{"dd. MMMM"} MMMd{"d. MMM"} MMMdd{"dd.MMM"} MMdd{"MM-dd"} diff --git a/icu4c/source/data/locales/sr_Latn.txt b/icu4c/source/data/locales/sr_Latn.txt index 8cfe2563b7d..4ef7d084df4 100644 --- a/icu4c/source/data/locales/sr_Latn.txt +++ b/icu4c/source/data/locales/sr_Latn.txt @@ -183,7 +183,7 @@ sr_Latn{ } } } - Version{"2.0.96.25"} + Version{"2.0.97.28"} calendar{ buddhist{ eras{ @@ -265,7 +265,6 @@ sr_Latn{ MMMEd{"E d. MMM"} MMMMEd{"E d. MMMM"} MMMMd{"d. MMMM"} - MMMMdd{"dd. MMMM"} MMMd{"d. MMM"} MMMdd{"dd.MMM"} MMdd{"MM-dd"} @@ -427,7 +426,6 @@ sr_Latn{ MMMEd{"E d. MMM"} MMMMEd{"E d. MMMM"} MMMMd{"d. MMMM"} - MMMMdd{"dd. MMMM"} MMMd{"d. MMM"} MMMdd{"dd.MMM"} MMdd{"MM-dd"} diff --git a/icu4c/source/data/locales/sv.txt b/icu4c/source/data/locales/sv.txt index f7388412d5f..7913d9de70e 100644 --- a/icu4c/source/data/locales/sv.txt +++ b/icu4c/source/data/locales/sv.txt @@ -161,7 +161,7 @@ sv{ } } } - Version{"2.0.95.66"} + Version{"2.0.97.50"} calendar{ buddhist{ eras{ @@ -1425,7 +1425,7 @@ sv{ } } contextTransforms{ - displayName:intvector{ + currencyName:intvector{ 1, 1, } diff --git a/icu4c/source/data/locales/sw.txt b/icu4c/source/data/locales/sw.txt index 5ba47b935d9..14e2a424aee 100644 --- a/icu4c/source/data/locales/sw.txt +++ b/icu4c/source/data/locales/sw.txt @@ -156,7 +156,7 @@ sw{ } } } - Version{"2.0.92.87"} + Version{"2.0.97.40"} calendar{ generic{ DateTimePatterns{ @@ -365,13 +365,13 @@ sw{ dayNames{ format{ abbreviated{ - "J2", - "J3", - "J4", - "J5", - "Alh", - "Ij", - "J1", + "Jumapili", + "Jumatatu", + "Jumanne", + "Jumatano", + "Alhamisi", + "Ijumaa", + "Jumamosi", } short{ "Jumapili", diff --git a/icu4c/source/data/locales/te.txt b/icu4c/source/data/locales/te.txt index 3a7a784f42f..7b82de8e6b5 100644 --- a/icu4c/source/data/locales/te.txt +++ b/icu4c/source/data/locales/te.txt @@ -339,6 +339,7 @@ te{ "{1} {0}", "{1} {0}", } + NoonMarker{"సాయంకాలం"} appendItems{ Timezone{"{0} {1}"} } diff --git a/icu4c/source/data/locales/tr.txt b/icu4c/source/data/locales/tr.txt index 6e6b12b1e5d..f58a125336f 100644 --- a/icu4c/source/data/locales/tr.txt +++ b/icu4c/source/data/locales/tr.txt @@ -164,7 +164,7 @@ tr{ } } } - Version{"2.0.95.37"} + Version{"2.0.97.50"} calendar{ buddhist{ eras{ @@ -879,7 +879,7 @@ tr{ } } contextTransforms{ - tense:intvector{ + relative:intvector{ 1, 1, } diff --git a/icu4c/source/data/locales/uk.txt b/icu4c/source/data/locales/uk.txt index 907657fc01b..4d206645e2d 100644 --- a/icu4c/source/data/locales/uk.txt +++ b/icu4c/source/data/locales/uk.txt @@ -205,7 +205,7 @@ uk{ } } } - Version{"2.0.95.37"} + Version{"2.0.97.50"} calendar{ coptic{ monthNames{ @@ -842,7 +842,7 @@ uk{ 1, 1, } - tense:intvector{ + relative:intvector{ 1, 1, } diff --git a/icu4c/source/data/locales/zh.txt b/icu4c/source/data/locales/zh.txt index 0b9223593d2..11abacae4cd 100644 --- a/icu4c/source/data/locales/zh.txt +++ b/icu4c/source/data/locales/zh.txt @@ -199,7 +199,7 @@ zh{ native{"hanidec"} traditional{"hans"} } - Version{"2.0.96.40"} + Version{"2.0.97.32"} calendar{ buddhist{ DateTimePatterns{ @@ -250,16 +250,16 @@ zh{ "ah:mm:ss", "ah:mm", { - "U年MMMd日EEEE", - "hanidec", + "U年MMMdEEEE", + "d=hanidays", } { - "U年MMMd日", - "hanidec", + "U年MMMd", + "d=hanidays", } { - "U年MMMd日", - "hanidec", + "U年MMMd", + "d=hanidays", } "U-M-d", "{1} {0}", @@ -281,14 +281,14 @@ zh{ Md{"M-d"} d{"d日"} y{"U年"} - yMd{"U年M月d日"} + yMd{"U年MMMd日"} yyyy{"U年"} - yyyyM{"U年M月"} - yyyyMEd{"U年M月d日，E"} + yyyyM{"U年MMM"} + yyyyMEd{"U年MMMd日，E"} yyyyMMM{"U年MMM"} yyyyMMMEd{"U年MMMd日E"} yyyyMMMd{"U年MMMd日"} - yyyyMd{"U年M月d日"} + yyyyMd{"U年MMMd日"} yyyyQQQ{"U年QQQQ"} yyyyQQQQ{"U年QQQQ"} } @@ -493,8 +493,8 @@ zh{ "八月", "九月", "十月", - "十一月", - "十二月", + "冬月", + "腊月", } narrow{ "正", @@ -507,8 +507,8 @@ zh{ "八", "九", "十", - "十一", - "十二", + "冬", + "腊", } wide{ "正月", @@ -521,8 +521,8 @@ zh{ "八月", "九月", "十月", - "十一月", - "十二月", + "冬月", + "腊月", } } stand-alone{ @@ -537,8 +537,8 @@ zh{ "八月", "九月", "十月", - "十一月", - "十二月", + "冬月", + "腊月", } narrow{ "正", @@ -551,8 +551,8 @@ zh{ "八", "九", "十", - "十一", - "十二", + "冬", + "腊", } wide{ "正月", @@ -565,8 +565,8 @@ zh{ "八月", "九月", "十月", - "十一月", - "十二月", + "冬月", + "腊月", } } } @@ -948,6 +948,8 @@ zh{ "{1} {0}", "{1} {0}", } + NoonMarker{"中午"} + NoonMarkerNarrow{"中午"} appendItems{ Timezone{"{1}{0}"} } diff --git a/icu4c/source/data/locales/zh_Hant.txt b/icu4c/source/data/locales/zh_Hant.txt index d17865d4810..979180b3cf1 100644 --- a/icu4c/source/data/locales/zh_Hant.txt +++ b/icu4c/source/data/locales/zh_Hant.txt @@ -205,7 +205,7 @@ zh_Hant{ native{"hanidec"} traditional{"hant"} } - Version{"2.0.96.40"} + Version{"2.0.97.32"} calendar{ buddhist{ DateTimePatterns{ @@ -260,16 +260,16 @@ zh_Hant{ "ah:mm:ss", "ah:mm", { - "U年MMMd日EEEE", - "hanidec", + "U年MMMdEEEE", + "d=hanidays", } { - "U年MMMd日", - "hanidec", + "U年MMMd", + "d=hanidays", } { - "U年MMMd日", - "hanidec", + "U年MMMd", + "d=hanidays", } "U/M/d", "{1} {0}", @@ -291,14 +291,14 @@ zh_Hant{ Md{"M/d"} d{"d日"} y{"U年"} - yMd{"U年M月d日"} + yMd{"U年MMMd日"} yyyy{"U年"} - yyyyM{"U年M月"} - yyyyMEd{"U年M月d日，E"} + yyyyM{"U年MMM"} + yyyyMEd{"U年MMMd日，E"} yyyyMMM{"U年MMM"} yyyyMMMEd{"U年MMMd日E"} yyyyMMMd{"U年MMMd日"} - yyyyMd{"U年M月d日"} + yyyyMd{"U年MMMd日"} yyyyQQQ{"U年QQQQ"} yyyyQQQQ{"U年QQQQ"} } @@ -415,7 +415,7 @@ zh_Hant{ H{"HH–HH [v]"} } M{ - M{"M月至M月"} + M{"MMM至MMM"} } MEd{ M{"M/dE至M/dE"} @@ -510,8 +510,8 @@ zh_Hant{ "八月", "九月", "十月", - "十一月", - "十二月", + "冬月", + "臘月", } narrow{ "正", @@ -524,8 +524,8 @@ zh_Hant{ "八", "九", "十", - "十一", - "十二", + "冬", + "臘", } wide{ "正月", @@ -538,8 +538,8 @@ zh_Hant{ "八月", "九月", "十月", - "十一月", - "十二月", + "冬月", + "臘月", } } stand-alone{ @@ -554,8 +554,8 @@ zh_Hant{ "八月", "九月", "十月", - "十一月", - "十二月", + "冬月", + "臘月", } narrow{ "正", @@ -568,8 +568,8 @@ zh_Hant{ "八", "九", "十", - "十一", - "十二", + "冬", + "臘", } wide{ "正月", @@ -582,8 +582,8 @@ zh_Hant{ "八月", "九月", "十月", - "十一月", - "十二月", + "冬月", + "臘月", } } } @@ -1181,6 +1181,8 @@ zh_Hant{ "{1} {0}", "{1} {0}", } + NoonMarker{"中午"} + NoonMarkerNarrow{"中午"} appendItems{ Timezone{"{0} {1}"} } diff --git a/icu4c/source/data/misc/likelySubtags.txt b/icu4c/source/data/misc/likelySubtags.txt index dafa78f1fb0..cf6d4e21aba 100644 --- a/icu4c/source/data/misc/likelySubtags.txt +++ b/icu4c/source/data/misc/likelySubtags.txt @@ -82,6 +82,7 @@ likelySubtags:table(nofallback){ crk{"crk_Cans_CA"} cs{"cs_Latn_CZ"} csb{"csb_Latn_PL"} + cu{"cu_Cyrl_RU"} cv{"cv_Cyrl_RU"} cy{"cy_Latn_GB"} da{"da_Latn_DK"} diff --git a/icu4c/source/data/misc/numberingSystems.txt b/icu4c/source/data/misc/numberingSystems.txt index feafe80c959..494e0d083c9 100644 --- a/icu4c/source/data/misc/numberingSystems.txt +++ b/icu4c/source/data/misc/numberingSystems.txt @@ -83,6 +83,11 @@ numberingSystems:table(nofallback){ desc{"੦੧੨੩੪੫੬੭੮੯"} radix:int{10} } + hanidays{ + algorithmic:int{1} + desc{"zh/SpelloutRules/%spellout-numbering-days"} + radix:int{10} + } hanidec{ algorithmic:int{0} desc{"〇一二三四五六七八九"} diff --git a/icu4c/source/data/misc/plurals.txt b/icu4c/source/data/misc/plurals.txt index 40a62c0d97b..46bef1dc6fa 100644 --- a/icu4c/source/data/misc/plurals.txt +++ b/icu4c/source/data/misc/plurals.txt @@ -50,7 +50,7 @@ plurals:table(nofallback){ fo{"set2"} fr{"set4"} fur{"set2"} - fy{"set2"} + fy{"set26"} ga{"set7"} gd{"set23"} gl{"set26"} @@ -186,7 +186,7 @@ plurals:table(nofallback){ tr{"set2"} ts{"set2"} tzm{"set21"} - uk{"set35"} + uk{"set34"} ur{"set26"} uz{"set2"} ve{"set2"} @@ -204,84 +204,85 @@ plurals:table(nofallback){ zu{"set30"} } locales_ordinals{ - af{"set36"} - am{"set36"} - ar{"set36"} - az{"set51"} - bg{"set36"} - bn{"set45"} - ca{"set42"} - cs{"set36"} - cy{"set52"} - da{"set36"} - de{"set36"} - el{"set36"} - en{"set40"} - es{"set36"} - et{"set36"} - eu{"set36"} - fa{"set36"} - fi{"set36"} - fil{"set37"} - fr{"set37"} - gl{"set36"} - gu{"set44"} - he{"set36"} - hi{"set44"} - hr{"set36"} - hu{"set38"} - hy{"set37"} - id{"set36"} - in{"set36"} - is{"set36"} - it{"set41"} - iw{"set36"} - ja{"set36"} - ka{"set49"} - kk{"set48"} - km{"set36"} - kn{"set36"} - ko{"set36"} - ky{"set36"} - lo{"set37"} - lt{"set36"} - lv{"set36"} - mk{"set36"} - ml{"set36"} - mn{"set36"} - mo{"set37"} - mr{"set43"} - ms{"set37"} - my{"set36"} - nb{"set36"} - ne{"set47"} - nl{"set36"} - pa{"set36"} - pl{"set36"} - prg{"set36"} - pt{"set36"} - ro{"set37"} - root{"set36"} - ru{"set36"} - sh{"set36"} - si{"set36"} - sk{"set36"} - sl{"set36"} - sq{"set50"} - sr{"set36"} - sv{"set39"} - sw{"set36"} - ta{"set36"} - te{"set36"} - th{"set36"} - tl{"set37"} - tr{"set36"} - uk{"set36"} - ur{"set36"} - uz{"set36"} - vi{"set37"} - zh{"set36"} - zu{"set46"} + af{"set35"} + am{"set35"} + ar{"set35"} + az{"set50"} + bg{"set35"} + bn{"set44"} + ca{"set41"} + cs{"set35"} + cy{"set51"} + da{"set35"} + de{"set35"} + el{"set35"} + en{"set39"} + es{"set35"} + et{"set35"} + eu{"set35"} + fa{"set35"} + fi{"set35"} + fil{"set36"} + fr{"set36"} + fy{"set35"} + gl{"set35"} + gu{"set43"} + he{"set35"} + hi{"set43"} + hr{"set35"} + hu{"set37"} + hy{"set36"} + id{"set35"} + in{"set35"} + is{"set35"} + it{"set40"} + iw{"set35"} + ja{"set35"} + ka{"set48"} + kk{"set47"} + km{"set35"} + kn{"set35"} + ko{"set35"} + ky{"set35"} + lo{"set36"} + lt{"set35"} + lv{"set35"} + mk{"set35"} + ml{"set35"} + mn{"set35"} + mo{"set36"} + mr{"set42"} + ms{"set36"} + my{"set35"} + nb{"set35"} + ne{"set46"} + nl{"set35"} + pa{"set35"} + pl{"set35"} + prg{"set35"} + pt{"set35"} + ro{"set36"} + root{"set35"} + ru{"set35"} + sh{"set35"} + si{"set35"} + sk{"set35"} + sl{"set35"} + sq{"set49"} + sr{"set35"} + sv{"set38"} + sw{"set35"} + ta{"set35"} + te{"set35"} + th{"set35"} + tl{"set36"} + tr{"set35"} + uk{"set35"} + ur{"set35"} + uz{"set35"} + vi{"set36"} + zh{"set35"} + zu{"set45"} } rules{ set0{ @@ -621,20 +622,6 @@ plurals:table(nofallback){ } } set34{ - many{ - "v = 0 and i % 10 = 0 or v = 0 and i % 10 = 5..9 or v = 0 and i % 100" - " = 11..14 @integer 0, 5~19, 100, 1000, 10000, 100000, 1000000, …" - } - one{ - "v = 0 and i % 10 = 1 and i % 100 != 11 @integer 1, 21, 31, 41, 51, 6" - "1, 71, 81, 101, 1001, …" - } - other{ - " @integer 2~4, 22~24, 32~34, 42~44, 52~54, 62, 102, 1002, … @decimal" - " 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …" - } - } - set35{ few{ "v = 0 and i % 10 = 2..4 and i % 100 != 12..14 @integer 2~4, 22~24, 3" "2~34, 42~44, 52~54, 62, 102, 1002, …" @@ -652,32 +639,25 @@ plurals:table(nofallback){ ".0, …" } } - set36{ + set35{ other{" @integer 0~15, 100, 1000, 10000, 100000, 1000000, …"} } - set37{ + set36{ one{"n = 1 @integer 1"} other{" @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, …"} } - set38{ + set37{ one{"n = 1,5 @integer 1, 5"} other{" @integer 0, 2~4, 6~17, 100, 1000, 10000, 100000, 1000000, …"} } - set39{ + set38{ one{ "n % 10 = 1,2 and n % 100 != 11,12 @integer 1, 2, 21, 22, 31, 32, 41," " 42, 51, 52, 61, 62, 71, 72, 81, 82, 101, 1001, …" } other{" @integer 0, 3~17, 100, 1000, 10000, 100000, 1000000, …"} } - set4{ - one{"i = 0,1 @integer 0, 1 @decimal 0.0~1.5"} - other{ - " @integer 2~17, 100, 1000, 10000, 100000, 1000000, … @decimal 2.0~3." - "5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …" - } - } - set40{ + set39{ few{ "n % 10 = 3 and n % 100 != 13 @integer 3, 23, 33, 43, 53, 63, 73, 83," " 103, 1003, …" @@ -692,47 +672,54 @@ plurals:table(nofallback){ " 102, 1002, …" } } - set41{ + set4{ + one{"i = 0,1 @integer 0, 1 @decimal 0.0~1.5"} + other{ + " @integer 2~17, 100, 1000, 10000, 100000, 1000000, … @decimal 2.0~3." + "5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …" + } + } + set40{ many{"n = 11,8,80,800 @integer 8, 11, 80, 800"} other{" @integer 0~7, 9, 10, 12~17, 100, 1000, 10000, 100000, 1000000, …"} } - set42{ + set41{ few{"n = 4 @integer 4"} one{"n = 1,3 @integer 1, 3"} other{" @integer 0, 5~19, 100, 1000, 10000, 100000, 1000000, …"} two{"n = 2 @integer 2"} } - set43{ + set42{ few{"n = 4 @integer 4"} one{"n = 1 @integer 1"} other{" @integer 0, 5~19, 100, 1000, 10000, 100000, 1000000, …"} two{"n = 2,3 @integer 2, 3"} } - set44{ + set43{ few{"n = 4 @integer 4"} many{"n = 6 @integer 6"} one{"n = 1 @integer 1"} other{" @integer 0, 5, 7~20, 100, 1000, 10000, 100000, 1000000, …"} two{"n = 2,3 @integer 2, 3"} } - set45{ + set44{ few{"n = 4 @integer 4"} many{"n = 6 @integer 6"} one{"n = 1,5,7,8,9,10 @integer 1, 5, 7~10"} other{" @integer 0, 11~25, 100, 1000, 10000, 100000, 1000000, …"} two{"n = 2,3 @integer 2, 3"} } - set46{ + set45{ few{"n = 2..9 @integer 2~9"} many{"n = 10..19,100..199,1000..1999 @integer 10~19, 100~105, 1000"} one{"n = 1 @integer 1"} other{" @integer 0, 20~34, 200, 2000, 10000, 100000, 1000000, …"} } - set47{ + set46{ one{"n = 1..4 @integer 1~4"} other{" @integer 0, 5~19, 100, 1000, 10000, 100000, 1000000, …"} } - set48{ + set47{ many{ "n % 10 = 6 or n % 10 = 9 or n % 10 = 0 and n != 0 @integer 6, 9, 10," " 16, 19, 20, 26, 29, 30, 36, 39, 40, 100, 1000, 10000, 100000, 10000" @@ -740,11 +727,26 @@ plurals:table(nofallback){ } other{" @integer 0~5, 7, 8, 11~15, 17, 18, 21, 101, 1001, …"} } - set49{ + set48{ many{"n = 2..20 @integer 2~17"} one{"n = 1 @integer 1"} other{" @integer 0, 21~35, 100, 1000, 10000, 100000, 1000000, …"} } + set49{ + few{ + "n % 10 = 1 and n != 1 or n % 100 = 14 @integer 11, 14, 21, 31, 41, 5" + "1, 61, 71, 101, 1001, …" + } + many{ + "n % 10 = 4 and n % 100 != 14 @integer 4, 24, 34, 44, 54, 64, 74, 84," + " 104, 1004, …" + } + one{"n = 1 @integer 1"} + other{ + " @integer 0, 2, 3, 5~10, 12, 13, 15~19, 100, 1000, 10000, 100000, 10" + "00000, …" + } + } set5{ one{ "n % 10 = 1 and n % 100 != 11 or v = 2 and f % 10 = 1 and f % 100 != " @@ -764,21 +766,6 @@ plurals:table(nofallback){ } } set50{ - few{ - "n % 10 = 1 and n != 1 or n % 100 = 14 @integer 11, 14, 21, 31, 41, 5" - "1, 61, 71, 101, 1001, …" - } - many{ - "n % 10 = 4 and n % 100 != 14 @integer 4, 24, 34, 44, 54, 64, 74, 84," - " 104, 1004, …" - } - one{"n = 1 @integer 1"} - other{ - " @integer 0, 2, 3, 5~10, 12, 13, 15~19, 100, 1000, 10000, 100000, 10" - "00000, …" - } - } - set51{ few{"n % 10 = 6 @integer 6, 16, 26, 36, 46, 56, 66, 76, 106, 1006, …"} many{ "n = 10 or n % 10 = 9 @integer 9, 10, 19, 29, 39, 49, 59, 69, 79, 109" @@ -793,7 +780,7 @@ plurals:table(nofallback){ "44, 53, 54, 63, 64, 73, 74, 103, 1003, …" } } - set52{ + set51{ few{"n = 3,4 @integer 3, 4"} many{"n = 5,6 @integer 5, 6"} one{"n = 1 @integer 1"} diff --git a/icu4c/source/data/misc/supplementalData.txt b/icu4c/source/data/misc/supplementalData.txt index 44a57729e9c..703d492443a 100644 --- a/icu4c/source/data/misc/supplementalData.txt +++ b/icu4c/source/data/misc/supplementalData.txt @@ -30,6 +30,23 @@ supplementalData:table(nofallback){ } system{"lunisolar"} } + coptic{ + eras{ + 0{ + end:intvector{ + -12383, + 368826367, + } + } + 1{ + start:intvector{ + -12383, + 368826368, + } + } + } + system{"other"} + } dangi{ eras{ 0{ @@ -41,6 +58,23 @@ supplementalData:table(nofallback){ } system{"lunisolar"} } + ethiopic{ + eras{ + 0{ + end:intvector{ + -14411, + 664902655, + } + } + 1{ + start:intvector{ + -14411, + 664902656, + } + } + } + system{"other"} + } gregorian{ eras{ 0{ @@ -4086,7 +4120,7 @@ supplementalData:table(nofallback){ } cu{ secondary{ - scripts{"Glag"} + scripts{"Cyrl"} } } cv{ @@ -7717,6 +7751,96 @@ supplementalData:table(nofallback){ "*_Hans", "75", } + { + "ab", + "ru", + "10", + } + { + "ach", + "en", + "10", + } + { + "af", + "nl", + "10", + } + { + "ak", + "en", + "10", + } + { + "am", + "en", + "10", + } + { + "ay", + "es", + "10", + } + { + "az", + "ru", + "10", + } + { + "bem", + "en", + "10", + } + { + "be", + "ru", + "10", + } + { + "bh", + "hi", + "10", + } + { + "bn", + "en", + "10", + } + { + "br", + "fr", + "10", + } + { + "ceb", + "fil", + "10", + } + { + "chr", + "en", + "10", + } + { + "ckb", + "ar", + "10", + } + { + "co", + "fr", + "10", + } + { + "crs", + "fr", + "10", + } + { + "cy", + "en", + "10", + } { "da", "nb", @@ -7727,60 +7851,281 @@ supplementalData:table(nofallback){ "no", "90", } + { + "ee", + "en", + "10", + } { "en_*_*", "en_*_*", "99", } - { - "en_*_CA", - "en_*_*", - "98", - } { "en_*_US", "en_*_*", "97", } { - "en_*_US", - "en_*_CA", + "eo", + "en", + "10", + } + { + "es_*_*", + "es_*_*", "98", } + { + "es_*_419", + "es_*_*", + "99", + } { "es_*_ES", "es_*_*", - "93", + "97", } { - "es_*_ES", - "es_*_ES", - "100", + "es_MX", + "es_419", + "10", + } + { + "et", + "fi", + "10", + } + { + "eu", + "es", + "10", + } + { + "fo", + "da", + "10", + } + { + "fy", + "nl", + "10", + } + { + "gaa", + "en", + "10", + } + { + "ga", + "en", + "10", + } + { + "gd", + "en", + "10", + } + { + "gl", + "es", + "10", + } + { + "gn", + "es", + "10", } { "gsw", "de", - "80", + "96", } { - "gsw", - "de_CH", - "85", + "gu", + "hi", + "10", + } + { + "ha", + "en", + "10", + } + { + "haw", + "en", + "10", } { "hr", "bs", "96", } + { + "ht", + "fr", + "10", + } + { + "hy", + "ru", + "10", + } + { + "ia", + "en", + "10", + } + { + "ig", + "en", + "10", + } + { + "is", + "en", + "10", + } + { + "jv", + "id", + "10", + } + { + "ka", + "en", + "10", + } + { + "kg", + "fr", + "10", + } + { + "kk", + "ru", + "10", + } + { + "km", + "en", + "10", + } + { + "kn", + "en", + "10", + } + { + "kri", + "en", + "10", + } + { + "ku", + "tr", + "10", + } + { + "ky", + "ru", + "10", + } + { + "la", + "it", + "10", + } + { + "lg", + "en", + "10", + } + { + "ln", + "fr", + "10", + } + { + "lo", + "th", + "10", + } + { + "loz", + "en", + "10", + } + { + "lua", + "fr", + "10", + } + { + "mfe", + "en", + "10", + } + { + "mg", + "fr", + "10", + } + { + "mi", + "en", + "10", + } + { + "mk", + "bg", + "10", + } + { + "ml", + "en", + "10", + } + { + "mn", + "ru", + "10", + } + { + "mr", + "hi", + "10", + } { "ms", "id", "90", + "ms", + "id", + "10", + } + { + "mt", + "en", + "10", + } + { + "my", + "en", + "10", + } + { + "ne", + "en", + "10", } { "nn", "nb", "96", + "nn", + "nb", + "10", } { "nn", @@ -7792,6 +8137,81 @@ supplementalData:table(nofallback){ "nb", "100", } + { + "nso", + "en", + "10", + } + { + "ny", + "en", + "10", + } + { + "nyn", + "en", + "10", + } + { + "oc", + "fr", + "10", + } + { + "om", + "en", + "10", + } + { + "or", + "en", + "10", + } + { + "pa", + "en", + "10", + } + { + "pcm", + "en", + "10", + } + { + "ps", + "en", + "10", + } + { + "qu", + "es", + "10", + } + { + "rm", + "de", + "10", + } + { + "rn", + "en", + "10", + } + { + "rw", + "fr", + "10", + } + { + "sa", + "hi", + "10", + } + { + "sd", + "en", + "10", + } { "sh", "bs", @@ -7807,6 +8227,26 @@ supplementalData:table(nofallback){ "sr", "96", } + { + "si", + "en", + "10", + } + { + "sn", + "en", + "10", + } + { + "so", + "en", + "10", + } + { + "sq", + "en", + "10", + } { "sr_Latn", "sr_Cyrl", @@ -7827,6 +8267,116 @@ supplementalData:table(nofallback){ "aa", "96", } + { + "st", + "en", + "10", + } + { + "su", + "id", + "10", + } + { + "sw", + "en", + "10", + } + { + "ta", + "en", + "10", + } + { + "te", + "en", + "10", + } + { + "tg", + "ru", + "10", + } + { + "ti", + "en", + "10", + } + { + "tk", + "ru", + "10", + } + { + "tlh", + "en", + "10", + } + { + "tn", + "en", + "10", + } + { + "to", + "en", + "10", + } + { + "tt", + "ru", + "10", + } + { + "tum", + "en", + "10", + } + { + "ug", + "zh", + "10", + } + { + "ur", + "en", + "10", + } + { + "uz", + "ru", + "10", + } + { + "wo", + "fr", + "10", + } + { + "xh", + "en", + "10", + } + { + "yi", + "en", + "10", + } + { + "yo", + "en", + "10", + } + { + "zh_HK", + "zh_TW", + "10", + } + { + "zu", + "en", + "10", + } } } measurementData{ diff --git a/icu4c/source/data/misc/windowsZones.txt b/icu4c/source/data/misc/windowsZones.txt index 9679a41d654..c881778bafe 100644 --- a/icu4c/source/data/misc/windowsZones.txt +++ b/icu4c/source/data/misc/windowsZones.txt @@ -196,10 +196,6 @@ windowsZones:table(nofallback){ 001{"Australia/Brisbane"} AU{"Australia/Brisbane Australia/Lindeman"} } - "E. Europe Standard Time"{ - 001{"Asia/Nicosia"} - CY{"Asia/Nicosia"} - } "E. South America Standard Time"{ 001{"America/Sao_Paulo"} BR{"America/Sao_Paulo"} @@ -256,6 +252,7 @@ windowsZones:table(nofallback){ } "GTB Standard Time"{ 001{"Europe/Bucharest"} + CY{"Asia/Nicosia"} GR{"Europe/Athens"} MD{"Europe/Chisinau"} RO{"Europe/Bucharest"} diff --git a/icu4c/source/data/rbnf/zh.txt b/icu4c/source/data/rbnf/zh.txt index c2e32dc3380..4c5637923f7 100644 --- a/icu4c/source/data/rbnf/zh.txt +++ b/icu4c/source/data/rbnf/zh.txt @@ -27,6 +27,21 @@ zh{ "10: <<>>>;", "100: <<>>>;", "1000: <<>>>;", + "%spellout-numbering-days:", + "-x: \u8D1F>>;", + "x.x: =#,##0.#=;", + "0: \u3007;", + "1: \u521D=%spellout-numbering=;", + "11: =%spellout-numbering=;", + "21: =%%numbering-days=;", + "%%numbering-days:", + "0: =%spellout-numbering=;", + "21: \u5EFF>>;", + "30: <<\u5341;", + "31: \u4E17>>;", + "40: <<\u5341;", + "41: \u534C>>;", + "50: =%spellout-numbering=;", "%spellout-numbering:", "-x: \u8D1F>>;", "x.x: <<\u70B9>>>;", @@ -234,5 +249,5 @@ zh{ "0: \u7B2C=%spellout-numbering=;", } } - Version{"2.0.82.42"} + Version{"2.0.97.32"} } diff --git a/icu4c/source/data/region/bg.txt b/icu4c/source/data/region/bg.txt index 9d954bbad4d..71a3acbe4d0 100644 --- a/icu4c/source/data/region/bg.txt +++ b/icu4c/source/data/region/bg.txt @@ -309,5 +309,5 @@ bg{ PS{"Палестина"} US{"САЩ"} } - Version{"2.0.95.33"} + Version{"2.0.97.18"} } diff --git a/icu4c/source/data/region/bm.txt b/icu4c/source/data/region/bm.txt index e8132142cc7..ed34775aef4 100755 --- a/icu4c/source/data/region/bm.txt +++ b/icu4c/source/data/region/bm.txt @@ -237,5 +237,5 @@ bm{ ZM{"Zanbi"} ZW{"Zimbabuwe"} } - Version{"2.0.92.87"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/region/cs.txt b/icu4c/source/data/region/cs.txt index 61545de7c8f..4eaaabcd047 100644 --- a/icu4c/source/data/region/cs.txt +++ b/icu4c/source/data/region/cs.txt @@ -309,5 +309,5 @@ cs{ PS{"Palestina"} US{"USA"} } - Version{"2.0.96.24"} + Version{"2.0.97.50"} } diff --git a/icu4c/source/data/region/de.txt b/icu4c/source/data/region/de.txt index 0109c8b021d..fc2bb0130c9 100644 --- a/icu4c/source/data/region/de.txt +++ b/icu4c/source/data/region/de.txt @@ -308,5 +308,5 @@ de{ MO{"Macao"} PS{"Palästina"} } - Version{"2.0.96.40"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/region/el.txt b/icu4c/source/data/region/el.txt index 485e5355cad..ad3cb484e23 100644 --- a/icu4c/source/data/region/el.txt +++ b/icu4c/source/data/region/el.txt @@ -309,5 +309,5 @@ el{ PS{"Παλαιστίνη"} US{"ΗΠΑ"} } - Version{"2.0.95.37"} + Version{"2.0.97.50"} } diff --git a/icu4c/source/data/region/en.txt b/icu4c/source/data/region/en.txt index 6561a240efe..4533e792e21 100644 --- a/icu4c/source/data/region/en.txt +++ b/icu4c/source/data/region/en.txt @@ -309,5 +309,5 @@ en{ PS{"Palestine"} US{"U.S."} } - Version{"2.0.96.5"} + Version{"2.0.97.54"} } diff --git a/icu4c/source/data/region/es.txt b/icu4c/source/data/region/es.txt index 84fa8be1fa9..a5864b1ed12 100644 --- a/icu4c/source/data/region/es.txt +++ b/icu4c/source/data/region/es.txt @@ -309,5 +309,5 @@ es{ PS{"Palestina"} US{"EE. UU."} } - Version{"2.0.96.40"} + Version{"2.0.97.9"} } diff --git a/icu4c/source/data/region/ff.txt b/icu4c/source/data/region/ff.txt index 61978040b7d..22eef319afb 100755 --- a/icu4c/source/data/region/ff.txt +++ b/icu4c/source/data/region/ff.txt @@ -237,5 +237,5 @@ ff{ ZM{"Sammbi"} ZW{"Simbaabuwe"} } - Version{"2.0.92.87"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/region/fi.txt b/icu4c/source/data/region/fi.txt index dc1e9401525..315714d1965 100644 --- a/icu4c/source/data/region/fi.txt +++ b/icu4c/source/data/region/fi.txt @@ -309,5 +309,5 @@ fi{ PS{"Palestiina"} US{"USA"} } - Version{"2.0.95.33"} + Version{"2.0.97.50"} } diff --git a/icu4c/source/data/region/fr.txt b/icu4c/source/data/region/fr.txt index bc86bae507b..c623ddd51e2 100644 --- a/icu4c/source/data/region/fr.txt +++ b/icu4c/source/data/region/fr.txt @@ -309,5 +309,5 @@ fr{ PS{"Palestine"} US{"É.-U."} } - Version{"2.0.96.40"} + Version{"2.0.97.9"} } diff --git a/icu4c/source/data/region/gl.txt b/icu4c/source/data/region/gl.txt index f27d985120b..774952d31be 100644 --- a/icu4c/source/data/region/gl.txt +++ b/icu4c/source/data/region/gl.txt @@ -307,5 +307,5 @@ gl{ MO{"Macau"} PS{"Palestina"} } - Version{"2.0.96.24"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/region/gsw.txt b/icu4c/source/data/region/gsw.txt index fb49934c216..7d92b0eb49d 100644 --- a/icu4c/source/data/region/gsw.txt +++ b/icu4c/source/data/region/gsw.txt @@ -295,5 +295,5 @@ gsw{ HK{"Hongkong"} MO{"Macao"} } - Version{"2.0.95.33"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/region/he.txt b/icu4c/source/data/region/he.txt index beff389b530..35695614f3d 100644 --- a/icu4c/source/data/region/he.txt +++ b/icu4c/source/data/region/he.txt @@ -309,5 +309,5 @@ he{ PS{"פלסטין"} US{"ארה״ב"} } - Version{"2.0.95.33"} + Version{"2.0.97.17"} } diff --git a/icu4c/source/data/region/hi.txt b/icu4c/source/data/region/hi.txt index 25c36e73569..eebf5832d58 100644 --- a/icu4c/source/data/region/hi.txt +++ b/icu4c/source/data/region/hi.txt @@ -309,5 +309,5 @@ hi{ PS{"फ़िलिस्तीन"} US{"अमेरिका"} } - Version{"2.0.95.34"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/region/hr.txt b/icu4c/source/data/region/hr.txt index f640cfa47c8..9354d6779ed 100644 --- a/icu4c/source/data/region/hr.txt +++ b/icu4c/source/data/region/hr.txt @@ -309,5 +309,5 @@ hr{ PS{"Palestina"} US{"SAD"} } - Version{"2.0.95.37"} + Version{"2.0.97.50"} } diff --git a/icu4c/source/data/region/id.txt b/icu4c/source/data/region/id.txt index f8944970386..37a0c8cc7bd 100644 --- a/icu4c/source/data/region/id.txt +++ b/icu4c/source/data/region/id.txt @@ -309,5 +309,5 @@ id{ PS{"Palestina"} US{"A.S."} } - Version{"2.0.95.60"} + Version{"2.0.97.50"} } diff --git a/icu4c/source/data/region/kab.txt b/icu4c/source/data/region/kab.txt index 620a920fef5..84cf7db6f99 100755 --- a/icu4c/source/data/region/kab.txt +++ b/icu4c/source/data/region/kab.txt @@ -237,5 +237,5 @@ kab{ ZM{"Zambya"} ZW{"Zimbabwi"} } - Version{"2.0.92.87"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/region/khq.txt b/icu4c/source/data/region/khq.txt index 6f53eaa1662..27719bdeb34 100755 --- a/icu4c/source/data/region/khq.txt +++ b/icu4c/source/data/region/khq.txt @@ -237,5 +237,5 @@ khq{ ZM{"Zambi"} ZW{"Zimbabwe"} } - Version{"2.0.92.87"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/region/lt.txt b/icu4c/source/data/region/lt.txt index 8696974a312..43bd50c72a5 100644 --- a/icu4c/source/data/region/lt.txt +++ b/icu4c/source/data/region/lt.txt @@ -309,5 +309,5 @@ lt{ PS{"Palestina"} US{"JAV"} } - Version{"2.0.95.38"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/region/mfe.txt b/icu4c/source/data/region/mfe.txt index 20fab49a8b8..187dfc16585 100755 --- a/icu4c/source/data/region/mfe.txt +++ b/icu4c/source/data/region/mfe.txt @@ -237,5 +237,5 @@ mfe{ ZM{"Zambi"} ZW{"Zimbabwe"} } - Version{"2.0.92.75"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/region/mg.txt b/icu4c/source/data/region/mg.txt index cc59f72dca4..1bd949e7b32 100755 --- a/icu4c/source/data/region/mg.txt +++ b/icu4c/source/data/region/mg.txt @@ -237,5 +237,5 @@ mg{ ZM{"Zambia"} ZW{"Zimbaboe"} } - Version{"2.0.92.87"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/region/mk.txt b/icu4c/source/data/region/mk.txt index 7d159c95141..39cfff7adbb 100644 --- a/icu4c/source/data/region/mk.txt +++ b/icu4c/source/data/region/mk.txt @@ -309,5 +309,5 @@ mk{ PS{"Палестина"} US{"САД"} } - Version{"2.0.95.33"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/region/nb.txt b/icu4c/source/data/region/nb.txt index cc7492ca123..e30d06d6128 100644 --- a/icu4c/source/data/region/nb.txt +++ b/icu4c/source/data/region/nb.txt @@ -309,5 +309,5 @@ nb{ PS{"Palestina"} US{"USA"} } - Version{"2.0.95.33"} + Version{"2.0.97.50"} } diff --git a/icu4c/source/data/region/nl.txt b/icu4c/source/data/region/nl.txt index df6d2f75a18..05396739c5c 100644 --- a/icu4c/source/data/region/nl.txt +++ b/icu4c/source/data/region/nl.txt @@ -309,5 +309,5 @@ nl{ PS{"Palestina"} US{"VS"} } - Version{"2.0.95.37"} + Version{"2.0.97.50"} } diff --git a/icu4c/source/data/region/nmg.txt b/icu4c/source/data/region/nmg.txt index 2616f76a821..3c4f9f1bff9 100755 --- a/icu4c/source/data/region/nmg.txt +++ b/icu4c/source/data/region/nmg.txt @@ -237,5 +237,5 @@ nmg{ ZM{"Zambia"} ZW{"Zimbabwǝ"} } - Version{"2.0.92.87"} + Version{"2.0.97.39"} } diff --git a/icu4c/source/data/region/pl.txt b/icu4c/source/data/region/pl.txt index cc4cae1452d..3321e894ea8 100644 --- a/icu4c/source/data/region/pl.txt +++ b/icu4c/source/data/region/pl.txt @@ -309,5 +309,5 @@ pl{ PS{"Palestyna"} US{"USA"} } - Version{"2.0.95.37"} + Version{"2.0.97.50"} } diff --git a/icu4c/source/data/region/pt.txt b/icu4c/source/data/region/pt.txt index 8285e0110ed..efd6db01ce7 100644 --- a/icu4c/source/data/region/pt.txt +++ b/icu4c/source/data/region/pt.txt @@ -309,5 +309,5 @@ pt{ PS{"Palestina"} US{"EUA"} } - Version{"2.0.95.37"} + Version{"2.0.97.50"} } diff --git a/icu4c/source/data/region/rm.txt b/icu4c/source/data/region/rm.txt index ff035831cc8..8abd0be2281 100755 --- a/icu4c/source/data/region/rm.txt +++ b/icu4c/source/data/region/rm.txt @@ -290,5 +290,5 @@ rm{ ZW{"Simbabwe"} ZZ{"Regiun betg encouschenta u nunvalaivla"} } - Version{"2.0.95.33"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/region/root.txt b/icu4c/source/data/region/root.txt index 887057224c2..a98c70b8b99 100644 --- a/icu4c/source/data/region/root.txt +++ b/icu4c/source/data/region/root.txt @@ -10,5 +10,5 @@ * ICU source: /common/main/root.xml */ root{ - Version{"2.0.95.34"} + Version{"2.0.97.37"} } diff --git a/icu4c/source/data/region/ru.txt b/icu4c/source/data/region/ru.txt index 60068d168e8..9bc56906134 100644 --- a/icu4c/source/data/region/ru.txt +++ b/icu4c/source/data/region/ru.txt @@ -309,5 +309,5 @@ ru{ PS{"Палестина"} US{"США"} } - Version{"2.0.95.59"} + Version{"2.0.97.50"} } diff --git a/icu4c/source/data/region/ses.txt b/icu4c/source/data/region/ses.txt index 03b4a172d65..ef90685c8bf 100755 --- a/icu4c/source/data/region/ses.txt +++ b/icu4c/source/data/region/ses.txt @@ -237,5 +237,5 @@ ses{ ZM{"Zambi"} ZW{"Zimbabwe"} } - Version{"2.0.92.87"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/region/sg.txt b/icu4c/source/data/region/sg.txt index 37ed0ef096a..89b43d50a2b 100755 --- a/icu4c/source/data/region/sg.txt +++ b/icu4c/source/data/region/sg.txt @@ -237,5 +237,5 @@ sg{ ZM{"Zambïi"} ZW{"Zimbäbwe"} } - Version{"2.0.92.87"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/region/shi.txt b/icu4c/source/data/region/shi.txt index f08934b12b6..2cd7b76fdba 100755 --- a/icu4c/source/data/region/shi.txt +++ b/icu4c/source/data/region/shi.txt @@ -237,5 +237,5 @@ shi{ ZM{"ⵣⴰⵎⴱⵢⴰ"} ZW{"ⵣⵉⵎⴱⴰⴱⵡⵉ"} } - Version{"2.0.92.87"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/region/shi_Latn.txt b/icu4c/source/data/region/shi_Latn.txt index 5fa8664986c..892ac263b31 100755 --- a/icu4c/source/data/region/shi_Latn.txt +++ b/icu4c/source/data/region/shi_Latn.txt @@ -238,5 +238,5 @@ shi_Latn{ ZM{"zambya"} ZW{"zimbabwi"} } - Version{"2.0.92.87"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/region/sq.txt b/icu4c/source/data/region/sq.txt index 86e9dd999ec..a52b6ab5227 100644 --- a/icu4c/source/data/region/sq.txt +++ b/icu4c/source/data/region/sq.txt @@ -308,5 +308,5 @@ sq{ PS{"Palestinë"} US{"SHBA"} } - Version{"2.0.92.87"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/region/sr.txt b/icu4c/source/data/region/sr.txt index 46b6b37f259..947d966d23a 100644 --- a/icu4c/source/data/region/sr.txt +++ b/icu4c/source/data/region/sr.txt @@ -309,5 +309,5 @@ sr{ PS{"Палестина"} US{"САД"} } - Version{"2.0.96.25"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/region/sr_Latn.txt b/icu4c/source/data/region/sr_Latn.txt index d67f49c26fb..437ec88678a 100644 --- a/icu4c/source/data/region/sr_Latn.txt +++ b/icu4c/source/data/region/sr_Latn.txt @@ -310,5 +310,5 @@ sr_Latn{ PS{"Palestina"} US{"SAD"} } - Version{"2.0.96.25"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/region/sv.txt b/icu4c/source/data/region/sv.txt index 90eea562053..0d6d5d86474 100644 --- a/icu4c/source/data/region/sv.txt +++ b/icu4c/source/data/region/sv.txt @@ -309,5 +309,5 @@ sv{ PS{"Palestina"} US{"USA"} } - Version{"2.0.95.66"} + Version{"2.0.97.50"} } diff --git a/icu4c/source/data/region/sw.txt b/icu4c/source/data/region/sw.txt index 5e4acbe1680..0f13a1bd2f1 100644 --- a/icu4c/source/data/region/sw.txt +++ b/icu4c/source/data/region/sw.txt @@ -308,5 +308,5 @@ sw{ MO{"Macau"} PS{"Palestina"} } - Version{"2.0.92.87"} + Version{"2.0.97.40"} } diff --git a/icu4c/source/data/region/tr.txt b/icu4c/source/data/region/tr.txt index 8e85776cd8b..c54c67759fc 100644 --- a/icu4c/source/data/region/tr.txt +++ b/icu4c/source/data/region/tr.txt @@ -309,5 +309,5 @@ tr{ PS{"Filistin"} US{"ABD"} } - Version{"2.0.95.37"} + Version{"2.0.97.50"} } diff --git a/icu4c/source/data/region/uk.txt b/icu4c/source/data/region/uk.txt index 9244e34df01..4fdd08b17bb 100644 --- a/icu4c/source/data/region/uk.txt +++ b/icu4c/source/data/region/uk.txt @@ -309,5 +309,5 @@ uk{ PS{"Палестина"} US{"США"} } - Version{"2.0.95.37"} + Version{"2.0.97.50"} } diff --git a/icu4c/source/data/region/zh.txt b/icu4c/source/data/region/zh.txt index 22ab7ccee0d..969fb1c7b72 100644 --- a/icu4c/source/data/region/zh.txt +++ b/icu4c/source/data/region/zh.txt @@ -309,5 +309,5 @@ zh{ PS{"巴勒斯坦"} US{"美国"} } - Version{"2.0.96.40"} + Version{"2.0.97.32"} } diff --git a/icu4c/source/data/region/zh_Hant.txt b/icu4c/source/data/region/zh_Hant.txt index a8647826cd7..b2cf2a44f62 100644 --- a/icu4c/source/data/region/zh_Hant.txt +++ b/icu4c/source/data/region/zh_Hant.txt @@ -310,5 +310,5 @@ zh_Hant{ PS{"巴勒斯坦"} US{"美國"} } - Version{"2.0.96.40"} + Version{"2.0.97.32"} } diff --git a/icu4c/source/data/translit/Simplified_Traditional.txt b/icu4c/source/data/translit/Simplified_Traditional.txt index 2e7494d5a5a..51b4873dbc0 100644 --- a/icu4c/source/data/translit/Simplified_Traditional.txt +++ b/icu4c/source/data/translit/Simplified_Traditional.txt @@ -3985,3 +3985,5 @@ $SCDigit { 出 } 戏 → 齣; 龚↔龔; 龛↔龕; 龟↔龜; +“↔「; +”↔」; diff --git a/icu4c/source/data/zone/bg.txt b/icu4c/source/data/zone/bg.txt index 56b76daaefb..931979f3ba9 100644 --- a/icu4c/source/data/zone/bg.txt +++ b/icu4c/source/data/zone/bg.txt @@ -10,7 +10,7 @@ * ICU source: /common/main/bg.xml */ bg{ - Version{"2.0.95.33"} + Version{"2.0.97.18"} zoneStrings{ "Africa:Abidjan"{ ec{"Абиджан"} diff --git a/icu4c/source/data/zone/bm.txt b/icu4c/source/data/zone/bm.txt index f5a27e72ffd..51d3b9355be 100755 --- a/icu4c/source/data/zone/bm.txt +++ b/icu4c/source/data/zone/bm.txt @@ -10,5 +10,5 @@ * ICU source: /common/main/bm.xml */ bm{ - Version{"2.0.92.87"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/zone/cs.txt b/icu4c/source/data/zone/cs.txt index 70063cb97f8..429f5e642fc 100644 --- a/icu4c/source/data/zone/cs.txt +++ b/icu4c/source/data/zone/cs.txt @@ -10,7 +10,7 @@ * ICU source: /common/main/cs.xml */ cs{ - Version{"2.0.96.24"} + Version{"2.0.97.50"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidžan"} diff --git a/icu4c/source/data/zone/de.txt b/icu4c/source/data/zone/de.txt index 5722ba047a0..5ce04e9ecb3 100644 --- a/icu4c/source/data/zone/de.txt +++ b/icu4c/source/data/zone/de.txt @@ -10,7 +10,7 @@ * ICU source: /common/main/de.xml */ de{ - Version{"2.0.96.40"} + Version{"2.0.97.28"} zoneStrings{ "Africa:Accra"{ ec{"Akkra"} diff --git a/icu4c/source/data/zone/el.txt b/icu4c/source/data/zone/el.txt index f0950972acd..5980bb327dc 100644 --- a/icu4c/source/data/zone/el.txt +++ b/icu4c/source/data/zone/el.txt @@ -10,7 +10,7 @@ * ICU source: /common/main/el.xml */ el{ - Version{"2.0.95.37"} + Version{"2.0.97.50"} zoneStrings{ "Africa:Abidjan"{ ec{"Αμπιτζάν"} diff --git a/icu4c/source/data/zone/en.txt b/icu4c/source/data/zone/en.txt index 00d51b99ca5..0338bfd6497 100644 --- a/icu4c/source/data/zone/en.txt +++ b/icu4c/source/data/zone/en.txt @@ -10,7 +10,7 @@ * ICU source: /common/main/en.xml */ en{ - Version{"2.0.96.5"} + Version{"2.0.97.54"} zoneStrings{ "Africa:Sao_Tome"{ ec{"São Tomé"} diff --git a/icu4c/source/data/zone/es.txt b/icu4c/source/data/zone/es.txt index 84979ecd238..fbb5e5e9db4 100644 --- a/icu4c/source/data/zone/es.txt +++ b/icu4c/source/data/zone/es.txt @@ -10,7 +10,7 @@ * ICU source: /common/main/es.xml */ es{ - Version{"2.0.96.40"} + Version{"2.0.97.9"} zoneStrings{ "Africa:Abidjan"{ ec{"Abiyán"} diff --git a/icu4c/source/data/zone/ff.txt b/icu4c/source/data/zone/ff.txt index 01f0a601d5b..d5cbd608466 100755 --- a/icu4c/source/data/zone/ff.txt +++ b/icu4c/source/data/zone/ff.txt @@ -10,5 +10,5 @@ * ICU source: /common/main/ff.xml */ ff{ - Version{"2.0.92.87"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/zone/fi.txt b/icu4c/source/data/zone/fi.txt index f78b146b135..d4ea8b344f7 100644 --- a/icu4c/source/data/zone/fi.txt +++ b/icu4c/source/data/zone/fi.txt @@ -10,7 +10,7 @@ * ICU source: /common/main/fi.xml */ fi{ - Version{"2.0.95.33"} + Version{"2.0.97.50"} zoneStrings{ "Africa:Addis_Ababa"{ ec{"Addis Abeba"} diff --git a/icu4c/source/data/zone/fr.txt b/icu4c/source/data/zone/fr.txt index 88b4214e06b..85219e67482 100644 --- a/icu4c/source/data/zone/fr.txt +++ b/icu4c/source/data/zone/fr.txt @@ -10,7 +10,7 @@ * ICU source: /common/main/fr.xml */ fr{ - Version{"2.0.96.40"} + Version{"2.0.97.9"} zoneStrings{ "Africa:Addis_Ababa"{ ec{"Addis-Abeba"} diff --git a/icu4c/source/data/zone/gl.txt b/icu4c/source/data/zone/gl.txt index 6e236aa796f..af92f7a6fe7 100644 --- a/icu4c/source/data/zone/gl.txt +++ b/icu4c/source/data/zone/gl.txt @@ -10,7 +10,7 @@ * ICU source: /common/main/gl.xml */ gl{ - Version{"2.0.96.24"} + Version{"2.0.97.28"} zoneStrings{ "Africa:Accra"{ ec{"Acra"} diff --git a/icu4c/source/data/zone/gsw.txt b/icu4c/source/data/zone/gsw.txt index 4997fa22023..d597330b641 100644 --- a/icu4c/source/data/zone/gsw.txt +++ b/icu4c/source/data/zone/gsw.txt @@ -10,7 +10,7 @@ * ICU source: /common/main/gsw.xml */ gsw{ - Version{"2.0.95.33"} + Version{"2.0.97.28"} zoneStrings{ "Africa:Accra"{ ec{"Akkra"} diff --git a/icu4c/source/data/zone/he.txt b/icu4c/source/data/zone/he.txt index 33c0336a2bd..b52b5b11e5c 100644 --- a/icu4c/source/data/zone/he.txt +++ b/icu4c/source/data/zone/he.txt @@ -10,7 +10,7 @@ * ICU source: /common/main/he.xml */ he{ - Version{"2.0.95.33"} + Version{"2.0.97.17"} zoneStrings{ "Africa:Abidjan"{ ec{"אביג׳אן"} diff --git a/icu4c/source/data/zone/hi.txt b/icu4c/source/data/zone/hi.txt index aaa6af4d36f..6aa3b0bc4f1 100644 --- a/icu4c/source/data/zone/hi.txt +++ b/icu4c/source/data/zone/hi.txt @@ -10,7 +10,7 @@ * ICU source: /common/main/hi.xml */ hi{ - Version{"2.0.95.34"} + Version{"2.0.97.28"} zoneStrings{ "Africa:Abidjan"{ ec{"अबिदजान"} diff --git a/icu4c/source/data/zone/hr.txt b/icu4c/source/data/zone/hr.txt index 79e86181a44..97676ac6665 100644 --- a/icu4c/source/data/zone/hr.txt +++ b/icu4c/source/data/zone/hr.txt @@ -10,7 +10,7 @@ * ICU source: /common/main/hr.xml */ hr{ - Version{"2.0.95.37"} + Version{"2.0.97.50"} zoneStrings{ "Africa:Addis_Ababa"{ ec{"Addis Abeba"} diff --git a/icu4c/source/data/zone/id.txt b/icu4c/source/data/zone/id.txt index dcada12c241..04ba21d28af 100644 --- a/icu4c/source/data/zone/id.txt +++ b/icu4c/source/data/zone/id.txt @@ -10,7 +10,7 @@ * ICU source: /common/main/id.xml */ id{ - Version{"2.0.95.60"} + Version{"2.0.97.50"} zoneStrings{ "Africa:Accra"{ ec{"Akra"} diff --git a/icu4c/source/data/zone/kab.txt b/icu4c/source/data/zone/kab.txt index eb5a2a665a8..bb06e8b37b5 100755 --- a/icu4c/source/data/zone/kab.txt +++ b/icu4c/source/data/zone/kab.txt @@ -10,5 +10,5 @@ * ICU source: /common/main/kab.xml */ kab{ - Version{"2.0.92.87"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/zone/khq.txt b/icu4c/source/data/zone/khq.txt index 52ddc5ba681..06ed56c8335 100755 --- a/icu4c/source/data/zone/khq.txt +++ b/icu4c/source/data/zone/khq.txt @@ -10,5 +10,5 @@ * ICU source: /common/main/khq.xml */ khq{ - Version{"2.0.92.87"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/zone/lt.txt b/icu4c/source/data/zone/lt.txt index 600ba737e8e..752520076f0 100644 --- a/icu4c/source/data/zone/lt.txt +++ b/icu4c/source/data/zone/lt.txt @@ -10,7 +10,7 @@ * ICU source: /common/main/lt.xml */ lt{ - Version{"2.0.95.38"} + Version{"2.0.97.28"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidžanas"} diff --git a/icu4c/source/data/zone/mfe.txt b/icu4c/source/data/zone/mfe.txt index ef67345e18b..a6a98746e45 100755 --- a/icu4c/source/data/zone/mfe.txt +++ b/icu4c/source/data/zone/mfe.txt @@ -10,5 +10,5 @@ * ICU source: /common/main/mfe.xml */ mfe{ - Version{"2.0.92.75"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/zone/mg.txt b/icu4c/source/data/zone/mg.txt index be81c03daf7..e7b89ccc7c9 100755 --- a/icu4c/source/data/zone/mg.txt +++ b/icu4c/source/data/zone/mg.txt @@ -10,5 +10,5 @@ * ICU source: /common/main/mg.xml */ mg{ - Version{"2.0.92.87"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/zone/mk.txt b/icu4c/source/data/zone/mk.txt index dc07fafefdf..ad85ad6b553 100644 --- a/icu4c/source/data/zone/mk.txt +++ b/icu4c/source/data/zone/mk.txt @@ -10,7 +10,7 @@ * ICU source: /common/main/mk.xml */ mk{ - Version{"2.0.95.33"} + Version{"2.0.97.28"} zoneStrings{ "Africa:Abidjan"{ ec{"Абиџан"} diff --git a/icu4c/source/data/zone/nb.txt b/icu4c/source/data/zone/nb.txt index 222a3b764c0..15d731a1d26 100644 --- a/icu4c/source/data/zone/nb.txt +++ b/icu4c/source/data/zone/nb.txt @@ -10,7 +10,7 @@ * ICU source: /common/main/nb.xml */ nb{ - Version{"2.0.95.33"} + Version{"2.0.97.50"} zoneStrings{ "Africa:Addis_Ababa"{ ec{"Addis Abeba"} diff --git a/icu4c/source/data/zone/nl.txt b/icu4c/source/data/zone/nl.txt index 9cfaca641e9..88e57fd9870 100644 --- a/icu4c/source/data/zone/nl.txt +++ b/icu4c/source/data/zone/nl.txt @@ -10,7 +10,7 @@ * ICU source: /common/main/nl.xml */ nl{ - Version{"2.0.95.37"} + Version{"2.0.97.50"} zoneStrings{ "Africa:Addis_Ababa"{ ec{"Addis Abeba"} diff --git a/icu4c/source/data/zone/nmg.txt b/icu4c/source/data/zone/nmg.txt index e39b7bfabf5..8d72181f528 100755 --- a/icu4c/source/data/zone/nmg.txt +++ b/icu4c/source/data/zone/nmg.txt @@ -10,5 +10,5 @@ * ICU source: /common/main/nmg.xml */ nmg{ - Version{"2.0.92.87"} + Version{"2.0.97.39"} } diff --git a/icu4c/source/data/zone/pl.txt b/icu4c/source/data/zone/pl.txt index 9e6e93e18fc..905f2f7a912 100644 --- a/icu4c/source/data/zone/pl.txt +++ b/icu4c/source/data/zone/pl.txt @@ -10,7 +10,7 @@ * ICU source: /common/main/pl.xml */ pl{ - Version{"2.0.95.37"} + Version{"2.0.97.50"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidżan"} diff --git a/icu4c/source/data/zone/pt.txt b/icu4c/source/data/zone/pt.txt index 02ff077a8b2..5504971e3ba 100644 --- a/icu4c/source/data/zone/pt.txt +++ b/icu4c/source/data/zone/pt.txt @@ -10,7 +10,7 @@ * ICU source: /common/main/pt.xml */ pt{ - Version{"2.0.95.37"} + Version{"2.0.97.50"} zoneStrings{ "Africa:Accra"{ ec{"Acra"} diff --git a/icu4c/source/data/zone/rm.txt b/icu4c/source/data/zone/rm.txt index c316fafca71..b9ec437f821 100755 --- a/icu4c/source/data/zone/rm.txt +++ b/icu4c/source/data/zone/rm.txt @@ -10,7 +10,7 @@ * ICU source: /common/main/rm.xml */ rm{ - Version{"2.0.95.33"} + Version{"2.0.97.28"} zoneStrings{ "Africa:Addis_Ababa"{ ec{"Addis Abeba"} diff --git a/icu4c/source/data/zone/root.txt b/icu4c/source/data/zone/root.txt index 72f61cfec9a..15ebbe57cad 100644 --- a/icu4c/source/data/zone/root.txt +++ b/icu4c/source/data/zone/root.txt @@ -10,7 +10,7 @@ * ICU source: /common/main/root.xml */ root{ - Version{"2.0.95.34"} + Version{"2.0.97.37"} zoneStrings{ "Africa:Asmera"{ ec{"Asmara"} diff --git a/icu4c/source/data/zone/ru.txt b/icu4c/source/data/zone/ru.txt index 46f8e419746..1af45a4d073 100644 --- a/icu4c/source/data/zone/ru.txt +++ b/icu4c/source/data/zone/ru.txt @@ -10,7 +10,7 @@ * ICU source: /common/main/ru.xml */ ru{ - Version{"2.0.95.59"} + Version{"2.0.97.50"} zoneStrings{ "Africa:Abidjan"{ ec{"Абиджан"} diff --git a/icu4c/source/data/zone/ses.txt b/icu4c/source/data/zone/ses.txt index 824a1338175..fcf1914e3fa 100755 --- a/icu4c/source/data/zone/ses.txt +++ b/icu4c/source/data/zone/ses.txt @@ -10,5 +10,5 @@ * ICU source: /common/main/ses.xml */ ses{ - Version{"2.0.92.87"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/zone/sg.txt b/icu4c/source/data/zone/sg.txt index cc9001bb2a0..6c1fbb3b14d 100755 --- a/icu4c/source/data/zone/sg.txt +++ b/icu4c/source/data/zone/sg.txt @@ -10,5 +10,5 @@ * ICU source: /common/main/sg.xml */ sg{ - Version{"2.0.92.87"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/zone/shi.txt b/icu4c/source/data/zone/shi.txt index 506f889079c..6b90cdd2140 100755 --- a/icu4c/source/data/zone/shi.txt +++ b/icu4c/source/data/zone/shi.txt @@ -10,5 +10,5 @@ * ICU source: /common/main/shi.xml */ shi{ - Version{"2.0.92.87"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/zone/shi_Latn.txt b/icu4c/source/data/zone/shi_Latn.txt index 9179e9ba9be..63f9123bf9a 100755 --- a/icu4c/source/data/zone/shi_Latn.txt +++ b/icu4c/source/data/zone/shi_Latn.txt @@ -11,5 +11,5 @@ */ shi_Latn{ %%Parent{"root"} - Version{"2.0.92.87"} + Version{"2.0.97.28"} } diff --git a/icu4c/source/data/zone/sq.txt b/icu4c/source/data/zone/sq.txt index 266e9562ebb..07ba453d047 100644 --- a/icu4c/source/data/zone/sq.txt +++ b/icu4c/source/data/zone/sq.txt @@ -10,7 +10,7 @@ * ICU source: /common/main/sq.xml */ sq{ - Version{"2.0.92.87"} + Version{"2.0.97.28"} zoneStrings{ "Africa:Abidjan"{ ec{"Abixhan"} diff --git a/icu4c/source/data/zone/sr.txt b/icu4c/source/data/zone/sr.txt index cdd198fa470..7ff729234e1 100644 --- a/icu4c/source/data/zone/sr.txt +++ b/icu4c/source/data/zone/sr.txt @@ -10,7 +10,7 @@ * ICU source: /common/main/sr.xml */ sr{ - Version{"2.0.96.25"} + Version{"2.0.97.28"} zoneStrings{ "Africa:Abidjan"{ ec{"Абиџан"} diff --git a/icu4c/source/data/zone/sr_Latn.txt b/icu4c/source/data/zone/sr_Latn.txt index 1d6d3ddbe80..b6d1847af4d 100644 --- a/icu4c/source/data/zone/sr_Latn.txt +++ b/icu4c/source/data/zone/sr_Latn.txt @@ -11,7 +11,7 @@ */ sr_Latn{ %%Parent{"root"} - Version{"2.0.96.25"} + Version{"2.0.97.28"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidžan"} diff --git a/icu4c/source/data/zone/sv.txt b/icu4c/source/data/zone/sv.txt index fdea69c1916..c126d9d4abc 100644 --- a/icu4c/source/data/zone/sv.txt +++ b/icu4c/source/data/zone/sv.txt @@ -10,7 +10,7 @@ * ICU source: /common/main/sv.xml */ sv{ - Version{"2.0.95.66"} + Version{"2.0.97.50"} zoneStrings{ "Africa:Addis_Ababa"{ ec{"Addis Abeba"} diff --git a/icu4c/source/data/zone/sw.txt b/icu4c/source/data/zone/sw.txt index 9d1b63a5a66..4d12ab9965d 100644 --- a/icu4c/source/data/zone/sw.txt +++ b/icu4c/source/data/zone/sw.txt @@ -10,7 +10,7 @@ * ICU source: /common/main/sw.xml */ sw{ - Version{"2.0.92.87"} + Version{"2.0.97.40"} zoneStrings{ "Africa:Asmera"{ ec{"Asmara"} diff --git a/icu4c/source/data/zone/tr.txt b/icu4c/source/data/zone/tr.txt index 10f3bec3547..15cddda6c7a 100644 --- a/icu4c/source/data/zone/tr.txt +++ b/icu4c/source/data/zone/tr.txt @@ -10,7 +10,7 @@ * ICU source: /common/main/tr.xml */ tr{ - Version{"2.0.95.37"} + Version{"2.0.97.50"} zoneStrings{ "Africa:Abidjan"{ ec{"Abican"} diff --git a/icu4c/source/data/zone/uk.txt b/icu4c/source/data/zone/uk.txt index 8e90b33bfaf..6f372c9f71a 100644 --- a/icu4c/source/data/zone/uk.txt +++ b/icu4c/source/data/zone/uk.txt @@ -10,7 +10,7 @@ * ICU source: /common/main/uk.xml */ uk{ - Version{"2.0.95.37"} + Version{"2.0.97.50"} zoneStrings{ "Africa:Abidjan"{ ec{"Абіджан"} diff --git a/icu4c/source/data/zone/zh.txt b/icu4c/source/data/zone/zh.txt index 0d094210c1c..ce196975ad4 100644 --- a/icu4c/source/data/zone/zh.txt +++ b/icu4c/source/data/zone/zh.txt @@ -10,7 +10,7 @@ * ICU source: /common/main/zh.xml */ zh{ - Version{"2.0.96.40"} + Version{"2.0.97.32"} zoneStrings{ "Africa:Abidjan"{ ec{"阿比让"} diff --git a/icu4c/source/data/zone/zh_Hant.txt b/icu4c/source/data/zone/zh_Hant.txt index 69152b5548a..ca8038ff391 100644 --- a/icu4c/source/data/zone/zh_Hant.txt +++ b/icu4c/source/data/zone/zh_Hant.txt @@ -11,7 +11,7 @@ */ zh_Hant{ %%Parent{"root"} - Version{"2.0.96.40"} + Version{"2.0.97.32"} zoneStrings{ "Africa:Abidjan"{ ec{"阿比讓"} diff --git a/icu4c/source/i18n/locdspnm.cpp b/icu4c/source/i18n/locdspnm.cpp index 30fb17db63d..7731463ac1a 100644 --- a/icu4c/source/i18n/locdspnm.cpp +++ b/icu4c/source/i18n/locdspnm.cpp @@ -1,6 +1,6 @@ /* ******************************************************************************* -* Copyright (C) 2010-2013, International Business Machines Corporation and +* Copyright (C) 2010-2014, International Business Machines Corporation and * others. All Rights Reserved. ******************************************************************************* */ @@ -287,7 +287,7 @@ class LocaleDisplayNamesImpl : public LocaleDisplayNames { kCapContextUsageTerritory, kCapContextUsageVariant, kCapContextUsageKey, - kCapContextUsageType, + kCapContextUsageKeyValue, kCapContextUsageCount }; // Capitalization transforms. For each usage type, the first array element indicates @@ -422,10 +422,10 @@ LocaleDisplayNamesImpl::initialize(void) { const ContextUsageNameToEnum contextUsageTypeMap[] = { // Entries must be sorted by usageTypeName; entry with NULL name terminates list. { "key", kCapContextUsageKey }, + { "keyValue", kCapContextUsageKeyValue }, { "languages", kCapContextUsageLanguage }, { "script", kCapContextUsageScript }, { "territory", kCapContextUsageTerritory }, - { "type", kCapContextUsageType }, { "variant", kCapContextUsageVariant }, { NULL, (CapContextUsage)0 }, }; @@ -747,7 +747,7 @@ LocaleDisplayNamesImpl::keyValueDisplayName(const char* key, const char* value, UnicodeString& result) const { langData.get("Types", key, value, result); - return adjustForUsageAndContext(kCapContextUsageType, result); + return adjustForUsageAndContext(kCapContextUsageKeyValue, result); } //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/icu4c/source/i18n/rbnf.cpp b/icu4c/source/i18n/rbnf.cpp index 486332d6049..df236f2b46d 100644 --- a/icu4c/source/i18n/rbnf.cpp +++ b/icu4c/source/i18n/rbnf.cpp @@ -1532,9 +1532,7 @@ RuleBasedNumberFormat::initCapitalizationContextInfo(const Locale& thelocale) UErrorCode status = U_ZERO_ERROR; UResourceBundle *rb = ures_open(NULL, localeID, &status); rb = ures_getByKeyWithFallback(rb, "contextTransforms", rb, &status); - // Have't got a good contextTransforms type for RBNF number spellout, - // fix that with CLDR #6857. In the meantime use "symbol". - rb = ures_getByKeyWithFallback(rb, "symbol", rb, &status); + rb = ures_getByKeyWithFallback(rb, "number-spellout", rb, &status); if (U_SUCCESS(status) && rb != NULL) { int32_t len = 0; const int32_t * intVector = ures_getIntVector(rb, &len, &status); diff --git a/icu4c/source/i18n/reldtfmt.cpp b/icu4c/source/i18n/reldtfmt.cpp index 10f7711946c..e3a126d3570 100644 --- a/icu4c/source/i18n/reldtfmt.cpp +++ b/icu4c/source/i18n/reldtfmt.cpp @@ -158,7 +158,7 @@ UnicodeString& RelativeDateFormat::format( Calendar& cal, if ( relativeDayString.length() > 0 && !fDatePattern.isEmpty() && (fTimePattern.isEmpty() || fCombinedFormat == NULL || fCombinedHasDateAtStart)) { - // capitalize relativeDayString according to context for tense, set formatter no context + // capitalize relativeDayString according to context for relative, set formatter no context if ( capitalizationContext==UDISPCTX_CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE || (capitalizationContext==UDISPCTX_CAPITALIZATION_FOR_UI_LIST_OR_MENU && fCapitalizationForRelativeUnits[0]) || (capitalizationContext==UDISPCTX_CAPITALIZATION_FOR_STANDALONE && fCapitalizationForRelativeUnits[1]) ) { @@ -477,7 +477,7 @@ void RelativeDateFormat::loadDates(UErrorCode &status) { UResourceBundle *lb = ures_open(NULL, fLocale.getBaseName(), &status); tempStatus = status; UResourceBundle *rb = ures_getByKeyWithFallback(lb, "contextTransforms", NULL, &tempStatus); - UResourceBundle *sb = ures_getByKeyWithFallback(rb, "tense", NULL, &tempStatus); + UResourceBundle *sb = ures_getByKeyWithFallback(rb, "relative", NULL, &tempStatus); if (U_SUCCESS(tempStatus) && sb != NULL) { int32_t len = 0; const int32_t * intVector = ures_getIntVector(sb, &len, &tempStatus); diff --git a/icu4c/source/test/cintltst/cnumtst.c b/icu4c/source/test/cintltst/cnumtst.c index 876e93cc53b..84590441fe8 100644 --- a/icu4c/source/test/cintltst/cnumtst.c +++ b/icu4c/source/test/cintltst/cnumtst.c @@ -2469,6 +2469,10 @@ static const TestContextItem tcItems[] = { /* results for 123.45 */ { "sv", UNUM_SPELLOUT, UDISPCTX_CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE, "Ett\\u00ADhundra\\u00ADtjugo\\u00ADtre komma fyra fem" }, { "sv", UNUM_SPELLOUT, UDISPCTX_CAPITALIZATION_FOR_UI_LIST_OR_MENU, "ett\\u00ADhundra\\u00ADtjugo\\u00ADtre komma fyra fem" }, { "sv", UNUM_SPELLOUT, UDISPCTX_CAPITALIZATION_FOR_STANDALONE, "ett\\u00ADhundra\\u00ADtjugo\\u00ADtre komma fyra fem" }, + { "en", UNUM_SPELLOUT, UDISPCTX_CAPITALIZATION_FOR_MIDDLE_OF_SENTENCE, "one hundred twenty-three point four five" }, + { "en", UNUM_SPELLOUT, UDISPCTX_CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE, "One hundred twenty-three point four five" }, + { "en", UNUM_SPELLOUT, UDISPCTX_CAPITALIZATION_FOR_UI_LIST_OR_MENU, "One hundred twenty-three point four five" }, + { "en", UNUM_SPELLOUT, UDISPCTX_CAPITALIZATION_FOR_STANDALONE, "One hundred twenty-three point four five" }, { NULL, (UNumberFormatStyle)0, (UDisplayContext)0, NULL } }; diff --git a/icu4c/source/test/cintltst/cpluralrulestest.c b/icu4c/source/test/cintltst/cpluralrulestest.c index 2ce185312d3..399ad1ad645 100644 --- a/icu4c/source/test/cintltst/cpluralrulestest.c +++ b/icu4c/source/test/cintltst/cpluralrulestest.c @@ -1,5 +1,5 @@ /******************************************************************** - * Copyright (c) 2011-2013, International Business Machines Corporation + * Copyright (c) 2011-2014, International Business Machines Corporation * and others. All Rights Reserved. ********************************************************************/ /* C API TEST FOR PLURAL RULES */ @@ -48,7 +48,7 @@ static const PluralRulesTestItem testItems[] = { { "ru", 0.5, "other" }, { "ru", 1, "one" }, { "ru", 1.5, "other" }, - { "ru", 2, "other" }, + { "ru", 2, "few" }, { "ru", 5, "many" }, { "ru", 10, "many" }, { "ru", 11, "many" }, diff --git a/icu4c/source/test/intltest/dtfmttst.cpp b/icu4c/source/test/intltest/dtfmttst.cpp index 4bcf22dc557..807c545dffd 100644 --- a/icu4c/source/test/intltest/dtfmttst.cpp +++ b/icu4c/source/test/intltest/dtfmttst.cpp @@ -3885,9 +3885,9 @@ void DateFormatTest::TestMonthPatterns() { "en@calendar=gregorian", -3, { UnicodeString("2012-4-22"), UnicodeString("2012-5-22"), UnicodeString("2012-6-20") } }, { "en@calendar=chinese", DateFormat::kLong, { UnicodeString("Month4 2, ren-chen"), UnicodeString("Month4bis 2, ren-chen"), UnicodeString("Month5 2, ren-chen") } }, { "en@calendar=chinese", DateFormat::kShort, { UnicodeString("4/2/29"), UnicodeString("4bis/2/29"), UnicodeString("5/2/29") } }, - { "zh@calendar=chinese", DateFormat::kLong, { CharsToUnicodeString("\\u58EC\\u8FB0\\u5E74\\u56DB\\u6708\\u4E8C\\u65E5"), - CharsToUnicodeString("\\u58EC\\u8FB0\\u5E74\\u95F0\\u56DB\\u6708\\u4E8C\\u65E5"), - CharsToUnicodeString("\\u58EC\\u8FB0\\u5E74\\u4E94\\u6708\\u4E8C\\u65E5") } }, + { "zh@calendar=chinese", DateFormat::kLong, { CharsToUnicodeString("\\u58EC\\u8FB0\\u5E74\\u56DB\\u6708\\u521D\\u4E8C"), + CharsToUnicodeString("\\u58EC\\u8FB0\\u5E74\\u95F0\\u56DB\\u6708\\u521D\\u4E8C"), + CharsToUnicodeString("\\u58EC\\u8FB0\\u5E74\\u4E94\\u6708\\u521D\\u4E8C") } }, { "zh@calendar=chinese", DateFormat::kShort, { CharsToUnicodeString("\\u58EC\\u8FB0-4-2"), CharsToUnicodeString("\\u58EC\\u8FB0-\\u95F04-2"), CharsToUnicodeString("\\u58EC\\u8FB0-5-2") } }, @@ -3897,9 +3897,9 @@ void DateFormatTest::TestMonthPatterns() { "zh@calendar=chinese", -4, { CharsToUnicodeString("\\u58EC\\u8FB0 \\u56DB\\u6708 2"), CharsToUnicodeString("\\u58EC\\u8FB0 \\u95F0\\u56DB\\u6708 2"), CharsToUnicodeString("\\u58EC\\u8FB0 \\u4E94\\u6708 2") } }, - { "zh_Hant@calendar=chinese", DateFormat::kLong, { CharsToUnicodeString("\\u58EC\\u8FB0\\u5E74\\u56DB\\u6708\\u4E8C\\u65E5"), - CharsToUnicodeString("\\u58EC\\u8FB0\\u5E74\\u958F\\u56DB\\u6708\\u4E8C\\u65E5"), - CharsToUnicodeString("\\u58EC\\u8FB0\\u5E74\\u4E94\\u6708\\u4E8C\\u65E5") } }, + { "zh_Hant@calendar=chinese", DateFormat::kLong, { CharsToUnicodeString("\\u58EC\\u8FB0\\u5E74\\u56DB\\u6708\\u521D\\u4E8C"), + CharsToUnicodeString("\\u58EC\\u8FB0\\u5E74\\u958F\\u56DB\\u6708\\u521D\\u4E8C"), + CharsToUnicodeString("\\u58EC\\u8FB0\\u5E74\\u4E94\\u6708\\u521D\\u4E8C") } }, { "zh_Hant@calendar=chinese", DateFormat::kShort, { CharsToUnicodeString("\\u58EC\\u8FB0/4/2"), CharsToUnicodeString("\\u58EC\\u8FB0/\\u958F4/2"), CharsToUnicodeString("\\u58EC\\u8FB0/5/2") } }, diff --git a/icu4c/source/test/intltest/dtptngts.cpp b/icu4c/source/test/intltest/dtptngts.cpp index 014282b7cb6..b0b9b7bb536 100644 --- a/icu4c/source/test/intltest/dtptngts.cpp +++ b/icu4c/source/test/intltest/dtptngts.cpp @@ -1,6 +1,6 @@ /******************************************************************** * COPYRIGHT: - * Copyright (c) 2008-2013, International Business Machines Corporation and + * Copyright (c) 2008-2014, International Business Machines Corporation and * others. All Rights Reserved. ********************************************************************/ @@ -269,20 +269,20 @@ void IntlTestDateTimePatternGeneratorAPI::testAPI(/*char *par*/) UnicodeString("23:58"), // 16: JJmm // zh@calendar=chinese // 10 zh@calendar=chinese - CharsToUnicodeString("\\u620A\\u5BC5\\u5E7411\\u6708"), // 00: yM - CharsToUnicodeString("\\u620A\\u5BC5\\u5E74\\u5341\\u4E00\\u6708"), // 01: yMMM - CharsToUnicodeString("\\u620A\\u5BC5\\u5E7411\\u670826\\u65E5"), // 02: yMd - CharsToUnicodeString("\\u620A\\u5BC5\\u5E74\\u5341\\u4E00\\u670826\\u65E5"), // 03: yMMMd + CharsToUnicodeString("\\u620A\\u5BC5\\u5E74\\u51AC\\u6708"), // 00: yMMM + CharsToUnicodeString("\\u620A\\u5BC5\\u5E74\\u51AC\\u6708"), // 01: yMMM + CharsToUnicodeString("\\u620A\\u5BC5\\u5E74\\u51AC\\u670826\\u65E5"), // 02: yMMMd + CharsToUnicodeString("\\u620A\\u5BC5\\u5E74\\u51AC\\u670826\\u65E5"), // 03: yMMMd UnicodeString("11-26"), // 04: Md - CharsToUnicodeString("\\u5341\\u4E00\\u670826\\u65E5"), // 05: MMMd - CharsToUnicodeString("\\u5341\\u4E00\\u670826\\u65E5"), // 06: MMMMd + CharsToUnicodeString("\\u51AC\\u670826\\u65E5"), // 05: MMMd + CharsToUnicodeString("\\u51AC\\u670826\\u65E5"), // 06: MMMMd CharsToUnicodeString("\\u620A\\u5BC5\\u5E74\\u7b2c\\u56db\\u5B63\\u5EA6"), // 07: yQQQ CharsToUnicodeString("\\u4E0B\\u534811:58"), // 08: hhmm UnicodeString("23:58"), // 09: HHmm CharsToUnicodeString("\\u4E0B\\u534811:58"), // 10: jjmm UnicodeString("58:59"), // 11: mmss - CharsToUnicodeString("\\u620A\\u5BC5\\u5E74\\u5341\\u4E00\\u6708"), // 12: yyyyMMMM - CharsToUnicodeString("\\u5341\\u4E00\\u670826\\u65E5\\u5468\\u4E09"), // 13: MMMEd + CharsToUnicodeString("\\u620A\\u5BC5\\u5E74\\u51AC\\u6708"), // 12: yyyyMMMM + CharsToUnicodeString("\\u51AC\\u670826\\u65E5\\u5468\\u4E09"), // 13: MMMEd CharsToUnicodeString("26\\u65E5\\u5468\\u4E09"), // 14: Ed -> d\u65E5EEE CharsToUnicodeString("\\u4E0B\\u534811:58:59.123"), // 15: jmmssSS UnicodeString("11:58"), // 16: JJmm diff --git a/icu4c/source/test/intltest/measfmttest.cpp b/icu4c/source/test/intltest/measfmttest.cpp index 64013939b53..6118996b362 100644 --- a/icu4c/source/test/intltest/measfmttest.cpp +++ b/icu4c/source/test/intltest/measfmttest.cpp @@ -642,8 +642,8 @@ void MeasureFormatTest::TestMultiples() { helperTestMultiples(en, UMEASFMT_WIDTH_SHORT, "2 mi, 1 ft, 2.3 in"); helperTestMultiples(en, UMEASFMT_WIDTH_NARROW, "2mi 1\\u2032 2.3\\u2033"); helperTestMultiples(ru, UMEASFMT_WIDTH_WIDE, "2 \\u043C\\u0438\\u043B\\u0438, 1 \\u0444\\u0443\\u0442 \\u0438 2,3 \\u0434\\u044E\\u0439\\u043C\\u0430"); - helperTestMultiples(ru, UMEASFMT_WIDTH_SHORT, "2 \\u043C\\u0438\\u043B\\u0438 1 \\u0444\\u0443\\u0442 2,3 \\u0434\\u044E\\u0439\\u043C\\u0430"); - helperTestMultiples(ru, UMEASFMT_WIDTH_NARROW, "2 \\u043C\\u0438\\u043B\\u0438, 1 \\u0444\\u0443\\u0442, 2,3 \\u0434\\u044E\\u0439\\u043C\\u0430"); + helperTestMultiples(ru, UMEASFMT_WIDTH_SHORT, "2 \\u043C\\u0438\\u043B\\u0438, 1 \\u0444\\u0443\\u0442, 2,3 \\u0434\\u044E\\u0439\\u043C\\u0430"); + helperTestMultiples(ru, UMEASFMT_WIDTH_NARROW, "2 \\u043C\\u0438\\u043B\\u044C 1 \\u0444\\u0443\\u0442 2,3 \\u0434\\u044E\\u0439\\u043C\\u0430"); } void MeasureFormatTest::helperTestMultiples( diff --git a/icu4c/source/test/testdata/structLocale.txt b/icu4c/source/test/testdata/structLocale.txt index 88996950105..ae6b52e727e 100644 --- a/icu4c/source/test/testdata/structLocale.txt +++ b/icu4c/source/test/testdata/structLocale.txt @@ -3880,6 +3880,10 @@ structLocale:table(nofallback){ 2, 2, } + currencyName:intvector{ + 2, + 2, + } day-format-except-narrow:intvector{ 2, 2, @@ -3888,10 +3892,6 @@ structLocale:table(nofallback){ 2, 2, } - displayName:intvector{ - 2, - 2, - } era-abbr:intvector{ 2, 2, @@ -3900,6 +3900,10 @@ structLocale:table(nofallback){ 2, 2, } + keyValue:intvector{ + 2, + 2, + } languages:intvector{ 2, 2, @@ -3912,18 +3916,18 @@ structLocale:table(nofallback){ 2, 2, } + number-spellout:intvector{ + 2, + 2, + } + relative:intvector{ + 2, + 2, + } script:intvector{ 2, 2, } - tense:intvector{ - 2, - 2, - } - type:intvector{ - 2, - 2, - } unit-pattern:intvector{ 2, 2, @@ -13323,6 +13327,14 @@ structLocale:table(nofallback){ MMMM{ M{""} } + MMMMEd{ + M{""} + d{""} + } + MMMMd{ + M{""} + d{""} + } MMMd{ M{""} d{""} @@ -13383,6 +13395,16 @@ structLocale:table(nofallback){ M{""} y{""} } + yMMMMEd{ + M{""} + d{""} + y{""} + } + yMMMMd{ + M{""} + d{""} + y{""} + } yMMMd{ M{""} d{""} @@ -13394,7 +13416,7 @@ structLocale:table(nofallback){ y{""} } } - } + } chinese{ AmPmMarkers{ "", @@ -13574,6 +13596,14 @@ structLocale:table(nofallback){ MMMM{ M{""} } + MMMMEd{ + M{""} + d{""} + } + MMMMd{ + M{""} + d{""} + } MMMd{ M{""} d{""} @@ -13634,6 +13664,16 @@ structLocale:table(nofallback){ M{""} y{""} } + yMMMMEd{ + M{""} + d{""} + y{""} + } + yMMMMd{ + M{""} + d{""} + y{""} + } yMMMd{ M{""} d{""} @@ -13842,6 +13882,14 @@ structLocale:table(nofallback){ MMMM{ M{""} } + MMMMEd{ + M{""} + d{""} + } + MMMMd{ + M{""} + d{""} + } MMMd{ M{""} d{""} @@ -13902,6 +13950,16 @@ structLocale:table(nofallback){ M{""} y{""} } + yMMMMEd{ + M{""} + d{""} + y{""} + } + yMMMMd{ + M{""} + d{""} + y{""} + } yMMMd{ M{""} d{""} @@ -14191,6 +14249,14 @@ structLocale:table(nofallback){ MMMM{ M{""} } + MMMMEd{ + M{""} + d{""} + } + MMMMd{ + M{""} + d{""} + } MMMd{ M{""} d{""} @@ -14251,6 +14317,16 @@ structLocale:table(nofallback){ M{""} y{""} } + yMMMMEd{ + M{""} + d{""} + y{""} + } + yMMMMd{ + M{""} + d{""} + y{""} + } yMMMd{ M{""} d{""} @@ -14460,6 +14536,14 @@ structLocale:table(nofallback){ MMMM{ M{""} } + MMMMEd{ + M{""} + d{""} + } + MMMMd{ + M{""} + d{""} + } MMMd{ M{""} d{""} @@ -14520,6 +14604,16 @@ structLocale:table(nofallback){ M{""} y{""} } + yMMMMEd{ + M{""} + d{""} + y{""} + } + yMMMMd{ + M{""} + d{""} + y{""} + } yMMMd{ M{""} d{""} @@ -14799,6 +14893,14 @@ structLocale:table(nofallback){ MMMM{ M{""} } + MMMMEd{ + M{""} + d{""} + } + MMMMd{ + M{""} + d{""} + } MMMd{ M{""} d{""} @@ -14859,6 +14961,16 @@ structLocale:table(nofallback){ M{""} y{""} } + yMMMMEd{ + M{""} + d{""} + y{""} + } + yMMMMd{ + M{""} + d{""} + y{""} + } yMMMd{ M{""} d{""} @@ -14941,6 +15053,8 @@ structLocale:table(nofallback){ "A4", "A4", } + NoonMarker{""} + NoonMarkerNarrow{""} appendItems{ Day{"{0} ({2}: {1})"} Day-Of-Week{"{0} {1}"} @@ -15100,6 +15214,14 @@ structLocale:table(nofallback){ MMMM{ M{""} } + MMMMEd{ + M{""} + d{""} + } + MMMMd{ + M{""} + d{""} + } MMMd{ M{""} d{""} @@ -15160,6 +15282,16 @@ structLocale:table(nofallback){ M{""} y{""} } + yMMMMEd{ + M{""} + d{""} + y{""} + } + yMMMMd{ + M{""} + d{""} + y{""} + } yMMMd{ M{""} d{""} @@ -15399,6 +15531,14 @@ structLocale:table(nofallback){ MMMM{ M{""} } + MMMMEd{ + M{""} + d{""} + } + MMMMd{ + M{""} + d{""} + } MMMd{ M{""} d{""} @@ -15459,6 +15599,16 @@ structLocale:table(nofallback){ M{""} y{""} } + yMMMMEd{ + M{""} + d{""} + y{""} + } + yMMMMd{ + M{""} + d{""} + y{""} + } yMMMd{ M{""} d{""} @@ -15662,6 +15812,14 @@ structLocale:table(nofallback){ MMMM{ M{""} } + MMMMEd{ + M{""} + d{""} + } + MMMMd{ + M{""} + d{""} + } MMMd{ M{""} d{""} @@ -15722,6 +15880,16 @@ structLocale:table(nofallback){ M{""} y{""} } + yMMMMEd{ + M{""} + d{""} + y{""} + } + yMMMMd{ + M{""} + d{""} + y{""} + } yMMMd{ M{""} d{""} @@ -15917,6 +16085,14 @@ structLocale:table(nofallback){ MMMM{ M{""} } + MMMMEd{ + M{""} + d{""} + } + MMMMd{ + M{""} + d{""} + } MMMd{ M{""} d{""} @@ -15977,6 +16153,16 @@ structLocale:table(nofallback){ M{""} y{""} } + yMMMMEd{ + M{""} + d{""} + y{""} + } + yMMMMd{ + M{""} + d{""} + y{""} + } yMMMd{ M{""} d{""} @@ -16172,6 +16358,14 @@ structLocale:table(nofallback){ MMMM{ M{""} } + MMMMEd{ + M{""} + d{""} + } + MMMMd{ + M{""} + d{""} + } MMMd{ M{""} d{""} @@ -16232,6 +16426,16 @@ structLocale:table(nofallback){ M{""} y{""} } + yMMMMEd{ + M{""} + d{""} + y{""} + } + yMMMMd{ + M{""} + d{""} + y{""} + } yMMMd{ M{""} d{""} @@ -17183,6 +17387,14 @@ structLocale:table(nofallback){ MMMM{ M{""} } + MMMMEd{ + M{""} + d{""} + } + MMMMd{ + M{""} + d{""} + } MMMd{ M{""} d{""} @@ -17243,6 +17455,16 @@ structLocale:table(nofallback){ M{""} y{""} } + yMMMMEd{ + M{""} + d{""} + y{""} + } + yMMMMd{ + M{""} + d{""} + y{""} + } yMMMd{ M{""} d{""}