From: Hannu Nyman Date: Tue, 28 Mar 2017 18:12:27 +0000 (+0300) Subject: Merge pull request #1088 from dibdot/luci-app-adblock X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=3dc08a354b4f5212fdaf54764729a025a14167cf;hp=8504fd64fc71a2c8e9ae8a7a6bfd71f648fd2782 Merge pull request #1088 from dibdot/luci-app-adblock luci-app-adblock: fix XHTML/HTML5 markup --- diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua index fc6b812d1..efe40e09e 100644 --- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua +++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua @@ -17,7 +17,7 @@ m = SimpleForm("input", nil) s = m:section(SimpleSection, nil, translatef("This form allows you to modify the content of the adblock blacklist (%s).
", adbinput) - .. translate("Please add only one domain per line. Comments introduced with '#' are allowed - ip addresses, wildcards & regex are not.")) + .. translate("Please add only one domain per line. Comments introduced with '#' are allowed - ip addresses, wildcards and regex are not.")) f = s:option(TextValue, "data") f.rmempty = true diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua index 955969e1f..6c4dee467 100644 --- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua +++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua @@ -17,7 +17,7 @@ m = SimpleForm("input", nil) s = m:section(SimpleSection, nil, translatef("This form allows you to modify the content of the adblock whitelist (%s).
", adbinput) - .. translate("Please add only one domain per line. Comments introduced with '#' are allowed - ip addresses, wildcards & regex are not.")) + .. translate("Please add only one domain per line. Comments introduced with '#' are allowed - ip addresses, wildcards and regex are not.")) f = s:option(TextValue, "data") f.rmempty = true diff --git a/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm b/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm index bb55d233f..4a90d4196 100644 --- a/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm +++ b/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm @@ -6,6 +6,6 @@ This is free software, licensed under the Apache License, Version 2.0 <%+cbi/valueheader%> - + <%+cbi/valuefooter%>