Merge pull request #5267 from vgaetera/status-routing

luci-mod-status: optimize view/formatting for status/routing

1 files changed, 20 insertions, 17 deletions

diff --git a/modules/luci-base/po/pl/base.po b/modules/luci-base/po/pl/base.po
index 58c86e4d4a..e8837a8b85 100644
--- a/modules/luci-base/po/pl/base.po
+++ b/modules/luci-base/po/pl/base.po
@@ -250,7 +250,6 @@ msgstr "ANSI T1.413"
 msgid "APN"
 msgstr "APN"
 
-#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:248
 #: protocols/luci-proto-bonding/htdocs/luci-static/resources/protocol/bonding.js:353
 msgid "ARP"
 msgstr "ARP"
@@ -355,20 +354,20 @@ msgstr "Akcje"
 msgid "Active"
 msgstr "Aktywny"
 
-#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:251
-msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:243
+msgid "Active IPv4 Routes"
 msgstr "Aktywne trasy <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
 
-#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:254
-msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Rules"
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:246
+msgid "Active IPv4 Rules"
 msgstr "Aktywne reguły <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
 
-#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:261
-msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:253
+msgid "Active IPv6 Routes"
 msgstr "Aktywne trasy <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>"
 
-#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:264
-msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Rules"
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:256
+msgid "Active IPv6 Rules"
 msgstr "Aktywne reguły <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>"
 
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/30_network.js:81
@@ -2829,6 +2828,7 @@ msgstr "Tunel GRETAP przez IPv6"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:74
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/30_network.js:44
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:188
 msgid "Gateway"
 msgstr "Brama"
 
@@ -3129,6 +3129,8 @@ msgid "IP Type"
 msgstr "Typ IP"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:501
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:178
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:204
 msgid "IP address"
 msgstr "Adres IP"
 
@@ -3161,7 +3163,11 @@ msgstr "IPv4"
 msgid "IPv4 Firewall"
 msgstr "Zapora sieciowa IPv4"
 
-#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:247
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:240
+msgid "IPv4 Neighbours"
+msgstr ""
+
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:239
 msgid "IPv4 Routing"
 msgstr "Trasowanie IPv4"
 
@@ -3173,7 +3179,6 @@ msgstr "Połączenie IPv4"
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:38
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:585
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:88
-#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:178
 #: protocols/luci-proto-bonding/htdocs/luci-static/resources/protocol/bonding.js:164
 msgid "IPv4 address"
 msgstr "Adres IPv4"
@@ -3187,7 +3192,6 @@ msgid "IPv4 broadcast"
 msgstr "Transmisja IPv4"
 
 #: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:180
-#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:188
 msgid "IPv4 gateway"
 msgstr "Brama IPv4"
 
@@ -3250,7 +3254,7 @@ msgstr "Zapora sieciowa IPv6"
 msgid "IPv6 MTU"
 msgstr "IPv6 MTU"
 
-#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:258
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:250
 msgid "IPv6 Neighbours"
 msgstr "Sąsiedztwo IPv6"
 
@@ -3258,7 +3262,7 @@ msgstr "Sąsiedztwo IPv6"
 msgid "IPv6 RA Settings"
 msgstr "Ustawienia RA IPv6"
 
-#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:257
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:249
 msgid "IPv6 Routing"
 msgstr "Trasowanie IPv6"
 
@@ -3277,7 +3281,6 @@ msgstr "Połączenie IPv6"
 #: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:183
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:57
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:127
-#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:204
 msgid "IPv6 address"
 msgstr "Adres IPv6"
 
@@ -6129,7 +6132,7 @@ msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:28
 #: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:50
-#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:244
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:236
 #: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:15
 msgid "Routing"
 msgstr "Trasowanie"
@@ -7259,7 +7262,7 @@ msgstr ""
 "pliku, porównaj je z oryginalnym plikiem, aby zapewnić integralność danych. "
 "<br /> Kliknij \"Kontynuuj\" poniżej, aby rozpocząć procedurę flashowania."
 
-#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:245
+#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:237
 msgid "The following rules are currently active on this system."
 msgstr "Następujące zasady są obecnie aktywne w tym systemie."