From 37d4e68cd42ed9ad77077dac7d5c3c742dde5506 Mon Sep 17 00:00:00 2001
From: Yoshito Umaoka <y.umaoka@gmail.com>
Date: Tue, 12 Aug 2014 16:37:22 +0000
Subject: [PATCH] ICU-10898 Updated tzdbNames.txt based on tzdata2014f.

X-SVN-Rev: 36144
---
 icu4c/source/data/zone/tzdbNames.txt    | 31 +++++++++++--------------
 icu4c/source/test/intltest/tzfmttst.cpp |  8 +++----
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/icu4c/source/data/zone/tzdbNames.txt b/icu4c/source/data/zone/tzdbNames.txt
index e603fa56fe3..a6940040432 100644
--- a/icu4c/source/data/zone/tzdbNames.txt
+++ b/icu4c/source/data/zone/tzdbNames.txt
@@ -12,6 +12,7 @@ tzdbNames{
         "meta:Acre"{
             sd{"ACST"}
             ss{"ACT"}
+            parseRegions{"BR"}
         }
         "meta:Afghanistan"{
             ss{"AFT"}
@@ -76,6 +77,10 @@ tzdbNames{
             sd{"ANAST"}
             ss{"ANAT"}
         }
+        "meta:Apia"{
+            sd{"WSDT"}
+            ss{"WST"}
+        }
         "meta:Aqtau"{
             sd{"AQTST"}
             ss{"AQTT"}
@@ -113,22 +118,20 @@ tzdbNames{
             ss{"AST"}
         }
         "meta:Australia_Central"{
-            sd{"CST"}
-            ss{"CST"}
-            parseRegions{"AU"}
+            sd{"ACDT"}
+            ss{"ACST"}
         }
         "meta:Australia_CentralWestern"{
-            sd{"CWST"}
-            ss{"CWST"}
+            sd{"ACWDT"}
+            ss{"ACWST"}
         }
         "meta:Australia_Eastern"{
-            sd{"EST"}
-            ss{"EST"}
-            parseRegions{"AU"}
+            sd{"AEDT"}
+            ss{"AEST"}
         }
         "meta:Australia_Western"{
-            sd{"WST"}
-            ss{"WST"}
+            sd{"AWDT"}
+            ss{"AWST"}
         }
         "meta:Azerbaijan"{
             sd{"AZT"}
@@ -378,9 +381,6 @@ tzdbNames{
         "meta:Karachi"{
             ss{"KART"}
         }
-        "meta:Kashgar"{
-            ss{"KAST"}
-        }
         "meta:Kazakhstan_Eastern"{
             sd{"ALMST"}
             ss{"ALMT"}
@@ -424,9 +424,6 @@ tzdbNames{
         "meta:Line_Islands"{
             ss{"LINT"}
         }
-        "meta:Long_Shu"{
-            ss{"LONT"}
-        }
         "meta:Lord_Howe"{
             ss{"LHST"}
         }
@@ -659,7 +656,7 @@ tzdbNames{
             ss{"UYT"}
         }
         "meta:Urumqi"{
-            ss{"URUT"}
+            ss{"XJT"}
         }
         "meta:Uzbekistan"{
             sd{"UZST"}
diff --git a/icu4c/source/test/intltest/tzfmttst.cpp b/icu4c/source/test/intltest/tzfmttst.cpp
index e1fd2c9b355..c3a03317cc4 100644
--- a/icu4c/source/test/intltest/tzfmttst.cpp
+++ b/icu4c/source/test/intltest/tzfmttst.cpp
@@ -807,8 +807,8 @@ TimeZoneFormatTest::TestParse(void) {
             {"CST",             0,      "zh_CN",    UTZFMT_STYLE_SPECIFIC_SHORT,
                 UTZFMT_PARSE_OPTION_TZ_DATABASE_ABBREVIATIONS,  "Asia/Shanghai",    3,  UTZFMT_TIME_TYPE_STANDARD},
 
-            {"EST",             0,      "en_AU",    UTZFMT_STYLE_SPECIFIC_SHORT,
-                UTZFMT_PARSE_OPTION_TZ_DATABASE_ABBREVIATIONS,  "Australia/Sydney", 3,  UTZFMT_TIME_TYPE_UNKNOWN},
+            {"AEST",            0,      "en_AU",    UTZFMT_STYLE_SPECIFIC_SHORT,
+                UTZFMT_PARSE_OPTION_TZ_DATABASE_ABBREVIATIONS,  "Australia/Sydney", 4,  UTZFMT_TIME_TYPE_STANDARD},
 
             {"AST",             0,      "ar_SA",    UTZFMT_STYLE_SPECIFIC_SHORT,
                 UTZFMT_PARSE_OPTION_TZ_DATABASE_ABBREVIATIONS,  "Asia/Riyadh",      3,  UTZFMT_TIME_TYPE_STANDARD},
@@ -1185,7 +1185,7 @@ TimeZoneFormatTest::TestFormatTZDBNames(void) {
             "Australia/Sydney",
             dateJan,
             UTZFMT_STYLE_SPECIFIC_SHORT,
-            "EST",
+            "AEDT",
             UTZFMT_TIME_TYPE_DAYLIGHT
         },
         {
@@ -1193,7 +1193,7 @@ TimeZoneFormatTest::TestFormatTZDBNames(void) {
             "Australia/Sydney",
             dateJul,
             UTZFMT_STYLE_SPECIFIC_SHORT,
-            "EST",
+            "AEST",
             UTZFMT_TIME_TYPE_STANDARD
         },