diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/timezone/tznames/America.txt | 2 | ||||
| -rw-r--r-- | src/timezone/tznames/Asia.txt | 9 | ||||
| -rw-r--r-- | src/timezone/tznames/Australia.txt | 1 | ||||
| -rw-r--r-- | src/timezone/tznames/Default | 1 |
4 files changed, 13 insertions, 0 deletions
diff --git a/src/timezone/tznames/America.txt b/src/timezone/tznames/America.txt index 9e6273207c1..1bb636741b4 100644 --- a/src/timezone/tznames/America.txt +++ b/src/timezone/tznames/America.txt @@ -137,11 +137,13 @@ COT -18000 # Columbia Time (not in zic) # Other timezones: # - CST: Central Standard Time (Australia) # - CST: Central Standard Time (America) +# - CST: China Standard Time (Asia) CST -18000 # Cuba Central Standard Time (America) # (America/Havana) # CONFLICT! CST is not unique # Other timezones: # - CST: Central Standard Time (Australia) +# - CST: China Standard Time (Asia) # - CST: Cuba Central Standard Time (America) CST -21600 # Central Standard Time (America) # (America/Cancun) diff --git a/src/timezone/tznames/Asia.txt b/src/timezone/tznames/Asia.txt index bb286464297..dcca78af7b0 100644 --- a/src/timezone/tznames/Asia.txt +++ b/src/timezone/tznames/Asia.txt @@ -59,6 +59,15 @@ CHOST 36000 D # Choibalsan Summer Time (obsolete) CHOT Asia/Choibalsan # Choibalsan Time # (Asia/Choibalsan) CIT 28800 # Central Indonesia Time (obsolete, WITA is now preferred) +# CONFLICT! CST is not unique +# Other timezones: +# - CST: Central Standard Time (Australia) +# - CST: Central Standard Time (America) +# - CST: Cuba Central Standard Time (America) +CST 28800 # China Standard Time + # (Asia/Macau) + # (Asia/Shanghai) + # (Asia/Taipei) EEST 10800 D # East-Egypt Summer Time # Eastern Europe Summer Time # (Africa/Cairo) diff --git a/src/timezone/tznames/Australia.txt b/src/timezone/tznames/Australia.txt index 92c296840f9..8f1c1379c1d 100644 --- a/src/timezone/tznames/Australia.txt +++ b/src/timezone/tznames/Australia.txt @@ -41,6 +41,7 @@ CAST 34200 # Central Australia Standard Time (not in zic) # CONFLICT! CST is not unique # Other timezones: # - CST: Central Standard Time (America) +# - CST: China Standard Time (Asia) # - CST: Cuba Central Standard Time (America) CST 34200 # Central Standard Time (not in zic) CWST 31500 # Central Western Standard Time (not in zic) diff --git a/src/timezone/tznames/Default b/src/timezone/tznames/Default index fca7ff8daa1..7a58e5900e5 100644 --- a/src/timezone/tznames/Default +++ b/src/timezone/tznames/Default @@ -105,6 +105,7 @@ CLT -14400 # Chile Time # CONFLICT! CST is not unique # Other timezones: # - CST: Central Standard Time (Australia) +# - CST: China Standard Time (Asia) # - CST: Cuba Central Standard Time (America) CST -21600 # Central Standard Time (America) # (America/Cancun) |