diff options
| author | Stan Grishin <stangri@melmac.ca> | 2024-11-23 10:05:22 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-23 10:05:22 -0800 |
| commit | ac1043cdc6a24485a052136b5be1598a21152a52 (patch) | |
| tree | 567ef7e3fff49f6deba327f14fe151cc7c4f2e8b | |
| parent | 9e70c9aed8b0c87a4c5f03eb0cfbca9f6970192a (diff) | |
| parent | 206e5fbbcce40c1ec0777a6ecc7db1d8ae21d589 (diff) | |
Merge pull request #7408 from stangri/master-luci-app-adblock-fast
luci-app-adblock-fast: sync with principal
4 files changed, 7 insertions, 7 deletions
diff --git a/applications/luci-app-adblock-fast/Makefile b/applications/luci-app-adblock-fast/Makefile index aecc776734..42e4af9de5 100644 --- a/applications/luci-app-adblock-fast/Makefile +++ b/applications/luci-app-adblock-fast/Makefile @@ -7,7 +7,7 @@ PKG_NAME:=luci-app-adblock-fast PKG_LICENSE:=AGPL-3.0-or-later PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca> PKG_VERSION:=1.1.2 -PKG_RELEASE:=10 +PKG_RELEASE:=16 LUCI_TITLE:=AdBlock-Fast Web UI LUCI_URL:=https://github.com/stangri/luci-app-adblock-fast/ diff --git a/applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js b/applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js index 3da046c8ce..d89e228953 100644 --- a/applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js +++ b/applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js @@ -198,7 +198,7 @@ var status = baseclass.extend({ "Use of external dnsmasq config file detected, please set '%s' option to '%s'" ).format("dns", "dnsmasq.conf"), warningMissingRecommendedPackages: _( - "Some recommended packages are missing" + "Missing recommended package: '%s'" ), warningOutdatedLuciPackage: _( "The WebUI application (luci-app-adblock-fast) is outdated, please update it" 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 cbcf83ac97..2b20743ebe 100644 --- a/applications/luci-app-adblock-fast/po/templates/adblock-fast.pot +++ b/applications/luci-app-adblock-fast/po/templates/adblock-fast.pot @@ -415,6 +415,10 @@ msgstr "" msgid "Let local devices use their own DNS servers if set" msgstr "" +#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:201 +msgid "Missing recommended package: '%s'" +msgstr "" + #: applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js:524 msgid "Name" msgstr "" @@ -530,10 +534,6 @@ msgstr "" msgid "Some output" msgstr "" -#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:201 -msgid "Some recommended packages are missing" -msgstr "" - #: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:357 msgid "Start" msgstr "" diff --git a/applications/luci-app-adblock-fast/root/usr/libexec/rpcd/luci.adblock-fast b/applications/luci-app-adblock-fast/root/usr/libexec/rpcd/luci.adblock-fast index 67c6427fe6..546df1d81d 100755 --- a/applications/luci-app-adblock-fast/root/usr/libexec/rpcd/luci.adblock-fast +++ b/applications/luci-app-adblock-fast/root/usr/libexec/rpcd/luci.adblock-fast @@ -14,7 +14,7 @@ # ubus -S call luci.adblock-fast setInitAction '{"name": "adblock-fast", "action": "pause" }' # ubus -S call luci.adblock-fast setInitAction '{"name": "adblock-fast", "action": "stop" }' -readonly luciCompat='3' +readonly luciCompat='4' readonly adbFunctionsFile='/etc/init.d/adblock-fast' if [ -s "$adbFunctionsFile" ]; then # shellcheck source=../../../../../adblock-fast/files/etc/init.d/adblock-fast |