summaryrefslogtreecommitdiffhomepage
path: root/applications/luci-app-adblock
diff options
context:
space:
mode:
Diffstat (limited to 'applications/luci-app-adblock')
-rw-r--r--applications/luci-app-adblock/luasrc/controller/adblock.lua12
-rw-r--r--applications/luci-app-adblock/po/it/adblock.po43
-rw-r--r--applications/luci-app-adblock/po/ja/adblock.po52
-rw-r--r--applications/luci-app-adblock/po/pt-br/adblock.po52
-rw-r--r--applications/luci-app-adblock/po/ru/adblock.po54
-rw-r--r--applications/luci-app-adblock/po/sv/adblock.po40
-rw-r--r--applications/luci-app-adblock/po/templates/adblock.pot40
-rw-r--r--applications/luci-app-adblock/po/zh-cn/adblock.po49
-rw-r--r--applications/luci-app-adblock/po/zh-tw/adblock.po50
9 files changed, 232 insertions, 160 deletions
diff --git a/applications/luci-app-adblock/luasrc/controller/adblock.lua b/applications/luci-app-adblock/luasrc/controller/adblock.lua
index 4641ac93bb..d75296275f 100644
--- a/applications/luci-app-adblock/luasrc/controller/adblock.lua
+++ b/applications/luci-app-adblock/luasrc/controller/adblock.lua
@@ -16,7 +16,9 @@ function index()
end
entry({"admin", "services", "adblock"}, firstchild(), _("Adblock"), 30).dependent = false
entry({"admin", "services", "adblock", "tab_from_cbi"}, cbi("adblock/overview_tab", {hideresetbtn=true, hidesavebtn=true}), _("Overview"), 10).leaf = true
- entry({"admin", "services", "adblock", "report"}, template("adblock/report"), _("DNS Query Report"), 20).leaf = true
+ if nixio.fs.access("/usr/sbin/tcpdump") then
+ entry({"admin", "services", "adblock", "report"}, template("adblock/report"), _("DNS Query Report"), 20).leaf = true
+ end
entry({"admin", "services", "adblock", "log"}, template("adblock/logread"), _("Logfile"), 30).leaf = true
entry({"admin", "services", "adblock", "advanced"}, firstchild(), _("Advanced"), 100)
entry({"admin", "services", "adblock", "advanced", "blacklist"}, form("adblock/blacklist_tab"), _("Edit Blacklist"), 110).leaf = true
@@ -143,14 +145,8 @@ function report_text()
end
function logread()
- local content
+ local content = util.trim(util.exec("logread -e 'adblock-'")) or ""
- if nixio.fs.access("/var/log/messages") then
- content = util.trim(util.exec("grep -F 'adblock-' /var/log/messages"))
- else
- content = util.trim(util.exec("logread -e 'adblock-'"))
- end
-
if content == "" then
content = "No adblock related logs yet!"
end
diff --git a/applications/luci-app-adblock/po/it/adblock.po b/applications/luci-app-adblock/po/it/adblock.po
index 40e27c4f3f..455dbb4a3d 100644
--- a/applications/luci-app-adblock/po/it/adblock.po
+++ b/applications/luci-app-adblock/po/it/adblock.po
@@ -68,7 +68,7 @@ msgstr ""
msgid "Blacklist"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:223
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:274
msgid "Blocked DNS Queries"
msgstr ""
@@ -167,6 +167,10 @@ msgstr ""
msgid "Domain"
msgstr ""
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:294
+msgid "Domain/Client/Date/Time"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
msgid "Download Utility"
msgstr ""
@@ -207,12 +211,6 @@ msgstr "Attiva Backup Lista di Blocco"
msgid "Enable DNS Query Report"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:226
-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:98
msgid "Enable verbose debug logging in case of any processing error."
msgstr ""
@@ -222,7 +220,7 @@ msgstr ""
msgid "Enabled"
msgstr "Abilitato"
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:211
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:262
msgid "End Date"
msgstr ""
@@ -230,6 +228,16 @@ msgstr ""
msgid "Extra Options"
msgstr "Opzioni Extra"
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:302
+msgid "Filter"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:292
+msgid ""
+"Filter the DNS Query result set for a particular domain, client or time "
+"frame."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
msgid "Flush DNS Cache"
msgstr ""
@@ -254,10 +262,6 @@ msgstr ""
msgid "Force Local DNS"
msgstr "Forza DNS Locale"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
-msgid "Force Overall Sort"
-msgstr "Forza Ordinamento Globale"
-
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
msgid "Full path to the whitelist file."
msgstr ""
@@ -278,7 +282,7 @@ msgstr "File di input non trovato, per favore controlla la tua configurazione."
msgid "Last Run"
msgstr "Ultimo Avvio"
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:241
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:307
msgid "Latest DNS Queries"
msgstr ""
@@ -298,7 +302,7 @@ 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/report.htm:221
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
msgid "Loading"
msgstr "Caricando"
@@ -394,7 +398,7 @@ msgstr ""
msgid "Refresh Blocklist Sources"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:230
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:281
msgid "Refresh Report"
msgstr ""
@@ -473,7 +477,7 @@ msgid ""
"Space separated list of reporting port(s) used by tcpdump (default: '53')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:205
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:256
msgid "Start Date"
msgstr ""
@@ -564,11 +568,11 @@ msgstr ""
"Per sovrascrivere il percorso di default usa l'opzione 'Directory DNS' nella "
"sezione aggiuntiva sotto."
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:236
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:287
msgid "Top 10 Reporting"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:217
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
msgid "Total DNS Queries"
msgstr ""
@@ -608,5 +612,8 @@ msgid ""
"value to 150000."
msgstr ""
+#~ msgid "Force Overall Sort"
+#~ msgstr "Forza Ordinamento Globale"
+
#~ 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 a9eb968e67..0271995f62 100644
--- a/applications/luci-app-adblock/po/ja/adblock.po
+++ b/applications/luci-app-adblock/po/ja/adblock.po
@@ -70,7 +70,7 @@ msgstr "バックアップ モード"
msgid "Blacklist"
msgstr "ブラックリスト"
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:223
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:274
msgid "Blocked DNS Queries"
msgstr "ブロックされた DNS クエリ"
@@ -175,6 +175,10 @@ msgstr ""
msgid "Domain"
msgstr "ドメイン"
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:294
+msgid "Domain/Client/Date/Time"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
msgid "Download Utility"
msgstr "ダウンロード ユーティリティ"
@@ -215,14 +219,6 @@ msgstr "ブロックリスト バックアップの有効化"
msgid "Enable DNS Query Report"
msgstr "DNS クエリ レポートの有効化"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:226
-msgid ""
-"Enable memory intense overall sort / duplicate removal on low memory devices "
-"(< 64 MB free RAM)"
-msgstr ""
-"メモリー容量の少ないデバイス(RAM 空き領域 64MB 未満)において、一時ファイル"
-"内の全体的なソート及び重複の除去を有効にします。"
-
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
msgid "Enable verbose debug logging in case of any processing error."
msgstr ""
@@ -232,7 +228,7 @@ msgstr ""
msgid "Enabled"
msgstr "有効"
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:211
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:262
msgid "End Date"
msgstr "終了日"
@@ -240,6 +236,16 @@ msgstr "終了日"
msgid "Extra Options"
msgstr "拡張オプション"
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:302
+msgid "Filter"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:292
+msgid ""
+"Filter the DNS Query result set for a particular domain, client or time "
+"frame."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
msgid "Flush DNS Cache"
msgstr "DNS キャッシュのクリア"
@@ -268,10 +274,6 @@ msgstr ""
msgid "Force Local DNS"
msgstr "ローカル DNS の強制"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
-msgid "Force Overall Sort"
-msgstr "全体ソートの強制"
-
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
msgid "Full path to the whitelist file."
msgstr "ホワイトリスト ファイルへのフルパスです。"
@@ -294,7 +296,7 @@ msgstr "入力ファイルが見つかりません。設定を確認してくだ
msgid "Last Run"
msgstr "最終実行"
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:241
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:307
msgid "Latest DNS Queries"
msgstr "最新の DNS クエリ"
@@ -318,7 +320,7 @@ 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/report.htm:221
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
msgid "Loading"
msgstr "読込中"
@@ -419,7 +421,7 @@ msgstr "リフレッシュ"
msgid "Refresh Blocklist Sources"
msgstr "ブロックリスト提供元のリフレッシュ"
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:230
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:281
msgid "Refresh Report"
msgstr "レポートをリフレッシュ"
@@ -507,7 +509,7 @@ msgstr ""
"tcpdump により使用される、レポートを行うポートのスペースで区切られたリストで"
"す。(規定値: '53')"
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:205
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:256
msgid "Start Date"
msgstr "開始日"
@@ -608,11 +610,11 @@ msgstr ""
"デフォルトのパスを上書きするには、下記拡張セクションの 'DNS ディレクトリ' オ"
"プションを使用します。"
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:236
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:287
msgid "Top 10 Reporting"
msgstr "上位 10 レポート"
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:217
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
msgid "Total DNS Queries"
msgstr "総 DNS クエリ"
@@ -654,3 +656,13 @@ msgid ""
"value to 150000."
msgstr ""
"例: Adblock のアップデート毎にメールを受け取るには、150000 に設定します。"
+
+#~ msgid ""
+#~ "Enable memory intense overall sort / duplicate removal on low memory "
+#~ "devices (< 64 MB free RAM)"
+#~ msgstr ""
+#~ "メモリー容量の少ないデバイス(RAM 空き領域 64MB 未満)において、一時ファイ"
+#~ "ル内の全体的なソート及び重複の除去を有効にします。"
+
+#~ msgid "Force Overall Sort"
+#~ msgstr "全体ソートの強制"
diff --git a/applications/luci-app-adblock/po/pt-br/adblock.po b/applications/luci-app-adblock/po/pt-br/adblock.po
index 43c8b1c4a1..3dc2d48ff4 100644
--- a/applications/luci-app-adblock/po/pt-br/adblock.po
+++ b/applications/luci-app-adblock/po/pt-br/adblock.po
@@ -73,7 +73,7 @@ msgstr "Modo de Backup"
msgid "Blacklist"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:223
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:274
msgid "Blocked DNS Queries"
msgstr ""
@@ -178,6 +178,10 @@ msgstr ""
msgid "Domain"
msgstr ""
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:294
+msgid "Domain/Client/Date/Time"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
msgid "Download Utility"
msgstr "Ferramenta para Baixar"
@@ -218,14 +222,6 @@ msgstr "Habilitar cópia de segurança da lista de bloqueio"
msgid "Enable DNS Query Report"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:226
-msgid ""
-"Enable memory intense overall sort / duplicate removal on low memory devices "
-"(< 64 MB free RAM)"
-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:98
msgid "Enable verbose debug logging in case of any processing error."
msgstr ""
@@ -236,7 +232,7 @@ msgstr ""
msgid "Enabled"
msgstr "Habilitado"
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:211
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:262
msgid "End Date"
msgstr ""
@@ -244,6 +240,16 @@ msgstr ""
msgid "Extra Options"
msgstr "Opções adicionais"
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:302
+msgid "Filter"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:292
+msgid ""
+"Filter the DNS Query result set for a particular domain, client or time "
+"frame."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
msgid "Flush DNS Cache"
msgstr "Limpar cache DNS"
@@ -272,10 +278,6 @@ msgstr ""
msgid "Force Local DNS"
msgstr "Force o DNS local"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
-msgid "Force Overall Sort"
-msgstr "Force Tipo Geral"
-
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
msgid "Full path to the whitelist file."
msgstr "Caminho completo para a lista branca."
@@ -296,7 +298,7 @@ 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/view/adblock/report.htm:241
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:307
msgid "Latest DNS Queries"
msgstr ""
@@ -320,7 +322,7 @@ 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/report.htm:221
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
msgid "Loading"
msgstr "Carregando"
@@ -420,7 +422,7 @@ msgstr "Atualizar"
msgid "Refresh Blocklist Sources"
msgstr "Atualizar as Fontes de Lista Negra"
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:230
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:281
msgid "Refresh Report"
msgstr ""
@@ -503,7 +505,7 @@ msgid ""
"Space separated list of reporting port(s) used by tcpdump (default: '53')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:205
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:256
msgid "Start Date"
msgstr ""
@@ -595,11 +597,11 @@ msgstr ""
"Para sobrescrever o caminho padrão, use a opção 'Diretório DNS' na seção "
"extra abaixo."
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:236
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:287
msgid "Top 10 Reporting"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:217
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
msgid "Total DNS Queries"
msgstr ""
@@ -642,6 +644,16 @@ msgstr ""
"este valor para 150000."
#~ msgid ""
+#~ "Enable memory intense overall sort / duplicate removal on low memory "
+#~ "devices (< 64 MB free RAM)"
+#~ msgstr ""
+#~ "Habilita a remoção de entradas duplicadas em dispositivos com pouca "
+#~ "memória (< 64 MB de memória RAM livre)"
+
+#~ msgid "Force Overall Sort"
+#~ msgstr "Force Tipo Geral"
+
+#~ msgid ""
#~ "Please note: this needs additional 'msmtp' package installation and setup."
#~ msgstr "Nota: isto exige a instalação e configuração do pacote 'msmtp'."
diff --git a/applications/luci-app-adblock/po/ru/adblock.po b/applications/luci-app-adblock/po/ru/adblock.po
index 58febecfc7..d143ec2660 100644
--- a/applications/luci-app-adblock/po/ru/adblock.po
+++ b/applications/luci-app-adblock/po/ru/adblock.po
@@ -74,7 +74,7 @@ msgstr "Режим сохранения бекапа"
msgid "Blacklist"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:223
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:274
msgid "Blocked DNS Queries"
msgstr ""
@@ -176,6 +176,10 @@ msgstr ""
msgid "Domain"
msgstr ""
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:294
+msgid "Domain/Client/Date/Time"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
msgid "Download Utility"
msgstr "Утилита для скачивания"
@@ -216,15 +220,6 @@ msgstr "Бэкап списка блокировок"
msgid "Enable DNS Query Report"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:226
-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:98
msgid "Enable verbose debug logging in case of any processing error."
msgstr "Включить подробное ведение журнала отладки в случае ошибок обработки."
@@ -233,7 +228,7 @@ msgstr "Включить подробное ведение журнала отл
msgid "Enabled"
msgstr "Включено"
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:211
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:262
msgid "End Date"
msgstr ""
@@ -241,6 +236,16 @@ msgstr ""
msgid "Extra Options"
msgstr "Дополнительные настройки"
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:302
+msgid "Filter"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:292
+msgid ""
+"Filter the DNS Query result set for a particular domain, client or time "
+"frame."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
msgid "Flush DNS Cache"
msgstr "Очистка кэша DNS"
@@ -269,10 +274,6 @@ msgstr ""
msgid "Force Local DNS"
msgstr "Локальный DNS"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
-msgid "Force Overall Sort"
-msgstr "Принудительная полная сортировка"
-
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
msgid "Full path to the whitelist file."
msgstr "Полный путь к файлу Белого списка."
@@ -293,7 +294,7 @@ msgstr "Config файл не найден, настройте config файл."
msgid "Last Run"
msgstr "Последний запуск"
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:241
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:307
msgid "Latest DNS Queries"
msgstr ""
@@ -315,7 +316,7 @@ 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/report.htm:221
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
msgid "Loading"
msgstr "Загрузка"
@@ -410,7 +411,7 @@ msgstr ""
msgid "Refresh Blocklist Sources"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:230
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:281
msgid "Refresh Report"
msgstr ""
@@ -489,7 +490,7 @@ msgid ""
"Space separated list of reporting port(s) used by tcpdump (default: '53')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:205
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:256
msgid "Start Date"
msgstr ""
@@ -582,11 +583,11 @@ msgstr ""
"Чтобы заменить путь по умолчанию, используйте пункт 'Папка DNS' в разделе "
"'Дополнительные настройки'."
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:236
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:287
msgid "Top 10 Reporting"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:217
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
msgid "Total DNS Queries"
msgstr ""
@@ -629,6 +630,17 @@ msgstr ""
"установите значение 150000."
#~ msgid ""
+#~ "Enable memory intense overall sort / duplicate removal on low memory "
+#~ "devices (< 64 MB free RAM)"
+#~ msgstr ""
+#~ "Включить полную сортировку / удаление дубликатов в памяти. Используйте на "
+#~ "устройствах с низким объемом памяти (< 64 MB свободной оперативной "
+#~ "памяти)."
+
+#~ msgid "Force Overall Sort"
+#~ msgstr "Принудительная полная сортировка"
+
+#~ msgid ""
#~ "Please note: this needs additional 'msmtp' package installation and setup."
#~ msgstr "Внимание: это потребует дополнительной установки пакета 'msmtp'."
diff --git a/applications/luci-app-adblock/po/sv/adblock.po b/applications/luci-app-adblock/po/sv/adblock.po
index 90c12c7114..f93f178ce8 100644
--- a/applications/luci-app-adblock/po/sv/adblock.po
+++ b/applications/luci-app-adblock/po/sv/adblock.po
@@ -58,7 +58,7 @@ msgstr ""
msgid "Blacklist"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:223
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:274
msgid "Blocked DNS Queries"
msgstr ""
@@ -158,6 +158,10 @@ msgstr ""
msgid "Domain"
msgstr ""
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:294
+msgid "Domain/Client/Date/Time"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
msgid "Download Utility"
msgstr ""
@@ -198,12 +202,6 @@ msgstr "Aktivera säkerhetskopiering av blockeringslistan"
msgid "Enable DNS Query Report"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:226
-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:98
msgid "Enable verbose debug logging in case of any processing error."
msgstr ""
@@ -212,7 +210,7 @@ msgstr ""
msgid "Enabled"
msgstr "Aktiverad"
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:211
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:262
msgid "End Date"
msgstr ""
@@ -220,6 +218,16 @@ msgstr ""
msgid "Extra Options"
msgstr "Extra alternativ"
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:302
+msgid "Filter"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:292
+msgid ""
+"Filter the DNS Query result set for a particular domain, client or time "
+"frame."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
msgid "Flush DNS Cache"
msgstr ""
@@ -244,10 +252,6 @@ msgstr ""
msgid "Force Local DNS"
msgstr "Tvinga lokal DNS"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
-msgid "Force Overall Sort"
-msgstr ""
-
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
msgid "Full path to the whitelist file."
msgstr ""
@@ -269,7 +273,7 @@ msgstr ""
msgid "Last Run"
msgstr "Kördes senast"
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:241
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:307
msgid "Latest DNS Queries"
msgstr ""
@@ -289,7 +293,7 @@ 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/report.htm:221
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
msgid "Loading"
msgstr "Laddar"
@@ -380,7 +384,7 @@ msgstr ""
msgid "Refresh Blocklist Sources"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:230
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:281
msgid "Refresh Report"
msgstr ""
@@ -459,7 +463,7 @@ msgid ""
"Space separated list of reporting port(s) used by tcpdump (default: '53')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:205
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:256
msgid "Start Date"
msgstr ""
@@ -546,11 +550,11 @@ msgid ""
"section below."
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:236
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:287
msgid "Top 10 Reporting"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:217
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
msgid "Total DNS Queries"
msgstr ""
diff --git a/applications/luci-app-adblock/po/templates/adblock.pot b/applications/luci-app-adblock/po/templates/adblock.pot
index 0db673683c..8890e4aa6f 100644
--- a/applications/luci-app-adblock/po/templates/adblock.pot
+++ b/applications/luci-app-adblock/po/templates/adblock.pot
@@ -58,7 +58,7 @@ msgstr ""
msgid "Blacklist"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:223
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:274
msgid "Blocked DNS Queries"
msgstr ""
@@ -151,6 +151,10 @@ msgstr ""
msgid "Domain"
msgstr ""
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:294
+msgid "Domain/Client/Date/Time"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
msgid "Download Utility"
msgstr ""
@@ -191,12 +195,6 @@ msgstr ""
msgid "Enable DNS Query Report"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:226
-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:98
msgid "Enable verbose debug logging in case of any processing error."
msgstr ""
@@ -205,7 +203,7 @@ msgstr ""
msgid "Enabled"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:211
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:262
msgid "End Date"
msgstr ""
@@ -213,6 +211,16 @@ msgstr ""
msgid "Extra Options"
msgstr ""
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:302
+msgid "Filter"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:292
+msgid ""
+"Filter the DNS Query result set for a particular domain, client or time "
+"frame."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
msgid "Flush DNS Cache"
msgstr ""
@@ -237,10 +245,6 @@ msgstr ""
msgid "Force Local DNS"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
-msgid "Force Overall Sort"
-msgstr ""
-
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
msgid "Full path to the whitelist file."
msgstr ""
@@ -261,7 +265,7 @@ msgstr ""
msgid "Last Run"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:241
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:307
msgid "Latest DNS Queries"
msgstr ""
@@ -281,7 +285,7 @@ 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/report.htm:221
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
msgid "Loading"
msgstr ""
@@ -372,7 +376,7 @@ msgstr ""
msgid "Refresh Blocklist Sources"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:230
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:281
msgid "Refresh Report"
msgstr ""
@@ -451,7 +455,7 @@ msgid ""
"Space separated list of reporting port(s) used by tcpdump (default: '53')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:205
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:256
msgid "Start Date"
msgstr ""
@@ -536,11 +540,11 @@ msgid ""
"section below."
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:236
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:287
msgid "Top 10 Reporting"
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:217
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
msgid "Total DNS Queries"
msgstr ""
diff --git a/applications/luci-app-adblock/po/zh-cn/adblock.po b/applications/luci-app-adblock/po/zh-cn/adblock.po
index b03f8a0bbc..dd59399f80 100644
--- a/applications/luci-app-adblock/po/zh-cn/adblock.po
+++ b/applications/luci-app-adblock/po/zh-cn/adblock.po
@@ -74,7 +74,7 @@ msgstr "备份模式"
msgid "Blacklist"
msgstr "黑名单"
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:223
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:274
msgid "Blocked DNS Queries"
msgstr "已拦截的 DNS 请求"
@@ -171,6 +171,10 @@ msgstr "启动期间不要自动更新 blocklists,改用 blocklists 的备份
msgid "Domain"
msgstr "域名"
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:294
+msgid "Domain/Client/Date/Time"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
msgid "Download Utility"
msgstr "下载工具"
@@ -211,12 +215,6 @@ msgstr "启用 Blocklist 备份"
msgid "Enable DNS Query Report"
msgstr "启用 DNS 查询报告"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:226
-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:98
msgid "Enable verbose debug logging in case of any processing error."
msgstr "在出现任何处理错误的情况下启用详细调试日志记录。"
@@ -225,7 +223,7 @@ msgstr "在出现任何处理错误的情况下启用详细调试日志记录。
msgid "Enabled"
msgstr "已启用"
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:211
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:262
msgid "End Date"
msgstr "结束日期"
@@ -233,6 +231,16 @@ msgstr "结束日期"
msgid "Extra Options"
msgstr "额外选项"
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:302
+msgid "Filter"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:292
+msgid ""
+"Filter the DNS Query result set for a particular domain, client or time "
+"frame."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
msgid "Flush DNS Cache"
msgstr "清空 DNS 缓存"
@@ -257,10 +265,6 @@ msgstr "为了进一步提高性能,您可以提高此值,例如:8 或 16
msgid "Force Local DNS"
msgstr "强制本地 DNS"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
-msgid "Force Overall Sort"
-msgstr "强制整体排序"
-
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
msgid "Full path to the whitelist file."
msgstr "白名单文件的全路径。"
@@ -281,7 +285,7 @@ msgstr "输入文件未找到,请检查您的配置。"
msgid "Last Run"
msgstr "最后运行"
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:241
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:307
msgid "Latest DNS Queries"
msgstr "最新的 DNS 查询"
@@ -301,7 +305,7 @@ 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/report.htm:221
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
msgid "Loading"
msgstr "加载中"
@@ -398,7 +402,7 @@ msgstr "刷新"
msgid "Refresh Blocklist Sources"
msgstr "刷新拦截列表源"
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:230
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:281
msgid "Refresh Report"
msgstr "刷新报告"
@@ -477,7 +481,7 @@ msgid ""
"Space separated list of reporting port(s) used by tcpdump (default: '53')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:205
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:256
msgid "Start Date"
msgstr "开始日期"
@@ -563,11 +567,11 @@ msgid ""
"section below."
msgstr "要覆盖默认路径,请使用下面额外部分中的“DNS 目录”选项。"
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:236
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:287
msgid "Top 10 Reporting"
msgstr "前十报告"
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:217
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
msgid "Total DNS Queries"
msgstr "DNS 查询总数"
@@ -607,5 +611,14 @@ msgid ""
"value to 150000."
msgstr "例如:要接收每个 adblock 更新的电子邮件通知时将此值设置为 150000。"
+#~ msgid ""
+#~ "Enable memory intense overall sort / duplicate removal on low memory "
+#~ "devices (< 64 MB free RAM)"
+#~ msgstr ""
+#~ "在低内存设备上启用积极的内存整体排序/重复移除(< 64 MB 空闲内存)"
+
+#~ msgid "Force Overall Sort"
+#~ msgstr "强制整体排序"
+
#~ msgid "Reporting interface used by tcpdump (default 'br-lan')."
#~ msgstr "tcpdump 将使用的报告接口(默认为“br-lan”)。"
diff --git a/applications/luci-app-adblock/po/zh-tw/adblock.po b/applications/luci-app-adblock/po/zh-tw/adblock.po
index e3f91b8d93..6611f1964a 100644
--- a/applications/luci-app-adblock/po/zh-tw/adblock.po
+++ b/applications/luci-app-adblock/po/zh-tw/adblock.po
@@ -74,7 +74,7 @@ msgstr "備份模式"
msgid "Blacklist"
msgstr "黑名單"
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:223
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:274
msgid "Blocked DNS Queries"
msgstr "已攔截的 DNS 請求"
@@ -171,6 +171,10 @@ msgstr "啟動期間不要自動更新 blocklists,改用 blocklists 的備份
msgid "Domain"
msgstr "域名"
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:294
+msgid "Domain/Client/Date/Time"
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
msgid "Download Utility"
msgstr "下載工具"
@@ -211,13 +215,6 @@ msgstr "啟用 Blocklist 備份"
msgid "Enable DNS Query Report"
msgstr "啟用 DNS 查詢報告"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:226
-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:98
msgid "Enable verbose debug logging in case of any processing error."
msgstr "在出現任何處理錯誤的情況下啟用詳細除錯日誌記錄。"
@@ -226,7 +223,7 @@ msgstr "在出現任何處理錯誤的情況下啟用詳細除錯日誌記錄。
msgid "Enabled"
msgstr "已啟用"
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:211
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:262
msgid "End Date"
msgstr "結束日期"
@@ -234,6 +231,16 @@ msgstr "結束日期"
msgid "Extra Options"
msgstr "額外選項"
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:302
+msgid "Filter"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:292
+msgid ""
+"Filter the DNS Query result set for a particular domain, client or time "
+"frame."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
msgid "Flush DNS Cache"
msgstr "清空 DNS 快取"
@@ -258,10 +265,6 @@ msgstr "為了進一步提高效能,您可以提高此值,例如:8 或 16
msgid "Force Local DNS"
msgstr "強制本地 DNS"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
-msgid "Force Overall Sort"
-msgstr "強制整體排序"
-
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
msgid "Full path to the whitelist file."
msgstr "白名單檔案的全路徑。"
@@ -282,7 +285,7 @@ msgstr "輸入檔案未找到,請檢查您的配置。"
msgid "Last Run"
msgstr "最後執行"
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:241
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:307
msgid "Latest DNS Queries"
msgstr "最新的 DNS 查詢"
@@ -302,7 +305,7 @@ 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/report.htm:221
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:90
msgid "Loading"
msgstr "載入中"
@@ -399,7 +402,7 @@ msgstr "重新整理"
msgid "Refresh Blocklist Sources"
msgstr "重新整理攔截列表源"
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:230
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:281
msgid "Refresh Report"
msgstr "重新整理報告"
@@ -479,7 +482,7 @@ msgid ""
"Space separated list of reporting port(s) used by tcpdump (default: '53')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:205
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:256
msgid "Start Date"
msgstr "開始日期"
@@ -565,11 +568,11 @@ msgid ""
"section below."
msgstr "要覆蓋預設路徑,請使用下面額外部分中的“DNS 目錄”選項。"
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:236
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:287
msgid "Top 10 Reporting"
msgstr "前十報告"
-#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:217
+#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
msgid "Total DNS Queries"
msgstr "DNS 查詢總數"
@@ -609,5 +612,14 @@ msgid ""
"value to 150000."
msgstr "例如:要接收每個 adblock 更新的電子郵件通知時將此值設定為 150000。"
+#~ msgid ""
+#~ "Enable memory intense overall sort / duplicate removal on low memory "
+#~ "devices (< 64 MB free RAM)"
+#~ msgstr ""
+#~ "在低記憶體裝置上啟用積極的記憶體整體排序/重複移除(< 64 MB 空閒記憶體)"
+
+#~ msgid "Force Overall Sort"
+#~ msgstr "強制整體排序"
+
#~ msgid "Reporting interface used by tcpdump (default 'br-lan')."
#~ msgstr "tcpdump 將使用的報告介面(預設為“br-lan”)。"