From ced38d8fc1d70b0a27dcbd2d567686248e1fbfb3 Mon Sep 17 00:00:00 2001 From: Stan Grishin Date: Wed, 8 Nov 2023 10:01:15 +0000 Subject: luci-app-adblock-fast: sync with adblock-fast 1.0.1-1 * improve error/warning/status messaging * trim rpcd script code from functions shared with principal package * depends on https://github.com/openwrt/packages/pull/22619 Signed-off-by: Stan Grishin --- .../po/templates/adblock-fast.pot | 139 +++++++++++---------- 1 file changed, 76 insertions(+), 63 deletions(-) (limited to 'applications/luci-app-adblock-fast/po') diff --git a/applications/luci-app-adblock-fast/po/templates/adblock-fast.pot b/applications/luci-app-adblock-fast/po/templates/adblock-fast.pot index fe609fe0d1..7df0c2bdce 100644 --- a/applications/luci-app-adblock-fast/po/templates/adblock-fast.pot +++ b/applications/luci-app-adblock-fast/po/templates/adblock-fast.pot @@ -1,7 +1,7 @@ msgid "" msgstr "Content-Type: text/plain; charset=UTF-8" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:223 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:225 msgid "%s is currently disabled" msgstr "" @@ -22,7 +22,7 @@ msgstr "" msgid "Action" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:118 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:116 #: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:61 msgid "Active" msgstr "" @@ -55,7 +55,7 @@ msgstr "" msgid "AdBlock-Fast - Configuration" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:121 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:119 msgid "AdBlock-Fast - Status" msgstr "" @@ -103,7 +103,7 @@ msgstr "" msgid "Blocked Domains" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:134 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:132 msgid "Blocking %s domains (with %s)." msgstr "" @@ -115,23 +115,27 @@ msgstr "" msgid "Cache file" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:160 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:158 msgid "Cache file found." msgstr "" +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:195 +msgid "Can't detect free RAM" +msgstr "" + #: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:68 msgid "Compressed cache" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:139 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:137 msgid "Compressed cache file created." msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:162 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:160 msgid "Compressed cache file found." msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:221 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:223 msgid "Config (%s) validation failure!" msgstr "" @@ -165,7 +169,7 @@ msgid "" "Directory for compressed cache file of block-list in the persistent memory." msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:419 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:424 #: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:239 msgid "Disable" msgstr "" @@ -174,11 +178,11 @@ msgstr "" msgid "Disable Debugging" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:156 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:154 msgid "Disabled" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:413 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:418 msgid "Disabling %s service" msgstr "" @@ -207,7 +211,7 @@ msgstr "" msgid "Downloading lists" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:400 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:405 #: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:240 #: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:394 msgid "Enable" @@ -222,109 +226,111 @@ msgstr "" msgid "Enables debug output to /tmp/adblock-fast.log." msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:394 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:399 msgid "Enabling %s service" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:115 #: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:58 msgid "Error" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:293 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:298 msgid "Errors encountered, please check the %sREADME%s" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:117 #: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:60 msgid "Fail" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:246 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:248 msgid "Failed to access shared memory" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:242 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:244 msgid "Failed to create '%s' file" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:264 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:266 msgid "Failed to create block-list or restart DNS resolver" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:255 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:257 msgid "Failed to create compressed cache" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:241 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:243 msgid "Failed to create directory for %s file" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:276 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:278 msgid "Failed to create output/cache/gzip file directory" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:278 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:280 msgid "Failed to detect format %s" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:271 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:273 msgid "Failed to download %s" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:269 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:271 msgid "Failed to download Config Update file" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:250 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:252 msgid "Failed to format data file" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:259 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:261 msgid "Failed to move '%s' to '%s'" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:252 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:254 msgid "Failed to move temporary data file to '%s'" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:248 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:250 msgid "Failed to optimize data file" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:273 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:275 msgid "Failed to parse %s" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:272 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:274 msgid "Failed to parse Config Update file" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:249 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:251 msgid "Failed to process allow-list" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:267 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:269 msgid "Failed to reload/restart DNS resolver" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:257 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:259 msgid "Failed to remove temporary files" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:245 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:247 msgid "Failed to restart/reload DNS resolver" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:247 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:249 msgid "Failed to sort data file" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:266 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:115 +msgid "Failed to start" +msgstr "" + +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:268 msgid "Failed to stop %s" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:258 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:260 msgid "Failed to unpack compressed cache" msgstr "" @@ -332,7 +338,7 @@ msgstr "" msgid "Force DNS Ports" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:142 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:140 msgid "Force DNS ports:" msgstr "" @@ -349,7 +355,7 @@ msgstr "" msgid "Force Router DNS server to all local devices" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:341 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:346 msgid "Force redownloading %s block lists" msgstr "" @@ -357,6 +363,10 @@ msgstr "" msgid "Forces Router DNS use on local devices, also known as DNS Hijacking." msgstr "" +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:285 +msgid "Free ram (%s) is not enough to process all enabled block-lists" +msgstr "" + #: applications/luci-app-adblock-fast/root/usr/share/rpcd/acl.d/luci-app-adblock-fast.json:3 msgid "Grant UCI and file access for luci-app-adblock-fast" msgstr "" @@ -385,6 +395,10 @@ msgstr "" msgid "Individual domains to be blocked." msgstr "" +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:193 +msgid "Invalid compressed cache directory '%s'" +msgstr "" + #: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:221 msgid "LED to indicate status" msgstr "" @@ -403,15 +417,15 @@ msgstr "" msgid "No AdBlock on dnsmasq" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:274 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:276 msgid "No HTTPS/SSL support on device" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:280 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:282 msgid "No blocked list URLs nor blocked-domains enabled" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:176 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:174 msgid "Not installed or not found" msgstr "" @@ -419,11 +433,11 @@ msgstr "" msgid "Output Verbosity Setting" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:362 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:367 msgid "Pause" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:357 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:362 msgid "Pausing %s" msgstr "" @@ -450,7 +464,7 @@ msgstr "" msgid "Processing lists" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:347 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:352 msgid "Redownload" msgstr "" @@ -459,19 +473,19 @@ msgstr "" msgid "Restarting" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:460 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:465 msgid "Service Control" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:286 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:291 msgid "Service Errors" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:125 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:123 msgid "Service Status" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:198 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:200 msgid "Service Warnings" msgstr "" @@ -491,11 +505,11 @@ msgstr "" msgid "Some output" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:192 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:190 msgid "Some recommended packages are missing" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:328 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:333 msgid "Start" msgstr "" @@ -504,7 +518,7 @@ msgstr "" msgid "Starting" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:322 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:327 msgid "Starting %s service" msgstr "" @@ -512,7 +526,7 @@ msgstr "" msgid "Status" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:381 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:386 msgid "Stop" msgstr "" @@ -525,7 +539,7 @@ msgstr "" msgid "Stopped" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:375 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:380 msgid "Stopping %s service" msgstr "" @@ -541,29 +555,29 @@ msgstr "" msgid "Suppress output" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:239 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:241 msgid "The %s failed to discover WAN gateway" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:227 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:229 msgid "" "The dnsmasq ipset support is enabled, but dnsmasq is either not installed or " "installed dnsmasq does not support ipset" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:230 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:232 msgid "" "The dnsmasq ipset support is enabled, but ipset is either not installed or " "installed ipset does not support '%s' type" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:233 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:235 msgid "" "The dnsmasq nft set support is enabled, but dnsmasq is either not installed " "or installed dnsmasq does not support nft set" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:236 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:238 msgid "The dnsmasq nft sets support is enabled, but nft is not installed" msgstr "" @@ -589,7 +603,7 @@ msgstr "" msgid "Use AdBlocking on the dnsmasq instance(s)" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:189 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:187 msgid "" "Use of external dnsmasq config file detected, please set '%s' option to '%s'" msgstr "" @@ -606,11 +620,10 @@ msgstr "" msgid "Version" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:128 +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:126 msgid "Version %s" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:116 #: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js:59 msgid "Warning" msgstr "" -- cgit v1.2.3