luci-app-adblock: sync with adblock 4.0.6

* made SafeSearch provider configurable, you can limit
  SafeSearch to certain providers
* add an explanation paragraph to report settings
  tab (regarding restart requirement)
* sync translations

Signed-off-by: Dirk Brenken <dev@brenken.org>

1 files changed, 11 insertions, 2 deletions

diff --git a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js
index 5d4eca53a6..9610735d97 100644
--- a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js
+++ b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js
@@ -268,7 +268,7 @@ return view.extend({
 		s.tab('general',  _('General Settings'));
 		s.tab('additional', _('Additional Settings'));
 		s.tab('adv_dns', _('Advanced DNS Settings'));
-		s.tab('adv_report', _('Advanced Report Settings'));
+		s.tab('adv_report', _('Advanced Report Settings'), _('Changes on this tab needs a full adblock service restart to take effect.<br /><p>&#xa0;</p>'));
 		s.tab('adv_email', _('Advanced E-Mail Settings'));
 		s.tab('sources', _('Blocklist Sources'), _('List of supported and fully pre-configured adblock sources, already active sources are pre-selected.<br /> \
 			<b><em>To avoid OOM errors, please do not select too many lists!</em></b><br /> \
@@ -301,7 +301,16 @@ return view.extend({
 		o = s.taboption('general', form.Flag, 'adb_safesearch', _('Enable SafeSearch'), _('Enforcing SafeSearch for google, bing, duckduckgo, yandex, youtube and pixabay.'));
 		o.rmempty = false;
 
-		o = s.taboption('general', form.Flag, 'adb_safesearchmod', _('SafeSearch Moderate'), _('Enable moderate SafeSearch filters for youtube.'));
+		o = s.taboption('general', form.MultiValue, 'adb_safesearchlist', _('Limit SafeSearch'), _('Limit SafeSearch to certain providers.'));
+		o.depends('adb_safesearch', '1');
+		o.value('google');
+		o.value('bing');
+		o.value('yandex');
+		o.value('youtube');
+		o.value('pixabay');
+		o.rmempty = true;
+
+		o = s.taboption('general', form.Flag, 'adb_safesearchmod', _('Relax SafeSearch'), _('Enable moderate SafeSearch filters for youtube.'));
 		o.depends('adb_safesearch', '1');
 		o.rmempty = true;