Improve support for microseconds with Date/Timemicroseconds

It fixes several bugs:

- Fixed bug #45554 (Inconsistent behavior of the u format char).
- Fixed bug #48225 (DateTime parser doesn't set microseconds for "now").
- Fixed bug #52514 (microseconds are missing in DateTime class).
- Fixed bug #52519 (microseconds in DateInterval are missing).
- Fixed bug #68506 (General DateTime improvments needed for microseconds to become useful).
- Fixed bug #73109 (timelib_meridian doesn't parse dots correctly).
- Fixed bug #73247 (DateTime constructor does not initialise microseconds property).

It also updates timelib to 2016.04, and updates a data mapping file, which
causes changes to the volatile abbreviations tests.

1 files changed, 38 insertions, 255 deletions

diff --git a/ext/date/lib/timezonemap.h b/ext/date/lib/timezonemap.h
index 41471909ac..d8898bf33d 100644
--- a/ext/date/lib/timezonemap.h
+++ b/ext/date/lib/timezonemap.h
@@ -5,10 +5,16 @@
 	{ "acdt",  1,  37800, "Australia/South"               },
 	{ "acdt",  1,  37800, "Australia/Yancowinna"          },
 	{ "acst",  1, -14400, "America/Porto_Acre"            },
+	{ "acst",  0,  32400, "Australia/Adelaide"            },
 	{ "acst",  0,  34200, "Australia/Adelaide"            },
 	{ "acst",  1, -14400, "America/Eirunepe"              },
 	{ "acst",  1, -14400, "America/Rio_Branco"            },
 	{ "acst",  1, -14400, "Brazil/Acre"                   },
+	{ "acst",  0,  32400, "Australia/Broken_Hill"         },
+	{ "acst",  0,  32400, "Australia/Darwin"              },
+	{ "acst",  0,  32400, "Australia/North"               },
+	{ "acst",  0,  32400, "Australia/South"               },
+	{ "acst",  0,  32400, "Australia/Yancowinna"          },
 	{ "acst",  0,  34200, "Asia/Jayapura"                 },
 	{ "acst",  0,  34200, "Australia/Broken_Hill"         },
 	{ "acst",  0,  34200, "Australia/Darwin"              },
@@ -71,23 +77,16 @@
 	{ "ahst",  0, -36000, "America/Atka"                  },
 	{ "akdt",  1, -28800, "America/Anchorage"             },
 	{ "akdt",  1, -28800, "America/Juneau"                },
+	{ "akdt",  1, -28800, "America/Metlakatla"            },
 	{ "akdt",  1, -28800, "America/Nome"                  },
 	{ "akdt",  1, -28800, "America/Sitka"                 },
 	{ "akdt",  1, -28800, "America/Yakutat"               },
 	{ "akst",  0, -32400, "America/Anchorage"             },
 	{ "akst",  0, -32400, "America/Juneau"                },
+	{ "akst",  0, -32400, "America/Metlakatla"            },
 	{ "akst",  0, -32400, "America/Nome"                  },
 	{ "akst",  0, -32400, "America/Sitka"                 },
 	{ "akst",  0, -32400, "America/Yakutat"               },
-	{ "aktst", 1,  21600, "Asia/Aqtobe"                   },
-	{ "aktt",  0,  21600, "Asia/Aqtobe"                   },
-	{ "aktt",  0,  14400, "Asia/Aqtobe"                   },
-	{ "aktt",  0,  18000, "Asia/Aqtobe"                   },
-	{ "almst", 1,  25200, "Asia/Almaty"                   },
-	{ "almt",  0,  21600, "Asia/Almaty"                   },
-	{ "almt",  0,  18000, "Asia/Almaty"                   },
-	{ "amst",  1,  18000, "Asia/Yerevan"                  },
-	{ "amst",  1,  14400, "Asia/Yerevan"                  },
 	{ "amst",  1, -10800, "America/Boa_Vista"             },
 	{ "amst",  1, -10800, "America/Campo_Grande"          },
 	{ "amst",  1, -10800, "America/Cuiaba"                },
@@ -95,8 +94,6 @@
 	{ "amst",  1, -10800, "America/Porto_Velho"           },
 	{ "amst",  1, -10800, "America/Santarem"              },
 	{ "amst",  1, -10800, "Brazil/West"                   },
-	{ "amt",   0,  14400, "Asia/Yerevan"                  },
-	{ "amt",   0,  10800, "Asia/Yerevan"                  },
 	{ "amt",   0, -13840, "America/Asuncion"              },
 	{ "amt",   0, -14400, "America/Boa_Vista"             },
 	{ "amt",   0, -14400, "America/Campo_Grande"          },
@@ -111,12 +108,6 @@
 	{ "amt",   0, -14400, "Brazil/West"                   },
 	{ "amt",   0,   1172, "Europe/Amsterdam"              },
 	{ "amt",   0,   5692, "Europe/Athens"                 },
-	{ "anast", 1,  50400, "Asia/Anadyr"                   },
-	{ "anast", 1,  43200, "Asia/Anadyr"                   },
-	{ "anast", 1,  46800, "Asia/Anadyr"                   },
-	{ "anat",  0,  46800, "Asia/Anadyr"                   },
-	{ "anat",  0,  39600, "Asia/Anadyr"                   },
-	{ "anat",  0,  43200, "Asia/Anadyr"                   },
 	{ "ant",   0, -16200, "America/Curacao"               },
 	{ "ant",   0, -16200, "America/Aruba"                 },
 	{ "ant",   0, -16200, "America/Kralendijk"            },
@@ -128,12 +119,6 @@
 	{ "apt",   1, -10800, "America/Pangnirtung"           },
 	{ "apt",   1, -10800, "America/Puerto_Rico"           },
 	{ "apt",   1, -10800, "Canada/Atlantic"               },
-	{ "aqtst", 1,  21600, "Asia/Aqtau"                    },
-	{ "aqtst", 1,  18000, "Asia/Aqtau"                    },
-	{ "aqtst", 1,  21600, "Asia/Aqtobe"                   },
-	{ "aqtt",  0,  18000, "Asia/Aqtau"                    },
-	{ "aqtt",  0,  14400, "Asia/Aqtau"                    },
-	{ "aqtt",  0,  18000, "Asia/Aqtobe"                   },
 	{ "arst",  1,  -7200, "America/Buenos_Aires"          },
 	{ "arst",  1, -10800, "America/Buenos_Aires"          },
 	{ "arst",  1, -10800, "America/Argentina/Buenos_Aires" },
@@ -214,14 +199,6 @@
 	{ "art",   0, -14400, "America/Mendoza"               },
 	{ "art",   0, -14400, "America/Rosario"               },
 	{ "art",   0, -14400, "Antarctica/Palmer"             },
-	{ "ashst", 1,  21600, "Asia/Ashkhabad"                },
-	{ "ashst", 1,  18000, "Asia/Ashkhabad"                },
-	{ "ashst", 1,  18000, "Asia/Ashgabat"                 },
-	{ "ashst", 1,  21600, "Asia/Ashgabat"                 },
-	{ "asht",  0,  18000, "Asia/Ashkhabad"                },
-	{ "asht",  0,  14400, "Asia/Ashkhabad"                },
-	{ "asht",  0,  14400, "Asia/Ashgabat"                 },
-	{ "asht",  0,  18000, "Asia/Ashgabat"                 },
 	{ "ast",   0,  10800, "Asia/Riyadh"                   },
 	{ "ast",   0, -14400, "America/Anguilla"              },
 	{ "ast",   0, -14400, "America/Antigua"               },
@@ -265,7 +242,6 @@
 	{ "awdt",  1,  32400, "Australia/Perth"               },
 	{ "awdt",  1,  32400, "Australia/West"                },
 	{ "awst",  0,  28800, "Australia/Perth"               },
-	{ "awst",  0,  28800, "Antarctica/Casey"              },
 	{ "awst",  0,  28800, "Australia/West"                },
 	{ "awt",   1, -10800, "America/Halifax"               },
 	{ "awt",   1, -10800, "America/Blanc-Sablon"          },
@@ -279,14 +255,6 @@
 	{ "azost", 1,  -3600, "Atlantic/Azores"               },
 	{ "azot",  0,  -3600, "Atlantic/Azores"               },
 	{ "azot",  0,  -7200, "Atlantic/Azores"               },
-	{ "azst",  1,  18000, "Asia/Baku"                     },
-	{ "azst",  1,  14400, "Asia/Baku"                     },
-	{ "azt",   0,  14400, "Asia/Baku"                     },
-	{ "azt",   0,  10800, "Asia/Baku"                     },
-	{ "bakst", 1,  18000, "Asia/Baku"                     },
-	{ "bakst", 1,  14400, "Asia/Baku"                     },
-	{ "bakt",  0,  14400, "Asia/Baku"                     },
-	{ "bakt",  0,  10800, "Asia/Baku"                     },
 	{ "bdst",  1,   7200, "Europe/London"                 },
 	{ "bdst",  1,  25200, "Asia/Dacca"                    },
 	{ "bdst",  1,  25200, "Asia/Dhaka"                    },
@@ -326,7 +294,11 @@
 	{ "bmt",   0, -14309, "America/Barbados"              },
 	{ "bmt",   0,   6264, "Europe/Tiraspol"               },
 	{ "bmt",   0, -17776, "America/Bogota"                },
+	{ "bmt",   0,   1050, "Europe/Brussels"               },
 	{ "bmt",   0,  10656, "Asia/Baghdad"                  },
+	{ "bmt",   0,   1786, "Europe/Busingen"               },
+	{ "bmt",   0,   1786, "Europe/Vaduz"                  },
+	{ "bmt",   0,   1786, "Europe/Zurich"                 },
 	{ "bmt",   0,  24124, "Asia/Bangkok"                  },
 	{ "bmt",   0,  24124, "Asia/Phnom_Penh"               },
 	{ "bmt",   0,  24124, "Asia/Vientiane"                },
@@ -385,12 +357,12 @@
 	{ "burt",  0,  23400, "Asia/Dacca"                    },
 	{ "burt",  0,  23400, "Asia/Dhaka"                    },
 	{ "burt",  0,  23400, "Asia/Rangoon"                  },
+	{ "burt",  0,  23400, "Asia/Yangon"                   },
 	{ "cant",  0,  -3600, "Atlantic/Canary"               },
 	{ "capt",  1, -32400, "America/Anchorage"             },
 	{ "cast",  0,  34200, "Australia/Adelaide"            },
 	{ "cast",  1,  10800, "Africa/Juba"                   },
 	{ "cast",  1,  10800, "Africa/Khartoum"               },
-	{ "cast",  0,  39600, "Antarctica/Casey"              },
 	{ "cat",   0, -36000, "America/Anchorage"             },
 	{ "cat",   0,   7200, "Africa/Khartoum"               },
 	{ "cat",   0,   7200, "Africa/Blantyre"               },
@@ -466,7 +438,6 @@
 	{ "cest",  1,   7200, "Africa/Ceuta"                  },
 	{ "cest",  1,   7200, "Africa/Tripoli"                },
 	{ "cest",  1,   7200, "Africa/Tunis"                  },
-	{ "cest",  1,   7200, "Antarctica/Troll"              },
 	{ "cest",  1,   7200, "Arctic/Longyearbyen"           },
 	{ "cest",  1,   7200, "Atlantic/Jan_Mayen"            },
 	{ "cest",  1,   7200, "Europe/Amsterdam"              },
@@ -588,10 +559,7 @@
 	{ "clst",  1, -10800, "Chile/Continental"             },
 	{ "clst",  1, -14400, "Chile/Continental"             },
 	{ "clt",   0, -14400, "America/Santiago"              },
-	{ "clt",   0, -10800, "America/Santiago"              },
 	{ "clt",   0, -18000, "America/Santiago"              },
-	{ "clt",   0, -10800, "Antarctica/Palmer"             },
-	{ "clt",   0, -10800, "Chile/Continental"             },
 	{ "clt",   0, -14400, "Antarctica/Palmer"             },
 	{ "clt",   0, -14400, "Chile/Continental"             },
 	{ "clt",   0, -18000, "Chile/Continental"             },
@@ -618,6 +586,7 @@
 	{ "cmt",   0, -16356, "America/La_Paz"                },
 	{ "cmt",   0, -19176, "America/Cayman"                },
 	{ "cmt",   0, -19176, "America/Panama"                },
+	{ "cmt",   0,   3020, "Europe/Copenhagen"             },
 	{ "cmt",   0,   6900, "Europe/Chisinau"               },
 	{ "cmt",   0,   6900, "Europe/Tiraspol"               },
 	{ "cost",  1, -14400, "America/Bogota"                },
@@ -738,22 +707,13 @@
 	{ "chst",  0,  36000, "Pacific/Saipan"                },
 	{ "dact",  0,  21600, "Asia/Dacca"                    },
 	{ "dact",  0,  21600, "Asia/Dhaka"                    },
-	{ "davt",  0,  25200, "Antarctica/Davis"              },
-	{ "davt",  0,  18000, "Antarctica/Davis"              },
-	{ "ddut",  0,  36000, "Antarctica/DumontDUrville"     },
 	{ "dmt",   0,  -1521, "Europe/Dublin"                 },
-	{ "dusst", 1,  25200, "Asia/Dushanbe"                 },
-	{ "dusst", 1,  21600, "Asia/Dushanbe"                 },
-	{ "dust",  0,  21600, "Asia/Dushanbe"                 },
-	{ "dust",  0,  18000, "Asia/Dushanbe"                 },
 	{ "easst", 1, -21600, "Chile/EasterIsland"            },
 	{ "easst", 1, -18000, "Chile/EasterIsland"            },
 	{ "easst", 1, -18000, "Pacific/Easter"                },
 	{ "easst", 1, -21600, "Pacific/Easter"                },
-	{ "east",  0, -18000, "Chile/EasterIsland"            },
 	{ "east",  0, -21600, "Chile/EasterIsland"            },
 	{ "east",  0, -25200, "Chile/EasterIsland"            },
-	{ "east",  0, -18000, "Pacific/Easter"                },
 	{ "east",  0, -21600, "Pacific/Easter"                },
 	{ "east",  0, -25200, "Pacific/Easter"                },
 	{ "eat",   0,  10800, "Africa/Khartoum"               },
@@ -819,7 +779,6 @@
 	{ "eest",  1,  10800, "Europe/Moscow"                 },
 	{ "eest",  1,  10800, "Europe/Nicosia"                },
 	{ "eest",  1,  10800, "Europe/Riga"                   },
-	{ "eest",  1,  10800, "Europe/Samara"                 },
 	{ "eest",  1,  10800, "Europe/Simferopol"             },
 	{ "eest",  1,  10800, "Europe/Sofia"                  },
 	{ "eest",  1,  10800, "Europe/Tallinn"                },
@@ -921,8 +880,6 @@
 	{ "ewt",   1, -14400, "America/Thunder_Bay"           },
 	{ "ewt",   1, -14400, "America/Toronto"               },
 	{ "ewt",   1, -14400, "Canada/Eastern"                },
-	{ "fet",   0,  10800, "Europe/Kaliningrad"            },
-	{ "fet",   0,  10800, "Europe/Minsk"                  },
 	{ "ffmt",  0, -14660, "America/Martinique"            },
 	{ "fjst",  1,  46800, "Pacific/Fiji"                  },
 	{ "fjt",   0,  43200, "Pacific/Fiji"                  },
@@ -936,19 +893,9 @@
 	{ "fnst",  1,  -3600, "Brazil/DeNoronha"              },
 	{ "fnt",   0,  -7200, "America/Noronha"               },
 	{ "fnt",   0,  -7200, "Brazil/DeNoronha"              },
-	{ "fort",  0,  18000, "Asia/Aqtau"                    },
-	{ "fort",  0,  14400, "Asia/Aqtau"                    },
-	{ "frust", 1,  25200, "Asia/Bishkek"                  },
-	{ "frust", 1,  21600, "Asia/Bishkek"                  },
-	{ "frut",  0,  21600, "Asia/Bishkek"                  },
-	{ "frut",  0,  18000, "Asia/Bishkek"                  },
 	{ "galt",  0, -21600, "Pacific/Galapagos"             },
 	{ "gamt",  0, -32400, "Pacific/Gambier"               },
 	{ "gbgt",  0, -13500, "America/Guyana"                },
-	{ "gest",  1,  14400, "Asia/Tbilisi"                  },
-	{ "gest",  1,  18000, "Asia/Tbilisi"                  },
-	{ "get",   0,  14400, "Asia/Tbilisi"                  },
-	{ "get",   0,  10800, "Asia/Tbilisi"                  },
 	{ "gft",   0, -14400, "America/Cayenne"               },
 	{ "gft",   0, -10800, "America/Cayenne"               },
 	{ "ghst",  1,   1200, "Africa/Accra"                  },
@@ -990,11 +937,9 @@
 	{ "gyt",   0, -14400, "America/Guyana"                },
 	{ "gyt",   0, -10800, "America/Guyana"                },
 	{ "gyt",   0, -13500, "America/Guyana"                },
-	{ "hadt",  1, -32400, "America/Adak"                  },
-	{ "hadt",  1, -32400, "America/Atka"                  },
-	{ "hast",  0, -36000, "America/Adak"                  },
-	{ "hast",  0, -36000, "America/Atka"                  },
 	{ "hdt",   1, -34200, "Pacific/Honolulu"              },
+	{ "hdt",   1, -32400, "America/Adak"                  },
+	{ "hdt",   1, -32400, "America/Atka"                  },
 	{ "hdt",   1, -34200, "Pacific/Johnston"              },
 	{ "hkst",  1,  32400, "Asia/Hong_Kong"                },
 	{ "hkt",   0,  28800, "Asia/Hong_Kong"                },
@@ -1011,6 +956,8 @@
 	{ "hovt",  0,  21600, "Asia/Hovd"                     },
 	{ "hst",   0, -36000, "Pacific/Honolulu"              },
 	{ "hst",   0, -37800, "Pacific/Honolulu"              },
+	{ "hst",   0, -36000, "America/Adak"                  },
+	{ "hst",   0, -36000, "America/Atka"                  },
 	{ "hst",   0, -36000, "Pacific/Johnston"              },
 	{ "hst",   0, -37800, "Pacific/Johnston"              },
 	{ "ict",   0,  25200, "Asia/Bangkok"                  },
@@ -1030,16 +977,11 @@
 	{ "imt",   0,  25025, "Asia/Irkutsk"                  },
 	{ "imt",   0,   7016, "Asia/Istanbul"                 },
 	{ "imt",   0,   7016, "Europe/Istanbul"               },
+	{ "imt",   0,   7016, "Europe/Sofia"                  },
 	{ "iot",   0,  21600, "Indian/Chagos"                 },
 	{ "iot",   0,  18000, "Indian/Chagos"                 },
 	{ "irdt",  1,  16200, "Asia/Tehran"                   },
 	{ "irdt",  1,  18000, "Asia/Tehran"                   },
-	{ "irkst", 1,  32400, "Asia/Irkutsk"                  },
-	{ "irkst", 1,  28800, "Asia/Irkutsk"                  },
-	{ "irkt",  0,  28800, "Asia/Irkutsk"                  },
-	{ "irkt",  0,  25200, "Asia/Irkutsk"                  },
-	{ "irkt",  0,  32400, "Asia/Irkutsk"                  },
-	{ "irkt",  0,  28800, "Asia/Chita"                    },
 	{ "irst",  0,  12600, "Asia/Tehran"                   },
 	{ "irst",  0,  14400, "Asia/Tehran"                   },
 	{ "isst",  1,      0, "Atlantic/Reykjavik"            },
@@ -1067,7 +1009,6 @@
 	{ "ist",   0,   7200, "Asia/Tel_Aviv"                 },
 	{ "javt",  0,  26400, "Asia/Jakarta"                  },
 	{ "jcst",  0,  32400, "Asia/Pyongyang"                },
-	{ "jcst",  0,  32400, "Asia/Sakhalin"                 },
 	{ "jcst",  0,  32400, "Asia/Seoul"                    },
 	{ "jcst",  0,  32400, "Asia/Tokyo"                    },
 	{ "jcst",  0,  32400, "ROK"                           },
@@ -1087,11 +1028,11 @@
 	{ "jst",   0,  32400, "Asia/Pyongyang"                },
 	{ "jst",   0,  32400, "Asia/Rangoon"                  },
 	{ "jst",   0,  32400, "Asia/Saigon"                   },
-	{ "jst",   0,  32400, "Asia/Sakhalin"                 },
 	{ "jst",   0,  32400, "Asia/Seoul"                    },
 	{ "jst",   0,  32400, "Asia/Singapore"                },
 	{ "jst",   0,  32400, "Asia/Taipei"                   },
 	{ "jst",   0,  32400, "Asia/Ujung_Pandang"            },
+	{ "jst",   0,  32400, "Asia/Yangon"                   },
 	{ "jst",   0,  32400, "Pacific/Bougainville"          },
 	{ "jst",   0,  32400, "Pacific/Nauru"                 },
 	{ "jst",   0,  32400, "ROC"                           },
@@ -1103,37 +1044,18 @@
 	{ "kdt",   1,  34200, "Asia/Seoul"                    },
 	{ "kdt",   1,  34200, "ROK"                           },
 	{ "kdt",   1,  36000, "ROK"                           },
-	{ "kgst",  1,  21600, "Asia/Bishkek"                  },
-	{ "kgt",   0,  18000, "Asia/Bishkek"                  },
-	{ "kgt",   0,  21600, "Asia/Bishkek"                  },
-	{ "kizst", 1,  21600, "Asia/Qyzylorda"                },
-	{ "kizt",  0,  21600, "Asia/Qyzylorda"                },
-	{ "kizt",  0,  14400, "Asia/Qyzylorda"                },
-	{ "kizt",  0,  18000, "Asia/Qyzylorda"                },
 	{ "kmt",   0,   5736, "Europe/Vilnius"                },
 	{ "kmt",   0, -18431, "America/Grand_Turk"            },
 	{ "kmt",   0, -18431, "America/Jamaica"               },
 	{ "kmt",   0,   7324, "Europe/Kiev"                   },
 	{ "kost",  0,  43200, "Pacific/Kosrae"                },
 	{ "kost",  0,  39600, "Pacific/Kosrae"                },
-	{ "krast", 1,  28800, "Asia/Krasnoyarsk"              },
-	{ "krast", 1,  25200, "Asia/Krasnoyarsk"              },
-	{ "krast", 1,  25200, "Asia/Novokuznetsk"             },
-	{ "krast", 1,  28800, "Asia/Novokuznetsk"             },
-	{ "krat",  0,  25200, "Asia/Krasnoyarsk"              },
-	{ "krat",  0,  21600, "Asia/Krasnoyarsk"              },
-	{ "krat",  0,  28800, "Asia/Krasnoyarsk"              },
-	{ "krat",  0,  21600, "Asia/Novokuznetsk"             },
-	{ "krat",  0,  25200, "Asia/Novokuznetsk"             },
 	{ "kst",   0,  30600, "Asia/Seoul"                    },
 	{ "kst",   0,  32400, "Asia/Pyongyang"                },
 	{ "kst",   0,  32400, "Asia/Seoul"                    },
 	{ "kst",   0,  30600, "Asia/Pyongyang"                },
 	{ "kst",   0,  30600, "ROK"                           },
 	{ "kst",   0,  32400, "ROK"                           },
-	{ "kuyst", 1,  18000, "Europe/Samara"                 },
-	{ "kuyt",  0,  14400, "Europe/Samara"                 },
-	{ "kuyt",  0,  10800, "Europe/Samara"                 },
 	{ "kwat",  0, -43200, "Pacific/Kwajalein"             },
 	{ "lhdt",  1,  39600, "Australia/LHI"                 },
 	{ "lhdt",  1,  39600, "Australia/Lord_Howe"           },
@@ -1151,21 +1073,6 @@
 	{ "madmt", 1,   3600, "Atlantic/Madeira"              },
 	{ "madst", 1,      0, "Atlantic/Madeira"              },
 	{ "madt",  0,  -3600, "Atlantic/Madeira"              },
-	{ "magst", 1,  43200, "Asia/Magadan"                  },
-	{ "magst", 1,  39600, "Asia/Magadan"                  },
-	{ "magst", 1,  39600, "Asia/Srednekolymsk"            },
-	{ "magst", 1,  39600, "Asia/Ust-Nera"                 },
-	{ "magst", 1,  43200, "Asia/Srednekolymsk"            },
-	{ "magst", 1,  43200, "Asia/Ust-Nera"                 },
-	{ "magt",  0,  36000, "Asia/Magadan"                  },
-	{ "magt",  0,  39600, "Asia/Magadan"                  },
-	{ "magt",  0,  43200, "Asia/Magadan"                  },
-	{ "magt",  0,  36000, "Asia/Srednekolymsk"            },
-	{ "magt",  0,  36000, "Asia/Ust-Nera"                 },
-	{ "magt",  0,  39600, "Asia/Srednekolymsk"            },
-	{ "magt",  0,  39600, "Asia/Ust-Nera"                 },
-	{ "magt",  0,  43200, "Asia/Srednekolymsk"            },
-	{ "magt",  0,  43200, "Asia/Ust-Nera"                 },
 	{ "malst", 1,  26400, "Asia/Singapore"                },
 	{ "malst", 1,  26400, "Asia/Kuala_Lumpur"             },
 	{ "malt",  0,  27000, "Asia/Singapore"                },
@@ -1175,8 +1082,6 @@
 	{ "malt",  0,  26400, "Asia/Kuala_Lumpur"             },
 	{ "malt",  0,  27000, "Asia/Kuala_Lumpur"             },
 	{ "mart",  0, -34200, "Pacific/Marquesas"             },
-	{ "mawt",  0,  21600, "Antarctica/Mawson"             },
-	{ "mawt",  0,  18000, "Antarctica/Mawson"             },
 	{ "mddt",  1, -18000, "America/Cambridge_Bay"         },
 	{ "mddt",  1, -18000, "America/Yellowknife"           },
 	{ "mdst",  1,  16279, "Europe/Moscow"                 },
@@ -1202,6 +1107,8 @@
 	{ "mdt",   1, -21600, "Canada/Mountain"               },
 	{ "mdt",   1, -21600, "Canada/Saskatchewan"           },
 	{ "mdt",   1, -21600, "Mexico/BajaSur"                },
+	{ "mest",  1,   7200, "MET"                           },
+	{ "met",   0,   3600, "MET"                           },
 	{ "mht",   0,  43200, "Pacific/Kwajalein"             },
 	{ "mht",   0,  39600, "Pacific/Kwajalein"             },
 	{ "mht",   0,  39600, "Pacific/Majuro"                },
@@ -1215,6 +1122,7 @@
 	{ "mmt",   0,  17640, "Indian/Maldives"               },
 	{ "mmt",   0,  19172, "Asia/Colombo"                  },
 	{ "mmt",   0,  23400, "Asia/Rangoon"                  },
+	{ "mmt",   0,  23400, "Asia/Yangon"                   },
 	{ "mmt",   0,  28656, "Asia/Makassar"                 },
 	{ "mmt",   0,  28656, "Asia/Ujung_Pandang"            },
 	{ "mmt",   0,   6600, "Europe/Minsk"                  },
@@ -1242,13 +1150,11 @@
 	{ "msd",   1,  14400, "Europe/Kiev"                   },
 	{ "msd",   1,  14400, "Europe/Minsk"                  },
 	{ "msd",   1,  14400, "Europe/Riga"                   },
-	{ "msd",   1,  14400, "Europe/Samara"                 },
 	{ "msd",   1,  14400, "Europe/Simferopol"             },
 	{ "msd",   1,  14400, "Europe/Tallinn"                },
 	{ "msd",   1,  14400, "Europe/Tiraspol"               },
 	{ "msd",   1,  14400, "Europe/Uzhgorod"               },
 	{ "msd",   1,  14400, "Europe/Vilnius"                },
-	{ "msd",   1,  14400, "Europe/Volgograd"              },
 	{ "msd",   1,  14400, "Europe/Zaporozhye"             },
 	{ "msk",   0,  10800, "Europe/Moscow"                 },
 	{ "msk",   0,  14400, "Europe/Moscow"                 },
@@ -1257,17 +1163,13 @@
 	{ "msk",   0,  10800, "Europe/Kiev"                   },
 	{ "msk",   0,  10800, "Europe/Minsk"                  },
 	{ "msk",   0,  10800, "Europe/Riga"                   },
-	{ "msk",   0,  10800, "Europe/Samara"                 },
 	{ "msk",   0,  10800, "Europe/Simferopol"             },
 	{ "msk",   0,  10800, "Europe/Tallinn"                },
 	{ "msk",   0,  10800, "Europe/Tiraspol"               },
 	{ "msk",   0,  10800, "Europe/Uzhgorod"               },
 	{ "msk",   0,  10800, "Europe/Vilnius"                },
-	{ "msk",   0,  10800, "Europe/Volgograd"              },
 	{ "msk",   0,  10800, "Europe/Zaporozhye"             },
 	{ "msk",   0,  14400, "Europe/Simferopol"             },
-	{ "msk",   0,  14400, "Europe/Volgograd"              },
-	{ "msm",   1,  18000, "Europe/Moscow"                 },
 	{ "mst",   0, -25200, "America/Denver"                },
 	{ "mst",   0, -25200, "America/Bahia_Banderas"        },
 	{ "mst",   0, -25200, "America/Boise"                 },
@@ -1277,6 +1179,7 @@
 	{ "mst",   0, -25200, "America/Dawson_Creek"          },
 	{ "mst",   0, -25200, "America/Edmonton"              },
 	{ "mst",   0, -25200, "America/Ensenada"              },
+	{ "mst",   0, -25200, "America/Fort_Nelson"           },
 	{ "mst",   0, -25200, "America/Hermosillo"            },
 	{ "mst",   0, -25200, "America/Inuvik"                },
 	{ "mst",   0, -25200, "America/Mazatlan"              },
@@ -1332,15 +1235,10 @@
 	{ "negt",  0, -12600, "America/Paramaribo"            },
 	{ "nest",  1,   4800, "Europe/Amsterdam"              },
 	{ "net",   0,   1200, "Europe/Amsterdam"              },
+	{ "nfst",  1,  45000, "Pacific/Norfolk"               },
 	{ "nft",   0,  41400, "Pacific/Norfolk"               },
+	{ "nft",   0,  39600, "Pacific/Norfolk"               },
 	{ "nmt",   0,  40320, "Pacific/Norfolk"               },
-	{ "novst", 1,  25200, "Asia/Novosibirsk"              },
-	{ "novst", 1,  28800, "Asia/Novosibirsk"              },
-	{ "novst", 1,  25200, "Asia/Novokuznetsk"             },
-	{ "novt",  0,  21600, "Asia/Novosibirsk"              },
-	{ "novt",  0,  25200, "Asia/Novosibirsk"              },
-	{ "novt",  0,  21600, "Asia/Novokuznetsk"             },
-	{ "novt",  0,  25200, "Asia/Novokuznetsk"             },
 	{ "npt",   1,  -9000, "America/St_Johns"              },
 	{ "npt",   0,  20700, "Asia/Katmandu"                 },
 	{ "npt",   1, -36000, "America/Adak"                  },
@@ -1393,20 +1291,13 @@
 	{ "nzst",  1,  45000, "Antarctica/McMurdo"            },
 	{ "nzst",  1,  45000, "Antarctica/South_Pole"         },
 	{ "nzst",  1,  45000, "NZ"                            },
-	{ "omsst", 1,  25200, "Asia/Omsk"                     },
-	{ "omsst", 1,  21600, "Asia/Omsk"                     },
-	{ "omst",  0,  21600, "Asia/Omsk"                     },
-	{ "omst",  0,  18000, "Asia/Omsk"                     },
-	{ "omst",  0,  25200, "Asia/Omsk"                     },
-	{ "orast", 1,  18000, "Asia/Oral"                     },
-	{ "orat",  0,  18000, "Asia/Oral"                     },
-	{ "orat",  0,  14400, "Asia/Oral"                     },
 	{ "pddt",  1, -21600, "America/Inuvik"                },
 	{ "pdt",   1, -25200, "America/Los_Angeles"           },
 	{ "pdt",   1, -25200, "America/Boise"                 },
 	{ "pdt",   1, -25200, "America/Dawson"                },
 	{ "pdt",   1, -25200, "America/Dawson_Creek"          },
 	{ "pdt",   1, -25200, "America/Ensenada"              },
+	{ "pdt",   1, -25200, "America/Fort_Nelson"           },
 	{ "pdt",   1, -25200, "America/Juneau"                },
 	{ "pdt",   1, -25200, "America/Metlakatla"            },
 	{ "pdt",   1, -25200, "America/Santa_Isabel"          },
@@ -1418,10 +1309,6 @@
 	{ "pdt",   1, -25200, "Canada/Yukon"                  },
 	{ "pdt",   1, -25200, "Mexico/BajaNorte"              },
 	{ "pest",  1, -14400, "America/Lima"                  },
-	{ "petst", 1,  46800, "Asia/Kamchatka"                },
-	{ "petst", 1,  43200, "Asia/Kamchatka"                },
-	{ "pett",  0,  43200, "Asia/Kamchatka"                },
-	{ "pett",  0,  39600, "Asia/Kamchatka"                },
 	{ "pet",   0, -18000, "America/Lima"                  },
 	{ "pgt",   0,  36000, "Pacific/Bougainville"          },
 	{ "pgt",   0,  36000, "Pacific/Port_Moresby"          },
@@ -1435,12 +1322,14 @@
 	{ "plmt",  0,  25590, "Asia/Ho_Chi_Minh"              },
 	{ "plmt",  0,  25590, "Asia/Saigon"                   },
 	{ "pmdt",  1,  -7200, "America/Miquelon"              },
+	{ "pmmt",  0,  35312, "Pacific/Bougainville"          },
 	{ "pmst",  0, -10800, "America/Miquelon"              },
 	{ "pmt",   0, -13236, "America/Paramaribo"            },
 	{ "pmt",   0, -13252, "America/Paramaribo"            },
-	{ "pmt",   0,  36000, "Antarctica/DumontDUrville"     },
 	{ "pmt",   0,  13505, "Asia/Yekaterinburg"            },
 	{ "pmt",   0,  26240, "Asia/Pontianak"                },
+	{ "pmt",   0,   3464, "Europe/Bratislava"             },
+	{ "pmt",   0,   3464, "Europe/Prague"                 },
 	{ "pmt",   0,    561, "Africa/Algiers"                },
 	{ "pmt",   0,    561, "Africa/Tunis"                  },
 	{ "pmt",   0,    561, "Europe/Monaco"                 },
@@ -1452,6 +1341,7 @@
 	{ "ppt",   1, -25200, "America/Los_Angeles"           },
 	{ "ppt",   1, -25200, "America/Dawson_Creek"          },
 	{ "ppt",   1, -25200, "America/Ensenada"              },
+	{ "ppt",   1, -25200, "America/Fort_Nelson"           },
 	{ "ppt",   1, -25200, "America/Juneau"                },
 	{ "ppt",   1, -25200, "America/Metlakatla"            },
 	{ "ppt",   1, -25200, "America/Santa_Isabel"          },
@@ -1467,6 +1357,7 @@
 	{ "pst",   0, -28800, "America/Dawson"                },
 	{ "pst",   0, -28800, "America/Dawson_Creek"          },
 	{ "pst",   0, -28800, "America/Ensenada"              },
+	{ "pst",   0, -28800, "America/Fort_Nelson"           },
 	{ "pst",   0, -28800, "America/Hermosillo"            },
 	{ "pst",   0, -28800, "America/Inuvik"                },
 	{ "pst",   0, -28800, "America/Juneau"                },
@@ -1485,6 +1376,7 @@
 	{ "pwt",   1, -25200, "America/Los_Angeles"           },
 	{ "pwt",   1, -25200, "America/Dawson_Creek"          },
 	{ "pwt",   1, -25200, "America/Ensenada"              },
+	{ "pwt",   1, -25200, "America/Fort_Nelson"           },
 	{ "pwt",   1, -25200, "America/Juneau"                },
 	{ "pwt",   1, -25200, "America/Metlakatla"            },
 	{ "pwt",   1, -25200, "America/Santa_Isabel"          },
@@ -1498,24 +1390,13 @@
 	{ "pyt",   0, -14400, "America/Asuncion"              },
 	{ "pyt",   0, -10800, "America/Asuncion"              },
 	{ "qmt",   0, -18840, "America/Guayaquil"             },
-	{ "qyzst", 1,  25200, "Asia/Qyzylorda"                },
-	{ "qyzt",  0,  21600, "Asia/Qyzylorda"                },
-	{ "qyzt",  0,  18000, "Asia/Qyzylorda"                },
 	{ "ret",   0,  14400, "Indian/Reunion"                },
 	{ "rmt",   0,   5794, "Europe/Riga"                   },
 	{ "rmt",   0,  23080, "Asia/Rangoon"                  },
-	{ "rott",  0, -10800, "Antarctica/Rothera"            },
-	{ "sakst", 1,  39600, "Asia/Sakhalin"                 },
-	{ "sakst", 1,  43200, "Asia/Sakhalin"                 },
-	{ "sakt",  0,  36000, "Asia/Sakhalin"                 },
-	{ "sakt",  0,  39600, "Asia/Sakhalin"                 },
-	{ "samst", 1,  21600, "Asia/Samarkand"                },
-	{ "samst", 1,  14400, "Europe/Samara"                 },
-	{ "samst", 1,  18000, "Europe/Samara"                 },
-	{ "samt",  0,  18000, "Asia/Samarkand"                },
-	{ "samt",  0,  14400, "Asia/Samarkand"                },
-	{ "samt",  0,  10800, "Europe/Samara"                 },
-	{ "samt",  0,  14400, "Europe/Samara"                 },
+	{ "rmt",   0,  23080, "Asia/Yangon"                   },
+	{ "rmt",   0,   2996, "Europe/Rome"                   },
+	{ "rmt",   0,   2996, "Europe/San_Marino"             },
+	{ "rmt",   0,   2996, "Europe/Vatican"                },
 	{ "sast",  0,   7200, "Africa/Johannesburg"           },
 	{ "sast",  1,  10800, "Africa/Johannesburg"           },
 	{ "sast",  0,   5400, "Africa/Johannesburg"           },
@@ -1531,11 +1412,9 @@
 	{ "sct",   0,  14400, "Indian/Mahe"                   },
 	{ "sdmt",  0, -16800, "America/Santo_Domingo"         },
 	{ "sdt",   1, -36000, "Pacific/Apia"                  },
+	{ "set",   0,   3614, "Europe/Stockholm"              },
 	{ "sgt",   0,  28800, "Asia/Singapore"                },
 	{ "sgt",   0,  27000, "Asia/Singapore"                },
-	{ "shest", 1,  21600, "Asia/Aqtau"                    },
-	{ "shet",  0,  21600, "Asia/Aqtau"                    },
-	{ "shet",  0,  18000, "Asia/Aqtau"                    },
 	{ "sjmt",  0, -20173, "America/Costa_Rica"            },
 	{ "smt",   0, -13884, "Atlantic/Stanley"              },
 	{ "smt",   0, -16966, "America/Santiago"              },
@@ -1543,53 +1422,24 @@
 	{ "smt",   0,  24925, "Asia/Kuala_Lumpur"             },
 	{ "smt",   0,  24925, "Asia/Singapore"                },
 	{ "smt",   0,   8160, "Europe/Simferopol"             },
-	{ "sret",  0,  39600, "Asia/Srednekolymsk"            },
 	{ "srt",   0, -10800, "America/Paramaribo"            },
 	{ "srt",   0, -12600, "America/Paramaribo"            },
 	{ "sst",   0, -39600, "Pacific/Samoa"                 },
 	{ "sst",   0, -39600, "Pacific/Apia"                  },
 	{ "sst",   0, -39600, "Pacific/Midway"                },
 	{ "sst",   0, -39600, "Pacific/Pago_Pago"             },
-	{ "stat",  0,  10800, "Europe/Volgograd"              },
-	{ "stat",  0,  14400, "Europe/Volgograd"              },
-	{ "svest", 1,  21600, "Asia/Yekaterinburg"            },
-	{ "svest", 1,  18000, "Asia/Yekaterinburg"            },
-	{ "svet",  0,  18000, "Asia/Yekaterinburg"            },
-	{ "svet",  0,  14400, "Asia/Yekaterinburg"            },
 	{ "swat",  0,   5400, "Africa/Windhoek"               },
-	{ "syot",  0,  10800, "Antarctica/Syowa"              },
 	{ "taht",  0, -36000, "Pacific/Tahiti"                },
-	{ "tasst", 1,  25200, "Asia/Samarkand"                },
-	{ "tasst", 1,  21600, "Asia/Tashkent"                 },
-	{ "tasst", 1,  25200, "Asia/Tashkent"                 },
-	{ "tast",  0,  21600, "Asia/Samarkand"                },
-	{ "tast",  0,  18000, "Asia/Tashkent"                 },
-	{ "tast",  0,  21600, "Asia/Tashkent"                 },
-	{ "tbist", 1,  18000, "Asia/Tbilisi"                  },
-	{ "tbist", 1,  14400, "Asia/Tbilisi"                  },
-	{ "tbit",  0,  14400, "Asia/Tbilisi"                  },
-	{ "tbit",  0,  10800, "Asia/Tbilisi"                  },
 	{ "tbmt",  0,  10751, "Asia/Tbilisi"                  },
-	{ "tft",   0,  18000, "Indian/Kerguelen"              },
-	{ "tjt",   0,  18000, "Asia/Dushanbe"                 },
 	{ "tkt",   0, -39600, "Pacific/Fakaofo"               },
 	{ "tkt",   0,  46800, "Pacific/Fakaofo"               },
 	{ "tlt",   0,  32400, "Asia/Dili"                     },
 	{ "tlt",   0,  28800, "Asia/Dili"                     },
 	{ "tmt",   0,  12344, "Asia/Tehran"                   },
 	{ "tmt",   0,   5940, "Europe/Tallinn"                },
-	{ "tmt",   0,  14400, "Asia/Ashgabat"                 },
-	{ "tmt",   0,  14400, "Asia/Ashkhabad"                },
-	{ "tmt",   0,  18000, "Asia/Ashgabat"                 },
-	{ "tmt",   0,  18000, "Asia/Ashkhabad"                },
 	{ "tost",  1,  50400, "Pacific/Tongatapu"             },
 	{ "tot",   0,  46800, "Pacific/Tongatapu"             },
 	{ "tot",   0,  44400, "Pacific/Tongatapu"             },
-	{ "trst",  1,  14400, "Europe/Istanbul"               },
-	{ "trst",  1,  14400, "Asia/Istanbul"                 },
-	{ "trt",   0,  10800, "Europe/Istanbul"               },
-	{ "trt",   0,  10800, "Asia/Istanbul"                 },
-	{ "tsat",  0,  10800, "Europe/Volgograd"              },
 	{ "tvt",   0,  43200, "Pacific/Funafuti"              },
 	{ "uct",   0,      0, "Etc/UCT"                       },
 	{ "ulast", 1,  32400, "Asia/Ulaanbaatar"              },
@@ -1600,12 +1450,6 @@
 	{ "ulat",  0,  25200, "Asia/Ulan_Bator"               },
 	{ "ulat",  0,  28800, "Asia/Choibalsan"               },
 	{ "ulat",  0,  28800, "Asia/Ulan_Bator"               },
-	{ "urast", 1,  21600, "Asia/Oral"                     },
-	{ "urast", 1,  18000, "Asia/Oral"                     },
-	{ "urat",  0,  21600, "Asia/Oral"                     },
-	{ "urat",  0,  14400, "Asia/Oral"                     },
-	{ "urat",  0,  18000, "Asia/Oral"                     },
-	{ "utc",   0,      0, "Antarctica/Troll"              },
 	{ "utc",   0,      0, "Etc/Universal"                 },
 	{ "utc",   0,      0, "Etc/UTC"                       },
 	{ "utc",   0,      0, "Etc/Zulu"                      },
@@ -1616,27 +1460,8 @@
 	{ "uyst",  1,  -7200, "America/Montevideo"            },
 	{ "uyt",   0, -10800, "America/Montevideo"            },
 	{ "uyt",   0, -12600, "America/Montevideo"            },
-	{ "uzst",  1,  21600, "Asia/Samarkand"                },
-	{ "uzst",  1,  21600, "Asia/Tashkent"                 },
-	{ "uzt",   0,  18000, "Asia/Samarkand"                },
-	{ "uzt",   0,  18000, "Asia/Tashkent"                 },
 	{ "vet",   0, -16200, "America/Caracas"               },
 	{ "vet",   0, -14400, "America/Caracas"               },
-	{ "vlast", 1,  39600, "Asia/Vladivostok"              },
-	{ "vlast", 1,  36000, "Asia/Vladivostok"              },
-	{ "vlast", 1,  39600, "Asia/Khandyga"                 },
-	{ "vlat",  0,  36000, "Asia/Vladivostok"              },
-	{ "vlat",  0,  32400, "Asia/Vladivostok"              },
-	{ "vlat",  0,  39600, "Asia/Vladivostok"              },
-	{ "vlat",  0,  36000, "Asia/Khandyga"                 },
-	{ "vlat",  0,  36000, "Asia/Ust-Nera"                 },
-	{ "vlat",  0,  39600, "Asia/Khandyga"                 },
-	{ "vlat",  0,  39600, "Asia/Ust-Nera"                 },
-	{ "volst", 1,  14400, "Europe/Volgograd"              },
-	{ "volst", 1,  18000, "Europe/Volgograd"              },
-	{ "volt",  0,  10800, "Europe/Volgograd"              },
-	{ "volt",  0,  14400, "Europe/Volgograd"              },
-	{ "vost",  0,  21600, "Antarctica/Vostok"             },
 	{ "vust",  1,  43200, "Pacific/Efate"                 },
 	{ "vut",   0,  39600, "Pacific/Efate"                 },
 	{ "wakt",  0,  43200, "Pacific/Wake"                  },
@@ -1737,23 +1562,6 @@
 	{ "wsst",  0,  46800, "Pacific/Apia"                  },
 	{ "xjt",   0,  21600, "Asia/Kashgar"                  },
 	{ "xjt",   0,  21600, "Asia/Urumqi"                   },
-	{ "yakst", 1,  36000, "Asia/Yakutsk"                  },
-	{ "yakst", 1,  32400, "Asia/Yakutsk"                  },
-	{ "yakst", 1,  32400, "Asia/Chita"                    },
-	{ "yakst", 1,  32400, "Asia/Khandyga"                 },
-	{ "yakst", 1,  36000, "Asia/Chita"                    },
-	{ "yakst", 1,  36000, "Asia/Khandyga"                 },
-	{ "yakt",  0,  32400, "Asia/Yakutsk"                  },
-	{ "yakt",  0,  28800, "Asia/Yakutsk"                  },
-	{ "yakt",  0,  36000, "Asia/Yakutsk"                  },
-	{ "yakt",  0,  28800, "Asia/Chita"                    },
-	{ "yakt",  0,  28800, "Asia/Khandyga"                 },
-	{ "yakt",  0,  28800, "Asia/Ust-Nera"                 },
-	{ "yakt",  0,  32400, "Asia/Chita"                    },
-	{ "yakt",  0,  32400, "Asia/Khandyga"                 },
-	{ "yakt",  0,  32400, "Asia/Ust-Nera"                 },
-	{ "yakt",  0,  36000, "Asia/Chita"                    },
-	{ "yakt",  0,  36000, "Asia/Khandyga"                 },
 	{ "yddt",  1, -25200, "America/Dawson"                },
 	{ "yddt",  1, -25200, "America/Whitehorse"            },
 	{ "yddt",  1, -25200, "Canada/Yukon"                  },
@@ -1762,13 +1570,6 @@
 	{ "ydt",   1, -28800, "America/Whitehorse"            },
 	{ "ydt",   1, -28800, "America/Yakutat"               },
 	{ "ydt",   1, -28800, "Canada/Yukon"                  },
-	{ "yekst", 1,  21600, "Asia/Yekaterinburg"            },
-	{ "yekt",  0,  18000, "Asia/Yekaterinburg"            },
-	{ "yekt",  0,  21600, "Asia/Yekaterinburg"            },
-	{ "yerst", 1,  18000, "Asia/Yerevan"                  },
-	{ "yerst", 1,  14400, "Asia/Yerevan"                  },
-	{ "yert",  0,  14400, "Asia/Yerevan"                  },
-	{ "yert",  0,  10800, "Asia/Yerevan"                  },
 	{ "ypt",   1, -28800, "America/Dawson"                },
 	{ "ypt",   1, -28800, "America/Whitehorse"            },
 	{ "ypt",   1, -28800, "America/Yakutat"               },
@@ -1809,22 +1610,4 @@
 	{ "w",     0, -36000, NULL                            },
 	{ "x",     0, -39600, NULL                            },
 	{ "y",     0, -43200, NULL                            },
-	{ "zzz",   0,      0, "Antarctica/Davis"              },
-	{ "zzz",   0,      0, "America/Cambridge_Bay"         },
-	{ "zzz",   0,      0, "America/Inuvik"                },
-	{ "zzz",   0,      0, "America/Iqaluit"               },
-	{ "zzz",   0,      0, "America/Pangnirtung"           },
-	{ "zzz",   0,      0, "America/Rankin_Inlet"          },
-	{ "zzz",   0,      0, "America/Resolute"              },
-	{ "zzz",   0,      0, "America/Yellowknife"           },
-	{ "zzz",   0,      0, "Antarctica/Casey"              },
-	{ "zzz",   0,      0, "Antarctica/DumontDUrville"     },
-	{ "zzz",   0,      0, "Antarctica/Macquarie"          },
-	{ "zzz",   0,      0, "Antarctica/Mawson"             },
-	{ "zzz",   0,      0, "Antarctica/Palmer"             },
-	{ "zzz",   0,      0, "Antarctica/Rothera"            },
-	{ "zzz",   0,      0, "Antarctica/Syowa"              },
-	{ "zzz",   0,      0, "Antarctica/Troll"              },
-	{ "zzz",   0,      0, "Antarctica/Vostok"             },
-	{ "zzz",   0,      0, "Indian/Kerguelen"              },
 	{ "z",     0,      0, NULL                            },