From 88b9d843882cf52a6acf4d08a878fd005120edd4 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 7 Jun 2021 12:43:36 +0200 Subject: treewide: consolidate {IPv4,IPv6,MAC} {address,gateway} spellings - Turn IPv4-Address into IPv4 address - Turn IPv4-Gateway into IPv4 gateway - Turn IPv6-Address into IPv6 address - Turn IPv6-Gateway into IPv6 gateway - Turn MAC-Address into MAC address Also remove related duplicate translation entries. Signed-off-by: Jo-Philipp Wich --- protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js | 2 +- protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js | 2 +- protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js | 2 +- protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js | 2 +- protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol') diff --git a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js index 4cf4d82701..59eb0b8be3 100644 --- a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js +++ b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js @@ -46,7 +46,7 @@ return network.registerProtocol('l2tp', { o.password = true; if (L.hasSystemFeature('ipv6')) { - o = s.taboption('advanced', form.ListValue, 'ppp_ipv6', _('Obtain IPv6-Address'), _('Enable IPv6 negotiation on the PPP link')); + o = s.taboption('advanced', form.ListValue, 'ppp_ipv6', _('Obtain IPv6 address'), _('Enable IPv6 negotiation on the PPP link')); o.ucioption = 'ipv6'; o.value('auto', _('Automatic')); o.value('0', _('Disabled')); diff --git a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js index 49ac8c4f89..d97d4bc29b 100644 --- a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js +++ b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js @@ -91,7 +91,7 @@ return network.registerProtocol('ppp', { o.password = true; if (L.hasSystemFeature('ipv6')) { - o = s.taboption('advanced', form.ListValue, 'ppp_ipv6', _('Obtain IPv6-Address'), _('Enable IPv6 negotiation on the PPP link')); + o = s.taboption('advanced', form.ListValue, 'ppp_ipv6', _('Obtain IPv6 address'), _('Enable IPv6 negotiation on the PPP link')); o.ucioption = 'ipv6'; o.value('auto', _('Automatic')); o.value('0', _('Disabled')); diff --git a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js index ef2b18d62c..79562994cf 100644 --- a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js +++ b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js @@ -77,7 +77,7 @@ return network.registerProtocol('pppoa', { o.password = true; if (L.hasSystemFeature('ipv6')) { - o = s.taboption('advanced', form.ListValue, 'ppp_ipv6', _('Obtain IPv6-Address'), _('Enable IPv6 negotiation on the PPP link')); + o = s.taboption('advanced', form.ListValue, 'ppp_ipv6', _('Obtain IPv6 address'), _('Enable IPv6 negotiation on the PPP link')); o.ucioption = 'ipv6'; o.value('auto', _('Automatic')); o.value('0', _('Disabled')); diff --git a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js index 0279830899..057e17fe81 100644 --- a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js +++ b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js @@ -51,7 +51,7 @@ return network.registerProtocol('pppoe', { o.placeholder = _('auto'); if (L.hasSystemFeature('ipv6')) { - o = s.taboption('advanced', form.ListValue, 'ppp_ipv6', _('Obtain IPv6-Address'), _('Enable IPv6 negotiation on the PPP link')); + o = s.taboption('advanced', form.ListValue, 'ppp_ipv6', _('Obtain IPv6 address'), _('Enable IPv6 negotiation on the PPP link')); o.ucioption = 'ipv6'; o.value('auto', _('Automatic')); o.value('0', _('Disabled')); diff --git a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js index 9ae683a296..a8d344fbe5 100644 --- a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js +++ b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js @@ -64,7 +64,7 @@ return network.registerProtocol('pptp', { o.password = true; if (L.hasSystemFeature('ipv6')) { - o = s.taboption('advanced', form.ListValue, 'ppp_ipv6', _('Obtain IPv6-Address'), _('Enable IPv6 negotiation on the PPP link')); + o = s.taboption('advanced', form.ListValue, 'ppp_ipv6', _('Obtain IPv6 address'), _('Enable IPv6 negotiation on the PPP link')); o.ucioption = 'ipv6'; o.value('auto', _('Automatic')); o.value('0', _('Disabled')); -- cgit v1.2.3