diff options
Diffstat (limited to 'applications/luci-app-adblock')
13 files changed, 803 insertions, 44 deletions
diff --git a/applications/luci-app-adblock/luasrc/controller/adblock.lua b/applications/luci-app-adblock/luasrc/controller/adblock.lua index b74858400b..0cfbb5f7f6 100644 --- a/applications/luci-app-adblock/luasrc/controller/adblock.lua +++ b/applications/luci-app-adblock/luasrc/controller/adblock.lua @@ -1,4 +1,4 @@ --- Copyright 2017 Dirk Brenken (dev@brenken.org) +-- Copyright 2017-2018 Dirk Brenken (dev@brenken.org) -- This is free software, licensed under the Apache License, Version 2.0 module("luci.controller.adblock", package.seeall) @@ -27,9 +27,9 @@ function logread() local logfile if nixio.fs.access("/var/log/messages") then - logfile = util.trim(util.exec("cat /var/log/messages | grep 'adblock'")) + logfile = util.trim(util.exec("cat /var/log/messages | grep -F 'adblock-'")) else - logfile = util.trim(util.exec("logread -e 'adblock'")) + logfile = util.trim(util.exec("logread -e 'adblock-'")) end templ.render("adblock/logread", {title = i18n.translate("Adblock Logfile"), content = logfile}) 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 4bb404c25c..476d8ece6c 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,4 +1,4 @@ --- Copyright 2017 Dirk Brenken (dev@brenken.org) +-- 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") @@ -74,34 +74,45 @@ end o2 = s:option(ListValue, "adb_dns", translate("DNS Backend (DNS Directory)"), translate("List of supported DNS backends with their default list export directory.<br />") .. translate("To overwrite the default path use the 'DNS Directory' option in the extra section below.")) -o2:value("dnsmasq", "dnsmasq (/tmp/dnsmasq.d)") +o2:value("dnsmasq", "dnsmasq (/tmp)") o2:value("unbound", "unbound (/var/lib/unbound)") o2:value("named", "named (/var/lib/bind)") o2:value("kresd", "kresd (/etc/kresd)") o2:value("dnscrypt-proxy","dnscrypt-proxy (/tmp)") +o2.default = "dnsmasq (/tmp)" o2.rmempty = false -o3 = s:option(ListValue, "adb_trigger", translate("Startup Trigger"), +o3 = s:option(ListValue, "adb_fetchutil", translate("Download Utility"), +translate("List of supported and fully pre-configured download utilities.")) +o3:value("uclient-fetch") +o3:value("wget") +o3:value("curl") +o3:value("aria2c") +o3:value("wget-nossl", "wget-nossl (noSSL)") +o3:value("busybox", "wget-busybox (noSSL)") +o3.default = "uclient-fetch" +o3.rmempty = false + +o4 = s:option(ListValue, "adb_trigger", translate("Startup Trigger"), translate("List of available network interfaces. Usually the startup will be triggered by the 'wan' interface.<br />") .. translate("Choose 'none' to disable automatic startups, 'timed' to use a classic timeout (default 30 sec.) or select another trigger interface.")) -o3:value("none") -o3:value("timed") +o4:value("none") +o4:value("timed") if dump then local i, v for i, v in ipairs(dump.interface) do if v.interface ~= "loopback" then - o3:value(v.interface) + o4:value(v.interface) end end end -o3.rmempty = false +o4.rmempty = false -- Runtime information -ds = s:option(DummyValue, "", translate("Runtime Information")) -ds.template = "cbi/nullsection" +ds = m:section(NamedSection, "global", "adblock", translate("Runtime Information")) -dv1 = s:option(DummyValue, "", translate("Adblock Status")) +dv1 = ds:option(DummyValue, "", translate("Adblock Status")) dv1.template = "adblock/runtime" if parse == nil then dv1.value = translate("n/a") @@ -112,12 +123,14 @@ else dv1.value = translate("disabled") elseif status == "paused" then dv1.value = translate("paused") + elseif status == "running" then + dv1.value = translate("running") else dv1.value = translate("enabled") end end -dv2 = s:option(DummyValue, "", translate("Adblock Version")) +dv2 = ds:option(DummyValue, "", translate("Adblock Version")) dv2.template = "adblock/runtime" if parse == nil then dv2.value = translate("n/a") @@ -125,8 +138,8 @@ else dv2.value = version end -dv3 = s:option(DummyValue, "", translate("Download Utility (SSL Library)"), - translate("For SSL protected blocklist sources you need a suitable SSL library, e.g. 'libustream-ssl' or the wget 'built-in'.")) +dv3 = ds:option(DummyValue, "", translate("Download Utility (SSL Library)"), + translate("For SSL protected blocklist sources you need a suitable SSL library, e.g. 'libustream-ssl' or 'built-in'.")) dv3.template = "adblock/runtime" if parse == nil then dv3.value = translate("n/a") @@ -134,7 +147,7 @@ else dv3.value = fetch end -dv4 = s:option(DummyValue, "", translate("DNS Backend (DNS Directory)")) +dv4 = ds:option(DummyValue, "", translate("DNS Backend (DNS Directory)")) dv4.template = "adblock/runtime" if parse == nil then dv4.value = translate("n/a") @@ -142,7 +155,7 @@ else dv4.value = backend end -dv5 = s:option(DummyValue, "", translate("Overall Domains")) +dv5 = ds:option(DummyValue, "", translate("Overall Domains")) dv5.template = "adblock/runtime" if parse == nil then dv5.value = translate("n/a") @@ -150,7 +163,7 @@ else dv5.value = domains end -dv6 = s:option(DummyValue, "", translate("Last Run")) +dv6 = ds:option(DummyValue, "", translate("Last Run")) dv6.template = "adblock/runtime" if parse == nil then dv6.value = translate("n/a") @@ -163,8 +176,8 @@ end bl = m:section(TypedSection, "source", translate("Blocklist Sources"), translate("Available blocklist sources. ") .. translate("List URLs and Shallalist category selections are configurable in the 'Advanced' section.<br />") - .. translate("Caution: To prevent OOM exceptions on low memory devices with less than 64 MB free RAM, please do not select too many lists - 5-6 should be sufficient!")) -bl.template = "cbi/tblsection" + .. translate("Caution: To prevent OOM exceptions on low memory devices with less than 64 MB free RAM, please do not select more than five blocklist sources!")) +bl.template = "adblock/blocklist" name = bl:option(Flag, "enabled", translate("Enabled")) name.rmempty = false @@ -223,20 +236,38 @@ e7 = e:option(Flag, "adb_whitelist_mode", translate("Whitelist Mode"), e7.default = e7.disabled e7.rmempty = true -e8 = e:option(Value, "adb_dnsdir", translate("DNS Directory"), +e8 = e:option(Flag, "adb_dnsflush", translate("Flush DNS Cache"), + translate("Flush DNS Cache after adblock processing.")) +e8.default = e8.disabled +e8.rmempty = true + +e9 = e:option(Flag, "adb_notify", translate("Email Notification"), + translate("Send notification emails in case of a processing error or if domain count is ≤ 0.<br />") + .. translate("Please note: this needs additional 'mstmp' installation and setup (see readme).")) +e9.default = e9.disabled +e9.rmempty = true + +e10 = e:option(Value, "adb_notifycnt", translate("Email Notification Count"), + translate("Raise the minimum email notification count, to get emails if the overall count is less or equal to the given limit (default 0),<br />") + .. translate("e.g. to receive an email notification with every adblock update set this value to 150000.")) +e10.default = 0 +e10.datatype = "min(0)" +e10.optional = true + +e11 = e:option(Value, "adb_dnsdir", translate("DNS Directory"), translate("Target directory for the generated blocklist 'adb_list.overall'.")) -e8.datatype = "directory" -e8.optional = true +e11.datatype = "directory" +e11.optional = true -e9 = e:option(Value, "adb_whitelist", translate("Whitelist File"), +e12 = e:option(Value, "adb_whitelist", translate("Whitelist File"), translate("Full path to the whitelist file.")) -e9.datatype = "file" -e9.default = "/etc/adblock/adblock.whitelist" -e9.optional = true +e12.datatype = "file" +e12.default = "/etc/adblock/adblock.whitelist" +e12.optional = true -e10 = e:option(Value, "adb_triggerdelay", translate("Trigger Delay"), +e13 = e:option(Value, "adb_triggerdelay", translate("Trigger Delay"), translate("Additional trigger delay in seconds before adblock processing begins.")) -e10.datatype = "range(1,60)" -e10.optional = true +e13.datatype = "range(1,60)" +e13.optional = true return m diff --git a/applications/luci-app-adblock/luasrc/view/adblock/blocklist.htm b/applications/luci-app-adblock/luasrc/view/adblock/blocklist.htm new file mode 100644 index 0000000000..aae64075ff --- /dev/null +++ b/applications/luci-app-adblock/luasrc/view/adblock/blocklist.htm @@ -0,0 +1,80 @@ +<%# +Copyright 2017-2018 Dirk Brenken (dev@brenken.org) +This is free software, licensed under the Apache License, Version 2.0 +-%> + +<%- +local rowcnt = 1 +function rowstyle() + rowcnt = rowcnt + 1 + return (rowcnt % 2) + 1 +end + +function width(o) + if o.width then + if type(o.width) == 'number' then + return ' style="width:%dpx"' % o.width + end + return ' style="width:%s"' % o.width + end + return '' +end +-%> + +<style type="text/css"> +<!-- +.cbi-section-table-cell, +.cbi-section-table-row +{ + text-align:left; + margin-right:auto; + margin-left:0px; +} +--> +</style> + +<fieldset class="cbi-section" id="cbi-<%=self.config%>-<%=self.sectiontype%>"> + <% if self.title then -%> + <legend><%=self.title%></legend> + <%- end %> + <div class="cbi-section-descr"><%=self.description%></div> + <div class="cbi-section-node"> + <%- local count = 0 -%> + <table class="cbi-section-table"> + <tr class="cbi-section-table-titles"> + <%- if self.sectionhead then -%> + <th class="cbi-section-table-cell"><%=self.sectionhead%></th> + <%- else -%> + <th> </th> + <%- end -%> + <%- for i, k in pairs(self.children) do -%> + <th class="cbi-section-table-cell"<%=width(k)%>> + <%-=k.title-%> + </th> + <%- count = count + 1; end; -%> + </tr> + <%- local isempty = true + for i, k in ipairs(self:cfgsections()) do + section = k + isempty = false + scope = { valueheader = "cbi/cell_valueheader", valuefooter = "cbi/cell_valuefooter" } + -%> + <tr class="cbi-section-table-row" id="cbi-<%=self.config%>-<%=section%>"> + <th><%=k%></th> + <%- + for k, node in ipairs(self.children) do + if not node.optional then + node:render(section, scope or {}) + end + end + -%> + </tr> + <%- end -%> + <%- if isempty then -%> + <tr class="cbi-section-table-row"> + <td colspan="<%=count%>"><em><br /><%:This section contains no values yet%></em></td> + </tr> + <%- end -%> + </table> + </div> +</fieldset> diff --git a/applications/luci-app-adblock/luasrc/view/adblock/logread.htm b/applications/luci-app-adblock/luasrc/view/adblock/logread.htm index 5e25a549c6..082ec806f8 100644 --- a/applications/luci-app-adblock/luasrc/view/adblock/logread.htm +++ b/applications/luci-app-adblock/luasrc/view/adblock/logread.htm @@ -1,5 +1,5 @@ <%# -Copyright 2017 Dirk Brenken (dev@brenken.org) +Copyright 2017-2018 Dirk Brenken (dev@brenken.org) This is free software, licensed under the Apache License, Version 2.0 -%> @@ -11,4 +11,10 @@ This is free software, licensed under the Apache License, Version 2.0 <textarea id="logread_id" style="width: 100%; height: 450px; border: 1px solid #cccccc; padding: 5px; font-size: 12px; font-family: monospace; resize: none;" readonly="readonly" wrap="off" rows="<%=content:cmatch("\n")+2%>"><%=content:pcdata()%></textarea> </fieldset> </div> + +<script type="text/javascript"> + var textarea = document.getElementById('logread_id'); + textarea.scrollTop = textarea.scrollHeight; +</script> + <%+footer%> diff --git a/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm b/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm index 0221a75ed1..e7827b5c31 100644 --- a/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm +++ b/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm @@ -1,10 +1,10 @@ <%# -Copyright 2017 Dirk Brenken (dev@brenken.org) +Copyright 2017-2018 Dirk Brenken (dev@brenken.org) This is free software, licensed under the Apache License, Version 2.0 -%> <%+cbi/valueheader%> -<input name="runtime" id="runtime" type="text" class="cbi-input-text" style="border:none;box-shadow:none;background:transparent;color:#0069d6;" value="<%=self:cfgvalue(section)%>" disabled="disabled" /> +<input name="runtime" id="runtime" type="text" class="cbi-input-text" style="outline:none;border:none;box-shadow:none;background:transparent;color:#0069d6;font-weight:bold;line-height:30px;height:30px;" value="<%=self:cfgvalue(section)%>" disabled="disabled" /> <%+cbi/valuefooter%> diff --git a/applications/luci-app-adblock/po/it/adblock.po b/applications/luci-app-adblock/po/it/adblock.po index af3414c997..6f3b53e4ff 100644 --- a/applications/luci-app-adblock/po/it/adblock.po +++ b/applications/luci-app-adblock/po/it/adblock.po @@ -51,7 +51,7 @@ msgstr "Fonti lista di Blocco" msgid "" "Caution: To prevent OOM exceptions on low memory devices with less than 64 " -"MB free RAM, please do not select too many lists - 5-6 should be sufficient!" +"MB free RAM, please do not select more than five blocklist sources!" msgstr "" msgid "" @@ -109,6 +109,12 @@ msgstr "Modifica Configurazione" msgid "Edit Whitelist" msgstr "Modifica Lista Bianca" +msgid "Email Notification" +msgstr "" + +msgid "Email Notification Count" +msgstr "" + msgid "Enable Adblock" msgstr "Attiva Adblock" @@ -130,6 +136,12 @@ msgstr "Abilitato" msgid "Extra Options" msgstr "Opzioni Extra" +msgid "Flush DNS Cache" +msgstr "" + +msgid "Flush DNS Cache after adblock processing." +msgstr "" + msgid "" "For SSL protected blocklist sources you need a suitable SSL library, e.g. " "'libustream-ssl' or the wget 'built-in'." @@ -208,6 +220,11 @@ msgid "Please edit this file directly in a terminal session." msgstr "" "Per favore modifica questo file direttamente in una sessione al terminale." +msgid "" +"Please note: this needs additional 'mstmp' installation and setup (see " +"readme)." +msgstr "" + msgid "Please update your adblock config file to use this package.<br />" msgstr "" @@ -217,6 +234,11 @@ msgstr "Interrogazione" msgid "Query domains" msgstr "Interrogazione domini" +msgid "" +"Raise the minimum email notification count, to get emails if the overall " +"count is less or equal to the given limit (default 0),<br />" +msgstr "" + msgid "Redirect all DNS queries from 'lan' zone to the local resolver." msgstr "" "Reindirizza tutte le richieste DNS dalla zona 'lan' al risolvitore locale." @@ -233,6 +255,11 @@ msgstr "Ric. SSL" msgid "Save" msgstr "Salva" +msgid "" +"Send notification emails in case of a processing error or if domain count is " +"≤ 0.<br />" +msgstr "" + msgid "Startup Trigger" msgstr "Innesco d'Avvio" @@ -290,6 +317,9 @@ msgstr "" "Questo form mostra l'output del registro, prefiltrato per messaggi relativi " "solo ad adblock." +msgid "This section contains no values yet" +msgstr "" + msgid "" "To overwrite the default path use the 'DNS Directory' option in the extra " "section below." @@ -321,6 +351,11 @@ msgstr "Sì" msgid "disabled" msgstr "disabilitato" +msgid "" +"e.g. to receive an email notification with every adblock update set this " +"value to 150000." +msgstr "" + msgid "enabled" msgstr "abilitato" diff --git a/applications/luci-app-adblock/po/ja/adblock.po b/applications/luci-app-adblock/po/ja/adblock.po index becef993fd..f43aafb6f4 100644 --- a/applications/luci-app-adblock/po/ja/adblock.po +++ b/applications/luci-app-adblock/po/ja/adblock.po @@ -52,11 +52,8 @@ msgstr "ブロックリスト提供元" msgid "" "Caution: To prevent OOM exceptions on low memory devices with less than 64 " -"MB free RAM, please do not select too many lists - 5-6 should be sufficient!" +"MB free RAM, please do not select more than five blocklist sources!" msgstr "" -"警告: RAM の空き容量が 64MB に満たないメモリー容量の小さいデバイスでは、 " -"OutOfMemory (OOM) 例外を防ぐために、多くのリストを選択しないようにしてくださ" -"い。5 - 6個のリストで十分です。" msgid "" "Choose 'none' to disable automatic startups, 'timed' to use a classic " @@ -120,6 +117,12 @@ msgstr "設定の編集" msgid "Edit Whitelist" msgstr "ホワイトリストの編集" +msgid "Email Notification" +msgstr "" + +msgid "Email Notification Count" +msgstr "" + msgid "Enable Adblock" msgstr "Adblock の有効化" @@ -143,6 +146,12 @@ msgstr "有効" msgid "Extra Options" msgstr "拡張オプション" +msgid "Flush DNS Cache" +msgstr "" + +msgid "Flush DNS Cache after adblock processing." +msgstr "" + msgid "" "For SSL protected blocklist sources you need a suitable SSL library, e.g. " "'libustream-ssl' or the wget 'built-in'." @@ -223,6 +232,11 @@ msgstr "" msgid "Please edit this file directly in a terminal session." msgstr "ターミナル セッションで直接このファイルを編集してください。" +msgid "" +"Please note: this needs additional 'mstmp' installation and setup (see " +"readme)." +msgstr "" + msgid "Please update your adblock config file to use this package.<br />" msgstr "" "このパッケージを使用するには、既存の Adblock 設定ファイルを更新してください。" @@ -234,6 +248,11 @@ msgstr "検索" msgid "Query domains" msgstr "ドメインの検索" +msgid "" +"Raise the minimum email notification count, to get emails if the overall " +"count is less or equal to the given limit (default 0),<br />" +msgstr "" + msgid "Redirect all DNS queries from 'lan' zone to the local resolver." msgstr "" "'lan' ゾーンからの全 DNS クエリを、ローカル リゾルバにリダイレクトします。" @@ -250,6 +269,11 @@ msgstr "SSL 必須" msgid "Save" msgstr "保存" +msgid "" +"Send notification emails in case of a processing error or if domain count is " +"≤ 0.<br />" +msgstr "" + msgid "Startup Trigger" msgstr "スタートアップ トリガ" @@ -309,6 +333,9 @@ msgstr "" "このフォームには、システムログ内の Adblock に関連するメッセージのみが表示され" "ます。" +msgid "This section contains no values yet" +msgstr "" + msgid "" "To overwrite the default path use the 'DNS Directory' option in the extra " "section below." @@ -340,6 +367,11 @@ msgstr "はい" msgid "disabled" msgstr "無効" +msgid "" +"e.g. to receive an email notification with every adblock update set this " +"value to 150000." +msgstr "" + msgid "enabled" msgstr "有効" @@ -351,3 +383,12 @@ msgstr "利用不可" msgid "paused" msgstr "一時停止" + +#~ msgid "" +#~ "Caution: To prevent OOM exceptions on low memory devices with less than " +#~ "64 MB free RAM, please do not select too many lists - 5-6 should be " +#~ "sufficient!" +#~ msgstr "" +#~ "警告: RAM の空き容量が 64MB に満たないメモリー容量の小さいデバイスでは、 " +#~ "OutOfMemory (OOM) 例外を防ぐために、多くのリストを選択しないようにしてくだ" +#~ "さい。5 - 6個のリストで十分です。" diff --git a/applications/luci-app-adblock/po/pt-br/adblock.po b/applications/luci-app-adblock/po/pt-br/adblock.po index f51791f48d..e08ad6c740 100644 --- a/applications/luci-app-adblock/po/pt-br/adblock.po +++ b/applications/luci-app-adblock/po/pt-br/adblock.po @@ -54,7 +54,7 @@ msgstr "Fontes de listas de bloqueio" msgid "" "Caution: To prevent OOM exceptions on low memory devices with less than 64 " -"MB free RAM, please do not select too many lists - 5-6 should be sufficient!" +"MB free RAM, please do not select more than five blocklist sources!" msgstr "" msgid "" @@ -110,6 +110,12 @@ msgstr "Editar Configuração" msgid "Edit Whitelist" msgstr "Editar Lista Permitida" +msgid "Email Notification" +msgstr "" + +msgid "Email Notification Count" +msgstr "" + msgid "Enable Adblock" msgstr "Habilitar adblock" @@ -130,6 +136,12 @@ msgstr "Habilitado" msgid "Extra Options" msgstr "Opções adicionais" +msgid "Flush DNS Cache" +msgstr "" + +msgid "Flush DNS Cache after adblock processing." +msgstr "" + msgid "" "For SSL protected blocklist sources you need a suitable SSL library, e.g. " "'libustream-ssl' or the wget 'built-in'." @@ -201,6 +213,11 @@ msgstr "" msgid "Please edit this file directly in a terminal session." msgstr "Por favor edite esse arquivo direto em uma sessão de terminal." +msgid "" +"Please note: this needs additional 'mstmp' installation and setup (see " +"readme)." +msgstr "" + msgid "Please update your adblock config file to use this package.<br />" msgstr "" @@ -210,6 +227,11 @@ msgstr "Consulta" msgid "Query domains" msgstr "Consulta de domínios" +msgid "" +"Raise the minimum email notification count, to get emails if the overall " +"count is less or equal to the given limit (default 0),<br />" +msgstr "" + msgid "Redirect all DNS queries from 'lan' zone to the local resolver." msgstr "" @@ -225,6 +247,11 @@ msgstr "req. de SSL" msgid "Save" msgstr "Salvar" +msgid "" +"Send notification emails in case of a processing error or if domain count is " +"≤ 0.<br />" +msgstr "" + msgid "Startup Trigger" msgstr "" @@ -281,6 +308,9 @@ msgstr "" "Esse formulário mostra a saída do syslog, pré-filtrado para mensagens do " "adblock apenas." +msgid "This section contains no values yet" +msgstr "" + msgid "" "To overwrite the default path use the 'DNS Directory' option in the extra " "section below." @@ -310,6 +340,11 @@ msgstr "Sim" msgid "disabled" msgstr "" +msgid "" +"e.g. to receive an email notification with every adblock update set this " +"value to 150000." +msgstr "" + msgid "enabled" msgstr "" diff --git a/applications/luci-app-adblock/po/ru/adblock.po b/applications/luci-app-adblock/po/ru/adblock.po new file mode 100644 index 0000000000..8400c6e146 --- /dev/null +++ b/applications/luci-app-adblock/po/ru/adblock.po @@ -0,0 +1,391 @@ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Project-Id-Version: LuCI: adblock\n" +"POT-Creation-Date: 2017-10-22 13:00+0300\n" +"PO-Revision-Date: 2018-01-06 12:37+0300\n" +"Language-Team: http://cyber-place.ru\n" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.8.7.1\n" +"Last-Translator: Vladimir aka sunny <picfun@ya.ru>\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" +"Language: ru\n" + +msgid "-------" +msgstr "-------" + +msgid "Adblock" +msgstr "Adblock" + +msgid "Adblock Logfile" +msgstr "Ведение системного журала Adblock-ом" + +msgid "Adblock Status" +msgstr "Состояние Adblock-а" + +msgid "Adblock Version" +msgstr "Версия Adblock-а" + +msgid "Additional trigger delay in seconds before adblock processing begins." +msgstr "Дополнительная задержка в секундах до начала работы Adblock-a." + +msgid "Advanced" +msgstr "Дополнительно" + +msgid "Available blocklist sources." +msgstr "Источники списков блокировки. " + +msgid "Backup Directory" +msgstr "Папка для бэкапа" + +msgid "Backup Mode" +msgstr "Режим сохранения бекапа" + +msgid "" +"Block access to all domains except those explicitly listed in the whitelist " +"file." +msgstr "" +"Блокировать доступ ко всем доменам, кроме тех, которые явно перечислены в " +"файле Белого списка." + +msgid "Blocklist Sources" +msgstr "Источники списков блокировки" + +msgid "" +"Caution: To prevent OOM exceptions on low memory devices with less than 64 " +"MB free RAM, please do not select more than five blocklist sources!" +msgstr "" +"ВНИМАНИЕ: Для предотвращения возможного программного сбоя и перезагрузки, на " +"устройствах с объемом оперативной памяти менее 64MB, не выбирайте больше 5 " +"списков." + +msgid "" +"Choose 'none' to disable automatic startups, 'timed' to use a classic " +"timeout (default 30 sec.) or select another trigger interface." +msgstr "" +"Выберите 'none', чтобы отключить автоматический старт, 'timed', чтобы " +"использовать дефолтную задержку (по умолчанию 30 сек.) или выберите другой " +"интерфейс запуска." + +msgid "Collecting data..." +msgstr "Сбор информации..." + +msgid "" +"Configuration of the adblock package to block ad/abuse domains by using DNS." +msgstr "" +"Настройка Adblock. Приложения для блокировки ненадежных или добавления " +"доверенных доменов используя DNS. " + +msgid "" +"Create compressed blocklist backups, they will be used in case of download " +"errors or during startup in backup mode." +msgstr "" +"Создавайте сжатые резервные копии списков блокировки, они будут " +"использоваться в случае ошибок загрузки или при запуске в ручном режиме." + +msgid "DNS Backend (DNS Directory)" +msgstr "DNS бэкенд (папка DNS)" + +msgid "DNS Directory" +msgstr "Папка DNS" + +msgid "Description" +msgstr "Описание" + +msgid "" +"Do not automatically update blocklists during startup, use blocklist backups " +"instead." +msgstr "" +"Не обновляйте списки блокировок автоматически во время запуска, вместо этого " +"используйте резервные копии списков блокировок." + +msgid "Download Utility (SSL Library)" +msgstr "Загрузить утилиту (библиотека SSL)" + +msgid "" +"During opkg package installation use the '--force-maintainer' option to " +"overwrite the pre-existing config file or download a fresh default config " +"from <a href=\"%s\" target=\"_blank\">here</a>" +msgstr "" +"Устанавливая пакет с помощью opkg, используйте '--force-maintainer', чтобы " +"перезаписать существующий config файл или загрузить новый дефолтный config " +"файл <a href=\"%s\" target=\"_blank\">здесь</a>" + +msgid "Edit Blacklist" +msgstr "Редактировать Черный список" + +msgid "Edit Configuration" +msgstr "Редактировать config файл" + +msgid "Edit Whitelist" +msgstr "Редактировать Белый список" + +msgid "Email Notification" +msgstr "Уведомление на email" + +msgid "Email Notification Count" +msgstr "Кол-во уведомлений на email" + +msgid "Enable Adblock" +msgstr "Включить Adblock" + +msgid "Enable Blocklist Backup" +msgstr "Включить сохранение списка блокировок" + +msgid "" +"Enable memory intense overall sort / duplicate removal on low memory devices " +"(< 64 MB free RAM)" +msgstr "" +"Включите полную сортировку / удаление дубликатов памяти на устройствах с " +"низким объемом памяти (< 64 MB свободной оперативной памяти)." + +msgid "Enable verbose debug logging in case of any processing error." +msgstr "Включите подробное ведение журнала отладки в случае ошибки обработки." + +msgid "Enabled" +msgstr "Включено" + +msgid "Extra Options" +msgstr "Дополнительные настройки" + +msgid "Flush DNS Cache" +msgstr "Очистка кэша DNS" + +msgid "Flush DNS Cache after adblock processing." +msgstr "Очистки DNS-кэша после обработки Adblock-ом." + +msgid "" +"For SSL protected blocklist sources you need a suitable SSL library, e.g. " +"'libustream-ssl' or the wget 'built-in'." +msgstr "" +"Для SSL-защищенных источников списков блокировки, вам нужны подходящие SSL " +"библиотеки, например 'libustream-ssl' или wget 'built-in'." + +msgid "" +"For further information <a href=\"%s\" target=\"_blank\">check the online " +"documentation</a>" +msgstr "" +"Для получения дополнительной информации <a href=\"%s\" target=\"_blank\"> " +"смотрите онлайн документацию</a>." + +msgid "Force Local DNS" +msgstr "Назначить локальный DNS" + +msgid "Force Overall Sort" +msgstr "Назначить полную сортировку" + +msgid "Full path to the whitelist file." +msgstr "Полный путь к файлу Белого списка." + +msgid "Input file not found, please check your configuration." +msgstr "Введенный файл не найден, проверьте ваши настройки." + +msgid "Invalid domain specified!" +msgstr "Задан недопустимый домен!" + +msgid "Last Run" +msgstr "Последнее время запуска" + +msgid "" +"List URLs and Shallalist category selections are configurable in the " +"'Advanced' section.<br />" +msgstr "" +"Список URL-адресов и настройка списка использования, настраиваются на " +"странице 'Дополнительно'.<br />" + +msgid "" +"List of available network interfaces. Usually the startup will be triggered " +"by the 'wan' interface.<br />" +msgstr "" +"Список доступных сетевых интерфейсов. По умолчанию установлен 'wan' " +"интерфейс.<br />" + +msgid "" +"List of supported DNS backends with their default list export directory.<br /" +">" +msgstr "" +"Список поддерживаемых серверов DNS с дефолтным списком - перемещается в " +"папку.<br />" + +msgid "Loading" +msgstr "Загрузка" + +msgid "No" +msgstr "Нет" + +msgid "" +"Options for further tweaking in case the defaults are not suitable for you." +msgstr "" +"Варианты для дальнейшей обработки, если значения по умолчанию вам не " +"подходят." + +msgid "Overall Domains" +msgstr "Итоговые домены" + +msgid "Overview" +msgstr "Главное меню" + +msgid "" +"Please add only one domain per line. Comments introduced with '#' are " +"allowed - ip addresses, wildcards and regex are not." +msgstr "" +"Добавляйте только один домен в строке. Комментарии вводятся используя '#' " +"разрешенные - ip адреса, метасимволы и нерегулярные выражения." + +msgid "Please edit this file directly in a terminal session." +msgstr "Отредактируйте данный файл, строго в терминале." + +msgid "" +"Please note: this needs additional 'mstmp' installation and setup (see " +"readme)." +msgstr "" +"Внимание: для этого требуется дополнительная установка и настройка " +"'mstmp' (см. readme)." + +msgid "Please update your adblock config file to use this package.<br />" +msgstr "Обновите config файл Adblock, чтобы использовать этот пакет.<br />" + +msgid "Query" +msgstr "Запрос" + +msgid "Query domains" +msgstr "Запрос доменов" + +msgid "" +"Raise the minimum email notification count, to get emails if the overall " +"count is less or equal to the given limit (default 0),<br />" +msgstr "" +"Увеличьте количество уведомлений по email, чтобы получить сообщения, если " +"общее количество меньше или равно заданному пределу (по умолчанию 0),<br />" + +msgid "Redirect all DNS queries from 'lan' zone to the local resolver." +msgstr "" +"Перенаправлять все DNS запросы с интерфейса 'lan' на обработку Adblock-ом." + +msgid "Resume" +msgstr "Возобновить" + +msgid "Runtime Information" +msgstr "Текущая информация" + +msgid "SSL req." +msgstr "Запрос SSL" + +msgid "Save" +msgstr "Сохранить" + +msgid "" +"Send notification emails in case of a processing error or if domain count is " +"≤ 0.<br />" +msgstr "" +"Отправлять по электронной почте уведомления в случае ошибки обработки или " +"если домен ≤ 0.<br />" + +msgid "Startup Trigger" +msgstr "Задержка запуска" + +msgid "Suspend" +msgstr "Приостановить" + +msgid "Suspend / Resume Adblock" +msgstr "Приостановить / Возобновить Adblock" + +msgid "" +"Target directory for adblock backups. Please use only non-volatile disks, e." +"g. an external usb stick." +msgstr "" +"Папка для резервного копирования Adblock. Используйте такие накопители, как " +"usb флешка." + +msgid "Target directory for the generated blocklist 'adb_list.overall'." +msgstr "Целевая папка для создания списка блокировки 'adb_list.overall'." + +msgid "The file size is too large for online editing in LuCI (> 512 KB)." +msgstr "" +"Размер файла слишком большой, для онлайн редактирования в LuCI (> 512 KB)." + +msgid "" +"This form allows you to modify the content of the adblock blacklist (%s)." +"<br />" +msgstr "" +"Страница позволяет изменять содержимое Черного списка Adblock (%s).<br />" + +msgid "" +"This form allows you to modify the content of the adblock whitelist (%s)." +"<br />" +msgstr "" +"Страница позволяет изменять содержимое Белого списка Adblock (%s).<br />" + +msgid "" +"This form allows you to modify the content of the main adblock configuration " +"file (/etc/config/adblock)." +msgstr "" +"Страница позволяет изменять содержимое главного config файла Adblock-a (/etc/" +"config/adblock)." + +msgid "" +"This form allows you to query active block lists for certain domains, e.g. " +"for whitelisting." +msgstr "" +"Страница позволяет запросить домены для конкретных списков, например для " +"Белого списка." + +msgid "" +"This form shows the syslog output, pre-filtered for adblock related messages " +"only." +msgstr "Страница системного журнала. Только сообщения связанные с Adblock." + +msgid "This section contains no values yet" +msgstr "Страница не содержит значений" + +msgid "" +"To overwrite the default path use the 'DNS Directory' option in the extra " +"section below." +msgstr "" +"Чтобы заменить дефолтную, используется 'Папка DNS' расширенный вариант, " +"раздел ниже." + +msgid "Trigger Delay" +msgstr "Задержка запуска" + +msgid "Verbose Debug Logging" +msgstr "Подробное ведение журнала отладки" + +msgid "View Logfile" +msgstr "Системный журнал" + +msgid "Waiting for command to complete..." +msgstr "Ожидание выполнения команды..." + +msgid "Whitelist File" +msgstr "Файл Белого списка" + +msgid "Whitelist Mode" +msgstr "Режим Белого списка" + +msgid "Yes" +msgstr "Да" + +msgid "disabled" +msgstr "отключено" + +msgid "" +"e.g. to receive an email notification with every adblock update set this " +"value to 150000." +msgstr "" +"например, чтобы получать уведомления по электронной почте при каждом " +"обновлении Adblock-а установите значение 150000." + +msgid "enabled" +msgstr "включено" + +msgid "error" +msgstr "ошибка" + +msgid "n/a" +msgstr "нет данных" + +msgid "paused" +msgstr "остановлено" diff --git a/applications/luci-app-adblock/po/sv/adblock.po b/applications/luci-app-adblock/po/sv/adblock.po index 503c5f6ef7..927e8af4f6 100644 --- a/applications/luci-app-adblock/po/sv/adblock.po +++ b/applications/luci-app-adblock/po/sv/adblock.po @@ -41,7 +41,7 @@ msgstr "Källor för blockeringslistor" msgid "" "Caution: To prevent OOM exceptions on low memory devices with less than 64 " -"MB free RAM, please do not select too many lists - 5-6 should be sufficient!" +"MB free RAM, please do not select more than five blocklist sources!" msgstr "" msgid "" @@ -100,6 +100,12 @@ msgstr "Redigerar konfigurationen" msgid "Edit Whitelist" msgstr "Redigera vitlista" +msgid "Email Notification" +msgstr "" + +msgid "Email Notification Count" +msgstr "" + msgid "Enable Adblock" msgstr "Aktivera adblock" @@ -120,6 +126,12 @@ msgstr "Aktiverad" msgid "Extra Options" msgstr "Extra alternativ" +msgid "Flush DNS Cache" +msgstr "" + +msgid "Flush DNS Cache after adblock processing." +msgstr "" + msgid "" "For SSL protected blocklist sources you need a suitable SSL library, e.g. " "'libustream-ssl' or the wget 'built-in'." @@ -188,6 +200,11 @@ msgstr "" msgid "Please edit this file directly in a terminal session." msgstr "Vänligen redigera den här filen direkt i en terminal-session." +msgid "" +"Please note: this needs additional 'mstmp' installation and setup (see " +"readme)." +msgstr "" + msgid "Please update your adblock config file to use this package.<br />" msgstr "" @@ -197,6 +214,11 @@ msgstr "Fråga" msgid "Query domains" msgstr "Fråga efter domäner" +msgid "" +"Raise the minimum email notification count, to get emails if the overall " +"count is less or equal to the given limit (default 0),<br />" +msgstr "" + msgid "Redirect all DNS queries from 'lan' zone to the local resolver." msgstr "" @@ -212,6 +234,11 @@ msgstr "SSL-rek." msgid "Save" msgstr "Spara" +msgid "" +"Send notification emails in case of a processing error or if domain count is " +"≤ 0.<br />" +msgstr "" + msgid "Startup Trigger" msgstr "Uppstartslösare" @@ -263,6 +290,9 @@ msgid "" "only." msgstr "" +msgid "This section contains no values yet" +msgstr "" + msgid "" "To overwrite the default path use the 'DNS Directory' option in the extra " "section below." @@ -292,6 +322,11 @@ msgstr "Ja" msgid "disabled" msgstr "inaktiverad" +msgid "" +"e.g. to receive an email notification with every adblock update set this " +"value to 150000." +msgstr "" + msgid "enabled" msgstr "aktiverad" diff --git a/applications/luci-app-adblock/po/templates/adblock.pot b/applications/luci-app-adblock/po/templates/adblock.pot index 9698333515..8fcff0791d 100644 --- a/applications/luci-app-adblock/po/templates/adblock.pot +++ b/applications/luci-app-adblock/po/templates/adblock.pot @@ -41,7 +41,7 @@ msgstr "" msgid "" "Caution: To prevent OOM exceptions on low memory devices with less than 64 " -"MB free RAM, please do not select too many lists - 5-6 should be sufficient!" +"MB free RAM, please do not select more than five blocklist sources!" msgstr "" msgid "" @@ -93,6 +93,12 @@ msgstr "" msgid "Edit Whitelist" msgstr "" +msgid "Email Notification" +msgstr "" + +msgid "Email Notification Count" +msgstr "" + msgid "Enable Adblock" msgstr "" @@ -113,6 +119,12 @@ msgstr "" msgid "Extra Options" msgstr "" +msgid "Flush DNS Cache" +msgstr "" + +msgid "Flush DNS Cache after adblock processing." +msgstr "" + msgid "" "For SSL protected blocklist sources you need a suitable SSL library, e.g. " "'libustream-ssl' or the wget 'built-in'." @@ -180,6 +192,11 @@ msgstr "" msgid "Please edit this file directly in a terminal session." msgstr "" +msgid "" +"Please note: this needs additional 'mstmp' installation and setup (see " +"readme)." +msgstr "" + msgid "Please update your adblock config file to use this package.<br />" msgstr "" @@ -189,6 +206,11 @@ msgstr "" msgid "Query domains" msgstr "" +msgid "" +"Raise the minimum email notification count, to get emails if the overall " +"count is less or equal to the given limit (default 0),<br />" +msgstr "" + msgid "Redirect all DNS queries from 'lan' zone to the local resolver." msgstr "" @@ -204,6 +226,11 @@ msgstr "" msgid "Save" msgstr "" +msgid "" +"Send notification emails in case of a processing error or if domain count is " +"≤ 0.<br />" +msgstr "" + msgid "Startup Trigger" msgstr "" @@ -249,6 +276,9 @@ msgid "" "only." msgstr "" +msgid "This section contains no values yet" +msgstr "" + msgid "" "To overwrite the default path use the 'DNS Directory' option in the extra " "section below." @@ -278,6 +308,11 @@ msgstr "" msgid "disabled" msgstr "" +msgid "" +"e.g. to receive an email notification with every adblock update set this " +"value to 150000." +msgstr "" + msgid "enabled" msgstr "" diff --git a/applications/luci-app-adblock/po/zh-cn/adblock.po b/applications/luci-app-adblock/po/zh-cn/adblock.po index 08032cab04..9e3a0284fc 100644 --- a/applications/luci-app-adblock/po/zh-cn/adblock.po +++ b/applications/luci-app-adblock/po/zh-cn/adblock.po @@ -55,7 +55,7 @@ msgstr "拦截列表来源" msgid "" "Caution: To prevent OOM exceptions on low memory devices with less than 64 " -"MB free RAM, please do not select too many lists - 5-6 should be sufficient!" +"MB free RAM, please do not select more than five blocklist sources!" msgstr "" msgid "" @@ -109,6 +109,12 @@ msgstr "编辑设置" msgid "Edit Whitelist" msgstr "编辑白名单" +msgid "Email Notification" +msgstr "" + +msgid "Email Notification Count" +msgstr "" + msgid "Enable Adblock" msgstr "启用 Adblock" @@ -129,6 +135,12 @@ msgstr "已启用" msgid "Extra Options" msgstr "额外选项" +msgid "Flush DNS Cache" +msgstr "" + +msgid "Flush DNS Cache after adblock processing." +msgstr "" + msgid "" "For SSL protected blocklist sources you need a suitable SSL library, e.g. " "'libustream-ssl' or the wget 'built-in'." @@ -200,6 +212,11 @@ msgstr "" msgid "Please edit this file directly in a terminal session." msgstr "请在终端会话中直接编辑此文件。" +msgid "" +"Please note: this needs additional 'mstmp' installation and setup (see " +"readme)." +msgstr "" + msgid "Please update your adblock config file to use this package.<br />" msgstr "" @@ -209,6 +226,11 @@ msgstr "查询" msgid "Query domains" msgstr "查询域" +msgid "" +"Raise the minimum email notification count, to get emails if the overall " +"count is less or equal to the given limit (default 0),<br />" +msgstr "" + msgid "Redirect all DNS queries from 'lan' zone to the local resolver." msgstr "将所有 DNS 查询从“lan”区域重定向到本地解析器。" @@ -224,6 +246,11 @@ msgstr "SSL 要求" msgid "Save" msgstr "保存" +msgid "" +"Send notification emails in case of a processing error or if domain count is " +"≤ 0.<br />" +msgstr "" + msgid "Startup Trigger" msgstr "启动触发器" @@ -269,6 +296,9 @@ msgid "" "only." msgstr "此表单显示系统日志输出，仅针对 adblock 相关的消息进行了预筛选。" +msgid "This section contains no values yet" +msgstr "" + msgid "" "To overwrite the default path use the 'DNS Directory' option in the extra " "section below." @@ -298,6 +328,11 @@ msgstr "是" msgid "disabled" msgstr "已禁用" +msgid "" +"e.g. to receive an email notification with every adblock update set this " +"value to 150000." +msgstr "" + msgid "enabled" msgstr "已启用" diff --git a/applications/luci-app-adblock/po/zh-tw/adblock.po b/applications/luci-app-adblock/po/zh-tw/adblock.po index f838fa0432..d468c96f51 100644 --- a/applications/luci-app-adblock/po/zh-tw/adblock.po +++ b/applications/luci-app-adblock/po/zh-tw/adblock.po @@ -55,7 +55,7 @@ msgstr "攔截列表來源" msgid "" "Caution: To prevent OOM exceptions on low memory devices with less than 64 " -"MB free RAM, please do not select too many lists - 5-6 should be sufficient!" +"MB free RAM, please do not select more than five blocklist sources!" msgstr "" msgid "" @@ -109,6 +109,12 @@ msgstr "編輯設定" msgid "Edit Whitelist" msgstr "編輯白名單" +msgid "Email Notification" +msgstr "" + +msgid "Email Notification Count" +msgstr "" + msgid "Enable Adblock" msgstr "啟用 Adblock" @@ -129,6 +135,12 @@ msgstr "已啟用" msgid "Extra Options" msgstr "額外選項" +msgid "Flush DNS Cache" +msgstr "" + +msgid "Flush DNS Cache after adblock processing." +msgstr "" + msgid "" "For SSL protected blocklist sources you need a suitable SSL library, e.g. " "'libustream-ssl' or the wget 'built-in'." @@ -200,6 +212,11 @@ msgstr "" msgid "Please edit this file directly in a terminal session." msgstr "請在終端會話中直接編輯此檔案。" +msgid "" +"Please note: this needs additional 'mstmp' installation and setup (see " +"readme)." +msgstr "" + msgid "Please update your adblock config file to use this package.<br />" msgstr "" @@ -209,6 +226,11 @@ msgstr "查詢" msgid "Query domains" msgstr "查詢域" +msgid "" +"Raise the minimum email notification count, to get emails if the overall " +"count is less or equal to the given limit (default 0),<br />" +msgstr "" + msgid "Redirect all DNS queries from 'lan' zone to the local resolver." msgstr "將所有 DNS 查詢從“lan”區域重定向到本地解析器。" @@ -224,6 +246,11 @@ msgstr "SSL 要求" msgid "Save" msgstr "儲存" +msgid "" +"Send notification emails in case of a processing error or if domain count is " +"≤ 0.<br />" +msgstr "" + msgid "Startup Trigger" msgstr "啟動觸發器" @@ -269,6 +296,9 @@ msgid "" "only." msgstr "此表單顯示系統日誌輸出，僅針對 adblock 相關的訊息進行了預篩選。" +msgid "This section contains no values yet" +msgstr "" + msgid "" "To overwrite the default path use the 'DNS Directory' option in the extra " "section below." @@ -298,6 +328,11 @@ msgstr "是" msgid "disabled" msgstr "已禁用" +msgid "" +"e.g. to receive an email notification with every adblock update set this " +"value to 150000." +msgstr "" + msgid "enabled" msgstr "已啟用" |