diff options
Diffstat (limited to 'applications/luci-app-adblock')
12 files changed, 22 insertions, 23 deletions
diff --git a/applications/luci-app-adblock/luasrc/controller/adblock.lua b/applications/luci-app-adblock/luasrc/controller/adblock.lua index d4368e7890..700f187b35 100644 --- a/applications/luci-app-adblock/luasrc/controller/adblock.lua +++ b/applications/luci-app-adblock/luasrc/controller/adblock.lua @@ -3,7 +3,6 @@ module("luci.controller.adblock", package.seeall) -local fs = require("nixio.fs") local util = require("luci.util") local templ = require("luci.template") local i18n = require("luci.i18n") 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 ef70100e4f..8526a4b5eb 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 @@ -4,7 +4,7 @@ local fs = require("nixio.fs") local util = require("luci.util") local uci = require("uci") -local adbinput = uci.get("adblock", "blacklist", "adb_src" or "/etc/adblock/adblock.blacklist") +local adbinput = uci:get("adblock", "blacklist", "adb_src") or "/etc/adblock/adblock.blacklist" if not nixio.fs.access(adbinput) then m = SimpleForm("error", nil, 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 dc5ab62cc3..3786c7a4e4 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 @@ -7,7 +7,7 @@ local sys = require("luci.sys") local util = require("luci.util") local dump = util.ubus("network.interface", "dump", {}) local json = require("luci.jsonc") -local adbinput = uci.get("adblock", "global", "adb_rtfile") or "/tmp/adb_runtime.json" +local adbinput = uci:get("adblock", "global", "adb_rtfile") or "/tmp/adb_runtime.json" if not uci:get("adblock", "extra") then m = SimpleForm("", nil, translate("Please update your adblock config file to use this package.<br />") @@ -251,7 +251,7 @@ e9.rmempty = true e10 = 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' package installation and setup.")) + .. translate("Please note: this needs additional 'msmtp' package installation and setup.")) e10.default = e10.disabled e10.rmempty = true 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 a3659eb469..df8b34f8e7 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 @@ -4,7 +4,7 @@ local fs = require("nixio.fs") local util = require("luci.util") local uci = require("uci") -local adbinput = uci.get("adblock", "global", "adb_whitelist") or "/etc/adblock/adblock.whitelist" +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.")) diff --git a/applications/luci-app-adblock/po/it/adblock.po b/applications/luci-app-adblock/po/it/adblock.po index 21b717f36e..88adcc8922 100644 --- a/applications/luci-app-adblock/po/it/adblock.po +++ b/applications/luci-app-adblock/po/it/adblock.po @@ -236,7 +236,7 @@ msgstr "" "Per favore modifica questo file direttamente in una sessione al terminale." msgid "" -"Please note: this needs additional 'mstmp' package installation and setup." +"Please note: this needs additional 'msmtp' package installation and setup." msgstr "" msgid "Please update your adblock config file to use this package.<br />" @@ -275,7 +275,7 @@ msgid "" msgstr "" msgid "" -"Size of the download queue to handle downloads & list processing in parallel " +"Size of the download queue to handle downloads & list processing in parallel " "(default '4').<br />" msgstr "" diff --git a/applications/luci-app-adblock/po/ja/adblock.po b/applications/luci-app-adblock/po/ja/adblock.po index 5929a2bf87..60c5a9a547 100644 --- a/applications/luci-app-adblock/po/ja/adblock.po +++ b/applications/luci-app-adblock/po/ja/adblock.po @@ -256,9 +256,9 @@ msgid "Please edit this file directly in a terminal session." msgstr "ターミナル セッションで直接このファイルを編集してください。" msgid "" -"Please note: this needs additional 'mstmp' package installation and setup." +"Please note: this needs additional 'msmtp' package installation and setup." msgstr "" -"注意: これには、追加で 'mstmp' のインストールとセットアップが必要です。" +"注意: これには、追加で 'msmtp' のインストールとセットアップが必要です。" msgid "Please update your adblock config file to use this package.<br />" msgstr "" @@ -301,7 +301,7 @@ msgstr "" "処理エラーまたはドメイン カウントが0以下の場合、メールを送信します。<br />" msgid "" -"Size of the download queue to handle downloads & list processing in parallel " +"Size of the download queue to handle downloads & list processing in parallel " "(default '4').<br />" msgstr "" "ダウンロードの制御とリストの処理を同時並行的に行うダウンロード キューのサイズ" diff --git a/applications/luci-app-adblock/po/pt-br/adblock.po b/applications/luci-app-adblock/po/pt-br/adblock.po index aae656271e..7eb6e3ebc8 100644 --- a/applications/luci-app-adblock/po/pt-br/adblock.po +++ b/applications/luci-app-adblock/po/pt-br/adblock.po @@ -229,7 +229,7 @@ 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' package installation and setup." +"Please note: this needs additional 'msmtp' package installation and setup." msgstr "" msgid "Please update your adblock config file to use this package.<br />" @@ -267,7 +267,7 @@ msgid "" msgstr "" msgid "" -"Size of the download queue to handle downloads & list processing in parallel " +"Size of the download queue to handle downloads & list processing in parallel " "(default '4').<br />" msgstr "" diff --git a/applications/luci-app-adblock/po/ru/adblock.po b/applications/luci-app-adblock/po/ru/adblock.po index 50eb945266..6e80e80b3a 100644 --- a/applications/luci-app-adblock/po/ru/adblock.po +++ b/applications/luci-app-adblock/po/ru/adblock.po @@ -260,8 +260,8 @@ msgid "Please edit this file directly in a terminal session." msgstr "Отредактируйте данный файл, строго в терминале." msgid "" -"Please note: this needs additional 'mstmp' package installation and setup." -msgstr "Внимание: это потребует дополнительной установки пакета 'mstmp'." +"Please note: this needs additional 'msmtp' package installation and setup." +msgstr "Внимание: это потребует дополнительной установки пакета 'msmtp'." msgid "Please update your adblock config file to use this package.<br />" msgstr "Обновите config файл Adblock, чтобы использовать этот пакет.<br />" @@ -303,7 +303,7 @@ msgstr "" "≤ 0.<br />" msgid "" -"Size of the download queue to handle downloads & list processing in parallel " +"Size of the download queue to handle downloads & list processing in parallel " "(default '4').<br />" msgstr "" "Значение очереди загрузки для выполнения параллельных загрузок (по умолчанию " diff --git a/applications/luci-app-adblock/po/sv/adblock.po b/applications/luci-app-adblock/po/sv/adblock.po index 4b23e3fdbd..d875a69f96 100644 --- a/applications/luci-app-adblock/po/sv/adblock.po +++ b/applications/luci-app-adblock/po/sv/adblock.po @@ -218,7 +218,7 @@ 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' package installation and setup." +"Please note: this needs additional 'msmtp' package installation and setup." msgstr "" msgid "Please update your adblock config file to use this package.<br />" @@ -256,7 +256,7 @@ msgid "" msgstr "" msgid "" -"Size of the download queue to handle downloads & list processing in parallel " +"Size of the download queue to handle downloads & list processing in parallel " "(default '4').<br />" msgstr "" diff --git a/applications/luci-app-adblock/po/templates/adblock.pot b/applications/luci-app-adblock/po/templates/adblock.pot index 4a65e2d477..5a93f8f070 100644 --- a/applications/luci-app-adblock/po/templates/adblock.pot +++ b/applications/luci-app-adblock/po/templates/adblock.pot @@ -210,7 +210,7 @@ msgid "Please edit this file directly in a terminal session." msgstr "" msgid "" -"Please note: this needs additional 'mstmp' package installation and setup." +"Please note: this needs additional 'msmtp' package installation and setup." msgstr "" msgid "Please update your adblock config file to use this package.<br />" @@ -248,7 +248,7 @@ msgid "" msgstr "" msgid "" -"Size of the download queue to handle downloads & list processing in parallel " +"Size of the download queue to handle downloads & list processing in parallel " "(default '4').<br />" msgstr "" diff --git a/applications/luci-app-adblock/po/zh-cn/adblock.po b/applications/luci-app-adblock/po/zh-cn/adblock.po index 3dc4fafd32..1d7dc2b193 100644 --- a/applications/luci-app-adblock/po/zh-cn/adblock.po +++ b/applications/luci-app-adblock/po/zh-cn/adblock.po @@ -228,7 +228,7 @@ msgid "Please edit this file directly in a terminal session." msgstr "请在终端会话中直接编辑此文件。" msgid "" -"Please note: this needs additional 'mstmp' package installation and setup." +"Please note: this needs additional 'msmtp' package installation and setup." msgstr "" msgid "Please update your adblock config file to use this package.<br />" @@ -266,7 +266,7 @@ msgid "" msgstr "" msgid "" -"Size of the download queue to handle downloads & list processing in parallel " +"Size of the download queue to handle downloads & list processing in parallel " "(default '4').<br />" msgstr "" diff --git a/applications/luci-app-adblock/po/zh-tw/adblock.po b/applications/luci-app-adblock/po/zh-tw/adblock.po index d668ebdb15..da00842d53 100644 --- a/applications/luci-app-adblock/po/zh-tw/adblock.po +++ b/applications/luci-app-adblock/po/zh-tw/adblock.po @@ -228,7 +228,7 @@ msgid "Please edit this file directly in a terminal session." msgstr "請在終端會話中直接編輯此檔案。" msgid "" -"Please note: this needs additional 'mstmp' package installation and setup." +"Please note: this needs additional 'msmtp' package installation and setup." msgstr "" msgid "Please update your adblock config file to use this package.<br />" @@ -266,7 +266,7 @@ msgid "" msgstr "" msgid "" -"Size of the download queue to handle downloads & list processing in parallel " +"Size of the download queue to handle downloads & list processing in parallel " "(default '4').<br />" msgstr "" |