From: Hannu Nyman Date: Wed, 23 May 2018 05:30:15 +0000 (+0300) Subject: Merge pull request #1708 from guidosarducci/lede-17.01-add-luci-isolate-mac80211 X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=refs%2Fheads%2Flede-17.01;hp=d01ad2bdf6557710bf48150e3fa4d12ebfcd97ab Merge pull request #1708 from guidosarducci/lede-17.01-add-luci-isolate-mac80211 luci-mod-admin-full: backport add missing "isolate" option for mac80211 --- diff --git a/applications/luci-app-ddns/Makefile b/applications/luci-app-ddns/Makefile index 69f9880d4..dbfeeba66 100644 --- a/applications/luci-app-ddns/Makefile +++ b/applications/luci-app-ddns/Makefile @@ -16,7 +16,7 @@ PKG_VERSION:=2.4.8 # Release == build # increase on changes of translation files -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_LICENSE:=Apache-2.0 PKG_MAINTAINER:=Christian Schoenebeck diff --git a/applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua b/applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua index a8f4cbf7a..977dbe34b 100644 --- a/applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua +++ b/applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua @@ -1229,7 +1229,7 @@ if DDNS.has_proxy or ( ( m:get(section, "proxy") or "" ) ~= "" ) then elseif DDNS.has_proxy then local ipv6 = usev6:formvalue(section) or "0" local force = fipv:formvalue(section) or "0" - local command = CRTL.luci_helper .. [[ -]] + local command = CTRL.luci_helper .. [[ -]] if (ipv6 == 1) then command = command .. [[6]] end if (force == 1) then command = command .. [[f]] end command = command .. [[p ]] .. value .. [[ -- verify_proxy]] diff --git a/applications/luci-app-fwknopd/Makefile b/applications/luci-app-fwknopd/Makefile index 3fbd88ad6..6df5a4740 100644 --- a/applications/luci-app-fwknopd/Makefile +++ b/applications/luci-app-fwknopd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Fwknopd config - web config for the firewall knock daemon LUCI_DEPENDS:=+fwknopd +qrencode PKG_VERSION:=1.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=GPLv2 PKG_MAINTAINER:=Jonathan Bennett include ../../luci.mk diff --git a/applications/luci-app-fwknopd/root/etc/uci-defaults/40_luci-fwknopd b/applications/luci-app-fwknopd/root/etc/uci-defaults/40_luci-fwknopd index 65ef01245..9e5057e70 100644 --- a/applications/luci-app-fwknopd/root/etc/uci-defaults/40_luci-fwknopd +++ b/applications/luci-app-fwknopd/root/etc/uci-defaults/40_luci-fwknopd @@ -3,6 +3,7 @@ #-- Licensed to the public under the GNU General Public License v2. . /lib/functions/network.sh +[ "$(uci -q get fwknopd.@access[0].KEY)" != "CHANGEME" ] && exit 0 uci batch < +-- Licensed to the public under the Apache License 2.0. + +m = Map("luci_statistics", + translate("APCUPS Plugin Configuration"), + translate( + "The APCUPS plugin collects statistics about the APC UPS." + )) + +-- collectd_apcups config section +s = m:section( NamedSection, "collectd_apcups", "luci_statistics" ) + +-- collectd_apcups.enable +enable = s:option( Flag, "enable", translate("Enable this plugin") ) +enable.default = 0 + +-- collectd_apcups.host (Host) +host = s:option( Value, "Host", translate("Monitor host"), translate ("Add multiple hosts separated by space.")) +host.default = "localhost" +host:depends( "enable", 1 ) + +-- collectd_apcups.port (Port) +port = s:option( Value, "Port", translate("Port for apcupsd communication") ) +port.isinteger = true +port.default = 3551 +port:depends( "enable", 1 ) + +return m diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/apcups.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/apcups.lua new file mode 100644 index 000000000..9f7a51a86 --- /dev/null +++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/apcups.lua @@ -0,0 +1,175 @@ +-- Copyright 2015 Jo-Philipp Wich +-- Licensed to the public under the Apache License 2.0. + +module("luci.statistics.rrdtool.definitions.apcups",package.seeall) + +function rrdargs( graph, plugin, plugin_instance ) + + local lu = require("luci.util") + local rv = { } + + -- Types and instances supported by APC UPS + -- e.g. ups_types -> { 'timeleft', 'charge', 'percent', 'voltage' } + -- e.g. ups_inst['voltage'] -> { 'input', 'battery' } + + local ups_types = graph.tree:data_types( plugin, plugin_instance ) + + local ups_inst = {} + for _, t in ipairs(ups_types) do + ups_inst[t] = graph.tree:data_instances( plugin, plugin_instance, t ) + end + + + -- Check if hash table or array is empty or nil-filled + + local function empty( t ) + for _, v in pairs(t) do + if type(v) then return false end + end + return true + end + + + -- Append graph definition but only types/instances which are + -- supported and available to the plugin and UPS. + + local function add_supported( t, defs ) + local def_inst = defs['data']['instances'] + + if type(def_inst) == "table" then + for k, v in pairs( def_inst ) do + if lu.contains( ups_types, k) then + for j = #v, 1, -1 do + if not lu.contains( ups_inst[k], v[j] ) then + table.remove( v, j ) + end + end + if #v == 0 then + def_inst[k] = nil -- can't assign v: immutable + end + else + def_inst[k] = nil -- can't assign v: immutable + end + end + if empty(def_inst) then return end + end + table.insert( t, defs ) + end + + + -- Graph definitions for APC UPS measurements MUST use only 'instances': + -- e.g. instances = { voltage = { "input", "output" } } + + local voltagesdc = { + title = "%H: Voltages on APC UPS - Battery", + vlabel = "Volts DC", + alt_autoscale = true, + number_format = "%5.1lfV", + data = { + instances = { + voltage = { "battery" } + }, + options = { + voltage = { title = "Battery voltage", noarea=true } + } + } + } + add_supported( rv, voltagesdc ) + + local voltagesac = { + title = "%H: Voltages on APC UPS - AC", + vlabel = "Volts AC", + alt_autoscale = true, + number_format = "%5.1lfV", + data = { + instances = { + voltage = { "input", "output" } + }, + options = { + voltage_output = { color = "00e000", title = "Output voltage", noarea=true, overlay=true }, + voltage_input = { color = "ffb000", title = "Input voltage", noarea=true, overlay=true } + } + } + } + add_supported( rv, voltagesac ) + + local percentload = { + title = "%H: Load on APC UPS ", + vlabel = "Percent", + y_min = "0", + y_max = "100", + number_format = "%5.1lf%%", + data = { + instances = { + percent = { "load" } + }, + options = { + percent_load = { color = "00ff00", title = "Load level" } + } + } + } + add_supported( rv, percentload ) + + local charge_percent = { + title = "%H: Battery charge on APC UPS ", + vlabel = "Percent", + y_min = "0", + y_max = "100", + number_format = "%5.1lf%%", + data = { + instances = { + charge = { "" } + }, + options = { + charge = { color = "00ff0b", title = "Charge level" } + } + } + } + add_supported( rv, charge_percent ) + + local temperature = { + title = "%H: Battery temperature on APC UPS ", + vlabel = "\176C", + number_format = "%5.1lf\176C", + data = { + instances = { + temperature = { "" } + }, + options = { + temperature = { color = "ffb000", title = "Battery temperature" } } + } + } + add_supported( rv, temperature ) + + local timeleft = { + title = "%H: Time left on APC UPS ", + vlabel = "Minutes", + number_format = "%.1lfm", + data = { + instances = { + timeleft = { "" } + }, + options = { + timeleft = { color = "0000ff", title = "Time left" } + } + } + } + add_supported( rv, timeleft ) + + local frequency = { + title = "%H: Incoming line frequency on APC UPS ", + vlabel = "Hz", + number_format = "%5.0lfhz", + data = { + instances = { + frequency = { "input" } + }, + options = { + frequency_input = { color = "000fff", title = "Line frequency" } + } + } + } + add_supported( rv, frequency ) + + return rv +end diff --git a/applications/luci-app-statistics/po/ca/statistics.po b/applications/luci-app-statistics/po/ca/statistics.po index 33d5051f4..738af5510 100644 --- a/applications/luci-app-statistics/po/ca/statistics.po +++ b/applications/luci-app-statistics/po/ca/statistics.po @@ -15,6 +15,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.6\n" +msgid "APC UPS" +msgstr "" + +msgid "APCUPS Plugin Configuration" +msgstr "" + msgid "Action (target)" msgstr "Acció (objectiu)" @@ -295,6 +301,9 @@ msgstr "Monitoritza els discs i les particions" msgid "Monitor filesystem types" msgstr "Monitoritza els tipus de sistema de fitxers" +msgid "Monitor host" +msgstr "" + msgid "Monitor hosts" msgstr "Monitoritza màquines" @@ -381,6 +390,9 @@ msgstr "Configuració del connector ping" msgid "Port" msgstr "Port" +msgid "Port for apcupsd communication" +msgstr "" + msgid "Processes" msgstr "Processos" @@ -506,6 +518,9 @@ msgstr "TTL per paquets ping" msgid "Table" msgstr "Taula" +msgid "The APCUPS plugin collects statistics about the APC UPS." +msgstr "" + msgid "The NUT plugin reads information about Uninterruptible Power Supplies." msgstr "" diff --git a/applications/luci-app-statistics/po/cs/statistics.po b/applications/luci-app-statistics/po/cs/statistics.po index 849831607..fc3f513c5 100644 --- a/applications/luci-app-statistics/po/cs/statistics.po +++ b/applications/luci-app-statistics/po/cs/statistics.po @@ -11,6 +11,12 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Pootle 2.0.6\n" +msgid "APC UPS" +msgstr "" + +msgid "APCUPS Plugin Configuration" +msgstr "" + msgid "Action (target)" msgstr "Akce (cíl)" @@ -290,6 +296,9 @@ msgstr "Sledovat disky a oddíly" msgid "Monitor filesystem types" msgstr "Sledovat typy souborových systémů" +msgid "Monitor host" +msgstr "" + msgid "Monitor hosts" msgstr "Sledovat hostitele" @@ -376,6 +385,9 @@ msgstr "Nastavení pluginu Ping" msgid "Port" msgstr "Port" +msgid "Port for apcupsd communication" +msgstr "" + msgid "Processes" msgstr "Procesy" @@ -500,6 +512,9 @@ msgstr "TTL pro pakety pingu" msgid "Table" msgstr "" +msgid "The APCUPS plugin collects statistics about the APC UPS." +msgstr "" + msgid "The NUT plugin reads information about Uninterruptible Power Supplies." msgstr "" diff --git a/applications/luci-app-statistics/po/de/statistics.po b/applications/luci-app-statistics/po/de/statistics.po index 196433e50..45ba020ad 100644 --- a/applications/luci-app-statistics/po/de/statistics.po +++ b/applications/luci-app-statistics/po/de/statistics.po @@ -13,6 +13,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.6\n" +msgid "APC UPS" +msgstr "" + +msgid "APCUPS Plugin Configuration" +msgstr "" + msgid "Action (target)" msgstr "Aktion (Ziel)" @@ -297,6 +303,9 @@ msgstr "Geräte und Partitionen überwachen" msgid "Monitor filesystem types" msgstr "Datesystemtypen überwachen" +msgid "Monitor host" +msgstr "" + msgid "Monitor hosts" msgstr "Hosts überwachen" @@ -383,6 +392,9 @@ msgstr "Ping Plugin Konfiguration" msgid "Port" msgstr "Port" +msgid "Port for apcupsd communication" +msgstr "" + msgid "Processes" msgstr "Prozesse" @@ -506,6 +518,9 @@ msgstr "TTL für Ping Pakete" msgid "Table" msgstr "Tabelle" +msgid "The APCUPS plugin collects statistics about the APC UPS." +msgstr "" + msgid "The NUT plugin reads information about Uninterruptible Power Supplies." msgstr "" "Das NUT-Plugin liest Informationen über Unterbrechungsfreie Stromversorgungen" diff --git a/applications/luci-app-statistics/po/el/statistics.po b/applications/luci-app-statistics/po/el/statistics.po index da54cdac6..406286844 100644 --- a/applications/luci-app-statistics/po/el/statistics.po +++ b/applications/luci-app-statistics/po/el/statistics.po @@ -13,6 +13,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.4\n" +msgid "APC UPS" +msgstr "" + +msgid "APCUPS Plugin Configuration" +msgstr "" + msgid "Action (target)" msgstr "" @@ -288,6 +294,9 @@ msgstr "" msgid "Monitor filesystem types" msgstr "" +msgid "Monitor host" +msgstr "" + msgid "Monitor hosts" msgstr "" @@ -374,6 +383,9 @@ msgstr "" msgid "Port" msgstr "" +msgid "Port for apcupsd communication" +msgstr "" + msgid "Processes" msgstr "Διεργασίες" @@ -497,6 +509,9 @@ msgstr "" msgid "Table" msgstr "Πίνακας" +msgid "The APCUPS plugin collects statistics about the APC UPS." +msgstr "" + msgid "The NUT plugin reads information about Uninterruptible Power Supplies." msgstr "" diff --git a/applications/luci-app-statistics/po/en/statistics.po b/applications/luci-app-statistics/po/en/statistics.po index d9ab59ce0..f7ebfe0c2 100644 --- a/applications/luci-app-statistics/po/en/statistics.po +++ b/applications/luci-app-statistics/po/en/statistics.po @@ -13,6 +13,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Translate Toolkit 1.1.1\n" +msgid "APC UPS" +msgstr "" + +msgid "APCUPS Plugin Configuration" +msgstr "" + msgid "Action (target)" msgstr "Action (target)" @@ -293,6 +299,9 @@ msgstr "Monitor disks and partitions" msgid "Monitor filesystem types" msgstr "Monitor filesystem types" +msgid "Monitor host" +msgstr "" + msgid "Monitor hosts" msgstr "Monitor hosts" @@ -379,6 +388,9 @@ msgstr "Ping Plugin Configuration" msgid "Port" msgstr "" +msgid "Port for apcupsd communication" +msgstr "" + msgid "Processes" msgstr "Processes" @@ -502,6 +514,9 @@ msgstr "TTL for ping packets" msgid "Table" msgstr "Table" +msgid "The APCUPS plugin collects statistics about the APC UPS." +msgstr "" + msgid "The NUT plugin reads information about Uninterruptible Power Supplies." msgstr "" diff --git a/applications/luci-app-statistics/po/es/statistics.po b/applications/luci-app-statistics/po/es/statistics.po index 18c25819a..3c811ffef 100644 --- a/applications/luci-app-statistics/po/es/statistics.po +++ b/applications/luci-app-statistics/po/es/statistics.po @@ -13,6 +13,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.6\n" +msgid "APC UPS" +msgstr "" + +msgid "APCUPS Plugin Configuration" +msgstr "" + msgid "Action (target)" msgstr "Acción (objetivo)" @@ -292,6 +298,9 @@ msgstr "Monitorizar discos y particiones" msgid "Monitor filesystem types" msgstr "Monitorizar tipos de sistema de archivos" +msgid "Monitor host" +msgstr "" + msgid "Monitor hosts" msgstr "Monitorizar máquinas" @@ -378,6 +387,9 @@ msgstr "Configuración del plugin \"Ping\"" msgid "Port" msgstr "Puerto" +msgid "Port for apcupsd communication" +msgstr "" + msgid "Processes" msgstr "Procesos" @@ -501,6 +513,9 @@ msgstr "TTL para paquetes de ping" msgid "Table" msgstr "Tabla" +msgid "The APCUPS plugin collects statistics about the APC UPS." +msgstr "" + msgid "The NUT plugin reads information about Uninterruptible Power Supplies." msgstr "" "El plugin NUT obtiene información sobre Sistemas de Alimentación " diff --git a/applications/luci-app-statistics/po/fr/statistics.po b/applications/luci-app-statistics/po/fr/statistics.po index b657bd38f..bc156dd42 100644 --- a/applications/luci-app-statistics/po/fr/statistics.po +++ b/applications/luci-app-statistics/po/fr/statistics.po @@ -13,6 +13,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.0.4\n" +msgid "APC UPS" +msgstr "" + +msgid "APCUPS Plugin Configuration" +msgstr "" + msgid "Action (target)" msgstr "Action (cible)" @@ -294,6 +300,9 @@ msgstr "Disques et partitions à surveiller" msgid "Monitor filesystem types" msgstr "types de systèmes de fichier à surveiller" +msgid "Monitor host" +msgstr "" + msgid "Monitor hosts" msgstr "Hôtes à surveiller" @@ -380,6 +389,9 @@ msgstr "Configuration du greffon Ping" msgid "Port" msgstr "" +msgid "Port for apcupsd communication" +msgstr "" + msgid "Processes" msgstr "Processus" @@ -503,6 +515,9 @@ msgstr "TTL des paquets ping" msgid "Table" msgstr "Table" +msgid "The APCUPS plugin collects statistics about the APC UPS." +msgstr "" + msgid "The NUT plugin reads information about Uninterruptible Power Supplies." msgstr "" diff --git a/applications/luci-app-statistics/po/he/statistics.po b/applications/luci-app-statistics/po/he/statistics.po index 6f40a47a2..35f978ed2 100644 --- a/applications/luci-app-statistics/po/he/statistics.po +++ b/applications/luci-app-statistics/po/he/statistics.po @@ -13,6 +13,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.6\n" +msgid "APC UPS" +msgstr "" + +msgid "APCUPS Plugin Configuration" +msgstr "" + msgid "Action (target)" msgstr "" @@ -283,6 +289,9 @@ msgstr "" msgid "Monitor filesystem types" msgstr "" +msgid "Monitor host" +msgstr "" + msgid "Monitor hosts" msgstr "" @@ -369,6 +378,9 @@ msgstr "" msgid "Port" msgstr "" +msgid "Port for apcupsd communication" +msgstr "" + msgid "Processes" msgstr "" @@ -492,6 +504,9 @@ msgstr "" msgid "Table" msgstr "" +msgid "The APCUPS plugin collects statistics about the APC UPS." +msgstr "" + msgid "The NUT plugin reads information about Uninterruptible Power Supplies." msgstr "" diff --git a/applications/luci-app-statistics/po/hu/statistics.po b/applications/luci-app-statistics/po/hu/statistics.po index 979c72f0f..e5c4e601c 100644 --- a/applications/luci-app-statistics/po/hu/statistics.po +++ b/applications/luci-app-statistics/po/hu/statistics.po @@ -11,6 +11,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.6\n" +msgid "APC UPS" +msgstr "" + +msgid "APCUPS Plugin Configuration" +msgstr "" + msgid "Action (target)" msgstr "Tevékenység (cél)" @@ -295,6 +301,9 @@ msgstr "Lemezek és partíciók figyelése" msgid "Monitor filesystem types" msgstr "Fájlrendszer típusok figyelése" +msgid "Monitor host" +msgstr "" + msgid "Monitor hosts" msgstr "Gépek figyelése" @@ -381,6 +390,9 @@ msgstr "Ping bővítmény beállítása" msgid "Port" msgstr "Port" +msgid "Port for apcupsd communication" +msgstr "" + msgid "Processes" msgstr "Folyamatok" @@ -508,6 +520,9 @@ msgstr "TTL a ping csomagokhoz" msgid "Table" msgstr "Táblázat" +msgid "The APCUPS plugin collects statistics about the APC UPS." +msgstr "" + msgid "The NUT plugin reads information about Uninterruptible Power Supplies." msgstr "A NUT bővítmény a szünetmentes tápokról ad információkat." diff --git a/applications/luci-app-statistics/po/it/statistics.po b/applications/luci-app-statistics/po/it/statistics.po index b0ae3d6b7..2451503f2 100644 --- a/applications/luci-app-statistics/po/it/statistics.po +++ b/applications/luci-app-statistics/po/it/statistics.po @@ -13,6 +13,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.6\n" +msgid "APC UPS" +msgstr "" + +msgid "APCUPS Plugin Configuration" +msgstr "" + msgid "Action (target)" msgstr "Azione (destinazione)" @@ -293,6 +299,9 @@ msgstr "" msgid "Monitor filesystem types" msgstr "" +msgid "Monitor host" +msgstr "" + msgid "Monitor hosts" msgstr "" @@ -379,6 +388,9 @@ msgstr "" msgid "Port" msgstr "" +msgid "Port for apcupsd communication" +msgstr "" + msgid "Processes" msgstr "" @@ -502,6 +514,9 @@ msgstr "" msgid "Table" msgstr "Tabella" +msgid "The APCUPS plugin collects statistics about the APC UPS." +msgstr "" + msgid "The NUT plugin reads information about Uninterruptible Power Supplies." msgstr "" diff --git a/applications/luci-app-statistics/po/ja/statistics.po b/applications/luci-app-statistics/po/ja/statistics.po index 690d9207d..53941cf0f 100644 --- a/applications/luci-app-statistics/po/ja/statistics.po +++ b/applications/luci-app-statistics/po/ja/statistics.po @@ -13,6 +13,12 @@ msgstr "" "X-Generator: Poedit 1.8.11\n" "Language-Team: \n" +msgid "APC UPS" +msgstr "" + +msgid "APCUPS Plugin Configuration" +msgstr "" + msgid "Action (target)" msgstr "アクション（対象）" @@ -295,6 +301,9 @@ msgstr "ディスクとパーティションをモニターする" msgid "Monitor filesystem types" msgstr "ファイルシステム タイプをモニターする" +msgid "Monitor host" +msgstr "" + msgid "Monitor hosts" msgstr "ホストをモニターする" @@ -384,6 +393,9 @@ msgstr "Ping プラグイン設定" msgid "Port" msgstr "ポート" +msgid "Port for apcupsd communication" +msgstr "" + msgid "Processes" msgstr "プロセス" @@ -507,6 +519,9 @@ msgstr "pingパケットのTTL" msgid "Table" msgstr "テーブル" +msgid "The APCUPS plugin collects statistics about the APC UPS." +msgstr "" + msgid "The NUT plugin reads information about Uninterruptible Power Supplies." msgstr "NUT プラグインは、無停電電源装置についての情報を読み取ります。" diff --git a/applications/luci-app-statistics/po/ms/statistics.po b/applications/luci-app-statistics/po/ms/statistics.po index 582314c54..c02556fc8 100644 --- a/applications/luci-app-statistics/po/ms/statistics.po +++ b/applications/luci-app-statistics/po/ms/statistics.po @@ -10,6 +10,12 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +msgid "APC UPS" +msgstr "" + +msgid "APCUPS Plugin Configuration" +msgstr "" + msgid "Action (target)" msgstr "" @@ -280,6 +286,9 @@ msgstr "" msgid "Monitor filesystem types" msgstr "" +msgid "Monitor host" +msgstr "" + msgid "Monitor hosts" msgstr "" @@ -366,6 +375,9 @@ msgstr "" msgid "Port" msgstr "" +msgid "Port for apcupsd communication" +msgstr "" + msgid "Processes" msgstr "" @@ -489,6 +501,9 @@ msgstr "" msgid "Table" msgstr "" +msgid "The APCUPS plugin collects statistics about the APC UPS." +msgstr "" + msgid "The NUT plugin reads information about Uninterruptible Power Supplies." msgstr "" diff --git a/applications/luci-app-statistics/po/no/statistics.po b/applications/luci-app-statistics/po/no/statistics.po index d37bc488f..4de2ee6b5 100644 --- a/applications/luci-app-statistics/po/no/statistics.po +++ b/applications/luci-app-statistics/po/no/statistics.po @@ -4,6 +4,12 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +msgid "APC UPS" +msgstr "" + +msgid "APCUPS Plugin Configuration" +msgstr "" + msgid "Action (target)" msgstr "Handling (mål)" @@ -282,6 +288,9 @@ msgstr "Overvåk disker og partisjoner" msgid "Monitor filesystem types" msgstr "Overvåk filsystem typer" +msgid "Monitor host" +msgstr "" + msgid "Monitor hosts" msgstr "Overvåk verter" @@ -368,6 +377,9 @@ msgstr "Ping plugin konfigurasjon" msgid "Port" msgstr "" +msgid "Port for apcupsd communication" +msgstr "" + msgid "Processes" msgstr "Prosesser" @@ -491,6 +503,9 @@ msgstr "TTL for ping pakker" msgid "Table" msgstr "Tabell" +msgid "The APCUPS plugin collects statistics about the APC UPS." +msgstr "" + msgid "The NUT plugin reads information about Uninterruptible Power Supplies." msgstr "" diff --git a/applications/luci-app-statistics/po/pl/statistics.po b/applications/luci-app-statistics/po/pl/statistics.po index bf2ec9351..6e34ce072 100644 --- a/applications/luci-app-statistics/po/pl/statistics.po +++ b/applications/luci-app-statistics/po/pl/statistics.po @@ -14,6 +14,12 @@ msgstr "" "|| n%100>=20) ? 1 : 2);\n" "X-Generator: Pootle 2.0.6\n" +msgid "APC UPS" +msgstr "" + +msgid "APCUPS Plugin Configuration" +msgstr "" + msgid "Action (target)" msgstr "Akcja (cel)" @@ -296,6 +302,9 @@ msgstr "Monitoruj dyski i partycje" msgid "Monitor filesystem types" msgstr "Monitoruj system plików" +msgid "Monitor host" +msgstr "" + msgid "Monitor hosts" msgstr "Monitoruj hosty" @@ -382,6 +391,9 @@ msgstr "Konfiguracja wtyczki Ping" msgid "Port" msgstr "Port" +msgid "Port for apcupsd communication" +msgstr "" + msgid "Processes" msgstr "Procesy" @@ -506,6 +518,9 @@ msgstr "TTL dla pakietów ping" msgid "Table" msgstr "Tabela" +msgid "The APCUPS plugin collects statistics about the APC UPS." +msgstr "" + msgid "The NUT plugin reads information about Uninterruptible Power Supplies." msgstr "Wtyczka Nut Informuje o Nie przerywalnym Zasilaniu" diff --git a/applications/luci-app-statistics/po/pt-br/statistics.po b/applications/luci-app-statistics/po/pt-br/statistics.po index 74c4a2603..c5d689933 100644 --- a/applications/luci-app-statistics/po/pt-br/statistics.po +++ b/applications/luci-app-statistics/po/pt-br/statistics.po @@ -13,6 +13,12 @@ msgstr "" "X-Generator: Poedit 1.8.11\n" "Language-Team: \n" +msgid "APC UPS" +msgstr "" + +msgid "APCUPS Plugin Configuration" +msgstr "" + msgid "Action (target)" msgstr "Ação (destino)" @@ -299,6 +305,9 @@ msgstr "Monitoras discos e partições" msgid "Monitor filesystem types" msgstr "Monitorar tipos de sistemas de arquivos" +msgid "Monitor host" +msgstr "" + msgid "Monitor hosts" msgstr "Monitorar os equipamentos" @@ -388,6 +397,9 @@ msgstr "Configuração do plugin Ping" msgid "Port" msgstr "Porta" +msgid "Port for apcupsd communication" +msgstr "" + msgid "Processes" msgstr "Processos" @@ -511,6 +523,9 @@ msgstr "TTL para os pacotes do ping" msgid "Table" msgstr "Tabela" +msgid "The APCUPS plugin collects statistics about the APC UPS." +msgstr "" + msgid "The NUT plugin reads information about Uninterruptible Power Supplies." msgstr "O plugin NUT lê informações sobre Fontes de alimentação ininterruptas." diff --git a/applications/luci-app-statistics/po/pt/statistics.po b/applications/luci-app-statistics/po/pt/statistics.po index 79c7bd03e..245e6e9bf 100644 --- a/applications/luci-app-statistics/po/pt/statistics.po +++ b/applications/luci-app-statistics/po/pt/statistics.po @@ -13,6 +13,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.6\n" +msgid "APC UPS" +msgstr "" + +msgid "APCUPS Plugin Configuration" +msgstr "" + msgid "Action (target)" msgstr "Ação (destino)" @@ -295,6 +301,9 @@ msgstr "Monitoras discos e partições" msgid "Monitor filesystem types" msgstr "Monitorar tipos de sistemas de arquivos" +msgid "Monitor host" +msgstr "" + msgid "Monitor hosts" msgstr "Monitorar os hosts" @@ -381,6 +390,9 @@ msgstr "Configuração do plugin Ping" msgid "Port" msgstr "Porta" +msgid "Port for apcupsd communication" +msgstr "" + msgid "Processes" msgstr "Processos" @@ -504,6 +516,9 @@ msgstr "TTL para os pacotes do ping" msgid "Table" msgstr "Tabela" +msgid "The APCUPS plugin collects statistics about the APC UPS." +msgstr "" + msgid "The NUT plugin reads information about Uninterruptible Power Supplies." msgstr "" diff --git a/applications/luci-app-statistics/po/ro/statistics.po b/applications/luci-app-statistics/po/ro/statistics.po index c5dfcfe55..a326fec79 100644 --- a/applications/luci-app-statistics/po/ro/statistics.po +++ b/applications/luci-app-statistics/po/ro/statistics.po @@ -14,6 +14,12 @@ msgstr "" "20)) ? 1 : 2);;\n" "X-Generator: Pootle 2.0.4\n" +msgid "APC UPS" +msgstr "" + +msgid "APCUPS Plugin Configuration" +msgstr "" + msgid "Action (target)" msgstr "" @@ -287,6 +293,9 @@ msgstr "" msgid "Monitor filesystem types" msgstr "" +msgid "Monitor host" +msgstr "" + msgid "Monitor hosts" msgstr "" @@ -373,6 +382,9 @@ msgstr "" msgid "Port" msgstr "" +msgid "Port for apcupsd communication" +msgstr "" + msgid "Processes" msgstr "Procese" @@ -496,6 +508,9 @@ msgstr "" msgid "Table" msgstr "" +msgid "The APCUPS plugin collects statistics about the APC UPS." +msgstr "" + msgid "The NUT plugin reads information about Uninterruptible Power Supplies." msgstr "" diff --git a/applications/luci-app-statistics/po/ru/statistics.po b/applications/luci-app-statistics/po/ru/statistics.po index 1a7eed694..e0eafdf66 100644 --- a/applications/luci-app-statistics/po/ru/statistics.po +++ b/applications/luci-app-statistics/po/ru/statistics.po @@ -15,6 +15,12 @@ msgstr "" "Project-Info: Это технический перевод, не дословный. Главное-удобный русский " "интерфейс, все проверялось в графическом режиме, совместим с другими apps\n" +msgid "APC UPS" +msgstr "" + +msgid "APCUPS Plugin Configuration" +msgstr "" + msgid "Action (target)" msgstr "Действие (цель)" @@ -301,6 +307,9 @@ msgstr "Мониторить диски и разделы" msgid "Monitor filesystem types" msgstr "Монитоить типы файловых систем" +msgid "Monitor host" +msgstr "" + msgid "Monitor hosts" msgstr "Мониторить хосты" @@ -389,6 +398,9 @@ msgstr "Настройка плагина Ping" msgid "Port" msgstr "Порт" +msgid "Port for apcupsd communication" +msgstr "" + msgid "Processes" msgstr "Процессы" @@ -512,6 +524,9 @@ msgstr "TTL для ping-пакетов" msgid "Table" msgstr "Таблица" +msgid "The APCUPS plugin collects statistics about the APC UPS." +msgstr "" + msgid "The NUT plugin reads information about Uninterruptible Power Supplies." msgstr "" "Плагин 'NUT' считывает информацию об источниках бесперебойного питания." diff --git a/applications/luci-app-statistics/po/sk/statistics.po b/applications/luci-app-statistics/po/sk/statistics.po index 6dba7d09b..53858ca54 100644 --- a/applications/luci-app-statistics/po/sk/statistics.po +++ b/applications/luci-app-statistics/po/sk/statistics.po @@ -8,6 +8,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +msgid "APC UPS" +msgstr "" + +msgid "APCUPS Plugin Configuration" +msgstr "" + msgid "Action (target)" msgstr "" @@ -278,6 +284,9 @@ msgstr "" msgid "Monitor filesystem types" msgstr "" +msgid "Monitor host" +msgstr "" + msgid "Monitor hosts" msgstr "" @@ -364,6 +373,9 @@ msgstr "" msgid "Port" msgstr "" +msgid "Port for apcupsd communication" +msgstr "" + msgid "Processes" msgstr "" @@ -487,6 +499,9 @@ msgstr "" msgid "Table" msgstr "" +msgid "The APCUPS plugin collects statistics about the APC UPS." +msgstr "" + msgid "The NUT plugin reads information about Uninterruptible Power Supplies." msgstr "" diff --git a/applications/luci-app-statistics/po/sv/statistics.po b/applications/luci-app-statistics/po/sv/statistics.po index bef0f2d6c..9d738f2f3 100644 --- a/applications/luci-app-statistics/po/sv/statistics.po +++ b/applications/luci-app-statistics/po/sv/statistics.po @@ -9,6 +9,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +msgid "APC UPS" +msgstr "" + +msgid "APCUPS Plugin Configuration" +msgstr "" + msgid "Action (target)" msgstr "" @@ -283,6 +289,9 @@ msgstr "Övervaka hårddiskar och partitioner" msgid "Monitor filesystem types" msgstr "Övervaka filsystemtyper" +msgid "Monitor host" +msgstr "" + msgid "Monitor hosts" msgstr "Övervaka värdar" @@ -369,6 +378,9 @@ msgstr "" msgid "Port" msgstr "Port" +msgid "Port for apcupsd communication" +msgstr "" + msgid "Processes" msgstr "Processer" @@ -492,6 +504,9 @@ msgstr "TTL för ping-paket" msgid "Table" msgstr "Tabell" +msgid "The APCUPS plugin collects statistics about the APC UPS." +msgstr "" + msgid "The NUT plugin reads information about Uninterruptible Power Supplies." msgstr "" diff --git a/applications/luci-app-statistics/po/templates/statistics.pot b/applications/luci-app-statistics/po/templates/statistics.pot index c57a85b76..ec630b696 100644 --- a/applications/luci-app-statistics/po/templates/statistics.pot +++ b/applications/luci-app-statistics/po/templates/statistics.pot @@ -1,6 +1,12 @@ msgid "" msgstr "Content-Type: text/plain; charset=UTF-8" +msgid "APC UPS" +msgstr "" + +msgid "APCUPS Plugin Configuration" +msgstr "" + msgid "Action (target)" msgstr "" @@ -271,6 +277,9 @@ msgstr "" msgid "Monitor filesystem types" msgstr "" +msgid "Monitor host" +msgstr "" + msgid "Monitor hosts" msgstr "" @@ -357,6 +366,9 @@ msgstr "" msgid "Port" msgstr "" +msgid "Port for apcupsd communication" +msgstr "" + msgid "Processes" msgstr "" @@ -480,6 +492,9 @@ msgstr "" msgid "Table" msgstr "" +msgid "The APCUPS plugin collects statistics about the APC UPS." +msgstr "" + msgid "The NUT plugin reads information about Uninterruptible Power Supplies." msgstr "" diff --git a/applications/luci-app-statistics/po/tr/statistics.po b/applications/luci-app-statistics/po/tr/statistics.po index 6d7056f3b..860ff95e8 100644 --- a/applications/luci-app-statistics/po/tr/statistics.po +++ b/applications/luci-app-statistics/po/tr/statistics.po @@ -9,6 +9,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" +msgid "APC UPS" +msgstr "" + +msgid "APCUPS Plugin Configuration" +msgstr "" + msgid "Action (target)" msgstr "" @@ -279,6 +285,9 @@ msgstr "" msgid "Monitor filesystem types" msgstr "" +msgid "Monitor host" +msgstr "" + msgid "Monitor hosts" msgstr "" @@ -365,6 +374,9 @@ msgstr "" msgid "Port" msgstr "" +msgid "Port for apcupsd communication" +msgstr "" + msgid "Processes" msgstr "" @@ -488,6 +500,9 @@ msgstr "" msgid "Table" msgstr "" +msgid "The APCUPS plugin collects statistics about the APC UPS." +msgstr "" + msgid "The NUT plugin reads information about Uninterruptible Power Supplies." msgstr "" diff --git a/applications/luci-app-statistics/po/uk/statistics.po b/applications/luci-app-statistics/po/uk/statistics.po index de17a3caf..ac9ae5094 100644 --- a/applications/luci-app-statistics/po/uk/statistics.po +++ b/applications/luci-app-statistics/po/uk/statistics.po @@ -14,6 +14,12 @@ msgstr "" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Pootle 2.0.6\n" +msgid "APC UPS" +msgstr "" + +msgid "APCUPS Plugin Configuration" +msgstr "" + msgid "Action (target)" msgstr "" @@ -284,6 +290,9 @@ msgstr "" msgid "Monitor filesystem types" msgstr "" +msgid "Monitor host" +msgstr "" + msgid "Monitor hosts" msgstr "" @@ -370,6 +379,9 @@ msgstr "" msgid "Port" msgstr "" +msgid "Port for apcupsd communication" +msgstr "" + msgid "Processes" msgstr "" @@ -493,6 +505,9 @@ msgstr "" msgid "Table" msgstr "" +msgid "The APCUPS plugin collects statistics about the APC UPS." +msgstr "" + msgid "The NUT plugin reads information about Uninterruptible Power Supplies." msgstr "" diff --git a/applications/luci-app-statistics/po/vi/statistics.po b/applications/luci-app-statistics/po/vi/statistics.po index bdb7f1a3a..f5798a265 100644 --- a/applications/luci-app-statistics/po/vi/statistics.po +++ b/applications/luci-app-statistics/po/vi/statistics.po @@ -14,6 +14,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Pootle 1.1.0\n" +msgid "APC UPS" +msgstr "" + +msgid "APCUPS Plugin Configuration" +msgstr "" + msgid "Action (target)" msgstr "Action (target)" @@ -294,6 +300,9 @@ msgstr "Kiểm soát đĩa và phân vùng" msgid "Monitor filesystem types" msgstr "Kiểm soát loại filesystem" +msgid "Monitor host" +msgstr "" + msgid "Monitor hosts" msgstr "Monitor hosts" @@ -380,6 +389,9 @@ msgstr "Cấu hình Ping plugin" msgid "Port" msgstr "" +msgid "Port for apcupsd communication" +msgstr "" + msgid "Processes" msgstr "Quá trình xử lý" @@ -503,6 +515,9 @@ msgstr "TTl cho gói ping" msgid "Table" msgstr "Table" +msgid "The APCUPS plugin collects statistics about the APC UPS." +msgstr "" + msgid "The NUT plugin reads information about Uninterruptible Power Supplies." msgstr "" diff --git a/applications/luci-app-statistics/po/zh-cn/statistics.po b/applications/luci-app-statistics/po/zh-cn/statistics.po index 46cf59fee..20f5a93cb 100644 --- a/applications/luci-app-statistics/po/zh-cn/statistics.po +++ b/applications/luci-app-statistics/po/zh-cn/statistics.po @@ -13,6 +13,12 @@ msgstr "" "X-Generator: Poedit 2.0.1\n" "Language-Team: \n" +msgid "APC UPS" +msgstr "" + +msgid "APCUPS Plugin Configuration" +msgstr "" + msgid "Action (target)" msgstr "动作（目标）" @@ -289,6 +295,9 @@ msgstr "监测磁盘和分区" msgid "Monitor filesystem types" msgstr "监测文件系统类型" +msgid "Monitor host" +msgstr "" + msgid "Monitor hosts" msgstr "监测主机" @@ -377,6 +386,9 @@ msgstr "Ping插件配置" msgid "Port" msgstr "端口" +msgid "Port for apcupsd communication" +msgstr "" + msgid "Processes" msgstr "进程" @@ -500,6 +512,9 @@ msgstr "ping包TTL" msgid "Table" msgstr "表" +msgid "The APCUPS plugin collects statistics about the APC UPS." +msgstr "" + msgid "The NUT plugin reads information about Uninterruptible Power Supplies." msgstr "NUT插件读取UPS信息。" diff --git a/applications/luci-app-statistics/po/zh-tw/statistics.po b/applications/luci-app-statistics/po/zh-tw/statistics.po index cbd6d9d38..36e42c1d0 100644 --- a/applications/luci-app-statistics/po/zh-tw/statistics.po +++ b/applications/luci-app-statistics/po/zh-tw/statistics.po @@ -7,6 +7,12 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" +msgid "APC UPS" +msgstr "" + +msgid "APCUPS Plugin Configuration" +msgstr "" + msgid "Action (target)" msgstr "" @@ -277,6 +283,9 @@ msgstr "" msgid "Monitor filesystem types" msgstr "" +msgid "Monitor host" +msgstr "" + msgid "Monitor hosts" msgstr "" @@ -363,6 +372,9 @@ msgstr "" msgid "Port" msgstr "" +msgid "Port for apcupsd communication" +msgstr "" + msgid "Processes" msgstr "" @@ -486,6 +498,9 @@ msgstr "" msgid "Table" msgstr "" +msgid "The APCUPS plugin collects statistics about the APC UPS." +msgstr "" + msgid "The NUT plugin reads information about Uninterruptible Power Supplies." msgstr "" diff --git a/applications/luci-app-statistics/root/etc/config/luci_statistics b/applications/luci-app-statistics/root/etc/config/luci_statistics index c081a8e72..8cc918e3d 100644 --- a/applications/luci-app-statistics/root/etc/config/luci_statistics +++ b/applications/luci-app-statistics/root/etc/config/luci_statistics @@ -49,6 +49,11 @@ config statistics 'collectd_unixsock' # input plugins +config statistics 'collectd_apcups' + option enable '0' + option Host 'localhost' + option Port '3551' + config statistics 'collectd_conntrack' option enable '0' diff --git a/applications/luci-app-statistics/root/usr/bin/stat-genconfig b/applications/luci-app-statistics/root/usr/bin/stat-genconfig index 41482ea46..d33b1a823 100755 --- a/applications/luci-app-statistics/root/usr/bin/stat-genconfig +++ b/applications/luci-app-statistics/root/usr/bin/stat-genconfig @@ -255,6 +255,12 @@ end plugins = { + apcups = { + { "Host", "Port" }, + { }, + { } + }, + collectd = { { "BaseDir", "Include", "PIDFile", "PluginDir", "TypesDB", "Interval", "ReadThreads", "Hostname" }, { }, diff --git a/contrib/package/community-profiles/files/etc/config/profile_berlin b/contrib/package/community-profiles/files/etc/config/profile_berlin index 1bfc8ed7d..e1e4eda91 100644 --- a/contrib/package/community-profiles/files/etc/config/profile_berlin +++ b/contrib/package/community-profiles/files/etc/config/profile_berlin @@ -33,7 +33,7 @@ config 'defaults' 'ssidscheme' config 'defaults' 'interface' option 'netmask' '255.255.255.255' - option 'dns' '85.214.20.141 213.73.91.35 194.150.168.168 2001:4ce8::53 2001:910:800::12' + option 'dns' '85.214.20.141 194.150.168.168 2001:4ce8::53 2001:910:800::12' config 'dhcp' 'dhcp' option leasetime '5m' diff --git a/contrib/package/community-profiles/files/etc/config/profile_cottbus b/contrib/package/community-profiles/files/etc/config/profile_cottbus index 6f395a133..9b08acc25 100644 --- a/contrib/package/community-profiles/files/etc/config/profile_cottbus +++ b/contrib/package/community-profiles/files/etc/config/profile_cottbus @@ -31,7 +31,7 @@ config 'defaults' 'ssidscheme' config 'defaults' 'interface' option 'netmask' '255.255.255.255' - option 'dns' '85.214.20.141 213.73.91.35 194.150.168.168 2001:4ce8::53 2001:910:800::12' + option 'dns' '85.214.20.141 194.150.168.168 2001:4ce8::53 2001:910:800::12' config 'dhcp' 'dhcp' option 'leasetime' '5m' diff --git a/contrib/package/community-profiles/files/etc/config/profile_potsdam b/contrib/package/community-profiles/files/etc/config/profile_potsdam index 6a8f1f14b..84bbdfe52 100644 --- a/contrib/package/community-profiles/files/etc/config/profile_potsdam +++ b/contrib/package/community-profiles/files/etc/config/profile_potsdam @@ -11,7 +11,7 @@ config 'community' 'profile' config 'defaults' 'interface' option 'netmask' '255.255.0.0' - option 'dns' '85.214.20.141 213.73.91.35 194.150.168.168' + option 'dns' '85.214.20.141 194.150.168.168' option 'delegate' '0' config 'defaults' 'wifi_device' diff --git a/contrib/package/community-profiles/files/etc/config/profile_tulumlibre b/contrib/package/community-profiles/files/etc/config/profile_tulumlibre index ecc6f9bc4..c028a6661 100644 --- a/contrib/package/community-profiles/files/etc/config/profile_tulumlibre +++ b/contrib/package/community-profiles/files/etc/config/profile_tulumlibre @@ -7,4 +7,4 @@ config 'community' 'profile' option 'splash_prefix' '28' config 'defaults' 'interface' - option 'dns' '213.73.91.35 216.87.84.211' + option 'dns' '216.87.84.211' diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua index 6668dad83..47cb901a5 100644 --- a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua +++ b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua @@ -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' }, @@ -239,8 +239,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' },