]> granicus.if.org Git - icu/commitdiff
ICU-12948 Imported data from CLDR trunk @13199, including UTC/GMT separation.
authorYoshito Umaoka <y.umaoka@gmail.com>
Sun, 29 Jan 2017 05:08:37 +0000 (05:08 +0000)
committerYoshito Umaoka <y.umaoka@gmail.com>
Sun, 29 Jan 2017 05:08:37 +0000 (05:08 +0000)
X-SVN-Rev: 39614

31 files changed:
icu4c/source/data/curr/en.txt
icu4c/source/data/curr/my.txt
icu4c/source/data/curr/si.txt
icu4c/source/data/curr/sw.txt
icu4c/source/data/lang/en.txt
icu4c/source/data/lang/my.txt
icu4c/source/data/lang/si.txt
icu4c/source/data/lang/sw.txt
icu4c/source/data/locales/en.txt
icu4c/source/data/locales/my.txt
icu4c/source/data/locales/si.txt
icu4c/source/data/locales/sw.txt
icu4c/source/data/misc/metaZones.txt
icu4c/source/data/misc/metadata.txt
icu4c/source/data/misc/timezoneTypes.txt
icu4c/source/data/region/en.txt
icu4c/source/data/region/my.txt
icu4c/source/data/region/si.txt
icu4c/source/data/region/sw.txt
icu4c/source/data/unit/en.txt
icu4c/source/data/unit/my.txt
icu4c/source/data/unit/si.txt
icu4c/source/data/unit/sw.txt
icu4c/source/data/zone/en.txt
icu4c/source/data/zone/my.txt
icu4c/source/data/zone/si.txt
icu4c/source/data/zone/sw.txt
icu4c/source/test/intltest/tztest.cpp
icu4j/main/shared/data/icudata.jar
icu4j/main/shared/data/icutzdata.jar
icu4j/main/shared/data/testdata.jar

index 2fabc1d132e67220c4370dc118d7960d169fa207..64e0486b16dbc6396fbaa21ee78eafb6eedcc8d9 100644 (file)
@@ -2393,5 +2393,5 @@ en{
         one{"{0} {1}"}
         other{"{0} {1}"}
     }
-    Version{"2.1.31.94"}
+    Version{"2.1.31.98"}
 }
index 0566594cafdad9df6b9deaebf402a95c95df8c91..96b61c3c85881dab2e62a5245af9ca5a3e1624be 100644 (file)
@@ -1301,5 +1301,5 @@ my{
             other{"ဇင်ဘာဘွေခွါးချာ"}
         }
     }
-    Version{"2.1.31.86"}
+    Version{"2.1.31.96"}
 }
index 5bf22a76288bc447997c50a4988d1103f8b2e2af..379dddfe16fc667cb71a87f2c0f7c61b73294fc3 100644 (file)
@@ -1373,5 +1373,5 @@ si{
         one{"{1}{0}"}
         other{"{1}{0}"}
     }
-    Version{"2.1.31.86"}
+    Version{"2.1.31.96"}
 }
index d6bd521f333e82ce734fdf613cd71b6300973201..1bc8aecd92bc9d974cc3297daafef4f98eba76af 100644 (file)
@@ -1408,5 +1408,5 @@ sw{
         one{"{1} {0}"}
         other{"{1} {0}"}
     }
-    Version{"2.1.31.86"}
+    Version{"2.1.31.96"}
 }
index dab59de4322505073d43c1e91ecbcd6794573e2e..29fb1a43cc2eb1f567ad9bb3007c17a8b4077ae8 100644 (file)
@@ -1220,7 +1220,7 @@ en{
         VALENCIA{"Valencian"}
         WADEGILE{"Wade-Giles Romanization"}
     }
-    Version{"2.1.31.94"}
+    Version{"2.1.31.98"}
     characterLabelPattern{
         all{"{0} — all"}
         category-list{"{0}: {1}"}
index 273fe95f2ebdfd53c7f6d94eeb0c7c0fc24b6890..0f898ba0e2ca328c03e83330e451da9ee397476f 100644 (file)
@@ -580,7 +580,7 @@ my{
         REVISED{"ပြန်လည်စီစစ်ထားသော ရေးထုံး"}
         SCOTLAND{"စကော့ စံ အင်္ဂလိပ်"}
     }
-    Version{"2.1.31.86"}
+    Version{"2.1.31.96"}
     characterLabelPattern{
         all{"{0} — အားလုံး"}
         category-list{"{0} − {1}"}
index 615cdc65a4d701bfd2b0acf9b12b8fbb3fc711b4..0b58fd6544e77c34ff4fc7bd4f9e07c21d84f83f 100644 (file)
@@ -547,7 +547,7 @@ si{
             tibt{"ටිබෙට ඉලක්කම්"}
         }
     }
-    Version{"2.1.31.86"}
+    Version{"2.1.31.96"}
     characterLabelPattern{
         all{"{0} — සියල්ල"}
         category-list{"{0}: {1}"}
index 99f38554abe6245f6c0c2aaac1e8f09c42369be0..d2b542c6d1bfb836de203cd1665ccde4c50b2f1a 100644 (file)
@@ -637,7 +637,7 @@ sw{
             vaii{"Dijiti za Vai"}
         }
     }
-    Version{"2.1.31.86"}
+    Version{"2.1.31.96"}
     characterLabelPattern{
         all{"{0} — Zote"}
         category-list{"{0}: {1}"}
index f07e03eddca9350a75060c00b9233fc0cb956107..85ec99edb9d6ece3d24b3485024c90954758311e 100644 (file)
@@ -204,7 +204,7 @@ en{
             }
         }
     }
-    Version{"2.1.31.94"}
+    Version{"2.1.31.98"}
     calendar{
         buddhist{
             eras{
index 7f70c1ac9084d3dfb378fdf8e05c0e99c12542b0..94c3a87775891c70fc0aa9c8f2c715a0ddbc4970 100644 (file)
@@ -131,19 +131,19 @@ my{
                         other{"00ကုဋေ"}
                     }
                     1000000000{
-                        other{"ကုဋေ000"}
+                        other{"ကုဋေ000;ကုဋေ-000"}
                     }
                     10000000000{
-                        other{"ကုဋေ0ထ"}
+                        other{"ကုဋေ0ထ;ကုဋေ-0ထ"}
                     }
                     100000000000{
-                        other{"ကုဋေ0သ"}
+                        other{"ကုဋေ0သ;ကုဋေ-0သ"}
                     }
                     1000000000000{
-                        other{"ဋေ0သိန်း"}
+                        other{"ဋေ0သိန်း;ဋေ-0သိန်း"}
                     }
                     10000000000000{
-                        other{"ဋေ0သန်း"}
+                        other{"ဋေ0သန်း;ဋေ-0သန်း"}
                     }
                     100000000000000{
                         other{"0ကောဋိ"}
@@ -192,7 +192,7 @@ my{
         }
         native{"mymr"}
     }
-    Version{"2.1.31.86"}
+    Version{"2.1.31.96"}
     calendar{
         generic{
             DateTimePatterns{
index 62fa78b22522e768dea300512f2ffe63cc7f3fc2..9f3ec58e90293b22762207a2386de38537eadfad 100644 (file)
@@ -41,52 +41,52 @@ si{
             patternsLong{
                 decimalFormat{
                     1000{
-                        one{"දහස 0"}
-                        other{"දහස 0"}
+                        one{"දහස 0;දහස -0"}
+                        other{"දහස 0;දහස -0"}
                     }
                     10000{
-                        one{"දහස 00"}
-                        other{"දහස 00"}
+                        one{"දහස 00;දහස -00"}
+                        other{"දහස 00;දහස -00"}
                     }
                     100000{
-                        one{"දහස 000"}
-                        other{"දහස 000"}
+                        one{"දහස 000;දහස -000"}
+                        other{"දහස 000;දහස -000"}
                     }
                     1000000{
-                        one{"මිලියන 0"}
-                        other{"මිලියන 0"}
+                        one{"මිලියන 0;මිලියන -0"}
+                        other{"මිලියන 0;මිලියන -0"}
                     }
                     10000000{
-                        one{"මිලියන 00"}
-                        other{"මිලියන 00"}
+                        one{"මිලියන 00;මිලියන -00"}
+                        other{"මිලියන 00;මිලියන -00"}
                     }
                     100000000{
-                        one{"මිලියන 000"}
-                        other{"මිලියන 000"}
+                        one{"මිලියන 000;මිලියන -000"}
+                        other{"මිලියන 000;මිලියන -000"}
                     }
                     1000000000{
-                        one{"බිලියන 0"}
-                        other{"බිලියන 0"}
+                        one{"බිලියන 0;බිලියන -0"}
+                        other{"බිලියන 0;බිලියන -0"}
                     }
                     10000000000{
-                        one{"බිලියන 00"}
-                        other{"බිලියන 00"}
+                        one{"බිලියන 00;බිලියන -00"}
+                        other{"බිලියන 00;බිලියන -00"}
                     }
                     100000000000{
-                        one{"බිලියන 000"}
-                        other{"බිලියන 000"}
+                        one{"බිලියන 000;බිලියන -000"}
+                        other{"බිලියන 000;බිලියන -000"}
                     }
                     1000000000000{
-                        one{"ට්‍රිලියන 0"}
-                        other{"ට්‍රිලියන 0"}
+                        one{"ට්‍රිලියන 0;ට්‍රිලියන -0"}
+                        other{"ට්‍රිලියන 0;ට්‍රිලියන -0"}
                     }
                     10000000000000{
-                        one{"ට්‍රිලියන 00"}
-                        other{"ට්‍රිලියන 00"}
+                        one{"ට්‍රිලියන 00;ට්‍රිලියන -00"}
+                        other{"ට්‍රිලියන 00;ට්‍රිලියන -00"}
                     }
                     100000000000000{
-                        one{"ට්‍රිලියන 000"}
-                        other{"ට්‍රිලියන 000"}
+                        one{"ට්‍රිලියන 000;ට්‍රිලියන -000"}
+                        other{"ට්‍රිලියන 000;ට්‍රිලියන -000"}
                     }
                 }
             }
@@ -218,7 +218,7 @@ si{
         minimumGroupingDigits{"1"}
         native{"latn"}
     }
-    Version{"2.1.31.86"}
+    Version{"2.1.31.96"}
     calendar{
         generic{
             DateTimePatterns{
index 74ad44a5f003d257cb990e3b146dd3718cc31637..21656c3bfed73042ce00a044f7f9a242d5c7910d 100644 (file)
@@ -29,154 +29,154 @@ sw{
             patternsLong{
                 decimalFormat{
                     1000{
-                        one{"Elfu 0"}
-                        other{"Elfu 0"}
+                        one{"Elfu 0;Elfu -0"}
+                        other{"Elfu 0;Elfu -0"}
                     }
                     10000{
-                        one{"Elfu 00"}
-                        other{"Elfu 00"}
+                        one{"Elfu 00;Elfu -00"}
+                        other{"Elfu 00;Elfu -00"}
                     }
                     100000{
-                        one{"Elfu 000"}
-                        other{"Elfu 000"}
+                        one{"Elfu 000;Elfu -000"}
+                        other{"Elfu 000;Elfu -000"}
                     }
                     1000000{
-                        one{"Milioni 0"}
-                        other{"Milioni 0"}
+                        one{"Milioni 0;Milioni -0"}
+                        other{"Milioni 0;Milioni -0"}
                     }
                     10000000{
-                        one{"Milioni 00"}
-                        other{"Milioni 00"}
+                        one{"Milioni 00;Milioni -00"}
+                        other{"Milioni 00;Milioni -00"}
                     }
                     100000000{
-                        one{"Milioni 000"}
-                        other{"Milioni 000"}
+                        one{"Milioni 000;Milioni -000"}
+                        other{"Milioni 000;Milioni -000"}
                     }
                     1000000000{
-                        one{"Bilioni 0"}
-                        other{"Bilioni 0"}
+                        one{"Bilioni 0;Bilioni -0"}
+                        other{"Bilioni 0;Bilioni -0"}
                     }
                     10000000000{
-                        one{"Bilioni 00"}
-                        other{"Bilioni 00"}
+                        one{"Bilioni 00;Bilioni -00"}
+                        other{"Bilioni 00;Bilioni -00"}
                     }
                     100000000000{
-                        one{"Bilioni 000"}
-                        other{"Bilioni 000"}
+                        one{"Bilioni 000;Bilioni -000"}
+                        other{"Bilioni 000;Bilioni -000"}
                     }
                     1000000000000{
-                        one{"Trilioni 0"}
-                        other{"Trilioni 0"}
+                        one{"Trilioni 0;Trilioni -0"}
+                        other{"Trilioni 0;Trilioni -0"}
                     }
                     10000000000000{
-                        one{"Trilioni 00"}
-                        other{"Trilioni 00"}
+                        one{"Trilioni 00;Trilioni -00"}
+                        other{"Trilioni 00;Trilioni -00"}
                     }
                     100000000000000{
-                        one{"Trilioni 000"}
-                        other{"Trilioni 000"}
+                        one{"Trilioni 000;Trilioni -000"}
+                        other{"Trilioni 000;Trilioni -000"}
                     }
                 }
             }
             patternsShort{
                 currencyFormat{
                     1000{
-                        one{"¤elfu 0"}
-                        other{"¤elfu 0"}
+                        one{"¤elfu 0;¤elfu -0"}
+                        other{"¤elfu 0;¤elfu -0"}
                     }
                     10000{
-                        one{"¤elfu 00"}
-                        other{"¤elfu 00"}
+                        one{"¤elfu 00;¤elfu -00"}
+                        other{"¤elfu 00;¤elfu -00"}
                     }
                     100000{
-                        one{"¤laki 000"}
-                        other{"¤laki 000"}
+                        one{"¤laki 000;¤laki -000"}
+                        other{"¤laki 000;¤laki -000"}
                     }
                     1000000{
-                        one{"¤M0"}
-                        other{"¤M0"}
+                        one{"¤M0;¤M-0"}
+                        other{"¤M0;¤M-0"}
                     }
                     10000000{
-                        one{"¤M00"}
-                        other{"¤M00"}
+                        one{"¤M00;¤M-00"}
+                        other{"¤M00;¤M-00"}
                     }
                     100000000{
-                        one{"¤M000"}
-                        other{"¤M000"}
+                        one{"¤M000;¤M-000"}
+                        other{"¤M000;¤M-000"}
                     }
                     1000000000{
-                        one{"¤B0"}
-                        other{"¤B0"}
+                        one{"¤B0;¤B-0"}
+                        other{"¤B0;¤B-0"}
                     }
                     10000000000{
-                        one{"¤B00"}
-                        other{"¤B00"}
+                        one{"¤B00;¤B-00"}
+                        other{"¤B00;¤B-00"}
                     }
                     100000000000{
-                        one{"¤B000"}
-                        other{"¤B000"}
+                        one{"¤B000;¤B-000"}
+                        other{"¤B000;¤B-000"}
                     }
                     1000000000000{
-                        one{"¤T0"}
-                        other{"¤T0"}
+                        one{"¤T0;¤T-0"}
+                        other{"¤T0;¤T-0"}
                     }
                     10000000000000{
-                        one{"¤T00"}
-                        other{"¤T00"}
+                        one{"¤T00;¤T-00"}
+                        other{"¤T00;¤T-00"}
                     }
                     100000000000000{
-                        one{"¤T000"}
-                        other{"¤T000"}
+                        one{"¤T000;¤T-000"}
+                        other{"¤T000;¤T-000"}
                     }
                 }
                 decimalFormat{
                     1000{
-                        one{"elfu 0"}
-                        other{"elfu 0"}
+                        one{"elfu 0;elfu -0"}
+                        other{"elfu 0;elfu -0"}
                     }
                     10000{
-                        one{"elfu 00"}
-                        other{"elfu 00"}
+                        one{"elfu 00;elfu -00"}
+                        other{"elfu 00;elfu -00"}
                     }
                     100000{
-                        one{"elfu 000"}
-                        other{"elfu 000"}
+                        one{"elfu 000;elfu -000"}
+                        other{"elfu 000;elfu -000"}
                     }
                     1000000{
-                        one{"M0"}
-                        other{"M0"}
+                        one{"M0;M-0"}
+                        other{"M0;M-0"}
                     }
                     10000000{
-                        one{"M00"}
-                        other{"M00"}
+                        one{"M00;M-00"}
+                        other{"M00;M-00"}
                     }
                     100000000{
-                        one{"M000"}
-                        other{"M000"}
+                        one{"M000;M-000"}
+                        other{"M000;M-000"}
                     }
                     1000000000{
-                        one{"B0"}
-                        other{"B0"}
+                        one{"B0;B-0"}
+                        other{"B0;B-0"}
                     }
                     10000000000{
-                        one{"B00"}
-                        other{"B00"}
+                        one{"B00;B-00"}
+                        other{"B00;B-00"}
                     }
                     100000000000{
-                        one{"B000"}
-                        other{"B000"}
+                        one{"B000;B-000"}
+                        other{"B000;B-000"}
                     }
                     1000000000000{
-                        one{"T0"}
-                        other{"T0"}
+                        one{"T0;T-0"}
+                        other{"T0;T-0"}
                     }
                     10000000000000{
-                        one{"T00"}
-                        other{"T00"}
+                        one{"T00;T-00"}
+                        other{"T00;T-00"}
                     }
                     100000000000000{
-                        one{"T000"}
-                        other{"T000"}
+                        one{"T000;T-000"}
+                        other{"T000;T-000"}
                     }
                 }
             }
@@ -207,7 +207,7 @@ sw{
         minimumGroupingDigits{"1"}
         native{"latn"}
     }
-    Version{"2.1.31.86"}
+    Version{"2.1.31.96"}
     calendar{
         generic{
             DateTimePatterns{
index e63ae3cefa48869d7c2ec3594ebabf74c78785eb..22b638d16324500fdd613dd5de3766a73acc922e 100644 (file)
@@ -3454,6 +3454,11 @@ metaZones:table(nofallback){
                 "America_Eastern",
             }
         }
+        "Etc:GMT"{
+            {
+                "GMT",
+            }
+        }
         "Europe:Amsterdam"{
             {
                 "Europe_Central",
index dc71473b40679ec4775ca013fff58681efe670cb..519c75b68439139ee10a5b1c6084498395c37278 100644 (file)
@@ -1347,287 +1347,311 @@ metadata:table(nofallback){
             }
         }
         subdivision{
-            CN-71{
+            cn71{
                 reason{"overlong"}
                 replacement{"TW"}
             }
-            CN-91{
+            cn91{
                 reason{"overlong"}
                 replacement{"HK"}
             }
-            CN-92{
+            cn92{
                 reason{"overlong"}
                 replacement{"MO"}
             }
-            CZ-JC{
+            czjc{
                 reason{"deprecated"}
-                replacement{"CZ-31"}
+                replacement{"cz31"}
             }
-            CZ-KA{
+            czka{
                 reason{"deprecated"}
-                replacement{"CZ-41"}
+                replacement{"cz41"}
             }
-            CZ-KR{
+            czkr{
                 reason{"deprecated"}
-                replacement{"CZ-52"}
+                replacement{"cz52"}
             }
-            CZ-LI{
+            czli{
                 reason{"deprecated"}
-                replacement{"CZ-51"}
+                replacement{"cz51"}
             }
-            CZ-MO{
+            czmo{
                 reason{"deprecated"}
-                replacement{"CZ-80"}
+                replacement{"cz80"}
             }
-            CZ-OL{
+            czol{
                 reason{"deprecated"}
-                replacement{"CZ-71"}
+                replacement{"cz71"}
             }
-            CZ-PA{
+            czpa{
                 reason{"deprecated"}
-                replacement{"CZ-53"}
+                replacement{"cz53"}
             }
-            CZ-PL{
+            czpl{
                 reason{"deprecated"}
-                replacement{"CZ-32"}
+                replacement{"cz32"}
             }
-            CZ-ST{
+            czst{
                 reason{"deprecated"}
-                replacement{"CZ-20"}
+                replacement{"cz20"}
             }
-            CZ-US{
+            czus{
                 reason{"deprecated"}
-                replacement{"CZ-42"}
+                replacement{"cz42"}
             }
-            CZ-ZL{
+            czzl{
                 reason{"deprecated"}
-                replacement{"CZ-72"}
+                replacement{"cz72"}
             }
-            FR-A{
+            escn{
+                reason{"overlong"}
+                replacement{"IC"}
+            }
+            fi01{
+                reason{"overlong"}
+                replacement{"AX"}
+            }
+            fra{
                 reason{"deprecated"}
-                replacement{"FR-GES"}
+                replacement{"frges"}
             }
-            FR-B{
+            frb{
                 reason{"deprecated"}
-                replacement{"FR-NAQ"}
+                replacement{"frnaq"}
             }
-            FR-BL{
+            frbl{
                 reason{"overlong"}
                 replacement{"BL"}
             }
-            FR-C{
+            frc{
                 reason{"deprecated"}
-                replacement{"FR-ARA"}
+                replacement{"frara"}
             }
-            FR-D{
+            frcp{
+                reason{"overlong"}
+                replacement{"CP"}
+            }
+            frd{
                 reason{"deprecated"}
-                replacement{"FR-BFC"}
+                replacement{"frbfc"}
             }
-            FR-E{
+            fre{
                 reason{"deprecated"}
-                replacement{"FR-BRE"}
+                replacement{"frbre"}
             }
-            FR-F{
+            frf{
                 reason{"deprecated"}
-                replacement{"FR-CVL"}
+                replacement{"frcvl"}
             }
-            FR-G{
+            frg{
                 reason{"deprecated"}
-                replacement{"FR-GES"}
+                replacement{"frges"}
             }
-            FR-GP{
+            frgf{
+                reason{"overlong"}
+                replacement{"GF"}
+            }
+            frgp{
                 reason{"overlong"}
                 replacement{"GP"}
             }
-            FR-H{
+            frh{
                 reason{"deprecated"}
-                replacement{"FR-COR"}
+                replacement{"frcor"}
             }
-            FR-I{
+            fri{
                 reason{"deprecated"}
-                replacement{"FR-BFC"}
+                replacement{"frbfc"}
             }
-            FR-J{
+            frj{
                 reason{"deprecated"}
-                replacement{"FR-IDF"}
+                replacement{"fridf"}
             }
-            FR-K{
+            frk{
                 reason{"deprecated"}
-                replacement{"FR-OCC"}
+                replacement{"frocc"}
             }
-            FR-L{
+            frl{
                 reason{"deprecated"}
-                replacement{"FR-NAQ"}
+                replacement{"frnaq"}
             }
-            FR-M{
+            frm{
                 reason{"deprecated"}
-                replacement{"FR-GES"}
+                replacement{"frges"}
             }
-            FR-MF{
+            frmf{
                 reason{"overlong"}
                 replacement{"MF"}
             }
-            FR-N{
+            frmq{
+                reason{"overlong"}
+                replacement{"MQ"}
+            }
+            frn{
                 reason{"deprecated"}
-                replacement{"FR-OCC"}
+                replacement{"frocc"}
             }
-            FR-NC{
+            frnc{
                 reason{"overlong"}
                 replacement{"NC"}
             }
-            FR-O{
+            fro{
                 reason{"deprecated"}
-                replacement{"FR-HDF"}
+                replacement{"frhdf"}
             }
-            FR-P{
+            frp{
                 reason{"deprecated"}
-                replacement{"FR-NOR"}
+                replacement{"frnor"}
             }
-            FR-PF{
+            frpf{
                 reason{"overlong"}
                 replacement{"PF"}
             }
-            FR-PM{
+            frpm{
                 reason{"overlong"}
                 replacement{"PM"}
             }
-            FR-Q{
+            frq{
                 reason{"deprecated"}
-                replacement{"FR-NOR"}
+                replacement{"frnor"}
             }
-            FR-R{
+            frr{
                 reason{"deprecated"}
-                replacement{"FR-PDL"}
+                replacement{"frpdl"}
             }
-            FR-RE{
+            frre{
                 reason{"overlong"}
                 replacement{"RE"}
             }
-            FR-S{
+            frs{
                 reason{"deprecated"}
-                replacement{"FR-HDF"}
+                replacement{"frhdf"}
             }
-            FR-T{
+            frt{
                 reason{"deprecated"}
-                replacement{"FR-NAQ"}
+                replacement{"frnaq"}
             }
-            FR-TF{
+            frtf{
                 reason{"overlong"}
                 replacement{"TF"}
             }
-            FR-U{
+            fru{
                 reason{"deprecated"}
-                replacement{"FR-PAC"}
+                replacement{"frpac"}
             }
-            FR-V{
+            frv{
                 reason{"deprecated"}
-                replacement{"FR-ARA"}
+                replacement{"frara"}
             }
-            FR-WF{
+            frwf{
                 reason{"overlong"}
                 replacement{"WF"}
             }
-            FR-YT{
+            fryt{
                 reason{"overlong"}
                 replacement{"YT"}
             }
-            LA-XN{
+            laxn{
                 reason{"deprecated"}
-                replacement{"LA-XS"}
+                replacement{"laxs"}
             }
-            LU-D{
+            lud{
                 reason{"deprecated"}
-                replacement{"LU-CL LU-DI LU-RD LU-VD LU-WI"}
+                replacement{"lucl ludi lurd luvd luwi"}
             }
-            LU-G{
+            lug{
                 reason{"deprecated"}
-                replacement{"LU-EC LU-GR LU-RM"}
+                replacement{"luec lugr lurm"}
             }
-            LU-L{
+            lul{
                 reason{"deprecated"}
-                replacement{"LU-CA LU-ES LU-LU LU-ME"}
+                replacement{"luca lues lulu lume"}
             }
-            MR-NKC{
+            mrnkc{
                 reason{"deprecated"}
-                replacement{"MR-13 MR-14 MR-15"}
+                replacement{"mr13 mr14 mr15"}
             }
-            NL-AW{
+            nlaw{
                 reason{"overlong"}
                 replacement{"AW"}
             }
-            NL-CW{
+            nlcw{
                 reason{"overlong"}
                 replacement{"CW"}
             }
-            NL-SX{
+            nlsx{
                 reason{"overlong"}
                 replacement{"SX"}
             }
-            NZ-N{
+            nzn{
                 reason{"deprecated"}
-                replacement{"NZ-AUK NZ-BOP NZ-GIS NZ-HKB NZ-MWT NZ-NTL NZ-TKI NZ-WGN NZ-WKO"}
+                replacement{"nzauk nzbop nzgis nzhkb nzmwt nzntl nztki nzwgn nzwko"}
             }
-            NZ-S{
+            nzs{
                 reason{"deprecated"}
-                replacement{"NZ-CAN NZ-MBH NZ-NSN NZ-OTA NZ-STL NZ-TAS NZ-WTC"}
+                replacement{"nzcan nzmbh nznsn nzota nzstl nztas nzwtc"}
             }
-            OM-BA{
+            omba{
                 reason{"deprecated"}
-                replacement{"OM-BJ OM-BS"}
+                replacement{"ombj ombs"}
             }
-            OM-SH{
+            omsh{
                 reason{"deprecated"}
-                replacement{"OM-SJ OM-SS"}
+                replacement{"omsj omss"}
+            }
+            shta{
+                reason{"overlong"}
+                replacement{"TA"}
             }
-            TT-ETO{
+            tteto{
                 reason{"deprecated"}
-                replacement{"TT-TOB"}
+                replacement{"tttob"}
             }
-            TT-RCM{
+            ttrcm{
                 reason{"deprecated"}
-                replacement{"TT-MRC"}
+                replacement{"ttmrc"}
             }
-            TT-WTO{
+            ttwto{
                 reason{"deprecated"}
-                replacement{"TT-TOB"}
+                replacement{"tttob"}
             }
-            TW-KHQ{
+            twkhq{
                 reason{"deprecated"}
-                replacement{"TW-KHH"}
+                replacement{"twkhh"}
             }
-            TW-TNQ{
+            twtnq{
                 reason{"deprecated"}
-                replacement{"TW-TNN"}
+                replacement{"twtnn"}
             }
-            TW-TPQ{
+            twtpq{
                 reason{"deprecated"}
-                replacement{"TW-NWT"}
+                replacement{"twnwt"}
             }
-            TW-TXQ{
+            twtxq{
                 reason{"deprecated"}
-                replacement{"TW-TXG"}
+                replacement{"twtxg"}
             }
-            US-AS{
+            usas{
                 reason{"overlong"}
                 replacement{"AS"}
             }
-            US-GU{
+            usgu{
                 reason{"overlong"}
                 replacement{"GU"}
             }
-            US-MP{
+            usmp{
                 reason{"overlong"}
                 replacement{"MP"}
             }
-            US-PR{
+            uspr{
                 reason{"overlong"}
                 replacement{"PR"}
             }
-            US-UM{
+            usum{
                 reason{"overlong"}
                 replacement{"UM"}
             }
-            US-VI{
+            usvi{
                 reason{"overlong"}
                 replacement{"VI"}
             }
index 07a4ac4b5c4071f7b58e8d57a9937c173cd7b737..984072d9cdaffa3dd0b9c53b62e648a40f5e5d8f 100644 (file)
@@ -80,10 +80,9 @@ timezoneTypes:table(nofallback){
             "Etc:GMT-0"{"Etc/GMT"}
             "Etc:GMT0"{"Etc/GMT"}
             "Etc:Greenwich"{"Etc/GMT"}
-            "Etc:UCT"{"Etc/GMT"}
-            "Etc:UTC"{"Etc/GMT"}
-            "Etc:Universal"{"Etc/GMT"}
-            "Etc:Zulu"{"Etc/GMT"}
+            "Etc:UCT"{"Etc/UTC"}
+            "Etc:Universal"{"Etc/UTC"}
+            "Etc:Zulu"{"Etc/UTC"}
             "Europe:Belfast"{"Europe/London"}
             "Europe:Nicosia"{"Asia/Nicosia"}
             "Europe:Tiraspol"{"Europe/Chisinau"}
@@ -138,11 +137,11 @@ timezoneTypes:table(nofallback){
             ROK{"Asia/Seoul"}
             Singapore{"Asia/Singapore"}
             Turkey{"Europe/Istanbul"}
-            UCT{"Etc/GMT"}
-            UTC{"Etc/GMT"}
-            Universal{"Etc/GMT"}
+            UCT{"Etc/UTC"}
+            UTC{"Etc/UTC"}
+            Universal{"Etc/UTC"}
             W-SU{"Europe/Moscow"}
-            Zulu{"Etc/GMT"}
+            Zulu{"Etc/UTC"}
         }
     }
     typeMap{
@@ -463,7 +462,7 @@ timezoneTypes:table(nofallback){
             "Australia:Melbourne"{"aumel"}
             "Australia:Perth"{"auper"}
             "Australia:Sydney"{"ausyd"}
-            "Etc:GMT"{"utc"}
+            "Etc:GMT"{"gmt"}
             "Etc:GMT+1"{"utcw01"}
             "Etc:GMT+10"{"utcw10"}
             "Etc:GMT+11"{"utcw11"}
@@ -490,6 +489,7 @@ timezoneTypes:table(nofallback){
             "Etc:GMT-7"{"utce07"}
             "Etc:GMT-8"{"utce08"}
             "Etc:GMT-9"{"utce09"}
+            "Etc:UTC"{"utc"}
             "Etc:Unknown"{"unk"}
             "Europe:Amsterdam"{"nlams"}
             "Europe:Andorra"{"adalv"}
index df06be0ba5dbbda70f588c4752daa0fcf5cccecf..04ed87eb8311cae70e98e8371f6dfb69afefc5a5 100644 (file)
@@ -313,5 +313,5 @@ en{
         MK{"Macedonia (FYROM)"}
         TL{"East Timor"}
     }
-    Version{"2.1.31.94"}
+    Version{"2.1.31.98"}
 }
index 2b8cc8dd67db3c719d65bfec8368742c738a2054..84fc35cb6d611829c0a98842fb172530005b69ae 100644 (file)
@@ -309,5 +309,5 @@ my{
         FK{"ဖော့ကလန် ကျွန်းစု (အီလားစ် မောလ်ဗီနာစ်)"}
         MK{"မက်စီဒိုးနီးယား (ယခင် ယူဂိုစလားဗီးယား မက်စီဒိုးနီးယားပြည်ထောင်စု)"}
     }
-    Version{"2.1.31.86"}
+    Version{"2.1.31.96"}
 }
index 04e64688b7055335836499e5ae4a0ce3f2628a4d..a241d8178652906b3ab1f08e2232c465afc537f4 100644 (file)
@@ -310,5 +310,5 @@ si{
         MK{"මැසිඩෝනියාව (FYROM)"}
         TL{"නැගෙනහිර ටිමෝරය"}
     }
-    Version{"2.1.31.86"}
+    Version{"2.1.31.96"}
 }
index fdf197120187a3899a6f0a829162b3d2c7ce7f70..ea6f3b4cbb240a3a75a46c6074bf159cf9dd915d 100644 (file)
@@ -310,5 +310,5 @@ sw{
         MK{"Masedonia (FYROM)"}
         TL{"Timor ya Mashariki"}
     }
-    Version{"2.1.31.86"}
+    Version{"2.1.31.96"}
 }
index 83a5490b82fdcce16615703151cae512765e740b..1e26add68db5dcafa8fec5e4aed4bb480589f277 100644 (file)
@@ -1,7 +1,7 @@
 // © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html#License
 en{
-    Version{"2.1.31.94"}
+    Version{"2.1.31.98"}
     units{
         acceleration{
             g-force{
index 775cbd890448060526fe347dae92a9067cb46876..07e837b2eb1637afa55fba42ab009fe29d360ca9 100644 (file)
@@ -1,7 +1,7 @@
 // © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html#License
 my{
-    Version{"2.1.31.86"}
+    Version{"2.1.31.96"}
     durationUnits{
         hm{"h:mm"}
         hms{"h:mm:ss"}
index 59e49f220e626d85e0d6d4fba2e38d91013aee25..31da04cc0276048585ca8ec7558a616bba3a8925 100644 (file)
@@ -1,7 +1,7 @@
 // © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html#License
 si{
-    Version{"2.1.31.86"}
+    Version{"2.1.31.96"}
     durationUnits{
         hm{"h.mm"}
         hms{"h.mm.ss"}
index d39d7eccb8115ef2c3ae0f737093808f3b916573..c0dd3ef954a9dd7381bf2de74fb5fe18946402e5 100644 (file)
@@ -1,7 +1,7 @@
 // © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html#License
 sw{
-    Version{"2.1.31.86"}
+    Version{"2.1.31.96"}
     durationUnits{
         hm{"h:mm"}
         hms{"h:mm:ss"}
index 8c29bd1be43b0cfcbbcb3fe12764e0deef093179..3ec2edf7e73bddc5f96bdd991515f8d177f5d6d4 100644 (file)
@@ -1,7 +1,7 @@
 // © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html#License
 en{
-    Version{"2.1.31.94"}
+    Version{"2.1.31.98"}
     zoneStrings{
         "Africa:Sao_Tome"{
             ec{"São Tomé"}
@@ -21,6 +21,10 @@ en{
         "Asia:Saigon"{
             ec{"Ho Chi Minh City"}
         }
+        "Etc:UTC"{
+            ls{"Coordinated Universal Time"}
+            ss{"UTC"}
+        }
         "Etc:Unknown"{
             ec{"Unknown City"}
         }
index 5f952d42301e60991471e1859e213d6b7c55b8da..ef0311d38491e8c63a4fc3f4373c5c8a217f082f 100644 (file)
@@ -1,7 +1,7 @@
 // © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html#License
 my{
-    Version{"2.1.31.86"}
+    Version{"2.1.31.96"}
     zoneStrings{
         "Africa:Abidjan"{
             ec{"အာဘီဂျန်"}
index d8322b36ec3935c9042c5699c591fc94677a63c2..5f5fe5ebea7c32aeb494282b32af8da0b450b42f 100644 (file)
@@ -1,7 +1,7 @@
 // © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html#License
 si{
-    Version{"2.1.31.86"}
+    Version{"2.1.31.96"}
     zoneStrings{
         "Africa:Abidjan"{
             ec{"අබිජාන්"}
index afccd0e35cbc16740171105c2a7bcf8a00fba67a..c280816e4efc9979ed0b29776253be8ddf48bfa3 100644 (file)
@@ -1,7 +1,7 @@
 // © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html#License
 sw{
-    Version{"2.1.31.86"}
+    Version{"2.1.31.96"}
     zoneStrings{
         "Africa:Abidjan"{
             ec{"Abidjan"}
index 40ff3600ff3212ae5715809cd9e96faab8c70b6a..1e2e01de1499bbeeff4c2cbc9dc10f3fb0de902b 100644 (file)
@@ -1205,31 +1205,43 @@ TimeZoneTest::TestAliasedNames()
         /* Generated by org.unicode.cldr.tool.CountItems */
 
         /* zoneID, canonical zoneID */
-        {"Africa/Timbuktu", "Africa/Bamako"},
+        {"Africa/Asmara", "Africa/Addis_Ababa"},
+        {"Africa/Timbuktu", "Africa/Abidjan"},
         {"America/Argentina/Buenos_Aires", "America/Buenos_Aires"},
         {"America/Argentina/Catamarca", "America/Catamarca"},
         {"America/Argentina/ComodRivadavia", "America/Catamarca"},
         {"America/Argentina/Cordoba", "America/Cordoba"},
         {"America/Argentina/Jujuy", "America/Jujuy"},
         {"America/Argentina/Mendoza", "America/Mendoza"},
+        {"America/Atikokan", "America/Coral_Harbour"},
         {"America/Atka", "America/Adak"},
         {"America/Ensenada", "America/Tijuana"},
-        {"America/Fort_Wayne", "America/Indiana/Indianapolis"},
-        {"America/Indianapolis", "America/Indiana/Indianapolis"},
+        {"America/Fort_Wayne", "America/Indianapolis"},
+        {"America/Indiana/Indianapolis", "America/Indianapolis"},
+        {"America/Kentucky/Louisville", "America/Louisville"},
         {"America/Knox_IN", "America/Indiana/Knox"},
-        {"America/Louisville", "America/Kentucky/Louisville"},
         {"America/Porto_Acre", "America/Rio_Branco"},
         {"America/Rosario", "America/Cordoba"},
-        {"America/Virgin", "America/St_Thomas"},
+        {"America/Shiprock", "America/Denver"},
+        {"America/Virgin", "America/Anguilla"},
+        {"Antarctica/South_Pole", "Antarctica/McMurdo"},
         {"Asia/Ashkhabad", "Asia/Ashgabat"},
-        {"Asia/Chungking", "Asia/Chongqing"},
+        {"Asia/Chongqing", "Asia/Shanghai"},
+        {"Asia/Chungking", "Asia/Shanghai"},
         {"Asia/Dacca", "Asia/Dhaka"},
+        {"Asia/Harbin", "Asia/Shanghai"},
+        {"Asia/Ho_Chi_Minh", "Asia/Saigon"},
         {"Asia/Istanbul", "Europe/Istanbul"},
+        {"Asia/Kashgar", "Asia/Urumqi"},
+        {"Asia/Kathmandu", "Asia/Katmandu"},
+        {"Asia/Kolkata", "Asia/Calcutta"},
         {"Asia/Macao", "Asia/Macau"},
         {"Asia/Tel_Aviv", "Asia/Jerusalem"},
         {"Asia/Thimbu", "Asia/Thimphu"},
         {"Asia/Ujung_Pandang", "Asia/Makassar"},
         {"Asia/Ulan_Bator", "Asia/Ulaanbaatar"},
+        {"Atlantic/Faroe", "Atlantic/Faeroe"},
+        {"Atlantic/Jan_Mayen", "Arctic/Longyearbyen"},
         {"Australia/ACT", "Australia/Sydney"},
         {"Australia/Canberra", "Australia/Sydney"},
         {"Australia/LHI", "Australia/Lord_Howe"},
@@ -1257,16 +1269,16 @@ TimeZoneTest::TestAliasedNames()
         {"Chile/Continental", "America/Santiago"},
         {"Chile/EasterIsland", "Pacific/Easter"},
         {"Cuba", "America/Havana"},
+        {"EST", "Etc/GMT+5"},
         {"Egypt", "Africa/Cairo"},
         {"Eire", "Europe/Dublin"},
         {"Etc/GMT+0", "Etc/GMT"},
         {"Etc/GMT-0", "Etc/GMT"},
         {"Etc/GMT0", "Etc/GMT"},
         {"Etc/Greenwich", "Etc/GMT"},
-        {"Etc/UCT", "Etc/GMT"},
-        {"Etc/UTC", "Etc/GMT"},
-        {"Etc/Universal", "Etc/GMT"},
-        {"Etc/Zulu", "Etc/GMT"},
+        {"Etc/UCT", "Etc/UTC"},
+        {"Etc/Universal", "Etc/UTC"},
+        {"Etc/Zulu", "Etc/UTC"},
         {"Europe/Belfast", "Europe/London"},
         {"Europe/Nicosia", "Asia/Nicosia"},
         {"Europe/Tiraspol", "Europe/Chisinau"},
@@ -1277,6 +1289,7 @@ TimeZoneTest::TestAliasedNames()
         {"GMT-0", "Etc/GMT"},
         {"GMT0", "Etc/GMT"},
         {"Greenwich", "Etc/GMT"},
+        {"HST", "Etc/GMT+10"},
         {"Hongkong", "Asia/Hong_Kong"},
         {"Iceland", "Atlantic/Reykjavik"},
         {"Iran", "Asia/Tehran"},
@@ -1285,27 +1298,37 @@ TimeZoneTest::TestAliasedNames()
         {"Japan", "Asia/Tokyo"},
         {"Kwajalein", "Pacific/Kwajalein"},
         {"Libya", "Africa/Tripoli"},
+        {"MST", "Etc/GMT+7"},
         {"Mexico/BajaNorte", "America/Tijuana"},
         {"Mexico/BajaSur", "America/Mazatlan"},
         {"Mexico/General", "America/Mexico_City"},
-        {"NZ", "Pacific/Auckland"},
+        {"NZ", "Antarctica/McMurdo"},
         {"NZ-CHAT", "Pacific/Chatham"},
-        {"Navajo", "America/Shiprock"},
+        {"Navajo", "America/Denver"},
         {"PRC", "Asia/Shanghai"},
-        {"Pacific/Samoa", "Pacific/Pago_Pago"},
+        {"Pacific/Chuuk", "Pacific/Truk"},
+        {"Pacific/Pohnpei", "Pacific/Ponape"},
+        {"Pacific/Samoa", "Pacific/Midway"},
         {"Pacific/Yap", "Pacific/Truk"},
         {"Poland", "Europe/Warsaw"},
         {"Portugal", "Europe/Lisbon"},
         {"ROC", "Asia/Taipei"},
         {"ROK", "Asia/Seoul"},
         {"Singapore", "Asia/Singapore"},
+        {"SystemV/AST4", "Etc/GMT+4"},
+        {"SystemV/CST6", "Etc/GMT+6"},
+        {"SystemV/EST5", "Etc/GMT+5"},
+        {"SystemV/HST10", "Etc/GMT+10"},
+        {"SystemV/MST7", "Etc/GMT+7"},
+        {"SystemV/PST8", "Etc/GMT+8"},
+        {"SystemV/YST9", "Etc/GMT+9"},
         {"Turkey", "Europe/Istanbul"},
-        {"UCT", "Etc/GMT"},
+        {"UCT", "Etc/UTC"},
         {"US/Alaska", "America/Anchorage"},
         {"US/Aleutian", "America/Adak"},
         {"US/Arizona", "America/Phoenix"},
         {"US/Central", "America/Chicago"},
-        {"US/East-Indiana", "America/Indiana/Indianapolis"},
+        {"US/East-Indiana", "America/Indianapolis"},
         {"US/Eastern", "America/New_York"},
         {"US/Hawaii", "Pacific/Honolulu"},
         {"US/Indiana-Starke", "America/Indiana/Knox"},
@@ -1313,13 +1336,12 @@ TimeZoneTest::TestAliasedNames()
         {"US/Mountain", "America/Denver"},
         {"US/Pacific", "America/Los_Angeles"},
         {"US/Pacific-New", "America/Los_Angeles"},
-        {"US/Samoa", "Pacific/Pago_Pago"},
-        {"UTC", "Etc/GMT"},
-        {"Universal", "Etc/GMT"},
+        {"US/Samoa", "Pacific/Midway"},
+        {"UTC", "Etc/UTC"},
+        {"Universal", "Etc/UTC"},
         {"W-SU", "Europe/Moscow"},
-        {"Zulu", "Etc/GMT"},
-        /* Total: 113 */
-
+        {"Zulu", "Etc/UTC"},
+        /* Total: 136 */
     };
 
     TimeZone::EDisplayType styles[] = { TimeZone::SHORT, TimeZone::LONG };
index 47944f05dc9631223a0d567c67a76fcd0e967be5..f30965e90e5efbde60ce57a4e89666d0661a4f0d 100755 (executable)
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:297144f683a1a46ffcc32a3e5f4e2431fcecc381520978510fe85bec01ab16a3
-size 12149297
+oid sha256:95b530f014803a19df9afcc4d84410624a398fe8883176123ac5fae8f4c55806
+size 12149619
index 67f66be206f667d70f6b7d35194a25f1e291f55d..f343dae97666cb5821ad1b92fcc5458c9268333d 100755 (executable)
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d4592320eb22e83f76f0182fbbf57eb0f5f6808c10f5eb742cf3fb1cf65be0f8
-size 92197
+oid sha256:06688c27b5423eff19aaea21c8a6052d33cbea41ac90f8b5e7713bd22bd01fe7
+size 92210
index db420037bbea0a8ed819df6e015a46fba7f980a3..aba70dc87eb2d1f7afa92a2bf3a2c023a9c37867 100755 (executable)
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a75923bde01f041396cd6f8eb329676f4b4007316bc1134ac26e5161d5615340
-size 812722
+oid sha256:6c9163ed20dbebfb2ac6c96da35e6202de0e2c5b791e8ab3ea57f42fabbf6ce8
+size 812721