diff --git a/gui/default/assets/lang/lang-fr.json b/gui/default/assets/lang/lang-fr.json
index 89e82c493..9117f8d45 100644
--- a/gui/default/assets/lang/lang-fr.json
+++ b/gui/default/assets/lang/lang-fr.json
@@ -39,8 +39,8 @@
     "Bugs": "Bugs",
     "Changelog": "Historique des versions",
     "Clean out after": "Conserver pendant :",
-    "Cleaning Versions": "Cleaning Versions",
-    "Cleanup Interval": "Cleanup Interval",
+    "Cleaning Versions": "Versions de nettoyage",
+    "Cleanup Interval": "Intervalle de nettoyage",
     "Click to see discovery failures": "Voir les échecs de découverte",
     "Close": "Fermer",
     "Command": "Commande",
@@ -296,7 +296,7 @@
     "The Syncthing Authors": "Les concepteurs de Syncthing",
     "The Syncthing admin interface is configured to allow remote access without a password.": "L'interface d'administration de Syncthing est paramétrée pour autoriser les accès à distance sans mot de passe !!!",
     "The aggregated statistics are publicly available at the URL below.": "Les statistiques agrégées sont disponibles publiquement à l'adresse ci-dessous.",
-    "The cleanup interval cannot be blank.": "The cleanup interval cannot be blank.",
+    "The cleanup interval cannot be blank.": "L'intervalle de nettoyage ne peut pas être vide.",
     "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "La configuration a été enregistrée mais pas activée. Syncthing doit redémarrer afin d'activer la nouvelle configuration.",
     "The device ID cannot be blank.": "L'ID de l'appareil ne peut être vide.",
     "The device ID to enter here can be found in the \"Actions > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "L'ID d'appareil à saisir ici se trouve dans le menu \"Actions > Afficher mon ID\" de l'appareil distant. Espaces et tirets sont optionnels (ignorés).",
@@ -308,8 +308,8 @@
     "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "Les seuils de durée suivants définissent le nombre maximum de versions pour chaque fichier : pendant la première heure une version est conservée toutes les 30 secondes. Le premier jour, une version par heure - des versions de la première heure sont alors progressivement effacées pour finir par n'en garder que la dernière. Pour les 30 jours passés, une version par jour - des versions horaires du premier jour sont alors progressivement effacées pour n'en garder qu'une par jour. Au-delà et jusqu'à la limite d'âge, une version est conservée par semaine - des versions journalières du premier mois sont alors progressivement effacées pour n'en garder qu'une.",
     "The following items could not be synchronized.": "Les fichiers suivants n'ont pas pu être synchronisés.",
     "The following items were changed locally.": "Les éléments suivants ont été modifiés localement.",
-    "The interval must be a positive number of seconds.": "The interval must be a positive number of seconds.",
-    "The interval, in seconds, for running cleanup in the versions directory. Zero to disable periodic cleaning.": "The interval, in seconds, for running cleanup in the versions directory. Zero to disable periodic cleaning.",
+    "The interval must be a positive number of seconds.": "L'intervalle doit être un nombre positif exprimé en secondes",
+    "The interval, in seconds, for running cleanup in the versions directory. Zero to disable periodic cleaning.": "L'intervalle, en secondes, de l'exécution du nettoyage dans le répertoire des versions. Définir à zéro pour désactiver le nettoyage périodique.",
     "The maximum age must be a number and cannot be blank.": "L'âge maximum doit être un nombre et ne peut être vide.",
     "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Durée maximale de conservation d'une version (en jours, 0 pour conservation éternelle)",
     "The number of days must be a number and cannot be blank.": "Le nombre de jours doit être numérique et ne peut pas être vide.",
@@ -351,7 +351,7 @@
     "Versions": "Restauration...",
     "Versions Path": "Emplacement des versions",
     "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Les versions seront supprimées automatiquement quand elles dépassent la durée maximum de conservation ou si leur nombre (par fichier) est supérieur à la limite prédéfinie pour l'intervalle.",
-    "Waiting to Clean": "Waiting to Clean",
+    "Waiting to Clean": "En attente de nettoyage",
     "Waiting to Scan": "En attente d'analyse",
     "Waiting to Sync": "En attente de synchronisation",
     "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "Attention, ce chemin est un répertoire parent d'au moins un partage existant (par exemple \"{{otherFolder}}\"). Si c'est bien ce que vous souhaitez, vous devriez créer un nouveau sous-répertoire, sinon ceci peut causer des problèmes tels que duplications et/ou suppressions intempestives de fichiers.",
@@ -376,7 +376,7 @@
     "files": "Fichiers",
     "full documentation": "Documentation complète ici",
     "items": "éléments",
-    "seconds": "seconds",
+    "seconds": "secondes",
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} vous invite au partage \"{{folder}}\".",
     "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} vous invite au partage \"{{folderlabel}}\" ({{folder}})."
 }
\ No newline at end of file
diff --git a/gui/default/assets/lang/lang-sk.json b/gui/default/assets/lang/lang-sk.json
index 8f2b19eae..d30cc9b46 100644
--- a/gui/default/assets/lang/lang-sk.json
+++ b/gui/default/assets/lang/lang-sk.json
@@ -47,7 +47,7 @@
     "Comment, when used at the start of a line": "Komentár, keď použité na začiatku riadku",
     "Compression": "Kompresia",
     "Configured": "Nakonfigurované",
-    "Connected (Unused)": "Connected (Unused)",
+    "Connected (Unused)": "Pripojené (Nepoužité)",
     "Connection Error": "Chyba pripojenia",
     "Connection Type": "Typ pripojenia",
     "Connections": "Spojenia",
@@ -79,7 +79,7 @@
     "Disables comparing and syncing file permissions. Useful on systems with nonexistent or custom permissions (e.g. FAT, exFAT, Synology, Android).": "Disables comparing and syncing file permissions. Useful on systems with nonexistent or custom permissions (e.g. FAT, exFAT, Synology, Android).",
     "Discard": "Zahodiť",
     "Disconnected": "Odpojené",
-    "Disconnected (Unused)": "Disconnected (Unused)",
+    "Disconnected (Unused)": "Odpojené (Nepoužité)",
     "Discovered": "Zistené",
     "Discovery": "Zisťovanie",
     "Discovery Failures": "Zlyhania zisťovania",
diff --git a/man/stdiscosrv.1 b/man/stdiscosrv.1
index f9af9d4dd..75f2209c6 100644
--- a/man/stdiscosrv.1
+++ b/man/stdiscosrv.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "STDISCOSRV" "1" "Aug 08, 2020" "v1" "Syncthing"
+.TH "STDISCOSRV" "1" "Aug 16, 2020" "v1" "Syncthing"
 .SH NAME
 stdiscosrv \- Syncthing Discovery Server
 .
diff --git a/man/strelaysrv.1 b/man/strelaysrv.1
index 19cc17d9b..3a0d0d139 100644
--- a/man/strelaysrv.1
+++ b/man/strelaysrv.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "STRELAYSRV" "1" "Aug 08, 2020" "v1" "Syncthing"
+.TH "STRELAYSRV" "1" "Aug 16, 2020" "v1" "Syncthing"
 .SH NAME
 strelaysrv \- Syncthing Relay Server
 .
diff --git a/man/syncthing-bep.7 b/man/syncthing-bep.7
index 7454e09a2..2ce5b53d1 100644
--- a/man/syncthing-bep.7
+++ b/man/syncthing-bep.7
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-BEP" "7" "Aug 08, 2020" "v1" "Syncthing"
+.TH "SYNCTHING-BEP" "7" "Aug 16, 2020" "v1" "Syncthing"
 .SH NAME
 syncthing-bep \- Block Exchange Protocol v1
 .
diff --git a/man/syncthing-config.5 b/man/syncthing-config.5
index 2f57f7ffa..12a61130b 100644
--- a/man/syncthing-config.5
+++ b/man/syncthing-config.5
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-CONFIG" "5" "Aug 08, 2020" "v1" "Syncthing"
+.TH "SYNCTHING-CONFIG" "5" "Aug 16, 2020" "v1" "Syncthing"
 .SH NAME
 syncthing-config \- Syncthing Configuration
 .
diff --git a/man/syncthing-device-ids.7 b/man/syncthing-device-ids.7
index 0a6d9e56d..ef6884a96 100644
--- a/man/syncthing-device-ids.7
+++ b/man/syncthing-device-ids.7
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-DEVICE-IDS" "7" "Aug 08, 2020" "v1" "Syncthing"
+.TH "SYNCTHING-DEVICE-IDS" "7" "Aug 16, 2020" "v1" "Syncthing"
 .SH NAME
 syncthing-device-ids \- Understanding Device IDs
 .
diff --git a/man/syncthing-event-api.7 b/man/syncthing-event-api.7
index c6560e58a..24705eb0d 100644
--- a/man/syncthing-event-api.7
+++ b/man/syncthing-event-api.7
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-EVENT-API" "7" "Aug 08, 2020" "v1" "Syncthing"
+.TH "SYNCTHING-EVENT-API" "7" "Aug 16, 2020" "v1" "Syncthing"
 .SH NAME
 syncthing-event-api \- Event API
 .
diff --git a/man/syncthing-faq.7 b/man/syncthing-faq.7
index 62ce7d7e1..bcad6f2f5 100644
--- a/man/syncthing-faq.7
+++ b/man/syncthing-faq.7
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-FAQ" "7" "Aug 08, 2020" "v1" "Syncthing"
+.TH "SYNCTHING-FAQ" "7" "Aug 16, 2020" "v1" "Syncthing"
 .SH NAME
 syncthing-faq \- Frequently Asked Questions
 .
diff --git a/man/syncthing-globaldisco.7 b/man/syncthing-globaldisco.7
index d38ae5b06..423db840b 100644
--- a/man/syncthing-globaldisco.7
+++ b/man/syncthing-globaldisco.7
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-GLOBALDISCO" "7" "Aug 08, 2020" "v1" "Syncthing"
+.TH "SYNCTHING-GLOBALDISCO" "7" "Aug 16, 2020" "v1" "Syncthing"
 .SH NAME
 syncthing-globaldisco \- Global Discovery Protocol v3
 .
diff --git a/man/syncthing-localdisco.7 b/man/syncthing-localdisco.7
index 0ea40c64f..9949489c8 100644
--- a/man/syncthing-localdisco.7
+++ b/man/syncthing-localdisco.7
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-LOCALDISCO" "7" "Aug 08, 2020" "v1" "Syncthing"
+.TH "SYNCTHING-LOCALDISCO" "7" "Aug 16, 2020" "v1" "Syncthing"
 .SH NAME
 syncthing-localdisco \- Local Discovery Protocol v4
 .
diff --git a/man/syncthing-networking.7 b/man/syncthing-networking.7
index d96d2e489..7028fd123 100644
--- a/man/syncthing-networking.7
+++ b/man/syncthing-networking.7
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-NETWORKING" "7" "Aug 08, 2020" "v1" "Syncthing"
+.TH "SYNCTHING-NETWORKING" "7" "Aug 16, 2020" "v1" "Syncthing"
 .SH NAME
 syncthing-networking \- Firewall Setup
 .
@@ -30,7 +30,8 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.SH PORT FORWARDS
+.SH ROUTER SETUP
+.SS Port Forwards
 .sp
 If you have a NAT router which supports UPnP, the easiest way to get a working
 port forward is to make sure UPnP setting is enabled on both Syncthing and the
@@ -47,10 +48,10 @@ Created UPnP port mapping for external port XXXXX on UPnP device YYYYY.
 .UNINDENT
 .UNINDENT
 .sp
-If this is not possible or desirable you should set up a port forward for port
-\fB22000/TCP\fP, or the port set in the \fISync Protocol Listen Address\fP setting.
+If this is not possible or desirable, you should set up a port forward for port
+\fB22000/TCP\fP (or whichever port is set in the \fISync Protocol Listen Address\fP setting).
 The external forwarded port and the internal destination port has to be the same
-(i.e. 22000/TCP).
+(e.g. 22000/TCP).
 .sp
 Communication in Syncthing works both ways. Therefore if you set up port
 forwards for one device, other devices will be able to connect to it even when
@@ -59,6 +60,16 @@ they are behind a NAT network or firewall.
 In the absence of port forwarding, relaying may work well enough to get
 devices connected and synced, but will perform poorly in comparison to a
 direct connection.
+.SS Local Discovery
+.sp
+The router needs to allow/forward broad\-/multicasts for local discovery to work.
+Usually these are allowed by default in a single local subnet, but may be
+blocked between different subnets or even between a bridged Wi\-Fi and LAN.
+.sp
+If you are unable to set up your router thus or your firewall as shown below,
+and your devices have static IP addresses, you can specify them directly by
+changing the default \fBdynamic\fP setting for \fIAddresses\fP to something like:
+\fBtcp://192.168.1.xxx:22000, dynamic\fP\&.
 .SH LOCAL FIREWALL
 .sp
 If your PC has a local firewall, you will need to open the following ports for
diff --git a/man/syncthing-relay.7 b/man/syncthing-relay.7
index 3e2b1ecc5..13f6685b3 100644
--- a/man/syncthing-relay.7
+++ b/man/syncthing-relay.7
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-RELAY" "7" "Aug 08, 2020" "v1" "Syncthing"
+.TH "SYNCTHING-RELAY" "7" "Aug 16, 2020" "v1" "Syncthing"
 .SH NAME
 syncthing-relay \- Relay Protocol v1
 .
diff --git a/man/syncthing-rest-api.7 b/man/syncthing-rest-api.7
index f35834007..4aa6877b0 100644
--- a/man/syncthing-rest-api.7
+++ b/man/syncthing-rest-api.7
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-REST-API" "7" "Aug 08, 2020" "v1" "Syncthing"
+.TH "SYNCTHING-REST-API" "7" "Aug 16, 2020" "v1" "Syncthing"
 .SH NAME
 syncthing-rest-api \- REST API
 .
diff --git a/man/syncthing-security.7 b/man/syncthing-security.7
index ec6b0a30b..5e0c1df1b 100644
--- a/man/syncthing-security.7
+++ b/man/syncthing-security.7
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-SECURITY" "7" "Aug 08, 2020" "v1" "Syncthing"
+.TH "SYNCTHING-SECURITY" "7" "Aug 16, 2020" "v1" "Syncthing"
 .SH NAME
 syncthing-security \- Security Principles
 .
diff --git a/man/syncthing-stignore.5 b/man/syncthing-stignore.5
index aaa93414a..6c69aa2d2 100644
--- a/man/syncthing-stignore.5
+++ b/man/syncthing-stignore.5
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-STIGNORE" "5" "Aug 08, 2020" "v1" "Syncthing"
+.TH "SYNCTHING-STIGNORE" "5" "Aug 16, 2020" "v1" "Syncthing"
 .SH NAME
 syncthing-stignore \- Prevent files from being synchronized to other nodes
 .
diff --git a/man/syncthing-versioning.7 b/man/syncthing-versioning.7
index 0ec709f4c..0ed737a85 100644
--- a/man/syncthing-versioning.7
+++ b/man/syncthing-versioning.7
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-VERSIONING" "7" "Aug 08, 2020" "v1" "Syncthing"
+.TH "SYNCTHING-VERSIONING" "7" "Aug 16, 2020" "v1" "Syncthing"
 .SH NAME
 syncthing-versioning \- Keep automatic backups of deleted files by other nodes
 .
diff --git a/man/syncthing.1 b/man/syncthing.1
index 8ab4d1bd5..3c52d5728 100644
--- a/man/syncthing.1
+++ b/man/syncthing.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING" "1" "Aug 08, 2020" "v1" "Syncthing"
+.TH "SYNCTHING" "1" "Aug 16, 2020" "v1" "Syncthing"
 .SH NAME
 syncthing \- Syncthing
 .