summaryrefslogtreecommitdiffhomepage
path: root/applications/luci-app-yggdrasil/po
diff options
context:
space:
mode:
authorFlorian Eckert <fe@dev.tdt.de>2021-08-17 11:32:40 +0200
committerFlorian Eckert <fe@dev.tdt.de>2021-08-17 12:09:31 +0200
commitdb87be1812b61b8aad7c7c0ac46f5560dea0611a (patch)
treeac73859724c7e0268e135ef85cb4faece7e660c2 /applications/luci-app-yggdrasil/po
parent9aa06eaf63039a8d3d8534063b7304289ab4763d (diff)
treewide: i18n - sync translations
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Diffstat (limited to 'applications/luci-app-yggdrasil/po')
-rw-r--r--applications/luci-app-yggdrasil/po/ar/yggdrasil.po232
-rw-r--r--applications/luci-app-yggdrasil/po/bg/yggdrasil.po226
-rw-r--r--applications/luci-app-yggdrasil/po/bn_BD/yggdrasil.po226
-rw-r--r--applications/luci-app-yggdrasil/po/ca/yggdrasil.po226
-rw-r--r--applications/luci-app-yggdrasil/po/cs/yggdrasil.po229
-rw-r--r--applications/luci-app-yggdrasil/po/de/yggdrasil.po299
-rw-r--r--applications/luci-app-yggdrasil/po/el/yggdrasil.po229
-rw-r--r--applications/luci-app-yggdrasil/po/en/yggdrasil.po226
-rw-r--r--applications/luci-app-yggdrasil/po/es/yggdrasil.po448
-rw-r--r--applications/luci-app-yggdrasil/po/fi/yggdrasil.po232
-rw-r--r--applications/luci-app-yggdrasil/po/fr/yggdrasil.po290
-rw-r--r--applications/luci-app-yggdrasil/po/he/yggdrasil.po226
-rw-r--r--applications/luci-app-yggdrasil/po/hi/yggdrasil.po226
-rw-r--r--applications/luci-app-yggdrasil/po/hu/yggdrasil.po388
-rw-r--r--applications/luci-app-yggdrasil/po/it/yggdrasil.po232
-rw-r--r--applications/luci-app-yggdrasil/po/ja/yggdrasil.po238
-rw-r--r--applications/luci-app-yggdrasil/po/ko/yggdrasil.po226
-rw-r--r--applications/luci-app-yggdrasil/po/mr/yggdrasil.po232
-rw-r--r--applications/luci-app-yggdrasil/po/ms/yggdrasil.po226
-rw-r--r--applications/luci-app-yggdrasil/po/nb_NO/yggdrasil.po226
-rw-r--r--applications/luci-app-yggdrasil/po/pl/yggdrasil.po444
-rw-r--r--applications/luci-app-yggdrasil/po/pt/yggdrasil.po455
-rw-r--r--applications/luci-app-yggdrasil/po/pt_BR/yggdrasil.po447
-rw-r--r--applications/luci-app-yggdrasil/po/ro/yggdrasil.po229
-rw-r--r--applications/luci-app-yggdrasil/po/ru/yggdrasil.po244
-rw-r--r--applications/luci-app-yggdrasil/po/sk/yggdrasil.po232
-rw-r--r--applications/luci-app-yggdrasil/po/sv/yggdrasil.po226
-rw-r--r--applications/luci-app-yggdrasil/po/templates/yggdrasil.pot226
-rw-r--r--applications/luci-app-yggdrasil/po/tr/yggdrasil.po443
-rw-r--r--applications/luci-app-yggdrasil/po/uk/yggdrasil.po232
-rw-r--r--applications/luci-app-yggdrasil/po/vi/yggdrasil.po226
-rw-r--r--applications/luci-app-yggdrasil/po/zh_Hans/yggdrasil.po424
-rw-r--r--applications/luci-app-yggdrasil/po/zh_Hant/yggdrasil.po427
33 files changed, 2592 insertions, 6746 deletions
diff --git a/applications/luci-app-yggdrasil/po/ar/yggdrasil.po b/applications/luci-app-yggdrasil/po/ar/yggdrasil.po
index 59bcc33c94..eb8f40303d 100644
--- a/applications/luci-app-yggdrasil/po/ar/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/ar/yggdrasil.po
@@ -15,51 +15,7 @@ msgstr ""
msgid "Active peers"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:56
-msgid "Address to listen for incoming connections"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:16
-msgid "Allow from direct"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:18
-msgid "Allow from remote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:17
-msgid "Allow network traffic from directly connected peers"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:19
-msgid ""
-"Allow network traffic from remote nodes on the network that you are not "
-"directly peered with"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid ""
-"Allow outbound network traffic regardless of AllowFromDirect or "
-"AllowFromRemote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:14
-msgid ""
-"Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively "
-"allows you to use Yggdrasil to route to, or to bridge other networks, "
-"similar to a VPN tunnel. Tunnelling works between any two nodes and does not "
-"require them to be directly peered."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid "Always allow outbound"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:31
-msgid "Blacklisted public keys"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:17
msgid ""
"By default, nodeinfo contains some defaults including the platform, "
"architecture and Yggdrasil version. These can help when surveying the "
@@ -68,12 +24,19 @@ msgid ""
"specified."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "Enable NodeInfo privacy"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
+msgid ""
+"Configuration for which interfaces multicast peer discovery should be "
+"enabled on. Regex is a regular expression which is matched against an "
+"interface name, and interfaces use the first configuration that they match "
+"gainst. Beacon configures whether or not the node should send link-local "
+"multicast beacons to advertise their presence, while listening for incoming "
+"connections on Port. Listen controls whether or not the node listens for "
+"multicast beacons and opens outgoing connections."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:14
-msgid "Enable session firewall"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
+msgid "Enable NodeInfo privacy"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:11
@@ -97,82 +60,20 @@ msgstr ""
msgid "Grant access to LuCI app yggdrasil"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:26
-msgid "IPv4 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:19
-msgid "IPv4 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-msgid "IPv4 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:20
-msgid "IPv4 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:27
-msgid ""
-"IPv4 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:40
-msgid "IPv6 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:33
-msgid "IPv6 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "IPv6 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:34
-msgid "IPv6 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:41
-msgid ""
-"IPv6 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges (or the Yggdrasil node's IPv6 address/subnet) will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:15
-msgid ""
-"If disabled, network traffic from any node will be allowed. If enabled, the "
-"below rules apply"
-msgstr ""
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:25
msgid "Interface"
msgstr "واجهه"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
-msgid "Interface name"
-msgstr "اسم الواجهة"
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
msgid "Interface peers"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:16
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:19
msgid "Keep this private. When compromised, generate a new keypair and IPv6."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Key"
-msgstr "مفتاح"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "Link-local TCP port"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:52
+msgid "Link-local port"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:21
@@ -191,11 +92,11 @@ msgid ""
"when you may connect via different interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:33
msgid "Listen addresses"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:34
msgid ""
"Listen addresses for incoming connections. You will need to add listeners in "
"order to accept incoming peerings from non-local nodes. Multicast peer "
@@ -204,35 +105,23 @@ msgid ""
"[::]:0 to listen on all interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
-msgid "MTU size for the interface"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:39
-msgid "Maximum size of all switch queues combined"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:41
-msgid "Multicast interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+msgid "Listen for beacons"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:25
-msgid ""
-"Network traffic is always accepted from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:31
+msgid "MTU size for the interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:32
-msgid ""
-"Network traffic is always rejected from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:44
+msgid "Multicast interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
msgid "NodeInfo"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:30
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:24
msgid ""
"Optional node info. This must be a { \"key\": \"value\", ... } map or set as "
"null. This is entirely optional but, if set, is visible to the whole network "
@@ -244,79 +133,22 @@ msgstr ""
msgid "Peers"
msgstr "الأقران"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Public encryption key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:26
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:33
-msgid "Public key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:42
-msgid ""
-"Regular expressions for which interfaces multicast peer discovery should be "
-"enabled on. If none specified, multicast peer discovery is disabled. The "
-"default value is .* which uses all interfaces."
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:49
+msgid "Regular expression"
msgstr ""
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:50
-msgid "Session firewall"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:11
-msgid "Session firewall settings"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:46
-msgid "Set .* to multicast on all interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+msgid "Send beacons"
msgstr ""
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:32
msgid "Settings"
msgstr "إعدادات"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:18
-msgid "Signing private key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:17
-msgid "Signing public key"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:14
msgid "Status"
msgstr "الحالة"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "Subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
-msgid ""
-"The port number to be used for the link-local TCP listeners for the "
-"configured MulticastInterfaces. This option does not affect "
-"listenersspecified in the Listen option. Unless you plan to firewall link-"
-"localtraffic, it is best to leave this as the default value of 0. This "
-"option cannot currently be changed by reloading config during runtime."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:11
-msgid "Tunnel Routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:59
-msgid "Tunnel routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:24
-msgid "Whitelisted public keys"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:3
msgid "Yggdrasil"
msgstr ""
@@ -329,6 +161,12 @@ msgstr ""
msgid "Yggdrasil's network interface name"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:58
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:40
msgid "e.g. tcp://0.0.0.0:0 or tcp://[::]:0"
msgstr ""
+
+#~ msgid "Interface name"
+#~ msgstr "اسم الواجهة"
+
+#~ msgid "Key"
+#~ msgstr "مفتاح"
diff --git a/applications/luci-app-yggdrasil/po/bg/yggdrasil.po b/applications/luci-app-yggdrasil/po/bg/yggdrasil.po
index 7da8e52fe9..f958a63c20 100644
--- a/applications/luci-app-yggdrasil/po/bg/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/bg/yggdrasil.po
@@ -8,51 +8,7 @@ msgstr ""
msgid "Active peers"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:56
-msgid "Address to listen for incoming connections"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:16
-msgid "Allow from direct"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:18
-msgid "Allow from remote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:17
-msgid "Allow network traffic from directly connected peers"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:19
-msgid ""
-"Allow network traffic from remote nodes on the network that you are not "
-"directly peered with"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid ""
-"Allow outbound network traffic regardless of AllowFromDirect or "
-"AllowFromRemote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:14
-msgid ""
-"Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively "
-"allows you to use Yggdrasil to route to, or to bridge other networks, "
-"similar to a VPN tunnel. Tunnelling works between any two nodes and does not "
-"require them to be directly peered."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid "Always allow outbound"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:31
-msgid "Blacklisted public keys"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:17
msgid ""
"By default, nodeinfo contains some defaults including the platform, "
"architecture and Yggdrasil version. These can help when surveying the "
@@ -61,12 +17,19 @@ msgid ""
"specified."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "Enable NodeInfo privacy"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
+msgid ""
+"Configuration for which interfaces multicast peer discovery should be "
+"enabled on. Regex is a regular expression which is matched against an "
+"interface name, and interfaces use the first configuration that they match "
+"gainst. Beacon configures whether or not the node should send link-local "
+"multicast beacons to advertise their presence, while listening for incoming "
+"connections on Port. Listen controls whether or not the node listens for "
+"multicast beacons and opens outgoing connections."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:14
-msgid "Enable session firewall"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
+msgid "Enable NodeInfo privacy"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:11
@@ -90,82 +53,20 @@ msgstr ""
msgid "Grant access to LuCI app yggdrasil"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:26
-msgid "IPv4 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:19
-msgid "IPv4 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-msgid "IPv4 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:20
-msgid "IPv4 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:27
-msgid ""
-"IPv4 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:40
-msgid "IPv6 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:33
-msgid "IPv6 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "IPv6 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:34
-msgid "IPv6 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:41
-msgid ""
-"IPv6 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges (or the Yggdrasil node's IPv6 address/subnet) will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:15
-msgid ""
-"If disabled, network traffic from any node will be allowed. If enabled, the "
-"below rules apply"
-msgstr ""
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:25
msgid "Interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
-msgid "Interface name"
-msgstr ""
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
msgid "Interface peers"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:16
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:19
msgid "Keep this private. When compromised, generate a new keypair and IPv6."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "Link-local TCP port"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:52
+msgid "Link-local port"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:21
@@ -184,11 +85,11 @@ msgid ""
"when you may connect via different interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:33
msgid "Listen addresses"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:34
msgid ""
"Listen addresses for incoming connections. You will need to add listeners in "
"order to accept incoming peerings from non-local nodes. Multicast peer "
@@ -197,35 +98,23 @@ msgid ""
"[::]:0 to listen on all interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
-msgid "MTU size for the interface"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:39
-msgid "Maximum size of all switch queues combined"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:41
-msgid "Multicast interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+msgid "Listen for beacons"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:25
-msgid ""
-"Network traffic is always accepted from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:31
+msgid "MTU size for the interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:32
-msgid ""
-"Network traffic is always rejected from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:44
+msgid "Multicast interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
msgid "NodeInfo"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:30
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:24
msgid ""
"Optional node info. This must be a { \"key\": \"value\", ... } map or set as "
"null. This is entirely optional but, if set, is visible to the whole network "
@@ -237,79 +126,22 @@ msgstr ""
msgid "Peers"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Public encryption key"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:49
+msgid "Regular expression"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:26
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:33
-msgid "Public key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:42
-msgid ""
-"Regular expressions for which interfaces multicast peer discovery should be "
-"enabled on. If none specified, multicast peer discovery is disabled. The "
-"default value is .* which uses all interfaces."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:50
-msgid "Session firewall"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:11
-msgid "Session firewall settings"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:46
-msgid "Set .* to multicast on all interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+msgid "Send beacons"
msgstr ""
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:32
msgid "Settings"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:18
-msgid "Signing private key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:17
-msgid "Signing public key"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:14
msgid "Status"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "Subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
-msgid ""
-"The port number to be used for the link-local TCP listeners for the "
-"configured MulticastInterfaces. This option does not affect "
-"listenersspecified in the Listen option. Unless you plan to firewall link-"
-"localtraffic, it is best to leave this as the default value of 0. This "
-"option cannot currently be changed by reloading config during runtime."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:11
-msgid "Tunnel Routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:59
-msgid "Tunnel routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:24
-msgid "Whitelisted public keys"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:3
msgid "Yggdrasil"
msgstr ""
@@ -322,6 +154,6 @@ msgstr ""
msgid "Yggdrasil's network interface name"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:58
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:40
msgid "e.g. tcp://0.0.0.0:0 or tcp://[::]:0"
msgstr ""
diff --git a/applications/luci-app-yggdrasil/po/bn_BD/yggdrasil.po b/applications/luci-app-yggdrasil/po/bn_BD/yggdrasil.po
index 801e5ec9d3..a643d942ce 100644
--- a/applications/luci-app-yggdrasil/po/bn_BD/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/bn_BD/yggdrasil.po
@@ -8,51 +8,7 @@ msgstr ""
msgid "Active peers"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:56
-msgid "Address to listen for incoming connections"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:16
-msgid "Allow from direct"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:18
-msgid "Allow from remote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:17
-msgid "Allow network traffic from directly connected peers"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:19
-msgid ""
-"Allow network traffic from remote nodes on the network that you are not "
-"directly peered with"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid ""
-"Allow outbound network traffic regardless of AllowFromDirect or "
-"AllowFromRemote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:14
-msgid ""
-"Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively "
-"allows you to use Yggdrasil to route to, or to bridge other networks, "
-"similar to a VPN tunnel. Tunnelling works between any two nodes and does not "
-"require them to be directly peered."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid "Always allow outbound"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:31
-msgid "Blacklisted public keys"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:17
msgid ""
"By default, nodeinfo contains some defaults including the platform, "
"architecture and Yggdrasil version. These can help when surveying the "
@@ -61,12 +17,19 @@ msgid ""
"specified."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "Enable NodeInfo privacy"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
+msgid ""
+"Configuration for which interfaces multicast peer discovery should be "
+"enabled on. Regex is a regular expression which is matched against an "
+"interface name, and interfaces use the first configuration that they match "
+"gainst. Beacon configures whether or not the node should send link-local "
+"multicast beacons to advertise their presence, while listening for incoming "
+"connections on Port. Listen controls whether or not the node listens for "
+"multicast beacons and opens outgoing connections."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:14
-msgid "Enable session firewall"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
+msgid "Enable NodeInfo privacy"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:11
@@ -90,82 +53,20 @@ msgstr ""
msgid "Grant access to LuCI app yggdrasil"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:26
-msgid "IPv4 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:19
-msgid "IPv4 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-msgid "IPv4 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:20
-msgid "IPv4 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:27
-msgid ""
-"IPv4 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:40
-msgid "IPv6 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:33
-msgid "IPv6 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "IPv6 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:34
-msgid "IPv6 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:41
-msgid ""
-"IPv6 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges (or the Yggdrasil node's IPv6 address/subnet) will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:15
-msgid ""
-"If disabled, network traffic from any node will be allowed. If enabled, the "
-"below rules apply"
-msgstr ""
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:25
msgid "Interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
-msgid "Interface name"
-msgstr ""
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
msgid "Interface peers"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:16
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:19
msgid "Keep this private. When compromised, generate a new keypair and IPv6."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "Link-local TCP port"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:52
+msgid "Link-local port"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:21
@@ -184,11 +85,11 @@ msgid ""
"when you may connect via different interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:33
msgid "Listen addresses"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:34
msgid ""
"Listen addresses for incoming connections. You will need to add listeners in "
"order to accept incoming peerings from non-local nodes. Multicast peer "
@@ -197,35 +98,23 @@ msgid ""
"[::]:0 to listen on all interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
-msgid "MTU size for the interface"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:39
-msgid "Maximum size of all switch queues combined"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:41
-msgid "Multicast interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+msgid "Listen for beacons"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:25
-msgid ""
-"Network traffic is always accepted from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:31
+msgid "MTU size for the interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:32
-msgid ""
-"Network traffic is always rejected from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:44
+msgid "Multicast interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
msgid "NodeInfo"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:30
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:24
msgid ""
"Optional node info. This must be a { \"key\": \"value\", ... } map or set as "
"null. This is entirely optional but, if set, is visible to the whole network "
@@ -237,79 +126,22 @@ msgstr ""
msgid "Peers"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Public encryption key"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:49
+msgid "Regular expression"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:26
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:33
-msgid "Public key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:42
-msgid ""
-"Regular expressions for which interfaces multicast peer discovery should be "
-"enabled on. If none specified, multicast peer discovery is disabled. The "
-"default value is .* which uses all interfaces."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:50
-msgid "Session firewall"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:11
-msgid "Session firewall settings"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:46
-msgid "Set .* to multicast on all interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+msgid "Send beacons"
msgstr ""
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:32
msgid "Settings"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:18
-msgid "Signing private key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:17
-msgid "Signing public key"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:14
msgid "Status"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "Subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
-msgid ""
-"The port number to be used for the link-local TCP listeners for the "
-"configured MulticastInterfaces. This option does not affect "
-"listenersspecified in the Listen option. Unless you plan to firewall link-"
-"localtraffic, it is best to leave this as the default value of 0. This "
-"option cannot currently be changed by reloading config during runtime."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:11
-msgid "Tunnel Routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:59
-msgid "Tunnel routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:24
-msgid "Whitelisted public keys"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:3
msgid "Yggdrasil"
msgstr ""
@@ -322,6 +154,6 @@ msgstr ""
msgid "Yggdrasil's network interface name"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:58
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:40
msgid "e.g. tcp://0.0.0.0:0 or tcp://[::]:0"
msgstr ""
diff --git a/applications/luci-app-yggdrasil/po/ca/yggdrasil.po b/applications/luci-app-yggdrasil/po/ca/yggdrasil.po
index 11e2f79031..d75cdc81d6 100644
--- a/applications/luci-app-yggdrasil/po/ca/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/ca/yggdrasil.po
@@ -14,51 +14,7 @@ msgstr ""
msgid "Active peers"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:56
-msgid "Address to listen for incoming connections"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:16
-msgid "Allow from direct"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:18
-msgid "Allow from remote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:17
-msgid "Allow network traffic from directly connected peers"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:19
-msgid ""
-"Allow network traffic from remote nodes on the network that you are not "
-"directly peered with"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid ""
-"Allow outbound network traffic regardless of AllowFromDirect or "
-"AllowFromRemote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:14
-msgid ""
-"Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively "
-"allows you to use Yggdrasil to route to, or to bridge other networks, "
-"similar to a VPN tunnel. Tunnelling works between any two nodes and does not "
-"require them to be directly peered."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid "Always allow outbound"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:31
-msgid "Blacklisted public keys"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:17
msgid ""
"By default, nodeinfo contains some defaults including the platform, "
"architecture and Yggdrasil version. These can help when surveying the "
@@ -67,12 +23,19 @@ msgid ""
"specified."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "Enable NodeInfo privacy"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
+msgid ""
+"Configuration for which interfaces multicast peer discovery should be "
+"enabled on. Regex is a regular expression which is matched against an "
+"interface name, and interfaces use the first configuration that they match "
+"gainst. Beacon configures whether or not the node should send link-local "
+"multicast beacons to advertise their presence, while listening for incoming "
+"connections on Port. Listen controls whether or not the node listens for "
+"multicast beacons and opens outgoing connections."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:14
-msgid "Enable session firewall"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
+msgid "Enable NodeInfo privacy"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:11
@@ -96,82 +59,20 @@ msgstr ""
msgid "Grant access to LuCI app yggdrasil"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:26
-msgid "IPv4 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:19
-msgid "IPv4 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-msgid "IPv4 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:20
-msgid "IPv4 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:27
-msgid ""
-"IPv4 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:40
-msgid "IPv6 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:33
-msgid "IPv6 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "IPv6 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:34
-msgid "IPv6 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:41
-msgid ""
-"IPv6 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges (or the Yggdrasil node's IPv6 address/subnet) will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:15
-msgid ""
-"If disabled, network traffic from any node will be allowed. If enabled, the "
-"below rules apply"
-msgstr ""
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:25
msgid "Interface"
msgstr "Interfície"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
-msgid "Interface name"
-msgstr ""
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
msgid "Interface peers"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:16
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:19
msgid "Keep this private. When compromised, generate a new keypair and IPv6."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "Link-local TCP port"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:52
+msgid "Link-local port"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:21
@@ -190,11 +91,11 @@ msgid ""
"when you may connect via different interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:33
msgid "Listen addresses"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:34
msgid ""
"Listen addresses for incoming connections. You will need to add listeners in "
"order to accept incoming peerings from non-local nodes. Multicast peer "
@@ -203,35 +104,23 @@ msgid ""
"[::]:0 to listen on all interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
-msgid "MTU size for the interface"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:39
-msgid "Maximum size of all switch queues combined"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:41
-msgid "Multicast interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+msgid "Listen for beacons"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:25
-msgid ""
-"Network traffic is always accepted from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:31
+msgid "MTU size for the interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:32
-msgid ""
-"Network traffic is always rejected from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:44
+msgid "Multicast interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
msgid "NodeInfo"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:30
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:24
msgid ""
"Optional node info. This must be a { \"key\": \"value\", ... } map or set as "
"null. This is entirely optional but, if set, is visible to the whole network "
@@ -243,79 +132,22 @@ msgstr ""
msgid "Peers"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Public encryption key"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:49
+msgid "Regular expression"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:26
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:33
-msgid "Public key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:42
-msgid ""
-"Regular expressions for which interfaces multicast peer discovery should be "
-"enabled on. If none specified, multicast peer discovery is disabled. The "
-"default value is .* which uses all interfaces."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:50
-msgid "Session firewall"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:11
-msgid "Session firewall settings"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:46
-msgid "Set .* to multicast on all interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+msgid "Send beacons"
msgstr ""
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:32
msgid "Settings"
msgstr "Paràmetres"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:18
-msgid "Signing private key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:17
-msgid "Signing public key"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:14
msgid "Status"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "Subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
-msgid ""
-"The port number to be used for the link-local TCP listeners for the "
-"configured MulticastInterfaces. This option does not affect "
-"listenersspecified in the Listen option. Unless you plan to firewall link-"
-"localtraffic, it is best to leave this as the default value of 0. This "
-"option cannot currently be changed by reloading config during runtime."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:11
-msgid "Tunnel Routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:59
-msgid "Tunnel routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:24
-msgid "Whitelisted public keys"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:3
msgid "Yggdrasil"
msgstr ""
@@ -328,6 +160,6 @@ msgstr ""
msgid "Yggdrasil's network interface name"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:58
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:40
msgid "e.g. tcp://0.0.0.0:0 or tcp://[::]:0"
msgstr ""
diff --git a/applications/luci-app-yggdrasil/po/cs/yggdrasil.po b/applications/luci-app-yggdrasil/po/cs/yggdrasil.po
index a6b6296727..4a747cd1a3 100644
--- a/applications/luci-app-yggdrasil/po/cs/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/cs/yggdrasil.po
@@ -14,51 +14,7 @@ msgstr ""
msgid "Active peers"
msgstr "Aktivní peery"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:56
-msgid "Address to listen for incoming connections"
-msgstr "Adresa pro naslouchání příchozích připojení"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:16
-msgid "Allow from direct"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:18
-msgid "Allow from remote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:17
-msgid "Allow network traffic from directly connected peers"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:19
-msgid ""
-"Allow network traffic from remote nodes on the network that you are not "
-"directly peered with"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid ""
-"Allow outbound network traffic regardless of AllowFromDirect or "
-"AllowFromRemote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:14
-msgid ""
-"Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively "
-"allows you to use Yggdrasil to route to, or to bridge other networks, "
-"similar to a VPN tunnel. Tunnelling works between any two nodes and does not "
-"require them to be directly peered."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid "Always allow outbound"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:31
-msgid "Blacklisted public keys"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:17
msgid ""
"By default, nodeinfo contains some defaults including the platform, "
"architecture and Yggdrasil version. These can help when surveying the "
@@ -67,12 +23,19 @@ msgid ""
"specified."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "Enable NodeInfo privacy"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
+msgid ""
+"Configuration for which interfaces multicast peer discovery should be "
+"enabled on. Regex is a regular expression which is matched against an "
+"interface name, and interfaces use the first configuration that they match "
+"gainst. Beacon configures whether or not the node should send link-local "
+"multicast beacons to advertise their presence, while listening for incoming "
+"connections on Port. Listen controls whether or not the node listens for "
+"multicast beacons and opens outgoing connections."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:14
-msgid "Enable session firewall"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
+msgid "Enable NodeInfo privacy"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:11
@@ -96,82 +59,20 @@ msgstr ""
msgid "Grant access to LuCI app yggdrasil"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:26
-msgid "IPv4 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:19
-msgid "IPv4 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-msgid "IPv4 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:20
-msgid "IPv4 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:27
-msgid ""
-"IPv4 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:40
-msgid "IPv6 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:33
-msgid "IPv6 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "IPv6 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:34
-msgid "IPv6 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:41
-msgid ""
-"IPv6 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges (or the Yggdrasil node's IPv6 address/subnet) will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:15
-msgid ""
-"If disabled, network traffic from any node will be allowed. If enabled, the "
-"below rules apply"
-msgstr ""
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:25
msgid "Interface"
msgstr "Rozhraní"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
-msgid "Interface name"
-msgstr ""
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
msgid "Interface peers"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:16
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:19
msgid "Keep this private. When compromised, generate a new keypair and IPv6."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "Link-local TCP port"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:52
+msgid "Link-local port"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:21
@@ -190,11 +91,11 @@ msgid ""
"when you may connect via different interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:33
msgid "Listen addresses"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:34
msgid ""
"Listen addresses for incoming connections. You will need to add listeners in "
"order to accept incoming peerings from non-local nodes. Multicast peer "
@@ -203,35 +104,23 @@ msgid ""
"[::]:0 to listen on all interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
-msgid "MTU size for the interface"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:39
-msgid "Maximum size of all switch queues combined"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:41
-msgid "Multicast interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+msgid "Listen for beacons"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:25
-msgid ""
-"Network traffic is always accepted from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:31
+msgid "MTU size for the interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:32
-msgid ""
-"Network traffic is always rejected from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:44
+msgid "Multicast interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
msgid "NodeInfo"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:30
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:24
msgid ""
"Optional node info. This must be a { \"key\": \"value\", ... } map or set as "
"null. This is entirely optional but, if set, is visible to the whole network "
@@ -243,79 +132,22 @@ msgstr ""
msgid "Peers"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Public encryption key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:26
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:33
-msgid "Public key"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:49
+msgid "Regular expression"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:42
-msgid ""
-"Regular expressions for which interfaces multicast peer discovery should be "
-"enabled on. If none specified, multicast peer discovery is disabled. The "
-"default value is .* which uses all interfaces."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:50
-msgid "Session firewall"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:11
-msgid "Session firewall settings"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:46
-msgid "Set .* to multicast on all interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+msgid "Send beacons"
msgstr ""
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:32
msgid "Settings"
msgstr "Nastavení"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:18
-msgid "Signing private key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:17
-msgid "Signing public key"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:14
msgid "Status"
msgstr "Stav"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "Subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
-msgid ""
-"The port number to be used for the link-local TCP listeners for the "
-"configured MulticastInterfaces. This option does not affect "
-"listenersspecified in the Listen option. Unless you plan to firewall link-"
-"localtraffic, it is best to leave this as the default value of 0. This "
-"option cannot currently be changed by reloading config during runtime."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:11
-msgid "Tunnel Routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:59
-msgid "Tunnel routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:24
-msgid "Whitelisted public keys"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:3
msgid "Yggdrasil"
msgstr ""
@@ -328,6 +160,9 @@ msgstr ""
msgid "Yggdrasil's network interface name"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:58
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:40
msgid "e.g. tcp://0.0.0.0:0 or tcp://[::]:0"
msgstr ""
+
+#~ msgid "Address to listen for incoming connections"
+#~ msgstr "Adresa pro naslouchání příchozích připojení"
diff --git a/applications/luci-app-yggdrasil/po/de/yggdrasil.po b/applications/luci-app-yggdrasil/po/de/yggdrasil.po
index eaf1e4c855..1481b35aaa 100644
--- a/applications/luci-app-yggdrasil/po/de/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/de/yggdrasil.po
@@ -14,59 +14,7 @@ msgstr ""
msgid "Active peers"
msgstr "Aktive Peers"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:56
-msgid "Address to listen for incoming connections"
-msgstr "Adresse für eingehende Verbindungen"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:16
-msgid "Allow from direct"
-msgstr "Erlaube direkten Zugriff"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:18
-msgid "Allow from remote"
-msgstr "Remote-Zugriff erlauben"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:17
-msgid "Allow network traffic from directly connected peers"
-msgstr "Erlaube Netzwerkverkehr von direkt verbundenen Teilnehmern"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:19
-msgid ""
-"Allow network traffic from remote nodes on the network that you are not "
-"directly peered with"
-msgstr ""
-"Erlaube Netzwerkverkehr mit entfernten Teilnehmern, die nicht direkt "
-"angebunden sind"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid ""
-"Allow outbound network traffic regardless of AllowFromDirect or "
-"AllowFromRemote"
-msgstr ""
-"Erlaube ausgehenden Verkehr unabhängig von AllowFromDirect oder "
-"AllowFromRemote"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:14
-msgid ""
-"Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively "
-"allows you to use Yggdrasil to route to, or to bridge other networks, "
-"similar to a VPN tunnel. Tunnelling works between any two nodes and does not "
-"require them to be directly peered."
-msgstr ""
-"Erlaube das Tunneln von nicht-Yggdrasil-Netzwerkverkehr. Dies ermöglicht "
-"Yggdrasil als Netzrouter oder -Brücke ähnlich zu einem VPN-Tunnel zu "
-"agieren. Tunneln funktioniert zwischen allen Knoten, unabhängig ob diese "
-"direkt verbunden sind."
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid "Always allow outbound"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:31
-msgid "Blacklisted public keys"
-msgstr "Public-Key-Blacklist"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:17
msgid ""
"By default, nodeinfo contains some defaults including the platform, "
"architecture and Yggdrasil version. These can help when surveying the "
@@ -80,14 +28,21 @@ msgstr ""
"verhindert dies, indem nur in \"NodeInfo\" spezifierte Elemente übermittelt "
"werden."
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
+msgid ""
+"Configuration for which interfaces multicast peer discovery should be "
+"enabled on. Regex is a regular expression which is matched against an "
+"interface name, and interfaces use the first configuration that they match "
+"gainst. Beacon configures whether or not the node should send link-local "
+"multicast beacons to advertise their presence, while listening for incoming "
+"connections on Port. Listen controls whether or not the node listens for "
+"multicast beacons and opens outgoing connections."
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
msgid "Enable NodeInfo privacy"
msgstr "Aktiviere NodeInfo-Privacy"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:14
-msgid "Enable session firewall"
-msgstr "Aktiviere Session-Firewall"
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:11
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:41
msgid "Encryption keys"
@@ -109,83 +64,21 @@ msgstr "Allgemeine Einstellungen"
msgid "Grant access to LuCI app yggdrasil"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:26
-msgid "IPv4 local subnet"
-msgstr "IPv4 lokales Subnetz"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:19
-msgid "IPv4 remote subnet"
-msgstr "IPv4 entferntes Subnetz"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-msgid "IPv4 subnet"
-msgstr "IPv4-Subnetz"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:20
-msgid "IPv4 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:27
-msgid ""
-"IPv4 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:40
-msgid "IPv6 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:33
-msgid "IPv6 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "IPv6 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:34
-msgid "IPv6 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:41
-msgid ""
-"IPv6 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges (or the Yggdrasil node's IPv6 address/subnet) will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:15
-msgid ""
-"If disabled, network traffic from any node will be allowed. If enabled, the "
-"below rules apply"
-msgstr ""
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:25
msgid "Interface"
msgstr "Schnittstelle"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
-msgid "Interface name"
-msgstr "Schnittstellenname"
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
msgid "Interface peers"
msgstr "Schnittstellen-Gegenstellen"
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:16
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:19
msgid "Keep this private. When compromised, generate a new keypair and IPv6."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Key"
-msgstr "Schlüssel"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "Link-local TCP port"
-msgstr "Link-local TCP-Port"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:52
+msgid "Link-local port"
+msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:21
msgid ""
@@ -203,11 +96,11 @@ msgid ""
"when you may connect via different interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:33
msgid "Listen addresses"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:34
msgid ""
"Listen addresses for incoming connections. You will need to add listeners in "
"order to accept incoming peerings from non-local nodes. Multicast peer "
@@ -216,35 +109,23 @@ msgid ""
"[::]:0 to listen on all interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
-msgid "MTU size for the interface"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:39
-msgid "Maximum size of all switch queues combined"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:41
-msgid "Multicast interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+msgid "Listen for beacons"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:25
-msgid ""
-"Network traffic is always accepted from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:31
+msgid "MTU size for the interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:32
-msgid ""
-"Network traffic is always rejected from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:44
+msgid "Multicast interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
msgid "NodeInfo"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:30
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:24
msgid ""
"Optional node info. This must be a { \"key\": \"value\", ... } map or set as "
"null. This is entirely optional but, if set, is visible to the whole network "
@@ -256,79 +137,22 @@ msgstr ""
msgid "Peers"
msgstr "Verbindungspartner"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Public encryption key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:26
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:33
-msgid "Public key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:42
-msgid ""
-"Regular expressions for which interfaces multicast peer discovery should be "
-"enabled on. If none specified, multicast peer discovery is disabled. The "
-"default value is .* which uses all interfaces."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:50
-msgid "Session firewall"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:49
+msgid "Regular expression"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:11
-msgid "Session firewall settings"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:46
-msgid "Set .* to multicast on all interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+msgid "Send beacons"
msgstr ""
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:32
msgid "Settings"
msgstr "Einstellungen"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:18
-msgid "Signing private key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:17
-msgid "Signing public key"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:14
msgid "Status"
msgstr "Status"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "Subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
-msgid ""
-"The port number to be used for the link-local TCP listeners for the "
-"configured MulticastInterfaces. This option does not affect "
-"listenersspecified in the Listen option. Unless you plan to firewall link-"
-"localtraffic, it is best to leave this as the default value of 0. This "
-"option cannot currently be changed by reloading config during runtime."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:11
-msgid "Tunnel Routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:59
-msgid "Tunnel routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:24
-msgid "Whitelisted public keys"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:3
msgid "Yggdrasil"
msgstr ""
@@ -341,6 +165,67 @@ msgstr ""
msgid "Yggdrasil's network interface name"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:58
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:40
msgid "e.g. tcp://0.0.0.0:0 or tcp://[::]:0"
msgstr ""
+
+#~ msgid "Address to listen for incoming connections"
+#~ msgstr "Adresse für eingehende Verbindungen"
+
+#~ msgid "Allow from direct"
+#~ msgstr "Erlaube direkten Zugriff"
+
+#~ msgid "Allow from remote"
+#~ msgstr "Remote-Zugriff erlauben"
+
+#~ msgid "Allow network traffic from directly connected peers"
+#~ msgstr "Erlaube Netzwerkverkehr von direkt verbundenen Teilnehmern"
+
+#~ msgid ""
+#~ "Allow network traffic from remote nodes on the network that you are not "
+#~ "directly peered with"
+#~ msgstr ""
+#~ "Erlaube Netzwerkverkehr mit entfernten Teilnehmern, die nicht direkt "
+#~ "angebunden sind"
+
+#~ msgid ""
+#~ "Allow outbound network traffic regardless of AllowFromDirect or "
+#~ "AllowFromRemote"
+#~ msgstr ""
+#~ "Erlaube ausgehenden Verkehr unabhängig von AllowFromDirect oder "
+#~ "AllowFromRemote"
+
+#~ msgid ""
+#~ "Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively "
+#~ "allows you to use Yggdrasil to route to, or to bridge other networks, "
+#~ "similar to a VPN tunnel. Tunnelling works between any two nodes and does "
+#~ "not require them to be directly peered."
+#~ msgstr ""
+#~ "Erlaube das Tunneln von nicht-Yggdrasil-Netzwerkverkehr. Dies ermöglicht "
+#~ "Yggdrasil als Netzrouter oder -Brücke ähnlich zu einem VPN-Tunnel zu "
+#~ "agieren. Tunneln funktioniert zwischen allen Knoten, unabhängig ob diese "
+#~ "direkt verbunden sind."
+
+#~ msgid "Blacklisted public keys"
+#~ msgstr "Public-Key-Blacklist"
+
+#~ msgid "Enable session firewall"
+#~ msgstr "Aktiviere Session-Firewall"
+
+#~ msgid "IPv4 local subnet"
+#~ msgstr "IPv4 lokales Subnetz"
+
+#~ msgid "IPv4 remote subnet"
+#~ msgstr "IPv4 entferntes Subnetz"
+
+#~ msgid "IPv4 subnet"
+#~ msgstr "IPv4-Subnetz"
+
+#~ msgid "Interface name"
+#~ msgstr "Schnittstellenname"
+
+#~ msgid "Key"
+#~ msgstr "Schlüssel"
+
+#~ msgid "Link-local TCP port"
+#~ msgstr "Link-local TCP-Port"
diff --git a/applications/luci-app-yggdrasil/po/el/yggdrasil.po b/applications/luci-app-yggdrasil/po/el/yggdrasil.po
index 5296665ca1..c8ffa00547 100644
--- a/applications/luci-app-yggdrasil/po/el/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/el/yggdrasil.po
@@ -14,51 +14,7 @@ msgstr ""
msgid "Active peers"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:56
-msgid "Address to listen for incoming connections"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:16
-msgid "Allow from direct"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:18
-msgid "Allow from remote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:17
-msgid "Allow network traffic from directly connected peers"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:19
-msgid ""
-"Allow network traffic from remote nodes on the network that you are not "
-"directly peered with"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid ""
-"Allow outbound network traffic regardless of AllowFromDirect or "
-"AllowFromRemote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:14
-msgid ""
-"Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively "
-"allows you to use Yggdrasil to route to, or to bridge other networks, "
-"similar to a VPN tunnel. Tunnelling works between any two nodes and does not "
-"require them to be directly peered."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid "Always allow outbound"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:31
-msgid "Blacklisted public keys"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:17
msgid ""
"By default, nodeinfo contains some defaults including the platform, "
"architecture and Yggdrasil version. These can help when surveying the "
@@ -67,12 +23,19 @@ msgid ""
"specified."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "Enable NodeInfo privacy"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
+msgid ""
+"Configuration for which interfaces multicast peer discovery should be "
+"enabled on. Regex is a regular expression which is matched against an "
+"interface name, and interfaces use the first configuration that they match "
+"gainst. Beacon configures whether or not the node should send link-local "
+"multicast beacons to advertise their presence, while listening for incoming "
+"connections on Port. Listen controls whether or not the node listens for "
+"multicast beacons and opens outgoing connections."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:14
-msgid "Enable session firewall"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
+msgid "Enable NodeInfo privacy"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:11
@@ -96,82 +59,20 @@ msgstr ""
msgid "Grant access to LuCI app yggdrasil"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:26
-msgid "IPv4 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:19
-msgid "IPv4 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-msgid "IPv4 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:20
-msgid "IPv4 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:27
-msgid ""
-"IPv4 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:40
-msgid "IPv6 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:33
-msgid "IPv6 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "IPv6 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:34
-msgid "IPv6 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:41
-msgid ""
-"IPv6 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges (or the Yggdrasil node's IPv6 address/subnet) will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:15
-msgid ""
-"If disabled, network traffic from any node will be allowed. If enabled, the "
-"below rules apply"
-msgstr ""
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:25
msgid "Interface"
msgstr "Διεπαφή"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
-msgid "Interface name"
-msgstr "Όνομα διεπαφής (Interface)"
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
msgid "Interface peers"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:16
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:19
msgid "Keep this private. When compromised, generate a new keypair and IPv6."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "Link-local TCP port"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:52
+msgid "Link-local port"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:21
@@ -190,11 +91,11 @@ msgid ""
"when you may connect via different interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:33
msgid "Listen addresses"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:34
msgid ""
"Listen addresses for incoming connections. You will need to add listeners in "
"order to accept incoming peerings from non-local nodes. Multicast peer "
@@ -203,35 +104,23 @@ msgid ""
"[::]:0 to listen on all interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
-msgid "MTU size for the interface"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:39
-msgid "Maximum size of all switch queues combined"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:41
-msgid "Multicast interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+msgid "Listen for beacons"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:25
-msgid ""
-"Network traffic is always accepted from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:31
+msgid "MTU size for the interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:32
-msgid ""
-"Network traffic is always rejected from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:44
+msgid "Multicast interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
msgid "NodeInfo"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:30
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:24
msgid ""
"Optional node info. This must be a { \"key\": \"value\", ... } map or set as "
"null. This is entirely optional but, if set, is visible to the whole network "
@@ -243,79 +132,22 @@ msgstr ""
msgid "Peers"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Public encryption key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:26
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:33
-msgid "Public key"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:49
+msgid "Regular expression"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:42
-msgid ""
-"Regular expressions for which interfaces multicast peer discovery should be "
-"enabled on. If none specified, multicast peer discovery is disabled. The "
-"default value is .* which uses all interfaces."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:50
-msgid "Session firewall"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:11
-msgid "Session firewall settings"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:46
-msgid "Set .* to multicast on all interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+msgid "Send beacons"
msgstr ""
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:32
msgid "Settings"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:18
-msgid "Signing private key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:17
-msgid "Signing public key"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:14
msgid "Status"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "Subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
-msgid ""
-"The port number to be used for the link-local TCP listeners for the "
-"configured MulticastInterfaces. This option does not affect "
-"listenersspecified in the Listen option. Unless you plan to firewall link-"
-"localtraffic, it is best to leave this as the default value of 0. This "
-"option cannot currently be changed by reloading config during runtime."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:11
-msgid "Tunnel Routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:59
-msgid "Tunnel routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:24
-msgid "Whitelisted public keys"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:3
msgid "Yggdrasil"
msgstr ""
@@ -328,6 +160,9 @@ msgstr ""
msgid "Yggdrasil's network interface name"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:58
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:40
msgid "e.g. tcp://0.0.0.0:0 or tcp://[::]:0"
msgstr ""
+
+#~ msgid "Interface name"
+#~ msgstr "Όνομα διεπαφής (Interface)"
diff --git a/applications/luci-app-yggdrasil/po/en/yggdrasil.po b/applications/luci-app-yggdrasil/po/en/yggdrasil.po
index 3955530dfb..79eba43851 100644
--- a/applications/luci-app-yggdrasil/po/en/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/en/yggdrasil.po
@@ -8,51 +8,7 @@ msgstr ""
msgid "Active peers"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:56
-msgid "Address to listen for incoming connections"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:16
-msgid "Allow from direct"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:18
-msgid "Allow from remote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:17
-msgid "Allow network traffic from directly connected peers"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:19
-msgid ""
-"Allow network traffic from remote nodes on the network that you are not "
-"directly peered with"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid ""
-"Allow outbound network traffic regardless of AllowFromDirect or "
-"AllowFromRemote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:14
-msgid ""
-"Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively "
-"allows you to use Yggdrasil to route to, or to bridge other networks, "
-"similar to a VPN tunnel. Tunnelling works between any two nodes and does not "
-"require them to be directly peered."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid "Always allow outbound"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:31
-msgid "Blacklisted public keys"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:17
msgid ""
"By default, nodeinfo contains some defaults including the platform, "
"architecture and Yggdrasil version. These can help when surveying the "
@@ -61,12 +17,19 @@ msgid ""
"specified."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "Enable NodeInfo privacy"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
+msgid ""
+"Configuration for which interfaces multicast peer discovery should be "
+"enabled on. Regex is a regular expression which is matched against an "
+"interface name, and interfaces use the first configuration that they match "
+"gainst. Beacon configures whether or not the node should send link-local "
+"multicast beacons to advertise their presence, while listening for incoming "
+"connections on Port. Listen controls whether or not the node listens for "
+"multicast beacons and opens outgoing connections."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:14
-msgid "Enable session firewall"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
+msgid "Enable NodeInfo privacy"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:11
@@ -90,82 +53,20 @@ msgstr ""
msgid "Grant access to LuCI app yggdrasil"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:26
-msgid "IPv4 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:19
-msgid "IPv4 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-msgid "IPv4 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:20
-msgid "IPv4 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:27
-msgid ""
-"IPv4 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:40
-msgid "IPv6 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:33
-msgid "IPv6 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "IPv6 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:34
-msgid "IPv6 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:41
-msgid ""
-"IPv6 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges (or the Yggdrasil node's IPv6 address/subnet) will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:15
-msgid ""
-"If disabled, network traffic from any node will be allowed. If enabled, the "
-"below rules apply"
-msgstr ""
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:25
msgid "Interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
-msgid "Interface name"
-msgstr ""
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
msgid "Interface peers"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:16
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:19
msgid "Keep this private. When compromised, generate a new keypair and IPv6."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "Link-local TCP port"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:52
+msgid "Link-local port"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:21
@@ -184,11 +85,11 @@ msgid ""
"when you may connect via different interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:33
msgid "Listen addresses"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:34
msgid ""
"Listen addresses for incoming connections. You will need to add listeners in "
"order to accept incoming peerings from non-local nodes. Multicast peer "
@@ -197,35 +98,23 @@ msgid ""
"[::]:0 to listen on all interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
-msgid "MTU size for the interface"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:39
-msgid "Maximum size of all switch queues combined"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:41
-msgid "Multicast interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+msgid "Listen for beacons"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:25
-msgid ""
-"Network traffic is always accepted from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:31
+msgid "MTU size for the interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:32
-msgid ""
-"Network traffic is always rejected from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:44
+msgid "Multicast interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
msgid "NodeInfo"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:30
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:24
msgid ""
"Optional node info. This must be a { \"key\": \"value\", ... } map or set as "
"null. This is entirely optional but, if set, is visible to the whole network "
@@ -237,79 +126,22 @@ msgstr ""
msgid "Peers"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Public encryption key"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:49
+msgid "Regular expression"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:26
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:33
-msgid "Public key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:42
-msgid ""
-"Regular expressions for which interfaces multicast peer discovery should be "
-"enabled on. If none specified, multicast peer discovery is disabled. The "
-"default value is .* which uses all interfaces."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:50
-msgid "Session firewall"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:11
-msgid "Session firewall settings"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:46
-msgid "Set .* to multicast on all interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+msgid "Send beacons"
msgstr ""
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:32
msgid "Settings"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:18
-msgid "Signing private key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:17
-msgid "Signing public key"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:14
msgid "Status"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "Subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
-msgid ""
-"The port number to be used for the link-local TCP listeners for the "
-"configured MulticastInterfaces. This option does not affect "
-"listenersspecified in the Listen option. Unless you plan to firewall link-"
-"localtraffic, it is best to leave this as the default value of 0. This "
-"option cannot currently be changed by reloading config during runtime."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:11
-msgid "Tunnel Routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:59
-msgid "Tunnel routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:24
-msgid "Whitelisted public keys"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:3
msgid "Yggdrasil"
msgstr ""
@@ -322,6 +154,6 @@ msgstr ""
msgid "Yggdrasil's network interface name"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:58
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:40
msgid "e.g. tcp://0.0.0.0:0 or tcp://[::]:0"
msgstr ""
diff --git a/applications/luci-app-yggdrasil/po/es/yggdrasil.po b/applications/luci-app-yggdrasil/po/es/yggdrasil.po
index 916a8234e5..7395d4e0ef 100644
--- a/applications/luci-app-yggdrasil/po/es/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/es/yggdrasil.po
@@ -17,59 +17,7 @@ msgstr ""
msgid "Active peers"
msgstr "Pares activos"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:56
-msgid "Address to listen for incoming connections"
-msgstr "Dirección para escuchar las conexiones entrantes"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:16
-msgid "Allow from direct"
-msgstr "Permitir desde directo"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:18
-msgid "Allow from remote"
-msgstr "Permitir desde remoto"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:17
-msgid "Allow network traffic from directly connected peers"
-msgstr "Permitir tráfico de red de pares conectados directamente"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:19
-msgid ""
-"Allow network traffic from remote nodes on the network that you are not "
-"directly peered with"
-msgstr ""
-"Permita el tráfico de red desde nodos remotos en la red con los que no está "
-"vinculado directamente"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid ""
-"Allow outbound network traffic regardless of AllowFromDirect or "
-"AllowFromRemote"
-msgstr ""
-"Permitir tráfico de red saliente independientemente de AllowFromDirect o "
-"AllowFromRemote"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:14
-msgid ""
-"Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively "
-"allows you to use Yggdrasil to route to, or to bridge other networks, "
-"similar to a VPN tunnel. Tunnelling works between any two nodes and does not "
-"require them to be directly peered."
-msgstr ""
-"Permitir el tráfico de túnel que no sea Yggdrasil sobre Yggdrasil. Esto "
-"efectivamente le permite usar Yggdrasil para enrutar o conectar otras redes, "
-"de forma similar a un túnel VPN. La tunelización funciona entre dos nodos y "
-"no requiere que se asocien directamente."
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid "Always allow outbound"
-msgstr "Permitir siempre saliente"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:31
-msgid "Blacklisted public keys"
-msgstr "Claves públicas en la lista negra"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:17
msgid ""
"By default, nodeinfo contains some defaults including the platform, "
"architecture and Yggdrasil version. These can help when surveying the "
@@ -84,14 +32,21 @@ msgstr ""
"que sólo los elementos especificados en \"NodeInfo\" se envían de regreso si "
"se especifica."
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
+msgid ""
+"Configuration for which interfaces multicast peer discovery should be "
+"enabled on. Regex is a regular expression which is matched against an "
+"interface name, and interfaces use the first configuration that they match "
+"gainst. Beacon configures whether or not the node should send link-local "
+"multicast beacons to advertise their presence, while listening for incoming "
+"connections on Port. Listen controls whether or not the node listens for "
+"multicast beacons and opens outgoing connections."
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
msgid "Enable NodeInfo privacy"
msgstr "Activar privacidad de NodeInfo"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:14
-msgid "Enable session firewall"
-msgstr "Activar firewall de sesión"
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:11
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:41
msgid "Encryption keys"
@@ -113,94 +68,23 @@ msgstr "Configuración general"
msgid "Grant access to LuCI app yggdrasil"
msgstr "Conceder acceso a la aplicación yggdrasil de LuCI"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:26
-msgid "IPv4 local subnet"
-msgstr "Subred local IPv4"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:19
-msgid "IPv4 remote subnet"
-msgstr "Subred remota IPv4"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-msgid "IPv4 subnet"
-msgstr "Subred IPv4"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:20
-msgid "IPv4 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-"Subredes IPv4 que pertenecen a nodos remotos, asignados al público del nodo"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:27
-msgid ""
-"IPv4 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges will be tunnelled."
-msgstr ""
-"Subredes IPv4 que pertenecen al final de los túneles de este nodo. Solo el "
-"tráfico de estos rangos será tunelizado."
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:40
-msgid "IPv6 local subnet"
-msgstr "Subred local IPv6"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:33
-msgid "IPv6 remote subnet"
-msgstr "Subred remota IPv6"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "IPv6 subnet"
-msgstr "Subred IPv6"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:34
-msgid "IPv6 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-"Subredes IPv6 que pertenecen a nodos remotos, asignados al público del nodo"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:41
-msgid ""
-"IPv6 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges (or the Yggdrasil node's IPv6 address/subnet) will be tunnelled."
-msgstr ""
-"Subredes IPv6 que pertenecen al extremo de los túneles de este nodo. Solo se "
-"canalizará el tráfico de estos rangos (o la dirección/subred IPv6 del nodo "
-"Yggdrasil)."
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:15
-msgid ""
-"If disabled, network traffic from any node will be allowed. If enabled, the "
-"below rules apply"
-msgstr ""
-"Si está desactivado, se permitirá el tráfico de red desde cualquier nodo. Si "
-"está activado, se aplican las siguientes reglas"
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:25
msgid "Interface"
msgstr "Interfaz"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
-msgid "Interface name"
-msgstr "Nombre de interfaz"
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
msgid "Interface peers"
msgstr "Interfaz de pares"
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:16
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:19
msgid "Keep this private. When compromised, generate a new keypair and IPv6."
msgstr ""
"Mantén esto en privado. Cuando esté comprometido, genere un nuevo par de "
"claves e IPv6."
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Key"
-msgstr "Clave"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "Link-local TCP port"
-msgstr "Puerto TCP local de enlace"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:52
+msgid "Link-local port"
+msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:21
msgid ""
@@ -227,11 +111,11 @@ msgstr ""
"debe usar esta sección cuando pueda conectarse a través de diferentes "
"interfaces."
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:33
msgid "Listen addresses"
msgstr "Escuchar direcciones"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:34
msgid ""
"Listen addresses for incoming connections. You will need to add listeners in "
"order to accept incoming peerings from non-local nodes. Multicast peer "
@@ -245,39 +129,23 @@ msgstr ""
"aquí. Cada escucha debe especificarse en formato URI como se indica arriba, "
"p.e. tcp://0.0.0.0:0 o tcp://[::]:0 para escuchar en todas las interfaces."
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+msgid "Listen for beacons"
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:31
msgid "MTU size for the interface"
msgstr "Tamaño de MTU para la interfaz"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:39
-msgid "Maximum size of all switch queues combined"
-msgstr "Tamaño máximo de todas las colas de conmutación combinadas"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:41
-msgid "Multicast interfaces"
-msgstr "Interfaces de multidifusión"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:25
-msgid ""
-"Network traffic is always accepted from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:44
+msgid "Multicast interface"
msgstr ""
-"El tráfico de red siempre se acepta de esos pares, independientemente de "
-"AllowFromDirect o AllowFromRemote"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:32
-msgid ""
-"Network traffic is always rejected from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
-msgstr ""
-"El tráfico de red siempre se rechaza de esos pares, independientemente de "
-"AllowFromDirect o AllowFromRemote"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
msgid "NodeInfo"
msgstr "NodeInfo"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:30
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:24
msgid ""
"Optional node info. This must be a { \"key\": \"value\", ... } map or set as "
"null. This is entirely optional but, if set, is visible to the whole network "
@@ -292,89 +160,22 @@ msgstr ""
msgid "Peers"
msgstr "Pares"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Public encryption key"
-msgstr "Clave de encriptación pública"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:26
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:33
-msgid "Public key"
-msgstr "Clave pública"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:42
-msgid ""
-"Regular expressions for which interfaces multicast peer discovery should be "
-"enabled on. If none specified, multicast peer discovery is disabled. The "
-"default value is .* which uses all interfaces."
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:49
+msgid "Regular expression"
msgstr ""
-"Expresiones regulares para las cuales se debe activar el descubrimiento de "
-"pares de multidifusión de interfaces. Si no se especifica ninguno, el "
-"descubrimiento de pares de multidifusión estará desactivado. El valor "
-"predeterminado es.* que usa todas las interfaces."
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:50
-msgid "Session firewall"
-msgstr "Firewall de sesión"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:11
-msgid "Session firewall settings"
-msgstr "Configuración de firewall de sesión"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:46
-msgid "Set .* to multicast on all interfaces"
-msgstr "Establecer .* para la multidifusión en todas las interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+msgid "Send beacons"
+msgstr ""
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:32
msgid "Settings"
msgstr "Configuraciones"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:18
-msgid "Signing private key"
-msgstr "Firma de clave privada"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:17
-msgid "Signing public key"
-msgstr "Firma de clave pública"
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:14
msgid "Status"
msgstr "Estado"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "Subnet"
-msgstr "Subred"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
-msgid ""
-"The port number to be used for the link-local TCP listeners for the "
-"configured MulticastInterfaces. This option does not affect "
-"listenersspecified in the Listen option. Unless you plan to firewall link-"
-"localtraffic, it is best to leave this as the default value of 0. This "
-"option cannot currently be changed by reloading config during runtime."
-msgstr ""
-"El número de puerto que se utilizará para las escuchas TCP locales de enlace "
-"para las interfaces de multidifusión configuradas. Esta opción no afecta a "
-"los oyentes especificados en la opción Escuchar. A menos que planee firewall "
-"link-localtraffic, es mejor dejarlo como el valor predeterminado de 0. Esta "
-"opción no se puede cambiar actualmente al volver a cargar la configuración "
-"durante el tiempo de ejecución."
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:11
-msgid "Tunnel Routing"
-msgstr "Enrutamiento de túnel"
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:59
-msgid "Tunnel routing"
-msgstr "Enrutamiento de túnel"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:24
-msgid "Whitelisted public keys"
-msgstr "Claves públicas en la lista blanca"
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:3
msgid "Yggdrasil"
msgstr "Yggdrasil"
@@ -387,10 +188,193 @@ msgstr "Estado del nodo Yggdrasil"
msgid "Yggdrasil's network interface name"
msgstr "Nombre de la interfaz de red de Yggdrasil"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:58
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:40
msgid "e.g. tcp://0.0.0.0:0 or tcp://[::]:0"
msgstr "p.ej. tcp://0.0.0.0:0 o tcp://[::]:0"
+#~ msgid "Address to listen for incoming connections"
+#~ msgstr "Dirección para escuchar las conexiones entrantes"
+
+#~ msgid "Allow from direct"
+#~ msgstr "Permitir desde directo"
+
+#~ msgid "Allow from remote"
+#~ msgstr "Permitir desde remoto"
+
+#~ msgid "Allow network traffic from directly connected peers"
+#~ msgstr "Permitir tráfico de red de pares conectados directamente"
+
+#~ msgid ""
+#~ "Allow network traffic from remote nodes on the network that you are not "
+#~ "directly peered with"
+#~ msgstr ""
+#~ "Permita el tráfico de red desde nodos remotos en la red con los que no "
+#~ "está vinculado directamente"
+
+#~ msgid ""
+#~ "Allow outbound network traffic regardless of AllowFromDirect or "
+#~ "AllowFromRemote"
+#~ msgstr ""
+#~ "Permitir tráfico de red saliente independientemente de AllowFromDirect o "
+#~ "AllowFromRemote"
+
+#~ msgid ""
+#~ "Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively "
+#~ "allows you to use Yggdrasil to route to, or to bridge other networks, "
+#~ "similar to a VPN tunnel. Tunnelling works between any two nodes and does "
+#~ "not require them to be directly peered."
+#~ msgstr ""
+#~ "Permitir el tráfico de túnel que no sea Yggdrasil sobre Yggdrasil. Esto "
+#~ "efectivamente le permite usar Yggdrasil para enrutar o conectar otras "
+#~ "redes, de forma similar a un túnel VPN. La tunelización funciona entre "
+#~ "dos nodos y no requiere que se asocien directamente."
+
+#~ msgid "Always allow outbound"
+#~ msgstr "Permitir siempre saliente"
+
+#~ msgid "Blacklisted public keys"
+#~ msgstr "Claves públicas en la lista negra"
+
+#~ msgid "Enable session firewall"
+#~ msgstr "Activar firewall de sesión"
+
+#~ msgid "IPv4 local subnet"
+#~ msgstr "Subred local IPv4"
+
+#~ msgid "IPv4 remote subnet"
+#~ msgstr "Subred remota IPv4"
+
+#~ msgid "IPv4 subnet"
+#~ msgstr "Subred IPv4"
+
+#~ msgid "IPv4 subnets belonging to remote nodes, mapped to the node's public"
+#~ msgstr ""
+#~ "Subredes IPv4 que pertenecen a nodos remotos, asignados al público del "
+#~ "nodo"
+
+#~ msgid ""
+#~ "IPv4 subnets belonging to this node's end of the tunnels. Only traffic "
+#~ "from these ranges will be tunnelled."
+#~ msgstr ""
+#~ "Subredes IPv4 que pertenecen al final de los túneles de este nodo. Solo "
+#~ "el tráfico de estos rangos será tunelizado."
+
+#~ msgid "IPv6 local subnet"
+#~ msgstr "Subred local IPv6"
+
+#~ msgid "IPv6 remote subnet"
+#~ msgstr "Subred remota IPv6"
+
+#~ msgid "IPv6 subnet"
+#~ msgstr "Subred IPv6"
+
+#~ msgid "IPv6 subnets belonging to remote nodes, mapped to the node's public"
+#~ msgstr ""
+#~ "Subredes IPv6 que pertenecen a nodos remotos, asignados al público del "
+#~ "nodo"
+
+#~ msgid ""
+#~ "IPv6 subnets belonging to this node's end of the tunnels. Only traffic "
+#~ "from these ranges (or the Yggdrasil node's IPv6 address/subnet) will be "
+#~ "tunnelled."
+#~ msgstr ""
+#~ "Subredes IPv6 que pertenecen al extremo de los túneles de este nodo. Solo "
+#~ "se canalizará el tráfico de estos rangos (o la dirección/subred IPv6 del "
+#~ "nodo Yggdrasil)."
+
+#~ msgid ""
+#~ "If disabled, network traffic from any node will be allowed. If enabled, "
+#~ "the below rules apply"
+#~ msgstr ""
+#~ "Si está desactivado, se permitirá el tráfico de red desde cualquier nodo. "
+#~ "Si está activado, se aplican las siguientes reglas"
+
+#~ msgid "Interface name"
+#~ msgstr "Nombre de interfaz"
+
+#~ msgid "Key"
+#~ msgstr "Clave"
+
+#~ msgid "Link-local TCP port"
+#~ msgstr "Puerto TCP local de enlace"
+
+#~ msgid "Maximum size of all switch queues combined"
+#~ msgstr "Tamaño máximo de todas las colas de conmutación combinadas"
+
+#~ msgid "Multicast interfaces"
+#~ msgstr "Interfaces de multidifusión"
+
+#~ msgid ""
+#~ "Network traffic is always accepted from those peers, regardless of "
+#~ "AllowFromDirect or AllowFromRemote"
+#~ msgstr ""
+#~ "El tráfico de red siempre se acepta de esos pares, independientemente de "
+#~ "AllowFromDirect o AllowFromRemote"
+
+#~ msgid ""
+#~ "Network traffic is always rejected from those peers, regardless of "
+#~ "AllowFromDirect or AllowFromRemote"
+#~ msgstr ""
+#~ "El tráfico de red siempre se rechaza de esos pares, independientemente de "
+#~ "AllowFromDirect o AllowFromRemote"
+
+#~ msgid "Public encryption key"
+#~ msgstr "Clave de encriptación pública"
+
+#~ msgid "Public key"
+#~ msgstr "Clave pública"
+
+#~ msgid ""
+#~ "Regular expressions for which interfaces multicast peer discovery should "
+#~ "be enabled on. If none specified, multicast peer discovery is disabled. "
+#~ "The default value is .* which uses all interfaces."
+#~ msgstr ""
+#~ "Expresiones regulares para las cuales se debe activar el descubrimiento "
+#~ "de pares de multidifusión de interfaces. Si no se especifica ninguno, el "
+#~ "descubrimiento de pares de multidifusión estará desactivado. El valor "
+#~ "predeterminado es.* que usa todas las interfaces."
+
+#~ msgid "Session firewall"
+#~ msgstr "Firewall de sesión"
+
+#~ msgid "Session firewall settings"
+#~ msgstr "Configuración de firewall de sesión"
+
+#~ msgid "Set .* to multicast on all interfaces"
+#~ msgstr "Establecer .* para la multidifusión en todas las interfaces"
+
+#~ msgid "Signing private key"
+#~ msgstr "Firma de clave privada"
+
+#~ msgid "Signing public key"
+#~ msgstr "Firma de clave pública"
+
+#~ msgid "Subnet"
+#~ msgstr "Subred"
+
+#~ msgid ""
+#~ "The port number to be used for the link-local TCP listeners for the "
+#~ "configured MulticastInterfaces. This option does not affect "
+#~ "listenersspecified in the Listen option. Unless you plan to firewall link-"
+#~ "localtraffic, it is best to leave this as the default value of 0. This "
+#~ "option cannot currently be changed by reloading config during runtime."
+#~ msgstr ""
+#~ "El número de puerto que se utilizará para las escuchas TCP locales de "
+#~ "enlace para las interfaces de multidifusión configuradas. Esta opción no "
+#~ "afecta a los oyentes especificados en la opción Escuchar. A menos que "
+#~ "planee firewall link-localtraffic, es mejor dejarlo como el valor "
+#~ "predeterminado de 0. Esta opción no se puede cambiar actualmente al "
+#~ "volver a cargar la configuración durante el tiempo de ejecución."
+
+#~ msgid "Tunnel Routing"
+#~ msgstr "Enrutamiento de túnel"
+
+#~ msgid "Tunnel routing"
+#~ msgstr "Enrutamiento de túnel"
+
+#~ msgid "Whitelisted public keys"
+#~ msgstr "Claves públicas en la lista blanca"
+
#~ msgid "Enable tap mode"
#~ msgstr "Activar modo tap"
diff --git a/applications/luci-app-yggdrasil/po/fi/yggdrasil.po b/applications/luci-app-yggdrasil/po/fi/yggdrasil.po
index 7285e8faf4..4e35bedf8a 100644
--- a/applications/luci-app-yggdrasil/po/fi/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/fi/yggdrasil.po
@@ -14,51 +14,7 @@ msgstr ""
msgid "Active peers"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:56
-msgid "Address to listen for incoming connections"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:16
-msgid "Allow from direct"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:18
-msgid "Allow from remote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:17
-msgid "Allow network traffic from directly connected peers"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:19
-msgid ""
-"Allow network traffic from remote nodes on the network that you are not "
-"directly peered with"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid ""
-"Allow outbound network traffic regardless of AllowFromDirect or "
-"AllowFromRemote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:14
-msgid ""
-"Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively "
-"allows you to use Yggdrasil to route to, or to bridge other networks, "
-"similar to a VPN tunnel. Tunnelling works between any two nodes and does not "
-"require them to be directly peered."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid "Always allow outbound"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:31
-msgid "Blacklisted public keys"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:17
msgid ""
"By default, nodeinfo contains some defaults including the platform, "
"architecture and Yggdrasil version. These can help when surveying the "
@@ -67,12 +23,19 @@ msgid ""
"specified."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "Enable NodeInfo privacy"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
+msgid ""
+"Configuration for which interfaces multicast peer discovery should be "
+"enabled on. Regex is a regular expression which is matched against an "
+"interface name, and interfaces use the first configuration that they match "
+"gainst. Beacon configures whether or not the node should send link-local "
+"multicast beacons to advertise their presence, while listening for incoming "
+"connections on Port. Listen controls whether or not the node listens for "
+"multicast beacons and opens outgoing connections."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:14
-msgid "Enable session firewall"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
+msgid "Enable NodeInfo privacy"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:11
@@ -96,82 +59,20 @@ msgstr ""
msgid "Grant access to LuCI app yggdrasil"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:26
-msgid "IPv4 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:19
-msgid "IPv4 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-msgid "IPv4 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:20
-msgid "IPv4 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:27
-msgid ""
-"IPv4 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:40
-msgid "IPv6 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:33
-msgid "IPv6 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "IPv6 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:34
-msgid "IPv6 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:41
-msgid ""
-"IPv6 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges (or the Yggdrasil node's IPv6 address/subnet) will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:15
-msgid ""
-"If disabled, network traffic from any node will be allowed. If enabled, the "
-"below rules apply"
-msgstr ""
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:25
msgid "Interface"
msgstr "Sovitin"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
-msgid "Interface name"
-msgstr "Sovittimen nimi"
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
msgid "Interface peers"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:16
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:19
msgid "Keep this private. When compromised, generate a new keypair and IPv6."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Key"
-msgstr "Avain"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "Link-local TCP port"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:52
+msgid "Link-local port"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:21
@@ -190,11 +91,11 @@ msgid ""
"when you may connect via different interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:33
msgid "Listen addresses"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:34
msgid ""
"Listen addresses for incoming connections. You will need to add listeners in "
"order to accept incoming peerings from non-local nodes. Multicast peer "
@@ -203,35 +104,23 @@ msgid ""
"[::]:0 to listen on all interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
-msgid "MTU size for the interface"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:39
-msgid "Maximum size of all switch queues combined"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:41
-msgid "Multicast interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+msgid "Listen for beacons"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:25
-msgid ""
-"Network traffic is always accepted from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:31
+msgid "MTU size for the interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:32
-msgid ""
-"Network traffic is always rejected from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:44
+msgid "Multicast interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
msgid "NodeInfo"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:30
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:24
msgid ""
"Optional node info. This must be a { \"key\": \"value\", ... } map or set as "
"null. This is entirely optional but, if set, is visible to the whole network "
@@ -243,79 +132,22 @@ msgstr ""
msgid "Peers"
msgstr "Vertaiskoneet"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Public encryption key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:26
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:33
-msgid "Public key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:42
-msgid ""
-"Regular expressions for which interfaces multicast peer discovery should be "
-"enabled on. If none specified, multicast peer discovery is disabled. The "
-"default value is .* which uses all interfaces."
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:49
+msgid "Regular expression"
msgstr ""
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:50
-msgid "Session firewall"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:11
-msgid "Session firewall settings"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:46
-msgid "Set .* to multicast on all interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+msgid "Send beacons"
msgstr ""
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:32
msgid "Settings"
msgstr "Asetukset"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:18
-msgid "Signing private key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:17
-msgid "Signing public key"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:14
msgid "Status"
msgstr "Tila"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "Subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
-msgid ""
-"The port number to be used for the link-local TCP listeners for the "
-"configured MulticastInterfaces. This option does not affect "
-"listenersspecified in the Listen option. Unless you plan to firewall link-"
-"localtraffic, it is best to leave this as the default value of 0. This "
-"option cannot currently be changed by reloading config during runtime."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:11
-msgid "Tunnel Routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:59
-msgid "Tunnel routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:24
-msgid "Whitelisted public keys"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:3
msgid "Yggdrasil"
msgstr ""
@@ -328,6 +160,12 @@ msgstr ""
msgid "Yggdrasil's network interface name"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:58
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:40
msgid "e.g. tcp://0.0.0.0:0 or tcp://[::]:0"
msgstr ""
+
+#~ msgid "Interface name"
+#~ msgstr "Sovittimen nimi"
+
+#~ msgid "Key"
+#~ msgstr "Avain"
diff --git a/applications/luci-app-yggdrasil/po/fr/yggdrasil.po b/applications/luci-app-yggdrasil/po/fr/yggdrasil.po
index a654c5163c..93160e5dbf 100644
--- a/applications/luci-app-yggdrasil/po/fr/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/fr/yggdrasil.po
@@ -14,51 +14,7 @@ msgstr ""
msgid "Active peers"
msgstr "Pairs actifs"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:56
-msgid "Address to listen for incoming connections"
-msgstr "Adresse pour écouter les connexions entrantes"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:16
-msgid "Allow from direct"
-msgstr "Autoriser directement"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:18
-msgid "Allow from remote"
-msgstr "Autoriser à distance"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:17
-msgid "Allow network traffic from directly connected peers"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:19
-msgid ""
-"Allow network traffic from remote nodes on the network that you are not "
-"directly peered with"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid ""
-"Allow outbound network traffic regardless of AllowFromDirect or "
-"AllowFromRemote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:14
-msgid ""
-"Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively "
-"allows you to use Yggdrasil to route to, or to bridge other networks, "
-"similar to a VPN tunnel. Tunnelling works between any two nodes and does not "
-"require them to be directly peered."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid "Always allow outbound"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:31
-msgid "Blacklisted public keys"
-msgstr "Clés publiques sur liste noire"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:17
msgid ""
"By default, nodeinfo contains some defaults including the platform, "
"architecture and Yggdrasil version. These can help when surveying the "
@@ -67,14 +23,21 @@ msgid ""
"specified."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
+msgid ""
+"Configuration for which interfaces multicast peer discovery should be "
+"enabled on. Regex is a regular expression which is matched against an "
+"interface name, and interfaces use the first configuration that they match "
+"gainst. Beacon configures whether or not the node should send link-local "
+"multicast beacons to advertise their presence, while listening for incoming "
+"connections on Port. Listen controls whether or not the node listens for "
+"multicast beacons and opens outgoing connections."
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
msgid "Enable NodeInfo privacy"
msgstr "Activer la confidentialité de NodeInfo"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:14
-msgid "Enable session firewall"
-msgstr ""
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:11
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:41
msgid "Encryption keys"
@@ -96,82 +59,20 @@ msgstr "Réglages généraux"
msgid "Grant access to LuCI app yggdrasil"
msgstr "Accorder l’accès à l’application LuCI yggdrasil"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:26
-msgid "IPv4 local subnet"
-msgstr "Sous-réseau local IPv4"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:19
-msgid "IPv4 remote subnet"
-msgstr "Sous-réseau distant IPv4"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-msgid "IPv4 subnet"
-msgstr "Sous-réseau IPv4"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:20
-msgid "IPv4 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:27
-msgid ""
-"IPv4 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:40
-msgid "IPv6 local subnet"
-msgstr "Sous-réseau local IPv6"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:33
-msgid "IPv6 remote subnet"
-msgstr "Sous-réseau distant IPv6"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "IPv6 subnet"
-msgstr "Sous-réseau IPv6"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:34
-msgid "IPv6 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:41
-msgid ""
-"IPv6 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges (or the Yggdrasil node's IPv6 address/subnet) will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:15
-msgid ""
-"If disabled, network traffic from any node will be allowed. If enabled, the "
-"below rules apply"
-msgstr ""
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:25
msgid "Interface"
msgstr "Interface"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
-msgid "Interface name"
-msgstr "Nom de l’interface"
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
msgid "Interface peers"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:16
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:19
msgid "Keep this private. When compromised, generate a new keypair and IPv6."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Key"
-msgstr "Clé"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "Link-local TCP port"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:52
+msgid "Link-local port"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:21
@@ -190,11 +91,11 @@ msgid ""
"when you may connect via different interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:33
msgid "Listen addresses"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:34
msgid ""
"Listen addresses for incoming connections. You will need to add listeners in "
"order to accept incoming peerings from non-local nodes. Multicast peer "
@@ -203,35 +104,23 @@ msgid ""
"[::]:0 to listen on all interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
-msgid "MTU size for the interface"
-msgstr "Taille MTU pour l’interface"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:39
-msgid "Maximum size of all switch queues combined"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+msgid "Listen for beacons"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:41
-msgid "Multicast interfaces"
-msgstr "Interfaces multidiffusion"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:25
-msgid ""
-"Network traffic is always accepted from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
-msgstr ""
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:31
+msgid "MTU size for the interface"
+msgstr "Taille MTU pour l’interface"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:32
-msgid ""
-"Network traffic is always rejected from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:44
+msgid "Multicast interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
msgid "NodeInfo"
msgstr "NodeInfo"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:30
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:24
msgid ""
"Optional node info. This must be a { \"key\": \"value\", ... } map or set as "
"null. This is entirely optional but, if set, is visible to the whole network "
@@ -243,79 +132,22 @@ msgstr ""
msgid "Peers"
msgstr "Pairs"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Public encryption key"
-msgstr "Clé publique de chiffrement"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:26
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:33
-msgid "Public key"
-msgstr "Clé publique"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:42
-msgid ""
-"Regular expressions for which interfaces multicast peer discovery should be "
-"enabled on. If none specified, multicast peer discovery is disabled. The "
-"default value is .* which uses all interfaces."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:50
-msgid "Session firewall"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:49
+msgid "Regular expression"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:11
-msgid "Session firewall settings"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:46
-msgid "Set .* to multicast on all interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+msgid "Send beacons"
msgstr ""
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:32
msgid "Settings"
msgstr "Paramètres"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:18
-msgid "Signing private key"
-msgstr "Signature de la clé privée"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:17
-msgid "Signing public key"
-msgstr "Signature de la clé publique"
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:14
msgid "Status"
msgstr "État"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "Subnet"
-msgstr "Sous-réseau"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
-msgid ""
-"The port number to be used for the link-local TCP listeners for the "
-"configured MulticastInterfaces. This option does not affect "
-"listenersspecified in the Listen option. Unless you plan to firewall link-"
-"localtraffic, it is best to leave this as the default value of 0. This "
-"option cannot currently be changed by reloading config during runtime."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:11
-msgid "Tunnel Routing"
-msgstr "Routage du tunnel"
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:59
-msgid "Tunnel routing"
-msgstr "Routage du tunnel"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:24
-msgid "Whitelisted public keys"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:3
msgid "Yggdrasil"
msgstr "Yggdrasil"
@@ -328,10 +160,70 @@ msgstr "Statut du nœud Yggdrasil"
msgid "Yggdrasil's network interface name"
msgstr "Nom de l’interface réseau de Yggdrasil"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:58
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:40
msgid "e.g. tcp://0.0.0.0:0 or tcp://[::]:0"
msgstr "p. ex. tcp://0.0.0.0:0 or tcp://[::]:0"
+#~ msgid "Address to listen for incoming connections"
+#~ msgstr "Adresse pour écouter les connexions entrantes"
+
+#~ msgid "Allow from direct"
+#~ msgstr "Autoriser directement"
+
+#~ msgid "Allow from remote"
+#~ msgstr "Autoriser à distance"
+
+#~ msgid "Blacklisted public keys"
+#~ msgstr "Clés publiques sur liste noire"
+
+#~ msgid "IPv4 local subnet"
+#~ msgstr "Sous-réseau local IPv4"
+
+#~ msgid "IPv4 remote subnet"
+#~ msgstr "Sous-réseau distant IPv4"
+
+#~ msgid "IPv4 subnet"
+#~ msgstr "Sous-réseau IPv4"
+
+#~ msgid "IPv6 local subnet"
+#~ msgstr "Sous-réseau local IPv6"
+
+#~ msgid "IPv6 remote subnet"
+#~ msgstr "Sous-réseau distant IPv6"
+
+#~ msgid "IPv6 subnet"
+#~ msgstr "Sous-réseau IPv6"
+
+#~ msgid "Interface name"
+#~ msgstr "Nom de l’interface"
+
+#~ msgid "Key"
+#~ msgstr "Clé"
+
+#~ msgid "Multicast interfaces"
+#~ msgstr "Interfaces multidiffusion"
+
+#~ msgid "Public encryption key"
+#~ msgstr "Clé publique de chiffrement"
+
+#~ msgid "Public key"
+#~ msgstr "Clé publique"
+
+#~ msgid "Signing private key"
+#~ msgstr "Signature de la clé privée"
+
+#~ msgid "Signing public key"
+#~ msgstr "Signature de la clé publique"
+
+#~ msgid "Subnet"
+#~ msgstr "Sous-réseau"
+
+#~ msgid "Tunnel Routing"
+#~ msgstr "Routage du tunnel"
+
+#~ msgid "Tunnel routing"
+#~ msgstr "Routage du tunnel"
+
#~ msgid "By default, nodeinfo contains some defaults including the platform,"
#~ msgstr ""
#~ "Par défaut, nodeinfo contient certains paramètres par défaut, notamment "
diff --git a/applications/luci-app-yggdrasil/po/he/yggdrasil.po b/applications/luci-app-yggdrasil/po/he/yggdrasil.po
index 983e60173b..d9d590587b 100644
--- a/applications/luci-app-yggdrasil/po/he/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/he/yggdrasil.po
@@ -15,51 +15,7 @@ msgstr ""
msgid "Active peers"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:56
-msgid "Address to listen for incoming connections"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:16
-msgid "Allow from direct"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:18
-msgid "Allow from remote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:17
-msgid "Allow network traffic from directly connected peers"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:19
-msgid ""
-"Allow network traffic from remote nodes on the network that you are not "
-"directly peered with"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid ""
-"Allow outbound network traffic regardless of AllowFromDirect or "
-"AllowFromRemote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:14
-msgid ""
-"Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively "
-"allows you to use Yggdrasil to route to, or to bridge other networks, "
-"similar to a VPN tunnel. Tunnelling works between any two nodes and does not "
-"require them to be directly peered."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid "Always allow outbound"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:31
-msgid "Blacklisted public keys"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:17
msgid ""
"By default, nodeinfo contains some defaults including the platform, "
"architecture and Yggdrasil version. These can help when surveying the "
@@ -68,12 +24,19 @@ msgid ""
"specified."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "Enable NodeInfo privacy"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
+msgid ""
+"Configuration for which interfaces multicast peer discovery should be "
+"enabled on. Regex is a regular expression which is matched against an "
+"interface name, and interfaces use the first configuration that they match "
+"gainst. Beacon configures whether or not the node should send link-local "
+"multicast beacons to advertise their presence, while listening for incoming "
+"connections on Port. Listen controls whether or not the node listens for "
+"multicast beacons and opens outgoing connections."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:14
-msgid "Enable session firewall"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
+msgid "Enable NodeInfo privacy"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:11
@@ -97,82 +60,20 @@ msgstr ""
msgid "Grant access to LuCI app yggdrasil"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:26
-msgid "IPv4 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:19
-msgid "IPv4 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-msgid "IPv4 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:20
-msgid "IPv4 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:27
-msgid ""
-"IPv4 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:40
-msgid "IPv6 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:33
-msgid "IPv6 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "IPv6 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:34
-msgid "IPv6 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:41
-msgid ""
-"IPv6 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges (or the Yggdrasil node's IPv6 address/subnet) will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:15
-msgid ""
-"If disabled, network traffic from any node will be allowed. If enabled, the "
-"below rules apply"
-msgstr ""
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:25
msgid "Interface"
msgstr "מנשק"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
-msgid "Interface name"
-msgstr ""
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
msgid "Interface peers"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:16
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:19
msgid "Keep this private. When compromised, generate a new keypair and IPv6."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "Link-local TCP port"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:52
+msgid "Link-local port"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:21
@@ -191,11 +92,11 @@ msgid ""
"when you may connect via different interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:33
msgid "Listen addresses"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:34
msgid ""
"Listen addresses for incoming connections. You will need to add listeners in "
"order to accept incoming peerings from non-local nodes. Multicast peer "
@@ -204,35 +105,23 @@ msgid ""
"[::]:0 to listen on all interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
-msgid "MTU size for the interface"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:39
-msgid "Maximum size of all switch queues combined"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:41
-msgid "Multicast interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+msgid "Listen for beacons"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:25
-msgid ""
-"Network traffic is always accepted from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:31
+msgid "MTU size for the interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:32
-msgid ""
-"Network traffic is always rejected from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:44
+msgid "Multicast interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
msgid "NodeInfo"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:30
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:24
msgid ""
"Optional node info. This must be a { \"key\": \"value\", ... } map or set as "
"null. This is entirely optional but, if set, is visible to the whole network "
@@ -244,79 +133,22 @@ msgstr ""
msgid "Peers"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Public encryption key"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:49
+msgid "Regular expression"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:26
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:33
-msgid "Public key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:42
-msgid ""
-"Regular expressions for which interfaces multicast peer discovery should be "
-"enabled on. If none specified, multicast peer discovery is disabled. The "
-"default value is .* which uses all interfaces."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:50
-msgid "Session firewall"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:11
-msgid "Session firewall settings"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:46
-msgid "Set .* to multicast on all interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+msgid "Send beacons"
msgstr ""
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:32
msgid "Settings"
msgstr "הגדרות"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:18
-msgid "Signing private key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:17
-msgid "Signing public key"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:14
msgid "Status"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "Subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
-msgid ""
-"The port number to be used for the link-local TCP listeners for the "
-"configured MulticastInterfaces. This option does not affect "
-"listenersspecified in the Listen option. Unless you plan to firewall link-"
-"localtraffic, it is best to leave this as the default value of 0. This "
-"option cannot currently be changed by reloading config during runtime."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:11
-msgid "Tunnel Routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:59
-msgid "Tunnel routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:24
-msgid "Whitelisted public keys"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:3
msgid "Yggdrasil"
msgstr ""
@@ -329,6 +161,6 @@ msgstr ""
msgid "Yggdrasil's network interface name"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:58
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:40
msgid "e.g. tcp://0.0.0.0:0 or tcp://[::]:0"
msgstr ""
diff --git a/applications/luci-app-yggdrasil/po/hi/yggdrasil.po b/applications/luci-app-yggdrasil/po/hi/yggdrasil.po
index 03a6500d60..c14f9a524f 100644
--- a/applications/luci-app-yggdrasil/po/hi/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/hi/yggdrasil.po
@@ -8,51 +8,7 @@ msgstr ""
msgid "Active peers"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:56
-msgid "Address to listen for incoming connections"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:16
-msgid "Allow from direct"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:18
-msgid "Allow from remote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:17
-msgid "Allow network traffic from directly connected peers"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:19
-msgid ""
-"Allow network traffic from remote nodes on the network that you are not "
-"directly peered with"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid ""
-"Allow outbound network traffic regardless of AllowFromDirect or "
-"AllowFromRemote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:14
-msgid ""
-"Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively "
-"allows you to use Yggdrasil to route to, or to bridge other networks, "
-"similar to a VPN tunnel. Tunnelling works between any two nodes and does not "
-"require them to be directly peered."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid "Always allow outbound"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:31
-msgid "Blacklisted public keys"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:17
msgid ""
"By default, nodeinfo contains some defaults including the platform, "
"architecture and Yggdrasil version. These can help when surveying the "
@@ -61,12 +17,19 @@ msgid ""
"specified."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "Enable NodeInfo privacy"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
+msgid ""
+"Configuration for which interfaces multicast peer discovery should be "
+"enabled on. Regex is a regular expression which is matched against an "
+"interface name, and interfaces use the first configuration that they match "
+"gainst. Beacon configures whether or not the node should send link-local "
+"multicast beacons to advertise their presence, while listening for incoming "
+"connections on Port. Listen controls whether or not the node listens for "
+"multicast beacons and opens outgoing connections."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:14
-msgid "Enable session firewall"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
+msgid "Enable NodeInfo privacy"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:11
@@ -90,82 +53,20 @@ msgstr ""
msgid "Grant access to LuCI app yggdrasil"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:26
-msgid "IPv4 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:19
-msgid "IPv4 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-msgid "IPv4 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:20
-msgid "IPv4 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:27
-msgid ""
-"IPv4 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:40
-msgid "IPv6 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:33
-msgid "IPv6 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "IPv6 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:34
-msgid "IPv6 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:41
-msgid ""
-"IPv6 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges (or the Yggdrasil node's IPv6 address/subnet) will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:15
-msgid ""
-"If disabled, network traffic from any node will be allowed. If enabled, the "
-"below rules apply"
-msgstr ""
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:25
msgid "Interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
-msgid "Interface name"
-msgstr ""
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
msgid "Interface peers"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:16
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:19
msgid "Keep this private. When compromised, generate a new keypair and IPv6."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "Link-local TCP port"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:52
+msgid "Link-local port"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:21
@@ -184,11 +85,11 @@ msgid ""
"when you may connect via different interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:33
msgid "Listen addresses"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:34
msgid ""
"Listen addresses for incoming connections. You will need to add listeners in "
"order to accept incoming peerings from non-local nodes. Multicast peer "
@@ -197,35 +98,23 @@ msgid ""
"[::]:0 to listen on all interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
-msgid "MTU size for the interface"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:39
-msgid "Maximum size of all switch queues combined"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:41
-msgid "Multicast interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+msgid "Listen for beacons"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:25
-msgid ""
-"Network traffic is always accepted from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:31
+msgid "MTU size for the interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:32
-msgid ""
-"Network traffic is always rejected from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:44
+msgid "Multicast interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
msgid "NodeInfo"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:30
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:24
msgid ""
"Optional node info. This must be a { \"key\": \"value\", ... } map or set as "
"null. This is entirely optional but, if set, is visible to the whole network "
@@ -237,79 +126,22 @@ msgstr ""
msgid "Peers"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Public encryption key"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:49
+msgid "Regular expression"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:26
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:33
-msgid "Public key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:42
-msgid ""
-"Regular expressions for which interfaces multicast peer discovery should be "
-"enabled on. If none specified, multicast peer discovery is disabled. The "
-"default value is .* which uses all interfaces."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:50
-msgid "Session firewall"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:11
-msgid "Session firewall settings"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:46
-msgid "Set .* to multicast on all interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+msgid "Send beacons"
msgstr ""
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:32
msgid "Settings"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:18
-msgid "Signing private key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:17
-msgid "Signing public key"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:14
msgid "Status"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "Subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
-msgid ""
-"The port number to be used for the link-local TCP listeners for the "
-"configured MulticastInterfaces. This option does not affect "
-"listenersspecified in the Listen option. Unless you plan to firewall link-"
-"localtraffic, it is best to leave this as the default value of 0. This "
-"option cannot currently be changed by reloading config during runtime."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:11
-msgid "Tunnel Routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:59
-msgid "Tunnel routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:24
-msgid "Whitelisted public keys"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:3
msgid "Yggdrasil"
msgstr ""
@@ -322,6 +154,6 @@ msgstr ""
msgid "Yggdrasil's network interface name"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:58
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:40
msgid "e.g. tcp://0.0.0.0:0 or tcp://[::]:0"
msgstr ""
diff --git a/applications/luci-app-yggdrasil/po/hu/yggdrasil.po b/applications/luci-app-yggdrasil/po/hu/yggdrasil.po
index e9f2c6eb1e..6a63b16b2e 100644
--- a/applications/luci-app-yggdrasil/po/hu/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/hu/yggdrasil.po
@@ -14,58 +14,7 @@ msgstr ""
msgid "Active peers"
msgstr "Aktív partnerek"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:56
-msgid "Address to listen for incoming connections"
-msgstr "Figyelési cím a bejövő kapcsolatokhoz"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:16
-msgid "Allow from direct"
-msgstr "Közvetlen elérés engedélyezése"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:18
-msgid "Allow from remote"
-msgstr "Távoli elérés engedélyezése"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:17
-msgid "Allow network traffic from directly connected peers"
-msgstr "Közvetlenül csatlakozó partnerek hálózati forgalmának engedélyezése"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:19
-msgid ""
-"Allow network traffic from remote nodes on the network that you are not "
-"directly peered with"
-msgstr "Nem-közvetlenül csatlakozó partnerek hálózati forgalmának engedélyezése"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid ""
-"Allow outbound network traffic regardless of AllowFromDirect or "
-"AllowFromRemote"
-msgstr ""
-"Kimenő forgalom engedélyezése, az AllowFromDirect és AllowFromRemote "
-"beállításoktól függetlenül"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:14
-msgid ""
-"Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively "
-"allows you to use Yggdrasil to route to, or to bridge other networks, "
-"similar to a VPN tunnel. Tunnelling works between any two nodes and does not "
-"require them to be directly peered."
-msgstr ""
-"Nem-Yggdrasil forgalom Yggdrasil feletti alagutazásának engedélyezése. Ezzel "
-"az Yggdrasil képes más hálózatok felé útvonalválasztani vagy hálózati hidat "
-"kiépíteni, egy hagyományos VPN alagúthoz hasonlóan. Az alagutazás bármely "
-"két csomópont között működik, a feleknek nem kell közvetlen kapcsolatban "
-"állniuk."
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid "Always allow outbound"
-msgstr "Kimenő forgalom mindig engedélyezve"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:31
-msgid "Blacklisted public keys"
-msgstr "Feketelistás nyilvános kulcsok"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:17
#, fuzzy
msgid ""
"By default, nodeinfo contains some defaults including the platform, "
@@ -80,14 +29,21 @@ msgstr ""
"adatvédelem bekapcsolásával azonban csak a \"NodeInfo\" által felsorolt "
"elemek kerülnek visszaküldésre."
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
+msgid ""
+"Configuration for which interfaces multicast peer discovery should be "
+"enabled on. Regex is a regular expression which is matched against an "
+"interface name, and interfaces use the first configuration that they match "
+"gainst. Beacon configures whether or not the node should send link-local "
+"multicast beacons to advertise their presence, while listening for incoming "
+"connections on Port. Listen controls whether or not the node listens for "
+"multicast beacons and opens outgoing connections."
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
msgid "Enable NodeInfo privacy"
msgstr "NodeInfo adatvédelem bekapcsolása"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:14
-msgid "Enable session firewall"
-msgstr "Munkamenet tűzfal bekapcsolása"
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:11
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:41
msgid "Encryption keys"
@@ -109,89 +65,20 @@ msgstr "Általános beállítások"
msgid "Grant access to LuCI app yggdrasil"
msgstr "Hozzáférés engedélyezése az yggdrasil LuCI alkalmazáshoz"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:26
-msgid "IPv4 local subnet"
-msgstr "IPv4 helyi alhálózat"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:19
-msgid "IPv4 remote subnet"
-msgstr "IPv4 távoli alhálózat"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-msgid "IPv4 subnet"
-msgstr "IPv4 alhálózat"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:20
-msgid "IPv4 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:27
-msgid ""
-"IPv4 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges will be tunnelled."
-msgstr ""
-"Alagutak itteni végéhez tartozó IPv4 alhálózat. Csak ezekbe a tartományokba "
-"eső forgalom fog az alagúton keresztül haladni."
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:40
-msgid "IPv6 local subnet"
-msgstr "IPv6 helyi alhálózat"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:33
-msgid "IPv6 remote subnet"
-msgstr "IPv6 távoli alhálózat"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "IPv6 subnet"
-msgstr "IPv6 alhálózat"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:34
-msgid "IPv6 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:41
-msgid ""
-"IPv6 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges (or the Yggdrasil node's IPv6 address/subnet) will be tunnelled."
-msgstr ""
-"Alagutak itteni végéhez tartozó IPv6 alhálózat. Csak ezekbe a tartományokba ("
-"vagy az Yggdrasil csomópont IPv6 cím/tartományába) eső forgalom fog az "
-"alagúton keresztül haladni."
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:15
-msgid ""
-"If disabled, network traffic from any node will be allowed. If enabled, the "
-"below rules apply"
-msgstr ""
-"Ha kikapcsolja, bármely csomópont forgalma engedélyezve lesz. Ha "
-"bekapcsolja, a lentebbi szabályok érvényesülnek"
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:25
msgid "Interface"
msgstr "Csatoló"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
-msgid "Interface name"
-msgstr "Csatoló neve"
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
msgid "Interface peers"
msgstr "Csatolóhoz tartozó partnerek"
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:16
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:19
msgid "Keep this private. When compromised, generate a new keypair and IPv6."
msgstr "Tartsa titokban. Ha kitudódik, hozzon létre új kulcspárt és IPv6-ot."
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Key"
-msgstr "Kulcs"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "Link-local TCP port"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:52
+msgid "Link-local port"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:21
@@ -210,11 +97,11 @@ msgid ""
"when you may connect via different interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:33
msgid "Listen addresses"
msgstr "Figyelési címek"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:34
msgid ""
"Listen addresses for incoming connections. You will need to add listeners in "
"order to accept incoming peerings from non-local nodes. Multicast peer "
@@ -223,40 +110,24 @@ msgid ""
"[::]:0 to listen on all interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+msgid "Listen for beacons"
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:31
msgid "MTU size for the interface"
msgstr "Csatoló MTU mérete"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:39
-msgid "Maximum size of all switch queues combined"
-msgstr "Várakozási sorok összesített mérete"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:41
-msgid "Multicast interfaces"
-msgstr "Multicast (többes szórású) csatolók"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:25
-msgid ""
-"Network traffic is always accepted from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
-msgstr ""
-"A hálózati forgalom mindig engedélyezett ezektől a partnerektől, függetlenül "
-"az AllowFromDirect és AllowFromRemote beállításoktól"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:32
-msgid ""
-"Network traffic is always rejected from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:44
+msgid "Multicast interface"
msgstr ""
-"A hálózati forgalom mindig tiltott ezektől a partnerektől, függetlenül az "
-"AllowFromDirect és AllowFromRemote beállításoktól"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
#, fuzzy
msgid "NodeInfo"
msgstr "NodeInfo"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:30
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:24
msgid ""
"Optional node info. This must be a { \"key\": \"value\", ... } map or set as "
"null. This is entirely optional but, if set, is visible to the whole network "
@@ -271,79 +142,22 @@ msgstr ""
msgid "Peers"
msgstr "Partnerek"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Public encryption key"
-msgstr "Nyilvános titkosító kulcs"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:26
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:33
-msgid "Public key"
-msgstr "Nyilvános kulcs"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:42
-msgid ""
-"Regular expressions for which interfaces multicast peer discovery should be "
-"enabled on. If none specified, multicast peer discovery is disabled. The "
-"default value is .* which uses all interfaces."
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:49
+msgid "Regular expression"
msgstr ""
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:50
-msgid "Session firewall"
-msgstr "Munkamenet tűzfal"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:11
-msgid "Session firewall settings"
-msgstr "Munkamenet tűzfal beállításai"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:46
-msgid "Set .* to multicast on all interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+msgid "Send beacons"
msgstr ""
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:32
msgid "Settings"
msgstr "Beállítások"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:18
-msgid "Signing private key"
-msgstr "Aláíró privát kulcsa"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:17
-msgid "Signing public key"
-msgstr "Aláíró nyilvános kulcsa"
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:14
msgid "Status"
msgstr "Állapot"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "Subnet"
-msgstr "Alhálózat"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
-msgid ""
-"The port number to be used for the link-local TCP listeners for the "
-"configured MulticastInterfaces. This option does not affect "
-"listenersspecified in the Listen option. Unless you plan to firewall link-"
-"localtraffic, it is best to leave this as the default value of 0. This "
-"option cannot currently be changed by reloading config during runtime."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:11
-msgid "Tunnel Routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:59
-msgid "Tunnel routing"
-msgstr "Alagút útvonalválasztás"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:24
-msgid "Whitelisted public keys"
-msgstr "Fehérlistás nyilvános kulcsok"
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:3
msgid "Yggdrasil"
msgstr "Yggdrasil"
@@ -356,6 +170,146 @@ msgstr "Yggdrasil csomópont állapota"
msgid "Yggdrasil's network interface name"
msgstr "Yggdrasil hálózati csatoló neve"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:58
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:40
msgid "e.g. tcp://0.0.0.0:0 or tcp://[::]:0"
msgstr "pl. tcp://0.0.0.0:0 vagy tcp://[::]:0"
+
+#~ msgid "Address to listen for incoming connections"
+#~ msgstr "Figyelési cím a bejövő kapcsolatokhoz"
+
+#~ msgid "Allow from direct"
+#~ msgstr "Közvetlen elérés engedélyezése"
+
+#~ msgid "Allow from remote"
+#~ msgstr "Távoli elérés engedélyezése"
+
+#~ msgid "Allow network traffic from directly connected peers"
+#~ msgstr "Közvetlenül csatlakozó partnerek hálózati forgalmának engedélyezése"
+
+#~ msgid ""
+#~ "Allow network traffic from remote nodes on the network that you are not "
+#~ "directly peered with"
+#~ msgstr ""
+#~ "Nem-közvetlenül csatlakozó partnerek hálózati forgalmának engedélyezése"
+
+#~ msgid ""
+#~ "Allow outbound network traffic regardless of AllowFromDirect or "
+#~ "AllowFromRemote"
+#~ msgstr ""
+#~ "Kimenő forgalom engedélyezése, az AllowFromDirect és AllowFromRemote "
+#~ "beállításoktól függetlenül"
+
+#~ msgid ""
+#~ "Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively "
+#~ "allows you to use Yggdrasil to route to, or to bridge other networks, "
+#~ "similar to a VPN tunnel. Tunnelling works between any two nodes and does "
+#~ "not require them to be directly peered."
+#~ msgstr ""
+#~ "Nem-Yggdrasil forgalom Yggdrasil feletti alagutazásának engedélyezése. "
+#~ "Ezzel az Yggdrasil képes más hálózatok felé útvonalválasztani vagy "
+#~ "hálózati hidat kiépíteni, egy hagyományos VPN alagúthoz hasonlóan. Az "
+#~ "alagutazás bármely két csomópont között működik, a feleknek nem kell "
+#~ "közvetlen kapcsolatban állniuk."
+
+#~ msgid "Always allow outbound"
+#~ msgstr "Kimenő forgalom mindig engedélyezve"
+
+#~ msgid "Blacklisted public keys"
+#~ msgstr "Feketelistás nyilvános kulcsok"
+
+#~ msgid "Enable session firewall"
+#~ msgstr "Munkamenet tűzfal bekapcsolása"
+
+#~ msgid "IPv4 local subnet"
+#~ msgstr "IPv4 helyi alhálózat"
+
+#~ msgid "IPv4 remote subnet"
+#~ msgstr "IPv4 távoli alhálózat"
+
+#~ msgid "IPv4 subnet"
+#~ msgstr "IPv4 alhálózat"
+
+#~ msgid ""
+#~ "IPv4 subnets belonging to this node's end of the tunnels. Only traffic "
+#~ "from these ranges will be tunnelled."
+#~ msgstr ""
+#~ "Alagutak itteni végéhez tartozó IPv4 alhálózat. Csak ezekbe a "
+#~ "tartományokba eső forgalom fog az alagúton keresztül haladni."
+
+#~ msgid "IPv6 local subnet"
+#~ msgstr "IPv6 helyi alhálózat"
+
+#~ msgid "IPv6 remote subnet"
+#~ msgstr "IPv6 távoli alhálózat"
+
+#~ msgid "IPv6 subnet"
+#~ msgstr "IPv6 alhálózat"
+
+#~ msgid ""
+#~ "IPv6 subnets belonging to this node's end of the tunnels. Only traffic "
+#~ "from these ranges (or the Yggdrasil node's IPv6 address/subnet) will be "
+#~ "tunnelled."
+#~ msgstr ""
+#~ "Alagutak itteni végéhez tartozó IPv6 alhálózat. Csak ezekbe a "
+#~ "tartományokba (vagy az Yggdrasil csomópont IPv6 cím/tartományába) eső "
+#~ "forgalom fog az alagúton keresztül haladni."
+
+#~ msgid ""
+#~ "If disabled, network traffic from any node will be allowed. If enabled, "
+#~ "the below rules apply"
+#~ msgstr ""
+#~ "Ha kikapcsolja, bármely csomópont forgalma engedélyezve lesz. Ha "
+#~ "bekapcsolja, a lentebbi szabályok érvényesülnek"
+
+#~ msgid "Interface name"
+#~ msgstr "Csatoló neve"
+
+#~ msgid "Key"
+#~ msgstr "Kulcs"
+
+#~ msgid "Maximum size of all switch queues combined"
+#~ msgstr "Várakozási sorok összesített mérete"
+
+#~ msgid "Multicast interfaces"
+#~ msgstr "Multicast (többes szórású) csatolók"
+
+#~ msgid ""
+#~ "Network traffic is always accepted from those peers, regardless of "
+#~ "AllowFromDirect or AllowFromRemote"
+#~ msgstr ""
+#~ "A hálózati forgalom mindig engedélyezett ezektől a partnerektől, "
+#~ "függetlenül az AllowFromDirect és AllowFromRemote beállításoktól"
+
+#~ msgid ""
+#~ "Network traffic is always rejected from those peers, regardless of "
+#~ "AllowFromDirect or AllowFromRemote"
+#~ msgstr ""
+#~ "A hálózati forgalom mindig tiltott ezektől a partnerektől, függetlenül az "
+#~ "AllowFromDirect és AllowFromRemote beállításoktól"
+
+#~ msgid "Public encryption key"
+#~ msgstr "Nyilvános titkosító kulcs"
+
+#~ msgid "Public key"
+#~ msgstr "Nyilvános kulcs"
+
+#~ msgid "Session firewall"
+#~ msgstr "Munkamenet tűzfal"
+
+#~ msgid "Session firewall settings"
+#~ msgstr "Munkamenet tűzfal beállításai"
+
+#~ msgid "Signing private key"
+#~ msgstr "Aláíró privát kulcsa"
+
+#~ msgid "Signing public key"
+#~ msgstr "Aláíró nyilvános kulcsa"
+
+#~ msgid "Subnet"
+#~ msgstr "Alhálózat"
+
+#~ msgid "Tunnel routing"
+#~ msgstr "Alagút útvonalválasztás"
+
+#~ msgid "Whitelisted public keys"
+#~ msgstr "Fehérlistás nyilvános kulcsok"
diff --git a/applications/luci-app-yggdrasil/po/it/yggdrasil.po b/applications/luci-app-yggdrasil/po/it/yggdrasil.po
index 715dba7193..9b4b2d1a03 100644
--- a/applications/luci-app-yggdrasil/po/it/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/it/yggdrasil.po
@@ -14,51 +14,7 @@ msgstr ""
msgid "Active peers"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:56
-msgid "Address to listen for incoming connections"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:16
-msgid "Allow from direct"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:18
-msgid "Allow from remote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:17
-msgid "Allow network traffic from directly connected peers"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:19
-msgid ""
-"Allow network traffic from remote nodes on the network that you are not "
-"directly peered with"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid ""
-"Allow outbound network traffic regardless of AllowFromDirect or "
-"AllowFromRemote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:14
-msgid ""
-"Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively "
-"allows you to use Yggdrasil to route to, or to bridge other networks, "
-"similar to a VPN tunnel. Tunnelling works between any two nodes and does not "
-"require them to be directly peered."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid "Always allow outbound"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:31
-msgid "Blacklisted public keys"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:17
msgid ""
"By default, nodeinfo contains some defaults including the platform, "
"architecture and Yggdrasil version. These can help when surveying the "
@@ -67,12 +23,19 @@ msgid ""
"specified."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "Enable NodeInfo privacy"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
+msgid ""
+"Configuration for which interfaces multicast peer discovery should be "
+"enabled on. Regex is a regular expression which is matched against an "
+"interface name, and interfaces use the first configuration that they match "
+"gainst. Beacon configures whether or not the node should send link-local "
+"multicast beacons to advertise their presence, while listening for incoming "
+"connections on Port. Listen controls whether or not the node listens for "
+"multicast beacons and opens outgoing connections."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:14
-msgid "Enable session firewall"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
+msgid "Enable NodeInfo privacy"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:11
@@ -96,82 +59,20 @@ msgstr "Impostazioni generali"
msgid "Grant access to LuCI app yggdrasil"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:26
-msgid "IPv4 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:19
-msgid "IPv4 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-msgid "IPv4 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:20
-msgid "IPv4 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:27
-msgid ""
-"IPv4 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:40
-msgid "IPv6 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:33
-msgid "IPv6 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "IPv6 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:34
-msgid "IPv6 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:41
-msgid ""
-"IPv6 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges (or the Yggdrasil node's IPv6 address/subnet) will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:15
-msgid ""
-"If disabled, network traffic from any node will be allowed. If enabled, the "
-"below rules apply"
-msgstr ""
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:25
msgid "Interface"
msgstr "Interfaccia"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
-msgid "Interface name"
-msgstr "Nome interfaccia"
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
msgid "Interface peers"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:16
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:19
msgid "Keep this private. When compromised, generate a new keypair and IPv6."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Key"
-msgstr "Chiave"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "Link-local TCP port"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:52
+msgid "Link-local port"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:21
@@ -190,11 +91,11 @@ msgid ""
"when you may connect via different interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:33
msgid "Listen addresses"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:34
msgid ""
"Listen addresses for incoming connections. You will need to add listeners in "
"order to accept incoming peerings from non-local nodes. Multicast peer "
@@ -203,35 +104,23 @@ msgid ""
"[::]:0 to listen on all interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
-msgid "MTU size for the interface"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:39
-msgid "Maximum size of all switch queues combined"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:41
-msgid "Multicast interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+msgid "Listen for beacons"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:25
-msgid ""
-"Network traffic is always accepted from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:31
+msgid "MTU size for the interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:32
-msgid ""
-"Network traffic is always rejected from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:44
+msgid "Multicast interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
msgid "NodeInfo"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:30
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:24
msgid ""
"Optional node info. This must be a { \"key\": \"value\", ... } map or set as "
"null. This is entirely optional but, if set, is visible to the whole network "
@@ -243,79 +132,22 @@ msgstr ""
msgid "Peers"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Public encryption key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:26
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:33
-msgid "Public key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:42
-msgid ""
-"Regular expressions for which interfaces multicast peer discovery should be "
-"enabled on. If none specified, multicast peer discovery is disabled. The "
-"default value is .* which uses all interfaces."
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:49
+msgid "Regular expression"
msgstr ""
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:50
-msgid "Session firewall"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:11
-msgid "Session firewall settings"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:46
-msgid "Set .* to multicast on all interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+msgid "Send beacons"
msgstr ""
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:32
msgid "Settings"
msgstr "Impostazioni"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:18
-msgid "Signing private key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:17
-msgid "Signing public key"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:14
msgid "Status"
msgstr "Stato"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "Subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
-msgid ""
-"The port number to be used for the link-local TCP listeners for the "
-"configured MulticastInterfaces. This option does not affect "
-"listenersspecified in the Listen option. Unless you plan to firewall link-"
-"localtraffic, it is best to leave this as the default value of 0. This "
-"option cannot currently be changed by reloading config during runtime."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:11
-msgid "Tunnel Routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:59
-msgid "Tunnel routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:24
-msgid "Whitelisted public keys"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:3
msgid "Yggdrasil"
msgstr ""
@@ -328,6 +160,12 @@ msgstr ""
msgid "Yggdrasil's network interface name"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:58
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:40
msgid "e.g. tcp://0.0.0.0:0 or tcp://[::]:0"
msgstr ""
+
+#~ msgid "Interface name"
+#~ msgstr "Nome interfaccia"
+
+#~ msgid "Key"
+#~ msgstr "Chiave"
diff --git a/applications/luci-app-yggdrasil/po/ja/yggdrasil.po b/applications/luci-app-yggdrasil/po/ja/yggdrasil.po
index e29720e2fc..9ca436a2f5 100644
--- a/applications/luci-app-yggdrasil/po/ja/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/ja/yggdrasil.po
@@ -14,51 +14,7 @@ msgstr ""
msgid "Active peers"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:56
-msgid "Address to listen for incoming connections"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:16
-msgid "Allow from direct"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:18
-msgid "Allow from remote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:17
-msgid "Allow network traffic from directly connected peers"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:19
-msgid ""
-"Allow network traffic from remote nodes on the network that you are not "
-"directly peered with"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid ""
-"Allow outbound network traffic regardless of AllowFromDirect or "
-"AllowFromRemote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:14
-msgid ""
-"Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively "
-"allows you to use Yggdrasil to route to, or to bridge other networks, "
-"similar to a VPN tunnel. Tunnelling works between any two nodes and does not "
-"require them to be directly peered."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid "Always allow outbound"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:31
-msgid "Blacklisted public keys"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:17
msgid ""
"By default, nodeinfo contains some defaults including the platform, "
"architecture and Yggdrasil version. These can help when surveying the "
@@ -67,12 +23,19 @@ msgid ""
"specified."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "Enable NodeInfo privacy"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
+msgid ""
+"Configuration for which interfaces multicast peer discovery should be "
+"enabled on. Regex is a regular expression which is matched against an "
+"interface name, and interfaces use the first configuration that they match "
+"gainst. Beacon configures whether or not the node should send link-local "
+"multicast beacons to advertise their presence, while listening for incoming "
+"connections on Port. Listen controls whether or not the node listens for "
+"multicast beacons and opens outgoing connections."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:14
-msgid "Enable session firewall"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
+msgid "Enable NodeInfo privacy"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:11
@@ -96,82 +59,20 @@ msgstr "一般設定"
msgid "Grant access to LuCI app yggdrasil"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:26
-msgid "IPv4 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:19
-msgid "IPv4 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-msgid "IPv4 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:20
-msgid "IPv4 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:27
-msgid ""
-"IPv4 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:40
-msgid "IPv6 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:33
-msgid "IPv6 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "IPv6 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:34
-msgid "IPv6 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:41
-msgid ""
-"IPv6 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges (or the Yggdrasil node's IPv6 address/subnet) will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:15
-msgid ""
-"If disabled, network traffic from any node will be allowed. If enabled, the "
-"below rules apply"
-msgstr ""
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:25
msgid "Interface"
msgstr "インターフェース"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
-msgid "Interface name"
-msgstr "インターフェース名"
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
msgid "Interface peers"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:16
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:19
msgid "Keep this private. When compromised, generate a new keypair and IPv6."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Key"
-msgstr "キー"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "Link-local TCP port"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:52
+msgid "Link-local port"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:21
@@ -190,11 +91,11 @@ msgid ""
"when you may connect via different interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:33
msgid "Listen addresses"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:34
msgid ""
"Listen addresses for incoming connections. You will need to add listeners in "
"order to accept incoming peerings from non-local nodes. Multicast peer "
@@ -203,35 +104,23 @@ msgid ""
"[::]:0 to listen on all interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
-msgid "MTU size for the interface"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:39
-msgid "Maximum size of all switch queues combined"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:41
-msgid "Multicast interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+msgid "Listen for beacons"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:25
-msgid ""
-"Network traffic is always accepted from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:31
+msgid "MTU size for the interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:32
-msgid ""
-"Network traffic is always rejected from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:44
+msgid "Multicast interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
msgid "NodeInfo"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:30
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:24
msgid ""
"Optional node info. This must be a { \"key\": \"value\", ... } map or set as "
"null. This is entirely optional but, if set, is visible to the whole network "
@@ -243,79 +132,22 @@ msgstr ""
msgid "Peers"
msgstr "ピア"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Public encryption key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:26
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:33
-msgid "Public key"
-msgstr "公開鍵"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:42
-msgid ""
-"Regular expressions for which interfaces multicast peer discovery should be "
-"enabled on. If none specified, multicast peer discovery is disabled. The "
-"default value is .* which uses all interfaces."
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:49
+msgid "Regular expression"
msgstr ""
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:50
-msgid "Session firewall"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:11
-msgid "Session firewall settings"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:46
-msgid "Set .* to multicast on all interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+msgid "Send beacons"
msgstr ""
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:32
msgid "Settings"
msgstr "設定"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:18
-msgid "Signing private key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:17
-msgid "Signing public key"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:14
msgid "Status"
msgstr "ステータス"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "Subnet"
-msgstr "サブネット"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
-msgid ""
-"The port number to be used for the link-local TCP listeners for the "
-"configured MulticastInterfaces. This option does not affect "
-"listenersspecified in the Listen option. Unless you plan to firewall link-"
-"localtraffic, it is best to leave this as the default value of 0. This "
-"option cannot currently be changed by reloading config during runtime."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:11
-msgid "Tunnel Routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:59
-msgid "Tunnel routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:24
-msgid "Whitelisted public keys"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:3
msgid "Yggdrasil"
msgstr ""
@@ -328,6 +160,18 @@ msgstr ""
msgid "Yggdrasil's network interface name"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:58
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:40
msgid "e.g. tcp://0.0.0.0:0 or tcp://[::]:0"
msgstr ""
+
+#~ msgid "Interface name"
+#~ msgstr "インターフェース名"
+
+#~ msgid "Key"
+#~ msgstr "キー"
+
+#~ msgid "Public key"
+#~ msgstr "公開鍵"
+
+#~ msgid "Subnet"
+#~ msgstr "サブネット"
diff --git a/applications/luci-app-yggdrasil/po/ko/yggdrasil.po b/applications/luci-app-yggdrasil/po/ko/yggdrasil.po
index 00bd65350e..919592b176 100644
--- a/applications/luci-app-yggdrasil/po/ko/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/ko/yggdrasil.po
@@ -14,51 +14,7 @@ msgstr ""
msgid "Active peers"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:56
-msgid "Address to listen for incoming connections"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:16
-msgid "Allow from direct"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:18
-msgid "Allow from remote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:17
-msgid "Allow network traffic from directly connected peers"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:19
-msgid ""
-"Allow network traffic from remote nodes on the network that you are not "
-"directly peered with"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid ""
-"Allow outbound network traffic regardless of AllowFromDirect or "
-"AllowFromRemote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:14
-msgid ""
-"Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively "
-"allows you to use Yggdrasil to route to, or to bridge other networks, "
-"similar to a VPN tunnel. Tunnelling works between any two nodes and does not "
-"require them to be directly peered."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid "Always allow outbound"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:31
-msgid "Blacklisted public keys"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:17
msgid ""
"By default, nodeinfo contains some defaults including the platform, "
"architecture and Yggdrasil version. These can help when surveying the "
@@ -67,12 +23,19 @@ msgid ""
"specified."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "Enable NodeInfo privacy"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
+msgid ""
+"Configuration for which interfaces multicast peer discovery should be "
+"enabled on. Regex is a regular expression which is matched against an "
+"interface name, and interfaces use the first configuration that they match "
+"gainst. Beacon configures whether or not the node should send link-local "
+"multicast beacons to advertise their presence, while listening for incoming "
+"connections on Port. Listen controls whether or not the node listens for "
+"multicast beacons and opens outgoing connections."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:14
-msgid "Enable session firewall"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
+msgid "Enable NodeInfo privacy"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:11
@@ -96,82 +59,20 @@ msgstr ""
msgid "Grant access to LuCI app yggdrasil"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:26
-msgid "IPv4 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:19
-msgid "IPv4 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-msgid "IPv4 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:20
-msgid "IPv4 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:27
-msgid ""
-"IPv4 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:40
-msgid "IPv6 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:33
-msgid "IPv6 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "IPv6 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:34
-msgid "IPv6 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:41
-msgid ""
-"IPv6 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges (or the Yggdrasil node's IPv6 address/subnet) will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:15
-msgid ""
-"If disabled, network traffic from any node will be allowed. If enabled, the "
-"below rules apply"
-msgstr ""
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:25
msgid "Interface"
msgstr "인터페이스"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
-msgid "Interface name"
-msgstr ""
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
msgid "Interface peers"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:16
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:19
msgid "Keep this private. When compromised, generate a new keypair and IPv6."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "Link-local TCP port"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:52
+msgid "Link-local port"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:21
@@ -190,11 +91,11 @@ msgid ""
"when you may connect via different interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:33
msgid "Listen addresses"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:34
msgid ""
"Listen addresses for incoming connections. You will need to add listeners in "
"order to accept incoming peerings from non-local nodes. Multicast peer "
@@ -203,35 +104,23 @@ msgid ""
"[::]:0 to listen on all interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
-msgid "MTU size for the interface"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:39
-msgid "Maximum size of all switch queues combined"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:41
-msgid "Multicast interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+msgid "Listen for beacons"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:25
-msgid ""
-"Network traffic is always accepted from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:31
+msgid "MTU size for the interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:32
-msgid ""
-"Network traffic is always rejected from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:44
+msgid "Multicast interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
msgid "NodeInfo"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:30
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:24
msgid ""
"Optional node info. This must be a { \"key\": \"value\", ... } map or set as "
"null. This is entirely optional but, if set, is visible to the whole network "
@@ -243,79 +132,22 @@ msgstr ""
msgid "Peers"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Public encryption key"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:49
+msgid "Regular expression"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:26
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:33
-msgid "Public key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:42
-msgid ""
-"Regular expressions for which interfaces multicast peer discovery should be "
-"enabled on. If none specified, multicast peer discovery is disabled. The "
-"default value is .* which uses all interfaces."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:50
-msgid "Session firewall"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:11
-msgid "Session firewall settings"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:46
-msgid "Set .* to multicast on all interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+msgid "Send beacons"
msgstr ""
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:32
msgid "Settings"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:18
-msgid "Signing private key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:17
-msgid "Signing public key"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:14
msgid "Status"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "Subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
-msgid ""
-"The port number to be used for the link-local TCP listeners for the "
-"configured MulticastInterfaces. This option does not affect "
-"listenersspecified in the Listen option. Unless you plan to firewall link-"
-"localtraffic, it is best to leave this as the default value of 0. This "
-"option cannot currently be changed by reloading config during runtime."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:11
-msgid "Tunnel Routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:59
-msgid "Tunnel routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:24
-msgid "Whitelisted public keys"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:3
msgid "Yggdrasil"
msgstr ""
@@ -328,6 +160,6 @@ msgstr ""
msgid "Yggdrasil's network interface name"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:58
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:40
msgid "e.g. tcp://0.0.0.0:0 or tcp://[::]:0"
msgstr ""
diff --git a/applications/luci-app-yggdrasil/po/mr/yggdrasil.po b/applications/luci-app-yggdrasil/po/mr/yggdrasil.po
index 4c104b0824..3b4990c32a 100644
--- a/applications/luci-app-yggdrasil/po/mr/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/mr/yggdrasil.po
@@ -14,51 +14,7 @@ msgstr ""
msgid "Active peers"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:56
-msgid "Address to listen for incoming connections"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:16
-msgid "Allow from direct"
-msgstr "थेट परवानगी द्या"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:18
-msgid "Allow from remote"
-msgstr "रिमोटमधून परवानगी द्या"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:17
-msgid "Allow network traffic from directly connected peers"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:19
-msgid ""
-"Allow network traffic from remote nodes on the network that you are not "
-"directly peered with"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid ""
-"Allow outbound network traffic regardless of AllowFromDirect or "
-"AllowFromRemote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:14
-msgid ""
-"Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively "
-"allows you to use Yggdrasil to route to, or to bridge other networks, "
-"similar to a VPN tunnel. Tunnelling works between any two nodes and does not "
-"require them to be directly peered."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid "Always allow outbound"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:31
-msgid "Blacklisted public keys"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:17
msgid ""
"By default, nodeinfo contains some defaults including the platform, "
"architecture and Yggdrasil version. These can help when surveying the "
@@ -67,12 +23,19 @@ msgid ""
"specified."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "Enable NodeInfo privacy"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
+msgid ""
+"Configuration for which interfaces multicast peer discovery should be "
+"enabled on. Regex is a regular expression which is matched against an "
+"interface name, and interfaces use the first configuration that they match "
+"gainst. Beacon configures whether or not the node should send link-local "
+"multicast beacons to advertise their presence, while listening for incoming "
+"connections on Port. Listen controls whether or not the node listens for "
+"multicast beacons and opens outgoing connections."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:14
-msgid "Enable session firewall"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
+msgid "Enable NodeInfo privacy"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:11
@@ -96,82 +59,20 @@ msgstr ""
msgid "Grant access to LuCI app yggdrasil"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:26
-msgid "IPv4 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:19
-msgid "IPv4 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-msgid "IPv4 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:20
-msgid "IPv4 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:27
-msgid ""
-"IPv4 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:40
-msgid "IPv6 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:33
-msgid "IPv6 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "IPv6 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:34
-msgid "IPv6 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:41
-msgid ""
-"IPv6 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges (or the Yggdrasil node's IPv6 address/subnet) will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:15
-msgid ""
-"If disabled, network traffic from any node will be allowed. If enabled, the "
-"below rules apply"
-msgstr ""
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:25
msgid "Interface"
msgstr "इंटरफेस"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
-msgid "Interface name"
-msgstr ""
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
msgid "Interface peers"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:16
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:19
msgid "Keep this private. When compromised, generate a new keypair and IPv6."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "Link-local TCP port"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:52
+msgid "Link-local port"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:21
@@ -190,11 +91,11 @@ msgid ""
"when you may connect via different interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:33
msgid "Listen addresses"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:34
msgid ""
"Listen addresses for incoming connections. You will need to add listeners in "
"order to accept incoming peerings from non-local nodes. Multicast peer "
@@ -203,35 +104,23 @@ msgid ""
"[::]:0 to listen on all interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
-msgid "MTU size for the interface"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:39
-msgid "Maximum size of all switch queues combined"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:41
-msgid "Multicast interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+msgid "Listen for beacons"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:25
-msgid ""
-"Network traffic is always accepted from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:31
+msgid "MTU size for the interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:32
-msgid ""
-"Network traffic is always rejected from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:44
+msgid "Multicast interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
msgid "NodeInfo"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:30
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:24
msgid ""
"Optional node info. This must be a { \"key\": \"value\", ... } map or set as "
"null. This is entirely optional but, if set, is visible to the whole network "
@@ -243,79 +132,22 @@ msgstr ""
msgid "Peers"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Public encryption key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:26
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:33
-msgid "Public key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:42
-msgid ""
-"Regular expressions for which interfaces multicast peer discovery should be "
-"enabled on. If none specified, multicast peer discovery is disabled. The "
-"default value is .* which uses all interfaces."
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:49
+msgid "Regular expression"
msgstr ""
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:50
-msgid "Session firewall"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:11
-msgid "Session firewall settings"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:46
-msgid "Set .* to multicast on all interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+msgid "Send beacons"
msgstr ""
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:32
msgid "Settings"
msgstr "सेटिंग्ज"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:18
-msgid "Signing private key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:17
-msgid "Signing public key"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:14
msgid "Status"
msgstr "स्थिती"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "Subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
-msgid ""
-"The port number to be used for the link-local TCP listeners for the "
-"configured MulticastInterfaces. This option does not affect "
-"listenersspecified in the Listen option. Unless you plan to firewall link-"
-"localtraffic, it is best to leave this as the default value of 0. This "
-"option cannot currently be changed by reloading config during runtime."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:11
-msgid "Tunnel Routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:59
-msgid "Tunnel routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:24
-msgid "Whitelisted public keys"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:3
msgid "Yggdrasil"
msgstr ""
@@ -328,6 +160,12 @@ msgstr ""
msgid "Yggdrasil's network interface name"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:58
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:40
msgid "e.g. tcp://0.0.0.0:0 or tcp://[::]:0"
msgstr ""
+
+#~ msgid "Allow from direct"
+#~ msgstr "थेट परवानगी द्या"
+
+#~ msgid "Allow from remote"
+#~ msgstr "रिमोटमधून परवानगी द्या"
diff --git a/applications/luci-app-yggdrasil/po/ms/yggdrasil.po b/applications/luci-app-yggdrasil/po/ms/yggdrasil.po
index 93db9fb911..01d73bb385 100644
--- a/applications/luci-app-yggdrasil/po/ms/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/ms/yggdrasil.po
@@ -8,51 +8,7 @@ msgstr ""
msgid "Active peers"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:56
-msgid "Address to listen for incoming connections"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:16
-msgid "Allow from direct"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:18
-msgid "Allow from remote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:17
-msgid "Allow network traffic from directly connected peers"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:19
-msgid ""
-"Allow network traffic from remote nodes on the network that you are not "
-"directly peered with"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid ""
-"Allow outbound network traffic regardless of AllowFromDirect or "
-"AllowFromRemote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:14
-msgid ""
-"Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively "
-"allows you to use Yggdrasil to route to, or to bridge other networks, "
-"similar to a VPN tunnel. Tunnelling works between any two nodes and does not "
-"require them to be directly peered."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid "Always allow outbound"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:31
-msgid "Blacklisted public keys"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:17
msgid ""
"By default, nodeinfo contains some defaults including the platform, "
"architecture and Yggdrasil version. These can help when surveying the "
@@ -61,12 +17,19 @@ msgid ""
"specified."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "Enable NodeInfo privacy"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
+msgid ""
+"Configuration for which interfaces multicast peer discovery should be "
+"enabled on. Regex is a regular expression which is matched against an "
+"interface name, and interfaces use the first configuration that they match "
+"gainst. Beacon configures whether or not the node should send link-local "
+"multicast beacons to advertise their presence, while listening for incoming "
+"connections on Port. Listen controls whether or not the node listens for "
+"multicast beacons and opens outgoing connections."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:14
-msgid "Enable session firewall"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
+msgid "Enable NodeInfo privacy"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:11
@@ -90,82 +53,20 @@ msgstr ""
msgid "Grant access to LuCI app yggdrasil"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:26
-msgid "IPv4 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:19
-msgid "IPv4 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-msgid "IPv4 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:20
-msgid "IPv4 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:27
-msgid ""
-"IPv4 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:40
-msgid "IPv6 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:33
-msgid "IPv6 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "IPv6 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:34
-msgid "IPv6 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:41
-msgid ""
-"IPv6 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges (or the Yggdrasil node's IPv6 address/subnet) will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:15
-msgid ""
-"If disabled, network traffic from any node will be allowed. If enabled, the "
-"below rules apply"
-msgstr ""
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:25
msgid "Interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
-msgid "Interface name"
-msgstr ""
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
msgid "Interface peers"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:16
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:19
msgid "Keep this private. When compromised, generate a new keypair and IPv6."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "Link-local TCP port"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:52
+msgid "Link-local port"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:21
@@ -184,11 +85,11 @@ msgid ""
"when you may connect via different interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:33
msgid "Listen addresses"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:34
msgid ""
"Listen addresses for incoming connections. You will need to add listeners in "
"order to accept incoming peerings from non-local nodes. Multicast peer "
@@ -197,35 +98,23 @@ msgid ""
"[::]:0 to listen on all interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
-msgid "MTU size for the interface"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:39
-msgid "Maximum size of all switch queues combined"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:41
-msgid "Multicast interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+msgid "Listen for beacons"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:25
-msgid ""
-"Network traffic is always accepted from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:31
+msgid "MTU size for the interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:32
-msgid ""
-"Network traffic is always rejected from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:44
+msgid "Multicast interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
msgid "NodeInfo"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:30
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:24
msgid ""
"Optional node info. This must be a { \"key\": \"value\", ... } map or set as "
"null. This is entirely optional but, if set, is visible to the whole network "
@@ -237,79 +126,22 @@ msgstr ""
msgid "Peers"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Public encryption key"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:49
+msgid "Regular expression"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:26
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:33
-msgid "Public key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:42
-msgid ""
-"Regular expressions for which interfaces multicast peer discovery should be "
-"enabled on. If none specified, multicast peer discovery is disabled. The "
-"default value is .* which uses all interfaces."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:50
-msgid "Session firewall"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:11
-msgid "Session firewall settings"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:46
-msgid "Set .* to multicast on all interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+msgid "Send beacons"
msgstr ""
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:32
msgid "Settings"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:18
-msgid "Signing private key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:17
-msgid "Signing public key"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:14
msgid "Status"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "Subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
-msgid ""
-"The port number to be used for the link-local TCP listeners for the "
-"configured MulticastInterfaces. This option does not affect "
-"listenersspecified in the Listen option. Unless you plan to firewall link-"
-"localtraffic, it is best to leave this as the default value of 0. This "
-"option cannot currently be changed by reloading config during runtime."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:11
-msgid "Tunnel Routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:59
-msgid "Tunnel routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:24
-msgid "Whitelisted public keys"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:3
msgid "Yggdrasil"
msgstr ""
@@ -322,6 +154,6 @@ msgstr ""
msgid "Yggdrasil's network interface name"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:58
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:40
msgid "e.g. tcp://0.0.0.0:0 or tcp://[::]:0"
msgstr ""
diff --git a/applications/luci-app-yggdrasil/po/nb_NO/yggdrasil.po b/applications/luci-app-yggdrasil/po/nb_NO/yggdrasil.po
index b7f860f363..7444055fb6 100644
--- a/applications/luci-app-yggdrasil/po/nb_NO/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/nb_NO/yggdrasil.po
@@ -14,51 +14,7 @@ msgstr ""
msgid "Active peers"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:56
-msgid "Address to listen for incoming connections"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:16
-msgid "Allow from direct"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:18
-msgid "Allow from remote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:17
-msgid "Allow network traffic from directly connected peers"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:19
-msgid ""
-"Allow network traffic from remote nodes on the network that you are not "
-"directly peered with"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid ""
-"Allow outbound network traffic regardless of AllowFromDirect or "
-"AllowFromRemote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:14
-msgid ""
-"Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively "
-"allows you to use Yggdrasil to route to, or to bridge other networks, "
-"similar to a VPN tunnel. Tunnelling works between any two nodes and does not "
-"require them to be directly peered."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid "Always allow outbound"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:31
-msgid "Blacklisted public keys"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:17
msgid ""
"By default, nodeinfo contains some defaults including the platform, "
"architecture and Yggdrasil version. These can help when surveying the "
@@ -67,12 +23,19 @@ msgid ""
"specified."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "Enable NodeInfo privacy"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
+msgid ""
+"Configuration for which interfaces multicast peer discovery should be "
+"enabled on. Regex is a regular expression which is matched against an "
+"interface name, and interfaces use the first configuration that they match "
+"gainst. Beacon configures whether or not the node should send link-local "
+"multicast beacons to advertise their presence, while listening for incoming "
+"connections on Port. Listen controls whether or not the node listens for "
+"multicast beacons and opens outgoing connections."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:14
-msgid "Enable session firewall"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
+msgid "Enable NodeInfo privacy"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:11
@@ -96,82 +59,20 @@ msgstr ""
msgid "Grant access to LuCI app yggdrasil"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:26
-msgid "IPv4 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:19
-msgid "IPv4 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-msgid "IPv4 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:20
-msgid "IPv4 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:27
-msgid ""
-"IPv4 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:40
-msgid "IPv6 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:33
-msgid "IPv6 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "IPv6 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:34
-msgid "IPv6 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:41
-msgid ""
-"IPv6 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges (or the Yggdrasil node's IPv6 address/subnet) will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:15
-msgid ""
-"If disabled, network traffic from any node will be allowed. If enabled, the "
-"below rules apply"
-msgstr ""
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:25
msgid "Interface"
msgstr "Grensesnitt"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
-msgid "Interface name"
-msgstr ""
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
msgid "Interface peers"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:16
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:19
msgid "Keep this private. When compromised, generate a new keypair and IPv6."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "Link-local TCP port"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:52
+msgid "Link-local port"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:21
@@ -190,11 +91,11 @@ msgid ""
"when you may connect via different interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:33
msgid "Listen addresses"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:34
msgid ""
"Listen addresses for incoming connections. You will need to add listeners in "
"order to accept incoming peerings from non-local nodes. Multicast peer "
@@ -203,35 +104,23 @@ msgid ""
"[::]:0 to listen on all interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
-msgid "MTU size for the interface"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:39
-msgid "Maximum size of all switch queues combined"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:41
-msgid "Multicast interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+msgid "Listen for beacons"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:25
-msgid ""
-"Network traffic is always accepted from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:31
+msgid "MTU size for the interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:32
-msgid ""
-"Network traffic is always rejected from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:44
+msgid "Multicast interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
msgid "NodeInfo"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:30
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:24
msgid ""
"Optional node info. This must be a { \"key\": \"value\", ... } map or set as "
"null. This is entirely optional but, if set, is visible to the whole network "
@@ -243,79 +132,22 @@ msgstr ""
msgid "Peers"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Public encryption key"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:49
+msgid "Regular expression"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:26
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:33
-msgid "Public key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:42
-msgid ""
-"Regular expressions for which interfaces multicast peer discovery should be "
-"enabled on. If none specified, multicast peer discovery is disabled. The "
-"default value is .* which uses all interfaces."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:50
-msgid "Session firewall"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:11
-msgid "Session firewall settings"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:46
-msgid "Set .* to multicast on all interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+msgid "Send beacons"
msgstr ""
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:32
msgid "Settings"
msgstr "Innstillinger"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:18
-msgid "Signing private key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:17
-msgid "Signing public key"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:14
msgid "Status"
msgstr "Status"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "Subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
-msgid ""
-"The port number to be used for the link-local TCP listeners for the "
-"configured MulticastInterfaces. This option does not affect "
-"listenersspecified in the Listen option. Unless you plan to firewall link-"
-"localtraffic, it is best to leave this as the default value of 0. This "
-"option cannot currently be changed by reloading config during runtime."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:11
-msgid "Tunnel Routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:59
-msgid "Tunnel routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:24
-msgid "Whitelisted public keys"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:3
msgid "Yggdrasil"
msgstr ""
@@ -328,6 +160,6 @@ msgstr ""
msgid "Yggdrasil's network interface name"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:58
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:40
msgid "e.g. tcp://0.0.0.0:0 or tcp://[::]:0"
msgstr ""
diff --git a/applications/luci-app-yggdrasil/po/pl/yggdrasil.po b/applications/luci-app-yggdrasil/po/pl/yggdrasil.po
index 0e0905d1c6..a2e8983a3c 100644
--- a/applications/luci-app-yggdrasil/po/pl/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/pl/yggdrasil.po
@@ -15,59 +15,7 @@ msgstr ""
msgid "Active peers"
msgstr "Aktywne peery"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:56
-msgid "Address to listen for incoming connections"
-msgstr "Adres do nasłuchiwania połączeń przychodzących"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:16
-msgid "Allow from direct"
-msgstr "Zezwalaj bezpośrednio"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:18
-msgid "Allow from remote"
-msgstr "Zezwalaj na zdalne"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:17
-msgid "Allow network traffic from directly connected peers"
-msgstr "Zezwól na ruch sieciowy z bezpośrednio połączonymi peerami"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:19
-msgid ""
-"Allow network traffic from remote nodes on the network that you are not "
-"directly peered with"
-msgstr ""
-"Zezwól na ruch sieciowy ze zdalnymi węzłami w sieci, które nie są "
-"bezpośrednio podłączone do sieci"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid ""
-"Allow outbound network traffic regardless of AllowFromDirect or "
-"AllowFromRemote"
-msgstr ""
-"Zezwól na ruch sieciowy wychodzący niezależnie od AllowFromDirect lub "
-"AllowFromRemote"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:14
-msgid ""
-"Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively "
-"allows you to use Yggdrasil to route to, or to bridge other networks, "
-"similar to a VPN tunnel. Tunnelling works between any two nodes and does not "
-"require them to be directly peered."
-msgstr ""
-"Zezwalaj na tunelowanie ruchu innego niż Yggdrasil przez Yggdrasil. Pozwala "
-"to skutecznie używać Yggdrasil do trasowania lub mostkowania innych sieci, "
-"podobnie jak tunel VPN. Tunelowanie działa między dowolnymi dwoma węzłami i "
-"nie wymaga ich bezpośredniego podglądu."
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid "Always allow outbound"
-msgstr "Zawsze zezwalaj na połączenia wychodzące"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:31
-msgid "Blacklisted public keys"
-msgstr "Klucze publiczne na czarnej liście"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:17
msgid ""
"By default, nodeinfo contains some defaults including the platform, "
"architecture and Yggdrasil version. These can help when surveying the "
@@ -81,14 +29,21 @@ msgstr ""
"nodeinfo zapobiega temu, tak że tylko elementy określone w „NodeInfo” są "
"odsyłane, jeśli są określone."
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
+msgid ""
+"Configuration for which interfaces multicast peer discovery should be "
+"enabled on. Regex is a regular expression which is matched against an "
+"interface name, and interfaces use the first configuration that they match "
+"gainst. Beacon configures whether or not the node should send link-local "
+"multicast beacons to advertise their presence, while listening for incoming "
+"connections on Port. Listen controls whether or not the node listens for "
+"multicast beacons and opens outgoing connections."
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
msgid "Enable NodeInfo privacy"
msgstr "Włącz prywatność NodeInfo"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:14
-msgid "Enable session firewall"
-msgstr "Włącz sesje zapory sieciowej"
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:11
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:41
msgid "Encryption keys"
@@ -110,93 +65,23 @@ msgstr "Ustawienia główne"
msgid "Grant access to LuCI app yggdrasil"
msgstr "Udziel dostępu LuCI do aplikacji yggdrasil"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:26
-msgid "IPv4 local subnet"
-msgstr "Lokalna podsieć IPv4"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:19
-msgid "IPv4 remote subnet"
-msgstr "Zdalna podsieć IPv4"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-msgid "IPv4 subnet"
-msgstr "Podsieć IPv4"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:20
-msgid "IPv4 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-"Podsieci IPv6 należące do zdalnych węzłów, zmapowane do publicznych węzłów"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:27
-msgid ""
-"IPv4 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges will be tunnelled."
-msgstr ""
-"Podsieci IPv4 należące do końca tuneli tego węzła. Tunelowany będzie tylko "
-"ruch z tych zakresów."
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:40
-msgid "IPv6 local subnet"
-msgstr "Lokalna podsieć IPv6"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:33
-msgid "IPv6 remote subnet"
-msgstr "Zdalna podsieć IPv6"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "IPv6 subnet"
-msgstr "Podsieć IPv6"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:34
-msgid "IPv6 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-"Podsieci IPv6 należące do zdalnych węzłów, zmapowane do publicznych węzłów"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:41
-msgid ""
-"IPv6 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges (or the Yggdrasil node's IPv6 address/subnet) will be tunnelled."
-msgstr ""
-"Podsieci IPv6 należące do końca tuneli tego węzła. Tunelowany będzie tylko "
-"ruch z tych zakresów (lub adresu IPv6/podsieci węzła Yggdrasil)."
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:15
-msgid ""
-"If disabled, network traffic from any node will be allowed. If enabled, the "
-"below rules apply"
-msgstr ""
-"Jeśli jest wyłączona, ruch sieciowy z dowolnego węzła będzie dozwolony. "
-"Jeśli ta opcja jest włączona, obowiązują poniższe zasady"
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:25
msgid "Interface"
msgstr "Interfejs"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
-msgid "Interface name"
-msgstr "Nazwa interfejsu"
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
msgid "Interface peers"
msgstr "Interfejs peera"
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:16
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:19
msgid "Keep this private. When compromised, generate a new keypair and IPv6."
msgstr ""
"Zachowaj to w tajemnicy. W przypadku naruszenia bezpieczeństwa wygeneruj "
"nową parę kluczy i IPv6."
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Key"
-msgstr "Klucz"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "Link-local TCP port"
-msgstr "Link lokalnego portu TCP"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:52
+msgid "Link-local port"
+msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:21
msgid ""
@@ -223,11 +108,11 @@ msgstr ""
"powinieneś skorzystać z tej sekcji, gdy możesz łączyć się za pośrednictwem "
"różnych interfejsów."
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:33
msgid "Listen addresses"
msgstr "Nasłuchiwanie adresów"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:34
msgid ""
"Listen addresses for incoming connections. You will need to add listeners in "
"order to accept incoming peerings from non-local nodes. Multicast peer "
@@ -242,39 +127,23 @@ msgstr ""
"określony w formacie URI jak wyżej, np. tcp: //0.0.0.0: 0 lub tcp: // [::]: "
"0, aby nasłuchiwać na wszystkich interfejsach."
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+msgid "Listen for beacons"
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:31
msgid "MTU size for the interface"
msgstr "Rozmiar MTU dla interfejsu"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:39
-msgid "Maximum size of all switch queues combined"
-msgstr "Maksymalny rozmiar wszystkich kolejek przełączników łącznie"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:41
-msgid "Multicast interfaces"
-msgstr "Interfejsy Multicast"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:25
-msgid ""
-"Network traffic is always accepted from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:44
+msgid "Multicast interface"
msgstr ""
-"Ruch sieciowy jest zawsze akceptowany od tych peerów, niezależnie od "
-"AllowFromDirect lub AllowFromRemote"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:32
-msgid ""
-"Network traffic is always rejected from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
-msgstr ""
-"Ruch sieciowy jest zawsze odrzucany od tych peerów, niezależnie od "
-"AllowFromDirect lub AllowFromRemote"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
msgid "NodeInfo"
msgstr "Informacje o węźle"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:30
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:24
msgid ""
"Optional node info. This must be a { \"key\": \"value\", ... } map or set as "
"null. This is entirely optional but, if set, is visible to the whole network "
@@ -289,89 +158,22 @@ msgstr ""
msgid "Peers"
msgstr "Peery"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Public encryption key"
-msgstr "Publiczny klucz szyfrujący"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:26
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:33
-msgid "Public key"
-msgstr "Klucz publiczny"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:42
-msgid ""
-"Regular expressions for which interfaces multicast peer discovery should be "
-"enabled on. If none specified, multicast peer discovery is disabled. The "
-"default value is .* which uses all interfaces."
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:49
+msgid "Regular expression"
msgstr ""
-"Wyrażenia regularne, dla których interfejsy multicast peer discovery powinny "
-"być włączone. Jeśli żaden z nich nie został określony, funkcja multi-cast "
-"peer discovery jest wyłączona. Domyślną wartością jest .*, która "
-"wykorzystuje wszystkie interfejsy."
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:50
-msgid "Session firewall"
-msgstr "Sesja zapory sieciowej"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:11
-msgid "Session firewall settings"
-msgstr "Ustawienia sesji zapory sieciowej"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:46
-msgid "Set .* to multicast on all interfaces"
-msgstr "Ustaw .* na multicast dla wszystkich interfejsów"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+msgid "Send beacons"
+msgstr ""
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:32
msgid "Settings"
msgstr "Ustawienia"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:18
-msgid "Signing private key"
-msgstr "Podpisywanie klucza prywatnego"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:17
-msgid "Signing public key"
-msgstr "Podpisywanie klucza publicznego"
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:14
msgid "Status"
msgstr "Status"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "Subnet"
-msgstr "Podsieć"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
-msgid ""
-"The port number to be used for the link-local TCP listeners for the "
-"configured MulticastInterfaces. This option does not affect "
-"listenersspecified in the Listen option. Unless you plan to firewall link-"
-"localtraffic, it is best to leave this as the default value of 0. This "
-"option cannot currently be changed by reloading config during runtime."
-msgstr ""
-"Numer portu, który ma być używany dla lokalnych nasłuchiwaczy TCP łącza dla "
-"skonfigurowanych interfejsów MulticastInterfaces. Ta opcja nie wpływa na "
-"słuchaczy określonych w opcji Listen. O ile nie planujesz zapory ogniowej "
-"link-localtraffic, najlepiej pozostawić tę wartość jako domyślną 0. Tej "
-"opcji nie można obecnie zmienić poprzez ponowne załadowanie config podczas "
-"działania."
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:11
-msgid "Tunnel Routing"
-msgstr "Trasowanie tunelu"
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:59
-msgid "Tunnel routing"
-msgstr "Trasowanie tunelu"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:24
-msgid "Whitelisted public keys"
-msgstr "Klucze publiczne z białej listy"
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:3
msgid "Yggdrasil"
msgstr "Yggdrasil"
@@ -384,10 +186,190 @@ msgstr "Status węzła Yggdrasil"
msgid "Yggdrasil's network interface name"
msgstr "Nazwa interfejsu sieciowego Yggdrasil'a"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:58
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:40
msgid "e.g. tcp://0.0.0.0:0 or tcp://[::]:0"
msgstr "np. tcp://0.0.0.0:0 or tcp://[::]:0"
+#~ msgid "Address to listen for incoming connections"
+#~ msgstr "Adres do nasłuchiwania połączeń przychodzących"
+
+#~ msgid "Allow from direct"
+#~ msgstr "Zezwalaj bezpośrednio"
+
+#~ msgid "Allow from remote"
+#~ msgstr "Zezwalaj na zdalne"
+
+#~ msgid "Allow network traffic from directly connected peers"
+#~ msgstr "Zezwól na ruch sieciowy z bezpośrednio połączonymi peerami"
+
+#~ msgid ""
+#~ "Allow network traffic from remote nodes on the network that you are not "
+#~ "directly peered with"
+#~ msgstr ""
+#~ "Zezwól na ruch sieciowy ze zdalnymi węzłami w sieci, które nie są "
+#~ "bezpośrednio podłączone do sieci"
+
+#~ msgid ""
+#~ "Allow outbound network traffic regardless of AllowFromDirect or "
+#~ "AllowFromRemote"
+#~ msgstr ""
+#~ "Zezwól na ruch sieciowy wychodzący niezależnie od AllowFromDirect lub "
+#~ "AllowFromRemote"
+
+#~ msgid ""
+#~ "Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively "
+#~ "allows you to use Yggdrasil to route to, or to bridge other networks, "
+#~ "similar to a VPN tunnel. Tunnelling works between any two nodes and does "
+#~ "not require them to be directly peered."
+#~ msgstr ""
+#~ "Zezwalaj na tunelowanie ruchu innego niż Yggdrasil przez Yggdrasil. "
+#~ "Pozwala to skutecznie używać Yggdrasil do trasowania lub mostkowania "
+#~ "innych sieci, podobnie jak tunel VPN. Tunelowanie działa między dowolnymi "
+#~ "dwoma węzłami i nie wymaga ich bezpośredniego podglądu."
+
+#~ msgid "Always allow outbound"
+#~ msgstr "Zawsze zezwalaj na połączenia wychodzące"
+
+#~ msgid "Blacklisted public keys"
+#~ msgstr "Klucze publiczne na czarnej liście"
+
+#~ msgid "Enable session firewall"
+#~ msgstr "Włącz sesje zapory sieciowej"
+
+#~ msgid "IPv4 local subnet"
+#~ msgstr "Lokalna podsieć IPv4"
+
+#~ msgid "IPv4 remote subnet"
+#~ msgstr "Zdalna podsieć IPv4"
+
+#~ msgid "IPv4 subnet"
+#~ msgstr "Podsieć IPv4"
+
+#~ msgid "IPv4 subnets belonging to remote nodes, mapped to the node's public"
+#~ msgstr ""
+#~ "Podsieci IPv6 należące do zdalnych węzłów, zmapowane do publicznych węzłów"
+
+#~ msgid ""
+#~ "IPv4 subnets belonging to this node's end of the tunnels. Only traffic "
+#~ "from these ranges will be tunnelled."
+#~ msgstr ""
+#~ "Podsieci IPv4 należące do końca tuneli tego węzła. Tunelowany będzie "
+#~ "tylko ruch z tych zakresów."
+
+#~ msgid "IPv6 local subnet"
+#~ msgstr "Lokalna podsieć IPv6"
+
+#~ msgid "IPv6 remote subnet"
+#~ msgstr "Zdalna podsieć IPv6"
+
+#~ msgid "IPv6 subnet"
+#~ msgstr "Podsieć IPv6"
+
+#~ msgid "IPv6 subnets belonging to remote nodes, mapped to the node's public"
+#~ msgstr ""
+#~ "Podsieci IPv6 należące do zdalnych węzłów, zmapowane do publicznych węzłów"
+
+#~ msgid ""
+#~ "IPv6 subnets belonging to this node's end of the tunnels. Only traffic "
+#~ "from these ranges (or the Yggdrasil node's IPv6 address/subnet) will be "
+#~ "tunnelled."
+#~ msgstr ""
+#~ "Podsieci IPv6 należące do końca tuneli tego węzła. Tunelowany będzie "
+#~ "tylko ruch z tych zakresów (lub adresu IPv6/podsieci węzła Yggdrasil)."
+
+#~ msgid ""
+#~ "If disabled, network traffic from any node will be allowed. If enabled, "
+#~ "the below rules apply"
+#~ msgstr ""
+#~ "Jeśli jest wyłączona, ruch sieciowy z dowolnego węzła będzie dozwolony. "
+#~ "Jeśli ta opcja jest włączona, obowiązują poniższe zasady"
+
+#~ msgid "Interface name"
+#~ msgstr "Nazwa interfejsu"
+
+#~ msgid "Key"
+#~ msgstr "Klucz"
+
+#~ msgid "Link-local TCP port"
+#~ msgstr "Link lokalnego portu TCP"
+
+#~ msgid "Maximum size of all switch queues combined"
+#~ msgstr "Maksymalny rozmiar wszystkich kolejek przełączników łącznie"
+
+#~ msgid "Multicast interfaces"
+#~ msgstr "Interfejsy Multicast"
+
+#~ msgid ""
+#~ "Network traffic is always accepted from those peers, regardless of "
+#~ "AllowFromDirect or AllowFromRemote"
+#~ msgstr ""
+#~ "Ruch sieciowy jest zawsze akceptowany od tych peerów, niezależnie od "
+#~ "AllowFromDirect lub AllowFromRemote"
+
+#~ msgid ""
+#~ "Network traffic is always rejected from those peers, regardless of "
+#~ "AllowFromDirect or AllowFromRemote"
+#~ msgstr ""
+#~ "Ruch sieciowy jest zawsze odrzucany od tych peerów, niezależnie od "
+#~ "AllowFromDirect lub AllowFromRemote"
+
+#~ msgid "Public encryption key"
+#~ msgstr "Publiczny klucz szyfrujący"
+
+#~ msgid "Public key"
+#~ msgstr "Klucz publiczny"
+
+#~ msgid ""
+#~ "Regular expressions for which interfaces multicast peer discovery should "
+#~ "be enabled on. If none specified, multicast peer discovery is disabled. "
+#~ "The default value is .* which uses all interfaces."
+#~ msgstr ""
+#~ "Wyrażenia regularne, dla których interfejsy multicast peer discovery "
+#~ "powinny być włączone. Jeśli żaden z nich nie został określony, funkcja "
+#~ "multi-cast peer discovery jest wyłączona. Domyślną wartością jest .*, "
+#~ "która wykorzystuje wszystkie interfejsy."
+
+#~ msgid "Session firewall"
+#~ msgstr "Sesja zapory sieciowej"
+
+#~ msgid "Session firewall settings"
+#~ msgstr "Ustawienia sesji zapory sieciowej"
+
+#~ msgid "Set .* to multicast on all interfaces"
+#~ msgstr "Ustaw .* na multicast dla wszystkich interfejsów"
+
+#~ msgid "Signing private key"
+#~ msgstr "Podpisywanie klucza prywatnego"
+
+#~ msgid "Signing public key"
+#~ msgstr "Podpisywanie klucza publicznego"
+
+#~ msgid "Subnet"
+#~ msgstr "Podsieć"
+
+#~ msgid ""
+#~ "The port number to be used for the link-local TCP listeners for the "
+#~ "configured MulticastInterfaces. This option does not affect "
+#~ "listenersspecified in the Listen option. Unless you plan to firewall link-"
+#~ "localtraffic, it is best to leave this as the default value of 0. This "
+#~ "option cannot currently be changed by reloading config during runtime."
+#~ msgstr ""
+#~ "Numer portu, który ma być używany dla lokalnych nasłuchiwaczy TCP łącza "
+#~ "dla skonfigurowanych interfejsów MulticastInterfaces. Ta opcja nie wpływa "
+#~ "na słuchaczy określonych w opcji Listen. O ile nie planujesz zapory "
+#~ "ogniowej link-localtraffic, najlepiej pozostawić tę wartość jako domyślną "
+#~ "0. Tej opcji nie można obecnie zmienić poprzez ponowne załadowanie config "
+#~ "podczas działania."
+
+#~ msgid "Tunnel Routing"
+#~ msgstr "Trasowanie tunelu"
+
+#~ msgid "Tunnel routing"
+#~ msgstr "Trasowanie tunelu"
+
+#~ msgid "Whitelisted public keys"
+#~ msgstr "Klucze publiczne z białej listy"
+
#~ msgid "Enable tap mode"
#~ msgstr "Włącz tryb dotykowy"
diff --git a/applications/luci-app-yggdrasil/po/pt/yggdrasil.po b/applications/luci-app-yggdrasil/po/pt/yggdrasil.po
index 6bb5b3b6a0..ba7a38da85 100644
--- a/applications/luci-app-yggdrasil/po/pt/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/pt/yggdrasil.po
@@ -14,59 +14,7 @@ msgstr ""
msgid "Active peers"
msgstr "Pares ativos"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:56
-msgid "Address to listen for incoming connections"
-msgstr "Endereço para escuta de conexões de entrada"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:16
-msgid "Allow from direct"
-msgstr "Aceitar diretamente"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:18
-msgid "Allow from remote"
-msgstr "Permitir a partir do remoto"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:17
-msgid "Allow network traffic from directly connected peers"
-msgstr "Permitir o tráfego de rede vindo de pares diretamente conectados"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:19
-msgid ""
-"Allow network traffic from remote nodes on the network that you are not "
-"directly peered with"
-msgstr ""
-"Permitir o tráfego de rede vindo de nós remotos na rede que você não esteja "
-"diretamente pareado"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid ""
-"Allow outbound network traffic regardless of AllowFromDirect or "
-"AllowFromRemote"
-msgstr ""
-"Permitir o tráfego de rede de saída, independentemente do AllowFromDirect ou "
-"AllowFromRemote"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:14
-msgid ""
-"Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively "
-"allows you to use Yggdrasil to route to, or to bridge other networks, "
-"similar to a VPN tunnel. Tunnelling works between any two nodes and does not "
-"require them to be directly peered."
-msgstr ""
-"Permitir o tráfego em túneis sem Yggdrasil sobre o Yggdrasil. Isto permite "
-"usar o Yggdrasil de forma efetiva para rotear ou fazer a ponte para outras "
-"redes, semelhante a um túnel VPN. A construção de túneis funciona entre "
-"quaisquer dois nós e não requer que estejam diretamente pareados."
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid "Always allow outbound"
-msgstr "Sempre permitir a saída"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:31
-msgid "Blacklisted public keys"
-msgstr "Lista negra de chaves públicas"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:17
msgid ""
"By default, nodeinfo contains some defaults including the platform, "
"architecture and Yggdrasil version. These can help when surveying the "
@@ -80,14 +28,21 @@ msgstr ""
"do nodeinfo impede isso, de modo que somente os itens especificados no "
"\"NodeInfo\" sejam enviados de volta caso sejam especificados."
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
+msgid ""
+"Configuration for which interfaces multicast peer discovery should be "
+"enabled on. Regex is a regular expression which is matched against an "
+"interface name, and interfaces use the first configuration that they match "
+"gainst. Beacon configures whether or not the node should send link-local "
+"multicast beacons to advertise their presence, while listening for incoming "
+"connections on Port. Listen controls whether or not the node listens for "
+"multicast beacons and opens outgoing connections."
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
msgid "Enable NodeInfo privacy"
msgstr "Ativar a privacidade NodeInfo"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:14
-msgid "Enable session firewall"
-msgstr "Ativar a sessão do firewall"
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:11
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:41
msgid "Encryption keys"
@@ -109,93 +64,22 @@ msgstr "Configurações gerais"
msgid "Grant access to LuCI app yggdrasil"
msgstr "Conceder acesso UCI à app LuCI yggdrasil"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:26
-msgid "IPv4 local subnet"
-msgstr "Subrede local de IPv4"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:19
-msgid "IPv4 remote subnet"
-msgstr "Subrede de IPV4 remota"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-msgid "IPv4 subnet"
-msgstr "Subrede de IPv4"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:20
-msgid "IPv4 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-"Subredes de IPv4 pertencentes a nós remotos, mapeadas para o público do nó"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:27
-msgid ""
-"IPv4 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges will be tunnelled."
-msgstr ""
-"Subredes de IPv4 pertencentes ao final dos túneis deste nó. Só o tráfego "
-"destas faixas serão feito por tunelamento."
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:40
-msgid "IPv6 local subnet"
-msgstr "Subrede local de IPv6"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:33
-msgid "IPv6 remote subnet"
-msgstr "Subrede remota de IPv6"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "IPv6 subnet"
-msgstr "Subrede de IPv6"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:34
-msgid "IPv6 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-"Subredes de IPv6 pertencentes a nós remotos, mapeadas para o público do nó"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:41
-msgid ""
-"IPv6 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges (or the Yggdrasil node's IPv6 address/subnet) will be tunnelled."
-msgstr ""
-"Subredes de IPv6 pertencentes ao final dos túneis deste nó. Somente o "
-"tráfego destas faixas (ou o endereço/subrede IPv6 do nó Yggdrasil) será "
-"feito por tunelamento."
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:15
-msgid ""
-"If disabled, network traffic from any node will be allowed. If enabled, the "
-"below rules apply"
-msgstr ""
-"Se desativado, o tráfego de rede de qualquer nó será permitido. Se ativado, "
-"as regras abaixo se aplicam"
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:25
msgid "Interface"
msgstr "Interface"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
-msgid "Interface name"
-msgstr "Nome da interface"
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
msgid "Interface peers"
msgstr "Pares de interface"
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:16
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:19
msgid "Keep this private. When compromised, generate a new keypair and IPv6."
msgstr ""
"Manter privado. Quando for comprometido, gerar um novo par de chaves e IPv6."
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Key"
-msgstr "Chave"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "Link-local TCP port"
-msgstr "Vincular porta TCP local"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:52
+msgid "Link-local port"
+msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:21
msgid ""
@@ -205,8 +89,8 @@ msgid ""
"\"Peers\" section instead."
msgstr ""
"Lista de cadeias de caracteres de conexão para conexões peer de saída no "
-"formato URI, organizada por interface de origem, por exemplo, { \"eth0\": [ "
-"tcp://a.b.c.d:e ] }. Observe que as conexões SOCKS NÃO serão afetados por "
+"formato URI, organizada por interface de origem, por exemplo, { \"eth0\": "
+"[ tcp://a.b.c.d:e ] }. Observe que as conexões SOCKS NÃO serão afetados por "
"essa opção e devem ir à secção \"Peers\"."
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:12
@@ -221,11 +105,11 @@ msgstr ""
"obedecerão à tabela de roteamento do sistema operacional, portanto deve usar "
"esta secção quando se pode conectar através de diferentes interfaces."
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:33
msgid "Listen addresses"
msgstr "Endereços de escuta"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:34
msgid ""
"Listen addresses for incoming connections. You will need to add listeners in "
"order to accept incoming peerings from non-local nodes. Multicast peer "
@@ -239,46 +123,30 @@ msgstr ""
"especificado em formato URI como acima, por exemplo, tcp://0.0.0.0:0 ou "
"tcp://[:]:0 para que seja possível ouvir em todas as interfaces."
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+msgid "Listen for beacons"
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:31
msgid "MTU size for the interface"
msgstr "Tamanho da MTU para a interface"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:39
-msgid "Maximum size of all switch queues combined"
-msgstr "Tamanho máximo de todas as filas de switch combinadas"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:41
-msgid "Multicast interfaces"
-msgstr "Interfaces multicast"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:25
-msgid ""
-"Network traffic is always accepted from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:44
+msgid "Multicast interface"
msgstr ""
-"O tráfego de rede é sempre aceito vindo desses pares, independentemente do "
-"AllowFromDirect ou AllowFromRemote"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:32
-msgid ""
-"Network traffic is always rejected from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
-msgstr ""
-"O tráfego de rede é sempre rejeitado vindo desses pares, independentemente "
-"do AllowFromDirect ou AllowFromRemote"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
msgid "NodeInfo"
msgstr "NodeInfo"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:30
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:24
msgid ""
"Optional node info. This must be a { \"key\": \"value\", ... } map or set as "
"null. This is entirely optional but, if set, is visible to the whole network "
"on request."
msgstr ""
-"Informações opcionais do nó. Isto deve ser um mapa { \"chave\": \"valor\", "
-"... } ou definido como nulo. É totalmente opcional, mas, se definido, é "
+"Informações opcionais do nó. Isto deve ser um mapa { \"chave\": \"valor"
+"\", ... } ou definido como nulo. É totalmente opcional, mas, se definido, é "
"visível para toda a rede quando requisitado."
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
@@ -286,89 +154,22 @@ msgstr ""
msgid "Peers"
msgstr "Parceiros"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Public encryption key"
-msgstr "Chave de criptografia pública"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:26
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:33
-msgid "Public key"
-msgstr "Chave pública"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:42
-msgid ""
-"Regular expressions for which interfaces multicast peer discovery should be "
-"enabled on. If none specified, multicast peer discovery is disabled. The "
-"default value is .* which uses all interfaces."
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:49
+msgid "Regular expression"
msgstr ""
-"Expressões regulares para as quais as interfaces multicast de descoberta de "
-"pares devem ser ativadas. Caso nenhuma seja especificada, a descoberta de "
-"multicast de pares será desativada. O valor predefinido é .* na qual usa "
-"todas as interfaces."
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:50
-msgid "Session firewall"
-msgstr "Sessão do firewall"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:11
-msgid "Session firewall settings"
-msgstr "Configuração da sessão do firewall"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:46
-msgid "Set .* to multicast on all interfaces"
-msgstr "Definir .* para multicast em todas as interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+msgid "Send beacons"
+msgstr ""
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:32
msgid "Settings"
msgstr "Configurações"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:18
-msgid "Signing private key"
-msgstr "Assinatura de chave privada"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:17
-msgid "Signing public key"
-msgstr "Assinatura de chave pública"
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:14
msgid "Status"
msgstr "Estado"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "Subnet"
-msgstr "Subrede"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
-msgid ""
-"The port number to be used for the link-local TCP listeners for the "
-"configured MulticastInterfaces. This option does not affect "
-"listenersspecified in the Listen option. Unless you plan to firewall link-"
-"localtraffic, it is best to leave this as the default value of 0. This "
-"option cannot currently be changed by reloading config during runtime."
-msgstr ""
-"O número da porta a ser usado para os ouvintes TCP locais de link para as "
-"interfaces Multicast configuradas. Esta opção não afeta os ouvintes "
-"especificados na opção Ouvir. A menos que você planeje aplicar regras de "
-"firewall no tráfego do link local, é melhor deixar isso como o valor padrão "
-"0. Esta opção atualmente não pode ser alterada ao recarregar a configuração "
-"durante o tempo de execução."
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:11
-msgid "Tunnel Routing"
-msgstr "Roteamento do Túnel"
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:59
-msgid "Tunnel routing"
-msgstr "Roteamento do túnel"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:24
-msgid "Whitelisted public keys"
-msgstr "Lista branca de chaves públicas"
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:3
msgid "Yggdrasil"
msgstr "Yggdrasil"
@@ -381,6 +182,188 @@ msgstr "Condição do nó do Yggdrasil"
msgid "Yggdrasil's network interface name"
msgstr "Nome da interface de rede Yggdrasil"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:58
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:40
msgid "e.g. tcp://0.0.0.0:0 or tcp://[::]:0"
msgstr "ex. tcp://0.0.0.0:0 ou tcp://[::]:0"
+
+#~ msgid "Address to listen for incoming connections"
+#~ msgstr "Endereço para escuta de conexões de entrada"
+
+#~ msgid "Allow from direct"
+#~ msgstr "Aceitar diretamente"
+
+#~ msgid "Allow from remote"
+#~ msgstr "Permitir a partir do remoto"
+
+#~ msgid "Allow network traffic from directly connected peers"
+#~ msgstr "Permitir o tráfego de rede vindo de pares diretamente conectados"
+
+#~ msgid ""
+#~ "Allow network traffic from remote nodes on the network that you are not "
+#~ "directly peered with"
+#~ msgstr ""
+#~ "Permitir o tráfego de rede vindo de nós remotos na rede que você não "
+#~ "esteja diretamente pareado"
+
+#~ msgid ""
+#~ "Allow outbound network traffic regardless of AllowFromDirect or "
+#~ "AllowFromRemote"
+#~ msgstr ""
+#~ "Permitir o tráfego de rede de saída, independentemente do AllowFromDirect "
+#~ "ou AllowFromRemote"
+
+#~ msgid ""
+#~ "Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively "
+#~ "allows you to use Yggdrasil to route to, or to bridge other networks, "
+#~ "similar to a VPN tunnel. Tunnelling works between any two nodes and does "
+#~ "not require them to be directly peered."
+#~ msgstr ""
+#~ "Permitir o tráfego em túneis sem Yggdrasil sobre o Yggdrasil. Isto "
+#~ "permite usar o Yggdrasil de forma efetiva para rotear ou fazer a ponte "
+#~ "para outras redes, semelhante a um túnel VPN. A construção de túneis "
+#~ "funciona entre quaisquer dois nós e não requer que estejam diretamente "
+#~ "pareados."
+
+#~ msgid "Always allow outbound"
+#~ msgstr "Sempre permitir a saída"
+
+#~ msgid "Blacklisted public keys"
+#~ msgstr "Lista negra de chaves públicas"
+
+#~ msgid "Enable session firewall"
+#~ msgstr "Ativar a sessão do firewall"
+
+#~ msgid "IPv4 local subnet"
+#~ msgstr "Subrede local de IPv4"
+
+#~ msgid "IPv4 remote subnet"
+#~ msgstr "Subrede de IPV4 remota"
+
+#~ msgid "IPv4 subnet"
+#~ msgstr "Subrede de IPv4"
+
+#~ msgid "IPv4 subnets belonging to remote nodes, mapped to the node's public"
+#~ msgstr ""
+#~ "Subredes de IPv4 pertencentes a nós remotos, mapeadas para o público do nó"
+
+#~ msgid ""
+#~ "IPv4 subnets belonging to this node's end of the tunnels. Only traffic "
+#~ "from these ranges will be tunnelled."
+#~ msgstr ""
+#~ "Subredes de IPv4 pertencentes ao final dos túneis deste nó. Só o tráfego "
+#~ "destas faixas serão feito por tunelamento."
+
+#~ msgid "IPv6 local subnet"
+#~ msgstr "Subrede local de IPv6"
+
+#~ msgid "IPv6 remote subnet"
+#~ msgstr "Subrede remota de IPv6"
+
+#~ msgid "IPv6 subnet"
+#~ msgstr "Subrede de IPv6"
+
+#~ msgid "IPv6 subnets belonging to remote nodes, mapped to the node's public"
+#~ msgstr ""
+#~ "Subredes de IPv6 pertencentes a nós remotos, mapeadas para o público do nó"
+
+#~ msgid ""
+#~ "IPv6 subnets belonging to this node's end of the tunnels. Only traffic "
+#~ "from these ranges (or the Yggdrasil node's IPv6 address/subnet) will be "
+#~ "tunnelled."
+#~ msgstr ""
+#~ "Subredes de IPv6 pertencentes ao final dos túneis deste nó. Somente o "
+#~ "tráfego destas faixas (ou o endereço/subrede IPv6 do nó Yggdrasil) será "
+#~ "feito por tunelamento."
+
+#~ msgid ""
+#~ "If disabled, network traffic from any node will be allowed. If enabled, "
+#~ "the below rules apply"
+#~ msgstr ""
+#~ "Se desativado, o tráfego de rede de qualquer nó será permitido. Se "
+#~ "ativado, as regras abaixo se aplicam"
+
+#~ msgid "Interface name"
+#~ msgstr "Nome da interface"
+
+#~ msgid "Key"
+#~ msgstr "Chave"
+
+#~ msgid "Link-local TCP port"
+#~ msgstr "Vincular porta TCP local"
+
+#~ msgid "Maximum size of all switch queues combined"
+#~ msgstr "Tamanho máximo de todas as filas de switch combinadas"
+
+#~ msgid "Multicast interfaces"
+#~ msgstr "Interfaces multicast"
+
+#~ msgid ""
+#~ "Network traffic is always accepted from those peers, regardless of "
+#~ "AllowFromDirect or AllowFromRemote"
+#~ msgstr ""
+#~ "O tráfego de rede é sempre aceito vindo desses pares, independentemente "
+#~ "do AllowFromDirect ou AllowFromRemote"
+
+#~ msgid ""
+#~ "Network traffic is always rejected from those peers, regardless of "
+#~ "AllowFromDirect or AllowFromRemote"
+#~ msgstr ""
+#~ "O tráfego de rede é sempre rejeitado vindo desses pares, "
+#~ "independentemente do AllowFromDirect ou AllowFromRemote"
+
+#~ msgid "Public encryption key"
+#~ msgstr "Chave de criptografia pública"
+
+#~ msgid "Public key"
+#~ msgstr "Chave pública"
+
+#~ msgid ""
+#~ "Regular expressions for which interfaces multicast peer discovery should "
+#~ "be enabled on. If none specified, multicast peer discovery is disabled. "
+#~ "The default value is .* which uses all interfaces."
+#~ msgstr ""
+#~ "Expressões regulares para as quais as interfaces multicast de descoberta "
+#~ "de pares devem ser ativadas. Caso nenhuma seja especificada, a descoberta "
+#~ "de multicast de pares será desativada. O valor predefinido é .* na qual "
+#~ "usa todas as interfaces."
+
+#~ msgid "Session firewall"
+#~ msgstr "Sessão do firewall"
+
+#~ msgid "Session firewall settings"
+#~ msgstr "Configuração da sessão do firewall"
+
+#~ msgid "Set .* to multicast on all interfaces"
+#~ msgstr "Definir .* para multicast em todas as interfaces"
+
+#~ msgid "Signing private key"
+#~ msgstr "Assinatura de chave privada"
+
+#~ msgid "Signing public key"
+#~ msgstr "Assinatura de chave pública"
+
+#~ msgid "Subnet"
+#~ msgstr "Subrede"
+
+#~ msgid ""
+#~ "The port number to be used for the link-local TCP listeners for the "
+#~ "configured MulticastInterfaces. This option does not affect "
+#~ "listenersspecified in the Listen option. Unless you plan to firewall link-"
+#~ "localtraffic, it is best to leave this as the default value of 0. This "
+#~ "option cannot currently be changed by reloading config during runtime."
+#~ msgstr ""
+#~ "O número da porta a ser usado para os ouvintes TCP locais de link para as "
+#~ "interfaces Multicast configuradas. Esta opção não afeta os ouvintes "
+#~ "especificados na opção Ouvir. A menos que você planeje aplicar regras de "
+#~ "firewall no tráfego do link local, é melhor deixar isso como o valor "
+#~ "padrão 0. Esta opção atualmente não pode ser alterada ao recarregar a "
+#~ "configuração durante o tempo de execução."
+
+#~ msgid "Tunnel Routing"
+#~ msgstr "Roteamento do Túnel"
+
+#~ msgid "Tunnel routing"
+#~ msgstr "Roteamento do túnel"
+
+#~ msgid "Whitelisted public keys"
+#~ msgstr "Lista branca de chaves públicas"
diff --git a/applications/luci-app-yggdrasil/po/pt_BR/yggdrasil.po b/applications/luci-app-yggdrasil/po/pt_BR/yggdrasil.po
index 8256c63e6f..c1586ea28f 100644
--- a/applications/luci-app-yggdrasil/po/pt_BR/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/pt_BR/yggdrasil.po
@@ -14,59 +14,7 @@ msgstr ""
msgid "Active peers"
msgstr "Pares ativos"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:56
-msgid "Address to listen for incoming connections"
-msgstr "Endereço para escuta de conexões de entrada"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:16
-msgid "Allow from direct"
-msgstr "Aceitar diretamente"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:18
-msgid "Allow from remote"
-msgstr "Permitir a partir do remoto"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:17
-msgid "Allow network traffic from directly connected peers"
-msgstr "Permitir o tráfego de rede vindo de pares diretamente conectados"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:19
-msgid ""
-"Allow network traffic from remote nodes on the network that you are not "
-"directly peered with"
-msgstr ""
-"Permitir o tráfego de rede a partir de nós remotos na rede que você não "
-"esteja diretamente em conexão"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid ""
-"Allow outbound network traffic regardless of AllowFromDirect or "
-"AllowFromRemote"
-msgstr ""
-"Permitir o tráfego de rede de saída, independentemente do AllowFromDirect ou "
-"AllowFromRemote"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:14
-msgid ""
-"Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively "
-"allows you to use Yggdrasil to route to, or to bridge other networks, "
-"similar to a VPN tunnel. Tunnelling works between any two nodes and does not "
-"require them to be directly peered."
-msgstr ""
-"Permitir o tráfego em túneis sem Yggdrasil sobre o Yggdrasil. Isto permite "
-"usar o Yggdrasil de forma efetiva para rotear ou fazer a ponte para outras "
-"redes, semelhante a um túnel VPN. A construção de túneis funciona entre "
-"quaisquer dois nós e não requer que estejam diretamente pareados."
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid "Always allow outbound"
-msgstr "Sempre permitir a saída"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:31
-msgid "Blacklisted public keys"
-msgstr "Lista negra de chaves públicas"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:17
msgid ""
"By default, nodeinfo contains some defaults including the platform, "
"architecture and Yggdrasil version. These can help when surveying the "
@@ -80,14 +28,21 @@ msgstr ""
"do nodeinfo impede isso, de modo que somente os itens especificados no "
"\"NodeInfo\" sejam enviados de volta caso sejam especificados."
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
+msgid ""
+"Configuration for which interfaces multicast peer discovery should be "
+"enabled on. Regex is a regular expression which is matched against an "
+"interface name, and interfaces use the first configuration that they match "
+"gainst. Beacon configures whether or not the node should send link-local "
+"multicast beacons to advertise their presence, while listening for incoming "
+"connections on Port. Listen controls whether or not the node listens for "
+"multicast beacons and opens outgoing connections."
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
msgid "Enable NodeInfo privacy"
msgstr "Ativar a privacidade NodeInfo"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:14
-msgid "Enable session firewall"
-msgstr "Ativar a sessão do firewall"
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:11
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:41
msgid "Encryption keys"
@@ -109,93 +64,22 @@ msgstr "Configurações gerais"
msgid "Grant access to LuCI app yggdrasil"
msgstr "Conceda acesso UCI ao LuCI app yggdrasil"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:26
-msgid "IPv4 local subnet"
-msgstr "Sub-rede local IPv4"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:19
-msgid "IPv4 remote subnet"
-msgstr "Sub-rede IPV4 remota"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-msgid "IPv4 subnet"
-msgstr "Sub-rede IPv4"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:20
-msgid "IPv4 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-"Subredes IPv4 pertencentes a nós remotos, mapeadas para o público do nó"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:27
-msgid ""
-"IPv4 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges will be tunnelled."
-msgstr ""
-"Sub-redes IPv4 pertencentes ao final dos túneis deste nó. Só o tráfego "
-"destas faixas serão feito por tunelamento."
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:40
-msgid "IPv6 local subnet"
-msgstr "Sub-rede local IPv6"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:33
-msgid "IPv6 remote subnet"
-msgstr "Sub-rede remota IPv6"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "IPv6 subnet"
-msgstr "Sub-rede IPv6"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:34
-msgid "IPv6 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-"Sub-redes IPv6 pertencentes a nós remotos, mapeadas para o público do nó"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:41
-msgid ""
-"IPv6 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges (or the Yggdrasil node's IPv6 address/subnet) will be tunnelled."
-msgstr ""
-"Sub-redes IPv6 pertencentes ao final dos túneis deste nó. Somente o tráfego "
-"destas faixas (ou o endereço/subrede IPv6 do nó Yggdrasil) será feito por "
-"tunelamento."
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:15
-msgid ""
-"If disabled, network traffic from any node will be allowed. If enabled, the "
-"below rules apply"
-msgstr ""
-"Se desativado, o tráfego de rede de qualquer nó será permitido. Se ativado, "
-"as regras abaixo se aplicam"
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:25
msgid "Interface"
msgstr "Interface"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
-msgid "Interface name"
-msgstr "Nome da Interface"
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
msgid "Interface peers"
msgstr "Pares de interface"
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:16
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:19
msgid "Keep this private. When compromised, generate a new keypair and IPv6."
msgstr ""
"Manter privado. Quando for comprometido, gerar um novo par de chaves e IPv6."
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Key"
-msgstr "Chave"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "Link-local TCP port"
-msgstr "Vincular porta TCP local"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:52
+msgid "Link-local port"
+msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:21
msgid ""
@@ -222,11 +106,11 @@ msgstr ""
"usar esta seção quando você pode se conectar através de diferentes "
"interfaces."
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:33
msgid "Listen addresses"
msgstr "Endereços de escuta"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:34
msgid ""
"Listen addresses for incoming connections. You will need to add listeners in "
"order to accept incoming peerings from non-local nodes. Multicast peer "
@@ -241,39 +125,23 @@ msgstr ""
"tcp://0.0.0.0:0 ou tcp://[:]:0 para que seja possível ouvir em todas as "
"interfaces."
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+msgid "Listen for beacons"
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:31
msgid "MTU size for the interface"
msgstr "Tamanho da MTU para a interface"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:39
-msgid "Maximum size of all switch queues combined"
-msgstr "Tamanho máximo de todas as filas de switch combinadas"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:41
-msgid "Multicast interfaces"
-msgstr "Interfaces multicast"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:25
-msgid ""
-"Network traffic is always accepted from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:44
+msgid "Multicast interface"
msgstr ""
-"O tráfego de rede é sempre aceito a partir desses pares, independentemente "
-"do AllowFromDirect ou AllowFromRemote"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:32
-msgid ""
-"Network traffic is always rejected from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
-msgstr ""
-"O tráfego de rede é sempre rejeitado vindo desses pares, independentemente "
-"do AllowFromDirect ou AllowFromRemote"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
msgid "NodeInfo"
msgstr "NodeInfo"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:30
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:24
msgid ""
"Optional node info. This must be a { \"key\": \"value\", ... } map or set as "
"null. This is entirely optional but, if set, is visible to the whole network "
@@ -288,89 +156,22 @@ msgstr ""
msgid "Peers"
msgstr "Pares"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Public encryption key"
-msgstr "Chave de criptografia pública"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:26
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:33
-msgid "Public key"
-msgstr "Chave pública"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:42
-msgid ""
-"Regular expressions for which interfaces multicast peer discovery should be "
-"enabled on. If none specified, multicast peer discovery is disabled. The "
-"default value is .* which uses all interfaces."
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:49
+msgid "Regular expression"
msgstr ""
-"Expressões regulares para as quais as interfaces multicast de descoberta de "
-"pares devem ser ativadas. Caso nenhuma seja especificada, a descoberta de "
-"multicast de pares será desativada. O valor predefinido é .* na qual usa "
-"todas as interfaces."
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:50
-msgid "Session firewall"
-msgstr "Sessão do firewall"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:11
-msgid "Session firewall settings"
-msgstr "Configuração da sessão do firewall"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:46
-msgid "Set .* to multicast on all interfaces"
-msgstr "Definir .* para multicast em todas as interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+msgid "Send beacons"
+msgstr ""
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:32
msgid "Settings"
msgstr "Configurações"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:18
-msgid "Signing private key"
-msgstr "Assinatura de chave privada"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:17
-msgid "Signing public key"
-msgstr "Assinatura de chave pública"
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:14
msgid "Status"
msgstr "Condição Geral"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "Subnet"
-msgstr "Sub-rede"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
-msgid ""
-"The port number to be used for the link-local TCP listeners for the "
-"configured MulticastInterfaces. This option does not affect "
-"listenersspecified in the Listen option. Unless you plan to firewall link-"
-"localtraffic, it is best to leave this as the default value of 0. This "
-"option cannot currently be changed by reloading config during runtime."
-msgstr ""
-"O número da porta a ser usado para os ouvintes TCP locais de link para as "
-"interfaces Multicast configuradas. Esta opção não afeta os ouvintes "
-"especificados na opção Ouvir. A menos que você planeje aplicar regras de "
-"firewall no tráfego do link local, é melhor deixar isso como o valor padrão "
-"0. Esta opção atualmente não pode ser alterada ao recarregar a configuração "
-"durante o tempo de execução."
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:11
-msgid "Tunnel Routing"
-msgstr "Roteamento do Túnel"
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:59
-msgid "Tunnel routing"
-msgstr "Roteamento do túnel"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:24
-msgid "Whitelisted public keys"
-msgstr "Lista branca de chaves públicas"
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:3
msgid "Yggdrasil"
msgstr "Yggdrasil"
@@ -383,6 +184,188 @@ msgstr "Condição do nó do Yggdrasil"
msgid "Yggdrasil's network interface name"
msgstr "Nome da interface de rede Yggdrasil"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:58
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:40
msgid "e.g. tcp://0.0.0.0:0 or tcp://[::]:0"
msgstr "ex. tcp://0.0.0.0:0 ou tcp://[::]:0"
+
+#~ msgid "Address to listen for incoming connections"
+#~ msgstr "Endereço para escuta de conexões de entrada"
+
+#~ msgid "Allow from direct"
+#~ msgstr "Aceitar diretamente"
+
+#~ msgid "Allow from remote"
+#~ msgstr "Permitir a partir do remoto"
+
+#~ msgid "Allow network traffic from directly connected peers"
+#~ msgstr "Permitir o tráfego de rede vindo de pares diretamente conectados"
+
+#~ msgid ""
+#~ "Allow network traffic from remote nodes on the network that you are not "
+#~ "directly peered with"
+#~ msgstr ""
+#~ "Permitir o tráfego de rede a partir de nós remotos na rede que você não "
+#~ "esteja diretamente em conexão"
+
+#~ msgid ""
+#~ "Allow outbound network traffic regardless of AllowFromDirect or "
+#~ "AllowFromRemote"
+#~ msgstr ""
+#~ "Permitir o tráfego de rede de saída, independentemente do AllowFromDirect "
+#~ "ou AllowFromRemote"
+
+#~ msgid ""
+#~ "Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively "
+#~ "allows you to use Yggdrasil to route to, or to bridge other networks, "
+#~ "similar to a VPN tunnel. Tunnelling works between any two nodes and does "
+#~ "not require them to be directly peered."
+#~ msgstr ""
+#~ "Permitir o tráfego em túneis sem Yggdrasil sobre o Yggdrasil. Isto "
+#~ "permite usar o Yggdrasil de forma efetiva para rotear ou fazer a ponte "
+#~ "para outras redes, semelhante a um túnel VPN. A construção de túneis "
+#~ "funciona entre quaisquer dois nós e não requer que estejam diretamente "
+#~ "pareados."
+
+#~ msgid "Always allow outbound"
+#~ msgstr "Sempre permitir a saída"
+
+#~ msgid "Blacklisted public keys"
+#~ msgstr "Lista negra de chaves públicas"
+
+#~ msgid "Enable session firewall"
+#~ msgstr "Ativar a sessão do firewall"
+
+#~ msgid "IPv4 local subnet"
+#~ msgstr "Sub-rede local IPv4"
+
+#~ msgid "IPv4 remote subnet"
+#~ msgstr "Sub-rede IPV4 remota"
+
+#~ msgid "IPv4 subnet"
+#~ msgstr "Sub-rede IPv4"
+
+#~ msgid "IPv4 subnets belonging to remote nodes, mapped to the node's public"
+#~ msgstr ""
+#~ "Subredes IPv4 pertencentes a nós remotos, mapeadas para o público do nó"
+
+#~ msgid ""
+#~ "IPv4 subnets belonging to this node's end of the tunnels. Only traffic "
+#~ "from these ranges will be tunnelled."
+#~ msgstr ""
+#~ "Sub-redes IPv4 pertencentes ao final dos túneis deste nó. Só o tráfego "
+#~ "destas faixas serão feito por tunelamento."
+
+#~ msgid "IPv6 local subnet"
+#~ msgstr "Sub-rede local IPv6"
+
+#~ msgid "IPv6 remote subnet"
+#~ msgstr "Sub-rede remota IPv6"
+
+#~ msgid "IPv6 subnet"
+#~ msgstr "Sub-rede IPv6"
+
+#~ msgid "IPv6 subnets belonging to remote nodes, mapped to the node's public"
+#~ msgstr ""
+#~ "Sub-redes IPv6 pertencentes a nós remotos, mapeadas para o público do nó"
+
+#~ msgid ""
+#~ "IPv6 subnets belonging to this node's end of the tunnels. Only traffic "
+#~ "from these ranges (or the Yggdrasil node's IPv6 address/subnet) will be "
+#~ "tunnelled."
+#~ msgstr ""
+#~ "Sub-redes IPv6 pertencentes ao final dos túneis deste nó. Somente o "
+#~ "tráfego destas faixas (ou o endereço/subrede IPv6 do nó Yggdrasil) será "
+#~ "feito por tunelamento."
+
+#~ msgid ""
+#~ "If disabled, network traffic from any node will be allowed. If enabled, "
+#~ "the below rules apply"
+#~ msgstr ""
+#~ "Se desativado, o tráfego de rede de qualquer nó será permitido. Se "
+#~ "ativado, as regras abaixo se aplicam"
+
+#~ msgid "Interface name"
+#~ msgstr "Nome da Interface"
+
+#~ msgid "Key"
+#~ msgstr "Chave"
+
+#~ msgid "Link-local TCP port"
+#~ msgstr "Vincular porta TCP local"
+
+#~ msgid "Maximum size of all switch queues combined"
+#~ msgstr "Tamanho máximo de todas as filas de switch combinadas"
+
+#~ msgid "Multicast interfaces"
+#~ msgstr "Interfaces multicast"
+
+#~ msgid ""
+#~ "Network traffic is always accepted from those peers, regardless of "
+#~ "AllowFromDirect or AllowFromRemote"
+#~ msgstr ""
+#~ "O tráfego de rede é sempre aceito a partir desses pares, "
+#~ "independentemente do AllowFromDirect ou AllowFromRemote"
+
+#~ msgid ""
+#~ "Network traffic is always rejected from those peers, regardless of "
+#~ "AllowFromDirect or AllowFromRemote"
+#~ msgstr ""
+#~ "O tráfego de rede é sempre rejeitado vindo desses pares, "
+#~ "independentemente do AllowFromDirect ou AllowFromRemote"
+
+#~ msgid "Public encryption key"
+#~ msgstr "Chave de criptografia pública"
+
+#~ msgid "Public key"
+#~ msgstr "Chave pública"
+
+#~ msgid ""
+#~ "Regular expressions for which interfaces multicast peer discovery should "
+#~ "be enabled on. If none specified, multicast peer discovery is disabled. "
+#~ "The default value is .* which uses all interfaces."
+#~ msgstr ""
+#~ "Expressões regulares para as quais as interfaces multicast de descoberta "
+#~ "de pares devem ser ativadas. Caso nenhuma seja especificada, a descoberta "
+#~ "de multicast de pares será desativada. O valor predefinido é .* na qual "
+#~ "usa todas as interfaces."
+
+#~ msgid "Session firewall"
+#~ msgstr "Sessão do firewall"
+
+#~ msgid "Session firewall settings"
+#~ msgstr "Configuração da sessão do firewall"
+
+#~ msgid "Set .* to multicast on all interfaces"
+#~ msgstr "Definir .* para multicast em todas as interfaces"
+
+#~ msgid "Signing private key"
+#~ msgstr "Assinatura de chave privada"
+
+#~ msgid "Signing public key"
+#~ msgstr "Assinatura de chave pública"
+
+#~ msgid "Subnet"
+#~ msgstr "Sub-rede"
+
+#~ msgid ""
+#~ "The port number to be used for the link-local TCP listeners for the "
+#~ "configured MulticastInterfaces. This option does not affect "
+#~ "listenersspecified in the Listen option. Unless you plan to firewall link-"
+#~ "localtraffic, it is best to leave this as the default value of 0. This "
+#~ "option cannot currently be changed by reloading config during runtime."
+#~ msgstr ""
+#~ "O número da porta a ser usado para os ouvintes TCP locais de link para as "
+#~ "interfaces Multicast configuradas. Esta opção não afeta os ouvintes "
+#~ "especificados na opção Ouvir. A menos que você planeje aplicar regras de "
+#~ "firewall no tráfego do link local, é melhor deixar isso como o valor "
+#~ "padrão 0. Esta opção atualmente não pode ser alterada ao recarregar a "
+#~ "configuração durante o tempo de execução."
+
+#~ msgid "Tunnel Routing"
+#~ msgstr "Roteamento do Túnel"
+
+#~ msgid "Tunnel routing"
+#~ msgstr "Roteamento do túnel"
+
+#~ msgid "Whitelisted public keys"
+#~ msgstr "Lista branca de chaves públicas"
diff --git a/applications/luci-app-yggdrasil/po/ro/yggdrasil.po b/applications/luci-app-yggdrasil/po/ro/yggdrasil.po
index 77dacf64fe..e5a1c274b8 100644
--- a/applications/luci-app-yggdrasil/po/ro/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/ro/yggdrasil.po
@@ -15,51 +15,7 @@ msgstr ""
msgid "Active peers"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:56
-msgid "Address to listen for incoming connections"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:16
-msgid "Allow from direct"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:18
-msgid "Allow from remote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:17
-msgid "Allow network traffic from directly connected peers"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:19
-msgid ""
-"Allow network traffic from remote nodes on the network that you are not "
-"directly peered with"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid ""
-"Allow outbound network traffic regardless of AllowFromDirect or "
-"AllowFromRemote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:14
-msgid ""
-"Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively "
-"allows you to use Yggdrasil to route to, or to bridge other networks, "
-"similar to a VPN tunnel. Tunnelling works between any two nodes and does not "
-"require them to be directly peered."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid "Always allow outbound"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:31
-msgid "Blacklisted public keys"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:17
msgid ""
"By default, nodeinfo contains some defaults including the platform, "
"architecture and Yggdrasil version. These can help when surveying the "
@@ -68,12 +24,19 @@ msgid ""
"specified."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "Enable NodeInfo privacy"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
+msgid ""
+"Configuration for which interfaces multicast peer discovery should be "
+"enabled on. Regex is a regular expression which is matched against an "
+"interface name, and interfaces use the first configuration that they match "
+"gainst. Beacon configures whether or not the node should send link-local "
+"multicast beacons to advertise their presence, while listening for incoming "
+"connections on Port. Listen controls whether or not the node listens for "
+"multicast beacons and opens outgoing connections."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:14
-msgid "Enable session firewall"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
+msgid "Enable NodeInfo privacy"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:11
@@ -97,82 +60,20 @@ msgstr ""
msgid "Grant access to LuCI app yggdrasil"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:26
-msgid "IPv4 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:19
-msgid "IPv4 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-msgid "IPv4 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:20
-msgid "IPv4 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:27
-msgid ""
-"IPv4 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:40
-msgid "IPv6 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:33
-msgid "IPv6 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "IPv6 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:34
-msgid "IPv6 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:41
-msgid ""
-"IPv6 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges (or the Yggdrasil node's IPv6 address/subnet) will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:15
-msgid ""
-"If disabled, network traffic from any node will be allowed. If enabled, the "
-"below rules apply"
-msgstr ""
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:25
msgid "Interface"
msgstr "Interfață"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
-msgid "Interface name"
-msgstr "Numele interfeței"
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
msgid "Interface peers"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:16
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:19
msgid "Keep this private. When compromised, generate a new keypair and IPv6."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "Link-local TCP port"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:52
+msgid "Link-local port"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:21
@@ -191,11 +92,11 @@ msgid ""
"when you may connect via different interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:33
msgid "Listen addresses"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:34
msgid ""
"Listen addresses for incoming connections. You will need to add listeners in "
"order to accept incoming peerings from non-local nodes. Multicast peer "
@@ -204,35 +105,23 @@ msgid ""
"[::]:0 to listen on all interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
-msgid "MTU size for the interface"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:39
-msgid "Maximum size of all switch queues combined"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:41
-msgid "Multicast interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+msgid "Listen for beacons"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:25
-msgid ""
-"Network traffic is always accepted from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:31
+msgid "MTU size for the interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:32
-msgid ""
-"Network traffic is always rejected from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:44
+msgid "Multicast interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
msgid "NodeInfo"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:30
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:24
msgid ""
"Optional node info. This must be a { \"key\": \"value\", ... } map or set as "
"null. This is entirely optional but, if set, is visible to the whole network "
@@ -244,79 +133,22 @@ msgstr ""
msgid "Peers"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Public encryption key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:26
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:33
-msgid "Public key"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:49
+msgid "Regular expression"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:42
-msgid ""
-"Regular expressions for which interfaces multicast peer discovery should be "
-"enabled on. If none specified, multicast peer discovery is disabled. The "
-"default value is .* which uses all interfaces."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:50
-msgid "Session firewall"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:11
-msgid "Session firewall settings"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:46
-msgid "Set .* to multicast on all interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+msgid "Send beacons"
msgstr ""
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:32
msgid "Settings"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:18
-msgid "Signing private key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:17
-msgid "Signing public key"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:14
msgid "Status"
msgstr "Status"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "Subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
-msgid ""
-"The port number to be used for the link-local TCP listeners for the "
-"configured MulticastInterfaces. This option does not affect "
-"listenersspecified in the Listen option. Unless you plan to firewall link-"
-"localtraffic, it is best to leave this as the default value of 0. This "
-"option cannot currently be changed by reloading config during runtime."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:11
-msgid "Tunnel Routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:59
-msgid "Tunnel routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:24
-msgid "Whitelisted public keys"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:3
msgid "Yggdrasil"
msgstr ""
@@ -329,6 +161,9 @@ msgstr ""
msgid "Yggdrasil's network interface name"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:58
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:40
msgid "e.g. tcp://0.0.0.0:0 or tcp://[::]:0"
msgstr ""
+
+#~ msgid "Interface name"
+#~ msgstr "Numele interfeței"
diff --git a/applications/luci-app-yggdrasil/po/ru/yggdrasil.po b/applications/luci-app-yggdrasil/po/ru/yggdrasil.po
index ba3281ea9b..35a7baaec5 100644
--- a/applications/luci-app-yggdrasil/po/ru/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/ru/yggdrasil.po
@@ -15,51 +15,7 @@ msgstr ""
msgid "Active peers"
msgstr "Активные пиры"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:56
-msgid "Address to listen for incoming connections"
-msgstr "Адрес для входящих подключений"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:16
-msgid "Allow from direct"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:18
-msgid "Allow from remote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:17
-msgid "Allow network traffic from directly connected peers"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:19
-msgid ""
-"Allow network traffic from remote nodes on the network that you are not "
-"directly peered with"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid ""
-"Allow outbound network traffic regardless of AllowFromDirect or "
-"AllowFromRemote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:14
-msgid ""
-"Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively "
-"allows you to use Yggdrasil to route to, or to bridge other networks, "
-"similar to a VPN tunnel. Tunnelling works between any two nodes and does not "
-"require them to be directly peered."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid "Always allow outbound"
-msgstr "Всегда разрешать исходящие"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:31
-msgid "Blacklisted public keys"
-msgstr "Общедоступные ключи, внесённые в чёрный список"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:17
msgid ""
"By default, nodeinfo contains some defaults including the platform, "
"architecture and Yggdrasil version. These can help when surveying the "
@@ -68,12 +24,19 @@ msgid ""
"specified."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "Enable NodeInfo privacy"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
+msgid ""
+"Configuration for which interfaces multicast peer discovery should be "
+"enabled on. Regex is a regular expression which is matched against an "
+"interface name, and interfaces use the first configuration that they match "
+"gainst. Beacon configures whether or not the node should send link-local "
+"multicast beacons to advertise their presence, while listening for incoming "
+"connections on Port. Listen controls whether or not the node listens for "
+"multicast beacons and opens outgoing connections."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:14
-msgid "Enable session firewall"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
+msgid "Enable NodeInfo privacy"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:11
@@ -97,82 +60,20 @@ msgstr "Основные настройки"
msgid "Grant access to LuCI app yggdrasil"
msgstr "Предоставить доступ LuCI к приложению yggdrasil"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:26
-msgid "IPv4 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:19
-msgid "IPv4 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-msgid "IPv4 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:20
-msgid "IPv4 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:27
-msgid ""
-"IPv4 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:40
-msgid "IPv6 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:33
-msgid "IPv6 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "IPv6 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:34
-msgid "IPv6 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:41
-msgid ""
-"IPv6 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges (or the Yggdrasil node's IPv6 address/subnet) will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:15
-msgid ""
-"If disabled, network traffic from any node will be allowed. If enabled, the "
-"below rules apply"
-msgstr ""
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:25
msgid "Interface"
msgstr "Интерфейс"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
-msgid "Interface name"
-msgstr "Имя интерфейса"
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
msgid "Interface peers"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:16
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:19
msgid "Keep this private. When compromised, generate a new keypair and IPv6."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Key"
-msgstr "Пароль (ключ)"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "Link-local TCP port"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:52
+msgid "Link-local port"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:21
@@ -191,11 +92,11 @@ msgid ""
"when you may connect via different interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:33
msgid "Listen addresses"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:34
msgid ""
"Listen addresses for incoming connections. You will need to add listeners in "
"order to accept incoming peerings from non-local nodes. Multicast peer "
@@ -204,35 +105,23 @@ msgid ""
"[::]:0 to listen on all interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
-msgid "MTU size for the interface"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:39
-msgid "Maximum size of all switch queues combined"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:41
-msgid "Multicast interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+msgid "Listen for beacons"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:25
-msgid ""
-"Network traffic is always accepted from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:31
+msgid "MTU size for the interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:32
-msgid ""
-"Network traffic is always rejected from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:44
+msgid "Multicast interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
msgid "NodeInfo"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:30
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:24
msgid ""
"Optional node info. This must be a { \"key\": \"value\", ... } map or set as "
"null. This is entirely optional but, if set, is visible to the whole network "
@@ -244,79 +133,22 @@ msgstr ""
msgid "Peers"
msgstr "Пиры"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Public encryption key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:26
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:33
-msgid "Public key"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:49
+msgid "Regular expression"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:42
-msgid ""
-"Regular expressions for which interfaces multicast peer discovery should be "
-"enabled on. If none specified, multicast peer discovery is disabled. The "
-"default value is .* which uses all interfaces."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:50
-msgid "Session firewall"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:11
-msgid "Session firewall settings"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:46
-msgid "Set .* to multicast on all interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+msgid "Send beacons"
msgstr ""
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:32
msgid "Settings"
msgstr "Настройки"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:18
-msgid "Signing private key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:17
-msgid "Signing public key"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:14
msgid "Status"
msgstr "Состояние"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "Subnet"
-msgstr "Подсеть"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
-msgid ""
-"The port number to be used for the link-local TCP listeners for the "
-"configured MulticastInterfaces. This option does not affect "
-"listenersspecified in the Listen option. Unless you plan to firewall link-"
-"localtraffic, it is best to leave this as the default value of 0. This "
-"option cannot currently be changed by reloading config during runtime."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:11
-msgid "Tunnel Routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:59
-msgid "Tunnel routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:24
-msgid "Whitelisted public keys"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:3
msgid "Yggdrasil"
msgstr ""
@@ -329,6 +161,24 @@ msgstr ""
msgid "Yggdrasil's network interface name"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:58
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:40
msgid "e.g. tcp://0.0.0.0:0 or tcp://[::]:0"
msgstr ""
+
+#~ msgid "Address to listen for incoming connections"
+#~ msgstr "Адрес для входящих подключений"
+
+#~ msgid "Always allow outbound"
+#~ msgstr "Всегда разрешать исходящие"
+
+#~ msgid "Blacklisted public keys"
+#~ msgstr "Общедоступные ключи, внесённые в чёрный список"
+
+#~ msgid "Interface name"
+#~ msgstr "Имя интерфейса"
+
+#~ msgid "Key"
+#~ msgstr "Пароль (ключ)"
+
+#~ msgid "Subnet"
+#~ msgstr "Подсеть"
diff --git a/applications/luci-app-yggdrasil/po/sk/yggdrasil.po b/applications/luci-app-yggdrasil/po/sk/yggdrasil.po
index f00b3a0b1f..2f2d0bb466 100644
--- a/applications/luci-app-yggdrasil/po/sk/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/sk/yggdrasil.po
@@ -14,51 +14,7 @@ msgstr ""
msgid "Active peers"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:56
-msgid "Address to listen for incoming connections"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:16
-msgid "Allow from direct"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:18
-msgid "Allow from remote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:17
-msgid "Allow network traffic from directly connected peers"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:19
-msgid ""
-"Allow network traffic from remote nodes on the network that you are not "
-"directly peered with"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid ""
-"Allow outbound network traffic regardless of AllowFromDirect or "
-"AllowFromRemote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:14
-msgid ""
-"Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively "
-"allows you to use Yggdrasil to route to, or to bridge other networks, "
-"similar to a VPN tunnel. Tunnelling works between any two nodes and does not "
-"require them to be directly peered."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid "Always allow outbound"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:31
-msgid "Blacklisted public keys"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:17
msgid ""
"By default, nodeinfo contains some defaults including the platform, "
"architecture and Yggdrasil version. These can help when surveying the "
@@ -67,12 +23,19 @@ msgid ""
"specified."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "Enable NodeInfo privacy"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
+msgid ""
+"Configuration for which interfaces multicast peer discovery should be "
+"enabled on. Regex is a regular expression which is matched against an "
+"interface name, and interfaces use the first configuration that they match "
+"gainst. Beacon configures whether or not the node should send link-local "
+"multicast beacons to advertise their presence, while listening for incoming "
+"connections on Port. Listen controls whether or not the node listens for "
+"multicast beacons and opens outgoing connections."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:14
-msgid "Enable session firewall"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
+msgid "Enable NodeInfo privacy"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:11
@@ -96,82 +59,20 @@ msgstr ""
msgid "Grant access to LuCI app yggdrasil"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:26
-msgid "IPv4 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:19
-msgid "IPv4 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-msgid "IPv4 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:20
-msgid "IPv4 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:27
-msgid ""
-"IPv4 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:40
-msgid "IPv6 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:33
-msgid "IPv6 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "IPv6 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:34
-msgid "IPv6 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:41
-msgid ""
-"IPv6 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges (or the Yggdrasil node's IPv6 address/subnet) will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:15
-msgid ""
-"If disabled, network traffic from any node will be allowed. If enabled, the "
-"below rules apply"
-msgstr ""
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:25
msgid "Interface"
msgstr "Rozhranie"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
-msgid "Interface name"
-msgstr "Názov rozhrania"
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
msgid "Interface peers"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:16
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:19
msgid "Keep this private. When compromised, generate a new keypair and IPv6."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Key"
-msgstr "Kľúč"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "Link-local TCP port"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:52
+msgid "Link-local port"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:21
@@ -190,11 +91,11 @@ msgid ""
"when you may connect via different interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:33
msgid "Listen addresses"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:34
msgid ""
"Listen addresses for incoming connections. You will need to add listeners in "
"order to accept incoming peerings from non-local nodes. Multicast peer "
@@ -203,35 +104,23 @@ msgid ""
"[::]:0 to listen on all interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
-msgid "MTU size for the interface"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:39
-msgid "Maximum size of all switch queues combined"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:41
-msgid "Multicast interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+msgid "Listen for beacons"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:25
-msgid ""
-"Network traffic is always accepted from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:31
+msgid "MTU size for the interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:32
-msgid ""
-"Network traffic is always rejected from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:44
+msgid "Multicast interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
msgid "NodeInfo"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:30
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:24
msgid ""
"Optional node info. This must be a { \"key\": \"value\", ... } map or set as "
"null. This is entirely optional but, if set, is visible to the whole network "
@@ -243,79 +132,22 @@ msgstr ""
msgid "Peers"
msgstr "Účastníci"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Public encryption key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:26
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:33
-msgid "Public key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:42
-msgid ""
-"Regular expressions for which interfaces multicast peer discovery should be "
-"enabled on. If none specified, multicast peer discovery is disabled. The "
-"default value is .* which uses all interfaces."
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:49
+msgid "Regular expression"
msgstr ""
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:50
-msgid "Session firewall"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:11
-msgid "Session firewall settings"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:46
-msgid "Set .* to multicast on all interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+msgid "Send beacons"
msgstr ""
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:32
msgid "Settings"
msgstr "Nastavenia"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:18
-msgid "Signing private key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:17
-msgid "Signing public key"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:14
msgid "Status"
msgstr "Stav"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "Subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
-msgid ""
-"The port number to be used for the link-local TCP listeners for the "
-"configured MulticastInterfaces. This option does not affect "
-"listenersspecified in the Listen option. Unless you plan to firewall link-"
-"localtraffic, it is best to leave this as the default value of 0. This "
-"option cannot currently be changed by reloading config during runtime."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:11
-msgid "Tunnel Routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:59
-msgid "Tunnel routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:24
-msgid "Whitelisted public keys"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:3
msgid "Yggdrasil"
msgstr ""
@@ -328,6 +160,12 @@ msgstr ""
msgid "Yggdrasil's network interface name"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:58
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:40
msgid "e.g. tcp://0.0.0.0:0 or tcp://[::]:0"
msgstr ""
+
+#~ msgid "Interface name"
+#~ msgstr "Názov rozhrania"
+
+#~ msgid "Key"
+#~ msgstr "Kľúč"
diff --git a/applications/luci-app-yggdrasil/po/sv/yggdrasil.po b/applications/luci-app-yggdrasil/po/sv/yggdrasil.po
index ad5911cbb4..1933443bfc 100644
--- a/applications/luci-app-yggdrasil/po/sv/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/sv/yggdrasil.po
@@ -14,51 +14,7 @@ msgstr ""
msgid "Active peers"
msgstr "Aktiva peers"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:56
-msgid "Address to listen for incoming connections"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:16
-msgid "Allow from direct"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:18
-msgid "Allow from remote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:17
-msgid "Allow network traffic from directly connected peers"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:19
-msgid ""
-"Allow network traffic from remote nodes on the network that you are not "
-"directly peered with"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid ""
-"Allow outbound network traffic regardless of AllowFromDirect or "
-"AllowFromRemote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:14
-msgid ""
-"Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively "
-"allows you to use Yggdrasil to route to, or to bridge other networks, "
-"similar to a VPN tunnel. Tunnelling works between any two nodes and does not "
-"require them to be directly peered."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid "Always allow outbound"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:31
-msgid "Blacklisted public keys"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:17
msgid ""
"By default, nodeinfo contains some defaults including the platform, "
"architecture and Yggdrasil version. These can help when surveying the "
@@ -67,12 +23,19 @@ msgid ""
"specified."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "Enable NodeInfo privacy"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
+msgid ""
+"Configuration for which interfaces multicast peer discovery should be "
+"enabled on. Regex is a regular expression which is matched against an "
+"interface name, and interfaces use the first configuration that they match "
+"gainst. Beacon configures whether or not the node should send link-local "
+"multicast beacons to advertise their presence, while listening for incoming "
+"connections on Port. Listen controls whether or not the node listens for "
+"multicast beacons and opens outgoing connections."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:14
-msgid "Enable session firewall"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
+msgid "Enable NodeInfo privacy"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:11
@@ -96,82 +59,20 @@ msgstr ""
msgid "Grant access to LuCI app yggdrasil"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:26
-msgid "IPv4 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:19
-msgid "IPv4 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-msgid "IPv4 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:20
-msgid "IPv4 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:27
-msgid ""
-"IPv4 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:40
-msgid "IPv6 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:33
-msgid "IPv6 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "IPv6 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:34
-msgid "IPv6 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:41
-msgid ""
-"IPv6 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges (or the Yggdrasil node's IPv6 address/subnet) will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:15
-msgid ""
-"If disabled, network traffic from any node will be allowed. If enabled, the "
-"below rules apply"
-msgstr ""
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:25
msgid "Interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
-msgid "Interface name"
-msgstr ""
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
msgid "Interface peers"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:16
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:19
msgid "Keep this private. When compromised, generate a new keypair and IPv6."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "Link-local TCP port"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:52
+msgid "Link-local port"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:21
@@ -190,11 +91,11 @@ msgid ""
"when you may connect via different interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:33
msgid "Listen addresses"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:34
msgid ""
"Listen addresses for incoming connections. You will need to add listeners in "
"order to accept incoming peerings from non-local nodes. Multicast peer "
@@ -203,35 +104,23 @@ msgid ""
"[::]:0 to listen on all interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
-msgid "MTU size for the interface"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:39
-msgid "Maximum size of all switch queues combined"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:41
-msgid "Multicast interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+msgid "Listen for beacons"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:25
-msgid ""
-"Network traffic is always accepted from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:31
+msgid "MTU size for the interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:32
-msgid ""
-"Network traffic is always rejected from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:44
+msgid "Multicast interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
msgid "NodeInfo"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:30
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:24
msgid ""
"Optional node info. This must be a { \"key\": \"value\", ... } map or set as "
"null. This is entirely optional but, if set, is visible to the whole network "
@@ -243,79 +132,22 @@ msgstr ""
msgid "Peers"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Public encryption key"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:49
+msgid "Regular expression"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:26
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:33
-msgid "Public key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:42
-msgid ""
-"Regular expressions for which interfaces multicast peer discovery should be "
-"enabled on. If none specified, multicast peer discovery is disabled. The "
-"default value is .* which uses all interfaces."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:50
-msgid "Session firewall"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:11
-msgid "Session firewall settings"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:46
-msgid "Set .* to multicast on all interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+msgid "Send beacons"
msgstr ""
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:32
msgid "Settings"
msgstr "Inställningar"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:18
-msgid "Signing private key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:17
-msgid "Signing public key"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:14
msgid "Status"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "Subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
-msgid ""
-"The port number to be used for the link-local TCP listeners for the "
-"configured MulticastInterfaces. This option does not affect "
-"listenersspecified in the Listen option. Unless you plan to firewall link-"
-"localtraffic, it is best to leave this as the default value of 0. This "
-"option cannot currently be changed by reloading config during runtime."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:11
-msgid "Tunnel Routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:59
-msgid "Tunnel routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:24
-msgid "Whitelisted public keys"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:3
msgid "Yggdrasil"
msgstr ""
@@ -328,6 +160,6 @@ msgstr ""
msgid "Yggdrasil's network interface name"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:58
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:40
msgid "e.g. tcp://0.0.0.0:0 or tcp://[::]:0"
msgstr ""
diff --git a/applications/luci-app-yggdrasil/po/templates/yggdrasil.pot b/applications/luci-app-yggdrasil/po/templates/yggdrasil.pot
index cea7301e5b..b6b00594be 100644
--- a/applications/luci-app-yggdrasil/po/templates/yggdrasil.pot
+++ b/applications/luci-app-yggdrasil/po/templates/yggdrasil.pot
@@ -5,51 +5,7 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
msgid "Active peers"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:56
-msgid "Address to listen for incoming connections"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:16
-msgid "Allow from direct"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:18
-msgid "Allow from remote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:17
-msgid "Allow network traffic from directly connected peers"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:19
-msgid ""
-"Allow network traffic from remote nodes on the network that you are not "
-"directly peered with"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid ""
-"Allow outbound network traffic regardless of AllowFromDirect or "
-"AllowFromRemote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:14
-msgid ""
-"Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively "
-"allows you to use Yggdrasil to route to, or to bridge other networks, "
-"similar to a VPN tunnel. Tunnelling works between any two nodes and does not "
-"require them to be directly peered."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid "Always allow outbound"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:31
-msgid "Blacklisted public keys"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:17
msgid ""
"By default, nodeinfo contains some defaults including the platform, "
"architecture and Yggdrasil version. These can help when surveying the "
@@ -58,12 +14,19 @@ msgid ""
"specified."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "Enable NodeInfo privacy"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
+msgid ""
+"Configuration for which interfaces multicast peer discovery should be "
+"enabled on. Regex is a regular expression which is matched against an "
+"interface name, and interfaces use the first configuration that they match "
+"gainst. Beacon configures whether or not the node should send link-local "
+"multicast beacons to advertise their presence, while listening for incoming "
+"connections on Port. Listen controls whether or not the node listens for "
+"multicast beacons and opens outgoing connections."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:14
-msgid "Enable session firewall"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
+msgid "Enable NodeInfo privacy"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:11
@@ -87,82 +50,20 @@ msgstr ""
msgid "Grant access to LuCI app yggdrasil"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:26
-msgid "IPv4 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:19
-msgid "IPv4 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-msgid "IPv4 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:20
-msgid "IPv4 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:27
-msgid ""
-"IPv4 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:40
-msgid "IPv6 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:33
-msgid "IPv6 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "IPv6 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:34
-msgid "IPv6 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:41
-msgid ""
-"IPv6 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges (or the Yggdrasil node's IPv6 address/subnet) will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:15
-msgid ""
-"If disabled, network traffic from any node will be allowed. If enabled, the "
-"below rules apply"
-msgstr ""
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:25
msgid "Interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
-msgid "Interface name"
-msgstr ""
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
msgid "Interface peers"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:16
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:19
msgid "Keep this private. When compromised, generate a new keypair and IPv6."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "Link-local TCP port"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:52
+msgid "Link-local port"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:21
@@ -181,11 +82,11 @@ msgid ""
"when you may connect via different interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:33
msgid "Listen addresses"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:34
msgid ""
"Listen addresses for incoming connections. You will need to add listeners in "
"order to accept incoming peerings from non-local nodes. Multicast peer "
@@ -194,35 +95,23 @@ msgid ""
"[::]:0 to listen on all interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
-msgid "MTU size for the interface"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:39
-msgid "Maximum size of all switch queues combined"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:41
-msgid "Multicast interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+msgid "Listen for beacons"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:25
-msgid ""
-"Network traffic is always accepted from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:31
+msgid "MTU size for the interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:32
-msgid ""
-"Network traffic is always rejected from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:44
+msgid "Multicast interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
msgid "NodeInfo"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:30
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:24
msgid ""
"Optional node info. This must be a { \"key\": \"value\", ... } map or set as "
"null. This is entirely optional but, if set, is visible to the whole network "
@@ -234,79 +123,22 @@ msgstr ""
msgid "Peers"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Public encryption key"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:49
+msgid "Regular expression"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:26
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:33
-msgid "Public key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:42
-msgid ""
-"Regular expressions for which interfaces multicast peer discovery should be "
-"enabled on. If none specified, multicast peer discovery is disabled. The "
-"default value is .* which uses all interfaces."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:50
-msgid "Session firewall"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:11
-msgid "Session firewall settings"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:46
-msgid "Set .* to multicast on all interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+msgid "Send beacons"
msgstr ""
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:32
msgid "Settings"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:18
-msgid "Signing private key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:17
-msgid "Signing public key"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:14
msgid "Status"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "Subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
-msgid ""
-"The port number to be used for the link-local TCP listeners for the "
-"configured MulticastInterfaces. This option does not affect "
-"listenersspecified in the Listen option. Unless you plan to firewall link-"
-"localtraffic, it is best to leave this as the default value of 0. This "
-"option cannot currently be changed by reloading config during runtime."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:11
-msgid "Tunnel Routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:59
-msgid "Tunnel routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:24
-msgid "Whitelisted public keys"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:3
msgid "Yggdrasil"
msgstr ""
@@ -319,6 +151,6 @@ msgstr ""
msgid "Yggdrasil's network interface name"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:58
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:40
msgid "e.g. tcp://0.0.0.0:0 or tcp://[::]:0"
msgstr ""
diff --git a/applications/luci-app-yggdrasil/po/tr/yggdrasil.po b/applications/luci-app-yggdrasil/po/tr/yggdrasil.po
index 9a28893eff..2866f82dd8 100644
--- a/applications/luci-app-yggdrasil/po/tr/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/tr/yggdrasil.po
@@ -14,60 +14,7 @@ msgstr ""
msgid "Active peers"
msgstr "Etkin eşler"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:56
-msgid "Address to listen for incoming connections"
-msgstr "Gelen bağlantıları dinleme adresi"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:16
-msgid "Allow from direct"
-msgstr "Doğrudan izin ver"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:18
-msgid "Allow from remote"
-msgstr "Uzaktan izin ver"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:17
-msgid "Allow network traffic from directly connected peers"
-msgstr "Doğrudan bağlı eşlerden ağ trafiğine izin verin"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:19
-msgid ""
-"Allow network traffic from remote nodes on the network that you are not "
-"directly peered with"
-msgstr ""
-"Doğrudan eşlenmediğiniz ağ üzerindeki uzak düğümlerden ağ trafiğine izin "
-"verin"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid ""
-"Allow outbound network traffic regardless of AllowFromDirect or "
-"AllowFromRemote"
-msgstr ""
-"AllowFromDirect veya AllowFromRemote'tan bağımsız olarak giden ağ trafiğine "
-"izin verin"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:14
-msgid ""
-"Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively "
-"allows you to use Yggdrasil to route to, or to bridge other networks, "
-"similar to a VPN tunnel. Tunnelling works between any two nodes and does not "
-"require them to be directly peered."
-msgstr ""
-"Yggdrasil üzerinden Yggdrasil dışı trafiğin tünellenmesine izin verin. Bu, "
-"Yggdrasil'i bir VPN tüneline benzer şekilde diğer ağlara yönlendirme veya bu "
-"ağlar arasında köprü oluşturmak için etkili bir şekilde kullanmanıza olanak "
-"tanır. Tünel oluşturma, herhangi iki düğüm arasında çalışır ve doğrudan "
-"eşlenmelerini gerektirmez."
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid "Always allow outbound"
-msgstr "Her zaman gidenlere izin ver"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:31
-msgid "Blacklisted public keys"
-msgstr "Kara listeye alınmış genel anahtarlar"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:17
msgid ""
"By default, nodeinfo contains some defaults including the platform, "
"architecture and Yggdrasil version. These can help when surveying the "
@@ -81,14 +28,21 @@ msgstr ""
"etkinleştirmek bunu önler, böylece yalnızca \"NodeInfo\" içinde belirtilen "
"öğeler belirtilirse geri gönderilir."
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
+msgid ""
+"Configuration for which interfaces multicast peer discovery should be "
+"enabled on. Regex is a regular expression which is matched against an "
+"interface name, and interfaces use the first configuration that they match "
+"gainst. Beacon configures whether or not the node should send link-local "
+"multicast beacons to advertise their presence, while listening for incoming "
+"connections on Port. Listen controls whether or not the node listens for "
+"multicast beacons and opens outgoing connections."
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
msgid "Enable NodeInfo privacy"
msgstr "NodeInfo gizliliğini etkinleştir"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:14
-msgid "Enable session firewall"
-msgstr "Oturum güvenlik duvarını etkinleştir"
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:11
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:41
msgid "Encryption keys"
@@ -110,92 +64,23 @@ msgstr "Genel Ayarlar"
msgid "Grant access to LuCI app yggdrasil"
msgstr "LuCI uygulaması yggdrasil'e erişim izni verin"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:26
-msgid "IPv4 local subnet"
-msgstr "IPv4 yerel alt ağı"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:19
-msgid "IPv4 remote subnet"
-msgstr "IPv4 uzak alt ağı"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-msgid "IPv4 subnet"
-msgstr "IPv4 alt ağı"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:20
-msgid "IPv4 subnets belonging to remote nodes, mapped to the node's public"
-msgstr "Uzak düğümlere ait IPv4 alt ağları, düğümün geneliyle eşlenir"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:27
-msgid ""
-"IPv4 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges will be tunnelled."
-msgstr ""
-"Bu düğümün tünellerin sonuna ait IPv4 alt ağları. Yalnızca bu aralıklardan "
-"gelen trafiğe tünel uygulanacaktır."
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:40
-msgid "IPv6 local subnet"
-msgstr "IPv6 yerel alt ağı"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:33
-msgid "IPv6 remote subnet"
-msgstr "IPv6 uzak alt ağ"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "IPv6 subnet"
-msgstr "IPv6 alt ağı"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:34
-msgid "IPv6 subnets belonging to remote nodes, mapped to the node's public"
-msgstr "Uzak düğümlere ait IPv6 alt ağları, düğümün geneliyle eşlenir"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:41
-msgid ""
-"IPv6 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges (or the Yggdrasil node's IPv6 address/subnet) will be tunnelled."
-msgstr ""
-"Bu düğümün tünellerin sonuna ait IPv6 alt ağları. Yalnızca bu aralıklardan ("
-"veya Yggdrasil düğümünün IPv6 adresi / alt ağından) gelen trafik "
-"tünellenecektir."
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:15
-msgid ""
-"If disabled, network traffic from any node will be allowed. If enabled, the "
-"below rules apply"
-msgstr ""
-"Devre dışı bırakılırsa, herhangi bir düğümden ağ trafiğine izin verilir. "
-"Etkinleştirilirse, aşağıdaki kurallar geçerlidir"
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:25
msgid "Interface"
msgstr "Arayüz"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
-msgid "Interface name"
-msgstr "Arayüz ismi"
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
msgid "Interface peers"
msgstr "Arayüz eşleri"
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:16
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:19
msgid "Keep this private. When compromised, generate a new keypair and IPv6."
msgstr ""
"Bunu gizli tut. Güvenlik ihlal edildiğinde, yeni bir anahtar çifti ve IPv6 "
"oluşturun."
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Key"
-msgstr "Anahtar"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "Link-local TCP port"
-msgstr "Bağlantı yerel TCP bağlantı noktası"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:52
+msgid "Link-local port"
+msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:21
msgid ""
@@ -221,11 +106,11 @@ msgstr ""
"işletim sistemi yönlendirme tablosuna uyacaktır, bu nedenle farklı arayüzler "
"üzerinden bağlanabileceğiniz bu bölümü kullanmalısınız."
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:33
msgid "Listen addresses"
msgstr "Adresleri dinle"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:34
msgid ""
"Listen addresses for incoming connections. You will need to add listeners in "
"order to accept incoming peerings from non-local nodes. Multicast peer "
@@ -239,39 +124,23 @@ msgstr ""
"çalışacaktır. Her dinleyici, yukarıdaki gibi URI biçiminde belirtilmelidir, "
"ör. tcp://0.0.0.0:0 or tcp://[::]:0 tüm arayüzleri dinlemek için."
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+msgid "Listen for beacons"
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:31
msgid "MTU size for the interface"
msgstr "Arayüz için MTU boyutu"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:39
-msgid "Maximum size of all switch queues combined"
-msgstr "Tüm anahtar sıralarının birleşik maksimum boyutu"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:41
-msgid "Multicast interfaces"
-msgstr "Çok noktaya yayın arayüzleri"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:25
-msgid ""
-"Network traffic is always accepted from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:44
+msgid "Multicast interface"
msgstr ""
-"AllowFromDirect veya AllowFromRemote'dan bağımsız olarak bu eşlerden ağ "
-"trafiği her zaman kabul edilir"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:32
-msgid ""
-"Network traffic is always rejected from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
-msgstr ""
-"AllowFromDirect veya AllowFromRemote'dan bağımsız olarak ağ trafiği bu "
-"eşlerden her zaman reddedilir"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
msgid "NodeInfo"
msgstr "Düğüm Bilgisi"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:30
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:24
msgid ""
"Optional node info. This must be a { \"key\": \"value\", ... } map or set as "
"null. This is entirely optional but, if set, is visible to the whole network "
@@ -286,88 +155,22 @@ msgstr ""
msgid "Peers"
msgstr "Eşler"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Public encryption key"
-msgstr "Genel şifreleme anahtarı"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:26
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:33
-msgid "Public key"
-msgstr "Genel anahtar"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:42
-msgid ""
-"Regular expressions for which interfaces multicast peer discovery should be "
-"enabled on. If none specified, multicast peer discovery is disabled. The "
-"default value is .* which uses all interfaces."
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:49
+msgid "Regular expression"
msgstr ""
-"Arayüzlerin çok noktaya yayın eş keşfinin etkinleştirilmesi gereken normal "
-"ifadeler. Hiçbiri belirtilmezse, çok noktaya yayın eş keşfi devre dışı "
-"bırakılır. Varsayılan değer, tüm arabirimleri kullanan .* Şeklindedir."
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:50
-msgid "Session firewall"
-msgstr "Oturum güvenlik duvarı"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:11
-msgid "Session firewall settings"
-msgstr "Oturum güvenlik duvarı ayarları"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:46
-msgid "Set .* to multicast on all interfaces"
-msgstr "Tüm arabirimlerde çok noktaya yayın için .* öğesini ayarlayın"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+msgid "Send beacons"
+msgstr ""
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:32
msgid "Settings"
msgstr "Ayarlar"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:18
-msgid "Signing private key"
-msgstr "Özel anahtarı imzalama"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:17
-msgid "Signing public key"
-msgstr "Genel anahtarı imzalama"
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:14
msgid "Status"
msgstr "Durum"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "Subnet"
-msgstr "Alt ağ"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
-msgid ""
-"The port number to be used for the link-local TCP listeners for the "
-"configured MulticastInterfaces. This option does not affect "
-"listenersspecified in the Listen option. Unless you plan to firewall link-"
-"localtraffic, it is best to leave this as the default value of 0. This "
-"option cannot currently be changed by reloading config during runtime."
-msgstr ""
-"Yapılandırılan Çok Noktaya Yayın Arabirimleri için bağlantı yerel TCP "
-"dinleyicileri için kullanılacak bağlantı noktası numarası. Bu seçenek, Dinle "
-"seçeneğinde belirtilen dinleyicileri etkilemez. Link-localtraffic'i güvenlik "
-"duvarına sokmayı planlamıyorsanız, bunu varsayılan değer olarak 0 olarak "
-"bırakmak en iyisidir. Bu seçenek şu anda çalışma zamanı sırasında config "
-"yeniden yüklenerek değiştirilemez."
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:11
-msgid "Tunnel Routing"
-msgstr "Tünel Yönlendirme"
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:59
-msgid "Tunnel routing"
-msgstr "Tünel Yönlendirme"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:24
-msgid "Whitelisted public keys"
-msgstr "Beyaz listeye alınmış genel anahtarlar"
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:3
msgid "Yggdrasil"
msgstr "Yggdrasil"
@@ -380,6 +183,186 @@ msgstr "Yggdrasil düğüm durumu"
msgid "Yggdrasil's network interface name"
msgstr "Yggdrasil'in ağ arayüz adı"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:58
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:40
msgid "e.g. tcp://0.0.0.0:0 or tcp://[::]:0"
msgstr "örn. tcp://0.0.0.0:0 veya tcp://[::]:0"
+
+#~ msgid "Address to listen for incoming connections"
+#~ msgstr "Gelen bağlantıları dinleme adresi"
+
+#~ msgid "Allow from direct"
+#~ msgstr "Doğrudan izin ver"
+
+#~ msgid "Allow from remote"
+#~ msgstr "Uzaktan izin ver"
+
+#~ msgid "Allow network traffic from directly connected peers"
+#~ msgstr "Doğrudan bağlı eşlerden ağ trafiğine izin verin"
+
+#~ msgid ""
+#~ "Allow network traffic from remote nodes on the network that you are not "
+#~ "directly peered with"
+#~ msgstr ""
+#~ "Doğrudan eşlenmediğiniz ağ üzerindeki uzak düğümlerden ağ trafiğine izin "
+#~ "verin"
+
+#~ msgid ""
+#~ "Allow outbound network traffic regardless of AllowFromDirect or "
+#~ "AllowFromRemote"
+#~ msgstr ""
+#~ "AllowFromDirect veya AllowFromRemote'tan bağımsız olarak giden ağ "
+#~ "trafiğine izin verin"
+
+#~ msgid ""
+#~ "Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively "
+#~ "allows you to use Yggdrasil to route to, or to bridge other networks, "
+#~ "similar to a VPN tunnel. Tunnelling works between any two nodes and does "
+#~ "not require them to be directly peered."
+#~ msgstr ""
+#~ "Yggdrasil üzerinden Yggdrasil dışı trafiğin tünellenmesine izin verin. "
+#~ "Bu, Yggdrasil'i bir VPN tüneline benzer şekilde diğer ağlara yönlendirme "
+#~ "veya bu ağlar arasında köprü oluşturmak için etkili bir şekilde "
+#~ "kullanmanıza olanak tanır. Tünel oluşturma, herhangi iki düğüm arasında "
+#~ "çalışır ve doğrudan eşlenmelerini gerektirmez."
+
+#~ msgid "Always allow outbound"
+#~ msgstr "Her zaman gidenlere izin ver"
+
+#~ msgid "Blacklisted public keys"
+#~ msgstr "Kara listeye alınmış genel anahtarlar"
+
+#~ msgid "Enable session firewall"
+#~ msgstr "Oturum güvenlik duvarını etkinleştir"
+
+#~ msgid "IPv4 local subnet"
+#~ msgstr "IPv4 yerel alt ağı"
+
+#~ msgid "IPv4 remote subnet"
+#~ msgstr "IPv4 uzak alt ağı"
+
+#~ msgid "IPv4 subnet"
+#~ msgstr "IPv4 alt ağı"
+
+#~ msgid "IPv4 subnets belonging to remote nodes, mapped to the node's public"
+#~ msgstr "Uzak düğümlere ait IPv4 alt ağları, düğümün geneliyle eşlenir"
+
+#~ msgid ""
+#~ "IPv4 subnets belonging to this node's end of the tunnels. Only traffic "
+#~ "from these ranges will be tunnelled."
+#~ msgstr ""
+#~ "Bu düğümün tünellerin sonuna ait IPv4 alt ağları. Yalnızca bu "
+#~ "aralıklardan gelen trafiğe tünel uygulanacaktır."
+
+#~ msgid "IPv6 local subnet"
+#~ msgstr "IPv6 yerel alt ağı"
+
+#~ msgid "IPv6 remote subnet"
+#~ msgstr "IPv6 uzak alt ağ"
+
+#~ msgid "IPv6 subnet"
+#~ msgstr "IPv6 alt ağı"
+
+#~ msgid "IPv6 subnets belonging to remote nodes, mapped to the node's public"
+#~ msgstr "Uzak düğümlere ait IPv6 alt ağları, düğümün geneliyle eşlenir"
+
+#~ msgid ""
+#~ "IPv6 subnets belonging to this node's end of the tunnels. Only traffic "
+#~ "from these ranges (or the Yggdrasil node's IPv6 address/subnet) will be "
+#~ "tunnelled."
+#~ msgstr ""
+#~ "Bu düğümün tünellerin sonuna ait IPv6 alt ağları. Yalnızca bu "
+#~ "aralıklardan (veya Yggdrasil düğümünün IPv6 adresi / alt ağından) gelen "
+#~ "trafik tünellenecektir."
+
+#~ msgid ""
+#~ "If disabled, network traffic from any node will be allowed. If enabled, "
+#~ "the below rules apply"
+#~ msgstr ""
+#~ "Devre dışı bırakılırsa, herhangi bir düğümden ağ trafiğine izin verilir. "
+#~ "Etkinleştirilirse, aşağıdaki kurallar geçerlidir"
+
+#~ msgid "Interface name"
+#~ msgstr "Arayüz ismi"
+
+#~ msgid "Key"
+#~ msgstr "Anahtar"
+
+#~ msgid "Link-local TCP port"
+#~ msgstr "Bağlantı yerel TCP bağlantı noktası"
+
+#~ msgid "Maximum size of all switch queues combined"
+#~ msgstr "Tüm anahtar sıralarının birleşik maksimum boyutu"
+
+#~ msgid "Multicast interfaces"
+#~ msgstr "Çok noktaya yayın arayüzleri"
+
+#~ msgid ""
+#~ "Network traffic is always accepted from those peers, regardless of "
+#~ "AllowFromDirect or AllowFromRemote"
+#~ msgstr ""
+#~ "AllowFromDirect veya AllowFromRemote'dan bağımsız olarak bu eşlerden ağ "
+#~ "trafiği her zaman kabul edilir"
+
+#~ msgid ""
+#~ "Network traffic is always rejected from those peers, regardless of "
+#~ "AllowFromDirect or AllowFromRemote"
+#~ msgstr ""
+#~ "AllowFromDirect veya AllowFromRemote'dan bağımsız olarak ağ trafiği bu "
+#~ "eşlerden her zaman reddedilir"
+
+#~ msgid "Public encryption key"
+#~ msgstr "Genel şifreleme anahtarı"
+
+#~ msgid "Public key"
+#~ msgstr "Genel anahtar"
+
+#~ msgid ""
+#~ "Regular expressions for which interfaces multicast peer discovery should "
+#~ "be enabled on. If none specified, multicast peer discovery is disabled. "
+#~ "The default value is .* which uses all interfaces."
+#~ msgstr ""
+#~ "Arayüzlerin çok noktaya yayın eş keşfinin etkinleştirilmesi gereken "
+#~ "normal ifadeler. Hiçbiri belirtilmezse, çok noktaya yayın eş keşfi devre "
+#~ "dışı bırakılır. Varsayılan değer, tüm arabirimleri kullanan .* "
+#~ "Şeklindedir."
+
+#~ msgid "Session firewall"
+#~ msgstr "Oturum güvenlik duvarı"
+
+#~ msgid "Session firewall settings"
+#~ msgstr "Oturum güvenlik duvarı ayarları"
+
+#~ msgid "Set .* to multicast on all interfaces"
+#~ msgstr "Tüm arabirimlerde çok noktaya yayın için .* öğesini ayarlayın"
+
+#~ msgid "Signing private key"
+#~ msgstr "Özel anahtarı imzalama"
+
+#~ msgid "Signing public key"
+#~ msgstr "Genel anahtarı imzalama"
+
+#~ msgid "Subnet"
+#~ msgstr "Alt ağ"
+
+#~ msgid ""
+#~ "The port number to be used for the link-local TCP listeners for the "
+#~ "configured MulticastInterfaces. This option does not affect "
+#~ "listenersspecified in the Listen option. Unless you plan to firewall link-"
+#~ "localtraffic, it is best to leave this as the default value of 0. This "
+#~ "option cannot currently be changed by reloading config during runtime."
+#~ msgstr ""
+#~ "Yapılandırılan Çok Noktaya Yayın Arabirimleri için bağlantı yerel TCP "
+#~ "dinleyicileri için kullanılacak bağlantı noktası numarası. Bu seçenek, "
+#~ "Dinle seçeneğinde belirtilen dinleyicileri etkilemez. Link-localtraffic'i "
+#~ "güvenlik duvarına sokmayı planlamıyorsanız, bunu varsayılan değer olarak "
+#~ "0 olarak bırakmak en iyisidir. Bu seçenek şu anda çalışma zamanı "
+#~ "sırasında config yeniden yüklenerek değiştirilemez."
+
+#~ msgid "Tunnel Routing"
+#~ msgstr "Tünel Yönlendirme"
+
+#~ msgid "Tunnel routing"
+#~ msgstr "Tünel Yönlendirme"
+
+#~ msgid "Whitelisted public keys"
+#~ msgstr "Beyaz listeye alınmış genel anahtarlar"
diff --git a/applications/luci-app-yggdrasil/po/uk/yggdrasil.po b/applications/luci-app-yggdrasil/po/uk/yggdrasil.po
index ca7431b0f1..f4b5bf2bca 100644
--- a/applications/luci-app-yggdrasil/po/uk/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/uk/yggdrasil.po
@@ -15,51 +15,7 @@ msgstr ""
msgid "Active peers"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:56
-msgid "Address to listen for incoming connections"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:16
-msgid "Allow from direct"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:18
-msgid "Allow from remote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:17
-msgid "Allow network traffic from directly connected peers"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:19
-msgid ""
-"Allow network traffic from remote nodes on the network that you are not "
-"directly peered with"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid ""
-"Allow outbound network traffic regardless of AllowFromDirect or "
-"AllowFromRemote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:14
-msgid ""
-"Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively "
-"allows you to use Yggdrasil to route to, or to bridge other networks, "
-"similar to a VPN tunnel. Tunnelling works between any two nodes and does not "
-"require them to be directly peered."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid "Always allow outbound"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:31
-msgid "Blacklisted public keys"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:17
msgid ""
"By default, nodeinfo contains some defaults including the platform, "
"architecture and Yggdrasil version. These can help when surveying the "
@@ -68,12 +24,19 @@ msgid ""
"specified."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "Enable NodeInfo privacy"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
+msgid ""
+"Configuration for which interfaces multicast peer discovery should be "
+"enabled on. Regex is a regular expression which is matched against an "
+"interface name, and interfaces use the first configuration that they match "
+"gainst. Beacon configures whether or not the node should send link-local "
+"multicast beacons to advertise their presence, while listening for incoming "
+"connections on Port. Listen controls whether or not the node listens for "
+"multicast beacons and opens outgoing connections."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:14
-msgid "Enable session firewall"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
+msgid "Enable NodeInfo privacy"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:11
@@ -97,82 +60,20 @@ msgstr "Загальні параметри"
msgid "Grant access to LuCI app yggdrasil"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:26
-msgid "IPv4 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:19
-msgid "IPv4 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-msgid "IPv4 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:20
-msgid "IPv4 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:27
-msgid ""
-"IPv4 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:40
-msgid "IPv6 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:33
-msgid "IPv6 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "IPv6 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:34
-msgid "IPv6 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:41
-msgid ""
-"IPv6 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges (or the Yggdrasil node's IPv6 address/subnet) will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:15
-msgid ""
-"If disabled, network traffic from any node will be allowed. If enabled, the "
-"below rules apply"
-msgstr ""
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:25
msgid "Interface"
msgstr "Інтерфейс"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
-msgid "Interface name"
-msgstr "Назва інтерфейсу"
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
msgid "Interface peers"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:16
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:19
msgid "Keep this private. When compromised, generate a new keypair and IPv6."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Key"
-msgstr "Ключ"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "Link-local TCP port"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:52
+msgid "Link-local port"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:21
@@ -191,11 +92,11 @@ msgid ""
"when you may connect via different interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:33
msgid "Listen addresses"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:34
msgid ""
"Listen addresses for incoming connections. You will need to add listeners in "
"order to accept incoming peerings from non-local nodes. Multicast peer "
@@ -204,35 +105,23 @@ msgid ""
"[::]:0 to listen on all interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
-msgid "MTU size for the interface"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:39
-msgid "Maximum size of all switch queues combined"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:41
-msgid "Multicast interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+msgid "Listen for beacons"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:25
-msgid ""
-"Network traffic is always accepted from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:31
+msgid "MTU size for the interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:32
-msgid ""
-"Network traffic is always rejected from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:44
+msgid "Multicast interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
msgid "NodeInfo"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:30
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:24
msgid ""
"Optional node info. This must be a { \"key\": \"value\", ... } map or set as "
"null. This is entirely optional but, if set, is visible to the whole network "
@@ -244,79 +133,22 @@ msgstr ""
msgid "Peers"
msgstr "Вузли"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Public encryption key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:26
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:33
-msgid "Public key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:42
-msgid ""
-"Regular expressions for which interfaces multicast peer discovery should be "
-"enabled on. If none specified, multicast peer discovery is disabled. The "
-"default value is .* which uses all interfaces."
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:49
+msgid "Regular expression"
msgstr ""
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:50
-msgid "Session firewall"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:11
-msgid "Session firewall settings"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:46
-msgid "Set .* to multicast on all interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+msgid "Send beacons"
msgstr ""
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:32
msgid "Settings"
msgstr "Налаштування"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:18
-msgid "Signing private key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:17
-msgid "Signing public key"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:14
msgid "Status"
msgstr "Стан"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "Subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
-msgid ""
-"The port number to be used for the link-local TCP listeners for the "
-"configured MulticastInterfaces. This option does not affect "
-"listenersspecified in the Listen option. Unless you plan to firewall link-"
-"localtraffic, it is best to leave this as the default value of 0. This "
-"option cannot currently be changed by reloading config during runtime."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:11
-msgid "Tunnel Routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:59
-msgid "Tunnel routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:24
-msgid "Whitelisted public keys"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:3
msgid "Yggdrasil"
msgstr ""
@@ -329,6 +161,12 @@ msgstr ""
msgid "Yggdrasil's network interface name"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:58
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:40
msgid "e.g. tcp://0.0.0.0:0 or tcp://[::]:0"
msgstr ""
+
+#~ msgid "Interface name"
+#~ msgstr "Назва інтерфейсу"
+
+#~ msgid "Key"
+#~ msgstr "Ключ"
diff --git a/applications/luci-app-yggdrasil/po/vi/yggdrasil.po b/applications/luci-app-yggdrasil/po/vi/yggdrasil.po
index 964c577bfe..15ec941954 100644
--- a/applications/luci-app-yggdrasil/po/vi/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/vi/yggdrasil.po
@@ -8,51 +8,7 @@ msgstr ""
msgid "Active peers"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:56
-msgid "Address to listen for incoming connections"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:16
-msgid "Allow from direct"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:18
-msgid "Allow from remote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:17
-msgid "Allow network traffic from directly connected peers"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:19
-msgid ""
-"Allow network traffic from remote nodes on the network that you are not "
-"directly peered with"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid ""
-"Allow outbound network traffic regardless of AllowFromDirect or "
-"AllowFromRemote"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:14
-msgid ""
-"Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively "
-"allows you to use Yggdrasil to route to, or to bridge other networks, "
-"similar to a VPN tunnel. Tunnelling works between any two nodes and does not "
-"require them to be directly peered."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid "Always allow outbound"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:31
-msgid "Blacklisted public keys"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:17
msgid ""
"By default, nodeinfo contains some defaults including the platform, "
"architecture and Yggdrasil version. These can help when surveying the "
@@ -61,12 +17,19 @@ msgid ""
"specified."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "Enable NodeInfo privacy"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
+msgid ""
+"Configuration for which interfaces multicast peer discovery should be "
+"enabled on. Regex is a regular expression which is matched against an "
+"interface name, and interfaces use the first configuration that they match "
+"gainst. Beacon configures whether or not the node should send link-local "
+"multicast beacons to advertise their presence, while listening for incoming "
+"connections on Port. Listen controls whether or not the node listens for "
+"multicast beacons and opens outgoing connections."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:14
-msgid "Enable session firewall"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
+msgid "Enable NodeInfo privacy"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:11
@@ -90,82 +53,20 @@ msgstr ""
msgid "Grant access to LuCI app yggdrasil"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:26
-msgid "IPv4 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:19
-msgid "IPv4 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-msgid "IPv4 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:20
-msgid "IPv4 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:27
-msgid ""
-"IPv4 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:40
-msgid "IPv6 local subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:33
-msgid "IPv6 remote subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "IPv6 subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:34
-msgid "IPv6 subnets belonging to remote nodes, mapped to the node's public"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:41
-msgid ""
-"IPv6 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges (or the Yggdrasil node's IPv6 address/subnet) will be tunnelled."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:15
-msgid ""
-"If disabled, network traffic from any node will be allowed. If enabled, the "
-"below rules apply"
-msgstr ""
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:25
msgid "Interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
-msgid "Interface name"
-msgstr ""
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
msgid "Interface peers"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:16
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:19
msgid "Keep this private. When compromised, generate a new keypair and IPv6."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "Link-local TCP port"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:52
+msgid "Link-local port"
msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:21
@@ -184,11 +85,11 @@ msgid ""
"when you may connect via different interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:33
msgid "Listen addresses"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:34
msgid ""
"Listen addresses for incoming connections. You will need to add listeners in "
"order to accept incoming peerings from non-local nodes. Multicast peer "
@@ -197,35 +98,23 @@ msgid ""
"[::]:0 to listen on all interfaces."
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
-msgid "MTU size for the interface"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:39
-msgid "Maximum size of all switch queues combined"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:41
-msgid "Multicast interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+msgid "Listen for beacons"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:25
-msgid ""
-"Network traffic is always accepted from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:31
+msgid "MTU size for the interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:32
-msgid ""
-"Network traffic is always rejected from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:44
+msgid "Multicast interface"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
msgid "NodeInfo"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:30
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:24
msgid ""
"Optional node info. This must be a { \"key\": \"value\", ... } map or set as "
"null. This is entirely optional but, if set, is visible to the whole network "
@@ -237,79 +126,22 @@ msgstr ""
msgid "Peers"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Public encryption key"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:49
+msgid "Regular expression"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:26
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:33
-msgid "Public key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:42
-msgid ""
-"Regular expressions for which interfaces multicast peer discovery should be "
-"enabled on. If none specified, multicast peer discovery is disabled. The "
-"default value is .* which uses all interfaces."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:50
-msgid "Session firewall"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:11
-msgid "Session firewall settings"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:46
-msgid "Set .* to multicast on all interfaces"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+msgid "Send beacons"
msgstr ""
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:32
msgid "Settings"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:18
-msgid "Signing private key"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:17
-msgid "Signing public key"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:14
msgid "Status"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "Subnet"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
-msgid ""
-"The port number to be used for the link-local TCP listeners for the "
-"configured MulticastInterfaces. This option does not affect "
-"listenersspecified in the Listen option. Unless you plan to firewall link-"
-"localtraffic, it is best to leave this as the default value of 0. This "
-"option cannot currently be changed by reloading config during runtime."
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:11
-msgid "Tunnel Routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:59
-msgid "Tunnel routing"
-msgstr ""
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:24
-msgid "Whitelisted public keys"
-msgstr ""
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:3
msgid "Yggdrasil"
msgstr ""
@@ -322,6 +154,6 @@ msgstr ""
msgid "Yggdrasil's network interface name"
msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:58
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:40
msgid "e.g. tcp://0.0.0.0:0 or tcp://[::]:0"
msgstr ""
diff --git a/applications/luci-app-yggdrasil/po/zh_Hans/yggdrasil.po b/applications/luci-app-yggdrasil/po/zh_Hans/yggdrasil.po
index 4d7c4acf97..8fa7a63f5d 100644
--- a/applications/luci-app-yggdrasil/po/zh_Hans/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/zh_Hans/yggdrasil.po
@@ -14,53 +14,7 @@ msgstr ""
msgid "Active peers"
msgstr "活跃的对等端"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:56
-msgid "Address to listen for incoming connections"
-msgstr "侦听传入连接的地址"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:16
-msgid "Allow from direct"
-msgstr "允许直连"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:18
-msgid "Allow from remote"
-msgstr "允许远程访问"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:17
-msgid "Allow network traffic from directly connected peers"
-msgstr "允许来自直接连接的对等端的网络流量"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:19
-msgid ""
-"Allow network traffic from remote nodes on the network that you are not "
-"directly peered with"
-msgstr "允许来自您未与之直接建立对等连接的网络远程节点的网络流量"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid ""
-"Allow outbound network traffic regardless of AllowFromDirect or "
-"AllowFromRemote"
-msgstr "无论 AllowFromDirect 还是 AllowFromRemote,都允许出站网络流量"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:14
-msgid ""
-"Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively "
-"allows you to use Yggdrasil to route to, or to bridge other networks, "
-"similar to a VPN tunnel. Tunnelling works between any two nodes and does not "
-"require them to be directly peered."
-msgstr ""
-"允许通过 Yggdrasil 隧道传输非 Yggdrasil 流量。这有效地使您可以使用 Yggdrasil 来路由或桥接其他网络,类似于 VPN "
-"隧道。隧道在任何两个节点之间工作,并且不需要直接对等。"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid "Always allow outbound"
-msgstr "总是允许出站流量"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:31
-msgid "Blacklisted public keys"
-msgstr "被拉黑的公钥"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:17
msgid ""
"By default, nodeinfo contains some defaults including the platform, "
"architecture and Yggdrasil version. These can help when surveying the "
@@ -68,17 +22,25 @@ msgid ""
"prevents this, so that only items specified in \"NodeInfo\" are sent back if "
"specified."
msgstr ""
-"默认情况下,nodeinfo 包含一些默认值,包括平台,体系结构和 Yggdrasil 版本。这些在调查网络和诊断网络路由问题时会有所帮助。启用 "
-"nodeinfo 隐私选项可防止这种情况,因此,如果启用,则仅发送回在“ NodeInfo”中指定的项目。"
+"默认情况下,nodeinfo 包含一些默认值,包括平台,体系结构和 Yggdrasil 版本。这"
+"些在调查网络和诊断网络路由问题时会有所帮助。启用 nodeinfo 隐私选项可防止这种"
+"情况,因此,如果启用,则仅发送回在“ NodeInfo”中指定的项目。"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
+msgid ""
+"Configuration for which interfaces multicast peer discovery should be "
+"enabled on. Regex is a regular expression which is matched against an "
+"interface name, and interfaces use the first configuration that they match "
+"gainst. Beacon configures whether or not the node should send link-local "
+"multicast beacons to advertise their presence, while listening for incoming "
+"connections on Port. Listen controls whether or not the node listens for "
+"multicast beacons and opens outgoing connections."
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
msgid "Enable NodeInfo privacy"
msgstr "启用 NodeInfo 隐私"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:14
-msgid "Enable session firewall"
-msgstr "启用会话防火墙"
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:11
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:41
msgid "Encryption keys"
@@ -100,83 +62,21 @@ msgstr "常规设置"
msgid "Grant access to LuCI app yggdrasil"
msgstr "授予访问 LuCI 应用 yggdrasil 的权限"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:26
-msgid "IPv4 local subnet"
-msgstr "IPv4 本地子网"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:19
-msgid "IPv4 remote subnet"
-msgstr "IPv4 远程子网"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-msgid "IPv4 subnet"
-msgstr "IPv4 子网"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:20
-msgid "IPv4 subnets belonging to remote nodes, mapped to the node's public"
-msgstr "属于远程节点的IPv4子网,映射到该节点的公共节点"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:27
-msgid ""
-"IPv4 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges will be tunnelled."
-msgstr "属于该节点隧道末端的IPv4子网。只有这些范围内的流量将通过隧道传输。"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:40
-msgid "IPv6 local subnet"
-msgstr "IPv6 本地子网"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:33
-msgid "IPv6 remote subnet"
-msgstr "IPv6 远程子网"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "IPv6 subnet"
-msgstr "IPv6 子网"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:34
-msgid "IPv6 subnets belonging to remote nodes, mapped to the node's public"
-msgstr "属于远程节点的 IPv6 子网,映射到该节点的公共节点"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:41
-msgid ""
-"IPv6 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges (or the Yggdrasil node's IPv6 address/subnet) will be tunnelled."
-msgstr "属于这个节点的隧道末端的IPv6子网。只有来自这些范围(或Yggdrasil节点的IPv6地址/子网)的流量将通过隧道。"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:15
-msgid ""
-"If disabled, network traffic from any node will be allowed. If enabled, the "
-"below rules apply"
-msgstr "如果禁用,将允许来自任何节点的网络流量。如果启用,将使用下面的规则"
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:25
msgid "Interface"
msgstr "接口"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
-msgid "Interface name"
-msgstr "接口名称"
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
msgid "Interface peers"
msgstr "接口对等节点"
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:16
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:19
msgid "Keep this private. When compromised, generate a new keypair and IPv6."
msgstr "请保管好该信息。一旦泄露,请重新生成一个新的密钥对和 IPv6。"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Key"
-msgstr "密钥"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "Link-local TCP port"
-msgstr "Link-local TCP 端口"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:52
+msgid "Link-local port"
+msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:21
msgid ""
@@ -185,8 +85,8 @@ msgid ""
"that SOCKS peerings will NOT be affected by this option and should go in the "
"\"Peers\" section instead."
msgstr ""
-"URI格式的出站对等连接的连接字符串列表,按源接口排列,例如{ \"eth0\": [ tcp://a.b.c.d:e ] "
-"}。请注意,SOCKS对等不会受到此选项的影响,而应进入“对等”部分。"
+"URI格式的出站对等连接的连接字符串列表,按源接口排列,例如{ \"eth0\": [ tcp://"
+"a.b.c.d:e ] }。请注意,SOCKS对等不会受到此选项的影响,而应进入“对等”部分。"
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:12
msgid ""
@@ -195,14 +95,15 @@ msgid ""
"the operating system routing table, therefore you should use this section "
"when you may connect via different interfaces."
msgstr ""
-"URI格式的出站对等连接的连接字符串列表。例如,tcp://a.b.c.d:e 或 socks://a.b.c.d:e/f.g.h."
-"i:j。这些连接将遵循操作系统路由表,因此,当您可以通过不同的接口进行连接时,应使用本部分。"
+"URI格式的出站对等连接的连接字符串列表。例如,tcp://a.b.c.d:e 或 socks://a.b."
+"c.d:e/f.g.h.i:j。这些连接将遵循操作系统路由表,因此,当您可以通过不同的接口进"
+"行连接时,应使用本部分。"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:33
msgid "Listen addresses"
msgstr "监听地址"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:34
msgid ""
"Listen addresses for incoming connections. You will need to add listeners in "
"order to accept incoming peerings from non-local nodes. Multicast peer "
@@ -210,38 +111,27 @@ msgid ""
"should be specified in URI format as above, e.g. tcp://0.0.0.0:0 or tcp://"
"[::]:0 to listen on all interfaces."
msgstr ""
-"侦听传入连接的地址。您需要添加侦听器来接受来自非本地节点的传入对等端。不管这里设置了什么监听器,多播对等发现都可以工作。每个侦听器都应按上述 URI "
-"格式指定,例如,tcp://0.0.0.0:0 或 tcp://[::]:0 侦听所有接口。"
+"侦听传入连接的地址。您需要添加侦听器来接受来自非本地节点的传入对等端。不管这"
+"里设置了什么监听器,多播对等发现都可以工作。每个侦听器都应按上述 URI 格式指"
+"定,例如,tcp://0.0.0.0:0 或 tcp://[::]:0 侦听所有接口。"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+msgid "Listen for beacons"
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:31
msgid "MTU size for the interface"
msgstr "接口的 MTU 大小"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:39
-msgid "Maximum size of all switch queues combined"
-msgstr "所有交换队列的最大大小"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:41
-msgid "Multicast interfaces"
-msgstr "多播接口"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:25
-msgid ""
-"Network traffic is always accepted from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
-msgstr "无论AllowFromDirect还是AllowFromRemote,始终会从这些对等方接受网络流量"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:32
-msgid ""
-"Network traffic is always rejected from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
-msgstr "无论AllowFromDirect还是AllowFromRemote,总是会拒绝这些对等方的网络流量"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:44
+msgid "Multicast interface"
+msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
msgid "NodeInfo"
msgstr "节点信息"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:30
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:24
msgid ""
"Optional node info. This must be a { \"key\": \"value\", ... } map or set as "
"null. This is entirely optional but, if set, is visible to the whole network "
@@ -255,81 +145,22 @@ msgstr ""
msgid "Peers"
msgstr "对等节点"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Public encryption key"
-msgstr "公共加密密钥"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:26
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:33
-msgid "Public key"
-msgstr "公钥"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:42
-msgid ""
-"Regular expressions for which interfaces multicast peer discovery should be "
-"enabled on. If none specified, multicast peer discovery is disabled. The "
-"default value is .* which uses all interfaces."
-msgstr "应启用多播对等方发现的接口的正则表达式。如果未指定,则禁用多播对等发现。默认值为 .* ,使用所有接口。"
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:50
-msgid "Session firewall"
-msgstr "会话防火墙"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:11
-msgid "Session firewall settings"
-msgstr "会话防火墙设置"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:49
+msgid "Regular expression"
+msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:46
-msgid "Set .* to multicast on all interfaces"
-msgstr "将 .* 设置为所有接口上的多播"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+msgid "Send beacons"
+msgstr ""
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:32
msgid "Settings"
msgstr "设置"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:18
-msgid "Signing private key"
-msgstr "签名私钥"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:17
-msgid "Signing public key"
-msgstr "签名公钥"
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:14
msgid "Status"
msgstr "状态"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "Subnet"
-msgstr "子网"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
-msgid ""
-"The port number to be used for the link-local TCP listeners for the "
-"configured MulticastInterfaces. This option does not affect "
-"listenersspecified in the Listen option. Unless you plan to firewall link-"
-"localtraffic, it is best to leave this as the default value of 0. This "
-"option cannot currently be changed by reloading config during runtime."
-msgstr ""
-"用于已配置的MulticastInterfaces的链接本地TCP侦听器的端口号。此选项不影响“监听”选项中指定的监听器。除非您计划对防火墙link-"
-"localtraffic进行防火墙,否则最好将其保留为默认值0。此选项当前无法通过在运行时重新加载配置来更改。"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:11
-msgid "Tunnel Routing"
-msgstr "隧道路由"
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:59
-msgid "Tunnel routing"
-msgstr "隧道路由"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:24
-msgid "Whitelisted public keys"
-msgstr "白名单上的公钥"
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:3
msgid "Yggdrasil"
msgstr "Yggdrasil"
@@ -342,6 +173,169 @@ msgstr "Yggdrasil 节点状态"
msgid "Yggdrasil's network interface name"
msgstr "Yggdrasil 网络接口名称"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:58
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:40
msgid "e.g. tcp://0.0.0.0:0 or tcp://[::]:0"
msgstr "例如 tcp://0.0.0.0:0 or tcp://[::]:0"
+
+#~ msgid "Address to listen for incoming connections"
+#~ msgstr "侦听传入连接的地址"
+
+#~ msgid "Allow from direct"
+#~ msgstr "允许直连"
+
+#~ msgid "Allow from remote"
+#~ msgstr "允许远程访问"
+
+#~ msgid "Allow network traffic from directly connected peers"
+#~ msgstr "允许来自直接连接的对等端的网络流量"
+
+#~ msgid ""
+#~ "Allow network traffic from remote nodes on the network that you are not "
+#~ "directly peered with"
+#~ msgstr "允许来自您未与之直接建立对等连接的网络远程节点的网络流量"
+
+#~ msgid ""
+#~ "Allow outbound network traffic regardless of AllowFromDirect or "
+#~ "AllowFromRemote"
+#~ msgstr "无论 AllowFromDirect 还是 AllowFromRemote,都允许出站网络流量"
+
+#~ msgid ""
+#~ "Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively "
+#~ "allows you to use Yggdrasil to route to, or to bridge other networks, "
+#~ "similar to a VPN tunnel. Tunnelling works between any two nodes and does "
+#~ "not require them to be directly peered."
+#~ msgstr ""
+#~ "允许通过 Yggdrasil 隧道传输非 Yggdrasil 流量。这有效地使您可以使用 "
+#~ "Yggdrasil 来路由或桥接其他网络,类似于 VPN 隧道。隧道在任何两个节点之间工"
+#~ "作,并且不需要直接对等。"
+
+#~ msgid "Always allow outbound"
+#~ msgstr "总是允许出站流量"
+
+#~ msgid "Blacklisted public keys"
+#~ msgstr "被拉黑的公钥"
+
+#~ msgid "Enable session firewall"
+#~ msgstr "启用会话防火墙"
+
+#~ msgid "IPv4 local subnet"
+#~ msgstr "IPv4 本地子网"
+
+#~ msgid "IPv4 remote subnet"
+#~ msgstr "IPv4 远程子网"
+
+#~ msgid "IPv4 subnet"
+#~ msgstr "IPv4 子网"
+
+#~ msgid "IPv4 subnets belonging to remote nodes, mapped to the node's public"
+#~ msgstr "属于远程节点的IPv4子网,映射到该节点的公共节点"
+
+#~ msgid ""
+#~ "IPv4 subnets belonging to this node's end of the tunnels. Only traffic "
+#~ "from these ranges will be tunnelled."
+#~ msgstr "属于该节点隧道末端的IPv4子网。只有这些范围内的流量将通过隧道传输。"
+
+#~ msgid "IPv6 local subnet"
+#~ msgstr "IPv6 本地子网"
+
+#~ msgid "IPv6 remote subnet"
+#~ msgstr "IPv6 远程子网"
+
+#~ msgid "IPv6 subnet"
+#~ msgstr "IPv6 子网"
+
+#~ msgid "IPv6 subnets belonging to remote nodes, mapped to the node's public"
+#~ msgstr "属于远程节点的 IPv6 子网,映射到该节点的公共节点"
+
+#~ msgid ""
+#~ "IPv6 subnets belonging to this node's end of the tunnels. Only traffic "
+#~ "from these ranges (or the Yggdrasil node's IPv6 address/subnet) will be "
+#~ "tunnelled."
+#~ msgstr ""
+#~ "属于这个节点的隧道末端的IPv6子网。只有来自这些范围(或Yggdrasil节点的IPv6地"
+#~ "址/子网)的流量将通过隧道。"
+
+#~ msgid ""
+#~ "If disabled, network traffic from any node will be allowed. If enabled, "
+#~ "the below rules apply"
+#~ msgstr "如果禁用,将允许来自任何节点的网络流量。如果启用,将使用下面的规则"
+
+#~ msgid "Interface name"
+#~ msgstr "接口名称"
+
+#~ msgid "Key"
+#~ msgstr "密钥"
+
+#~ msgid "Link-local TCP port"
+#~ msgstr "Link-local TCP 端口"
+
+#~ msgid "Maximum size of all switch queues combined"
+#~ msgstr "所有交换队列的最大大小"
+
+#~ msgid "Multicast interfaces"
+#~ msgstr "多播接口"
+
+#~ msgid ""
+#~ "Network traffic is always accepted from those peers, regardless of "
+#~ "AllowFromDirect or AllowFromRemote"
+#~ msgstr ""
+#~ "无论AllowFromDirect还是AllowFromRemote,始终会从这些对等方接受网络流量"
+
+#~ msgid ""
+#~ "Network traffic is always rejected from those peers, regardless of "
+#~ "AllowFromDirect or AllowFromRemote"
+#~ msgstr ""
+#~ "无论AllowFromDirect还是AllowFromRemote,总是会拒绝这些对等方的网络流量"
+
+#~ msgid "Public encryption key"
+#~ msgstr "公共加密密钥"
+
+#~ msgid "Public key"
+#~ msgstr "公钥"
+
+#~ msgid ""
+#~ "Regular expressions for which interfaces multicast peer discovery should "
+#~ "be enabled on. If none specified, multicast peer discovery is disabled. "
+#~ "The default value is .* which uses all interfaces."
+#~ msgstr ""
+#~ "应启用多播对等方发现的接口的正则表达式。如果未指定,则禁用多播对等发现。默"
+#~ "认值为 .* ,使用所有接口。"
+
+#~ msgid "Session firewall"
+#~ msgstr "会话防火墙"
+
+#~ msgid "Session firewall settings"
+#~ msgstr "会话防火墙设置"
+
+#~ msgid "Set .* to multicast on all interfaces"
+#~ msgstr "将 .* 设置为所有接口上的多播"
+
+#~ msgid "Signing private key"
+#~ msgstr "签名私钥"
+
+#~ msgid "Signing public key"
+#~ msgstr "签名公钥"
+
+#~ msgid "Subnet"
+#~ msgstr "子网"
+
+#~ msgid ""
+#~ "The port number to be used for the link-local TCP listeners for the "
+#~ "configured MulticastInterfaces. This option does not affect "
+#~ "listenersspecified in the Listen option. Unless you plan to firewall link-"
+#~ "localtraffic, it is best to leave this as the default value of 0. This "
+#~ "option cannot currently be changed by reloading config during runtime."
+#~ msgstr ""
+#~ "用于已配置的MulticastInterfaces的链接本地TCP侦听器的端口号。此选项不影"
+#~ "响“监听”选项中指定的监听器。除非您计划对防火墙link-localtraffic进行防火"
+#~ "墙,否则最好将其保留为默认值0。此选项当前无法通过在运行时重新加载配置来更"
+#~ "改。"
+
+#~ msgid "Tunnel Routing"
+#~ msgstr "隧道路由"
+
+#~ msgid "Tunnel routing"
+#~ msgstr "隧道路由"
+
+#~ msgid "Whitelisted public keys"
+#~ msgstr "白名单上的公钥"
diff --git a/applications/luci-app-yggdrasil/po/zh_Hant/yggdrasil.po b/applications/luci-app-yggdrasil/po/zh_Hant/yggdrasil.po
index 5e53ea965b..90888c2531 100644
--- a/applications/luci-app-yggdrasil/po/zh_Hant/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/zh_Hant/yggdrasil.po
@@ -14,53 +14,7 @@ msgstr ""
msgid "Active peers"
msgstr "活躍的使用者群"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:56
-msgid "Address to listen for incoming connections"
-msgstr "監聽傳入連接的位址"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:16
-msgid "Allow from direct"
-msgstr "直接允許"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:18
-msgid "Allow from remote"
-msgstr "允許遠端"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:17
-msgid "Allow network traffic from directly connected peers"
-msgstr "允許來自直接連接節點的網絡流量"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:19
-msgid ""
-"Allow network traffic from remote nodes on the network that you are not "
-"directly peered with"
-msgstr "允許來自您未直接與之對等的網絡上遠端節點的網絡流量"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid ""
-"Allow outbound network traffic regardless of AllowFromDirect or "
-"AllowFromRemote"
-msgstr "無論AllowFromDirect還是AllowFromRemote,都允許傳出網絡流量"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:14
-msgid ""
-"Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively "
-"allows you to use Yggdrasil to route to, or to bridge other networks, "
-"similar to a VPN tunnel. Tunnelling works between any two nodes and does not "
-"require them to be directly peered."
-msgstr ""
-"允許通過Yggdrasil隧道傳輸非Yggdrasil流量。這有效地使您可以使用Yggdrasil來路由或橋接其他網絡,類似於VPN隧道。隧道在任何兩個節"
-"點之間工作,並且不需要直接對等。"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:21
-msgid "Always allow outbound"
-msgstr "始終允許傳出"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:31
-msgid "Blacklisted public keys"
-msgstr "黑名單公鑰"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:17
msgid ""
"By default, nodeinfo contains some defaults including the platform, "
"architecture and Yggdrasil version. These can help when surveying the "
@@ -68,17 +22,25 @@ msgid ""
"prevents this, so that only items specified in \"NodeInfo\" are sent back if "
"specified."
msgstr ""
-"預設情況下,nodeinfo包含一些預設值,包括平台、架構和Yggdrasil版本。這些在調查網絡和診斷網絡路由問題時會有所幫助。啟用nodeinfo隱私"
-"可防止這種情況。因此如果指定,則僅發送回在 “NodeInfo” 中指定的項目。"
+"預設情況下,nodeinfo包含一些預設值,包括平台、架構和Yggdrasil版本。這些在調查"
+"網絡和診斷網絡路由問題時會有所幫助。啟用nodeinfo隱私可防止這種情況。因此如果"
+"指定,則僅發送回在 “NodeInfo” 中指定的項目。"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
+msgid ""
+"Configuration for which interfaces multicast peer discovery should be "
+"enabled on. Regex is a regular expression which is matched against an "
+"interface name, and interfaces use the first configuration that they match "
+"gainst. Beacon configures whether or not the node should send link-local "
+"multicast beacons to advertise their presence, while listening for incoming "
+"connections on Port. Listen controls whether or not the node listens for "
+"multicast beacons and opens outgoing connections."
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
msgid "Enable NodeInfo privacy"
msgstr "啟用NodeInfo隱私"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:14
-msgid "Enable session firewall"
-msgstr "啟用會話防火牆"
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:11
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:41
msgid "Encryption keys"
@@ -100,83 +62,21 @@ msgstr "一般設定值"
msgid "Grant access to LuCI app yggdrasil"
msgstr "授予 luci-app-yggdrasil 擁有存取的權限"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:26
-msgid "IPv4 local subnet"
-msgstr "IPv4本地子網"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:19
-msgid "IPv4 remote subnet"
-msgstr "IPv4遠端子網"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-msgid "IPv4 subnet"
-msgstr "IPv4子網"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:20
-msgid "IPv4 subnets belonging to remote nodes, mapped to the node's public"
-msgstr "屬於遠端節點的IPv4子網,映射到該節點的公共節點"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:27
-msgid ""
-"IPv4 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges will be tunnelled."
-msgstr "屬於隧道的此節點末端的IPv4子網。只有這些範圍內的流量將通過隧道傳輸。"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:40
-msgid "IPv6 local subnet"
-msgstr "IPv6本地子網"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:33
-msgid "IPv6 remote subnet"
-msgstr "IPv6遠端子網"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "IPv6 subnet"
-msgstr "IPv6子網"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:34
-msgid "IPv6 subnets belonging to remote nodes, mapped to the node's public"
-msgstr "屬於遠端節點的IPv6子網,映射到該節點的公共節點"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:41
-msgid ""
-"IPv6 subnets belonging to this node's end of the tunnels. Only traffic from "
-"these ranges (or the Yggdrasil node's IPv6 address/subnet) will be tunnelled."
-msgstr "屬於隧道的此節點末端的IPv6子網。僅來自這些範圍(或Yggdrasil節點的IPv6位址/子網)的流量將通過隧道傳輸。"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:15
-msgid ""
-"If disabled, network traffic from any node will be allowed. If enabled, the "
-"below rules apply"
-msgstr "如果禁用,則將允許來自任何節點的網絡流量。如果啟用,則適用以下規則"
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:25
msgid "Interface"
msgstr "介面"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:45
-msgid "Interface name"
-msgstr "介面名稱"
-
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
msgid "Interface peers"
msgstr "對等介面"
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:16
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:19
msgid "Keep this private. When compromised, generate a new keypair and IPv6."
msgstr "保密。受到威脅時,產生新的密鑰對和IPv6。"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Key"
-msgstr "金鑰"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "Link-local TCP port"
-msgstr "連接本地TCP埠"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:52
+msgid "Link-local port"
+msgstr ""
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:21
msgid ""
@@ -185,8 +85,8 @@ msgid ""
"that SOCKS peerings will NOT be affected by this option and should go in the "
"\"Peers\" section instead."
msgstr ""
-"以URI格式的傳出對等連線的連接字串列表,按來源介面排列,例如 { “eth0”; [tcp://a.b.c.d:e "
-"]}。請注意,SOCKS對等不會受到此選項的影響,而應進入“對等”部分。"
+"以URI格式的傳出對等連線的連接字串列表,按來源介面排列,例如 { “eth0”; [tcp://"
+"a.b.c.d:e ]}。請注意,SOCKS對等不會受到此選項的影響,而應進入“對等”部分。"
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:12
msgid ""
@@ -195,14 +95,15 @@ msgid ""
"the operating system routing table, therefore you should use this section "
"when you may connect via different interfaces."
msgstr ""
-"以URI格式的傳出對等連線的連接字串列表,例如 tcp://a.b.c.d:e 或 socks://a.b.c.d:e /f.g.h."
-"i:j。這些連線將遵循操作系統路由表,因此,當您可以通過不同的界面進行連接時,應使用本節。"
+"以URI格式的傳出對等連線的連接字串列表,例如 tcp://a.b.c.d:e 或 socks://a.b.c."
+"d:e /f.g.h.i:j。這些連線將遵循操作系統路由表,因此,當您可以通過不同的界面進"
+"行連接時,應使用本節。"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:33
msgid "Listen addresses"
msgstr "監聽位址"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:34
msgid ""
"Listen addresses for incoming connections. You will need to add listeners in "
"order to accept incoming peerings from non-local nodes. Multicast peer "
@@ -210,125 +111,56 @@ msgid ""
"should be specified in URI format as above, e.g. tcp://0.0.0.0:0 or tcp://"
"[::]:0 to listen on all interfaces."
msgstr ""
-"監聽傳入連接的位址。您將需要新增監聽器,以接受來自非本地節點傳入的凝視。無論此處設置了哪些監聽器,群播對等節點發現都將起作用。每個監聽器都應按上述URI格"
-"式指定,例如 tcp://0.0.0.0:0 或 tcp://[::]:0 以便監聽所有界面."
+"監聽傳入連接的位址。您將需要新增監聽器,以接受來自非本地節點傳入的凝視。無論"
+"此處設置了哪些監聽器,群播對等節點發現都將起作用。每個監聽器都應按上述URI格式"
+"指定,例如 tcp://0.0.0.0:0 或 tcp://[::]:0 以便監聽所有界面."
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
+msgid "Listen for beacons"
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:31
msgid "MTU size for the interface"
msgstr "介面的MTU大小"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:39
-msgid "Maximum size of all switch queues combined"
-msgstr "所有交換隊列的最大大小"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:41
-msgid "Multicast interfaces"
-msgstr "群播界面"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:25
-msgid ""
-"Network traffic is always accepted from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
-msgstr "無論AllowFromDirect還是AllowFromRemote,始終會從這些對等方接受網絡流量"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:32
-msgid ""
-"Network traffic is always rejected from those peers, regardless of "
-"AllowFromDirect or AllowFromRemote"
-msgstr "無論AllowFromDirect還是AllowFromRemote,總是會拒絕這些對等方的網絡流量"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:44
+msgid "Multicast interface"
+msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:23
msgid "NodeInfo"
msgstr "節點信息"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:30
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:24
msgid ""
"Optional node info. This must be a { \"key\": \"value\", ... } map or set as "
"null. This is entirely optional but, if set, is visible to the whole network "
"on request."
msgstr ""
-"可選節點信息。這必須是一個 { “key”:“ value”, ...} 映射或設置為null。這完全是可選的,但如果設置了,則可應要求在整個網絡中看到。"
+"可選節點信息。這必須是一個 { “key”:“ value”, ...} 映射或設置為null。這完全是"
+"可選的,但如果設置了,則可應要求在整個網絡中看到。"
#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:23
msgid "Peers"
msgstr "對等節點群"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:21
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:35
-msgid "Public encryption key"
-msgstr "公共加密金鑰"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:26
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:33
-msgid "Public key"
-msgstr "公鑰"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:42
-msgid ""
-"Regular expressions for which interfaces multicast peer discovery should be "
-"enabled on. If none specified, multicast peer discovery is disabled. The "
-"default value is .* which uses all interfaces."
-msgstr "應啟用其界面群播對等方發現的正則表達式。如果未指定,則禁用群播對等發現。預設值為 .* 將使用所有界面。"
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:50
-msgid "Session firewall"
-msgstr "會話防火牆"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:11
-msgid "Session firewall settings"
-msgstr "會話防火牆設定值"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:49
+msgid "Regular expression"
+msgstr ""
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:46
-msgid "Set .* to multicast on all interfaces"
-msgstr "將 .* 設置為在所有界面上群播"
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
+msgid "Send beacons"
+msgstr ""
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:32
msgid "Settings"
msgstr "設定"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:18
-msgid "Signing private key"
-msgstr "簽署私鑰"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/keys.js:17
-msgid "Signing public key"
-msgstr "簽署公鑰"
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:14
msgid "Status"
msgstr "狀態"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:22
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:29
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:36
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:44
-msgid "Subnet"
-msgstr "子網路"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:16
-msgid ""
-"The port number to be used for the link-local TCP listeners for the "
-"configured MulticastInterfaces. This option does not affect "
-"listenersspecified in the Listen option. Unless you plan to firewall link-"
-"localtraffic, it is best to leave this as the default value of 0. This "
-"option cannot currently be changed by reloading config during runtime."
-msgstr ""
-"用於已配置的MulticastInterfaces的連接本地TCP監聽器的埠號。此選項不影響“監聽”選項中指定的監聽器。除非您計劃防堵 link-"
-"localtraffic,否則最好將其保留為預設值0。此選項當前無法通過在運行時重新載入設置來更改。"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:11
-msgid "Tunnel Routing"
-msgstr "隧道路由"
-
-#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:59
-msgid "Tunnel routing"
-msgstr "隧道路由"
-
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:24
-msgid "Whitelisted public keys"
-msgstr "白名單公鑰"
-
#: applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json:3
msgid "Yggdrasil"
msgstr "Yggdrasil世界樹"
@@ -341,6 +173,169 @@ msgstr "Yggdrasil 節點狀態"
msgid "Yggdrasil's network interface name"
msgstr "Yggdrasil的網絡介面名稱"
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:58
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:40
msgid "e.g. tcp://0.0.0.0:0 or tcp://[::]:0"
msgstr "例如 tcp://0.0.0.0:0 or tcp://[::]:0"
+
+#~ msgid "Address to listen for incoming connections"
+#~ msgstr "監聽傳入連接的位址"
+
+#~ msgid "Allow from direct"
+#~ msgstr "直接允許"
+
+#~ msgid "Allow from remote"
+#~ msgstr "允許遠端"
+
+#~ msgid "Allow network traffic from directly connected peers"
+#~ msgstr "允許來自直接連接節點的網絡流量"
+
+#~ msgid ""
+#~ "Allow network traffic from remote nodes on the network that you are not "
+#~ "directly peered with"
+#~ msgstr "允許來自您未直接與之對等的網絡上遠端節點的網絡流量"
+
+#~ msgid ""
+#~ "Allow outbound network traffic regardless of AllowFromDirect or "
+#~ "AllowFromRemote"
+#~ msgstr "無論AllowFromDirect還是AllowFromRemote,都允許傳出網絡流量"
+
+#~ msgid ""
+#~ "Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively "
+#~ "allows you to use Yggdrasil to route to, or to bridge other networks, "
+#~ "similar to a VPN tunnel. Tunnelling works between any two nodes and does "
+#~ "not require them to be directly peered."
+#~ msgstr ""
+#~ "允許通過Yggdrasil隧道傳輸非Yggdrasil流量。這有效地使您可以使用Yggdrasil來"
+#~ "路由或橋接其他網絡,類似於VPN隧道。隧道在任何兩個節點之間工作,並且不需要"
+#~ "直接對等。"
+
+#~ msgid "Always allow outbound"
+#~ msgstr "始終允許傳出"
+
+#~ msgid "Blacklisted public keys"
+#~ msgstr "黑名單公鑰"
+
+#~ msgid "Enable session firewall"
+#~ msgstr "啟用會話防火牆"
+
+#~ msgid "IPv4 local subnet"
+#~ msgstr "IPv4本地子網"
+
+#~ msgid "IPv4 remote subnet"
+#~ msgstr "IPv4遠端子網"
+
+#~ msgid "IPv4 subnet"
+#~ msgstr "IPv4子網"
+
+#~ msgid "IPv4 subnets belonging to remote nodes, mapped to the node's public"
+#~ msgstr "屬於遠端節點的IPv4子網,映射到該節點的公共節點"
+
+#~ msgid ""
+#~ "IPv4 subnets belonging to this node's end of the tunnels. Only traffic "
+#~ "from these ranges will be tunnelled."
+#~ msgstr ""
+#~ "屬於隧道的此節點末端的IPv4子網。只有這些範圍內的流量將通過隧道傳輸。"
+
+#~ msgid "IPv6 local subnet"
+#~ msgstr "IPv6本地子網"
+
+#~ msgid "IPv6 remote subnet"
+#~ msgstr "IPv6遠端子網"
+
+#~ msgid "IPv6 subnet"
+#~ msgstr "IPv6子網"
+
+#~ msgid "IPv6 subnets belonging to remote nodes, mapped to the node's public"
+#~ msgstr "屬於遠端節點的IPv6子網,映射到該節點的公共節點"
+
+#~ msgid ""
+#~ "IPv6 subnets belonging to this node's end of the tunnels. Only traffic "
+#~ "from these ranges (or the Yggdrasil node's IPv6 address/subnet) will be "
+#~ "tunnelled."
+#~ msgstr ""
+#~ "屬於隧道的此節點末端的IPv6子網。僅來自這些範圍(或Yggdrasil節點的IPv6位址/"
+#~ "子網)的流量將通過隧道傳輸。"
+
+#~ msgid ""
+#~ "If disabled, network traffic from any node will be allowed. If enabled, "
+#~ "the below rules apply"
+#~ msgstr "如果禁用,則將允許來自任何節點的網絡流量。如果啟用,則適用以下規則"
+
+#~ msgid "Interface name"
+#~ msgstr "介面名稱"
+
+#~ msgid "Key"
+#~ msgstr "金鑰"
+
+#~ msgid "Link-local TCP port"
+#~ msgstr "連接本地TCP埠"
+
+#~ msgid "Maximum size of all switch queues combined"
+#~ msgstr "所有交換隊列的最大大小"
+
+#~ msgid "Multicast interfaces"
+#~ msgstr "群播界面"
+
+#~ msgid ""
+#~ "Network traffic is always accepted from those peers, regardless of "
+#~ "AllowFromDirect or AllowFromRemote"
+#~ msgstr ""
+#~ "無論AllowFromDirect還是AllowFromRemote,始終會從這些對等方接受網絡流量"
+
+#~ msgid ""
+#~ "Network traffic is always rejected from those peers, regardless of "
+#~ "AllowFromDirect or AllowFromRemote"
+#~ msgstr ""
+#~ "無論AllowFromDirect還是AllowFromRemote,總是會拒絕這些對等方的網絡流量"
+
+#~ msgid "Public encryption key"
+#~ msgstr "公共加密金鑰"
+
+#~ msgid "Public key"
+#~ msgstr "公鑰"
+
+#~ msgid ""
+#~ "Regular expressions for which interfaces multicast peer discovery should "
+#~ "be enabled on. If none specified, multicast peer discovery is disabled. "
+#~ "The default value is .* which uses all interfaces."
+#~ msgstr ""
+#~ "應啟用其界面群播對等方發現的正則表達式。如果未指定,則禁用群播對等發現。預"
+#~ "設值為 .* 將使用所有界面。"
+
+#~ msgid "Session firewall"
+#~ msgstr "會話防火牆"
+
+#~ msgid "Session firewall settings"
+#~ msgstr "會話防火牆設定值"
+
+#~ msgid "Set .* to multicast on all interfaces"
+#~ msgstr "將 .* 設置為在所有界面上群播"
+
+#~ msgid "Signing private key"
+#~ msgstr "簽署私鑰"
+
+#~ msgid "Signing public key"
+#~ msgstr "簽署公鑰"
+
+#~ msgid "Subnet"
+#~ msgstr "子網路"
+
+#~ msgid ""
+#~ "The port number to be used for the link-local TCP listeners for the "
+#~ "configured MulticastInterfaces. This option does not affect "
+#~ "listenersspecified in the Listen option. Unless you plan to firewall link-"
+#~ "localtraffic, it is best to leave this as the default value of 0. This "
+#~ "option cannot currently be changed by reloading config during runtime."
+#~ msgstr ""
+#~ "用於已配置的MulticastInterfaces的連接本地TCP監聽器的埠號。此選項不影響“監"
+#~ "聽”選項中指定的監聽器。除非您計劃防堵 link-localtraffic,否則最好將其保留"
+#~ "為預設值0。此選項當前無法通過在運行時重新載入設置來更改。"
+
+#~ msgid "Tunnel Routing"
+#~ msgstr "隧道路由"
+
+#~ msgid "Tunnel routing"
+#~ msgstr "隧道路由"
+
+#~ msgid "Whitelisted public keys"
+#~ msgstr "白名單公鑰"