diff options
| author | Tom Lane | 2015-01-31 03:45:44 +0000 |
|---|---|---|
| committer | Tom Lane | 2015-01-31 03:45:44 +0000 |
| commit | 08bd0c58115897de8b5c53f616c2add48e8038c2 (patch) | |
| tree | 9e56d26a6442466ad93dd39a10e10a2c18640c49 /src/timezone/tznames | |
| parent | 3144e1b3c6cf59f068f704061ba967ce707531d3 (diff) | |
Update time zone data files to tzdata release 2015a.
DST law changes in Chile and Mexico (state of Quintana Roo).
Historical changes for Iceland.
Diffstat (limited to 'src/timezone/tznames')
| -rw-r--r-- | src/timezone/tznames/America.txt | 7 | ||||
| -rw-r--r-- | src/timezone/tznames/Antarctica.txt | 4 | ||||
| -rw-r--r-- | src/timezone/tznames/Default | 7 |
3 files changed, 8 insertions, 10 deletions
diff --git a/src/timezone/tznames/America.txt b/src/timezone/tznames/America.txt index 1bb636741b4..931fc7c5d8d 100644 --- a/src/timezone/tznames/America.txt +++ b/src/timezone/tznames/America.txt @@ -116,7 +116,6 @@ CDT -14400 D # Cuba Central Daylight Time # - CDT: Cuba Central Daylight Time (America) # - CDT: Canada Central Daylight Time (America) CDT -18000 D # Central Daylight Time - # (America/Cancun) # (America/Chicago) # (America/Menominee) # (America/Merida) @@ -126,10 +125,10 @@ CDT -18000 D # Central Daylight Time # (America/Rainy_River) # (America/Rankin_Inlet) # (America/Winnipeg) -CLST -10800 D # Chile Summer Time +CLST -10800 D # Chile Summer Time (obsolete) # (America/Santiago) # (Antarctica/Palmer) -CLT -14400 # Chile Time +CLT America/Santiago # Chile Time # (America/Santiago) # (Antarctica/Palmer) COT -18000 # Columbia Time (not in zic) @@ -146,7 +145,6 @@ CST -18000 # Cuba Central Standard Time (America) # - CST: China Standard Time (Asia) # - CST: Cuba Central Standard Time (America) CST -21600 # Central Standard Time (America) - # (America/Cancun) # (America/Chicago) # (America/Menominee) # (America/Merida) @@ -186,6 +184,7 @@ EGT -3600 # East Greenland Time (Svalbard & Jan Mayen) # Other timezones: # - EST: Eastern Standard Time (Australia) EST -18000 # Eastern Standard Time (America) + # (America/Cancun) # (America/Cayman) # (America/Coral_Harbour) # (America/Detroit) diff --git a/src/timezone/tznames/Antarctica.txt b/src/timezone/tznames/Antarctica.txt index 2359020ef87..17e52469223 100644 --- a/src/timezone/tznames/Antarctica.txt +++ b/src/timezone/tznames/Antarctica.txt @@ -10,10 +10,10 @@ AWST 28800 # Australian Western Standard Time # (Antarctica/Casey) # (Australia/Perth) -CLST -10800 D # Chile Summer Time +CLST -10800 D # Chile Summer Time (obsolete) # (America/Santiago) # (Antarctica/Palmer) -CLT -14400 # Chile Time +CLT America/Santiago # Chile Time # (America/Santiago) # (Antarctica/Palmer) DAVT Antarctica/Davis # Davis Time (Antarctica) diff --git a/src/timezone/tznames/Default b/src/timezone/tznames/Default index 7a58e5900e5..bb3b5919600 100644 --- a/src/timezone/tznames/Default +++ b/src/timezone/tznames/Default @@ -86,7 +86,6 @@ COT -18000 # Columbia Time (not in zic) # - CDT: Cuba Central Daylight Time (America) # - CDT: Canada Central Daylight Time (America) CDT -18000 D # Central Daylight Time - # (America/Cancun) # (America/Chicago) # (America/Menominee) # (America/Merida) @@ -96,10 +95,10 @@ CDT -18000 D # Central Daylight Time # (America/Rainy_River) # (America/Rankin_Inlet) # (America/Winnipeg) -CLST -10800 D # Chile Summer Time +CLST -10800 D # Chile Summer Time (obsolete) # (America/Santiago) # (Antarctica/Palmer) -CLT -14400 # Chile Time +CLT America/Santiago # Chile Time # (America/Santiago) # (Antarctica/Palmer) # CONFLICT! CST is not unique @@ -108,7 +107,6 @@ CLT -14400 # Chile Time # - CST: China Standard Time (Asia) # - CST: Cuba Central Standard Time (America) CST -21600 # Central Standard Time (America) - # (America/Cancun) # (America/Chicago) # (America/Menominee) # (America/Merida) @@ -145,6 +143,7 @@ EGT -3600 # East Greenland Time (Svalbard & Jan Mayen) # Other timezones: # - EST: Eastern Standard Time (Australia) EST -18000 # Eastern Standard Time (America) + # (America/Cancun) # (America/Cayman) # (America/Coral_Harbour) # (America/Detroit) |