ICU-4450 Synch data with CLDR
X-SVN-Rev: 17630
diff --git a/icu4c/source/data/coll/ar.txt b/icu4c/source/data/coll/ar.txt
index 4eab22b..10e12b8 100644
--- a/icu4c/source/data/coll/ar.txt
+++ b/icu4c/source/data/coll/ar.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/ar.xml
+// * Source File: ../../../cldr/common/collation/ar.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/be.txt b/icu4c/source/data/coll/be.txt
index 778cd9c..764ccbf 100644
--- a/icu4c/source/data/coll/be.txt
+++ b/icu4c/source/data/coll/be.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/be.xml
+// * Source File: ../../../cldr/common/collation/be.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/bg.txt b/icu4c/source/data/coll/bg.txt
index 6333920..ce0b544 100644
--- a/icu4c/source/data/coll/bg.txt
+++ b/icu4c/source/data/coll/bg.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/bg.xml
+// * Source File: ../../../cldr/common/collation/bg.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/ca.txt b/icu4c/source/data/coll/ca.txt
index abaad22..6c54191 100644
--- a/icu4c/source/data/coll/ca.txt
+++ b/icu4c/source/data/coll/ca.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/ca.xml
+// * Source File: ../../../cldr/common/collation/ca.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/colfiles.mk b/icu4c/source/data/coll/colfiles.mk
index 2451038..8c39178 100644
--- a/icu4c/source/data/coll/colfiles.mk
+++ b/icu4c/source/data/coll/colfiles.mk
@@ -57,7 +57,8 @@
nb_NO.txt nl.txt nl_BE.txt nl_NL.txt nn_NO.txt\
om_ET.txt om_KE.txt pa_IN.txt pl_PL.txt ps_AF.txt\
pt.txt pt_BR.txt pt_PT.txt ro_RO.txt ru_RU.txt\
- ru_UA.txt sh_YU.txt sk_SK.txt sl_SI.txt sq_AL.txt\
+ ru_UA.txt sh_BA.txt sh_YU.txt sk_SK.txt sl_SI.txt\
+ sq_AL.txt sr_BA.txt sr_Cyrl.txt sr_Cyrl_BA.txt sr_Cyrl_YU.txt\
sr_YU.txt sv_FI.txt sv_SE.txt ta_IN.txt te_IN.txt\
th_TH.txt tr_TR.txt uk_UA.txt vi_VN.txt zh_CN.txt\
zh_SG.txt
diff --git a/icu4c/source/data/coll/cs.txt b/icu4c/source/data/coll/cs.txt
index 943d332a..e77052d 100644
--- a/icu4c/source/data/coll/cs.txt
+++ b/icu4c/source/data/coll/cs.txt
@@ -3,14 +3,14 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/cs.xml
+// * Source File: ../../../cldr/common/collation/cs.xml
// *
// ***************************************************************************
/**
* ICU <specials> source: ./xml/collation/cs.xml
*/
cs{
- Version{"1.19"}
+ Version{"1.20"}
collations{
standard{
Sequence{"&C<č<<<Č&H<ch<<<cH<<<Ch<<<CH&R<ř<<<Ř&S<š<<<Š&Z<ž<<<Ž"}
diff --git a/icu4c/source/data/coll/da.txt b/icu4c/source/data/coll/da.txt
index 9b4cc36..e128bb4 100644
--- a/icu4c/source/data/coll/da.txt
+++ b/icu4c/source/data/coll/da.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/da.xml
+// * Source File: ../../../cldr/common/collation/da.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/de.txt b/icu4c/source/data/coll/de.txt
index 97c30cf..8c66632 100644
--- a/icu4c/source/data/coll/de.txt
+++ b/icu4c/source/data/coll/de.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/de.xml
+// * Source File: ../../../cldr/common/collation/de.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/el.txt b/icu4c/source/data/coll/el.txt
index d249623..74b3930 100644
--- a/icu4c/source/data/coll/el.txt
+++ b/icu4c/source/data/coll/el.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/el.xml
+// * Source File: ../../../cldr/common/collation/el.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/en.txt b/icu4c/source/data/coll/en.txt
index 6aabbee..72bdded 100644
--- a/icu4c/source/data/coll/en.txt
+++ b/icu4c/source/data/coll/en.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/en.xml
+// * Source File: ../../../cldr/common/collation/en.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/en_BE.txt b/icu4c/source/data/coll/en_BE.txt
index d297ced..ef45e7b 100644
--- a/icu4c/source/data/coll/en_BE.txt
+++ b/icu4c/source/data/coll/en_BE.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/en_BE.xml
+// * Source File: ../../../cldr/common/collation/en_BE.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/eo.txt b/icu4c/source/data/coll/eo.txt
index c714538..5c4e9c5 100644
--- a/icu4c/source/data/coll/eo.txt
+++ b/icu4c/source/data/coll/eo.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/eo.xml
+// * Source File: ../../../cldr/common/collation/eo.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/es.txt b/icu4c/source/data/coll/es.txt
index 98256d5..316d22f 100644
--- a/icu4c/source/data/coll/es.txt
+++ b/icu4c/source/data/coll/es.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/es.xml
+// * Source File: ../../../cldr/common/collation/es.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/et.txt b/icu4c/source/data/coll/et.txt
index d1d18f9..b45b95c 100644
--- a/icu4c/source/data/coll/et.txt
+++ b/icu4c/source/data/coll/et.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/et.xml
+// * Source File: ../../../cldr/common/collation/et.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/fa.txt b/icu4c/source/data/coll/fa.txt
index b5b3a10..2289d54 100644
--- a/icu4c/source/data/coll/fa.txt
+++ b/icu4c/source/data/coll/fa.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/fa.xml
+// * Source File: ../../../cldr/common/collation/fa.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/fa_AF.txt b/icu4c/source/data/coll/fa_AF.txt
index 86ccf0a..9c73442 100644
--- a/icu4c/source/data/coll/fa_AF.txt
+++ b/icu4c/source/data/coll/fa_AF.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/fa_AF.xml
+// * Source File: ../../../cldr/common/collation/fa_AF.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/fi.txt b/icu4c/source/data/coll/fi.txt
index 74cca7a..a2c1842 100644
--- a/icu4c/source/data/coll/fi.txt
+++ b/icu4c/source/data/coll/fi.txt
@@ -3,14 +3,14 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/fi.xml
+// * Source File: ../../../cldr/common/collation/fi.xml
// *
// ***************************************************************************
/**
* ICU <specials> source: ./xml/collation/fi.xml
*/
fi{
- Version{"1.18"}
+ Version{"1.19"}
collations{
standard{
Sequence{
diff --git a/icu4c/source/data/coll/fo.txt b/icu4c/source/data/coll/fo.txt
index 0aaad1c..7430e4b 100644
--- a/icu4c/source/data/coll/fo.txt
+++ b/icu4c/source/data/coll/fo.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/fo.xml
+// * Source File: ../../../cldr/common/collation/fo.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/fr.txt b/icu4c/source/data/coll/fr.txt
index 54d76ed..eb02bdf 100644
--- a/icu4c/source/data/coll/fr.txt
+++ b/icu4c/source/data/coll/fr.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/fr.xml
+// * Source File: ../../../cldr/common/collation/fr.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/gu.txt b/icu4c/source/data/coll/gu.txt
index 3124ef9..96a484d 100644
--- a/icu4c/source/data/coll/gu.txt
+++ b/icu4c/source/data/coll/gu.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/gu.xml
+// * Source File: ../../../cldr/common/collation/gu.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/he.txt b/icu4c/source/data/coll/he.txt
index 8b2fc9a..2dd4637 100644
--- a/icu4c/source/data/coll/he.txt
+++ b/icu4c/source/data/coll/he.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/he.xml
+// * Source File: ../../../cldr/common/collation/he.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/hi.txt b/icu4c/source/data/coll/hi.txt
index 2e99640..917396b 100644
--- a/icu4c/source/data/coll/hi.txt
+++ b/icu4c/source/data/coll/hi.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/hi.xml
+// * Source File: ../../../cldr/common/collation/hi.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/hr.txt b/icu4c/source/data/coll/hr.txt
index 301e746..01a0485 100644
--- a/icu4c/source/data/coll/hr.txt
+++ b/icu4c/source/data/coll/hr.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/hr.xml
+// * Source File: ../../../cldr/common/collation/hr.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/hu.txt b/icu4c/source/data/coll/hu.txt
index ae990bd..cf14810 100644
--- a/icu4c/source/data/coll/hu.txt
+++ b/icu4c/source/data/coll/hu.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/hu.xml
+// * Source File: ../../../cldr/common/collation/hu.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/is.txt b/icu4c/source/data/coll/is.txt
index a31d734..7457d16 100644
--- a/icu4c/source/data/coll/is.txt
+++ b/icu4c/source/data/coll/is.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/is.xml
+// * Source File: ../../../cldr/common/collation/is.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/it.txt b/icu4c/source/data/coll/it.txt
index 56847f5..73e06c7 100644
--- a/icu4c/source/data/coll/it.txt
+++ b/icu4c/source/data/coll/it.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/it.xml
+// * Source File: ../../../cldr/common/collation/it.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/ja.txt b/icu4c/source/data/coll/ja.txt
index b859043..9017b79 100644
--- a/icu4c/source/data/coll/ja.txt
+++ b/icu4c/source/data/coll/ja.txt
@@ -3,14 +3,14 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/ja.xml
+// * Source File: ../../../cldr/common/collation/ja.xml
// *
// ***************************************************************************
/**
* ICU <specials> source: ./xml/collation/ja.xml
*/
ja{
- Version{"1.19"}
+ Version{"1.20"}
collations{
standard{
Sequence{
@@ -254,58 +254,58 @@
"&¥=￥"
"&¦=￤"
"&¬=￢"
- "&ᄀ=ﾡ"
- "&ᄁ=ﾢ"
- "&ᄂ=ﾤ"
- "&ᄃ=ﾧ"
- "&ᄄ=ﾨ"
- "&ᄅ=ﾩ"
- "&ᄆ=ﾱ"
- "&ᄇ=ﾲ"
- "&ᄈ=ﾳ"
- "&ᄉ=ﾵ"
- "&ᄊ=ﾶ"
- "&ᄋ=ﾷ"
- "&ᄌ=ﾸ"
- "&ᄍ=ﾹ"
- "&ᄎ=ﾺ"
- "&ᄏ=ﾻ"
- "&ᄐ=ﾼ"
- "&ᄑ=ﾽ"
- "&ᄒ=ﾾ"
- "&ᄚ=ﾰ"
- "&ᄡ=ﾴ"
- "&ᅠ=ﾠ"
- "&ᅡ=ￂ"
- "&ᅢ=ￃ"
- "&ᅣ=ￄ"
- "&ᅤ=ￅ"
- "&ᅥ=ￆ"
- "&ᅦ=ￇ"
- "&ᅧ=ￊ"
- "&ᅨ=ￋ"
- "&ᅩ=ￌ"
- "&ᅪ=ￍ"
- "&ᅫ=ￎ"
- "&ᅬ=ￏ"
- "&ᅭ=ￒ"
- "&ᅮ=ￓ"
- "&ᅯ=ￔ"
- "&ᅰ=ￕ"
- "&ᅱ=ￖ"
- "&ᅲ=ￗ"
- "&ᅳ=ￚ"
- "&ᅴ=ￛ"
- "&ᅵ=ￜ"
- "&ᆪ=ﾣ"
- "&ᆬ=ﾥ"
- "&ᆭ=ﾦ"
- "&ᆰ=ﾪ"
- "&ᆱ=ﾫ"
- "&ᆲ=ﾬ"
- "&ᆳ=ﾭ"
- "&ᆴ=ﾮ"
- "&ᆵ=ﾯ"
+ "&ᄀ=ﾡ=ㄱ"
+ "&ᄁ=ﾢ=ㄲ"
+ "&ᄂ=ﾤ=ㄴ"
+ "&ᄃ=ﾧ=ㄷ"
+ "&ᄄ=ﾨ=ㄸ"
+ "&ᄅ=ﾩ=ㄹ"
+ "&ᄆ=ﾱ=ㅁ"
+ "&ᄇ=ﾲ=ㅂ"
+ "&ᄈ=ﾳ=ㅃ"
+ "&ᄉ=ﾵ=ㅅ"
+ "&ᄊ=ﾶ=ㅆ"
+ "&ᄋ=ﾷ=ㅇ"
+ "&ᄌ=ﾸ=ㅈ"
+ "&ᄍ=ﾹ=ㅉ"
+ "&ᄎ=ﾺ=ㅊ"
+ "&ᄏ=ﾻ=ㅋ"
+ "&ᄐ=ﾼ=ㅌ"
+ "&ᄑ=ﾽ=ㅍ"
+ "&ᄒ=ﾾ=ㅎ"
+ "&ᄚ=ﾰ=ㅀ"
+ "&ᄡ=ﾴ=ㅄ"
+ "&ᅠ=ﾠ=ㅤ"
+ "&ᅡ=ￂ=ㅏ"
+ "&ᅢ=ￃ=ㅐ"
+ "&ᅣ=ￄ=ㅑ"
+ "&ᅤ=ￅ=ㅒ"
+ "&ᅥ=ￆ=ㅓ"
+ "&ᅦ=ￇ=ㅔ"
+ "&ᅧ=ￊ=ㅕ"
+ "&ᅨ=ￋ=ㅖ"
+ "&ᅩ=ￌ=ㅗ"
+ "&ᅪ=ￍ=ㅘ"
+ "&ᅫ=ￎ=ㅙ"
+ "&ᅬ=ￏ=ㅚ"
+ "&ᅭ=ￒ=ㅛ"
+ "&ᅮ=ￓ=ㅜ"
+ "&ᅯ=ￔ=ㅝ"
+ "&ᅰ=ￕ=ㅞ"
+ "&ᅱ=ￖ=ㅟ"
+ "&ᅲ=ￗ=ㅠ"
+ "&ᅳ=ￚ=ㅡ"
+ "&ᅴ=ￛ=ㅢ"
+ "&ᅵ=ￜ=ㅣ"
+ "&ᆪ=ﾣ=ㄳ"
+ "&ᆬ=ﾥ=ㄵ"
+ "&ᆭ=ﾦ=ㄶ"
+ "&ᆰ=ﾪ=ㄺ"
+ "&ᆱ=ﾫ=ㄻ"
+ "&ᆲ=ﾬ=ㄼ"
+ "&ᆳ=ﾭ=ㄽ"
+ "&ᆴ=ﾮ=ㄾ"
+ "&ᆵ=ﾯ=ㄿ"
"&₩=￦"
"&←=￩"
"&↑=￪"
diff --git a/icu4c/source/data/coll/kk.txt b/icu4c/source/data/coll/kk.txt
index 84298dd..a82a804 100644
--- a/icu4c/source/data/coll/kk.txt
+++ b/icu4c/source/data/coll/kk.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/kk.xml
+// * Source File: ../../../cldr/common/collation/kk.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/kl.txt b/icu4c/source/data/coll/kl.txt
index bf23326..f902086 100644
--- a/icu4c/source/data/coll/kl.txt
+++ b/icu4c/source/data/coll/kl.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/kl.xml
+// * Source File: ../../../cldr/common/collation/kl.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/kn.txt b/icu4c/source/data/coll/kn.txt
index 5460a49..4dda0df 100644
--- a/icu4c/source/data/coll/kn.txt
+++ b/icu4c/source/data/coll/kn.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/kn.xml
+// * Source File: ../../../cldr/common/collation/kn.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/ko.txt b/icu4c/source/data/coll/ko.txt
index a3793a8..78f21ac 100644
--- a/icu4c/source/data/coll/ko.txt
+++ b/icu4c/source/data/coll/ko.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/ko.xml
+// * Source File: ../../../cldr/common/collation/ko.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/lt.txt b/icu4c/source/data/coll/lt.txt
index 1919591..76e5c73 100644
--- a/icu4c/source/data/coll/lt.txt
+++ b/icu4c/source/data/coll/lt.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/lt.xml
+// * Source File: ../../../cldr/common/collation/lt.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/lv.txt b/icu4c/source/data/coll/lv.txt
index 4205acd..3628b01 100644
--- a/icu4c/source/data/coll/lv.txt
+++ b/icu4c/source/data/coll/lv.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/lv.xml
+// * Source File: ../../../cldr/common/collation/lv.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/mk.txt b/icu4c/source/data/coll/mk.txt
index d187547..b870111 100644
--- a/icu4c/source/data/coll/mk.txt
+++ b/icu4c/source/data/coll/mk.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/mk.xml
+// * Source File: ../../../cldr/common/collation/mk.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/ml.txt b/icu4c/source/data/coll/ml.txt
index d665ab5..2af6ecf 100644
--- a/icu4c/source/data/coll/ml.txt
+++ b/icu4c/source/data/coll/ml.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/ml.xml
+// * Source File: ../../../cldr/common/collation/ml.xml
// *
// ***************************************************************************
ml{
diff --git a/icu4c/source/data/coll/mr.txt b/icu4c/source/data/coll/mr.txt
index 062ff1e..8182192 100644
--- a/icu4c/source/data/coll/mr.txt
+++ b/icu4c/source/data/coll/mr.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/mr.xml
+// * Source File: ../../../cldr/common/collation/mr.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/mt.txt b/icu4c/source/data/coll/mt.txt
index 5d5e246..9987781 100644
--- a/icu4c/source/data/coll/mt.txt
+++ b/icu4c/source/data/coll/mt.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/mt.xml
+// * Source File: ../../../cldr/common/collation/mt.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/nb.txt b/icu4c/source/data/coll/nb.txt
index 2a6c4d9..71db971 100644
--- a/icu4c/source/data/coll/nb.txt
+++ b/icu4c/source/data/coll/nb.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/nb.xml
+// * Source File: ../../../cldr/common/collation/nb.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/nn.txt b/icu4c/source/data/coll/nn.txt
index 7229908..872487e 100644
--- a/icu4c/source/data/coll/nn.txt
+++ b/icu4c/source/data/coll/nn.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/nn.xml
+// * Source File: ../../../cldr/common/collation/nn.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/om.txt b/icu4c/source/data/coll/om.txt
index 55577b5..3c77fea 100644
--- a/icu4c/source/data/coll/om.txt
+++ b/icu4c/source/data/coll/om.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/om.xml
+// * Source File: ../../../cldr/common/collation/om.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/or.txt b/icu4c/source/data/coll/or.txt
index ee43edd..c9eccc1 100644
--- a/icu4c/source/data/coll/or.txt
+++ b/icu4c/source/data/coll/or.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/or.xml
+// * Source File: ../../../cldr/common/collation/or.xml
// *
// ***************************************************************************
or{
diff --git a/icu4c/source/data/coll/pa.txt b/icu4c/source/data/coll/pa.txt
index 2d3ee57..30c8555 100644
--- a/icu4c/source/data/coll/pa.txt
+++ b/icu4c/source/data/coll/pa.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/pa.xml
+// * Source File: ../../../cldr/common/collation/pa.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/pl.txt b/icu4c/source/data/coll/pl.txt
index 58371c1..3593c1f 100644
--- a/icu4c/source/data/coll/pl.txt
+++ b/icu4c/source/data/coll/pl.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/pl.xml
+// * Source File: ../../../cldr/common/collation/pl.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/ps.txt b/icu4c/source/data/coll/ps.txt
index 864342f..01a047a 100644
--- a/icu4c/source/data/coll/ps.txt
+++ b/icu4c/source/data/coll/ps.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/ps.xml
+// * Source File: ../../../cldr/common/collation/ps.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/ro.txt b/icu4c/source/data/coll/ro.txt
index d86ac71..9546aea 100644
--- a/icu4c/source/data/coll/ro.txt
+++ b/icu4c/source/data/coll/ro.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/ro.xml
+// * Source File: ../../../cldr/common/collation/ro.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/root.txt b/icu4c/source/data/coll/root.txt
index f6a2b11..7741360 100644
--- a/icu4c/source/data/coll/root.txt
+++ b/icu4c/source/data/coll/root.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/root.xml
+// * Source File: ../../../cldr/common/collation/root.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/ru.txt b/icu4c/source/data/coll/ru.txt
index cd56fbd..fd8c62f 100644
--- a/icu4c/source/data/coll/ru.txt
+++ b/icu4c/source/data/coll/ru.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/ru.xml
+// * Source File: ../../../cldr/common/collation/ru.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/sh.txt b/icu4c/source/data/coll/sh.txt
index 13e2d82..5bc266b 100644
--- a/icu4c/source/data/coll/sh.txt
+++ b/icu4c/source/data/coll/sh.txt
@@ -3,13 +3,13 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/sh.xml
+// * Source File: ../../../cldr/common/collation/sh.xml
// *
// ***************************************************************************
/**
* ICU <specials> source: ./xml/collation/sh.xml
*/
sh{
- Version{"1.18"}
+ Version{"1.19"}
collations:alias{"hr/collations"}
}
diff --git a/icu4c/source/data/locales/hr_HR.txt b/icu4c/source/data/coll/sh_BA.txt
similarity index 69%
copy from icu4c/source/data/locales/hr_HR.txt
copy to icu4c/source/data/coll/sh_BA.txt
index c20444d..e53bd97 100644
--- a/icu4c/source/data/locales/hr_HR.txt
+++ b/icu4c/source/data/coll/sh_BA.txt
@@ -3,9 +3,15 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/hr_HR.xml
+// * Source File: deprecatedList.xml
// *
// ***************************************************************************
-hr_HR{
- Version{"1.26"}
+/**
+ * validSubLocale of "sh"
+ */
+sh_BA{
+ /**
+ * so genrb doesn't issue warnings
+ */
+ ___{""}
}
diff --git a/icu4c/source/data/coll/sk.txt b/icu4c/source/data/coll/sk.txt
index d9767b9..bf84d1f 100644
--- a/icu4c/source/data/coll/sk.txt
+++ b/icu4c/source/data/coll/sk.txt
@@ -3,21 +3,21 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/sk.xml
+// * Source File: ../../../cldr/common/collation/sk.xml
// *
// ***************************************************************************
/**
* ICU <specials> source: ./xml/collation/sk.xml
*/
sk{
- Version{"1.19"}
+ Version{"1.20"}
collations{
standard{
Sequence{
"&A<ä<<<Ä"
"&C<č<<<Č"
"&D<đ<<<Đ"
- "&H<ch<<<cH<<<Ch<<<CH"
+ "&H<ch<<<Ch<<<CH"
"&L<ł<<<Ł"
"&O<ô<<<Ô"
"&R<ř<<<Ř"
diff --git a/icu4c/source/data/coll/sl.txt b/icu4c/source/data/coll/sl.txt
index 47e004d..4c48c70 100644
--- a/icu4c/source/data/coll/sl.txt
+++ b/icu4c/source/data/coll/sl.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/sl.xml
+// * Source File: ../../../cldr/common/collation/sl.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/sq.txt b/icu4c/source/data/coll/sq.txt
index 8f22e64..6263236 100644
--- a/icu4c/source/data/coll/sq.txt
+++ b/icu4c/source/data/coll/sq.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/sq.xml
+// * Source File: ../../../cldr/common/collation/sq.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/sr.txt b/icu4c/source/data/coll/sr.txt
index 7ccf4ca..29cbb73 100644
--- a/icu4c/source/data/coll/sr.txt
+++ b/icu4c/source/data/coll/sr.txt
@@ -3,13 +3,13 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/sr.xml
+// * Source File: ../../../cldr/common/collation/sr.xml
// *
// ***************************************************************************
/**
* ICU <specials> source: ./xml/collation/sr.xml
*/
sr{
- Version{"1.15"}
+ Version{"1.16"}
collations:alias{"ru/collations"}
}
diff --git a/icu4c/source/data/locales/hr_HR.txt b/icu4c/source/data/coll/sr_BA.txt
similarity index 69%
copy from icu4c/source/data/locales/hr_HR.txt
copy to icu4c/source/data/coll/sr_BA.txt
index c20444d..3e47825 100644
--- a/icu4c/source/data/locales/hr_HR.txt
+++ b/icu4c/source/data/coll/sr_BA.txt
@@ -3,9 +3,15 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/hr_HR.xml
+// * Source File: deprecatedList.xml
// *
// ***************************************************************************
-hr_HR{
- Version{"1.26"}
+/**
+ * validSubLocale of "sr"
+ */
+sr_BA{
+ /**
+ * so genrb doesn't issue warnings
+ */
+ ___{""}
}
diff --git a/icu4c/source/data/locales/sr_Cyrl.txt b/icu4c/source/data/coll/sr_Cyrl.txt
similarity index 71%
rename from icu4c/source/data/locales/sr_Cyrl.txt
rename to icu4c/source/data/coll/sr_Cyrl.txt
index 628865b..2a2b9a8 100644
--- a/icu4c/source/data/locales/sr_Cyrl.txt
+++ b/icu4c/source/data/coll/sr_Cyrl.txt
@@ -3,9 +3,15 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/sr_Cyrl.xml
+// * Source File: deprecatedList.xml
// *
// ***************************************************************************
+/**
+ * validSubLocale of "sr"
+ */
sr_Cyrl{
- Version{"1.9"}
+ /**
+ * so genrb doesn't issue warnings
+ */
+ ___{""}
}
diff --git a/icu4c/source/data/locales/hr_HR.txt b/icu4c/source/data/coll/sr_Cyrl_BA.txt
similarity index 69%
copy from icu4c/source/data/locales/hr_HR.txt
copy to icu4c/source/data/coll/sr_Cyrl_BA.txt
index c20444d..eb45ac0 100644
--- a/icu4c/source/data/locales/hr_HR.txt
+++ b/icu4c/source/data/coll/sr_Cyrl_BA.txt
@@ -3,9 +3,15 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/hr_HR.xml
+// * Source File: deprecatedList.xml
// *
// ***************************************************************************
-hr_HR{
- Version{"1.26"}
+/**
+ * validSubLocale of "sr"
+ */
+sr_Cyrl_BA{
+ /**
+ * so genrb doesn't issue warnings
+ */
+ ___{""}
}
diff --git a/icu4c/source/data/locales/hr_HR.txt b/icu4c/source/data/coll/sr_Cyrl_YU.txt
similarity index 69%
rename from icu4c/source/data/locales/hr_HR.txt
rename to icu4c/source/data/coll/sr_Cyrl_YU.txt
index c20444d..1a71d88 100644
--- a/icu4c/source/data/locales/hr_HR.txt
+++ b/icu4c/source/data/coll/sr_Cyrl_YU.txt
@@ -3,9 +3,15 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/hr_HR.xml
+// * Source File: deprecatedList.xml
// *
// ***************************************************************************
-hr_HR{
- Version{"1.26"}
+/**
+ * validSubLocale of "sr"
+ */
+sr_Cyrl_YU{
+ /**
+ * so genrb doesn't issue warnings
+ */
+ ___{""}
}
diff --git a/icu4c/source/data/coll/sv.txt b/icu4c/source/data/coll/sv.txt
index 6f695c7..8ae9761 100644
--- a/icu4c/source/data/coll/sv.txt
+++ b/icu4c/source/data/coll/sv.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/sv.xml
+// * Source File: ../../../cldr/common/collation/sv.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/ta.txt b/icu4c/source/data/coll/ta.txt
index d15309c..57ecb24 100644
--- a/icu4c/source/data/coll/ta.txt
+++ b/icu4c/source/data/coll/ta.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/ta.xml
+// * Source File: ../../../cldr/common/collation/ta.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/te.txt b/icu4c/source/data/coll/te.txt
index d412c71..f05da26 100644
--- a/icu4c/source/data/coll/te.txt
+++ b/icu4c/source/data/coll/te.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/te.xml
+// * Source File: ../../../cldr/common/collation/te.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/th.txt b/icu4c/source/data/coll/th.txt
index a596e4b..9579e1f 100644
--- a/icu4c/source/data/coll/th.txt
+++ b/icu4c/source/data/coll/th.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/th.xml
+// * Source File: ../../../cldr/common/collation/th.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/tr.txt b/icu4c/source/data/coll/tr.txt
index 3e877ca..85eaf16 100644
--- a/icu4c/source/data/coll/tr.txt
+++ b/icu4c/source/data/coll/tr.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/tr.xml
+// * Source File: ../../../cldr/common/collation/tr.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/uk.txt b/icu4c/source/data/coll/uk.txt
index af24abc..f7b190c 100644
--- a/icu4c/source/data/coll/uk.txt
+++ b/icu4c/source/data/coll/uk.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/uk.xml
+// * Source File: ../../../cldr/common/collation/uk.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/vi.txt b/icu4c/source/data/coll/vi.txt
index ad5dd2d..148f5e4 100644
--- a/icu4c/source/data/coll/vi.txt
+++ b/icu4c/source/data/coll/vi.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/vi.xml
+// * Source File: ../../../cldr/common/collation/vi.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/zh.txt b/icu4c/source/data/coll/zh.txt
index 5742dcd..d68410a 100644
--- a/icu4c/source/data/coll/zh.txt
+++ b/icu4c/source/data/coll/zh.txt
@@ -3,11 +3,14 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/zh.xml
+// * Source File: ../../../cldr/common/collation/zh.xml
// *
// ***************************************************************************
+/**
+ * ICU <specials> source: ./xml/collation/zh.xml
+ */
zh{
- Version{"1.20"}
+ Version{"1.21"}
collations{
big5han{
Sequence{
@@ -1261,6 +1264,20 @@
}
Version{"1.3"}
}
+ standard{
+ Sequence{
+ "&[before 2]a<<ā<<<Ā<<á<<<Á<<ǎ<<<Ǎ<<à<<<À"
+ "&[before 2]e<<ē<<<Ē<<é<<<É<<ě<<<Ě<<è<<<È"
+ "&e<<ê̄<<<Ê̄<<ế<<<Ế<<ê̌<<<Ê̌<<ề<<<Ề"
+ "&[before 2]i<<ī<<<Ī<<í<<<Í<<ǐ<<<Ǐ<<ì<<<Ì"
+ "&[before 2]m<<m̄<<<M̄<<ḿ<<<Ḿ<<m̌<<<M̌<<m̀<<<M̀"
+ "&[before 2]n<<n̄<<<N̄<<ń<<<Ń<<ň<<<Ň<<ǹ<<<Ǹ"
+ "&[before 2]o<<ō<<<Ō<<ó<<<Ó<<ǒ<<<Ǒ<<ò<<<Ò"
+ "&[before 2]u<<ū<<<Ū<<ú<<<Ú<<ǔ<<<Ǔ<<ù<<<Ù"
+ "&U<<ǖ<<<Ǖ<<ǘ<<<Ǘ<<ǚ<<<Ǚ<<ǜ<<<Ǜ<<ü<<<Ü"
+ }
+ Version{"1.3"}
+ }
stroke{
Sequence{
"&[before 2]a<<ā<<<Ā<<á<<<Á<<ǎ<<<Ǎ<<à<<<À"
diff --git a/icu4c/source/data/coll/zh_HK.txt b/icu4c/source/data/coll/zh_HK.txt
index cc8ae21..e0ad5e5 100644
--- a/icu4c/source/data/coll/zh_HK.txt
+++ b/icu4c/source/data/coll/zh_HK.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/zh_HK.xml
+// * Source File: ../../../cldr/common/collation/zh_HK.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/zh_Hant.txt b/icu4c/source/data/coll/zh_Hant.txt
index 7eb29c1..6d377a8 100644
--- a/icu4c/source/data/coll/zh_Hant.txt
+++ b/icu4c/source/data/coll/zh_Hant.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/zh_Hant.xml
+// * Source File: ../../../cldr/common/collation/zh_Hant.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/zh_MO.txt b/icu4c/source/data/coll/zh_MO.txt
index 282d893..d90616a 100644
--- a/icu4c/source/data/coll/zh_MO.txt
+++ b/icu4c/source/data/coll/zh_MO.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/zh_MO.xml
+// * Source File: ../../../cldr/common/collation/zh_MO.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/coll/zh_TW.txt b/icu4c/source/data/coll/zh_TW.txt
index 454776a..197f392 100644
--- a/icu4c/source/data/coll/zh_TW.txt
+++ b/icu4c/source/data/coll/zh_TW.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/collation/zh_TW.xml
+// * Source File: ../../../cldr/common/collation/zh_TW.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/locales/af.txt b/icu4c/source/data/locales/af.txt
index eb0050a..16e7077 100644
--- a/icu4c/source/data/locales/af.txt
+++ b/icu4c/source/data/locales/af.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/af.xml
+// * Source File: ../../../cldr/common/main/af.xml
// *
// ***************************************************************************
/**
@@ -168,7 +168,7 @@
"�",
"+",
}
- Version{"1.31"}
+ Version{"1.33"}
calendar{
gregorian{
AmPmMarkers{
diff --git a/icu4c/source/data/locales/af_ZA.txt b/icu4c/source/data/locales/af_ZA.txt
index c026e17..9ddfb1d 100644
--- a/icu4c/source/data/locales/af_ZA.txt
+++ b/icu4c/source/data/locales/af_ZA.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/af_ZA.xml
+// * Source File: ../../../cldr/common/main/af_ZA.xml
// *
// ***************************************************************************
af_ZA{
@@ -13,7 +13,7 @@
"#,##0%",
"#E0",
}
- Version{"1.24"}
+ Version{"1.27"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/am.txt b/icu4c/source/data/locales/am.txt
index 77e7d5c..357aa1e 100644
--- a/icu4c/source/data/locales/am.txt
+++ b/icu4c/source/data/locales/am.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/am.xml
+// * Source File: ../../../cldr/common/main/am.xml
// *
// ***************************************************************************
/**
@@ -138,7 +138,28 @@
ZA{"ደቡብ አፍሪካ"}
ZM{"ዛምቢያ"}
}
- ExemplarCharacters{"[:Ethi:]"}
+ Currencies{
+ EUR{
+ "€",
+ "EUR",
+ }
+ GBP{
+ "£",
+ "GBP",
+ }
+ INR{
+ "=0#Rs.|1#Re.|1<Rs.",
+ "INR",
+ }
+ JPY{
+ "¥",
+ "JPY",
+ }
+ }
+ ExemplarCharacters{
+ "[ሀ-ቈቊ-ቍቐ-ቖቘቚ-ቝበ-ኈኊ-ኍነ-ኰኲ-ኵኸ-ኾዀዂ-ዅወ-ዖዘ-ጐጒ-ጕጘ-ፚ፟-፼ᎀ-᎙ⶀ-ⶖⶠ-ⶦⶨ-ⶮⶰ-ⶶⶸ-ⶾⷀ-ⷆⷈ-ⷎⷐ-ⷖⷘ"
+ "-ⷞ]"
+ }
Languages{
aa{"አፋርኛ"}
ab{"አብሐዚኛ"}
@@ -286,7 +307,7 @@
LocaleScript{
"Ethi",
}
- Version{"1.34"}
+ Version{"1.39"}
calendar{
gregorian{
DateTimeElements:intvector{
diff --git a/icu4c/source/data/locales/am_ET.txt b/icu4c/source/data/locales/am_ET.txt
index 0310ee8..d86aebb 100644
--- a/icu4c/source/data/locales/am_ET.txt
+++ b/icu4c/source/data/locales/am_ET.txt
@@ -3,15 +3,11 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/am_ET.xml
+// * Source File: ../../../cldr/common/main/am_ET.xml
// *
// ***************************************************************************
am_ET{
Currencies{
- ETB{
- "$",
- "ETB",
- }
USD{
"US$",
"USD",
@@ -23,7 +19,7 @@
"#,##0%",
"#E0",
}
- Version{"1.28"}
+ Version{"1.29"}
calendar{
gregorian{
AmPmMarkers{
diff --git a/icu4c/source/data/locales/ar.txt b/icu4c/source/data/locales/ar.txt
index 9095550..9a99bf5 100644
--- a/icu4c/source/data/locales/ar.txt
+++ b/icu4c/source/data/locales/ar.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ar.xml
+// * Source File: ../../../cldr/common/main/ar.xml
// *
// ***************************************************************************
/**
@@ -435,7 +435,7 @@
traditional{"تقليدي"}
}
}
- Version{"1.40"}
+ Version{"1.43"}
calendar{
buddhist{
eras{
@@ -475,15 +475,6 @@
"ج",
"س",
}
- narrow{
- "ح",
- "ن",
- "ث",
- "ر",
- "خ",
- "ج",
- "س",
- }
wide{
"الأحد",
"الاثنين",
@@ -494,6 +485,17 @@
"السبت",
}
}
+ stand-alone{
+ narrow{
+ "ح",
+ "ن",
+ "ث",
+ "ر",
+ "خ",
+ "ج",
+ "س",
+ }
+ }
}
eras{
abbreviated{
@@ -517,20 +519,6 @@
"نوفمبر",
"ديسمبر",
}
- narrow{
- "ي",
- "ف",
- "م",
- "آ",
- "و",
- "ن",
- "ل",
- "غ",
- "س",
- "ك",
- "ب",
- "د",
- }
wide{
"يناير",
"فبراير",
@@ -546,6 +534,22 @@
"ديسمبر",
}
}
+ stand-alone{
+ narrow{
+ "ي",
+ "ف",
+ "م",
+ "آ",
+ "و",
+ "ن",
+ "ل",
+ "غ",
+ "س",
+ "ك",
+ "ب",
+ "د",
+ }
+ }
}
weekend:intvector{
5,
diff --git a/icu4c/source/data/locales/ar_AE.txt b/icu4c/source/data/locales/ar_AE.txt
index 522ae47..a6d5d65 100644
--- a/icu4c/source/data/locales/ar_AE.txt
+++ b/icu4c/source/data/locales/ar_AE.txt
@@ -3,9 +3,9 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ar_AE.xml
+// * Source File: ../../../cldr/common/main/ar_AE.xml
// *
// ***************************************************************************
ar_AE{
- Version{"1.25"}
+ Version{"1.26"}
}
diff --git a/icu4c/source/data/locales/ar_BH.txt b/icu4c/source/data/locales/ar_BH.txt
index ceb67c2..c15f54d 100644
--- a/icu4c/source/data/locales/ar_BH.txt
+++ b/icu4c/source/data/locales/ar_BH.txt
@@ -3,9 +3,9 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ar_BH.xml
+// * Source File: ../../../cldr/common/main/ar_BH.xml
// *
// ***************************************************************************
ar_BH{
- Version{"1.25"}
+ Version{"1.26"}
}
diff --git a/icu4c/source/data/locales/ar_DZ.txt b/icu4c/source/data/locales/ar_DZ.txt
index 5fb351d..dc7e1ee 100644
--- a/icu4c/source/data/locales/ar_DZ.txt
+++ b/icu4c/source/data/locales/ar_DZ.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ar_DZ.xml
+// * Source File: ../../../cldr/common/main/ar_DZ.xml
// *
// ***************************************************************************
ar_DZ{
@@ -21,5 +21,5 @@
"�",
"+",
}
- Version{"1.27"}
+ Version{"1.28"}
}
diff --git a/icu4c/source/data/locales/ar_EG.txt b/icu4c/source/data/locales/ar_EG.txt
deleted file mode 100644
index 8f84cb6..0000000
--- a/icu4c/source/data/locales/ar_EG.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-// ***************************************************************************
-// *
-// * Copyright (C) 2005 International Business Machines
-// * Corporation and others. All Rights Reserved.
-// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ar_EG.xml
-// *
-// ***************************************************************************
-ar_EG{
- Version{"1.25"}
- calendar{
- gregorian{
- weekend:intvector{
- 6,
- 0,
- 7,
- 86400000,
- }
- }
- }
-}
diff --git a/icu4c/source/data/locales/ar_IN.txt b/icu4c/source/data/locales/ar_IN.txt
index 2bf62af..771dab2 100644
--- a/icu4c/source/data/locales/ar_IN.txt
+++ b/icu4c/source/data/locales/ar_IN.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ar_IN.xml
+// * Source File: ../../../cldr/common/main/ar_IN.xml
// *
// ***************************************************************************
ar_IN{
@@ -13,7 +13,7 @@
"#,##,##0%",
"#E0",
}
- Version{"1.33"}
+ Version{"1.35"}
calendar{
gregorian{
DateTimeElements:intvector{
diff --git a/icu4c/source/data/locales/ar_IQ.txt b/icu4c/source/data/locales/ar_IQ.txt
index 32d76d4..de90aa3 100644
--- a/icu4c/source/data/locales/ar_IQ.txt
+++ b/icu4c/source/data/locales/ar_IQ.txt
@@ -3,9 +3,9 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ar_IQ.xml
+// * Source File: ../../../cldr/common/main/ar_IQ.xml
// *
// ***************************************************************************
ar_IQ{
- Version{"1.25"}
+ Version{"1.26"}
}
diff --git a/icu4c/source/data/locales/ar_JO.txt b/icu4c/source/data/locales/ar_JO.txt
index 0d1501b..1628496 100644
--- a/icu4c/source/data/locales/ar_JO.txt
+++ b/icu4c/source/data/locales/ar_JO.txt
@@ -3,11 +3,11 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ar_JO.xml
+// * Source File: ../../../cldr/common/main/ar_JO.xml
// *
// ***************************************************************************
ar_JO{
- Version{"1.26"}
+ Version{"1.27"}
calendar{
gregorian{
dayNames{
diff --git a/icu4c/source/data/locales/ar_KW.txt b/icu4c/source/data/locales/ar_KW.txt
index 4855531..31d1d6d 100644
--- a/icu4c/source/data/locales/ar_KW.txt
+++ b/icu4c/source/data/locales/ar_KW.txt
@@ -3,9 +3,9 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ar_KW.xml
+// * Source File: ../../../cldr/common/main/ar_KW.xml
// *
// ***************************************************************************
ar_KW{
- Version{"1.27"}
+ Version{"1.28"}
}
diff --git a/icu4c/source/data/locales/ar_LB.txt b/icu4c/source/data/locales/ar_LB.txt
index 3bb30b3..86a53e4 100644
--- a/icu4c/source/data/locales/ar_LB.txt
+++ b/icu4c/source/data/locales/ar_LB.txt
@@ -3,11 +3,11 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ar_LB.xml
+// * Source File: ../../../cldr/common/main/ar_LB.xml
// *
// ***************************************************************************
ar_LB{
- Version{"1.23"}
+ Version{"1.25"}
calendar{
gregorian{
dayNames{
diff --git a/icu4c/source/data/locales/ar_LY.txt b/icu4c/source/data/locales/ar_LY.txt
index 2024a08..3cab4fe 100644
--- a/icu4c/source/data/locales/ar_LY.txt
+++ b/icu4c/source/data/locales/ar_LY.txt
@@ -3,9 +3,9 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ar_LY.xml
+// * Source File: ../../../cldr/common/main/ar_LY.xml
// *
// ***************************************************************************
ar_LY{
- Version{"1.25"}
+ Version{"1.26"}
}
diff --git a/icu4c/source/data/locales/ar_MA.txt b/icu4c/source/data/locales/ar_MA.txt
index 8aacdc3..a44caea 100644
--- a/icu4c/source/data/locales/ar_MA.txt
+++ b/icu4c/source/data/locales/ar_MA.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ar_MA.xml
+// * Source File: ../../../cldr/common/main/ar_MA.xml
// *
// ***************************************************************************
ar_MA{
@@ -21,5 +21,5 @@
"�",
"+",
}
- Version{"1.25"}
+ Version{"1.26"}
}
diff --git a/icu4c/source/data/locales/ar_OM.txt b/icu4c/source/data/locales/ar_OM.txt
index 11bcb0b..dccbb64 100644
--- a/icu4c/source/data/locales/ar_OM.txt
+++ b/icu4c/source/data/locales/ar_OM.txt
@@ -3,9 +3,9 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ar_OM.xml
+// * Source File: ../../../cldr/common/main/ar_OM.xml
// *
// ***************************************************************************
ar_OM{
- Version{"1.25"}
+ Version{"1.26"}
}
diff --git a/icu4c/source/data/locales/ar_QA.txt b/icu4c/source/data/locales/ar_QA.txt
index 7827749..0253e9a 100644
--- a/icu4c/source/data/locales/ar_QA.txt
+++ b/icu4c/source/data/locales/ar_QA.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ar_QA.xml
+// * Source File: ../../../cldr/common/main/ar_QA.xml
// *
// ***************************************************************************
ar_QA{
@@ -13,7 +13,7 @@
"#,##0%",
"#E0",
}
- Version{"1.26"}
+ Version{"1.27"}
calendar{
gregorian{
dayNames{
diff --git a/icu4c/source/data/locales/ar_SA.txt b/icu4c/source/data/locales/ar_SA.txt
index e47d76f..cf50349 100644
--- a/icu4c/source/data/locales/ar_SA.txt
+++ b/icu4c/source/data/locales/ar_SA.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ar_SA.xml
+// * Source File: ../../../cldr/common/main/ar_SA.xml
// *
// ***************************************************************************
ar_SA{
@@ -13,7 +13,7 @@
"#,##0%",
"#E0",
}
- Version{"1.26"}
+ Version{"1.28"}
calendar{
gregorian{
dayNames{
diff --git a/icu4c/source/data/locales/ar_SD.txt b/icu4c/source/data/locales/ar_SD.txt
index 89072f5..6b7d1b5 100644
--- a/icu4c/source/data/locales/ar_SD.txt
+++ b/icu4c/source/data/locales/ar_SD.txt
@@ -3,9 +3,9 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ar_SD.xml
+// * Source File: ../../../cldr/common/main/ar_SD.xml
// *
// ***************************************************************************
ar_SD{
- Version{"1.23"}
+ Version{"1.24"}
}
diff --git a/icu4c/source/data/locales/ar_SY.txt b/icu4c/source/data/locales/ar_SY.txt
index 636a51a..2a0bba0 100644
--- a/icu4c/source/data/locales/ar_SY.txt
+++ b/icu4c/source/data/locales/ar_SY.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ar_SY.xml
+// * Source File: ../../../cldr/common/main/ar_SY.xml
// *
// ***************************************************************************
ar_SY{
@@ -13,7 +13,7 @@
"#,##0%",
"#E0",
}
- Version{"1.27"}
+ Version{"1.28"}
calendar{
gregorian{
DateTimeElements:intvector{
diff --git a/icu4c/source/data/locales/ar_TN.txt b/icu4c/source/data/locales/ar_TN.txt
index 061c481..b99c13e 100644
--- a/icu4c/source/data/locales/ar_TN.txt
+++ b/icu4c/source/data/locales/ar_TN.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ar_TN.xml
+// * Source File: ../../../cldr/common/main/ar_TN.xml
// *
// ***************************************************************************
ar_TN{
@@ -27,7 +27,7 @@
"#,##0%",
"#E0",
}
- Version{"1.25"}
+ Version{"1.27"}
calendar{
gregorian{
dayNames{
diff --git a/icu4c/source/data/locales/ar_YE.txt b/icu4c/source/data/locales/ar_YE.txt
index 228d48f..3a0e46d 100644
--- a/icu4c/source/data/locales/ar_YE.txt
+++ b/icu4c/source/data/locales/ar_YE.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ar_YE.xml
+// * Source File: ../../../cldr/common/main/ar_YE.xml
// *
// ***************************************************************************
ar_YE{
@@ -13,7 +13,7 @@
"#,##0%",
"#E0",
}
- Version{"1.26"}
+ Version{"1.27"}
calendar{
gregorian{
dayNames{
diff --git a/icu4c/source/data/locales/be.txt b/icu4c/source/data/locales/be.txt
index 335d9e2..b16204d 100644
--- a/icu4c/source/data/locales/be.txt
+++ b/icu4c/source/data/locales/be.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/be.xml
+// * Source File: ../../../cldr/common/main/be.xml
// *
// ***************************************************************************
/**
@@ -60,7 +60,7 @@
"�",
"+",
}
- Version{"1.31"}
+ Version{"1.34"}
calendar{
gregorian{
DateTimeElements:intvector{
diff --git a/icu4c/source/data/locales/be_BY.txt b/icu4c/source/data/locales/be_BY.txt
index 76a2335..14fe701 100644
--- a/icu4c/source/data/locales/be_BY.txt
+++ b/icu4c/source/data/locales/be_BY.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/be_BY.xml
+// * Source File: ../../../cldr/common/main/be_BY.xml
// *
// ***************************************************************************
be_BY{
@@ -13,5 +13,5 @@
"#,##0%",
"#E0",
}
- Version{"1.25"}
+ Version{"1.26"}
}
diff --git a/icu4c/source/data/locales/bg.txt b/icu4c/source/data/locales/bg.txt
index 4f1c370..e75cbe2 100644
--- a/icu4c/source/data/locales/bg.txt
+++ b/icu4c/source/data/locales/bg.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/bg.xml
+// * Source File: ../../../cldr/common/main/bg.xml
// *
// ***************************************************************************
/**
@@ -1358,7 +1358,7 @@
traditional{"Традиционно"}
}
}
- Version{"1.41"}
+ Version{"1.48"}
calendar{
gregorian{
DateTimeElements:intvector{
@@ -1387,15 +1387,6 @@
"пет.",
"съб.",
}
- narrow{
- "н",
- "п",
- "в",
- "с",
- "ч",
- "п",
- "с",
- }
wide{
"неделя",
"понеделник",
@@ -1406,6 +1397,17 @@
"събота",
}
}
+ stand-alone{
+ narrow{
+ "н",
+ "п",
+ "в",
+ "с",
+ "ч",
+ "п",
+ "с",
+ }
+ }
}
eras{
abbreviated{
@@ -1429,20 +1431,6 @@
"ноем.",
"дек.",
}
- narrow{
- "я",
- "ф",
- "м",
- "а",
- "м",
- "ю",
- "ю",
- "а",
- "с",
- "о",
- "н",
- "д",
- }
wide{
"януари",
"февруари",
@@ -1458,20 +1446,28 @@
"декември",
}
}
+ stand-alone{
+ narrow{
+ "я",
+ "ф",
+ "м",
+ "а",
+ "м",
+ "ю",
+ "ю",
+ "а",
+ "с",
+ "о",
+ "н",
+ "д",
+ }
+ }
}
}
}
localPatternChars{"GanjkHmsSEDFwWxhKzAeugXZ"}
zoneStrings{
{
- "Etc/GMT",
- "Часова зона Гринуич",
- "GMT",
- "Часова зона Гринуич",
- "GMT",
- "Лондон",
- }
- {
"America/Halifax",
"Атлантическа часова зона",
"AST",
diff --git a/icu4c/source/data/locales/bg_BG.txt b/icu4c/source/data/locales/bg_BG.txt
index 94759ad..349475b 100644
--- a/icu4c/source/data/locales/bg_BG.txt
+++ b/icu4c/source/data/locales/bg_BG.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/bg_BG.xml
+// * Source File: ../../../cldr/common/main/bg_BG.xml
// *
// ***************************************************************************
bg_BG{
@@ -13,5 +13,5 @@
"#,##0%",
"#E0",
}
- Version{"1.25"}
+ Version{"1.27"}
}
diff --git a/icu4c/source/data/locales/bn.txt b/icu4c/source/data/locales/bn.txt
index cdfd03b..da31294 100644
--- a/icu4c/source/data/locales/bn.txt
+++ b/icu4c/source/data/locales/bn.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/bn.xml
+// * Source File: ../../../cldr/common/main/bn.xml
// *
// ***************************************************************************
/**
@@ -129,14 +129,14 @@
"INR",
}
}
- ExemplarCharacters{"[[:Beng:]]"}
+ ExemplarCharacters{"[ঁ-ঃঅ-ঌএঐও-নপ-রলশ-হ়-ৄেৈো-ৎৗড়ঢ়য়-ৣ০-৺]"}
Languages{
bn{"বাংলা"}
}
LocaleScript{
"Beng",
}
- Version{"1.29"}
+ Version{"1.32"}
calendar{
gregorian{
AmPmMarkers{
diff --git a/icu4c/source/data/locales/bn_IN.txt b/icu4c/source/data/locales/bn_IN.txt
index 32c54bd..427cf2b 100644
--- a/icu4c/source/data/locales/bn_IN.txt
+++ b/icu4c/source/data/locales/bn_IN.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/bn_IN.xml
+// * Source File: ../../../cldr/common/main/bn_IN.xml
// *
// ***************************************************************************
bn_IN{
@@ -13,7 +13,7 @@
"#,##,##0%",
"#E0",
}
- Version{"1.31"}
+ Version{"1.33"}
calendar{
gregorian{
DateTimeElements:intvector{
diff --git a/icu4c/source/data/locales/ca.txt b/icu4c/source/data/locales/ca.txt
index 26b07f5..182cfaf 100644
--- a/icu4c/source/data/locales/ca.txt
+++ b/icu4c/source/data/locales/ca.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ca.xml
+// * Source File: ../../../cldr/common/main/ca.xml
// *
// ***************************************************************************
/**
@@ -396,7 +396,7 @@
"�",
"+",
}
- Version{"1.40"}
+ Version{"1.45"}
calendar{
gregorian{
DateTimeElements:intvector{
diff --git a/icu4c/source/data/locales/ca_ES.txt b/icu4c/source/data/locales/ca_ES.txt
index 3546925..6490741 100644
--- a/icu4c/source/data/locales/ca_ES.txt
+++ b/icu4c/source/data/locales/ca_ES.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ca_ES.xml
+// * Source File: ../../../cldr/common/main/ca_ES.xml
// *
// ***************************************************************************
ca_ES{
@@ -13,5 +13,5 @@
"#,##0%",
"#E0",
}
- Version{"1.25"}
+ Version{"1.28"}
}
diff --git a/icu4c/source/data/locales/cs.txt b/icu4c/source/data/locales/cs.txt
index 193ae4a..1734f2d 100644
--- a/icu4c/source/data/locales/cs.txt
+++ b/icu4c/source/data/locales/cs.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/cs.xml
+// * Source File: ../../../cldr/common/main/cs.xml
// *
// ***************************************************************************
/**
@@ -1391,7 +1391,7 @@
japanese{"Japonský kalendář"}
}
}
- Version{"1.43"}
+ Version{"1.56"}
calendar{
gregorian{
AmPmMarkers{
@@ -1516,18 +1516,18 @@
"p",
}
wide{
- "Leden",
- "Únor",
- "Březen",
- "Duben",
- "Květen",
- "Červen",
- "Červenec",
- "Srpen",
- "Září",
- "Říjen",
- "Listopad",
- "Prosinec",
+ "leden",
+ "únor",
+ "březen",
+ "duben",
+ "květen",
+ "červen",
+ "červenec",
+ "srpen",
+ "září",
+ "říjen",
+ "listopad",
+ "prosinec",
}
}
}
@@ -1536,14 +1536,6 @@
localPatternChars{"GuMtkHmsSEDFwWahKzUeygAZ"}
zoneStrings{
{
- "Etc/GMT",
- "Greenwichský střední čas",
- "GMT",
- "Greenwichský střední čas",
- "GMT",
- "Londýn",
- }
- {
"America/Halifax",
"Atlantický standardní čas",
"AST",
diff --git a/icu4c/source/data/locales/cs_CZ.txt b/icu4c/source/data/locales/cs_CZ.txt
index 467845a..d05bd02 100644
--- a/icu4c/source/data/locales/cs_CZ.txt
+++ b/icu4c/source/data/locales/cs_CZ.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/cs_CZ.xml
+// * Source File: ../../../cldr/common/main/cs_CZ.xml
// *
// ***************************************************************************
cs_CZ{
@@ -13,5 +13,5 @@
"#,##0%",
"#E0",
}
- Version{"1.26"}
+ Version{"1.28"}
}
diff --git a/icu4c/source/data/locales/cy.txt b/icu4c/source/data/locales/cy.txt
index 63fe059..08bab04 100644
--- a/icu4c/source/data/locales/cy.txt
+++ b/icu4c/source/data/locales/cy.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/cy.xml
+// * Source File: ../../../cldr/common/main/cy.xml
// *
// ***************************************************************************
/**
@@ -68,7 +68,7 @@
Scripts{
Latn{"Lladin"}
}
- Version{"1.19"}
+ Version{"1.23"}
calendar{
gregorian{
dayNames{
@@ -82,15 +82,6 @@
"Gwen",
"Sad",
}
- narrow{
- "S",
- "L",
- "M",
- "M",
- "I",
- "G",
- "S",
- }
wide{
"Dydd Sul",
"Dydd Llun",
@@ -101,6 +92,17 @@
"Dydd Sadwrn",
}
}
+ stand-alone{
+ narrow{
+ "S",
+ "L",
+ "M",
+ "M",
+ "I",
+ "G",
+ "S",
+ }
+ }
}
monthNames{
format{
@@ -118,20 +120,6 @@
"Tach",
"Rhag",
}
- narrow{
- "I",
- "C",
- "M",
- "E",
- "M",
- "M",
- "G",
- "A",
- "M",
- "H",
- "T",
- "R",
- }
wide{
"Ionawr",
"Chwefror",
@@ -147,6 +135,22 @@
"Rhagfyr",
}
}
+ stand-alone{
+ narrow{
+ "I",
+ "C",
+ "M",
+ "E",
+ "M",
+ "M",
+ "G",
+ "A",
+ "M",
+ "H",
+ "T",
+ "R",
+ }
+ }
}
}
}
diff --git a/icu4c/source/data/locales/cy_GB.txt b/icu4c/source/data/locales/cy_GB.txt
index e3c2c8f..b20726c 100644
--- a/icu4c/source/data/locales/cy_GB.txt
+++ b/icu4c/source/data/locales/cy_GB.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/cy_GB.xml
+// * Source File: ../../../cldr/common/main/cy_GB.xml
// *
// ***************************************************************************
cy_GB{
@@ -13,7 +13,7 @@
"#,##0%",
"#E0",
}
- Version{"1.17"}
+ Version{"1.20"}
calendar{
gregorian{
DateTimeElements:intvector{
diff --git a/icu4c/source/data/locales/da.txt b/icu4c/source/data/locales/da.txt
index 2b89cd4..0bd6730 100644
--- a/icu4c/source/data/locales/da.txt
+++ b/icu4c/source/data/locales/da.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/da.xml
+// * Source File: ../../../cldr/common/main/da.xml
// *
// ***************************************************************************
/**
@@ -1338,7 +1338,6 @@
grc{"Græsk, Old- (til 1453)"}
gu{"Gujaratisk"}
gv{"Manx"}
- gwi{"Gwichʻin"}
ha{"Hausa"}
hai{"Haida"}
haw{"Hawaiiansk"}
@@ -1699,7 +1698,7 @@
traditional{"Traditionel sorteringsrækkefølge"}
}
}
- Version{"1.37"}
+ Version{"1.44"}
calendar{
gregorian{
DateTimeElements:intvector{
@@ -1717,15 +1716,6 @@
"fre",
"lør",
}
- narrow{
- "S",
- "M",
- "T",
- "O",
- "T",
- "F",
- "L",
- }
wide{
"søndag",
"mandag",
@@ -1736,6 +1726,17 @@
"lørdag",
}
}
+ stand-alone{
+ narrow{
+ "S",
+ "M",
+ "T",
+ "O",
+ "T",
+ "F",
+ "L",
+ }
+ }
}
eras{
abbreviated{
@@ -1759,20 +1760,6 @@
"nov",
"dec",
}
- narrow{
- "J",
- "F",
- "M",
- "A",
- "M",
- "J",
- "J",
- "A",
- "S",
- "O",
- "N",
- "D",
- }
wide{
"januar",
"februar",
@@ -1788,20 +1775,28 @@
"december",
}
}
+ stand-alone{
+ narrow{
+ "J",
+ "F",
+ "M",
+ "A",
+ "M",
+ "J",
+ "J",
+ "A",
+ "S",
+ "O",
+ "N",
+ "D",
+ }
+ }
}
}
}
localPatternChars{"GuMtkHmsSEDFwWahKzUeygAZ"}
zoneStrings{
{
- "Etc/GMT",
- "Verdenstid",
- "GMT",
- "Verdenstid",
- "GMT",
- "London",
- }
- {
"America/Halifax",
"Atlantic-normaltid",
"AST",
diff --git a/icu4c/source/data/locales/da_DK.txt b/icu4c/source/data/locales/da_DK.txt
index 7424aad..1da2376 100644
--- a/icu4c/source/data/locales/da_DK.txt
+++ b/icu4c/source/data/locales/da_DK.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/da_DK.xml
+// * Source File: ../../../cldr/common/main/da_DK.xml
// *
// ***************************************************************************
da_DK{
@@ -13,5 +13,5 @@
"#,##0%",
"#E0",
}
- Version{"1.24"}
+ Version{"1.27"}
}
diff --git a/icu4c/source/data/locales/de.txt b/icu4c/source/data/locales/de.txt
index 2b61a98..f6f94f3 100644
--- a/icu4c/source/data/locales/de.txt
+++ b/icu4c/source/data/locales/de.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/de.xml
+// * Source File: ../../../cldr/common/main/de.xml
// *
// ***************************************************************************
/**
@@ -1477,7 +1477,7 @@
POSIX{"Posix"}
REVISED{"Revidiert"}
}
- Version{"1.43"}
+ Version{"1.50"}
calendar{
gregorian{
AmPmMarkers{
@@ -1510,15 +1510,6 @@
"Fr",
"Sa",
}
- narrow{
- "S",
- "M",
- "D",
- "M",
- "D",
- "F",
- "S",
- }
wide{
"Sonntag",
"Montag",
@@ -1529,6 +1520,17 @@
"Samstag",
}
}
+ stand-alone{
+ narrow{
+ "S",
+ "M",
+ "D",
+ "M",
+ "D",
+ "F",
+ "S",
+ }
+ }
}
eras{
abbreviated{
@@ -1552,20 +1554,6 @@
"Nov",
"Dez",
}
- narrow{
- "J",
- "F",
- "M",
- "A",
- "M",
- "J",
- "J",
- "A",
- "S",
- "O",
- "N",
- "D",
- }
wide{
"Januar",
"Februar",
@@ -1581,6 +1569,22 @@
"Dezember",
}
}
+ stand-alone{
+ narrow{
+ "J",
+ "F",
+ "M",
+ "A",
+ "M",
+ "J",
+ "J",
+ "A",
+ "S",
+ "O",
+ "N",
+ "D",
+ }
+ }
}
}
}
diff --git a/icu4c/source/data/locales/de_AT.txt b/icu4c/source/data/locales/de_AT.txt
index c65dd74..0ebb27f 100644
--- a/icu4c/source/data/locales/de_AT.txt
+++ b/icu4c/source/data/locales/de_AT.txt
@@ -3,11 +3,11 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/de_AT.xml
+// * Source File: ../../../cldr/common/main/de_AT.xml
// *
// ***************************************************************************
de_AT{
- Version{"1.25"}
+ Version{"1.28"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/de_BE.txt b/icu4c/source/data/locales/de_BE.txt
index b896b03..7f5e8cd 100644
--- a/icu4c/source/data/locales/de_BE.txt
+++ b/icu4c/source/data/locales/de_BE.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/de_BE.xml
+// * Source File: ../../../cldr/common/main/de_BE.xml
// *
// ***************************************************************************
de_BE{
@@ -19,7 +19,7 @@
"#,##0%",
"#E0",
}
- Version{"1.29"}
+ Version{"1.30"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/de_CH.txt b/icu4c/source/data/locales/de_CH.txt
index 3fbfd34..9701a2d 100644
--- a/icu4c/source/data/locales/de_CH.txt
+++ b/icu4c/source/data/locales/de_CH.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/de_CH.xml
+// * Source File: ../../../cldr/common/main/de_CH.xml
// *
// ***************************************************************************
de_CH{
@@ -40,5 +40,5 @@
"#,##0%",
"#E0",
}
- Version{"1.29"}
+ Version{"1.31"}
}
diff --git a/icu4c/source/data/locales/de_DE.txt b/icu4c/source/data/locales/de_DE.txt
index b75253f..b35ce54 100644
--- a/icu4c/source/data/locales/de_DE.txt
+++ b/icu4c/source/data/locales/de_DE.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/de_DE.xml
+// * Source File: ../../../cldr/common/main/de_DE.xml
// *
// ***************************************************************************
de_DE{
@@ -13,5 +13,5 @@
"#,##0%",
"#E0",
}
- Version{"1.26"}
+ Version{"1.28"}
}
diff --git a/icu4c/source/data/locales/de_LU.txt b/icu4c/source/data/locales/de_LU.txt
index 1710afd..315bb49 100644
--- a/icu4c/source/data/locales/de_LU.txt
+++ b/icu4c/source/data/locales/de_LU.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/de_LU.xml
+// * Source File: ../../../cldr/common/main/de_LU.xml
// *
// ***************************************************************************
de_LU{
@@ -24,5 +24,5 @@
"#,##0%",
"#E0",
}
- Version{"1.26"}
+ Version{"1.28"}
}
diff --git a/icu4c/source/data/locales/el.txt b/icu4c/source/data/locales/el.txt
index 89efd8d..9b3ee85 100644
--- a/icu4c/source/data/locales/el.txt
+++ b/icu4c/source/data/locales/el.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/el.xml
+// * Source File: ../../../cldr/common/main/el.xml
// *
// ***************************************************************************
/**
@@ -1320,7 +1320,7 @@
traditional{"Παραδοσιακή"}
}
}
- Version{"1.44"}
+ Version{"1.49"}
calendar{
gregorian{
AmPmMarkers{
@@ -1353,15 +1353,6 @@
"Παρ",
"Σαβ",
}
- narrow{
- "Κ",
- "Δ",
- "Τ",
- "Τ",
- "Π",
- "Π",
- "Σ",
- }
wide{
"Κυριακή",
"Δευτέρα",
@@ -1372,6 +1363,17 @@
"Σάββατο",
}
}
+ stand-alone{
+ narrow{
+ "Κ",
+ "Δ",
+ "Τ",
+ "Τ",
+ "Π",
+ "Π",
+ "Σ",
+ }
+ }
}
eras{
abbreviated{
diff --git a/icu4c/source/data/locales/el_GR.txt b/icu4c/source/data/locales/el_GR.txt
index 5e1c1b3..a4211ad 100644
--- a/icu4c/source/data/locales/el_GR.txt
+++ b/icu4c/source/data/locales/el_GR.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/el_GR.xml
+// * Source File: ../../../cldr/common/main/el_GR.xml
// *
// ***************************************************************************
el_GR{
@@ -24,5 +24,5 @@
"#,##0%",
"#E0",
}
- Version{"1.27"}
+ Version{"1.30"}
}
diff --git a/icu4c/source/data/locales/en.txt b/icu4c/source/data/locales/en.txt
index cd1609b..55b43c8 100644
--- a/icu4c/source/data/locales/en.txt
+++ b/icu4c/source/data/locales/en.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/en.xml
+// * Source File: ../../../cldr/common/main/en.xml
// *
// ***************************************************************************
/**
@@ -451,6 +451,10 @@
"SwF",
"Swiss Franc",
}
+ CHW{
+ "CHW",
+ "WIR Franc",
+ }
CLF{
"CLF",
"Chilean Unidades de Fomento",
@@ -1388,11 +1392,10 @@
gon{"Gondi"}
gor{"Gorontalo"}
got{"Gothic"}
- grb{"Gerbo"}
+ grb{"Grebo"}
grc{"Greek, Ancient (to 1453)"}
gu{"Gujarati"}
gv{"Manx"}
- gwi{"Gwichʻin"}
ha{"Hausa"}
hai{"Haida"}
haw{"Hawaiian"}
@@ -1520,6 +1523,7 @@
mul{"Multiple Languages"}
mun{"Munda Languages"}
mus{"Creek"}
+ mwl{"Mirandese"}
mwr{"Marwari"}
my{"Burmese"}
myn{"Mayan"}
@@ -1598,6 +1602,7 @@
sas{"Sasak"}
sat{"Santali"}
sc{"Sardinian"}
+ scn{"Sicilian"}
sco{"Scots"}
sd{"Sindhi"}
se{"Northern Sami"}
@@ -1628,9 +1633,10 @@
son{"Songhai"}
sq{"Albanian"}
sr{"Serbian"}
+ srn{"Sranan Tongo"}
srr{"Serer"}
ss{"Swati"}
- ssa{"Nilo-Saharam (Other)"}
+ ssa{"Nilo-Saharan (Other)"}
st{"Sotho, Southern"}
su{"Sundanese"}
suk{"Sukuma"}
@@ -1730,6 +1736,7 @@
Deva{"Devanagari"}
Dsrt{"Deseret"}
Ethi{"Ethiopic"}
+ Geok{"Khutsuri (Asomtavruli and Nuskhuri)"}
Geor{"Georgian"}
Goth{"Gothic"}
Grek{"Greek"}
@@ -1754,6 +1761,7 @@
Mlym{"Malayalam"}
Mong{"Mongolian"}
Mymr{"Myanmar"}
+ Nkoo{"N’Ko"}
Ogam{"Ogham"}
Orya{"Oriya"}
Osma{"Osmanya"}
@@ -1795,7 +1803,7 @@
POSIX{"Computer"}
REVISED{"Revised Orthography"}
}
- Version{"1.52"}
+ Version{"1.67"}
calendar{
gregorian{
DateTimePatterns{
@@ -1820,15 +1828,6 @@
"Fri",
"Sat",
}
- narrow{
- "S",
- "M",
- "T",
- "W",
- "T",
- "F",
- "S",
- }
wide{
"Sunday",
"Monday",
@@ -1839,6 +1838,17 @@
"Saturday",
}
}
+ stand-alone{
+ narrow{
+ "S",
+ "M",
+ "T",
+ "W",
+ "T",
+ "F",
+ "S",
+ }
+ }
}
eras{
abbreviated{
@@ -1862,20 +1872,6 @@
"Nov",
"Dec",
}
- narrow{
- "J",
- "F",
- "M",
- "A",
- "M",
- "J",
- "J",
- "A",
- "S",
- "O",
- "N",
- "D",
- }
wide{
"January",
"February",
@@ -1891,25 +1887,35 @@
"December",
}
}
+ stand-alone{
+ narrow{
+ "J",
+ "F",
+ "M",
+ "A",
+ "M",
+ "J",
+ "J",
+ "A",
+ "S",
+ "O",
+ "N",
+ "D",
+ }
+ }
}
}
}
zoneStrings{
{
- "Etc/GMT",
- "Greenwich Mean Time",
- "GMT",
- "Greenwich Mean Time",
- "GMT",
- "(GMT)",
- }
- {
"America/Vancouver",
"Pacific Standard Time (CA)",
"PST (CA)",
"Pacific Daylight Time (CA)",
"PDT (CA)",
"Vancouver",
+ "Pacific Time (CA)",
+ "PT (CA)",
}
{
"America/Edmonton",
@@ -1918,6 +1924,8 @@
"Mountain Daylight Time (CA)",
"MDT (CA)",
"Edmonton",
+ "Mountain Time (CA)",
+ "MT (CA)",
}
{
"America/Winnipeg",
@@ -1926,6 +1934,8 @@
"Central Daylight Time (CA)",
"CDT (CA)",
"Winnipeg",
+ "Central Time (CA)",
+ "CT (CA)",
}
{
"America/Montreal",
@@ -1934,6 +1944,8 @@
"Eastern Daylight Time (CA)",
"EDT (CA)",
"Montreal",
+ "Eastern Time (CA)",
+ "ET (CA)",
}
{
"America/Halifax",
@@ -1942,6 +1954,8 @@
"Atlantic Daylight Time",
"ADT",
"Halifax",
+ "Atlantic Time",
+ "AT",
}
{
"America/St_Johns",
@@ -1950,6 +1964,8 @@
"Newfoundland Daylight Time",
"NDT",
"St. John’s",
+ "Newfoundland Time",
+ "NT",
}
{
"Asia/Shanghai",
@@ -1966,6 +1982,8 @@
"Central European Daylight Time",
"CEDT",
"Paris",
+ "Central European Time",
+ "CET",
}
{
"Europe/London",
@@ -1974,6 +1992,8 @@
"British Daylight Time",
"BDT",
"London",
+ "British Time",
+ "BT",
}
{
"Asia/Jerusalem",
@@ -2006,6 +2026,8 @@
"Hawaii Daylight Time",
"HDT",
"Honolulu",
+ "Hawaii Time",
+ "HT",
}
{
"America/Anchorage",
@@ -2014,6 +2036,8 @@
"Alaska Daylight Time",
"AKDT",
"Anchorage",
+ "Alaska Time",
+ "AKT",
}
{
"America/Los_Angeles",
@@ -2022,6 +2046,8 @@
"Pacific Daylight Time",
"PDT",
"Los Angeles",
+ "Pacific Time",
+ "PT",
}
{
"America/Phoenix",
@@ -2030,6 +2056,8 @@
"Mountain Daylight Time",
"MDT",
"Phoenix",
+ "Mountain Time",
+ "MT",
}
{
"America/Denver",
@@ -2038,6 +2066,8 @@
"Mountain Daylight Time",
"MDT",
"Denver",
+ "Mountain Time",
+ "MT",
}
{
"America/Chicago",
@@ -2046,6 +2076,8 @@
"Central Daylight Time",
"CDT",
"Chicago",
+ "Central Time",
+ "CT",
}
{
"America/Indianapolis",
@@ -2054,6 +2086,8 @@
"Eastern Daylight Time",
"EDT",
"Indianapolis",
+ "Eastern Time",
+ "ET",
}
{
"America/New_York",
@@ -2062,6 +2096,8 @@
"Eastern Daylight Time",
"EDT",
"New York",
+ "Eastern Time",
+ "ET",
}
}
}
diff --git a/icu4c/source/data/locales/en_AU.txt b/icu4c/source/data/locales/en_AU.txt
index 1164dcf..a79dc02 100644
--- a/icu4c/source/data/locales/en_AU.txt
+++ b/icu4c/source/data/locales/en_AU.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/en_AU.xml
+// * Source File: ../../../cldr/common/main/en_AU.xml
// *
// ***************************************************************************
en_AU{
@@ -13,7 +13,7 @@
"Australian Dollar",
}
}
- Version{"1.23"}
+ Version{"1.25"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/en_BE.txt b/icu4c/source/data/locales/en_BE.txt
index ce7f343..8bb2f96 100644
--- a/icu4c/source/data/locales/en_BE.txt
+++ b/icu4c/source/data/locales/en_BE.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/en_BE.xml
+// * Source File: ../../../cldr/common/main/en_BE.xml
// *
// ***************************************************************************
en_BE{
@@ -38,7 +38,7 @@
"#,##0%",
"#E0",
}
- Version{"1.31"}
+ Version{"1.32"}
calendar{
gregorian{
DateTimeElements:intvector{
diff --git a/icu4c/source/data/locales/en_BW.txt b/icu4c/source/data/locales/en_BW.txt
index b3fc9a3..1e15365 100644
--- a/icu4c/source/data/locales/en_BW.txt
+++ b/icu4c/source/data/locales/en_BW.txt
@@ -3,11 +3,11 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/en_BW.xml
+// * Source File: ../../../cldr/common/main/en_BW.xml
// *
// ***************************************************************************
en_BW{
- Version{"1.23"}
+ Version{"1.24"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/en_CA.txt b/icu4c/source/data/locales/en_CA.txt
index e7660c9..86deef9 100644
--- a/icu4c/source/data/locales/en_CA.txt
+++ b/icu4c/source/data/locales/en_CA.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/en_CA.xml
+// * Source File: ../../../cldr/common/main/en_CA.xml
// *
// ***************************************************************************
en_CA{
@@ -19,7 +19,7 @@
"#,##0%",
"#E0",
}
- Version{"1.29"}
+ Version{"1.31"}
calendar{
gregorian{
DateTimeElements:intvector{
diff --git a/icu4c/source/data/locales/en_GB.txt b/icu4c/source/data/locales/en_GB.txt
index 191fc96..c9ef0fe 100644
--- a/icu4c/source/data/locales/en_GB.txt
+++ b/icu4c/source/data/locales/en_GB.txt
@@ -3,11 +3,11 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/en_GB.xml
+// * Source File: ../../../cldr/common/main/en_GB.xml
// *
// ***************************************************************************
en_GB{
- Version{"1.27"}
+ Version{"1.30"}
calendar{
gregorian{
DateTimeElements:intvector{
@@ -27,14 +27,4 @@
}
}
}
- zoneStrings{
- {
- "Europe/London",
- "Greenwich Mean Time",
- "GMT",
- "British Daylight Time",
- "BDT",
- "London",
- }
- }
}
diff --git a/icu4c/source/data/locales/en_HK.txt b/icu4c/source/data/locales/en_HK.txt
index aa26767..6db7cad 100644
--- a/icu4c/source/data/locales/en_HK.txt
+++ b/icu4c/source/data/locales/en_HK.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/en_HK.xml
+// * Source File: ../../../cldr/common/main/en_HK.xml
// *
// ***************************************************************************
en_HK{
@@ -23,7 +23,7 @@
"#,##0%",
"#E0",
}
- Version{"1.25"}
+ Version{"1.26"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/en_IE.txt b/icu4c/source/data/locales/en_IE.txt
index 3f98f25..e5ee3b8 100644
--- a/icu4c/source/data/locales/en_IE.txt
+++ b/icu4c/source/data/locales/en_IE.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/en_IE.xml
+// * Source File: ../../../cldr/common/main/en_IE.xml
// *
// ***************************************************************************
en_IE{
@@ -13,7 +13,7 @@
"Irish Pound",
}
}
- Version{"1.27"}
+ Version{"1.29"}
calendar{
gregorian{
AmPmMarkers{
@@ -33,14 +33,4 @@
}
}
}
- zoneStrings{
- {
- "Europe/Dublin",
- "Greenwich Mean Time",
- "GMT",
- "Irish Summer Time",
- "IST",
- "Dublin",
- }
- }
}
diff --git a/icu4c/source/data/locales/en_IN.txt b/icu4c/source/data/locales/en_IN.txt
index c189a8b..91e10ed 100644
--- a/icu4c/source/data/locales/en_IN.txt
+++ b/icu4c/source/data/locales/en_IN.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/en_IN.xml
+// * Source File: ../../../cldr/common/main/en_IN.xml
// *
// ***************************************************************************
en_IN{
@@ -13,7 +13,7 @@
"#,##,##0%",
"#E0",
}
- Version{"1.29"}
+ Version{"1.31"}
calendar{
gregorian{
DateTimeElements:intvector{
diff --git a/icu4c/source/data/locales/en_MT.txt b/icu4c/source/data/locales/en_MT.txt
index 2570e7c..9cf627b 100644
--- a/icu4c/source/data/locales/en_MT.txt
+++ b/icu4c/source/data/locales/en_MT.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/en_MT.xml
+// * Source File: ../../../cldr/common/main/en_MT.xml
// *
// ***************************************************************************
en_MT{
@@ -13,7 +13,7 @@
"British Pound Sterling",
}
}
- Version{"1.29"}
+ Version{"1.30"}
calendar{
gregorian{
DateTimeElements:intvector{
diff --git a/icu4c/source/data/locales/en_NZ.txt b/icu4c/source/data/locales/en_NZ.txt
index b782391..c86e162 100644
--- a/icu4c/source/data/locales/en_NZ.txt
+++ b/icu4c/source/data/locales/en_NZ.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/en_NZ.xml
+// * Source File: ../../../cldr/common/main/en_NZ.xml
// *
// ***************************************************************************
en_NZ{
@@ -13,7 +13,7 @@
"New Zealand Dollar",
}
}
- Version{"1.26"}
+ Version{"1.28"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/en_PH.txt b/icu4c/source/data/locales/en_PH.txt
index adb9a9f..836f318 100644
--- a/icu4c/source/data/locales/en_PH.txt
+++ b/icu4c/source/data/locales/en_PH.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/en_PH.xml
+// * Source File: ../../../cldr/common/main/en_PH.xml
// *
// ***************************************************************************
en_PH{
@@ -19,7 +19,7 @@
"#,##0%",
"#E0",
}
- Version{"1.23"}
+ Version{"1.25"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/en_PK.txt b/icu4c/source/data/locales/en_PK.txt
index 9a97ded..01f2f25 100644
--- a/icu4c/source/data/locales/en_PK.txt
+++ b/icu4c/source/data/locales/en_PK.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/en_PK.xml
+// * Source File: ../../../cldr/common/main/en_PK.xml
// *
// ***************************************************************************
en_PK{
@@ -13,10 +13,7 @@
"#,##,##0%",
"#E0",
}
- /**
- * Draft
- */
- Version{"1.7"}
+ Version{"1.9"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/en_SG.txt b/icu4c/source/data/locales/en_SG.txt
index 4d137ee..a46ad65 100644
--- a/icu4c/source/data/locales/en_SG.txt
+++ b/icu4c/source/data/locales/en_SG.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/en_SG.xml
+// * Source File: ../../../cldr/common/main/en_SG.xml
// *
// ***************************************************************************
en_SG{
@@ -17,7 +17,7 @@
"USD",
}
}
- Version{"1.30"}
+ Version{"1.31"}
calendar{
gregorian{
DateTimePatterns{
@@ -33,14 +33,4 @@
}
}
}
- zoneStrings{
- {
- "Asia/Singapore",
- "Singapore Standard Time",
- "SST",
- "Singapore Standard Time",
- "SST",
- "Singapore",
- }
- }
}
diff --git a/icu4c/source/data/locales/en_US.txt b/icu4c/source/data/locales/en_US.txt
index 98eb11c..5bef85d 100644
--- a/icu4c/source/data/locales/en_US.txt
+++ b/icu4c/source/data/locales/en_US.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/en_US.xml
+// * Source File: ../../../cldr/common/main/en_US.xml
// *
// ***************************************************************************
en_US{
@@ -24,5 +24,5 @@
279,
216,
}
- Version{"1.29"}
+ Version{"1.31"}
}
diff --git a/icu4c/source/data/locales/en_US_POSIX.txt b/icu4c/source/data/locales/en_US_POSIX.txt
index eb20a61..dbdd749 100644
--- a/icu4c/source/data/locales/en_US_POSIX.txt
+++ b/icu4c/source/data/locales/en_US_POSIX.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/en_US_POSIX.xml
+// * Source File: ../../../cldr/common/main/en_US_POSIX.xml
// *
// ***************************************************************************
/**
@@ -30,7 +30,7 @@
"#0%",
"0.000000E+000",
}
- Version{"1.31"}
+ Version{"1.32"}
boundaries{
word{"word_POSIX"}
}
diff --git a/icu4c/source/data/locales/en_VI.txt b/icu4c/source/data/locales/en_VI.txt
index 035860c..dad33d2 100644
--- a/icu4c/source/data/locales/en_VI.txt
+++ b/icu4c/source/data/locales/en_VI.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/en_VI.xml
+// * Source File: ../../../cldr/common/main/en_VI.xml
// *
// ***************************************************************************
en_VI{
@@ -13,5 +13,5 @@
"#,##0%",
"#E0",
}
- Version{"1.24"}
+ Version{"1.25"}
}
diff --git a/icu4c/source/data/locales/en_ZA.txt b/icu4c/source/data/locales/en_ZA.txt
index ee45859..b82db9b 100644
--- a/icu4c/source/data/locales/en_ZA.txt
+++ b/icu4c/source/data/locales/en_ZA.txt
@@ -3,11 +3,11 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/en_ZA.xml
+// * Source File: ../../../cldr/common/main/en_ZA.xml
// *
// ***************************************************************************
en_ZA{
- Version{"1.23"}
+ Version{"1.25"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/en_ZW.txt b/icu4c/source/data/locales/en_ZW.txt
index 032bee7..9b7841f 100644
--- a/icu4c/source/data/locales/en_ZW.txt
+++ b/icu4c/source/data/locales/en_ZW.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/en_ZW.xml
+// * Source File: ../../../cldr/common/main/en_ZW.xml
// *
// ***************************************************************************
en_ZW{
@@ -13,7 +13,7 @@
"Zimbabwean Dollar",
}
}
- Version{"1.23"}
+ Version{"1.25"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/eo.txt b/icu4c/source/data/locales/eo.txt
index 3c4d0ce..5f8fc30 100644
--- a/icu4c/source/data/locales/eo.txt
+++ b/icu4c/source/data/locales/eo.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/eo.xml
+// * Source File: ../../../cldr/common/main/eo.xml
// *
// ***************************************************************************
/**
@@ -394,7 +394,7 @@
"�",
"+",
}
- Version{"1.33"}
+ Version{"1.35"}
calendar{
gregorian{
AmPmMarkers{
diff --git a/icu4c/source/data/locales/es.txt b/icu4c/source/data/locales/es.txt
index 8fd6ba4..c0b46e3 100644
--- a/icu4c/source/data/locales/es.txt
+++ b/icu4c/source/data/locales/es.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/es.xml
+// * Source File: ../../../cldr/common/main/es.xml
// *
// ***************************************************************************
/**
@@ -1434,6 +1434,20 @@
LocaleScript{
"Latn",
}
+ NumberElements{
+ ",",
+ ".",
+ ";",
+ "%",
+ "0",
+ "#",
+ "-",
+ "E",
+ "‰",
+ "∞",
+ "�",
+ "+",
+ }
NumberPatterns{
"#,##0.###",
"¤#,##0.00;(¤#,##0.00)",
@@ -1518,7 +1532,7 @@
Variants{
REVISED{"Revisado"}
}
- Version{"1.39"}
+ Version{"1.49"}
calendar{
gregorian{
DateTimeElements:intvector{
@@ -1547,15 +1561,6 @@
"vie",
"sáb",
}
- narrow{
- "D",
- "L",
- "M",
- "M",
- "J",
- "V",
- "S",
- }
wide{
"domingo",
"lunes",
@@ -1566,6 +1571,17 @@
"sábado",
}
}
+ stand-alone{
+ narrow{
+ "D",
+ "L",
+ "M",
+ "M",
+ "J",
+ "V",
+ "S",
+ }
+ }
}
eras{
abbreviated{
@@ -1589,20 +1605,6 @@
"nov",
"dic",
}
- narrow{
- "E",
- "F",
- "M",
- "A",
- "M",
- "J",
- "J",
- "A",
- "S",
- "O",
- "N",
- "D",
- }
wide{
"enero",
"febrero",
@@ -1618,20 +1620,28 @@
"diciembre",
}
}
+ stand-alone{
+ narrow{
+ "E",
+ "F",
+ "M",
+ "A",
+ "M",
+ "J",
+ "J",
+ "A",
+ "S",
+ "O",
+ "N",
+ "D",
+ }
+ }
}
}
}
localPatternChars{"GuMtkHmsSEDFwWahKzUeygAZ"}
zoneStrings{
{
- "Etc/GMT",
- "Hora media de Greenwich",
- "GMT",
- "Hora media de Greenwich",
- "GMT",
- "Londres",
- }
- {
"America/Halifax",
"Hora estándar del Atlántico",
"AST",
diff --git a/icu4c/source/data/locales/es_AR.txt b/icu4c/source/data/locales/es_AR.txt
index b7c7c3e..24619c9 100644
--- a/icu4c/source/data/locales/es_AR.txt
+++ b/icu4c/source/data/locales/es_AR.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/es_AR.xml
+// * Source File: ../../../cldr/common/main/es_AR.xml
// *
// ***************************************************************************
es_AR{
@@ -17,21 +17,7 @@
"Dólar Americano",
}
}
- NumberElements{
- ",",
- ".",
- ";",
- "%",
- "0",
- "#",
- "-",
- "E",
- "‰",
- "∞",
- "�",
- "+",
- }
- Version{"1.24"}
+ Version{"1.27"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/es_BO.txt b/icu4c/source/data/locales/es_BO.txt
index 4336ebc..6404c02 100644
--- a/icu4c/source/data/locales/es_BO.txt
+++ b/icu4c/source/data/locales/es_BO.txt
@@ -3,25 +3,11 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/es_BO.xml
+// * Source File: ../../../cldr/common/main/es_BO.xml
// *
// ***************************************************************************
es_BO{
- NumberElements{
- ",",
- ".",
- ";",
- "%",
- "0",
- "#",
- "-",
- "E",
- "‰",
- "∞",
- "�",
- "+",
- }
- Version{"1.24"}
+ Version{"1.27"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/es_CL.txt b/icu4c/source/data/locales/es_CL.txt
index e531c7d..eee6344 100644
--- a/icu4c/source/data/locales/es_CL.txt
+++ b/icu4c/source/data/locales/es_CL.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/es_CL.xml
+// * Source File: ../../../cldr/common/main/es_CL.xml
// *
// ***************************************************************************
es_CL{
@@ -17,27 +17,13 @@
"Dólar Americano",
}
}
- NumberElements{
- ",",
- ".",
- ";",
- "%",
- "0",
- "#",
- "-",
- "E",
- "‰",
- "∞",
- "�",
- "+",
- }
NumberPatterns{
"#,##0.###",
"¤#,##0.00;¤-#,##0.00",
"#,##0%",
"#E0",
}
- Version{"1.25"}
+ Version{"1.28"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/es_CO.txt b/icu4c/source/data/locales/es_CO.txt
index a0ceb02..4437eec 100644
--- a/icu4c/source/data/locales/es_CO.txt
+++ b/icu4c/source/data/locales/es_CO.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/es_CO.xml
+// * Source File: ../../../cldr/common/main/es_CO.xml
// *
// ***************************************************************************
es_CO{
@@ -17,21 +17,7 @@
"Dólar Americano",
}
}
- NumberElements{
- ",",
- ".",
- ";",
- "%",
- "0",
- "#",
- "-",
- "E",
- "‰",
- "∞",
- "�",
- "+",
- }
- Version{"1.25"}
+ Version{"1.28"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/es_CR.txt b/icu4c/source/data/locales/es_CR.txt
index 1b6f486..358b966 100644
--- a/icu4c/source/data/locales/es_CR.txt
+++ b/icu4c/source/data/locales/es_CR.txt
@@ -3,25 +3,11 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/es_CR.xml
+// * Source File: ../../../cldr/common/main/es_CR.xml
// *
// ***************************************************************************
es_CR{
- NumberElements{
- ",",
- ".",
- ";",
- "%",
- "0",
- "#",
- "-",
- "E",
- "‰",
- "∞",
- "�",
- "+",
- }
- Version{"1.24"}
+ Version{"1.27"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/es_DO.txt b/icu4c/source/data/locales/es_DO.txt
index bd2b1a3..d707db2 100644
--- a/icu4c/source/data/locales/es_DO.txt
+++ b/icu4c/source/data/locales/es_DO.txt
@@ -3,11 +3,11 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/es_DO.xml
+// * Source File: ../../../cldr/common/main/es_DO.xml
// *
// ***************************************************************************
es_DO{
- Version{"1.24"}
+ Version{"1.27"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/es_EC.txt b/icu4c/source/data/locales/es_EC.txt
index acd420e..7c57bbf 100644
--- a/icu4c/source/data/locales/es_EC.txt
+++ b/icu4c/source/data/locales/es_EC.txt
@@ -3,23 +3,15 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/es_EC.xml
+// * Source File: ../../../cldr/common/main/es_EC.xml
// *
// ***************************************************************************
es_EC{
- NumberElements{
- ",",
- ".",
- ";",
- "%",
- "0",
- "#",
- "-",
- "E",
- "‰",
- "∞",
- "�",
- "+",
+ Currencies{
+ USD{
+ "$",
+ "dólar estadounidense",
+ }
}
NumberPatterns{
"#,##0.###",
@@ -27,7 +19,7 @@
"#,##0%",
"#E0",
}
- Version{"1.25"}
+ Version{"1.29"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/es_ES.txt b/icu4c/source/data/locales/es_ES.txt
index 03cc464..7796c7e 100644
--- a/icu4c/source/data/locales/es_ES.txt
+++ b/icu4c/source/data/locales/es_ES.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/es_ES.xml
+// * Source File: ../../../cldr/common/main/es_ES.xml
// *
// ***************************************************************************
es_ES{
@@ -18,27 +18,13 @@
}
}
}
- NumberElements{
- ",",
- ".",
- ";",
- "%",
- "0",
- "#",
- "-",
- "E",
- "‰",
- "∞",
- "�",
- "+",
- }
NumberPatterns{
"#,##0.###",
"#,##0.00 ¤",
"#,##0%",
"#E0",
}
- Version{"1.25"}
+ Version{"1.28"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/es_GT.txt b/icu4c/source/data/locales/es_GT.txt
index 022be2d..9ce386f 100644
--- a/icu4c/source/data/locales/es_GT.txt
+++ b/icu4c/source/data/locales/es_GT.txt
@@ -3,11 +3,11 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/es_GT.xml
+// * Source File: ../../../cldr/common/main/es_GT.xml
// *
// ***************************************************************************
es_GT{
- Version{"1.24"}
+ Version{"1.27"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/es_HN.txt b/icu4c/source/data/locales/es_HN.txt
index 1a2fa88..7390f7b 100644
--- a/icu4c/source/data/locales/es_HN.txt
+++ b/icu4c/source/data/locales/es_HN.txt
@@ -3,11 +3,11 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/es_HN.xml
+// * Source File: ../../../cldr/common/main/es_HN.xml
// *
// ***************************************************************************
es_HN{
- Version{"1.24"}
+ Version{"1.27"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/es_MX.txt b/icu4c/source/data/locales/es_MX.txt
index d302627..8151539 100644
--- a/icu4c/source/data/locales/es_MX.txt
+++ b/icu4c/source/data/locales/es_MX.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/es_MX.xml
+// * Source File: ../../../cldr/common/main/es_MX.xml
// *
// ***************************************************************************
es_MX{
@@ -17,7 +17,7 @@
"Dólar Americano",
}
}
- Version{"1.24"}
+ Version{"1.27"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/es_NI.txt b/icu4c/source/data/locales/es_NI.txt
index 643ea88..ece9ece 100644
--- a/icu4c/source/data/locales/es_NI.txt
+++ b/icu4c/source/data/locales/es_NI.txt
@@ -3,11 +3,11 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/es_NI.xml
+// * Source File: ../../../cldr/common/main/es_NI.xml
// *
// ***************************************************************************
es_NI{
- Version{"1.24"}
+ Version{"1.27"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/es_PA.txt b/icu4c/source/data/locales/es_PA.txt
index e7d17ec..29c5253 100644
--- a/icu4c/source/data/locales/es_PA.txt
+++ b/icu4c/source/data/locales/es_PA.txt
@@ -3,11 +3,11 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/es_PA.xml
+// * Source File: ../../../cldr/common/main/es_PA.xml
// *
// ***************************************************************************
es_PA{
- Version{"1.24"}
+ Version{"1.27"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/es_PE.txt b/icu4c/source/data/locales/es_PE.txt
index c017da9..aa96ecb 100644
--- a/icu4c/source/data/locales/es_PE.txt
+++ b/icu4c/source/data/locales/es_PE.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/es_PE.xml
+// * Source File: ../../../cldr/common/main/es_PE.xml
// *
// ***************************************************************************
es_PE{
@@ -13,7 +13,7 @@
"#,##0%",
"#E0",
}
- Version{"1.27"}
+ Version{"1.30"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/es_PR.txt b/icu4c/source/data/locales/es_PR.txt
index 42bcb11..bac465e 100644
--- a/icu4c/source/data/locales/es_PR.txt
+++ b/icu4c/source/data/locales/es_PR.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/es_PR.xml
+// * Source File: ../../../cldr/common/main/es_PR.xml
// *
// ***************************************************************************
es_PR{
@@ -13,7 +13,7 @@
"Dólar Americano",
}
}
- Version{"1.25"}
+ Version{"1.28"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/es_PY.txt b/icu4c/source/data/locales/es_PY.txt
index 47e598c..485d473 100644
--- a/icu4c/source/data/locales/es_PY.txt
+++ b/icu4c/source/data/locales/es_PY.txt
@@ -3,31 +3,17 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/es_PY.xml
+// * Source File: ../../../cldr/common/main/es_PY.xml
// *
// ***************************************************************************
es_PY{
- NumberElements{
- ",",
- ".",
- ";",
- "%",
- "0",
- "#",
- "-",
- "E",
- "‰",
- "∞",
- "�",
- "+",
- }
NumberPatterns{
"#,##0.###",
"¤ #,##0.00;¤ -#,##0.00",
"#,##0%",
"#E0",
}
- Version{"1.25"}
+ Version{"1.28"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/es_SV.txt b/icu4c/source/data/locales/es_SV.txt
index 109c114..a21c57e 100644
--- a/icu4c/source/data/locales/es_SV.txt
+++ b/icu4c/source/data/locales/es_SV.txt
@@ -3,11 +3,11 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/es_SV.xml
+// * Source File: ../../../cldr/common/main/es_SV.xml
// *
// ***************************************************************************
es_SV{
- Version{"1.24"}
+ Version{"1.27"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/es_US.txt b/icu4c/source/data/locales/es_US.txt
index ffa2ce6..c8e3c6a 100644
--- a/icu4c/source/data/locales/es_US.txt
+++ b/icu4c/source/data/locales/es_US.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/es_US.xml
+// * Source File: ../../../cldr/common/main/es_US.xml
// *
// ***************************************************************************
es_US{
@@ -12,7 +12,7 @@
279,
216,
}
- Version{"1.32"}
+ Version{"1.35"}
calendar{
gregorian{
DateTimeElements:intvector{
@@ -30,12 +30,6 @@
"M/d/yy",
"{1} {0}",
}
- weekend:intvector{
- 7,
- 0,
- 1,
- 86400000,
- }
}
}
}
diff --git a/icu4c/source/data/locales/es_UY.txt b/icu4c/source/data/locales/es_UY.txt
index dfaf59b..0f1a94b 100644
--- a/icu4c/source/data/locales/es_UY.txt
+++ b/icu4c/source/data/locales/es_UY.txt
@@ -3,23 +3,15 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/es_UY.xml
+// * Source File: ../../../cldr/common/main/es_UY.xml
// *
// ***************************************************************************
es_UY{
- NumberElements{
- ",",
- ".",
- ";",
- "%",
- "0",
- "#",
- "-",
- "E",
- "‰",
- "∞",
- "�",
- "+",
+ Currencies{
+ UYU{
+ "UYU",
+ "peso uruguayo",
+ }
}
NumberPatterns{
"#,##0.###",
@@ -27,7 +19,7 @@
"#,##0%",
"#E0",
}
- Version{"1.24"}
+ Version{"1.28"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/es_VE.txt b/icu4c/source/data/locales/es_VE.txt
index 4c6fc5b..365c2e8 100644
--- a/icu4c/source/data/locales/es_VE.txt
+++ b/icu4c/source/data/locales/es_VE.txt
@@ -3,31 +3,17 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/es_VE.xml
+// * Source File: ../../../cldr/common/main/es_VE.xml
// *
// ***************************************************************************
es_VE{
- NumberElements{
- ",",
- ".",
- ";",
- "%",
- "0",
- "#",
- "-",
- "E",
- "‰",
- "∞",
- "�",
- "+",
- }
NumberPatterns{
"#,##0.###",
"¤#,##0.00;¤ -#,##0.00",
"#,##0%",
"#E0",
}
- Version{"1.24"}
+ Version{"1.27"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/et.txt b/icu4c/source/data/locales/et.txt
index a14ab1e..f710718 100644
--- a/icu4c/source/data/locales/et.txt
+++ b/icu4c/source/data/locales/et.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/et.xml
+// * Source File: ../../../cldr/common/main/et.xml
// *
// ***************************************************************************
/**
@@ -317,7 +317,7 @@
"�",
"+",
}
- Version{"1.34"}
+ Version{"1.39"}
calendar{
gregorian{
DateTimeElements:intvector{
diff --git a/icu4c/source/data/locales/et_EE.txt b/icu4c/source/data/locales/et_EE.txt
index 27a87f5..8a2656f 100644
--- a/icu4c/source/data/locales/et_EE.txt
+++ b/icu4c/source/data/locales/et_EE.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/et_EE.xml
+// * Source File: ../../../cldr/common/main/et_EE.xml
// *
// ***************************************************************************
et_EE{
@@ -13,5 +13,5 @@
"#,##0%",
"#E0",
}
- Version{"1.25"}
+ Version{"1.27"}
}
diff --git a/icu4c/source/data/locales/eu.txt b/icu4c/source/data/locales/eu.txt
index b587f82..5142adc 100644
--- a/icu4c/source/data/locales/eu.txt
+++ b/icu4c/source/data/locales/eu.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/eu.xml
+// * Source File: ../../../cldr/common/main/eu.xml
// *
// ***************************************************************************
/**
@@ -152,7 +152,7 @@
"�",
"+",
}
- Version{"1.30"}
+ Version{"1.35"}
calendar{
gregorian{
dayNames{
diff --git a/icu4c/source/data/locales/eu_ES.txt b/icu4c/source/data/locales/eu_ES.txt
index 3bb30af..beda190 100644
--- a/icu4c/source/data/locales/eu_ES.txt
+++ b/icu4c/source/data/locales/eu_ES.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/eu_ES.xml
+// * Source File: ../../../cldr/common/main/eu_ES.xml
// *
// ***************************************************************************
eu_ES{
@@ -13,7 +13,7 @@
"#,##0%",
"#E0",
}
- Version{"1.26"}
+ Version{"1.27"}
calendar{
gregorian{
DateTimeElements:intvector{
diff --git a/icu4c/source/data/locales/fa.txt b/icu4c/source/data/locales/fa.txt
index 6c82527..815d3a5 100644
--- a/icu4c/source/data/locales/fa.txt
+++ b/icu4c/source/data/locales/fa.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/fa.xml
+// * Source File: ../../../cldr/common/main/fa.xml
// *
// ***************************************************************************
/**
@@ -504,7 +504,7 @@
Yiii{"یی"}
Zyyy{"مشترک"}
}
- Version{"1.34"}
+ Version{"1.38"}
calendar{
gregorian{
AmPmMarkers{
diff --git a/icu4c/source/data/locales/fa_AF.txt b/icu4c/source/data/locales/fa_AF.txt
index 68d995c..e4981f2 100644
--- a/icu4c/source/data/locales/fa_AF.txt
+++ b/icu4c/source/data/locales/fa_AF.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/fa_AF.xml
+// * Source File: ../../../cldr/common/main/fa_AF.xml
// *
// ***************************************************************************
fa_AF{
@@ -146,7 +146,7 @@
"#,##0%",
"#E0",
}
- Version{"1.27"}
+ Version{"1.31"}
calendar{
gregorian{
DateTimeElements:intvector{
@@ -187,14 +187,4 @@
}
}
}
- zoneStrings{
- {
- "Asia/Kabul",
- "وقت افغانستان",
- "AFT",
- "وقت افغانستان",
- "AFT",
- "کابل",
- }
- }
}
diff --git a/icu4c/source/data/locales/fa_IR.txt b/icu4c/source/data/locales/fa_IR.txt
index 5e95b0a..35e6504 100644
--- a/icu4c/source/data/locales/fa_IR.txt
+++ b/icu4c/source/data/locales/fa_IR.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/fa_IR.xml
+// * Source File: ../../../cldr/common/main/fa_IR.xml
// *
// ***************************************************************************
fa_IR{
@@ -27,7 +27,7 @@
"%#,##0",
"#E0",
}
- Version{"1.29"}
+ Version{"1.31"}
calendar{
gregorian{
DateTimeElements:intvector{
diff --git a/icu4c/source/data/locales/fi.txt b/icu4c/source/data/locales/fi.txt
index 3a24dc4..d736824 100644
--- a/icu4c/source/data/locales/fi.txt
+++ b/icu4c/source/data/locales/fi.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/fi.xml
+// * Source File: ../../../cldr/common/main/fi.xml
// *
// ***************************************************************************
/**
@@ -1756,7 +1756,7 @@
traditional{"Perinteinen"}
}
}
- Version{"1.40"}
+ Version{"1.51"}
calendar{
gregorian{
AmPmMarkers{
@@ -1778,15 +1778,6 @@
"pe",
"la",
}
- narrow{
- "S",
- "M",
- "T",
- "K",
- "T",
- "P",
- "L",
- }
wide{
"sunnuntai",
"maanantai",
@@ -1797,6 +1788,17 @@
"lauantai",
}
}
+ stand-alone{
+ narrow{
+ "S",
+ "M",
+ "T",
+ "K",
+ "T",
+ "P",
+ "L",
+ }
+ }
}
eras{
abbreviated{
@@ -1820,20 +1822,6 @@
"marras",
"joulu",
}
- narrow{
- "T",
- "H",
- "M",
- "H",
- "T",
- "K",
- "H",
- "E",
- "S",
- "L",
- "M",
- "J",
- }
wide{
"tammikuu",
"helmikuu",
@@ -1849,12 +1837,27 @@
"joulukuu",
}
}
+ stand-alone{
+ narrow{
+ "T",
+ "H",
+ "M",
+ "H",
+ "T",
+ "K",
+ "H",
+ "E",
+ "S",
+ "L",
+ "M",
+ "J",
+ }
+ }
}
}
hebrew{
monthNames{
format{
- abbreviated:alias{"fi/calendar/hebrew/monthNames/format/wide"}
wide{
"Tišrìkuu",
"Hešvánkuu",
@@ -1901,14 +1904,6 @@
localPatternChars{"GanjkHmsSEDFwWxhKzAeugXZ"}
zoneStrings{
{
- "Etc/GMT",
- "Greenwichin aika",
- "GMT",
- "Greenwichin aika",
- "GMT",
- "Lontoo",
- }
- {
"America/Halifax",
"Atlantin normaaliaika",
"AST",
diff --git a/icu4c/source/data/locales/fi_FI.txt b/icu4c/source/data/locales/fi_FI.txt
index 6ea9a52..110bf39 100644
--- a/icu4c/source/data/locales/fi_FI.txt
+++ b/icu4c/source/data/locales/fi_FI.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/fi_FI.xml
+// * Source File: ../../../cldr/common/main/fi_FI.xml
// *
// ***************************************************************************
fi_FI{
@@ -13,5 +13,5 @@
"#,##0%",
"#E0",
}
- Version{"1.25"}
+ Version{"1.27"}
}
diff --git a/icu4c/source/data/locales/fo.txt b/icu4c/source/data/locales/fo.txt
index cee0781..ce600fd 100644
--- a/icu4c/source/data/locales/fo.txt
+++ b/icu4c/source/data/locales/fo.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/fo.xml
+// * Source File: ../../../cldr/common/main/fo.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/locales/fo_FO.txt b/icu4c/source/data/locales/fo_FO.txt
index 9db7ac8..4191e9f 100644
--- a/icu4c/source/data/locales/fo_FO.txt
+++ b/icu4c/source/data/locales/fo_FO.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/fo_FO.xml
+// * Source File: ../../../cldr/common/main/fo_FO.xml
// *
// ***************************************************************************
fo_FO{
@@ -13,5 +13,5 @@
"#,##0%",
"#E0",
}
- Version{"1.24"}
+ Version{"1.26"}
}
diff --git a/icu4c/source/data/locales/fr.txt b/icu4c/source/data/locales/fr.txt
index fc97314..b8645d5 100644
--- a/icu4c/source/data/locales/fr.txt
+++ b/icu4c/source/data/locales/fr.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/fr.xml
+// * Source File: ../../../cldr/common/main/fr.xml
// *
// ***************************************************************************
/**
@@ -1515,7 +1515,7 @@
Variants{
REVISED{"Révisé"}
}
- Version{"1.46"}
+ Version{"1.58"}
calendar{
gregorian{
DateTimeElements:intvector{
@@ -1544,15 +1544,6 @@
"ven.",
"sam.",
}
- narrow{
- "D",
- "L",
- "M",
- "M",
- "J",
- "V",
- "S",
- }
wide{
"dimanche",
"lundi",
@@ -1563,6 +1554,17 @@
"samedi",
}
}
+ stand-alone{
+ narrow{
+ "D",
+ "L",
+ "M",
+ "M",
+ "J",
+ "V",
+ "S",
+ }
+ }
}
eras{
abbreviated{
@@ -1586,20 +1588,6 @@
"nov.",
"déc.",
}
- narrow{
- "J",
- "F",
- "M",
- "A",
- "M",
- "J",
- "J",
- "A",
- "S",
- "O",
- "N",
- "D",
- }
wide{
"janvier",
"février",
@@ -1615,6 +1603,22 @@
"décembre",
}
}
+ stand-alone{
+ narrow{
+ "J",
+ "F",
+ "M",
+ "A",
+ "M",
+ "J",
+ "J",
+ "A",
+ "S",
+ "O",
+ "N",
+ "D",
+ }
+ }
}
}
hebrew{
@@ -1665,20 +1669,14 @@
localPatternChars{"GaMjkHmsSEDFwWxhKzAeugXZ"}
zoneStrings{
{
- "Etc/GMT",
- "Temps Moyen de Greenwich",
- "GMT",
- "Temps Moyen de Greenwich",
- "GMT",
- "(GMT)",
- }
- {
"America/Vancouver",
"Heure normale du Pacifique",
"HNP",
"Heure avancée du Pacifique",
"HAP",
"Vancouver",
+ "Heure du Pacifique",
+ "HP",
}
{
"America/Edmonton",
@@ -1687,6 +1685,8 @@
"Heure avancée des Rocheuses",
"HAR",
"Edmonton",
+ "Heure des Rocheuses",
+ "HR",
}
{
"America/Winnipeg",
@@ -1695,6 +1695,8 @@
"Heure avancée du Centre",
"HAC",
"Winnipeg",
+ "Heure du Centre",
+ "HC",
}
{
"America/Montreal",
@@ -1703,6 +1705,8 @@
"Heure avancée de l’Est",
"HAE",
"Montréal",
+ "Heure de l’Est",
+ "HE",
}
{
"America/Halifax",
@@ -1711,6 +1715,8 @@
"Heure avancée de l’Atlantique",
"HAA",
"Halifax",
+ "Heure de l’Atlantique",
+ "HA",
}
{
"America/St_Johns",
@@ -1719,6 +1725,8 @@
"Heure avancée de Terre-Neuve",
"HAT",
"Saint-Jean de Terre-Neuve",
+ "Heure de Terre-Neuve",
+ "HT",
}
{
"Asia/Shanghai",
@@ -1735,6 +1743,8 @@
"Heure avancée de l’Europe centrale",
"HAEC",
"Paris",
+ "Heure de l’Europe centrale",
+ "HEC",
}
{
"Asia/Jerusalem",
@@ -1767,6 +1777,8 @@
"Heure avancée d’Hawaï",
"HDT",
"Honolulu",
+ "Heure d’Hawaï",
+ "HT",
}
{
"America/Anchorage",
@@ -1775,6 +1787,8 @@
"Heure avancée de l’Alaska",
"HAAK",
"Anchorage",
+ "Heure de l’Alaska",
+ "HAK",
}
{
"America/Los_Angeles",
@@ -1783,6 +1797,8 @@
"Heure avancée du Pacifique (ÉUA)",
"HAP (ÉUA)",
"Los Angeles",
+ "Heure du Pacifique (ÉUA)",
+ "HP (ÉUA)",
}
{
"America/Phoenix",
@@ -1791,6 +1807,8 @@
"Heure avancée des Rocheuses (ÉUA)",
"HAR (ÉUA)",
"Phoenix",
+ "Heure des Rocheuses (ÉUA)",
+ "HR (ÉUA)",
}
{
"America/Denver",
@@ -1799,6 +1817,8 @@
"Heure avancée des Rocheuses (ÉUA)",
"HAR (ÉUA)",
"Denver",
+ "Heure des Rocheuses (ÉUA)",
+ "HR (ÉUA)",
}
{
"America/Chicago",
@@ -1807,6 +1827,8 @@
"Heure avancée du Centre (ÉUA)",
"HAC (ÉUA)",
"Chicago",
+ "Heure du Centre (ÉUA)",
+ "HC (ÉUA)",
}
{
"America/Indianapolis",
@@ -1815,6 +1837,8 @@
"Heure avancée de l’Est (ÉUA)",
"HAE (ÉUA)",
"Indianapolis",
+ "Heure de l’Est (ÉUA)",
+ "HE (ÉUA)",
}
{
"America/New_York",
@@ -1823,6 +1847,8 @@
"Heure avancée de l’Est (ÉUA)",
"HAE (ÉUA)",
"New York",
+ "Heure de l’Est (ÉUA)",
+ "HE (ÉUA)",
}
}
}
diff --git a/icu4c/source/data/locales/fr_BE.txt b/icu4c/source/data/locales/fr_BE.txt
index 8b0210d..84226a0 100644
--- a/icu4c/source/data/locales/fr_BE.txt
+++ b/icu4c/source/data/locales/fr_BE.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/fr_BE.xml
+// * Source File: ../../../cldr/common/main/fr_BE.xml
// *
// ***************************************************************************
fr_BE{
@@ -21,7 +21,7 @@
"�",
"+",
}
- Version{"1.26"}
+ Version{"1.27"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/fr_CA.txt b/icu4c/source/data/locales/fr_CA.txt
index 8505a6d..2edf66e 100644
--- a/icu4c/source/data/locales/fr_CA.txt
+++ b/icu4c/source/data/locales/fr_CA.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/fr_CA.xml
+// * Source File: ../../../cldr/common/main/fr_CA.xml
// *
// ***************************************************************************
fr_CA{
@@ -23,7 +23,7 @@
"#,##0%",
"#E0",
}
- Version{"1.27"}
+ Version{"1.28"}
calendar{
gregorian{
DateTimeElements:intvector{
diff --git a/icu4c/source/data/locales/fr_CH.txt b/icu4c/source/data/locales/fr_CH.txt
index f5db0fe..2af4417 100644
--- a/icu4c/source/data/locales/fr_CH.txt
+++ b/icu4c/source/data/locales/fr_CH.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/fr_CH.xml
+// * Source File: ../../../cldr/common/main/fr_CH.xml
// *
// ***************************************************************************
fr_CH{
@@ -27,7 +27,7 @@
"#,##0%",
"#E0",
}
- Version{"1.26"}
+ Version{"1.27"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/fr_FR.txt b/icu4c/source/data/locales/fr_FR.txt
index 1b87d85..e13ad59 100644
--- a/icu4c/source/data/locales/fr_FR.txt
+++ b/icu4c/source/data/locales/fr_FR.txt
@@ -3,9 +3,9 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/fr_FR.xml
+// * Source File: ../../../cldr/common/main/fr_FR.xml
// *
// ***************************************************************************
fr_FR{
- Version{"1.24"}
+ Version{"1.25"}
}
diff --git a/icu4c/source/data/locales/fr_LU.txt b/icu4c/source/data/locales/fr_LU.txt
index ffdcc14..6ecf638 100644
--- a/icu4c/source/data/locales/fr_LU.txt
+++ b/icu4c/source/data/locales/fr_LU.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/fr_LU.xml
+// * Source File: ../../../cldr/common/main/fr_LU.xml
// *
// ***************************************************************************
fr_LU{
@@ -31,5 +31,5 @@
"�",
"+",
}
- Version{"1.27"}
+ Version{"1.28"}
}
diff --git a/icu4c/source/data/locales/ga.txt b/icu4c/source/data/locales/ga.txt
index 16b489e..03bee9d 100644
--- a/icu4c/source/data/locales/ga.txt
+++ b/icu4c/source/data/locales/ga.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ga.xml
+// * Source File: ../../../cldr/common/main/ga.xml
// *
// ***************************************************************************
/**
@@ -1348,7 +1348,7 @@
LocaleScript{
"Latn",
}
- Version{"1.32"}
+ Version{"1.35"}
calendar{
gregorian{
AmPmMarkers{
@@ -1420,14 +1420,6 @@
localPatternChars{"RbMLkUnsSElFtTauKcBeyrAC"}
zoneStrings{
{
- "Etc/GMT",
- "Meán-Am Greenwich",
- "MAG",
- "Meán-Am Greenwich",
- "MAG",
- "Londain",
- }
- {
"Europe/Belfast",
"Meán-Am Greenwich",
"MAG",
diff --git a/icu4c/source/data/locales/ga_IE.txt b/icu4c/source/data/locales/ga_IE.txt
index 31935bc..3a3dcb2 100644
--- a/icu4c/source/data/locales/ga_IE.txt
+++ b/icu4c/source/data/locales/ga_IE.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ga_IE.xml
+// * Source File: ../../../cldr/common/main/ga_IE.xml
// *
// ***************************************************************************
ga_IE{
@@ -19,7 +19,7 @@
"#,##0%",
"#E0",
}
- Version{"1.24"}
+ Version{"1.26"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/gl.txt b/icu4c/source/data/locales/gl.txt
index c2097ec..a3edb5e 100644
--- a/icu4c/source/data/locales/gl.txt
+++ b/icu4c/source/data/locales/gl.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/gl.xml
+// * Source File: ../../../cldr/common/main/gl.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/locales/gl_ES.txt b/icu4c/source/data/locales/gl_ES.txt
index e5aa046..55fedcd 100644
--- a/icu4c/source/data/locales/gl_ES.txt
+++ b/icu4c/source/data/locales/gl_ES.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/gl_ES.xml
+// * Source File: ../../../cldr/common/main/gl_ES.xml
// *
// ***************************************************************************
gl_ES{
@@ -13,7 +13,7 @@
"#,##0%",
"#E0",
}
- Version{"1.26"}
+ Version{"1.28"}
calendar{
gregorian{
DateTimeElements:intvector{
diff --git a/icu4c/source/data/locales/gu.txt b/icu4c/source/data/locales/gu.txt
index 20ea1b9..32b7f64 100644
--- a/icu4c/source/data/locales/gu.txt
+++ b/icu4c/source/data/locales/gu.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/gu.xml
+// * Source File: ../../../cldr/common/main/gu.xml
// *
// ***************************************************************************
/**
@@ -28,7 +28,7 @@
"INR",
}
}
- ExemplarCharacters{"[[:Gujr:]]"}
+ ExemplarCharacters{"[ઁ-ઃઅ-ઍએ-ઑઓ-નપ-રલળવ-હ઼-ૅે-ૉો-્ૐૠ-ૣ૦-૯૱]"}
Languages{
gu{"ગુજરાતી"}
}
@@ -49,7 +49,7 @@
"�",
"+",
}
- Version{"1.24"}
+ Version{"1.26"}
calendar{
gregorian{
AmPmMarkers{
diff --git a/icu4c/source/data/locales/gu_IN.txt b/icu4c/source/data/locales/gu_IN.txt
index 3276044..5e80143 100644
--- a/icu4c/source/data/locales/gu_IN.txt
+++ b/icu4c/source/data/locales/gu_IN.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/gu_IN.xml
+// * Source File: ../../../cldr/common/main/gu_IN.xml
// *
// ***************************************************************************
gu_IN{
@@ -13,7 +13,7 @@
"#,##,##0%",
"#E0",
}
- Version{"1.31"}
+ Version{"1.33"}
calendar{
gregorian{
DateTimeElements:intvector{
diff --git a/icu4c/source/data/locales/gv.txt b/icu4c/source/data/locales/gv.txt
index d190d5d..69ddc21 100644
--- a/icu4c/source/data/locales/gv.txt
+++ b/icu4c/source/data/locales/gv.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/gv.xml
+// * Source File: ../../../cldr/common/main/gv.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/locales/gv_GB.txt b/icu4c/source/data/locales/gv_GB.txt
index 657b2ea..03938b7 100644
--- a/icu4c/source/data/locales/gv_GB.txt
+++ b/icu4c/source/data/locales/gv_GB.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/gv_GB.xml
+// * Source File: ../../../cldr/common/main/gv_GB.xml
// *
// ***************************************************************************
gv_GB{
diff --git a/icu4c/source/data/locales/he.txt b/icu4c/source/data/locales/he.txt
index 1cf60b4..3c3e103 100644
--- a/icu4c/source/data/locales/he.txt
+++ b/icu4c/source/data/locales/he.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/he.xml
+// * Source File: ../../../cldr/common/main/he.xml
// *
// ***************************************************************************
/**
@@ -369,7 +369,7 @@
hebrew{"לוח שנה עברי"}
}
}
- Version{"1.40"}
+ Version{"1.45"}
calendar{
gregorian{
DateTimePatterns{
@@ -394,15 +394,6 @@
"ו",
"ש",
}
- narrow{
- "א",
- "ב",
- "ג",
- "ד",
- "ה",
- "ו",
- "ש",
- }
wide{
"יום ראשון",
"יום שני",
@@ -413,6 +404,17 @@
"שבת",
}
}
+ stand-alone{
+ narrow{
+ "א",
+ "ב",
+ "ג",
+ "ד",
+ "ה",
+ "ו",
+ "ש",
+ }
+ }
}
eras{
abbreviated{
diff --git a/icu4c/source/data/locales/he_IL.txt b/icu4c/source/data/locales/he_IL.txt
index 9a8a2c6..cb5bce3 100644
--- a/icu4c/source/data/locales/he_IL.txt
+++ b/icu4c/source/data/locales/he_IL.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/he_IL.xml
+// * Source File: ../../../cldr/common/main/he_IL.xml
// *
// ***************************************************************************
he_IL{
@@ -13,5 +13,5 @@
"#,##0%",
"#E0",
}
- Version{"1.27"}
+ Version{"1.28"}
}
diff --git a/icu4c/source/data/locales/hi.txt b/icu4c/source/data/locales/hi.txt
index f1c37a7..1745dcba 100644
--- a/icu4c/source/data/locales/hi.txt
+++ b/icu4c/source/data/locales/hi.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/hi.xml
+// * Source File: ../../../cldr/common/main/hi.xml
// *
// ***************************************************************************
/**
@@ -186,7 +186,7 @@
"INR",
}
}
- ExemplarCharacters{"[[:Deva:]]"}
+ ExemplarCharacters{"[ँ-ह़-्ॐ-॔क़-ॣ०-९ॽ]"}
Languages{
aa{"अफ़ार"}
ab{"अब्खाज़ियन्"}
@@ -348,7 +348,7 @@
"�",
"+",
}
- Version{"1.33"}
+ Version{"1.35"}
calendar{
gregorian{
AmPmMarkers{
diff --git a/icu4c/source/data/locales/hi_IN.txt b/icu4c/source/data/locales/hi_IN.txt
index 349e8d2..c33f072 100644
--- a/icu4c/source/data/locales/hi_IN.txt
+++ b/icu4c/source/data/locales/hi_IN.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/hi_IN.xml
+// * Source File: ../../../cldr/common/main/hi_IN.xml
// *
// ***************************************************************************
hi_IN{
@@ -13,7 +13,7 @@
"#,##,##0%",
"#E0",
}
- Version{"1.30"}
+ Version{"1.32"}
calendar{
gregorian{
DateTimeElements:intvector{
diff --git a/icu4c/source/data/locales/hr.txt b/icu4c/source/data/locales/hr.txt
index 2f10d1b..cdeae76 100644
--- a/icu4c/source/data/locales/hr.txt
+++ b/icu4c/source/data/locales/hr.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/hr.xml
+// * Source File: ../../../cldr/common/main/hr.xml
// *
// ***************************************************************************
/**
@@ -1058,7 +1058,7 @@
traditional{"Tradicionano poredavanje"}
}
}
- Version{"1.40"}
+ Version{"1.45"}
calendar{
gregorian{
DateTimeElements:intvector{
@@ -1087,15 +1087,6 @@
"pet",
"sub",
}
- narrow{
- "n",
- "p",
- "u",
- "s",
- "č",
- "p",
- "s",
- }
wide{
"nedjelja",
"ponedjeljak",
@@ -1106,6 +1097,17 @@
"subota",
}
}
+ stand-alone{
+ narrow{
+ "n",
+ "p",
+ "u",
+ "s",
+ "č",
+ "p",
+ "s",
+ }
+ }
}
monthNames{
format{
diff --git a/icu4c/source/data/locales/hu.txt b/icu4c/source/data/locales/hu.txt
index d2a08ab..a61f91e 100644
--- a/icu4c/source/data/locales/hu.txt
+++ b/icu4c/source/data/locales/hu.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/hu.xml
+// * Source File: ../../../cldr/common/main/hu.xml
// *
// ***************************************************************************
/**
@@ -1443,7 +1443,7 @@
traditional{"Hagyományos"}
}
}
- Version{"1.40"}
+ Version{"1.46"}
calendar{
buddhist{
eras{
@@ -1483,15 +1483,6 @@
"P",
"Szo",
}
- narrow{
- "V",
- "H",
- "K",
- "S",
- "C",
- "P",
- "S",
- }
wide{
"vasárnap",
"hétfő",
@@ -1502,6 +1493,17 @@
"szombat",
}
}
+ stand-alone{
+ narrow{
+ "V",
+ "H",
+ "K",
+ "S",
+ "C",
+ "P",
+ "S",
+ }
+ }
}
eras{
abbreviated{
@@ -1525,20 +1527,6 @@
"nov.",
"dec.",
}
- narrow{
- "J",
- "F",
- "M",
- "Á",
- "M",
- "J",
- "J",
- "A",
- "S",
- "O",
- "N",
- "D",
- }
wide{
"január",
"február",
@@ -1554,6 +1542,22 @@
"december",
}
}
+ stand-alone{
+ narrow{
+ "J",
+ "F",
+ "M",
+ "Á",
+ "M",
+ "J",
+ "J",
+ "A",
+ "S",
+ "O",
+ "N",
+ "D",
+ }
+ }
}
}
hebrew{
diff --git a/icu4c/source/data/locales/hu_HU.txt b/icu4c/source/data/locales/hu_HU.txt
index 80f92bc..8b9bc22 100644
--- a/icu4c/source/data/locales/hu_HU.txt
+++ b/icu4c/source/data/locales/hu_HU.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/hu_HU.xml
+// * Source File: ../../../cldr/common/main/hu_HU.xml
// *
// ***************************************************************************
hu_HU{
@@ -13,5 +13,5 @@
"#,##0%",
"#E0",
}
- Version{"1.25"}
+ Version{"1.27"}
}
diff --git a/icu4c/source/data/locales/hy.txt b/icu4c/source/data/locales/hy.txt
index 5411585..d7afc75 100644
--- a/icu4c/source/data/locales/hy.txt
+++ b/icu4c/source/data/locales/hy.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/hy.xml
+// * Source File: ../../../cldr/common/main/hy.xml
// *
// ***************************************************************************
/**
@@ -203,7 +203,7 @@
ZM{"Զամբիա"}
ZW{"Զիմբաբվե"}
}
- ExemplarCharacters{"[:Armn:]"}
+ ExemplarCharacters{"[Ա-Ֆՙ-՟ա-և֊ﬓ-ﬗ]"}
Languages{
hy{"Հայերէն"}
}
@@ -230,7 +230,7 @@
"#0%",
"#E0",
}
- Version{"1.33"}
+ Version{"1.35"}
calendar{
gregorian{
AmPmMarkers{
diff --git a/icu4c/source/data/locales/hy_AM.txt b/icu4c/source/data/locales/hy_AM.txt
index 93383d7..c298df6 100644
--- a/icu4c/source/data/locales/hy_AM.txt
+++ b/icu4c/source/data/locales/hy_AM.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/hy_AM.xml
+// * Source File: ../../../cldr/common/main/hy_AM.xml
// *
// ***************************************************************************
hy_AM{
diff --git a/icu4c/source/data/locales/hy_AM_REVISED.txt b/icu4c/source/data/locales/hy_AM_REVISED.txt
index 2c43e08..fdbbf41 100644
--- a/icu4c/source/data/locales/hy_AM_REVISED.txt
+++ b/icu4c/source/data/locales/hy_AM_REVISED.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/hy_AM_REVISED.xml
+// * Source File: ../../../cldr/common/main/hy_AM_REVISED.xml
// *
// ***************************************************************************
hy_AM_REVISED{
diff --git a/icu4c/source/data/locales/id.txt b/icu4c/source/data/locales/id.txt
index 3fcb6f8..6113704 100644
--- a/icu4c/source/data/locales/id.txt
+++ b/icu4c/source/data/locales/id.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/id.xml
+// * Source File: ../../../cldr/common/main/id.xml
// *
// ***************************************************************************
/**
@@ -504,7 +504,7 @@
"#,##0%",
"#E0",
}
- Version{"1.33"}
+ Version{"1.35"}
calendar{
gregorian{
DateTimeElements:intvector{
diff --git a/icu4c/source/data/locales/id_ID.txt b/icu4c/source/data/locales/id_ID.txt
index cfcc81a..7a56b60 100644
--- a/icu4c/source/data/locales/id_ID.txt
+++ b/icu4c/source/data/locales/id_ID.txt
@@ -3,11 +3,11 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/id_ID.xml
+// * Source File: ../../../cldr/common/main/id_ID.xml
// *
// ***************************************************************************
id_ID{
- Version{"1.23"}
+ Version{"1.25"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/is.txt b/icu4c/source/data/locales/is.txt
index dd741a9..98f397d 100644
--- a/icu4c/source/data/locales/is.txt
+++ b/icu4c/source/data/locales/is.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/is.xml
+// * Source File: ../../../cldr/common/main/is.xml
// *
// ***************************************************************************
/**
@@ -1394,7 +1394,7 @@
traditional{"Hefðbundin"}
}
}
- Version{"1.38"}
+ Version{"1.43"}
calendar{
gregorian{
DateTimePatterns{
@@ -1419,15 +1419,6 @@
"fös",
"lau",
}
- narrow{
- "s",
- "m",
- "þ",
- "m",
- "f",
- "f",
- "l",
- }
wide{
"sunnudagur",
"mánudagur",
@@ -1438,6 +1429,17 @@
"laugardagur",
}
}
+ stand-alone{
+ narrow{
+ "s",
+ "m",
+ "þ",
+ "m",
+ "f",
+ "f",
+ "l",
+ }
+ }
}
monthNames{
format{
@@ -1455,20 +1457,6 @@
"nóv",
"des",
}
- narrow{
- "j",
- "f",
- "m",
- "a",
- "m",
- "j",
- "j",
- "á",
- "s",
- "o",
- "n",
- "d",
- }
wide{
"janúar",
"febrúar",
@@ -1484,6 +1472,22 @@
"desember",
}
}
+ stand-alone{
+ narrow{
+ "j",
+ "f",
+ "m",
+ "a",
+ "m",
+ "j",
+ "j",
+ "á",
+ "s",
+ "o",
+ "n",
+ "d",
+ }
+ }
}
}
}
diff --git a/icu4c/source/data/locales/is_IS.txt b/icu4c/source/data/locales/is_IS.txt
index 0f61089..e41a5db 100644
--- a/icu4c/source/data/locales/is_IS.txt
+++ b/icu4c/source/data/locales/is_IS.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/is_IS.xml
+// * Source File: ../../../cldr/common/main/is_IS.xml
// *
// ***************************************************************************
is_IS{
@@ -13,5 +13,5 @@
"#,##0%",
"#E0",
}
- Version{"1.25"}
+ Version{"1.27"}
}
diff --git a/icu4c/source/data/locales/it.txt b/icu4c/source/data/locales/it.txt
index edd5201..32bb68a 100644
--- a/icu4c/source/data/locales/it.txt
+++ b/icu4c/source/data/locales/it.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/it.xml
+// * Source File: ../../../cldr/common/main/it.xml
// *
// ***************************************************************************
/**
@@ -1389,7 +1389,6 @@
grc{"greco, antico (fino al 1453)"}
gu{"gujarati"}
gv{"manx"}
- gwi{"gwichʻin"}
ha{"haussa"}
hai{"haida"}
haw{"hawaiano"}
@@ -1792,7 +1791,7 @@
Variants{
REVISED{"Modificato"}
}
- Version{"1.38"}
+ Version{"1.47"}
calendar{
gregorian{
AmPmMarkers{
@@ -1825,15 +1824,6 @@
"ven",
"sab",
}
- narrow{
- "D",
- "L",
- "M",
- "M",
- "G",
- "V",
- "S",
- }
wide{
"domenica",
"lunedì",
@@ -1844,6 +1834,17 @@
"sabato",
}
}
+ stand-alone{
+ narrow{
+ "D",
+ "L",
+ "M",
+ "M",
+ "G",
+ "V",
+ "S",
+ }
+ }
}
eras{
abbreviated{
@@ -1867,20 +1868,6 @@
"nov",
"dic",
}
- narrow{
- "G",
- "F",
- "M",
- "A",
- "M",
- "G",
- "L",
- "A",
- "S",
- "O",
- "N",
- "D",
- }
wide{
"gennaio",
"febbraio",
@@ -1896,19 +1883,27 @@
"dicembre",
}
}
+ stand-alone{
+ narrow{
+ "G",
+ "F",
+ "M",
+ "A",
+ "M",
+ "G",
+ "L",
+ "A",
+ "S",
+ "O",
+ "N",
+ "D",
+ }
+ }
}
}
}
zoneStrings{
{
- "Etc/GMT",
- "Ora Meridiano Greenwich",
- "GMT",
- "Ora Meridiano Greenwich",
- "GMT",
- "Londra",
- }
- {
"America/Halifax",
"Ora Standard Atlantico",
"AST",
diff --git a/icu4c/source/data/locales/it_CH.txt b/icu4c/source/data/locales/it_CH.txt
index fc386b8..df41bf3 100644
--- a/icu4c/source/data/locales/it_CH.txt
+++ b/icu4c/source/data/locales/it_CH.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/it_CH.xml
+// * Source File: ../../../cldr/common/main/it_CH.xml
// *
// ***************************************************************************
it_CH{
@@ -27,7 +27,7 @@
"#,##0%",
"#E0",
}
- Version{"1.24"}
+ Version{"1.25"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/it_IT.txt b/icu4c/source/data/locales/it_IT.txt
index 1fe6cae..cc939e3 100644
--- a/icu4c/source/data/locales/it_IT.txt
+++ b/icu4c/source/data/locales/it_IT.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/it_IT.xml
+// * Source File: ../../../cldr/common/main/it_IT.xml
// *
// ***************************************************************************
it_IT{
@@ -18,7 +18,7 @@
}
}
}
- Version{"1.26"}
+ Version{"1.27"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/ja.txt b/icu4c/source/data/locales/ja.txt
index cf661b9..0f89eb8 100644
--- a/icu4c/source/data/locales/ja.txt
+++ b/icu4c/source/data/locales/ja.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ja.xml
+// * Source File: ../../../cldr/common/main/ja.xml
// *
// ***************************************************************************
/**
@@ -1268,7 +1268,7 @@
ba{"バシキール語"}
be{"ベラルーシ語"}
bg{"ブルガリア語"}
- bh{"ビハ―ル語"}
+ bh{"ビハール語"}
bi{"ビスラマ語"}
bm{"バンバラ語"}
bn{"ベンガル語"}
@@ -1362,7 +1362,7 @@
mh{"マーシャル語"}
mi{"マオリ語"}
mk{"マケドニア語"}
- ml{"マラヤ―ラム語"}
+ ml{"マラヤーラム語"}
mn{"モンゴル語"}
mo{"モルダビア語"}
mr{"マラーティー語"}
@@ -1530,7 +1530,7 @@
Variants{
REVISED{"改訂版"}
}
- Version{"1.42"}
+ Version{"1.56"}
boundaries{
word{"word_ja"}
}
@@ -1562,15 +1562,6 @@
"金",
"土",
}
- narrow{
- "日",
- "月",
- "火",
- "水",
- "木",
- "金",
- "土",
- }
wide{
"日曜日",
"月曜日",
@@ -1581,6 +1572,17 @@
"土曜日",
}
}
+ stand-alone{
+ narrow{
+ "日",
+ "月",
+ "火",
+ "水",
+ "木",
+ "金",
+ "土",
+ }
+ }
}
eras{
abbreviated{
@@ -1864,14 +1866,6 @@
localPatternChars{"GanjkHmsSEDFwWxhKzAeugXZ"}
zoneStrings{
{
- "Etc/GMT",
- "グリニッジ標準時",
- "GMT",
- "グリニッジ標準時",
- "GMT",
- "ロンドン",
- }
- {
"America/Halifax",
"大西洋標準時",
"AST",
diff --git a/icu4c/source/data/locales/ja_JP.txt b/icu4c/source/data/locales/ja_JP.txt
index 4e00e21..fd3d57b 100644
--- a/icu4c/source/data/locales/ja_JP.txt
+++ b/icu4c/source/data/locales/ja_JP.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ja_JP.xml
+// * Source File: ../../../cldr/common/main/ja_JP.xml
// *
// ***************************************************************************
ja_JP{
@@ -13,5 +13,5 @@
"#,##0%",
"#E0",
}
- Version{"1.25"}
+ Version{"1.27"}
}
diff --git a/icu4c/source/data/locales/kk.txt b/icu4c/source/data/locales/kk.txt
index bff3219..7b7bb18 100644
--- a/icu4c/source/data/locales/kk.txt
+++ b/icu4c/source/data/locales/kk.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/kk.xml
+// * Source File: ../../../cldr/common/main/kk.xml
// *
// ***************************************************************************
/**
@@ -40,7 +40,7 @@
"�",
"+",
}
- Version{"1.23"}
+ Version{"1.24"}
calendar{
gregorian{
DateTimeElements:intvector{
diff --git a/icu4c/source/data/locales/kk_KZ.txt b/icu4c/source/data/locales/kk_KZ.txt
index 0d2d23e..f7925b0 100644
--- a/icu4c/source/data/locales/kk_KZ.txt
+++ b/icu4c/source/data/locales/kk_KZ.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/kk_KZ.xml
+// * Source File: ../../../cldr/common/main/kk_KZ.xml
// *
// ***************************************************************************
kk_KZ{
diff --git a/icu4c/source/data/locales/kl.txt b/icu4c/source/data/locales/kl.txt
index 6db0eed..df406d9 100644
--- a/icu4c/source/data/locales/kl.txt
+++ b/icu4c/source/data/locales/kl.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/kl.xml
+// * Source File: ../../../cldr/common/main/kl.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/locales/kl_GL.txt b/icu4c/source/data/locales/kl_GL.txt
index ee8f6d1..185545c 100644
--- a/icu4c/source/data/locales/kl_GL.txt
+++ b/icu4c/source/data/locales/kl_GL.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/kl_GL.xml
+// * Source File: ../../../cldr/common/main/kl_GL.xml
// *
// ***************************************************************************
kl_GL{
diff --git a/icu4c/source/data/locales/kn.txt b/icu4c/source/data/locales/kn.txt
index b8d3abe..790b8dc 100644
--- a/icu4c/source/data/locales/kn.txt
+++ b/icu4c/source/data/locales/kn.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/kn.xml
+// * Source File: ../../../cldr/common/main/kn.xml
// *
// ***************************************************************************
/**
@@ -26,14 +26,14 @@
"INR",
}
}
- ExemplarCharacters{"[:Knda:]"}
+ ExemplarCharacters{"[ಂಃಅ-ಌಎ-ಐಒ-ನಪ-ಳವ-ಹ಼-ೄೆ-ೈೊ-್ೕೖೞೠೡ೦-೯]"}
Languages{
kn{"ಕನ್ನಡ"}
}
LocaleScript{
"Knda",
}
- Version{"1.27"}
+ Version{"1.30"}
calendar{
gregorian{
AmPmMarkers{
diff --git a/icu4c/source/data/locales/kn_IN.txt b/icu4c/source/data/locales/kn_IN.txt
index 0f60b1e..092b1e2 100644
--- a/icu4c/source/data/locales/kn_IN.txt
+++ b/icu4c/source/data/locales/kn_IN.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/kn_IN.xml
+// * Source File: ../../../cldr/common/main/kn_IN.xml
// *
// ***************************************************************************
kn_IN{
@@ -13,7 +13,7 @@
"#,##,##0%",
"#E0",
}
- Version{"1.31"}
+ Version{"1.33"}
calendar{
gregorian{
DateTimeElements:intvector{
diff --git a/icu4c/source/data/locales/ko.txt b/icu4c/source/data/locales/ko.txt
index f1877c7..ce11217 100644
--- a/icu4c/source/data/locales/ko.txt
+++ b/icu4c/source/data/locales/ko.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ko.xml
+// * Source File: ../../../cldr/common/main/ko.xml
// *
// ***************************************************************************
/**
@@ -1717,7 +1717,7 @@
Variants{
REVISED{"개정"}
}
- Version{"1.44"}
+ Version{"1.49"}
calendar{
gregorian{
AmPmMarkers{
@@ -1746,15 +1746,6 @@
"금",
"토",
}
- narrow{
- "일",
- "월",
- "화",
- "수",
- "목",
- "금",
- "토",
- }
wide{
"일요일",
"월요일",
@@ -1765,6 +1756,17 @@
"토요일",
}
}
+ stand-alone{
+ narrow{
+ "일",
+ "월",
+ "화",
+ "수",
+ "목",
+ "금",
+ "토",
+ }
+ }
}
eras{
abbreviated{
@@ -1788,7 +1790,7 @@
"11월",
"12월",
}
- narrow{
+ wide{
"1월",
"2월",
"3월",
@@ -1802,7 +1804,9 @@
"11월",
"12월",
}
- wide{
+ }
+ stand-alone{
+ narrow{
"1월",
"2월",
"3월",
@@ -1823,14 +1827,6 @@
localPatternChars{"GanjkHmsSEDFwWxhKzAeugXZ"}
zoneStrings{
{
- "Etc/GMT",
- "그리니치 표준시",
- "GMT",
- "그리니치 표준시",
- "GMT",
- "런던",
- }
- {
"America/Halifax",
"대서양 표준시",
"AST",
diff --git a/icu4c/source/data/locales/ko_KR.txt b/icu4c/source/data/locales/ko_KR.txt
index dc029f8..2bfe5b6 100644
--- a/icu4c/source/data/locales/ko_KR.txt
+++ b/icu4c/source/data/locales/ko_KR.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ko_KR.xml
+// * Source File: ../../../cldr/common/main/ko_KR.xml
// *
// ***************************************************************************
ko_KR{
@@ -13,7 +13,7 @@
"#,##0%",
"#E0",
}
- Version{"1.27"}
+ Version{"1.28"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/kok.txt b/icu4c/source/data/locales/kok.txt
index f763d66..de2f4c0 100644
--- a/icu4c/source/data/locales/kok.txt
+++ b/icu4c/source/data/locales/kok.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/kok.xml
+// * Source File: ../../../cldr/common/main/kok.xml
// *
// ***************************************************************************
/**
@@ -19,7 +19,7 @@
"INR",
}
}
- ExemplarCharacters{"[[:Deva:]]"}
+ ExemplarCharacters{"[ँ-ह़-्ॐ-॔क़-ॣ०-९ॽ]"}
Languages{
aa{"अफार"}
ab{"अबखेज़ियन"}
@@ -165,7 +165,7 @@
LocaleScript{
"Deva",
}
- Version{"1.30"}
+ Version{"1.31"}
calendar{
gregorian{
AmPmMarkers{
@@ -234,14 +234,4 @@
}
}
}
- zoneStrings{
- {
- "Asia/Calcutta",
- "भारतीय समय",
- "IST",
- "भारतीय समय",
- "IST",
- "Calcutta",
- }
- }
}
diff --git a/icu4c/source/data/locales/kok_IN.txt b/icu4c/source/data/locales/kok_IN.txt
index b332a81..96d954e 100644
--- a/icu4c/source/data/locales/kok_IN.txt
+++ b/icu4c/source/data/locales/kok_IN.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/kok_IN.xml
+// * Source File: ../../../cldr/common/main/kok_IN.xml
// *
// ***************************************************************************
kok_IN{
@@ -13,7 +13,7 @@
"#,##,##0%",
"#E0",
}
- Version{"1.30"}
+ Version{"1.31"}
calendar{
gregorian{
DateTimeElements:intvector{
diff --git a/icu4c/source/data/locales/kw.txt b/icu4c/source/data/locales/kw.txt
index e223a99..dc6f7ad 100644
--- a/icu4c/source/data/locales/kw.txt
+++ b/icu4c/source/data/locales/kw.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/kw.xml
+// * Source File: ../../../cldr/common/main/kw.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/locales/kw_GB.txt b/icu4c/source/data/locales/kw_GB.txt
index a42956b..4e43e00 100644
--- a/icu4c/source/data/locales/kw_GB.txt
+++ b/icu4c/source/data/locales/kw_GB.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/kw_GB.xml
+// * Source File: ../../../cldr/common/main/kw_GB.xml
// *
// ***************************************************************************
kw_GB{
diff --git a/icu4c/source/data/locales/lt.txt b/icu4c/source/data/locales/lt.txt
index 18557b8..43e8acd 100644
--- a/icu4c/source/data/locales/lt.txt
+++ b/icu4c/source/data/locales/lt.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/lt.xml
+// * Source File: ../../../cldr/common/main/lt.xml
// *
// ***************************************************************************
/**
@@ -325,7 +325,7 @@
"�",
"+",
}
- Version{"1.37"}
+ Version{"1.41"}
calendar{
gregorian{
DateTimeElements:intvector{
diff --git a/icu4c/source/data/locales/lt_LT.txt b/icu4c/source/data/locales/lt_LT.txt
index 5be1eeb..0ed8eaa 100644
--- a/icu4c/source/data/locales/lt_LT.txt
+++ b/icu4c/source/data/locales/lt_LT.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/lt_LT.xml
+// * Source File: ../../../cldr/common/main/lt_LT.xml
// *
// ***************************************************************************
lt_LT{
@@ -13,5 +13,5 @@
"#,##0%",
"#E0",
}
- Version{"1.27"}
+ Version{"1.29"}
}
diff --git a/icu4c/source/data/locales/lv.txt b/icu4c/source/data/locales/lv.txt
index 94f2b62..7eea8d8 100644
--- a/icu4c/source/data/locales/lv.txt
+++ b/icu4c/source/data/locales/lv.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/lv.xml
+// * Source File: ../../../cldr/common/main/lv.xml
// *
// ***************************************************************************
/**
@@ -305,7 +305,7 @@
"�",
"+",
}
- Version{"1.34"}
+ Version{"1.36"}
calendar{
gregorian{
DateTimeElements:intvector{
diff --git a/icu4c/source/data/locales/lv_LV.txt b/icu4c/source/data/locales/lv_LV.txt
index 12c2cc7..a737b7c 100644
--- a/icu4c/source/data/locales/lv_LV.txt
+++ b/icu4c/source/data/locales/lv_LV.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/lv_LV.xml
+// * Source File: ../../../cldr/common/main/lv_LV.xml
// *
// ***************************************************************************
lv_LV{
@@ -13,5 +13,5 @@
"#,##0%",
"#E0",
}
- Version{"1.25"}
+ Version{"1.26"}
}
diff --git a/icu4c/source/data/locales/mk.txt b/icu4c/source/data/locales/mk.txt
index 3811118..e9903ae 100644
--- a/icu4c/source/data/locales/mk.txt
+++ b/icu4c/source/data/locales/mk.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/mk.xml
+// * Source File: ../../../cldr/common/main/mk.xml
// *
// ***************************************************************************
/**
@@ -1015,7 +1015,7 @@
traditional{"Традиционално"}
}
}
- Version{"1.37"}
+ Version{"1.41"}
calendar{
gregorian{
DateTimeElements:intvector{
@@ -1044,15 +1044,6 @@
"пет.",
"саб.",
}
- narrow{
- "н",
- "п",
- "в",
- "с",
- "ч",
- "п",
- "с",
- }
wide{
"недела",
"понеделник",
@@ -1063,6 +1054,17 @@
"сабота",
}
}
+ stand-alone{
+ narrow{
+ "н",
+ "п",
+ "в",
+ "с",
+ "ч",
+ "п",
+ "с",
+ }
+ }
}
eras{
abbreviated{
@@ -1086,20 +1088,6 @@
"ноем.",
"декем.",
}
- narrow{
- "ј",
- "ф",
- "м",
- "а",
- "м",
- "ј",
- "ј",
- "а",
- "се",
- "о",
- "но",
- "д",
- }
wide{
"јануари",
"февруари",
@@ -1115,6 +1103,22 @@
"декември",
}
}
+ stand-alone{
+ narrow{
+ "ј",
+ "ф",
+ "м",
+ "а",
+ "м",
+ "ј",
+ "ј",
+ "а",
+ "се",
+ "о",
+ "но",
+ "д",
+ }
+ }
}
}
}
diff --git a/icu4c/source/data/locales/mk_MK.txt b/icu4c/source/data/locales/mk_MK.txt
index 4c49d2b..43d9204 100644
--- a/icu4c/source/data/locales/mk_MK.txt
+++ b/icu4c/source/data/locales/mk_MK.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/mk_MK.xml
+// * Source File: ../../../cldr/common/main/mk_MK.xml
// *
// ***************************************************************************
mk_MK{
diff --git a/icu4c/source/data/locales/ml.txt b/icu4c/source/data/locales/ml.txt
index ddb0e3d..a284218 100644
--- a/icu4c/source/data/locales/ml.txt
+++ b/icu4c/source/data/locales/ml.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ml.xml
+// * Source File: ../../../cldr/common/main/ml.xml
// *
// ***************************************************************************
/**
@@ -34,10 +34,7 @@
"�",
"+",
}
- /**
- * Draft
- */
- Version{"1.13"}
+ Version{"1.14"}
calendar{
gregorian{
AmPmMarkers{
diff --git a/icu4c/source/data/locales/ml_IN.txt b/icu4c/source/data/locales/ml_IN.txt
index 5432e39..3137e81 100644
--- a/icu4c/source/data/locales/ml_IN.txt
+++ b/icu4c/source/data/locales/ml_IN.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ml_IN.xml
+// * Source File: ../../../cldr/common/main/ml_IN.xml
// *
// ***************************************************************************
ml_IN{
@@ -13,10 +13,7 @@
"#,##,##0%",
"#E0",
}
- /**
- * Draft
- */
- Version{"1.13"}
+ Version{"1.14"}
calendar{
gregorian{
DateTimeElements:intvector{
diff --git a/icu4c/source/data/locales/mr.txt b/icu4c/source/data/locales/mr.txt
index 5070dc26..dc1a3d3 100644
--- a/icu4c/source/data/locales/mr.txt
+++ b/icu4c/source/data/locales/mr.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/mr.xml
+// * Source File: ../../../cldr/common/main/mr.xml
// *
// ***************************************************************************
/**
@@ -19,7 +19,7 @@
"INR",
}
}
- ExemplarCharacters{"[[:Deva:]-[क़-य़]]"}
+ ExemplarCharacters{"[ँ-ह़-्ॐ-॔ॠ-ॣ०-९ॽ]"}
Languages{
aa{"अफार"}
ab{"अबखेजियन"}
@@ -166,7 +166,7 @@
LocaleScript{
"Deva",
}
- Version{"1.28"}
+ Version{"1.30"}
calendar{
gregorian{
AmPmMarkers{
diff --git a/icu4c/source/data/locales/mr_IN.txt b/icu4c/source/data/locales/mr_IN.txt
index 4a2a4ab..d20e012 100644
--- a/icu4c/source/data/locales/mr_IN.txt
+++ b/icu4c/source/data/locales/mr_IN.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/mr_IN.xml
+// * Source File: ../../../cldr/common/main/mr_IN.xml
// *
// ***************************************************************************
mr_IN{
@@ -13,7 +13,7 @@
"#,##,##0%",
"#E0",
}
- Version{"1.31"}
+ Version{"1.33"}
calendar{
gregorian{
DateTimeElements:intvector{
diff --git a/icu4c/source/data/locales/ms.txt b/icu4c/source/data/locales/ms.txt
index e6c2f9d..5f760a0 100644
--- a/icu4c/source/data/locales/ms.txt
+++ b/icu4c/source/data/locales/ms.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ms.xml
+// * Source File: ../../../cldr/common/main/ms.xml
// *
// ***************************************************************************
/**
@@ -263,7 +263,7 @@
LocaleScript{
"Latn",
}
- Version{"1.27"}
+ Version{"1.29"}
calendar{
gregorian{
DateTimeElements:intvector{
diff --git a/icu4c/source/data/locales/ms_BN.txt b/icu4c/source/data/locales/ms_BN.txt
index c250d59..ce50607 100644
--- a/icu4c/source/data/locales/ms_BN.txt
+++ b/icu4c/source/data/locales/ms_BN.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ms_BN.xml
+// * Source File: ../../../cldr/common/main/ms_BN.xml
// *
// ***************************************************************************
ms_BN{
diff --git a/icu4c/source/data/locales/ms_MY.txt b/icu4c/source/data/locales/ms_MY.txt
index b08b267..2623138 100644
--- a/icu4c/source/data/locales/ms_MY.txt
+++ b/icu4c/source/data/locales/ms_MY.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ms_MY.xml
+// * Source File: ../../../cldr/common/main/ms_MY.xml
// *
// ***************************************************************************
ms_MY{
@@ -13,7 +13,7 @@
"#,##0%",
"#E0",
}
- Version{"1.22"}
+ Version{"1.24"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/mt.txt b/icu4c/source/data/locales/mt.txt
index e2ceaad..1e8224f 100644
--- a/icu4c/source/data/locales/mt.txt
+++ b/icu4c/source/data/locales/mt.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/mt.xml
+// * Source File: ../../../cldr/common/main/mt.xml
// *
// ***************************************************************************
/**
@@ -732,7 +732,7 @@
LocaleScript{
"Latn",
}
- Version{"1.32"}
+ Version{"1.37"}
calendar{
gregorian{
DateTimeElements:intvector{
diff --git a/icu4c/source/data/locales/mt_MT.txt b/icu4c/source/data/locales/mt_MT.txt
index db19d2f..0698f8d 100644
--- a/icu4c/source/data/locales/mt_MT.txt
+++ b/icu4c/source/data/locales/mt_MT.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/mt_MT.xml
+// * Source File: ../../../cldr/common/main/mt_MT.xml
// *
// ***************************************************************************
mt_MT{
diff --git a/icu4c/source/data/locales/nb.txt b/icu4c/source/data/locales/nb.txt
index d4f45af..b6c3fd8 100644
--- a/icu4c/source/data/locales/nb.txt
+++ b/icu4c/source/data/locales/nb.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/nb.xml
+// * Source File: ../../../cldr/common/main/nb.xml
// *
// ***************************************************************************
/**
@@ -1446,12 +1446,6 @@
"�",
"+",
}
- NumberPatterns{
- "#,##0.###",
- "¤ #,##0.00",
- "#,##0 %",
- "#E0",
- }
Scripts{
Arab{"arabisk"}
Armn{"armensk"}
@@ -1531,7 +1525,7 @@
Variants{
REVISED{"Revidert"}
}
- Version{"1.43"}
+ Version{"1.49"}
calendar{
gregorian{
DateTimeElements:intvector{
@@ -1560,15 +1554,6 @@
"fr",
"lø",
}
- narrow{
- "S",
- "M",
- "T",
- "O",
- "T",
- "F",
- "L",
- }
wide{
"søndag",
"mandag",
@@ -1579,6 +1564,17 @@
"lørdag",
}
}
+ stand-alone{
+ narrow{
+ "S",
+ "M",
+ "T",
+ "O",
+ "T",
+ "F",
+ "L",
+ }
+ }
}
eras{
abbreviated{
@@ -1602,20 +1598,6 @@
"nov",
"des",
}
- narrow{
- "J",
- "F",
- "M",
- "A",
- "M",
- "J",
- "J",
- "A",
- "S",
- "O",
- "N",
- "D",
- }
wide{
"januar",
"februar",
@@ -1631,6 +1613,22 @@
"desember",
}
}
+ stand-alone{
+ narrow{
+ "J",
+ "F",
+ "M",
+ "A",
+ "M",
+ "J",
+ "J",
+ "A",
+ "S",
+ "O",
+ "N",
+ "D",
+ }
+ }
}
}
}
diff --git a/icu4c/source/data/locales/nb_NO.txt b/icu4c/source/data/locales/nb_NO.txt
index 127fbae..bb8283c 100644
--- a/icu4c/source/data/locales/nb_NO.txt
+++ b/icu4c/source/data/locales/nb_NO.txt
@@ -3,15 +3,9 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/nb_NO.xml
+// * Source File: ../../../cldr/common/main/nb_NO.xml
// *
// ***************************************************************************
nb_NO{
- NumberPatterns{
- "#,##0.###",
- "#,##0.00 ¤",
- "#,##0 %",
- "#E0",
- }
- Version{"1.25"}
+ Version{"1.27"}
}
diff --git a/icu4c/source/data/locales/nl.txt b/icu4c/source/data/locales/nl.txt
index ee2d801..3cac7f1 100644
--- a/icu4c/source/data/locales/nl.txt
+++ b/icu4c/source/data/locales/nl.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/nl.xml
+// * Source File: ../../../cldr/common/main/nl.xml
// *
// ***************************************************************************
/**
@@ -1524,7 +1524,7 @@
Variants{
REVISED{"Gewijzigd"}
}
- Version{"1.43"}
+ Version{"1.50"}
calendar{
gregorian{
DateTimePatterns{
@@ -1549,15 +1549,6 @@
"vr",
"za",
}
- narrow{
- "Z",
- "M",
- "D",
- "W",
- "D",
- "V",
- "Z",
- }
wide{
"zondag",
"maandag",
@@ -1568,6 +1559,17 @@
"zaterdag",
}
}
+ stand-alone{
+ narrow{
+ "Z",
+ "M",
+ "D",
+ "W",
+ "D",
+ "V",
+ "Z",
+ }
+ }
}
eras{
abbreviated{
@@ -1591,20 +1593,6 @@
"nov",
"dec",
}
- narrow{
- "J",
- "F",
- "M",
- "A",
- "M",
- "J",
- "J",
- "A",
- "S",
- "O",
- "N",
- "D",
- }
wide{
"januari",
"februari",
@@ -1620,6 +1608,22 @@
"december",
}
}
+ stand-alone{
+ narrow{
+ "J",
+ "F",
+ "M",
+ "A",
+ "M",
+ "J",
+ "J",
+ "A",
+ "S",
+ "O",
+ "N",
+ "D",
+ }
+ }
}
}
hebrew{
@@ -1674,14 +1678,6 @@
}
zoneStrings{
{
- "Etc/GMT",
- "Greenwich Mean Time",
- "GMT",
- "Greenwich Mean Time",
- "GMT",
- "Londen",
- }
- {
"America/Halifax",
"Atlantic-standaardtijd",
"AST",
diff --git a/icu4c/source/data/locales/nl_BE.txt b/icu4c/source/data/locales/nl_BE.txt
index 69979af..69c75dd 100644
--- a/icu4c/source/data/locales/nl_BE.txt
+++ b/icu4c/source/data/locales/nl_BE.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/nl_BE.xml
+// * Source File: ../../../cldr/common/main/nl_BE.xml
// *
// ***************************************************************************
nl_BE{
@@ -13,7 +13,7 @@
"#,##0%",
"#E0",
}
- Version{"1.28"}
+ Version{"1.31"}
calendar{
gregorian{
DateTimeElements:intvector{
diff --git a/icu4c/source/data/locales/nl_NL.txt b/icu4c/source/data/locales/nl_NL.txt
index 8c9f295..b6e7e28 100644
--- a/icu4c/source/data/locales/nl_NL.txt
+++ b/icu4c/source/data/locales/nl_NL.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/nl_NL.xml
+// * Source File: ../../../cldr/common/main/nl_NL.xml
// *
// ***************************************************************************
nl_NL{
@@ -13,5 +13,5 @@
"#,##0%",
"#E0",
}
- Version{"1.25"}
+ Version{"1.27"}
}
diff --git a/icu4c/source/data/locales/nn.txt b/icu4c/source/data/locales/nn.txt
index 57cd0f3..e150efc 100644
--- a/icu4c/source/data/locales/nn.txt
+++ b/icu4c/source/data/locales/nn.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/nn.xml
+// * Source File: ../../../cldr/common/main/nn.xml
// *
// ***************************************************************************
/**
@@ -291,7 +291,7 @@
"�",
"+",
}
- Version{"1.36"}
+ Version{"1.41"}
calendar{
gregorian{
DateTimeElements:intvector{
diff --git a/icu4c/source/data/locales/nn_NO.txt b/icu4c/source/data/locales/nn_NO.txt
index ac07fd4..29b2e4d 100644
--- a/icu4c/source/data/locales/nn_NO.txt
+++ b/icu4c/source/data/locales/nn_NO.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/nn_NO.xml
+// * Source File: ../../../cldr/common/main/nn_NO.xml
// *
// ***************************************************************************
nn_NO{
@@ -13,5 +13,5 @@
"#,##0%",
"#E0",
}
- Version{"1.25"}
+ Version{"1.27"}
}
diff --git a/icu4c/source/data/locales/om.txt b/icu4c/source/data/locales/om.txt
index 626c8b7..d986797 100644
--- a/icu4c/source/data/locales/om.txt
+++ b/icu4c/source/data/locales/om.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/om.xml
+// * Source File: ../../../cldr/common/main/om.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/locales/om_ET.txt b/icu4c/source/data/locales/om_ET.txt
index c5f8c11..34ad28c 100644
--- a/icu4c/source/data/locales/om_ET.txt
+++ b/icu4c/source/data/locales/om_ET.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/om_ET.xml
+// * Source File: ../../../cldr/common/main/om_ET.xml
// *
// ***************************************************************************
om_ET{
diff --git a/icu4c/source/data/locales/om_KE.txt b/icu4c/source/data/locales/om_KE.txt
index c972065..3b5eddd 100644
--- a/icu4c/source/data/locales/om_KE.txt
+++ b/icu4c/source/data/locales/om_KE.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/om_KE.xml
+// * Source File: ../../../cldr/common/main/om_KE.xml
// *
// ***************************************************************************
om_KE{
diff --git a/icu4c/source/data/locales/or.txt b/icu4c/source/data/locales/or.txt
index 2594d63..1a3a54a 100644
--- a/icu4c/source/data/locales/or.txt
+++ b/icu4c/source/data/locales/or.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/or.xml
+// * Source File: ../../../cldr/common/main/or.xml
// *
// ***************************************************************************
/**
@@ -34,10 +34,7 @@
"�",
"+",
}
- /**
- * Draft
- */
- Version{"1.12"}
+ Version{"1.13"}
calendar{
gregorian{
dayNames{
diff --git a/icu4c/source/data/locales/or_IN.txt b/icu4c/source/data/locales/or_IN.txt
index 93f6c4c..a49557f 100644
--- a/icu4c/source/data/locales/or_IN.txt
+++ b/icu4c/source/data/locales/or_IN.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/or_IN.xml
+// * Source File: ../../../cldr/common/main/or_IN.xml
// *
// ***************************************************************************
or_IN{
@@ -13,10 +13,7 @@
"#,##,##0%",
"#E0",
}
- /**
- * Draft
- */
- Version{"1.16"}
+ Version{"1.17"}
calendar{
gregorian{
DateTimeElements:intvector{
diff --git a/icu4c/source/data/locales/pa.txt b/icu4c/source/data/locales/pa.txt
index 0f58aa5..4b55e2e 100644
--- a/icu4c/source/data/locales/pa.txt
+++ b/icu4c/source/data/locales/pa.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/pa.xml
+// * Source File: ../../../cldr/common/main/pa.xml
// *
// ***************************************************************************
/**
@@ -19,7 +19,7 @@
"ਰੁਪਿਯ",
}
}
- ExemplarCharacters{"[[:Guru:]]"}
+ ExemplarCharacters{"[ਁ-ਃਅ-ਊਏਐਓ-ਨਪ-ਰਲਲ਼ਵਸ਼ਸਹ਼ਾ-ੂੇੈੋ-੍ਖ਼-ੜਫ਼੦-ੴ]"}
Languages{
pa{"ਪੰਜਾਬੀ"}
}
@@ -46,7 +46,7 @@
"#,##,##0%",
"#E0",
}
- Version{"1.23"}
+ Version{"1.25"}
calendar{
gregorian{
AmPmMarkers{
diff --git a/icu4c/source/data/locales/pa_IN.txt b/icu4c/source/data/locales/pa_IN.txt
index 102a84a..18efa8d 100644
--- a/icu4c/source/data/locales/pa_IN.txt
+++ b/icu4c/source/data/locales/pa_IN.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/pa_IN.xml
+// * Source File: ../../../cldr/common/main/pa_IN.xml
// *
// ***************************************************************************
pa_IN{
@@ -13,7 +13,7 @@
"#,##,##0%",
"#E0",
}
- Version{"1.23"}
+ Version{"1.25"}
calendar{
gregorian{
DateTimeElements:intvector{
diff --git a/icu4c/source/data/locales/pl.txt b/icu4c/source/data/locales/pl.txt
index 2a36888..7c68fe1 100644
--- a/icu4c/source/data/locales/pl.txt
+++ b/icu4c/source/data/locales/pl.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/pl.xml
+// * Source File: ../../../cldr/common/main/pl.xml
// *
// ***************************************************************************
/**
@@ -1294,7 +1294,7 @@
traditional{"tradycyjny"}
}
}
- Version{"1.41"}
+ Version{"1.51"}
calendar{
gregorian{
DateTimeElements:intvector{
@@ -1323,15 +1323,6 @@
"Pt",
"So",
}
- narrow{
- "N",
- "P",
- "W",
- "Ś",
- "C",
- "P",
- "S",
- }
wide{
"niedziela",
"poniedziałek",
@@ -1342,6 +1333,17 @@
"sobota",
}
}
+ stand-alone{
+ narrow{
+ "N",
+ "P",
+ "W",
+ "Ś",
+ "C",
+ "P",
+ "S",
+ }
+ }
}
eras{
abbreviated{
@@ -1424,18 +1426,18 @@
"g",
}
wide{
- "Styczeń",
- "Luty",
- "Marzec",
- "Kwiecień",
- "Maj",
- "Czerwiec",
- "Lipiec",
- "Sierpień",
- "Wrzesień",
- "Październik",
- "Listopad",
- "Grudzień",
+ "styczeń",
+ "luty",
+ "marzec",
+ "kwiecień",
+ "maj",
+ "czerwiec",
+ "lipiec",
+ "sierpień",
+ "wrzesień",
+ "październik",
+ "listopad",
+ "grudzień",
}
}
}
diff --git a/icu4c/source/data/locales/pl_PL.txt b/icu4c/source/data/locales/pl_PL.txt
index 2cd6dd4..21304e7 100644
--- a/icu4c/source/data/locales/pl_PL.txt
+++ b/icu4c/source/data/locales/pl_PL.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/pl_PL.xml
+// * Source File: ../../../cldr/common/main/pl_PL.xml
// *
// ***************************************************************************
pl_PL{
@@ -13,5 +13,5 @@
"#,##0%",
"#E0",
}
- Version{"1.25"}
+ Version{"1.27"}
}
diff --git a/icu4c/source/data/locales/ps.txt b/icu4c/source/data/locales/ps.txt
index 9babf2a..ba2fb0f 100644
--- a/icu4c/source/data/locales/ps.txt
+++ b/icu4c/source/data/locales/ps.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ps.xml
+// * Source File: ../../../cldr/common/main/ps.xml
// *
// ***************************************************************************
/**
diff --git a/icu4c/source/data/locales/ps_AF.txt b/icu4c/source/data/locales/ps_AF.txt
index 9f752ad..21aadca 100644
--- a/icu4c/source/data/locales/ps_AF.txt
+++ b/icu4c/source/data/locales/ps_AF.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ps_AF.xml
+// * Source File: ../../../cldr/common/main/ps_AF.xml
// *
// ***************************************************************************
ps_AF{
diff --git a/icu4c/source/data/locales/pt.txt b/icu4c/source/data/locales/pt.txt
index 80183cc..1d45b06 100644
--- a/icu4c/source/data/locales/pt.txt
+++ b/icu4c/source/data/locales/pt.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/pt.xml
+// * Source File: ../../../cldr/common/main/pt.xml
// *
// ***************************************************************************
/**
@@ -1392,7 +1392,6 @@
grc{"grego, arcaico (até 1453)"}
gu{"guzerate"}
gv{"manx"}
- gwi{"gwichʻin"}
ha{"hauçá"}
hai{"haida"}
haw{"havaiano"}
@@ -1784,7 +1783,7 @@
Variants{
REVISED{"Revisado"}
}
- Version{"1.36"}
+ Version{"1.42"}
calendar{
gregorian{
DateTimeElements:intvector{
@@ -1813,15 +1812,6 @@
"sex",
"sáb",
}
- narrow{
- "D",
- "S",
- "T",
- "Q",
- "Q",
- "S",
- "S",
- }
wide{
"domingo",
"segunda-feira",
@@ -1832,6 +1822,17 @@
"sábado",
}
}
+ stand-alone{
+ narrow{
+ "D",
+ "S",
+ "T",
+ "Q",
+ "Q",
+ "S",
+ "S",
+ }
+ }
}
eras{
abbreviated{
@@ -1855,20 +1856,6 @@
"nov",
"dez",
}
- narrow{
- "J",
- "F",
- "M",
- "A",
- "M",
- "J",
- "J",
- "A",
- "S",
- "O",
- "N",
- "D",
- }
wide{
"janeiro",
"fevereiro",
@@ -1884,19 +1871,27 @@
"dezembro",
}
}
+ stand-alone{
+ narrow{
+ "J",
+ "F",
+ "M",
+ "A",
+ "M",
+ "J",
+ "J",
+ "A",
+ "S",
+ "O",
+ "N",
+ "D",
+ }
+ }
}
}
}
zoneStrings{
{
- "Etc/GMT",
- "Horário do Meridiano de Greenwich",
- "GMT",
- "Horário do Meridiano de Greenwich",
- "GMT",
- "Londres",
- }
- {
"America/Halifax",
"Horário Padrão Atlântico",
"AST",
diff --git a/icu4c/source/data/locales/pt_BR.txt b/icu4c/source/data/locales/pt_BR.txt
index 744d7d7..cac962f 100644
--- a/icu4c/source/data/locales/pt_BR.txt
+++ b/icu4c/source/data/locales/pt_BR.txt
@@ -3,11 +3,11 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/pt_BR.xml
+// * Source File: ../../../cldr/common/main/pt_BR.xml
// *
// ***************************************************************************
pt_BR{
- Version{"1.26"}
+ Version{"1.28"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/pt_PT.txt b/icu4c/source/data/locales/pt_PT.txt
index 89e3aa2..91b5776 100644
--- a/icu4c/source/data/locales/pt_PT.txt
+++ b/icu4c/source/data/locales/pt_PT.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/pt_PT.xml
+// * Source File: ../../../cldr/common/main/pt_PT.xml
// *
// ***************************************************************************
pt_PT{
@@ -90,7 +90,7 @@
"#,##0%",
"#E0",
}
- Version{"1.31"}
+ Version{"1.34"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/resfiles.mk b/icu4c/source/data/locales/resfiles.mk
index 9d260a2..caf559f 100644
--- a/icu4c/source/data/locales/resfiles.mk
+++ b/icu4c/source/data/locales/resfiles.mk
@@ -30,57 +30,57 @@
# All aliases (to not be included under 'installed'), but not including root.
-GENRB_ALIAS_SOURCE = $(GENRB_SYNTHETIC_ALIAS) sh.txt sh_YU.txt sr_YU.txt zh_CN.txt\
- zh_HK.txt zh_MO.txt zh_SG.txt zh_TW.txt
+GENRB_ALIAS_SOURCE = $(GENRB_SYNTHETIC_ALIAS) sh.txt sh_YU.txt sr_Cyrl_YU.txt sr_Latn_YU.txt\
+ sr_YU.txt zh_CN.txt zh_HK.txt zh_MO.txt zh_SG.txt\
+ zh_TW.txt
# Ordinary resources
GENRB_SOURCE = af.txt af_ZA.txt am.txt am_ET.txt\
- ar.txt ar_AE.txt ar_BH.txt ar_DZ.txt ar_EG.txt\
- ar_IN.txt ar_IQ.txt ar_JO.txt ar_KW.txt ar_LB.txt\
- ar_LY.txt ar_MA.txt ar_OM.txt ar_QA.txt ar_SA.txt\
- ar_SD.txt ar_SY.txt ar_TN.txt ar_YE.txt be.txt\
- be_BY.txt bg.txt bg_BG.txt bn.txt bn_IN.txt\
- ca.txt ca_ES.txt cs.txt cs_CZ.txt cy.txt\
- cy_GB.txt da.txt da_DK.txt de.txt de_AT.txt\
- de_BE.txt de_CH.txt de_DE.txt de_LU.txt el.txt\
- el_GR.txt en.txt en_AU.txt en_BE.txt en_BW.txt\
- en_CA.txt en_GB.txt en_HK.txt en_IE.txt en_IN.txt\
- en_MT.txt en_NZ.txt en_PH.txt en_PK.txt en_SG.txt\
- en_US.txt en_US_POSIX.txt en_VI.txt en_ZA.txt en_ZW.txt\
- eo.txt es.txt es_AR.txt es_BO.txt es_CL.txt\
- es_CO.txt es_CR.txt es_DO.txt es_EC.txt es_ES.txt\
- es_GT.txt es_HN.txt es_MX.txt es_NI.txt es_PA.txt\
- es_PE.txt es_PR.txt es_PY.txt es_SV.txt es_US.txt\
- es_UY.txt es_VE.txt et.txt et_EE.txt eu.txt\
- eu_ES.txt fa.txt fa_AF.txt fa_IR.txt fi.txt\
- fi_FI.txt fo.txt fo_FO.txt fr.txt fr_BE.txt\
- fr_CA.txt fr_CH.txt fr_FR.txt fr_LU.txt ga.txt\
- ga_IE.txt gl.txt gl_ES.txt gu.txt gu_IN.txt\
- gv.txt gv_GB.txt he.txt he_IL.txt hi.txt\
- hi_IN.txt hr.txt hr_HR.txt hu.txt hu_HU.txt\
- hy.txt hy_AM.txt hy_AM_REVISED.txt id.txt id_ID.txt\
- is.txt is_IS.txt it.txt it_CH.txt it_IT.txt\
- ja.txt ja_JP.txt kk.txt kk_KZ.txt kl.txt\
- kl_GL.txt kn.txt kn_IN.txt ko.txt ko_KR.txt\
- kok.txt kok_IN.txt kw.txt kw_GB.txt lt.txt\
- lt_LT.txt lv.txt lv_LV.txt mk.txt mk_MK.txt\
- ml.txt ml_IN.txt mr.txt mr_IN.txt ms.txt\
- ms_BN.txt ms_MY.txt mt.txt mt_MT.txt nb.txt\
- nb_NO.txt nl.txt nl_BE.txt nl_NL.txt nn.txt\
- nn_NO.txt om.txt om_ET.txt om_KE.txt or.txt\
- or_IN.txt pa.txt pa_IN.txt pl.txt pl_PL.txt\
- ps.txt ps_AF.txt pt.txt pt_BR.txt pt_PT.txt\
- ro.txt ro_RO.txt ru.txt ru_RU.txt ru_UA.txt\
- sk.txt sk_SK.txt sl.txt sl_SI.txt so.txt\
- so_DJ.txt so_ET.txt so_KE.txt so_SO.txt sq.txt\
- sq_AL.txt sr.txt sr_Cyrl.txt sr_Cyrl_YU.txt sr_Latn.txt\
- sr_Latn_YU.txt sv.txt sv_FI.txt sv_SE.txt sw.txt\
- sw_KE.txt sw_TZ.txt ta.txt ta_IN.txt te.txt\
- te_IN.txt th.txt th_TH.txt ti.txt ti_ER.txt\
- ti_ET.txt tr.txt tr_TR.txt uk.txt uk_UA.txt\
- vi.txt vi_VN.txt zh.txt zh_Hans.txt zh_Hans_CN.txt\
- zh_Hans_SG.txt zh_Hant.txt zh_Hant_HK.txt zh_Hant_MO.txt zh_Hant_TW.txt
+ ar.txt ar_AE.txt ar_BH.txt ar_DZ.txt ar_IN.txt\
+ ar_IQ.txt ar_JO.txt ar_KW.txt ar_LB.txt ar_LY.txt\
+ ar_MA.txt ar_OM.txt ar_QA.txt ar_SA.txt ar_SD.txt\
+ ar_SY.txt ar_TN.txt ar_YE.txt be.txt be_BY.txt\
+ bg.txt bg_BG.txt bn.txt bn_IN.txt ca.txt\
+ ca_ES.txt cs.txt cs_CZ.txt cy.txt cy_GB.txt\
+ da.txt da_DK.txt de.txt de_AT.txt de_BE.txt\
+ de_CH.txt de_DE.txt de_LU.txt el.txt el_GR.txt\
+ en.txt en_AU.txt en_BE.txt en_BW.txt en_CA.txt\
+ en_GB.txt en_HK.txt en_IE.txt en_IN.txt en_MT.txt\
+ en_NZ.txt en_PH.txt en_PK.txt en_SG.txt en_US.txt\
+ en_US_POSIX.txt en_VI.txt en_ZA.txt en_ZW.txt eo.txt\
+ es.txt es_AR.txt es_BO.txt es_CL.txt es_CO.txt\
+ es_CR.txt es_DO.txt es_EC.txt es_ES.txt es_GT.txt\
+ es_HN.txt es_MX.txt es_NI.txt es_PA.txt es_PE.txt\
+ es_PR.txt es_PY.txt es_SV.txt es_US.txt es_UY.txt\
+ es_VE.txt et.txt et_EE.txt eu.txt eu_ES.txt\
+ fa.txt fa_AF.txt fa_IR.txt fi.txt fi_FI.txt\
+ fo.txt fo_FO.txt fr.txt fr_BE.txt fr_CA.txt\
+ fr_CH.txt fr_FR.txt fr_LU.txt ga.txt ga_IE.txt\
+ gl.txt gl_ES.txt gu.txt gu_IN.txt gv.txt\
+ gv_GB.txt he.txt he_IL.txt hi.txt hi_IN.txt\
+ hr.txt hu.txt hu_HU.txt hy.txt hy_AM.txt\
+ hy_AM_REVISED.txt id.txt id_ID.txt is.txt is_IS.txt\
+ it.txt it_CH.txt it_IT.txt ja.txt ja_JP.txt\
+ kk.txt kk_KZ.txt kl.txt kl_GL.txt kn.txt\
+ kn_IN.txt ko.txt ko_KR.txt kok.txt kok_IN.txt\
+ kw.txt kw_GB.txt lt.txt lt_LT.txt lv.txt\
+ lv_LV.txt mk.txt mk_MK.txt ml.txt ml_IN.txt\
+ mr.txt mr_IN.txt ms.txt ms_BN.txt ms_MY.txt\
+ mt.txt mt_MT.txt nb.txt nb_NO.txt nl.txt\
+ nl_BE.txt nl_NL.txt nn.txt nn_NO.txt om.txt\
+ om_ET.txt om_KE.txt or.txt or_IN.txt pa.txt\
+ pa_IN.txt pl.txt pl_PL.txt ps.txt ps_AF.txt\
+ pt.txt pt_BR.txt pt_PT.txt ro.txt ro_RO.txt\
+ ru.txt ru_RU.txt ru_UA.txt sk.txt sk_SK.txt\
+ sl.txt so.txt so_DJ.txt so_ET.txt so_KE.txt\
+ so_SO.txt sq.txt sq_AL.txt sr.txt sr_Latn.txt\
+ sv.txt sv_FI.txt sv_SE.txt sw.txt sw_KE.txt\
+ sw_TZ.txt ta.txt ta_IN.txt te.txt te_IN.txt\
+ th.txt th_TH.txt ti.txt ti_ER.txt ti_ET.txt\
+ tr.txt tr_TR.txt uk.txt uk_UA.txt vi.txt\
+ vi_VN.txt zh.txt zh_Hans.txt zh_Hans_CN.txt zh_Hans_SG.txt\
+ zh_Hant.txt zh_Hant_HK.txt zh_Hant_MO.txt zh_Hant_TW.txt
diff --git a/icu4c/source/data/locales/ro.txt b/icu4c/source/data/locales/ro.txt
index a83549c..ca25d58 100644
--- a/icu4c/source/data/locales/ro.txt
+++ b/icu4c/source/data/locales/ro.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ro.xml
+// * Source File: ../../../cldr/common/main/ro.xml
// *
// ***************************************************************************
/**
@@ -321,7 +321,7 @@
"�",
"+",
}
- Version{"1.40"}
+ Version{"1.44"}
calendar{
gregorian{
DateTimeElements:intvector{
diff --git a/icu4c/source/data/locales/ro_RO.txt b/icu4c/source/data/locales/ro_RO.txt
index fc867de..c0a66bf 100644
--- a/icu4c/source/data/locales/ro_RO.txt
+++ b/icu4c/source/data/locales/ro_RO.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ro_RO.xml
+// * Source File: ../../../cldr/common/main/ro_RO.xml
// *
// ***************************************************************************
ro_RO{
@@ -13,5 +13,5 @@
"#,##0%",
"#E0",
}
- Version{"1.25"}
+ Version{"1.27"}
}
diff --git a/icu4c/source/data/locales/root.txt b/icu4c/source/data/locales/root.txt
index 68e6254..dc5467f 100644
--- a/icu4c/source/data/locales/root.txt
+++ b/icu4c/source/data/locales/root.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/root.xml
+// * Source File: ../../../cldr/common/main/root.xml
// *
// ***************************************************************************
/**
@@ -65,7 +65,7 @@
297,
210,
}
- Version{"1.41"}
+ Version{"1.47"}
boundaries{
grapheme{"char"}
line{"line"}
@@ -143,7 +143,7 @@
"7",
}
default{"wide"}
- narrow{
+ wide{
"1",
"2",
"3",
@@ -152,7 +152,9 @@
"6",
"7",
}
- wide{
+ }
+ stand-alone{
+ narrow{
"1",
"2",
"3",
@@ -187,7 +189,7 @@
"12",
}
default{"wide"}
- narrow{
+ wide{
"1",
"2",
"3",
@@ -201,7 +203,9 @@
"11",
"12",
}
- wide{
+ }
+ stand-alone{
+ narrow{
"1",
"2",
"3",
@@ -535,6 +539,14 @@
}
}
}
+ persian{
+ monthNames{
+ default{"format"}
+ format{
+ default{"wide"}
+ }
+ }
+ }
}
localPatternChars{"GyMdkHmsSEDFwWahKzYeugAZ"}
zoneStrings{
diff --git a/icu4c/source/data/locales/ru.txt b/icu4c/source/data/locales/ru.txt
index f059566..5a90325 100644
--- a/icu4c/source/data/locales/ru.txt
+++ b/icu4c/source/data/locales/ru.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ru.xml
+// * Source File: ../../../cldr/common/main/ru.xml
// *
// ***************************************************************************
/**
@@ -443,6 +443,10 @@
"FRF",
"Французский франк",
}
+ GBP{
+ "£",
+ "GBP",
+ }
GEK{
"GEK",
"Грузинский купон",
@@ -499,6 +503,10 @@
"JD",
"Иорданский динар",
}
+ JPY{
+ "¥",
+ "JPY",
+ }
KES{
"K Sh",
"Кенийский шиллинг",
@@ -812,369 +820,383 @@
"Доллар Зимбабве",
}
}
- ExemplarCharacters{"[а-я ё і ѣ ѳ ѵ]"}
+ ExemplarCharacters{"[а-я ё і]"}
Keys{
calendar{"Календарь"}
collation{"Сортировка"}
currency{"Валюта"}
}
Languages{
- aa{"Афар"}
- ab{"Абхазский"}
- ace{"Ачехский"}
- ach{"Ачоли"}
- ada{"Адангме"}
- ady{"Адыгейский"}
- af{"Африкаанс"}
- afa{"Афразийские (другие)"}
- afh{"Африхили"}
- akk{"Аккадский"}
- ale{"Алеутский"}
- alg{"Алгонкинские языки"}
- am{"Амхарский"}
- ang{"Староанглийский"}
- ar{"Арабский"}
- arc{"Арамейский"}
- art{"Искусственные (другие)"}
- arw{"Аравакский"}
- as{"Ассамский"}
- ath{"Атапачские языки"}
- awa{"Авадхи"}
- ay{"Аямара"}
- az{"Азербайджанский"}
- ba{"Башкирский"}
- bad{"Банда"}
- bai{"Бамилеке языки"}
- bal{"Белуджский"}
- ban{"Балийский"}
- bas{"Баса"}
- bat{"Балтийские (другие)"}
- be{"Белорусский"}
- bej{"Беджа"}
- bem{"Бемба"}
- bg{"Болгарский"}
- bh{"Бихарский"}
- bho{"Бходжпури"}
- bi{"Бислама"}
- bik{"Бикольский"}
- bin{"Бини"}
- bla{"Сиксика"}
- bn{"Бенгальский"}
- bnt{"Банту (другие)"}
- bo{"Тибетский"}
- br{"Бретонский"}
- bra{"Брауи"}
- bua{"Бурятский"}
- bug{"Бугийский"}
- ca{"Каталанский"}
- cad{"Каддо"}
- cai{"Центральной Америки индейцев (другие)"}
- car{"Кариб"}
- cau{"Кавказские (другие)"}
- chb{"Чибча"}
- chg{"Чагатайский"}
- chk{"Чукотский"}
- chm{"Марийский (Черемисский)"}
- chn{"Чинук жаргон"}
- cho{"Чоктав"}
- chr{"Чероки"}
- chy{"Чейенн"}
- co{"Корсиканский"}
- cop{"Коптский"}
- cpe{"Англо-креольские и пиджины (другие)"}
- cpf{"Франко-креольские и пиджины (другие)"}
- crp{"Креольские и пиджины (другие)"}
- cs{"Чешский"}
- cus{"Кушитские (другие)"}
- cv{"Чувашский"}
- cy{"Валлийский"}
- da{"Датский"}
- dak{"Дакота"}
- de{"Немецкий"}
- del{"Делаварский"}
- din{"Динка"}
- doi{"Догри"}
- dra{"Дравидийские (другие)"}
- dua{"Дуала"}
- dum{"Нидерландский средневековый"}
- dyu{"Диула (Дьюла)"}
- dz{"Бутанский"}
- efi{"Эфик"}
- egy{"Древнеегипетский"}
- eka{"Экаджук"}
- el{"Греческий"}
- elx{"Эламский"}
- en{"Английский"}
- enm{"Среднеанглийский"}
- eo{"Эсперанто"}
- es{"Испанский"}
- et{"Эстонский"}
- eu{"Баскский"}
- ewo{"Эвондо"}
- fa{"Персидский"}
- fan{"Фанг"}
- fat{"Фанти"}
- fi{"Финский"}
- fiu{"Финно-угорские (другие)"}
- fj{"Фиджи"}
- fo{"Фарерский"}
- fon{"Фон"}
- fr{"Французский"}
- frm{"Среднефранцузский"}
- fro{"Старофранцузский"}
- fy{"Фризский"}
- ga{"Ирландский"}
- gaa{"Га"}
- gay{"Гайо"}
- gd{"Гаэльский"}
- gem{"Германские (другие)"}
- gez{"Геэз"}
- gil{"Гильбертский"}
- gl{"Галицийский"}
- gmh{"Средневерхненемецкий"}
- gn{"Гуарани"}
- goh{"Староверхненемецкий"}
- gon{"Гонди"}
- got{"Готский"}
- grc{"Древнегреческий"}
- gu{"Гуярати"}
- ha{"Хоса"}
- hai{"Хайда"}
- haw{"Гавайский"}
- he{"Иврит"}
- hi{"Хинди"}
- hil{"Хилигайнон"}
- him{"Химачали"}
- hr{"Хорватский"}
- hu{"Венгерский"}
- hy{"Армянский"}
- ia{"Смешанный язык"}
- iba{"Ибанский"}
- id{"Индонезийский"}
- ie{"Смешанный язык"}
- ijo{"Иджо"}
- ik{"Инапиак"}
- ilo{"Илоко"}
- inc{"Индийские (другие)"}
- ira{"Иранские (другие)"}
- iro{"Ирокезские языки"}
- is{"Исландский"}
- it{"Итальянский"}
- iu{"Инактитут"}
- ja{"Японский"}
- jpr{"Еврейско-персидский"}
- jrb{"Еврейско-арабский"}
- jv{"Яванский"}
- ka{"Грузинский"}
- kaa{"Каракалпакский"}
- kab{"Кабильский"}
- kam{"Камба"}
- kar{"Каренский"}
- kaw{"Кави"}
- kha{"Кхаси"}
- khi{"Койсанские (другие)"}
- kho{"Хотанский"}
- kk{"Казахский"}
- kl{"Гренландский"}
- km{"Камбоджийский"}
- kn{"Канада"}
- ko{"Корейский"}
- kok{"Конкани"}
- kpe{"Кпелле"}
- kro{"Кру"}
- ks{"Кашмирский"}
- ku{"Курдиш"}
- kum{"Кумыкский"}
- kut{"Кутенаи"}
- ky{"Киргизский"}
- la{"Латинский"}
- lad{"Ладино"}
- lah{"Лахнда"}
- lam{"Ламба"}
- lez{"Лезгинский"}
- ln{"Лингала"}
- lo{"Лаосский"}
- lol{"Монго"}
- loz{"Лози"}
- lt{"Литовский"}
- lu{"Луба-Катанга"}
- lui{"Луисеньо"}
- lun{"Лунда"}
- luo{"Луо (Кения и Танзания)"}
- lv{"Латвийский"}
- mad{"Мадурский"}
- mag{"Магахи"}
- mai{"Майтхили"}
- mak{"Макассарский"}
- man{"Мандинго"}
- map{"Австронезийские (другие)"}
- mas{"Масаи"}
- men{"Менде"}
- mg{"Малагасийский"}
- mga{"Среднеирландский"}
- mi{"Маори"}
- mic{"Микмак"}
- min{"Минангкабау"}
- mis{"Смешанные (другие)"}
- mk{"Македонский"}
- mkh{"Монкхмерские (другие)"}
- ml{"Малаялам"}
- mn{"Монгольский"}
- mni{"Манипурский"}
- mno{"Манобо языки"}
- mo{"Молдавский"}
- moh{"Мохаук"}
- mos{"Моей"}
- mr{"Маратийский"}
- ms{"Малайский"}
- mt{"Мальтийский"}
- mul{"Разных семей языки"}
- mun{"Мунда языки"}
- mus{"Крик"}
- mwr{"Марвари"}
- my{"Бирманский"}
- myn{"Майя языки"}
- na{"Науру"}
- nah{"Ацтекский"}
- nai{"Северной Америки индейцев (другие)"}
- ne{"Непальский"}
- new{"Неварский"}
- nic{"Нигер-кордофанские (другие)"}
- niu{"Ниуэ"}
- nl{"Голландский"}
- no{"Норвежский"}
- nog{"Ногайский"}
- non{"Старонорвежский"}
- nso{"Сото Северный"}
- nub{"Нубийские языки"}
- nym{"Ньямвези"}
- nyn{"Ньянколе"}
- nyo{"Ньоро"}
- nzi{"Нзима"}
- oc{"Окитан"}
- oj{"Оджибва"}
- om{"Оромо (Афан)"}
- or{"Ория"}
- os{"Осетинский"}
- osa{"Оседжи"}
- ota{"Старотурецкий"}
- oto{"Отомангские языки"}
- pa{"Панджабский"}
- paa{"Папуасско-австралийские (другие)"}
- pag{"Пангасинан"}
- pal{"Пехлевийский"}
- pam{"Пампанга"}
- pap{"Папьяменто"}
- pau{"Палау"}
- peo{"Староперсидский"}
- phn{"Финикийский"}
- pi{"Пали"}
- pl{"Польский"}
- pon{"Понапе"}
- pra{"Пракриты языки"}
- pro{"Старопровансальский"}
- ps{"Пашто (Пушто)"}
- pt{"Португальский"}
- qu{"Кечуа"}
- raj{"Раджастхани"}
- rm{"Раето-романский"}
- rn{"Кирундийский"}
- ro{"Румынский"}
- roa{"Романские (другие)"}
- rom{"Цыганский"}
- ru{"Русский"}
- rw{"Кинярванда"}
- sa{"Санскрит"}
- sad{"Сандаве"}
- sah{"Якутский"}
- sai{"Южной Америки индейцев (другие)"}
- sal{"Салишские языки"}
- sam{"Самаритянский арамейский"}
- sd{"Синди"}
- sel{"Селькупский"}
- sem{"Семитские (другие)"}
- sg{"Санго"}
- sga{"Староирландский"}
- sh{"Сербско-хорватский"}
- shn{"Шанский"}
- si{"Сингальский"}
- sid{"Сидама"}
- sio{"Сиу языки"}
- sit{"Синотибетские (другие)"}
- sk{"Словацкий"}
- sl{"Словенский"}
- sla{"Славянские (другие)"}
- sm{"Самоа"}
- smi{"Саамские языки"}
- sn{"Шона"}
- so{"Сомали"}
- sog{"Согдийский"}
- sq{"Албанский"}
- sr{"Сербский"}
- ss{"Сисвати"}
- ssa{"Нило-сахарские (другие)"}
- st{"Сесото"}
- su{"Санданизский"}
- suk{"Сукума"}
- sus{"Сусу"}
- sux{"Шумерский"}
- sv{"Шведский"}
- sw{"Суахили"}
- ta{"Тамильский"}
- tai{"Татский"}
- te{"Телугу"}
- ter{"Терено"}
- tg{"Таджикский"}
- th{"Тайский"}
- ti{"Тигриниа"}
- tig{"Тигре"}
- tiv{"Тиви"}
- tk{"Туркменский"}
- tl{"Тагалог"}
- tli{"Тлингит"}
- tmh{"Тамашек"}
- tn{"Сетсвана"}
- to{"Тонга"}
- tog{"Тонга (Ньяса)"}
- tr{"Турецкий"}
- ts{"Тсонга"}
- tsi{"Цимшиан"}
- tt{"Татарский"}
- tut{"Алтайские (другие)"}
- tw{"Тви"}
- tyv{"Тувинский"}
- ug{"Уйгурский"}
- uga{"Угаритский"}
- uk{"Украинский"}
- umb{"Умбунду"}
- und{"Неидентифицированный"}
- ur{"Урду"}
- uz{"Узбекский"}
- vai{"Ваи"}
- vi{"Вьетнамский"}
- vo{"Волапак"}
- vot{"Удмуртский (Вотяцкий)"}
- wak{"Вакашские языки"}
- wal{"Воламо"}
- war{"Варай"}
- was{"Вашо"}
- wen{"Лужицкие языки"}
- wo{"Волоф"}
- xh{"Хоза"}
- yao{"Яо"}
- yap{"Яп"}
- yi{"Идиш"}
- yo{"Йоруба"}
- za{"Зуанг"}
- zap{"Сапотекский"}
- zen{"Зенагский"}
- zh{"Китайский"}
- zu{"Зулусский"}
- zun{"Зуньи"}
+ aa{"афар"}
+ ab{"абхазский"}
+ ace{"ачехский"}
+ ach{"ачоли"}
+ ada{"адангме"}
+ ady{"адыгейский"}
+ af{"африкаанс"}
+ afa{"афразийские (другие)"}
+ afh{"африхили"}
+ akk{"аккадский"}
+ ale{"алеутский"}
+ alg{"алгонкинские языки"}
+ am{"амхарский"}
+ ang{"староанглийский"}
+ ar{"арабский"}
+ arc{"арамейский"}
+ art{"искусственные (другие)"}
+ arw{"аравакский"}
+ as{"ассамский"}
+ ath{"атапачские языки"}
+ awa{"авадхи"}
+ ay{"аямара"}
+ az{"азербайджанский"}
+ ba{"башкирский"}
+ bad{"банда"}
+ bai{"бамилеке языки"}
+ bal{"белуджский"}
+ ban{"балийский"}
+ bas{"баса"}
+ bat{"балтийские (другие)"}
+ be{"белорусский"}
+ bej{"беджа"}
+ bem{"бемба"}
+ bg{"болгарский"}
+ bh{"бихарский"}
+ bho{"бходжпури"}
+ bi{"бислама"}
+ bik{"бикольский"}
+ bin{"бини"}
+ bla{"сиксика"}
+ bn{"бенгальский"}
+ bnt{"банту (другие)"}
+ bo{"тибетский"}
+ br{"бретонский"}
+ bra{"брауи"}
+ bua{"бурятский"}
+ bug{"бугийский"}
+ ca{"каталанский"}
+ cad{"каддо"}
+ cai{"центральной Америки индейцев (другие)"}
+ car{"кариб"}
+ cau{"кавказские (другие)"}
+ chb{"чибча"}
+ chg{"чагатайский"}
+ chk{"чукотский"}
+ chm{"марийский (Черемисский)"}
+ chn{"чинук жаргон"}
+ cho{"чоктав"}
+ chr{"чероки"}
+ chy{"чейенн"}
+ co{"корсиканский"}
+ cop{"коптский"}
+ cpe{"англо-креольские и пиджины (другие)"}
+ cpf{"франко-креольские и пиджины (другие)"}
+ crp{"креольские и пиджины (другие)"}
+ cs{"чешский"}
+ cus{"кушитские (другие)"}
+ cv{"чувашский"}
+ cy{"валлийский"}
+ da{"датский"}
+ dak{"дакота"}
+ de{"немецкий"}
+ del{"делаварский"}
+ din{"динка"}
+ doi{"догри"}
+ dra{"дравидийские (другие)"}
+ dua{"дуала"}
+ dum{"нидерландский средневековый"}
+ dyu{"диула (дьюла)"}
+ dz{"бутанский"}
+ efi{"эфик"}
+ egy{"древнеегипетский"}
+ eka{"экаджук"}
+ el{"греческий"}
+ elx{"эламский"}
+ en{"английский"}
+ enm{"среднеанглийский"}
+ eo{"эсперанто"}
+ es{"испанский"}
+ et{"эстонский"}
+ eu{"баскский"}
+ ewo{"эвондо"}
+ fa{"персидский"}
+ fan{"фанг"}
+ fat{"фанти"}
+ fi{"финский"}
+ fiu{"финно-угорские (другие)"}
+ fj{"фиджи"}
+ fo{"фарерский"}
+ fon{"фон"}
+ fr{"французский"}
+ frm{"среднефранцузский"}
+ fro{"старофранцузский"}
+ fy{"фризский"}
+ ga{"ирландский"}
+ gaa{"га"}
+ gay{"гайо"}
+ gd{"гаэльский"}
+ gem{"германские (другие)"}
+ gez{"геэз"}
+ gil{"гильбертский"}
+ gl{"галицийский"}
+ gmh{"средневерхненемецкий"}
+ gn{"гуарани"}
+ goh{"староверхненемецкий"}
+ gon{"гонди"}
+ got{"готский"}
+ grc{"древнегреческий"}
+ gu{"гуярати"}
+ ha{"хоса"}
+ hai{"хайда"}
+ haw{"гавайский"}
+ he{"иврит"}
+ hi{"хинди"}
+ hil{"хилигайнон"}
+ him{"химачали"}
+ hr{"хорватский"}
+ hu{"венгерский"}
+ hy{"армянский"}
+ ia{"смешанный язык"}
+ iba{"ибанский"}
+ id{"индонезийский"}
+ ie{"смешанный язык"}
+ ijo{"иджо"}
+ ik{"инапиак"}
+ ilo{"илоко"}
+ inc{"индийские (другие)"}
+ ira{"иранские (другие)"}
+ iro{"ирокезские языки"}
+ is{"исландский"}
+ it{"итальянский"}
+ iu{"инактитут"}
+ ja{"японский"}
+ jpr{"еврейско-персидский"}
+ jrb{"еврейско-арабский"}
+ jv{"яванский"}
+ ka{"грузинский"}
+ kaa{"каракалпакский"}
+ kab{"кабильский"}
+ kam{"камба"}
+ kar{"каренский"}
+ kaw{"кави"}
+ kha{"кхаси"}
+ khi{"койсанские (другие)"}
+ kho{"хотанский"}
+ kk{"казахский"}
+ kl{"гренландский"}
+ km{"камбоджийский"}
+ kn{"канада"}
+ ko{"корейский"}
+ kok{"конкани"}
+ kpe{"кпелле"}
+ kro{"кру"}
+ ks{"кашмирский"}
+ ku{"курдиш"}
+ kum{"кумыкский"}
+ kut{"кутенаи"}
+ ky{"киргизский"}
+ la{"латинский"}
+ lad{"ладино"}
+ lah{"лахнда"}
+ lam{"ламба"}
+ lez{"лезгинский"}
+ ln{"лингала"}
+ lo{"лаосский"}
+ lol{"монго"}
+ loz{"лози"}
+ lt{"литовский"}
+ lu{"луба-Катанга"}
+ lui{"луисеньо"}
+ lun{"лунда"}
+ luo{"луо (Кения и Танзания)"}
+ lv{"латвийский"}
+ mad{"мадурский"}
+ mag{"магахи"}
+ mai{"майтхили"}
+ mak{"макассарский"}
+ man{"мандинго"}
+ map{"австронезийские (другие)"}
+ mas{"масаи"}
+ men{"менде"}
+ mg{"малагасийский"}
+ mga{"среднеирландский"}
+ mi{"маори"}
+ mic{"микмак"}
+ min{"минангкабау"}
+ mis{"смешанные (другие)"}
+ mk{"македонский"}
+ mkh{"монкхмерские (другие)"}
+ ml{"малаялам"}
+ mn{"монгольский"}
+ mni{"манипурский"}
+ mno{"манобо языки"}
+ mo{"молдавский"}
+ moh{"мохаук"}
+ mos{"моей"}
+ mr{"маратийский"}
+ ms{"малайский"}
+ mt{"мальтийский"}
+ mul{"разных семей языки"}
+ mun{"мунда языки"}
+ mus{"крик"}
+ mwr{"марвари"}
+ my{"бирманский"}
+ myn{"майя языки"}
+ na{"науру"}
+ nah{"ацтекский"}
+ nai{"северной Америки индейцев (другие)"}
+ ne{"непальский"}
+ new{"неварский"}
+ nic{"нигер-кордофанские (другие)"}
+ niu{"ниуэ"}
+ nl{"голландский"}
+ no{"норвежский"}
+ nog{"ногайский"}
+ non{"старонорвежский"}
+ nso{"сото северный"}
+ nub{"нубийские языки"}
+ nym{"ньямвези"}
+ nyn{"ньянколе"}
+ nyo{"ньоро"}
+ nzi{"нзима"}
+ oc{"окитан"}
+ oj{"оджибва"}
+ om{"оромо (Афан)"}
+ or{"ория"}
+ os{"осетинский"}
+ osa{"оседжи"}
+ ota{"старотурецкий"}
+ oto{"отомангские языки"}
+ pa{"панджабский"}
+ paa{"папуасско-австралийские (другие)"}
+ pag{"пангасинан"}
+ pal{"пехлевийский"}
+ pam{"пампанга"}
+ pap{"папьяменто"}
+ pau{"палау"}
+ peo{"староперсидский"}
+ phn{"финикийский"}
+ pi{"пали"}
+ pl{"польский"}
+ pon{"понапе"}
+ pra{"пракриты языки"}
+ pro{"старопровансальский"}
+ ps{"пашто (пушто)"}
+ pt{"португальский"}
+ qu{"кечуа"}
+ raj{"раджастхани"}
+ rm{"раето-романский"}
+ rn{"кирундийский"}
+ ro{"румынский"}
+ roa{"романские (другие)"}
+ rom{"цыганский"}
+ ru{"русский"}
+ rw{"кинярванда"}
+ sa{"санскрит"}
+ sad{"сандаве"}
+ sah{"якутский"}
+ sai{"южной америки индейцев (другие)"}
+ sal{"салишские языки"}
+ sam{"самаритянский арамейский"}
+ sd{"синди"}
+ sel{"селькупский"}
+ sem{"семитские (другие)"}
+ sg{"санго"}
+ sga{"староирландский"}
+ sh{"сербско-хорватский"}
+ shn{"шанский"}
+ si{"сингальский"}
+ sid{"сидама"}
+ sio{"сиу языки"}
+ sit{"синотибетские (другие)"}
+ sk{"словацкий"}
+ sl{"словенский"}
+ sla{"славянские (другие)"}
+ sm{"самоа"}
+ smi{"саамские языки"}
+ sn{"шона"}
+ so{"сомали"}
+ sog{"согдийский"}
+ sq{"албанский"}
+ sr{"сербский"}
+ ss{"сисвати"}
+ ssa{"нило-сахарские (другие)"}
+ st{"сесото"}
+ su{"санданизский"}
+ suk{"сукума"}
+ sus{"сусу"}
+ sux{"шумерский"}
+ sv{"шведский"}
+ sw{"суахили"}
+ ta{"тамильский"}
+ tai{"татский"}
+ te{"телугу"}
+ ter{"терено"}
+ tg{"таджикский"}
+ th{"тайский"}
+ ti{"тигриниа"}
+ tig{"тигре"}
+ tiv{"тиви"}
+ tk{"туркменский"}
+ tl{"тагалог"}
+ tli{"тлингит"}
+ tmh{"тамашек"}
+ tn{"сетсвана"}
+ to{"тонга"}
+ tog{"тонга (ньяса)"}
+ tr{"турецкий"}
+ ts{"тсонга"}
+ tsi{"цимшиан"}
+ tt{"татарский"}
+ tut{"алтайские (другие)"}
+ tw{"тви"}
+ tyv{"тувинский"}
+ ug{"уйгурский"}
+ uga{"угаритский"}
+ uk{"украинский"}
+ umb{"умбунду"}
+ und{"неидентифицированный"}
+ ur{"урду"}
+ uz{"узбекский"}
+ vai{"ваи"}
+ vi{"вьетнамский"}
+ vo{"волапак"}
+ vot{"удмуртский (Вотяцкий)"}
+ wak{"вакашские языки"}
+ wal{"воламо"}
+ war{"варай"}
+ was{"вашо"}
+ wen{"лужицкие языки"}
+ wo{"волоф"}
+ xh{"хоза"}
+ yao{"яо"}
+ yap{"яп"}
+ yi{"идиш"}
+ yo{"йоруба"}
+ za{"зуанг"}
+ zap{"сапотекский"}
+ zen{"зенагский"}
+ zh{"китайский"}
+ zu{"зулусский"}
+ zun{"зуньи"}
}
LocaleScript{
"Cyrl",
}
+ NumberElements{
+ ",",
+ " ",
+ ";",
+ "%",
+ "0",
+ "#",
+ "-",
+ "E",
+ "‰",
+ "∞",
+ "�",
+ "+",
+ }
Scripts{
Arab{"Арабская"}
Armn{"Армянская"}
@@ -1240,7 +1262,7 @@
japanese{"Японский календарь"}
}
}
- Version{"1.43"}
+ Version{"1.55"}
calendar{
gregorian{
DateTimeElements:intvector{
@@ -1269,15 +1291,6 @@
"Пт",
"Сб",
}
- narrow{
- "В",
- "П",
- "В",
- "С",
- "Ч",
- "П",
- "С",
- }
wide{
"воскресенье",
"понедельник",
@@ -1288,6 +1301,17 @@
"суббота",
}
}
+ stand-alone{
+ narrow{
+ "В",
+ "П",
+ "В",
+ "С",
+ "Ч",
+ "П",
+ "С",
+ }
+ }
}
eras{
abbreviated{
diff --git a/icu4c/source/data/locales/ru_RU.txt b/icu4c/source/data/locales/ru_RU.txt
index 0d5e2b8..624e868 100644
--- a/icu4c/source/data/locales/ru_RU.txt
+++ b/icu4c/source/data/locales/ru_RU.txt
@@ -3,29 +3,15 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ru_RU.xml
+// * Source File: ../../../cldr/common/main/ru_RU.xml
// *
// ***************************************************************************
ru_RU{
- NumberElements{
- ",",
- " ",
- ";",
- "%",
- "0",
- "#",
- "-",
- "E",
- "‰",
- "∞",
- "�",
- "+",
- }
NumberPatterns{
"#,##0.###",
"#,##0.00¤",
"#,##0%",
"#E0",
}
- Version{"1.26"}
+ Version{"1.29"}
}
diff --git a/icu4c/source/data/locales/ru_UA.txt b/icu4c/source/data/locales/ru_UA.txt
index 837c75a..7e7071b 100644
--- a/icu4c/source/data/locales/ru_UA.txt
+++ b/icu4c/source/data/locales/ru_UA.txt
@@ -3,31 +3,17 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ru_UA.xml
+// * Source File: ../../../cldr/common/main/ru_UA.xml
// *
// ***************************************************************************
ru_UA{
- NumberElements{
- ",",
- " ",
- ";",
- "%",
- "0",
- "#",
- "-",
- "E",
- "‰",
- "∞",
- "�",
- "+",
- }
NumberPatterns{
"#,##0.###",
"#,##0.00 ¤",
"#,##0%",
"#E0",
}
- Version{"1.25"}
+ Version{"1.26"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/sh.txt b/icu4c/source/data/locales/sh.txt
index b3e9255..987405e 100644
--- a/icu4c/source/data/locales/sh.txt
+++ b/icu4c/source/data/locales/sh.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/sh.xml
+// * Source File: ../../../cldr/common/main/sh.xml
// *
// ***************************************************************************
sh{
diff --git a/icu4c/source/data/locales/sh_YU.txt b/icu4c/source/data/locales/sh_YU.txt
index 464c548..d63f265 100644
--- a/icu4c/source/data/locales/sh_YU.txt
+++ b/icu4c/source/data/locales/sh_YU.txt
@@ -3,9 +3,9 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/sh_YU.xml
+// * Source File: ../../../cldr/common/main/sh_YU.xml
// *
// ***************************************************************************
sh_YU{
- "%%ALIAS"{"sr_Latn_YU"}
+ "%%ALIAS"{"sr_Latn_CS"}
}
diff --git a/icu4c/source/data/locales/sk.txt b/icu4c/source/data/locales/sk.txt
index d5aab94..4873a93 100644
--- a/icu4c/source/data/locales/sk.txt
+++ b/icu4c/source/data/locales/sk.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/sk.xml
+// * Source File: ../../../cldr/common/main/sk.xml
// *
// ***************************************************************************
/**
@@ -1276,7 +1276,7 @@
traditional{"Tradičné"}
}
}
- Version{"1.36"}
+ Version{"1.41"}
calendar{
gregorian{
DateTimeElements:intvector{
@@ -1305,15 +1305,6 @@
"Pi",
"So",
}
- narrow{
- "N",
- "P",
- "U",
- "S",
- "Š",
- "P",
- "S",
- }
wide{
"Nedeľa",
"Pondelok",
@@ -1324,6 +1315,17 @@
"Sobota",
}
}
+ stand-alone{
+ narrow{
+ "N",
+ "P",
+ "U",
+ "S",
+ "Š",
+ "P",
+ "S",
+ }
+ }
}
eras{
abbreviated{
@@ -1347,20 +1349,6 @@
"nov",
"dec",
}
- narrow{
- "j",
- "f",
- "m",
- "a",
- "m",
- "j",
- "j",
- "a",
- "s",
- "o",
- "n",
- "d",
- }
wide{
"január",
"február",
@@ -1376,6 +1364,22 @@
"december",
}
}
+ stand-alone{
+ narrow{
+ "j",
+ "f",
+ "m",
+ "a",
+ "m",
+ "j",
+ "j",
+ "a",
+ "s",
+ "o",
+ "n",
+ "d",
+ }
+ }
}
}
}
diff --git a/icu4c/source/data/locales/sk_SK.txt b/icu4c/source/data/locales/sk_SK.txt
index dd57f33..9ba1705 100644
--- a/icu4c/source/data/locales/sk_SK.txt
+++ b/icu4c/source/data/locales/sk_SK.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/sk_SK.xml
+// * Source File: ../../../cldr/common/main/sk_SK.xml
// *
// ***************************************************************************
sk_SK{
@@ -13,5 +13,5 @@
"#,##0%",
"#E0",
}
- Version{"1.25"}
+ Version{"1.26"}
}
diff --git a/icu4c/source/data/locales/sl.txt b/icu4c/source/data/locales/sl.txt
index 5d63563..6885265 100644
--- a/icu4c/source/data/locales/sl.txt
+++ b/icu4c/source/data/locales/sl.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/sl.xml
+// * Source File: ../../../cldr/common/main/sl.xml
// *
// ***************************************************************************
/**
@@ -349,7 +349,7 @@
traditional{"Tradicionano zlaganje"}
}
}
- Version{"1.41"}
+ Version{"1.45"}
calendar{
gregorian{
DateTimeElements:intvector{
@@ -378,15 +378,6 @@
"pet",
"sob",
}
- narrow{
- "n",
- "p",
- "t",
- "s",
- "č",
- "p",
- "s",
- }
wide{
"nedelja",
"ponedeljek",
@@ -397,6 +388,17 @@
"sobota",
}
}
+ stand-alone{
+ narrow{
+ "n",
+ "p",
+ "t",
+ "s",
+ "č",
+ "p",
+ "s",
+ }
+ }
}
eras{
abbreviated{
@@ -420,20 +422,6 @@
"nov",
"dec",
}
- narrow{
- "j",
- "f",
- "m",
- "a",
- "m",
- "j",
- "j",
- "a",
- "s",
- "o",
- "n",
- "d",
- }
wide{
"januar",
"februar",
@@ -449,6 +437,22 @@
"december",
}
}
+ stand-alone{
+ narrow{
+ "j",
+ "f",
+ "m",
+ "a",
+ "m",
+ "j",
+ "j",
+ "a",
+ "s",
+ "o",
+ "n",
+ "d",
+ }
+ }
}
}
}
diff --git a/icu4c/source/data/locales/sl_SI.txt b/icu4c/source/data/locales/sl_SI.txt
deleted file mode 100644
index 5d16503..0000000
--- a/icu4c/source/data/locales/sl_SI.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-// ***************************************************************************
-// *
-// * Copyright (C) 2005 International Business Machines
-// * Corporation and others. All Rights Reserved.
-// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/sl_SI.xml
-// *
-// ***************************************************************************
-sl_SI{
- NumberPatterns{
- "#,##0.###",
- "#,##0.00 ¤",
- "#,##0%",
- "#E0",
- }
- Version{"1.28"}
-}
diff --git a/icu4c/source/data/locales/so.txt b/icu4c/source/data/locales/so.txt
index 927ce23..e5eb6f2 100644
--- a/icu4c/source/data/locales/so.txt
+++ b/icu4c/source/data/locales/so.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/so.xml
+// * Source File: ../../../cldr/common/main/so.xml
// *
// ***************************************************************************
/**
@@ -45,7 +45,6 @@
HU{"Hangeri"}
ID{"Indoneesiya"}
IE{"Ayrlaanda"}
- IL{"Israa'iil"}
IN{"Hindiya"}
IQ{"Ciraaq"}
IR{"Iiraan"}
@@ -125,7 +124,7 @@
LocaleScript{
"Latn",
}
- Version{"1.28"}
+ Version{"1.29"}
calendar{
gregorian{
AmPmMarkers{
diff --git a/icu4c/source/data/locales/so_DJ.txt b/icu4c/source/data/locales/so_DJ.txt
index a76e281..8d3206a 100644
--- a/icu4c/source/data/locales/so_DJ.txt
+++ b/icu4c/source/data/locales/so_DJ.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/so_DJ.xml
+// * Source File: ../../../cldr/common/main/so_DJ.xml
// *
// ***************************************************************************
so_DJ{
diff --git a/icu4c/source/data/locales/so_ET.txt b/icu4c/source/data/locales/so_ET.txt
index 975c444..4b89817 100644
--- a/icu4c/source/data/locales/so_ET.txt
+++ b/icu4c/source/data/locales/so_ET.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/so_ET.xml
+// * Source File: ../../../cldr/common/main/so_ET.xml
// *
// ***************************************************************************
so_ET{
diff --git a/icu4c/source/data/locales/so_KE.txt b/icu4c/source/data/locales/so_KE.txt
index 8750741..5306d66 100644
--- a/icu4c/source/data/locales/so_KE.txt
+++ b/icu4c/source/data/locales/so_KE.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/so_KE.xml
+// * Source File: ../../../cldr/common/main/so_KE.xml
// *
// ***************************************************************************
so_KE{
diff --git a/icu4c/source/data/locales/so_SO.txt b/icu4c/source/data/locales/so_SO.txt
index 0c5405b..b1969d0 100644
--- a/icu4c/source/data/locales/so_SO.txt
+++ b/icu4c/source/data/locales/so_SO.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/so_SO.xml
+// * Source File: ../../../cldr/common/main/so_SO.xml
// *
// ***************************************************************************
so_SO{
diff --git a/icu4c/source/data/locales/sq.txt b/icu4c/source/data/locales/sq.txt
index 1260c96..3acb8cd 100644
--- a/icu4c/source/data/locales/sq.txt
+++ b/icu4c/source/data/locales/sq.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/sq.xml
+// * Source File: ../../../cldr/common/main/sq.xml
// *
// ***************************************************************************
/**
@@ -210,7 +210,7 @@
"�",
"+",
}
- Version{"1.34"}
+ Version{"1.38"}
calendar{
gregorian{
AmPmMarkers{
diff --git a/icu4c/source/data/locales/sq_AL.txt b/icu4c/source/data/locales/sq_AL.txt
index 8f8d92b..c755edd 100644
--- a/icu4c/source/data/locales/sq_AL.txt
+++ b/icu4c/source/data/locales/sq_AL.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/sq_AL.xml
+// * Source File: ../../../cldr/common/main/sq_AL.xml
// *
// ***************************************************************************
sq_AL{
diff --git a/icu4c/source/data/locales/sr.txt b/icu4c/source/data/locales/sr.txt
index 8cd5645..a124c2b 100644
--- a/icu4c/source/data/locales/sr.txt
+++ b/icu4c/source/data/locales/sr.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/sr.xml
+// * Source File: ../../../cldr/common/main/sr.xml
// *
// ***************************************************************************
/**
@@ -240,7 +240,6 @@
WS{"Самоа"}
YE{"Јемен"}
YT{"Мајоте"}
- YU{"Југославија"}
ZA{"Јужна Африка"}
ZM{"Замбија"}
ZW{"Зимбабве"}
@@ -490,7 +489,7 @@
traditional{"Традиционално сортирање"}
}
}
- Version{"1.43"}
+ Version{"1.47"}
calendar{
gregorian{
DateTimeElements:intvector{
@@ -519,15 +518,6 @@
"пет",
"суб",
}
- narrow{
- "н",
- "п",
- "у",
- "с",
- "ч",
- "п",
- "с",
- }
wide{
"недеља",
"понедељак",
@@ -538,6 +528,17 @@
"субота",
}
}
+ stand-alone{
+ narrow{
+ "н",
+ "п",
+ "у",
+ "с",
+ "ч",
+ "п",
+ "с",
+ }
+ }
}
eras{
abbreviated{
@@ -561,20 +562,6 @@
"нов",
"дец",
}
- narrow{
- "ј",
- "ф",
- "м",
- "а",
- "м",
- "ј",
- "ј",
- "а",
- "с",
- "о",
- "н",
- "д",
- }
wide{
"јануар",
"фебруар",
@@ -590,6 +577,22 @@
"децембар",
}
}
+ stand-alone{
+ narrow{
+ "ј",
+ "ф",
+ "м",
+ "а",
+ "м",
+ "ј",
+ "ј",
+ "а",
+ "с",
+ "о",
+ "н",
+ "д",
+ }
+ }
}
}
}
diff --git a/icu4c/source/data/locales/sr_Cyrl_YU.txt b/icu4c/source/data/locales/sr_Cyrl_YU.txt
index 97e6302..4f9e017 100644
--- a/icu4c/source/data/locales/sr_Cyrl_YU.txt
+++ b/icu4c/source/data/locales/sr_Cyrl_YU.txt
@@ -3,9 +3,9 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/sr_Cyrl_YU.xml
+// * Source File: ../../../cldr/common/main/sr_Cyrl_YU.xml
// *
// ***************************************************************************
sr_Cyrl_YU{
- Version{"1.9"}
+ "%%ALIAS"{"sr_Cyrl_CS"}
}
diff --git a/icu4c/source/data/locales/sr_Latn.txt b/icu4c/source/data/locales/sr_Latn.txt
index e4bac85..7322233 100644
--- a/icu4c/source/data/locales/sr_Latn.txt
+++ b/icu4c/source/data/locales/sr_Latn.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/sr_Latn.xml
+// * Source File: ../../../cldr/common/main/sr_Latn.xml
// *
// ***************************************************************************
/**
@@ -79,7 +79,7 @@
ET{"Etiopija"}
FI{"Finska"}
FJ{"Fidži"}
- FK{"Folklendska Ostrva"}
+ FK{"Folklandska Ostrva"}
FM{"Mikronezija"}
FO{"Farska Ostrva"}
FR{"Francuska"}
@@ -120,7 +120,7 @@
JO{"Jordan"}
JP{"Japan"}
KE{"Kenija"}
- KG{"Kirgistan"}
+ KG{"Kirgizstan"}
KH{"Kambodža"}
KI{"Kiribati"}
KM{"Komorska Ostrva"}
@@ -134,7 +134,7 @@
LB{"Liban"}
LC{"Sent Lucija"}
LI{"Lihtenštajn"}
- LK{"Šrilanka"}
+ LK{"Šri Lanka"}
LR{"Liberija"}
LS{"Lesoto"}
LT{"Litvanija"}
@@ -154,7 +154,7 @@
MP{"Severna Marijanska Ostrva"}
MQ{"Martinik"}
MR{"Mauritanija"}
- MS{"Montserrat"}
+ MS{"Monserat"}
MT{"Malta"}
MU{"Mauricius"}
MV{"Maldivi"}
@@ -195,14 +195,14 @@
RU{"Rusija"}
RW{"Ruanda"}
SA{"Saudijska Arabija"}
- SB{"Solomon Islands"}
+ SB{"Solomonska Ostrva"}
SC{"Sejšeli"}
SD{"Sudan"}
SE{"Švedska"}
SG{"Singapur"}
- SH{"Saint Helena"}
+ SH{"Sveta Jelena"}
SI{"Slovenija"}
- SJ{"Svalbard i Jan Majen"}
+ SJ{"Svalbard i Janmajen Ostrva"}
SK{"Slovačka"}
SL{"Sijera Leone"}
SM{"San Marino"}
@@ -242,22 +242,142 @@
VI{"S.A.D. Devičanska Ostrva"}
VN{"Vijetnam"}
VU{"Vanuatu"}
- WF{"Valis i Futuna"}
+ WF{"Valis i Futuna Ostrva"}
WS{"Samoa"}
YE{"Jemen"}
- YT{"Mayotte"}
- YU{"Jugoslavija"}
+ YT{"Majote"}
ZA{"Južna Afrika"}
ZM{"Zambija"}
ZW{"Zimbabve"}
}
Currencies{
+ ATS{
+ "ATS",
+ "Austrijski šiling",
+ }
+ AUD{
+ "$A",
+ "Australijski dolar",
+ }
+ BAM{
+ "KM",
+ "Konvertibilna marka",
+ }
+ BEF{
+ "BF",
+ "Belgijski franak",
+ }
+ CAD{
+ "Can$",
+ "Kanadski dolar",
+ }
+ CHF{
+ "SwF",
+ "Švajcarski franak",
+ }
+ DEM{
+ "DEM",
+ "Nemačka marka",
+ }
+ DKK{
+ "DKr",
+ "Danska kruna",
+ }
+ ESP{
+ "ESP",
+ "Španska pezeta",
+ }
+ EUR{
+ "€",
+ "EVRO",
+ }
+ FIM{
+ "FIM",
+ "Finska marka",
+ }
+ FRF{
+ "FRF",
+ "Francuski franak",
+ }
+ GBP{
+ "£",
+ "Funta sterlinga",
+ }
+ GRD{
+ "GRD",
+ "Drahma",
+ }
+ HRD{
+ "HRD",
+ "Hrvatski dinar",
+ }
+ HRK{
+ "HRK",
+ "Kuna",
+ }
+ IEP{
+ "IR£",
+ "Irska funta",
+ }
+ ITL{
+ "₤",
+ "Italijanska lira",
+ }
+ JPY{
+ "¥",
+ "Jen",
+ }
+ KWD{
+ "KD",
+ "Kuvajtski dinar",
+ }
+ LUF{
+ "LUF",
+ "Luksemburški franak",
+ }
+ NLG{
+ "NLG",
+ "Holandski gulden",
+ }
+ NOK{
+ "NKr",
+ "Norveška kruna",
+ }
+ PTE{
+ "PTE",
+ "Portugalski eskudo",
+ }
+ RUB{
+ "RUB",
+ "Ruska rublja",
+ }
+ RUR{
+ "RUR",
+ "Ruska rublja (1991-1998)",
+ }
+ SEK{
+ "SKr",
+ "Švedska kruna",
+ }
+ SIT{
+ "SIT",
+ "Tolar",
+ }
+ USD{
+ "US$",
+ "Američki dolar",
+ }
YUN{
"Din",
"YUN",
}
}
ExemplarCharacters{"[a-p r-v z đ ć č ž š {lj} {nj} {dž}]"}
+ Keys{
+ calendar{"Kalendar"}
+ collation{"Sortiranje"}
+ currency{"Valuta"}
+ }
Languages{
af{"Afrikanerski"}
ar{"Arapski"}
@@ -271,6 +391,7 @@
de{"Nemački"}
el{"Grčki"}
en{"Engleski"}
+ eo{"Esperanto"}
es{"Španski"}
et{"Estonski"}
eu{"Baskijski"}
@@ -305,6 +426,7 @@
rm{"Reto-Romanski"}
ro{"Rumunski"}
ru{"Ruski"}
+ sa{"Sanskrit"}
sh{"Srpsko-Hrvatski"}
sk{"Slovački"}
sl{"Slovenački"}
@@ -313,7 +435,7 @@
sv{"Švedski"}
sw{"Svahili"}
tr{"Turski"}
- uk{"Ukrajnski"}
+ uk{"Ukrajinski"}
vi{"Vijetnamski"}
yi{"Jidiš"}
zh{"Kineski"}
@@ -341,9 +463,31 @@
Kana{"Katakana"}
Latn{"Latinica"}
}
- Version{"1.22"}
+ Types{
+ calendar{
+ buddhist{"Budistički kalendar"}
+ chinese{"Kineski kalendar"}
+ gregorian{"Gregorijanski kalendar"}
+ hebrew{"Hebrejski kalendar"}
+ islamic{"Islamski kalendar"}
+ islamic-civil{"Islamski civilni kalendar"}
+ japanese{"Japanski kalendar"}
+ }
+ collation{
+ direct{"Direktno sortiranje"}
+ phonebook{"Sortiranje po azbuci"}
+ pinyin{"Pinjin sortiranje"}
+ stroke{"Sortiranje po broju crta"}
+ traditional{"Tradicionalno sortiranje"}
+ }
+ }
+ Version{"1.27"}
calendar{
gregorian{
+ DateTimeElements:intvector{
+ 2,
+ 1,
+ }
DateTimePatterns{
"HH.mm.ss z",
"HH.mm.ss z",
@@ -366,15 +510,6 @@
"pet",
"sub",
}
- narrow{
- "n",
- "p",
- "u",
- "s",
- "č",
- "p",
- "s",
- }
wide{
"nedelja",
"ponedeljak",
@@ -385,6 +520,17 @@
"subota",
}
}
+ stand-alone{
+ narrow{
+ "n",
+ "p",
+ "u",
+ "s",
+ "č",
+ "p",
+ "s",
+ }
+ }
}
eras{
abbreviated{
@@ -408,20 +554,6 @@
"nov",
"dec",
}
- narrow{
- "j",
- "f",
- "m",
- "a",
- "m",
- "j",
- "j",
- "a",
- "s",
- "o",
- "n",
- "d",
- }
wide{
"januar",
"februar",
@@ -437,6 +569,22 @@
"decembar",
}
}
+ stand-alone{
+ narrow{
+ "j",
+ "f",
+ "m",
+ "a",
+ "m",
+ "j",
+ "j",
+ "a",
+ "s",
+ "o",
+ "n",
+ "d",
+ }
+ }
}
}
}
diff --git a/icu4c/source/data/locales/sr_Latn_YU.txt b/icu4c/source/data/locales/sr_Latn_YU.txt
index e9455bf..1b57618 100644
--- a/icu4c/source/data/locales/sr_Latn_YU.txt
+++ b/icu4c/source/data/locales/sr_Latn_YU.txt
@@ -3,9 +3,9 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/sr_Latn_YU.xml
+// * Source File: ../../../cldr/common/main/sr_Latn_YU.xml
// *
// ***************************************************************************
sr_Latn_YU{
- Version{"1.8"}
+ "%%ALIAS"{"sr_Latn_CS"}
}
diff --git a/icu4c/source/data/locales/sr_YU.txt b/icu4c/source/data/locales/sr_YU.txt
index da9f2b7..7aac359 100644
--- a/icu4c/source/data/locales/sr_YU.txt
+++ b/icu4c/source/data/locales/sr_YU.txt
@@ -3,9 +3,9 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/sr_YU.xml
+// * Source File: ../../../cldr/common/main/sr_YU.xml
// *
// ***************************************************************************
sr_YU{
- "%%ALIAS"{"sr_Cyrl_YU"}
+ "%%ALIAS"{"sr_Cyrl_CS"}
}
diff --git a/icu4c/source/data/locales/sv.txt b/icu4c/source/data/locales/sv.txt
index 5122cf0..a539895 100644
--- a/icu4c/source/data/locales/sv.txt
+++ b/icu4c/source/data/locales/sv.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/sv.xml
+// * Source File: ../../../cldr/common/main/sv.xml
// *
// ***************************************************************************
/**
@@ -1351,7 +1351,6 @@
grc{"forngrekiska (till 1453)"}
gu{"gujarati"}
gv{"manx gaeliska"}
- gwi{"gwichʻin"}
ha{"haussa"}
hai{"haida"}
haw{"hawaiiska"}
@@ -1754,7 +1753,7 @@
Variants{
REVISED{"Reviderad"}
}
- Version{"1.44"}
+ Version{"1.54"}
calendar{
gregorian{
AmPmMarkers{
@@ -1787,15 +1786,6 @@
"fr",
"lö",
}
- narrow{
- "S",
- "M",
- "T",
- "O",
- "T",
- "F",
- "L",
- }
wide{
"söndag",
"måndag",
@@ -1806,6 +1796,17 @@
"lördag",
}
}
+ stand-alone{
+ narrow{
+ "S",
+ "M",
+ "T",
+ "O",
+ "T",
+ "F",
+ "L",
+ }
+ }
}
eras{
abbreviated{
@@ -1829,20 +1830,6 @@
"nov",
"dec",
}
- narrow{
- "J",
- "F",
- "M",
- "A",
- "M",
- "J",
- "J",
- "A",
- "S",
- "O",
- "N",
- "D",
- }
wide{
"januari",
"februari",
@@ -1858,19 +1845,27 @@
"december",
}
}
+ stand-alone{
+ narrow{
+ "J",
+ "F",
+ "M",
+ "A",
+ "M",
+ "J",
+ "J",
+ "A",
+ "S",
+ "O",
+ "N",
+ "D",
+ }
+ }
}
}
}
zoneStrings{
{
- "Etc/GMT",
- "Greenwichtid",
- "GMT",
- "Greenwichtid",
- "GMT",
- "London",
- }
- {
"America/Halifax",
"Atlantic, normaltid",
"AST",
diff --git a/icu4c/source/data/locales/sv_FI.txt b/icu4c/source/data/locales/sv_FI.txt
index 8aba85c..1f12a9f 100644
--- a/icu4c/source/data/locales/sv_FI.txt
+++ b/icu4c/source/data/locales/sv_FI.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/sv_FI.xml
+// * Source File: ../../../cldr/common/main/sv_FI.xml
// *
// ***************************************************************************
sv_FI{
@@ -13,5 +13,5 @@
"#,##0%",
"#E0",
}
- Version{"1.25"}
+ Version{"1.27"}
}
diff --git a/icu4c/source/data/locales/sv_SE.txt b/icu4c/source/data/locales/sv_SE.txt
index 5c320d7..02fa5f2 100644
--- a/icu4c/source/data/locales/sv_SE.txt
+++ b/icu4c/source/data/locales/sv_SE.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/sv_SE.xml
+// * Source File: ../../../cldr/common/main/sv_SE.xml
// *
// ***************************************************************************
sv_SE{
@@ -13,5 +13,5 @@
"#,##0 %",
"#E0",
}
- Version{"1.27"}
+ Version{"1.30"}
}
diff --git a/icu4c/source/data/locales/sw.txt b/icu4c/source/data/locales/sw.txt
index 1e69c0f..c99cb68 100644
--- a/icu4c/source/data/locales/sw.txt
+++ b/icu4c/source/data/locales/sw.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/sw.xml
+// * Source File: ../../../cldr/common/main/sw.xml
// *
// ***************************************************************************
/**
@@ -107,7 +107,7 @@
LocaleScript{
"Latn",
}
- Version{"1.28"}
+ Version{"1.31"}
calendar{
gregorian{
DateTimeElements:intvector{
diff --git a/icu4c/source/data/locales/sw_KE.txt b/icu4c/source/data/locales/sw_KE.txt
index 1c3c9f7..6b424ff 100644
--- a/icu4c/source/data/locales/sw_KE.txt
+++ b/icu4c/source/data/locales/sw_KE.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/sw_KE.xml
+// * Source File: ../../../cldr/common/main/sw_KE.xml
// *
// ***************************************************************************
sw_KE{
diff --git a/icu4c/source/data/locales/sw_TZ.txt b/icu4c/source/data/locales/sw_TZ.txt
index 3cfb63d..bfa491f 100644
--- a/icu4c/source/data/locales/sw_TZ.txt
+++ b/icu4c/source/data/locales/sw_TZ.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/sw_TZ.xml
+// * Source File: ../../../cldr/common/main/sw_TZ.xml
// *
// ***************************************************************************
sw_TZ{
@@ -13,5 +13,13 @@
"#,##0%",
"#E0",
}
- Version{"1.28"}
+ Version{"1.30"}
+ calendar{
+ gregorian{
+ DateTimeElements:intvector{
+ 2,
+ 1,
+ }
+ }
+ }
}
diff --git a/icu4c/source/data/locales/ta.txt b/icu4c/source/data/locales/ta.txt
index 9c779e4..c9d8dcd 100644
--- a/icu4c/source/data/locales/ta.txt
+++ b/icu4c/source/data/locales/ta.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ta.xml
+// * Source File: ../../../cldr/common/main/ta.xml
// *
// ***************************************************************************
/**
@@ -183,7 +183,7 @@
"INR",
}
}
- ExemplarCharacters{"[[:Taml:]]"}
+ ExemplarCharacters{"[ஂஃஅ-ஊஎ-ஐஒ-கஙசஜஞடணதந-பம-ஹா-ூெ-ைொ-்ௗ௦-௺]"}
Languages{
aa{"அபார்"}
ab{"அப்காஸின்"}
@@ -336,7 +336,7 @@
"#,##,##0%",
"#E0",
}
- Version{"1.32"}
+ Version{"1.34"}
calendar{
gregorian{
AmPmMarkers{
diff --git a/icu4c/source/data/locales/ta_IN.txt b/icu4c/source/data/locales/ta_IN.txt
index 469aa64..c4b2185 100644
--- a/icu4c/source/data/locales/ta_IN.txt
+++ b/icu4c/source/data/locales/ta_IN.txt
@@ -3,11 +3,11 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ta_IN.xml
+// * Source File: ../../../cldr/common/main/ta_IN.xml
// *
// ***************************************************************************
ta_IN{
- Version{"1.32"}
+ Version{"1.34"}
calendar{
gregorian{
DateTimeElements:intvector{
diff --git a/icu4c/source/data/locales/te.txt b/icu4c/source/data/locales/te.txt
index 8bf01f0..89a450b 100644
--- a/icu4c/source/data/locales/te.txt
+++ b/icu4c/source/data/locales/te.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/te.xml
+// * Source File: ../../../cldr/common/main/te.xml
// *
// ***************************************************************************
/**
@@ -11,7 +11,7 @@
*/
te{
Countries{
- IN{"భారత దేళం"}
+ IN{"భారత దేళ౦"}
}
Currencies{
EUR{
@@ -35,7 +35,7 @@
"USD",
}
}
- ExemplarCharacters{"[[:Telu:]]"}
+ ExemplarCharacters{"[ఁ-ఃఅ-ఌఎ-ఐఒ-నప-ళవ-హా-ౄె-ైొ-్ౕౖౠౡ౦-౯]"}
Languages{
te{"తెలుగు"}
}
@@ -56,7 +56,7 @@
"�",
"+",
}
- Version{"1.32"}
+ Version{"1.36"}
calendar{
gregorian{
AmPmMarkers{
diff --git a/icu4c/source/data/locales/te_IN.txt b/icu4c/source/data/locales/te_IN.txt
index c3a04f7..f4983cf 100644
--- a/icu4c/source/data/locales/te_IN.txt
+++ b/icu4c/source/data/locales/te_IN.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/te_IN.xml
+// * Source File: ../../../cldr/common/main/te_IN.xml
// *
// ***************************************************************************
te_IN{
@@ -13,7 +13,7 @@
"#,##,##0%",
"#E0",
}
- Version{"1.31"}
+ Version{"1.33"}
calendar{
gregorian{
DateTimeElements:intvector{
diff --git a/icu4c/source/data/locales/th.txt b/icu4c/source/data/locales/th.txt
index 75ed13e..6e7941e 100644
--- a/icu4c/source/data/locales/th.txt
+++ b/icu4c/source/data/locales/th.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/th.xml
+// * Source File: ../../../cldr/common/main/th.xml
// *
// ***************************************************************************
/**
@@ -218,32 +218,16 @@
ZW{"ซิมบาบเว"}
}
Currencies{
- EUR{
- "\u20AC",
- "EUR",
- }
- GBP{
- "\u00A3",
- "GBP",
- }
INR{
"=0#Rs.|1#Re.|1<Rs.",
"INR",
}
- JPY{
- "\u00A5",
- "JPY",
- }
THB{
"฿",
"บาท",
}
- USD{
- "US$",
- "USD",
- }
}
- ExemplarCharacters{"[ก-ฺเ-๎]"}
+ ExemplarCharacters{"[ก-ฺเ-๎]"}
Languages{
aa{"อาฟา"}
ab{"แอบกาเซีย"}
@@ -388,7 +372,7 @@
LocaleScript{
"Thai",
}
- Version{"1.41"}
+ Version{"1.47"}
boundaries{
line{"line_th"}
word{"word_th"}
diff --git a/icu4c/source/data/locales/th_TH.txt b/icu4c/source/data/locales/th_TH.txt
index a68f865..def3453 100644
--- a/icu4c/source/data/locales/th_TH.txt
+++ b/icu4c/source/data/locales/th_TH.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/th_TH.xml
+// * Source File: ../../../cldr/common/main/th_TH.xml
// *
// ***************************************************************************
th_TH{
@@ -13,5 +13,5 @@
"#,##0%",
"#E0",
}
- Version{"1.24"}
+ Version{"1.25"}
}
diff --git a/icu4c/source/data/locales/ti.txt b/icu4c/source/data/locales/ti.txt
index f01becc..20b330d 100644
--- a/icu4c/source/data/locales/ti.txt
+++ b/icu4c/source/data/locales/ti.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ti.xml
+// * Source File: ../../../cldr/common/main/ti.xml
// *
// ***************************************************************************
/**
@@ -11,12 +11,33 @@
*/
ti{
Countries:alias{"am"}
- ExemplarCharacters{"[:Ethi:]"}
+ Currencies{
+ EUR{
+ "€",
+ "EUR",
+ }
+ GBP{
+ "£",
+ "GBP",
+ }
+ INR{
+ "=0#Rs.|1#Re.|1<Rs.",
+ "INR",
+ }
+ JPY{
+ "¥",
+ "JPY",
+ }
+ }
+ ExemplarCharacters{
+ "[ሀ-ቈቊ-ቍቐ-ቖቘቚ-ቝበ-ኈኊ-ኍነ-ኰኲ-ኵኸ-ኾዀዂ-ዅወ-ዖዘ-ጐጒ-ጕጘ-ፚ፟-፼ᎀ-᎙ⶀ-ⶖⶠ-ⶦⶨ-ⶮⶰ-ⶶⶸ-ⶾⷀ-ⷆⷈ-ⷎⷐ-ⷖⷘ"
+ "-ⷞ]"
+ }
Languages:alias{"am"}
LocaleScript{
"Ethi",
}
- Version{"1.28"}
+ Version{"1.31"}
calendar{
gregorian{
AmPmMarkers{
diff --git a/icu4c/source/data/locales/ti_ER.txt b/icu4c/source/data/locales/ti_ER.txt
index 3d022e2..f3ba8b3 100644
--- a/icu4c/source/data/locales/ti_ER.txt
+++ b/icu4c/source/data/locales/ti_ER.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ti_ER.xml
+// * Source File: ../../../cldr/common/main/ti_ER.xml
// *
// ***************************************************************************
ti_ER{
diff --git a/icu4c/source/data/locales/ti_ET.txt b/icu4c/source/data/locales/ti_ET.txt
index 627df7b..30adb5d 100644
--- a/icu4c/source/data/locales/ti_ET.txt
+++ b/icu4c/source/data/locales/ti_ET.txt
@@ -3,15 +3,11 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/ti_ET.xml
+// * Source File: ../../../cldr/common/main/ti_ET.xml
// *
// ***************************************************************************
ti_ET{
Currencies{
- ETB{
- "$",
- "ETB",
- }
USD{
"US$",
"USD",
@@ -23,7 +19,7 @@
"#,##0%",
"#E0",
}
- Version{"1.28"}
+ Version{"1.29"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/tr.txt b/icu4c/source/data/locales/tr.txt
index 3800fd1..bd98376 100644
--- a/icu4c/source/data/locales/tr.txt
+++ b/icu4c/source/data/locales/tr.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/tr.xml
+// * Source File: ../../../cldr/common/main/tr.xml
// *
// ***************************************************************************
/**
@@ -1228,7 +1228,7 @@
"Zimbabwe Doları",
}
}
- ExemplarCharacters{"[a-zâûöüıçşğ]"}
+ ExemplarCharacters{"[a-zâûöüıçşğİ]"}
Keys{
calendar{"Takvim"}
collation{"Sıralama"}
@@ -1428,7 +1428,7 @@
traditional{"Geleneksel"}
}
}
- Version{"1.42"}
+ Version{"1.48"}
calendar{
gregorian{
DateTimeElements:intvector{
@@ -1457,15 +1457,6 @@
"Cum",
"Cmt",
}
- narrow{
- "P",
- "P",
- "S",
- "Ç",
- "P",
- "C",
- "C",
- }
wide{
"Pazar",
"Pazartesi",
@@ -1476,6 +1467,17 @@
"Cumartesi",
}
}
+ stand-alone{
+ narrow{
+ "P",
+ "P",
+ "S",
+ "Ç",
+ "P",
+ "C",
+ "C",
+ }
+ }
}
eras{
abbreviated{
@@ -1499,20 +1501,6 @@
"Kas",
"Ara",
}
- narrow{
- "O",
- "Ş",
- "M",
- "N",
- "M",
- "H",
- "T",
- "A",
- "E",
- "E",
- "K",
- "A",
- }
wide{
"Ocak",
"Şubat",
@@ -1528,6 +1516,22 @@
"Aralık",
}
}
+ stand-alone{
+ narrow{
+ "O",
+ "Ş",
+ "M",
+ "N",
+ "M",
+ "H",
+ "T",
+ "A",
+ "E",
+ "E",
+ "K",
+ "A",
+ }
+ }
}
}
}
diff --git a/icu4c/source/data/locales/tr_TR.txt b/icu4c/source/data/locales/tr_TR.txt
index d4ae0df..025a0ac 100644
--- a/icu4c/source/data/locales/tr_TR.txt
+++ b/icu4c/source/data/locales/tr_TR.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/tr_TR.xml
+// * Source File: ../../../cldr/common/main/tr_TR.xml
// *
// ***************************************************************************
tr_TR{
@@ -13,5 +13,5 @@
"#,##0%",
"#E0",
}
- Version{"1.25"}
+ Version{"1.27"}
}
diff --git a/icu4c/source/data/locales/uk.txt b/icu4c/source/data/locales/uk.txt
index 93af720..89301c7 100644
--- a/icu4c/source/data/locales/uk.txt
+++ b/icu4c/source/data/locales/uk.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/uk.xml
+// * Source File: ../../../cldr/common/main/uk.xml
// *
// ***************************************************************************
/**
@@ -1435,7 +1435,7 @@
traditional{"Традиційний"}
}
}
- Version{"1.39"}
+ Version{"1.45"}
calendar{
gregorian{
DateTimeElements:intvector{
@@ -1464,15 +1464,6 @@
"Пт",
"Сб",
}
- narrow{
- "Н",
- "П",
- "В",
- "С",
- "Ч",
- "П",
- "С",
- }
wide{
"Неділя",
"Понеділок",
@@ -1483,6 +1474,17 @@
"Субота",
}
}
+ stand-alone{
+ narrow{
+ "Н",
+ "П",
+ "В",
+ "С",
+ "Ч",
+ "П",
+ "С",
+ }
+ }
}
eras{
abbreviated{
diff --git a/icu4c/source/data/locales/uk_UA.txt b/icu4c/source/data/locales/uk_UA.txt
index c6d8a88..a5bce8e 100644
--- a/icu4c/source/data/locales/uk_UA.txt
+++ b/icu4c/source/data/locales/uk_UA.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/uk_UA.xml
+// * Source File: ../../../cldr/common/main/uk_UA.xml
// *
// ***************************************************************************
uk_UA{
@@ -13,5 +13,5 @@
"#,##0%",
"#E0",
}
- Version{"1.25"}
+ Version{"1.26"}
}
diff --git a/icu4c/source/data/locales/vi.txt b/icu4c/source/data/locales/vi.txt
index 9d08528..729cd36 100644
--- a/icu4c/source/data/locales/vi.txt
+++ b/icu4c/source/data/locales/vi.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/vi.xml
+// * Source File: ../../../cldr/common/main/vi.xml
// *
// ***************************************************************************
/**
@@ -289,7 +289,7 @@
"#,##0%",
"#E0",
}
- Version{"1.34"}
+ Version{"1.36"}
calendar{
gregorian{
AmPmMarkers{
diff --git a/icu4c/source/data/locales/vi_VN.txt b/icu4c/source/data/locales/vi_VN.txt
index 2d239f8..b9aff7c 100644
--- a/icu4c/source/data/locales/vi_VN.txt
+++ b/icu4c/source/data/locales/vi_VN.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/vi_VN.xml
+// * Source File: ../../../cldr/common/main/vi_VN.xml
// *
// ***************************************************************************
vi_VN{
diff --git a/icu4c/source/data/locales/zh.txt b/icu4c/source/data/locales/zh.txt
index 493d0aa..9f6645e 100644
--- a/icu4c/source/data/locales/zh.txt
+++ b/icu4c/source/data/locales/zh.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/zh.xml
+// * Source File: ../../../cldr/common/main/zh.xml
// *
// ***************************************************************************
/**
@@ -1766,7 +1766,7 @@
Variants{
REVISED{"已修订"}
}
- Version{"1.41"}
+ Version{"1.48"}
calendar{
gregorian{
AmPmMarkers{
@@ -1776,22 +1776,13 @@
dayNames{
format{
abbreviated{
- "日",
- "一",
- "二",
- "三",
- "四",
- "五",
- "六",
- }
- narrow{
- "日",
- "一",
- "二",
- "三",
- "四",
- "五",
- "六",
+ "周日",
+ "周一",
+ "周二",
+ "周三",
+ "周四",
+ "周五",
+ "周六",
}
wide{
"星期日",
@@ -1803,6 +1794,17 @@
"星期六",
}
}
+ stand-alone{
+ narrow{
+ "日",
+ "一",
+ "二",
+ "三",
+ "四",
+ "五",
+ "六",
+ }
+ }
}
eras{
abbreviated{
@@ -1826,20 +1828,6 @@
"十一月",
"十二月",
}
- narrow{
- "1月",
- "2月",
- "3月",
- "4月",
- "5月",
- "6月",
- "7月",
- "8月",
- "9月",
- "10月",
- "11月",
- "12月",
- }
wide{
"一月",
"二月",
@@ -1855,20 +1843,28 @@
"十二月",
}
}
+ stand-alone{
+ narrow{
+ "1月",
+ "2月",
+ "3月",
+ "4月",
+ "5月",
+ "6月",
+ "7月",
+ "8月",
+ "9月",
+ "10月",
+ "11月",
+ "12月",
+ }
+ }
}
}
}
localPatternChars{"GanjkHmsSEDFwWxhKzAeugXZ"}
zoneStrings{
{
- "Etc/GMT",
- "格林威治标准时间",
- "GMT",
- "格林威治标准时间",
- "GMT",
- "伦敦",
- }
- {
"America/Halifax",
"大西洋标准时间",
"AST",
diff --git a/icu4c/source/data/locales/zh_CN.txt b/icu4c/source/data/locales/zh_CN.txt
index 9d597c7..949dbdc 100644
--- a/icu4c/source/data/locales/zh_CN.txt
+++ b/icu4c/source/data/locales/zh_CN.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/zh_CN.xml
+// * Source File: ../../../cldr/common/main/zh_CN.xml
// *
// ***************************************************************************
zh_CN{
diff --git a/icu4c/source/data/locales/zh_HK.txt b/icu4c/source/data/locales/zh_HK.txt
index 5deb091..1101c15 100644
--- a/icu4c/source/data/locales/zh_HK.txt
+++ b/icu4c/source/data/locales/zh_HK.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/zh_HK.xml
+// * Source File: ../../../cldr/common/main/zh_HK.xml
// *
// ***************************************************************************
zh_HK{
diff --git a/icu4c/source/data/locales/zh_Hans.txt b/icu4c/source/data/locales/zh_Hans.txt
index 08734b7..0d69c21 100644
--- a/icu4c/source/data/locales/zh_Hans.txt
+++ b/icu4c/source/data/locales/zh_Hans.txt
@@ -3,9 +3,9 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/zh_Hans.xml
+// * Source File: ../../../cldr/common/main/zh_Hans.xml
// *
// ***************************************************************************
zh_Hans{
- Version{"1.13"}
+ Version{"1.14"}
}
diff --git a/icu4c/source/data/locales/zh_Hans_CN.txt b/icu4c/source/data/locales/zh_Hans_CN.txt
index 1305238..50061f3 100644
--- a/icu4c/source/data/locales/zh_Hans_CN.txt
+++ b/icu4c/source/data/locales/zh_Hans_CN.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/zh_Hans_CN.xml
+// * Source File: ../../../cldr/common/main/zh_Hans_CN.xml
// *
// ***************************************************************************
zh_Hans_CN{
@@ -13,7 +13,7 @@
"#,##0%",
"#E0",
}
- Version{"1.13"}
+ Version{"1.15"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/zh_Hans_SG.txt b/icu4c/source/data/locales/zh_Hans_SG.txt
index ceac067..e8ee806 100644
--- a/icu4c/source/data/locales/zh_Hans_SG.txt
+++ b/icu4c/source/data/locales/zh_Hans_SG.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/zh_Hans_SG.xml
+// * Source File: ../../../cldr/common/main/zh_Hans_SG.xml
// *
// ***************************************************************************
zh_Hans_SG{
@@ -26,7 +26,7 @@
"#,##0%",
"#E0",
}
- Version{"1.14"}
+ Version{"1.16"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/zh_Hant.txt b/icu4c/source/data/locales/zh_Hant.txt
index 6ff053e..1d317a4 100644
--- a/icu4c/source/data/locales/zh_Hant.txt
+++ b/icu4c/source/data/locales/zh_Hant.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/zh_Hant.xml
+// * Source File: ../../../cldr/common/main/zh_Hant.xml
// *
// ***************************************************************************
/**
@@ -1622,7 +1622,7 @@
Variants{
REVISED{"已修訂"}
}
- Version{"1.30"}
+ Version{"1.36"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/zh_Hant_HK.txt b/icu4c/source/data/locales/zh_Hant_HK.txt
index 7076100..3a34e5b 100644
--- a/icu4c/source/data/locales/zh_Hant_HK.txt
+++ b/icu4c/source/data/locales/zh_Hant_HK.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/zh_Hant_HK.xml
+// * Source File: ../../../cldr/common/main/zh_Hant_HK.xml
// *
// ***************************************************************************
zh_Hant_HK{
@@ -16,7 +16,7 @@
"#,##0%",
"#E0",
}
- Version{"1.16"}
+ Version{"1.18"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/zh_Hant_MO.txt b/icu4c/source/data/locales/zh_Hant_MO.txt
index f69f1fe..ad070be 100644
--- a/icu4c/source/data/locales/zh_Hant_MO.txt
+++ b/icu4c/source/data/locales/zh_Hant_MO.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/zh_Hant_MO.xml
+// * Source File: ../../../cldr/common/main/zh_Hant_MO.xml
// *
// ***************************************************************************
zh_Hant_MO{
@@ -16,7 +16,7 @@
"#,##0%",
"#E0",
}
- Version{"1.13"}
+ Version{"1.14"}
calendar{
gregorian{
DateTimePatterns{
diff --git a/icu4c/source/data/locales/zh_Hant_TW.txt b/icu4c/source/data/locales/zh_Hant_TW.txt
index d43b656..7df19dd 100644
--- a/icu4c/source/data/locales/zh_Hant_TW.txt
+++ b/icu4c/source/data/locales/zh_Hant_TW.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/zh_Hant_TW.xml
+// * Source File: ../../../cldr/common/main/zh_Hant_TW.xml
// *
// ***************************************************************************
zh_Hant_TW{
@@ -13,5 +13,5 @@
"#,##0%",
"#E0",
}
- Version{"1.7"}
+ Version{"1.8"}
}
diff --git a/icu4c/source/data/locales/zh_MO.txt b/icu4c/source/data/locales/zh_MO.txt
index f2841ac..58b9012 100644
--- a/icu4c/source/data/locales/zh_MO.txt
+++ b/icu4c/source/data/locales/zh_MO.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/zh_MO.xml
+// * Source File: ../../../cldr/common/main/zh_MO.xml
// *
// ***************************************************************************
zh_MO{
diff --git a/icu4c/source/data/locales/zh_SG.txt b/icu4c/source/data/locales/zh_SG.txt
index 245e3be..e51c7f5 100644
--- a/icu4c/source/data/locales/zh_SG.txt
+++ b/icu4c/source/data/locales/zh_SG.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/zh_SG.xml
+// * Source File: ../../../cldr/common/main/zh_SG.xml
// *
// ***************************************************************************
zh_SG{
diff --git a/icu4c/source/data/locales/zh_TW.txt b/icu4c/source/data/locales/zh_TW.txt
index 5ff4694..b37c56d 100644
--- a/icu4c/source/data/locales/zh_TW.txt
+++ b/icu4c/source/data/locales/zh_TW.txt
@@ -3,7 +3,7 @@
// * Copyright (C) 2005 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
-// * Source File: ../../../locale/common/main/zh_TW.xml
+// * Source File: ../../../cldr/common/main/zh_TW.xml
// *
// ***************************************************************************
zh_TW{
diff --git a/icu4c/source/i18n/dtfmtsym.cpp b/icu4c/source/i18n/dtfmtsym.cpp
index 02443bc..300d454 100644
--- a/icu4c/source/i18n/dtfmtsym.cpp
+++ b/icu4c/source/i18n/dtfmtsym.cpp
@@ -675,7 +675,10 @@
goto cleanup;
}
zoneRow = ures_getByIndex(zoneArray, i, zoneRow, &status);
- for(int32_t j = 0; j<fZoneStringsColCount; j++) {
+ // compute the size of the array dynamically. Don't assume
+ // that all rows of zone strings are of the same size.
+ int32_t size = ures_getSize(zoneRow);
+ for(int32_t j = 0; j<size; j++) {
resStr = ures_getStringByIndex(zoneRow, j, &len, &status);
// setTo() - see assignArray comments
fZoneStrings[i][j].setTo(TRUE, resStr, len);
diff --git a/icu4c/source/i18n/smpdtfmt.cpp b/icu4c/source/i18n/smpdtfmt.cpp
index 9c9e757..a3a1d14 100644
--- a/icu4c/source/i18n/smpdtfmt.cpp
+++ b/icu4c/source/i18n/smpdtfmt.cpp
@@ -1309,9 +1309,9 @@
// GMT[+-]hhmm or
// GMT.
- if ((text.length() - start) > gmtLen &&
- (text.caseCompare(start, gmtLen, gGmt, 0, gmtLen, U_FOLD_CASE_DEFAULT)) == 0)
- {
+ if ((text.length() - start) >= gmtLen &&
+ (text.caseCompare(start, gmtLen, gGmt, 0, gmtLen, U_FOLD_CASE_DEFAULT)) == 0)
+ {
cal.set(UCAL_DST_OFFSET, 0);
pos.setIndex(start + gmtLen);
diff --git a/icu4c/source/test/cintltst/creststn.c b/icu4c/source/test/cintltst/creststn.c
index 7681f3e..141970d 100644
--- a/icu4c/source/test/cintltst/creststn.c
+++ b/icu4c/source/test/cintltst/creststn.c
@@ -2029,7 +2029,7 @@
UResourceBundle* myResB = ures_open(NULL,"no_NO_NY",&err);
UResourceBundle* resLocID = ures_getByKey(myResB, "Version", NULL, &err);
UResourceBundle* tResB;
- static const UChar versionStr[] = { 0x0031, 0x002E, 0x0032, 0x0035, 0x0000};
+ static const UChar versionStr[] = { 0x0031, 0x002E, 0x0032, 0x0037, 0x0000};
if(err != U_ZERO_ERROR){
log_data_err("Expected U_ZERO_ERROR when trying to test no_NO_NY aliased to nn_NO for Version err=%s\n",u_errorName(err));
@@ -2638,3 +2638,4 @@
ures_close(alias);
ures_close(rb);
}
+
diff --git a/icu4c/source/test/cintltst/cucdapi.c b/icu4c/source/test/cintltst/cucdapi.c
index 287f907..4972e6a 100644
--- a/icu4c/source/test/cintltst/cucdapi.c
+++ b/icu4c/source/test/cintltst/cucdapi.c
@@ -84,7 +84,7 @@
{
UErrorCode err = U_ZERO_ERROR;
int32_t capacity=0;
- UScriptCode jaCode[]={ USCRIPT_KATAKANA,USCRIPT_HIRAGANA,USCRIPT_HAN};
+ UScriptCode jaCode[]={USCRIPT_KATAKANA, USCRIPT_HIRAGANA, USCRIPT_HAN };
UScriptCode script[10]={USCRIPT_INVALID_CODE};
int32_t num = uscript_getCode("ja",script,capacity, &err);
/* preflight */
diff --git a/icu4c/source/test/intltest/caltest.cpp b/icu4c/source/test/intltest/caltest.cpp
index 0ec15c2..0efacb1 100644
--- a/icu4c/source/test/intltest/caltest.cpp
+++ b/icu4c/source/test/intltest/caltest.cpp
@@ -1338,7 +1338,11 @@
int32_t woy = cal.get(UCAL_WEEK_OF_YEAR, status);
int32_t dow = cal.get(UCAL_DOW_LOCAL, status);
UDate t = cal.getTime(status);
-
+
+ if(U_FAILURE(status)){
+ errln(UnicodeString("Failed to create Calendar for locale. Error: ") + UnicodeString(u_errorName(status)));
+ return;
+ }
UnicodeString str, str2;
SimpleDateFormat fmt(UnicodeString("EEE MMM dd yyyy / YYYY'-W'ww-ee"), status);
fmt.setCalendar(cal);
diff --git a/icu4c/source/test/intltest/dtfmttst.cpp b/icu4c/source/test/intltest/dtfmttst.cpp
index 9a215aa..e39cc3c 100644
--- a/icu4c/source/test/intltest/dtfmttst.cpp
+++ b/icu4c/source/test/intltest/dtfmttst.cpp
@@ -294,7 +294,10 @@
}
}
dateFormats[3] = new SimpleDateFormat(buf, Locale::getUS(), ec);
-
+ if(U_FAILURE(ec)){
+ errln(UnicodeString("Could not create SimpleDateFormat object for locale en_US. Error: " )+ UnicodeString(u_errorName(ec)));
+ return;
+ }
UDate aug13 = 871508052513.0;
// Expected output field values for above DateFormats on aug13
@@ -905,11 +908,11 @@
UDate greenwichdate = greenwichcalendar->getTime(status);
// format every way
UnicodeString DATA [] = {
- UnicodeString("simple format: "), UnicodeString("04/04/97 23:00 GMT"),
+ UnicodeString("simple format: "), UnicodeString("04/04/97 23:00 GMT+00:00"),
UnicodeString("MM/dd/yy HH:mm z"),
- UnicodeString("full format: "), UnicodeString("Friday, April 4, 1997 11:00:00 o'clock PM GMT"),
+ UnicodeString("full format: "), UnicodeString("Friday, April 4, 1997 11:00:00 o'clock PM GMT+00:00"),
UnicodeString("EEEE, MMMM d, yyyy h:mm:ss 'o''clock' a z"),
- UnicodeString("long format: "), UnicodeString("April 4, 1997 11:00:00 PM GMT"),
+ UnicodeString("long format: "), UnicodeString("April 4, 1997 11:00:00 PM GMT+00:00"),
UnicodeString("MMMM d, yyyy h:mm:ss a z"),
UnicodeString("default format: "), UnicodeString("04-Apr-97 11:00:00 PM"),
UnicodeString("dd-MMM-yy h:mm:ss a"),
diff --git a/icu4c/source/test/intltest/loctest.cpp b/icu4c/source/test/intltest/loctest.cpp
index 0ba31cf..cff8d4a 100644
--- a/icu4c/source/test/intltest/loctest.cpp
+++ b/icu4c/source/test/intltest/loctest.cpp
@@ -1318,6 +1318,10 @@
UDate mydate = date(98,3,13); // A Monday
UErrorCode status = U_ZERO_ERROR;
SimpleDateFormat df_full("EEEE", mylocale, status);
+ if(U_FAILURE(status)){
+ errln(UnicodeString("Could not create SimpleDateFormat object for locale hu. Error: " )+ UnicodeString(u_errorName(status)));
+ return;
+ }
UnicodeString str;
FieldPosition pos(FieldPosition::DONT_CARE);
df_full.format(mydate, str, pos);
diff --git a/icu4c/source/test/intltest/miscdtfm.cpp b/icu4c/source/test/intltest/miscdtfm.cpp
index ffb5bf3..ce843ea 100644
--- a/icu4c/source/test/intltest/miscdtfm.cpp
+++ b/icu4c/source/test/intltest/miscdtfm.cpp
@@ -338,25 +338,25 @@
int32_t rowCount, colCount;
const UnicodeString **zones = symbols->getZoneStrings(rowCount, colCount);
- int pos = 6;
+ int pos = 5;
logln(UnicodeString("Long zone name = ") + zones[pos][1]);
if (zones[pos][1] != jstLong) {
- errln("*** Should have been " + prettify(jstLong));
+ errln("*** Should have been " + prettify(jstLong)+ " but it is: " + prettify(zones[pos][1]));
//throw new Exception("Error in long TZ name");
}
logln(UnicodeString("Short zone name = ") + zones[pos][2]);
if (zones[pos][2] != jstShort) {
- errln("*** Should have been " + jstShort + " but it is: " + prettify(zones[pos][2]));
+ errln("*** Should have been " + prettify(jstShort) + " but it is: " + prettify(zones[pos][2]));
//throw new Exception("Error in short TZ name");
}
logln(UnicodeString("Long zone name = ") + zones[pos][3]);
if (zones[pos][3] != jstLong) {
- errln("*** Should have been " + jstLong);
+ errln("*** Should have been " + prettify(jstLong) + " but it is: " + prettify(zones[pos][3]));
//throw new Exception("Error in long TZ name");
}
logln(UnicodeString("SHORT zone name = ") + zones[pos][4]);
if (zones[pos][4] != jstShort) {
- errln("*** Should have been " + jstShort);
+ errln("*** Should have been " + prettify(jstShort)+ " but it is: " + prettify(zones[pos][4]));
//throw new Exception("Error in short TZ name");
}
delete symbols;
diff --git a/icu4c/source/test/testdata/structLocale.txt b/icu4c/source/test/testdata/structLocale.txt
index f13afb1..da78132 100644
--- a/icu4c/source/test/testdata/structLocale.txt
+++ b/icu4c/source/test/testdata/structLocale.txt
@@ -576,6 +576,10 @@
"",
"",
}
+ CHW{
+ "",
+ "",
+ }
CKD{
"",
"",
diff --git a/icu4c/source/test/testdata/testaliases.txt b/icu4c/source/test/testdata/testaliases.txt
index 510495c..f46e029 100644
--- a/icu4c/source/test/testdata/testaliases.txt
+++ b/icu4c/source/test/testdata/testaliases.txt
@@ -45,18 +45,19 @@
// WARNING: this test assumes that on all platforms digits sort normally
// if not, the test may fail
testGetStringByKeyAliasing {
- KeyAlias0PST:alias { "/ICUDATA/en/zoneStrings/15/0" } //"America/Los_Angeles",
- KeyAlias1PacificStandardTime:alias { "/ICUDATA/en/zoneStrings/15/1" } //"Pacific Standard Time",
- KeyAlias2PDT:alias { "/ICUDATA/en/zoneStrings/15/4" } //"PDT",
- KeyAlias3LosAngeles:alias { "/ICUDATA/en/zoneStrings/15/5" } //"Los Angeles",
+ KeyAlias0PST:alias { "/ICUDATA/en/zoneStrings/14/0" } //"America/Los_Angeles",
+ KeyAlias1PacificStandardTime:alias { "/ICUDATA/en/zoneStrings/14/1" } //"Pacific Standard Time",
+ KeyAlias2PDT:alias { "/ICUDATA/en/zoneStrings/14/4" } //"PDT",
+ KeyAlias3LosAngeles:alias { "/ICUDATA/en/zoneStrings/14/5" } //"Los Angeles",
}
testGetStringByIndexAliasing {
- :alias { "/ICUDATA/en/zoneStrings/15/0" } //"America/Los_Angeles",
- :alias { "/ICUDATA/en/zoneStrings/15/1" } //"Pacific Standard Time",
- :alias { "/ICUDATA/en/zoneStrings/15/4" } //"PDT",
- :alias { "/ICUDATA/en/zoneStrings/15/5" } //"Los Angeles",
+ :alias { "/ICUDATA/en/zoneStrings/14/0" } //"America/Los_Angeles",
+ :alias { "/ICUDATA/en/zoneStrings/14/1" } //"Pacific Standard Time",
+ :alias { "/ICUDATA/en/zoneStrings/14/4" } //"PDT",
+ :alias { "/ICUDATA/en/zoneStrings/14/5" } //"Los Angeles",
}
+
}
//eof
