build: Bump quic-go to 0.24.0

lib: Fix panic due to closed event subscriptions on shutdown (#8079 )
cmd/syncthing/cli: Add command to show pending devices/folders (fixes #8068 ) (#8069 )
2026-01-03 03:19:04 -05:00 · 2021-12-30 13:07:01 +01:00 · 2021-12-22 20:16:21 +01:00 · 2021-12-09 21:18:47 +01:00 · 2021-11-27 15:35:07 +01:00 · 2021-11-27 15:35:07 +01:00
613 changed files with 76131 additions and 16701 deletions
--- a/.codecov.yml
+++ b/.codecov.yml
@@ -1,5 +1,20 @@
+comment: false
+
 coverage:
  range: "40...100"
+  precision: 1
+  status:
+    patch:
+      default:
+        informational: true
+    project:
+      default:
+        informational: true
+
+github_checks:
+  annotations: false

 ignore:
  - "**.pb.go"
+  - "**_mocked.go"
+  - "**/mocks/*"
--- a/.deepsource.toml
+++ b/.deepsource.toml
@@ -0,0 +1,12 @@
+version = 1
+
+exclude_patterns = ["**/*.pb.go"]
+test_patterns = ["**/*_test.go"]
+
+[[analyzers]]
+name = "go"
+enabled = true
+
+  [analyzers.meta]
+  import_paths = ["github.com/syncthing/syncthing"]
+  build_tags = ["noassets"]
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -0,0 +1,7 @@
+version: 2
+updates:
+- package-ecosystem: gomod
+  directory: "/"
+  schedule:
+    interval: weekly
+  open-pull-requests-limit: 10
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,5 @@ deb
 *.bz2
 /repos
 /proto/scripts/protoc-gen-gosyncthing
+/gui/next-gen-gui
+.idea
--- a/29
+++ b/29
@@ -34,6 +34,7 @@ andyleap <andyleap@gmail.com>
 Anjan Momi <anjan@momi.ca>
 Antoine Lamielle (0x010C) <antoine.lamielle@0x010c.fr> <gh@0x010c.fr>
 Antony Male (canton7) <antony.male@gmail.com>
+Anur <anurnomeru@163.com>
 Aranjedeath <Aranjedeath@users.noreply.github.com>
 Arkadiusz Tymiński <gevleeog@gmail.com>
 Arthur Axel fREW Schmidt (frioux) <frew@afoolishmanifesto.com> <frioux@gmail.com>
@@ -48,6 +49,7 @@ Ben Shepherd (benshep) <bjashepherd@gmail.com>
 Ben Sidhom (bsidhom) <bsidhom@gmail.com>
 Benedikt Heine (bebehei) <bebe@bebehei.de>
 Benedikt Morbach <benedikt.morbach@googlemail.com>
+Benjamin Nater <17193640+bn4t@users.noreply.github.com>
 Benno Fünfstück <benno.fuenfstueck@gmail.com>
 Benny Ng (tpng) <benny.tpng@gmail.com>
 boomsquared <54829195+boomsquared@users.noreply.github.com>
@@ -56,14 +58,18 @@ Boris Rybalkin <ribalkin@gmail.com>
 Brandon Philips (philips) <brandon@ifup.org>
 Brendan Long (brendanlong) <self@brendanlong.com>
 Brian R. Becker (brbecker) <brbecker@gmail.com>
+bt90 <btom1990@googlemail.com>
 Caleb Callaway (cqcallaw) <enlightened.despot@gmail.com>
 Carsten Hagemann (carstenhag) <moter8@gmail.com> <carsten@chagemann.de>
 Cathryne Linenweaver (Cathryne) <cathryne.linenweaver@gmail.com> <Cathryne@users.noreply.github.com> <katrinleinweber@MAC.local>
 Cedric Staniewski (xduugu) <cedric@gmx.ca>
 chenrui <rui@meetup.com>
+Chih-Hsuan Yen <yan12125@gmail.com>
+Choongkyu <choongkyu.kim+gh@gmail.com> <vapidlyrapid+gh@gmail.com>
 Chris Howie (cdhowie) <me@chrishowie.com>
 Chris Joel (cdata) <chris@scriptolo.gy>
 Chris Tonkinson <chris@masterbran.ch>
+Christian Prescott <me@christianprescott.com>
 chucic <chucic@seznam.cz>
 Colin Kennedy (moshen) <moshen.colin@gmail.com>
 Cromefire_ <tim.l@nghorst.net> <26320625+cromefire@users.noreply.github.com>
@@ -75,10 +81,11 @@ Daniel Harte (norgeous) <daniel@harte.me> <daniel@danielharte.co.uk> <norgeous@u
 Daniel Martí (mvdan) <mvdan@mvdan.cc>
 Darshil Chanpura (dtchanpura) <dtchanpura@gmail.com> <dcprime314@gmail.com>
 David Rimmer (dinosore) <dinosore@dbrsoftware.co.uk>
+deepsource-autofix[bot] <62050782+deepsource-autofix[bot]@users.noreply.github.com>
 Denis A. (dva) <denisva@gmail.com>
 Dennis Wilson (snnd) <dw@risu.io>
 dependabot-preview[bot] <dependabot-preview[bot]@users.noreply.github.com> <27856297+dependabot-preview[bot]@users.noreply.github.com>
-dependabot[bot] <dependabot[bot]@users.noreply.github.com>
+dependabot[bot] <dependabot[bot]@users.noreply.github.com> <49699333+dependabot[bot]@users.noreply.github.com>
 derekriemer <derek.riemer@colorado.edu>
 desbma <desbma@users.noreply.github.com>
 Dmitry Saveliev (dsaveliev) <d.e.saveliev@gmail.com>
@@ -87,6 +94,7 @@ Dominik Heidler (asdil12) <dominik@heidler.eu>
 Elias Jarlebring (jarlebring) <jarlebring@gmail.com>
 Elliot Huffman <thelich2@gmail.com>
 Emil Hessman (ceh) <emil@hessman.se>
+Eric Lesiuta <elesiuta@gmail.com>
 Erik Meitner (WSGCSysadmin) <e.meitner@willystreet.coop>
 Evgeny Kuznetsov <evgeny@kuznetsov.md>
 Federico Castagnini (facastagnini) <federico.castagnini@gmail.com>
@@ -95,6 +103,7 @@ Felix Lampe <mail@flampe.de>
 Felix Unterpaintner (bigbear2nd) <bigbear2nd@gmail.com>
 Francois-Xavier Gsell (zukoo) <fxgsell@gmail.com>
 Frank Isemann (fti7) <frank@isemann.name>
+Gahl Saraf <saraf.gahl@gmail.com>
 georgespatton <georgespatton@users.noreply.github.com>
 ghjklw <malo@jaffre.info>
 Gilli Sigurdsson (gillisig) <gilli@vx.is>
@@ -108,6 +117,7 @@ Heiko Zuerker (Smiley73) <heiko@zuerker.org>
 Hugo Locurcio <hugo.locurcio@hugo.pro>
 Iain Barnett <iainspeed@gmail.com>
 Ian Johnson (anonymouse64) <ian.johnson@canonical.com> <person.uwsome@gmail.com>
+Ikko Ashimine <eltociear@gmail.com>
 Ilya Brin <464157+ilyabrin@users.noreply.github.com>
 Iskander Sharipov (Alex) <quasilyte@gmail.com>
 Jaakko Hannikainen (jgke) <jgke@jgke.fi>
@@ -125,14 +135,17 @@ Jaya Chithra (jayachithra) <s.k.jayachithra@gmail.com>
 jelle van der Waa <jelle@vdwaa.nl>
 Jens Diemer (jedie) <github.com@jensdiemer.de> <git@jensdiemer.de>
 Jerry Jacobs (xor-gate) <jerry.jacobs@xor-gate.org> <xor-gate@users.noreply.github.com>
+Jesse Lucas <jesse@jesselucas.com>
 Jochen Voss (seehuhn) <voss@seehuhn.de>
 Johan Andersson <j@i19.se>
 Johan Vromans (sciurius) <jvromans@squirrel.nl>
 John Rinehart (fuzzybear3965) <johnrichardrinehart@gmail.com>
 Jonas Thelemann <e-mail@jonas-thelemann.de>
-Jonathan <artback@protonmail.com>
+Jonathan <artback@protonmail.com> <jonagn@gmail.com>
 Jonathan Cross <jcross@gmail.com>
+Jonta <359397+Jonta@users.noreply.github.com>
 Jose Manuel Delicado (jmdaweb) <jmdaweb@hotmail.com> <jmdaweb@users.noreply.github.com>
+jtagcat <git-514635f7@jtag.cat> <git-12dbd862@jtag.cat>
 Jörg Thalheim <Mic92@users.noreply.github.com>
 Jędrzej Kula <kula.jedrek@gmail.com>
 Kalle Laine <pahakalle@protonmail.com>
@@ -146,6 +159,7 @@ Kevin White, Jr. (kwhite17) <kevinwhite1710@gmail.com>
 klemens <ka7@github.com>
 Kurt Fitzner (Kudalufi) <kurt@va1der.ca> <kurt.fitzner@gmail.com>
 Lars K.W. Gohlke (lkwg82) <lkwg82@gmx.de>
+Lars Lehtonen <lars.lehtonen@gmail.com>
 Laurent Arnoud <laurent@spkdev.net>
 Laurent Etiemble (letiemble) <laurent.etiemble@gmail.com> <laurent.etiemble@monobjc.net>
 Leo Arias (elopio) <yo@elopio.net>
@@ -168,13 +182,16 @@ Matt Burke (burkemw3) <mburke@amplify.com> <burkemw3@gmail.com>
 Matt Robenolt <matt@ydekproductions.com>
 Matteo Ruina <matteo.ruina@gmail.com>
 Maurizio Tomasi <ziotom78@gmail.com>
+Max <github@germancoding.com>
 Max Schulze (kralo) <max.schulze@online.de> <kralo@users.noreply.github.com>
 MaximAL <almaximal@ya.ru>
 Maxime Thirouin <m@moox.io>
+mclang <1721600+mclang@users.noreply.github.com>
 Michael Jephcote (Rewt0r) <rewt0r@gmx.com> <Rewt0r@users.noreply.github.com>
 Michael Ploujnikov (plouj) <ploujj@gmail.com>
 Michael Rienstra <mrienstra@gmail.com>
 Michael Tilli (pyfisch) <pyfisch@gmail.com>
+MichaIng <micha@dietpi.com>
 Mike Boone <mike@boonedocks.net>
 MikeLund <MikeLund@users.noreply.github.com>
 MikolajTwarog <43782609+MikolajTwarog@users.noreply.github.com>
@@ -193,6 +210,7 @@ NoLooseEnds <jon.koslung@gmail.com>
 Oliver Freyermuth <o.freyermuth@googlemail.com>
 otbutz <tbutz@optitool.de>
 Otiel <Otiel@users.noreply.github.com>
+overkill <22098433+0verk1ll@users.noreply.github.com>
 Oyebanji Jacob Mayowa <oyebanji05@gmail.com>
 Pablo <pbaeyens31+github@gmail.com>
 Pascal Jungblut (pascalj) <github@pascalj.com> <mail@pascal-jungblut.com>
@@ -204,15 +222,18 @@ Peter Badida <KeyWeeUsr@users.noreply.github.com>
 Peter Dave Hello <hsu@peterdavehello.org>
 Peter Hoeg (peterhoeg) <peter@speartail.com>
 Peter Marquardt (wwwutz) <wwwutz@gmail.com> <wwwutz@googlemail.com>
+Phani Rithvij <phanirithvij2000@gmail.com>
 Phil Davis <phil.davis@inf.org>
 Philippe Schommers (filoozoom) <philippe@schommers.be>
 Phill Luby (pluby) <phill.luby@newredo.com>
 Pier Paolo Ramon <ramonpierre@gmail.com>
 Piotr Bejda (piobpl) <piotrb10@gmail.com>
 Pramodh KP (pramodhkp) <pramodh.p@directi.com> <1507241+pramodhkp@users.noreply.github.com>
+Quentin Hibon <qh.public@yahoo.com>
 Rahmi Pruitt <rjpruitt16@gmail.com>
 Richard Hartmann <RichiH@users.noreply.github.com>
 Robert Carosi (nov1n) <robert@carosi.nl>
+Roberto Santalla <roobre@users.noreply.github.com>
 Robin Schoonover <robin@cornhooves.org>
 Roman Zaynetdinov (zaynetro) <romanznet@gmail.com>
 Ross Smith II (rasa) <ross@smithii.com>
@@ -228,6 +249,7 @@ Simon Mwepu <simonmwepu@gmail.com>
 Sly_tom_cat <slytomcat@mail.ru>
 Stefan Kuntz (Stefan-Code) <stefan.github@gmail.com> <Stefan.github@gmail.com>
 Stefan Tatschner (rumpelsepp) <stefan@sevenbyte.org> <rumpelsepp@sevenbyte.org> <stefan@rumpelsepp.org>
+Steven Eckhoff <steven.eckhoff.opensource@gmail.com>
 Suhas Gundimeda (snugghash) <suhas.gundimeda@gmail.com> <snugghash@gmail.com>
 Taylor Khan (nelsonkhan) <nelsonkhan@gmail.com>
 Thomas Hipp <thomashipp@gmail.com>
@@ -246,9 +268,10 @@ Unrud (Unrud) <unrud@openaliasbox.org> <Unrud@users.noreply.github.com>
 Veeti Paananen (veeti) <veeti.paananen@rojekti.fi>
 Victor Buinsky (buinsky) <vix_booja@tut.by>
 Vil Brekin (Vilbrekin) <vilbrekin@gmail.com>
-Vladimir Rusinov <vrusinov@google.com>
+Vladimir Rusinov <vrusinov@google.com> <vladimir.rusinov@gmail.com>
 wangguoliang <liangcszzu@163.com>
 William A. Kennington III (wkennington) <william@wkennington.com>
+wouter bolsterlee <wouter@bolsterl.ee>
 Wulf Weich (wweich) <wweich@users.noreply.github.com> <wweich@gmx.de> <wulf@weich-kr.de>
 xarx00 <xarx00@users.noreply.github.com>
 Xavier O. (damajor) <damajor@gmail.com>
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 ## Reporting Bugs

-Please file bugs in the [Github Issue
+Please file bugs in the [GitHub Issue
 Tracker](https://github.com/syncthing/syncthing/issues). Include at
 least the following:

--- a/2
+++ b/2
@@ -11,7 +11,7 @@ RUN rm -f syncthing && go run build.go -no-upgrade build syncthing

 FROM alpine

-EXPOSE 8384 22000 21027/udp
+EXPOSE 8384 22000/tcp 22000/udp 21027/udp

 VOLUME ["/var/syncthing"]

--- a/Dockerfile.builder
+++ b/Dockerfile.builder
@@ -6,4 +6,4 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 	locales rubygems ruby-dev build-essential git \
 	&& apt-get clean \
 	&& rm -rf /var/lib/apt/lists/* \
-	&& gem install --no-ri --no-rdoc fpm
+	&& gem install fpm
--- a/Dockerfile.buildx
+++ b/Dockerfile.buildx
@@ -1,7 +1,7 @@
 FROM alpine
 ARG TARGETARCH

-EXPOSE 8384 22000 21027/udp
+EXPOSE 8384 22000/tcp 22000/udp 21027/udp

 VOLUME ["/var/syncthing"]

--- a/README-Docker.md
+++ b/README-Docker.md
@@ -7,17 +7,42 @@ Use the `/var/syncthing` volume to have the synchronized files available on the
 host. You can add more folders and map them as you prefer.

 Note that Syncthing runs as UID 1000 and GID 1000 by default. These may be
-altered with the ``PUID`` and ``PGID`` environment variables.
+altered with the ``PUID`` and ``PGID`` environment variables. In addition
+the name of the Syncthing instance can be optionally defined by using
+``--hostname=syncthing`` parameter.

 ## Example Usage

+**Docker cli**
 ```
 $ docker pull syncthing/syncthing
-$ docker run -p 8384:8384 -p 22000:22000 \
+$ docker run -p 8384:8384 -p 22000:22000/tcp -p 22000:22000/udp \
    -v /wherever/st-sync:/var/syncthing \
+    --hostname=my-syncthing \
    syncthing/syncthing:latest
 ```

+**Docker compose**
+```
+---
+version: "3"
+services:
+  syncthing:
+    image: syncthing/syncthing
+    container_name: syncthing
+    hostname: my-syncthing
+    environment:
+      - PUID=1000
+      - PGID=1000
+    volumes:
+      - /wherever/st-sync:/var/syncthing
+    ports:
+      - 8384:8384
+      - 22000:22000/tcp
+      - 22000:22000/udp
+    restart: unless-stopped
+```
+
 ## Discovery

 Note that local device discovery will not work with the above command,
--- a/README.md
+++ b/README.md
@@ -73,14 +73,13 @@ This helps the team understand what are the biggest pain points for our users, a

 ## Getting in Touch

-The first and best point of contact is the [Forum][8]. There is also an IRC
-channel, `#syncthing` on [freenode][4] (with a [web client][9]), for talking
-directly to developers and users. If you've found something that is clearly a
+The first and best point of contact is the [Forum][8].
+If you've found something that is clearly a
 bug, feel free to report it in the [GitHub issue tracker][10].

 ## Building

-Building Syncthing from source is easy, and there's a [guide][5]
+Building Syncthing from source is easy, and there's [a guide][5]
 that describes it for both Unix and Windows systems.

 ## Signed Releases
@@ -95,19 +94,17 @@ binaries are also properly code signed.

 ## Documentation

-Please see the [Syncthing documentation site][6].
+Please see the Syncthing [documentation site][6] [[source]][17].

 All code is licensed under the [MPLv2 License][7].

 [1]: https://docs.syncthing.net/specs/bep-v1.html
 [2]: https://docs.syncthing.net/intro/getting-started.html
 [3]: https://github.com/syncthing/syncthing/blob/main/etc
-[4]: https://www.freenode.net/
 [5]: https://docs.syncthing.net/dev/building.html
 [6]: https://docs.syncthing.net/
 [7]: https://github.com/syncthing/syncthing/blob/main/LICENSE
 [8]: https://forum.syncthing.net/
-[9]: https://kiwiirc.com/client/irc.freenode.net/#syncthing
 [10]: https://github.com/syncthing/syncthing/issues
 [11]: https://docs.syncthing.net/users/contrib.html#gui-wrappers
 [12]: https://www.bountysource.com/teams/syncthing/issues
@@ -115,4 +112,4 @@ All code is licensed under the [MPLv2 License][7].
 [14]: assets/logo-text-128.png
 [15]: https://syncthing.net/
 [16]: https://github.com/syncthing/syncthing/blob/main/README-Docker.md
-
+[17]: https://github.com/syncthing/docs
--- a/build.go
+++ b/build.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.

+//go:build ignore
 // +build ignore

 package main
@@ -14,13 +15,11 @@ import (
 	"bytes"
 	"compress/flate"
 	"compress/gzip"
-	"crypto/sha256"
 	"encoding/json"
 	"errors"
 	"flag"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"os"
 	"os/exec"
@@ -30,27 +29,31 @@ import (
 	"runtime"
 	"strconv"
 	"strings"
+	"text/template"
 	"time"
 )

 var (
-	goarch        string
-	goos          string
-	noupgrade     bool
-	version       string
-	goCmd         string
-	race          bool
-	debug         = os.Getenv("BUILDDEBUG") != ""
-	extraTags     string
-	installSuffix string
-	pkgdir        string
-	cc            string
-	run           string
-	benchRun      string
-	debugBinary   bool
-	coverage      bool
-	timeout       = "120s"
-	numVersions   = 5
+	goarch         string
+	goos           string
+	noupgrade      bool
+	version        string
+	goCmd          string
+	race           bool
+	debug          = os.Getenv("BUILDDEBUG") != ""
+	extraTags      string
+	installSuffix  string
+	pkgdir         string
+	cc             string
+	run            string
+	benchRun       string
+	debugBinary    bool
+	coverage       bool
+	long           bool
+	timeout        = "120s"
+	longTimeout    = "600s"
+	numVersions    = 5
+	withNextGenGUI = os.Getenv("BUILD_NEXT_GEN_GUI") != ""
 )

 type target struct {
@@ -58,12 +61,11 @@ type target struct {
 	debname           string
 	debdeps           []string
 	debpre            string
-	debpost           string
 	description       string
 	buildPkgs         []string
 	binaryName        string
 	archiveFiles      []archiveFile
-	systemdServices   []string
+	systemdService    string
 	installationFiles []archiveFile
 	tags              []string
 }
@@ -85,7 +87,6 @@ var targets = map[string]target{
 		name:        "syncthing",
 		debname:     "syncthing",
 		debdeps:     []string{"libc6", "procps"},
-		debpost:     "script/post-upgrade",
 		description: "Open Source Continuous File Synchronization",
 		buildPkgs:   []string{"github.com/syncthing/syncthing/cmd/syncthing"},
 		binaryName:  "syncthing", // .exe will be added automatically for Windows builds
@@ -96,6 +97,7 @@ var targets = map[string]target{
 			{src: "AUTHORS", dst: "AUTHORS.txt", perm: 0644},
 			// All files from etc/ and extra/ added automatically in init().
 		},
+		systemdService: "syncthing@*.service",
 		installationFiles: []archiveFile{
 			{src: "{{binary}}", dst: "deb/usr/bin/{{binary}}", perm: 0755},
 			{src: "README.md", dst: "deb/usr/share/doc/syncthing/README.txt", perm: 0644},
@@ -114,6 +116,7 @@ var targets = map[string]target{
 			{src: "etc/linux-systemd/system/syncthing@.service", dst: "deb/lib/systemd/system/syncthing@.service", perm: 0644},
 			{src: "etc/linux-systemd/system/syncthing-resume.service", dst: "deb/lib/systemd/system/syncthing-resume.service", perm: 0644},
 			{src: "etc/linux-systemd/user/syncthing.service", dst: "deb/usr/lib/systemd/user/syncthing.service", perm: 0644},
+			{src: "etc/linux-sysctl/30-syncthing.conf", dst: "deb/usr/lib/sysctl.d/30-syncthing.conf", perm: 0644},
 			{src: "etc/firewall-ufw/syncthing", dst: "deb/etc/ufw/applications.d/syncthing", perm: 0644},
 			{src: "etc/linux-desktop/syncthing-start.desktop", dst: "deb/usr/share/applications/syncthing-start.desktop", perm: 0644},
 			{src: "etc/linux-desktop/syncthing-ui.desktop", dst: "deb/usr/share/applications/syncthing-ui.desktop", perm: 0644},
@@ -139,15 +142,14 @@ var targets = map[string]target{
 			{src: "LICENSE", dst: "LICENSE.txt", perm: 0644},
 			{src: "AUTHORS", dst: "AUTHORS.txt", perm: 0644},
 		},
-		systemdServices: []string{
-			"cmd/stdiscosrv/etc/linux-systemd/stdiscosrv.service",
-		},
+		systemdService: "stdiscosrv.service",
 		installationFiles: []archiveFile{
 			{src: "{{binary}}", dst: "deb/usr/bin/{{binary}}", perm: 0755},
 			{src: "cmd/stdiscosrv/README.md", dst: "deb/usr/share/doc/syncthing-discosrv/README.txt", perm: 0644},
 			{src: "LICENSE", dst: "deb/usr/share/doc/syncthing-discosrv/LICENSE.txt", perm: 0644},
 			{src: "AUTHORS", dst: "deb/usr/share/doc/syncthing-discosrv/AUTHORS.txt", perm: 0644},
 			{src: "man/stdiscosrv.1", dst: "deb/usr/share/man/man1/stdiscosrv.1", perm: 0644},
+			{src: "cmd/stdiscosrv/etc/linux-systemd/stdiscosrv.service", dst: "deb/lib/systemd/system/stdiscosrv.service", perm: 0644},
 			{src: "cmd/stdiscosrv/etc/linux-systemd/default", dst: "deb/etc/default/syncthing-discosrv", perm: 0644},
 			{src: "cmd/stdiscosrv/etc/firewall-ufw/stdiscosrv", dst: "deb/etc/ufw/applications.d/stdiscosrv", perm: 0644},
 		},
@@ -168,9 +170,7 @@ var targets = map[string]target{
 			{src: "LICENSE", dst: "LICENSE.txt", perm: 0644},
 			{src: "AUTHORS", dst: "AUTHORS.txt", perm: 0644},
 		},
-		systemdServices: []string{
-			"cmd/strelaysrv/etc/linux-systemd/strelaysrv.service",
-		},
+		systemdService: "strelaysrv.service",
 		installationFiles: []archiveFile{
 			{src: "{{binary}}", dst: "deb/usr/bin/{{binary}}", perm: 0755},
 			{src: "cmd/strelaysrv/README.md", dst: "deb/usr/share/doc/syncthing-relaysrv/README.txt", perm: 0644},
@@ -178,6 +178,7 @@ var targets = map[string]target{
 			{src: "LICENSE", dst: "deb/usr/share/doc/syncthing-relaysrv/LICENSE.txt", perm: 0644},
 			{src: "AUTHORS", dst: "deb/usr/share/doc/syncthing-relaysrv/AUTHORS.txt", perm: 0644},
 			{src: "man/strelaysrv.1", dst: "deb/usr/share/man/man1/strelaysrv.1", perm: 0644},
+			{src: "cmd/strelaysrv/etc/linux-systemd/strelaysrv.service", dst: "deb/lib/systemd/system/strelaysrv.service", perm: 0644},
 			{src: "cmd/strelaysrv/etc/linux-systemd/default", dst: "deb/etc/default/syncthing-relaysrv", perm: 0644},
 			{src: "cmd/strelaysrv/etc/firewall-ufw/strelaysrv", dst: "deb/etc/ufw/applications.d/strelaysrv", perm: 0644},
 		},
@@ -204,19 +205,7 @@ var targets = map[string]target{
 	},
 }

-// These are repos we need to clone to run "go generate"
-
-type dependencyRepo struct {
-	path   string
-	repo   string
-	commit string
-}
-
-var dependencyRepos = []dependencyRepo{
-	{path: "xdr", repo: "https://github.com/calmh/xdr.git", commit: "08e072f9cb16"},
-}
-
-func init() {
+func initTargets() {
 	all := targets["all"]
 	pkgs, _ := filepath.Glob("cmd/*")
 	for _, pkg := range pkgs {
@@ -225,6 +214,9 @@ func init() {
 			// ignore dotfiles
 			continue
 		}
+		if noupgrade && pkg == "stupgrades" {
+			continue
+		}
 		all.buildPkgs = append(all.buildPkgs, fmt.Sprintf("github.com/syncthing/syncthing/cmd/%s", pkg))
 	}
 	targets["all"] = all
@@ -256,6 +248,8 @@ func main() {
 		}()
 	}

+	initTargets()
+
 	// Invoking build.go with no parameters at all builds everything (incrementally),
 	// which is what you want for maximum error checking during development.
 	if flag.NArg() == 0 {
@@ -278,22 +272,18 @@ func main() {
 }

 func runCommand(cmd string, target target) {
+	var tags []string
+	if noupgrade {
+		tags = []string{"noupgrade"}
+	}
+	tags = append(tags, strings.Fields(extraTags)...)
+
 	switch cmd {
 	case "install":
-		var tags []string
-		if noupgrade {
-			tags = []string{"noupgrade"}
-		}
-		tags = append(tags, strings.Fields(extraTags)...)
 		install(target, tags)
 		metalintShort()

 	case "build":
-		var tags []string
-		if noupgrade {
-			tags = []string{"noupgrade"}
-		}
-		tags = append(tags, strings.Fields(extraTags)...)
 		build(target, tags)

 	case "test":
@@ -311,9 +301,15 @@ func runCommand(cmd string, target target) {
 	case "assets":
 		rebuildAssets()

+	case "update-deps":
+		updateDependencies()
+
 	case "proto":
 		proto()

+	case "testmocks":
+		testmocks()
+
 	case "translate":
 		translate()

@@ -321,10 +317,10 @@ func runCommand(cmd string, target target) {
 		transifex()

 	case "tar":
-		buildTar(target)
+		buildTar(target, tags)

 	case "zip":
-		buildZip(target)
+		buildZip(target, tags)

 	case "deb":
 		buildDeb(target)
@@ -373,9 +369,11 @@ func parseFlags() {
 	flag.StringVar(&cc, "cc", os.Getenv("CC"), "Set CC environment variable for `go build`")
 	flag.BoolVar(&debugBinary, "debug-binary", debugBinary, "Create unoptimized binary to use with delve, set -gcflags='-N -l' and omit -ldflags")
 	flag.BoolVar(&coverage, "coverage", coverage, "Write coverage profile of tests to coverage.txt")
+	flag.BoolVar(&long, "long", long, "Run tests without the -short flag")
 	flag.IntVar(&numVersions, "num-versions", numVersions, "Number of versions for changelog command")
 	flag.StringVar(&run, "run", "", "Specify which tests to run")
 	flag.StringVar(&benchRun, "bench", "", "Specify which benchmarks to run")
+	flag.BoolVar(&withNextGenGUI, "with-next-gen-gui", withNextGenGUI, "Also build 'newgui'")
 	flag.Parse()
 }

@@ -383,7 +381,13 @@ func test(tags []string, pkgs ...string) {
 	lazyRebuildAssets()

 	tags = append(tags, "purego")
-	args := []string{"test", "-short", "-timeout", timeout, "-tags", strings.Join(tags, " ")}
+	args := []string{"test", "-tags", strings.Join(tags, " ")}
+	if long {
+		timeout = longTimeout
+	} else {
+		args = append(args, "-short")
+	}
+	args = append(args, "-timeout", timeout)

 	if runtime.GOARCH == "amd64" {
 		switch runtime.GOOS {
@@ -442,6 +446,10 @@ func benchArgs() []string {
 }

 func install(target target, tags []string) {
+	if (target.name == "syncthing" || target.name == "") && !withNextGenGUI {
+		log.Println("Notice: Next generation GUI will not be built; see --with-next-gen-gui.")
+	}
+
 	lazyRebuildAssets()

 	tags = append(target.tags, tags...)
@@ -465,12 +473,16 @@ func install(target target, tags []string) {
 		defer shouldCleanupSyso(sysoPath)
 	}

-	args := []string{"install", "-v", "-trimpath"}
+	args := []string{"install", "-v"}
 	args = appendParameters(args, tags, target.buildPkgs...)
 	runPrint(goCmd, args...)
 }

 func build(target target, tags []string) {
+	if (target.name == "syncthing" || target.name == "") && !withNextGenGUI {
+		log.Println("Notice: Next generation GUI will not be built; see --with-next-gen-gui.")
+	}
+
 	lazyRebuildAssets()
 	tags = append(target.tags, tags...)

@@ -493,7 +505,7 @@ func build(target target, tags []string) {
 		defer shouldCleanupSyso(sysoPath)
 	}

-	args := []string{"build", "-v", "-trimpath"}
+	args := []string{"build", "-v"}
 	args = appendParameters(args, tags, target.buildPkgs...)
 	runPrint(goCmd, args...)
 }
@@ -527,26 +539,27 @@ func appendParameters(args []string, tags []string, pkgs ...string) []string {

 	if !debugBinary {
 		// Regular binaries get version tagged and skip some debug symbols
-		args = append(args, "-ldflags", ldflags(tags))
+		args = append(args, "-trimpath", "-ldflags", ldflags(tags))
 	} else {
 		// -gcflags to disable optimizations and inlining. Skip -ldflags
 		// because `Could not launch program: decoding dwarf section info at
 		// offset 0x0: too short` on 'dlv exec ...' see
-		// https://github.com/derekparker/delve/issues/79
-		args = append(args, "-gcflags", "-N -l")
+		// https://github.com/go-delve/delve/issues/79
+		args = append(args, "-gcflags", "all=-N -l")
 	}

 	return append(args, pkgs...)
 }

-func buildTar(target target) {
+func buildTar(target target, tags []string) {
 	name := archiveName(target)
 	filename := name + ".tar.gz"

-	var tags []string
-	if noupgrade {
-		tags = []string{"noupgrade"}
-		name += "-noupgrade"
+	for _, tag := range tags {
+		if tag == "noupgrade" {
+			name += "-noupgrade"
+			break
+		}
 	}

 	build(target, tags)
@@ -562,14 +575,15 @@ func buildTar(target target) {
 	fmt.Println(filename)
 }

-func buildZip(target target) {
+func buildZip(target target, tags []string) {
 	name := archiveName(target)
 	filename := name + ".zip"

-	var tags []string
-	if noupgrade {
-		tags = []string{"noupgrade"}
-		name += "-noupgrade"
+	for _, tag := range tags {
+		if tag == "noupgrade" {
+			name += "-noupgrade"
+			break
+		}
 	}

 	build(target, tags)
@@ -637,11 +651,13 @@ func buildDeb(target target) {
 	for _, dep := range target.debdeps {
 		args = append(args, "-d", dep)
 	}
-	for _, service := range target.systemdServices {
-		args = append(args, "--deb-systemd", service)
-	}
-	if target.debpost != "" {
-		args = append(args, "--after-upgrade", target.debpost)
+	if target.systemdService != "" {
+		debpost, err := createPostInstScript(target)
+		defer os.Remove(debpost)
+		if err != nil {
+			log.Fatal(err)
+		}
+		args = append(args, "--after-upgrade", debpost)
 	}
 	if target.debpre != "" {
 		args = append(args, "--before-install", target.debpre)
@@ -649,6 +665,28 @@ func buildDeb(target target) {
 	runPrint("fpm", args...)
 }

+func createPostInstScript(target target) (string, error) {
+	scriptname := filepath.Join("script", "deb-post-inst.template")
+	t, err := template.ParseFiles(scriptname)
+	if err != nil {
+		return "", err
+	}
+	scriptname = strings.TrimSuffix(scriptname, ".template")
+	w, err := os.Create(scriptname)
+	if err != nil {
+		return "", err
+	}
+	defer w.Close()
+	if err = t.Execute(w, struct {
+		Service, Command string
+	}{
+		target.systemdService, target.binaryName,
+	}); err != nil {
+		return "", err
+	}
+	return scriptname, nil
+}
+
 func shouldBuildSyso(dir string) (string, error) {
 	type M map[string]interface{}
 	version := getVersion()
@@ -668,11 +706,14 @@ func shouldBuildSyso(dir string) (string, error) {
 			},
 		},
 		"StringFileInfo": M{
-			"FileDescription": "Open Source Continuous File Synchronization",
-			"LegalCopyright":  "The Syncthing Authors",
-			"FileVersion":     version,
-			"ProductVersion":  version,
-			"ProductName":     "Syncthing",
+			"CompanyName":      "The Syncthing Authors",
+			"FileDescription":  "Syncthing - Open Source Continuous File Synchronization",
+			"FileVersion":      version,
+			"InternalName":     "syncthing",
+			"LegalCopyright":   "The Syncthing Authors",
+			"OriginalFilename": "syncthing",
+			"ProductName":      "Syncthing",
+			"ProductVersion":   version,
 		},
 		"IconPath": "assets/logo.ico",
 	})
@@ -681,7 +722,7 @@ func shouldBuildSyso(dir string) (string, error) {
 	}

 	jsonPath := filepath.Join(dir, "versioninfo.json")
-	err = ioutil.WriteFile(jsonPath, bs, 0644)
+	err = os.WriteFile(jsonPath, bs, 0644)
 	if err != nil {
 		return "", errors.New("failed to create " + jsonPath + ": " + err.Error())
 	}
@@ -694,7 +735,13 @@ func shouldBuildSyso(dir string) (string, error) {

 	sysoPath := filepath.Join(dir, "cmd", "syncthing", "resource.syso")

-	if _, err := runError("goversioninfo", "-o", sysoPath); err != nil {
+	// See https://github.com/josephspurrier/goversioninfo#command-line-flags
+	armOption := ""
+	if strings.Contains(goarch, "arm") {
+		armOption = "-arm=true"
+	}
+
+	if _, err := runError("goversioninfo", "-o", sysoPath, armOption); err != nil {
 		return "", errors.New("failed to create " + sysoPath + ": " + err.Error())
 	}

@@ -714,12 +761,12 @@ func shouldCleanupSyso(sysoFilePath string) {
 // exists. The permission bits are copied as well. If dst already exists and
 // the contents are identical to src the modification time is not updated.
 func copyFile(src, dst string, perm os.FileMode) error {
-	in, err := ioutil.ReadFile(src)
+	in, err := os.ReadFile(src)
 	if err != nil {
 		return err
 	}

-	out, err := ioutil.ReadFile(dst)
+	out, err := os.ReadFile(dst)
 	if err != nil {
 		// The destination probably doesn't exist, we should create
 		// it.
@@ -735,7 +782,7 @@ func copyFile(src, dst string, perm os.FileMode) error {

 copy:
 	os.MkdirAll(filepath.Dir(dst), 0777)
-	if err := ioutil.WriteFile(dst, in, perm); err != nil {
+	if err := os.WriteFile(dst, in, perm); err != nil {
 		return err
 	}

@@ -763,11 +810,46 @@ func rebuildAssets() {
 }

 func lazyRebuildAssets() {
-	if shouldRebuildAssets("lib/api/auto/gui.files.go", "gui") || shouldRebuildAssets("cmd/strelaypoolsrv/auto/gui.files.go", "cmd/strelaypoolsrv/gui") {
+	shouldRebuild := shouldRebuildAssets("lib/api/auto/gui.files.go", "gui") ||
+		shouldRebuildAssets("cmd/strelaypoolsrv/auto/gui.files.go", "cmd/strelaypoolsrv/gui")
+
+	if withNextGenGUI {
+		shouldRebuild = buildNextGenGUI() || shouldRebuild
+	}
+
+	if shouldRebuild {
 		rebuildAssets()
 	}
 }

+func buildNextGenGUI() bool {
+	// Check if we need to run the npm process, and if so also set the flag
+	// to rebuild Go assets afterwards. The index.html is regenerated every
+	// time by the build process. This assumes the new GUI ends up in
+	// next-gen-gui/dist/next-gen-gui.
+
+	if !shouldRebuildAssets("gui/next-gen-gui/index.html", "next-gen-gui") {
+		// The GUI is up to date.
+		return false
+	}
+
+	runPrintInDir("next-gen-gui", "npm", "install")
+	runPrintInDir("next-gen-gui", "npm", "run", "build", "--", "--prod", "--subresource-integrity")
+
+	rmr("gui/tech-ui")
+
+	for _, src := range listFiles("next-gen-gui/dist") {
+		rel, _ := filepath.Rel("next-gen-gui/dist", src)
+		dst := filepath.Join("gui", rel)
+		if err := copyFile(src, dst, 0644); err != nil {
+			fmt.Println("copy:", err)
+			os.Exit(1)
+		}
+	}
+
+	return true
+}
+
 func shouldRebuildAssets(target, srcdir string) bool {
 	info, err := os.Stat(target)
 	if err != nil {
@@ -794,27 +876,47 @@ func shouldRebuildAssets(target, srcdir string) bool {
 	return assetsAreNewer
 }

+func updateDependencies() {
+	runPrint(goCmd, "get", "-u", "./cmd/...")
+	runPrint(goCmd, "mod", "tidy", "-go=1.16", "-compat=1.16")
+
+	// We might have updated the protobuf package and should regenerate to match.
+	proto()
+}
+
 func proto() {
 	pv := protobufVersion()
-	dependencyRepos = append(dependencyRepos,
-		dependencyRepo{path: "protobuf", repo: "https://github.com/gogo/protobuf.git", commit: pv},
-	)
+	repo := "https://github.com/gogo/protobuf.git"
+	path := filepath.Join("repos", "protobuf")

-	runPrint(goCmd, "get", fmt.Sprintf("github.com/gogo/protobuf/protoc-gen-gogofast@%v", pv))
+	runPrint(goCmd, "install", fmt.Sprintf("github.com/gogo/protobuf/protoc-gen-gogofast@%v", pv))
 	os.MkdirAll("repos", 0755)
-	for _, dep := range dependencyRepos {
-		path := filepath.Join("repos", dep.path)
-		if _, err := os.Stat(path); err != nil {
-			runPrintInDir("repos", "git", "clone", dep.repo, dep.path)
-		} else {
-			runPrintInDir(path, "git", "fetch")
-		}
-		runPrintInDir(path, "git", "checkout", dep.commit)
+
+	if _, err := os.Stat(path); err != nil {
+		runPrint("git", "clone", repo, path)
+	} else {
+		runPrintInDir(path, "git", "fetch")
 	}
-	runPrint(goCmd, "generate", "github.com/syncthing/syncthing/lib/...", "github.com/syncthing/syncthing/cmd/stdiscosrv")
+	runPrintInDir(path, "git", "checkout", pv)
+
+	runPrint(goCmd, "generate", "github.com/syncthing/syncthing/cmd/stdiscosrv")
 	runPrint(goCmd, "generate", "proto/generate.go")
 }

+func testmocks() {
+	args := []string{
+		"generate",
+		"github.com/syncthing/syncthing/lib/config",
+		"github.com/syncthing/syncthing/lib/connections",
+		"github.com/syncthing/syncthing/lib/discover",
+		"github.com/syncthing/syncthing/lib/events",
+		"github.com/syncthing/syncthing/lib/logger",
+		"github.com/syncthing/syncthing/lib/model",
+		"github.com/syncthing/syncthing/lib/protocol",
+	}
+	runPrint(goCmd, args...)
+}
+
 func translate() {
 	os.Chdir("gui/default/assets/lang")
 	runPipe("lang-en-new.json", goCmd, "run", "../../../../script/translate.go", "lang-en.json", "../../../")
@@ -855,7 +957,7 @@ func rmr(paths ...string) {
 }

 func getReleaseVersion() (string, error) {
-	bs, err := ioutil.ReadFile("RELEASE")
+	bs, err := os.ReadFile("RELEASE")
 	if err != nil {
 		return "", err
 	}
@@ -1187,11 +1289,11 @@ func zipFile(out string, files []archiveFile) {

 		if strings.HasSuffix(f.dst, ".txt") {
 			// Text file. Read it and convert line endings.
-			bs, err := ioutil.ReadAll(sf)
+			bs, err := io.ReadAll(sf)
 			if err != nil {
 				log.Fatal(err)
 			}
-			bs = bytes.Replace(bs, []byte{'\n'}, []byte{'\n', '\r'}, -1)
+			bs = bytes.Replace(bs, []byte{'\n'}, []byte{'\r', '\n'}, -1)
 			fh.UncompressedSize = uint32(len(bs))
 			fh.UncompressedSize64 = uint64(len(bs))

@@ -1298,32 +1400,6 @@ func metalintShort() {
 	runPrint(goCmd, "test", "-short", "-run", "Metalint", "./meta")
 }

-func temporaryBuildDir() (string, error) {
-	// The base of our temp dir is "syncthing-xxxxxxxx" where the x:es
-	// are eight bytes from the sha256 of our working directory. We do
-	// this because we want a name in the global temp dir that doesn't
-	// conflict with someone else building syncthing on the same
-	// machine, yet is persistent between runs from the same source
-	// directory.
-	wd, err := os.Getwd()
-	if err != nil {
-		return "", err
-	}
-	hash := sha256.Sum256([]byte(wd))
-	base := fmt.Sprintf("syncthing-%x", hash[:4])
-
-	// The temp dir is taken from $STTMPDIR if set, otherwise the system
-	// default (potentially infrluenced by $TMPDIR on unixes).
-	var tmpDir string
-	if t := os.Getenv("STTMPDIR"); t != "" {
-		tmpDir = t
-	} else {
-		tmpDir = os.TempDir()
-	}
-
-	return filepath.Join(tmpDir, base), nil
-}
-
 func (t target) BinaryName() string {
 	if goos == "windows" {
 		return t.binaryName + ".exe"
--- a/cmd/stcli/client.go
+++ b/cmd/stcli/client.go
@@ -1,96 +0,0 @@
-// Copyright (C) 2019 The Syncthing Authors.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at https://mozilla.org/MPL/2.0/.
-
-package main
-
-import (
-	"bytes"
-	"context"
-	"crypto/tls"
-	"errors"
-	"fmt"
-	"net"
-	"net/http"
-	"strings"
-
-	"github.com/syncthing/syncthing/lib/config"
-)
-
-type APIClient struct {
-	http.Client
-	cfg    config.GUIConfiguration
-	apikey string
-}
-
-func getClient(cfg config.GUIConfiguration) *APIClient {
-	httpClient := http.Client{
-		Transport: &http.Transport{
-			TLSClientConfig: &tls.Config{
-				InsecureSkipVerify: true,
-			},
-			DialContext: func(_ context.Context, _, _ string) (net.Conn, error) {
-				return net.Dial(cfg.Network(), cfg.Address())
-			},
-		},
-	}
-	return &APIClient{
-		Client: httpClient,
-		cfg:    cfg,
-		apikey: cfg.APIKey,
-	}
-}
-
-func (c *APIClient) Endpoint() string {
-	if c.cfg.Network() == "unix" {
-		return "http://unix/"
-	}
-	url := c.cfg.URL()
-	if !strings.HasSuffix(url, "/") {
-		url += "/"
-	}
-	return url
-}
-
-func (c *APIClient) Do(req *http.Request) (*http.Response, error) {
-	req.Header.Set("X-API-Key", c.apikey)
-	resp, err := c.Client.Do(req)
-	if err != nil {
-		return nil, err
-	}
-	return resp, checkResponse(resp)
-}
-
-func (c *APIClient) Get(url string) (*http.Response, error) {
-	request, err := http.NewRequest("GET", c.Endpoint()+"rest/"+url, nil)
-	if err != nil {
-		return nil, err
-	}
-	return c.Do(request)
-}
-
-func (c *APIClient) Post(url, body string) (*http.Response, error) {
-	request, err := http.NewRequest("POST", c.Endpoint()+"rest/"+url, bytes.NewBufferString(body))
-	if err != nil {
-		return nil, err
-	}
-	return c.Do(request)
-}
-
-func checkResponse(response *http.Response) error {
-	if response.StatusCode == 404 {
-		return errors.New("invalid endpoint or API call")
-	} else if response.StatusCode == 403 {
-		return errors.New("invalid API key")
-	} else if response.StatusCode != 200 {
-		data, err := responseToBArray(response)
-		if err != nil {
-			return err
-		}
-		body := strings.TrimSpace(string(data))
-		return fmt.Errorf("unexpected HTTP status returned: %s\n%s", response.Status, body)
-	}
-	return nil
-}
--- a/cmd/stcli/main.go
+++ b/cmd/stcli/main.go
@@ -1,192 +0,0 @@
-// Copyright (C) 2019 The Syncthing Authors.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at https://mozilla.org/MPL/2.0/.
-
-package main
-
-import (
-	"bufio"
-	"crypto/tls"
-	"encoding/json"
-	"flag"
-	"log"
-	"os"
-	"reflect"
-
-	"github.com/AudriusButkevicius/recli"
-	"github.com/flynn-archive/go-shlex"
-	"github.com/mattn/go-isatty"
-	"github.com/pkg/errors"
-	"github.com/syncthing/syncthing/lib/build"
-	"github.com/syncthing/syncthing/lib/config"
-	"github.com/syncthing/syncthing/lib/events"
-	"github.com/syncthing/syncthing/lib/locations"
-	"github.com/syncthing/syncthing/lib/protocol"
-	"github.com/urfave/cli"
-)
-
-func main() {
-	// This is somewhat a hack around a chicken and egg problem.
-	// We need to set the home directory and potentially other flags to know where the syncthing instance is running
-	// in order to get it's config ... which we then use to construct the actual CLI ... at which point it's too late
-	// to add flags there...
-	homeBaseDir := locations.GetBaseDir(locations.ConfigBaseDir)
-	guiCfg := config.GUIConfiguration{}
-
-	flags := flag.NewFlagSet("", flag.ContinueOnError)
-	flags.StringVar(&guiCfg.RawAddress, "gui-address", guiCfg.RawAddress, "Override GUI address (e.g. \"http://192.0.2.42:8443\")")
-	flags.StringVar(&guiCfg.APIKey, "gui-apikey", guiCfg.APIKey, "Override GUI API key")
-	flags.StringVar(&homeBaseDir, "home", homeBaseDir, "Set configuration directory")
-
-	// Implement the same flags at the lower CLI, with the same default values (pre-parse), but do nothing with them.
-	// This is so that we could reuse os.Args
-	fakeFlags := []cli.Flag{
-		cli.StringFlag{
-			Name:  "gui-address",
-			Value: guiCfg.RawAddress,
-			Usage: "Override GUI address (e.g. \"http://192.0.2.42:8443\")",
-		},
-		cli.StringFlag{
-			Name:  "gui-apikey",
-			Value: guiCfg.APIKey,
-			Usage: "Override GUI API key",
-		},
-		cli.StringFlag{
-			Name:  "home",
-			Value: homeBaseDir,
-			Usage: "Set configuration directory",
-		},
-	}
-
-	// Do not print usage of these flags, and ignore errors as this can't understand plenty of things
-	flags.Usage = func() {}
-	_ = flags.Parse(os.Args[1:])
-
-	// Now if the API key and address is not provided (we are not connecting to a remote instance),
-	// try to rip it out of the config.
-	if guiCfg.RawAddress == "" && guiCfg.APIKey == "" {
-		// Update the base directory
-		err := locations.SetBaseDir(locations.ConfigBaseDir, homeBaseDir)
-		if err != nil {
-			log.Fatal(errors.Wrap(err, "setting home"))
-		}
-
-		// Load the certs and get the ID
-		cert, err := tls.LoadX509KeyPair(
-			locations.Get(locations.CertFile),
-			locations.Get(locations.KeyFile),
-		)
-		if err != nil {
-			log.Fatal(errors.Wrap(err, "reading device ID"))
-		}
-
-		myID := protocol.NewDeviceID(cert.Certificate[0])
-
-		// Load the config
-		cfg, _, err := config.Load(locations.Get(locations.ConfigFile), myID, events.NoopLogger)
-		if err != nil {
-			log.Fatalln(errors.Wrap(err, "loading config"))
-		}
-
-		guiCfg = cfg.GUI()
-	} else if guiCfg.Address() == "" || guiCfg.APIKey == "" {
-		log.Fatalln("Both -gui-address and -gui-apikey should be specified")
-	}
-
-	if guiCfg.Address() == "" {
-		log.Fatalln("Could not find GUI Address")
-	}
-
-	if guiCfg.APIKey == "" {
-		log.Fatalln("Could not find GUI API key")
-	}
-
-	client := getClient(guiCfg)
-
-	cfg, err := getConfig(client)
-	original := cfg.Copy()
-	if err != nil {
-		log.Fatalln(errors.Wrap(err, "getting config"))
-	}
-
-	// Copy the config and set the default flags
-	recliCfg := recli.DefaultConfig
-	recliCfg.IDTag.Name = "xml"
-	recliCfg.SkipTag.Name = "json"
-
-	commands, err := recli.New(recliCfg).Construct(&cfg)
-	if err != nil {
-		log.Fatalln(errors.Wrap(err, "config reflect"))
-	}
-
-	// Construct the actual CLI
-	app := cli.NewApp()
-	app.Name = "stcli"
-	app.HelpName = app.Name
-	app.Author = "The Syncthing Authors"
-	app.Usage = "Syncthing command line interface"
-	app.Version = build.Version
-	app.Flags = fakeFlags
-	app.Metadata = map[string]interface{}{
-		"client": client,
-	}
-	app.Commands = []cli.Command{
-		{
-			Name:        "config",
-			HideHelp:    true,
-			Usage:       "Configuration modification command group",
-			Subcommands: commands,
-		},
-		showCommand,
-		operationCommand,
-		errorsCommand,
-	}
-
-	tty := isatty.IsTerminal(os.Stdin.Fd()) || isatty.IsCygwinTerminal(os.Stdin.Fd())
-	if !tty {
-		// Not a TTY, consume from stdin
-		scanner := bufio.NewScanner(os.Stdin)
-		for scanner.Scan() {
-			input, err := shlex.Split(scanner.Text())
-			if err != nil {
-				log.Fatalln(errors.Wrap(err, "parsing input"))
-			}
-			if len(input) == 0 {
-				continue
-			}
-			err = app.Run(append(os.Args, input...))
-			if err != nil {
-				log.Fatalln(err)
-			}
-		}
-		err = scanner.Err()
-		if err != nil {
-			log.Fatalln(err)
-		}
-	} else {
-		err = app.Run(os.Args)
-		if err != nil {
-			log.Fatalln(err)
-		}
-	}
-
-	if !reflect.DeepEqual(cfg, original) {
-		body, err := json.MarshalIndent(cfg, "", "  ")
-		if err != nil {
-			log.Fatalln(err)
-		}
-		resp, err := client.Post("system/config", string(body))
-		if err != nil {
-			log.Fatalln(err)
-		}
-		if resp.StatusCode != 200 {
-			body, err := responseToBArray(resp)
-			if err != nil {
-				log.Fatalln(err)
-			}
-			log.Fatalln(string(body))
-		}
-	}
-}
--- a/cmd/stcli/utils.go
+++ b/cmd/stcli/utils.go
@@ -1,94 +0,0 @@
-// Copyright (C) 2019 The Syncthing Authors.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at https://mozilla.org/MPL/2.0/.
-
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"os"
-
-	"github.com/syncthing/syncthing/lib/config"
-	"github.com/urfave/cli"
-)
-
-func responseToBArray(response *http.Response) ([]byte, error) {
-	bytes, err := ioutil.ReadAll(response.Body)
-	if err != nil {
-		return nil, err
-	}
-	return bytes, response.Body.Close()
-}
-
-func emptyPost(url string) cli.ActionFunc {
-	return func(c *cli.Context) error {
-		client := c.App.Metadata["client"].(*APIClient)
-		_, err := client.Post(url, "")
-		return err
-	}
-}
-
-func dumpOutput(url string) cli.ActionFunc {
-	return func(c *cli.Context) error {
-		client := c.App.Metadata["client"].(*APIClient)
-		response, err := client.Get(url)
-		if err != nil {
-			return err
-		}
-		return prettyPrintResponse(c, response)
-	}
-}
-
-func getConfig(c *APIClient) (config.Configuration, error) {
-	cfg := config.Configuration{}
-	response, err := c.Get("system/config")
-	if err != nil {
-		return cfg, err
-	}
-	bytes, err := responseToBArray(response)
-	if err != nil {
-		return cfg, err
-	}
-	err = json.Unmarshal(bytes, &cfg)
-	if err == nil {
-		return cfg, err
-	}
-	return cfg, nil
-}
-
-func expects(n int, actionFunc cli.ActionFunc) cli.ActionFunc {
-	return func(ctx *cli.Context) error {
-		if ctx.NArg() != n {
-			plural := ""
-			if n != 1 {
-				plural = "s"
-			}
-			return fmt.Errorf("expected %d argument%s, got %d", n, plural, ctx.NArg())
-		}
-		return actionFunc(ctx)
-	}
-}
-
-func prettyPrintJSON(data interface{}) error {
-	enc := json.NewEncoder(os.Stdout)
-	enc.SetIndent("", "  ")
-	return enc.Encode(data)
-}
-
-func prettyPrintResponse(c *cli.Context, response *http.Response) error {
-	bytes, err := responseToBArray(response)
-	if err != nil {
-		return err
-	}
-	var data interface{}
-	if err := json.Unmarshal(bytes, &data); err != nil {
-		return err
-	}
-	// TODO: Check flag for pretty print format
-	return prettyPrintJSON(data)
-}
--- a/cmd/stcompdirs/main.go
+++ b/cmd/stcompdirs/main.go
@@ -7,7 +7,6 @@
 package main

 import (
-	"crypto/md5"
 	"errors"
 	"flag"
 	"fmt"
@@ -15,6 +14,8 @@ import (
 	"log"
 	"os"
 	"path/filepath"
+
+	"github.com/syncthing/syncthing/lib/sha256"
 )

 func main() {
@@ -74,7 +75,7 @@ type fileInfo struct {
 	name string
 	mode os.FileMode
 	mod  int64
-	hash [16]byte
+	hash [sha256.Size]byte
 }

 func (f fileInfo) String() string {
@@ -106,11 +107,7 @@ func startWalker(dir string, res chan<- fileInfo, abort <-chan struct{}) chan er
 			if err != nil {
 				return err
 			}
-			h := md5.New()
-			h.Write([]byte(tgt))
-			hash := h.Sum(nil)
-
-			copy(f.hash[:], hash)
+			f.hash = sha256.Sum256([]byte(tgt))
 		} else if info.IsDir() {
 			f = fileInfo{
 				name: rn,
@@ -123,7 +120,7 @@ func startWalker(dir string, res chan<- fileInfo, abort <-chan struct{}) chan er
 				mode: info.Mode(),
 				mod:  info.ModTime().Unix(),
 			}
-			sum, err := md5file(path)
+			sum, err := sha256file(path)
 			if err != nil {
 				return err
 			}
@@ -150,14 +147,14 @@ func startWalker(dir string, res chan<- fileInfo, abort <-chan struct{}) chan er
 	return errc
 }

-func md5file(fname string) (hash [16]byte, err error) {
+func sha256file(fname string) (hash [sha256.Size]byte, err error) {
 	f, err := os.Open(fname)
 	if err != nil {
 		return
 	}
 	defer f.Close()

-	h := md5.New()
+	h := sha256.New()
 	io.Copy(h, f)
 	hb := h.Sum(nil)
 	copy(hash[:], hb)
--- a/cmd/stcrashreceiver/main.go
+++ b/cmd/stcrashreceiver/main.go
@@ -17,12 +17,10 @@ import (
 	"flag"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
-	"net"
 	"net/http"
 	"os"
-	"time"
+	"path/filepath"

 	"github.com/syncthing/syncthing/lib/sha256"
 	"github.com/syncthing/syncthing/lib/ur"
@@ -33,7 +31,7 @@ import (
 const maxRequestSize = 1 << 20 // 1 MiB

 func main() {
-	dir := flag.String("dir", ".", "Directory to store reports in")
+	dir := flag.String("dir", ".", "Parent directory to store crash and failure reports in")
 	dsn := flag.String("dsn", "", "Sentry DSN")
 	listen := flag.String("listen", ":22039", "HTTP listen address")
 	flag.Parse()
@@ -41,13 +39,13 @@ func main() {
 	mux := http.NewServeMux()

 	cr := &crashReceiver{
-		dir: *dir,
+		dir: filepath.Join(*dir, "crash_reports"),
 		dsn: *dsn,
 	}
 	mux.Handle("/", cr)

 	if *dsn != "" {
-		mux.HandleFunc("/failure", handleFailureFn(*dsn))
+		mux.HandleFunc("/newcrash/failure", handleFailureFn(*dsn, filepath.Join(*dir, "failure_reports")))
 	}

 	log.SetOutput(os.Stdout)
@@ -56,10 +54,10 @@ func main() {
 	}
 }

-func handleFailureFn(dsn string) func(w http.ResponseWriter, req *http.Request) {
+func handleFailureFn(dsn, failureDir string) func(w http.ResponseWriter, req *http.Request) {
 	return func(w http.ResponseWriter, req *http.Request) {
 		lr := io.LimitReader(req.Body, maxRequestSize)
-		bs, err := ioutil.ReadAll(lr)
+		bs, err := io.ReadAll(lr)
 		req.Body.Close()
 		if err != nil {
 			http.Error(w, err.Error(), 500)
@@ -74,6 +72,7 @@ func handleFailureFn(dsn string) func(w http.ResponseWriter, req *http.Request)
 		}
 		if len(reports) == 0 {
 			// Shouldn't happen
+			log.Printf("Got zero failure reports")
 			return
 		}

@@ -83,33 +82,44 @@ func handleFailureFn(dsn string) func(w http.ResponseWriter, req *http.Request)
 			return
 		}
 		for _, r := range reports {
-			pkt := packet(version)
+			pkt := packet(version, "failure")
 			pkt.Message = r.Description
 			pkt.Extra = raven.Extra{
 				"count": r.Count,
 			}
-			pkt.Fingerprint = []string{r.Description}
+			for k, v := range r.Extra {
+				pkt.Extra[k] = v
+			}
+			if len(r.Goroutines) != 0 {
+				url, err := saveFailureWithGoroutines(r.FailureData, failureDir)
+				if err != nil {
+					log.Println("Saving failure report:", err)
+					http.Error(w, "Internal server error", http.StatusInternalServerError)
+					return
+				}
+				pkt.Extra["goroutinesURL"] = url
+			}
+			message := sanitizeMessageLDB(r.Description)
+			pkt.Fingerprint = []string{message}

 			if err := sendReport(dsn, pkt, userIDFor(req)); err != nil {
-				log.Println("Failed to send  crash report:", err)
+				log.Println("Failed to send failure report:", err)
+			} else {
+				log.Println("Sent failure report:", r.Description)
 			}
 		}
 	}
 }

-// userIDFor returns a string we can use as the user ID for the purpose of
-// counting affected users. It's the truncated hash of a salt, the user
-// remote IP, and the current month.
-func userIDFor(req *http.Request) string {
-	addr := req.RemoteAddr
-	if fwd := req.Header.Get("x-forwarded-for"); fwd != "" {
-		addr = fwd
+func saveFailureWithGoroutines(data ur.FailureData, failureDir string) (string, error) {
+	bs := make([]byte, len(data.Description)+len(data.Goroutines))
+	copy(bs, data.Description)
+	copy(bs[len(data.Description):], data.Goroutines)
+	id := fmt.Sprintf("%x", sha256.Sum256(bs))
+	path := fullPathCompressed(failureDir, id)
+	err := compressAndWrite(bs, path)
+	if err != nil {
+		return "", err
 	}
-	if host, _, err := net.SplitHostPort(addr); err == nil {
-		addr = host
-	}
-	now := time.Now().Format("200601")
-	salt := "stcrashreporter"
-	hash := sha256.Sum256([]byte(salt + addr + now))
-	return fmt.Sprintf("%x", hash[:8])
+	return reportServer + path, nil
 }
--- a/cmd/stcrashreceiver/sentry.go
+++ b/cmd/stcrashreceiver/sentry.go
@@ -9,7 +9,7 @@ package main
 import (
 	"bytes"
 	"errors"
-	"io/ioutil"
+	"io"
 	"regexp"
 	"strings"
 	"sync"
@@ -93,7 +93,7 @@ func parseCrashReport(path string, report []byte) (*raven.Packet, error) {
 	}

 	r := bytes.NewReader(report)
-	ctx, err := stack.ParseDump(r, ioutil.Discard, false)
+	ctx, err := stack.ParseDump(r, io.Discard, false)
 	if err != nil {
 		return nil, err
 	}
@@ -122,7 +122,7 @@ func parseCrashReport(path string, report []byte) (*raven.Packet, error) {
 		}
 	}

-	pkt := packet(version)
+	pkt := packet(version, "crash")
 	pkt.Message = string(subjectLine)
 	pkt.Extra = raven.Extra{
 		"url": reportServer + path,
@@ -143,15 +143,20 @@ var (
 	ldbPathRe        = regexp.MustCompile(`(open|write|read) .+[\\/].+[\\/]index[^\\/]+[\\/][^\\/]+: `)
 )

-func crashReportFingerprint(message string) []string {
-	// Do not fingerprint on the stack in case of db corruption or fatal
-	// db io error - where it occurs doesn't matter.
-	orig := message
+func sanitizeMessageLDB(message string) string {
 	message = ldbPosRe.ReplaceAllString(message, "${1}x)")
 	message = ldbFileRe.ReplaceAllString(message, "${1}x${3}")
 	message = ldbChecksumRe.ReplaceAllString(message, "${1}X${3}X")
 	message = ldbInternalKeyRe.ReplaceAllString(message, "${1}x${2}x")
 	message = ldbPathRe.ReplaceAllString(message, "$1 x: ")
+	return message
+}
+
+func crashReportFingerprint(message string) []string {
+	// Do not fingerprint on the stack in case of db corruption or fatal
+	// db io error - where it occurs doesn't matter.
+	orig := message
+	message = sanitizeMessageLDB(message)
 	if message != orig {
 		return []string{message}
 	}
@@ -229,7 +234,7 @@ func parseVersion(line string) (version, error) {
 	return v, nil
 }

-func packet(version version) *raven.Packet {
+func packet(version version, reportType string) *raven.Packet {
 	pkt := &raven.Packet{
 		Platform:    "go",
 		Release:     version.tag,
@@ -242,6 +247,7 @@ func packet(version version) *raven.Packet {
 			raven.Tag{Key: "goos", Value: version.goos},
 			raven.Tag{Key: "goarch", Value: version.goarch},
 			raven.Tag{Key: "builder", Value: version.builder},
+			raven.Tag{Key: "report_type", Value: reportType},
 		},
 	}
 	if version.commit != "" {
--- a/cmd/stcrashreceiver/sentry_test.go
+++ b/cmd/stcrashreceiver/sentry_test.go
@@ -8,7 +8,7 @@ package main

 import (
 	"fmt"
-	"io/ioutil"
+	"os"
 	"testing"
 )

@@ -59,7 +59,7 @@ func TestParseVersion(t *testing.T) {
 }

 func TestParseReport(t *testing.T) {
-	bs, err := ioutil.ReadFile("_testdata/panic.log")
+	bs, err := os.ReadFile("_testdata/panic.log")
 	if err != nil {
 		t.Fatal(err)
 	}
--- a/cmd/stcrashreceiver/sourcecodeloader.go
+++ b/cmd/stcrashreceiver/sourcecodeloader.go
@@ -9,7 +9,7 @@ package main
 import (
 	"bytes"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"path/filepath"
 	"strings"
@@ -80,7 +80,7 @@ func (l *githubSourceCodeLoader) Load(filename string, line, context int) ([][]b
 			fmt.Println("Loading source:", resp.Status)
 			return nil, 0
 		}
-		data, err := ioutil.ReadAll(resp.Body)
+		data, err := io.ReadAll(resp.Body)
 		_ = resp.Body.Close()
 		if err != nil {
 			fmt.Println("Loading source:", err.Error())
--- a/cmd/stcrashreceiver/stcrashreceiver.go
+++ b/cmd/stcrashreceiver/stcrashreceiver.go
@@ -10,7 +10,6 @@ import (
 	"bytes"
 	"compress/gzip"
 	"io"
-	"io/ioutil"
 	"log"
 	"net/http"
 	"os"
@@ -96,7 +95,7 @@ func (r *crashReceiver) servePut(reportID, fullPath string, w http.ResponseWrite
 	// Read at most maxRequestSize of report data.
 	log.Println("Receiving report", reportID)
 	lr := io.LimitReader(req.Body, maxRequestSize)
-	bs, err := ioutil.ReadAll(lr)
+	bs, err := io.ReadAll(lr)
 	if err != nil {
 		log.Println("Reading report:", err)
 		http.Error(w, "Internal server error", http.StatusInternalServerError)
@@ -110,7 +109,7 @@ func (r *crashReceiver) servePut(reportID, fullPath string, w http.ResponseWrite
 	gw.Close()

 	// Create an output file with the compressed report
-	err = ioutil.WriteFile(fullPath, buf.Bytes(), 0644)
+	err = os.WriteFile(fullPath, buf.Bytes(), 0644)
 	if err != nil {
 		log.Println("Saving report:", err)
 		http.Error(w, "Internal server error", http.StatusInternalServerError)
@@ -130,7 +129,7 @@ func (r *crashReceiver) servePut(reportID, fullPath string, w http.ResponseWrite
 				return
 			}
 			if err := sendReport(r.dsn, pkt, user); err != nil {
-				log.Println("Failed to send  crash report:", err)
+				log.Println("Failed to send crash report:", err)
 			}
 		}()
 	}
--- a/cmd/stcrashreceiver/util.go
+++ b/cmd/stcrashreceiver/util.go
@@ -0,0 +1,57 @@
+// Copyright (C) 2021 The Syncthing Authors.
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this file,
+// You can obtain one at https://mozilla.org/MPL/2.0/.
+
+package main
+
+import (
+	"bytes"
+	"compress/gzip"
+	"fmt"
+	"net"
+	"net/http"
+	"os"
+	"path/filepath"
+	"time"
+
+	"github.com/syncthing/syncthing/lib/sha256"
+)
+
+// userIDFor returns a string we can use as the user ID for the purpose of
+// counting affected users. It's the truncated hash of a salt, the user
+// remote IP, and the current month.
+func userIDFor(req *http.Request) string {
+	addr := req.RemoteAddr
+	if fwd := req.Header.Get("x-forwarded-for"); fwd != "" {
+		addr = fwd
+	}
+	if host, _, err := net.SplitHostPort(addr); err == nil {
+		addr = host
+	}
+	now := time.Now().Format("200601")
+	salt := "stcrashreporter"
+	hash := sha256.Sum256([]byte(salt + addr + now))
+	return fmt.Sprintf("%x", hash[:8])
+}
+
+// 01234567890abcdef... => 01/23
+func dirFor(base string) string {
+	return filepath.Join(base[0:2], base[2:4])
+}
+
+func fullPathCompressed(root, reportID string) string {
+	return filepath.Join(root, dirFor(reportID), reportID) + ".gz"
+}
+
+func compressAndWrite(bs []byte, fullPath string) error {
+	// Compress the report for storage
+	buf := new(bytes.Buffer)
+	gw := gzip.NewWriter(buf)
+	_, _ = gw.Write(bs) // can't fail
+	gw.Close()
+
+	// Create an output file with the compressed report
+	return os.WriteFile(fullPath, buf.Bytes(), 0644)
+}
--- a/cmd/stdisco/main.go
+++ b/cmd/stdisco/main.go
@@ -7,6 +7,7 @@
 package main

 import (
+	"context"
 	"crypto/rand"
 	"encoding/binary"
 	"flag"
@@ -47,14 +48,16 @@ func main() {
 		log.Println("My ID:", myID)
 	}

-	runbeacon(beacon.NewMulticast(mc), fake)
-	runbeacon(beacon.NewBroadcast(bc), fake)
+	ctx := context.Background()
+
+	runbeacon(ctx, beacon.NewMulticast(mc), fake)
+	runbeacon(ctx, beacon.NewBroadcast(bc), fake)

 	select {}
 }

-func runbeacon(bc beacon.Interface, fake bool) {
-	go bc.Serve()
+func runbeacon(ctx context.Context, bc beacon.Interface, fake bool) {
+	go bc.Serve(ctx)
 	go recv(bc)
 	if fake {
 		go send(bc)
--- a/cmd/stdiscosrv/apisrv.go
+++ b/cmd/stdiscosrv/apisrv.go
@@ -66,12 +66,12 @@ func newAPISrv(addr string, cert tls.Certificate, db database, repl replicator,
 	}
 }

-func (s *apiSrv) Serve() {
+func (s *apiSrv) Serve(ctx context.Context) error {
 	if s.useHTTP {
 		listener, err := net.Listen("tcp", s.addr)
 		if err != nil {
 			log.Println("Listen:", err)
-			return
+			return err
 		}
 		s.listener = listener
 	} else {
@@ -93,7 +93,7 @@ func (s *apiSrv) Serve() {
 		tlsListener, err := tls.Listen("tcp", s.addr, tlsCfg)
 		if err != nil {
 			log.Println("Listen:", err)
-			return
+			return err
 		}
 		s.listener = tlsListener
 	}
@@ -107,9 +107,11 @@ func (s *apiSrv) Serve() {
 		MaxHeaderBytes: httpMaxHeaderBytes,
 	}

-	if err := srv.Serve(s.listener); err != nil {
+	err := srv.Serve(s.listener)
+	if err != nil {
 		log.Println("Serve:", err)
 	}
+	return err
 }

 var topCtx = context.Background()
@@ -417,7 +419,7 @@ func fixupAddresses(remote *net.TCPAddr, addresses []string) []string {

 			// If zero port was specified, use remote port.
 			if port == "0" && remote.Port > 0 {
-				port = fmt.Sprintf("%d", remote.Port)
+				port = strconv.Itoa(remote.Port)
 			}
 		}

--- a/cmd/stdiscosrv/database.go
+++ b/cmd/stdiscosrv/database.go
@@ -10,6 +10,7 @@
 package main

 import (
+	"context"
 	"log"
 	"sort"
 	"time"
@@ -37,7 +38,6 @@ type database interface {
 type levelDBStore struct {
 	db         *leveldb.DB
 	inbox      chan func()
-	stop       chan struct{}
 	clock      clock
 	marshalBuf []byte
 }
@@ -50,7 +50,6 @@ func newLevelDBStore(dir string) (*levelDBStore, error) {
 	return &levelDBStore{
 		db:    db,
 		inbox: make(chan func(), 16),
-		stop:  make(chan struct{}),
 		clock: defaultClock{},
 	}, nil
 }
@@ -155,7 +154,7 @@ func (s *levelDBStore) get(key string) (DatabaseRecord, error) {
 	return rec, nil
 }

-func (s *levelDBStore) Serve() {
+func (s *levelDBStore) Serve(ctx context.Context) error {
 	t := time.NewTimer(0)
 	defer t.Stop()
 	defer s.db.Close()
@@ -183,7 +182,7 @@ loop:
 			// the next.
 			t.Reset(databaseStatisticsInterval)

-		case <-s.stop:
+		case <-ctx.Done():
 			// We're done.
 			close(statisticsTrigger)
 			break loop
@@ -192,6 +191,8 @@ loop:

 	// Also wait for statisticsServe to return
 	<-statisticsDone
+
+	return nil
 }

 func (s *levelDBStore) statisticsServe(trigger <-chan struct{}, done chan<- struct{}) {
@@ -255,10 +256,6 @@ func (s *levelDBStore) statisticsServe(trigger <-chan struct{}, done chan<- stru
 	}
 }

-func (s *levelDBStore) Stop() {
-	close(s.stop)
-}
-
 // merge returns the merged result of the two database records a and b. The
 // result is the union of the two address sets, with the newer expiry time
 // chosen for any duplicates.
--- a/cmd/stdiscosrv/database.pb.go
+++ b/cmd/stdiscosrv/database.pb.go
@@ -510,10 +510,7 @@ func (m *DatabaseRecord) Unmarshal(dAtA []byte) error {
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthDatabase
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthDatabase
 			}
 			if (iNdEx + skippy) > l {
@@ -648,10 +645,7 @@ func (m *ReplicationRecord) Unmarshal(dAtA []byte) error {
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthDatabase
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthDatabase
 			}
 			if (iNdEx + skippy) > l {
@@ -752,10 +746,7 @@ func (m *DatabaseAddress) Unmarshal(dAtA []byte) error {
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthDatabase
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthDatabase
 			}
 			if (iNdEx + skippy) > l {
--- a/cmd/stdiscosrv/database_test.go
+++ b/cmd/stdiscosrv/database_test.go
@@ -7,6 +7,7 @@
 package main

 import (
+	"context"
 	"fmt"
 	"os"
 	"testing"
@@ -20,8 +21,9 @@ func TestDatabaseGetSet(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	go db.Serve()
-	defer db.Stop()
+	ctx, cancel := context.WithCancel(context.Background())
+	go db.Serve(ctx)
+	defer cancel()

 	// Check missing record

--- a/cmd/stdiscosrv/main.go
+++ b/cmd/stdiscosrv/main.go
@@ -7,6 +7,7 @@
 package main

 import (
+	"context"
 	"crypto/tls"
 	"flag"
 	"log"
@@ -21,7 +22,7 @@ import (
 	"github.com/syncthing/syncthing/lib/protocol"
 	"github.com/syncthing/syncthing/lib/tlsutil"
 	"github.com/syndtr/goleveldb/leveldb/opt"
-	"github.com/thejerf/suture"
+	"github.com/thejerf/suture/v4"
 )

 const (
@@ -183,5 +184,5 @@ func main() {
 	}

 	// Engage!
-	main.Serve()
+	main.Serve(context.Background())
 }
--- a/cmd/stdiscosrv/replication.go
+++ b/cmd/stdiscosrv/replication.go
@@ -7,6 +7,7 @@
 package main

 import (
+	"context"
 	"crypto/tls"
 	"encoding/binary"
 	"fmt"
@@ -32,7 +33,6 @@ type replicationSender struct {
 	cert       tls.Certificate // our certificate
 	allowedIDs []protocol.DeviceID
 	outbox     chan ReplicationRecord
-	stop       chan struct{}
 }

 func newReplicationSender(dst string, cert tls.Certificate, allowedIDs []protocol.DeviceID) *replicationSender {
@@ -41,11 +41,10 @@ func newReplicationSender(dst string, cert tls.Certificate, allowedIDs []protoco
 		cert:       cert,
 		allowedIDs: allowedIDs,
 		outbox:     make(chan ReplicationRecord, replicationOutboxSize),
-		stop:       make(chan struct{}),
 	}
 }

-func (s *replicationSender) Serve() {
+func (s *replicationSender) Serve(ctx context.Context) error {
 	// Sleep a little at startup. Peers often restart at the same time, and
 	// this avoid the service failing and entering backoff state
 	// unnecessarily, while also reducing the reconnect rate to something
@@ -62,7 +61,7 @@ func (s *replicationSender) Serve() {
 	conn, err := tls.Dial("tcp", s.dst, tlsCfg)
 	if err != nil {
 		log.Println("Replication connect:", err)
-		return
+		return err
 	}
 	defer func() {
 		conn.SetWriteDeadline(time.Now().Add(time.Second))
@@ -73,13 +72,13 @@ func (s *replicationSender) Serve() {
 	remoteID, err := deviceID(conn)
 	if err != nil {
 		log.Println("Replication connect:", err)
-		return
+		return err
 	}

 	// Verify it's in the set of allowed device IDs.
 	if !deviceIDIn(remoteID, s.allowedIDs) {
 		log.Println("Replication connect: unexpected device ID:", remoteID)
-		return
+		return err
 	}

 	heartBeatTicker := time.NewTicker(replicationHeartbeatInterval)
@@ -122,20 +121,16 @@ func (s *replicationSender) Serve() {
 				replicationSendsTotal.WithLabelValues("error").Inc()
 				log.Println("Replication write:", err)
 				// Yes, we are loosing the replication event here.
-				return
+				return err
 			}
 			replicationSendsTotal.WithLabelValues("success").Inc()

-		case <-s.stop:
-			return
+		case <-ctx.Done():
+			return nil
 		}
 	}
 }

-func (s *replicationSender) Stop() {
-	close(s.stop)
-}
-
 func (s *replicationSender) String() string {
 	return fmt.Sprintf("replicationSender(%q)", s.dst)
 }
@@ -172,7 +167,6 @@ type replicationListener struct {
 	cert       tls.Certificate
 	allowedIDs []protocol.DeviceID
 	db         database
-	stop       chan struct{}
 }

 func newReplicationListener(addr string, cert tls.Certificate, allowedIDs []protocol.DeviceID, db database) *replicationListener {
@@ -181,11 +175,10 @@ func newReplicationListener(addr string, cert tls.Certificate, allowedIDs []prot
 		cert:       cert,
 		allowedIDs: allowedIDs,
 		db:         db,
-		stop:       make(chan struct{}),
 	}
 }

-func (l *replicationListener) Serve() {
+func (l *replicationListener) Serve(ctx context.Context) error {
 	tlsCfg := &tls.Config{
 		Certificates:       []tls.Certificate{l.cert},
 		ClientAuth:         tls.RequestClientCert,
@@ -196,14 +189,14 @@ func (l *replicationListener) Serve() {
 	lst, err := tls.Listen("tcp", l.addr, tlsCfg)
 	if err != nil {
 		log.Println("Replication listen:", err)
-		return
+		return err
 	}
 	defer lst.Close()

 	for {
 		select {
-		case <-l.stop:
-			return
+		case <-ctx.Done():
+			return nil
 		default:
 		}

@@ -211,7 +204,7 @@ func (l *replicationListener) Serve() {
 		conn, err := lst.Accept()
 		if err != nil {
 			log.Println("Replication accept:", err)
-			return
+			return err
 		}

 		// Figure out the other side device ID
@@ -231,19 +224,15 @@ func (l *replicationListener) Serve() {
 			continue
 		}

-		go l.handle(conn)
+		go l.handle(ctx, conn)
 	}
 }

-func (l *replicationListener) Stop() {
-	close(l.stop)
-}
-
 func (l *replicationListener) String() string {
 	return fmt.Sprintf("replicationListener(%q)", l.addr)
 }

-func (l *replicationListener) handle(conn net.Conn) {
+func (l *replicationListener) handle(ctx context.Context, conn net.Conn) {
 	defer func() {
 		conn.SetWriteDeadline(time.Now().Add(time.Second))
 		conn.Close()
@@ -253,7 +242,7 @@ func (l *replicationListener) handle(conn net.Conn) {

 	for {
 		select {
-		case <-l.stop:
+		case <-ctx.Done():
 			return
 		default:
 		}
--- a/cmd/stevents/main.go
+++ b/cmd/stevents/main.go
@@ -28,16 +28,21 @@ func main() {
 	log.SetFlags(0)

 	target := flag.String("target", "localhost:8384", "Target Syncthing instance")
+	types := flag.String("types", "", "Filter for specific event types (comma-separated)")
 	apikey := flag.String("apikey", "", "Syncthing API key")
 	flag.Parse()

 	if *apikey == "" {
 		log.Fatal("Must give -apikey argument")
 	}
+	var eventsArg string
+	if len(*types) > 0 {
+		eventsArg = "&events=" + *types
+	}

 	since := 0
 	for {
-		req, err := http.NewRequest("GET", fmt.Sprintf("http://%s/rest/events?since=%d", *target, since), nil)
+		req, err := http.NewRequest("GET", fmt.Sprintf("http://%s/rest/events?since=%d%s", *target, since, eventsArg), nil)
 		if err != nil {
 			log.Fatal(err)
 		}
--- a/cmd/stfindignored/main.go
+++ b/cmd/stfindignored/main.go
@@ -4,7 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.

-// Commmand stfindignored lists ignored files under a given folder root.
+// Command stfindignored lists ignored files under a given folder root.
 package main

 import (
--- a/cmd/stindex/main.go
+++ b/cmd/stindex/main.go
@@ -1,63 +0,0 @@
-// Copyright (C) 2014 The Syncthing Authors.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at https://mozilla.org/MPL/2.0/.
-
-package main
-
-import (
-	"flag"
-	"fmt"
-	"log"
-	"os"
-	"path/filepath"
-
-	"github.com/syncthing/syncthing/lib/db/backend"
-)
-
-func main() {
-	var mode string
-	log.SetFlags(0)
-	log.SetOutput(os.Stdout)
-
-	flag.StringVar(&mode, "mode", "dump", "Mode of operation: dump, dumpsize, idxck")
-
-	flag.Parse()
-
-	path := flag.Arg(0)
-	if path == "" {
-		path = filepath.Join(defaultConfigDir(), "index-v0.14.0.db")
-	}
-
-	var ldb backend.Backend
-	var err error
-	if looksLikeBadger(path) {
-		ldb, err = backend.OpenBadger(path)
-	} else {
-		ldb, err = backend.OpenLevelDBRO(path)
-	}
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	switch mode {
-	case "dump":
-		dump(ldb)
-	case "dumpsize":
-		dumpsize(ldb)
-	case "idxck":
-		if !idxck(ldb) {
-			os.Exit(1)
-		}
-	case "account":
-		account(ldb)
-	default:
-		fmt.Println("Unknown mode")
-	}
-}
-
-func looksLikeBadger(path string) bool {
-	_, err := os.Stat(filepath.Join(path, "KEYREGISTRY"))
-	return err == nil
-}
--- a/cmd/stindex/util.go
+++ b/cmd/stindex/util.go
@@ -1,52 +0,0 @@
-// Copyright (C) 2015 The Syncthing Authors.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at https://mozilla.org/MPL/2.0/.
-
-package main
-
-import (
-	"log"
-	"os"
-	"path/filepath"
-	"runtime"
-
-	"github.com/syncthing/syncthing/lib/fs"
-)
-
-func nulString(bs []byte) string {
-	for i := range bs {
-		if bs[i] == 0 {
-			return string(bs[:i])
-		}
-	}
-	return string(bs)
-}
-
-func defaultConfigDir() string {
-	switch runtime.GOOS {
-	case "windows":
-		if p := os.Getenv("LocalAppData"); p != "" {
-			return filepath.Join(p, "Syncthing")
-		}
-		return filepath.Join(os.Getenv("AppData"), "Syncthing")
-
-	case "darwin":
-		dir, err := fs.ExpandTilde("~/Library/Application Support/Syncthing")
-		if err != nil {
-			log.Fatal(err)
-		}
-		return dir
-
-	default:
-		if xdgCfg := os.Getenv("XDG_CONFIG_HOME"); xdgCfg != "" {
-			return filepath.Join(xdgCfg, "syncthing")
-		}
-		dir, err := fs.ExpandTilde("~/.config/syncthing")
-		if err != nil {
-			log.Fatal(err)
-		}
-		return dir
-	}
-}
--- a/cmd/strelaypoolsrv/auto/noassets.go
+++ b/cmd/strelaypoolsrv/auto/noassets.go
@@ -0,0 +1,16 @@
+// Copyright (C) 2021 The Syncthing Authors.
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this file,
+// You can obtain one at https://mozilla.org/MPL/2.0/.
+
+//go:build noassets
+// +build noassets
+
+package auto
+
+import "github.com/syncthing/syncthing/lib/assets"
+
+func Assets() map[string]assets.Asset {
+	return nil
+}
--- a/cmd/strelaypoolsrv/gui/index.html
+++ b/cmd/strelaypoolsrv/gui/index.html
@@ -46,18 +46,18 @@
      <h1>Relay Pool Data</h1>
      <div ng-if="relays === undefined" class="text-center">
        <img src="https://cdnjs.cloudflare.com/ajax/libs/galleriffic/2.0.1/css/loader.gif" alt=""/>
-        <p>Please wait while we gather data</p>
+        <p>Please wait while we gather data…</p>
      </div>
      <div>
        <div ng-show="relays !== undefined" class="ng-hide">
          <p>
            The relays listed on this page are not managed or vetted by the Syncthing project.
            Each relay is the responsibility of the relay operator.
-            Currently {{ relays.length }} relays online.
+            Currently {{ relays.length }} relays are online.
          </p>
        </div>
        <div id="map"></div> <!-- Can't hide the map, otherwise it freaks out -->
-        <p>The circle size represents how much bytes the relay transferred relative to other relays</p>
+        <p>The circle size represents how much bytes the relay has transferred relatively to other relays.</p>
      </div>
      <div>
        <table class="table table-striped table-condensed table">
@@ -188,7 +188,7 @@
      <hr>
      <p>
        This product includes GeoLite2 data created by MaxMind, available from
-        <a href="http://www.maxmind.com">http://www.maxmind.com</a>.
+        <a href="https://www.maxmind.com">https://www.maxmind.com</a>.
      </p>
    </div>

@@ -237,7 +237,7 @@
      uptimeSeconds: 0,
    };
    $scope.map = L.map('map').setView([40.90296, 1.90925], 2);
-    L.tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+    L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
    {
      attribution: 'Leaflet',
      maxZoom: 17
--- a/cmd/strelaypoolsrv/main.go
+++ b/cmd/strelaypoolsrv/main.go
@@ -6,11 +6,11 @@ import (
 	"compress/gzip"
 	"context"
 	"crypto/tls"
+	"crypto/x509"
 	"encoding/json"
 	"flag"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"net"
 	"net/http"
@@ -21,6 +21,8 @@ import (
 	"strings"
 	"time"

+	"github.com/syncthing/syncthing/lib/protocol"
+
 	"github.com/golang/groupcache/lru"
 	"github.com/oschwald/geoip2-golang"
 	"github.com/prometheus/client_golang/prometheus"
@@ -208,6 +210,7 @@ func main() {
 		tlsCfg := &tls.Config{
 			Certificates: []tls.Certificate{cert},
 			MinVersion:   tls.VersionTLS10, // No SSLv3
+			ClientAuth:   tls.RequestClientCert,
 			CipherSuites: []uint16{
 				// No RC4
 				tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
@@ -338,6 +341,12 @@ func handleGetRequest(rw http.ResponseWriter, r *http.Request) {
 }

 func handlePostRequest(w http.ResponseWriter, r *http.Request) {
+	var relayCert *x509.Certificate
+	if r.TLS != nil && len(r.TLS.PeerCertificates) > 0 {
+		relayCert = r.TLS.PeerCertificates[0]
+		log.Printf("Got TLS cert from relay server")
+	}
+
 	var newRelay relay
 	err := json.NewDecoder(r.Body).Decode(&newRelay)
 	r.Body.Close()
@@ -359,6 +368,16 @@ func handlePostRequest(w http.ResponseWriter, r *http.Request) {
 		return
 	}

+	if relayCert != nil {
+		advertisedId := uri.Query().Get("id")
+		idFromCert := protocol.NewDeviceID(relayCert.Raw).String()
+		if advertisedId != idFromCert {
+			log.Println("Warning: Relay server requested to join with an ID different from the join request, rejecting")
+			http.Error(w, "mismatched advertised id and join request cert", http.StatusBadRequest)
+			return
+		}
+	}
+
 	host, port, err := net.SplitHostPort(uri.Host)
 	if err != nil {
 		if debug {
@@ -379,7 +398,7 @@ func handlePostRequest(w http.ResponseWriter, r *http.Request) {
 	if ip == nil || ip.IsUnspecified() {
 		uri.Host = net.JoinHostPort(rhost, port)
 		newRelay.URL = uri.String()
-	} else if host != rhost {
+	} else if host != rhost && relayCert == nil {
 		if debug {
 			log.Println("IP address advertised does not match client IP address", r.RemoteAddr, uri)
 		}
@@ -456,7 +475,7 @@ func handleRelayTest(request request) {
 		updateMetrics(request.relay.uri.Host, *stats, location)
 	}
 	request.relay.Stats = stats
-	request.relay.StatsRetrieved = time.Now()
+	request.relay.StatsRetrieved = time.Now().Truncate(time.Second)
 	request.relay.Location = location

 	timer, ok := evictionTimers[request.relay.uri.Host]
@@ -540,7 +559,7 @@ func limit(addr string, cache *lru.Cache, lock sync.Mutex, intv time.Duration, b
 }

 func loadRelays(file string) []*relay {
-	content, err := ioutil.ReadFile(file)
+	content, err := os.ReadFile(file)
 	if err != nil {
 		log.Println("Failed to load relays: " + err.Error())
 		return nil
@@ -578,11 +597,11 @@ func saveRelays(file string, relays []*relay) error {
 	for _, relay := range relays {
 		content += relay.uri.String() + "\n"
 	}
-	return ioutil.WriteFile(file, []byte(content), 0777)
+	return os.WriteFile(file, []byte(content), 0777)
 }

 func createTestCertificate() tls.Certificate {
-	tmpDir, err := ioutil.TempDir("", "relaypoolsrv")
+	tmpDir, err := os.MkdirTemp("", "relaypoolsrv")
 	if err != nil {
 		log.Fatal(err)
 	}
--- a/cmd/strelaysrv/main.go
+++ b/cmd/strelaysrv/main.go
@@ -3,6 +3,7 @@
 package main

 import (
+	"context"
 	"crypto/tls"
 	"flag"
 	"fmt"
@@ -98,7 +99,7 @@ func main() {
 	flag.IntVar(&natRenewal, "nat-renewal", 30, "NAT renewal frequency in minutes")
 	flag.IntVar(&natTimeout, "nat-timeout", 10, "NAT discovery timeout in seconds")
 	flag.BoolVar(&pprofEnabled, "pprof", false, "Enable the built in profiling on the status server")
-	flag.IntVar(&networkBufferSize, "network-buffer", 2048, "Network buffer size (two of these per proxied connection)")
+	flag.IntVar(&networkBufferSize, "network-buffer", 65536, "Network buffer size (two of these per proxied connection)")
 	showVersion := flag.Bool("version", false, "Show version")
 	flag.Parse()

@@ -184,19 +185,22 @@ func main() {
 		log.Println("ID:", id)
 	}

-	wrapper := config.Wrap("config", config.New(id), events.NoopLogger)
-	wrapper.SetOptions(config.OptionsConfiguration{
-		NATLeaseM:   natLease,
-		NATRenewalM: natRenewal,
-		NATTimeoutS: natTimeout,
+	wrapper := config.Wrap("config", config.New(id), id, events.NoopLogger)
+	go wrapper.Serve(context.TODO())
+	wrapper.Modify(func(cfg *config.Configuration) {
+		cfg.Options.NATLeaseM = natLease
+		cfg.Options.NATRenewalM = natRenewal
+		cfg.Options.NATTimeoutS = natTimeout
 	})
 	natSvc := nat.NewService(id, wrapper)
 	mapping := mapping{natSvc.NewMapping(nat.TCP, addr.IP, addr.Port)}

 	if natEnabled {
-		go natSvc.Serve()
+		ctx, cancel := context.WithCancel(context.Background())
+		go natSvc.Serve(ctx)
+		defer cancel()
 		found := make(chan struct{})
-		mapping.OnChanged(func(_ *nat.Mapping, _, _ []nat.Address) {
+		mapping.OnChanged(func() {
 			select {
 			case found <- struct{}{}:
 			default:
@@ -229,6 +233,7 @@ func main() {
 	uri, err := url.Parse(fmt.Sprintf("relay://%s/?id=%s&pingInterval=%s&networkTimeout=%s&sessionLimitBps=%d&globalLimitBps=%d&statusAddr=%s&providedBy=%s", mapping.Address(), id, pingInterval, networkTimeout, sessionLimitBps, globalLimitBps, statusAddr, providedBy))
 	if err != nil {
 		log.Fatalln("Failed to construct URI", err)
+		return
 	}

 	log.Println("URI:", uri.String())
@@ -244,7 +249,7 @@ func main() {
 	for _, pool := range pools {
 		pool = strings.TrimSpace(pool)
 		if len(pool) > 0 {
-			go poolHandler(pool, uri, mapping)
+			go poolHandler(pool, uri, mapping, cert)
 		}
 	}

--- a/cmd/strelaysrv/pool.go
+++ b/cmd/strelaysrv/pool.go
@@ -4,8 +4,9 @@ package main

 import (
 	"bytes"
+	"crypto/tls"
 	"encoding/json"
-	"io/ioutil"
+	"io"
 	"log"
 	"net/http"
 	"net/url"
@@ -16,7 +17,7 @@ const (
 	httpStatusEnhanceYourCalm = 429
 )

-func poolHandler(pool string, uri *url.URL, mapping mapping) {
+func poolHandler(pool string, uri *url.URL, mapping mapping, ownCert tls.Certificate) {
 	if debug {
 		log.Println("Joining", pool)
 	}
@@ -31,14 +32,31 @@ func poolHandler(pool string, uri *url.URL, mapping mapping) {
 			uriCopy.String(),
 		})

-		resp, err := httpClient.Post(pool, "application/json", &b)
+		poolUrl, err := url.Parse(pool)
+		if err != nil {
+			log.Printf("Could not parse pool url '%s': %v", pool, err)
+		}
+
+		client := http.DefaultClient
+		if poolUrl.Scheme == "https" {
+			// Sent our certificate in join request
+			client = &http.Client{
+				Transport: &http.Transport{
+					TLSClientConfig: &tls.Config{
+						Certificates: []tls.Certificate{ownCert},
+					},
+				},
+			}
+		}
+
+		resp, err := client.Post(pool, "application/json", &b)
 		if err != nil {
 			log.Printf("Error joining pool %v: HTTP request: %v", pool, err)
 			time.Sleep(time.Minute)
 			continue
 		}

-		bs, err := ioutil.ReadAll(resp.Body)
+		bs, err := io.ReadAll(resp.Body)
 		resp.Body.Close()
 		if err != nil {
 			log.Printf("Error joining pool %v: reading response: %v", pool, err)
--- a/cmd/strelaysrv/testutil/main.go
+++ b/cmd/strelaysrv/testutil/main.go
@@ -20,7 +20,8 @@ import (
 )

 func main() {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()

 	log.SetOutput(os.Stdout)
 	log.SetFlags(log.LstdFlags | log.Lshortfile)
@@ -56,13 +57,13 @@ func main() {

 	if join {
 		log.Println("Creating client")
-		relay, err := client.NewClient(uri, []tls.Certificate{cert}, nil, 10*time.Second)
+		relay, err := client.NewClient(uri, []tls.Certificate{cert}, 10*time.Second)
 		if err != nil {
 			log.Fatal(err)
 		}
 		log.Println("Created client")

-		go relay.Serve()
+		go relay.Serve(ctx)

 		recv := make(chan protocol.SessionInvitation)

--- a/cmd/stsigtool/main.go
+++ b/cmd/stsigtool/main.go
@@ -9,7 +9,6 @@ package main
 import (
 	"flag"
 	"io"
-	"io/ioutil"
 	"log"
 	"os"

@@ -69,7 +68,7 @@ func gen() {
 }

 func sign(keyname, dataname string) {
-	privkey, err := ioutil.ReadFile(keyname)
+	privkey, err := os.ReadFile(keyname)
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -95,7 +94,7 @@ func sign(keyname, dataname string) {
 }

 func verifyWithFile(signame, dataname, keyname string) {
-	pubkey, err := ioutil.ReadFile(keyname)
+	pubkey, err := os.ReadFile(keyname)
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -103,7 +102,7 @@ func verifyWithFile(signame, dataname, keyname string) {
 }

 func verifyWithKey(signame, dataname string, pubkey []byte) {
-	sig, err := ioutil.ReadFile(signame)
+	sig, err := os.ReadFile(signame)
 	if err != nil {
 		log.Fatal(err)
 	}
--- a/cmd/stvanity/main.go
+++ b/cmd/stvanity/main.go
@@ -37,7 +37,7 @@ type result struct {

 func main() {
 	flag.Parse()
-	prefix := strings.ToUpper(strings.Replace(flag.Arg(0), "-", "", -1))
+	prefix := strings.ToUpper(strings.ReplaceAll(flag.Arg(0), "-", ""))
 	if len(prefix) > 7 {
 		prefix = prefix[:7] + "-" + prefix[7:]
 	}
--- a/cmd/stwatchfile/main.go
+++ b/cmd/stwatchfile/main.go
@@ -7,31 +7,15 @@
 package main

 import (
-	"bytes"
-	"crypto/md5"
 	"flag"
 	"fmt"
 	"io"
 	"os"
 	"time"
+
+	"github.com/syncthing/syncthing/lib/sha256"
 )

-func getmd5(filePath string) ([]byte, error) {
-	var result []byte
-	file, err := os.Open(filePath)
-	if err != nil {
-		return result, err
-	}
-	defer file.Close()
-
-	hash := md5.New()
-	if _, err := io.Copy(hash, file); err != nil {
-		return result, err
-	}
-
-	return hash.Sum(result), nil
-}
-
 func main() {
 	period := flag.Duration("period", 200*time.Millisecond, "Sleep period between checks")
 	flag.Parse()
@@ -46,7 +30,7 @@ func main() {
 	exists := true
 	size := int64(0)
 	mtime := time.Time{}
-	hash := []byte{}
+	var hash [sha256.Size]byte

 	for {
 		time.Sleep(*period)
@@ -72,7 +56,7 @@ func main() {
 		if !exists {
 			size = 0
 			mtime = time.Time{}
-			hash = []byte{}
+			hash = [sha256.Size]byte{}
 			continue
 		}

@@ -83,12 +67,12 @@ func main() {
 		newSize := fi.Size()
 		newMtime := fi.ModTime()

-		newHash, err := getmd5(file)
+		newHash, err := sha256file(file)
 		if err != nil {
-			fmt.Println("getmd5:", err)
+			fmt.Println("sha256file:", err)
 		}

-		if newSize != size || newMtime != mtime || !bytes.Equal(newHash, hash) {
+		if newSize != size || newMtime != mtime || newHash != hash {
 			fmt.Println(file, "Size:", newSize, "Mtime:", newMtime, "Hash:", fmt.Sprintf("%x", newHash))
 			hash = newHash
 			size = newSize
@@ -96,3 +80,18 @@ func main() {
 		}
 	}
 }
+
+func sha256file(fname string) (hash [sha256.Size]byte, err error) {
+	f, err := os.Open(fname)
+	if err != nil {
+		return
+	}
+	defer f.Close()
+
+	h := sha256.New()
+	io.Copy(h, f)
+	hb := h.Sum(nil)
+	copy(hash[:], hb)
+
+	return
+}
--- a/cmd/syncthing/blockprof.go
+++ b/cmd/syncthing/blockprof.go
@@ -15,19 +15,17 @@ import (
 	"time"
 )

-func init() {
-	if innerProcess && os.Getenv("STBLOCKPROFILE") != "" {
-		profiler := pprof.Lookup("block")
-		if profiler == nil {
-			panic("Couldn't find block profiler")
-		}
-		l.Debugln("Starting block profiling")
-		go func() {
-			err := saveBlockingProfiles(profiler) // Only returns on error
-			l.Warnln("Block profiler failed:", err)
-			panic("Block profiler failed")
-		}()
+func startBlockProfiler() {
+	profiler := pprof.Lookup("block")
+	if profiler == nil {
+		panic("Couldn't find block profiler")
 	}
+	l.Debugln("Starting block profiling")
+	go func() {
+		err := saveBlockingProfiles(profiler) // Only returns on error
+		l.Warnln("Block profiler failed:", err)
+		panic("Block profiler failed")
+	}()
 }

 func saveBlockingProfiles(profiler *pprof.Profile) error {
--- a/cmd/syncthing/cli/client.go
+++ b/cmd/syncthing/cli/client.go
@@ -0,0 +1,153 @@
+// Copyright (C) 2019 The Syncthing Authors.
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this file,
+// You can obtain one at https://mozilla.org/MPL/2.0/.
+
+package cli
+
+import (
+	"bytes"
+	"context"
+	"crypto/tls"
+	"errors"
+	"fmt"
+	"net"
+	"net/http"
+	"strings"
+
+	"github.com/syncthing/syncthing/lib/config"
+	"github.com/syncthing/syncthing/lib/events"
+	"github.com/syncthing/syncthing/lib/locations"
+	"github.com/syncthing/syncthing/lib/protocol"
+)
+
+type APIClient interface {
+	Get(url string) (*http.Response, error)
+	Post(url, body string) (*http.Response, error)
+}
+
+type apiClient struct {
+	http.Client
+	cfg    config.GUIConfiguration
+	apikey string
+}
+
+type apiClientFactory struct {
+	cfg config.GUIConfiguration
+}
+
+func (f *apiClientFactory) getClient() (APIClient, error) {
+	// Now if the API key and address is not provided (we are not connecting to a remote instance),
+	// try to rip it out of the config.
+	if f.cfg.RawAddress == "" && f.cfg.APIKey == "" {
+		var err error
+		f.cfg, err = loadGUIConfig()
+		if err != nil {
+			return nil, err
+		}
+	} else if f.cfg.Address() == "" || f.cfg.APIKey == "" {
+		return nil, errors.New("Both --gui-address and --gui-apikey should be specified")
+	}
+
+	httpClient := http.Client{
+		Transport: &http.Transport{
+			TLSClientConfig: &tls.Config{
+				InsecureSkipVerify: true,
+			},
+			DialContext: func(_ context.Context, _, _ string) (net.Conn, error) {
+				return net.Dial(f.cfg.Network(), f.cfg.Address())
+			},
+		},
+	}
+	return &apiClient{
+		Client: httpClient,
+		cfg:    f.cfg,
+		apikey: f.cfg.APIKey,
+	}, nil
+}
+
+func loadGUIConfig() (config.GUIConfiguration, error) {
+	// Load the certs and get the ID
+	cert, err := tls.LoadX509KeyPair(
+		locations.Get(locations.CertFile),
+		locations.Get(locations.KeyFile),
+	)
+	if err != nil {
+		return config.GUIConfiguration{}, fmt.Errorf("reading device ID: %w", err)
+	}
+
+	myID := protocol.NewDeviceID(cert.Certificate[0])
+
+	// Load the config
+	cfg, _, err := config.Load(locations.Get(locations.ConfigFile), myID, events.NoopLogger)
+	if err != nil {
+		return config.GUIConfiguration{}, fmt.Errorf("loading config: %w", err)
+	}
+
+	guiCfg := cfg.GUI()
+
+	if guiCfg.Address() == "" {
+		return config.GUIConfiguration{}, errors.New("Could not find GUI Address")
+	}
+
+	if guiCfg.APIKey == "" {
+		return config.GUIConfiguration{}, errors.New("Could not find GUI API key")
+	}
+
+	return guiCfg, nil
+}
+
+func (c *apiClient) Endpoint() string {
+	if c.cfg.Network() == "unix" {
+		return "http://unix/"
+	}
+	url := c.cfg.URL()
+	if !strings.HasSuffix(url, "/") {
+		url += "/"
+	}
+	return url
+}
+
+func (c *apiClient) Do(req *http.Request) (*http.Response, error) {
+	req.Header.Set("X-API-Key", c.apikey)
+	resp, err := c.Client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	return resp, checkResponse(resp)
+}
+
+func (c *apiClient) Get(url string) (*http.Response, error) {
+	request, err := http.NewRequest("GET", c.Endpoint()+"rest/"+url, nil)
+	if err != nil {
+		return nil, err
+	}
+	return c.Do(request)
+}
+
+func (c *apiClient) Post(url, body string) (*http.Response, error) {
+	request, err := http.NewRequest("POST", c.Endpoint()+"rest/"+url, bytes.NewBufferString(body))
+	if err != nil {
+		return nil, err
+	}
+	return c.Do(request)
+}
+
+var errNotFound = errors.New("invalid endpoint or API call")
+
+func checkResponse(response *http.Response) error {
+	if response.StatusCode == http.StatusNotFound {
+		return errNotFound
+	} else if response.StatusCode == http.StatusUnauthorized {
+		return errors.New("invalid API key")
+	} else if response.StatusCode != http.StatusOK {
+		data, err := responseToBArray(response)
+		if err != nil {
+			return err
+		}
+		body := strings.TrimSpace(string(data))
+		return fmt.Errorf("unexpected HTTP status returned: %s\n%s", response.Status, body)
+	}
+	return nil
+}
--- a/cmd/syncthing/cli/config.go
+++ b/cmd/syncthing/cli/config.go
@@ -0,0 +1,87 @@
+// Copyright (C) 2021 The Syncthing Authors.
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this file,
+// You can obtain one at https://mozilla.org/MPL/2.0/.
+
+package cli
+
+import (
+	"encoding/json"
+	"fmt"
+	"reflect"
+
+	"github.com/AudriusButkevicius/recli"
+	"github.com/pkg/errors"
+	"github.com/syncthing/syncthing/lib/config"
+	"github.com/urfave/cli"
+)
+
+type configHandler struct {
+	original, cfg config.Configuration
+	client        APIClient
+	err           error
+}
+
+func getConfigCommand(f *apiClientFactory) (cli.Command, error) {
+	h := new(configHandler)
+	h.client, h.err = f.getClient()
+	if h.err == nil {
+		h.cfg, h.err = getConfig(h.client)
+	}
+	h.original = h.cfg.Copy()
+
+	// Copy the config and set the default flags
+	recliCfg := recli.DefaultConfig
+	recliCfg.IDTag.Name = "xml"
+	recliCfg.SkipTag.Name = "json"
+
+	commands, err := recli.New(recliCfg).Construct(&h.cfg)
+	if err != nil {
+		return cli.Command{}, fmt.Errorf("config reflect: %w", err)
+	}
+
+	return cli.Command{
+		Name:        "config",
+		HideHelp:    true,
+		Usage:       "Configuration modification command group",
+		Subcommands: commands,
+		Before:      h.configBefore,
+		After:       h.configAfter,
+	}, nil
+}
+
+func (h *configHandler) configBefore(c *cli.Context) error {
+	for _, arg := range c.Args() {
+		if arg == "--help" || arg == "-h" {
+			return nil
+		}
+	}
+	return h.err
+}
+
+func (h *configHandler) configAfter(c *cli.Context) error {
+	if h.err != nil {
+		// Error was already returned in configBefore
+		return nil
+	}
+	if reflect.DeepEqual(h.cfg, h.original) {
+		return nil
+	}
+	body, err := json.MarshalIndent(h.cfg, "", "  ")
+	if err != nil {
+		return err
+	}
+	resp, err := h.client.Post("system/config", string(body))
+	if err != nil {
+		return err
+	}
+	if resp.StatusCode != 200 {
+		body, err := responseToBArray(resp)
+		if err != nil {
+			return err
+		}
+		return errors.New(string(body))
+	}
+	return nil
+}
--- a/cmd/syncthing/cli/debug.go
+++ b/cmd/syncthing/cli/debug.go
@@ -0,0 +1,55 @@
+// Copyright (C) 2021 The Syncthing Authors.
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this file,
+// You can obtain one at https://mozilla.org/MPL/2.0/.
+
+package cli
+
+import (
+	"fmt"
+	"net/url"
+
+	"github.com/urfave/cli"
+)
+
+var debugCommand = cli.Command{
+	Name:     "debug",
+	HideHelp: true,
+	Usage:    "Debug command group",
+	Subcommands: []cli.Command{
+		{
+			Name:      "file",
+			Usage:     "Show information about a file (or directory/symlink)",
+			ArgsUsage: "FOLDER-ID PATH",
+			Action:    expects(2, debugFile()),
+		},
+		indexCommand,
+		{
+			Name:      "profile",
+			Usage:     "Save a profile to help figuring out what Syncthing does.",
+			ArgsUsage: "cpu | heap",
+			Action:    expects(1, profile()),
+		},
+	},
+}
+
+func debugFile() cli.ActionFunc {
+	return func(c *cli.Context) error {
+		query := make(url.Values)
+		query.Set("folder", c.Args()[0])
+		query.Set("file", normalizePath(c.Args()[1]))
+		return indexDumpOutput("debug/file?" + query.Encode())(c)
+	}
+}
+
+func profile() cli.ActionFunc {
+	return func(c *cli.Context) error {
+		switch t := c.Args()[0]; t {
+		case "cpu", "heap":
+			return saveToFile(fmt.Sprintf("debug/%vprof", c.Args()[0]))(c)
+		default:
+			return fmt.Errorf("expected cpu or heap as argument, got %v", t)
+		}
+	}
+}
--- a/cmd/syncthing/cli/errors.go
+++ b/cmd/syncthing/cli/errors.go
@@ -4,7 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.

-package main
+package cli

 import (
 	"errors"
@@ -22,7 +22,7 @@ var errorsCommand = cli.Command{
 		{
 			Name:   "show",
 			Usage:  "Show pending errors",
-			Action: expects(0, dumpOutput("system/error")),
+			Action: expects(0, indexDumpOutput("system/error")),
 		},
 		{
 			Name:      "push",
@@ -39,7 +39,7 @@ var errorsCommand = cli.Command{
 }

 func errorsPush(c *cli.Context) error {
-	client := c.App.Metadata["client"].(*APIClient)
+	client := c.App.Metadata["client"].(APIClient)
 	errStr := strings.Join(c.Args(), " ")
 	response, err := client.Post("system/error", strings.TrimSpace(errStr))
 	if err != nil {
--- a/cmd/syncthing/cli/index.go
+++ b/cmd/syncthing/cli/index.go
@@ -0,0 +1,38 @@
+// Copyright (C) 2014 The Syncthing Authors.
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this file,
+// You can obtain one at https://mozilla.org/MPL/2.0/.
+
+package cli
+
+import (
+	"github.com/urfave/cli"
+)
+
+var indexCommand = cli.Command{
+	Name:  "index",
+	Usage: "Show information about the index (database)",
+	Subcommands: []cli.Command{
+		{
+			Name:   "dump",
+			Usage:  "Print the entire db",
+			Action: expects(0, indexDump),
+		},
+		{
+			Name:   "dump-size",
+			Usage:  "Print the db size of different categories of information",
+			Action: expects(0, indexDumpSize),
+		},
+		{
+			Name:   "check",
+			Usage:  "Check the database for inconsistencies",
+			Action: expects(0, indexCheck),
+		},
+		{
+			Name:   "account",
+			Usage:  "Print key and value size statistics per key type",
+			Action: expects(0, indexAccount),
+		},
+	},
+}
--- a/cmd/syncthing/cli/index_accounting.go
+++ b/cmd/syncthing/cli/index_accounting.go
@@ -4,22 +4,26 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.

-package main
+package cli

 import (
 	"fmt"
-	"log"
 	"os"
 	"text/tabwriter"

-	"github.com/syncthing/syncthing/lib/db/backend"
+	"github.com/urfave/cli"
 )

-// account prints key and data size statistics per class
-func account(ldb backend.Backend) {
+// indexAccount prints key and data size statistics per class
+func indexAccount(*cli.Context) error {
+	ldb, err := getDB()
+	if err != nil {
+		return err
+	}
+
 	it, err := ldb.NewPrefixIterator(nil)
 	if err != nil {
-		log.Fatal(err)
+		return err
 	}

 	var ksizes [256]int
@@ -55,4 +59,6 @@ func account(ldb backend.Backend) {
 	}
 	fmt.Fprintf(tw, "Total\t%d items,\t%d KB keys +\t%d KB data.\t\n", toti, totks/1000, totds/1000)
 	tw.Flush()
+
+	return nil
 }
--- a/cmd/syncthing/cli/index_dump.go
+++ b/cmd/syncthing/cli/index_dump.go
@@ -4,23 +4,27 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.

-package main
+package cli

 import (
 	"encoding/binary"
 	"fmt"
-	"log"
 	"time"

+	"github.com/urfave/cli"
+
 	"github.com/syncthing/syncthing/lib/db"
-	"github.com/syncthing/syncthing/lib/db/backend"
 	"github.com/syncthing/syncthing/lib/protocol"
 )

-func dump(ldb backend.Backend) {
+func indexDump(*cli.Context) error {
+	ldb, err := getDB()
+	if err != nil {
+		return err
+	}
 	it, err := ldb.NewPrefixIterator(nil)
 	if err != nil {
-		log.Fatal(err)
+		return err
 	}
 	for it.Next() {
 		key := it.Key()
@@ -34,7 +38,7 @@ func dump(ldb backend.Backend) {
 			var f protocol.FileInfo
 			err := f.Unmarshal(it.Value())
 			if err != nil {
-				log.Fatal(err)
+				return err
 			}
 			fmt.Printf(" V:%v\n", f)

@@ -61,10 +65,10 @@ func dump(ldb backend.Backend) {
 			folder := binary.BigEndian.Uint32(key[1:])
 			name := nulString(key[1+4:])
 			val := it.Value()
-			var real, virt time.Time
-			real.UnmarshalBinary(val[:len(val)/2])
-			virt.UnmarshalBinary(val[len(val)/2:])
-			fmt.Printf("[mtime] F:%d N:%q R:%v V:%v\n", folder, name, real, virt)
+			var realTime, virtualTime time.Time
+			realTime.UnmarshalBinary(val[:len(val)/2])
+			virtualTime.UnmarshalBinary(val[len(val)/2:])
+			fmt.Printf("[mtime] F:%d N:%q R:%v V:%v\n", folder, name, realTime, virtualTime)

 		case db.KeyTypeFolderIdx:
 			key := binary.BigEndian.Uint32(key[1:])
@@ -131,8 +135,26 @@ func dump(ldb backend.Backend) {
 				fmt.Printf(" V:%v\n", v)
 			}

+		case db.KeyTypePendingFolder:
+			device := binary.BigEndian.Uint32(key[1:])
+			folder := string(key[5:])
+			var of db.ObservedFolder
+			of.Unmarshal(it.Value())
+			fmt.Printf("[pendingFolder] D:%d F:%s V:%v\n", device, folder, of)
+
+		case db.KeyTypePendingDevice:
+			device := "<invalid>"
+			dev, err := protocol.DeviceIDFromBytes(key[1:])
+			if err == nil {
+				device = dev.String()
+			}
+			var od db.ObservedDevice
+			od.Unmarshal(it.Value())
+			fmt.Printf("[pendingDevice] D:%v V:%v\n", device, od)
+
 		default:
 			fmt.Printf("[??? %d]\n  %x\n  %x\n", key[0], key, it.Value())
 		}
 	}
+	return nil
 }
--- a/cmd/syncthing/cli/index_dumpsize.go
+++ b/cmd/syncthing/cli/index_dumpsize.go
@@ -4,51 +4,38 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.

-package main
+package cli

 import (
-	"container/heap"
 	"encoding/binary"
 	"fmt"
-	"log"
+	"sort"
+
+	"github.com/urfave/cli"

 	"github.com/syncthing/syncthing/lib/db"
-	"github.com/syncthing/syncthing/lib/db/backend"
 )

-type SizedElement struct {
-	key  string
-	size int
-}
+func indexDumpSize(*cli.Context) error {
+	type sizedElement struct {
+		key  string
+		size int
+	}

-type ElementHeap []SizedElement
-
-func (h ElementHeap) Len() int           { return len(h) }
-func (h ElementHeap) Less(i, j int) bool { return h[i].size > h[j].size }
-func (h ElementHeap) Swap(i, j int)      { h[i], h[j] = h[j], h[i] }
-
-func (h *ElementHeap) Push(x interface{}) {
-	*h = append(*h, x.(SizedElement))
-}
-
-func (h *ElementHeap) Pop() interface{} {
-	old := *h
-	n := len(old)
-	x := old[n-1]
-	*h = old[0 : n-1]
-	return x
-}
-
-func dumpsize(ldb backend.Backend) {
-	h := &ElementHeap{}
-	heap.Init(h)
+	ldb, err := getDB()
+	if err != nil {
+		return err
+	}

 	it, err := ldb.NewPrefixIterator(nil)
 	if err != nil {
-		log.Fatal(err)
+		return err
 	}
-	var ele SizedElement
+
+	var elems []sizedElement
 	for it.Next() {
+		var ele sizedElement
+
 		key := it.Key()
 		switch key[0] {
 		case db.KeyTypeDevice:
@@ -89,11 +76,15 @@ func dumpsize(ldb backend.Backend) {
 			ele.key = fmt.Sprintf("UNKNOWN:%x", key)
 		}
 		ele.size = len(it.Value())
-		heap.Push(h, ele)
+		elems = append(elems, ele)
 	}

-	for h.Len() > 0 {
-		ele = heap.Pop(h).(SizedElement)
+	sort.Slice(elems, func(i, j int) bool {
+		return elems[i].size > elems[j].size
+	})
+	for _, ele := range elems {
 		fmt.Println(ele.key, ele.size)
 	}
+
+	return nil
 }
--- a/cmd/syncthing/cli/index_idxck.go
+++ b/cmd/syncthing/cli/index_idxck.go
@@ -4,17 +4,18 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.

-package main
+package cli

 import (
 	"bytes"
 	"encoding/binary"
+	"errors"
 	"fmt"
-	"log"
 	"sort"

+	"github.com/urfave/cli"
+
 	"github.com/syncthing/syncthing/lib/db"
-	"github.com/syncthing/syncthing/lib/db/backend"
 	"github.com/syncthing/syncthing/lib/protocol"
 )

@@ -34,7 +35,12 @@ type sequenceKey struct {
 	sequence uint64
 }

-func idxck(ldb backend.Backend) (success bool) {
+func indexCheck(*cli.Context) (err error) {
+	ldb, err := getDB()
+	if err != nil {
+		return err
+	}
+
 	folders := make(map[uint32]string)
 	devices := make(map[uint32]string)
 	deviceToIDs := make(map[string]uint32)
@@ -47,11 +53,20 @@ func idxck(ldb backend.Backend) (success bool) {
 	usedBlocklists := make(map[string]struct{})
 	usedVersions := make(map[string]struct{})
 	var localDeviceKey uint32
-	success = true
+	success := true
+	defer func() {
+		if err == nil {
+			if success {
+				fmt.Println("Index check completed succesfully.")
+			} else {
+				err = errors.New("Inconsistencies found in the index")
+			}
+		}
+	}()

 	it, err := ldb.NewPrefixIterator(nil)
 	if err != nil {
-		log.Fatal(err)
+		return err
 	}
 	for it.Next() {
 		key := it.Key()
@@ -329,7 +344,7 @@ func idxck(ldb backend.Backend) (success bool) {
 		fmt.Printf("%d version entries out of %d needs GC\n", d, len(versions))
 	}

-	return
+	return nil
 }

 func needsLocally(vl db.VersionList) bool {
--- a/cmd/syncthing/cli/main.go
+++ b/cmd/syncthing/cli/main.go
@@ -0,0 +1,160 @@
+// Copyright (C) 2019 The Syncthing Authors.
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this file,
+// You can obtain one at https://mozilla.org/MPL/2.0/.
+
+package cli
+
+import (
+	"bufio"
+	"fmt"
+	"io"
+	"os"
+	"strings"
+
+	"github.com/alecthomas/kong"
+	"github.com/flynn-archive/go-shlex"
+	"github.com/pkg/errors"
+	"github.com/urfave/cli"
+
+	"github.com/syncthing/syncthing/cmd/syncthing/cmdutil"
+	"github.com/syncthing/syncthing/lib/config"
+)
+
+type preCli struct {
+	GUIAddress string `name:"gui-address"`
+	GUIAPIKey  string `name:"gui-apikey"`
+	HomeDir    string `name:"home"`
+	ConfDir    string `name:"config"`
+	DataDir    string `name:"data"`
+}
+
+func Run() error {
+	// This is somewhat a hack around a chicken and egg problem. We need to set
+	// the home directory and potentially other flags to know where the
+	// syncthing instance is running in order to get it's config ... which we
+	// then use to construct the actual CLI ... at which point it's too late to
+	// add flags there...
+	c := preCli{}
+	parseFlags(&c)
+
+	// Not set as default above because the strings can be really long.
+	err := cmdutil.SetConfigDataLocationsFromFlags(c.HomeDir, c.ConfDir, c.DataDir)
+	if err != nil {
+		return errors.Wrap(err, "Command line options:")
+	}
+	clientFactory := &apiClientFactory{
+		cfg: config.GUIConfiguration{
+			RawAddress: c.GUIAddress,
+			APIKey:     c.GUIAPIKey,
+		},
+	}
+
+	configCommand, err := getConfigCommand(clientFactory)
+	if err != nil {
+		return err
+	}
+
+	// Implement the same flags at the upper CLI, but do nothing with them.
+	// This is so that the usage text is the same
+	fakeFlags := []cli.Flag{
+		cli.StringFlag{
+			Name:  "gui-address",
+			Usage: "Override GUI address to `URL` (e.g. \"http://192.0.2.42:8443\")",
+		},
+		cli.StringFlag{
+			Name:  "gui-apikey",
+			Usage: "Override GUI API key to `API-KEY`",
+		},
+		cli.StringFlag{
+			Name:  "home",
+			Usage: "Set configuration and data directory to `PATH`",
+		},
+		cli.StringFlag{
+			Name:  "config",
+			Usage: "Set configuration directory (config and keys) to `PATH`",
+		},
+		cli.StringFlag{
+			Name:  "data",
+			Usage: "Set data directory (database and logs) to `PATH`",
+		},
+	}
+
+	// Construct the actual CLI
+	app := cli.NewApp()
+	app.Author = "The Syncthing Authors"
+	app.Metadata = map[string]interface{}{
+		"clientFactory": clientFactory,
+	}
+	app.Commands = []cli.Command{{
+		Name:  "cli",
+		Usage: "Syncthing command line interface",
+		Flags: fakeFlags,
+		Subcommands: []cli.Command{
+			configCommand,
+			showCommand,
+			operationCommand,
+			errorsCommand,
+			debugCommand,
+			{
+				Name:     "-",
+				HideHelp: true,
+				Usage:    "Read commands from stdin",
+				Action: func(ctx *cli.Context) error {
+					if ctx.NArg() > 0 {
+						return errors.New("command does not expect any arguments")
+					}
+
+					// Drop the `-` not to recurse into self.
+					args := make([]string, len(os.Args)-1)
+					copy(args, os.Args)
+
+					fmt.Println("Reading commands from stdin...", args)
+					scanner := bufio.NewScanner(os.Stdin)
+					for scanner.Scan() {
+						input, err := shlex.Split(scanner.Text())
+						if err != nil {
+							return errors.Wrap(err, "parsing input")
+						}
+						if len(input) == 0 {
+							continue
+						}
+						err = app.Run(append(args, input...))
+						if err != nil {
+							return err
+						}
+					}
+					return scanner.Err()
+				},
+			},
+		},
+	}}
+
+	return app.Run(os.Args)
+}
+
+func parseFlags(c *preCli) error {
+	// kong only needs to parse the global arguments after "cli" and before the
+	// subcommand (if any).
+	if len(os.Args) <= 2 {
+		return nil
+	}
+	args := os.Args[2:]
+	for i := 0; i < len(args); i++ {
+		if !strings.HasPrefix(args[i], "--") {
+			args = args[:i]
+			break
+		}
+		if !strings.Contains(args[i], "=") {
+			i++
+		}
+	}
+	// We don't want kong to print anything nor os.Exit (e.g. on -h)
+	parser, err := kong.New(c, kong.Writers(io.Discard, io.Discard), kong.Exit(func(int) {}))
+	if err != nil {
+		return err
+	}
+	_, err = parser.Parse(args)
+	return err
+}
--- a/cmd/syncthing/cli/operations.go
+++ b/cmd/syncthing/cli/operations.go
@@ -4,7 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.

-package main
+package cli

 import (
 	"fmt"
@@ -27,11 +27,6 @@ var operationCommand = cli.Command{
 			Usage:  "Shutdown syncthing",
 			Action: expects(0, emptyPost("system/shutdown")),
 		},
-		{
-			Name:   "reset",
-			Usage:  "Reset syncthing deleting all folders and devices",
-			Action: expects(0, emptyPost("system/reset")),
-		},
 		{
 			Name:   "upgrade",
 			Usage:  "Upgrade syncthing (if a newer version is available)",
@@ -39,7 +34,7 @@ var operationCommand = cli.Command{
 		},
 		{
 			Name:      "folder-override",
-			Usage:     "Override changes on folder (remote for sendonly, local for receiveonly)",
+			Usage:     "Override changes on folder (remote for sendonly, local for receiveonly). WARNING: Destructive - deletes/changes your data.",
 			ArgsUsage: "[folder id]",
 			Action:    expects(1, foldersOverride),
 		},
@@ -47,7 +42,10 @@ var operationCommand = cli.Command{
 }

 func foldersOverride(c *cli.Context) error {
-	client := c.App.Metadata["client"].(*APIClient)
+	client, err := getClientFactory(c).getClient()
+	if err != nil {
+		return err
+	}
 	cfg, err := getConfig(client)
 	if err != nil {
 		return err
--- a/cmd/syncthing/cli/pending.go
+++ b/cmd/syncthing/cli/pending.go
@@ -0,0 +1,29 @@
+// Copyright (C) 2021 The Syncthing Authors.
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this file,
+// You can obtain one at https://mozilla.org/MPL/2.0/.
+
+package cli
+
+import (
+	"github.com/urfave/cli"
+)
+
+var pendingCommand = cli.Command{
+	Name:     "pending",
+	HideHelp: true,
+	Usage:    "Pending subcommand group",
+	Subcommands: []cli.Command{
+		{
+			Name:   "devices",
+			Usage:  "Show pending devices",
+			Action: expects(0, indexDumpOutput("cluster/pending/devices")),
+		},
+		{
+			Name:   "folders",
+			Usage:  "Show pending folders",
+			Action: expects(0, indexDumpOutput("cluster/pending/folders")),
+		},
+	},
+}
--- a/cmd/syncthing/cli/show.go
+++ b/cmd/syncthing/cli/show.go
@@ -4,7 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.

-package main
+package cli

 import (
 	"github.com/urfave/cli"
@@ -18,27 +18,28 @@ var showCommand = cli.Command{
 		{
 			Name:   "version",
 			Usage:  "Show syncthing client version",
-			Action: expects(0, dumpOutput("system/version")),
+			Action: expects(0, indexDumpOutput("system/version")),
 		},
 		{
 			Name:   "config-status",
 			Usage:  "Show configuration status, whether or not a restart is required for changes to take effect",
-			Action: expects(0, dumpOutput("system/config/insync")),
+			Action: expects(0, indexDumpOutput("config/restart-required")),
 		},
 		{
 			Name:   "system",
 			Usage:  "Show system status",
-			Action: expects(0, dumpOutput("system/status")),
+			Action: expects(0, indexDumpOutput("system/status")),
 		},
 		{
 			Name:   "connections",
 			Usage:  "Report about connections to other devices",
-			Action: expects(0, dumpOutput("system/connections")),
+			Action: expects(0, indexDumpOutput("system/connections")),
 		},
+		pendingCommand,
 		{
 			Name:   "usage",
 			Usage:  "Show usage report",
-			Action: expects(0, dumpOutput("svc/report")),
+			Action: expects(0, indexDumpOutput("svc/report")),
 		},
 	},
 }
--- a/cmd/syncthing/cli/utils.go
+++ b/cmd/syncthing/cli/utils.go
@@ -0,0 +1,165 @@
+// Copyright (C) 2019 The Syncthing Authors.
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this file,
+// You can obtain one at https://mozilla.org/MPL/2.0/.
+
+package cli
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"mime"
+	"net/http"
+	"os"
+	"path/filepath"
+
+	"github.com/syncthing/syncthing/lib/config"
+	"github.com/syncthing/syncthing/lib/db/backend"
+	"github.com/syncthing/syncthing/lib/locations"
+	"github.com/urfave/cli"
+)
+
+func responseToBArray(response *http.Response) ([]byte, error) {
+	bytes, err := io.ReadAll(response.Body)
+	if err != nil {
+		return nil, err
+	}
+	return bytes, response.Body.Close()
+}
+
+func emptyPost(url string) cli.ActionFunc {
+	return func(c *cli.Context) error {
+		client, err := getClientFactory(c).getClient()
+		if err != nil {
+			return err
+		}
+		_, err = client.Post(url, "")
+		return err
+	}
+}
+
+func indexDumpOutput(url string) cli.ActionFunc {
+	return func(c *cli.Context) error {
+		client, err := getClientFactory(c).getClient()
+		if err != nil {
+			return err
+		}
+		response, err := client.Get(url)
+		if errors.Is(err, errNotFound) {
+			return errors.New("not found (folder/file not in database)")
+		}
+		if err != nil {
+			return err
+		}
+		return prettyPrintResponse(response)
+	}
+}
+
+func saveToFile(url string) cli.ActionFunc {
+	return func(c *cli.Context) error {
+		client, err := getClientFactory(c).getClient()
+		if err != nil {
+			return err
+		}
+		response, err := client.Get(url)
+		if err != nil {
+			return err
+		}
+		_, params, err := mime.ParseMediaType(response.Header.Get("Content-Disposition"))
+		if err != nil {
+			return err
+		}
+		filename := params["filename"]
+		if filename == "" {
+			return errors.New("Missing filename in response")
+		}
+		bs, err := responseToBArray(response)
+		if err != nil {
+			return err
+		}
+		f, err := os.Create(filename)
+		if err != nil {
+			return err
+		}
+		defer f.Close()
+		_, err = f.Write(bs)
+		if err != nil {
+			return err
+		}
+		fmt.Println("Wrote results to", filename)
+		return err
+	}
+}
+
+func getConfig(c APIClient) (config.Configuration, error) {
+	cfg := config.Configuration{}
+	response, err := c.Get("system/config")
+	if err != nil {
+		return cfg, err
+	}
+	bytes, err := responseToBArray(response)
+	if err != nil {
+		return cfg, err
+	}
+	err = json.Unmarshal(bytes, &cfg)
+	if err == nil {
+		return cfg, err
+	}
+	return cfg, nil
+}
+
+func expects(n int, actionFunc cli.ActionFunc) cli.ActionFunc {
+	return func(ctx *cli.Context) error {
+		if ctx.NArg() != n {
+			plural := ""
+			if n != 1 {
+				plural = "s"
+			}
+			return fmt.Errorf("expected %d argument%s, got %d", n, plural, ctx.NArg())
+		}
+		return actionFunc(ctx)
+	}
+}
+
+func prettyPrintJSON(data interface{}) error {
+	enc := json.NewEncoder(os.Stdout)
+	enc.SetIndent("", "  ")
+	return enc.Encode(data)
+}
+
+func prettyPrintResponse(response *http.Response) error {
+	bytes, err := responseToBArray(response)
+	if err != nil {
+		return err
+	}
+	var data interface{}
+	if err := json.Unmarshal(bytes, &data); err != nil {
+		return err
+	}
+	// TODO: Check flag for pretty print format
+	return prettyPrintJSON(data)
+}
+
+func getDB() (backend.Backend, error) {
+	return backend.OpenLevelDBRO(locations.Get(locations.Database))
+}
+
+func nulString(bs []byte) string {
+	for i := range bs {
+		if bs[i] == 0 {
+			return string(bs[:i])
+		}
+	}
+	return string(bs)
+}
+
+func normalizePath(path string) string {
+	return filepath.ToSlash(filepath.Clean(path))
+}
+
+func getClientFactory(c *cli.Context) *apiClientFactory {
+	return c.App.Metadata["clientFactory"].(*apiClientFactory)
+}
--- a/cmd/syncthing/cmdutil/options_common.go
+++ b/cmd/syncthing/cmdutil/options_common.go
@@ -0,0 +1,15 @@
+// Copyright (C) 2021 The Syncthing Authors.
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this file,
+// You can obtain one at https://mozilla.org/MPL/2.0/.
+
+package cmdutil
+
+// CommonOptions are reused among several subcommands
+type CommonOptions struct {
+	buildCommonOptions
+	ConfDir         string `name:"config" placeholder:"PATH" help:"Set configuration directory (config and keys)"`
+	HomeDir         string `name:"home" placeholder:"PATH" help:"Set configuration and data directory"`
+	NoDefaultFolder bool   `env:"STNODEFAULTFOLDER" help:"Don't create the \"default\" folder on first startup"`
+}
--- a/cmd/syncthing/cmdutil/options_others.go
+++ b/cmd/syncthing/cmdutil/options_others.go
@@ -1,10 +1,14 @@
-// Copyright (C) 2016 The Syncthing Authors.
+// Copyright (C) 2021 The Syncthing Authors.
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.

-// The existence of this file means we get 0% test coverage rather than no
-// test coverage at all. Remove when implementing an actual test.
+//go:build !windows
+// +build !windows

-package stats
+package cmdutil
+
+type buildCommonOptions struct {
+	HideConsole bool `hidden:""`
+}
--- a/cmd/syncthing/cmdutil/options_windows.go
+++ b/cmd/syncthing/cmdutil/options_windows.go
@@ -0,0 +1,11 @@
+// Copyright (C) 2021 The Syncthing Authors.
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this file,
+// You can obtain one at https://mozilla.org/MPL/2.0/.
+
+package cmdutil
+
+type buildCommonOptions struct {
+	HideConsole bool `name:"no-console" help:"Hide console window"`
+}
--- a/cmd/syncthing/cmdutil/util.go
+++ b/cmd/syncthing/cmdutil/util.go
@@ -0,0 +1,35 @@
+// Copyright (C) 2014 The Syncthing Authors.
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this file,
+// You can obtain one at https://mozilla.org/MPL/2.0/.
+
+package cmdutil
+
+import (
+	"errors"
+
+	"github.com/syncthing/syncthing/lib/locations"
+)
+
+func SetConfigDataLocationsFromFlags(homeDir, confDir, dataDir string) error {
+	homeSet := homeDir != ""
+	confSet := confDir != ""
+	dataSet := dataDir != ""
+	switch {
+	case dataSet != confSet:
+		return errors.New("either both or none of --config and --data must be given, use --home to set both at once")
+	case homeSet && dataSet:
+		return errors.New("--home must not be used together with --config and --data")
+	case homeSet:
+		confDir = homeDir
+		dataDir = homeDir
+		fallthrough
+	case dataSet:
+		if err := locations.SetBaseDir(locations.ConfigBaseDir, confDir); err != nil {
+			return err
+		}
+		return locations.SetBaseDir(locations.DataBaseDir, dataDir)
+	}
+	return nil
+}
--- a/cmd/syncthing/crash_reporting.go
+++ b/cmd/syncthing/crash_reporting.go
@@ -10,7 +10,6 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"io/ioutil"
 	"net/http"
 	"os"
 	"path/filepath"
@@ -62,7 +61,7 @@ func uploadPanicLogs(ctx context.Context, urlBase, dir string) {
 // the log contents. A HEAD request is made to see if the log has already
 // been reported. If not, a PUT is made with the log contents.
 func uploadPanicLog(ctx context.Context, urlBase, file string) error {
-	data, err := ioutil.ReadFile(file)
+	data, err := os.ReadFile(file)
 	if err != nil {
 		return err
 	}
--- a/cmd/syncthing/decrypt/decrypt.go
+++ b/cmd/syncthing/decrypt/decrypt.go
@@ -0,0 +1,275 @@
+// Copyright (C) 2021 The Syncthing Authors.
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this file,
+// You can obtain one at https://mozilla.org/MPL/2.0/.
+
+// Package decrypt implements the `syncthing decrypt` subcommand.
+package decrypt
+
+import (
+	"encoding/binary"
+	"encoding/json"
+	"fmt"
+	"io"
+	"log"
+	"os"
+	"path/filepath"
+
+	"github.com/syncthing/syncthing/lib/config"
+	"github.com/syncthing/syncthing/lib/fs"
+	"github.com/syncthing/syncthing/lib/osutil"
+	"github.com/syncthing/syncthing/lib/protocol"
+	"github.com/syncthing/syncthing/lib/scanner"
+)
+
+type CLI struct {
+	Path       string `arg:"" required:"1" help:"Path to encrypted folder"`
+	To         string `xor:"mode" placeholder:"PATH" help:"Destination directory, when decrypting"`
+	VerifyOnly bool   `xor:"mode" help:"Don't write decrypted files to disk (but verify plaintext hashes)"`
+	Password   string `help:"Folder password for decryption / verification" env:"FOLDER_PASSWORD"`
+	FolderID   string `help:"Folder ID of the encrypted folder, if it cannot be determined automatically"`
+	Continue   bool   `help:"Continue processing next file in case of error, instead of aborting"`
+	Verbose    bool   `help:"Show verbose progress information"`
+	TokenPath  string `placeholder:"PATH" help:"Path to the token file within the folder (used to determine folder ID)"`
+
+	folderKey *[32]byte
+}
+
+type storedEncryptionToken struct {
+	FolderID string
+	Token    []byte
+}
+
+func (c *CLI) Run() error {
+	log.SetFlags(0)
+
+	if c.To == "" && !c.VerifyOnly {
+		return fmt.Errorf("must set --to or --verify-only")
+	}
+
+	if c.TokenPath == "" {
+		// This is a bit long to show as default in --help
+		c.TokenPath = filepath.Join(config.DefaultMarkerName, config.EncryptionTokenName)
+	}
+
+	if c.FolderID == "" {
+		// We should try to figure out the folder ID
+		folderID, err := c.getFolderID()
+		if err != nil {
+			log.Println("No --folder-id given and couldn't read folder token")
+			return fmt.Errorf("getting folder ID: %w", err)
+		}
+
+		c.FolderID = folderID
+		if c.Verbose {
+			log.Println("Found folder ID:", c.FolderID)
+		}
+	}
+
+	c.folderKey = protocol.KeyFromPassword(c.FolderID, c.Password)
+
+	return c.walk()
+}
+
+// walk finds and processes every file in the encrypted folder
+func (c *CLI) walk() error {
+	srcFs := fs.NewFilesystem(fs.FilesystemTypeBasic, c.Path)
+	var dstFs fs.Filesystem
+	if c.To != "" {
+		dstFs = fs.NewFilesystem(fs.FilesystemTypeBasic, c.To)
+	}
+
+	return srcFs.Walk(".", func(path string, info fs.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+		if !info.IsRegular() {
+			return nil
+		}
+		if fs.IsInternal(path) {
+			return nil
+		}
+
+		return c.withContinue(c.process(srcFs, dstFs, path))
+	})
+}
+
+// If --continue was set we just mention the error and return nil to
+// continue processing.
+func (c *CLI) withContinue(err error) error {
+	if err == nil {
+		return nil
+	}
+	if c.Continue {
+		log.Println("Warning:", err)
+		return nil
+	}
+	return err
+}
+
+// getFolderID returns the folder ID found in the encrypted token, or an
+// error.
+func (c *CLI) getFolderID() (string, error) {
+	tokenPath := filepath.Join(c.Path, c.TokenPath)
+	bs, err := os.ReadFile(tokenPath)
+	if err != nil {
+		return "", fmt.Errorf("reading folder token: %w", err)
+	}
+
+	var tok storedEncryptionToken
+	if err := json.Unmarshal(bs, &tok); err != nil {
+		return "", fmt.Errorf("parsing folder token: %w", err)
+	}
+
+	return tok.FolderID, nil
+}
+
+// process handles the file named path in srcFs, decrypting it into dstFs
+// unless dstFs is nil.
+func (c *CLI) process(srcFs fs.Filesystem, dstFs fs.Filesystem, path string) error {
+	if c.Verbose {
+		log.Printf("Processing %q", path)
+	}
+
+	encFd, err := srcFs.Open(path)
+	if err != nil {
+		return err
+	}
+	defer encFd.Close()
+
+	encFi, err := c.loadEncryptedFileInfo(encFd)
+	if err != nil {
+		return fmt.Errorf("%s: loading metadata trailer: %w", path, err)
+	}
+
+	// Workaround for a bug in <= v1.15.0-rc.5 where we stored names
+	// in native format, while protocol expects wire format (slashes).
+	encFi.Name = osutil.NormalizedFilename(encFi.Name)
+
+	plainFi, err := protocol.DecryptFileInfo(*encFi, c.folderKey)
+	if err != nil {
+		return fmt.Errorf("%s: decrypting metadata: %w", path, err)
+	}
+
+	if c.Verbose {
+		log.Printf("Plaintext filename is %q", plainFi.Name)
+	}
+
+	var plainFd fs.File
+	if dstFs != nil {
+		if err := dstFs.MkdirAll(filepath.Dir(plainFi.Name), 0700); err != nil {
+			return fmt.Errorf("%s: %w", plainFi.Name, err)
+		}
+
+		plainFd, err = dstFs.Create(plainFi.Name)
+		if err != nil {
+			return fmt.Errorf("%s: %w", plainFi.Name, err)
+		}
+		defer plainFd.Close() // also closed explicitly in the return
+	}
+
+	if err := c.decryptFile(encFi, &plainFi, encFd, plainFd); err != nil {
+		// Decrypting the file failed, leaving it in an inconsistent state.
+		// Delete it. Even --continue currently doesn't mean "leave broken
+		// stuff in place", it just means "try the next file instead of
+		// aborting".
+		if plainFd != nil {
+			_ = dstFs.Remove(plainFd.Name())
+		}
+		return fmt.Errorf("%s: %s: %w", path, plainFi.Name, err)
+	} else if c.Verbose {
+		log.Printf("Data verified for %q", plainFi.Name)
+	}
+
+	if plainFd != nil {
+		return plainFd.Close()
+	}
+	return nil
+}
+
+// decryptFile reads, decrypts and verifies all the blocks in src, writing
+// it to dst if dst is non-nil. (If dst is nil it just becomes a
+// read-and-verify operation.)
+func (c *CLI) decryptFile(encFi *protocol.FileInfo, plainFi *protocol.FileInfo, src io.ReaderAt, dst io.WriterAt) error {
+	// The encrypted and plaintext files must consist of an equal number of blocks
+	if len(encFi.Blocks) != len(plainFi.Blocks) {
+		return fmt.Errorf("block count mismatch: encrypted %d != plaintext %d", len(encFi.Blocks), len(plainFi.Blocks))
+	}
+
+	fileKey := protocol.FileKey(plainFi.Name, c.folderKey)
+	for i, encBlock := range encFi.Blocks {
+		// Read the encrypted block
+		buf := make([]byte, encBlock.Size)
+		if _, err := src.ReadAt(buf, encBlock.Offset); err != nil {
+			return fmt.Errorf("encrypted block %d (%d bytes): %w", i, encBlock.Size, err)
+		}
+
+		// Decrypt it
+		dec, err := protocol.DecryptBytes(buf, fileKey)
+		if err != nil {
+			return fmt.Errorf("encrypted block %d (%d bytes): %w", i, encBlock.Size, err)
+		}
+
+		// Verify the block size against the expected plaintext
+		plainBlock := plainFi.Blocks[i]
+		if i == len(plainFi.Blocks)-1 && len(dec) > plainBlock.Size {
+			// The last block might be padded, which is fine (we skip the padding)
+			dec = dec[:plainBlock.Size]
+		} else if len(dec) != plainBlock.Size {
+			return fmt.Errorf("plaintext block %d size mismatch, actual %d != expected %d", i, len(dec), plainBlock.Size)
+		}
+
+		// Verify the hash against the plaintext block info
+		if !scanner.Validate(dec, plainBlock.Hash, 0) {
+			// The block decrypted correctly but fails the hash check. This
+			// is odd and unexpected, but it it's still a valid block from
+			// the source. The file might have changed while we pulled it?
+			err := fmt.Errorf("plaintext block %d (%d bytes) failed validation after decryption", i, plainBlock.Size)
+			if c.Continue {
+				log.Printf("Warning: %s: %s: %v", encFi.Name, plainFi.Name, err)
+			} else {
+				return err
+			}
+		}
+
+		// Write it to the destination, unless we're just verifying.
+		if dst != nil {
+			if _, err := dst.WriteAt(dec, plainBlock.Offset); err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}
+
+// loadEncryptedFileInfo loads the encrypted FileInfo trailer from a file on
+// disk.
+func (c *CLI) loadEncryptedFileInfo(fd fs.File) (*protocol.FileInfo, error) {
+	// Seek to the size of the trailer block
+	if _, err := fd.Seek(-4, io.SeekEnd); err != nil {
+		return nil, err
+	}
+	var bs [4]byte
+	if _, err := io.ReadFull(fd, bs[:]); err != nil {
+		return nil, err
+	}
+	size := int64(binary.BigEndian.Uint32(bs[:]))
+
+	// Seek to the start of the trailer
+	if _, err := fd.Seek(-(4 + size), io.SeekEnd); err != nil {
+		return nil, err
+	}
+	trailer := make([]byte, size)
+	if _, err := io.ReadFull(fd, trailer); err != nil {
+		return nil, err
+	}
+
+	var encFi protocol.FileInfo
+	if err := encFi.Unmarshal(trailer); err != nil {
+		return nil, err
+	}
+
+	return &encFi, nil
+}
--- a/cmd/syncthing/generate/generate.go
+++ b/cmd/syncthing/generate/generate.go
@@ -0,0 +1,144 @@
+// Copyright (C) 2021 The Syncthing Authors.
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this file,
+// You can obtain one at https://mozilla.org/MPL/2.0/.
+
+// Package generate implements the `syncthing generate` subcommand.
+package generate
+
+import (
+	"bufio"
+	"context"
+	"crypto/tls"
+	"fmt"
+	"log"
+	"os"
+
+	"github.com/syncthing/syncthing/cmd/syncthing/cmdutil"
+	"github.com/syncthing/syncthing/lib/config"
+	"github.com/syncthing/syncthing/lib/events"
+	"github.com/syncthing/syncthing/lib/fs"
+	"github.com/syncthing/syncthing/lib/locations"
+	"github.com/syncthing/syncthing/lib/osutil"
+	"github.com/syncthing/syncthing/lib/protocol"
+	"github.com/syncthing/syncthing/lib/syncthing"
+)
+
+type CLI struct {
+	cmdutil.CommonOptions
+	GUIUser     string `placeholder:"STRING" help:"Specify new GUI authentication user name"`
+	GUIPassword string `placeholder:"STRING" help:"Specify new GUI authentication password (use - to read from standard input)"`
+}
+
+func (c *CLI) Run() error {
+	log.SetFlags(0)
+
+	if c.HideConsole {
+		osutil.HideConsole()
+	}
+
+	if c.HomeDir != "" {
+		if c.ConfDir != "" {
+			return fmt.Errorf("--home must not be used together with --config")
+		}
+		c.ConfDir = c.HomeDir
+	}
+	if c.ConfDir == "" {
+		c.ConfDir = locations.GetBaseDir(locations.ConfigBaseDir)
+	}
+
+	// Support reading the password from a pipe or similar
+	if c.GUIPassword == "-" {
+		reader := bufio.NewReader(os.Stdin)
+		password, _, err := reader.ReadLine()
+		if err != nil {
+			return fmt.Errorf("Failed reading GUI password: %w", err)
+		}
+		c.GUIPassword = string(password)
+	}
+
+	if err := Generate(c.ConfDir, c.GUIUser, c.GUIPassword, c.NoDefaultFolder); err != nil {
+		return fmt.Errorf("Failed to generate config and keys: %w", err)
+	}
+	return nil
+}
+
+func Generate(confDir, guiUser, guiPassword string, noDefaultFolder bool) error {
+	dir, err := fs.ExpandTilde(confDir)
+	if err != nil {
+		return err
+	}
+
+	if err := syncthing.EnsureDir(dir, 0700); err != nil {
+		return err
+	}
+	locations.SetBaseDir(locations.ConfigBaseDir, dir)
+
+	var myID protocol.DeviceID
+	certFile, keyFile := locations.Get(locations.CertFile), locations.Get(locations.KeyFile)
+	cert, err := tls.LoadX509KeyPair(certFile, keyFile)
+	if err == nil {
+		log.Println("WARNING: Key exists; will not overwrite.")
+	} else {
+		cert, err = syncthing.GenerateCertificate(certFile, keyFile)
+		if err != nil {
+			return fmt.Errorf("create certificate: %w", err)
+		}
+	}
+	myID = protocol.NewDeviceID(cert.Certificate[0])
+	log.Println("Device ID:", myID)
+
+	cfgFile := locations.Get(locations.ConfigFile)
+	var cfg config.Wrapper
+	if _, err := os.Stat(cfgFile); err == nil {
+		if guiUser == "" && guiPassword == "" {
+			log.Println("WARNING: Config exists; will not overwrite.")
+			return nil
+		}
+
+		if cfg, _, err = config.Load(cfgFile, myID, events.NoopLogger); err != nil {
+			return fmt.Errorf("load config: %w", err)
+		}
+	} else {
+		if cfg, err = syncthing.DefaultConfig(cfgFile, myID, events.NoopLogger, noDefaultFolder); err != nil {
+			return fmt.Errorf("create config: %w", err)
+		}
+	}
+
+	ctx, cancel := context.WithCancel(context.Background())
+	go cfg.Serve(ctx)
+	defer cancel()
+
+	var updateErr error
+	waiter, err := cfg.Modify(func(cfg *config.Configuration) {
+		updateErr = updateGUIAuthentication(&cfg.GUI, guiUser, guiPassword)
+	})
+	if err != nil {
+		return fmt.Errorf("modify config: %w", err)
+	}
+
+	waiter.Wait()
+	if updateErr != nil {
+		return updateErr
+	}
+	if err := cfg.Save(); err != nil {
+		return fmt.Errorf("save config: %w", err)
+	}
+	return nil
+}
+
+func updateGUIAuthentication(guiCfg *config.GUIConfiguration, guiUser, guiPassword string) error {
+	if guiUser != "" && guiCfg.User != guiUser {
+		guiCfg.User = guiUser
+		log.Println("Updated GUI authentication user name:", guiUser)
+	}
+
+	if guiPassword != "" && guiCfg.Password != guiPassword {
+		if err := guiCfg.HashAndSetPassword(guiPassword); err != nil {
+			return fmt.Errorf("Failed to set GUI authentication password: %w", err)
+		}
+		log.Println("Updated GUI authentication password.")
+	}
+	return nil
+}
--- a/cmd/syncthing/heapprof.go
+++ b/cmd/syncthing/heapprof.go
@@ -11,24 +11,17 @@ import (
 	"os"
 	"runtime"
 	"runtime/pprof"
-	"strconv"
 	"syscall"
 	"time"
 )

-func init() {
-	if innerProcess && os.Getenv("STHEAPPROFILE") != "" {
-		rate := 1
-		if i, err := strconv.Atoi(os.Getenv("STHEAPPROFILE")); err == nil {
-			rate = i
-		}
-		l.Debugln("Starting heap profiling")
-		go func() {
-			err := saveHeapProfiles(rate) // Only returns on error
-			l.Warnln("Heap profiler failed:", err)
-			panic("Heap profiler failed")
-		}()
-	}
+func startHeapProfiler() {
+	l.Debugln("Starting heap profiling")
+	go func() {
+		err := saveHeapProfiles(1) // Only returns on error
+		l.Warnln("Heap profiler failed:", err)
+		panic("Heap profiler failed")
+	}()
 }

 func saveHeapProfiles(rate int) error {
--- a/cmd/syncthing/main.go
+++ b/cmd/syncthing/main.go
--- a/cmd/syncthing/monitor.go
+++ b/cmd/syncthing/monitor.go
@@ -25,8 +25,8 @@ import (
 	"github.com/syncthing/syncthing/lib/locations"
 	"github.com/syncthing/syncthing/lib/osutil"
 	"github.com/syncthing/syncthing/lib/protocol"
+	"github.com/syncthing/syncthing/lib/svcutil"
 	"github.com/syncthing/syncthing/lib/sync"
-	"github.com/syncthing/syncthing/lib/syncthing"
 )

 var (
@@ -36,20 +36,21 @@ var (
 )

 const (
-	countRestarts         = 4
-	loopThreshold         = 60 * time.Second
+	restartCounts         = 4
+	restartPause          = 1 * time.Second
+	restartLoopThreshold  = 60 * time.Second
 	logFileAutoCloseDelay = 5 * time.Second
 	logFileMaxOpenTime    = time.Minute
 	panicUploadMaxWait    = 30 * time.Second
 	panicUploadNoticeWait = 10 * time.Second
 )

-func monitorMain(runtimeOptions RuntimeOptions) {
+func monitorMain(options serveOptions) {
 	l.SetPrefix("[monitor] ")

 	var dst io.Writer = os.Stdout

-	logFile := runtimeOptions.logFile
+	logFile := options.LogFile
 	if logFile != "-" {
 		if expanded, err := fs.ExpandTilde(logFile); err == nil {
 			logFile = expanded
@@ -59,8 +60,8 @@ func monitorMain(runtimeOptions RuntimeOptions) {
 		open := func(name string) (io.WriteCloser, error) {
 			return newAutoclosedFile(name, logFileAutoCloseDelay, logFileMaxOpenTime)
 		}
-		if runtimeOptions.logMaxSize > 0 {
-			fileDst, err = newRotatedFile(logFile, open, int64(runtimeOptions.logMaxSize), runtimeOptions.logMaxFiles)
+		if options.LogMaxSize > 0 {
+			fileDst, err = newRotatedFile(logFile, open, int64(options.LogMaxSize), options.LogMaxFiles)
 		} else {
 			fileDst, err = open(logFile)
 		}
@@ -84,7 +85,7 @@ func monitorMain(runtimeOptions RuntimeOptions) {
 	}

 	args := os.Args
-	var restarts [countRestarts]time.Time
+	var restarts [restartCounts]time.Time

 	stopSign := make(chan os.Signal, 1)
 	signal.Notify(stopSign, os.Interrupt, sigTerm)
@@ -97,9 +98,9 @@ func monitorMain(runtimeOptions RuntimeOptions) {
 	for {
 		maybeReportPanics()

-		if t := time.Since(restarts[0]); t < loopThreshold {
-			l.Warnf("%d restarts in %v; not retrying further", countRestarts, t)
-			os.Exit(syncthing.ExitError.AsInt())
+		if t := time.Since(restarts[0]); t < restartLoopThreshold {
+			l.Warnf("%d restarts in %v; not retrying further", restartCounts, t)
+			os.Exit(svcutil.ExitError.AsInt())
 		}

 		copy(restarts[0:], restarts[1:])
@@ -169,15 +170,15 @@ func monitorMain(runtimeOptions RuntimeOptions) {

 		if err == nil {
 			// Successful exit indicates an intentional shutdown
-			os.Exit(syncthing.ExitSuccess.AsInt())
+			os.Exit(svcutil.ExitSuccess.AsInt())
 		}

 		if exiterr, ok := err.(*exec.ExitError); ok {
 			exitCode := exiterr.ExitCode()
-			if stopped || runtimeOptions.noRestart {
+			if stopped || options.NoRestart {
 				os.Exit(exitCode)
 			}
-			if exitCode == syncthing.ExitUpgrade.AsInt() {
+			if exitCode == svcutil.ExitUpgrade.AsInt() {
 				// Restart the monitor process to release the .old
 				// binary as part of the upgrade process.
 				l.Infoln("Restarting monitor...")
@@ -188,12 +189,12 @@ func monitorMain(runtimeOptions RuntimeOptions) {
 			}
 		}

-		if runtimeOptions.noRestart {
-			os.Exit(syncthing.ExitError.AsInt())
+		if options.NoRestart {
+			os.Exit(svcutil.ExitError.AsInt())
 		}

 		l.Infoln("Syncthing exited:", err)
-		time.Sleep(1 * time.Second)
+		time.Sleep(restartPause)

 		if first {
 			// Let the next child process know that this is not the first time
--- a/cmd/syncthing/monitor_test.go
+++ b/cmd/syncthing/monitor_test.go
@@ -8,7 +8,6 @@ package main

 import (
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"testing"
@@ -18,7 +17,7 @@ import (
 func TestRotatedFile(t *testing.T) {
 	// Verify that log rotation happens.

-	dir, err := ioutil.TempDir("", "syncthing")
+	dir, err := os.MkdirTemp("", "syncthing")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -179,7 +178,7 @@ func TestAutoClosedFile(t *testing.T) {
 	}

 	// The file should have both writes in it.
-	bs, err := ioutil.ReadFile(file)
+	bs, err := os.ReadFile(file)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -199,7 +198,7 @@ func TestAutoClosedFile(t *testing.T) {
 	}

 	// It should now contain three writes, as the file is always opened for appending
-	bs, err = ioutil.ReadFile(file)
+	bs, err = os.ReadFile(file)
 	if err != nil {
 		t.Fatal(err)
 	}
--- a/cmd/syncthing/openurl_unix.go
+++ b/cmd/syncthing/openurl_unix.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.

+//go:build !windows
 // +build !windows

 package main
--- a/cmd/syncthing/openurl_windows.go
+++ b/cmd/syncthing/openurl_windows.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.

+//go:build windows
 // +build windows

 package main
--- a/cmd/syncthing/perfstats_unix.go
+++ b/cmd/syncthing/perfstats_unix.go
@@ -4,6 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.

+//go:build !solaris && !windows
 // +build !solaris,!windows

 package main
@@ -18,10 +19,8 @@ import (
 	"github.com/syncthing/syncthing/lib/protocol"
 )

-func init() {
-	if innerProcess && os.Getenv("STPERFSTATS") != "" {
-		go savePerfStats(fmt.Sprintf("perfstats-%d.csv", syscall.Getpid()))
-	}
+func startPerfStats() {
+	go savePerfStats(fmt.Sprintf("perfstats-%d.csv", syscall.Getpid()))
 }

 func savePerfStats(file string) {
--- a/cmd/syncthing/perfstats_unsupported.go
+++ b/cmd/syncthing/perfstats_unsupported.go
@@ -0,0 +1,13 @@
+// Copyright (C) 2021 The Syncthing Authors.
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this file,
+// You can obtain one at https://mozilla.org/MPL/2.0/.
+
+//go:build solaris || windows
+// +build solaris windows
+
+package main
+
+func startPerfStats() {
+}
--- a/cmd/syncthing/traceback.go
+++ b/cmd/syncthing/traceback.go
@@ -4,7 +4,8 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.

-//+build go1.7
+//go:build go1.7
+// +build go1.7

 package main

--- a/cmd/syncthing/usage.go
+++ b/cmd/syncthing/usage.go
@@ -1,57 +0,0 @@
-// Copyright (C) 2014 The Syncthing Authors.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at https://mozilla.org/MPL/2.0/.
-
-package main
-
-import (
-	"bytes"
-	"flag"
-	"fmt"
-	"io"
-	"text/tabwriter"
-)
-
-func optionTable(w io.Writer, rows [][]string) {
-	tw := tabwriter.NewWriter(w, 2, 4, 2, ' ', 0)
-	for _, row := range rows {
-		for i, cell := range row {
-			if i > 0 {
-				tw.Write([]byte("\t"))
-			}
-			tw.Write([]byte(cell))
-		}
-		tw.Write([]byte("\n"))
-	}
-	tw.Flush()
-}
-
-func usageFor(fs *flag.FlagSet, usage string, extra string) func() {
-	return func() {
-		var b bytes.Buffer
-		b.WriteString("Usage:\n  " + usage + "\n")
-
-		var options [][]string
-		fs.VisitAll(func(f *flag.Flag) {
-			var opt = "  -" + f.Name
-
-			if f.DefValue != "false" {
-				opt += "=" + fmt.Sprintf(`"%s"`, f.DefValue)
-			}
-			options = append(options, []string{opt, f.Usage})
-		})
-
-		if len(options) > 0 {
-			b.WriteString("\nOptions:\n")
-			optionTable(&b, options)
-		}
-
-		fmt.Println(b.String())
-
-		if len(extra) > 0 {
-			fmt.Println(extra)
-		}
-	}
-}
--- a/cmd/uraggregate/main.go
+++ b/cmd/uraggregate/main.go
@@ -47,32 +47,32 @@ func main() {
 func runAggregation(db *sql.DB) {
 	since := maxIndexedDay(db, "VersionSummary")
 	log.Println("Aggregating VersionSummary data since", since)
-	rows, err := aggregateVersionSummary(db, since)
+	rows, err := aggregateVersionSummary(db, since.Add(24*time.Hour))
 	if err != nil {
-		log.Fatalln("aggregate:", err)
+		log.Println("aggregate:", err)
 	}
 	log.Println("Inserted", rows, "rows")

 	log.Println("Aggregating UserMovement data")
 	rows, err = aggregateUserMovement(db)
 	if err != nil {
-		log.Fatalln("aggregate:", err)
+		log.Println("aggregate:", err)
 	}
 	log.Println("Inserted", rows, "rows")

-	log.Println("Aggregating Performance data")
 	since = maxIndexedDay(db, "Performance")
-	rows, err = aggregatePerformance(db, since)
+	log.Println("Aggregating Performance data since", since)
+	rows, err = aggregatePerformance(db, since.Add(24*time.Hour))
 	if err != nil {
-		log.Fatalln("aggregate:", err)
+		log.Println("aggregate:", err)
 	}
 	log.Println("Inserted", rows, "rows")

-	log.Println("Aggregating BlockStats data")
 	since = maxIndexedDay(db, "BlockStats")
-	rows, err = aggregateBlockStats(db, since)
+	log.Println("Aggregating BlockStats data since", since)
+	rows, err = aggregateBlockStats(db, since.Add(24*time.Hour))
 	if err != nil {
-		log.Fatalln("aggregate:", err)
+		log.Println("aggregate:", err)
 	}
 	log.Println("Inserted", rows, "rows")
 }
@@ -135,35 +135,35 @@ func setupDB(db *sql.DB) error {

 	row := db.QueryRow(`SELECT 'UniqueDayVersionIndex'::regclass`)
 	if err := row.Scan(&t); err != nil {
-		_, err = db.Exec(`CREATE UNIQUE INDEX UniqueDayVersionIndex ON VersionSummary (Day, Version)`)
+		_, _ = db.Exec(`CREATE UNIQUE INDEX UniqueDayVersionIndex ON VersionSummary (Day, Version)`)
 	}

 	row = db.QueryRow(`SELECT 'VersionDayIndex'::regclass`)
 	if err := row.Scan(&t); err != nil {
-		_, err = db.Exec(`CREATE INDEX VersionDayIndex ON VersionSummary (Day)`)
+		_, _ = db.Exec(`CREATE INDEX VersionDayIndex ON VersionSummary (Day)`)
 	}

 	row = db.QueryRow(`SELECT 'MovementDayIndex'::regclass`)
 	if err := row.Scan(&t); err != nil {
-		_, err = db.Exec(`CREATE INDEX MovementDayIndex ON UserMovement (Day)`)
+		_, _ = db.Exec(`CREATE INDEX MovementDayIndex ON UserMovement (Day)`)
 	}

 	row = db.QueryRow(`SELECT 'PerformanceDayIndex'::regclass`)
 	if err := row.Scan(&t); err != nil {
-		_, err = db.Exec(`CREATE INDEX PerformanceDayIndex ON Performance (Day)`)
+		_, _ = db.Exec(`CREATE INDEX PerformanceDayIndex ON Performance (Day)`)
 	}

 	row = db.QueryRow(`SELECT 'BlockStatsDayIndex'::regclass`)
 	if err := row.Scan(&t); err != nil {
-		_, err = db.Exec(`CREATE INDEX BlockStatsDayIndex ON BlockStats (Day)`)
+		_, _ = db.Exec(`CREATE INDEX BlockStatsDayIndex ON BlockStats (Day)`)
 	}

-	return err
+	return nil
 }

 func maxIndexedDay(db *sql.DB, table string) time.Time {
 	var t time.Time
-	row := db.QueryRow("SELECT MAX(Day) FROM " + table)
+	row := db.QueryRow("SELECT MAX(DATE_TRUNC('day', Day)) FROM " + table)
 	err := row.Scan(&t)
 	if err != nil {
 		return time.Time{}
@@ -179,8 +179,8 @@ func aggregateVersionSummary(db *sql.DB, since time.Time) (int64, error) {
 		COUNT(*) AS Count
 		FROM ReportsJson
 		WHERE
-			DATE_TRUNC('day', Received) > $1
-			AND DATE_TRUNC('day', Received) < DATE_TRUNC('day', NOW())
+			Received > $1
+			AND Received < DATE_TRUNC('day', NOW())
 			AND Report->>'version' like 'v_.%'
 		GROUP BY Day, Ver
 		);
@@ -198,7 +198,8 @@ func aggregateUserMovement(db *sql.DB) (int64, error) {
 		Report->>'uniqueID'
 		FROM ReportsJson
 		WHERE
-			DATE_TRUNC('day', Received) < DATE_TRUNC('day', NOW())
+			Report->>'uniqueID' IS NOT NULL
+			AND Received < DATE_TRUNC('day', NOW())
 			AND Report->>'version' like 'v_.%'
 		ORDER BY Day
 	`)
@@ -283,9 +284,11 @@ func aggregatePerformance(db *sql.DB, since time.Time) (int64, error) {
 		AVG((Report->>'memoryUsageMiB')::numeric) As MemoryUsageMiB
 		FROM ReportsJson
 		WHERE
-			DATE_TRUNC('day', Received) > $1
-			AND DATE_TRUNC('day', Received) < DATE_TRUNC('day', NOW())
+			Received > $1
+			AND Received < DATE_TRUNC('day', NOW())
 			AND Report->>'version' like 'v_.%'
+			/* Some custom implementation reported bytes when we expect megabytes, cap at petabyte */
+			AND (Report->>'memorySize')::numeric < 1073741824
 		GROUP BY Day
 		);
 	`, since)
@@ -312,8 +315,8 @@ func aggregateBlockStats(db *sql.DB, since time.Time) (int64, error) {
 		SUM((Report->'blockStats'->>'copyElsewhere')::numeric) AS CopyElsewhere
 		FROM ReportsJson
 		WHERE
-			DATE_TRUNC('day', Received) > $1
-			AND DATE_TRUNC('day', Received) < DATE_TRUNC('day', NOW())
+			Received > $1
+			AND Received < DATE_TRUNC('day', NOW())
 			AND (Report->>'urVersion')::numeric >= 3
 			AND Report->>'version' like 'v_.%'
 			AND Report->>'version' NOT LIKE 'v0.14.40%'
--- a/cmd/ursrv/main.go
+++ b/cmd/ursrv/main.go
@@ -13,7 +13,6 @@ import (
 	"encoding/json"
 	"html/template"
 	"io"
-	"io/ioutil"
 	"log"
 	"net"
 	"net/http"
@@ -89,7 +88,7 @@ var funcs = map[string]interface{}{
 			parts = append(parts, part)
 		}
 		if len(input) > 0 {
-			parts = append(parts, input[:])
+			parts = append(parts, input)
 		}
 		return parts[whichPart-1]
 	},
@@ -162,7 +161,7 @@ func main() {
 	if err != nil {
 		log.Fatalln("template:", err)
 	}
-	bs, err := ioutil.ReadAll(fd)
+	bs, err := io.ReadAll(fd)
 	if err != nil {
 		log.Fatalln("template:", err)
 	}
@@ -324,7 +323,7 @@ func newDataHandler(db *sql.DB, w http.ResponseWriter, r *http.Request) {
 	rep.Address = addr

 	lr := &io.LimitedReader{R: r.Body, N: 40 * 1024}
-	bs, _ := ioutil.ReadAll(lr)
+	bs, _ := io.ReadAll(lr)
 	if err := json.Unmarshal(bs, &rep); err != nil {
 		log.Println("decode:", err)
 		if debug {
@@ -725,8 +724,8 @@ func getReport(db *sql.DB) map[string]interface{} {

 			if rep.NATType != "" {
 				natType := rep.NATType
-				natType = strings.Replace(natType, "unknown", "Unknown", -1)
-				natType = strings.Replace(natType, "Symetric", "Symmetric", -1)
+				natType = strings.ReplaceAll(natType, "unknown", "Unknown")
+				natType = strings.ReplaceAll(natType, "Symetric", "Symmetric")
 				add(featureGroups["Various"]["v3"], "NAT Type", natType, 1)
 			}

@@ -745,6 +744,7 @@ func getReport(db *sql.DB) map[string]interface{} {
 			inc(features["Folder"]["v3"], "Weak hash, custom threshold", rep.FolderUsesV3.CustomWeakHashThreshold)
 			inc(features["Folder"]["v3"], "Filesystem watcher", rep.FolderUsesV3.FsWatcherEnabled)
 			inc(features["Folder"]["v3"], "Case sensitive FS", rep.FolderUsesV3.CaseSensitiveFS)
+			inc(features["Folder"]["v3"], "Mode, receive encrypted", rep.FolderUsesV3.ReceiveEncrypted)

 			add(featureGroups["Folder"]["v3"], "Conflicts", "Disabled", rep.FolderUsesV3.ConflictsDisabled)
 			add(featureGroups["Folder"]["v3"], "Conflicts", "Unlimited", rep.FolderUsesV3.ConflictsUnlimited)
--- a/etc/firewall-ufw/syncthing
+++ b/etc/firewall-ufw/syncthing
@@ -1,7 +1,7 @@
 [syncthing]
 title=Syncthing
 description=Syncthing file synchronisation
-ports=22000/tcp|21027/udp
+ports=22000|21027/udp

 [syncthing-gui]
 title=Syncthing-GUI
--- a/etc/freebsd-rc/syncthing
+++ b/etc/freebsd-rc/syncthing
@@ -38,13 +38,14 @@ syncthing_group=${syncthing_group:-$syncthing_user}

 command=/usr/local/bin/syncthing
 pidfile=/var/run/syncthing.pid
-syncthing_flags="${syncthing_home:+-home=${syncthing_home}} ${syncthing_log_file:+-logfile=${syncthing_log_file}}"
+syncthing_cmd=serve
+syncthing_flags="${syncthing_home:+--home=${syncthing_home}} ${syncthing_log_file:+--logfile=${syncthing_log_file}}"

 syncthing_start() {
    echo "Starting syncthing"
    touch ${pidfile} && chown ${syncthing_user} ${pidfile}
    touch ${syncthing_log_file} && chown ${syncthing_user} ${syncthing_log_file}
-    /usr/sbin/daemon -cf -p ${pidfile} -u ${syncthing_user} ${command} ${syncthing_flags}
+    /usr/sbin/daemon -cf -p ${pidfile} -u ${syncthing_user} ${command} ${syncthing_cmd} ${syncthing_flags}
 }

 syncthing_cleanup() {
--- a/etc/linux-desktop/syncthing-start.desktop
+++ b/etc/linux-desktop/syncthing-start.desktop
@@ -2,7 +2,7 @@
 Name=Start Syncthing
 GenericName=File synchronization
 Comment=Starts the main syncthing process in the background.
-Exec=/usr/bin/syncthing -no-browser -logfile=default
+Exec=/usr/bin/syncthing serve --no-browser --logfile=default
 Icon=syncthing
 Terminal=false
 Type=Application
--- a/etc/linux-runit/run
+++ b/etc/linux-runit/run
@@ -5,5 +5,4 @@ export HOME="/home/$USERNAME"
 export SYNCTHING="$HOME/bin/syncthing"

 exec 2>&1
-exec chpst -u "$USERNAME" "$SYNCTHING" -logflags 0
-
+exec chpst -u "$USERNAME" "$SYNCTHING" serve --logflags 0
--- a/etc/linux-sysctl/30-syncthing.conf
+++ b/etc/linux-sysctl/30-syncthing.conf
@@ -0,0 +1,3 @@
+# Increase maximum receive socket buffer size to 2MiB for QUIC connections
+# see https://github.com/lucas-clemente/quic-go/wiki/UDP-Receive-Buffer-Size
+net.core.rmem_max = 2097152
--- a/etc/linux-sysctl/README.md
+++ b/etc/linux-sysctl/README.md
@@ -0,0 +1,21 @@
+sysctl configuration to raise UDP buffer size
+===================
+Installation
+-----------
+**Please note:** When you installed syncthing using the official deb package, you can skip the copying.
+
+Copy the file `30-syncthing.conf` to `/etc/sysctl.d/` (root permissions required).
+
+In a terminal run
+```
+sudo sysctl -q --system
+```
+to apply the sysctl changes.
+
+
+Verification
+----------
+You can verify that the new limit is active using
+```
+sysctl net.core.rmem_max
+```
--- a/etc/linux-systemd/system/syncthing@.service
+++ b/etc/linux-systemd/system/syncthing@.service
@@ -2,12 +2,14 @@
 Description=Syncthing - Open Source Continuous File Synchronization for %I
 Documentation=man:syncthing(1)
 After=network.target
+StartLimitIntervalSec=60
+StartLimitBurst=4

 [Service]
 User=%i
-ExecStart=/usr/bin/syncthing -no-browser -no-restart -logflags=0
+ExecStart=/usr/bin/syncthing serve --no-browser --no-restart --logflags=0
 Restart=on-failure
-RestartSec=5
+RestartSec=1
 SuccessExitStatus=3 4
 RestartForceExitStatus=3 4

--- a/etc/linux-systemd/user/syncthing.service
+++ b/etc/linux-systemd/user/syncthing.service
@@ -1,11 +1,13 @@
 [Unit]
 Description=Syncthing - Open Source Continuous File Synchronization
 Documentation=man:syncthing(1)
+StartLimitIntervalSec=60
+StartLimitBurst=4

 [Service]
-ExecStart=/usr/bin/syncthing -no-browser -no-restart -logflags=0
+ExecStart=/usr/bin/syncthing serve --no-browser --no-restart --logflags=0
 Restart=on-failure
-RestartSec=5
+RestartSec=1
 SuccessExitStatus=3 4
 RestartForceExitStatus=3 4

--- a/go.mod
+++ b/go.mod
@@ -1,53 +1,61 @@
 module github.com/syncthing/syncthing

 require (
-	github.com/AudriusButkevicius/pfilter v0.0.0-20190627213056-c55ef6137fc6
-	github.com/AudriusButkevicius/recli v0.0.5
-	github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
+	github.com/AudriusButkevicius/pfilter v0.0.10
+	github.com/AudriusButkevicius/recli v0.0.6
+	github.com/alecthomas/kong v0.2.17
 	github.com/bkaradzic/go-lz4 v0.0.0-20160924222819-7224d8d8f27e
 	github.com/calmh/xdr v1.1.0
-	github.com/ccding/go-stun v0.1.2
-	github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054 // indirect
+	github.com/ccding/go-stun v0.1.3
+	github.com/certifi/gocertifi v0.0.0-20210507211836-431795d63e8d // indirect
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/chmduquesne/rollinghash v0.0.0-20180912150627-a60f8e7142b5
+	github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
 	github.com/d4l3k/messagediff v1.2.1
-	github.com/dchest/siphash v1.2.2
-	github.com/dgraph-io/badger/v2 v2.0.3
 	github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568
+	github.com/fsnotify/fsnotify v1.5.1 // indirect
 	github.com/getsentry/raven-go v0.2.0
-	github.com/go-ldap/ldap/v3 v3.2.4
-	github.com/go-ole/go-ole v1.2.4 // indirect
+	github.com/go-asn1-ber/asn1-ber v1.5.3 // indirect
+	github.com/go-ldap/ldap/v3 v3.4.1
+	github.com/go-ole/go-ole v1.2.6-0.20210915003542-8b1f7f90f6b1 // indirect
 	github.com/gobwas/glob v0.2.3
-	github.com/gogo/protobuf v1.3.1
-	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e
-	github.com/golang/protobuf v1.4.3
-	github.com/greatroar/blobloom v0.5.0
-	github.com/jackpal/gateway v1.0.6
+	github.com/gogo/protobuf v1.3.2
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da
+	github.com/golang/snappy v0.0.4 // indirect
+	github.com/greatroar/blobloom v0.7.0
+	github.com/hashicorp/golang-lru v0.5.4
+	github.com/jackpal/gateway v1.0.7
 	github.com/jackpal/go-nat-pmp v1.0.2
 	github.com/julienschmidt/httprouter v1.3.0
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
-	github.com/lib/pq v1.8.0
-	github.com/lucas-clemente/quic-go v0.18.1
-	github.com/maruel/panicparse v1.5.1
-	github.com/mattn/go-isatty v0.0.12
-	github.com/minio/sha256-simd v0.1.1
+	github.com/klauspost/cpuid/v2 v2.0.9 // indirect
+	github.com/lib/pq v1.10.3
+	github.com/lucas-clemente/quic-go v0.24.0
+	github.com/maruel/panicparse v1.6.1
+	github.com/maxbrunsfeld/counterfeiter/v6 v6.3.0
+	github.com/minio/sha256-simd v1.0.0
 	github.com/miscreant/miscreant.go v0.0.0-20200214223636-26d376326b75
-	github.com/oschwald/geoip2-golang v1.4.0
-	github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
+	github.com/oschwald/geoip2-golang v1.5.0
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.8.0
-	github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0
-	github.com/sasha-s/go-deadlock v0.2.0
-	github.com/shirou/gopsutil v3.20.10+incompatible
-	github.com/syncthing/notify v0.0.0-20201109091751-9a0e44181151
+	github.com/prometheus/client_golang v1.11.0
+	github.com/prometheus/common v0.30.0 // indirect
+	github.com/prometheus/procfs v0.7.3 // indirect
+	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475
+	github.com/sasha-s/go-deadlock v0.3.1
+	github.com/shirou/gopsutil/v3 v3.21.8
+	github.com/syncthing/notify v0.0.0-20210616190510-c6b7342338d2
 	github.com/syndtr/goleveldb v1.0.1-0.20200815071216-d9e9293bd0f7
-	github.com/thejerf/suture v4.0.0+incompatible
-	github.com/urfave/cli v1.22.4
+	github.com/thejerf/suture/v4 v4.0.1
+	github.com/urfave/cli v1.22.5
 	github.com/vitrun/qart v0.0.0-20160531060029-bf64b92db6b0
-	golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
-	golang.org/x/net v0.0.0-20201031054903-ff519b6c9102
-	golang.org/x/sys v0.0.0-20201101102859-da207088b7d1
-	golang.org/x/text v0.3.4
-	golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
+	golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
+	golang.org/x/mod v0.5.1 // indirect
+	golang.org/x/net v0.0.0-20210924151903-3ad01bbaa167
+	golang.org/x/sys v0.0.0-20210925032602-92d5a993a665
+	golang.org/x/text v0.3.7
+	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
+	golang.org/x/tools v0.1.6
+	google.golang.org/protobuf v1.27.1
 )

-go 1.14
+go 1.16
--- a/go.sum
+++ b/go.sum
--- a/gui/black/assets/css/theme.css
+++ b/gui/black/assets/css/theme.css
@@ -42,7 +42,7 @@ a:hover,a:focus,a.focus{
 .nav-tabs > li > a:hover,
 .nav-tabs > li > a:focus {
  background-color: #222222 !important;
-  border: none !important;
+  border-color: transparent !important;
 }

 .navbar-text, .dropdown>a, .dropdown-menu>li>a, .hidden-xs>a, .navbar-link {
--- a/gui/dark/assets/css/theme.css
+++ b/gui/dark/assets/css/theme.css
@@ -45,7 +45,7 @@ a:hover,a:focus,a.focus{
 .nav-tabs > li > a:hover,
 .nav-tabs > li > a:focus {
  background-color: #424242 !important;
-  border: none !important;
+  border-color: transparent !important;
 }


--- a/gui/default/assets/css/overrides.css
+++ b/gui/default/assets/css/overrides.css
@@ -41,6 +41,12 @@ ul+h5 {
    float: none; /* issue #1197 */
 }

+#advancedAccordion input.form-control[type="checkbox"] {
+    box-shadow: none;
+    margin: 0;
+    width: auto;
+}
+
 .popover {
    max-width: none;
    min-width: 250px;
@@ -114,7 +120,8 @@ table.table-dynamic {
    word-break: break-all;
 }

-table.table-condensed td {
+table.table-condensed td,
+table.table-condensed th {
    overflow: hidden;
    text-overflow: ellipsis;
    white-space: nowrap;
@@ -357,7 +364,8 @@ ul.three-columns li, ul.two-columns li {
        overflow-y: scroll;
    }

-    table.table-condensed td {
+    table.table-condensed td,
+    table.table-condensed th {
        /* for mobile phones to allow linebreaks in long repro folder/shared with
        * columns. */
        white-space: normal;
@@ -429,3 +437,15 @@ ul.three-columns li, ul.two-columns li {
 .form-horizontal {
    margin-bottom: 10px;
 }
+
+/* Use the same style as Bootstrap uses for disabled <select>. */
+.form-control option[disabled] {
+    background-color: #eeeeee;
+    opacity: 1;
+}
+
+/* Make a "well" look more like a readonly text input when grouped with a button */
+.input-group .well-sm {
+  padding-top: 6px;
+  padding-bottom: 6px;
+}
--- a/gui/default/assets/lang/lang-bg.json
+++ b/gui/default/assets/lang/lang-bg.json
@@ -1,385 +1,442 @@
 {
-    "A device with that ID is already added.": "Устройство с този идентификатор е вече добавено.",
-    "A negative number of days doesn't make sense.": "Няма логика в задаването на отрицателен брой дни.",
-    "A new major version may not be compatible with previous versions.": "Нова основна версия, която може да не е съвместима с предишни версии.",
-    "API Key": "API Ключ",
-    "About": "За програмата",
+    "A device with that ID is already added.": "Устройство с този идентификатор вече е добавено.",
+    "A negative number of days doesn't make sense.": "Отрицателният брой дни е безсмислен.",
+    "A new major version may not be compatible with previous versions.": "Ново значимо издание, което може да е несъвместимо с предните издания.",
+    "API Key": "Ключ за ППИ",
+    "About": "Относно",
    "Action": "Действие",
-    "Actions": "Меню",
-    "Add": "Добави",
-    "Add Device": "Добави устройство",
-    "Add Folder": "Добави папка",
-    "Add Remote Device": "Добави ново устройство",
-    "Add devices from the introducer to our device list, for mutually shared folders.": "Добавяне на нови устройства през устройства предлагащи други устройства, за взаимно споделени папки.",
-    "Add new folder?": "Добави нова папка?",
-    "Additionally the full rescan interval will be increased (times 60, i.e. new default of 1h). You can also configure it manually for every folder later after choosing No.": "Също така интервалът за повторно сканиране ще бъде увеличен (60 пъти, пр. новият интервал бъде 1ч). Освен това може да го зададете и ръчно за всяка папка след като изберете Не.",
+    "Actions": "Действия",
+    "Add": "Добавяне",
+    "Add Device": "Добавяне на устройство",
+    "Add Folder": "Добавяне на папка",
+    "Add Remote Device": "Добавяне на устройство",
+    "Add devices from the introducer to our device list, for mutually shared folders.": "Добавяйте устройства през поръчителите за взаимно споделени папки.",
+    "Add new folder?": "Добавяне на тази папка?",
+    "Additionally the full rescan interval will be increased (times 60, i.e. new default of 1h). You can also configure it manually for every folder later after choosing No.": "Също така интервалът за повторно обхождане ще бъде увеличен (60 пъти, пр. новият интервал бъде 1ч). Освен това може да го зададете и ръчно за всяка папка след като изберете Не.",
    "Address": "Адрес",
    "Addresses": "Адреси",
-    "Advanced": "Допълнителни",
-    "Advanced Configuration": "Допълнителни настройки",
+    "Advanced": "Разширени",
+    "Advanced Configuration": "Разширени настройки",
    "All Data": "Всички данни",
-    "Allow Anonymous Usage Reporting?": "Разрешаване изпращането на анонимни статистически данни?",
+    "All folders shared with this device must be protected by a password, such that all sent data is unreadable without the given password.": "Всички папки, споделени с устройството трябва да бъдат защитени с парола, така че данните да са недостъпни без нея.",
+    "Allow Anonymous Usage Reporting?": "Разрешаване на анонимното отчитане на употребата?",
    "Allowed Networks": "Разрешени мрежи",
    "Alphabetic": "Азбучен ред",
-    "An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.": "Външна команда се занимава с версиите. Тази команда трябва да премахне файла от синхронизираната папка. Ако пътят до това приложение използва интервали, то той трябва да бъде заграден в кавички.",
-    "Anonymous Usage Reporting": "Анонимен доклад",
-    "Anonymous usage report format has changed. Would you like to move to the new format?": "Форматът на анонимния доклад е променен. Желаете ли да преминете към новия формат?",
-    "Are you sure you want to remove device {%name%}?": "Сигурни ли сте, че искате да премахнете устройството {{name}}?",
-    "Are you sure you want to remove folder {%label%}?": "Сигурни ли сте, че искате да премахнете папката {{label}}?",
-    "Are you sure you want to restore {%count%} files?": "Сигурни ли сте, че искате да възстановите файла {{count}}?",
-    "Are you sure you want to upgrade?": "Are you sure you want to upgrade?",
+    "An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.": "Външна команда управлява версиите. Тя трябва да премахне файла от синхронизираната папка. Ако в пътя до приложението има интервали, то той трябва да бъде поставен в кавички.",
+    "Anonymous Usage Reporting": "Анонимно отчитане на употреба",
+    "Anonymous usage report format has changed. Would you like to move to the new format?": "Форматът на данните за анонимно отчитане на употреба е променен. Желаете ли да използвате него вместо стария?",
+    "Are you sure you want to continue?": "Сигурни ли сте, че желаете да продължите?",
+    "Are you sure you want to override all remote changes?": "Сигурни ли сте, че желаете да отмените всички промени, направени отдалечено?",
+    "Are you sure you want to permanently delete all these files?": "Сигурни ли сте, че желаете всички тези файлове да бъдат безвъзвратно премахнати?",
+    "Are you sure you want to remove device {%name%}?": "Сигурни ли сте, че желаете устройството {{name}} да бъде премахнато?",
+    "Are you sure you want to remove folder {%label%}?": "Сигурни ли сте, че желаете папката {{label}} да бъде премахната?",
+    "Are you sure you want to restore {%count%} files?": "Сигурни ли сте, че желаете {{count}} файла да бъдат възстановени?",
+    "Are you sure you want to revert all local changes?": "Сигурни ли сте, че желаете всички местни промени да бъдат отменени?",
+    "Are you sure you want to upgrade?": "Желаете ли приложението да бъде обновено?",
    "Auto Accept": "Автоматично приемане",
-    "Automatic Crash Reporting": "Automatic Crash Reporting",
-    "Automatic upgrade now offers the choice between stable releases and release candidates.": "Автоматичното обновяване вече предлага избор между стабилни версии и кандидат версии.",
+    "Automatic Crash Reporting": "Автоматично изпращане на доклад за срив",
+    "Automatic upgrade now offers the choice between stable releases and release candidates.": "Автоматичното обновяване вече предлага избор между стабилни и предварителни издания.",
    "Automatic upgrades": "Автоматично обновяване",
-    "Automatic upgrades are always enabled for candidate releases.": "Automatic upgrades are always enabled for candidate releases.",
-    "Automatically create or share folders that this device advertises at the default path.": "Автоматично създаване или споделяне на папки, които това устройство предлага в пътя по подразбиране.",
-    "Available debug logging facilities:": "Дебъгинг функционалност на разположение:",
+    "Automatic upgrades are always enabled for candidate releases.": "Автоматичното обновяване е винаги включено за предварителните издания.",
+    "Automatically create or share folders that this device advertises at the default path.": "Автоматично създава в подразбираната папка или споделя папките, които устройството предлага.",
+    "Available debug logging facilities:": "Достъпни улеснения при отстраняване на дефекти:",
    "Be careful!": "Внимание!",
-    "Bugs": "Бъгове",
-    "Changelog": "Списък с промени",
-    "Clean out after": "Изчисти след",
-    "Cleaning Versions": "Cleaning Versions",
-    "Cleanup Interval": "Cleanup Interval",
-    "Click to see discovery failures": "Натиснете, за да видите грешки при откриването",
-    "Close": "Затвори",
+    "Bugs": "Дефекти",
+    "Cancel": "Отказ",
+    "Changelog": "Дневник на промените",
+    "Clean out after": "Почистване след",
+    "Cleaning Versions": "Почистване на версии",
+    "Cleanup Interval": "Интервал на почистване",
+    "Click to see discovery failures": "Преглед на грешки при откриване",
+    "Click to see full identification string and QR code.": "Преглед на идентификатор и код за QR.",
+    "Close": "Затваряне",
    "Command": "Команда",
-    "Comment, when used at the start of a line": "Коментар, използван в началото на реда",
+    "Comment, when used at the start of a line": "Коментар, когато се използва в началото на реда",
    "Compression": "Компресиране",
    "Configured": "Настроен",
-    "Connected (Unused)": "Connected (Unused)",
-    "Connection Error": "Грешка при свързването",
-    "Connection Type": "Вид връзка",
+    "Connected (Unused)": "Свързано (неизползвано)",
+    "Connection Error": "Грешка при осъществяване на връзка",
+    "Connection Type": "Вид на връзката",
    "Connections": "Връзки",
-    "Continuously watching for changes is now available within Syncthing. This will detect changes on disk and issue a scan on only the modified paths. The benefits are that changes are propagated quicker and that less full scans are required.": "Постоянния мониторинг за промени вече е част от Syncthing. При промени по файловете се стартира сканиране само за променените папки. Ползите са, че промените биват синхронизирани по-бързо, без да се изисква цялостно сканирания на папките.",
-    "Copied from elsewhere": "Копиране от някъде другаде",
-    "Copied from original": "Копиран от оригинала",
-    "Copyright © 2014-2019 the following Contributors:": "Copyright © 2014-2019 the following Contributors:",
-    "Creating ignore patterns, overwriting an existing file at {%path%}.": "Създаване на шаблони за игнориране, презаписване на съществуващ файл в {{path}}.",
-    "Currently Shared With Devices": "Currently Shared With Devices",
+    "Continuously watching for changes is now available within Syncthing. This will detect changes on disk and issue a scan on only the modified paths. The benefits are that changes are propagated quicker and that less full scans are required.": "Syncthing вече разполага с постоянно наблюдение за промени. Така се забелязват промените на дисковото устройство и се обхождат само променените папки. Ползите са, че промените се разпространяват по-бързо и с по-малко на брой пълни обхождания.",
+    "Copied from elsewhere": "Копирано от другаде",
+    "Copied from original": "Копирано от източника",
+    "Copyright © 2014-2019 the following Contributors:": "Всички права запазени © 2014-2019 за следните сътрудници:",
+    "Creating ignore patterns, overwriting an existing file at {%path%}.": "При създаване на шаблони за пренебрегване, съществуващият файл „{{path}}“ ще бъде презаписан.",
+    "Currently Shared With Devices": "Устройства, с които е споделена",
    "Danger!": "Опасност!",
-    "Debugging Facilities": "Дебъг функционалност",
+    "Debugging Facilities": "Отстраняване на дефекти",
+    "Default Configuration": "Настройки по подразбиране",
+    "Default Device": "Устройство по подразбиране",
+    "Default Folder": "Папка по подразбиране",
    "Default Folder Path": "Път до папка по подразбиране",
+    "Defaults": "Подразбирани",
+    "Delete": "Изтрий",
+    "Delete Unexpected Items": "Премахване на неочакваните",
    "Deleted": "Изтрито",
-    "Deselect All": "Никое",
-    "Deselect devices to stop sharing this folder with.": "Deselect devices to stop sharing this folder with.",
+    "Deselect All": "Изчистване",
+    "Deselect devices to stop sharing this folder with.": "Махнете отметката от устройство, за да спрете споделяне с него.",
+    "Deselect folders to stop sharing with this device.": "Махнете отметката от папка, за да спрете споделяне устройствто.",
    "Device": "Устройство",
    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Устройство \"{{name}}\" ({{device}}) с адрес {{address}} желае да се свърже. Да бъде ли добавено?",
    "Device ID": "Идентификатор на устройство",
-    "Device Identification": "Идентификатор на устройството",
+    "Device Identification": "Идентификатор на устройство",
    "Device Name": "Име на устройството",
-    "Device rate limits": "Device rate limits",
+    "Device is untrusted, enter encryption password": "Устройството е недоверено, въведете парола за шифроване",
+    "Device rate limits": "Ограничаване на скоростта",
    "Device that last modified the item": "Устройство, което последно промени обекта",
    "Devices": "Устройства",
-    "Disable Crash Reporting": "Disable Crash Reporting",
-    "Disabled": "Деактивирано",
-    "Disabled periodic scanning and disabled watching for changes": "Периодичните сканирания и наблюденията за промяна са деактивирани.",
-    "Disabled periodic scanning and enabled watching for changes": "Периодичните сканирания са деактивирани , а наблюденията за промяна са активирани.",
-    "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Периодичните сканирания са деактивирани и задаването на наблюдение за промени е неуспешно, ще опита пак след 1мин:",
-    "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": "Discard",
+    "Disable Crash Reporting": "Изключване на доклада за срив",
+    "Disabled": "Изключено",
+    "Disabled periodic scanning and disabled watching for changes": "Изключено периодично обхождане и изключено наблюдение за промени",
+    "Disabled periodic scanning and enabled watching for changes": "Изключено периодично обхождане и включено наблюдение за промени",
+    "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Изключено периодично обхождане и грешка при започване на наблюдението за промени, прави се опит всяка минута:",
+    "Disables comparing and syncing file permissions. Useful on systems with nonexistent or custom permissions (e.g. FAT, exFAT, Synology, Android).": "Изключва сравняването и синхронизацията на правата на файловете. Полезно за системи с липсващи или специфични права (като FAT, exFAT, Synology, Android).",
+    "Discard": "Отказване",
    "Disconnected": "Не е свързано",
-    "Disconnected (Unused)": "Disconnected (Unused)",
+    "Disconnected (Unused)": "Не е свързано (неизползвано)",
    "Discovered": "Открит",
    "Discovery": "Откриване",
-    "Discovery Failures": "Грешка в откриването",
-    "Do not restore": "Не възстановявай",
-    "Do not restore all": "Не възстановявай всички",
-    "Do you want to enable watching for changes for all your folders?": "Желаете ли да активирате наблюдението за промени на всички папки?",
+    "Discovery Failures": "Грешка при откриване",
+    "Discovery Status": "Състояние на откриване",
+    "Dismiss": "Отхвърляне",
+    "Do not add it to the ignore list, so this notification may recur.": "Да не бъде добавяна в списъка за пренебрегване, така че да има повторно запитване.",
+    "Do not restore": "Без възстановяване",
+    "Do not restore all": "Без възстановяване всички",
+    "Do you want to enable watching for changes for all your folders?": "Желаете ли да наблюдението за промени да бъде включено за всички папки?",
    "Documentation": "Документация",
-    "Download Rate": "Скорост на сваляне",
-    "Downloaded": "Изтеглен",
+    "Download Rate": "Скорост на изтегляне",
+    "Downloaded": "Изтеглено",
    "Downloading": "Изтегляне",
-    "Edit": "Промени",
-    "Edit Device": "Edit Device",
-    "Edit Folder": "Edit Folder",
+    "Edit": "Редактиране",
+    "Edit Device": "Промяна на устройство",
+    "Edit Device Defaults": "За нови устройства",
+    "Edit Folder": "Промяна на папка",
+    "Edit Folder Defaults": "За нови папки",
    "Editing {%path%}.": "Променяне на {{path}}.",
-    "Enable Crash Reporting": "Enable Crash Reporting",
-    "Enable NAT traversal": "Разреши NAT traversal",
-    "Enable Relaying": "Разреши препращане",
-    "Enabled": "Активирано",
-    "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Въведете не отрицателно число (пр. \"2.35\") и изберете единица.\nПроцентите са като част от размера на цялото дисково пространство.",
-    "Enter a non-privileged port number (1024 - 65535).": "Въведете непривилегирован номер на порт (1024-65535).",
-    "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Въведете адреси разделени със запетая (\"tcp://ip:port\", \"tcp://host:port\") или \"dynamic\", за автоматично откриване на наличните адреси.",
-    "Enter ignore patterns, one per line.": "Добавете шаблони за игнориране, по един на ред.",
-    "Enter up to three octal digits.": "Enter up to three octal digits.",
+    "Enable Crash Reporting": "Включване на доклад за срив",
+    "Enable NAT traversal": "Преминаване през NAT",
+    "Enable Relaying": "Ретранслация",
+    "Enabled": "Включено",
+    "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Въведете положително число (например „3.14“) и изберете единица мярка. Процентите са части от цялото дисково пространство.",
+    "Enter a non-privileged port number (1024 - 65535).": "Въведете номер на непривилегирован порт (1024-65535).",
+    "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Въведете адреси, разделени със запетая („tcp://ip:port“, „tcp://host:port“) или „dynamic“, за автоматично откриване на наличните адреси.",
+    "Enter ignore patterns, one per line.": "Въведете шаблони за пренебрегване, по един на ред.",
+    "Enter up to three octal digits.": "Въведете до три осмични цифри.",
    "Error": "Грешка",
-    "External File Versioning": "Външно управление на версиите",
-    "Failed Items": "Неуспешни",
-    "Failed to setup, retrying": "Неуспешно конфигуриране, правенe на повторен опит",
-    "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Неуспешна връзка към IPv6 сървъри може да се очаква ако няма IPv6 свързаност.",
-    "File Pull Order": "Ред на сваляне",
+    "External File Versioning": "Външно управление на версии",
+    "Failed Items": "Елементи с грешка",
+    "Failed to load ignore patterns.": "Грешка при зареждане на шаблони за пренебрегване.",
+    "Failed to setup, retrying": "Грешка при настройване, извършва се повторен опит",
+    "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Неуспешна връзка към сървъри по IPv6 може да се очаква ако няма свързаност по IPv6.",
+    "File Pull Order": "Ред на изтегляне",
    "File Versioning": "Версии на файловете",
-    "Files are moved to .stversions directory when replaced or deleted by Syncthing.": "Файловете биват преместени в .stversions папка, когато са заменени или изтрити от Syncthing.",
-    "Files are moved to date stamped versions in a .stversions directory when replaced or deleted by Syncthing.": "Когато Syncthing замени или изтрие файл той бива преместен в папката .stversions и преименуван - с добавяне на дата и час.",
-    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Защитава локалните файловете от промени направени на други устройства, но промените направени на това устройство ще бъдат синхронизирани с останалите устройства.",
-    "Files are synchronized from the cluster, but any changes made locally will not be sent to other devices.": "Промените направени на други устройства ще бъдат прилагани локално, но локалните промени няма да бъдат синхронизирани с останалите устройства.",
-    "Filesystem Watcher Errors": "Filesystem Watcher Errors",
+    "Files are moved to .stversions directory when replaced or deleted by Syncthing.": "Файловете биват преместени в папка .stversions при заменяне или изтриване от Syncthing.",
+    "Files are moved to date stamped versions in a .stversions directory when replaced or deleted by Syncthing.": "Когато Syncthing замени или изтрие файл той бива преместен в папката .stversions и преименуван - с добавяне на датата и часа.",
+    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Предпазва местните файлове от промени, идващи от другите устройства, но местните промени се изпращат.",
+    "Files are synchronized from the cluster, but any changes made locally will not be sent to other devices.": "Файловете се синхронизират от другите устройства, но местните промени не се изпращат.",
+    "Filesystem Watcher Errors": "Грешка при наблюдаване на файловата система",
    "Filter by date": "Филтриране по дата",
    "Filter by name": "Филтриране по име",
    "Folder": "Папка",
    "Folder ID": "Идентификатор на папката",
    "Folder Label": "Име на папката",
    "Folder Path": "Път до папката",
-    "Folder Type": "Вид папка",
+    "Folder Type": "Вид на папката",
+    "Folder type \"{%receiveEncrypted%}\" can only be set when adding a new folder.": "Вида „{{receiveEncrypted}}“ може да бъде избран само при добавяне на папка.",
+    "Folder type \"{%receiveEncrypted%}\" cannot be changed after adding the folder. You need to remove the folder, delete or decrypt the data on disk, and add the folder again.": "Видът папката „{{receiveEncrypted}}“ не може да бъде променян след нейното създаване. Трябва да я премахнете, изтриете или разшифровате съдържанието и да добавите папката отново.",
    "Folders": "Папки",
-    "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.",
-    "Full Rescan Interval (s)": "Интервал(и) за периодичното сканиране",
-    "GUI": "Потребителски интерфейс",
+    "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "Грешка при започване на наблюдението за промени на следните папки. Всяка минута ще бъде извършван нов опит, така че грешката скоро може да изчезне. Ако все пак не изчезне, отстранете нейната първопричина или потърсете помощ ако не съумявате.",
+    "Full Rescan Interval (s)": "Интервал на пълно обхождане (секунди)",
+    "GUI": "Графичен интерфейс",
    "GUI Authentication Password": "Парола за интерфейса",
    "GUI Authentication User": "Потребител за интерфейса",
-    "GUI Authentication: Set User and Password": "GUI Authentication: Set User and Password",
-    "GUI Listen Address": "Адрес на слушане на GUI-то",
-    "GUI Theme": "Тема за потребителския интерфейс",
+    "GUI Authentication: Set User and Password": "Удостоверяване на графичния интерфейс: потребител и парола",
+    "GUI Listen Address": "Адрес на слушане",
+    "GUI Theme": "Тема на графичния интерфейс",
    "General": "Общи",
-    "Generate": "Генерирай",
+    "Generate": "Подновяване",
    "Global Discovery": "Глобално откриване",
    "Global Discovery Servers": "Сървъри за глобално откриване",
    "Global State": "Глобално състояние",
    "Help": "Помощ",
-    "Home page": "Начална страница",
-    "However, your current settings indicate you might not want it enabled. We have disabled automatic crash reporting for you.": "However, your current settings indicate you might not want it enabled. We have disabled automatic crash reporting for you.",
-    "If you want to prevent other users on this computer from accessing Syncthing and through it your files, consider setting up authentication.": "If you want to prevent other users on this computer from accessing Syncthing and through it your files, consider setting up authentication.",
-    "Ignore": "Игнорирай",
-    "Ignore Patterns": "Шаблони за игнориране",
-    "Ignore Permissions": "Игнорирай правата за достъп",
-    "Ignored Devices": "Игнорирани устройства",
-    "Ignored Folders": "Игнорирани папки",
-    "Ignored at": "Ignored at",
-    "Incoming Rate Limit (KiB/s)": "Лимит на скоростта за сваляне (KiB/s)",
+    "Home page": "Страница",
+    "However, your current settings indicate you might not want it enabled. We have disabled automatic crash reporting for you.": "Текущите настройки обаче показват, че може би не искате да бъде включена. За това автоматичното докладване на сривове е изключено.",
+    "Identification": "Идентификация",
+    "If untrusted, enter encryption password": "При недоверено задайте парола за шифроване",
+    "If you want to prevent other users on this computer from accessing Syncthing and through it your files, consider setting up authentication.": "Ако желаете да предотвратите достъпа на другите потребители на устройството до Syncthing, а чрез него и до файловете ви, помислете за удостоверяване на графичния интерфейс.",
+    "Ignore": "Пренебрегване",
+    "Ignore Patterns": "Шаблони за пренебрегване",
+    "Ignore Permissions": "Пренебрегване на права",
+    "Ignored Devices": "Пренебрегнати устройства",
+    "Ignored Folders": "Пренебрегнати папки",
+    "Ignored at": "Пренебрегнато на",
+    "Incoming Rate Limit (KiB/s)": "Ограничение при изтегляне (KiB/s)",
    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Неправилни настройки могат да повредят файлове и да попречат на синхронизирането.",
    "Introduced By": "Предложено от",
-    "Introducer": "Може да предлага други устройства",
-    "Inversion of the given condition (i.e. do not exclude)": "Обратното на даденото условие (пр. не изключвай)",
-    "Keep Versions": "Пази версии",
+    "Introducer": "Поръчител",
+    "Inversion of the given condition (i.e. do not exclude)": "Обръща значението на условието (напр. да не се отхвърля)",
+    "Keep Versions": "Пазени версии",
    "LDAP": "LDAP",
-    "Largest First": " Първо най-големите",
-    "Last Scan": "Последно сканирана",
+    "Largest First": " Първо най-големи",
+    "Last Scan": "Последно обхождане",
    "Last seen": "Последно видяно",
    "Latest Change": "Последна промяна",
    "Learn more": "Научете повече",
-    "Limit": "Limit",
-    "Listeners": "Синхронизиращи устройства",
+    "Limit": "Ограничение",
+    "Listener Failures": "Грешки при очакване на връзка",
+    "Listener Status": "Очакване на връзка",
+    "Listeners": "Очакване на връзка",
    "Loading data...": "Зареждане на информация...",
    "Loading...": "Зареждане...",
-    "Local Additions": "Local Additions",
-    "Local Discovery": "Локално откриване",
-    "Local State": "Локално състояние",
-    "Local State (Total)": "Локално състояние (общо)",
-    "Locally Changed Items": "Locally Changed Items",
-    "Log": "Доклад",
-    "Log tailing paused. Scroll to the bottom to continue.": "Log tailing paused. Scroll to the bottom to continue.",
-    "Logs": "Доклади",
-    "Major Upgrade": "Основно Обновяване",
-    "Mass actions": "Действия за всички",
+    "Local Additions": "Местно добавени",
+    "Local Discovery": "Месно откриване",
+    "Local State": "Местно състояние",
+    "Local State (Total)": "Местно състояние (общо)",
+    "Locally Changed Items": "Местно променени",
+    "Log": "Дневник",
+    "Log tailing paused. Scroll to the bottom to continue.": "Добавяне на редове към дневника е спряно. Плъзнете най-долу за да продължи.",
+    "Logs": "Дневници",
+    "Major Upgrade": "Обновяване на значимо издание",
+    "Mass actions": "Мащабни действия",
    "Maximum Age": "Максимална възраст",
    "Metadata Only": "Само мета информация",
    "Minimum Free Disk Space": "Минимално свободно дисково пространство",
    "Mod. Device": "Променящо устройство",
    "Mod. Time": "Дата на промяна",
-    "Move to top of queue": "Премести в началото на опашката",
-    "Multi level wildcard (matches multiple directory levels)": "Маска на много нива (покрива папки с много нива)",
+    "Move to top of queue": "Премества най-отпред на опашката",
+    "Multi level wildcard (matches multiple directory levels)": "Заместващ символ за няколко нива (съвпада с папки, вложени на няколко нива)",
    "Never": "никога",
    "New Device": "Ново устройство",
    "New Folder": "Нова папка",
-    "Newest First": "Първо най-новите",
+    "Newest First": "Първо най-нови",
    "No": "Не",
-    "No File Versioning": "Без версии",
-    "No files will be deleted as a result of this operation.": "Няма да бъдат изтрити файлове като резултат от тази операция.",
-    "No upgrades": "Няма обновления",
+    "No File Versioning": "Без пазене на версии",
+    "No files will be deleted as a result of this operation.": "В резултат на операцията няма да бъдат премахнати файлове.",
+    "No upgrades": "Без обновяване",
+    "Not shared": "Не споделена",
    "Notice": "Известие",
-    "OK": "ОК",
+    "OK": "Добре",
    "Off": "Изключено",
-    "Oldest First": "Първо най-старите",
+    "Oldest First": "Първо най-стари",
    "Optional descriptive label for the folder. Can be different on each device.": "Незадължително име на папката. Може да бъде различно на всяко устройство.",
    "Options": "Настройки",
    "Out of Sync": "Несинхронизирано",
    "Out of Sync Items": "Несинхронизирани елементи",
-    "Outgoing Rate Limit (KiB/s)": "Лимит на скорост за качване (KiB/s)",
-    "Override Changes": "Наложи локалните промени",
+    "Outgoing Rate Limit (KiB/s)": "Ограничение при качване (KiB/s)",
+    "Override": "Налагане",
+    "Override Changes": "Налагане на местни промени",
    "Path": "Път",
-    "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Път до папката на това устройство. Ако не съществува ще бъде създадена. Символът тилда (~) може да бъде използван като заместител на",
-    "Path where new auto accepted folders will be created, as well as the default suggested path when adding new folders via the UI. Tilde character (~) expands to {%tilde%}.": "Къде да бъдат създавани, автоматично приети папки, както и предложението за път, при добавяне на нови папки от потребителският интерфейс. Символът тилда (~) ще бъде заменян с {{tilde}}.",
-    "Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).": "Пътят, където версиите да бъдат складирани (оставете празно за папката .stversions).",
+    "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Път до папката на това устройство. Ако не съществува ще бъде създадена. Символът тилда (~) може да бъде използван вместо",
+    "Path where new auto accepted folders will be created, as well as the default suggested path when adding new folders via the UI. Tilde character (~) expands to {%tilde%}.": "Къде да бъдат създавани, автоматично приетите папки, както и предложението за път, при добавяне на нови папки от графичния интерфейс. Символът тилда (~) ще бъде заменян с {{tilde}}.",
+    "Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).": "Папка, в която да бъдат запазвани версиите (оставете празно за подразбираната директория .stversions в споделената папка).",
    "Pause": "Пауза",
    "Pause All": "Пауза на всички",
    "Paused": "На пауза",
-    "Paused (Unused)": "Paused (Unused)",
-    "Pending changes": "Pending changes",
-    "Periodic scanning at given interval and disabled watching for changes": "Периодично сканиране, през определен интервал, без мониторинг за промени",
-    "Periodic scanning at given interval and enabled watching for changes": "Периодично сканиране, през определен интервал, и мониторинг за промени",
-    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Периодично сканиране, през определен интервал, мониторинга за промени не може да стартира. Всяка минута минута се прави опит за стартиране:",
-    "Permissions": "Права за достъп",
-    "Please consult the release notes before performing a major upgrade.": "Моля прочети бележките по обновяването преди да започнеш.",
-    "Please set a GUI Authentication User and Password in the Settings dialog.": "Моля задайте потребителско име и парола за потребителския интерфейс в секцията Настройки.",
-    "Please wait": "Моля изчакайте",
-    "Prefix indicating that the file can be deleted if preventing directory removal": "Представка, която индикира, че файлът може да бъде изтрит ако пречи на премахването на папка",
-    "Prefix indicating that the pattern should be matched without case sensitivity": "Представка, която индикира, че шаблона няма да прави разлика между главни/малки букви",
-    "Preparing to Sync": "Preparing to Sync",
+    "Paused (Unused)": "На пауза (неизползвано)",
+    "Pending changes": "Незапазени промени",
+    "Periodic scanning at given interval and disabled watching for changes": "Периодично обхождане без наблюдение за промени",
+    "Periodic scanning at given interval and enabled watching for changes": "Периодично обхождане и наблюдение за промени",
+    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Периодично обхождане и грешка при започване на наблюдението за промени, прави се опит всяка минута.",
+    "Permanently add it to the ignore list, suppressing further notifications.": "Добавяне за постоянно в списъка с пренебрегнати елементи, потискайки бъдещи известия.",
+    "Permissions": "Права",
+    "Please consult the release notes before performing a major upgrade.": "Прочетете бележките по изданието преди да пристъпите към обновяване към значимо издание.",
+    "Please set a GUI Authentication User and Password in the Settings dialog.": "Задайте потребителско име и парола за графичния интерфейс в настройките.",
+    "Please wait": "Изчакайте",
+    "Prefix indicating that the file can be deleted if preventing directory removal": "Представка, указваща че файлът може да бъде изтрит ако пречи при премахване на папката",
+    "Prefix indicating that the pattern should be matched without case sensitivity": "Представка, указваща че шаблонът не прави разлика в регистъра на буквите",
+    "Preparing to Sync": "Подготовка за синхронизация",
    "Preview": "Преглед",
-    "Preview Usage Report": "Преглед на статистиката",
-    "Quick guide to supported patterns": "Бърз наръчник към поддържаните шаблони",
+    "Preview Usage Report": "Преглед на отчет за употреба",
+    "Quick guide to supported patterns": "Кратък наръчник на поддържаните шаблони",
    "Random": "Произволен",
-    "Receive Only": "Само получаване",
+    "Receive Encrypted": "Приема шифровани данни",
+    "Receive Only": "Само получава",
+    "Received data is already encrypted": "Получените данни вече са шифровани",
    "Recent Changes": "Последни промени",
-    "Reduced by ignore patterns": "Намалено посредством шаблон за игнориране",
-    "Release Notes": "Бележки по обновяването",
-    "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Кандидат версиите съдържат най-новата функционалност и поправки. Те са близки до традиционните дву-седмични Synchthing обновления.",
-    "Remote Devices": "Устройства",
-    "Remove": "Премахни",
+    "Reduced by ignore patterns": "Наложени са шаблони за пренебрегване",
+    "Release Notes": "Бележки по изданието",
+    "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Предварителните издания съдържат най-новите възможности и поправки. Те са близки до традиционните, два пъти в седмицата, издания на Synchthing.",
+    "Remote Devices": "Отдалечени устройства",
+    "Remote GUI": "Отдалечен графичен интерфейс",
+    "Remove": "Премахване",
    "Remove Device": "Премахване на устройство",
    "Remove Folder": "Премахване на папка",
-    "Required identifier for the folder. Must be the same on all cluster devices.": "Задължителен идентификатор за папката. Трябва да бъде един и същ на всяко устройство.",
-    "Rescan": "Сканирай",
-    "Rescan All": "Сканирай всички",
-    "Rescans": "Повторни сканирания",
-    "Restart": "Рестартирай",
+    "Required identifier for the folder. Must be the same on all cluster devices.": "Задължителен идентификатор на папката. Трябва е еднакъв на всички устройства.",
+    "Rescan": "Обхождане",
+    "Rescan All": "Обхождане всички",
+    "Rescans": "Обхождане",
+    "Restart": "Рестартиране",
    "Restart Needed": "Изисква се рестартиране",
    "Restarting": "Рестартиране",
    "Restore": "Възстановяване",
    "Restore Versions": "Възстановяване на версии",
-    "Resume": "Пусни",
-    "Resume All": "Пусни всички",
-    "Reused": "Повторно използван",
-    "Revert Local Changes": "Revert Local Changes",
-    "Save": "Запази",
-    "Scan Time Remaining": "Оставащо време за сканиране",
-    "Scanning": "Сканиране",
-    "See external versioning help for supported templated command line parameters.": "Прегледайте външната документацията за поддържаните командни параметри. ",
+    "Resume": "Възобновяване",
+    "Resume All": "Възобновяване всички",
+    "Reused": "Преизползвано",
+    "Revert": "Отменяне",
+    "Revert Local Changes": "Отменяне на местни промени",
+    "Save": "Запазване",
+    "Scan Time Remaining": "Оставащо време до обхождане",
+    "Scanning": "Обхождане",
+    "See external versioning help for supported templated command line parameters.": "Прочетете ръководството за външното управление на версии, за да се запознаете с шаблонните параметри.",
    "Select All": "Всички",
    "Select a version": "Изберете версия",
-    "Select additional devices to share this folder with.": "Select additional devices to share this folder with.",
-    "Select latest version": "Избор на най-новата версия",
-    "Select oldest version": "Избор на най-старата версия",
-    "Select the folders to share with this device.": "Изберете папките за споделяне с това устройство.",
-    "Send & Receive": "Изпращане и получаване",
-    "Send Only": "Само изпращане",
+    "Select additional devices to share this folder with.": "Изберете други устройства, с които да споделите с папката.",
+    "Select additional folders to share with this device.": "Изберете други папки, които да споделите с устройството.",
+    "Select latest version": "Избиране на най-новата версия",
+    "Select oldest version": "Избиране на на най-старата версия",
+    "Select the folders to share with this device.": "Изберете папките, които да споделите с устройството.",
+    "Send & Receive": "Изпраща и получава",
+    "Send Only": "Само изпраща",
    "Settings": "Настройки",
-    "Share": "Сподели",
-    "Share Folder": "Сподели папка",
+    "Share": "Споделяне",
+    "Share Folder": "Споделяне на папка",
    "Share Folders With Device": "Споделяне на папки с устройството",
-    "Share this folder?": "Сподели тази папка?",
+    "Share this folder?": "Споделяне на папката?",
+    "Shared Folders": "Споделени папки",
    "Shared With": "Споделена с",
    "Sharing": "Споделяне",
-    "Show ID": "Покажи идентификатора",
-    "Show QR": "Покажи QR",
-    "Show diff with previous version": "Показване на разликите спрямо предната версия",
-    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Показва се вместо идентификатора на устройството в статуса на клъстъра. Ще се ползва за представяне пред останалите устройства.",
-    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Показва се вместо идентификатора на устройството в статуса на клъстъра. Ще бъде попълнено с името, с което се е представило устройството, ако оставите полето празно.",
-    "Shutdown": "Спри програмата",
+    "Show ID": "Идентификатор",
+    "Show QR": "Преглед на QR",
+    "Show detailed discovery status": "Подробно състояние на откриване",
+    "Show detailed listener status": "Подробно състояние на слушане",
+    "Show diff with previous version": "Показване на разликите с предходната версия",
+    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "В списъка на устройствата се показва вместо идентификатор. Ще бъде предложено на другите устройства като име по подразбиране.",
+    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "В списъка на устройствата се показва вместо идентификатор. Ако бъде оставено празно ще бъде променено на името, което носи устройството.",
+    "Shutdown": "Изключване",
    "Shutdown Complete": "Спирането завършено",
-    "Simple File Versioning": "Опростени версии",
-    "Single level wildcard (matches within a directory only)": "Маска на едно ниво (покрива само в папка)",
+    "Simple File Versioning": "Обикновени версии",
+    "Single level wildcard (matches within a directory only)": "Заместващ символ за едно ниво (съвпада само с папка)",
    "Size": "Размер",
-    "Smallest First": "Първо най-малките",
+    "Smallest First": "Първо най-малки",
+    "Some discovery methods could not be established for finding other devices or announcing this device:": "Следните методи за откриване не могат да бъдат използвани за намиране на други устройства или за обявяване на това устройство, за да бъде открито от останалите:",
    "Some items could not be restored:": "Някои елементи не могат да бъдат възстановени:",
-    "Source Code": "Сорс код",
-    "Stable releases and release candidates": "Стабилни версии и кандидати за стабилни версии",
-    "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "Стабилните версии са забавени с две седмици. През това време те преминават през тестване като бъдат кандидат версии.",
+    "Some listening addresses could not be enabled to accept connections:": "Някои от адресите, на които Syncthing очаква връзка не могат да бъдат настроени да получават входящи връзки.",
+    "Source Code": "Изходен код",
+    "Stable releases and release candidates": "Стабилни и предварителни издания",
+    "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "Стабилните издания биват забавяни с две седмици. През този период те преминават през изпитване като предварителни издания.",
    "Stable releases only": "Само стабилни версии",
-    "Staggered File Versioning": "Наслагващи се версии",
-    "Start Browser": "Стартирай браузъра",
+    "Staggered File Versioning": "Разпределени версии",
+    "Start Browser": "Отваряне в мрежов четец",
    "Statistics": "Статистика",
-    "Stopped": "Не се синхронизира",
+    "Stopped": "Спряна",
+    "Stores and syncs only encrypted data. Folders on all connected devices need to be set up with the same password or be of type \"{%receiveEncrypted%}\" too.": "Съхранява и синхронизира само шифровани данни. Папките на всички свързани устройства трябва да бъдат настроени със същата парола или също да са от вида „{{receiveEncrypted}}“.",
    "Support": "Помощ",
-    "Support Bundle": "Support Bundle",
-    "Sync Protocol Listen Addresses": "Адрес за слушане на синхронизиращия протокол",
+    "Support Bundle": "Архив за поддръжка",
+    "Sync Protocol Listen Addresses": "Адрес, на който слуша синхронизиращия протокол",
    "Syncing": "Синхронизиране",
-    "Syncthing has been shut down.": "Syncthing е спрян.",
+    "Syncthing has been shut down.": "Syncthing е изключен.",
    "Syncthing includes the following software or portions thereof:": "Syncthing уползотворява частично или изцяло следните софтуерни продукти:",
-    "Syncthing is Free and Open Source Software licensed as MPL v2.0.": "Syncthing is Free and Open Source Software licensed as MPL v2.0.",
-    "Syncthing is restarting.": "Syncthing се рестартира",
+    "Syncthing is Free and Open Source Software licensed as MPL v2.0.": "Syncthing е свободен софтуер с отворен код, под лиценза на MPL v2.0.",
+    "Syncthing is listening on the following network addresses for connection attempts from other devices:": "Syncthing очаква опити за установяване на връзка от други устройства на следните мрежови адреси:",
+    "Syncthing is not listening for connection attempts from other devices on any address.  Only outgoing connections from this device may work.": "Syncthing не слуша за опити за установяване на връзка от други устройства. Вероятно работят само изходящите връзки от това устройство.",
+    "Syncthing is restarting.": "Syncthing се рестартира.",
    "Syncthing is upgrading.": "Syncthing се обновява.",
-    "Syncthing now supports automatically reporting crashes to the developers. This feature is enabled by default.": "Syncthing now supports automatically reporting crashes to the developers. This feature is enabled by default.",
-    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Изглежда, че Syncthing не е включен, или има проблем с връзката с Интернет. Повторен опит...",
-    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing има проблем при обработването на заявката. Моля, презаредете браузъра или рестартирайте Syncthing ако проблемът продължи.",
-    "Take me back": "Take me back",
-    "The GUI address is overridden by startup options. Changes here will not take effect while the override is in place.": "The GUI address is overridden by startup options. Changes here will not take effect while the override is in place.",
-    "The Syncthing Authors": "The Syncthing Authors",
+    "Syncthing now supports automatically reporting crashes to the developers. This feature is enabled by default.": "Syncthing вече поддържа автоматично докладване на сривове на разработчиците. Тази възможност е включена по подразбиране.",
+    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Изглежда, че Syncthing не работи или няма достъп до интернет. Извършва се повторен опит…",
+    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing има проблем при обработването на заявката. Презаредете страницата или рестартирайте Syncthing ако проблемът продължава да съществува.",
+    "Take me back": "Назад",
+    "The GUI address is overridden by startup options. Changes here will not take effect while the override is in place.": "Адресът на интерфейса не се взима под внимание заради параметри при стартиране. Промените тук няма да бъдат отразени докато параметрите не бъдат променени.",
+    "The Syncthing Authors": "Автори на Syncthing",
    "The Syncthing admin interface is configured to allow remote access without a password.": "Администраторският панел на Syncthing разрешава дистанционен достъп без да изисква парола.",
-    "The aggregated statistics are publicly available at the URL below.": "Обобщение на събраните статистически ще намерите на долния URL адрес.",
-    "The cleanup interval cannot be blank.": "The cleanup interval cannot be blank.",
-    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Конфигурацията е запазена, но не е активирана. Syncthing трябва да рестартира, за да се активира новата конфигурация.",
+    "The aggregated statistics are publicly available at the URL below.": "Обобщените статистически данни са публично достъпни на адреса по-долу.",
+    "The cleanup interval cannot be blank.": "Интервалът на почистване не може да бъде празен.",
+    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Настройките са запазени, но не са приложени. За да влязат в сила Syncthing трябва да се рестартира.",
    "The device ID cannot be blank.": "Полето идентификатор на устройство не може да бъде празно.",
-    "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).": "Идентификатор на устройство за въвеждане тук, може да бъде намерен в \"Промени > Покажи идентификатора\" на другото устройство. Интервалите и тиретата са пожелание (биват прескачани).",
-    "The encrypted usage report is sent daily. It is used to track common platforms, folder sizes and app versions. If the reported data set is changed you will be prompted with this dialog again.": "Криптиран статистически доклад ще се изпраща ежедневно. Ползва се, за отичане на ползваните платформи, размер на папки и версии на приложението. При промяна в събираните данни, ще бъдете информирани от подобен на този прозорец.",
-    "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.": "Въведеният идентификатор на устройство не е валиден. Трябва да бъде 52 или 56 символа и да се състои от букви и цифри, като интервалите и тиретата са пожелание.",
+    "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).": "Идентификаторът на устройството, който да въведете се намира в „Действия > Идентификатор“. Интервалите и дефисите са незадължителни.",
+    "The encrypted usage report is sent daily. It is used to track common platforms, folder sizes and app versions. If the reported data set is changed you will be prompted with this dialog again.": "Шифрованият отчет за употреба се изпраща ежедневно. Използва се за отчитане на най-често срещаните платформи, размери на папки и издания на приложението. При промяна в събираните данни отново ще бъде поискано вашето съгласие.",
+    "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.": "Въведеният идентификатор на устройство не е валиден. Трябва да бъде 52 или 56 символа и да се състои от букви и цифри, като интервалите и дефисите са незадължителни.",
    "The folder ID cannot be blank.": "Полето идентификатор на папка не може да бъде празно.",
    "The folder ID must be unique.": "Идентификаторът на папката трябва да бъде уникален.",
+    "The folder content on other devices will be overwritten to become identical with this device. Files not present here will be deleted on other devices.": "Съдържанието на папката в другите устройства ще бъде презаписано, за да стане еднакво със съдържанието на това устройство. Файловете, които ги няма тук, но съществуват на другите устройства ще бъдат премахнати.",
+    "The folder content on this device will be overwritten to become identical with other devices. Files newly added here will be deleted.": "Съдържанието на папката в това устройство ще бъде презаписано, за да стане еднакво със съдържанието на другите устройства. Добавените файлове ще бъдат премахнати.",
    "The folder path cannot be blank.": "Пътят до папката не може да бъде празен.",
-    "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.": "Използва се следния интервал: за първия час се пази версия на всеки 30 секунди, за първия ден се пази версия на всеки час, за първите 30 дена се пази версия всеки ден, до максимума се пази една версия всяка седмица.",
+    "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.": "Използват се следните интервали: за първия час се пази версия на всеки 30 секунди, за първия ден - на всеки час, за първите 30 дена - всеки ден, до максимума се пази една версия всяка седмица.",
    "The following items could not be synchronized.": "Следните елементи не могат да бъдат синхронизирани.",
-    "The following items were changed locally.": "The following items were changed locally.",
-    "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 following items were changed locally.": "Следните елементи са променени локално.",
+    "The following methods are used to discover other devices on the network and announce this device to be found by others:": "Следните методи се използват за откриване на други устройства в мрежата и за обявяване на това устройство, за да бъде открито от останалите:",
+    "The following unexpected items were found.": "Следните елементи са намерени, но не са очаквани.",
+    "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 maximum age must be a number and cannot be blank.": "Максималната възраст трябва да е число, полето не може да бъде празно.",
    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Максималното време за пазене на версия (в дни, задайте 0 за да не бъдат изтривани версии).",
    "The number of days must be a number and cannot be blank.": "Броят дни трябва да бъде число и не може да бъде празно.",
-    "The number of days to keep files in the trash can. Zero means forever.": "Броят дни за запазване на файловете в кошчето. Нула значи завинаги.",
-    "The number of old versions to keep, per file.": "Броят стари версии, които да бъдат пазени за всеки файл.",
+    "The number of days to keep files in the trash can. Zero means forever.": "Брой дни за пазене на файловете в кошчето. Нула значи завинаги.",
+    "The number of old versions to keep, per file.": "Брой стари версии, които да бъдат пазени за всеки файл.",
    "The number of versions must be a number and cannot be blank.": "Броят версии трябва да бъде число и не може да бъде празно.",
    "The path cannot be blank.": "Пътят не може да бъде празен.",
    "The rate limit must be a non-negative number (0: no limit)": "Ограничението на скоростта трябва да бъде положително число (0: неограничено)",
-    "The rescan interval must be a non-negative number of seconds.": "Интервала на сканиране трябва да бъде не отрицателно число в секунди.",
-    "There are no devices to share this folder with.": "There are no devices to share this folder with.",
-    "They are retried automatically and will be synced when the error is resolved.": "Ще бъдат спрени и автоматично синхронизирани, когато грешката бъде оправена.",
-    "This Device": "Вашето устройство",
-    "This can easily give hackers access to read and change any files on your computer.": "Така се предоставя изключително лесен достъп (четене, редактиране и изтриване) до всеки файл, на компютъра Ви.",
-    "This is a major version upgrade.": "Това е нова основна версия.",
-    "This setting controls the free space required on the home (i.e., index database) disk.": "Тази настройка контролира нужното свободното място на основния (пр. този с базата данни) диск.",
+    "The rescan interval must be a non-negative number of seconds.": "Интервалът на обхождане трябва да е положителен брой секунди.",
+    "There are no devices to share this folder with.": "Няма устройства, с които да споделите папката.",
+    "There are no folders to share with this device.": "Няма папка, която да споделите с устройството.",
+    "They are retried automatically and will be synced when the error is resolved.": "Ще бъдат спрени и автоматично синхронизирани, когато грешката бъде отстранена.",
+    "This Device": "Това устройство",
+    "This can easily give hackers access to read and change any files on your computer.": "Така се предоставя лесен достъп за четене и промяна на всеки файл на компютъра.",
+    "This device cannot automatically discover other devices or announce its own address to be found by others.  Only devices with statically configured addresses can connect.": "Устройството не може автоматично да открива други устройства или да обяви своя адрес, за да бъде намерено от другите. Само устройствата със статично настроени адреси могат да се свързват.",
+    "This is a major version upgrade.": "Това е обновяване на значимо издание.",
+    "This setting controls the free space required on the home (i.e., index database) disk.": "Тази настройка управлява нужното свободното място на основния (пр. този с банката от данни) диск.",
    "Time": "Време",
-    "Time the item was last modified": "Часът на последна промяна на елемента",
-    "Trash Can File Versioning": "Само на файловете в кошчето",
-    "Type": "Тип",
-    "UNIX Permissions": "UNIX Permissions",
-    "Unavailable": "Не е на разположение",
-    "Unavailable/Disabled by administrator or maintainer": "Не е на разположение/Деактивриан от администраторът или поддръжника",
+    "Time the item was last modified": "Час на последна промяна на елемента",
+    "Trash Can File Versioning": "Версии от вида „кошче за отпадъци“",
+    "Type": "Вид",
+    "UNIX Permissions": "Права на UNIX",
+    "Unavailable": "Няма налични",
+    "Unavailable/Disabled by administrator or maintainer": "Недостъпно или изключено от администратора или поддръжката",
    "Undecided (will prompt)": "Неизбрано (ще попита)",
-    "Unignore": "Unignore",
+    "Unexpected Items": "Неочаквани елементи",
+    "Unexpected items have been found in this folder.": "В папката са намерени неочаквани елементи.",
+    "Unignore": "Отменяне на пренебрегване",
    "Unknown": "Неясно",
    "Unshared": "Несподелена",
-    "Unshared Devices": "Unshared Devices",
+    "Unshared Devices": "Устройства, с които не е споделена",
+    "Unshared Folders": "Несподелени папки",
+    "Untrusted": "Недоверено",
    "Up to Date": "Синхронизирано",
    "Updated": "Обновено",
-    "Upgrade": "Обнови",
-    "Upgrade To {%version%}": "Обновен до {{version}}",
+    "Upgrade": "Обновяване",
+    "Upgrade To {%version%}": "Обновяване до {{version}}",
    "Upgrading": "Обновяване",
    "Upload Rate": "Скорост на качване",
    "Uptime": "Работи от",
-    "Usage reporting is always enabled for candidate releases.": "Докладът за ползването е винаги включен за кандидат нови версии.",
-    "Use HTTPS for GUI": "Използвай HTTPS за потребителския интерфейс",
-    "Username/Password has not been set for the GUI authentication. Please consider setting it up.": "Username/Password has not been set for the GUI authentication. Please consider setting it up.",
-    "Version": "Версия",
+    "Usage reporting is always enabled for candidate releases.": "Отчитането на употребата винаги е включено за предварителни издания.",
+    "Use HTTPS for GUI": "Графичният интерфейс работи под HTTPS",
+    "Use notifications from the filesystem to detect changed items.": "Използва съобщения от файловата система, за да открива променени елементи.",
+    "Username/Password has not been set for the GUI authentication. Please consider setting it up.": "Няма зададени потребителско име и парола за достъп до графичния интерфейс. Помислете за създаването им.",
+    "Version": "Издание",
    "Versions": "Версии",
    "Versions Path": "Път до версиите",
-    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Версиите биват изтривани автоматично, когато са по-стари от максималната възраст или надминават броя версии разрешени в даден интервал.",
-    "Waiting to Clean": "Waiting to Clean",
-    "Waiting to Scan": "Waiting to Scan",
-    "Waiting to Sync": "Waiting to Sync",
-    "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "Предупреждение, този път е по-горна директория на съществуващата папка \"{{otherFolder}}\".",
-    "Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Предупреждение, този път е по-горна директория на съществуващата папка \"{{otherFolderLabel}}\" ({{otherFolder}}).",
-    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Внимание, това е вътрешна папка на вече съществуваща папка \"{{otherFolder}}\".",
-    "Warning, this path is a subdirectory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Предупреждение, този път е под-директория на съществуващата папка \"{{otherFolderLabel}}\" ({{otherFolder}}).",
-    "Warning: If you are using an external watcher like {%syncthingInotify%}, you should make sure it is deactivated.": "Предупреждение: Ако използвате външна програма за наблюдение като {{syncthingInotify}}, трябва да я деактивирате.",
-    "Watch for Changes": "Мониторинг за промени",
-    "Watching for Changes": "Мониторинг за промени",
-    "Watching for changes discovers most changes without periodic scanning.": "Watching for changes discovers most changes without periodic scanning.",
-    "When adding a new device, keep in mind that this device must be added on the other side too.": "Когато добавяте ново устройство имайте предвид, че това устройство също трябва да бъде добавено от другата страна.",
-    "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Когато добавяте нов идентификатор на папка имайте предвид, че той се използва за свързване на папките между отделните устройства. Идентификатора разграничава главни/малки букви.",
+    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Версиите биват изтривани автоматично ако са по-стари от максималната възраст или надминават броя разрешени версии за определено време.",
+    "Waiting to Clean": "Изчаква за почистване",
+    "Waiting to Scan": "Изчаква за обхождане",
+    "Waiting to Sync": "Изчаква за синхронизиране",
+    "Warning": "Внимание",
+    "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "Внимание, този път е родителска папка съществуващата „{{otherFolder}}“.",
+    "Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Внимание, този път е родителска папка съществуващата „{{otherFolderLabel}}“ ({{otherFolder}}).",
+    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Внимание, този път е подпапка съществуващата „{{otherFolder}}“.",
+    "Warning, this path is a subdirectory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Внимание, този път е подпапка на съществуващата „{{otherFolderLabel}}“ ({{otherFolder}}).",
+    "Warning: If you are using an external watcher like {%syncthingInotify%}, you should make sure it is deactivated.": "Внимание: Ако използвате външно приложение за наблюдение като {{syncthingInotify}}, трябва да го спрете.",
+    "Watch for Changes": "Наблюдаване за промени",
+    "Watching for Changes": "Наблюдаване за промени",
+    "Watching for changes discovers most changes without periodic scanning.": "Наблюдението за промени открива повечето изменения без периодични обхождания.",
+    "When adding a new device, keep in mind that this device must be added on the other side too.": "Когато добавяте ново устройство имайте предвид, че то също трябва да бъде добавено от другата страна.",
+    "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Като добавяте папката имайте предвид, че той се използва за еднозначно указване на папката между устройствата. Има разлика в регистъра на знаците и трябва изцяло да съвпада между всички устройства.",
    "Yes": "Да",
-    "You can also select one of these nearby devices:": "Също така може да изберете едно от устройствата, които намират се наблизо:",
+    "You can also select one of these nearby devices:": "Също така може да изберете едно от устройствата, които се намират наблизо:",
    "You can change your choice at any time in the Settings dialog.": "Може да промените решението си по всяко време в прозореца Настройки.",
-    "You can read more about the two release channels at the link below.": "Може да научите допълнително за двата канала на версии, следвайки връзката по-долу.",
-    "You have no ignored devices.": "Няма игнорирани устройства.",
-    "You have no ignored folders.": "Няма игнорирани папки.",
-    "You have unsaved changes. Do you really want to discard them?": "Има незапазени промени. Наистина ли желаете да ги отмените?",
-    "You must keep at least one version.": "Трябва да пазиш поне една версия.",
+    "You can read more about the two release channels at the link below.": "Може да научите повече за двата канала на издание, следвайки препратката по-долу.",
+    "You have no ignored devices.": "Няма пренебрегнати устройства.",
+    "You have no ignored folders.": "Няма пренебрегнати папки.",
+    "You have unsaved changes. Do you really want to discard them?": "Има незапазени промени. Желаете ли да се откажете от тях?",
+    "You must keep at least one version.": "Необходимо е да има поне една версия.",
+    "You should never add or change anything locally in a \"{%receiveEncrypted%}\" folder.": "Никога не трябва да променяте нищо в папка от вида „{{receiveEncrypted}}“.",
    "days": "дни",
-    "directories": "directories",
+    "directories": "папки",
    "files": "файла",
    "full documentation": "пълна документация",
    "items": "елемента",
-    "seconds": "seconds",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} желае да сподели папката \"{{folder}}\".",
-    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} желае да сподели папката \"{{folderlabel}}\" ({{folder}})."
+    "seconds": "секунди",
+    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} споделя папката „{{folder}}“.",
+    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} споделя папката „{{folder}}“. ({{folder}}).",
+    "{%reintroducer%} might reintroduce this device.": "Поръчителят {{reintroducer}} може отново да предложи това устройство."
 }
--- a/gui/default/assets/lang/lang-ca@valencia.json
+++ b/gui/default/assets/lang/lang-ca@valencia.json
@@ -18,15 +18,20 @@
    "Advanced": "Avançat",
    "Advanced Configuration": "Configuració avançada",
    "All Data": "Totes les dades",
+    "All folders shared with this device must be protected by a password, such that all sent data is unreadable without the given password.": "All folders shared with this device must be protected by a password, such that all sent data is unreadable without the given password.",
    "Allow Anonymous Usage Reporting?": "Permetre informes d'ús anònim?",
    "Allowed Networks": "Xarxes permeses",
    "Alphabetic": "Alfabètic",
    "An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.": "Un comandament extern maneja el versionat. És necessari eliminar el fitxer de la carpeta compartida. Si la ruta a l'aplicació conté espais, hi ha que ficar-los entre cometes.",
    "Anonymous Usage Reporting": "Informe d'ús anònim",
    "Anonymous usage report format has changed. Would you like to move to the new format?": "El format del informe anònim d'ús ha canviat. Vols canviar al nou format?",
+    "Are you sure you want to continue?": "Are you sure you want to continue?",
+    "Are you sure you want to override all remote changes?": "Are you sure you want to override all remote changes?",
+    "Are you sure you want to permanently delete all these files?": "Are you sure you want to permanently delete all these files?",
    "Are you sure you want to remove device {%name%}?": "Estàs segur de que vols eliminar el dispositiu {{name}}?",
    "Are you sure you want to remove folder {%label%}?": "Estàs segur de que vols eliminar la carpeta {{label}}?",
    "Are you sure you want to restore {%count%} files?": "Estàs segur de que vols restaurar {{count}} fitxers?",
+    "Are you sure you want to revert all local changes?": "Are you sure you want to revert all local changes?",
    "Are you sure you want to upgrade?": "Are you sure you want to upgrade?",
    "Auto Accept": "Auto Acceptar",
    "Automatic Crash Reporting": "Automatic Crash Reporting",
@@ -37,11 +42,13 @@
    "Available debug logging facilities:": "Hi han disponibles les següents utilitats per a depurar el registre:",
    "Be careful!": "Tin precaució!",
    "Bugs": "Errors (Bugs)",
+    "Cancel": "Cancel",
    "Changelog": "Registre de canvis",
    "Clean out after": "Netejar després de",
    "Cleaning Versions": "Cleaning Versions",
    "Cleanup Interval": "Cleanup Interval",
    "Click to see discovery failures": "Clica per a vore els fallos en el descobriment",
+    "Click to see full identification string and QR code.": "Click to see full identification string and QR code.",
    "Close": "Tancar",
    "Command": "Comando",
    "Comment, when used at the start of a line": "Comentar, quant s'utilitza al principi d'una línia",
@@ -59,15 +66,23 @@
    "Currently Shared With Devices": "Currently Shared With Devices",
    "Danger!": "Perill!",
    "Debugging Facilities": "Utilitats de Depuració",
+    "Default Configuration": "Default Configuration",
+    "Default Device": "Default Device",
+    "Default Folder": "Default Folder",
    "Default Folder Path": "Carpeta de la Ruta per Defecte",
+    "Defaults": "Defaults",
+    "Delete": "Esborrar",
+    "Delete Unexpected Items": "Delete Unexpected Items",
    "Deleted": "Esborrat",
    "Deselect All": "Anul·lar tota la selecció",
    "Deselect devices to stop sharing this folder with.": "Deselect devices to stop sharing this folder with.",
+    "Deselect folders to stop sharing with this device.": "Deselect folders to stop sharing with this device.",
    "Device": "Dispositiu",
    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Dispositiu \"{{name}}\" ({{device}} a l'adreça {{address}}) vol connectar. Afegir nou dispositiu?",
    "Device ID": "ID del dispositiu",
    "Device Identification": "Identificació del dispositiu",
    "Device Name": "Nom del dispositiu",
+    "Device is untrusted, enter encryption password": "Device is untrusted, enter encryption password",
    "Device rate limits": "Límits de la tasa del dispositiu",
    "Device that last modified the item": "El dispositiu que va modificar el item per última vegada",
    "Devices": "Dispositius",
@@ -83,6 +98,9 @@
    "Discovered": "Descobert",
    "Discovery": "Descobriment",
    "Discovery Failures": "Fallades al Descobriment",
+    "Discovery Status": "Discovery Status",
+    "Dismiss": "Dismiss",
+    "Do not add it to the ignore list, so this notification may recur.": "Do not add it to the ignore list, so this notification may recur.",
    "Do not restore": "No restaurar",
    "Do not restore all": "No restaurar en absolut",
    "Do you want to enable watching for changes for all your folders?": "Vols activar el rastreig continu de canvis per a totes les carpetes?",
@@ -91,8 +109,10 @@
    "Downloaded": "Descarregat",
    "Downloading": "Descarregant",
    "Edit": "Editar",
-    "Edit Device": "Edit Device",
-    "Edit Folder": "Edit Folder",
+    "Edit Device": "Editar Dispositiu",
+    "Edit Device Defaults": "Edit Device Defaults",
+    "Edit Folder": "Editar Carpeta",
+    "Edit Folder Defaults": "Edit Folder Defaults",
    "Editing {%path%}.": "Editant {{path}}.",
    "Enable Crash Reporting": "Enable Crash Reporting",
    "Enable NAT traversal": "Permetre NAT transversal",
@@ -106,6 +126,7 @@
    "Error": "Error",
    "External File Versioning": "Versionat extern de fitxers",
    "Failed Items": "Objectes fallits",
+    "Failed to load ignore patterns.": "Failed to load ignore patterns.",
    "Failed to setup, retrying": "Errada en la configuració, reintentant",
    "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "És possible que es produïsca una fallada al connectar als servidors IPv6 si no hi ha connectivitat IPv6.",
    "File Pull Order": "Ordre de fitxers del pull",
@@ -122,6 +143,8 @@
    "Folder Label": "Etiqueta de la Carpeta",
    "Folder Path": "Ruta de la carpeta",
    "Folder Type": "Tipus de carpeta",
+    "Folder type \"{%receiveEncrypted%}\" can only be set when adding a new folder.": "Folder type \"{{receiveEncrypted}}\" can only be set when adding a new folder.",
+    "Folder type \"{%receiveEncrypted%}\" cannot be changed after adding the folder. You need to remove the folder, delete or decrypt the data on disk, and add the folder again.": "Folder type \"{{receiveEncrypted}}\" cannot be changed after adding the folder. You need to remove the folder, delete or decrypt the data on disk, and add the folder again.",
    "Folders": "Carpetes",
    "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "Per a les següents carpetes va ocòrrer un error mentre es començava a vigilar els canvis. Es tornarà a intentar cada minut, així que potser els errors desapareguen pronte. Si persisteixen, tracta d'arreglar el motiu subjacent i demana ajuda si no pots.",
    "Full Rescan Interval (s)": "Interval de l'Escaneig Complet (segons)",
@@ -139,6 +162,8 @@
    "Help": "Ajuda",
    "Home page": "Pàgina inicial",
    "However, your current settings indicate you might not want it enabled. We have disabled automatic crash reporting for you.": "However, your current settings indicate you might not want it enabled. We have disabled automatic crash reporting for you.",
+    "Identification": "Identification",
+    "If untrusted, enter encryption password": "If untrusted, enter encryption password",
    "If you want to prevent other users on this computer from accessing Syncthing and through it your files, consider setting up authentication.": "If you want to prevent other users on this computer from accessing Syncthing and through it your files, consider setting up authentication.",
    "Ignore": "Ignorar",
    "Ignore Patterns": "Patrons a ignorar",
@@ -159,6 +184,8 @@
    "Latest Change": "Últim Canvi",
    "Learn more": "Saber més",
    "Limit": "Límit",
+    "Listener Failures": "Listener Failures",
+    "Listener Status": "Listener Status",
    "Listeners": "Escoltants",
    "Loading data...": "Carregant dades...",
    "Loading...": "Carregant...",
@@ -187,6 +214,7 @@
    "No File Versioning": "Sense versionat de fitxer",
    "No files will be deleted as a result of this operation.": "Amb aquesta operació no s'esborrarà cap fitxer.",
    "No upgrades": "Sense actualitzacions",
+    "Not shared": "Not shared",
    "Notice": "Avís",
    "OK": "OK",
    "Off": "Off",
@@ -196,6 +224,7 @@
    "Out of Sync": "Sense sincronització",
    "Out of Sync Items": "Dispositius sense sincronitzar",
    "Outgoing Rate Limit (KiB/s)": "Límit de pujada (KiB/s)",
+    "Override": "Override",
    "Override Changes": "Sobreescriure els canvis",
    "Path": "Ruta",
    "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Ruta a la carpeta local en l'ordinador. Es crearà si no existeix. El caràcter tilde (~) es pot utilitzar com a drecera",
@@ -209,6 +238,7 @@
    "Periodic scanning at given interval and disabled watching for changes": "Escaneig periòdic a l'interval determinat i desactivat el rastreig continu de canvis",
    "Periodic scanning at given interval and enabled watching for changes": "Escaneig periòdic a l'interval determinat i activat el rastreig continu de canvis",
    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Escaneig periòdic a l'interval determinat i errada al activar el rastreig continu de canvis, reintentant cada 1 minut:",
+    "Permanently add it to the ignore list, suppressing further notifications.": "Permanently add it to the ignore list, suppressing further notifications.",
    "Permissions": "Permisos",
    "Please consult the release notes before performing a major upgrade.": "Per favor, consultar les notes de la versió abans de fer una actualització important.",
    "Please set a GUI Authentication User and Password in the Settings dialog.": "Per favor, estableix un usuari i password per a l'Interfície Gràfica d'Usuari en el menú d'Adjustos.",
@@ -220,12 +250,15 @@
    "Preview Usage Report": "Informe d'ús de vista prèvia",
    "Quick guide to supported patterns": "Guía ràpida de patrons suportats",
    "Random": "Aleatori",
+    "Receive Encrypted": "Receive Encrypted",
    "Receive Only": "Només rebre",
+    "Received data is already encrypted": "Received data is already encrypted",
    "Recent Changes": "Canvis Recents",
    "Reduced by ignore patterns": "Reduït ignorant patrons",
    "Release Notes": "Notes de la versió",
    "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Les versions candidates (Release Candidates) contenen les darreres característiques i arreglos. Són paregudes a les versions tradicionals bi-semanals de Syncthing. ",
    "Remote Devices": "Dispositius Remots",
+    "Remote GUI": "Remote GUI",
    "Remove": "Eliminar",
    "Remove Device": "Eliminar Dispositiu",
    "Remove Folder": "Eliminar Carpeta",
@@ -241,6 +274,7 @@
    "Resume": "Continuar",
    "Resume All": "Continuar Tot",
    "Reused": "Reutilitzat",
+    "Revert": "Revert",
    "Revert Local Changes": "Revertir els canvis locals",
    "Save": "Gravar",
    "Scan Time Remaining": "Temps d'escaneig restant",
@@ -249,6 +283,7 @@
    "Select All": "Sel·leccionar Tot",
    "Select a version": "Seleccionar una versió",
    "Select additional devices to share this folder with.": "Select additional devices to share this folder with.",
+    "Select additional folders to share with this device.": "Select additional folders to share with this device.",
    "Select latest version": "Seleccionar l'última versió",
    "Select oldest version": "Seleccionar la versió més antiga",
    "Select the folders to share with this device.": "Selecciona les carpetes per a compartir amb aquest dispositiu.",
@@ -259,10 +294,13 @@
    "Share Folder": "Compartir carpeta",
    "Share Folders With Device": "Compartir carpetes amb el dispositiu",
    "Share this folder?": "Compartir aquesta carpeta?",
+    "Shared Folders": "Shared Folders",
    "Shared With": "Compartit amb",
    "Sharing": "Compartint",
    "Show ID": "Mostrar ID",
    "Show QR": "Mostrar QR",
+    "Show detailed discovery status": "Show detailed discovery status",
+    "Show detailed listener status": "Show detailed listener status",
    "Show diff with previous version": "Mostrar les diferències amb la versió prèvia",
    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Mostrat en lloc de l'ID del dispositiu en l'estat del grup (cluster). S'anunciarà als altres dispositius com el nom opcional per defecte.",
    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Mostrat en lloc de l'ID del dispositiu en l'estat del grup (cluster). S'actualitzarà al nom que el dispositiu anuncia si es deixa buit.",
@@ -272,7 +310,9 @@
    "Single level wildcard (matches within a directory only)": "Comodí de nivell únic (coincideix sols dins d'un directori)",
    "Size": "Tamany",
    "Smallest First": "El més xicotet primer",
+    "Some discovery methods could not be established for finding other devices or announcing this device:": "Some discovery methods could not be established for finding other devices or announcing this device:",
    "Some items could not be restored:": "Alguns ítems no s'han pogut restaurar:",
+    "Some listening addresses could not be enabled to accept connections:": "Some listening addresses could not be enabled to accept connections:",
    "Source Code": "Codi font",
    "Stable releases and release candidates": "Versions estables i versions candidates",
    "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "Les versions estables es retrasen sobre dos setmanes. Durant aquest temps es fiquen a prova com versions candidates.",
@@ -281,6 +321,7 @@
    "Start Browser": "Iniciar navegador",
    "Statistics": "Estadístiques",
    "Stopped": "Parat",
+    "Stores and syncs only encrypted data. Folders on all connected devices need to be set up with the same password or be of type \"{%receiveEncrypted%}\" too.": "Stores and syncs only encrypted data. Folders on all connected devices need to be set up with the same password or be of type \"{{receiveEncrypted}}\" too.",
    "Support": "Suport",
    "Support Bundle": "Lot de Suport",
    "Sync Protocol Listen Addresses": "Direccions d'escolta del protocol de sincronització",
@@ -288,6 +329,8 @@
    "Syncthing has been shut down.": "Syncthing s'ha apagat",
    "Syncthing includes the following software or portions thereof:": "Syncthing inclou el següent software o parts d'ell:",
    "Syncthing is Free and Open Source Software licensed as MPL v2.0.": "Syncthing és Software Gratuït i Open Source llicenciat com MPL v2.0.",
+    "Syncthing is listening on the following network addresses for connection attempts from other devices:": "Syncthing is listening on the following network addresses for connection attempts from other devices:",
+    "Syncthing is not listening for connection attempts from other devices on any address.  Only outgoing connections from this device may work.": "Syncthing is not listening for connection attempts from other devices on any address.  Only outgoing connections from this device may work.",
    "Syncthing is restarting.": "Syncthing està reiniciant.",
    "Syncthing is upgrading.": "Syncthing està actualitzant-se.",
    "Syncthing now supports automatically reporting crashes to the developers. This feature is enabled by default.": "Syncthing now supports automatically reporting crashes to the developers. This feature is enabled by default.",
@@ -306,10 +349,14 @@
    "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.": "L'ID del dispositiu introduïda no pareix vàlida. Deuria ser una cadena de 52 o 56 caracters consistents en lletres i nombre, amb espais i barres opcionals.",
    "The folder ID cannot be blank.": "L'ID de la carpeta no pot estar buit.",
    "The folder ID must be unique.": "L'ID de la carpeta deu ser única.",
+    "The folder content on other devices will be overwritten to become identical with this device. Files not present here will be deleted on other devices.": "The folder content on other devices will be overwritten to become identical with this device. Files not present here will be deleted on other devices.",
+    "The folder content on this device will be overwritten to become identical with other devices. Files newly added here will be deleted.": "The folder content on this device will be overwritten to become identical with other devices. Files newly added here will be deleted.",
    "The folder path cannot be blank.": "La ruta de la carpeta no pot estar buida.",
    "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.": "S'utilitzen els següents intervals: per a la primera hora es guarda una versió cada 30 segons, per al primer dia es guarda una versió cada hora, per als primers 30 dies es guarda una versió diaria, fins l'edat màxima es guarda una versió cada setmana.",
    "The following items could not be synchronized.": "Els següents objectes no s'han pogut sincronitzar.",
    "The following items were changed locally.": "Els següents ítems es canviaren localment.",
+    "The following methods are used to discover other devices on the network and announce this device to be found by others:": "The following methods are used to discover other devices on the network and announce this device to be found by others:",
+    "The following unexpected items were found.": "The following unexpected items were found.",
    "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 maximum age must be a number and cannot be blank.": "L'edat màxima deu ser un nombre i no pot estar buida.",
@@ -322,9 +369,11 @@
    "The rate limit must be a non-negative number (0: no limit)": "El llímit del ritme deu ser un nombre no negatiu (0: sense llímit)",
    "The rescan interval must be a non-negative number of seconds.": "L'interval de reescaneig deu ser un nombre positiu de segons.",
    "There are no devices to share this folder with.": "There are no devices to share this folder with.",
+    "There are no folders to share with this device.": "There are no folders to share with this device.",
    "They are retried automatically and will be synced when the error is resolved.": "Es reintenta automàticament i es sincronitzaràn quant el resolga l'error.",
    "This Device": "Aquest Dispositiu",
    "This can easily give hackers access to read and change any files on your computer.": "Açò pot donar accés fàcilment als hackers per a llegir i canviar qualsevol fitxer al teu ordinador.",
+    "This device cannot automatically discover other devices or announce its own address to be found by others.  Only devices with statically configured addresses can connect.": "This device cannot automatically discover other devices or announce its own address to be found by others.  Only devices with statically configured addresses can connect.",
    "This is a major version upgrade.": "Aquesta és una actualització important de la versió.",
    "This setting controls the free space required on the home (i.e., index database) disk.": "Aquest ajust controla l'espai lliure requerit en el disc inicial (per exemple, la base de dades de l'index).",
    "Time": "Temps",
@@ -335,10 +384,14 @@
    "Unavailable": "No disponible",
    "Unavailable/Disabled by administrator or maintainer": "No disponible/Desactivar per l'administrador o mantenedor",
    "Undecided (will prompt)": "No decidit (es preguntarà)",
+    "Unexpected Items": "Unexpected Items",
+    "Unexpected items have been found in this folder.": "Unexpected items have been found in this folder.",
    "Unignore": "Designorar",
    "Unknown": "Desconegut",
    "Unshared": "No compartit",
    "Unshared Devices": "Unshared Devices",
+    "Unshared Folders": "Unshared Folders",
+    "Untrusted": "Untrusted",
    "Up to Date": "Actualitzat",
    "Updated": "Actualitzat",
    "Upgrade": "Actualitzar",
@@ -348,6 +401,7 @@
    "Uptime": "Temps de funcionament",
    "Usage reporting is always enabled for candidate releases.": "Els informes d'ús sempre estan activats per a les versions candidates.",
    "Use HTTPS for GUI": "Utilitzar HTTPS per a l'Interfície Gràfica d'Usuari (GUI)",
+    "Use notifications from the filesystem to detect changed items.": "Usar notificacions del sistema de fitxers per a detectar els ítems canviats.",
    "Username/Password has not been set for the GUI authentication. Please consider setting it up.": "Username/Password has not been set for the GUI authentication. Please consider setting it up.",
    "Version": "Versió",
    "Versions": "Versions",
@@ -356,6 +410,7 @@
    "Waiting to Clean": "Waiting to Clean",
    "Waiting to Scan": "Waiting to Scan",
    "Waiting to Sync": "Waiting to Sync",
+    "Warning": "Warning",
    "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "Perill! Esta ruta és un directori pare d'una carpeta ja existent \"{{otherFolder}}\".",
    "Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Perill! Esta ruta és un directori pare d'una carpeta existent \"{{otherFolderLabel}}\" ({{otherFolder}}).",
    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Perill! Esta ruta és un subdirectori d'una carpeta que ja existeix nomenada \"{{otherFolder}}\".",
@@ -374,12 +429,14 @@
    "You have no ignored folders.": "No tens carpetes ignorades.",
    "You have unsaved changes. Do you really want to discard them?": "Tens canvis sense guardar. Realment vols descartar-los?",
    "You must keep at least one version.": "Es deu mantindre al menys una versió.",
+    "You should never add or change anything locally in a \"{%receiveEncrypted%}\" folder.": "You should never add or change anything locally in a \"{{receiveEncrypted}}\" folder.",
    "days": "dies",
-    "directories": "directories",
+    "directories": "directoris",
    "files": "arxius",
    "full documentation": "Documentació completa",
    "items": "Elements",
    "seconds": "seconds",
    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} vol compartit la carpeta \"{{folder}}\".",
-    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} vol compartir la carpeta \"{{folderlabel}}\" ({{folder}})."
+    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} vol compartir la carpeta \"{{folderlabel}}\" ({{folder}}).",
+    "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} might reintroduce this device."
 }
--- a/gui/default/assets/lang/lang-cs.json
+++ b/gui/default/assets/lang/lang-cs.json
@@ -18,15 +18,20 @@
    "Advanced": "Pokročilé",
    "Advanced Configuration": "Pokročilá nastavení",
    "All Data": "Všechna data",
+    "All folders shared with this device must be protected by a password, such that all sent data is unreadable without the given password.": "Všechny složky sdílené s tímto zařízením musí být chráněna heslem, aby byla odesílaná data bez hesla nečitelná.",
    "Allow Anonymous Usage Reporting?": "Povolit anonymní hlášení o používání?",
    "Allowed Networks": "Sítě, ze kterých je umožněn přístup",
    "Alphabetic": "Abecední",
    "An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.": "Správu verzí obstarává externí příkaz. U toho je třeba, aby neaktuální soubory jím byly odsouvány pryč ze sdílené složky. Pokud popis umístění tohoto příkazu obsahuje mezeru, je třeba popis umístění uzavřít do uvozovek.",
    "Anonymous Usage Reporting": "Anonymní hlášení o používání",
    "Anonymous usage report format has changed. Would you like to move to the new format?": "Formát anonymního hlášení o používání byl změněn. Chcete přejít na nový formát?",
+    "Are you sure you want to continue?": "Skutečně si přejete pokračovat?",
+    "Are you sure you want to override all remote changes?": "Skutečně si přejete přebít všechny vzdálené změny?",
+    "Are you sure you want to permanently delete all these files?": "Skutečně chcete smazat všechny tyto soubory?",
    "Are you sure you want to remove device {%name%}?": "Opravdu chcete odebrat zařízení {{name}}?",
    "Are you sure you want to remove folder {%label%}?": "Opravdu chcete odebrat složku {{label}}?",
    "Are you sure you want to restore {%count%} files?": "Opravdu chcete obnovit {{count}} souborů?",
+    "Are you sure you want to revert all local changes?": "Skutečně si přejete vrátit všechny lokální změny?",
    "Are you sure you want to upgrade?": "Skutečně chcete provést aktualizaci?",
    "Auto Accept": "Přijmout automaticky",
    "Automatic Crash Reporting": "Automatické hlášení pádů",
@@ -37,11 +42,13 @@
    "Available debug logging facilities:": "Dostupná logovací zařízení pro ladění:",
    "Be careful!": "Buďte opatrní!",
    "Bugs": "Chyby",
+    "Cancel": "Zrušit",
    "Changelog": "Seznam změn",
    "Clean out after": "Vyčistit po",
    "Cleaning Versions": "Mazání verzí",
    "Cleanup Interval": "Interval mazání",
    "Click to see discovery failures": "Kliknutím zobrazíte nezdary při objevování",
+    "Click to see full identification string and QR code.": "Kliknutím zobrazíte úplnou identifikaci a QR kód.",
    "Close": "Zavřít",
    "Command": "Příkaz",
    "Comment, when used at the start of a line": "Pokud použito na jeho začátku, je řádek považován za komentář",
@@ -59,15 +66,23 @@
    "Currently Shared With Devices": "Aktuálně sdíleno se zařízeními",
    "Danger!": "Nebezpečí!",
    "Debugging Facilities": "Nástroje pro ladění",
+    "Default Configuration": "Výchozí nastavení",
+    "Default Device": "Výchozí zařízení",
+    "Default Folder": "Výchozí složka",
    "Default Folder Path": "Popis umístění výchozí složky",
+    "Defaults": "Výchozí hodnoty",
+    "Delete": "Smazat",
+    "Delete Unexpected Items": "Smazat neočekávané položky",
    "Deleted": "Smazáno",
    "Deselect All": "Zrušit výběr všeho",
    "Deselect devices to stop sharing this folder with.": "Zrušte výběr zařízení, se kterými již nemá být tato složka sdílena.",
+    "Deselect folders to stop sharing with this device.": "Zrušte výběr složek, které se mají přestat sdílet s tímto zařízením.",
    "Device": "Zařízení",
    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Zařízení „{{name}}“ ({{device}} na {{address}}) se chce připojit. Přidat nové zařízení?",
    "Device ID": "Identifikátor zařízení",
    "Device Identification": "Identifikace zařízení",
    "Device Name": "Název zařízení",
+    "Device is untrusted, enter encryption password": "Zařízení nemá důvěru, zadejte šifrovací heslo.",
    "Device rate limits": "Omezení přenosové rychlosti pro zařízení",
    "Device that last modified the item": "Zařízení, které položku změnilo naposledy",
    "Devices": "Zařízení",
@@ -81,8 +96,11 @@
    "Disconnected": "Odpojeno",
    "Disconnected (Unused)": "Odpojeno (nepoužité)",
    "Discovered": "Objeveno",
-    "Discovery": "Oznamování",
-    "Discovery Failures": "Nezdary při oznamování",
+    "Discovery": "Objevování",
+    "Discovery Failures": "Nezdary při objevování",
+    "Discovery Status": "Stav objevování",
+    "Dismiss": "OK",
+    "Do not add it to the ignore list, so this notification may recur.": "Nepřidávat k ignorování, takže oznámení se může opakovat.",
    "Do not restore": "Neobnovit",
    "Do not restore all": "Neobnovit nic",
    "Do you want to enable watching for changes for all your folders?": "Chcete zapnout sledování změn pro všechny složky?",
@@ -92,7 +110,9 @@
    "Downloading": "Stahuje se",
    "Edit": "Upravit",
    "Edit Device": "Upravit zařízení",
+    "Edit Device Defaults": "Upravit výchozí hodnoty zařízení",
    "Edit Folder": "Upravit složku",
+    "Edit Folder Defaults": "Upravit výchozí hodnoty složek",
    "Editing {%path%}.": "Upravuje se {{path}}.",
    "Enable Crash Reporting": "Povolit hlášení pádů",
    "Enable NAT traversal": "Povolit průchod skrze NAT překlad",
@@ -100,12 +120,13 @@
    "Enabled": "Zapnuto",
    "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Zadejte kladné číslo (např. „2.35“) a zvolte jednotku. Procenta znamenají část celkové velikosti úložiště.",
    "Enter a non-privileged port number (1024 - 65535).": "Zadejte číslo neprivilegovaného portu (1024-65535).",
-    "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Zadejte adresy oddělené čárkami („tcp://ip:port“, „tcp://host:port“) nebo „dynamic“ pro automatické zjištění adresy.",
+    "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Zadejte adresy oddělené čárkami („tcp://ip:port“, „tcp://host:port“) nebo „dynamic“ pro automatické objevení adresy.",
    "Enter ignore patterns, one per line.": "Zadejte vzory toho, co ignorovat – každý na zvlášť řádek.",
    "Enter up to three octal digits.": "Zadejte nanejvýš tři osmičkové číslice.",
    "Error": "Chyba",
    "External File Versioning": "Externí správa verzí souborů",
    "Failed Items": "Nezdařené položky",
+    "Failed to load ignore patterns.": "Načtení vzorů ignorovaného se nezdařilo.",
    "Failed to setup, retrying": "Nastavování se nezdařilo, zkouší se znovu",
    "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Je v pořádku, když připojení k IPv6 serverům nezdaří, pokud není k dispozici IPv6 konektivita.",
    "File Pull Order": "Pořadí stahování souborů",
@@ -122,6 +143,8 @@
    "Folder Label": "Jmenovka složky",
    "Folder Path": "Popis umístění složky",
    "Folder Type": "Typ složky",
+    "Folder type \"{%receiveEncrypted%}\" can only be set when adding a new folder.": "Typ složky „{{receiveEncrypted}}“ lze nastavit jen při vytváření nové složky.",
+    "Folder type \"{%receiveEncrypted%}\" cannot be changed after adding the folder. You need to remove the folder, delete or decrypt the data on disk, and add the folder again.": "Typ složky „{{receiveEncrypted}}“ nelze změnit po přidání složky. Je třeba složku odebrat, data na disku vymazat nebo rozšifrovat, a nakonec vytvořit složku znova.",
    "Folders": "Složky",
    "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "Pokus o spuštění sledování změn v těchto složkách se nezdařil. Bude se to opětovně zkoušet každou minutu, takže se to možná brzo povede. Pokud ne, pokuste se najít příčinu. případně požádejte o pomoc.",
    "Full Rescan Interval (s)": "Interval plného skenu (sek.)",
@@ -133,12 +156,14 @@
    "GUI Theme": "Motiv vzhledu pro GUI",
    "General": "Obecné",
    "Generate": "Vytvořit",
-    "Global Discovery": "Globální oznamování",
-    "Global Discovery Servers": "Servery globálního oznamování",
+    "Global Discovery": "Globální objevování",
+    "Global Discovery Servers": "Servery globálního objevování",
    "Global State": "Globální status",
    "Help": "Nápověda",
    "Home page": "Domovská stránka",
    "However, your current settings indicate you might not want it enabled. We have disabled automatic crash reporting for you.": "Nicméně Vaše současná nastavení značí, že si nepřejete funkci povolit. Automatické hlášení pádů tedy bylo vypnuto.",
+    "Identification": "Identifikace",
+    "If untrusted, enter encryption password": "V případě nedůvěryhodnosti zadat šifrovací heslo",
    "If you want to prevent other users on this computer from accessing Syncthing and through it your files, consider setting up authentication.": "Pokud chcete ostatním uživatelům tohoto počítače zabránit v přístupu k Syncthing (a skrze něj tedy ke svým souborům), zvažte nastavení ověřování se.",
    "Ignore": "Ignorovat",
    "Ignore Patterns": "Vzory ignorovaného",
@@ -159,11 +184,13 @@
    "Latest Change": "Poslední změna",
    "Learn more": "Zjistěte více",
    "Limit": "Limit",
+    "Listener Failures": "Selhání při naslouchání",
+    "Listener Status": "Stav naslouchání",
    "Listeners": "Naslouchající",
    "Loading data...": "Načítání dat…",
    "Loading...": "Načítání…",
    "Local Additions": "Místní příbytky",
-    "Local Discovery": "Místní oznamování",
+    "Local Discovery": "Místní objevování",
    "Local State": "Místní status",
    "Local State (Total)": "Místní status (Celkem)",
    "Locally Changed Items": "Lokálně změněné položky",
@@ -187,6 +214,7 @@
    "No File Versioning": "Neuchovávat předchozí verze souborů",
    "No files will be deleted as a result of this operation.": "Tato operace nesmaže žádné soubory.",
    "No upgrades": "Žádné aktualizace",
+    "Not shared": "Nesdílené",
    "Notice": "Oznámení",
    "OK": "OK",
    "Off": "Vypnuta",
@@ -196,6 +224,7 @@
    "Out of Sync": "Nesesynchronizováno",
    "Out of Sync Items": "Nesesynchronizované položky",
    "Outgoing Rate Limit (KiB/s)": "Omezení odchozí rychlosti (KiB/s)",
+    "Override": "Přebít",
    "Override Changes": "Přebít změny na ostatních",
    "Path": "Popis umístění",
    "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Popis umístění složky na tomto počítači. Pokud neexistuje, bude vytvořeno. Znak vlnovky (~) může být použit jako zkratka pro",
@@ -209,6 +238,7 @@
    "Periodic scanning at given interval and disabled watching for changes": "Periodické skenování podle zadaného intervalu; sledování změn vypnuto",
    "Periodic scanning at given interval and enabled watching for changes": "Periodické skenování podle zadaného intervalu; sledování změn zapnuto",
    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Periodické skenování podle zadaného intervalu; nastavení sledování změn se nezdařilo, opětovný pokus každou 1 min: ",
+    "Permanently add it to the ignore list, suppressing further notifications.": "Natrvalo ignorovat, takže oznámení již nebudou přicházet.",
    "Permissions": "Oprávnění",
    "Please consult the release notes before performing a major upgrade.": "Před přechodem na novější hlavní verzi si nejdříve přečtěte poznámky k vydání nové verze.",
    "Please set a GUI Authentication User and Password in the Settings dialog.": "V dialogu Nastavení zadejte uživatelské jméno a heslo pro ověření se v GUI.",
@@ -220,12 +250,15 @@
    "Preview Usage Report": "Náhled hlášení o využívání",
    "Quick guide to supported patterns": "Rychlá nápověda k podporovaným vzorům",
    "Random": "Náhodné",
+    "Receive Encrypted": "Přijmout zašifrované",
    "Receive Only": "Pouze přijímací",
+    "Received data is already encrypted": "Přijatá data jsou již zašifrována",
    "Recent Changes": "Nedávné změny",
    "Reduced by ignore patterns": "Redukováno o ignorované vzory",
    "Release Notes": "Poznámky k vydání",
    "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Kandidáti na vydání obsahují nejnovější změny a opravy. Podobají se tradičním dvoutýdenním vydáním Syncthing.",
    "Remote Devices": "Vzdálená zařízení",
+    "Remote GUI": "Vzdálené GUI",
    "Remove": "Odstranit",
    "Remove Device": "Odebrat zařízení",
    "Remove Folder": "Odebrat složku",
@@ -241,6 +274,7 @@
    "Resume": "Pokračovat",
    "Resume All": "Pokračovat (vše)",
    "Reused": "Opakovaně použité",
+    "Revert": "Vrátit zpět",
    "Revert Local Changes": "Vrátit lokální změny",
    "Save": "Uložit",
    "Scan Time Remaining": "Čas do dokončení skenování",
@@ -249,6 +283,7 @@
    "Select All": "Vybrat vše",
    "Select a version": "Vyberte verzi",
    "Select additional devices to share this folder with.": "Vyberte další zařízení pro sdílení s touto složkou.",
+    "Select additional folders to share with this device.": "Vyberte další složky, které mají být sdíleny s tímto zařízením.",
    "Select latest version": "Vybrat nejnovější verzi",
    "Select oldest version": "Vybrat nejstarší verzi",
    "Select the folders to share with this device.": "Vybrat složky ke sdílení s tímto zařízením.",
@@ -259,10 +294,13 @@
    "Share Folder": "Sdílet složku",
    "Share Folders With Device": "Sdílet složky s tímto zařízením",
    "Share this folder?": "Sdílet tuto složku?",
+    "Shared Folders": "Sdílené složky",
    "Shared With": "Sdíleno s",
    "Sharing": "Sdílení",
    "Show ID": "Zobrazit identifikátor",
    "Show QR": "Zobrazit QR kód",
+    "Show detailed discovery status": "Zobrazit detailní stav objevování",
+    "Show detailed listener status": "Zobrazit detailní stav naslouchajících",
    "Show diff with previous version": "Ukázat rozdíl oproti předchozí verzi",
    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Zobrazeno místo identifikátoru zařízení na náhledu stavu clusteru. Bude odesíláno ostatním zařízením jako výchozí název zařízení.",
    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Zobrazeno místo identifikátoru zařízení na náhledu stavu clusteru. Pokud nebude vyplněno, bude nastaveno na název, který zařízení odesílá.",
@@ -272,7 +310,9 @@
    "Single level wildcard (matches within a directory only)": "Jednoúrovňový zástupný znak (shody pouze uvnitř složky)",
    "Size": "Velikost",
    "Smallest First": "Od nejmenších",
+    "Some discovery methods could not be established for finding other devices or announcing this device:": "Nebyly zajištěny některé metody pro objevování ostatních zařízení nebo oznamování tohoto zařízení:",
    "Some items could not be restored:": "Některé položky nemohly být obnoveny:",
+    "Some listening addresses could not be enabled to accept connections:": "Některé adresy k naslouchání nebylo možné povolit pro příchozí spojení:",
    "Source Code": "Zdrojové kódy",
    "Stable releases and release candidates": "Stabilní vydání a kandidáti na vydání",
    "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "Stabilní vydání jsou opožděna zhruba o dva týdny. Po tuto dobu se testují jako kandidáti na vydání.",
@@ -281,6 +321,7 @@
    "Start Browser": "Otevřít webový prohlížeč",
    "Statistics": "Statistiky",
    "Stopped": "Zastaveno",
+    "Stores and syncs only encrypted data. Folders on all connected devices need to be set up with the same password or be of type \"{%receiveEncrypted%}\" too.": "Ukládá a synchronizuje pouze zašifrovaná data. Složky na všech připojených zařízeních musí mít nastavené stejné heslo a nebo být také typu „{{receiveEncrypted}}“.",
    "Support": "Podpora",
    "Support Bundle": "Balík podpory",
    "Sync Protocol Listen Addresses": "Adresa, na které synchronizační protokol očekává spojení",
@@ -288,6 +329,8 @@
    "Syncthing has been shut down.": "Syncthing bylo vypnuto.",
    "Syncthing includes the following software or portions thereof:": "Syncthing obsahuje následující software nebo jejich část:",
    "Syncthing is Free and Open Source Software licensed as MPL v2.0.": "Syncthing je svobodný a open source software licencovaný jako MPL v2.0.",
+    "Syncthing is listening on the following network addresses for connection attempts from other devices:": "Syncthing naslouchá pro příchozí spojení na následujících síťových adresách:",
+    "Syncthing is not listening for connection attempts from other devices on any address.  Only outgoing connections from this device may work.": "Syncthing nenaslouchá pro příchozí spojení na žádné adrese. Mohou fungovat jen odchozí spojení z tohoto zařízení.",
    "Syncthing is restarting.": "Syncthing se restartuje.",
    "Syncthing is upgrading.": "Syncthing se aktualizuje.",
    "Syncthing now supports automatically reporting crashes to the developers. This feature is enabled by default.": "Syncthing nyní umožňuje automaticky hlásit vývojářům pády aplikace. Tato funkce je ve výchozím stavu povolena.",
@@ -306,10 +349,14 @@
    "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.": "Zadaný identifikátor zařízení není platný. Měl by mít 52 nebo 56 znaků a měl by obsahovat písmena a číslice. Mezery a pomlčky jsou nepovinné.",
    "The folder ID cannot be blank.": "Identifikátor složky nemůže zůstat nevyplněný.",
    "The folder ID must be unique.": "Je třeba, aby se identifikátor složky neopakoval.",
+    "The folder content on other devices will be overwritten to become identical with this device. Files not present here will be deleted on other devices.": "Obsah složky na ostatních zařízeních bude přepsán, aby se stal identickým s tímto zařízením. Soubory, které zde chybí, budou smazány na ostatních zařízeních.",
+    "The folder content on this device will be overwritten to become identical with other devices. Files newly added here will be deleted.": "Obsah složky na tomto zařízení bude přepsán, aby se stal identickým s ostatními zařízeními. Lokálně přidané soubory budou smazány.",
    "The folder path cannot be blank.": "Popis umístění složky nemůže zůstat nevyplněný.",
    "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.": "Jsou použity následující intervaly: za první hodinu jsou ponechány verze pro každých 30 sekund, za první den jsou ponechány verze pro každou hodinu, za prvních 30 dní jsou ponechány verze pro každý den a do nejvyššího nastaveného stáří jsou ponechány verze pro každý týden.",
    "The following items could not be synchronized.": "Následující položky nemohly být synchronizovány.",
    "The following items were changed locally.": "Tyto položky byly změněny lokálně",
+    "The following methods are used to discover other devices on the network and announce this device to be found by others:": "K objevování ostatních zařízení a oznamování tohoto zařízení se používají následující metody:",
+    "The following unexpected items were found.": "Byly nalezeny tyto neočekávané položky.",
    "The interval must be a positive number of seconds.": "Interval musí být kladný počet sekund.",
    "The interval, in seconds, for running cleanup in the versions directory. Zero to disable periodic cleaning.": "Interval (v sekundách) pro spouštění čištění ve složce s verzemi. Nula pravidelné čištění vypíná.",
    "The maximum age must be a number and cannot be blank.": "Nejvyšší stáří je třeba zadat v podobě čísla a nemůže být prázdné.",
@@ -322,9 +369,11 @@
    "The rate limit must be a non-negative number (0: no limit)": "Je třeba, aby limit rychlosti bylo kladné číslo (0: bez limitu)",
    "The rescan interval must be a non-negative number of seconds.": "Je třeba, aby interval opakování skenování bylo kladné číslo.",
    "There are no devices to share this folder with.": "Nejsou žádná zařízení, se kterými lze sdílet tuto složku.",
+    "There are no folders to share with this device.": "S tímto zařízením nejsou sdíleny žádné složky.",
    "They are retried automatically and will be synced when the error is resolved.": "Nové pokusy o synchronizaci budou probíhat automaticky a položky budou synchronizovány jakmile bude chyba odstraněna.",
    "This Device": "Toto zařízení",
    "This can easily give hackers access to read and change any files on your computer.": "Toto může útočníkům jednoduše umožnit čtení a úpravy souborů na vašem počítači. ",
+    "This device cannot automatically discover other devices or announce its own address to be found by others.  Only devices with statically configured addresses can connect.": "Toto zařízení nemůže automaticky objevovat ostatní zařízení ani oznamovat ostatním vlastní adresu. Připojit se mohou jen zařízení se staticky nastavenou adresou.",
    "This is a major version upgrade.": "Toto je velká aktualizace.",
    "This setting controls the free space required on the home (i.e., index database) disk.": "Toto nastavení ovládá velikost volného prostoru na hlavním datovém úložišti (to, na kterém je databáze rejstříku).",
    "Time": "Čas",
@@ -335,10 +384,14 @@
    "Unavailable": "Nedostupné",
    "Unavailable/Disabled by administrator or maintainer": "Není k dispozici / vypnuto správcem systému či balíčku",
    "Undecided (will prompt)": "Nerozhodnuto (zeptá se)",
+    "Unexpected Items": "Neočekávané položky",
+    "Unexpected items have been found in this folder.": "V této složce byly nalezeny neočekávané položky.",
    "Unignore": "Přestat ignorovat",
    "Unknown": "Neznámý",
    "Unshared": "Nesdílený",
    "Unshared Devices": "Nesdílená zařízení",
+    "Unshared Folders": "Nesdílené složky",
+    "Untrusted": "Bez důvěry",
    "Up to Date": "Aktuální",
    "Updated": "Aktualizováno",
    "Upgrade": "Přechod na novější verzi",
@@ -348,6 +401,7 @@
    "Uptime": "Celkový čas běhu",
    "Usage reporting is always enabled for candidate releases.": "Hlášení o používání je pro kandidáty na vydání vždy zapnuto.",
    "Use HTTPS for GUI": "Použít pro grafické rozhraní zabezpečení HTTPS",
+    "Use notifications from the filesystem to detect changed items.": "Použít oznamování soubor. systému pro nalezení změněných položek.",
    "Username/Password has not been set for the GUI authentication. Please consider setting it up.": "Pro ověřování v grafickém uživatelském rozhraní nebylo nastaveno uživatelské jméno / heslo. Prosím zvažte nastavení nějakého.",
    "Version": "Verze",
    "Versions": "Verze",
@@ -356,6 +410,7 @@
    "Waiting to Clean": "Čeká se na čistění",
    "Waiting to Scan": "Čekání na skenování",
    "Waiting to Sync": "Čekání na synchronizaci",
+    "Warning": "Varování",
    "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "Varování, tento popis umístění je nadřazenou složkou existující „{{otherFolder}}“.",
    "Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Varování, tento popis umístění je nadřazenou složkou existující „{{otherFolderLabel}}“ ({{otherFolder}}).",
    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Varování: toto umístění je podsložkou existující „{{otherFolder}}“.",
@@ -370,10 +425,11 @@
    "You can also select one of these nearby devices:": "Také můžete vybrat jedno z těchto okolních zařízení:",
    "You can change your choice at any time in the Settings dialog.": "Vaši volbu můžete kdykoliv změnit v dialogu nastavení.",
    "You can read more about the two release channels at the link below.": "O kandidátech na vydání si můžete přečíst více v odkazu níže.",
-    "You have no ignored devices.": "Nemáte žádná ignorovaná zařízení",
+    "You have no ignored devices.": "Nemáte žádná ignorovaná zařízení.",
    "You have no ignored folders.": "Nemáte žádné ignorované složky.",
    "You have unsaved changes. Do you really want to discard them?": "Máte neuložené změny. Opravdu je chcete zahodit?",
    "You must keep at least one version.": "Je třeba ponechat alespoň jednu verzi.",
+    "You should never add or change anything locally in a \"{%receiveEncrypted%}\" folder.": "Ve složce typu „{{receiveEncrypted}}“ byste neměli lokálně nic měnit ani vytvářet.",
    "days": "dní",
    "directories": "složky",
    "files": "souborů",
@@ -381,5 +437,6 @@
    "items": "položky",
    "seconds": "sekund",
    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} chce sdílet složku „{{folder}}“.",
-    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} chce sdílet složku „{{folderlabel}}“ ({{folder}})."
+    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} chce sdílet složku „{{folderlabel}}“ ({{folder}}).",
+    "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} může toto zařízení znovu uvést."
 }
--- a/gui/default/assets/lang/lang-da.json
+++ b/gui/default/assets/lang/lang-da.json
@@ -18,15 +18,20 @@
    "Advanced": "Avanceret",
    "Advanced Configuration": "Avanceret konfiguration",
    "All Data": "Alt data",
+    "All folders shared with this device must be protected by a password, such that all sent data is unreadable without the given password.": "Alle mapper delt med denne enhed, skal beskyttes med adgangskode, således at alle sendte data er ikke-læsbare uden den angivne adgangskode.",
    "Allow Anonymous Usage Reporting?": "Tillad anonym brugerstatistik?",
    "Allowed Networks": "Tilladte netværk",
    "Alphabetic": "Alfabetisk",
    "An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.": "En ekstern kommando styrer versioneringen. Den skal fjerne filen fra den delte mappe. Hvis stien til programmet indeholder mellemrum, bør den sættes i anførselstegn.",
    "Anonymous Usage Reporting": "Anonym brugerstatistik",
    "Anonymous usage report format has changed. Would you like to move to the new format?": "Formatet for anonym brugerstatistik er ændret. Vil du flytte til det nye format?",
+    "Are you sure you want to continue?": "Fortsætte?",
+    "Are you sure you want to override all remote changes?": "Tilsidesæt alle eksterne ændringer?",
+    "Are you sure you want to permanently delete all these files?": "Slette valgte filer permanent?",
    "Are you sure you want to remove device {%name%}?": "Er du sikker på, at du vil fjerne enheden {{name}}?",
    "Are you sure you want to remove folder {%label%}?": "Er du sikker på, at du vil fjerne mappen {{label}}?",
    "Are you sure you want to restore {%count%} files?": "Er du sikker på, at du vil genskabe {{count}} filer?",
+    "Are you sure you want to revert all local changes?": "Fortryde alle lokale ændringer?",
    "Are you sure you want to upgrade?": "Opgradere?",
    "Auto Accept": "Autoacceptér",
    "Automatic Crash Reporting": "Automatisk nedbrud rapportering",
@@ -37,11 +42,13 @@
    "Available debug logging facilities:": "Tilgængelige faciliteter for fejlretningslogning:",
    "Be careful!": "Vær forsigtig!",
    "Bugs": "Fejl",
+    "Cancel": "Annullere",
    "Changelog": "Udgivelsesnoter",
    "Clean out after": "Rens efter",
    "Cleaning Versions": "Rydder op i versioner",
    "Cleanup Interval": "Ryd op interval",
    "Click to see discovery failures": "Klik for at se opdagelsesfejl",
+    "Click to see full identification string and QR code.": "Klik for at se fuld identifikation streng og QR kode.",
    "Close": "Luk",
    "Command": "Kommando",
    "Comment, when used at the start of a line": "Kommentar, når den bruges i starten af en linje",
@@ -59,15 +66,23 @@
    "Currently Shared With Devices": "i øjeblikket delt med enheder",
    "Danger!": "Fare!",
    "Debugging Facilities": "Faciliteter til fejlretning",
+    "Default Configuration": "Standard opsætning",
+    "Default Device": "Standard enhed",
+    "Default Folder": "Standard mappe",
    "Default Folder Path": "Standardmappesti",
+    "Defaults": "Standarder",
+    "Delete": "Slet",
+    "Delete Unexpected Items": "Slet ikke forventede elementer ",
    "Deleted": "Slettet",
    "Deselect All": "Fravælg alle",
    "Deselect devices to stop sharing this folder with.": "Fravælg enheder for at stoppe mappe deling.",
+    "Deselect folders to stop sharing with this device.": "Fravælg mapper for at stoppe deling med denne enhed.",
    "Device": "Enhed",
    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Enheden “{{name}}” ({{device}} på {{address}}) vil gerne forbinde. Tilføj denne enhed?",
    "Device ID": "Enheds-ID",
    "Device Identification": "Enhedsidentifikation",
    "Device Name": "Enhedsnavn",
+    "Device is untrusted, enter encryption password": "Enhed er ikke-troværdig, indtast krypteringsadgangskode",
    "Device rate limits": "Enhedens hastighedsbegrænsning",
    "Device that last modified the item": "Enhed, som sidst ændrede filen",
    "Devices": "Enheder",
@@ -83,6 +98,9 @@
    "Discovered": "Opdaget",
    "Discovery": "Opslag",
    "Discovery Failures": "Fejl ved opdagelse",
+    "Discovery Status": "Opdagelses-status",
+    "Dismiss": "Forlade",
+    "Do not add it to the ignore list, so this notification may recur.": "Tilføj ikke til ignore liste, så påmindelsen kan gentage.",
    "Do not restore": "Genskab ikke",
    "Do not restore all": "Genskab ikke alle",
    "Do you want to enable watching for changes for all your folders?": "Vil du aktivere løbende overvågning af ændringer for alle dine mapper?",
@@ -92,7 +110,9 @@
    "Downloading": "Downloader",
    "Edit": "Redigér",
    "Edit Device": "Redigere enhed",
+    "Edit Device Defaults": "Rediger enhed standarder",
    "Edit Folder": "Redigere mappe",
+    "Edit Folder Defaults": "Rediger mappe standarder",
    "Editing {%path%}.": "Redigerer {{path}}.",
    "Enable Crash Reporting": "Aktivere nedbrud rapportering",
    "Enable NAT traversal": "Aktivér NAT-traversering",
@@ -106,6 +126,7 @@
    "Error": "Fejl",
    "External File Versioning": "Ekstern filversionering",
    "Failed Items": "Mislykkede filer",
+    "Failed to load ignore patterns.": "Ignorerings-mønstre kunne ikke indlæses.",
    "Failed to setup, retrying": "Opsætning mislykkedes; prøver igen",
    "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Fejl i forbindelse med opkobling til IPv6-servere skal forventes, hvis der ikke er IPv6-forbindelse.",
    "File Pull Order": "Hentningsrækkefølge for filer",
@@ -122,6 +143,8 @@
    "Folder Label": "Mappeetiket",
    "Folder Path": "Mappesti",
    "Folder Type": "Mappetype",
+    "Folder type \"{%receiveEncrypted%}\" can only be set when adding a new folder.": "Mappe type \"{{receiveEncrypted}}\" kan kun indstilles når en ny mappe tilføjes.",
+    "Folder type \"{%receiveEncrypted%}\" cannot be changed after adding the folder. You need to remove the folder, delete or decrypt the data on disk, and add the folder again.": "Folder type \"{{receiveEncrypted}}\" cannot be changed after adding the folder. You need to remove the folder, delete or decrypt the data on disk, and add the folder again.",
    "Folders": "Mapper",
    "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "For de følgende mapper opstod en fejl ved start på overvågning af ændringer. Der prøves igen hvert minut, så fejlene går eventuelt væk snart. Hvis de forbliver, kan du prøve at rette den tilgrundliggende fejl eller spørge efter hjælp, hvis du ikke kan.",
    "Full Rescan Interval (s)": "Interval for komplet genskan (sek.)",
@@ -139,6 +162,8 @@
    "Help": "Hjælp",
    "Home page": "Hjem",
    "However, your current settings indicate you might not want it enabled. We have disabled automatic crash reporting for you.": "However, your current settings indicate you might not want it enabled. We have disabled automatic crash reporting for you.",
+    "Identification": "Identifikation",
+    "If untrusted, enter encryption password": "Hvis ikke troværdig, indtast krypteringsadgangskode",
    "If you want to prevent other users on this computer from accessing Syncthing and through it your files, consider setting up authentication.": "If you want to prevent other users on this computer from accessing Syncthing and through it your files, consider setting up authentication.",
    "Ignore": "Ignorér",
    "Ignore Patterns": "Ignoreringsmønstre",
@@ -159,6 +184,8 @@
    "Latest Change": "Seneste ændring",
    "Learn more": "Lær mere",
    "Limit": "Grænse",
+    "Listener Failures": "Lytter fejl",
+    "Listener Status": "Lytter status",
    "Listeners": "Lyttere",
    "Loading data...": "Indlæser data ...",
    "Loading...": "Indlæser ...",
@@ -187,6 +214,7 @@
    "No File Versioning": "Ingen filversionering",
    "No files will be deleted as a result of this operation.": "Ingen filer vil blive slettet som resultat af denne handling.",
    "No upgrades": "Ingen opgraderinger",
+    "Not shared": "Ikke delte",
    "Notice": "Bemærk",
    "OK": "OK",
    "Off": "Deaktiveret",
@@ -196,6 +224,7 @@
    "Out of Sync": "Ikke synkroniseret",
    "Out of Sync Items": "Ikke synkroniserede filer",
    "Outgoing Rate Limit (KiB/s)": "Udgående hastighedsbegrænsning (KiB/s)",
+    "Override": "Tilsidesæt",
    "Override Changes": "Overskriv ændringer",
    "Path": "Sti",
    "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Sti til den lokale mappe. Vil blive oprettet hvis den ikke findes. Tildetegnet (~) kan bruges som en forkortelse for",
@@ -209,6 +238,7 @@
    "Periodic scanning at given interval and disabled watching for changes": "Periodisk skanning med et givent interval og deaktiveret overvågning af ændringer",
    "Periodic scanning at given interval and enabled watching for changes": "Periodisk skanning med et givent interval og aktiveret overvågning af ændringer",
    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Periodisk skanning med et givent interval og lykkedes ikke med at opsætte overvågning af ændringer; prøver igen hvert minut:",
+    "Permanently add it to the ignore list, suppressing further notifications.": "Permanent tilføj til ignore liste, undertrykker yderligere påmindelse.",
    "Permissions": "Tilladelser",
    "Please consult the release notes before performing a major upgrade.": "Tjek venligst udgivelsesnoterne før opgradering til en ny hovedversion.",
    "Please set a GUI Authentication User and Password in the Settings dialog.": "Opret venligst en GUI-bruger og -adgangskode i opsætningen.",
@@ -220,12 +250,15 @@
    "Preview Usage Report": "Forhåndsvisning af forbrugsrapport",
    "Quick guide to supported patterns": "Kvikguide til understøttede mønstre",
    "Random": "Tilfældig",
+    "Receive Encrypted": "Modtag krypteret",
    "Receive Only": "Modtag kun",
+    "Received data is already encrypted": "Modtaget data er allerede krypteret",
    "Recent Changes": "Nylige ændringer",
    "Reduced by ignore patterns": "Reduceret af ignoreringsmønstre",
    "Release Notes": "Udgivelsesnoter",
    "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Udgivelseskandidater indeholder alle de nyeste funktioner og rettelser. De er det samme som de traditionelle tougers-udgivelser af Syncthing.",
    "Remote Devices": "Fjernenheder ",
+    "Remote GUI": "Ekstern grafisk brugerflade",
    "Remove": "Fjern",
    "Remove Device": "Fjern enhed",
    "Remove Folder": "Fjern mappe",
@@ -241,6 +274,7 @@
    "Resume": "Genoptag",
    "Resume All": "Genoptag alt",
    "Reused": "Genbrugt",
+    "Revert": "Fortryd",
    "Revert Local Changes": "Opgiv lokale ændringer",
    "Save": "Gem",
    "Scan Time Remaining": "Tid tilbage af skanningen",
@@ -248,7 +282,8 @@
    "See external versioning help for supported templated command line parameters.": "Se hjælp til ekstern versionering for understøttede kommandolinjeparametre.",
    "Select All": "Vælg alle",
    "Select a version": "Vælg en version",
-    "Select additional devices to share this folder with.": "Select additional devices to share this folder with.",
+    "Select additional devices to share this folder with.": "Vælg yderligere enheder at dele denne mappe med.",
+    "Select additional folders to share with this device.": "Vælg yderligere mapper  at dele med denne enhed.",
    "Select latest version": "Vælg seneste version",
    "Select oldest version": "Vælg ældste version",
    "Select the folders to share with this device.": "Vælg hvilke mapper du vil dele med denne enhed.",
@@ -259,10 +294,13 @@
    "Share Folder": "Del mappe",
    "Share Folders With Device": "Del mappe med enhed",
    "Share this folder?": "Del denne mappe?",
+    "Shared Folders": "Delte mapper",
    "Shared With": "Delt med",
    "Sharing": "Deler",
    "Show ID": "Vis ID",
    "Show QR": "Vis QR",
+    "Show detailed discovery status": "Vis detaljeret opdagelse status",
+    "Show detailed listener status": "Vis detaljeret lytter status",
    "Show diff with previous version": "Vis forskelle fra tidligere version",
    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Vises i stedet for enheds-ID i klyngestatus. Vil blive sendt til andre enheder som valgfrit standardnavn.",
    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Vises i stedet for enheds-ID i klyngestatus. Vil blive opdateret til det navn, som enheden sender, hvis det ikke er udfyldt.",
@@ -272,7 +310,9 @@
    "Single level wildcard (matches within a directory only)": "Enkeltniveau-wildcard (matcher kun inden for en mappe)",
    "Size": "Størrelse",
    "Smallest First": "Mindste først",
+    "Some discovery methods could not be established for finding other devices or announcing this device:": "Some discovery methods could not be established for finding other devices or announcing this device:",
    "Some items could not be restored:": "Enkelte filer kunne ikke genskabes:",
+    "Some listening addresses could not be enabled to accept connections:": "Some listening addresses could not be enabled to accept connections:",
    "Source Code": "Kildekode",
    "Stable releases and release candidates": "Stabile udgivelser og udgivelseskandidater ",
    "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "Stabile udgivelser er forsinket med omkring to uger. I denne periode gennemgår de afprøvninger som udgivelseskandidater.",
@@ -281,6 +321,7 @@
    "Start Browser": "Start browser",
    "Statistics": "Statistikker",
    "Stopped": "Stoppet",
+    "Stores and syncs only encrypted data. Folders on all connected devices need to be set up with the same password or be of type \"{%receiveEncrypted%}\" too.": "Stores and syncs only encrypted data. Folders on all connected devices need to be set up with the same password or be of type \"{{receiveEncrypted}}\" too.",
    "Support": "Støt",
    "Support Bundle": "Støttepakke",
    "Sync Protocol Listen Addresses": "Lytteadresser for synkroniseringsprotokol",
@@ -288,6 +329,8 @@
    "Syncthing has been shut down.": "Syncthing er lukket ned.",
    "Syncthing includes the following software or portions thereof:": "Syncthing indeholder følgende software eller dele heraf:",
    "Syncthing is Free and Open Source Software licensed as MPL v2.0.": "Syncthing er fri og åben kildekode software licenseret som MPL v2.0.",
+    "Syncthing is listening on the following network addresses for connection attempts from other devices:": "Syncthing is listening on the following network addresses for connection attempts from other devices:",
+    "Syncthing is not listening for connection attempts from other devices on any address.  Only outgoing connections from this device may work.": "Syncthing is not listening for connection attempts from other devices on any address.  Only outgoing connections from this device may work.",
    "Syncthing is restarting.": "Syncthing genstarter.",
    "Syncthing is upgrading.": "Syncthing opgraderer.",
    "Syncthing now supports automatically reporting crashes to the developers. This feature is enabled by default.": "Syncthing now supports automatically reporting crashes to the developers. This feature is enabled by default.",
@@ -306,12 +349,16 @@
    "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.": "Det indtastede enheds-ID ser ikke gyldigt ud. Det skal være en streng på 52 eller 56 tegn, der består af tal og bogstaver, eventuelt med mellemrum og bindestreger.",
    "The folder ID cannot be blank.": "Mappe-ID må ikke være tom.",
    "The folder ID must be unique.": "Mappe-ID skal være unik.",
+    "The folder content on other devices will be overwritten to become identical with this device. Files not present here will be deleted on other devices.": "The folder content on other devices will be overwritten to become identical with this device. Files not present here will be deleted on other devices.",
+    "The folder content on this device will be overwritten to become identical with other devices. Files newly added here will be deleted.": "The folder content on this device will be overwritten to become identical with other devices. Files newly added here will be deleted.",
    "The folder path cannot be blank.": "Mappestien må ikke være tom.",
    "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.": "De følgende intervaller er brugt: Inden for den første time bliver en version gemt hvert 30. sekund, inden for den første dag bliver en version gemt hver time, inden for de første 30 dage bliver en version gemt hver dag, og indtil den maksimale alder bliver en version gemt hver uge.",
    "The following items could not be synchronized.": "Følgende filer kunne ikke synkroniseres.",
    "The following items were changed locally.": "De følgende filer er ændret lokalt.",
+    "The following methods are used to discover other devices on the network and announce this device to be found by others:": "The following methods are used to discover other devices on the network and announce this device to be found by others:",
+    "The following unexpected items were found.": "Følgende ikke-forventet emner blev fundet.",
    "The interval must be a positive number of seconds.": "Intervallet skal være et positivt antal sekunder.",
-    "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, in seconds, for running cleanup in the versions directory. Zero to disable periodic cleaning.": "Interval i sekunder for kørsel af oprydning i versionskatalog. Nul vil deaktivere periodisk rengøring.",
    "The maximum age must be a number and cannot be blank.": "Maksimal alder skal være et tal og feltet må ikke være tomt.",
    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Den maksimale tid, en version skal gemmes (i dage; sæt lig med 0 for at beholde gamle versioner for altid).",
    "The number of days must be a number and cannot be blank.": "Antallet af dage skal være et tal og feltet må ikke være tomt.",
@@ -322,9 +369,11 @@
    "The rate limit must be a non-negative number (0: no limit)": "Hastighedsbegrænsningen skal være et ikke-negativt tal (0: ingen begrænsning)",
    "The rescan interval must be a non-negative number of seconds.": "Genskanningsintervallet skal være et ikke-negativt antal sekunder.",
    "There are no devices to share this folder with.": "Der er ingen enheder at dele denne mappe med.",
+    "There are no folders to share with this device.": "Der er ingen mapper at dele med denne enhed.",
    "They are retried automatically and will be synced when the error is resolved.": "De prøves igen automatisk og vil blive synkroniseret, når fejlen er løst.",
    "This Device": "Denne enhed",
    "This can easily give hackers access to read and change any files on your computer.": "Dette gør det nemt for hackere at få adgang til at læse og ændre filer på din computer.",
+    "This device cannot automatically discover other devices or announce its own address to be found by others.  Only devices with statically configured addresses can connect.": "This device cannot automatically discover other devices or announce its own address to be found by others.  Only devices with statically configured addresses can connect.",
    "This is a major version upgrade.": "Dette er en ny hovedversion.",
    "This setting controls the free space required on the home (i.e., index database) disk.": "Denne indstilling styrer den krævede ledige plads på hjemmedrevet (dvs. drevet med indeksdatabasen).",
    "Time": "Tid",
@@ -335,10 +384,14 @@
    "Unavailable": "Ikke tilgængelig",
    "Unavailable/Disabled by administrator or maintainer": "Ikke tilgængelig / deaktiveret af administrator eller vedligeholder",
    "Undecided (will prompt)": "Ubestemt (du bliver spurgt)",
+    "Unexpected Items": "Ikke forventede elementer",
+    "Unexpected items have been found in this folder.": "Ikke-forventet emner blev fundet i denne mappe.",
    "Unignore": "Fjern ignorering",
    "Unknown": "Ukendt",
    "Unshared": "Ikke delt",
    "Unshared Devices": "Ikke delte enheder",
+    "Unshared Folders": "Ikke delte mapper",
+    "Untrusted": "Ikke troværdig",
    "Up to Date": "Fuldt opdateret",
    "Updated": "Opdateret",
    "Upgrade": "Opgradér",
@@ -348,7 +401,8 @@
    "Uptime": "Oppetid",
    "Usage reporting is always enabled for candidate releases.": "Forbrugsraportering er altid aktiveret for udgivelseskandidater.",
    "Use HTTPS for GUI": "Anvend HTTPS til GUI-adgang",
-    "Username/Password has not been set for the GUI authentication. Please consider setting it up.": "Username/Password has not been set for the GUI authentication. Please consider setting it up.",
+    "Use notifications from the filesystem to detect changed items.": "Benyt notifikationer fra filsystemet til at finde filændringer.",
+    "Username/Password has not been set for the GUI authentication. Please consider setting it up.": "Brugernavn/adgangskode er ikke indstillet til GUI godkendelse. Overvej at konfigurere det. ",
    "Version": "Version",
    "Versions": "Versioner",
    "Versions Path": "Versionssti",
@@ -356,6 +410,7 @@
    "Waiting to Clean": "Venter på oprydning",
    "Waiting to Scan": "Venter på skanning",
    "Waiting to Sync": "Venter på synkronisering",
+    "Warning": "Advarsel",
    "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "Advarsel: Denne sti er en forældermappe til den eksisterende mappe “{{otherFolder}}”.",
    "Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Advarsel: Denne sti er en forældermappe til den eksisterende mappe “{{otherFolderLabel}}” ({{otherFolder}}).",
    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Advarsel: Denne sti er en undermappe til den eksisterende mappe “{{otherFolder}}”.",
@@ -374,6 +429,7 @@
    "You have no ignored folders.": "Du har ingen ignorerede mapper.",
    "You have unsaved changes. Do you really want to discard them?": "Du har ændringer, som ikke er gemt. Er du sikker på, at du ikke vil beholde dem?",
    "You must keep at least one version.": "Du skal beholde mindst én version.",
+    "You should never add or change anything locally in a \"{%receiveEncrypted%}\" folder.": "Der bør aldrig tilføjes eller ændres noget lokalt i en \"{{receiveEncrypted}}\" mappe.",
    "days": "dage",
    "directories": "kataloger",
    "files": "filer",
@@ -381,5 +437,6 @@
    "items": "filer",
    "seconds": "sekunder",
    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} ønsker at dele mappen “{{folder}}”.",
-    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} ønsker at dele mappen “{{folderlabel}}” ({{folder}})."
+    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} ønsker at dele mappen “{{folderlabel}}” ({{folder}}).",
+    "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} vil muligvis genindføre denne enhed."
 }
--- a/gui/default/assets/lang/lang-de.json
+++ b/gui/default/assets/lang/lang-de.json
@@ -18,15 +18,20 @@
    "Advanced": "Erweitert",
    "Advanced Configuration": "Erweiterte Konfiguration",
    "All Data": "Alle Daten",
+    "All folders shared with this device must be protected by a password, such that all sent data is unreadable without the given password.": "Alle Ordner, welche mit diesem Gerät geteilt werden, müssen von einem Passwort geschützt werden, sodass die gesendeten Daten ohne Kenntnis des Passworts nicht gelesen werden können. ",
    "Allow Anonymous Usage Reporting?": "Übertragung von anonymen Nutzungsberichten erlauben?",
    "Allowed Networks": "Erlaubte Netzwerke",
    "Alphabetic": "Alphabetisch",
    "An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.": "Ein externer Befehl behandelt die Versionierung. Die Datei aus dem freigegebenen Ordner muss entfernen werden. Wenn der Pfad der Anwendung Leerzeichen enthält, sollte dieser in Anführungszeichen stehen.",
    "Anonymous Usage Reporting": "Anonymer Nutzungsbericht",
    "Anonymous usage report format has changed. Would you like to move to the new format?": "Das Format des anonymen Nutzungsberichts hat sich geändert. Möchten Sie auf das neue Format umsteigen?",
+    "Are you sure you want to continue?": "Sind Sie sicher, dass Sie fortfahren möchten?",
+    "Are you sure you want to override all remote changes?": "Are you sure you want to override all remote changes?",
+    "Are you sure you want to permanently delete all these files?": "Sind Sie sicher, dass Sie all diese Dateien dauerhaft löschen möchten?",
    "Are you sure you want to remove device {%name%}?": "Sind Sie sicher, dass sie das Gerät {{name}} entfernen möchten?",
    "Are you sure you want to remove folder {%label%}?": "Sind Sie sicher, dass sie den Ordner {{label}} entfernen möchten?",
    "Are you sure you want to restore {%count%} files?": "Sind Sie sicher, dass Sie {{count}} Dateien wiederherstellen möchten?",
+    "Are you sure you want to revert all local changes?": "Are you sure you want to revert all local changes?",
    "Are you sure you want to upgrade?": "Sind Sie sicher, dass Sie ein Upgrade durchführen möchten?",
    "Auto Accept": "Automatische Annahme",
    "Automatic Crash Reporting": "Automatische Absturzmeldung",
@@ -37,11 +42,13 @@
    "Available debug logging facilities:": "Verfügbare Debugging-Möglichkeiten:",
    "Be careful!": "Vorsicht!",
    "Bugs": "Fehler",
+    "Cancel": "Abbrechen",
    "Changelog": "Änderungsprotokoll",
    "Clean out after": "Löschen nach",
    "Cleaning Versions": "Versionen bereinigen",
    "Cleanup Interval": "Bereinigungsintervall",
    "Click to see discovery failures": "Klick um Gerätesuchfehler anzuzeigen",
+    "Click to see full identification string and QR code.": "Klicken um die volle Kennung und den QR-Code anzuzeigen.",
    "Close": "Schließen",
    "Command": "Befehl",
    "Comment, when used at the start of a line": "Kommentar, wenn am Anfang der Zeile benutzt.",
@@ -59,15 +66,23 @@
    "Currently Shared With Devices": "Derzeit mit Geräten geteilt",
    "Danger!": "Achtung!",
    "Debugging Facilities": "Debugging-Möglichkeiten",
+    "Default Configuration": "Vorgabekonfiguration",
+    "Default Device": "Vorgabegerät",
+    "Default Folder": "Vorgabeordner",
    "Default Folder Path": "Standardmäßiger Ordnerpfad",
+    "Defaults": "Vorgaben",
+    "Delete": "Löschen",
+    "Delete Unexpected Items": "Unerwartete Elemente löschen",
    "Deleted": "Gelöscht",
    "Deselect All": "Alle abwählen",
-    "Deselect devices to stop sharing this folder with.": "Die Geräte abwählen, für die dieser Ordner nicht mehr freigegeben werden soll.",
+    "Deselect devices to stop sharing this folder with.": "Geräte abwählen, um diesen Ordner nicht mehr damit zu teilen.",
+    "Deselect folders to stop sharing with this device.": "Ordner abwählen, um sie nicht mehr für mit diesem Gerät zu teilen.",
    "Device": "Gerät",
    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Gerät \"{{name}}\" ({{device}} {{address}}) möchte sich verbinden. Gerät hinzufügen?",
    "Device ID": "Gerätekennung",
    "Device Identification": "Geräteidentifikation",
    "Device Name": "Gerätename",
+    "Device is untrusted, enter encryption password": "Gerät wird nicht vertraut, Verschlüsselungspasswort eingeben",
    "Device rate limits": "Gerät Datenratelimit",
    "Device that last modified the item": "Gerät, das das Element zuletzt geändert hat",
    "Devices": "Geräte",
@@ -83,6 +98,9 @@
    "Discovered": "Ermittelt",
    "Discovery": "Gerätesuche",
    "Discovery Failures": "Gerätesuchfehler",
+    "Discovery Status": "Discovery Status",
+    "Dismiss": "Ausblenden",
+    "Do not add it to the ignore list, so this notification may recur.": "Nicht zur Ignorierliste hinzufügen, diese Benachrichtigung kann erneut auftauchen.",
    "Do not restore": "Nicht wiederherstellen",
    "Do not restore all": "Nicht alle wiederherstellen",
    "Do you want to enable watching for changes for all your folders?": "Möchten Sie das nach Änderungen für alle Ihre Ordner gesucht wird aktivieren?",
@@ -92,7 +110,9 @@
    "Downloading": "Lädt herunter",
    "Edit": "Bearbeiten",
    "Edit Device": "Gerät bearbeiten",
+    "Edit Device Defaults": "Gerätevorgaben bearbeiten",
    "Edit Folder": "Ordner bearbeiten",
+    "Edit Folder Defaults": "Ordnervorgaben bearbeiten",
    "Editing {%path%}.": "Bearbeite {{path}}.",
    "Enable Crash Reporting": "Absturzmeldung aktivieren",
    "Enable NAT traversal": "NAT-Durchdringung aktivieren",
@@ -102,10 +122,11 @@
    "Enter a non-privileged port number (1024 - 65535).": "Geben Sie eine nichtprivilegierte Portnummer ein (1024 - 65535).",
    "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Kommagetrennte Adressen (\"tcp://ip:port\", \"tcp://host:port\") oder \"dynamic\" eingeben, um die Adresse automatisch zu ermitteln.",
    "Enter ignore patterns, one per line.": "Geben Sie Ignoriermuster ein, eines pro Zeile.",
-    "Enter up to three octal digits.": "Tragen Sie bis zu drei oktale (0-7) Zahlen ein.",
+    "Enter up to three octal digits.": "Tragen Sie bis zu drei oktale Ziffern (0-7) ein.",
    "Error": "Fehler",
    "External File Versioning": "Externe Dateiversionierung",
    "Failed Items": "Fehlgeschlagene Elemente",
+    "Failed to load ignore patterns.": "Failed to load ignore patterns.",
    "Failed to setup, retrying": "Fehler beim Installieren, versuche erneut",
    "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Ein Verbindungsfehler zu IPv6-Servern ist zu erwarten, wenn es keine IPv6-Konnektivität gibt.",
    "File Pull Order": "Dateiübertragungsreihenfolge",
@@ -122,13 +143,15 @@
    "Folder Label": "Ordnerbezeichnung",
    "Folder Path": "Ordnerpfad",
    "Folder Type": "Ordnertyp",
+    "Folder type \"{%receiveEncrypted%}\" can only be set when adding a new folder.": "Ordnertyp „{{receiveEncrypted}}“ kann nur beim Hinzufügen eines neuen Ordners festgelegt werden.",
+    "Folder type \"{%receiveEncrypted%}\" cannot be changed after adding the folder. You need to remove the folder, delete or decrypt the data on disk, and add the folder again.": "Der Ordnertyp \"{{receiveEncrypted}}\" kann nach dem Hinzufügen nicht geändert werden. Sie müssen den Ordner entfernen, die Daten auf dem Speichermedium löschen oder entschlüsseln und anschließend den Order wieder neu hinzufügen.",
    "Folders": "Ordner",
    "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "Bei den folgenden Ordnern ist ein Fehler aufgetreten, während Sie nach Änderungen suchten. Es wird jede Minute erneut gesucht, damit die Fehler bald verschwinden. Falls die Fehler bestehen bleiben, versuchen Sie, das zugrunde liegende Problem zu beheben, und fragen Sie evtl. nach Hilfe.",
    "Full Rescan Interval (s)": "Vollständiges Scanintervall (s)",
    "GUI": "GUI",
    "GUI Authentication Password": "Passwort für Zugang zur Benutzeroberfläche",
    "GUI Authentication User": "Benutzername für Zugang zur Benutzeroberfläche",
-    "GUI Authentication: Set User and Password": "Benutzeroberflächenauthentisierung: Geben Sie Benutzer und Passwort ein. ",
+    "GUI Authentication: Set User and Password": "Authentifizierung für die Benutzeroberfläche: Geben Sie Benutzer und Passwort ein. ",
    "GUI Listen Address": "Addresse der Benutzeroberfläche",
    "GUI Theme": "GUI Design",
    "General": "Allgemein",
@@ -139,7 +162,9 @@
    "Help": "Hilfe",
    "Home page": "Homepage",
    "However, your current settings indicate you might not want it enabled. We have disabled automatic crash reporting for you.": "Ihre aktuellen Einstellungen weisen jedoch daraufhin, dass Sie die Aktivierung möglicherweise nicht wünschen. Wir haben die automatischen Absturzberichte für Sie deaktiviert.",
-    "If you want to prevent other users on this computer from accessing Syncthing and through it your files, consider setting up authentication.": "Falls Sie andere Benutzer dieses Computers daran hindern möchten auf Syncthing und somit ihren Dateien Zugriff zu haben, setzen Sie bitte einen Benutzernamen und Passwort.",
+    "Identification": "Kennung",
+    "If untrusted, enter encryption password": "Wenn nicht vertraut, geben Sie das Verschlüsselungspasswort ein",
+    "If you want to prevent other users on this computer from accessing Syncthing and through it your files, consider setting up authentication.": "Falls Sie andere Benutzer dieses Computers am Zugriff auf Syncthing und somit Ihren Dateien hindern möchten, richten Sie bitte eine Authentifizierung ein.",
    "Ignore": "Ignorieren",
    "Ignore Patterns": "Ignoriermuster",
    "Ignore Permissions": "Berechtigungen ignorieren",
@@ -159,6 +184,8 @@
    "Latest Change": "Letzte Änderung",
    "Learn more": "Mehr erfahren",
    "Limit": "Limit",
+    "Listener Failures": "Listener Failures",
+    "Listener Status": "Listener Status",
    "Listeners": "Zuhörer",
    "Loading data...": "Daten werden geladen...",
    "Loading...": "Wird geladen...",
@@ -187,6 +214,7 @@
    "No File Versioning": "Keine Dateiversionierung",
    "No files will be deleted as a result of this operation.": "Durch diesen Vorgang werden keine Dateien gelöscht.",
    "No upgrades": "Keine Aktualisierungen",
+    "Not shared": "Nicht geteilt",
    "Notice": "Hinweis",
    "OK": "OK",
    "Off": "Aus",
@@ -196,6 +224,7 @@
    "Out of Sync": "Nicht synchronisiert",
    "Out of Sync Items": "Nicht synchronisierte Elemente",
    "Outgoing Rate Limit (KiB/s)": "Ausgehendes Datenratelimit (KiB/s)",
+    "Override": "Override",
    "Override Changes": "Änderungen überschreiben",
    "Path": "Pfad",
    "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Pfad zum Ordner auf dem lokalen Gerät. Ordner wird erzeugt, wenn er nicht existiert. Das Tilden-Zeichen (~) kann als Abkürzung benutzt werden für",
@@ -209,6 +238,7 @@
    "Periodic scanning at given interval and disabled watching for changes": "Periodisches Scannen bei angegebenen Intervall und deaktivierter Überwachung von Änderungen",
    "Periodic scanning at given interval and enabled watching for changes": "Periodisches Scannen bei angegebenen Intervall und aktivierter Überwachung von Änderungen",
    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Periodisches Scannen bei angegebenen Intervall, fehlgeschlagene überprüfen auf Änderungen und erneuter versuch in 1 Min:",
+    "Permanently add it to the ignore list, suppressing further notifications.": "Permanent zur Ignorierliste hinzufügen, um weitere Benachrichtigungen zu unterdrücken.",
    "Permissions": "Berechtigungen",
    "Please consult the release notes before performing a major upgrade.": "Bitte lesen Sie die Veröffentlichungshinweise bevor Sie eine Hauptversionsaktualisierung installieren.",
    "Please set a GUI Authentication User and Password in the Settings dialog.": "Bitte lege einen Benutzer und ein Passwort für die Benutzeroberfläche in den Einstellungen fest.",
@@ -220,12 +250,15 @@
    "Preview Usage Report": "Vorschau des Nutzungsberichts",
    "Quick guide to supported patterns": "Schnellanleitung zu den unterstützten Mustern",
    "Random": "Zufall",
+    "Receive Encrypted": "Empfange verschlüsselt",
    "Receive Only": "Nur empfangen",
+    "Received data is already encrypted": "Empfangene Daten sind bereits verschlüsselt",
    "Recent Changes": "Letzte Änderungen",
    "Reduced by ignore patterns": "Durch Ignoriermuster reduziert",
    "Release Notes": "Veröffentlichungshinweise",
    "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Veröffentlichungskandidaten enthalten die neuesten Funktionen und Verbesserungen. Sie gleichen den üblichen zweiwöchentlichen Syncthing-Veröffentlichungen.",
    "Remote Devices": "Externe Geräte",
+    "Remote GUI": "Entfernte Oberfläche",
    "Remove": "Entfernen",
    "Remove Device": "Gerät entfernen",
    "Remove Folder": "Ordner entfernen",
@@ -241,6 +274,7 @@
    "Resume": "Fortsetzen",
    "Resume All": "Alles fortsetzen",
    "Reused": "Erneut benutzt",
+    "Revert": "Revert",
    "Revert Local Changes": "Lokale Änderungen zurücksetzen",
    "Save": "Speichern",
    "Scan Time Remaining": "Verbleibende Scanzeit",
@@ -248,7 +282,8 @@
    "See external versioning help for supported templated command line parameters.": "Siehe Hilfe zur externen Versionierung für unterstützte Befehlszeilenparameter.",
    "Select All": "Alle auswählen",
    "Select a version": "Wählen Sie eine Version",
-    "Select additional devices to share this folder with.": "Weitere Geräte auswählen, für die dieser Ordner geteilt werden soll.",
+    "Select additional devices to share this folder with.": "Weitere Geräte auswählen, um diesen Ordner damit zu teilen.",
+    "Select additional folders to share with this device.": "Weitere Ordner auswählen, um mit diesem Gerät zu teilen.",
    "Select latest version": "Letzte Version auswählen",
    "Select oldest version": "Älteste Version auswählen",
    "Select the folders to share with this device.": "Wähle Sie die Ordner aus, die Sie mit diesem Gerät teilen möchten.",
@@ -259,10 +294,13 @@
    "Share Folder": "Ordner teilen",
    "Share Folders With Device": "Ordner mit diesem Gerät teilen",
    "Share this folder?": "Diesen Ordner teilen?",
+    "Shared Folders": "Geteilte Ordner",
    "Shared With": "Geteilt mit",
    "Sharing": "Teilen",
    "Show ID": "Eigene Kennung",
    "Show QR": "Zeige QR Code",
+    "Show detailed discovery status": "Status der Gerätesuche anzeigen",
+    "Show detailed listener status": "Detaillierten Listener-Status anzeigen",
    "Show diff with previous version": "Unterschied zur vorherigen Version anzeigen",
    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Wird anstatt der Gerätekennung im Verbund-Status angezeigt. Wird als optionaler Standardname an andere Geräte bekannt gegeben.",
    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Wird auf diesem Gerät als Gerätename angezeigt und an die anderen Geräte im Geräte-Verbund weitergegeben. Wenn kein Gerätename anegegeben wird, wird der Name des entfernten Gerätes genommen.",
@@ -272,7 +310,9 @@
    "Single level wildcard (matches within a directory only)": "Einzelnes Maskenzeichen (wird für einen einzelnen Ordner verwendet)",
    "Size": "Größe",
    "Smallest First": "Kleinstes zuerst",
+    "Some discovery methods could not be established for finding other devices or announcing this device:": "Zum Auffinden anderer Geräte, oder um dieses Gerät anzukündigen, konnten manche Methoden nicht eingerichtet werden:",
    "Some items could not be restored:": "Einige Elemente konnten nicht wiederhergestellt werden:",
+    "Some listening addresses could not be enabled to accept connections:": "An manchen Netzwerkadressen kann nicht gelauscht werden, um Verbindungen anzunehmen:",
    "Source Code": "Quellcode",
    "Stable releases and release candidates": "Stabile Veröffentlichungen und Veröffentlichungskandidaten",
    "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "Stabile Veröffentlichungen werden ca. 2 Wochen verzögert. Während dieser Zeit durchlaufen sie eine Testphase als Veröffentlichungskandidaten.",
@@ -281,6 +321,7 @@
    "Start Browser": "Browser starten",
    "Statistics": "Statistiken",
    "Stopped": "Gestoppt",
+    "Stores and syncs only encrypted data. Folders on all connected devices need to be set up with the same password or be of type \"{%receiveEncrypted%}\" too.": "Speichert und synchronisiert nur verschlüsselte Daten. Ordner auf allen verbundenen Geräten müssen mit dem selben Passwort eingerichtet werden  oder vom Typ \"{{receiveEncrypted}}\" sein.",
    "Support": "Support",
    "Support Bundle": "Supportpaket",
    "Sync Protocol Listen Addresses": "Adresse(n) für das Synchronisierungsprotokoll",
@@ -288,6 +329,8 @@
    "Syncthing has been shut down.": "Syncthing wurde heruntergefahren.",
    "Syncthing includes the following software or portions thereof:": "Syncthing enthält die folgende Software oder Teile von:",
    "Syncthing is Free and Open Source Software licensed as MPL v2.0.": "Syncthing ist freie und quelloffene Software, lizenziert als MPL v2.0.",
+    "Syncthing is listening on the following network addresses for connection attempts from other devices:": "Syncthing lauscht an den folgenden Netzwerkadressen auf Verbindungsversuche von anderen Geräten:",
+    "Syncthing is not listening for connection attempts from other devices on any address.  Only outgoing connections from this device may work.": "Syncthing lauscht nicht auf Verbindungsversuche von anderen Geräten auf irgendeiner Adresse. Nur von diesem Gerät ausgehende Verbindungen können funktionieren.",
    "Syncthing is restarting.": "Syncthing wird neu gestartet",
    "Syncthing is upgrading.": "Syncthing wird aktualisiert",
    "Syncthing now supports automatically reporting crashes to the developers. This feature is enabled by default.": "Syncthing unterstützt jetzt automatische Absturzberichte an die Entwickler. Diese Funktion ist standardmäßig aktiviert.",
@@ -306,10 +349,14 @@
    "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.": "Die eingegebene Gerätekennung scheint nicht gültig zu sein. Es sollte eine 52 oder 56 stellige Zeichenkette aus Buchstaben und Nummern sein. Leerzeichen und Bindestriche sind optional.",
    "The folder ID cannot be blank.": "Die Ordnerkennung darf nicht leer sein.",
    "The folder ID must be unique.": "Die Ordnerkennung muss eindeutig sein.",
+    "The folder content on other devices will be overwritten to become identical with this device. Files not present here will be deleted on other devices.": "Der Ordnerinhalt auf anderen Geräten wird überschrieben, um mit diesem Gerät identisch zu werden. Dateien, die hier nicht vorhanden sind, werden auf anderen Geräten gelöscht.",
+    "The folder content on this device will be overwritten to become identical with other devices. Files newly added here will be deleted.": "Der Ordnerinhalt auf diesem Gerät wird überschrieben, um mit anderen Geräten identisch zu werden. Dateien, die hier neu hinzugefügt wurden, werden gelöscht.",
    "The folder path cannot be blank.": "Der Ordnerpfad darf nicht leer sein.",
    "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.": "Es wird in folgenden Abständen versioniert: In der ersten Stunde wird alle 30 Sekunden eine Version behalten, am ersten Tag eine jede Stunde, in den ersten 30 Tagen eine jeden Tag. Danach wird bis zum angegebenen Höchstalter eine Version pro Woche behalten.",
    "The following items could not be synchronized.": "Die folgenden Elemente konnten nicht synchronisiert werden.",
    "The following items were changed locally.": "Die folgenden Elemente wurden lokal geändert.",
+    "The following methods are used to discover other devices on the network and announce this device to be found by others:": "Die folgenden Methoden werden verwendet, um andere Geräte im Netzwerk aufzufinden und dieses Gerät anzukündigen, damit es von anderen gefunden wird:",
+    "The following unexpected items were found.": "Die folgenden unerwarteten Elemente wurden gefunden.",
    "The interval must be a positive number of seconds.": "Das Intervall muss eine positive Zahl von Sekunden sein.",
    "The interval, in seconds, for running cleanup in the versions directory. Zero to disable periodic cleaning.": "Das Intervall, in Sekunden, zwischen den Bereinigungen im Versionsverzeichnis. 0 um das regelmäßige Bereinigen zu deaktivieren.",
    "The maximum age must be a number and cannot be blank.": "Das Höchstalter muss angegeben werden und eine Zahl sein.",
@@ -322,9 +369,11 @@
    "The rate limit must be a non-negative number (0: no limit)": "Das Datenratelimit muss eine nicht negative Zahl sein (0 = kein Limit).",
    "The rescan interval must be a non-negative number of seconds.": "Das Scanintervall muss eine nicht negative Anzahl (in Sekunden) sein.",
    "There are no devices to share this folder with.": "Es gibt keine Geräte, mit denen dieser Ordner geteilt werden kann.",
+    "There are no folders to share with this device.": "Es gibt keine Ordner, die mit diesem Gerät geteilt werden können.",
    "They are retried automatically and will be synced when the error is resolved.": "Sie werden automatisch heruntergeladen und werden synchronisiert, wenn der Fehler behoben wurde.",
    "This Device": "Dieses Gerät",
    "This can easily give hackers access to read and change any files on your computer.": "Dies kann dazu führen, dass Unberechtigte relativ einfach auf Ihre Dateien zugreifen und diese ändern können.",
+    "This device cannot automatically discover other devices or announce its own address to be found by others.  Only devices with statically configured addresses can connect.": "Dieses Gerät kann nicht automatisch andere Geräte auffinden, oder seine eigene Adresse bekannt geben, um von anderen gefunden zu werden. Nur Geräte mit statisch konfigurierten Adressen können sich verbinden.",
    "This is a major version upgrade.": "Dies ist eine Hauptversionsaktualisierung.",
    "This setting controls the free space required on the home (i.e., index database) disk.": "Diese Einstellung regelt den freien Speicherplatz, der für den Systemordner (d.h. Indexdatenbank) erforderlich ist.",
    "Time": "Zeit",
@@ -335,10 +384,14 @@
    "Unavailable": " Nicht verfügbar",
    "Unavailable/Disabled by administrator or maintainer": "Nicht verfügbar/durch Administrator oder Betreuer deaktiviert",
    "Undecided (will prompt)": "Unentschlossen (wird nachgefragt)",
+    "Unexpected Items": "Unerwartete Elemente",
+    "Unexpected items have been found in this folder.": "In diesem Ordner wurden unerwartete Elemente gefunden.",
    "Unignore": "Beachten",
    "Unknown": "Unbekannt",
    "Unshared": "Ungeteilt",
-    "Unshared Devices": "Ungeteilte Geräte",
+    "Unshared Devices": "Nicht geteilte Geräte",
+    "Unshared Folders": "Nicht geteilte Ordner",
+    "Untrusted": "Nicht vertraut",
    "Up to Date": "Aktuell",
    "Updated": "Aktualisiert",
    "Upgrade": "Aktualisierung",
@@ -348,6 +401,7 @@
    "Uptime": "Betriebszeit",
    "Usage reporting is always enabled for candidate releases.": "Nutzungsbericht ist für Veröffentlichungskandidaten immer aktiviert.",
    "Use HTTPS for GUI": "HTTPS für Benutzeroberfläche verwenden",
+    "Use notifications from the filesystem to detect changed items.": "Benachrichtigungen des Dateisystems nutzen, um Änderungen zu erkennen.",
    "Username/Password has not been set for the GUI authentication. Please consider setting it up.": "Benutzername und Passwort für die Benutzeroberfläche sind nicht gesetzt. Setzen Sie diese zum Schutz ihrer Daten. ",
    "Version": "Version",
    "Versions": "Versionen",
@@ -356,6 +410,7 @@
    "Waiting to Clean": "Warten auf Bereinigung",
    "Waiting to Scan": "Warten auf Scannen",
    "Waiting to Sync": "Warten auf die Synchronisation",
+    "Warning": "Warnung",
    "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "Warnung, dieser Pfad ist ein übergeordneter Ordner eines existierenden Ordners \"{{otherFolder}}\".",
    "Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Warnung, dieser Pfad ist ein übergeordneter Ordner eines existierenden Ordners \"{{otherFolderLabel}}\" ({{otherFolder}}).",
    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Warnung, dieser Pfad ist ein Unterordner des existierenden Ordners \"{{otherFolder}}\".",
@@ -374,12 +429,18 @@
    "You have no ignored folders.": "Sie haben keine ignorierten Ordner.",
    "You have unsaved changes. Do you really want to discard them?": "Sie haben nicht gespeicherte Änderungen. Wollen sie diese wirklich verwerfen?",
    "You must keep at least one version.": "Du musst mindestens eine Version behalten.",
+    "You should never add or change anything locally in a \"{%receiveEncrypted%}\" folder.": "Sie sollten nie etwas im \"{{receiveEncrypted}}\" Ordner lokal ändern oder hinzufügen.",
    "days": "Tage",
    "directories": "Verzeichnisse",
    "files": "Dateien",
    "full documentation": "Komplette Dokumentation",
    "items": "Elemente",
    "seconds": "Sekunden",
+    "theme-name-black": "Schwarz",
+    "theme-name-dark": "Dunkel",
+    "theme-name-default": "Standard",
+    "theme-name-light": "Hell",
    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} möchte den Ordner \"{{folder}}\" teilen.",
-    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} möchte den Ordner \"{{folderlabel}}\" ({{folder}}) teilen."
+    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} möchte den Ordner \"{{folderlabel}}\" ({{folder}}) teilen.",
+    "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} könnte dieses Gerät wieder einführen."
 }
--- a/gui/default/assets/lang/lang-el.json
+++ b/gui/default/assets/lang/lang-el.json
@@ -18,15 +18,20 @@
    "Advanced": "Προχωρημένες",
    "Advanced Configuration": "Προχωρημένες ρυθμίσεις",
    "All Data": "Όλα τα δεδομένα",
+    "All folders shared with this device must be protected by a password, such that all sent data is unreadable without the given password.": "All folders shared with this device must be protected by a password, such that all sent data is unreadable without the given password.",
    "Allow Anonymous Usage Reporting?": "Να επιτρέπεται η αποστολή ανώνυμων στοιχείων χρήσης;",
    "Allowed Networks": "Επιτρεπόμενα δίκτυα",
    "Alphabetic": "Αλφαβητικά",
    "An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.": "Μια εξωτερική εντολή χειρίζεται την τήρηση εκδόσεων και αναλαμβάνει να αφαιρέσει το αρχείο από τον συγχρονισμένο φάκελο. Αν η διαδρομή προς την εφαρμογή περιέχει διαστήματα, πρέπει να εσωκλείεται σε εισαγωγικά. ",
    "Anonymous Usage Reporting": "Ανώνυμα στοιχεία χρήσης",
    "Anonymous usage report format has changed. Would you like to move to the new format?": "Η μορφή της αναφοράς ανώνυμων στοιχείων χρήσης έχει αλλάξει. Επιθυμείτε να μεταβείτε στη νέα μορφή;",
+    "Are you sure you want to continue?": "Are you sure you want to continue?",
+    "Are you sure you want to override all remote changes?": "Are you sure you want to override all remote changes?",
+    "Are you sure you want to permanently delete all these files?": "Are you sure you want to permanently delete all these files?",
    "Are you sure you want to remove device {%name%}?": "Σίγουρα επιθυμείτε να αφαιρέσετε τη συσκευή {{name}};",
    "Are you sure you want to remove folder {%label%}?": "Σίγουρα επιθυμείτε να αφαιρέσετε τον φάκελο {{label}};",
    "Are you sure you want to restore {%count%} files?": "Σίγουρα επιθυμείτε να επαναφέρετε {{count}} αρχεία;",
+    "Are you sure you want to revert all local changes?": "Are you sure you want to revert all local changes?",
    "Are you sure you want to upgrade?": "Σίγουρα επιθυμείτε να αναβαθμίσετε;",
    "Auto Accept": "Αυτόματη αποδοχή",
    "Automatic Crash Reporting": "Αυτόματη αναφορά σφαλμάτων",
@@ -37,11 +42,13 @@
    "Available debug logging facilities:": "Διαθέσιμες επιλογές μηνυμάτων αποσφαλμάτωσης:",
    "Be careful!": "Με προσοχή!",
    "Bugs": "Bugs",
+    "Cancel": "Cancel",
    "Changelog": "Πληροφορίες εκδόσεων",
    "Clean out after": "Εκκαθάριση μετά από",
    "Cleaning Versions": "Cleaning Versions",
    "Cleanup Interval": "Cleanup Interval",
    "Click to see discovery failures": "Πατήστε για να δείτε τις αποτυχίες ανεύρεσης συσκευών",
+    "Click to see full identification string and QR code.": "Click to see full identification string and QR code.",
    "Close": "Τέλος",
    "Command": "Εντολή",
    "Comment, when used at the start of a line": "Σχόλιο, όταν χρησιμοποιείται στην αρχή μιας γραμμής",
@@ -59,15 +66,23 @@
    "Currently Shared With Devices": "Διαμοιράζεται με αυτές τις συσκευές",
    "Danger!": "Προσοχή!",
    "Debugging Facilities": "Εργαλεία αποσφαλμάτωσης",
+    "Default Configuration": "Default Configuration",
+    "Default Device": "Default Device",
+    "Default Folder": "Default Folder",
    "Default Folder Path": "Προκαθορισμένη διαδρομή φακέλων",
+    "Defaults": "Defaults",
+    "Delete": "Διαγραφή",
+    "Delete Unexpected Items": "Delete Unexpected Items",
    "Deleted": "Διαγραμμένα",
    "Deselect All": "Αποεπιλογή όλων",
    "Deselect devices to stop sharing this folder with.": "Αποεπιλέξτε συσκευές για να σταματήσει ο διαμοιρασμός του φακέλου με αυτές.",
+    "Deselect folders to stop sharing with this device.": "Deselect folders to stop sharing with this device.",
    "Device": "Συσκευή",
    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Η συσκευή \"{{name}}\" ({{device}} στη διεύθυνση {{address}}) επιθυμεί να συνδεθεί. Προσθήκη της νέας συσκευής;",
    "Device ID": "Ταυτότητα συσκευής",
    "Device Identification": "Ταυτότητα συσκευής",
    "Device Name": "Όνομα συσκευής",
+    "Device is untrusted, enter encryption password": "Device is untrusted, enter encryption password",
    "Device rate limits": "Όρια ταχύτητας συσκευών",
    "Device that last modified the item": "Συσκευή από την οποία πραγματοποιήθηκε η τελευταία τροποποίηση του στοιχείου",
    "Devices": "Συσκευές",
@@ -83,6 +98,9 @@
    "Discovered": "Βάσει ανεύρεσης",
    "Discovery": "Ανεύρεση συσκευών",
    "Discovery Failures": "Αποτυχίες ανεύρεσης συσκευών",
+    "Discovery Status": "Discovery Status",
+    "Dismiss": "Dismiss",
+    "Do not add it to the ignore list, so this notification may recur.": "Do not add it to the ignore list, so this notification may recur.",
    "Do not restore": "Να μη γίνει επαναφορά",
    "Do not restore all": "Να μη γίνει επαναφορά όλων",
    "Do you want to enable watching for changes for all your folders?": "Επιθυμείτε να ενεργοποιήσετε την επιτήρηση για όλους τους φακέλους σας;",
@@ -92,7 +110,9 @@
    "Downloading": "Λήψη",
    "Edit": "Επεξεργασία",
    "Edit Device": "Επεξεργασία συσκευής",
+    "Edit Device Defaults": "Edit Device Defaults",
    "Edit Folder": "Επεξεργασία φακέλου",
+    "Edit Folder Defaults": "Edit Folder Defaults",
    "Editing {%path%}.": "Επεξεργασία του {{path}}.",
    "Enable Crash Reporting": "Ενεργοποίηση αναφοράς σφαλμάτων",
    "Enable NAT traversal": "Ενεργοποίηση διάσχισης NAT",
@@ -106,6 +126,7 @@
    "Error": "Σφάλμα",
    "External File Versioning": "Εξωτερική τήρηση εκδόσεων",
    "Failed Items": "Αρχεία που απέτυχαν",
+    "Failed to load ignore patterns.": "Failed to load ignore patterns.",
    "Failed to setup, retrying": "Αποτυχία ενεργοποίησης, γίνεται νέα προσπάθεια",
    "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Είναι φυσιολογική η αποτυχία σύνδεσης σε εξυπηρετητές IPv6 όταν δεν υπάρχει συνδεσιμότητα IPv6.",
    "File Pull Order": "Σειρά με την οποία θα κατεβαίνουν τα αρχεία",
@@ -122,6 +143,8 @@
    "Folder Label": "Ετικέτα φακέλου",
    "Folder Path": "Μονοπάτι φακέλου",
    "Folder Type": "Τύπος φακέλου",
+    "Folder type \"{%receiveEncrypted%}\" can only be set when adding a new folder.": "Folder type \"{{receiveEncrypted}}\" can only be set when adding a new folder.",
+    "Folder type \"{%receiveEncrypted%}\" cannot be changed after adding the folder. You need to remove the folder, delete or decrypt the data on disk, and add the folder again.": "Folder type \"{{receiveEncrypted}}\" cannot be changed after adding the folder. You need to remove the folder, delete or decrypt the data on disk, and add the folder again.",
    "Folders": "Φάκελοι",
    "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "Στους παρακάτω φακέλους εμφανίστηκε σφάλμα κατά την ενεργοποίηση της επιτήρησης αλλαγών. Καθώς θα γίνεται νέα προσπάθεια κάθε λεπτό, ενδέχεται αυτά τα σφάλματα να διορθωθούν από μόνα τους. Αν παραμείνουν, προσπαθήστε να επιλύσετε το βασικό αίτιο ή ζητήστε βοήθεια αν δεν μπορείτε.",
    "Full Rescan Interval (s)": "Διάστημα πλήρων επανασαρώσεων (s)",
@@ -139,6 +162,8 @@
    "Help": "Βοήθεια",
    "Home page": "Αρχική σελίδα",
    "However, your current settings indicate you might not want it enabled. We have disabled automatic crash reporting for you.": "Ωστόσο, σύμφωνα με τις τρέχουσες ρυθμίσεις σας, μάλλον δεν επιθυμείτε αυτή τη λειτουργία. Οι αναφορές σφαλμάτων απενεργοποιήθηκαν.",
+    "Identification": "Identification",
+    "If untrusted, enter encryption password": "If untrusted, enter encryption password",
    "If you want to prevent other users on this computer from accessing Syncthing and through it your files, consider setting up authentication.": "If you want to prevent other users on this computer from accessing Syncthing and through it your files, consider setting up authentication.",
    "Ignore": "Αγνόησε",
    "Ignore Patterns": "Πρότυπο για αγνόηση",
@@ -159,6 +184,8 @@
    "Latest Change": "Τελευταία αλλαγή",
    "Learn more": "Μάθετε περισσότερα",
    "Limit": "Όριο",
+    "Listener Failures": "Listener Failures",
+    "Listener Status": "Listener Status",
    "Listeners": "Ακροατές",
    "Loading data...": "Φόρτωση δεδομένων...",
    "Loading...": "Φόρτωση...",
@@ -187,6 +214,7 @@
    "No File Versioning": "Να μην τηρούνται εκδόσεις",
    "No files will be deleted as a result of this operation.": "Δεν πρόκειται να διαγραφούν αρχεία με αυτή την ενέργεια.",
    "No upgrades": "Απενεργοποιημένες",
+    "Not shared": "Not shared",
    "Notice": "Σημείωση",
    "OK": "OK",
    "Off": "Απενεργοποιημένο",
@@ -196,6 +224,7 @@
    "Out of Sync": "Μη συγχρονισμένα",
    "Out of Sync Items": "Μη συγχρονισμένα αντικείμενα",
    "Outgoing Rate Limit (KiB/s)": "Περιορισμός ταχύτητας αποστολής (KiB/s)",
+    "Override": "Override",
    "Override Changes": "Να αντικατασταθούν οι αλλαγές",
    "Path": "Μονοπάτι",
    "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Μονοπάτι του φακέλου σε αυτόν τον υπολογιστή. Αν δεν υπάρχει θα δημιουργηθεί. Η περισπωμένη (~) μπορεί να μπει σαν συντόμευση για το",
@@ -209,6 +238,7 @@
    "Periodic scanning at given interval and disabled watching for changes": "Τακτική σάρωση ανά καθορισμένο διάστημα και απενεργοποίηση επιτήρησης αλλαγών",
    "Periodic scanning at given interval and enabled watching for changes": "Τακτική σάρωση ανά καθορισμένο διάστημα και ενεργοποίηση επιτήρησης αλλαγών",
    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Τακτική σάρωση ανά καθορισμένο διάστημα και αποτυχία ενεργοποίησης επιτήρησης αλλαγών. Γίνεται νέα προσπάθεια κάθε 1m:",
+    "Permanently add it to the ignore list, suppressing further notifications.": "Permanently add it to the ignore list, suppressing further notifications.",
    "Permissions": "Δικαιώματα",
    "Please consult the release notes before performing a major upgrade.": "Παρακαλούμε, πριν από την εκτέλεση μιας σημαντικής αναβάθμισης, να συμβουλευτείς το σημείωμα που τη συνοδεύει.  ",
    "Please set a GUI Authentication User and Password in the Settings dialog.": "Παρακαλώ όρισε στις ρυθμίσεις έναν χρήστη και έναν κωδικό πρόσβασης για τη διεπαφή.",
@@ -220,12 +250,15 @@
    "Preview Usage Report": "Προεπισκόπηση αναφοράς χρήσης",
    "Quick guide to supported patterns": "Σύντομη βοήθεια σχετικά με τα πρότυπα αναζήτησης που υποστηρίζονται",
    "Random": "Τυχαία",
+    "Receive Encrypted": "Receive Encrypted",
    "Receive Only": "Μόνο λήψη",
+    "Received data is already encrypted": "Received data is already encrypted",
    "Recent Changes": "Πρόσφατες αλλαγές",
    "Reduced by ignore patterns": "Περιορισμένα λόγω προτύπων αγνόησης",
    "Release Notes": "Σημείωμα έκδοσης",
    "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Οι υποψήφιες εκδόσεις περιέχουν τις νεότερες λειτουργίες και επιδιορθώσεις σφαλμάτων, όπως και οι παραδοσιακές δισεβδομαδιαίες εκδόσεις του Syncthing.",
    "Remote Devices": "Απομακρυσμένες συσκευές",
+    "Remote GUI": "Remote GUI",
    "Remove": "Αφαίρεση",
    "Remove Device": "Αφαίρεση συσκευής",
    "Remove Folder": "Αφαίρεση φακέλου",
@@ -241,6 +274,7 @@
    "Resume": "Συνέχεια",
    "Resume All": "Συνέχιση όλων",
    "Reused": "Χρησιμοποιήθηκε ξανά",
+    "Revert": "Revert",
    "Revert Local Changes": "Αναίρεση τοπικών αλλαγών",
    "Save": "Αποθήκευση",
    "Scan Time Remaining": "Εναπομείναντας χρόνος για τον έλεγχο ",
@@ -249,6 +283,7 @@
    "Select All": "Επιλογή όλων",
    "Select a version": "Επιλογή έκδοσης",
    "Select additional devices to share this folder with.": "Επιλέξτε επιπλέον συσκευές με τις οποίες θα διαμοιράζεται αυτός ο φάκελος.",
+    "Select additional folders to share with this device.": "Select additional folders to share with this device.",
    "Select latest version": "Επιλογή τελευταίας έκδοσης",
    "Select oldest version": "Επιλογή παλαιότερης έκδοσης",
    "Select the folders to share with this device.": "Διάλεξε ποιοι φάκελοι θα διαμοιράζονται προς αυτή τη συσκευή.",
@@ -259,10 +294,13 @@
    "Share Folder": "Διαμοίραση φακέλου",
    "Share Folders With Device": "Διαμοίρασε τους φακέλους προς αυτή τη συσκευή",
    "Share this folder?": "Να διαμοιραστεί αυτός ο φάκελος;",
+    "Shared Folders": "Shared Folders",
    "Shared With": "Διαμοιράζεται με",
    "Sharing": "Διαμοιρασμός",
    "Show ID": "Εμφάνιση ταυτότητας",
    "Show QR": "Δείξε τον κωδικό QR",
+    "Show detailed discovery status": "Show detailed discovery status",
+    "Show detailed listener status": "Show detailed listener status",
    "Show diff with previous version": "Εμφάνιση διαφορών με προηγούμενη έκδοση",
    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Θα φαίνεται αντί για την ταυτότητα της συσκευής στην προβολή της κατάστασης ολόκληρης της συστάδας. Θα γνωστοποιείται σαν το προαιρετικό όνομα της συσκευής.",
    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Θα φαίνεται αντί για την ταυτότητα της συσκευής στην προβολή της κατάστασης ολόκληρης της συστάδας. Θα ενημερώνεται αυτόματα αν αλλάξει το όνομα της συσκευής.",
@@ -272,7 +310,9 @@
    "Single level wildcard (matches within a directory only)": "Τελεστής μπαλαντέρ (*) για ένα επίπεδο (χρησιμοποιείται για έναν φάκελο μόνο)",
    "Size": "Μέγεθος",
    "Smallest First": "Το μικρότερο πρώτα",
+    "Some discovery methods could not be established for finding other devices or announcing this device:": "Some discovery methods could not be established for finding other devices or announcing this device:",
    "Some items could not be restored:": "Κάποια στοιχεία δεν μπόρεσαν να επαναφερθούν:",
+    "Some listening addresses could not be enabled to accept connections:": "Some listening addresses could not be enabled to accept connections:",
    "Source Code": "Πηγαίος κώδικας",
    "Stable releases and release candidates": "Σταθερές εκδόσεις και υποψήφιες εκδόσεις.",
    "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "Οι σταθερές εκδόσεις βγαίνουν με καθυστέρηση περίπου δύο εβδομάδων. Σε αυτό το διάστημα δοκιμάζονται ως υποψήφιες εκδόσεις.",
@@ -281,6 +321,7 @@
    "Start Browser": "Εκκίνηση προγράμματος περιήγησης",
    "Statistics": "Στατιστικά",
    "Stopped": "Απενεργοποιημένο",
+    "Stores and syncs only encrypted data. Folders on all connected devices need to be set up with the same password or be of type \"{%receiveEncrypted%}\" too.": "Stores and syncs only encrypted data. Folders on all connected devices need to be set up with the same password or be of type \"{{receiveEncrypted}}\" too.",
    "Support": "Υποστήριξη",
    "Support Bundle": "Πακέτο υποστήριξης",
    "Sync Protocol Listen Addresses": "Διευθύνσεις για το πρωτόκολλο συγχρονισμού",
@@ -288,6 +329,8 @@
    "Syncthing has been shut down.": "Το Syncthing έχει απενεργοποιηθεί.",
    "Syncthing includes the following software or portions thereof:": "Το Syncthing περιλαμβάνει τα παρακάτω λογισμικά ή μέρη αυτών:",
    "Syncthing is Free and Open Source Software licensed as MPL v2.0.": "Το Syncthing είναι ελεύθερο λογισμικό και ανοικτού κώδικα, με άδεια MPL v2.0.",
+    "Syncthing is listening on the following network addresses for connection attempts from other devices:": "Syncthing is listening on the following network addresses for connection attempts from other devices:",
+    "Syncthing is not listening for connection attempts from other devices on any address.  Only outgoing connections from this device may work.": "Syncthing is not listening for connection attempts from other devices on any address.  Only outgoing connections from this device may work.",
    "Syncthing is restarting.": "Το Syncthing επανεκκινείται.",
    "Syncthing is upgrading.": "Το Syncthing αναβαθμίζεται.",
    "Syncthing now supports automatically reporting crashes to the developers. This feature is enabled by default.": "Το Syncthing επιτρέπει την αυτόματη υποβολή αναφορών σφαλμάτων στους προγραμματιστές. Η προεπιλεγμένη ρύθμιση είναι να αποστέλλονται οι αναφορές.",
@@ -306,10 +349,14 @@
    "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.": "Η ταυτότητα συσκευής που έδωσες δε φαίνεται έγκυρη. Θα πρέπει να είναι μια σειρά από 52 ή 56 χαρακτήρες (γράμματα και αριθμοί). Τα κενά και οι παύλες είναι προαιρετικά (αδιάφορα).",
    "The folder ID cannot be blank.": "Η ταυτότητα του φακέλου δεν μπορεί να είναι κενή.",
    "The folder ID must be unique.": "Η ταυτότητα του φακέλου πρέπει να είναι μοναδική.",
+    "The folder content on other devices will be overwritten to become identical with this device. Files not present here will be deleted on other devices.": "The folder content on other devices will be overwritten to become identical with this device. Files not present here will be deleted on other devices.",
+    "The folder content on this device will be overwritten to become identical with other devices. Files newly added here will be deleted.": "The folder content on this device will be overwritten to become identical with other devices. Files newly added here will be deleted.",
    "The folder path cannot be blank.": "Το μονοπάτι του φακέλου δεν μπορεί να είναι κενό.",
    "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.": "Θα χρησιμοποιούνται τα εξής διαστήματα: Την πρώτη ώρα θα τηρείται μια έκδοση κάθε 30 δευτερόλεπτα. Την πρώτη ημέρα, μια έκδοση κάθε μια ώρα. Τις πρώτες 30 ημέρες, μία έκδοση κάθε ημέρα. Από εκεί και έπειτα μέχρι τη μέγιστη ηλικία, θα τηρείται μια έκδοση κάθε εβδομάδα.",
    "The following items could not be synchronized.": "Δεν ήταν δυνατόν να συγχρονιστούν τα παρακάτω αρχεία.",
    "The following items were changed locally.": "Τα παρακάτω στοιχεία τροποποιήθηκαν τοπικά.",
+    "The following methods are used to discover other devices on the network and announce this device to be found by others:": "The following methods are used to discover other devices on the network and announce this device to be found by others:",
+    "The following unexpected items were found.": "The following unexpected items were found.",
    "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 maximum age must be a number and cannot be blank.": "Η μέγιστη ηλικία πρέπει να είναι αριθμός και σίγουρα όχι κενό.",
@@ -322,9 +369,11 @@
    "The rate limit must be a non-negative number (0: no limit)": "Το όριο ταχύτητας πρέπει να είναι ένας μη-αρνητικός αριθμός (0: χωρίς όριο)",
    "The rescan interval must be a non-negative number of seconds.": "Ο χρόνος επανελέγχου για αλλαγές είναι σε δευτερόλεπτα (δηλ. θετικός αριθμός).",
    "There are no devices to share this folder with.": "Δεν υπάρχουν συσκευές με τις οποίες διαμοιράζεται αυτός ο φάκελος.",
+    "There are no folders to share with this device.": "There are no folders to share with this device.",
    "They are retried automatically and will be synced when the error is resolved.": "Όταν επιλυθεί το σφάλμα θα κατεβούν και θα συχρονιστούν αυτόματα.",
    "This Device": "Αυτή η συσκευή",
    "This can easily give hackers access to read and change any files on your computer.": "Αυτό μπορεί εύκολα να δώσει πρόσβαση ανάγνωσης και επεξεργασίας αρχείων του υπολογιστή σας σε χάκερς.",
+    "This device cannot automatically discover other devices or announce its own address to be found by others.  Only devices with statically configured addresses can connect.": "This device cannot automatically discover other devices or announce its own address to be found by others.  Only devices with statically configured addresses can connect.",
    "This is a major version upgrade.": "Αυτή είναι μια σημαντική αναβάθμιση.",
    "This setting controls the free space required on the home (i.e., index database) disk.": "Αυτή η επιλογή καθορίζει τον ελεύθερο χώρο που θα παραμένει ελεύθερος στον δίσκο όπου βρίσκεται ο κατάλογος της εφαρμογής (και συνεπώς η βάση δεδομένων ευρετηρίων).",
    "Time": "Χρόνος",
@@ -335,10 +384,14 @@
    "Unavailable": "Μη διαθέσιμο",
    "Unavailable/Disabled by administrator or maintainer": "Μη διαθέσιμο/απενεργοποιημένο από τον διαχειριστή ή υπεύθυνο διανομής",
    "Undecided (will prompt)": "Μη καθορισμένη (θα γίνει ερώτηση)",
+    "Unexpected Items": "Unexpected Items",
+    "Unexpected items have been found in this folder.": "Unexpected items have been found in this folder.",
    "Unignore": "Αναίρεση αγνόησης",
    "Unknown": "Άγνωστο",
    "Unshared": "Δε μοιράζεται",
    "Unshared Devices": "Συσκευές χωρίς διαμοιρασμό",
+    "Unshared Folders": "Unshared Folders",
+    "Untrusted": "Untrusted",
    "Up to Date": "Ενημερωμένη",
    "Updated": "Ενημερωμένο",
    "Upgrade": "Αναβάθμιση",
@@ -348,6 +401,7 @@
    "Uptime": "Χρόνος απρόσκοπτης λειτουργίας",
    "Usage reporting is always enabled for candidate releases.": "Η αποστολή αναφορών χρήσης είναι πάντα ενεργοποιημένη στις υποψήφιες εκδόσεις.",
    "Use HTTPS for GUI": "Χρήση HTTPS για τη διεπαφή",
+    "Use notifications from the filesystem to detect changed items.": "Χρήση ειδοποιήσεων από το σύστημα αρχείων για την ανίχνευση αλλαγών.",
    "Username/Password has not been set for the GUI authentication. Please consider setting it up.": "Username/Password has not been set for the GUI authentication. Please consider setting it up.",
    "Version": "Έκδοση",
    "Versions": "Εκδόσεις",
@@ -356,6 +410,7 @@
    "Waiting to Clean": "Αναμονή εκκαθάρισης",
    "Waiting to Scan": "Αναμονή σάρωσης",
    "Waiting to Sync": "Αναμονή συγχρονισμού",
+    "Warning": "Warning",
    "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "Προσοχή, αυτό το μονοπάτι είναι γονικός φάκελος ενός υπάρχοντος φακέλου \"{{otherFolder}}\".",
    "Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Προσοχή, αυτό το μονοπάτι είναι γονικός φάκελος ενός υπάρχοντος φακέλου \"{{otherFolderLabel}}\" ({{otherFolder}}).",
    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Προσοχή, αυτό το μονοπάτι είναι υποφάκελος του υπάρχοντος φακέλου \"{{otherFolder}}\".",
@@ -374,6 +429,7 @@
    "You have no ignored folders.": "Δεν έχετε αγνοηθέντες φακέλους.",
    "You have unsaved changes. Do you really want to discard them?": "Έχετε μη αποθηκευμένες αλλαγές. Σίγουρα επιθυμείτε να τις απορρίψετε;",
    "You must keep at least one version.": "Πρέπει να τηρήσεις τουλάχιστον μια έκδοση.",
+    "You should never add or change anything locally in a \"{%receiveEncrypted%}\" folder.": "You should never add or change anything locally in a \"{{receiveEncrypted}}\" folder.",
    "days": "Μέρες",
    "directories": "κατάλογοι",
    "files": "αρχεία",
@@ -381,5 +437,6 @@
    "items": "εγγραφές",
    "seconds": "δευτερόλεπτα",
    "{%device%} wants to share folder \"{%folder%}\".": "Η συσκευή {{device}} θέλει να μοιράσει τον φάκελο «{{folder}}».",
-    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "Η συσκευή {{device}} επιθυμεί να διαμοιράσει τον φάκελο \"{{folderlabel}}\" ({{folder}})."
+    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "Η συσκευή {{device}} επιθυμεί να διαμοιράσει τον φάκελο \"{{folderlabel}}\" ({{folder}}).",
+    "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} might reintroduce this device."
 }
--- a/gui/default/assets/lang/lang-en-AU.json
+++ b/gui/default/assets/lang/lang-en-AU.json
@@ -18,15 +18,20 @@
    "Advanced": "Advanced",
    "Advanced Configuration": "Advanced Configuration",
    "All Data": "All Data",
+    "All folders shared with this device must be protected by a password, such that all sent data is unreadable without the given password.": "All folders shared with this device must be protected by a password, such that all sent data is unreadable without the given password.",
    "Allow Anonymous Usage Reporting?": "Allow Anonymous Usage Reporting?",
    "Allowed Networks": "Allowed Networks",
    "Alphabetic": "Alphabetic",
    "An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.": "An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.",
    "Anonymous Usage Reporting": "Anonymous Usage Reporting",
    "Anonymous usage report format has changed. Would you like to move to the new format?": "Anonymous usage report format has changed. Would you like to move to the new format?",
+    "Are you sure you want to continue?": "Are you sure you want to continue?",
+    "Are you sure you want to override all remote changes?": "Are you sure you want to override all remote changes?",
+    "Are you sure you want to permanently delete all these files?": "Are you sure you want to permanently delete all these files?",
    "Are you sure you want to remove device {%name%}?": "Are you sure you want to remove device {{name}}?",
    "Are you sure you want to remove folder {%label%}?": "Are you sure you want to remove folder {{label}}?",
    "Are you sure you want to restore {%count%} files?": "Are you sure you want to restore {{count}} files?",
+    "Are you sure you want to revert all local changes?": "Are you sure you want to revert all local changes?",
    "Are you sure you want to upgrade?": "Are you sure you want to upgrade?",
    "Auto Accept": "Auto Accept",
    "Automatic Crash Reporting": "Automatic Crash Reporting",
@@ -37,11 +42,13 @@
    "Available debug logging facilities:": "Available debug logging facilities:",
    "Be careful!": "Be careful!",
    "Bugs": "Bugs",
+    "Cancel": "Cancel",
    "Changelog": "Changelog",
    "Clean out after": "Clean out after",
    "Cleaning Versions": "Cleaning Versions",
    "Cleanup Interval": "Cleanup Interval",
    "Click to see discovery failures": "Click to see discovery failures",
+    "Click to see full identification string and QR code.": "Click to see full identification string and QR code.",
    "Close": "Close",
    "Command": "Command",
    "Comment, when used at the start of a line": "Comment, when used at the start of a line",
@@ -51,7 +58,7 @@
    "Connection Error": "Connection Error",
    "Connection Type": "Connection Type",
    "Connections": "Connections",
-    "Continuously watching for changes is now available within Syncthing. This will detect changes on disk and issue a scan on only the modified paths. The benefits are that changes are propagated quicker and that less full scans are required.": "Continuously watching for changes is now available within Syncthing. This will detect changes on disk and issue a scan on only the modified paths. The benefits are that changes are propagated quicker and that less full scans are required.",
+    "Continuously watching for changes is now available within Syncthing. This will detect changes on disk and issue a scan on only the modified paths. The benefits are that changes are propagated quicker and that less full scans are required.": "Continuously watching for changes is now available within Syncthing. This will detect changes on disk and issue a scan on only the modified paths. The benefits are that changes are propagated quicker and that fewer full scans are required.",
    "Copied from elsewhere": "Copied from elsewhere",
    "Copied from original": "Copied from original",
    "Copyright © 2014-2019 the following Contributors:": "Copyright © 2014-2019 the following Contributors:",
@@ -59,15 +66,23 @@
    "Currently Shared With Devices": "Currently Shared With Devices",
    "Danger!": "Danger!",
    "Debugging Facilities": "Debugging Facilities",
+    "Default Configuration": "Default Configuration",
+    "Default Device": "Default Device",
+    "Default Folder": "Default Folder",
    "Default Folder Path": "Default Folder Path",
+    "Defaults": "Defaults",
+    "Delete": "Delete",
+    "Delete Unexpected Items": "Delete Unexpected Items",
    "Deleted": "Deleted",
    "Deselect All": "Deselect All",
    "Deselect devices to stop sharing this folder with.": "Deselect devices to stop sharing this folder with.",
+    "Deselect folders to stop sharing with this device.": "Deselect folders to stop sharing with this device.",
    "Device": "Device",
    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Device \"{{name}}\" ({{device}} at {{address}}) wants to connect. Add new device?",
    "Device ID": "Device ID",
    "Device Identification": "Device Identification",
    "Device Name": "Device Name",
+    "Device is untrusted, enter encryption password": "Device is untrusted, enter encryption password",
    "Device rate limits": "Device rate limits",
    "Device that last modified the item": "Device that last modified the item",
    "Devices": "Devices",
@@ -83,6 +98,9 @@
    "Discovered": "Discovered",
    "Discovery": "Discovery",
    "Discovery Failures": "Discovery Failures",
+    "Discovery Status": "Discovery Status",
+    "Dismiss": "Dismiss",
+    "Do not add it to the ignore list, so this notification may recur.": "Do not add it to the ignore list, so this notification may recur.",
    "Do not restore": "Do not restore",
    "Do not restore all": "Do not restore all",
    "Do you want to enable watching for changes for all your folders?": "Do you want to enable watching for changes for all your folders?",
@@ -92,7 +110,9 @@
    "Downloading": "Downloading",
    "Edit": "Edit",
    "Edit Device": "Edit Device",
+    "Edit Device Defaults": "Edit Device Defaults",
    "Edit Folder": "Edit Folder",
+    "Edit Folder Defaults": "Edit Folder Defaults",
    "Editing {%path%}.": "Editing {{path}}.",
    "Enable Crash Reporting": "Enable Crash Reporting",
    "Enable NAT traversal": "Enable NAT traversal",
@@ -106,6 +126,7 @@
    "Error": "Error",
    "External File Versioning": "External File Versioning",
    "Failed Items": "Failed Items",
+    "Failed to load ignore patterns.": "Failed to load ignore patterns.",
    "Failed to setup, retrying": "Failed to setup, retrying",
    "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.",
    "File Pull Order": "File Pull Order",
@@ -122,6 +143,8 @@
    "Folder Label": "Folder Label",
    "Folder Path": "Folder Path",
    "Folder Type": "Folder Type",
+    "Folder type \"{%receiveEncrypted%}\" can only be set when adding a new folder.": "Folder type \"{{receiveEncrypted}}\" can only be set when adding a new folder.",
+    "Folder type \"{%receiveEncrypted%}\" cannot be changed after adding the folder. You need to remove the folder, delete or decrypt the data on disk, and add the folder again.": "Folder type \"{{receiveEncrypted}}\" cannot be changed after adding the folder. You need to remove the folder, delete or decrypt the data on disk, and add the folder again.",
    "Folders": "Folders",
    "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.",
    "Full Rescan Interval (s)": "Full Rescan Interval (s)",
@@ -139,6 +162,8 @@
    "Help": "Help",
    "Home page": "Home page",
    "However, your current settings indicate you might not want it enabled. We have disabled automatic crash reporting for you.": "However, your current settings indicate you might not want it enabled. We have disabled automatic crash reporting for you.",
+    "Identification": "Identification",
+    "If untrusted, enter encryption password": "If untrusted, enter encryption password",
    "If you want to prevent other users on this computer from accessing Syncthing and through it your files, consider setting up authentication.": "If you want to prevent other users on this computer from accessing Syncthing and through it your files, consider setting up authentication.",
    "Ignore": "Ignore",
    "Ignore Patterns": "Ignore Patterns",
@@ -159,6 +184,8 @@
    "Latest Change": "Latest Change",
    "Learn more": "Learn more",
    "Limit": "Limit",
+    "Listener Failures": "Listener Failures",
+    "Listener Status": "Listener Status",
    "Listeners": "Listeners",
    "Loading data...": "Loading data...",
    "Loading...": "Loading...",
@@ -187,6 +214,7 @@
    "No File Versioning": "No File Versioning",
    "No files will be deleted as a result of this operation.": "No files will be deleted as a result of this operation.",
    "No upgrades": "No upgrades",
+    "Not shared": "Not shared",
    "Notice": "Notice",
    "OK": "OK",
    "Off": "Off",
@@ -196,6 +224,7 @@
    "Out of Sync": "Out of Sync",
    "Out of Sync Items": "Out of Sync Items",
    "Outgoing Rate Limit (KiB/s)": "Outgoing Rate Limit (KiB/s)",
+    "Override": "Override",
    "Override Changes": "Override Changes",
    "Path": "Path",
    "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for",
@@ -209,6 +238,7 @@
    "Periodic scanning at given interval and disabled watching for changes": "Periodic scanning at given interval and disabled watching for changes",
    "Periodic scanning at given interval and enabled watching for changes": "Periodic scanning at given interval and enabled watching for changes",
    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:",
+    "Permanently add it to the ignore list, suppressing further notifications.": "Permanently add it to the ignore list, suppressing further notifications.",
    "Permissions": "Permissions",
    "Please consult the release notes before performing a major upgrade.": "Please consult the release notes before performing a major upgrade.",
    "Please set a GUI Authentication User and Password in the Settings dialog.": "Please set a GUI Authentication User and Password in the Settings dialog.",
@@ -220,12 +250,15 @@
    "Preview Usage Report": "Preview Usage Report",
    "Quick guide to supported patterns": "Quick guide to supported patterns",
    "Random": "Random",
+    "Receive Encrypted": "Receive Encrypted",
    "Receive Only": "Receive Only",
+    "Received data is already encrypted": "Received data is already encrypted",
    "Recent Changes": "Recent Changes",
    "Reduced by ignore patterns": "Reduced by ignore patterns",
    "Release Notes": "Release Notes",
    "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.",
    "Remote Devices": "Remote Devices",
+    "Remote GUI": "Remote GUI",
    "Remove": "Remove",
    "Remove Device": "Remove Device",
    "Remove Folder": "Remove Folder",
@@ -241,6 +274,7 @@
    "Resume": "Resume",
    "Resume All": "Resume All",
    "Reused": "Reused",
+    "Revert": "Revert",
    "Revert Local Changes": "Revert Local Changes",
    "Save": "Save",
    "Scan Time Remaining": "Scan Time Remaining",
@@ -249,6 +283,7 @@
    "Select All": "Select All",
    "Select a version": "Select a version",
    "Select additional devices to share this folder with.": "Select additional devices to share this folder with.",
+    "Select additional folders to share with this device.": "Select additional folders to share with this device.",
    "Select latest version": "Select latest version",
    "Select oldest version": "Select oldest version",
    "Select the folders to share with this device.": "Select the folders to share with this device.",
@@ -259,10 +294,13 @@
    "Share Folder": "Share Folder",
    "Share Folders With Device": "Share Folders With Device",
    "Share this folder?": "Share this folder?",
+    "Shared Folders": "Shared Folders",
    "Shared With": "Shared With",
    "Sharing": "Sharing",
    "Show ID": "Show ID",
    "Show QR": "Show QR",
+    "Show detailed discovery status": "Show detailed discovery status",
+    "Show detailed listener status": "Show detailed listener status",
    "Show diff with previous version": "Show diff with previous version",
    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.",
    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.",
@@ -272,7 +310,9 @@
    "Single level wildcard (matches within a directory only)": "Single level wildcard (matches within a directory only)",
    "Size": "Size",
    "Smallest First": "Smallest First",
+    "Some discovery methods could not be established for finding other devices or announcing this device:": "Some discovery methods could not be established for finding other devices or announcing this device:",
    "Some items could not be restored:": "Some items could not be restored:",
+    "Some listening addresses could not be enabled to accept connections:": "Some listening addresses could not be enabled to accept connections:",
    "Source Code": "Source Code",
    "Stable releases and release candidates": "Stable releases and release candidates",
    "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.",
@@ -281,6 +321,7 @@
    "Start Browser": "Start Browser",
    "Statistics": "Statistics",
    "Stopped": "Stopped",
+    "Stores and syncs only encrypted data. Folders on all connected devices need to be set up with the same password or be of type \"{%receiveEncrypted%}\" too.": "Stores and syncs only encrypted data. Folders on all connected devices need to be set up with the same password or be of type \"{{receiveEncrypted}}\" too.",
    "Support": "Support",
    "Support Bundle": "Support Bundle",
    "Sync Protocol Listen Addresses": "Sync Protocol Listen Addresses",
@@ -288,6 +329,8 @@
    "Syncthing has been shut down.": "Syncthing has been shut down.",
    "Syncthing includes the following software or portions thereof:": "Syncthing includes the following software or portions thereof:",
    "Syncthing is Free and Open Source Software licensed as MPL v2.0.": "Syncthing is Free and Open Source Software licensed as MPL v2.0.",
+    "Syncthing is listening on the following network addresses for connection attempts from other devices:": "Syncthing is listening on the following network addresses for connection attempts from other devices:",
+    "Syncthing is not listening for connection attempts from other devices on any address.  Only outgoing connections from this device may work.": "Syncthing is not listening for connection attempts from other devices on any address.  Only outgoing connections from this device may work.",
    "Syncthing is restarting.": "Syncthing is restarting.",
    "Syncthing is upgrading.": "Syncthing is upgrading.",
    "Syncthing now supports automatically reporting crashes to the developers. This feature is enabled by default.": "Syncthing now supports automatically reporting crashes to the developers. This feature is enabled by default.",
@@ -306,10 +349,14 @@
    "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.": "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.",
    "The folder ID cannot be blank.": "The folder ID cannot be blank.",
    "The folder ID must be unique.": "The folder ID must be unique.",
+    "The folder content on other devices will be overwritten to become identical with this device. Files not present here will be deleted on other devices.": "The folder content on other devices will be overwritten to become identical with this device. Files not present here will be deleted on other devices.",
+    "The folder content on this device will be overwritten to become identical with other devices. Files newly added here will be deleted.": "The folder content on this device will be overwritten to become identical with other devices. Files newly added here will be deleted.",
    "The folder path cannot be blank.": "The folder path cannot be blank.",
    "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.": "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.",
    "The following items could not be synchronized.": "The following items could not be synchronised.",
    "The following items were changed locally.": "The following items were changed locally.",
+    "The following methods are used to discover other devices on the network and announce this device to be found by others:": "The following methods are used to discover other devices on the network and announce this device to be found by others:",
+    "The following unexpected items were found.": "The following unexpected items were found.",
    "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 maximum age must be a number and cannot be blank.": "The maximum age must be a number and cannot be blank.",
@@ -322,9 +369,11 @@
    "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
    "The rescan interval must be a non-negative number of seconds.": "The rescan interval must be a non-negative number of seconds.",
    "There are no devices to share this folder with.": "There are no devices to share this folder with.",
+    "There are no folders to share with this device.": "There are no folders to share with this device.",
    "They are retried automatically and will be synced when the error is resolved.": "They are retried automatically and will be synced when the error is resolved.",
    "This Device": "This Device",
    "This can easily give hackers access to read and change any files on your computer.": "This can easily give hackers access to read and change any files on your computer.",
+    "This device cannot automatically discover other devices or announce its own address to be found by others.  Only devices with statically configured addresses can connect.": "This device cannot automatically discover other devices or announce its own address to be found by others.  Only devices with statically configured addresses can connect.",
    "This is a major version upgrade.": "This is a major version upgrade.",
    "This setting controls the free space required on the home (i.e., index database) disk.": "This setting controls the free space required on the home (i.e., index database) disk.",
    "Time": "Time",
@@ -335,10 +384,14 @@
    "Unavailable": "Unavailable",
    "Unavailable/Disabled by administrator or maintainer": "Unavailable/Disabled by administrator or maintainer",
    "Undecided (will prompt)": "Undecided (will prompt)",
+    "Unexpected Items": "Unexpected Items",
+    "Unexpected items have been found in this folder.": "Unexpected items have been found in this folder.",
    "Unignore": "Unignore",
    "Unknown": "Unknown",
    "Unshared": "Unshared",
    "Unshared Devices": "Unshared Devices",
+    "Unshared Folders": "Unshared Folders",
+    "Untrusted": "Untrusted",
    "Up to Date": "Up to Date",
    "Updated": "Updated",
    "Upgrade": "Upgrade",
@@ -348,6 +401,7 @@
    "Uptime": "Uptime",
    "Usage reporting is always enabled for candidate releases.": "Usage reporting is always enabled for candidate releases.",
    "Use HTTPS for GUI": "Use HTTPS for GUI",
+    "Use notifications from the filesystem to detect changed items.": "Use notifications from the filesystem to detect changed items.",
    "Username/Password has not been set for the GUI authentication. Please consider setting it up.": "Username/Password has not been set for the GUI authentication. Please consider setting it up.",
    "Version": "Version",
    "Versions": "Versions",
@@ -356,6 +410,7 @@
    "Waiting to Clean": "Waiting to Clean",
    "Waiting to Scan": "Waiting to Scan",
    "Waiting to Sync": "Waiting to Sync",
+    "Warning": "Warning",
    "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "Warning, this path is a parent directory of an existing folder \"{{otherFolder}}\".",
    "Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Warning, this path is a parent directory of an existing folder \"{{otherFolderLabel}}\" ({{otherFolder}}).",
    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Warning, this path is a subdirectory of an existing folder \"{{otherFolder}}\".",
@@ -374,6 +429,7 @@
    "You have no ignored folders.": "You have no ignored folders.",
    "You have unsaved changes. Do you really want to discard them?": "You have unsaved changes. Do you really want to discard them?",
    "You must keep at least one version.": "You must keep at least one version.",
+    "You should never add or change anything locally in a \"{%receiveEncrypted%}\" folder.": "You should never add or change anything locally in a \"{{receiveEncrypted}}\" folder.",
    "days": "days",
    "directories": "directories",
    "files": "files",
@@ -381,5 +437,6 @@
    "items": "items",
    "seconds": "seconds",
    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} wants to share folder \"{{folder}}\".",
-    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} wants to share folder \"{{folderlabel}}\" ({{folder}})."
+    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} wants to share folder \"{{folderlabel}}\" ({{folder}}).",
+    "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} might reintroduce this device."
 }
--- a/gui/default/assets/lang/lang-en-GB.json
+++ b/gui/default/assets/lang/lang-en-GB.json
@@ -18,15 +18,20 @@
    "Advanced": "Advanced",
    "Advanced Configuration": "Advanced Configuration",
    "All Data": "All Data",
+    "All folders shared with this device must be protected by a password, such that all sent data is unreadable without the given password.": "All folders shared with this device must be protected by a password, such that all sent data is unreadable without the given password.",
    "Allow Anonymous Usage Reporting?": "Allow Anonymous Usage Reporting?",
    "Allowed Networks": "Allowed Networks",
    "Alphabetic": "Alphabetic",
    "An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.": "An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.",
    "Anonymous Usage Reporting": "Anonymous Usage Reporting",
    "Anonymous usage report format has changed. Would you like to move to the new format?": "Anonymous usage report format has changed. Would you like to move to the new format?",
+    "Are you sure you want to continue?": "Are you sure you want to continue?",
+    "Are you sure you want to override all remote changes?": "Are you sure you want to override all remote changes?",
+    "Are you sure you want to permanently delete all these files?": "Are you sure you want to permanently delete all these files?",
    "Are you sure you want to remove device {%name%}?": "Are you sure you want to remove device {{name}}?",
    "Are you sure you want to remove folder {%label%}?": "Are you sure you want to remove folder {{label}}?",
    "Are you sure you want to restore {%count%} files?": "Are you sure you want to restore {{count}} files?",
+    "Are you sure you want to revert all local changes?": "Are you sure you want to revert all local changes?",
    "Are you sure you want to upgrade?": "Are you sure you want to upgrade?",
    "Auto Accept": "Auto Accept",
    "Automatic Crash Reporting": "Automatic Crash Reporting",
@@ -37,11 +42,13 @@
    "Available debug logging facilities:": "Available debug logging facilities:",
    "Be careful!": "Be careful!",
    "Bugs": "Bugs",
+    "Cancel": "Cancel",
    "Changelog": "Changelog",
    "Clean out after": "Clean out after",
    "Cleaning Versions": "Cleaning Versions",
    "Cleanup Interval": "Cleanup Interval",
    "Click to see discovery failures": "Click to see discovery failures",
+    "Click to see full identification string and QR code.": "Click to see full identification string and QR code.",
    "Close": "Close",
    "Command": "Command",
    "Comment, when used at the start of a line": "Comment, when used at the start of a line",
@@ -59,15 +66,23 @@
    "Currently Shared With Devices": "Currently Shared With Devices",
    "Danger!": "Danger!",
    "Debugging Facilities": "Debugging Facilities",
+    "Default Configuration": "Default Configuration",
+    "Default Device": "Default Device",
+    "Default Folder": "Default Folder",
    "Default Folder Path": "Default Folder Path",
+    "Defaults": "Defaults",
+    "Delete": "Delete",
+    "Delete Unexpected Items": "Delete Unexpected Items",
    "Deleted": "Deleted",
    "Deselect All": "Deselect All",
    "Deselect devices to stop sharing this folder with.": "Deselect devices to stop sharing this folder with.",
+    "Deselect folders to stop sharing with this device.": "Deselect folders to stop sharing with this device.",
    "Device": "Device",
    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Device \"{{name}}\" ({{device}} at {{address}}) wants to connect. Add new device?",
    "Device ID": "Device ID",
    "Device Identification": "Device Identification",
    "Device Name": "Device Name",
+    "Device is untrusted, enter encryption password": "Device is untrusted, enter encryption password",
    "Device rate limits": "Device rate limits",
    "Device that last modified the item": "Device that last modified the item",
    "Devices": "Devices",
@@ -83,6 +98,9 @@
    "Discovered": "Discovered",
    "Discovery": "Discovery",
    "Discovery Failures": "Discovery Failures",
+    "Discovery Status": "Discovery Status",
+    "Dismiss": "Dismiss",
+    "Do not add it to the ignore list, so this notification may recur.": "Do not add it to the ignore list, so this notification may recur.",
    "Do not restore": "Do not restore",
    "Do not restore all": "Do not restore all",
    "Do you want to enable watching for changes for all your folders?": "Do you want to enable watching for changes for all your folders?",
@@ -92,7 +110,9 @@
    "Downloading": "Downloading",
    "Edit": "Edit",
    "Edit Device": "Edit Device",
+    "Edit Device Defaults": "Edit Device Defaults",
    "Edit Folder": "Edit Folder",
+    "Edit Folder Defaults": "Edit Folder Defaults",
    "Editing {%path%}.": "Editing {{path}}.",
    "Enable Crash Reporting": "Enable Crash Reporting",
    "Enable NAT traversal": "Enable NAT traversal",
@@ -106,6 +126,7 @@
    "Error": "Error",
    "External File Versioning": "External File Versioning",
    "Failed Items": "Failed Items",
+    "Failed to load ignore patterns.": "Failed to load ignore patterns.",
    "Failed to setup, retrying": "Failed to setup, retrying",
    "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.",
    "File Pull Order": "File Pull Order",
@@ -122,6 +143,8 @@
    "Folder Label": "Folder Label",
    "Folder Path": "Folder Path",
    "Folder Type": "Folder Type",
+    "Folder type \"{%receiveEncrypted%}\" can only be set when adding a new folder.": "Folder type \"{{receiveEncrypted}}\" can only be set when adding a new folder.",
+    "Folder type \"{%receiveEncrypted%}\" cannot be changed after adding the folder. You need to remove the folder, delete or decrypt the data on disk, and add the folder again.": "Folder type \"{{receiveEncrypted}}\" cannot be changed after adding the folder. You need to remove the folder, delete or decrypt the data on disk, and add the folder again.",
    "Folders": "Folders",
    "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.",
    "Full Rescan Interval (s)": "Full Rescan Interval (s)",
@@ -139,6 +162,8 @@
    "Help": "Help",
    "Home page": "Home page",
    "However, your current settings indicate you might not want it enabled. We have disabled automatic crash reporting for you.": "However, your current settings indicate you might not want it enabled. We have disabled automatic crash reporting for you.",
+    "Identification": "Identification",
+    "If untrusted, enter encryption password": "If untrusted, enter encryption password",
    "If you want to prevent other users on this computer from accessing Syncthing and through it your files, consider setting up authentication.": "If you want to prevent other users on this computer from accessing Syncthing and through it your files, consider setting up authentication.",
    "Ignore": "Ignore",
    "Ignore Patterns": "Ignore Patterns",
@@ -159,6 +184,8 @@
    "Latest Change": "Latest Change",
    "Learn more": "Learn more",
    "Limit": "Limit",
+    "Listener Failures": "Listener Failures",
+    "Listener Status": "Listener Status",
    "Listeners": "Listeners",
    "Loading data...": "Loading data...",
    "Loading...": "Loading...",
@@ -187,6 +214,7 @@
    "No File Versioning": "No File Versioning",
    "No files will be deleted as a result of this operation.": "No files will be deleted as a result of this operation.",
    "No upgrades": "No upgrades",
+    "Not shared": "Not shared",
    "Notice": "Notice",
    "OK": "OK",
    "Off": "Off",
@@ -196,6 +224,7 @@
    "Out of Sync": "Out of Sync",
    "Out of Sync Items": "Out of Sync Items",
    "Outgoing Rate Limit (KiB/s)": "Outgoing Rate Limit (KiB/s)",
+    "Override": "Override",
    "Override Changes": "Override Changes",
    "Path": "Path",
    "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for",
@@ -209,6 +238,7 @@
    "Periodic scanning at given interval and disabled watching for changes": "Periodic scanning at given interval and disabled watching for changes",
    "Periodic scanning at given interval and enabled watching for changes": "Periodic scanning at given interval and enabled watching for changes",
    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:",
+    "Permanently add it to the ignore list, suppressing further notifications.": "Permanently add it to the ignore list, suppressing further notifications.",
    "Permissions": "Permissions",
    "Please consult the release notes before performing a major upgrade.": "Please consult the release notes before performing a major upgrade.",
    "Please set a GUI Authentication User and Password in the Settings dialog.": "Please set a GUI Authentication User and Password in the Settings dialogue.",
@@ -220,12 +250,15 @@
    "Preview Usage Report": "Preview Usage Report",
    "Quick guide to supported patterns": "Quick guide to supported patterns",
    "Random": "Random",
+    "Receive Encrypted": "Receive Encrypted",
    "Receive Only": "Receive Only",
+    "Received data is already encrypted": "Received data is already encrypted",
    "Recent Changes": "Recent Changes",
    "Reduced by ignore patterns": "Reduced by ignore patterns",
    "Release Notes": "Release Notes",
    "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Release candidates contain the latest features and fixes. They are similar to the traditional fortnightly Syncthing releases.",
    "Remote Devices": "Remote Devices",
+    "Remote GUI": "Remote GUI",
    "Remove": "Remove",
    "Remove Device": "Remove Device",
    "Remove Folder": "Remove Folder",
@@ -241,6 +274,7 @@
    "Resume": "Resume",
    "Resume All": "Resume All",
    "Reused": "Reused",
+    "Revert": "Revert",
    "Revert Local Changes": "Revert Local Changes",
    "Save": "Save",
    "Scan Time Remaining": "Scan Time Remaining",
@@ -249,6 +283,7 @@
    "Select All": "Select All",
    "Select a version": "Select a version",
    "Select additional devices to share this folder with.": "Select additional devices to share this folder with.",
+    "Select additional folders to share with this device.": "Select additional folders to share with this device.",
    "Select latest version": "Select latest version",
    "Select oldest version": "Select oldest version",
    "Select the folders to share with this device.": "Select the folders to share with this device.",
@@ -259,10 +294,13 @@
    "Share Folder": "Share Folder",
    "Share Folders With Device": "Share Folders With Device",
    "Share this folder?": "Share this folder?",
+    "Shared Folders": "Shared Folders",
    "Shared With": "Shared With",
    "Sharing": "Sharing",
    "Show ID": "Show ID",
    "Show QR": "Show QR",
+    "Show detailed discovery status": "Show detailed discovery status",
+    "Show detailed listener status": "Show detailed listener status",
    "Show diff with previous version": "Show diff with previous version",
    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.",
    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.",
@@ -272,7 +310,9 @@
    "Single level wildcard (matches within a directory only)": "Single level wildcard (matches within a directory only)",
    "Size": "Size",
    "Smallest First": "Smallest First",
+    "Some discovery methods could not be established for finding other devices or announcing this device:": "Some discovery methods could not be established for finding other devices or announcing this device:",
    "Some items could not be restored:": "Some items could not be restored:",
+    "Some listening addresses could not be enabled to accept connections:": "Some listening addresses could not be enabled to accept connections:",
    "Source Code": "Source Code",
    "Stable releases and release candidates": "Stable releases and release candidates",
    "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.",
@@ -281,6 +321,7 @@
    "Start Browser": "Start Browser",
    "Statistics": "Statistics",
    "Stopped": "Stopped",
+    "Stores and syncs only encrypted data. Folders on all connected devices need to be set up with the same password or be of type \"{%receiveEncrypted%}\" too.": "Stores and syncs only encrypted data. Folders on all connected devices need to be set up with the same password or be of type \"{{receiveEncrypted}}\" too.",
    "Support": "Support",
    "Support Bundle": "Support Bundle",
    "Sync Protocol Listen Addresses": "Sync Protocol Listen Addresses",
@@ -288,6 +329,8 @@
    "Syncthing has been shut down.": "Syncthing has been shut down.",
    "Syncthing includes the following software or portions thereof:": "Syncthing includes the following software or portions thereof:",
    "Syncthing is Free and Open Source Software licensed as MPL v2.0.": "Syncthing is Free and Open Source Software licensed as MPL v2.0.",
+    "Syncthing is listening on the following network addresses for connection attempts from other devices:": "Syncthing is listening on the following network addresses for connection attempts from other devices:",
+    "Syncthing is not listening for connection attempts from other devices on any address.  Only outgoing connections from this device may work.": "Syncthing is not listening for connection attempts from other devices on any address.  Only outgoing connections from this device may work.",
    "Syncthing is restarting.": "Syncthing is restarting.",
    "Syncthing is upgrading.": "Syncthing is upgrading.",
    "Syncthing now supports automatically reporting crashes to the developers. This feature is enabled by default.": "Syncthing now supports automatically reporting crashes to the developers. This feature is enabled by default.",
@@ -306,10 +349,14 @@
    "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.": "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.",
    "The folder ID cannot be blank.": "The folder ID cannot be blank.",
    "The folder ID must be unique.": "The folder ID must be unique.",
+    "The folder content on other devices will be overwritten to become identical with this device. Files not present here will be deleted on other devices.": "The folder content on other devices will be overwritten to become identical with this device. Files not present here will be deleted on other devices.",
+    "The folder content on this device will be overwritten to become identical with other devices. Files newly added here will be deleted.": "The folder content on this device will be overwritten to become identical with other devices. Files newly added here will be deleted.",
    "The folder path cannot be blank.": "The folder path cannot be blank.",
    "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.": "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.",
    "The following items could not be synchronized.": "The following items could not be synchronised.",
    "The following items were changed locally.": "The following items were changed locally.",
+    "The following methods are used to discover other devices on the network and announce this device to be found by others:": "The following methods are used to discover other devices on the network and announce this device to be found by others:",
+    "The following unexpected items were found.": "The following unexpected items were found.",
    "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 maximum age must be a number and cannot be blank.": "The maximum age must be a number and cannot be blank.",
@@ -322,9 +369,11 @@
    "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
    "The rescan interval must be a non-negative number of seconds.": "The rescan interval must be a non-negative number of seconds.",
    "There are no devices to share this folder with.": "There are no devices to share this folder with.",
+    "There are no folders to share with this device.": "There are no folders to share with this device.",
    "They are retried automatically and will be synced when the error is resolved.": "They are retried automatically and will be synced when the error is resolved.",
    "This Device": "This Device",
    "This can easily give hackers access to read and change any files on your computer.": "This can easily give hackers access to read and change any files on your computer.",
+    "This device cannot automatically discover other devices or announce its own address to be found by others.  Only devices with statically configured addresses can connect.": "This device cannot automatically discover other devices or announce its own address to be found by others.  Only devices with statically configured addresses can connect.",
    "This is a major version upgrade.": "This is a major version upgrade.",
    "This setting controls the free space required on the home (i.e., index database) disk.": "This setting controls the free space required on the home (i.e., index database) disk.",
    "Time": "Time",
@@ -335,10 +384,14 @@
    "Unavailable": "Unavailable",
    "Unavailable/Disabled by administrator or maintainer": "Unavailable/Disabled by administrator or maintainer",
    "Undecided (will prompt)": "Undecided (will prompt)",
+    "Unexpected Items": "Unexpected Items",
+    "Unexpected items have been found in this folder.": "Unexpected items have been found in this folder.",
    "Unignore": "Unignore",
    "Unknown": "Unknown",
    "Unshared": "Unshared",
    "Unshared Devices": "Unshared Devices",
+    "Unshared Folders": "Unshared Folders",
+    "Untrusted": "Untrusted",
    "Up to Date": "Up to Date",
    "Updated": "Updated",
    "Upgrade": "Upgrade",
@@ -348,6 +401,7 @@
    "Uptime": "Uptime",
    "Usage reporting is always enabled for candidate releases.": "Usage reporting is always enabled for candidate releases.",
    "Use HTTPS for GUI": "Use HTTPS for GUI",
+    "Use notifications from the filesystem to detect changed items.": "Use notifications from the filesystem to detect changed items.",
    "Username/Password has not been set for the GUI authentication. Please consider setting it up.": "Username/Password has not been set for the GUI authentication. Please consider setting it up.",
    "Version": "Version",
    "Versions": "Versions",
@@ -356,6 +410,7 @@
    "Waiting to Clean": "Waiting to Clean",
    "Waiting to Scan": "Waiting to Scan",
    "Waiting to Sync": "Waiting to Sync",
+    "Warning": "Warning",
    "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "Warning, this path is a parent directory of an existing folder \"{{otherFolder}}\".",
    "Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Warning, this path is a parent directory of an existing folder \"{{otherFolderLabel}}\" ({{otherFolder}}).",
    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Warning, this path is a subdirectory of an existing folder \"{{otherFolder}}\".",
@@ -374,6 +429,7 @@
    "You have no ignored folders.": "You have no ignored folders.",
    "You have unsaved changes. Do you really want to discard them?": "You have unsaved changes. Do you really want to discard them?",
    "You must keep at least one version.": "You must keep at least one version.",
+    "You should never add or change anything locally in a \"{%receiveEncrypted%}\" folder.": "You should never add or change anything locally in a \"{{receiveEncrypted}}\" folder.",
    "days": "days",
    "directories": "directories",
    "files": "files",
@@ -381,5 +437,6 @@
    "items": "items",
    "seconds": "seconds",
    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} wants to share folder \"{{folder}}\".",
-    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} wants to share folder \"{{folderlabel}}\" ({{folder}})."
+    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} wants to share folder \"{{folderlabel}}\" ({{folder}}).",
+    "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} might reintroduce this device."
 }
--- a/gui/default/assets/lang/lang-en.json
+++ b/gui/default/assets/lang/lang-en.json
@@ -25,10 +25,13 @@
   "An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.": "An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.",
   "Anonymous Usage Reporting": "Anonymous Usage Reporting",
   "Anonymous usage report format has changed. Would you like to move to the new format?": "Anonymous usage report format has changed. Would you like to move to the new format?",
+   "Are you sure you want to continue?": "Are you sure you want to continue?",
+   "Are you sure you want to override all remote changes?": "Are you sure you want to override all remote changes?",
   "Are you sure you want to permanently delete all these files?": "Are you sure you want to permanently delete all these files?",
   "Are you sure you want to remove device {%name%}?": "Are you sure you want to remove device {{name}}?",
   "Are you sure you want to remove folder {%label%}?": "Are you sure you want to remove folder {{label}}?",
   "Are you sure you want to restore {%count%} files?": "Are you sure you want to restore {{count}} files?",
+   "Are you sure you want to revert all local changes?": "Are you sure you want to revert all local changes?",
   "Are you sure you want to upgrade?": "Are you sure you want to upgrade?",
   "Auto Accept": "Auto Accept",
   "Automatic Crash Reporting": "Automatic Crash Reporting",
@@ -39,11 +42,13 @@
   "Available debug logging facilities:": "Available debug logging facilities:",
   "Be careful!": "Be careful!",
   "Bugs": "Bugs",
+   "Cancel": "Cancel",
   "Changelog": "Changelog",
   "Clean out after": "Clean out after",
   "Cleaning Versions": "Cleaning Versions",
   "Cleanup Interval": "Cleanup Interval",
   "Click to see discovery failures": "Click to see discovery failures",
+   "Click to see full identification string and QR code.": "Click to see full identification string and QR code.",
   "Close": "Close",
   "Command": "Command",
   "Comment, when used at the start of a line": "Comment, when used at the start of a line",
@@ -61,16 +66,23 @@
   "Currently Shared With Devices": "Currently Shared With Devices",
   "Danger!": "Danger!",
   "Debugging Facilities": "Debugging Facilities",
+   "Default Configuration": "Default Configuration",
+   "Default Device": "Default Device",
+   "Default Folder": "Default Folder",
   "Default Folder Path": "Default Folder Path",
+   "Defaults": "Defaults",
+   "Delete": "Delete",
   "Delete Unexpected Items": "Delete Unexpected Items",
   "Deleted": "Deleted",
   "Deselect All": "Deselect All",
   "Deselect devices to stop sharing this folder with.": "Deselect devices to stop sharing this folder with.",
+   "Deselect folders to stop sharing with this device.": "Deselect folders to stop sharing with this device.",
   "Device": "Device",
   "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Device \"{{name}}\" ({{device}} at {{address}}) wants to connect. Add new device?",
   "Device ID": "Device ID",
   "Device Identification": "Device Identification",
   "Device Name": "Device Name",
+   "Device is untrusted, enter encryption password": "Device is untrusted, enter encryption password",
   "Device rate limits": "Device rate limits",
   "Device that last modified the item": "Device that last modified the item",
   "Devices": "Devices",
@@ -86,6 +98,9 @@
   "Discovered": "Discovered",
   "Discovery": "Discovery",
   "Discovery Failures": "Discovery Failures",
+   "Discovery Status": "Discovery Status",
+   "Dismiss": "Dismiss",
+   "Do not add it to the ignore list, so this notification may recur.": "Do not add it to the ignore list, so this notification may recur.",
   "Do not restore": "Do not restore",
   "Do not restore all": "Do not restore all",
   "Do you want to enable watching for changes for all your folders?": "Do you want to enable watching for changes for all your folders?",
@@ -95,7 +110,9 @@
   "Downloading": "Downloading",
   "Edit": "Edit",
   "Edit Device": "Edit Device",
+   "Edit Device Defaults": "Edit Device Defaults",
   "Edit Folder": "Edit Folder",
+   "Edit Folder Defaults": "Edit Folder Defaults",
   "Editing {%path%}.": "Editing {{path}}.",
   "Enable Crash Reporting": "Enable Crash Reporting",
   "Enable NAT traversal": "Enable NAT traversal",
@@ -109,6 +126,7 @@
   "Error": "Error",
   "External File Versioning": "External File Versioning",
   "Failed Items": "Failed Items",
+   "Failed to load ignore patterns.": "Failed to load ignore patterns.",
   "Failed to setup, retrying": "Failed to setup, retrying",
   "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.",
   "File Pull Order": "File Pull Order",
@@ -125,6 +143,7 @@
   "Folder Label": "Folder Label",
   "Folder Path": "Folder Path",
   "Folder Type": "Folder Type",
+   "Folder type \"{%receiveEncrypted%}\" can only be set when adding a new folder.": "Folder type \"{{receiveEncrypted}}\" can only be set when adding a new folder.",
   "Folder type \"{%receiveEncrypted%}\" cannot be changed after adding the folder. You need to remove the folder, delete or decrypt the data on disk, and add the folder again.": "Folder type \"{{receiveEncrypted}}\" cannot be changed after adding the folder. You need to remove the folder, delete or decrypt the data on disk, and add the folder again.",
   "Folders": "Folders",
   "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.",
@@ -143,6 +162,7 @@
   "Help": "Help",
   "Home page": "Home page",
   "However, your current settings indicate you might not want it enabled. We have disabled automatic crash reporting for you.": "However, your current settings indicate you might not want it enabled. We have disabled automatic crash reporting for you.",
+   "Identification": "Identification",
   "If untrusted, enter encryption password": "If untrusted, enter encryption password",
   "If you want to prevent other users on this computer from accessing Syncthing and through it your files, consider setting up authentication.": "If you want to prevent other users on this computer from accessing Syncthing and through it your files, consider setting up authentication.",
   "Ignore": "Ignore",
@@ -164,6 +184,8 @@
   "Latest Change": "Latest Change",
   "Learn more": "Learn more",
   "Limit": "Limit",
+   "Listener Failures": "Listener Failures",
+   "Listener Status": "Listener Status",
   "Listeners": "Listeners",
   "Loading data...": "Loading data...",
   "Loading...": "Loading...",
@@ -202,6 +224,7 @@
   "Out of Sync": "Out of Sync",
   "Out of Sync Items": "Out of Sync Items",
   "Outgoing Rate Limit (KiB/s)": "Outgoing Rate Limit (KiB/s)",
+   "Override": "Override",
   "Override Changes": "Override Changes",
   "Path": "Path",
   "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for",
@@ -215,6 +238,7 @@
   "Periodic scanning at given interval and disabled watching for changes": "Periodic scanning at given interval and disabled watching for changes",
   "Periodic scanning at given interval and enabled watching for changes": "Periodic scanning at given interval and enabled watching for changes",
   "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:",
+   "Permanently add it to the ignore list, suppressing further notifications.": "Permanently add it to the ignore list, suppressing further notifications.",
   "Permissions": "Permissions",
   "Please consult the release notes before performing a major upgrade.": "Please consult the release notes before performing a major upgrade.",
   "Please set a GUI Authentication User and Password in the Settings dialog.": "Please set a GUI Authentication User and Password in the Settings dialog.",
@@ -234,6 +258,7 @@
   "Release Notes": "Release Notes",
   "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.",
   "Remote Devices": "Remote Devices",
+   "Remote GUI": "Remote GUI",
   "Remove": "Remove",
   "Remove Device": "Remove Device",
   "Remove Folder": "Remove Folder",
@@ -249,6 +274,7 @@
   "Resume": "Resume",
   "Resume All": "Resume All",
   "Reused": "Reused",
+   "Revert": "Revert",
   "Revert Local Changes": "Revert Local Changes",
   "Save": "Save",
   "Scan Time Remaining": "Scan Time Remaining",
@@ -273,6 +299,8 @@
   "Sharing": "Sharing",
   "Show ID": "Show ID",
   "Show QR": "Show QR",
+   "Show detailed discovery status": "Show detailed discovery status",
+   "Show detailed listener status": "Show detailed listener status",
   "Show diff with previous version": "Show diff with previous version",
   "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.",
   "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.",
@@ -282,7 +310,9 @@
   "Single level wildcard (matches within a directory only)": "Single level wildcard (matches within a directory only)",
   "Size": "Size",
   "Smallest First": "Smallest First",
+   "Some discovery methods could not be established for finding other devices or announcing this device:": "Some discovery methods could not be established for finding other devices or announcing this device:",
   "Some items could not be restored:": "Some items could not be restored:",
+   "Some listening addresses could not be enabled to accept connections:": "Some listening addresses could not be enabled to accept connections:",
   "Source Code": "Source Code",
   "Stable releases and release candidates": "Stable releases and release candidates",
   "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.",
@@ -299,6 +329,8 @@
   "Syncthing has been shut down.": "Syncthing has been shut down.",
   "Syncthing includes the following software or portions thereof:": "Syncthing includes the following software or portions thereof:",
   "Syncthing is Free and Open Source Software licensed as MPL v2.0.": "Syncthing is Free and Open Source Software licensed as MPL v2.0.",
+   "Syncthing is listening on the following network addresses for connection attempts from other devices:": "Syncthing is listening on the following network addresses for connection attempts from other devices:",
+   "Syncthing is not listening for connection attempts from other devices on any address.  Only outgoing connections from this device may work.": "Syncthing is not listening for connection attempts from other devices on any address.  Only outgoing connections from this device may work.",
   "Syncthing is restarting.": "Syncthing is restarting.",
   "Syncthing is upgrading.": "Syncthing is upgrading.",
   "Syncthing now supports automatically reporting crashes to the developers. This feature is enabled by default.": "Syncthing now supports automatically reporting crashes to the developers. This feature is enabled by default.",
@@ -317,10 +349,13 @@
   "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.": "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.",
   "The folder ID cannot be blank.": "The folder ID cannot be blank.",
   "The folder ID must be unique.": "The folder ID must be unique.",
+   "The folder content on other devices will be overwritten to become identical with this device. Files not present here will be deleted on other devices.": "The folder content on other devices will be overwritten to become identical with this device. Files not present here will be deleted on other devices.",
+   "The folder content on this device will be overwritten to become identical with other devices. Files newly added here will be deleted.": "The folder content on this device will be overwritten to become identical with other devices. Files newly added here will be deleted.",
   "The folder path cannot be blank.": "The folder path cannot be blank.",
   "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.": "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.",
   "The following items could not be synchronized.": "The following items could not be synchronized.",
   "The following items were changed locally.": "The following items were changed locally.",
+   "The following methods are used to discover other devices on the network and announce this device to be found by others:": "The following methods are used to discover other devices on the network and announce this device to be found by others:",
   "The following unexpected items were found.": "The following unexpected items were found.",
   "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.",
@@ -334,9 +369,11 @@
   "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
   "The rescan interval must be a non-negative number of seconds.": "The rescan interval must be a non-negative number of seconds.",
   "There are no devices to share this folder with.": "There are no devices to share this folder with.",
+   "There are no folders to share with this device.": "There are no folders to share with this device.",
   "They are retried automatically and will be synced when the error is resolved.": "They are retried automatically and will be synced when the error is resolved.",
   "This Device": "This Device",
   "This can easily give hackers access to read and change any files on your computer.": "This can easily give hackers access to read and change any files on your computer.",
+   "This device cannot automatically discover other devices or announce its own address to be found by others.  Only devices with statically configured addresses can connect.": "This device cannot automatically discover other devices or announce its own address to be found by others.  Only devices with statically configured addresses can connect.",
   "This is a major version upgrade.": "This is a major version upgrade.",
   "This setting controls the free space required on the home (i.e., index database) disk.": "This setting controls the free space required on the home (i.e., index database) disk.",
   "Time": "Time",
@@ -364,6 +401,7 @@
   "Uptime": "Uptime",
   "Usage reporting is always enabled for candidate releases.": "Usage reporting is always enabled for candidate releases.",
   "Use HTTPS for GUI": "Use HTTPS for GUI",
+   "Use notifications from the filesystem to detect changed items.": "Use notifications from the filesystem to detect changed items.",
   "Username/Password has not been set for the GUI authentication. Please consider setting it up.": "Username/Password has not been set for the GUI authentication. Please consider setting it up.",
   "Version": "Version",
   "Versions": "Versions",
@@ -372,6 +410,7 @@
   "Waiting to Clean": "Waiting to Clean",
   "Waiting to Scan": "Waiting to Scan",
   "Waiting to Sync": "Waiting to Sync",
+   "Warning": "Warning",
   "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "Warning, this path is a parent directory of an existing folder \"{{otherFolder}}\".",
   "Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Warning, this path is a parent directory of an existing folder \"{{otherFolderLabel}}\" ({{otherFolder}}).",
   "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Warning, this path is a subdirectory of an existing folder \"{{otherFolder}}\".",
@@ -397,6 +436,11 @@
   "full documentation": "full documentation",
   "items": "items",
   "seconds": "seconds",
+   "theme-name-black": "Black",
+   "theme-name-dark": "Dark",
+   "theme-name-default": "Default",
+   "theme-name-light": "Light",
   "{%device%} wants to share folder \"{%folder%}\".": "{{device}} wants to share folder \"{{folder}}\".",
-   "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} wants to share folder \"{{folderlabel}}\" ({{folder}})."
+   "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} wants to share folder \"{{folderlabel}}\" ({{folder}}).",
+   "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} might reintroduce this device."
 }
--- a/gui/default/assets/lang/lang-eo.json
+++ b/gui/default/assets/lang/lang-eo.json
@@ -18,15 +18,20 @@
    "Advanced": "Altnivela",
    "Advanced Configuration": "Altnivela Agordo",
    "All Data": "Ĉiuj Datumoj",
+    "All folders shared with this device must be protected by a password, such that all sent data is unreadable without the given password.": "All folders shared with this device must be protected by a password, such that all sent data is unreadable without the given password.",
    "Allow Anonymous Usage Reporting?": "Permesi Anoniman Raporton de Uzado?",
    "Allowed Networks": "Permesitaj Retoj",
    "Alphabetic": "Alfabeta",
    "An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.": "Ekstera komando manipulas la version. Ĝi devas forigi la dosieron el la komunigita dosierujo. Se la vojo al la apliko elhavas blankoj, ĝi devas esti inter citiloj.",
    "Anonymous Usage Reporting": "Anonima Raporto de Uzado",
    "Anonymous usage report format has changed. Would you like to move to the new format?": "Formato de anonima raporto de uzado ŝanĝis. Ĉu vi ŝatus transiri al la nova formato?",
+    "Are you sure you want to continue?": "Are you sure you want to continue?",
+    "Are you sure you want to override all remote changes?": "Are you sure you want to override all remote changes?",
+    "Are you sure you want to permanently delete all these files?": "Are you sure you want to permanently delete all these files?",
    "Are you sure you want to remove device {%name%}?": "Ĉu vi certas, ke vi volas forigi aparaton {{name}}?",
    "Are you sure you want to remove folder {%label%}?": "Ĉu vi certas, ke vi volas forigi dosierujon {{label}}?",
    "Are you sure you want to restore {%count%} files?": "Ĉu vi certas, ke vi volas restarigi {{count}} dosierojn?",
+    "Are you sure you want to revert all local changes?": "Are you sure you want to revert all local changes?",
    "Are you sure you want to upgrade?": "Ĉu vi certe volas plinovigi ?",
    "Auto Accept": "Akcepti Aŭtomate",
    "Automatic Crash Reporting": "Aŭtomata raportado de kraŝoj",
@@ -37,11 +42,13 @@
    "Available debug logging facilities:": "Disponeblaj elpurigadaj protokoliloj:",
    "Be careful!": "Atentu!",
    "Bugs": "Cimoj",
+    "Cancel": "Cancel",
    "Changelog": "Ŝanĝoprotokolo",
    "Clean out after": "Purigi poste",
    "Cleaning Versions": "Cleaning Versions",
    "Cleanup Interval": "Cleanup Interval",
    "Click to see discovery failures": "Alklaku por vidi malsukcesajn malkovrojn",
+    "Click to see full identification string and QR code.": "Click to see full identification string and QR code.",
    "Close": "Fermi",
    "Command": "Komando",
    "Comment, when used at the start of a line": "Komento, kiam uzita ĉe la komenco de lineo",
@@ -59,15 +66,23 @@
    "Currently Shared With Devices": "Nune komunigita kun aparatoj",
    "Danger!": "Danĝero!",
    "Debugging Facilities": "Elpurigadiloj",
+    "Default Configuration": "Default Configuration",
+    "Default Device": "Default Device",
+    "Default Folder": "Default Folder",
    "Default Folder Path": "Defaŭlta Dosieruja Vojo",
+    "Defaults": "Defaults",
+    "Delete": "Delete",
+    "Delete Unexpected Items": "Delete Unexpected Items",
    "Deleted": "Forigita",
    "Deselect All": "Malelekti Ĉiujn",
    "Deselect devices to stop sharing this folder with.": "Malelekti aparatojn por ĉesi komunigi tiun ĉi dosierujon kun ili.",
+    "Deselect folders to stop sharing with this device.": "Deselect folders to stop sharing with this device.",
    "Device": "Aparato",
    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Aparato \"{{name}}\" ({{device}} ĉe {{address}}) volas konekti. Aldoni la novan aparaton?",
    "Device ID": "Aparato ID",
    "Device Identification": "Identigo de Aparato",
    "Device Name": "Nomo de Aparato",
+    "Device is untrusted, enter encryption password": "Device is untrusted, enter encryption password",
    "Device rate limits": "Limoj de rapideco de aparato",
    "Device that last modified the item": "Aparato kiu laste modifis la eron",
    "Devices": "Aparatoj",
@@ -83,6 +98,9 @@
    "Discovered": "Malkovrita",
    "Discovery": "Malkovro",
    "Discovery Failures": "Malsukcesoj de Malkovro",
+    "Discovery Status": "Discovery Status",
+    "Dismiss": "Dismiss",
+    "Do not add it to the ignore list, so this notification may recur.": "Do not add it to the ignore list, so this notification may recur.",
    "Do not restore": "Ne restarigu",
    "Do not restore all": "Ne restarigu ĉion",
    "Do you want to enable watching for changes for all your folders?": "Ĉu vi volas ebligi rigardado je ŝanĝoj por ĉiuj viaj dosierujoj?",
@@ -91,8 +109,10 @@
    "Downloaded": "Elŝutita",
    "Downloading": "Elŝutado",
    "Edit": "Redakti",
-    "Edit Device": "Edit Device",
-    "Edit Folder": "Edit Folder",
+    "Edit Device": "Redakti Aparaton",
+    "Edit Device Defaults": "Edit Device Defaults",
+    "Edit Folder": "Redakti Dosierujon",
+    "Edit Folder Defaults": "Edit Folder Defaults",
    "Editing {%path%}.": "Redaktado de {{path}}.",
    "Enable Crash Reporting": "Ŝalti raportadon de kraŝoj",
    "Enable NAT traversal": "Ŝaltu trairan NAT",
@@ -106,6 +126,7 @@
    "Error": "Eraro",
    "External File Versioning": "Ekstera Versionado de Dosiero",
    "Failed Items": "Malsukcesaj Eroj",
+    "Failed to load ignore patterns.": "Failed to load ignore patterns.",
    "Failed to setup, retrying": "Malsukcesis agordi, provante denove",
    "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Malsukceso por konekti al IPv6 serviloj atendante se ekzistas neniu IPv6 konektebleco.",
    "File Pull Order": "Ordo por Tiri Dosieron",
@@ -122,6 +143,8 @@
    "Folder Label": "Dosieruja Etikedo",
    "Folder Path": "Dosieruja Vojo",
    "Folder Type": "Dosieruja Tipo",
+    "Folder type \"{%receiveEncrypted%}\" can only be set when adding a new folder.": "Folder type \"{{receiveEncrypted}}\" can only be set when adding a new folder.",
+    "Folder type \"{%receiveEncrypted%}\" cannot be changed after adding the folder. You need to remove the folder, delete or decrypt the data on disk, and add the folder again.": "Folder type \"{{receiveEncrypted}}\" cannot be changed after adding the folder. You need to remove the folder, delete or decrypt the data on disk, and add the folder again.",
    "Folders": "Dosierujoj",
    "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "Por la sekvantaj dosierujoj eraro okazis dum komencado de rigardado je ŝanĝoj. Provante denove ĉiuminute, do eraroj eble foriros baldaŭ. Se ili persistas, provu ripari subkuŝantan problemon kaj petu helpon, se vi ne povas.",
    "Full Rescan Interval (s)": "Plena Reskana Intervalo (s)",
@@ -139,6 +162,8 @@
    "Help": "Helpo",
    "Home page": "Hejma paĝo",
    "However, your current settings indicate you might not want it enabled. We have disabled automatic crash reporting for you.": "However, your current settings indicate you might not want it enabled. We have disabled automatic crash reporting for you.",
+    "Identification": "Identification",
+    "If untrusted, enter encryption password": "If untrusted, enter encryption password",
    "If you want to prevent other users on this computer from accessing Syncthing and through it your files, consider setting up authentication.": "If you want to prevent other users on this computer from accessing Syncthing and through it your files, consider setting up authentication.",
    "Ignore": "Ignoru",
    "Ignore Patterns": "Ignorantaj Ŝablonoj",
@@ -159,6 +184,8 @@
    "Latest Change": "Lasta Ŝanĝo",
    "Learn more": "Lerni pli",
    "Limit": "Limo",
+    "Listener Failures": "Listener Failures",
+    "Listener Status": "Listener Status",
    "Listeners": "Aŭskultantoj",
    "Loading data...": "Ŝarĝas datumojn...",
    "Loading...": "Ŝarĝas...",
@@ -187,6 +214,7 @@
    "No File Versioning": "Sen Dosiera Versionado",
    "No files will be deleted as a result of this operation.": "Neniuj dosieroj estos forigitaj rezulte de ĉi tiu ago.",
    "No upgrades": "Sen ĝisdatigoj",
+    "Not shared": "Not shared",
    "Notice": "Avizo",
    "OK": "Bone",
    "Off": "Malŝata",
@@ -196,6 +224,7 @@
    "Out of Sync": "Elsinkronigita",
    "Out of Sync Items": "Elsinkronigitaj Eroj",
    "Outgoing Rate Limit (KiB/s)": " Eliranta Rapideco Limo (KiB/s)",
+    "Override": "Override",
    "Override Changes": "Transpasi Ŝanĝojn",
    "Path": "Vojo",
    "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Vojo de la dosierujo en la loka komputilo. Kreiĝos se ne ekzistas. La tilda signo (~) povas esti uzata kiel mallongigilo por",
@@ -209,6 +238,7 @@
    "Periodic scanning at given interval and disabled watching for changes": "Perioda skanado ĉe donita intervalo kaj malebligita rigardado je ŝanĝoj",
    "Periodic scanning at given interval and enabled watching for changes": "Perioda skanado ĉe donita intervalo kaj ebligita rigardado je ŝanĝoj",
    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Perioda skanado ĉe donita intervalo kaj malsukcesis agordi rigardadon je ŝanĝoj. Provante denove ĉiuminute:",
+    "Permanently add it to the ignore list, suppressing further notifications.": "Permanently add it to the ignore list, suppressing further notifications.",
    "Permissions": "Permesoj",
    "Please consult the release notes before performing a major upgrade.": "Bonvolu konsulti la notojn de eldono antaŭ elfari ĉefan ĝisdatigon.",
    "Please set a GUI Authentication User and Password in the Settings dialog.": "Bonvolu agordi GUI Authentication Uzanto kaj Pasvorto en la agordoj dialogo.",
@@ -220,12 +250,15 @@
    "Preview Usage Report": "Antaŭrigardo Uzada Raporto",
    "Quick guide to supported patterns": "Rapida gvidilo pri subtenata ŝablonoj",
    "Random": "Hazarda",
+    "Receive Encrypted": "Receive Encrypted",
    "Receive Only": "Nur Ricevi",
+    "Received data is already encrypted": "Received data is already encrypted",
    "Recent Changes": "Lastatempaj Ŝanĝoj",
    "Reduced by ignore patterns": "Malpliigita per ignorantaj ŝablonoj",
    "Release Notes": "Notoj de Eldono",
    "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Kandidataj eldonoj enhavas la lastajn trajtojn kaj korektojn. Ili estas similaj al la tradiciaj dusemajnaj Syncthing eldonoj.",
    "Remote Devices": "Foraj Aparatoj",
+    "Remote GUI": "Remote GUI",
    "Remove": "Forigu",
    "Remove Device": "Forigi Aparaton",
    "Remove Folder": "Forigi Dosierujon",
@@ -241,6 +274,7 @@
    "Resume": "Daŭrigu",
    "Resume All": "Daŭrigu Ĉion",
    "Reused": "Reuzita",
+    "Revert": "Revert",
    "Revert Local Changes": "Reverti Lokajn Ŝangojn",
    "Save": "Konservu",
    "Scan Time Remaining": "Restanta Tempo de Skano",
@@ -249,6 +283,7 @@
    "Select All": "Elekti Ĉiujn",
    "Select a version": "Elekti version",
    "Select additional devices to share this folder with.": "Elektu pliajn aparatojn por komunigi tiun ĉi dosierujon kun ili.",
+    "Select additional folders to share with this device.": "Select additional folders to share with this device.",
    "Select latest version": "Elekti plej novan version",
    "Select oldest version": "Elekti plej malnovan version",
    "Select the folders to share with this device.": "Elekti la dosierujojn por komunigi kun ĉi tiu aparato.",
@@ -259,10 +294,13 @@
    "Share Folder": "Komunigu Dosierujon",
    "Share Folders With Device": "Dosierujoj Komunigitaj Kun Aparato",
    "Share this folder?": "Komunigi ĉi tiun dosierujon?",
+    "Shared Folders": "Shared Folders",
    "Shared With": "Komunigita Kun",
    "Sharing": "Komunigo",
    "Show ID": "Montru ID",
    "Show QR": "Montru QR",
+    "Show detailed discovery status": "Show detailed discovery status",
+    "Show detailed listener status": "Show detailed listener status",
    "Show diff with previous version": "Montri diferenco kun antaŭa versio",
    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Montrita anstataŭ ID de Aparato en la statuso de la grupo. Estos anoncita al aliaj aparatoj kiel laŭvola defaŭlta nomo.",
    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Montri anstataŭ ID de Aparato en la statuso de la grupo. Estos ĝisdatigita al la nomo de la aparato sciigante se ĝi estas lasita malplena.",
@@ -272,7 +310,9 @@
    "Single level wildcard (matches within a directory only)": "Ununivela ĵokero (egalas nur ene de dosierujo)",
    "Size": "Grandeco",
    "Smallest First": "Plej Malgranda Unue",
+    "Some discovery methods could not be established for finding other devices or announcing this device:": "Some discovery methods could not be established for finding other devices or announcing this device:",
    "Some items could not be restored:": "Iuj eroj ne povis esti restarigitaj:",
+    "Some listening addresses could not be enabled to accept connections:": "Some listening addresses could not be enabled to accept connections:",
    "Source Code": "Fontkodo",
    "Stable releases and release candidates": "Stabilaj eldonoj kaj kandidataj eldonoj",
    "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "Stabilaj eldonoj prokrastas je ĉirkaŭ du semjanoj. Dum tiu tempo ili estos testataj kiel kandidataj eldonoj.",
@@ -281,6 +321,7 @@
    "Start Browser": "Startu Retumilon",
    "Statistics": "Statistikoj",
    "Stopped": "Haltita",
+    "Stores and syncs only encrypted data. Folders on all connected devices need to be set up with the same password or be of type \"{%receiveEncrypted%}\" too.": "Stores and syncs only encrypted data. Folders on all connected devices need to be set up with the same password or be of type \"{{receiveEncrypted}}\" too.",
    "Support": "Subteno",
    "Support Bundle": "Pakaĵo por subteno",
    "Sync Protocol Listen Addresses": "Aŭskultado Adresoj de Sinkprotokolo",
@@ -288,6 +329,8 @@
    "Syncthing has been shut down.": "Syncthing estis malŝaltita.",
    "Syncthing includes the following software or portions thereof:": "Syncthing inkluzivas la jenajn programarojn aŭ porciojn ĝiajn:",
    "Syncthing is Free and Open Source Software licensed as MPL v2.0.": "Syncthing estas libera kaj malferma fonta programaro licencita kiel MPL v2.0.",
+    "Syncthing is listening on the following network addresses for connection attempts from other devices:": "Syncthing is listening on the following network addresses for connection attempts from other devices:",
+    "Syncthing is not listening for connection attempts from other devices on any address.  Only outgoing connections from this device may work.": "Syncthing is not listening for connection attempts from other devices on any address.  Only outgoing connections from this device may work.",
    "Syncthing is restarting.": "Syncthing estas restartanta.",
    "Syncthing is upgrading.": "Syncthing estas ĝisdatigita.",
    "Syncthing now supports automatically reporting crashes to the developers. This feature is enabled by default.": "Syncthing now supports automatically reporting crashes to the developers. This feature is enabled by default.",
@@ -306,10 +349,14 @@
    "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.": "La enigita aparato ID ne ŝajnas valida. Ĝi devas esti signoĉeno el 52 aŭ 56 karaktroj longa enhavanta leterojn kaj nombrojn, kun interspacoj kaj streketoj opciaj.",
    "The folder ID cannot be blank.": "La dosierujo ID ne povas esti malplena.",
    "The folder ID must be unique.": "La dosierujo ID devas esti unika.",
+    "The folder content on other devices will be overwritten to become identical with this device. Files not present here will be deleted on other devices.": "The folder content on other devices will be overwritten to become identical with this device. Files not present here will be deleted on other devices.",
+    "The folder content on this device will be overwritten to become identical with other devices. Files newly added here will be deleted.": "The folder content on this device will be overwritten to become identical with other devices. Files newly added here will be deleted.",
    "The folder path cannot be blank.": "La vojo de dosierujo ne povas esti malplena.",
    "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.": "La jenaj intervaloj estas uzataj: dum la unua horo version restas dum ĉiuj 30 sekundoj, dum la unua tago versio restas konservita dum ĉiu horo, dum la unuaj 30 tagoj versio estas konservita dum ĉiu tago, ĝis la maksimume aĝa versio restas konservita dum ĉiu semajno.",
    "The following items could not be synchronized.": "La sekvantaj eroj ne povas esti sinkronigitaj.",
    "The following items were changed locally.": "La sekvantaj eroj estis ŝanĝitaj loke.",
+    "The following methods are used to discover other devices on the network and announce this device to be found by others:": "The following methods are used to discover other devices on the network and announce this device to be found by others:",
+    "The following unexpected items were found.": "The following unexpected items were found.",
    "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 maximum age must be a number and cannot be blank.": "La maksimuma aĝo devas esti nombro kaj ne povas esti malplena.",
@@ -322,9 +369,11 @@
    "The rate limit must be a non-negative number (0: no limit)": "La rapideca limo devas esti pozitiva nombro (0: senlimo)",
    "The rescan interval must be a non-negative number of seconds.": "La intervalo de reskano devas esti pozitiva nombro da sekundoj.",
    "There are no devices to share this folder with.": "Estas neniu aparato kun kiu komunigi tiun ĉi dosierujon.",
+    "There are no folders to share with this device.": "There are no folders to share with this device.",
    "They are retried automatically and will be synced when the error is resolved.": "Ili estas reprovitaj aŭtomate kaj estos sinkronigitaj kiam la eraro estas solvita.",
    "This Device": "Ĉi Tiu Aparato",
    "This can easily give hackers access to read and change any files on your computer.": "Ĉi tio povas facile doni al kodumuloj atingon por legi kaj ŝanĝi ajnajn dosierojn en via komputilo.",
+    "This device cannot automatically discover other devices or announce its own address to be found by others.  Only devices with statically configured addresses can connect.": "This device cannot automatically discover other devices or announce its own address to be found by others.  Only devices with statically configured addresses can connect.",
    "This is a major version upgrade.": "Ĉi tio estas ĉefversio ĝisdatigita.",
    "This setting controls the free space required on the home (i.e., index database) disk.": "Ĉi tiu agordo regas la libera spaco postulita sur la hejma (t.e. indeksa datumbaza) disko.",
    "Time": "Tempo",
@@ -335,10 +384,14 @@
    "Unavailable": "Ne disponebla",
    "Unavailable/Disabled by administrator or maintainer": "Ne disponebla/Malebligita de administranto aŭ subtenanto",
    "Undecided (will prompt)": "Hezitema (demandos)",
+    "Unexpected Items": "Unexpected Items",
+    "Unexpected items have been found in this folder.": "Unexpected items have been found in this folder.",
    "Unignore": "Malignoru",
    "Unknown": "Nekonata",
    "Unshared": "Nekomunigita",
    "Unshared Devices": "Malkomunigitaj aparatoj",
+    "Unshared Folders": "Unshared Folders",
+    "Untrusted": "Untrusted",
    "Up to Date": "Ĝisdata",
    "Updated": "Ĝisdatigita",
    "Upgrade": "Altgradigo",
@@ -348,6 +401,7 @@
    "Uptime": "Daŭro de funkciado",
    "Usage reporting is always enabled for candidate releases.": "Uzada raportado ĉiam ŝaltita por kandidataj eldonoj.",
    "Use HTTPS for GUI": "Uzi HTTPS por grafika interfaco.",
+    "Use notifications from the filesystem to detect changed items.": "Uzi sciigoj de la dosiersistemo por detekti ŝanĝitajn erojn.",
    "Username/Password has not been set for the GUI authentication. Please consider setting it up.": "Username/Password has not been set for the GUI authentication. Please consider setting it up.",
    "Version": "Versio",
    "Versions": "Versioj",
@@ -356,6 +410,7 @@
    "Waiting to Clean": "Waiting to Clean",
    "Waiting to Scan": "Atendante skanadon",
    "Waiting to Sync": "Atendante sinkronigadon",
+    "Warning": "Warning",
    "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "Averto, ĉi tiu vojo estas parenta dosierujo de ekzistanta dosierujo \"{{otherFolder}}\".",
    "Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Averto, ĉi tiu vojo estas parenta dosierujo de ekzistanta dosierujo \"{{otherFolderLabel}}\" ({{otherFolder}}).",
    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Averto, ĉi tiu vojo estas subdosierujo de ekzistanta dosierujo \"{{otherFolder}}\".",
@@ -374,12 +429,14 @@
    "You have no ignored folders.": "Vi havas neniujn ignoritajn dosierujojn.",
    "You have unsaved changes. Do you really want to discard them?": "Vi havas ne konservitaj ŝanĝoj. Ĉu vi vere volas forĵeti ilin?",
    "You must keep at least one version.": "Vi devas konservi almenaŭ unu version.",
+    "You should never add or change anything locally in a \"{%receiveEncrypted%}\" folder.": "You should never add or change anything locally in a \"{{receiveEncrypted}}\" folder.",
    "days": "tagoj",
-    "directories": "directories",
+    "directories": "dosierujoj",
    "files": "dosieroj",
    "full documentation": "tuta dokumentado",
    "items": "eroj",
    "seconds": "seconds",
    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} volas komunigi dosierujon \"{{folder}}\".",
-    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} volas komunigi dosierujon \"{{folderlabel}}\" ({{folder}})."
+    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} volas komunigi dosierujon \"{{folderlabel}}\" ({{folder}}).",
+    "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} might reintroduce this device."
 }
--- a/gui/default/assets/lang/lang-es-ES.json
+++ b/gui/default/assets/lang/lang-es-ES.json
@@ -18,16 +18,21 @@
    "Advanced": "Avanzado",
    "Advanced Configuration": "Configuración Avanzada",
    "All Data": "Todos los datos",
+    "All folders shared with this device must be protected by a password, such that all sent data is unreadable without the given password.": "Todos las carpetas compartidas con este equipo deben ser protegidas con una contraseña, de manera que todos los datos enviados sean ilegibles sin la contraseña dada.",
    "Allow Anonymous Usage Reporting?": "¿Deseas permitir el envío anónimo de informes de uso?",
    "Allowed Networks": "Redes permitidas",
    "Alphabetic": "Alfabético",
    "An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.": "Un comando externo maneja el versionado. Tiene que eliminar el fichero de la carpeta compartida. Si la ruta a la aplicación contiene espacios, hay que escribirla entre comillas.",
    "Anonymous Usage Reporting": "Informe anónimo de uso",
    "Anonymous usage report format has changed. Would you like to move to the new format?": "El formato del informe anónimo de uso ha cambiado. ¿Quieres cambiar al nuevo formato?",
+    "Are you sure you want to continue?": "Are you sure you want to continue?",
+    "Are you sure you want to override all remote changes?": "Are you sure you want to override all remote changes?",
+    "Are you sure you want to permanently delete all these files?": "¿Esta seguro(a) de que desea eliminar permanentemente todos estos archivos?",
    "Are you sure you want to remove device {%name%}?": "¿Estás seguro de que quieres quitar el dispositivo {{name}}?",
    "Are you sure you want to remove folder {%label%}?": "¿Estás seguro de que quieres quitar la carpeta {{label}}?",
    "Are you sure you want to restore {%count%} files?": "¿Estás seguro de que quieres restaurar {{count}} ficheros?",
-    "Are you sure you want to upgrade?": "Are you sure you want to upgrade?",
+    "Are you sure you want to revert all local changes?": "Are you sure you want to revert all local changes?",
+    "Are you sure you want to upgrade?": "¿Está seguro(a) de que desea actualizar?",
    "Auto Accept": "Auto aceptar",
    "Automatic Crash Reporting": "Informe automático de errores",
    "Automatic upgrade now offers the choice between stable releases and release candidates.": "Ahora la actualización automática permite elegir entre versiones estables o versiones candidatas.",
@@ -37,17 +42,19 @@
    "Available debug logging facilities:": "Ayudas disponibles para la depuración del registro:",
    "Be careful!": "¡Ten cuidado!",
    "Bugs": "Errores",
+    "Cancel": "Cancel",
    "Changelog": "Registro de cambios",
    "Clean out after": "Limpiar tras",
-    "Cleaning Versions": "Cleaning Versions",
-    "Cleanup Interval": "Cleanup Interval",
+    "Cleaning Versions": "Limpiando Versiones",
+    "Cleanup Interval": "Intervalo de Limpieza",
    "Click to see discovery failures": "Clica para ver fallos de descubrimiento.",
+    "Click to see full identification string and QR code.": "Click to see full identification string and QR code.",
    "Close": "Cerrar",
    "Command": "Acción",
    "Comment, when used at the start of a line": "Comentar, cuando se usa al comienzo de una línea",
    "Compression": "Compresión",
    "Configured": "Configurado",
-    "Connected (Unused)": "Connected (Unused)",
+    "Connected (Unused)": "Conectado (Sin uso)",
    "Connection Error": "Error de conexión",
    "Connection Type": "Tipo de conexión",
    "Connections": "Conexiones",
@@ -56,18 +63,26 @@
    "Copied from original": "Copiado del original",
    "Copyright © 2014-2019 the following Contributors:": "Copyright © 2014-2019 los siguientes Colaboradores:",
    "Creating ignore patterns, overwriting an existing file at {%path%}.": "Crear patrones a ignorar, sobreescribiendo un fichero existente en {{path}}.",
-    "Currently Shared With Devices": "Currently Shared With Devices",
+    "Currently Shared With Devices": "Actualmente Compartida Con Los Equipos",
    "Danger!": "¡Peligro!",
    "Debugging Facilities": "Ayudas a la depuración",
+    "Default Configuration": "Configuración Por Defecto",
+    "Default Device": "Equipo Por Defecto",
+    "Default Folder": "Carpeta Por Defecto",
    "Default Folder Path": "Ruta de la carpeta por defecto",
+    "Defaults": "Valores Por Defecto",
+    "Delete": "Eliminar",
+    "Delete Unexpected Items": "Borrar Elementos Inesperados",
    "Deleted": "Eliminado",
    "Deselect All": "Deseleccionar Todo",
-    "Deselect devices to stop sharing this folder with.": "Deselect devices to stop sharing this folder with.",
+    "Deselect devices to stop sharing this folder with.": "Deseleccione los equipos con los cuales dejar de compartir esta carpeta.",
+    "Deselect folders to stop sharing with this device.": "Deseleccione las carpetas para dejar de compartir con este equipo.",
    "Device": "Dispositivo",
    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "El dispositivo \"{{name}}\" ({{device}} en la dirección {{address}}) quiere conectarse. Añadir nuevo dispositivo?",
    "Device ID": "ID del Dispositivo",
    "Device Identification": "Identificación del Dispositivo",
    "Device Name": "Nombre del Dispositivo",
+    "Device is untrusted, enter encryption password": "Se desconfía del equipo, ingrese la contraseña de cifrado.",
    "Device rate limits": "Límites de la tasa del dispositivo",
    "Device that last modified the item": "Último dispositivo que cambió el objeto",
    "Devices": "Dispositivos",
@@ -76,13 +91,16 @@
    "Disabled periodic scanning and disabled watching for changes": "Desactivados el escaneo periódico y la vigilancia de cambios",
    "Disabled periodic scanning and enabled watching for changes": "Desactivado el escaneo periódico y activada la vigilancia de cambios",
    "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Desactivado el escaneo periódico y falló la activación de la vigilancia de cambios, reintentando cada 1 minuto:",
-    "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).",
+    "Disables comparing and syncing file permissions. Useful on systems with nonexistent or custom permissions (e.g. FAT, exFAT, Synology, Android).": "Desactiva la comparación y sincronización de los permisos de los archivos. Útil en sistemas con permisos inexistentes o personalizados (por ejemplo, FAT, exFAT, Synology, Android).",
    "Discard": "Descartar",
    "Disconnected": "Desconectado",
-    "Disconnected (Unused)": "Disconnected (Unused)",
+    "Disconnected (Unused)": "Desconectado (Sin uso)",
    "Discovered": "Descubierto",
    "Discovery": "Descubrimiento",
    "Discovery Failures": "Fallos de Descubrimiento",
+    "Discovery Status": "Discovery Status",
+    "Dismiss": "Dismiss",
+    "Do not add it to the ignore list, so this notification may recur.": "Do not add it to the ignore list, so this notification may recur.",
    "Do not restore": "No restaurar",
    "Do not restore all": "No restaurar todo",
    "Do you want to enable watching for changes for all your folders?": "Quieres activar la vigilancia de cambios para todas tus carpetas?",
@@ -91,8 +109,10 @@
    "Downloaded": "Descargado",
    "Downloading": "Descargando",
    "Edit": "Editar",
-    "Edit Device": "Edit Device",
-    "Edit Folder": "Edit Folder",
+    "Edit Device": "Editar Equipo",
+    "Edit Device Defaults": "Editar Valores Por Defecto del Equipo",
+    "Edit Folder": "Editar Carpeta",
+    "Edit Folder Defaults": "Editar Valores Por Defecto de la Carpeta",
    "Editing {%path%}.": "Editando {{path}}.",
    "Enable Crash Reporting": "Permitir informe de errores",
    "Enable NAT traversal": "Permitir NAT transversal",
@@ -102,10 +122,11 @@
    "Enter a non-privileged port number (1024 - 65535).": "Introduce un puerto sin privilegios (1024 - 65535).",
    "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Introducir direcciones separadas por coma (\"tcp://ip:port\", \"tcp://host:port\") o dinámicas para realizar el descubrimiento automático de la dirección.",
    "Enter ignore patterns, one per line.": "Introducir patrones a ignorar, uno por línea.",
-    "Enter up to three octal digits.": "Enter up to three octal digits.",
+    "Enter up to three octal digits.": "Ingrese hasta tres dígitos octales.",
    "Error": "Error",
    "External File Versioning": "Versionado externo de fichero",
    "Failed Items": "Elementos fallidos",
+    "Failed to load ignore patterns.": "Failed to load ignore patterns.",
    "Failed to setup, retrying": "Fallo al configurar, reintentando",
    "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Se espera un fallo al conectar a los servidores IPv6 si no hay conectividad IPv6.",
    "File Pull Order": "Orden de obtención de los ficheros",
@@ -122,13 +143,15 @@
    "Folder Label": "Etiqueta de la Carpeta",
    "Folder Path": "Ruta de la carpeta",
    "Folder Type": "Tipo de carpeta",
+    "Folder type \"{%receiveEncrypted%}\" can only be set when adding a new folder.": "Folder type \"{{receiveEncrypted}}\" can only be set when adding a new folder.",
+    "Folder type \"{%receiveEncrypted%}\" cannot be changed after adding the folder. You need to remove the folder, delete or decrypt the data on disk, and add the folder again.": "El tipo de carpeta \"{{receiveEncrypted}}\" no se puede cambiar después de añadir la carpeta. Es necesario eliminar la carpeta, borrar o descifrar los datos en el disco y volver a añadir la carpeta.",
    "Folders": "Carpetas",
    "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "Para las siguientes carpetas ocurrió un error cuando se empezó a vigilar los cambios. Se reintentará cada minuto, así que puede ser que los errores desaparezcan pronto. Si persisten, intenta solucionar el problema subyacente y pide ayuda en el caso de que no puedas.",
    "Full Rescan Interval (s)": "Intervalo para el reescaneo completo (s)",
    "GUI": "GUI",
    "GUI Authentication Password": "Password de la Interfaz Gráfica de Usuario (GUI)",
    "GUI Authentication User": "Autentificación de usuario de la Interfaz Gráfica de Usuario (GUI)",
-    "GUI Authentication: Set User and Password": "GUI Authentication: Set User and Password",
+    "GUI Authentication: Set User and Password": "Autenticación de la GUI: Establezca el Usuario y la Contraseña.",
    "GUI Listen Address": "Dirección de Escucha del GUI.",
    "GUI Theme": "Tema GUI",
    "General": "General",
@@ -139,7 +162,9 @@
    "Help": "Ayuda",
    "Home page": "Página de inicio",
    "However, your current settings indicate you might not want it enabled. We have disabled automatic crash reporting for you.": "Sin embargo, su configuración actual indica que puede no querer habilitarlo. Hemos deshabilitado el informe automático de errores por usted.",
-    "If you want to prevent other users on this computer from accessing Syncthing and through it your files, consider setting up authentication.": "If you want to prevent other users on this computer from accessing Syncthing and through it your files, consider setting up authentication.",
+    "Identification": "Identification",
+    "If untrusted, enter encryption password": "Si no es de confianza, ingrese la contraseña de cifrado.",
+    "If you want to prevent other users on this computer from accessing Syncthing and through it your files, consider setting up authentication.": "Si quiere impedirle a otros usuarios de esta computadora acceder a Syncthing y, a través de este, a sus archivos, considere establecer la autenticación.",
    "Ignore": "Ignorar",
    "Ignore Patterns": "Patrones a ignorar",
    "Ignore Permissions": "Permisos a ignorar",
@@ -159,10 +184,12 @@
    "Latest Change": "Último Cambio",
    "Learn more": "Saber más",
    "Limit": "Límite",
+    "Listener Failures": "Listener Failures",
+    "Listener Status": "Listener Status",
    "Listeners": "Oyentes",
    "Loading data...": "Cargando datos...",
    "Loading...": "Cargando...",
-    "Local Additions": "Local Additions",
+    "Local Additions": "Adiciones Locales",
    "Local Discovery": "Descubrimiento local",
    "Local State": "Estado local",
    "Local State (Total)": "Estado Local (Total)",
@@ -187,6 +214,7 @@
    "No File Versioning": "Sin versionado de fichero",
    "No files will be deleted as a result of this operation.": "No se borraron ficheros como resultado de esta operación",
    "No upgrades": "Sin actualizaciones",
+    "Not shared": "No compartida",
    "Notice": "Aviso",
    "OK": "OK",
    "Off": "Desconectar",
@@ -196,6 +224,7 @@
    "Out of Sync": "No sincronizado",
    "Out of Sync Items": "Elementos no sincronizados",
    "Outgoing Rate Limit (KiB/s)": "Límite de subida (KiB/s)",
+    "Override": "Override",
    "Override Changes": "Anular cambios",
    "Path": "Parche",
    "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Ruta a la carpeta en la máquina local. Se creará si no existe. El carácter de la tilde (~) puede usarse como atajo.",
@@ -204,28 +233,32 @@
    "Pause": "Pausar",
    "Pause All": "Pausar todo",
    "Paused": "Pausado",
-    "Paused (Unused)": "Paused (Unused)",
+    "Paused (Unused)": "Pausado(a) (Sin uso)",
    "Pending changes": "Cambios pendientes",
    "Periodic scanning at given interval and disabled watching for changes": "Escaneo periódico en un intervalo determinado y desactivada la vigilancia de cambios",
    "Periodic scanning at given interval and enabled watching for changes": "Escaneo periódico en un intervalo determinado y activada la vigilancia de cambios",
    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Escaneo periódico en un intervalo determinado y falló la configuración de la vigilancia de cambios, se reintentará cada 1 minuto:",
+    "Permanently add it to the ignore list, suppressing further notifications.": "Permanently add it to the ignore list, suppressing further notifications.",
    "Permissions": "Permisos",
    "Please consult the release notes before performing a major upgrade.": "Por favor, consultar las notas de la versión antes de realizar una actualización importante.",
    "Please set a GUI Authentication User and Password in the Settings dialog.": "Por favor, introduzca un Usuario y Contraseña para la Autenticación de la Interfaz de Usuario en el panel de Ajustes.",
    "Please wait": "Por favor, espere",
    "Prefix indicating that the file can be deleted if preventing directory removal": "El prefijo indica que el fichero puede ser borrado si se previene la eliminación de directorios",
    "Prefix indicating that the pattern should be matched without case sensitivity": "El prefijo indica que el patrón se comparará sin tener en cuenta las mayúsculas",
-    "Preparing to Sync": "Preparing to Sync",
+    "Preparing to Sync": "Preparándose para Sincronizar",
    "Preview": "Vista previa",
    "Preview Usage Report": "Informe de uso de vista previa",
    "Quick guide to supported patterns": "Guía rápida de patrones soportados",
    "Random": "Aleatorio",
+    "Receive Encrypted": "Recibir Cifrado",
    "Receive Only": "Solo recibir",
+    "Received data is already encrypted": "Los datos recibidos ya están cifrados",
    "Recent Changes": "Cambios recientes",
    "Reduced by ignore patterns": "Reducido por patrones de ignorar",
    "Release Notes": "Notas de la versión",
    "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Las versiones candidatas contienen las últimas funcionalidades y correcciones. Son similares a las tradicionales versiones bisemanales de Syncthing.",
    "Remote Devices": "Otros dispositivos",
+    "Remote GUI": "GUI Remota",
    "Remove": "Eliminar",
    "Remove Device": "Quitar dispositivo",
    "Remove Folder": "Quitar carpeta",
@@ -241,6 +274,7 @@
    "Resume": "Continuar",
    "Resume All": "Continuar todo",
    "Reused": "Reutilizado",
+    "Revert": "Revert",
    "Revert Local Changes": "Revertir los cambios locales",
    "Save": "Guardar",
    "Scan Time Remaining": "Tiempo Restante de Escaneo",
@@ -248,7 +282,8 @@
    "See external versioning help for supported templated command line parameters.": "Consultar la ayuda externa del versionado para ver las plantillas de los parámetros de línea de comandos",
    "Select All": "Seleccionar Todo",
    "Select a version": "Selecciona una versión",
-    "Select additional devices to share this folder with.": "Select additional devices to share this folder with.",
+    "Select additional devices to share this folder with.": "Seleccione equipos adicionales con los cuales compartir esta carpeta",
+    "Select additional folders to share with this device.": "Seleccione carpetas adicionales para compartir con este equipo.",
    "Select latest version": "Selecciona la última versión",
    "Select oldest version": "Selecciona la versión más antigua",
    "Select the folders to share with this device.": "Selecciona las carpetas para compartir con este dispositivo.",
@@ -259,10 +294,13 @@
    "Share Folder": "Compartir carpeta",
    "Share Folders With Device": "Compartir carpetas con dispositivo",
    "Share this folder?": "¿Deseas compartir esta carpeta?",
+    "Shared Folders": "Carpetas Compartidas",
    "Shared With": "Compartir con",
    "Sharing": "Compartiendo",
    "Show ID": "Mostrar ID",
    "Show QR": "Mostrar QR",
+    "Show detailed discovery status": "Show detailed discovery status",
+    "Show detailed listener status": "Show detailed listener status",
    "Show diff with previous version": "Muestra las diferencias con la versión previa",
    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Se muestra en lugar del ID del dispositivo en el estado del grupo (cluster). Se notificará a los otros dispositivos como nombre opcional por defecto.",
    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Se muestra en lugar del ID del dispositivo en el estado del grupo (cluster). Se actualizará al nombre que el dispositivo anuncia si se deja vacío.",
@@ -272,7 +310,9 @@
    "Single level wildcard (matches within a directory only)": "Comodín de nivel único (coincide solamente dentro de un directorio)",
    "Size": "Tamaño",
    "Smallest First": "El más pequeño primero",
+    "Some discovery methods could not be established for finding other devices or announcing this device:": "Some discovery methods could not be established for finding other devices or announcing this device:",
    "Some items could not be restored:": "Algunos ítems no se pudieron restaurar:",
+    "Some listening addresses could not be enabled to accept connections:": "Some listening addresses could not be enabled to accept connections:",
    "Source Code": "Código fuente",
    "Stable releases and release candidates": "Versiones estables y versiones candidatas",
    "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "Las versiones estables son publicadas cada dos semanas. Durante este tiempo son probadas como versiones candidatas.",
@@ -281,6 +321,7 @@
    "Start Browser": "Iniciar el navegador",
    "Statistics": "Estadísticas",
    "Stopped": "Detenido",
+    "Stores and syncs only encrypted data. Folders on all connected devices need to be set up with the same password or be of type \"{%receiveEncrypted%}\" too.": "Solo almacena y sincroniza datos cifrados. Las carpetas de todos los equipos conectados tienen que ser configuradas con la misma contraseña o ser del tipo \"{{receiveEncrypted}}\" también.",
    "Support": "Forum",
    "Support Bundle": "Lote de Soporte",
    "Sync Protocol Listen Addresses": "Direcciones de escucha del protocolo de sincronización",
@@ -288,6 +329,8 @@
    "Syncthing has been shut down.": "Syncthing se ha detenido.",
    "Syncthing includes the following software or portions thereof:": "Syncthing incluye el siguiente software o partes de él:",
    "Syncthing is Free and Open Source Software licensed as MPL v2.0.": "Syncthing es Software Gratuito y Open Source Software licenciado como MPL v2.0.",
+    "Syncthing is listening on the following network addresses for connection attempts from other devices:": "Syncthing is listening on the following network addresses for connection attempts from other devices:",
+    "Syncthing is not listening for connection attempts from other devices on any address.  Only outgoing connections from this device may work.": "Syncthing is not listening for connection attempts from other devices on any address.  Only outgoing connections from this device may work.",
    "Syncthing is restarting.": "Syncthing se está reiniciando.",
    "Syncthing is upgrading.": "Syncthing se está actualizando.",
    "Syncthing now supports automatically reporting crashes to the developers. This feature is enabled by default.": "Syncthing ahora permite el informe automático de errores a los desarrolladores. Esta característica está activada por defecto.",
@@ -295,10 +338,10 @@
    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing tiene problemas para procesar tu solicitud. Por favor, actualiza la página o reinicia Syncthing si el problema persiste.",
    "Take me back": "Llévame atrás",
    "The GUI address is overridden by startup options. Changes here will not take effect while the override is in place.": "La dirección del GUI es sobreescrita por las opciones de arranque. Los cambios de aquí no tendrán efecto mientras la sobreescritura esté activa.",
-    "The Syncthing Authors": "The Syncthing Authors",
+    "The Syncthing Authors": "Los Autores de Syncthing",
    "The Syncthing admin interface is configured to allow remote access without a password.": "El panel de administración de Syncthing está configurado para permitir el acceso remoto sin contraseña.",
    "The aggregated statistics are publicly available at the URL below.": "Las estadísticas agragadas están disponibles públicamente en la URL de abajo.",
-    "The cleanup interval cannot be blank.": "The cleanup interval cannot be blank.",
+    "The cleanup interval cannot be blank.": "El intervalo de limpieza no puede ser nulo.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "La configuración ha sido grabada pero no activada. Syncthing debe reiniciarse para activar la nueva configuración.",
    "The device ID cannot be blank.": "La ID del dispositivo no puede estar vacía.",
    "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).": "El ID del dispositivo que hay que introducir aquí se puede encontrar en el diálogo \"Acciones > Mostrar ID\" en el otro dispositivo. Los espacios y las barras son opcionales (ignorados).",
@@ -306,12 +349,16 @@
    "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.": "La ID del dispositivo introducida no parece válida. Debe ser una cadena de 52 ó 56 caracteres formada por letras y números, con espacios y guiones opcionales.",
    "The folder ID cannot be blank.": "La ID de la carpeta no puede estar vacía.",
    "The folder ID must be unique.": "La ID de la carpeta debe ser única.",
+    "The folder content on other devices will be overwritten to become identical with this device. Files not present here will be deleted on other devices.": "The folder content on other devices will be overwritten to become identical with this device. Files not present here will be deleted on other devices.",
+    "The folder content on this device will be overwritten to become identical with other devices. Files newly added here will be deleted.": "The folder content on this device will be overwritten to become identical with other devices. Files newly added here will be deleted.",
    "The folder path cannot be blank.": "La ruta de la carpeta no puede estar en blanco.",
    "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.": "Se utilizan los siguientes intervalos: para la primera hora se mantiene una versión cada 30 segundos, para el primer día se mantiene una versión cada hora, para los primeros 30 días se mantiene una versión diaria hasta la edad máxima de una semana.",
    "The following items could not be synchronized.": "Los siguientes elementos no pueden ser sincronizados.",
    "The following items were changed locally.": "Los siguientes ítems fueron cambiados localmente.",
-    "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 following methods are used to discover other devices on the network and announce this device to be found by others:": "The following methods are used to discover other devices on the network and announce this device to be found by others:",
+    "The following unexpected items were found.": "Los siguientes elementos inesperados fueron encontrados.",
+    "The interval must be a positive number of seconds.": "El intervalo debe ser un número positivo de segundos.",
+    "The interval, in seconds, for running cleanup in the versions directory. Zero to disable periodic cleaning.": "El intervalo, en segundos, para realizar la limpieza del directorio de versiones. Cero para desactivar la limpieza periódica.",
    "The maximum age must be a number and cannot be blank.": "La edad máxima debe ser un número y no puede estar vacía.",
    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "El tiempo máximo para mantener una versión en días (introducir 0 para mantener las versiones indefinidamente).",
    "The number of days must be a number and cannot be blank.": "El número de días debe ser un número y no puede estar en blanco.",
@@ -321,24 +368,30 @@
    "The path cannot be blank.": "La ruta no puede estar vacía.",
    "The rate limit must be a non-negative number (0: no limit)": "El límite de velocidad debe ser un número no negativo (0: sin límite)",
    "The rescan interval must be a non-negative number of seconds.": "El intervalo de actualización debe ser un número positivo de segundos.",
-    "There are no devices to share this folder with.": "There are no devices to share this folder with.",
+    "There are no devices to share this folder with.": "No hay equipos con los cuales compartir esta carpeta.",
+    "There are no folders to share with this device.": "No hay carpetas para compartir con este equipo.",
    "They are retried automatically and will be synced when the error is resolved.": "Se reintentarán de forma automática y se sincronizarán cuando se resuelva el error.",
    "This Device": "Este Dispositivo",
    "This can easily give hackers access to read and change any files on your computer.": "Esto podría permitir fácilmente el acceso a hackers para leer y modificar cualquier fichero de tu equipo.",
+    "This device cannot automatically discover other devices or announce its own address to be found by others.  Only devices with statically configured addresses can connect.": "This device cannot automatically discover other devices or announce its own address to be found by others.  Only devices with statically configured addresses can connect.",
    "This is a major version upgrade.": "Hay una actualización importante.",
    "This setting controls the free space required on the home (i.e., index database) disk.": "Este ajuste controla el espacio libre necesario en el disco principal (por ejemplo, el índice de la base de datos).",
    "Time": "Hora",
    "Time the item was last modified": "Tiempo en el que se modificó el ítem por última vez",
    "Trash Can File Versioning": "Versionado de archivos de la papelera",
    "Type": "Tipo",
-    "UNIX Permissions": "UNIX Permissions",
+    "UNIX Permissions": "Permisos de UNIX",
    "Unavailable": "No disponible",
    "Unavailable/Disabled by administrator or maintainer": "No disponible/Desactivado por el administrador o el mantenedor",
    "Undecided (will prompt)": "Aún no decidido (se preguntará al usuario)",
+    "Unexpected Items": "Elementos Inesperados",
+    "Unexpected items have been found in this folder.": "Se han encontrado Elementos Inesperados en esta carpeta.",
    "Unignore": "Designorar",
    "Unknown": "Desconocido",
    "Unshared": "No compartido",
-    "Unshared Devices": "Unshared Devices",
+    "Unshared Devices": "Equipos no Compartidos",
+    "Unshared Folders": "Carpetas no Compartidas",
+    "Untrusted": "No Confiable",
    "Up to Date": "Actualizado",
    "Updated": "Actualizado",
    "Upgrade": "Actualizar",
@@ -348,14 +401,16 @@
    "Uptime": "Tiempo de funcionamiento",
    "Usage reporting is always enabled for candidate releases.": "El informe de uso está siempre habilitado en las versiones candidatas.",
    "Use HTTPS for GUI": "Usar HTTPS para la Interfaz Gráfica de Usuario (GUI)",
-    "Username/Password has not been set for the GUI authentication. Please consider setting it up.": "Username/Password has not been set for the GUI authentication. Please consider setting it up.",
+    "Use notifications from the filesystem to detect changed items.": "Usar notificaciones del sistema de ficheros para detectar los ítems cambiados.",
+    "Username/Password has not been set for the GUI authentication. Please consider setting it up.": "Usuario/Contraseña no establecida para la autenticación de la GUI. Por favor, considere establecerla.",
    "Version": "Versión",
    "Versions": "Versiones",
    "Versions Path": "Ruta de las versiones",
    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Las versiones se borran automáticamente si son más antiguas que la edad máxima o exceden el número de ficheros permitidos en un intervalo.",
-    "Waiting to Clean": "Waiting to Clean",
-    "Waiting to Scan": "Waiting to Scan",
-    "Waiting to Sync": "Waiting to Sync",
+    "Waiting to Clean": "Esperando para Limpiar",
+    "Waiting to Scan": "Esperando para Escanear",
+    "Waiting to Sync": "Esperando para Sincronizar",
+    "Warning": "Warning",
    "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "¡Peligro! Esta ruta es un directorio principal de la carpeta ya existente \"{{otherFolder}}\".",
    "Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "'Peligro! Esta ruta es un subdirectorio de la carpeta ya existente \"{{otherFolderLabel}}\"  ({{otherFolder}}).",
    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Peligro! Esta ruta es un subdirectorio de una carpeta ya existente llamada \"{{otherFolder}}\".",
@@ -374,12 +429,14 @@
    "You have no ignored folders.": "No tienes carpetas ignoradas.",
    "You have unsaved changes. Do you really want to discard them?": "Tienes cambios sin guardar. ¿Quieres descartarlos?",
    "You must keep at least one version.": "Debes mantener al menos una versión.",
+    "You should never add or change anything locally in a \"{%receiveEncrypted%}\" folder.": "Nunca debe agregar o cambiar nada localmente en una carpeta \"{{receiveEncrypted}}\".",
    "days": "días",
-    "directories": "directories",
+    "directories": "directorios",
    "files": "archivos",
    "full documentation": "Documentación completa",
    "items": "Elementos",
-    "seconds": "seconds",
+    "seconds": "segundos",
    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} quiere compartir la carpeta \"{{folder}}\".",
-    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} quiere compartir la carpeta \"{{folderlabel}}\" ({{folder}})."
+    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} quiere compartir la carpeta \"{{folderlabel}}\" ({{folder}}).",
+    "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} puede reintroducir este equipo."
 }
--- a/Show More
+++ b/Show More