diff options
Diffstat (limited to 'applications')
35 files changed, 3581 insertions, 1156 deletions
diff --git a/applications/luci-app-adblock/luasrc/controller/adblock.lua b/applications/luci-app-adblock/luasrc/controller/adblock.lua index 0cfb8fc80c..e5061bc9d9 100644 --- a/applications/luci-app-adblock/luasrc/controller/adblock.lua +++ b/applications/luci-app-adblock/luasrc/controller/adblock.lua @@ -54,7 +54,7 @@ function adb_action(name, domain) local file = uci:get("adblock", "blacklist", "adb_src") or "/etc/adblock/adblock.blacklist" if nixio.fs.access(file) then local blacklist = nixio.fs.readfile(file) - if not string.find(blacklist, domain, 1, plain) + if not string.find(blacklist, domain, 1, true) then nixio.fs.writefile(file, blacklist.. domain.. "\n") end @@ -63,7 +63,7 @@ function adb_action(name, domain) local file = uci:get("adblock", "global", "adb_whitelist") or "/etc/adblock/adblock.whitelist" if nixio.fs.access(file) then local whitelist = nixio.fs.readfile(file) - if not string.find(whitelist, domain, 1, plain) + if not string.find(whitelist, domain, 1, true) then nixio.fs.writefile(file, whitelist.. domain.. "\n") end diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua index 819a772163..edf5df7ec9 100644 --- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua +++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua @@ -1,12 +1,11 @@ -- Copyright 2017-2018 Dirk Brenken (dev@brenken.org) -- This is free software, licensed under the Apache License, Version 2.0 -local fs = require("nixio.fs") -local uci = require("luci.model.uci").cursor() -local util = require("luci.util") -local net = require "luci.model.network".init() -local sys = require("luci.sys") -local devices = sys.net:devices() +local fs = require("nixio.fs") +local uci = require("luci.model.uci").cursor() +local util = require("luci.util") +local net = require "luci.model.network".init() +local dump = util.ubus("network.interface", "dump", {}) m = Map("adblock", translate("Adblock"), translate("Configuration of the adblock package to block ad/abuse domains by using DNS. ") @@ -34,7 +33,7 @@ o2.default = "dnsmasq (/tmp)" o2.rmempty = false o3 = s:option(ListValue, "adb_fetchutil", translate("Download Utility"), -translate("List of supported and fully pre-configured download utilities.")) + translate("List of supported and fully pre-configured download utilities.")) o3:value("uclient-fetch") o3:value("wget") o3:value("curl") @@ -49,15 +48,12 @@ o4 = s:option(ListValue, "adb_trigger", translate("Startup Trigger"), ..translate("Choose 'none' to disable automatic startups, 'timed' to use a classic timeout (default 30 sec.) or select another trigger interface.")) o4:value("none") o4:value("timed") -for _, dev in ipairs(devices) do - if dev ~= "lo" then - local iface = net:get_interface(dev) - if iface then - iface = iface:get_networks() or {} - for k, v in pairs(iface) do - iface[k] = iface[k].sid - o4:value(iface[k], iface[k].. " (" ..dev.. ")") - end +if dump then + local i, v + for i, v in ipairs(dump.interface) do + if v.interface ~= "loopback" then + local device = v.l3_device or v.device or "-" + o4:value(v.interface, v.interface.. " (" ..device.. ")") end end end @@ -190,22 +186,40 @@ e25.optional = true e25.default = nil e26 = e:option(ListValue, "adb_repiface", translate("Report Interface"), - translate("Reporting interface used by tcpdump (default 'br-lan').")) -for _, dev in ipairs(devices) do - if dev ~= "lo" then - e26:value(dev) + translate("Reporting interface used by tcpdump, set to 'any' for multiple interfaces (default 'br-lan'). ") + ..translate("This change requires a manual service stop/re-start to take effect.")) +if dump then + local i, v + for i, v in ipairs(dump.interface) do + if v.interface ~= "loopback" then + local device = v.device + if device then + e26:value(device) + end + end end end +e26:value("any") e26.optional = true +e27 = e:option(Value, "adb_replisten", translate("Report Listen Port(s)"), + translate("Space separated list of reporting port(s) used by tcpdump (default: '53'). ") + ..translate("This change requires a manual service stop/re-start to take effect.")) +e27.default = 53 +e27.optional = true + e28 = e:option(Value, "adb_repchunkcnt", translate("Report Chunk Count"), - translate("Report chunk count used by tcpdump (default '5').")) + translate("Report chunk count used by tcpdump (default '5'). ") + ..translate("This change requires a manual service stop/re-start to take effect.")) e28.datatype = "range(1,10)" +e28.default = 5 e28.optional = true e29 = e:option(Value, "adb_repchunksize", translate("Report Chunk Size"), - translate("Report chunk size used by tcpdump in MB (default '1').")) + translate("Report chunk size used by tcpdump in MB (default '1'). ") + ..translate("This change requires a manual service stop/re-start to take effect.")) e29.datatype = "range(1,10)" +e29.default = 1 e29.optional = true e30 = e:option(Flag, "adb_forcesrt", translate("Force Overall Sort"), diff --git a/applications/luci-app-adblock/luasrc/view/adblock/report.htm b/applications/luci-app-adblock/luasrc/view/adblock/report.htm index a28ca171b6..4e3d65ba75 100644 --- a/applications/luci-app-adblock/luasrc/view/adblock/report.htm +++ b/applications/luci-app-adblock/luasrc/view/adblock/report.htm @@ -166,7 +166,7 @@ This is free software, licensed under the Apache License, Version 2.0 report_json(json_info); }); - XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "services", "adblock", "report_json")%>', null, + XHR.poll(-1, '<%=luci.dispatcher.build_url("admin", "services", "adblock", "report_json")%>', null, function(x, json_info) { if (!x || !json_info || !json_info.data) @@ -188,7 +188,7 @@ This is free software, licensed under the Apache License, Version 2.0 report_text(x.responseText); }); - XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "services", "adblock", "report_text")%>', null, + XHR.poll(-1, '<%=luci.dispatcher.build_url("admin", "services", "adblock", "report_text")%>', null, function(x) { if (!x || !x.responseText) diff --git a/applications/luci-app-adblock/po/it/adblock.po b/applications/luci-app-adblock/po/it/adblock.po index 3c32091b5c..49d42cf564 100644 --- a/applications/luci-app-adblock/po/it/adblock.po +++ b/applications/luci-app-adblock/po/it/adblock.po @@ -11,18 +11,23 @@ msgstr "" "X-Generator: Poedit 2.0.3\n" "Language: it\n" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:143 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158 msgid "'Jail' Blocklist Creation" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:68 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:74 msgid "" "<b>Caution:</b> To prevent OOM exceptions on low memory devices with less " "than 64 MB free RAM, please only select a few of them!" msgstr "" +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:86 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Action" +msgstr "" + #: applications/luci-app-adblock/luasrc/controller/adblock.lua:17 -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:9 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11 msgid "Adblock" msgstr "Adblock" @@ -34,27 +39,45 @@ msgstr "Status Adblock" msgid "Adblock Version" msgstr "Versione Adblock" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183 msgid "Additional trigger delay in seconds before adblock processing begins." msgstr "Tempo addizionale in secondi di attesa prima che adblock si avvii." -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:21 msgid "Advanced" msgstr "Avanzato" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:85 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Answer" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:92 msgid "Archive Categories" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120 msgid "Backup Directory" msgstr "Directory del Backup" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127 msgid "Backup Mode" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:67 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106 +msgid "Blacklist" +msgstr "" + +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:223 +msgid "Blocked DNS Queries" +msgstr "" + +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:30 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:73 +msgid "Blocked Domain" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73 msgid "Blocklist Sources" msgstr "Fonti lista di Blocco" @@ -62,13 +85,13 @@ msgstr "Fonti lista di Blocco" msgid "Blocklist not found!" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:144 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:159 msgid "" "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all " "domains except those listed in the whitelist file." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:49 msgid "" "Choose 'none' to disable automatic startups, 'timed' to use a classic " "timeout (default 30 sec.) or select another trigger interface." @@ -76,37 +99,60 @@ msgstr "" "Scegli 'none' per disabilitare l'avvio automatico, 'timed' per usare un " "classico timeout (default 30 sec.) o seleziona un'altra interfaccia di avvio." +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:83 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Client" +msgstr "" + #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:59 msgid "Collecting data..." msgstr "Raccogliendo dati..." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:10 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12 msgid "" "Configuration of the adblock package to block ad/abuse domains by using DNS." msgstr "" "Configurazione del pacchetto adblock per bloccare domini pubblicità/abuso " "usando i DNS." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:119 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:25 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:27 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:29 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:68 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:70 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:72 +msgid "Count" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117 msgid "" "Create compressed blocklist backups, they will be used in case of download " "errors or during startup in backup mode." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:23 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25 #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159 msgid "DNS Backend (DNS Directory)" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:171 msgid "DNS Directory" msgstr "Directory DNS" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:19 +msgid "DNS Query Report" +msgstr "" + +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:81 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Date" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90 msgid "Description" msgstr "Descrizione" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:131 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128 msgid "" "Do not automatically update blocklists during startup, use blocklist backups " "instead." @@ -114,7 +160,14 @@ msgstr "" "Non aggiornare automaticamente le liste durante l'avvio, usa invece i backup " "della lista di blocco." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:71 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:84 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Domain" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36 msgid "Download Utility" msgstr "" @@ -122,85 +175,99 @@ msgstr "" msgid "Download Utility (SSL Library)" msgstr "" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:21 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22 msgid "Edit Blacklist" msgstr "Modifica Lista Nera" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:23 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24 msgid "Edit Configuration" msgstr "Modifica Configurazione" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:23 msgid "Edit Whitelist" msgstr "Modifica Lista Bianca" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:151 msgid "Email Notification" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164 msgid "Email Notification Count" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:19 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:21 msgid "Enable Adblock" msgstr "Attiva Adblock" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:118 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116 msgid "Enable Blocklist Backup" msgstr "Attiva Backup Lista di Blocco" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:114 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139 +msgid "Enable DNS Query Report" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212 msgid "" "Enable memory intense overall sort / duplicate removal on low memory devices " "(< 64 MB free RAM)" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102 msgid "Enable verbose debug logging in case of any processing error." msgstr "" "Abilita il registro dettagliato in caso di qualsiasi errore di processo." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:71 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77 msgid "Enabled" msgstr "Abilitato" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:92 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:211 +msgid "End Date" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98 msgid "Extra Options" msgstr "Opzioni Extra" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187 msgid "Flush DNS Cache" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:150 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188 msgid "Flush DNS Cache after adblock processing." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:13 msgid "" "For further information <a href=\"%s\" target=\"_blank\">check the online " "documentation</a>" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:138 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134 msgid "" "For further performance improvements you can raise this value, e.g. '8' or " "'16' should be safe." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112 msgid "Force Local DNS" msgstr "Forza DNS Locale" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211 msgid "Force Overall Sort" msgstr "Forza Ordinamento Globale" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:177 msgid "Full path to the whitelist file." msgstr "" +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140 +msgid "" +"Gather dns related network traffic via tcpdump to provide a DNS Query Report " +"on demand." +msgstr "" + #: applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua:10 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/configuration_tab.lua:9 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua:10 @@ -211,39 +278,53 @@ msgstr "File di input non trovato, per favore controlla la tua configurazione." msgid "Last Run" msgstr "Ultimo Avvio" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:241 +msgid "Latest DNS Queries" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48 msgid "" "List of available network interfaces. Usually the startup will be triggered " "by the 'wan' interface." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:26 msgid "" "List of supported DNS backends with their default list export directory." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:37 msgid "List of supported and fully pre-configured download utilities." msgstr "" #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:21 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:148 #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90 msgid "Loading" msgstr "Caricando" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:100 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20 +msgid "Logfile" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105 msgid "Low Priority Service" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:132 msgid "Max. Download Queue" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:26 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:69 +msgid "Name / IP-Address" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86 msgid "No" msgstr "No" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:93 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:99 msgid "" "Options for further tweaking in case the defaults are not suitable for you." msgstr "" @@ -274,26 +355,29 @@ msgid "Please edit this file directly in a terminal session." msgstr "" "Per favore modifica questo file direttamente in una sessione al terminale." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156 -msgid "" -"Please note: this needs additional 'msmtp' package installation and setup." +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153 +msgid "Please note: this needs manual 'msmtp' package installation and setup." +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141 +msgid "Please note: this needs manual 'tcpdump-mini' package installation." msgstr "" #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:52 msgid "Query" msgstr "Interrogazione" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:25 msgid "Query domains" msgstr "Interrogazione domini" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165 msgid "" "Raise the minimum email notification count, to get emails if the overall " "count is less or equal to the given limit (default 0)," msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113 msgid "" "Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp " "and tcp protocol on ports 53, 853 and 5353." @@ -310,6 +394,38 @@ msgstr "" msgid "Refresh Blocklist Sources" msgstr "" +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:230 +msgid "Refresh Report" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:201 +msgid "Report Chunk Count" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206 +msgid "Report Chunk Size" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:144 +msgid "Report Directory" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192 +msgid "Report Interface" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:202 +msgid "Report chunk count used by tcpdump (default '5')." +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207 +msgid "Report chunk size used by tcpdump in MB (default '1')." +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193 +msgid "Reporting interface used by tcpdump (default 'br-lan')." +msgstr "" + #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31 msgid "Resume" msgstr "Riprendi" @@ -318,7 +434,7 @@ msgstr "Riprendi" msgid "Runtime Information" msgstr "Informazione di Runtime" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:74 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80 msgid "SSL req." msgstr "Ric. SSL" @@ -328,25 +444,29 @@ msgstr "Ric. SSL" msgid "Save" msgstr "Salva" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152 msgid "" "Send notification emails in case of a processing error or if domain count is " "≤ 0." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106 msgid "" "Set the nice level to 'low priority' and the adblock background processing " "will take less resources from the system." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:133 msgid "" "Size of the download queue to handle downloads & list processing in " -"parallel (default '4')." +"parallel (default '8')." +msgstr "" + +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:205 +msgid "Start Date" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:45 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47 msgid "Startup Trigger" msgstr "Innesco d'Avvio" @@ -360,13 +480,19 @@ msgstr "Sospendi" msgid "Suspend / Resume Adblock" msgstr "Sospendi / Riprendi Adblock" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121 msgid "" -"Target directory for adblock backups. Please use only non-volatile disks, e." +"Target directory for adblock backups. Please use only a non-volatile disk, e." "g. an external usb stick." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:145 +msgid "" +"Target directory for dns related report files. Please use preferably a non-" +"volatile disk, e.g. an external usb stick." +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172 msgid "Target directory for the generated blocklist 'adb_list.overall'." msgstr "Directory per la lista di blocco generata 'adb_list.overall'." @@ -380,7 +506,7 @@ msgstr "" msgid "The syslog output, pre-filtered for adblock related messages only." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:107 msgid "This change requires a manual service stop/re-start to take effect." msgstr "" @@ -410,7 +536,12 @@ msgstr "" "Questo form ti consente di interrogare le liste di blocco attive per " "determinati domini, p.e. per metterli nella lista bianca." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Time" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:27 msgid "" "To overwrite the default path use the 'DNS Directory' option in the extra " "section below." @@ -418,38 +549,49 @@ msgstr "" "Per sovrascrivere il percorso di default usa l'opzione 'Directory DNS' nella " "sezione aggiuntiva sotto." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:236 +msgid "Top 10 Reporting" +msgstr "" + +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:217 +msgid "Total DNS Queries" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182 msgid "Trigger Delay" msgstr "Ritardo Innesco" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101 msgid "Verbose Debug Logging" msgstr "Registro di Debug Dettagliato" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:19 -msgid "View Logfile" -msgstr "Vedi Registro" - #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:22 msgid "Waiting for command to complete..." msgstr "Aspettando che il comando venga completato..." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:102 +msgid "Whitelist" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176 msgid "Whitelist File" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84 msgid "Yes" msgstr "Sì" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:145 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160 msgid "" -"You can use this restrictive blocklist manually e.g. for guest wifi or " -"kidsafe configurations." +"You can use this restrictive blocklist e.g. for guest wifi or kidsafe " +"configurations." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:166 msgid "" "e.g. to receive an email notification with every adblock update set this " "value to 150000." msgstr "" + +#~ msgid "View Logfile" +#~ msgstr "Vedi Registro" diff --git a/applications/luci-app-adblock/po/ja/adblock.po b/applications/luci-app-adblock/po/ja/adblock.po index 442a13138b..a956d63869 100644 --- a/applications/luci-app-adblock/po/ja/adblock.po +++ b/applications/luci-app-adblock/po/ja/adblock.po @@ -8,14 +8,14 @@ msgstr "" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.1.1\n" +"X-Generator: Poedit 2.2\n" "Language: ja\n" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:143 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158 msgid "'Jail' Blocklist Creation" msgstr "'Jail' ブロックリストの作成" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:68 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:74 msgid "" "<b>Caution:</b> To prevent OOM exceptions on low memory devices with less " "than 64 MB free RAM, please only select a few of them!" @@ -23,8 +23,13 @@ msgstr "" "<b>警告:</b> RAM の空き容量が 64MB に満たないメモリー容量の小さいデバイスで" "は、 OutOfMemory (OOM) 例外を防ぐために少数のみを選択してください。" +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:86 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Action" +msgstr "アクション" + #: applications/luci-app-adblock/luasrc/controller/adblock.lua:17 -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:9 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11 msgid "Adblock" msgstr "Adblock" @@ -36,27 +41,45 @@ msgstr "Adblock ステータス" msgid "Adblock Version" msgstr "Adblock バージョン" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183 msgid "Additional trigger delay in seconds before adblock processing begins." msgstr "Adblock の処理が開始されるまでの、追加の遅延時間（秒）です。" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:21 msgid "Advanced" msgstr "詳細設定" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:85 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Answer" +msgstr "回答" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:92 msgid "Archive Categories" msgstr "アーカイブ カテゴリ" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120 msgid "Backup Directory" msgstr "バックアップ先 ディレクトリ" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127 msgid "Backup Mode" msgstr "バックアップ モード" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:67 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106 +msgid "Blacklist" +msgstr "ブラックリスト" + +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:223 +msgid "Blocked DNS Queries" +msgstr "ブロックされた DNS クエリ" + +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:30 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:73 +msgid "Blocked Domain" +msgstr "ブロックされたドメイン" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73 msgid "Blocklist Sources" msgstr "ブロックリスト提供元" @@ -64,7 +87,7 @@ msgstr "ブロックリスト提供元" msgid "Blocklist not found!" msgstr "ブロックリストが見つかりません！" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:144 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:159 msgid "" "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all " "domains except those listed in the whitelist file." @@ -72,7 +95,7 @@ msgstr "" "ホワイトリストに列挙されたものを除く全てのドメインをブロックする、追加の " "'Jail' リスト (/tmp/adb_list.jail) を作成します。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:49 msgid "" "Choose 'none' to disable automatic startups, 'timed' to use a classic " "timeout (default 30 sec.) or select another trigger interface." @@ -81,18 +104,32 @@ msgstr "" "秒）を使用するには 'timed' を選択してください。または、他のトリガとなるイン" "ターフェースを選択してください。" +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:83 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Client" +msgstr "クライアント" + #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:59 msgid "Collecting data..." msgstr "データ収集中です..." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:10 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12 msgid "" "Configuration of the adblock package to block ad/abuse domains by using DNS." msgstr "" "DNS の利用によって広告/不正ドメインをブロックする、Adblock パッケージの設定で" "す。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:119 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:25 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:27 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:29 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:68 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:70 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:72 +msgid "Count" +msgstr "カウント" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117 msgid "" "Create compressed blocklist backups, they will be used in case of download " "errors or during startup in backup mode." @@ -101,20 +138,29 @@ msgstr "" "ロードがエラーの場合、またはバックアップ モードでサービスを起動した場合に使用" "されます。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:23 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25 #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159 msgid "DNS Backend (DNS Directory)" msgstr "DNS バックエンド（DNS ディレクトリ）" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:171 msgid "DNS Directory" msgstr "DNS ディレクトリ" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:19 +msgid "DNS Query Report" +msgstr "DNS クエリ レポート" + +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:81 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Date" +msgstr "日付" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90 msgid "Description" msgstr "説明" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:131 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128 msgid "" "Do not automatically update blocklists during startup, use blocklist backups " "instead." @@ -122,7 +168,14 @@ msgstr "" "サービス起動時にブロックリストを自動的に更新せず、代わりにバックアップされた" "ブロックリストを使用します。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:71 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:84 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Domain" +msgstr "ドメイン" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36 msgid "Download Utility" msgstr "ダウンロード ユーティリティ" @@ -130,35 +183,39 @@ msgstr "ダウンロード ユーティリティ" msgid "Download Utility (SSL Library)" msgstr "ダウンロード ユーティリティ（SSL ライブラリ）" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:21 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22 msgid "Edit Blacklist" msgstr "ブラックリストの編集" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:23 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24 msgid "Edit Configuration" msgstr "設定の編集" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:23 msgid "Edit Whitelist" msgstr "ホワイトリストの編集" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:151 msgid "Email Notification" msgstr "メール通知" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164 msgid "Email Notification Count" msgstr "メール通知カウント" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:19 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:21 msgid "Enable Adblock" msgstr "Adblock の有効化" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:118 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116 msgid "Enable Blocklist Backup" msgstr "ブロックリスト バックアップの有効化" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:114 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139 +msgid "Enable DNS Query Report" +msgstr "DNS クエリ レポートの有効化" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212 msgid "" "Enable memory intense overall sort / duplicate removal on low memory devices " "(< 64 MB free RAM)" @@ -166,28 +223,32 @@ msgstr "" "メモリー容量の少ないデバイス（RAM 空き領域 64MB 未満）において、一時ファイル" "内の全体的なソート及び重複の除去を有効にします。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102 msgid "Enable verbose debug logging in case of any processing error." msgstr "" "何らかの処理エラーが発生した場合に、詳細なデバッグ ログを有効にします。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:71 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77 msgid "Enabled" msgstr "有効" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:92 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:211 +msgid "End Date" +msgstr "終了日" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98 msgid "Extra Options" msgstr "拡張オプション" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187 msgid "Flush DNS Cache" msgstr "DNS キャッシュのクリア" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:150 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188 msgid "Flush DNS Cache after adblock processing." msgstr "Adblock 処理の後に DNS キャッシュをクリアします。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:13 msgid "" "For further information <a href=\"%s\" target=\"_blank\">check the online " "documentation</a>" @@ -195,7 +256,7 @@ msgstr "" "詳細な情報は <a href=\"%s\" target=\"_blank\">オンライン ドキュメント</a> を" "確認してください。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:138 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134 msgid "" "For further performance improvements you can raise this value, e.g. '8' or " "'16' should be safe." @@ -203,18 +264,26 @@ msgstr "" "パフォーマンスの更なる改善のため、安全と思われる '8' や '16' などの値に引き上" "げることができます。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112 msgid "Force Local DNS" msgstr "ローカル DNS の強制" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211 msgid "Force Overall Sort" msgstr "全体ソートの強制" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:177 msgid "Full path to the whitelist file." msgstr "ホワイトリスト ファイルへのフルパスです。" +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140 +msgid "" +"Gather dns related network traffic via tcpdump to provide a DNS Query Report " +"on demand." +msgstr "" +"tcpdump によって DNS 関連のネットワークトラフィックを収集し、 オンデマンドの" +"DNS クエリレポートを提供します。" + #: applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua:10 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/configuration_tab.lua:9 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua:10 @@ -225,7 +294,11 @@ msgstr "入力ファイルが見つかりません。設定を確認してくだ msgid "Last Run" msgstr "最終実行" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:241 +msgid "Latest DNS Queries" +msgstr "最新の DNS クエリ" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48 msgid "" "List of available network interfaces. Usually the startup will be triggered " "by the 'wan' interface." @@ -233,35 +306,45 @@ msgstr "" "利用可能なネットワーク インターフェースの一覧です。通常、スタートアップは " "'wan' インターフェースによってトリガされます。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:26 msgid "" "List of supported DNS backends with their default list export directory." msgstr "" "サポートされる DNS バックエンドと、それぞれのデフォルトのリスト出力先の一覧で" "す。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:37 msgid "List of supported and fully pre-configured download utilities." msgstr "サポートされ、かつ設定済のダウンロード ユーティリティの一覧です。" #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:21 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:148 #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90 msgid "Loading" msgstr "読込中" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:100 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20 +msgid "Logfile" +msgstr "ログファイル" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105 msgid "Low Priority Service" msgstr "低優先度サービス" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:132 msgid "Max. Download Queue" msgstr "ダウンロード キューの上限" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:26 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:69 +msgid "Name / IP-Address" +msgstr "名前 / IP アドレス" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86 msgid "No" msgstr "いいえ" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:93 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:99 msgid "" "Options for further tweaking in case the defaults are not suitable for you." msgstr "デフォルト設定が適切でない場合、追加で設定するためのオプションです。" @@ -290,21 +373,26 @@ msgstr "" msgid "Please edit this file directly in a terminal session." msgstr "ターミナル セッションで直接このファイルを編集してください。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156 -msgid "" -"Please note: this needs additional 'msmtp' package installation and setup." +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153 +msgid "Please note: this needs manual 'msmtp' package installation and setup." +msgstr "" +"注意: これは手動での 'msmtp' パッケージのインストールとセットアップを必要とし" +"ます。" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141 +msgid "Please note: this needs manual 'tcpdump-mini' package installation." msgstr "" -"注意: これには、追加で 'msmtp' のインストールとセットアップが必要です。" +"注意: これは手動での 'tcpdump-mini' パッケージのインストールを必要とします。" #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:52 msgid "Query" msgstr "検索" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:25 msgid "Query domains" msgstr "ドメインの検索" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165 msgid "" "Raise the minimum email notification count, to get emails if the overall " "count is less or equal to the given limit (default 0)," @@ -312,7 +400,7 @@ msgstr "" "メール通知を行うメール通知カウントの下限値を設定します。全体カウントが指定さ" "れた値以下の場合、メールを受け取ります（規定値: 0）。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113 msgid "" "Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp " "and tcp protocol on ports 53, 853 and 5353." @@ -331,6 +419,40 @@ msgstr "リフレッシュ" msgid "Refresh Blocklist Sources" msgstr "ブロックリスト提供元のリフレッシュ" +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:230 +msgid "Refresh Report" +msgstr "レポートをリフレッシュ" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:201 +msgid "Report Chunk Count" +msgstr "レポート チャンクカウント" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206 +msgid "Report Chunk Size" +msgstr "レポート チャンクサイズ" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:144 +msgid "Report Directory" +msgstr "レポート ディレクトリ" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192 +msgid "Report Interface" +msgstr "レポート インターフェース" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:202 +msgid "Report chunk count used by tcpdump (default '5')." +msgstr "tcpdump により使用される、レポートチャンク数です。（規定値: '5'）" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207 +msgid "Report chunk size used by tcpdump in MB (default '1')." +msgstr "tcpdump により使用される、レポート チャンクサイズです。（規定値: '1'）" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193 +msgid "Reporting interface used by tcpdump (default 'br-lan')." +msgstr "" +"tcpdump により使用される、レポートを行うインターフェースです。（規定値: 'br-" +"lan'）" + #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31 msgid "Resume" msgstr "再開" @@ -339,7 +461,7 @@ msgstr "再開" msgid "Runtime Information" msgstr "実行情報" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:74 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80 msgid "SSL req." msgstr "SSL 必須" @@ -349,14 +471,14 @@ msgstr "SSL 必須" msgid "Save" msgstr "保存" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152 msgid "" "Send notification emails in case of a processing error or if domain count is " "≤ 0." msgstr "" "処理エラーまたはドメイン カウントが 0 以下の場合、通知メールを送信します。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106 msgid "" "Set the nice level to 'low priority' and the adblock background processing " "will take less resources from the system." @@ -364,15 +486,19 @@ msgstr "" "nice値（優先度）を '低優先度' に設定し、adblock バックグラウンド処理のシステ" "ムリソース使用量を抑制します。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:133 msgid "" "Size of the download queue to handle downloads & list processing in " -"parallel (default '4')." +"parallel (default '8')." msgstr "" -"ダウンロードの制御とリストの処理を同時並行的に行うダウンロード キューのサイズ" -"です（規定値: '4'）。" +"ダウンロードの制御とリストの処理を同時並行的に行う、ダウンロードキューのサイ" +"ズです。（規定値: '8'）" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:45 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:205 +msgid "Start Date" +msgstr "開始日" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47 msgid "Startup Trigger" msgstr "スタートアップ トリガ" @@ -386,15 +512,23 @@ msgstr "一時停止" msgid "Suspend / Resume Adblock" msgstr "Adblock の一時停止 / 再開" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121 msgid "" -"Target directory for adblock backups. Please use only non-volatile disks, e." +"Target directory for adblock backups. Please use only a non-volatile disk, e." "g. an external usb stick." msgstr "" -"Adblock バックアップの保存先ディレクトリです。 外部 USB フラッシュメモリなど" -"の不揮発性ドライブのみを使用してください。" +"adblock バックアップの保存先ディレクトリです。不揮発性ディスクのみを使用して" +"ください。（例: 外部 USB スティック）" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:145 +msgid "" +"Target directory for dns related report files. Please use preferably a non-" +"volatile disk, e.g. an external usb stick." +msgstr "" +"DNS 関連レポートファイルの保存先ディレクトリです。可能であれば不揮発性ディス" +"クを使用してください。（例: 外部 USB スティック）" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172 msgid "Target directory for the generated blocklist 'adb_list.overall'." msgstr "生成されたブロックリスト 'adb_list.overall' の保存先ディレクトリです。" @@ -410,7 +544,7 @@ msgstr "" msgid "The syslog output, pre-filtered for adblock related messages only." msgstr "Adblock に関連するメッセージのみが抽出された、システムログ出力です。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:107 msgid "This change requires a manual service stop/re-start to take effect." msgstr "この変更の反映には、手動でのサービスの停止 / 再起動が必要です。" @@ -444,7 +578,12 @@ msgstr "" "このフォームでは、現在有効なリスト内で特定のドメインを検索することができま" "す。例: ホワイトリスト内" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Time" +msgstr "時刻" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:27 msgid "" "To overwrite the default path use the 'DNS Directory' option in the extra " "section below." @@ -452,39 +591,47 @@ msgstr "" "デフォルトのパスを上書きするには、下記拡張セクションの 'DNS ディレクトリ' オ" "プションを使用します。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:236 +msgid "Top 10 Reporting" +msgstr "上位 10 レポート" + +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:217 +msgid "Total DNS Queries" +msgstr "総 DNS クエリ" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182 msgid "Trigger Delay" msgstr "トリガ遅延" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101 msgid "Verbose Debug Logging" msgstr "詳細なデバッグ ログ" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:19 -msgid "View Logfile" -msgstr "ログファイルを見る" - #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:22 msgid "Waiting for command to complete..." msgstr "コマンド実行中です..." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:102 +msgid "Whitelist" +msgstr "ホワイトリスト" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176 msgid "Whitelist File" msgstr "ホワイトリスト ファイル" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84 msgid "Yes" msgstr "はい" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:145 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160 msgid "" -"You can use this restrictive blocklist manually e.g. for guest wifi or " -"kidsafe configurations." +"You can use this restrictive blocklist e.g. for guest wifi or kidsafe " +"configurations." msgstr "" "この制約の厳しいブロックリストを、ゲスト WiFi や子供の安全を守る設定などに手" "動で利用することができます。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:166 msgid "" "e.g. to receive an email notification with every adblock update set this " "value to 150000." diff --git a/applications/luci-app-adblock/po/pt-br/adblock.po b/applications/luci-app-adblock/po/pt-br/adblock.po index 3a0658b74b..1146dd7164 100644 --- a/applications/luci-app-adblock/po/pt-br/adblock.po +++ b/applications/luci-app-adblock/po/pt-br/adblock.po @@ -12,11 +12,11 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "Language: pt_BR\n" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:143 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158 msgid "'Jail' Blocklist Creation" msgstr "'Enjaule' Criação de Lista Negra" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:68 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:74 msgid "" "<b>Caution:</b> To prevent OOM exceptions on low memory devices with less " "than 64 MB free RAM, please only select a few of them!" @@ -24,8 +24,13 @@ msgstr "" "<b>Cudiado:</b> Selecione apenas alguns para evitar erros de falta de " "memória em dispositivos com menos que 64MB de RAM livres!" +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:86 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Action" +msgstr "" + #: applications/luci-app-adblock/luasrc/controller/adblock.lua:17 -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:9 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11 msgid "Adblock" msgstr "Adblock" @@ -37,29 +42,47 @@ msgstr "Estado do Adblock" msgid "Adblock Version" msgstr "Versão do Adblock" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183 msgid "Additional trigger delay in seconds before adblock processing begins." msgstr "" "Atraso de gatilho adicional em segundos antes do processamento do adblock " "começar." -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:21 msgid "Advanced" msgstr "Avançado" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:85 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Answer" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:92 msgid "Archive Categories" msgstr "Categorias Arquivadas" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120 msgid "Backup Directory" msgstr "Diretório da cópia de segurança" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127 msgid "Backup Mode" msgstr "Modo de Backup" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:67 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106 +msgid "Blacklist" +msgstr "" + +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:223 +msgid "Blocked DNS Queries" +msgstr "" + +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:30 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:73 +msgid "Blocked Domain" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73 msgid "Blocklist Sources" msgstr "Fontes de listas de bloqueio" @@ -67,7 +90,7 @@ msgstr "Fontes de listas de bloqueio" msgid "Blocklist not found!" msgstr "Lista preta não encontrada!" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:144 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:159 msgid "" "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all " "domains except those listed in the whitelist file." @@ -75,7 +98,7 @@ msgstr "" "Cria uma lista adicional (/tmp/adb_list.jail) para bloquear o acesso a todos " "os domínios exceto aqueles listados na lista branca." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:49 msgid "" "Choose 'none' to disable automatic startups, 'timed' to use a classic " "timeout (default 30 sec.) or select another trigger interface." @@ -84,18 +107,32 @@ msgstr "" "usar o estouro de tempo clássico (padrão 30 segundos) ou outro gatilho pela " "interface." +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:83 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Client" +msgstr "" + #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:59 msgid "Collecting data..." msgstr "Coletando dados..." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:10 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12 msgid "" "Configuration of the adblock package to block ad/abuse domains by using DNS." msgstr "" "Configuração do pacote adblock para bloquear, usando o DNS, domínios que " "distribuem propagandas abusivas." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:119 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:25 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:27 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:29 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:68 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:70 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:72 +msgid "Count" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117 msgid "" "Create compressed blocklist backups, they will be used in case of download " "errors or during startup in backup mode." @@ -104,20 +141,29 @@ msgstr "" "usadas em caso de falha ao baixar novas listas ou ao iniciar em modo de " "backup." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:23 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25 #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159 msgid "DNS Backend (DNS Directory)" msgstr "Serviço DNS (Diretório DNS)" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:171 msgid "DNS Directory" msgstr "Diretório DNS" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:19 +msgid "DNS Query Report" +msgstr "" + +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:81 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Date" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90 msgid "Description" msgstr "Descrição" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:131 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128 msgid "" "Do not automatically update blocklists during startup, use blocklist backups " "instead." @@ -125,7 +171,14 @@ msgstr "" "Não atualize as listas de bloqueio automaticamente durante o início, use o " "backup das listas como alternativa." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:71 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:84 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Domain" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36 msgid "Download Utility" msgstr "Ferramenta para Baixar" @@ -133,35 +186,39 @@ msgstr "Ferramenta para Baixar" msgid "Download Utility (SSL Library)" msgstr "Utilitário de Download (Biblioteca SSL)" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:21 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22 msgid "Edit Blacklist" msgstr "Editar Lista de Bloqueio" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:23 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24 msgid "Edit Configuration" msgstr "Editar Configuração" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:23 msgid "Edit Whitelist" msgstr "Editar Lista Permitida" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:151 msgid "Email Notification" msgstr "Notificação por Email" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164 msgid "Email Notification Count" msgstr "Quantidade para Notificação por Email" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:19 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:21 msgid "Enable Adblock" msgstr "Habilitar adblock" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:118 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116 msgid "Enable Blocklist Backup" msgstr "Habilitar cópia de segurança da lista de bloqueio" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:114 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139 +msgid "Enable DNS Query Report" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212 msgid "" "Enable memory intense overall sort / duplicate removal on low memory devices " "(< 64 MB free RAM)" @@ -169,29 +226,33 @@ msgstr "" "Habilita a remoção de entradas duplicadas em dispositivos com pouca memória " "(< 64 MB de memória RAM livre)" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102 msgid "Enable verbose debug logging in case of any processing error." msgstr "" "Habilita os registros de depuração detalhados em caso de qualquer erro de " "processamento." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:71 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77 msgid "Enabled" msgstr "Habilitado" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:92 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:211 +msgid "End Date" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98 msgid "Extra Options" msgstr "Opções adicionais" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187 msgid "Flush DNS Cache" msgstr "Limpar cache DNS" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:150 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188 msgid "Flush DNS Cache after adblock processing." msgstr "Limpar cache DNS depois do processamento do adblock." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:13 msgid "" "For further information <a href=\"%s\" target=\"_blank\">check the online " "documentation</a>" @@ -199,7 +260,7 @@ msgstr "" "Para mais informações <a href=\"%s\" target=\"_blank\">veja a documentação " "externa</a>" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:138 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134 msgid "" "For further performance improvements you can raise this value, e.g. '8' or " "'16' should be safe." @@ -207,18 +268,24 @@ msgstr "" "Para melhoramentos no desempenho, você pode aumentar este valor (ex: '8' ou " "'16' deve ser seguro)." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112 msgid "Force Local DNS" msgstr "Force o DNS local" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211 msgid "Force Overall Sort" msgstr "Force Tipo Geral" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:177 msgid "Full path to the whitelist file." msgstr "Caminho completo para a lista branca." +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140 +msgid "" +"Gather dns related network traffic via tcpdump to provide a DNS Query Report " +"on demand." +msgstr "" + #: applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua:10 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/configuration_tab.lua:9 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua:10 @@ -229,7 +296,11 @@ msgstr "Arquivo de entrada não encontrado, por favor cheque sua configuração. msgid "Last Run" msgstr "Última Execução" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:241 +msgid "Latest DNS Queries" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48 msgid "" "List of available network interfaces. Usually the startup will be triggered " "by the 'wan' interface." @@ -237,35 +308,45 @@ msgstr "" "Lista das interfaces de redes disponíveis. Normalmente, o início será " "desencadeado pela interface 'wan'." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:26 msgid "" "List of supported DNS backends with their default list export directory." msgstr "" "Lista dos serviços DNS suportados com seu diretório padrão de exportação de " "lista." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:37 msgid "List of supported and fully pre-configured download utilities." msgstr "Lista de ferramentas suportadas para baixar listas." #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:21 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:148 #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90 msgid "Loading" msgstr "Carregando" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:100 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20 +msgid "Logfile" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105 msgid "Low Priority Service" msgstr "Serviço de Baixa Prioridade" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:132 msgid "Max. Download Queue" msgstr "Tamanho Máximo da Fila" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:26 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:69 +msgid "Name / IP-Address" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86 msgid "No" msgstr "Não" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:93 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:99 msgid "" "Options for further tweaking in case the defaults are not suitable for you." msgstr "" @@ -296,20 +377,23 @@ msgstr "" msgid "Please edit this file directly in a terminal session." msgstr "Por favor edite esse arquivo direto em uma sessão de terminal." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156 -msgid "" -"Please note: this needs additional 'msmtp' package installation and setup." -msgstr "Nota: isto exige a instalação e configuração do pacote 'msmtp'." +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153 +msgid "Please note: this needs manual 'msmtp' package installation and setup." +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141 +msgid "Please note: this needs manual 'tcpdump-mini' package installation." +msgstr "" #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:52 msgid "Query" msgstr "Consulta" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:25 msgid "Query domains" msgstr "Consulta de domínios" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165 msgid "" "Raise the minimum email notification count, to get emails if the overall " "count is less or equal to the given limit (default 0)," @@ -317,7 +401,7 @@ msgstr "" "Aumente a quantidade mínima para notificar por email para receber mensagens " "se a contagem total for menos ou igual a este limite (padrão 0)." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113 msgid "" "Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp " "and tcp protocol on ports 53, 853 and 5353." @@ -336,6 +420,38 @@ msgstr "Atualizar" msgid "Refresh Blocklist Sources" msgstr "Atualizar as Fontes de Lista Negra" +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:230 +msgid "Refresh Report" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:201 +msgid "Report Chunk Count" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206 +msgid "Report Chunk Size" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:144 +msgid "Report Directory" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192 +msgid "Report Interface" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:202 +msgid "Report chunk count used by tcpdump (default '5')." +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207 +msgid "Report chunk size used by tcpdump in MB (default '1')." +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193 +msgid "Reporting interface used by tcpdump (default 'br-lan')." +msgstr "" + #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31 msgid "Resume" msgstr "Continuar" @@ -344,7 +460,7 @@ msgstr "Continuar" msgid "Runtime Information" msgstr "Informação de execução" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:74 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80 msgid "SSL req." msgstr "Req. de SSL" @@ -354,7 +470,7 @@ msgstr "Req. de SSL" msgid "Save" msgstr "Salvar" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152 msgid "" "Send notification emails in case of a processing error or if domain count is " "≤ 0." @@ -362,7 +478,7 @@ msgstr "" "Enviar notificações por email se ocorrer um erro de processamento ou se a " "contagem por domínio for menor que 0." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106 msgid "" "Set the nice level to 'low priority' and the adblock background processing " "will take less resources from the system." @@ -370,15 +486,17 @@ msgstr "" "Define o nível de prioridade para 'baixa', reduzindo o impacto do " "processamento em segundo plano do adblock no seu sistema." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:133 msgid "" "Size of the download queue to handle downloads & list processing in " -"parallel (default '4')." +"parallel (default '8')." +msgstr "" + +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:205 +msgid "Start Date" msgstr "" -"Tamanho da fila responsável por baixar e processamento em paralelo (padrão " -"'4')." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:45 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47 msgid "Startup Trigger" msgstr "Gatilho de Iniciação" @@ -392,15 +510,19 @@ msgstr "Suspender" msgid "Suspend / Resume Adblock" msgstr "Suspender / Resumir adblock" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121 msgid "" -"Target directory for adblock backups. Please use only non-volatile disks, e." +"Target directory for adblock backups. Please use only a non-volatile disk, e." "g. an external usb stick." msgstr "" -"Diretório para cópias de segurança do adblock. Use somente destinos não " -"voláteis, como dispositivos de armazenamento USB." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:145 +msgid "" +"Target directory for dns related report files. Please use preferably a non-" +"volatile disk, e.g. an external usb stick." +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172 msgid "Target directory for the generated blocklist 'adb_list.overall'." msgstr "Diretório para a lista nega gerada 'adb_list.overall'." @@ -415,7 +537,7 @@ msgstr "" msgid "The syslog output, pre-filtered for adblock related messages only." msgstr "Mensagens do syslog relacionadas ao adblock." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:107 msgid "This change requires a manual service stop/re-start to take effect." msgstr "Esta mudança requer um reinício manual do serviço para ser efetivada." @@ -445,7 +567,12 @@ msgstr "" "Esse formulário permite que você consulte listas de blocos ativos para " "certos domínios, e.x. para listas de permissão." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Time" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:27 msgid "" "To overwrite the default path use the 'DNS Directory' option in the extra " "section below." @@ -453,42 +580,76 @@ msgstr "" "Para sobrescrever o caminho padrão, use a opção 'Diretório DNS' na seção " "extra abaixo." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:236 +msgid "Top 10 Reporting" +msgstr "" + +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:217 +msgid "Total DNS Queries" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182 msgid "Trigger Delay" msgstr "Atraso no gatilho" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101 msgid "Verbose Debug Logging" msgstr "Registros de Depuração Detalhados" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:19 -msgid "View Logfile" -msgstr "Ver arquivo de log" - #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:22 msgid "Waiting for command to complete..." msgstr "Aguardando por comando para completar..." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:102 +msgid "Whitelist" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176 msgid "Whitelist File" msgstr "Lista Branca" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84 msgid "Yes" msgstr "Sim" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:145 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160 msgid "" -"You can use this restrictive blocklist manually e.g. for guest wifi or " -"kidsafe configurations." +"You can use this restrictive blocklist e.g. for guest wifi or kidsafe " +"configurations." msgstr "" -"Você pode usar esta lista de bloqueio restritiva para, por exemplo, redes de " -"convidados ou para crianças." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:166 msgid "" "e.g. to receive an email notification with every adblock update set this " "value to 150000." msgstr "" "ex: para receber notificação por email a cada atualização do adblock, ajuste " "este valor para 150000." + +#~ msgid "" +#~ "Please note: this needs additional 'msmtp' package installation and setup." +#~ msgstr "Nota: isto exige a instalação e configuração do pacote 'msmtp'." + +#~ msgid "" +#~ "Size of the download queue to handle downloads & list processing in " +#~ "parallel (default '4')." +#~ msgstr "" +#~ "Tamanho da fila responsável por baixar e processamento em paralelo " +#~ "(padrão '4')." + +#~ msgid "" +#~ "Target directory for adblock backups. Please use only non-volatile disks, " +#~ "e.g. an external usb stick." +#~ msgstr "" +#~ "Diretório para cópias de segurança do adblock. Use somente destinos não " +#~ "voláteis, como dispositivos de armazenamento USB." + +#~ msgid "View Logfile" +#~ msgstr "Ver arquivo de log" + +#~ msgid "" +#~ "You can use this restrictive blocklist manually e.g. for guest wifi or " +#~ "kidsafe configurations." +#~ msgstr "" +#~ "Você pode usar esta lista de bloqueio restritiva para, por exemplo, redes " +#~ "de convidados ou para crianças." diff --git a/applications/luci-app-adblock/po/ru/adblock.po b/applications/luci-app-adblock/po/ru/adblock.po index dad07b7c65..3aed4fe7b9 100644 --- a/applications/luci-app-adblock/po/ru/adblock.po +++ b/applications/luci-app-adblock/po/ru/adblock.po @@ -15,11 +15,11 @@ msgstr "" "Project-Info: Это технический перевод, не дословный. Главное-удобный русский " "интерфейс, все проверялось в графическом режиме, совместим с другими apps\n" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:143 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158 msgid "'Jail' Blocklist Creation" msgstr "Создание Черного<br />списка 'Jail'" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:68 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:74 msgid "" "<b>Caution:</b> To prevent OOM exceptions on low memory devices with less " "than 64 MB free RAM, please only select a few of them!" @@ -27,8 +27,13 @@ msgstr "" "<b>Внимание:</b> Для предотвращения переполнения ОЗУ, на устройствахс ОЗУ " "менее 64MB, выбирайте только необходимый минимум списков!" +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:86 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Action" +msgstr "" + #: applications/luci-app-adblock/luasrc/controller/adblock.lua:17 -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:9 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11 msgid "Adblock" msgstr "AdBlock" @@ -40,27 +45,45 @@ msgstr "Состояние Adblock" msgid "Adblock Version" msgstr "Версия Adblock" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183 msgid "Additional trigger delay in seconds before adblock processing begins." msgstr "Дополнительная задержка в секундах до начала работы Adblock." -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:21 msgid "Advanced" msgstr "Дополнительно" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:85 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Answer" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:92 msgid "Archive Categories" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120 msgid "Backup Directory" msgstr "Папка для бэкапа" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127 msgid "Backup Mode" msgstr "Режим сохранения бекапа" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:67 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106 +msgid "Blacklist" +msgstr "" + +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:223 +msgid "Blocked DNS Queries" +msgstr "" + +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:30 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:73 +msgid "Blocked Domain" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73 msgid "Blocklist Sources" msgstr "Источники списков блокировок" @@ -68,13 +91,13 @@ msgstr "Источники списков блокировок" msgid "Blocklist not found!" msgstr "Список блокировок не найден!" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:144 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:159 msgid "" "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all " "domains except those listed in the whitelist file." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:49 msgid "" "Choose 'none' to disable automatic startups, 'timed' to use a classic " "timeout (default 30 sec.) or select another trigger interface." @@ -83,18 +106,32 @@ msgstr "" "использовать стандартную задержку (по умолчанию 30 сек.) или выберите другой " "интерфейс для запуска." +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:83 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Client" +msgstr "" + #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:59 msgid "Collecting data..." msgstr "Сбор данных..." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:10 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12 msgid "" "Configuration of the adblock package to block ad/abuse domains by using DNS." msgstr "" "Настройка Adblock. Приложения для блокировки ненадежных или добавления " "доверенных доменов используя DNS. " -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:119 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:25 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:27 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:29 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:68 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:70 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:72 +msgid "Count" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117 msgid "" "Create compressed blocklist backups, they will be used in case of download " "errors or during startup in backup mode." @@ -102,20 +139,29 @@ msgstr "" "Создание сжатых резервных копий списков блокировок, они будут использоваться " "в случае ошибок загрузки или при запуске в ручном режиме." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:23 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25 #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159 msgid "DNS Backend (DNS Directory)" msgstr "DNS бэкенд (папка DNS)" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:171 msgid "DNS Directory" msgstr "Папка DNS" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:19 +msgid "DNS Query Report" +msgstr "" + +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:81 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Date" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90 msgid "Description" msgstr "Описание" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:131 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128 msgid "" "Do not automatically update blocklists during startup, use blocklist backups " "instead." @@ -123,7 +169,14 @@ msgstr "" "Не обновлять списки блокировок автоматически во время запуска, вместо этого " "использовать резервные копии списков блокировок." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:71 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:84 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Domain" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36 msgid "Download Utility" msgstr "Утилита для скачивания" @@ -131,35 +184,39 @@ msgstr "Утилита для скачивания" msgid "Download Utility (SSL Library)" msgstr "Утилита для скачивания (с библиотекой SSL)" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:21 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22 msgid "Edit Blacklist" msgstr "Редактировать Черный список" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:23 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24 msgid "Edit Configuration" msgstr "Редактировать config файл" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:23 msgid "Edit Whitelist" msgstr "Редактировать Белый список" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:151 msgid "Email Notification" msgstr "Email уведомления" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164 msgid "Email Notification Count" msgstr "Кол-во email уведомлений" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:19 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:21 msgid "Enable Adblock" msgstr "Включить Adblock" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:118 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116 msgid "Enable Blocklist Backup" msgstr "Бэкап списка блокировок" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:114 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139 +msgid "Enable DNS Query Report" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212 msgid "" "Enable memory intense overall sort / duplicate removal on low memory devices " "(< 64 MB free RAM)" @@ -168,27 +225,31 @@ msgstr "" "устройствах с низким объемом памяти (< 64 MB свободной оперативной " "памяти)." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102 msgid "Enable verbose debug logging in case of any processing error." msgstr "Включить подробное ведение журнала отладки в случае ошибок обработки." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:71 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77 msgid "Enabled" msgstr "Включено" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:92 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:211 +msgid "End Date" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98 msgid "Extra Options" msgstr "Дополнительные настройки" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187 msgid "Flush DNS Cache" msgstr "Очистка кэша DNS" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:150 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188 msgid "Flush DNS Cache after adblock processing." msgstr "Очистка DNS-кэша после обработки Adblock-ом." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:13 msgid "" "For further information <a href=\"%s\" target=\"_blank\">check the online " "documentation</a>" @@ -196,7 +257,7 @@ msgstr "" "<br />Для получения дополнительной информации <a href=\"%s\" target=\"_blank" "\"> смотрите онлайн документацию</a>." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:138 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134 msgid "" "For further performance improvements you can raise this value, e.g. '8' or " "'16' should be safe." @@ -204,18 +265,24 @@ msgstr "" "Для дополнительного повышения производительности вы можете увеличить это " "значение, например значения '8' или '16' должны быть безопасными." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112 msgid "Force Local DNS" msgstr "Локальный DNS" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211 msgid "Force Overall Sort" msgstr "Принудительная полная сортировка" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:177 msgid "Full path to the whitelist file." msgstr "Полный путь к файлу Белого списка." +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140 +msgid "" +"Gather dns related network traffic via tcpdump to provide a DNS Query Report " +"on demand." +msgstr "" + #: applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua:10 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/configuration_tab.lua:9 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua:10 @@ -226,41 +293,55 @@ msgstr "Config файл не найден, настройте config файл." msgid "Last Run" msgstr "Последний запуск" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:241 +msgid "Latest DNS Queries" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48 msgid "" "List of available network interfaces. Usually the startup will be triggered " "by the 'wan' interface." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:26 msgid "" "List of supported DNS backends with their default list export directory." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:37 msgid "List of supported and fully pre-configured download utilities." msgstr "" "Список поддерживаемых и полностью предварительно настроенных утилит для " "скачивания." #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:21 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:148 #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90 msgid "Loading" msgstr "Загрузка" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:100 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20 +msgid "Logfile" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105 msgid "Low Priority Service" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:132 msgid "Max. Download Queue" msgstr "Максимальная очередь загрузки" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:26 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:69 +msgid "Name / IP-Address" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86 msgid "No" msgstr "Нет" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:93 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:99 msgid "" "Options for further tweaking in case the defaults are not suitable for you." msgstr "" @@ -290,26 +371,29 @@ msgstr "" msgid "Please edit this file directly in a terminal session." msgstr "Редактируйте данный файл только в терминале." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156 -msgid "" -"Please note: this needs additional 'msmtp' package installation and setup." -msgstr "Внимание: это потребует дополнительной установки пакета 'msmtp'." +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153 +msgid "Please note: this needs manual 'msmtp' package installation and setup." +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141 +msgid "Please note: this needs manual 'tcpdump-mini' package installation." +msgstr "" #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:52 msgid "Query" msgstr "Запрос" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:25 msgid "Query domains" msgstr "Запрос доменов" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165 msgid "" "Raise the minimum email notification count, to get emails if the overall " "count is less or equal to the given limit (default 0)," msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113 msgid "" "Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp " "and tcp protocol on ports 53, 853 and 5353." @@ -326,6 +410,38 @@ msgstr "" msgid "Refresh Blocklist Sources" msgstr "" +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:230 +msgid "Refresh Report" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:201 +msgid "Report Chunk Count" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206 +msgid "Report Chunk Size" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:144 +msgid "Report Directory" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192 +msgid "Report Interface" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:202 +msgid "Report chunk count used by tcpdump (default '5')." +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207 +msgid "Report chunk size used by tcpdump in MB (default '1')." +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193 +msgid "Reporting interface used by tcpdump (default 'br-lan')." +msgstr "" + #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31 msgid "Resume" msgstr "Возобновить" @@ -334,7 +450,7 @@ msgstr "Возобновить" msgid "Runtime Information" msgstr "Информация о состоянии" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:74 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80 msgid "SSL req." msgstr "Запрос SSL" @@ -344,25 +460,29 @@ msgstr "Запрос SSL" msgid "Save" msgstr "Сохранить" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152 msgid "" "Send notification emails in case of a processing error or if domain count is " "≤ 0." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106 msgid "" "Set the nice level to 'low priority' and the adblock background processing " "will take less resources from the system." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:133 msgid "" "Size of the download queue to handle downloads & list processing in " -"parallel (default '4')." +"parallel (default '8')." +msgstr "" + +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:205 +msgid "Start Date" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:45 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47 msgid "Startup Trigger" msgstr "Триггер запуска" @@ -376,15 +496,19 @@ msgstr "Приостановить" msgid "Suspend / Resume Adblock" msgstr "Приостановить / Возобновить Adblock" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121 msgid "" -"Target directory for adblock backups. Please use only non-volatile disks, e." +"Target directory for adblock backups. Please use only a non-volatile disk, e." "g. an external usb stick." msgstr "" -"Папка для бэкапов списков блокировок. Используйте такие накопители, как usb " -"флешка." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:145 +msgid "" +"Target directory for dns related report files. Please use preferably a non-" +"volatile disk, e.g. an external usb stick." +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172 msgid "Target directory for the generated blocklist 'adb_list.overall'." msgstr "Папка для созданного списка блокировки 'adb_list.overall'." @@ -400,7 +524,7 @@ msgstr "" msgid "The syslog output, pre-filtered for adblock related messages only." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:107 msgid "This change requires a manual service stop/re-start to take effect." msgstr "" @@ -430,7 +554,12 @@ msgstr "" "Данное поле позволяет запросить домены для конкретных списков, например для " "Белого списка." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Time" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:27 msgid "" "To overwrite the default path use the 'DNS Directory' option in the extra " "section below." @@ -438,42 +567,69 @@ msgstr "" "Чтобы заменить путь по умолчанию, используйте пункт 'Папка DNS' в разделе " "'Дополнительные настройки'." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:236 +msgid "Top 10 Reporting" +msgstr "" + +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:217 +msgid "Total DNS Queries" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182 msgid "Trigger Delay" msgstr "Задержка запуска" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101 msgid "Verbose Debug Logging" msgstr "Подробный журнал отладки" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:19 -msgid "View Logfile" -msgstr "Системный журнал" - #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:22 msgid "Waiting for command to complete..." msgstr "Ожидание завершения выполнения команды..." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:102 +msgid "Whitelist" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176 msgid "Whitelist File" msgstr "Файл Белого списка" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84 msgid "Yes" msgstr "Да" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:145 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160 msgid "" -"You can use this restrictive blocklist manually e.g. for guest wifi or " -"kidsafe configurations." +"You can use this restrictive blocklist e.g. for guest wifi or kidsafe " +"configurations." msgstr "" -"Вы можете вручную настраивать и использовать этот Черный список, например " -"для гостевой wifi сети или режима родительского контроля." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:166 msgid "" "e.g. to receive an email notification with every adblock update set this " "value to 150000." msgstr "" "например, чтобы получать email уведомления при каждом обновлении Adblock-а " "установите значение 150000." + +#~ msgid "" +#~ "Please note: this needs additional 'msmtp' package installation and setup." +#~ msgstr "Внимание: это потребует дополнительной установки пакета 'msmtp'." + +#~ msgid "" +#~ "Target directory for adblock backups. Please use only non-volatile disks, " +#~ "e.g. an external usb stick." +#~ msgstr "" +#~ "Папка для бэкапов списков блокировок. Используйте такие накопители, как " +#~ "usb флешка." + +#~ msgid "View Logfile" +#~ msgstr "Системный журнал" + +#~ msgid "" +#~ "You can use this restrictive blocklist manually e.g. for guest wifi or " +#~ "kidsafe configurations." +#~ msgstr "" +#~ "Вы можете вручную настраивать и использовать этот Черный список, например " +#~ "для гостевой wifi сети или режима родительского контроля." diff --git a/applications/luci-app-adblock/po/sv/adblock.po b/applications/luci-app-adblock/po/sv/adblock.po index 811182f421..6a934a2394 100644 --- a/applications/luci-app-adblock/po/sv/adblock.po +++ b/applications/luci-app-adblock/po/sv/adblock.po @@ -1,18 +1,23 @@ msgid "" msgstr "Content-Type: text/plain; charset=UTF-8\n" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:143 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158 msgid "'Jail' Blocklist Creation" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:68 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:74 msgid "" "<b>Caution:</b> To prevent OOM exceptions on low memory devices with less " "than 64 MB free RAM, please only select a few of them!" msgstr "" +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:86 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Action" +msgstr "" + #: applications/luci-app-adblock/luasrc/controller/adblock.lua:17 -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:9 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11 msgid "Adblock" msgstr "Adblock" @@ -24,27 +29,45 @@ msgstr "Status för Adblock" msgid "Adblock Version" msgstr "Version av Adblock" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183 msgid "Additional trigger delay in seconds before adblock processing begins." msgstr "" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:21 msgid "Advanced" msgstr "Avancerat" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:85 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Answer" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:92 msgid "Archive Categories" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120 msgid "Backup Directory" msgstr "Säkerhetskopiera mapp" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127 msgid "Backup Mode" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:67 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106 +msgid "Blacklist" +msgstr "" + +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:223 +msgid "Blocked DNS Queries" +msgstr "" + +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:30 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:73 +msgid "Blocked Domain" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73 msgid "Blocklist Sources" msgstr "Källor för blockeringslistor" @@ -52,13 +75,13 @@ msgstr "Källor för blockeringslistor" msgid "Blocklist not found!" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:144 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:159 msgid "" "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all " "domains except those listed in the whitelist file." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:49 msgid "" "Choose 'none' to disable automatic startups, 'timed' to use a classic " "timeout (default 30 sec.) or select another trigger interface." @@ -67,37 +90,60 @@ msgstr "" "använda ett klassiskt avbrott (30 sek. är standard) eller välj ett annat " "utlösande gränssnitt." +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:83 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Client" +msgstr "" + #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:59 msgid "Collecting data..." msgstr "Samlar in data..." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:10 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12 msgid "" "Configuration of the adblock package to block ad/abuse domains by using DNS." msgstr "" "Konfiguration av paketet adblock för att blockera annons/otillåtna domäner " "genom att använda DNS." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:119 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:25 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:27 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:29 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:68 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:70 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:72 +msgid "Count" +msgstr "Räkna" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117 msgid "" "Create compressed blocklist backups, they will be used in case of download " "errors or during startup in backup mode." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:23 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25 #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159 msgid "DNS Backend (DNS Directory)" msgstr "DNS-bakände (DNS-mapp)" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:171 msgid "DNS Directory" msgstr "DNS-mapp" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:19 +msgid "DNS Query Report" +msgstr "" + +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:81 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Date" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90 msgid "Description" msgstr "Beskrivning" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:131 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128 msgid "" "Do not automatically update blocklists during startup, use blocklist backups " "instead." @@ -105,7 +151,14 @@ msgstr "" "Uppdatera inte automatiskt blockeringlistor vid uppstarten, använd " "säkerhetskopierade blockeringslistor istället." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:71 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:84 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Domain" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36 msgid "Download Utility" msgstr "" @@ -113,84 +166,98 @@ msgstr "" msgid "Download Utility (SSL Library)" msgstr "Nerladdningsprogram (SSL-bibliotek)" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:21 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22 msgid "Edit Blacklist" msgstr "Redigera svartlista" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:23 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24 msgid "Edit Configuration" msgstr "Redigerar konfigurationen" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:23 msgid "Edit Whitelist" msgstr "Redigera vitlista" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:151 msgid "Email Notification" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164 msgid "Email Notification Count" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:19 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:21 msgid "Enable Adblock" msgstr "Aktivera adblock" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:118 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116 msgid "Enable Blocklist Backup" msgstr "Aktivera säkerhetskopiering av blockeringslistan" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:114 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139 +msgid "Enable DNS Query Report" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212 msgid "" "Enable memory intense overall sort / duplicate removal on low memory devices " "(< 64 MB free RAM)" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102 msgid "Enable verbose debug logging in case of any processing error." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:71 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77 msgid "Enabled" msgstr "Aktiverad" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:92 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:211 +msgid "End Date" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98 msgid "Extra Options" msgstr "Extra alternativ" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187 msgid "Flush DNS Cache" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:150 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188 msgid "Flush DNS Cache after adblock processing." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:13 msgid "" "For further information <a href=\"%s\" target=\"_blank\">check the online " "documentation</a>" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:138 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134 msgid "" "For further performance improvements you can raise this value, e.g. '8' or " "'16' should be safe." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112 msgid "Force Local DNS" msgstr "Tvinga lokal DNS" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211 msgid "Force Overall Sort" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:177 msgid "Full path to the whitelist file." msgstr "" +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140 +msgid "" +"Gather dns related network traffic via tcpdump to provide a DNS Query Report " +"on demand." +msgstr "" + #: applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua:10 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/configuration_tab.lua:9 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua:10 @@ -202,39 +269,53 @@ msgstr "" msgid "Last Run" msgstr "Kördes senast" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:241 +msgid "Latest DNS Queries" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48 msgid "" "List of available network interfaces. Usually the startup will be triggered " "by the 'wan' interface." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:26 msgid "" "List of supported DNS backends with their default list export directory." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:37 msgid "List of supported and fully pre-configured download utilities." msgstr "" #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:21 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:148 #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90 msgid "Loading" msgstr "Laddar" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:100 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20 +msgid "Logfile" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105 msgid "Low Priority Service" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:132 msgid "Max. Download Queue" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:26 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:69 +msgid "Name / IP-Address" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86 msgid "No" msgstr "Nej" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:93 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:99 msgid "" "Options for further tweaking in case the defaults are not suitable for you." msgstr "" @@ -260,26 +341,29 @@ msgstr "" msgid "Please edit this file directly in a terminal session." msgstr "Vänligen redigera den här filen direkt i en terminal-session." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156 -msgid "" -"Please note: this needs additional 'msmtp' package installation and setup." +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153 +msgid "Please note: this needs manual 'msmtp' package installation and setup." +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141 +msgid "Please note: this needs manual 'tcpdump-mini' package installation." msgstr "" #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:52 msgid "Query" msgstr "Fråga" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:25 msgid "Query domains" msgstr "Fråga efter domäner" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165 msgid "" "Raise the minimum email notification count, to get emails if the overall " "count is less or equal to the given limit (default 0)," msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113 msgid "" "Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp " "and tcp protocol on ports 53, 853 and 5353." @@ -296,6 +380,38 @@ msgstr "" msgid "Refresh Blocklist Sources" msgstr "" +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:230 +msgid "Refresh Report" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:201 +msgid "Report Chunk Count" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206 +msgid "Report Chunk Size" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:144 +msgid "Report Directory" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192 +msgid "Report Interface" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:202 +msgid "Report chunk count used by tcpdump (default '5')." +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207 +msgid "Report chunk size used by tcpdump in MB (default '1')." +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193 +msgid "Reporting interface used by tcpdump (default 'br-lan')." +msgstr "" + #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31 msgid "Resume" msgstr "Återuppta" @@ -304,7 +420,7 @@ msgstr "Återuppta" msgid "Runtime Information" msgstr "Information om körtid" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:74 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80 msgid "SSL req." msgstr "SSL-rek." @@ -314,25 +430,29 @@ msgstr "SSL-rek." msgid "Save" msgstr "Spara" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152 msgid "" "Send notification emails in case of a processing error or if domain count is " "≤ 0." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106 msgid "" "Set the nice level to 'low priority' and the adblock background processing " "will take less resources from the system." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:133 msgid "" "Size of the download queue to handle downloads & list processing in " -"parallel (default '4')." +"parallel (default '8')." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:45 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:205 +msgid "Start Date" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47 msgid "Startup Trigger" msgstr "Uppstartslösare" @@ -346,13 +466,19 @@ msgstr "Stäng av" msgid "Suspend / Resume Adblock" msgstr "Upphäv / Återuppta adblock" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121 msgid "" -"Target directory for adblock backups. Please use only non-volatile disks, e." +"Target directory for adblock backups. Please use only a non-volatile disk, e." "g. an external usb stick." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:145 +msgid "" +"Target directory for dns related report files. Please use preferably a non-" +"volatile disk, e.g. an external usb stick." +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172 msgid "Target directory for the generated blocklist 'adb_list.overall'." msgstr "" @@ -366,7 +492,7 @@ msgstr "" msgid "The syslog output, pre-filtered for adblock related messages only." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:107 msgid "This change requires a manual service stop/re-start to take effect." msgstr "" @@ -394,48 +520,64 @@ msgid "" "for whitelisting." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Time" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:27 msgid "" "To overwrite the default path use the 'DNS Directory' option in the extra " "section below." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:236 +msgid "Top 10 Reporting" +msgstr "" + +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:217 +msgid "Total DNS Queries" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182 msgid "Trigger Delay" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101 msgid "Verbose Debug Logging" msgstr "" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:19 -msgid "View Logfile" -msgstr "Visa loggfil" - #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:22 msgid "Waiting for command to complete..." msgstr "Väntar på att kommandot ska slutföras..." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:102 +msgid "Whitelist" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176 msgid "Whitelist File" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84 msgid "Yes" msgstr "Ja" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:145 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160 msgid "" -"You can use this restrictive blocklist manually e.g. for guest wifi or " -"kidsafe configurations." +"You can use this restrictive blocklist e.g. for guest wifi or kidsafe " +"configurations." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:166 msgid "" "e.g. to receive an email notification with every adblock update set this " "value to 150000." msgstr "" +#~ msgid "View Logfile" +#~ msgstr "Visa loggfil" + #~ msgid "paused" #~ msgstr "pausad" @@ -525,9 +667,6 @@ msgstr "" #~ msgid "see list details" #~ msgstr "se listans detaljer" -#~ msgid "Count" -#~ msgstr "Räkna" - #~ msgid "Do not write status info to flash" #~ msgstr "Skriv inte status info till flash" diff --git a/applications/luci-app-adblock/po/templates/adblock.pot b/applications/luci-app-adblock/po/templates/adblock.pot index 8df46cddc1..4510e92499 100644 --- a/applications/luci-app-adblock/po/templates/adblock.pot +++ b/applications/luci-app-adblock/po/templates/adblock.pot @@ -1,18 +1,23 @@ msgid "" msgstr "Content-Type: text/plain; charset=UTF-8" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:143 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158 msgid "'Jail' Blocklist Creation" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:68 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:74 msgid "" "<b>Caution:</b> To prevent OOM exceptions on low memory devices with less " "than 64 MB free RAM, please only select a few of them!" msgstr "" +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:86 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Action" +msgstr "" + #: applications/luci-app-adblock/luasrc/controller/adblock.lua:17 -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:9 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11 msgid "Adblock" msgstr "" @@ -24,27 +29,45 @@ msgstr "" msgid "Adblock Version" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183 msgid "Additional trigger delay in seconds before adblock processing begins." msgstr "" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:21 msgid "Advanced" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:85 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Answer" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:92 msgid "Archive Categories" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120 msgid "Backup Directory" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127 msgid "Backup Mode" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:67 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106 +msgid "Blacklist" +msgstr "" + +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:223 +msgid "Blocked DNS Queries" +msgstr "" + +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:30 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:73 +msgid "Blocked Domain" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73 msgid "Blocklist Sources" msgstr "" @@ -52,53 +75,83 @@ msgstr "" msgid "Blocklist not found!" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:144 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:159 msgid "" "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all " "domains except those listed in the whitelist file." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:49 msgid "" "Choose 'none' to disable automatic startups, 'timed' to use a classic " "timeout (default 30 sec.) or select another trigger interface." msgstr "" +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:83 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Client" +msgstr "" + #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:59 msgid "Collecting data..." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:10 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12 msgid "" "Configuration of the adblock package to block ad/abuse domains by using DNS." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:119 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:25 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:27 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:29 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:68 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:70 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:72 +msgid "Count" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117 msgid "" "Create compressed blocklist backups, they will be used in case of download " "errors or during startup in backup mode." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:23 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25 #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159 msgid "DNS Backend (DNS Directory)" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:171 msgid "DNS Directory" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:19 +msgid "DNS Query Report" +msgstr "" + +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:81 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Date" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90 msgid "Description" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:131 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128 msgid "" "Do not automatically update blocklists during startup, use blocklist backups " "instead." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:71 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:84 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Domain" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36 msgid "Download Utility" msgstr "" @@ -106,84 +159,98 @@ msgstr "" msgid "Download Utility (SSL Library)" msgstr "" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:21 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22 msgid "Edit Blacklist" msgstr "" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:23 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24 msgid "Edit Configuration" msgstr "" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:23 msgid "Edit Whitelist" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:151 msgid "Email Notification" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164 msgid "Email Notification Count" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:19 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:21 msgid "Enable Adblock" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:118 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116 msgid "Enable Blocklist Backup" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:114 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139 +msgid "Enable DNS Query Report" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212 msgid "" "Enable memory intense overall sort / duplicate removal on low memory devices " "(< 64 MB free RAM)" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102 msgid "Enable verbose debug logging in case of any processing error." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:71 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77 msgid "Enabled" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:92 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:211 +msgid "End Date" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98 msgid "Extra Options" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187 msgid "Flush DNS Cache" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:150 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188 msgid "Flush DNS Cache after adblock processing." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:13 msgid "" "For further information <a href=\"%s\" target=\"_blank\">check the online " "documentation</a>" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:138 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134 msgid "" "For further performance improvements you can raise this value, e.g. '8' or " "'16' should be safe." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112 msgid "Force Local DNS" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211 msgid "Force Overall Sort" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:177 msgid "Full path to the whitelist file." msgstr "" +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140 +msgid "" +"Gather dns related network traffic via tcpdump to provide a DNS Query Report " +"on demand." +msgstr "" + #: applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua:10 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/configuration_tab.lua:9 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua:10 @@ -194,39 +261,53 @@ msgstr "" msgid "Last Run" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:241 +msgid "Latest DNS Queries" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48 msgid "" "List of available network interfaces. Usually the startup will be triggered " "by the 'wan' interface." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:26 msgid "" "List of supported DNS backends with their default list export directory." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:37 msgid "List of supported and fully pre-configured download utilities." msgstr "" #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:21 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:148 #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90 msgid "Loading" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:100 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20 +msgid "Logfile" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105 msgid "Low Priority Service" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:132 msgid "Max. Download Queue" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:26 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:69 +msgid "Name / IP-Address" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86 msgid "No" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:93 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:99 msgid "" "Options for further tweaking in case the defaults are not suitable for you." msgstr "" @@ -252,26 +333,29 @@ msgstr "" msgid "Please edit this file directly in a terminal session." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156 -msgid "" -"Please note: this needs additional 'msmtp' package installation and setup." +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153 +msgid "Please note: this needs manual 'msmtp' package installation and setup." +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141 +msgid "Please note: this needs manual 'tcpdump-mini' package installation." msgstr "" #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:52 msgid "Query" msgstr "" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:25 msgid "Query domains" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165 msgid "" "Raise the minimum email notification count, to get emails if the overall " "count is less or equal to the given limit (default 0)," msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113 msgid "" "Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp " "and tcp protocol on ports 53, 853 and 5353." @@ -288,6 +372,38 @@ msgstr "" msgid "Refresh Blocklist Sources" msgstr "" +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:230 +msgid "Refresh Report" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:201 +msgid "Report Chunk Count" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206 +msgid "Report Chunk Size" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:144 +msgid "Report Directory" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192 +msgid "Report Interface" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:202 +msgid "Report chunk count used by tcpdump (default '5')." +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207 +msgid "Report chunk size used by tcpdump in MB (default '1')." +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193 +msgid "Reporting interface used by tcpdump (default 'br-lan')." +msgstr "" + #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31 msgid "Resume" msgstr "" @@ -296,7 +412,7 @@ msgstr "" msgid "Runtime Information" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:74 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80 msgid "SSL req." msgstr "" @@ -306,25 +422,29 @@ msgstr "" msgid "Save" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152 msgid "" "Send notification emails in case of a processing error or if domain count is " "≤ 0." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106 msgid "" "Set the nice level to 'low priority' and the adblock background processing " "will take less resources from the system." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:133 msgid "" "Size of the download queue to handle downloads & list processing in " -"parallel (default '4')." +"parallel (default '8')." +msgstr "" + +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:205 +msgid "Start Date" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:45 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47 msgid "Startup Trigger" msgstr "" @@ -338,13 +458,19 @@ msgstr "" msgid "Suspend / Resume Adblock" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121 msgid "" -"Target directory for adblock backups. Please use only non-volatile disks, e." +"Target directory for adblock backups. Please use only a non-volatile disk, e." "g. an external usb stick." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:145 +msgid "" +"Target directory for dns related report files. Please use preferably a non-" +"volatile disk, e.g. an external usb stick." +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172 msgid "Target directory for the generated blocklist 'adb_list.overall'." msgstr "" @@ -358,7 +484,7 @@ msgstr "" msgid "The syslog output, pre-filtered for adblock related messages only." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:107 msgid "This change requires a manual service stop/re-start to take effect." msgstr "" @@ -384,43 +510,56 @@ msgid "" "for whitelisting." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Time" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:27 msgid "" "To overwrite the default path use the 'DNS Directory' option in the extra " "section below." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178 -msgid "Trigger Delay" +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:236 +msgid "Top 10 Reporting" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95 -msgid "Verbose Debug Logging" +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:217 +msgid "Total DNS Queries" msgstr "" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:19 -msgid "View Logfile" +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182 +msgid "Trigger Delay" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101 +msgid "Verbose Debug Logging" msgstr "" #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:22 msgid "Waiting for command to complete..." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:102 +msgid "Whitelist" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176 msgid "Whitelist File" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84 msgid "Yes" msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:145 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160 msgid "" -"You can use this restrictive blocklist manually e.g. for guest wifi or " -"kidsafe configurations." +"You can use this restrictive blocklist e.g. for guest wifi or kidsafe " +"configurations." msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:166 msgid "" "e.g. to receive an email notification with every adblock update set this " "value to 150000." diff --git a/applications/luci-app-adblock/po/zh-cn/adblock.po b/applications/luci-app-adblock/po/zh-cn/adblock.po index c3f5dfd853..7f77fd855c 100644 --- a/applications/luci-app-adblock/po/zh-cn/adblock.po +++ b/applications/luci-app-adblock/po/zh-cn/adblock.po @@ -15,11 +15,11 @@ msgstr "" "X-Generator: Gtranslator 2.91.7\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:143 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158 msgid "'Jail' Blocklist Creation" msgstr "“Jail”拦截列表创建" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:68 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:74 msgid "" "<b>Caution:</b> To prevent OOM exceptions on low memory devices with less " "than 64 MB free RAM, please only select a few of them!" @@ -27,8 +27,13 @@ msgstr "" "<b>注意：</b>为防止在小于 64M 空闲内存的设备上出现内存不足异常，请只选择其中" "的几个！" +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:86 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Action" +msgstr "" + #: applications/luci-app-adblock/luasrc/controller/adblock.lua:17 -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:9 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11 msgid "Adblock" msgstr "Adblock" @@ -40,27 +45,45 @@ msgstr "Adblock 状态" msgid "Adblock Version" msgstr "Adblock 版本" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183 msgid "Additional trigger delay in seconds before adblock processing begins." msgstr "触发 Adblock 开始处理前的额外延迟（秒）。" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:21 msgid "Advanced" msgstr "高级" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:85 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Answer" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:92 msgid "Archive Categories" msgstr "存档类别" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120 msgid "Backup Directory" msgstr "备份目录" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127 msgid "Backup Mode" msgstr "备份模式" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:67 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106 +msgid "Blacklist" +msgstr "" + +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:223 +msgid "Blocked DNS Queries" +msgstr "" + +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:30 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:73 +msgid "Blocked Domain" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73 msgid "Blocklist Sources" msgstr "拦截列表来源" @@ -68,7 +91,7 @@ msgstr "拦截列表来源" msgid "Blocklist not found!" msgstr "拦截列表未找到！" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:144 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:159 msgid "" "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all " "domains except those listed in the whitelist file." @@ -76,7 +99,7 @@ msgstr "" "构建一个额外的“Jail”列表（/tmp/adb_list.jail），除白名单文件中列出的域名外，" "阻止访问其他所有的域名。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:49 msgid "" "Choose 'none' to disable automatic startups, 'timed' to use a classic " "timeout (default 30 sec.) or select another trigger interface." @@ -84,41 +107,71 @@ msgstr "" "选择“none”以禁用自动启动，“timed”以使用默认的超时设定（默认 30 秒），或选择另" "一个触发接口。" +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:83 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Client" +msgstr "" + #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:59 msgid "Collecting data..." msgstr "正在收集数据..." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:10 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12 msgid "" "Configuration of the adblock package to block ad/abuse domains by using DNS." msgstr "Adblock 配置工具，通过 DNS 来拦截广告和阻止域名。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:119 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:25 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:27 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:29 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:68 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:70 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:72 +msgid "Count" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117 msgid "" "Create compressed blocklist backups, they will be used in case of download " "errors or during startup in backup mode." msgstr "创建压缩的拦截列表备份，它们将在下载错误或备份模式启动期间使用。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:23 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25 #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159 msgid "DNS Backend (DNS Directory)" msgstr "DNS 后端（DNS 目录）" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:171 msgid "DNS Directory" msgstr "DNS 目录" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:19 +msgid "DNS Query Report" +msgstr "" + +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:81 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Date" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90 msgid "Description" msgstr "描述" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:131 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128 msgid "" "Do not automatically update blocklists during startup, use blocklist backups " "instead." msgstr "启动期间不要自动更新 blocklists，改用 blocklists 的备份。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:71 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:84 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Domain" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36 msgid "Download Utility" msgstr "下载工具" @@ -126,84 +179,98 @@ msgstr "下载工具" msgid "Download Utility (SSL Library)" msgstr "下载实用程序（SSL 库）" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:21 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22 msgid "Edit Blacklist" msgstr "编辑黑名单" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:23 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24 msgid "Edit Configuration" msgstr "编辑设置" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:23 msgid "Edit Whitelist" msgstr "编辑白名单" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:151 msgid "Email Notification" msgstr "Email 提醒" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164 msgid "Email Notification Count" msgstr "Email 提醒计数" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:19 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:21 msgid "Enable Adblock" msgstr "启用 Adblock" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:118 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116 msgid "Enable Blocklist Backup" msgstr "启用 Blocklist 备份" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:114 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139 +msgid "Enable DNS Query Report" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212 msgid "" "Enable memory intense overall sort / duplicate removal on low memory devices " "(< 64 MB free RAM)" msgstr "在低内存设备上启用积极的内存整体排序/重复移除（< 64 MB 空闲内存）" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102 msgid "Enable verbose debug logging in case of any processing error." msgstr "在出现任何处理错误的情况下启用详细调试日志记录。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:71 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77 msgid "Enabled" msgstr "已启用" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:92 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:211 +msgid "End Date" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98 msgid "Extra Options" msgstr "额外选项" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187 msgid "Flush DNS Cache" msgstr "清空 DNS 缓存" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:150 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188 msgid "Flush DNS Cache after adblock processing." msgstr "在 adblock 进程启动后清空 DNS 缓存。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:13 msgid "" "For further information <a href=\"%s\" target=\"_blank\">check the online " "documentation</a>" msgstr "进一步信息<a href=\"%s\" target=\"_blank\">请访问在线文档</a>" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:138 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134 msgid "" "For further performance improvements you can raise this value, e.g. '8' or " "'16' should be safe." msgstr "为了进一步提高性能，您可以提高此值，例如：8 或 16 应该是安全的。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112 msgid "Force Local DNS" msgstr "强制本地 DNS" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211 msgid "Force Overall Sort" msgstr "强制整体排序" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:177 msgid "Full path to the whitelist file." msgstr "白名单文件的全路径。" +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140 +msgid "" +"Gather dns related network traffic via tcpdump to provide a DNS Query Report " +"on demand." +msgstr "" + #: applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua:10 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/configuration_tab.lua:9 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua:10 @@ -214,39 +281,53 @@ msgstr "输入文件未找到，请检查您的配置。" msgid "Last Run" msgstr "最后运行" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:241 +msgid "Latest DNS Queries" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48 msgid "" "List of available network interfaces. Usually the startup will be triggered " "by the 'wan' interface." msgstr "可用网络接口列表。通常启动将由“wan”接口触发。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:26 msgid "" "List of supported DNS backends with their default list export directory." msgstr "支持的 DNS 后端列表及其默认列表导出目录。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:37 msgid "List of supported and fully pre-configured download utilities." msgstr "支持和完全预配置的下载工具列表。" #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:21 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:148 #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90 msgid "Loading" msgstr "加载中" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:100 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20 +msgid "Logfile" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105 msgid "Low Priority Service" msgstr "低优先级服务" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:132 msgid "Max. Download Queue" msgstr "最大下载队列" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:26 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:69 +msgid "Name / IP-Address" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86 msgid "No" msgstr "否" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:93 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:99 msgid "" "Options for further tweaking in case the defaults are not suitable for you." msgstr "在默认设置并不适合您时的额外选项。" @@ -274,20 +355,23 @@ msgstr "" msgid "Please edit this file directly in a terminal session." msgstr "请在终端会话中直接编辑此文件。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156 -msgid "" -"Please note: this needs additional 'msmtp' package installation and setup." -msgstr "请注意：这需要额外的“msmtp”软件包安装和设置。" +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153 +msgid "Please note: this needs manual 'msmtp' package installation and setup." +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141 +msgid "Please note: this needs manual 'tcpdump-mini' package installation." +msgstr "" #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:52 msgid "Query" msgstr "查询" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:25 msgid "Query domains" msgstr "查询域" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165 msgid "" "Raise the minimum email notification count, to get emails if the overall " "count is less or equal to the given limit (default 0)," @@ -295,7 +379,7 @@ msgstr "" "如果总数小于或等于给定限制（默认为 0），请提高最小电子邮件通知数，以获取电子" "邮件。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113 msgid "" "Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp " "and tcp protocol on ports 53, 853 and 5353." @@ -314,6 +398,38 @@ msgstr "刷新" msgid "Refresh Blocklist Sources" msgstr "刷新拦截列表源" +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:230 +msgid "Refresh Report" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:201 +msgid "Report Chunk Count" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206 +msgid "Report Chunk Size" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:144 +msgid "Report Directory" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192 +msgid "Report Interface" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:202 +msgid "Report chunk count used by tcpdump (default '5')." +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207 +msgid "Report chunk size used by tcpdump in MB (default '1')." +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193 +msgid "Reporting interface used by tcpdump (default 'br-lan')." +msgstr "" + #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31 msgid "Resume" msgstr "恢复" @@ -322,7 +438,7 @@ msgstr "恢复" msgid "Runtime Information" msgstr "运行信息" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:74 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80 msgid "SSL req." msgstr "SSL 要求" @@ -332,25 +448,29 @@ msgstr "SSL 要求" msgid "Save" msgstr "保存" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152 msgid "" "Send notification emails in case of a processing error or if domain count is " "≤ 0." msgstr "如果发生错误或域计数 ≤ 0，发送通知电子邮件。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106 msgid "" "Set the nice level to 'low priority' and the adblock background processing " "will take less resources from the system." msgstr "设置 nice 级别为“低优先级”，adblock 后台进程将从系统中获取更少的资源。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:133 msgid "" "Size of the download queue to handle downloads & list processing in " -"parallel (default '4')." -msgstr "处理下载队列的大小及并行处理列表（默认“4”）。" +"parallel (default '8')." +msgstr "" + +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:205 +msgid "Start Date" +msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:45 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47 msgid "Startup Trigger" msgstr "启动触发器" @@ -364,13 +484,19 @@ msgstr "暂停" msgid "Suspend / Resume Adblock" msgstr "暂停/恢复 Adblock" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121 msgid "" -"Target directory for adblock backups. Please use only non-volatile disks, e." +"Target directory for adblock backups. Please use only a non-volatile disk, e." "g. an external usb stick." -msgstr "adblock 备份的目标目录。请仅使用非易失性磁盘，例如：一个外置 U 盘。" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:145 +msgid "" +"Target directory for dns related report files. Please use preferably a non-" +"volatile disk, e.g. an external usb stick." +msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172 msgid "Target directory for the generated blocklist 'adb_list.overall'." msgstr "生成拦截列表“adb_list.overall”的目标目录。" @@ -384,7 +510,7 @@ msgstr "文件过大，无法使用 LuCI 的在线编辑（≥ 100 KB）。" msgid "The syslog output, pre-filtered for adblock related messages only." msgstr "系统日志输出，仅针对 adblock 相关的消息进行了预筛选。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:107 msgid "This change requires a manual service stop/re-start to take effect." msgstr "此更改需要手动停止/重启服务才能生效。" @@ -410,45 +536,80 @@ msgid "" "for whitelisting." msgstr "此表单允许您查询某些域的活动块列表，例如用于列出白名单。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Time" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:27 msgid "" "To overwrite the default path use the 'DNS Directory' option in the extra " "section below." msgstr "要覆盖默认路径，请使用下面额外部分中的“DNS 目录”选项。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:236 +msgid "Top 10 Reporting" +msgstr "" + +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:217 +msgid "Total DNS Queries" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182 msgid "Trigger Delay" msgstr "触发延迟" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101 msgid "Verbose Debug Logging" msgstr "详细的调试记录" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:19 -msgid "View Logfile" -msgstr "查看日志文件" - #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:22 msgid "Waiting for command to complete..." msgstr "正在等待命令完成…" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:102 +msgid "Whitelist" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176 msgid "Whitelist File" msgstr "白名单文件" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84 msgid "Yes" msgstr "是" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:145 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160 msgid "" -"You can use this restrictive blocklist manually e.g. for guest wifi or " -"kidsafe configurations." +"You can use this restrictive blocklist e.g. for guest wifi or kidsafe " +"configurations." msgstr "" -"您可以手动使用此限制性拦截列表，例如：为客人提供 wifi 或 kidsafe 配置。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:166 msgid "" "e.g. to receive an email notification with every adblock update set this " "value to 150000." msgstr "例如：要接收每个 adblock 更新的电子邮件通知时将此值设置为 150000。" + +#~ msgid "" +#~ "Please note: this needs additional 'msmtp' package installation and setup." +#~ msgstr "请注意：这需要额外的“msmtp”软件包安装和设置。" + +#~ msgid "" +#~ "Size of the download queue to handle downloads & list processing in " +#~ "parallel (default '4')." +#~ msgstr "处理下载队列的大小及并行处理列表（默认“4”）。" + +#~ msgid "" +#~ "Target directory for adblock backups. Please use only non-volatile disks, " +#~ "e.g. an external usb stick." +#~ msgstr "adblock 备份的目标目录。请仅使用非易失性磁盘，例如：一个外置 U 盘。" + +#~ msgid "View Logfile" +#~ msgstr "查看日志文件" + +#~ msgid "" +#~ "You can use this restrictive blocklist manually e.g. for guest wifi or " +#~ "kidsafe configurations." +#~ msgstr "" +#~ "您可以手动使用此限制性拦截列表，例如：为客人提供 wifi 或 kidsafe 配置。" diff --git a/applications/luci-app-adblock/po/zh-tw/adblock.po b/applications/luci-app-adblock/po/zh-tw/adblock.po index 5c10301749..4c34c1a9a3 100644 --- a/applications/luci-app-adblock/po/zh-tw/adblock.po +++ b/applications/luci-app-adblock/po/zh-tw/adblock.po @@ -15,11 +15,11 @@ msgstr "" "X-Generator: Gtranslator 2.91.7\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:143 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158 msgid "'Jail' Blocklist Creation" msgstr "“Jail”攔截列表建立" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:68 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:74 msgid "" "<b>Caution:</b> To prevent OOM exceptions on low memory devices with less " "than 64 MB free RAM, please only select a few of them!" @@ -27,8 +27,13 @@ msgstr "" "<b>注意：</b>為防止在小於 64M 空閒記憶體的裝置上出現記憶體不足異常，請只選擇" "其中的幾個！" +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:86 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Action" +msgstr "" + #: applications/luci-app-adblock/luasrc/controller/adblock.lua:17 -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:9 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11 msgid "Adblock" msgstr "Adblock" @@ -40,27 +45,45 @@ msgstr "Adblock 狀態" msgid "Adblock Version" msgstr "Adblock 版本" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183 msgid "Additional trigger delay in seconds before adblock processing begins." msgstr "觸發 Adblock 開始處理前的額外延遲（秒）。" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:21 msgid "Advanced" msgstr "高階" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:85 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Answer" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:92 msgid "Archive Categories" msgstr "存檔類別" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120 msgid "Backup Directory" msgstr "備份目錄" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127 msgid "Backup Mode" msgstr "備份模式" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:67 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106 +msgid "Blacklist" +msgstr "" + +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:223 +msgid "Blocked DNS Queries" +msgstr "" + +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:30 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:73 +msgid "Blocked Domain" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73 msgid "Blocklist Sources" msgstr "攔截列表來源" @@ -68,7 +91,7 @@ msgstr "攔截列表來源" msgid "Blocklist not found!" msgstr "攔截列表未找到！" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:144 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:159 msgid "" "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all " "domains except those listed in the whitelist file." @@ -76,7 +99,7 @@ msgstr "" "構建一個額外的“Jail”列表（/tmp/adb_list.jail），除白名單檔案中列出的域名外，" "阻止訪問其他所有的域名。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:49 msgid "" "Choose 'none' to disable automatic startups, 'timed' to use a classic " "timeout (default 30 sec.) or select another trigger interface." @@ -84,41 +107,71 @@ msgstr "" "選擇“none”以禁用自動啟動，“timed”以使用預設的超時設定（預設 30 秒），或選擇另" "一個觸發介面。" +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:83 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Client" +msgstr "" + #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:59 msgid "Collecting data..." msgstr "正在收集資料..." -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:10 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12 msgid "" "Configuration of the adblock package to block ad/abuse domains by using DNS." msgstr "Adblock 配置工具，通過 DNS 來攔截廣告和阻止域名。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:119 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:25 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:27 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:29 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:68 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:70 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:72 +msgid "Count" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117 msgid "" "Create compressed blocklist backups, they will be used in case of download " "errors or during startup in backup mode." msgstr "建立壓縮的攔截列表備份，它們將在下載錯誤或備份模式啟動期間使用。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:23 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25 #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159 msgid "DNS Backend (DNS Directory)" msgstr "DNS 後端（DNS 目錄）" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:171 msgid "DNS Directory" msgstr "DNS 目錄" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:19 +msgid "DNS Query Report" +msgstr "" + +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:81 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Date" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90 msgid "Description" msgstr "描述" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:131 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128 msgid "" "Do not automatically update blocklists during startup, use blocklist backups " "instead." msgstr "啟動期間不要自動更新 blocklists，改用 blocklists 的備份。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:71 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:84 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Domain" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36 msgid "Download Utility" msgstr "下載工具" @@ -126,85 +179,99 @@ msgstr "下載工具" msgid "Download Utility (SSL Library)" msgstr "下載實用程式（SSL 庫）" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:21 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22 msgid "Edit Blacklist" msgstr "編輯黑名單" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:23 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24 msgid "Edit Configuration" msgstr "編輯設定" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:23 msgid "Edit Whitelist" msgstr "編輯白名單" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:151 msgid "Email Notification" msgstr "Email 提醒" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164 msgid "Email Notification Count" msgstr "Email 提醒計數" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:19 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:21 msgid "Enable Adblock" msgstr "啟用 Adblock" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:118 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116 msgid "Enable Blocklist Backup" msgstr "啟用 Blocklist 備份" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:114 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139 +msgid "Enable DNS Query Report" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212 msgid "" "Enable memory intense overall sort / duplicate removal on low memory devices " "(< 64 MB free RAM)" msgstr "" "在低記憶體裝置上啟用積極的記憶體整體排序/重複移除（< 64 MB 空閒記憶體）" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102 msgid "Enable verbose debug logging in case of any processing error." msgstr "在出現任何處理錯誤的情況下啟用詳細除錯日誌記錄。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:71 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77 msgid "Enabled" msgstr "已啟用" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:92 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:211 +msgid "End Date" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98 msgid "Extra Options" msgstr "額外選項" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187 msgid "Flush DNS Cache" msgstr "清空 DNS 快取" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:150 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188 msgid "Flush DNS Cache after adblock processing." msgstr "在 adblock 程序啟動後清空 DNS 快取。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:13 msgid "" "For further information <a href=\"%s\" target=\"_blank\">check the online " "documentation</a>" msgstr "進一步資訊<a href=\"%s\" target=\"_blank\">請訪問線上文檔</a>" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:138 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134 msgid "" "For further performance improvements you can raise this value, e.g. '8' or " "'16' should be safe." msgstr "為了進一步提高效能，您可以提高此值，例如：8 或 16 應該是安全的。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112 msgid "Force Local DNS" msgstr "強制本地 DNS" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211 msgid "Force Overall Sort" msgstr "強制整體排序" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:177 msgid "Full path to the whitelist file." msgstr "白名單檔案的全路徑。" +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140 +msgid "" +"Gather dns related network traffic via tcpdump to provide a DNS Query Report " +"on demand." +msgstr "" + #: applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua:10 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/configuration_tab.lua:9 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua:10 @@ -215,39 +282,53 @@ msgstr "輸入檔案未找到，請檢查您的配置。" msgid "Last Run" msgstr "最後執行" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:241 +msgid "Latest DNS Queries" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48 msgid "" "List of available network interfaces. Usually the startup will be triggered " "by the 'wan' interface." msgstr "可用網路介面列表。通常啟動將由“wan”介面觸發。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:26 msgid "" "List of supported DNS backends with their default list export directory." msgstr "支援的 DNS 後端列表及其預設列表匯出目錄。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:37 msgid "List of supported and fully pre-configured download utilities." msgstr "支援和完全預配置的下載工具列表。" #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:21 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:148 #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90 msgid "Loading" msgstr "載入中" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:100 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20 +msgid "Logfile" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105 msgid "Low Priority Service" msgstr "低優先順序服務" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:132 msgid "Max. Download Queue" msgstr "最大下載佇列" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:26 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:69 +msgid "Name / IP-Address" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86 msgid "No" msgstr "否" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:93 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:99 msgid "" "Options for further tweaking in case the defaults are not suitable for you." msgstr "在預設設定並不適合您時的額外選項。" @@ -275,20 +356,23 @@ msgstr "" msgid "Please edit this file directly in a terminal session." msgstr "請在終端會話中直接編輯此檔案。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156 -msgid "" -"Please note: this needs additional 'msmtp' package installation and setup." -msgstr "請注意：這需要額外的“msmtp”軟體包安裝和設定。" +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153 +msgid "Please note: this needs manual 'msmtp' package installation and setup." +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141 +msgid "Please note: this needs manual 'tcpdump-mini' package installation." +msgstr "" #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:52 msgid "Query" msgstr "查詢" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24 +#: applications/luci-app-adblock/luasrc/controller/adblock.lua:25 msgid "Query domains" msgstr "查詢域" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165 msgid "" "Raise the minimum email notification count, to get emails if the overall " "count is less or equal to the given limit (default 0)," @@ -296,7 +380,7 @@ msgstr "" "如果總數小於或等於給定限制（預設為 0），請提高最小電子郵件通知數，以獲取電子" "郵件。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113 msgid "" "Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp " "and tcp protocol on ports 53, 853 and 5353." @@ -315,6 +399,38 @@ msgstr "重新整理" msgid "Refresh Blocklist Sources" msgstr "重新整理攔截列表源" +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:230 +msgid "Refresh Report" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:201 +msgid "Report Chunk Count" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206 +msgid "Report Chunk Size" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:144 +msgid "Report Directory" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192 +msgid "Report Interface" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:202 +msgid "Report chunk count used by tcpdump (default '5')." +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207 +msgid "Report chunk size used by tcpdump in MB (default '1')." +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193 +msgid "Reporting interface used by tcpdump (default 'br-lan')." +msgstr "" + #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31 msgid "Resume" msgstr "恢復" @@ -323,7 +439,7 @@ msgstr "恢復" msgid "Runtime Information" msgstr "執行資訊" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:74 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80 msgid "SSL req." msgstr "SSL 要求" @@ -333,26 +449,30 @@ msgstr "SSL 要求" msgid "Save" msgstr "儲存" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152 msgid "" "Send notification emails in case of a processing error or if domain count is " "≤ 0." msgstr "如果發生錯誤或域計數 ≤ 0，傳送通知電子郵件。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106 msgid "" "Set the nice level to 'low priority' and the adblock background processing " "will take less resources from the system." msgstr "" "設定 nice 級別為“低優先順序”，adblock 後臺程序將從系統中獲取更少的資源。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:133 msgid "" "Size of the download queue to handle downloads & list processing in " -"parallel (default '4')." -msgstr "處理下載佇列的大小及並行處理列表（預設“4”）。" +"parallel (default '8')." +msgstr "" + +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:205 +msgid "Start Date" +msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:45 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47 msgid "Startup Trigger" msgstr "啟動觸發器" @@ -366,13 +486,19 @@ msgstr "暫停" msgid "Suspend / Resume Adblock" msgstr "暫停/恢復 Adblock" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121 msgid "" -"Target directory for adblock backups. Please use only non-volatile disks, e." +"Target directory for adblock backups. Please use only a non-volatile disk, e." "g. an external usb stick." -msgstr "adblock 備份的目標目錄。請僅使用非易失性磁碟，例如：一個外接 U 盤。" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:145 +msgid "" +"Target directory for dns related report files. Please use preferably a non-" +"volatile disk, e.g. an external usb stick." +msgstr "" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172 msgid "Target directory for the generated blocklist 'adb_list.overall'." msgstr "生成攔截列表“adb_list.overall”的目標目錄。" @@ -386,7 +512,7 @@ msgstr "檔案過大，無法使用 LuCI 的線上編輯（≥ 100 KB）。" msgid "The syslog output, pre-filtered for adblock related messages only." msgstr "系統日誌輸出，僅針對 adblock 相關的訊息進行了預篩選。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:107 msgid "This change requires a manual service stop/re-start to take effect." msgstr "此更改需要手動停止/重啟服務才能生效。" @@ -412,45 +538,80 @@ msgid "" "for whitelisting." msgstr "此表單允許您查詢某些域的活動塊列表，例如用於列出白名單。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89 +msgid "Time" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:27 msgid "" "To overwrite the default path use the 'DNS Directory' option in the extra " "section below." msgstr "要覆蓋預設路徑，請使用下面額外部分中的“DNS 目錄”選項。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:236 +msgid "Top 10 Reporting" +msgstr "" + +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:217 +msgid "Total DNS Queries" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182 msgid "Trigger Delay" msgstr "觸發延遲" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101 msgid "Verbose Debug Logging" msgstr "詳細的除錯記錄" -#: applications/luci-app-adblock/luasrc/controller/adblock.lua:19 -msgid "View Logfile" -msgstr "檢視日誌檔案" - #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:22 msgid "Waiting for command to complete..." msgstr "正在等待指令完成…" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172 +#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:102 +msgid "Whitelist" +msgstr "" + +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176 msgid "Whitelist File" msgstr "白名單檔案" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84 msgid "Yes" msgstr "是" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:145 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160 msgid "" -"You can use this restrictive blocklist manually e.g. for guest wifi or " -"kidsafe configurations." +"You can use this restrictive blocklist e.g. for guest wifi or kidsafe " +"configurations." msgstr "" -"您可以手動使用此限制性攔截列表，例如：為客人提供 wifi 或 kidsafe 配置。" -#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162 +#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:166 msgid "" "e.g. to receive an email notification with every adblock update set this " "value to 150000." msgstr "例如：要接收每個 adblock 更新的電子郵件通知時將此值設定為 150000。" + +#~ msgid "" +#~ "Please note: this needs additional 'msmtp' package installation and setup." +#~ msgstr "請注意：這需要額外的“msmtp”軟體包安裝和設定。" + +#~ msgid "" +#~ "Size of the download queue to handle downloads & list processing in " +#~ "parallel (default '4')." +#~ msgstr "處理下載佇列的大小及並行處理列表（預設“4”）。" + +#~ msgid "" +#~ "Target directory for adblock backups. Please use only non-volatile disks, " +#~ "e.g. an external usb stick." +#~ msgstr "adblock 備份的目標目錄。請僅使用非易失性磁碟，例如：一個外接 U 盤。" + +#~ msgid "View Logfile" +#~ msgstr "檢視日誌檔案" + +#~ msgid "" +#~ "You can use this restrictive blocklist manually e.g. for guest wifi or " +#~ "kidsafe configurations." +#~ msgstr "" +#~ "您可以手動使用此限制性攔截列表，例如：為客人提供 wifi 或 kidsafe 配置。" diff --git a/applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua b/applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua index 8b5bedc089..53353175ef 100644 --- a/applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua +++ b/applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua @@ -1,17 +1,15 @@ -- Copyright 2018 Dirk Brenken (dev@brenken.org) -- This is free software, licensed under the Apache License, Version 2.0 -local fs = require("nixio.fs") -local uci = require("luci.model.uci").cursor() -local sys = require("luci.sys") -local net = require "luci.model.network".init() -local util = require("luci.util") -local dump = util.ubus("network.interface", "dump", {}) -local devices = sys.net:devices() +local fs = require("nixio.fs") +local uci = require("luci.model.uci").cursor() +local net = require "luci.model.network".init() +local util = require("luci.util") +local dump = util.ubus("network.interface", "dump", {}) m = Map("banip", translate("banIP"), translate("Configuration of the banIP package to block ip adresses/subnets via IPSet. ") - .. translatef("For further information " + ..translatef("For further information " .. "<a href=\"%s\" target=\"_blank\">" .. "check the online documentation</a>", "https://github.com/openwrt/packages/blob/master/net/banip/files/README.md")) @@ -29,22 +27,16 @@ o2.rmempty = false o3 = s:option(MultiValue, "ban_iface", translate("Interface Selection"), translate("Disable the automatic WAN detection and select your preferred interface(s) manually.")) -for _, dev in ipairs(devices) do - if dev ~= "lo" and dev ~= "br-lan" then - local iface = net:get_interface(dev) - if iface then - iface = iface:get_networks() or {} - for k, v in pairs(iface) do - iface[k] = iface[k].sid - if iface[k] ~= "lan" then - o3:value(iface[k], iface[k].. " (" ..dev.. ")") - end - end +if dump then + local i, v + for i, v in ipairs(dump.interface) do + if v.interface ~= "loopback" and v.interface ~= "lan" then + local device = v.l3_device or v.device or "-" + o3:value(v.interface, v.interface.. " (" ..device.. ")") end end end o3.widget = "checkbox" -o3.default = ban_iface o3.rmempty = false o4 = s:option(ListValue, "ban_fetchutil", translate("Download Utility"), diff --git a/applications/luci-app-banip/luasrc/view/banip/banip_css.htm b/applications/luci-app-banip/luasrc/view/banip/banip_css.htm index b1b9707f04..2fd4109e90 100644 --- a/applications/luci-app-banip/luasrc/view/banip/banip_css.htm +++ b/applications/luci-app-banip/luasrc/view/banip/banip_css.htm @@ -1,8 +1,8 @@ <style type="text/css"> textarea { - width: 100%; - height: 450px; + width: 100% !important; + height: 450px !important; border: 1px solid #cccccc; padding: 5px; font-size: 12px; @@ -16,8 +16,8 @@ select[readonly], textarea[readonly] { - width: 100%; - height: 450px; + width: 100% !important; + height: 450px !important; border: 1px solid #cccccc; padding: 5px; font-size: 12px; @@ -33,7 +33,7 @@ .cbi-section-table-row, .tr[data-title]::before { - text-align: left; + text-align: left !important; vertical-align: top; margin-left: 0px; padding-left: 2px; diff --git a/applications/luci-app-ddns/luasrc/model/cbi/ddns/global.lua b/applications/luci-app-ddns/luasrc/model/cbi/ddns/global.lua index 9dc0857509..2f06200146 100644 --- a/applications/luci-app-ddns/luasrc/model/cbi/ddns/global.lua +++ b/applications/luci-app-ddns/luasrc/model/cbi/ddns/global.lua @@ -28,7 +28,7 @@ local ns = m:section( NamedSection, "global", "ddns", .. [[<br /><strong>]] .. translate("It is NOT recommended for casual users to change settings on this page.") .. [[</strong><br />]] - .. [[<a href="http://wiki.openwrt.org/doc/uci/ddns#version_2x1" target="_blank">]] + .. [[<a href="https://openwrt.org/docs/guide-user/base-system/ddns#section_ddns" target="_blank">]] .. translate("For detailed information about parameter settings look here.") .. [[</a>]] ) diff --git a/applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua b/applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua index 8f0e3224b4..967110fbf8 100644 --- a/applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua +++ b/applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua @@ -59,7 +59,7 @@ m = Map("dnscrypt-proxy", translate("DNSCrypt-Proxy"), translate("Configuration of the DNSCrypt-Proxy package. ") .. translatef("For further information " .. "<a href=\"%s\" target=\"_blank\">" - .. "see the wiki online</a>", "https://wiki.openwrt.org/inbox/dnscrypt")) + .. "see the wiki online</a>", "https://openwrt.org/docs/guide-user/services/dns/dnscrypt")) m:chain("dhcp") function m.on_after_commit(self) @@ -146,7 +146,7 @@ if not fs.access("/etc/resolv-crypt.conf") or fs.stat("/etc/resolv-crypt.conf"). translate("Create '/etc/resolv-crypt.conf' with 'options timeout:1' to reduce DNS upstream timeouts with multiple DNSCrypt instances.<br />") .. translatef("For further information " .. "<a href=\"%s\" target=\"_blank\">" - .. "see the wiki online</a>", "https://wiki.openwrt.org/inbox/dnscrypt")) + .. "see the wiki online</a>", "https://openwrt.org/docs/guide-user/services/dns/dnscrypt")) btn2.inputtitle = translate("Create Config File") btn2.inputstyle = "apply" btn2.disabled = false diff --git a/applications/luci-app-firewall/po/uk/firewall.po b/applications/luci-app-firewall/po/uk/firewall.po index bbe50c134e..40b3fb9937 100644 --- a/applications/luci-app-firewall/po/uk/firewall.po +++ b/applications/luci-app-firewall/po/uk/firewall.po @@ -1,15 +1,13 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"PO-Revision-Date: 2018-07-01 23:45+0300\n" +"PO-Revision-Date: 2018-12-29 23:25+0200\n" "Last-Translator: Yurii <yuripet@gmail.com>\n" "Language-Team: none\n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:127 msgid "%s in %s" @@ -543,7 +541,7 @@ msgstr "Відхиляти вихідний" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:52 msgid "Requires hardware NAT support. Implemented at least for mt7621" -msgstr "Необхідна апаратна підтримка NAT. Впроваджено принаймні для mt7621" +msgstr "Необхідна апаратна підтримка NAT. Упроваджено принаймні для mt7621" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:29 msgid "Restart Firewall" diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua index ed9d94ac7e..4c970d4fa1 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua @@ -34,8 +34,20 @@ track_ip.datatype = "host" track_method = mwan_interface:option(ListValue, "track_method", translate("Tracking method")) track_method.default = "ping" track_method:value("ping") -track_method:value("arping") -track_method:value("httping") +if os.execute("which nping 1>/dev/null") == 0 then + track_method:value("nping-tcp") + track_method:value("nping-udp") + track_method:value("nping-icmp") + track_method:value("nping-arp") +end + +if os.execute("which arping 1>/dev/null") == 0 then + track_method:value("arping") +end + +if os.execute("which httping 1>/dev/null") == 0 then + track_method:value("httping") +end reliability = mwan_interface:option(Value, "reliability", translate("Tracking reliability"), translate("Acceptable values: 1-100. This many Tracking IP addresses must respond for the link to be deemed up")) diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm b/applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm index 259f3c975b..2e7b490f4f 100644 --- a/applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm +++ b/applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm @@ -5,6 +5,17 @@ -%> <script type="text/javascript">//<![CDATA[ + +function secondsToString(time) { + var seconds = parseInt(time, 10); + + var hrs = Math.floor(seconds / 3600); + seconds -= hrs*3600; + var mnts = Math.floor(seconds / 60); + seconds -= mnts*60; + return String.format("%sh:%sm:%ss", hrs, mnts, seconds); +} + XHR.poll(-1, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "interface_status")%>', null, function(x, status) { @@ -15,15 +26,24 @@ XHR.poll(-1, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "interface for ( var iface in status.interfaces) { var state = ''; - var css = '' + var css = ''; + var time = ''; switch (status.interfaces[iface].status) { case 'online': state = '<%:Online%>'; + time = String.format( + '<div><strong>Uptime: </strong>%s</div>', + secondsToString(status.interfaces[iface].uptime) + ); css = 'success'; break; case 'offline': state = '<%:Offline%>'; + time = String.format( + '<div><strong>Downtime: </strong>%s</div>', + secondsToString(status.interfaces[iface].downtime) + ); css = 'danger'; break; default: @@ -43,6 +63,10 @@ XHR.poll(-1, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "interface '<div><strong>Status: </strong>%s</div>', state ); + if (time) + { + statusview += time; + } statusview += '</div>' } statusDiv.innerHTML = statusview; diff --git a/applications/luci-app-mwan3/po/de/mwan3.po b/applications/luci-app-mwan3/po/de/mwan3.po index a387948791..ffc0ea72e2 100644 --- a/applications/luci-app-mwan3/po/de/mwan3.po +++ b/applications/luci-app-mwan3/po/de/mwan3.po @@ -81,15 +81,15 @@ msgstr "Gültige Werte: 1-1000. Standard auf 1, falls nicht gesetzt" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua:24 msgid "Acceptable values: 1-256. Defaults to 1 if not set" -msgstr "" +msgstr "Akzeptable Werte: 1-256. Standardwert ist 1, wenn nicht gesetzt" #: applications/luci-app-mwan3/luasrc/controller/mwan3.lua:177 msgid "All required IP rules for interface %s found" -msgstr "" +msgstr "Alle erforderlichen IP-Regeln für die Schnittstelle %s gefunden" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua:36 msgid "Also scan this Routing table for connected networks" -msgstr "" +msgstr "Auch diese Routing-Tabelle für verbundene Netzwerke scannen" #: applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm:73 msgid "Check IP rules" @@ -97,7 +97,7 @@ msgstr "Prüfen der IP-Regeln" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:81 msgid "Check link quality" -msgstr "" +msgstr "Linkqualität prüfen" #: applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm:74 msgid "Check routing table" @@ -155,11 +155,11 @@ msgstr "Fehler beim Sammeln von Informationen zur Fehlerbehebung" #: applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm:81 msgid "Execute" -msgstr "" +msgstr "Ausführen" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:20 msgid "Expect interface state on up event" -msgstr "" +msgstr "Erwarteter Schnittstellen status beim up event" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:155 msgid "Failure interval" @@ -167,19 +167,19 @@ msgstr "Fehler-Intervall" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua:15 msgid "Firewall mask" -msgstr "" +msgstr "Firewall-Maske" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:219 msgid "Flush conntrack table" -msgstr "" +msgstr "Conntrack-Tabelle leeren" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:220 msgid "Flush global firewall conntrack table on interface events" -msgstr "" +msgstr "Leere Global-Firewall-Conntrack-Table bei Schnittstellen-Events" #: applications/luci-app-mwan3/luasrc/controller/mwan3.lua:45 msgid "Globals" -msgstr "" +msgstr "Allgemein" #: applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm:76 msgid "Hotplug ifdown" @@ -191,13 +191,13 @@ msgstr "Hotplug ifup" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua:24 msgid "How often should rtmon update the interface routing table" -msgstr "" +msgstr "Zeit interval wie oft rtmon die Routing-Tabelle der Schnittstelle aktualisiert" #: applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm:29 #: applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm:56 #: applications/luci-app-mwan3/luasrc/view/mwan/status_troubleshooting.htm:29 msgid "INFO: MWAN not running" -msgstr "" +msgstr "INFO: MWAN läuft nicht" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:50 msgid "IPset" @@ -213,7 +213,7 @@ msgstr "" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:19 msgid "Initial state" -msgstr "" +msgstr "Ausgangszustand" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:148 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua:26 @@ -252,21 +252,21 @@ msgstr "Internet-Protokoll" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:171 msgid "Keep failure interval" -msgstr "" +msgstr "Fehlerintervall beibehalten" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:172 msgid "Keep ping failure interval during failure state" -msgstr "" +msgstr "Ping-Fehlerintervall während des Ausfalls beibehalten" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua:74 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:23 msgid "Last resort" -msgstr "" +msgstr "Letzter Ausweg" #: applications/luci-app-mwan3/luasrc/controller/mwan3.lua:19 #: applications/luci-app-mwan3/luasrc/controller/mwan3.lua:41 msgid "Load Balancing" -msgstr "" +msgstr "Lastverteilung" #: applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm:72 #: applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm:33 @@ -277,27 +277,27 @@ msgstr "Lade" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua:8 msgid "MWAN - Globals" -msgstr "" +msgstr "MWAN - Allgemein" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:137 msgid "MWAN - Interfaces" -msgstr "" +msgstr "MWAN - Schnittstellen" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua:8 msgid "MWAN - Members" -msgstr "" +msgstr "MWAN - Mitglieder" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/notify.lua:10 msgid "MWAN - Notification" -msgstr "" +msgstr "MWAN - Benachrichtigung" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua:37 msgid "MWAN - Policies" -msgstr "" +msgstr "MWAN - Richtlinien" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:41 msgid "MWAN - Rules" -msgstr "" +msgstr "MWAN - Regeln" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:9 msgid "MWAN Interface Configuration - %s" @@ -305,7 +305,7 @@ msgstr "MWAN-Konfiguration, Schnittstelle - %s" #: applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm:70 msgid "MWAN Interfaces" -msgstr "" +msgstr "MWAN Schnittstellen" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua:9 msgid "MWAN Member Configuration - %s" @@ -321,15 +321,15 @@ msgstr "MWAN-Konfiguration, Regeln - %s" #: applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm:27 msgid "MWAN Status - Detail" -msgstr "" +msgstr "MWAN Status - Details" #: applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm:54 msgid "MWAN Status - Diagnostics" -msgstr "" +msgstr "MWAN Status - Diagnose" #: applications/luci-app-mwan3/luasrc/view/mwan/status_troubleshooting.htm:27 msgid "MWAN Status - Troubleshooting" -msgstr "" +msgstr "MWAN Status - Fehlerbehebung" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:141 msgid "" @@ -340,18 +340,25 @@ msgid "" ">Interfaces may not share the same name as configured members, policies or " "rules" msgstr "" +"MWAN unterstützt bis zu 252 physische und/oder logische Schnittstellen" +"<br />MWAN erfordert, dass alle Schnittstellen eine eindeutige Metrik haben, " +"die in /etc/config/network konfiguriert sind <br /> Namen müssen mit dem " +"Schnittstellennamen in /etc/config/network übereinstimmen <br /> Namen dürfen " +"Zeichen A-Z, a-z, 0-9, _ enthalten aber keine Leerzeichen<br />Schnittstellen " +"dürfen nicht den gleichen Namen wie konfigurierte Mitglieder, Richtlinien " +"oder Regeln verwenden" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:69 msgid "Max TTL" -msgstr "" +msgstr "Maximale TTL" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:85 msgid "Max packet latency [ms]" -msgstr "" +msgstr "Maximale Paketlatenzzeit [ms]" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:97 msgid "Max packet loss [%]" -msgstr "" +msgstr "Maximaler Paketverlust [%]" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:21 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:28 @@ -398,15 +405,15 @@ msgstr "Metrik" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:106 msgid "Min packet latency [ms]" -msgstr "" +msgstr "Minimale Paketlatenzzeit [ms]" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:118 msgid "Min packet loss [%]" -msgstr "" +msgstr "Minimaler Paketverlust [%]" #: applications/luci-app-mwan3/luasrc/controller/mwan3.lua:190 msgid "Missing both IP rules for interface %s" -msgstr "" +msgstr "Beide IP-Regeln fehlen für die Schnittstelle %s" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:51 msgid "" @@ -427,15 +434,15 @@ msgstr "Keine MWAN-Schnittstellen gefunden" #: applications/luci-app-mwan3/luasrc/controller/mwan3.lua:159 msgid "No gateway for interface %s found." -msgstr "" +msgstr "No gateway für Schnittstelle %s gefunden" #: applications/luci-app-mwan3/luasrc/controller/mwan3.lua:168 msgid "No tracking Hosts for interface %s defined." -msgstr "" +msgstr "Kein Tracking Host für die Schnittstelle %s definiert" #: applications/luci-app-mwan3/luasrc/controller/mwan3.lua:60 msgid "Notification" -msgstr "" +msgstr "Benachrichtigung" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:23 #: applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm:26 @@ -450,7 +457,7 @@ msgstr "" #: applications/luci-app-mwan3/luasrc/controller/mwan3.lua:182 #: applications/luci-app-mwan3/luasrc/controller/mwan3.lua:186 msgid "Only one IP rules for interface %s found" -msgstr "" +msgstr "Nur eine IP-Regel für die Schnittstelle %s gefunden" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:45 msgid "Ping count" @@ -499,6 +506,15 @@ msgid "" "spaces<br />Names must be 15 characters or less<br />Policies may not share " "the same name as configured interfaces, members or rules" msgstr "" +"Richtlinien sind Profile, die ein oder mehrere Mitglieder gruppieren und MWAN" +"steuern und verteilt den Traffic<br />Mitglieder-Schnittstellen mit " +"niedrigeren Metriken werden als ersters genutzt<br />Mitglieder-Schnittstellen " +"mit der gleichen Metrik werden lastverteilt<br /> Mitglieder-Schnittstellen " +"verteilen mehr Traffic aus denen mit höhere Gewichtung." +"<br />Namen können die Zeichen A-Z, a-z, 0-9, _ und keine Leerzeichen enthalten. " +"<br />Namen müssen 15 Zeichen oder weniger sein" +"<br />Richtlinien dürfen nicht den gleichen Namen wie konfigurierte Schnittstellen, " +"Mitglieder oder Regeln verwenden." #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua:50 msgid "Policy" @@ -522,19 +538,19 @@ msgstr "Wiederherstellungs-Intervall" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua:39 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua:40 msgid "Routing table %d" -msgstr "" +msgstr "Routing-Tabelle %d" #: applications/luci-app-mwan3/luasrc/controller/mwan3.lua:196 msgid "Routing table %s for interface %s found" -msgstr "" +msgstr "Routing-Tabelle %s für die Schnittstelle %s gefunden" #: applications/luci-app-mwan3/luasrc/controller/mwan3.lua:200 msgid "Routing table %s for interface %s not found" -msgstr "" +msgstr "Routing-Tabelle %s für die Schnittstelle %s nicht gefunden" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua:35 msgid "Routing table lookup" -msgstr "" +msgstr "Routing-Tabelle nachschlagen" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:58 msgid "Rule" @@ -556,6 +572,17 @@ msgid "" "z, 0-9, _ and no spaces<br />Rules may not share the same name as configured " "interfaces, members or policies" msgstr "" +"Regeln legen fest, welcher Datenverkehr eine bestimmte MWAN-Richtlinie verwendet<br />" +"Regeln basieren auf IP-Adresse, Port oder Protokoll<br />" +"Regeln werden von oben nach unten abgeglichen<br />" +"Regeln unterhalb einer Matching-Regel werden ignoriert<br />" +"Der Datenverkehr, der keiner Regel entspricht, wird über die Hauptroutentabelle geleitet<br />" +"Der Datenverkehr, der für bekannte (nicht Standard) Netzwerke bestimmt ist" +"wird von der Hauptroutinentabelle abgewickelt<br />" +"Der Datenverker, der einer Regel entspricht, wo alle WAN-Schnittstellen für diese " +" Richtlinie nicht verbunden sind, werden verworfen<br />" +"Namen können die Zeichen A-Z, a-z, 0-9, _ und keine Leerzeichen enthalten<br />" +"Regeln dürfen nicht den gleichen Namen wie konfigurierte Schnittstellen, Mitglieder oder Richtlinien verwenden<br />" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:47 msgid "Seconds. Acceptable values: 1-1000000. Defaults to 600 if not set" @@ -629,6 +656,21 @@ msgid "" "Physical device name which interface went up or down (e.g. \"eth0\" or " "\"wwan0\")<br /><br />" msgstr "" +"Dieser Abschnitt ermöglicht es Ihnen, den Inhalt von \"/etc/mwan3.user\" zu ändern <br />" +"Die Datei bleibt auch während des System-Upgrades erhalten.<br /><br /><br />Anmerkung:<br />Diese " +"Datei wird als Shell-Skript interpretiert.<br />Die erste Zeile des Skripts " +"muss "#!/bin/sh" ohne Anführungszeichen sein.<br />Zeilen, die mit # beginnen, sind " +"Kommentare und werden nicht ausgeführt.<br />Setzen Sie Ihre eigene mwan3-Aktion hier, sie " +"wird bei jedem netifd hotplug interface event ausgeführt<br />" +"für die Schnittstell wo der mwan3 aktiviert ist.<br /><br /><br /><br />Es gibt drei Haupt " +"Umgebungsvariablen, die an dieses Skript übergeben werden.<br /><br /><br />$ACTION " +"<br />* \"ifup\" Wird von netifd und mwan3track ausgeführt<br />* \"ifdown\" Wird " +"von netifd und mwan3track ausgeführt<br />* \"connected\" Wird von " +"mwan3track ausgeführt, wenn das Tracking erfolgreich war <br />* \"disconnected\" Wird " +"von mwan3track ausgeführt, wenn das Tracking fehlgeschlagen ist <br />$INTERFACE Name der " +"Schnittstelle, die up oder down gegangen ist (z.B. \"wan\" oder \"wwan\")<br />$DEVICE " +"Physischer Gerätename, dessen Schnittstelle up oder down gegangen ist (z.B. \"eth0\" oder " +"\"wwan0\")<br /><br /><br />" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:30 msgid "Tracking hostname or IP address" @@ -637,12 +679,12 @@ msgstr "Tracking des Hostnamen oder der IP-Addresse" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:168 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:34 msgid "Tracking method" -msgstr "" +msgstr "Tracking-Methode" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:179 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:40 msgid "Tracking reliability" -msgstr "" +msgstr "Tracking-Sicherheit" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:41 msgid "" @@ -662,11 +704,11 @@ msgstr "Fehlerbehebung" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua:23 msgid "Update interval" -msgstr "" +msgstr "Aktualisierungsintervall" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:31 msgid "View the content of /etc/protocols for protocol description" -msgstr "" +msgstr "Schaue in der Datei /etc/protocols für Protokollbeschreibung mach" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:17 msgid "WARNING: %d interfaces are configured exceeding the maximum of %d!" @@ -702,7 +744,7 @@ msgstr "" #: applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm:37 msgid "Waiting for command to complete..." -msgstr "" +msgstr "Warten auf den Abschluss des Befehls..." #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua:38 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua:27 diff --git a/applications/luci-app-mwan3/po/ja/mwan3.po b/applications/luci-app-mwan3/po/ja/mwan3.po index 1920d6bb4e..4c9ad6c185 100644 --- a/applications/luci-app-mwan3/po/ja/mwan3.po +++ b/applications/luci-app-mwan3/po/ja/mwan3.po @@ -7,7 +7,7 @@ msgstr "" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.7\n" +"X-Generator: Poedit 2.2\n" "Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n" "Plural-Forms: nplurals=1; plural=0;\n" "Language: ja\n" @@ -83,8 +83,8 @@ msgid "" "Acceptable values: 1-100. This many Tracking IP addresses must respond for " "the link to be deemed up" msgstr "" -"利用可能な値: 1-100。上記の追跡 IP の合計個数のうち、Up 状態と判定するために" -"に必要な、レスポンスが返された追跡 IP アドレスの個数です。" +"利用可能な値: 1-100。上記のトラッキング IP の合計個数のうち、Up 状態と判定す" +"るためにに必要な、レスポンスが返されたトラッキング IP アドレスの個数です。" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua:28 msgid "Acceptable values: 1-1000. Defaults to 1 if not set" @@ -96,11 +96,12 @@ msgstr "利用可能な値: 1-256。空欄の場合のデフォルトは1です #: applications/luci-app-mwan3/luasrc/controller/mwan3.lua:177 msgid "All required IP rules for interface %s found" -msgstr "" +msgstr "インターフェース %s の全必須 IP ルールが見つかりました" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua:36 msgid "Also scan this Routing table for connected networks" msgstr "" +"接続されたネットワークのために、追加でスキャンするルーティングテーブルです。" #: applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm:73 msgid "Check IP rules" @@ -204,7 +205,7 @@ msgstr "ホットプラグ ifup" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua:24 msgid "How often should rtmon update the interface routing table" -msgstr "" +msgstr "rtmon がインターフェース ルーティングテーブルの更新を行う頻度です。" #: applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm:29 #: applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm:56 @@ -363,7 +364,7 @@ msgstr "" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:69 msgid "Max TTL" -msgstr "" +msgstr "最大 TTL" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:85 msgid "Max packet latency [ms]" @@ -447,11 +448,11 @@ msgstr "MWAN インターフェースが見つかりません" #: applications/luci-app-mwan3/luasrc/controller/mwan3.lua:159 msgid "No gateway for interface %s found." -msgstr "" +msgstr "インターフェース %s にゲートウェイが見つかりません。" #: applications/luci-app-mwan3/luasrc/controller/mwan3.lua:168 msgid "No tracking Hosts for interface %s defined." -msgstr "" +msgstr "インターフェース %s にトラッキングホストが指定されていません。" #: applications/luci-app-mwan3/luasrc/controller/mwan3.lua:60 msgid "Notification" @@ -470,7 +471,7 @@ msgstr "オンライン" #: applications/luci-app-mwan3/luasrc/controller/mwan3.lua:182 #: applications/luci-app-mwan3/luasrc/controller/mwan3.lua:186 msgid "Only one IP rules for interface %s found" -msgstr "" +msgstr "インターフェース %s に IP ルールが一つのみ見つかりました。" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:45 msgid "Ping count" @@ -478,7 +479,7 @@ msgstr "Ping 回数" #: applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm:71 msgid "Ping default gateway" -msgstr "Ping デフォルト ゲートウェイ" +msgstr "デフォルト ゲートウェイへのping" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:190 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:140 @@ -503,7 +504,7 @@ msgstr "Ping タイムアウト" #: applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm:72 msgid "Ping tracking IP" -msgstr "Ping トラッキング IP" +msgstr "トラッキング IP へのping" #: applications/luci-app-mwan3/luasrc/controller/mwan3.lua:54 msgid "Policies" @@ -550,19 +551,19 @@ msgstr "障害復旧 インターバル" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua:39 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua:40 msgid "Routing table %d" -msgstr "" +msgstr "ルーティングテーブル %d" #: applications/luci-app-mwan3/luasrc/controller/mwan3.lua:196 msgid "Routing table %s for interface %s found" -msgstr "" +msgstr "ルーティングテーブル %s が見つかりました（インターフェース %s）" #: applications/luci-app-mwan3/luasrc/controller/mwan3.lua:200 msgid "Routing table %s for interface %s not found" -msgstr "" +msgstr "ルーティングテーブル %s が見つかりません（インターフェース %s）" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua:35 msgid "Routing table lookup" -msgstr "" +msgstr "ルーティングテーブルの検索" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:58 msgid "Rule" @@ -681,17 +682,17 @@ msgstr "" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:30 msgid "Tracking hostname or IP address" -msgstr "追跡ホスト名または IP アドレス" +msgstr "トラッキング ホスト名または IP アドレス" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:168 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:34 msgid "Tracking method" -msgstr "追跡方式" +msgstr "トラッキング方式" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:179 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:40 msgid "Tracking reliability" -msgstr "追跡の信頼性" +msgstr "トラッキングの信頼性" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:41 msgid "" @@ -711,7 +712,7 @@ msgstr "トラブルシューティング" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua:23 msgid "Update interval" -msgstr "" +msgstr "更新間隔" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:31 msgid "View the content of /etc/protocols for protocol description" @@ -735,8 +736,8 @@ msgid "" "WARNING: Interface %s has a higher reliability requirement than tracking " "hosts (%d)" msgstr "" -"警告: インターフェース %s は追跡ホスト数 (%d) よりも高い追跡信頼性の値が設定" -"されています" +"警告: インターフェース %s はトラッキング ホスト数 (%d) よりも高いトラッキング" +"信頼性の値が設定されています" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:30 msgid "WARNING: Interface %s has no default route in the main routing table" @@ -810,10 +811,3 @@ msgstr "never" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:59 msgid "unreachable (reject)" msgstr "unreachable (reject)" - -#~ msgid "" -#~ "Use the IP address of this interface as source IP address for traffic " -#~ "initiated by the router itself" -#~ msgstr "" -#~ "ルーター自身によって発生するトラフィックのアクセス元 IP アドレスとして、こ" -#~ "のインターフェースの IP アドレスが使用されます。" diff --git a/applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua b/applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua index 42043505dc..637eb11736 100644 --- a/applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua +++ b/applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua @@ -17,25 +17,29 @@ function index() end function _action_rate(rv, n) - local c = io.popen("nft list chain inet nft-qos-monitor " .. n .. " 2>/dev/null") + local c = nixio.fs.access("/proc/net/ipv6_route") and + io.popen("nft list chain inet nft-qos-monitor " .. n .. " 2>/dev/null") or + io.popen("nft list chain ip nft-qos-monitor " .. n .. " 2>/dev/null") + if c then for l in c:lines() do - local _, i, p, b = l:match('^%s+ip ([^%s]+) ([^%s]+) counter packets (%d+) bytes (%d+)') + local _, i, p, b = l:match( + '^%s+ip ([^%s]+) ([^%s]+) counter packets (%d+) bytes (%d+)' + ) if i and p and b then -- handle expression - local r = { + rv[#rv + 1] = { rule = { - family = "inet", - table = "nft-qos-monitor", - chain = n, - handle = 0, - expr = { + family = "inet", + table = "nft-qos-monitor", + chain = n, + handle = 0, + expr = { { match = { right = i } }, { counter = { packets = p, bytes = b } } } } } - rv[#rv + 1] = r end end c:close() diff --git a/applications/luci-app-nut/luasrc/model/cbi/nut_server.lua b/applications/luci-app-nut/luasrc/model/cbi/nut_server.lua index dea7932395..6aaf1d2c22 100644 --- a/applications/luci-app-nut/luasrc/model/cbi/nut_server.lua +++ b/applications/luci-app-nut/luasrc/model/cbi/nut_server.lua @@ -48,7 +48,7 @@ o.optional = true o.datatype = "port" o.placeholder = "3493" -s = m:section(NamedSection, "upsd", "upsd", translate("Global Settings")) +s = m:section(NamedSection, "upsd", "upsd", translate("UPS Server Global Settings")) s.addremove = true o = s:option(Value, "maxage", translate("Maximum Age of Data"), translate("Period after which data is considered stale")) @@ -74,6 +74,43 @@ if luci.util.checklib("/usr/sbin/upsd", "libssl.so") then o.optional = true end +s = m:section(NamedSection, "driver_global", "driver_global", translate("Driver Global Settings")) +s.addremove = true + +o = s:option(Value, "chroot", translate("chroot"), translate("Run drivers in a chroot(2) environment")) +o.optional = true + +o = s:option(Value, "driverpath", translate("Driver Path"), translate("Path to drivers (instead of default)")) +o.optional = true +o.placeholder = "/lib/lnut" + +o = s:option(Value, "maxstartdelay", translate("Maximum Start Delay"), translate("Default for UPSes without this field.")) +o.optional = true +o.datatype = "uinteger" + +o = s:option(Value, "maxretry", translate("Maxium Retries"), translate("Maximum number of times to try starting a driver.")) +o.optional = true +o.placeholder = 1 +o.datatype = "uinteger" + +o = s:option(Value, "retrydelay", translate("Retry Delay"), translate("Time in seconds between driver start retry attempts.")) +o.optional = true +o.placeholder = 5 +o.datatype = "uinteger" + +o = s:option(Value, "pollinterval", translate("Poll Interval"), translate("Maximum time in seconds between refresh of UPS status")) +o.optional = true +o.placeholder = 2 +o.datatype = "uinteger" + +o = s:option(Flag, "synchronous", translate("Synchronous Communication"), translate("Driver waits for data to be consumed by upsd before publishing more.")) +o.optional = true +o.default = false + +o = s:option(Value, "user", translate("RunAs User"), translate("User as which to execute driver; requires device file accessed by driver to be read-write for that user.")) +o.optional = true +o.placeholder = "nut" + s = m:section(TypedSection, "driver", translate("Driver Configuration"), translate("The name of this section will be used as UPS name elsewhere")) s.addremove = true @@ -81,15 +118,47 @@ s.anonymous = false driverlist = nixio.fs.dir("/lib/nut") +o = s:option(Value, "bus", translate("USB Bus(es) (regex)")) +o.optional = true +o.datatype = "uinteger" + +o = s:option(Value, "community", translate("SNMP Community")) +o.optional = true +o.placeholder = "private" + +o = s:option(Value, "desc", translate("Description (Display)")) +o.optional = true + o = s:option(ListValue, "driver", translate("Driver")) for driver in driverlist do o:value(driver) end o.optional = false -o = s:option(Value, "port", translate("Port")) -o.optional = false -o.default = "auto" +o = s:option(Flag, "enable_usb_serial", translate("Set USB serial port permissions"), translate("Enables a hotplug script that makes all ttyUSB devices (e.g. serial USB) group read-write as user 'nut'")) +o.optional = true +o.default = false + +o = s:option(Flag, "ignorelb", translate("Ignore Low Battery")) +o.optional = true +o.default = false + +o = s:option(Flag, "interruptonly", translate("Interrupt Only")) +o.optional = true +o.default = false + +o = s:option(Value, "interruptsize", translate("Interrupt Size"), translate("Bytes to read from interrupt pipe")) +o.optional = true +o.datatype = "uinteger" + +o = s:option(Value, "maxreport", translate("Max USB HID Length Reported"), translate("Workaround for buggy firmware")) +o.optional = true +o.datatype = "uinteger" + +o = s:option(Value, "maxstartdelay", translate("Maxium Start Delay"), translate("Time in seconds that upsdrvctl will wait for driver to finish starting")) +o.optional = true +o.datatype = "uinteger" +o.placeholder = 45 o = s:option(Value, "mfr", translate("Manufacturer (Display)")) o.optional = true @@ -97,11 +166,13 @@ o.optional = true o = s:option(Value, "model", translate("Model (Display)")) o.optional = true -o = s:option(Value, "serial", translate("Serial Number")) +o = s:option(Flag, "nolock", translate("No Lock"), translate("Don't lock port when starting driver")) o.optional = true +o.default = false -o = s:option(Value, "sdtime", translate("Additional Shutdown Time(s)")) +o = s:option(Flag, "notransferoids", translate("No low/high voltage transfer OIDs")) o.optional = true +o.default = false o = s:option(Value, "offdelay", translate("Off Delay(s)"), translate("Delay for kill power command")) o.optional = true @@ -128,42 +199,33 @@ o.optional = true o.datatype = "integer" o.placeholder = 30 -o = s:option(Value, "vendor", translate("Vendor (regex)")) -o.optional = true +o = s:option(Value, "port", translate("Port")) +o.optional = false +o.default = "auto" o = s:option(Value, "product", translate("Product (regex)")) o.optional = true -o = s:option(Value, "bus", translate("USB Bus(es) (regex)")) -o.optional = true -o.datatype = "uinteger" - -o = s:option(Flag, "interruptonly", translate("Interrupt Only")) -o.optional = true -o.default = false - -o = s:option(Value, "interruptsize", translate("Interrupt Size"), translate("Bytes to read from interrupt pipe")) +o = s:option(Value, "productid", translate("USB Product Id")) o.optional = true -o.datatype = "integer" -o = s:option(Value, "maxreport", translate("Max USB HID Length Reported"), translate("Workaround for buggy firmware")) +o = s:option(Value, "sdorder", translate("Driver Shutdown Order")) o.optional = true -o.datatype = "integer" -o.default = nil +o.datatype = "uinteger" -o = s:option(Value, "vendorid", translate("USB Vendor Id")) +o = s:option(Value, "sdtime", translate("Additional Shutdown Time(s)")) o.optional = true -o = s:option(Value, "productid", translate("USB Product Id")) +o = s:option(Value, "serial", translate("Serial Number")) o.optional = true -o = s:option(Value, "runas", translate("RunAs User"), translate("User as which to execute driver; requires device file accessed by driver be read-write for that user.")) +o = s:option(Value, "snmp_retries", translate("SNMP retries")) o.optional = true -o.placeholder = "nut" +o.datatype = "uinteger" -o = s:option(Value, "community", translate("SNMP Community")) +o = s:option(Value, "snmp_timeout", translate("SNMP timeout(s)")) o.optional = true -o.placeholder = "private" +o.datatype = "uinteger" o = s:option(ListValue, "snmp_version", translate("SNMP version")) o.optional = true @@ -173,19 +235,14 @@ o:value("v3", translate("SNMPv3")) o:value("", "") o.default = "" -o = s:option(Value, "snmp_retries", translate("SNMP retries")) +o = s:option(Value, "vendor", translate("Vendor (regex)")) o.optional = true -o.datatype = "uinteger" -o = s:option(Value, "snmp_timeout", translate("SNMP timeout(s)")) +o = s:option(Value, "vendorid", translate("USB Vendor Id")) o.optional = true -o.datatype = "uinteger" -o = s:option(Flag, "notransferoids", translate("No low/high voltage transfer OIDs")) +o = s:option(Flag, "synchronous", translate("Synchronous Communication"), translate("Driver waits for data to be consumed by upsd before publishing more.")) o.optional = true o.default = false -o = s:option(Value, "other", translate("Additional Parameters")) -o.optional = true - return m diff --git a/applications/luci-app-nut/po/templates/nut.pot b/applications/luci-app-nut/po/templates/nut.pot new file mode 100644 index 0000000000..945c31ddab --- /dev/null +++ b/applications/luci-app-nut/po/templates/nut.pot @@ -0,0 +1,588 @@ +msgid "" +msgstr "Content-Type: text/plain; charset=UTF-8" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:216 +msgid "Additional Shutdown Time(s)" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:37 +msgid "Addresses on which to listen" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:23 +msgid "Allowed actions" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:20 +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:188 +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:217 +msgid "As configured by NUT" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:150 +msgid "Bytes to read from interrupt pipe" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:174 +msgid "CA Certificate path" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:73 +msgid "Certificate file (SSL)" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:63 +msgid "Communications lost message" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:60 +msgid "Communications restored message" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:35 +msgid "Control UPS via CGI" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:43 +msgid "Deadtime" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:87 +msgid "Default for UPSes without this field." +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:177 +msgid "Delay for kill power command" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:181 +msgid "Delay to power on UPS if power returns after kill power" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:129 +msgid "Description (Display)" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:32 +msgid "Display name" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:169 +msgid "Don't lock port when starting driver" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:132 +msgid "Driver" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:114 +msgid "Driver Configuration" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:77 +msgid "Driver Global Settings" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:83 +msgid "Driver Path" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:212 +msgid "Driver Shutdown Order" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:106 +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:244 +msgid "Driver waits for data to be consumed by upsd before publishing more." +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:59 +msgid "Drop privileges to this user" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:40 +msgid "Enable" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:138 +msgid "" +"Enables a hotplug script that makes all ttyUSB devices (e.g. serial USB) " +"group read-write as user 'nut'" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:93 +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:102 +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:110 +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:118 +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:126 +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:134 +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:142 +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:150 +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:158 +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:166 +msgid "Execute notify command" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:26 +msgid "Forced Shutdown" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:57 +msgid "Forced shutdown message" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:10 +msgid "Global Settings" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:13 +msgid "Go to NUT CGI" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:16 +msgid "Host" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:23 +msgid "Hostname or IP address" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:191 +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:220 +msgid "Hostname or address of UPS" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:39 +msgid "Hot Sync" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:41 +msgid "IP Address" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:95 +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:104 +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:112 +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:120 +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:128 +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:136 +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:144 +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:152 +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:160 +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:168 +msgid "Ignore" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:142 +msgid "Ignore Low Battery" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:29 +msgid "Instant commands" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:146 +msgid "Interrupt Only" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:150 +msgid "Interrupt Size" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:54 +msgid "Low battery message" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:163 +msgid "Manufacturer (Display)" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:34 +msgid "Master" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:154 +msgid "Max USB HID Length Reported" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:54 +msgid "Maximum Age of Data" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:87 +msgid "Maximum Start Delay" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:67 +msgid "Maximum connections" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:91 +msgid "Maximum number of times to try starting a driver." +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:101 +msgid "Maximum time in seconds between refresh of UPS status" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:91 +msgid "Maxium Retries" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:158 +msgid "Maxium Start Delay" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:17 +msgid "Minimum required number or power supplies" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:166 +msgid "Model (Display)" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:9 +msgid "NUT CGI Access" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:12 +msgid "NUT Users" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:188 +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:217 +msgid "Name of UPS" +msgstr "" + +#: applications/luci-app-nut/luasrc/controller/nut.lua:11 +msgid "Network UPS Tools" +msgstr "" + +#: applications/luci-app-nut/luasrc/controller/nut.lua:22 +#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:6 +msgid "Network UPS Tools (CGI)" +msgstr "" + +#: applications/luci-app-nut/luasrc/controller/nut.lua:18 +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:7 +msgid "Network UPS Tools (Monitor)" +msgstr "" + +#: applications/luci-app-nut/luasrc/controller/nut.lua:14 +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:9 +msgid "Network UPS Tools (Server)" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:7 +msgid "Network UPS Tools CGI Configuration" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:8 +msgid "Network UPS Tools Monitoring Configuration" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:10 +msgid "Network UPS Tools Server Configuration" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:169 +msgid "No Lock" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:72 +msgid "No communications message" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:173 +msgid "No low/high voltage transfer OIDs" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:75 +msgid "No parent message" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:90 +msgid "Notification defaults" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:26 +msgid "Notify command" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:99 +msgid "Notify when back online" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:163 +msgid "Notify when battery needs replacing" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:147 +msgid "Notify when communications lost" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:139 +msgid "Notify when communications restored" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:131 +msgid "Notify when force shutdown" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:115 +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:123 +msgid "Notify when low battery" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:107 +msgid "Notify when on battery" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:155 +msgid "Notify when shutting down" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:177 +msgid "Off Delay(s)" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:181 +msgid "On Delay(s)" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:51 +msgid "On battery message" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:48 +msgid "Online message" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:208 +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:237 +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:19 +msgid "Password" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:174 +msgid "Path containing ca certificates to match against host certificate" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:83 +msgid "Path to drivers (instead of default)" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:63 +msgid "Path to state file" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:54 +msgid "Period after which data is considered stale" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:101 +msgid "Poll Interval" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:29 +msgid "Poll frequency" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:34 +msgid "Poll frequency alert" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:197 +msgid "Polling Frequency(s)" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:27 +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:195 +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:224 +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:46 +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:202 +msgid "Port" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:200 +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:229 +msgid "Power value" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:206 +msgid "Product (regex)" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:69 +msgid "Replace battery message" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:178 +msgid "Require SSL and make sure server CN matches hostname" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:96 +msgid "Retry Delay" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:32 +msgid "Role" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:80 +msgid "Run drivers in a chroot(2) environment" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:14 +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:59 +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:110 +msgid "RunAs User" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:125 +msgid "SNMP Community" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:222 +msgid "SNMP retries" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:226 +msgid "SNMP timeout(s)" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:230 +msgid "SNMP version" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:232 +msgid "SNMPv1" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:233 +msgid "SNMPv2c" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:234 +msgid "SNMPv3" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:219 +msgid "Serial Number" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:138 +msgid "Set USB serial port permissions" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:25 +msgid "Set variables" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:22 +msgid "Shutdown command" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:66 +msgid "Shutdown message" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:33 +msgid "Slave" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:106 +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:244 +msgid "Synchronous Communication" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:115 +msgid "The name of this section will be used as UPS name elsewhere" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:96 +msgid "Time in seconds between driver start retry attempts." +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:158 +msgid "Time in seconds that upsdrvctl will wait for driver to finish starting" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:183 +msgid "UPS Master" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:51 +msgid "UPS Server Global Settings" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:212 +msgid "UPS Slave" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:20 +msgid "UPS name" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:121 +msgid "USB Bus(es) (regex)" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:209 +msgid "USB Product Id" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:241 +msgid "USB Vendor Id" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:29 +msgid "" +"Use upscmd -l to see full list which the commands your UPS supports " +"(requires upscmd package)" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:110 +msgid "" +"User as which to execute driver; requires device file accessed by driver to " +"be read-write for that user." +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:205 +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:234 +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:16 +msgid "Username" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:238 +msgid "Vendor (regex)" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:178 +msgid "Verify all connection with SSL" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:154 +msgid "Workaround for buggy firmware" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:94 +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:103 +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:111 +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:119 +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:127 +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:135 +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:143 +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:151 +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:159 +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:167 +msgid "Write to syslog" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:80 +msgid "chroot" +msgstr "" + +#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:14 +msgid "upsmon drops privileges to this user" +msgstr "" diff --git a/applications/luci-app-olsr/po/de/olsr.po b/applications/luci-app-olsr/po/de/olsr.po index 15b8412a26..51cc1a84c4 100644 --- a/applications/luci-app-olsr/po/de/olsr.po +++ b/applications/luci-app-olsr/po/de/olsr.po @@ -21,32 +21,34 @@ msgstr "Aktive MID-Ankündigungen" msgid "Active OLSR nodes" msgstr "Aktive OLSR-Knoten" -#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:77 +#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82 msgid "Active host net announcements" msgstr "Aktive HNA-Ankündigungen" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:45 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45 msgid "Advanced Settings" msgstr "Erweiterte Einstellungen" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141 msgid "Allow gateways with NAT" msgstr "Gateways mit NAT erlauben" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141 msgid "Allow the selection of an outgoing ipv4 gateway with NAT" msgstr "Auswahl von IPv4-Gateways erlauben, die zum Internet hin NAT verwenden" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:155 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149 msgid "Announce uplink" msgstr "Uplink ankündigen" -#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:86 -#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:101 +#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:39 +#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:90 +#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:47 +#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:107 msgid "Announced network" msgstr "Angekündigtes Netzwerk" @@ -63,12 +65,12 @@ msgid "Both values must use the dotted decimal notation." msgstr "" "Beide Werte müssen in der 'dotted decimal' Schreibweise angegeben werden." -#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29 +#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:30 msgid "Broadcast address" msgstr "Broadcast-Adresse" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:265 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90 msgid "Can only be a valid IPv4 or IPv6 address or 'default'" msgstr "" @@ -87,11 +89,16 @@ msgid "" "allows connections from localhost." msgstr "" +#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24 +msgid "Device" +msgstr "Schnittstelle" + #: applications/luci-app-olsr/luasrc/controller/olsr.lua:75 msgid "Display" msgstr "Anzeige" -#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:105 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:60 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:112 msgid "Downlink" msgstr "Download-Bandbreite" @@ -99,24 +106,25 @@ msgstr "Download-Bandbreite" msgid "Download Config" msgstr "Konfiguration herunterladen" -#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:102 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:57 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:109 #: applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm:26 msgid "ETX" msgstr "ETX" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:346 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:35 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:15 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15 msgid "Enable" msgstr "Aktivieren" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134 msgid "" "Enable SmartGateway. If it is disabled, then all other SmartGateway " "parameters are ignored. Default is \"no\"." @@ -124,13 +132,13 @@ msgstr "" "SmartGateway aktivieren. Ist diese Option deaktiviert, dann werden alle " "folgenden SmartGateway Einstellungen ignoriert. Der Defaultwert ist \"no\"." -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:36 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36 msgid "Enable this interface." msgstr "Dieses Interface benutzen." -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:249 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249 msgid "Enabled" msgstr "Aktiviert" @@ -138,13 +146,13 @@ msgstr "Aktiviert" msgid "Expected retransmission count" msgstr "Zu erwartende Sendeversuche pro Paket" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:71 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65 msgid "FIB metric" msgstr "FIB-Metrik" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:72 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66 msgid "" "FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" " "means that the metric value is always 2. This is the preferred value because " @@ -160,28 +168,29 @@ msgstr "" "aber nur, wenn sich auch der Nexthop verändert hat. Der Defaultwert ist " "\"flat\"." -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:112 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106 msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\"" msgstr "" "Fisheye Mechanismus für TC-Nachrichten (ausgewählt entspricht ein). Der " "Defaultwert ist \"ein\"" -#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:100 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:55 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107 msgid "Gateway" msgstr "Gateway" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:42 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:216 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:31 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31 msgid "General Settings" msgstr "Allgemeine Einstellungen" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:39 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39 msgid "General settings" msgstr "Allgemeine Einstellungen" @@ -199,8 +208,8 @@ msgid "Green" msgstr "" #: applications/luci-app-olsr/luasrc/controller/olsr.lua:53 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:402 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:178 msgid "HNA" msgstr "HNA" @@ -209,17 +218,17 @@ msgstr "HNA" msgid "HNA Announcements" msgstr "HNA-Ankündigungen" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:322 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:165 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152 msgid "HNA interval" msgstr "HNA-Intervall" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:328 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:171 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158 msgid "HNA validity time" msgstr "HNA-Gültigkeit" @@ -228,22 +237,22 @@ msgstr "HNA-Gültigkeit" msgid "HNA6 Announcements" msgstr "HNA-Ankündigungen" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:381 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362 msgid "Hello" msgstr "Hello" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:286 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:129 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116 msgid "Hello interval" msgstr "Hello-Intervall" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:292 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:135 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122 msgid "Hello validity time" msgstr "Hello-Gültigkeit" @@ -261,16 +270,18 @@ msgstr "" msgid "Hna4" msgstr "Hna4" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10 msgid "Hna6" msgstr "Hna6" -#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:103 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:58 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:110 msgid "Hops" msgstr "Sprünge" -#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:118 +#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:61 +#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:127 msgid "Hostname" msgstr "Hostname" @@ -291,8 +302,8 @@ msgstr "" "Rechner in einem OLSR-geroutetem Netzwerk können Konnektivität zu externen " "Netzwerken mittels HNA-Nachrichten ankündigen." -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:117 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111 msgid "" "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more " "robustness to the link sensing but delays neighbor registration. Defaults is " @@ -303,10 +314,10 @@ msgstr "" "aber das Registrieren von Nachbarknoten. Der Defaultwert ist \"eingeschaltet" "\"." +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:217 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:32 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32 msgid "IP Addresses" msgstr "IP-Adressen" @@ -318,17 +329,18 @@ msgstr "" "Die zu verwendende IP-Version. Wird 6and4 gewählt dann wird ein OLSRd-" "Prozess für jedes Protokoll gestartet." -#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:106 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:61 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:113 msgid "IPv4" msgstr "IPv4" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:278 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103 msgid "IPv4 broadcast" msgstr "IPv4 Broadcast" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:279 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104 msgid "" "IPv4 broadcast address for outgoing OLSR packets. One useful example would " "be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the " @@ -338,13 +350,13 @@ msgstr "" "Beispiel ist 255.255.255.255. Der Defaultwert ist \"0.0.0.0\". Dies " "verwendet die Broadcastadresse des Interfaces." -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:291 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116 msgid "IPv4 source" msgstr "IPv4 Quell-IP" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:292 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117 msgid "" "IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which " "triggers usage of the interface IP." @@ -352,21 +364,22 @@ msgstr "" "IPv4 Quell-IP für ausgehende OLSR-Nachrichten. Der Defaultwert ist " "\"0.0.0.0\", dann wird die IP des Interfaces verwendet." -#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:62 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:114 msgid "IPv6" msgstr "IPv6" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:272 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:110 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103 msgid "IPv6 multicast" msgstr "IPv6 Multicast" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:273 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:111 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104 msgid "" "IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal " "multicast." @@ -374,25 +387,25 @@ msgstr "" "IPv6 Multicast-Adresse. Der Defaultwert ist \"FF02::6D\", die linklocal " "Multicastadresse für MANETs." -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10 msgid "" "IPv6 network must be given in full notation, prefix must be in CIDR notation." msgstr "" "IPv6 Netzwerk muss in 'full notation', der Prefix in CIDR Schreibweise " "eingegeben werden." +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:278 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:122 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109 msgid "IPv6 source" msgstr "IPv6 Quell-IP" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:279 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:123 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110 msgid "" "IPv6 src prefix. OLSRd will choose one of the interface IPs which matches " "the prefix of this parameter. Default is \"0::/0\", which triggers the usage " @@ -402,13 +415,13 @@ msgstr "" "angegebenen Prefix liegt. Der Defaultwert ist \"0::/0\", damit wird eine " "IPv6-Adresse des Interfaces verwendet die nicht linklocal ist." -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178 msgid "IPv6-Prefix of the uplink" msgstr "IPv6-Präfix des Uplinks" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:202 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196 msgid "" "If the route to the current gateway is to be changed, the ETX value of this " "gateway is multiplied with this value before it is compared to the new one. " @@ -423,26 +436,28 @@ msgstr "" "><b>ACHTUNG:</b> Diese Einstellung darf nicht zusammen mit der etx_ffeth " "Metrik verwendet werden!<br />Der Defaultwert ist \"1.0\"." -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160 msgid "" "If this Node uses NAT for connections to the internet. Default is \"yes\"." msgstr "" "Benutzt dieser Knoten NAT für die Verbindung zum Internet? Der Defaultwert " "ist \"yes\"." -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:27 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:23 -#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:119 -#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103 +#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:62 +#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128 +#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:49 +#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:109 msgid "Interface" msgstr "Schnittstelle" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:221 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:52 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52 msgid "" "Interface Mode is used to prevent unnecessary packet forwarding on switched " "ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is " @@ -453,15 +468,15 @@ msgstr "" "\"ether\". Der Defaultwert ist \"mesh\"." #: applications/luci-app-olsr/luasrc/controller/olsr.lua:70 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:354 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:14 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:163 msgid "Interfaces" msgstr "Schnittstellen" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:218 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212 msgid "Interfaces Defaults" msgstr "Schnittstellen-Standards" @@ -469,8 +484,8 @@ msgstr "Schnittstellen-Standards" msgid "Internet protocol" msgstr "Internet Protokoll" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:60 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54 msgid "" "Interval to poll network interfaces for configuration changes (in seconds). " "Default is \"2.5\"." @@ -478,23 +493,23 @@ msgstr "" "Intervall mit dem Netzwerkschnittstellen auf Änderungen in ihrer " "Konfiguration überprüft werden (in Sekunden). Der Defaultwert ist \"2.5\"." +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:262 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:93 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93 msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0." msgstr "" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:265 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:96 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96 msgid "" "Invalid Value for LQMult-Value. You must use a decimal number between 0.01 " "and 1.0 here." msgstr "" -#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:91 +#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:98 msgid "Known OLSR routes" msgstr "Bekannte OLSR-Routen" @@ -502,30 +517,30 @@ msgstr "Bekannte OLSR-Routen" msgid "LQ" msgstr "LQ" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:90 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84 msgid "LQ aging" msgstr "LQ-Alterung" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:96 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90 msgid "LQ algorithm" msgstr "LQ-Algorithmus" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:111 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105 msgid "LQ fisheye" msgstr "LQ-Fisheye" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:82 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76 msgid "LQ level" msgstr "LQ-Level" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:256 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:87 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87 msgid "" "LQMult requires two values (IP address or 'default' and multiplicator) " "separated by space." @@ -539,20 +554,20 @@ msgstr "letzter Hop" msgid "Legend" msgstr "Legende" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:23 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:257 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257 msgid "Library" msgstr "Bibliothek" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:43 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43 msgid "Link Quality Settings" msgstr "Linkqualitätseinstellungen" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:91 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85 msgid "" "Link quality aging factor (only for lq level 2). Tuning parameter for " "etx_float and etx_fpm, smaller values mean slower changes of ETX value. " @@ -562,8 +577,8 @@ msgstr "" "verwendet werden. Kleinere Werte bedeuten, dass ETX-Werte sich langsamer " "verändern. Erlaubte Werte sind 0.01 bis 1.0." -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:97 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91 msgid "" "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: " "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as " @@ -580,8 +595,8 @@ msgstr "" "Variante von etx_ff die Ethernetlinks mit ETX 0.1 erlaubt<br />Der Default " "ist \"etx_ff\"" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:83 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77 msgid "" "Link quality level switch between hopcount and cost-based (mostly ETX) " "routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link " @@ -591,10 +606,10 @@ msgstr "" "><b>0</b> = Linkquality nicht benutzen<br /><b>2</b> = Linkquality für die " "Wahl von MPRs und fürs Routing benutzen.<br />Der Defaultwert ist \"2\"." +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:239 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:70 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70 msgid "LinkQuality Multiplicator" msgstr "LQ-Multiplikator" @@ -606,36 +621,37 @@ msgstr "Verbindungen pro Node (Durchschnitt)" msgid "Links total" msgstr "Verbindungen insgesamt" -#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:120 +#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:63 +#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:129 msgid "Local interface IP" msgstr "Lokale Interface-IP" #: applications/luci-app-olsr/luasrc/controller/olsr.lua:58 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:395 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376 msgid "MID" msgstr "MID" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:310 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:153 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140 msgid "MID interval" msgstr "MID-Intervall" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:316 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:159 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146 msgid "MID validity time" msgstr "MID-Gültigkeit" -#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25 +#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26 msgid "MTU" msgstr "MTU" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:132 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126 msgid "Main IP" msgstr "Haupt-IP" @@ -645,21 +661,22 @@ msgid "" "configured on port 9090 and accepts connections from \"127.0.0.1\"." msgstr "" -#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:104 +#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:50 +#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:110 msgid "Metric" msgstr "Metrik" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:220 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:357 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:51 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51 msgid "Mode" msgstr "Modus" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:246 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71 msgid "" "Multiply routes with the factor given here. Allowed values are between 0.01 " "and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /" @@ -681,8 +698,8 @@ msgstr "" "zu 192.168.0.1: 192.168.0.1 0.5<br />reduziere die LQ für alle Nodes die mit " "diesem Interface kommunizieren um 20%: default 0.8" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:201 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195 msgid "NAT threshold" msgstr "NAT-Schwellenwert" @@ -694,7 +711,8 @@ msgstr "NLQ" msgid "Neighbors" msgstr "Nachbarn" -#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117 +#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:60 +#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:126 msgid "Neighbour IP" msgstr "Nachbar-IP" @@ -703,26 +721,26 @@ msgid "Neighbours" msgstr "Nachbarn" #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:21 -#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28 +#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29 msgid "Netmask" msgstr "Netzmaske" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:354 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:44 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:160 msgid "Network" msgstr "Netzwerk" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:17 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:34 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16 msgid "Network address" msgstr "Netzwerk-Adresse" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:59 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53 msgid "Nic changes poll interval" msgstr "Abfrageintervall für Schnittstellenänderungen" @@ -747,30 +765,32 @@ msgstr "OLSR - HNA-Ankündigungen" msgid "OLSR - HNA6-Announcements" msgstr "OLSR - HNA-Ankündigungen" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:9 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:216 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216 msgid "OLSR - Plugins" msgstr "OLSR - Plugins" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:12 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12 #: applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm:8 msgid "OLSR Daemon" msgstr "OLSR Daemon" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:14 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14 msgid "OLSR Daemon - Interface" msgstr "OLSR Daemon - Schnittstelle" -#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:107 +#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117 msgid "OLSR connections" msgstr "OLSR-Verbindungen" -#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87 -#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:102 +#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:40 +#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:91 +#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:48 +#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:108 msgid "OLSR gateway" msgstr "OLSR-Gateway" @@ -788,11 +808,11 @@ msgstr "" msgid "Overview" msgstr "Übersicht" -#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82 +#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87 msgid "Overview of currently active OLSR host net announcements" msgstr "Übersicht über zur Zeit aktive OLSR-Netzwerk-Ankündigungen" -#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:112 +#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:122 msgid "Overview of currently established OLSR connections" msgstr "Übersicht über aktuell bestehende OLSR-Verbindungen" @@ -800,7 +820,7 @@ msgstr "Übersicht über aktuell bestehende OLSR-Verbindungen" msgid "Overview of currently known OLSR nodes" msgstr "Übersicht über zur Zeit bekannte andere OLSR-Knoten" -#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:96 +#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103 msgid "Overview of currently known routes to other OLSR nodes" msgstr "Übersicht über zur Zeit bekannte Routen zu anderen OLSR-Knoten" @@ -812,40 +832,41 @@ msgstr "Übersicht über Interfaces auf denen OLSRd läuft." msgid "Overview of known multiple interface announcements" msgstr "Übersicht über bekannte Mehrfachschnittstellenmeldungen" -#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:96 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104 msgid "Overview of smart gateways in this network" msgstr "Übersicht über Smart Gateways in diesem Netzwerk." -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:11 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11 msgid "Plugin configuration" msgstr "Pluginkonfiguration" #: applications/luci-app-olsr/luasrc/controller/olsr4.lua:29 #: applications/luci-app-olsr/luasrc/controller/olsr6.lua:29 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:240 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240 msgid "Plugins" msgstr "Plugins" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:54 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48 msgid "Polling rate for OLSR sockets in seconds. Default is 0.05." msgstr "Abfragerate für OLSRd-Sockets in Sekunden. Der Defaultwert ist 0.05." -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:53 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47 msgid "Pollrate" msgstr "Abfragerate" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:126 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120 msgid "Port" msgstr "Port" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:38 -#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:63 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:115 msgid "Prefix" msgstr "Prefix" @@ -877,9 +898,10 @@ msgstr "Routen" msgid "Secondary OLSR interfaces" msgstr "Sekundäre OLSR Schnittstellen" -#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:101 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:56 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108 msgid "Selected" -msgstr "" +msgstr "Ausgewählt" #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:133 msgid "" @@ -915,25 +937,25 @@ msgid "Signal Noise Ratio in dB" msgstr "" #: applications/luci-app-olsr/luasrc/controller/olsr.lua:64 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44 msgid "SmartGW" msgstr "Smart Gateway" -#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:89 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:97 msgid "SmartGW announcements" msgstr "Smart Gateway Ankündigungen" -#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:147 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:150 msgid "SmartGateway is not configured on this system." msgstr "Smart Gateway ist auf diesem System nicht konfiguriert." -#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27 +#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28 msgid "Source address" msgstr "Quell-IP" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170 msgid "" "Specifies the speed of the uplink in kilobits/s. First parameter is " "upstream, second parameter is downstream. Default is \"128 1024\"." @@ -942,12 +964,12 @@ msgstr "" "Der erste Wert ist die Upload-, der zweite Wert die Downloadgeschwindigkeit. " "Der Defaultwert ist \"128 1024\"." -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170 msgid "Speed of the uplink" msgstr "Geschwindigkeit des Uplinks" -#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24 +#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25 msgid "State" msgstr "Status" @@ -967,34 +989,34 @@ msgstr "Erfolgsquote vom Nachbarn empfangener Pakete" msgid "Success rate of packages sent to the neighbour" msgstr "Erfolgsquote zum Nachbarn gesendeter Pakete" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:388 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369 msgid "TC" msgstr "TC" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:298 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:141 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128 msgid "TC interval" msgstr "TC-Intervall" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:304 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:147 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134 msgid "TC validity time" msgstr "TC-Gültigkeit" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:65 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59 msgid "TOS value" msgstr "TOS-Wert" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:13 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:15 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15 msgid "" "The OLSR daemon is an implementation of the Optimized Link State Routing " "protocol. As such it allows mesh routing for any network equipment. It runs " @@ -1006,8 +1028,8 @@ msgstr "" "erlaubt damit Mesh-Routing für jegliche Netzwerkgeräte. Besuche <a " "href='http://www.olsr.org'>olsrd.org</a> für Hilfe und Dokumentation." -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:194 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188 msgid "" "The fixed willingness to use. If not set willingness will be calculated " "dynamically based on battery/power status. Default is \"3\"." @@ -1016,13 +1038,13 @@ msgstr "" "dann wird der Bereitschaftswert automatisch anhand von Akkukapazität und " "Stromversorgung berechnet" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:45 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45 msgid "The interface OLSRd should serve." msgstr "Interface das OLSRd verwenden soll." -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:127 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121 msgid "" "The port OLSR uses. This should usually stay at the IANA assigned port 698. " "It can have a value between 1 and 65535." @@ -1030,8 +1052,8 @@ msgstr "" "Port, den OLSRd benutzt. Dieser sollte in der Regel auf dem Defaultwert 698 " "bleiben, was dem von IANA zugewiesenen Port für OLSRd entspricht." -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178 msgid "" "This can be used to signal the external IPv6 prefix of the uplink to the " "clients. This might allow a client to change it's local IPv6 address to use " @@ -1043,10 +1065,10 @@ msgstr "" "Übersetzung der IPv6-Adresse zu benutzen. Die maximale erlaubte Länge des " "Präfix ist 64 bit. Der Defaultwert ist \"::/0\" (kein Präfix)." +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:218 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:33 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33 msgid "Timing and Validity" msgstr "Taktung und Validität" @@ -1054,8 +1076,8 @@ msgstr "Taktung und Validität" msgid "Topology" msgstr "Topologie" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:66 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60 msgid "" "Type of service value for the IP header of control traffic. Default is " "\"16\"." @@ -1066,21 +1088,23 @@ msgstr "" msgid "Unable to connect to the OLSR daemon!" msgstr "Es konnte keine Verbindung zum OLSR-Daemon hergestellt werden!" -#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:59 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:111 msgid "Uplink" msgstr "Upload-Bandbreite" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160 msgid "Uplink uses NAT" msgstr "Der Uplink benutzt NAT." -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:116 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110 msgid "Use hysteresis" msgstr "Hysterese aktivieren" -#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:88 +#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:41 +#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:92 msgid "Validity Time" msgstr "" @@ -1096,12 +1120,12 @@ msgstr "" msgid "Very good (SNR > 30)" msgstr "" -#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26 +#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27 msgid "WLAN" msgstr "WLAN" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44 msgid "" "Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not " "work, please install it." @@ -1109,17 +1133,17 @@ msgstr "" "WARNUNG: kmod-ipip ist nicht installiert. Ohne kmod-ipip wird SmartGateway " "nicht funktionieren!" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:229 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:60 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60 msgid "Weight" msgstr "Gewichtung" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:230 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:61 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61 msgid "" "When multiple links exist between hosts the weight of interface is used to " "determine the link to use. Normally the weight is automatically calculated " @@ -1160,8 +1184,8 @@ msgstr "" "2000::/3). Der Defaultwert ist \"both\" (sowohl IPv4 als auch IPv6 Uplink " "ankündigen sofern verfügbar)." -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:193 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187 msgid "Willingness" msgstr "Bereitschaft" @@ -1170,44 +1194,42 @@ msgstr "Bereitschaft" msgid "Yellow" msgstr "" -#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36 +#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38 msgid "down" msgstr "" -#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:30 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134 +msgid "infinate" +msgstr "" + +#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35 -#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129 -#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134 -#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139 msgid "no" msgstr "" -#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36 +#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38 msgid "up" msgstr "" -#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38 +#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35 -#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129 -#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134 -#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139 msgid "yes" msgstr "" #~ msgid "Status" #~ msgstr "Status" -#: application/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:97 -msgid "Selected" -msgstr "Ausgewählt" - -#~ msgid "Device" -#~ msgstr "Schnittstelle" - #~ msgid "" #~ "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, " #~ "configured on port 2006 and accepts connections from \"127.0.0.1\"." diff --git a/applications/luci-app-olsr/po/en/olsr.po b/applications/luci-app-olsr/po/en/olsr.po index a009f84854..ee68cdf692 100644 --- a/applications/luci-app-olsr/po/en/olsr.po +++ b/applications/luci-app-olsr/po/en/olsr.po @@ -21,32 +21,34 @@ msgstr "Active MID announcements" msgid "Active OLSR nodes" msgstr "Active OLSR nodes" -#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:77 +#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82 msgid "Active host net announcements" msgstr "Active host net announcements" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:45 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45 msgid "Advanced Settings" msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141 msgid "Allow gateways with NAT" msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141 msgid "Allow the selection of an outgoing ipv4 gateway with NAT" msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:155 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149 msgid "Announce uplink" msgstr "" -#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:86 -#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:101 +#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:39 +#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:90 +#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:47 +#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:107 msgid "Announced network" msgstr "Announced network" @@ -62,12 +64,12 @@ msgstr "" msgid "Both values must use the dotted decimal notation." msgstr "" -#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29 +#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:30 msgid "Broadcast address" msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:265 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90 msgid "Can only be a valid IPv4 or IPv6 address or 'default'" msgstr "" @@ -86,11 +88,16 @@ msgid "" "allows connections from localhost." msgstr "" +#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24 +msgid "Device" +msgstr "" + #: applications/luci-app-olsr/luasrc/controller/olsr.lua:75 msgid "Display" msgstr "" -#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:105 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:60 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:112 msgid "Downlink" msgstr "" @@ -98,36 +105,37 @@ msgstr "" msgid "Download Config" msgstr "" -#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:102 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:57 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:109 #: applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm:26 msgid "ETX" msgstr "" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:346 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:35 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:15 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15 msgid "Enable" msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134 msgid "" "Enable SmartGateway. If it is disabled, then all other SmartGateway " "parameters are ignored. Default is \"no\"." msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:36 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36 msgid "Enable this interface." msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:249 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249 msgid "Enabled" msgstr "" @@ -135,13 +143,13 @@ msgstr "" msgid "Expected retransmission count" msgstr "Expected retransmission count" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:71 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65 msgid "FIB metric" msgstr "FIB metric" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:72 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66 msgid "" "FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" " "means that the metric value is always 2. This is the preferred value because " @@ -151,26 +159,27 @@ msgid "" "Default is \"flat\"." msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:112 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106 msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\"" msgstr "" -#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:100 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:55 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107 msgid "Gateway" msgstr "" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:42 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:216 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:31 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31 msgid "General Settings" msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:39 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39 msgid "General settings" msgstr "General settings" @@ -188,8 +197,8 @@ msgid "Green" msgstr "" #: applications/luci-app-olsr/luasrc/controller/olsr.lua:53 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:402 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:178 msgid "HNA" msgstr "" @@ -198,17 +207,17 @@ msgstr "" msgid "HNA Announcements" msgstr "" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:322 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:165 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152 msgid "HNA interval" msgstr "HNA interval" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:328 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:171 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158 msgid "HNA validity time" msgstr "HNA validity time" @@ -217,22 +226,22 @@ msgstr "HNA validity time" msgid "HNA6 Announcements" msgstr "OLSR - HNA-Announcements" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:381 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362 msgid "Hello" msgstr "" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:286 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:129 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116 msgid "Hello interval" msgstr "Hello interval" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:292 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:135 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122 msgid "Hello validity time" msgstr "Hello validity time" @@ -250,16 +259,18 @@ msgstr "" msgid "Hna4" msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10 msgid "Hna6" msgstr "" -#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:103 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:58 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:110 msgid "Hops" msgstr "" -#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:118 +#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:61 +#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:127 msgid "Hostname" msgstr "" @@ -275,18 +286,18 @@ msgid "" "networks using HNA6 messages." msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:117 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111 msgid "" "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more " "robustness to the link sensing but delays neighbor registration. Defaults is " "\"yes\"" msgstr "" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:217 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:32 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32 msgid "IP Addresses" msgstr "" @@ -296,85 +307,87 @@ msgid "" "for each protocol." msgstr "" -#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:106 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:61 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:113 msgid "IPv4" msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:278 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103 msgid "IPv4 broadcast" msgstr "IPv4 broadcast" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:279 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104 msgid "" "IPv4 broadcast address for outgoing OLSR packets. One useful example would " "be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the " "interface broadcast IP." msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:291 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116 msgid "IPv4 source" msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:292 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117 msgid "" "IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which " "triggers usage of the interface IP." msgstr "" -#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:62 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:114 msgid "IPv6" msgstr "" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:272 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:110 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103 msgid "IPv6 multicast" msgstr "" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:273 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:111 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104 msgid "" "IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal " "multicast." msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10 msgid "" "IPv6 network must be given in full notation, prefix must be in CIDR notation." msgstr "" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:278 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:122 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109 msgid "IPv6 source" msgstr "" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:279 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:123 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110 msgid "" "IPv6 src prefix. OLSRd will choose one of the interface IPs which matches " "the prefix of this parameter. Default is \"0::/0\", which triggers the usage " "of a not-linklocal interface IP." msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178 msgid "IPv6-Prefix of the uplink" msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:202 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196 msgid "" "If the route to the current gateway is to be changed, the ETX value of this " "gateway is multiplied with this value before it is compared to the new one. " @@ -383,24 +396,26 @@ msgid "" "with the etx_ffeth metric!<br />Defaults to \"1.0\"." msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160 msgid "" "If this Node uses NAT for connections to the internet. Default is \"yes\"." msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:27 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:23 -#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:119 -#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103 +#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:62 +#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128 +#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:49 +#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:109 msgid "Interface" msgstr "" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:221 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:52 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52 msgid "" "Interface Mode is used to prevent unnecessary packet forwarding on switched " "ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is " @@ -408,15 +423,15 @@ msgid "" msgstr "" #: applications/luci-app-olsr/luasrc/controller/olsr.lua:70 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:354 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:14 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:163 msgid "Interfaces" msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:218 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212 msgid "Interfaces Defaults" msgstr "" @@ -424,30 +439,30 @@ msgstr "" msgid "Internet protocol" msgstr "Internet protocol" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:60 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54 msgid "" "Interval to poll network interfaces for configuration changes (in seconds). " "Default is \"2.5\"." msgstr "" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:262 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:93 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93 msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0." msgstr "" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:265 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:96 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96 msgid "" "Invalid Value for LQMult-Value. You must use a decimal number between 0.01 " "and 1.0 here." msgstr "" -#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:91 +#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:98 msgid "Known OLSR routes" msgstr "Known OLSR routes" @@ -455,30 +470,30 @@ msgstr "Known OLSR routes" msgid "LQ" msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:90 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84 msgid "LQ aging" msgstr "LQ aging" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:96 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90 msgid "LQ algorithm" msgstr "LQ algorithm" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:111 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105 msgid "LQ fisheye" msgstr "LQ fisheye" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:82 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76 msgid "LQ level" msgstr "LQ level" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:256 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:87 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87 msgid "" "LQMult requires two values (IP address or 'default' and multiplicator) " "separated by space." @@ -492,28 +507,28 @@ msgstr "Last hop" msgid "Legend" msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:23 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:257 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257 msgid "Library" msgstr "Library" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:43 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43 msgid "Link Quality Settings" msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:91 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85 msgid "" "Link quality aging factor (only for lq level 2). Tuning parameter for " "etx_float and etx_fpm, smaller values mean slower changes of ETX value. " "(allowed values are between 0.01 and 1.0)" msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:97 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91 msgid "" "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: " "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as " @@ -523,18 +538,18 @@ msgid "" "allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\"" msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:83 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77 msgid "" "Link quality level switch between hopcount and cost-based (mostly ETX) " "routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link " "quality for MPR selection and routing<br />Default is \"2\"" msgstr "" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:239 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:70 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70 msgid "LinkQuality Multiplicator" msgstr "" @@ -546,36 +561,37 @@ msgstr "" msgid "Links total" msgstr "" -#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:120 +#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:63 +#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:129 msgid "Local interface IP" msgstr "Local interface IP" #: applications/luci-app-olsr/luasrc/controller/olsr.lua:58 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:395 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376 msgid "MID" msgstr "" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:310 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:153 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140 msgid "MID interval" msgstr "MID interval" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:316 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:159 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146 msgid "MID validity time" msgstr "MID validity time" -#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25 +#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26 msgid "MTU" msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:132 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126 msgid "Main IP" msgstr "" @@ -585,21 +601,22 @@ msgid "" "configured on port 9090 and accepts connections from \"127.0.0.1\"." msgstr "" -#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:104 +#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:50 +#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:110 msgid "Metric" msgstr "" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:220 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:357 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:51 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51 msgid "Mode" msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:246 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71 msgid "" "Multiply routes with the factor given here. Allowed values are between 0.01 " "and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /" @@ -616,8 +633,8 @@ msgid "" "LQ to all nodes on this interface by 20%: default 0.8" msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:201 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195 msgid "NAT threshold" msgstr "" @@ -629,7 +646,8 @@ msgstr "" msgid "Neighbors" msgstr "" -#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117 +#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:60 +#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:126 msgid "Neighbour IP" msgstr "Neighbour IP" @@ -638,26 +656,26 @@ msgid "Neighbours" msgstr "" #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:21 -#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28 +#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29 msgid "Netmask" msgstr "Netmask" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:354 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:44 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:160 msgid "Network" msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:17 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:34 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16 msgid "Network address" msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:59 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53 msgid "Nic changes poll interval" msgstr "" @@ -682,30 +700,32 @@ msgstr "OLSR - HNA-Announcements" msgid "OLSR - HNA6-Announcements" msgstr "OLSR - HNA-Announcements" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:9 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:216 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216 msgid "OLSR - Plugins" msgstr "OLSR - Plugins" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:12 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12 #: applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm:8 msgid "OLSR Daemon" msgstr "OLSR Daemon" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:14 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14 msgid "OLSR Daemon - Interface" msgstr "" -#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:107 +#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117 msgid "OLSR connections" msgstr "OLSR connections" -#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87 -#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:102 +#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:40 +#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:91 +#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:48 +#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:108 msgid "OLSR gateway" msgstr "OLSR gateway" @@ -723,11 +743,11 @@ msgstr "" msgid "Overview" msgstr "" -#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82 +#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87 msgid "Overview of currently active OLSR host net announcements" msgstr "Overview of currently active OLSR host net announcements" -#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:112 +#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:122 msgid "Overview of currently established OLSR connections" msgstr "Overview of currently established OLSR connections" @@ -735,7 +755,7 @@ msgstr "Overview of currently established OLSR connections" msgid "Overview of currently known OLSR nodes" msgstr "Overview of currently known OLSR nodes" -#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:96 +#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103 msgid "Overview of currently known routes to other OLSR nodes" msgstr "Overview of currently known routes to other OLSR nodes" @@ -747,40 +767,41 @@ msgstr "" msgid "Overview of known multiple interface announcements" msgstr "Overview of known multiple interface announcements" -#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:96 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104 msgid "Overview of smart gateways in this network" msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:11 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11 msgid "Plugin configuration" msgstr "Plugin configuration" #: applications/luci-app-olsr/luasrc/controller/olsr4.lua:29 #: applications/luci-app-olsr/luasrc/controller/olsr6.lua:29 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:240 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240 msgid "Plugins" msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:54 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48 msgid "Polling rate for OLSR sockets in seconds. Default is 0.05." msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:53 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47 msgid "Pollrate" msgstr "Pollrate" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:126 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120 msgid "Port" msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:38 -#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:63 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:115 msgid "Prefix" msgstr "Prefix" @@ -808,7 +829,8 @@ msgstr "" msgid "Secondary OLSR interfaces" msgstr "Secondary OLSR interfaces" -#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:101 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:56 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108 msgid "Selected" msgstr "" @@ -839,36 +861,36 @@ msgid "Signal Noise Ratio in dB" msgstr "" #: applications/luci-app-olsr/luasrc/controller/olsr.lua:64 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44 msgid "SmartGW" msgstr "" -#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:89 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:97 msgid "SmartGW announcements" msgstr "" -#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:147 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:150 msgid "SmartGateway is not configured on this system." msgstr "" -#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27 +#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28 msgid "Source address" msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170 msgid "" "Specifies the speed of the uplink in kilobits/s. First parameter is " "upstream, second parameter is downstream. Default is \"128 1024\"." msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170 msgid "Speed of the uplink" msgstr "" -#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24 +#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25 msgid "State" msgstr "" @@ -888,34 +910,34 @@ msgstr "" msgid "Success rate of packages sent to the neighbour" msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:388 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369 msgid "TC" msgstr "" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:298 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:141 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128 msgid "TC interval" msgstr "TC interval" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:304 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:147 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134 msgid "TC validity time" msgstr "TC validity time" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:65 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59 msgid "TOS value" msgstr "" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:13 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:15 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15 msgid "" "The OLSR daemon is an implementation of the Optimized Link State Routing " "protocol. As such it allows mesh routing for any network equipment. It runs " @@ -924,27 +946,27 @@ msgid "" "documentation." msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:194 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188 msgid "" "The fixed willingness to use. If not set willingness will be calculated " "dynamically based on battery/power status. Default is \"3\"." msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:45 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45 msgid "The interface OLSRd should serve." msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:127 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121 msgid "" "The port OLSR uses. This should usually stay at the IANA assigned port 698. " "It can have a value between 1 and 65535." msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178 msgid "" "This can be used to signal the external IPv6 prefix of the uplink to the " "clients. This might allow a client to change it's local IPv6 address to use " @@ -952,10 +974,10 @@ msgid "" "length is 64 bits. Default is \"::/0\" (no prefix)." msgstr "" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:218 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:33 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33 msgid "Timing and Validity" msgstr "" @@ -963,8 +985,8 @@ msgstr "" msgid "Topology" msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:66 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60 msgid "" "Type of service value for the IP header of control traffic. Default is " "\"16\"." @@ -974,21 +996,23 @@ msgstr "" msgid "Unable to connect to the OLSR daemon!" msgstr "Unable to connect to the OLSR daemon!" -#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:59 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:111 msgid "Uplink" msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160 msgid "Uplink uses NAT" msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:116 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110 msgid "Use hysteresis" msgstr "Use hysteresis" -#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:88 +#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:41 +#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:92 msgid "Validity Time" msgstr "" @@ -1004,28 +1028,28 @@ msgstr "" msgid "Very good (SNR > 30)" msgstr "" -#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26 +#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27 msgid "WLAN" msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44 msgid "" "Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not " "work, please install it." msgstr "" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:229 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:60 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60 msgid "Weight" msgstr "" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:230 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:61 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61 msgid "" "When multiple links exist between hosts the weight of interface is used to " "determine the link to use. Normally the weight is automatically calculated " @@ -1050,8 +1074,8 @@ msgid "" "setting is \"both\"." msgstr "" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:193 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187 msgid "Willingness" msgstr "Willingness" @@ -1060,38 +1084,39 @@ msgstr "Willingness" msgid "Yellow" msgstr "" -#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36 +#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38 msgid "down" msgstr "" -#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:30 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134 +msgid "infinate" +msgstr "" + +#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35 -#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129 -#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134 -#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139 msgid "no" msgstr "" -#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36 +#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38 msgid "up" msgstr "" -#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38 +#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35 -#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129 -#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134 -#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138 +#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139 msgid "yes" msgstr "" -#: application/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:97 -msgid "Selected" -msgstr "" - #~ msgid "" #~ "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, " #~ "configured on port 2006 and accepts connections from \"127.0.0.1\"." diff --git a/applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js b/applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js index 274a982929..4a36b0a3c3 100644 --- a/applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js +++ b/applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js @@ -135,7 +135,7 @@ function display(pattern) if (currentDisplayMode === 'updates') { var avail = packages.available.pkgs[name]; - if (!avail || avail.version === pkg.version) + if (!avail || compareVersion(avail.version, pkg.version) <= 0) continue; ver = '%s » %s'.format( @@ -291,6 +291,9 @@ function compareVersion(val, ref) val = val || ''; ref = ref || ''; + if (val === ref) + return 0; + while (vi < val.length || ri < ref.length) { var first_diff = 0; diff --git a/applications/luci-app-opkg/po/uk/opkg.po b/applications/luci-app-opkg/po/uk/opkg.po index a9fe86612c..63f5457fb4 100644 --- a/applications/luci-app-opkg/po/uk/opkg.po +++ b/applications/luci-app-opkg/po/uk/opkg.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"PO-Revision-Date: 2018-11-22 13:55+0200\n" +"PO-Revision-Date: 2018-12-29 23:30+0200\n" "Last-Translator: Yurii <yuripet@gmail.com>\n" "Language-Team: none\n" "Language: uk\n" @@ -65,7 +65,7 @@ msgstr "Подробиці про пакет <em>%h</em>" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:762 msgid "Dismiss" -msgstr "Закрити" +msgstr "Відхилити" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227 msgid "Displaying %d-%d of %d" diff --git a/applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua b/applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua index 4a01bed247..553b297ac0 100644 --- a/applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua +++ b/applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua @@ -98,8 +98,8 @@ else o.inputstyle = "apply" o.write = function() return luci.http.redirect( - luci.dispatcher.build_url("admin/system/packages") .. - "?submit=1&install=iptables-mod-conntrack-extra" + luci.dispatcher.build_url("admin/system/opkg") .. + "?query=iptables-mod-conntrack-extra" ) end end diff --git a/applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua b/applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua index 5fc20c52bc..cbe32afde6 100644 --- a/applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua +++ b/applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua @@ -199,8 +199,8 @@ function option_install_package(s, tab) function p_install.write() return luci.http.redirect( - luci.dispatcher.build_url("admin/system/packages") .. - "?submit=1&install=%s" % opkg_package + luci.dispatcher.build_url("admin/system/opkg") .. + "?query=%s" % opkg_package ) end end diff --git a/applications/luci-app-shadowsocks-libev/po/zh-cn/shadowsocks-libev.po b/applications/luci-app-shadowsocks-libev/po/zh-cn/shadowsocks-libev.po new file mode 100644 index 0000000000..d6b84b913b --- /dev/null +++ b/applications/luci-app-shadowsocks-libev/po/zh-cn/shadowsocks-libev.po @@ -0,0 +1,326 @@ +msgid "" +msgstr "" +"Last-Translator: Yousong Zhou <yszhou4tech@gmail.com>\n" +"Language: zh_CN\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:170 +msgid "<hidden>" +msgstr "<已隐藏>" + +#: applications/luci-app-shadowsocks-libev/luasrc/view/shadowsocks-libev/add_instance.htm:14 +msgid "Add" +msgstr "添加" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instance-details.lua:24 +msgid "Advanced Settings" +msgstr "高级设置" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instance-details.lua:32 +msgid "Bind address" +msgstr "绑定地址" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:73 +msgid "Bypass ss-redir for packets with dst address in this list" +msgstr "对于目的地址在列表中的报文，绕过ss-redir" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:59 +msgid "Bypass ss-redir for packets with src address in this list" +msgstr "对于源地址在列表中的报文，绕过ss-redir" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:65 +msgid "" +"Continue to have dst address checked for packets with src address in this " +"list" +msgstr "对于源地址在列表中的报文，继续检查其目的地址" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:47 +msgid "Default action for locally generated TCP packets" +msgstr "对于设备本身产生的TCP报文的默认行为" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:88 +msgid "" +"Default action for packets whose dst address do not match any of the dst ip " +"list" +msgstr "对于目的地址不在列表中的报文的默认行为" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:68 +msgid "" +"Default action for packets whose src address do not match any of the src ip/" +"net list" +msgstr "对于源地址不在列表中的报文的默认行为" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/servers.lua:11 +msgid "" +"Definition of remote shadowsocks servers. Disable any of them will also " +"disable instances referring to it." +msgstr "在此页面设定访问远端shadowsocks服务器的参数。请注意，禁用远端服务器会同时停止与之关联的shadowsocks-libev组件" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:33 +msgid "Destination Settings" +msgstr "目的地址设定" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instance-details.lua:25 +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:35 +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/servers.lua:28 +msgid "Disable" +msgstr "禁用" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instances.lua:86 +msgid "Disabled" +msgstr "已禁用" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:87 +msgid "Dst default" +msgstr "目的未匹配时默认行为" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:72 +msgid "Dst ip/net bypass" +msgstr "绕过" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:79 +msgid "Dst ip/net bypass file" +msgstr "绕过（文件）" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:75 +msgid "Dst ip/net forward" +msgstr "转发" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:83 +msgid "Dst ip/net forward file" +msgstr "转发（文件）" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:126 +msgid "Enable SO_REUSEPORT" +msgstr "启用SO_REUSEPORT" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:124 +msgid "Enable TCP Fast Open" +msgstr "启用TCP Fast Open" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:125 +msgid "Enable TCP_NODELAY" +msgstr "启用TCP_NODELAY" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instances.lua:83 +msgid "Enable/Disable" +msgstr "启用/禁用" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instances.lua:89 +msgid "Enabled" +msgstr "已启用" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:54 +msgid "Extra arguments" +msgstr "额外参数" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:80 +msgid "" +"File containing ip/net for the purposes as with <em>Dst ip/net bypass</em>" +msgstr "文件列出需要绕过ss-redir转发的地址和网段" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:84 +msgid "" +"File containing ip/net for the purposes as with <em>Dst ip/net forward</em>" +msgstr "文件列出需要使用ss-redir转发的地址和网段" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:106 +msgid "Forward recentrst" +msgstr "转发被连接重置的地址" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:107 +msgid "" +"Forward those packets whose dst have recently sent to us multiple tcp-rst" +msgstr "若近期多次收到某地址的连接重置报文，则将其加入到转发列表中" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:76 +msgid "Forward through ss-redir for packets with dst address in this list" +msgstr "对于目的地址在列表中的报文，通过ss-redir转发" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:62 +msgid "Forward through ss-redir for packets with src address in this list" +msgstr "对于源地址在列表中的报文，通过ss-redir转发" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instance-details.lua:23 +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:31 +msgid "General Settings" +msgstr "常规设置" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:123 +msgid "IPv6 First" +msgstr "IPv6优先" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:50 +msgid "Ingress interfaces" +msgstr "入口网卡" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:197 +msgid "Install package %q" +msgstr "安装%q" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:97 +msgid "Install package iptables-mod-conntrack-extra" +msgstr "安装iptables-mod-conntrack-extra" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instances.lua:11 +msgid "" +"Instances of shadowsocks-libev components, e.g. ss-local, ss-redir, ss-" +"tunnel, ss-server, etc. To enable an instance it is required to enable both " +"the instance itself and the remote server it refers to." +msgstr "此页面展示本地运行的shadowsocks-libev各组件实例，如ss-local、ss-redir、ss-tunnel、ss-server等。请注意，实际启用一个实例要求实例本身及所关联的远端服务器都是启用状态。" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:99 +msgid "Key (base64 encoding)" +msgstr "密钥（base64编码）" + +#: applications/luci-app-shadowsocks-libev/luasrc/controller/shadowsocks-libev.lua:13 +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instances.lua:10 +msgid "Local Instances" +msgstr "本地实例" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:71 +msgid "Local address" +msgstr "监听地址" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:75 +msgid "Local port" +msgstr "监听端口" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:46 +msgid "Local-out default" +msgstr "本地报文默认行为" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:116 +msgid "MTU" +msgstr "" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:95 +msgid "Method" +msgstr "加密方法" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:111 +msgid "Mode of operation" +msgstr "工作模式" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instances.lua:76 +#: applications/luci-app-shadowsocks-libev/luasrc/view/shadowsocks-libev/add_instance.htm:12 +msgid "Name" +msgstr "名称" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:10 +msgid "" +"On this page you can configure how traffics are to be forwarded to ss-redir " +"instances. If enabled, packets will first have their src ip addresses " +"checked against <em>Src ip/net bypass</em>, <em>Src ip/net forward</em>, " +"<em>Src ip/net checkdst</em> and if none matches <em>Src default</em> will " +"give the default action to be taken. If the prior check results in action " +"<em>checkdst</em>, packets will continue to have their dst addresses checked." +msgstr "在此页面，您可以配置指定报文是否通过ss-redir转发。启用后，规则会先将报文的源地址与相应的地址集进行匹配，依次决定是否“绕过（<em>bypass</em>）”、“转发（<em>forward</em>）”，或“继续匹配目的地址（<em>checkdst</em>）”；若未在集合中找到匹配，则执行指定的默认动作。继续匹配目的地址时同理。" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:51 +msgid "Only apply rules on packets from these network interfaces" +msgstr "仅对来自指定网卡的报文应用规则" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instances.lua:78 +msgid "Overview" +msgstr "概览" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:196 +msgid "Package is not installed" +msgstr "依赖包未安装" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:55 +msgid "Passes additional arguments to iptables. Use with care!" +msgstr "给iptables的额外参数。请小心使用" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:103 +msgid "Password" +msgstr "密码" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:123 +msgid "Prefer IPv6 addresses when resolving names" +msgstr "名字解析时优先取用IPv6地址" + +#: applications/luci-app-shadowsocks-libev/luasrc/controller/shadowsocks-libev.lua:21 +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:9 +msgid "Redir Rules" +msgstr "转发规则" + +#: applications/luci-app-shadowsocks-libev/luasrc/controller/shadowsocks-libev.lua:17 +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/servers.lua:10 +msgid "Remote Servers" +msgstr "远端服务器" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:69 +msgid "Remote server" +msgstr "服务器" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:120 +msgid "Run as" +msgstr "运行时用户" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instances.lua:81 +msgid "Running" +msgstr "运行中" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:89 +msgid "Server" +msgstr "监听地址" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:92 +msgid "Server port" +msgstr "监听端口" + +#: applications/luci-app-shadowsocks-libev/luasrc/controller/shadowsocks-libev.lua:9 +msgid "Shadowsocks-libev" +msgstr "" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:32 +msgid "Source Settings" +msgstr "源地址设定" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:67 +msgid "Src default" +msgstr "源未匹配默认行为" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:58 +msgid "Src ip/net bypass" +msgstr "绕过" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:64 +msgid "Src ip/net checkdst" +msgstr "继续匹配目的地址" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:61 +msgid "Src ip/net forward" +msgstr "转发" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instance-details.lua:33 +msgid "The address ss-server will initiate connection from" +msgstr "ss-server建立连接时使用的源地址" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instance-details.lua:42 +msgid "The address ss-tunnel will forward traffic to" +msgstr "ss-tunnel所建立隧道的对端地址" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:118 +msgid "Timeout (sec)" +msgstr "超时时间（秒）" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instance-details.lua:41 +msgid "Tunnel address" +msgstr "隧道对端地址" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:122 +msgid "Verbose" +msgstr "记录详细日志" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:39 +msgid "ss-redir for TCP" +msgstr "用于TCP转发的ss-redir" + +#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:42 +msgid "ss-redir for UDP" +msgstr "用于UDP转发的ss-redir" diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua index e98cde719c..5792536ba1 100644 --- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua +++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua @@ -76,7 +76,8 @@ if dump then local i, v for i, v in ipairs(dump.interface) do if v.interface ~= "loopback" and v.interface ~= "lan" then - o4:value(v.interface) + local device = v.l3_device or v.device or "-" + o4:value(v.interface, v.interface.. " (" ..device.. ")") end end end diff --git a/applications/luci-app-travelmate/luasrc/view/travelmate/travelmate_css.htm b/applications/luci-app-travelmate/luasrc/view/travelmate/travelmate_css.htm index 14afe3997f..36b0081865 100644 --- a/applications/luci-app-travelmate/luasrc/view/travelmate/travelmate_css.htm +++ b/applications/luci-app-travelmate/luasrc/view/travelmate/travelmate_css.htm @@ -1,8 +1,8 @@ <style type="text/css"> textarea { - width: 100%; - height: 450px; + width: 100% !important; + height: 450px !important; border: 1px solid #cccccc; padding: 5px; font-size: 12px; @@ -16,8 +16,8 @@ select[readonly], textarea[readonly] { - width: 100%; - height: 450px; + width: 100% !important; + height: 450px !important; border: 1px solid #cccccc; padding: 5px; font-size: 12px; @@ -33,7 +33,7 @@ .cbi-section-table-row, .tr[data-title]::before { - text-align: left; + text-align: left !important; vertical-align: top; margin-left: 0px; padding-left: 2px; diff --git a/applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua b/applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua index 883e1bb631..eadf9b5722 100644 --- a/applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua +++ b/applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua @@ -42,7 +42,7 @@ function lhttp.validate(self, value, section) end end if not (have_http_listener or have_https_listener) then - return nil, "must listen on at list one address:port" + return nil, "must listen on at least one address:port" end return DynamicList.validate(self, value, section) end @@ -78,7 +78,7 @@ function lhttps.validate(self, value, section) end end if not (have_http_listener or have_https_listener) then - return nil, "must listen on at list one address:port" + return nil, "must listen on at least one address:port" end return DynamicList.validate(self, value, section) end diff --git a/applications/luci-app-unbound/luasrc/controller/unbound.lua b/applications/luci-app-unbound/luasrc/controller/unbound.lua index 5e19621842..32879cb9f2 100644 --- a/applications/luci-app-unbound/luasrc/controller/unbound.lua +++ b/applications/luci-app-unbound/luasrc/controller/unbound.lua @@ -53,7 +53,7 @@ function index() call("QueryLocalZone"), _("Local Zones"), 30).leaf = true entry({"admin", "services", "unbound", "status", "dumpcache"}, - call("QueryCacheDump"), _("Cache Dump"), 40).leaf = true + call("QueryDumpCache"), _("DNS Cache"), 40).leaf = true else entry({"admin", "services", "unbound", "status", "statistics"}, call("ShowEmpty"), _("Statistics"), 10).leaf = true @@ -153,17 +153,33 @@ function QueryLocalZone() {heading = "", description = lcldesc, content = lcldata}) end -function QueryCacheDump() + +function QueryDumpCache() + local tp = require "luci.template" + local tr = require "luci.i18n" + local lcldesc local lcldata = luci.util.exec( "unbound-control -c /var/lib/unbound/unbound.conf dump_cache") - local lcldesc = luci.i18n.translate( - "This shows Unbound 'cache_dump'. Useful to check if unbound is actually caching dns entities.") - luci.template.render("unbound/show-textbox", - {heading = "", description = lcldesc, content = lcldata}) + if #lcldata > 262144 then + lcldesc = tr.translate( + "Unbound cache is too large to display in LuCI.") + + tp.render("unbound/show-empty", + {heading = "", description = lcldesc}) + + else + lcldesc = tr.translate( + "This shows 'ubound-control dump_cache' for auditing records including DNSSEC.") + + tp.render("unbound/show-textbox", + {heading = "", description = lcldesc, content = lcldata}) + end + end + function ShowUnboundConf() local unboundfile = "/var/lib/unbound/unbound.conf" local lcldata = nixio.fs.readfile(unboundfile) @@ -196,7 +212,7 @@ function ShowAdblock() if fs.stat(adblockfile).size > 262144 then lcldesc = tr.translate( - "Adblock domain list '" .. adblockfile .. "' is too large for LuCI.") + "Adblock domain list is too large to display in LuCI.") tp.render("unbound/show-empty", {heading = "", description = lcldesc}) diff --git a/applications/luci-app-wifischedule/po/de/wifischedule.po b/applications/luci-app-wifischedule/po/de/wifischedule.po new file mode 100644 index 0000000000..4addd09185 --- /dev/null +++ b/applications/luci-app-wifischedule/po/de/wifischedule.po @@ -0,0 +1,101 @@ +msgid "" +msgstr "Content-Type: text/plain; charset=UTF-8" + +msgid "Activate wifi" +msgstr "WLAN aktivieren" + +msgid "Could not find required /usr/bin/wifi_schedule.sh or /sbin/wifi" +msgstr "Konnte /usr/bin/wifi_schedule.sh oder /sbin/wifi nicht finden" + +msgid "Could not find required programm /usr/bin/iwinfo" +msgstr "Konnte /usr/bin/iwinfo nicht finden" + +msgid "Cron Jobs" +msgstr "" + +msgid "Day(s) of Week" +msgstr "Wochentag(e)" + +msgid "Defines a schedule when to turn on and off wifi." +msgstr "Definiert einen Zeitplan, wann das WLAN ein- und ausgeschaltet werden soll" + +msgid "Determine Modules Automatically" +msgstr "Module automatisch ermitteln" + +msgid "Disable wifi gracefully" +msgstr "Wifi ordnungsgemäß deaktivieren" + +msgid "Disabled wifi forced" +msgstr "Wifi abrupt deaktivieren" + +msgid "Enable" +msgstr "Aktivieren" + +msgid "Enable Wifi Schedule" +msgstr "Wifi-Zeitschaltung aktivieren" + +msgid "Enable logging" +msgstr "Protokollierung aktivieren" + +msgid "Force disabling wifi even if stations associated" +msgstr "Deaktivieren des WLANs auch bei verbundenen Stationen" + +msgid "Friday" +msgstr "Freitag" + +msgid "Global Settings" +msgstr "Globale Einstellungen" + +msgid "Monday" +msgstr "Montag" + +msgid "Saturday" +msgstr "Samstag" + +msgid "Schedule" +msgstr "Zeitschaltung" + +msgid "Schedule events" +msgstr "Ereignisse planen" + +msgid "Start Time" +msgstr "Startzeit" + +msgid "Start WiFi" +msgstr "WiFi starten" + +msgid "Stop Time" +msgstr "Stoppzeit" + +msgid "Stop WiFi" +msgstr "WiFi stoppen" + +msgid "Sunday" +msgstr "Sonntag" + +msgid "The value %s is invalid" +msgstr "Der Wert %s ist ungültig" + +msgid "Thursday" +msgstr "Donnerstag" + +msgid "Tuesday" +msgstr "Dienstag" + +msgid "Unload Modules (experimental; saves more power)" +msgstr "Module entladen (experimentell - spart mehr Energie)" + +msgid "View Cron Jobs" +msgstr "Cron-Jobs anzeigen" + +msgid "View Logfile" +msgstr "Protokolldatei anzeigen" + +msgid "Wednesday" +msgstr "Mittwoch" + +msgid "Wifi Schedule" +msgstr "Wifi-Zeitschaltung" + +msgid "Wifi Schedule Logfile" +msgstr "Protokolldatei für Wifi-Zeitschaltung" |