diff options
Diffstat (limited to 'applications/luci-app-adblock')
14 files changed, 428 insertions, 178 deletions
diff --git a/applications/luci-app-adblock/Makefile b/applications/luci-app-adblock/Makefile index 614faf0e83..ae1eba2516 100644 --- a/applications/luci-app-adblock/Makefile +++ b/applications/luci-app-adblock/Makefile @@ -1,11 +1,10 @@ -# Copyright 2016 Hannu Nyman # Copyright 2017 Dirk Brenken (dev@brenken.org) # This is free software, licensed under the Apache License, Version 2.0 include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI support for Adblock -LUCI_DEPENDS:=+adblock +LUCI_DEPENDS:=+adblock +luci-lib-jsonc LUCI_PKGARCH:=all include ../../luci.mk diff --git a/applications/luci-app-adblock/luasrc/controller/adblock.lua b/applications/luci-app-adblock/luasrc/controller/adblock.lua index bcb2976033..b37fcd8891 100644 --- a/applications/luci-app-adblock/luasrc/controller/adblock.lua +++ b/applications/luci-app-adblock/luasrc/controller/adblock.lua @@ -1,4 +1,3 @@ --- Copyright 2016 Hannu Nyman -- Copyright 2017 Dirk Brenken (dev@brenken.org) -- This is free software, licensed under the Apache License, Version 2.0 diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua index efe40e09e5..7945aa154e 100644 --- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua +++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua @@ -1,11 +1,10 @@ --- Copyright 2016 Hannu Nyman -- Copyright 2017 Dirk Brenken (dev@brenken.org) -- This is free software, licensed under the Apache License, Version 2.0 local fs = require("nixio.fs") local util = require("luci.util") local uci = require("uci") -local adbinput = uci.get("adblock", "blacklist", "adb_src") +local adbinput = uci.get("adblock", "blacklist", "adb_src" or "/etc/adblock/adblock.blacklist") if not nixio.fs.access(adbinput) then m = SimpleForm("error", nil, translate("Input file not found, please check your configuration.")) @@ -13,27 +12,27 @@ if not nixio.fs.access(adbinput) then end m = SimpleForm("input", nil) - m:append(Template("adblock/config_css")) +m:append(Template("adblock/config_css")) s = m:section(SimpleSection, nil, translatef("This form allows you to modify the content of the adblock blacklist (%s).<br />", adbinput) .. translate("Please add only one domain per line. Comments introduced with '#' are allowed - ip addresses, wildcards and regex are not.")) f = s:option(TextValue, "data") - f.rmempty = true - f.datatype = "string" - f.rows = 20 +f.datatype = "string" +f.rows = 20 +f.rmempty = true - function f.cfgvalue() - return nixio.fs.readfile(adbinput) or "" - end +function f.cfgvalue() + return nixio.fs.readfile(adbinput) or "" +end - function f.write(self, section, data) - return nixio.fs.writefile(adbinput, "\n" .. util.trim(data:gsub("\r\n", "\n")) .. "\n") - end +function f.write(self, section, data) + return nixio.fs.writefile(adbinput, "\n" .. util.trim(data:gsub("\r\n", "\n")) .. "\n") +end - function s.handle(self, state, data) - return true - end +function s.handle(self, state, data) + return true +end return m diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock/configuration_tab.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock/configuration_tab.lua index 035b99e5e3..ec88e5fbc0 100644 --- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/configuration_tab.lua +++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock/configuration_tab.lua @@ -1,4 +1,3 @@ --- Copyright 2016 Hannu Nyman -- Copyright 2017 Dirk Brenken (dev@brenken.org) -- This is free software, licensed under the Apache License, Version 2.0 @@ -12,25 +11,25 @@ if not nixio.fs.access(adbinput) then end m = SimpleForm("input", nil) - m:append(Template("adblock/config_css")) +m:append(Template("adblock/config_css")) s = m:section(SimpleSection, nil, -translate("This form allows you to modify the content of the main adblock configuration file (/etc/config/adblock).")) + translate("This form allows you to modify the content of the main adblock configuration file (/etc/config/adblock).")) f = s:option(TextValue, "data") - f.rmempty = true - f.rows = 20 +f.rows = 20 +f.rmempty = true - function f.cfgvalue() - return nixio.fs.readfile(adbinput) or "" - end +function f.cfgvalue() + return nixio.fs.readfile(adbinput) or "" +end - function f.write(self, section, data) - return nixio.fs.writefile(adbinput, "\n" .. util.trim(data:gsub("\r\n", "\n")) .. "\n") - end +function f.write(self, section, data) + return nixio.fs.writefile(adbinput, "\n" .. util.trim(data:gsub("\r\n", "\n")) .. "\n") +end - function s.handle(self, state, data) - return true - end +function s.handle(self, state, data) + return true +end return m 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 7919b71516..fbc09b1847 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,14 @@ --- Copyright 2016 Hannu Nyman -- Copyright 2017 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("uci") local sys = require("luci.sys") -local util = require("luci.util") -local data = util.ubus("service", "get_data", "name", "adblock") or { } -local dnsFile1 = sys.exec("find '/tmp/dnsmasq.d' -maxdepth 1 -type f -name 'adb_list*' -print 2>/dev/null") -local dnsFile2 = sys.exec("find '/var/lib/unbound' -maxdepth 1 -type f -name 'adb_list*' -print 2>/dev/null") +local json = require("luci.jsonc") +local adbinput = uci.get("adblock", "global", "adb_rtfile") or "/tmp/adb_runtime.json" +local parse = json.parse(fs.readfile(adbinput) or "") +local dnsFile1 = sys.exec("find '/tmp/dnsmasq.d/.adb_hidden' -maxdepth 1 -type f -name 'adb_list*' -print 2>/dev/null") +local dnsFile2 = sys.exec("find '/var/lib/unbound/.adb_hidden' -maxdepth 1 -type f -name 'adb_list*' -print 2>/dev/null") m = Map("adblock", translate("Adblock"), translate("Configuration of the adblock package to block ad/abuse domains by using DNS. ") @@ -21,87 +23,99 @@ m = Map("adblock", translate("Adblock"), s = m:section(NamedSection, "global", "adblock") o1 = s:option(Flag, "adb_enabled", translate("Enable adblock")) +o1.default = o1.enabled o1.rmempty = false -o1.default = 0 btn = s:option(Button, "", translate("Suspend / Resume adblock")) -if data.adblock == nil then - btn.inputtitle = "n/a" - btn.inputstyle = nil - btn.disabled = true -elseif dnsFile1 ~= "" or dnsFile2 ~= "" then - btn.inputtitle = "Suspend adblock" - btn.inputstyle = "reset" +if dnsFile1 ~= "" or dnsFile2 ~= "" then + btn.inputtitle = translate("Resume adblock") + btn.inputstyle = "apply" btn.disabled = false function btn.write() - luci.sys.call("/etc/init.d/adblock suspend >/dev/null 2>&1") + luci.sys.call("/etc/init.d/adblock resume >/dev/null 2>&1") end else - btn.inputtitle = "Resume adblock" - btn.inputstyle = "apply" + btn.inputtitle = translate("Suspend adblock") + btn.inputstyle = "reset" btn.disabled = false function btn.write() - luci.sys.call("/etc/init.d/adblock resume >/dev/null 2>&1") + luci.sys.call("/etc/init.d/adblock suspend >/dev/null 2>&1") end end -o2 = s:option(Flag, "adb_debug", translate("Enable verbose debug logging")) -o2.default = o2.disabled -o2.rmempty = false +o2 = s:option(Value, "adb_iface", translate("Restrict interface trigger to certain interface(s)"), + translate("Space separated list of interfaces that trigger adblock processing. ".. + "To disable event driven (re-)starts remove all entries.")) +o2.rmempty = true -o3 = s:option(Value, "adb_iface", translate("Restrict interface reload trigger to certain interface(s)"), - translate("Space separated list of interfaces that trigger a reload action. ".. - "To disable reload trigger at all set it to 'false'.")) -o3.rmempty =false +o3 = s:option(Value, "adb_triggerdelay", translate("Trigger delay"), + translate("Additional trigger delay in seconds before adblock processing begins.")) +o3.default = 2 +o3.datatype = "range(1,90)" +o3.rmempty = false + +o4 = s:option(Flag, "adb_debug", translate("Enable verbose debug logging")) +o4.default = o4.disabled +o4.rmempty = false -- Runtime information - ds = s:option(DummyValue, "_dummy", translate("Runtime information")) - ds.template = "cbi/nullsection" +ds = s:option(DummyValue, "_dummy", translate("Runtime information")) +ds.template = "cbi/nullsection" - dv1 = s:option(DummyValue, "adblock_version", translate("Adblock version")) - dv1.template = "adblock/runtime" - if data.adblock ~= nil then - dv1.value = data.adblock.adblock.adblock_version or "n/a" - else - dv1.value = "n/a" - end +dv1 = s:option(DummyValue, "status", translate("Status")) +dv1.template = "adblock/runtime" +if parse == nil then + dv1.value = translate("n/a") +elseif parse.data.blocked_domains == "0" then + dv1.value = translate("no domains blocked") +elseif dnsFile1 ~= "" or dnsFile2 ~= "" then + dv1.value = translate("suspended") +else + dv1.value = translate("active") +end +dv2 = s:option(DummyValue, "adblock_version", translate("Adblock version")) +dv2.template = "adblock/runtime" +if parse ~= nil then + dv2.value = parse.data.adblock_version or translate("n/a") +else + dv2.value = translate("n/a") +end - dv2 = s:option(DummyValue, "status", translate("Status")) - dv2.template = "adblock/runtime" - if data.adblock == nil then - dv2.value = "n/a" - elseif dnsFile1 ~= "" or dnsFile2 ~= "" then - dv2.value = "active" - else - dv2.value = "suspended" - end +dv3 = s:option(DummyValue, "fetch_info", 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.template = "adblock/runtime" +if parse ~= nil then + dv3.value = parse.data.fetch_info or translate("n/a") +else + dv3.value = translate("n/a") +end - dv3 = s:option(DummyValue, "dns_backend", translate("DNS backend")) - dv3.template = "adblock/runtime" - if data.adblock ~= nil then - dv3.value = data.adblock.adblock.dns_backend or "n/a" - else - dv3.value = "n/a" - end +dv4 = s:option(DummyValue, "dns_backend", translate("DNS backend")) +dv4.template = "adblock/runtime" +if parse ~= nil then + dv4.value = parse.data.dns_backend or translate("n/a") +else + dv4.value = translate("n/a") +end - dv4 = s:option(DummyValue, "blocked_domains", translate("Blocked domains (overall)")) - dv4.template = "adblock/runtime" - if data.adblock ~= nil then - dv4.value = data.adblock.adblock.blocked_domains or "n/a" - else - dv4.value = "n/a" - end +dv5 = s:option(DummyValue, "blocked_domains", translate("Blocked domains (overall)")) +dv5.template = "adblock/runtime" +if parse ~= nil then + dv5.value = parse.data.blocked_domains or translate("n/a") +else + dv5.value = translate("n/a") +end - dv5 = s:option(DummyValue, "last_rundate", translate("Last rundate")) - dv5.template = "adblock/runtime" - if data.adblock ~= nil then - dv5.value = data.adblock.adblock.last_rundate or "n/a" - else - dv5.value = "n/a" - end +dv6 = s:option(DummyValue, "last_rundate", translate("Last rundate")) +dv6.template = "adblock/runtime" +if parse ~= nil then + dv6.value = parse.data.last_rundate or translate("n/a") +else + dv6.value = translate("n/a") +end --- Blocklist options +-- Blocklist table bl = m:section(TypedSection, "source", translate("Blocklist sources"), translate("Available blocklist sources. ") @@ -109,7 +123,17 @@ bl = m:section(TypedSection, "source", translate("Blocklist sources"), bl.template = "cbi/tblsection" name = bl:option(Flag, "enabled", translate("Enabled")) -name.rmempty = false +name.rmempty = false + +ssl = bl:option(DummyValue, "adb_src", translate("SSL req.")) +function ssl.cfgvalue(self, section) + local source = self.map:get(section, "adb_src") + if source and source:match("https://") then + return translate("Yes") + else + return translate("No") + end +end des = bl:option(DummyValue, "adb_src_desc", translate("Description")) @@ -117,12 +141,12 @@ des = bl:option(DummyValue, "adb_src_desc", translate("Description")) s = m:section(NamedSection, "global", "adblock", translate("Backup options")) -o4 = s:option(Flag, "adb_backup", translate("Enable blocklist backup")) -o4.rmempty = false -o4.default = 0 - -o5 = s:option(Value, "adb_backupdir", translate("Backup directory")) +o5 = s:option(Flag, "adb_backup", translate("Enable blocklist backup")) +o5.default = o5.disabled o5.rmempty = false -o5.datatype = "directory" + +o6 = s:option(Value, "adb_backupdir", translate("Backup directory")) +o6.datatype = "directory" +o6.rmempty = false return m diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua index 6c4dee4676..9e087a6c4b 100644 --- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua +++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua @@ -1,11 +1,10 @@ --- Copyright 2016 Hannu Nyman -- Copyright 2017 Dirk Brenken (dev@brenken.org) -- This is free software, licensed under the Apache License, Version 2.0 local fs = require("nixio.fs") local util = require("luci.util") local uci = require("uci") -local adbinput = uci.get("adblock", "global", "adb_whitelist") or " " +local adbinput = uci.get("adblock", "global", "adb_whitelist") or "/etc/adblock/adblock.whitelist" if not nixio.fs.access(adbinput) then m = SimpleForm("error", nil, translate("Input file not found, please check your configuration.")) @@ -13,27 +12,27 @@ if not nixio.fs.access(adbinput) then end m = SimpleForm("input", nil) - m:append(Template("adblock/config_css")) +m:append(Template("adblock/config_css")) s = m:section(SimpleSection, nil, translatef("This form allows you to modify the content of the adblock whitelist (%s).<br />", adbinput) .. translate("Please add only one domain per line. Comments introduced with '#' are allowed - ip addresses, wildcards and regex are not.")) f = s:option(TextValue, "data") - f.rmempty = true - f.datatype = "string" - f.rows = 20 +f.datatype = "string" +f.rows = 20 +f.rmempty = true - function f.cfgvalue() - return nixio.fs.readfile(adbinput) or "" - end +function f.cfgvalue() + return nixio.fs.readfile(adbinput) or "" +end - function f.write(self, section, data) - return nixio.fs.writefile(adbinput, "\n" .. util.trim(data:gsub("\r\n", "\n")) .. "\n") - end +function f.write(self, section, data) + return nixio.fs.writefile(adbinput, "\n" .. util.trim(data:gsub("\r\n", "\n")) .. "\n") +end - function s.handle(self, state, data) - return true - end +function s.handle(self, state, data) + return true +end return m diff --git a/applications/luci-app-adblock/luasrc/view/adblock/logread.htm b/applications/luci-app-adblock/luasrc/view/adblock/logread.htm index ce842a88e8..5e25a549c6 100644 --- a/applications/luci-app-adblock/luasrc/view/adblock/logread.htm +++ b/applications/luci-app-adblock/luasrc/view/adblock/logread.htm @@ -1,5 +1,4 @@ <%# -Copyright 2016 Hannu Nyman Copyright 2017 Dirk Brenken (dev@brenken.org) This is free software, licensed under the Apache License, Version 2.0 -%> diff --git a/applications/luci-app-adblock/luasrc/view/adblock/query.htm b/applications/luci-app-adblock/luasrc/view/adblock/query.htm index be606301ec..ce706e40aa 100644 --- a/applications/luci-app-adblock/luasrc/view/adblock/query.htm +++ b/applications/luci-app-adblock/luasrc/view/adblock/query.htm @@ -1,5 +1,4 @@ <%# -Copyright 2016 Hannu Nyman Copyright 2017 Dirk Brenken (dev@brenken.org) This is free software, licensed under the Apache License, Version 2.0 -%> @@ -25,7 +24,7 @@ This is free software, licensed under the Apache License, Version 2.0 ; input.parentNode.style.display = 'block'; input.style.display = 'inline'; - stxhr.post('<%=url('admin/services/adblock/advanced/result/')%>' + domain, { token: '<%=token%>' }, + stxhr.post('<%=luci.dispatcher.build_url('admin/services/adblock/advanced/result/')%>' + domain, { token: '<%=token%>' }, function(x) { if (x.responseText) diff --git a/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm b/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm index 4a90d41966..ee3a4553a8 100644 --- a/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm +++ b/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm @@ -1,5 +1,4 @@ <%# -Copyright 2016 Hannu Nyman Copyright 2017 Dirk Brenken (dev@brenken.org) This is free software, licensed under the Apache License, Version 2.0 -%> diff --git a/applications/luci-app-adblock/po/ja/adblock.po b/applications/luci-app-adblock/po/ja/adblock.po index 39bc183493..3b8f0da8d0 100644 --- a/applications/luci-app-adblock/po/ja/adblock.po +++ b/applications/luci-app-adblock/po/ja/adblock.po @@ -8,7 +8,7 @@ msgstr "" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.12\n" +"X-Generator: Poedit 2.0\n" "Language: ja\n" msgid "." @@ -26,6 +26,9 @@ msgstr "Adblock ログファイル" msgid "Adblock version" msgstr "Adblock バージョン" +msgid "Additional trigger delay in seconds before adblock processing begins." +msgstr "Adblock の処理が開始されるまでの、追加の遅延時間（秒）です。" + msgid "Advanced" msgstr "詳細設定" @@ -50,7 +53,7 @@ msgstr "データ収集中です..." msgid "" "Configuration of the adblock package to block ad/abuse domains by using DNS." msgstr "" -"DNSの利用によって広告/不正ドメインをブロックする、adblock パッケージの設定で" +"DNS の利用によって広告/不正ドメインをブロックする、Adblock パッケージの設定で" "す。" msgid "DNS backend" @@ -59,6 +62,9 @@ msgstr "DNS バックエンド" msgid "Description" msgstr "説明" +msgid "Download Utility (SSL Library)" +msgstr "ダウンロード ユーティリティ（SSL ライブラリ）" + msgid "Edit Blacklist" msgstr "ブラックリストの編集" @@ -69,7 +75,7 @@ msgid "Edit Whitelist" msgstr "ホワイトリストの編集" msgid "Enable adblock" -msgstr "Adblockの有効化" +msgstr "Adblock の有効化" msgid "Enable blocklist backup" msgstr "ブロックリスト バックアップの有効化" @@ -80,6 +86,13 @@ msgstr "詳細なデバッグ ログの有効化" msgid "Enabled" msgstr "有効" +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 'ビルトイン'" + msgid "For further information" msgstr "詳細な情報は" @@ -95,22 +108,25 @@ msgstr "最終実行日時" msgid "Loading" msgstr "読込中" +msgid "No" +msgstr "いいえ" + msgid "" "Note that list URLs and Shallalist category selections are configurable in " "the 'Advanced' section." msgstr "" -"リストのURL及び \"Shalla\" リストのカテゴリー設定は、'詳細設定' セクションで" -"設定することができます。" +"リストの URL 及び \"Shalla\" リストのカテゴリー設定は、'詳細設定' セクション" +"で設定することができます。" msgid "Overview" msgstr "概要" msgid "" "Please add only one domain per line. Comments introduced with '#' are " -"allowed - ip addresses, wildcards & regex are not." +"allowed - ip addresses, wildcards and regex are not." msgstr "" -"一行に一つのドメインを追加してください。'#' から始まるコメントを記述できます" -"が、IPアドレスやワイルドカード、正規表現を設定値として使用することはできませ" +"1行に1つのドメインを追加してください。'#' から始まるコメントを記述できます" +"が、IP アドレスやワイルドカード、正規表現を設定値として使用することはできませ" "ん。" msgid "Query" @@ -119,24 +135,34 @@ msgstr "検索" msgid "Query domains" msgstr "ドメインの検索" -msgid "Restrict interface reload trigger to certain interface(s)" -msgstr "リロード トリガを特定のインターフェースに限定する" +msgid "Restrict interface trigger to certain interface(s)" +msgstr "インターフェース トリガーを特定のインターフェースに限定する" + +msgid "Resume adblock" +msgstr "Adblock の再開" msgid "Runtime information" msgstr "実行情報" +msgid "SSL req." +msgstr "SSL 必須" + msgid "" -"Space separated list of interfaces that trigger a reload action. To disable " -"reload trigger at all set it to 'false'." +"Space separated list of interfaces that trigger adblock processing. To " +"disable event driven (re-)starts remove all entries." msgstr "" -"リロードのトリガとなる、スペースで区切られたインターフェースのリストで" -"す。'false' に設定した場合、全てのリロード トリガは無効になります。" +"Adblock の処理のトリガーとなる、スペースで区切られたインターフェースのリスト" +"です。処理を発生させるイベントを無効にするには、全てのエントリーを削除して空" +"欄にします。" msgid "Status" msgstr "ステータス" msgid "Suspend / Resume adblock" -msgstr "Adblockの一時停止/再開" +msgstr "Adblock の一時停止/再開" + +msgid "Suspend adblock" +msgstr "Adblock の一時停止" msgid "" "This form allows you to modify the content of the adblock blacklist (%s)." @@ -170,8 +196,11 @@ msgid "" "This form shows the syslog output, pre-filtered for adblock related messages " "only." msgstr "" -"このフォームには、システムログ内のAdblockに関連するメッセージのみが表示されま" -"す。" +"このフォームには、システムログ内の Adblock に関連するメッセージのみが表示され" +"ます。" + +msgid "Trigger delay" +msgstr "トリガー遅延" msgid "View Logfile" msgstr "ログファイルを見る" @@ -179,9 +208,49 @@ msgstr "ログファイルを見る" msgid "Waiting for command to complete..." msgstr "コマンドの完了をお待ちください..." +msgid "Yes" +msgstr "はい" + +msgid "active" +msgstr "動作中" + +msgid "n/a" +msgstr "利用不可" + +msgid "no domains blocked" +msgstr "ブロックされたドメインはありません" + msgid "see online documentation" msgstr "オンライン ドキュメントを確認してください" +msgid "suspended" +msgstr "一時停止中" + +#~ msgid "Restrict interface reload trigger to certain interface(s)" +#~ msgstr "リロード トリガを特定のインターフェースに限定する" + +#~ msgid "" +#~ "Space separated list of interfaces that trigger a reload action. To " +#~ "disable reload trigger at all remove all entries." +#~ msgstr "" +#~ "リロードのトリガとなる、スペースで区切られたインターフェースのリストです。" +#~ "リロード トリガを無効にするには、全てのエントリーを削除して空欄にします。" + +#~ msgid "" +#~ "Space separated list of interfaces that trigger a reload action. To " +#~ "disable reload trigger at all set it to 'false'." +#~ msgstr "" +#~ "リロードのトリガとなる、スペースで区切られたインターフェースのリストで" +#~ "す。'false' に設定した場合、全てのリロード トリガは無効になります。" + +#~ msgid "" +#~ "Please add only one domain per line. Comments introduced with '#' are " +#~ "allowed - ip addresses, wildcards & regex are not." +#~ msgstr "" +#~ "一行に一つのドメインを追加してください。'#' から始まるコメントを記述できま" +#~ "すが、IPアドレスやワイルドカード、正規表現を設定値として使用することはでき" +#~ "ません。" + #~ msgid "" #~ "). Note that list URLs and Shallalist category selections are not " #~ "configurable via Luci." diff --git a/applications/luci-app-adblock/po/pt-br/adblock.po b/applications/luci-app-adblock/po/pt-br/adblock.po index 013768773e..60668675eb 100644 --- a/applications/luci-app-adblock/po/pt-br/adblock.po +++ b/applications/luci-app-adblock/po/pt-br/adblock.po @@ -27,6 +27,9 @@ msgstr "" msgid "Adblock version" msgstr "" +msgid "Additional trigger delay in seconds before adblock processing begins." +msgstr "" + msgid "Advanced" msgstr "" @@ -60,6 +63,9 @@ msgstr "" msgid "Description" msgstr "Descrição" +msgid "Download Utility (SSL Library)" +msgstr "" + msgid "Edit Blacklist" msgstr "" @@ -81,6 +87,11 @@ msgstr "Habilite registros detalhados para depuração" msgid "Enabled" msgstr "Habilitado" +msgid "" +"For SSL protected blocklist sources you need a suitable SSL library, e.g. " +"'libustream-ssl' or the wget 'built-in'." +msgstr "" + msgid "For further information" msgstr "" @@ -96,6 +107,9 @@ msgstr "" msgid "Loading" msgstr "" +msgid "No" +msgstr "" + msgid "" "Note that list URLs and Shallalist category selections are configurable in " "the 'Advanced' section." @@ -106,7 +120,7 @@ msgstr "" msgid "" "Please add only one domain per line. Comments introduced with '#' are " -"allowed - ip addresses, wildcards & regex are not." +"allowed - ip addresses, wildcards and regex are not." msgstr "" msgid "Query" @@ -115,15 +129,21 @@ msgstr "" msgid "Query domains" msgstr "" -msgid "Restrict interface reload trigger to certain interface(s)" +msgid "Restrict interface trigger to certain interface(s)" +msgstr "" + +msgid "Resume adblock" msgstr "" msgid "Runtime information" msgstr "" +msgid "SSL req." +msgstr "" + msgid "" -"Space separated list of interfaces that trigger a reload action. To disable " -"reload trigger at all set it to 'false'." +"Space separated list of interfaces that trigger adblock processing. To " +"disable event driven (re-)starts remove all entries." msgstr "" msgid "Status" @@ -132,6 +152,9 @@ msgstr "" msgid "Suspend / Resume adblock" msgstr "" +msgid "Suspend adblock" +msgstr "" + msgid "" "This form allows you to modify the content of the adblock blacklist (%s)." "<br />" @@ -157,15 +180,33 @@ msgid "" "only." msgstr "" +msgid "Trigger delay" +msgstr "" + msgid "View Logfile" msgstr "" msgid "Waiting for command to complete..." msgstr "" +msgid "Yes" +msgstr "" + +msgid "active" +msgstr "" + +msgid "n/a" +msgstr "" + +msgid "no domains blocked" +msgstr "" + msgid "see online documentation" msgstr "" +msgid "suspended" +msgstr "" + #~ msgid "" #~ "). Note that list URLs and Shallalist category selections are not " #~ "configurable via Luci." diff --git a/applications/luci-app-adblock/po/sv/adblock.po b/applications/luci-app-adblock/po/sv/adblock.po index 9fcc36d26b..bc4a599299 100644 --- a/applications/luci-app-adblock/po/sv/adblock.po +++ b/applications/luci-app-adblock/po/sv/adblock.po @@ -16,6 +16,9 @@ msgstr "" msgid "Adblock version" msgstr "" +msgid "Additional trigger delay in seconds before adblock processing begins." +msgstr "" + msgid "Advanced" msgstr "" @@ -49,6 +52,9 @@ msgstr "" msgid "Description" msgstr "Beskrivning" +msgid "Download Utility (SSL Library)" +msgstr "" + msgid "Edit Blacklist" msgstr "" @@ -70,6 +76,11 @@ msgstr "" msgid "Enabled" msgstr "Aktiverad" +msgid "" +"For SSL protected blocklist sources you need a suitable SSL library, e.g. " +"'libustream-ssl' or the wget 'built-in'." +msgstr "" + msgid "For further information" msgstr "" @@ -85,6 +96,9 @@ msgstr "" msgid "Loading" msgstr "" +msgid "No" +msgstr "" + msgid "" "Note that list URLs and Shallalist category selections are configurable in " "the 'Advanced' section." @@ -95,7 +109,7 @@ msgstr "" msgid "" "Please add only one domain per line. Comments introduced with '#' are " -"allowed - ip addresses, wildcards & regex are not." +"allowed - ip addresses, wildcards and regex are not." msgstr "" msgid "Query" @@ -104,15 +118,21 @@ msgstr "" msgid "Query domains" msgstr "" -msgid "Restrict interface reload trigger to certain interface(s)" +msgid "Restrict interface trigger to certain interface(s)" +msgstr "" + +msgid "Resume adblock" msgstr "" msgid "Runtime information" msgstr "" +msgid "SSL req." +msgstr "" + msgid "" -"Space separated list of interfaces that trigger a reload action. To disable " -"reload trigger at all set it to 'false'." +"Space separated list of interfaces that trigger adblock processing. To " +"disable event driven (re-)starts remove all entries." msgstr "" msgid "Status" @@ -121,6 +141,9 @@ msgstr "" msgid "Suspend / Resume adblock" msgstr "" +msgid "Suspend adblock" +msgstr "" + msgid "" "This form allows you to modify the content of the adblock blacklist (%s)." "<br />" @@ -146,15 +169,33 @@ msgid "" "only." msgstr "" +msgid "Trigger delay" +msgstr "" + msgid "View Logfile" msgstr "" msgid "Waiting for command to complete..." msgstr "" +msgid "Yes" +msgstr "" + +msgid "active" +msgstr "" + +msgid "n/a" +msgstr "" + +msgid "no domains blocked" +msgstr "" + msgid "see online documentation" msgstr "" +msgid "suspended" +msgstr "" + #~ msgid "Available blocklist sources (" #~ msgstr "Tillgängliga källor för blockeringslistor (" diff --git a/applications/luci-app-adblock/po/templates/adblock.pot b/applications/luci-app-adblock/po/templates/adblock.pot index 9282768892..d847a69ba0 100644 --- a/applications/luci-app-adblock/po/templates/adblock.pot +++ b/applications/luci-app-adblock/po/templates/adblock.pot @@ -16,6 +16,9 @@ msgstr "" msgid "Adblock version" msgstr "" +msgid "Additional trigger delay in seconds before adblock processing begins." +msgstr "" + msgid "Advanced" msgstr "" @@ -47,6 +50,9 @@ msgstr "" msgid "Description" msgstr "" +msgid "Download Utility (SSL Library)" +msgstr "" + msgid "Edit Blacklist" msgstr "" @@ -68,6 +74,11 @@ msgstr "" msgid "Enabled" msgstr "" +msgid "" +"For SSL protected blocklist sources you need a suitable SSL library, e.g. " +"'libustream-ssl' or the wget 'built-in'." +msgstr "" + msgid "For further information" msgstr "" @@ -83,6 +94,9 @@ msgstr "" msgid "Loading" msgstr "" +msgid "No" +msgstr "" + msgid "" "Note that list URLs and Shallalist category selections are configurable in " "the 'Advanced' section." @@ -93,7 +107,7 @@ msgstr "" msgid "" "Please add only one domain per line. Comments introduced with '#' are " -"allowed - ip addresses, wildcards & regex are not." +"allowed - ip addresses, wildcards and regex are not." msgstr "" msgid "Query" @@ -102,15 +116,21 @@ msgstr "" msgid "Query domains" msgstr "" -msgid "Restrict interface reload trigger to certain interface(s)" +msgid "Restrict interface trigger to certain interface(s)" +msgstr "" + +msgid "Resume adblock" msgstr "" msgid "Runtime information" msgstr "" +msgid "SSL req." +msgstr "" + msgid "" -"Space separated list of interfaces that trigger a reload action. To disable " -"reload trigger at all set it to 'false'." +"Space separated list of interfaces that trigger adblock processing. To " +"disable event driven (re-)starts remove all entries." msgstr "" msgid "Status" @@ -119,6 +139,9 @@ msgstr "" msgid "Suspend / Resume adblock" msgstr "" +msgid "Suspend adblock" +msgstr "" + msgid "" "This form allows you to modify the content of the adblock blacklist (%s)." "<br />" @@ -144,11 +167,29 @@ msgid "" "only." msgstr "" +msgid "Trigger delay" +msgstr "" + msgid "View Logfile" msgstr "" msgid "Waiting for command to complete..." msgstr "" +msgid "Yes" +msgstr "" + +msgid "active" +msgstr "" + +msgid "n/a" +msgstr "" + +msgid "no domains blocked" +msgstr "" + msgid "see online documentation" msgstr "" + +msgid "suspended" +msgstr "" diff --git a/applications/luci-app-adblock/po/zh-cn/adblock.po b/applications/luci-app-adblock/po/zh-cn/adblock.po index 277be1a6a3..28f37df28b 100644 --- a/applications/luci-app-adblock/po/zh-cn/adblock.po +++ b/applications/luci-app-adblock/po/zh-cn/adblock.po @@ -1,19 +1,20 @@ +# liushuyu <liushuyu_011@163.com>, 2017. msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: \n" -"Last-Translator: kuoruan@gmail.com\n" -"Language-Team: none\n" +"PO-Revision-Date: 2017-04-15 21:35-0600\n" +"Last-Translator: liushuyu <liushuyu011@gmail.com>\n" +"Language-Team: Chinese <kde-i18n-doc@kde.org>\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.5\n" +"X-Generator: Poedit 2.0.1\n" "Plural-Forms: nplurals=1; plural=0;\n" msgid "." -msgstr "" +msgstr "." msgid "Adblock" msgstr "Adblock" @@ -22,16 +23,19 @@ msgid "Adblock Domain Query" msgstr "" msgid "Adblock Logfile" -msgstr "" +msgstr "Adblock 日志文件" msgid "Adblock version" +msgstr "Adblock 版本" + +msgid "Additional trigger delay in seconds before adblock processing begins." msgstr "" msgid "Advanced" -msgstr "" +msgstr "高级" msgid "Available blocklist sources." -msgstr "" +msgstr "可用的 blocklist 来源" msgid "Backup directory" msgstr "备份目录" @@ -46,26 +50,29 @@ msgid "Blocklist sources" msgstr "拦截列表来源" msgid "Collecting data..." -msgstr "" +msgstr "正在收集数据..." msgid "" "Configuration of the adblock package to block ad/abuse domains by using DNS." msgstr "Adblock 配置工具，通过 DNS 来拦截广告和阻止域名。" msgid "DNS backend" -msgstr "" +msgstr "DNS 后端" msgid "Description" msgstr "描述" -msgid "Edit Blacklist" +msgid "Download Utility (SSL Library)" msgstr "" +msgid "Edit Blacklist" +msgstr "编辑黑名单" + msgid "Edit Configuration" -msgstr "" +msgstr "编辑设置" msgid "Edit Whitelist" -msgstr "" +msgstr "编辑白名单" msgid "Enable adblock" msgstr "启用Adblock" @@ -74,25 +81,33 @@ msgid "Enable blocklist backup" msgstr "启用拦截规则备份" msgid "Enable verbose debug logging" -msgstr "" +msgstr "启用详细调试输出" msgid "Enabled" msgstr "启用" -msgid "For further information" +msgid "" +"For SSL protected blocklist sources you need a suitable SSL library, e.g. " +"'libustream-ssl' or the wget 'built-in'." msgstr "" +msgid "For further information" +msgstr "更多信息" + msgid "Input file not found, please check your configuration." msgstr "" msgid "Invalid domain specified!" -msgstr "" +msgstr "无效域名！" msgid "Last rundate" msgstr "" msgid "Loading" -msgstr "" +msgstr "加载中" + +msgid "No" +msgstr "否" msgid "" "Note that list URLs and Shallalist category selections are configurable in " @@ -100,35 +115,44 @@ msgid "" msgstr "" msgid "Overview" -msgstr "" +msgstr "总览" msgid "" "Please add only one domain per line. Comments introduced with '#' are " -"allowed - ip addresses, wildcards & regex are not." +"allowed - ip addresses, wildcards and regex are not." msgstr "" msgid "Query" -msgstr "" +msgstr "查询" msgid "Query domains" msgstr "" -msgid "Restrict interface reload trigger to certain interface(s)" +msgid "Restrict interface trigger to certain interface(s)" msgstr "" +msgid "Resume adblock" +msgstr "恢复 Adblock" + msgid "Runtime information" +msgstr "运行信息" + +msgid "SSL req." msgstr "" msgid "" -"Space separated list of interfaces that trigger a reload action. To disable " -"reload trigger at all set it to 'false'." +"Space separated list of interfaces that trigger adblock processing. To " +"disable event driven (re-)starts remove all entries." msgstr "" msgid "Status" -msgstr "" +msgstr "状态" msgid "Suspend / Resume adblock" -msgstr "" +msgstr "暂停/恢复 Adblock" + +msgid "Suspend adblock" +msgstr "暂停 Adblock" msgid "" "This form allows you to modify the content of the adblock blacklist (%s)." @@ -155,14 +179,32 @@ msgid "" "only." msgstr "" +msgid "Trigger delay" +msgstr "触发延迟" + msgid "View Logfile" -msgstr "" +msgstr "查看日志文件" msgid "Waiting for command to complete..." +msgstr "正在执行命令..." + +msgid "Yes" +msgstr "是" + +msgid "active" +msgstr "已启用" + +msgid "n/a" msgstr "" +msgid "no domains blocked" +msgstr "没有被拦截的域名" + msgid "see online documentation" -msgstr "" +msgstr "查看在线文档" + +msgid "suspended" +msgstr "已暂停" #~ msgid "" #~ "). Note that list URLs and Shallalist category selections are not " |