X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fluci-base%2Fluasrc%2Fsys%2Fzoneinfo%2Ftzdata.lua;h=c9a507eaa2111946fa8b41fa7e2d351609db4d99;hp=97a3608ea7e56640b8ca4fc43bf469052a231603;hb=859e4353783c3c9b6b23eaa51604d360a73c1236;hpb=dd2b05289b40002b2e4c098abfc88052e423215f

diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
index 97a3608ea..c9a507eaa 100644
--- 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' },
@@ -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' },
@@ -146,12 +147,12 @@ TZ = {
 	{ 'America/Mazatlan', 'MST7MDT,M4.1.0,M10.5.0' },
 	{ 'America/Menominee', 'CST6CDT,M3.2.0,M11.1.0' },
 	{ 'America/Merida', 'CST6CDT,M4.1.0,M10.5.0' },
-	{ 'America/Metlakatla', 'PST8' },
+	{ 'America/Metlakatla', 'AKST9AKDT,M3.2.0,M11.1.0' },
 	{ 'America/Mexico City', 'CST6CDT,M4.1.0,M10.5.0' },
 	{ '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' },
@@ -167,7 +168,7 @@ TZ = {
 	{ 'America/Paramaribo', 'SRT3' },
 	{ 'America/Phoenix', 'MST7' },
 	{ 'America/Port of Spain', 'AST4' },
-	{ 'America/Port-au-Prince', 'EST5EDT,M3.2.0,M11.1.0' },
+	{ 'America/Port-au-Prince', 'EST5' },
 	{ 'America/Porto Velho', 'AMT4' },
 	{ 'America/Puerto Rico', 'AST4' },
 	{ 'America/Rainy River', 'CST6CDT,M3.2.0,M11.1.0' },
@@ -176,9 +177,8 @@ TZ = {
 	{ 'America/Regina', 'CST6' },
 	{ 'America/Resolute', 'CST6CDT,M3.2.0,M11.1.0' },
 	{ 'America/Rio Branco', 'ACT5' },
-	{ 'America/Santa Isabel', 'PST8PDT,M4.1.0,M10.5.0' },
 	{ 'America/Santarem', 'BRT3' },
-	{ 'America/Santiago', 'CLT3' },
+	{ 'America/Santiago', 'CLT4CLST,M8.2.6/24,M5.2.6/24' },
 	{ 'America/Santo Domingo', 'AST4' },
 	{ 'America/Sao Paulo', 'BRT3BRST,M10.3.0/0,M2.3.0/0' },
 	{ 'America/Scoresbysund', 'EGT1EGST,M3.5.0/0,M10.5.0/1' },
@@ -207,7 +207,7 @@ TZ = {
 	{ 'Antarctica/Macquarie', 'MIST-11' },
 	{ 'Antarctica/Mawson', 'MAWT-5' },
 	{ 'Antarctica/McMurdo', 'NZST-12NZDT,M9.5.0,M4.1.0/3' },
-	{ 'Antarctica/Palmer', 'CLT3' },
+	{ 'Antarctica/Palmer', 'CLT4CLST,M8.2.6/24,M5.2.6/24' },
 	{ 'Antarctica/Rothera', 'ROTT3' },
 	{ 'Antarctica/Syowa', 'SYOT-3' },
 	{ 'Antarctica/Troll', 'UTC0CEST-2,M3.5.0/1,M10.5.0/3' },
@@ -222,24 +222,25 @@ TZ = {
 	{ 'Asia/Ashgabat', 'TMT-5' },
 	{ 'Asia/Baghdad', 'AST-3' },
 	{ 'Asia/Bahrain', 'AST-3' },
-	{ 'Asia/Baku', 'AZT-4AZST,M3.5.0/4,M10.5.0/5' },
+	{ 'Asia/Baku', 'AZT-4' },
 	{ 'Asia/Bangkok', 'ICT-7' },
+	{ 'Asia/Barnaul', '<+07>-7' },
 	{ 'Asia/Beirut', 'EET-2EEST,M3.5.0/0,M10.5.0/0' },
 	{ 'Asia/Bishkek', 'KGT-6' },
 	{ 'Asia/Brunei', 'BNT-8' },
-	{ 'Asia/Chita', 'IRKT-8' },
-	{ 'Asia/Choibalsan', 'CHOT-8' },
+	{ 'Asia/Chita', 'YAKT-9' },
+	{ '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.6/1,M10.3.6/144' },
+	{ 'Asia/Hebron', 'EET-2EEST,M3.5.6/1,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,12 +267,12 @@ 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' },
 	{ 'Asia/Riyadh', 'AST-3' },
-	{ 'Asia/Sakhalin', 'SAKT-10' },
+	{ 'Asia/Sakhalin', 'SAKT-11' },
 	{ 'Asia/Samarkand', 'UZT-5' },
 	{ 'Asia/Seoul', 'KST-9' },
 	{ 'Asia/Shanghai', 'CST-8' },
@@ -280,9 +281,10 @@ TZ = {
 	{ 'Asia/Taipei', 'CST-8' },
 	{ 'Asia/Tashkent', 'UZT-5' },
 	{ 'Asia/Tbilisi', 'GET-4' },
+	{ 'Asia/Tehran', 'IRST-3:30IRDT,J80/0,J264/0' },
 	{ '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' },
@@ -314,6 +316,7 @@ TZ = {
 	{ 'Australia/Sydney', 'AEST-10AEDT,M10.1.0,M4.1.0/3' },
 	{ 'Europe/Amsterdam', 'CET-1CEST,M3.5.0,M10.5.0/3' },
 	{ 'Europe/Andorra', 'CET-1CEST,M3.5.0,M10.5.0/3' },
+	{ 'Europe/Astrakhan', '<+04>-4' },
 	{ 'Europe/Athens', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
 	{ 'Europe/Belgrade', 'CET-1CEST,M3.5.0,M10.5.0/3' },
 	{ 'Europe/Berlin', 'CET-1CEST,M3.5.0,M10.5.0/3' },
@@ -322,7 +325,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' },
@@ -358,6 +361,7 @@ TZ = {
 	{ 'Europe/Stockholm', 'CET-1CEST,M3.5.0,M10.5.0/3' },
 	{ 'Europe/Tallinn', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
 	{ 'Europe/Tirane', 'CET-1CEST,M3.5.0,M10.5.0/3' },
+	{ 'Europe/Ulyanovsk', '<+04>-4' },
 	{ 'Europe/Uzhgorod', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
 	{ 'Europe/Vaduz', 'CET-1CEST,M3.5.0,M10.5.0/3' },
 	{ 'Europe/Vatican', 'CET-1CEST,M3.5.0,M10.5.0/3' },
@@ -384,11 +388,11 @@ TZ = {
 	{ 'Pacific/Bougainville', 'BST-11' },
 	{ 'Pacific/Chatham', 'CHAST-12:45CHADT,M9.5.0/2:45,M4.1.0/3:45' },
 	{ 'Pacific/Chuuk', 'CHUT-10' },
-	{ 'Pacific/Easter', 'EAST5' },
+	{ 'Pacific/Easter', 'EAST6EASST,M8.2.6/22,M5.2.6/22' },
 	{ '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 +408,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' },