summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorHannu Nyman <hannu.nyman@iki.fi>2017-06-07 21:31:53 +0300
committerGitHub <noreply@github.com>2017-06-07 21:31:53 +0300
commitc87ce62711732eea323a43519da2e98f4b1a4da1 (patch)
treed39daf0ace7618ee86b2216c92eb26968d30ba20
parenta9e8376c20f386c030e8b004e1245fa220173773 (diff)
parent22c252e2cd042ab3f28a92cec18b6f4f118a1f55 (diff)
Merge pull request #1185 from dibdot/master
luci-app-adblock: sync with adblock 2.7.0
-rw-r--r--applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua12
1 files changed, 9 insertions, 3 deletions
diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
index f71fb7ba4d..fe269656f3 100644
--- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
+++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
@@ -157,12 +157,18 @@ e2 = e:option(Flag, "adb_forcesrt", translate("Force Overall Sort"),
e2.default = e2.disabled
e2.rmempty = false
-e3 = e:option(Flag, "adb_backup", translate("Enable blocklist backup"))
+e3 = e:option(Flag, "adb_manmode", translate("Manual mode"),
+ translate("Do not automatically update blocklists during startup, use blocklist backups instead."))
e3.default = e3.disabled
e3.rmempty = false
-e4 = e:option(Value, "adb_backupdir", translate("Backup directory"))
-e4.datatype = "directory"
+e4 = e:option(Flag, "adb_backup", translate("Enable blocklist backup"),
+ translate("Create compressed blocklist backups, they will be used in case of download errors or during startup in manual mode."))
+e4.default = e4.disabled
e4.rmempty = false
+e5 = e:option(Value, "adb_backupdir", translate("Backup directory"))
+e5.datatype = "directory"
+e5.rmempty = false
+
return m