Merge pull request #776 from cshore/pull-request-statistics-nut

[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 ff13b1c..c9a507e 100644 (file)
--- a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
+++ b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
@@ -89,7 +89,7 @@ TZ = {
        { 'America/Cancun', 'EST5' },
        { 'America/Caracas', 'VET4:30' },
        { 'America/Cayenne', 'GFT3' },
-       { 'America/Cayman', 'EST5EDT,M3.2.0,M11.1.0' },
+       { 'America/Cayman', 'EST5' },
        { 'America/Chicago', 'CST6CDT,M3.2.0,M11.1.0' },
        { 'America/Chihuahua', 'MST7MDT,M4.1.0,M10.5.0' },
        { 'America/Costa Rica', 'CST6' },
@@ -147,7 +147,7 @@ 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' },
@@ -168,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' },
@@ -177,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' },
@@ -208,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' },
@@ -223,12 +222,13 @@ 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/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' },
@@ -236,8 +236,8 @@ TZ = {
        { 'Asia/Dili', 'TLT-9' },
        { 'Asia/Dubai', 'GST-4' },
        { 'Asia/Dushanbe', 'TJT-5' },
-       { '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/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-7HOVST,M3.5.6,M9.5.6/0' },
@@ -272,7 +272,7 @@ TZ = {
        { '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' },
@@ -281,6 +281,7 @@ 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-8ULAST,M3.5.6,M9.5.6/0' },
@@ -315,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' },
@@ -359,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' },
@@ -385,7 +388,7 @@ 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' },