summaryrefslogtreecommitdiffhomepage
path: root/applications/luci-app-simple-adblock
diff options
context:
space:
mode:
Diffstat (limited to 'applications/luci-app-simple-adblock')
-rw-r--r--applications/luci-app-simple-adblock/Makefile5
-rw-r--r--applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua20
-rw-r--r--applications/luci-app-simple-adblock/po/ja/simple-adblock.po11
-rw-r--r--applications/luci-app-simple-adblock/po/pt-br/simple-adblock.po9
-rw-r--r--applications/luci-app-simple-adblock/po/pt/simple-adblock.po9
-rw-r--r--applications/luci-app-simple-adblock/po/ru/simple-adblock.po42
-rw-r--r--applications/luci-app-simple-adblock/po/sv/simple-adblock.po9
-rw-r--r--applications/luci-app-simple-adblock/po/templates/simple-adblock.pot6
8 files changed, 57 insertions, 54 deletions
diff --git a/applications/luci-app-simple-adblock/Makefile b/applications/luci-app-simple-adblock/Makefile
index d7be6850ba..31055f1207 100644
--- a/applications/luci-app-simple-adblock/Makefile
+++ b/applications/luci-app-simple-adblock/Makefile
@@ -7,9 +7,10 @@ PKG_LICENSE:=GPL-3.0+
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net>
LUCI_TITLE:=Simple Adblock Web UI
-LUCI_DEPENDS:=+simple-adblock
+LUCI_DESCRIPTION:=Provides Web UI for simple-adblock service.
+LUCI_DEPENDS:=+luci +simple-adblock
LUCI_PKGARCH:=all
-PKG_RELEASE:=2
+PKG_RELEASE:=5
include ../../luci.mk
diff --git a/applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua b/applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua
index 214f298292..22672124fc 100644
--- a/applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua
+++ b/applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua
@@ -2,19 +2,11 @@ m = Map("simple-adblock", translate("Simple AdBlock Settings"))
s = m:section(NamedSection, "config", "simple-adblock")
-- General options
-e = s:option(Flag, "enabled", translate("Enable/start service"))
+e = s:option(Flag, "enabled", translate("Start Simple Adblock service"))
e.rmempty = false
-
-function e.cfgvalue(self, section)
- return self.map:get(section, "enabled") == "1" and luci.sys.init.enabled("simple-adblock") and self.enabled or self.disabled
-end
-
function e.write(self, section, value)
- if value == "1" then
- luci.sys.call("/etc/init.d/simple-adblock enable >/dev/null")
- luci.sys.call("/etc/init.d/simple-adblock start >/dev/null")
- else
- luci.sys.call("/etc/init.d/simple-adblock stop >/dev/null")
+ if value ~= "1" then
+ luci.sys.init.stop("simple-adblock")
end
return Flag.write(self, section, value)
end
@@ -32,15 +24,14 @@ o3:value("1", translate("Force Router DNS server to all local devices"))
o3.rmempty = false
o3.default = 1
-
local sysfs_path = "/sys/class/leds/"
local leds = {}
if nixio.fs.access(sysfs_path) then
leds = nixio.util.consume((nixio.fs.dir(sysfs_path)))
end
if #leds ~= 0 then
- o3 = s:option(Value, "led", translate("LED to indicate status"), translate("Pick the LED not already used in ")
- .. [[<a href="]] .. luci.dispatcher.build_url("admin/system/leds") .. [[">]]
+ o3 = s:option(Value, "led", translate("LED to indicate status"), translate("Pick the LED not already used in")
+ .. [[ <a href="]] .. luci.dispatcher.build_url("admin/system/leds") .. [[">]]
.. translate("System LED Configuration") .. [[</a>]])
o3.rmempty = true
o3:value("", translate("none"))
@@ -49,7 +40,6 @@ if #leds ~= 0 then
end
end
-
s2 = m:section(NamedSection, "config", "simple-adblock")
-- Whitelisted Domains
d1 = s2:option(DynamicList, "whitelist_domain", translate("Whitelisted Domains"), translate("Individual domains to be whitelisted"))
diff --git a/applications/luci-app-simple-adblock/po/ja/simple-adblock.po b/applications/luci-app-simple-adblock/po/ja/simple-adblock.po
index 7926595b6e..6c98eb6cea 100644
--- a/applications/luci-app-simple-adblock/po/ja/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/ja/simple-adblock.po
@@ -24,9 +24,6 @@ msgstr "hosts ブラックリストのURL"
msgid "Controls system log and console output verbosity"
msgstr "システム ログとコンソール出力の冗長性を設定します。"
-msgid "Enable/start service"
-msgstr "サービスの有効化/開始"
-
msgid "Force Router DNS"
msgstr "ルーターDNSの強制"
@@ -54,7 +51,7 @@ msgid "Output Verbosity Setting"
msgstr "出力詳細度の設定"
msgid "Pick the LED not already used in"
-msgstr "右の設定で既に使用されていないLEDを選択します:"
+msgstr "右の設定で既に使用されていないLEDを選択します"
msgid "Simple AdBlock"
msgstr "Simple AdBlock"
@@ -65,6 +62,9 @@ msgstr "Simple AdBlock 設定"
msgid "Some output"
msgstr "軽量出力"
+msgid "Start Simple Adblock service"
+msgstr ""
+
msgid "Suppress output"
msgstr "出力の抑制"
@@ -91,3 +91,6 @@ msgstr "ホワイトリスト ドメイン"
msgid "none"
msgstr "なし"
+
+#~ msgid "Enable/start service"
+#~ msgstr "サービスの有効化/開始"
diff --git a/applications/luci-app-simple-adblock/po/pt-br/simple-adblock.po b/applications/luci-app-simple-adblock/po/pt-br/simple-adblock.po
index 6dbbf8b844..d298e94902 100644
--- a/applications/luci-app-simple-adblock/po/pt-br/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/pt-br/simple-adblock.po
@@ -15,9 +15,6 @@ msgstr ""
"Controla o sistema de registro e o detalhamento das mensagens de saída do "
"console"
-msgid "Enable/start service"
-msgstr "Habilitar/Iniciar o serviço"
-
msgid "Force Router DNS"
msgstr "Forçar o DNS do Roteador"
@@ -58,6 +55,9 @@ msgstr "Configuração do Simple AdBlock"
msgid "Some output"
msgstr "Pouco detalhado"
+msgid "Start Simple Adblock service"
+msgstr ""
+
msgid "Suppress output"
msgstr "Suprimir"
@@ -84,3 +84,6 @@ msgstr "Domínios para a Lista Branca"
msgid "none"
msgstr "Nenhum"
+
+#~ msgid "Enable/start service"
+#~ msgstr "Habilitar/Iniciar o serviço"
diff --git a/applications/luci-app-simple-adblock/po/pt/simple-adblock.po b/applications/luci-app-simple-adblock/po/pt/simple-adblock.po
index 6dbbf8b844..d298e94902 100644
--- a/applications/luci-app-simple-adblock/po/pt/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/pt/simple-adblock.po
@@ -15,9 +15,6 @@ msgstr ""
"Controla o sistema de registro e o detalhamento das mensagens de saída do "
"console"
-msgid "Enable/start service"
-msgstr "Habilitar/Iniciar o serviço"
-
msgid "Force Router DNS"
msgstr "Forçar o DNS do Roteador"
@@ -58,6 +55,9 @@ msgstr "Configuração do Simple AdBlock"
msgid "Some output"
msgstr "Pouco detalhado"
+msgid "Start Simple Adblock service"
+msgstr ""
+
msgid "Suppress output"
msgstr "Suprimir"
@@ -84,3 +84,6 @@ msgstr "Domínios para a Lista Branca"
msgid "none"
msgstr "Nenhum"
+
+#~ msgid "Enable/start service"
+#~ msgstr "Habilitar/Iniciar o serviço"
diff --git a/applications/luci-app-simple-adblock/po/ru/simple-adblock.po b/applications/luci-app-simple-adblock/po/ru/simple-adblock.po
index ba1b02a271..01e07ddd24 100644
--- a/applications/luci-app-simple-adblock/po/ru/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/ru/simple-adblock.po
@@ -3,32 +3,29 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: LuCI: simple-adblock\n"
"POT-Creation-Date: 2017-12-07 14:00+0300\n"
-"PO-Revision-Date: 2018-01-14 18:55+0300\n"
+"PO-Revision-Date: 2018-01-22 13:18+0300\n"
"Language-Team: http://cyber-place.ru\n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.7.1\n"
"Last-Translator: Vladimir aka sunny <picfun@ya.ru>\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : "
+"2);\n"
"Language: ru\n"
-"Project-Info: Это технический перевод, не дословный. Главное-удобный русский "
-"интерфейс, все проверялось в графическом режиме, совместим с другими apps\n"
+"Project-Info: Это технический перевод, не дословный. Главное-удобный русский интерфейс, все проверялось в "
+"графическом режиме, совместим с другими apps\n"
msgid "Blacklisted Domain URLs"
-msgstr "Черный список доменных<br />URL адресов"
+msgstr "URL ссылки Черных<br />списков доменов"
msgid "Blacklisted Domains"
msgstr "Черный список доменов"
msgid "Blacklisted Hosts URLs"
-msgstr "Черный список хостов<br />URL адресов"
+msgstr "URL ссылки Черных<br />списков хостов"
msgid "Controls system log and console output verbosity"
-msgstr "Проверка системного журнала и уровень детализации вывода консоли."
-
-msgid "Enable/start service"
-msgstr "Включение / Запуск утилиты"
+msgstr "Детальная настройка записи событий в системный журнал."
msgid "Force Router DNS"
msgstr "Назначить DNS роутера"
@@ -55,10 +52,10 @@ msgstr ""
"прописаны в настройках сети устройства"
msgid "Output Verbosity Setting"
-msgstr "Настройка детализации вывода"
+msgstr "Настройка журнала"
msgid "Pick the LED not already used in"
-msgstr "Выберите LED не используется на странице "
+msgstr "Выберите LED не используется на странице"
msgid "Simple AdBlock"
msgstr "Simple AdBlock"
@@ -67,31 +64,34 @@ msgid "Simple AdBlock Settings"
msgstr "Simple AdBlock настройки"
msgid "Some output"
-msgstr "Неполный вывод"
+msgstr "Частичная запись"
+
+msgid "Start Simple Adblock service"
+msgstr "Запуск сервиса Simple Adblock"
msgid "Suppress output"
-msgstr "Подавить вывод"
+msgstr "Запретить запись"
msgid "System LED Configuration"
msgstr "'Настройка LED индикации' системы."
msgid "URLs to lists of domains to be blacklisted"
-msgstr "URL адреса доменов для Черного списка."
+msgstr "URL ссылки Черных списков доменов."
msgid "URLs to lists of domains to be whitelisted"
-msgstr "URL адреса доменов для Белого списка."
+msgstr "URL ссылки Белых списков доменов."
msgid "URLs to lists of hosts to be blacklisted"
-msgstr "URL адреса хостов для Черного списка."
+msgstr "URL ссылки Черных списков хостов."
msgid "Verbose output"
-msgstr "Подробный вывод"
+msgstr "Подробная запись"
msgid "Whitelisted Domain URLs"
-msgstr "URLs доменов Белого списка"
+msgstr "URL ссылки Белых списков доменов"
msgid "Whitelisted Domains"
msgstr "Белый список доменов"
msgid "none"
-msgstr "Нет"
+msgstr "ничего"
diff --git a/applications/luci-app-simple-adblock/po/sv/simple-adblock.po b/applications/luci-app-simple-adblock/po/sv/simple-adblock.po
index e95f95f02b..33408e1839 100644
--- a/applications/luci-app-simple-adblock/po/sv/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/sv/simple-adblock.po
@@ -13,9 +13,6 @@ msgstr "Svartlistade värdadresser"
msgid "Controls system log and console output verbosity"
msgstr "Kontrollerar systemloggar och detaljnivån för konsoll-utmatningen"
-msgid "Enable/start service"
-msgstr "Aktivera/starta tjänsten"
-
msgid "Force Router DNS"
msgstr ""
@@ -52,6 +49,9 @@ msgstr "Inställningar för Simple AdBlock"
msgid "Some output"
msgstr "Viss utmatning"
+msgid "Start Simple Adblock service"
+msgstr ""
+
msgid "Suppress output"
msgstr "Förträng utmatning"
@@ -78,3 +78,6 @@ msgstr "Vitlistade domäner"
msgid "none"
msgstr "ingen"
+
+#~ msgid "Enable/start service"
+#~ msgstr "Aktivera/starta tjänsten"
diff --git a/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot b/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot
index 4cfff964a3..1a71cae624 100644
--- a/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot
+++ b/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot
@@ -13,9 +13,6 @@ msgstr ""
msgid "Controls system log and console output verbosity"
msgstr ""
-msgid "Enable/start service"
-msgstr ""
-
msgid "Force Router DNS"
msgstr ""
@@ -52,6 +49,9 @@ msgstr ""
msgid "Some output"
msgstr ""
+msgid "Start Simple Adblock service"
+msgstr ""
+
msgid "Suppress output"
msgstr ""
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-19 07:48:10 +0000