diff --git a/source/data/curr/af.txt b/source/data/curr/af.txt
index fdd75f3..2a58e8d 100644
--- a/source/data/curr/af.txt
+++ b/source/data/curr/af.txt
@@ -264,7 +264,7 @@ af{
             "Israeliese nuwe sikkel",
         }
         INR{
-            "₹",
+            "Rs.",
             "Indiese roepee",
         }
         IQD{
diff --git a/source/data/curr/agq.txt b/source/data/curr/agq.txt
index 969e9e4..24e8987 100755
--- a/source/data/curr/agq.txt
+++ b/source/data/curr/agq.txt
@@ -96,7 +96,7 @@ agq{
             "Fàlâŋ è Ginè",
         }
         INR{
-            "₹",
+            "Rs.",
             "Lukpì è Endìa",
         }
         JPY{
diff --git a/source/data/curr/ak.txt b/source/data/curr/ak.txt
index ba52f7d..9665200 100755
--- a/source/data/curr/ak.txt
+++ b/source/data/curr/ak.txt
@@ -96,7 +96,7 @@ ak{
             "Gini Frank",
         }
         INR{
-            "₹",
+            "Rs.",
             "India Rupi",
         }
         JPY{
diff --git a/source/data/curr/am.txt b/source/data/curr/am.txt
index 0078d33..58fb09b 100644
--- a/source/data/curr/am.txt
+++ b/source/data/curr/am.txt
@@ -260,7 +260,7 @@ am{
             "የእስራኤል አዲስ ሽቅል",
         }
         INR{
-            "₹",
+            "Rs.",
             "የሕንድ ሩፒ",
         }
         IQD{
diff --git a/source/data/curr/asa.txt b/source/data/curr/asa.txt
index ef389da..d3003b7 100755
--- a/source/data/curr/asa.txt
+++ b/source/data/curr/asa.txt
@@ -96,7 +96,7 @@ asa{
             "faranga ya Gine",
         }
         INR{
-            "₹",
+            "Rs.",
             "rupia ya India",
         }
         JPY{
diff --git a/source/data/curr/az.txt b/source/data/curr/az.txt
index 0e0146a..be2b03b 100644
--- a/source/data/curr/az.txt
+++ b/source/data/curr/az.txt
@@ -452,7 +452,7 @@ az{
             "İsrail Yeni Şekeli",
         }
         INR{
-            "₹",
+            "Rs.",
             "Hindistan Rupisi",
         }
         IQD{
diff --git a/source/data/curr/az_Cyrl_AZ.txt b/source/data/curr/az_Cyrl_AZ.txt
new file mode 100644
index 0000000..34897f4
--- /dev/null
+++ b/source/data/curr/az_Cyrl_AZ.txt
@@ -0,0 +1,12 @@
+﻿// ***************************************************************************
+// *
+// * Copyright (C) 2014 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/az_Cyrl_AZ.xml
+// *
+// ***************************************************************************
+az_Cyrl_AZ{
+    %%Parent{"az_Cyrl"}
+    Version{"2.1.6.69"}
+}
diff --git a/source/data/curr/bas.txt b/source/data/curr/bas.txt
index c88fda4..a1b82c5 100755
--- a/source/data/curr/bas.txt
+++ b/source/data/curr/bas.txt
@@ -96,7 +96,7 @@ bas{
             "Frǎŋ gìnê",
         }
         INR{
-            "₹",
+            "Rs.",
             "Rùpi īndìà",
         }
         JPY{
diff --git a/source/data/curr/be.txt b/source/data/curr/be.txt
index 609da39..9cd52eb 100644
--- a/source/data/curr/be.txt
+++ b/source/data/curr/be.txt
@@ -40,7 +40,7 @@ be{
             "англійскі фунт",
         }
         INR{
-            "₹",
+            "Rs.",
             "індыйская рупія",
         }
         JPY{
diff --git a/source/data/curr/bez.txt b/source/data/curr/bez.txt
index 16d056d..3ba4a6d 100755
--- a/source/data/curr/bez.txt
+++ b/source/data/curr/bez.txt
@@ -96,7 +96,7 @@ bez{
             "Lupila lwa Hujine",
         }
         INR{
-            "₹",
+            "Rs.",
             "Lupila lwa Huindia",
         }
         JPY{
diff --git a/source/data/curr/bm.txt b/source/data/curr/bm.txt
index 19e3797..d85e3b0 100755
--- a/source/data/curr/bm.txt
+++ b/source/data/curr/bm.txt
@@ -96,7 +96,7 @@ bm{
             "gine Fraŋ",
         }
         INR{
-            "₹",
+            "Rs.",
             "Ɛndu Rupi",
         }
         JPY{
diff --git a/source/data/curr/bn.txt b/source/data/curr/bn.txt
index 33f0712..91faadc 100644
--- a/source/data/curr/bn.txt
+++ b/source/data/curr/bn.txt
@@ -456,7 +456,7 @@ bn{
             "ইস্রাইলি নতুন শেকেল",
         }
         INR{
-            "₹",
+            "Rs.",
             "ভারতীয় রুপি",
         }
         IQD{
diff --git a/source/data/curr/bo.txt b/source/data/curr/bo.txt
index 6b12032..b9781a0 100644
--- a/source/data/curr/bo.txt
+++ b/source/data/curr/bo.txt
@@ -16,7 +16,7 @@ bo{
             "ཡུ་ཨན་",
         }
         INR{
-            "₹",
+            "Rs.",
             "རྒྱ་གར་སྒོར་མོ་",
         }
         XXX{
diff --git a/source/data/curr/br.txt b/source/data/curr/br.txt
index dbbc365..e138a44 100755
--- a/source/data/curr/br.txt
+++ b/source/data/curr/br.txt
@@ -416,7 +416,7 @@ br{
             "shekel nevez Israel",
         }
         INR{
-            "₹",
+            "Rs.",
             "roupi India",
         }
         IQD{
diff --git a/source/data/curr/brx.txt b/source/data/curr/brx.txt
index ca5c516..8afc7cb 100755
--- a/source/data/curr/brx.txt
+++ b/source/data/curr/brx.txt
@@ -452,7 +452,7 @@ brx{
             "इस्राइली शेकेल",
         }
         INR{
-            "₹",
+            "Rs.",
             "रां",
         }
         IQD{
diff --git a/source/data/curr/bs.txt b/source/data/curr/bs.txt
index 3bbb92b..d252816 100644
--- a/source/data/curr/bs.txt
+++ b/source/data/curr/bs.txt
@@ -472,7 +472,7 @@ bs{
             "Izraelski novi šekel",
         }
         INR{
-            "₹",
+            "Rs.",
             "Indijska rupija",
         }
         IQD{
diff --git a/source/data/curr/bs_Cyrl.txt b/source/data/curr/bs_Cyrl.txt
index 9ce7938..cd9d15d 100755
--- a/source/data/curr/bs_Cyrl.txt
+++ b/source/data/curr/bs_Cyrl.txt
@@ -461,7 +461,7 @@ bs_Cyrl{
             "Израелски нови шекел",
         }
         INR{
-            "₹",
+            "Rs.",
             "Индијски Рупи",
         }
         IQD{
diff --git a/source/data/curr/ca.txt b/source/data/curr/ca.txt
index 7325329..6920353 100644
--- a/source/data/curr/ca.txt
+++ b/source/data/curr/ca.txt
@@ -501,7 +501,7 @@ ca{
             "nou xéquel israelià",
         }
         INR{
-            "₹",
+            "Rs.",
             "rupia índia",
         }
         IQD{
diff --git a/source/data/curr/cgg.txt b/source/data/curr/cgg.txt
index 1a11f94..e1b212c 100755
--- a/source/data/curr/cgg.txt
+++ b/source/data/curr/cgg.txt
@@ -96,7 +96,7 @@ cgg{
             "Faranga ya Guinea",
         }
         INR{
-            "₹",
+            "Rs.",
             "Rupiya ya India",
         }
         JPY{
diff --git a/source/data/curr/chr.txt b/source/data/curr/chr.txt
index 02b7f99..ef9f242 100755
--- a/source/data/curr/chr.txt
+++ b/source/data/curr/chr.txt
@@ -32,7 +32,7 @@ chr{
             "ᎩᎵᏏᏲ ᎠᏕᎳ",
         }
         INR{
-            "₹",
+            "Rs.",
             "ᎢᏅᏗᎾ ᎠᏕᎳ",
         }
         JPY{
diff --git a/source/data/curr/cy.txt b/source/data/curr/cy.txt
index c349013..fb4b09b 100644
--- a/source/data/curr/cy.txt
+++ b/source/data/curr/cy.txt
@@ -260,7 +260,7 @@ cy{
             "Shegel Newydd Israel",
         }
         INR{
-            "₹",
+            "Rs.",
             "Rwpî India",
         }
         IQD{
diff --git a/source/data/curr/da.txt b/source/data/curr/da.txt
index 5248673..a7fdc68 100644
--- a/source/data/curr/da.txt
+++ b/source/data/curr/da.txt
@@ -444,7 +444,7 @@ da{
             "Ny israelsk shekel",
         }
         INR{
-            "₹",
+            "Rs.",
             "Indisk rupee",
         }
         IQD{
diff --git a/source/data/curr/dav.txt b/source/data/curr/dav.txt
index ede0afd..10ff4aa 100755
--- a/source/data/curr/dav.txt
+++ b/source/data/curr/dav.txt
@@ -96,7 +96,7 @@ dav{
             "Faranga ya Gine",
         }
         INR{
-            "₹",
+            "Rs.",
             "Rupia ya India",
         }
         JPY{
diff --git a/source/data/curr/de.txt b/source/data/curr/de.txt
index 314cff7..0c1f8cf 100644
--- a/source/data/curr/de.txt
+++ b/source/data/curr/de.txt
@@ -500,7 +500,7 @@ de{
             "Israelischer Neuer Schekel",
         }
         INR{
-            "₹",
+            "Rs.",
             "Indische Rupie",
         }
         IQD{
diff --git a/source/data/curr/dje.txt b/source/data/curr/dje.txt
index 5400ac0..022a604 100755
--- a/source/data/curr/dje.txt
+++ b/source/data/curr/dje.txt
@@ -96,7 +96,7 @@ dje{
             "Ginee Fraŋ",
         }
         INR{
-            "₹",
+            "Rs.",
             "Indu Rupii",
         }
         JPY{
diff --git a/source/data/curr/dsb.txt b/source/data/curr/dsb.txt
index e5930fb..4a328cd 100644
--- a/source/data/curr/dsb.txt
+++ b/source/data/curr/dsb.txt
@@ -348,7 +348,7 @@ dsb{
             "israelski nowy šekel",
         }
         INR{
-            "₹",
+            "Rs.",
             "indiska rupija",
         }
         IQD{
diff --git a/source/data/curr/dyo.txt b/source/data/curr/dyo.txt
index feba2af..a8d2af2 100755
--- a/source/data/curr/dyo.txt
+++ b/source/data/curr/dyo.txt
@@ -84,7 +84,7 @@ dyo{
             "sili yati Giné",
         }
         INR{
-            "₹",
+            "Rs.",
             "rupii yati End",
         }
         JPY{
diff --git a/source/data/curr/dz.txt b/source/data/curr/dz.txt
index 2e39b7b..a5099c9 100755
--- a/source/data/curr/dz.txt
+++ b/source/data/curr/dz.txt
@@ -96,7 +96,7 @@ dz{
             "ཨིས་རེལ་གྱི་དངུལ་གསརཔ་ ཤེ་ཀེལ",
         }
         INR{
-            "₹",
+            "Rs.",
             "རྒྱ་གར་གྱི་དངུལ་ རུ་པི",
         }
         IQD{
diff --git a/source/data/curr/ebu.txt b/source/data/curr/ebu.txt
index e52285b..ce3ef18 100755
--- a/source/data/curr/ebu.txt
+++ b/source/data/curr/ebu.txt
@@ -96,7 +96,7 @@ ebu{
             "Faranga ya Gine",
         }
         INR{
-            "₹",
+            "Rs.",
             "Rupia ya India",
         }
         JPY{
diff --git a/source/data/curr/ee.txt b/source/data/curr/ee.txt
index 74d09b2..8f92043 100755
--- a/source/data/curr/ee.txt
+++ b/source/data/curr/ee.txt
@@ -500,7 +500,7 @@ ee{
             "israelga yeyetɔ sheqel",
         }
         INR{
-            "₹",
+            "Rs.",
             "indiaga rupee",
         }
         IQD{
diff --git a/source/data/curr/el.txt b/source/data/curr/el.txt
index c5ef590..4fc5c0e 100644
--- a/source/data/curr/el.txt
+++ b/source/data/curr/el.txt
@@ -453,7 +453,7 @@ el{
             "Νέο Σέκελ Ισραήλ",
         }
         INR{
-            "₹",
+            "Rs.",
             "Ρουπία Ινδίας",
         }
         IQD{
diff --git a/source/data/curr/en.txt b/source/data/curr/en.txt
index 1965617..e087a33 100644
--- a/source/data/curr/en.txt
+++ b/source/data/curr/en.txt
@@ -500,7 +500,7 @@ en{
             "Israeli New Sheqel",
         }
         INR{
-            "₹",
+            "Rs.",
             "Indian Rupee",
         }
         IQD{
@@ -796,7 +796,7 @@ en{
             "Papua New Guinean Kina",
         }
         PHP{
-            "PHP",
+            "Php",
             "Philippine Peso",
         }
         PKR{
diff --git a/source/data/curr/en_GB.txt b/source/data/curr/en_GB.txt
index d7f7506..6fdd678 100755
--- a/source/data/curr/en_GB.txt
+++ b/source/data/curr/en_GB.txt
@@ -386,7 +386,7 @@ en_GB{
             "Israeli New Shekel",
         }
         INR{
-            "₹",
+            "Rs.",
             "Indian Rupee",
         }
         IQD{
diff --git a/source/data/curr/et.txt b/source/data/curr/et.txt
index c5e01e6..facec0e 100644
--- a/source/data/curr/et.txt
+++ b/source/data/curr/et.txt
@@ -389,7 +389,7 @@ et{
             "Iisraeli uus seekel",
         }
         INR{
-            "₹",
+            "Rs.",
             "India ruupia",
         }
         IQD{
diff --git a/source/data/curr/eu.txt b/source/data/curr/eu.txt
index 89e7c1b..785f33b 100644
--- a/source/data/curr/eu.txt
+++ b/source/data/curr/eu.txt
@@ -265,7 +265,7 @@ eu{
             "Israeleko sheqel berria",
         }
         INR{
-            "₹",
+            "Rs.",
             "Indiako errupia",
         }
         IQD{
diff --git a/source/data/curr/ewo.txt b/source/data/curr/ewo.txt
index a8a6fba..20f6bcb 100755
--- a/source/data/curr/ewo.txt
+++ b/source/data/curr/ewo.txt
@@ -96,7 +96,7 @@ ewo{
             "Síli yá Giné",
         }
         INR{
-            "₹",
+            "Rs.",
             "Rupí yá ɛ́ndía",
         }
         JPY{
diff --git a/source/data/curr/fa.txt b/source/data/curr/fa.txt
index 8d2f65d..81f8acf 100644
--- a/source/data/curr/fa.txt
+++ b/source/data/curr/fa.txt
@@ -332,7 +332,7 @@ fa{
             "شقل جدید اسرائیل",
         }
         INR{
-            "₹",
+            "Rs.",
             "روپیهٔ هند",
         }
         IQD{
diff --git a/source/data/curr/ff.txt b/source/data/curr/ff.txt
index 375b6d7..a9c7926 100755
--- a/source/data/curr/ff.txt
+++ b/source/data/curr/ff.txt
@@ -96,7 +96,7 @@ ff{
             "Faraa Gine",
         }
         INR{
-            "₹",
+            "Rs.",
             "Rupii Enndo",
         }
         JPY{
diff --git a/source/data/curr/fil.txt b/source/data/curr/fil.txt
index 6580341..2f3230a 100755
--- a/source/data/curr/fil.txt
+++ b/source/data/curr/fil.txt
@@ -268,7 +268,7 @@ fil{
             "Israeli New Sheqel",
         }
         INR{
-            "₹",
+            "Rs.",
             "Indian Rupee",
         }
         IQD{
diff --git a/source/data/curr/fr.txt b/source/data/curr/fr.txt
index b93c67c..6039e59 100644
--- a/source/data/curr/fr.txt
+++ b/source/data/curr/fr.txt
@@ -460,7 +460,7 @@ fr{
             "nouveau shekel israélien",
         }
         INR{
-            "₹",
+            "Rs.",
             "roupie indienne",
         }
         IQD{
diff --git a/source/data/curr/fur.txt b/source/data/curr/fur.txt
index 3ba0449..1acc9f4 100644
--- a/source/data/curr/fur.txt
+++ b/source/data/curr/fur.txt
@@ -112,7 +112,7 @@ fur{
             "rupiah indonesiane",
         }
         INR{
-            "₹",
+            "Rs.",
             "rupie indiane",
         }
         IRR{
diff --git a/source/data/curr/fy.txt b/source/data/curr/fy.txt
index 09632dd..5fbf0cf 100644
--- a/source/data/curr/fy.txt
+++ b/source/data/curr/fy.txt
@@ -488,7 +488,7 @@ fy{
             "Israëlyske nieuwe shekel",
         }
         INR{
-            "₹",
+            "Rs.",
             "Indiase roepie",
         }
         IQD{
diff --git a/source/data/curr/ga.txt b/source/data/curr/ga.txt
index 88882a7..246f3b5 100644
--- a/source/data/curr/ga.txt
+++ b/source/data/curr/ga.txt
@@ -480,7 +480,7 @@ ga{
             "Seiceal Nua Iosrael",
         }
         INR{
-            "₹",
+            "Rs.",
             "Rúipí na hIndia",
         }
         IQD{
diff --git a/source/data/curr/gd.txt b/source/data/curr/gd.txt
index 71c6238..92c9d2b 100644
--- a/source/data/curr/gd.txt
+++ b/source/data/curr/gd.txt
@@ -500,7 +500,7 @@ gd{
             "Sheqel ùr Iosraeleach",
         }
         INR{
-            "₹",
+            "Rs.",
             "Rupee Innseanach",
         }
         IQD{
diff --git a/source/data/curr/gl.txt b/source/data/curr/gl.txt
index a6c1e8b..d717425 100644
--- a/source/data/curr/gl.txt
+++ b/source/data/curr/gl.txt
@@ -357,7 +357,7 @@ gl{
             "Novo shequel israelí",
         }
         INR{
-            "₹",
+            "Rs.",
             "Rupia india",
         }
         IQD{
diff --git a/source/data/curr/gsw.txt b/source/data/curr/gsw.txt
index 9f54051..7714495 100644
--- a/source/data/curr/gsw.txt
+++ b/source/data/curr/gsw.txt
@@ -452,7 +452,7 @@ gsw{
             "Schekel",
         }
         INR{
-            "₹",
+            "Rs.",
             "Indischi Rupie",
         }
         IQD{
diff --git a/source/data/curr/gu.txt b/source/data/curr/gu.txt
index 4aa62db..7b26385 100644
--- a/source/data/curr/gu.txt
+++ b/source/data/curr/gu.txt
@@ -256,7 +256,7 @@ gu{
             "ઇઝરાયેલી ન્યુ શેકલ",
         }
         INR{
-            "₹",
+            "Rs.",
             "ભારતીય રૂપિયા",
         }
         IQD{
diff --git a/source/data/curr/guz.txt b/source/data/curr/guz.txt
index a8250f4..ad6fbe8 100755
--- a/source/data/curr/guz.txt
+++ b/source/data/curr/guz.txt
@@ -96,7 +96,7 @@ guz{
             "Faranga ya Gine",
         }
         INR{
-            "₹",
+            "Rs.",
             "Rupia ya India",
         }
         JPY{
diff --git a/source/data/curr/ha.txt b/source/data/curr/ha.txt
index b0f5821..5871b87 100644
--- a/source/data/curr/ha.txt
+++ b/source/data/curr/ha.txt
@@ -96,7 +96,7 @@ ha{
             "Kuɗin Gini",
         }
         INR{
-            "₹",
+            "Rs.",
             "Kuɗin Indiya",
         }
         JPY{
diff --git a/source/data/curr/he.txt b/source/data/curr/he.txt
index d291828..77866f8 100644
--- a/source/data/curr/he.txt
+++ b/source/data/curr/he.txt
@@ -360,7 +360,7 @@ he{
             "ש״ח",
         }
         INR{
-            "₹",
+            "Rs.",
             "רופי הודי",
         }
         IQD{
diff --git a/source/data/curr/hi.txt b/source/data/curr/hi.txt
index f467133..812fa28 100644
--- a/source/data/curr/hi.txt
+++ b/source/data/curr/hi.txt
@@ -284,7 +284,7 @@ hi{
             "इज़राइली न्यू शेकेल",
         }
         INR{
-            "₹",
+            "Rs.",
             "भारतीय रुपया",
         }
         IQD{
diff --git a/source/data/curr/hsb.txt b/source/data/curr/hsb.txt
index 70851af..155ccc5 100644
--- a/source/data/curr/hsb.txt
+++ b/source/data/curr/hsb.txt
@@ -348,7 +348,7 @@ hsb{
             "israelski nowy šekel",
         }
         INR{
-            "₹",
+            "Rs.",
             "indiska rupija",
         }
         IQD{
diff --git a/source/data/curr/hy.txt b/source/data/curr/hy.txt
index 2fc6985..d12f974 100644
--- a/source/data/curr/hy.txt
+++ b/source/data/curr/hy.txt
@@ -256,7 +256,7 @@ hy{
             "Իսրայելի նոր շեկել",
         }
         INR{
-            "₹",
+            "Rs.",
             "Հնդկական ռուփի",
         }
         IQD{
diff --git a/source/data/curr/it.txt b/source/data/curr/it.txt
index bd41683..32f02e5 100644
--- a/source/data/curr/it.txt
+++ b/source/data/curr/it.txt
@@ -444,7 +444,7 @@ it{
             "Nuovo siclo israeliano",
         }
         INR{
-            "₹",
+            "Rs.",
             "Rupia Indiana",
         }
         IQD{
diff --git a/source/data/curr/ja.txt b/source/data/curr/ja.txt
index bbba119..f60e61c 100644
--- a/source/data/curr/ja.txt
+++ b/source/data/curr/ja.txt
@@ -500,7 +500,7 @@ ja{
             "イスラエル新シェケル",
         }
         INR{
-            "₹",
+            "Rs.",
             "インド ルピー",
         }
         IQD{
diff --git a/source/data/curr/jmc.txt b/source/data/curr/jmc.txt
index 23c6dd2..d94e2c9 100755
--- a/source/data/curr/jmc.txt
+++ b/source/data/curr/jmc.txt
@@ -96,7 +96,7 @@ jmc{
             "Faranga ya Gine",
         }
         INR{
-            "₹",
+            "Rs.",
             "Rupia ya India",
         }
         JPY{
diff --git a/source/data/curr/kab.txt b/source/data/curr/kab.txt
index c670966..7e8b120 100755
--- a/source/data/curr/kab.txt
+++ b/source/data/curr/kab.txt
@@ -96,7 +96,7 @@ kab{
             "Afrank Aɣini",
         }
         INR{
-            "₹",
+            "Rs.",
             "Arupi Ahendi",
         }
         JPY{
diff --git a/source/data/curr/kam.txt b/source/data/curr/kam.txt
index 98bf077..d114cea 100755
--- a/source/data/curr/kam.txt
+++ b/source/data/curr/kam.txt
@@ -96,7 +96,7 @@ kam{
             "Faranga ya Gine",
         }
         INR{
-            "₹",
+            "Rs.",
             "Rupia ya India",
         }
         JPY{
diff --git a/source/data/curr/kde.txt b/source/data/curr/kde.txt
index 180b4cc..5120e85 100755
--- a/source/data/curr/kde.txt
+++ b/source/data/curr/kde.txt
@@ -96,7 +96,7 @@ kde{
             "Faranga ya Gine",
         }
         INR{
-            "₹",
+            "Rs.",
             "Rupia ya India",
         }
         JPY{
diff --git a/source/data/curr/kea.txt b/source/data/curr/kea.txt
index d32d8bd..5d4eac5 100755
--- a/source/data/curr/kea.txt
+++ b/source/data/curr/kea.txt
@@ -197,7 +197,7 @@ kea{
             "ILS",
         }
         INR{
-            "₹",
+            "Rs.",
             "Rupia indianu",
         }
         IQD{
diff --git a/source/data/curr/khq.txt b/source/data/curr/khq.txt
index 62d41fe..159351f 100755
--- a/source/data/curr/khq.txt
+++ b/source/data/curr/khq.txt
@@ -96,7 +96,7 @@ khq{
             "Ginee Fraŋ",
         }
         INR{
-            "₹",
+            "Rs.",
             "Indu Rupii",
         }
         JPY{
diff --git a/source/data/curr/ki.txt b/source/data/curr/ki.txt
index 8ada81e..9f78a55 100755
--- a/source/data/curr/ki.txt
+++ b/source/data/curr/ki.txt
@@ -96,7 +96,7 @@ ki{
             "Faranga ya Gine",
         }
         INR{
-            "₹",
+            "Rs.",
             "Rubia rwa India",
         }
         JPY{
diff --git a/source/data/curr/kk.txt b/source/data/curr/kk.txt
index a81d948..73979ae 100644
--- a/source/data/curr/kk.txt
+++ b/source/data/curr/kk.txt
@@ -256,7 +256,7 @@ kk{
             "Израиль жаңа шекелі",
         }
         INR{
-            "₹",
+            "Rs.",
             "Үнді рупиясы",
         }
         IQD{
diff --git a/source/data/curr/kln.txt b/source/data/curr/kln.txt
index f31ab06..2a8d953 100755
--- a/source/data/curr/kln.txt
+++ b/source/data/curr/kln.txt
@@ -96,7 +96,7 @@ kln{
             "Rabisiekab Guinea",
         }
         INR{
-            "₹",
+            "Rs.",
             "Rabisiekab India",
         }
         JPY{
diff --git a/source/data/curr/km.txt b/source/data/curr/km.txt
index cfd6dbc..0a5a4e4 100644
--- a/source/data/curr/km.txt
+++ b/source/data/curr/km.txt
@@ -256,7 +256,7 @@ km{
             "ស្ស៊ីហ្គែល​អ៊ីស្រាអែល",
         }
         INR{
-            "₹",
+            "Rs.",
             "រ៉ូពី​ឥណ្ឌា",
         }
         IQD{
diff --git a/source/data/curr/kn.txt b/source/data/curr/kn.txt
index a219ed6..b10b999 100644
--- a/source/data/curr/kn.txt
+++ b/source/data/curr/kn.txt
@@ -256,7 +256,7 @@ kn{
             "ಇಸ್ರೇಲಿ ನ್ಯೂ ಶೇಖಲ್",
         }
         INR{
-            "₹",
+            "Rs.",
             "ಭಾರತೀಯ ರುಪಾಯಿ",
         }
         IQD{
diff --git a/source/data/curr/ko.txt b/source/data/curr/ko.txt
index 08653b5..98af271 100644
--- a/source/data/curr/ko.txt
+++ b/source/data/curr/ko.txt
@@ -488,7 +488,7 @@ ko{
             "이스라엘 신권 세켈",
         }
         INR{
-            "₹",
+            "Rs.",
             "인도 루피",
         }
         IQD{
diff --git a/source/data/curr/ks.txt b/source/data/curr/ks.txt
index 4ed10c0..5be1d54 100755
--- a/source/data/curr/ks.txt
+++ b/source/data/curr/ks.txt
@@ -396,7 +396,7 @@ ks{
             "اِزرٲیِلی نٔوۍ شٮ۪قٕل",
         }
         INR{
-            "₹",
+            "Rs.",
             "ہِندُستٲنۍ رۄپَے",
         }
         IQD{
diff --git a/source/data/curr/ksb.txt b/source/data/curr/ksb.txt
index 28d543c..7038523 100755
--- a/source/data/curr/ksb.txt
+++ b/source/data/curr/ksb.txt
@@ -96,7 +96,7 @@ ksb{
             "falanga ya Gine",
         }
         INR{
-            "₹",
+            "Rs.",
             "lupia ya India",
         }
         JPY{
diff --git a/source/data/curr/ksf.txt b/source/data/curr/ksf.txt
index 1ce385d..5b4d659 100755
--- a/source/data/curr/ksf.txt
+++ b/source/data/curr/ksf.txt
@@ -96,7 +96,7 @@ ksf{
             "mɔni mǝ á ginɛ́",
         }
         INR{
-            "₹",
+            "Rs.",
             "mɔni mǝ á indí",
         }
         JPY{
diff --git a/source/data/curr/ksh.txt b/source/data/curr/ksh.txt
index 0e0a876..fb11456 100644
--- a/source/data/curr/ksh.txt
+++ b/source/data/curr/ksh.txt
@@ -264,7 +264,7 @@ ksh{
             "ißraeelesche Schekel",
         }
         INR{
-            "₹",
+            "Rs.",
             "indesche Ruupije",
         }
         IQD{
diff --git a/source/data/curr/lag.txt b/source/data/curr/lag.txt
index a9f6570..3aa2e48 100755
--- a/source/data/curr/lag.txt
+++ b/source/data/curr/lag.txt
@@ -96,7 +96,7 @@ lag{
             "Faráanga ya Gíine",
         }
         INR{
-            "₹",
+            "Rs.",
             "Rupía ya Índia",
         }
         JPY{
diff --git a/source/data/curr/lb.txt b/source/data/curr/lb.txt
index 556a514..8b94612 100644
--- a/source/data/curr/lb.txt
+++ b/source/data/curr/lb.txt
@@ -456,7 +456,7 @@ lb{
             "Israeleschen Neie Schekel",
         }
         INR{
-            "₹",
+            "Rs.",
             "Indesch Rupie",
         }
         IQD{
diff --git a/source/data/curr/lg.txt b/source/data/curr/lg.txt
index 8ca5368..ef3ed1a 100755
--- a/source/data/curr/lg.txt
+++ b/source/data/curr/lg.txt
@@ -96,7 +96,7 @@ lg{
             "Faranga ey’eGini",
         }
         INR{
-            "₹",
+            "Rs.",
             "Rupiya ey’eBuyindi",
         }
         JPY{
diff --git a/source/data/curr/ln.txt b/source/data/curr/ln.txt
index 3385123..c6a083c 100755
--- a/source/data/curr/ln.txt
+++ b/source/data/curr/ln.txt
@@ -96,7 +96,7 @@ ln{
             "Falánga ya Ginɛ",
         }
         INR{
-            "₹",
+            "Rs.",
             "Rupi ya Índɛ",
         }
         JPY{
diff --git a/source/data/curr/lo.txt b/source/data/curr/lo.txt
index 25db878..c3becd6 100755
--- a/source/data/curr/lo.txt
+++ b/source/data/curr/lo.txt
@@ -488,7 +488,7 @@ lo{
             "ອິສ​ຣາ​ເອວ​ລິ ນິວ ເຊ​ເກວ",
         }
         INR{
-            "₹",
+            "Rs.",
             "ອິນ​ເດຍ ຣູ​ປີ",
         }
         IQD{
diff --git a/source/data/curr/lu.txt b/source/data/curr/lu.txt
index fb885a5..370c6d1 100755
--- a/source/data/curr/lu.txt
+++ b/source/data/curr/lu.txt
@@ -96,7 +96,7 @@ lu{
             "Nfalanga wa Ngina",
         }
         INR{
-            "₹",
+            "Rs.",
             "Rupi wa Inde",
         }
         JPY{
diff --git a/source/data/curr/luo.txt b/source/data/curr/luo.txt
index c271518..7b452e9 100755
--- a/source/data/curr/luo.txt
+++ b/source/data/curr/luo.txt
@@ -96,7 +96,7 @@ luo{
             "Faranga ya Gine",
         }
         INR{
-            "₹",
+            "Rs.",
             "Rupia ya India",
         }
         JPY{
diff --git a/source/data/curr/luy.txt b/source/data/curr/luy.txt
index e0c5580..9f3a8c8 100755
--- a/source/data/curr/luy.txt
+++ b/source/data/curr/luy.txt
@@ -96,7 +96,7 @@ luy{
             "Faranga ya Gine",
         }
         INR{
-            "₹",
+            "Rs.",
             "Rupia ya India",
         }
         JPY{
diff --git a/source/data/curr/lv.txt b/source/data/curr/lv.txt
index 827d9f5..7bb9839 100644
--- a/source/data/curr/lv.txt
+++ b/source/data/curr/lv.txt
@@ -304,7 +304,7 @@ lv{
             "Izraēlas šekelis",
         }
         INR{
-            "₹",
+            "Rs.",
             "Indijas rūpija",
         }
         IQD{
diff --git a/source/data/curr/mas.txt b/source/data/curr/mas.txt
index d2b32ff..afc577b 100755
--- a/source/data/curr/mas.txt
+++ b/source/data/curr/mas.txt
@@ -96,7 +96,7 @@ mas{
             "Iropiyianí e Gine",
         }
         INR{
-            "₹",
+            "Rs.",
             "Iropiyianí e India",
         }
         JPY{
diff --git a/source/data/curr/mer.txt b/source/data/curr/mer.txt
index 9acf899..1a6854a 100755
--- a/source/data/curr/mer.txt
+++ b/source/data/curr/mer.txt
@@ -96,7 +96,7 @@ mer{
             "Faranga ya Gine",
         }
         INR{
-            "₹",
+            "Rs.",
             "Rupia ya India",
         }
         JPY{
diff --git a/source/data/curr/mfe.txt b/source/data/curr/mfe.txt
index 8fb8832..c82e651 100755
--- a/source/data/curr/mfe.txt
+++ b/source/data/curr/mfe.txt
@@ -96,7 +96,7 @@ mfe{
             "fran gineen",
         }
         INR{
-            "₹",
+            "Rs.",
             "roupi",
         }
         JPY{
diff --git a/source/data/curr/mg.txt b/source/data/curr/mg.txt
index a12c0f7..24a0473 100755
--- a/source/data/curr/mg.txt
+++ b/source/data/curr/mg.txt
@@ -96,7 +96,7 @@ mg{
             "Farantsa Gineanina",
         }
         INR{
-            "₹",
+            "Rs.",
             "Ropia Indianina",
         }
         JPY{
diff --git a/source/data/curr/ml.txt b/source/data/curr/ml.txt
index abf8885..30caa1c 100644
--- a/source/data/curr/ml.txt
+++ b/source/data/curr/ml.txt
@@ -456,7 +456,7 @@ ml{
             "ഇസ്രായേലി ന്യൂ ഷെക്കെൽ",
         }
         INR{
-            "₹",
+            "Rs.",
             "ഇന്ത്യൻ രൂപ",
         }
         IQD{
diff --git a/source/data/curr/mn.txt b/source/data/curr/mn.txt
index 02d8c7d..cc15193 100755
--- a/source/data/curr/mn.txt
+++ b/source/data/curr/mn.txt
@@ -256,7 +256,7 @@ mn{
             "израйлийн шинэ шекел",
         }
         INR{
-            "₹",
+            "Rs.",
             "энэтхэг рупи",
         }
         IQD{
diff --git a/source/data/curr/mr.txt b/source/data/curr/mr.txt
index 4fff57e..2d93042 100644
--- a/source/data/curr/mr.txt
+++ b/source/data/curr/mr.txt
@@ -256,7 +256,7 @@ mr{
             "ईस्त्रायली न्यू शेकेल",
         }
         INR{
-            "₹",
+            "Rs.",
             "भारतीय रुपया",
         }
         IQD{
diff --git a/source/data/curr/ms.txt b/source/data/curr/ms.txt
index 85f936d..e90b078 100644
--- a/source/data/curr/ms.txt
+++ b/source/data/curr/ms.txt
@@ -256,7 +256,7 @@ ms{
             "Sheqel Baru Israel",
         }
         INR{
-            "₹",
+            "Rs.",
             "Rupee India",
         }
         IQD{
diff --git a/source/data/curr/mua.txt b/source/data/curr/mua.txt
index 617d1f6..6ce5855 100755
--- a/source/data/curr/mua.txt
+++ b/source/data/curr/mua.txt
@@ -96,7 +96,7 @@ mua{
             "solai Guine",
         }
         INR{
-            "₹",
+            "Rs.",
             "solai India",
         }
         JPY{
diff --git a/source/data/curr/my.txt b/source/data/curr/my.txt
index c154cc4..d716680 100644
--- a/source/data/curr/my.txt
+++ b/source/data/curr/my.txt
@@ -296,7 +296,7 @@ my{
             "အစ္စရေးရှဲကလ်အသစ်",
         }
         INR{
-            "₹",
+            "Rs.",
             "အိန္ဒိယ ရူပီး",
         }
         IQD{
diff --git a/source/data/curr/naq.txt b/source/data/curr/naq.txt
index 9b5af96..e64a4f2 100755
--- a/source/data/curr/naq.txt
+++ b/source/data/curr/naq.txt
@@ -96,7 +96,7 @@ naq{
             "Guinea Franc",
         }
         INR{
-            "₹",
+            "Rs.",
             "Indian Rupee",
         }
         JPY{
diff --git a/source/data/curr/nd.txt b/source/data/curr/nd.txt
index 2e6ef13..35c6143 100755
--- a/source/data/curr/nd.txt
+++ b/source/data/curr/nd.txt
@@ -96,7 +96,7 @@ nd{
             "Fulenki yase Gine",
         }
         INR{
-            "₹",
+            "Rs.",
             "Rupi yase Indiya",
         }
         JPY{
diff --git a/source/data/curr/ne.txt b/source/data/curr/ne.txt
index 5622f80..01af3a7 100644
--- a/source/data/curr/ne.txt
+++ b/source/data/curr/ne.txt
@@ -260,7 +260,7 @@ ne{
             "इजरायली नयाँ शेकेल",
         }
         INR{
-            "₹",
+            "Rs.",
             "भारती रूपिँया",
         }
         IQD{
diff --git a/source/data/curr/ne_IN.txt b/source/data/curr/ne_IN.txt
index acdabf0..3bce53b 100755
--- a/source/data/curr/ne_IN.txt
+++ b/source/data/curr/ne_IN.txt
@@ -9,7 +9,7 @@
 ne_IN{
     Currencies{
         INR{
-            "₹",
+            "Rs.",
             "भारतीय रूपिँया",
         }
     }
diff --git a/source/data/curr/nl.txt b/source/data/curr/nl.txt
index 1c9ceae..4ec873f 100644
--- a/source/data/curr/nl.txt
+++ b/source/data/curr/nl.txt
@@ -500,7 +500,7 @@ nl{
             "Israëlische nieuwe shekel",
         }
         INR{
-            "₹",
+            "Rs.",
             "Indiase roepie",
         }
         IQD{
diff --git a/source/data/curr/nmg.txt b/source/data/curr/nmg.txt
index ed7d956..226bf52 100755
--- a/source/data/curr/nmg.txt
+++ b/source/data/curr/nmg.txt
@@ -96,7 +96,7 @@ nmg{
             "Fraŋ Guiné",
         }
         INR{
-            "₹",
+            "Rs.",
             "Mɔn India",
         }
         JPY{
diff --git a/source/data/curr/nn.txt b/source/data/curr/nn.txt
index 50f9dc4..fc8380c 100644
--- a/source/data/curr/nn.txt
+++ b/source/data/curr/nn.txt
@@ -452,7 +452,7 @@ nn{
             "israelsk ny shekel",
         }
         INR{
-            "₹",
+            "Rs.",
             "indisk rupi",
         }
         IQD{
diff --git a/source/data/curr/nyn.txt b/source/data/curr/nyn.txt
index e93a8a8..d15ad46 100755
--- a/source/data/curr/nyn.txt
+++ b/source/data/curr/nyn.txt
@@ -96,7 +96,7 @@ nyn{
             "Faranga ya Guinea",
         }
         INR{
-            "₹",
+            "Rs.",
             "Rupiya ya India",
         }
         JPY{
diff --git a/source/data/curr/om.txt b/source/data/curr/om.txt
index 552e2e7..276045e 100644
--- a/source/data/curr/om.txt
+++ b/source/data/curr/om.txt
@@ -32,7 +32,7 @@ om{
             "British Pound Sterling",
         }
         INR{
-            "₹",
+            "Rs.",
             "Indian Rupee",
         }
         JPY{
diff --git a/source/data/curr/or.txt b/source/data/curr/or.txt
index 36f90f1..f5378bc 100644
--- a/source/data/curr/or.txt
+++ b/source/data/curr/or.txt
@@ -12,7 +12,7 @@
 or{
     Currencies{
         INR{
-            "₹",
+            "Rs.",
             "ଟଙକା",
         }
     }
diff --git a/source/data/curr/pa.txt b/source/data/curr/pa.txt
index 2d579e6..a6f0f1a 100644
--- a/source/data/curr/pa.txt
+++ b/source/data/curr/pa.txt
@@ -320,7 +320,7 @@ pa{
             "ਇਜ਼ਰਾਈਲੀ ਨਵੀਂ ਸ਼ੇਕੇਲ",
         }
         INR{
-            "₹",
+            "Rs.",
             "ਭਾਰਤੀ ਰੁਪਇਆ",
         }
         IQD{
diff --git a/source/data/curr/pa_Arab.txt b/source/data/curr/pa_Arab.txt
index 5458ecb..7f7d0f4 100644
--- a/source/data/curr/pa_Arab.txt
+++ b/source/data/curr/pa_Arab.txt
@@ -17,7 +17,7 @@ pa_Arab{
             "يورو",
         }
         INR{
-            "₹",
+            "Rs.",
             "روپئیہ [INR]",
         }
         PKR{
diff --git a/source/data/curr/pa_Arab_PK.txt b/source/data/curr/pa_Arab_PK.txt
index 508a02a..9eabbb8 100644
--- a/source/data/curr/pa_Arab_PK.txt
+++ b/source/data/curr/pa_Arab_PK.txt
@@ -3,12 +3,10 @@
 // * Copyright (C) 2014 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/icu-locale-deprecates.xml & build.xml
+// * Source File: <path>/common/main/pa_Arab_PK.xml
 // *
 // ***************************************************************************
-/**
- * generated alias target
- */
 pa_Arab_PK{
-    ___{""}
+    %%Parent{"pa_Arab"}
+    Version{"2.1.6.69"}
 }
diff --git a/source/data/curr/pt.txt b/source/data/curr/pt.txt
index d758eed..ca82306 100644
--- a/source/data/curr/pt.txt
+++ b/source/data/curr/pt.txt
@@ -500,7 +500,7 @@ pt{
             "Sheqel novo israelita",
         }
         INR{
-            "₹",
+            "Rs.",
             "Rupia indiana",
         }
         IQD{
diff --git a/source/data/curr/resfiles.mk b/source/data/curr/resfiles.mk
index aa1d323..04e1b3a 100644
--- a/source/data/curr/resfiles.mk
+++ b/source/data/curr/resfiles.mk
@@ -33,16 +33,15 @@ CURR_SYNTHETIC_ALIAS = az_AZ.txt az_Latn_AZ.txt bs_BA.txt bs_Latn_BA.txt\
  ja_JP_TRADITIONAL.txt kk_Cyrl_KZ.txt kk_KZ.txt ks_Arab_IN.txt ks_IN.txt\
  ky_Cyrl_KG.txt ky_KG.txt mn_Cyrl_MN.txt mn_MN.txt mo.txt\
  ms_BN.txt ms_Latn_MY.txt ms_MY.txt ms_SG.txt nb_NO.txt\
- nn_NO.txt no.txt no_NO.txt no_NO_NY.txt pa_Arab_PK.txt\
- pa_Guru_IN.txt pa_IN.txt pa_PK.txt sh.txt sh_BA.txt\
- sh_CS.txt sh_YU.txt shi_MA.txt shi_Tfng_MA.txt sr_BA.txt\
- sr_CS.txt sr_Cyrl_CS.txt sr_Cyrl_RS.txt sr_Cyrl_XK.txt sr_Cyrl_YU.txt\
- sr_Latn_CS.txt sr_Latn_ME.txt sr_Latn_RS.txt sr_Latn_YU.txt sr_ME.txt\
- sr_RS.txt sr_XK.txt sr_YU.txt th_TH.txt th_TH_TRADITIONAL.txt\
- tl.txt tl_PH.txt tzm_Latn_MA.txt tzm_MA.txt ug_Arab_CN.txt\
- ug_CN.txt uz_AF.txt uz_Arab_AF.txt uz_Latn_UZ.txt uz_UZ.txt\
- vai_LR.txt vai_Vaii_LR.txt zh_CN.txt zh_HK.txt zh_Hans_CN.txt\
- zh_Hant_TW.txt zh_MO.txt zh_SG.txt zh_TW.txt
+ nn_NO.txt no.txt no_NO.txt no_NO_NY.txt pa_Guru_IN.txt\
+ pa_IN.txt pa_PK.txt sh.txt sh_BA.txt sh_CS.txt\
+ sh_YU.txt shi_MA.txt sr_BA.txt sr_CS.txt sr_Cyrl_CS.txt\
+ sr_Cyrl_RS.txt sr_Cyrl_XK.txt sr_Cyrl_YU.txt sr_Latn_CS.txt sr_Latn_YU.txt\
+ sr_ME.txt sr_RS.txt sr_XK.txt sr_YU.txt th_TH.txt\
+ th_TH_TRADITIONAL.txt tl.txt tl_PH.txt tzm_Latn_MA.txt tzm_MA.txt\
+ ug_Arab_CN.txt ug_CN.txt uz_AF.txt uz_UZ.txt vai_LR.txt\
+ vai_Vaii_LR.txt zh_CN.txt zh_HK.txt zh_Hans_CN.txt zh_MO.txt\
+ zh_SG.txt zh_TW.txt
 
 
 # All aliases (to not be included under 'installed'), but not including root.
@@ -53,82 +52,83 @@ CURR_ALIAS_SOURCE = $(CURR_SYNTHETIC_ALIAS)
 CURR_SOURCE = af.txt af_NA.txt agq.txt ak.txt\
  am.txt ar.txt ar_AE.txt ar_DJ.txt ar_ER.txt\
  ar_LB.txt ar_SO.txt ar_SS.txt as.txt asa.txt\
- az.txt az_Cyrl.txt az_Latn.txt bas.txt be.txt\
- bem.txt bez.txt bg.txt bm.txt bm_Latn.txt\
- bn.txt bo.txt bo_IN.txt br.txt brx.txt\
- bs.txt bs_Cyrl.txt bs_Latn.txt ca.txt ca_FR.txt\
- cgg.txt chr.txt cs.txt cy.txt da.txt\
- dav.txt de.txt de_CH.txt de_LU.txt dje.txt\
- dsb.txt dua.txt dyo.txt dz.txt ebu.txt\
- ee.txt el.txt en.txt en_001.txt en_150.txt\
- en_AG.txt en_AI.txt en_AU.txt en_BB.txt en_BE.txt\
- en_BM.txt en_BS.txt en_BW.txt en_BZ.txt en_CA.txt\
- en_CC.txt en_CK.txt en_CM.txt en_CX.txt en_DG.txt\
- en_DM.txt en_ER.txt en_FJ.txt en_FK.txt en_FM.txt\
- en_GB.txt en_GD.txt en_GG.txt en_GH.txt en_GI.txt\
- en_GM.txt en_GY.txt en_HK.txt en_IE.txt en_IM.txt\
- en_IN.txt en_IO.txt en_JE.txt en_JM.txt en_KE.txt\
- en_KI.txt en_KN.txt en_KY.txt en_LC.txt en_LR.txt\
- en_LS.txt en_MG.txt en_MO.txt en_MS.txt en_MT.txt\
- en_MU.txt en_MW.txt en_MY.txt en_NA.txt en_NF.txt\
- en_NG.txt en_NR.txt en_NU.txt en_NZ.txt en_PG.txt\
- en_PH.txt en_PK.txt en_PN.txt en_PW.txt en_RW.txt\
- en_SB.txt en_SC.txt en_SD.txt en_SG.txt en_SH.txt\
- en_SL.txt en_SS.txt en_SX.txt en_SZ.txt en_TC.txt\
- en_TK.txt en_TO.txt en_TT.txt en_TV.txt en_TZ.txt\
- en_UG.txt en_VC.txt en_VG.txt en_VU.txt en_WS.txt\
- en_ZA.txt en_ZM.txt en_ZW.txt eo.txt es.txt\
- es_419.txt es_AR.txt es_BO.txt es_CL.txt es_CO.txt\
- es_CR.txt es_CU.txt es_DO.txt es_EC.txt es_GQ.txt\
- es_GT.txt es_HN.txt es_MX.txt es_NI.txt es_PA.txt\
- es_PE.txt es_PH.txt es_PR.txt es_PY.txt es_SV.txt\
- es_US.txt es_UY.txt es_VE.txt et.txt eu.txt\
- ewo.txt fa.txt fa_AF.txt ff.txt ff_GN.txt\
- ff_MR.txt fi.txt fil.txt fo.txt fr.txt\
- fr_BI.txt fr_CA.txt fr_CD.txt fr_DJ.txt fr_DZ.txt\
- fr_GN.txt fr_HT.txt fr_KM.txt fr_LU.txt fr_MG.txt\
- fr_MR.txt fr_MU.txt fr_RW.txt fr_SC.txt fr_SY.txt\
- fr_TN.txt fr_VU.txt fur.txt fy.txt ga.txt\
- gd.txt gl.txt gsw.txt gu.txt guz.txt\
- gv.txt ha.txt ha_Latn.txt ha_Latn_GH.txt haw.txt\
- he.txt hi.txt hr.txt hr_BA.txt hsb.txt\
- hu.txt hy.txt id.txt ig.txt ii.txt\
- is.txt it.txt ja.txt jgo.txt jmc.txt\
- ka.txt kab.txt kam.txt kde.txt kea.txt\
- khq.txt ki.txt kk.txt kk_Cyrl.txt kkj.txt\
- kl.txt kln.txt km.txt kn.txt ko.txt\
- kok.txt ks.txt ks_Arab.txt ksb.txt ksf.txt\
- ksh.txt kw.txt ky.txt ky_Cyrl.txt lag.txt\
- lb.txt lg.txt lkt.txt ln.txt ln_AO.txt\
- lo.txt lt.txt lu.txt luo.txt luy.txt\
- lv.txt mas.txt mas_TZ.txt mer.txt mfe.txt\
- mg.txt mgh.txt mgo.txt mk.txt ml.txt\
- mn.txt mn_Cyrl.txt mr.txt ms.txt ms_Latn.txt\
- ms_Latn_BN.txt ms_Latn_SG.txt mt.txt mua.txt my.txt\
- naq.txt nb.txt nd.txt ne.txt ne_IN.txt\
- nl.txt nl_AW.txt nl_BQ.txt nl_CW.txt nl_SR.txt\
- nl_SX.txt nmg.txt nn.txt nnh.txt nus.txt\
- nyn.txt om.txt om_KE.txt or.txt os.txt\
- os_RU.txt pa.txt pa_Arab.txt pa_Guru.txt pl.txt\
- ps.txt pt.txt pt_AO.txt pt_CV.txt pt_GW.txt\
- pt_MO.txt pt_MZ.txt pt_PT.txt pt_ST.txt pt_TL.txt\
- qu.txt qu_BO.txt qu_EC.txt rm.txt rn.txt\
- ro.txt ro_MD.txt rof.txt ru.txt ru_BY.txt\
- ru_KG.txt ru_KZ.txt ru_MD.txt rw.txt rwk.txt\
- sah.txt saq.txt sbp.txt se.txt se_SE.txt\
- seh.txt ses.txt sg.txt shi.txt shi_Latn.txt\
- shi_Tfng.txt si.txt sk.txt sl.txt smn.txt\
- sn.txt so.txt so_DJ.txt so_ET.txt so_KE.txt\
- sq.txt sq_MK.txt sr.txt sr_Cyrl.txt sr_Cyrl_BA.txt\
- sr_Latn.txt sr_Latn_BA.txt sv.txt sw.txt sw_UG.txt\
+ az.txt az_Cyrl.txt az_Cyrl_AZ.txt az_Latn.txt bas.txt\
+ be.txt bem.txt bez.txt bg.txt bm.txt\
+ bm_Latn.txt bn.txt bo.txt bo_IN.txt br.txt\
+ brx.txt bs.txt bs_Cyrl.txt bs_Latn.txt ca.txt\
+ ca_FR.txt cgg.txt chr.txt cs.txt cy.txt\
+ da.txt dav.txt de.txt de_CH.txt de_LU.txt\
+ dje.txt dsb.txt dua.txt dyo.txt dz.txt\
+ ebu.txt ee.txt el.txt en.txt en_001.txt\
+ en_150.txt en_AG.txt en_AI.txt en_AU.txt en_BB.txt\
+ en_BE.txt en_BM.txt en_BS.txt en_BW.txt en_BZ.txt\
+ en_CA.txt en_CC.txt en_CK.txt en_CM.txt en_CX.txt\
+ en_DG.txt en_DM.txt en_ER.txt en_FJ.txt en_FK.txt\
+ en_FM.txt en_GB.txt en_GD.txt en_GG.txt en_GH.txt\
+ en_GI.txt en_GM.txt en_GY.txt en_HK.txt en_IE.txt\
+ en_IM.txt en_IN.txt en_IO.txt en_JE.txt en_JM.txt\
+ en_KE.txt en_KI.txt en_KN.txt en_KY.txt en_LC.txt\
+ en_LR.txt en_LS.txt en_MG.txt en_MO.txt en_MS.txt\
+ en_MT.txt en_MU.txt en_MW.txt en_MY.txt en_NA.txt\
+ en_NF.txt en_NG.txt en_NR.txt en_NU.txt en_NZ.txt\
+ en_PG.txt en_PH.txt en_PK.txt en_PN.txt en_PW.txt\
+ en_RW.txt en_SB.txt en_SC.txt en_SD.txt en_SG.txt\
+ en_SH.txt en_SL.txt en_SS.txt en_SX.txt en_SZ.txt\
+ en_TC.txt en_TK.txt en_TO.txt en_TT.txt en_TV.txt\
+ en_TZ.txt en_UG.txt en_VC.txt en_VG.txt en_VU.txt\
+ en_WS.txt en_ZA.txt en_ZM.txt en_ZW.txt eo.txt\
+ es.txt es_419.txt es_AR.txt es_BO.txt es_CL.txt\
+ es_CO.txt es_CR.txt es_CU.txt es_DO.txt es_EC.txt\
+ es_GQ.txt es_GT.txt es_HN.txt es_MX.txt es_NI.txt\
+ es_PA.txt es_PE.txt es_PH.txt es_PR.txt es_PY.txt\
+ es_SV.txt es_US.txt es_UY.txt es_VE.txt et.txt\
+ eu.txt ewo.txt fa.txt fa_AF.txt ff.txt\
+ ff_GN.txt ff_MR.txt fi.txt fil.txt fo.txt\
+ fr.txt fr_BI.txt fr_CA.txt fr_CD.txt fr_DJ.txt\
+ fr_DZ.txt fr_GN.txt fr_HT.txt fr_KM.txt fr_LU.txt\
+ fr_MG.txt fr_MR.txt fr_MU.txt fr_RW.txt fr_SC.txt\
+ fr_SY.txt fr_TN.txt fr_VU.txt fur.txt fy.txt\
+ ga.txt gd.txt gl.txt gsw.txt gu.txt\
+ guz.txt gv.txt ha.txt ha_Latn.txt ha_Latn_GH.txt\
+ haw.txt he.txt hi.txt hr.txt hr_BA.txt\
+ hsb.txt hu.txt hy.txt id.txt ig.txt\
+ ii.txt is.txt it.txt ja.txt jgo.txt\
+ jmc.txt ka.txt kab.txt kam.txt kde.txt\
+ kea.txt khq.txt ki.txt kk.txt kk_Cyrl.txt\
+ kkj.txt kl.txt kln.txt km.txt kn.txt\
+ ko.txt kok.txt ks.txt ks_Arab.txt ksb.txt\
+ ksf.txt ksh.txt kw.txt ky.txt ky_Cyrl.txt\
+ lag.txt lb.txt lg.txt lkt.txt ln.txt\
+ ln_AO.txt lo.txt lt.txt lu.txt luo.txt\
+ luy.txt lv.txt mas.txt mas_TZ.txt mer.txt\
+ mfe.txt mg.txt mgh.txt mgo.txt mk.txt\
+ ml.txt mn.txt mn_Cyrl.txt mr.txt ms.txt\
+ ms_Latn.txt ms_Latn_BN.txt ms_Latn_SG.txt mt.txt mua.txt\
+ my.txt naq.txt nb.txt nd.txt ne.txt\
+ ne_IN.txt nl.txt nl_AW.txt nl_BQ.txt nl_CW.txt\
+ nl_SR.txt nl_SX.txt nmg.txt nn.txt nnh.txt\
+ nus.txt nyn.txt om.txt om_KE.txt or.txt\
+ os.txt os_RU.txt pa.txt pa_Arab.txt pa_Arab_PK.txt\
+ pa_Guru.txt pl.txt ps.txt pt.txt pt_AO.txt\
+ pt_CV.txt pt_GW.txt pt_MO.txt pt_MZ.txt pt_PT.txt\
+ pt_ST.txt pt_TL.txt qu.txt qu_BO.txt qu_EC.txt\
+ rm.txt rn.txt ro.txt ro_MD.txt rof.txt\
+ ru.txt ru_BY.txt ru_KG.txt ru_KZ.txt ru_MD.txt\
+ rw.txt rwk.txt sah.txt saq.txt sbp.txt\
+ se.txt se_SE.txt seh.txt ses.txt sg.txt\
+ shi.txt shi_Latn.txt shi_Tfng.txt shi_Tfng_MA.txt si.txt\
+ sk.txt sl.txt smn.txt sn.txt so.txt\
+ so_DJ.txt so_ET.txt so_KE.txt sq.txt sq_MK.txt\
+ sr.txt sr_Cyrl.txt sr_Cyrl_BA.txt sr_Latn.txt sr_Latn_BA.txt\
+ sr_Latn_ME.txt sr_Latn_RS.txt sv.txt sw.txt sw_UG.txt\
  swc.txt ta.txt ta_LK.txt ta_MY.txt ta_SG.txt\
  te.txt teo.txt teo_KE.txt th.txt ti.txt\
  ti_ER.txt to.txt tr.txt twq.txt tzm.txt\
  tzm_Latn.txt ug.txt ug_Arab.txt uk.txt ur.txt\
- ur_IN.txt uz.txt uz_Arab.txt uz_Cyrl.txt uz_Latn.txt\
- vai.txt vai_Latn.txt vai_Vaii.txt vi.txt vun.txt\
- wae.txt xog.txt yav.txt yi.txt yo.txt\
- yo_BJ.txt zgh.txt zh.txt zh_Hans.txt zh_Hans_HK.txt\
- zh_Hans_MO.txt zh_Hans_SG.txt zh_Hant.txt zh_Hant_HK.txt zh_Hant_MO.txt\
- zu.txt
+ ur_IN.txt uz.txt uz_Arab.txt uz_Arab_AF.txt uz_Cyrl.txt\
+ uz_Latn.txt uz_Latn_UZ.txt vai.txt vai_Latn.txt vai_Latn_LR.txt\
+ vai_Vaii.txt vi.txt vun.txt wae.txt xog.txt\
+ yav.txt yi.txt yo.txt yo_BJ.txt zgh.txt\
+ zh.txt zh_Hans.txt zh_Hans_HK.txt zh_Hans_MO.txt zh_Hans_SG.txt\
+ zh_Hant.txt zh_Hant_HK.txt zh_Hant_MO.txt zh_Hant_TW.txt zu.txt
 
diff --git a/source/data/curr/rm.txt b/source/data/curr/rm.txt
index a94319c..b62e703 100755
--- a/source/data/curr/rm.txt
+++ b/source/data/curr/rm.txt
@@ -492,7 +492,7 @@ rm{
             "sheqel",
         }
         INR{
-            "₹",
+            "Rs.",
             "rupia indica",
         }
         IQD{
diff --git a/source/data/curr/rn.txt b/source/data/curr/rn.txt
index 0e38de6..f822c6c 100755
--- a/source/data/curr/rn.txt
+++ b/source/data/curr/rn.txt
@@ -96,7 +96,7 @@ rn{
             "Ifaranga ryo muri Gineya",
         }
         INR{
-            "₹",
+            "Rs.",
             "Irupiya ryo mu Buhindi",
         }
         JPY{
diff --git a/source/data/curr/rof.txt b/source/data/curr/rof.txt
index cc47c81..d5924c2 100755
--- a/source/data/curr/rof.txt
+++ b/source/data/curr/rof.txt
@@ -96,7 +96,7 @@ rof{
             "heleri sa Gine",
         }
         INR{
-            "₹",
+            "Rs.",
             "heleri sa India",
         }
         JPY{
diff --git a/source/data/curr/root.txt b/source/data/curr/root.txt
index 8ae296e..a2109dc 100644
--- a/source/data/curr/root.txt
+++ b/source/data/curr/root.txt
@@ -44,7 +44,7 @@ root{
             "ILS",
         }
         INR{
-            "₹",
+            "Rs.",
             "INR",
         }
         JPY{
diff --git a/source/data/curr/ru.txt b/source/data/curr/ru.txt
index 8d3e09a..633dbb7 100644
--- a/source/data/curr/ru.txt
+++ b/source/data/curr/ru.txt
@@ -456,7 +456,7 @@ ru{
             "Новый израильский шекель",
         }
         INR{
-            "₹",
+            "Rs.",
             "Индийская рупия",
         }
         IQD{
diff --git a/source/data/curr/rwk.txt b/source/data/curr/rwk.txt
index 773aa84..482fdd4 100755
--- a/source/data/curr/rwk.txt
+++ b/source/data/curr/rwk.txt
@@ -96,7 +96,7 @@ rwk{
             "Faranga ya Gine",
         }
         INR{
-            "₹",
+            "Rs.",
             "Rupia ya India",
         }
         JPY{
diff --git a/source/data/curr/saq.txt b/source/data/curr/saq.txt
index d1ccddb..52b8b7e 100755
--- a/source/data/curr/saq.txt
+++ b/source/data/curr/saq.txt
@@ -96,7 +96,7 @@ saq{
             "Njilingi eel Gine",
         }
         INR{
-            "₹",
+            "Rs.",
             "Njilingi eel India",
         }
         JPY{
diff --git a/source/data/curr/sbp.txt b/source/data/curr/sbp.txt
index 4ad4c69..6cca276 100755
--- a/source/data/curr/sbp.txt
+++ b/source/data/curr/sbp.txt
@@ -96,7 +96,7 @@ sbp{
             "Ihela ya Gine",
         }
         INR{
-            "₹",
+            "Rs.",
             "Ihela ya Indiya",
         }
         JPY{
diff --git a/source/data/curr/se.txt b/source/data/curr/se.txt
index 45c50e4..8448465 100644
--- a/source/data/curr/se.txt
+++ b/source/data/curr/se.txt
@@ -28,7 +28,7 @@ se{
             "HKD",
         }
         INR{
-            "₹",
+            "Rs.",
             "INR",
         }
         JPY{
diff --git a/source/data/curr/seh.txt b/source/data/curr/seh.txt
index 39d3951..51d8821 100755
--- a/source/data/curr/seh.txt
+++ b/source/data/curr/seh.txt
@@ -96,7 +96,7 @@ seh{
             "Syli da Guiné",
         }
         INR{
-            "₹",
+            "Rs.",
             "Rúpia indiana",
         }
         JPY{
diff --git a/source/data/curr/ses.txt b/source/data/curr/ses.txt
index 26f8b13..710753d 100755
--- a/source/data/curr/ses.txt
+++ b/source/data/curr/ses.txt
@@ -96,7 +96,7 @@ ses{
             "Ginee Fraŋ",
         }
         INR{
-            "₹",
+            "Rs.",
             "Indu Rupii",
         }
         JPY{
diff --git a/source/data/curr/sg.txt b/source/data/curr/sg.txt
index 04b1f31..1a2dc5f 100755
--- a/source/data/curr/sg.txt
+++ b/source/data/curr/sg.txt
@@ -96,7 +96,7 @@ sg{
             "sili tî Ginëe",
         }
         INR{
-            "₹",
+            "Rs.",
             "rupïi tî Ênnde",
         }
         JPY{
diff --git a/source/data/curr/shi.txt b/source/data/curr/shi.txt
index 7cca8dd..4de8411 100755
--- a/source/data/curr/shi.txt
+++ b/source/data/curr/shi.txt
@@ -96,7 +96,7 @@ shi{
             "ⴼⵔⴰⵏⴽ ⵏ ⵖⵉⵏⵢⴰ",
         }
         INR{
-            "₹",
+            "Rs.",
             "ⴰⵔⵓⴱⵉ ⵏ ⵍⵀⵉⵏⴷ",
         }
         JPY{
diff --git a/source/data/curr/shi_Latn.txt b/source/data/curr/shi_Latn.txt
index 2c10600..405ac9a 100755
--- a/source/data/curr/shi_Latn.txt
+++ b/source/data/curr/shi_Latn.txt
@@ -97,7 +97,7 @@ shi_Latn{
             "frank n ɣinya",
         }
         INR{
-            "₹",
+            "Rs.",
             "arubi n lhind",
         }
         JPY{
diff --git a/source/data/curr/shi_Tfng_MA.txt b/source/data/curr/shi_Tfng_MA.txt
index 729e805..87d9d8f 100755
--- a/source/data/curr/shi_Tfng_MA.txt
+++ b/source/data/curr/shi_Tfng_MA.txt
@@ -3,12 +3,10 @@
 // * Copyright (C) 2014 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/icu-locale-deprecates.xml & build.xml
+// * Source File: <path>/common/main/shi_Tfng_MA.xml
 // *
 // ***************************************************************************
-/**
- * generated alias target
- */
 shi_Tfng_MA{
-    ___{""}
+    %%Parent{"shi_Tfng"}
+    Version{"2.1.6.69"}
 }
diff --git a/source/data/curr/si.txt b/source/data/curr/si.txt
index 53457d7..42dcdd8 100644
--- a/source/data/curr/si.txt
+++ b/source/data/curr/si.txt
@@ -256,7 +256,7 @@ si{
             "ඊශ්‍රායල නව ශෙකල්",
         }
         INR{
-            "₹",
+            "Rs.",
             "ඉන්දියානු රුපියල්",
         }
         IQD{
diff --git a/source/data/curr/sl.txt b/source/data/curr/sl.txt
index e8aec73..08a82c5 100644
--- a/source/data/curr/sl.txt
+++ b/source/data/curr/sl.txt
@@ -456,7 +456,7 @@ sl{
             "izraelski šekel",
         }
         INR{
-            "₹",
+            "Rs.",
             "indijska rupija",
         }
         IQD{
diff --git a/source/data/curr/sn.txt b/source/data/curr/sn.txt
index 929cc90..5fe8c33 100755
--- a/source/data/curr/sn.txt
+++ b/source/data/curr/sn.txt
@@ -96,7 +96,7 @@ sn{
             "Furenki re Gine",
         }
         INR{
-            "₹",
+            "Rs.",
             "Rupe re India",
         }
         JPY{
diff --git a/source/data/curr/sq.txt b/source/data/curr/sq.txt
index 9c92d60..53508a4 100644
--- a/source/data/curr/sq.txt
+++ b/source/data/curr/sq.txt
@@ -256,7 +256,7 @@ sq{
             "Shekeli izrealit",
         }
         INR{
-            "₹",
+            "Rs.",
             "Rupia indiane",
         }
         IQD{
diff --git a/source/data/curr/sr.txt b/source/data/curr/sr.txt
index 84ff1c9..394c477 100644
--- a/source/data/curr/sr.txt
+++ b/source/data/curr/sr.txt
@@ -460,7 +460,7 @@ sr{
             "Израелски нови шекел",
         }
         INR{
-            "₹",
+            "Rs.",
             "Индијска рупија",
         }
         IQD{
diff --git a/source/data/curr/sr_Latn.txt b/source/data/curr/sr_Latn.txt
index e4f6d23..f9e23e6 100644
--- a/source/data/curr/sr_Latn.txt
+++ b/source/data/curr/sr_Latn.txt
@@ -461,7 +461,7 @@ sr_Latn{
             "Izraelski novi šekel",
         }
         INR{
-            "₹",
+            "Rs.",
             "Indijska rupija",
         }
         IQD{
diff --git a/source/data/curr/sr_Latn_BA.txt b/source/data/curr/sr_Latn_BA.txt
index d1b23e1..94a6b51 100644
--- a/source/data/curr/sr_Latn_BA.txt
+++ b/source/data/curr/sr_Latn_BA.txt
@@ -7,6 +7,7 @@
 // *
 // ***************************************************************************
 sr_Latn_BA{
+    %%Parent{"sr_Latn"}
     Currencies{
         BAM{
             "KM",
diff --git a/source/data/curr/sr_Latn_ME.txt b/source/data/curr/sr_Latn_ME.txt
index 4887740..ddbcd9c 100755
--- a/source/data/curr/sr_Latn_ME.txt
+++ b/source/data/curr/sr_Latn_ME.txt
@@ -3,12 +3,10 @@
 // * Copyright (C) 2014 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/icu-locale-deprecates.xml & build.xml
+// * Source File: <path>/common/main/sr_Latn_ME.xml
 // *
 // ***************************************************************************
-/**
- * generated alias target
- */
 sr_Latn_ME{
-    ___{""}
+    %%Parent{"sr_Latn"}
+    Version{"2.1.8.20"}
 }
diff --git a/source/data/curr/sr_Latn_RS.txt b/source/data/curr/sr_Latn_RS.txt
index c5ee86b..14725d1 100644
--- a/source/data/curr/sr_Latn_RS.txt
+++ b/source/data/curr/sr_Latn_RS.txt
@@ -3,12 +3,10 @@
 // * Copyright (C) 2014 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/icu-locale-deprecates.xml & build.xml
+// * Source File: <path>/common/main/sr_Latn_RS.xml
 // *
 // ***************************************************************************
-/**
- * generated alias target
- */
 sr_Latn_RS{
-    ___{""}
+    %%Parent{"sr_Latn"}
+    Version{"2.1.6.69"}
 }
diff --git a/source/data/curr/supplementalData.txt b/source/data/curr/supplementalData.txt
index ce67fdc..5c91a69 100644
--- a/source/data/curr/supplementalData.txt
+++ b/source/data/curr/supplementalData.txt
@@ -1,6 +1,6 @@
 ﻿// ***************************************************************************
 // *
-// * Copyright (C) 2014 International Business Machines
+// * Copyright (C) 2015 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
 // * Source File: <path>/supplementalData.xml
@@ -2447,10 +2447,21 @@ supplementalData:table(nofallback){
         LT{
             {
                 from:intvector{
+                    330,
+                    -1563774976,
+                }
+                id{"EUR"}
+            }
+            {
+                from:intvector{
                     172,
                     -2062942208,
                 }
                 id{"LTL"}
+                to:intvector{
+                    330,
+                    -1563774977,
+                }
             }
             {
                 from:intvector{
diff --git a/source/data/curr/sw.txt b/source/data/curr/sw.txt
index aba0158..dff0c6f 100644
--- a/source/data/curr/sw.txt
+++ b/source/data/curr/sw.txt
@@ -264,7 +264,7 @@ sw{
             "Sheqel Mpya ya Israeli",
         }
         INR{
-            "₹",
+            "Rs.",
             "rupia ya India",
         }
         IQD{
diff --git a/source/data/curr/swc.txt b/source/data/curr/swc.txt
index 9a5c045..c591da5 100755
--- a/source/data/curr/swc.txt
+++ b/source/data/curr/swc.txt
@@ -96,7 +96,7 @@ swc{
             "Faranga ya Gine",
         }
         INR{
-            "₹",
+            "Rs.",
             "Rupia ya India",
         }
         JPY{
diff --git a/source/data/curr/ta.txt b/source/data/curr/ta.txt
index 4538e84..a609426 100644
--- a/source/data/curr/ta.txt
+++ b/source/data/curr/ta.txt
@@ -256,7 +256,7 @@ ta{
             "இஸ்ரேலி நியூ ஷிகேல்",
         }
         INR{
-            "₹",
+            "Rs.",
             "இந்திய ரூபாய்",
         }
         IQD{
diff --git a/source/data/curr/te.txt b/source/data/curr/te.txt
index 5fa37a8..e82fb52 100644
--- a/source/data/curr/te.txt
+++ b/source/data/curr/te.txt
@@ -256,7 +256,7 @@ te{
             "ఐరాయిలి న్యూ షెక్యెల్",
         }
         INR{
-            "₹",
+            "Rs.",
             "రూపాయి",
         }
         IQD{
diff --git a/source/data/curr/teo.txt b/source/data/curr/teo.txt
index ea8e400..f43b1f5 100755
--- a/source/data/curr/teo.txt
+++ b/source/data/curr/teo.txt
@@ -96,7 +96,7 @@ teo{
             "Ango’otol lok’ Gine",
         }
         INR{
-            "₹",
+            "Rs.",
             "Ango’otol lok’ India",
         }
         JPY{
diff --git a/source/data/curr/th.txt b/source/data/curr/th.txt
index 073d1ce..3f8443f 100644
--- a/source/data/curr/th.txt
+++ b/source/data/curr/th.txt
@@ -488,7 +488,7 @@ th{
             "นิวเชเกลอิสราเอล",
         }
         INR{
-            "₹",
+            "Rs.",
             "รูปีอินเดีย",
         }
         IQD{
diff --git a/source/data/curr/ti.txt b/source/data/curr/ti.txt
index c6a0132..fbf3845 100644
--- a/source/data/curr/ti.txt
+++ b/source/data/curr/ti.txt
@@ -32,7 +32,7 @@ ti{
             "የእንግሊዝ ፓውንድ ስተርሊንግ",
         }
         INR{
-            "₹",
+            "Rs.",
             "የሕንድ ሩፒ",
         }
         JPY{
diff --git a/source/data/curr/tr.txt b/source/data/curr/tr.txt
index 2880b09..bba7d35 100644
--- a/source/data/curr/tr.txt
+++ b/source/data/curr/tr.txt
@@ -500,7 +500,7 @@ tr{
             "Yeni İsrail Şekeli",
         }
         INR{
-            "₹",
+            "Rs.",
             "Hindistan Rupisi",
         }
         IQD{
@@ -972,7 +972,7 @@ tr{
             "Eski Türk Lirası",
         }
         TRY{
-            "₺",
+            "TL",
             "Türk Lirası",
             {
                 "¤#,##0.00",
diff --git a/source/data/curr/twq.txt b/source/data/curr/twq.txt
index d9795fa..2dceddc 100755
--- a/source/data/curr/twq.txt
+++ b/source/data/curr/twq.txt
@@ -96,7 +96,7 @@ twq{
             "Ginee Fraŋ",
         }
         INR{
-            "₹",
+            "Rs.",
             "Indu Rupii",
         }
         JPY{
diff --git a/source/data/curr/tzm.txt b/source/data/curr/tzm.txt
index 3bc4979..89b8689 100755
--- a/source/data/curr/tzm.txt
+++ b/source/data/curr/tzm.txt
@@ -96,7 +96,7 @@ tzm{
             "Frank Uɣini",
         }
         INR{
-            "₹",
+            "Rs.",
             "Rupi Uḥindi",
         }
         JPY{
diff --git a/source/data/curr/ug.txt b/source/data/curr/ug.txt
index 8d52a48..a729dc9 100755
--- a/source/data/curr/ug.txt
+++ b/source/data/curr/ug.txt
@@ -500,7 +500,7 @@ ug{
             "ئىسرائىل يېڭى شېكېلى",
         }
         INR{
-            "₹",
+            "Rs.",
             "ھىندىستان رۇپىسى",
         }
         IQD{
diff --git a/source/data/curr/ur.txt b/source/data/curr/ur.txt
index b956643..d8bf011 100644
--- a/source/data/curr/ur.txt
+++ b/source/data/curr/ur.txt
@@ -264,7 +264,7 @@ ur{
             "اسرائیلی نیا شیکل",
         }
         INR{
-            "₹",
+            "Rs.",
             "بھارتی روپیہ",
         }
         IQD{
diff --git a/source/data/curr/uz.txt b/source/data/curr/uz.txt
index b4aea7e..d2a5e78 100644
--- a/source/data/curr/uz.txt
+++ b/source/data/curr/uz.txt
@@ -256,7 +256,7 @@ uz{
             "ILS",
         }
         INR{
-            "₹",
+            "Rs.",
             "Hind rupiyasi",
         }
         IQD{
diff --git a/source/data/curr/uz_Arab_AF.txt b/source/data/curr/uz_Arab_AF.txt
index e438cc7..70606f1 100644
--- a/source/data/curr/uz_Arab_AF.txt
+++ b/source/data/curr/uz_Arab_AF.txt
@@ -3,12 +3,10 @@
 // * Copyright (C) 2014 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/icu-locale-deprecates.xml & build.xml
+// * Source File: <path>/common/main/uz_Arab_AF.xml
 // *
 // ***************************************************************************
-/**
- * generated alias target
- */
 uz_Arab_AF{
-    ___{""}
+    %%Parent{"uz_Arab"}
+    Version{"2.1.6.69"}
 }
diff --git a/source/data/curr/uz_Cyrl.txt b/source/data/curr/uz_Cyrl.txt
index 0e233a6..8a66463 100644
--- a/source/data/curr/uz_Cyrl.txt
+++ b/source/data/curr/uz_Cyrl.txt
@@ -129,7 +129,7 @@ uz_Cyrl{
             "ILS",
         }
         INR{
-            "₹",
+            "Rs.",
             "Ҳинд рупияси",
         }
         JMD{
diff --git a/source/data/curr/uz_Latn_UZ.txt b/source/data/curr/uz_Latn_UZ.txt
index 3b1b013..e46e887 100755
--- a/source/data/curr/uz_Latn_UZ.txt
+++ b/source/data/curr/uz_Latn_UZ.txt
@@ -3,12 +3,10 @@
 // * Copyright (C) 2014 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/icu-locale-deprecates.xml & build.xml
+// * Source File: <path>/common/main/uz_Latn_UZ.xml
 // *
 // ***************************************************************************
-/**
- * generated alias target
- */
 uz_Latn_UZ{
-    ___{""}
+    %%Parent{"uz_Latn"}
+    Version{"2.1.6.69"}
 }
diff --git a/source/data/curr/vai.txt b/source/data/curr/vai.txt
index 1225d33..41e222e 100755
--- a/source/data/curr/vai.txt
+++ b/source/data/curr/vai.txt
@@ -96,7 +96,7 @@ vai{
             "ꕅꔤꕇ ꖢꕟꘋꕃ",
         }
         INR{
-            "₹",
+            "Rs.",
             "ꔤꔺꕩ ꖩꔪ",
         }
         JPY{
diff --git a/source/data/curr/vai_Latn.txt b/source/data/curr/vai_Latn.txt
index e7b6528..f0d740d 100755
--- a/source/data/curr/vai_Latn.txt
+++ b/source/data/curr/vai_Latn.txt
@@ -97,7 +97,7 @@ vai_Latn{
             "Gini Furaŋki",
         }
         INR{
-            "₹",
+            "Rs.",
             "Índiya Rupi",
         }
         JPY{
diff --git a/source/data/curr/vai_Latn_LR.txt b/source/data/curr/vai_Latn_LR.txt
new file mode 100644
index 0000000..ffb3e10
--- /dev/null
+++ b/source/data/curr/vai_Latn_LR.txt
@@ -0,0 +1,12 @@
+﻿// ***************************************************************************
+// *
+// * Copyright (C) 2014 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/vai_Latn_LR.xml
+// *
+// ***************************************************************************
+vai_Latn_LR{
+    %%Parent{"vai_Latn"}
+    Version{"2.1.6.69"}
+}
diff --git a/source/data/curr/vi.txt b/source/data/curr/vi.txt
index 28ba384..b6cff1b 100644
--- a/source/data/curr/vi.txt
+++ b/source/data/curr/vi.txt
@@ -488,7 +488,7 @@ vi{
             "Sheqel Israel mới",
         }
         INR{
-            "₹",
+            "Rs.",
             "Rupee Ấn Độ",
         }
         IQD{
diff --git a/source/data/curr/vun.txt b/source/data/curr/vun.txt
index 6163942..3c01a33 100755
--- a/source/data/curr/vun.txt
+++ b/source/data/curr/vun.txt
@@ -96,7 +96,7 @@ vun{
             "Faranga ya Gine",
         }
         INR{
-            "₹",
+            "Rs.",
             "Rupia ya India",
         }
         JPY{
diff --git a/source/data/curr/wae.txt b/source/data/curr/wae.txt
index 91874ba..dba9a50 100644
--- a/source/data/curr/wae.txt
+++ b/source/data/curr/wae.txt
@@ -28,7 +28,7 @@ wae{
             "Pfund",
         }
         INR{
-            "₹",
+            "Rs.",
             "Indiši Rupie",
         }
         JPY{
diff --git a/source/data/curr/xog.txt b/source/data/curr/xog.txt
index a596e2d..3cbbf3f 100755
--- a/source/data/curr/xog.txt
+++ b/source/data/curr/xog.txt
@@ -96,7 +96,7 @@ xog{
             "Faranga ya Gini",
         }
         INR{
-            "₹",
+            "Rs.",
             "Rupiya ya Buyindi",
         }
         JPY{
diff --git a/source/data/curr/yav.txt b/source/data/curr/yav.txt
index 2472d0f..20eade2 100755
--- a/source/data/curr/yav.txt
+++ b/source/data/curr/yav.txt
@@ -88,7 +88,7 @@ yav{
             "silí u kiiné",
         }
         INR{
-            "₹",
+            "Rs.",
             "ulupí",
         }
         JPY{
diff --git a/source/data/curr/yo.txt b/source/data/curr/yo.txt
index b3245a5..c8e3c35 100755
--- a/source/data/curr/yo.txt
+++ b/source/data/curr/yo.txt
@@ -96,7 +96,7 @@ yo{
             "Faransi ti Orílẹ́ède Gini",
         }
         INR{
-            "₹",
+            "Rs.",
             "Rupi ti Orílẹ́ède Indina",
         }
         JPY{
diff --git a/source/data/curr/yo_BJ.txt b/source/data/curr/yo_BJ.txt
index 445bc06..60fb9af 100755
--- a/source/data/curr/yo_BJ.txt
+++ b/source/data/curr/yo_BJ.txt
@@ -89,7 +89,7 @@ yo_BJ{
             "Faransi ti Orílɛ́ède Gini",
         }
         INR{
-            "₹",
+            "Rs.",
             "Rupi ti Orílɛ́ède Indina",
         }
         JPY{
diff --git a/source/data/curr/zgh.txt b/source/data/curr/zgh.txt
index f77bb18..15a398f 100755
--- a/source/data/curr/zgh.txt
+++ b/source/data/curr/zgh.txt
@@ -92,7 +92,7 @@ zgh{
             "ⴷⴰⵍⴰⵙⵉ ⵏ ⴳⴰⵎⴱⵢⴰ",
         }
         INR{
-            "₹",
+            "Rs.",
             "ⴰⵔⵓⴱⵉ ⵏ ⵍⵀⵉⵏⴷ",
         }
         JPY{
diff --git a/source/data/curr/zh.txt b/source/data/curr/zh.txt
index 278e153..8e22481 100644
--- a/source/data/curr/zh.txt
+++ b/source/data/curr/zh.txt
@@ -496,7 +496,7 @@ zh{
             "以色列新谢克尔",
         }
         INR{
-            "₹",
+            "Rs.",
             "印度卢比",
         }
         IQD{
diff --git a/source/data/curr/zh_Hant.txt b/source/data/curr/zh_Hant.txt
index b6adb99..1d820c7 100644
--- a/source/data/curr/zh_Hant.txt
+++ b/source/data/curr/zh_Hant.txt
@@ -501,7 +501,7 @@ zh_Hant{
             "以色列新謝克爾",
         }
         INR{
-            "₹",
+            "Rs.",
             "印度盧比",
         }
         IQD{
diff --git a/source/data/curr/zh_Hant_HK.txt b/source/data/curr/zh_Hant_HK.txt
index 49b43e0..4c94d93 100644
--- a/source/data/curr/zh_Hant_HK.txt
+++ b/source/data/curr/zh_Hant_HK.txt
@@ -7,6 +7,7 @@
 // *
 // ***************************************************************************
 zh_Hant_HK{
+    %%Parent{"zh_Hant"}
     Currencies{
         AED{
             "AED",
diff --git a/source/data/curr/zh_Hant_TW.txt b/source/data/curr/zh_Hant_TW.txt
index b5fc19d..507476e 100644
--- a/source/data/curr/zh_Hant_TW.txt
+++ b/source/data/curr/zh_Hant_TW.txt
@@ -3,12 +3,10 @@
 // * Copyright (C) 2014 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/icu-locale-deprecates.xml & build.xml
+// * Source File: <path>/common/main/zh_Hant_TW.xml
 // *
 // ***************************************************************************
-/**
- * generated alias target
- */
 zh_Hant_TW{
-    ___{""}
+    %%Parent{"zh_Hant"}
+    Version{"2.1.6.69"}
 }
diff --git a/source/data/curr/zu.txt b/source/data/curr/zu.txt
index b52603f..f375c50 100644
--- a/source/data/curr/zu.txt
+++ b/source/data/curr/zu.txt
@@ -256,7 +256,7 @@ zu{
             "i-Israeli New Sheqel",
         }
         INR{
-            "₹",
+            "Rs.",
             "i-Indian Rupee",
         }
         IQD{
diff --git a/source/data/lang/az_Cyrl_AZ.txt b/source/data/lang/az_Cyrl_AZ.txt
new file mode 100644
index 0000000..34897f4
--- /dev/null
+++ b/source/data/lang/az_Cyrl_AZ.txt
@@ -0,0 +1,12 @@
+﻿// ***************************************************************************
+// *
+// * Copyright (C) 2014 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/az_Cyrl_AZ.xml
+// *
+// ***************************************************************************
+az_Cyrl_AZ{
+    %%Parent{"az_Cyrl"}
+    Version{"2.1.6.69"}
+}
diff --git a/source/data/lang/hi.txt b/source/data/lang/hi.txt
index 809d6bf..a44214e 100644
--- a/source/data/lang/hi.txt
+++ b/source/data/lang/hi.txt
@@ -197,7 +197,7 @@ hi{
         hai{"हैडा"}
         haw{"हवाई"}
         he{"हिब्रू"}
-        hi{"हिंदी"}
+        hi{"हिन्दी"}
         hil{"हिलिगेनन"}
         hit{"हिताइत"}
         hmn{"ह्मॉंग"}
diff --git a/source/data/lang/pa_Arab_PK.txt b/source/data/lang/pa_Arab_PK.txt
index 508a02a..9eabbb8 100644
--- a/source/data/lang/pa_Arab_PK.txt
+++ b/source/data/lang/pa_Arab_PK.txt
@@ -3,12 +3,10 @@
 // * Copyright (C) 2014 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/icu-locale-deprecates.xml & build.xml
+// * Source File: <path>/common/main/pa_Arab_PK.xml
 // *
 // ***************************************************************************
-/**
- * generated alias target
- */
 pa_Arab_PK{
-    ___{""}
+    %%Parent{"pa_Arab"}
+    Version{"2.1.6.69"}
 }
diff --git a/source/data/lang/resfiles.mk b/source/data/lang/resfiles.mk
index 7ebe52f..517db55 100644
--- a/source/data/lang/resfiles.mk
+++ b/source/data/lang/resfiles.mk
@@ -34,16 +34,15 @@ LANG_SYNTHETIC_ALIAS = az_AZ.txt az_Latn_AZ.txt bs_BA.txt bs_Latn_BA.txt\
  ks_IN.txt ky_Cyrl_KG.txt ky_KG.txt mn_Cyrl_MN.txt mn_MN.txt\
  mo.txt ms_BN.txt ms_Latn_BN.txt ms_Latn_MY.txt ms_Latn_SG.txt\
  ms_MY.txt ms_SG.txt nb_NO.txt nn_NO.txt no.txt\
- no_NO.txt no_NO_NY.txt pa_Arab_PK.txt pa_Guru_IN.txt pa_IN.txt\
- pa_PK.txt ro_MD.txt sh.txt sh_BA.txt sh_CS.txt\
- sh_YU.txt shi_MA.txt shi_Tfng_MA.txt sr_BA.txt sr_CS.txt\
- sr_Cyrl_BA.txt sr_Cyrl_CS.txt sr_Cyrl_RS.txt sr_Cyrl_XK.txt sr_Cyrl_YU.txt\
- sr_Latn_BA.txt sr_Latn_CS.txt sr_Latn_ME.txt sr_Latn_RS.txt sr_Latn_YU.txt\
+ no_NO.txt no_NO_NY.txt pa_Guru_IN.txt pa_IN.txt pa_PK.txt\
+ ro_MD.txt sh.txt sh_BA.txt sh_CS.txt sh_YU.txt\
+ shi_MA.txt sr_BA.txt sr_CS.txt sr_Cyrl_BA.txt sr_Cyrl_CS.txt\
+ sr_Cyrl_RS.txt sr_Cyrl_XK.txt sr_Cyrl_YU.txt sr_Latn_CS.txt sr_Latn_YU.txt\
  sr_ME.txt sr_RS.txt sr_XK.txt sr_YU.txt th_TH.txt\
  th_TH_TRADITIONAL.txt tl.txt tl_PH.txt tzm_Latn_MA.txt tzm_MA.txt\
- ug_Arab_CN.txt ug_CN.txt uz_AF.txt uz_Arab_AF.txt uz_Latn_UZ.txt\
- uz_UZ.txt vai_LR.txt vai_Vaii_LR.txt zh_CN.txt zh_HK.txt\
- zh_Hans_CN.txt zh_Hant_TW.txt zh_MO.txt zh_SG.txt zh_TW.txt
+ ug_Arab_CN.txt ug_CN.txt uz_AF.txt uz_UZ.txt vai_LR.txt\
+ vai_Vaii_LR.txt zh_CN.txt zh_HK.txt zh_Hans_CN.txt zh_MO.txt\
+ zh_SG.txt zh_TW.txt
 
 
 # All aliases (to not be included under 'installed'), but not including root.
@@ -53,71 +52,73 @@ LANG_ALIAS_SOURCE = $(LANG_SYNTHETIC_ALIAS)
 # Ordinary resources
 LANG_SOURCE = af.txt agq.txt ak.txt am.txt\
  ar.txt ar_AE.txt ar_EG.txt ar_LB.txt as.txt\
- asa.txt az.txt az_Cyrl.txt az_Latn.txt bas.txt\
- be.txt bem.txt bez.txt bg.txt bm.txt\
- bm_Latn.txt bn.txt bn_IN.txt bo.txt br.txt\
- brx.txt bs.txt bs_Cyrl.txt bs_Latn.txt ca.txt\
- cgg.txt chr.txt cs.txt cy.txt da.txt\
- dav.txt de.txt de_CH.txt dje.txt dsb.txt\
- dua.txt dyo.txt dz.txt ebu.txt ee.txt\
- el.txt en.txt en_150.txt en_AG.txt en_AI.txt\
- en_AU.txt en_BB.txt en_BE.txt en_BM.txt en_BS.txt\
- en_BW.txt en_BZ.txt en_CC.txt en_CK.txt en_CM.txt\
- en_CX.txt en_DG.txt en_DM.txt en_ER.txt en_FJ.txt\
- en_FK.txt en_FM.txt en_GB.txt en_GD.txt en_GG.txt\
- en_GH.txt en_GI.txt en_GM.txt en_GY.txt en_HK.txt\
- en_IE.txt en_IM.txt en_IN.txt en_IO.txt en_JE.txt\
- en_JM.txt en_KE.txt en_KI.txt en_KN.txt en_KY.txt\
- en_LC.txt en_LR.txt en_LS.txt en_MG.txt en_MO.txt\
- en_MS.txt en_MT.txt en_MU.txt en_MW.txt en_MY.txt\
- en_NA.txt en_NF.txt en_NG.txt en_NR.txt en_NU.txt\
- en_NZ.txt en_PG.txt en_PH.txt en_PK.txt en_PN.txt\
- en_PW.txt en_RW.txt en_SB.txt en_SC.txt en_SD.txt\
- en_SG.txt en_SH.txt en_SL.txt en_SS.txt en_SX.txt\
- en_SZ.txt en_TC.txt en_TK.txt en_TO.txt en_TT.txt\
- en_TV.txt en_TZ.txt en_UG.txt en_VC.txt en_VG.txt\
- en_VU.txt en_WS.txt en_ZA.txt en_ZM.txt en_ZW.txt\
- eo.txt es.txt es_419.txt es_AR.txt es_BO.txt\
- es_CL.txt es_CO.txt es_CR.txt es_CU.txt es_DO.txt\
- es_EC.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 eu.txt\
- ewo.txt fa.txt fa_AF.txt ff.txt fi.txt\
- fil.txt fo.txt fr.txt fr_CA.txt fur.txt\
- fy.txt ga.txt gd.txt gl.txt gsw.txt\
- gu.txt guz.txt gv.txt ha.txt ha_Latn.txt\
- haw.txt he.txt hi.txt hr.txt hsb.txt\
- hu.txt hy.txt id.txt ig.txt ii.txt\
- is.txt it.txt ja.txt jgo.txt jmc.txt\
- ka.txt kab.txt kam.txt kde.txt kea.txt\
- khq.txt ki.txt kk.txt kk_Cyrl.txt kkj.txt\
- kl.txt kln.txt km.txt kn.txt ko.txt\
- kok.txt ks.txt ks_Arab.txt ksb.txt ksf.txt\
- ksh.txt kw.txt ky.txt ky_Cyrl.txt lag.txt\
- lb.txt lg.txt lkt.txt ln.txt lo.txt\
- lt.txt lu.txt luo.txt luy.txt lv.txt\
- mas.txt mer.txt mfe.txt mg.txt mgh.txt\
- mgo.txt mk.txt ml.txt mn.txt mn_Cyrl.txt\
- mr.txt ms.txt ms_Latn.txt mt.txt mua.txt\
- my.txt naq.txt nb.txt nd.txt ne.txt\
- ne_IN.txt nl.txt nl_BE.txt nmg.txt nn.txt\
- nnh.txt nus.txt nyn.txt om.txt or.txt\
- os.txt pa.txt pa_Arab.txt pa_Guru.txt pl.txt\
- ps.txt pt.txt pt_AO.txt pt_CV.txt pt_GW.txt\
- pt_MO.txt pt_MZ.txt pt_PT.txt pt_ST.txt pt_TL.txt\
- qu.txt rm.txt rn.txt ro.txt rof.txt\
- ru.txt ru_UA.txt rw.txt rwk.txt sah.txt\
- saq.txt sbp.txt se.txt se_FI.txt seh.txt\
- ses.txt sg.txt shi.txt shi_Latn.txt shi_Tfng.txt\
- si.txt sk.txt sl.txt smn.txt sn.txt\
- so.txt sq.txt sr.txt sr_Cyrl.txt sr_Latn.txt\
- sv.txt sv_FI.txt sw.txt swc.txt ta.txt\
- te.txt teo.txt th.txt ti.txt to.txt\
- tr.txt twq.txt tzm.txt tzm_Latn.txt ug.txt\
- ug_Arab.txt uk.txt ur.txt ur_IN.txt uz.txt\
- uz_Arab.txt uz_Cyrl.txt uz_Latn.txt vai.txt vai_Latn.txt\
- vai_Vaii.txt vi.txt vun.txt wae.txt xog.txt\
- yav.txt yi.txt yo.txt yo_BJ.txt zgh.txt\
- zh.txt zh_Hans.txt zh_Hans_HK.txt zh_Hans_MO.txt zh_Hans_SG.txt\
- zh_Hant.txt zh_Hant_HK.txt zh_Hant_MO.txt zu.txt
+ asa.txt az.txt az_Cyrl.txt az_Cyrl_AZ.txt az_Latn.txt\
+ bas.txt be.txt bem.txt bez.txt bg.txt\
+ bm.txt bm_Latn.txt bn.txt bn_IN.txt bo.txt\
+ br.txt brx.txt bs.txt bs_Cyrl.txt bs_Latn.txt\
+ ca.txt cgg.txt chr.txt cs.txt cy.txt\
+ da.txt dav.txt de.txt de_CH.txt dje.txt\
+ dsb.txt dua.txt dyo.txt dz.txt ebu.txt\
+ ee.txt el.txt en.txt en_150.txt en_AG.txt\
+ en_AI.txt en_AU.txt en_BB.txt en_BE.txt en_BM.txt\
+ en_BS.txt en_BW.txt en_BZ.txt en_CC.txt en_CK.txt\
+ en_CM.txt en_CX.txt en_DG.txt en_DM.txt en_ER.txt\
+ en_FJ.txt en_FK.txt en_FM.txt en_GB.txt en_GD.txt\
+ en_GG.txt en_GH.txt en_GI.txt en_GM.txt en_GY.txt\
+ en_HK.txt en_IE.txt en_IM.txt en_IN.txt en_IO.txt\
+ en_JE.txt en_JM.txt en_KE.txt en_KI.txt en_KN.txt\
+ en_KY.txt en_LC.txt en_LR.txt en_LS.txt en_MG.txt\
+ en_MO.txt en_MS.txt en_MT.txt en_MU.txt en_MW.txt\
+ en_MY.txt en_NA.txt en_NF.txt en_NG.txt en_NR.txt\
+ en_NU.txt en_NZ.txt en_PG.txt en_PH.txt en_PK.txt\
+ en_PN.txt en_PW.txt en_RW.txt en_SB.txt en_SC.txt\
+ en_SD.txt en_SG.txt en_SH.txt en_SL.txt en_SS.txt\
+ en_SX.txt en_SZ.txt en_TC.txt en_TK.txt en_TO.txt\
+ en_TT.txt en_TV.txt en_TZ.txt en_UG.txt en_VC.txt\
+ en_VG.txt en_VU.txt en_WS.txt en_ZA.txt en_ZM.txt\
+ en_ZW.txt eo.txt es.txt es_419.txt es_AR.txt\
+ es_BO.txt es_CL.txt es_CO.txt es_CR.txt es_CU.txt\
+ es_DO.txt es_EC.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\
+ eu.txt ewo.txt fa.txt fa_AF.txt ff.txt\
+ fi.txt fil.txt fo.txt fr.txt fr_CA.txt\
+ fur.txt fy.txt ga.txt gd.txt gl.txt\
+ gsw.txt gu.txt guz.txt gv.txt ha.txt\
+ ha_Latn.txt haw.txt he.txt hi.txt hr.txt\
+ hsb.txt hu.txt hy.txt id.txt ig.txt\
+ ii.txt is.txt it.txt ja.txt jgo.txt\
+ jmc.txt ka.txt kab.txt kam.txt kde.txt\
+ kea.txt khq.txt ki.txt kk.txt kk_Cyrl.txt\
+ kkj.txt kl.txt kln.txt km.txt kn.txt\
+ ko.txt kok.txt ks.txt ks_Arab.txt ksb.txt\
+ ksf.txt ksh.txt kw.txt ky.txt ky_Cyrl.txt\
+ lag.txt lb.txt lg.txt lkt.txt ln.txt\
+ lo.txt lt.txt lu.txt luo.txt luy.txt\
+ lv.txt mas.txt mer.txt mfe.txt mg.txt\
+ mgh.txt mgo.txt mk.txt ml.txt mn.txt\
+ mn_Cyrl.txt mr.txt ms.txt ms_Latn.txt mt.txt\
+ mua.txt my.txt naq.txt nb.txt nd.txt\
+ ne.txt ne_IN.txt nl.txt nl_BE.txt nmg.txt\
+ nn.txt nnh.txt nus.txt nyn.txt om.txt\
+ or.txt os.txt pa.txt pa_Arab.txt pa_Arab_PK.txt\
+ pa_Guru.txt pl.txt ps.txt pt.txt pt_AO.txt\
+ pt_CV.txt pt_GW.txt pt_MO.txt pt_MZ.txt pt_PT.txt\
+ pt_ST.txt pt_TL.txt qu.txt rm.txt rn.txt\
+ ro.txt rof.txt ru.txt ru_UA.txt rw.txt\
+ rwk.txt sah.txt saq.txt sbp.txt se.txt\
+ se_FI.txt seh.txt ses.txt sg.txt shi.txt\
+ shi_Latn.txt shi_Tfng.txt shi_Tfng_MA.txt si.txt sk.txt\
+ sl.txt smn.txt sn.txt so.txt sq.txt\
+ sr.txt sr_Cyrl.txt sr_Latn.txt sr_Latn_BA.txt sr_Latn_ME.txt\
+ sr_Latn_RS.txt sv.txt sv_FI.txt sw.txt swc.txt\
+ ta.txt te.txt teo.txt th.txt ti.txt\
+ to.txt tr.txt twq.txt tzm.txt tzm_Latn.txt\
+ ug.txt ug_Arab.txt uk.txt ur.txt ur_IN.txt\
+ uz.txt uz_Arab.txt uz_Arab_AF.txt uz_Cyrl.txt uz_Latn.txt\
+ uz_Latn_UZ.txt vai.txt vai_Latn.txt vai_Latn_LR.txt vai_Vaii.txt\
+ vi.txt vun.txt wae.txt xog.txt yav.txt\
+ yi.txt yo.txt yo_BJ.txt zgh.txt zh.txt\
+ zh_Hans.txt zh_Hans_HK.txt zh_Hans_MO.txt zh_Hans_SG.txt zh_Hant.txt\
+ zh_Hant_HK.txt zh_Hant_MO.txt zh_Hant_TW.txt zu.txt
 
diff --git a/source/data/lang/shi_Tfng_MA.txt b/source/data/lang/shi_Tfng_MA.txt
index 729e805..87d9d8f 100755
--- a/source/data/lang/shi_Tfng_MA.txt
+++ b/source/data/lang/shi_Tfng_MA.txt
@@ -3,12 +3,10 @@
 // * Copyright (C) 2014 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/icu-locale-deprecates.xml & build.xml
+// * Source File: <path>/common/main/shi_Tfng_MA.xml
 // *
 // ***************************************************************************
-/**
- * generated alias target
- */
 shi_Tfng_MA{
-    ___{""}
+    %%Parent{"shi_Tfng"}
+    Version{"2.1.6.69"}
 }
diff --git a/source/data/lang/sr_Latn_BA.txt b/source/data/lang/sr_Latn_BA.txt
index fcc337c..61e502c 100644
--- a/source/data/lang/sr_Latn_BA.txt
+++ b/source/data/lang/sr_Latn_BA.txt
@@ -3,12 +3,10 @@
 // * Copyright (C) 2014 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/icu-locale-deprecates.xml & build.xml
+// * Source File: <path>/common/main/sr_Latn_BA.xml
 // *
 // ***************************************************************************
-/**
- * generated alias target
- */
 sr_Latn_BA{
-    ___{""}
+    %%Parent{"sr_Latn"}
+    Version{"2.1.8.20"}
 }
diff --git a/source/data/lang/sr_Latn_ME.txt b/source/data/lang/sr_Latn_ME.txt
index 4887740..ddbcd9c 100755
--- a/source/data/lang/sr_Latn_ME.txt
+++ b/source/data/lang/sr_Latn_ME.txt
@@ -3,12 +3,10 @@
 // * Copyright (C) 2014 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/icu-locale-deprecates.xml & build.xml
+// * Source File: <path>/common/main/sr_Latn_ME.xml
 // *
 // ***************************************************************************
-/**
- * generated alias target
- */
 sr_Latn_ME{
-    ___{""}
+    %%Parent{"sr_Latn"}
+    Version{"2.1.8.20"}
 }
diff --git a/source/data/lang/sr_Latn_RS.txt b/source/data/lang/sr_Latn_RS.txt
index c5ee86b..14725d1 100644
--- a/source/data/lang/sr_Latn_RS.txt
+++ b/source/data/lang/sr_Latn_RS.txt
@@ -3,12 +3,10 @@
 // * Copyright (C) 2014 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/icu-locale-deprecates.xml & build.xml
+// * Source File: <path>/common/main/sr_Latn_RS.xml
 // *
 // ***************************************************************************
-/**
- * generated alias target
- */
 sr_Latn_RS{
-    ___{""}
+    %%Parent{"sr_Latn"}
+    Version{"2.1.6.69"}
 }
diff --git a/source/data/lang/uz_Arab_AF.txt b/source/data/lang/uz_Arab_AF.txt
index e438cc7..70606f1 100644
--- a/source/data/lang/uz_Arab_AF.txt
+++ b/source/data/lang/uz_Arab_AF.txt
@@ -3,12 +3,10 @@
 // * Copyright (C) 2014 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/icu-locale-deprecates.xml & build.xml
+// * Source File: <path>/common/main/uz_Arab_AF.xml
 // *
 // ***************************************************************************
-/**
- * generated alias target
- */
 uz_Arab_AF{
-    ___{""}
+    %%Parent{"uz_Arab"}
+    Version{"2.1.6.69"}
 }
diff --git a/source/data/lang/uz_Latn_UZ.txt b/source/data/lang/uz_Latn_UZ.txt
index 3b1b013..e46e887 100755
--- a/source/data/lang/uz_Latn_UZ.txt
+++ b/source/data/lang/uz_Latn_UZ.txt
@@ -3,12 +3,10 @@
 // * Copyright (C) 2014 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/icu-locale-deprecates.xml & build.xml
+// * Source File: <path>/common/main/uz_Latn_UZ.xml
 // *
 // ***************************************************************************
-/**
- * generated alias target
- */
 uz_Latn_UZ{
-    ___{""}
+    %%Parent{"uz_Latn"}
+    Version{"2.1.6.69"}
 }
diff --git a/source/data/lang/vai_Latn_LR.txt b/source/data/lang/vai_Latn_LR.txt
new file mode 100644
index 0000000..ffb3e10
--- /dev/null
+++ b/source/data/lang/vai_Latn_LR.txt
@@ -0,0 +1,12 @@
+﻿// ***************************************************************************
+// *
+// * Copyright (C) 2014 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/vai_Latn_LR.xml
+// *
+// ***************************************************************************
+vai_Latn_LR{
+    %%Parent{"vai_Latn"}
+    Version{"2.1.6.69"}
+}
diff --git a/source/data/lang/zh_Hant_HK.txt b/source/data/lang/zh_Hant_HK.txt
index 32ca958..d599662 100644
--- a/source/data/lang/zh_Hant_HK.txt
+++ b/source/data/lang/zh_Hant_HK.txt
@@ -7,6 +7,7 @@
 // *
 // ***************************************************************************
 zh_Hant_HK{
+    %%Parent{"zh_Hant"}
     Keys{
         calendar{"日曆"}
         x{"專用區"}
diff --git a/source/data/lang/zh_Hant_TW.txt b/source/data/lang/zh_Hant_TW.txt
index b5fc19d..507476e 100644
--- a/source/data/lang/zh_Hant_TW.txt
+++ b/source/data/lang/zh_Hant_TW.txt
@@ -3,12 +3,10 @@
 // * Copyright (C) 2014 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/icu-locale-deprecates.xml & build.xml
+// * Source File: <path>/common/main/zh_Hant_TW.xml
 // *
 // ***************************************************************************
-/**
- * generated alias target
- */
 zh_Hant_TW{
-    ___{""}
+    %%Parent{"zh_Hant"}
+    Version{"2.1.6.69"}
 }
diff --git a/source/data/locales/az_Cyrl_AZ.txt b/source/data/locales/az_Cyrl_AZ.txt
index 758678a..34897f4 100644
--- a/source/data/locales/az_Cyrl_AZ.txt
+++ b/source/data/locales/az_Cyrl_AZ.txt
@@ -7,5 +7,6 @@
 // *
 // ***************************************************************************
 az_Cyrl_AZ{
+    %%Parent{"az_Cyrl"}
     Version{"2.1.6.69"}
 }
diff --git a/source/data/locales/bn.txt b/source/data/locales/bn.txt
index 0efbe51..c130903 100644
--- a/source/data/locales/bn.txt
+++ b/source/data/locales/bn.txt
@@ -325,8 +325,8 @@ bn{
         }
         gregorian{
             AmPmMarkers{
-                "পূর্বাহ্ণ",
-                "অপরাহ্ণ",
+                "am",
+                "pm",
             }
             AmPmMarkersNarrow{
                 "পূর্বাহ্ণ",
@@ -347,7 +347,7 @@ bn{
                 "{1} {0}",
                 "{1} {0}",
             }
-            NoonMarker{"দুপুর"}
+            NoonMarker{"noon"}
             NoonMarkerNarrow{"দুপুর"}
             appendItems{
                 Timezone{"{0} {1}"}
diff --git a/source/data/locales/en.txt b/source/data/locales/en.txt
index 189e9cf..2dacacf 100644
--- a/source/data/locales/en.txt
+++ b/source/data/locales/en.txt
@@ -348,18 +348,18 @@ en{
                         "Mo12",
                     }
                     wide{
-                        "Month1",
-                        "Month2",
-                        "Month3",
-                        "Month4",
-                        "Month5",
-                        "Month6",
-                        "Month7",
-                        "Month8",
-                        "Month9",
-                        "Month10",
-                        "Month11",
-                        "Month12",
+                        "1",
+                        "2",
+                        "3",
+                        "4",
+                        "5",
+                        "6",
+                        "7",
+                        "8",
+                        "9",
+                        "10",
+                        "11",
+                        "12",
                     }
                 }
             }
diff --git a/source/data/locales/en_GB.txt b/source/data/locales/en_GB.txt
index 9897ea9..f701fc3 100644
--- a/source/data/locales/en_GB.txt
+++ b/source/data/locales/en_GB.txt
@@ -391,6 +391,7 @@ en_GB{
                     h{"h–h a"}
                 }
                 hm{
+                    a{"h:mm a – h:mm a"}
                     h{"h:mm–h:mm a"}
                     m{"h:mm–h:mm a"}
                 }
diff --git a/source/data/locales/hi.txt b/source/data/locales/hi.txt
index e502fd7..1adc3a4 100644
--- a/source/data/locales/hi.txt
+++ b/source/data/locales/hi.txt
@@ -339,16 +339,16 @@ hi{
         }
         gregorian{
             AmPmMarkers{
-                "पूर्वाह्न",
-                "अपराह्न",
+                "am",
+                "pm",
             }
             AmPmMarkersAbbr{
                 "पूर्व",
                 "अपर",
             }
             AmPmMarkersNarrow{
-                "पू",
-                "अ",
+                "am",
+                "pm",
             }
             DateTimePatterns{
                 "h:mm:ss a zzzz",
@@ -365,8 +365,8 @@ hi{
                 "{1}, {0}",
                 "{1}, {0}",
             }
-            NoonMarker{"दोपहर"}
-            NoonMarkerNarrow{"दोप"}
+            NoonMarker{"noon"}
+            NoonMarkerNarrow{"n"}
             appendItems{
                 Timezone{"{0} {1}"}
             }
diff --git a/source/data/locales/my.txt b/source/data/locales/my.txt
index 4d00454..30fdd41 100644
--- a/source/data/locales/my.txt
+++ b/source/data/locales/my.txt
@@ -522,18 +522,18 @@ my{
             monthNames{
                 format{
                     abbreviated{
-                        "ဇန်နဝါရီ",
-                        "ဖေဖော်ဝါရီ",
+                        "ဇန်",
+                        "ဖေ",
                         "မတ်",
                         "ဧပြီ",
                         "မေ",
                         "ဇွန်",
-                        "ဇူလိုင်",
-                        "ဩဂုတ်",
-                        "စက်တင်ဘာ",
-                        "အောက်တိုဘာ",
-                        "နိုဝင်ဘာ",
-                        "ဒီဇင်ဘာ",
+                        "ဇူ",
+                        "ဩ",
+                        "စက်",
+                        "အောက်",
+                        "နို",
+                        "ဒီ",
                     }
                     wide{
                         "ဇန်နဝါရီ",
@@ -552,18 +552,18 @@ my{
                 }
                 stand-alone{
                     abbreviated{
-                        "ဇန်နဝါရီ",
-                        "ဖေဖော်ဝါရီ",
+                        "ဇန်",
+                        "ဖေ",
                         "မတ်",
                         "ဧပြီ",
                         "မေ",
                         "ဇွန်",
-                        "ဇူလိုင်",
-                        "ဩဂုတ်",
-                        "စက်တင်ဘာ",
-                        "အောက်တိုဘာ",
-                        "နိုဝင်ဘာ",
-                        "ဒီဇင်ဘာ",
+                        "ဇူ",
+                        "ဩ",
+                        "စက်",
+                        "အောက်",
+                        "နို",
+                        "ဒီ",
                     }
                     narrow{
                         "ဇ",
diff --git a/source/data/locales/pa_Arab_PK.txt b/source/data/locales/pa_Arab_PK.txt
index eab87b1..9eabbb8 100755
--- a/source/data/locales/pa_Arab_PK.txt
+++ b/source/data/locales/pa_Arab_PK.txt
@@ -7,5 +7,6 @@
 // *
 // ***************************************************************************
 pa_Arab_PK{
+    %%Parent{"pa_Arab"}
     Version{"2.1.6.69"}
 }
diff --git a/source/data/locales/shi_Tfng_MA.txt b/source/data/locales/shi_Tfng_MA.txt
index 95868fa..87d9d8f 100755
--- a/source/data/locales/shi_Tfng_MA.txt
+++ b/source/data/locales/shi_Tfng_MA.txt
@@ -7,5 +7,6 @@
 // *
 // ***************************************************************************
 shi_Tfng_MA{
+    %%Parent{"shi_Tfng"}
     Version{"2.1.6.69"}
 }
diff --git a/source/data/locales/sr_Latn_BA.txt b/source/data/locales/sr_Latn_BA.txt
index 079e6e8..737dad7 100644
--- a/source/data/locales/sr_Latn_BA.txt
+++ b/source/data/locales/sr_Latn_BA.txt
@@ -7,6 +7,7 @@
 // *
 // ***************************************************************************
 sr_Latn_BA{
+    %%Parent{"sr_Latn"}
     Version{"2.1.8.20"}
     calendar{
         generic{
diff --git a/source/data/locales/sr_Latn_ME.txt b/source/data/locales/sr_Latn_ME.txt
index 92b3336..ddbcd9c 100644
--- a/source/data/locales/sr_Latn_ME.txt
+++ b/source/data/locales/sr_Latn_ME.txt
@@ -7,5 +7,6 @@
 // *
 // ***************************************************************************
 sr_Latn_ME{
+    %%Parent{"sr_Latn"}
     Version{"2.1.8.20"}
 }
diff --git a/source/data/locales/sr_Latn_RS.txt b/source/data/locales/sr_Latn_RS.txt
index 5997d68..14725d1 100644
--- a/source/data/locales/sr_Latn_RS.txt
+++ b/source/data/locales/sr_Latn_RS.txt
@@ -7,5 +7,6 @@
 // *
 // ***************************************************************************
 sr_Latn_RS{
+    %%Parent{"sr_Latn"}
     Version{"2.1.6.69"}
 }
diff --git a/source/data/locales/ta.txt b/source/data/locales/ta.txt
index 157af68..e02a89a 100644
--- a/source/data/locales/ta.txt
+++ b/source/data/locales/ta.txt
@@ -430,8 +430,8 @@ ta{
                 "பிற்பகல்",
             }
             AmPmMarkersAbbr{
-                "முற்பகல்",
-                "பிற்பகல்",
+                "AM",
+                "PM",
             }
             AmPmMarkersNarrow{
                 "மு.ப",
diff --git a/source/data/locales/tr.txt b/source/data/locales/tr.txt
index fbf4878..457344b 100644
--- a/source/data/locales/tr.txt
+++ b/source/data/locales/tr.txt
@@ -384,7 +384,7 @@ tr{
                 "d MMMM y EEEE",
                 "d MMMM y",
                 "d MMM y",
-                "d.MM.y",
+                "d MM y",
                 "{1} {0}",
                 "{1} {0}",
                 "{1} {0}",
diff --git a/source/data/locales/uz_Arab_AF.txt b/source/data/locales/uz_Arab_AF.txt
index b564df2..7df9d13 100644
--- a/source/data/locales/uz_Arab_AF.txt
+++ b/source/data/locales/uz_Arab_AF.txt
@@ -7,6 +7,7 @@
 // *
 // ***************************************************************************
 uz_Arab_AF{
+    %%Parent{"uz_Arab"}
     Version{"2.1.6.69"}
     calendar{
         default{"persian"}
diff --git a/source/data/locales/uz_Latn_UZ.txt b/source/data/locales/uz_Latn_UZ.txt
index 79c19d1..e46e887 100644
--- a/source/data/locales/uz_Latn_UZ.txt
+++ b/source/data/locales/uz_Latn_UZ.txt
@@ -7,5 +7,6 @@
 // *
 // ***************************************************************************
 uz_Latn_UZ{
+    %%Parent{"uz_Latn"}
     Version{"2.1.6.69"}
 }
diff --git a/source/data/locales/vai_Latn_LR.txt b/source/data/locales/vai_Latn_LR.txt
index 007c64a..ffb3e10 100755
--- a/source/data/locales/vai_Latn_LR.txt
+++ b/source/data/locales/vai_Latn_LR.txt
@@ -7,5 +7,6 @@
 // *
 // ***************************************************************************
 vai_Latn_LR{
+    %%Parent{"vai_Latn"}
     Version{"2.1.6.69"}
 }
diff --git a/source/data/locales/zh_Hant_HK.txt b/source/data/locales/zh_Hant_HK.txt
index 4642481..9838af7 100644
--- a/source/data/locales/zh_Hant_HK.txt
+++ b/source/data/locales/zh_Hant_HK.txt
@@ -7,6 +7,7 @@
 // *
 // ***************************************************************************
 zh_Hant_HK{
+    %%Parent{"zh_Hant"}
     NumberElements{
         latn{
             patternsLong{
diff --git a/source/data/locales/zh_Hant_TW.txt b/source/data/locales/zh_Hant_TW.txt
index 44ec082..507476e 100644
--- a/source/data/locales/zh_Hant_TW.txt
+++ b/source/data/locales/zh_Hant_TW.txt
@@ -7,5 +7,6 @@
 // *
 // ***************************************************************************
 zh_Hant_TW{
+    %%Parent{"zh_Hant"}
     Version{"2.1.6.69"}
 }
diff --git a/source/data/misc/likelySubtags.txt b/source/data/misc/likelySubtags.txt
index 54f979f..3a3fa4d 100644
--- a/source/data/misc/likelySubtags.txt
+++ b/source/data/misc/likelySubtags.txt
@@ -266,7 +266,6 @@ likelySubtags:table(nofallback){
     ja{"ja_Jpan_JP"}
     jam{"jam_Latn_JM"}
     jgo{"jgo_Latn_CM"}
-    ji{"ji_Hebr_UA"}
     jmc{"jmc_Latn_TZ"}
     jml{"jml_Deva_NP"}
     jut{"jut_Latn_DK"}
@@ -329,6 +328,7 @@ likelySubtags:table(nofallback){
     ksh{"ksh_Latn_DE"}
     ku{"ku_Latn_TR"}
     ku_Arab{"ku_Arab_IQ"}
+    ku_IR{"ku_Arab_IR"}
     ku_LB{"ku_Arab_LB"}
     kum{"kum_Cyrl_RU"}
     kv{"kv_Cyrl_RU"}
@@ -560,6 +560,7 @@ likelySubtags:table(nofallback){
     sg{"sg_Latn_CF"}
     sga{"sga_Ogam_IE"}
     sgs{"sgs_Latn_LT"}
+    sh{"sr_Latn_RS"}
     shi{"shi_Tfng_MA"}
     shn{"shn_Mymr_MM"}
     si{"si_Sinh_LK"}
@@ -718,6 +719,7 @@ likelySubtags:table(nofallback){
     und_Arab_MU{"ur_Arab_MU"}
     und_Arab_NG{"ha_Arab_NG"}
     und_Arab_PK{"ur_Arab_PK"}
+    und_Arab_SN{"wo_Arab_SN"}
     und_Arab_TH{"mfa_Arab_TH"}
     und_Arab_TJ{"fa_Arab_TJ"}
     und_Arab_YT{"swb_Arab_YT"}
@@ -745,6 +747,7 @@ likelySubtags:table(nofallback){
     und_Bass{"bsq_Bass_LR"}
     und_Batk{"bbc_Batk_ID"}
     und_Beng{"bn_Beng_BD"}
+    und_Beng_IN{"bn_Beng_IN"}
     und_Bopo{"zh_Bopo_TW"}
     und_Brah{"pka_Brah_IN"}
     und_Brai{"fr_Brai_FR"}
@@ -778,6 +781,7 @@ likelySubtags:table(nofallback){
     und_Cyrl_BA{"sr_Cyrl_BA"}
     und_Cyrl_GE{"ab_Cyrl_GE"}
     und_Cyrl_GR{"mk_Cyrl_GR"}
+    und_Cyrl_KZ{"kk_Cyrl_KZ"}
     und_Cyrl_MD{"uk_Cyrl_MD"}
     und_Cyrl_PL{"be_Cyrl_PL"}
     und_Cyrl_RO{"bg_Cyrl_RO"}
@@ -807,7 +811,9 @@ likelySubtags:table(nofallback){
     und_Egyp{"egy_Egyp_EG"}
     und_Elba{"sq_Elba_AL"}
     und_Ethi{"am_Ethi_ET"}
+    und_Ethi_ER{"ti_Ethi_ER"}
     und_FI{"fi_Latn_FI"}
+    und_FJ{"fj_Latn_FJ"}
     und_FM{"chk_Latn_FM"}
     und_FO{"fo_Latn_FO"}
     und_FR{"fr_Latn_FR"}
@@ -822,6 +828,7 @@ likelySubtags:table(nofallback){
     und_GR{"el_Grek_GR"}
     und_GS{"und_Latn_GS"}
     und_GT{"es_Latn_GT"}
+    und_GU{"ch_Latn_GU"}
     und_GW{"pt_Latn_GW"}
     und_Geor{"ka_Geor_GE"}
     und_Glag{"cu_Glag_BG"}
@@ -895,11 +902,16 @@ likelySubtags:table(nofallback){
     und_Latn_CN{"za_Latn_CN"}
     und_Latn_CY{"tr_Latn_CY"}
     und_Latn_DZ{"fr_Latn_DZ"}
+    und_Latn_ES{"es_Latn_ES"}
     und_Latn_ET{"en_Latn_ET"}
+    und_Latn_GB{"en_Latn_GB"}
     und_Latn_GE{"ku_Latn_GE"}
+    und_Latn_GH{"ak_Latn_GH"}
     und_Latn_GR{"tr_Latn_GR"}
+    und_Latn_ID{"id_Latn_ID"}
     und_Latn_IL{"ro_Latn_IL"}
     und_Latn_IR{"tk_Latn_IR"}
+    und_Latn_IT{"it_Latn_IT"}
     und_Latn_KM{"fr_Latn_KM"}
     und_Latn_KZ{"de_Latn_KZ"}
     und_Latn_LB{"fr_Latn_LB"}
@@ -910,8 +922,10 @@ likelySubtags:table(nofallback){
     und_Latn_RU{"krl_Latn_RU"}
     und_Latn_SY{"fr_Latn_SY"}
     und_Latn_TN{"fr_Latn_TN"}
+    und_Latn_TR{"tr_Latn_TR"}
     und_Latn_TW{"trv_Latn_TW"}
     und_Latn_UA{"pl_Latn_UA"}
+    und_Latn_ZA{"af_Latn_ZA"}
     und_Lepc{"lep_Lepc_IN"}
     und_Limb{"lif_Limb_IN"}
     und_Lina{"lab_Lina_GR"}
@@ -925,6 +939,7 @@ likelySubtags:table(nofallback){
     und_ME{"sr_Latn_ME"}
     und_MF{"fr_Latn_MF"}
     und_MG{"mg_Latn_MG"}
+    und_MH{"mh_Latn_MH"}
     und_MK{"mk_Cyrl_MK"}
     und_ML{"bm_Latn_ML"}
     und_MM{"my_Mymr_MM"}
@@ -957,8 +972,10 @@ likelySubtags:table(nofallback){
     und_NE{"ha_Latn_NE"}
     und_NI{"es_Latn_NI"}
     und_NL{"nl_Latn_NL"}
-    und_NO{"nb_Latn_NO"}
+    und_NO{"no_Latn_NO"}
     und_NP{"ne_Deva_NP"}
+    und_NR{"na_Latn_NR"}
+    und_NU{"niu_Latn_NU"}
     und_Narb{"xna_Narb_SA"}
     und_Nbat{"arc_Nbat_JO"}
     und_Nkoo{"man_Nkoo_GN"}
@@ -1004,7 +1021,7 @@ likelySubtags:table(nofallback){
     und_SD{"ar_Arab_SD"}
     und_SE{"sv_Latn_SE"}
     und_SI{"sl_Latn_SI"}
-    und_SJ{"nb_Latn_SJ"}
+    und_SJ{"no_Latn_SJ"}
     und_SK{"sk_Latn_SK"}
     und_SM{"it_Latn_SM"}
     und_SN{"fr_Latn_SN"}
diff --git a/source/data/misc/metaZones.txt b/source/data/misc/metaZones.txt
index 73fb227..939d924 100644
--- a/source/data/misc/metaZones.txt
+++ b/source/data/misc/metaZones.txt
@@ -405,10 +405,9 @@ metaZones:table(nofallback){
             001{"Indian/Chagos"}
         }
         Indochina{
-            001{"Asia/Saigon"}
+            001{"Asia/Bangkok"}
             KH{"Asia/Phnom_Penh"}
             LA{"Asia/Vientiane"}
-            TH{"Asia/Bangkok"}
         }
         Indonesia_Central{
             001{"Asia/Makassar"}
@@ -1621,11 +1620,11 @@ metaZones:table(nofallback){
             {
                 "America_Eastern",
                 "1970-01-01 00:00",
-                "2014-11-02 06:00",
+                "2015-11-01 06:00",
             }
             {
                 "Atlantic",
-                "2014-11-02 06:00",
+                "2015-11-01 06:00",
                 "9999-12-31 23:59",
             }
         }
@@ -3097,6 +3096,8 @@ metaZones:table(nofallback){
         "Asia:Saigon"{
             {
                 "Indochina",
+                "1975-06-12 16:00",
+                "9999-12-31 23:59",
             }
         }
         "Asia:Sakhalin"{
@@ -3984,6 +3985,13 @@ metaZones:table(nofallback){
                 "New_Zealand",
             }
         }
+        "Pacific:Bougainville"{
+            {
+                "Papua_New_Guinea",
+                "1970-01-01 00:00",
+                "2014-12-27 16:00",
+            }
+        }
         "Pacific:Chatham"{
             {
                 "Chatham",
diff --git a/source/data/misc/supplementalData.txt b/source/data/misc/supplementalData.txt
index a9be5a4..b940e0d 100644
--- a/source/data/misc/supplementalData.txt
+++ b/source/data/misc/supplementalData.txt
@@ -7070,6 +7070,7 @@ supplementalData:table(nofallback){
             }
         }
         parentLocales{
+            az_Cyrl{"az_Cyrl_AZ"}
             en_001{
                 "en_AG",
                 "en_AI",
@@ -7179,6 +7180,7 @@ supplementalData:table(nofallback){
                 "es_UY",
                 "es_VE",
             }
+            pa_Arab{"pa_Arab_PK"}
             pt_PT{
                 "pt_AO",
                 "pt_CV",
@@ -7204,6 +7206,19 @@ supplementalData:table(nofallback){
                 "vai_Latn",
                 "zh_Hant",
             }
+            shi_Tfng{"shi_Tfng_MA"}
+            sr_Latn{
+                "sr_Latn_BA",
+                "sr_Latn_ME",
+                "sr_Latn_RS",
+            }
+            uz_Arab{"uz_Arab_AF"}
+            uz_Latn{"uz_Latn_UZ"}
+            vai_Latn{"vai_Latn_LR"}
+            zh_Hant{
+                "zh_Hant_HK",
+                "zh_Hant_TW",
+            }
             zh_Hant_HK{"zh_Hant_MO"}
         }
         pau{
diff --git a/source/data/misc/timezoneTypes.txt b/source/data/misc/timezoneTypes.txt
index 80c4aaa..366b101 100644
--- a/source/data/misc/timezoneTypes.txt
+++ b/source/data/misc/timezoneTypes.txt
@@ -560,6 +560,7 @@ timezoneTypes:table(nofallback){
             "Indian:Reunion"{"rereu"}
             "Pacific:Apia"{"wsapw"}
             "Pacific:Auckland"{"nzakl"}
+            "Pacific:Bougainville"{"pgraw"}
             "Pacific:Chatham"{"nzcht"}
             "Pacific:Easter"{"clipc"}
             "Pacific:Efate"{"vuvli"}
diff --git a/source/data/misc/windowsZones.txt b/source/data/misc/windowsZones.txt
index a26db63..4a9b9f2 100644
--- a/source/data/misc/windowsZones.txt
+++ b/source/data/misc/windowsZones.txt
@@ -78,6 +78,10 @@ windowsZones:table(nofallback){
             BD{"Asia/Dhaka"}
             BT{"Asia/Thimphu"}
         }
+        "Belarus Standard Time"{
+            001{"Europe/Minsk"}
+            BY{"Europe/Minsk"}
+        }
         "Canada Central Standard Time"{
             001{"America/Regina"}
             CA{"America/Regina America/Swift_Current"}
@@ -309,7 +313,6 @@ windowsZones:table(nofallback){
         }
         "Kaliningrad Standard Time"{
             001{"Europe/Kaliningrad"}
-            BY{"Europe/Minsk"}
             RU{"Europe/Kaliningrad"}
         }
         "Korea Standard Time"{
@@ -328,7 +331,7 @@ windowsZones:table(nofallback){
         }
         "Magadan Standard Time"{
             001{"Asia/Magadan"}
-            RU{"Asia/Magadan Asia/Anadyr Asia/Kamchatka Asia/Srednekolymsk"}
+            RU{"Asia/Magadan"}
         }
         "Mauritius Standard Time"{
             001{"Indian/Mauritius"}
@@ -370,7 +373,7 @@ windowsZones:table(nofallback){
         }
         "N. Central Asia Standard Time"{
             001{"Asia/Novosibirsk"}
-            RU{"Asia/Novosibirsk Asia/Novokuznetsk Asia/Omsk"}
+            RU{"Asia/Novosibirsk Asia/Omsk"}
         }
         "Namibia Standard Time"{
             001{"Africa/Windhoek"}
@@ -391,11 +394,11 @@ windowsZones:table(nofallback){
         }
         "North Asia East Standard Time"{
             001{"Asia/Irkutsk"}
-            RU{"Asia/Irkutsk"}
+            RU{"Asia/Irkutsk Asia/Chita"}
         }
         "North Asia Standard Time"{
             001{"Asia/Krasnoyarsk"}
-            RU{"Asia/Krasnoyarsk"}
+            RU{"Asia/Krasnoyarsk Asia/Novokuznetsk"}
         }
         "Pacific SA Standard Time"{
             001{"America/Santiago"}
@@ -428,9 +431,21 @@ windowsZones:table(nofallback){
             ES{"Europe/Madrid Africa/Ceuta"}
             FR{"Europe/Paris"}
         }
+        "Russia Time Zone 10"{
+            001{"Asia/Srednekolymsk"}
+            RU{"Asia/Srednekolymsk"}
+        }
+        "Russia Time Zone 11"{
+            001{"Asia/Kamchatka"}
+            RU{"Asia/Kamchatka Asia/Anadyr"}
+        }
+        "Russia Time Zone 3"{
+            001{"Europe/Samara"}
+            RU{"Europe/Samara"}
+        }
         "Russian Standard Time"{
             001{"Europe/Moscow"}
-            RU{"Europe/Moscow Europe/Samara Europe/Simferopol Europe/Volgograd"}
+            RU{"Europe/Moscow Europe/Simferopol Europe/Volgograd"}
         }
         "SA Eastern Standard Time"{
             001{"America/Cayenne"}
@@ -671,12 +686,12 @@ windowsZones:table(nofallback){
             FM{"Pacific/Truk"}
             GU{"Pacific/Guam"}
             MP{"Pacific/Saipan"}
-            PG{"Pacific/Port_Moresby"}
+            PG{"Pacific/Port_Moresby Pacific/Bougainville"}
             ZZ{"Etc/GMT-10"}
         }
         "Yakutsk Standard Time"{
             001{"Asia/Yakutsk"}
-            RU{"Asia/Yakutsk Asia/Chita Asia/Khandyga"}
+            RU{"Asia/Yakutsk Asia/Khandyga"}
         }
     }
 }
diff --git a/source/data/misc/zoneinfo64.txt b/source/data/misc/zoneinfo64.txt
index 945dec1..e619ccb 100644
--- a/source/data/misc/zoneinfo64.txt
+++ b/source/data/misc/zoneinfo64.txt
@@ -2,18 +2,18 @@
 // Copyright (C) 2003-2014, International Business Machines
 // Corporation and others.  All Rights Reserved.
 //---------------------------------------------------------
-// Build tool: tz2icu
-// Build date: Fri Sep 26 12:59:27 2014
-// Olson source: ftp://elsie.nci.nih.gov/pub/
-// Olson version: 2014h
-// ICU version: 54.1
+// Build tool:  tz2icu
+// Build date:  Tue Nov 11 12:33:07 2014
+// tz database: ftp://ftp.iana.org/tz/
+// tz version:  2014j
+// ICU version: 55.0.1
 //---------------------------------------------------------
 // >> !!! >>   THIS IS A MACHINE-GENERATED FILE   << !!! <<
 // >> !!! >>>            DO NOT EDIT             <<< !!! <<
 //---------------------------------------------------------
 
 zoneinfo64:table(nofallback) {
- TZVersion { "2014h" }
+ TZVersion { "2014j" }
  Zones:array { 
   /* ACT */ :int { 347 } //Z#0
   /* AET */ :int { 359 } //Z#1
@@ -31,27 +31,15 @@ zoneinfo64:table(nofallback) {
     typeOffsets:intvector { -52, 0, 0, 0, 0, 1200 }
     typeMap:bin { "0102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
   } //Z#6
-  /* Africa/Addis_Ababa */ :table {
-    transPre32:intvector { -1, 1139284408 }
-    trans:intvector { -1062210920 }
-    typeOffsets:intvector { 9288, 0, 9320, 0, 10800, 0 }
-    typeMap:bin { "0102" }
-    links:intvector { 7, 388 }
-  } //Z#7
+  /* Africa/Addis_Ababa */ :int { 48 } //Z#7
   /* Africa/Algiers */ :table {
     transPre32:intvector { -1, 1808288224 }
     trans:intvector { -1855958961, -1689814800, -1680397200, -1665363600, -1648342800, -1635123600, -1616893200, -1604278800, -1585443600, -1574038800, -1552266000, -1539997200, -1531443600, -956365200, -950486400, -942012000, -812502000, -796262400, -781052400, -766630800, -733280400, -439430400, -212029200, 41468400, 54774000, 231724800, 246236400, 259545600, 275274000, 309740400, 325468800, 341802000, 357523200 }
     typeOffsets:intvector { 732, 0, 0, 0, 0, 3600, 561, 0, 3600, 0, 3600, 3600 }
     typeMap:bin { "03010201020102010201020102010201040504050401040102010204050401020104" }
   } //Z#8
-  /* Africa/Asmara */ :table {
-    transPre32:intvector { -1, 1770436364 }
-    trans:intvector { -1062210920 }
-    typeOffsets:intvector { 9332, 0, 9320, 0, 10800, 0 }
-    typeMap:bin { "0102" }
-    links:intvector { 9, 10 }
-  } //Z#9
-  /* Africa/Asmera */ :int { 9 } //Z#10
+  /* Africa/Asmara */ :int { 48 } //Z#9
+  /* Africa/Asmera */ :int { 48 } //Z#10
   /* Africa/Bamako */ :int { 5 } //Z#11
   /* Africa/Bangui */ :int { 36 } //Z#12
   /* Africa/Banjul */ :int { 5 } //Z#13
@@ -93,16 +81,8 @@ zoneinfo64:table(nofallback) {
   } //Z#20
   /* Africa/Conakry */ :int { 5 } //Z#21
   /* Africa/Dakar */ :int { 5 } //Z#22
-  /* Africa/Dar_es_Salaam */ :table {
-    trans:intvector { -1230777428, -694321200, -284006700 }
-    typeOffsets:intvector { 9428, 0, 9900, 0, 10800, 0 }
-    typeMap:bin { "020102" }
-  } //Z#23
-  /* Africa/Djibouti */ :table {
-    trans:intvector { -1846291956 }
-    typeOffsets:intvector { 10356, 0, 10800, 0 }
-    typeMap:bin { "01" }
-  } //Z#24
+  /* Africa/Dar_es_Salaam */ :int { 48 } //Z#23
+  /* Africa/Djibouti */ :int { 48 } //Z#24
   /* Africa/Douala */ :int { 36 } //Z#25
   /* Africa/El_Aaiun */ :table {
     trans:intvector { -1136070432, 198291600, 199756800, 207702000, 231292800, 244249200, 265507200, 271033200, 1212278400, 1220223600, 1243814400, 1250809200, 1272758400, 1281222000, 1301788800, 1312066800, 1335664800, 1342749600, 1345428000, 1348970400, 1367114400, 1373162400, 1376100000, 1382839200, 1396144800, 1403920800, 1406944800, 1414288800, 1427594400, 1434160800, 1437184800, 1445738400, 1459044000, 1465005600, 1468029600, 1477792800, 1490493600, 1495245600, 1498874400, 1509242400, 1521943200, 1526090400, 1529114400, 1540692000, 1553997600, 1556935200, 1559959200, 1572141600, 1585447200, 1587175200, 1590804000, 1603591200, 1616896800, 1618020000, 1621044000, 1635645600, 1648346400, 1648864800, 1651888800, 1667095200, 1682128800, 1698544800, 1712973600, 1729994400, 1743818400, 1761444000, 1774749600, 1792893600, 1806199200, 1824948000, 1837648800, 1856397600, 1869098400, 1887847200, 1901152800, 1919296800, 1932602400, 1950746400, 1964052000, 1982800800, 1995501600, 2014250400, 2026951200, 2045700000, 2058400800, 2077063200, 2090455200, 2107908000, 2121904800, 2138752800 }
@@ -124,11 +104,7 @@ zoneinfo64:table(nofallback) {
     links:intvector { 30, 44, 45 }
   } //Z#30
   /* Africa/Juba */ :int { 33 } //Z#31
-  /* Africa/Kampala */ :table {
-    trans:intvector { -1309745380, -1262314800, -694319400, -410237100 }
-    typeOffsets:intvector { 7780, 0, 9000, 0, 9900, 0, 10800, 0 }
-    typeMap:bin { "03010203" }
-  } //Z#32
+  /* Africa/Kampala */ :int { 48 } //Z#32
   /* Africa/Khartoum */ :table {
     trans:intvector { -1230775808, 10360800, 24786000, 41810400, 56322000, 73432800, 87944400, 104882400, 119480400, 136332000, 151016400, 167781600, 182552400, 199231200, 214174800, 230680800, 245710800, 262735200, 277246800, 294184800, 308782800, 325634400, 340405200, 357084000, 371941200, 388533600, 403477200, 419983200, 435013200, 452037600, 466635600, 483487200, 498171600, 947930400 }
     typeOffsets:intvector { 7808, 0, 7200, 0, 7200, 3600, 10800, 0 }
@@ -157,12 +133,7 @@ zoneinfo64:table(nofallback) {
   } //Z#43
   /* Africa/Maseru */ :int { 30 } //Z#44
   /* Africa/Mbabane */ :int { 30 } //Z#45
-  /* Africa/Mogadishu */ :table {
-    transPre32:intvector { -1, 1891394808 }
-    trans:intvector { -1230778800, -410236200 }
-    typeOffsets:intvector { 10888, 0, 9000, 0, 10800, 0 }
-    typeMap:bin { "020102" }
-  } //Z#46
+  /* Africa/Mogadishu */ :int { 48 } //Z#46
   /* Africa/Monrovia */ :table {
     trans:intvector { -1604359012, 73529070 }
     typeOffsets:intvector { -2588, 0, -2670, 0, 0, 0 }
@@ -172,6 +143,7 @@ zoneinfo64:table(nofallback) {
     trans:intvector { -1309746436, -1262314800, -946780200, -315629100 }
     typeOffsets:intvector { 8836, 0, 9000, 0, 9900, 0, 10800, 0 }
     typeMap:bin { "03010203" }
+    links:intvector { 7, 9, 10, 23, 24, 32, 46, 48, 388, 503, 507, 512 }
   } //Z#48
   /* Africa/Ndjamena */ :table {
     trans:intvector { -1830387612, 308703600, 321314400 }
@@ -213,7 +185,7 @@ zoneinfo64:table(nofallback) {
     finalRule { "US" }
     finalRaw:int { -36000 }
     finalYear:int { 2008 }
-    links:intvector { 59, 80, 603 }
+    links:intvector { 59, 80, 604 }
   } //Z#59
   /* America/Anchorage */ :table {
     transPre32:intvector { -1, 1069604872, -1, 2106016072 }
@@ -223,7 +195,7 @@ zoneinfo64:table(nofallback) {
     finalRule { "US" }
     finalRaw:int { -32400 }
     finalYear:int { 2008 }
-    links:intvector { 4, 60, 602 }
+    links:intvector { 4, 60, 603 }
   } //Z#60
   /* America/Anguilla */ :int { 185 } //Z#61
   /* America/Antigua */ :table {
@@ -435,7 +407,7 @@ zoneinfo64:table(nofallback) {
     finalRule { "US" }
     finalRaw:int { -21600 }
     finalYear:int { 2008 }
-    links:intvector { 98, 373, 605 }
+    links:intvector { 98, 373, 606 }
   } //Z#98
   /* America/Chihuahua */ :table {
     trans:intvector { -1514739600, -1343066400, -1234807200, -1220292000, -1207159200, -1191344400, 828864000, 846399600, 860313600, 877849200, 891766800, 909302400, 923216400, 941356800, 954666000, 972806400, 989139600, 1001836800, 1018170000, 1035705600 }
@@ -501,7 +473,7 @@ zoneinfo64:table(nofallback) {
     finalRule { "US" }
     finalRaw:int { -25200 }
     finalYear:int { 2008 }
-    links:intvector { 109, 202, 532, 611 }
+    links:intvector { 109, 202, 532, 612 }
   } //Z#109
   /* America/Detroit */ :table {
     trans:intvector { -2051202469, -1724083200, -880218000, -765396000, -684349200, -671047200, -80499600, -68666400, 104914800, 120636000, 126687600, 152085600, 167814000, 183535200, 199263600, 215589600, 230713200, 247039200, 262767600, 278488800, 294217200, 309938400, 325666800, 341388000, 357116400, 372837600, 388566000, 404892000, 420015600, 436341600, 452070000, 467791200, 483519600, 499240800, 514969200, 530690400, 544604400, 562140000, 576054000, 594194400, 607503600, 625644000, 638953200, 657093600, 671007600, 688543200, 702457200, 719992800, 733906800, 752047200, 765356400, 783496800, 796806000, 814946400, 828860400, 846396000, 860310000, 877845600, 891759600, 909295200, 923209200, 941349600, 954658800, 972799200, 986108400, 1004248800, 1018162800, 1035698400, 1049612400, 1067148000, 1081062000, 1099202400, 1112511600, 1130652000, 1143961200, 1162101600, 1173596400, 1194156000 }
@@ -510,7 +482,7 @@ zoneinfo64:table(nofallback) {
     finalRule { "US" }
     finalRaw:int { -18000 }
     finalYear:int { 2008 }
-    links:intvector { 110, 610 }
+    links:intvector { 110, 611 }
   } //Z#110
   /* America/Dominica */ :int { 185 } //Z#111
   /* America/Edmonton */ :table {
@@ -566,9 +538,9 @@ zoneinfo64:table(nofallback) {
   } //Z#120
   /* America/Grand_Turk */ :table {
     transPre32:intvector { -1, 1770462768 }
-    trans:intvector { -1827687169, 294217200, 309938400, 325666800, 341388000, 357116400, 372837600, 388566000, 404892000, 420015600, 436341600, 452070000, 467791200, 483519600, 499240800, 514969200, 530690400, 544604400, 562140000, 576054000, 594194400, 607503600, 625644000, 638953200, 657093600, 671007600, 688543200, 702457200, 719992800, 733906800, 752047200, 765356400, 783496800, 796806000, 814946400, 828860400, 846396000, 860310000, 877845600, 891759600, 909295200, 923209200, 941349600, 954658800, 972799200, 986108400, 1004248800, 1018162800, 1035698400, 1049612400, 1067148000, 1081062000, 1099202400, 1112511600, 1130652000, 1143961200, 1162101600, 1173596400, 1194156000, 1205046000, 1225605600, 1236495600, 1257055200, 1268550000, 1289109600, 1299999600, 1320559200, 1331449200, 1352008800, 1362898800, 1383458400, 1394348400, 1414908000 }
+    trans:intvector { -1827687169, 294217200, 309938400, 325666800, 341388000, 357116400, 372837600, 388566000, 404892000, 420015600, 436341600, 452070000, 467791200, 483519600, 499240800, 514969200, 530690400, 544604400, 562140000, 576054000, 594194400, 607503600, 625644000, 638953200, 657093600, 671007600, 688543200, 702457200, 719992800, 733906800, 752047200, 765356400, 783496800, 796806000, 814946400, 828860400, 846396000, 860310000, 877845600, 891759600, 909295200, 923209200, 941349600, 954658800, 972799200, 986108400, 1004248800, 1018162800, 1035698400, 1049612400, 1067148000, 1081062000, 1099202400, 1112511600, 1130652000, 1143961200, 1162101600, 1173596400, 1194156000, 1205046000, 1225605600, 1236495600, 1257055200, 1268550000, 1289109600, 1299999600, 1320559200, 1331449200, 1352008800, 1362898800, 1383458400, 1394348400, 1414908000, 1425798000, 1446357600 }
     typeOffsets:intvector { -17072, 0, -18431, 0, -18000, 0, -18000, 3600, -14400, 0 }
-    typeMap:bin { "0102030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020304" }
+    typeMap:bin { "01020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020304" }
   } //Z#121
   /* America/Grenada */ :int { 185 } //Z#122
   /* America/Guadeloupe */ :int { 185 } //Z#123
@@ -620,7 +592,7 @@ zoneinfo64:table(nofallback) {
     finalRule { "US" }
     finalRaw:int { -18000 }
     finalYear:int { 2008 }
-    links:intvector { 116, 130, 138, 500, 606 }
+    links:intvector { 116, 130, 138, 500, 607 }
   } //Z#130
   /* America/Indiana/Knox */ :table {
     transPre32:intvector { -1, 1577320096 }
@@ -630,7 +602,7 @@ zoneinfo64:table(nofallback) {
     finalRule { "US" }
     finalRaw:int { -21600 }
     finalYear:int { 2008 }
-    links:intvector { 131, 146, 609 }
+    links:intvector { 131, 146, 610 }
   } //Z#131
   /* America/Indiana/Marengo */ :table {
     transPre32:intvector { -1, 1577320096 }
@@ -759,7 +731,7 @@ zoneinfo64:table(nofallback) {
     finalRule { "US" }
     finalRaw:int { -28800 }
     finalYear:int { 2008 }
-    links:intvector { 150, 537, 612, 613 }
+    links:intvector { 150, 537, 613, 614 }
   } //Z#150
   /* America/Louisville */ :int { 144 } //Z#151
   /* America/Lower_Princes */ :int { 105 } //Z#152
@@ -895,7 +867,7 @@ zoneinfo64:table(nofallback) {
     finalRule { "US" }
     finalRaw:int { -18000 }
     finalYear:int { 2008 }
-    links:intvector { 172, 607 }
+    links:intvector { 172, 608 }
   } //Z#172
   /* America/Nipigon */ :table {
     transPre32:intvector { -1, 1928233280 }
@@ -980,7 +952,7 @@ zoneinfo64:table(nofallback) {
     trans:intvector { -1633273200, -1615132800, -1601823600, -1583683200, -880210800, -820519140, -812653140, -796845540, -84380400, -68659200 }
     typeOffsets:intvector { -26898, 0, -25200, 0, -25200, 3600 }
     typeMap:bin { "0102010201020102010201" }
-    links:intvector { 183, 534, 604 }
+    links:intvector { 183, 534, 605 }
   } //Z#183
   /* America/Port-au-Prince */ :table {
     transPre32:intvector { -1, 1770463056 }
@@ -1341,6 +1313,7 @@ zoneinfo64:table(nofallback) {
     trans:intvector { -1570084924 }
     typeOffsets:intvector { 24124, 0, 25200, 0 }
     typeMap:bin { "01" }
+    links:intvector { 247, 297, 324 }
   } //Z#247
   /* Asia/Beirut */ :table {
     transPre32:intvector { -1, 1454817976 }
@@ -1431,10 +1404,10 @@ zoneinfo64:table(nofallback) {
     finalYear:int { 2014 }
   } //Z#265
   /* Asia/Ho_Chi_Minh */ :table {
-    trans:intvector { -2005974400, -1855983920, -1819954800, -1220428800 }
-    typeOffsets:intvector { 25600, 0, 25200, 0, 25580, 0, 28800, 0 }
-    typeMap:bin { "02010301" }
-    links:intvector { 266, 304, 617 }
+    trans:intvector { -2004073600, -1851577590, -852105600, -782643600, -767869200, -718095600, -457776000, -315648000, 171820800 }
+    typeOffsets:intvector { 25600, 0, 25200, 0, 25590, 0, 28800, 0, 32400, 0 }
+    typeMap:bin { "020103040103010301" }
+    links:intvector { 266, 304, 618 }
   } //Z#266
   /* Asia/Hong_Kong */ :table {
     trans:intvector { -2056693002, -907389000, -891667800, -884246400, -766746000, -747981000, -728544600, -717049800, -694503000, -683785800, -668064600, -654755400, -636615000, -623305800, -605165400, -591856200, -573715800, -559801800, -542352600, -528352200, -510211800, -498112200, -478762200, -466662600, -446707800, -435213000, -415258200, -403158600, -383808600, -371709000, -352359000, -340259400, -320909400, -308809800, -288855000, -277360200, -257405400, -245910600, -225955800, -213856200, -194506200, -182406600, -163056600, -148537800, -132816600, -117088200, -101367000, -85638600, -69312600, -53584200, -37863000, -22134600, -6413400, 9315000, 25036200, 40764600, 56485800, 72214200, 88540200, 104268600, 119989800, 126041400, 151439400, 167167800, 182889000, 198617400, 214338600, 295385400, 309292200 }
@@ -1589,21 +1562,16 @@ zoneinfo64:table(nofallback) {
     typeOffsets:intvector { 12324, 0, 14400, 0, 14400, 3600, 18000, 0, 18000, 3600, 21600, 0 }
     typeMap:bin { "01030405040304030403040304030403040302010201020102010201020102010201020102010201020102010201020103" }
   } //Z#296
-  /* Asia/Phnom_Penh */ :table {
-    trans:intvector { -2005973980, -1855983920, -1819954800, -1220428800 }
-    typeOffsets:intvector { 25180, 0, 25200, 0, 25580, 0, 28800, 0 }
-    typeMap:bin { "02010301" }
-  } //Z#297
+  /* Asia/Phnom_Penh */ :int { 247 } //Z#297
   /* Asia/Pontianak */ :table {
     trans:intvector { -1172906240, -881220600, -766054800, -683883000, -620812800, -189415800, 567964800 }
     typeOffsets:intvector { 26240, 0, 25200, 0, 27000, 0, 28800, 0, 32400, 0 }
     typeMap:bin { "02040203020301" }
   } //Z#298
   /* Asia/Pyongyang */ :table {
-    transPre32:intvector { -1, 1770415516 }
-    trans:intvector { -2053931400, -1325494800, -1199262600, -498128400, -264931200 }
-    typeOffsets:intvector { 30180, 0, 28800, 0, 30600, 0, 32400, 0 }
-    typeMap:bin { "020302030103" }
+    trans:intvector { -1948782180, -1830414600 }
+    typeOffsets:intvector { 30180, 0, 30600, 0, 32400, 0 }
+    typeMap:bin { "0102" }
   } //Z#299
   /* Asia/Qatar */ :table {
     trans:intvector { -1577935568, 76190400 }
@@ -1637,11 +1605,10 @@ zoneinfo64:table(nofallback) {
     typeMap:bin { "010203040302030203020302030203020302030203020302" }
   } //Z#306
   /* Asia/Seoul */ :table {
-    transPre32:intvector { -1, 1770415224 }
-    trans:intvector { -2053931400, -1325494800, -1199262600, -498128400, -303984000, -293533200, -264931200, -39515400, 547570800, 560872800, 579020400, 592322400 }
-    typeOffsets:intvector { 30472, 0, 28800, 0, 28800, 3600, 30600, 0, 32400, 0, 32400, 3600 }
-    typeMap:bin { "03040304010201030405040504" }
-    links:intvector { 307, 584 }
+    trans:intvector { -1948782472, -1830414600, -498128400, -462702600, -451733400, -429784200, -418296600, -399544200, -387451800, -368094600, -356002200, -336645000, -324552600, -305195400, -293103000, -264933000, 547578000, 560883600, 579027600, 592333200 }
+    typeOffsets:intvector { 30472, 0, 30600, 0, 30600, 3600, 32400, 0, 32400, 3600 }
+    typeMap:bin { "0103010201020102010201020102010304030403" }
+    links:intvector { 307, 585 }
   } //Z#307
   /* Asia/Shanghai */ :table {
     transPre32:intvector { -1, 2117485353 }
@@ -1654,7 +1621,7 @@ zoneinfo64:table(nofallback) {
     trans:intvector { -2038200925, -1167634800, -1073028000, -894180000, -879665400, -767005200, 378664200 }
     typeOffsets:intvector { 24925, 0, 25200, 0, 25200, 1200, 26400, 0, 27000, 0, 28800, 0, 32400, 0 }
     typeMap:bin { "01020304060405" }
-    links:intvector { 309, 586 }
+    links:intvector { 309, 587 }
   } //Z#309
   /* Asia/Srednekolymsk */ :table {
     trans:intvector { -1441188892, -1247565600, 354891600, 370699200, 386427600, 402235200, 417963600, 433771200, 449586000, 465318000, 481042800, 496767600, 512492400, 528217200, 543942000, 559666800, 575391600, 591116400, 606841200, 622566000, 638290800, 654620400, 670345200, 686073600, 695750400, 701784000, 717505200, 733244400, 748969200, 764694000, 780418800, 796143600, 811868400, 828198000, 846342000, 859647600, 877791600, 891097200, 909241200, 922546800, 941295600, 953996400, 972745200, 985446000, 1004194800, 1017500400, 1035644400, 1048950000, 1067094000, 1080399600, 1099148400, 1111849200, 1130598000, 1143298800, 1162047600, 1174748400, 1193497200, 1206802800, 1224946800, 1238252400, 1256396400, 1269702000, 1288450800, 1301151600, 1414245600 }
@@ -1666,7 +1633,7 @@ zoneinfo64:table(nofallback) {
     trans:intvector { -1017820800, -766224000, -745833600, -733827600, -716889600, -699613200, -683884800, -670669200, -652348800, -639133200, -620812800, -607597200, -589276800, -576061200, -562924800, -541760400, -528710400, -510224400, -497174400, -478688400, -465638400, -449830800, -434016000, -418208400, -402480000, -386672400, -370944000, -355136400, -339408000, -323600400, -302515200, -291978000, -270979200, -260442000, 133977600, 149785200, 165513600, 181321200, 299606400, 307551600 }
     typeOffsets:intvector { 29160, 0, 28800, 0, 28800, 3600, 32400, 0 }
     typeMap:bin { "0103010201020102010201020102010201020102010201020102010201020102010201020102010201" }
-    links:intvector { 311, 583 }
+    links:intvector { 311, 584 }
   } //Z#311
   /* Asia/Tashkent */ :table {
     trans:intvector { -1441168631, -1247547600, 354909600, 370717200, 386445600, 402253200, 417981600, 433789200, 449604000, 465336000, 481060800, 496785600, 512510400, 528235200, 543960000, 559684800, 575409600, 591134400, 606859200, 622584000, 638308800, 654638400, 670363200, 686091600 }
@@ -1718,11 +1685,7 @@ zoneinfo64:table(nofallback) {
     typeOffsets:intvector { 34374, 0, 28800, 0, 32400, 0, 36000, 0, 36000, 3600, 39600, 0, 39600, 3600, 43200, 0 }
     typeMap:bin { "010206050605060506050605060506050605060506050403050605060506050605060506050605060506050605060506050605060506050605060506050605070503" }
   } //Z#323
-  /* Asia/Vientiane */ :table {
-    trans:intvector { -2005973424, -1855983920, -1819954800, -1220428800 }
-    typeOffsets:intvector { 24624, 0, 25200, 0, 25580, 0, 28800, 0 }
-    typeMap:bin { "02010301" }
-  } //Z#324
+  /* Asia/Vientiane */ :int { 247 } //Z#324
   /* Asia/Vladivostok */ :table {
     trans:intvector { -1487321251, -1247562000, 354895200, 370702800, 386431200, 402238800, 417967200, 433774800, 449589600, 465321600, 481046400, 496771200, 512496000, 528220800, 543945600, 559670400, 575395200, 591120000, 606844800, 622569600, 638294400, 654624000, 670348800, 686077200, 695754000, 701787600, 717508800, 733248000, 748972800, 764697600, 780422400, 796147200, 811872000, 828201600, 846345600, 859651200, 877795200, 891100800, 909244800, 922550400, 941299200, 954000000, 972748800, 985449600, 1004198400, 1017504000, 1035648000, 1048953600, 1067097600, 1080403200, 1099152000, 1111852800, 1130601600, 1143302400, 1162051200, 1174752000, 1193500800, 1206806400, 1224950400, 1238256000, 1256400000, 1269705600, 1288454400, 1301155200, 1414249200 }
     typeOffsets:intvector { 31651, 0, 32400, 0, 32400, 3600, 36000, 0, 36000, 3600, 39600, 0 }
@@ -1960,9 +1923,9 @@ zoneinfo64:table(nofallback) {
   /* Canada/Saskatchewan */ :int { 192 } //Z#383
   /* Canada/Yukon */ :int { 219 } //Z#384
   /* Chile/Continental */ :int { 198 } //Z#385
-  /* Chile/EasterIsland */ :int { 543 } //Z#386
+  /* Chile/EasterIsland */ :int { 544 } //Z#386
   /* Cuba */ :int { 128 } //Z#387
-  /* EAT */ :int { 7 } //Z#388
+  /* EAT */ :int { 48 } //Z#388
   /* ECT */ :int { 465 } //Z#389
   /* EET */ :table {
     trans:intvector { 228877200, 243997200, 260326800, 276051600, 291776400, 307501200, 323830800, 338950800, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
@@ -2073,11 +2036,11 @@ zoneinfo64:table(nofallback) {
   /* Etc/Greenwich */ :int { 395 } //Z#425
   /* Etc/UCT */ :table {
     typeOffsets:intvector { 0, 0 }
-    links:intvector { 426, 601 }
+    links:intvector { 426, 602 }
   } //Z#426
   /* Etc/UTC */ :table {
     typeOffsets:intvector { 0, 0 }
-    links:intvector { 427, 428, 430, 615, 616, 620 }
+    links:intvector { 427, 428, 430, 616, 617, 621 }
   } //Z#427
   /* Etc/Universal */ :int { 427 } //Z#428
   /* Etc/Unknown */ :table {
@@ -2214,7 +2177,7 @@ zoneinfo64:table(nofallback) {
     finalRule { "EU" }
     finalRaw:int { 7200 }
     finalYear:int { 2016 }
-    links:intvector { 270, 449, 600 }
+    links:intvector { 270, 449, 601 }
   } //Z#449
   /* Europe/Jersey */ :int { 455 } //Z#450
   /* Europe/Kaliningrad */ :table {
@@ -2238,7 +2201,7 @@ zoneinfo64:table(nofallback) {
     finalRule { "EU" }
     finalRaw:int { 0 }
     finalYear:int { 1997 }
-    links:intvector { 453, 582 }
+    links:intvector { 453, 583 }
   } //Z#453
   /* Europe/Ljubljana */ :int { 435 } //Z#454
   /* Europe/London */ :table {
@@ -2297,7 +2260,7 @@ zoneinfo64:table(nofallback) {
     trans:intvector { -1688265017, -1656819079, -1641353479, -1627965079, -1618716679, -1596429079, -1593829879, -1589860800, -1542427200, -1539493200, -1525323600, -1522728000, -1491188400, -1247536800, 354920400, 370728000, 386456400, 402264000, 417992400, 433800000, 449614800, 465346800, 481071600, 496796400, 512521200, 528246000, 543970800, 559695600, 575420400, 591145200, 606870000, 622594800, 638319600, 654649200, 670374000, 686102400, 695779200, 701812800, 717534000, 733273200, 748998000, 764722800, 780447600, 796172400, 811897200, 828226800, 846370800, 859676400, 877820400, 891126000, 909270000, 922575600, 941324400, 954025200, 972774000, 985474800, 1004223600, 1017529200, 1035673200, 1048978800, 1067122800, 1080428400, 1099177200, 1111878000, 1130626800, 1143327600, 1162076400, 1174777200, 1193526000, 1206831600, 1224975600, 1238281200, 1256425200, 1269730800, 1288479600, 1301180400, 1414274400 }
     typeOffsets:intvector { 9017, 0, 7200, 0, 7200, 3600, 9079, 0, 9079, 3600, 9079, 7200, 10800, 0, 10800, 3600, 10800, 7200, 14400, 0 }
     typeMap:bin { "0304030504050706070807060106070607060706070607060706070607060706070602010607060706070607060706070607060706070607060706070607060706070607060706070607060906" }
-    links:intvector { 462, 618 }
+    links:intvector { 462, 619 }
   } //Z#462
   /* Europe/Nicosia */ :int { 292 } //Z#463
   /* Europe/Oslo */ :table {
@@ -2438,7 +2401,7 @@ zoneinfo64:table(nofallback) {
     finalRule { "EU" }
     finalRaw:int { 3600 }
     finalYear:int { 1997 }
-    links:intvector { 486, 581 }
+    links:intvector { 486, 582 }
   } //Z#486
   /* Europe/Zagreb */ :int { 435 } //Z#487
   /* Europe/Zaporozhye */ :table {
@@ -2477,11 +2440,7 @@ zoneinfo64:table(nofallback) {
   /* IET */ :int { 130 } //Z#500
   /* IST */ :int { 281 } //Z#501
   /* Iceland */ :int { 337 } //Z#502
-  /* Indian/Antananarivo */ :table {
-    trans:intvector { -1846293004, -499924800, -492062400 }
-    typeOffsets:intvector { 11404, 0, 10800, 0, 10800, 3600 }
-    typeMap:bin { "010201" }
-  } //Z#503
+  /* Indian/Antananarivo */ :int { 48 } //Z#503
   /* Indian/Chagos */ :table {
     trans:intvector { -1988167780, 820436400 }
     typeOffsets:intvector { 17380, 0, 18000, 0, 21600, 0 }
@@ -2497,11 +2456,7 @@ zoneinfo64:table(nofallback) {
     typeOffsets:intvector { 23260, 0, 23400, 0 }
     typeMap:bin { "01" }
   } //Z#506
-  /* Indian/Comoro */ :table {
-    trans:intvector { -1846291984 }
-    typeOffsets:intvector { 10384, 0, 10800, 0 }
-    typeMap:bin { "01" }
-  } //Z#507
+  /* Indian/Comoro */ :int { 48 } //Z#507
   /* Indian/Kerguelen */ :table {
     trans:intvector { -631152000 }
     typeOffsets:intvector { 0, 0, 18000, 0 }
@@ -2522,11 +2477,7 @@ zoneinfo64:table(nofallback) {
     typeOffsets:intvector { 13800, 0, 14400, 0, 14400, 3600 }
     typeMap:bin { "0102010201" }
   } //Z#511
-  /* Indian/Mayotte */ :table {
-    trans:intvector { -1846292456 }
-    typeOffsets:intvector { 10856, 0, 10800, 0 }
-    typeMap:bin { "01" }
-  } //Z#512
+  /* Indian/Mayotte */ :int { 48 } //Z#512
   /* Indian/Reunion */ :table {
     trans:intvector { -1848886912 }
     typeOffsets:intvector { 13312, 0, 14400, 0 }
@@ -2537,7 +2488,7 @@ zoneinfo64:table(nofallback) {
   /* JST */ :int { 318 } //Z#516
   /* Jamaica */ :int { 141 } //Z#517
   /* Japan */ :int { 318 } //Z#518
-  /* Kwajalein */ :int { 557 } //Z#519
+  /* Kwajalein */ :int { 558 } //Z#519
   /* Libya */ :int { 56 } //Z#520
   /* MET */ :table {
     trans:intvector { -1693706400, -1680483600, -1663455600, -1650150000, -1632006000, -1618700400, -938905200, -857257200, -844556400, -828226800, -812502000, -796777200, -781052400, -766623600, 228877200, 243997200, 260326800, 276051600, 291776400, 307501200, 323830800, 338950800, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
@@ -2565,7 +2516,7 @@ zoneinfo64:table(nofallback) {
   /* NET */ :int { 328 } //Z#528
   /* NST */ :int { 540 } //Z#529
   /* NZ */ :int { 540 } //Z#530
-  /* NZ-CHAT */ :int { 541 } //Z#531
+  /* NZ-CHAT */ :int { 542 } //Z#531
   /* Navajo */ :int { 109 } //Z#532
   /* PLT */ :int { 276 } //Z#533
   /* PNT */ :int { 183 } //Z#534
@@ -2600,6 +2551,12 @@ zoneinfo64:table(nofallback) {
     finalYear:int { 2009 }
     links:intvector { 228, 231, 529, 530, 540 }
   } //Z#540
+  /* Pacific/Bougainville */ :table {
+    transPre32:intvector { -1, 1454789160, -1, 1928176784 }
+    trans:intvector { -868010400, -768906000, 1419696000 }
+    typeOffsets:intvector { 37336, 0, 32400, 0, 35312, 0, 36000, 0, 39600, 0 }
+    typeMap:bin { "0203010304" }
+  } //Z#541
   /* Pacific/Chatham */ :table {
     transPre32:intvector { -1, 1102529668 }
     trans:intvector { -757426500, 152632800, 162309600, 183477600, 194968800, 215532000, 226418400, 246981600, 257868000, 278431200, 289317600, 309880800, 320767200, 341330400, 352216800, 372780000, 384271200, 404834400, 415720800, 436284000, 447170400, 467733600, 478620000, 499183200, 510069600, 530632800, 541519200, 562082400, 573573600, 594136800, 605023200, 623772000, 637682400, 655221600, 669132000, 686671200, 700581600, 718120800, 732636000, 749570400, 764085600, 781020000, 795535200, 812469600, 826984800, 844524000, 858434400, 875973600, 889884000, 907423200, 921938400, 938872800, 953388000, 970322400, 984837600, 1002376800, 1016287200, 1033826400, 1047736800, 1065276000, 1079791200, 1096725600, 1111240800, 1128175200, 1142690400, 1159624800, 1174140000, 1191074400, 1207404000, 1222524000 }
@@ -2608,14 +2565,14 @@ zoneinfo64:table(nofallback) {
     finalRule { "Chatham" }
     finalRaw:int { 45900 }
     finalYear:int { 2009 }
-    links:intvector { 531, 541 }
-  } //Z#541
+    links:intvector { 531, 542 }
+  } //Z#542
   /* Pacific/Chuuk */ :table {
     transPre32:intvector { -1, 2117478068 }
     typeOffsets:intvector { 36428, 0, 36000, 0 }
     typeMap:bin { "01" }
-    links:intvector { 542, 577, 580 }
-  } //Z#542
+    links:intvector { 543, 578, 581 }
+  } //Z#543
   /* Pacific/Easter */ :table {
     transPre32:intvector { -1, 1770471960 }
     trans:intvector { -1178124152, -870552000, -865278000, -736376400, -36619200, -23922000, -3355200, 7527600, 24465600, 37767600, 55915200, 69217200, 87969600, 100666800, 118209600, 132116400, 150868800, 163566000, 182318400, 195620400, 213768000, 227070000, 245217600, 258519600, 277272000, 289969200, 308721600, 321418800, 340171200, 353473200, 371620800, 384922800, 403070400, 416372400, 434520000, 447822000, 466574400, 479271600, 498024000, 510721200, 529473600, 545194800, 560923200, 574225200, 591768000, 605674800, 624427200, 637729200, 653457600, 668574000, 687326400, 700628400, 718776000, 732078000, 750225600, 763527600, 781675200, 794977200, 813729600, 826426800, 845179200, 859690800, 876628800, 889930800, 906868800, 923194800, 939528000, 952830000, 971582400, 984279600, 1003032000, 1015729200, 1034481600, 1047178800, 1065931200, 1079233200, 1097380800, 1110682800, 1128830400, 1142132400, 1160884800, 1173582000, 1192334400, 1206846000, 1223784000, 1237086000, 1255233600, 1270350000, 1286683200, 1304823600, 1313899200, 1335668400, 1346558400 }
@@ -2624,205 +2581,205 @@ zoneinfo64:table(nofallback) {
     finalRule { "Chile" }
     finalRaw:int { -21600 }
     finalYear:int { 2013 }
-    links:intvector { 386, 543 }
-  } //Z#543
+    links:intvector { 386, 544 }
+  } //Z#544
   /* Pacific/Efate */ :table {
     trans:intvector { -1829387596, 433256400, 448977600, 467298000, 480427200, 496760400, 511876800, 528210000, 543931200, 559659600, 575380800, 591109200, 606830400, 622558800, 638280000, 654008400, 669729600, 686062800, 696340800, 719931600, 727790400 }
     typeOffsets:intvector { 40396, 0, 39600, 0, 39600, 3600 }
     typeMap:bin { "010201020102010201020102010201020102010201" }
-  } //Z#544
+  } //Z#545
   /* Pacific/Enderbury */ :table {
     transPre32:intvector { -1, 2117555556 }
     trans:intvector { 307627200, 788958000 }
     typeOffsets:intvector { -41060, 0, -43200, 0, -39600, 0, 46800, 0 }
     typeMap:bin { "010203" }
-  } //Z#545
+  } //Z#546
   /* Pacific/Fakaofo */ :table {
     transPre32:intvector { -1, 2117555592 }
     trans:intvector { 1325242800 }
     typeOffsets:intvector { -41096, 0, -39600, 0, 46800, 0 }
     typeMap:bin { "0102" }
-  } //Z#546
+  } //Z#547
   /* Pacific/Fiji */ :table {
-    trans:intvector { -1709985344, 909842400, 920124000, 941896800, 951573600, 1259416800, 1269698400, 1287842400, 1299333600, 1319292000, 1327154400, 1350741600, 1358604000, 1382796000, 1390050000, 1414245600 }
+    trans:intvector { -1709985344, 909842400, 920124000, 941896800, 951573600, 1259416800, 1269698400, 1287842400, 1299333600, 1319292000, 1327154400, 1350741600, 1358604000, 1382796000, 1390050000, 1414850400, 1421503200, 1446300000 }
     typeOffsets:intvector { 42944, 0, 43200, 0, 43200, 3600 }
-    typeMap:bin { "01020102010201020102010201020102" }
+    typeMap:bin { "010201020102010201020102010201020102" }
     finalRule { "Fiji" }
     finalRaw:int { 43200 }
-    finalYear:int { 2015 }
-  } //Z#547
+    finalYear:int { 2016 }
+  } //Z#548
   /* Pacific/Funafuti */ :table {
     transPre32:intvector { -1, 2117471484 }
     typeOffsets:intvector { 43012, 0, 43200, 0 }
     typeMap:bin { "01" }
-  } //Z#548
+  } //Z#549
   /* Pacific/Galapagos */ :table {
     trans:intvector { -1230746496, 504939600 }
     typeOffsets:intvector { -21504, 0, -21600, 0, -18000, 0 }
     typeMap:bin { "0201" }
-  } //Z#549
+  } //Z#550
   /* Pacific/Gambier */ :table {
     trans:intvector { -1806678012 }
     typeOffsets:intvector { -32388, 0, -32400, 0 }
     typeMap:bin { "01" }
-  } //Z#550
+  } //Z#551
   /* Pacific/Guadalcanal */ :table {
     trans:intvector { -1806748788 }
     typeOffsets:intvector { 38388, 0, 39600, 0 }
     typeMap:bin { "01" }
-    links:intvector { 551, 585 }
-  } //Z#551
+    links:intvector { 552, 586 }
+  } //Z#552
   /* Pacific/Guam */ :table {
     transPre32:intvector { -1, 350340556, -1, 2117479756 }
     typeOffsets:intvector { -51660, 0, 34740, 0, 36000, 0 }
     typeMap:bin { "0102" }
-  } //Z#552
+  } //Z#553
   /* Pacific/Honolulu */ :table {
     transPre32:intvector { -1, 1960865982 }
     trans:intvector { -1157283000, -1155436200, -880198200, -765376200, -712150200 }
     typeOffsets:intvector { -37886, 0, -37800, 0, -37800, 3600, -36000, 0 }
     typeMap:bin { "010201020103" }
-    links:intvector { 553, 554, 608 }
-  } //Z#553
-  /* Pacific/Johnston */ :int { 553 } //Z#554
+    links:intvector { 554, 555, 609 }
+  } //Z#554
+  /* Pacific/Johnston */ :int { 554 } //Z#555
   /* Pacific/Kiritimati */ :table {
     transPre32:intvector { -1, 2117552256 }
     trans:intvector { 307622400, 788954400 }
     typeOffsets:intvector { -37760, 0, -38400, 0, -36000, 0, 50400, 0 }
     typeMap:bin { "010203" }
-  } //Z#555
+  } //Z#556
   /* Pacific/Kosrae */ :table {
     transPre32:intvector { -1, 2117475380 }
     trans:intvector { -7988400, 915105600 }
     typeOffsets:intvector { 39116, 0, 39600, 0, 43200, 0 }
     typeMap:bin { "010201" }
-  } //Z#556
+  } //Z#557
   /* Pacific/Kwajalein */ :table {
     transPre32:intvector { -1, 2117474336 }
     trans:intvector { -7988400, 745848000 }
     typeOffsets:intvector { 40160, 0, -43200, 0, 39600, 0, 43200, 0 }
     typeMap:bin { "020103" }
-    links:intvector { 519, 557 }
-  } //Z#557
+    links:intvector { 519, 558 }
+  } //Z#558
   /* Pacific/Majuro */ :table {
     transPre32:intvector { -1, 2117473408 }
     trans:intvector { -7988400 }
     typeOffsets:intvector { 41088, 0, 39600, 0, 43200, 0 }
     typeMap:bin { "0102" }
-  } //Z#558
+  } //Z#559
   /* Pacific/Marquesas */ :table {
     trans:intvector { -1806676920 }
     typeOffsets:intvector { -33480, 0, -34200, 0 }
     typeMap:bin { "01" }
-  } //Z#559
+  } //Z#560
   /* Pacific/Midway */ :table {
     transPre32:intvector { -1, 2117557064 }
     trans:intvector { -428504400, -420645600 }
     typeOffsets:intvector { -42568, 0, -39600, 0, -39600, 3600 }
     typeMap:bin { "010201" }
-  } //Z#560
+  } //Z#561
   /* Pacific/Nauru */ :table {
     trans:intvector { -1545131260, -877347000, -800960400, 294323400 }
     typeOffsets:intvector { 40060, 0, 32400, 0, 41400, 0, 43200, 0 }
     typeMap:bin { "02010203" }
-  } //Z#561
+  } //Z#562
   /* Pacific/Niue */ :table {
     transPre32:intvector { -1, 2117555276 }
     trans:intvector { -599575200, 276089400 }
     typeOffsets:intvector { -40780, 0, -41400, 0, -40800, 0, -39600, 0 }
     typeMap:bin { "020103" }
-  } //Z#562
+  } //Z#563
   /* Pacific/Norfolk */ :table {
     transPre32:intvector { -1, 2117474184 }
     trans:intvector { -599656320 }
     typeOffsets:intvector { 40312, 0, 40320, 0, 41400, 0 }
     typeMap:bin { "0102" }
-  } //Z#563
+  } //Z#564
   /* Pacific/Noumea */ :table {
     trans:intvector { -1829387148, 250002000, 257342400, 281451600, 288878400, 849366000, 857228400 }
     typeOffsets:intvector { 39948, 0, 39600, 0, 39600, 3600 }
     typeMap:bin { "01020102010201" }
-  } //Z#564
+  } //Z#565
   /* Pacific/Pago_Pago */ :table {
     transPre32:intvector { -1, 1439229064 }
     trans:intvector { -1861879032 }
     typeOffsets:intvector { 45432, 0, -40968, 0, -39600, 0 }
     typeMap:bin { "0102" }
-    links:intvector { 565, 573, 614 }
-  } //Z#565
+    links:intvector { 566, 574, 615 }
+  } //Z#566
   /* Pacific/Palau */ :table {
     transPre32:intvector { -1, 2117482220 }
     typeOffsets:intvector { 32276, 0, 32400, 0 }
     typeMap:bin { "01" }
-  } //Z#566
+  } //Z#567
   /* Pacific/Pitcairn */ :table {
     transPre32:intvector { -1, 2117545716 }
     trans:intvector { 893665800 }
     typeOffsets:intvector { -31220, 0, -30600, 0, -28800, 0 }
     typeMap:bin { "0102" }
-  } //Z#567
+  } //Z#568
   /* Pacific/Pohnpei */ :table {
     transPre32:intvector { -1, 2117476524 }
     typeOffsets:intvector { 37972, 0, 39600, 0 }
     typeMap:bin { "01" }
-    links:intvector { 568, 569 }
-  } //Z#568
-  /* Pacific/Ponape */ :int { 568 } //Z#569
+    links:intvector { 569, 570 }
+  } //Z#569
+  /* Pacific/Ponape */ :int { 569 } //Z#570
   /* Pacific/Port_Moresby */ :table {
     transPre32:intvector { -1, 1454791176, -1, 1928176784 }
     typeOffsets:intvector { 35320, 0, 35312, 0, 36000, 0 }
     typeMap:bin { "0102" }
-  } //Z#570
+  } //Z#571
   /* Pacific/Rarotonga */ :table {
     transPre32:intvector { -1, 2117552840 }
     trans:intvector { 279714600, 289387800, 309952800, 320837400, 341402400, 352287000, 372852000, 384341400, 404906400, 415791000, 436356000, 447240600, 467805600, 478690200, 499255200, 510139800, 530704800, 541589400, 562154400, 573643800, 594208800, 605093400, 625658400, 636543000, 657108000, 667992600 }
     typeOffsets:intvector { -38344, 0, -37800, 0, -36000, 0, -36000, 1800 }
     typeMap:bin { "010302030203020302030203020302030203020302030203020302" }
-  } //Z#571
+  } //Z#572
   /* Pacific/Saipan */ :table {
     transPre32:intvector { -1, 350340316, -1, 2117479516 }
     trans:intvector { -7981200 }
     typeOffsets:intvector { -51420, 0, 32400, 0, 34980, 0, 36000, 0 }
     typeMap:bin { "020103" }
-  } //Z#572
-  /* Pacific/Samoa */ :int { 565 } //Z#573
+  } //Z#573
+  /* Pacific/Samoa */ :int { 566 } //Z#574
   /* Pacific/Tahiti */ :table {
     trans:intvector { -1806674504 }
     typeOffsets:intvector { -35896, 0, -36000, 0 }
     typeMap:bin { "01" }
-  } //Z#574
+  } //Z#575
   /* Pacific/Tarawa */ :table {
     transPre32:intvector { -1, 2117472972 }
     typeOffsets:intvector { 41524, 0, 43200, 0 }
     typeMap:bin { "01" }
-  } //Z#575
+  } //Z#576
   /* Pacific/Tongatapu */ :table {
     transPre32:intvector { -1, 2117470136 }
     trans:intvector { -915193200, 939214800, 953384400, 973342800, 980596800, 1004792400, 1012046400 }
     typeOffsets:intvector { 44360, 0, 44400, 0, 46800, 0, 46800, 3600 }
     typeMap:bin { "0102030203020302" }
-  } //Z#576
-  /* Pacific/Truk */ :int { 542 } //Z#577
+  } //Z#577
+  /* Pacific/Truk */ :int { 543 } //Z#578
   /* Pacific/Wake */ :table {
     transPre32:intvector { -1, 2117474508 }
     typeOffsets:intvector { 39988, 0, 43200, 0 }
     typeMap:bin { "01" }
-  } //Z#578
+  } //Z#579
   /* Pacific/Wallis */ :table {
     transPre32:intvector { -1, 2117470376 }
     typeOffsets:intvector { 44120, 0, 43200, 0 }
     typeMap:bin { "01" }
-  } //Z#579
-  /* Pacific/Yap */ :int { 542 } //Z#580
-  /* Poland */ :int { 486 } //Z#581
-  /* Portugal */ :int { 453 } //Z#582
-  /* ROC */ :int { 311 } //Z#583
-  /* ROK */ :int { 307 } //Z#584
-  /* SST */ :int { 551 } //Z#585
-  /* Singapore */ :int { 309 } //Z#586
+  } //Z#580
+  /* Pacific/Yap */ :int { 543 } //Z#581
+  /* Poland */ :int { 486 } //Z#582
+  /* Portugal */ :int { 453 } //Z#583
+  /* ROC */ :int { 311 } //Z#584
+  /* ROK */ :int { 307 } //Z#585
+  /* SST */ :int { 552 } //Z#586
+  /* Singapore */ :int { 309 } //Z#587
   /* SystemV/AST4 */ :table {
     typeOffsets:intvector { -14400, 0 }
-  } //Z#587
+  } //Z#588
   /* SystemV/AST4ADT */ :table {
     transPre32:intvector { -1, 2096195296, -1, 2111916496, -1, 2127644896, -1, 2143366096 }
     trans:intvector { -2135872800, -2120151600, -2104423200, -2088702000, -2072973600, -2056647600, -2040919200, -2025198000, -2009469600, -1993748400, -1978020000, -1962298800, -1946570400, -1930849200, -1915120800, -1898794800, -1883671200, -1867345200, -1851616800, -1835895600, -1820167200, -1804446000, -1788717600, -1772996400, -1757268000, -1741546800, -1725818400, -1709492400, -1693764000, -1678042800, -1662314400, -1646593200, -1630864800, -1615143600, -1599415200, -1583694000, -1567965600, -1551639600, -1536516000, -1520190000, -1504461600, -1488740400, -1473012000, -1457290800, -1441562400, -1425841200, -1410112800, -1394391600, -1378663200, -1362337200, -1347213600, -1330887600, -1315159200, -1299438000, -1283709600, -1267988400, -1252260000, -1236538800, -1220810400, -1205089200, -1189360800, -1173034800, -1157306400, -1141585200, -1125856800, -1110135600, -1094407200, -1078686000, -1062957600, -1047236400, -1031508000, -1015182000, -1000058400, -983732400, -968004000, -952282800, -936554400, -920833200, -905104800, -889383600, -873655200, -857934000, -842205600, -825879600, -810151200, -794430000, -778701600, -762980400, -747252000, -731530800, -715802400, -700081200, -684352800, -668026800, -652903200, -636577200, -620848800, -605127600, -589399200, -573678000, -557949600, -542228400, -526500000, -510778800, -495050400, -478724400, -463600800, -447274800, -431546400, -415825200, -400096800, -384375600, -368647200, -352926000, -337197600, -321476400, -305748000, -289422000, -273693600, -257972400, -242244000, -226522800, -210794400, -195073200, -179344800, -163623600, -147895200, -131569200, -116445600, -100119600, -84391200, -68670000, -52941600, -37220400, -21492000, -5770800, 9957600, 25678800, 41407200, 57733200, 73461600, 89182800, 104911200, 120632400, 126684000, 154501200, 162367200, 183531600, 199260000, 215586000 }
@@ -2831,10 +2788,10 @@ zoneinfo64:table(nofallback) {
     finalRule { "SystemV" }
     finalRaw:int { -14400 }
     finalYear:int { 1977 }
-  } //Z#588
+  } //Z#589
   /* SystemV/CST6 */ :table {
     typeOffsets:intvector { -21600, 0 }
-  } //Z#589
+  } //Z#590
   /* SystemV/CST6CDT */ :table {
     transPre32:intvector { -1, 2096202496, -1, 2111923696, -1, 2127652096, -1, 2143373296 }
     trans:intvector { -2135865600, -2120144400, -2104416000, -2088694800, -2072966400, -2056640400, -2040912000, -2025190800, -2009462400, -1993741200, -1978012800, -1962291600, -1946563200, -1930842000, -1915113600, -1898787600, -1883664000, -1867338000, -1851609600, -1835888400, -1820160000, -1804438800, -1788710400, -1772989200, -1757260800, -1741539600, -1725811200, -1709485200, -1693756800, -1678035600, -1662307200, -1646586000, -1630857600, -1615136400, -1599408000, -1583686800, -1567958400, -1551632400, -1536508800, -1520182800, -1504454400, -1488733200, -1473004800, -1457283600, -1441555200, -1425834000, -1410105600, -1394384400, -1378656000, -1362330000, -1347206400, -1330880400, -1315152000, -1299430800, -1283702400, -1267981200, -1252252800, -1236531600, -1220803200, -1205082000, -1189353600, -1173027600, -1157299200, -1141578000, -1125849600, -1110128400, -1094400000, -1078678800, -1062950400, -1047229200, -1031500800, -1015174800, -1000051200, -983725200, -967996800, -952275600, -936547200, -920826000, -905097600, -889376400, -873648000, -857926800, -842198400, -825872400, -810144000, -794422800, -778694400, -762973200, -747244800, -731523600, -715795200, -700074000, -684345600, -668019600, -652896000, -636570000, -620841600, -605120400, -589392000, -573670800, -557942400, -542221200, -526492800, -510771600, -495043200, -478717200, -463593600, -447267600, -431539200, -415818000, -400089600, -384368400, -368640000, -352918800, -337190400, -321469200, -305740800, -289414800, -273686400, -257965200, -242236800, -226515600, -210787200, -195066000, -179337600, -163616400, -147888000, -131562000, -116438400, -100112400, -84384000, -68662800, -52934400, -37213200, -21484800, -5763600, 9964800, 25686000, 41414400, 57740400, 73468800, 89190000, 104918400, 120639600, 126691200, 154508400, 162374400, 183538800, 199267200, 215593200 }
@@ -2843,10 +2800,10 @@ zoneinfo64:table(nofallback) {
     finalRule { "SystemV" }
     finalRaw:int { -21600 }
     finalYear:int { 1977 }
-  } //Z#590
+  } //Z#591
   /* SystemV/EST5 */ :table {
     typeOffsets:intvector { -18000, 0 }
-  } //Z#591
+  } //Z#592
   /* SystemV/EST5EDT */ :table {
     transPre32:intvector { -1, 2096198896, -1, 2111920096, -1, 2127648496, -1, 2143369696 }
     trans:intvector { -2135869200, -2120148000, -2104419600, -2088698400, -2072970000, -2056644000, -2040915600, -2025194400, -2009466000, -1993744800, -1978016400, -1962295200, -1946566800, -1930845600, -1915117200, -1898791200, -1883667600, -1867341600, -1851613200, -1835892000, -1820163600, -1804442400, -1788714000, -1772992800, -1757264400, -1741543200, -1725814800, -1709488800, -1693760400, -1678039200, -1662310800, -1646589600, -1630861200, -1615140000, -1599411600, -1583690400, -1567962000, -1551636000, -1536512400, -1520186400, -1504458000, -1488736800, -1473008400, -1457287200, -1441558800, -1425837600, -1410109200, -1394388000, -1378659600, -1362333600, -1347210000, -1330884000, -1315155600, -1299434400, -1283706000, -1267984800, -1252256400, -1236535200, -1220806800, -1205085600, -1189357200, -1173031200, -1157302800, -1141581600, -1125853200, -1110132000, -1094403600, -1078682400, -1062954000, -1047232800, -1031504400, -1015178400, -1000054800, -983728800, -968000400, -952279200, -936550800, -920829600, -905101200, -889380000, -873651600, -857930400, -842202000, -825876000, -810147600, -794426400, -778698000, -762976800, -747248400, -731527200, -715798800, -700077600, -684349200, -668023200, -652899600, -636573600, -620845200, -605124000, -589395600, -573674400, -557946000, -542224800, -526496400, -510775200, -495046800, -478720800, -463597200, -447271200, -431542800, -415821600, -400093200, -384372000, -368643600, -352922400, -337194000, -321472800, -305744400, -289418400, -273690000, -257968800, -242240400, -226519200, -210790800, -195069600, -179341200, -163620000, -147891600, -131565600, -116442000, -100116000, -84387600, -68666400, -52938000, -37216800, -21488400, -5767200, 9961200, 25682400, 41410800, 57736800, 73465200, 89186400, 104914800, 120636000, 126687600, 154504800, 162370800, 183535200, 199263600, 215589600 }
@@ -2855,13 +2812,13 @@ zoneinfo64:table(nofallback) {
     finalRule { "SystemV" }
     finalRaw:int { -18000 }
     finalYear:int { 1977 }
-  } //Z#592
+  } //Z#593
   /* SystemV/HST10 */ :table {
     typeOffsets:intvector { -36000, 0 }
-  } //Z#593
+  } //Z#594
   /* SystemV/MST7 */ :table {
     typeOffsets:intvector { -25200, 0 }
-  } //Z#594
+  } //Z#595
   /* SystemV/MST7MDT */ :table {
     transPre32:intvector { -1, 2096206096, -1, 2111927296, -1, 2127655696, -1, 2143376896 }
     trans:intvector { -2135862000, -2120140800, -2104412400, -2088691200, -2072962800, -2056636800, -2040908400, -2025187200, -2009458800, -1993737600, -1978009200, -1962288000, -1946559600, -1930838400, -1915110000, -1898784000, -1883660400, -1867334400, -1851606000, -1835884800, -1820156400, -1804435200, -1788706800, -1772985600, -1757257200, -1741536000, -1725807600, -1709481600, -1693753200, -1678032000, -1662303600, -1646582400, -1630854000, -1615132800, -1599404400, -1583683200, -1567954800, -1551628800, -1536505200, -1520179200, -1504450800, -1488729600, -1473001200, -1457280000, -1441551600, -1425830400, -1410102000, -1394380800, -1378652400, -1362326400, -1347202800, -1330876800, -1315148400, -1299427200, -1283698800, -1267977600, -1252249200, -1236528000, -1220799600, -1205078400, -1189350000, -1173024000, -1157295600, -1141574400, -1125846000, -1110124800, -1094396400, -1078675200, -1062946800, -1047225600, -1031497200, -1015171200, -1000047600, -983721600, -967993200, -952272000, -936543600, -920822400, -905094000, -889372800, -873644400, -857923200, -842194800, -825868800, -810140400, -794419200, -778690800, -762969600, -747241200, -731520000, -715791600, -700070400, -684342000, -668016000, -652892400, -636566400, -620838000, -605116800, -589388400, -573667200, -557938800, -542217600, -526489200, -510768000, -495039600, -478713600, -463590000, -447264000, -431535600, -415814400, -400086000, -384364800, -368636400, -352915200, -337186800, -321465600, -305737200, -289411200, -273682800, -257961600, -242233200, -226512000, -210783600, -195062400, -179334000, -163612800, -147884400, -131558400, -116434800, -100108800, -84380400, -68659200, -52930800, -37209600, -21481200, -5760000, 9968400, 25689600, 41418000, 57744000, 73472400, 89193600, 104922000, 120643200, 126694800, 154512000, 162378000, 183542400, 199270800, 215596800 }
@@ -2870,10 +2827,10 @@ zoneinfo64:table(nofallback) {
     finalRule { "SystemV" }
     finalRaw:int { -25200 }
     finalYear:int { 1977 }
-  } //Z#595
+  } //Z#596
   /* SystemV/PST8 */ :table {
     typeOffsets:intvector { -28800, 0 }
-  } //Z#596
+  } //Z#597
   /* SystemV/PST8PDT */ :table {
     transPre32:intvector { -1, 2096209696, -1, 2111930896, -1, 2127659296, -1, 2143380496 }
     trans:intvector { -2135858400, -2120137200, -2104408800, -2088687600, -2072959200, -2056633200, -2040904800, -2025183600, -2009455200, -1993734000, -1978005600, -1962284400, -1946556000, -1930834800, -1915106400, -1898780400, -1883656800, -1867330800, -1851602400, -1835881200, -1820152800, -1804431600, -1788703200, -1772982000, -1757253600, -1741532400, -1725804000, -1709478000, -1693749600, -1678028400, -1662300000, -1646578800, -1630850400, -1615129200, -1599400800, -1583679600, -1567951200, -1551625200, -1536501600, -1520175600, -1504447200, -1488726000, -1472997600, -1457276400, -1441548000, -1425826800, -1410098400, -1394377200, -1378648800, -1362322800, -1347199200, -1330873200, -1315144800, -1299423600, -1283695200, -1267974000, -1252245600, -1236524400, -1220796000, -1205074800, -1189346400, -1173020400, -1157292000, -1141570800, -1125842400, -1110121200, -1094392800, -1078671600, -1062943200, -1047222000, -1031493600, -1015167600, -1000044000, -983718000, -967989600, -952268400, -936540000, -920818800, -905090400, -889369200, -873640800, -857919600, -842191200, -825865200, -810136800, -794415600, -778687200, -762966000, -747237600, -731516400, -715788000, -700066800, -684338400, -668012400, -652888800, -636562800, -620834400, -605113200, -589384800, -573663600, -557935200, -542214000, -526485600, -510764400, -495036000, -478710000, -463586400, -447260400, -431532000, -415810800, -400082400, -384361200, -368632800, -352911600, -337183200, -321462000, -305733600, -289407600, -273679200, -257958000, -242229600, -226508400, -210780000, -195058800, -179330400, -163609200, -147880800, -131554800, -116431200, -100105200, -84376800, -68655600, -52927200, -37206000, -21477600, -5756400, 9972000, 25693200, 41421600, 57747600, 73476000, 89197200, 104925600, 120646800, 126698400, 154515600, 162381600, 183546000, 199274400, 215600400 }
@@ -2882,10 +2839,10 @@ zoneinfo64:table(nofallback) {
     finalRule { "SystemV" }
     finalRaw:int { -28800 }
     finalYear:int { 1977 }
-  } //Z#597
+  } //Z#598
   /* SystemV/YST9 */ :table {
     typeOffsets:intvector { -32400, 0 }
-  } //Z#598
+  } //Z#599
   /* SystemV/YST9YDT */ :table {
     transPre32:intvector { -1, 2096213296, -1, 2111934496, -1, 2127662896, -1, 2143384096 }
     trans:intvector { -2135854800, -2120133600, -2104405200, -2088684000, -2072955600, -2056629600, -2040901200, -2025180000, -2009451600, -1993730400, -1978002000, -1962280800, -1946552400, -1930831200, -1915102800, -1898776800, -1883653200, -1867327200, -1851598800, -1835877600, -1820149200, -1804428000, -1788699600, -1772978400, -1757250000, -1741528800, -1725800400, -1709474400, -1693746000, -1678024800, -1662296400, -1646575200, -1630846800, -1615125600, -1599397200, -1583676000, -1567947600, -1551621600, -1536498000, -1520172000, -1504443600, -1488722400, -1472994000, -1457272800, -1441544400, -1425823200, -1410094800, -1394373600, -1378645200, -1362319200, -1347195600, -1330869600, -1315141200, -1299420000, -1283691600, -1267970400, -1252242000, -1236520800, -1220792400, -1205071200, -1189342800, -1173016800, -1157288400, -1141567200, -1125838800, -1110117600, -1094389200, -1078668000, -1062939600, -1047218400, -1031490000, -1015164000, -1000040400, -983714400, -967986000, -952264800, -936536400, -920815200, -905086800, -889365600, -873637200, -857916000, -842187600, -825861600, -810133200, -794412000, -778683600, -762962400, -747234000, -731512800, -715784400, -700063200, -684334800, -668008800, -652885200, -636559200, -620830800, -605109600, -589381200, -573660000, -557931600, -542210400, -526482000, -510760800, -495032400, -478706400, -463582800, -447256800, -431528400, -415807200, -400078800, -384357600, -368629200, -352908000, -337179600, -321458400, -305730000, -289404000, -273675600, -257954400, -242226000, -226504800, -210776400, -195055200, -179326800, -163605600, -147877200, -131551200, -116427600, -100101600, -84373200, -68652000, -52923600, -37202400, -21474000, -5752800, 9975600, 25696800, 41425200, 57751200, 73479600, 89200800, 104929200, 120650400, 126702000, 154519200, 162385200, 183549600, 199278000, 215604000 }
@@ -2894,26 +2851,26 @@ zoneinfo64:table(nofallback) {
     finalRule { "SystemV" }
     finalRaw:int { -32400 }
     finalYear:int { 1977 }
-  } //Z#599
-  /* Turkey */ :int { 449 } //Z#600
-  /* UCT */ :int { 426 } //Z#601
-  /* US/Alaska */ :int { 60 } //Z#602
-  /* US/Aleutian */ :int { 59 } //Z#603
-  /* US/Arizona */ :int { 183 } //Z#604
-  /* US/Central */ :int { 98 } //Z#605
-  /* US/East-Indiana */ :int { 130 } //Z#606
-  /* US/Eastern */ :int { 172 } //Z#607
-  /* US/Hawaii */ :int { 553 } //Z#608
-  /* US/Indiana-Starke */ :int { 131 } //Z#609
-  /* US/Michigan */ :int { 110 } //Z#610
-  /* US/Mountain */ :int { 109 } //Z#611
-  /* US/Pacific */ :int { 150 } //Z#612
-  /* US/Pacific-New */ :int { 150 } //Z#613
-  /* US/Samoa */ :int { 565 } //Z#614
-  /* UTC */ :int { 427 } //Z#615
-  /* Universal */ :int { 427 } //Z#616
-  /* VST */ :int { 266 } //Z#617
-  /* W-SU */ :int { 462 } //Z#618
+  } //Z#600
+  /* Turkey */ :int { 449 } //Z#601
+  /* UCT */ :int { 426 } //Z#602
+  /* US/Alaska */ :int { 60 } //Z#603
+  /* US/Aleutian */ :int { 59 } //Z#604
+  /* US/Arizona */ :int { 183 } //Z#605
+  /* US/Central */ :int { 98 } //Z#606
+  /* US/East-Indiana */ :int { 130 } //Z#607
+  /* US/Eastern */ :int { 172 } //Z#608
+  /* US/Hawaii */ :int { 554 } //Z#609
+  /* US/Indiana-Starke */ :int { 131 } //Z#610
+  /* US/Michigan */ :int { 110 } //Z#611
+  /* US/Mountain */ :int { 109 } //Z#612
+  /* US/Pacific */ :int { 150 } //Z#613
+  /* US/Pacific-New */ :int { 150 } //Z#614
+  /* US/Samoa */ :int { 566 } //Z#615
+  /* UTC */ :int { 427 } //Z#616
+  /* Universal */ :int { 427 } //Z#617
+  /* VST */ :int { 266 } //Z#618
+  /* W-SU */ :int { 462 } //Z#619
   /* WET */ :table {
     trans:intvector { 228877200, 243997200, 260326800, 276051600, 291776400, 307501200, 323830800, 338950800, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
     typeOffsets:intvector { 0, 0, 0, 3600 }
@@ -2921,8 +2878,8 @@ zoneinfo64:table(nofallback) {
     finalRule { "EU" }
     finalRaw:int { 0 }
     finalYear:int { 1997 }
-  } //Z#619
-  /* Zulu */ :int { 427 } //Z#620
+  } //Z#620
+  /* Zulu */ :int { 427 } //Z#621
  }
  Names {
     "ACT","AET","AGT","ART","AST","Africa/Abidjan","Africa/Accra" // 6
@@ -3083,28 +3040,29 @@ zoneinfo64:table(nofallback) {
     ,"Libya","MET","MIT","MST","MST7MDT","Mexico/BajaNorte" // 525
     ,"Mexico/BajaSur","Mexico/General","NET","NST","NZ" // 530
     ,"NZ-CHAT","Navajo","PLT","PNT","PRC","PRT","PST","PST8PDT" // 538
-    ,"Pacific/Apia","Pacific/Auckland","Pacific/Chatham" // 541
-    ,"Pacific/Chuuk","Pacific/Easter","Pacific/Efate","Pacific/Enderbury" // 545
-    ,"Pacific/Fakaofo","Pacific/Fiji","Pacific/Funafuti" // 548
-    ,"Pacific/Galapagos","Pacific/Gambier","Pacific/Guadalcanal" // 551
-    ,"Pacific/Guam","Pacific/Honolulu","Pacific/Johnston" // 554
-    ,"Pacific/Kiritimati","Pacific/Kosrae","Pacific/Kwajalein" // 557
-    ,"Pacific/Majuro","Pacific/Marquesas","Pacific/Midway" // 560
-    ,"Pacific/Nauru","Pacific/Niue","Pacific/Norfolk","Pacific/Noumea" // 564
-    ,"Pacific/Pago_Pago","Pacific/Palau","Pacific/Pitcairn" // 567
-    ,"Pacific/Pohnpei","Pacific/Ponape","Pacific/Port_Moresby" // 570
-    ,"Pacific/Rarotonga","Pacific/Saipan","Pacific/Samoa" // 573
-    ,"Pacific/Tahiti","Pacific/Tarawa","Pacific/Tongatapu" // 576
-    ,"Pacific/Truk","Pacific/Wake","Pacific/Wallis","Pacific/Yap" // 580
-    ,"Poland","Portugal","ROC","ROK","SST","Singapore" // 586
-    ,"SystemV/AST4","SystemV/AST4ADT","SystemV/CST6","SystemV/CST6CDT" // 590
-    ,"SystemV/EST5","SystemV/EST5EDT","SystemV/HST10","SystemV/MST7" // 594
-    ,"SystemV/MST7MDT","SystemV/PST8","SystemV/PST8PDT" // 597
-    ,"SystemV/YST9","SystemV/YST9YDT","Turkey","UCT","US/Alaska" // 602
-    ,"US/Aleutian","US/Arizona","US/Central","US/East-Indiana" // 606
-    ,"US/Eastern","US/Hawaii","US/Indiana-Starke","US/Michigan" // 610
-    ,"US/Mountain","US/Pacific","US/Pacific-New","US/Samoa" // 614
-    ,"UTC","Universal","VST","W-SU","WET","Zulu" // 620
+    ,"Pacific/Apia","Pacific/Auckland","Pacific/Bougainville" // 541
+    ,"Pacific/Chatham","Pacific/Chuuk","Pacific/Easter" // 544
+    ,"Pacific/Efate","Pacific/Enderbury","Pacific/Fakaofo" // 547
+    ,"Pacific/Fiji","Pacific/Funafuti","Pacific/Galapagos" // 550
+    ,"Pacific/Gambier","Pacific/Guadalcanal","Pacific/Guam" // 553
+    ,"Pacific/Honolulu","Pacific/Johnston","Pacific/Kiritimati" // 556
+    ,"Pacific/Kosrae","Pacific/Kwajalein","Pacific/Majuro" // 559
+    ,"Pacific/Marquesas","Pacific/Midway","Pacific/Nauru" // 562
+    ,"Pacific/Niue","Pacific/Norfolk","Pacific/Noumea" // 565
+    ,"Pacific/Pago_Pago","Pacific/Palau","Pacific/Pitcairn" // 568
+    ,"Pacific/Pohnpei","Pacific/Ponape","Pacific/Port_Moresby" // 571
+    ,"Pacific/Rarotonga","Pacific/Saipan","Pacific/Samoa" // 574
+    ,"Pacific/Tahiti","Pacific/Tarawa","Pacific/Tongatapu" // 577
+    ,"Pacific/Truk","Pacific/Wake","Pacific/Wallis","Pacific/Yap" // 581
+    ,"Poland","Portugal","ROC","ROK","SST","Singapore" // 587
+    ,"SystemV/AST4","SystemV/AST4ADT","SystemV/CST6","SystemV/CST6CDT" // 591
+    ,"SystemV/EST5","SystemV/EST5EDT","SystemV/HST10","SystemV/MST7" // 595
+    ,"SystemV/MST7MDT","SystemV/PST8","SystemV/PST8PDT" // 598
+    ,"SystemV/YST9","SystemV/YST9YDT","Turkey","UCT","US/Alaska" // 603
+    ,"US/Aleutian","US/Arizona","US/Central","US/East-Indiana" // 607
+    ,"US/Eastern","US/Hawaii","US/Indiana-Starke","US/Michigan" // 611
+    ,"US/Mountain","US/Pacific","US/Pacific-New","US/Samoa" // 615
+    ,"UTC","Universal","VST","W-SU","WET","Zulu" // 621
  }
  Rules { 
   AN:intvector {
@@ -3153,7 +3111,7 @@ zoneinfo64:table(nofallback) {
     3, -30, -6, 0, 1, 8, -30, -5, 86400, 0, 3600
   } //_#14
   Fiji:intvector {
-    9, 21, -1, 7200, 0, 0, 18, -1, 7200, 0, 3600
+    10, 1, -1, 7200, 0, 0, 18, -1, 10800, 0, 3600
   } //_#15
   Haiti:intvector {
     2, 8, -1, 7200, 0, 10, 1, -1, 7200, 0, 3600
@@ -3599,7 +3557,7 @@ zoneinfo64:table(nofallback) {
   "CL", //Z#385 Chile/Continental
   "CL", //Z#386 Chile/EasterIsland
   "CU", //Z#387 Cuba
-  "ET", //Z#388 EAT
+  "KE", //Z#388 EAT
   "FR", //Z#389 ECT
   "001",//Z#390 EET
   "001",//Z#391 EST
@@ -3752,85 +3710,86 @@ zoneinfo64:table(nofallback) {
   "001",//Z#538 PST8PDT
   "WS", //Z#539 Pacific/Apia
   "NZ", //Z#540 Pacific/Auckland
-  "NZ", //Z#541 Pacific/Chatham
-  "FM", //Z#542 Pacific/Chuuk
-  "CL", //Z#543 Pacific/Easter
-  "VU", //Z#544 Pacific/Efate
-  "KI", //Z#545 Pacific/Enderbury
-  "TK", //Z#546 Pacific/Fakaofo
-  "FJ", //Z#547 Pacific/Fiji
-  "TV", //Z#548 Pacific/Funafuti
-  "EC", //Z#549 Pacific/Galapagos
-  "PF", //Z#550 Pacific/Gambier
-  "SB", //Z#551 Pacific/Guadalcanal
-  "GU", //Z#552 Pacific/Guam
-  "US", //Z#553 Pacific/Honolulu
-  "UM", //Z#554 Pacific/Johnston
-  "KI", //Z#555 Pacific/Kiritimati
-  "FM", //Z#556 Pacific/Kosrae
-  "MH", //Z#557 Pacific/Kwajalein
-  "MH", //Z#558 Pacific/Majuro
-  "PF", //Z#559 Pacific/Marquesas
-  "UM", //Z#560 Pacific/Midway
-  "NR", //Z#561 Pacific/Nauru
-  "NU", //Z#562 Pacific/Niue
-  "NF", //Z#563 Pacific/Norfolk
-  "NC", //Z#564 Pacific/Noumea
-  "AS", //Z#565 Pacific/Pago_Pago
-  "PW", //Z#566 Pacific/Palau
-  "PN", //Z#567 Pacific/Pitcairn
-  "FM", //Z#568 Pacific/Pohnpei
-  "FM", //Z#569 Pacific/Ponape
-  "PG", //Z#570 Pacific/Port_Moresby
-  "CK", //Z#571 Pacific/Rarotonga
-  "MP", //Z#572 Pacific/Saipan
-  "AS", //Z#573 Pacific/Samoa
-  "PF", //Z#574 Pacific/Tahiti
-  "KI", //Z#575 Pacific/Tarawa
-  "TO", //Z#576 Pacific/Tongatapu
-  "FM", //Z#577 Pacific/Truk
-  "UM", //Z#578 Pacific/Wake
-  "WF", //Z#579 Pacific/Wallis
-  "FM", //Z#580 Pacific/Yap
-  "PL", //Z#581 Poland
-  "PT", //Z#582 Portugal
-  "TW", //Z#583 ROC
-  "KR", //Z#584 ROK
-  "SB", //Z#585 SST
-  "SG", //Z#586 Singapore
-  "001",//Z#587 SystemV/AST4
-  "001",//Z#588 SystemV/AST4ADT
-  "001",//Z#589 SystemV/CST6
-  "001",//Z#590 SystemV/CST6CDT
-  "001",//Z#591 SystemV/EST5
-  "001",//Z#592 SystemV/EST5EDT
-  "001",//Z#593 SystemV/HST10
-  "001",//Z#594 SystemV/MST7
-  "001",//Z#595 SystemV/MST7MDT
-  "001",//Z#596 SystemV/PST8
-  "001",//Z#597 SystemV/PST8PDT
-  "001",//Z#598 SystemV/YST9
-  "001",//Z#599 SystemV/YST9YDT
-  "TR", //Z#600 Turkey
-  "001",//Z#601 UCT
-  "US", //Z#602 US/Alaska
-  "US", //Z#603 US/Aleutian
-  "US", //Z#604 US/Arizona
-  "US", //Z#605 US/Central
-  "US", //Z#606 US/East-Indiana
-  "US", //Z#607 US/Eastern
-  "US", //Z#608 US/Hawaii
-  "US", //Z#609 US/Indiana-Starke
-  "US", //Z#610 US/Michigan
-  "US", //Z#611 US/Mountain
-  "US", //Z#612 US/Pacific
-  "US", //Z#613 US/Pacific-New
-  "AS", //Z#614 US/Samoa
-  "001",//Z#615 UTC
-  "001",//Z#616 Universal
-  "VN", //Z#617 VST
-  "RU", //Z#618 W-SU
-  "001",//Z#619 WET
-  "001",//Z#620 Zulu
+  "PG", //Z#541 Pacific/Bougainville
+  "NZ", //Z#542 Pacific/Chatham
+  "FM", //Z#543 Pacific/Chuuk
+  "CL", //Z#544 Pacific/Easter
+  "VU", //Z#545 Pacific/Efate
+  "KI", //Z#546 Pacific/Enderbury
+  "TK", //Z#547 Pacific/Fakaofo
+  "FJ", //Z#548 Pacific/Fiji
+  "TV", //Z#549 Pacific/Funafuti
+  "EC", //Z#550 Pacific/Galapagos
+  "PF", //Z#551 Pacific/Gambier
+  "SB", //Z#552 Pacific/Guadalcanal
+  "GU", //Z#553 Pacific/Guam
+  "US", //Z#554 Pacific/Honolulu
+  "UM", //Z#555 Pacific/Johnston
+  "KI", //Z#556 Pacific/Kiritimati
+  "FM", //Z#557 Pacific/Kosrae
+  "MH", //Z#558 Pacific/Kwajalein
+  "MH", //Z#559 Pacific/Majuro
+  "PF", //Z#560 Pacific/Marquesas
+  "UM", //Z#561 Pacific/Midway
+  "NR", //Z#562 Pacific/Nauru
+  "NU", //Z#563 Pacific/Niue
+  "NF", //Z#564 Pacific/Norfolk
+  "NC", //Z#565 Pacific/Noumea
+  "AS", //Z#566 Pacific/Pago_Pago
+  "PW", //Z#567 Pacific/Palau
+  "PN", //Z#568 Pacific/Pitcairn
+  "FM", //Z#569 Pacific/Pohnpei
+  "FM", //Z#570 Pacific/Ponape
+  "PG", //Z#571 Pacific/Port_Moresby
+  "CK", //Z#572 Pacific/Rarotonga
+  "MP", //Z#573 Pacific/Saipan
+  "AS", //Z#574 Pacific/Samoa
+  "PF", //Z#575 Pacific/Tahiti
+  "KI", //Z#576 Pacific/Tarawa
+  "TO", //Z#577 Pacific/Tongatapu
+  "FM", //Z#578 Pacific/Truk
+  "UM", //Z#579 Pacific/Wake
+  "WF", //Z#580 Pacific/Wallis
+  "FM", //Z#581 Pacific/Yap
+  "PL", //Z#582 Poland
+  "PT", //Z#583 Portugal
+  "TW", //Z#584 ROC
+  "KR", //Z#585 ROK
+  "SB", //Z#586 SST
+  "SG", //Z#587 Singapore
+  "001",//Z#588 SystemV/AST4
+  "001",//Z#589 SystemV/AST4ADT
+  "001",//Z#590 SystemV/CST6
+  "001",//Z#591 SystemV/CST6CDT
+  "001",//Z#592 SystemV/EST5
+  "001",//Z#593 SystemV/EST5EDT
+  "001",//Z#594 SystemV/HST10
+  "001",//Z#595 SystemV/MST7
+  "001",//Z#596 SystemV/MST7MDT
+  "001",//Z#597 SystemV/PST8
+  "001",//Z#598 SystemV/PST8PDT
+  "001",//Z#599 SystemV/YST9
+  "001",//Z#600 SystemV/YST9YDT
+  "TR", //Z#601 Turkey
+  "001",//Z#602 UCT
+  "US", //Z#603 US/Alaska
+  "US", //Z#604 US/Aleutian
+  "US", //Z#605 US/Arizona
+  "US", //Z#606 US/Central
+  "US", //Z#607 US/East-Indiana
+  "US", //Z#608 US/Eastern
+  "US", //Z#609 US/Hawaii
+  "US", //Z#610 US/Indiana-Starke
+  "US", //Z#611 US/Michigan
+  "US", //Z#612 US/Mountain
+  "US", //Z#613 US/Pacific
+  "US", //Z#614 US/Pacific-New
+  "AS", //Z#615 US/Samoa
+  "001",//Z#616 UTC
+  "001",//Z#617 Universal
+  "VN", //Z#618 VST
+  "RU", //Z#619 W-SU
+  "001",//Z#620 WET
+  "001",//Z#621 Zulu
  }
 }
diff --git a/source/data/rbnf/zh_Hant_HK.txt b/source/data/rbnf/zh_Hant_HK.txt
index 4e52c7b..e373c03 100755
--- a/source/data/rbnf/zh_Hant_HK.txt
+++ b/source/data/rbnf/zh_Hant_HK.txt
@@ -7,6 +7,7 @@
 // *
 // ***************************************************************************
 zh_Hant_HK{
+    %%Parent{"zh_Hant"}
     RBNFRules{
         SpelloutRules{
             "%spellout-numbering-year:",
diff --git a/source/data/region/af.txt b/source/data/region/af.txt
index 7e44fd8..d4168bd 100644
--- a/source/data/region/af.txt
+++ b/source/data/region/af.txt
@@ -141,7 +141,7 @@ af{
         GU{"Guam"}
         GW{"Guinee-Bissau"}
         GY{"Guyana"}
-        HK{"Hongkong SAS Sjina"}
+        HK{"Hongkong"}
         HM{"Heard- en McDonaldeilande"}
         HN{"Honduras"}
         HR{"Kroasië"}
@@ -195,7 +195,7 @@ af{
         ML{"Mali"}
         MM{"Mianmar (Birma)"}
         MN{"Mongolië"}
-        MO{"Macau SAS Sjina"}
+        MO{"Macau"}
         MP{"Noordelike Mariana-eilande"}
         MQ{"Martinique"}
         MR{"Mauritanië"}
@@ -230,7 +230,7 @@ af{
         PM{"Sint Pierre en Miquelon"}
         PN{"Pitcairneilande"}
         PR{"Puerto Rico"}
-        PS{"Palestynse gebiede"}
+        PS{"Palestina"}
         PT{"Portugal"}
         PW{"Palau"}
         PY{"Paraguay"}
@@ -310,9 +310,6 @@ af{
     }
     CountriesShort{
         GB{"VK"}
-        HK{"Hongkong"}
-        MO{"Macau"}
-        PS{"Palestina"}
         US{"VSA"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/am.txt b/source/data/region/am.txt
index 8417e6f..57508b3 100644
--- a/source/data/region/am.txt
+++ b/source/data/region/am.txt
@@ -141,7 +141,7 @@ am{
         GU{"ጉዋም"}
         GW{"ጊኒ ቢሳኦ"}
         GY{"ጉያና"}
-        HK{"ሆንግ ኮንግ SAR ቻይና"}
+        HK{"ሆንግ ኮንግ"}
         HM{"ኽርድ ደሴቶችና ማክዶናልድ ደሴቶች"}
         HN{"ሆንዱራስ"}
         HR{"ክሮኤሽያ"}
@@ -195,7 +195,7 @@ am{
         ML{"ማሊ"}
         MM{"ማይናማር(በርማ)"}
         MN{"ሞንጎሊያ"}
-        MO{"ማካኡ ልዩ የአስተዳደር ክልል ቻይና"}
+        MO{"ማካኡ"}
         MP{"የሰሜናዊ ማሪያና ደሴቶች"}
         MQ{"ማርቲኒክ"}
         MR{"ሞሪቴኒያ"}
@@ -230,7 +230,7 @@ am{
         PM{"ቅዱስ ፒዬር እና ሚኩኤሎን"}
         PN{"ፒትካኢርን አይስላንድ"}
         PR{"ፖርታ ሪኮ"}
-        PS{"የፍልስጤም ግዛት"}
+        PS{"ፍልስጥኤም"}
         PT{"ፖርቱጋል"}
         PW{"ፓላው"}
         PY{"ፓራጓይ"}
@@ -312,9 +312,6 @@ am{
     }
     CountriesShort{
         GB{"ዩናይትድ ኪንግደም"}
-        HK{"ሆንግ ኮንግ"}
-        MO{"ማካኡ"}
-        PS{"ፍልስጥኤም"}
         US{"ዩ ኤስ"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/ar.txt b/source/data/region/ar.txt
index fb50dcd..77719f5 100644
--- a/source/data/region/ar.txt
+++ b/source/data/region/ar.txt
@@ -141,7 +141,7 @@ ar{
         GU{"غوام"}
         GW{"غينيا بيساو"}
         GY{"غيانا"}
-        HK{"هونغ كونغ الصينية"}
+        HK{"هونغ كونغ"}
         HM{"جزيرة هيرد وجزر ماكدونالد"}
         HN{"هندوراس"}
         HR{"كرواتيا"}
@@ -195,7 +195,7 @@ ar{
         ML{"مالي"}
         MM{"ميانمار -بورما"}
         MN{"منغوليا"}
-        MO{"مكاو الصينية (منطقة إدارية خاصة)"}
+        MO{"مكاو"}
         MP{"جزر ماريانا الشمالية"}
         MQ{"مارتينيك"}
         MR{"موريتانيا"}
@@ -230,7 +230,7 @@ ar{
         PM{"سانت بيير وميكولون"}
         PN{"جزر بيتكيرن"}
         PR{"بورتوريكو"}
-        PS{"الأراضي الفلسطينية"}
+        PS{"فلسطين"}
         PT{"البرتغال"}
         PW{"بالاو"}
         PY{"باراغواي"}
@@ -310,9 +310,6 @@ ar{
     }
     CountriesShort{
         GB{"المملكة المتحدة"}
-        HK{"هونغ كونغ"}
-        MO{"مكاو"}
-        PS{"فلسطين"}
         US{"الولايات المتحدة"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/az.txt b/source/data/region/az.txt
index a96e7cd..a9b55a9 100644
--- a/source/data/region/az.txt
+++ b/source/data/region/az.txt
@@ -141,7 +141,7 @@ az{
         GU{"Quam"}
         GW{"Qvineya-Bisau"}
         GY{"Qviyana"}
-        HK{"Honq Konq Xüsusi İnzibati Ərazi Çin"}
+        HK{"Honq Konq"}
         HM{"Herd və Mak Donald Adaları"}
         HN{"Honduras"}
         HR{"Xorvatiya"}
@@ -195,7 +195,7 @@ az{
         ML{"Mali"}
         MM{"Myanma"}
         MN{"Monqoliya"}
-        MO{"Makao Xüsusi İnzibati Ərazi Çin"}
+        MO{"Makao"}
         MP{"Şimali Mariana Adaları"}
         MQ{"Martinik"}
         MR{"Mavritaniya"}
@@ -230,7 +230,7 @@ az{
         PM{"San Pier və Mikelon"}
         PN{"Pitkern Adaları"}
         PR{"Puerto Riko"}
-        PS{"Fələstin Əraziləri"}
+        PS{"Fələstin"}
         PT{"Portuqal"}
         PW{"Palau"}
         PY{"Paraqvay"}
@@ -311,9 +311,6 @@ az{
     }
     CountriesShort{
         GB{"B.K."}
-        HK{"Honq Konq"}
-        MO{"Makao"}
-        PS{"Fələstin"}
         US{"A.B.Ş."}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/az_Cyrl_AZ.txt b/source/data/region/az_Cyrl_AZ.txt
new file mode 100644
index 0000000..34897f4
--- /dev/null
+++ b/source/data/region/az_Cyrl_AZ.txt
@@ -0,0 +1,12 @@
+﻿// ***************************************************************************
+// *
+// * Copyright (C) 2014 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/az_Cyrl_AZ.xml
+// *
+// ***************************************************************************
+az_Cyrl_AZ{
+    %%Parent{"az_Cyrl"}
+    Version{"2.1.6.69"}
+}
diff --git a/source/data/region/be.txt b/source/data/region/be.txt
index 341e74f..afc115e 100644
--- a/source/data/region/be.txt
+++ b/source/data/region/be.txt
@@ -133,7 +133,7 @@ be{
         GU{"Гуам"}
         GW{"Гвінея-Бісау"}
         GY{"Гаяна"}
-        HK{"Гон-Конг, Кітай (САР)"}
+        HK{"Ганконг"}
         HM{"Востраў Херд і Астравы Макдоналд"}
         HN{"Гандурас"}
         HR{"Харватыя"}
@@ -185,7 +185,7 @@ be{
         ML{"Малі"}
         MM{"М’янма"}
         MN{"Манголія"}
-        MO{"Макао, Кітай (САР)"}
+        MO{"Макаа"}
         MP{"Паўночныя Марыянскія астравы"}
         MQ{"Марцініка"}
         MR{"Маўрытанія"}
@@ -292,9 +292,5 @@ be{
         CG{"Рэспубліка Конга"}
         MK{"Рэспубліка Македонія"}
     }
-    CountriesShort{
-        HK{"Ганконг"}
-        MO{"Макаа"}
-    }
     Version{"2.1.7.39"}
 }
diff --git a/source/data/region/bg.txt b/source/data/region/bg.txt
index 552ae6b..2d016a0 100644
--- a/source/data/region/bg.txt
+++ b/source/data/region/bg.txt
@@ -141,7 +141,7 @@ bg{
         GU{"Гуам"}
         GW{"Гвинея-Бисау"}
         GY{"Гаяна"}
-        HK{"Хонконг, САР на Китай"}
+        HK{"Хонконг"}
         HM{"остров Хърд и острови Макдоналд"}
         HN{"Хондурас"}
         HR{"Хърватия"}
@@ -195,7 +195,7 @@ bg{
         ML{"Мали"}
         MM{"Мианмар (Бирма)"}
         MN{"Монголия"}
-        MO{"Макао, САР на Китай"}
+        MO{"Макао"}
         MP{"Северни Мариански острови"}
         MQ{"Мартиника"}
         MR{"Мавритания"}
@@ -230,7 +230,7 @@ bg{
         PM{"Сен Пиер и Микелон"}
         PN{"Острови Питкерн"}
         PR{"Пуерто Рико"}
-        PS{"Палестински територии"}
+        PS{"Палестина"}
         PT{"Португалия"}
         PW{"Палау"}
         PY{"Парагвай"}
@@ -311,9 +311,6 @@ bg{
     }
     CountriesShort{
         GB{"Великобритания"}
-        HK{"Хонконг"}
-        MO{"Макао"}
-        PS{"Палестина"}
         US{"САЩ"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/bn.txt b/source/data/region/bn.txt
index a47830e..34e9673 100644
--- a/source/data/region/bn.txt
+++ b/source/data/region/bn.txt
@@ -141,7 +141,7 @@ bn{
         GU{"গুয়াম"}
         GW{"গিনি-বিসাউ"}
         GY{"গিয়ানা"}
-        HK{"হংকং এসএআর চীনা"}
+        HK{"হংকং"}
         HM{"হার্ড দ্বীপ এবং ম্যাকডোনাল্ড দ্বীপপুঞ্জ"}
         HN{"হণ্ডুরাস"}
         HR{"ক্রোয়েশিয়া"}
@@ -195,7 +195,7 @@ bn{
         ML{"মালি"}
         MM{"মায়ানমার (বার্মা)"}
         MN{"মঙ্গোলিয়া"}
-        MO{"ম্যাকাও এস এ আর চায়না"}
+        MO{"ম্যাকাও"}
         MP{"উত্তরাঞ্চলীয় মারিয়ানা দ্বীপপুঞ্জ"}
         MQ{"মার্টিনিক"}
         MR{"মরিতানিয়া"}
@@ -230,7 +230,7 @@ bn{
         PM{"সেন্ট পিয়ের ও মিকুয়েলন"}
         PN{"পিটকেয়ার্ন দ্বীপপুঞ্জ"}
         PR{"পুয়ের্তো রিকো"}
-        PS{"ফিলিস্তিন অঞ্চলসমূহ"}
+        PS{"ফিলিস্তিন"}
         PT{"পর্তুগাল"}
         PW{"পালাউ"}
         PY{"প্যারাগুয়ে"}
@@ -311,9 +311,6 @@ bn{
     }
     CountriesShort{
         GB{"ইউ. কে"}
-        HK{"হংকং"}
-        MO{"ম্যাকাও"}
-        PS{"ফিলিস্তিন"}
         US{"ইউ এস"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/br.txt b/source/data/region/br.txt
index 95e4f93..c499d55 100755
--- a/source/data/region/br.txt
+++ b/source/data/region/br.txt
@@ -141,7 +141,7 @@ br{
         GU{"Guam"}
         GW{"Ginea-Bissau"}
         GY{"Guyana"}
-        HK{"Hong Kong RMD Sina"}
+        HK{"Hong Kong"}
         HM{"Inizi Heard ha McDonald"}
         HN{"Honduras"}
         HR{"Kroatia"}
@@ -195,7 +195,7 @@ br{
         ML{"Mali"}
         MM{"Myanmar (Birmania)"}
         MN{"Mongolia"}
-        MO{"Macau RMD Sina"}
+        MO{"Macau"}
         MP{"Inizi Mariana an Norzh"}
         MQ{"Martinik"}
         MR{"Maouritania"}
@@ -230,7 +230,7 @@ br{
         PM{"Sant-Pêr-ha-Mikelon"}
         PN{"Enez Pitcairn"}
         PR{"Puerto Rico"}
-        PS{"Tiriadoù Palestina"}
+        PS{"Palestina"}
         PT{"Portugal"}
         PW{"Palau"}
         PY{"Paraguay"}
@@ -312,9 +312,6 @@ br{
     }
     CountriesShort{
         GB{"R.U."}
-        HK{"Hong Kong"}
-        MO{"Macau"}
-        PS{"Palestina"}
         US{"S.U."}
     }
     Version{"2.1.7.39"}
diff --git a/source/data/region/bs.txt b/source/data/region/bs.txt
index c550878..26a898c 100644
--- a/source/data/region/bs.txt
+++ b/source/data/region/bs.txt
@@ -141,7 +141,7 @@ bs{
         GU{"Guam"}
         GW{"Gvineja-Bisao"}
         GY{"Gvajana"}
-        HK{"Hong Kong (S. A. R. Kina)"}
+        HK{"Hong Kong"}
         HM{"Herd i Mekdonald Ostrva"}
         HN{"Honduras"}
         HR{"Hrvatska"}
@@ -195,7 +195,7 @@ bs{
         ML{"Mali"}
         MM{"Mijanmar"}
         MN{"Mongolija"}
-        MO{"Makao (S. A. R. Kina)"}
+        MO{"Makao"}
         MP{"Sjeverna Marijanska Ostrva"}
         MQ{"Martinik"}
         MR{"Mauritanija"}
@@ -230,7 +230,7 @@ bs{
         PM{"Sen Pjer i Mikelon"}
         PN{"Pitkern"}
         PR{"Porto Riko"}
-        PS{"Palestinska Teritorija"}
+        PS{"Palestina"}
         PT{"Portugal"}
         PW{"Palau"}
         PY{"Paragvaj"}
@@ -312,9 +312,6 @@ bs{
     }
     CountriesShort{
         GB{"UK"}
-        HK{"Hong Kong"}
-        MO{"Makao"}
-        PS{"Palestina"}
         US{"SAD"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/bs_Cyrl.txt b/source/data/region/bs_Cyrl.txt
index 146a63e..467c81f 100755
--- a/source/data/region/bs_Cyrl.txt
+++ b/source/data/region/bs_Cyrl.txt
@@ -140,7 +140,7 @@ bs_Cyrl{
         GU{"Гуам"}
         GW{"Гвинеја-Бисао"}
         GY{"Гвајана"}
-        HK{"Хонг Конг С. А. Р. Кина"}
+        HK{"Хонг Конг"}
         HM{"Херд и Мекдоналд Острва"}
         HN{"Хондурас"}
         HR{"Хрватска"}
@@ -194,7 +194,7 @@ bs_Cyrl{
         ML{"Мали"}
         MM{"Мијанмар (Бурма)"}
         MN{"Монголија"}
-        MO{"Макао С. А. Р. Кина"}
+        MO{"Макао"}
         MP{"Северна Маријанска Острва"}
         MQ{"Мартиник"}
         MR{"Мауританија"}
@@ -303,9 +303,5 @@ bs_Cyrl{
         CG{"Конго (Република)"}
         FK{"Фокландска (Малвинска) острва"}
     }
-    CountriesShort{
-        HK{"Хонг Конг"}
-        MO{"Макао"}
-    }
     Version{"2.1.8.9"}
 }
diff --git a/source/data/region/ca.txt b/source/data/region/ca.txt
index a10aa0a..8858837 100644
--- a/source/data/region/ca.txt
+++ b/source/data/region/ca.txt
@@ -141,7 +141,7 @@ ca{
         GU{"Guam"}
         GW{"Guinea Bissau"}
         GY{"Guyana"}
-        HK{"Hong Kong (RAE Xina)"}
+        HK{"Hong Kong"}
         HM{"Illa Heard i Illes McDonald"}
         HN{"Hondures"}
         HR{"Croàcia"}
@@ -195,7 +195,7 @@ ca{
         ML{"Mali"}
         MM{"Myanmar (Birmània)"}
         MN{"Mongòlia"}
-        MO{"Macau (RAE Xina)"}
+        MO{"Macau"}
         MP{"illes Mariannes del Nord"}
         MQ{"Martinica"}
         MR{"Mauritània"}
@@ -310,9 +310,6 @@ ca{
     }
     CountriesShort{
         GB{"GB"}
-        HK{"Hong Kong"}
-        MO{"Macau"}
-        PS{"Palestina"}
         US{"EUA"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/chr.txt b/source/data/region/chr.txt
index 1433053..15b45bc 100755
--- a/source/data/region/chr.txt
+++ b/source/data/region/chr.txt
@@ -157,7 +157,7 @@ chr{
         ML{"ᎹᎵ"}
         MM{"ᎹᏯᎹᎵ"}
         MN{"ᎹᏂᎪᎵᎠ"}
-        MO{"ᎹᎧᎣ (ᎤᏓᏤᎵᏓ ᏧᏂᎸᏫᏍᏓᏁᏗ ᎢᎬᎾᏕᎾ) ᏣᎢ"}
+        MO{"ᎹᎧᎣ"}
         MP{"ᎾᏍᎩ ᎤᏴᏢ ᏗᏜ ᎹᎵᎠᎾ ᏚᎦᏚᏛ"}
         MQ{"ᎹᏘᏂᎨ"}
         MR{"ᎹᏘᎢᏯ"}
@@ -216,8 +216,5 @@ chr{
     Countries%variant{
         FK{"ᏩᎩ ᎤᎦᏚᏛ (ᎢᏍᎳᏍ ᎹᎸᏫᎾᏍ)"}
     }
-    CountriesShort{
-        MO{"ᎹᎧᎣ"}
-    }
     Version{"2.1.6.69"}
 }
diff --git a/source/data/region/cs.txt b/source/data/region/cs.txt
index c3c55b9..e2d92db 100644
--- a/source/data/region/cs.txt
+++ b/source/data/region/cs.txt
@@ -141,7 +141,7 @@ cs{
         GU{"Guam"}
         GW{"Guinea-Bissau"}
         GY{"Guyana"}
-        HK{"Hongkong – ZAO Číny"}
+        HK{"Hongkong"}
         HM{"Heardův ostrov a McDonaldovy ostrovy"}
         HN{"Honduras"}
         HR{"Chorvatsko"}
@@ -195,7 +195,7 @@ cs{
         ML{"Mali"}
         MM{"Myanmar (Barma)"}
         MN{"Mongolsko"}
-        MO{"Macao – ZAO Číny"}
+        MO{"Macao"}
         MP{"Severní Mariany"}
         MQ{"Martinik"}
         MR{"Mauritánie"}
@@ -230,7 +230,7 @@ cs{
         PM{"Saint-Pierre a Miquelon"}
         PN{"Pitcairnovy ostrovy"}
         PR{"Portoriko"}
-        PS{"Palestinská území"}
+        PS{"Palestina"}
         PT{"Portugalsko"}
         PW{"Palau"}
         PY{"Paraguay"}
@@ -310,9 +310,6 @@ cs{
     }
     CountriesShort{
         GB{"VB"}
-        HK{"Hongkong"}
-        MO{"Macao"}
-        PS{"Palestina"}
         US{"USA"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/cy.txt b/source/data/region/cy.txt
index 1e8eaa0..3d80620 100644
--- a/source/data/region/cy.txt
+++ b/source/data/region/cy.txt
@@ -141,7 +141,7 @@ cy{
         GU{"Guam"}
         GW{"Guiné-Bissau"}
         GY{"Guyana"}
-        HK{"Hong Kong RhGA Tsieina"}
+        HK{"Hong Kong"}
         HM{"Ynys Heard ac Ynysoedd McDonald"}
         HN{"Honduras"}
         HR{"Croatia"}
@@ -195,7 +195,7 @@ cy{
         ML{"Mali"}
         MM{"Myanmar (Burma)"}
         MN{"Mongolia"}
-        MO{"Macau RhGA Tsieina"}
+        MO{"Macau"}
         MP{"Ynysoedd Gogledd Mariana"}
         MQ{"Martinique"}
         MR{"Mauritania"}
@@ -230,7 +230,7 @@ cy{
         PM{"Saint-Pierre-et-Miquelon"}
         PN{"Ynysoedd Pitcairn"}
         PR{"Puerto Rico"}
-        PS{"Tiriogaethau Palesteinaidd"}
+        PS{"Palesteina"}
         PT{"Portiwgal"}
         PW{"Palau"}
         PY{"Paraguay"}
@@ -311,9 +311,6 @@ cy{
     }
     CountriesShort{
         GB{"DU"}
-        HK{"Hong Kong"}
-        MO{"Macau"}
-        PS{"Palesteina"}
         US{"UDA"}
     }
     Version{"2.1.7.80"}
diff --git a/source/data/region/da.txt b/source/data/region/da.txt
index ee37956..20bd9df 100644
--- a/source/data/region/da.txt
+++ b/source/data/region/da.txt
@@ -141,7 +141,7 @@ da{
         GU{"Guam"}
         GW{"Guinea-Bissau"}
         GY{"Guyana"}
-        HK{"Hongkong SAR"}
+        HK{"Hongkong"}
         HM{"Heard Island og McDonald Islands"}
         HN{"Honduras"}
         HR{"Kroatien"}
@@ -195,7 +195,7 @@ da{
         ML{"Mali"}
         MM{"Myanmar (Burma)"}
         MN{"Mongoliet"}
-        MO{"Macao SAR"}
+        MO{"Macao"}
         MP{"Nordmarianerne"}
         MQ{"Martinique"}
         MR{"Mauretanien"}
@@ -230,7 +230,7 @@ da{
         PM{"Saint Pierre og Miquelon"}
         PN{"Pitcairn"}
         PR{"Puerto Rico"}
-        PS{"De palæstinensiske områder"}
+        PS{"Palæstina"}
         PT{"Portugal"}
         PW{"Palau"}
         PY{"Paraguay"}
@@ -311,9 +311,6 @@ da{
     }
     CountriesShort{
         GB{"UK"}
-        HK{"Hongkong"}
-        MO{"Macao"}
-        PS{"Palæstina"}
         US{"USA"}
     }
     Version{"2.1.9.62"}
diff --git a/source/data/region/de.txt b/source/data/region/de.txt
index 9aa773b..0c6eee3 100644
--- a/source/data/region/de.txt
+++ b/source/data/region/de.txt
@@ -141,7 +141,7 @@ de{
         GU{"Guam"}
         GW{"Guinea-Bissau"}
         GY{"Guyana"}
-        HK{"Sonderverwaltungszone Hongkong"}
+        HK{"Hongkong"}
         HM{"Heard- und McDonald-Inseln"}
         HN{"Honduras"}
         HR{"Kroatien"}
@@ -195,7 +195,7 @@ de{
         ML{"Mali"}
         MM{"Myanmar"}
         MN{"Mongolei"}
-        MO{"Sonderverwaltungsregion Macau"}
+        MO{"Macau"}
         MP{"Nördliche Marianen"}
         MQ{"Martinique"}
         MR{"Mauretanien"}
@@ -230,7 +230,7 @@ de{
         PM{"St. Pierre und Miquelon"}
         PN{"Pitcairninseln"}
         PR{"Puerto Rico"}
-        PS{"Palästinensische Autonomiegebiete"}
+        PS{"Palästina"}
         PT{"Portugal"}
         PW{"Palau"}
         PY{"Paraguay"}
@@ -312,9 +312,6 @@ de{
     }
     CountriesShort{
         GB{"UK"}
-        HK{"Hongkong"}
-        MO{"Macau"}
-        PS{"Palästina"}
         US{"USA"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/dsb.txt b/source/data/region/dsb.txt
index 3178be2..1f8929d 100644
--- a/source/data/region/dsb.txt
+++ b/source/data/region/dsb.txt
@@ -140,7 +140,7 @@ dsb{
         GU{"Guam"}
         GW{"Gineja-Bissau"}
         GY{"Guyana"}
-        HK{"Wósebna zastojnstwowa cona Hongkong"}
+        HK{"Hongkong"}
         HM{"Heardowa kupa a McDonaldowe kupy"}
         HN{"Honduras"}
         HR{"Chorwatska"}
@@ -194,7 +194,7 @@ dsb{
         ML{"Mali"}
         MM{"Myanmar"}
         MN{"Mongolska"}
-        MO{"Wósebna zastojnstwowa cona Macao"}
+        MO{"Macao"}
         MP{"Pódpołnocne Mariany"}
         MQ{"Martinique"}
         MR{"Mawretańska"}
@@ -229,7 +229,7 @@ dsb{
         PM{"St. Pierre a Miquelon"}
         PN{"Pitcairnowe kupy"}
         PR{"Puerto Rico"}
-        PS{"Palestinski awtonomny teritorium"}
+        PS{"Palestina"}
         PT{"Portugalska"}
         PW{"Palau"}
         PY{"Paraguay"}
@@ -311,9 +311,6 @@ dsb{
     }
     CountriesShort{
         GB{"UK"}
-        HK{"Hongkong"}
-        MO{"Macao"}
-        PS{"Palestina"}
         US{"USA"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/dz.txt b/source/data/region/dz.txt
index c4b08f4..9822e89 100755
--- a/source/data/region/dz.txt
+++ b/source/data/region/dz.txt
@@ -140,7 +140,7 @@ dz{
         GU{"གུ་འམ་ མཚོ་གླིང"}
         GW{"གྷི་ནི་ བྷི་སཱའུ"}
         GY{"གྷ་ཡ་ན"}
-        HK{"ཧོང་ཀོང་ཅཱའི་ན"}
+        HK{"ཧོང་ཀོང"}
         HM{"ཧཱརཌ་མཚོ་གླིང་ དང་ མེཀ་ཌོ་ནལཌ྄་གླིང་ཚོམ"}
         HN{"ཧཱན་ཌུ་རཱས྄"}
         HR{"ཀྲོ་ཨེ་ཤ"}
@@ -194,7 +194,7 @@ dz{
         ML{"མཱ་ལི"}
         MM{"མི་ཡཱན་མར་ (བྷར་མ)"}
         MN{"སོག་པོ་ཡུལ"}
-        MO{"མཀ་ཨའུ་ཅཱའི་ན"}
+        MO{"མཀ་ཨའུ"}
         MP{"བྱང་ཕྱོགས་ཀྱི་མ་ར་ཡ་ན་གླིང་ཚོམ"}
         MQ{"མཱར་ཊི་ནིཀ"}
         MR{"མོ་རི་ཊེ་ནི་ཡ"}
@@ -308,9 +308,5 @@ dz{
         MK{"མ་སེ་ཌོ་ནི་ཡ་ (ཡུ་གོ་སླཱ་བི་ཡ)"}
         TL{"ཤར་ཕྱོགས་ཏི་་མོར"}
     }
-    CountriesShort{
-        HK{"ཧོང་ཀོང"}
-        MO{"མཀ་ཨའུ"}
-    }
     Version{"2.1.6.69"}
 }
diff --git a/source/data/region/ee.txt b/source/data/region/ee.txt
index e68d6f2..fda2909 100755
--- a/source/data/region/ee.txt
+++ b/source/data/region/ee.txt
@@ -139,7 +139,7 @@ ee{
         GU{"Guam nutome"}
         GW{"Gini-Bisao nutome"}
         GY{"Guyanadu"}
-        HK{"Hɔng Kɔng SAR Tsaina nutome"}
+        HK{"Hɔng Kɔng nutome"}
         HM{"Heard kple Mcdonald ƒudomekpowo nutome"}
         HN{"Hondurasdu"}
         HR{"Kroatsia nutome"}
@@ -193,7 +193,7 @@ ee{
         ML{"Mali nutome"}
         MM{"Myanmar (Burma) nutome"}
         MN{"Mongolia nutome"}
-        MO{"Macau SAR Tsaina nutome"}
+        MO{"Macau nutome"}
         MP{"Dziehe Marina ƒudomekpowo nutome"}
         MQ{"Martiniki nutome"}
         MR{"Mauritania nutome"}
@@ -304,9 +304,5 @@ ee{
         MK{"Makedonia (FYROM) nutome"}
         TL{"Ɣedzeƒe Timɔ nutome"}
     }
-    CountriesShort{
-        HK{"Hɔng Kɔng nutome"}
-        MO{"Macau nutome"}
-    }
     Version{"2.1.8.9"}
 }
diff --git a/source/data/region/el.txt b/source/data/region/el.txt
index f47ca19..6c3ae5b 100644
--- a/source/data/region/el.txt
+++ b/source/data/region/el.txt
@@ -141,7 +141,7 @@ el{
         GU{"Γκουάμ"}
         GW{"Γουινέα Μπισάου"}
         GY{"Γουιάνα"}
-        HK{"Χονγκ Κονγκ ΕΔΠ Κίνας"}
+        HK{"Χονγκ Κονγκ"}
         HM{"Νήσοι Χερντ και Μακντόναλντ"}
         HN{"Ονδούρα"}
         HR{"Κροατία"}
@@ -195,7 +195,7 @@ el{
         ML{"Μάλι"}
         MM{"Μιανμάρ/Βιρμανία"}
         MN{"Μογγολία"}
-        MO{"Μακάο ΕΔΠ Κίνας"}
+        MO{"Μακάο"}
         MP{"Νήσοι Βόρειες Μαριάνες"}
         MQ{"Μαρτινίκα"}
         MR{"Μαυριτανία"}
@@ -230,7 +230,7 @@ el{
         PM{"Σεν Πιερ και Μικελόν"}
         PN{"Νήσοι Πίτκερν"}
         PR{"Πουέρτο Ρίκο"}
-        PS{"Παλαιστινιακά Εδάφη"}
+        PS{"Παλαιστίνη"}
         PT{"Πορτογαλία"}
         PW{"Παλάου"}
         PY{"Παραγουάη"}
@@ -311,9 +311,6 @@ el{
     }
     CountriesShort{
         GB{"Η.Β."}
-        HK{"Χονγκ Κονγκ"}
-        MO{"Μακάο"}
-        PS{"Παλαιστίνη"}
         US{"ΗΠΑ"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/en.txt b/source/data/region/en.txt
index 6d20d14..e8b9fbf 100644
--- a/source/data/region/en.txt
+++ b/source/data/region/en.txt
@@ -82,9 +82,9 @@ en{
         BZ{"Belize"}
         CA{"Canada"}
         CC{"Cocos (Keeling) Islands"}
-        CD{"Congo - Kinshasa"}
+        CD{"Congo (DRC)"}
         CF{"Central African Republic"}
-        CG{"Congo - Brazzaville"}
+        CG{"Congo (Republic)"}
         CH{"Switzerland"}
         CI{"Côte d’Ivoire"}
         CK{"Cook Islands"}
@@ -118,7 +118,7 @@ en{
         EU{"European Union"}
         FI{"Finland"}
         FJ{"Fiji"}
-        FK{"Falkland Islands"}
+        FK{"Falkland Islands (Islas Malvinas)"}
         FM{"Micronesia"}
         FO{"Faroe Islands"}
         FR{"France"}
@@ -141,7 +141,7 @@ en{
         GU{"Guam"}
         GW{"Guinea-Bissau"}
         GY{"Guyana"}
-        HK{"Hong Kong SAR China"}
+        HK{"Hong Kong"}
         HM{"Heard & McDonald Islands"}
         HN{"Honduras"}
         HR{"Croatia"}
@@ -191,11 +191,11 @@ en{
         MF{"St. Martin"}
         MG{"Madagascar"}
         MH{"Marshall Islands"}
-        MK{"Macedonia"}
+        MK{"Macedonia (FYROM)"}
         ML{"Mali"}
         MM{"Myanmar (Burma)"}
         MN{"Mongolia"}
-        MO{"Macau SAR China"}
+        MO{"Macau"}
         MP{"Northern Mariana Islands"}
         MQ{"Martinique"}
         MR{"Mauritania"}
@@ -230,7 +230,7 @@ en{
         PM{"St. Pierre & Miquelon"}
         PN{"Pitcairn Islands"}
         PR{"Puerto Rico"}
-        PS{"Palestinian Territories"}
+        PS{"Palestine"}
         PT{"Portugal"}
         PW{"Palau"}
         PY{"Paraguay"}
@@ -313,10 +313,7 @@ en{
     CountriesShort{
         BA{"Bosnia"}
         GB{"U.K."}
-        HK{"Hong Kong"}
         MM{"Myanmar"}
-        MO{"Macau"}
-        PS{"Palestine"}
         US{"U.S."}
     }
     Version{"2.1.8.87"}
diff --git a/source/data/region/es.txt b/source/data/region/es.txt
index c894f95..4a58393 100644
--- a/source/data/region/es.txt
+++ b/source/data/region/es.txt
@@ -141,7 +141,7 @@ es{
         GU{"Guam"}
         GW{"Guinea-Bisáu"}
         GY{"Guyana"}
-        HK{"RAE de Hong Kong (China)"}
+        HK{"Hong Kong"}
         HM{"Islas Heard y McDonald"}
         HN{"Honduras"}
         HR{"Croacia"}
@@ -195,7 +195,7 @@ es{
         ML{"Mali"}
         MM{"Myanmar (Birmania)"}
         MN{"Mongolia"}
-        MO{"RAE de Macao (China)"}
+        MO{"Macao"}
         MP{"Islas Marianas del Norte"}
         MQ{"Martinica"}
         MR{"Mauritania"}
@@ -230,7 +230,7 @@ es{
         PM{"San Pedro y Miquelón"}
         PN{"Islas Pitcairn"}
         PR{"Puerto Rico"}
-        PS{"Territorios Palestinos"}
+        PS{"Palestina"}
         PT{"Portugal"}
         PW{"Palau"}
         PY{"Paraguay"}
@@ -310,9 +310,6 @@ es{
     }
     CountriesShort{
         GB{"RU"}
-        HK{"Hong Kong"}
-        MO{"Macao"}
-        PS{"Palestina"}
         US{"EE. UU."}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/et.txt b/source/data/region/et.txt
index 19330a8..e3e0b58 100644
--- a/source/data/region/et.txt
+++ b/source/data/region/et.txt
@@ -141,7 +141,7 @@ et{
         GU{"Guam"}
         GW{"Guinea-Bissau"}
         GY{"Guyana"}
-        HK{"Hongkong - Hiina erihalduspiirkond"}
+        HK{"Hongkong"}
         HM{"Heardi ja McDonaldi saared"}
         HN{"Honduras"}
         HR{"Horvaatia"}
@@ -195,7 +195,7 @@ et{
         ML{"Mali"}
         MM{"Myanmar (Birma)"}
         MN{"Mongoolia"}
-        MO{"Macau - Hiina erihalduspiirkond"}
+        MO{"Macau"}
         MP{"Põhja-Mariaanid"}
         MQ{"Martinique"}
         MR{"Mauritaania"}
@@ -230,7 +230,7 @@ et{
         PM{"Saint Pierre ja Miquelon"}
         PN{"Pitcairni saared"}
         PR{"Puerto Rico"}
-        PS{"Palestiina alad"}
+        PS{"Palestiina"}
         PT{"Portugal"}
         PW{"Belau"}
         PY{"Paraguay"}
@@ -310,9 +310,6 @@ et{
     }
     CountriesShort{
         GB{"Suurbritannia"}
-        HK{"Hongkong"}
-        MO{"Macau"}
-        PS{"Palestiina"}
         US{"USA"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/eu.txt b/source/data/region/eu.txt
index 508ea3a..a040d67 100644
--- a/source/data/region/eu.txt
+++ b/source/data/region/eu.txt
@@ -141,7 +141,7 @@ eu{
         GU{"Guam"}
         GW{"Ginea-Bissau"}
         GY{"Guyana"}
-        HK{"Hong Kong AEB Txina"}
+        HK{"Hong Kong"}
         HM{"Heard eta McDonald uharteak"}
         HN{"Honduras"}
         HR{"Kroazia"}
@@ -195,7 +195,7 @@ eu{
         ML{"Mali"}
         MM{"Myanmar"}
         MN{"Mongolia"}
-        MO{"Macau AEB Txina"}
+        MO{"Macau"}
         MP{"Iparraldeko Mariana uharteak"}
         MQ{"Martinika"}
         MR{"Mauritania"}
@@ -230,7 +230,7 @@ eu{
         PM{"Saint-Pierre eta Mikelune"}
         PN{"Pitcairn uharteak"}
         PR{"Puerto Rico"}
-        PS{"Palestinako Lurraldeak"}
+        PS{"Palestina"}
         PT{"Portugal"}
         PW{"Palau"}
         PY{"Paraguai"}
@@ -311,9 +311,6 @@ eu{
     }
     CountriesShort{
         GB{"EB"}
-        HK{"Hong Kong"}
-        MO{"Macau"}
-        PS{"Palestina"}
         US{"AEB"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/fa.txt b/source/data/region/fa.txt
index fd48ca6..936e64f 100644
--- a/source/data/region/fa.txt
+++ b/source/data/region/fa.txt
@@ -141,7 +141,7 @@ fa{
         GU{"گوام"}
         GW{"گینهٔ بیسائو"}
         GY{"گویان"}
-        HK{"هنگ‌کنگ، ناحیهٔ ویژهٔ حکومتی چین"}
+        HK{"هنگ‌کنگ"}
         HM{"جزایر هرد و مک‌دونالد"}
         HN{"هندوراس"}
         HR{"کرواسی"}
@@ -195,7 +195,7 @@ fa{
         ML{"مالی"}
         MM{"میانمار (برمه)"}
         MN{"مغولستان"}
-        MO{"ماکائو، ناحیهٔ ویژهٔ حکومتی چین"}
+        MO{"ماکائو"}
         MP{"جزایر ماریانای شمالی"}
         MQ{"مارتینیک"}
         MR{"موریتانی"}
@@ -230,7 +230,7 @@ fa{
         PM{"سن پیر و میکلن"}
         PN{"جزایر پیت‌کرن"}
         PR{"پورتوریکو"}
-        PS{"سرزمین‌های فلسطینی"}
+        PS{"فلسطین"}
         PT{"پرتغال"}
         PW{"پالائو"}
         PY{"پاراگوئه"}
@@ -310,9 +310,6 @@ fa{
     }
     CountriesShort{
         GB{"بریتانیا"}
-        HK{"هنگ‌کنگ"}
-        MO{"ماکائو"}
-        PS{"فلسطین"}
         SA{"عربستان"}
         US{"ایالات متحده"}
     }
diff --git a/source/data/region/fi.txt b/source/data/region/fi.txt
index 678e4b9..4c4c0a5 100644
--- a/source/data/region/fi.txt
+++ b/source/data/region/fi.txt
@@ -141,7 +141,7 @@ fi{
         GU{"Guam"}
         GW{"Guinea-Bissau"}
         GY{"Guyana"}
-        HK{"Hongkong – Kiinan e.h.a."}
+        HK{"Hongkong"}
         HM{"Heard ja McDonaldinsaaret"}
         HN{"Honduras"}
         HR{"Kroatia"}
@@ -195,7 +195,7 @@ fi{
         ML{"Mali"}
         MM{"Myanmar (Burma)"}
         MN{"Mongolia"}
-        MO{"Macao – Kiinan e.h.a."}
+        MO{"Macao"}
         MP{"Pohjois-Mariaanit"}
         MQ{"Martinique"}
         MR{"Mauritania"}
@@ -230,7 +230,7 @@ fi{
         PM{"Saint-Pierre ja Miquelon"}
         PN{"Pitcairn"}
         PR{"Puerto Rico"}
-        PS{"Palestiinalaisalueet"}
+        PS{"Palestiina"}
         PT{"Portugali"}
         PW{"Palau"}
         PY{"Paraguay"}
@@ -312,9 +312,6 @@ fi{
     }
     CountriesShort{
         GB{"Britannia"}
-        HK{"Hongkong"}
-        MO{"Macao"}
-        PS{"Palestiina"}
         US{"USA"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/fil.txt b/source/data/region/fil.txt
index 9391823..2c0d592 100755
--- a/source/data/region/fil.txt
+++ b/source/data/region/fil.txt
@@ -141,7 +141,7 @@ fil{
         GU{"Guam"}
         GW{"Guinea-Bissau"}
         GY{"Guyana"}
-        HK{"Hong Kong SAR China"}
+        HK{"Hong Kong"}
         HM{"Heard Island and McDonald Islands"}
         HN{"Honduras"}
         HR{"Croatia"}
@@ -195,7 +195,7 @@ fil{
         ML{"Mali"}
         MM{"Myanmar (Burma)"}
         MN{"Mongolia"}
-        MO{"Macau SAR China"}
+        MO{"Macau"}
         MP{"Northern Mariana Islands"}
         MQ{"Martinique"}
         MR{"Mauritania"}
@@ -230,7 +230,7 @@ fil{
         PM{"Saint Pierre and Miquelon"}
         PN{"Pitcairn Islands"}
         PR{"Puerto Rico"}
-        PS{"Palestinian Territories"}
+        PS{"Palestine"}
         PT{"Portugal"}
         PW{"Palau"}
         PY{"Paraguay"}
@@ -312,9 +312,6 @@ fil{
     }
     CountriesShort{
         GB{"U.K."}
-        HK{"Hong Kong"}
-        MO{"Macau"}
-        PS{"Palestine"}
         US{"U.S."}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/fo.txt b/source/data/region/fo.txt
index f95afff..d482ff7 100644
--- a/source/data/region/fo.txt
+++ b/source/data/region/fo.txt
@@ -230,7 +230,7 @@ fo{
         PM{"Saint Pierre og Miquelon"}
         PN{"Pitcairn"}
         PR{"Puerto Rico"}
-        PS{"Palestinskt territorium"}
+        PS{"Palestina"}
         PT{"Portugal"}
         PW{"Palau"}
         PY{"Paraguei"}
@@ -304,9 +304,6 @@ fo{
     }
     CountriesShort{
         GB{"Stóra Bretland"}
-        HK{"Hongkong"}
-        MO{"Makao"}
-        PS{"Palestina"}
         US{"USA"}
     }
     Version{"2.1.7.53"}
diff --git a/source/data/region/fr.txt b/source/data/region/fr.txt
index 1fd6a1d..414f44a 100644
--- a/source/data/region/fr.txt
+++ b/source/data/region/fr.txt
@@ -141,7 +141,7 @@ fr{
         GU{"Guam"}
         GW{"Guinée-Bissau"}
         GY{"Guyana"}
-        HK{"R.A.S. chinoise de Hong Kong"}
+        HK{"Hong Kong"}
         HM{"Îles Heard et McDonald"}
         HN{"Honduras"}
         HR{"Croatie"}
@@ -195,7 +195,7 @@ fr{
         ML{"Mali"}
         MM{"Myanmar"}
         MN{"Mongolie"}
-        MO{"R.A.S. chinoise de Macao"}
+        MO{"Macao"}
         MP{"Îles Mariannes du Nord"}
         MQ{"Martinique"}
         MR{"Mauritanie"}
@@ -230,7 +230,7 @@ fr{
         PM{"Saint-Pierre-et-Miquelon"}
         PN{"Pitcairn"}
         PR{"Porto Rico"}
-        PS{"Territoires palestiniens"}
+        PS{"Palestine"}
         PT{"Portugal"}
         PW{"Palaos"}
         PY{"Paraguay"}
@@ -311,9 +311,6 @@ fr{
     }
     CountriesShort{
         GB{"R.-U."}
-        HK{"Hong Kong"}
-        MO{"Macao"}
-        PS{"Palestine"}
         US{"É.-U."}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/fr_CA.txt b/source/data/region/fr_CA.txt
index 9ed817a..f4e840f 100755
--- a/source/data/region/fr_CA.txt
+++ b/source/data/region/fr_CA.txt
@@ -17,6 +17,7 @@ fr_CA{
         SV{"Salvador"}
         SX{"Saint-Martin (Pays-Bas)"}
         VC{"Saint-Vincent-et-les Grenadines"}
+        XK{"Kosovo"}
     }
     Version{"2.1.8.19"}
 }
diff --git a/source/data/region/fur.txt b/source/data/region/fur.txt
index 7b4eb50..436d917 100644
--- a/source/data/region/fur.txt
+++ b/source/data/region/fur.txt
@@ -138,7 +138,7 @@ fur{
         GU{"Guam"}
         GW{"Guinea-Bissau"}
         GY{"Guyana"}
-        HK{"Regjon aministrative speciâl de Cine di Hong Kong"}
+        HK{"Hong Kong"}
         HM{"Isule Heard e Isulis McDonald"}
         HN{"Honduras"}
         HR{"Cravuazie"}
@@ -192,7 +192,7 @@ fur{
         ML{"Mali"}
         MM{"Birmanie"}
         MN{"Mongolie"}
-        MO{"Regjon aministrative speciâl de Cine di Macao"}
+        MO{"Macao"}
         MP{"Isulis Mariana dal Nord"}
         MQ{"Martiniche"}
         MR{"Mauritanie"}
@@ -302,9 +302,5 @@ fur{
         FK{"Isulis Falkland (Isulis Malvinas)"}
         MK{"Macedonie (FYROM)"}
     }
-    CountriesShort{
-        HK{"Hong Kong"}
-        MO{"Macao"}
-    }
     Version{"2.1.7.53"}
 }
diff --git a/source/data/region/fy.txt b/source/data/region/fy.txt
index e2b273f..da944b5 100644
--- a/source/data/region/fy.txt
+++ b/source/data/region/fy.txt
@@ -141,7 +141,7 @@ fy{
         GU{"Guam"}
         GW{"Guinee-Bissau"}
         GY{"Guyana"}
-        HK{"Hongkong SAR van Sina"}
+        HK{"Hongkong"}
         HM{"Heard- en McDonaldeilannen"}
         HN{"Honduras"}
         HR{"Kroatië"}
@@ -195,7 +195,7 @@ fy{
         ML{"Mali"}
         MM{"Myanmar (Birma)"}
         MN{"Mongolië"}
-        MO{"Macao SAR van Sina"}
+        MO{"Macao"}
         MP{"Noardlike Marianeneilannen"}
         MQ{"Martinique"}
         MR{"Mauritanië"}
@@ -230,7 +230,7 @@ fy{
         PM{"Saint-Pierre en Miquelon"}
         PN{"Pitcairneilannen"}
         PR{"Puerto Rico"}
-        PS{"Palestynske gebieten"}
+        PS{"Palestina"}
         PT{"Portugal"}
         PW{"Palau"}
         PY{"Paraguay"}
@@ -310,9 +310,6 @@ fy{
     }
     CountriesShort{
         GB{"VK"}
-        HK{"Hongkong"}
-        MO{"Macao"}
-        PS{"Palestina"}
         US{"VS"}
     }
     Version{"2.1.7.53"}
diff --git a/source/data/region/ga.txt b/source/data/region/ga.txt
index bd32753..03da2b3 100644
--- a/source/data/region/ga.txt
+++ b/source/data/region/ga.txt
@@ -141,7 +141,7 @@ ga{
         GU{"Guam"}
         GW{"Guine Bissau"}
         GY{"An Ghuáin"}
-        HK{"S.R.R. na Síne Hong Cong"}
+        HK{"Hong Cong"}
         HM{"Oileán Heard agus Oileáin McDonald"}
         HN{"Hondúras"}
         HR{"An Chróit"}
@@ -195,7 +195,7 @@ ga{
         ML{"Mailí"}
         MM{"Maenmar (Burma)"}
         MN{"An Mhongóil"}
-        MO{"S.R.R. na Síne Macao"}
+        MO{"Macao"}
         MP{"Na hOileáin Mháirianacha Thuaidh"}
         MQ{"Martinique"}
         MR{"An Mháratáin"}
@@ -230,7 +230,7 @@ ga{
         PM{"Saint-Pierre-et-Miquelon"}
         PN{"Oileáin Pitcairn"}
         PR{"Portó Ríce"}
-        PS{"Na Críocha Palaistíneacha"}
+        PS{"An Phalaistín"}
         PT{"An Phortaingéil"}
         PW{"Palau"}
         PY{"Paragua"}
@@ -310,9 +310,6 @@ ga{
     }
     CountriesShort{
         GB{"RA"}
-        HK{"Hong Cong"}
-        MO{"Macao"}
-        PS{"An Phalaistín"}
         US{"SAM"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/gd.txt b/source/data/region/gd.txt
index 038767b..30c1d55 100644
--- a/source/data/region/gd.txt
+++ b/source/data/region/gd.txt
@@ -141,7 +141,7 @@ gd{
         GU{"Guam"}
         GW{"Gini-Bioso"}
         GY{"Guidheàna"}
-        HK{"Hong Kong SAR na Sìne"}
+        HK{"Hong Kong"}
         HM{"Eilean Heard is MhicDhòmhnaill"}
         HN{"Hondùras"}
         HR{"A’ Chròthais"}
@@ -195,7 +195,7 @@ gd{
         ML{"Màili"}
         MM{"Miànmar (Burma)"}
         MN{"Dùthaich nam Mongol"}
-        MO{"Macàthu SAR na Sìne"}
+        MO{"Macàthu"}
         MP{"Na h-Eileanan Mairianach a Tuath"}
         MQ{"Mairtinic"}
         MR{"Moratàinea"}
@@ -230,7 +230,7 @@ gd{
         PM{"Saint Pierre agus Miquelon"}
         PN{"Eilean Peit a’ Chàirn"}
         PR{"Porto Rìceo"}
-        PS{"Na Ranntairean Palastaineach"}
+        PS{"Palastain"}
         PT{"A’ Phortagail"}
         PW{"Palabh"}
         PY{"Paraguaidh"}
@@ -312,9 +312,6 @@ gd{
     }
     CountriesShort{
         GB{"RA"}
-        HK{"Hong Kong"}
-        MO{"Macàthu"}
-        PS{"Palastain"}
         US{"SA"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/gl.txt b/source/data/region/gl.txt
index 51c3493..51f07b5 100644
--- a/source/data/region/gl.txt
+++ b/source/data/region/gl.txt
@@ -141,7 +141,7 @@ gl{
         GU{"Guam"}
         GW{"Guinea-Bissau"}
         GY{"Güiana"}
-        HK{"Hong Kong RAE de China"}
+        HK{"Hong Kong"}
         HM{"Illa Heard e Illas McDonald"}
         HN{"Honduras"}
         HR{"Croacia"}
@@ -195,7 +195,7 @@ gl{
         ML{"Mali"}
         MM{"Myanmar (Birmania)"}
         MN{"Mongolia"}
-        MO{"Macau RAE de China"}
+        MO{"Macau"}
         MP{"Illas Marianas do norte"}
         MQ{"Martinica"}
         MR{"Mauritania"}
@@ -230,7 +230,7 @@ gl{
         PM{"San Pedro e Miguelón"}
         PN{"Illas Pitcairn"}
         PR{"Porto Rico"}
-        PS{"Territorios palestinos"}
+        PS{"Palestina"}
         PT{"Portugal"}
         PW{"Palau"}
         PY{"Paraguai"}
@@ -311,9 +311,6 @@ gl{
     }
     CountriesShort{
         GB{"RU"}
-        HK{"Hong Kong"}
-        MO{"Macau"}
-        PS{"Palestina"}
     }
     Version{"2.1.8.9"}
 }
diff --git a/source/data/region/gsw.txt b/source/data/region/gsw.txt
index 7612469..960df47 100644
--- a/source/data/region/gsw.txt
+++ b/source/data/region/gsw.txt
@@ -135,7 +135,7 @@ gsw{
         GU{"Guam"}
         GW{"Gineea-Bissau"}
         GY{"Guäjaana"}
-        HK{"Sonderverwaltigszone Hongkong"}
+        HK{"Hongkong"}
         HM{"Höörd- und MäcDonald-Insle"}
         HN{"Honduras"}
         HR{"Kroaazie"}
@@ -188,7 +188,7 @@ gsw{
         ML{"Maali"}
         MM{"Myanmar (Burma)"}
         MN{"Mongolei"}
-        MO{"Sonderverwaltigszone Macao"}
+        MO{"Macao"}
         MP{"Nördlichi Mariaane"}
         MQ{"Martinigg"}
         MR{"Mauretaanie"}
@@ -294,9 +294,5 @@ gsw{
     Countries%variant{
         MK{"Mazedoonie (EJRM)"}
     }
-    CountriesShort{
-        HK{"Hongkong"}
-        MO{"Macao"}
-    }
     Version{"2.1.7.41"}
 }
diff --git a/source/data/region/gu.txt b/source/data/region/gu.txt
index 66d94f3..337673a 100644
--- a/source/data/region/gu.txt
+++ b/source/data/region/gu.txt
@@ -141,7 +141,7 @@ gu{
         GU{"ગ્વામ"}
         GW{"ગિની-બિસાઉ"}
         GY{"ગયાના"}
-        HK{"હોંગકોંગ SAR ચીન"}
+        HK{"હોંગ કોંગ"}
         HM{"હર્ડ અને મેકડોનાલ્ડ આઇલેન્ડ્સ"}
         HN{"હોન્ડુરસ"}
         HR{"ક્રોએશિયા"}
@@ -195,7 +195,7 @@ gu{
         ML{"માલી"}
         MM{"મ્યાંમાર (બર્મા)"}
         MN{"મંગોલિયા"}
-        MO{"મકાઉ SAR ચીન"}
+        MO{"મકાઉ"}
         MP{"ઉત્તરીય મારિયાના આઇલેન્ડ્સ"}
         MQ{"માર્ટીનીક"}
         MR{"મૌરિટાનિયા"}
@@ -230,7 +230,7 @@ gu{
         PM{"સેંટ પીએરે એન્ડ મિકીલોન"}
         PN{"પીટકૈર્ન આઇલેન્ડ્સ"}
         PR{"પ્યુઅર્ટો રિકો"}
-        PS{"પેલેસ્ટિનિયન ટેરિટરી"}
+        PS{"પેલેસ્ટાઇન"}
         PT{"પોર્ટુગલ"}
         PW{"પલાઉ"}
         PY{"પેરાગ્વે"}
@@ -312,9 +312,6 @@ gu{
     }
     CountriesShort{
         GB{"યુ.કે."}
-        HK{"હોંગ કોંગ"}
-        MO{"મકાઉ"}
-        PS{"પેલેસ્ટાઇન"}
         US{"યુ.એસ."}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/he.txt b/source/data/region/he.txt
index a555c9d..710f51c 100644
--- a/source/data/region/he.txt
+++ b/source/data/region/he.txt
@@ -141,7 +141,7 @@ he{
         GU{"גואם"}
         GW{"גיניאה-ביסאו"}
         GY{"גיאנה"}
-        HK{"הונג קונג - מחוז מנהלי מיוחד של סין"}
+        HK{"הונג קונג"}
         HM{"איי הרד ואיי מקדונלד"}
         HN{"הונדורס"}
         HR{"קרואטיה"}
@@ -195,7 +195,7 @@ he{
         ML{"מאלי"}
         MM{"מיאנמאר (בורמה)‎"}
         MN{"מונגוליה"}
-        MO{"מקאו - מחוז מנהלי מיוחד של סין"}
+        MO{"מקאו"}
         MP{"איי מריאנה הצפוניים"}
         MQ{"מרטיניק"}
         MR{"מאוריטניה"}
@@ -230,7 +230,7 @@ he{
         PM{"סנט פייר ומיקלון"}
         PN{"איי פיטקרן"}
         PR{"פורטו ריקו"}
-        PS{"השטחים הפלסטיניים"}
+        PS{"פלסטין"}
         PT{"פורטוגל"}
         PW{"פאלאו"}
         PY{"פרגוואי"}
@@ -311,9 +311,6 @@ he{
     }
     CountriesShort{
         GB{"בריטניה"}
-        HK{"הונג קונג"}
-        MO{"מקאו"}
-        PS{"פלסטין"}
         US{"ארה״ב"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/hi.txt b/source/data/region/hi.txt
index 8016e6a..3e3c48b 100644
--- a/source/data/region/hi.txt
+++ b/source/data/region/hi.txt
@@ -141,7 +141,7 @@ hi{
         GU{"गुआम"}
         GW{"गिनी-बिसाउ"}
         GY{"गयाना"}
-        HK{"हाँग काँग (चीन विशेष प्रशासनिक क्षेत्र)"}
+        HK{"हाँग काँग"}
         HM{"हर्ड द्वीप और मैकडोनॉल्ड द्वीपसमूह"}
         HN{"होंडूरास"}
         HR{"क्रोएशिया"}
@@ -195,7 +195,7 @@ hi{
         ML{"माली"}
         MM{"म्यांमार (बर्मा)"}
         MN{"मंगोलिया"}
-        MO{"मकाऊ (विशेष प्रशासनिक क्षेत्र चीन)"}
+        MO{"मकाऊ"}
         MP{"उत्तरी मारियाना द्वीपसमूह"}
         MQ{"मार्टीनिक"}
         MR{"मॉरिटानिया"}
@@ -230,7 +230,7 @@ hi{
         PM{"सेंट पिएरे और मिक्वेलान"}
         PN{"पिटकैर्न द्वीपसमूह"}
         PR{"पोर्टो रिको"}
-        PS{"फ़िलिस्तीनी क्षेत्र"}
+        PS{"फ़िलिस्तीन"}
         PT{"पुर्तगाल"}
         PW{"पलाऊ"}
         PY{"पेराग्वे"}
@@ -312,9 +312,6 @@ hi{
     }
     CountriesShort{
         GB{"यू.के."}
-        HK{"हाँग काँग"}
-        MO{"मकाऊ"}
-        PS{"फ़िलिस्तीन"}
         US{"अमेरिका"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/hr.txt b/source/data/region/hr.txt
index 6fd11d5..3b673c0 100644
--- a/source/data/region/hr.txt
+++ b/source/data/region/hr.txt
@@ -141,7 +141,7 @@ hr{
         GU{"Guam"}
         GW{"Gvineja Bisau"}
         GY{"Gvajana"}
-        HK{"Hong Kong PUP Kina"}
+        HK{"Hong Kong"}
         HM{"Otoci Heard i McDonald"}
         HN{"Honduras"}
         HR{"Hrvatska"}
@@ -195,7 +195,7 @@ hr{
         ML{"Mali"}
         MM{"Mijanmar (Burma)"}
         MN{"Mongolija"}
-        MO{"Makao PUP Kina"}
+        MO{"Makao"}
         MP{"Sjeverni Marijanski Otoci"}
         MQ{"Martinique"}
         MR{"Mauritanija"}
@@ -230,7 +230,7 @@ hr{
         PM{"Sveti Petar i Mikelon"}
         PN{"Otoci Pitcairn"}
         PR{"Portoriko"}
-        PS{"Palestinsko Područje"}
+        PS{"Palestina"}
         PT{"Portugal"}
         PW{"Palau"}
         PY{"Paragvaj"}
@@ -311,9 +311,6 @@ hr{
     }
     CountriesShort{
         GB{"UK"}
-        HK{"Hong Kong"}
-        MO{"Makao"}
-        PS{"Palestina"}
         US{"SAD"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/hsb.txt b/source/data/region/hsb.txt
index e5a604a..043b0a0 100644
--- a/source/data/region/hsb.txt
+++ b/source/data/region/hsb.txt
@@ -140,7 +140,7 @@ hsb{
         GU{"Guam"}
         GW{"Gineja-Bissau"}
         GY{"Guyana"}
-        HK{"Wosebita zarjadniska cona Hongkong"}
+        HK{"Hongkong"}
         HM{"Heardowa kupa a McDonaldowe kupy"}
         HN{"Honduras"}
         HR{"Chorwatska"}
@@ -194,7 +194,7 @@ hsb{
         ML{"Mali"}
         MM{"Myanmar"}
         MN{"Mongolska"}
-        MO{"Wosebita zarjadniska cona Macao"}
+        MO{"Macao"}
         MP{"Sewjerne Mariany"}
         MQ{"Martinique"}
         MR{"Mawretanska"}
@@ -229,7 +229,7 @@ hsb{
         PM{"St. Pierre a Miquelon"}
         PN{"Pitcairnowe kupy"}
         PR{"Puerto Rico"}
-        PS{"Palestinski awtonomny teritorij"}
+        PS{"Palestina"}
         PT{"Portugalska"}
         PW{"Palau"}
         PY{"Paraguay"}
@@ -311,9 +311,6 @@ hsb{
     }
     CountriesShort{
         GB{"UK"}
-        HK{"Hongkong"}
-        MO{"Macao"}
-        PS{"Palestina"}
         US{"USA"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/hu.txt b/source/data/region/hu.txt
index 1fa00d1..06fd3cb 100644
--- a/source/data/region/hu.txt
+++ b/source/data/region/hu.txt
@@ -141,7 +141,7 @@ hu{
         GU{"Guam"}
         GW{"Guinea-Bissau"}
         GY{"Guyana"}
-        HK{"Hongkong SAR Kína"}
+        HK{"Hongkong"}
         HM{"Heard-sziget és McDonald-szigetek"}
         HN{"Honduras"}
         HR{"Horvátország"}
@@ -195,7 +195,7 @@ hu{
         ML{"Mali"}
         MM{"Mianmar (Burma)"}
         MN{"Mongólia"}
-        MO{"Makaó SAR Kína"}
+        MO{"Makaó"}
         MP{"Északi Mariana-szigetek"}
         MQ{"Martinique"}
         MR{"Mauritánia"}
@@ -230,7 +230,7 @@ hu{
         PM{"Saint Pierre és Miquelon"}
         PN{"Pitcairn-szigetek"}
         PR{"Puerto Rico"}
-        PS{"Palesztin Terület"}
+        PS{"Palesztina"}
         PT{"Portugália"}
         PW{"Palau"}
         PY{"Paraguay"}
@@ -310,9 +310,6 @@ hu{
     }
     CountriesShort{
         GB{"UK"}
-        HK{"Hongkong"}
-        MO{"Makaó"}
-        PS{"Palesztina"}
         US{"USA"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/hy.txt b/source/data/region/hy.txt
index 439f045..19ae393 100644
--- a/source/data/region/hy.txt
+++ b/source/data/region/hy.txt
@@ -140,7 +140,7 @@ hy{
         GU{"Գուամ"}
         GW{"Գվինեա-Բիսաու"}
         GY{"Գայանա"}
-        HK{"Հոնկոնգի ՀՎՇ"}
+        HK{"Հոնկոնգ"}
         HM{"Հերդ կղզի և ՄակԴոնալդի կղզիներ"}
         HN{"Հոնդուրաս"}
         HR{"Խորվաթիա"}
@@ -194,7 +194,7 @@ hy{
         ML{"Մալի"}
         MM{"Մյանմա (Բիրմա)"}
         MN{"Մոնղոլիա"}
-        MO{"Չինաստանի Մակաո ՀՎՇ"}
+        MO{"Մակաո"}
         MP{"Հյուսիսային Մարիանյան կղզիներ"}
         MQ{"Մարտինիկա"}
         MR{"Մավրիտանիա"}
@@ -229,7 +229,7 @@ hy{
         PM{"Սեն Պիեր և Միկելոն"}
         PN{"Պիտկեռն կղզիներ"}
         PR{"Պուերտո Ռիկո"}
-        PS{"Պաղեստինյան տարածքներ"}
+        PS{"Պաղեստին"}
         PT{"Պորտուգալիա"}
         PW{"Պալաու"}
         PY{"Պարագվայ"}
@@ -311,9 +311,6 @@ hy{
     }
     CountriesShort{
         GB{"Միացյալ Թագավորություն"}
-        HK{"Հոնկոնգ"}
-        MO{"Մակաո"}
-        PS{"Պաղեստին"}
         US{"ԱՄՆ"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/id.txt b/source/data/region/id.txt
index 3c210c4..0e2f945 100644
--- a/source/data/region/id.txt
+++ b/source/data/region/id.txt
@@ -141,7 +141,7 @@ id{
         GU{"Guam"}
         GW{"Guinea-Bissau"}
         GY{"Guyana"}
-        HK{"Hong Kong SAR China"}
+        HK{"Hong Kong"}
         HM{"Pulau Heard dan Kepulauan McDonald"}
         HN{"Honduras"}
         HR{"Kroasia"}
@@ -195,7 +195,7 @@ id{
         ML{"Mali"}
         MM{"Myanmar (Burma)"}
         MN{"Mongolia"}
-        MO{"Makau SAR China"}
+        MO{"Makau"}
         MP{"Kepulauan Mariana Utara"}
         MQ{"Martinik"}
         MR{"Mauritania"}
@@ -230,7 +230,7 @@ id{
         PM{"Saint Pierre dan Miquelon"}
         PN{"Kepulauan Pitcairn"}
         PR{"Puerto Riko"}
-        PS{"Wilayah Palestina"}
+        PS{"Palestina"}
         PT{"Portugal"}
         PW{"Palau"}
         PY{"Paraguay"}
@@ -312,9 +312,6 @@ id{
     }
     CountriesShort{
         GB{"GB"}
-        HK{"Hong Kong"}
-        MO{"Makau"}
-        PS{"Palestina"}
         US{"A.S."}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/is.txt b/source/data/region/is.txt
index 26aa1f1..f4e9b25 100644
--- a/source/data/region/is.txt
+++ b/source/data/region/is.txt
@@ -141,7 +141,7 @@ is{
         GU{"Gvam"}
         GW{"Gínea-Bissá"}
         GY{"Gvæjana"}
-        HK{"Sjálfstjórnarsvæðið Hong Kong"}
+        HK{"Hong Kong"}
         HM{"Heard og McDonaldseyjar"}
         HN{"Hondúras"}
         HR{"Króatía"}
@@ -195,7 +195,7 @@ is{
         ML{"Malí"}
         MM{"Mjanmar (Búrma)"}
         MN{"Mongólía"}
-        MO{"Sjálfstjórnarsvæðið Makaó"}
+        MO{"Makaó"}
         MP{"Norður-Maríanaeyjar"}
         MQ{"Martiník"}
         MR{"Máritanía"}
@@ -230,7 +230,7 @@ is{
         PM{"Sankti Pierre og Miquelon"}
         PN{"Pitcairn-eyjar"}
         PR{"Púertó Ríkó"}
-        PS{"Heimastjórnarsvæði Palestínumanna"}
+        PS{"Palestína"}
         PT{"Portúgal"}
         PW{"Palá"}
         PY{"Paragvæ"}
@@ -311,9 +311,6 @@ is{
     }
     CountriesShort{
         GB{"Bretland"}
-        HK{"Hong Kong"}
-        MO{"Makaó"}
-        PS{"Palestína"}
         US{"BNA"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/it.txt b/source/data/region/it.txt
index 1378c71..ec8887d 100644
--- a/source/data/region/it.txt
+++ b/source/data/region/it.txt
@@ -141,7 +141,7 @@ it{
         GU{"Guam"}
         GW{"Guinea-Bissau"}
         GY{"Guyana"}
-        HK{"RAS di Hong Kong"}
+        HK{"Hong-Kong"}
         HM{"Isole Heard ed Isole McDonald"}
         HN{"Honduras"}
         HR{"Croazia"}
@@ -195,7 +195,7 @@ it{
         ML{"Mali"}
         MM{"Myanmar (Birmania)"}
         MN{"Mongolia"}
-        MO{"RAS di Macao"}
+        MO{"Macao"}
         MP{"Isole Marianne Settentrionali"}
         MQ{"Martinica"}
         MR{"Mauritania"}
@@ -230,7 +230,7 @@ it{
         PM{"Saint Pierre e Miquelon"}
         PN{"Isole Pitcairn"}
         PR{"Portorico"}
-        PS{"Territori palestinesi"}
+        PS{"Palestina"}
         PT{"Portogallo"}
         PW{"Palau"}
         PY{"Paraguay"}
@@ -310,9 +310,6 @@ it{
     }
     CountriesShort{
         GB{"GB"}
-        HK{"Hong-Kong"}
-        MO{"Macao"}
-        PS{"Palestina"}
         US{"USA"}
     }
     Version{"2.1.8.32"}
diff --git a/source/data/region/ja.txt b/source/data/region/ja.txt
index 84e3519..dabca4a 100644
--- a/source/data/region/ja.txt
+++ b/source/data/region/ja.txt
@@ -141,7 +141,7 @@ ja{
         GU{"グアム"}
         GW{"ギニアビサウ"}
         GY{"ガイアナ"}
-        HK{"中華人民共和国香港特別行政区"}
+        HK{"香港"}
         HM{"ハード島・マクドナルド諸島"}
         HN{"ホンジュラス"}
         HR{"クロアチア"}
@@ -195,7 +195,7 @@ ja{
         ML{"マリ"}
         MM{"ミャンマー"}
         MN{"モンゴル"}
-        MO{"中華人民共和国マカオ特別行政区"}
+        MO{"マカオ"}
         MP{"北マリアナ諸島"}
         MQ{"マルティニーク"}
         MR{"モーリタニア"}
@@ -312,9 +312,6 @@ ja{
     }
     CountriesShort{
         GB{"英国"}
-        HK{"香港"}
-        MO{"マカオ"}
-        PS{"パレスチナ"}
         US{"アメリカ"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/ka.txt b/source/data/region/ka.txt
index a234621..3c291e9 100644
--- a/source/data/region/ka.txt
+++ b/source/data/region/ka.txt
@@ -141,7 +141,7 @@ ka{
         GU{"გუამი"}
         GW{"გვინეა-ბისაუ"}
         GY{"გაიანა"}
-        HK{"ჰონკონგის სპეციალური ადმინისტრაციული რეგიონი ჩინეთი"}
+        HK{"ჰონკონგი"}
         HM{"ჰერდი და მაკდონალდის კუნძულები"}
         HN{"ჰონდურასი"}
         HR{"ხორვატია"}
@@ -195,7 +195,7 @@ ka{
         ML{"მალი"}
         MM{"მიანმარი (ბირმა)"}
         MN{"მონღოლეთი"}
-        MO{"მაკაოს სპეციალური ადმინისტრაციული რეგიონი ჩინეთი"}
+        MO{"მაკაო"}
         MP{"ჩრდილოეთ მარიანას კუნძულები"}
         MQ{"მარტინიკა"}
         MR{"მავრიტანია"}
@@ -230,7 +230,7 @@ ka{
         PM{"სენ-პიერი და მიკელონი"}
         PN{"პიტკერნის კუნძულები"}
         PR{"პუერტო-რიკო"}
-        PS{"პალესტინის ტერიტორიები"}
+        PS{"პალესტინა"}
         PT{"პორტუგალია"}
         PW{"პალაუ"}
         PY{"პარაგვაი"}
@@ -312,9 +312,6 @@ ka{
     }
     CountriesShort{
         GB{"გაერთ.სამ."}
-        HK{"ჰონკონგი"}
-        MO{"მაკაო"}
-        PS{"პალესტინა"}
         US{"აშშ"}
     }
     Version{"2.1.8.95"}
diff --git a/source/data/region/kea.txt b/source/data/region/kea.txt
index a298de7..f8df454 100755
--- a/source/data/region/kea.txt
+++ b/source/data/region/kea.txt
@@ -141,7 +141,7 @@ kea{
         GU{"Guam"}
         GW{"Gine-Bisau"}
         GY{"Giana"}
-        HK{"Rejiãu Administrativu Special di Ong Kong"}
+        HK{"Ong Kong"}
         HM{"Ilha Heard i Ilhas McDonald"}
         HN{"Onduras"}
         HR{"Kroasia"}
@@ -195,7 +195,7 @@ kea{
         ML{"Mali"}
         MM{"Mianmar"}
         MN{"Mongolia"}
-        MO{"Rejiãu Administrativu Special di Makau"}
+        MO{"Makau"}
         MP{"Ilhas Marianas di Norti"}
         MQ{"Martinika"}
         MR{"Mauritania"}
@@ -310,8 +310,6 @@ kea{
     }
     CountriesShort{
         GB{"R.U."}
-        HK{"Ong Kong"}
-        MO{"Makau"}
         US{"S.U."}
     }
     Version{"2.1.7.39"}
diff --git a/source/data/region/kk.txt b/source/data/region/kk.txt
index 467ad48..126c48d 100644
--- a/source/data/region/kk.txt
+++ b/source/data/region/kk.txt
@@ -81,7 +81,7 @@ kk{
         BZ{"Белиз"}
         CA{"Канада"}
         CC{"Кокос аралдары"}
-        CD{"Конго"}
+        CD{"Конго Демократиялық Республикасы"}
         CF{"Орталық Африка Республикасы"}
         CG{"Конго-Браззавиль Республикасы"}
         CH{"Швейцария"}
@@ -140,7 +140,7 @@ kk{
         GU{"Гуам"}
         GW{"Гвинея-Бисау"}
         GY{"Гайана"}
-        HK{"Қытай Халық Республикасының Гонг-Конг арнайы әкімшілік ауданы"}
+        HK{"Гонконг"}
         HM{"Херд аралы мен Макдональд аралы"}
         HN{"Гондурас"}
         HR{"Хорватия"}
@@ -194,7 +194,7 @@ kk{
         ML{"Мали"}
         MM{"Мьянма (Бирма)"}
         MN{"Моңғолия"}
-        MO{"Қытай Халық Республикасының Макао арнайы әкімшілік ауданы"}
+        MO{"Макао"}
         MP{"Солтүстік Мариан аралдары"}
         MQ{"Мартиника"}
         MR{"Мавритания"}
@@ -229,7 +229,7 @@ kk{
         PM{"Сен-Пьер және Микелон"}
         PN{"Питкэрн аралдары"}
         PR{"Пуэрто-Рико"}
-        PS{"Палестина аймақтары"}
+        PS{"Палестина"}
         PT{"Португалия"}
         PW{"Палау"}
         PY{"Парагвай"}
@@ -311,9 +311,6 @@ kk{
     }
     CountriesShort{
         GB{"БК"}
-        HK{"Гонконг"}
-        MO{"Макао"}
-        PS{"Палестина"}
         US{"АҚШ"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/km.txt b/source/data/region/km.txt
index 4ef7295..c286928 100644
--- a/source/data/region/km.txt
+++ b/source/data/region/km.txt
@@ -229,7 +229,7 @@ km{
         PM{"សង់ព្យែរ និង​មីគីឡុង"}
         PN{"កោះ​ភីតខារិន"}
         PR{"ព័រតូរីកូ"}
-        PS{"ដែន​ប៉ាលេស្ទីន"}
+        PS{"ប៉ាលេស្ទីន"}
         PT{"ព័រទុយហ្កាល់"}
         PW{"ផៅឡូ"}
         PY{"ប៉ារ៉ាហ្គាយ"}
@@ -311,9 +311,6 @@ km{
     }
     CountriesShort{
         GB{"ច.អ."}
-        HK{"ហុងកុង"}
-        MO{"ម៉ាកាវ"}
-        PS{"ប៉ាលេស្ទីន"}
         US{"ស.រ.អ"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/kn.txt b/source/data/region/kn.txt
index 163dddf..8410fc3 100644
--- a/source/data/region/kn.txt
+++ b/source/data/region/kn.txt
@@ -141,7 +141,7 @@ kn{
         GU{"ಗುಯಾಮ್"}
         GW{"ಗಿನಿ-ಬಿಸ್ಸಾವ್"}
         GY{"ಗಯಾನಾ"}
-        HK{"ಹಾಂಕ್‌ ಕಾಂಗ್ SAR ಚೈನಾ"}
+        HK{"ಹಾಂಗ್ ಕಾಂಗ್"}
         HM{"ಹರ್ಡ್ ದ್ವೀಪ ಮತ್ತು ಮ್ಯಾಕ್‍ಡೊನಾಲ್ಡ್ ದ್ವೀಪಗಳು"}
         HN{"ಹೊಂಡುರಾಸ್"}
         HR{"ಕ್ರೊಯೇಶಿಯಾ"}
@@ -195,7 +195,7 @@ kn{
         ML{"ಮಾಲಿ"}
         MM{"ಮಯನ್ಮಾರ್ (ಬರ್ಮಾ)"}
         MN{"ಮೊಂಗೋಲಿಯಾ"}
-        MO{"ಮಖಾವ್ (SAR) ಚೈನಾ"}
+        MO{"ಮಖಾವ್"}
         MP{"ಉತ್ತರ ಮರಿಯಾನಾ ದ್ವೀಪಗಳು"}
         MQ{"ಮಾರ್ಟಿನಿಕ್"}
         MR{"ಮಾರಿಟೇನಿಯಾ"}
@@ -230,7 +230,7 @@ kn{
         PM{"ಸೇಂಟ್ ಪಿಯರೆ ಮತ್ತು ಮಿಕೆಲನ್"}
         PN{"ಪಿಟ್‌ಕೈರ್ನ್ ದ್ವೀಪಗಳು"}
         PR{"ಪ್ಯೂರ್ಟೋ ರಿಕೊ"}
-        PS{"ಪ್ಯಾಲೇಸ್ಟೇನಿಯನ್ ಪ್ರದೇಶ"}
+        PS{"ಪ್ಯಾಲೆಸ್ಟೇನ್"}
         PT{"ಪೋರ್ಚುಗಲ್"}
         PW{"ಪಲಾವು"}
         PY{"ಪರಾಗ್ವೇ"}
@@ -312,9 +312,6 @@ kn{
     }
     CountriesShort{
         GB{"ಯು.ಕೆ."}
-        HK{"ಹಾಂಗ್ ಕಾಂಗ್"}
-        MO{"ಮಖಾವ್"}
-        PS{"ಪ್ಯಾಲೆಸ್ಟೇನ್"}
         US{"ಯು.ಎಸ್"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/ko.txt b/source/data/region/ko.txt
index 4fa90ea..6672814 100644
--- a/source/data/region/ko.txt
+++ b/source/data/region/ko.txt
@@ -141,7 +141,7 @@ ko{
         GU{"괌"}
         GW{"기네비쏘"}
         GY{"가이아나"}
-        HK{"홍콩, 중국 특별행정구"}
+        HK{"홍콩"}
         HM{"허드섬-맥도널드제도"}
         HN{"온두라스"}
         HR{"크로아티아"}
@@ -195,7 +195,7 @@ ko{
         ML{"말리"}
         MM{"미얀마"}
         MN{"몽골"}
-        MO{"마카오, 중국 특별행정구"}
+        MO{"마카오"}
         MP{"북마리아나제도"}
         MQ{"말티니크"}
         MR{"모리타니"}
@@ -230,7 +230,7 @@ ko{
         PM{"생피에르 미클롱"}
         PN{"핏케언 섬"}
         PR{"푸에르토리코"}
-        PS{"팔레스타인 지구"}
+        PS{"팔레스타인"}
         PT{"포르투갈"}
         PW{"팔라우"}
         PY{"파라과이"}
@@ -310,9 +310,6 @@ ko{
     }
     CountriesShort{
         GB{"영국"}
-        HK{"홍콩"}
-        MO{"마카오"}
-        PS{"팔레스타인"}
         US{"미국"}
     }
     Version{"2.1.9.31"}
diff --git a/source/data/region/ksh.txt b/source/data/region/ksh.txt
index 3c69977..feb6745 100644
--- a/source/data/region/ksh.txt
+++ b/source/data/region/ksh.txt
@@ -311,8 +311,6 @@ ksh{
     }
     CountriesShort{
         GB{"Jruußbrettannije"}
-        HK{"Hongkong"}
-        MO{"Makau"}
         US{"USA"}
     }
     Version{"2.1.7.53"}
diff --git a/source/data/region/ky.txt b/source/data/region/ky.txt
index 330803f..e2b913d 100755
--- a/source/data/region/ky.txt
+++ b/source/data/region/ky.txt
@@ -140,7 +140,7 @@ ky{
         GU{"Гуам"}
         GW{"Гвинея-Бисау"}
         GY{"Гайана"}
-        HK{"Гонконг Кытай ААА"}
+        HK{"Гонконг"}
         HM{"Херд жана Макдоналд аралдары"}
         HN{"Гондурас"}
         HR{"Хорватия"}
@@ -194,7 +194,7 @@ ky{
         ML{"Мали"}
         MM{"Мьянма (Бирма)"}
         MN{"Монголия"}
-        MO{"Макау Кытай ААА"}
+        MO{"Макау"}
         MP{"Түндүк Мариана аралдары"}
         MQ{"Мартиника"}
         MR{"Мавритания"}
@@ -229,7 +229,7 @@ ky{
         PM{"Сен-Пьер жана Микелон"}
         PN{"Питкэрн аралдары"}
         PR{"Пуэрто-Рико"}
-        PS{"Палестина аймактары"}
+        PS{"Палестина"}
         PT{"Португалия"}
         PW{"Палау"}
         PY{"Парагвай"}
@@ -311,9 +311,6 @@ ky{
     }
     CountriesShort{
         GB{"УБ"}
-        HK{"Гонконг"}
-        MO{"Макау"}
-        PS{"Палестина"}
         US{"АКШ"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/lb.txt b/source/data/region/lb.txt
index 4684bd0..0fedce0 100644
--- a/source/data/region/lb.txt
+++ b/source/data/region/lb.txt
@@ -140,7 +140,7 @@ lb{
         GU{"Guam"}
         GW{"Guinea-Bissau"}
         GY{"Guyana"}
-        HK{"Spezialverwaltungszon Hong Kong"}
+        HK{"Hong Kong"}
         HM{"Heard- a McDonald-Inselen"}
         HN{"Honduras"}
         HR{"Kroatien"}
@@ -194,7 +194,7 @@ lb{
         ML{"Mali"}
         MM{"Myanmar"}
         MN{"Mongolei"}
-        MO{"Spezialverwaltungszon Macau"}
+        MO{"Macau"}
         MP{"Nërdlech Marianen"}
         MQ{"Martinique"}
         MR{"Mauretanien"}
@@ -229,7 +229,7 @@ lb{
         PM{"St. Pierre a Miquelon"}
         PN{"Pitcairninselen"}
         PR{"Puerto Rico"}
-        PS{"Palestinensesch Autonomiegebidder"}
+        PS{"Palestina"}
         PT{"Portugal"}
         PW{"Palau"}
         PY{"Paraguay"}
@@ -309,9 +309,6 @@ lb{
     }
     CountriesShort{
         GB{"GB"}
-        HK{"Hong Kong"}
-        MO{"Macau"}
-        PS{"Palestina"}
         US{"US"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/lo.txt b/source/data/region/lo.txt
index bef247a..ce375a5 100755
--- a/source/data/region/lo.txt
+++ b/source/data/region/lo.txt
@@ -140,7 +140,7 @@ lo{
         GU{"ກວມ"}
         GW{"ກິນີ-ບິສເຊົາ"}
         GY{"ກາຍຢານາ"}
-        HK{"ຮອງກົງ ເຂດປົກຄອງພິເສດ ຈີນ"}
+        HK{"ຮອງກົງ"}
         HM{"ໝູ່ເກາະເຮີດ & ແມັກໂດນອລ"}
         HN{"ຮອນດູຣັສ"}
         HR{"ໂຄຣເອເທຍ"}
@@ -194,7 +194,7 @@ lo{
         ML{"ມາລິ"}
         MM{"ມຽນມາ (ເບີມາ)"}
         MN{"ມອງໂກເລຍ"}
-        MO{"ມາເກົ້າ ເຂດປົກຄອງພິເສດ ຈີນ"}
+        MO{"ມາເກົ້າ"}
         MP{"ຫມູ່ເກາະມາແຊວຕອນເຫນືອ"}
         MQ{"ມາຕິນີກ"}
         MR{"ມົວຣິເທເນຍ"}
@@ -229,7 +229,7 @@ lo{
         PM{"ເຊນ ປີແອ ມິເກວລອນ"}
         PN{"ໝູ່ເກາະພິດແຄນ"}
         PR{"ເພືອໂຕ ຣິໂກ"}
-        PS{"ດິນແດນ ປາເລສຕິນຽນ"}
+        PS{"ປາເລສຕິນ"}
         PT{"ພອລທູໂກ"}
         PW{"ປາເລົາ"}
         PY{"ພາຣາກວຍ"}
@@ -311,9 +311,6 @@ lo{
     }
     CountriesShort{
         GB{"ສະຫະລາດຊະອະນາຈັກຯ"}
-        HK{"ຮອງກົງ"}
-        MO{"ມາເກົ້າ"}
-        PS{"ປາເລສຕິນ"}
         US{"ສະຫະລັດຯ"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/lt.txt b/source/data/region/lt.txt
index 085fb9b..351f5c2 100644
--- a/source/data/region/lt.txt
+++ b/source/data/region/lt.txt
@@ -141,7 +141,7 @@ lt{
         GU{"Guamas"}
         GW{"Bisau Gvinėja"}
         GY{"Gajana"}
-        HK{"Ypatingasis Administracinis Kinijos Regionas Honkongas"}
+        HK{"Honkongas"}
         HM{"Herdo ir Makdonaldo Salos"}
         HN{"Hondūras"}
         HR{"Kroatija"}
@@ -195,7 +195,7 @@ lt{
         ML{"Malis"}
         MM{"Mianmaras (Birma)"}
         MN{"Mongolija"}
-        MO{"Ypatingasis Administracinis Kinijos Regionas Makao"}
+        MO{"Makao"}
         MP{"Marianos Šiaurinės Salos"}
         MQ{"Martinika"}
         MR{"Mauritanija"}
@@ -230,7 +230,7 @@ lt{
         PM{"Sen Pjeras ir Mikelonas"}
         PN{"Pitkernas"}
         PR{"Puerto Rikas"}
-        PS{"Palestinos teritorija"}
+        PS{"Palestina"}
         PT{"Portugalija"}
         PW{"Palau"}
         PY{"Paragvajus"}
@@ -310,9 +310,6 @@ lt{
     }
     CountriesShort{
         GB{"Didžioji Britanija"}
-        HK{"Honkongas"}
-        MO{"Makao"}
-        PS{"Palestina"}
         US{"JAV"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/lv.txt b/source/data/region/lv.txt
index 6427986..159dfb5 100644
--- a/source/data/region/lv.txt
+++ b/source/data/region/lv.txt
@@ -141,7 +141,7 @@ lv{
         GU{"Guama"}
         GW{"Gvineja-Bisava"}
         GY{"Gajāna"}
-        HK{"Ķīnas īpašās pārvaldes apgabals Honkonga"}
+        HK{"Honkonga"}
         HM{"Hērda un Makdonalda salas"}
         HN{"Hondurasa"}
         HR{"Horvātija"}
@@ -195,7 +195,7 @@ lv{
         ML{"Mali"}
         MM{"Mjanma (Birma)"}
         MN{"Mongolija"}
-        MO{"Ķīnas īpašās pārvaldes apgabals Makao"}
+        MO{"Makao"}
         MP{"Ziemeļu Marianas salas"}
         MQ{"Martinika"}
         MR{"Mauritānija"}
@@ -311,9 +311,6 @@ lv{
     }
     CountriesShort{
         GB{"Lielbritānija"}
-        HK{"Honkonga"}
-        MO{"Makao"}
-        PS{"Palestīna"}
         US{"ASV"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/mk.txt b/source/data/region/mk.txt
index 68e121e..41acd14 100644
--- a/source/data/region/mk.txt
+++ b/source/data/region/mk.txt
@@ -141,7 +141,7 @@ mk{
         GU{"Гвам"}
         GW{"Гвинеја-Бисау"}
         GY{"Гвајана"}
-        HK{"Хонг Конг С.А.Р Кина"}
+        HK{"Хонг Конг"}
         HM{"Остров Херд и Острови Макдоналд"}
         HN{"Хондурас"}
         HR{"Хрватска"}
@@ -195,7 +195,7 @@ mk{
         ML{"Мали"}
         MM{"Мјанмар (Бурма)"}
         MN{"Монголија"}
-        MO{"Макао С.А.Р Кина"}
+        MO{"Макао"}
         MP{"Северни Маријански Острови"}
         MQ{"Мартиник"}
         MR{"Мавританија"}
@@ -230,7 +230,7 @@ mk{
         PM{"Сент Пјер и Микелан"}
         PN{"Питкернски Острови"}
         PR{"Порторико"}
-        PS{"Палестински територии"}
+        PS{"Палестина"}
         PT{"Португалија"}
         PW{"Палау"}
         PY{"Парагвај"}
@@ -312,9 +312,6 @@ mk{
     }
     CountriesShort{
         GB{"ОК"}
-        HK{"Хонг Конг"}
-        MO{"Макао"}
-        PS{"Палестина"}
         US{"САД"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/ml.txt b/source/data/region/ml.txt
index 26f5efc..7117299 100644
--- a/source/data/region/ml.txt
+++ b/source/data/region/ml.txt
@@ -141,7 +141,7 @@ ml{
         GU{"ഗ്വാം"}
         GW{"ഗിനിയ-ബിസൗ"}
         GY{"ഗയാന"}
-        HK{"ഹോങ് കോങ് എസ്.ഏ.ആർ. ചൈന"}
+        HK{"ഹോങ്കോങ്ങ്"}
         HM{"ഹിയേർഡും മക്‌ഡൊണാൾഡ് ദ്വീപുകളും"}
         HN{"ഹോണ്ടുറാസ്"}
         HR{"ക്രൊയേഷ്യ"}
@@ -195,7 +195,7 @@ ml{
         ML{"മാലി"}
         MM{"മ്യാൻമാർ (ബർമ്മ)"}
         MN{"മംഗോളിയ"}
-        MO{"മക്കാവോ SAR ചൈന"}
+        MO{"മക്കാവു"}
         MP{"ഉത്തര മറിയാനാ ദ്വീപുകൾ"}
         MQ{"മാർട്ടിനിക്ക്"}
         MR{"മൗറിറ്റാനിയ"}
@@ -230,7 +230,7 @@ ml{
         PM{"സെന്റ് പിയറിയും മിക്കലണും"}
         PN{"പിറ്റ്‌കെയ്‌ൻ ദ്വീപുകൾ"}
         PR{"പ്യൂർട്ടോ റിക്കോ"}
-        PS{"പാലസ്‌തീൻ പ്രദേശങ്ങൾ"}
+        PS{"പലസ്‌തീൻ"}
         PT{"പോർച്ചുഗൽ"}
         PW{"പലാവു"}
         PY{"പരാഗ്വേ"}
@@ -312,9 +312,6 @@ ml{
     }
     CountriesShort{
         GB{"യു.കെ."}
-        HK{"ഹോങ്കോങ്ങ്"}
-        MO{"മക്കാവു"}
-        PS{"പലസ്‌തീൻ"}
         US{"യു.എസ്"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/mn.txt b/source/data/region/mn.txt
index 4c6cbf2..428402f 100755
--- a/source/data/region/mn.txt
+++ b/source/data/region/mn.txt
@@ -140,7 +140,7 @@ mn{
         GU{"Гуам"}
         GW{"Гвиней-Бисау"}
         GY{"Гайана"}
-        HK{"БНХАУ-ын Тусгай захиргааны бүс Хонг Конг"}
+        HK{"Хонг Конг"}
         HM{"Хэрд болон Макдоналд Арлууд"}
         HN{"Гондурас"}
         HR{"Хорват"}
@@ -194,7 +194,7 @@ mn{
         ML{"Мали"}
         MM{"Мьянмар (Бурма)"}
         MN{"Монгол"}
-        MO{"БНХАУ-ын Тусгай захиргааны бүс Макао"}
+        MO{"Макао"}
         MP{"Хойд Марианы Арлууд"}
         MQ{"Мартиник"}
         MR{"Мавритани"}
@@ -229,7 +229,7 @@ mn{
         PM{"Сэнт Пьер ба Микелон"}
         PN{"Питкэрн Арлууд"}
         PR{"Пуэрто Рико"}
-        PS{"Палестины нутаг дэвсгэрүүд"}
+        PS{"Палестин"}
         PT{"Португал"}
         PW{"Палау"}
         PY{"Парагвай"}
@@ -311,9 +311,6 @@ mn{
     }
     CountriesShort{
         GB{"ИБ"}
-        HK{"Хонг Конг"}
-        MO{"Макао"}
-        PS{"Палестин"}
         US{"АНУ"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/mr.txt b/source/data/region/mr.txt
index 9e2937e..c944645 100644
--- a/source/data/region/mr.txt
+++ b/source/data/region/mr.txt
@@ -141,7 +141,7 @@ mr{
         GU{"गुआम"}
         GW{"गिनी-बिसाउ"}
         GY{"गयाना"}
-        HK{"हाँगकाँग एसएआर चीन"}
+        HK{"हाँगकाँग"}
         HM{"हर्ड आणि मॅक्डोनाल्ड बेटे"}
         HN{"होंडुरास"}
         HR{"क्रोएशिया"}
@@ -195,7 +195,7 @@ mr{
         ML{"माली"}
         MM{"म्यानमार (बर्मा)"}
         MN{"मंगोलिया"}
-        MO{"मकाओ एसएआर चीन"}
+        MO{"मकाओ"}
         MP{"उत्तरी मारियाना बेटे"}
         MQ{"मार्टिनिक"}
         MR{"मॉरिटानिया"}
@@ -230,7 +230,7 @@ mr{
         PM{"सेंट पियरे आणि मिक्वेलोन"}
         PN{"पिटकैर्न बेटे"}
         PR{"प्युएर्तो रिको"}
-        PS{"पॅलेस्टिनियन प्रदेश"}
+        PS{"पॅलेस्टाईन"}
         PT{"पोर्तुगाल"}
         PW{"पलाऊ"}
         PY{"पराग्वे"}
@@ -310,9 +310,6 @@ mr{
     }
     CountriesShort{
         GB{"यू.के."}
-        HK{"हाँगकाँग"}
-        MO{"मकाओ"}
-        PS{"पॅलेस्टाईन"}
         US{"यू.एस."}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/ms.txt b/source/data/region/ms.txt
index 8d6a1c9..6915b56 100644
--- a/source/data/region/ms.txt
+++ b/source/data/region/ms.txt
@@ -141,7 +141,7 @@ ms{
         GU{"Guam"}
         GW{"Guinea Bissau"}
         GY{"Guyana"}
-        HK{"Hong Kong SAR China"}
+        HK{"Hong Kong"}
         HM{"Kepulauan Heard & McDonald"}
         HN{"Honduras"}
         HR{"Croatia"}
@@ -195,7 +195,7 @@ ms{
         ML{"Mali"}
         MM{"Myanmar (Burma)"}
         MN{"Mongolia"}
-        MO{"Macau SAR China"}
+        MO{"Macau"}
         MP{"Kepulauan Mariana Utara"}
         MQ{"Martinique"}
         MR{"Mauritania"}
@@ -230,7 +230,7 @@ ms{
         PM{"Saint Pierre dan Miquelon"}
         PN{"Kepulauan Pitcairn"}
         PR{"Puerto Rico"}
-        PS{"Wilayah Palestin"}
+        PS{"Palestin"}
         PT{"Portugal"}
         PW{"Palau"}
         PY{"Paraguay"}
@@ -312,9 +312,6 @@ ms{
     }
     CountriesShort{
         GB{"GB"}
-        HK{"Hong Kong"}
-        MO{"Macau"}
-        PS{"Palestin"}
         US{"A.S"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/my.txt b/source/data/region/my.txt
index 0b0f1e2..e8aef2f 100644
--- a/source/data/region/my.txt
+++ b/source/data/region/my.txt
@@ -140,7 +140,7 @@ my{
         GU{"ဂူအမ်"}
         GW{"ဂီရာနာ-ဘီစ်စာဥ"}
         GY{"ဂူရာနာ"}
-        HK{"တရုတ်၏ အထူးအုပ်ချုပ်ခွင့်ရ ဟောင်ကောင်"}
+        HK{"ဟောင်ကောင်"}
         HM{"ဟတ်ကျွန်းနှင့်မက်ဒေါနယ်ကျွန်းစု"}
         HN{"ဟွန်ဒူးရပ်စ်"}
         HR{"ခရိုအေးရှား"}
@@ -194,7 +194,7 @@ my{
         ML{"မာလီ"}
         MM{"မြန်မာ"}
         MN{"မွန်ဂိုးလီးယား"}
-        MO{"တရုတ်၏ အထူးအုပ်ချုပ်ခွင့်ရ မကာအို"}
+        MO{"မကာအို"}
         MP{"တောင်ပိုင်းမာရီအာနာကျွန်းစု"}
         MQ{"မာတီနီကီ"}
         MR{"မောရီတာနီအာ"}
@@ -229,7 +229,7 @@ my{
         PM{"စိန့်ပီအဲရီနှင့်မီကွီလွန်"}
         PN{"ပစ်တ်ကိန်းကျွန်းစု"}
         PR{"ပေါ်တူရီကို"}
-        PS{"ပါလက်စတိုင်း ပိုင်နက်"}
+        PS{"ပါလက်စတိုင်း"}
         PT{"ပေါ်တူဂီ"}
         PW{"ပလောင်"}
         PY{"ပါရာဂွေး"}
@@ -309,9 +309,6 @@ my{
     }
     CountriesShort{
         GB{"ယူကေ"}
-        HK{"ဟောင်ကောင်"}
-        MO{"မကာအို"}
-        PS{"ပါလက်စတိုင်း"}
         US{"ယူအက်စ်"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/nb.txt b/source/data/region/nb.txt
index a2efe40..a297ede 100644
--- a/source/data/region/nb.txt
+++ b/source/data/region/nb.txt
@@ -141,7 +141,7 @@ nb{
         GU{"Guam"}
         GW{"Guinea-Bissau"}
         GY{"Guyana"}
-        HK{"Hongkong S.A.R. Kina"}
+        HK{"Hongkong"}
         HM{"Heard- og McDonaldøyene"}
         HN{"Honduras"}
         HR{"Kroatia"}
@@ -195,7 +195,7 @@ nb{
         ML{"Mali"}
         MM{"Myanmar (Burma)"}
         MN{"Mongolia"}
-        MO{"Macao S.A.R. Kina"}
+        MO{"Macao"}
         MP{"Nord-Marianene"}
         MQ{"Martinique"}
         MR{"Mauritania"}
@@ -230,7 +230,7 @@ nb{
         PM{"St. Pierre og Miquelon"}
         PN{"Pitcairn"}
         PR{"Puerto Rico"}
-        PS{"Det palestinske området"}
+        PS{"Palestina"}
         PT{"Portugal"}
         PW{"Palau"}
         PY{"Paraguay"}
@@ -310,9 +310,6 @@ nb{
     }
     CountriesShort{
         GB{"Storbritannia"}
-        HK{"Hongkong"}
-        MO{"Macao"}
-        PS{"Palestina"}
         US{"USA"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/ne.txt b/source/data/region/ne.txt
index f790ba2..b1a8674 100644
--- a/source/data/region/ne.txt
+++ b/source/data/region/ne.txt
@@ -141,7 +141,7 @@ ne{
         GU{"गुवाम"}
         GW{"गिनी-बिसाउ"}
         GY{"गुयाना"}
-        HK{"हङकङ चिनिया समाजवादी स्वायत्त क्षेत्र"}
+        HK{"हङकङ"}
         HM{"हर्ड टापु एण्ड म्याकडोनाल्ड टापुहरु"}
         HN{"हन्डुरास"}
         HR{"क्रोएशिया"}
@@ -195,7 +195,7 @@ ne{
         ML{"माली"}
         MM{"म्यान्मार (बर्मा)"}
         MN{"मङ्गोलिया"}
-        MO{"मकावो चिनिँया स्वशासित क्षेत्र"}
+        MO{"मकावो"}
         MP{"उत्तरी मारिआना टापु"}
         MQ{"मार्टिनिक"}
         MR{"माउरिटानिया"}
@@ -230,7 +230,7 @@ ne{
         PM{"सेन्ट पिर्रे र मिक्केलोन"}
         PN{"पिटकाइर्न टापुहरु"}
         PR{"पुएर्टो रिको"}
-        PS{"प्यालेस्टनी भू-भागहरु"}
+        PS{"प्यालेसटाइन"}
         PT{"पोर्चुगल"}
         PW{"पलाउ"}
         PY{"प्याराग्वे"}
@@ -311,9 +311,6 @@ ne{
     }
     CountriesShort{
         GB{"बेलायत"}
-        HK{"हङकङ"}
-        MO{"मकावो"}
-        PS{"प्यालेसटाइन"}
         US{"अमेरिका"}
     }
     Version{"2.1.8.95"}
diff --git a/source/data/region/nl.txt b/source/data/region/nl.txt
index 6cb4aad..e8bb9b3 100644
--- a/source/data/region/nl.txt
+++ b/source/data/region/nl.txt
@@ -141,7 +141,7 @@ nl{
         GU{"Guam"}
         GW{"Guinee-Bissau"}
         GY{"Guyana"}
-        HK{"Hongkong SAR van China"}
+        HK{"Hongkong"}
         HM{"Heard en McDonaldeilanden"}
         HN{"Honduras"}
         HR{"Kroatië"}
@@ -195,7 +195,7 @@ nl{
         ML{"Mali"}
         MM{"Myanmar (Birma)"}
         MN{"Mongolië"}
-        MO{"Macau SAR van China"}
+        MO{"Macau"}
         MP{"Noordelijke Marianen"}
         MQ{"Martinique"}
         MR{"Mauritanië"}
@@ -230,7 +230,7 @@ nl{
         PM{"Saint-Pierre en Miquelon"}
         PN{"Pitcairneilanden"}
         PR{"Puerto Rico"}
-        PS{"Palestijnse gebieden"}
+        PS{"Palestina"}
         PT{"Portugal"}
         PW{"Palau"}
         PY{"Paraguay"}
@@ -310,9 +310,6 @@ nl{
     }
     CountriesShort{
         GB{"VK"}
-        HK{"Hongkong"}
-        MO{"Macau"}
-        PS{"Palestina"}
         US{"VS"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/nn.txt b/source/data/region/nn.txt
index 74e55ad..c3c6553 100644
--- a/source/data/region/nn.txt
+++ b/source/data/region/nn.txt
@@ -139,7 +139,7 @@ nn{
         GU{"Guam"}
         GW{"Guinea-Bissau"}
         GY{"Guyana"}
-        HK{"Hongkong S.A.R. Kina"}
+        HK{"Hongkong"}
         HM{"Heard- og McDonaldsøyane"}
         HN{"Honduras"}
         HR{"Kroatia"}
@@ -193,7 +193,7 @@ nn{
         ML{"Mali"}
         MM{"Myanmar"}
         MN{"Mongolia"}
-        MO{"Macao S.A.R. Kina"}
+        MO{"Macao"}
         MP{"Nord-Marianane"}
         MQ{"Martinique"}
         MR{"Mauritania"}
@@ -297,9 +297,5 @@ nn{
         ZW{"Zimbabwe"}
         ZZ{"ukjent område"}
     }
-    CountriesShort{
-        HK{"Hongkong"}
-        MO{"Macao"}
-    }
     Version{"2.1.7.72"}
 }
diff --git a/source/data/region/pa.txt b/source/data/region/pa.txt
index 1b69569..5c23d21 100644
--- a/source/data/region/pa.txt
+++ b/source/data/region/pa.txt
@@ -140,7 +140,7 @@ pa{
         GU{"ਗੁਆਮ"}
         GW{"ਗਿਨੀ-ਬਿਸਾਉ"}
         GY{"ਗੁਯਾਨਾ"}
-        HK{"ਹਾਂਗ ਕਾਂਗ ਐਸਏਆਰ ਚੀਨ"}
+        HK{"ਹਾਂਗ ਕਾਂਗ"}
         HM{"ਹਰਡ ਤੇ ਮੈਕਡੋਨਾਲਡ ਟਾਪੂ"}
         HN{"ਹੋਂਡੁਰਸ"}
         HR{"ਕਰੋਏਸ਼ੀਆ"}
@@ -194,7 +194,7 @@ pa{
         ML{"ਮਾਲੀ"}
         MM{"ਮਿਆਂਮਾਰ (ਬਰਮਾ)"}
         MN{"ਮੰਗੋਲੀਆ"}
-        MO{"ਮਕਾਉ ਐਸਏਆਰ ਚੀਨ"}
+        MO{"ਮਕਾਉ"}
         MP{"ਉੱਤਰੀ ਮਾਰੀਆਨਾ ਟਾਪੂ"}
         MQ{"ਮਾਰਟੀਨਿਕ"}
         MR{"ਮੋਰਿਟਾਨੀਆ"}
@@ -229,7 +229,7 @@ pa{
         PM{"ਸੈਂਟ ਪੀਅਰੇ ਐਂਡ ਮਿਕੇਲਨ"}
         PN{"ਪਿਟਕੇਰਨ ਟਾਪੂ"}
         PR{"ਪਿਊਰਟੋ ਰਿਕੋ"}
-        PS{"ਫਿਲੀਸਤੀਨੀ ਖੇਤਰ"}
+        PS{"ਫਿਲੀਸਤੀਨ"}
         PT{"ਪੁਰਤਗਾਲ"}
         PW{"ਪਲਾਉ"}
         PY{"ਪੈਰਾਗਵੇ"}
@@ -311,9 +311,6 @@ pa{
     }
     CountriesShort{
         GB{"ਯੂ.ਕੇ."}
-        HK{"ਹਾਂਗ ਕਾਂਗ"}
-        MO{"ਮਕਾਉ"}
-        PS{"ਫਿਲੀਸਤੀਨ"}
         US{"ਯੂ.ਐਸ."}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/pa_Arab_PK.txt b/source/data/region/pa_Arab_PK.txt
index 508a02a..9eabbb8 100644
--- a/source/data/region/pa_Arab_PK.txt
+++ b/source/data/region/pa_Arab_PK.txt
@@ -3,12 +3,10 @@
 // * Copyright (C) 2014 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/icu-locale-deprecates.xml & build.xml
+// * Source File: <path>/common/main/pa_Arab_PK.xml
 // *
 // ***************************************************************************
-/**
- * generated alias target
- */
 pa_Arab_PK{
-    ___{""}
+    %%Parent{"pa_Arab"}
+    Version{"2.1.6.69"}
 }
diff --git a/source/data/region/pl.txt b/source/data/region/pl.txt
index e2c02d7..6a03c29 100644
--- a/source/data/region/pl.txt
+++ b/source/data/region/pl.txt
@@ -141,7 +141,7 @@ pl{
         GU{"Guam"}
         GW{"Gwinea Bissau"}
         GY{"Gujana"}
-        HK{"SRA Hongkong (Chiny)"}
+        HK{"Hongkong"}
         HM{"Wyspy Heard i McDonalda"}
         HN{"Honduras"}
         HR{"Chorwacja"}
@@ -195,7 +195,7 @@ pl{
         ML{"Mali"}
         MM{"Mjanma (Birma)"}
         MN{"Mongolia"}
-        MO{"SRA Makau (Chiny)"}
+        MO{"Makau"}
         MP{"Mariany Północne"}
         MQ{"Martynika"}
         MR{"Mauretania"}
@@ -230,7 +230,7 @@ pl{
         PM{"Saint-Pierre i Miquelon"}
         PN{"Pitcairn"}
         PR{"Portoryko"}
-        PS{"Terytoria Palestyńskie"}
+        PS{"Palestyna"}
         PT{"Portugalia"}
         PW{"Palau"}
         PY{"Paragwaj"}
@@ -310,9 +310,6 @@ pl{
     }
     CountriesShort{
         GB{"GB"}
-        HK{"Hongkong"}
-        MO{"Makau"}
-        PS{"Palestyna"}
         US{"USA"}
     }
     Version{"2.1.8.95"}
diff --git a/source/data/region/pt.txt b/source/data/region/pt.txt
index 28185ee..0fa3e80 100644
--- a/source/data/region/pt.txt
+++ b/source/data/region/pt.txt
@@ -141,7 +141,7 @@ pt{
         GU{"Guam"}
         GW{"Guiné Bissau"}
         GY{"Guiana"}
-        HK{"Hong Kong, RAE da China"}
+        HK{"Hong Kong"}
         HM{"Ilhas Heard e McDonald"}
         HN{"Honduras"}
         HR{"Croácia"}
@@ -195,7 +195,7 @@ pt{
         ML{"Mali"}
         MM{"Mianmar (Birmânia)"}
         MN{"Mongólia"}
-        MO{"Macau, RAE da China"}
+        MO{"Macau"}
         MP{"Ilhas Marianas do Norte"}
         MQ{"Martinica"}
         MR{"Mauritânia"}
@@ -230,7 +230,7 @@ pt{
         PM{"Saint Pierre e Miquelon"}
         PN{"Ilhas Pitcairn"}
         PR{"Porto Rico"}
-        PS{"Territórios palestinos"}
+        PS{"Palestina"}
         PT{"Portugal"}
         PW{"Palau"}
         PY{"Paraguai"}
@@ -311,9 +311,6 @@ pt{
     }
     CountriesShort{
         GB{"Reino Unido"}
-        HK{"Hong Kong"}
-        MO{"Macau"}
-        PS{"Palestina"}
         US{"EUA"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/resfiles.mk b/source/data/region/resfiles.mk
index 78329c0..e36ba5f 100644
--- a/source/data/region/resfiles.mk
+++ b/source/data/region/resfiles.mk
@@ -34,16 +34,15 @@ REGION_SYNTHETIC_ALIAS = az_AZ.txt az_Latn_AZ.txt bs_BA.txt bs_Latn_BA.txt\
  ks_IN.txt ky_Cyrl_KG.txt ky_KG.txt mn_Cyrl_MN.txt mn_MN.txt\
  mo.txt ms_BN.txt ms_Latn_BN.txt ms_Latn_MY.txt ms_Latn_SG.txt\
  ms_MY.txt ms_SG.txt nb_NO.txt nn_NO.txt no.txt\
- no_NO.txt no_NO_NY.txt pa_Arab_PK.txt pa_Guru_IN.txt pa_IN.txt\
- pa_PK.txt ro_MD.txt sh.txt sh_BA.txt sh_CS.txt\
- sh_YU.txt shi_MA.txt shi_Tfng_MA.txt sr_BA.txt sr_CS.txt\
- sr_Cyrl_BA.txt sr_Cyrl_CS.txt sr_Cyrl_RS.txt sr_Cyrl_XK.txt sr_Cyrl_YU.txt\
- sr_Latn_BA.txt sr_Latn_CS.txt sr_Latn_ME.txt sr_Latn_RS.txt sr_Latn_YU.txt\
+ no_NO.txt no_NO_NY.txt pa_Guru_IN.txt pa_IN.txt pa_PK.txt\
+ ro_MD.txt sh.txt sh_BA.txt sh_CS.txt sh_YU.txt\
+ shi_MA.txt sr_BA.txt sr_CS.txt sr_Cyrl_BA.txt sr_Cyrl_CS.txt\
+ sr_Cyrl_RS.txt sr_Cyrl_XK.txt sr_Cyrl_YU.txt sr_Latn_CS.txt sr_Latn_YU.txt\
  sr_ME.txt sr_RS.txt sr_XK.txt sr_YU.txt th_TH.txt\
  th_TH_TRADITIONAL.txt tl.txt tl_PH.txt tzm_Latn_MA.txt tzm_MA.txt\
- ug_Arab_CN.txt ug_CN.txt uz_AF.txt uz_Arab_AF.txt uz_Latn_UZ.txt\
- uz_UZ.txt vai_LR.txt vai_Vaii_LR.txt zh_CN.txt zh_HK.txt\
- zh_Hans_CN.txt zh_Hant_TW.txt zh_MO.txt zh_SG.txt zh_TW.txt
+ ug_Arab_CN.txt ug_CN.txt uz_AF.txt uz_UZ.txt vai_LR.txt\
+ vai_Vaii_LR.txt zh_CN.txt zh_HK.txt zh_Hans_CN.txt zh_MO.txt\
+ zh_SG.txt zh_TW.txt
 
 
 # All aliases (to not be included under 'installed'), but not including root.
@@ -53,71 +52,73 @@ REGION_ALIAS_SOURCE = $(REGION_SYNTHETIC_ALIAS)
 # Ordinary resources
 REGION_SOURCE = af.txt agq.txt ak.txt am.txt\
  ar.txt ar_AE.txt as.txt asa.txt az.txt\
- az_Cyrl.txt az_Latn.txt bas.txt be.txt bem.txt\
- bez.txt bg.txt bm.txt bm_Latn.txt bn.txt\
- bn_IN.txt bo.txt bo_IN.txt br.txt brx.txt\
- bs.txt bs_Cyrl.txt bs_Latn.txt ca.txt cgg.txt\
- chr.txt cs.txt cy.txt da.txt dav.txt\
- de.txt de_CH.txt dje.txt dsb.txt dua.txt\
- dyo.txt dz.txt ebu.txt ee.txt el.txt\
- en.txt en_150.txt en_AG.txt en_AI.txt en_AU.txt\
- en_BB.txt en_BE.txt en_BM.txt en_BS.txt en_BW.txt\
- en_BZ.txt en_CC.txt en_CK.txt en_CM.txt en_CX.txt\
- en_DG.txt en_DM.txt en_ER.txt en_FJ.txt en_FK.txt\
- en_FM.txt en_GB.txt en_GD.txt en_GG.txt en_GH.txt\
- en_GI.txt en_GM.txt en_GY.txt en_HK.txt en_IE.txt\
- en_IM.txt en_IN.txt en_IO.txt en_JE.txt en_JM.txt\
- en_KE.txt en_KI.txt en_KN.txt en_KY.txt en_LC.txt\
- en_LR.txt en_LS.txt en_MG.txt en_MO.txt en_MS.txt\
- en_MT.txt en_MU.txt en_MW.txt en_MY.txt en_NA.txt\
- en_NF.txt en_NG.txt en_NR.txt en_NU.txt en_NZ.txt\
- en_PG.txt en_PH.txt en_PK.txt en_PN.txt en_PW.txt\
- en_RW.txt en_SB.txt en_SC.txt en_SD.txt en_SG.txt\
- en_SH.txt en_SL.txt en_SS.txt en_SX.txt en_SZ.txt\
- en_TC.txt en_TK.txt en_TO.txt en_TT.txt en_TV.txt\
- en_TZ.txt en_UG.txt en_VC.txt en_VG.txt en_VU.txt\
- en_WS.txt en_ZA.txt en_ZM.txt en_ZW.txt eo.txt\
- es.txt es_419.txt es_AR.txt es_BO.txt es_CL.txt\
- es_CO.txt es_CR.txt es_CU.txt es_DO.txt es_EC.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 eu.txt ewo.txt\
- fa.txt fa_AF.txt ff.txt fi.txt fil.txt\
- fo.txt fr.txt fr_CA.txt fur.txt fy.txt\
- ga.txt gd.txt gl.txt gsw.txt gu.txt\
- guz.txt gv.txt ha.txt ha_Latn.txt haw.txt\
- he.txt hi.txt hr.txt hsb.txt hu.txt\
- hy.txt id.txt ig.txt ii.txt is.txt\
- it.txt ja.txt jgo.txt jmc.txt ka.txt\
- kab.txt kam.txt kde.txt kea.txt khq.txt\
- ki.txt kk.txt kk_Cyrl.txt kkj.txt kl.txt\
- kln.txt km.txt kn.txt ko.txt kok.txt\
- ks.txt ks_Arab.txt ksb.txt ksf.txt ksh.txt\
- kw.txt ky.txt ky_Cyrl.txt lag.txt lb.txt\
- lg.txt lkt.txt ln.txt lo.txt lt.txt\
- lu.txt luo.txt luy.txt lv.txt mas.txt\
- mer.txt mfe.txt mg.txt mgh.txt mgo.txt\
- mk.txt ml.txt mn.txt mn_Cyrl.txt mr.txt\
- ms.txt ms_Latn.txt mt.txt mua.txt my.txt\
- naq.txt nb.txt nd.txt ne.txt nl.txt\
- nl_BE.txt nmg.txt nn.txt nnh.txt nus.txt\
- nyn.txt om.txt or.txt os.txt pa.txt\
- pa_Arab.txt pa_Guru.txt pl.txt ps.txt pt.txt\
- pt_AO.txt pt_CV.txt pt_GW.txt pt_MO.txt pt_MZ.txt\
- pt_PT.txt pt_ST.txt pt_TL.txt qu.txt rm.txt\
- rn.txt ro.txt rof.txt ru.txt rw.txt\
- rwk.txt sah.txt saq.txt sbp.txt se.txt\
- se_FI.txt seh.txt ses.txt sg.txt shi.txt\
- shi_Latn.txt shi_Tfng.txt si.txt sk.txt sl.txt\
- smn.txt sn.txt so.txt sq.txt sr.txt\
- sr_Cyrl.txt sr_Latn.txt sv.txt sv_FI.txt sw.txt\
- swc.txt ta.txt te.txt teo.txt th.txt\
- ti.txt to.txt tr.txt twq.txt tzm.txt\
- tzm_Latn.txt ug.txt ug_Arab.txt uk.txt ur.txt\
- ur_IN.txt uz.txt uz_Arab.txt uz_Cyrl.txt uz_Latn.txt\
- vai.txt vai_Latn.txt vai_Vaii.txt vi.txt vun.txt\
- wae.txt xog.txt yav.txt yi.txt yo.txt\
- yo_BJ.txt zgh.txt zh.txt zh_Hans.txt zh_Hans_HK.txt\
- zh_Hans_MO.txt zh_Hans_SG.txt zh_Hant.txt zh_Hant_HK.txt zh_Hant_MO.txt\
+ az_Cyrl.txt az_Cyrl_AZ.txt az_Latn.txt bas.txt be.txt\
+ bem.txt bez.txt bg.txt bm.txt bm_Latn.txt\
+ bn.txt bn_IN.txt bo.txt bo_IN.txt br.txt\
+ brx.txt bs.txt bs_Cyrl.txt bs_Latn.txt ca.txt\
+ cgg.txt chr.txt cs.txt cy.txt da.txt\
+ dav.txt de.txt de_CH.txt dje.txt dsb.txt\
+ dua.txt dyo.txt dz.txt ebu.txt ee.txt\
+ el.txt en.txt en_150.txt en_AG.txt en_AI.txt\
+ en_AU.txt en_BB.txt en_BE.txt en_BM.txt en_BS.txt\
+ en_BW.txt en_BZ.txt en_CC.txt en_CK.txt en_CM.txt\
+ en_CX.txt en_DG.txt en_DM.txt en_ER.txt en_FJ.txt\
+ en_FK.txt en_FM.txt en_GB.txt en_GD.txt en_GG.txt\
+ en_GH.txt en_GI.txt en_GM.txt en_GY.txt en_HK.txt\
+ en_IE.txt en_IM.txt en_IN.txt en_IO.txt en_JE.txt\
+ en_JM.txt en_KE.txt en_KI.txt en_KN.txt en_KY.txt\
+ en_LC.txt en_LR.txt en_LS.txt en_MG.txt en_MO.txt\
+ en_MS.txt en_MT.txt en_MU.txt en_MW.txt en_MY.txt\
+ en_NA.txt en_NF.txt en_NG.txt en_NR.txt en_NU.txt\
+ en_NZ.txt en_PG.txt en_PH.txt en_PK.txt en_PN.txt\
+ en_PW.txt en_RW.txt en_SB.txt en_SC.txt en_SD.txt\
+ en_SG.txt en_SH.txt en_SL.txt en_SS.txt en_SX.txt\
+ en_SZ.txt en_TC.txt en_TK.txt en_TO.txt en_TT.txt\
+ en_TV.txt en_TZ.txt en_UG.txt en_VC.txt en_VG.txt\
+ en_VU.txt en_WS.txt en_ZA.txt en_ZM.txt en_ZW.txt\
+ eo.txt es.txt es_419.txt es_AR.txt es_BO.txt\
+ es_CL.txt es_CO.txt es_CR.txt es_CU.txt es_DO.txt\
+ es_EC.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 eu.txt\
+ ewo.txt fa.txt fa_AF.txt ff.txt fi.txt\
+ fil.txt fo.txt fr.txt fr_CA.txt fur.txt\
+ fy.txt ga.txt gd.txt gl.txt gsw.txt\
+ gu.txt guz.txt gv.txt ha.txt ha_Latn.txt\
+ haw.txt he.txt hi.txt hr.txt hsb.txt\
+ hu.txt hy.txt id.txt ig.txt ii.txt\
+ is.txt it.txt ja.txt jgo.txt jmc.txt\
+ ka.txt kab.txt kam.txt kde.txt kea.txt\
+ khq.txt ki.txt kk.txt kk_Cyrl.txt kkj.txt\
+ kl.txt kln.txt km.txt kn.txt ko.txt\
+ kok.txt ks.txt ks_Arab.txt ksb.txt ksf.txt\
+ ksh.txt kw.txt ky.txt ky_Cyrl.txt lag.txt\
+ lb.txt lg.txt lkt.txt ln.txt lo.txt\
+ lt.txt lu.txt luo.txt luy.txt lv.txt\
+ mas.txt mer.txt mfe.txt mg.txt mgh.txt\
+ mgo.txt mk.txt ml.txt mn.txt mn_Cyrl.txt\
+ mr.txt ms.txt ms_Latn.txt mt.txt mua.txt\
+ my.txt naq.txt nb.txt nd.txt ne.txt\
+ nl.txt nl_BE.txt nmg.txt nn.txt nnh.txt\
+ nus.txt nyn.txt om.txt or.txt os.txt\
+ pa.txt pa_Arab.txt pa_Arab_PK.txt pa_Guru.txt pl.txt\
+ ps.txt pt.txt pt_AO.txt pt_CV.txt pt_GW.txt\
+ pt_MO.txt pt_MZ.txt pt_PT.txt pt_ST.txt pt_TL.txt\
+ qu.txt rm.txt rn.txt ro.txt rof.txt\
+ ru.txt rw.txt rwk.txt sah.txt saq.txt\
+ sbp.txt se.txt se_FI.txt seh.txt ses.txt\
+ sg.txt shi.txt shi_Latn.txt shi_Tfng.txt shi_Tfng_MA.txt\
+ si.txt sk.txt sl.txt smn.txt sn.txt\
+ so.txt sq.txt sr.txt sr_Cyrl.txt sr_Latn.txt\
+ sr_Latn_BA.txt sr_Latn_ME.txt sr_Latn_RS.txt sv.txt sv_FI.txt\
+ sw.txt swc.txt ta.txt te.txt teo.txt\
+ th.txt ti.txt to.txt tr.txt twq.txt\
+ tzm.txt tzm_Latn.txt ug.txt ug_Arab.txt uk.txt\
+ ur.txt ur_IN.txt uz.txt uz_Arab.txt uz_Arab_AF.txt\
+ uz_Cyrl.txt uz_Latn.txt uz_Latn_UZ.txt vai.txt vai_Latn.txt\
+ vai_Latn_LR.txt vai_Vaii.txt vi.txt vun.txt wae.txt\
+ xog.txt yav.txt yi.txt yo.txt yo_BJ.txt\
+ zgh.txt zh.txt zh_Hans.txt zh_Hans_HK.txt zh_Hans_MO.txt\
+ zh_Hans_SG.txt zh_Hant.txt zh_Hant_HK.txt zh_Hant_MO.txt zh_Hant_TW.txt\
  zu.txt
 
diff --git a/source/data/region/ro.txt b/source/data/region/ro.txt
index c8f2e6d..7b92d7d 100644
--- a/source/data/region/ro.txt
+++ b/source/data/region/ro.txt
@@ -141,7 +141,7 @@ ro{
         GU{"Guam"}
         GW{"Guineea-Bissau"}
         GY{"Guyana"}
-        HK{"R.A.S. Hong Kong a Chinei"}
+        HK{"Hong Kong"}
         HM{"Insula Heard și Insulele McDonald"}
         HN{"Honduras"}
         HR{"Croația"}
@@ -195,7 +195,7 @@ ro{
         ML{"Mali"}
         MM{"Myanmar (Birmania)"}
         MN{"Mongolia"}
-        MO{"R.A.S. Macao a Chinei"}
+        MO{"Macao"}
         MP{"Insulele Mariane de Nord"}
         MQ{"Martinica"}
         MR{"Mauritania"}
@@ -230,7 +230,7 @@ ro{
         PM{"Saint-Pierre și Miquelon"}
         PN{"Insulele Pitcairn"}
         PR{"Puerto Rico"}
-        PS{"Teritoriile Palestiniene"}
+        PS{"Palestina"}
         PT{"Portugalia"}
         PW{"Palau"}
         PY{"Paraguay"}
@@ -311,9 +311,6 @@ ro{
     }
     CountriesShort{
         GB{"Regatul Unit"}
-        HK{"Hong Kong"}
-        MO{"Macao"}
-        PS{"Palestina"}
         US{"S.U.A."}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/ru.txt b/source/data/region/ru.txt
index 17915a0..fe5f98c 100644
--- a/source/data/region/ru.txt
+++ b/source/data/region/ru.txt
@@ -141,7 +141,7 @@ ru{
         GU{"Гуам"}
         GW{"Гвинея-Бисау"}
         GY{"Гайана"}
-        HK{"Гонконг (особый район)"}
+        HK{"Гонконг"}
         HM{"о-ва Херд и Макдональд"}
         HN{"Гондурас"}
         HR{"Хорватия"}
@@ -195,7 +195,7 @@ ru{
         ML{"Мали"}
         MM{"Мьянма (Бирма)"}
         MN{"Монголия"}
-        MO{"Макао (особый район)"}
+        MO{"Макао"}
         MP{"Северные Марианские о-ва"}
         MQ{"Мартиника"}
         MR{"Мавритания"}
@@ -230,7 +230,7 @@ ru{
         PM{"Сен-Пьер и Микелон"}
         PN{"Питкэрн"}
         PR{"Пуэрто-Рико"}
-        PS{"Палестинские территории"}
+        PS{"Палестина"}
         PT{"Португалия"}
         PW{"Палау"}
         PY{"Парагвай"}
@@ -311,9 +311,6 @@ ru{
     }
     CountriesShort{
         GB{"Британия"}
-        HK{"Гонконг"}
-        MO{"Макао"}
-        PS{"Палестина"}
         US{"США"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/se.txt b/source/data/region/se.txt
index 55598cb..86c2eee 100644
--- a/source/data/region/se.txt
+++ b/source/data/region/se.txt
@@ -298,9 +298,6 @@ se{
     }
     CountriesShort{
         GB{"Stuorra-Británnia"}
-        HK{"Hongkong"}
-        MO{"Makáo"}
-        PS{"Palestina"}
         US{"USA"}
     }
     Version{"2.1.7.53"}
diff --git a/source/data/region/shi_Tfng_MA.txt b/source/data/region/shi_Tfng_MA.txt
index 729e805..87d9d8f 100755
--- a/source/data/region/shi_Tfng_MA.txt
+++ b/source/data/region/shi_Tfng_MA.txt
@@ -3,12 +3,10 @@
 // * Copyright (C) 2014 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/icu-locale-deprecates.xml & build.xml
+// * Source File: <path>/common/main/shi_Tfng_MA.xml
 // *
 // ***************************************************************************
-/**
- * generated alias target
- */
 shi_Tfng_MA{
-    ___{""}
+    %%Parent{"shi_Tfng"}
+    Version{"2.1.6.69"}
 }
diff --git a/source/data/region/si.txt b/source/data/region/si.txt
index c5cf4e2..e59f8bb 100644
--- a/source/data/region/si.txt
+++ b/source/data/region/si.txt
@@ -141,7 +141,7 @@ si{
         GU{"ගුවාම්"}
         GW{"ගිනි බිසව්"}
         GY{"ගයනාව"}
-        HK{"හොංකොං චීන විශේෂ පරිපාලන කලාපය"}
+        HK{"හොංකොං"}
         HM{"හර්ඩ් දූපත සහ මැක්ඩොනල්ඩ් දූපත්"}
         HN{"හොන්ඩුරාස්"}
         HR{"ක්‍රොඒෂියාව"}
@@ -195,7 +195,7 @@ si{
         ML{"මාලි"}
         MM{"මියන්මාරය (බුරුමය)"}
         MN{"මොන්ගෝලියාව"}
-        MO{"මකාවු චීන විශේෂ පරිපාලන කලාපය"}
+        MO{"මකාවු"}
         MP{"උතුරු මරියානා දූපත්"}
         MQ{"මර්ටිනික්"}
         MR{"මොරිටේනියාව"}
@@ -230,7 +230,7 @@ si{
         PM{"ශාන්ත පියරේ සහ මැකෝලන්"}
         PN{"පිට්කෙය්න් දූපත්"}
         PR{"පුවර්ටෝ රිකෝ"}
-        PS{"පලස්තීන රාජ්‍යය"}
+        PS{"පලස්තීනය"}
         PT{"පෘතුගාලය"}
         PW{"පලාවු"}
         PY{"පැරගුවේ"}
@@ -312,9 +312,6 @@ si{
     }
     CountriesShort{
         GB{"එ.රා"}
-        HK{"හොංකොං"}
-        MO{"මකාවු"}
-        PS{"පලස්තීනය"}
         US{"එ.ජ"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/sk.txt b/source/data/region/sk.txt
index afa4027..c621a2b 100644
--- a/source/data/region/sk.txt
+++ b/source/data/region/sk.txt
@@ -141,7 +141,7 @@ sk{
         GU{"Guam"}
         GW{"Guinea-Bissau"}
         GY{"Guayana"}
-        HK{"Hongkong – OAO Číny"}
+        HK{"Hongkong"}
         HM{"Heardov ostrov a McDonaldove ostrovy"}
         HN{"Honduras"}
         HR{"Chorvátsko"}
@@ -195,7 +195,7 @@ sk{
         ML{"Mali"}
         MM{"Mjanmarsko"}
         MN{"Mongolsko"}
-        MO{"Macao – OAO Číny"}
+        MO{"Macao"}
         MP{"Severné Mariány"}
         MQ{"Martinik"}
         MR{"Mauritánia"}
@@ -230,7 +230,7 @@ sk{
         PM{"Saint Pierre a Miquelon"}
         PN{"Pitcairnove ostrovy"}
         PR{"Portoriko"}
-        PS{"Palestínske územia"}
+        PS{"Palestína"}
         PT{"Portugalsko"}
         PW{"Palau"}
         PY{"Paraguaj"}
@@ -310,9 +310,6 @@ sk{
     }
     CountriesShort{
         GB{"UK"}
-        HK{"Hongkong"}
-        MO{"Macao"}
-        PS{"Palestína"}
         US{"USA"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/sl.txt b/source/data/region/sl.txt
index 49be992..af4d412 100644
--- a/source/data/region/sl.txt
+++ b/source/data/region/sl.txt
@@ -141,7 +141,7 @@ sl{
         GU{"Guam"}
         GW{"Gvineja Bissau"}
         GY{"Gvajana"}
-        HK{"Posebno administrativno območje LR Kitajske Hong Kong"}
+        HK{"Hongkong"}
         HM{"Heardov otok in McDonaldovi otoki"}
         HN{"Honduras"}
         HR{"Hrvaška"}
@@ -195,7 +195,7 @@ sl{
         ML{"Mali"}
         MM{"Mjanmar (Burma)"}
         MN{"Mongolija"}
-        MO{"Posebno administrativno območje LR Kitajske Macao"}
+        MO{"Macao"}
         MP{"Severni Marianski otoki"}
         MQ{"Martinik"}
         MR{"Mavretanija"}
@@ -230,7 +230,7 @@ sl{
         PM{"Saint Pierre in Miquelon"}
         PN{"Pitcairn"}
         PR{"Portoriko"}
-        PS{"Palestinsko ozemlje"}
+        PS{"Palestina"}
         PT{"Portugalska"}
         PW{"Palau"}
         PY{"Paragvaj"}
@@ -310,9 +310,6 @@ sl{
     }
     CountriesShort{
         GB{"ZK"}
-        HK{"Hongkong"}
-        MO{"Macao"}
-        PS{"Palestina"}
         US{"ZDA"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/sq.txt b/source/data/region/sq.txt
index 49d6607..9773c6c 100644
--- a/source/data/region/sq.txt
+++ b/source/data/region/sq.txt
@@ -140,7 +140,7 @@ sq{
         GU{"Guam"}
         GW{"Guine-Bisau"}
         GY{"Guajanë"}
-        HK{"RVAK i Hong Kongut"}
+        HK{"Hong Kong"}
         HM{"Ishulli Hërd dhe Ishujt Mekdonald"}
         HN{"Honduras"}
         HR{"Kroaci"}
@@ -194,7 +194,7 @@ sq{
         ML{"Mali"}
         MM{"Mianmar (Burma)"}
         MN{"Mongoli"}
-        MO{"RVAK i Makaos"}
+        MO{"Makao"}
         MP{"Ishujt e Marianës Veriore"}
         MQ{"Martinik"}
         MR{"Mauritani"}
@@ -229,7 +229,7 @@ sq{
         PM{"Shën Peir dhe Mikuelon"}
         PN{"Ishujt Pitkernë"}
         PR{"Porto Riko"}
-        PS{"Territoret Palestineze"}
+        PS{"Palestinë"}
         PT{"Portugali"}
         PW{"Palau"}
         PY{"Paraguai"}
@@ -309,9 +309,6 @@ sq{
     }
     CountriesShort{
         GB{"Mbretëria e Bashkuar"}
-        HK{"Hong Kong"}
-        MO{"Makao"}
-        PS{"Palestinë"}
         US{"SHBA"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/sr.txt b/source/data/region/sr.txt
index 9e3e6df..955defb 100644
--- a/source/data/region/sr.txt
+++ b/source/data/region/sr.txt
@@ -141,7 +141,7 @@ sr{
         GU{"Гуам"}
         GW{"Гвинеја-Бисао"}
         GY{"Гвајана"}
-        HK{"Хонг Конг С. А. Р. Кина"}
+        HK{"Хонг Конг"}
         HM{"Острва Херд и Мекдоналд"}
         HN{"Хондурас"}
         HR{"Хрватска"}
@@ -195,7 +195,7 @@ sr{
         ML{"Мали"}
         MM{"Мијанмар (Бурма)"}
         MN{"Монголија"}
-        MO{"САР Макао (Кина)"}
+        MO{"Макао"}
         MP{"Северна Маријанска Острва"}
         MQ{"Мартиник"}
         MR{"Мауританија"}
@@ -230,7 +230,7 @@ sr{
         PM{"Сен Пјер и Микелон"}
         PN{"Питкерн"}
         PR{"Порторико"}
-        PS{"Палестинске територије"}
+        PS{"Палестина"}
         PT{"Португал"}
         PW{"Палау"}
         PY{"Парагвај"}
@@ -310,9 +310,6 @@ sr{
     }
     CountriesShort{
         GB{"УК"}
-        HK{"Хонг Конг"}
-        MO{"Макао"}
-        PS{"Палестина"}
         US{"САД"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/sr_Latn.txt b/source/data/region/sr_Latn.txt
index 9f29436..e7efa07 100644
--- a/source/data/region/sr_Latn.txt
+++ b/source/data/region/sr_Latn.txt
@@ -142,7 +142,7 @@ sr_Latn{
         GU{"Guam"}
         GW{"Gvineja-Bisao"}
         GY{"Gvajana"}
-        HK{"Hong Kong S. A. R. Kina"}
+        HK{"Hong Kong"}
         HM{"Ostrva Herd i Mekdonald"}
         HN{"Honduras"}
         HR{"Hrvatska"}
@@ -196,7 +196,7 @@ sr_Latn{
         ML{"Mali"}
         MM{"Mijanmar (Burma)"}
         MN{"Mongolija"}
-        MO{"SAR Makao (Kina)"}
+        MO{"Makao"}
         MP{"Severna Marijanska Ostrva"}
         MQ{"Martinik"}
         MR{"Mauritanija"}
@@ -231,7 +231,7 @@ sr_Latn{
         PM{"Sen Pjer i Mikelon"}
         PN{"Pitkern"}
         PR{"Portoriko"}
-        PS{"Palestinske teritorije"}
+        PS{"Palestina"}
         PT{"Portugal"}
         PW{"Palau"}
         PY{"Paragvaj"}
@@ -311,9 +311,6 @@ sr_Latn{
     }
     CountriesShort{
         GB{"UK"}
-        HK{"Hong Kong"}
-        MO{"Makao"}
-        PS{"Palestina"}
         US{"SAD"}
     }
     Version{"2.1.8.20"}
diff --git a/source/data/region/sr_Latn_BA.txt b/source/data/region/sr_Latn_BA.txt
index fcc337c..61e502c 100644
--- a/source/data/region/sr_Latn_BA.txt
+++ b/source/data/region/sr_Latn_BA.txt
@@ -3,12 +3,10 @@
 // * Copyright (C) 2014 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/icu-locale-deprecates.xml & build.xml
+// * Source File: <path>/common/main/sr_Latn_BA.xml
 // *
 // ***************************************************************************
-/**
- * generated alias target
- */
 sr_Latn_BA{
-    ___{""}
+    %%Parent{"sr_Latn"}
+    Version{"2.1.8.20"}
 }
diff --git a/source/data/region/sr_Latn_ME.txt b/source/data/region/sr_Latn_ME.txt
index 4887740..ddbcd9c 100755
--- a/source/data/region/sr_Latn_ME.txt
+++ b/source/data/region/sr_Latn_ME.txt
@@ -3,12 +3,10 @@
 // * Copyright (C) 2014 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/icu-locale-deprecates.xml & build.xml
+// * Source File: <path>/common/main/sr_Latn_ME.xml
 // *
 // ***************************************************************************
-/**
- * generated alias target
- */
 sr_Latn_ME{
-    ___{""}
+    %%Parent{"sr_Latn"}
+    Version{"2.1.8.20"}
 }
diff --git a/source/data/region/sr_Latn_RS.txt b/source/data/region/sr_Latn_RS.txt
index c5ee86b..14725d1 100644
--- a/source/data/region/sr_Latn_RS.txt
+++ b/source/data/region/sr_Latn_RS.txt
@@ -3,12 +3,10 @@
 // * Copyright (C) 2014 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/icu-locale-deprecates.xml & build.xml
+// * Source File: <path>/common/main/sr_Latn_RS.xml
 // *
 // ***************************************************************************
-/**
- * generated alias target
- */
 sr_Latn_RS{
-    ___{""}
+    %%Parent{"sr_Latn"}
+    Version{"2.1.6.69"}
 }
diff --git a/source/data/region/sv.txt b/source/data/region/sv.txt
index 960e0cb..5a69f85 100644
--- a/source/data/region/sv.txt
+++ b/source/data/region/sv.txt
@@ -141,7 +141,7 @@ sv{
         GU{"Guam"}
         GW{"Guinea-Bissau"}
         GY{"Guyana"}
-        HK{"Hongkong (S.A.R. Kina)"}
+        HK{"Hongkong"}
         HM{"Heardön och McDonaldöarna"}
         HN{"Honduras"}
         HR{"Kroatien"}
@@ -195,7 +195,7 @@ sv{
         ML{"Mali"}
         MM{"Myanmar (Burma)"}
         MN{"Mongoliet"}
-        MO{"Macao (S.A.R. Kina)"}
+        MO{"Macao"}
         MP{"Nordmarianerna"}
         MQ{"Martinique"}
         MR{"Mauretanien"}
@@ -230,7 +230,7 @@ sv{
         PM{"S:t Pierre och Miquelon"}
         PN{"Pitcairnöarna"}
         PR{"Puerto Rico"}
-        PS{"Palestinska territorierna"}
+        PS{"Palestina"}
         PT{"Portugal"}
         PW{"Palau"}
         PY{"Paraguay"}
@@ -310,9 +310,6 @@ sv{
     }
     CountriesShort{
         GB{"Storbritannien"}
-        HK{"Hongkong"}
-        MO{"Macao"}
-        PS{"Palestina"}
         US{"USA"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/sw.txt b/source/data/region/sw.txt
index d1ecb7a..96d0b92 100644
--- a/source/data/region/sw.txt
+++ b/source/data/region/sw.txt
@@ -141,7 +141,7 @@ sw{
         GU{"Gwam"}
         GW{"Ginebisau"}
         GY{"Guyana"}
-        HK{"Hong Kong SAR China"}
+        HK{"Hong Kong"}
         HM{"Kisiwa cha Heard na Visiwa vya McDonald"}
         HN{"Hondurasi"}
         HR{"Korasia"}
@@ -195,7 +195,7 @@ sw{
         ML{"Mali"}
         MM{"Myanmar (Burma)"}
         MN{"Mongolia"}
-        MO{"Macau SAR China"}
+        MO{"Macau"}
         MP{"Visiwa vya Mariana vya Kaskazini"}
         MQ{"Martiniki"}
         MR{"Moritania"}
@@ -230,7 +230,7 @@ sw{
         PM{"Santapieri na Mikeloni"}
         PN{"Pitkairni"}
         PR{"Pwetoriko"}
-        PS{"Maeneo ya Palestina"}
+        PS{"Palestina"}
         PT{"Ureno"}
         PW{"Palau"}
         PY{"Paragwai"}
@@ -310,9 +310,6 @@ sw{
     }
     CountriesShort{
         GB{"Uingereza"}
-        HK{"Hong Kong"}
-        MO{"Macau"}
-        PS{"Palestina"}
         US{"US"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/ta.txt b/source/data/region/ta.txt
index 3af113b..7332493 100644
--- a/source/data/region/ta.txt
+++ b/source/data/region/ta.txt
@@ -141,7 +141,7 @@ ta{
         GU{"குவாம்"}
         GW{"கினி-பிஸ்ஸாவ்"}
         GY{"கயானா"}
-        HK{"ஹாங்காங் எஸ்ஏஆர் சீனா"}
+        HK{"ஹாங்காங்"}
         HM{"ஹேர்ட் மற்றும் மெக்டொனால்டு தீவுகள்"}
         HN{"ஹோண்டூராஸ்"}
         HR{"குரோசியா"}
@@ -195,7 +195,7 @@ ta{
         ML{"மாலி"}
         MM{"மியான்மார் (பர்மா)"}
         MN{"மங்கோலியா"}
-        MO{"மகாவோ எஸ்ஏஆர் சீனா"}
+        MO{"மகாவோ"}
         MP{"வடக்கு மரியானா தீவுகள்"}
         MQ{"மார்டினிக்"}
         MR{"மௌரிடானியா"}
@@ -230,7 +230,7 @@ ta{
         PM{"செயின்ட் பியர் மற்றும் மிக்வேலான்"}
         PN{"பிட்கெய்ர்ன் தீவுகள்"}
         PR{"பியூர்டோ ரிகோ"}
-        PS{"பாலஸ்தீனிய பிரதேசங்கள்"}
+        PS{"பாலஸ்தீனம்"}
         PT{"போர்ச்சுக்கல்"}
         PW{"பாலோ"}
         PY{"பராகுவே"}
@@ -312,9 +312,6 @@ ta{
     }
     CountriesShort{
         GB{"யூ.கே."}
-        HK{"ஹாங்காங்"}
-        MO{"மகாவோ"}
-        PS{"பாலஸ்தீனம்"}
         US{"யூஎஸ்"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/te.txt b/source/data/region/te.txt
index 9ad059b..c28adc2 100644
--- a/source/data/region/te.txt
+++ b/source/data/region/te.txt
@@ -141,7 +141,7 @@ te{
         GU{"గ్వామ్"}
         GW{"గినియా-బిస్సావ్"}
         GY{"గయానా"}
-        HK{"హాంకాంగ్ ఎస్ఏఆర్ చైనా"}
+        HK{"హాంకాంగ్"}
         HM{"హెర్డ్ & మెక్ డొనాల్డ్ దీవులు"}
         HN{"హోండురాస్"}
         HR{"క్రోయేషియా"}
@@ -195,7 +195,7 @@ te{
         ML{"మాలి"}
         MM{"మయన్మార్ (బర్మా)"}
         MN{"మంగోలియా"}
-        MO{"మాకావ్ ఎస్ఏఆర్ చైనా"}
+        MO{"మకావు"}
         MP{"ఉత్తర మరియానా దీవులు"}
         MQ{"మార్టినిక్"}
         MR{"మౌరిటేనియా"}
@@ -230,7 +230,7 @@ te{
         PM{"సెంట్ పియెర్ మరియు మికెలాన్"}
         PN{"పిట్‌కెయిర్న్ దీవులు"}
         PR{"ఫ్యూర్టో రికో"}
-        PS{"పాలస్తీనియన్ ప్రాంతాలు"}
+        PS{"పాలస్తీనా"}
         PT{"పోర్చుగల్"}
         PW{"పలావు"}
         PY{"పరాగ్వే"}
@@ -311,9 +311,6 @@ te{
     }
     CountriesShort{
         GB{"యు.కె."}
-        HK{"హాంకాంగ్"}
-        MO{"మకావు"}
-        PS{"పాలస్తీనా"}
         US{"యు.ఎస్."}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/th.txt b/source/data/region/th.txt
index 00aad78..52bd41a 100644
--- a/source/data/region/th.txt
+++ b/source/data/region/th.txt
@@ -141,7 +141,7 @@ th{
         GU{"กวม"}
         GW{"กินี-บิสเซา"}
         GY{"กายอานา"}
-        HK{"เขตปกครองพิเศษฮ่องกงแห่งสาธารณรัฐประชาชนจีน"}
+        HK{"ฮ่องกง"}
         HM{"เกาะเฮิร์ดและหมู่เกาะแมกดอนัลด์"}
         HN{"ฮอนดูรัส"}
         HR{"โครเอเชีย"}
@@ -195,7 +195,7 @@ th{
         ML{"มาลี"}
         MM{"เมียนม่าร์ (พม่า)"}
         MN{"มองโกเลีย"}
-        MO{"เขตปกครองพิเศษมาเก๊าแห่งสาธารณรัฐประชาชนจีน"}
+        MO{"มาเก๊า"}
         MP{"หมู่เกาะนอร์เทิร์นมาเรียนา"}
         MQ{"มาร์ตินีก"}
         MR{"มอริเตเนีย"}
@@ -230,7 +230,7 @@ th{
         PM{"แซงปีแยร์และมีเกอลง"}
         PN{"หมู่เกาะพิตแคร์น"}
         PR{"เปอร์โตริโก"}
-        PS{"ดินแดนปาเลสไตน์"}
+        PS{"ปาเลสไตน์"}
         PT{"โปรตุเกส"}
         PW{"ปาเลา"}
         PY{"ปารากวัย"}
@@ -311,9 +311,6 @@ th{
     }
     CountriesShort{
         GB{"อังกฤษ"}
-        HK{"ฮ่องกง"}
-        MO{"มาเก๊า"}
-        PS{"ปาเลสไตน์"}
         US{"สหรัฐฯ"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/to.txt b/source/data/region/to.txt
index a10be26..f306023 100755
--- a/source/data/region/to.txt
+++ b/source/data/region/to.txt
@@ -141,7 +141,7 @@ to{
         GU{"Kuamu"}
         GW{"Kini-Pisau"}
         GY{"Kuiana"}
-        HK{"Hongi Kongi SAR Siaina"}
+        HK{"Hongi Kongi"}
         HM{"ʻOtumotu Heati mo Makitonali"}
         HN{"Honitulasi"}
         HR{"Kuloisia"}
@@ -195,7 +195,7 @@ to{
         ML{"Māli"}
         MM{"Pema"}
         MN{"Mongokōlia"}
-        MO{"Makau SAR Siaina"}
+        MO{"Makau"}
         MP{"ʻOtumotu Maliana tokelau"}
         MQ{"Māteniki"}
         MR{"Maulitenia"}
@@ -230,7 +230,7 @@ to{
         PM{"Sā Piea mo Mikeloni"}
         PN{"ʻOtumotu Pitikeni"}
         PR{"Pueto Liko"}
-        PS{"Potu Palesitaine"}
+        PS{"Palesitaine"}
         PT{"Potukali"}
         PW{"Palau"}
         PY{"Palakuai"}
@@ -309,9 +309,6 @@ to{
     }
     CountriesShort{
         GB{"Pilitānia"}
-        HK{"Hongi Kongi"}
-        MO{"Makau"}
-        PS{"Palesitaine"}
         US{"ʻAmelika"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/tr.txt b/source/data/region/tr.txt
index b0a29be..e2868f0 100644
--- a/source/data/region/tr.txt
+++ b/source/data/region/tr.txt
@@ -141,7 +141,7 @@ tr{
         GU{"Guam"}
         GW{"Gine-Bissau"}
         GY{"Guyana"}
-        HK{"Çin Hong Kong ÖYB"}
+        HK{"Hong Kong"}
         HM{"Heard Adası ve McDonald Adaları"}
         HN{"Honduras"}
         HR{"Hırvatistan"}
@@ -195,7 +195,7 @@ tr{
         ML{"Mali"}
         MM{"Myanmar (Burma)"}
         MN{"Moğolistan"}
-        MO{"Çin Makao ÖYB"}
+        MO{"Makao"}
         MP{"Kuzey Mariana Adaları"}
         MQ{"Martinik"}
         MR{"Moritanya"}
@@ -230,7 +230,7 @@ tr{
         PM{"Saint Pierre ve Miquelon"}
         PN{"Pitcairn Adaları"}
         PR{"Porto Riko"}
-        PS{"Filistin Bölgeleri"}
+        PS{"Filistin"}
         PT{"Portekiz"}
         PW{"Palau"}
         PY{"Paraguay"}
@@ -311,9 +311,6 @@ tr{
     }
     CountriesShort{
         GB{"BK"}
-        HK{"Hong Kong"}
-        MO{"Makao"}
-        PS{"Filistin"}
         US{"ABD"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/ug.txt b/source/data/region/ug.txt
index f424499..3c07682 100755
--- a/source/data/region/ug.txt
+++ b/source/data/region/ug.txt
@@ -140,7 +140,7 @@ ug{
         GU{"گۇئام"}
         GW{"گىۋىنېيە-بىسسائۇ"}
         GY{"گىۋىيانا"}
-        HK{"شياڭگاڭ ئالاھىدە مەمۇرىي رايونى (جۇڭگو)"}
+        HK{"شياڭگاڭ"}
         HM{"خېرد ۋە ماك-دونالد ئارىلى"}
         HN{"ھوندۇراس"}
         HR{"كىرودىيە"}
@@ -194,7 +194,7 @@ ug{
         ML{"مالى"}
         MM{"بىرما"}
         MN{"موڭغۇلىيە"}
-        MO{"ئاۋمېن ئالاھىدە مەمۇرىي رايونى (جۇڭگو)"}
+        MO{"ئاۋمېن"}
         MP{"شىمالىي مارىيانا ئاراللىرى"}
         MQ{"مارتىنىكا"}
         MR{"ماۋرىتانىيە"}
@@ -229,7 +229,7 @@ ug{
         PM{"ساينىت-پىئېر ۋە مىكېلون ئاراللىرى"}
         PN{"پىتكاير ئاراللىرى"}
         PR{"پۇئېرتو-رىكو"}
-        PS{"پەلەستىن زېمىنى"}
+        PS{"پەلەستىن"}
         PT{"پورتۇگالىيە"}
         PW{"پالاۋ"}
         PY{"پاراگۋاي"}
@@ -310,9 +310,6 @@ ug{
     }
     CountriesShort{
         GB{"ئەنگلىيە"}
-        HK{"شياڭگاڭ"}
-        MO{"ئاۋمېن"}
-        PS{"پەلەستىن"}
         US{"ئا ق ش"}
     }
     Version{"2.1.7.39"}
diff --git a/source/data/region/uk.txt b/source/data/region/uk.txt
index 5307314..7cae37b 100644
--- a/source/data/region/uk.txt
+++ b/source/data/region/uk.txt
@@ -119,7 +119,7 @@ uk{
         FI{"Фінляндія"}
         FJ{"Фіджі"}
         FK{"Фолклендські острови"}
-        FM{"Мікронезія"}
+        FM{"Мікронезія Федеративні Штати"}
         FO{"Фарерські острови"}
         FR{"Франція"}
         GA{"Габон"}
@@ -141,7 +141,7 @@ uk{
         GU{"Гуам"}
         GW{"Гвінея-Бісау"}
         GY{"Гаяна"}
-        HK{"Гонконг, О.А.Р. Китаю"}
+        HK{"Гонконг"}
         HM{"Острови Херд і Мак-Дональд"}
         HN{"Гондурас"}
         HR{"Хорватія"}
@@ -195,7 +195,7 @@ uk{
         ML{"Малі"}
         MM{"Мʼянма (Бірма)"}
         MN{"Монголія"}
-        MO{"Макао О.А.Р. Китаю"}
+        MO{"Макао"}
         MP{"Північні Маріанські острови"}
         MQ{"Мартиніка"}
         MR{"Мавританія"}
@@ -230,7 +230,7 @@ uk{
         PM{"Сен-Пʼєр і Мікелон"}
         PN{"Острови Піткерн"}
         PR{"Пуерто-Рико"}
-        PS{"Палестинські території"}
+        PS{"Палестина"}
         PT{"Португалія"}
         PW{"Палау"}
         PY{"Парагвай"}
@@ -312,9 +312,6 @@ uk{
     }
     CountriesShort{
         GB{"Велика Британія"}
-        HK{"Гонконг"}
-        MO{"Макао"}
-        PS{"Палестина"}
         US{"США"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/ur.txt b/source/data/region/ur.txt
index 5f09823..d233d70 100644
--- a/source/data/region/ur.txt
+++ b/source/data/region/ur.txt
@@ -141,7 +141,7 @@ ur{
         GU{"گوآم"}
         GW{"گنی بساؤ"}
         GY{"گیانا"}
-        HK{"ہانگ کانگ SAR چین"}
+        HK{"ہانگ کانگ"}
         HM{"ہیئرڈ آئلینڈ اور میکڈونالڈ آئلینڈز"}
         HN{"ہونڈاروس"}
         HR{"کروشیا"}
@@ -195,7 +195,7 @@ ur{
         ML{"مالی"}
         MM{"میانمار (برما)"}
         MN{"منگولیا"}
-        MO{"مکاؤ SAR چین"}
+        MO{"مکاؤ"}
         MP{"شمالی ماریانا آئلینڈز"}
         MQ{"مارٹینک"}
         MR{"موریطانیہ"}
@@ -230,7 +230,7 @@ ur{
         PM{"سینٹ پیئر اور میکلیئون"}
         PN{"پٹکائرن جزائر"}
         PR{"پیورٹو ریکو"}
-        PS{"فلسطینی خطے"}
+        PS{"فلسطین"}
         PT{"پرتگال"}
         PW{"پلاؤ"}
         PY{"پیراگوئے"}
@@ -312,9 +312,6 @@ ur{
     }
     CountriesShort{
         GB{"یو کے"}
-        HK{"ہانگ کانگ"}
-        MO{"مکاؤ"}
-        PS{"فلسطین"}
         US{"امریکا"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/uz.txt b/source/data/region/uz.txt
index 912911a..2d6c4c4 100644
--- a/source/data/region/uz.txt
+++ b/source/data/region/uz.txt
@@ -140,7 +140,7 @@ uz{
         GU{"Guam"}
         GW{"Gvineya-Bisau"}
         GY{"Gayana"}
-        HK{"Gonkong Xitoy MMH"}
+        HK{"Gonkong"}
         HM{"Gerd oroli va MakDonald orollari"}
         HN{"Gonduras"}
         HR{"Xorvatiya"}
@@ -194,7 +194,7 @@ uz{
         ML{"Mali"}
         MM{"Myanma (Birma)"}
         MN{"Mo‘g‘uliston"}
-        MO{"Makao Xitoy MMH"}
+        MO{"Makao"}
         MP{"Shimoliy Marianna orollari"}
         MQ{"Martinika"}
         MR{"Mavritaniya"}
@@ -229,7 +229,7 @@ uz{
         PM{"Sent-Pyer va Mikelon"}
         PN{"Pitkarin orollari"}
         PR{"Puerto-Riko"}
-        PS{"Falastin hududi"}
+        PS{"Falastin"}
         PT{"Portugaliya"}
         PW{"Palau"}
         PY{"Paragvay"}
@@ -311,9 +311,6 @@ uz{
     }
     CountriesShort{
         GB{"B.Q."}
-        HK{"Gonkong"}
-        MO{"Makao"}
-        PS{"Falastin"}
         US{"AQSH"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/uz_Arab_AF.txt b/source/data/region/uz_Arab_AF.txt
index e438cc7..70606f1 100644
--- a/source/data/region/uz_Arab_AF.txt
+++ b/source/data/region/uz_Arab_AF.txt
@@ -3,12 +3,10 @@
 // * Copyright (C) 2014 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/icu-locale-deprecates.xml & build.xml
+// * Source File: <path>/common/main/uz_Arab_AF.xml
 // *
 // ***************************************************************************
-/**
- * generated alias target
- */
 uz_Arab_AF{
-    ___{""}
+    %%Parent{"uz_Arab"}
+    Version{"2.1.6.69"}
 }
diff --git a/source/data/region/uz_Cyrl.txt b/source/data/region/uz_Cyrl.txt
index 7c188eb..922f63e 100644
--- a/source/data/region/uz_Cyrl.txt
+++ b/source/data/region/uz_Cyrl.txt
@@ -141,7 +141,7 @@ uz_Cyrl{
         GU{"Гуам"}
         GW{"Гвинея-Бисау"}
         GY{"Гаяна"}
-        HK{"Гонконг Хитой ММҲ"}
+        HK{"Гонконг"}
         HM{"Герд ороли ва МакДоналд ороллари"}
         HN{"Гондурас"}
         HR{"Хорватия"}
@@ -195,7 +195,7 @@ uz_Cyrl{
         ML{"Мали"}
         MM{"Мьянма (Бирма)"}
         MN{"Муғулистон"}
-        MO{"Макао Хитой ММҲ"}
+        MO{"Макао"}
         MP{"Шимолий Марианна ороллари"}
         MQ{"Мартиника"}
         MR{"Мавритания"}
@@ -230,7 +230,7 @@ uz_Cyrl{
         PM{"Сент-Пьер ва Микелон"}
         PN{"Питкарин ороллари"}
         PR{"Пуэрто-Рико"}
-        PS{"Фаластин ҳудуди"}
+        PS{"Фаластина"}
         PT{"Португалия"}
         PW{"Палау"}
         PY{"Парагвай"}
@@ -312,9 +312,6 @@ uz_Cyrl{
     }
     CountriesShort{
         GB{"Бирлашган Қироллик"}
-        HK{"Гонконг"}
-        MO{"Макао"}
-        PS{"Фаластина"}
         US{"АКШ"}
     }
     Version{"2.1.7.39"}
diff --git a/source/data/region/uz_Latn_UZ.txt b/source/data/region/uz_Latn_UZ.txt
index 3b1b013..e46e887 100755
--- a/source/data/region/uz_Latn_UZ.txt
+++ b/source/data/region/uz_Latn_UZ.txt
@@ -3,12 +3,10 @@
 // * Copyright (C) 2014 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/icu-locale-deprecates.xml & build.xml
+// * Source File: <path>/common/main/uz_Latn_UZ.xml
 // *
 // ***************************************************************************
-/**
- * generated alias target
- */
 uz_Latn_UZ{
-    ___{""}
+    %%Parent{"uz_Latn"}
+    Version{"2.1.6.69"}
 }
diff --git a/source/data/region/vai_Latn_LR.txt b/source/data/region/vai_Latn_LR.txt
new file mode 100644
index 0000000..ffb3e10
--- /dev/null
+++ b/source/data/region/vai_Latn_LR.txt
@@ -0,0 +1,12 @@
+﻿// ***************************************************************************
+// *
+// * Copyright (C) 2014 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/vai_Latn_LR.xml
+// *
+// ***************************************************************************
+vai_Latn_LR{
+    %%Parent{"vai_Latn"}
+    Version{"2.1.6.69"}
+}
diff --git a/source/data/region/vi.txt b/source/data/region/vi.txt
index 0fd09d0..94b2e02 100644
--- a/source/data/region/vi.txt
+++ b/source/data/region/vi.txt
@@ -141,7 +141,7 @@ vi{
         GU{"Guam"}
         GW{"Guinea-Bissau"}
         GY{"Guyana"}
-        HK{"Đặc khu hành chính Hồng Kông - Trung Quốc"}
+        HK{"Hồng Kông"}
         HM{"Đảo Heard và Quần đảo McDonald"}
         HN{"Honduras"}
         HR{"Croatia"}
@@ -195,7 +195,7 @@ vi{
         ML{"Mali"}
         MM{"Myanmar (Miến Điện)"}
         MN{"Mông Cổ"}
-        MO{"Đặc khu hành chính Macao - Trung Quốc"}
+        MO{"Macao"}
         MP{"Quần đảo Bắc Mariana"}
         MQ{"Martinique"}
         MR{"Mauritania"}
@@ -230,7 +230,7 @@ vi{
         PM{"Saint Pierre và Miquelon"}
         PN{"Quần đảo Pitcairn"}
         PR{"Puerto Rico"}
-        PS{"Lãnh thổ Palestine"}
+        PS{"Palestine"}
         PT{"Bồ Đào Nha"}
         PW{"Palau"}
         PY{"Paraguay"}
@@ -310,9 +310,6 @@ vi{
     }
     CountriesShort{
         GB{"Vương quốc Anh"}
-        HK{"Hồng Kông"}
-        MO{"Macao"}
-        PS{"Palestine"}
         US{"Hoa Kỳ"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/wae.txt b/source/data/region/wae.txt
index 9deb5be..edc5ded 100644
--- a/source/data/region/wae.txt
+++ b/source/data/region/wae.txt
@@ -139,7 +139,7 @@ wae{
         GU{"Guam"}
         GW{"Ginea Bissau"}
         GY{"Guyana"}
-        HK{"Sonderverwaltigszona Hongkong"}
+        HK{"Hongkong"}
         HM{"Heard- und McDonald-Inslä"}
         HN{"Honduras"}
         HR{"Kroatie"}
@@ -193,7 +193,7 @@ wae{
         ML{"Mali"}
         MM{"Burma"}
         MN{"Mongolei"}
-        MO{"Sonderverwaltigszona Makau"}
+        MO{"Makau"}
         MP{"Nördliči Mariane"}
         MQ{"Martinique"}
         MR{"Mauretanie"}
@@ -305,9 +305,5 @@ wae{
         MK{"Mazedonie (EJR)"}
         TL{"Wešttimor"}
     }
-    CountriesShort{
-        HK{"Hongkong"}
-        MO{"Makau"}
-    }
     Version{"2.1.7.53"}
 }
diff --git a/source/data/region/zh.txt b/source/data/region/zh.txt
index d1d9978..9ef412b 100644
--- a/source/data/region/zh.txt
+++ b/source/data/region/zh.txt
@@ -141,7 +141,7 @@ zh{
         GU{"关岛"}
         GW{"几内亚比绍"}
         GY{"圭亚那"}
-        HK{"中国香港特别行政区"}
+        HK{"香港"}
         HM{"赫德岛和麦克唐纳群岛"}
         HN{"洪都拉斯"}
         HR{"克罗地亚"}
@@ -195,7 +195,7 @@ zh{
         ML{"马里"}
         MM{"缅甸"}
         MN{"蒙古"}
-        MO{"中国澳门特别行政区"}
+        MO{"澳门"}
         MP{"北马里亚纳群岛"}
         MQ{"马提尼克"}
         MR{"毛里塔尼亚"}
@@ -230,7 +230,7 @@ zh{
         PM{"圣皮埃尔和密克隆群岛"}
         PN{"皮特凯恩群岛"}
         PR{"波多黎各"}
-        PS{"巴勒斯坦领土"}
+        PS{"巴勒斯坦"}
         PT{"葡萄牙"}
         PW{"帕劳"}
         PY{"巴拉圭"}
@@ -311,9 +311,6 @@ zh{
     }
     CountriesShort{
         GB{"英国"}
-        HK{"香港"}
-        MO{"澳门"}
-        PS{"巴勒斯坦"}
         US{"美国"}
     }
     Version{"2.1.8.9"}
diff --git a/source/data/region/zh_Hant.txt b/source/data/region/zh_Hant.txt
index dc533e9..ee650ee 100644
--- a/source/data/region/zh_Hant.txt
+++ b/source/data/region/zh_Hant.txt
@@ -142,7 +142,7 @@ zh_Hant{
         GU{"關島"}
         GW{"幾內亞比紹"}
         GY{"蓋亞那"}
-        HK{"中華人民共和國香港特別行政區"}
+        HK{"香港"}
         HM{"赫德島和麥克唐納群島"}
         HN{"宏都拉斯"}
         HR{"克羅埃西亞"}
@@ -196,7 +196,7 @@ zh_Hant{
         ML{"馬利"}
         MM{"緬甸"}
         MN{"蒙古"}
-        MO{"中華人民共和國澳門特別行政區"}
+        MO{"澳門"}
         MP{"北馬里亞納群島"}
         MQ{"馬丁尼克島"}
         MR{"茅利塔尼亞"}
@@ -231,7 +231,7 @@ zh_Hant{
         PM{"聖皮埃爾和密克隆群島"}
         PN{"皮特肯群島"}
         PR{"波多黎各"}
-        PS{"巴勒斯坦自治區"}
+        PS{"巴勒斯坦"}
         PT{"葡萄牙"}
         PW{"帛琉"}
         PY{"巴拉圭"}
@@ -311,9 +311,6 @@ zh_Hant{
     }
     CountriesShort{
         GB{"英國"}
-        HK{"香港"}
-        MO{"澳門"}
-        PS{"巴勒斯坦"}
         US{"美國"}
     }
     Version{"2.1.8.95"}
diff --git a/source/data/region/zh_Hant_HK.txt b/source/data/region/zh_Hant_HK.txt
index a3211c3..43a5ac9 100644
--- a/source/data/region/zh_Hant_HK.txt
+++ b/source/data/region/zh_Hant_HK.txt
@@ -7,6 +7,7 @@
 // *
 // ***************************************************************************
 zh_Hant_HK{
+    %%Parent{"zh_Hant"}
     Countries{
         013{"中美洲"}
         029{"加勒比"}
@@ -79,6 +80,7 @@ zh_Hant_HK{
         VA{"梵蒂岡宮城"}
         VC{"聖文森特和格林納丁斯"}
         VU{"瓦努阿圖"}
+        XK{"科索沃"}
         ZM{"贊比亞"}
     }
     Countries%variant{
diff --git a/source/data/region/zh_Hant_TW.txt b/source/data/region/zh_Hant_TW.txt
index b5fc19d..507476e 100644
--- a/source/data/region/zh_Hant_TW.txt
+++ b/source/data/region/zh_Hant_TW.txt
@@ -3,12 +3,10 @@
 // * Copyright (C) 2014 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/icu-locale-deprecates.xml & build.xml
+// * Source File: <path>/common/main/zh_Hant_TW.xml
 // *
 // ***************************************************************************
-/**
- * generated alias target
- */
 zh_Hant_TW{
-    ___{""}
+    %%Parent{"zh_Hant"}
+    Version{"2.1.6.69"}
 }
diff --git a/source/data/region/zu.txt b/source/data/region/zu.txt
index 4515e9d..80d34da 100644
--- a/source/data/region/zu.txt
+++ b/source/data/region/zu.txt
@@ -141,7 +141,7 @@ zu{
         GU{"i-Guam"}
         GW{"i-Guinea-Bissau"}
         GY{"i-Guyana"}
-        HK{"i-Hong Kong SAR China"}
+        HK{"i-Hong Kong"}
         HM{"i-Heard Island ne-McDonald Islands"}
         HN{"i-Honduras"}
         HR{"i-Croatia"}
@@ -195,7 +195,7 @@ zu{
         ML{"i-Mali"}
         MM{"i-Myanmar (Burma)"}
         MN{"i-Mongolia"}
-        MO{"i-Macau SAR China"}
+        MO{"i-Macau"}
         MP{"i-Northern Mariana Islands"}
         MQ{"i-Martinique"}
         MR{"i-Mauritania"}
@@ -230,7 +230,7 @@ zu{
         PM{"i-Saint Pierre kanye ne-Miquelon"}
         PN{"i-Pitcairn Islands"}
         PR{"i-Puerto Rico"}
-        PS{"i-Palestinian Territories"}
+        PS{"i-Phalestine"}
         PT{"i-Portugal"}
         PW{"i-Palau"}
         PY{"i-Paraguay"}
@@ -312,9 +312,6 @@ zu{
     }
     CountriesShort{
         GB{"i-U.K."}
-        HK{"i-Hong Kong"}
-        MO{"i-Macau"}
-        PS{"i-Phalestine"}
         US{"i-U.S"}
     }
     Version{"2.1.8.18"}
diff --git a/source/data/unit/az_Cyrl_AZ.txt b/source/data/unit/az_Cyrl_AZ.txt
new file mode 100644
index 0000000..34897f4
--- /dev/null
+++ b/source/data/unit/az_Cyrl_AZ.txt
@@ -0,0 +1,12 @@
+﻿// ***************************************************************************
+// *
+// * Copyright (C) 2014 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/az_Cyrl_AZ.xml
+// *
+// ***************************************************************************
+az_Cyrl_AZ{
+    %%Parent{"az_Cyrl"}
+    Version{"2.1.6.69"}
+}
diff --git a/source/data/unit/pa_Arab_PK.txt b/source/data/unit/pa_Arab_PK.txt
index 508a02a..9eabbb8 100755
--- a/source/data/unit/pa_Arab_PK.txt
+++ b/source/data/unit/pa_Arab_PK.txt
@@ -3,12 +3,10 @@
 // * Copyright (C) 2014 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/icu-locale-deprecates.xml & build.xml
+// * Source File: <path>/common/main/pa_Arab_PK.xml
 // *
 // ***************************************************************************
-/**
- * generated alias target
- */
 pa_Arab_PK{
-    ___{""}
+    %%Parent{"pa_Arab"}
+    Version{"2.1.6.69"}
 }
diff --git a/source/data/unit/resfiles.mk b/source/data/unit/resfiles.mk
index a907667..ef0566f 100755
--- a/source/data/unit/resfiles.mk
+++ b/source/data/unit/resfiles.mk
@@ -34,16 +34,15 @@ UNIT_SYNTHETIC_ALIAS = az_AZ.txt az_Latn_AZ.txt bs_BA.txt bs_Latn_BA.txt\
  ks_IN.txt ky_Cyrl_KG.txt ky_KG.txt mn_Cyrl_MN.txt mn_MN.txt\
  mo.txt ms_BN.txt ms_Latn_BN.txt ms_Latn_MY.txt ms_Latn_SG.txt\
  ms_MY.txt ms_SG.txt nb_NO.txt nn_NO.txt no.txt\
- no_NO.txt no_NO_NY.txt pa_Arab_PK.txt pa_Guru_IN.txt pa_IN.txt\
- pa_PK.txt ro_MD.txt sh.txt sh_BA.txt sh_CS.txt\
- sh_YU.txt shi_MA.txt shi_Tfng_MA.txt sr_BA.txt sr_CS.txt\
- sr_Cyrl_BA.txt sr_Cyrl_CS.txt sr_Cyrl_RS.txt sr_Cyrl_XK.txt sr_Cyrl_YU.txt\
- sr_Latn_BA.txt sr_Latn_CS.txt sr_Latn_ME.txt sr_Latn_RS.txt sr_Latn_YU.txt\
+ no_NO.txt no_NO_NY.txt pa_Guru_IN.txt pa_IN.txt pa_PK.txt\
+ ro_MD.txt sh.txt sh_BA.txt sh_CS.txt sh_YU.txt\
+ shi_MA.txt sr_BA.txt sr_CS.txt sr_Cyrl_BA.txt sr_Cyrl_CS.txt\
+ sr_Cyrl_RS.txt sr_Cyrl_XK.txt sr_Cyrl_YU.txt sr_Latn_CS.txt sr_Latn_YU.txt\
  sr_ME.txt sr_RS.txt sr_XK.txt sr_YU.txt th_TH.txt\
  th_TH_TRADITIONAL.txt tl.txt tl_PH.txt tzm_Latn_MA.txt tzm_MA.txt\
- ug_Arab_CN.txt ug_CN.txt uz_AF.txt uz_Arab_AF.txt uz_Latn_UZ.txt\
- uz_UZ.txt vai_LR.txt vai_Vaii_LR.txt zh_CN.txt zh_HK.txt\
- zh_Hans_CN.txt zh_Hant_TW.txt zh_MO.txt zh_SG.txt zh_TW.txt
+ ug_Arab_CN.txt ug_CN.txt uz_AF.txt uz_UZ.txt vai_LR.txt\
+ vai_Vaii_LR.txt zh_CN.txt zh_HK.txt zh_Hans_CN.txt zh_MO.txt\
+ zh_SG.txt zh_TW.txt
 
 
 # All aliases (to not be included under 'installed'), but not including root.
@@ -53,70 +52,72 @@ UNIT_ALIAS_SOURCE = $(UNIT_SYNTHETIC_ALIAS)
 # Ordinary resources
 UNIT_SOURCE = af.txt agq.txt ak.txt am.txt\
  ar.txt ar_AE.txt as.txt asa.txt az.txt\
- az_Cyrl.txt az_Latn.txt bas.txt be.txt bem.txt\
- bez.txt bg.txt bm.txt bm_Latn.txt bn.txt\
- bn_IN.txt bo.txt br.txt brx.txt bs.txt\
- bs_Cyrl.txt bs_Latn.txt ca.txt cgg.txt chr.txt\
- cs.txt cy.txt da.txt dav.txt de.txt\
- de_CH.txt dje.txt dsb.txt dua.txt dyo.txt\
- dz.txt ebu.txt ee.txt el.txt en.txt\
- en_001.txt en_150.txt en_AG.txt en_AI.txt en_AU.txt\
- en_BB.txt en_BE.txt en_BM.txt en_BS.txt en_BW.txt\
- en_BZ.txt en_CC.txt en_CK.txt en_CM.txt en_CX.txt\
- en_DG.txt en_DM.txt en_ER.txt en_FJ.txt en_FK.txt\
- en_FM.txt en_GB.txt en_GD.txt en_GG.txt en_GH.txt\
- en_GI.txt en_GM.txt en_GY.txt en_HK.txt en_IE.txt\
- en_IM.txt en_IN.txt en_IO.txt en_JE.txt en_JM.txt\
- en_KE.txt en_KI.txt en_KN.txt en_KY.txt en_LC.txt\
- en_LR.txt en_LS.txt en_MG.txt en_MO.txt en_MS.txt\
- en_MT.txt en_MU.txt en_MW.txt en_MY.txt en_NA.txt\
- en_NF.txt en_NG.txt en_NR.txt en_NU.txt en_NZ.txt\
- en_PG.txt en_PH.txt en_PK.txt en_PN.txt en_PW.txt\
- en_RW.txt en_SB.txt en_SC.txt en_SD.txt en_SG.txt\
- en_SH.txt en_SL.txt en_SS.txt en_SX.txt en_SZ.txt\
- en_TC.txt en_TK.txt en_TO.txt en_TT.txt en_TV.txt\
- en_TZ.txt en_UG.txt en_VC.txt en_VG.txt en_VU.txt\
- en_WS.txt en_ZA.txt en_ZM.txt en_ZW.txt eo.txt\
- es.txt es_419.txt es_AR.txt es_BO.txt es_CL.txt\
- es_CO.txt es_CR.txt es_CU.txt es_DO.txt es_EC.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 eu.txt ewo.txt\
- fa.txt ff.txt fi.txt fil.txt fo.txt\
- fr.txt fr_CA.txt fur.txt fy.txt ga.txt\
- gd.txt gl.txt gsw.txt gu.txt guz.txt\
- gv.txt ha.txt ha_Latn.txt haw.txt he.txt\
- hi.txt hr.txt hsb.txt hu.txt hy.txt\
- id.txt ig.txt ii.txt is.txt it.txt\
- ja.txt jgo.txt jmc.txt ka.txt kab.txt\
- kam.txt kde.txt kea.txt khq.txt ki.txt\
- kk.txt kk_Cyrl.txt kkj.txt kl.txt kln.txt\
- km.txt kn.txt ko.txt kok.txt ks.txt\
- ks_Arab.txt ksb.txt ksf.txt ksh.txt kw.txt\
- ky.txt ky_Cyrl.txt lag.txt lb.txt lg.txt\
- lkt.txt ln.txt lo.txt lt.txt lu.txt\
- luo.txt luy.txt lv.txt mas.txt mer.txt\
- mfe.txt mg.txt mgh.txt mgo.txt mk.txt\
- ml.txt mn.txt mn_Cyrl.txt mr.txt ms.txt\
- ms_Latn.txt mt.txt mua.txt my.txt naq.txt\
- nb.txt nd.txt ne.txt ne_IN.txt nl.txt\
- nmg.txt nn.txt nnh.txt nus.txt nyn.txt\
- om.txt or.txt os.txt pa.txt pa_Arab.txt\
- pa_Guru.txt pl.txt ps.txt pt.txt pt_AO.txt\
- pt_CV.txt pt_GW.txt pt_MO.txt pt_MZ.txt pt_PT.txt\
- pt_ST.txt pt_TL.txt qu.txt rm.txt rn.txt\
- ro.txt rof.txt ru.txt rw.txt rwk.txt\
- sah.txt saq.txt sbp.txt se.txt seh.txt\
- ses.txt sg.txt shi.txt shi_Latn.txt shi_Tfng.txt\
- si.txt sk.txt sl.txt smn.txt sn.txt\
- so.txt sq.txt sr.txt sr_Cyrl.txt sr_Latn.txt\
- sv.txt sv_FI.txt sw.txt swc.txt ta.txt\
- te.txt teo.txt th.txt ti.txt to.txt\
- tr.txt twq.txt tzm.txt tzm_Latn.txt ug.txt\
- ug_Arab.txt uk.txt ur.txt ur_IN.txt uz.txt\
- uz_Arab.txt uz_Cyrl.txt uz_Latn.txt vai.txt vai_Latn.txt\
- vai_Vaii.txt vi.txt vun.txt wae.txt xog.txt\
- yav.txt yi.txt yo.txt zgh.txt zh.txt\
- zh_Hans.txt zh_Hans_HK.txt zh_Hans_MO.txt zh_Hans_SG.txt zh_Hant.txt\
- zh_Hant_HK.txt zh_Hant_MO.txt zu.txt
+ az_Cyrl.txt az_Cyrl_AZ.txt az_Latn.txt bas.txt be.txt\
+ bem.txt bez.txt bg.txt bm.txt bm_Latn.txt\
+ bn.txt bn_IN.txt bo.txt br.txt brx.txt\
+ bs.txt bs_Cyrl.txt bs_Latn.txt ca.txt cgg.txt\
+ chr.txt cs.txt cy.txt da.txt dav.txt\
+ de.txt de_CH.txt dje.txt dsb.txt dua.txt\
+ dyo.txt dz.txt ebu.txt ee.txt el.txt\
+ en.txt en_001.txt en_150.txt en_AG.txt en_AI.txt\
+ en_AU.txt en_BB.txt en_BE.txt en_BM.txt en_BS.txt\
+ en_BW.txt en_BZ.txt en_CC.txt en_CK.txt en_CM.txt\
+ en_CX.txt en_DG.txt en_DM.txt en_ER.txt en_FJ.txt\
+ en_FK.txt en_FM.txt en_GB.txt en_GD.txt en_GG.txt\
+ en_GH.txt en_GI.txt en_GM.txt en_GY.txt en_HK.txt\
+ en_IE.txt en_IM.txt en_IN.txt en_IO.txt en_JE.txt\
+ en_JM.txt en_KE.txt en_KI.txt en_KN.txt en_KY.txt\
+ en_LC.txt en_LR.txt en_LS.txt en_MG.txt en_MO.txt\
+ en_MS.txt en_MT.txt en_MU.txt en_MW.txt en_MY.txt\
+ en_NA.txt en_NF.txt en_NG.txt en_NR.txt en_NU.txt\
+ en_NZ.txt en_PG.txt en_PH.txt en_PK.txt en_PN.txt\
+ en_PW.txt en_RW.txt en_SB.txt en_SC.txt en_SD.txt\
+ en_SG.txt en_SH.txt en_SL.txt en_SS.txt en_SX.txt\
+ en_SZ.txt en_TC.txt en_TK.txt en_TO.txt en_TT.txt\
+ en_TV.txt en_TZ.txt en_UG.txt en_VC.txt en_VG.txt\
+ en_VU.txt en_WS.txt en_ZA.txt en_ZM.txt en_ZW.txt\
+ eo.txt es.txt es_419.txt es_AR.txt es_BO.txt\
+ es_CL.txt es_CO.txt es_CR.txt es_CU.txt es_DO.txt\
+ es_EC.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 eu.txt\
+ ewo.txt fa.txt ff.txt fi.txt fil.txt\
+ fo.txt fr.txt fr_CA.txt fur.txt fy.txt\
+ ga.txt gd.txt gl.txt gsw.txt gu.txt\
+ guz.txt gv.txt ha.txt ha_Latn.txt haw.txt\
+ he.txt hi.txt hr.txt hsb.txt hu.txt\
+ hy.txt id.txt ig.txt ii.txt is.txt\
+ it.txt ja.txt jgo.txt jmc.txt ka.txt\
+ kab.txt kam.txt kde.txt kea.txt khq.txt\
+ ki.txt kk.txt kk_Cyrl.txt kkj.txt kl.txt\
+ kln.txt km.txt kn.txt ko.txt kok.txt\
+ ks.txt ks_Arab.txt ksb.txt ksf.txt ksh.txt\
+ kw.txt ky.txt ky_Cyrl.txt lag.txt lb.txt\
+ lg.txt lkt.txt ln.txt lo.txt lt.txt\
+ lu.txt luo.txt luy.txt lv.txt mas.txt\
+ mer.txt mfe.txt mg.txt mgh.txt mgo.txt\
+ mk.txt ml.txt mn.txt mn_Cyrl.txt mr.txt\
+ ms.txt ms_Latn.txt mt.txt mua.txt my.txt\
+ naq.txt nb.txt nd.txt ne.txt ne_IN.txt\
+ nl.txt nmg.txt nn.txt nnh.txt nus.txt\
+ nyn.txt om.txt or.txt os.txt pa.txt\
+ pa_Arab.txt pa_Arab_PK.txt pa_Guru.txt pl.txt ps.txt\
+ pt.txt pt_AO.txt pt_CV.txt pt_GW.txt pt_MO.txt\
+ pt_MZ.txt pt_PT.txt pt_ST.txt pt_TL.txt qu.txt\
+ rm.txt rn.txt ro.txt rof.txt ru.txt\
+ rw.txt rwk.txt sah.txt saq.txt sbp.txt\
+ se.txt seh.txt ses.txt sg.txt shi.txt\
+ shi_Latn.txt shi_Tfng.txt shi_Tfng_MA.txt si.txt sk.txt\
+ sl.txt smn.txt sn.txt so.txt sq.txt\
+ sr.txt sr_Cyrl.txt sr_Latn.txt sr_Latn_BA.txt sr_Latn_ME.txt\
+ sr_Latn_RS.txt sv.txt sv_FI.txt sw.txt swc.txt\
+ ta.txt te.txt teo.txt th.txt ti.txt\
+ to.txt tr.txt twq.txt tzm.txt tzm_Latn.txt\
+ ug.txt ug_Arab.txt uk.txt ur.txt ur_IN.txt\
+ uz.txt uz_Arab.txt uz_Arab_AF.txt uz_Cyrl.txt uz_Latn.txt\
+ uz_Latn_UZ.txt vai.txt vai_Latn.txt vai_Latn_LR.txt vai_Vaii.txt\
+ vi.txt vun.txt wae.txt xog.txt yav.txt\
+ yi.txt yo.txt zgh.txt zh.txt zh_Hans.txt\
+ zh_Hans_HK.txt zh_Hans_MO.txt zh_Hans_SG.txt zh_Hant.txt zh_Hant_HK.txt\
+ zh_Hant_MO.txt zh_Hant_TW.txt zu.txt
 
diff --git a/source/data/unit/shi_Tfng_MA.txt b/source/data/unit/shi_Tfng_MA.txt
index 729e805..87d9d8f 100755
--- a/source/data/unit/shi_Tfng_MA.txt
+++ b/source/data/unit/shi_Tfng_MA.txt
@@ -3,12 +3,10 @@
 // * Copyright (C) 2014 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/icu-locale-deprecates.xml & build.xml
+// * Source File: <path>/common/main/shi_Tfng_MA.xml
 // *
 // ***************************************************************************
-/**
- * generated alias target
- */
 shi_Tfng_MA{
-    ___{""}
+    %%Parent{"shi_Tfng"}
+    Version{"2.1.6.69"}
 }
diff --git a/source/data/unit/sr_Latn_BA.txt b/source/data/unit/sr_Latn_BA.txt
index fcc337c..61e502c 100755
--- a/source/data/unit/sr_Latn_BA.txt
+++ b/source/data/unit/sr_Latn_BA.txt
@@ -3,12 +3,10 @@
 // * Copyright (C) 2014 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/icu-locale-deprecates.xml & build.xml
+// * Source File: <path>/common/main/sr_Latn_BA.xml
 // *
 // ***************************************************************************
-/**
- * generated alias target
- */
 sr_Latn_BA{
-    ___{""}
+    %%Parent{"sr_Latn"}
+    Version{"2.1.8.20"}
 }
diff --git a/source/data/unit/sr_Latn_ME.txt b/source/data/unit/sr_Latn_ME.txt
index 4887740..ddbcd9c 100755
--- a/source/data/unit/sr_Latn_ME.txt
+++ b/source/data/unit/sr_Latn_ME.txt
@@ -3,12 +3,10 @@
 // * Copyright (C) 2014 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/icu-locale-deprecates.xml & build.xml
+// * Source File: <path>/common/main/sr_Latn_ME.xml
 // *
 // ***************************************************************************
-/**
- * generated alias target
- */
 sr_Latn_ME{
-    ___{""}
+    %%Parent{"sr_Latn"}
+    Version{"2.1.8.20"}
 }
diff --git a/source/data/unit/sr_Latn_RS.txt b/source/data/unit/sr_Latn_RS.txt
index c5ee86b..14725d1 100755
--- a/source/data/unit/sr_Latn_RS.txt
+++ b/source/data/unit/sr_Latn_RS.txt
@@ -3,12 +3,10 @@
 // * Copyright (C) 2014 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/icu-locale-deprecates.xml & build.xml
+// * Source File: <path>/common/main/sr_Latn_RS.xml
 // *
 // ***************************************************************************
-/**
- * generated alias target
- */
 sr_Latn_RS{
-    ___{""}
+    %%Parent{"sr_Latn"}
+    Version{"2.1.6.69"}
 }
diff --git a/source/data/unit/uz_Arab_AF.txt b/source/data/unit/uz_Arab_AF.txt
index e438cc7..70606f1 100755
--- a/source/data/unit/uz_Arab_AF.txt
+++ b/source/data/unit/uz_Arab_AF.txt
@@ -3,12 +3,10 @@
 // * Copyright (C) 2014 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/icu-locale-deprecates.xml & build.xml
+// * Source File: <path>/common/main/uz_Arab_AF.xml
 // *
 // ***************************************************************************
-/**
- * generated alias target
- */
 uz_Arab_AF{
-    ___{""}
+    %%Parent{"uz_Arab"}
+    Version{"2.1.6.69"}
 }
diff --git a/source/data/unit/uz_Latn_UZ.txt b/source/data/unit/uz_Latn_UZ.txt
index 3b1b013..e46e887 100755
--- a/source/data/unit/uz_Latn_UZ.txt
+++ b/source/data/unit/uz_Latn_UZ.txt
@@ -3,12 +3,10 @@
 // * Copyright (C) 2014 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/icu-locale-deprecates.xml & build.xml
+// * Source File: <path>/common/main/uz_Latn_UZ.xml
 // *
 // ***************************************************************************
-/**
- * generated alias target
- */
 uz_Latn_UZ{
-    ___{""}
+    %%Parent{"uz_Latn"}
+    Version{"2.1.6.69"}
 }
diff --git a/source/data/unit/vai_Latn_LR.txt b/source/data/unit/vai_Latn_LR.txt
new file mode 100644
index 0000000..ffb3e10
--- /dev/null
+++ b/source/data/unit/vai_Latn_LR.txt
@@ -0,0 +1,12 @@
+﻿// ***************************************************************************
+// *
+// * Copyright (C) 2014 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/vai_Latn_LR.xml
+// *
+// ***************************************************************************
+vai_Latn_LR{
+    %%Parent{"vai_Latn"}
+    Version{"2.1.6.69"}
+}
diff --git a/source/data/unit/zh_Hant_HK.txt b/source/data/unit/zh_Hant_HK.txt
index 02e2b8e..27940f0 100755
--- a/source/data/unit/zh_Hant_HK.txt
+++ b/source/data/unit/zh_Hant_HK.txt
@@ -7,6 +7,7 @@
 // *
 // ***************************************************************************
 zh_Hant_HK{
+    %%Parent{"zh_Hant"}
     Version{"2.1.8.28"}
     units{
         acceleration{
diff --git a/source/data/unit/zh_Hant_TW.txt b/source/data/unit/zh_Hant_TW.txt
index b5fc19d..507476e 100755
--- a/source/data/unit/zh_Hant_TW.txt
+++ b/source/data/unit/zh_Hant_TW.txt
@@ -3,12 +3,10 @@
 // * Copyright (C) 2014 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/icu-locale-deprecates.xml & build.xml
+// * Source File: <path>/common/main/zh_Hant_TW.xml
 // *
 // ***************************************************************************
-/**
- * generated alias target
- */
 zh_Hant_TW{
-    ___{""}
+    %%Parent{"zh_Hant"}
+    Version{"2.1.6.69"}
 }
diff --git a/source/data/zone/az_Cyrl_AZ.txt b/source/data/zone/az_Cyrl_AZ.txt
new file mode 100644
index 0000000..34897f4
--- /dev/null
+++ b/source/data/zone/az_Cyrl_AZ.txt
@@ -0,0 +1,12 @@
+﻿// ***************************************************************************
+// *
+// * Copyright (C) 2014 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/az_Cyrl_AZ.xml
+// *
+// ***************************************************************************
+az_Cyrl_AZ{
+    %%Parent{"az_Cyrl"}
+    Version{"2.1.6.69"}
+}
diff --git a/source/data/zone/ko.txt b/source/data/zone/ko.txt
index 707815f..c53c0b7 100644
--- a/source/data/zone/ko.txt
+++ b/source/data/zone/ko.txt
@@ -1617,9 +1617,9 @@ ko{
             ls{"서부 카자흐스탄 시간"}
         }
         "meta:Korea"{
-            ld{"대한민국 하계 표준시"}
-            lg{"대한민국 시간"}
-            ls{"대한민국 표준시"}
+            ld{"한국 하계 표준시"}
+            lg{"한국 시간"}
+            ls{"한국 표준시"}
         }
         "meta:Kosrae"{
             ls{"코스라에섬 시간"}
diff --git a/source/data/zone/pa_Arab_PK.txt b/source/data/zone/pa_Arab_PK.txt
index 508a02a..9eabbb8 100644
--- a/source/data/zone/pa_Arab_PK.txt
+++ b/source/data/zone/pa_Arab_PK.txt
@@ -3,12 +3,10 @@
 // * Copyright (C) 2014 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/icu-locale-deprecates.xml & build.xml
+// * Source File: <path>/common/main/pa_Arab_PK.xml
 // *
 // ***************************************************************************
-/**
- * generated alias target
- */
 pa_Arab_PK{
-    ___{""}
+    %%Parent{"pa_Arab"}
+    Version{"2.1.6.69"}
 }
diff --git a/source/data/zone/resfiles.mk b/source/data/zone/resfiles.mk
index 31bfdcd..4850a72 100644
--- a/source/data/zone/resfiles.mk
+++ b/source/data/zone/resfiles.mk
@@ -34,16 +34,15 @@ ZONE_SYNTHETIC_ALIAS = az_AZ.txt az_Latn_AZ.txt bs_BA.txt bs_Latn_BA.txt\
  ks_IN.txt ky_Cyrl_KG.txt ky_KG.txt mn_Cyrl_MN.txt mn_MN.txt\
  mo.txt ms_BN.txt ms_Latn_BN.txt ms_Latn_MY.txt ms_Latn_SG.txt\
  ms_MY.txt ms_SG.txt nb_NO.txt nn_NO.txt no.txt\
- no_NO.txt no_NO_NY.txt pa_Arab_PK.txt pa_Guru_IN.txt pa_IN.txt\
- pa_PK.txt ro_MD.txt sh.txt sh_BA.txt sh_CS.txt\
- sh_YU.txt shi_MA.txt shi_Tfng_MA.txt sr_BA.txt sr_CS.txt\
- sr_Cyrl_BA.txt sr_Cyrl_CS.txt sr_Cyrl_RS.txt sr_Cyrl_XK.txt sr_Cyrl_YU.txt\
- sr_Latn_BA.txt sr_Latn_CS.txt sr_Latn_ME.txt sr_Latn_RS.txt sr_Latn_YU.txt\
+ no_NO.txt no_NO_NY.txt pa_Guru_IN.txt pa_IN.txt pa_PK.txt\
+ ro_MD.txt sh.txt sh_BA.txt sh_CS.txt sh_YU.txt\
+ shi_MA.txt sr_BA.txt sr_CS.txt sr_Cyrl_BA.txt sr_Cyrl_CS.txt\
+ sr_Cyrl_RS.txt sr_Cyrl_XK.txt sr_Cyrl_YU.txt sr_Latn_CS.txt sr_Latn_YU.txt\
  sr_ME.txt sr_RS.txt sr_XK.txt sr_YU.txt th_TH.txt\
  th_TH_TRADITIONAL.txt tl.txt tl_PH.txt tzm_Latn_MA.txt tzm_MA.txt\
- ug_Arab_CN.txt ug_CN.txt uz_AF.txt uz_Arab_AF.txt uz_Latn_UZ.txt\
- uz_UZ.txt vai_LR.txt vai_Vaii_LR.txt zh_CN.txt zh_HK.txt\
- zh_Hans_CN.txt zh_Hant_TW.txt zh_MO.txt zh_SG.txt zh_TW.txt
+ ug_Arab_CN.txt ug_CN.txt uz_AF.txt uz_UZ.txt vai_LR.txt\
+ vai_Vaii_LR.txt zh_CN.txt zh_HK.txt zh_Hans_CN.txt zh_MO.txt\
+ zh_SG.txt zh_TW.txt
 
 
 # All aliases (to not be included under 'installed'), but not including root.
@@ -53,71 +52,73 @@ ZONE_ALIAS_SOURCE = $(ZONE_SYNTHETIC_ALIAS)
 # Ordinary resources
 ZONE_SOURCE = af.txt agq.txt ak.txt am.txt\
  ar.txt ar_AE.txt ar_EG.txt as.txt asa.txt\
- az.txt az_Cyrl.txt az_Latn.txt bas.txt be.txt\
- bem.txt bez.txt bg.txt bm.txt bm_Latn.txt\
- bn.txt bn_IN.txt bo.txt br.txt brx.txt\
- bs.txt bs_Cyrl.txt bs_Latn.txt ca.txt cgg.txt\
- chr.txt cs.txt cy.txt da.txt dav.txt\
- de.txt dje.txt dsb.txt dua.txt dyo.txt\
- dz.txt ebu.txt ee.txt el.txt en.txt\
- en_001.txt en_150.txt en_AG.txt en_AI.txt en_AU.txt\
- en_BB.txt en_BE.txt en_BM.txt en_BS.txt en_BW.txt\
- en_BZ.txt en_CA.txt en_CC.txt en_CK.txt en_CM.txt\
- en_CX.txt en_DG.txt en_DM.txt en_ER.txt en_FJ.txt\
- en_FK.txt en_FM.txt en_GB.txt en_GD.txt en_GG.txt\
- en_GH.txt en_GI.txt en_GM.txt en_GU.txt en_GY.txt\
- en_HK.txt en_IE.txt en_IM.txt en_IN.txt en_IO.txt\
- en_JE.txt en_JM.txt en_KE.txt en_KI.txt en_KN.txt\
- en_KY.txt en_LC.txt en_LR.txt en_LS.txt en_MG.txt\
- en_MH.txt en_MO.txt en_MP.txt en_MS.txt en_MT.txt\
- en_MU.txt en_MW.txt en_MY.txt en_NA.txt en_NF.txt\
- en_NG.txt en_NR.txt en_NU.txt en_NZ.txt en_PG.txt\
- en_PH.txt en_PK.txt en_PN.txt en_PW.txt en_RW.txt\
- en_SB.txt en_SC.txt en_SD.txt en_SG.txt en_SH.txt\
- en_SL.txt en_SS.txt en_SX.txt en_SZ.txt en_TC.txt\
- en_TK.txt en_TO.txt en_TT.txt en_TV.txt en_TZ.txt\
- en_UG.txt en_VC.txt en_VG.txt en_VU.txt en_WS.txt\
- en_ZA.txt en_ZM.txt en_ZW.txt eo.txt es.txt\
- es_419.txt es_AR.txt es_BO.txt es_CL.txt es_CO.txt\
- es_CR.txt es_CU.txt es_DO.txt es_EC.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 eu.txt ewo.txt fa.txt\
- ff.txt fi.txt fil.txt fo.txt fr.txt\
- fr_CA.txt fur.txt fy.txt ga.txt gd.txt\
- gl.txt gsw.txt gu.txt guz.txt gv.txt\
- ha.txt ha_Latn.txt haw.txt he.txt hi.txt\
- hr.txt hsb.txt hu.txt hy.txt id.txt\
- ig.txt ii.txt is.txt it.txt ja.txt\
- jgo.txt jmc.txt ka.txt kab.txt kam.txt\
- kde.txt kea.txt khq.txt ki.txt kk.txt\
- kk_Cyrl.txt kkj.txt kl.txt kln.txt km.txt\
- kn.txt ko.txt ko_KP.txt kok.txt ks.txt\
- ks_Arab.txt ksb.txt ksf.txt ksh.txt kw.txt\
- ky.txt ky_Cyrl.txt lag.txt lb.txt lg.txt\
- lkt.txt ln.txt lo.txt lt.txt lu.txt\
- luo.txt luy.txt lv.txt mas.txt mer.txt\
- mfe.txt mg.txt mgh.txt mgo.txt mk.txt\
- ml.txt mn.txt mn_Cyrl.txt mr.txt ms.txt\
- ms_Latn.txt mt.txt mua.txt my.txt naq.txt\
- nb.txt nd.txt ne.txt ne_IN.txt nl.txt\
- nmg.txt nn.txt nnh.txt nus.txt nyn.txt\
- om.txt or.txt os.txt pa.txt pa_Arab.txt\
- pa_Guru.txt pl.txt ps.txt pt.txt pt_AO.txt\
- pt_CV.txt pt_GW.txt pt_MO.txt pt_MZ.txt pt_PT.txt\
- pt_ST.txt pt_TL.txt qu.txt rm.txt rn.txt\
- ro.txt rof.txt ru.txt rw.txt rwk.txt\
- sah.txt saq.txt sbp.txt se.txt seh.txt\
- ses.txt sg.txt shi.txt shi_Latn.txt shi_Tfng.txt\
- si.txt sk.txt sl.txt smn.txt sn.txt\
- so.txt sq.txt sr.txt sr_Cyrl.txt sr_Latn.txt\
- sv.txt sv_FI.txt sw.txt swc.txt ta.txt\
- ta_MY.txt ta_SG.txt te.txt teo.txt th.txt\
- ti.txt to.txt tr.txt twq.txt tzm.txt\
- tzm_Latn.txt ug.txt ug_Arab.txt uk.txt ur.txt\
- ur_IN.txt uz.txt uz_Arab.txt uz_Cyrl.txt uz_Latn.txt\
- vai.txt vai_Latn.txt vai_Vaii.txt vi.txt vun.txt\
- wae.txt xog.txt yav.txt yi.txt yo.txt\
- zgh.txt zh.txt zh_Hans.txt zh_Hans_HK.txt zh_Hans_MO.txt\
- zh_Hans_SG.txt zh_Hant.txt zh_Hant_HK.txt zh_Hant_MO.txt zu.txt
+ az.txt az_Cyrl.txt az_Cyrl_AZ.txt az_Latn.txt bas.txt\
+ be.txt bem.txt bez.txt bg.txt bm.txt\
+ bm_Latn.txt bn.txt bn_IN.txt bo.txt br.txt\
+ brx.txt bs.txt bs_Cyrl.txt bs_Latn.txt ca.txt\
+ cgg.txt chr.txt cs.txt cy.txt da.txt\
+ dav.txt de.txt dje.txt dsb.txt dua.txt\
+ dyo.txt dz.txt ebu.txt ee.txt el.txt\
+ en.txt en_001.txt en_150.txt en_AG.txt en_AI.txt\
+ en_AU.txt en_BB.txt en_BE.txt en_BM.txt en_BS.txt\
+ en_BW.txt en_BZ.txt en_CA.txt en_CC.txt en_CK.txt\
+ en_CM.txt en_CX.txt en_DG.txt en_DM.txt en_ER.txt\
+ en_FJ.txt en_FK.txt en_FM.txt en_GB.txt en_GD.txt\
+ en_GG.txt en_GH.txt en_GI.txt en_GM.txt en_GU.txt\
+ en_GY.txt en_HK.txt en_IE.txt en_IM.txt en_IN.txt\
+ en_IO.txt en_JE.txt en_JM.txt en_KE.txt en_KI.txt\
+ en_KN.txt en_KY.txt en_LC.txt en_LR.txt en_LS.txt\
+ en_MG.txt en_MH.txt en_MO.txt en_MP.txt en_MS.txt\
+ en_MT.txt en_MU.txt en_MW.txt en_MY.txt en_NA.txt\
+ en_NF.txt en_NG.txt en_NR.txt en_NU.txt en_NZ.txt\
+ en_PG.txt en_PH.txt en_PK.txt en_PN.txt en_PW.txt\
+ en_RW.txt en_SB.txt en_SC.txt en_SD.txt en_SG.txt\
+ en_SH.txt en_SL.txt en_SS.txt en_SX.txt en_SZ.txt\
+ en_TC.txt en_TK.txt en_TO.txt en_TT.txt en_TV.txt\
+ en_TZ.txt en_UG.txt en_VC.txt en_VG.txt en_VU.txt\
+ en_WS.txt en_ZA.txt en_ZM.txt en_ZW.txt eo.txt\
+ es.txt es_419.txt es_AR.txt es_BO.txt es_CL.txt\
+ es_CO.txt es_CR.txt es_CU.txt es_DO.txt es_EC.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 eu.txt ewo.txt\
+ fa.txt ff.txt fi.txt fil.txt fo.txt\
+ fr.txt fr_CA.txt fur.txt fy.txt ga.txt\
+ gd.txt gl.txt gsw.txt gu.txt guz.txt\
+ gv.txt ha.txt ha_Latn.txt haw.txt he.txt\
+ hi.txt hr.txt hsb.txt hu.txt hy.txt\
+ id.txt ig.txt ii.txt is.txt it.txt\
+ ja.txt jgo.txt jmc.txt ka.txt kab.txt\
+ kam.txt kde.txt kea.txt khq.txt ki.txt\
+ kk.txt kk_Cyrl.txt kkj.txt kl.txt kln.txt\
+ km.txt kn.txt ko.txt ko_KP.txt kok.txt\
+ ks.txt ks_Arab.txt ksb.txt ksf.txt ksh.txt\
+ kw.txt ky.txt ky_Cyrl.txt lag.txt lb.txt\
+ lg.txt lkt.txt ln.txt lo.txt lt.txt\
+ lu.txt luo.txt luy.txt lv.txt mas.txt\
+ mer.txt mfe.txt mg.txt mgh.txt mgo.txt\
+ mk.txt ml.txt mn.txt mn_Cyrl.txt mr.txt\
+ ms.txt ms_Latn.txt mt.txt mua.txt my.txt\
+ naq.txt nb.txt nd.txt ne.txt ne_IN.txt\
+ nl.txt nmg.txt nn.txt nnh.txt nus.txt\
+ nyn.txt om.txt or.txt os.txt pa.txt\
+ pa_Arab.txt pa_Arab_PK.txt pa_Guru.txt pl.txt ps.txt\
+ pt.txt pt_AO.txt pt_CV.txt pt_GW.txt pt_MO.txt\
+ pt_MZ.txt pt_PT.txt pt_ST.txt pt_TL.txt qu.txt\
+ rm.txt rn.txt ro.txt rof.txt ru.txt\
+ rw.txt rwk.txt sah.txt saq.txt sbp.txt\
+ se.txt seh.txt ses.txt sg.txt shi.txt\
+ shi_Latn.txt shi_Tfng.txt shi_Tfng_MA.txt si.txt sk.txt\
+ sl.txt smn.txt sn.txt so.txt sq.txt\
+ sr.txt sr_Cyrl.txt sr_Latn.txt sr_Latn_BA.txt sr_Latn_ME.txt\
+ sr_Latn_RS.txt sv.txt sv_FI.txt sw.txt swc.txt\
+ ta.txt ta_MY.txt ta_SG.txt te.txt teo.txt\
+ th.txt ti.txt to.txt tr.txt twq.txt\
+ tzm.txt tzm_Latn.txt ug.txt ug_Arab.txt uk.txt\
+ ur.txt ur_IN.txt uz.txt uz_Arab.txt uz_Arab_AF.txt\
+ uz_Cyrl.txt uz_Latn.txt uz_Latn_UZ.txt vai.txt vai_Latn.txt\
+ vai_Latn_LR.txt vai_Vaii.txt vi.txt vun.txt wae.txt\
+ xog.txt yav.txt yi.txt yo.txt zgh.txt\
+ zh.txt zh_Hans.txt zh_Hans_HK.txt zh_Hans_MO.txt zh_Hans_SG.txt\
+ zh_Hant.txt zh_Hant_HK.txt zh_Hant_MO.txt zh_Hant_TW.txt zu.txt
 
diff --git a/source/data/zone/shi_Tfng_MA.txt b/source/data/zone/shi_Tfng_MA.txt
index 729e805..87d9d8f 100755
--- a/source/data/zone/shi_Tfng_MA.txt
+++ b/source/data/zone/shi_Tfng_MA.txt
@@ -3,12 +3,10 @@
 // * Copyright (C) 2014 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/icu-locale-deprecates.xml & build.xml
+// * Source File: <path>/common/main/shi_Tfng_MA.xml
 // *
 // ***************************************************************************
-/**
- * generated alias target
- */
 shi_Tfng_MA{
-    ___{""}
+    %%Parent{"shi_Tfng"}
+    Version{"2.1.6.69"}
 }
diff --git a/source/data/zone/sr_Latn_BA.txt b/source/data/zone/sr_Latn_BA.txt
index fcc337c..61e502c 100644
--- a/source/data/zone/sr_Latn_BA.txt
+++ b/source/data/zone/sr_Latn_BA.txt
@@ -3,12 +3,10 @@
 // * Copyright (C) 2014 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/icu-locale-deprecates.xml & build.xml
+// * Source File: <path>/common/main/sr_Latn_BA.xml
 // *
 // ***************************************************************************
-/**
- * generated alias target
- */
 sr_Latn_BA{
-    ___{""}
+    %%Parent{"sr_Latn"}
+    Version{"2.1.8.20"}
 }
diff --git a/source/data/zone/sr_Latn_ME.txt b/source/data/zone/sr_Latn_ME.txt
index 4887740..ddbcd9c 100755
--- a/source/data/zone/sr_Latn_ME.txt
+++ b/source/data/zone/sr_Latn_ME.txt
@@ -3,12 +3,10 @@
 // * Copyright (C) 2014 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/icu-locale-deprecates.xml & build.xml
+// * Source File: <path>/common/main/sr_Latn_ME.xml
 // *
 // ***************************************************************************
-/**
- * generated alias target
- */
 sr_Latn_ME{
-    ___{""}
+    %%Parent{"sr_Latn"}
+    Version{"2.1.8.20"}
 }
diff --git a/source/data/zone/sr_Latn_RS.txt b/source/data/zone/sr_Latn_RS.txt
index c5ee86b..14725d1 100644
--- a/source/data/zone/sr_Latn_RS.txt
+++ b/source/data/zone/sr_Latn_RS.txt
@@ -3,12 +3,10 @@
 // * Copyright (C) 2014 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/icu-locale-deprecates.xml & build.xml
+// * Source File: <path>/common/main/sr_Latn_RS.xml
 // *
 // ***************************************************************************
-/**
- * generated alias target
- */
 sr_Latn_RS{
-    ___{""}
+    %%Parent{"sr_Latn"}
+    Version{"2.1.6.69"}
 }
diff --git a/source/data/zone/uz_Arab_AF.txt b/source/data/zone/uz_Arab_AF.txt
index e438cc7..70606f1 100644
--- a/source/data/zone/uz_Arab_AF.txt
+++ b/source/data/zone/uz_Arab_AF.txt
@@ -3,12 +3,10 @@
 // * Copyright (C) 2014 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/icu-locale-deprecates.xml & build.xml
+// * Source File: <path>/common/main/uz_Arab_AF.xml
 // *
 // ***************************************************************************
-/**
- * generated alias target
- */
 uz_Arab_AF{
-    ___{""}
+    %%Parent{"uz_Arab"}
+    Version{"2.1.6.69"}
 }
diff --git a/source/data/zone/uz_Latn_UZ.txt b/source/data/zone/uz_Latn_UZ.txt
index 3b1b013..e46e887 100755
--- a/source/data/zone/uz_Latn_UZ.txt
+++ b/source/data/zone/uz_Latn_UZ.txt
@@ -3,12 +3,10 @@
 // * Copyright (C) 2014 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/icu-locale-deprecates.xml & build.xml
+// * Source File: <path>/common/main/uz_Latn_UZ.xml
 // *
 // ***************************************************************************
-/**
- * generated alias target
- */
 uz_Latn_UZ{
-    ___{""}
+    %%Parent{"uz_Latn"}
+    Version{"2.1.6.69"}
 }
diff --git a/source/data/zone/vai_Latn_LR.txt b/source/data/zone/vai_Latn_LR.txt
new file mode 100644
index 0000000..ffb3e10
--- /dev/null
+++ b/source/data/zone/vai_Latn_LR.txt
@@ -0,0 +1,12 @@
+﻿// ***************************************************************************
+// *
+// * Copyright (C) 2014 International Business Machines
+// * Corporation and others. All Rights Reserved.
+// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
+// * Source File: <path>/common/main/vai_Latn_LR.xml
+// *
+// ***************************************************************************
+vai_Latn_LR{
+    %%Parent{"vai_Latn"}
+    Version{"2.1.6.69"}
+}
diff --git a/source/data/zone/zh.txt b/source/data/zone/zh.txt
index 842daad..596e463 100644
--- a/source/data/zone/zh.txt
+++ b/source/data/zone/zh.txt
@@ -839,6 +839,12 @@ zh{
         }
         "Asia:Taipei"{
             ec{"台北"}
+            ld{"台北夏令时间"}
+            lg{"台北时间"}
+            ls{"台北标准时间"}
+            sd{"台北"}
+            sg{"台北"}
+            ss{"台北"}
         }
         "Asia:Tashkent"{
             ec{"塔什干"}
diff --git a/source/data/zone/zh_Hant.txt b/source/data/zone/zh_Hant.txt
index 053c002..b31c1ff 100644
--- a/source/data/zone/zh_Hant.txt
+++ b/source/data/zone/zh_Hant.txt
@@ -840,6 +840,12 @@ zh_Hant{
         }
         "Asia:Taipei"{
             ec{"台北"}
+            ld{"台北夏令時間"}
+            lg{"台北時間"}
+            ls{"台北標準時間"}
+            sd{"台北"}
+            sg{"台北"}
+            ss{"台北"}
         }
         "Asia:Tashkent"{
             ec{"塔什干"}
diff --git a/source/data/zone/zh_Hant_HK.txt b/source/data/zone/zh_Hant_HK.txt
index bc7f6d7..844b29a 100644
--- a/source/data/zone/zh_Hant_HK.txt
+++ b/source/data/zone/zh_Hant_HK.txt
@@ -7,6 +7,7 @@
 // *
 // ***************************************************************************
 zh_Hant_HK{
+    %%Parent{"zh_Hant"}
     Version{"2.1.8.28"}
     zoneStrings{
         "Africa:Abidjan"{
diff --git a/source/data/zone/zh_Hant_TW.txt b/source/data/zone/zh_Hant_TW.txt
index b5fc19d..507476e 100644
--- a/source/data/zone/zh_Hant_TW.txt
+++ b/source/data/zone/zh_Hant_TW.txt
@@ -3,12 +3,10 @@
 // * Copyright (C) 2014 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/icu-locale-deprecates.xml & build.xml
+// * Source File: <path>/common/main/zh_Hant_TW.xml
 // *
 // ***************************************************************************
-/**
- * generated alias target
- */
 zh_Hant_TW{
-    ___{""}
+    %%Parent{"zh_Hant"}
+    Version{"2.1.6.69"}
 }