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 <jo@mein.io>

1 files changed, 17 insertions, 29 deletions

diff --git a/modules/luci-base/po/fi/base.po b/modules/luci-base/po/fi/base.po
index c387bd3e78..8733a7dae5 100644
--- a/modules/luci-base/po/fi/base.po
+++ b/modules/luci-base/po/fi/base.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "PO-Revision-Date: 2021-04-05 07:56+0000\n"
 "Last-Translator: Petri Asikainen <uniluodossa@gmail.com>\n"
-"Language-Team: Finnish <https://hosted.weblate.org/projects/openwrt/luci/fi/>"
-"\n"
+"Language-Team: Finnish <https://hosted.weblate.org/projects/openwrt/luci/fi/"
+">\n"
 "Language: fi\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -3153,6 +3153,9 @@ msgid "IPv4 Upstream"
 msgstr "IPv4 ylävirta"
 
 #: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:178
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:37
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:87
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:155
 #: protocols/luci-proto-bonding/htdocs/luci-static/resources/protocol/bonding.js:162
 msgid "IPv4 address"
 msgstr "IPv4-osoite"
@@ -3166,6 +3169,7 @@ msgid "IPv4 broadcast"
 msgstr "IPv4-lähetys"
 
 #: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:180
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:165
 msgid "IPv4 gateway"
 msgstr "IPv4-yhdyskäytävä"
 
@@ -3195,16 +3199,6 @@ msgstr "IPv4-etuliitteen pituus"
 msgid "IPv4+IPv6"
 msgstr "IPv4+IPv6"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:37
-#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:87
-#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:155
-msgid "IPv4-Address"
-msgstr "IPv4-osoite"
-
-#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:165
-msgid "IPv4-Gateway"
-msgstr "IPv4-yhdyskäytävä"
-
 #: modules/luci-compat/luasrc/model/network/proto_ipip.lua:9
 #: protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js:10
 msgid "IPv4-in-IPv4 (RFC2003)"
@@ -3259,6 +3253,9 @@ msgid "IPv6 Upstream"
 msgstr "IPv6 ylävirta"
 
 #: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:183
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:56
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:126
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:174
 msgid "IPv6 address"
 msgstr "IPv6-osoite"
 
@@ -3314,12 +3311,6 @@ msgstr "IPv6-pääte"
 msgid "IPv6 support"
 msgstr "IPv6 tuki"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:56
-#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:126
-#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:174
-msgid "IPv6-Address"
-msgstr "IPv6-osoite"
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:101
 msgid "IPv6-PD"
 msgstr "IPv6-PD"
@@ -4129,6 +4120,10 @@ msgstr "MAC"
 msgid "MAC Address"
 msgstr ""
 
+#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1050
+msgid "MAC Address Filter"
+msgstr "MAC-osoitesuodatin"
+
 #: protocols/luci-proto-bonding/htdocs/luci-static/resources/protocol/bonding.js:251
 msgid "MAC Address For The Actor"
 msgstr "Toimijan MAC-osoite"
@@ -4139,9 +4134,6 @@ msgid "MAC VLAN"
 msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/tools/network.js:622
-msgid "MAC address"
-msgstr ""
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:38
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:2116
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/30_network.js:56
@@ -4149,13 +4141,9 @@ msgstr ""
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:229
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:156
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:175
-msgid "MAC-Address"
+msgid "MAC address"
 msgstr "MAC-osoite"
 
-#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1050
-msgid "MAC-Address Filter"
-msgstr "MAC-osoitesuodatin"
-
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:953
 msgid "MAC-Filter"
 msgstr "MAC-suodatin"
@@ -4861,7 +4849,7 @@ msgstr "Häivytetty salasana"
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:54
 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:67
 #: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:93
-msgid "Obtain IPv6-Address"
+msgid "Obtain IPv6 address"
 msgstr "Hae IPv6-osoite"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/led-trigger/default-on.js:18
@@ -7908,8 +7896,8 @@ msgstr "Käytä järjestelmävarmenteita sisätunneliin"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:412
 msgid ""
-"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 "
+"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."