From: Stan Grishin Date: Sat, 11 Apr 2020 11:39:11 +0000 (+0000) Subject: luci-app-simple-adblock: improve i18n X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=refs%2Fpull%2F3898%2Fhead;p=oweals%2Fluci.git luci-app-simple-adblock: improve i18n Signed-off-by: Stan Grishin --- diff --git a/applications/luci-app-simple-adblock/Makefile b/applications/luci-app-simple-adblock/Makefile index 75fb2c56c..8b876fff8 100644 --- a/applications/luci-app-simple-adblock/Makefile +++ b/applications/luci-app-simple-adblock/Makefile @@ -10,7 +10,7 @@ LUCI_TITLE:=Simple Adblock Web UI LUCI_DESCRIPTION:=Provides Web UI for simple-adblock service. LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full +simple-adblock LUCI_PKGARCH:=all -PKG_RELEASE:=43 +PKG_RELEASE:=44 include ../../luci.mk diff --git a/applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua b/applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua index 15e757cf4..408d07026 100644 --- a/applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua +++ b/applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua @@ -77,7 +77,7 @@ end local statusTable = {} local errorTable = {} -statusTable["statusNoInstall"] = packageName .. translate("is not installed or not found") +statusTable["statusNoInstall"] = translatef("%s is not installed or not found", packageName) statusTable["statusStopped"] = translate("Stopped") statusTable["statusStarting"] = translate("Starting") statusTable["statusRestarting"] = translate("Restarting") @@ -87,20 +87,20 @@ statusTable["statusError"] = translate("Error") statusTable["statusWarning"] = translate("Warning") statusTable["statusFail"] = translate("Fail") statusTable["statusSuccess"] = translate("Success") -errorTable["errorOutputFileCreate"] = translate("failed to create") .. " '" .. outputFile .. "' " .. translate("file") +errorTable["errorOutputFileCreate"] = translatef("failed to create '%s' file", outputFile) errorTable["errorFailDNSReload"] = translate("failed to restart/reload DNS resolver") errorTable["errorSharedMemory"] = translate("failed to access shared memory") errorTable["errorSorting"] = translate("failed to sort data file") errorTable["errorOptimization"] = translate("failed to optimize data file") errorTable["errorWhitelistProcessing"] = translate("failed to process whitelist") errorTable["errorDataFileFormatting"] = translate("failed to format data file") -errorTable["errorMovingDataFile"] = translate("failed to move temporary data file to") .. " '" .. outputFile .. "'" +errorTable["errorMovingDataFile"] = translatef("failed to move temporary data file to '%s'", outputFile) errorTable["errorCreatingCompressedCache"] = translate("failed to create compressed cache") errorTable["errorRemovingTempFiles"] = translate("failed to remove temporary files") errorTable["errorRestoreCompressedCache"] = translate("failed to unpack compressed cache") -errorTable["errorRestoreCache"] = translate("failed to move") .. " '" .. outputCache .. "' " .. translate("to") .. " '" .. outputFile .. "'" +errorTable["errorRestoreCache"] = translatef("failed to move '%s' to '%s'", outputCache, outputFile) errorTable["errorOhSnap"] = translate("failed to create blocklist or restart DNS resolver") -errorTable["errorStopping"] = translate("failed to stop") .. " " .. packageName +errorTable["errorStopping"] = translatef("failed to stop %s", packageName) errorTable["errorDNSReload"] = translate("failed to reload/restart DNS resolver") errorTable["errorDownloadingList"] = translate("failed to download") errorTable["errorParsingList"] = translate("failed to parse") @@ -111,7 +111,7 @@ m.on_after_apply = function(self) sys.call("/etc/init.d/simple-adblock restart") end -h = m:section(NamedSection, "config", "simple-adblock", translate("Service Status") .. " [" .. tmpfsVersion .. "]") +h = m:section(NamedSection, "config", "simple-adblock", translatef("Service Status [%s]", tmpfsVersion)) if tmpfsStatus == "statusStarting" or tmpfsStatus == "statusRestarting" or @@ -133,20 +133,17 @@ else if fs.access(outputCache) then sm = h:option(DummyValue, "_dummy", translate("Info")) sm.template = "simple-adblock/status" - sm.value = translate("Cache file containing") .. " " .. util.trim(sys.exec("wc -l < " .. outputCache)) .. " " .. translate("domains found") .. "." + sm.value = translatef("Cache file containing %s domains found.", util.trim(sys.exec("wc -l < " .. outputCache))) elseif fs.access(outputGzip) then sm = h:option(DummyValue, "_dummy", translate("Info")) sm.template = "simple-adblock/status" - sm.value = translate("Compressed cache file found") .. "." + sm.value = translate("Compressed cache file found.") end else ss = h:option(DummyValue, "_dummy", translate("Service Status")) ss.template = "simple-adblock/status" if tmpfsStatus == "statusSuccess" then - ss.value = tmpfsVersion .. " " .. translate("is blocking") .. - " " .. util.trim(sys.exec("wc -l < " .. outputFile)) .. - " " .. translate("domains") .. " (" .. translate("with") .. - " " .. targetDNS .. ")." + ss.value = translatef("%s is blocking %s domains (with %s).", tmpfsVersion, util.trim(sys.exec("wc -l < " .. outputFile)), targetDNS) else ss.value = statusTable[tmpfsStatus] end @@ -163,9 +160,9 @@ else for err in tmpfsError:gmatch("[%p%w]+") do if err:match("=") then e,url = err:match("(.+)=(.+)") - es.value = es.value .. translate("Error") .. ": " .. errorTable[e] .. " " .. url .. ".\n" + es.value = translatef("%s Error: %s %s", es.value, errorTable[e], url) .. ".\n" else - es.value = es.value .. translate("Error") .. ": " .. errorTable[err] .. ".\n" + es.value = translatef("%s Error: %s", es.value, errorTable[err]) .. ".\n" end end end @@ -197,9 +194,8 @@ if fs.access(sysfs_path) then leds = nutil.consume((fs.dir(sysfs_path))) end if #leds ~= 0 then - o4 = s:taboption("basic", Value, "led", translate("LED to indicate status"), translate("Pick the LED not already used in") - .. [[ ]] - .. translate("System LED Configuration") .. [[]] .. ".") + o4 = s:taboption("basic", Value, "led", translate("LED to indicate status"), + translatef("Pick the LED not already used in System LED Configuration.", dispatcher.build_url("admin", "system", "leds"))) o4.rmempty = false o4:value("", translate("none")) for k, v in ipairs(leds) do @@ -209,20 +205,18 @@ end s:tab("advanced", translate("Advanced Configuration")) -local dns_descr = translate("Pick the DNS resolution option to create the adblock list for, see the") .. " " - .. [[]] - .. translate("README") .. [[]] .. " " .. translate("for details.") +local dns_descr = translatef("Pick the DNS resolution option to create the adblock list for, see the README for details.", readmeURL) if not checkDnsmasq then - dns_descr = dns_descr .. "
" .. translate("Please note that") .. " dnsmasq.addnhosts " .. translate("is not supported on this system.") - dns_descr = dns_descr .. "
" .. translate("Please note that") .. " dnsmasq.conf " .. translate("is not supported on this system.") - dns_descr = dns_descr .. "
" .. translate("Please note that") .. " dnsmasq.ipset " .. translate("is not supported on this system.") - dns_descr = dns_descr .. "
" .. translate("Please note that") .. " dnsmasq.servers " .. translate("is not supported on this system.") + dns_descr = dns_descr .. "
" .. translatef("Please note that %s is not supported on this system.", "dnsmasq.addnhosts") + dns_descr = dns_descr .. "
" .. translatef("Please note that %s is not supported on this system.", "dnsmasq.conf") + dns_descr = dns_descr .. "
" .. translatef("Please note that %s is not supported on this system.", "dnsmasq.ipset") + dns_descr = dns_descr .. "
" .. translatef("Please note that %s is not supported on this system.", "dnsmasq.servers") elseif not checkDnsmasqIpset then - dns_descr = dns_descr .. "
" .. translate("Please note that") .. " dnsmasq.ipset " .. translate("is not supported on this system.") + dns_descr = dns_descr .. "
" .. translatef("Please note that %s is not supported on this system.", "dnsmasq.ipset") end if not checkUnbound then - dns_descr = dns_descr .. "
" .. translate("Please note that") .. " unbound.adb_list " .. translate("is not supported on this system.") + dns_descr = dns_descr .. "
" .. translatef("Please note that %s is not supported on this system.", "unbound.adb_list") end dns = s:taboption("advanced", ListValue, "dns", translate("DNS Service"), dns_descr) 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 b3d74edf5..2a5152780 100644 --- a/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot +++ b/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot @@ -1,84 +1,100 @@ msgid "" msgstr "Content-Type: text/plain; charset=UTF-8" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:244 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:165 +msgid "%s Error: %s" +msgstr "" + +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:163 +msgid "%s Error: %s %s" +msgstr "" + +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:146 +msgid "%s is blocking %s domains (with %s)." +msgstr "" + +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:80 +msgid "%s is not installed or not found" +msgstr "" + +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:238 msgid "Add IPv6 entries" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:242 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236 msgid "Add IPv6 entries to block-list." msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:210 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:206 msgid "Advanced Configuration" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:266 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:260 msgid "" "Attempt to create a compressed cache of block-list in the persistent memory." msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:181 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:178 msgid "Basic Configuration" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:294 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:288 msgid "Blacklisted Domain URLs" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:284 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:278 msgid "Blacklisted Domains" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:299 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:293 msgid "Blacklisted Hosts URLs" msgstr "" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:136 -msgid "Cache file containing" +msgid "Cache file containing %s domains found." msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:156 msgid "Collected Errors" msgstr "" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:140 -msgid "Compressed cache file found" +msgid "Compressed cache file found." msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:179 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:176 msgid "Configuration" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:183 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:180 msgid "Controls system log and console output verbosity." msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:257 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251 msgid "Curl download retry" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:228 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:222 msgid "DNS Service" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:230 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:224 msgid "DNSMASQ Additional Hosts" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:225 msgid "DNSMASQ Config" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:233 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:227 msgid "DNSMASQ IP Set" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:235 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:229 msgid "DNSMASQ Servers File" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:249 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:243 msgid "Delay (in seconds) for on-boot start" msgstr "" @@ -86,23 +102,23 @@ msgstr "" msgid "Disable" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:272 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:266 msgid "Disable Debugging" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:243 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:237 msgid "Do not add IPv6 entries" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:267 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:261 msgid "Do not store compressed cache" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:262 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:256 msgid "Do not use simultaneous processing" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:253 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:247 msgid "Download time-out (in seconds)" msgstr "" @@ -114,18 +130,16 @@ msgstr "" msgid "Enable" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:271 -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:273 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:265 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:267 msgid "Enable Debugging" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:271 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:265 msgid "Enables debug output to /tmp/simple-adblock.log." msgstr "" #: 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 msgid "Error" msgstr "" @@ -141,33 +155,33 @@ msgstr "" msgid "Force Reloading" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:189 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186 msgid "Force Router DNS" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:188 msgid "Force Router DNS server to all local devices" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:189 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186 msgid "Forces Router DNS use on local devices, also known as DNS Hijacking." msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:242 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236 msgid "IPv6 Support" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:257 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251 msgid "" "If curl is installed and detected, it would retry download this many times " "on timeout/fail." msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:284 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:278 msgid "Individual domains to be blacklisted." msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:279 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:273 msgid "Individual domains to be whitelisted." msgstr "" @@ -176,17 +190,17 @@ msgstr "" msgid "Info" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:197 msgid "LED to indicate status" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:261 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:255 msgid "" "Launch all lists downloads and processing simultaneously, reducing service " "start time." msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:190 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:187 msgid "Let local devices use their own DNS servers if set" msgstr "" @@ -194,50 +208,52 @@ msgstr "" msgid "Loading" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:154 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151 msgid "Message" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:183 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:180 msgid "Output Verbosity Setting" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:212 -msgid "Pick the DNS resolution option to create the adblock list for, see the" -msgstr "" - -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200 -msgid "Pick the LED not already used in" +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:208 +msgid "" +"Pick the DNS resolution option to create the adblock list for, see the README for details." msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:217 -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:218 -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:219 -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:220 -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:222 -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:225 -msgid "Please note that" +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:198 +msgid "" +"Pick the LED not already used in System LED Configuration." msgstr "" +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:211 +#: 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:214 -msgid "README" +#: 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." msgstr "" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:83 msgid "Restarting" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:249 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:243 msgid "Run service after set delay on boot." msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:114 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:130 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:143 msgid "Service Status" msgstr "" +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:114 +msgid "Service Status [%s]" +msgstr "" + #: applications/luci-app-simple-adblock/luasrc/controller/simple-adblock.lua:4 msgid "Simple AdBlock" msgstr "" @@ -246,11 +262,11 @@ msgstr "" msgid "Simple AdBlock Settings" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:261 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:255 msgid "Simultaneous processing" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:185 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182 msgid "Some output" msgstr "" @@ -266,7 +282,7 @@ msgstr "" msgid "Stop" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:253 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:247 msgid "Stop the download if it is stalled for set number of seconds." msgstr "" @@ -274,11 +290,11 @@ msgstr "" msgid "Stopped" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:268 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:262 msgid "Store compressed cache" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:266 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:260 msgid "Store compressed cache file on router" msgstr "" @@ -286,39 +302,35 @@ msgstr "" msgid "Success" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:184 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:181 msgid "Suppress output" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:202 -msgid "System LED Configuration" -msgstr "" - #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:124 msgid "Task" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:294 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:288 msgid "URLs to lists of domains to be blacklisted." msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:289 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:283 msgid "URLs to lists of domains to be whitelisted." msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:299 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:293 msgid "URLs to lists of hosts to be blacklisted." msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:238 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:232 msgid "Unbound AdBlock List" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:263 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:257 msgid "Use simultaneous processing" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:183 msgid "Verbose output" msgstr "" @@ -326,32 +338,24 @@ msgstr "" msgid "Warning" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:277 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:271 msgid "Whitelist and Blocklist Management" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:289 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:283 msgid "Whitelisted Domain URLs" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:279 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:273 msgid "Whitelisted Domains" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:148 -msgid "domains" -msgstr "" - -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:136 -msgid "domains found" -msgstr "" - #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:92 msgid "failed to access shared memory" msgstr "" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:90 -msgid "failed to create" +msgid "failed to create '%s' file" msgstr "" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:102 @@ -371,11 +375,11 @@ msgid "failed to format data file" msgstr "" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:101 -msgid "failed to move" +msgid "failed to move '%s' to '%s'" msgstr "" #: 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 '%s'" msgstr "" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:94 @@ -407,46 +411,13 @@ msgid "failed to sort data file" msgstr "" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:103 -msgid "failed to stop" +msgid "failed to stop %s" msgstr "" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:100 msgid "failed to unpack compressed cache" msgstr "" -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:90 -msgid "file" -msgstr "" - -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:214 -msgid "for details." -msgstr "" - -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:146 -msgid "is blocking" -msgstr "" - -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:80 -msgid "is not installed or not found" -msgstr "" - -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:217 -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:218 -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:219 -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:220 -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:222 -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:225 -msgid "is not supported on this system." -msgstr "" - -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:204 +#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200 msgid "none" msgstr "" - -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:101 -msgid "to" -msgstr "" - -#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:148 -msgid "with" -msgstr ""