Rebased from upstream / out of band repository.

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

diff --git a/package/luci/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua b/package/luci/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
index 48ae5747c0292b2d8d364894a6b8a9983ac109e3..39fd4a3c890f48f169e4fa17cd8f6dc01f881bb4 100644 (file)
--- a/package/luci/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
+++ b/package/luci/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
@@ -16,14 +16,12 @@ TZ = {
        { 'Africa/Brazzaville', 'WAT-1' },
        { 'Africa/Bujumbura', 'CAT-2' },
        { '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' },
        { 'Africa/Dakar', 'GMT0' },
        { 'Africa/Dar es Salaam', 'EAT-3' },
        { 'Africa/Djibouti', 'EAT-3' },
        { 'Africa/Douala', 'WAT-1' },
-       { 'Africa/El Aaiun', 'WET0WEST,M3.5.0,M10.5.0/3' },
        { 'Africa/Freetown', 'GMT0' },
        { 'Africa/Gaborone', 'CAT-2' },
        { 'Africa/Harare', 'CAT-2' },
@@ -85,7 +83,7 @@ TZ = {
        { 'America/Bogota', '<-05>5' },
        { 'America/Boise', 'MST7MDT,M3.2.0,M11.1.0' },
        { 'America/Cambridge Bay', 'MST7MDT,M3.2.0,M11.1.0' },
-       { 'America/Campo Grande', '<-04>4<-03>,M10.3.0/0,M2.3.0/0' },
+       { 'America/Campo Grande', '<-04>4<-03>,M11.1.0/0,M2.3.0/0' },
        { 'America/Cancun', 'EST5' },
        { 'America/Caracas', '<-04>4' },
        { 'America/Cayenne', '<-03>3' },
@@ -94,7 +92,7 @@ TZ = {
        { 'America/Chihuahua', 'MST7MDT,M4.1.0,M10.5.0' },
        { 'America/Costa Rica', 'CST6' },
        { 'America/Creston', 'MST7' },
-       { 'America/Cuiaba', '<-04>4<-03>,M10.3.0/0,M2.3.0/0' },
+       { 'America/Cuiaba', '<-04>4<-03>,M11.1.0/0,M2.3.0/0' },
        { 'America/Curacao', 'AST4' },
        { 'America/Danmarkshavn', 'GMT0' },
        { 'America/Dawson', 'PST8PDT,M3.2.0,M11.1.0' },
@@ -179,9 +177,9 @@ TZ = {
        { 'America/Resolute', 'CST6CDT,M3.2.0,M11.1.0' },
        { 'America/Rio Branco', '<-05>5' },
        { 'America/Santarem', '<-03>3' },
-       { 'America/Santiago', '<-04>4<-03>,M8.2.6/24,M5.2.6/24' },
+       { 'America/Santiago', '<-04>4<-03>,M9.1.6/24,M4.1.6/24' },
        { 'America/Santo Domingo', 'AST4' },
-       { 'America/Sao Paulo', '<-03>3<-02>,M10.3.0/0,M2.3.0/0' },
+       { 'America/Sao Paulo', '<-03>3<-02>,M11.1.0/0,M2.3.0/0' },
        { 'America/Scoresbysund', '<-01>1<+00>,M3.5.0/0,M10.5.0/1' },
        { 'America/Sitka', 'AKST9AKDT,M3.2.0,M11.1.0' },
        { 'America/St Barthelemy', 'AST4' },
@@ -202,7 +200,7 @@ TZ = {
        { 'America/Winnipeg', 'CST6CDT,M3.2.0,M11.1.0' },
        { 'America/Yakutat', 'AKST9AKDT,M3.2.0,M11.1.0' },
        { 'America/Yellowknife', 'MST7MDT,M3.2.0,M11.1.0' },
-       { 'Antarctica/Casey', '<+11>-11' },
+       { 'Antarctica/Casey', '<+08>-8' },
        { 'Antarctica/Davis', '<+07>-7' },
        { 'Antarctica/DumontDUrville', '<+10>-10' },
        { 'Antarctica/Macquarie', '<+11>-11' },
@@ -239,8 +237,8 @@ TZ = {
        { 'Asia/Dubai', '<+04>-4' },
        { 'Asia/Dushanbe', '<+05>-5' },
        { 'Asia/Famagusta', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
-       { 'Asia/Gaza', 'EET-2EEST,M3.5.6/1,M10.5.6/1' },
-       { 'Asia/Hebron', 'EET-2EEST,M3.5.6/1,M10.5.6/1' },
+       { 'Asia/Gaza', 'EET-2EEST,M3.4.6/1,M10.5.6/1' },
+       { 'Asia/Hebron', 'EET-2EEST,M3.4.6/1,M10.5.6/1' },
        { 'Asia/Ho Chi Minh', '<+07>-7' },
        { 'Asia/Hong Kong', 'HKT-8' },
        { 'Asia/Hovd', '<+07>-7' },
@@ -261,7 +259,7 @@ TZ = {
        { 'Asia/Macau', 'CST-8' },
        { 'Asia/Magadan', '<+11>-11' },
        { 'Asia/Makassar', 'WITA-8' },
-       { 'Asia/Manila', '<+08>-8' },
+       { 'Asia/Manila', 'PST-8' },
        { 'Asia/Muscat', '<+04>-4' },
        { 'Asia/Nicosia', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
        { 'Asia/Novokuznetsk', '<+07>-7' },
@@ -270,9 +268,10 @@ TZ = {
        { 'Asia/Oral', '<+05>-5' },
        { 'Asia/Phnom Penh', '<+07>-7' },
        { 'Asia/Pontianak', 'WIB-7' },
-       { 'Asia/Pyongyang', 'KST-8:30' },
+       { 'Asia/Pyongyang', 'KST-9' },
        { 'Asia/Qatar', '<+03>-3' },
-       { 'Asia/Qyzylorda', '<+06>-6' },
+       { 'Asia/Qostanay', '<+06>-6' },
+       { 'Asia/Qyzylorda', '<+05>-5' },
        { 'Asia/Riyadh', '<+03>-3' },
        { 'Asia/Sakhalin', '<+11>-11' },
        { 'Asia/Samarkand', '<+05>-5' },
@@ -283,7 +282,7 @@ TZ = {
        { 'Asia/Taipei', 'CST-8' },
        { 'Asia/Tashkent', '<+05>-5' },
        { 'Asia/Tbilisi', '<+04>-4' },
-       { 'Asia/Tehran', '<+0330>-3:30<+0430>,J80/0,J264/0' },
+       { 'Asia/Tehran', '<+0330>-3:30<+0430>,J79/24,J263/24' },
        { 'Asia/Thimphu', '<+06>-6' },
        { 'Asia/Tokyo', 'JST-9' },
        { 'Asia/Tomsk', '<+07>-7' },
@@ -358,7 +357,7 @@ TZ = {
        { 'Europe/Busingen', 'CET-1CEST,M3.5.0,M10.5.0/3' },
        { '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/Dublin', 'IST-1GMT0,M10.5.0,M3.5.0/1' },
        { 'Europe/Gibraltar', 'CET-1CEST,M3.5.0,M10.5.0/3' },
        { 'Europe/Guernsey', 'GMT0BST,M3.5.0/1,M10.5.0' },
        { 'Europe/Helsinki', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
@@ -400,7 +399,7 @@ TZ = {
        { 'Europe/Vatican', 'CET-1CEST,M3.5.0,M10.5.0/3' },
        { 'Europe/Vienna', 'CET-1CEST,M3.5.0,M10.5.0/3' },
        { 'Europe/Vilnius', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
-       { 'Europe/Volgograd', '<+03>-3' },
+       { 'Europe/Volgograd', '<+04>-4' },
        { 'Europe/Warsaw', 'CET-1CEST,M3.5.0,M10.5.0/3' },
        { 'Europe/Zagreb', 'CET-1CEST,M3.5.0,M10.5.0/3' },
        { 'Europe/Zaporozhye', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
@@ -421,11 +420,11 @@ TZ = {
        { 'Pacific/Bougainville', '<+11>-11' },
        { 'Pacific/Chatham', '<+1245>-12:45<+1345>,M9.5.0/2:45,M4.1.0/3:45' },
        { 'Pacific/Chuuk', '<+10>-10' },
-       { 'Pacific/Easter', '<-06>6<-05>,M8.2.6/22,M5.2.6/22' },
+       { 'Pacific/Easter', '<-06>6<-05>,M9.1.6/22,M4.1.6/22' },
        { 'Pacific/Efate', '<+11>-11' },
        { 'Pacific/Enderbury', '<+13>-13' },
        { 'Pacific/Fakaofo', '<+13>-13' },
-       { 'Pacific/Fiji', '<+12>-12<+13>,M11.1.0,M1.2.1/147' },
+       { 'Pacific/Fiji', '<+12>-12<+13>,M11.1.0,M1.2.2/123' },
        { 'Pacific/Funafuti', '<+12>-12' },
        { 'Pacific/Galapagos', '<-06>6' },
        { 'Pacific/Gambier', '<-09>9' },