Merge pull request #3822 from stangri/18.06-luci-app-simple-adblock
[18..06] luci-app-simple-adblock: better service control & buttons styling
This commit is contained in:
commit
e0a6127cea
4 changed files with 129 additions and 110 deletions
|
@ -10,7 +10,7 @@ LUCI_TITLE:=Simple Adblock Web UI
|
||||||
LUCI_DESCRIPTION:=Provides Web UI for simple-adblock service.
|
LUCI_DESCRIPTION:=Provides Web UI for simple-adblock service.
|
||||||
LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full +simple-adblock
|
LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full +simple-adblock
|
||||||
LUCI_PKGARCH:=all
|
LUCI_PKGARCH:=all
|
||||||
PKG_RELEASE:=42
|
PKG_RELEASE:=43
|
||||||
|
|
||||||
include ../../luci.mk
|
include ../../luci.mk
|
||||||
|
|
||||||
|
|
|
@ -49,13 +49,12 @@ elseif targetDNS == "unbound.adb_list" then
|
||||||
outputGzip="/etc/" .. packageName .. ".unbound.gz"
|
outputGzip="/etc/" .. packageName .. ".unbound.gz"
|
||||||
end
|
end
|
||||||
|
|
||||||
local tmpfs
|
local tmpfs, tmpfsMessage, tmpfsError, tmpfsStats
|
||||||
|
local tmpfsVersion, tmpfsStatus = "", "Stopped"
|
||||||
if fs.access("/var/run/" .. packageName .. ".json") then
|
if fs.access("/var/run/" .. packageName .. ".json") then
|
||||||
tmpfs = jsonc.parse(util.trim(sys.exec("cat /var/run/" .. packageName .. ".json")))
|
tmpfs = jsonc.parse(util.trim(sys.exec("cat /var/run/" .. packageName .. ".json")))
|
||||||
end
|
end
|
||||||
|
|
||||||
local tmpfsVersion, tmpfsStatus = "", "Stopped"
|
|
||||||
local tmpfsMessage, tmpfsError, tmpfsStats
|
|
||||||
if tmpfs and tmpfs['data'] then
|
if tmpfs and tmpfs['data'] then
|
||||||
if tmpfs['data']['status'] and tmpfs['data']['status'] ~= "" then
|
if tmpfs['data']['status'] and tmpfs['data']['status'] ~= "" then
|
||||||
tmpfsStatus = tmpfs['data']['status']
|
tmpfsStatus = tmpfs['data']['status']
|
||||||
|
@ -109,7 +108,7 @@ errorTable["errorParsingList"] = translate("failed to parse")
|
||||||
m = Map("simple-adblock", translate("Simple AdBlock Settings"))
|
m = Map("simple-adblock", translate("Simple AdBlock Settings"))
|
||||||
m.apply_on_parse = true
|
m.apply_on_parse = true
|
||||||
m.on_after_apply = function(self)
|
m.on_after_apply = function(self)
|
||||||
sys.call("/etc/init.d/simple-adblock restart")
|
sys.call("/etc/init.d/simple-adblock restart")
|
||||||
end
|
end
|
||||||
|
|
||||||
h = m:section(NamedSection, "config", "simple-adblock", translate("Service Status") .. " [" .. tmpfsVersion .. "]")
|
h = m:section(NamedSection, "config", "simple-adblock", translate("Service Status") .. " [" .. tmpfsVersion .. "]")
|
||||||
|
@ -144,7 +143,6 @@ else
|
||||||
ss = h:option(DummyValue, "_dummy", translate("Service Status"))
|
ss = h:option(DummyValue, "_dummy", translate("Service Status"))
|
||||||
ss.template = "simple-adblock/status"
|
ss.template = "simple-adblock/status"
|
||||||
if tmpfsStatus == "statusSuccess" then
|
if tmpfsStatus == "statusSuccess" then
|
||||||
-- ss.value = tmpfsStats
|
|
||||||
ss.value = tmpfsVersion .. " " .. translate("is blocking") ..
|
ss.value = tmpfsVersion .. " " .. translate("is blocking") ..
|
||||||
" " .. util.trim(sys.exec("wc -l < " .. outputFile)) ..
|
" " .. util.trim(sys.exec("wc -l < " .. outputFile)) ..
|
||||||
" " .. translate("domains") .. " (" .. translate("with") ..
|
" " .. translate("domains") .. " (" .. translate("with") ..
|
||||||
|
@ -172,8 +170,10 @@ else
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
buttons = h:option(DummyValue, "_dummy")
|
if tmpfsVersion ~= "" then
|
||||||
buttons.template = "simple-adblock/buttons"
|
buttons = h:option(DummyValue, "_dummy")
|
||||||
|
buttons.template = packageName .. "/buttons"
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
s = m:section(NamedSection, "config", "simple-adblock", translate("Configuration"))
|
s = m:section(NamedSection, "config", "simple-adblock", translate("Configuration"))
|
||||||
|
|
|
@ -1,69 +1,88 @@
|
||||||
<%#
|
<%# Copyright 2020 Stan Grishin <stangri@melmac.net> -%>
|
||||||
Copyright 2019 Stan Grishin <stangri@melmac.net>
|
|
||||||
-%>
|
|
||||||
|
|
||||||
<%-
|
|
||||||
local packageName = "simple-adblock"
|
|
||||||
local enabledFlag = luci.model.uci.cursor():get(packageName, "config", "enabled")
|
|
||||||
if nixio.fs.access("/var/run/" .. packageName .. ".json") then
|
|
||||||
tmpfs = luci.jsonc.parse(luci.util.trim(luci.sys.exec("cat /var/run/" .. packageName .. ".json")))
|
|
||||||
end
|
|
||||||
local tmpfsVersion, tmpfsStatus, tmpfsMessage, tmpfsError, tmpfsStats = "", "Stopped"
|
|
||||||
if tmpfs and tmpfs['data'] then
|
|
||||||
if tmpfs['data']['status'] and tmpfs['data']['status'] ~= "" then
|
|
||||||
tmpfsStatus = tmpfs['data']['status']
|
|
||||||
end
|
|
||||||
if tmpfs['data']['message'] and tmpfs['data']['message'] ~= "" then
|
|
||||||
tmpfsMessage = tmpfs['data']['message']
|
|
||||||
end
|
|
||||||
if tmpfs['data']['error'] and tmpfs['data']['error'] ~= "" then
|
|
||||||
tmpfsError = tmpfs['data']['error']
|
|
||||||
end
|
|
||||||
if tmpfs['data']['stats'] and tmpfs['data']['stats'] ~= "" then
|
|
||||||
tmpfsStats = tmpfs['data']['stats']
|
|
||||||
end
|
|
||||||
if tmpfs['data']['version'] and tmpfs['data']['version'] ~= "" then
|
|
||||||
tmpfsVersion = " (" .. packageName .. " " .. tmpfs['data']['version'] .. ")"
|
|
||||||
end
|
|
||||||
end
|
|
||||||
if tmpfsStatus == "Stopped" then
|
|
||||||
btn_start_style = "cbi-button cbi-button-apply important"
|
|
||||||
btn_action_style = "cbi-button cbi-button-apply important"
|
|
||||||
btn_stop_style = "cbi-button cbi-button-reset -disabled"
|
|
||||||
else
|
|
||||||
btn_start_style = "cbi-button cbi-button-apply -disabled"
|
|
||||||
btn_action_style = "cbi-button cbi-button-apply important"
|
|
||||||
btn_stop_style = "cbi-button cbi-button-reset important"
|
|
||||||
end
|
|
||||||
if enabledFlag ~= "1" then
|
|
||||||
btn_start_style = "cbi-button cbi-button-apply -disabled"
|
|
||||||
btn_action_style = "cbi-button cbi-button-apply -disabled"
|
|
||||||
btn_enable_style = "cbi-button cbi-button-apply important"
|
|
||||||
btn_disable_style = "cbi-button cbi-button-reset -disabled"
|
|
||||||
else
|
|
||||||
btn_enable_style = "cbi-button cbi-button-apply -disabled"
|
|
||||||
btn_disable_style = "cbi-button cbi-button-reset important"
|
|
||||||
end
|
|
||||||
-%>
|
|
||||||
|
|
||||||
<%+simple-adblock/css%>
|
<%+simple-adblock/css%>
|
||||||
<%+simple-adblock/js%>
|
<%+simple-adblock/js%>
|
||||||
|
|
||||||
|
<%-
|
||||||
|
local packageName = "simple-adblock"
|
||||||
|
local serviceRunning, serviceEnabled = false, false;
|
||||||
|
local tmpfs, tmpfsStatus;
|
||||||
|
if nixio.fs.access("/var/run/" .. packageName .. ".json") then
|
||||||
|
tmpfs = luci.jsonc.parse(luci.util.trim(luci.sys.exec("cat /var/run/" .. packageName .. ".json")))
|
||||||
|
if tmpfs and tmpfs['data'] and tmpfs['data']['status'] then
|
||||||
|
tmpfsStatus = tmpfs['data']['status']
|
||||||
|
end
|
||||||
|
end
|
||||||
|
if tmpfsStatus == "statusStarting" or tmpfsStatus == "statusRestarting" or
|
||||||
|
tmpfsStatus == "statusForceReloading" or tmpfsStatus == "statusDownloading" or
|
||||||
|
tmpfsStatus == "statusError" or tmpfsStatus == "statusWarning"
|
||||||
|
or tmpfsStatus == "statusSuccess" then
|
||||||
|
serviceRunning = true
|
||||||
|
end
|
||||||
|
|
||||||
|
if luci.model.uci.cursor():get(packageName, "config", "enabled") == "1" then
|
||||||
|
serviceEnabled = true
|
||||||
|
end
|
||||||
|
|
||||||
|
if serviceEnabled then
|
||||||
|
btn_start_status = true
|
||||||
|
btn_action_status = true
|
||||||
|
btn_stop_status = true
|
||||||
|
btn_enable_status = false
|
||||||
|
btn_disable_status = true
|
||||||
|
else
|
||||||
|
btn_start_status = false
|
||||||
|
btn_action_status = false
|
||||||
|
btn_stop_status = false
|
||||||
|
btn_enable_status = true
|
||||||
|
btn_disable_status = false
|
||||||
|
end
|
||||||
|
if serviceRunning then
|
||||||
|
btn_start_status = false
|
||||||
|
btn_action_status = true
|
||||||
|
btn_stop_status = true
|
||||||
|
else
|
||||||
|
btn_action_status = false
|
||||||
|
btn_stop_status = false
|
||||||
|
end
|
||||||
|
-%>
|
||||||
|
|
||||||
<div class="cbi-value"><label class="cbi-value-title">Service Control</label>
|
<div class="cbi-value"><label class="cbi-value-title">Service Control</label>
|
||||||
<div class="cbi-value-field">
|
<div class="cbi-value-field">
|
||||||
<input type="button" class="<%=btn_start_style%>" id="btn_start" name="start" value="<%:Start%>" onclick="button_action(this)" />
|
<input type="button" class="cbi-button cbi-button-apply" id="btn_start" name="start" value="<%:Start%>"
|
||||||
|
onclick="button_action(this)" />
|
||||||
<span id="btn_start_spinner" class="btn_spinner"></span>
|
<span id="btn_start_spinner" class="btn_spinner"></span>
|
||||||
<input type="button" class="<%=btn_action_style%>" id="btn_action" name="action" value="<%:Force Re-Download%>" onclick="button_action(this)" />
|
<input type="button" class="cbi-button cbi-button-apply" id="btn_action" name="action" value="<%:Force Re-Download%>"
|
||||||
|
onclick="button_action(this)" />
|
||||||
<span id="btn_action_spinner" class="btn_spinner"></span>
|
<span id="btn_action_spinner" class="btn_spinner"></span>
|
||||||
<input type="button" class="<%=btn_stop_style%>" id="btn_stop" name="stop" value="<%:Stop%>" onclick="button_action(this)" />
|
<input type="button" class="cbi-button cbi-button-reset" id="btn_stop" name="stop" value="<%:Stop%>"
|
||||||
|
onclick="button_action(this)" />
|
||||||
<span id="btn_stop_spinner" class="btn_spinner"></span>
|
<span id="btn_stop_spinner" class="btn_spinner"></span>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<input type="button" class="<%=btn_enable_style%>" id="btn_enable" name="enable" value="<%:Enable%>" onclick="button_action(this)" />
|
<input type="button" class="cbi-button cbi-button-apply" id="btn_enable" name="enable" value="<%:Enable%>"
|
||||||
|
onclick="button_action(this)" />
|
||||||
<span id="btn_enable_spinner" class="btn_spinner"></span>
|
<span id="btn_enable_spinner" class="btn_spinner"></span>
|
||||||
<input type="button" class="<%=btn_disable_style%>" id="btn_disable" name="disable" value="<%:Disable%>" onclick="button_action(this)" />
|
<input type="button" class="cbi-button cbi-button-reset" id="btn_disable" name="disable" value="<%:Disable%>"
|
||||||
|
onclick="button_action(this)" />
|
||||||
<span id="btn_disable_spinner" class="btn_spinner"></span>
|
<span id="btn_disable_spinner" class="btn_spinner"></span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<%-if not btn_start_status then%>
|
||||||
|
<script type="text/javascript">document.getElementById("btn_start").disabled = true;</script>
|
||||||
|
<%-end%>
|
||||||
|
<%-if not btn_action_status then%>
|
||||||
|
<script type="text/javascript">document.getElementById("btn_action").disabled = true;</script>
|
||||||
|
<%-end%>
|
||||||
|
<%-if not btn_stop_status then%>
|
||||||
|
<script type="text/javascript">document.getElementById("btn_stop").disabled = true;</script>
|
||||||
|
<%-end%>
|
||||||
|
<%-if not btn_enable_status then%>
|
||||||
|
<script type="text/javascript">document.getElementById("btn_enable").disabled = true;</script>
|
||||||
|
<%-end%>
|
||||||
|
<%-if not btn_disable_status then%>
|
||||||
|
<script type="text/javascript">document.getElementById("btn_disable").disabled = true;</script>
|
||||||
|
<%-end%>
|
|
@ -34,15 +34,15 @@ msgstr ""
|
||||||
msgid "Blacklisted Hosts URLs"
|
msgid "Blacklisted Hosts URLs"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:137
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:136
|
||||||
msgid "Cache file containing"
|
msgid "Cache file containing"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:161
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
|
||||||
msgid "Collected Errors"
|
msgid "Collected Errors"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:141
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:140
|
||||||
msgid "Compressed cache file found"
|
msgid "Compressed cache file found"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
@ -82,7 +82,7 @@ msgstr ""
|
||||||
msgid "Delay (in seconds) for on-boot start"
|
msgid "Delay (in seconds) for on-boot start"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/view/simple-adblock/buttons.htm:66
|
#: applications/luci-app-simple-adblock/luasrc/view/simple-adblock/buttons.htm:68
|
||||||
msgid "Disable"
|
msgid "Disable"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
@ -106,11 +106,11 @@ msgstr ""
|
||||||
msgid "Download time-out (in seconds)"
|
msgid "Download time-out (in seconds)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:86
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:85
|
||||||
msgid "Downloading"
|
msgid "Downloading"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/view/simple-adblock/buttons.htm:64
|
#: applications/luci-app-simple-adblock/luasrc/view/simple-adblock/buttons.htm:65
|
||||||
msgid "Enable"
|
msgid "Enable"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
@ -123,21 +123,21 @@ msgstr ""
|
||||||
msgid "Enables debug output to /tmp/simple-adblock.log."
|
msgid "Enables debug output to /tmp/simple-adblock.log."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:87
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:86
|
||||||
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:166
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:170
|
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:89
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:88
|
||||||
msgid "Fail"
|
msgid "Fail"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/view/simple-adblock/buttons.htm:56
|
#: applications/luci-app-simple-adblock/luasrc/view/simple-adblock/buttons.htm:55
|
||||||
msgid "Force Re-Download"
|
msgid "Force Re-Download"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:85
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:84
|
||||||
msgid "Force Reloading"
|
msgid "Force Reloading"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
@ -171,8 +171,8 @@ msgstr ""
|
||||||
msgid "Individual domains to be whitelisted."
|
msgid "Individual domains to be whitelisted."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:135
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:134
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:139
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:138
|
||||||
msgid "Info"
|
msgid "Info"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
@ -194,7 +194,7 @@ msgstr ""
|
||||||
msgid "Loading"
|
msgid "Loading"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:156
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:154
|
||||||
msgid "Message"
|
msgid "Message"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
@ -223,7 +223,7 @@ msgstr ""
|
||||||
msgid "README"
|
msgid "README"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:84
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:83
|
||||||
msgid "Restarting"
|
msgid "Restarting"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
@ -231,10 +231,10 @@ msgstr ""
|
||||||
msgid "Run service after set delay on boot."
|
msgid "Run service after set delay on boot."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:115
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:114
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:121
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:131
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:130
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:144
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:143
|
||||||
msgid "Service Status"
|
msgid "Service Status"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
@ -242,7 +242,7 @@ msgstr ""
|
||||||
msgid "Simple AdBlock"
|
msgid "Simple AdBlock"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:109
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:108
|
||||||
msgid "Simple AdBlock Settings"
|
msgid "Simple AdBlock Settings"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
@ -254,11 +254,11 @@ msgstr ""
|
||||||
msgid "Some output"
|
msgid "Some output"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/view/simple-adblock/buttons.htm:54
|
#: applications/luci-app-simple-adblock/luasrc/view/simple-adblock/buttons.htm:52
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:83
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:82
|
||||||
msgid "Starting"
|
msgid "Starting"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
@ -270,7 +270,7 @@ msgstr ""
|
||||||
msgid "Stop the download if it is stalled for set number of seconds."
|
msgid "Stop the download if it is stalled for set number of seconds."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:82
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:81
|
||||||
msgid "Stopped"
|
msgid "Stopped"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
@ -282,7 +282,7 @@ msgstr ""
|
||||||
msgid "Store compressed cache file on router"
|
msgid "Store compressed cache file on router"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:90
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:89
|
||||||
msgid "Success"
|
msgid "Success"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
@ -294,7 +294,7 @@ msgstr ""
|
||||||
msgid "System LED Configuration"
|
msgid "System LED Configuration"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:125
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:124
|
||||||
msgid "Task"
|
msgid "Task"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
@ -322,7 +322,7 @@ msgstr ""
|
||||||
msgid "Verbose output"
|
msgid "Verbose output"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:88
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:87
|
||||||
msgid "Warning"
|
msgid "Warning"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
@ -338,83 +338,83 @@ msgstr ""
|
||||||
msgid "Whitelisted Domains"
|
msgid "Whitelisted Domains"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:150
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:148
|
||||||
msgid "domains"
|
msgid "domains"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:137
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:136
|
||||||
msgid "domains found"
|
msgid "domains found"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:93
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:92
|
||||||
msgid "failed to access shared memory"
|
msgid "failed to access shared memory"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:91
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:90
|
||||||
msgid "failed to create"
|
msgid "failed to create"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:103
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:102
|
||||||
msgid "failed to create blocklist or restart DNS resolver"
|
msgid "failed to create blocklist or restart DNS resolver"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:99
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:98
|
||||||
msgid "failed to create compressed cache"
|
msgid "failed to create compressed cache"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:106
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:105
|
||||||
msgid "failed to download"
|
msgid "failed to download"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:97
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:96
|
||||||
msgid "failed to format data file"
|
msgid "failed to format data file"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:102
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:101
|
||||||
msgid "failed to move"
|
msgid "failed to move"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:98
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:97
|
||||||
msgid "failed to move temporary data file to"
|
msgid "failed to move temporary data file to"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:95
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:94
|
||||||
msgid "failed to optimize data file"
|
msgid "failed to optimize data file"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:107
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:106
|
||||||
msgid "failed to parse"
|
msgid "failed to parse"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:96
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:95
|
||||||
msgid "failed to process whitelist"
|
msgid "failed to process whitelist"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:105
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:104
|
||||||
msgid "failed to reload/restart DNS resolver"
|
msgid "failed to reload/restart DNS resolver"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:100
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:99
|
||||||
msgid "failed to remove temporary files"
|
msgid "failed to remove temporary files"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:92
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:91
|
||||||
msgid "failed to restart/reload DNS resolver"
|
msgid "failed to restart/reload DNS resolver"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:94
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:93
|
||||||
msgid "failed to sort data file"
|
msgid "failed to sort data file"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:104
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:103
|
||||||
msgid "failed to stop"
|
msgid "failed to stop"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:101
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:100
|
||||||
msgid "failed to unpack compressed cache"
|
msgid "failed to unpack compressed cache"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:91
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:90
|
||||||
msgid "file"
|
msgid "file"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
@ -422,11 +422,11 @@ msgstr ""
|
||||||
msgid "for details."
|
msgid "for details."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:148
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:146
|
||||||
msgid "is blocking"
|
msgid "is blocking"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:81
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:80
|
||||||
msgid "is not installed or not found"
|
msgid "is not installed or not found"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
@ -443,10 +443,10 @@ msgstr ""
|
||||||
msgid "none"
|
msgid "none"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:102
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:101
|
||||||
msgid "to"
|
msgid "to"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:150
|
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:148
|
||||||
msgid "with"
|
msgid "with"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
Loading…
Reference in a new issue