diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2017-02-15 10:08:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-15 10:08:34 +0200 |
| commit | 4854ed66b6d6fb4ea5a176318c766095e6cfdfe8 (patch) | |
| tree | 661f626c830b59dd0f59752edbf7e7a67afbe3e0 | |
| parent | 6a2a62fa4f9b220398fd2ed1a1fe79197b0019c9 (diff) | |
| parent | ca0d99070493d2542c15feefa9863983a0f85563 (diff) | |
Merge pull request #1012 from stangri/luci-app-vpnbypass
luci-app-vpnbypass: cbi file fix for README link and an unneeded section
| -rw-r--r-- | applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua | 9 | ||||
| -rw-r--r-- | applications/luci-app-vpnbypass/po/templates/vpnbypass.pot | 14 |
2 files changed, 11 insertions, 12 deletions
diff --git a/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua b/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua index 2d500b968..6ed52ddba 100644 --- a/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua +++ b/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua @@ -27,13 +27,12 @@ r2.addremove = true r2.optional = true -- Domains -d1 = s:option(DynamicList, "domain", translate("Domains to Bypass"), translate("Domains which will be accessed directly (outside of the VPN tunnel)")) -d1.addremove = true -d1.optional = true - d = Map("dhcp") s4 = d:section(TypedSection, "dnsmasq") s4.anonymous = true -di = s4:option(DynamicList, "ipset", translate("Domains to Bypass"), translate("Domains to be accessed directly (outside of the VPN tunnel), see <a href='https://github.com/openwrt/packages/tree/master/net/vpnbypass/files#bypass-domains-formatsyntax'>README</a> for syntax")) +di = s4:option(DynamicList, "ipset", translate("Domains to Bypass"), + translate("Domains to be accessed directly (outside of the VPN tunnel), see ") + .. [[<a href="https://github.com/openwrt/packages/tree/master/net/vpnbypass/files#bypass-domains-formatsyntax" target="_blank">]] + .. translate("README") .. [[</a>]] .. translate(" for syntax")) return m, d diff --git a/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot b/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot index 9463bc010..144adedc4 100644 --- a/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot +++ b/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot @@ -4,13 +4,7 @@ msgstr "Content-Type: text/plain; charset=UTF-8" msgid "Domains to Bypass" msgstr "" -msgid "" -"Domains to be accessed directly (outside of the VPN tunnel), see <a " -"href='https://github.com/openwrt/packages/tree/master/net/vpnbypass/" -"files#bypass-domains-formatsyntax'>README</a> for syntax" -msgstr "" - -msgid "Domains which will be accessed directly (outside of the VPN tunnel)" +msgid "Domains to be accessed directly (outside of the VPN tunnel), see" msgstr "" msgid "Enable VPN Bypass" @@ -28,6 +22,9 @@ msgstr "" msgid "Local ports to trigger VPN Bypass" msgstr "" +msgid "README" +msgstr "" + msgid "Remote IP Subnets to Bypass" msgstr "" @@ -46,3 +43,6 @@ msgstr "" msgid "VPN Bypass Settings" msgstr "" + +msgid "for syntax" +msgstr "" |