Re: Proposal for better support of time-varying timezone abbreviations

Поиск
Список
Период
Сортировка
От Tom Lane
Тема Re: Proposal for better support of time-varying timezone abbreviations
Дата
Msg-id 18061.1413402078@sss.pgh.pa.us
обсуждение исходный текст
Ответ на Re: Proposal for better support of time-varying timezone abbreviations  (Tom Lane <tgl@sss.pgh.pa.us>)
Ответы Re: Proposal for better support of time-varying timezone abbreviations
Список pgsql-hackers
... and here is a draft patch for the timezone abbreviation data files.

I changed all the abbreviations for which the parent zone had used more
than one GMT offset since 1970.  That seemed like a good cutoff to avoid
wasting cycles on ancient history, especially since the IANA people
themselves don't make any large promises about the quality of their data
before 1970.

Although zones in the Russian Federation are the majority of zones that
had abbreviation changes, a quick look at this patch shows that they're
hardly the only ones.  We've been sticking our heads in the sand about
this problem for quite a while :-(

            regards, tom lane

diff --git a/src/timezone/tznames/America.txt b/src/timezone/tznames/America.txt
index 54b51fe..9e62732 100644
*** a/src/timezone/tznames/America.txt
--- b/src/timezone/tznames/America.txt
*************** AMT    -14400    # Amazon Time
*** 47,53 ****
                   #     (America/Cuiaba)
                   #     (America/Manaus)
                   #     (America/Porto_Velho)
! ART    -10800    # Argentina Time
                   #     (America/Argentina/Buenos_Aires)
                   #     (America/Argentina/Cordoba)
                   #     (America/Argentina/Tucuman)
--- 47,53 ----
                   #     (America/Cuiaba)
                   #     (America/Manaus)
                   #     (America/Porto_Velho)
! ART    America/Argentina/Buenos_Aires  # Argentina Time
                   #     (America/Argentina/Buenos_Aires)
                   #     (America/Argentina/Cordoba)
                   #     (America/Argentina/Tucuman)
*************** ART    -10800    # Argentina Time
*** 58,64 ****
                   #     (America/Argentina/Mendoza)
                   #     (America/Argentina/Rio_Gallegos)
                   #     (America/Argentina/Ushuaia)
! ARST    -7200 D  # Argentina Summer Time
  # CONFLICT! AST is not unique
  # Other timezones:
  #  - AST: Arabic Standard Time (Asia)
--- 58,64 ----
                   #     (America/Argentina/Mendoza)
                   #     (America/Argentina/Rio_Gallegos)
                   #     (America/Argentina/Ushuaia)
! ARST    America/Argentina/Buenos_Aires  # Argentina Summer Time
  # CONFLICT! AST is not unique
  # Other timezones:
  #  - AST: Arabic Standard Time (Asia)
*************** GMT         0    # Greenwich Mean Time
*** 228,234 ****
                   #     (Etc/GMT)
                   #     (Europe/Dublin)
                   #     (Europe/London)
! GYT    -14400    # Guyana Time
                   #     (America/Guyana)
  HADT   -32400 D  # Hawaii-Aleutian Daylight Time
                   #     (America/Adak)
--- 228,234 ----
                   #     (Etc/GMT)
                   #     (Europe/Dublin)
                   #     (Europe/London)
! GYT    America/Guyana  # Guyana Time
                   #     (America/Guyana)
  HADT   -32400 D  # Hawaii-Aleutian Daylight Time
                   #     (America/Adak)
*************** PST    -28800    # Pacific Standard Time
*** 285,299 ****
                   #     (Pacific/Pitcairn)
  PYST   -10800 D  # Paraguay Summer Time
                   #     (America/Asuncion)
! PYT    -14400    # Paraguay Time
                   #     (America/Asuncion)
! SRT    -10800    # Suriname Time
                   #     (America/Paramaribo)
  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
                   #     (America/Godthab)
--- 285,299 ----
                   #     (Pacific/Pitcairn)
  PYST   -10800 D  # Paraguay Summer Time
                   #     (America/Asuncion)
! PYT    America/Asuncion  # Paraguay Time
                   #     (America/Asuncion)
! SRT    America/Paramaribo  # Suriname Time
                   #     (America/Paramaribo)
  UYST    -7200 D  # Uruguay Summer Time
                   #     (America/Montevideo)
  UYT    -10800    # Uruguay Time
                   #     (America/Montevideo)
! VET    America/Caracas  # Venezuela Time
                   #     (America/Caracas)
  WGST    -7200 D  # Western Greenland Summer Time
                   #     (America/Godthab)
diff --git a/src/timezone/tznames/Antarctica.txt b/src/timezone/tznames/Antarctica.txt
index 5a03250..2359020 100644
*** a/src/timezone/tznames/Antarctica.txt
--- b/src/timezone/tznames/Antarctica.txt
*************** CLST   -10800 D  # Chile Summer Time
*** 16,26 ****
  CLT    -14400    # Chile Time
                   #     (America/Santiago)
                   #     (Antarctica/Palmer)
! DAVT    25200    # Davis Time (Antarctica)
                   #     (Antarctica/Davis)
  DDUT    36000    # Dumont-d`Urville Time (Antarctica)
                   #     (Antarctica/DumontDUrville)
! MAWT    18000    # Mawson Time (Antarctica) (caution: this used to mean 21600)
                   #     (Antarctica/Mawson)
  MIST    39600    # Macquarie Island Time
                   #     (Antarctica/Macquarie)
--- 16,26 ----
  CLT    -14400    # Chile Time
                   #     (America/Santiago)
                   #     (Antarctica/Palmer)
! DAVT    Antarctica/Davis  # Davis Time (Antarctica)
                   #     (Antarctica/Davis)
  DDUT    36000    # Dumont-d`Urville Time (Antarctica)
                   #     (Antarctica/DumontDUrville)
! MAWT    Antarctica/Mawson  # Mawson Time (Antarctica)
                   #     (Antarctica/Mawson)
  MIST    39600    # Macquarie Island Time
                   #     (Antarctica/Macquarie)
diff --git a/src/timezone/tznames/Asia.txt b/src/timezone/tznames/Asia.txt
index 8c3cb35..bb28646 100644
*** a/src/timezone/tznames/Asia.txt
--- b/src/timezone/tznames/Asia.txt
*************** ALMT    21600    # Alma-Ata Time
*** 15,31 ****
  # 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
  # Other timezones:
  #  - AMT: Amazon Time (America)
! AMT     14400    # Armenia Time
                   #     (Asia/Yerevan)
! ANAST   46800 D  # Anadyr Summer Time (obsolete)
! ANAT    43200    # Anadyr Time
                   #     (Asia/Anadyr)
! AQTT    18000    # Aqtau Time (obsolete)
  # CONFLICT! AST is not unique
  # Other timezones:
  #  - AST: Atlantic Standard Time (America)
--- 15,33 ----
  # CONFLICT! AMST is not unique
  # Other timezones:
  #  - AMST: Amazon Summer Time (America)
! AMST    Asia/Yerevan  # Armenia Summer Time
                   #     (Asia/Yerevan)
  # CONFLICT! AMT is not unique
  # Other timezones:
  #  - AMT: Amazon Time (America)
! AMT     Asia/Yerevan  # Armenia Time
                   #     (Asia/Yerevan)
! ANAST   Asia/Anadyr  # Anadyr Summer Time (obsolete)
! ANAT    Asia/Anadyr  # Anadyr Time
                   #     (Asia/Anadyr)
! AQTST   Asia/Aqtau  # Aqtau Summer Time (obsolete)
! AQTT    Asia/Aqtau  # Aqtau Time
!                  #     (Asia/Aqtau)
  # CONFLICT! AST is not unique
  # Other timezones:
  #  - AST: Atlantic Standard Time (America)
*************** AST     10800    # Arabia Standard Time
*** 41,49 ****
                   #     (Asia/Kuwait)
                   #     (Asia/Qatar)
                   #     (Asia/Riyadh)
! AZST    18000 D  # Azerbaijan Summer Time
                   #     (Asia/Baku)
! AZT     14400    # Azerbaijan Time
                   #     (Asia/Baku)
  BDT     21600    # Bangladesh Time
                   #     (Asia/Dhaka)
--- 43,51 ----
                   #     (Asia/Kuwait)
                   #     (Asia/Qatar)
                   #     (Asia/Riyadh)
! AZST    Asia/Baku  # Azerbaijan Summer Time
                   #     (Asia/Baku)
! AZT     Asia/Baku  # Azerbaijan Time
                   #     (Asia/Baku)
  BDT     21600    # Bangladesh Time
                   #     (Asia/Dhaka)
*************** BTT     21600    # Bhutan Time
*** 54,60 ****
                   #     (Asia/Thimphu)
  CCT     28800    # China Coastal Time (not in zic)
  CHOST   36000 D  # Choibalsan Summer Time (obsolete)
! CHOT    28800    # Choibalsan Time (caution: this used to mean 32400)
                   #     (Asia/Choibalsan)
  CIT     28800    # Central Indonesia Time (obsolete, WITA is now preferred)
  EEST    10800 D  # East-Egypt Summer Time
--- 56,62 ----
                   #     (Asia/Thimphu)
  CCT     28800    # China Coastal Time (not in zic)
  CHOST   36000 D  # Choibalsan Summer Time (obsolete)
! CHOT    Asia/Choibalsan  # Choibalsan Time
                   #     (Asia/Choibalsan)
  CIT     28800    # Central Indonesia Time (obsolete, WITA is now preferred)
  EEST    10800 D  # East-Egypt Summer Time
*************** EET      7200    # East-Egypt Time
*** 105,113 ****
                   #     (Europe/Vilnius)
                   #     (Europe/Zaporozhye)
  EIT     32400    # East Indonesia Time (obsolete, WIT is now preferred)
! GEST    14400 D  # Georgia Summer Time (obsolete)
!                  #     (Asia/Tbilisi)
! GET     14400    # Georgia Time (caution: this used to mean 10800)
                   #     (Asia/Tbilisi)
  # CONFLICT! GST is not unique
  # Other timezones:
--- 107,114 ----
                   #     (Europe/Vilnius)
                   #     (Europe/Zaporozhye)
  EIT     32400    # East Indonesia Time (obsolete, WIT is now preferred)
! GEST    Asia/Tbilisi  # Georgia Summer Time (obsolete)
! GET     Asia/Tbilisi  # Georgia Time
                   #     (Asia/Tbilisi)
  # CONFLICT! GST is not unique
  # Other timezones:
*************** GST     14400    # Gulf Standard Time
*** 117,123 ****
                   #     (Asia/Muscat)
  HKT     28800    # Hong Kong Time (not in zic)
  HOVST   28800 D  # Hovd Summer Time (obsolete)
! HOVT    25200    # Hovd Time
                   #     (Asia/Hovd)
  ICT     25200    # Indochina Time
                   #     (Asia/Bangkok)
--- 118,124 ----
                   #     (Asia/Muscat)
  HKT     28800    # Hong Kong Time (not in zic)
  HOVST   28800 D  # Hovd Summer Time (obsolete)
! HOVT    Asia/Hovd  # Hovd Time
                   #     (Asia/Hovd)
  ICT     25200    # Indochina Time
                   #     (Asia/Bangkok)
*************** ICT     25200    # Indochina Time
*** 126,137 ****
                   #     (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)
! IRKT    28800    # Irkutsk Time (caution: this used to mean 32400)
                   #     (Asia/Irkutsk)
! IRST    12600    # Iran Standard Time
                   #     (Asia/Tehran)
  IRT     12600    # Iran Time (not in zic)
  # CONFLICT! IST is not unique
--- 127,138 ----
                   #     (Asia/Vientiane)
  IDT     10800 D  # Israel Daylight Time
                   #     (Asia/Jerusalem)
! IRDT    Asia/Tehran  # Iran Daylight Time
                   #     (Asia/Tehran)
! IRKST   Asia/Irkutsk  # Irkutsk Summer Time (obsolete)
! IRKT    Asia/Irkutsk  # Irkutsk Time
                   #     (Asia/Irkutsk)
! IRST    Asia/Tehran  # Iran Standard Time
                   #     (Asia/Tehran)
  IRT     12600    # Iran Time (not in zic)
  # CONFLICT! IST is not unique
*************** JST     32400    # Japan Standard Time
*** 151,185 ****
                   #     (Asia/Tokyo)
  KDT     36000 D  # Korean Daylight Time (not in zic)
  KGST    21600 D  # Kyrgyzstan Summer Time (obsolete)
                   #     (Asia/Bishkek)
! KGT     21600    # Kyrgyzstan Time (caution: this used to mean 18000)
!                  #     (Asia/Bishkek)
! KRAST   28800 D  # Krasnoyarsk Summer Time (obsolete)
! KRAT    25200    # Krasnoyarsk Time (caution: this used to mean 28800)
                   #     (Asia/Krasnoyarsk)
  KST     32400    # Korean Standard Time
                   #     (Asia/Pyongyang)
! LKT     21600    # Lanka Time (obsolete)
! MAGST   43200 D  # Magadan Summer Time (obsolete)
! MAGT    36000    # Magadan Time (caution: this used to mean 43200)
                   #     (Asia/Magadan)
  MMT     23400    # Myanmar Time
                   #     (Asia/Rangoon)
  MYT     28800    # Malaysia Time
                   #     (Asia/Kuala_Lumpur)
                   #     (Asia/Kuching)
! NOVST   25200 D  # Novosibirsk Summer Time (obsolete)
! NOVT    21600    # Novosibirsk Time (caution: this used to mean 25200)
                   #     (Asia/Novosibirsk)
  NPT     20700    # Nepal Time
                   #     (Asia/Katmandu)
! OMSST   25200 D  # Omsk Summer Time (obsolete)
! OMST    21600    # Omsk Time (caution: this used to mean 25200)
                   #     (Asia/Omsk)
! ORAT    18000    # Oral Time
                   #     (Asia/Oral)
! PETST   46800 D  # Petropavlovsk-Kamchatski Summer Time (obsolete)
! PETT    43200    # Petropavlovsk-Kamchatski Time
                   #     (Asia/Kamchatka)
  PHT     28800    # Philippine Time
                   #     (Asia/Manila)
--- 152,185 ----
                   #     (Asia/Tokyo)
  KDT     36000 D  # Korean Daylight Time (not in zic)
  KGST    21600 D  # Kyrgyzstan Summer Time (obsolete)
+ KGT     Asia/Bishkek  # Kyrgyzstan Time
                   #     (Asia/Bishkek)
! KRAST   Asia/Krasnoyarsk  # Krasnoyarsk Summer Time (obsolete)
! KRAT    Asia/Krasnoyarsk  # Krasnoyarsk Time
                   #     (Asia/Krasnoyarsk)
  KST     32400    # Korean Standard Time
                   #     (Asia/Pyongyang)
! LKT     Asia/Colombo  # Lanka Time (obsolete)
! MAGST   Asia/Magadan  # Magadan Summer Time (obsolete)
! MAGT    Asia/Magadan  # Magadan Time
                   #     (Asia/Magadan)
  MMT     23400    # Myanmar Time
                   #     (Asia/Rangoon)
  MYT     28800    # Malaysia Time
                   #     (Asia/Kuala_Lumpur)
                   #     (Asia/Kuching)
! NOVST   Asia/Novosibirsk  # Novosibirsk Summer Time (obsolete)
! NOVT    Asia/Novosibirsk  # Novosibirsk Time
                   #     (Asia/Novosibirsk)
  NPT     20700    # Nepal Time
                   #     (Asia/Katmandu)
! OMSST   Asia/Omsk  # Omsk Summer Time (obsolete)
! OMST    Asia/Omsk  # Omsk Time
                   #     (Asia/Omsk)
! ORAT    Asia/Oral  # Oral Time
                   #     (Asia/Oral)
! PETST   Asia/Kamchatka  # Petropavlovsk-Kamchatski Summer Time (obsolete)
! PETT    Asia/Kamchatka  # Petropavlovsk-Kamchatski Time
                   #     (Asia/Kamchatka)
  PHT     28800    # Philippine Time
                   #     (Asia/Manila)
*************** PKST    21600 D  # Pakistan Summer Time
*** 189,198 ****
                   #     (Asia/Karachi)
  QYZT    21600    # Kizilorda Time
                   #     (Asia/Qyzylorda)
! SAKST   39600 D  # Sakhalin Summer Time (obsolete)
! SAKT    36000    # Sakhalin Time (caution: this used to mean 39600)
                   #     (Asia/Sakhalin)
! SGT     28800    # Singapore Time
                   #     (Asia/Singapore)
  SRET    39600    # Srednekolymsk Time
                   #     (Asia/Srednekolymsk)
--- 189,198 ----
                   #     (Asia/Karachi)
  QYZT    21600    # Kizilorda Time
                   #     (Asia/Qyzylorda)
! SAKST   Asia/Sakhalin  # Sakhalin Summer Time (obsolete)
! SAKT    Asia/Sakhalin  # Sakhalin Time
                   #     (Asia/Sakhalin)
! SGT     Asia/Singapore  # Singapore Time
                   #     (Asia/Singapore)
  SRET    39600    # Srednekolymsk Time
                   #     (Asia/Srednekolymsk)
*************** TJT     18000    # Tajikistan Time
*** 200,209 ****
                   #     (Asia/Dushanbe)
  TLT     32400    # East Timor Time
                   #     (Asia/Dili)
! TMT     18000    # Turkmenistan Time
                   #     (Asia/Ashgabat)
  ULAST   32400 D  # Ulan Bator Summer Time (obsolete)
! ULAT    28800    # Ulan Bator Time
                   #     (Asia/Ulaanbaatar)
  UZST    21600 D  # Uzbekistan Summer Time
                   #     (Asia/Samarkand)
--- 200,209 ----
                   #     (Asia/Dushanbe)
  TLT     32400    # East Timor Time
                   #     (Asia/Dili)
! TMT     Asia/Ashgabat  # Turkmenistan Time
                   #     (Asia/Ashgabat)
  ULAST   32400 D  # Ulan Bator Summer Time (obsolete)
! ULAT    Asia/Ulaanbaatar  # Ulan Bator Time
                   #     (Asia/Ulaanbaatar)
  UZST    21600 D  # Uzbekistan Summer Time
                   #     (Asia/Samarkand)
*************** UZST    21600 D  # Uzbekistan Summer Tim
*** 211,218 ****
  UZT     18000    # Uzbekistan Time
                   #     (Asia/Samarkand)
                   #     (Asia/Tashkent)
! VLAST   39600 D  # Vladivostok Summer Time (obsolete)
! VLAT    36000    # Vladivostok Time (caution: this used to mean 39600)
                   #     (Asia/Vladivostok)
  WIB     25200    # Waktu Indonesia Barat
                   #     (Asia/Jakarta)
--- 211,218 ----
  UZT     18000    # Uzbekistan Time
                   #     (Asia/Samarkand)
                   #     (Asia/Tashkent)
! VLAST   Asia/Vladivostok  # Vladivostok Summer Time (obsolete)
! VLAT    Asia/Vladivostok  # Vladivostok Time
                   #     (Asia/Vladivostok)
  WIB     25200    # Waktu Indonesia Barat
                   #     (Asia/Jakarta)
*************** WITA    28800    # Waktu Indonesia Tenga
*** 223,231 ****
                   #     (Asia/Makassar)
  XJT     21600    # Xinjiang Time
                   #     (Asia/Urumqi)
! YAKST   36000 D  # Yakutsk Summer Time (obsolete)
! YAKT    32400    # Yakutsk Time (caution: this used to mean 36000)
                   #     (Asia/Yakutsk)
  YEKST   21600 D  # Yekaterinburg Summer Time (obsolete)
! YEKT    18000    # Yekaterinburg Time (caution: this used to mean 21600)
                   #     (Asia/Yekaterinburg)
--- 223,231 ----
                   #     (Asia/Makassar)
  XJT     21600    # Xinjiang Time
                   #     (Asia/Urumqi)
! YAKST   Asia/Yakutsk  # Yakutsk Summer Time (obsolete)
! YAKT    Asia/Yakutsk  # Yakutsk Time
                   #     (Asia/Yakutsk)
  YEKST   21600 D  # Yekaterinburg Summer Time (obsolete)
! YEKT    Asia/Yekaterinburg  # Yekaterinburg Time
                   #     (Asia/Yekaterinburg)
diff --git a/src/timezone/tznames/Atlantic.txt b/src/timezone/tznames/Atlantic.txt
index c65734b..1d34d1e 100644
*** a/src/timezone/tznames/Atlantic.txt
--- b/src/timezone/tznames/Atlantic.txt
*************** AZOST       0 D  # Azores Summer Time
*** 48,58 ****
                   #     (Atlantic/Azores)
  AZOT    -3600    # Azores Time
                   #     (Atlantic/Azores)
! CVT     -3600    # Cape Verde Time
                   #     (Atlantic/Cape_Verde)
! 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)
--- 48,58 ----
                   #     (Atlantic/Azores)
  AZOT    -3600    # Azores Time
                   #     (Atlantic/Azores)
! CVT     Atlantic/Cape_Verde  # Cape Verde Time
                   #     (Atlantic/Cape_Verde)
! FKST    Atlantic/Stanley  # Falkland Islands Summer/Standard Time
                   #     (Atlantic/Stanley)
! FKT     Atlantic/Stanley  # Falkland Islands Time (obsolete)
  GMT         0    # Greenwich Mean Time
                   #     (Africa/Abidjan)
                   #     (Africa/Bamako)
diff --git a/src/timezone/tznames/Australia.txt b/src/timezone/tznames/Australia.txt
index 8373093..92c2968 100644
*** a/src/timezone/tznames/Australia.txt
--- b/src/timezone/tznames/Australia.txt
*************** EAST    36000    # East Australian Stand
*** 52,58 ****
  # Other timezones:
  #  - EST: Eastern Standard Time (America)
  EST     36000    # Eastern Standard Time (not in zic)
! LHDT    39600 D  # Lord Howe Daylight Time
                   #     (Australia/Lord_Howe)
  LHST    37800    # Lord Howe Standard Time
                   #     (Australia/Lord_Howe)
--- 52,58 ----
  # Other timezones:
  #  - EST: Eastern Standard Time (America)
  EST     36000    # Eastern Standard Time (not in zic)
! LHDT    Australia/Lord_Howe  # Lord Howe Daylight Time
                   #     (Australia/Lord_Howe)
  LHST    37800    # Lord Howe Standard Time
                   #     (Australia/Lord_Howe)
diff --git a/src/timezone/tznames/Default b/src/timezone/tznames/Default
index 9e5209e..a8b8eac 100644
*** a/src/timezone/tznames/Default
--- b/src/timezone/tznames/Default
*************** AKST   -32400    # Alaska Standard Time
*** 54,60 ****
                   #     (America/Juneau)
                   #     (America/Nome)
                   #     (America/Yakutat)
! ART    -10800    # Argentina Time
                   #     (America/Argentina/Buenos_Aires)
                   #     (America/Argentina/Cordoba)
                   #     (America/Argentina/Tucuman)
--- 54,60 ----
                   #     (America/Juneau)
                   #     (America/Nome)
                   #     (America/Yakutat)
! ART    America/Argentina/Buenos_Aires  # Argentina Time
                   #     (America/Argentina/Buenos_Aires)
                   #     (America/Argentina/Cordoba)
                   #     (America/Argentina/Tucuman)
*************** ART    -10800    # Argentina Time
*** 65,71 ****
                   #     (America/Argentina/Mendoza)
                   #     (America/Argentina/Rio_Gallegos)
                   #     (America/Argentina/Ushuaia)
! ARST    -7200 D  # Argentina Summer Time
  BOT    -14400    # Bolivia Time
                   #     (America/La_Paz)
  BRA    -10800    # Brazil Time (not in zic)
--- 65,71 ----
                   #     (America/Argentina/Mendoza)
                   #     (America/Argentina/Rio_Gallegos)
                   #     (America/Argentina/Ushuaia)
! ARST    America/Argentina/Buenos_Aires  # Argentina Summer Time
  BOT    -14400    # Bolivia Time
                   #     (America/La_Paz)
  BRA    -10800    # Brazil Time (not in zic)
*************** FNST    -3600 D  # Fernando de Noronha S
*** 170,176 ****
                   #     (America/Noronha)
  GFT    -10800    # French Guiana Time
                   #     (America/Cayenne)
! GYT    -14400    # Guyana Time
                   #     (America/Guyana)
  MDT    -21600 D  # Mexico Mountain Daylight Time
                   # Mountain Daylight Time
--- 170,176 ----
                   #     (America/Noronha)
  GFT    -10800    # French Guiana Time
                   #     (America/Cayenne)
! GYT    America/Guyana  # Guyana Time
                   #     (America/Guyana)
  MDT    -21600 D  # Mexico Mountain Daylight Time
                   # Mountain Daylight Time
*************** PST    -28800    # Pacific Standard Time
*** 219,231 ****
                   #     (Pacific/Pitcairn)
  PYST   -10800 D  # Paraguay Summer Time
                   #     (America/Asuncion)
! PYT    -14400    # Paraguay Time
                   #     (America/Asuncion)
  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
                   #     (America/Godthab)
--- 219,231 ----
                   #     (Pacific/Pitcairn)
  PYST   -10800 D  # Paraguay Summer Time
                   #     (America/Asuncion)
! PYT    America/Asuncion  # Paraguay Time
                   #     (America/Asuncion)
  UYST    -7200 D  # Uruguay Summer Time
                   #     (America/Montevideo)
  UYT    -10800    # Uruguay Time
                   #     (America/Montevideo)
! VET    America/Caracas  # Venezuela Time
                   #     (America/Caracas)
  WGST    -7200 D  # Western Greenland Summer Time
                   #     (America/Godthab)
*************** WGT    -10800    # West Greenland Time
*** 234,246 ****

  #################### ANTARCTICA ####################

! DAVT    25200    # Davis Time (Antarctica)
                   #     (Antarctica/Davis)
  DDUT    36000    # Dumont-d'Urville Time (Antarctica)
                   #     (Antarctica/DumontDUrville)
                   #     (Antarctica/Palmer)
                   #     (America/Santiago)
! MAWT    18000    # Mawson Time (Antarctica) (caution: this used to mean 21600)
                   #     (Antarctica/Mawson)

  #################### ASIA ####################
--- 234,246 ----

  #################### ANTARCTICA ####################

! DAVT    Antarctica/Davis  # Davis Time (Antarctica)
                   #     (Antarctica/Davis)
  DDUT    36000    # Dumont-d'Urville Time (Antarctica)
                   #     (Antarctica/DumontDUrville)
                   #     (Antarctica/Palmer)
                   #     (America/Santiago)
! MAWT    Antarctica/Mawson  # Mawson Time (Antarctica)
                   #     (Antarctica/Mawson)

  #################### ASIA ####################
*************** ALMST   25200 D  # Alma-Ata Summer Time
*** 253,271 ****
  # 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
  # Other timezones:
  #  - AMT: Amazon Time (America)
! AMT     14400    # Armenia Time
                   #     (Asia/Yerevan)
! ANAST   46800 D  # Anadyr Summer Time (obsolete)
! ANAT    43200    # Anadyr Time
                   #     (Asia/Anadyr)
! AZST    18000 D  # Azerbaijan Summer Time
                   #     (Asia/Baku)
! AZT     14400    # Azerbaijan Time
                   #     (Asia/Baku)
  BDT     21600    # Bangladesh Time
                   #     (Asia/Dhaka)
--- 253,271 ----
  # CONFLICT! AMST is not unique
  # Other timezones:
  #  - AMST: Amazon Summer Time (America)
! AMST    Asia/Yerevan  # Armenia Summer Time
                   #     (Asia/Yerevan)
  # CONFLICT! AMT is not unique
  # Other timezones:
  #  - AMT: Amazon Time (America)
! AMT     Asia/Yerevan  # Armenia Time
                   #     (Asia/Yerevan)
! ANAST   Asia/Anadyr  # Anadyr Summer Time (obsolete)
! ANAT    Asia/Anadyr  # Anadyr Time
                   #     (Asia/Anadyr)
! AZST    Asia/Baku  # Azerbaijan Summer Time
                   #     (Asia/Baku)
! AZT     Asia/Baku  # Azerbaijan Time
                   #     (Asia/Baku)
  BDT     21600    # Bangladesh Time
                   #     (Asia/Dhaka)
*************** BORT    28800    # Borneo Time (Indonesi
*** 275,283 ****
  BTT     21600    # Bhutan Time
                   #     (Asia/Thimphu)
  CCT     28800    # China Coastal Time (not in zic)
! GEST    14400 D  # Georgia Summer Time (obsolete)
!                  #     (Asia/Tbilisi)
! GET     14400    # Georgia Time (caution: this used to mean 10800)
                   #     (Asia/Tbilisi)
  HKT     28800    # Hong Kong Time (not in zic)
  ICT     25200    # Indochina Time
--- 275,282 ----
  BTT     21600    # Bhutan Time
                   #     (Asia/Thimphu)
  CCT     28800    # China Coastal Time (not in zic)
! GEST    Asia/Tbilisi  # Georgia Summer Time (obsolete)
! GET     Asia/Tbilisi  # Georgia Time
                   #     (Asia/Tbilisi)
  HKT     28800    # Hong Kong Time (not in zic)
  ICT     25200    # Indochina Time
*************** ICT     25200    # Indochina Time
*** 287,294 ****
                   #     (Asia/Vientiane)
  IDT     10800 D  # Israel Daylight Time
                   #     (Asia/Jerusalem)
! IRKST   32400 D  # Irkutsk Summer Time (obsolete)
! IRKT    28800    # Irkutsk Time (caution: this used to mean 32400)
                   #     (Asia/Irkutsk)
  IRT     12600    # Iran Time (not in zic)
  # CONFLICT! IST is not unique
--- 286,293 ----
                   #     (Asia/Vientiane)
  IDT     10800 D  # Israel Daylight Time
                   #     (Asia/Jerusalem)
! IRKST   Asia/Irkutsk  # Irkutsk Summer Time (obsolete)
! IRKT    Asia/Irkutsk  # Irkutsk Time
                   #     (Asia/Irkutsk)
  IRT     12600    # Iran Time (not in zic)
  # CONFLICT! IST is not unique
*************** JST     32400    # Japan Standard Time
*** 302,334 ****
                   #     (Asia/Tokyo)
  KDT     36000 D  # Korean Daylight Time (not in zic)
  KGST    21600 D  # Kyrgyzstan Summer Time (obsolete)
                   #     (Asia/Bishkek)
! KGT     21600    # Kyrgyzstan Time (caution: this used to mean 18000)
!                  #     (Asia/Bishkek)
! KRAST   28800 D  # Krasnoyarsk Summer Time (obsolete)
! KRAT    25200    # Krasnoyarsk Time (caution: this used to mean 28800)
                   #     (Asia/Krasnoyarsk)
  KST     32400    # Korean Standard Time
                   #     (Asia/Pyongyang)
! LKT     21600    # Lanka Time (obsolete)
! MAGST   43200 D  # Magadan Summer Time (obsolete)
! MAGT    36000    # Magadan Time (caution: this used to mean 43200)
                   #     (Asia/Magadan)
  MMT     23400    # Myanmar Time
                   #     (Asia/Rangoon)
  MYT     28800    # Malaysia Time
                   #     (Asia/Kuala_Lumpur)
                   #     (Asia/Kuching)
! NOVST   25200 D  # Novosibirsk Summer Time (obsolete)
! NOVT    21600    # Novosibirsk Time (caution: this used to mean 25200)
                   #     (Asia/Novosibirsk)
  NPT     20700    # Nepal Time
                   #     (Asia/Katmandu)
! OMSST   25200 D  # Omsk Summer Time (obsolete)
! OMST    21600    # Omsk Time (caution: this used to mean 25200)
                   #     (Asia/Omsk)
! PETST   46800 D  # Petropavlovsk-Kamchatski Summer Time (obsolete)
! PETT    43200    # Petropavlovsk-Kamchatski Time
                   #     (Asia/Kamchatka)
  PHT     28800    # Philippine Time
                   #     (Asia/Manila)
--- 301,332 ----
                   #     (Asia/Tokyo)
  KDT     36000 D  # Korean Daylight Time (not in zic)
  KGST    21600 D  # Kyrgyzstan Summer Time (obsolete)
+ KGT     Asia/Bishkek  # Kyrgyzstan Time
                   #     (Asia/Bishkek)
! KRAST   Asia/Krasnoyarsk  # Krasnoyarsk Summer Time (obsolete)
! KRAT    Asia/Krasnoyarsk  # Krasnoyarsk Time
                   #     (Asia/Krasnoyarsk)
  KST     32400    # Korean Standard Time
                   #     (Asia/Pyongyang)
! LKT     Asia/Colombo  # Lanka Time (obsolete)
! MAGST   Asia/Magadan  # Magadan Summer Time (obsolete)
! MAGT    Asia/Magadan  # Magadan Time
                   #     (Asia/Magadan)
  MMT     23400    # Myanmar Time
                   #     (Asia/Rangoon)
  MYT     28800    # Malaysia Time
                   #     (Asia/Kuala_Lumpur)
                   #     (Asia/Kuching)
! NOVST   Asia/Novosibirsk  # Novosibirsk Summer Time (obsolete)
! NOVT    Asia/Novosibirsk  # Novosibirsk Time
                   #     (Asia/Novosibirsk)
  NPT     20700    # Nepal Time
                   #     (Asia/Katmandu)
! OMSST   Asia/Omsk  # Omsk Summer Time (obsolete)
! OMST    Asia/Omsk  # Omsk Time
                   #     (Asia/Omsk)
! PETST   Asia/Kamchatka  # Petropavlovsk-Kamchatski Summer Time (obsolete)
! PETT    Asia/Kamchatka  # Petropavlovsk-Kamchatski Time
                   #     (Asia/Kamchatka)
  PHT     28800    # Philippine Time
                   #     (Asia/Manila)
*************** PKT     18000    # Pakistan Time
*** 336,349 ****
                   #     (Asia/Karachi)
  PKST    21600 D  # Pakistan Summer Time
                   #     (Asia/Karachi)
! SGT     28800    # Singapore Time
                   #     (Asia/Singapore)
  TJT     18000    # Tajikistan Time
                   #     (Asia/Dushanbe)
! TMT     18000    # Turkmenistan Time
                   #     (Asia/Ashgabat)
  ULAST   32400 D  # Ulan Bator Summer Time (obsolete)
! ULAT    28800    # Ulan Bator Time
                   #     (Asia/Ulaanbaatar)
  UZST    21600 D  # Uzbekistan Summer Time
                   #     (Asia/Samarkand)
--- 334,347 ----
                   #     (Asia/Karachi)
  PKST    21600 D  # Pakistan Summer Time
                   #     (Asia/Karachi)
! SGT     Asia/Singapore  # Singapore Time
                   #     (Asia/Singapore)
  TJT     18000    # Tajikistan Time
                   #     (Asia/Dushanbe)
! TMT     Asia/Ashgabat  # Turkmenistan Time
                   #     (Asia/Ashgabat)
  ULAST   32400 D  # Ulan Bator Summer Time (obsolete)
! ULAT    Asia/Ulaanbaatar  # Ulan Bator Time
                   #     (Asia/Ulaanbaatar)
  UZST    21600 D  # Uzbekistan Summer Time
                   #     (Asia/Samarkand)
*************** UZST    21600 D  # Uzbekistan Summer Tim
*** 351,366 ****
  UZT     18000    # Uzbekistan Time
                   #     (Asia/Samarkand)
                   #     (Asia/Tashkent)
! VLAST   39600 D  # Vladivostok Summer Time (obsolete)
! VLAT    36000    # Vladivostok Time (caution: this used to mean 39600)
                   #     (Asia/Vladivostok)
  XJT     21600    # Xinjiang Time
                   #     (Asia/Urumqi)
! YAKST   36000 D  # Yakutsk Summer Time (obsolete)
! YAKT    32400    # Yakutsk Time (caution: this used to mean 36000)
                   #     (Asia/Yakutsk)
  YEKST   21600 D  # Yekaterinburg Summer Time (obsolete)
! YEKT    18000    # Yekaterinburg Time (caution: this used to mean 21600)
                   #     (Asia/Yekaterinburg)

  #################### ATLANTIC ####################
--- 349,364 ----
  UZT     18000    # Uzbekistan Time
                   #     (Asia/Samarkand)
                   #     (Asia/Tashkent)
! VLAST   Asia/Vladivostok  # Vladivostok Summer Time (obsolete)
! VLAT    Asia/Vladivostok  # Vladivostok Time
                   #     (Asia/Vladivostok)
  XJT     21600    # Xinjiang Time
                   #     (Asia/Urumqi)
! YAKST   Asia/Yakutsk  # Yakutsk Summer Time (obsolete)
! YAKT    Asia/Yakutsk  # Yakutsk Time
                   #     (Asia/Yakutsk)
  YEKST   21600 D  # Yekaterinburg Summer Time (obsolete)
! YEKT    Asia/Yekaterinburg  # Yekaterinburg Time
                   #     (Asia/Yekaterinburg)

  #################### ATLANTIC ####################
*************** AZOST       0 D  # Azores Summer Time
*** 406,414 ****
                   #     (Atlantic/Azores)
  AZOT    -3600    # Azores Time
                   #     (Atlantic/Azores)
! FKST   -10800    # Falkland Islands Summer Time (now used all year round)
                   #     (Atlantic/Stanley)
! FKT    -14400    # Falkland Islands Time (obsolete)

  #################### AUSTRALIA ####################

--- 404,412 ----
                   #     (Atlantic/Azores)
  AZOT    -3600    # Azores Time
                   #     (Atlantic/Azores)
! FKST    Atlantic/Stanley  # Falkland Islands Summer/Standard Time
                   #     (Atlantic/Stanley)
! FKT     Atlantic/Stanley  # Falkland Islands Time (obsolete)

  #################### AUSTRALIA ####################

*************** AWST    28800    # Australian Western St
*** 443,449 ****
                   #     (Australia/Perth)
  CADT    37800 D  # Central Australia Daylight-Saving Time (not in zic)
  CAST    34200    # Central Australia Standard Time (not in zic)
! LHDT    39600 D  # Lord Howe Daylight Time
                   #     (Australia/Lord_Howe)
  LHST    37800    # Lord Howe Standard Time
                   #     (Australia/Lord_Howe)
--- 441,447 ----
                   #     (Australia/Perth)
  CADT    37800 D  # Central Australia Daylight-Saving Time (not in zic)
  CAST    34200    # Central Australia Standard Time (not in zic)
! LHDT    Australia/Lord_Howe  # Lord Howe Daylight Time
                   #     (Australia/Lord_Howe)
  LHST    37800    # Lord Howe Standard Time
                   #     (Australia/Lord_Howe)
*************** MET      3600    # Middle Europe Time (n
*** 639,647 ****
  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)
! MSK     10800    # Moscow Time (caution: this used to mean 14400)
                   #     (Europe/Moscow)
! VOLT    14400    # Volgograd Time (obsolete)
  WET         0    # Western Europe Time
                   #     (Africa/Casablanca)
                   #     (Africa/El_Aaiun)
--- 637,646 ----
  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)
! MSK     Europe/Moscow  # Moscow Time
                   #     (Europe/Moscow)
!                  #     (Europe/Volgograd)
! VOLT    Europe/Volgograd  # Volgograd Time (obsolete)
  WET         0    # Western Europe Time
                   #     (Africa/Casablanca)
                   #     (Africa/El_Aaiun)
*************** WETDST   3600 D  # Western Europe Summer
*** 659,665 ****

  CXT     25200    # Christmas Island Time (Indian Ocean)
                   #     (Indian/Christmas)
! IOT     21600    # British Indian Ocean Territory (Chagos) (there was a timezone change recently in 1996)
                   #     (Indian/Chagos)
  MUT     14400    # Mauritius Island Time
                   #     (Indian/Mauritius)
--- 658,664 ----

  CXT     25200    # Christmas Island Time (Indian Ocean)
                   #     (Indian/Christmas)
! IOT     Indian/Chagos  # British Indian Ocean Territory (Chagos)
                   #     (Indian/Chagos)
  MUT     14400    # Mauritius Island Time
                   #     (Indian/Mauritius)
*************** CHAST   45900    # Chatham Standard Time
*** 682,692 ****
                   #     (Pacific/Chatham)
  CHUT    36000    # Chuuk Time
                   #     (Pacific/Chuuk)
! 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
                   #     (Pacific/Fiji)
--- 681,691 ----
                   #     (Pacific/Chatham)
  CHUT    36000    # Chuuk Time
                   #     (Pacific/Chuuk)
! CKT     Pacific/Rarotonga  # Cook Islands Time
                   #     (Pacific/Rarotonga)
! EASST   Pacific/Easter  # Easter Island Summer Time (Chile)
                   #     (Pacific/Easter)
! EAST    Pacific/Easter  # Easter Island Time (Chile)
                   #     (Pacific/Easter)
  FJST    46800 D  # Fiji Summer Time
                   #     (Pacific/Fiji)
*************** GILT    43200    # Gilbert Islands Time
*** 701,709 ****
  HST    -36000    # Hawaiian Standard Time
                   #     (Pacific/Honolulu)
                   #     (Pacific/Johnston)
! KOST    39600    # Kosrae Time
                   #     (Pacific/Kosrae)
! LINT    50400    # Line Islands Time (Kiribati)
                   #     (Pacific/Kiritimati)
  MART   -34200    # Marquesas Time
                   #     (Pacific/Marquesas)
--- 700,708 ----
  HST    -36000    # Hawaiian Standard Time
                   #     (Pacific/Honolulu)
                   #     (Pacific/Johnston)
! KOST    Pacific/Kosrae  # Kosrae Time
                   #     (Pacific/Kosrae)
! LINT    Pacific/Kiritimati  # Line Islands Time (Kiribati)
                   #     (Pacific/Kiritimati)
  MART   -34200    # Marquesas Time
                   #     (Pacific/Marquesas)
*************** MPT     36000    # North Mariana Islands
*** 715,721 ****
  # Other timezones:
  #  - NFT: Norfolk Time (Pacific)
  NFT    -12600    # Newfoundland Time (not in zic)
! NUT    -39600    # Niue Time
                   #     (Pacific/Niue)
  NZDT    46800 D  # New Zealand Daylight Time
                   #     (Antarctica/McMurdo)
--- 714,720 ----
  # Other timezones:
  #  - NFT: Norfolk Time (Pacific)
  NFT    -12600    # Newfoundland Time (not in zic)
! NUT     Pacific/Niue  # Niue Time
                   #     (Pacific/Niue)
  NZDT    46800 D  # New Zealand Daylight Time
                   #     (Antarctica/McMurdo)
*************** NZST    43200    # New Zealand Standard
*** 725,731 ****
                   #     (Pacific/Auckland)
  PGT     36000    # Papua New Guinea Time
                   #     (Pacific/Port_Moresby)
! PHOT    46800    # Phoenix Islands Time (Kiribati)
                   #     (Pacific/Enderbury)
  PONT    39600    # Ponape Time (Micronesia)
                   #     (Pacific/Ponape)
--- 724,730 ----
                   #     (Pacific/Auckland)
  PGT     36000    # Papua New Guinea Time
                   #     (Pacific/Port_Moresby)
! PHOT    Pacific/Enderbury  # Phoenix Islands Time (Kiribati)
                   #     (Pacific/Enderbury)
  PONT    39600    # Ponape Time (Micronesia)
                   #     (Pacific/Ponape)
*************** PWT     32400    # Palau Time
*** 733,739 ****
                   #     (Pacific/Palau)
  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
                   #     (Pacific/Tongatapu)
--- 732,738 ----
                   #     (Pacific/Palau)
  TAHT   -36000    # Tahiti Time (zic says "TAHT", other sources "THAT")
                   #     (Pacific/Tahiti)
! TKT     Pacific/Fakaofo  # Tokelau Time
                   #     (Pacific/Fakaofo)
  TOT     46800    # Tonga Time
                   #     (Pacific/Tongatapu)
diff --git a/src/timezone/tznames/Europe.txt b/src/timezone/tznames/Europe.txt
index c6b37bd..421f8f1 100644
*** a/src/timezone/tznames/Europe.txt
--- b/src/timezone/tznames/Europe.txt
*************** MET      3600    # Middle Europe Time (n
*** 186,197 ****
  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)
! MSK     10800    # Moscow Time (caution: this used to mean 14400)
                   #     (Europe/Moscow)
! SAMST   18000 D  # Samara Summer Time (obsolete)
! SAMT    14400    # Samara Time
                   #     (Europe/Samara)
! VOLT    14400    # Volgograd Time (obsolete)
  WEST     3600 D  # Western Europe Summer Time
                   #     (Africa/Casablanca)
                   #     (Atlantic/Canary)
--- 186,198 ----
  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)
! MSK     Europe/Moscow  # Moscow Time
                   #     (Europe/Moscow)
!                  #     (Europe/Volgograd)
! SAMST   Europe/Samara  # Samara Summer Time (obsolete)
! SAMT    Europe/Samara  # Samara Time
                   #     (Europe/Samara)
! VOLT    Europe/Volgograd  # Volgograd Time (obsolete)
  WEST     3600 D  # Western Europe Summer Time
                   #     (Africa/Casablanca)
                   #     (Atlantic/Canary)
diff --git a/src/timezone/tznames/Indian.txt b/src/timezone/tznames/Indian.txt
index c77c991..6346600 100644
*** a/src/timezone/tznames/Indian.txt
--- b/src/timezone/tznames/Indian.txt
*************** EAT     10800    # East Africa Time
*** 23,29 ****
                   #     (Indian/Antananarivo)
                   #     (Indian/Comoro)
                   #     (Indian/Mayotte)
! IOT     21600    # British Indian Ocean Territory (Chagos) (there was a timezone change recently in 1996)
                   #     (Indian/Chagos)
  MUT     14400    # Mauritius Island Time
                   #     (Indian/Mauritius)
--- 23,29 ----
                   #     (Indian/Antananarivo)
                   #     (Indian/Comoro)
                   #     (Indian/Mayotte)
! IOT     Indian/Chagos  # British Indian Ocean Territory (Chagos)
                   #     (Indian/Chagos)
  MUT     14400    # Mauritius Island Time
                   #     (Indian/Mauritius)
diff --git a/src/timezone/tznames/Pacific.txt b/src/timezone/tznames/Pacific.txt
index 2f98814..1d20558 100644
*** a/src/timezone/tznames/Pacific.txt
--- b/src/timezone/tznames/Pacific.txt
*************** ChST    36000    # Chamorro Standard Tim
*** 16,29 ****
                   #     (Pacific/Saipan)
  CHUT    36000    # Chuuk Time
                   #     (Pacific/Chuuk)
! 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
  # Other timezones:
  #  - EAST: East Australian Standard Time (Australia)
! EAST   -21600    # Easter Island Time (Chile)
                   #     (Pacific/Easter)
  FJST    46800 D  # Fiji Summer Time (caution: this used to mean -46800)
                   #     (Pacific/Fiji)
--- 16,29 ----
                   #     (Pacific/Saipan)
  CHUT    36000    # Chuuk Time
                   #     (Pacific/Chuuk)
! CKT     Pacific/Rarotonga  # Cook Islands Time
                   #     (Pacific/Rarotonga)
! EASST   Pacific/Easter  # Easter Island Summer Time (Chile)
                   #     (Pacific/Easter)
  # CONFLICT! EAST is not unique
  # Other timezones:
  #  - EAST: East Australian Standard Time (Australia)
! EAST    Pacific/Easter  # Easter Island Time (Chile)
                   #     (Pacific/Easter)
  FJST    46800 D  # Fiji Summer Time (caution: this used to mean -46800)
                   #     (Pacific/Fiji)
*************** GILT    43200    # Gilbert Islands Time
*** 38,46 ****
  HST    -36000    # Hawaiian Standard Time
                   #     (Pacific/Honolulu)
                   #     (Pacific/Johnston)
! KOST    39600    # Kosrae Time
                   #     (Pacific/Kosrae)
! LINT    50400    # Line Islands Time (Kiribati)
                   #     (Pacific/Kiritimati)
  MART   -34200    # Marquesas Time
                   #     (Pacific/Marquesas)
--- 38,46 ----
  HST    -36000    # Hawaiian Standard Time
                   #     (Pacific/Honolulu)
                   #     (Pacific/Johnston)
! KOST    Pacific/Kosrae  # Kosrae Time
                   #     (Pacific/Kosrae)
! LINT    Pacific/Kiritimati  # Line Islands Time (Kiribati)
                   #     (Pacific/Kiritimati)
  MART   -34200    # Marquesas Time
                   #     (Pacific/Marquesas)
*************** NCT     39600    # New Caledonia Time
*** 55,63 ****
  #  - NFT: Newfoundland Time (America)
  NFT     41400    # Norfolk Time
                   #     (Pacific/Norfolk)
! NRT     43200    # Nauru Time
                   #     (Pacific/Nauru)
! NUT    -39600    # Niue Time
                   #     (Pacific/Niue)
  NZDT    46800 D  # New Zealand Daylight Time
                   #     (Antarctica/McMurdo)
--- 55,63 ----
  #  - NFT: Newfoundland Time (America)
  NFT     41400    # Norfolk Time
                   #     (Pacific/Norfolk)
! NRT     Pacific/Nauru  # Nauru Time
                   #     (Pacific/Nauru)
! NUT     Pacific/Niue  # Niue Time
                   #     (Pacific/Niue)
  NZDT    46800 D  # New Zealand Daylight Time
                   #     (Antarctica/McMurdo)
*************** NZST    43200    # New Zealand Standard
*** 67,73 ****
                   #     (Pacific/Auckland)
  PGT     36000    # Papua New Guinea Time
                   #     (Pacific/Port_Moresby)
! PHOT    46800    # Phoenix Islands Time (Kiribati)
                   #     (Pacific/Enderbury)
  PONT    39600    # Ponape Time (Micronesia)
                   #     (Pacific/Ponape)
--- 67,73 ----
                   #     (Pacific/Auckland)
  PGT     36000    # Papua New Guinea Time
                   #     (Pacific/Port_Moresby)
! PHOT    Pacific/Enderbury  # Phoenix Islands Time (Kiribati)
                   #     (Pacific/Enderbury)
  PONT    39600    # Ponape Time (Micronesia)
                   #     (Pacific/Ponape)
*************** SST    -39600    # South Sumatran Time
*** 87,93 ****
                   #     (Pacific/Pago_Pago)
  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
                   #     (Pacific/Tongatapu)
--- 87,93 ----
                   #     (Pacific/Pago_Pago)
  TAHT   -36000    # Tahiti Time (zic says "TAHT", other sources "THAT")
                   #     (Pacific/Tahiti)
! TKT     Pacific/Fakaofo  # Tokelau Time
                   #     (Pacific/Fakaofo)
  TOT     46800    # Tonga Time
                   #     (Pacific/Tongatapu)

В списке pgsql-hackers по дате отправления:

Предыдущее
От: Simon Riggs
Дата:
Сообщение: Re: Column Redaction
Следующее
От: Claudio Freire
Дата:
Сообщение: Re: Column Redaction