diff options
-rw-r--r-- | src/timezone/tznames/Africa.txt | 2 | ||||
-rw-r--r-- | src/timezone/tznames/America.txt | 2 | ||||
-rw-r--r-- | src/timezone/tznames/Antarctica.txt | 6 | ||||
-rw-r--r-- | src/timezone/tznames/Asia.txt | 48 | ||||
-rw-r--r-- | src/timezone/tznames/Atlantic.txt | 2 | ||||
-rw-r--r-- | src/timezone/tznames/Australia | 2 | ||||
-rw-r--r-- | src/timezone/tznames/Australia.txt | 2 | ||||
-rw-r--r-- | src/timezone/tznames/Default | 54 | ||||
-rw-r--r-- | src/timezone/tznames/Etc.txt | 2 | ||||
-rw-r--r-- | src/timezone/tznames/Europe.txt | 10 | ||||
-rw-r--r-- | src/timezone/tznames/India | 2 | ||||
-rw-r--r-- | src/timezone/tznames/Indian.txt | 2 | ||||
-rw-r--r-- | src/timezone/tznames/Pacific.txt | 8 | ||||
-rw-r--r-- | src/timezone/tznames/README | 2 |
14 files changed, 76 insertions, 68 deletions
diff --git a/src/timezone/tznames/Africa.txt b/src/timezone/tznames/Africa.txt index 7d883884cb3..6b88f20fadd 100644 --- a/src/timezone/tznames/Africa.txt +++ b/src/timezone/tznames/Africa.txt @@ -4,7 +4,7 @@ # a template for timezones you could need. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/Africa.txt,v 1.2.6.1 2009/09/06 15:25:31 tgl Exp $ +# src/timezone/tznames/Africa.txt # CAT 7200 # Central Africa Time diff --git a/src/timezone/tznames/America.txt b/src/timezone/tznames/America.txt index e929c092389..b6104b85f37 100644 --- a/src/timezone/tznames/America.txt +++ b/src/timezone/tznames/America.txt @@ -4,7 +4,7 @@ # a template for timezones you could need. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/America.txt,v 1.4 2008/03/02 00:10:22 tgl Exp $ +# src/timezone/tznames/America.txt # # Acre time is sometimes called Acre Standard Time (AST) which leads to a diff --git a/src/timezone/tznames/Antarctica.txt b/src/timezone/tznames/Antarctica.txt index 22b06f90986..8cd17755745 100644 --- a/src/timezone/tznames/Antarctica.txt +++ b/src/timezone/tznames/Antarctica.txt @@ -4,7 +4,7 @@ # a template for timezones you could need. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/Antarctica.txt,v 1.2 2006/07/25 13:49:21 tgl Exp $ +# src/timezone/tznames/Antarctica.txt # CLST -10800 D # Chile Summer Time @@ -17,8 +17,10 @@ DAVT 25200 # Davis Time (Antarctica) # (Antarctica/Davis) DDUT 36000 # Dumont-d`Urville Time (Antarctica) # (Antarctica/DumontDUrville) -MAWT 21600 # Mawson Time (Antarctica) +MAWT 18000 # Mawson Time (Antarctica) (caution: this used to mean 21600) # (Antarctica/Mawson) +MIST 39600 # Macquarie Island Time + # (Antarctica/Macquarie) NZDT 46800 D # New Zealand Daylight Time # (Antarctica/McMurdo) # (Pacific/Auckland) diff --git a/src/timezone/tznames/Asia.txt b/src/timezone/tznames/Asia.txt index 0826b01ed70..26d3be3d925 100644 --- a/src/timezone/tznames/Asia.txt +++ b/src/timezone/tznames/Asia.txt @@ -4,7 +4,7 @@ # a template for timezones you could need. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/Asia.txt,v 1.3.4.2 2010/05/11 22:36:58 tgl Exp $ +# src/timezone/tznames/Asia.txt # # CONFLICT! ADT is not unique @@ -63,9 +63,9 @@ BORT 28800 # Borneo Time (Indonesia) (not in zic) BTT 21600 # Bhutan Time # (Asia/Thimphu) CCT 28800 # China Coastal Time (not in zic) -CHOST 36000 D # Choibalsan Summer Time +CHOST 36000 D # Choibalsan Summer Time (obsolete) # (Asia/Choibalsan) -CHOT 32400 # Choibalsan Time +CHOT 28800 # Choibalsan Time (caution: this used to mean 32400) # (Asia/Choibalsan) CIT 28800 # Central Indonesia Time # (Asia/Makassar) @@ -118,9 +118,9 @@ EET 7200 # East-Egypt Time # (Europe/Zaporozhye) EIT 32400 # East Indonesia Time # (Asia/Jayapura) -GEST 14400 D # Georgia Summer Time (there was a timezone change in 2004) +GEST 14400 D # Georgia Summer Time (obsolete) # (Asia/Tbilisi) -GET 10800 # Georgia Time (there was a timezone change in 2004) +GET 14400 # Georgia Time (caution: this used to mean 10800) # (Asia/Tbilisi) # CONFLICT! GST is not unique # Other timezones: @@ -141,9 +141,9 @@ ICT 25200 # Indochina Time IDT 10800 D # Israel Daylight Time IRDT 16200 D # Iran Daylight Time # (Asia/Tehran) -IRKST 32400 D # Irkutsk Summer Time +IRKST 32400 D # Irkutsk Summer Time (obsolete) # (Asia/Irkutsk) -IRKT 28800 # Irkutsk Time +IRKT 32400 # Irkutsk Time (caution: this used to mean 28800) # (Asia/Irkutsk) IRST 12600 # Iran Standard Time # (Asia/Tehran) @@ -163,36 +163,36 @@ JAYT 32400 # Jayapura Time (Indonesia) (not in zic) JST 32400 # Japan Standard Time # (Asia/Tokyo) KDT 36000 D # Korean Daylight Time (not in zic) -KGST 21600 D # Kyrgyzstan Summer Time +KGST 21600 D # Kyrgyzstan Summer Time (obsolete) # (Asia/Bishkek) -KGT 18000 # Kyrgyzstan Time +KGT 21600 # Kyrgyzstan Time (caution: this used to mean 18000) # (Asia/Bishkek) -KRAST 28800 D # Krasnoyarsk Summer Time +KRAST 28800 D # Krasnoyarsk Summer Time (obsolete) # (Asia/Krasnoyarsk) -KRAT 25200 # Krasnoyarsk Time +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) -MAGST 43200 D # Magadan Summer Time +MAGST 43200 D # Magadan Summer Time (obsolete) # (Asia/Magadan) -MAGT 39600 # Magadan Time +MAGT 43200 # Magadan Time (caution: this used to mean 39600) # (Asia/Magadan) MMT 23400 # Myanmar Time # (Asia/Rangoon) MYT 28800 # Malaysia Time # (Asia/Kuala_Lumpur) # (Asia/Kuching) -NOVST 25200 D # Novosibirsk Summer Time +NOVST 25200 D # Novosibirsk Summer Time (obsolete) # (Asia/Novosibirsk) -NOVT 21600 # Novosibirsk Time +NOVT 25200 # Novosibirsk Time (caution: this used to mean 21600) # (Asia/Novosibirsk) NPT 20700 # Nepal Time # (Asia/Katmandu) -OMSST 25200 D # Omsk Summer Time +OMSST 25200 D # Omsk Summer Time (obsolete) # (Asia/Omsk) -OMST 21600 # Omsk Time +OMST 25200 # Omsk Time (caution: this used to mean 21600) # (Asia/Omsk) ORAT 18000 # Oral Time # (Asia/Oral) @@ -200,7 +200,7 @@ PETST 46800 D # Petropavlovsk-Kamchatski Summer Time # (Asia/Kamchatka) PETT 43200 # Petropavlovsk-Kamchatski Time # (Asia/Kamchatka) -PHT 28800 # Phillipine Time (not in zic) +PHT 28800 # Philippine Time (not in zic) PKT 18000 # Pakistan Time # (Asia/Karachi) PKST 21600 D # Pakistan Summer Time @@ -229,19 +229,19 @@ UZST 21600 D # Uzbekistan Summer Time UZT 18000 # Uzbekistan Time # (Asia/Samarkand) # (Asia/Tashkent) -VLAST 39600 D # Vladivostok Summer Time +VLAST 39600 D # Vladivostok Summer Time (obsolete) # (Asia/Vladivostok) -VLAT 36000 # Vladivostok Time +VLAT 39600 # Vladivostok Time (caution: this used to mean 36000) # (Asia/Vladivostok) WIT 25200 # Waktu Indonesia Timur # West Indonesia Time # (Asia/Jakarta) # (Asia/Pontianak) -YAKST 36000 D # Yakutsk Summer Time +YAKST 36000 D # Yakutsk Summer Time (obsolete) # (Asia/Yakutsk) -YAKT 32400 # Yakutsk Time +YAKT 36000 # Yakutsk Time (caution: this used to mean 32400) # (Asia/Yakutsk) -YEKST 21600 D # Yekaterinburg Summer Time +YEKST 21600 D # Yekaterinburg Summer Time (obsolete) # (Asia/Yekaterinburg) -YEKT 18000 # Yekaterinburg Time +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 a74c8e44de9..b2085818bb6 100644 --- a/src/timezone/tznames/Atlantic.txt +++ b/src/timezone/tznames/Atlantic.txt @@ -4,7 +4,7 @@ # a template for timezones you could need. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/Atlantic.txt,v 1.2 2006/07/25 13:49:21 tgl Exp $ +# src/timezone/tznames/Atlantic.txt # # CONFLICT! ADT is not unique diff --git a/src/timezone/tznames/Australia b/src/timezone/tznames/Australia index a55f5088b47..320e94dcbcf 100644 --- a/src/timezone/tznames/Australia +++ b/src/timezone/tznames/Australia @@ -4,7 +4,7 @@ # timezone_abbreviations to 'Australia'. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/Australia,v 1.2 2006/07/25 13:49:21 tgl Exp $ +# src/timezone/tznames/Australia # include the default set diff --git a/src/timezone/tznames/Australia.txt b/src/timezone/tznames/Australia.txt index 9ede28cd2bd..906c7fc43ae 100644 --- a/src/timezone/tznames/Australia.txt +++ b/src/timezone/tznames/Australia.txt @@ -4,7 +4,7 @@ # a template for timezones you could need. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/Australia.txt,v 1.2.6.1 2009/09/06 15:25:31 tgl Exp $ +# src/timezone/tznames/Australia.txt # ACSST 37800 D # Central Australia (not in zic) diff --git a/src/timezone/tznames/Default b/src/timezone/tznames/Default index bf0ce82779c..3d5efbd6d4e 100644 --- a/src/timezone/tznames/Default +++ b/src/timezone/tznames/Default @@ -4,7 +4,7 @@ # timezone_abbreviations to 'Default'. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/Default,v 1.7.2.3 2010/08/26 19:59:00 tgl Exp $ +# src/timezone/tznames/Default #################### AFRICA #################### @@ -239,7 +239,7 @@ DDUT 36000 # Dumont-d'Urville Time (Antarctica) # (Antarctica/DumontDUrville) # (Antarctica/Palmer) # (America/Santiago) -MAWT 21600 # Mawson Time (Antarctica) +MAWT 18000 # Mawson Time (Antarctica) (caution: this used to mean 21600) # (Antarctica/Mawson) #################### ASIA #################### @@ -273,9 +273,9 @@ BORT 28800 # Borneo Time (Indonesia) (not in zic) BTT 21600 # Bhutan Time # (Asia/Thimphu) CCT 28800 # China Coastal Time (not in zic) -GEST 14400 D # Georgia Summer Time (there was a timezone change in 2004) +GEST 14400 D # Georgia Summer Time (obsolete) # (Asia/Tbilisi) -GET 10800 # Georgia Time (there was a timezone change in 2004) +GET 14400 # Georgia Time (caution: this used to mean 10800) # (Asia/Tbilisi) HKT 28800 # Hong Kong Time (not in zic) ICT 25200 # Indochina Time @@ -284,9 +284,9 @@ ICT 25200 # Indochina Time # (Asia/Saigon) # (Asia/Vientiane) IDT 10800 D # Israel Daylight Time -IRKST 32400 D # Irkutsk Summer Time +IRKST 32400 D # Irkutsk Summer Time (obsolete) # (Asia/Irkutsk) -IRKT 28800 # Irkutsk Time +IRKT 32400 # Irkutsk Time (caution: this used to mean 28800) # (Asia/Irkutsk) IRT 12600 # Iran Time (not in zic) # CONFLICT! IST is not unique @@ -298,42 +298,42 @@ JAYT 32400 # Jayapura Time (Indonesia) (not in zic) JST 32400 # Japan Standard Time # (Asia/Tokyo) KDT 36000 D # Korean Daylight Time (not in zic) -KGST 21600 D # Kyrgyzstan Summer Time +KGST 21600 D # Kyrgyzstan Summer Time (obsolete) # (Asia/Bishkek) -KGT 18000 # Kyrgyzstan Time +KGT 21600 # Kyrgyzstan Time (caution: this used to mean 18000) # (Asia/Bishkek) -KRAST 28800 D # Krasnoyarsk Summer Time +KRAST 28800 D # Krasnoyarsk Summer Time (obsolete) # (Asia/Krasnoyarsk) -KRAT 25200 # Krasnoyarsk Time +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) -MAGST 43200 D # Magadan Summer Time +MAGST 43200 D # Magadan Summer Time (obsolete) # (Asia/Magadan) -MAGT 39600 # Magadan Time +MAGT 43200 # Magadan Time (caution: this used to mean 39600) # (Asia/Magadan) MMT 23400 # Myanmar Time # (Asia/Rangoon) MYT 28800 # Malaysia Time # (Asia/Kuala_Lumpur) # (Asia/Kuching) -NOVST 25200 D # Novosibirsk Summer Time +NOVST 25200 D # Novosibirsk Summer Time (obsolete) # (Asia/Novosibirsk) -NOVT 21600 # Novosibirsk Time +NOVT 25200 # Novosibirsk Time (caution: this used to mean 21600) # (Asia/Novosibirsk) NPT 20700 # Nepal Time # (Asia/Katmandu) -OMSST 25200 D # Omsk Summer Time +OMSST 25200 D # Omsk Summer Time (obsolete) # (Asia/Omsk) -OMST 21600 # Omsk Time +OMST 25200 # Omsk Time (caution: this used to mean 21600) # (Asia/Omsk) PETST 46800 D # Petropavlovsk-Kamchatski Summer Time # (Asia/Kamchatka) PETT 43200 # Petropavlovsk-Kamchatski Time # (Asia/Kamchatka) -PHT 28800 # Phillipine Time (not in zic) +PHT 28800 # Philippine Time (not in zic) PKT 18000 # Pakistan Time # (Asia/Karachi) PKST 21600 D # Pakistan Summer Time @@ -354,17 +354,17 @@ UZST 21600 D # Uzbekistan Summer Time UZT 18000 # Uzbekistan Time # (Asia/Samarkand) # (Asia/Tashkent) -VLAST 39600 D # Vladivostok Summer Time +VLAST 39600 D # Vladivostok Summer Time (obsolete) # (Asia/Vladivostok) -VLAT 36000 # Vladivostok Time +VLAT 39600 # Vladivostok Time (caution: this used to mean 36000) # (Asia/Vladivostok) -YAKST 36000 D # Yakutsk Summer Time +YAKST 36000 D # Yakutsk Summer Time (obsolete) # (Asia/Yakutsk) -YAKT 32400 # Yakutsk Time +YAKT 36000 # Yakutsk Time (caution: this used to mean 32400) # (Asia/Yakutsk) -YEKST 21600 D # Yekaterinburg Summer Time +YEKST 21600 D # Yekaterinburg Summer Time (obsolete) # (Asia/Yekaterinburg) -YEKT 18000 # Yekaterinburg Time +YEKT 21600 # Yekaterinburg Time (caution: this used to mean 18000) # (Asia/Yekaterinburg) #################### ATLANTIC #################### @@ -622,10 +622,12 @@ MEST 7200 D # Middle Europe Summer Time (not in zic) 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 +MSD 14400 D # Moscow Daylight Time (obsolete) # (Europe/Moscow) -MSK 10800 # Moscow Time +MSK 14400 # Moscow Time (caution: this used to mean 10800) # (Europe/Moscow) +VOLT 14400 # Volgograd Time + # (Europe/Volgograd) WET 0 # Western Europe Time # (Africa/Casablanca) # (Africa/El_Aaiun) @@ -714,7 +716,7 @@ PWT 32400 # Palau Time # (Pacific/Palau) TAHT -36000 # Tahiti Time (zic says "TAHT", other sources "THAT") # (Pacific/Tahiti) -TKT -36000 # Tokelau Time +TKT 46800 # Tokelau Time (caution: this used to mean -36000) # (Pacific/Fakaofo) TOT 46800 # Tonga Time (not in zic) TRUT 36000 # Truk Time (zic used to say "TRUT", other sources say "TRUK") diff --git a/src/timezone/tznames/Etc.txt b/src/timezone/tznames/Etc.txt index 9d0481d49a3..52bd834a4ab 100644 --- a/src/timezone/tznames/Etc.txt +++ b/src/timezone/tznames/Etc.txt @@ -4,7 +4,7 @@ # a template for timezones you could need. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/Etc.txt,v 1.2 2006/07/25 13:49:21 tgl Exp $ +# src/timezone/tznames/Etc.txt # GMT 0 # Greenwich Mean Time diff --git a/src/timezone/tznames/Europe.txt b/src/timezone/tznames/Europe.txt index 17f8a9deff9..665f576d4d1 100644 --- a/src/timezone/tznames/Europe.txt +++ b/src/timezone/tznames/Europe.txt @@ -4,7 +4,7 @@ # a template for timezones you could need. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/Europe.txt,v 1.2.6.1 2009/09/06 15:25:31 tgl Exp $ +# src/timezone/tznames/Europe.txt # BST 3600 D # British Summer Time @@ -185,14 +185,16 @@ MEST 7200 D # Middle Europe Summer Time (not in zic) 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 +MSD 14400 D # Moscow Daylight Time (obsolete) # (Europe/Moscow) -MSK 10800 # Moscow Time +MSK 14400 # Moscow Time (caution: this used to mean 10800) # (Europe/Moscow) -SAMST 18000 D # Samara Summer Time +SAMST 18000 D # Samara Summer Time (obsolete) # (Europe/Samara) SAMT 14400 # Samara Time # (Europe/Samara) +VOLT 14400 # Volgograd Time + # (Europe/Volgograd) WEST 3600 D # Western Europe Summer Time # (Africa/Casablanca) # (Atlantic/Canary) diff --git a/src/timezone/tznames/India b/src/timezone/tznames/India index 05b404dae89..85830e9f893 100644 --- a/src/timezone/tznames/India +++ b/src/timezone/tznames/India @@ -4,7 +4,7 @@ # timezone_abbreviations to 'India'. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/India,v 1.2 2006/07/25 13:49:21 tgl Exp $ +# src/timezone/tznames/India # include the default set diff --git a/src/timezone/tznames/Indian.txt b/src/timezone/tznames/Indian.txt index 342f897b45a..c77c9919a1c 100644 --- a/src/timezone/tznames/Indian.txt +++ b/src/timezone/tznames/Indian.txt @@ -4,7 +4,7 @@ # a template for timezones you could need. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/Indian.txt,v 1.3 2009/03/05 14:27:50 heikki Exp $ +# src/timezone/tznames/Indian.txt # CCT 23400 # Cocos Islands Time (Indian Ocean) diff --git a/src/timezone/tznames/Pacific.txt b/src/timezone/tznames/Pacific.txt index 573104768ef..2a989d37905 100644 --- a/src/timezone/tznames/Pacific.txt +++ b/src/timezone/tznames/Pacific.txt @@ -4,7 +4,7 @@ # a template for timezones you could need. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/Pacific.txt,v 1.2.6.1 2010/08/26 19:59:00 tgl Exp $ +# src/timezone/tznames/Pacific.txt # CHADT 49500 D # Chatham Daylight Time (New Zealand) @@ -83,7 +83,7 @@ SST -39600 # South Sumatran Time # (Pacific/Pago_Pago) TAHT -36000 # Tahiti Time (zic says "TAHT", other sources "THAT") # (Pacific/Tahiti) -TKT -36000 # Tokelau Time +TKT 46800 # Tokelau Time (caution: this used to mean -36000) # (Pacific/Fakaofo) TOT 46800 # Tonga Time (not in zic) TRUT 36000 # Truk Time (zic used to say "TRUT", other sources say "TRUK") @@ -98,6 +98,8 @@ WFT 43200 # Wallis and Futuna Time # CONFLICT! WST is not unique # Other timezones: # - WST: Western Standard Time (Australia) -WST -39600 # West Samoa Time +WSDT 50400 D # West Samoa Daylight Time + # (Pacific/Apia) +WST 46800 # West Samoa Time (caution: this used to mean -39600) # (Pacific/Apia) YAPT 36000 # Yap Time (Micronesia) (not in zic) diff --git a/src/timezone/tznames/README b/src/timezone/tznames/README index 621d4fc0ccc..6cb0ae88c93 100644 --- a/src/timezone/tznames/README +++ b/src/timezone/tznames/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/timezone/tznames/README,v 1.3.2.1 2009/09/06 15:25:31 tgl Exp $ +src/timezone/tznames/README tznames ======= |