2 files changed, 141 insertions, 50 deletions
diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock.lua
index 2cee302086..d80cb486e3 100644
--- a/applications/luci-app-adblock/luasrc/model/cbi/adblock.lua
+++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock.lua
@@ -1,4 +1,4 @@
--- Copyright 2016 Openwrt.org
+-- Copyright 2016 Hannu Nyman
 -- Licensed to the public under the Apache License 2.0.
 
 m = Map("adblock", translate("Adblock"),
@@ -17,20 +17,6 @@ o3 = s:option(Value, "adb_whitelist", translate("Whitelist file"),
 o3.rmempty = false
 o3.datatype = "file"
 
-fdns = s:option(Flag, "adb_forcedns", translate("Redirect all DNS queries to the local resolver"),
-        translate("When adblock is active, all DNS queries are redirected to the local resolver " ..
-        "in this server by default. You can disable that to allow queries to external DNS servers."))
-fdns.rmempty = false
-fdns.default = fdns.enabled
-
--- Statistics
-
-t = m:section(NamedSection, "global", "adblock", translate("Statistics"))
-
-dat = t:option(DummyValue, "adb_lastrun", translate("Last update of the blocklists"))
-tot = t:option(DummyValue, "adb_overall_count", translate("Total count of blocked domains"))
-prc = t:option(DummyValue, "adb_percentage", translate("Percentage of blocked packets (before last update, IPv4/IPv6)"))
-
 -- Blocklist options
 
 bl = m:section(TypedSection, "source", translate("Blocklist sources"),
@@ -45,8 +31,6 @@ name = bl:option(Flag, "enabled", translate("Enabled"))
 name.rmempty  = false
 
 des = bl:option(DummyValue, "adb_src_desc", translate("Description"))
-cou = bl:option(DummyValue, "adb_src_count", translate("Count"))
-upd = bl:option(DummyValue, "adb_src_timestamp", translate("List date/state"))
 
 -- Additional options
 
@@ -65,39 +49,15 @@ o5.datatype = "directory"
 e = m:section(NamedSection, "global", "adblock", translate("Extra options"),
 	translate("Options for further tweaking in case the defaults are not suitable for you."))
 
-a0 = e:option(Flag, "adb_restricted", translate("Do not write status info to flash"),
-	translate("Skip writing update status information to the config file. Status fields on this page will not be updated."))
-a0.default = 0
-
-a1 = e:option(Value, "adb_nullport", translate("Port of the adblock uhttpd instance"))
-a1.optional = true
-a1.default = 65534
-a1.datatype = "port"
-
-a5 = e:option(Value, "adb_nullportssl", translate("Port of the adblock uhttpd instance for https links"))
-a5.optional = true
-a5.default = 65535
-a5.datatype = "port"
-
-a2 = e:option(Value, "adb_nullipv4", translate("IPv4 blackhole ip address"))
-a2.optional = true
-a2.default = "198.18.0.1"
-a2.datatype = "ip4addr"
-
-a3 = e:option(Value, "adb_nullipv6", translate("IPv6 blackhole ip address"))
-a3.optional = true
-a3.default = "::ffff:c612:0001"
-a3.datatype = "ip6addr"
-
-a4 = e:option(Value, "adb_fetchttl", translate("Timeout for blocklist fetch (seconds)"))
-a4.optional = true
-a4.default = 5
-a4.datatype = "range(2,60)"
-
-a7 = e:option(Value, "adb_lanif", translate("Name of the logical lan interface"))
-a7.optional = true
-a7.default = "lan"
-a7.datatype = "network"
+a = e:option(Flag, "adb_debug", translate("Enable verbose debug logging"))
+a.default = a.disabled
+a.rmempty = false
+
+a = e:option(Value, "adb_iface", translate("Restrict reload trigger to certain interface(s)"),
+	translate("Space separated list of wan interfaces that trigger reload action. " ..
+		"To disable reload trigger set it to 'false'. Default: empty"))
+a.datatype = "network"
+a.rmempty = true
 
 return m
 
diff --git a/applications/luci-app-adblock/po/ja/adblock.po b/applications/luci-app-adblock/po/ja/adblock.po
new file mode 100644
index 0000000000..72f1c7ac31
--- /dev/null
+++ b/applications/luci-app-adblock/po/ja/adblock.po
@@ -0,0 +1,131 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: musashino205 <musashino.open@gmail.com>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.5.7\n"
+
+msgid ""
+"). Note that list URLs and Shallalist category selections are not "
+"configurable via Luci."
+msgstr ""
+"）。これらのリストのURLおよびshallaリストのカテゴリー選択は、Luciによって設定"
+"できないことに注意します。"
+
+msgid "Adblock"
+msgstr "Adblock"
+
+msgid "Available blocklist sources ("
+msgstr "利用可能なブロックリスト提供元です（"
+
+msgid "Backup directory"
+msgstr "バックアップ ディレクトリ"
+
+msgid "Backup options"
+msgstr "バックアップ オプション"
+
+msgid "Blocklist sources"
+msgstr "ブロックリスト提供元"
+
+msgid ""
+"Configuration of the adblock package to block ad/abuse domains by using DNS."
+msgstr ""
+"広告/不正ドメインをDNSを利用してブロックする、adblock パッケージの設定です。"
+
+msgid "Count"
+msgstr "カウント"
+
+msgid "Description"
+msgstr "説明"
+
+msgid "Do not write status info to flash"
+msgstr "ステータス情報をフラッシュに書き込まない"
+
+msgid "Enable adblock"
+msgstr "adblockの有効化"
+
+msgid "Enable blocklist backup"
+msgstr "ブロックリスト バックアップの有効化"
+
+msgid "Enabled"
+msgstr "有効"
+
+msgid "Extra options"
+msgstr "拡張設定"
+
+msgid ""
+"File with whitelisted hosts/domains that are allowed despite being on a "
+"blocklist."
+msgstr ""
+"ファイルのホワイトリスト ホスト/ドメインは、ブロックリストに登録されていても"
+"許可されます。"
+
+msgid "Global options"
+msgstr "一般設定"
+
+msgid "IPv4 blackhole ip address"
+msgstr ""
+
+msgid "IPv6 blackhole ip address"
+msgstr ""
+
+msgid "Last update of the blocklists"
+msgstr "ブロックリストの最終更新日時"
+
+msgid "List date/state"
+msgstr "リスト日時/状態"
+
+msgid "Name of the logical lan interface"
+msgstr "論理LANインターフェース名"
+
+msgid ""
+"Options for further tweaking in case the defaults are not suitable for you."
+msgstr "デフォルト設定が適切でない場合、追加で設定するためのオプションです。"
+
+msgid "Percentage of blocked packets (before last update, IPv4/IPv6)"
+msgstr "ブロック済みパケットの割合（最終更新以前、IPv4/IPv6）"
+
+msgid "Port of the adblock uhttpd instance"
+msgstr "adblock uhttpdインスタンスのポート"
+
+msgid "Port of the adblock uhttpd instance for https links"
+msgstr "httpsリンク用adblock uhttpdインスタンスのポート"
+
+msgid "Redirect all DNS queries to the local resolver"
+msgstr "全てのDNSクエリをローカルリゾルバにリダイレクト"
+
+msgid ""
+"Skip writing update status information to the config file. Status fields on "
+"this page will not be updated."
+msgstr ""
+"更新ステータス情報をコンフィグファイルに書き込まず、スキップします。このペー"
+"ジのステータス画面は更新されなくなります。"
+
+msgid "Statistics"
+msgstr "ステータス"
+
+msgid "Timeout for blocklist fetch (seconds)"
+msgstr "ブロックリスト取得の制限時間（秒）"
+
+msgid "Total count of blocked domains"
+msgstr "ブロック済みドメインの合計"
+
+msgid ""
+"When adblock is active, all DNS queries are redirected to the local resolver "
+"in this server by default. You can disable that to allow queries to external "
+"DNS servers."
+msgstr ""
+"adblockがアクティブである時、全てのDNSクエリは既定でこのサーバー上のリゾルバ"
+"にリダイレクトされます。外部DNSサーバーへのクエリを許可する場合、この設定を無"
+"効にすることもできます。"
+
+msgid "Whitelist file"
+msgstr "ホワイトリスト ファイル"
+
+msgid "see list details"
+msgstr "リストの詳細を見る"