X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=modules%2Fluci-base%2Fluasrc%2Fsys%2Fzoneinfo%2Ftzdata.lua;h=47cb901a5b46f7b0149233c5876e932a89184e06;hb=c7369830b62b69b9537ec68f6bfe193e11963164;hp=2d32b39b153c333f272b4b122efbdb7c846a5e95;hpb=1b42d7a02df97c77ff9653de5e53b115610b3121;p=project%2Fluci.git

diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
index 2d32b39b1..47cb901a5 100644
--- a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
+++ b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
@@ -30,7 +30,7 @@ TZ = {
 	{ 'Africa/Johannesburg', 'SAST-2' },
 	{ 'Africa/Juba', 'EAT-3' },
 	{ 'Africa/Kampala', 'EAT-3' },
-	{ 'Africa/Khartoum', 'EAT-3' },
+	{ 'Africa/Khartoum', 'CAT-2' },
 	{ 'Africa/Kigali', 'CAT-2' },
 	{ 'Africa/Kinshasa', 'WAT-1' },
 	{ 'Africa/Lagos', 'WAT-1' },
@@ -51,10 +51,10 @@ TZ = {
 	{ 'Africa/Nouakchott', 'GMT0' },
 	{ 'Africa/Ouagadougou', 'GMT0' },
 	{ 'Africa/Porto-Novo', 'WAT-1' },
-	{ 'Africa/Sao Tome', 'GMT0' },
+	{ 'Africa/Sao Tome', 'WAT-1' },
 	{ 'Africa/Tripoli', 'EET-2' },
 	{ 'Africa/Tunis', 'CET-1' },
-	{ 'Africa/Windhoek', 'WAT-1WAST,M9.1.0,M4.1.0' },
+	{ 'Africa/Windhoek', 'CAT-2' },
 	{ 'America/Adak', 'HST10HDT,M3.2.0,M11.1.0' },
 	{ 'America/Anchorage', 'AKST9AKDT,M3.2.0,M11.1.0' },
 	{ 'America/Anguilla', 'AST4' },
@@ -85,7 +85,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 +94,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' },
@@ -110,7 +110,7 @@ TZ = {
 	{ 'America/Glace Bay', 'AST4ADT,M3.2.0,M11.1.0' },
 	{ 'America/Godthab', '<-03>3<-02>,M3.5.0/-2,M10.5.0/-1' },
 	{ 'America/Goose Bay', 'AST4ADT,M3.2.0,M11.1.0' },
-	{ 'America/Grand Turk', 'AST4' },
+	{ 'America/Grand Turk', 'EST5EDT,M3.2.0,M11.1.0' },
 	{ 'America/Grenada', 'AST4' },
 	{ 'America/Guadeloupe', 'AST4' },
 	{ 'America/Guatemala', 'CST6' },
@@ -181,7 +181,7 @@ TZ = {
 	{ 'America/Santarem', '<-03>3' },
 	{ 'America/Santiago', '<-04>4<-03>,M8.2.6/24,M5.2.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 +202,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' },
@@ -238,9 +238,9 @@ TZ = {
 	{ 'Asia/Dili', '<+09>-9' },
 	{ 'Asia/Dubai', '<+04>-4' },
 	{ 'Asia/Dushanbe', '<+05>-5' },
-	{ 'Asia/Famagusta', '<+03>-3' },
-	{ '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/Famagusta', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
+	{ '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' },
@@ -318,6 +318,33 @@ TZ = {
 	{ 'Australia/Melbourne', 'AEST-10AEDT,M10.1.0,M4.1.0/3' },
 	{ 'Australia/Perth', 'AWST-8' },
 	{ 'Australia/Sydney', 'AEST-10AEDT,M10.1.0,M4.1.0/3' },
+	{ 'Etc/GMT', 'GMT0' },
+	{ 'Etc/GMT+1', '<-01>1' },
+	{ 'Etc/GMT+10', '<-10>10' },
+	{ 'Etc/GMT+11', '<-11>11' },
+	{ 'Etc/GMT+12', '<-12>12' },
+	{ 'Etc/GMT+2', '<-02>2' },
+	{ 'Etc/GMT+3', '<-03>3' },
+	{ 'Etc/GMT+4', '<-04>4' },
+	{ 'Etc/GMT+5', '<-05>5' },
+	{ 'Etc/GMT+6', '<-06>6' },
+	{ 'Etc/GMT+7', '<-07>7' },
+	{ 'Etc/GMT+8', '<-08>8' },
+	{ 'Etc/GMT+9', '<-09>9' },
+	{ 'Etc/GMT-1', '<+01>-1' },
+	{ 'Etc/GMT-10', '<+10>-10' },
+	{ 'Etc/GMT-11', '<+11>-11' },
+	{ 'Etc/GMT-12', '<+12>-12' },
+	{ 'Etc/GMT-13', '<+13>-13' },
+	{ 'Etc/GMT-14', '<+14>-14' },
+	{ 'Etc/GMT-2', '<+02>-2' },
+	{ 'Etc/GMT-3', '<+03>-3' },
+	{ 'Etc/GMT-4', '<+04>-4' },
+	{ 'Etc/GMT-5', '<+05>-5' },
+	{ 'Etc/GMT-6', '<+06>-6' },
+	{ 'Etc/GMT-7', '<+07>-7' },
+	{ 'Etc/GMT-8', '<+08>-8' },
+	{ 'Etc/GMT-9', '<+09>-9' },
 	{ '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' },
@@ -398,7 +425,7 @@ TZ = {
 	{ 'Pacific/Efate', '<+11>-11' },
 	{ 'Pacific/Enderbury', '<+13>-13' },
 	{ 'Pacific/Fakaofo', '<+13>-13' },
-	{ 'Pacific/Fiji', '<+12>-12<+13>,M11.1.0,M1.3.0/3' },
+	{ 'Pacific/Fiji', '<+12>-12<+13>,M11.1.0,M1.2.1/147' },
 	{ 'Pacific/Funafuti', '<+12>-12' },
 	{ 'Pacific/Galapagos', '<-06>6' },
 	{ 'Pacific/Gambier', '<-09>9' },
@@ -424,7 +451,7 @@ TZ = {
 	{ 'Pacific/Saipan', 'ChST-10' },
 	{ 'Pacific/Tahiti', '<-10>10' },
 	{ 'Pacific/Tarawa', '<+12>-12' },
-	{ 'Pacific/Tongatapu', '<+13>-13<+14>,M11.1.0,M1.3.0/3' },
+	{ 'Pacific/Tongatapu', '<+13>-13' },
 	{ 'Pacific/Wake', '<+12>-12' },
 	{ 'Pacific/Wallis', '<+12>-12' },
 }