ICU-10898 Updated tzdbNames.txt based on tzdata2014f.

X-SVN-Rev: 36144

diff --git a/icu4c/source/data/zone/tzdbNames.txt b/icu4c/source/data/zone/tzdbNames.txt
index e603fa56fe390c5fade04e69538044968fd4ca3c..a6940040432d3803e8aa88f0cc286f62bc215b97 100644 (file)
--- a/icu4c/source/data/zone/tzdbNames.txt
+++ b/icu4c/source/data/zone/tzdbNames.txt
@@ -12,6 +12,7 @@ tzdbNames{
         "meta:Acre"{\r
             sd{"ACST"}\r
             ss{"ACT"}\r
+            parseRegions{"BR"}\r
         }\r
         "meta:Afghanistan"{\r
             ss{"AFT"}\r
@@ -76,6 +77,10 @@ tzdbNames{
             sd{"ANAST"}\r
             ss{"ANAT"}\r
         }\r
+        "meta:Apia"{\r
+            sd{"WSDT"}\r
+            ss{"WST"}\r
+        }\r
         "meta:Aqtau"{\r
             sd{"AQTST"}\r
             ss{"AQTT"}\r
@@ -113,22 +118,20 @@ tzdbNames{
             ss{"AST"}\r
         }\r
         "meta:Australia_Central"{\r
-            sd{"CST"}\r
-            ss{"CST"}\r
-            parseRegions{"AU"}\r
+            sd{"ACDT"}\r
+            ss{"ACST"}\r
         }\r
         "meta:Australia_CentralWestern"{\r
-            sd{"CWST"}\r
-            ss{"CWST"}\r
+            sd{"ACWDT"}\r
+            ss{"ACWST"}\r
         }\r
         "meta:Australia_Eastern"{\r
-            sd{"EST"}\r
-            ss{"EST"}\r
-            parseRegions{"AU"}\r
+            sd{"AEDT"}\r
+            ss{"AEST"}\r
         }\r
         "meta:Australia_Western"{\r
-            sd{"WST"}\r
-            ss{"WST"}\r
+            sd{"AWDT"}\r
+            ss{"AWST"}\r
         }\r
         "meta:Azerbaijan"{\r
             sd{"AZT"}\r
@@ -378,9 +381,6 @@ tzdbNames{
         "meta:Karachi"{\r
             ss{"KART"}\r
         }\r
-        "meta:Kashgar"{\r
-            ss{"KAST"}\r
-        }\r
         "meta:Kazakhstan_Eastern"{\r
             sd{"ALMST"}\r
             ss{"ALMT"}\r
@@ -424,9 +424,6 @@ tzdbNames{
         "meta:Line_Islands"{\r
             ss{"LINT"}\r
         }\r
-        "meta:Long_Shu"{\r
-            ss{"LONT"}\r
-        }\r
         "meta:Lord_Howe"{\r
             ss{"LHST"}\r
         }\r
@@ -659,7 +656,7 @@ tzdbNames{
             ss{"UYT"}\r
         }\r
         "meta:Urumqi"{\r
-            ss{"URUT"}\r
+            ss{"XJT"}\r
         }\r
         "meta:Uzbekistan"{\r
             sd{"UZST"}\r

diff --git a/icu4c/source/test/intltest/tzfmttst.cpp b/icu4c/source/test/intltest/tzfmttst.cpp
index e1fd2c9b35525a79bec82e5b7ad4fb7ee430f1d9..c3a03317cc40b4957e909358b1fdc76bdf706dd0 100644 (file)
--- 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
         },