treewide: i18n - sync translations

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

29 files changed, 1549 insertions, 317 deletions

diff --git a/applications/luci-app-yggdrasil/po/bg/yggdrasil.po b/applications/luci-app-yggdrasil/po/bg/yggdrasil.po
index 27e1e71e7..6ce7749ad 100644
--- a/applications/luci-app-yggdrasil/po/bg/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/bg/yggdrasil.po
@@ -37,7 +37,11 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:13
-msgid "Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively"
+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:20
@@ -49,7 +53,12 @@ msgid "Blacklisted public keys"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "By default, nodeinfo contains some defaults including the platform,"
+msgid ""
+"By default, nodeinfo contains some defaults including the platform, "
+"architecture and Yggdrasil version. These can help when surveying the "
+"network and diagnosing network routing problems. Enabling nodeinfo privacy "
+"prevents this, so that only items specified in \"NodeInfo\" are sent back if "
+"specified."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:21
@@ -99,7 +108,9 @@ 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:26
-msgid "IPv4 subnets belonging to this node's end of the tunnels. Only traffic"
+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:39
@@ -120,7 +131,9 @@ 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:40
-msgid "IPv6 subnets belonging to this node's end of the tunnels. Only traffic"
+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:14
@@ -155,9 +168,20 @@ msgstr ""
 msgid "Link-local TCP port"
 msgstr ""
 
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
-msgid "List of connection strings for outbound peer connections in URI format,"
+msgid ""
+"List of connection strings for outbound peer connections in URI format, "
+"arranged by source interface, e.g. { \"eth0\": [ tcp://a.b.c.d:e ] }. Note "
+"that SOCKS peerings will NOT be affected by this option and should go in the "
+"\"Peers\" section instead."
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
+msgid ""
+"List of connection strings for outbound peer connections in URI format, e.g. "
+"tcp://a.b.c.d:e or socks://a.b.c.d:e/f.g.h.i:j. These connections will obey "
+"the operating system routing table, therefore you should use this section "
+"when you may connect via different interfaces."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
@@ -165,7 +189,12 @@ msgid "Listen addresses"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
-msgid "Listen addresses for incoming connections. You will need to add"
+msgid ""
+"Listen addresses for incoming connections. You will need to add listeners in "
+"order to accept incoming peerings from non-local nodes. Multicast peer "
+"discovery will work regardless of any listeners set here. Each listener "
+"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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
@@ -197,7 +226,10 @@ msgid "NodeInfo"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
-msgid "Optional node info. This must be a { \"key\": \"value\", ... } map"
+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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:10
@@ -216,7 +248,10 @@ 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"
+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/luasrc/controller/yggdrasil.lua:14
@@ -255,7 +290,12 @@ msgid "Subnet"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "The port number to be used for the link-local TCP listeners for the"
+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:10
diff --git a/applications/luci-app-yggdrasil/po/ca/yggdrasil.po b/applications/luci-app-yggdrasil/po/ca/yggdrasil.po
index 28666643c..54721b0a8 100644
--- a/applications/luci-app-yggdrasil/po/ca/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/ca/yggdrasil.po
@@ -43,7 +43,11 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:13
-msgid "Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively"
+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:20
@@ -55,7 +59,12 @@ msgid "Blacklisted public keys"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "By default, nodeinfo contains some defaults including the platform,"
+msgid ""
+"By default, nodeinfo contains some defaults including the platform, "
+"architecture and Yggdrasil version. These can help when surveying the "
+"network and diagnosing network routing problems. Enabling nodeinfo privacy "
+"prevents this, so that only items specified in \"NodeInfo\" are sent back if "
+"specified."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:21
@@ -105,7 +114,9 @@ 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:26
-msgid "IPv4 subnets belonging to this node's end of the tunnels. Only traffic"
+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:39
@@ -126,7 +137,9 @@ 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:40
-msgid "IPv6 subnets belonging to this node's end of the tunnels. Only traffic"
+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:14
@@ -161,9 +174,20 @@ msgstr ""
 msgid "Link-local TCP port"
 msgstr ""
 
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
-msgid "List of connection strings for outbound peer connections in URI format,"
+msgid ""
+"List of connection strings for outbound peer connections in URI format, "
+"arranged by source interface, e.g. { \"eth0\": [ tcp://a.b.c.d:e ] }. Note "
+"that SOCKS peerings will NOT be affected by this option and should go in the "
+"\"Peers\" section instead."
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
+msgid ""
+"List of connection strings for outbound peer connections in URI format, e.g. "
+"tcp://a.b.c.d:e or socks://a.b.c.d:e/f.g.h.i:j. These connections will obey "
+"the operating system routing table, therefore you should use this section "
+"when you may connect via different interfaces."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
@@ -171,7 +195,12 @@ msgid "Listen addresses"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
-msgid "Listen addresses for incoming connections. You will need to add"
+msgid ""
+"Listen addresses for incoming connections. You will need to add listeners in "
+"order to accept incoming peerings from non-local nodes. Multicast peer "
+"discovery will work regardless of any listeners set here. Each listener "
+"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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
@@ -203,7 +232,10 @@ msgid "NodeInfo"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
-msgid "Optional node info. This must be a { \"key\": \"value\", ... } map"
+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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:10
@@ -222,7 +254,10 @@ 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"
+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/luasrc/controller/yggdrasil.lua:14
@@ -261,7 +296,12 @@ msgid "Subnet"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "The port number to be used for the link-local TCP listeners for the"
+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:10
diff --git a/applications/luci-app-yggdrasil/po/cs/yggdrasil.po b/applications/luci-app-yggdrasil/po/cs/yggdrasil.po
index a3f4de79f..0d67767bd 100644
--- a/applications/luci-app-yggdrasil/po/cs/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/cs/yggdrasil.po
@@ -37,7 +37,11 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:13
-msgid "Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively"
+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:20
@@ -49,7 +53,12 @@ msgid "Blacklisted public keys"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "By default, nodeinfo contains some defaults including the platform,"
+msgid ""
+"By default, nodeinfo contains some defaults including the platform, "
+"architecture and Yggdrasil version. These can help when surveying the "
+"network and diagnosing network routing problems. Enabling nodeinfo privacy "
+"prevents this, so that only items specified in \"NodeInfo\" are sent back if "
+"specified."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:21
@@ -99,7 +108,9 @@ 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:26
-msgid "IPv4 subnets belonging to this node's end of the tunnels. Only traffic"
+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:39
@@ -120,7 +131,9 @@ 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:40
-msgid "IPv6 subnets belonging to this node's end of the tunnels. Only traffic"
+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:14
@@ -155,9 +168,20 @@ msgstr ""
 msgid "Link-local TCP port"
 msgstr ""
 
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
-msgid "List of connection strings for outbound peer connections in URI format,"
+msgid ""
+"List of connection strings for outbound peer connections in URI format, "
+"arranged by source interface, e.g. { \"eth0\": [ tcp://a.b.c.d:e ] }. Note "
+"that SOCKS peerings will NOT be affected by this option and should go in the "
+"\"Peers\" section instead."
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
+msgid ""
+"List of connection strings for outbound peer connections in URI format, e.g. "
+"tcp://a.b.c.d:e or socks://a.b.c.d:e/f.g.h.i:j. These connections will obey "
+"the operating system routing table, therefore you should use this section "
+"when you may connect via different interfaces."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
@@ -165,7 +189,12 @@ msgid "Listen addresses"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
-msgid "Listen addresses for incoming connections. You will need to add"
+msgid ""
+"Listen addresses for incoming connections. You will need to add listeners in "
+"order to accept incoming peerings from non-local nodes. Multicast peer "
+"discovery will work regardless of any listeners set here. Each listener "
+"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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
@@ -197,7 +226,10 @@ msgid "NodeInfo"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
-msgid "Optional node info. This must be a { \"key\": \"value\", ... } map"
+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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:10
@@ -216,7 +248,10 @@ 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"
+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/luasrc/controller/yggdrasil.lua:14
@@ -255,7 +290,12 @@ msgid "Subnet"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "The port number to be used for the link-local TCP listeners for the"
+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:10
diff --git a/applications/luci-app-yggdrasil/po/de/yggdrasil.po b/applications/luci-app-yggdrasil/po/de/yggdrasil.po
index c5018c4b2..a30943ad6 100644
--- a/applications/luci-app-yggdrasil/po/de/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/de/yggdrasil.po
@@ -43,7 +43,11 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:13
-msgid "Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively"
+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:20
@@ -55,7 +59,12 @@ msgid "Blacklisted public keys"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "By default, nodeinfo contains some defaults including the platform,"
+msgid ""
+"By default, nodeinfo contains some defaults including the platform, "
+"architecture and Yggdrasil version. These can help when surveying the "
+"network and diagnosing network routing problems. Enabling nodeinfo privacy "
+"prevents this, so that only items specified in \"NodeInfo\" are sent back if "
+"specified."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:21
@@ -105,7 +114,9 @@ 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:26
-msgid "IPv4 subnets belonging to this node's end of the tunnels. Only traffic"
+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:39
@@ -126,7 +137,9 @@ 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:40
-msgid "IPv6 subnets belonging to this node's end of the tunnels. Only traffic"
+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:14
@@ -161,9 +174,20 @@ msgstr "Schlüssel"
 msgid "Link-local TCP port"
 msgstr ""
 
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
-msgid "List of connection strings for outbound peer connections in URI format,"
+msgid ""
+"List of connection strings for outbound peer connections in URI format, "
+"arranged by source interface, e.g. { \"eth0\": [ tcp://a.b.c.d:e ] }. Note "
+"that SOCKS peerings will NOT be affected by this option and should go in the "
+"\"Peers\" section instead."
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
+msgid ""
+"List of connection strings for outbound peer connections in URI format, e.g. "
+"tcp://a.b.c.d:e or socks://a.b.c.d:e/f.g.h.i:j. These connections will obey "
+"the operating system routing table, therefore you should use this section "
+"when you may connect via different interfaces."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
@@ -171,7 +195,12 @@ msgid "Listen addresses"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
-msgid "Listen addresses for incoming connections. You will need to add"
+msgid ""
+"Listen addresses for incoming connections. You will need to add listeners in "
+"order to accept incoming peerings from non-local nodes. Multicast peer "
+"discovery will work regardless of any listeners set here. Each listener "
+"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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
@@ -203,7 +232,10 @@ msgid "NodeInfo"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
-msgid "Optional node info. This must be a { \"key\": \"value\", ... } map"
+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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:10
@@ -222,7 +254,10 @@ 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"
+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/luasrc/controller/yggdrasil.lua:14
@@ -261,7 +296,12 @@ msgid "Subnet"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "The port number to be used for the link-local TCP listeners for the"
+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:10
diff --git a/applications/luci-app-yggdrasil/po/el/yggdrasil.po b/applications/luci-app-yggdrasil/po/el/yggdrasil.po
index f9bb89dba..5fd2ded0a 100644
--- a/applications/luci-app-yggdrasil/po/el/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/el/yggdrasil.po
@@ -37,7 +37,11 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:13
-msgid "Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively"
+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:20
@@ -49,7 +53,12 @@ msgid "Blacklisted public keys"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "By default, nodeinfo contains some defaults including the platform,"
+msgid ""
+"By default, nodeinfo contains some defaults including the platform, "
+"architecture and Yggdrasil version. These can help when surveying the "
+"network and diagnosing network routing problems. Enabling nodeinfo privacy "
+"prevents this, so that only items specified in \"NodeInfo\" are sent back if "
+"specified."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:21
@@ -99,7 +108,9 @@ 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:26
-msgid "IPv4 subnets belonging to this node's end of the tunnels. Only traffic"
+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:39
@@ -120,7 +131,9 @@ 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:40
-msgid "IPv6 subnets belonging to this node's end of the tunnels. Only traffic"
+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:14
@@ -155,9 +168,20 @@ msgstr ""
 msgid "Link-local TCP port"
 msgstr ""
 
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
-msgid "List of connection strings for outbound peer connections in URI format,"
+msgid ""
+"List of connection strings for outbound peer connections in URI format, "
+"arranged by source interface, e.g. { \"eth0\": [ tcp://a.b.c.d:e ] }. Note "
+"that SOCKS peerings will NOT be affected by this option and should go in the "
+"\"Peers\" section instead."
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
+msgid ""
+"List of connection strings for outbound peer connections in URI format, e.g. "
+"tcp://a.b.c.d:e or socks://a.b.c.d:e/f.g.h.i:j. These connections will obey "
+"the operating system routing table, therefore you should use this section "
+"when you may connect via different interfaces."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
@@ -165,7 +189,12 @@ msgid "Listen addresses"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
-msgid "Listen addresses for incoming connections. You will need to add"
+msgid ""
+"Listen addresses for incoming connections. You will need to add listeners in "
+"order to accept incoming peerings from non-local nodes. Multicast peer "
+"discovery will work regardless of any listeners set here. Each listener "
+"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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
@@ -197,7 +226,10 @@ msgid "NodeInfo"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
-msgid "Optional node info. This must be a { \"key\": \"value\", ... } map"
+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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:10
@@ -216,7 +248,10 @@ 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"
+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/luasrc/controller/yggdrasil.lua:14
@@ -255,7 +290,12 @@ msgid "Subnet"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "The port number to be used for the link-local TCP listeners for the"
+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:10
diff --git a/applications/luci-app-yggdrasil/po/es/yggdrasil.po b/applications/luci-app-yggdrasil/po/es/yggdrasil.po
index f285280e8..cecf4a384 100644
--- a/applications/luci-app-yggdrasil/po/es/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/es/yggdrasil.po
@@ -50,10 +50,12 @@ msgstr ""
 "AllowFromRemote"
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:13
-msgid "Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively"
+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"
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:20
 msgid "Always allow outbound"
@@ -64,10 +66,13 @@ msgid "Blacklisted public keys"
 msgstr "Claves públicas en la lista negra"
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "By default, nodeinfo contains some defaults including the platform,"
+msgid ""
+"By default, nodeinfo contains some defaults including the platform, "
+"architecture and Yggdrasil version. These can help when surveying the "
+"network and diagnosing network routing problems. Enabling nodeinfo privacy "
+"prevents this, so that only items specified in \"NodeInfo\" are sent back if "
+"specified."
 msgstr ""
-"De forma predeterminada, nodeinfo contiene algunos valores predeterminados, "
-"incluida la plataforma,"
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:21
 msgid "Enable NodeInfo privacy"
@@ -117,10 +122,10 @@ 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:26
-msgid "IPv4 subnets belonging to this node's end of the tunnels. Only traffic"
+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 "
-"tráfico"
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:39
 msgid "IPv6 local subnet"
@@ -141,10 +146,10 @@ 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:40
-msgid "IPv6 subnets belonging to this node's end of the tunnels. Only traffic"
+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 "
-"tráfico"
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:14
 msgid ""
@@ -182,20 +187,34 @@ msgstr "Clave"
 msgid "Link-local TCP port"
 msgstr "Puerto TCP local de enlace"
 
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
-msgid "List of connection strings for outbound peer connections in URI format,"
+msgid ""
+"List of connection strings for outbound peer connections in URI format, "
+"arranged by source interface, e.g. { \"eth0\": [ tcp://a.b.c.d:e ] }. Note "
+"that SOCKS peerings will NOT be affected by this option and should go in the "
+"\"Peers\" section instead."
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
+msgid ""
+"List of connection strings for outbound peer connections in URI format, e.g. "
+"tcp://a.b.c.d:e or socks://a.b.c.d:e/f.g.h.i:j. These connections will obey "
+"the operating system routing table, therefore you should use this section "
+"when you may connect via different interfaces."
 msgstr ""
-"Lista de cadenas de conexión para conexiones pares salientes en formato URI,"
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
 msgid "Listen addresses"
 msgstr "Escuchar direcciones"
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
-msgid "Listen addresses for incoming connections. You will need to add"
+msgid ""
+"Listen addresses for incoming connections. You will need to add listeners in "
+"order to accept incoming peerings from non-local nodes. Multicast peer "
+"discovery will work regardless of any listeners set here. Each listener "
+"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 ""
-"Escuche las direcciones de las conexiones entrantes. Necesitarás agregar"
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
 msgid "MTU size for the interface"
@@ -230,10 +249,11 @@ msgid "NodeInfo"
 msgstr "NodeInfo"
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
-msgid "Optional node info. This must be a { \"key\": \"value\", ... } map"
+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 ""
-"Información opcional del nodo. Debe ser un mapa de { \"clave\": \"valor"
-"\", ... }"
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:10
 #: applications/luci-app-yggdrasil/luasrc/controller/yggdrasil.lua:11
@@ -251,10 +271,11 @@ 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"
+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 interfaces de descubrimiento de pares "
-"multicast"
 
 #: applications/luci-app-yggdrasil/luasrc/controller/yggdrasil.lua:14
 msgid "Session firewall"
@@ -292,10 +313,13 @@ msgid "Subnet"
 msgstr "Subred"
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "The port number to be used for the link-local TCP listeners for the"
+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 los escuchas TCP locales de enlace "
-"para"
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:10
 msgid "Tunnel Routing"
@@ -320,3 +344,51 @@ msgstr "Nombre de la interfaz de red de Yggdrasil"
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:58
 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 ""
+#~ "Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively"
+#~ msgstr ""
+#~ "Permitir el tráfico de túnel que no sea Yggdrasil sobre Yggdrasil. Esto "
+#~ "efectivamente"
+
+#~ msgid "By default, nodeinfo contains some defaults including the platform,"
+#~ msgstr ""
+#~ "De forma predeterminada, nodeinfo contiene algunos valores "
+#~ "predeterminados, incluida la plataforma,"
+
+#~ msgid ""
+#~ "IPv4 subnets belonging to this node's end of the tunnels. Only traffic"
+#~ msgstr ""
+#~ "Subredes IPv4 que pertenecen al final de los túneles de este nodo. Solo "
+#~ "tráfico"
+
+#~ msgid ""
+#~ "IPv6 subnets belonging to this node's end of the tunnels. Only traffic"
+#~ msgstr ""
+#~ "Subredes IPv6 que pertenecen al extremo de los túneles de este nodo. Solo "
+#~ "tráfico"
+
+#~ msgid ""
+#~ "List of connection strings for outbound peer connections in URI format,"
+#~ msgstr ""
+#~ "Lista de cadenas de conexión para conexiones pares salientes en formato "
+#~ "URI,"
+
+#~ msgid "Listen addresses for incoming connections. You will need to add"
+#~ msgstr ""
+#~ "Escuche las direcciones de las conexiones entrantes. Necesitarás agregar"
+
+#~ msgid "Optional node info. This must be a { \"key\": \"value\", ... } map"
+#~ msgstr ""
+#~ "Información opcional del nodo. Debe ser un mapa de { \"clave\": \"valor"
+#~ "\", ... }"
+
+#~ msgid "Regular expressions for which interfaces multicast peer discovery"
+#~ msgstr ""
+#~ "Expresiones regulares para las interfaces de descubrimiento de pares "
+#~ "multicast"
+
+#~ msgid "The port number to be used for the link-local TCP listeners for the"
+#~ msgstr ""
+#~ "El número de puerto que se utilizará para los escuchas TCP locales de "
+#~ "enlace para"
diff --git a/applications/luci-app-yggdrasil/po/fr/yggdrasil.po b/applications/luci-app-yggdrasil/po/fr/yggdrasil.po
index 1b7a7e18d..135804431 100644
--- a/applications/luci-app-yggdrasil/po/fr/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/fr/yggdrasil.po
@@ -43,7 +43,11 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:13
-msgid "Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively"
+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:20
@@ -55,10 +59,13 @@ msgid "Blacklisted public keys"
 msgstr "Clés publiques sur liste noire"
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "By default, nodeinfo contains some defaults including the platform,"
+msgid ""
+"By default, nodeinfo contains some defaults including the platform, "
+"architecture and Yggdrasil version. These can help when surveying the "
+"network and diagnosing network routing problems. Enabling nodeinfo privacy "
+"prevents this, so that only items specified in \"NodeInfo\" are sent back if "
+"specified."
 msgstr ""
-"Par défaut, nodeinfo contient certains paramètres par défaut, notamment la "
-"plate-forme,"
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:21
 msgid "Enable NodeInfo privacy"
@@ -107,7 +114,9 @@ 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:26
-msgid "IPv4 subnets belonging to this node's end of the tunnels. Only traffic"
+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:39
@@ -128,7 +137,9 @@ 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:40
-msgid "IPv6 subnets belonging to this node's end of the tunnels. Only traffic"
+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:14
@@ -163,9 +174,20 @@ msgstr ""
 msgid "Link-local TCP port"
 msgstr ""
 
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
-msgid "List of connection strings for outbound peer connections in URI format,"
+msgid ""
+"List of connection strings for outbound peer connections in URI format, "
+"arranged by source interface, e.g. { \"eth0\": [ tcp://a.b.c.d:e ] }. Note "
+"that SOCKS peerings will NOT be affected by this option and should go in the "
+"\"Peers\" section instead."
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
+msgid ""
+"List of connection strings for outbound peer connections in URI format, e.g. "
+"tcp://a.b.c.d:e or socks://a.b.c.d:e/f.g.h.i:j. These connections will obey "
+"the operating system routing table, therefore you should use this section "
+"when you may connect via different interfaces."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
@@ -173,7 +195,12 @@ msgid "Listen addresses"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
-msgid "Listen addresses for incoming connections. You will need to add"
+msgid ""
+"Listen addresses for incoming connections. You will need to add listeners in "
+"order to accept incoming peerings from non-local nodes. Multicast peer "
+"discovery will work regardless of any listeners set here. Each listener "
+"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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
@@ -205,7 +232,10 @@ msgid "NodeInfo"
 msgstr "NodeInfo"
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
-msgid "Optional node info. This must be a { \"key\": \"value\", ... } map"
+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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:10
@@ -224,7 +254,10 @@ 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"
+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/luasrc/controller/yggdrasil.lua:14
@@ -263,7 +296,12 @@ msgid "Subnet"
 msgstr "Sous-réseau"
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "The port number to be used for the link-local TCP listeners for the"
+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:10
@@ -289,3 +327,8 @@ msgstr ""
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:58
 msgid "e.g. tcp://0.0.0.0:0 or tcp://[::]:0"
 msgstr ""
+
+#~ msgid "By default, nodeinfo contains some defaults including the platform,"
+#~ msgstr ""
+#~ "Par défaut, nodeinfo contient certains paramètres par défaut, notamment "
+#~ "la plate-forme,"
diff --git a/applications/luci-app-yggdrasil/po/he/yggdrasil.po b/applications/luci-app-yggdrasil/po/he/yggdrasil.po
index ca2df6fbe..6d57b6190 100644
--- a/applications/luci-app-yggdrasil/po/he/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/he/yggdrasil.po
@@ -37,7 +37,11 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:13
-msgid "Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively"
+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:20
@@ -49,7 +53,12 @@ msgid "Blacklisted public keys"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "By default, nodeinfo contains some defaults including the platform,"
+msgid ""
+"By default, nodeinfo contains some defaults including the platform, "
+"architecture and Yggdrasil version. These can help when surveying the "
+"network and diagnosing network routing problems. Enabling nodeinfo privacy "
+"prevents this, so that only items specified in \"NodeInfo\" are sent back if "
+"specified."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:21
@@ -99,7 +108,9 @@ 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:26
-msgid "IPv4 subnets belonging to this node's end of the tunnels. Only traffic"
+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:39
@@ -120,7 +131,9 @@ 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:40
-msgid "IPv6 subnets belonging to this node's end of the tunnels. Only traffic"
+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:14
@@ -155,9 +168,20 @@ msgstr ""
 msgid "Link-local TCP port"
 msgstr ""
 
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
-msgid "List of connection strings for outbound peer connections in URI format,"
+msgid ""
+"List of connection strings for outbound peer connections in URI format, "
+"arranged by source interface, e.g. { \"eth0\": [ tcp://a.b.c.d:e ] }. Note "
+"that SOCKS peerings will NOT be affected by this option and should go in the "
+"\"Peers\" section instead."
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
+msgid ""
+"List of connection strings for outbound peer connections in URI format, e.g. "
+"tcp://a.b.c.d:e or socks://a.b.c.d:e/f.g.h.i:j. These connections will obey "
+"the operating system routing table, therefore you should use this section "
+"when you may connect via different interfaces."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
@@ -165,7 +189,12 @@ msgid "Listen addresses"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
-msgid "Listen addresses for incoming connections. You will need to add"
+msgid ""
+"Listen addresses for incoming connections. You will need to add listeners in "
+"order to accept incoming peerings from non-local nodes. Multicast peer "
+"discovery will work regardless of any listeners set here. Each listener "
+"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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
@@ -197,7 +226,10 @@ msgid "NodeInfo"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
-msgid "Optional node info. This must be a { \"key\": \"value\", ... } map"
+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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:10
@@ -216,7 +248,10 @@ 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"
+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/luasrc/controller/yggdrasil.lua:14
@@ -255,7 +290,12 @@ msgid "Subnet"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "The port number to be used for the link-local TCP listeners for the"
+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:10
diff --git a/applications/luci-app-yggdrasil/po/hi/yggdrasil.po b/applications/luci-app-yggdrasil/po/hi/yggdrasil.po
index 6807b7b53..178facaef 100644
--- a/applications/luci-app-yggdrasil/po/hi/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/hi/yggdrasil.po
@@ -37,7 +37,11 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:13
-msgid "Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively"
+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:20
@@ -49,7 +53,12 @@ msgid "Blacklisted public keys"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "By default, nodeinfo contains some defaults including the platform,"
+msgid ""
+"By default, nodeinfo contains some defaults including the platform, "
+"architecture and Yggdrasil version. These can help when surveying the "
+"network and diagnosing network routing problems. Enabling nodeinfo privacy "
+"prevents this, so that only items specified in \"NodeInfo\" are sent back if "
+"specified."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:21
@@ -99,7 +108,9 @@ 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:26
-msgid "IPv4 subnets belonging to this node's end of the tunnels. Only traffic"
+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:39
@@ -120,7 +131,9 @@ 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:40
-msgid "IPv6 subnets belonging to this node's end of the tunnels. Only traffic"
+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:14
@@ -155,9 +168,20 @@ msgstr ""
 msgid "Link-local TCP port"
 msgstr ""
 
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
-msgid "List of connection strings for outbound peer connections in URI format,"
+msgid ""
+"List of connection strings for outbound peer connections in URI format, "
+"arranged by source interface, e.g. { \"eth0\": [ tcp://a.b.c.d:e ] }. Note "
+"that SOCKS peerings will NOT be affected by this option and should go in the "
+"\"Peers\" section instead."
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
+msgid ""
+"List of connection strings for outbound peer connections in URI format, e.g. "
+"tcp://a.b.c.d:e or socks://a.b.c.d:e/f.g.h.i:j. These connections will obey "
+"the operating system routing table, therefore you should use this section "
+"when you may connect via different interfaces."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
@@ -165,7 +189,12 @@ msgid "Listen addresses"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
-msgid "Listen addresses for incoming connections. You will need to add"
+msgid ""
+"Listen addresses for incoming connections. You will need to add listeners in "
+"order to accept incoming peerings from non-local nodes. Multicast peer "
+"discovery will work regardless of any listeners set here. Each listener "
+"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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
@@ -197,7 +226,10 @@ msgid "NodeInfo"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
-msgid "Optional node info. This must be a { \"key\": \"value\", ... } map"
+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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:10
@@ -216,7 +248,10 @@ 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"
+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/luasrc/controller/yggdrasil.lua:14
@@ -255,7 +290,12 @@ msgid "Subnet"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "The port number to be used for the link-local TCP listeners for the"
+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:10
diff --git a/applications/luci-app-yggdrasil/po/hu/yggdrasil.po b/applications/luci-app-yggdrasil/po/hu/yggdrasil.po
index 0378212b1..da0408461 100644
--- a/applications/luci-app-yggdrasil/po/hu/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/hu/yggdrasil.po
@@ -43,7 +43,11 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:13
-msgid "Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively"
+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:20
@@ -55,7 +59,12 @@ msgid "Blacklisted public keys"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "By default, nodeinfo contains some defaults including the platform,"
+msgid ""
+"By default, nodeinfo contains some defaults including the platform, "
+"architecture and Yggdrasil version. These can help when surveying the "
+"network and diagnosing network routing problems. Enabling nodeinfo privacy "
+"prevents this, so that only items specified in \"NodeInfo\" are sent back if "
+"specified."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:21
@@ -105,7 +114,9 @@ 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:26
-msgid "IPv4 subnets belonging to this node's end of the tunnels. Only traffic"
+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:39
@@ -126,7 +137,9 @@ 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:40
-msgid "IPv6 subnets belonging to this node's end of the tunnels. Only traffic"
+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:14
@@ -161,9 +174,20 @@ msgstr "Kulcs"
 msgid "Link-local TCP port"
 msgstr ""
 
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
-msgid "List of connection strings for outbound peer connections in URI format,"
+msgid ""
+"List of connection strings for outbound peer connections in URI format, "
+"arranged by source interface, e.g. { \"eth0\": [ tcp://a.b.c.d:e ] }. Note "
+"that SOCKS peerings will NOT be affected by this option and should go in the "
+"\"Peers\" section instead."
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
+msgid ""
+"List of connection strings for outbound peer connections in URI format, e.g. "
+"tcp://a.b.c.d:e or socks://a.b.c.d:e/f.g.h.i:j. These connections will obey "
+"the operating system routing table, therefore you should use this section "
+"when you may connect via different interfaces."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
@@ -171,7 +195,12 @@ msgid "Listen addresses"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
-msgid "Listen addresses for incoming connections. You will need to add"
+msgid ""
+"Listen addresses for incoming connections. You will need to add listeners in "
+"order to accept incoming peerings from non-local nodes. Multicast peer "
+"discovery will work regardless of any listeners set here. Each listener "
+"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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
@@ -203,7 +232,10 @@ msgid "NodeInfo"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
-msgid "Optional node info. This must be a { \"key\": \"value\", ... } map"
+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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:10
@@ -222,7 +254,10 @@ 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"
+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/luasrc/controller/yggdrasil.lua:14
@@ -261,7 +296,12 @@ msgid "Subnet"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "The port number to be used for the link-local TCP listeners for the"
+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:10
diff --git a/applications/luci-app-yggdrasil/po/it/yggdrasil.po b/applications/luci-app-yggdrasil/po/it/yggdrasil.po
index 1adf6eb5c..789c849f1 100644
--- a/applications/luci-app-yggdrasil/po/it/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/it/yggdrasil.po
@@ -37,7 +37,11 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:13
-msgid "Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively"
+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:20
@@ -49,7 +53,12 @@ msgid "Blacklisted public keys"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "By default, nodeinfo contains some defaults including the platform,"
+msgid ""
+"By default, nodeinfo contains some defaults including the platform, "
+"architecture and Yggdrasil version. These can help when surveying the "
+"network and diagnosing network routing problems. Enabling nodeinfo privacy "
+"prevents this, so that only items specified in \"NodeInfo\" are sent back if "
+"specified."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:21
@@ -99,7 +108,9 @@ 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:26
-msgid "IPv4 subnets belonging to this node's end of the tunnels. Only traffic"
+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:39
@@ -120,7 +131,9 @@ 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:40
-msgid "IPv6 subnets belonging to this node's end of the tunnels. Only traffic"
+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:14
@@ -155,9 +168,20 @@ msgstr ""
 msgid "Link-local TCP port"
 msgstr ""
 
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
-msgid "List of connection strings for outbound peer connections in URI format,"
+msgid ""
+"List of connection strings for outbound peer connections in URI format, "
+"arranged by source interface, e.g. { \"eth0\": [ tcp://a.b.c.d:e ] }. Note "
+"that SOCKS peerings will NOT be affected by this option and should go in the "
+"\"Peers\" section instead."
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
+msgid ""
+"List of connection strings for outbound peer connections in URI format, e.g. "
+"tcp://a.b.c.d:e or socks://a.b.c.d:e/f.g.h.i:j. These connections will obey "
+"the operating system routing table, therefore you should use this section "
+"when you may connect via different interfaces."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
@@ -165,7 +189,12 @@ msgid "Listen addresses"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
-msgid "Listen addresses for incoming connections. You will need to add"
+msgid ""
+"Listen addresses for incoming connections. You will need to add listeners in "
+"order to accept incoming peerings from non-local nodes. Multicast peer "
+"discovery will work regardless of any listeners set here. Each listener "
+"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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
@@ -197,7 +226,10 @@ msgid "NodeInfo"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
-msgid "Optional node info. This must be a { \"key\": \"value\", ... } map"
+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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:10
@@ -216,7 +248,10 @@ 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"
+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/luasrc/controller/yggdrasil.lua:14
@@ -255,7 +290,12 @@ msgid "Subnet"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "The port number to be used for the link-local TCP listeners for the"
+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:10
diff --git a/applications/luci-app-yggdrasil/po/ja/yggdrasil.po b/applications/luci-app-yggdrasil/po/ja/yggdrasil.po
index 608a2c313..ebbf8f26c 100644
--- a/applications/luci-app-yggdrasil/po/ja/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/ja/yggdrasil.po
@@ -37,7 +37,11 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:13
-msgid "Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively"
+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:20
@@ -49,7 +53,12 @@ msgid "Blacklisted public keys"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "By default, nodeinfo contains some defaults including the platform,"
+msgid ""
+"By default, nodeinfo contains some defaults including the platform, "
+"architecture and Yggdrasil version. These can help when surveying the "
+"network and diagnosing network routing problems. Enabling nodeinfo privacy "
+"prevents this, so that only items specified in \"NodeInfo\" are sent back if "
+"specified."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:21
@@ -99,7 +108,9 @@ 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:26
-msgid "IPv4 subnets belonging to this node's end of the tunnels. Only traffic"
+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:39
@@ -120,7 +131,9 @@ 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:40
-msgid "IPv6 subnets belonging to this node's end of the tunnels. Only traffic"
+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:14
@@ -155,9 +168,20 @@ msgstr ""
 msgid "Link-local TCP port"
 msgstr ""
 
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
-msgid "List of connection strings for outbound peer connections in URI format,"
+msgid ""
+"List of connection strings for outbound peer connections in URI format, "
+"arranged by source interface, e.g. { \"eth0\": [ tcp://a.b.c.d:e ] }. Note "
+"that SOCKS peerings will NOT be affected by this option and should go in the "
+"\"Peers\" section instead."
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
+msgid ""
+"List of connection strings for outbound peer connections in URI format, e.g. "
+"tcp://a.b.c.d:e or socks://a.b.c.d:e/f.g.h.i:j. These connections will obey "
+"the operating system routing table, therefore you should use this section "
+"when you may connect via different interfaces."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
@@ -165,7 +189,12 @@ msgid "Listen addresses"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
-msgid "Listen addresses for incoming connections. You will need to add"
+msgid ""
+"Listen addresses for incoming connections. You will need to add listeners in "
+"order to accept incoming peerings from non-local nodes. Multicast peer "
+"discovery will work regardless of any listeners set here. Each listener "
+"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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
@@ -197,7 +226,10 @@ msgid "NodeInfo"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
-msgid "Optional node info. This must be a { \"key\": \"value\", ... } map"
+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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:10
@@ -216,7 +248,10 @@ 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"
+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/luasrc/controller/yggdrasil.lua:14
@@ -255,7 +290,12 @@ msgid "Subnet"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "The port number to be used for the link-local TCP listeners for the"
+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:10
diff --git a/applications/luci-app-yggdrasil/po/ko/yggdrasil.po b/applications/luci-app-yggdrasil/po/ko/yggdrasil.po
index f8d7dfad7..400c7e62c 100644
--- a/applications/luci-app-yggdrasil/po/ko/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/ko/yggdrasil.po
@@ -37,7 +37,11 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:13
-msgid "Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively"
+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:20
@@ -49,7 +53,12 @@ msgid "Blacklisted public keys"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "By default, nodeinfo contains some defaults including the platform,"
+msgid ""
+"By default, nodeinfo contains some defaults including the platform, "
+"architecture and Yggdrasil version. These can help when surveying the "
+"network and diagnosing network routing problems. Enabling nodeinfo privacy "
+"prevents this, so that only items specified in \"NodeInfo\" are sent back if "
+"specified."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:21
@@ -99,7 +108,9 @@ 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:26
-msgid "IPv4 subnets belonging to this node's end of the tunnels. Only traffic"
+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:39
@@ -120,7 +131,9 @@ 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:40
-msgid "IPv6 subnets belonging to this node's end of the tunnels. Only traffic"
+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:14
@@ -155,9 +168,20 @@ msgstr ""
 msgid "Link-local TCP port"
 msgstr ""
 
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
-msgid "List of connection strings for outbound peer connections in URI format,"
+msgid ""
+"List of connection strings for outbound peer connections in URI format, "
+"arranged by source interface, e.g. { \"eth0\": [ tcp://a.b.c.d:e ] }. Note "
+"that SOCKS peerings will NOT be affected by this option and should go in the "
+"\"Peers\" section instead."
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
+msgid ""
+"List of connection strings for outbound peer connections in URI format, e.g. "
+"tcp://a.b.c.d:e or socks://a.b.c.d:e/f.g.h.i:j. These connections will obey "
+"the operating system routing table, therefore you should use this section "
+"when you may connect via different interfaces."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
@@ -165,7 +189,12 @@ msgid "Listen addresses"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
-msgid "Listen addresses for incoming connections. You will need to add"
+msgid ""
+"Listen addresses for incoming connections. You will need to add listeners in "
+"order to accept incoming peerings from non-local nodes. Multicast peer "
+"discovery will work regardless of any listeners set here. Each listener "
+"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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
@@ -197,7 +226,10 @@ msgid "NodeInfo"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
-msgid "Optional node info. This must be a { \"key\": \"value\", ... } map"
+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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:10
@@ -216,7 +248,10 @@ 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"
+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/luasrc/controller/yggdrasil.lua:14
@@ -255,7 +290,12 @@ msgid "Subnet"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "The port number to be used for the link-local TCP listeners for the"
+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:10
diff --git a/applications/luci-app-yggdrasil/po/mr/yggdrasil.po b/applications/luci-app-yggdrasil/po/mr/yggdrasil.po
index 7d4e0895d..92572f420 100644
--- a/applications/luci-app-yggdrasil/po/mr/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/mr/yggdrasil.po
@@ -37,7 +37,11 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:13
-msgid "Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively"
+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:20
@@ -49,7 +53,12 @@ msgid "Blacklisted public keys"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "By default, nodeinfo contains some defaults including the platform,"
+msgid ""
+"By default, nodeinfo contains some defaults including the platform, "
+"architecture and Yggdrasil version. These can help when surveying the "
+"network and diagnosing network routing problems. Enabling nodeinfo privacy "
+"prevents this, so that only items specified in \"NodeInfo\" are sent back if "
+"specified."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:21
@@ -99,7 +108,9 @@ 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:26
-msgid "IPv4 subnets belonging to this node's end of the tunnels. Only traffic"
+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:39
@@ -120,7 +131,9 @@ 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:40
-msgid "IPv6 subnets belonging to this node's end of the tunnels. Only traffic"
+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:14
@@ -155,9 +168,20 @@ msgstr ""
 msgid "Link-local TCP port"
 msgstr ""
 
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
-msgid "List of connection strings for outbound peer connections in URI format,"
+msgid ""
+"List of connection strings for outbound peer connections in URI format, "
+"arranged by source interface, e.g. { \"eth0\": [ tcp://a.b.c.d:e ] }. Note "
+"that SOCKS peerings will NOT be affected by this option and should go in the "
+"\"Peers\" section instead."
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
+msgid ""
+"List of connection strings for outbound peer connections in URI format, e.g. "
+"tcp://a.b.c.d:e or socks://a.b.c.d:e/f.g.h.i:j. These connections will obey "
+"the operating system routing table, therefore you should use this section "
+"when you may connect via different interfaces."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
@@ -165,7 +189,12 @@ msgid "Listen addresses"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
-msgid "Listen addresses for incoming connections. You will need to add"
+msgid ""
+"Listen addresses for incoming connections. You will need to add listeners in "
+"order to accept incoming peerings from non-local nodes. Multicast peer "
+"discovery will work regardless of any listeners set here. Each listener "
+"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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
@@ -197,7 +226,10 @@ msgid "NodeInfo"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
-msgid "Optional node info. This must be a { \"key\": \"value\", ... } map"
+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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:10
@@ -216,7 +248,10 @@ 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"
+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/luasrc/controller/yggdrasil.lua:14
@@ -255,7 +290,12 @@ msgid "Subnet"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "The port number to be used for the link-local TCP listeners for the"
+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:10
diff --git a/applications/luci-app-yggdrasil/po/ms/yggdrasil.po b/applications/luci-app-yggdrasil/po/ms/yggdrasil.po
index 8a10c10ae..df0a0bbb7 100644
--- a/applications/luci-app-yggdrasil/po/ms/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/ms/yggdrasil.po
@@ -37,7 +37,11 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:13
-msgid "Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively"
+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:20
@@ -49,7 +53,12 @@ msgid "Blacklisted public keys"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "By default, nodeinfo contains some defaults including the platform,"
+msgid ""
+"By default, nodeinfo contains some defaults including the platform, "
+"architecture and Yggdrasil version. These can help when surveying the "
+"network and diagnosing network routing problems. Enabling nodeinfo privacy "
+"prevents this, so that only items specified in \"NodeInfo\" are sent back if "
+"specified."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:21
@@ -99,7 +108,9 @@ 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:26
-msgid "IPv4 subnets belonging to this node's end of the tunnels. Only traffic"
+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:39
@@ -120,7 +131,9 @@ 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:40
-msgid "IPv6 subnets belonging to this node's end of the tunnels. Only traffic"
+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:14
@@ -155,9 +168,20 @@ msgstr ""
 msgid "Link-local TCP port"
 msgstr ""
 
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
-msgid "List of connection strings for outbound peer connections in URI format,"
+msgid ""
+"List of connection strings for outbound peer connections in URI format, "
+"arranged by source interface, e.g. { \"eth0\": [ tcp://a.b.c.d:e ] }. Note "
+"that SOCKS peerings will NOT be affected by this option and should go in the "
+"\"Peers\" section instead."
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
+msgid ""
+"List of connection strings for outbound peer connections in URI format, e.g. "
+"tcp://a.b.c.d:e or socks://a.b.c.d:e/f.g.h.i:j. These connections will obey "
+"the operating system routing table, therefore you should use this section "
+"when you may connect via different interfaces."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
@@ -165,7 +189,12 @@ msgid "Listen addresses"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
-msgid "Listen addresses for incoming connections. You will need to add"
+msgid ""
+"Listen addresses for incoming connections. You will need to add listeners in "
+"order to accept incoming peerings from non-local nodes. Multicast peer "
+"discovery will work regardless of any listeners set here. Each listener "
+"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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
@@ -197,7 +226,10 @@ msgid "NodeInfo"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
-msgid "Optional node info. This must be a { \"key\": \"value\", ... } map"
+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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:10
@@ -216,7 +248,10 @@ 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"
+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/luasrc/controller/yggdrasil.lua:14
@@ -255,7 +290,12 @@ msgid "Subnet"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "The port number to be used for the link-local TCP listeners for the"
+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:10
diff --git a/applications/luci-app-yggdrasil/po/nb_NO/yggdrasil.po b/applications/luci-app-yggdrasil/po/nb_NO/yggdrasil.po
index 8abda2ea7..3d72d6b6d 100644
--- a/applications/luci-app-yggdrasil/po/nb_NO/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/nb_NO/yggdrasil.po
@@ -37,7 +37,11 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:13
-msgid "Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively"
+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:20
@@ -49,7 +53,12 @@ msgid "Blacklisted public keys"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "By default, nodeinfo contains some defaults including the platform,"
+msgid ""
+"By default, nodeinfo contains some defaults including the platform, "
+"architecture and Yggdrasil version. These can help when surveying the "
+"network and diagnosing network routing problems. Enabling nodeinfo privacy "
+"prevents this, so that only items specified in \"NodeInfo\" are sent back if "
+"specified."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:21
@@ -99,7 +108,9 @@ 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:26
-msgid "IPv4 subnets belonging to this node's end of the tunnels. Only traffic"
+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:39
@@ -120,7 +131,9 @@ 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:40
-msgid "IPv6 subnets belonging to this node's end of the tunnels. Only traffic"
+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:14
@@ -155,9 +168,20 @@ msgstr ""
 msgid "Link-local TCP port"
 msgstr ""
 
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
-msgid "List of connection strings for outbound peer connections in URI format,"
+msgid ""
+"List of connection strings for outbound peer connections in URI format, "
+"arranged by source interface, e.g. { \"eth0\": [ tcp://a.b.c.d:e ] }. Note "
+"that SOCKS peerings will NOT be affected by this option and should go in the "
+"\"Peers\" section instead."
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
+msgid ""
+"List of connection strings for outbound peer connections in URI format, e.g. "
+"tcp://a.b.c.d:e or socks://a.b.c.d:e/f.g.h.i:j. These connections will obey "
+"the operating system routing table, therefore you should use this section "
+"when you may connect via different interfaces."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
@@ -165,7 +189,12 @@ msgid "Listen addresses"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
-msgid "Listen addresses for incoming connections. You will need to add"
+msgid ""
+"Listen addresses for incoming connections. You will need to add listeners in "
+"order to accept incoming peerings from non-local nodes. Multicast peer "
+"discovery will work regardless of any listeners set here. Each listener "
+"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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
@@ -197,7 +226,10 @@ msgid "NodeInfo"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
-msgid "Optional node info. This must be a { \"key\": \"value\", ... } map"
+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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:10
@@ -216,7 +248,10 @@ 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"
+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/luasrc/controller/yggdrasil.lua:14
@@ -255,7 +290,12 @@ msgid "Subnet"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "The port number to be used for the link-local TCP listeners for the"
+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:10
diff --git a/applications/luci-app-yggdrasil/po/pl/yggdrasil.po b/applications/luci-app-yggdrasil/po/pl/yggdrasil.po
index 30cc2d0cd..06fde3dae 100644
--- a/applications/luci-app-yggdrasil/po/pl/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/pl/yggdrasil.po
@@ -48,9 +48,12 @@ msgstr ""
 "AllowFromRemote"
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:13
-msgid "Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively"
+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 ""
-"Zezwól na tunelowanie ruchu innego niż Yggdrasil nad Yggdrasil. To skutecznie"
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/session_firewall.js:20
 msgid "Always allow outbound"
@@ -61,8 +64,13 @@ msgid "Blacklisted public keys"
 msgstr "Klucze publiczne na czarnej liście"
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "By default, nodeinfo contains some defaults including the platform,"
-msgstr "Domyślnie, nodeinfo zawiera kilka domyślnych ustawień, w tym platformę,"
+msgid ""
+"By default, nodeinfo contains some defaults including the platform, "
+"architecture and Yggdrasil version. These can help when surveying the "
+"network and diagnosing network routing problems. Enabling nodeinfo privacy "
+"prevents this, so that only items specified in \"NodeInfo\" are sent back if "
+"specified."
+msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:21
 msgid "Enable NodeInfo privacy"
@@ -112,8 +120,10 @@ 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:26
-msgid "IPv4 subnets belonging to this node's end of the tunnels. Only traffic"
-msgstr "Podsieci IPv6 należące do końca tunelu tego węzła. Tylko ruch"
+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:39
 msgid "IPv6 local subnet"
@@ -134,8 +144,10 @@ 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:40
-msgid "IPv6 subnets belonging to this node's end of the tunnels. Only traffic"
-msgstr "Podsieci IPv6 należące do końca tunelu tego węzła. Tylko ruch"
+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:14
 msgid ""
@@ -173,19 +185,34 @@ msgstr "Klucz"
 msgid "Link-local TCP port"
 msgstr ""
 
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
-msgid "List of connection strings for outbound peer connections in URI format,"
+msgid ""
+"List of connection strings for outbound peer connections in URI format, "
+"arranged by source interface, e.g. { \"eth0\": [ tcp://a.b.c.d:e ] }. Note "
+"that SOCKS peerings will NOT be affected by this option and should go in the "
+"\"Peers\" section instead."
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
+msgid ""
+"List of connection strings for outbound peer connections in URI format, e.g. "
+"tcp://a.b.c.d:e or socks://a.b.c.d:e/f.g.h.i:j. These connections will obey "
+"the operating system routing table, therefore you should use this section "
+"when you may connect via different interfaces."
 msgstr ""
-"Lista ciągów połączeń dla wychodzących połączeń równorzędnych w formacie URI,"
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
 msgid "Listen addresses"
 msgstr "Nasłuchiwanie adresów"
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
-msgid "Listen addresses for incoming connections. You will need to add"
-msgstr "Nasłuchiwanie adresów dla połączeń przychodzących. Trzeba będzie dodać"
+msgid ""
+"Listen addresses for incoming connections. You will need to add listeners in "
+"order to accept incoming peerings from non-local nodes. Multicast peer "
+"discovery will work regardless of any listeners set here. Each listener "
+"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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
 msgid "MTU size for the interface"
@@ -220,9 +247,11 @@ msgid "NodeInfo"
 msgstr "Informacje o węźle"
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
-msgid "Optional node info. This must be a { \"key\": \"value\", ... } map"
+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 ""
-"Opcjonalne informacje o węźle. Musi to być mapa { \"key\": \"value\", ... }"
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:10
 #: applications/luci-app-yggdrasil/luasrc/controller/yggdrasil.lua:11
@@ -240,8 +269,11 @@ 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"
-msgstr "Wyrażenia regularne, dla których interfejs odnajduje peera multicast"
+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/luasrc/controller/yggdrasil.lua:14
 msgid "Session firewall"
@@ -279,8 +311,13 @@ msgid "Subnet"
 msgstr "Podsieć"
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "The port number to be used for the link-local TCP listeners for the"
-msgstr "Numer portu, który ma być użyty dla odbiorców Link-local TCP dla"
+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:10
 msgid "Tunnel Routing"
@@ -305,3 +342,43 @@ msgstr "Nazwa interfejsu sieciowego Yggdrasil'a"
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:58
 msgid "e.g. tcp://0.0.0.0:0 or tcp://[::]:0"
 msgstr "np. tcp://0.0.0.0:0 or tcp://[::]:0"
+
+#~ msgid ""
+#~ "Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively"
+#~ msgstr ""
+#~ "Zezwól na tunelowanie ruchu innego niż Yggdrasil nad Yggdrasil. To "
+#~ "skutecznie"
+
+#~ msgid "By default, nodeinfo contains some defaults including the platform,"
+#~ msgstr ""
+#~ "Domyślnie, nodeinfo zawiera kilka domyślnych ustawień, w tym platformę,"
+
+#~ msgid ""
+#~ "IPv4 subnets belonging to this node's end of the tunnels. Only traffic"
+#~ msgstr "Podsieci IPv6 należące do końca tunelu tego węzła. Tylko ruch"
+
+#~ msgid ""
+#~ "IPv6 subnets belonging to this node's end of the tunnels. Only traffic"
+#~ msgstr "Podsieci IPv6 należące do końca tunelu tego węzła. Tylko ruch"
+
+#~ msgid ""
+#~ "List of connection strings for outbound peer connections in URI format,"
+#~ msgstr ""
+#~ "Lista ciągów połączeń dla wychodzących połączeń równorzędnych w formacie "
+#~ "URI,"
+
+#~ msgid "Listen addresses for incoming connections. You will need to add"
+#~ msgstr ""
+#~ "Nasłuchiwanie adresów dla połączeń przychodzących. Trzeba będzie dodać"
+
+#~ msgid "Optional node info. This must be a { \"key\": \"value\", ... } map"
+#~ msgstr ""
+#~ "Opcjonalne informacje o węźle. Musi to być mapa { \"key\": \"value"
+#~ "\", ... }"
+
+#~ msgid "Regular expressions for which interfaces multicast peer discovery"
+#~ msgstr ""
+#~ "Wyrażenia regularne, dla których interfejs odnajduje peera multicast"
+
+#~ msgid "The port number to be used for the link-local TCP listeners for the"
+#~ msgstr "Numer portu, który ma być użyty dla odbiorców Link-local TCP dla"
diff --git a/applications/luci-app-yggdrasil/po/pt/yggdrasil.po b/applications/luci-app-yggdrasil/po/pt/yggdrasil.po
index 2e071dcf5..188247f8d 100644
--- a/applications/luci-app-yggdrasil/po/pt/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/pt/yggdrasil.po
@@ -43,7 +43,11 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:13
-msgid "Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively"
+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:20
@@ -55,7 +59,12 @@ msgid "Blacklisted public keys"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "By default, nodeinfo contains some defaults including the platform,"
+msgid ""
+"By default, nodeinfo contains some defaults including the platform, "
+"architecture and Yggdrasil version. These can help when surveying the "
+"network and diagnosing network routing problems. Enabling nodeinfo privacy "
+"prevents this, so that only items specified in \"NodeInfo\" are sent back if "
+"specified."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:21
@@ -105,7 +114,9 @@ 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:26
-msgid "IPv4 subnets belonging to this node's end of the tunnels. Only traffic"
+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:39
@@ -126,7 +137,9 @@ 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:40
-msgid "IPv6 subnets belonging to this node's end of the tunnels. Only traffic"
+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:14
@@ -161,9 +174,20 @@ msgstr "Chave"
 msgid "Link-local TCP port"
 msgstr ""
 
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
-msgid "List of connection strings for outbound peer connections in URI format,"
+msgid ""
+"List of connection strings for outbound peer connections in URI format, "
+"arranged by source interface, e.g. { \"eth0\": [ tcp://a.b.c.d:e ] }. Note "
+"that SOCKS peerings will NOT be affected by this option and should go in the "
+"\"Peers\" section instead."
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
+msgid ""
+"List of connection strings for outbound peer connections in URI format, e.g. "
+"tcp://a.b.c.d:e or socks://a.b.c.d:e/f.g.h.i:j. These connections will obey "
+"the operating system routing table, therefore you should use this section "
+"when you may connect via different interfaces."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
@@ -171,7 +195,12 @@ msgid "Listen addresses"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
-msgid "Listen addresses for incoming connections. You will need to add"
+msgid ""
+"Listen addresses for incoming connections. You will need to add listeners in "
+"order to accept incoming peerings from non-local nodes. Multicast peer "
+"discovery will work regardless of any listeners set here. Each listener "
+"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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
@@ -203,7 +232,10 @@ msgid "NodeInfo"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
-msgid "Optional node info. This must be a { \"key\": \"value\", ... } map"
+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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:10
@@ -222,7 +254,10 @@ 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"
+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/luasrc/controller/yggdrasil.lua:14
@@ -261,7 +296,12 @@ msgid "Subnet"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "The port number to be used for the link-local TCP listeners for the"
+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:10
diff --git a/applications/luci-app-yggdrasil/po/pt_BR/yggdrasil.po b/applications/luci-app-yggdrasil/po/pt_BR/yggdrasil.po
index 7a5829877..bc5e5506f 100644
--- a/applications/luci-app-yggdrasil/po/pt_BR/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/pt_BR/yggdrasil.po
@@ -37,7 +37,11 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:13
-msgid "Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively"
+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:20
@@ -49,7 +53,12 @@ msgid "Blacklisted public keys"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "By default, nodeinfo contains some defaults including the platform,"
+msgid ""
+"By default, nodeinfo contains some defaults including the platform, "
+"architecture and Yggdrasil version. These can help when surveying the "
+"network and diagnosing network routing problems. Enabling nodeinfo privacy "
+"prevents this, so that only items specified in \"NodeInfo\" are sent back if "
+"specified."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:21
@@ -99,7 +108,9 @@ 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:26
-msgid "IPv4 subnets belonging to this node's end of the tunnels. Only traffic"
+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:39
@@ -120,7 +131,9 @@ 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:40
-msgid "IPv6 subnets belonging to this node's end of the tunnels. Only traffic"
+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:14
@@ -155,9 +168,20 @@ msgstr ""
 msgid "Link-local TCP port"
 msgstr ""
 
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
-msgid "List of connection strings for outbound peer connections in URI format,"
+msgid ""
+"List of connection strings for outbound peer connections in URI format, "
+"arranged by source interface, e.g. { \"eth0\": [ tcp://a.b.c.d:e ] }. Note "
+"that SOCKS peerings will NOT be affected by this option and should go in the "
+"\"Peers\" section instead."
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
+msgid ""
+"List of connection strings for outbound peer connections in URI format, e.g. "
+"tcp://a.b.c.d:e or socks://a.b.c.d:e/f.g.h.i:j. These connections will obey "
+"the operating system routing table, therefore you should use this section "
+"when you may connect via different interfaces."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
@@ -165,7 +189,12 @@ msgid "Listen addresses"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
-msgid "Listen addresses for incoming connections. You will need to add"
+msgid ""
+"Listen addresses for incoming connections. You will need to add listeners in "
+"order to accept incoming peerings from non-local nodes. Multicast peer "
+"discovery will work regardless of any listeners set here. Each listener "
+"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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
@@ -197,7 +226,10 @@ msgid "NodeInfo"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
-msgid "Optional node info. This must be a { \"key\": \"value\", ... } map"
+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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:10
@@ -216,7 +248,10 @@ 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"
+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/luasrc/controller/yggdrasil.lua:14
@@ -255,7 +290,12 @@ msgid "Subnet"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "The port number to be used for the link-local TCP listeners for the"
+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:10
diff --git a/applications/luci-app-yggdrasil/po/ro/yggdrasil.po b/applications/luci-app-yggdrasil/po/ro/yggdrasil.po
index 493ef180e..9879b3c93 100644
--- a/applications/luci-app-yggdrasil/po/ro/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/ro/yggdrasil.po
@@ -44,7 +44,11 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:13
-msgid "Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively"
+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:20
@@ -56,7 +60,12 @@ msgid "Blacklisted public keys"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "By default, nodeinfo contains some defaults including the platform,"
+msgid ""
+"By default, nodeinfo contains some defaults including the platform, "
+"architecture and Yggdrasil version. These can help when surveying the "
+"network and diagnosing network routing problems. Enabling nodeinfo privacy "
+"prevents this, so that only items specified in \"NodeInfo\" are sent back if "
+"specified."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:21
@@ -106,7 +115,9 @@ 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:26
-msgid "IPv4 subnets belonging to this node's end of the tunnels. Only traffic"
+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:39
@@ -127,7 +138,9 @@ 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:40
-msgid "IPv6 subnets belonging to this node's end of the tunnels. Only traffic"
+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:14
@@ -162,9 +175,20 @@ msgstr ""
 msgid "Link-local TCP port"
 msgstr ""
 
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
-msgid "List of connection strings for outbound peer connections in URI format,"
+msgid ""
+"List of connection strings for outbound peer connections in URI format, "
+"arranged by source interface, e.g. { \"eth0\": [ tcp://a.b.c.d:e ] }. Note "
+"that SOCKS peerings will NOT be affected by this option and should go in the "
+"\"Peers\" section instead."
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
+msgid ""
+"List of connection strings for outbound peer connections in URI format, e.g. "
+"tcp://a.b.c.d:e or socks://a.b.c.d:e/f.g.h.i:j. These connections will obey "
+"the operating system routing table, therefore you should use this section "
+"when you may connect via different interfaces."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
@@ -172,7 +196,12 @@ msgid "Listen addresses"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
-msgid "Listen addresses for incoming connections. You will need to add"
+msgid ""
+"Listen addresses for incoming connections. You will need to add listeners in "
+"order to accept incoming peerings from non-local nodes. Multicast peer "
+"discovery will work regardless of any listeners set here. Each listener "
+"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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
@@ -204,7 +233,10 @@ msgid "NodeInfo"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
-msgid "Optional node info. This must be a { \"key\": \"value\", ... } map"
+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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:10
@@ -223,7 +255,10 @@ 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"
+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/luasrc/controller/yggdrasil.lua:14
@@ -262,7 +297,12 @@ msgid "Subnet"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "The port number to be used for the link-local TCP listeners for the"
+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:10
diff --git a/applications/luci-app-yggdrasil/po/ru/yggdrasil.po b/applications/luci-app-yggdrasil/po/ru/yggdrasil.po
index 72bc53d45..e0b564769 100644
--- a/applications/luci-app-yggdrasil/po/ru/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/ru/yggdrasil.po
@@ -44,7 +44,11 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:13
-msgid "Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively"
+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:20
@@ -56,7 +60,12 @@ msgid "Blacklisted public keys"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "By default, nodeinfo contains some defaults including the platform,"
+msgid ""
+"By default, nodeinfo contains some defaults including the platform, "
+"architecture and Yggdrasil version. These can help when surveying the "
+"network and diagnosing network routing problems. Enabling nodeinfo privacy "
+"prevents this, so that only items specified in \"NodeInfo\" are sent back if "
+"specified."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:21
@@ -106,7 +115,9 @@ 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:26
-msgid "IPv4 subnets belonging to this node's end of the tunnels. Only traffic"
+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:39
@@ -127,7 +138,9 @@ 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:40
-msgid "IPv6 subnets belonging to this node's end of the tunnels. Only traffic"
+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:14
@@ -162,9 +175,20 @@ msgstr "Пароль (ключ)"
 msgid "Link-local TCP port"
 msgstr ""
 
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
-msgid "List of connection strings for outbound peer connections in URI format,"
+msgid ""
+"List of connection strings for outbound peer connections in URI format, "
+"arranged by source interface, e.g. { \"eth0\": [ tcp://a.b.c.d:e ] }. Note "
+"that SOCKS peerings will NOT be affected by this option and should go in the "
+"\"Peers\" section instead."
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
+msgid ""
+"List of connection strings for outbound peer connections in URI format, e.g. "
+"tcp://a.b.c.d:e or socks://a.b.c.d:e/f.g.h.i:j. These connections will obey "
+"the operating system routing table, therefore you should use this section "
+"when you may connect via different interfaces."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
@@ -172,7 +196,12 @@ msgid "Listen addresses"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
-msgid "Listen addresses for incoming connections. You will need to add"
+msgid ""
+"Listen addresses for incoming connections. You will need to add listeners in "
+"order to accept incoming peerings from non-local nodes. Multicast peer "
+"discovery will work regardless of any listeners set here. Each listener "
+"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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
@@ -204,7 +233,10 @@ msgid "NodeInfo"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
-msgid "Optional node info. This must be a { \"key\": \"value\", ... } map"
+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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:10
@@ -223,7 +255,10 @@ 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"
+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/luasrc/controller/yggdrasil.lua:14
@@ -262,7 +297,12 @@ msgid "Subnet"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "The port number to be used for the link-local TCP listeners for the"
+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:10
diff --git a/applications/luci-app-yggdrasil/po/sk/yggdrasil.po b/applications/luci-app-yggdrasil/po/sk/yggdrasil.po
index c5733967d..f40464838 100644
--- a/applications/luci-app-yggdrasil/po/sk/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/sk/yggdrasil.po
@@ -37,7 +37,11 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:13
-msgid "Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively"
+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:20
@@ -49,7 +53,12 @@ msgid "Blacklisted public keys"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "By default, nodeinfo contains some defaults including the platform,"
+msgid ""
+"By default, nodeinfo contains some defaults including the platform, "
+"architecture and Yggdrasil version. These can help when surveying the "
+"network and diagnosing network routing problems. Enabling nodeinfo privacy "
+"prevents this, so that only items specified in \"NodeInfo\" are sent back if "
+"specified."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:21
@@ -99,7 +108,9 @@ 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:26
-msgid "IPv4 subnets belonging to this node's end of the tunnels. Only traffic"
+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:39
@@ -120,7 +131,9 @@ 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:40
-msgid "IPv6 subnets belonging to this node's end of the tunnels. Only traffic"
+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:14
@@ -155,9 +168,20 @@ msgstr ""
 msgid "Link-local TCP port"
 msgstr ""
 
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
-msgid "List of connection strings for outbound peer connections in URI format,"
+msgid ""
+"List of connection strings for outbound peer connections in URI format, "
+"arranged by source interface, e.g. { \"eth0\": [ tcp://a.b.c.d:e ] }. Note "
+"that SOCKS peerings will NOT be affected by this option and should go in the "
+"\"Peers\" section instead."
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
+msgid ""
+"List of connection strings for outbound peer connections in URI format, e.g. "
+"tcp://a.b.c.d:e or socks://a.b.c.d:e/f.g.h.i:j. These connections will obey "
+"the operating system routing table, therefore you should use this section "
+"when you may connect via different interfaces."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
@@ -165,7 +189,12 @@ msgid "Listen addresses"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
-msgid "Listen addresses for incoming connections. You will need to add"
+msgid ""
+"Listen addresses for incoming connections. You will need to add listeners in "
+"order to accept incoming peerings from non-local nodes. Multicast peer "
+"discovery will work regardless of any listeners set here. Each listener "
+"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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
@@ -197,7 +226,10 @@ msgid "NodeInfo"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
-msgid "Optional node info. This must be a { \"key\": \"value\", ... } map"
+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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:10
@@ -216,7 +248,10 @@ 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"
+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/luasrc/controller/yggdrasil.lua:14
@@ -255,7 +290,12 @@ msgid "Subnet"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "The port number to be used for the link-local TCP listeners for the"
+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:10
diff --git a/applications/luci-app-yggdrasil/po/sv/yggdrasil.po b/applications/luci-app-yggdrasil/po/sv/yggdrasil.po
index 2a26af649..18dd5589a 100644
--- a/applications/luci-app-yggdrasil/po/sv/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/sv/yggdrasil.po
@@ -37,7 +37,11 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:13
-msgid "Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively"
+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:20
@@ -49,7 +53,12 @@ msgid "Blacklisted public keys"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "By default, nodeinfo contains some defaults including the platform,"
+msgid ""
+"By default, nodeinfo contains some defaults including the platform, "
+"architecture and Yggdrasil version. These can help when surveying the "
+"network and diagnosing network routing problems. Enabling nodeinfo privacy "
+"prevents this, so that only items specified in \"NodeInfo\" are sent back if "
+"specified."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:21
@@ -99,7 +108,9 @@ 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:26
-msgid "IPv4 subnets belonging to this node's end of the tunnels. Only traffic"
+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:39
@@ -120,7 +131,9 @@ 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:40
-msgid "IPv6 subnets belonging to this node's end of the tunnels. Only traffic"
+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:14
@@ -155,9 +168,20 @@ msgstr ""
 msgid "Link-local TCP port"
 msgstr ""
 
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
-msgid "List of connection strings for outbound peer connections in URI format,"
+msgid ""
+"List of connection strings for outbound peer connections in URI format, "
+"arranged by source interface, e.g. { \"eth0\": [ tcp://a.b.c.d:e ] }. Note "
+"that SOCKS peerings will NOT be affected by this option and should go in the "
+"\"Peers\" section instead."
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
+msgid ""
+"List of connection strings for outbound peer connections in URI format, e.g. "
+"tcp://a.b.c.d:e or socks://a.b.c.d:e/f.g.h.i:j. These connections will obey "
+"the operating system routing table, therefore you should use this section "
+"when you may connect via different interfaces."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
@@ -165,7 +189,12 @@ msgid "Listen addresses"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
-msgid "Listen addresses for incoming connections. You will need to add"
+msgid ""
+"Listen addresses for incoming connections. You will need to add listeners in "
+"order to accept incoming peerings from non-local nodes. Multicast peer "
+"discovery will work regardless of any listeners set here. Each listener "
+"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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
@@ -197,7 +226,10 @@ msgid "NodeInfo"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
-msgid "Optional node info. This must be a { \"key\": \"value\", ... } map"
+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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:10
@@ -216,7 +248,10 @@ 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"
+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/luasrc/controller/yggdrasil.lua:14
@@ -255,7 +290,12 @@ msgid "Subnet"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "The port number to be used for the link-local TCP listeners for the"
+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:10
diff --git a/applications/luci-app-yggdrasil/po/templates/yggdrasil.pot b/applications/luci-app-yggdrasil/po/templates/yggdrasil.pot
index 380042f42..065a00f8a 100644
--- a/applications/luci-app-yggdrasil/po/templates/yggdrasil.pot
+++ b/applications/luci-app-yggdrasil/po/templates/yggdrasil.pot
@@ -34,7 +34,11 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:13
-msgid "Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively"
+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:20
@@ -46,7 +50,12 @@ msgid "Blacklisted public keys"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "By default, nodeinfo contains some defaults including the platform,"
+msgid ""
+"By default, nodeinfo contains some defaults including the platform, "
+"architecture and Yggdrasil version. These can help when surveying the "
+"network and diagnosing network routing problems. Enabling nodeinfo privacy "
+"prevents this, so that only items specified in \"NodeInfo\" are sent back if "
+"specified."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:21
@@ -96,7 +105,9 @@ 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:26
-msgid "IPv4 subnets belonging to this node's end of the tunnels. Only traffic"
+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:39
@@ -117,7 +128,9 @@ 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:40
-msgid "IPv6 subnets belonging to this node's end of the tunnels. Only traffic"
+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:14
@@ -152,9 +165,20 @@ msgstr ""
 msgid "Link-local TCP port"
 msgstr ""
 
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
-msgid "List of connection strings for outbound peer connections in URI format,"
+msgid ""
+"List of connection strings for outbound peer connections in URI format, "
+"arranged by source interface, e.g. { \"eth0\": [ tcp://a.b.c.d:e ] }. Note "
+"that SOCKS peerings will NOT be affected by this option and should go in the "
+"\"Peers\" section instead."
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
+msgid ""
+"List of connection strings for outbound peer connections in URI format, e.g. "
+"tcp://a.b.c.d:e or socks://a.b.c.d:e/f.g.h.i:j. These connections will obey "
+"the operating system routing table, therefore you should use this section "
+"when you may connect via different interfaces."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
@@ -162,7 +186,12 @@ msgid "Listen addresses"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
-msgid "Listen addresses for incoming connections. You will need to add"
+msgid ""
+"Listen addresses for incoming connections. You will need to add listeners in "
+"order to accept incoming peerings from non-local nodes. Multicast peer "
+"discovery will work regardless of any listeners set here. Each listener "
+"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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
@@ -194,7 +223,10 @@ msgid "NodeInfo"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
-msgid "Optional node info. This must be a { \"key\": \"value\", ... } map"
+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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:10
@@ -213,7 +245,10 @@ 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"
+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/luasrc/controller/yggdrasil.lua:14
@@ -252,7 +287,12 @@ msgid "Subnet"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "The port number to be used for the link-local TCP listeners for the"
+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:10
diff --git a/applications/luci-app-yggdrasil/po/tr/yggdrasil.po b/applications/luci-app-yggdrasil/po/tr/yggdrasil.po
index 9c8efc0cd..1fb481aa6 100644
--- a/applications/luci-app-yggdrasil/po/tr/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/tr/yggdrasil.po
@@ -37,7 +37,11 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:13
-msgid "Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively"
+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:20
@@ -49,7 +53,12 @@ msgid "Blacklisted public keys"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "By default, nodeinfo contains some defaults including the platform,"
+msgid ""
+"By default, nodeinfo contains some defaults including the platform, "
+"architecture and Yggdrasil version. These can help when surveying the "
+"network and diagnosing network routing problems. Enabling nodeinfo privacy "
+"prevents this, so that only items specified in \"NodeInfo\" are sent back if "
+"specified."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:21
@@ -99,7 +108,9 @@ 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:26
-msgid "IPv4 subnets belonging to this node's end of the tunnels. Only traffic"
+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:39
@@ -120,7 +131,9 @@ 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:40
-msgid "IPv6 subnets belonging to this node's end of the tunnels. Only traffic"
+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:14
@@ -155,9 +168,20 @@ msgstr ""
 msgid "Link-local TCP port"
 msgstr ""
 
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
-msgid "List of connection strings for outbound peer connections in URI format,"
+msgid ""
+"List of connection strings for outbound peer connections in URI format, "
+"arranged by source interface, e.g. { \"eth0\": [ tcp://a.b.c.d:e ] }. Note "
+"that SOCKS peerings will NOT be affected by this option and should go in the "
+"\"Peers\" section instead."
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
+msgid ""
+"List of connection strings for outbound peer connections in URI format, e.g. "
+"tcp://a.b.c.d:e or socks://a.b.c.d:e/f.g.h.i:j. These connections will obey "
+"the operating system routing table, therefore you should use this section "
+"when you may connect via different interfaces."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
@@ -165,7 +189,12 @@ msgid "Listen addresses"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
-msgid "Listen addresses for incoming connections. You will need to add"
+msgid ""
+"Listen addresses for incoming connections. You will need to add listeners in "
+"order to accept incoming peerings from non-local nodes. Multicast peer "
+"discovery will work regardless of any listeners set here. Each listener "
+"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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
@@ -197,7 +226,10 @@ msgid "NodeInfo"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
-msgid "Optional node info. This must be a { \"key\": \"value\", ... } map"
+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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:10
@@ -216,7 +248,10 @@ 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"
+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/luasrc/controller/yggdrasil.lua:14
@@ -255,7 +290,12 @@ msgid "Subnet"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "The port number to be used for the link-local TCP listeners for the"
+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:10
diff --git a/applications/luci-app-yggdrasil/po/uk/yggdrasil.po b/applications/luci-app-yggdrasil/po/uk/yggdrasil.po
index 87538618b..8ff4c75fb 100644
--- a/applications/luci-app-yggdrasil/po/uk/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/uk/yggdrasil.po
@@ -37,7 +37,11 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:13
-msgid "Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively"
+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:20
@@ -49,7 +53,12 @@ msgid "Blacklisted public keys"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "By default, nodeinfo contains some defaults including the platform,"
+msgid ""
+"By default, nodeinfo contains some defaults including the platform, "
+"architecture and Yggdrasil version. These can help when surveying the "
+"network and diagnosing network routing problems. Enabling nodeinfo privacy "
+"prevents this, so that only items specified in \"NodeInfo\" are sent back if "
+"specified."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:21
@@ -99,7 +108,9 @@ 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:26
-msgid "IPv4 subnets belonging to this node's end of the tunnels. Only traffic"
+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:39
@@ -120,7 +131,9 @@ 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:40
-msgid "IPv6 subnets belonging to this node's end of the tunnels. Only traffic"
+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:14
@@ -155,9 +168,20 @@ msgstr ""
 msgid "Link-local TCP port"
 msgstr ""
 
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
-msgid "List of connection strings for outbound peer connections in URI format,"
+msgid ""
+"List of connection strings for outbound peer connections in URI format, "
+"arranged by source interface, e.g. { \"eth0\": [ tcp://a.b.c.d:e ] }. Note "
+"that SOCKS peerings will NOT be affected by this option and should go in the "
+"\"Peers\" section instead."
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
+msgid ""
+"List of connection strings for outbound peer connections in URI format, e.g. "
+"tcp://a.b.c.d:e or socks://a.b.c.d:e/f.g.h.i:j. These connections will obey "
+"the operating system routing table, therefore you should use this section "
+"when you may connect via different interfaces."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
@@ -165,7 +189,12 @@ msgid "Listen addresses"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
-msgid "Listen addresses for incoming connections. You will need to add"
+msgid ""
+"Listen addresses for incoming connections. You will need to add listeners in "
+"order to accept incoming peerings from non-local nodes. Multicast peer "
+"discovery will work regardless of any listeners set here. Each listener "
+"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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
@@ -197,7 +226,10 @@ msgid "NodeInfo"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
-msgid "Optional node info. This must be a { \"key\": \"value\", ... } map"
+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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:10
@@ -216,7 +248,10 @@ 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"
+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/luasrc/controller/yggdrasil.lua:14
@@ -255,7 +290,12 @@ msgid "Subnet"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "The port number to be used for the link-local TCP listeners for the"
+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:10
diff --git a/applications/luci-app-yggdrasil/po/vi/yggdrasil.po b/applications/luci-app-yggdrasil/po/vi/yggdrasil.po
index 28e76869a..b60b6d248 100644
--- a/applications/luci-app-yggdrasil/po/vi/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/vi/yggdrasil.po
@@ -37,7 +37,11 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:13
-msgid "Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively"
+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:20
@@ -49,7 +53,12 @@ msgid "Blacklisted public keys"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "By default, nodeinfo contains some defaults including the platform,"
+msgid ""
+"By default, nodeinfo contains some defaults including the platform, "
+"architecture and Yggdrasil version. These can help when surveying the "
+"network and diagnosing network routing problems. Enabling nodeinfo privacy "
+"prevents this, so that only items specified in \"NodeInfo\" are sent back if "
+"specified."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:21
@@ -99,7 +108,9 @@ 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:26
-msgid "IPv4 subnets belonging to this node's end of the tunnels. Only traffic"
+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:39
@@ -120,7 +131,9 @@ 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:40
-msgid "IPv6 subnets belonging to this node's end of the tunnels. Only traffic"
+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:14
@@ -155,9 +168,20 @@ msgstr ""
 msgid "Link-local TCP port"
 msgstr ""
 
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
-msgid "List of connection strings for outbound peer connections in URI format,"
+msgid ""
+"List of connection strings for outbound peer connections in URI format, "
+"arranged by source interface, e.g. { \"eth0\": [ tcp://a.b.c.d:e ] }. Note "
+"that SOCKS peerings will NOT be affected by this option and should go in the "
+"\"Peers\" section instead."
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
+msgid ""
+"List of connection strings for outbound peer connections in URI format, e.g. "
+"tcp://a.b.c.d:e or socks://a.b.c.d:e/f.g.h.i:j. These connections will obey "
+"the operating system routing table, therefore you should use this section "
+"when you may connect via different interfaces."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
@@ -165,7 +189,12 @@ msgid "Listen addresses"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
-msgid "Listen addresses for incoming connections. You will need to add"
+msgid ""
+"Listen addresses for incoming connections. You will need to add listeners in "
+"order to accept incoming peerings from non-local nodes. Multicast peer "
+"discovery will work regardless of any listeners set here. Each listener "
+"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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
@@ -197,7 +226,10 @@ msgid "NodeInfo"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
-msgid "Optional node info. This must be a { \"key\": \"value\", ... } map"
+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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:10
@@ -216,7 +248,10 @@ 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"
+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/luasrc/controller/yggdrasil.lua:14
@@ -255,7 +290,12 @@ msgid "Subnet"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "The port number to be used for the link-local TCP listeners for the"
+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:10
diff --git a/applications/luci-app-yggdrasil/po/zh-cn/yggdrasil.po b/applications/luci-app-yggdrasil/po/zh-cn/yggdrasil.po
index 8005c7fbf..ac9c54876 100644
--- a/applications/luci-app-yggdrasil/po/zh-cn/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/zh-cn/yggdrasil.po
@@ -43,7 +43,11 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:13
-msgid "Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively"
+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:20
@@ -55,7 +59,12 @@ msgid "Blacklisted public keys"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "By default, nodeinfo contains some defaults including the platform,"
+msgid ""
+"By default, nodeinfo contains some defaults including the platform, "
+"architecture and Yggdrasil version. These can help when surveying the "
+"network and diagnosing network routing problems. Enabling nodeinfo privacy "
+"prevents this, so that only items specified in \"NodeInfo\" are sent back if "
+"specified."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:21
@@ -105,7 +114,9 @@ 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:26
-msgid "IPv4 subnets belonging to this node's end of the tunnels. Only traffic"
+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:39
@@ -126,7 +137,9 @@ 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:40
-msgid "IPv6 subnets belonging to this node's end of the tunnels. Only traffic"
+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:14
@@ -161,9 +174,20 @@ msgstr ""
 msgid "Link-local TCP port"
 msgstr ""
 
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
-msgid "List of connection strings for outbound peer connections in URI format,"
+msgid ""
+"List of connection strings for outbound peer connections in URI format, "
+"arranged by source interface, e.g. { \"eth0\": [ tcp://a.b.c.d:e ] }. Note "
+"that SOCKS peerings will NOT be affected by this option and should go in the "
+"\"Peers\" section instead."
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
+msgid ""
+"List of connection strings for outbound peer connections in URI format, e.g. "
+"tcp://a.b.c.d:e or socks://a.b.c.d:e/f.g.h.i:j. These connections will obey "
+"the operating system routing table, therefore you should use this section "
+"when you may connect via different interfaces."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
@@ -171,7 +195,12 @@ msgid "Listen addresses"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
-msgid "Listen addresses for incoming connections. You will need to add"
+msgid ""
+"Listen addresses for incoming connections. You will need to add listeners in "
+"order to accept incoming peerings from non-local nodes. Multicast peer "
+"discovery will work regardless of any listeners set here. Each listener "
+"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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
@@ -203,7 +232,10 @@ msgid "NodeInfo"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
-msgid "Optional node info. This must be a { \"key\": \"value\", ... } map"
+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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:10
@@ -222,7 +254,10 @@ 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"
+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/luasrc/controller/yggdrasil.lua:14
@@ -261,7 +296,12 @@ msgid "Subnet"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "The port number to be used for the link-local TCP listeners for the"
+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:10
diff --git a/applications/luci-app-yggdrasil/po/zh-tw/yggdrasil.po b/applications/luci-app-yggdrasil/po/zh-tw/yggdrasil.po
index dd259b1f4..bf048e0f6 100644
--- a/applications/luci-app-yggdrasil/po/zh-tw/yggdrasil.po
+++ b/applications/luci-app-yggdrasil/po/zh-tw/yggdrasil.po
@@ -37,7 +37,11 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/tunnel_routing.js:13
-msgid "Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively"
+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:20
@@ -49,7 +53,12 @@ msgid "Blacklisted public keys"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:22
-msgid "By default, nodeinfo contains some defaults including the platform,"
+msgid ""
+"By default, nodeinfo contains some defaults including the platform, "
+"architecture and Yggdrasil version. These can help when surveying the "
+"network and diagnosing network routing problems. Enabling nodeinfo privacy "
+"prevents this, so that only items specified in \"NodeInfo\" are sent back if "
+"specified."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:21
@@ -99,7 +108,9 @@ 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:26
-msgid "IPv4 subnets belonging to this node's end of the tunnels. Only traffic"
+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:39
@@ -120,7 +131,9 @@ 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:40
-msgid "IPv6 subnets belonging to this node's end of the tunnels. Only traffic"
+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:14
@@ -155,9 +168,20 @@ msgstr ""
 msgid "Link-local TCP port"
 msgstr ""
 
-#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:20
-msgid "List of connection strings for outbound peer connections in URI format,"
+msgid ""
+"List of connection strings for outbound peer connections in URI format, "
+"arranged by source interface, e.g. { \"eth0\": [ tcp://a.b.c.d:e ] }. Note "
+"that SOCKS peerings will NOT be affected by this option and should go in the "
+"\"Peers\" section instead."
+msgstr ""
+
+#: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:11
+msgid ""
+"List of connection strings for outbound peer connections in URI format, e.g. "
+"tcp://a.b.c.d:e or socks://a.b.c.d:e/f.g.h.i:j. These connections will obey "
+"the operating system routing table, therefore you should use this section "
+"when you may connect via different interfaces."
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:50
@@ -165,7 +189,12 @@ msgid "Listen addresses"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:51
-msgid "Listen addresses for incoming connections. You will need to add"
+msgid ""
+"Listen addresses for incoming connections. You will need to add listeners in "
+"order to accept incoming peerings from non-local nodes. Multicast peer "
+"discovery will work regardless of any listeners set here. Each listener "
+"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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:37
@@ -197,7 +226,10 @@ msgid "NodeInfo"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:29
-msgid "Optional node info. This must be a { \"key\": \"value\", ... } map"
+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 ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/peers.js:10
@@ -216,7 +248,10 @@ 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"
+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/luasrc/controller/yggdrasil.lua:14
@@ -255,7 +290,12 @@ msgid "Subnet"
 msgstr ""
 
 #: applications/luci-app-yggdrasil/htdocs/luci-static/resources/view/yggdrasil/settings.js:15
-msgid "The port number to be used for the link-local TCP listeners for the"
+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:10