time: run genzabbrs.go with new source data

The source xml data has changed, so running genzabbrs.go
regenerates a new time zone file in zoneinfo_abbrs_windows.go
which adds some zones and adjusts others.

Now set export ZONEINFO=$GOROOT/lib/time/zoneinfo.zip to use zoneinfo.zip in go tip.

Change-Id: I19f72359cc808094e5dcb420e480a00c6b2205d7
Reviewed-on: https://go-review.googlesource.com/23321
Reviewed-by: Alex Brainman <alex.brainman@gmail.com>
Run-TryBot: Alex Brainman <alex.brainman@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>

diff --git a/src/time/zoneinfo_abbrs_windows.go b/src/time/zoneinfo_abbrs_windows.go
index 51a1a2f66d87e31e6f55632a5533f10515284ac6..344a891d1a4eb15bd20706a2e6d3acffe3c537aa 100644 (file)
--- a/src/time/zoneinfo_abbrs_windows.go
+++ b/src/time/zoneinfo_abbrs_windows.go
@@ -22,9 +22,10 @@ var abbrs = map[string]abbr{
        "Namibia Standard Time":           {"WAT", "WAST"},   // Africa/Windhoek
        "Alaskan Standard Time":           {"AKST", "AKDT"},  // America/Anchorage
        "Paraguay Standard Time":          {"PYT", "PYST"},   // America/Asuncion
-       "Bahia Standard Time":             {"BRT", "BRST"},   // America/Bahia
+       "Bahia Standard Time":             {"BRT", "BRT"},    // America/Bahia
        "SA Pacific Standard Time":        {"COT", "COT"},    // America/Bogota
        "Argentina Standard Time":         {"ART", "ART"},    // America/Buenos_Aires
+       "Eastern Standard Time (Mexico)":  {"EST", "EST"},    // America/Cancun
        "Venezuela Standard Time":         {"VET", "VET"},    // America/Caracas
        "SA Eastern Standard Time":        {"GFT", "GFT"},    // America/Cayenne
        "Central Standard Time":           {"CST", "CDT"},    // America/Chicago
@@ -38,21 +39,22 @@ var abbrs = map[string]abbr{
        "SA Western Standard Time":        {"BOT", "BOT"},    // America/La_Paz
        "Pacific Standard Time":           {"PST", "PDT"},    // America/Los_Angeles
        "Central Standard Time (Mexico)":  {"CST", "CDT"},    // America/Mexico_City
-       "Montevideo Standard Time":        {"UYT", "UYST"},   // America/Montevideo
+       "Montevideo Standard Time":        {"UYT", "UYT"},    // America/Montevideo
        "Eastern Standard Time":           {"EST", "EDT"},    // America/New_York
        "US Mountain Standard Time":       {"MST", "MST"},    // America/Phoenix
        "Canada Central Standard Time":    {"CST", "CST"},    // America/Regina
-       "Pacific Standard Time (Mexico)":  {"PST", "PDT"},    // America/Santa_Isabel
        "Pacific SA Standard Time":        {"CLT", "CLST"},   // America/Santiago
        "E. South America Standard Time":  {"BRT", "BRST"},   // America/Sao_Paulo
        "Newfoundland Standard Time":      {"NST", "NDT"},    // America/St_Johns
-       "Central Asia Standard Time":      {"ALMT", "ALMT"},  // Asia/Almaty
+       "Central Asia Standard Time":      {"+06", "+06"},    // Asia/Almaty
        "Jordan Standard Time":            {"EET", "EEST"},   // Asia/Amman
        "Arabic Standard Time":            {"AST", "AST"},    // Asia/Baghdad
-       "Azerbaijan Standard Time":        {"AZT", "AZST"},   // Asia/Baku
+       "Azerbaijan Standard Time":        {"AZT", "AZT"},    // Asia/Baku
        "SE Asia Standard Time":           {"ICT", "ICT"},    // Asia/Bangkok
+       "Altai Standard Time":             {"+06", "+07"},    // Asia/Barnaul
        "Middle East Standard Time":       {"EET", "EEST"},   // Asia/Beirut
        "India Standard Time":             {"IST", "IST"},    // Asia/Calcutta
+       "Transbaikal Standard Time":       {"IRKT", "YAKT"},  // Asia/Chita
        "Sri Lanka Standard Time":         {"IST", "IST"},    // Asia/Colombo
        "Syria Standard Time":             {"EET", "EEST"},   // Asia/Damascus
        "Bangladesh Standard Time":        {"BDT", "BDT"},    // Asia/Dhaka
@@ -60,22 +62,26 @@ var abbrs = map[string]abbr{
        "North Asia East Standard Time":   {"IRKT", "IRKT"},  // Asia/Irkutsk
        "Israel Standard Time":            {"IST", "IDT"},    // Asia/Jerusalem
        "Afghanistan Standard Time":       {"AFT", "AFT"},    // Asia/Kabul
+       "Russia Time Zone 11":             {"PETT", "PETT"},  // Asia/Kamchatka
        "Pakistan Standard Time":          {"PKT", "PKT"},    // Asia/Karachi
        "Nepal Standard Time":             {"NPT", "NPT"},    // Asia/Katmandu
        "North Asia Standard Time":        {"KRAT", "KRAT"},  // Asia/Krasnoyarsk
        "Magadan Standard Time":           {"MAGT", "MAGT"},  // Asia/Magadan
        "N. Central Asia Standard Time":   {"NOVT", "NOVT"},  // Asia/Novosibirsk
+       "North Korea Standard Time":       {"KST", "KST"},    // Asia/Pyongyang
        "Myanmar Standard Time":           {"MMT", "MMT"},    // Asia/Rangoon
        "Arab Standard Time":              {"AST", "AST"},    // Asia/Riyadh
+       "Sakhalin Standard Time":          {"SAKT", "SAKT"},  // Asia/Sakhalin
        "Korea Standard Time":             {"KST", "KST"},    // Asia/Seoul
        "China Standard Time":             {"CST", "CST"},    // Asia/Shanghai
        "Singapore Standard Time":         {"SGT", "SGT"},    // Asia/Singapore
+       "Russia Time Zone 10":             {"SRET", "SRET"},  // Asia/Srednekolymsk
        "Taipei Standard Time":            {"CST", "CST"},    // Asia/Taipei
        "West Asia Standard Time":         {"UZT", "UZT"},    // Asia/Tashkent
        "Georgian Standard Time":          {"GET", "GET"},    // Asia/Tbilisi
        "Iran Standard Time":              {"IRST", "IRDT"},  // Asia/Tehran
        "Tokyo Standard Time":             {"JST", "JST"},    // Asia/Tokyo
-       "Ulaanbaatar Standard Time":       {"ULAT", "ULAT"},  // Asia/Ulaanbaatar
+       "Ulaanbaatar Standard Time":       {"ULAT", "ULAST"}, // Asia/Ulaanbaatar
        "Vladivostok Standard Time":       {"VLAT", "VLAT"},  // Asia/Vladivostok
        "Yakutsk Standard Time":           {"YAKT", "YAKT"},  // Asia/Yakutsk
        "Ekaterinburg Standard Time":      {"YEKT", "YEKT"},  // Asia/Yekaterinburg
@@ -83,31 +89,35 @@ var abbrs = map[string]abbr{
        "Azores Standard Time":            {"AZOT", "AZOST"}, // Atlantic/Azores
        "Cape Verde Standard Time":        {"CVT", "CVT"},    // Atlantic/Cape_Verde
        "Greenwich Standard Time":         {"GMT", "GMT"},    // Atlantic/Reykjavik
-       "Cen. Australia Standard Time":    {"CST", "CST"},    // Australia/Adelaide
-       "E. Australia Standard Time":      {"EST", "EST"},    // Australia/Brisbane
-       "AUS Central Standard Time":       {"CST", "CST"},    // Australia/Darwin
-       "Tasmania Standard Time":          {"EST", "EST"},    // Australia/Hobart
-       "W. Australia Standard Time":      {"WST", "WST"},    // Australia/Perth
-       "AUS Eastern Standard Time":       {"EST", "EST"},    // Australia/Sydney
+       "Cen. Australia Standard Time":    {"ACST", "ACDT"},  // Australia/Adelaide
+       "E. Australia Standard Time":      {"AEST", "AEST"},  // Australia/Brisbane
+       "AUS Central Standard Time":       {"ACST", "ACST"},  // Australia/Darwin
+       "Tasmania Standard Time":          {"AEST", "AEDT"},  // Australia/Hobart
+       "W. Australia Standard Time":      {"AWST", "AWST"},  // Australia/Perth
+       "AUS Eastern Standard Time":       {"AEST", "AEDT"},  // Australia/Sydney
        "UTC":                            {"GMT", "GMT"},       // Etc/GMT
        "UTC-11":                         {"GMT+11", "GMT+11"}, // Etc/GMT+11
        "Dateline Standard Time":         {"GMT+12", "GMT+12"}, // Etc/GMT+12
        "UTC-02":                         {"GMT+2", "GMT+2"},   // Etc/GMT+2
        "UTC+12":                         {"GMT-12", "GMT-12"}, // Etc/GMT-12
+       "Astrakhan Standard Time":        {"+03", "+04"},       // Europe/Astrakhan
        "W. Europe Standard Time":        {"CET", "CEST"},      // Europe/Berlin
        "GTB Standard Time":              {"EET", "EEST"},      // Europe/Bucharest
        "Central Europe Standard Time":   {"CET", "CEST"},      // Europe/Budapest
+       "E. Europe Standard Time":        {"EET", "EEST"},      // Europe/Chisinau
        "Turkey Standard Time":           {"EET", "EEST"},      // Europe/Istanbul
-       "Kaliningrad Standard Time":      {"FET", "FET"},       // Europe/Kaliningrad
+       "Kaliningrad Standard Time":      {"EET", "EET"},       // Europe/Kaliningrad
        "FLE Standard Time":              {"EET", "EEST"},      // Europe/Kiev
        "GMT Standard Time":              {"GMT", "BST"},       // Europe/London
+       "Belarus Standard Time":          {"MSK", "MSK"},       // Europe/Minsk
        "Russian Standard Time":          {"MSK", "MSK"},       // Europe/Moscow
        "Romance Standard Time":          {"CET", "CEST"},      // Europe/Paris
+       "Russia Time Zone 3":             {"SAMT", "SAMT"},     // Europe/Samara
        "Central European Standard Time": {"CET", "CEST"},      // Europe/Warsaw
        "Mauritius Standard Time":        {"MUT", "MUT"},       // Indian/Mauritius
-       "Samoa Standard Time":            {"WST", "WST"},       // Pacific/Apia
+       "Samoa Standard Time":            {"WSST", "WSDT"},     // Pacific/Apia
        "New Zealand Standard Time":      {"NZST", "NZDT"},     // Pacific/Auckland
-       "Fiji Standard Time":             {"FJT", "FJT"},       // Pacific/Fiji
+       "Fiji Standard Time":             {"FJT", "FJST"},      // Pacific/Fiji
        "Central Pacific Standard Time":  {"SBT", "SBT"},       // Pacific/Guadalcanal
        "Hawaiian Standard Time":         {"HST", "HST"},       // Pacific/Honolulu
        "Line Islands Standard Time":     {"LINT", "LINT"},     // Pacific/Kiritimati