From b4f4799f9e745aae8b70df7ad27315eb997cf570 Mon Sep 17 00:00:00 2001 From: Vladislav Grigoryev Date: Tue, 10 Aug 2021 01:55:19 +0300 Subject: luci-mod-network: network/routing support for pbr Provide comprehensive routing configuration: * Rename the "Network > Routes" page to "Network > Routing". * Unify sorting for the "Status" and "Network" menus. * Add the tabs "IPv4 Rules" and "IPv6 Rules" to the "Routing" page. * Provide configuration for IPv4 and IPv6 routing rules. * Consolidate routing configuration and terminology for IPv4 and IPv6. Policy-based routing is an increasingly popular problem. Netifd natively supports policy-based routing: * Interface-specific options "ip4table" and "ip6table". * Routing rules using the "rule" and "rule6" sections. LuCI is missing configuration for routing rules. Signed-off-by: Vladislav Grigoryev --- modules/luci-base/po/de/base.po | 94 ++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 62 deletions(-) (limited to 'modules/luci-base/po/de') diff --git a/modules/luci-base/po/de/base.po b/modules/luci-base/po/de/base.po index a0cb2fb1a3..944a6f2387 100644 --- a/modules/luci-base/po/de/base.po +++ b/modules/luci-base/po/de/base.po @@ -178,27 +178,10 @@ msgstr "BSSID" msgid "ESSID" msgstr "ESSID" -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:47 -msgid "IPv4-Gateway" -msgstr "IPv4-Gateway" - #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:691 -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:41 msgid "IPv4-Netmask" msgstr "IPv4-Netzmaske" -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:36 -msgid "" -"IPv6-Address or Network " -"(CIDR)" -msgstr "" -"IPv6 Host- oder Netzwerk-" -"Addresse (CIDR)" - -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:47 -msgid "IPv6-Gateway" -msgstr "IPv6-Gateway" - #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:58 msgid "LED Configuration" msgstr "LED Konfiguration" @@ -530,7 +513,8 @@ msgstr "Administration" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:478 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:633 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:1523 -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:26 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:39 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:126 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:924 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:988 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:241 @@ -1602,7 +1586,7 @@ msgid "DHCP Server" msgstr "DHCP-Server" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244 -#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:50 +#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:62 msgid "DHCP and DNS" msgstr "DHCP und DNS" @@ -1794,6 +1778,7 @@ msgstr "Design" msgid "Designated master" msgstr "Master-Schnittstelle" +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:158 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:386 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:71 msgid "Destination" @@ -1867,7 +1852,7 @@ msgstr "Gerät nicht erreichbar! Warte immer noch..." msgid "Devices" msgstr "Geräte" -#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:78 +#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:76 msgid "Diagnostics" msgstr "Diagnosen" @@ -1880,7 +1865,8 @@ msgstr "Einwahlnummer" msgid "Directory" msgstr "Verzeichnis" -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:32 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:112 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:197 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:897 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:937 msgid "Disable" @@ -1911,10 +1897,6 @@ msgstr "Inaktivitäts-Proben deaktivieren" msgid "Disable this network" msgstr "Dieses Netzwerk deaktivieren" -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:32 -msgid "Disable this route" -msgstr "Diese Route deaktivieren" - #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1680 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:13 @@ -2866,6 +2848,7 @@ msgstr "GRETAP-Tunnel über IPv4" msgid "GRETAP tunnel over IPv6" msgstr "GRETAP-Tunnel über 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 msgid "Gateway" msgstr "Gateway" @@ -2881,7 +2864,8 @@ msgstr "Gateway-Adresse ist ungültig" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:251 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:477 -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:25 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:38 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:125 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:240 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:108 msgid "General Settings" @@ -3102,10 +3086,6 @@ msgstr "Host" msgid "Host expiry timeout" msgstr "Host Verfallsdatum" -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:36 -msgid "Host-IP or Network" -msgstr "Host-IP oder Netzwerk" - #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:88 msgid "Host-Uniq tag content" msgstr "\"Host-Uniq\"-Bezeichner" @@ -3598,7 +3578,7 @@ msgstr "" msgid "Insufficient permissions to read UCI configuration." msgstr "Ungenügende Berechtigungen um UCI-Konfiguration zu lesen." -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:28 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:41 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:180 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:206 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:17 @@ -4276,7 +4256,7 @@ msgstr "MII Intervall" #: modules/luci-mod-network/htdocs/luci-static/resources/tools/network.js:580 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:1418 -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:59 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:85 #: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:53 #: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:92 msgid "MTU" @@ -4423,7 +4403,7 @@ msgstr "Methode zur Verbindungsüberwachung" msgid "Method to determine link status" msgstr "Methode zur Bestimmung des Verbindungsstatus" -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:51 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:78 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:189 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:215 msgid "Metric" @@ -4990,8 +4970,8 @@ msgstr "Verzögerung für Ausschalt-Zustand" msgid "On" msgstr "An" -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:101 -msgid "On-Link route" +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:108 +msgid "On-link" msgstr "Link-lokale Route" #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/led-trigger/timer.js:11 @@ -5669,6 +5649,7 @@ msgstr "" "(immer 0)" #: modules/luci-mod-network/htdocs/luci-static/resources/tools/network.js:508 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:128 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:197 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:223 msgid "Priority" @@ -6158,11 +6139,7 @@ msgstr "Round-Robin-Richtlinie (balance-rr, 0)" msgid "Route Allowed IPs" msgstr "Erlaubte IP-Adressen routen" -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:78 -msgid "Route table" -msgstr "Routen-Tabelle" - -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:65 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:45 msgid "Route type" msgstr "Routen-Typ" @@ -6179,18 +6156,16 @@ msgstr "" msgid "Router Password" msgstr "Routerpasswort" -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:15 -msgid "Routes" -msgstr "Routen" - -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:15 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:28 msgid "" -"Routes specify over which interface and gateway a certain host or network " +"Routing defines over which interface and gateway a certain host or network " "can be reached." msgstr "" "Netzwerkrouten geben an, über welche Schnittstellen bestimmte Rechner oder " "Subnetze erreicht werden können." +#: 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/root/usr/share/luci/menu.d/luci-mod-status.json:15 msgid "Routing" @@ -6579,16 +6554,14 @@ msgstr "" "geflasht werden. Weitere Informationen sowie gerätespezifische " "Installationsanleitungen entnehmen Sie bitte dem Wiki." +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:98 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:147 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:385 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:70 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:214 msgid "Source" msgstr "Quelle" -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:89 -msgid "Source Address" -msgstr "Quelladresse" - #: protocols/luci-proto-gre/htdocs/luci-static/resources/protocol/grev6.js:57 #: protocols/luci-proto-gre/htdocs/luci-static/resources/protocol/grev6tap.js:57 msgid "Source interface" @@ -6938,11 +6911,11 @@ msgstr "Starte WLAN Scan..." msgid "Startup" msgstr "Systemstart" -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:19 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:32 msgid "Static IPv4 Routes" msgstr "Statische IPv4 Routen" -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:19 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:32 msgid "Static IPv6 Routes" msgstr "Statische IPv6 Routen" @@ -6955,10 +6928,6 @@ msgstr "Statische Reservierung" msgid "Static Leases" msgstr "Statische Einträge" -#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:66 -msgid "Static Routes" -msgstr "Statische Routen" - #: modules/luci-base/htdocs/luci-static/resources/network.js:2099 #: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172 #: modules/luci-compat/luasrc/model/network.lua:967 @@ -7129,13 +7098,15 @@ msgstr "TX-Rate" msgid "TX queue length" msgstr "Sendewarteschlangenlänge" +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:90 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:165 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:18 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:190 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:216 msgid "Table" msgstr "Tabelle" -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:36 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:56 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:66 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:187 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:213 @@ -8620,12 +8591,16 @@ msgid "ZRam Size" msgstr "ZRAM Größe" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:440 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:151 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:162 msgid "any" msgstr "beliebig" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:1463 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:1471 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:1476 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:101 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:132 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1230 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:79 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:48 @@ -8635,7 +8610,6 @@ msgid "auto" msgstr "auto" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:776 -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:90 msgid "automatic" msgstr "automatisch" @@ -8764,10 +8738,6 @@ msgstr "versteckt" msgid "hybrid mode" msgstr "hybrider Modus" -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:41 -msgid "if target is a network" -msgstr "falls Ziel ein Netzwerk ist" - #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:63 msgid "ignore" msgstr "ignorieren" -- cgit v1.2.3