Merge pull request #3945 from stangri/18.06-luci-app-simple-adblock

[18.06] luci-app-simple-adblock: bugfix: get package version from opkg
This commit is contained in:
Hannu Nyman 2020-04-21 19:48:36 +03:00 committed by GitHub
commit 7cc22e1a65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 107 additions and 111 deletions

View file

@ -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:=44 PKG_RELEASE:=45
include ../../luci.mk include ../../luci.mk

View file

@ -49,8 +49,9 @@ elseif targetDNS == "unbound.adb_list" then
outputGzip="/etc/" .. packageName .. ".unbound.gz" outputGzip="/etc/" .. packageName .. ".unbound.gz"
end end
local packageVersion = packageName .. " " .. tostring(util.trim(sys.exec("opkg list-installed " .. packageName .. " | awk '{print $3}'")))
local tmpfs, tmpfsMessage, tmpfsError, tmpfsStats local tmpfs, tmpfsMessage, tmpfsError, tmpfsStats
local tmpfsVersion, tmpfsStatus = "", "Stopped" local tmpfsStatus = "statusStopped"
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
@ -68,11 +69,6 @@ if tmpfs and tmpfs['data'] then
if tmpfs['data']['stats'] and tmpfs['data']['stats'] ~= "" then if tmpfs['data']['stats'] and tmpfs['data']['stats'] ~= "" then
tmpfsStats = tmpfs['data']['stats'] tmpfsStats = tmpfs['data']['stats']
end end
if tmpfs['data']['version'] and tmpfs['data']['version'] ~= "" then
tmpfsVersion = packageName .. " " .. tmpfs['data']['version']
else
tmpfsVersion = packageName
end
end end
local statusTable = {} local statusTable = {}
@ -111,7 +107,7 @@ 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", translatef("Service Status [%s]", tmpfsVersion)) h = m:section(NamedSection, "config", "simple-adblock", translatef("Service Status [%s]", packageVersion))
if tmpfsStatus == "statusStarting" or if tmpfsStatus == "statusStarting" or
tmpfsStatus == "statusRestarting" or tmpfsStatus == "statusRestarting" or
@ -143,7 +139,7 @@ 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 = translatef("%s is blocking %s domains (with %s).", tmpfsVersion, util.trim(sys.exec("wc -l < " .. outputFile)), targetDNS) ss.value = translatef("%s is blocking %s domains (with %s).", packageVersion, util.trim(sys.exec("wc -l < " .. outputFile)), targetDNS)
else else
ss.value = statusTable[tmpfsStatus] ss.value = statusTable[tmpfsStatus]
end end
@ -167,7 +163,7 @@ else
end end
end end
end end
if tmpfsVersion ~= "" then if packageVersion ~= "" then
buttons = h:option(DummyValue, "_dummy") buttons = h:option(DummyValue, "_dummy")
buttons.template = packageName .. "/buttons" buttons.template = packageName .. "/buttons"
end end

View file

@ -1,100 +1,100 @@
msgid "" msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8" msgstr "Content-Type: text/plain; charset=UTF-8"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:165 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:161
msgid "%s Error: %s" msgid "%s Error: %s"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:163 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
msgid "%s Error: %s %s" msgid "%s Error: %s %s"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:146 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:142
msgid "%s is blocking %s domains (with %s)." msgid "%s is blocking %s domains (with %s)."
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:80 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:76
msgid "%s is not installed or not found" msgid "%s is not installed or not found"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:238 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:234
msgid "Add IPv6 entries" msgid "Add IPv6 entries"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:232
msgid "Add IPv6 entries to block-list." msgid "Add IPv6 entries to block-list."
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:206 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:202
msgid "Advanced Configuration" msgid "Advanced Configuration"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:260 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:256
msgid "" msgid ""
"Attempt to create a compressed cache of block-list in the persistent memory." "Attempt to create a compressed cache of block-list in the persistent memory."
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:178 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:174
msgid "Basic Configuration" msgid "Basic Configuration"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:288 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:284
msgid "Blacklisted Domain URLs" msgid "Blacklisted Domain URLs"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:278 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:274
msgid "Blacklisted Domains" msgid "Blacklisted Domains"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:293 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:289
msgid "Blacklisted Hosts URLs" msgid "Blacklisted Hosts URLs"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:136 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:132
msgid "Cache file containing %s domains found." msgid "Cache file containing %s domains found."
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:152
msgid "Collected Errors" msgid "Collected Errors"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:140 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:136
msgid "Compressed cache file found." msgid "Compressed cache file found."
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:176 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
msgid "Configuration" msgid "Configuration"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:180 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:176
msgid "Controls system log and console output verbosity." msgid "Controls system log and console output verbosity."
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:247
msgid "Curl download retry" msgid "Curl download retry"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:222 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:218
msgid "DNS Service" msgid "DNS Service"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:224 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:220
msgid "DNSMASQ Additional Hosts" msgid "DNSMASQ Additional Hosts"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:225 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:221
msgid "DNSMASQ Config" msgid "DNSMASQ Config"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:227 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:223
msgid "DNSMASQ IP Set" msgid "DNSMASQ IP Set"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:229 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:225
msgid "DNSMASQ Servers File" msgid "DNSMASQ Servers File"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:243 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:239
msgid "Delay (in seconds) for on-boot start" msgid "Delay (in seconds) for on-boot start"
msgstr "" msgstr ""
@ -102,27 +102,27 @@ msgstr ""
msgid "Disable" msgid "Disable"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:266 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:262
msgid "Disable Debugging" msgid "Disable Debugging"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:237 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:233
msgid "Do not add IPv6 entries" msgid "Do not add IPv6 entries"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:261 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:257
msgid "Do not store compressed cache" msgid "Do not store compressed cache"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:256 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:252
msgid "Do not use simultaneous processing" msgid "Do not use simultaneous processing"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:247 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:243
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:85 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:81
msgid "Downloading" msgid "Downloading"
msgstr "" msgstr ""
@ -130,20 +130,20 @@ msgstr ""
msgid "Enable" msgid "Enable"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:265 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:261
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:267 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:263
msgid "Enable Debugging" msgid "Enable Debugging"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:265 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:261
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:86 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:82
msgid "Error" msgid "Error"
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:84
msgid "Fail" msgid "Fail"
msgstr "" msgstr ""
@ -151,56 +151,56 @@ msgstr ""
msgid "Force Re-Download" msgid "Force Re-Download"
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:80
msgid "Force Reloading" msgid "Force Reloading"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182
msgid "Force Router DNS" msgid "Force Router DNS"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:188 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:184
msgid "Force Router DNS server to all local devices" msgid "Force Router DNS server to all local devices"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182
msgid "Forces Router DNS use on local devices, also known as DNS Hijacking." msgid "Forces Router DNS use on local devices, also known as DNS Hijacking."
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:232
msgid "IPv6 Support" msgid "IPv6 Support"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:247
msgid "" msgid ""
"If curl is installed and detected, it would retry download this many times " "If curl is installed and detected, it would retry download this many times "
"on timeout/fail." "on timeout/fail."
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:278 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:274
msgid "Individual domains to be blacklisted." msgid "Individual domains to be blacklisted."
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:273 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:269
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:130
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:134 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:134
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:138
msgid "Info" msgid "Info"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:197 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:193
msgid "LED to indicate status" msgid "LED to indicate status"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:255 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
msgid "" msgid ""
"Launch all lists downloads and processing simultaneously, reducing service " "Launch all lists downloads and processing simultaneously, reducing service "
"start time." "start time."
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:187 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:183
msgid "Let local devices use their own DNS servers if set" msgid "Let local devices use their own DNS servers if set"
msgstr "" msgstr ""
@ -208,49 +208,49 @@ msgstr ""
msgid "Loading" msgid "Loading"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:147
msgid "Message" msgid "Message"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:180 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:176
msgid "Output Verbosity Setting" msgid "Output Verbosity Setting"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:208 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:204
msgid "" msgid ""
"Pick the DNS resolution option to create the adblock list for, see the <a " "Pick the DNS resolution option to create the adblock list for, see the <a "
"href=\"%s#dns-resolution-option\" target=\"_blank\">README</a> for details." "href=\"%s#dns-resolution-option\" target=\"_blank\">README</a> for details."
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:198 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:194
msgid "" msgid ""
"Pick the LED not already used in <a href=\"%s\">System LED Configuration</a>." "Pick the LED not already used in <a href=\"%s\">System LED Configuration</a>."
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:211 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:207
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:208
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:209
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:210
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:212 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:212
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:213 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:215
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:214
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:216
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:219
msgid "Please note that %s is not supported on this system." msgid "Please note that %s is not supported on this system."
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:79
msgid "Restarting" msgid "Restarting"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:243 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:239
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:120 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:116
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:130 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:126
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:143 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:139
msgid "Service Status" msgid "Service Status"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:114 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:110
msgid "Service Status [%s]" msgid "Service Status [%s]"
msgstr "" msgstr ""
@ -258,15 +258,15 @@ msgstr ""
msgid "Simple AdBlock" msgid "Simple AdBlock"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:108 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:104
msgid "Simple AdBlock Settings" msgid "Simple AdBlock Settings"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:255 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
msgid "Simultaneous processing" msgid "Simultaneous processing"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:178
msgid "Some output" msgid "Some output"
msgstr "" msgstr ""
@ -274,7 +274,7 @@ msgstr ""
msgid "Start" msgid "Start"
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:78
msgid "Starting" msgid "Starting"
msgstr "" msgstr ""
@ -282,142 +282,142 @@ msgstr ""
msgid "Stop" msgid "Stop"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:247 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:243
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:81 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:77
msgid "Stopped" msgid "Stopped"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:262 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:258
msgid "Store compressed cache" msgid "Store compressed cache"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:260 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:256
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:89 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:85
msgid "Success" msgid "Success"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:181 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:177
msgid "Suppress output" msgid "Suppress output"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:124 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
msgid "Task" msgid "Task"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:288 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:284
msgid "URLs to lists of domains to be blacklisted." msgid "URLs to lists of domains to be blacklisted."
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:283 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:279
msgid "URLs to lists of domains to be whitelisted." msgid "URLs to lists of domains to be whitelisted."
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:293 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:289
msgid "URLs to lists of hosts to be blacklisted." msgid "URLs to lists of hosts to be blacklisted."
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:232 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:228
msgid "Unbound AdBlock List" msgid "Unbound AdBlock List"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:257 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:253
msgid "Use simultaneous processing" msgid "Use simultaneous processing"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:183 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:179
msgid "Verbose output" msgid "Verbose output"
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:83
msgid "Warning" msgid "Warning"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:271 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:267
msgid "Whitelist and Blocklist Management" msgid "Whitelist and Blocklist Management"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:283 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:279
msgid "Whitelisted Domain URLs" msgid "Whitelisted Domain URLs"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:273 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:269
msgid "Whitelisted Domains" msgid "Whitelisted Domains"
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:88
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:90 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:86
msgid "failed to create '%s' file" msgid "failed to create '%s' 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:98
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:98 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:94
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:105 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:101
msgid "failed to download" msgid "failed to download"
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:92
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:101 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:97
msgid "failed to move '%s' to '%s'" msgid "failed to move '%s' to '%s'"
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:93
msgid "failed to move temporary data file to '%s'" msgid "failed to move temporary data file to '%s'"
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:90
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:106 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:102
msgid "failed to parse" msgid "failed to parse"
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:91
msgid "failed to process whitelist" msgid "failed to process whitelist"
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:100
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:99 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:95
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:91 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:87
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:93 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:89
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:103 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:99
msgid "failed to stop %s" msgid "failed to stop %s"
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:96
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:200 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
msgid "none" msgid "none"
msgstr "" msgstr ""