diff options
7 files changed, 60 insertions, 20 deletions
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..b8318fe994 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 @@ -30,14 +30,14 @@ if data.adblock == nil then btn.inputstyle = nil btn.disabled = true elseif dnsFile1 ~= "" or dnsFile2 ~= "" then - btn.inputtitle = "Suspend adblock" + btn.inputtitle = translate("Suspend adblock") btn.inputstyle = "reset" btn.disabled = false function btn.write() luci.sys.call("/etc/init.d/adblock suspend >/dev/null 2>&1") end else - btn.inputtitle = "Resume adblock" + btn.inputtitle = translate("Resume adblock") btn.inputstyle = "apply" btn.disabled = false function btn.write() @@ -51,8 +51,8 @@ o2.rmempty = false 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 + "To disable reload trigger at all remove all entries.")) +o3.rmempty =true -- Runtime information diff --git a/applications/luci-app-adblock/luasrc/view/adblock/query.htm b/applications/luci-app-adblock/luasrc/view/adblock/query.htm index be606301ec..5e064af858 100644 --- a/applications/luci-app-adblock/luasrc/view/adblock/query.htm +++ b/applications/luci-app-adblock/luasrc/view/adblock/query.htm @@ -25,7 +25,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/po/ja/adblock.po b/applications/luci-app-adblock/po/ja/adblock.po index 0d806d21a8..d37fa748cb 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 "." @@ -50,7 +50,7 @@ msgstr "データ収集中です..." msgid "" "Configuration of the adblock package to block ad/abuse domains by using DNS." msgstr "" -"DNSの利用によって広告/不正ドメインをブロックする、adblock パッケージの設定で" +"DNS の利用によって広告/不正ドメインをブロックする、Adblock パッケージの設定で" "す。" msgid "DNS backend" @@ -69,7 +69,7 @@ msgid "Edit Whitelist" msgstr "ホワイトリストの編集" msgid "Enable adblock" -msgstr "Adblockの有効化" +msgstr "Adblock の有効化" msgid "Enable blocklist backup" msgstr "ブロックリスト バックアップの有効化" @@ -99,8 +99,8 @@ msgid "" "Note that list URLs and Shallalist category selections are configurable in " "the 'Advanced' section." msgstr "" -"リストのURL及び \"Shalla\" リストのカテゴリー設定は、'詳細設定' セクションで" -"設定することができます。" +"リストの URL 及び \"Shalla\" リストのカテゴリー設定は、'詳細設定' セクション" +"で設定することができます。" msgid "Overview" msgstr "概要" @@ -109,6 +109,9 @@ msgid "" "Please add only one domain per line. Comments introduced with '#' are " "allowed - ip addresses, wildcards and regex are not." msgstr "" +"1行に1つのドメインを追加してください。'#' から始まるコメントを記述できます" +"が、IP アドレスやワイルドカード、正規表現を設定値として使用することはできませ" +"ん。" msgid "Query" msgstr "検索" @@ -119,21 +122,27 @@ msgstr "ドメインの検索" msgid "Restrict interface reload trigger to certain interface(s)" msgstr "リロード トリガを特定のインターフェースに限定する" +msgid "Resume adblock" +msgstr "Adblock の再開" + msgid "Runtime information" msgstr "実行情報" msgid "" "Space separated list of interfaces that trigger a reload action. To disable " -"reload trigger at all set it to 'false'." +"reload trigger at all remove all entries." msgstr "" -"リロードのトリガとなる、スペースで区切られたインターフェースのリストで" -"す。'false' に設定した場合、全てのリロード トリガは無効になります。" +"リロードのトリガとなる、スペースで区切られたインターフェースのリストです。リ" +"ロード トリガを無効にするには、全てのエントリーを削除して空欄にします。" 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)." @@ -167,8 +176,8 @@ msgid "" "This form shows the syslog output, pre-filtered for adblock related messages " "only." msgstr "" -"このフォームには、システムログ内のAdblockに関連するメッセージのみが表示されま" -"す。" +"このフォームには、システムログ内の Adblock に関連するメッセージのみが表示され" +"ます。" msgid "View Logfile" msgstr "ログファイルを見る" @@ -180,6 +189,13 @@ msgid "see online documentation" 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 "" diff --git a/applications/luci-app-adblock/po/pt-br/adblock.po b/applications/luci-app-adblock/po/pt-br/adblock.po index c0a4c0ea01..32553277b2 100644 --- a/applications/luci-app-adblock/po/pt-br/adblock.po +++ b/applications/luci-app-adblock/po/pt-br/adblock.po @@ -118,12 +118,15 @@ msgstr "" msgid "Restrict interface reload trigger to certain interface(s)" msgstr "" +msgid "Resume adblock" +msgstr "" + msgid "Runtime information" msgstr "" msgid "" "Space separated list of interfaces that trigger a reload action. To disable " -"reload trigger at all set it to 'false'." +"reload trigger at all remove all entries." msgstr "" msgid "Status" @@ -132,6 +135,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 />" diff --git a/applications/luci-app-adblock/po/sv/adblock.po b/applications/luci-app-adblock/po/sv/adblock.po index 1d2e2351a0..0e2f039de7 100644 --- a/applications/luci-app-adblock/po/sv/adblock.po +++ b/applications/luci-app-adblock/po/sv/adblock.po @@ -107,12 +107,15 @@ msgstr "" msgid "Restrict interface reload trigger to certain interface(s)" msgstr "" +msgid "Resume adblock" +msgstr "" + msgid "Runtime information" msgstr "" msgid "" "Space separated list of interfaces that trigger a reload action. To disable " -"reload trigger at all set it to 'false'." +"reload trigger at all remove all entries." msgstr "" msgid "Status" @@ -121,6 +124,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 />" diff --git a/applications/luci-app-adblock/po/templates/adblock.pot b/applications/luci-app-adblock/po/templates/adblock.pot index 1f27213e44..464ffd9949 100644 --- a/applications/luci-app-adblock/po/templates/adblock.pot +++ b/applications/luci-app-adblock/po/templates/adblock.pot @@ -105,12 +105,15 @@ msgstr "" msgid "Restrict interface reload trigger to certain interface(s)" msgstr "" +msgid "Resume adblock" +msgstr "" + msgid "Runtime information" msgstr "" msgid "" "Space separated list of interfaces that trigger a reload action. To disable " -"reload trigger at all set it to 'false'." +"reload trigger at all remove all entries." msgstr "" msgid "Status" @@ -119,6 +122,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 />" diff --git a/applications/luci-app-adblock/po/zh-cn/adblock.po b/applications/luci-app-adblock/po/zh-cn/adblock.po index 7fc5dcc4fa..36af78bdab 100644 --- a/applications/luci-app-adblock/po/zh-cn/adblock.po +++ b/applications/luci-app-adblock/po/zh-cn/adblock.po @@ -116,12 +116,15 @@ msgstr "" msgid "Restrict interface reload trigger to certain interface(s)" msgstr "" +msgid "Resume adblock" +msgstr "" + msgid "Runtime information" msgstr "" msgid "" "Space separated list of interfaces that trigger a reload action. To disable " -"reload trigger at all set it to 'false'." +"reload trigger at all remove all entries." msgstr "" msgid "Status" @@ -130,6 +133,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 />" |