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

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit 88b9d843882cf52a6acf4d08a878fd005120edd4)

diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
index 0d1420772ebc56041e3d8d23b2a4e95c5c982167..4dd90cc326fa91844f4ed7c07a12ce46a8a835c3 100644 (file)
--- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
+++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
@@ -34,8 +34,8 @@ CBILeaseStatus = form.DummyValue.extend({
                        E('table', { 'id': 'lease_status_table', 'class': 'table' }, [
                                E('tr', { 'class': 'tr table-titles' }, [
                                        E('th', { 'class': 'th' }, _('Hostname')),
-                                       E('th', { 'class': 'th' }, _('IPv4-Address')),
-                                       E('th', { 'class': 'th' }, _('MAC-Address')),
+                                       E('th', { 'class': 'th' }, _('IPv4 address')),
+                                       E('th', { 'class': 'th' }, _('MAC address')),
                                        E('th', { 'class': 'th' }, _('Lease time remaining'))
                                ]),
                                E('tr', { 'class': 'tr placeholder' }, [
@@ -53,7 +53,7 @@ CBILease6Status = form.DummyValue.extend({
                        E('table', { 'id': 'lease6_status_table', 'class': 'table' }, [
                                E('tr', { 'class': 'tr table-titles' }, [
                                        E('th', { 'class': 'th' }, _('Host')),
-                                       E('th', { 'class': 'th' }, _('IPv6-Address')),
+                                       E('th', { 'class': 'th' }, _('IPv6 address')),
                                        E('th', { 'class': 'th' }, _('DUID')),
                                        E('th', { 'class': 'th' }, _('Lease time remaining'))
                                ]),
@@ -409,7 +409,7 @@ return view.extend({
 
                o = s.taboption('leases', form.SectionValue, '__leases__', form.GridSection, 'host', null,
                        _('Static leases are used to assign fixed IP addresses and symbolic hostnames to DHCP clients. They are also required for non-dynamic interface configurations where only hosts with a corresponding lease are served.') + '<br />' +
-                       _('Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</em> identifies the host, the <em>IPv4-Address</em> specifies the fixed address to use, and the <em>Hostname</em> is assigned as a symbolic name to the requesting host. The optional <em>Lease time</em> can be used to set non-standard host-specific lease time, e.g. 12h, 3d or infinite.'));
+                       _('Use the <em>Add</em> Button to add a new lease entry. The <em>MAC address</em> identifies the host, the <em>IPv4 address</em> specifies the fixed address to use, and the <em>Hostname</em> is assigned as a symbolic name to the requesting host. The optional <em>Lease time</em> can be used to set non-standard host-specific lease time, e.g. 12h, 3d or infinite.'));
 
                ss = o.subsection;
 

diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js
index 04b312b1a77aa91f8f7015779e2ca30e1bbce5a9..8f3f7a24ed5cab6a73ac62350048ee6cce8abb23 100644 (file)
--- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js
+++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js
@@ -1078,7 +1078,7 @@ return view.extend({
                                        bssid.depends('mode', 'sta');
                                        bssid.depends('mode', 'sta-wds');
 
-                                       o = ss.taboption('macfilter', form.ListValue, 'macfilter', _('MAC-Address Filter'));
+                                       o = ss.taboption('macfilter', form.ListValue, 'macfilter', _('MAC Address Filter'));
                                        o.depends('mode', 'ap');
                                        o.depends('mode', 'ap-wds');
                                        o.value('', _('disable'));
@@ -2144,7 +2144,7 @@ return view.extend({
                        var table = E('table', { 'class': 'table assoclist', 'id': 'wifi_assoclist_table' }, [
                                E('tr', { 'class': 'tr table-titles' }, [
                                        E('th', { 'class': 'th nowrap' }, _('Network')),
-                                       E('th', { 'class': 'th hide-xs' }, _('MAC-Address')),
+                                       E('th', { 'class': 'th hide-xs' }, _('MAC address')),
                                        E('th', { 'class': 'th' }, _('Host')),
                                        E('th', { 'class': 'th' }, _('Signal / Noise')),
                                        E('th', { 'class': 'th' }, _('RX Rate / TX Rate'))

diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/30_network.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/30_network.js
index 3359ca82cc5d3bc4e23617353d510155c178895d..1a0f7037f99aefcb5b3d5fd832daff516521328f 100644 (file)
--- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/30_network.js
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/30_network.js
@@ -53,7 +53,7 @@ function renderbox(ifc, ipv6) {
                        E('div', {}, renderBadge(
                                L.resource('icons/%s.png').format(dev ? dev.getType() : 'ethernet_disabled'), null,
                                _('Device'), dev ? dev.getI18n() : '-',
-                               _('MAC-Address'), dev.getMAC())
+                               _('MAC address'), dev.getMAC())
                        )
                ])
        ]);

diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js
index e06b555e836149bfa62c91e028a9eb60591db2c1..9b40e23b5e04398ac174830332b03799a434b9a0 100644 (file)
--- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js
@@ -84,8 +84,8 @@ return baseclass.extend({
                var table = E('table', { 'class': 'table lases' }, [
                        E('tr', { 'class': 'tr table-titles' }, [
                                E('th', { 'class': 'th' }, _('Hostname')),
-                               E('th', { 'class': 'th' }, _('IPv4-Address')),
-                               E('th', { 'class': 'th' }, _('MAC-Address')),
+                               E('th', { 'class': 'th' }, _('IPv4 address')),
+                               E('th', { 'class': 'th' }, _('MAC address')),
                                E('th', { 'class': 'th' }, _('Lease time remaining')),
                                E('th', { 'class': 'th cbi-section-actions' }, _('Static Lease'))
                        ])
@@ -123,7 +123,7 @@ return baseclass.extend({
                var table6 = E('table', { 'class': 'table leases6' }, [
                        E('tr', { 'class': 'tr table-titles' }, [
                                E('th', { 'class': 'th' }, _('Host')),
-                               E('th', { 'class': 'th' }, _('IPv6-Address')),
+                               E('th', { 'class': 'th' }, _('IPv6 address')),
                                E('th', { 'class': 'th' }, _('DUID')),
                                E('th', { 'class': 'th' }, _('Lease time remaining')),
                                E('th', { 'class': 'th cbi-section-actions' }, _('Static Lease'))

diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js
index 18172aae94e75250f6f10f4cc608bf0237949b55..7cb3e78e7aa59db1984b1fc23736f86eaf0b11aa 100644 (file)
--- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js
@@ -226,7 +226,7 @@ return baseclass.extend({
                var assoclist = E('table', { 'class': 'table assoclist' }, [
                        E('tr', { 'class': 'tr table-titles' }, [
                                E('th', { 'class': 'th nowrap' }, _('Network')),
-                               E('th', { 'class': 'th hide-xs' }, _('MAC-Address')),
+                               E('th', { 'class': 'th hide-xs' }, _('MAC address')),
                                E('th', { 'class': 'th' }, _('Host')),
                                E('th', { 'class': 'th' }, '%s / %s'.format(_('Signal'), _('Noise'))),
                                E('th', { 'class': 'th' }, '%s / %s'.format(_('RX Rate'), _('TX Rate')))

diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js
index ac512bb849b76f9474dfc1545ca4d084a62fdd1d..6051b74c3be2f360d4183b35a3d2d548e1ac915d 100644 (file)
--- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js
@@ -152,8 +152,8 @@ return view.extend({
 
                var neigh4tbl = E('table', { 'class': 'table' }, [
                        E('tr', { 'class': 'tr table-titles' }, [
-                               E('th', { 'class': 'th' }, [ _('IPv4-Address') ]),
-                               E('th', { 'class': 'th' }, [ _('MAC-Address') ]),
+                               E('th', { 'class': 'th' }, [ _('IPv4 address') ]),
+                               E('th', { 'class': 'th' }, [ _('MAC address') ]),
                                E('th', { 'class': 'th' }, [ _('Interface') ])
                        ])
                ]);
@@ -162,7 +162,7 @@ return view.extend({
                        E('tr', { 'class': 'tr table-titles' }, [
                                E('th', { 'class': 'th' }, [ _('Network') ]),
                                E('th', { 'class': 'th' }, [ _('Target') ]),
-                               E('th', { 'class': 'th' }, [ _('IPv4-Gateway') ]),
+                               E('th', { 'class': 'th' }, [ _('IPv4 gateway') ]),
                                E('th', { 'class': 'th' }, [ _('Metric') ]),
                                E('th', { 'class': 'th' }, [ _('Table') ]),
                                E('th', { 'class': 'th' }, [ _('Protocol') ]),
@@ -171,8 +171,8 @@ return view.extend({
 
                var neigh6tbl = E('table', { 'class': 'table' }, [
                        E('tr', { 'class': 'tr table-titles' }, [
-                               E('th', { 'class': 'th' }, [ _('IPv6-Address') ]),
-                               E('th', { 'class': 'th' }, [ _('MAC-Address') ]),
+                               E('th', { 'class': 'th' }, [ _('IPv6 address') ]),
+                               E('th', { 'class': 'th' }, [ _('MAC address') ]),
                                E('th', { 'class': 'th' }, [ _('Interface') ])
                        ])
                ]);

diff --git a/protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js b/protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js
index 620b4032df83e3ccaa46aaa59a8dcfc2f14d5f94..ee4927a02761989f842baea16142036dee58e3b9 100644 (file)
--- a/protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js
+++ b/protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js
@@ -103,7 +103,7 @@ return network.registerProtocol('3g', {
                o.placeholder = '*99***1#';
 
                if (L.hasSystemFeature('ipv6')) {
-                       o = s.taboption('advanced', form.ListValue, 'ppp_ipv6', _('Obtain IPv6-Address'));
+                       o = s.taboption('advanced', form.ListValue, 'ppp_ipv6', _('Obtain IPv6 address'));
                        o.ucioption = 'ipv6';
                        o.value('auto', _('Automatic'));
                        o.value('0', _('Disabled'));

diff --git a/protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js b/protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js
index 13dee21b15b301cb937f51e47269768864fd0b88..0daa7c16c186592f5551fa6da98b0ecb0c55f41c 100644 (file)
--- a/protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js
+++ b/protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js
@@ -95,7 +95,7 @@ return network.registerProtocol('ncm', {
                o.placeholder = '*99***1#';
 
                if (L.hasSystemFeature('ipv6')) {
-                       o = s.taboption('advanced', form.ListValue, 'ppp_ipv6', _('Obtain IPv6-Address'));
+                       o = s.taboption('advanced', form.ListValue, 'ppp_ipv6', _('Obtain IPv6 address'));
                        o.ucioption = 'ipv6';
                        o.value('auto', _('Automatic'));
                        o.value('0', _('Disabled'));

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 4cf4d8270109dc201e246203dbd37c76979da5ba..59eb0b8be397c18a8718c26243bf93e7436ae877 100644 (file)
--- 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 49ac8c4f894293b3d9c07bd165aed5d93f87e895..d97d4bc29b65bea54c180d8e164e0e8be7dbc778 100644 (file)
--- 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 ef2b18d62c3791628d74c11eb5223c816fb0d4d9..79562994cf72466007879116bb41739b5603a9c9 100644 (file)
--- 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 02798308995ea7fc3056e34cf4efe57a7f1f042b..057e17fe81b1906c1e0c2a3d8b5cc460fbde03b0 100644 (file)
--- 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 9ae683a2964b133c0cc431fc8f7a3ff7878e2fa3..a8d344fbe568c725519ea3faf3f8655cc4a044e4 100644 (file)
--- 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'));

diff --git a/protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js b/protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js
index 54035eb23ef0d2f6186913607d911783fe87862f..52cf481a5e759c5bcc7236d529021cad256672b5 100644 (file)
--- a/protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js
+++ b/protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js
@@ -90,7 +90,7 @@ return network.registerProtocol('pppossh', {
                o.datatype = 'ipaddr("nomask")';
 
                if (L.hasSystemFeature('ipv6')) {
-                       o = s.taboption('advanced', form.Flag, 'ppp_ipv6', _('Obtain IPv6-Address'), _('Enable IPv6 negotiation on the PPP link'));
+                       o = s.taboption('advanced', form.Flag, 'ppp_ipv6', _('Obtain IPv6 address'), _('Enable IPv6 negotiation on the PPP link'));
                        o.ucioption = 'ipv6';
                        o.default = o.disabled;
                }