Merge pull request #6087 from stangri/openwrt-22.03-luci-app-simple-adblock
[22.03] luci-app-simple-adblock: bugfix: allow empty leds field
This commit is contained in:
Stan Grishin
GitHub
commit
26cd223ee0
3 changed files with 48 additions and 49 deletions
|
|
@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
|
|||
|
||||
PKG_LICENSE:=GPL-3.0-or-later
|
||||
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
|
||||
PKG_VERSION:=1.9.2-4
|
||||
PKG_VERSION:=1.9.2-5
|
||||
|
||||
LUCI_TITLE:=Simple Adblock Web UI
|
||||
LUCI_DESCRIPTION:=Provides Web UI for simple-adblock service.
|
||||
|
|
|
|||
|
|
@ -60,7 +60,6 @@ return view.extend({
|
|||
(replyPlatform[pkg.Name].leds).forEach(element => {
|
||||
o.value(element);
|
||||
});
|
||||
o.rmempty = false;
|
||||
}
|
||||
var text = _("DNS resolution option, see the %sREADME%s for details.")
|
||||
.format("<a href=\"" + pkg.URL + "#dns-resolution-option\" target=\"_blank\">", "</a>");
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@ msgstr ""
|
|||
msgid "Active"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:106
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:105
|
||||
msgid "Add IPv6 entries"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:104
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:103
|
||||
msgid "Add IPv6 entries to block-list."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -21,19 +21,19 @@ msgstr ""
|
|||
msgid "Advanced Configuration"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:145
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:144
|
||||
msgid "Allowed Domain URLs"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:142
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:141
|
||||
msgid "Allowed Domains"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:141
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:140
|
||||
msgid "Allowed and Blocked Lists Management"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:129
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:128
|
||||
msgid ""
|
||||
"Attempt to create a compressed cache of block-list in the persistent memory."
|
||||
msgstr ""
|
||||
|
|
@ -46,15 +46,15 @@ msgstr ""
|
|||
msgid "Basic Configuration"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:151
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:150
|
||||
msgid "Blocked Domain URLs"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:148
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:147
|
||||
msgid "Blocked Domains"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:154
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:153
|
||||
msgid "Blocked Hosts URLs"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -78,15 +78,15 @@ msgstr ""
|
|||
msgid "Controls system log and console output verbosity."
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:117
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:116
|
||||
msgid "Curl download retry"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:86
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:85
|
||||
msgid "DNS Service"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:65
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:64
|
||||
msgid "DNS resolution option, see the %sREADME%s for details."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -96,8 +96,8 @@ msgstr ""
|
|||
msgid "Disable"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:136
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:138
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:135
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:137
|
||||
msgid "Disable Debugging"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -105,21 +105,21 @@ msgstr ""
|
|||
msgid "Disabling %s service"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:105
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:109
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:104
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:108
|
||||
msgid "Do not add IPv6 entries"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:130
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:132
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:129
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:131
|
||||
msgid "Do not store compressed cache"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:124
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:123
|
||||
msgid "Do not use simultaneous processing"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:112
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:111
|
||||
msgid "Download time-out (in seconds)"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -132,12 +132,12 @@ msgstr ""
|
|||
msgid "Enable"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:134
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:137
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:133
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:136
|
||||
msgid "Enable Debugging"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:135
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:134
|
||||
msgid "Enables debug output to /tmp/simple-adblock.log."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -186,21 +186,21 @@ msgstr ""
|
|||
msgid "Grant UCI and file access for luci-app-simple-adblock"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:103
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:102
|
||||
msgid "IPv6 Support"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:118
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:117
|
||||
msgid ""
|
||||
"If curl is installed and detected, it would retry download this many times "
|
||||
"on timeout/fail."
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:143
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:142
|
||||
msgid "Individual domains to be allowed."
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:149
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:148
|
||||
msgid "Individual domains to be blocked."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -208,7 +208,7 @@ msgstr ""
|
|||
msgid "LED to indicate status"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:123
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:122
|
||||
msgid ""
|
||||
"Launch all lists downloads and processing simultaneously, reducing service "
|
||||
"start time."
|
||||
|
|
@ -234,13 +234,13 @@ msgstr ""
|
|||
msgid "Pick the LED not already used in %sSystem LED Configuration%s."
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:67
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:68
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:69
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:70
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:71
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:75
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:78
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:82
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:74
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:77
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:81
|
||||
msgid "Please note that %s is not supported on this system."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -276,7 +276,7 @@ msgstr ""
|
|||
msgid "Simple AdBlock - Status"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:122
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:121
|
||||
msgid "Simultaneous processing"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -300,7 +300,7 @@ msgstr ""
|
|||
msgid "Stop"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:113
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:112
|
||||
msgid "Stop the download if it is stalled for set number of seconds."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -312,11 +312,11 @@ msgstr ""
|
|||
msgid "Stopping %s service"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:131
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:130
|
||||
msgid "Store compressed cache"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:128
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:127
|
||||
msgid "Store compressed cache file on router"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -324,20 +324,20 @@ msgstr ""
|
|||
msgid "Suppress output"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:146
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:145
|
||||
msgid "URLs to lists of domains to be allowed."
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:152
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:151
|
||||
msgid "URLs to lists of domains to be blocked."
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:155
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:154
|
||||
msgid "URLs to lists of hosts to be blocked."
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:124
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:125
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:126
|
||||
msgid "Use simultaneous processing"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -358,24 +358,24 @@ msgstr ""
|
|||
msgid "disabled"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:88
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:87
|
||||
msgid "dnsmasq additional hosts"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:89
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:88
|
||||
msgid "dnsmasq config"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:91
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:90
|
||||
msgid "dnsmasq ipset"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:94
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:93
|
||||
msgid "dnsmasq nft set"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:96
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:101
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:95
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:100
|
||||
msgid "dnsmasq servers file"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -467,6 +467,6 @@ msgstr ""
|
|||
msgid "none"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:99
|
||||
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js:98
|
||||
msgid "unbound adblock list"
|
||||
msgstr ""
|
||||
|
|
|
|||
Loading…
Reference in a new issue