From: Jo-Philipp Wich Date: Fri, 14 Nov 2014 16:17:14 +0000 (+0100) Subject: Merge pull request #248 from chris5560/master X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=559bf9126c38992838e240c784ce0d9f4e6714a9;hp=ee9fdba61744111d8f5d7f7d616992ac7135ac09 Merge pull request #248 from chris5560/master luci-app-ddns: Update to support ddns-scripts 2.1.0-1 --- diff --git a/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm b/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm index 8fb648377..312fd0865 100644 --- a/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm +++ b/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm @@ -232,7 +232,7 @@ You may obtain a copy of the License at toggle.title = '<%:Activate this network%>'; } - toggle.setAttribute('active', is_assoc); + toggle.setAttribute('active', !iw.disabled); } var info = document.getElementById(iw.id + '-iw-status'); diff --git a/modules/base/luasrc/sys/zoneinfo/tzdata.lua b/modules/base/luasrc/sys/zoneinfo/tzdata.lua index 1a99f6a7e..8c7cc2add 100644 --- a/modules/base/luasrc/sys/zoneinfo/tzdata.lua +++ b/modules/base/luasrc/sys/zoneinfo/tzdata.lua @@ -24,14 +24,15 @@ TZ = { { 'Africa/Blantyre', 'CAT-2' }, { 'Africa/Brazzaville', 'WAT-1' }, { 'Africa/Bujumbura', 'CAT-2' }, - { 'Africa/Casablanca', 'WET0' }, + { 'Africa/Cairo', 'EET-2EEST,M4.5.5/0,M9.5.4/24' }, + { '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', 'WET0' }, + { 'Africa/El Aaiun', 'WET0WEST,M3.5.0,M10.5.0/3' }, { 'Africa/Freetown', 'GMT0' }, { 'Africa/Gaborone', 'CAT-2' }, { 'Africa/Harare', 'CAT-2' }, @@ -77,12 +78,13 @@ TZ = { { 'America/Argentina/Rio Gallegos', 'ART3' }, { 'America/Argentina/Salta', 'ART3' }, { 'America/Argentina/San Juan', 'ART3' }, + { 'America/Argentina/San Luis', 'ART3' }, { 'America/Argentina/Tucuman', 'ART3' }, { 'America/Argentina/Ushuaia', 'ART3' }, { 'America/Aruba', 'AST4' }, - { 'America/Asuncion', 'PYT4PYST,M10.1.0/0,M4.2.0/0' }, + { 'America/Asuncion', 'PYT4PYST,M10.1.0/0,M3.4.0/0' }, { 'America/Atikokan', 'EST5' }, - { 'America/Bahia', 'BRT3BRST,M10.3.0/0,M2.3.0/0' }, + { 'America/Bahia', 'BRT3' }, { 'America/Bahia Banderas', 'CST6CDT,M4.1.0,M10.5.0' }, { 'America/Barbados', 'AST4' }, { 'America/Belem', 'BRT3' }, @@ -100,6 +102,7 @@ TZ = { { 'America/Chicago', 'CST6CDT,M3.2.0,M11.1.0' }, { 'America/Chihuahua', 'MST7MDT,M4.1.0,M10.5.0' }, { 'America/Costa Rica', 'CST6' }, + { 'America/Creston', 'MST7' }, { 'America/Cuiaba', 'AMT4AMST,M10.3.0/0,M2.3.0/0' }, { 'America/Curacao', 'AST4' }, { 'America/Danmarkshavn', 'GMT0' }, @@ -109,19 +112,20 @@ TZ = { { 'America/Detroit', 'EST5EDT,M3.2.0,M11.1.0' }, { 'America/Dominica', 'AST4' }, { 'America/Edmonton', 'MST7MDT,M3.2.0,M11.1.0' }, - { 'America/Eirunepe', 'AMT4' }, + { 'America/Eirunepe', 'ACT5' }, { 'America/El Salvador', 'CST6' }, { 'America/Fortaleza', 'BRT3' }, { 'America/Glace Bay', 'AST4ADT,M3.2.0,M11.1.0' }, + { 'America/Godthab', 'WGT3WGST,M3.5.0/-2,M10.5.0/-1' }, { 'America/Goose Bay', 'AST4ADT,M3.2.0,M11.1.0' }, - { 'America/Grand Turk', 'EST5EDT,M3.2.0,M11.1.0' }, + { 'America/Grand Turk', 'AST4' }, { 'America/Grenada', 'AST4' }, { 'America/Guadeloupe', 'AST4' }, { 'America/Guatemala', 'CST6' }, { 'America/Guayaquil', 'ECT5' }, { 'America/Guyana', 'GYT4' }, { 'America/Halifax', 'AST4ADT,M3.2.0,M11.1.0' }, - { 'America/Havana', 'CST5CDT,M3.2.0/0,M10.5.0/1' }, + { 'America/Havana', 'CST5CDT,M3.2.0/0,M11.1.0/1' }, { 'America/Hermosillo', 'MST7' }, { 'America/Indiana/Indianapolis', 'EST5EDT,M3.2.0,M11.1.0' }, { 'America/Indiana/Knox', 'CST6CDT,M3.2.0,M11.1.0' }, @@ -151,13 +155,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', 'MeST8' }, + { 'America/Metlakatla', 'PST8' }, { '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/Montreal', 'EST5EDT,M3.2.0,M11.1.0' }, { 'America/Montserrat', 'AST4' }, { 'America/Nassau', 'EST5EDT,M3.2.0,M11.1.0' }, { 'America/New York', 'EST5EDT,M3.2.0,M11.1.0' }, @@ -173,7 +176,7 @@ TZ = { { 'America/Paramaribo', 'SRT3' }, { 'America/Phoenix', 'MST7' }, { 'America/Port of Spain', 'AST4' }, - { 'America/Port-au-Prince', 'EST5' }, + { 'America/Port-au-Prince', 'EST5EDT,M3.2.0,M11.1.0' }, { 'America/Porto Velho', 'AMT4' }, { 'America/Puerto Rico', 'AST4' }, { 'America/Rainy River', 'CST6CDT,M3.2.0,M11.1.0' }, @@ -181,13 +184,13 @@ TZ = { { 'America/Recife', 'BRT3' }, { 'America/Regina', 'CST6' }, { 'America/Resolute', 'CST6CDT,M3.2.0,M11.1.0' }, - { 'America/Rio Branco', 'AMT4' }, + { 'America/Rio Branco', 'ACT5' }, { 'America/Santa Isabel', 'PST8PDT,M4.1.0,M10.5.0' }, { 'America/Santarem', 'BRT3' }, + { 'America/Santiago', 'CLT4CLST,M9.1.6/24,M4.4.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' }, - { 'America/Shiprock', 'MST7MDT,M3.2.0,M11.1.0' }, { 'America/Sitka', 'AKST9AKDT,M3.2.0,M11.1.0' }, { 'America/St Barthelemy', 'AST4' }, { 'America/St Johns', 'NST3:30NDT,M3.2.0,M11.1.0' }, @@ -207,19 +210,21 @@ 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', 'WST-8' }, + { 'Antarctica/Casey', 'AWST-8' }, { 'Antarctica/Davis', 'DAVT-7' }, { 'Antarctica/DumontDUrville', 'DDUT-10' }, { 'Antarctica/Macquarie', 'MIST-11' }, { 'Antarctica/Mawson', 'MAWT-5' }, { 'Antarctica/McMurdo', 'NZST-12NZDT,M9.5.0,M4.1.0/3' }, + { 'Antarctica/Palmer', 'CLT4CLST,M9.1.6/24,M4.4.6/24' }, { 'Antarctica/Rothera', 'ROTT3' }, - { 'Antarctica/South Pole', 'NZST-12NZDT,M9.5.0,M4.1.0/3' }, { 'Antarctica/Syowa', 'SYOT-3' }, + { 'Antarctica/Troll', 'UTC0CEST-2,M3.5.0/1,M10.5.0/3' }, { 'Antarctica/Vostok', 'VOST-6' }, { 'Arctic/Longyearbyen', 'CET-1CEST,M3.5.0,M10.5.0/3' }, { 'Asia/Aden', 'AST-3' }, { 'Asia/Almaty', 'ALMT-6' }, + { 'Asia/Amman', 'EET-2EEST,M3.5.4/24,M10.5.5/1' }, { 'Asia/Anadyr', 'ANAT-12' }, { 'Asia/Aqtau', 'AQTT-5' }, { 'Asia/Aqtobe', 'AQTT-5' }, @@ -231,67 +236,69 @@ TZ = { { '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/Chongqing', 'CST-8' }, { 'Asia/Colombo', 'IST-5:30' }, - { 'Asia/Damascus', 'EET-2EEST,M4.1.5/0,M10.5.5/0' }, + { '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-2' }, - { 'Asia/Harbin', 'CST-8' }, - { 'Asia/Hebron', 'EET-2' }, + { '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/Ho Chi Minh', 'ICT-7' }, { 'Asia/Hong Kong', 'HKT-8' }, { 'Asia/Hovd', 'HOVT-7' }, - { 'Asia/Irkutsk', 'IRKT-9' }, - { 'Asia/Jakarta', 'WIT-7' }, - { 'Asia/Jayapura', 'EIT-9' }, + { 'Asia/Irkutsk', 'IRKT-8' }, + { 'Asia/Jakarta', 'WIB-7' }, + { 'Asia/Jayapura', 'WIT-9' }, + { 'Asia/Jerusalem', 'IST-2IDT,M3.4.4/26,M10.5.0' }, { 'Asia/Kabul', 'AFT-4:30' }, { 'Asia/Kamchatka', 'PETT-12' }, { 'Asia/Karachi', 'PKT-5' }, - { 'Asia/Kashgar', 'CST-8' }, { 'Asia/Kathmandu', 'NPT-5:45' }, + { 'Asia/Khandyga', 'YAKT-9' }, { 'Asia/Kolkata', 'IST-5:30' }, - { 'Asia/Krasnoyarsk', 'KRAT-8' }, + { 'Asia/Krasnoyarsk', 'KRAT-7' }, { 'Asia/Kuala Lumpur', 'MYT-8' }, { 'Asia/Kuching', 'MYT-8' }, { 'Asia/Kuwait', 'AST-3' }, { 'Asia/Macau', 'CST-8' }, - { 'Asia/Magadan', 'MAGT-12' }, - { 'Asia/Makassar', 'CIT-8' }, + { 'Asia/Magadan', 'MAGT-10' }, + { 'Asia/Makassar', 'WITA-8' }, { 'Asia/Manila', 'PHT-8' }, { 'Asia/Muscat', 'GST-4' }, { 'Asia/Nicosia', 'EET-2EEST,M3.5.0/3,M10.5.0/4' }, - { 'Asia/Novokuznetsk', 'NOVT-7' }, - { 'Asia/Novosibirsk', 'NOVT-7' }, - { 'Asia/Omsk', 'OMST-7' }, + { 'Asia/Novokuznetsk', 'KRAT-7' }, + { 'Asia/Novosibirsk', 'NOVT-6' }, + { 'Asia/Omsk', 'OMST-6' }, { 'Asia/Oral', 'ORAT-5' }, { 'Asia/Phnom Penh', 'ICT-7' }, - { 'Asia/Pontianak', 'WIT-7' }, + { 'Asia/Pontianak', 'WIB-7' }, { 'Asia/Pyongyang', 'KST-9' }, { 'Asia/Qatar', 'AST-3' }, { 'Asia/Qyzylorda', 'QYZT-6' }, { 'Asia/Rangoon', 'MMT-6:30' }, { 'Asia/Riyadh', 'AST-3' }, - { 'Asia/Sakhalin', 'SAKT-11' }, + { 'Asia/Sakhalin', 'SAKT-10' }, { 'Asia/Samarkand', 'UZT-5' }, { 'Asia/Seoul', 'KST-9' }, { 'Asia/Shanghai', 'CST-8' }, { 'Asia/Singapore', 'SGT-8' }, + { 'Asia/Srednekolymsk', 'SRET-11' }, { 'Asia/Taipei', 'CST-8' }, { 'Asia/Tashkent', 'UZT-5' }, { 'Asia/Tbilisi', 'GET-4' }, { 'Asia/Thimphu', 'BTT-6' }, { 'Asia/Tokyo', 'JST-9' }, { 'Asia/Ulaanbaatar', 'ULAT-8' }, - { 'Asia/Urumqi', 'CST-8' }, + { 'Asia/Urumqi', 'XJT-6' }, + { 'Asia/Ust-Nera', 'VLAT-10' }, { 'Asia/Vientiane', 'ICT-7' }, - { 'Asia/Vladivostok', 'VLAT-11' }, - { 'Asia/Yakutsk', 'YAKT-10' }, - { 'Asia/Yekaterinburg', 'YEKT-6' }, - { 'Asia/Yerevan', 'AMT-4AMST,M3.5.0,M10.5.0/3' }, + { 'Asia/Vladivostok', 'VLAT-10' }, + { 'Asia/Yakutsk', 'YAKT-9' }, + { 'Asia/Yekaterinburg', 'YEKT-5' }, + { 'Asia/Yerevan', 'AMT-4' }, { 'Atlantic/Azores', 'AZOT1AZOST,M3.5.0/0,M10.5.0/1' }, { 'Atlantic/Bermuda', 'AST4ADT,M3.2.0,M11.1.0' }, { 'Atlantic/Canary', 'WET0WEST,M3.5.0/1,M10.5.0' }, @@ -301,19 +308,19 @@ TZ = { { 'Atlantic/Reykjavik', 'GMT0' }, { 'Atlantic/South Georgia', 'GST2' }, { 'Atlantic/St Helena', 'GMT0' }, - { 'Atlantic/Stanley', 'FKT4FKST,M9.1.0,M4.3.0' }, - { 'Australia/Adelaide', 'CST-9:30CST,M10.1.0,M4.1.0/3' }, - { 'Australia/Brisbane', 'EST-10' }, - { 'Australia/Broken Hill', 'CST-9:30CST,M10.1.0,M4.1.0/3' }, - { 'Australia/Currie', 'EST-10EST,M10.1.0,M4.1.0/3' }, - { 'Australia/Darwin', 'CST-9:30' }, - { 'Australia/Eucla', 'CWST-8:45' }, - { 'Australia/Hobart', 'EST-10EST,M10.1.0,M4.1.0/3' }, - { 'Australia/Lindeman', 'EST-10' }, - { 'Australia/Lord Howe', 'LHST-10:30LHST-11,M10.1.0,M4.1.0' }, - { 'Australia/Melbourne', 'EST-10EST,M10.1.0,M4.1.0/3' }, - { 'Australia/Perth', 'WST-8' }, - { 'Australia/Sydney', 'EST-10EST,M10.1.0,M4.1.0/3' }, + { 'Atlantic/Stanley', 'FKST3' }, + { 'Australia/Adelaide', 'ACST-9:30ACDT,M10.1.0,M4.1.0/3' }, + { 'Australia/Brisbane', 'AEST-10' }, + { 'Australia/Broken Hill', 'ACST-9:30ACDT,M10.1.0,M4.1.0/3' }, + { 'Australia/Currie', 'AEST-10AEDT,M10.1.0,M4.1.0/3' }, + { 'Australia/Darwin', 'ACST-9:30' }, + { 'Australia/Eucla', 'ACWST-8:45' }, + { 'Australia/Hobart', 'AEST-10AEDT,M10.1.0,M4.1.0/3' }, + { 'Australia/Lindeman', 'AEST-10' }, + { 'Australia/Lord Howe', 'LHST-10:30LHDT-11,M10.1.0,M4.1.0' }, + { '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' }, { 'Europe/Amsterdam', 'CET-1CEST,M3.5.0,M10.5.0/3' }, { 'Europe/Andorra', 'CET-1CEST,M3.5.0,M10.5.0/3' }, { 'Europe/Athens', 'EET-2EEST,M3.5.0/3,M10.5.0/4' }, @@ -323,6 +330,7 @@ TZ = { { 'Europe/Brussels', 'CET-1CEST,M3.5.0,M10.5.0/3' }, { '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/Copenhagen', 'CET-1CEST,M3.5.0,M10.5.0/3' }, { 'Europe/Dublin', 'GMT0IST,M3.5.0/1,M10.5.0' }, @@ -332,7 +340,7 @@ TZ = { { 'Europe/Isle of Man', 'GMT0BST,M3.5.0/1,M10.5.0' }, { 'Europe/Istanbul', 'EET-2EEST,M3.5.0/3,M10.5.0/4' }, { 'Europe/Jersey', 'GMT0BST,M3.5.0/1,M10.5.0' }, - { 'Europe/Kaliningrad', 'FET-3' }, + { 'Europe/Kaliningrad', 'EET-2' }, { 'Europe/Kiev', 'EET-2EEST,M3.5.0/3,M10.5.0/4' }, { 'Europe/Lisbon', 'WET0WEST,M3.5.0/1,M10.5.0' }, { 'Europe/Ljubljana', 'CET-1CEST,M3.5.0,M10.5.0/3' }, @@ -341,9 +349,9 @@ TZ = { { 'Europe/Madrid', 'CET-1CEST,M3.5.0,M10.5.0/3' }, { 'Europe/Malta', 'CET-1CEST,M3.5.0,M10.5.0/3' }, { 'Europe/Mariehamn', 'EET-2EEST,M3.5.0/3,M10.5.0/4' }, - { 'Europe/Minsk', 'FET-3' }, + { 'Europe/Minsk', 'MSK-3' }, { 'Europe/Monaco', 'CET-1CEST,M3.5.0,M10.5.0/3' }, - { 'Europe/Moscow', 'MSK-4' }, + { 'Europe/Moscow', 'MSK-3' }, { 'Europe/Oslo', 'CET-1CEST,M3.5.0,M10.5.0/3' }, { 'Europe/Paris', 'CET-1CEST,M3.5.0,M10.5.0/3' }, { 'Europe/Podgorica', 'CET-1CEST,M3.5.0,M10.5.0/3' }, @@ -353,7 +361,7 @@ TZ = { { 'Europe/Samara', 'SAMT-4' }, { 'Europe/San Marino', 'CET-1CEST,M3.5.0,M10.5.0/3' }, { 'Europe/Sarajevo', 'CET-1CEST,M3.5.0,M10.5.0/3' }, - { 'Europe/Simferopol', 'EET-2EEST,M3.5.0/3,M10.5.0/4' }, + { 'Europe/Simferopol', 'MSK-3' }, { 'Europe/Skopje', 'CET-1CEST,M3.5.0,M10.5.0/3' }, { 'Europe/Sofia', 'EET-2EEST,M3.5.0/3,M10.5.0/4' }, { 'Europe/Stockholm', 'CET-1CEST,M3.5.0,M10.5.0/3' }, @@ -364,7 +372,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', 'VOLT-4' }, + { 'Europe/Volgograd', 'MSK-3' }, { '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' }, @@ -380,14 +388,16 @@ TZ = { { 'Indian/Mauritius', 'MUT-4' }, { 'Indian/Mayotte', 'EAT-3' }, { 'Indian/Reunion', 'RET-4' }, - { 'Pacific/Apia', 'WST-13' }, + { 'Pacific/Apia', 'WSST-13WSDT,M9.5.0/3,M4.1.0/4' }, { 'Pacific/Auckland', 'NZST-12NZDT,M9.5.0,M4.1.0/3' }, + { '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', 'EAST6EASST,M9.1.6/22,M4.4.6/22' }, { 'Pacific/Efate', 'VUT-11' }, { 'Pacific/Enderbury', 'PHOT-13' }, - { 'Pacific/Fakaofo', 'TKT10' }, - { 'Pacific/Fiji', 'FJT-12' }, + { 'Pacific/Fakaofo', 'TKT-13' }, + { 'Pacific/Fiji', 'FJT-12FJST,M11.1.0,M1.3.4/75' }, { 'Pacific/Funafuti', 'TVT-12' }, { 'Pacific/Galapagos', 'GALT6' }, { 'Pacific/Gambier', 'GAMT9' }, diff --git a/modules/base/luasrc/sys/zoneinfo/tzoffset.lua b/modules/base/luasrc/sys/zoneinfo/tzoffset.lua index bbe75d5a4..d2f77ed28 100644 --- a/modules/base/luasrc/sys/zoneinfo/tzoffset.lua +++ b/modules/base/luasrc/sys/zoneinfo/tzoffset.lua @@ -17,9 +17,10 @@ OFFSET = { cet = 3600, -- CET wat = 3600, -- WAT cat = 7200, -- CAT + eet = 7200, -- EET + eest = 10800, -- EEST wet = 0, -- WET sast = 7200, -- SAST - eet = 7200, -- EET hast = -36000, -- HAST hadt = -32400, -- HADT akst = -32400, -- AKST @@ -40,6 +41,9 @@ OFFSET = { gft = -10800, -- GFT pst = -28800, -- PST pdt = -25200, -- PDT + act = -18000, -- ACT + wgt = -10800, -- WGT + wgst = -7200, -- WGST ect = -18000, -- ECT gyt = -14400, -- GYT bot = -14400, -- BOT @@ -50,11 +54,13 @@ OFFSET = { uyst = -7200, -- UYST fnt = -7200, -- FNT srt = -10800, -- SRT + clt = -14400, -- CLT + clst = -10800, -- CLST egt = -3600, -- EGT egst = 0, -- EGST nst = -12600, -- NST ndt = -9000, -- NDT - wst = 28800, -- WST + awst = 28800, -- AWST davt = 25200, -- DAVT ddut = 36000, -- DDUT mist = 39600, -- MIST @@ -63,6 +69,7 @@ OFFSET = { nzdt = 46800, -- NZDT rott = -10800, -- ROTT syot = 10800, -- SYOT + utc = 0, -- UTC vost = 21600, -- VOST almt = 21600, -- ALMT anat = 43200, -- ANAT @@ -73,6 +80,7 @@ OFFSET = { ict = 25200, -- ICT kgt = 21600, -- KGT bnt = 28800, -- BNT + irkt = 28800, -- IRKT chot = 28800, -- CHOT ist = 19800, -- IST bdt = 21600, -- BDT @@ -81,46 +89,47 @@ OFFSET = { tjt = 18000, -- TJT hkt = 28800, -- HKT hovt = 25200, -- HOVT - irkt = 32400, -- IRKT - wit = 25200, -- WIT - eit = 32400, -- EIT + wib = 25200, -- WIB + wit = 32400, -- WIT aft = 16200, -- AFT pett = 43200, -- PETT pkt = 18000, -- PKT npt = 20700, -- NPT - krat = 28800, -- KRAT + yakt = 32400, -- YAKT + krat = 25200, -- KRAT myt = 28800, -- MYT - magt = 43200, -- MAGT - cit = 28800, -- CIT + magt = 36000, -- MAGT + wita = 28800, -- WITA pht = 28800, -- PHT - novt = 25200, -- NOVT - omst = 25200, -- OMST + novt = 21600, -- NOVT + omst = 21600, -- OMST orat = 18000, -- ORAT kst = 32400, -- KST qyzt = 21600, -- QYZT mmt = 23400, -- MMT - sakt = 39600, -- SAKT + sakt = 36000, -- SAKT uzt = 18000, -- UZT sgt = 28800, -- SGT + sret = 39600, -- SRET get = 14400, -- GET btt = 21600, -- BTT jst = 32400, -- JST ulat = 28800, -- ULAT - vlat = 39600, -- VLAT - yakt = 36000, -- YAKT - yekt = 21600, -- YEKT + xjt = 21600, -- XJT + vlat = 36000, -- VLAT + yekt = 18000, -- YEKT azot = -3600, -- AZOT azost = 0, -- AZOST cvt = -3600, -- CVT - fkt = -14400, -- FKT fkst = -10800, -- FKST - cwst = 31500, -- CWST + acst = 34200, -- ACST + acdt = 37800, -- ACDT + aest = 36000, -- AEST + acwst = 31500, -- ACWST lhst = 37800, -- LHST - lhst = 39600, -- LHST - fet = 10800, -- FET - msk = 14400, -- MSK + lhdt = 39600, -- LHDT + msk = 10800, -- MSK samt = 14400, -- SAMT - volt = 14400, -- VOLT iot = 21600, -- IOT cxt = 25200, -- CXT cct = 23400, -- CCT @@ -129,13 +138,19 @@ OFFSET = { mvt = 18000, -- MVT mut = 14400, -- MUT ret = 14400, -- RET + wsst = 46800, -- WSST + wsdt = 50400, -- WSDT + bst = 39600, -- BST chast = 45900, -- CHAST chadt = 49500, -- CHADT chut = 36000, -- CHUT + east = -21600, -- EAST + easst = -18000, -- EASST vut = 39600, -- VUT phot = 46800, -- PHOT - tkt = -36000, -- TKT + tkt = 46800, -- TKT fjt = 43200, -- FJT + fjst = 46800, -- FJST tvt = 43200, -- TVT galt = -21600, -- GALT gamt = -32400, -- GAMT diff --git a/modules/base/root/etc/config/ucitrack b/modules/base/root/etc/config/ucitrack index 04467f4fd..cd3cb8515 100644 --- a/modules/base/root/etc/config/ucitrack +++ b/modules/base/root/etc/config/ucitrack @@ -17,6 +17,10 @@ config olsr config dhcp option init dnsmasq + list affects odhcpd + +config odhcpd + option init odhcpd config dropbear option init dropbear