From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Fri, 3 Oct 2014 21:44:38 +0000 (-0400)
Subject: Update time zone abbreviations lists.
X-Git-Tag: REL9_4_BETA3~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d13913c820c2b6ea418d51106c199d01c50eb14b;p=postgresql

Update time zone abbreviations lists.

This updates known_abbrevs.txt to be what it should have been already,
were my -P patch not broken; and updates some tznames/ entries that
missed getting any love in previous timezone data updates because zic
failed to flag the change of abbreviation.

The non-cosmetic updates:

* Remove references to "ADT" as "Arabia Daylight Time", an abbreviation
that's been out of use since 2007; therefore, claiming there is a conflict
with "Atlantic Daylight Time" doesn't seem especially helpful.  (We have
left obsolete entries in the files when they didn't conflict with anything,
but that seems like a different situation.)

* Fix entirely incorrect GMT offsets for CKT (Cook Islands), FJT, FJST
(Fiji); we didn't even have them on the proper side of the date line.
(Seems to have been aboriginal errors in our tznames data; there's no
evidence anything actually changed recently.)

* FKST (Falkland Islands Summer Time) is now used all year round, so
don't mark it as a DST abbreviation.

* Update SAKT (Sakhalin) to mean GMT+11 not GMT+10.

In cosmetic changes, I fixed a bunch of wrong (or at least obsolete)
claims about abbreviations not being present in the zic files, and
tried to be consistent about how obsolete abbreviations are labeled.

Note the underlying timezone/data files are still at release 2014e;
this is just trying to get us in sync with what those files actually
say before we go to the next update.
---

diff --git a/src/timezone/known_abbrevs.txt b/src/timezone/known_abbrevs.txt
index affe8ca91c..52862fee48 100644
--- a/src/timezone/known_abbrevs.txt
+++ b/src/timezone/known_abbrevs.txt
@@ -1,64 +1,67 @@
-ADDT	-7200	D
+ACT	-18000
 ADT	-10800	D
-ADT	14400	D
 AFT	16200
+AKDT	-28800	D
 AKST	-32400
-ALMST	25200	D
+ALMT	21600
+AMST	-10800	D
 AMT	-14400
 AMT	14400
-ANAT	39600
-APT	-10800	D
-AQTT	14400
+ANAT	43200
 AQTT	18000
 ART	-10800
 AST	-14400
 AST	10800
-AWT	-10800	D
+AZOST	0	D
 AZOT	-3600
 AZST	18000	D
-BDST	25200	D
-BEAT	9000
-BEAUT	9900
+AZT	14400
+BDT	21600
 BNT	28800
 BOT	-14400
+BRST	-7200	D
 BRT	-10800
+BST	3600	D
 BTT	21600
-CAST	10800	D
 CAT	7200
 CCT	23400
 CDT	-14400	D
 CDT	-18000	D
-CDT	32400	D
 CEST	7200	D
 CET	3600
+CHADT	49500	D
 CHAST	45900
 CHOT	28800
 CHUT	36000
-CKHST	-34200	D
+CKT	-36000
+CLST	-10800	D
 CLT	-14400
 COT	-18000
-CPT	-18000	D
+CST	-18000
 CST	-21600
 CST	28800
 CST	34200
+CST	37800	D
 CVT	-3600
 CWST	31500
-CWT	-18000	D
 CXT	25200
 ChST	36000
 DAVT	25200
 DDUT	36000
 EASST	-18000	D
+EAST	-21600
 EAT	10800
 ECT	-18000
 EDT	-14400	D
 EEST	10800	D
 EET	7200
 EGST	0	D
-EPT	-14400	D
+EGT	-3600
 EST	-18000
 EST	36000
+EST	39600	D
 FET	10800
+FJST	46800	D
 FJT	43200
 FKST	-10800
 FNT	-7200
@@ -68,99 +71,77 @@ GET	14400
 GFT	-10800
 GILT	43200
 GMT	0
-GMT+1	-3600
-GMT+10	-36000
-GMT+11	-39600
-GMT+12	-43200
-GMT+2	-7200
-GMT+3	-10800
-GMT+4	-14400
-GMT+5	-18000
-GMT+6	-21600
-GMT+7	-25200
-GMT+8	-28800
-GMT+9	-32400
-GMT-1	3600
-GMT-10	36000
-GMT-11	39600
-GMT-12	43200
-GMT-13	46800
-GMT-14	50400
-GMT-2	7200
-GMT-3	10800
-GMT-4	14400
-GMT-5	18000
-GMT-6	21600
-GMT-7	25200
-GMT-8	28800
-GMT-9	32400
 GST	-7200
 GST	14400
 GYT	-14400
+HADT	-32400	D
 HAST	-36000
+HKT	28800
 HOVT	25200
 HST	-36000
 ICT	25200
-ICT	28800
-IDDT	14400	D
+IDT	10800	D
 IOT	21600
 IRDT	16200	D
 IRKT	32400
-IST	23400	D
+IRST	12600
+IST	19800
+IST	3600	D
+IST	7200
 JST	32400
-KDT	36000	D
 KGT	21600
-KOST	43200
+KOST	39600
 KRAT	28800
-KST	28800
+KST	32400
+LHST	37800
 LHST	39600	D
 LINT	50400
-LKT	21600
 MAGT	43200
 MART	-34200
 MAWT	18000
 MDT	-21600	D
+MEST	7200	D
 MET	3600
 MHT	43200
 MIST	39600
 MMT	23400
-MPT	-21600	D
 MSK	14400
 MST	-25200
 MUT	14400
 MVT	18000
-MWT	-21600	D
 MYT	28800
 MeST	-28800
 NCT	39600
-NDDT	-5400	D
+NDT	-9000	D
 NFT	41400
-NOVST	25200	D
 NOVT	25200
 NPT	20700
 NRT	43200
+NST	-12600
 NUT	-39600
+NZDT	46800	D
 NZST	43200
 OMST	25200
 ORAT	18000
 PDT	-25200	D
 PET	-18000
-PETT	39600
+PETT	43200
 PGT	36000
 PHOT	46800
+PHT	28800
 PKT	18000
 PMDT	-7200	D
+PMST	-10800
 PONT	39600
-PPT	-25200	D
 PST	-28800
 PWT	32400
 PYST	-10800	D
+PYT	-14400
 QYZT	21600
 RET	14400
 ROTT	-10800
-SAKT	36000
-SAMT	10800
-SAST	10800	D
+SAKT	39600
+SAMT	14400
 SAST	7200
 SBT	39600
 SCT	14400
@@ -172,32 +153,32 @@ TAHT	-36000
 TFT	18000
 TJT	18000
 TKT	46800
+TLT	32400
 TMT	18000
-TOST	50400	D
+TOT	46800
 TVT	43200
-UCT	0
 ULAT	28800
 UTC	0
-UYHST	-9000	D
+UYST	-7200	D
+UYT	-10800
 UZT	18000
-VET	-14400
+VET	-16200
 VLAT	39600
-VOLT	10800
+VOLT	14400
 VOST	21600
 VUT	39600
 WAKT	43200
-WARST	-10800	D
-WART	-14400
 WAST	7200	D
-WAT	-3600
-WAT	0
 WAT	3600
 WEST	3600	D
 WET	0
 WFT	43200
 WGST	-7200	D
+WGT	-10800
 WIB	25200
+WIT	32400
 WITA	28800
+WSDT	50400	D
 WST	28800
 WST	46800
 YAKT	36000
diff --git a/src/timezone/tznames/America.txt b/src/timezone/tznames/America.txt
index b6104b85f3..6f548566e2 100644
--- a/src/timezone/tznames/America.txt
+++ b/src/timezone/tznames/America.txt
@@ -18,9 +18,6 @@ ACT    -18000    # Acre Time
 ACST   -14400 D  # Acre Summer Time (not in zic)
                  #     (America/Eirunepe)
                  #     (America/Rio_Branco)
-# CONFLICT! ADT is not unique
-# Other timezones:
-#  - ADT: Arabic Daylight Time (Asia)
 ADT    -10800 D  # Atlantic Daylight Time
                  #     (America/Glace_Bay)
                  #     (America/Goose_Bay)
@@ -235,9 +232,9 @@ GMT         0    # Greenwich Mean Time
                  #     (Europe/London)
 GYT    -14400    # Guyana Time
                  #     (America/Guyana)
-HADT   -32400 D  # Hawaii-Aleutain Daylight Time
+HADT   -32400 D  # Hawaii-Aleutian Daylight Time
                  #     (America/Adak)
-HAST   -36000    # Hawaii-Aleutain Standard Time
+HAST   -36000    # Hawaii-Aleutian Standard Time
                  #     (America/Adak)
 MDT    -21600 D  # Mexico Mountain Daylight Time
                  # Mountain Daylight Time
@@ -294,8 +291,10 @@ PYT    -14400    # Paraguay Time
                  #     (America/Asuncion)
 SRT    -10800    # Suriname Time
                  #     (America/Paramaribo)
-UYST    -7200 D  # Uruguay Summer Time (not in zic)
-UYT    -10800    # Uruguay Time (not in zic)
+UYST    -7200 D  # Uruguay Summer Time
+                 #     (America/Montevideo)
+UYT    -10800    # Uruguay Time
+                 #     (America/Montevideo)
 VET    -16200    # Venezuela Time (caution: this used to mean -14400)
                  #     (America/Caracas)
 WGST    -7200 D  # Western Greenland Summer Time
diff --git a/src/timezone/tznames/Asia.txt b/src/timezone/tznames/Asia.txt
index d21eaba079..df91eda13d 100644
--- a/src/timezone/tznames/Asia.txt
+++ b/src/timezone/tznames/Asia.txt
@@ -7,15 +7,9 @@
 # src/timezone/tznames/Asia.txt
 #
 
-# CONFLICT! ADT is not unique
-# Other timezones:
-# - ADT: Atlantic Daylight Time (America)
-ADT     14400 D  # Arabia Daylight Time
-                 #     (Asia/Baghdad)
 AFT     16200    # Afghanistan Time
                  #     (Asia/Kabul)
-ALMST   25200 D  # Alma-Ata Summer Time
-                 #     (Asia/Almaty)
+ALMST   25200 D  # Alma-Ata Summer Time (obsolete)
 ALMT    21600    # Alma-Ata Time
                  #     (Asia/Almaty)
 # CONFLICT! AMST is not unique
@@ -28,14 +22,10 @@ AMST    18000 D  # Armenia Summer Time
 #  - AMT: Amazon Time (America)
 AMT     14400    # Armenia Time
                  #     (Asia/Yerevan)
-ANAST   46800 D  # Anadyr Summer Time
-                 #     (Asia/Anadyr)
+ANAST   46800 D  # Anadyr Summer Time (obsolete)
 ANAT    43200    # Anadyr Time
                  #     (Asia/Anadyr)
-AQTT    18000    # Aqtau Time
-                 # Aqtobe Time
-                 #     (Asia/Aqtau)
-                 #     (Asia/Aqtobe)
+AQTT    18000    # Aqtau Time (obsolete)
 # CONFLICT! AST is not unique
 # Other timezones:
 #  - AST: Atlantic Standard Time (America)
@@ -64,7 +54,6 @@ BTT     21600    # Bhutan Time
                  #     (Asia/Thimphu)
 CCT     28800    # China Coastal Time (not in zic)
 CHOST   36000 D  # Choibalsan Summer Time (obsolete)
-                 #     (Asia/Choibalsan)
 CHOT    28800    # Choibalsan Time (caution: this used to mean 32400)
                  #     (Asia/Choibalsan)
 CIT     28800    # Central Indonesia Time (obsolete, WITA is now preferred)
@@ -127,8 +116,7 @@ GST     14400    # Gulf Standard Time
                  #     (Asia/Dubai)
                  #     (Asia/Muscat)
 HKT     28800    # Hong Kong Time (not in zic)
-HOVST   28800 D  # Hovd Summer Time
-                 #     (Asia/Hovd)
+HOVST   28800 D  # Hovd Summer Time (obsolete)
 HOVT    25200    # Hovd Time
                  #     (Asia/Hovd)
 ICT     25200    # Indochina Time
@@ -137,10 +125,10 @@ ICT     25200    # Indochina Time
                  #     (Asia/Saigon)
                  #     (Asia/Vientiane)
 IDT     10800 D  # Israel Daylight Time
+                 #     (Asia/Jerusalem)
 IRDT    16200 D  # Iran Daylight Time
                  #     (Asia/Tehran)
 IRKST   32400 D  # Irkutsk Summer Time (obsolete)
-                 #     (Asia/Irkutsk)
 IRKT    32400    # Irkutsk Time (caution: this used to mean 28800)
                  #     (Asia/Irkutsk)
 IRST    12600    # Iran Standard Time
@@ -157,6 +145,7 @@ IST     19800    # Indian Standard Time
 # - IST: Irish Summer Time (Europe)
 # - IST: Indian Standard Time (Asia)
 IST      7200    # Israel Standard Time
+                 #     (Asia/Jerusalem)
 JAYT    32400    # Jayapura Time (Indonesia) (not in zic)
 JST     32400    # Japan Standard Time
                  #     (Asia/Tokyo)
@@ -166,15 +155,12 @@ KGST    21600 D  # Kyrgyzstan Summer Time (obsolete)
 KGT     21600    # Kyrgyzstan Time (caution: this used to mean 18000)
                  #     (Asia/Bishkek)
 KRAST   28800 D  # Krasnoyarsk Summer Time (obsolete)
-                 #     (Asia/Krasnoyarsk)
 KRAT    28800    # Krasnoyarsk Time (caution: this used to mean 25200)
                  #     (Asia/Krasnoyarsk)
 KST     32400    # Korean Standard Time
                  #     (Asia/Pyongyang)
-LKT     21600    # Lanka Time
-                 #     (Asia/Colombo)
+LKT     21600    # Lanka Time (obsolete)
 MAGST   43200 D  # Magadan Summer Time (obsolete)
-                 #     (Asia/Magadan)
 MAGT    43200    # Magadan Time (caution: this used to mean 39600)
                  #     (Asia/Magadan)
 MMT     23400    # Myanmar Time
@@ -183,31 +169,28 @@ MYT     28800    # Malaysia Time
                  #     (Asia/Kuala_Lumpur)
                  #     (Asia/Kuching)
 NOVST   25200 D  # Novosibirsk Summer Time (obsolete)
-                 #     (Asia/Novosibirsk)
 NOVT    25200    # Novosibirsk Time (caution: this used to mean 21600)
                  #     (Asia/Novosibirsk)
 NPT     20700    # Nepal Time
                  #     (Asia/Katmandu)
 OMSST   25200 D  # Omsk Summer Time (obsolete)
-                 #     (Asia/Omsk)
 OMST    25200    # Omsk Time (caution: this used to mean 21600)
                  #     (Asia/Omsk)
 ORAT    18000    # Oral Time
                  #     (Asia/Oral)
-PETST   46800 D  # Petropavlovsk-Kamchatski Summer Time
-                 #     (Asia/Kamchatka)
+PETST   46800 D  # Petropavlovsk-Kamchatski Summer Time (obsolete)
 PETT    43200    # Petropavlovsk-Kamchatski Time
                  #     (Asia/Kamchatka)
-PHT     28800    # Philippine Time (not in zic)
+PHT     28800    # Philippine Time
+                 #     (Asia/Manila)
 PKT     18000    # Pakistan Time
                  #     (Asia/Karachi)
 PKST    21600 D  # Pakistan Summer Time
                  #     (Asia/Karachi)
 QYZT    21600    # Kizilorda Time
                  #     (Asia/Qyzylorda)
-SAKST   39600 D  # Sakhalin Summer Time
-                 #     (Asia/Sakhalin)
-SAKT    36000    # Sakhalin Time
+SAKST   39600 D  # Sakhalin Summer Time (obsolete)
+SAKT    39600    # Sakhalin Time (caution: this used to mean 36000)
                  #     (Asia/Sakhalin)
 SGT     28800    # Singapore Time
                  #     (Asia/Singapore)
@@ -217,8 +200,7 @@ TLT     32400    # East Timor Time
                  #     (Asia/Dili)
 TMT     18000    # Turkmenistan Time
                  #     (Asia/Ashgabat)
-ULAST   32400 D  # Ulan Bator Summer Time
-                 #     (Asia/Ulaanbaatar)
+ULAST   32400 D  # Ulan Bator Summer Time (obsolete)
 ULAT    28800    # Ulan Bator Time
                  #     (Asia/Ulaanbaatar)
 UZST    21600 D  # Uzbekistan Summer Time
@@ -228,7 +210,6 @@ UZT     18000    # Uzbekistan Time
                  #     (Asia/Samarkand)
                  #     (Asia/Tashkent)
 VLAST   39600 D  # Vladivostok Summer Time (obsolete)
-                 #     (Asia/Vladivostok)
 VLAT    39600    # Vladivostok Time (caution: this used to mean 36000)
                  #     (Asia/Vladivostok)
 WIB     25200    # Waktu Indonesia Barat
@@ -239,10 +220,8 @@ WIT     32400    # Waktu Indonesia Timur (caution: this used to mean 25200)
 WITA    28800    # Waktu Indonesia Tengah
                  #     (Asia/Makassar)
 YAKST   36000 D  # Yakutsk Summer Time (obsolete)
-                 #     (Asia/Yakutsk)
 YAKT    36000    # Yakutsk Time (caution: this used to mean 32400)
                  #     (Asia/Yakutsk)
 YEKST   21600 D  # Yekaterinburg Summer Time (obsolete)
-                 #     (Asia/Yekaterinburg)
 YEKT    21600    # Yekaterinburg Time (caution: this used to mean 18000)
                  #     (Asia/Yekaterinburg)
diff --git a/src/timezone/tznames/Atlantic.txt b/src/timezone/tznames/Atlantic.txt
index b2085818bb..c65734b0ae 100644
--- a/src/timezone/tznames/Atlantic.txt
+++ b/src/timezone/tznames/Atlantic.txt
@@ -7,9 +7,6 @@
 # src/timezone/tznames/Atlantic.txt
 #
 
-# CONFLICT! ADT is not unique
-# Other timezones:
-#  - ADT: Arabic Daylight Time (Asia)
 ADT    -10800 D  # Atlantic Daylight Time
                  #     (America/Glace_Bay)
                  #     (America/Goose_Bay)
@@ -53,10 +50,9 @@ AZOT    -3600    # Azores Time
                  #     (Atlantic/Azores)
 CVT     -3600    # Cape Verde Time
                  #     (Atlantic/Cape_Verde)
-FKST   -10800 D  # Falkland Islands Summer Time
-                 #     (Atlantic/Stanley)
-FKT    -14400    # Falkland Islands Time
+FKST   -10800    # Falkland Islands Summer Time (now used all year round)
                  #     (Atlantic/Stanley)
+FKT    -14400    # Falkland Islands Time (obsolete)
 GMT         0    # Greenwich Mean Time
                  #     (Africa/Abidjan)
                  #     (Africa/Bamako)
diff --git a/src/timezone/tznames/Default b/src/timezone/tznames/Default
index e5a5498c84..a388c62906 100644
--- a/src/timezone/tznames/Default
+++ b/src/timezone/tznames/Default
@@ -222,8 +222,10 @@ PYST   -10800 D  # Paraguay Summer Time
                  #     (America/Asuncion)
 PYT    -14400    # Paraguay Time
                  #     (America/Asuncion)
-UYST    -7200 D  # Uruguay Summer Time (not in zic)
-UYT    -10800    # Uruguay Time (not in zic)
+UYST    -7200 D  # Uruguay Summer Time
+                 #     (America/Montevideo)
+UYT    -10800    # Uruguay Time
+                 #     (America/Montevideo)
 VET    -16200    # Venezuela Time (caution: this used to mean -14400)
                  #     (America/Caracas)
 WGST    -7200 D  # Western Greenland Summer Time
@@ -248,8 +250,10 @@ AFT     16200    # Afghanistan Time
                  #     (Asia/Kabul)
 ALMT    21600    # Alma-Ata Time
                  #     (Asia/Almaty)
-ALMST   25200 D  # Alma-Ata Summer Time
-                 #     (Asia/Almaty)
+ALMST   25200 D  # Alma-Ata Summer Time (obsolete)
+# CONFLICT! AMST is not unique
+# Other timezones:
+#  - AMST: Amazon Summer Time (America)
 AMST    18000 D  # Armenia Summer Time
                  #     (Asia/Yerevan)
 # CONFLICT! AMT is not unique
@@ -257,8 +261,7 @@ AMST    18000 D  # Armenia Summer Time
 #  - AMT: Amazon Time (America)
 AMT     14400    # Armenia Time
                  #     (Asia/Yerevan)
-ANAST   46800 D  # Anadyr Summer Time
-                 #     (Asia/Anadyr)
+ANAST   46800 D  # Anadyr Summer Time (obsolete)
 ANAT    43200    # Anadyr Time
                  #     (Asia/Anadyr)
 AZST    18000 D  # Azerbaijan Summer Time
@@ -284,8 +287,8 @@ ICT     25200    # Indochina Time
                  #     (Asia/Saigon)
                  #     (Asia/Vientiane)
 IDT     10800 D  # Israel Daylight Time
+                 #     (Asia/Jerusalem)
 IRKST   32400 D  # Irkutsk Summer Time (obsolete)
-                 #     (Asia/Irkutsk)
 IRKT    32400    # Irkutsk Time (caution: this used to mean 28800)
                  #     (Asia/Irkutsk)
 IRT     12600    # Iran Time (not in zic)
@@ -293,7 +296,8 @@ IRT     12600    # Iran Time (not in zic)
 # Other timezones:
 # - IST: Irish Summer Time (Europe)
 # - IST: Indian Standard Time (Asia)
-IST      7200    # Israel Standard Time (not in zic)
+IST      7200    # Israel Standard Time
+                 #     (Asia/Jerusalem)
 JAYT    32400    # Jayapura Time (Indonesia) (not in zic)
 JST     32400    # Japan Standard Time
                  #     (Asia/Tokyo)
@@ -303,15 +307,12 @@ KGST    21600 D  # Kyrgyzstan Summer Time (obsolete)
 KGT     21600    # Kyrgyzstan Time (caution: this used to mean 18000)
                  #     (Asia/Bishkek)
 KRAST   28800 D  # Krasnoyarsk Summer Time (obsolete)
-                 #     (Asia/Krasnoyarsk)
 KRAT    28800    # Krasnoyarsk Time (caution: this used to mean 25200)
                  #     (Asia/Krasnoyarsk)
 KST     32400    # Korean Standard Time
                  #     (Asia/Pyongyang)
-LKT     21600    # Lanka Time
-                 #     (Asia/Colombo)
+LKT     21600    # Lanka Time (obsolete)
 MAGST   43200 D  # Magadan Summer Time (obsolete)
-                 #     (Asia/Magadan)
 MAGT    43200    # Magadan Time (caution: this used to mean 39600)
                  #     (Asia/Magadan)
 MMT     23400    # Myanmar Time
@@ -320,20 +321,18 @@ MYT     28800    # Malaysia Time
                  #     (Asia/Kuala_Lumpur)
                  #     (Asia/Kuching)
 NOVST   25200 D  # Novosibirsk Summer Time (obsolete)
-                 #     (Asia/Novosibirsk)
 NOVT    25200    # Novosibirsk Time (caution: this used to mean 21600)
                  #     (Asia/Novosibirsk)
 NPT     20700    # Nepal Time
                  #     (Asia/Katmandu)
 OMSST   25200 D  # Omsk Summer Time (obsolete)
-                 #     (Asia/Omsk)
 OMST    25200    # Omsk Time (caution: this used to mean 21600)
                  #     (Asia/Omsk)
-PETST   46800 D  # Petropavlovsk-Kamchatski Summer Time
-                 #     (Asia/Kamchatka)
+PETST   46800 D  # Petropavlovsk-Kamchatski Summer Time (obsolete)
 PETT    43200    # Petropavlovsk-Kamchatski Time
                  #     (Asia/Kamchatka)
-PHT     28800    # Philippine Time (not in zic)
+PHT     28800    # Philippine Time
+                 #     (Asia/Manila)
 PKT     18000    # Pakistan Time
                  #     (Asia/Karachi)
 PKST    21600 D  # Pakistan Summer Time
@@ -344,8 +343,7 @@ TJT     18000    # Tajikistan Time
                  #     (Asia/Dushanbe)
 TMT     18000    # Turkmenistan Time
                  #     (Asia/Ashgabat)
-ULAST   32400 D  # Ulan Bator Summer Time
-                 #     (Asia/Ulaanbaatar)
+ULAST   32400 D  # Ulan Bator Summer Time (obsolete)
 ULAT    28800    # Ulan Bator Time
                  #     (Asia/Ulaanbaatar)
 UZST    21600 D  # Uzbekistan Summer Time
@@ -355,23 +353,17 @@ UZT     18000    # Uzbekistan Time
                  #     (Asia/Samarkand)
                  #     (Asia/Tashkent)
 VLAST   39600 D  # Vladivostok Summer Time (obsolete)
-                 #     (Asia/Vladivostok)
 VLAT    39600    # Vladivostok Time (caution: this used to mean 36000)
                  #     (Asia/Vladivostok)
 YAKST   36000 D  # Yakutsk Summer Time (obsolete)
-                 #     (Asia/Yakutsk)
 YAKT    36000    # Yakutsk Time (caution: this used to mean 32400)
                  #     (Asia/Yakutsk)
 YEKST   21600 D  # Yekaterinburg Summer Time (obsolete)
-                 #     (Asia/Yekaterinburg)
 YEKT    21600    # Yekaterinburg Time (caution: this used to mean 18000)
                  #     (Asia/Yekaterinburg)
 
 #################### ATLANTIC ####################
 
-# CONFLICT! ADT is not unique
-# Other timezones:
-#  - ADT: Arabic Daylight Time (Asia)
 ADT    -10800 D  # Atlantic Daylight Time
                  #     (America/Glace_Bay)
                  #     (America/Goose_Bay)
@@ -413,10 +405,9 @@ AZOST       0 D  # Azores Summer Time
                  #     (Atlantic/Azores)
 AZOT    -3600    # Azores Time
                  #     (Atlantic/Azores)
-FKST   -10800 D  # Falkland Islands Summer Time
-                 #     (Atlantic/Stanley)
-FKT    -14400    # Falkland Islands Time
+FKST   -10800    # Falkland Islands Summer Time (now used all year round)
                  #     (Atlantic/Stanley)
+FKT    -14400    # Falkland Islands Time (obsolete)
 
 #################### AUSTRALIA ####################
 
@@ -623,7 +614,6 @@ MET      3600    # Middle Europe Time (not in zic)
 METDST   7200 D  # Middle Europe Summer Time (not in zic)
 MEZ      3600    # Mitteleuropaeische Zeit (German) (not in zic)
 MSD     14400 D  # Moscow Daylight Time (obsolete)
-                 #     (Europe/Moscow)
 MSK     14400    # Moscow Time (caution: this used to mean 10800)
                  #     (Europe/Moscow)
 VOLT    14400    # Volgograd Time
@@ -668,13 +658,16 @@ CHAST   45900    # Chatham Standard Time (New Zealand)
                  #     (Pacific/Chatham)
 CHUT    36000    # Chuuk Time
                  #     (Pacific/Chuuk)
-CKT     43200    # Cook Islands Time (not in zic)
+CKT    -36000    # Cook Islands Time (caution: this used to mean 43200)
+                 #     (Pacific/Rarotonga)
 EASST  -18000 D  # Easter Island Summer Time (Chile)
                  #     (Pacific/Easter)
 EAST   -21600    # Easter Island Time (Chile)
                  #     (Pacific/Easter)
-FJST   -46800 D  # Fiji Summer Time (not in zic)
-FJT    -43200    # Fiji Time (not in zic)
+FJST    46800 D  # Fiji Summer Time
+                 #     (Pacific/Fiji)
+FJT     43200    # Fiji Time
+                 #     (Pacific/Fiji)
 GALT   -21600    # Galapagos Time
                  #     (Pacific/Galapagos)
 GAMT   -32400    # Gambier Time
@@ -718,7 +711,8 @@ TAHT   -36000    # Tahiti Time (zic says "TAHT", other sources "THAT")
                  #     (Pacific/Tahiti)
 TKT     46800    # Tokelau Time (caution: this used to mean -36000)
                  #     (Pacific/Fakaofo)
-TOT     46800    # Tonga Time (not in zic)
+TOT     46800    # Tonga Time
+                 #     (Pacific/Tongatapu)
 TRUT    36000    # Truk Time (zic used to say "TRUT", other sources say "TRUK")
                  #     (Pacific/Truk)
 TVT     43200    # Tuvalu Time
diff --git a/src/timezone/tznames/Europe.txt b/src/timezone/tznames/Europe.txt
index 665f576d4d..36c96fdc85 100644
--- a/src/timezone/tznames/Europe.txt
+++ b/src/timezone/tznames/Europe.txt
@@ -186,11 +186,9 @@ MET      3600    # Middle Europe Time (not in zic)
 METDST   7200 D  # Middle Europe Summer Time (not in zic)
 MEZ      3600    # Mitteleuropäische Zeit (German) (not in zic)
 MSD     14400 D  # Moscow Daylight Time (obsolete)
-                 #     (Europe/Moscow)
 MSK     14400    # Moscow Time (caution: this used to mean 10800)
                  #     (Europe/Moscow)
 SAMST   18000 D  # Samara Summer Time (obsolete)
-                 #     (Europe/Samara)
 SAMT    14400    # Samara Time
                  #     (Europe/Samara)
 VOLT    14400    # Volgograd Time
diff --git a/src/timezone/tznames/Pacific.txt b/src/timezone/tznames/Pacific.txt
index 2a989d3790..18bacea9c4 100644
--- a/src/timezone/tznames/Pacific.txt
+++ b/src/timezone/tznames/Pacific.txt
@@ -16,7 +16,8 @@ ChST    36000    # Chamorro Standard Time (lower case "h" is as in zic)
                  #     (Pacific/Saipan)
 CHUT    36000    # Chuuk Time
                  #     (Pacific/Chuuk)
-CKT     43200    # Cook Islands Time (not in zic)
+CKT    -36000    # Cook Islands Time (caution: this used to mean 43200)
+                 #     (Pacific/Rarotonga)
 EASST  -18000 D  # Easter Island Summer Time (Chile)
                  #     (Pacific/Easter)
 # CONFLICT! EAST is not unique
@@ -24,8 +25,10 @@ EASST  -18000 D  # Easter Island Summer Time (Chile)
 #  - EAST: East Australian Standard Time (Australia)
 EAST   -21600    # Easter Island Time (Chile)
                  #     (Pacific/Easter)
-FJST   -46800 D  # Fiji Summer Time (not in zic)
-FJT    -43200    # Fiji Time (not in zic)
+FJST    46800 D  # Fiji Summer Time (caution: this used to mean -46800)
+                 #     (Pacific/Fiji)
+FJT     43200    # Fiji Time (caution: this used to mean -43200)
+                 #     (Pacific/Fiji)
 GALT   -21600    # Galapagos Time
                  #     (Pacific/Galapagos)
 GAMT   -32400    # Gambier Time
@@ -85,7 +88,8 @@ TAHT   -36000    # Tahiti Time (zic says "TAHT", other sources "THAT")
                  #     (Pacific/Tahiti)
 TKT     46800    # Tokelau Time (caution: this used to mean -36000)
                  #     (Pacific/Fakaofo)
-TOT     46800    # Tonga Time (not in zic)
+TOT     46800    # Tonga Time
+                 #     (Pacific/Tongatapu)
 TRUT    36000    # Truk Time (zic used to say "TRUT", other sources say "TRUK")
                  #     (Pacific/Truk)
 TVT     43200    # Tuvalu Time