Merge pull request #461 from marcel-sch/patch-1

[project/luci.git] / modules / luci-base / luasrc / sys / zoneinfo / tzdata.lua

diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
index 97a3608..ff13b1c 100644 (file)
--- a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
+++ b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
@@ -15,7 +15,7 @@ TZ = {
        { 'Africa/Blantyre', 'CAT-2' },
        { 'Africa/Brazzaville', 'WAT-1' },
        { 'Africa/Bujumbura', 'CAT-2' },
-       { 'Africa/Cairo', 'EET-2EEST,M4.5.5/0,M9.5.4/24' },
+       { 'Africa/Cairo', 'EET-2' },
        { 'Africa/Casablanca', 'WET0WEST,M3.5.0,M10.5.0/3' },
        { 'Africa/Ceuta', 'CET-1CEST,M3.5.0,M10.5.0/3' },
        { 'Africa/Conakry', 'GMT0' },
@@ -55,7 +55,7 @@ TZ = {
        { 'Africa/Tripoli', 'EET-2' },
        { 'Africa/Tunis', 'CET-1' },
        { 'Africa/Windhoek', 'WAT-1WAST,M9.1.0,M4.1.0' },
-       { 'America/Adak', 'HAST10HADT,M3.2.0,M11.1.0' },
+       { 'America/Adak', 'HST10HDT,M3.2.0,M11.1.0' },
        { 'America/Anchorage', 'AKST9AKDT,M3.2.0,M11.1.0' },
        { 'America/Anguilla', 'AST4' },
        { 'America/Antigua', 'AST4' },
@@ -89,7 +89,7 @@ TZ = {
        { 'America/Cancun', 'EST5' },
        { 'America/Caracas', 'VET4:30' },
        { 'America/Cayenne', 'GFT3' },
-       { 'America/Cayman', 'EST5' },
+       { 'America/Cayman', 'EST5EDT,M3.2.0,M11.1.0' },
        { 'America/Chicago', 'CST6CDT,M3.2.0,M11.1.0' },
        { 'America/Chihuahua', 'MST7MDT,M4.1.0,M10.5.0' },
        { 'America/Costa Rica', 'CST6' },
@@ -105,6 +105,7 @@ TZ = {
        { 'America/Edmonton', 'MST7MDT,M3.2.0,M11.1.0' },
        { 'America/Eirunepe', 'ACT5' },
        { 'America/El Salvador', 'CST6' },
+       { 'America/Fort Nelson', 'MST7' },
        { 'America/Fortaleza', 'BRT3' },
        { 'America/Glace Bay', 'AST4ADT,M3.2.0,M11.1.0' },
        { 'America/Godthab', 'WGT3WGST,M3.5.0/-2,M10.5.0/-1' },
@@ -151,7 +152,7 @@ TZ = {
        { 'America/Miquelon', 'PMST3PMDT,M3.2.0,M11.1.0' },
        { 'America/Moncton', 'AST4ADT,M3.2.0,M11.1.0' },
        { 'America/Monterrey', 'CST6CDT,M4.1.0,M10.5.0' },
-       { 'America/Montevideo', 'UYT3UYST,M10.1.0,M3.2.0' },
+       { 'America/Montevideo', 'UYT3' },
        { 'America/Montserrat', 'AST4' },
        { 'America/Nassau', 'EST5EDT,M3.2.0,M11.1.0' },
        { 'America/New York', 'EST5EDT,M3.2.0,M11.1.0' },
@@ -228,18 +229,18 @@ TZ = {
        { 'Asia/Bishkek', 'KGT-6' },
        { 'Asia/Brunei', 'BNT-8' },
        { 'Asia/Chita', 'IRKT-8' },
-       { 'Asia/Choibalsan', 'CHOT-8' },
+       { 'Asia/Choibalsan', 'CHOT-8CHOST,M3.5.6,M9.5.6/0' },
        { 'Asia/Colombo', 'IST-5:30' },
        { 'Asia/Damascus', 'EET-2EEST,M3.5.5/0,M10.5.5/0' },
        { 'Asia/Dhaka', 'BDT-6' },
        { 'Asia/Dili', 'TLT-9' },
        { 'Asia/Dubai', 'GST-4' },
        { 'Asia/Dushanbe', 'TJT-5' },
-       { 'Asia/Gaza', 'EET-2EEST,M3.5.4/24,M9.3.6/144' },
-       { 'Asia/Hebron', 'EET-2EEST,M3.5.4/24,M9.3.6/144' },
+       { 'Asia/Gaza', 'EET-2EEST,M3.5.5/24,M10.3.6/144' },
+       { 'Asia/Hebron', 'EET-2EEST,M3.5.5/24,M10.3.6/144' },
        { 'Asia/Ho Chi Minh', 'ICT-7' },
        { 'Asia/Hong Kong', 'HKT-8' },
-       { 'Asia/Hovd', 'HOVT-7' },
+       { 'Asia/Hovd', 'HOVT-7HOVST,M3.5.6,M9.5.6/0' },
        { 'Asia/Irkutsk', 'IRKT-8' },
        { 'Asia/Jakarta', 'WIB-7' },
        { 'Asia/Jayapura', 'WIT-9' },
@@ -266,7 +267,7 @@ TZ = {
        { 'Asia/Oral', 'ORAT-5' },
        { 'Asia/Phnom Penh', 'ICT-7' },
        { 'Asia/Pontianak', 'WIB-7' },
-       { 'Asia/Pyongyang', 'KST-9' },
+       { 'Asia/Pyongyang', 'KST-8:30' },
        { 'Asia/Qatar', 'AST-3' },
        { 'Asia/Qyzylorda', 'QYZT-6' },
        { 'Asia/Rangoon', 'MMT-6:30' },
@@ -282,7 +283,7 @@ TZ = {
        { 'Asia/Tbilisi', 'GET-4' },
        { 'Asia/Thimphu', 'BTT-6' },
        { 'Asia/Tokyo', 'JST-9' },
-       { 'Asia/Ulaanbaatar', 'ULAT-8' },
+       { 'Asia/Ulaanbaatar', 'ULAT-8ULAST,M3.5.6,M9.5.6/0' },
        { 'Asia/Urumqi', 'XJT-6' },
        { 'Asia/Ust-Nera', 'VLAT-10' },
        { 'Asia/Vientiane', 'ICT-7' },
@@ -322,7 +323,7 @@ TZ = {
        { 'Europe/Bucharest', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
        { 'Europe/Budapest', 'CET-1CEST,M3.5.0,M10.5.0/3' },
        { 'Europe/Busingen', 'CET-1CEST,M3.5.0,M10.5.0/3' },
-       { 'Europe/Chisinau', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
+       { 'Europe/Chisinau', 'EET-2EEST,M3.5.0,M10.5.0/3' },
        { 'Europe/Copenhagen', 'CET-1CEST,M3.5.0,M10.5.0/3' },
        { 'Europe/Dublin', 'GMT0IST,M3.5.0/1,M10.5.0' },
        { 'Europe/Gibraltar', 'CET-1CEST,M3.5.0,M10.5.0/3' },
@@ -388,7 +389,7 @@ TZ = {
        { 'Pacific/Efate', 'VUT-11' },
        { 'Pacific/Enderbury', 'PHOT-13' },
        { 'Pacific/Fakaofo', 'TKT-13' },
-       { 'Pacific/Fiji', 'FJT-12FJST,M11.1.0,M1.3.4/75' },
+       { 'Pacific/Fiji', 'FJT-12FJST,M11.1.0,M1.3.0/3' },
        { 'Pacific/Funafuti', 'TVT-12' },
        { 'Pacific/Galapagos', 'GALT6' },
        { 'Pacific/Gambier', 'GAMT9' },
@@ -404,7 +405,7 @@ TZ = {
        { 'Pacific/Midway', 'SST11' },
        { 'Pacific/Nauru', 'NRT-12' },
        { 'Pacific/Niue', 'NUT11' },
-       { 'Pacific/Norfolk', 'NFT-11:30' },
+       { 'Pacific/Norfolk', 'NFT-11' },
        { 'Pacific/Noumea', 'NCT-11' },
        { 'Pacific/Pago Pago', 'SST11' },
        { 'Pacific/Palau', 'PWT-9' },