gui: Package attribution and copyright bumps (fixes #3861 )

GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3863
gui, man: Update docs & translations
2025-12-24 06:28:10 -05:00 · 2017-01-10 07:50:11 +00:00 · 2017-01-10 08:41:14 +01:00 · 2017-01-10 07:09:31 +00:00 · 2017-01-07 17:05:30 +00:00 · 2017-01-07 17:56:46 +01:00
1192 changed files with 376193 additions and 71988 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ stdiscosrv.exe
 *.tar.gz
 *.zip
 *.asc
+*.deb
 .jshintrc
 coverage.out
 files/pidx
@@ -15,3 +16,4 @@ syncthing.sig
 RELEASE
 deb
 lib/auto/gui.files.go
+snapcraft.yaml
--- a/16
+++ b/16
@@ -6,13 +6,15 @@
 # The NICKS list is auto generated from this file.

 Aaron Bieber (qbit) <qbit@deftly.net>
-Adam Piggott (simplypeachy) <aD@simplypeachy.co.uk> <simplypeachy@users.noreply.github.com>
+Adam Piggott (ProactiveServices) <aD@simplypeachy.co.uk> <simplypeachy@users.noreply.github.com> <ProactiveServices@users.noreply.github.com>
+Adel Qalieh (adelq) <aqalieh95@gmail.com> <adelq@users.noreply.github.com>
 Alessandro G. (alessandro.g89) <alessandro.g89@gmail.com>
 Alexander Graf (alex2108) <register-github@alex-graf.de>
 Alexandre Viau (aviau) <alexandre@alexandreviau.net> <aviau@debian.org>
 Anderson Mesquita (andersonvom) <andersonvom@gmail.com>
 Andrew Dunham (andrew-d) <andrew@du.nham.ca>
 Andrey D (scienmind) <scintertech@cryptolab.net>
+Antoine Lamielle (0x010C) <antoine.lamielle@0x010c.fr> <gh@0x010c.fr>
 Antony Male (canton7) <antony.male@gmail.com>
 Arthur Axel fREW Schmidt (frioux) <frew@afoolishmanifesto.com> <frioux@gmail.com>
 Audrius Butkevicius (AudriusButkevicius) <audrius.butkevicius@gmail.com>
@@ -47,10 +49,11 @@ Felix Unterpaintner (bigbear2nd) <bigbear2nd@gmail.com>
 Francois-Xavier Gsell (zukoo) <fxgsell@gmail.com>
 Frank Isemann (fti7) <frank@isemann.name>
 Gilli Sigurdsson (gillisig) <gilli@vx.is>
+Heiko Zuerker (Smiley73) <heiko@zuerker.org>
 Jaakko Hannikainen (jgke) <jgke@jgke.fi>
 Jacek Szafarkiewicz (hadogenes) <szafar@linux.pl>
 Jake Peterson (acogdev) <jake@acogdev.com>
-Jakob Borg (calmh) <jakob@nym.se>
+Jakob Borg (calmh) <jakob@nym.se> <jakob@kastelo.net>
 James Patterson (jpjp) <jamespatterson@operamail.com> <jpjp@users.noreply.github.com>
 Jaroslav Malec (dzarda) <dzardacz@gmail.com>
 Jens Diemer (jedie) <github.com@jensdiemer.de> <git@jensdiemer.de>
@@ -60,14 +63,18 @@ Karol Różycki (krozycki) <rozycki.karol@gmail.com>
 Kelong Cong (kc1212) <kc04bc@gmx.com> <kc1212@users.noreply.github.com>
 Ken'ichi Kamada (kamadak) <kamada@nanohz.org>
 Kevin Allen (ironmig) <kma1660@gmail.com>
+Kevin White, Jr. (kwhite17) <kevinwhite1710@gmail.com>
+Kurt Fitzner (Kudalufi) <kurt@va1der.ca>
 Lars K.W. Gohlke (lkwg82) <lkwg82@gmx.de>
 Laurent Etiemble (letiemble) <laurent.etiemble@gmail.com> <laurent.etiemble@monobjc.net>
+Leo Arias (elopio) <yo@elopio.net>
 Lode Hoste (Zillode) <zillode@zillode.be>
 Lord Landon Agahnim (LordLandon) <lordlandon@gmail.com>
 Majed Abdulaziz (majedev) <majed.alhajry@gmail.com>
 Marc Laporte (marclaporte) <marc@marclaporte.com> <marc@laporte.name>
 Marc Pujol (kilburn) <kilburn@la3.org>
 Marcin Dziadus (marcindziadus) <dziadus.marcin@gmail.com>
+Mark Pulford (mpx) <mark@kyne.com.au>
 Mateusz Naściszewski (mateon1) <matin1111@wp.pl>
 Matt Burke (burkemw3) <mburke@amplify.com> <burkemw3@gmail.com>
 Max Schulze (kralo) <max.schulze@online.de> <kralo@users.noreply.github.com>
@@ -80,19 +87,24 @@ Peter Hoeg (peterhoeg) <peter@speartail.com>
 Philippe Schommers (filoozoom) <philippe@schommers.be>
 Phill Luby (pluby) <phill.luby@newredo.com>
 Piotr Bejda (piobpl) <piotrb10@gmail.com>
+Roman Zaynetdinov (zaynetro) <romanznet@gmail.com>
 Ryan Sullivan (KayoticSully) <kayoticsully@gmail.com>
 Scott Klupfel (kluppy) <kluppy@going2blue.com>
 Sergey Mishin (ralder) <ralder@yandex.ru>
+Simon Frei (imsodin) <freisim93@gmail.com>
 Stefan Kuntz (Stefan-Code) <stefan.github@gmail.com> <Stefan.github@gmail.com>
 Stefan Tatschner (rumpelsepp) <stefan@sevenbyte.org> <rumpelsepp@sevenbyte.org>
 Tim Abell (timabell) <tim@timwise.co.uk>
+Tim Howes (timhowes) <timhowes@berkeley.edu>
 Tobias Nygren (tnn2) <tnn@nygren.pp.se>
 Tomas Cerveny (kozec) <kozec@kozec.com>
 Tully Robinson (tojrobinson) <tully@tojr.org>
 Tyler Brazier (tylerbrazier) <tyler@tylerbrazier.com>
+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>
 William A. Kennington III (wkennington) <william@wkennington.com>
 Wulf Weich (wweich) <wweich@users.noreply.github.com> <wweich@gmx.de>
+Xavier O. (damajor) <damajor@gmail.com>
 Yannic A. (eipiminus1) <eipiminusone+github@gmail.com> <eipiminus1@users.noreply.github.com>
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -33,12 +33,12 @@ latest info on Transifex.

 Every contribution is welcome. If you want to contribute but are unsure
 where to start, any open issues are fair game! See the [Contribution
-Guidelines](http://docs.syncthing.net/dev/contributing.html) for the full
+Guidelines](https://docs.syncthing.net/dev/contributing.html) for the full
 story on committing code.

 ## Contributing Documentation

-Updates to the [documentation site](http://docs.syncthing.net/) can be
+Updates to the [documentation site](https://docs.syncthing.net/) can be
 made as pull requests on the [documentation
 repository](https://github.com/syncthing/docs).

--- a/21
+++ b/21
@@ -1,7 +1,11 @@
 # This file maps email addresses used in commits to nicks used the changelog.
 # It is auto generated from the AUTHORS file by script/authors.go.

+0x010C <antoine.lamielle@0x010c.fr>
+0x010C <gh@0x010c.fr>
 acogdev <jake@acogdev.com>
+adelq <aqalieh95@gmail.com>
+adelq <adelq@users.noreply.github.com>
 alessandro.g89 <alessandro.g89@gmail.com>
 alex2108 <register-github@alex-graf.de>
 andersonvom <andersonvom@gmail.com>
@@ -21,6 +25,7 @@ buinsky <vix_booja@tut.by>
 burkemw3 <mburke@amplify.com>
 burkemw3 <burkemw3@gmail.com>
 calmh <jakob@nym.se>
+calmh <jakob@kastelo.net>
 canton7 <antony.male@gmail.com>
 Cathryne <cathryne.linenweaver@gmail.com>
 Cathryne <Cathryne@users.noreply.github.com>
@@ -28,11 +33,13 @@ cdata <chris@scriptolo.gy>
 cdhowie <me@chrishowie.com>
 ceh <emil@hessman.se>
 cqcallaw <enlightened.despot@gmail.com>
+damajor <damajor@gmail.com>
 dinosore <dinosore@dbrsoftware.co.uk>
 dva <denisva@gmail.com>
 dzarda <dzardacz@gmail.com>
 eipiminus1 <eipiminusone+github@gmail.com>
 eipiminus1 <eipiminus1@users.noreply.github.com>
+elopio <yo@elopio.net>
 facastagnini <federico.castagnini@gmail.com>
 filoozoom <philippe@schommers.be>
 frioux <frew@afoolishmanifesto.com>
@@ -40,6 +47,7 @@ frioux <frioux@gmail.com>
 fti7 <frank@isemann.name>
 gillisig <gilli@vx.is>
 hadogenes <szafar@linux.pl>
+imsodin <freisim93@gmail.com>
 ironmig <kma1660@gmail.com>
 jarlebring <jarlebring@gmail.com>
 jedie <github.com@jensdiemer.de>
@@ -57,6 +65,8 @@ kozec <kozec@kozec.com>
 kralo <max.schulze@online.de>
 kralo <kralo@users.noreply.github.com>
 krozycki <rozycki.karol@gmail.com>
+Kudalufi <kurt@va1der.ca>
+kwhite17 <kevinwhite1710@gmail.com>
 letiemble <laurent.etiemble@gmail.com>
 letiemble <laurent.etiemble@monobjc.net>
 lkwg82 <lkwg82@gmx.de>
@@ -69,6 +79,7 @@ mateon1 <matin1111@wp.pl>
 mogwa1 <devriesb@gmail.com>
 moshen <moshen.colin@gmail.com>
 Moter8 <moter8@gmail.com>
+mpx <mark@kyne.com.au>
 mvdan <mvdan@mvdan.cc>
 norgeous <daniel@harte.me>
 norgeous <daniel@danielharte.co.uk>
@@ -82,6 +93,9 @@ philips <brandon@ifup.org>
 piobpl <piotrb10@gmail.com>
 plouj <ploujj@gmail.com>
 pluby <phill.luby@newredo.com>
+ProactiveServices <aD@simplypeachy.co.uk>
+ProactiveServices <simplypeachy@users.noreply.github.com>
+ProactiveServices <ProactiveServices@users.noreply.github.com>
 pyfisch <pyfisch@gmail.com>
 qbit <qbit@deftly.net>
 ralder <ralder@yandex.ru>
@@ -92,16 +106,18 @@ rumpelsepp <rumpelsepp@sevenbyte.org>
 scienmind <scintertech@cryptolab.net>
 sciurius <jvromans@squirrel.nl>
 seehuhn <voss@seehuhn.de>
-simplypeachy <aD@simplypeachy.co.uk>
-simplypeachy <simplypeachy@users.noreply.github.com>
+Smiley73 <heiko@zuerker.org>
 snnd <dw@risu.io>
 Stefan-Code <stefan.github@gmail.com>
 Stefan-Code <Stefan.github@gmail.com>
 timabell <tim@timwise.co.uk>
+timhowes <timhowes@berkeley.edu>
 tnn2 <tnn@nygren.pp.se>
 tojrobinson <tully@tojr.org>
 tpng <benny.tpng@gmail.com>
 tylerbrazier <tyler@tylerbrazier.com>
+Unrud <unrud@openaliasbox.org>
+Unrud <Unrud@users.noreply.github.com>
 uok <ueomkail@gmail.com>
 uok <uok@users.noreply.github.com>
 veeti <veeti.paananen@rojekti.fi>
@@ -111,5 +127,6 @@ WSGCSysadmin <e.meitner@willystreet.coop>
 wweich <wweich@users.noreply.github.com>
 wweich <wweich@gmx.de>
 xduugu <cedric@gmx.ca>
+zaynetro <romanznet@gmail.com>
 Zillode <zillode@zillode.be>
 zukoo <fxgsell@gmail.com>
--- a/README.md
+++ b/README.md
@@ -3,6 +3,7 @@
 [![Latest Build (Official)](https://img.shields.io/jenkins/s/http/build.syncthing.net/syncthing.svg?style=flat-square&label=unix%20build)](http://build.syncthing.net/job/syncthing/lastBuild/)
 [![API Documentation](https://img.shields.io/badge/api-Godoc-blue.svg?style=flat-square)](http://godoc.org/github.com/syncthing/syncthing)
 [![MPLv2 License](https://img.shields.io/badge/license-MPLv2-blue.svg?style=flat-square)](https://www.mozilla.org/MPL/2.0/)
+[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/88/badge)](https://bestpractices.coreinfrastructure.org/projects/88)

 This is the Syncthing project which pursues the following goals:

@@ -60,15 +61,15 @@ Please see the [Syncthing documentation site][6].

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

-[1]: http://docs.syncthing.net/specs/bep-v1.html
-[2]: http://docs.syncthing.net/intro/getting-started.html
+[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/master/etc
 [4]: http://www.freenode.net/irc_servers.shtml
-[5]: http://docs.syncthing.net/dev/building.html
-[6]: http://docs.syncthing.net/
+[5]: https://docs.syncthing.net/dev/building.html
+[6]: https://docs.syncthing.net/
 [7]: https://github.com/syncthing/syncthing/blob/master/LICENSE
 [8]: https://forum.syncthing.net/
 [9]: https://kiwiirc.com/client/irc.freenode.net/#syncthing
 [10]: https://github.com/syncthing/syncthing/issues
-[11]: http://docs.syncthing.net/users/contrib.html#gui-wrappers
+[11]: https://docs.syncthing.net/users/contrib.html#gui-wrappers
 [12]: https://www.bountysource.com/teams/syncthing/issues
--- a/build.go
+++ b/build.go
@@ -13,6 +13,7 @@ import (
 	"archive/zip"
 	"bytes"
 	"compress/gzip"
+	"errors"
 	"flag"
 	"fmt"
 	"io"
@@ -26,7 +27,6 @@ import (
 	"runtime"
 	"strconv"
 	"strings"
-	"syscall"
 	"text/template"
 	"time"
 )
@@ -43,12 +43,12 @@ var (
 )

 type target struct {
-	name         string
-	buildPkg     string
-	binaryName   string
-	archiveFiles []archiveFile
-	debianFiles  []archiveFile
-	tags         []string
+	name              string
+	buildPkg          string
+	binaryName        string
+	archiveFiles      []archiveFile
+	installationFiles []archiveFile
+	tags              []string
 }

 type archiveFile struct {
@@ -76,7 +76,7 @@ var targets = map[string]target{
 			{src: "AUTHORS", dst: "AUTHORS.txt", perm: 0644},
 			// All files from etc/ and extra/ added automatically in init().
 		},
-		debianFiles: []archiveFile{
+		installationFiles: []archiveFile{
 			{src: "{{binary}}", dst: "deb/usr/bin/{{binary}}", perm: 0755},
 			{src: "README.md", dst: "deb/usr/share/doc/syncthing/README.txt", perm: 0644},
 			{src: "LICENSE", dst: "deb/usr/share/doc/syncthing/LICENSE.txt", perm: 0644},
@@ -94,6 +94,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/firewall-ufw/syncthing", dst: "deb/etc/ufw/applications.d/syncthing", perm: 0644},
 		},
 	},
 	"stdiscosrv": {
@@ -106,7 +107,7 @@ var targets = map[string]target{
 			{src: "cmd/stdiscosrv/LICENSE", dst: "LICENSE.txt", perm: 0644},
 			{src: "AUTHORS", dst: "AUTHORS.txt", perm: 0644},
 		},
-		debianFiles: []archiveFile{
+		installationFiles: []archiveFile{
 			{src: "{{binary}}", dst: "deb/usr/bin/{{binary}}", perm: 0755},
 			{src: "cmd/stdiscosrv/README.md", dst: "deb/usr/share/doc/stdiscosrv/README.txt", perm: 0644},
 			{src: "cmd/stdiscosrv/LICENSE", dst: "deb/usr/share/doc/stdiscosrv/LICENSE.txt", perm: 0644},
@@ -125,7 +126,7 @@ var targets = map[string]target{
 			{src: "cmd/strelaysrv/LICENSE", dst: "LICENSE.txt", perm: 0644},
 			{src: "AUTHORS", dst: "AUTHORS.txt", perm: 0644},
 		},
-		debianFiles: []archiveFile{
+		installationFiles: []archiveFile{
 			{src: "{{binary}}", dst: "deb/usr/bin/{{binary}}", perm: 0755},
 			{src: "cmd/strelaysrv/README.md", dst: "deb/usr/share/doc/strelaysrv/README.txt", perm: 0644},
 			{src: "cmd/strelaysrv/LICENSE", dst: "deb/usr/share/doc/strelaysrv/LICENSE.txt", perm: 0644},
@@ -143,7 +144,7 @@ var targets = map[string]target{
 			{src: "cmd/strelaypoolsrv/LICENSE", dst: "LICENSE.txt", perm: 0644},
 			{src: "AUTHORS", dst: "AUTHORS.txt", perm: 0644},
 		},
-		debianFiles: []archiveFile{
+		installationFiles: []archiveFile{
 			{src: "{{binary}}", dst: "deb/usr/bin/{{binary}}", perm: 0755},
 			{src: "cmd/strelaypoolsrv/README.md", dst: "deb/usr/share/doc/relaysrv/README.txt", perm: 0644},
 			{src: "cmd/strelaypoolsrv/LICENSE", dst: "deb/usr/share/doc/relaysrv/LICENSE.txt", perm: 0644},
@@ -152,6 +153,40 @@ var targets = map[string]target{
 	},
 }

+var (
+	// fast linters complete in a fraction of a second and might as well be
+	// run always as part of the build
+	fastLinters = []string{
+		"deadcode",
+		"golint",
+		"ineffassign",
+		"vet",
+	}
+
+	// slow linters take several seconds and are run only as part of the
+	// "metalint" command.
+	slowLinters = []string{
+		"gosimple",
+		"staticcheck",
+		"structcheck",
+		"unused",
+		"varcheck",
+	}
+
+	// Which parts of the tree to lint
+	lintDirs = []string{".", "./lib/...", "./cmd/..."}
+
+	// Messages to ignore
+	lintExcludes = []string{
+		".pb.go",
+		"should have comment",
+		"protocol.Vector composite literal uses unkeyed fields",
+		"cli.Requires composite literal uses unkeyed fields",
+		"Use DialContext instead",   // Go 1.7
+		"os.SEEK_SET is deprecated", // Go 1.7
+	}
+)
+
 func init() {
 	// The "syncthing" target includes a few more files found in the "etc"
 	// and "extra" dirs.
@@ -163,12 +198,12 @@ func init() {
 		syncthingPkg.archiveFiles = append(syncthingPkg.archiveFiles, archiveFile{src: file, dst: file, perm: 0644})
 	}
 	for _, file := range listFiles("extra") {
-		syncthingPkg.debianFiles = append(syncthingPkg.debianFiles, archiveFile{src: file, dst: "deb/usr/share/doc/syncthing/" + filepath.Base(file), perm: 0644})
+		syncthingPkg.installationFiles = append(syncthingPkg.installationFiles, archiveFile{src: file, dst: "deb/usr/share/doc/syncthing/" + filepath.Base(file), perm: 0644})
 	}
 	targets["syncthing"] = syncthingPkg
 }

-const minGoVersion = 1.3
+const minGoVersion = 1.5

 func main() {
 	log.SetOutput(os.Stdout)
@@ -201,8 +236,6 @@ func main() {
 	// which is what you want for maximum error checking during development.
 	if flag.NArg() == 0 {
 		runCommand("install", targets["all"])
-		runCommand("vet", target{})
-		runCommand("lint", target{})
 	} else {
 		// with any command given but not a target, the target is
 		// "syncthing". So "go run build.go install" is "go run build.go install
@@ -240,6 +273,7 @@ func runCommand(cmd string, target target) {
 			tags = []string{"noupgrade"}
 		}
 		install(target, tags)
+		metalint(fastLinters, lintDirs)

 	case "build":
 		var tags []string
@@ -247,6 +281,7 @@ func runCommand(cmd string, target target) {
 			tags = []string{"noupgrade"}
 		}
 		build(target, tags)
+		metalint(fastLinters, lintDirs)

 	case "test":
 		test("./lib/...", "./cmd/...")
@@ -275,28 +310,24 @@ func runCommand(cmd string, target target) {
 	case "deb":
 		buildDeb(target)

+	case "snap":
+		buildSnap(target)
+
 	case "clean":
 		clean()

 	case "vet":
-		vet("build.go")
-		vet("cmd", "lib")
+		metalint(fastLinters, lintDirs)

 	case "lint":
-		lint(".")
-		lint("./cmd/...")
-		lint("./lib/...")
+		metalint(fastLinters, lintDirs)

 	case "metalint":
-		if isGometalinterInstalled() {
-			dirs := []string{".", "./cmd/...", "./lib/..."}
-			ok := gometalinter("deadcode", dirs, "test/util.go")
-			ok = gometalinter("structcheck", dirs) && ok
-			ok = gometalinter("varcheck", dirs) && ok
-			if !ok {
-				os.Exit(1)
-			}
-		}
+		metalint(fastLinters, lintDirs)
+		metalint(slowLinters, lintDirs)
+
+	case "version":
+		fmt.Println(getVersion())

 	default:
 		log.Fatalf("Unknown command %q", cmd)
@@ -348,14 +379,29 @@ func checkRequiredGoVersion() (float64, bool) {
 }

 func setup() {
-	runPrint("go", "get", "-v", "golang.org/x/tools/cmd/cover")
-	runPrint("go", "get", "-v", "golang.org/x/net/html")
-	runPrint("go", "get", "-v", "github.com/FiloSottile/gvt")
-	runPrint("go", "get", "-v", "github.com/axw/gocov/gocov")
-	runPrint("go", "get", "-v", "github.com/AlekSi/gocov-xml")
-	runPrint("go", "get", "-v", "bitbucket.org/tebeka/go2xunit")
-	runPrint("go", "get", "-v", "github.com/alecthomas/gometalinter")
-	runPrint("go", "get", "-v", "github.com/mitchellh/go-wordwrap")
+	packages := []string{
+		"github.com/alecthomas/gometalinter",
+		"github.com/AlekSi/gocov-xml",
+		"github.com/axw/gocov/gocov",
+		"github.com/FiloSottile/gvt",
+		"github.com/golang/lint/golint",
+		"github.com/gordonklaus/ineffassign",
+		"github.com/mdempsky/unconvert",
+		"github.com/mitchellh/go-wordwrap",
+		"github.com/opennota/check/cmd/...",
+		"github.com/tsenart/deadcode",
+		"golang.org/x/net/html",
+		"golang.org/x/tools/cmd/cover",
+		"honnef.co/go/simple/cmd/gosimple",
+		"honnef.co/go/staticcheck/cmd/staticcheck",
+		"honnef.co/go/unused/cmd/unused",
+	}
+	for _, pkg := range packages {
+		fmt.Println(pkg)
+		runPrint("go", "get", "-u", pkg)
+	}
+
+	runPrint("go", "install", "-v", "./vendor/github.com/gogo/protobuf/protoc-gen-gogofast")
 }

 func test(pkgs ...string) {
@@ -478,8 +524,8 @@ func buildDeb(target target) {
 	os.RemoveAll("deb")

 	// "goarch" here is set to whatever the Debian packages expect. We correct
-	// "it to what we actually know how to build and keep the Debian variant
-	// "name in "debarch".
+	// it to what we actually know how to build and keep the Debian variant
+	// name in "debarch".
 	debarch := goarch
 	switch goarch {
 	case "i386":
@@ -490,46 +536,69 @@ func buildDeb(target target) {

 	build(target, []string{"noupgrade"})

-	for i := range target.debianFiles {
-		target.debianFiles[i].src = strings.Replace(target.debianFiles[i].src, "{{binary}}", target.binaryName, 1)
-		target.debianFiles[i].dst = strings.Replace(target.debianFiles[i].dst, "{{binary}}", target.binaryName, 1)
+	for i := range target.installationFiles {
+		target.installationFiles[i].src = strings.Replace(target.installationFiles[i].src, "{{binary}}", target.binaryName, 1)
+		target.installationFiles[i].dst = strings.Replace(target.installationFiles[i].dst, "{{binary}}", target.binaryName, 1)
 	}

-	for _, af := range target.debianFiles {
+	for _, af := range target.installationFiles {
 		if err := copyFile(af.src, af.dst, af.perm); err != nil {
 			log.Fatal(err)
 		}
 	}

-	os.MkdirAll("deb/DEBIAN", 0755)
+	maintainer := "Syncthing Release Management <release@syncthing.net>"
+	debver := version
+	if strings.HasPrefix(debver, "v") {
+		debver = debver[1:]
+	}
+	runPrint("fpm", "-t", "deb", "-s", "dir", "-C", "deb",
+		"-n", "syncthing", "-v", debver, "-a", debarch,
+		"--vendor", maintainer, "-m", maintainer,
+		"-d", "libc6",
+		"-d", "procps", // because postinst script
+		"--url", "https://syncthing.net/",
+		"--description", "Open Source Continuous File Synchronization",
+		"--after-upgrade", "script/post-upgrade",
+		"--license", "MPL-2")
+}

-	data := map[string]string{
-		"name":    target.name,
-		"arch":    debarch,
-		"version": version[1:],
-		"date":    time.Now().Format(time.RFC1123),
+func buildSnap(target target) {
+	os.RemoveAll("snap")
+
+	tmpl, err := template.ParseFiles("snapcraft.yaml.template")
+	if err != nil {
+		log.Fatal(err)
+	}
+	f, err := os.Create("snapcraft.yaml")
+	defer f.Close()
+	if err != nil {
+		log.Fatal(err)
 	}

-	debTemplateFiles := append(listFiles("debtpl/common"), listFiles("debtpl/"+target.name)...)
-	for _, file := range debTemplateFiles {
-		tpl, err := template.New(filepath.Base(file)).ParseFiles(file)
-		if err != nil {
-			log.Fatal(err)
-		}
-		outFile := filepath.Join("deb/DEBIAN", filepath.Base(file))
-		out, err := os.Create(outFile)
-		if err != nil {
-			log.Fatal(err)
-		}
-		if err := tpl.Execute(out, data); err != nil {
-			log.Fatal(err)
-		}
-		if err := out.Close(); err != nil {
-			log.Fatal(err)
-		}
-		info, _ := os.Lstat(file)
-		os.Chmod(outFile, info.Mode())
+	snaparch := goarch
+	if snaparch == "armhf" {
+		goarch = "arm"
 	}
+	snapver := version
+	if strings.HasPrefix(snapver, "v") {
+		snapver = snapver[1:]
+	}
+	snapgrade := "devel"
+	if matched, _ := regexp.MatchString(`^\d+\.\d+\.\d+$`, snapver); matched {
+		snapgrade = "stable"
+	}
+	err = tmpl.Execute(f, map[string]string{
+		"Version":      snapver,
+		"Architecture": snaparch,
+		"Grade":        snapgrade,
+	})
+	if err != nil {
+		log.Fatal(err)
+	}
+	runPrint("snapcraft", "clean")
+	build(target, []string{"noupgrade"})
+	runPrint("snapcraft")
 }

 func copyFile(src, dst string, perm os.FileMode) error {
@@ -585,14 +654,15 @@ func shouldRebuildAssets(target, srcdir string) bool {
 	// so we should rebuild it.
 	currentBuild := info.ModTime()
 	assetsAreNewer := false
+	stop := errors.New("no need to iterate further")
 	filepath.Walk(srcdir, func(path string, info os.FileInfo, err error) error {
 		if err != nil {
 			return err
 		}
-		if assetsAreNewer {
-			return nil
+		if info.ModTime().After(currentBuild) {
+			assetsAreNewer = true
+			return stop
 		}
-		assetsAreNewer = info.ModTime().After(currentBuild)
 		return nil
 	})

@@ -641,7 +711,9 @@ func ldflags() string {

 func rmr(paths ...string) {
 	for _, path := range paths {
-		log.Println("rm -r", path)
+		if debug {
+			log.Println("rm -r", path)
+		}
 		os.RemoveAll(path)
 	}
 }
@@ -959,48 +1031,6 @@ func zipFile(out string, files []archiveFile) {
 	}
 }

-func vet(dirs ...string) {
-	params := []string{"tool", "vet", "-all"}
-	params = append(params, dirs...)
-	bs, err := runError("go", params...)
-
-	if len(bs) > 0 {
-		log.Printf("%s", bs)
-	}
-
-	if err != nil {
-		if exitStatus(err) == 3 {
-			// Exit code 3, the "vet" tool is not installed
-			return
-		}
-
-		// A genuine error exit from the vet tool.
-		log.Fatal(err)
-	}
-}
-
-func lint(pkg string) {
-	bs, err := runError("golint", pkg)
-	if err != nil {
-		log.Println(`- No golint, not linting. Try "go get -u github.com/golang/lint/golint".`)
-		return
-	}
-
-	analCommentPolicy := regexp.MustCompile(`exported (function|method|const|type|var) [^\s]+ should have comment`)
-	for _, line := range strings.Split(string(bs), "\n") {
-		if line == "" {
-			continue
-		}
-		if analCommentPolicy.MatchString(line) {
-			continue
-		}
-		if strings.Contains(line, ".pb.go:") {
-			continue
-		}
-		log.Println(line)
-	}
-}
-
 func macosCodesign(file string) {
 	if pass := os.Getenv("CODESIGN_KEYCHAIN_PASS"); pass != "" {
 		bs, err := runError("security", "unlock-keychain", "-p", pass)
@@ -1020,14 +1050,16 @@ func macosCodesign(file string) {
 	}
 }

-func exitStatus(err error) int {
-	if err, ok := err.(*exec.ExitError); ok {
-		if ws, ok := err.ProcessState.Sys().(syscall.WaitStatus); ok {
-			return ws.ExitStatus()
+func metalint(linters []string, dirs []string) {
+	ok := true
+	if isGometalinterInstalled() {
+		if !gometalinter(linters, dirs, lintExcludes...) {
+			ok = false
 		}
 	}
-
-	return -1
+	if !ok {
+		log.Fatal("Build succeeded, but there were lint warnings")
+	}
 }

 func isGometalinterInstalled() bool {
@@ -1038,10 +1070,12 @@ func isGometalinterInstalled() bool {
 	return true
 }

-func gometalinter(linter string, dirs []string, excludes ...string) bool {
-	params := []string{"--disable-all"}
-	params = append(params, fmt.Sprintf("--deadline=%ds", 60))
-	params = append(params, "--enable="+linter)
+func gometalinter(linters []string, dirs []string, excludes ...string) bool {
+	params := []string{"--disable-all", "--concurrency=2", "--deadline=300s"}
+
+	for _, linter := range linters {
+		params = append(params, "--enable="+linter)
+	}

 	for _, exclude := range excludes {
 		params = append(params, "--exclude="+exclude)
@@ -1054,14 +1088,19 @@ func gometalinter(linter string, dirs []string, excludes ...string) bool {
 	bs, _ := runError("gometalinter", params...)

 	nerr := 0
+	lines := make(map[string]struct{})
 	for _, line := range strings.Split(string(bs), "\n") {
 		if line == "" {
 			continue
 		}
-		if strings.Contains(line, ".pb.go:") {
+		if _, ok := lines[line]; ok {
 			continue
 		}
 		log.Println(line)
+		if strings.Contains(line, "executable file not found") {
+			log.Println(` - Try "go run build.go setup" to install missing tools`)
+		}
+		lines[line] = struct{}{}
 		nerr++
 	}

--- a/build.sh
+++ b/build.sh
@@ -104,7 +104,7 @@ case "${1:-default}" in
 		# For every package in the repo
 		for dir in $(go list ./lib/... ./cmd/...) ; do
 			# run the tests
-			GOPATH="$(pwd)/Godeps/_workspace:$GOPATH" go test -race -coverprofile=profile.out $dir
+			GOPATH="$(pwd)/Godeps/_workspace:$GOPATH" go test -coverprofile=profile.out $dir
 			if [ -f profile.out ] ; then
 				# and if there was test output, append it to coverage.out
 				grep -v "mode: " profile.out >> coverage.out
@@ -112,6 +112,11 @@ case "${1:-default}" in
 			fi
 		done

+		notCovered=$(egrep -c '\s0$' coverage.out)
+		total=$(wc -l coverage.out | awk '{print $1}')
+		coverPct=$(awk "BEGIN{print (1 - $notCovered / $total) * 100}")
+		echo "Total coverage is $coverPct%"
+
 		gocov convert coverage.out | gocov-xml > coverage.xml

 		# This is usually run from within Jenkins. If it is, we need to
--- a/cmd/stcli/LICENSE
+++ b/cmd/stcli/LICENSE
@@ -0,0 +1,19 @@
+Copyright (C) 2014 Audrius Butkevičius
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+- The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
--- a/cmd/stcli/README.md
+++ b/cmd/stcli/README.md
@@ -0,0 +1,10 @@
+syncthing-cli
+=============
+
+[![Latest Build](http://img.shields.io/jenkins/s/http/build.syncthing.net/syncthing-cli.svg?style=flat-square)](http://build.syncthing.net/job/syncthing-cli/lastBuild/)
+
+A CLI that talks to the Syncthing REST interface.
+
+`go get github.com/syncthing/syncthing-cli`
+
+Or download the [latest build](http://build.syncthing.net/job/syncthing-cli/lastSuccessfulBuild/artifact/).
--- a/cmd/stcli/client.go
+++ b/cmd/stcli/client.go
@@ -0,0 +1,115 @@
+// Copyright (C) 2014 Audrius Butkevičius
+
+package main
+
+import (
+	"bytes"
+	"crypto/tls"
+	"net/http"
+	"strings"
+
+	"github.com/AudriusButkevicius/cli"
+)
+
+type APIClient struct {
+	httpClient http.Client
+	endpoint   string
+	apikey     string
+	username   string
+	password   string
+	id         string
+	csrf       string
+}
+
+var instance *APIClient
+
+func getClient(c *cli.Context) *APIClient {
+	if instance != nil {
+		return instance
+	}
+	endpoint := c.GlobalString("endpoint")
+	if !strings.HasPrefix(endpoint, "http") {
+		endpoint = "http://" + endpoint
+	}
+	httpClient := http.Client{
+		Transport: &http.Transport{
+			TLSClientConfig: &tls.Config{
+				InsecureSkipVerify: c.GlobalBool("insecure"),
+			},
+		},
+	}
+	client := APIClient{
+		httpClient: httpClient,
+		endpoint:   endpoint,
+		apikey:     c.GlobalString("apikey"),
+		username:   c.GlobalString("username"),
+		password:   c.GlobalString("password"),
+	}
+
+	if client.apikey == "" {
+		request, err := http.NewRequest("GET", client.endpoint, nil)
+		die(err)
+		response := client.handleRequest(request)
+		client.id = response.Header.Get("X-Syncthing-ID")
+		if client.id == "" {
+			die("Failed to get device ID")
+		}
+		for _, item := range response.Cookies() {
+			if item.Name == "CSRF-Token-"+client.id[:5] {
+				client.csrf = item.Value
+				goto csrffound
+			}
+		}
+		die("Failed to get CSRF token")
+	csrffound:
+	}
+	instance = &client
+	return &client
+}
+
+func (client *APIClient) handleRequest(request *http.Request) *http.Response {
+	if client.apikey != "" {
+		request.Header.Set("X-API-Key", client.apikey)
+	}
+	if client.username != "" || client.password != "" {
+		request.SetBasicAuth(client.username, client.password)
+	}
+	if client.csrf != "" {
+		request.Header.Set("X-CSRF-Token-"+client.id[:5], client.csrf)
+	}
+
+	response, err := client.httpClient.Do(request)
+	die(err)
+
+	if response.StatusCode == 404 {
+		die("Invalid endpoint or API call")
+	} else if response.StatusCode == 401 {
+		die("Invalid username or password")
+	} else if response.StatusCode == 403 {
+		if client.apikey == "" {
+			die("Invalid CSRF token")
+		}
+		die("Invalid API key")
+	} else if response.StatusCode != 200 {
+		body := strings.TrimSpace(string(responseToBArray(response)))
+		if body != "" {
+			die(body)
+		}
+		die("Unknown HTTP status returned: " + response.Status)
+	}
+	return response
+}
+
+func httpGet(c *cli.Context, url string) *http.Response {
+	client := getClient(c)
+	request, err := http.NewRequest("GET", client.endpoint+"/rest/"+url, nil)
+	die(err)
+	return client.handleRequest(request)
+}
+
+func httpPost(c *cli.Context, url string, body string) *http.Response {
+	client := getClient(c)
+	request, err := http.NewRequest("POST", client.endpoint+"/rest/"+url, bytes.NewBufferString(body))
+	die(err)
+	return client.handleRequest(request)
+}
--- a/cmd/stcli/cmd_devices.go
+++ b/cmd/stcli/cmd_devices.go
@@ -0,0 +1,188 @@
+// Copyright (C) 2014 Audrius Butkevičius
+
+package main
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/AudriusButkevicius/cli"
+	"github.com/syncthing/syncthing/lib/config"
+)
+
+func init() {
+	cliCommands = append(cliCommands, cli.Command{
+		Name:     "devices",
+		HideHelp: true,
+		Usage:    "Device command group",
+		Subcommands: []cli.Command{
+			{
+				Name:     "list",
+				Usage:    "List registered devices",
+				Requires: &cli.Requires{},
+				Action:   devicesList,
+			},
+			{
+				Name:     "add",
+				Usage:    "Add a new device",
+				Requires: &cli.Requires{"device id", "device name?"},
+				Action:   devicesAdd,
+			},
+			{
+				Name:     "remove",
+				Usage:    "Remove an existing device",
+				Requires: &cli.Requires{"device id"},
+				Action:   devicesRemove,
+			},
+			{
+				Name:     "get",
+				Usage:    "Get a property of a device",
+				Requires: &cli.Requires{"device id", "property"},
+				Action:   devicesGet,
+			},
+			{
+				Name:     "set",
+				Usage:    "Set a property of a device",
+				Requires: &cli.Requires{"device id", "property", "value..."},
+				Action:   devicesSet,
+			},
+		},
+	})
+}
+
+func devicesList(c *cli.Context) {
+	cfg := getConfig(c)
+	first := true
+	writer := newTableWriter()
+	for _, device := range cfg.Devices {
+		if !first {
+			fmt.Fprintln(writer)
+		}
+		fmt.Fprintln(writer, "ID:\t", device.DeviceID, "\t")
+		fmt.Fprintln(writer, "Name:\t", device.Name, "\t(name)")
+		fmt.Fprintln(writer, "Address:\t", strings.Join(device.Addresses, " "), "\t(address)")
+		fmt.Fprintln(writer, "Compression:\t", device.Compression, "\t(compression)")
+		fmt.Fprintln(writer, "Certificate name:\t", device.CertName, "\t(certname)")
+		fmt.Fprintln(writer, "Introducer:\t", device.Introducer, "\t(introducer)")
+		first = false
+	}
+	writer.Flush()
+}
+
+func devicesAdd(c *cli.Context) {
+	nid := c.Args()[0]
+	id := parseDeviceID(nid)
+
+	newDevice := config.DeviceConfiguration{
+		DeviceID:  id,
+		Name:      nid,
+		Addresses: []string{"dynamic"},
+	}
+
+	if len(c.Args()) > 1 {
+		newDevice.Name = c.Args()[1]
+	}
+
+	if len(c.Args()) > 2 {
+		addresses := c.Args()[2:]
+		for _, item := range addresses {
+			if item == "dynamic" {
+				continue
+			}
+			validAddress(item)
+		}
+		newDevice.Addresses = addresses
+	}
+
+	cfg := getConfig(c)
+	for _, device := range cfg.Devices {
+		if device.DeviceID == id {
+			die("Device " + nid + " already exists")
+		}
+	}
+	cfg.Devices = append(cfg.Devices, newDevice)
+	setConfig(c, cfg)
+}
+
+func devicesRemove(c *cli.Context) {
+	nid := c.Args()[0]
+	id := parseDeviceID(nid)
+	if nid == getMyID(c) {
+		die("Cannot remove yourself")
+	}
+	cfg := getConfig(c)
+	for i, device := range cfg.Devices {
+		if device.DeviceID == id {
+			last := len(cfg.Devices) - 1
+			cfg.Devices[i] = cfg.Devices[last]
+			cfg.Devices = cfg.Devices[:last]
+			setConfig(c, cfg)
+			return
+		}
+	}
+	die("Device " + nid + " not found")
+}
+
+func devicesGet(c *cli.Context) {
+	nid := c.Args()[0]
+	id := parseDeviceID(nid)
+	arg := c.Args()[1]
+	cfg := getConfig(c)
+	for _, device := range cfg.Devices {
+		if device.DeviceID != id {
+			continue
+		}
+		switch strings.ToLower(arg) {
+		case "name":
+			fmt.Println(device.Name)
+		case "address":
+			fmt.Println(strings.Join(device.Addresses, "\n"))
+		case "compression":
+			fmt.Println(device.Compression.String())
+		case "certname":
+			fmt.Println(device.CertName)
+		case "introducer":
+			fmt.Println(device.Introducer)
+		default:
+			die("Invalid property: " + arg + "\nAvailable properties: name, address, compression, certname, introducer")
+		}
+		return
+	}
+	die("Device " + nid + " not found")
+}
+
+func devicesSet(c *cli.Context) {
+	nid := c.Args()[0]
+	id := parseDeviceID(nid)
+	arg := c.Args()[1]
+	config := getConfig(c)
+	for i, device := range config.Devices {
+		if device.DeviceID != id {
+			continue
+		}
+		switch strings.ToLower(arg) {
+		case "name":
+			config.Devices[i].Name = strings.Join(c.Args()[2:], " ")
+		case "address":
+			for _, item := range c.Args()[2:] {
+				if item == "dynamic" {
+					continue
+				}
+				validAddress(item)
+			}
+			config.Devices[i].Addresses = c.Args()[2:]
+		case "compression":
+			err := config.Devices[i].Compression.UnmarshalText([]byte(c.Args()[2]))
+			die(err)
+		case "certname":
+			config.Devices[i].CertName = strings.Join(c.Args()[2:], " ")
+		case "introducer":
+			config.Devices[i].Introducer = parseBool(c.Args()[2])
+		default:
+			die("Invalid property: " + arg + "\nAvailable properties: name, address, compression, certname, introducer")
+		}
+		setConfig(c, config)
+		return
+	}
+	die("Device " + nid + " not found")
+}
--- a/cmd/stcli/cmd_errors.go
+++ b/cmd/stcli/cmd_errors.go
@@ -0,0 +1,67 @@
+// Copyright (C) 2014 Audrius Butkevičius
+
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"strings"
+
+	"github.com/AudriusButkevicius/cli"
+)
+
+func init() {
+	cliCommands = append(cliCommands, cli.Command{
+		Name:     "errors",
+		HideHelp: true,
+		Usage:    "Error command group",
+		Subcommands: []cli.Command{
+			{
+				Name:     "show",
+				Usage:    "Show pending errors",
+				Requires: &cli.Requires{},
+				Action:   errorsShow,
+			},
+			{
+				Name:     "push",
+				Usage:    "Push an error to active clients",
+				Requires: &cli.Requires{"error message..."},
+				Action:   errorsPush,
+			},
+			{
+				Name:     "clear",
+				Usage:    "Clear pending errors",
+				Requires: &cli.Requires{},
+				Action:   wrappedHTTPPost("system/error/clear"),
+			},
+		},
+	})
+}
+
+func errorsShow(c *cli.Context) {
+	response := httpGet(c, "system/error")
+	var data map[string][]map[string]interface{}
+	json.Unmarshal(responseToBArray(response), &data)
+	writer := newTableWriter()
+	for _, item := range data["errors"] {
+		time := item["time"].(string)[:19]
+		time = strings.Replace(time, "T", " ", 1)
+		err := item["error"].(string)
+		err = strings.TrimSpace(err)
+		fmt.Fprintln(writer, time+":\t"+err)
+	}
+	writer.Flush()
+}
+
+func errorsPush(c *cli.Context) {
+	err := strings.Join(c.Args(), " ")
+	response := httpPost(c, "system/error", strings.TrimSpace(err))
+	if response.StatusCode != 200 {
+		err = fmt.Sprint("Failed to push error\nStatus code: ", response.StatusCode)
+		body := string(responseToBArray(response))
+		if body != "" {
+			err += "\nBody: " + body
+		}
+		die(err)
+	}
+}
--- a/cmd/stcli/cmd_folders.go
+++ b/cmd/stcli/cmd_folders.go
@@ -0,0 +1,351 @@
+// Copyright (C) 2014 Audrius Butkevičius
+
+package main
+
+import (
+	"fmt"
+	"path/filepath"
+	"strings"
+
+	"github.com/AudriusButkevicius/cli"
+	"github.com/syncthing/syncthing/lib/config"
+)
+
+func init() {
+	cliCommands = append(cliCommands, cli.Command{
+		Name:     "folders",
+		HideHelp: true,
+		Usage:    "Folder command group",
+		Subcommands: []cli.Command{
+			{
+				Name:     "list",
+				Usage:    "List available folders",
+				Requires: &cli.Requires{},
+				Action:   foldersList,
+			},
+			{
+				Name:     "add",
+				Usage:    "Add a new folder",
+				Requires: &cli.Requires{"folder id", "directory"},
+				Action:   foldersAdd,
+			},
+			{
+				Name:     "remove",
+				Usage:    "Remove an existing folder",
+				Requires: &cli.Requires{"folder id"},
+				Action:   foldersRemove,
+			},
+			{
+				Name:     "override",
+				Usage:    "Override changes from other nodes for a master folder",
+				Requires: &cli.Requires{"folder id"},
+				Action:   foldersOverride,
+			},
+			{
+				Name:     "get",
+				Usage:    "Get a property of a folder",
+				Requires: &cli.Requires{"folder id", "property"},
+				Action:   foldersGet,
+			},
+			{
+				Name:     "set",
+				Usage:    "Set a property of a folder",
+				Requires: &cli.Requires{"folder id", "property", "value..."},
+				Action:   foldersSet,
+			},
+			{
+				Name:     "unset",
+				Usage:    "Unset a property of a folder",
+				Requires: &cli.Requires{"folder id", "property"},
+				Action:   foldersUnset,
+			},
+			{
+				Name:     "devices",
+				Usage:    "Folder devices command group",
+				HideHelp: true,
+				Subcommands: []cli.Command{
+					{
+						Name:     "list",
+						Usage:    "List of devices which the folder is shared with",
+						Requires: &cli.Requires{"folder id"},
+						Action:   foldersDevicesList,
+					},
+					{
+						Name:     "add",
+						Usage:    "Share a folder with a device",
+						Requires: &cli.Requires{"folder id", "device id"},
+						Action:   foldersDevicesAdd,
+					},
+					{
+						Name:     "remove",
+						Usage:    "Unshare a folder with a device",
+						Requires: &cli.Requires{"folder id", "device id"},
+						Action:   foldersDevicesRemove,
+					},
+					{
+						Name:     "clear",
+						Usage:    "Unshare a folder with all devices",
+						Requires: &cli.Requires{"folder id"},
+						Action:   foldersDevicesClear,
+					},
+				},
+			},
+		},
+	})
+}
+
+func foldersList(c *cli.Context) {
+	cfg := getConfig(c)
+	first := true
+	writer := newTableWriter()
+	for _, folder := range cfg.Folders {
+		if !first {
+			fmt.Fprintln(writer)
+		}
+		fmt.Fprintln(writer, "ID:\t", folder.ID, "\t")
+		fmt.Fprintln(writer, "Path:\t", folder.RawPath, "\t(directory)")
+		fmt.Fprintln(writer, "Folder type:\t", folder.Type, "\t(type)")
+		fmt.Fprintln(writer, "Ignore permissions:\t", folder.IgnorePerms, "\t(permissions)")
+		fmt.Fprintln(writer, "Rescan interval in seconds:\t", folder.RescanIntervalS, "\t(rescan)")
+
+		if folder.Versioning.Type != "" {
+			fmt.Fprintln(writer, "Versioning:\t", folder.Versioning.Type, "\t(versioning)")
+			for key, value := range folder.Versioning.Params {
+				fmt.Fprintf(writer, "Versioning %s:\t %s \t(versioning-%s)\n", key, value, key)
+			}
+		}
+		first = false
+	}
+	writer.Flush()
+}
+
+func foldersAdd(c *cli.Context) {
+	cfg := getConfig(c)
+	abs, err := filepath.Abs(c.Args()[1])
+	die(err)
+	folder := config.FolderConfiguration{
+		ID:      c.Args()[0],
+		RawPath: filepath.Clean(abs),
+	}
+	cfg.Folders = append(cfg.Folders, folder)
+	setConfig(c, cfg)
+}
+
+func foldersRemove(c *cli.Context) {
+	cfg := getConfig(c)
+	rid := c.Args()[0]
+	for i, folder := range cfg.Folders {
+		if folder.ID == rid {
+			last := len(cfg.Folders) - 1
+			cfg.Folders[i] = cfg.Folders[last]
+			cfg.Folders = cfg.Folders[:last]
+			setConfig(c, cfg)
+			return
+		}
+	}
+	die("Folder " + rid + " not found")
+}
+
+func foldersOverride(c *cli.Context) {
+	cfg := getConfig(c)
+	rid := c.Args()[0]
+	for _, folder := range cfg.Folders {
+		if folder.ID == rid && folder.Type == config.FolderTypeSendOnly {
+			response := httpPost(c, "db/override", "")
+			if response.StatusCode != 200 {
+				err := fmt.Sprint("Failed to override changes\nStatus code: ", response.StatusCode)
+				body := string(responseToBArray(response))
+				if body != "" {
+					err += "\nBody: " + body
+				}
+				die(err)
+			}
+			return
+		}
+	}
+	die("Folder " + rid + " not found or folder not master")
+}
+
+func foldersGet(c *cli.Context) {
+	cfg := getConfig(c)
+	rid := c.Args()[0]
+	arg := strings.ToLower(c.Args()[1])
+	for _, folder := range cfg.Folders {
+		if folder.ID != rid {
+			continue
+		}
+		if strings.HasPrefix(arg, "versioning-") {
+			arg = arg[11:]
+			value, ok := folder.Versioning.Params[arg]
+			if ok {
+				fmt.Println(value)
+				return
+			}
+			die("Versioning property " + c.Args()[1][11:] + " not found")
+		}
+		switch arg {
+		case "directory":
+			fmt.Println(folder.RawPath)
+		case "type":
+			fmt.Println(folder.Type)
+		case "permissions":
+			fmt.Println(folder.IgnorePerms)
+		case "rescan":
+			fmt.Println(folder.RescanIntervalS)
+		case "versioning":
+			if folder.Versioning.Type != "" {
+				fmt.Println(folder.Versioning.Type)
+			}
+		default:
+			die("Invalid property: " + c.Args()[1] + "\nAvailable properties: directory, type, permissions, versioning, versioning-<key>")
+		}
+		return
+	}
+	die("Folder " + rid + " not found")
+}
+
+func foldersSet(c *cli.Context) {
+	rid := c.Args()[0]
+	arg := strings.ToLower(c.Args()[1])
+	val := strings.Join(c.Args()[2:], " ")
+	cfg := getConfig(c)
+	for i, folder := range cfg.Folders {
+		if folder.ID != rid {
+			continue
+		}
+		if strings.HasPrefix(arg, "versioning-") {
+			cfg.Folders[i].Versioning.Params[arg[11:]] = val
+			setConfig(c, cfg)
+			return
+		}
+		switch arg {
+		case "directory":
+			cfg.Folders[i].RawPath = val
+		case "type":
+			var t config.FolderType
+			if err := t.UnmarshalText([]byte(val)); err != nil {
+				die("Invalid folder type: " + err.Error())
+			}
+			cfg.Folders[i].Type = t
+		case "permissions":
+			cfg.Folders[i].IgnorePerms = parseBool(val)
+		case "rescan":
+			cfg.Folders[i].RescanIntervalS = parseInt(val)
+		case "versioning":
+			cfg.Folders[i].Versioning.Type = val
+		default:
+			die("Invalid property: " + c.Args()[1] + "\nAvailable properties: directory, master, permissions, versioning, versioning-<key>")
+		}
+		setConfig(c, cfg)
+		return
+	}
+	die("Folder " + rid + " not found")
+}
+
+func foldersUnset(c *cli.Context) {
+	rid := c.Args()[0]
+	arg := strings.ToLower(c.Args()[1])
+	cfg := getConfig(c)
+	for i, folder := range cfg.Folders {
+		if folder.ID != rid {
+			continue
+		}
+		if strings.HasPrefix(arg, "versioning-") {
+			arg = arg[11:]
+			if _, ok := folder.Versioning.Params[arg]; ok {
+				delete(cfg.Folders[i].Versioning.Params, arg)
+				setConfig(c, cfg)
+				return
+			}
+			die("Versioning property " + c.Args()[1][11:] + " not found")
+		}
+		switch arg {
+		case "versioning":
+			cfg.Folders[i].Versioning.Type = ""
+			cfg.Folders[i].Versioning.Params = make(map[string]string)
+		default:
+			die("Invalid property: " + c.Args()[1] + "\nAvailable properties: versioning, versioning-<key>")
+		}
+		setConfig(c, cfg)
+		return
+	}
+	die("Folder " + rid + " not found")
+}
+
+func foldersDevicesList(c *cli.Context) {
+	rid := c.Args()[0]
+	cfg := getConfig(c)
+	for _, folder := range cfg.Folders {
+		if folder.ID != rid {
+			continue
+		}
+		for _, device := range folder.Devices {
+			fmt.Println(device.DeviceID)
+		}
+		return
+	}
+	die("Folder " + rid + " not found")
+}
+
+func foldersDevicesAdd(c *cli.Context) {
+	rid := c.Args()[0]
+	nid := parseDeviceID(c.Args()[1])
+	cfg := getConfig(c)
+	for i, folder := range cfg.Folders {
+		if folder.ID != rid {
+			continue
+		}
+		for _, device := range folder.Devices {
+			if device.DeviceID == nid {
+				die("Device " + c.Args()[1] + " is already part of this folder")
+			}
+		}
+		for _, device := range cfg.Devices {
+			if device.DeviceID == nid {
+				cfg.Folders[i].Devices = append(folder.Devices, config.FolderDeviceConfiguration{
+					DeviceID: device.DeviceID,
+				})
+				setConfig(c, cfg)
+				return
+			}
+		}
+		die("Device " + c.Args()[1] + " not found in device list")
+	}
+	die("Folder " + rid + " not found")
+}
+
+func foldersDevicesRemove(c *cli.Context) {
+	rid := c.Args()[0]
+	nid := parseDeviceID(c.Args()[1])
+	cfg := getConfig(c)
+	for ri, folder := range cfg.Folders {
+		if folder.ID != rid {
+			continue
+		}
+		for ni, device := range folder.Devices {
+			if device.DeviceID == nid {
+				last := len(folder.Devices) - 1
+				cfg.Folders[ri].Devices[ni] = folder.Devices[last]
+				cfg.Folders[ri].Devices = cfg.Folders[ri].Devices[:last]
+				setConfig(c, cfg)
+				return
+			}
+		}
+		die("Device " + c.Args()[1] + " not found")
+	}
+	die("Folder " + rid + " not found")
+}
+
+func foldersDevicesClear(c *cli.Context) {
+	rid := c.Args()[0]
+	cfg := getConfig(c)
+	for i, folder := range cfg.Folders {
+		if folder.ID != rid {
+			continue
+		}
+		cfg.Folders[i].Devices = []config.FolderDeviceConfiguration{}
+		setConfig(c, cfg)
+		return
+	}
+	die("Folder " + rid + " not found")
+}
--- a/cmd/stcli/cmd_general.go
+++ b/cmd/stcli/cmd_general.go
@@ -0,0 +1,78 @@
+// Copyright (C) 2014 Audrius Butkevičius
+
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+
+	"github.com/AudriusButkevicius/cli"
+)
+
+func init() {
+	cliCommands = append(cliCommands, []cli.Command{
+		{
+			Name:     "id",
+			Usage:    "Get ID of the Syncthing client",
+			Requires: &cli.Requires{},
+			Action:   generalID,
+		},
+		{
+			Name:     "status",
+			Usage:    "Configuration status, whether or not a restart is required for changes to take effect",
+			Requires: &cli.Requires{},
+			Action:   generalStatus,
+		},
+		{
+			Name:     "restart",
+			Usage:    "Restart syncthing",
+			Requires: &cli.Requires{},
+			Action:   wrappedHTTPPost("system/restart"),
+		},
+		{
+			Name:     "shutdown",
+			Usage:    "Shutdown syncthing",
+			Requires: &cli.Requires{},
+			Action:   wrappedHTTPPost("system/shutdown"),
+		},
+		{
+			Name:     "reset",
+			Usage:    "Reset syncthing deleting all folders and devices",
+			Requires: &cli.Requires{},
+			Action:   wrappedHTTPPost("system/reset"),
+		},
+		{
+			Name:     "upgrade",
+			Usage:    "Upgrade syncthing (if a newer version is available)",
+			Requires: &cli.Requires{},
+			Action:   wrappedHTTPPost("system/upgrade"),
+		},
+		{
+			Name:     "version",
+			Usage:    "Syncthing client version",
+			Requires: &cli.Requires{},
+			Action:   generalVersion,
+		},
+	}...)
+}
+
+func generalID(c *cli.Context) {
+	fmt.Println(getMyID(c))
+}
+
+func generalStatus(c *cli.Context) {
+	response := httpGet(c, "system/config/insync")
+	var status struct{ ConfigInSync bool }
+	json.Unmarshal(responseToBArray(response), &status)
+	if !status.ConfigInSync {
+		die("Config out of sync")
+	}
+	fmt.Println("Config in sync")
+}
+
+func generalVersion(c *cli.Context) {
+	response := httpGet(c, "system/version")
+	version := make(map[string]interface{})
+	json.Unmarshal(responseToBArray(response), &version)
+	prettyPrintJSON(version)
+}
--- a/cmd/stcli/cmd_gui.go
+++ b/cmd/stcli/cmd_gui.go
@@ -0,0 +1,127 @@
+// Copyright (C) 2014 Audrius Butkevičius
+
+package main
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/AudriusButkevicius/cli"
+)
+
+func init() {
+	cliCommands = append(cliCommands, cli.Command{
+		Name:     "gui",
+		HideHelp: true,
+		Usage:    "GUI command group",
+		Subcommands: []cli.Command{
+			{
+				Name:     "dump",
+				Usage:    "Show all GUI configuration settings",
+				Requires: &cli.Requires{},
+				Action:   guiDump,
+			},
+			{
+				Name:     "get",
+				Usage:    "Get a GUI configuration setting",
+				Requires: &cli.Requires{"setting"},
+				Action:   guiGet,
+			},
+			{
+				Name:     "set",
+				Usage:    "Set a GUI configuration setting",
+				Requires: &cli.Requires{"setting", "value"},
+				Action:   guiSet,
+			},
+			{
+				Name:     "unset",
+				Usage:    "Unset a GUI configuration setting",
+				Requires: &cli.Requires{"setting"},
+				Action:   guiUnset,
+			},
+		},
+	})
+}
+
+func guiDump(c *cli.Context) {
+	cfg := getConfig(c).GUI
+	writer := newTableWriter()
+	fmt.Fprintln(writer, "Enabled:\t", cfg.Enabled, "\t(enabled)")
+	fmt.Fprintln(writer, "Use HTTPS:\t", cfg.UseTLS(), "\t(tls)")
+	fmt.Fprintln(writer, "Listen Addresses:\t", cfg.Address(), "\t(address)")
+	if cfg.User != "" {
+		fmt.Fprintln(writer, "Authentication User:\t", cfg.User, "\t(username)")
+		fmt.Fprintln(writer, "Authentication Password:\t", cfg.Password, "\t(password)")
+	}
+	if cfg.APIKey != "" {
+		fmt.Fprintln(writer, "API Key:\t", cfg.APIKey, "\t(apikey)")
+	}
+	writer.Flush()
+}
+
+func guiGet(c *cli.Context) {
+	cfg := getConfig(c).GUI
+	arg := c.Args()[0]
+	switch strings.ToLower(arg) {
+	case "enabled":
+		fmt.Println(cfg.Enabled)
+	case "tls":
+		fmt.Println(cfg.UseTLS())
+	case "address":
+		fmt.Println(cfg.Address())
+	case "user":
+		if cfg.User != "" {
+			fmt.Println(cfg.User)
+		}
+	case "password":
+		if cfg.User != "" {
+			fmt.Println(cfg.Password)
+		}
+	case "apikey":
+		if cfg.APIKey != "" {
+			fmt.Println(cfg.APIKey)
+		}
+	default:
+		die("Invalid setting: " + arg + "\nAvailable settings: enabled, tls, address, user, password, apikey")
+	}
+}
+
+func guiSet(c *cli.Context) {
+	cfg := getConfig(c)
+	arg := c.Args()[0]
+	val := c.Args()[1]
+	switch strings.ToLower(arg) {
+	case "enabled":
+		cfg.GUI.Enabled = parseBool(val)
+	case "tls":
+		cfg.GUI.RawUseTLS = parseBool(val)
+	case "address":
+		validAddress(val)
+		cfg.GUI.RawAddress = val
+	case "user":
+		cfg.GUI.User = val
+	case "password":
+		cfg.GUI.Password = val
+	case "apikey":
+		cfg.GUI.APIKey = val
+	default:
+		die("Invalid setting: " + arg + "\nAvailable settings: enabled, tls, address, user, password, apikey")
+	}
+	setConfig(c, cfg)
+}
+
+func guiUnset(c *cli.Context) {
+	cfg := getConfig(c)
+	arg := c.Args()[0]
+	switch strings.ToLower(arg) {
+	case "user":
+		cfg.GUI.User = ""
+	case "password":
+		cfg.GUI.Password = ""
+	case "apikey":
+		cfg.GUI.APIKey = ""
+	default:
+		die("Invalid setting: " + arg + "\nAvailable settings: user, password, apikey")
+	}
+	setConfig(c, cfg)
+}
--- a/cmd/stcli/cmd_options.go
+++ b/cmd/stcli/cmd_options.go
@@ -0,0 +1,173 @@
+// Copyright (C) 2014 Audrius Butkevičius
+
+package main
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/AudriusButkevicius/cli"
+)
+
+func init() {
+	cliCommands = append(cliCommands, cli.Command{
+		Name:     "options",
+		HideHelp: true,
+		Usage:    "Options command group",
+		Subcommands: []cli.Command{
+			{
+				Name:     "dump",
+				Usage:    "Show all Syncthing option settings",
+				Requires: &cli.Requires{},
+				Action:   optionsDump,
+			},
+			{
+				Name:     "get",
+				Usage:    "Get a Syncthing option setting",
+				Requires: &cli.Requires{"setting"},
+				Action:   optionsGet,
+			},
+			{
+				Name:     "set",
+				Usage:    "Set a Syncthing option setting",
+				Requires: &cli.Requires{"setting", "value..."},
+				Action:   optionsSet,
+			},
+		},
+	})
+}
+
+func optionsDump(c *cli.Context) {
+	cfg := getConfig(c).Options
+	writer := newTableWriter()
+
+	fmt.Fprintln(writer, "Sync protocol listen addresses:\t", strings.Join(cfg.ListenAddresses, " "), "\t(addresses)")
+	fmt.Fprintln(writer, "Global discovery enabled:\t", cfg.GlobalAnnEnabled, "\t(globalannenabled)")
+	fmt.Fprintln(writer, "Global discovery servers:\t", strings.Join(cfg.GlobalAnnServers, " "), "\t(globalannserver)")
+
+	fmt.Fprintln(writer, "Local discovery enabled:\t", cfg.LocalAnnEnabled, "\t(localannenabled)")
+	fmt.Fprintln(writer, "Local discovery port:\t", cfg.LocalAnnPort, "\t(localannport)")
+
+	fmt.Fprintln(writer, "Outgoing rate limit in KiB/s:\t", cfg.MaxSendKbps, "\t(maxsend)")
+	fmt.Fprintln(writer, "Incoming rate limit in KiB/s:\t", cfg.MaxRecvKbps, "\t(maxrecv)")
+	fmt.Fprintln(writer, "Reconnect interval in seconds:\t", cfg.ReconnectIntervalS, "\t(reconnect)")
+	fmt.Fprintln(writer, "Start browser:\t", cfg.StartBrowser, "\t(browser)")
+	fmt.Fprintln(writer, "Enable UPnP:\t", cfg.NATEnabled, "\t(nat)")
+	fmt.Fprintln(writer, "UPnP Lease in minutes:\t", cfg.NATLeaseM, "\t(natlease)")
+	fmt.Fprintln(writer, "UPnP Renewal period in minutes:\t", cfg.NATRenewalM, "\t(natrenew)")
+	fmt.Fprintln(writer, "Restart on Wake Up:\t", cfg.RestartOnWakeup, "\t(wake)")
+
+	reporting := "unrecognized value"
+	switch cfg.URAccepted {
+	case -1:
+		reporting = "false"
+	case 0:
+		reporting = "undecided/false"
+	case 1:
+		reporting = "true"
+	}
+	fmt.Fprintln(writer, "Anonymous usage reporting:\t", reporting, "\t(reporting)")
+
+	writer.Flush()
+}
+
+func optionsGet(c *cli.Context) {
+	cfg := getConfig(c).Options
+	arg := c.Args()[0]
+	switch strings.ToLower(arg) {
+	case "address":
+		fmt.Println(strings.Join(cfg.ListenAddresses, "\n"))
+	case "globalannenabled":
+		fmt.Println(cfg.GlobalAnnEnabled)
+	case "globalannservers":
+		fmt.Println(strings.Join(cfg.GlobalAnnServers, "\n"))
+	case "localannenabled":
+		fmt.Println(cfg.LocalAnnEnabled)
+	case "localannport":
+		fmt.Println(cfg.LocalAnnPort)
+	case "maxsend":
+		fmt.Println(cfg.MaxSendKbps)
+	case "maxrecv":
+		fmt.Println(cfg.MaxRecvKbps)
+	case "reconnect":
+		fmt.Println(cfg.ReconnectIntervalS)
+	case "browser":
+		fmt.Println(cfg.StartBrowser)
+	case "nat":
+		fmt.Println(cfg.NATEnabled)
+	case "natlease":
+		fmt.Println(cfg.NATLeaseM)
+	case "natrenew":
+		fmt.Println(cfg.NATRenewalM)
+	case "reporting":
+		switch cfg.URAccepted {
+		case -1:
+			fmt.Println("false")
+		case 0:
+			fmt.Println("undecided/false")
+		case 1:
+			fmt.Println("true")
+		default:
+			fmt.Println("unknown")
+		}
+	case "wake":
+		fmt.Println(cfg.RestartOnWakeup)
+	default:
+		die("Invalid setting: " + arg + "\nAvailable settings: address, globalannenabled, globalannserver, localannenabled, localannport, maxsend, maxrecv, reconnect, browser, upnp, upnplease, upnprenew, reporting, wake")
+	}
+}
+
+func optionsSet(c *cli.Context) {
+	config := getConfig(c)
+	arg := c.Args()[0]
+	val := c.Args()[1]
+	switch strings.ToLower(arg) {
+	case "address":
+		for _, item := range c.Args().Tail() {
+			validAddress(item)
+		}
+		config.Options.ListenAddresses = c.Args().Tail()
+	case "globalannenabled":
+		config.Options.GlobalAnnEnabled = parseBool(val)
+	case "globalannserver":
+		for _, item := range c.Args().Tail() {
+			validAddress(item)
+		}
+		config.Options.GlobalAnnServers = c.Args().Tail()
+	case "localannenabled":
+		config.Options.LocalAnnEnabled = parseBool(val)
+	case "localannport":
+		config.Options.LocalAnnPort = parsePort(val)
+	case "maxsend":
+		config.Options.MaxSendKbps = parseUint(val)
+	case "maxrecv":
+		config.Options.MaxRecvKbps = parseUint(val)
+	case "reconnect":
+		config.Options.ReconnectIntervalS = parseUint(val)
+	case "browser":
+		config.Options.StartBrowser = parseBool(val)
+	case "nat":
+		config.Options.NATEnabled = parseBool(val)
+	case "natlease":
+		config.Options.NATLeaseM = parseUint(val)
+	case "natrenew":
+		config.Options.NATRenewalM = parseUint(val)
+	case "reporting":
+		switch strings.ToLower(val) {
+		case "u", "undecided", "unset":
+			config.Options.URAccepted = 0
+		default:
+			boolvalue := parseBool(val)
+			if boolvalue {
+				config.Options.URAccepted = 1
+			} else {
+				config.Options.URAccepted = -1
+			}
+		}
+	case "wake":
+		config.Options.RestartOnWakeup = parseBool(val)
+	default:
+		die("Invalid setting: " + arg + "\nAvailable settings: address, globalannenabled, globalannserver, localannenabled, localannport, maxsend, maxrecv, reconnect, browser, upnp, upnplease, upnprenew, reporting, wake")
+	}
+	setConfig(c, config)
+}
--- a/cmd/stcli/cmd_report.go
+++ b/cmd/stcli/cmd_report.go
@@ -0,0 +1,72 @@
+// Copyright (C) 2014 Audrius Butkevičius
+
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+
+	"github.com/AudriusButkevicius/cli"
+)
+
+func init() {
+	cliCommands = append(cliCommands, cli.Command{
+		Name:     "report",
+		HideHelp: true,
+		Usage:    "Reporting command group",
+		Subcommands: []cli.Command{
+			{
+				Name:     "system",
+				Usage:    "Report system state",
+				Requires: &cli.Requires{},
+				Action:   reportSystem,
+			},
+			{
+				Name:     "connections",
+				Usage:    "Report about connections to other devices",
+				Requires: &cli.Requires{},
+				Action:   reportConnections,
+			},
+			{
+				Name:     "usage",
+				Usage:    "Usage report",
+				Requires: &cli.Requires{},
+				Action:   reportUsage,
+			},
+		},
+	})
+}
+
+func reportSystem(c *cli.Context) {
+	response := httpGet(c, "system/status")
+	data := make(map[string]interface{})
+	json.Unmarshal(responseToBArray(response), &data)
+	prettyPrintJSON(data)
+}
+
+func reportConnections(c *cli.Context) {
+	response := httpGet(c, "system/connections")
+	data := make(map[string]map[string]interface{})
+	json.Unmarshal(responseToBArray(response), &data)
+	var overall map[string]interface{}
+	for key, value := range data {
+		if key == "total" {
+			overall = value
+			continue
+		}
+		value["Device ID"] = key
+		prettyPrintJSON(value)
+		fmt.Println()
+	}
+	if overall != nil {
+		fmt.Println("=== Overall statistics ===")
+		prettyPrintJSON(overall)
+	}
+}
+
+func reportUsage(c *cli.Context) {
+	response := httpGet(c, "svc/report")
+	report := make(map[string]interface{})
+	json.Unmarshal(responseToBArray(response), &report)
+	prettyPrintJSON(report)
+}
--- a/cmd/stcli/labels.go
+++ b/cmd/stcli/labels.go
@@ -0,0 +1,31 @@
+// Copyright (C) 2014 Audrius Butkevičius
+
+package main
+
+var jsonAttributeLabels = map[string]string{
+	"folderMaxMiB":   "Largest folder size in MiB",
+	"folderMaxFiles": "Largest folder file count",
+	"longVersion":    "Long version",
+	"totMiB":         "Total size in MiB",
+	"totFiles":       "Total files",
+	"uniqueID":       "Unique ID",
+	"numFolders":     "Folder count",
+	"numDevices":     "Device count",
+	"memoryUsageMiB": "Memory usage in MiB",
+	"memorySize":     "Total memory in MiB",
+	"sha256Perf":     "SHA256 Benchmark",
+	"At":             "Last contacted",
+	"Completion":     "Percent complete",
+	"InBytesTotal":   "Total bytes received",
+	"OutBytesTotal":  "Total bytes sent",
+	"ClientVersion":  "Client version",
+	"alloc":          "Memory allocated in bytes",
+	"sys":            "Memory using in bytes",
+	"cpuPercent":     "CPU load in percent",
+	"extAnnounceOK":  "External announcments working",
+	"goroutines":     "Number of Go routines",
+	"myID":           "Client ID",
+	"tilde":          "Tilde expands to",
+	"arch":           "Architecture",
+	"os":             "OS",
+}
--- a/cmd/stcli/main.go
+++ b/cmd/stcli/main.go
@@ -0,0 +1,63 @@
+// Copyright (C) 2014 Audrius Butkevičius
+
+package main
+
+import (
+	"sort"
+
+	"github.com/AudriusButkevicius/cli"
+)
+
+type ByAlphabet []cli.Command
+
+func (a ByAlphabet) Len() int           { return len(a) }
+func (a ByAlphabet) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
+func (a ByAlphabet) Less(i, j int) bool { return a[i].Name < a[j].Name }
+
+var cliCommands []cli.Command
+
+func main() {
+	app := cli.NewApp()
+	app.Name = "syncthing-cli"
+	app.Author = "Audrius Butkevičius"
+	app.Email = "audrius.butkevicius@gmail.com"
+	app.Usage = "Syncthing command line interface"
+	app.Version = "0.1"
+	app.HideHelp = true
+
+	app.Flags = []cli.Flag{
+		cli.StringFlag{
+			Name:   "endpoint, e",
+			Value:  "http://127.0.0.1:8384",
+			Usage:  "End point to connect to",
+			EnvVar: "STENDPOINT",
+		},
+		cli.StringFlag{
+			Name:   "apikey, k",
+			Value:  "",
+			Usage:  "API Key",
+			EnvVar: "STAPIKEY",
+		},
+		cli.StringFlag{
+			Name:   "username, u",
+			Value:  "",
+			Usage:  "Username",
+			EnvVar: "STUSERNAME",
+		},
+		cli.StringFlag{
+			Name:   "password, p",
+			Value:  "",
+			Usage:  "Password",
+			EnvVar: "STPASSWORD",
+		},
+		cli.BoolFlag{
+			Name:   "insecure, i",
+			Usage:  "Do not verify SSL certificate",
+			EnvVar: "STINSECURE",
+		},
+	}
+
+	sort.Sort(ByAlphabet(cliCommands))
+	app.Commands = cliCommands
+	app.RunAndExitOnError()
+}
--- a/cmd/stcli/utils.go
+++ b/cmd/stcli/utils.go
@@ -0,0 +1,165 @@
+// Copyright (C) 2014 Audrius Butkevičius
+
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"os"
+	"regexp"
+	"sort"
+	"strconv"
+	"strings"
+	"text/tabwriter"
+	"unicode"
+
+	"github.com/AudriusButkevicius/cli"
+	"github.com/syncthing/syncthing/lib/config"
+	"github.com/syncthing/syncthing/lib/protocol"
+)
+
+func responseToBArray(response *http.Response) []byte {
+	defer response.Body.Close()
+	bytes, err := ioutil.ReadAll(response.Body)
+	if err != nil {
+		die(err)
+	}
+	return bytes
+}
+
+func die(vals ...interface{}) {
+	if len(vals) > 1 || vals[0] != nil {
+		os.Stderr.WriteString(fmt.Sprintln(vals...))
+		os.Exit(1)
+	}
+}
+
+func wrappedHTTPPost(url string) func(c *cli.Context) {
+	return func(c *cli.Context) {
+		httpPost(c, url, "")
+	}
+}
+
+func prettyPrintJSON(json map[string]interface{}) {
+	writer := newTableWriter()
+	remap := make(map[string]interface{})
+	for k, v := range json {
+		key, ok := jsonAttributeLabels[k]
+		if !ok {
+			key = firstUpper(k)
+		}
+		remap[key] = v
+	}
+
+	jsonKeys := make([]string, 0, len(remap))
+	for key := range remap {
+		jsonKeys = append(jsonKeys, key)
+	}
+	sort.Strings(jsonKeys)
+	for _, k := range jsonKeys {
+		var value string
+		rvalue := remap[k]
+		switch rvalue.(type) {
+		case int, int16, int32, int64, uint, uint16, uint32, uint64, float32, float64:
+			value = fmt.Sprintf("%.0f", rvalue)
+		default:
+			value = fmt.Sprint(rvalue)
+		}
+		if value == "" {
+			continue
+		}
+		fmt.Fprintln(writer, k+":\t"+value)
+	}
+	writer.Flush()
+}
+
+func firstUpper(str string) string {
+	for i, v := range str {
+		return string(unicode.ToUpper(v)) + str[i+1:]
+	}
+	return ""
+}
+
+func newTableWriter() *tabwriter.Writer {
+	writer := new(tabwriter.Writer)
+	writer.Init(os.Stdout, 0, 8, 0, '\t', 0)
+	return writer
+}
+
+func getMyID(c *cli.Context) string {
+	response := httpGet(c, "system/status")
+	data := make(map[string]interface{})
+	json.Unmarshal(responseToBArray(response), &data)
+	return data["myID"].(string)
+}
+
+func getConfig(c *cli.Context) config.Configuration {
+	response := httpGet(c, "system/config")
+	config := config.Configuration{}
+	json.Unmarshal(responseToBArray(response), &config)
+	return config
+}
+
+func setConfig(c *cli.Context, cfg config.Configuration) {
+	body, err := json.Marshal(cfg)
+	die(err)
+	response := httpPost(c, "system/config", string(body))
+	if response.StatusCode != 200 {
+		die("Unexpected status code", response.StatusCode)
+	}
+}
+
+func parseBool(input string) bool {
+	val, err := strconv.ParseBool(input)
+	if err != nil {
+		die(input + " is not a valid value for a boolean")
+	}
+	return val
+}
+
+func parseInt(input string) int {
+	val, err := strconv.ParseInt(input, 0, 64)
+	if err != nil {
+		die(input + " is not a valid value for an integer")
+	}
+	return int(val)
+}
+
+func parseUint(input string) int {
+	val, err := strconv.ParseUint(input, 0, 64)
+	if err != nil {
+		die(input + " is not a valid value for an unsigned integer")
+	}
+	return int(val)
+}
+
+func parsePort(input string) int {
+	port := parseUint(input)
+	if port < 1 || port > 65535 {
+		die(input + " is not a valid port\nExpected value between 1 and 65535")
+	}
+	return port
+}
+
+func validAddress(input string) {
+	tokens := strings.Split(input, ":")
+	if len(tokens) != 2 {
+		die(input + " is not a valid value for an address\nExpected format <ip or hostname>:<port>")
+	}
+	matched, err := regexp.MatchString("^[a-zA-Z0-9]+([-a-zA-Z0-9.]+[-a-zA-Z0-9]+)?$", tokens[0])
+	die(err)
+	if !matched {
+		die(input + " is not a valid value for an address\nExpected format <ip or hostname>:<port>")
+	}
+	parsePort(tokens[1])
+}
+
+func parseDeviceID(input string) protocol.DeviceID {
+	device, err := protocol.DeviceIDFromString(input)
+	if err != nil {
+		die(input + " is not a valid device id")
+	}
+	return device
+}
--- a/cmd/stdisco/main.go
+++ b/cmd/stdisco/main.go
@@ -7,7 +7,6 @@
 package main

 import (
-	"bytes"
 	"crypto/rand"
 	"encoding/binary"
 	"flag"
@@ -45,7 +44,7 @@ func main() {
 	flag.Parse()

 	if fake {
-		log.Println("My ID:", protocol.DeviceIDFromBytes(myID))
+		log.Println("My ID:", myID)
 	}

 	runbeacon(beacon.NewMulticast(mc), fake)
@@ -75,17 +74,17 @@ func recv(bc beacon.Interface) {
 		var ann discover.Announce
 		ann.Unmarshal(data[4:])

-		if bytes.Equal(ann.ID, myID) {
+		if ann.ID == myID {
 			// This is one of our own fake packets, don't print it.
 			continue
 		}

 		// Print announcement details for the first packet from a given
 		// device ID and source address, or if -all was given.
-		key := string(ann.ID) + src.String()
+		key := ann.ID.String() + src.String()
 		if all || !seen[key] {
 			log.Printf("Announcement from %v\n", src)
-			log.Printf(" %v at %s\n", protocol.DeviceIDFromBytes(ann.ID), strings.Join(ann.Addresses, ", "))
+			log.Printf(" %v at %s\n", ann.ID, strings.Join(ann.Addresses, ", "))
 			seen[key] = true
 		}
 	}
@@ -106,9 +105,9 @@ func send(bc beacon.Interface) {
 }

 // returns a random but recognizable device ID
-func randomDeviceID() []byte {
-	var id [32]byte
+func randomDeviceID() protocol.DeviceID {
+	var id protocol.DeviceID
 	copy(id[:], randomPrefix)
 	rand.Read(id[len(randomPrefix):])
-	return id[:]
+	return id
 }
--- a/cmd/stdiscosrv/README.md
+++ b/cmd/stdiscosrv/README.md
@@ -38,3 +38,7 @@ In all cases, the appropriate tables and indexes will be created at first
 startup. If it doesn't exit with an error, you're fine.

 See `stdiscosrv -help` for other options.
+
+##### Third-party attribution
+
+[cznic/lldb](https://github.com/cznic/lldb), Copyright (C) 2014 The lldb Authors.
--- a/cmd/stdiscosrv/main.go
+++ b/cmd/stdiscosrv/main.go
@@ -14,6 +14,7 @@ import (
 	"time"

 	"github.com/syncthing/syncthing/lib/protocol"
+	"github.com/syncthing/syncthing/lib/tlsutil"
 	"github.com/thejerf/suture"
 )

@@ -86,7 +87,11 @@ func main() {
 	if !useHTTP {
 		cert, err = tls.LoadX509KeyPair(certFile, keyFile)
 		if err != nil {
-			log.Fatalln("Failed to load X509 key pair:", err)
+			log.Println("Failed to load keypair. Generating one, this might take a while...")
+			cert, err = tlsutil.NewCertificate(certFile, keyFile, "stdiscosrv", 3072)
+			if err != nil {
+				log.Fatalln("Failed to generate X509 key pair:", err)
+			}
 		}

 		devID := protocol.NewDeviceID(cert.Certificate[0])
--- a/cmd/stdiscosrv/psql.go
+++ b/cmd/stdiscosrv/psql.go
@@ -27,8 +27,9 @@ func postgresSetup(db *sql.DB) error {
 		return err
 	}

+	var tmp string
 	row := db.QueryRow(`SELECT 'DevicesDeviceIDIndex'::regclass`)
-	if err = row.Scan(nil); err != nil {
+	if err = row.Scan(&tmp); err != nil {
 		_, err = db.Exec(`CREATE INDEX DevicesDeviceIDIndex ON Devices (DeviceID)`)
 	}
 	if err != nil {
@@ -36,7 +37,7 @@ func postgresSetup(db *sql.DB) error {
 	}

 	row = db.QueryRow(`SELECT 'DevicesSeenIndex'::regclass`)
-	if err = row.Scan(nil); err != nil {
+	if err = row.Scan(&tmp); err != nil {
 		_, err = db.Exec(`CREATE INDEX DevicesSeenIndex ON Devices (Seen)`)
 	}
 	if err != nil {
@@ -46,14 +47,14 @@ func postgresSetup(db *sql.DB) error {
 	_, err = db.Exec(`CREATE TABLE IF NOT EXISTS Addresses (
 		DeviceID CHAR(63) NOT NULL,
 		Seen TIMESTAMP NOT NULL,
-		Address VARCHAR(256) NOT NULL
+		Address VARCHAR(2048) NOT NULL
 	)`)
 	if err != nil {
 		return err
 	}

 	row = db.QueryRow(`SELECT 'AddressesDeviceIDSeenIndex'::regclass`)
-	if err = row.Scan(nil); err != nil {
+	if err = row.Scan(&tmp); err != nil {
 		_, err = db.Exec(`CREATE INDEX AddressesDeviceIDSeenIndex ON Addresses (DeviceID, Seen)`)
 	}
 	if err != nil {
@@ -61,7 +62,7 @@ func postgresSetup(db *sql.DB) error {
 	}

 	row = db.QueryRow(`SELECT 'AddressesDeviceIDAddressIndex'::regclass`)
-	if err = row.Scan(nil); err != nil {
+	if err = row.Scan(&tmp); err != nil {
 		_, err = db.Exec(`CREATE INDEX AddressesDeviceIDAddressIndex ON Addresses (DeviceID, Address)`)
 	}
 	if err != nil {
--- a/cmd/stdiscosrv/querysrv.go
+++ b/cmd/stdiscosrv/querysrv.go
@@ -19,9 +19,9 @@ import (
 	"time"

 	"github.com/golang/groupcache/lru"
-	"github.com/juju/ratelimit"
 	"github.com/syncthing/syncthing/lib/protocol"
 	"golang.org/x/net/context"
+	"golang.org/x/time/rate"
 )

 type querysrv struct {
@@ -62,6 +62,10 @@ func (i requestID) String() string {
 	return fmt.Sprintf("%016x", int64(i))
 }

+type contextKey int
+
+const idKey contextKey = iota
+
 func negCacheFor(lastSeen time.Time) int {
 	since := time.Since(lastSeen).Seconds()
 	if since >= maxDeviceAge {
@@ -132,7 +136,7 @@ var topCtx = context.Background()

 func (s *querysrv) handler(w http.ResponseWriter, req *http.Request) {
 	reqID := requestID(rand.Int63())
-	ctx := context.WithValue(topCtx, "id", reqID)
+	ctx := context.WithValue(topCtx, idKey, reqID)

 	if debug {
 		log.Println(reqID, req.Method, req.URL)
@@ -186,7 +190,7 @@ func (s *querysrv) handler(w http.ResponseWriter, req *http.Request) {
 }

 func (s *querysrv) handleGET(ctx context.Context, w http.ResponseWriter, req *http.Request) {
-	reqID := ctx.Value("id").(requestID)
+	reqID := ctx.Value(idKey).(requestID)

 	deviceID, err := protocol.DeviceIDFromString(req.URL.Query().Get("device"))
 	if err != nil {
@@ -238,7 +242,7 @@ func (s *querysrv) handleGET(ctx context.Context, w http.ResponseWriter, req *ht
 }

 func (s *querysrv) handlePOST(ctx context.Context, remoteIP net.IP, w http.ResponseWriter, req *http.Request) {
-	reqID := ctx.Value("id").(requestID)
+	reqID := ctx.Value(idKey).(requestID)

 	rawCert := certificateBytes(req)
 	if rawCert == nil {
@@ -299,7 +303,7 @@ func (s *querysrv) Stop() {
 }

 func (s *querysrv) handleAnnounce(ctx context.Context, remote net.IP, deviceID protocol.DeviceID, addresses []string) (userErr, internalErr error) {
-	reqID := ctx.Value("id").(requestID)
+	reqID := ctx.Value(idKey).(requestID)

 	tx, err := s.db.Begin()
 	if err != nil {
@@ -369,21 +373,21 @@ func (s *querysrv) limit(remote net.IP) bool {

 	bkt, ok := s.limiter.Get(key)
 	if ok {
-		bkt := bkt.(*ratelimit.Bucket)
-		if bkt.TakeAvailable(1) != 1 {
+		bkt := bkt.(*rate.Limiter)
+		if !bkt.Allow() {
 			// Rate limit exceeded; ignore packet
 			return true
 		}
 	} else {
-		// One packet per ten seconds average rate, burst ten packets
-		s.limiter.Add(key, ratelimit.NewBucket(10*time.Second/time.Duration(limitAvg), int64(limitBurst)))
+		// limitAvg is in packets per ten seconds.
+		s.limiter.Add(key, rate.NewLimiter(rate.Limit(limitAvg)/10, limitBurst))
 	}

 	return false
 }

 func (s *querysrv) updateDevice(ctx context.Context, tx *sql.Tx, device protocol.DeviceID) error {
-	reqID := ctx.Value("id").(requestID)
+	reqID := ctx.Value(idKey).(requestID)
 	t0 := time.Now()
 	res, err := tx.Stmt(s.prep["updateDevice"]).Exec(device.String())
 	if err != nil {
@@ -451,7 +455,7 @@ func (s *querysrv) getDeviceSeen(device protocol.DeviceID) (time.Time, error) {
 	if err := row.Scan(&seen); err != nil {
 		return time.Time{}, err
 	}
-	return seen, nil
+	return seen.In(time.UTC), nil
 }

 func handlePing(w http.ResponseWriter, r *http.Request) {
--- a/cmd/stfileinfo/main.go
+++ b/cmd/stfileinfo/main.go
@@ -40,7 +40,8 @@ func main() {
 	log.Println("Lstat:")
 	log.Printf("  Size: %d bytes", fi.Size())
 	log.Printf("  Mode: 0%o", fi.Mode())
-	log.Printf("  Time: %v (%d)", fi.ModTime(), fi.ModTime().Unix())
+	log.Printf("  Time: %v", fi.ModTime())
+	log.Printf("        %d.%09d", fi.ModTime().Unix(), fi.ModTime().Nanosecond())
 	log.Println()

 	if !fi.Mode().IsDir() && !fi.Mode().IsRegular() {
@@ -52,7 +53,8 @@ func main() {
 		log.Println("Stat:")
 		log.Printf("  Size: %d bytes", fi.Size())
 		log.Printf("  Mode: 0%o", fi.Mode())
-		log.Printf("  Time: %v (%d)", fi.ModTime(), fi.ModTime().Unix())
+		log.Printf("  Time: %v", fi.ModTime())
+		log.Printf("        %d.%09d", fi.ModTime().Unix(), fi.ModTime().Nanosecond())
 		log.Println()
 	}

--- a/cmd/stfinddevice/main.go
+++ b/cmd/stfinddevice/main.go
@@ -66,7 +66,7 @@ func checkServers(deviceID protocol.DeviceID, servers ...string) {
 		}()
 	}

-	for _ = range servers {
+	for range servers {
 		res := <-resc

 		u, _ := url.Parse(res.server)
--- a/cmd/stgenfiles/main.go
+++ b/cmd/stgenfiles/main.go
@@ -66,7 +66,7 @@ func generateFiles(dir string, files, maxexp int, srcname string) error {
 }

 func generateOneFile(fd io.ReadSeeker, p1 string, s int64) error {
-	src := io.LimitReader(&inifiteReader{fd}, int64(s))
+	src := io.LimitReader(&inifiteReader{fd}, s)
 	dst, err := os.Create(p1)
 	if err != nil {
 		return err
@@ -85,12 +85,7 @@ func generateOneFile(fd io.ReadSeeker, p1 string, s int64) error {
 	_ = os.Chmod(p1, os.FileMode(rand.Intn(0777)|0400))

 	t := time.Now().Add(-time.Duration(rand.Intn(30*86400)) * time.Second)
-	err = os.Chtimes(p1, t, t)
-	if err != nil {
-		return err
-	}
-
-	return nil
+	return os.Chtimes(p1, t, t)
 }

 func randomName() string {
--- a/cmd/stindex/dump.go
+++ b/cmd/stindex/dump.go
@@ -10,6 +10,7 @@ import (
 	"encoding/binary"
 	"fmt"
 	"log"
+	"time"

 	"github.com/syncthing/syncthing/lib/db"
 	"github.com/syncthing/syncthing/lib/protocol"
@@ -53,7 +54,13 @@ func dump(ldb *db.Instance) {
 			fmt.Printf("[fstat] K:%x V:%x\n", it.Key(), it.Value())

 		case db.KeyTypeVirtualMtime:
-			fmt.Printf("[mtime] K:%x V:%x\n", it.Key(), it.Value())
+			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)

 		case db.KeyTypeFolderIdx:
 			key := binary.BigEndian.Uint32(it.Key()[1:])
--- a/cmd/strelaypoolsrv/README.md
+++ b/cmd/strelaypoolsrv/README.md
@@ -13,3 +13,9 @@ If you still want to run it, you can run `go get github.com/syncthing/relaypools
 from the build server.

 See `relaypoolsrv -help` for configuration options.
+
+##### Third-party attributions
+
+[oschwald/geoip2-golang](https://github.com/oschwald/geoip2-golang), [oschwald/maxminddb-golang](https://github.com/oschwald/maxminddb-golang), Copyright (C) 2015 [Gregory J. Oschwald](mailto:oschwald@gmail.com).
+
+[lib/pq](https://github.com/lib/pq)</a>, Copyright (C) 2011-2013 'pq' Contributors Portions Copyright (C) 2011 Blake Mizerany.
--- a/cmd/strelaypoolsrv/gui/index.html
+++ b/cmd/strelaypoolsrv/gui/index.html
@@ -56,32 +56,32 @@
            <tr>
              <th rowspan="2">Address</td>
              <th rowspan="2">
-                <a ng-click="sortType = 'status.numActiveSessions || -1'; sortReverse = !sortReverse">
+                <a ng-click="sortType = 'status.numActiveSessions'; sortReverse = !sortReverse">
                  Sessions
-                  <span ng-show="sortType == 'status.numActiveSessions || -1' && !sortReverse" class="fa fa-caret-down"></span>
-                  <span ng-show="sortType == 'status.numActiveSessions || -1' && sortReverse" class="fa fa-caret-up"></span>
+                  <span ng-show="sortType == 'status.numActiveSessions' && !sortReverse" class="fa fa-caret-down"></span>
+                  <span ng-show="sortType == 'status.numActiveSessions' && sortReverse" class="fa fa-caret-up"></span>
                </a>
              </th>
              <th rowspan="2">
-                <a ng-click="sortType = 'status.numConnections || -1'; sortReverse = !sortReverse">
+                <a ng-click="sortType = 'status.numConnections'; sortReverse = !sortReverse">
                  Connections
-                  <span ng-show="sortType == 'status.numConnections || -1' && !sortReverse" class="fa fa-caret-down"></span>
-                  <span ng-show="sortType == 'status.numConnections || -1' && sortReverse" class="fa fa-caret-up"></span>
+                  <span ng-show="sortType == 'status.numConnections' && !sortReverse" class="fa fa-caret-down"></span>
+                  <span ng-show="sortType == 'status.numConnections' && sortReverse" class="fa fa-caret-up"></span>
                </a>
              </th>
              <th rowspan="2">
-                <a ng-click="sortType = 'status.bytesProxied || -1'; sortReverse = !sortReverse">
+                <a ng-click="sortType = 'status.bytesProxied'; sortReverse = !sortReverse">
                  Data relayed
-                  <span ng-show="sortType == 'status.bytesProxied || -1' && !sortReverse" class="fa fa-caret-down"></span>
-                  <span ng-show="sortType == 'status.bytesProxied || -1' && sortReverse" class="fa fa-caret-up"></span>
+                  <span ng-show="sortType == 'status.bytesProxied' && !sortReverse" class="fa fa-caret-down"></span>
+                  <span ng-show="sortType == 'status.bytesProxied' && sortReverse" class="fa fa-caret-up"></span>
                </a>
              </th>
              <th colspan="6" class="text-center">Transfer rate in the last period</th>
              <th rowspan="2">
-                <a ng-click="sortType = 'status.uptimeSeconds || -1'; sortReverse = !sortReverse">
+                <a ng-click="sortType = 'status.uptimeSeconds'; sortReverse = !sortReverse">
                  Uptime hours
-                  <span ng-show="sortType == 'status.uptimeSeconds || -1' && !sortReverse" class="fa fa-caret-down"></span>
-                  <span ng-show="sortType == 'status.uptimeSeconds || -1' && sortReverse" class="fa fa-caret-up"></span>
+                  <span ng-show="sortType == 'status.uptimeSeconds' && !sortReverse" class="fa fa-caret-down"></span>
+                  <span ng-show="sortType == 'status.uptimeSeconds' && sortReverse" class="fa fa-caret-up"></span>
                </a>
              </th>
              <th rowspan="2">
@@ -94,51 +94,51 @@
            </tr>
            <tr>
              <th>
-                <a ng-click="sortType = 'status.kbps10s1m5m15m30m60m[0] || -1'; sortReverse = !sortReverse">
+                <a ng-click="sortType = 'status.kbps10s1m5m15m30m60m[0]'; sortReverse = !sortReverse">
                  10s
-                  <span ng-show="sortType == 'status.kbps10s1m5m15m30m60m[0] || -1' && !sortReverse" class="fa fa-caret-down"></span>
-                  <span ng-show="sortType == 'status.kbps10s1m5m15m30m60m[0] || -1' && sortReverse" class="fa fa-caret-up"></span>
+                  <span ng-show="sortType == 'status.kbps10s1m5m15m30m60m[0]' && !sortReverse" class="fa fa-caret-down"></span>
+                  <span ng-show="sortType == 'status.kbps10s1m5m15m30m60m[0]' && sortReverse" class="fa fa-caret-up"></span>
                </a>
              </th>
              <th>
-                <a ng-click="sortType = 'status.kbps10s1m5m15m30m60m[1] || -1'; sortReverse = !sortReverse">
+                <a ng-click="sortType = 'status.kbps10s1m5m15m30m60m[1]'; sortReverse = !sortReverse">
                  1m
-                  <span ng-show="sortType == 'status.kbps10s1m5m15m30m60m[1] || -1' && !sortReverse" class="fa fa-caret-down"></span>
-                  <span ng-show="sortType == 'status.kbps10s1m5m15m30m60m[1] || -1' && sortReverse" class="fa fa-caret-up"></span>
+                  <span ng-show="sortType == 'status.kbps10s1m5m15m30m60m[1]' && !sortReverse" class="fa fa-caret-down"></span>
+                  <span ng-show="sortType == 'status.kbps10s1m5m15m30m60m[1]' && sortReverse" class="fa fa-caret-up"></span>
                </a>
              </th>
              <th>
-                <a ng-click="sortType = 'status.kbps10s1m5m15m30m60m[2] || -1'; sortReverse = !sortReverse">
+                <a ng-click="sortType = 'status.kbps10s1m5m15m30m60m[2]'; sortReverse = !sortReverse">
                  5m
-                  <span ng-show="sortType == 'status.kbps10s1m5m15m30m60m[2] || -1' && !sortReverse" class="fa fa-caret-down"></span>
-                  <span ng-show="sortType == 'status.kbps10s1m5m15m30m60m[2] || -1' && sortReverse" class="fa fa-caret-up"></span>
+                  <span ng-show="sortType == 'status.kbps10s1m5m15m30m60m[2]' && !sortReverse" class="fa fa-caret-down"></span>
+                  <span ng-show="sortType == 'status.kbps10s1m5m15m30m60m[2]' && sortReverse" class="fa fa-caret-up"></span>
                </a>
              </th>
              <th>
-                <a ng-click="sortType = 'status.kbps10s1m5m15m30m60m[3] || -1'; sortReverse = !sortReverse">
+                <a ng-click="sortType = 'status.kbps10s1m5m15m30m60m[3]'; sortReverse = !sortReverse">
                  15m
-                  <span ng-show="sortType == 'status.kbps10s1m5m15m30m60m[3] || -1' && !sortReverse" class="fa fa-caret-down"></span>
-                  <span ng-show="sortType == 'status.kbps10s1m5m15m30m60m[3] || -1' && sortReverse" class="fa fa-caret-up"></span>
+                  <span ng-show="sortType == 'status.kbps10s1m5m15m30m60m[3]' && !sortReverse" class="fa fa-caret-down"></span>
+                  <span ng-show="sortType == 'status.kbps10s1m5m15m30m60m[3]' && sortReverse" class="fa fa-caret-up"></span>
                </a>
              </th>
              <th>
-                <a ng-click="sortType = 'status.kbps10s1m5m15m30m60m[4] || -1'; sortReverse = !sortReverse">
+                <a ng-click="sortType = 'status.kbps10s1m5m15m30m60m[4]'; sortReverse = !sortReverse">
                  30m
-                  <span ng-show="sortType == 'status.kbps10s1m5m15m30m60m[4] || -1' && !sortReverse" class="fa fa-caret-down"></span>
-                  <span ng-show="sortType == 'status.kbps10s1m5m15m30m60m[4] || -1' && sortReverse" class="fa fa-caret-up"></span>
+                  <span ng-show="sortType == 'status.kbps10s1m5m15m30m60m[4]' && !sortReverse" class="fa fa-caret-down"></span>
+                  <span ng-show="sortType == 'status.kbps10s1m5m15m30m60m[4]' && sortReverse" class="fa fa-caret-up"></span>
                </a>
              </th>
              <th>
-                <a ng-click="sortType = 'status.kbps10s1m5m15m30m60m[5] || -1'; sortReverse = !sortReverse">
+                <a ng-click="sortType = 'status.kbps10s1m5m15m30m60m[5]'; sortReverse = !sortReverse">
                  60m
-                  <span ng-show="sortType == 'status.kbps10s1m5m15m30m60m[5] || -1' && !sortReverse" class="fa fa-caret-down"></span>
-                  <span ng-show="sortType == 'status.kbps10s1m5m15m30m60m[5] || -1' && sortReverse" class="fa fa-caret-up"></span>
+                  <span ng-show="sortType == 'status.kbps10s1m5m15m30m60m[5]' && !sortReverse" class="fa fa-caret-down"></span>
+                  <span ng-show="sortType == 'status.kbps10s1m5m15m30m60m[5]' && sortReverse" class="fa fa-caret-up"></span>
                </a>
              </th>
            </tr>
          </thead>
          <tbody>
-            <tr ng-repeat="relay in relays | orderBy:sortType:sortReverse ">
+            <tr ng-repeat="relay in relays | orderBy:sortType:sortReverse:sortCompare">
              <td>{{ relay.address }}</td>
              <td ng-if="relay.status === undefined" colspan="11" class="text-center">Looking up...</td>
              <td ng-if-start="relay.status !== undefined">{{ relay.status.numActiveSessions }}</td>
@@ -185,7 +185,7 @@


    <script src="//code.jquery.com/jquery-2.1.4.min.js"></script>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.4.7/angular.min.js"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.8/angular.min.js"></script>
    <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
    <script src="//maps.googleapis.com/maps/api/js"></script>
  </body>
@@ -235,8 +235,20 @@
    $scope.mapBounds = new google.maps.LatLngBounds();
    $scope.tooltipTemplate = $('#infoTemplate').html();
    $scope.usedLocations = {};
-    $scope.sortType = 'status.numActiveSessions || -1';
+    $scope.sortType = 'status.numActiveSessions';
    $scope.sortReverse = true;
+    $scope.sortCompare = function(a, b) {
+      if (a.value == b.value) {
+        return 0;
+      }
+      if (a.type == "undefined") {
+        return -1;
+      }
+      if (b.type == "undefined") {
+        return 1;
+      }
+      return a.value > b.value ? 1 : -1;
+    }

    $http.get("/endpoint").then(function(response) {
      $scope.relays = response.data.relays;
@@ -325,7 +337,8 @@
      var timeoutRequest = $q.defer();
      var resolveStatus = $q.defer();

-      $http.get("http://" + relay.uri.hostname + (relay.uri.args.statusAddr || ":22070") + "/status", { timeout: timeoutRequest.promise }).then(function (response) {
+
+      $http.get("http://" + relay.uri.hostname + ':' + ((relay.uri.args.statusAddr && relay.uri.args.statusAddr.split(':')[1]) || "22070") + "/status", { timeout: timeoutRequest.promise }).then(function (response) {
        relay.status = response.data;
        resolveStatus.resolve();
        angular.forEach($scope.totals, function(value, key) {
--- a/cmd/strelaypoolsrv/main.go
+++ b/cmd/strelaypoolsrv/main.go
@@ -1,6 +1,6 @@
 // Copyright (C) 2015 Audrius Butkevicius and Contributors (see the CONTRIBUTORS file).

-//go:generate go run genassets.go gui auto/gui.go
+//go:generate go run ../../script/genassets.go gui >auto/gui.go

 package main

@@ -23,14 +23,12 @@ import (
 	"time"

 	"github.com/golang/groupcache/lru"
-	"github.com/juju/ratelimit"
-
 	"github.com/oschwald/geoip2-golang"
-
 	"github.com/syncthing/syncthing/cmd/strelaypoolsrv/auto"
 	"github.com/syncthing/syncthing/lib/relay/client"
 	"github.com/syncthing/syncthing/lib/sync"
 	"github.com/syncthing/syncthing/lib/tlsutil"
+	"golang.org/x/time/rate"
 )

 type location struct {
@@ -65,17 +63,18 @@ var (
 	dir            string
 	evictionTime   = time.Hour
 	debug          bool
-	getLRUSize           = 10 << 10
-	getLimitBurst  int64 = 10
-	getLimitAvg          = 1
-	postLRUSize          = 1 << 10
-	postLimitBurst int64 = 2
-	postLimitAvg         = 1
+	getLRUSize     = 10 << 10
+	getLimitBurst  = 10
+	getLimitAvg    = 1
+	postLRUSize    = 1 << 10
+	postLimitBurst = 2
+	postLimitAvg   = 1
 	getLimit       time.Duration
 	postLimit      time.Duration
 	permRelaysFile string
 	ipHeader       string
 	geoipPath      string
+	proto          string

 	getMut      = sync.NewRWMutex()
 	getLRUCache *lru.Cache
@@ -98,13 +97,14 @@ func main() {
 	flag.DurationVar(&evictionTime, "eviction", evictionTime, "After how long the relay is evicted")
 	flag.IntVar(&getLRUSize, "get-limit-cache", getLRUSize, "Get request limiter cache size")
 	flag.IntVar(&getLimitAvg, "get-limit-avg", 2, "Allowed average get request rate, per 10 s")
-	flag.Int64Var(&getLimitBurst, "get-limit-burst", getLimitBurst, "Allowed burst get requests")
+	flag.IntVar(&getLimitBurst, "get-limit-burst", getLimitBurst, "Allowed burst get requests")
 	flag.IntVar(&postLRUSize, "post-limit-cache", postLRUSize, "Post request limiter cache size")
 	flag.IntVar(&postLimitAvg, "post-limit-avg", 2, "Allowed average post request rate, per minute")
-	flag.Int64Var(&postLimitBurst, "post-limit-burst", postLimitBurst, "Allowed burst post requests")
+	flag.IntVar(&postLimitBurst, "post-limit-burst", postLimitBurst, "Allowed burst post requests")
 	flag.StringVar(&permRelaysFile, "perm-relays", "", "Path to list of permanent relays")
 	flag.StringVar(&ipHeader, "ip-header", "", "Name of header which holds clients ip:port. Only meaningful when running behind a reverse proxy.")
 	flag.StringVar(&geoipPath, "geoip", "GeoLite2-City.mmdb", "Path to GeoLite2-City database")
+	flag.StringVar(&proto, "protocol", "tcp", "Protocol used for listening. 'tcp' for IPv4 and IPv6, 'tcp4' for IPv4, 'tcp6' for IPv6")

 	flag.Parse()

@@ -154,12 +154,12 @@ func main() {
 			},
 		}

-		listener, err = tls.Listen("tcp", listen, tlsCfg)
+		listener, err = tls.Listen(proto, listen, tlsCfg)
 	} else {
 		if debug {
 			log.Println("Starting plain listener on", listen)
 		}
-		listener, err = net.Listen("tcp", listen)
+		listener, err = net.Listen(proto, listen)
 	}

 	if err != nil {
@@ -247,13 +247,13 @@ func handleRequest(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Access-Control-Allow-Origin", "*")
 	switch r.Method {
 	case "GET":
-		if limit(r.RemoteAddr, getLRUCache, getMut, getLimit, int64(getLimitBurst)) {
+		if limit(r.RemoteAddr, getLRUCache, getMut, getLimit, getLimitBurst) {
 			w.WriteHeader(429)
 			return
 		}
 		handleGetRequest(w, r)
 	case "POST":
-		if limit(r.RemoteAddr, postLRUCache, postMut, postLimit, int64(postLimitBurst)) {
+		if limit(r.RemoteAddr, postLRUCache, postMut, postLimit, postLimitBurst) {
 			w.WriteHeader(429)
 			return
 		}
@@ -324,8 +324,9 @@ func handlePostRequest(w http.ResponseWriter, r *http.Request) {
 		return
 	}

+	ip := net.ParseIP(host)
 	// The client did not provide an IP address, use the IP address of the client.
-	if host == "" {
+	if ip == nil || ip.IsUnspecified() {
 		uri.Host = net.JoinHostPort(rhost, port)
 		newRelay.URL = uri.String()
 	} else if host != rhost {
@@ -443,7 +444,7 @@ func evict(relay relay) func() {
 	}
 }

-func limit(addr string, cache *lru.Cache, lock sync.RWMutex, rate time.Duration, burst int64) bool {
+func limit(addr string, cache *lru.Cache, lock sync.RWMutex, intv time.Duration, burst int) bool {
 	host, _, err := net.SplitHostPort(addr)
 	if err != nil {
 		return false
@@ -453,14 +454,14 @@ func limit(addr string, cache *lru.Cache, lock sync.RWMutex, rate time.Duration,
 	bkt, ok := cache.Get(host)
 	lock.RUnlock()
 	if ok {
-		bkt := bkt.(*ratelimit.Bucket)
-		if bkt.TakeAvailable(1) != 1 {
+		bkt := bkt.(*rate.Limiter)
+		if !bkt.Allow() {
 			// Rate limit
 			return true
 		}
 	} else {
 		lock.Lock()
-		cache.Add(host, ratelimit.NewBucket(rate, burst))
+		cache.Add(host, rate.NewLimiter(rate.Every(intv), burst))
 		lock.Unlock()
 	}
 	return false
--- a/cmd/strelaysrv/README.md
+++ b/cmd/strelaysrv/README.md
@@ -5,24 +5,22 @@ strelaysrv

 This is the relay server for the `syncthing` project.

-To get it, run `go get github.com/syncthing/strelaysrv` or download the
+To get it, run `go get github.com/syncthing/syncthing/cmd/strelaysrv` or download the
 [latest build](http://build.syncthing.net/job/strelaysrv/lastSuccessfulBuild/artifact/)
 from the build server.

 :exclamation:Warnings:exclamation: - Read or regret
 -----

-By default, all relay servers will join the default public relay pool, which means that the relay server will be availble for public use, and **will consume your bandwidth** helping others to connect.
+By default, all relay servers will join to the default public relay pool, which means that the relay server will be availble for public use, and **will consume your bandwidth** helping others to connect.

-If you wish to disable this behaviour, please specify `-pools=""` argument.
+If you wish to disable this behaviour, please specify the `-pools=""` argument.

 Please note that `strelaysrv` is only usable by `syncthing` **version v0.12 and onwards**.

-To run `strelaysrv` you need to have port 22067 available to the internet, which means you might need to allow it through your firewall if you **have a public IP, or setup a port-forwarding** (22067 to 22067) if you are behind a router.
+To run `strelaysrv` you need to have port 22067 available to the internet, which means you might need to port forward it and/or allow it through your firewall.

-Furthermore, **by default strelaysrv will also expose a /status HTTP endpoint on port 22070**, which is used by the pool servers to peek at metrics of the strelaysrv, such as what are the current transfer rates, how many clients are connected, etc, etc. If you wish this information to be available, similarlly you might want to allow it through your firewall, or port-forward it (22070 to 22070) on your NAT device.
-
-This is **not mandatory** for the strelaysrv to function, and is used only to gather metrics and present them in the overview page of the pool server, displaying stats about the specific relay.
+Furthermore, by default `strelaysrv` will also expose a /status HTTP endpoint on port 22070, which is used by the pool servers to read metrics of the `strelaysrv`, such as  the current transfer rates, how many clients are connected, etc. If you wish this information to be available you may need to port forward and allow it through your firewall. This is not mandatory for the `strelaysrv` to function, and is used only to gather metrics and present them in the overview page of the pool server.

 At the point of writing the endpoint output looks as follows:

@@ -66,7 +64,7 @@ If you wish to disable the /status endpoint, provide `-status-srv=""` as one of

 Running for public use
 ----
-Make sure you have a public IP with port 22067 open, or make sure you have port-forwarding (22067 to 22067) if you are behind a router.
+Make sure you have a public IP with port 22067 open, or have forwarded port 22067 if you are behind a NAT.

 Run the `strelaysrv` with no arguments (or `-debug` if you want more output), and that should be enough for the server to join the public relay pool.
 You should see a message saying:
@@ -79,37 +77,37 @@ See `strelaysrv -help` for other options, such as rate limits, timeout intervals
 Running for private use
 -----

-Once you've started the `strelaysrv`, it will generate a key pair and print an URI:
+Once you've started the `strelaysrv`, it will generate a key pair and print a URI:
 ```bash
 relay://:22067/?id=EZQOIDM-6DDD4ZI-DJ65NSM-4OQWRAT-EIKSMJO-OZ552BO-WQZEGYY-STS5RQM&pingInterval=1m0s&networkTimeout=2m0s&sessionLimitBps=0&globalLimitBps=0&statusAddr=:22070
 ```

-This URI contains partial address of the relay server, as well as it's options which in the future may be taken into account when choosing the best suitable relay out of multiple available.
+This URI contains a partial address of the relay server, as well as its options which in the future may be taken into account when choosing the most suitable relay.

-Because `-listen` option was not used, the `strelaysrv` does not know it's external IP, therefore you should replace the host part of the URI with your public IP address on which the `strelaysrv` will be available:
+Because the `-listen` option was not used `strelaysrv` does not know its external IP, therefore you should replace the host part of the URI with your public IP address on which the `strelaysrv` will be available:

 ```bash
-relay://123.123.123.123:22067/?id=EZQOIDM-6DDD4ZI-DJ65NSM-4OQWRAT-EIKSMJO-OZ552BO-WQZEGYY-STS5RQM&pingInterval=1m0s&networkTimeout=2m0s&sessionLimitBps=0&globalLimitBps=0&statusAddr=:22070
+relay://192.0.2.1:22067/?id=EZQOIDM-6DDD4ZI-DJ65NSM-4OQWRAT-EIKSMJO-OZ552BO-WQZEGYY-STS5RQM&pingInterval=1m0s&networkTimeout=2m0s&sessionLimitBps=0&globalLimitBps=0&statusAddr=:22070
 ```

 If you do not care about certificate pinning (improved security) or do not care about passing verbose settings to the clients, you can shorten the URL to just the host part:

 ```bash
-relay://123.123.123.123:22067
+relay://192.0.2.1:22067
 ```

-This URI can then be used in `syncthing` as one of the relay servers.
+This URI can then be used in `syncthing` clients as one of the relay servers by adding the URI to the "Sync Protocol Listen Address" field, under Actions and Settings.

 See `strelaysrv -help` for other options, such as rate limits, timeout intervals, etc.

 Other items available in this repo
 ----
 ##### testutil
-A test utility which can be used to test connectivity of a relay server.
-You need to generate two x509 key pairs (key.pem and cert.pem), one for the client, another one for the server, in separate directories.
+A test utility which can be used to test the connectivity of a relay server.
+You need to generate two x509 key pairs (key.pem and cert.pem), one for the client and one for the server, in separate directories.
 Afterwards, start the client:
 ```bash
-./testutil -relay="relay://uri.of.relay" -keys=certs/client/ -join
+./testutil -relay="relay://192.0.2.1:22067" -keys=certs/client/ -join
 ```

 This prints out the client ID:
@@ -120,7 +118,7 @@ This prints out the client ID:
 In the other terminal run the following:

 ```bash
- ./testutil -relay="relay://uri.of.relay" -keys=certs/server/ -connect=BG2C5ZA-W7XPFDO-LH222Z6-65F3HJX-ADFTGRT-3SBFIGM-KV26O2Q-E5RMRQ2
+ ./testutil -relay="relay://192.0.2.1:22067" -keys=certs/server/ -connect=BG2C5ZA-W7XPFDO-LH222Z6-65F3HJX-ADFTGRT-3SBFIGM-KV26O2Q-E5RMRQ2
 ```

 Which should then give you an interactive prompt, where you can type things in one terminal, and they get relayed to the other terminal.
@@ -137,5 +135,3 @@ Relay related libraries used by this repo
 Only used by the testutil.

 [Available here](https://github.com/syncthing/syncthing/tree/master/lib/relay/client)
-
-
--- a/cmd/strelaysrv/listener.go
+++ b/cmd/strelaysrv/listener.go
@@ -23,7 +23,7 @@ var (
 	numConnections int64
 )

-func listener(addr string, config *tls.Config) {
+func listener(proto, addr string, config *tls.Config) {
 	tcpListener, err := net.Listen("tcp", addr)
 	if err != nil {
 		log.Fatalln(err)
@@ -167,10 +167,16 @@ func protocolConnectionHandler(tcpConn net.Conn, config *tls.Config) {
 					continue
 				}

-				peerOutbox <- serverInvitation
+				select {
+				case peerOutbox <- serverInvitation:
+					if debug {
+						log.Println("Sent invitation from", id, "to", requestedPeer)
+					}
+				case <-time.After(time.Second):
+					if debug {
+						log.Println("Could not send invitation from", id, "to", requestedPeer, "as peer disconnected")
+					}

-				if debug {
-					log.Println("Sent invitation from", id, "to", requestedPeer)
 				}
 				conn.Close()

@@ -198,7 +204,6 @@ func protocolConnectionHandler(tcpConn net.Conn, config *tls.Config) {
 			if debug {
 				log.Printf("Closing connection %s: %s", id, err)
 			}
-			close(outbox)

 			// Potentially closing a second time.
 			conn.Close()
@@ -254,10 +259,6 @@ func protocolConnectionHandler(tcpConn net.Conn, config *tls.Config) {
 			conn.Close()

 		case msg := <-outbox:
-			if msg == nil {
-				conn.Close()
-				return
-			}
 			if debug {
 				log.Printf("Sending message %T to %s", msg, id)
 			}
--- a/cmd/strelaysrv/main.go
+++ b/cmd/strelaysrv/main.go
@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"log"
 	"net"
+	"net/http"
 	"net/url"
 	"os"
 	"os/signal"
@@ -19,10 +20,15 @@ import (
 	"syscall"
 	"time"

-	"github.com/juju/ratelimit"
 	"github.com/syncthing/syncthing/lib/osutil"
 	"github.com/syncthing/syncthing/lib/relay/protocol"
 	"github.com/syncthing/syncthing/lib/tlsutil"
+	"golang.org/x/time/rate"
+
+	"github.com/syncthing/syncthing/lib/config"
+	"github.com/syncthing/syncthing/lib/nat"
+	_ "github.com/syncthing/syncthing/lib/pmp"
+	_ "github.com/syncthing/syncthing/lib/upnp"

 	syncthingprotocol "github.com/syncthing/syncthing/lib/protocol"
 )
@@ -62,20 +68,25 @@ var (
 	globalLimitBps  int
 	overLimit       int32
 	descriptorLimit int64
-	sessionLimiter  *ratelimit.Bucket
-	globalLimiter   *ratelimit.Bucket
+	sessionLimiter  *rate.Limiter
+	globalLimiter   *rate.Limiter

 	statusAddr       string
 	poolAddrs        string
 	pools            []string
 	providedBy       string
 	defaultPoolAddrs = "https://relays.syncthing.net/endpoint"
+
+	natEnabled bool
+	natLease   int
+	natRenewal int
+	natTimeout int
 )

 func main() {
 	log.SetFlags(log.Lshortfile | log.LstdFlags)

-	var dir, extAddress string
+	var dir, extAddress, proto string

 	flag.StringVar(&listen, "listen", ":22067", "Protocol listen address")
 	flag.StringVar(&dir, "keys", ".", "Directory where cert.pem and key.pem is stored")
@@ -89,18 +100,41 @@ func main() {
 	flag.StringVar(&poolAddrs, "pools", defaultPoolAddrs, "Comma separated list of relay pool addresses to join")
 	flag.StringVar(&providedBy, "provided-by", "", "An optional description about who provides the relay")
 	flag.StringVar(&extAddress, "ext-address", "", "An optional address to advertise as being available on.\n\tAllows listening on an unprivileged port with port forwarding from e.g. 443, and be connected to on port 443.")
-
+	flag.StringVar(&proto, "protocol", "tcp", "Protocol used for listening. 'tcp' for IPv4 and IPv6, 'tcp4' for IPv4, 'tcp6' for IPv6")
+	flag.BoolVar(&natEnabled, "nat", false, "Use UPnP/NAT-PMP to acquire external port mapping")
+	flag.IntVar(&natLease, "nat-lease", 60, "NAT lease length in minutes")
+	flag.IntVar(&natRenewal, "nat-renewal", 30, "NAT renewal frequency in minutes")
+	flag.IntVar(&natTimeout, "nat-timeout", 10, "NAT discovery timeout in seconds")
 	flag.Parse()

 	if extAddress == "" {
 		extAddress = listen
 	}

-	addr, err := net.ResolveTCPAddr("tcp", extAddress)
+	if len(providedBy) > 30 {
+		log.Fatal("Provided-by cannot be longer than 30 characters")
+	}
+
+	addr, err := net.ResolveTCPAddr(proto, extAddress)
 	if err != nil {
 		log.Fatal(err)
 	}

+	laddr, err := net.ResolveTCPAddr(proto, listen)
+	if err != nil {
+		log.Fatal(err)
+	}
+	if laddr.IP != nil && !laddr.IP.IsUnspecified() {
+		laddr.Port = 0
+		transport, ok := http.DefaultTransport.(*http.Transport)
+		if ok {
+			transport.Dial = (&net.Dialer{
+				Timeout:   30 * time.Second,
+				LocalAddr: laddr,
+			}).Dial
+		}
+	}
+
 	log.Println(LongVersion)

 	maxDescriptors, err := osutil.MaximizeOpenFileLimit()
@@ -149,18 +183,49 @@ func main() {
 		log.Println("ID:", id)
 	}

+	wrapper := config.Wrap("config", config.New(id))
+	wrapper.SetOptions(config.OptionsConfiguration{
+		NATLeaseM:   natLease,
+		NATRenewalM: natRenewal,
+		NATTimeoutS: natTimeout,
+	})
+	natSvc := nat.NewService(id, wrapper)
+	mapping := mapping{natSvc.NewMapping(nat.TCP, addr.IP, addr.Port)}
+
+	if natEnabled {
+		go natSvc.Serve()
+		found := make(chan struct{})
+		mapping.OnChanged(func(_ *nat.Mapping, _, _ []nat.Address) {
+			select {
+			case found <- struct{}{}:
+			default:
+			}
+		})
+
+		// Need to wait a few extra seconds, since NAT library waits exactly natTimeout seconds on all interfaces.
+		timeout := time.Duration(natTimeout+2) * time.Second
+		log.Printf("Waiting %s to acquire NAT mapping", timeout)
+
+		select {
+		case <-found:
+			log.Printf("Found NAT mapping: %s", mapping.ExternalAddresses())
+		case <-time.After(timeout):
+			log.Println("Timeout out waiting for NAT mapping.")
+		}
+	}
+
 	if sessionLimitBps > 0 {
-		sessionLimiter = ratelimit.NewBucketWithRate(float64(sessionLimitBps), int64(2*sessionLimitBps))
+		sessionLimiter = rate.NewLimiter(rate.Limit(sessionLimitBps), 2*sessionLimitBps)
 	}
 	if globalLimitBps > 0 {
-		globalLimiter = ratelimit.NewBucketWithRate(float64(globalLimitBps), int64(2*globalLimitBps))
+		globalLimiter = rate.NewLimiter(rate.Limit(globalLimitBps), 2*globalLimitBps)
 	}

 	if statusAddr != "" {
 		go statusService(statusAddr)
 	}

-	uri, err := url.Parse(fmt.Sprintf("relay://%s/?id=%s&pingInterval=%s&networkTimeout=%s&sessionLimitBps=%d&globalLimitBps=%d&statusAddr=%s&providedBy=%s", extAddress, id, pingInterval, networkTimeout, sessionLimitBps, globalLimitBps, statusAddr, providedBy))
+	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)
 	}
@@ -178,11 +243,11 @@ func main() {
 	for _, pool := range pools {
 		pool = strings.TrimSpace(pool)
 		if len(pool) > 0 {
-			go poolHandler(pool, uri)
+			go poolHandler(pool, uri, mapping)
 		}
 	}

-	go listener(listen, tlsCfg)
+	go listener(proto, listen, tlsCfg)

 	sigs := make(chan os.Signal, 1)
 	signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
@@ -212,7 +277,7 @@ func main() {

 func monitorLimits() {
 	limitCheckTimer = time.NewTimer(time.Minute)
-	for _ = range limitCheckTimer.C {
+	for range limitCheckTimer.C {
 		if atomic.LoadInt64(&numConnections)+atomic.LoadInt64(&numProxies) > descriptorLimit {
 			atomic.StoreInt32(&overLimit, 1)
 			log.Println("Gone past our connection limits. Starting to refuse new/drop idle connections.")
@@ -222,3 +287,15 @@ func monitorLimits() {
 		limitCheckTimer.Reset(time.Minute)
 	}
 }
+
+type mapping struct {
+	*nat.Mapping
+}
+
+func (m *mapping) Address() nat.Address {
+	ext := m.ExternalAddresses()
+	if len(ext) > 0 {
+		return ext[0]
+	}
+	return m.Mapping.Address()
+}
--- a/cmd/strelaysrv/pool.go
+++ b/cmd/strelaysrv/pool.go
@@ -12,16 +12,19 @@ import (
 	"time"
 )

-func poolHandler(pool string, uri *url.URL) {
+func poolHandler(pool string, uri *url.URL, mapping mapping) {
 	if debug {
 		log.Println("Joining", pool)
 	}
 	for {
+		uriCopy := *uri
+		uriCopy.Host = mapping.Address().String()
+
 		var b bytes.Buffer
 		json.NewEncoder(&b).Encode(struct {
 			URL string `json:"url"`
 		}{
-			uri.String(),
+			uriCopy.String(),
 		})

 		resp, err := http.Post(pool, "application/json", &b)
@@ -39,7 +42,7 @@ func poolHandler(pool string, uri *url.URL) {
 			log.Println(pool, "under load, will retry in a minute")
 			time.Sleep(time.Minute)
 			continue
-		} else if resp.StatusCode == 403 {
+		} else if resp.StatusCode == 401 {
 			log.Println(pool, "failed to join due to IP address not matching external address. Aborting")
 			return
 		} else if resp.StatusCode == 200 {
--- a/cmd/strelaysrv/session.go
+++ b/cmd/strelaysrv/session.go
@@ -7,15 +7,16 @@ import (
 	"encoding/hex"
 	"fmt"
 	"log"
+	"math"
 	"net"
 	"sync"
 	"sync/atomic"
 	"time"

-	"github.com/juju/ratelimit"
-	"github.com/syncthing/syncthing/lib/relay/protocol"
+	"golang.org/x/time/rate"

 	syncthingprotocol "github.com/syncthing/syncthing/lib/protocol"
+	"github.com/syncthing/syncthing/lib/relay/protocol"
 )

 var (
@@ -26,7 +27,7 @@ var (
 	bytesProxied    int64
 )

-func newSession(serverid, clientid syncthingprotocol.DeviceID, sessionRateLimit, globalRateLimit *ratelimit.Bucket) *session {
+func newSession(serverid, clientid syncthingprotocol.DeviceID, sessionRateLimit, globalRateLimit *rate.Limiter) *session {
 	serverkey := make([]byte, 32)
 	_, err := rand.Read(serverkey)
 	if err != nil {
@@ -108,7 +109,7 @@ type session struct {
 	clientkey []byte
 	clientid  syncthingprotocol.DeviceID

-	rateLimit func(bytes int64)
+	rateLimit func(bytes int)

 	connsChan chan net.Conn
 	conns     []net.Conn
@@ -216,7 +217,7 @@ done:
 func (s *session) GetClientInvitationMessage() protocol.SessionInvitation {
 	return protocol.SessionInvitation{
 		From:         s.serverid[:],
-		Key:          []byte(s.clientkey),
+		Key:          s.clientkey,
 		Address:      sessionAddress,
 		Port:         sessionPort,
 		ServerSocket: false,
@@ -226,7 +227,7 @@ func (s *session) GetClientInvitationMessage() protocol.SessionInvitation {
 func (s *session) GetServerInvitationMessage() protocol.SessionInvitation {
 	return protocol.SessionInvitation{
 		From:         s.clientid[:],
-		Key:          []byte(s.serverkey),
+		Key:          s.serverkey,
 		Address:      sessionAddress,
 		Port:         sessionPort,
 		ServerSocket: true,
@@ -268,7 +269,7 @@ func (s *session) proxy(c1, c2 net.Conn) error {
 		}

 		if s.rateLimit != nil {
-			s.rateLimit(int64(n))
+			s.rateLimit(n)
 		}

 		c2.SetWriteDeadline(time.Now().Add(networkTimeout))
@@ -283,7 +284,7 @@ func (s *session) String() string {
 	return fmt.Sprintf("<%s/%s>", hex.EncodeToString(s.clientkey)[:5], hex.EncodeToString(s.serverkey)[:5])
 }

-func makeRateLimitFunc(sessionRateLimit, globalRateLimit *ratelimit.Bucket) func(int64) {
+func makeRateLimitFunc(sessionRateLimit, globalRateLimit *rate.Limiter) func(int) {
 	// This may be a case of super duper premature optimization... We build an
 	// optimized function to do the rate limiting here based on what we need
 	// to do and then use it in the loop.
@@ -298,29 +299,55 @@ func makeRateLimitFunc(sessionRateLimit, globalRateLimit *ratelimit.Bucket) func

 	if sessionRateLimit == nil {
 		// We only have a global limiter
-		return func(bytes int64) {
-			globalRateLimit.Wait(bytes)
+		return func(bytes int) {
+			take(bytes, globalRateLimit)
 		}
 	}

 	if globalRateLimit == nil {
 		// We only have a session limiter
-		return func(bytes int64) {
-			sessionRateLimit.Wait(bytes)
+		return func(bytes int) {
+			take(bytes, sessionRateLimit)
 		}
 	}

 	// We have both. Queue the bytes on both the global and session specific
-	// rate limiters. Wait for both in parallell, so that the actual send
-	// happens when both conditions are satisfied. In practice this just means
-	// wait the longer of the two times.
-	return func(bytes int64) {
-		t0 := sessionRateLimit.Take(bytes)
-		t1 := globalRateLimit.Take(bytes)
-		if t0 > t1 {
-			time.Sleep(t0)
-		} else {
-			time.Sleep(t1)
-		}
+	// rate limiters.
+	return func(bytes int) {
+		take(bytes, sessionRateLimit, globalRateLimit)
+	}
+}
+
+// take is a utility function to consume tokens from a set of rate.Limiters.
+// Tokens are consumed in parallel on all limiters, respecting their
+// individual burst sizes.
+func take(tokens int, ls ...*rate.Limiter) {
+	// minBurst is the smallest burst size supported by all limiters.
+	minBurst := int(math.MaxInt32)
+	for _, l := range ls {
+		if burst := l.Burst(); burst < minBurst {
+			minBurst = burst
+		}
+	}
+
+	for tokens > 0 {
+		// chunk is how many tokens we can consume at a time
+		chunk := tokens
+		if chunk > minBurst {
+			chunk = minBurst
+		}
+
+		// maxDelay is the longest delay mandated by any of the limiters for
+		// the chosen chunk size.
+		var maxDelay time.Duration
+		for _, l := range ls {
+			res := l.ReserveN(time.Now(), chunk)
+			if del := res.Delay(); del > maxDelay {
+				maxDelay = del
+			}
+		}
+
+		time.Sleep(maxDelay)
+		tokens -= chunk
 	}
 }
--- a/cmd/strelaysrv/status.go
+++ b/cmd/strelaysrv/status.go
@@ -42,7 +42,7 @@ func getStatus(w http.ResponseWriter, r *http.Request) {
 	status["goMaxProcs"] = runtime.GOMAXPROCS(-1)
 	status["goNumRoutine"] = runtime.NumGoroutine()
 	status["kbps10s1m5m15m30m60m"] = []int64{
-		rc.rate(10/10) * 8 / 1000,
+		rc.rate(1) * 8 / 1000, // each interval is 10s
 		rc.rate(60/10) * 8 / 1000,
 		rc.rate(5*60/10) * 8 / 1000,
 		rc.rate(15*60/10) * 8 / 1000,
--- a/cmd/stvanity/main.go
+++ b/cmd/stvanity/main.go
@@ -130,7 +130,7 @@ func printProgress(prefix string, count *int64) {
 	expectedIterations := float64(int(1) << uint(wantBits))
 	fmt.Printf("Want %d bits for prefix %q, about %.2g certs to test (statistically speaking)\n", wantBits, prefix, expectedIterations)

-	for _ = range time.NewTicker(15 * time.Second).C {
+	for range time.NewTicker(15 * time.Second).C {
 		tried := atomic.LoadInt64(count)
 		elapsed := time.Since(started)
 		rate := float64(tried) / elapsed.Seconds()
--- a/cmd/syncthing/gui.go
+++ b/cmd/syncthing/gui.go
@@ -17,6 +17,7 @@ import (
 	"path/filepath"
 	"reflect"
 	"runtime"
+	"runtime/pprof"
 	"sort"
 	"strconv"
 	"strings"
@@ -52,6 +53,7 @@ type apiService struct {
 	statics            *staticsServer
 	model              modelIntf
 	eventSub           events.BufferedSubscription
+	diskEventSub       events.BufferedSubscription
 	discoverer         discover.CachingMux
 	connectionsService connectionsIntf
 	fss                *folderSummaryService
@@ -59,7 +61,7 @@ type apiService struct {
 	stop               chan struct{} // signals intentional stop
 	configChanged      chan struct{} // signals intentional listener close due to config change
 	started            chan string   // signals startup complete by sending the listener address, for testing only
-	startedOnce        bool          // the service has started successfully at least once
+	startedOnce        chan struct{} // the service has started successfully at least once

 	guiErrors logger.Recorder
 	systemLog logger.Recorder
@@ -67,10 +69,10 @@ type apiService struct {

 type modelIntf interface {
 	GlobalDirectoryTree(folder, prefix string, levels int, dirsonly bool) map[string]interface{}
-	Completion(device protocol.DeviceID, folder string) float64
+	Completion(device protocol.DeviceID, folder string) model.FolderCompletion
 	Override(folder string)
 	NeedFolderFiles(folder string, page, perpage int) ([]db.FileInfoTruncated, []db.FileInfoTruncated, []db.FileInfoTruncated, int)
-	NeedSize(folder string) (nfiles int, bytes int64)
+	NeedSize(folder string) db.Counts
 	ConnectionStats() map[string]interface{}
 	DeviceStatistics() map[string]stats.DeviceStatistics
 	FolderStatistics() map[string]stats.FolderStatistics
@@ -80,29 +82,28 @@ type modelIntf interface {
 	Availability(folder, file string, version protocol.Vector, block protocol.BlockInfo) []model.Availability
 	GetIgnores(folder string) ([]string, []string, error)
 	SetIgnores(folder string, content []string) error
-	PauseDevice(device protocol.DeviceID)
-	ResumeDevice(device protocol.DeviceID)
 	DelayScan(folder string, next time.Duration)
 	ScanFolder(folder string) error
 	ScanFolders() map[string]error
 	ScanFolderSubdirs(folder string, subs []string) error
 	BringToFront(folder, file string)
 	ConnectedTo(deviceID protocol.DeviceID) bool
-	GlobalSize(folder string) (nfiles, deleted int, bytes int64)
-	LocalSize(folder string) (nfiles, deleted int, bytes int64)
-	CurrentLocalVersion(folder string) (int64, bool)
-	RemoteLocalVersion(folder string) (int64, bool)
+	GlobalSize(folder string) db.Counts
+	LocalSize(folder string) db.Counts
+	CurrentSequence(folder string) (int64, bool)
+	RemoteSequence(folder string) (int64, bool)
 	State(folder string) (string, time.Time, error)
 }

 type configIntf interface {
 	GUI() config.GUIConfiguration
-	Raw() config.Configuration
+	RawCopy() config.Configuration
 	Options() config.OptionsConfiguration
 	Replace(cfg config.Configuration) error
 	Subscribe(c config.Committer)
 	Folders() map[string]config.FolderConfiguration
 	Devices() map[protocol.DeviceID]config.DeviceConfiguration
+	SetDevice(config.DeviceConfiguration) error
 	Save() error
 	ListenAddresses() []string
 	RequiresRestart() bool
@@ -112,7 +113,7 @@ type connectionsIntf interface {
 	Status() map[string]interface{}
 }

-func newAPIService(id protocol.DeviceID, cfg configIntf, httpsCertFile, httpsKeyFile, assetDir string, m modelIntf, eventSub events.BufferedSubscription, discoverer discover.CachingMux, connectionsService connectionsIntf, errors, systemLog logger.Recorder) *apiService {
+func newAPIService(id protocol.DeviceID, cfg configIntf, httpsCertFile, httpsKeyFile, assetDir string, m modelIntf, eventSub events.BufferedSubscription, diskEventSub events.BufferedSubscription, discoverer discover.CachingMux, connectionsService connectionsIntf, errors, systemLog logger.Recorder) *apiService {
 	service := &apiService{
 		id:                 id,
 		cfg:                cfg,
@@ -121,11 +122,13 @@ func newAPIService(id protocol.DeviceID, cfg configIntf, httpsCertFile, httpsKey
 		statics:            newStaticsServer(cfg.GUI().Theme, assetDir),
 		model:              m,
 		eventSub:           eventSub,
+		diskEventSub:       diskEventSub,
 		discoverer:         discoverer,
 		connectionsService: connectionsService,
 		systemConfigMut:    sync.NewMutex(),
 		stop:               make(chan struct{}),
 		configChanged:      make(chan struct{}),
+		startedOnce:        make(chan struct{}),
 		guiErrors:          errors,
 		systemLog:          systemLog,
 	}
@@ -199,20 +202,20 @@ func sendJSON(w http.ResponseWriter, jsonObject interface{}) {
 func (s *apiService) Serve() {
 	listener, err := s.getListener(s.cfg.GUI())
 	if err != nil {
-		if !s.startedOnce {
+		select {
+		case <-s.startedOnce:
+			// We let this be a loud user-visible warning as it may be the only
+			// indication they get that the GUI won't be available.
+			l.Warnln("Starting API/GUI:", err)
+			return
+
+		default:
 			// This is during initialization. A failure here should be fatal
 			// as there will be no way for the user to communicate with us
 			// otherwise anyway.
 			l.Fatalln("Starting API/GUI:", err)
 		}
-
-		// We let this be a loud user-visible warning as it may be the only
-		// indication they get that the GUI won't be available on startup.
-		l.Warnln("Starting API/GUI:", err)
-		return
 	}
-	s.startedOnce = true
-	defer listener.Close()

 	if listener == nil {
 		// Not much we can do here other than exit quickly. The supervisor
@@ -220,6 +223,8 @@ func (s *apiService) Serve() {
 		return
 	}

+	defer listener.Close()
+
 	// The GET handlers
 	getRestMux := http.NewServeMux()
 	getRestMux.HandleFunc("/rest/db/completion", s.getDBCompletion)              // device folder
@@ -228,7 +233,8 @@ func (s *apiService) Serve() {
 	getRestMux.HandleFunc("/rest/db/need", s.getDBNeed)                          // folder [perpage] [page]
 	getRestMux.HandleFunc("/rest/db/status", s.getDBStatus)                      // folder
 	getRestMux.HandleFunc("/rest/db/browse", s.getDBBrowse)                      // folder [prefix] [dirsonly] [levels]
-	getRestMux.HandleFunc("/rest/events", s.getEvents)                           // since [limit]
+	getRestMux.HandleFunc("/rest/events", s.getIndexEvents)                      // since [limit]
+	getRestMux.HandleFunc("/rest/events/disk", s.getDiskEvents)                  // since [limit]
 	getRestMux.HandleFunc("/rest/stats/device", s.getDeviceStats)                // -
 	getRestMux.HandleFunc("/rest/stats/folder", s.getFolderStats)                // -
 	getRestMux.HandleFunc("/rest/svc/deviceid", s.getDeviceID)                   // id
@@ -251,25 +257,29 @@ func (s *apiService) Serve() {

 	// The POST handlers
 	postRestMux := http.NewServeMux()
-	postRestMux.HandleFunc("/rest/db/prio", s.postDBPrio)                      // folder file [perpage] [page]
-	postRestMux.HandleFunc("/rest/db/ignores", s.postDBIgnores)                // folder
-	postRestMux.HandleFunc("/rest/db/override", s.postDBOverride)              // folder
-	postRestMux.HandleFunc("/rest/db/scan", s.postDBScan)                      // folder [sub...] [delay]
-	postRestMux.HandleFunc("/rest/system/config", s.postSystemConfig)          // <body>
-	postRestMux.HandleFunc("/rest/system/error", s.postSystemError)            // <body>
-	postRestMux.HandleFunc("/rest/system/error/clear", s.postSystemErrorClear) // -
-	postRestMux.HandleFunc("/rest/system/ping", s.restPing)                    // -
-	postRestMux.HandleFunc("/rest/system/reset", s.postSystemReset)            // [folder]
-	postRestMux.HandleFunc("/rest/system/restart", s.postSystemRestart)        // -
-	postRestMux.HandleFunc("/rest/system/shutdown", s.postSystemShutdown)      // -
-	postRestMux.HandleFunc("/rest/system/upgrade", s.postSystemUpgrade)        // -
-	postRestMux.HandleFunc("/rest/system/pause", s.postSystemPause)            // device
-	postRestMux.HandleFunc("/rest/system/resume", s.postSystemResume)          // device
-	postRestMux.HandleFunc("/rest/system/debug", s.postSystemDebug)            // [enable] [disable]
+	postRestMux.HandleFunc("/rest/db/prio", s.postDBPrio)                          // folder file [perpage] [page]
+	postRestMux.HandleFunc("/rest/db/ignores", s.postDBIgnores)                    // folder
+	postRestMux.HandleFunc("/rest/db/override", s.postDBOverride)                  // folder
+	postRestMux.HandleFunc("/rest/db/scan", s.postDBScan)                          // folder [sub...] [delay]
+	postRestMux.HandleFunc("/rest/system/config", s.postSystemConfig)              // <body>
+	postRestMux.HandleFunc("/rest/system/error", s.postSystemError)                // <body>
+	postRestMux.HandleFunc("/rest/system/error/clear", s.postSystemErrorClear)     // -
+	postRestMux.HandleFunc("/rest/system/ping", s.restPing)                        // -
+	postRestMux.HandleFunc("/rest/system/reset", s.postSystemReset)                // [folder]
+	postRestMux.HandleFunc("/rest/system/restart", s.postSystemRestart)            // -
+	postRestMux.HandleFunc("/rest/system/shutdown", s.postSystemShutdown)          // -
+	postRestMux.HandleFunc("/rest/system/upgrade", s.postSystemUpgrade)            // -
+	postRestMux.HandleFunc("/rest/system/pause", s.makeDevicePauseHandler(true))   // device
+	postRestMux.HandleFunc("/rest/system/resume", s.makeDevicePauseHandler(false)) // device
+	postRestMux.HandleFunc("/rest/system/debug", s.postSystemDebug)                // [enable] [disable]

 	// Debug endpoints, not for general use
-	getRestMux.HandleFunc("/rest/debug/peerCompletion", s.getPeerCompletion)
-	getRestMux.HandleFunc("/rest/debug/httpmetrics", s.getSystemHTTPMetrics)
+	debugMux := http.NewServeMux()
+	debugMux.HandleFunc("/rest/debug/peerCompletion", s.getPeerCompletion)
+	debugMux.HandleFunc("/rest/debug/httpmetrics", s.getSystemHTTPMetrics)
+	debugMux.HandleFunc("/rest/debug/cpuprof", s.getCPUProf) // duration
+	debugMux.HandleFunc("/rest/debug/heapprof", s.getHeapProf)
+	getRestMux.Handle("/rest/debug/", s.whenDebugging(debugMux))

 	// A handler that splits requests between the two above and disables
 	// caching
@@ -308,11 +318,18 @@ func (s *apiService) Serve() {
 	// Add the CORS handling
 	handler = corsMiddleware(handler)

+	if addressIsLocalhost(guiCfg.Address()) && !guiCfg.InsecureSkipHostCheck {
+		// Verify source host
+		handler = localhostMiddleware(handler)
+	}
+
 	handler = debugMiddleware(handler)

 	srv := http.Server{
-		Handler:     handler,
-		ReadTimeout: 10 * time.Second,
+		Handler: handler,
+		// ReadTimeout must be longer than SyncthingController $scope.refresh
+		// interval to avoid HTTP keepalive/GUI refresh race.
+		ReadTimeout: 15 * time.Second,
 	}

 	s.fss = newFolderSummaryService(s.cfg, s.model)
@@ -326,6 +343,14 @@ func (s *apiService) Serve() {
 		s.started <- listener.Addr().String()
 	}

+	// Indicate successfull initial startup, to ourselves and to interested
+	// listeners (i.e. the thing that starts the browser).
+	select {
+	case <-s.startedOnce:
+	default:
+		close(s.startedOnce)
+	}
+
 	// Serve in the background

 	serveError := make(chan error, 1)
@@ -357,13 +382,14 @@ func (s *apiService) String() string {
 }

 func (s *apiService) VerifyConfiguration(from, to config.Configuration) error {
-	if _, err := net.ResolveTCPAddr("tcp", to.GUI.Address()); err != nil {
-		return err
-	}
-	return nil
+	_, err := net.ResolveTCPAddr("tcp", to.GUI.Address())
+	return err
 }

 func (s *apiService) CommitConfiguration(from, to config.Configuration) bool {
+	// No action required when this changes, so mask the fact that it changed at all.
+	from.GUI.Debugging = to.GUI.Debugging
+
 	if to.GUI == from.GUI {
 		return true
 	}
@@ -429,10 +455,12 @@ func corsMiddleware(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		// Process OPTIONS requests
 		if r.Method == "OPTIONS" {
+			// Add a generous access-control-allow-origin header for CORS requests
+			w.Header().Add("Access-Control-Allow-Origin", "*")
 			// Only GET/POST Methods are supported
 			w.Header().Set("Access-Control-Allow-Methods", "GET, POST")
-			// Only this custom header can be set
-			w.Header().Set("Access-Control-Allow-Headers", "X-API-Key")
+			// Only these headers can be set
+			w.Header().Set("Access-Control-Allow-Headers", "Content-Type, X-API-Key")
 			// The request is meant to be cached 10 minutes
 			w.Header().Set("Access-Control-Max-Age", "600")

@@ -487,6 +515,28 @@ func withDetailsMiddleware(id protocol.DeviceID, h http.Handler) http.Handler {
 	})
 }

+func localhostMiddleware(h http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if addressIsLocalhost(r.Host) {
+			h.ServeHTTP(w, r)
+			return
+		}
+
+		http.Error(w, "Host check error", http.StatusForbidden)
+	})
+}
+
+func (s *apiService) whenDebugging(h http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if s.cfg.GUI().Debugging {
+			h.ServeHTTP(w, r)
+			return
+		}
+
+		http.Error(w, "Debugging disabled", http.StatusBadRequest)
+	})
+}
+
 func (s *apiService) restPing(w http.ResponseWriter, r *http.Request) {
 	sendJSON(w, map[string]string{"ping": "pong"})
 }
@@ -563,8 +613,12 @@ func (s *apiService) getDBCompletion(w http.ResponseWriter, r *http.Request) {
 		return
 	}

-	sendJSON(w, map[string]float64{
-		"completion": s.model.Completion(device, folder),
+	comp := s.model.Completion(device, folder)
+	sendJSON(w, map[string]interface{}{
+		"completion":  comp.CompletionPct,
+		"needBytes":   comp.NeedBytes,
+		"globalBytes": comp.GlobalBytes,
+		"needDeletes": comp.NeedDeletes,
 	})
 }

@@ -579,16 +633,16 @@ func folderSummary(cfg configIntf, m modelIntf, folder string) map[string]interf

 	res["invalid"] = "" // Deprecated, retains external API for now

-	globalFiles, globalDeleted, globalBytes := m.GlobalSize(folder)
-	res["globalFiles"], res["globalDeleted"], res["globalBytes"] = globalFiles, globalDeleted, globalBytes
+	global := m.GlobalSize(folder)
+	res["globalFiles"], res["globalDirectories"], res["globalSymlinks"], res["globalDeleted"], res["globalBytes"] = global.Files, global.Directories, global.Symlinks, global.Deleted, global.Bytes

-	localFiles, localDeleted, localBytes := m.LocalSize(folder)
-	res["localFiles"], res["localDeleted"], res["localBytes"] = localFiles, localDeleted, localBytes
+	local := m.LocalSize(folder)
+	res["localFiles"], res["localDirectories"], res["localSymlinks"], res["localDeleted"], res["localBytes"] = local.Files, local.Directories, local.Symlinks, local.Deleted, local.Bytes

-	needFiles, needBytes := m.NeedSize(folder)
-	res["needFiles"], res["needBytes"] = needFiles, needBytes
+	need := m.NeedSize(folder)
+	res["needFiles"], res["needDirectories"], res["needSymlinks"], res["needDeletes"], res["needBytes"] = need.Files, need.Directories, need.Symlinks, need.Deleted, need.Bytes

-	res["inSyncFiles"], res["inSyncBytes"] = globalFiles-needFiles, globalBytes-needBytes
+	res["inSyncFiles"], res["inSyncBytes"] = global.Files-need.Files, global.Bytes-need.Bytes

 	var err error
 	res["state"], res["stateChanged"], err = m.State(folder)
@@ -596,10 +650,11 @@ func folderSummary(cfg configIntf, m modelIntf, folder string) map[string]interf
 		res["error"] = err.Error()
 	}

-	lv, _ := m.CurrentLocalVersion(folder)
-	rv, _ := m.RemoteLocalVersion(folder)
+	ourSeq, _ := m.CurrentSequence(folder)
+	remoteSeq, _ := m.RemoteSequence(folder)

-	res["version"] = lv + rv
+	res["version"] = ourSeq + remoteSeq  // legacy
+	res["sequence"] = ourSeq + remoteSeq // new name

 	ignorePatterns, _, _ := m.GetIgnores(folder)
 	res["ignorePatterns"] = false
@@ -680,7 +735,7 @@ func (s *apiService) getDBFile(w http.ResponseWriter, r *http.Request) {
 }

 func (s *apiService) getSystemConfig(w http.ResponseWriter, r *http.Request) {
-	sendJSON(w, s.cfg.Raw())
+	sendJSON(w, s.cfg.RawCopy())
 }

 func (s *apiService) postSystemConfig(w http.ResponseWriter, r *http.Request) {
@@ -723,11 +778,13 @@ func (s *apiService) postSystemConfig(w http.ResponseWriter, r *http.Request) {
 	// Activate and save

 	if err := s.cfg.Replace(to); err != nil {
+		l.Warnln("Replacing config:", err)
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}

 	if err := s.cfg.Save(); err != nil {
+		l.Warnln("Saving config:", err)
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
@@ -949,15 +1006,22 @@ func (s *apiService) postDBIgnores(w http.ResponseWriter, r *http.Request) {
 	s.getDBIgnores(w, r)
 }

-func (s *apiService) getEvents(w http.ResponseWriter, r *http.Request) {
+func (s *apiService) getIndexEvents(w http.ResponseWriter, r *http.Request) {
+	s.fss.gotEventRequest()
+	s.getEvents(w, r, s.eventSub)
+}
+
+func (s *apiService) getDiskEvents(w http.ResponseWriter, r *http.Request) {
+	s.getEvents(w, r, s.diskEventSub)
+}
+
+func (s *apiService) getEvents(w http.ResponseWriter, r *http.Request, eventSub events.BufferedSubscription) {
 	qs := r.URL.Query()
 	sinceStr := qs.Get("since")
 	limitStr := qs.Get("limit")
 	since, _ := strconv.Atoi(sinceStr)
 	limit, _ := strconv.Atoi(limitStr)

-	s.fss.gotEventRequest()
-
 	// Flush before blocking, to indicate that we've received the request and
 	// that it should not be retried. Must set Content-Type header before
 	// flushing.
@@ -965,7 +1029,7 @@ func (s *apiService) getEvents(w http.ResponseWriter, r *http.Request) {
 	f := w.(http.Flusher)
 	f.Flush()

-	evs := s.eventSub.Since(since, nil)
+	evs := eventSub.Since(since, nil)
 	if 0 < limit && limit < len(evs) {
 		evs = evs[len(evs)-limit:]
 	}
@@ -1040,30 +1104,27 @@ func (s *apiService) postSystemUpgrade(w http.ResponseWriter, r *http.Request) {
 	}
 }

-func (s *apiService) postSystemPause(w http.ResponseWriter, r *http.Request) {
-	var qs = r.URL.Query()
-	var deviceStr = qs.Get("device")
+func (s *apiService) makeDevicePauseHandler(paused bool) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var qs = r.URL.Query()
+		var deviceStr = qs.Get("device")

-	device, err := protocol.DeviceIDFromString(deviceStr)
-	if err != nil {
-		http.Error(w, err.Error(), 500)
-		return
+		device, err := protocol.DeviceIDFromString(deviceStr)
+		if err != nil {
+			http.Error(w, err.Error(), 500)
+			return
+		}
+
+		cfg, ok := s.cfg.Devices()[device]
+		if !ok {
+			http.Error(w, "not found", http.StatusNotFound)
+		}
+
+		cfg.Paused = paused
+		if err := s.cfg.SetDevice(cfg); err != nil {
+			http.Error(w, err.Error(), 500)
+		}
 	}
-
-	s.model.PauseDevice(device)
-}
-
-func (s *apiService) postSystemResume(w http.ResponseWriter, r *http.Request) {
-	var qs = r.URL.Query()
-	var deviceStr = qs.Get("device")
-
-	device, err := protocol.DeviceIDFromString(deviceStr)
-	if err != nil {
-		http.Error(w, err.Error(), 500)
-		return
-	}
-
-	s.model.ResumeDevice(device)
 }

 func (s *apiService) postDBScan(w http.ResponseWriter, r *http.Request) {
@@ -1121,7 +1182,7 @@ func (s *apiService) getPeerCompletion(w http.ResponseWriter, r *http.Request) {
 		for _, device := range folder.DeviceIDs() {
 			deviceStr := device.String()
 			if s.model.ConnectedTo(device) {
-				tot[deviceStr] += s.model.Completion(device, folder.ID)
+				tot[deviceStr] += s.model.Completion(device, folder.ID).CompletionPct
 			} else {
 				tot[deviceStr] = 0
 			}
@@ -1165,6 +1226,32 @@ func (s *apiService) getSystemBrowse(w http.ResponseWriter, r *http.Request) {
 	sendJSON(w, ret)
 }

+func (s *apiService) getCPUProf(w http.ResponseWriter, r *http.Request) {
+	duration, err := time.ParseDuration(r.FormValue("duration"))
+	if err != nil {
+		duration = 30 * time.Second
+	}
+
+	filename := fmt.Sprintf("syncthing-cpu-%s-%s-%s-%s.pprof", runtime.GOOS, runtime.GOARCH, Version, time.Now().Format("150405")) // hhmmss
+
+	w.Header().Set("Content-Type", "application/octet-stream")
+	w.Header().Set("Content-Disposition", "attachment; filename="+filename)
+
+	pprof.StartCPUProfile(w)
+	time.Sleep(duration)
+	pprof.StopCPUProfile()
+}
+
+func (s *apiService) getHeapProf(w http.ResponseWriter, r *http.Request) {
+	filename := fmt.Sprintf("syncthing-heap-%s-%s-%s-%s.pprof", runtime.GOOS, runtime.GOARCH, Version, time.Now().Format("150405")) // hhmmss
+
+	w.Header().Set("Content-Type", "application/octet-stream")
+	w.Header().Set("Content-Disposition", "attachment; filename="+filename)
+
+	runtime.GC()
+	pprof.WriteHeapProfile(w)
+}
+
 func (s *apiService) toNeedSlice(fs []db.FileInfoTruncated) []jsonDBFileInfo {
 	res := make([]jsonDBFileInfo, len(fs))
 	for i, f := range fs {
@@ -1186,8 +1273,8 @@ func (f jsonFileInfo) MarshalJSON() ([]byte, error) {
 		"deleted":       f.Deleted,
 		"invalid":       f.Invalid,
 		"noPermissions": f.NoPermissions,
-		"modified":      time.Unix(f.Modified, 0),
-		"localVersion":  f.LocalVersion,
+		"modified":      protocol.FileInfo(f).ModTime(),
+		"sequence":      f.Sequence,
 		"numBlocks":     len(f.Blocks),
 		"version":       jsonVersionVector(f.Version),
 	})
@@ -1204,8 +1291,8 @@ func (f jsonDBFileInfo) MarshalJSON() ([]byte, error) {
 		"deleted":       f.Deleted,
 		"invalid":       f.Invalid,
 		"noPermissions": f.NoPermissions,
-		"modified":      time.Unix(f.Modified, 0),
-		"localVersion":  f.LocalVersion,
+		"modified":      db.FileInfoTruncated(f).ModTime(),
+		"sequence":      f.Sequence,
 	})
 }

@@ -1241,3 +1328,17 @@ func dirNames(dir string) []string {
 	sort.Strings(dirs)
 	return dirs
 }
+
+func addressIsLocalhost(addr string) bool {
+	host, _, err := net.SplitHostPort(addr)
+	if err != nil {
+		// There was no port, so we assume the address was just a hostname
+		host = addr
+	}
+	switch strings.ToLower(host) {
+	case "127.0.0.1", "::1", "localhost":
+		return true
+	default:
+		return false
+	}
+}
--- a/cmd/syncthing/gui_csrf.go
+++ b/cmd/syncthing/gui_csrf.go
@@ -37,6 +37,16 @@ func csrfMiddleware(unique string, prefix string, cfg config.GUIConfiguration, n
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		// Allow requests carrying a valid API key
 		if cfg.IsValidAPIKey(r.Header.Get("X-API-Key")) {
+			// Set the access-control-allow-origin header for CORS requests
+			// since a valid API key has been provided
+			w.Header().Add("Access-Control-Allow-Origin", "*")
+			next.ServeHTTP(w, r)
+			return
+		}
+
+		if strings.HasPrefix(r.URL.Path, "/rest/debug") {
+			// Debugging functions are only available when explicitly
+			// enabled, and can be accessed without a CSRF token
 			next.ServeHTTP(w, r)
 			return
 		}
@@ -106,7 +116,7 @@ func saveCsrfTokens() {
 	// nothing relevant we can do about them anyway...

 	name := locations[locCsrfTokens]
-	f, err := osutil.CreateAtomic(name, 0600)
+	f, err := osutil.CreateAtomic(name)
 	if err != nil {
 		return
 	}
--- a/cmd/syncthing/gui_solaris.go
+++ b/cmd/syncthing/gui_solaris.go
@@ -78,7 +78,7 @@ func trackCPUUsage() {
 	var prevTime = time.Now().UnixNano()
 	var rusage prusage_t
 	var pid = os.Getpid()
-	for _ = range time.NewTicker(time.Second).C {
+	for range time.NewTicker(time.Second).C {
 		err := solarisPrusage(pid, &rusage)
 		if err != nil {
 			l.Warnln("getting prusage:", err)
--- a/cmd/syncthing/gui_test.go
+++ b/cmd/syncthing/gui_test.go
@@ -16,6 +16,7 @@ import (
 	"net"
 	"net/http"
 	"net/http/httptest"
+	"strconv"
 	"strings"
 	"testing"
 	"time"
@@ -69,7 +70,7 @@ func TestStopAfterBrokenConfig(t *testing.T) {
 	}
 	w := config.Wrap("/dev/null", cfg)

-	srv := newAPIService(protocol.LocalDeviceID, w, "../../test/h1/https-cert.pem", "../../test/h1/https-key.pem", "", nil, nil, nil, nil, nil, nil)
+	srv := newAPIService(protocol.LocalDeviceID, w, "../../test/h1/https-cert.pem", "../../test/h1/https-key.pem", "", nil, nil, nil, nil, nil, nil, nil)
 	srv.started = make(chan string)

 	sup := suture.NewSimple("test")
@@ -460,7 +461,6 @@ func TestHTTPLogin(t *testing.T) {
 	if resp.StatusCode != http.StatusOK {
 		t.Errorf("Unexpected non-200 return code %d for authed request (ISO-8859-1)", resp.StatusCode)
 	}
-
 }

 func startHTTP(cfg *mockedConfig) (string, error) {
@@ -469,6 +469,7 @@ func startHTTP(cfg *mockedConfig) (string, error) {
 	httpsKeyFile := "../../test/h1/https-key.pem"
 	assetDir := "../../gui"
 	eventSub := new(mockedEventSub)
+	diskEventSub := new(mockedEventSub)
 	discoverer := new(mockedCachingMux)
 	connections := new(mockedConnections)
 	errorLog := new(mockedLoggerRecorder)
@@ -477,7 +478,7 @@ func startHTTP(cfg *mockedConfig) (string, error) {

 	// Instantiate the API service
 	svc := newAPIService(protocol.LocalDeviceID, cfg, httpsCertFile, httpsKeyFile, assetDir, model,
-		eventSub, discoverer, connections, errorLog, systemLog)
+		eventSub, diskEventSub, discoverer, connections, errorLog, systemLog)
 	svc.started = addrChan

 	// Actually start the API service
@@ -491,7 +492,12 @@ func startHTTP(cfg *mockedConfig) (string, error) {
 	if err != nil {
 		return "", fmt.Errorf("Weird address from API service: %v", err)
 	}
-	baseURL := fmt.Sprintf("http://127.0.0.1:%d", tcpAddr.Port)
+
+	host, _, _ := net.SplitHostPort(cfg.gui.RawAddress)
+	if host == "" || host == "0.0.0.0" {
+		host = "127.0.0.1"
+	}
+	baseURL := fmt.Sprintf("http://%s", net.JoinHostPort(host, strconv.Itoa(tcpAddr.Port)))

 	return baseURL, nil
 }
@@ -501,6 +507,9 @@ func TestCSRFRequired(t *testing.T) {
 	cfg := new(mockedConfig)
 	cfg.gui.APIKey = testAPIKey
 	baseURL, err := startHTTP(cfg)
+	if err != nil {
+		t.Fatal("Unexpected error from getting base URL:", err)
+	}

 	cli := &http.Client{
 		Timeout: time.Second,
@@ -666,3 +675,252 @@ func testConfigPost(data io.Reader) (*http.Response, error) {
 	req.Header.Set("X-API-Key", testAPIKey)
 	return cli.Do(req)
 }
+
+func TestHostCheck(t *testing.T) {
+	// An API service bound to localhost should reject non-localhost host Headers
+
+	cfg := new(mockedConfig)
+	cfg.gui.RawAddress = "127.0.0.1:0"
+	baseURL, err := startHTTP(cfg)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// A normal HTTP get to the localhost-bound service should succeed
+
+	resp, err := http.Get(baseURL)
+	if err != nil {
+		t.Fatal(err)
+	}
+	resp.Body.Close()
+	if resp.StatusCode != http.StatusOK {
+		t.Error("Regular HTTP get: expected 200 OK, not", resp.Status)
+	}
+
+	// A request with a suspicious Host header should fail
+
+	req, _ := http.NewRequest("GET", baseURL, nil)
+	req.Host = "example.com"
+	resp, err = http.DefaultClient.Do(req)
+	if err != nil {
+		t.Fatal(err)
+	}
+	resp.Body.Close()
+	if resp.StatusCode != http.StatusForbidden {
+		t.Error("Suspicious Host header: expected 403 Forbidden, not", resp.Status)
+	}
+
+	// A request with an explicit "localhost:8384" Host header should pass
+
+	req, _ = http.NewRequest("GET", baseURL, nil)
+	req.Host = "localhost:8384"
+	resp, err = http.DefaultClient.Do(req)
+	if err != nil {
+		t.Fatal(err)
+	}
+	resp.Body.Close()
+	if resp.StatusCode != http.StatusOK {
+		t.Error("Explicit localhost:8384: expected 200 OK, not", resp.Status)
+	}
+
+	// A request with an explicit "localhost" Host header (no port) should pass
+
+	req, _ = http.NewRequest("GET", baseURL, nil)
+	req.Host = "localhost"
+	resp, err = http.DefaultClient.Do(req)
+	if err != nil {
+		t.Fatal(err)
+	}
+	resp.Body.Close()
+	if resp.StatusCode != http.StatusOK {
+		t.Error("Explicit localhost: expected 200 OK, not", resp.Status)
+	}
+
+	// A server with InsecureSkipHostCheck set behaves differently
+
+	cfg = new(mockedConfig)
+	cfg.gui.RawAddress = "127.0.0.1:0"
+	cfg.gui.InsecureSkipHostCheck = true
+	baseURL, err = startHTTP(cfg)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// A request with a suspicious Host header should be allowed
+
+	req, _ = http.NewRequest("GET", baseURL, nil)
+	req.Host = "example.com"
+	resp, err = http.DefaultClient.Do(req)
+	if err != nil {
+		t.Fatal(err)
+	}
+	resp.Body.Close()
+	if resp.StatusCode != http.StatusOK {
+		t.Error("Incorrect host header, check disabled: expected 200 OK, not", resp.Status)
+	}
+
+	// A server bound to a wildcard address also doesn't do the check
+
+	cfg = new(mockedConfig)
+	cfg.gui.RawAddress = "0.0.0.0:0"
+	cfg.gui.InsecureSkipHostCheck = true
+	baseURL, err = startHTTP(cfg)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// A request with a suspicious Host header should be allowed
+
+	req, _ = http.NewRequest("GET", baseURL, nil)
+	req.Host = "example.com"
+	resp, err = http.DefaultClient.Do(req)
+	if err != nil {
+		t.Fatal(err)
+	}
+	resp.Body.Close()
+	if resp.StatusCode != http.StatusOK {
+		t.Error("Incorrect host header, wildcard bound: expected 200 OK, not", resp.Status)
+	}
+
+	// This should all work over IPv6 as well
+
+	cfg = new(mockedConfig)
+	cfg.gui.RawAddress = "[::1]:0"
+	baseURL, err = startHTTP(cfg)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// A normal HTTP get to the localhost-bound service should succeed
+
+	resp, err = http.Get(baseURL)
+	if err != nil {
+		t.Fatal(err)
+	}
+	resp.Body.Close()
+	if resp.StatusCode != http.StatusOK {
+		t.Error("Regular HTTP get (IPv6): expected 200 OK, not", resp.Status)
+	}
+
+	// A request with a suspicious Host header should fail
+
+	req, _ = http.NewRequest("GET", baseURL, nil)
+	req.Host = "example.com"
+	resp, err = http.DefaultClient.Do(req)
+	if err != nil {
+		t.Fatal(err)
+	}
+	resp.Body.Close()
+	if resp.StatusCode != http.StatusForbidden {
+		t.Error("Suspicious Host header (IPv6): expected 403 Forbidden, not", resp.Status)
+	}
+
+	// A request with an explicit "localhost:8384" Host header should pass
+
+	req, _ = http.NewRequest("GET", baseURL, nil)
+	req.Host = "localhost:8384"
+	resp, err = http.DefaultClient.Do(req)
+	if err != nil {
+		t.Fatal(err)
+	}
+	resp.Body.Close()
+	if resp.StatusCode != http.StatusOK {
+		t.Error("Explicit localhost:8384 (IPv6): expected 200 OK, not", resp.Status)
+	}
+}
+
+func TestAddressIsLocalhost(t *testing.T) {
+	testcases := []struct {
+		address string
+		result  bool
+	}{
+		// These are all valid localhost addresses
+		{"localhost", true},
+		{"LOCALHOST", true},
+		{"::1", true},
+		{"127.0.0.1", true},
+		{"localhost:8080", true},
+		{"LOCALHOST:8000", true},
+		{"[::1]:8080", true},
+		{"127.0.0.1:8080", true},
+
+		// These are all non-localhost addresses
+		{"example.com", false},
+		{"example.com:8080", false},
+		{"192.0.2.10", false},
+		{"192.0.2.10:8080", false},
+		{"0.0.0.0", false},
+		{"0.0.0.0:8080", false},
+		{"::", false},
+		{"[::]:8080", false},
+		{":8080", false},
+	}
+
+	for _, tc := range testcases {
+		result := addressIsLocalhost(tc.address)
+		if result != tc.result {
+			t.Errorf("addressIsLocalhost(%q)=%v, expected %v", tc.address, result, tc.result)
+		}
+	}
+}
+
+func TestAccessControlAllowOriginHeader(t *testing.T) {
+	const testAPIKey = "foobarbaz"
+	cfg := new(mockedConfig)
+	cfg.gui.APIKey = testAPIKey
+	baseURL, err := startHTTP(cfg)
+	if err != nil {
+		t.Fatal(err)
+	}
+	cli := &http.Client{
+		Timeout: time.Second,
+	}
+
+	req, _ := http.NewRequest("GET", baseURL+"/rest/system/status", nil)
+	req.Header.Set("X-API-Key", testAPIKey)
+	resp, err := cli.Do(req)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	resp.Body.Close()
+	if resp.StatusCode != http.StatusOK {
+		t.Fatal("GET on /rest/system/status should succeed, not", resp.Status)
+	}
+	if resp.Header.Get("Access-Control-Allow-Origin") != "*" {
+		t.Fatal("GET on /rest/system/status should return a 'Access-Control-Allow-Origin: *' header")
+	}
+}
+
+func TestOptionsRequest(t *testing.T) {
+	const testAPIKey = "foobarbaz"
+	cfg := new(mockedConfig)
+	cfg.gui.APIKey = testAPIKey
+	baseURL, err := startHTTP(cfg)
+	if err != nil {
+		t.Fatal(err)
+	}
+	cli := &http.Client{
+		Timeout: time.Second,
+	}
+
+	req, _ := http.NewRequest("OPTIONS", baseURL+"/rest/system/status", nil)
+	resp, err := cli.Do(req)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	resp.Body.Close()
+	if resp.StatusCode != http.StatusNoContent {
+		t.Fatal("OPTIONS on /rest/system/status should succeed, not", resp.Status)
+	}
+	if resp.Header.Get("Access-Control-Allow-Origin") != "*" {
+		t.Fatal("OPTIONS on /rest/system/status should return a 'Access-Control-Allow-Origin: *' header")
+	}
+	if resp.Header.Get("Access-Control-Allow-Methods") != "GET, POST" {
+		t.Fatal("OPTIONS on /rest/system/status should return a 'Access-Control-Allow-Methods: GET, POST' header")
+	}
+	if resp.Header.Get("Access-Control-Allow-Headers") != "Content-Type, X-API-Key" {
+		t.Fatal("OPTIONS on /rest/system/status should return a 'Access-Control-Allow-Headers: Content-Type, X-API-KEY' header")
+	}
+}
--- a/cmd/syncthing/gui_unix.go
+++ b/cmd/syncthing/gui_unix.go
@@ -21,7 +21,7 @@ func trackCPUUsage() {
 	var prevUsage int64
 	var prevTime = time.Now().UnixNano()
 	var rusage syscall.Rusage
-	for _ = range time.NewTicker(time.Second).C {
+	for range time.NewTicker(time.Second).C {
 		syscall.Getrusage(syscall.RUSAGE_SELF, &rusage)
 		curTime := time.Now().UnixNano()
 		timeDiff := curTime - prevTime
--- a/cmd/syncthing/gui_windows.go
+++ b/cmd/syncthing/gui_windows.go
@@ -34,7 +34,7 @@ func trackCPUUsage() {
 	prevTime := ctime.Nanoseconds()
 	prevUsage := ktime.Nanoseconds() + utime.Nanoseconds() // Always overflows

-	for _ = range time.NewTicker(time.Second).C {
+	for range time.NewTicker(time.Second).C {
 		err := syscall.GetProcessTimes(handle, &ctime, &etime, &ktime, &utime)
 		if err != nil {
 			continue
--- a/cmd/syncthing/main.go
+++ b/cmd/syncthing/main.go
@@ -12,11 +12,11 @@ import (
 	"errors"
 	"flag"
 	"fmt"
+	"io"
 	"io/ioutil"
 	"log"
 	"net"
 	"net/http"
-	_ "net/http/pprof"
 	"net/url"
 	"os"
 	"os/signal"
@@ -42,11 +42,14 @@ import (
 	"github.com/syncthing/syncthing/lib/osutil"
 	"github.com/syncthing/syncthing/lib/protocol"
 	"github.com/syncthing/syncthing/lib/rand"
+	"github.com/syncthing/syncthing/lib/sha256"
 	"github.com/syncthing/syncthing/lib/symlinks"
 	"github.com/syncthing/syncthing/lib/tlsutil"
 	"github.com/syncthing/syncthing/lib/upgrade"

 	"github.com/thejerf/suture"
+
+	_ "net/http/pprof" // Need to import this to support STPROFILER.
 )

 var (
@@ -138,11 +141,11 @@ show time only (2).
 Development Settings
 --------------------

-The following environment variables modify syncthing's behavior in ways that
+The following environment variables modify Syncthing's behavior in ways that
 are mostly useful for developers. Use with care.

 STNODEFAULTFOLDER Don't create a default folder when starting for the first
-                   time.  This variable will be ignored anytime after the first
+                   time. This variable will be ignored anytime after the first
                   run.

 STGUIASSETS       Directory to load GUI assets from. Overrides compiled in
@@ -151,8 +154,8 @@ are mostly useful for developers. Use with care.
 STTRACE           A comma separated string of facilities to trace. The valid
                   facility strings listed below.

- STPROFILER        Set to a listen address such as "127.0.0.1:9090" to start the
-                   profiler with HTTP access.
+ STPROFILER        Set to a listen address such as "127.0.0.1:9090" to start
+                   the profiler with HTTP access.

 STCPUPROFILE      Write a CPU profile to cpu-$pid.pprof on exit.

@@ -165,14 +168,33 @@ are mostly useful for developers. Use with care.
 STPERFSTATS       Write running performance statistics to perf-$pid.csv. Not
                   supported on Windows.

+ STDEADLOCK        Used for debugging internal deadlocks. Use only under
+                   direction of a developer.
+
+ STDEADLOCKTIMEOUT Used for debugging internal deadlocks; sets debug
+                   sensitivity. Use only under direction of a developer.
+
+ STDEADLOCKTHRESHOLD Used for debugging internal deadlocks; sets debug
+                     sensitivity.  Use only under direction of a developer.
+
+ STNORESTART       Equivalent to the -no-restart argument. Disable the
+                   Syncthing monitor process which handles restarts for some
+                   configuration changes, upgrades, crashes and also log file
+                   writing (stdout is still written).
+
 STNOUPGRADE       Disable automatic upgrades.

+ STHASHING         Select the SHA256 hashing package to use. Possible values
+                   are "standard" for the Go standard library implementation,
+                   "minio" for the github.com/minio/sha256-simd implementation,
+                   and blank (the default) for auto detection.
+
 GOMAXPROCS        Set the maximum number of CPU cores to use. Defaults to all
                   available CPU cores.

 GOGC              Percentage of heap growth at which to trigger GC. Default is
                   100. Lower numbers keep peak memory usage down, at the price
-                   of CPU usage (ie. performance).
+                   of CPU usage (i.e. performance).


 Debugging Facilities
@@ -192,7 +214,8 @@ var (

 type RuntimeOptions struct {
 	confDir        string
-	reset          bool
+	resetDatabase  bool
+	resetDeltaIdxs bool
 	showVersion    bool
 	showPaths      bool
 	doUpgrade      bool
@@ -203,8 +226,10 @@ type RuntimeOptions struct {
 	hideConsole    bool
 	logFile        string
 	auditEnabled   bool
+	auditFile      string
 	verbose        bool
 	paused         bool
+	unpaused       bool
 	guiAddress     string
 	guiAPIKey      string
 	generateDir    string
@@ -251,8 +276,9 @@ func parseCommandLineOptions() RuntimeOptions {
 	flag.IntVar(&options.logFlags, "logflags", options.logFlags, "Select information in log line prefix (see below)")
 	flag.BoolVar(&options.noBrowser, "no-browser", false, "Do not start browser")
 	flag.BoolVar(&options.browserOnly, "browser-only", false, "Open GUI in browser")
-	flag.BoolVar(&options.noRestart, "no-restart", options.noRestart, "Do not restart; just exit")
-	flag.BoolVar(&options.reset, "reset", false, "Reset the database")
+	flag.BoolVar(&options.noRestart, "no-restart", options.noRestart, "Disable monitor process, managed restarts and log file writing")
+	flag.BoolVar(&options.resetDatabase, "reset-database", false, "Reset the database, forcing a full rescan and resync")
+	flag.BoolVar(&options.resetDeltaIdxs, "reset-deltas", false, "Reset delta index IDs, forcing a full index exchange")
 	flag.BoolVar(&options.doUpgrade, "upgrade", false, "Perform upgrade")
 	flag.BoolVar(&options.doUpgradeCheck, "upgrade-check", false, "Check for available upgrade")
 	flag.BoolVar(&options.showVersion, "version", false, "Show version")
@@ -260,8 +286,10 @@ func parseCommandLineOptions() RuntimeOptions {
 	flag.StringVar(&options.upgradeTo, "upgrade-to", options.upgradeTo, "Force upgrade directly from specified URL")
 	flag.BoolVar(&options.auditEnabled, "audit", false, "Write events to audit file")
 	flag.BoolVar(&options.verbose, "verbose", false, "Print verbose log output")
-	flag.BoolVar(&options.paused, "paused", false, "Start with all devices paused")
+	flag.BoolVar(&options.paused, "paused", false, "Start with all devices and folders paused")
+	flag.BoolVar(&options.unpaused, "unpaused", false, "Start with all devices and folders unpaused")
 	flag.StringVar(&options.logFile, "logfile", options.logFile, "Log file name (use \"-\" for stdout)")
+	flag.StringVar(&options.auditFile, "auditfile", options.auditFile, "Specify audit file (use \"-\" for stdout, \"--\" for stderr)")
 	if runtime.GOOS == "windows" {
 		// Allow user to hide the console window
 		flag.BoolVar(&options.hideConsole, "no-console", false, "Hide console window")
@@ -271,6 +299,11 @@ func parseCommandLineOptions() RuntimeOptions {
 	flag.Usage = usageFor(flag.CommandLine, usage, longUsage)
 	flag.Parse()

+	if len(flag.Args()) > 0 {
+		flag.Usage()
+		os.Exit(2)
+	}
+
 	return options
 }

@@ -355,7 +388,7 @@ func main() {
 		return
 	}

-	if options.reset {
+	if options.resetDatabase {
 		resetDB()
 		return
 	}
@@ -529,7 +562,7 @@ func syncthingMain(runtimeOptions RuntimeOptions) {
 	l.SetPrefix("[start] ")

 	if runtimeOptions.auditEnabled {
-		startAuditing(mainService)
+		startAuditing(mainService, runtimeOptions.auditFile)
 	}

 	if runtimeOptions.verbose {
@@ -542,7 +575,8 @@ func syncthingMain(runtimeOptions RuntimeOptions) {
 	// Event subscription for the API; must start early to catch the early
 	// events. The LocalChangeDetected event might overwhelm the event
 	// receiver in some situations so we will not subscribe to it here.
-	apiSub := events.NewBufferedSubscription(events.Default.Subscribe(events.AllEvents&^events.LocalChangeDetected), 1000)
+	apiSub := events.NewBufferedSubscription(events.Default.Subscribe(events.AllEvents&^events.LocalChangeDetected&^events.RemoteChangeDetected), 1000)
+	diskSub := events.NewBufferedSubscription(events.Default.Subscribe(events.LocalChangeDetected|events.RemoteChangeDetected), 1000)

 	if len(os.Getenv("GOMAXPROCS")) == 0 {
 		runtime.GOMAXPROCS(runtime.NumCPU())
@@ -568,7 +602,9 @@ func syncthingMain(runtimeOptions RuntimeOptions) {

 	l.Infoln(LongVersion)
 	l.Infoln("My ID:", myID)
-	printHashRate()
+
+	sha256.SelectAlgo()
+	sha256.Report()

 	// Emit the Starting event, now that we know who we are.

@@ -605,6 +641,10 @@ func syncthingMain(runtimeOptions RuntimeOptions) {
 		InsecureSkipVerify:     true,
 		MinVersion:             tls.VersionTLS12,
 		CipherSuites: []uint16{
+			0xCCA8, // TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305, Go 1.8
+			0xCCA9, // TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305, Go 1.8
+			tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
+			tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
 			tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
 			tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
 			tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
@@ -614,9 +654,6 @@ func syncthingMain(runtimeOptions RuntimeOptions) {
 		},
 	}

-	// If the read or write rate should be limited, set up a rate limiter for it.
-	// This will be used on connections created in the connect and listen routines.
-
 	opts := cfg.Options()

 	if !opts.SymlinksEnabled {
@@ -648,6 +685,11 @@ func syncthingMain(runtimeOptions RuntimeOptions) {
 		l.Fatalln("Cannot open database:", err, "- Is another copy of Syncthing already running?")
 	}

+	if runtimeOptions.resetDeltaIdxs {
+		l.Infoln("Reinitializing delta index IDs")
+		ldb.DropDeltaIndexIDs()
+	}
+
 	protectedFiles := []string{
 		locations[locDatabase],
 		locations[locConfigFile],
@@ -664,8 +706,14 @@ func syncthingMain(runtimeOptions RuntimeOptions) {
 		}
 	}

+	if cfg.RawCopy().OriginalVersion == 15 {
+		// The config version 15->16 migration is about handling ignores and
+		// delta indexes and requires that we drop existing indexes that
+		// have been incorrectly ignore filtered.
+		ldb.DropDeltaIndexIDs()
+	}
+
 	m := model.NewModel(cfg, myID, myDeviceName(cfg), "syncthing", Version, ldb, protectedFiles)
-	cfg.Subscribe(m)

 	if t := os.Getenv("STDEADLOCKTIMEOUT"); len(t) > 0 {
 		it, err := strconv.Atoi(t)
@@ -676,14 +724,17 @@ func syncthingMain(runtimeOptions RuntimeOptions) {
 		m.StartDeadlockDetector(20 * time.Minute)
 	}

-	if runtimeOptions.paused {
-		for device := range cfg.Devices() {
-			m.PauseDevice(device)
-		}
+	if runtimeOptions.unpaused {
+		setPauseState(cfg, false)
+	} else if runtimeOptions.paused {
+		setPauseState(cfg, true)
 	}

 	// Add and start folders
 	for _, folderCfg := range cfg.Folders() {
+		if folderCfg.Paused {
+			continue
+		}
 		m.AddFolder(folderCfg)
 		m.StartFolder(folderCfg.ID)
 	}
@@ -735,7 +786,7 @@ func syncthingMain(runtimeOptions RuntimeOptions) {

 	// GUI

-	setupGUI(mainService, cfg, m, apiSub, cachedDiscovery, connectionsService, errors, systemLog, runtimeOptions)
+	setupGUI(mainService, cfg, m, apiSub, diskSub, cachedDiscovery, connectionsService, errors, systemLog, runtimeOptions)

 	if runtimeOptions.cpuProfile {
 		f, err := os.Create(fmt.Sprintf("cpu-%d.pprof", os.Getpid()))
@@ -835,22 +886,6 @@ func setupSignalHandling() {
 	}()
 }

-// printHashRate prints the hashing performance in MB/s, formatting it with
-// appropriate precision for the value, i.e. 182 MB/s, 18 MB/s, 1.8 MB/s, 0.18
-// MB/s.
-func printHashRate() {
-	hashRate := cpuBench(3, 100*time.Millisecond)
-
-	decimals := 0
-	if hashRate < 1 {
-		decimals = 2
-	} else if hashRate < 10 {
-		decimals = 1
-	}
-
-	l.Infof("Single thread hash performance is ~%.*f MB/s", decimals, hashRate)
-}
-
 func loadConfig() (*config.Wrapper, error) {
 	cfgFile := locations[locConfigFile]
 	cfg, err := config.Load(cfgFile, myID)
@@ -873,7 +908,7 @@ func loadOrCreateConfig() *config.Wrapper {
 		l.Fatalln("Config:", err)
 	}

-	if cfg.Raw().OriginalVersion != config.CurrentVersion {
+	if cfg.RawCopy().OriginalVersion != config.CurrentVersion {
 		err = archiveAndSaveConfig(cfg)
 		if err != nil {
 			l.Fatalln("Config archive:", err)
@@ -884,24 +919,57 @@ func loadOrCreateConfig() *config.Wrapper {
 }

 func archiveAndSaveConfig(cfg *config.Wrapper) error {
-	// To prevent previous config from being cleaned up, quickly touch it too
-	now := time.Now()
-	_ = os.Chtimes(cfg.ConfigPath(), now, now) // May return error on Android etc; no worries
-
-	archivePath := cfg.ConfigPath() + fmt.Sprintf(".v%d", cfg.Raw().OriginalVersion)
+	// Copy the existing config to an archive copy
+	archivePath := cfg.ConfigPath() + fmt.Sprintf(".v%d", cfg.RawCopy().OriginalVersion)
 	l.Infoln("Archiving a copy of old config file format at:", archivePath)
-	if err := osutil.Rename(cfg.ConfigPath(), archivePath); err != nil {
+	if err := copyFile(cfg.ConfigPath(), archivePath); err != nil {
 		return err
 	}

+	// Do a regular atomic config sve
 	return cfg.Save()
 }

-func startAuditing(mainService *suture.Supervisor) {
-	auditFile := timestampedLoc(locAuditLog)
-	fd, err := os.OpenFile(auditFile, os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0600)
+func copyFile(src, dst string) error {
+	bs, err := ioutil.ReadFile(src)
 	if err != nil {
-		l.Fatalln("Audit:", err)
+		return err
+	}
+
+	if err := ioutil.WriteFile(dst, bs, 0600); err != nil {
+		// Attempt to clean up
+		os.Remove(dst)
+		return err
+	}
+
+	return nil
+}
+
+func startAuditing(mainService *suture.Supervisor, auditFile string) {
+
+	var fd io.Writer
+	var err error
+	var auditDest string
+	var auditFlags int
+
+	if auditFile == "-" {
+		fd = os.Stdout
+		auditDest = "stdout"
+	} else if auditFile == "--" {
+		fd = os.Stderr
+		auditDest = "stderr"
+	} else {
+		if auditFile == "" {
+			auditFile = timestampedLoc(locAuditLog)
+			auditFlags = os.O_WRONLY | os.O_CREATE | os.O_EXCL
+		} else {
+			auditFlags = os.O_WRONLY | os.O_CREATE | os.O_APPEND
+		}
+		fd, err = os.OpenFile(auditFile, auditFlags, 0600)
+		if err != nil {
+			l.Fatalln("Audit:", err)
+		}
+		auditDest = auditFile
 	}

 	auditService := newAuditService(fd)
@@ -911,10 +979,10 @@ func startAuditing(mainService *suture.Supervisor) {
 	// ensure we capture all events from the start.
 	auditService.WaitForStart()

-	l.Infoln("Audit log in", auditFile)
+	l.Infoln("Audit log in", auditDest)
 }

-func setupGUI(mainService *suture.Supervisor, cfg *config.Wrapper, m *model.Model, apiSub events.BufferedSubscription, discoverer discover.CachingMux, connectionsService *connections.Service, errors, systemLog logger.Recorder, runtimeOptions RuntimeOptions) {
+func setupGUI(mainService *suture.Supervisor, cfg *config.Wrapper, m *model.Model, apiSub events.BufferedSubscription, diskSub events.BufferedSubscription, discoverer discover.CachingMux, connectionsService *connections.Service, errors, systemLog logger.Recorder, runtimeOptions RuntimeOptions) {
 	guiCfg := cfg.GUI()

 	if !guiCfg.Enabled {
@@ -925,13 +993,14 @@ func setupGUI(mainService *suture.Supervisor, cfg *config.Wrapper, m *model.Mode
 		l.Warnln("Insecure admin access is enabled.")
 	}

-	api := newAPIService(myID, cfg, locations[locHTTPSCertFile], locations[locHTTPSKeyFile], runtimeOptions.assetDir, m, apiSub, discoverer, connectionsService, errors, systemLog)
+	api := newAPIService(myID, cfg, locations[locHTTPSCertFile], locations[locHTTPSKeyFile], runtimeOptions.assetDir, m, apiSub, diskSub, discoverer, connectionsService, errors, systemLog)
 	cfg.Subscribe(api)
 	mainService.Add(api)

 	if cfg.Options().StartBrowser && !runtimeOptions.noBrowser && !runtimeOptions.stRestarting {
 		// Can potentially block if the utility we are invoking doesn't
 		// fork, and just execs, hence keep it in it's own routine.
+		<-api.startedOnce
 		go openURL(guiCfg.URL())
 	}
 }
@@ -941,9 +1010,8 @@ func defaultConfig(myName string) config.Configuration {

 	if !noDefaultFolder {
 		l.Infoln("Default folder created and/or linked to new config")
-		folderID := rand.String(5) + "-" + rand.String(5)
-		defaultFolder = config.NewFolderConfiguration(folderID, locations[locDefFolder])
-		defaultFolder.Label = "Default Folder (" + folderID + ")"
+		defaultFolder = config.NewFolderConfiguration("default", locations[locDefFolder])
+		defaultFolder.Label = "Default Folder"
 		defaultFolder.RescanIntervalS = 60
 		defaultFolder.MinDiskFreePct = 1
 		defaultFolder.Devices = []config.FolderDeviceConfiguration{{DeviceID: myID}}
@@ -1048,7 +1116,7 @@ func getFreePort(host string, ports ...int) (int, error) {
 }

 func standbyMonitor() {
-	restartDelay := time.Duration(60 * time.Second)
+	restartDelay := 60 * time.Second
 	now := time.Now()
 	for {
 		time.Sleep(10 * time.Second)
@@ -1119,13 +1187,16 @@ func autoUpgrade(cfg *config.Wrapper) {
 // suitable time after they have gone out of fashion.
 func cleanConfigDirectory() {
 	patterns := map[string]time.Duration{
-		"panic-*.log":      7 * 24 * time.Hour,  // keep panic logs for a week
-		"audit-*.log":      7 * 24 * time.Hour,  // keep audit logs for a week
-		"index":            14 * 24 * time.Hour, // keep old index format for two weeks
-		"index*.converted": 14 * 24 * time.Hour, // keep old converted indexes for two weeks
-		"config.xml.v*":    30 * 24 * time.Hour, // old config versions for a month
-		"*.idx.gz":         30 * 24 * time.Hour, // these should for sure no longer exist
-		"backup-of-v0.8":   30 * 24 * time.Hour, // these neither
+		"panic-*.log":        7 * 24 * time.Hour,  // keep panic logs for a week
+		"audit-*.log":        7 * 24 * time.Hour,  // keep audit logs for a week
+		"index":              14 * 24 * time.Hour, // keep old index format for two weeks
+		"index-v0.11.0.db":   14 * 24 * time.Hour, // keep old index format for two weeks
+		"index-v0.13.0.db":   14 * 24 * time.Hour, // keep old index format for two weeks
+		"index*.converted":   14 * 24 * time.Hour, // keep old converted indexes for two weeks
+		"config.xml.v*":      30 * 24 * time.Hour, // old config versions for a month
+		"*.idx.gz":           30 * 24 * time.Hour, // these should for sure no longer exist
+		"backup-of-v0.8":     30 * 24 * time.Hour, // these neither
+		"tmp-index-sorter.*": time.Minute,         // these should never exist on startup
 	}

 	for pat, dur := range patterns {
@@ -1178,3 +1249,16 @@ func showPaths() {
 	fmt.Printf("GUI override directory:\n\t%s\n\n", locations[locGUIAssets])
 	fmt.Printf("Default sync folder directory:\n\t%s\n\n", locations[locDefFolder])
 }
+
+func setPauseState(cfg *config.Wrapper, paused bool) {
+	raw := cfg.RawCopy()
+	for i := range raw.Devices {
+		raw.Devices[i].Paused = paused
+	}
+	for i := range raw.Folders {
+		raw.Folders[i].Paused = paused
+	}
+	if err := cfg.Replace(raw); err != nil {
+		l.Fatalln("Cannot adjust paused state:", err)
+	}
+}
--- a/cmd/syncthing/memsize_windows.go
+++ b/cmd/syncthing/memsize_windows.go
@@ -20,9 +20,8 @@ var (
 func memorySize() (int64, error) {
 	var memoryStatusEx [64]byte
 	binary.LittleEndian.PutUint32(memoryStatusEx[:], 64)
-	p := uintptr(unsafe.Pointer(&memoryStatusEx[0]))

-	ret, _, callErr := syscall.Syscall(uintptr(globalMemoryStatusEx), 1, p, 0, 0)
+	ret, _, callErr := syscall.Syscall(uintptr(globalMemoryStatusEx), 1, uintptr(unsafe.Pointer(&memoryStatusEx[0])), 0, 0)
 	if ret == 0 {
 		return 0, callErr
 	}
--- a/cmd/syncthing/mocked_config_test.go
+++ b/cmd/syncthing/mocked_config_test.go
@@ -23,7 +23,7 @@ func (c *mockedConfig) ListenAddresses() []string {
 	return nil
 }

-func (c *mockedConfig) Raw() config.Configuration {
+func (c *mockedConfig) RawCopy() config.Configuration {
 	return config.Configuration{}
 }

@@ -45,6 +45,10 @@ func (c *mockedConfig) Devices() map[protocol.DeviceID]config.DeviceConfiguratio
 	return nil
 }

+func (c *mockedConfig) SetDevice(config.DeviceConfiguration) error {
+	return nil
+}
+
 func (c *mockedConfig) Save() error {
 	return nil
 }
--- a/cmd/syncthing/mocked_model_test.go
+++ b/cmd/syncthing/mocked_model_test.go
@@ -21,8 +21,8 @@ func (m *mockedModel) GlobalDirectoryTree(folder, prefix string, levels int, dir
 	return nil
 }

-func (m *mockedModel) Completion(device protocol.DeviceID, folder string) float64 {
-	return 0
+func (m *mockedModel) Completion(device protocol.DeviceID, folder string) model.FolderCompletion {
+	return model.FolderCompletion{}
 }

 func (m *mockedModel) Override(folder string) {}
@@ -31,8 +31,8 @@ func (m *mockedModel) NeedFolderFiles(folder string, page, perpage int) ([]db.Fi
 	return nil, nil, nil, 0
 }

-func (m *mockedModel) NeedSize(folder string) (nfiles int, bytes int64) {
-	return 0, 0
+func (m *mockedModel) NeedSize(folder string) db.Counts {
+	return db.Counts{}
 }

 func (m *mockedModel) ConnectionStats() map[string]interface{} {
@@ -95,19 +95,19 @@ func (m *mockedModel) ConnectedTo(deviceID protocol.DeviceID) bool {
 	return false
 }

-func (m *mockedModel) GlobalSize(folder string) (nfiles, deleted int, bytes int64) {
-	return 0, 0, 0
+func (m *mockedModel) GlobalSize(folder string) db.Counts {
+	return db.Counts{}
 }

-func (m *mockedModel) LocalSize(folder string) (nfiles, deleted int, bytes int64) {
-	return 0, 0, 0
+func (m *mockedModel) LocalSize(folder string) db.Counts {
+	return db.Counts{}
 }

-func (m *mockedModel) CurrentLocalVersion(folder string) (int64, bool) {
+func (m *mockedModel) CurrentSequence(folder string) (int64, bool) {
 	return 0, false
 }

-func (m *mockedModel) RemoteLocalVersion(folder string) (int64, bool) {
+func (m *mockedModel) RemoteSequence(folder string) (int64, bool) {
 	return 0, false
 }

--- a/cmd/syncthing/monitor.go
+++ b/cmd/syncthing/monitor.go
@@ -178,6 +178,22 @@ func copyStderr(stderr io.Reader, dst io.Writer) {
 		if panicFd == nil {
 			dst.Write([]byte(line))

+			if strings.Contains(line, "SIGILL") {
+				l.Warnln(`
+*******************************************************************************
+* Crash due to illegal instruction detected. This is most likely due to a CPU *
+* incompatibility with the high performance hashing package. Switching to the *
+* standard hashing package instead. Please report this issue at:              *
+*                                                                             *
+*   https://github.com/syncthing/syncthing/issues                             *
+*                                                                             *
+* Include the details of your CPU.                                            *
+*******************************************************************************
+`)
+				os.Setenv("STHASHING", "standard")
+				return
+			}
+
 			if strings.HasPrefix(line, "panic:") || strings.HasPrefix(line, "fatal error:") {
 				panicFd, err = os.Create(timestampedLoc(locPanicLog))
 				if err != nil {
@@ -186,8 +202,24 @@ func copyStderr(stderr io.Reader, dst io.Writer) {
 				}

 				l.Warnf("Panic detected, writing to \"%s\"", panicFd.Name())
-				l.Warnln("Please check for existing issues with similar panic message at https://github.com/syncthing/syncthing/issues/")
-				l.Warnln("If no issue with similar panic message exists, please create a new issue with the panic log attached")
+				if strings.Contains(line, "leveldb") && strings.Contains(line, "corrupt") {
+					l.Warnln(`
+*********************************************************************************
+* Crash due to corrupt database.                                                *
+*                                                                               *
+* This crash usually occurs due to one of the following reasons:                *
+*  - Syncthing being stopped abruptly (killed/loss of power)                    *
+*  - Bad hardware (memory/disk issues)                                          *
+*  - Software that affects disk writes (SSD caching software and simillar)      *
+*                                                                               *
+* Please see the following URL for instructions on how to recover:              *
+*   https://docs.syncthing.net/users/faq.html#my-syncthing-database-is-corrupt  *
+*********************************************************************************
+`)
+				} else {
+					l.Warnln("Please check for existing issues with similar panic message at https://github.com/syncthing/syncthing/issues/")
+					l.Warnln("If no issue with similar panic message exists, please create a new issue with the panic log attached")
+				}

 				stdoutMut.Lock()
 				for _, line := range stdoutFirstLines {
--- a/cmd/syncthing/summaryservice.go
+++ b/cmd/syncthing/summaryservice.go
@@ -207,9 +207,11 @@ func (c *folderSummaryService) sendSummary(folder string) {
 		// remote device.
 		comp := c.model.Completion(devCfg.DeviceID, folder)
 		events.Default.Log(events.FolderCompletion, map[string]interface{}{
-			"folder":     folder,
-			"device":     devCfg.DeviceID.String(),
-			"completion": comp,
+			"folder":      folder,
+			"device":      devCfg.DeviceID.String(),
+			"completion":  comp.CompletionPct,
+			"needBytes":   comp.NeedBytes,
+			"globalBytes": comp.GlobalBytes,
 		})
 	}
 }
--- a/cmd/syncthing/traceback.go
+++ b/cmd/syncthing/traceback.go
@@ -0,0 +1,16 @@
+// Copyright (C) 2016 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 http://mozilla.org/MPL/2.0/.
+
+//+build go1.7
+
+package main
+
+import "runtime/debug"
+
+func init() {
+	// We want all (our) goroutines in panic traces.
+	debug.SetTraceback("all")
+}
--- a/cmd/syncthing/usage_report.go
+++ b/cmd/syncthing/usage_report.go
@@ -9,7 +9,6 @@ package main
 import (
 	"bytes"
 	"crypto/rand"
-	"crypto/sha256"
 	"crypto/tls"
 	"encoding/json"
 	"fmt"
@@ -23,6 +22,7 @@ import (
 	"github.com/syncthing/syncthing/lib/dialer"
 	"github.com/syncthing/syncthing/lib/model"
 	"github.com/syncthing/syncthing/lib/protocol"
+	"github.com/syncthing/syncthing/lib/sha256"
 	"github.com/syncthing/syncthing/lib/upgrade"
 	"github.com/thejerf/suture"
 )
@@ -45,7 +45,7 @@ func newUsageReportingManager(cfg *config.Wrapper, m *model.Model) *usageReporti
 	}

 	// Start UR if it's enabled.
-	mgr.CommitConfiguration(config.Configuration{}, cfg.Raw())
+	mgr.CommitConfiguration(config.Configuration{}, cfg.RawCopy())

 	// Listen to future config changes so that we can start and stop as
 	// appropriate.
@@ -93,14 +93,14 @@ func reportData(cfg configIntf, m modelIntf) map[string]interface{} {
 	var totFiles, maxFiles int
 	var totBytes, maxBytes int64
 	for folderID := range cfg.Folders() {
-		files, _, bytes := m.GlobalSize(folderID)
-		totFiles += files
-		totBytes += bytes
-		if files > maxFiles {
-			maxFiles = files
+		global := m.GlobalSize(folderID)
+		totFiles += global.Files
+		totBytes += global.Bytes
+		if global.Files > maxFiles {
+			maxFiles = global.Files
 		}
-		if bytes > maxBytes {
-			maxBytes = bytes
+		if global.Bytes > maxBytes {
+			maxBytes = global.Bytes
 		}
 	}

@@ -134,7 +134,7 @@ func reportData(cfg configIntf, m modelIntf) map[string]interface{} {
 	for _, cfg := range cfg.Folders() {
 		rescanIntvs = append(rescanIntvs, cfg.RescanIntervalS)

-		if cfg.Type == config.FolderTypeReadOnly {
+		if cfg.Type == config.FolderTypeSendOnly {
 			folderUses["readonly"]++
 		}
 		if cfg.IgnorePerms {
--- a/cmd/syncthing/verboseservice.go
+++ b/cmd/syncthing/verboseservice.go
@@ -94,9 +94,12 @@ func (s *verboseService) formatEvent(ev events.Event) string {

 	case events.LocalChangeDetected:
 		data := ev.Data.(map[string]string)
-		// Local change detected in folder "foo": modified file /Users/jb/whatever
 		return fmt.Sprintf("Local change detected in folder %q: %s %s %s", data["folder"], data["action"], data["type"], data["path"])

+	case events.RemoteChangeDetected:
+		data := ev.Data.(map[string]string)
+		return fmt.Sprintf("Remote change detected in folder %q: %s %s %s", data["folder"], data["action"], data["type"], data["path"])
+
 	case events.RemoteIndexUpdated:
 		data := ev.Data.(map[string]interface{})
 		return fmt.Sprintf("Device %v sent an index update for %q with %d items", data["device"], data["folder"], data["items"])
@@ -151,7 +154,7 @@ func (s *verboseService) formatEvent(ev events.Event) string {
 		if total > 0 {
 			pct = 100 * current / total
 		}
-		return fmt.Sprintf("Scanning folder %q, %d%% done (%.01f MB/s)", folder, pct, rate)
+		return fmt.Sprintf("Scanning folder %q, %d%% done (%.01f MiB/s)", folder, pct, rate)

 	case events.DevicePaused:
 		data := ev.Data.(map[string]string)
@@ -163,6 +166,18 @@ func (s *verboseService) formatEvent(ev events.Event) string {
 		device := data["device"]
 		return fmt.Sprintf("Device %v was resumed", device)

+	case events.FolderPaused:
+		data := ev.Data.(map[string]string)
+		id := data["id"]
+		label := data["label"]
+		return fmt.Sprintf("Folder %v (%v) was paused", id, label)
+
+	case events.FolderResumed:
+		data := ev.Data.(map[string]string)
+		id := data["id"]
+		label := data["label"]
+		return fmt.Sprintf("Folder %v (%v) was resumed", id, label)
+
 	case events.ListenAddressesChanged:
 		data := ev.Data.(map[string]interface{})
 		address := data["address"]
--- a/debtpl/common/changelog
+++ b/debtpl/common/changelog
@@ -1,5 +0,0 @@
-{{.name}} ({{.version}}); urgency=medium
-
-  * Packaging of {{.version}}.
-
- -- Syncthing Release Management <release@syncthing.net>  {{.date}}
--- a/debtpl/common/compat
+++ b/debtpl/common/compat
@@ -1 +0,0 @@
-9
--- a/debtpl/syncthing/control
+++ b/debtpl/syncthing/control
@@ -1,16 +0,0 @@
-Package: syncthing
-Version: {{.version}}
-Priority: optional
-Section: net
-Architecture: {{.arch}}
-Depends: libc6, procps
-Homepage: https://syncthing.net/
-Maintainer: Syncthing Release Management <release@syncthing.net>
-Description: Open Source Continuous File Synchronization
- Syncthing is an application that lets you synchronize your files across
- multiple devices. This means the creation, modification or deletion of files
- on one machine will automatically be replicated to your other devices. We
- believe your data is your data alone and you deserve to choose where it is
- stored. Therefore Syncthing does not upload your data to the cloud but
- exchanges your data across your machines as soon as they are online at the
- same time.
--- a/debtpl/syncthing/postinst
+++ b/debtpl/syncthing/postinst
@@ -1,6 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-if [[ ${1:-} == configure ]]; then
-	pkill -HUP -x syncthing || true
-fi
--- a/etc/firewall-ufw/README.md
+++ b/etc/firewall-ufw/README.md
@@ -0,0 +1,31 @@
+Uncomplicated FireWall application preset
+===================
+Installation
+-----------
+**Please note:** When you installed syncthing using the official deb package, you can skip the copying.
+
+Copy the file `syncthing` to your ufw applications directory usually located at `/etc/ufw/applications.d/` (root permissions required).
+
+In a terminal run
+```
+sudo ufw app update syncthing
+sudo ufw app update syncthing-gui
+```
+to load the presets.
+To allow the syncthing ports, run
+```
+sudo ufw allow syncthing
+```
+If you want to access the web gui from anywhere (not only from localhost), you can also allow the gui port.
+This is step is **not** necessary for a "normal" installation!
+```
+sudo ufw allow syncthing-gui
+```
+
+
+Verification
+----------
+You can verify the opened ports by running
+```
+sudo ufw status verbose
+```
--- a/etc/firewall-ufw/syncthing
+++ b/etc/firewall-ufw/syncthing
@@ -0,0 +1,9 @@
+[syncthing]
+title=Syncthing
+description=Syncthing file synchronisation
+ports=22000/tcp|21027/udp
+
+[syncthing-gui]
+title=Syncthing-GUI
+description=Syncthing web gui
+ports=8384/tcp
--- a/etc/linux-systemd/README.md
+++ b/etc/linux-systemd/README.md
@@ -3,6 +3,6 @@
 This directory contains configuration files for running Syncthing under the
 "systemd" service manager on Linux both under either a systemd system service or
 systemd user service. For further documentation take a look at the [systemd
-section][1] on http://docs.syncthing.net.
+section][1] on https://docs.syncthing.net.

-[1]: http://docs.syncthing.net/users/autostart.html#systemd
+[1]: https://docs.syncthing.net/users/autostart.html#systemd
--- a/etc/linux-systemd/system/syncthing-resume.service
+++ b/etc/linux-systemd/system/syncthing-resume.service
@@ -5,7 +5,7 @@ After=suspend.target

 [Service]
 Type=oneshot
-ExecStart=/usr/bin/pkill -HUP -x syncthing
+ExecStart=-/usr/bin/pkill -HUP -x syncthing

 [Install]
 WantedBy=suspend.target
--- a/etc/linux-systemd/user/syncthing.service
+++ b/etc/linux-systemd/user/syncthing.service
@@ -1,7 +1,6 @@
 [Unit]
 Description=Syncthing - Open Source Continuous File Synchronization
 Documentation=man:syncthing(1)
-After=network.target
 Wants=syncthing-inotify.service

 [Service]
--- a/etc/linux-upstart/README.md
+++ b/etc/linux-upstart/README.md
@@ -11,6 +11,6 @@ To manualy start syncthing via Upstart when using the system configuration use:
    sudo initctl start syncthing
 ```

-For further documentation see [http://docs.syncthing.net/users/autostart.html][1].
+For further documentation see [https://docs.syncthing.net/users/autostart.html][1].

-[1]: http://docs.syncthing.net/users/autostart.html#Upstart
+[1]: https://docs.syncthing.net/users/autostart.html#Upstart
--- a/gui/black/assets/css/theme.css
+++ b/gui/black/assets/css/theme.css
@@ -0,0 +1,245 @@
+/**
+
+Black theme
+
+Author: alessandro.g89
+Source: https://userstyles.org/styles/122502/syncthing-dark
+
+**/
+
+body {
+    color: #aaa !important;
+    background-color: black !important;
+}
+
+a:hover,a:focus,a.focus{
+    outline: none !important;
+}
+
+
+/* navbar */
+.navbar {
+    background-color: #333 !important;
+    border-color: #333 !important;
+    border-width: 2px !important;
+}
+
+.navbar-text, .dropdown>a, .dropdown-menu>li>a, .hidden-xs>a, .navbar-link {
+    color: #aaa !important;
+}
+
+.dropdown-menu {
+    border-color: #333 !important;
+    border-width: 2px !important;
+    background-color: #222 !important;
+}
+
+.dropdown-menu>li>a:hover, .dropdown-menu>li>a:focus {
+    color: #fff !important;
+    background-color: #333 !important;
+}
+
+.open>.dropdown-toggle, .dropdown-toggle:hover {
+    border-color: #333 !important;
+    background-color: #222 !important;
+}
+
+.divider {
+    background-color: #333 !important;
+    height: 2px !important;
+}
+
+li.hidden-xs:hover, .navbar-link:hover, .navbar-link:focus {
+    outline: none !important;
+    border-color: #333 !important;
+    background-color: #222 !important;
+}
+
+.dropdown-menu>.active>a {
+    color: #fff !important;
+    background-color: #217dbb !important;
+}
+
+
+/* main panel */
+.panel {
+    background-color: #111 !important;
+    border-width: 2px !important;
+}
+
+.panel-default {
+    border-color: #222 !important;
+}
+
+.panel-default > .panel-heading {
+    color: #aaa !important;
+    border-color: #222 !important;
+    background-color: #222 !important;
+}
+.panel-warning > .panel-heading {
+    color: #222 !important;
+}
+
+.panel-progress {
+    background: #3498db;
+}
+
+.panel-footer {
+    background-color: #111 !important;
+    border-width: 0 !important;
+}
+
+.table-striped>tbody>tr:nth-of-type(odd) {
+    background-color: #181818 !important;
+}
+
+.panel-group .panel-heading+.panel-collapse>.panel-body, .panel-group .panel-heading+.panel-collapse>.list-group {
+    border-top: 1px solid #222 !important;
+}
+
+.identicon rect {
+    fill: #aaa;
+}
+
+.panel-warning .identicon rect {
+    fill: #222;
+}
+
+.panel-heading:hover, .panel-heading:focus {
+    text-decoration: none;
+}
+
+
+/* buttons */
+.btn {
+    border-radius: 3px !important;
+    border-width: 0px !important;
+}
+
+.btn:hover, .btn:focus, .btn.focus {
+    outline: none !important;
+}
+.btn-default {
+    color: #aaa !important;
+    background-color: #333 !important;
+}
+
+.btn-default:hover, .btn-default:focus, .btn-default.focus {
+    color: #fff !important;
+    background-color: #484848 !important;
+}
+
+.btn-primary {
+    background-color: #217dbb !important;
+}
+
+.btn-primary:hover, .btn-primary:focus, .btn-primary.focus {
+    background-color: #3498db !important;
+}
+
+.btn-warning {
+    background-color: #c29d0b !important;
+}
+
+.btn-warning:hover, .btn-warning:focus, .btn-warning.focus {
+    background-color: #f1c40f !important;
+}
+
+.btn-danger {
+    background-color: #d62c1a !important;
+}
+
+.btn-danger:hover, .btn-danger:focus, .btn-danger.focus {
+    background-color: #e74c3c !important;
+}
+
+
+/* modal dialogs */
+.modal-header {
+    border-bottom-color: #222 !important;
+}
+
+.modal-header:not(.alert) {
+    background-color: #222;
+}
+
+.alert-info {
+    color: #222 !important;
+}
+
+.alert-warning {
+    color: #222 !important;
+}
+
+.alert-danger {
+    color: #222 !important;
+    background-color: #d62c1a !important;
+}
+
+.modal-content {
+    border-color: #666 !important;
+    border-width: 2px !important;
+    background-color: #111 !important;
+}
+
+.modal-footer {
+    border-color: #111 !important;
+    background-color: #111 !important;
+}
+
+.help-block {
+    color: #aaa !important;
+}
+
+.form-control {
+    color: #aaa !important;
+    border-color: #444 !important;
+    background-color: black !important;
+}
+
+code.ng-binding{
+    color: #f99 !important;
+    background-color: #444 !important;
+}
+
+.well, .form-control[readonly="readonly"], .popover { /* read-only fields*/
+    color: #666 !important;
+    border-color: #444 !important;
+    background-color: #111 !important;
+}
+
+/* buttons for pagination */
+.pagination>li>a, .pagination>li>span {
+    background-color: #333 !important;
+    border-color: #484848 !important;
+}
+
+.pagination>li>a:hover, .pagination>li>a:focus, .pagination>li>a.focus {
+    background-color: #484848 !important;
+}
+
+
+/* progress bars */
+.progress-bar {
+    background-color: #217dbb !important;
+}
+
+.progress-bar-success {
+    background-color: #0A8522 !important;
+}
+
+.progress-bar-info {
+    background-color: #9b59b6 !important;
+}
+
+.progress-bar-warning {
+    background-color: #c29d0b !important;
+}
+
+.progress-bar-danger {
+    background-color: #d62c1a !important;
+}
+
+.progress .frontal {
+    color: #222;
+}
--- a/gui/dark/assets/css/theme.css
+++ b/gui/dark/assets/css/theme.css
@@ -5,11 +5,13 @@ Dark theme
 Author: alessandro.g89
 Source: https://userstyles.org/styles/122502/syncthing-dark

+Modified by: fti7
+
 **/

 body {
    color: #aaa !important;
-    background-color: black !important;
+    background-color: #272727 !important;
 }

 a:hover,a:focus,a.focus{
@@ -20,8 +22,10 @@ a:hover,a:focus,a.focus{
 /* navbar */
 .navbar {
    background-color: #333 !important;
-    border-color: #333 !important;
-    border-width: 2px !important;
+    border-color: #424242 !important;
+    border-top-width: 1px !important;
+    border-bottom-width: 1px !important;
+
 }

 .navbar-text, .dropdown>a, .dropdown-menu>li>a, .hidden-xs>a, .navbar-link {
@@ -29,7 +33,7 @@ a:hover,a:focus,a.focus{
 }

 .dropdown-menu {
-    border-color: #333 !important;
+    border-color: #424242 !important;
    border-width: 2px !important;
    background-color: #222 !important;
 }
@@ -40,7 +44,7 @@ a:hover,a:focus,a.focus{
 }

 .open>.dropdown-toggle, .dropdown-toggle:hover {
-    border-color: #333 !important;
+    border-color: #424242 !important;
    background-color: #222 !important;
 }

@@ -51,7 +55,7 @@ a:hover,a:focus,a.focus{

 li.hidden-xs:hover, .navbar-link:hover, .navbar-link:focus {
    outline: none !important;
-    border-color: #333 !important;
+    border-color: #424242 !important;
    background-color: #222 !important;
 }

@@ -63,18 +67,18 @@ li.hidden-xs:hover, .navbar-link:hover, .navbar-link:focus {

 /* main panel */
 .panel {
-    background-color: #111 !important;
+    background-color: #323232 !important;
    border-width: 2px !important;
 }

 .panel-default {
-    border-color: #222 !important;
+    border-color: #424242 !important;
 }

 .panel-default > .panel-heading {
    color: #aaa !important;
    border-color: #222 !important;
-    background-color: #222 !important;
+    background-color: #3B3B3B !important;
 }
 .panel-warning > .panel-heading {
    color: #222 !important;
@@ -85,16 +89,16 @@ li.hidden-xs:hover, .navbar-link:hover, .navbar-link:focus {
 }

 .panel-footer {
-    background-color: #111 !important;
+    background-color: #2D2D2D !important;
    border-width: 0 !important;
 }

 .table-striped>tbody>tr:nth-of-type(odd) {
-    background-color: #181818 !important;
+    background-color: #2E2E2E !important;
 }

 .panel-group .panel-heading+.panel-collapse>.panel-body, .panel-group .panel-heading+.panel-collapse>.list-group {
-    border-top: 1px solid #222 !important;
+    border-top: 1px solid #424242 !important;
 }

 .identicon rect {
@@ -156,11 +160,11 @@ li.hidden-xs:hover, .navbar-link:hover, .navbar-link:focus {

 /* modal dialogs */
 .modal-header {
-    border-bottom-color: #222 !important;
+    border-bottom-color: #424242 !important;
 }

 .modal-header:not(.alert) {
-    background-color: #222;
+    background-color: #3B3B3B;
 }

 .alert-info {
@@ -179,12 +183,12 @@ li.hidden-xs:hover, .navbar-link:hover, .navbar-link:focus {
 .modal-content {
    border-color: #666 !important;
    border-width: 2px !important;
-    background-color: #111 !important;
+    background-color: #272727 !important;
 }

 .modal-footer {
-    border-color: #111 !important;
-    background-color: #111 !important;
+    border-color: #303030 !important;
+    background-color: #2D2D2D !important;
 }

 .help-block {
@@ -193,8 +197,8 @@ li.hidden-xs:hover, .navbar-link:hover, .navbar-link:focus {

 .form-control {
    color: #aaa !important;
-    border-color: #444 !important;
-    background-color: black !important;
+    border-color: #424242 !important;
+    background-color: #3B3B3B !important;
 }

 code.ng-binding{
@@ -204,8 +208,8 @@ code.ng-binding{

 .well, .form-control[readonly="readonly"], .popover { /* read-only fields*/
    color: #666 !important;
-    border-color: #444 !important;
-    background-color: #111 !important;
+    border-color: #424242 !important;
+    background-color: #3B3B3B !important;
 }

 /* buttons for pagination */
@@ -243,3 +247,12 @@ code.ng-binding{
 .progress .frontal {
    color: #222;
 }
+
+.text-info {
+    color: #9a6dc0;
+}
+
+.text-primary {
+    color: #3fa9f0;
+}
+
--- a/gui/default/assets/css/overrides.css
+++ b/gui/default/assets/css/overrides.css
@@ -249,6 +249,10 @@ ul.three-columns li, ul.two-columns li {
    text-indent: -0.5em;
 }

+.navbar-fixed-bottom {
+    z-index: 980;
+}
+
 /** Footer nav on small devices **/
@media (max-width: 1199px) {
    /* Stay at the end of the page, with space reserved for the footer
--- a/gui/default/assets/lang/lang-bg.json
+++ b/gui/default/assets/lang/lang-bg.json
@@ -31,34 +31,32 @@
    "Command": "Команда",
    "Comment, when used at the start of a line": "Коментар, използван в началото на реда",
    "Compression": "Компресиране",
+    "Configured": "Настроен",
    "Connection Error": "Грешка при свързването",
    "Connection Type": "Вид връзка",
    "Copied from elsewhere": "Копиране от някъде другаде",
    "Copied from original": "Копиран от оригинала",
    "Copyright © 2014-2016 the following Contributors:": "Всички правата запазени © 2014-2016 Сътрудници:",
-    "Copyright © 2015 the following Contributors:": "Всички правата запазени © 2015 Сътрудници:",
    "Danger!": "Опасност!",
-    "Delete": "Изтрий",
    "Deleted": "Изтрито",
    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Устройство \"{{name}}\" ({{device}}) на {{address}} желае да се свърже. Добави ново устройство?",
    "Device ID": "Идентификатор на устройство",
    "Device Identification": "Идентификатор на устройство",
    "Device Name": "Име на устройството",
-    "Device {%device%} ({%address%}) wants to connect. Add new device?": "Устройство {{device}} ({{address}}) желае да се свърже. Добави ново устройство?",
    "Devices": "Устройства",
    "Disconnected": "Не е свързано",
+    "Discovered": "Открит",
    "Discovery": "Откриване",
    "Documentation": "Документация",
    "Download Rate": "Скорост на сваляне",
    "Downloaded": "Изтеглен",
    "Downloading": "Изтегляне",
    "Edit": "Промени",
-    "Edit Device": "Промени устройство",
-    "Edit Folder": "Промени папка",
+    "Edit Device": "Промяна на устройството",
+    "Edit Folder": "Промяна на папката",
    "Editing": "Променяне",
    "Enable NAT traversal": "Разреши NAT traversal",
    "Enable Relaying": "Разреши препращане",
-    "Enable UPnP": "Включи UPnP",
    "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.": "Добави шаблони за игнориране, по един на ред.",
    "Error": "Грешка",
@@ -73,7 +71,6 @@
    "Folder": "Папка",
    "Folder ID": "Идентификатор на папката",
    "Folder Label": "Етикет на папката",
-    "Folder Master": "Главна папка",
    "Folder Path": "Път до папката",
    "Folder Type": "Вид папка",
    "Folders": "Папки",
@@ -83,7 +80,6 @@
    "GUI Listen Addresses": "Адрес за свързване с потребителския интерфейс",
    "Generate": "Генерирай",
    "Global Discovery": "Глобално откриване",
-    "Global Discovery Server": "Сървър за глобално откриване",
    "Global Discovery Servers": "Сървъри за глобално откриване",
    "Global State": "Глобално състояние",
    "Help": "Помощ",
@@ -101,6 +97,7 @@
    "Last Scan": "Последно сканиран",
    "Last seen": "Последно видяно",
    "Later": "По-късно",
+    "Latest Change": "Последна промяна",
    "Listeners": "Синхронизиращи устройства",
    "Local Discovery": "Локално откриване",
    "Local State": "Локално състояние",
@@ -125,7 +122,7 @@
    "Oldest First": "Първо най-старите",
    "Optional descriptive label for the folder. Can be different on each device.": "Допълнително разяснеие за етикета на папката. Може да бъде различно всяко устройство.",
    "Options": "Настройки",
-    "Out of Sync": "Несинхронизирана",
+    "Out of Sync": "Несинхронизирано",
    "Out of Sync Items": "Несинхронизирани елементи",
    "Outgoing Rate Limit (KiB/s)": "Лимит на скорост за качване (KiB/s)",
    "Override Changes": "Наложи локалните промени",
@@ -141,15 +138,13 @@
    "Quick guide to supported patterns": "Бърз наръчник към поддържаните шаблони",
    "RAM Utilization": "Използван RAM",
    "Random": "Произволен",
-    "Relay Servers": "Препращащи сървъри",
-    "Relayed via": "Препратено през",
-    "Relays": "Препращачи",
+    "Reduced by ignore patterns": "Намалено посредством шаблон за игнориране",
    "Release Notes": "Бележки по обновяването",
    "Remote Devices": "Чужди устройства",
    "Remove": "Премахни",
    "Required identifier for the folder. Must be the same on all cluster devices.": "Задължителен идентификатор за тази папка. Трябва да бъде един и същ на всички устройства.",
    "Rescan": "Сканирай",
-    "Rescan All": "Сканирай всички",
+    "Rescan All": "Обнови всички",
    "Rescan Interval": "Интервал за повторно сканиране",
    "Restart": "Рестартирай",
    "Restart Needed": "Изисква се рестартиране",
@@ -161,6 +156,8 @@
    "Scanning": "Сканиране",
    "Select the devices to share this folder with.": "Изберете устройствата, с които да споделите папката.",
    "Select the folders to share with this device.": "Изберете папките за споделяне с това устройство.",
+    "Send & Receive": "Изпращане & получаване",
+    "Send Only": "Само изпращане",
    "Settings": "Настройки",
    "Share": "Сподели",
    "Share Folder": "Сподели папка",
@@ -168,7 +165,6 @@
    "Share With Devices": "Споделяне с устройства",
    "Share this folder?": "Сподели тази папка?",
    "Shared With": "Споделена с",
-    "Short identifier for the folder. Must be the same on all cluster devices.": "Идентификаторът на папката трябва да бъде еднакъв на всички устройства.",
    "Show ID": "Покажи идентификатора",
    "Show QR": "Покажи QR",
    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Покажи вместо идентификатор на устройството в статус на клъстъра. Ще бъде предлагано на други комютри като име по подразбиране.",
@@ -182,7 +178,7 @@
    "Staggered File Versioning": "Наслагващи се версии",
    "Start Browser": "Стартирай браузъра",
    "Statistics": "Статистика",
-    "Stopped": "Без синхронизиране",
+    "Stopped": "Не се синхронизира",
    "Support": "Помощ",
    "Sync Protocol Listen Addresses": "Адрес за слушане на синхронизиращия протокол",
    "Syncing": "Синхронизиране",
@@ -194,16 +190,13 @@
    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing има проблем при обработването на заявката. Моля, презаредете браузъра или рестартирайте 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.": "Сумарната статистика е публично достъпна на посочения по-долу адрес.",
-    "The aggregated statistics are publicly available at {%url%}.": "Сумарната статистика е публично достъпна на {{url}}.",
    "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 device ID to enter here can be found in the \"Edit > 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 first command line parameter is the folder path and the second parameter is the relative path in the folder.": "Първият параметър за командата е пътя до папката, а вторият е релативния път в самата папка.",
    "The folder ID cannot be blank.": "Полето идентификатор на папка не може да бъде празно.",
-    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "Идентификаторът на папка трябва да бъде къс (64 символа или по-малко) състоящ се само от букви, цифри, точка (.), тире (-) и подчерта (_).",
    "The folder ID must be unique.": "Идентификаторът на папката тряба да бъде уникален.",
    "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 дена се пази версия всеки ден, до максимума се пази една версия всяка седмица.",
@@ -226,7 +219,7 @@
    "Unknown": "Неясно",
    "Unshared": "Несподелена",
    "Unused": "Неизползван",
-    "Up to Date": "Синхронизирана",
+    "Up to Date": "Синхронизирано",
    "Updated": "Обновено",
    "Upgrade": "Обнови",
    "Upgrade To {%version%}": "Обновен до {{version}}",
@@ -243,9 +236,10 @@
    "Yes": "Да",
    "You must keep at least one version.": "Трябва да пазиш поне една версия.",
    "days": "дни",
+    "directories": "директории",
+    "files": "файла",
    "full documentation": "пълна документация",
    "items": "елемента",
    "{%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}})."
 }
--- a/gui/default/assets/lang/lang-ca.json
+++ b/gui/default/assets/lang/lang-ca.json
@@ -31,34 +31,32 @@
    "Command": "Comando",
    "Comment, when used at the start of a line": "Comentari quan és usat al principi d'una línia",
    "Compression": "Compressió",
+    "Configured": "Configured",
    "Connection Error": "Error de connexió",
    "Connection Type": "Connection Type",
    "Copied from elsewhere": "Copiat d'un altre lloc",
    "Copied from original": "Copiat de l'original",
    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 the following Contributors:",
-    "Copyright © 2015 the following Contributors:": "Copyright © 2015 els següents col·laboradors:",
    "Danger!": "Perill!",
-    "Delete": "Esborrar",
    "Deleted": "Esborrat",
    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Device \"{{name}}\" ({{device}} at {{address}}) wants to connect. Add new device?",
    "Device ID": "ID del dispositiu",
    "Device Identification": "Identificació del dispositiu",
    "Device Name": "Nom del dispositiu",
-    "Device {%device%} ({%address%}) wants to connect. Add new device?": "El dispositiu {{device}} ({{address}}) vol conectar-se. Afegir nou dispositiu?",
    "Devices": "Dispositius",
    "Disconnected": "Desconnectat",
+    "Discovered": "Discovered",
    "Discovery": "Descobriment",
    "Documentation": "Documentació",
    "Download Rate": "Tasca de descarrega",
    "Downloaded": "Descarregat",
    "Downloading": "Descarregant",
    "Edit": "Editar",
-    "Edit Device": "Modificar dispositiu",
-    "Edit Folder": "Modificar carpeta",
+    "Edit Device": "Edit Device",
+    "Edit Folder": "Edit Folder",
    "Editing": "Modificant",
    "Enable NAT traversal": "Enable NAT traversal",
    "Enable Relaying": "Enable Relaying",
-    "Enable UPnP": "Habilitat UPnP",
    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Introdueix adreces separades per comes (\"tcp://ip:port\", \"tcp://host:port\") o \"dinàmic\" per realitzar descobriments automàtics de l'adreça.",
    "Enter ignore patterns, one per line.": "Introduex patrons a ignorar, un per línia.",
    "Error": "Error",
@@ -73,7 +71,6 @@
    "Folder": "Carpeta",
    "Folder ID": "ID de carpeta",
    "Folder Label": "Folder Label",
-    "Folder Master": "Carpeta mestra",
    "Folder Path": "Camí de carpeta",
    "Folder Type": "Folder Type",
    "Folders": "Carpetes",
@@ -83,7 +80,6 @@
    "GUI Listen Addresses": "Adreça d'escolta del GUI",
    "Generate": "Generar",
    "Global Discovery": "Descobriment Global",
-    "Global Discovery Server": "Servidor de Descobriment Global",
    "Global Discovery Servers": "Global Discovery Servers",
    "Global State": "Estat global",
    "Help": "Ajuda",
@@ -101,6 +97,7 @@
    "Last Scan": "Last Scan",
    "Last seen": "Vist per última vegada",
    "Later": "Després",
+    "Latest Change": "Latest Change",
    "Listeners": "Listeners",
    "Local Discovery": "Descobriment Local",
    "Local State": "Estat local",
@@ -141,9 +138,7 @@
    "Quick guide to supported patterns": "Guia ràpida per als possibles patrons",
    "RAM Utilization": "Utilització de la RAM",
    "Random": "Aleatori",
-    "Relay Servers": "Relay Servers",
-    "Relayed via": "Retransmés a través",
-    "Relays": "Repetidors",
+    "Reduced by ignore patterns": "Reduced by ignore patterns",
    "Release Notes": "Notes de llançament",
    "Remote Devices": "Remote Devices",
    "Remove": "Esborrar",
@@ -161,6 +156,8 @@
    "Scanning": "Escanejant",
    "Select the devices to share this folder with.": "Selecciona els dispositius en els quals compartir aquesta carpeta.",
    "Select the folders to share with this device.": "Selecciona la carpeta per a compartir en aquest dispositiu.",
+    "Send & Receive": "Send & Receive",
+    "Send Only": "Send Only",
    "Settings": "Preferències",
    "Share": "Compartir",
    "Share Folder": "Compartir carpeta",
@@ -168,7 +165,6 @@
    "Share With Devices": "Compartir en dispositius",
    "Share this folder?": "Compartir aquesta carpeta?",
    "Shared With": "Compartir Amb",
-    "Short identifier for the folder. Must be the same on all cluster devices.": "Breva identificació per a la carpeta. Té que ser la mateixa per tots els dispositius del cluster.",
    "Show ID": "Mostrar ID",
    "Show QR": "Show QR",
    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Mostrat en comptes del ID del Node en l'estat del cluster. Serà advertit als altres dispositius com un nom opcional per defecte.",
@@ -194,16 +190,13 @@
    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Sembla ser que Syncthing està tinguent problemes per processar la teva petició. Si us plau, refresca la pàgina o reinicia Syncthing si el problema persisteix.",
    "The Syncthing admin interface is configured to allow remote access without a password.": "La interfície d'administració de Syncthing està configurada per permetre l'accés remot sense contrasenya.",
    "The aggregated statistics are publicly available at the URL below.": "The aggregated statistics are publicly available at the URL below.",
-    "The aggregated statistics are publicly available at {%url%}.": "Les estadístiques agregades estan públicament disponibles a {{url}}.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "La configuració s'ha guardar però no s'ha activat. S'ha de reiniciar el synthing per activar la nova configuració.",
    "The device ID cannot be blank.": "El ID del dispositiu no pot estar en blanc.",
    "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 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 device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "El ID del dispositiu per introduir ací es pot trobar al diàleg \"Editar > Mostrar ID\" en l'altre dispositiu. Els espais i les barres son opcionals (s'ignoren).",
    "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.": "L'informe d'ús encriptat s'envia diàriament. Es fa servir per rastrejar plataformes habituals, mides de carpetes i versions de l'aplicació. Si es canvia el conjunt de dades reportades es demanarà amb aquest diàleg de nou.",
    "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.": "El ID del dispositiu introduït no sembla vàlid. Hauria de tenir 52 o 56 caràcters amb lletres i números, els espais i les barres son opcionals.",
    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "El primer paràmetre de la línia de comandes és el camí a la carpeta i el segon paràmetre és el camí relatiu a la carpeta.",
    "The folder ID cannot be blank.": "El ID del dispositiu no pot estar en blanc.",
-    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "El ID de la carpeta ha de ser un identificador curt (64 caràcters o menys) format només per lletres, nombres i el punt (.), barra (-) i barra baixa (_).",
    "The folder ID must be unique.": "El ID de la carpeta ha de ser únic.",
    "The folder path cannot be blank.": "El camí a la carpeta no pot estar en blanc.",
    "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 fan servir els següents intervals: per la primera hora es manté una versió cada 30 segons, pel primer dia es manté una versió cada hora, pel primer cada 30 dies es manté una versió cada dia, fins el màxim d'antiguitat es manté una versió cada setmana.",
@@ -243,9 +236,10 @@
    "Yes": "Si",
    "You must keep at least one version.": "Has de mantenir com a mínim una versió.",
    "days": "dies",
+    "directories": "directories",
+    "files": "files",
    "full documentation": "documentació sencera",
    "items": "Elements",
    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} vol compartir la carpeta \"{{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}})."
 }
--- a/gui/default/assets/lang/lang-ca@valencia.json
+++ b/gui/default/assets/lang/lang-ca@valencia.json
@@ -31,34 +31,32 @@
    "Command": "Comando",
    "Comment, when used at the start of a line": "Comentar, quant s'utilitza al principi d'una línia",
    "Compression": "Compresió",
+    "Configured": "Configurat",
    "Connection Error": "Error de connexió",
    "Connection Type": "Tipus de connexió",
    "Copied from elsewhere": "Copiat de qualsevol lloc",
    "Copied from original": "Copiat de l'original",
    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 els següents Col·laboradors:",
-    "Copyright © 2015 the following Contributors:": "Copyright © 2015 els següents Col·laboradors:",
    "Danger!": "Perill!",
-    "Delete": "Esborrar",
    "Deleted": "Esborrat",
    "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 {%device%} ({%address%}) wants to connect. Add new device?": "El dispositiu {{device}} ({{address}}) vol connectar-se. Afegir nou dispositiu?",
    "Devices": "Dispositius",
    "Disconnected": "Desconnectat",
+    "Discovered": "Descobert",
    "Discovery": "Descobriment",
    "Documentation": "Documentació",
    "Download Rate": "Velocitat de descàrrega",
    "Downloaded": "Descarregat",
    "Downloading": "Descarregant",
    "Edit": "Editar",
-    "Edit Device": "Editar dispositiu",
-    "Edit Folder": "Editar carpeta",
+    "Edit Device": "Editar Dispositiu",
+    "Edit Folder": "Editar Carpeta",
    "Editing": "Editant",
    "Enable NAT traversal": "Permetre NAT transversal",
    "Enable Relaying": "Permetre Transmissions",
-    "Enable UPnP": "Activar UPnp",
    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Introdueix adreces separades per coma (\"tcp://ip:port\", \"tcp://host:port\") o \"dynamic\" per a realitzar el descobriment automàtic de l'adreça.",
    "Enter ignore patterns, one per line.": "Introduïr patrons a ignorar, un per línia.",
    "Error": "Error",
@@ -73,7 +71,6 @@
    "Folder": "Carpeta",
    "Folder ID": "ID de carpeta",
    "Folder Label": "Etiqueta de la Carpeta",
-    "Folder Master": "Carpeta principal",
    "Folder Path": "Ruta de la carpeta",
    "Folder Type": "Tipus de carpeta",
    "Folders": "Carpetes",
@@ -83,7 +80,6 @@
    "GUI Listen Addresses": "Direcció d'escolta de l'Interfície Gràfica d'Usuari (GUI)",
    "Generate": "Generar",
    "Global Discovery": "Descobriment global",
-    "Global Discovery Server": "Servidor de Descobriment Global",
    "Global Discovery Servers": "Servidors de Descobriment Global",
    "Global State": "Estat global",
    "Help": "Ajuda",
@@ -101,6 +97,7 @@
    "Last Scan": "Últim escaneig",
    "Last seen": "Vist per última vegada",
    "Later": "Més tard",
+    "Latest Change": "Últim Canvi",
    "Listeners": "Escoltants",
    "Local Discovery": "Descobriment local",
    "Local State": "Estat local",
@@ -141,9 +138,7 @@
    "Quick guide to supported patterns": "Guía ràpida de patrons suportats",
    "RAM Utilization": "Utilització de la RAM",
    "Random": "Aleatori",
-    "Relay Servers": "Servidors de Transmissió",
-    "Relayed via": "Transmitit via",
-    "Relays": "Transmissions",
+    "Reduced by ignore patterns": "Reduït ignorant patrons",
    "Release Notes": "Notes de la versió",
    "Remote Devices": "Dispositius Remots",
    "Remove": "Eliminar",
@@ -161,6 +156,8 @@
    "Scanning": "Rastrejant",
    "Select the devices to share this folder with.": "Selecciona els dispositius amb els que compartir aquesta carpeta.",
    "Select the folders to share with this device.": "Selecciona les carpetes per a compartir amb aquest dispositiu.",
+    "Send & Receive": "Enviar i Rebre",
+    "Send Only": "Enviar Solament",
    "Settings": "Ajustos",
    "Share": "Compartir",
    "Share Folder": "Compartir carpeta",
@@ -168,7 +165,6 @@
    "Share With Devices": "Compartir amb els dispositius",
    "Share this folder?": "Compartir aquesta carpeta?",
    "Shared With": "Compartit amb",
-    "Short identifier for the folder. Must be the same on all cluster devices.": "Identificador curt per a la carpeta. Deu ser el mateix en tots els dispositius del grup (cluster).",
    "Show ID": "Mostrar ID",
    "Show QR": "Mostrar QR",
    "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.",
@@ -194,16 +190,13 @@
    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing pareix que té un problema processant la seua sol·licitud. Per favor, refresque la pàgina o reinicie Syncthing si el problema persistix.",
    "The Syncthing admin interface is configured to allow remote access without a password.": "L'interfície d'administració de Syncthing està configurat per a permetre l'accés remot sense una contrasenya.",
    "The aggregated statistics are publicly available at the URL below.": "Les estadístiques agregades estàn disponibles en la URL que figura a continuació.",
-    "The aggregated statistics are publicly available at {%url%}.": "Les estadístiques agregades estan disponibles públicament en {{url}}.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "La configuració ha sigut gravada però no activada. Syncthing deu reiniciar per tal d'activar la nova configuració.",
    "The device ID cannot be blank.": "L'ID del dispositiu no pot estar buida.",
    "The device ID to enter here can be found in the \"Actions > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "L'ID del dispositiu que hi ha que introduïr ací es pot trobar en el menú \"Accions > Mostrar ID\" en l'altre dispositiu. Els espais i les barres son opcionals (ignorats).",
-    "The device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "L'ID del dispositiu que hi ha que introduïr ací es pot trobar en el menú \"Editar > Mostrar ID\" en l'altre dispositiu. Els espais i les barres son opcionals (ignorats).",
    "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.": "L'informe encriptat d'ús s'envia diariament. S'utilitza per a rastrejar plataformes comuns, tamanys de carpetes i versions de l'aplicació. Si el conjunt de dades enviat a l'informe es canvia, se li demanarà a vosté l'autorització altra vegada.\n",
    "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 first command line parameter is the folder path and the second parameter is the relative path in the folder.": "El primer paràmetre de la línia de comandos és la ruta de la carpeta i el segon és la ruta relativa en la carpeta.",
    "The folder ID cannot be blank.": "L'ID de la carpeta no pot estar buit.",
-    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "L'ID de la carpeta deu ser un identificador curt (64 caracters o menys) consistint en lletres, nombres i únicament els caracters del punt (.), guió (-) i guió baix (_).",
    "The folder ID must be unique.": "L'ID de la carpeta deu ser única.",
    "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.",
@@ -243,9 +236,10 @@
    "Yes": "Sí",
    "You must keep at least one version.": "Es deu mantindre al menys una versió.",
    "days": "dies",
+    "directories": "directoris",
+    "files": "arxius",
    "full documentation": "Documentació completa",
    "items": "Elements",
    "{%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}})."
 }
--- a/gui/default/assets/lang/lang-cs.json
+++ b/gui/default/assets/lang/lang-cs.json
@@ -31,34 +31,32 @@
    "Command": "Příkaz",
    "Comment, when used at the start of a line": "Komentář, pokud použito na začátku řádku",
    "Compression": "Komprese",
+    "Configured": "Nastaveno",
    "Connection Error": "Chyba připojení",
    "Connection Type": "Typ připojení",
    "Copied from elsewhere": "Zkopírováno odjinud",
    "Copied from original": "Zkopírováno z originálu",
    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 následující přispěvatelé:",
-    "Copyright © 2015 the following Contributors:": "Copyright © 2015 následující přispěvatelé:",
    "Danger!": "Pozor!",
-    "Delete": "Smazat",
    "Deleted": "Smazáno",
    "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": "ID přístroje",
    "Device Identification": "Identifikace přístroje",
    "Device Name": "Jméno přístroje",
-    "Device {%device%} ({%address%}) wants to connect. Add new device?": "Přístroj {{device}} ({{address}}) žádá o připojení. Chcete ho přidat?",
    "Devices": "Přístroje",
    "Disconnected": "Odpojen",
+    "Discovered": "Nalezeno",
    "Discovery": "Oznamování",
    "Documentation": "Dokumentace",
    "Download Rate": "Rychlost stahování",
    "Downloaded": "Staženo",
    "Downloading": "Stahuji",
    "Edit": "Upravit",
-    "Edit Device": "Upravit přístroj",
+    "Edit Device": "Upravit zařízení",
    "Edit Folder": "Upravit adresář",
    "Editing": "Upravuje se",
    "Enable NAT traversal": "Povolit NAT přenos",
    "Enable Relaying": "Povolit přenašeče",
-    "Enable UPnP": "Povolit UPnP",
    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Zadejte adresy oddělené čárkou (\"tcp://ip:port\", \"tcp://host:port\") nebo \"dynamic\" pro automatické zjišťování adres.",
    "Enter ignore patterns, one per line.": "Vložit ignorované vzory, jeden na řádek.",
    "Error": "Chyba",
@@ -73,7 +71,6 @@
    "Folder": "Adresář",
    "Folder ID": "ID adresáře",
    "Folder Label": "Jmenovka adresáře",
-    "Folder Master": "Master adresář",
    "Folder Path": "Cesta k adresáři",
    "Folder Type": "Typ adresáře",
    "Folders": "Adresáře",
@@ -83,7 +80,6 @@
    "GUI Listen Addresses": "Adresa naslouchání GUI",
    "Generate": "Generovat",
    "Global Discovery": "Globální oznamování",
-    "Global Discovery Server": "Server globálního oznamování",
    "Global Discovery Servers": "Servery globálního oznamování",
    "Global State": "Globální status",
    "Help": "Pomoc",
@@ -101,6 +97,7 @@
    "Last Scan": "Poslední sken",
    "Last seen": "Naposledy spatřen",
    "Later": "Později",
+    "Latest Change": "Poslední změna",
    "Listeners": "Naslouchající",
    "Local Discovery": "Místní oznamování",
    "Local State": "Místní status",
@@ -141,9 +138,7 @@
    "Quick guide to supported patterns": "Rychlá nápověda k podporovaným vzorům",
    "RAM Utilization": "Využití RAM",
    "Random": "Náhodně",
-    "Relay Servers": "Přenášecí servery",
-    "Relayed via": "Přenášené přes",
-    "Relays": "Přenašeče",
+    "Reduced by ignore patterns": "Redukováno o ignorované vzory",
    "Release Notes": "Poznámky k vydání",
    "Remote Devices": "Vzdálená zařízení",
    "Remove": "Odstranit",
@@ -161,6 +156,8 @@
    "Scanning": "Skenování",
    "Select the devices to share this folder with.": "Vybrat přístroje, se kterými sdílet tento adresář.",
    "Select the folders to share with this device.": "Vybrat adresáře sdílené s tímto přístrojem.",
+    "Send & Receive": "Odeslat a přijmout",
+    "Send Only": "Pouze odeslat",
    "Settings": "Nastavení",
    "Share": "Sdílet",
    "Share Folder": "Sdílet adresář",
@@ -168,7 +165,6 @@
    "Share With Devices": "Sdílet s přístroji",
    "Share this folder?": "Sdílet tento adresář?",
    "Shared With": "Sdíleno s",
-    "Short identifier for the folder. Must be the same on all cluster devices.": "Krátký identifikátor tohoto adresáře. Musí být stejný na všech přístrojích v clusteru.",
    "Show ID": "Zobrazit ID",
    "Show QR": "Zobrazit QR",
    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Zobrazeno místo ID přístroje na náhledu stavu clusteru. Bude odesíláno ostatním přístrojům jako výchozí jméno přístroje.",
@@ -194,16 +190,13 @@
    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing má nejspíše problém s provedením vašeho požadavku. Pokud problém přetrvává, obnovte stránku v prohlížeči nebo restartujte Syncthing.",
    "The Syncthing admin interface is configured to allow remote access without a password.": "V nastavení aplikace Syncthing je povoleno vzdálené připojení k administrátorskému rozhraní bez zadání hesla.",
    "The aggregated statistics are publicly available at the URL below.": "Souhrnné statistiky jsou veřejně dostupné na níže uvedené URL.",
-    "The aggregated statistics are publicly available at {%url%}.": "Souhrnné statistiky jsou veřejně dostupné na {{url}}.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Konfigurace byla uložena, ale není aktivována. Pro aktivaci nové konfigurace je třeba restartovat Syncthing.",
    "The device ID cannot be blank.": "ID přístroje nemůže být prázdné.",
    "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).": "ID přístroje, které je třeba vložit, lze nalézt v dialogu \"Akce > Zobrazit ID\" na druhém přístroji. Mezery a pomlčky nejsou nutné (budou ignorovány).",
-    "The device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "ID přístroje, které je třeba vložit, lze nalézt v dialogu \"Upravit > Zobrazit ID\" na druhém přístroji. Mezery a pomlčky nejsou nutné (budou ignorovány).",
    "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.": "Šifrovaná data o využití jsou zasílána denně. Jsou používána pro zjištění nejobvyklejších platforem, velikosti adresářů a verzí aplikace. Pokud se hlášená data změní, budete opět upozorněni tímto dialogem.",
    "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é ID přístroje není platné. Mělo by mít 52 nebo 56 znaků a mělo by obsahovat písmena a čísla. Mezery a pomlčky jsou nepovinné.",
    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "První parametr příkazové řádky je cesta k adresáři, druhý je relativní cesta v témže adresáři.",
    "The folder ID cannot be blank.": "ID adresáře nemůže být prázdné.",
-    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "ID adresáře musí být stručný popisek (64 znaků nebo méně) obsahující pouze písmena, čísla, tečku (.), pomlčku (-) a nebo podtržítko (_).",
    "The folder ID must be unique.": "ID adresáře musí být unikátní.",
    "The folder path cannot be blank.": "Cesta k adresáři nemůže být prázdná.",
    "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.",
@@ -243,9 +236,10 @@
    "Yes": "Ano",
    "You must keep at least one version.": "Je třeba ponechat alespoň jednu verzi.",
    "days": "dní",
+    "directories": "složek",
+    "files": "souborů",
    "full documentation": "plná dokumentace",
    "items": "položky",
    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} chce sdílet adresář \"{{folder}}\".",
-    "{%device%} wants to share folder \"{%folderLabel%}\" ({%folder%}).": "{{device}} chce sdílet adresář \"{{folderLabel}}\" ({{folder}}).",
    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} chce sdílet adresář \"{{folderlabel}}\" ({{folder}})."
 }
--- a/gui/default/assets/lang/lang-da.json
+++ b/gui/default/assets/lang/lang-da.json
@@ -31,34 +31,32 @@
    "Command": "Kommando",
    "Comment, when used at the start of a line": "Kommentering som bruges i starten af en linje",
    "Compression": "Anvend komprimering",
+    "Configured": "Configured",
    "Connection Error": "Tilslutnings fejl",
    "Connection Type": "Connection Type",
    "Copied from elsewhere": "Kopieret fra et andet sted",
    "Copied from original": "Kopieret fra originalen",
    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 the following Contributors:",
-    "Copyright © 2015 the following Contributors:": "Copyright © 2015 alle bidragsydere:",
    "Danger!": "Fare!",
-    "Delete": "Slet",
    "Deleted": "Slettet",
    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Device \"{{name}}\" ({{device}} at {{address}}) wants to connect. Add new device?",
    "Device ID": "Enheds-ID",
    "Device Identification": "Enhedsidentifikation",
    "Device Name": "Enhedsnavn",
-    "Device {%device%} ({%address%}) wants to connect. Add new device?": "Enheden {{device}} ({{address}}) ønsker at forbinde. Tilføj denne enhed?",
    "Devices": "Enheder",
    "Disconnected": "Ikke tilsluttet",
+    "Discovered": "Discovered",
    "Discovery": "Opslag",
    "Documentation": "Dokumentation",
    "Download Rate": "Downloadhastighed",
    "Downloaded": "Downloadet",
    "Downloading": "Downloader",
    "Edit": "Rediger",
-    "Edit Device": "Rediger enhed",
-    "Edit Folder": "Rediger mappe",
+    "Edit Device": "Edit Device",
+    "Edit Folder": "Edit Folder",
    "Editing": "Redigerer",
    "Enable NAT traversal": "Enable NAT traversal",
    "Enable Relaying": "Enable Relaying",
-    "Enable UPnP": "Anvend UPnP",
    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Angiv kommaseparerede adresser (\"tcp://ip:port\", \"tcp://host:port\") eller \"dynamic\" for at benytte automatisk opdagelse af adressen.",
    "Enter ignore patterns, one per line.": "Vælg ignorer maske, én per linje.",
    "Error": "Fejl",
@@ -73,7 +71,6 @@
    "Folder": "Mappe",
    "Folder ID": "Mappe-ID",
    "Folder Label": "Folder Label",
-    "Folder Master": "Mastermappe",
    "Folder Path": "Mappesti",
    "Folder Type": "Folder Type",
    "Folders": "Mapper",
@@ -83,7 +80,6 @@
    "GUI Listen Addresses": "GUI-lytteadresse",
    "Generate": "Opret",
    "Global Discovery": "Globalt opslag",
-    "Global Discovery Server": "Global opslagsserver",
    "Global Discovery Servers": "Global Discovery Servers",
    "Global State": "Global tilstand",
    "Help": "Hjælp",
@@ -101,6 +97,7 @@
    "Last Scan": "Last Scan",
    "Last seen": "Sidst set",
    "Later": "Senere",
+    "Latest Change": "Latest Change",
    "Listeners": "Listeners",
    "Local Discovery": "Lokal opslag",
    "Local State": "Lokal tilstand",
@@ -141,9 +138,7 @@
    "Quick guide to supported patterns": "Hurtig guide til supporteret mønstre",
    "RAM Utilization": "RAM-forbrug",
    "Random": "Tilfældig",
-    "Relay Servers": "Relay Servers",
-    "Relayed via": "Passeret gennem",
-    "Relays": "Passager",
+    "Reduced by ignore patterns": "Reduced by ignore patterns",
    "Release Notes": "Udgivelsesnoter",
    "Remote Devices": "Remote Devices",
    "Remove": "Fjern",
@@ -161,6 +156,8 @@
    "Scanning": "Opdaterer",
    "Select the devices to share this folder with.": "Vælg hvilke enheder du vil dele denne mappe med",
    "Select the folders to share with this device.": "Vælg hvilke mapper du vil dele med denne enhed.",
+    "Send & Receive": "Send & Receive",
+    "Send Only": "Send Only",
    "Settings": "Indstillinger",
    "Share": "Del",
    "Share Folder": "Delt mappe",
@@ -168,7 +165,6 @@
    "Share With Devices": "Del med enhed",
    "Share this folder?": "Del denne mappe",
    "Shared With": "Delt med",
-    "Short identifier for the folder. Must be the same on all cluster devices.": "Kort navn for mappen. Skal være det samme på alle tilknyttede enheder.",
    "Show ID": "Vis ID",
    "Show QR": "Show QR",
    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Vist istedet for Enheds ID i klynge status. Vil blive vist på andre enheder som valgfrit standard navn.",
@@ -194,16 +190,13 @@
    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Det ser ud til at Syncthiing har problemer med at udføre opgaven. Prøv at genopfriske siden eller genstarte Synching hvis problemet vedbliver.",
    "The Syncthing admin interface is configured to allow remote access without a password.": "Syncthing administationsdelen er konfigureret til at blive fjernstyret uden kodeord.",
    "The aggregated statistics are publicly available at the URL below.": "The aggregated statistics are publicly available at the URL below.",
-    "The aggregated statistics are publicly available at {%url%}.": "Samlet statistik er offentligt tilgængelig på {{url}}.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Konfigurationen er gemt, men ikke aktiveret. Syncthing skal genstarte for at aktivere den nye konfiguration.",
    "The device ID cannot be blank.": "Enhedens ID må ikke være tom.",
    "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 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 device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "Enheds ID som som skal bruges her, kan du finde i \"Rediger > Vis ID\"-dialogen på den anden enhed. Mellemrum og bindestreg er valgfri (ignoreres).",
    "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.": "Den krypterede forbrugsrapport sendes dagligt. Den benyttes til at spore anvendte platforme, mappestørrelser og versioner. Hvis det typen af opsamlet data ændres på et senere tidspunkt, vil du blive spurgt om tilladelse igen.",
    "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 node ID ser ikke gyldigt ud. Det skal være en 52 eller 56 tegn streng, bestående af tal og bogstaver, eventuelt med mellemrum og bindestreger.",
    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "Den første kommandolinjeparameter er mappestien og den anden parameter er den relative sti til mappen.",
    "The folder ID cannot be blank.": "Mappe-ID må ikke være tom",
-    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "Mappe-ID skal være en kort identificierende streng (64 karakterer eller mindre) bestående af bogstav-, tal-, punktum- (.), bindestreg- (-) og understregskarakteren (_).",
    "The folder ID must be unique.": "Mappe-ID skal være unik",
    "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: i den første time, er en version gemt hvert 30. sekund, for første da er en version gemt hver time,  for de første 30 dage er en version gemt hver dag og indtil den maksimale periode er en version hver uge gemt.",
@@ -243,9 +236,10 @@
    "Yes": "Ja",
    "You must keep at least one version.": "Du skal beholde mindst én version.",
    "days": "dage",
+    "directories": "directories",
+    "files": "files",
    "full documentation": "Fuld dokumentation",
    "items": "poster",
    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} ønsker at dele mappen \"{{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}})."
 }
--- a/gui/default/assets/lang/lang-de.json
+++ b/gui/default/assets/lang/lang-de.json
@@ -1,15 +1,15 @@
 {
-    "A device with that ID is already added.": "Ein Gerät mit dieser ID existiert bereits.",
+    "A device with that ID is already added.": "Ein Gerät mit dieser Kennung ist bereits hinzugefügt.",
    "A negative number of days doesn't make sense.": "Eine negative Anzahl von Tagen ergibt keinen Sinn.",
    "A new major version may not be compatible with previous versions.": "Die neue Hauptversion ist evtl. nicht mit vorherigen Versionen kompatibel.",
    "API Key": "API-Schlüssel",
-    "About": "Über Syncthing",
+    "About": "Über",
    "Actions": "Aktionen",
    "Add": "Hinzufügen",
    "Add Device": "Gerät hinzufügen",
-    "Add Folder": "Verzeichnis hinzufügen",
-    "Add Remote Device": "Remote-Gerät hinzufügen",
-    "Add new folder?": "Neues Verzeichnis hinzufügen?",
+    "Add Folder": "Ordner hinzufügen",
+    "Add Remote Device": "Gerät hinzufügen",
+    "Add new folder?": "Neuen Ordner hinzufügen?",
    "Address": "Adresse",
    "Addresses": "Adressen",
    "Advanced": "Erweitert",
@@ -18,7 +18,7 @@
    "All Data": "Alle Daten",
    "Allow Anonymous Usage Reporting?": "Übertragung von anonymen Nutzungsberichten erlauben?",
    "Alphabetic": "Alphabetisch",
-    "An external command handles the versioning. It has to remove the file from the synced folder.": "Ein externer Programmaufruf handhabt die Versionierung. Es muss die Datei aus dem zu synchronisierendem Verzeichnis entfernen.",
+    "An external command handles the versioning. It has to remove the file from the synced folder.": "Ein externer Programmaufruf handhabt die Versionierung. Es muss die Datei aus dem zu synchronisierendem Ordner entfernen.",
    "Anonymous Usage Reporting": "Anonymer Nutzungsbericht",
    "Any devices configured on an introducer device will be added to this device as well.": "Alle Geräte, die beim Verteiler eingetragen sind, werden auch bei diesem Gerät eingetragen",
    "Automatic upgrades": "Automatische Updates aktivieren",
@@ -31,22 +31,21 @@
    "Command": "Befehl",
    "Comment, when used at the start of a line": "Kommentar, wenn am Anfang der Zeile benutzt.",
    "Compression": "Komprimierung",
+    "Configured": "Konfiguriert",
    "Connection Error": "Verbindungsfehler",
    "Connection Type": "Verbindungstyp",
    "Copied from elsewhere": "Von anderer Quelle kopiert",
    "Copied from original": "Vom Original kopiert",
    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 der folgenden Unterstützer:",
-    "Copyright © 2015 the following Contributors:": "Copyright © 2015 die folgenden Unterstützer:",
    "Danger!": "Achtung!",
-    "Delete": "Löschen",
    "Deleted": "Gelöscht",
    "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äte ID",
-    "Device Identification": "Geräte Identifikation",
+    "Device ID": "Gerätekennung",
+    "Device Identification": "Geräteidentifikation",
    "Device Name": "Gerätename",
-    "Device {%device%} ({%address%}) wants to connect. Add new device?": "Gerät {{device}} ({{address}}) möchte sich verbinden. Gerät hinzufügen?",
    "Devices": "Geräte",
    "Disconnected": "Getrennt",
+    "Discovered": "Ermittelt",
    "Discovery": "Gerätesuche",
    "Documentation": "Dokumentation",
    "Download Rate": "Download",
@@ -54,11 +53,10 @@
    "Downloading": "Lädt herunter",
    "Edit": "Bearbeiten",
    "Edit Device": "Gerät bearbeiten",
-    "Edit Folder": "Verzeichnis bearbeiten",
+    "Edit Folder": "Ordner bearbeiten",
    "Editing": "Bearbeitet",
    "Enable NAT traversal": "NAT-Durchdringung aktivieren",
    "Enable Relaying": "Weiterleitung aktivieren",
-    "Enable UPnP": "UPnP aktivieren",
    "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.",
    "Error": "Fehler",
@@ -67,23 +65,21 @@
    "File Pull Order": "Dateiübertragungsreihenfolge",
    "File Versioning": "Dateiversionierung",
    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Dateizugriffsrechte beim Suchen nach Veränderungen ignorieren. Bei FAT-Dateisystemen zu verwenden.",
-    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Wenn Syncthing Dateien ersetzt oder löscht, werden sie in das .stversions Verzeichnis verschoben.",
-    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Dateien werden, bevor Syncthing sie löscht oder ersetzt, datiert in das Verzeichnis .stversions verschoben.",
+    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Wenn Syncthing Dateien ersetzt oder löscht, werden sie in den Ordner .stversions verschoben.",
+    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Dateien werden, bevor Syncthing sie löscht oder ersetzt, datiert in den Ordner .stversions verschoben.",
    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Dateien sind auf diesem Gerät schreibgeschützt. Auf diesem Gerät durchgeführte Veränderungen werden aber auf den Rest des Verbunds übertragen.",
-    "Folder": "Verzeichnis",
-    "Folder ID": "Verzeichnis ID",
-    "Folder Label": "Verzeichnisbezeichnung",
-    "Folder Master": "Master Verzeichnis - schreibgeschützt",
-    "Folder Path": "Verzeichnispfad",
-    "Folder Type": "Verzeichnistyp",
-    "Folders": "Verzeichnisse",
+    "Folder": "Ordner",
+    "Folder ID": "Ordnerkennung",
+    "Folder Label": "Ordnerbezeichnung",
+    "Folder Path": "Ordnerpfad",
+    "Folder Type": "Ordnertyp",
+    "Folders": "Ordner",
    "GUI": "GUI",
    "GUI Authentication Password": "Passwort für Zugang zur Benutzeroberfläche",
    "GUI Authentication User": "Nutzername für Zugang zur Benutzeroberfläche",
    "GUI Listen Addresses": "Adresse(n) für die Benutzeroberfläche",
    "Generate": "Generieren",
    "Global Discovery": "Globale Gerätesuche",
-    "Global Discovery Server": "Globale(r) Gerätesuchserver",
    "Global Discovery Servers": "Globale Gerätesuchserver",
    "Global State": "Globaler Status",
    "Help": "Hilfe",
@@ -92,7 +88,7 @@
    "Ignore Patterns": "Ignoriermuster",
    "Ignore Permissions": "Berechtigungen ignorieren",
    "Incoming Rate Limit (KiB/s)": "Limit Datenrate (eingehend) (KB/s)",
-    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Eine falsche Konfiguration kann den Verzeichnisinhalt beschädigen und Syncthing in einen unausführbaren Zustand versetzen.",
+    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Eine falsche Konfiguration kann den Ordnerinhalt beschädigen und Syncthing in einen unausführbaren Zustand versetzen.",
    "Introducer": "Verteilergerät",
    "Inversion of the given condition (i.e. do not exclude)": "Umkehrung der angegebenen Bedingung (z.B. schließe nicht aus)",
    "Keep Versions": "Versionen erhalten",
@@ -101,6 +97,7 @@
    "Last Scan": "Letzter Scan",
    "Last seen": "Zuletzt online",
    "Later": "Später",
+    "Latest Change": "Letzte Änderung",
    "Listeners": "Zuhörer",
    "Local Discovery": "Lokale Gerätesuche",
    "Local State": "Lokaler Status",
@@ -111,10 +108,10 @@
    "Metadata Only": "Nur Metadaten",
    "Minimum Free Disk Space": "Minimal freier Festplattenspeicher",
    "Move to top of queue": "An den Anfang der Warteschlange setzen",
-    "Multi level wildcard (matches multiple directory levels)": "Verschachteltes Maskenzeichen (wird für verschachtelte Verzeichnisse verwendet)",
+    "Multi level wildcard (matches multiple directory levels)": "Verschachteltes Maskenzeichen (wird für verschachtelte Ordner verwendet)",
    "Never": "Nie",
    "New Device": "Neues Gerät",
-    "New Folder": "Neues Verzeichnis",
+    "New Folder": "Neuer Ordner",
    "Newest First": "Neueste zuerst",
    "No": "Nein",
    "No File Versioning": "Keine Dateiversionierung",
@@ -123,14 +120,14 @@
    "OK": "OK",
    "Off": "Aus",
    "Oldest First": "Älteste zuerst",
-    "Optional descriptive label for the folder. Can be different on each device.": "Optionale beschreibende Bezeichnung des Verzeichnisses. Kann auf jedem Gerät unterschiedlich sein.",
+    "Optional descriptive label for the folder. Can be different on each device.": "Optionale beschreibende Bezeichnung des Ordners. Kann auf jedem Gerät unterschiedlich sein.",
    "Options": "Optionen",
    "Out of Sync": "Nicht synchronisiert",
    "Out of Sync Items": "Nicht synchronisierte Objekte",
    "Outgoing Rate Limit (KiB/s)": "Limit Datenrate (ausgehend) (KB/s)",
    "Override Changes": "Änderungen überschreiben",
-    "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 Verzeichnis auf dem lokalen Gerät. Verzeichnis wird erzeugt, wenn es nicht existiert. Das Tilden-Zeichen (~) kann als Abkürzung benutzt werden für",
-    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Pfad in dem alte Dateiversionen gespeichert werden sollen (ohne Angabe wird das Verzeichnis .stversions im Verzeichnis verwendet).",
+    "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",
+    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Pfad in dem alte Dateiversionen gespeichert werden sollen (ohne Angabe wird der Ordner .stversions im Ordner verwendet).",
    "Pause": "Pause",
    "Paused": "Pausiert",
    "Please consult the release notes before performing a major upgrade.": "Bitte lesen Sie die Veröffentlichungsnotizen bevor Sie eine neue Hauptversion installieren.",
@@ -141,13 +138,11 @@
    "Quick guide to supported patterns": "Schnellanleitung zu den unterstützten Mustern",
    "RAM Utilization": "RAM Auslastung",
    "Random": "Zufall",
-    "Relay Servers": "Weiterleitungs-Server",
-    "Relayed via": "Weitergeleitet über",
-    "Relays": "Weiterleitungen",
+    "Reduced by ignore patterns": "Durch Ignoriermuster reduziert",
    "Release Notes": "Veröffentlichungsnotizen",
-    "Remote Devices": "Remote-Geräte",
+    "Remote Devices": "Fern-Geräte",
    "Remove": "Entfernen",
-    "Required identifier for the folder. Must be the same on all cluster devices.": "Erforderliche ID für das Verzeichnis. Muss auf allen Verbund-Geräten gleich sein.",
+    "Required identifier for the folder. Must be the same on all cluster devices.": "Erforderlicher Bezeichner für den Ordner. Muss auf allen Verbund-Geräten gleich sein.",
    "Rescan": "Neu scannen",
    "Rescan All": "Alle neu scannen",
    "Rescan Interval": "Scanintervall",
@@ -159,24 +154,25 @@
    "Save": "Speichern",
    "Scan Time Remaining": "Zeit für Scan verbleibend",
    "Scanning": "Scannen",
-    "Select the devices to share this folder with.": "Wähle die Geräte aus, mit denen Du dieses Verzeichnis teilen willst.",
-    "Select the folders to share with this device.": "Wähle die Verzeichnisse aus, die du mit diesem Gerät teilen möchtest",
+    "Select the devices to share this folder with.": "Wähle die Geräte aus, mit denen Du diesen Ordner teilen willst.",
+    "Select the folders to share with this device.": "Wähle die Ordner aus, die Du mit diesem Gerät teilen möchtest",
+    "Send & Receive": "Senden & empfangen",
+    "Send Only": "Nur senden",
    "Settings": "Einstellungen",
    "Share": "Teilen",
-    "Share Folder": "Teile Verzeichnis",
-    "Share Folders With Device": "Teile Verzeichnisse mit diesem Gerät",
+    "Share Folder": "Ordner teilen",
+    "Share Folders With Device": "Ordner mit diesem Gerät teilen",
    "Share With Devices": "Teile mit diesen Geräten",
-    "Share this folder?": "Dieses Verzeichnis teilen?",
+    "Share this folder?": "Diesen Ordner teilen?",
    "Shared With": "Geteilt mit",
-    "Short identifier for the folder. Must be the same on all cluster devices.": "Kurze ID für das Verzeichnis. Muss auf allen Verbunds-Geräten gleich sein.",
-    "Show ID": "ID anzeigen",
+    "Show ID": "Eigene Kennung",
    "Show QR": "Zeige QR Code",
-    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Wird anstatt der Geräte ID angezeigt. Wird als optionaler Gerätename an die anderen Clients im Cluster weitergegeben.",
+    "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.",
    "Shutdown": "Herunterfahren",
    "Shutdown Complete": "Vollständig Heruntergefahren",
    "Simple File Versioning": "Einfache Dateiversionierung",
-    "Single level wildcard (matches within a directory only)": "Einzelnes Maskenzeichen (wird für ein einzelnes Verzeichnis verwendet)",
+    "Single level wildcard (matches within a directory only)": "Einzelnes Maskenzeichen (wird für einen einzelnen Ordner verwendet)",
    "Smallest First": "Kleinstes zuerst",
    "Source Code": "Quellcode",
    "Staggered File Versioning": "Stufenweise Dateiversionierung",
@@ -194,18 +190,15 @@
    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing scheint ein Problem mit der Verarbeitung Deiner Eingabe zu haben. Bitte lade die Seite neu oder führe einen Neustart durch, falls das Problem weiterhin besteht.",
    "The Syncthing admin interface is configured to allow remote access without a password.": "Die Syncthing-Oberfläche erlaubt mit den jetzigen Einstellungen einen Zugriff ohne Passwort.",
    "The aggregated statistics are publicly available at the URL below.": "Die gesammelten Statistiken sind öffentlich unter der nachfolgenden URL verfügbar.",
-    "The aggregated statistics are publicly available at {%url%}.": "Die gesammelten Statistiken sind öffentlich verfügbar unter {{url}}.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Die Konfiguration wurde gespeichert, aber noch nicht aktiviert. Syncthing muss neugestartet werden, um die neue Konfiguration zu übernehmen.",
-    "The device ID cannot be blank.": "Die Geräte ID darf nicht leer sein.",
-    "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).": "Die hier einzutragende Geräte ID kann im \"Aktionen > Zeige ID\"-Dialog auf dem anderen Gerät gefunden werden. Leerzeichen und Bindestriche sind optional (werden ignoriert).",
-    "The device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "Die hier einzutragende Geräte ID kann im \"Bearbeiten > Zeige ID\"-Dialog auf dem anderen Gerät gefunden werden. Leerzeichen und Bindestriche sind optional (werden ignoriert).",
-    "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.": "Der verschlüsselte Nutzungsbericht wird täglich gesendet. Er wird verwendet, um Statistiken über verwendete Betriebssysteme, Verzeichnis-Größen und Programm-Versionen zu erstellen. Sollte der Bericht in Zukunft weitere Daten erfassen, wird dieses Fenster erneut angezeigt.",
-    "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äte ID 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 first command line parameter is the folder path and the second parameter is the relative path in the folder.": "Der erste Kommandozeilenparameter ist der Verzeichnis-Pfad und der zweite Parameter ist der relative Pfad in diesem Verzeichnis.",
-    "The folder ID cannot be blank.": "Die Verzeichnis ID darf nicht leer sein.",
-    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "Die Verzeichnis ID muss eine kurze Bezeichnung haben (64 Zeichen oder weniger). Sie darf nur aus Buchstaben, Zahlen und dem Punkt- (.), Bindestrich- (-), und Unterstrich- (_) Zeichen bestehen.",
-    "The folder ID must be unique.": "Die Verzeichnis ID darf nur einmal existieren.",
-    "The folder path cannot be blank.": "Der Verzeichnispfad darf nicht leer sein.",
+    "The device ID cannot be blank.": "Die Gerätekennung darf nicht leer sein.",
+    "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).": "Die hier einzutragende Gerätekennung kann im Dialog \"Aktionen > Kennung anzeigen\" auf dem anderen Gerät gefunden werden. Leerzeichen und Bindestriche sind optional (werden ignoriert).",
+    "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.": "Der verschlüsselte Nutzungsbericht wird täglich gesendet. Er wird verwendet, um Statistiken über verwendete Betriebssysteme, Ordnergrößen und Programmversionen zu erstellen. Sollte der Bericht in Zukunft weitere Daten erfassen, wird dieses Fenster erneut angezeigt.",
+    "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 first command line parameter is the folder path and the second parameter is the relative path in the folder.": "Der erste Kommandozeilenparameter ist der Ordnerpfad und der zweite Parameter ist der relative Pfad in diesem Ordner.",
+    "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 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 Objekte konnten nicht synchronisiert werden.",
    "The maximum age must be a number and cannot be blank.": "Das Höchstalter muss angegeben werden und eine Zahl sein.",
@@ -237,15 +230,16 @@
    "Version": "Version",
    "Versions Path": "Versionierungspfad",
    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Alte Dateiversionen werden automatisch gelöscht, wenn sie älter als das angegebene Höchstalter sind oder die angegebene Höchstzahl an Dateien erreicht ist.",
-    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Warnung, dieser Pfad ist ein Unterverzeichnis des existierenden Verzeichnisses \"{{otherFolder}}\".",
+    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Warnung, dieser Pfad ist ein Unterordner des existierenden Ordners \"{{otherFolder}}\".",
    "When adding a new device, keep in mind that this device must be added on the other side too.": "Beachte beim Hinzufügen eines neuen Gerätes, dass dieses Gerät auch auf den anderen Geräten hinzugefügt werden muss.",
-    "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.": "Beachte bitte beim Hinzufügen eines neuen Verzeichnisses, dass die Verzeichnis ID dazu verwendet wird, Verzeichnisse zwischen Geräten zu verbinden. Die ID muss also auf allen Geräten gleich sein, die Groß- und Kleinschreibung muss dabei beachtet werden.",
+    "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.": "Beachte bitte beim Hinzufügen eines neuen Ordners, dass die Ordnerkennung dazu verwendet wird, Ordner zwischen Geräten zu verbinden. Die Kennung muss also auf allen Geräten gleich sein, die Groß- und Kleinschreibung muss dabei beachtet werden.",
    "Yes": "Ja",
    "You must keep at least one version.": "Du musst mindestens eine Version behalten.",
    "days": "Tage",
+    "directories": "Ordner",
+    "files": "Dateien",
    "full documentation": "Komplette Dokumentation",
    "items": "Objekte",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} möchte das Verzeichnis \"{{folder}}\" teilen.",
-    "{%device%} wants to share folder \"{%folderLabel%}\" ({%folder%}).": "{{device}} möchte das Verzeichnis \"{{folderLabel}}\" ({{folder}}) teilen.",
-    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} möchte das Verzeichnis \"{{folderLabel}}\" ({{folder}}) teilen."
+    "{%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."
 }
--- a/gui/default/assets/lang/lang-el.json
+++ b/gui/default/assets/lang/lang-el.json
@@ -26,27 +26,26 @@
    "Bugs": "Bugs",
    "CPU Utilization": "Επιβάρυνση του επεξεργαστή",
    "Changelog": "Πληροφορίες εκδόσεων",
-    "Clean out after": "Μετά από αυτό, εκκαθάρισε",
+    "Clean out after": "Εκκαθάριση μετά από",
    "Close": "Τέλος",
    "Command": "Εντολή",
    "Comment, when used at the start of a line": "Σχόλιο, όταν χρησιμοποιείται στην αρχή μιας γραμμής",
    "Compression": "Συμπίεση",
+    "Configured": "Βάσει ρύθμισης",
    "Connection Error": "Σφάλμα σύνδεσης",
    "Connection Type": "Τύπος Σύνδεσης",
    "Copied from elsewhere": "Έχει αντιγραφεί από κάπου αλλού",
    "Copied from original": "Έχει αντιγραφεί από το πρωτότυπο",
-    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 οι παρακάτω Συνεισφέροντες:",
-    "Copyright © 2015 the following Contributors:": "Copyright © 2015 από τους παρακάτω συνεισφορείς:",
+    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 για τους παρακάτω συνεισφέροντες:",
    "Danger!": "Προσοχή!",
-    "Delete": "Διαγραφή",
    "Deleted": "Διαγραμμένα",
-    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Η συσκευή \"{{name}}\" ({{device}} στη {{address}}) επιθυμεί να συνδεθεί. Προσθήκη της νέας συσκευής?",
+    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Η συσκευή \"{{name}}\" ({{device}} στη διεύθυνση {{address}}) επιθυμεί να συνδεθεί. Προσθήκη της νέας συσκευής;",
    "Device ID": "Ταυτότητα συσκευής",
    "Device Identification": "Ταυτότητα συσκευής",
    "Device Name": "Όνομα συσκευής",
-    "Device {%device%} ({%address%}) wants to connect. Add new device?": "Η συσκευή {{device}} ({{address}}) επιθυμεί να συνδεθεί. Προσθήκη της νέας συσκευής1",
    "Devices": "Συσκευές",
    "Disconnected": "Αποσυνδεδεμένος",
+    "Discovered": "Βάσει ανεύρεσης",
    "Discovery": "Ανεύρεση συσκευών",
    "Documentation": "Τεκμηρίωση",
    "Download Rate": "Ταχύτητα λήψης",
@@ -56,10 +55,9 @@
    "Edit Device": "Επεξεργασία συσκευής",
    "Edit Folder": "Επεξεργασία φακέλου",
    "Editing": "Επεξεργασία σε εξέλιξη",
-    "Enable NAT traversal": "Enable NAT traversal",
+    "Enable NAT traversal": "Ενεργοποίηση διάσχισης NAT",
    "Enable Relaying": "Ενεργοποίηση αναμετάδοσης",
-    "Enable UPnP": "Ενεργοποίηση UPnP",
-    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.",
+    "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.": "Δώσε τα πρότυπα που θα αγνοηθούν, ένα σε κάθε γραμμή.",
    "Error": "Σφάλμα",
    "External File Versioning": "Εξωτερική τήρηση εκδόσεων",
@@ -72,10 +70,9 @@
    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Τα αρχεία προστατεύονται από αλλαγές που γίνονται σε άλλες συσκευές, αλλά όποιες αλλαγές γίνουν σε αυτή τη συσκευή θα αποσταλούν σε όλη τη συστάδα συσκευών.",
    "Folder": "Φάκελος",
    "Folder ID": "Ταυτότητα φακέλου",
-    "Folder Label": "Folder Label",
-    "Folder Master": "Να μην επιτρέπονται αλλαγές",
+    "Folder Label": "Ετικέτα φακέλου",
    "Folder Path": "Μονοπάτι φακέλου",
-    "Folder Type": "Folder Type",
+    "Folder Type": "Τύπος φακέλου",
    "Folders": "Φάκελοι",
    "GUI": "Γραφικό περιβάλλον",
    "GUI Authentication Password": "Κωδικός για την πρόσβαση στη διεπαφή",
@@ -83,8 +80,7 @@
    "GUI Listen Addresses": "Διευθύνσεις από τις οποίες θα είναι προσβάσιμη η διεπαφή",
    "Generate": "Δημιουργία",
    "Global Discovery": "Καθολική ανεύρεση",
-    "Global Discovery Server": "Διακομιστής καθολικής ανεύρεσης κόμβου",
-    "Global Discovery Servers": "Global Discovery Servers",
+    "Global Discovery Servers": "Διακομιστές καθολικής ανεύρεσης κόμβων",
    "Global State": "Καθολική κατάσταση",
    "Help": "Βοήθεια",
    "Home page": "Αρχική σελίδα",
@@ -92,7 +88,7 @@
    "Ignore Patterns": "Πρότυπο για αγνόηση",
    "Ignore Permissions": "Αγνόησε τα δικαιώματα",
    "Incoming Rate Limit (KiB/s)": "Περιορισμός ταχύτητας λήψης (KiB/s)",
-    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Με μια εσφαλμένη ρύθμιση μπορεί προκαληθεί ζημιά στα περιεχόμενα του φακέλου και το Syncthing μπορεί να σταματήσει να λειτουργεί.",
+    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Με μια εσφαλμένη ρύθμιση μπορεί να προκληθεί ζημιά στα περιεχόμενα των φακέλων και το Syncthing να σταματήσει να λειτουργεί.",
    "Introducer": "Βασικός κόμβος",
    "Inversion of the given condition (i.e. do not exclude)": "Αντιστροφή της δοσμένης συνθήκης (π.χ. να μην εξαιρείς) ",
    "Keep Versions": "Διατήρηση εκδόσεων",
@@ -101,12 +97,13 @@
    "Last Scan": "Τελευταία Σάρωση",
    "Last seen": "Τελευταία φορά συνδεδεμένος",
    "Later": "Αργότερα",
-    "Listeners": "Listeners",
+    "Latest Change": "Τελευταία αλλαγή",
+    "Listeners": "Ακροατές",
    "Local Discovery": "Τοπική ανεύρεση",
    "Local State": "Τοπική κατάσταση",
    "Local State (Total)": "Τοπική κατάσταση (συνολικά)",
    "Major Upgrade": "Σημαντική αναβάθμιση",
-    "Master": "Master",
+    "Master": "Βασικός κόμβος",
    "Maximum Age": "Μέγιστη ηλικία",
    "Metadata Only": "Μόνο μεταδεδομένα",
    "Minimum Free Disk Space": "Ελάχιστος ελεύθερος αποθηκευτικός χώρος",
@@ -118,16 +115,16 @@
    "Newest First": "Το νεότερο πρώτα",
    "No": "Όχι",
    "No File Versioning": "Να μην τηρούνται εκδόσεις",
-    "Normal": "Normal",
+    "Normal": "Κανονικός",
    "Notice": "Σημείωση",
    "OK": "OK",
    "Off": "Απενεργοποιημένο",
    "Oldest First": "Το παλιότερο πρώτα",
-    "Optional descriptive label for the folder. Can be different on each device.": "Optional descriptive label for the folder. Can be different on each device.",
+    "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)",
+    "Outgoing Rate Limit (KiB/s)": "Περιορισμός ταχύτητας αποστολής (KiB/s)",
    "Override Changes": "Να αντικατασταθούν οι αλλαγές",
    "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 versions should be stored (leave empty for the default .stversions folder in the folder).": "Ο φάκελος στον οποίο θα αποθηκεύονται οι εκδόσεις των αρχείων (αν δεν οριστεί θα αποθηκεύονται στον υποφάκελο .stversions)",
@@ -141,26 +138,26 @@
    "Quick guide to supported patterns": "Σύντομη βοήθεια σχετικά με τα πρότυπα αναζήτησης που υποστηρίζονται",
    "RAM Utilization": "Επιβάρυνση RAM",
    "Random": "Τυχαία",
-    "Relay Servers": "Διακομιστές αναμετάδοσης",
-    "Relayed via": "Αναμετάδοση μέσω",
-    "Relays": "Αναμεταδόσεις",
+    "Reduced by ignore patterns": "Περιορισμένα λόγω προτύπων αγνόησης",
    "Release Notes": "Σημείωμα έκδοσης",
-    "Remote Devices": "Remote Devices",
+    "Remote Devices": "Απομακρυσμένες συσκευές",
    "Remove": "Αφαίρεση",
-    "Required identifier for the folder. Must be the same on all cluster devices.": "Required identifier for the folder. Must be the same on all cluster devices.",
+    "Required identifier for the folder. Must be the same on all cluster devices.": "Απαραίτητο αναγνωριστικό για τον φάκελο. Πρέπει να είναι το ίδιο σε όλες τις συσκευές με τις οποίες διαμοιράζεται ο φάκελος αυτός.",
    "Rescan": "Έλεγξε για αλλαγές",
    "Rescan All": "Έλεγξέ τα όλα για αλλαγές",
    "Rescan Interval": "Κάθε πότε θα ελέγχεται για αλλαγές ",
    "Restart": "Επανεκκίνηση",
    "Restart Needed": "Απαιτείται επανεκκίνηση",
    "Restarting": "Επανεκκίνηση",
-    "Resume": "Συνέχιση",
+    "Resume": "Συνέχεια",
    "Reused": "Χρησιμοποιήθηκε ξανά",
    "Save": "Αποθήκευση",
    "Scan Time Remaining": "Εναπομείναντας χρόνος για τον έλεγχο ",
    "Scanning": "Έλεγχος για αλλαγές",
    "Select the devices to share this folder with.": "Διάλεξε τις συσκευές προς τις οποίες θα διαμοιράζεται αυτός ο φάκελος.",
    "Select the folders to share with this device.": "Διάλεξε ποιοι φάκελοι θα διαμοιράζονται προς αυτή τη συσκευή.",
+    "Send & Receive": "Αποστολή και λήψη",
+    "Send Only": "Μόνο αποστολή",
    "Settings": "Ρυθμίσεις",
    "Share": "Διαμοίραση",
    "Share Folder": "Διαμοίραση φακέλου",
@@ -168,7 +165,6 @@
    "Share With Devices": "Διαμοίρασε με αυτές τις συσκευές",
    "Share this folder?": "Να διαμοιραστεί αυτός ο φάκελος;",
    "Shared With": "Διαμοιράζεται με",
-    "Short identifier for the folder. Must be the same on all cluster devices.": "Σύντομη ταυτότητα για το φάκελο. Θα πρέπει να είναι η ίδια σε όλη τη συστάδα  συσκευών με τις οποίες διαμοιράζεται ο φάκελος αυτός.",
    "Show ID": "Εμφάνιση ταυτότητας",
    "Show QR": "Δείξε τον κωδικό QR",
    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Θα φαίνεται αντί για την ταυτότητα της συσκευής στην προβολή της κατάστασης ολόκληρης της συστάδας. Θα γνωστοποιείται σαν το προαιρετικό όνομα της συσκευής.",
@@ -194,16 +190,13 @@
    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Το Syncthing φαίνεται να αντιμετωπίζει ένα πρόβλημα με την επεξεργασία του αιτήματός σου. Παρακαλούμε, αν το πρόβλημα συνεχίζει, ανανέωσε την σελίδα ή επανεκκίνησε το 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.": "Τα στατιστικά που έχουν συλλεγεί είναι δημόσια διαθέσιμα στη παρακάτω διεύθυνση.",
-    "The aggregated statistics are publicly available at {%url%}.": "Τα στατιστικά που έχουν συλλεγεί είναι δημόσια διαθέσιμα στο {{url}}.",
    "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 device ID to enter here can be found in the \"Edit > 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 first command line parameter is the folder path and the second parameter is the relative path in the folder.": "Η πρώτη παράμετρος στη γραμμή εντολών είναι το μονοπάτι του φακέλου και η δεύτερη παράμετρος είναι το σχετικό μονοπάτι στο φάκελο.",
    "The folder ID cannot be blank.": "Η ταυτότητα του φακέλου δεν μπορεί να είναι κενή.",
-    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "Η ταυτότητα του φακέλου πρέπει να είναι ένα σύντομο αναγνωριστικό (το πολύ 64 χαρακτήρες). Μπορεί να αποτελείται από γράμματα, αριθμούς, την τελεία (.), την παύλα (-) και την κάτω παύλα (_).",
    "The folder ID must be unique.": "Η ταυτότητα του φακέλου πρέπει να είναι μοναδική.",
    "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 ημέρες, μία έκδοση κάθε ημέρα. Από εκεί και έπειτα μέχρι τη μέγιστη ηλικία, θα τηρείται μια έκδοση κάθε εβδομάδα.",
@@ -219,10 +212,10 @@
    "The rate limit must be a non-negative number (0: no limit)": "Το όριο ταχύτητας πρέπει να είναι ένας μη-αρνητικός αριθμός (0: χωρίς όριο)",
    "The rescan interval must be a non-negative number of seconds.": "Ο χρόνος επανελέγχου για αλλαγές είναι σε δευτερόλεπτα (δηλ. θετικός αριθμός).",
    "They are retried automatically and will be synced when the error is resolved.": "Όταν επιλυθεί το σφάλμα θα κατεβούν και θα συχρονιστούν αυτόματα.",
-    "This Device": "This Device",
+    "This Device": "Αυτή η συσκευή",
    "This can easily give hackers access to read and change any files on your computer.": "Αυτό μπορεί εύκολα να δώσει πρόσβαση ανάγνωσης και επεξεργασίας αρχείων του υπολογιστή σας σε χάκερς.",
-    "This is a major version upgrade.": "Αυτή είναι μιας σημαντική αναβάθμιση.",
-    "Trash Can File Versioning": "Ο κάδος μπορεί να τηρεί εκδόσεις",
+    "This is a major version upgrade.": "Αυτή είναι μια σημαντική αναβάθμιση.",
+    "Trash Can File Versioning": "Τήρηση εκδόσεων κάδου ανακύκλωσης",
    "Unknown": "Άγνωστο",
    "Unshared": "Δε μοιράζεται",
    "Unused": "Δε χρησιμοποιείται",
@@ -237,15 +230,16 @@
    "Version": "Έκδοση",
    "Versions Path": "Φάκελος τήρησης εκδόσεων",
    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Οι παλιές εκδόσεις θα σβήνονται αυτόματα όταν ξεπεράσουν τη μέγιστη ηλικία ή όταν ξεπεραστεί ο μέγιστος αριθμός αρχείων ανά περίοδο.",
-    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Warning, this path is a subdirectory of an existing folder \"{{otherFolder}}\".",
+    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Προσοχή, αυτό το μονοπάτι είναι υποφάκελος του υπάρχοντος φακέλου \"{{otherFolder}}\".",
    "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 must keep at least one version.": "Πρέπει να τηρήσεις τουλάχιστον μια έκδοση.",
    "days": "Μέρες",
+    "directories": "κατάλογοι",
+    "files": "αρχεία",
    "full documentation": "πλήρης τεκμηρίωση",
    "items": "εγγραφές",
    "{%device%} wants to share folder \"{%folder%}\".": "Η συσκευή {{device}} θέλει να μοιράσει τον φάκελο «{{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}})."
+    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "Η συσκευή {{device}} επιθυμεί να διαμοιράσει τον φάκελο \"{{folderlabel}}\" ({{folder}})."
 }
--- a/gui/default/assets/lang/lang-en-GB.json
+++ b/gui/default/assets/lang/lang-en-GB.json
@@ -31,22 +31,21 @@
    "Command": "Command",
    "Comment, when used at the start of a line": "Comment, when used at the start of a line",
    "Compression": "Compression",
+    "Configured": "Configured",
    "Connection Error": "Connection Error",
    "Connection Type": "Connection Type",
    "Copied from elsewhere": "Copied from elsewhere",
    "Copied from original": "Copied from original",
    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 the following Contributors:",
-    "Copyright © 2015 the following Contributors:": "Copyright © 2015 the following Contributors:",
    "Danger!": "Danger!",
-    "Delete": "Delete",
    "Deleted": "Deleted",
    "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 {%device%} ({%address%}) wants to connect. Add new device?": "Device {{device}} ({{address}}) wants to connect. Add new device?",
    "Devices": "Devices",
    "Disconnected": "Disconnected",
+    "Discovered": "Discovered",
    "Discovery": "Discovery",
    "Documentation": "Documentation",
    "Download Rate": "Download Rate",
@@ -58,7 +57,6 @@
    "Editing": "Editing",
    "Enable NAT traversal": "Enable NAT traversal",
    "Enable Relaying": "Enable Relaying",
-    "Enable UPnP": "Enable UPnP",
    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.",
    "Enter ignore patterns, one per line.": "Enter ignore patterns, one per line.",
    "Error": "Error",
@@ -73,7 +71,6 @@
    "Folder": "Folder",
    "Folder ID": "Folder ID",
    "Folder Label": "Folder Label",
-    "Folder Master": "Folder Master",
    "Folder Path": "Folder Path",
    "Folder Type": "Folder Type",
    "Folders": "Folders",
@@ -83,7 +80,6 @@
    "GUI Listen Addresses": "GUI Listen Addresses",
    "Generate": "Generate",
    "Global Discovery": "Global Discovery",
-    "Global Discovery Server": "Global Discovery Server",
    "Global Discovery Servers": "Global Discovery Servers",
    "Global State": "Global State",
    "Help": "Help",
@@ -101,6 +97,7 @@
    "Last Scan": "Last Scan",
    "Last seen": "Last seen",
    "Later": "Later",
+    "Latest Change": "Latest Change",
    "Listeners": "Listeners",
    "Local Discovery": "Local Discovery",
    "Local State": "Local State",
@@ -141,9 +138,7 @@
    "Quick guide to supported patterns": "Quick guide to supported patterns",
    "RAM Utilization": "RAM Utilisation",
    "Random": "Random",
-    "Relay Servers": "Relay Servers",
-    "Relayed via": "Relayed via",
-    "Relays": "Relays",
+    "Reduced by ignore patterns": "Reduced by ignore patterns",
    "Release Notes": "Release Notes",
    "Remote Devices": "Remote Devices",
    "Remove": "Remove",
@@ -161,6 +156,8 @@
    "Scanning": "Scanning",
    "Select the devices to share this folder with.": "Select the devices to share this folder with.",
    "Select the folders to share with this device.": "Select the folders to share with this device.",
+    "Send & Receive": "Send & Receive",
+    "Send Only": "Send Only",
    "Settings": "Settings",
    "Share": "Share",
    "Share Folder": "Share Folder",
@@ -168,7 +165,6 @@
    "Share With Devices": "Share With Devices",
    "Share this folder?": "Share this folder?",
    "Shared With": "Shared With",
-    "Short identifier for the folder. Must be the same on all cluster devices.": "Short identifier for the folder. Must be the same on all cluster devices.",
    "Show ID": "Show ID",
    "Show QR": "Show QR",
    "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.",
@@ -194,16 +190,13 @@
    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.",
    "The Syncthing admin interface is configured to allow remote access without a password.": "The Syncthing admin interface is configured to allow remote access without a password.",
    "The aggregated statistics are publicly available at the URL below.": "The aggregated statistics are publicly available at the URL below.",
-    "The aggregated statistics are publicly available at {%url%}.": "The aggregated statistics are publicly available at {{url}}.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.",
    "The device ID cannot be blank.": "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 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 device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "The device ID to enter here can be found in the \"Edit > 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 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.": "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 first command line parameter is the folder path and the second parameter is the relative path in the folder.": "The first command line parameter is the folder path and the second parameter is the relative path in the folder.",
    "The folder ID cannot be blank.": "The folder ID cannot be blank.",
-    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.",
    "The folder ID must be unique.": "The folder ID must be unique.",
    "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.",
@@ -243,9 +236,10 @@
    "Yes": "Yes",
    "You must keep at least one version.": "You must keep at least one version.",
    "days": "days",
+    "directories": "directories",
+    "files": "files",
    "full documentation": "full documentation",
    "items": "items",
    "{%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}})."
 }
--- a/gui/default/assets/lang/lang-en.json
+++ b/gui/default/assets/lang/lang-en.json
@@ -31,22 +31,21 @@
   "Command": "Command",
   "Comment, when used at the start of a line": "Comment, when used at the start of a line",
   "Compression": "Compression",
+   "Configured": "Configured",
   "Connection Error": "Connection Error",
   "Connection Type": "Connection Type",
   "Copied from elsewhere": "Copied from elsewhere",
   "Copied from original": "Copied from original",
   "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 the following Contributors:",
-   "Copyright © 2015 the following Contributors:": "Copyright © 2015 the following Contributors:",
   "Danger!": "Danger!",
-   "Delete": "Delete",
   "Deleted": "Deleted",
   "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 {%device%} ({%address%}) wants to connect. Add new device?": "Device {{device}} ({{address}}) wants to connect. Add new device?",
   "Devices": "Devices",
   "Disconnected": "Disconnected",
+   "Discovered": "Discovered",
   "Discovery": "Discovery",
   "Documentation": "Documentation",
   "Download Rate": "Download Rate",
@@ -58,7 +57,6 @@
   "Editing": "Editing",
   "Enable NAT traversal": "Enable NAT traversal",
   "Enable Relaying": "Enable Relaying",
-   "Enable UPnP": "Enable UPnP",
   "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.",
   "Enter ignore patterns, one per line.": "Enter ignore patterns, one per line.",
   "Error": "Error",
@@ -73,7 +71,6 @@
   "Folder": "Folder",
   "Folder ID": "Folder ID",
   "Folder Label": "Folder Label",
-   "Folder Master": "Folder Master",
   "Folder Path": "Folder Path",
   "Folder Type": "Folder Type",
   "Folders": "Folders",
@@ -83,7 +80,6 @@
   "GUI Listen Addresses": "GUI Listen Addresses",
   "Generate": "Generate",
   "Global Discovery": "Global Discovery",
-   "Global Discovery Server": "Global Discovery Server",
   "Global Discovery Servers": "Global Discovery Servers",
   "Global State": "Global State",
   "Help": "Help",
@@ -101,6 +97,7 @@
   "Last Scan": "Last Scan",
   "Last seen": "Last seen",
   "Later": "Later",
+   "Latest Change": "Latest Change",
   "Listeners": "Listeners",
   "Local Discovery": "Local Discovery",
   "Local State": "Local State",
@@ -141,9 +138,7 @@
   "Quick guide to supported patterns": "Quick guide to supported patterns",
   "RAM Utilization": "RAM Utilization",
   "Random": "Random",
-   "Relay Servers": "Relay Servers",
-   "Relayed via": "Relayed via",
-   "Relays": "Relays",
+   "Reduced by ignore patterns": "Reduced by ignore patterns",
   "Release Notes": "Release Notes",
   "Remote Devices": "Remote Devices",
   "Remove": "Remove",
@@ -161,6 +156,8 @@
   "Scanning": "Scanning",
   "Select the devices to share this folder with.": "Select the devices to share this folder with.",
   "Select the folders to share with this device.": "Select the folders to share with this device.",
+   "Send \u0026 Receive": "Send \u0026 Receive",
+   "Send Only": "Send Only",
   "Settings": "Settings",
   "Share": "Share",
   "Share Folder": "Share Folder",
@@ -168,7 +165,6 @@
   "Share With Devices": "Share With Devices",
   "Share this folder?": "Share this folder?",
   "Shared With": "Shared With",
-   "Short identifier for the folder. Must be the same on all cluster devices.": "Short identifier for the folder. Must be the same on all cluster devices.",
   "Show ID": "Show ID",
   "Show QR": "Show QR",
   "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.",
@@ -194,16 +190,13 @@
   "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.",
   "The Syncthing admin interface is configured to allow remote access without a password.": "The Syncthing admin interface is configured to allow remote access without a password.",
   "The aggregated statistics are publicly available at the URL below.": "The aggregated statistics are publicly available at the URL below.",
-   "The aggregated statistics are publicly available at {%url%}.": "The aggregated statistics are publicly available at {{url}}.",
   "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.",
   "The device ID cannot be blank.": "The device ID cannot be blank.",
   "The device ID to enter here can be found in the \"Actions \u003e Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "The device ID to enter here can be found in the \"Actions \u003e Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).",
-   "The device ID to enter here can be found in the \"Edit \u003e Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "The device ID to enter here can be found in the \"Edit \u003e 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 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.": "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 first command line parameter is the folder path and the second parameter is the relative path in the folder.": "The first command line parameter is the folder path and the second parameter is the relative path in the folder.",
   "The folder ID cannot be blank.": "The folder ID cannot be blank.",
-   "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.",
   "The folder ID must be unique.": "The folder ID must be unique.",
   "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.",
@@ -243,9 +236,10 @@
   "Yes": "Yes",
   "You must keep at least one version.": "You must keep at least one version.",
   "days": "days",
+   "directories": "directories",
+   "files": "files",
   "full documentation": "full documentation",
   "items": "items",
   "{%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}})."
 }
--- a/gui/default/assets/lang/lang-es-ES.json
+++ b/gui/default/assets/lang/lang-es-ES.json
@@ -6,9 +6,9 @@
    "About": "Acerca de",
    "Actions": "Acciones",
    "Add": "Agregar",
-    "Add Device": "Agregar Dispositivo",
+    "Add Device": "Agregar el dispositivo",
    "Add Folder": "Agregar Carpeta",
-    "Add Remote Device": "Añadir Dispositivo Remoto",
+    "Add Remote Device": "Añadir un dispositivo",
    "Add new folder?": "¿Agregar una carpeta nueva?",
    "Address": "Dirección",
    "Addresses": "Direcciones",
@@ -23,7 +23,7 @@
    "Any devices configured on an introducer device will be added to this device as well.": "Cualquier dispositivo configurado en un dispositivo de introducción será añadido también.",
    "Automatic upgrades": "Actualizaciones automáticas",
    "Be careful!": "¡Ten cuidado!",
-    "Bugs": "Errores (bugs)",
+    "Bugs": "Errores",
    "CPU Utilization": "Uso de CPU",
    "Changelog": "Registro de cambios",
    "Clean out after": "Limpiar tras",
@@ -31,34 +31,32 @@
    "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",
    "Connection Error": "Error de conexión",
-    "Connection Type": "Connection Type",
+    "Connection Type": "Tipo de conexión",
    "Copied from elsewhere": "Copiado de otro sitio",
    "Copied from original": "Copiado del original",
    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 los siguientes Colaboradores:",
-    "Copyright © 2015 the following Contributors:": "Copyright © 2015 los siguientes Colaboradores:",
    "Danger!": "¡Peligro!",
-    "Delete": "Eliminar",
    "Deleted": "Eliminado",
    "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 {%device%} ({%address%}) wants to connect. Add new device?": "El dispositivo {{device}} ({{address}}) quiere conectarse. ¿Agregar el dispositivo?",
    "Devices": "Dispositivos",
    "Disconnected": "Desconectado",
+    "Discovered": "Descubierto",
    "Discovery": "Descubrimiento",
    "Documentation": "Documentación",
    "Download Rate": "Velocidad de descarga",
    "Downloaded": "Descargado",
    "Downloading": "Descargando",
    "Edit": "Editar",
-    "Edit Device": "Editar dispositivo",
-    "Edit Folder": "Editar repositorio",
+    "Edit Device": "Editar Dispositivo",
+    "Edit Folder": "Editar Carpeta",
    "Editing": "Editando",
    "Enable NAT traversal": "Permitir NAT transversal",
    "Enable Relaying": "Habilitar Retransmisión",
-    "Enable UPnP": "Habilitar UPnP",
    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Introduzca las direcciones, separadas por comas (\"tcp://ip:port\", \"tcp://host:port\"), o \"dynamic\" para llevar a cabo el descubrimiento automático de la dirección.",
    "Enter ignore patterns, one per line.": "Introducir patrones a ignorar, uno por línea.",
    "Error": "Error",
@@ -73,9 +71,8 @@
    "Folder": "Carpeta",
    "Folder ID": "ID de carpeta",
    "Folder Label": "Etiqueta de la Carpeta",
-    "Folder Master": "Carpeta principal",
    "Folder Path": "Ruta de la carpeta",
-    "Folder Type": "Folder Type",
+    "Folder Type": "Tipo de carpeta",
    "Folders": "Carpetas",
    "GUI": "GUI",
    "GUI Authentication Password": "Password de la Interfaz Gráfica de Usuario (GUI)",
@@ -83,7 +80,6 @@
    "GUI Listen Addresses": "Direcciones de escucha de la Interfaz Gráfica de Usuario (GUI)",
    "Generate": "Generar",
    "Global Discovery": "Descubrimiento global",
-    "Global Discovery Server": "Servidor de descubrimiento global",
    "Global Discovery Servers": "Servidores Globales de Descubrimiento",
    "Global State": "Estado global",
    "Help": "Ayuda",
@@ -97,16 +93,17 @@
    "Inversion of the given condition (i.e. do not exclude)": "Inversión de la condición dada (por ejemplo, \"no excluir\")",
    "Keep Versions": "Mantener versiones",
    "Largest First": "Más grande primero",
-    "Last File Received": "Último fichero recibido",
-    "Last Scan": "Last Scan",
+    "Last File Received": "Última actualización",
+    "Last Scan": "Último escaneo",
    "Last seen": "Visto por última vez",
    "Later": "Más tarde",
-    "Listeners": "Listeners",
+    "Latest Change": "Último Cambio",
+    "Listeners": "Oyentes",
    "Local Discovery": "Descubrimiento local",
    "Local State": "Estado local",
    "Local State (Total)": "Estado Local (Total)",
    "Major Upgrade": "Actualización importante",
-    "Master": "Master",
+    "Master": "Maestro",
    "Maximum Age": "Edad máxima",
    "Metadata Only": "Sólo metadatos",
    "Minimum Free Disk Space": "Espacio mínimo libre en disco",
@@ -141,11 +138,9 @@
    "Quick guide to supported patterns": "Guía rápida de patrones soportados",
    "RAM Utilization": "Uso de RAM",
    "Random": "Aleatorio",
-    "Relay Servers": "Servidores de Retransmisión",
-    "Relayed via": "Respaldada a través",
-    "Relays": "Respaldos",
+    "Reduced by ignore patterns": "Reducido por patrones de ignorar",
    "Release Notes": "Notas de la versión",
-    "Remote Devices": "Dispositivos Remotos",
+    "Remote Devices": "Otros dispositivos",
    "Remove": "Eliminar",
    "Required identifier for the folder. Must be the same on all cluster devices.": "Identificador requerido para la carpeta. Debe ser el mismo en todos los dispositivos del clúster.",
    "Rescan": "Volver a analizar",
@@ -161,6 +156,8 @@
    "Scanning": "Analizando",
    "Select the devices to share this folder with.": "Selecciona los dispositivos con los que compartir esta carpeta.",
    "Select the folders to share with this device.": "Selecciona las carpetas para compartir con este dispositivo.",
+    "Send & Receive": "Enviar y Recibir",
+    "Send Only": "Solo Enviar",
    "Settings": "Ajustes",
    "Share": "Compartir",
    "Share Folder": "Compartir carpeta",
@@ -168,7 +165,6 @@
    "Share With Devices": "Compartir con dispositivos",
    "Share this folder?": "¿Deseas compartir esta carpeta?",
    "Shared With": "Compartir con",
-    "Short identifier for the folder. Must be the same on all cluster devices.": "Identificador corto para la carpeta. Debe ser el mismo en todos los dispositivos del grupo (cluster).",
    "Show ID": "Mostrar ID",
    "Show QR": "Mostrar QR",
    "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.",
@@ -183,7 +179,7 @@
    "Start Browser": "Iniciar el navegador",
    "Statistics": "Estadísticas",
    "Stopped": "Detenido",
-    "Support": "Soporte",
+    "Support": "Forum",
    "Sync Protocol Listen Addresses": "Direcciones de escucha del protocolo de sincronización",
    "Syncing": "Sincronizando",
    "Syncthing has been shut down.": "Syncthing se ha detenido.",
@@ -193,21 +189,18 @@
    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing parece no estar activo o hay un problema con tu conexión de internet. Reintentando...",
    "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.",
    "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.": "The aggregated statistics are publicly available at the URL below.",
-    "The aggregated statistics are publicly available at {%url%}.": "Las estadísticas agregadas están disponibles públicamente en {{url}}.",
+    "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 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).",
-    "The device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "La ID del dispositivo que hay que introducir aquí puede encontrarse en el menú \"Editar > Mostrar ID\" en el otro dispositivo. Los espacios y barras son opcionales (ignorados).",
    "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.": "El informe encriptado de uso se envía diariamente. Se usa para rastrear plataformas comunes, tamaños de carpetas y versiones de la aplicación. Si el conjunto de datos enviados en el informes se cambia, se le pedirá a usted autorización de nuevo.",
    "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 first command line parameter is the folder path and the second parameter is the relative path in the folder.": "El primer parámetro del comando es la ruta de la carpeta y el segundo es la ruta relativa en la carpeta.",
    "The folder ID cannot be blank.": "La ID de la carpeta no puede estar vacía.",
-    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "La ID de la carpeta debe ser un identificador corto (64 caracteres o menos) y debe estar formado únicamente por letras, números y los símbolos punto (.), guión (-) y guión bajo (_).",
    "The folder ID must be unique.": "La ID de la carpeta debe ser única.",
    "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 artículos no pueden ser sincronizados.",
+    "The following items could not be synchronized.": "Los siguientes elementos no pueden ser sincronizados.",
    "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 minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "El porcentaje de espacio libre mínimo debe ser un número no negativo entre 0 y 100 (ambos inclusive).",
@@ -243,9 +236,10 @@
    "Yes": "Si",
    "You must keep at least one version.": "Debes mantener al menos una versión.",
    "days": "días",
+    "directories": "directorios",
+    "files": "archivos",
    "full documentation": "Documentación completa",
    "items": "Elementos",
    "{%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}})."
 }
--- a/gui/default/assets/lang/lang-es.json
+++ b/gui/default/assets/lang/lang-es.json
@@ -8,19 +8,19 @@
    "Add": "Agregar",
    "Add Device": "Agregar Dispositivo",
    "Add Folder": "Agregar Repositorio",
-    "Add Remote Device": "Agregar Dispositivo Remoto",
+    "Add Remote Device": "Añadir un dispositivo",
    "Add new folder?": "¿Agregar nueva carpeta?",
    "Address": "Dirección",
    "Addresses": "Direcciones",
    "Advanced": "Avanzada",
    "Advanced Configuration": "Configuración avanzada",
-    "Advanced settings": "Configuración avanzada",
+    "Advanced settings": "Optiones avanzadas",
    "All Data": "Todos los datos",
    "Allow Anonymous Usage Reporting?": "Permitir reporte anónimo de uso?",
    "Alphabetic": "Alfabético",
    "An external command handles the versioning. It has to remove the file from the synced folder.": "Un comando exterior maneja el control de versiones. Éste tiene que eliminar el archivo de la carpeta sincronizada.",
    "Anonymous Usage Reporting": "Reporte anónimo de uso",
-    "Any devices configured on an introducer device will be added to this device as well.": "Cualquier dispositivo configurado en un dispositivo introductor será también agregado a este dispositivo.",
+    "Any devices configured on an introducer device will be added to this device as well.": "Cualquier dispositivo configurado en un dispositivo introductor será también agregado a tu propio dispositivo.",
    "Automatic upgrades": "Actualizaciones automáticas",
    "Be careful!": "¡Sé cuidadoso!",
    "Bugs": "Errores",
@@ -31,35 +31,33 @@
    "Command": "Comando",
    "Comment, when used at the start of a line": "Comentario, cuando es utilizado al inicio de una línea.",
    "Compression": "Compresión",
+    "Configured": "Configurado",
    "Connection Error": "Error de conexión",
-    "Connection Type": "Connection Type",
+    "Connection Type": "Tipo de conexión",
    "Copied from elsewhere": "Copiado desde otra parte.",
    "Copied from original": "Copiado del original",
    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 los siguientes contribuidores:",
-    "Copyright © 2015 the following Contributors:": "Derechos de autor © 2015 los siguientes colaboradores:",
    "Danger!": "Peligro!",
-    "Delete": "Suprimir",
    "Deleted": "Suprimido",
-    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Device \"{{name}}\" ({{device}} at {{address}}) wants to connect. Add new device?",
+    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Dispositivo \"{{name}}\" ({{device}} en {{address}}) quiere conectar. ¿Añadir nuevo dispositivo?",
    "Device ID": "ID del dispositivo",
    "Device Identification": "Identificación del dispositivo",
    "Device Name": "Nombre del dispositivo",
-    "Device {%device%} ({%address%}) wants to connect. Add new device?": "El dispositivo {{device}} ({{address}}) se quiere conectar. ¿Agregar nuevo dispositivo?",
    "Devices": "Dispositivos",
    "Disconnected": "Desconectado",
+    "Discovered": "Descubierto",
    "Discovery": "Búsqueda",
    "Documentation": "Documentación",
    "Download Rate": "Tasa de descarga",
    "Downloaded": "Descargado",
    "Downloading": "Descargando",
    "Edit": "Editar",
-    "Edit Device": "Editar dispositivo",
-    "Edit Folder": "Editar repositorio",
+    "Edit Device": "Cambiando dispositivo",
+    "Edit Folder": "Cambiando repositorio",
    "Editing": "Editando",
-    "Enable NAT traversal": "Enable NAT traversal",
-    "Enable Relaying": "Enable Relaying",
-    "Enable UPnP": "Permitir UPnP",
-    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.",
+    "Enable NAT traversal": "Habilitar NAT trasversal",
+    "Enable Relaying": "Habilitar Retransmisión",
+    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Introduce las direcciones (\"tcp://ip:puerto\", \"tcp://huésped:puerto\") separadas por comas, o \"dynamic\" para ejecutar un descubrimiento automático de la dirección. ",
    "Enter ignore patterns, one per line.": "Añadir patrones de exclusión, uno por línea.",
    "Error": "Error",
    "External File Versioning": "Control de versiones externo",
@@ -67,15 +65,14 @@
    "File Pull Order": "Orden para coger ficheros",
    "File Versioning": "Control de versiones",
    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Los permisos de archivo son ignorados al buscar cambios. Usar el sistemas de archivos FAT.",
-    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Los archivos son movidos al directorio .stversions cuando son reemplazados o eliminados por Syncthing.",
-    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Lo archivos son movidos al directorio .stversions y renombrados a versiones marcadas por fecha cuando son reemplazados o eliminados por Syncthing,",
+    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Los archivos son movidos al directorio .stversions cuando son reemplazados o eliminados por Syncthing. Sus caminos de accesos relativos son recreados aquí si necesidad. ",
+    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Lo archivos son movidos al directorio .stversions y renombrados a versiones marcadas por fecha cuando son reemplazados o eliminados por Syncthing, Sus caminos de accesos relativos son recreados aquí si necesidad.",
    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Los archivos están protegidos frente a los cambios realizados en otros dispositivos, peros los cambios realizados en este dispositivo serán envíados al resto del grupo",
-    "Folder": "Carpeta",
+    "Folder": "Repositorio",
    "Folder ID": "ID del repositorio",
-    "Folder Label": "Folder Label",
-    "Folder Master": "Repositorio maestro",
+    "Folder Label": "Etiqueta de Carpeta",
    "Folder Path": "Ruta del repositorio",
-    "Folder Type": "Folder Type",
+    "Folder Type": "Tipo de Carpeta",
    "Folders": "Repositorios",
    "GUI": "GUI",
    "GUI Authentication Password": "Contraseña de autenticación de la GUI",
@@ -83,8 +80,7 @@
    "GUI Listen Addresses": "Direcciones de escucha para la GUI.",
    "Generate": "Generar",
    "Global Discovery": "Búsqueda en internet",
-    "Global Discovery Server": "Servidor global de identificación",
-    "Global Discovery Servers": "Global Discovery Servers",
+    "Global Discovery Servers": "Servidores globales de identificación",
    "Global State": "Estado global",
    "Help": "Ayuda",
    "Home page": "Pagina de inicio",
@@ -93,20 +89,21 @@
    "Ignore Permissions": "Ignorar permisos",
    "Incoming Rate Limit (KiB/s)": "Límite de velocidad de entrada (KiB/s)",
    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Configuración incorrecta puede dañar los contenidos de la carpeta y hacer Syncthing inoperable.",
-    "Introducer": "Introductor",
+    "Introducer": "Dispositivo introductor",
    "Inversion of the given condition (i.e. do not exclude)": "Inversión de la condición dada (es decir, no excluir)",
    "Keep Versions": "Conservar versiones",
    "Largest First": "Más grande primero",
-    "Last File Received": "Último archivo recibido",
-    "Last Scan": "Last Scan",
+    "Last File Received": "Última actualización",
+    "Last Scan": "Último escaneo",
    "Last seen": "Visto por ultima vez",
    "Later": "Más tarde",
-    "Listeners": "Listeners",
+    "Latest Change": "Último cambio",
+    "Listeners": "Receptor",
    "Local Discovery": "Búsqueda en red local",
    "Local State": "Estado local",
    "Local State (Total)": "Estado local (total)",
    "Major Upgrade": "Actualización mayor",
-    "Master": "Master",
+    "Master": "Maestro",
    "Maximum Age": "Edad máxima",
    "Metadata Only": "Sólo metadatos",
    "Minimum Free Disk Space": "Espacio mínimo libre en disco",
@@ -123,7 +120,7 @@
    "OK": "OK",
    "Off": "Apagado",
    "Oldest First": "Antiguo primero",
-    "Optional descriptive label for the folder. Can be different on each device.": "Optional descriptive label for the folder. Can be different on each device.",
+    "Optional descriptive label for the folder. Can be different on each device.": "Etiqueta descriptiva opcional para la carpeta. Puede ser diferente en cada dispositivo.",
    "Options": "Opciones",
    "Out of Sync": "Fuera de sincronización",
    "Out of Sync Items": "Ítems no sincronizados",
@@ -134,20 +131,18 @@
    "Pause": "Pausa",
    "Paused": "En pausa",
    "Please consult the release notes before performing a major upgrade.": "Por favor consulta las notas de lanzamiento antes de realizar una actualizacón mayor.",
-    "Please set a GUI Authentication User and Password in the Settings dialog.": "Please set a GUI Authentication User and Password in the Settings dialog.",
+    "Please set a GUI Authentication User and Password in the Settings dialog.": "Por favor, establece un Usuario y Contraseña de Autenticación en la GUI en el diálogo de Configuración",
    "Please wait": "Aguarde por favor",
    "Preview": "Vista previa",
    "Preview Usage Report": "Ver reporte de uso",
    "Quick guide to supported patterns": "Guía rápida sobre los patrones soportados",
    "RAM Utilization": "Utilización de RAM",
    "Random": "Aleatorio",
-    "Relay Servers": "Relay Servers",
-    "Relayed via": "retransmitida vía",
-    "Relays": "Retransmisores",
+    "Reduced by ignore patterns": "(Restringido por patrones de exclusión)",
    "Release Notes": "Notas de lanzamiento",
-    "Remote Devices": "Dispositivos Remotos",
+    "Remote Devices": "Otros dispositivos",
    "Remove": "Eliminar",
-    "Required identifier for the folder. Must be the same on all cluster devices.": "Required identifier for the folder. Must be the same on all cluster devices.",
+    "Required identifier for the folder. Must be the same on all cluster devices.": "Identificación requerida para la carpeta. Debe ser la misma en todos los dispositivos del grupo.",
    "Rescan": "Reescanear",
    "Rescan All": "Reescanear todo",
    "Rescan Interval": "Intervalo de reescaneo",
@@ -161,6 +156,8 @@
    "Scanning": "Actualización",
    "Select the devices to share this folder with.": "Seleccione los dispositivos con los cuales compartir este repositorio.",
    "Select the folders to share with this device.": "Seleccione los repositorios para compartir con este dispositivo.",
+    "Send & Receive": "Send & Receive",
+    "Send Only": "Send Only",
    "Settings": "Configuración",
    "Share": "Compartir",
    "Share Folder": "Compartir repositorio",
@@ -168,11 +165,10 @@
    "Share With Devices": "Compartir con los dispositivos",
    "Share this folder?": "¿Compartir este repositorio?",
    "Shared With": "Compartido con",
-    "Short identifier for the folder. Must be the same on all cluster devices.": "Identificador corto para el repositorio. Debe ser el mismo en todos los dispositivos del grupo.",
    "Show ID": "Mostrar ID",
    "Show QR": "Mostrar QR",
-    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Mostrado en lugar de la ID del dispositivo en el estado del grupo. Será sugerido a otros dispositivos como nombre predeterminado opcional.",
-    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Mostrado en lugar de la ID del dispositivo en el estado del grupo. Si se deja en blanco, será usado el nombre sugerido por el dispositivo.",
+    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Mostrado en lugar de la ID del dispositivo en el estado del grupo. Será sugerido a otros dispositivos como nombre fácil de usar predeterminado opcional.",
+    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Mostrado en lugar de la ID del dispositivo en el estado del grupo. Si se deja en blanco, será llenado por el nombre fácil de usar sugerido por el dispositivo.",
    "Shutdown": "Apagar",
    "Shutdown Complete": "Apagado completado",
    "Simple File Versioning": "Versiones simple de archivos",
@@ -183,7 +179,7 @@
    "Start Browser": "Iniciar navegador",
    "Statistics": "Estadísticas",
    "Stopped": "Parado",
-    "Support": "Soporte",
+    "Support": "Forum",
    "Sync Protocol Listen Addresses": "Dirección de escucha del protocolo de sincronización",
    "Syncing": "Sincronización",
    "Syncthing has been shut down.": "La sincronización esta apagada",
@@ -193,24 +189,21 @@
    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing parece estar apagado, o hay un problema con su conexión de Internet. Reintentando...",
    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing parece estar experimentando un problema al procesar su solicitud. Por favor, recargue el navegador o reinicie Syncthing si el problema persiste.",
    "The Syncthing admin interface is configured to allow remote access without a password.": "La interfaz administrativa del Syncthing está configurada para permitir acceso remoto sin una contraseña.",
-    "The aggregated statistics are publicly available at the URL below.": "The aggregated statistics are publicly available at the URL below.",
-    "The aggregated statistics are publicly available at {%url%}.": "Las estadísticas acumuladas están disponibles públicamente en {{url}}.",
+    "The aggregated statistics are publicly available at the URL below.": "Las estadísticas agregadas están disponibles públicamente en la dirección de abajo.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "La configuración ha sido guardada pero no activada.\nSyncthing debe reiniciarse para activar la nueva configuración.",
    "The device ID cannot be blank.": "La ID del dispositivo no puede estar en blanco.",
-    "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 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 device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "La ID del dispositivo a introducir se puede encontrar en la opción de menú \"Edición > Mostrar ID\" en el otro dispositivo. Espacios y guiones son opcionales (ignorados).",
+    "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).": "La ID de dispositivo a introducir ser puede encontrar en el menú \"Acciones > Mostrar ID\" en el otro dispositivo. Espacios y guiones son opcionales (ignorados). ",
    "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.": "El informe de uso se envía encriptado diariamente. Se utiliza para hacer un seguimiento de plataformas comunes, tamaño de repositorios y versiones de la aplicación. Si el conjunto de datos cambia será notificado mediante este dialogo nuevamente.",
    "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 es válida. Debe ser una cadena de 52 o 56 caracteres consistente en letras y números, con espacios y guiones opcionales.",
    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "El primer argumento es la ruta de la carpeta y el segundo argumento es la ruta relativa de esta carpeta.",
    "The folder ID cannot be blank.": "La ID del repositorio no puede estar en blanco.",
-    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "La ID del repositorio debe ser un identificador corto (64 caracteres o menos) consistente solamente en letras, números, punto (.), guion (-) y guion bajo (_).",
    "The folder ID must be unique.": "La ID del repositorio debe ser única.",
    "The folder path cannot be blank.": "La ruta del repositorio no puede estar vacía.",
    "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.": "Los siguientes intervalos se utilizan: para la primera hora una versión se mantiene cada 30 segundos, para el primer día de una versión se mantiene cada hora, durante los primeros 30 días de la versión se mantiene todos los días, hasta que la edad máxima de una versión se mantiene cada semana.",
    "The following items could not be synchronized.": "Los siguientes artículos no pueden ser sincronizados.",
    "The maximum age must be a number and cannot be blank.": "La edad máxima debe ser un número y no puede estar en blanco.",
    "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, establece en 0 para mantener versiones para siempre).",
-    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).",
+    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "El porcentaje de espacio libre en disco mínimo debe ser un número no negativo entre 0 y 100 (incluidos).",
    "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 vacío.",
    "The number of days to keep files in the trash can. Zero means forever.": "El tiempo máximo para mantener un archivo en el cubo de basura (en días, establece en 0 para mantener versiones para siempre).",
    "The number of old versions to keep, per file.": "El numero de versiones anteriores a conservar, por archivo.",
@@ -243,9 +236,10 @@
    "Yes": "Sí",
    "You must keep at least one version.": "Debe mantener al menos una versión",
    "days": "días",
+    "directories": "directorios",
+    "files": "archivos",
    "full documentation": "documentación completa",
    "items": "ítems",
    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} quiere compartir repositorio \"{{folder}}\".",
-    "{%device%} wants to share folder \"{%folderLabel%}\" ({%folder%}).": "{{device}} qiuere compartir el repositorio \"{{folderLabel}}\" ({{folder}}).",
-    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} wants to share folder \"{{folderlabel}}\" ({{folder}})."
+    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} quiere compartir la carpeta \"{{folderlabel}}\" ({{folder}})."
 }
--- a/gui/default/assets/lang/lang-eu.json
+++ b/gui/default/assets/lang/lang-eu.json
@@ -0,0 +1,245 @@
+{
+    "A device with that ID is already added.": "Id horrekin beste talde bat gehitu da.",
+    "A negative number of days doesn't make sense.": "Hemen 0 edo zenbaki positiboa ,mesedez.",
+    "A new major version may not be compatible with previous versions.": "Aldaketa garrantzitsuak dituen bertsio berria beharbada ez da bateragarria izango bertsio zaharragoekin.",
+    "API Key": "API giltza",
+    "About": "Egoki",
+    "Actions": "Egintzak",
+    "Add": "Gaineratu",
+    "Add Device": "Gaineratu makina",
+    "Add Folder": "Gaineratu partekatze",
+    "Add Remote Device": "Gaineratu makinan izan",
+    "Add new folder?": "Gaineratu hau partekatze ?",
+    "Address": "Helbide",
+    "Addresses": "Helbidek",
+    "Advanced": "Aditu",
+    "Advanced Configuration": "Konfigurazio aintzinatua",
+    "Advanced settings": "Ezarpen aurreratuak",
+    "All Data": "Datu guziak",
+    "Allow Anonymous Usage Reporting?": "Izenik gabeko erabiltze erreportak baimendu",
+    "Alphabetic": "Alfabetikoa",
+    "An external command handles the versioning. It has to remove the file from the synced folder.": "Kanpoko kontrolagailu batek bertsioak erabiltzen ditu. Fitxeroak errepertorio sinkronizatutik desagertaraztea berari doakio.",
+    "Anonymous Usage Reporting": "Izenik gabeko erabiltze erreportak",
+    "Any devices configured on an introducer device will be added to this device as well.": "Sarrarazle batean sartua izanen edozein tresna dena huntan ere izanen da.",
+    "Automatic upgrades": "Aktualizatze automatikoak",
+    "Be careful!": "Kasu!",
+    "Bugs": "Akatsek",
+    "CPU Utilization": "Prozesadore erabiltze",
+    "Changelog": "Bertsio historia",
+    "Clean out after": "Garbi …. epearen ondotik",
+    "Close": "Ezeztatu",
+    "Command": "Kontrolagailua",
+    "Comment, when used at the start of a line": "Komentarioa, lerro baten hastean delarik",
+    "Compression": "Trinkotze",
+    "Configured": "Konfiguratua",
+    "Connection Error": "Konexio hutsa",
+    "Connection Type": "Konexion mota",
+    "Copied from elsewhere": "Beste nunbaitik kopiatua",
+    "Copied from original": "Kopiatua jatorrizkoatik",
+    "Copyright © 2014-2016 the following Contributors:": "Copyright 2014-2016, ekarle hauk:",
+    "Danger!": "Lanjer !",
+    "Deleted": "Ezeztatu",
+    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Makina \"{{name}}\" ({{device}} izan {{address}}) konektatu nahi du. Gaineratu berri makina ?",
+    "Device ID": "Makina ID",
+    "Device Identification": "Tresnaren identifikazioa",
+    "Device Name": "Makina izen",
+    "Devices": "Makinak",
+    "Disconnected": "Desloturik",
+    "Discovered": "Ziloa",
+    "Discovery": "Aurkikuntza",
+    "Documentation": "Dokumentazio",
+    "Download Rate": "Deskargatze emari",
+    "Downloaded": "Telekargatua",
+    "Downloading": "Deskargatze",
+    "Edit": "Aldatu",
+    "Edit Device": "Aldaketa tresna",
+    "Edit Folder": "Aldaketa partekatze",
+    "Editing": "Aldaketa",
+    "Enable NAT traversal": "Ahalbidetu NAT",
+    "Enable Relaying": "Ahalbidetu lekua hartu",
+    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": " (\"tcp://ip:port\" ou \"tcp://nom:port\") zuzenbideak sar, krakotx batez separatuak edo bestenaz \"dynamic\", zuzenbidearen xekatze automatikoa aktibatzeko\nTu peux traduire nom et port dans la parenthèse, c'est pas des variables du programme, juste du texte explicatif",
+    "Enter ignore patterns, one per line.": "Ezkluzio filtroak sar, lerro batean bakar bat",
+    "Error": "Huts",
+    "External File Versioning": "Fitxero bertsioen kanpoko kudeaketa",
+    "Failed Items": "Fitxategiken huts",
+    "File Pull Order": "Fitxategiak irekitzeko agindua",
+    "File Versioning": "Artxiboak babesteko metodoa",
+    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Aldaketa bilaketetan fitxero baimenen bitak ez dira kontuan hartuko. Fitxero FAT sistimetan erabilia.",
+    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": ".stbersioak azpi karpetan lekutuko dira fitxeroak, Syncthing-ek aldatu edo ezeztatuko dituelarik. Beren helbide errelatiboak hor berean berriz sortuak izanen dira, behar balin bada",
+    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": ".stbersioak azpi karpetan lekutuko eta ordu-markatuko dira fitxeroak, Syncthing-ek aldatu edo ezeztatuko dituelarik. Beren helbide errelatiboak hor berean berriz sortuak izanen dira, behar balin bada",
+    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Beste tresnetan eginak izanen diren aldaketetatik zainduak izanen dira fitxeroak; haatik, tresna huntan egindako aldaketak besteeri hedatuak izanen dira",
+    "Folder": "Partekatze",
+    "Folder ID": "Partekatze ID",
+    "Folder Label": "Partekatze izengoiti",
+    "Folder Path": "Partekatze bidexka",
+    "Folder Type": "Partekatze mota",
+    "Folders": "Partekatzek",
+    "GUI": "Interfaze grafiko",
+    "GUI Authentication Password": "Interfaze grafiko pasahitz",
+    "GUI Authentication User": "Interfaze grafiko erabiltzaile",
+    "GUI Listen Addresses": "Interfaze grafiko helbide",
+    "Generate": "Sortu",
+    "Global Discovery": "Aurkikuntza oso",
+    "Global Discovery Servers": "Aurkikuntza oso zerbitzarik",
+    "Global State": "Oso egoera",
+    "Help": "Aiuta",
+    "Home page": "Errezibitze",
+    "Ignore": "Baztertu",
+    "Ignore Patterns": "Bazterketak arauk",
+    "Ignore Permissions": "Baztertu baimenek",
+    "Incoming Rate Limit (KiB/s)": "Deskargatze emari gehieneko (KiB/s)",
+    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Langer !!!!",
+    "Introducer": "Abiarazle",
+    "Inversion of the given condition (i.e. do not exclude)": "Emana izan den baldintza alderantziz eman (i.e ez baztertu)",
+    "Keep Versions": "Gorde bertsioak",
+    "Largest First": "Handienak lehenik",
+    "Last File Received": " Fitxategi azken eskuratu",
+    "Last Scan": "Azterketa azken",
+    "Last seen": "Azken agerraldia",
+    "Later": "Berantago",
+    "Latest Change": "Asken aldaketa",
+    "Listeners": "Entzungailuak",
+    "Local Discovery": "Lekuko aurkikuntza",
+    "Local State": "Lekuko egoera",
+    "Local State (Total)": "Lekuko egoera (Oso)",
+    "Major Upgrade": "Nagusi eguneratu",
+    "Master": "Nagusi",
+    "Maximum Age": "Goren adin",
+    "Metadata Only": "Metadatuak bakarrik",
+    "Minimum Free Disk Space": "Diskoan leku libre gutxieneko",
+    "Move to top of queue": "Igurikatze zerrenda bururat lekuz alda",
+    "Multi level wildcard (matches multiple directory levels)": "Hein askorentzako jokerra (errepertorio eta azpi errepertorioeri  dagokiona)",
+    "Never": "Sekulan",
+    "New Device": "Berria makina",
+    "New Folder": "Berri partekatze",
+    "Newest First": "Gehien gertatu berri lehen",
+    "No": "Ez",
+    "No File Versioning": "Ez babestu",
+    "Normal": "Normal",
+    "Notice": "Jakinaraztea",
+    "OK": "Ados",
+    "Off": "Desgaitu",
+    "Oldest First": "Gehien zahar lehen",
+    "Optional descriptive label for the folder. Can be different on each device.": "Partikatzearen izen hautuzkoa eta atsegina, zure gisa. Tresna bakotxean desberdina izaiten ahal da.",
+    "Options": "Hautuk",
+    "Out of Sync": "Ez sinkronizatua",
+    "Out of Sync Items": "Ez sinkronizatu elementuak",
+    "Outgoing Rate Limit (KiB/s)": "Bidaltze emari gehieneko (KiB/s)",
+    "Override Changes": "Aldaketak desegin",
+    "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": "Bertako tresnaren karpetari buruzko bidea. Ez balin bada, asmatu beharko da bat. Vous pouvez entrer un chemin absolu (p.ex \"/home/moi/Sync/Exemple\") ou relatif à celui du programme (p.ex \"..\\Partages\\Exemple\" - utile pour installation portable). Tildea (~, edo ~+Espazioa Windows XP+Azerty-n) erabil litzateke bide motz gisa",
+    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Kopiak kontserbatzeko bidea (hutsa utzezazu, .stversioen karpetaren bide ohituan).",
+    "Pause": "Pausa",
+    "Paused": "Geldirik",
+    "Please consult the release notes before performing a major upgrade.": "Aktualizatze garrantzitsu bat egin baino lehen, bertsioaren oharrak begira itzazu.",
+    "Please set a GUI Authentication User and Password in the Settings dialog.": "Konfigurazio leihoan asma itzazu erabiltzale izen bat eta sartzeko giltza bat",
+    "Please wait": "Oraino pazientzia pixka bat har ezazu",
+    "Preview": "Aurrebista",
+    "Preview Usage Report": "Erabiltze aurrebista",
+    "Quick guide to supported patterns": "Filtro ez onartuen txostena",
+    "RAM Utilization": "RAM erabiltze",
+    "Random": "Aleatorio",
+    "Reduced by ignore patterns": "(Mugatu baztertzek patroikez)",
+    "Release Notes": "Bertsioen notak",
+    "Remote Devices": "Besteak makinak",
+    "Remove": "Kendu",
+    "Required identifier for the folder. Must be the same on all cluster devices.": "Partikatzearen erabilzaile izena. Diren tresna guzietan berdin berdina izan behar du",
+    "Rescan": "Berreskanea",
+    "Rescan All": "Berreskanea guzia",
+    "Rescan Interval": "Arte berreskanea",
+    "Restart": "Berriz abiatu",
+    "Restart Needed": "Berriz piztea beharrezkoa",
+    "Restarting": "Berriz piztea martxan",
+    "Resume": "Berriz hasi",
+    "Reused": "Berriz erabilia",
+    "Save": "Begiratu",
+    "Scan Time Remaining": "Gelditzen den denbora azterketa",
+    "Scanning": "Etengabeko azterketa",
+    "Select the devices to share this folder with.": "Honekin sinkronizatua:",
+    "Select the folders to share with this device.": "Tresna hunek erabiltzen dituen banaketak hauta",
+    "Send & Receive": "Igorri & Artu",
+    "Send Only": "Bakarrik igorri",
+    "Settings": "Egokitzek",
+    "Share": "Banatu",
+    "Share Folder": "Banatu",
+    "Share Folders With Device": "Partekatu makinakekin",
+    "Share With Devices": "Partekatuekin makinak",
+    "Share this folder?": "Banatze hau onartzen duzu?",
+    "Shared With": "Partekatuekin",
+    "Show ID": "Erakutsi ene ID",
+    "Show QR": "Erakutsi QR",
+    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Tresnaren ID-aren ordez erakutsia, taldearen egoeran. Beste tresneri erakutsia izanen da, izen erabilgarria bezala",
+    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Tresnaren ID-aren ordez erakutsia, taldearen egoeran. Hutsa utzia balin bada, urrun den tresnak proposatu izenarekin aktualizatua izanen da",
+    "Shutdown": "Utzi",
+    "Shutdown Complete": "Gelditua!",
+    "Simple File Versioning": "Bertsioen segitze sinplifikatuak",
+    "Single level wildcard (matches within a directory only)": "Hein bakar bateko jokerra (karpetaren barnean bakarrik dagokiona)",
+    "Smallest First": "Tipienak lehenik",
+    "Source Code": "Iturri kode",
+    "Staggered File Versioning": "Bertsio eskaleratuak",
+    "Start Browser": "Web nabigatzailea pitz",
+    "Statistics": "Statistikak",
+    "Stopped": "Gelditua!",
+    "Support": "Foroa",
+    "Sync Protocol Listen Addresses": "Sinkronizatu protokoloaren entzun zuzenbideak",
+    "Syncing": "Sinkronizazio joaira",
+    "Syncthing has been shut down.": "Syncthing gelditua izan da",
+    "Syncthing includes the following software or portions thereof:": "Syncthing-ek programa hauk integratzen ditu (edo programa hauetatik datozten elementuak):",
+    "Syncthing is restarting.": "Syncthing berriz pizten ari",
+    "Syncthing is upgrading.": "Syncthing aktualizatzen ari da",
+    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Iduri luke Syncthing gelditua dela, edo bestenaz arrazo bat bada interneten konekzioarekin. Berriz entsea zaitez…",
+    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Iduri luke Syncthing arazo bat duela zure eskaeraren tratatzeko. Otoi, horria freska ezazu edo bestenaz Syncthing berriz pitz arazoak segitzen badu.",
+    "The Syncthing admin interface is configured to allow remote access without a password.": "Syncthing administrazio interfazea pentsatua da urrundikako irisbideak sekretu hitz gabe onartzeko !!!",
+    "The aggregated statistics are publicly available at the URL below.": "Estadistikak zuzen bide honetan publikoki ikusgarri dira",
+    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Konfigurazioa grabatua izan da bainan ez aktibatua. Syncthing berriz piztu behar da konfigurazio berriaren berriz aktibatzeko.",
+    "The device ID cannot be blank.": "Tresnaren ID-a ez da hutsa izaiten ahal.",
+    "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).": "Tresnaren ID-a atxemaiten ahal da \"Ekintza> Tresna urrunduaren \"ID-a erakuts\" menuan. Espazio eta gioiak ez dira beharrezkoak.",
+    "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.": "Erabileraren zifratu txostena egun guziz igorria da. Erabili diren plataformak, banaketeen neurriak eta aplikazioaren bertsioen zerendatzeko balio du.",
+    "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.": "Sartu den tresnaren ID-ak iduri du ez duela balio. 52 edo 56-ko ezaugarriko kadena baten itxura behar luke, hizkiak, zifrak eta baita ere tarte edo gioiez egina",
+    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "Agingailu lerroaren lehen parametroa banatua den karpetaren bidea da, eta bigarrena karpetan den errelatibo bidea",
+    "The folder ID cannot be blank.": "banatzearen ID-a ez da hutsa izaiten ahal",
+    "The folder ID must be unique.": "Banatzearen ID-ak bakarra izan behar du",
+    "The folder path cannot be blank.": "Karpetari buruzko bidea ez da hutsa izaiten ahal",
+    "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.": "Hunako tarteak erabiliak dira: oren bateko denboraldian bertsio bat kontserbatua da 30 segundu guziz. Egun batekoan,bertsio bat egunero. Handik harat, adinaren mugetan egonez, bertsio bat astero.",
+    "The following items could not be synchronized.": "Ondoko fitxero hauk ez dira sinkronizatuak ahal izan",
+    "The maximum age must be a number and cannot be blank.": "Gehieneko adinak zenbaki bat behar du izan eta ez da hutsa izaiten ahal.",
+    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Bertsio baten kontserbatzeko epe haundiena (egunez behar du izan. Jar ezazu zerotan bertsioak betirako atxikitzeko)",
+    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "Diskoaren ehuneko espazioa hutsak zenbaki positibo bat behar du izan, 0 eta 100-en artekoa (100 barne)",
+    "The number of days must be a number and cannot be blank.": "Egunen kopuruak numerikoa izan behar du eta ez da hutsa izaiten ahal",
+    "The number of days to keep files in the trash can. Zero means forever.": "Zikin ontziko elgar hizketen kontserbatzeko egun kopurua. Beti 0 erran nahi du.",
+    "The number of old versions to keep, per file.": "Atxikitzeko diren lehenagoko bertsio kopurua,fitxero bakotxarentzat",
+    "The number of versions must be a number and cannot be blank.": "Bertsio kopuruak numerikoa behar du izan eta ez da hutsa izaiten ahal",
+    "The path cannot be blank.": "Bidea ez da hutsa izaiten ahal",
+    "The rate limit must be a non-negative number (0: no limit)": "Ixuriaren neurria ez da negatiboa izaiten ahal (0 = mugarik gabekoa)",
+    "The rescan interval must be a non-negative number of seconds.": "Ikerketaren tartea ez da segundu kopuru negatiboa izaiten ahal",
+    "They are retried automatically and will be synced when the error is resolved.": "Akatsa zuzendua izanen delarik, automatikoki berriz entseatuak et sinkronizatuak izanen dira",
+    "This Device": "Makina hau",
+    "This can easily give hackers access to read and change any files on your computer.": "Hunek errexki irakurtzen eta aldatzen uzten ahal du zure ordenagailuko edozein fitxero, nahiz eta sartu denak ez haizu!",
+    "This is a major version upgrade.": "Aktualizatze garrantzitsu bat da",
+    "Trash Can File Versioning": "Zakarrontzia",
+    "Unknown": "Ez ezaguna",
+    "Unshared": "Partekatu ez den",
+    "Unused": "Ez baliatua",
+    "Up to Date": "Egun",
+    "Updated": "Berritu",
+    "Upgrade": "Aktualizatu",
+    "Upgrade To {%version%}": "Egunetaratzea {{version}}-i buruz",
+    "Upgrading": "Syncthing-en egunetaratzea",
+    "Upload Rate": "Bidaltze emari",
+    "Uptime": "Denbora ibiltze",
+    "Use HTTPS for GUI": "HTTPS-a erabil GUI-arentzat",
+    "Version": "Bertsio",
+    "Versions Path": "Bertsioen egon tokia",
+    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Bertsioak automatikoki ezeztatuak izanen dira, kontserbatzeko iraupen denbora pasatua badute edo bitartean onartua den kopurua gainditua balin bada",
+    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Kasu emazu, \"{{otherFolder}}\" banaketa azpi-karpetaren bidea da. Arazoak emaiten ahal ditu, fitxero batzuen ezeztatze edo duplikatzeak batez ere.",
+    "When adding a new device, keep in mind that this device must be added on the other side too.": "Tresna bat gehitzen duzularik, gogoan atxik ezazu zurea bestaldean gehitu behar dela ere",
+    "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.": "Tresna bat gehitzen delarik, gogoan atxik ezazu bere IDa erabilia dela errepertorioak lotzeko tresnen bitartez. ID-a hautskorra da eta banatze huntan parte hartzen duten tresna guzietan berdina izanen da",
+    "Yes": "Bai",
+    "You must keep at least one version.": "Bertsio bat bederen behar duzu atxiki",
+    "days": "Egunak",
+    "directories": "karpetak",
+    "files": "fitxategik",
+    "full documentation": "Dokumentazio osoa",
+    "items": "Elementuak",
+    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} banaketa \"{{folder}}\" gomitatzen zaitu.",
+    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}}  \"{{folderlabel}}\" ({{folder}}) gomitatzen zaitu."
+}
--- a/gui/default/assets/lang/lang-fi.json
+++ b/gui/default/assets/lang/lang-fi.json
@@ -8,16 +8,16 @@
    "Add": "Lisää",
    "Add Device": "Lisää laite",
    "Add Folder": "Lisää kansio",
-    "Add Remote Device": "Add Remote Device",
+    "Add Remote Device": "Lisää laite",
    "Add new folder?": "Lisää uusi kansio?",
    "Address": "Osoite",
    "Addresses": "Osoitteet",
-    "Advanced": "Advanced",
-    "Advanced Configuration": "Advanced Configuration",
-    "Advanced settings": "Advanced settings",
+    "Advanced": "Lisäasetukset",
+    "Advanced Configuration": "Kehittyneet asetukset",
+    "Advanced settings": "Kehittyneet asetukset",
    "All Data": "Kaikki data",
    "Allow Anonymous Usage Reporting?": "Salli anonyymi käyttöraportointi?",
-    "Alphabetic": "Alphabetic",
+    "Alphabetic": "Aakkosellinen",
    "An external command handles the versioning. It has to remove the file from the synced folder.": "Ulkoinen komento hallitsee versionnin. Sen täytyy poistaa tiedosto synkronoidusta kansiosta.",
    "Anonymous Usage Reporting": "Anonyymi käyttöraportointi",
    "Any devices configured on an introducer device will be added to this device as well.": "Kaikki esittelijäksi määritetyn laitteen tuntemat laitteet lisätään myös tähän laitteeseen.",
@@ -26,27 +26,26 @@
    "Bugs": "Bugit",
    "CPU Utilization": "CPU:n käyttö",
    "Changelog": "Muutoshistoria",
-    "Clean out after": "Clean out after",
+    "Clean out after": "Puhdista seuraavan ajan kuluttua",
    "Close": "Sulje",
    "Command": "Komento",
    "Comment, when used at the start of a line": "Kommentti, käytettäessä rivin alussa",
    "Compression": "Pakkaus",
+    "Configured": "Konfiguroitu",
    "Connection Error": "Yhteysvirhe",
-    "Connection Type": "Connection Type",
+    "Connection Type": "Yhteyden tyyppi",
    "Copied from elsewhere": "Kopioitu muualta",
    "Copied from original": "Kopioitu alkuperäisestä lähteestä",
-    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 the following Contributors:",
-    "Copyright © 2015 the following Contributors:": "Tekijänoikeus © 2015 seuraavat avustajat:",
+    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 seuraavat avustajat",
    "Danger!": "Vaara!",
-    "Delete": "Poista",
    "Deleted": "Poistettu",
-    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Device \"{{name}}\" ({{device}} at {{address}}) wants to connect. Add new device?",
+    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Laite \"{{name}}\" {{device}} osoitteessa ({{address}}) haluaa yhdistää. Lisää uusi laite?",
    "Device ID": "Laitteen ID",
    "Device Identification": "Laitteen tunniste",
    "Device Name": "Laitteen nimi",
-    "Device {%device%} ({%address%}) wants to connect. Add new device?": "Laite {{device}} ({{address}}) haluaa yhdistää. Lisää uusi laite?",
    "Devices": "Laitteet",
    "Disconnected": "Yhteys katkaistu",
+    "Discovered": "Löydetty",
    "Discovery": "Etsintä",
    "Documentation": "Dokumentaatio",
    "Download Rate": "Latausmäärä",
@@ -56,15 +55,14 @@
    "Edit Device": "Muokkaa laitetta",
    "Edit Folder": "Muokkaa kansiota",
    "Editing": "Muokkaus",
-    "Enable NAT traversal": "Enable NAT traversal",
-    "Enable Relaying": "Enable Relaying",
-    "Enable UPnP": "Ota UPnP käyttöön",
+    "Enable NAT traversal": "Aktivoi osoitteenmuunnoksen kierto",
+    "Enable Relaying": "Aktivoi yhteyden välitys",
    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Syötä osoitteet pilkuilla erotettuina (\"tcp://ip:portti, tcp://nimi:portti\") tai \"dynamic\" käyttääksesi osoitteen automaattista selvitystä.",
    "Enter ignore patterns, one per line.": "Syötä ohituslausekkeet, yksi riviä kohden.",
    "Error": "Virhe",
    "External File Versioning": "Ulkoinen tiedostoversionti",
    "Failed Items": "Epäonnistuneet kohteet",
-    "File Pull Order": "File Pull Order",
+    "File Pull Order": "Tiedostojen noutojärjestys",
    "File Versioning": "Tiedostoversiointi",
    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Tiedostojen oikeusbitit jätetään huomiotta etsittäessä muutoksia. Käytä FAT-tiedostojärjestelmissä.",
    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Kun Syncthing poistaa tai korvaa tiedostoja, ne siirretään .stversions-hakemistoon.",
@@ -72,10 +70,9 @@
    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Tiedostot on suojattu muilla laitteilla tehdyiltä muutoksilta, mutta tällä laitteella tehdyt muutokset lähetetään muuhun ryhmään.",
    "Folder": "Kansio",
    "Folder ID": "Kansion ID",
-    "Folder Label": "Folder Label",
-    "Folder Master": "Hallitsijakansio",
+    "Folder Label": "Kansion nimi",
    "Folder Path": "Kansion polku",
-    "Folder Type": "Folder Type",
+    "Folder Type": "Kansion tyyppi",
    "Folders": "Kansiot",
    "GUI": "GUI",
    "GUI Authentication Password": "GUI:n salasana",
@@ -83,7 +80,6 @@
    "GUI Listen Addresses": "GUI:n kuunteluosoitteet",
    "Generate": "Generoi",
    "Global Discovery": "Globaali etsintä",
-    "Global Discovery Server": "Globaali etsintäpalvelin",
    "Global Discovery Servers": "Globaalit etsintäpalvelimet",
    "Global State": "Globaali tila",
    "Help": "Apua",
@@ -98,15 +94,16 @@
    "Keep Versions": "Säilytä versiot",
    "Largest First": "Suurin ensin",
    "Last File Received": "Viimeksi vastaanotettu tiedosto",
-    "Last Scan": "Last Scan",
+    "Last Scan": "Viimeisin skannaus",
    "Last seen": "Nähty viimeksi",
    "Later": "Myöhemmin",
-    "Listeners": "Listeners",
+    "Latest Change": "Viimeisin muutos",
+    "Listeners": "Kuuntelijat",
    "Local Discovery": "Paikallinen etsintä",
    "Local State": "Paikallinen tila",
    "Local State (Total)": "Paikallinen tila (Yhteensä)",
    "Major Upgrade": "Pääversion päivitys.",
-    "Master": "Master",
+    "Master": "Pääkansio",
    "Maximum Age": "Maksimi-ikä",
    "Metadata Only": "Vain metadata",
    "Minimum Free Disk Space": "Vapaan levytilan vähimmäismäärä",
@@ -118,13 +115,13 @@
    "Newest First": "Uusin ensin",
    "No": "Ei",
    "No File Versioning": "Ei tiedostoversiointia",
-    "Normal": "Normal",
+    "Normal": "Normaali kansio",
    "Notice": "Huomautus",
    "OK": "OK",
    "Off": "Pois",
    "Oldest First": "Vanhin ensin",
-    "Optional descriptive label for the folder. Can be different on each device.": "Optional descriptive label for the folder. Can be different on each device.",
-    "Options": "Options",
+    "Optional descriptive label for the folder. Can be different on each device.": "Valinnainen kuvaava nimi kansiolle, joka voi olla eri jokaisella laitteella.",
+    "Options": "Valinnat",
    "Out of Sync": "Ei ajan tasalla",
    "Out of Sync Items": "Kohteet, jotka eivät ole ajan tasalla",
    "Outgoing Rate Limit (KiB/s)": "Uloslähtevän liikenteen rajoitus (KiB/s)",
@@ -140,14 +137,12 @@
    "Preview Usage Report": "Esikatsele käyttöraportti",
    "Quick guide to supported patterns": "Tuettujen lausekkeiden pikaohje",
    "RAM Utilization": "RAM:n käyttö",
-    "Random": "Satunnaien",
-    "Relay Servers": "Välityspalvelimet",
-    "Relayed via": "Käytetty välityspalvelin",
-    "Relays": "Välityspalvelimet",
+    "Random": "Satunnainen",
+    "Reduced by ignore patterns": "Vähennetty ohituslausekkeiden perusteella",
    "Release Notes": "Julkaisutiedot",
-    "Remote Devices": "Remote Devices",
+    "Remote Devices": "Laitteet",
    "Remove": "Poista",
-    "Required identifier for the folder. Must be the same on all cluster devices.": "Required identifier for the folder. Must be the same on all cluster devices.",
+    "Required identifier for the folder. Must be the same on all cluster devices.": "Pakollinen tunniste kansiolle, jonka täytyy olla sama kaikilla laitteilla.",
    "Rescan": "Skannaa uudelleen",
    "Rescan All": "Skannaa kaikki uudelleen",
    "Rescan Interval": "Uudelleenskannauksen aikaväli",
@@ -161,6 +156,8 @@
    "Scanning": "Skannataan",
    "Select the devices to share this folder with.": "Valitse laitteet, joiden kanssa tämä kansio jaetaan.",
    "Select the folders to share with this device.": "Valitse kansiot jaettavaksi tämän laitteen kanssa.",
+    "Send & Receive": "Lähetä & vastaanota",
+    "Send Only": "Vain lähetys",
    "Settings": "Asetukset",
    "Share": "Jaa",
    "Share Folder": "Jaa kansio",
@@ -168,7 +165,6 @@
    "Share With Devices": "Jaa laitteiden kanssa",
    "Share this folder?": "Jaa tämä kansio?",
    "Shared With": "Jaettu seuraavien kanssa",
-    "Short identifier for the folder. Must be the same on all cluster devices.": "Lyhyt tunniste kansiolle. Tämän tulee olla sama kaikilla ryhmän laitteilla.",
    "Show ID": "Näytä ID",
    "Show QR": "Näytä QR-koodi",
    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Näytetään ryhmän tiedoissa laitteen ID:n sijaan. Ilmoitetaan muille laitteille vaihtoehtoisena oletusnimenä.",
@@ -193,17 +189,14 @@
    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing näyttää olevan alhaalla tai internetyhteydessä on ongelma. Yritetään uudelleen...",
    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing ei pysty käsittelemään pyyntöäsi. Ole hyvä ja päivitä sivu tai käynnistä Syncthing uudelleen, jos ongelma jatkuu.",
    "The Syncthing admin interface is configured to allow remote access without a password.": "Syncthingin hallintakäyttöliittymä on asetettu sallimaan ulkoiset yhteydet ilman salasanaa.",
-    "The aggregated statistics are publicly available at the URL below.": "The aggregated statistics are publicly available at the URL below.",
-    "The aggregated statistics are publicly available at {%url%}.": "Yhdistetyt tilastot ovat julkisesti saatavilla osoitteessa {{url}}.",
+    "The aggregated statistics are publicly available at the URL below.": "Koostetut tilastot ovat julkisesti saatavilla alla olevassa osoitteessa.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Asetukset on tallennettu, mutta niitä ei ole otettu käyttöön. Syncthingin täytyy käynnistyä uudelleen, jotta uudet asetukset saadaan käyttöön.",
    "The device ID cannot be blank.": "Laitteen ID ei voi olla tyhjä.",
    "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).": "Tähän kohtaan syötettävän ID:n löytää \"Muokkaa > Näytä ID\" -valikosta toiselta laitteelta. Välit ja viivat ovat valinnaisia (jätetään huomiotta).",
-    "The device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "Tähän kohtaan syötettävän ID:n löytää \"Muokkaa > Näytä ID\" -valikosta toisesta laitteesta. Välit ja viivat ovat valinnaisia (jätetään huomiotta).",
    "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.": "Salattu käyttöraportti lähetetään päivittäin. Sitä käytetään yleisimpien alustojen, kansioiden kokojen ja sovellusversioiden seuraamiseen. Jos raportitavan datan luonne muuttuu, sinua tullaan huomauttamaan tällä dialogilla uudelleen.",
    "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.": "Syötetty laite-ID ei näytä kelpaavalta. Sen tulisi olla 52 tai 56 merkkiä pitkä, joka koostuu kirjaimista ja numeroista, jossa välit ja viivat ovat valinnaisia.",
    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "Ensimmäinen komentoriviparametri on kansion polku, toinen parametri on suhteellinen polku kansion sisällä.",
    "The folder ID cannot be blank.": "Kansion ID ei voi olla tyhjä.",
-    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "Kansion ID:n tulee olla lyhyt tunniste (64 merkkiä tai vähemmän), joka koostuu vain kirjaimista, numeroista, pisteistä (.), viivoista (-), ja alaviivoista (_).",
    "The folder ID must be unique.": "Kansion ID:n tulee olla uniikki.",
    "The folder path cannot be blank.": "Kansion polku ei voi olla tyhjä.",
    "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.": "Seuraavat aikavälit ovat käytössä: ensimmäisen tunnin ajalta uusi versio säilytetään joka 30 sekunti, ensimmäisen päivän ajalta uusi versio säilytetään tunneittain ja ensimmäisen 30 päivän aikana uusi versio säilytetään päivittäin. Lopulta uusi versio säilytetään viikoittain, kunnes maksimi-ikä saavutetaan.",
@@ -218,8 +211,8 @@
    "The path cannot be blank.": "Polku ei voi olla tyhjä.",
    "The rate limit must be a non-negative number (0: no limit)": "Nopeusrajan tulee olla positiivinen luku tai nolla. (0: ei rajaa)",
    "The rescan interval must be a non-negative number of seconds.": "Uudelleenskannauksen aikavälin tulee olla ei-negatiivinen numero sekunteja.",
-    "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",
+    "They are retried automatically and will be synced when the error is resolved.": "Niiden synkronointia yritetään uudelleen automaattisesti.",
+    "This Device": "Tämä laite",
    "This can easily give hackers access to read and change any files on your computer.": "Tämä voi helposti sallia vihamielisille tahoille pääsyn lukea ja muokata kaikkia tiedostojasi",
    "This is a major version upgrade.": "Tämä on pääversion päivitys.",
    "Trash Can File Versioning": "Roskakorin tiedostoversiointi",
@@ -237,15 +230,16 @@
    "Version": "Versio",
    "Versions Path": "Versioiden polku",
    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Versiot poistetaan automaattisesti mikäli ne ovat vanhempia kuin maksimi-ikä tai niiden määrä ylittää sallitun määrän tietyllä aikavälillä.",
-    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Warning, this path is a subdirectory of an existing folder \"{{otherFolder}}\".",
+    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Varoitus: tämä polku on olemassa olevan kansion \"{{otherFolder}}\" alikansio.",
    "When adding a new device, keep in mind that this device must be added on the other side too.": "Lisättäessä laitetta, muista että tämä laite tulee myös lisätä toiseen laitteeseen.",
    "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.": "Lisättäessä uutta kansiota, muista että kansion ID:tä käytetään solmimaan kansiot yhteen laitteiden välillä. Ne ovat riippuvaisia kirjankoosta ja niiden tulee täsmätä kaikkien laitteiden välillä.",
    "Yes": "Kyllä",
    "You must keep at least one version.": "Sinun tulee säilyttää ainakin yksi versio.",
    "days": "päivää",
+    "directories": "kansiot",
+    "files": "tiedostot",
    "full documentation": "täysi dokumentaatio",
    "items": "kohteet",
    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} haluaa jakaa kansion \"{{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}})."
+    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} haluaa jakaa kansion \"{{folderlabel}}\" ({{folder}})."
 }
--- a/gui/default/assets/lang/lang-fr-CA.json
+++ b/gui/default/assets/lang/lang-fr-CA.json
@@ -1,108 +1,105 @@
 {
-    "A device with that ID is already added.": "La machine portant cette ID est déjà présente.",
-    "A negative number of days doesn't make sense.": "Un nombre négatif de jours n'a pas de sens.",
+    "A device with that ID is already added.": "L'appareil portant cette ID est déjà présent.",
+    "A negative number of days doesn't make sense.": "Ce champ n'accepte qu'un entier positif ou nul.",
    "A new major version may not be compatible with previous versions.": "Une nouvelle version majeure peut présenter des incompatibilités avec les versions antérieures.",
    "API Key": "Clé API",
    "About": "À propos",
    "Actions": "Actions",
    "Add": "Ajouter",
-    "Add Device": "Ajouter une machine",
+    "Add Device": "Ajouter l'appareil",
    "Add Folder": "Ajouter un partage",
-    "Add Remote Device": "Ajouter une machine",
-    "Add new folder?": "Ajouter un nouveau partage ?",
+    "Add Remote Device": "Ajouter un appareil",
+    "Add new folder?": "Ajouter ce partage ?",
    "Address": "Adresse",
    "Addresses": "Adresses",
    "Advanced": "Avancé",
    "Advanced Configuration": "Configuration avancée",
-    "Advanced settings": "Réglages experts",
+    "Advanced settings": "Paramètres avancés",
    "All Data": "Toutes les données",
-    "Allow Anonymous Usage Reporting?": "Autoriser le rapport anonyme de statistiques d'utilisation ?",
+    "Allow Anonymous Usage Reporting?": "Autoriser l'envoi de statistiques d'utilisation anonymisées ?",
    "Alphabetic": "Alphabétique",
-    "An external command handles the versioning. It has to remove the file from the synced folder.": "Une commande externe gère les versions de fichiers. Elle supprime les fichiers dans le répertoire synchronisé.",
+    "An external command handles the versioning. It has to remove the file from the synced folder.": "Une commande externe gère les versions de fichiers. Il lui incombe de supprimer les fichiers dans le répertoire synchronisé.",
    "Anonymous Usage Reporting": "Rapport anonyme de statistiques d'utilisation",
-    "Any devices configured on an introducer device will be added to this device as well.": "Toute machine ajoutée depuis une machine introductrice sera aussi ajoutée sur cette machine.",
+    "Any devices configured on an introducer device will be added to this device as well.": "Tout appareil ajouté sur un appareil introducteur sera aussi ajouté sur votre propre appareil.",
    "Automatic upgrades": "Mises à jour automatiques",
    "Be careful!": "Faites attention !",
    "Bugs": "Bugs",
    "CPU Utilization": "Utilisation du CPU",
    "Changelog": "Historique des changements",
-    "Clean out after": "Nettoyer après",
+    "Clean out after": "Purger après :",
    "Close": "Fermer",
    "Command": "Commande",
    "Comment, when used at the start of a line": "Commentaire lorsque utilisé en début de ligne",
    "Compression": "Compression",
+    "Configured": "Configuré",
    "Connection Error": "Erreur de connexion",
    "Connection Type": "Type de connexion",
    "Copied from elsewhere": "Copié d'ailleurs",
    "Copied from original": "Copié depuis l'original",
-    "Copyright © 2014-2016 the following Contributors:": "Les contributeurs suivants, Copyright © 2014-2016 :",
-    "Copyright © 2015 the following Contributors:": "Copyright © 2015 Les contributeurs suivants:",
+    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016, les contributeurs suivants:",
    "Danger!": "Attention !",
-    "Delete": "Supprimer",
    "Deleted": "Supprimé",
-    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "La machine \"{{name}}\" ({{device}} à l'IP {{address}}) souhaite se connecter. L'acceptez-vous ?",
-    "Device ID": "ID de la machine",
-    "Device Identification": "Identification de l'appareil",
-    "Device Name": "Nom de la machine",
-    "Device {%device%} ({%address%}) wants to connect. Add new device?": "L'appareil {{device}} ({{address}}) veut se connecter. Voulez-vous ajouter cette appareil ?",
+    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "L'appareil \"{{name}}\" ({{device}} à l'IP {{address}}) souhaite se connecter. L'acceptez-vous ?",
+    "Device ID": "ID de l'appareil",
+    "Device Identification": "Identifiant de l'appareil",
+    "Device Name": "Nom de l'appareil",
    "Devices": "Appareil",
    "Disconnected": "Déconnecté",
+    "Discovered": "Découvert",
    "Discovery": "Découverte",
    "Documentation": "Documentation",
    "Download Rate": "Débit de réception",
-    "Downloaded": "Téléchargé",
-    "Downloading": "En cours de téléchargement",
+    "Downloaded": "Reçu",
+    "Downloading": "Réception",
    "Edit": "Modifier",
-    "Edit Device": "Modifier la machine",
+    "Edit Device": "Modifier l'appareil",
    "Edit Folder": "Modifier le partage",
-    "Editing": "Édition",
+    "Editing": "Modifications",
    "Enable NAT traversal": "Activer transfert d'adresses NAT",
    "Enable Relaying": "Activer le relayage",
-    "Enable UPnP": "Activer l'UPnP",
-    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Entrer les adresses (\"tcp://ip:port\" ou \"tcp://host:port\") séparées par une virgule ou \"dynamic\" afin d'activer la recherche automatique de l'adresse.",
-    "Enter ignore patterns, one per line.": "Entrer les masques de filtrage, un par ligne.",
+    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Entrer les adresses (\"tcp://ip:port\" ou \"tcp://hôte:port\") séparées par une virgule, ou \"dynamic\" afin d'activer la recherche automatique de l'adresse.",
+    "Enter ignore patterns, one per line.": "Entrer les masques d'exclusion, un par ligne.",
    "Error": "Erreur",
    "External File Versioning": "Gestion externe des versions de fichiers",
    "Failed Items": "Éléments en échec",
    "File Pull Order": "Ordre de récupération de fichier",
-    "File Versioning": "Versions de fichier",
+    "File Versioning": "Méthode de préservation des fichiers",
    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Les bits de permission de fichier sont ignorés lors de la recherche de changements. Utilisé sur les systèmes de fichiers FAT.",
-    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Les fichiers sont déplacés vers le répertoire .stversions quand ils sont remplacés ou effacés par Syncthing.",
-    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Les fichiers sont déplacés, avec horodatage, dans le répertoire .stversions quand ils sont remplacés ou supprimés par Syncthing.",
-    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Les fichiers sont protégés des changements réalisés sur les autres appareils, mais les changements réalisés sur cet appareil seront transférés aux autres appareils.",
+    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Les fichiers sont déplacés dans le sous-répertoire .stversions quand ils sont remplacés ou supprimés par Syncthing. Leurs chemins d'accès relatifs y sont recréés si besoin.",
+    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Les fichiers sont déplacés, avec horodatage, dans le répertoire .stversions quand ils sont remplacés ou supprimés par Syncthing. Leurs chemins d'accès relatifs y sont recréés si besoin.",
+    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Les fichiers sont protégés des changements réalisés sur les autres appareils, mais les changements réalisés sur celui-ci seront transférés aux autres.",
    "Folder": "Partage",
    "Folder ID": "ID du partage",
-    "Folder Label": "Étiquette du partage",
-    "Folder Master": "Partage maître",
+    "Folder Label": "Nom du partage",
    "Folder Path": "Chemin racine du partage",
    "Folder Type": "Type de partage",
    "Folders": "Partages",
-    "GUI": "GUI",
+    "GUI": "Interface graphique",
    "GUI Authentication Password": "Mot de passe d'authentification GUI",
    "GUI Authentication User": "Utilisateur autorisé GUI",
-    "GUI Listen Addresses": "Adresse du GUI",
+    "GUI Listen Addresses": "Adresses de l'interface (GUI)",
    "Generate": "Générer",
-    "Global Discovery": "Recherche globale",
-    "Global Discovery Server": "Serveur global de recherche",
+    "Global Discovery": "Découverte globale",
    "Global Discovery Servers": "Serveurs de découverte globale",
    "Global State": "État global",
    "Help": "Aide",
    "Home page": "Page d'accueil",
    "Ignore": "Ignorer",
-    "Ignore Patterns": "Masques d'exclusion",
+    "Ignore Patterns": "Règles d'exclusion",
    "Ignore Permissions": "Ignorer les permissions",
-    "Incoming Rate Limit (KiB/s)": "Limite du débit entrant (KiB/s)",
+    "Incoming Rate Limit (KiB/s)": "Limite du débit de réception (Kio/s)",
    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Une configuration incorrecte peut créer des dommages dans vos répertoires et mettre Syncthing hors-service.",
-    "Introducer": "Initiateur",
+    "Introducer": "Appareil introducteur",
    "Inversion of the given condition (i.e. do not exclude)": "Inverser la condition donnée (i.e. ne pas exclure)",
-    "Keep Versions": "Conserver les versions",
-    "Largest First": "Les plus volumineux en premier",
-    "Last File Received": "Dernier fichier reçu",
+    "Keep Versions": "Combien de versions conserver",
+    "Largest First": "Les plus volumineux d'abord",
+    "Last File Received": "Dernier changement",
    "Last Scan": "Dernière analyse",
    "Last seen": "Dernière apparition",
    "Later": "Plus tard",
+    "Latest Change": "Dernier changement",
    "Listeners": "Systèmes à l'écoute",
-    "Local Discovery": "Recherche locale",
+    "Local Discovery": "Découverte locale",
    "Local State": "État local",
    "Local State (Total)": "État local (Total)",
    "Major Upgrade": "Mise à jour majeure",
@@ -111,25 +108,25 @@
    "Metadata Only": "Métadonnées uniquement",
    "Minimum Free Disk Space": "Espace disque libre minimum",
    "Move to top of queue": "Déplacer en haut de la file",
-    "Multi level wildcard (matches multiple directory levels)": "Astérisque à plusieurs niveaux (correspond aux répertoires et sous-répertoires)",
+    "Multi level wildcard (matches multiple directory levels)": "Joker multi niveaux (correspond aux répertoires et sous-répertoires)",
    "Never": "Jamais",
    "New Device": "Nouvel appareil",
    "New Folder": "Nouveau partage",
    "Newest First": "Les plus récents en premier",
    "No": "Non",
-    "No File Versioning": "Pas de version de fichier",
+    "No File Versioning": "Pas de préservation",
    "Normal": "Normal",
    "Notice": "Notification",
    "OK": "OK",
-    "Off": "Éteint",
+    "Off": "Désactivé(e)",
    "Oldest First": "Les plus anciens en premier",
-    "Optional descriptive label for the folder. Can be different on each device.": "Étiquette conviviale pour le partage. Elle peut être différente sur chaque machine.",
+    "Optional descriptive label for the folder. Can be different on each device.": "Nom convivial du partage, à votre guise. il peut être différent sur chaque appareil.",
    "Options": "Options",
    "Out of Sync": "Désynchronisé",
-    "Out of Sync Items": "Objets non synchronisés",
-    "Outgoing Rate Limit (KiB/s)": "Limite du débit sortant (KiB/s)",
+    "Out of Sync Items": "Éléments non synchronisés",
+    "Outgoing Rate Limit (KiB/s)": "Limite du débit d'envoi (Kio/s)",
    "Override Changes": "Écraser les changements",
-    "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": "Le chemin du répertoire sur l'ordinateur local sera créé si il n'existe pas. Le caractère tilde (~) peut être utilisé comme raccourci vers",
+    "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": "Chemin vers le répertoire dans l'appareil local. Il sera créé s'il n'existe pas. Vous pouvez entrer un chemin absolu (p.ex \"/home/moi/Sync/Exemple\") ou relatif à celui du programme (p.ex \"..\\Partages\\Exemple\" - utile pour installation portable). Le caractère tilde (~, ou ~+Espace sous Windows XP+Azerty) peut être utilisé comme raccourci vers",
    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Chemin où les versions doivent être conservées (laisser vide pour le chemin par défaut de .stversions dans le répertoire)",
    "Pause": "Pause",
    "Paused": "En pause",
@@ -141,88 +138,84 @@
    "Quick guide to supported patterns": "Guide rapide des masques supportés",
    "RAM Utilization": "Utilisation de la RAM",
    "Random": "Aléatoire",
-    "Relay Servers": "Serveurs relais",
-    "Relayed via": "Relayée par",
-    "Relays": "Relais",
+    "Reduced by ignore patterns": "(Limité par des masques d'exclusion)",
    "Release Notes": "Notes de version",
-    "Remote Devices": "Machines distantes",
+    "Remote Devices": "Autres appareils",
    "Remove": "Enlever",
-    "Required identifier for the folder. Must be the same on all cluster devices.": "Identifiant obligatoire du partage. Il doit être identique chez chaque participant.",
+    "Required identifier for the folder. Must be the same on all cluster devices.": "Identifiant du partage. Doit être le même sur tous les appareils concernés.",
    "Rescan": "Réanalyser",
    "Rescan All": "Réanalyser tout",
    "Rescan Interval": "Intervalle d'analyse",
    "Restart": "Redémarrer",
    "Restart Needed": "Redémarrage nécessaire",
-    "Restarting": "Redémarrage",
-    "Resume": "Résumer",
+    "Restarting": "Redémarrage en cours",
+    "Resume": "Reprise",
    "Reused": "Réutilisé",
-    "Save": "Sauver",
+    "Save": "Enregistrer",
    "Scan Time Remaining": "Temps d'analyse restant",
    "Scanning": "Analyse en cours",
-    "Select the devices to share this folder with.": "Sélectionner les machines invitées à ce partage.",
-    "Select the folders to share with this device.": "Sélectionner les partages auxquels cette machine participe.",
+    "Select the devices to share this folder with.": "Synchroniser avec :",
+    "Select the folders to share with this device.": "Sélectionner les partages auxquels participe cet appareil.",
+    "Send & Receive": "Envoi & réception",
+    "Send Only": "Envoi (lecture seule)",
    "Settings": "Configuration",
    "Share": "Partager",
    "Share Folder": "Partager",
-    "Share Folders With Device": "Partages avec cette machine",
-    "Share With Devices": "Partage avec des appareils",
+    "Share Folders With Device": "Partages avec cet appareil",
+    "Share With Devices": "Synchroniser avec des appareils",
    "Share this folder?": "Acceptez-vous ce partage ?",
-    "Shared With": "Partagé avec",
-    "Short identifier for the folder. Must be the same on all cluster devices.": "Identifiant court du partage. Il sera le même sur l'ensemble des machines du groupe.",
+    "Shared With": "Synchronisé avec",
    "Show ID": "Afficher mon ID",
    "Show QR": "Afficher l'image QR",
-    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Affiché à la place de l'ID de l'appareil dans le groupe. Sera proposé aux autres appareils comme nom optionnel par défaut.",
-    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Affiché à la place de l'ID de l'appareil dans le groupe. Si laissé vide, il sera mis à jour par le nom proposé par l'appareil distant.",
+    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Affiché à la place de l'ID de l'appareil dans l'état du groupe. Sera diffusé aux autres appareils comme nom convivial optionnel par défaut.",
+    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Affiché à la place de l'ID de l'appareil dans l'état du groupe. Si laissé vide, il sera renseigné par le nom convivial proposé par l'appareil distant.",
    "Shutdown": "Arrêter",
    "Shutdown Complete": "Arrêté !",
-    "Simple File Versioning": "Suivi simple des versions de fichier",
-    "Single level wildcard (matches within a directory only)": "Astérisque à un seul niveau (correspond uniquement à l’intérieur du répertoire)",
-    "Smallest First": "Les plus petits en premier",
+    "Simple File Versioning": "Suivi simplifié des versions",
+    "Single level wildcard (matches within a directory only)": "Joker à un seul niveau (correspond uniquement à l’intérieur du répertoire)",
+    "Smallest First": "Les plus petits d'abord",
    "Source Code": "Code source",
-    "Staggered File Versioning": "Versions échelonnées de fichier",
-    "Start Browser": "Démarrer le navigateur web",
+    "Staggered File Versioning": "Versions échelonnées",
+    "Start Browser": "Lancer le navigateur web",
    "Statistics": "Statistiques",
    "Stopped": "Arrêté",
-    "Support": "Aide",
-    "Sync Protocol Listen Addresses": "Adresse d'écoute du protocole de synchronisation",
+    "Support": "Forum",
+    "Sync Protocol Listen Addresses": "Adresses d'écoute du protocole de synchronisation",
    "Syncing": "En cours de synchronisation",
-    "Syncthing has been shut down.": "Syncthing a été éteint.",
+    "Syncthing has been shut down.": "Syncthing a été arrêté.",
    "Syncthing includes the following software or portions thereof:": "Syncthing intègre les logiciels suivants (ou des éléments provenant de ces logiciels) :",
-    "Syncthing is restarting.": "Syncthing est cours de redémarrage.",
-    "Syncthing is upgrading.": "Syncthing est cours de mise à jour.",
-    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing semble être éteint, ou il y a un problème avec votre connexion Internet. Nouvelle tentative ...",
-    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing semble avoir un problème pour traiter votre demande. S'il vous plait, rafraichissez la page ou redémarrer Syncthing si le problème persiste.",
+    "Syncthing is restarting.": "Syncthing redémarre.",
+    "Syncthing is upgrading.": "Syncthing se met à jour.",
+    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing semble être arrêté, ou il y a un problème avec votre connexion Internet. Nouvelle tentative ...",
+    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing semble avoir un problème pour traiter votre demande. S'il vous plaît, rafraîchissez la page ou redémarrez Syncthing si le problème persiste.",
    "The Syncthing admin interface is configured to allow remote access without a password.": "L'interface d'administration de Syncthing est configuré pour accepter l'accès distant sans mot de passe !",
-    "The aggregated statistics are publicly available at the URL below.": "Les statistiques aggrégées sont publiquement disponibles à l'adresse ci-dessous.",
-    "The aggregated statistics are publicly available at {%url%}.": "Les statistiques agrégées sont disponibles publiquement à l'adresse {{url}}.",
+    "The aggregated statistics are publicly available at the URL below.": "Les statistiques agrégées sont publiquement disponibles à l'adresse ci-dessous.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "La configuration a été enregistrée mais pas activée. Syncthing doit redémarrer afin d'activer la nouvelle configuration.",
    "The device ID cannot be blank.": "L'ID de l'appareil ne peut être vide.",
-    "The device ID to enter here can be found in the \"Actions > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "L'ID de machine à saisir ici se trouve dans le menu \"Actions > Afficher mon ID\" de la machine distante. Les tirets et espaces sont optionnels (et ignorés).",
-    "The device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "L'ID de machine à saisir ici se trouve dans le menu \"Actions > Afficher mon ID\" de la machine distante. Les tirets et espaces sont optionnels (et ignorés).",
-    "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.": "Le rapport d'utilisation chiffré est envoyé quotidiennement. Il sert à répertorier les plateformes utilisées, la taille des partages et les versions de l'application. Si les données rapportées sont modifiées cette boite de dialogue vous redemandera votre confirmation.",
-    "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 de l'appareil inséré ne semble pas être valide. Il devrait ressembler à une chaîne de 52 ou 56 caractères comprenant des lettres, des chiffres et potentiellement des espaces et des traits d'union.",
+    "The device ID to enter here can be found in the \"Actions > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "L'ID d'appareil à saisir ici se trouve dans le menu \"Actions > Afficher mon ID\" sur l'appareil distant. Les tirets et espaces sont optionnels (et ignorés).",
+    "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.": "Le rapport d'utilisation chiffré est envoyé quotidiennement. Il sert à répertorier les plates-formes utilisées, la taille des partages et les versions de l'application. Si les données rapportées sont modifiées cette boite de dialogue vous redemandera votre confirmation.",
+    "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 de l'appareil inséré ne semble pas valide. Il devrait ressembler à une chaîne de 52 ou 56 caractères comprenant des lettres, des chiffres et potentiellement des espaces et des traits d'union.",
    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "Le premier paramètre de ligne de commande est le chemin du répertoire partagé, et le second est le chemin relatif dans le répertoire.",
    "The folder ID cannot be blank.": "L'identifiant du partage ne peut être vide.",
-    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "L'ID du partage doit être un identifiant court (64 caractères ou moins) comprenant uniquement des lettres, chiffre, points (.), traits d'union (-) et tirets bas (_).",
    "The folder ID must be unique.": "L'ID du partage doit être unique.",
    "The folder path cannot be blank.": "Le chemin vers le répertoire ne peut pas être vide.",
-    "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "Les intervalles suivant sont utilisés: la première heure une version est conservée chaque 30 secondes, le premier jour une version est conservée chaque heure, les premiers 30 jours une version est conservée chaque jour, jusqu'à la limite d'âge maximum une version est conservée chaque semaine.",
-    "The following items could not be synchronized.": "Les éléments suivants ne peuvent pas être synchronisés.",
+    "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "Les intervalles suivant sont utilisés: jusqu'à une heure une version est conservée toutes les 30 secondes. Jusqu'à un jour une version est conservée chaque heure. Jusqu'à 30 jours une version est conservée chaque jour. Au-delà, jusqu'à la limite d'âge, une version est conservée chaque semaine.",
+    "The following items could not be synchronized.": "Les fichiers suivants n'ont pas pu être synchronisés.",
    "The maximum age must be a number and cannot be blank.": "L'âge maximum doit être un nombre et ne peut être vide.",
-    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Le temps maximum de conservation d'une version (en jours, mettre à 0 pour conserver les versions pour toujours)",
+    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Le temps maximum de conservation d'une version (en jours, mettre à 0 pour conserver les versions indéfiniment)",
    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "Le pourcentage d'espace disque libre doit être un nombre positif compris entre 0 et 100 (inclus).",
    "The number of days must be a number and cannot be blank.": "Le nombre de jours doit être numérique et ne peut pas être vide.",
-    "The number of days to keep files in the trash can. Zero means forever.": "Le nombre de jours de conservation des fichiers dans la poubelle. Zéro signifie toujours.",
+    "The number of days to keep files in the trash can. Zero means forever.": "Le nombre de jours de conservation des fichiers dans la poubelle. 0 signifie toujours.",
    "The number of old versions to keep, per file.": "Le nombre d'anciennes versions à garder, par fichier.",
    "The number of versions must be a number and cannot be blank.": "Le nombre de versions doit être numérique, et ne peut pas être vide.",
    "The path cannot be blank.": "Le chemin ne peut pas être vide.",
-    "The rate limit must be a non-negative number (0: no limit)": "La limite de débit ne doit pas être négative (0: Aucune limite)",
+    "The rate limit must be a non-negative number (0: no limit)": "La limite de débit ne doit pas être négative (0 = pas de limite)",
    "The rescan interval must be a non-negative number of seconds.": "L'intervalle d'analyse ne doit pas être un nombre négatif de secondes.",
-    "They are retried automatically and will be synced when the error is resolved.": "Ils seront réessayés automatiquement et synchronisés quand l'erreur sera résolue.",
-    "This Device": "Cette machine",
+    "They are retried automatically and will be synced when the error is resolved.": "Ils seront automatiquement retentés et synchronisés quand l'erreur sera résolue.",
+    "This Device": "Cet appareil",
    "This can easily give hackers access to read and change any files on your computer.": "Ceci peut aisément permettre à un intrus de lire et modifier n'importe quel fichier de votre ordinateur.  ",
-    "This is a major version upgrade.": "Ceci est une mise à jour majeure.",
-    "Trash Can File Versioning": "Gestion des versions de fichier style poubelle.",
+    "This is a major version upgrade.": "Il s'agit d'une mise à jour majeure.",
+    "Trash Can File Versioning": "Style poubelle",
    "Unknown": "Inconnu",
    "Unshared": "Non partagé",
    "Unused": "Non utilisé",
@@ -238,14 +231,15 @@
    "Versions Path": "Emplacement des versions",
    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Les versions seront supprimées automatiquement, si elles dépassent la durée maximum de conservation, ou si leur nombre est supérieur à la valeur autorisée dans l'intervalle.",
    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Attention, ce chemin est un sous-répertoire du partage existant \"{{otherFolder}}\". Ceci peut causer des problèmes tels que duplications de fichiers ou suppressions intempestives sur les autres machines.",
-    "When adding a new device, keep in mind that this device must be added on the other side too.": "Lorsqu'un appareil est ajouté, gardez à l'esprit que cet appareil doit aussi être ajouté de l'autre coté.",
-    "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.": "Lorsqu'un nouveau partage est ajouté, gardez à l'esprit que son ID est utilisée pour lier les répertoires à travers les machines. L'ID est sensible à la casse et sera forcément la même sur toutes les machines participant à ce partage.",
+    "When adding a new device, keep in mind that this device must be added on the other side too.": "Lorsque vous ajoutez un appareil, gardez à l'esprit que le votre doit aussi être ajouté de l'autre coté.",
+    "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.": "Lorsqu'un nouveau partage est ajouté, gardez à l'esprit que son ID est utilisée pour lier les répertoires à travers les appareils. L'ID est sensible à la casse et sera forcément la même sur tous les appareils participant à ce partage.",
    "Yes": "Oui",
    "You must keep at least one version.": "Vous devez garder au minimum une version.",
    "days": "Jours",
+    "directories": "répertoires",
+    "files": "fichiers",
    "full documentation": "documentation complète",
    "items": "éléments",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} vous invite au partage \"{{folderLabel}}\".",
-    "{%device%} wants to share folder \"{%folderLabel%}\" ({%folder%}).": "{{device}} vous invite au partage \"{{folderLabel}}\" ({{folder}}).",
-    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} vous invite au partage \"{{folderLabel}}\" ({{folder}})."
+    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} vous invite au partage \"{{folder}}\".",
+    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} vous invite au partage \"{{folderlabel}}\" ({{folder}})."
 }
--- a/gui/default/assets/lang/lang-fr.json
+++ b/gui/default/assets/lang/lang-fr.json
@@ -1,108 +1,105 @@
 {
-    "A device with that ID is already added.": "La machine portant cette ID est déjà présente.",
-    "A negative number of days doesn't make sense.": "Un nombre négatif de jours n'a pas de sens.",
+    "A device with that ID is already added.": "L'appareil portant cette ID est déjà présent.",
+    "A negative number of days doesn't make sense.": "Ce champ n'accepte qu'un entier positif ou nul.",
    "A new major version may not be compatible with previous versions.": "Une nouvelle version majeure peut présenter des incompatibilités avec les versions antérieures.",
    "API Key": "Clé API",
    "About": "À propos",
    "Actions": "Actions",
    "Add": "Ajouter",
-    "Add Device": "Ajouter une machine",
-    "Add Folder": "Ajouter un dossier",
-    "Add Remote Device": "Ajouter une machine distante",
-    "Add new folder?": "Ajouter un nouveau dossier ?",
+    "Add Device": "Ajouter l'appareil",
+    "Add Folder": "Ajouter un partage",
+    "Add Remote Device": "Ajouter un appareil",
+    "Add new folder?": "Ajouter ce partage ?",
    "Address": "Adresse",
    "Addresses": "Adresses",
    "Advanced": "Avancé",
    "Advanced Configuration": "Configuration avancée",
-    "Advanced settings": "Configuration avancée",
+    "Advanced settings": "Paramètres avancés",
    "All Data": "Toutes les données",
-    "Allow Anonymous Usage Reporting?": "Autoriser le rapport anonyme de statistiques d'utilisation ?",
+    "Allow Anonymous Usage Reporting?": "Autoriser l'envoi de statistiques d'utilisation anonymisées ?",
    "Alphabetic": "Alphabétique",
-    "An external command handles the versioning. It has to remove the file from the synced folder.": "Une commande externe gère les versions de fichiers. Elle supprime les fichiers dans le dossier synchronisé.",
+    "An external command handles the versioning. It has to remove the file from the synced folder.": "Une commande externe gère les versions de fichiers. Il lui incombe de supprimer les fichiers dans le répertoire synchronisé.",
    "Anonymous Usage Reporting": "Rapport anonyme de statistiques d'utilisation",
-    "Any devices configured on an introducer device will be added to this device as well.": "Toute machine ajoutée depuis une machine initiatrice sera aussi ajoutée sur cette machine.",
+    "Any devices configured on an introducer device will be added to this device as well.": "Tout appareil ajouté sur un appareil introducteur sera aussi ajouté sur votre propre appareil.",
    "Automatic upgrades": "Mises à jour automatiques",
    "Be careful!": "Faites attention !",
    "Bugs": "Bugs",
    "CPU Utilization": "Utilisation du CPU",
    "Changelog": "Historique des changements",
-    "Clean out after": "Nettoyer après",
+    "Clean out after": "Purger après :",
    "Close": "Fermer",
    "Command": "Commande",
    "Comment, when used at the start of a line": "Commentaire lorsque utilisé en début de ligne",
    "Compression": "Compression",
+    "Configured": "Configuré",
    "Connection Error": "Erreur de connexion",
    "Connection Type": "Type de connexion",
    "Copied from elsewhere": "Copié d'ailleurs",
    "Copied from original": "Copié depuis l'original",
    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016, les contributeurs suivants:",
-    "Copyright © 2015 the following Contributors:": "Copyright © 2015 Les contributeurs suivants:",
    "Danger!": "Attention !",
-    "Delete": "Supprimer",
    "Deleted": "Supprimé",
-    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "La machine \"{{name}}\" ({{device}} à {{address}}) veut se connecter. L'acceptez-vous ?",
-    "Device ID": "ID de la machine",
-    "Device Identification": "Identifiant de la machine",
-    "Device Name": "Nom de la machine",
-    "Device {%device%} ({%address%}) wants to connect. Add new device?": "La machine {{device}} ({{address}}) veut se connecter. Voulez-vous ajouter cette machine ?",
-    "Devices": "Machines",
+    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "L'appareil \"{{name}}\" ({{device}} à {{address}}) veut se connecter. L'acceptez-vous ?",
+    "Device ID": "ID de l'appareil",
+    "Device Identification": "Identifiant de l'appareil",
+    "Device Name": "Nom de l'appareil",
+    "Devices": "Appareils",
    "Disconnected": "Déconnecté",
+    "Discovered": "Découvert",
    "Discovery": "Découverte",
    "Documentation": "Documentation",
-    "Download Rate": "Vitesse de réception",
-    "Downloaded": "Téléchargé",
-    "Downloading": "En cours de téléchargement",
+    "Download Rate": "Débit de réception",
+    "Downloaded": "Reçu",
+    "Downloading": "Réception",
    "Edit": "Modifier",
-    "Edit Device": "Modifier la machine",
-    "Edit Folder": "Modifier le dossier",
+    "Edit Device": "Modifier l'appareil",
+    "Edit Folder": "Modifier le partage",
    "Editing": "Modifications",
    "Enable NAT traversal": "Activer la translation d'adresses (NAT)",
    "Enable Relaying": "Relayage possible",
-    "Enable UPnP": "Activer UPnP",
-    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Entrer les adresses (\"tcp://ip:port\" ou \"tcp://host:port\") séparées par une virgule ou \"dynamic\" afin d'activer la recherche automatique de l'adresse.",
+    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Entrer les adresses (\"tcp://ip:port\" ou \"tcp://hôte:port\") séparées par une virgule, ou \"dynamic\" afin d'activer la recherche automatique de l'adresse.",
    "Enter ignore patterns, one per line.": "Entrez les masques d'exclusion, un par ligne.",
    "Error": "Erreur",
    "External File Versioning": "Gestion externe des versions de fichiers",
    "Failed Items": "Fichiers en échec",
    "File Pull Order": "Ordre de récupération des fichiers",
-    "File Versioning": "Versions de fichier",
+    "File Versioning": "Méthode de préservation des fichiers",
    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Les bits de permission de fichier sont ignorés lors de la recherche de changements. Utilisé sur les systèmes de fichiers FAT.",
-    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Les fichiers sont déplacés vers le dossier .stversions quand ils sont remplacés ou effacés par Syncthing.",
-    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Les fichiers sont déplacés, avec horodatage, dans le dossier .stversions quand ils sont remplacés ou supprimés par Syncthing.",
-    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Les fichiers sont protégés des changements réalisés sur les autres machines, mais les changements réalisés sur celle-ci seront transférés aux autres machines.",
-    "Folder": "Dossier",
-    "Folder ID": "ID du dossier",
-    "Folder Label": "Étiquette du partage",
-    "Folder Master": "Dossier maître",
+    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Les fichiers sont déplacés dans le sous-répertoire .stversions quand ils sont remplacés ou supprimés par Syncthing. Leurs chemins d'accès relatifs y sont recréés si besoin.",
+    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Les fichiers sont déplacés et horodatés dans le sous-répertoire .stversions quand ils sont remplacés ou supprimés par Syncthing. Leurs chemins d'accès relatifs y sont recréés si besoin.",
+    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Les fichiers sont protégés des changements réalisés sur les autres appareils, mais les changements réalisés sur celui-ci seront transférés aux autres.",
+    "Folder": "Partage",
+    "Folder ID": "ID du partage",
+    "Folder Label": "Nom du partage",
    "Folder Path": "Chemin racine du partage",
    "Folder Type": "Type de partage",
-    "Folders": "Dossiers",
-    "GUI": "GUI",
+    "Folders": "Partages",
+    "GUI": "Interface graphique",
    "GUI Authentication Password": "Mot de passe d'authentification GUI",
    "GUI Authentication User": "Utilisateur autorisé GUI",
-    "GUI Listen Addresses": "Adresse du GUI",
+    "GUI Listen Addresses": "Adresses de l'interface (GUI)",
    "Generate": "Générer",
-    "Global Discovery": "Recherche globale",
-    "Global Discovery Server": "Serveur global de recherche",
+    "Global Discovery": "Découverte globale",
    "Global Discovery Servers": "Serveurs de découverte globale",
    "Global State": "État global",
    "Help": "Aide",
    "Home page": "Page d'accueil",
    "Ignore": "Ignorer",
-    "Ignore Patterns": "Masques d'exclusion",
+    "Ignore Patterns": "Exclusions ...",
    "Ignore Permissions": "Ignorer les permissions",
-    "Incoming Rate Limit (KiB/s)": "Limite du débit de réception (Ko/s)",
-    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Une configuration incorrecte peut créer des dommages dans vos dossiers et mettre hors-service Syncthing",
-    "Introducer": "Initiateur",
+    "Incoming Rate Limit (KiB/s)": "Limite du débit de réception (Kio/s)",
+    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Une configuration incorrecte peut créer des dommages dans vos répertoires et mettre Syncthing hors-service.",
+    "Introducer": "Appareil introducteur",
    "Inversion of the given condition (i.e. do not exclude)": "Inverser la condition donnée (i.e. ne pas exclure)",
-    "Keep Versions": "Conserver les versions",
-    "Largest First": "Les plus volumineux en premier",
-    "Last File Received": "Dernier fichier reçu",
+    "Keep Versions": "Combien de versions conserver",
+    "Largest First": "Les plus volumineux d'abord",
+    "Last File Received": "Dernier changement",
    "Last Scan": "Dernière analyse",
    "Last seen": "Dernière apparition",
    "Later": "Plus tard",
+    "Latest Change": "Dernier changement",
    "Listeners": "Systèmes en écoute",
-    "Local Discovery": "Recherche locale",
+    "Local Discovery": "Découverte locale",
    "Local State": "État local",
    "Local State (Total)": "État local (Total)",
    "Major Upgrade": "Mise à jour majeure",
@@ -111,26 +108,26 @@
    "Metadata Only": "Métadonnées uniquement",
    "Minimum Free Disk Space": "Espace disque libre minimum",
    "Move to top of queue": "Déplacer en haut de la file",
-    "Multi level wildcard (matches multiple directory levels)": "Astérisque à plusieurs niveaux (correspond aux répertoires et sous-répertoires)",
+    "Multi level wildcard (matches multiple directory levels)": "Joker multi niveaux (correspond aux répertoires et sous-répertoires)",
    "Never": "Jamais",
-    "New Device": "Nouvelle machine",
-    "New Folder": "Nouveau dossier",
+    "New Device": "Nouvel appareil",
+    "New Folder": "Nouveau partage",
    "Newest First": "Les plus récents en premier",
    "No": "Non",
-    "No File Versioning": "Pas de version de fichier",
+    "No File Versioning": "Pas de préservation",
    "Normal": "Normal",
    "Notice": "Notification",
    "OK": "OK",
    "Off": "Désactivé(e)",
    "Oldest First": "Les plus anciens en premier",
-    "Optional descriptive label for the folder. Can be different on each device.": "Étiquette optionnelle pour le partage. Peut être différente sur chaque machine.",
+    "Optional descriptive label for the folder. Can be different on each device.": "Nom convivial et optionnel du partage, à votre guise. il peut être différent sur chaque appareil.",
    "Options": "Options",
    "Out of Sync": "Désynchronisé",
-    "Out of Sync Items": "Fichiers non synchronisés",
-    "Outgoing Rate Limit (KiB/s)": "Limite du débit d'émission (Ko/s)",
+    "Out of Sync Items": "Éléments non synchronisés",
+    "Outgoing Rate Limit (KiB/s)": "Limite du débit d'envoi (Kio/s)",
    "Override Changes": "Écraser les changements",
-    "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": "Chemin vers le répertoire dans la machine locale. Il sera créé s'il n'existe pas. Le caractère tilde (~, ou ~+Espace sous Windows+Azerty) peut être utilisé comme raccourci vers",
-    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Chemin où les versions doivent être conservées (laisser vide pour le chemin par défaut de .stversions dans le répertoire)",
+    "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": "Chemin vers le répertoire dans l'appareil local. Il sera créé s'il n'existe pas. Vous pouvez entrer un chemin absolu (p.ex \"/home/moi/Sync/Exemple\") ou relatif à celui du programme (p.ex \"..\\Partages\\Exemple\" - utile pour installation portable). Le caractère tilde (~, ou ~+Espace sous Windows XP+Azerty) peut être utilisé comme raccourci vers",
+    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Chemin où les copies doivent être conservées (laisser vide pour le chemin par défaut de .stversions dans le répertoire)",
    "Pause": "Pause",
    "Paused": "En pause",
    "Please consult the release notes before performing a major upgrade.": "Veuillez consulter les notes de version avant de réaliser une mise à jour majeure.",
@@ -138,91 +135,87 @@
    "Please wait": "Merci de patienter",
    "Preview": "Aperçu",
    "Preview Usage Report": "Aperçu du rapport de statistiques d'utilisation",
-    "Quick guide to supported patterns": "Guide rapide des masques supportés",
+    "Quick guide to supported patterns": "Filtro ez onartuen txostena",
    "RAM Utilization": "Utilisation de la RAM",
    "Random": "Aléatoire",
-    "Relay Servers": "Serveurs relais",
-    "Relayed via": "Relayée par",
-    "Relays": "Relais",
+    "Reduced by ignore patterns": "(Limité par des masques d'exclusion)",
    "Release Notes": "Notes de version",
-    "Remote Devices": "Machines distantes",
+    "Remote Devices": "Autres appareils",
    "Remove": "Enlever",
-    "Required identifier for the folder. Must be the same on all cluster devices.": "Identifiant du partage. Doit être le même sur l'ensemble des machines concernées.",
-    "Rescan": "Réanalyse",
+    "Required identifier for the folder. Must be the same on all cluster devices.": "Identifiant du partage. Doit être le même sur tous les appareils concernés.",
+    "Rescan": "Réanalyser",
    "Rescan All": "Réanalyser tout",
    "Rescan Interval": "Intervalle d'analyse",
    "Restart": "Redémarrer",
    "Restart Needed": "Redémarrage nécessaire",
-    "Restarting": "Redémarrage",
-    "Resume": "Résumer",
+    "Restarting": "Redémarrage en cours",
+    "Resume": "Reprise",
    "Reused": "Réutilisé",
-    "Save": "Sauver",
+    "Save": "Enregistrer",
    "Scan Time Remaining": "Temps d'analyse restant",
    "Scanning": "Analyse en cours",
-    "Select the devices to share this folder with.": "Sélectionner les machines avec qui partager ce dossier.",
-    "Select the folders to share with this device.": "Sélectionner les dossiers à partager avec cette machine.",
+    "Select the devices to share this folder with.": "Synchroniser avec :",
+    "Select the folders to share with this device.": "Sélectionner les partages auxquels participe cet appareil.",
+    "Send & Receive": "Envoi & réception",
+    "Send Only": "Envoi (lecture seule)",
    "Settings": "Configuration",
    "Share": "Partager",
-    "Share Folder": "Partager le dossier",
-    "Share Folders With Device": "Partager des dossiers avec des machines",
-    "Share With Devices": "Partage avec des appareils",
-    "Share this folder?": "Voulez-vous partager ce dossier ?",
-    "Shared With": "Partagé avec",
-    "Short identifier for the folder. Must be the same on all cluster devices.": "Identifiant court du dossier. Il doit être le même sur l'ensemble des machines du groupe.",
+    "Share Folder": "Partager",
+    "Share Folders With Device": "Partages avec cet appareil",
+    "Share With Devices": "Synchroniser avec des appareils",
+    "Share this folder?": "Acceptez-vous ce partage ?",
+    "Shared With": "Synchronisé avec",
    "Show ID": "Afficher mon ID",
    "Show QR": "Afficher le QR",
-    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Affiché à la place de l'ID de la machine dans le groupe. Sera proposé aux autres machines comme nom optionnel par défaut.",
-    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Affiché à la place de l'ID de la machine dans le groupe. Si laissé vide, il sera mis à jour par le nom proposé par la machine distante.",
+    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Affiché à la place de l'ID de l'appareil dans l'état du groupe. Sera diffusé aux autres appareils comme nom convivial optionnel par défaut.",
+    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Affiché à la place de l'ID de l'appareil dans l'état du groupe. Si laissé vide, il sera renseigné par le nom convivial proposé par l'appareil distant.",
    "Shutdown": "Arrêter",
    "Shutdown Complete": "Arrêté !",
-    "Simple File Versioning": "Suivi simple des versions de fichier",
-    "Single level wildcard (matches within a directory only)": "Astérisque à un seul niveau (correspond uniquement à l’intérieur du dossier)",
-    "Smallest First": "Les plus petits en premier",
+    "Simple File Versioning": "Suivi simplifié des versions",
+    "Single level wildcard (matches within a directory only)": "Joker à un seul niveau (correspond uniquement à l’intérieur du répertoire)",
+    "Smallest First": "Les plus petits d'abord",
    "Source Code": "Code source",
-    "Staggered File Versioning": "Versions échelonnées de fichier",
-    "Start Browser": "Démarrer le navigateur web",
+    "Staggered File Versioning": "Versions échelonnées",
+    "Start Browser": "Lancer le navigateur web",
    "Statistics": "Statistiques",
    "Stopped": "Arrêté",
-    "Support": "Aide",
-    "Sync Protocol Listen Addresses": "Adresse d'écoute du protocole de synchronisation",
+    "Support": "Forum",
+    "Sync Protocol Listen Addresses": "Adresses d'écoute du protocole de synchronisation",
    "Syncing": "Synchronisation en cours",
    "Syncthing has been shut down.": "Syncthing a été arrêté.",
    "Syncthing includes the following software or portions thereof:": "Syncthing intègre les logiciels suivants (ou des éléments provenant de ces logiciels) :",
-    "Syncthing is restarting.": "Syncthing est cours de redémarrage.",
-    "Syncthing is upgrading.": "Syncthing est cours de mise à jour.",
+    "Syncthing is restarting.": "Syncthing redémarre.",
+    "Syncthing is upgrading.": "Syncthing se met à jour.",
    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing semble être arrêté, ou il y a un problème avec votre connexion Internet. Nouvelle tentative ...",
-    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing semble avoir un problème pour traiter votre demande. S'il vous plaît, rafraichissez la page ou redémarrez Syncthing si le problème persiste.",
+    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing semble avoir un problème pour traiter votre demande. S'il vous plaît, rafraîchissez la page ou redémarrez Syncthing si le problème persiste.",
    "The Syncthing admin interface is configured to allow remote access without a password.": "L'interface d'administration de Syncthing est paramétrée pour autoriser les accès à distance sans mot de passe !!!",
    "The aggregated statistics are publicly available at the URL below.": "Les statistiques agrégées sont disponibles publiquement à l'adresse ci-dessous.",
-    "The aggregated statistics are publicly available at {%url%}.": "Les statistiques agrégées sont disponibles publiquement à l'adresse {{url}}.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "La configuration a été enregistrée mais pas activée. Syncthing doit redémarrer afin d'activer la nouvelle configuration.",
-    "The device ID cannot be blank.": "L'ID de la machine ne peut être vide.",
-    "The device ID to enter here can be found in the \"Actions > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "L'ID de machine à saisir se trouve dans le menu \"Actions > Afficher mon ID\" de la machine distante. Espaces et tirets sont optionnels (ignorés).",
-    "The device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "L'ID de machine à saisir se trouve dans le menu \"Modifications > Afficher mon ID\" de la machine distante. Les espaces et les tirets sont optionnels (ils seront ignorés).",
-    "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.": "Le rapport d'utilisation chiffré est envoyé quotidiennement. Il sert à répertorier les plateformes utilisées, la taille des dossiers et les versions de l'application. Si les données rapportées sont modifiées cette boite de dialogue vous redemandera votre confirmation.",
-    "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 de la machine inséré ne semble pas être valide. Il devrait ressembler à une chaîne de 52 ou 56 caractères comprenant des lettres, des chiffres et potentiellement des espaces et des traits d'union.",
-    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "Le premier paramètre de ligne de commande est le chemin du dossier, et le second est le chemin relatif dans le dossier.",
-    "The folder ID cannot be blank.": "L'identifiant (ID) du dossier ne peut être vide.",
-    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "L'ID du dossier doit être un identifiant court (64 caractères ou moins) comprenant uniquement des lettres, chiffre, points (.), traits d'union (-) et tirets bas (_).",
-    "The folder ID must be unique.": "L'ID du dossier doit être unique.",
-    "The folder path cannot be blank.": "Le chemin du dossier ne peut pas être vide.",
-    "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "Les intervalles suivant sont utilisés: la première heure une version est conservée chaque 30 secondes, le premier jour une version est conservée chaque heure, les premiers 30 jours une version est conservée chaque jour, jusqu'à la limite d'âge maximum une version est conservée chaque semaine.",
-    "The following items could not be synchronized.": "Les fichiers suivants ne peuvent pas être synchronisés.",
+    "The device ID cannot be blank.": "L'ID de l'appareil ne peut être vide.",
+    "The device ID to enter here can be found in the \"Actions > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "L'ID d'appareil à saisir ici se trouve dans le menu \"Actions > Afficher mon ID\" de l'appareil distant. Espaces et tirets sont optionnels (ignorés).",
+    "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.": "Le rapport d'utilisation chiffré est envoyé quotidiennement. Il sert à répertorier les plates-formes utilisées, la taille des partages et les versions de l'application. Si le jeu de données rapportées devait être changé, il vous sera demandé de le valider de nouveau via ce message.",
+    "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 de l'appareil inséré ne semble pas valide. Il devrait ressembler à une chaîne de 52 ou 56 caractères comprenant des lettres, des chiffres et potentiellement des espaces et des traits d'union.",
+    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "Le premier paramètre de ligne de commande est le chemin du répertoire partagé, et le second est le chemin relatif dans le répertoire.",
+    "The folder ID cannot be blank.": "L'ID du partage ne peut être vide.",
+    "The folder ID must be unique.": "L'ID du partage doit être unique.",
+    "The folder path cannot be blank.": "Le chemin vers le répertoire ne peut pas être vide.",
+    "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "Les intervalles suivant sont utilisés: jusqu'à une heure une version est conservée toutes les 30 secondes. Jusqu'à un jour une version est conservée chaque heure. Jusqu'à 30 jours une version est conservée chaque jour. Au-delà, jusqu'à la limite d'âge, une version est conservée chaque semaine.",
+    "The following items could not be synchronized.": "Les fichiers suivants n'ont pas pu être synchronisés.",
    "The maximum age must be a number and cannot be blank.": "L'âge maximum doit être un nombre et ne peut être vide.",
-    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Le temps maximum de conservation d'une version (en jours, mettre à 0 pour conserver les versions pour toujours)",
+    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Le temps maximum de conservation d'une version (en jours, mettre à 0 pour conserver les versions indéfiniment)",
    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "Le pourcentage d'espace disque libre doit être un nombre positif compris entre 0 et 100 (inclus).",
    "The number of days must be a number and cannot be blank.": "Le nombre de jours doit être numérique et ne peut pas être vide.",
-    "The number of days to keep files in the trash can. Zero means forever.": "Le nombre de jours de conservation des fichiers dans la poubelle. Zéro signifie toujours.",
+    "The number of days to keep files in the trash can. Zero means forever.": "Le nombre de jours de conservation des fichiers dans la poubelle. 0 signifie toujours.",
    "The number of old versions to keep, per file.": "Le nombre d'anciennes versions à garder, par fichier.",
    "The number of versions must be a number and cannot be blank.": "Le nombre de versions doit être numérique, et ne peut pas être vide.",
    "The path cannot be blank.": "Le chemin ne peut pas être vide.",
-    "The rate limit must be a non-negative number (0: no limit)": "La limite de débit ne doit pas être négative (0: Aucune limite)",
+    "The rate limit must be a non-negative number (0: no limit)": "La limite de débit ne doit pas être négative (0 = pas de limite)",
    "The rescan interval must be a non-negative number of seconds.": "L'intervalle d'analyse ne doit pas être un nombre négatif de secondes.",
-    "They are retried automatically and will be synced when the error is resolved.": "Ils seront réessayés automatiquement et synchronisés quand l'erreur sera résolue.",
-    "This Device": "Cette machine",
+    "They are retried automatically and will be synced when the error is resolved.": "Ils seront automatiquement retentés et synchronisés quand l'erreur sera résolue.",
+    "This Device": "Cet appareil",
    "This can easily give hackers access to read and change any files on your computer.": "Ceci peut aisément permettre à un intrus de lire et modifier n'importe quel fichier de votre ordinateur.",
-    "This is a major version upgrade.": "Ceci est une mise à jour majeure.",
-    "Trash Can File Versioning": "Gestion des versions de fichier style poubelle.",
+    "This is a major version upgrade.": "Il s'agit d'une mise à jour majeure.",
+    "Trash Can File Versioning": "Style poubelle",
    "Unknown": "Inconnu",
    "Unshared": "Non partagé",
    "Unused": "Non utilisé",
@@ -231,21 +224,22 @@
    "Upgrade": "Mettre à jour",
    "Upgrade To {%version%}": "Mettre à jour vers {{version}}",
    "Upgrading": "Mise à jour de Syncthing",
-    "Upload Rate": "Vitesse d'émission",
+    "Upload Rate": "Débit d'envoi",
    "Uptime": "Durée de fonctionnement",
    "Use HTTPS for GUI": "Utiliser l'HTTPS pour le GUI",
    "Version": "Version",
    "Versions Path": "Emplacement des versions",
    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Les versions seront supprimées automatiquement, si elles dépassent la durée maximum de conservation, ou si leur nombre est supérieur à la valeur autorisée dans l'intervalle.",
-    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Attention, ce chemin est un sous-répertoire du partage existant \"{{otherFolder}}\". Ceci peut causer des problèmes tels que duplications de fichiers ou suppressions intempestives sur les autres machines.",
-    "When adding a new device, keep in mind that this device must be added on the other side too.": "Lorsqu'une machine est ajoutée, gardez à l'esprit que cette machine doit aussi être ajoutée de l'autre coté.",
-    "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.": "Lorsqu'un nouveau dossier est ajouté, gardez à l'esprit que son ID est utilisé pour lier les dossiers à travers les machines. Les ID sont sensibles à la casse et doivent être identiques à travers tous les nœuds.",
+    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Attention, ce chemin est un sous-répertoire du partage existant \"{{otherFolder}}\". Ceci peut causer des problèmes tels que duplications de fichiers ou suppressions intempestives sur les autres appareils.",
+    "When adding a new device, keep in mind that this device must be added on the other side too.": "Lorsque vous ajoutez un appareil, gardez à l'esprit que le votre doit aussi être ajouté de l'autre coté.",
+    "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.": "Lorsqu'un nouveau partage est ajouté, gardez à l'esprit que son ID est utilisée pour lier les répertoires à travers les appareils. L'ID est sensible à la casse et sera forcément la même sur tous les appareils participant à ce partage.",
    "Yes": "Oui",
    "You must keep at least one version.": "Vous devez garder au minimum une version.",
    "days": "Jours",
+    "directories": "répertoires",
+    "files": "Fichiers",
    "full documentation": "documentation complète",
-    "items": "fichiers",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} veut partager le dossier \"{{folder}}\".",
-    "{%device%} wants to share folder \"{%folderLabel%}\" ({%folder%}).": "{{device}} vous invite au partage \"{{folderLabel}}\" ({{folder}}).",
-    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} vous invite au partage \"{{folderLabel}}\" ({{folder}})."
+    "items": "éléments",
+    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} vous invite au partage \"{{folder}}\".",
+    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} vous invite au partage \"{{folderlabel}}\" ({{folder}})."
 }
--- a/gui/default/assets/lang/lang-fy.json
+++ b/gui/default/assets/lang/lang-fy.json
@@ -31,34 +31,32 @@
    "Command": "Kommando",
    "Comment, when used at the start of a line": "Kommentaar, wannear as brûkt by it begjin fan in rige",
    "Compression": "Kompresje",
+    "Configured": "Konfigureart",
    "Connection Error": "Ferbiningsflater",
    "Connection Type": "Ferbiningstype",
    "Copied from elsewhere": "Oernommen fan earne oars",
    "Copied from original": "Oernommen fan orizjineel",
    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 de folgende bydragers:",
-    "Copyright © 2015 the following Contributors:": "Copyright © 2015 de folgende bydragers:",
    "Danger!": "Gefaar!",
-    "Delete": "Fuortsmite",
    "Deleted": "Fuortsmiten",
    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Apparaat \"{{name}}\" {{device}} op ({{address}}) wol ferbining meitsje. Nij apparaat taheakje?",
    "Device ID": "Apparaat-ID",
    "Device Identification": "Apparaatidentifikaasje",
    "Device Name": "Apparaatnamme",
-    "Device {%device%} ({%address%}) wants to connect. Add new device?": "Apparaat {{device}} ({{address}}) wol ferbining meitsje. Nij apparaat taheakje?",
    "Devices": "Apparaten",
    "Disconnected": "Ferbining ferbrutsen",
+    "Discovered": "Untdekt",
    "Discovery": "Untdekking",
    "Documentation": "Dokumintaasje",
    "Download Rate": "Ynlaadfluggens",
    "Downloaded": "Ynladen",
    "Downloading": "Oan it ynladen",
    "Edit": "Bewurkje",
-    "Edit Device": "Apparaat bewurkje",
-    "Edit Folder": "Map bewurkje",
+    "Edit Device": "Apparaat Bewurkje",
+    "Edit Folder": "Map Bewurkje",
    "Editing": "Bewurkjen",
    "Enable NAT traversal": "NAT-trochkruse ynskeakelje",
    "Enable Relaying": "Trochjaan tastean",
-    "Enable UPnP": "UPnP oansette",
    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Fier troch komma's skieden (\"tcp://ip:port\", \"tcp://host:port\") adressen yn of \"dynamic\" om automatyske ûntdekking fan it adres út te fieren.",
    "Enter ignore patterns, one per line.": "Fier negearpatroanen yn, ien per rigel.",
    "Error": "Flater",
@@ -73,7 +71,6 @@
    "Folder": "Map",
    "Folder ID": "Map-ID",
    "Folder Label": "Map-opskrift",
-    "Folder Master": "Map-master",
    "Folder Path": "Map-paad",
    "Folder Type": "Maptype",
    "Folders": "Mappen",
@@ -83,7 +80,6 @@
    "GUI Listen Addresses": "Harkadres foar GUI",
    "Generate": "Generearje",
    "Global Discovery": "Wrâldwide ûntdekking",
-    "Global Discovery Server": "Wrâldwide ûntdekkingstsjinner",
    "Global Discovery Servers": "Wrâldwide ûntdekkingstsjinners",
    "Global State": "Wrâldwide tastân",
    "Help": "Help",
@@ -101,6 +97,7 @@
    "Last Scan": "Lêst Skent",
    "Last seen": "Lêst sjoen",
    "Later": "Letter",
+    "Latest Change": "Meast Resinte Feroarings",
    "Listeners": "Harkers",
    "Local Discovery": "Lokale ûntdekking",
    "Local State": "Lokale tastân",
@@ -141,9 +138,7 @@
    "Quick guide to supported patterns": "Fluch-paadwizer foar stipe patroanen",
    "RAM Utilization": "RAM-brûken",
    "Random": "Willekeurich",
-    "Relay Servers": "Trochjoutsjinners",
-    "Relayed via": "Trochjûn fia",
-    "Relays": "Trochjouers",
+    "Reduced by ignore patterns": "Ferlytse troch negear-patroanen",
    "Release Notes": "Utjeftenotysjes",
    "Remote Devices": "Apparaten op Ofstân",
    "Remove": "Fuortsmite",
@@ -161,6 +156,8 @@
    "Scanning": "Oan it skennen",
    "Select the devices to share this folder with.": "Sykje de apparaten út om dizze map mei te dielen.",
    "Select the folders to share with this device.": "Sykje de mappen út om mei dit apparaat te dielen.",
+    "Send & Receive": "Stjoere & Untfange",
+    "Send Only": "Allinnich Stjoere",
    "Settings": "Ynstellings",
    "Share": "Diele",
    "Share Folder": "Map diele",
@@ -168,7 +165,6 @@
    "Share With Devices": "Diele mei apparaten",
    "Share this folder?": "Dizze map diele?",
    "Shared With": "Dielt mei",
-    "Short identifier for the folder. Must be the same on all cluster devices.": "Koarte ID foar de map. Moat op alle bondelapparaten itselde wêze.",
    "Show ID": "ID sjen litte",
    "Show QR": "QR sjen litte",
    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Wurd ynstee fan apparaat-ID sjen litten by de bondeltastân. Wurd nei oare apparaten advertearre as in mooglike standertnamme.",
@@ -194,16 +190,13 @@
    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "It liket dêrop dat Syncthing swierrichheden ûnderfynt mei it ferwurkjen fan jo fersyk. Graach de stee ferfarskje of Syncthing werstarte as it probleem der bliuwt.",
    "The Syncthing admin interface is configured to allow remote access without a password.": "De Syncthing haadbrûker-ynterfaasje is sa ynstelt dat tagong fan ôfstân sûnder wachtwurd tastean is.",
    "The aggregated statistics are publicly available at the URL below.": "De fersammele statistiken binnen yn it publyk beskikber fia ûndersteande keppeling.",
-    "The aggregated statistics are publicly available at {%url%}.": "De fersammele statistiken binnen yn it publyk beskikber op {{url}}.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "De konfiguraasje is bewarre mar noch net aktivearre.  Syncthing moat werstarte om de nije konfiguraasje te aktivearren.",
    "The device ID cannot be blank.": "It apparaat-ID kin net leech wêze.",
    "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).": "It apparaat-ID dat hjir ynfierd wurde kin, kin fûn wurde yn in it \"Askjes > ID sjen litte\" dialooch op de oare apparaten. Spaasjes en streepkes binne mooglik (wurde negeard).",
-    "The device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "It apparaat-ID dat hjir ynfierd wurde kin, kin fûn wurde yn in it \"Bewurkje > ID sjen litte\" dialooch op de oare apparaten. Spaasjes en streepkes binne mooglik (wurde negeard).",
    "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.": "It ferkaaide brûkensrapport wurd eltse dei ferstjoerd. It wurd brûkt om algemiene platfoarmen, mapgruttens en app-ferzjes by te hâlden. As de rapportearre dataset feroaret, krije jo dit dialooch wer te sjen.",
    "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.": "Dit ynfierde apparaat-ID liket ûnjildich. It moat in tekenrige (string) wêze mei in lingte fan 52 of 56 karakters besteande út letters en nûmers, mei spaasjes en streepkes mooglik.",
    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "De earste parameter yn de kommando-rigel is it paad fan de map, de twadde parameter is it relative paad yn de map.",
    "The folder ID cannot be blank.": "It map-ID mei net leech wêze.",
-    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "It map-ID moat in koart opskrift wêze (64 karakters of minder) allinnich besteande út letters, nûmers en punt- (.), streep- (-) en lizzend-streepkekarakters (_) .",
    "The folder ID must be unique.": "It map-ID moat unyk wêze.",
    "The folder path cannot be blank.": "It map-paad mei net leech wêze.",
    "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 folgende yntervals wurd brûkt: foar it earste oere wurd eltse 30 sekonden in ferzje bewarre, foar de earste dei wurd eltse oere in ferzje bewarre, foar de earste 30 dagen wurd eltse dei in ferzje bewarre, oant ta de maksimale âldens wurd eltse wike in ferzje bewarre.",
@@ -243,9 +236,10 @@
    "Yes": "Ja",
    "You must keep at least one version.": "Jo moatte minstens ien ferzje bewarje.",
    "days": "dagen",
+    "directories": "triemtafels",
+    "files": "triemmen",
    "full documentation": "komplete dokumintaasje",
    "items": "items",
    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} wol map \"{{folder}}\" diele.",
-    "{%device%} wants to share folder \"{%folderLabel%}\" ({%folder%}).": "{{device}} wol de map \"{{folderLabel}}\" ({{folder}}) diele.",
    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} wol map \"{{folderlabel}}\" ({{folder}}) diele."
 }
--- a/gui/default/assets/lang/lang-hu.json
+++ b/gui/default/assets/lang/lang-hu.json
@@ -31,22 +31,21 @@
    "Command": "Parancs",
    "Comment, when used at the start of a line": "Megjegyzés, a sor elején használva",
    "Compression": "Tömörítés",
+    "Configured": "Beállított",
    "Connection Error": "Kapcsolódási hiba",
    "Connection Type": "Kapcsolat típus",
    "Copied from elsewhere": "Máshonnan másolva",
    "Copied from original": "Eredetiről másolva",
    "Copyright © 2014-2016 the following Contributors:": "Szerzői jog © 2014-2016 az alábbi közreműködők:",
-    "Copyright © 2015 the following Contributors:": "Copyright © 2015 az alábbi közreműködők:",
    "Danger!": "Veszély!",
-    "Delete": "Törlés",
    "Deleted": "Törölve",
    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "\"{{name}}\" eszköz ({{device}} @ {{address}}) szeretne csatlakozni. Hozzáadod az új eszközt?",
    "Device ID": "Eszköz azonosító",
    "Device Identification": "Eszköz azonosító",
    "Device Name": "Eszköz neve",
-    "Device {%device%} ({%address%}) wants to connect. Add new device?": "{{device}} ({{address}}) csatlakozni szeretne. Hozzáadod az új eszközt?",
    "Devices": "Eszközök",
    "Disconnected": "Kapcsolat bontva",
+    "Discovered": "Felfedezett",
    "Discovery": "Felfedezés",
    "Documentation": "Dokumentáció",
    "Download Rate": "Letöltési sebesség",
@@ -58,9 +57,8 @@
    "Editing": "Szerkesztés",
    "Enable NAT traversal": "NAT bejárás engedélyezése",
    "Enable Relaying": "Közvetítés engedélyezése",
-    "Enable UPnP": "UPnP engedélyezése",
    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Vesszővel elválasztva több cím is bevihető (\"tcp://ip:port\", \"tcp://host:port\"), az automatikus felderítéshez a 'dynamic' kulcsszó használatos. ",
-    "Enter ignore patterns, one per line.": "Figyelmen kívül hagyáshoz ide írhatod a mintákat, soronként egyet",
+    "Enter ignore patterns, one per line.": "Add meg a kihagyási mintákat, soronként egyet.",
    "Error": "Hiba",
    "External File Versioning": "Külső fájl verziókövetés",
    "Failed Items": "Hibás elemek",
@@ -73,7 +71,6 @@
    "Folder": "Mappa",
    "Folder ID": "Mappa azonosító",
    "Folder Label": "Mappa címke",
-    "Folder Master": "Központi mappa",
    "Folder Path": "Mappa elérési útja",
    "Folder Type": "Mappa típus",
    "Folders": "Mappák",
@@ -83,13 +80,12 @@
    "GUI Listen Addresses": "Grafikus felület címe",
    "Generate": "Generálás",
    "Global Discovery": "Globális felfedezés",
-    "Global Discovery Server": "Globális felfedező kiszolgáló",
    "Global Discovery Servers": "Globális felfedező kiszolgálók",
    "Global State": "Globális állapot",
    "Help": "Súgó",
    "Home page": "Főoldal",
    "Ignore": "Figyelmen kívül hagyás",
-    "Ignore Patterns": "Minták figyelmen kívül hagyása",
+    "Ignore Patterns": "Kihagyási minták",
    "Ignore Permissions": "Jogosultságok figyelmen kívül hagyása",
    "Incoming Rate Limit (KiB/s)": "Bejövő sebesség korlát (KIB/mp)",
    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Helytelen konfiguráció esetén károsodhat a mappák tartalma és működésképtelenné válhat a Syncthing.",
@@ -101,6 +97,7 @@
    "Last Scan": "Utolsó vizsgálat",
    "Last seen": "Utoljára látva",
    "Later": "Később",
+    "Latest Change": "Utolsó módosítás",
    "Listeners": "Kapcsolatok",
    "Local Discovery": "Helyi felfedezés",
    "Local State": "Helyi állapot",
@@ -141,9 +138,7 @@
    "Quick guide to supported patterns": "Rövid útmutató a használható mintákról",
    "RAM Utilization": "Memória használat",
    "Random": "Véletlenszerű",
-    "Relay Servers": "Közvetítő kiszolgálók",
-    "Relayed via": "Közvetítve",
-    "Relays": "Közvetítések",
+    "Reduced by ignore patterns": "Kihagyási mintákkal csökkentve",
    "Release Notes": "Kiadási megjegyzések",
    "Remote Devices": "Távoli eszközök",
    "Remove": "Eltávolítás",
@@ -161,6 +156,8 @@
    "Scanning": "Átnézés",
    "Select the devices to share this folder with.": "Válaszd ki az eszközöket, amelyekkel meg szeretnéd osztani a mappát",
    "Select the folders to share with this device.": "Válaszd ki a mappákat, amiket meg szeretnél osztani ezzel az eszközzel.",
+    "Send & Receive": "Küldés és fogadás",
+    "Send Only": "Csak küldés",
    "Settings": "Beállítások",
    "Share": "Megosztás",
    "Share Folder": "Mappa megosztása",
@@ -168,7 +165,6 @@
    "Share With Devices": "Megosztás más eszközzel",
    "Share this folder?": "Megosztod ezt a mappát?",
    "Shared With": "Megosztva ezekkel:",
-    "Short identifier for the folder. Must be the same on all cluster devices.": "Rövid mappaazonosító. Minden megosztott eszközön azonosnak kell lennie.",
    "Show ID": "Azonosító mutatása",
    "Show QR": "QR-kód mutatása",
    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Az eszköz azonosító helyett jelenik meg. A többi eszközön alapértelmezett névként használható. ",
@@ -194,16 +190,13 @@
    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Úgy tűnik, hogy a Syncthing problémába ütközött a kérés feldolgozása során. Ha a probléma továbbra is fennáll, akkor frissíteni kell az oldalt, vagy újra kell indítani a Syncthinget.",
    "The Syncthing admin interface is configured to allow remote access without a password.": "A Syncthing adminisztrációs felületének távoli elérése be van kapcsolva jelszó nélkül.",
    "The aggregated statistics are publicly available at the URL below.": "Az összesített statisztikák elérhetők az alábbi címen.",
-    "The aggregated statistics are publicly available at {%url%}.": "Az összevont statisztikák nyilvánosan elérhetők a {{url}} címen.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "A beállítások elmentésre kerültek, de nem lettek aktiválva. Indítsd újra a Syncthing-et, hogy aktiváld őket.",
    "The device ID cannot be blank.": "Az eszköz azonosító nem lehet üres.",
    "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).": "Az itt megadandó eszközazonosító a másik eszköz Műveletek > Azonosító mutatása című ablakában látható. Szóközök és kötőjelek használhatók (nem számítanak).",
-    "The device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "Az eszköz azonosító az \"Azonosító mutatása\" ablakban található az eszközökön. A szóközök és kötőjelek opcionálisak (nem lesznek figyelembe véve)",
    "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.": "A titkosított felhasználási adatok naponta kerülnek küldésre. Arra használjuk őket hogy kövessük a különböző platformokat, mappa méreteket és program verziókat. Amennyiben az elküldésre kerülő adat megváltozik, ez az ablak újra megjelenik.",
    "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.": "A beírt eszköz azonosító nem valódi. Az azonosító 52 vagy 56 karakter hosszú, számokból és betűkből áll, opcionálisan szóközöket és kötőjeleket tartalmaz.",
    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "Az első parancssori paraméter a mappa elérési útja, a második a relatív elérési út a mappában.",
    "The folder ID cannot be blank.": "A mappa azonosító nem lehet üres.",
-    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "A mappa azonosító rövid (maximum 64 karakter), betűkből, számokból és a pont (.), kötőjel (-) és alulvonás (_) karakterekből állhat.",
    "The folder ID must be unique.": "A mappa azonosító egyedi kell legyen",
    "The folder path cannot be blank.": "Az elérési út nem lehet üres",
    "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.": "A következő intervallumokat használjuk: egy régi verziót őrzünk meg az első órában minden 30 másodpercben, az első nap minden órában, az első 30 napban minden nap, egészen addig amíg el nem érjük a maximálisan megtartható verziók számát minden héten.",
@@ -243,9 +236,10 @@
    "Yes": "Igen",
    "You must keep at least one version.": "Legalább egy verziót meg kell tartanod.",
    "days": "nap",
+    "directories": "könyvtárak",
+    "files": "fájlok",
    "full documentation": "teljes dokumentáció",
    "items": "elem",
    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} meg szeretné osztani a \"{{folder}}\" nevű mappát.",
-    "{%device%} wants to share folder \"{%folderLabel%}\" ({%folder%}).": "{{device}} meg szeretné osztani \"{{folderLabel}}\" ({{folder}}) mappát.",
    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} szeretné megosztani \"{{folderlabel}}\" ({{folder}}) mappát."
 }
--- a/gui/default/assets/lang/lang-id.json
+++ b/gui/default/assets/lang/lang-id.json
@@ -31,34 +31,32 @@
    "Command": "Perintah",
    "Comment, when used at the start of a line": "Komentar, digunakan saat awal baris",
    "Compression": "Kompresi",
+    "Configured": "Configured",
    "Connection Error": "Koneksi Galat",
    "Connection Type": "Connection Type",
    "Copied from elsewhere": "Tersalin dari tempat lain",
    "Copied from original": "Tersalin dari asal",
    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 the following Contributors:",
-    "Copyright © 2015 the following Contributors:": "Hak cipta © 2015 Kontributor berikut ini:",
    "Danger!": "Bahaya!",
-    "Delete": "Hapus",
    "Deleted": "Terhapus",
    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Device \"{{name}}\" ({{device}} at {{address}}) wants to connect. Add new device?",
    "Device ID": "ID Perangkat",
    "Device Identification": "Identifikasi Perangkat",
    "Device Name": "Nama Perangkat",
-    "Device {%device%} ({%address%}) wants to connect. Add new device?": "Perangkat {{device}} ({{address}}) ingin tersambung. Tambah perangkat baru?",
    "Devices": "Perangkat",
    "Disconnected": "Terputus",
+    "Discovered": "Discovered",
    "Discovery": "Discovery",
    "Documentation": "Dokumentasi",
    "Download Rate": "Download Rate",
    "Downloaded": "Terunduh",
    "Downloading": "Mengunduh",
    "Edit": "Sunting",
-    "Edit Device": "Sunting Perangkat",
-    "Edit Folder": "Sunting Folder",
+    "Edit Device": "Edit Device",
+    "Edit Folder": "Edit Folder",
    "Editing": "Menyunting",
    "Enable NAT traversal": "Enable NAT traversal",
    "Enable Relaying": "Aktifkan Relay",
-    "Enable UPnP": "Aktifkan UPnP",
    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Masukkan alamat, pisahkan dengan koma  (\"tcp://ip:port\", \"tcp://host:port\") atau \"dynamic\" untuk menjalankan penemuan otomatis alamat tersebut.",
    "Enter ignore patterns, one per line.": "Masukkan pola pengabaian, satu per baris.",
    "Error": "Galat",
@@ -73,7 +71,6 @@
    "Folder": "Folder",
    "Folder ID": "ID Folder",
    "Folder Label": "Folder Label",
-    "Folder Master": "Master Folder",
    "Folder Path": "Path Folder",
    "Folder Type": "Folder Type",
    "Folders": "Folder",
@@ -83,7 +80,6 @@
    "GUI Listen Addresses": "Alamat Listen GUI",
    "Generate": "Buat Baru",
    "Global Discovery": "Discovery Global",
-    "Global Discovery Server": "Global Discovery Server",
    "Global Discovery Servers": "Global Discovery Servers",
    "Global State": "Status Global",
    "Help": "Panduan",
@@ -101,6 +97,7 @@
    "Last Scan": "Last Scan",
    "Last seen": "Last seen",
    "Later": "Later",
+    "Latest Change": "Latest Change",
    "Listeners": "Listeners",
    "Local Discovery": "Local Discovery",
    "Local State": "Local State",
@@ -141,9 +138,7 @@
    "Quick guide to supported patterns": "Quick guide to supported patterns",
    "RAM Utilization": "RAM Utilization",
    "Random": "Random",
-    "Relay Servers": "Relay Servers",
-    "Relayed via": "Relayed via",
-    "Relays": "Relays",
+    "Reduced by ignore patterns": "Reduced by ignore patterns",
    "Release Notes": "Release Notes",
    "Remote Devices": "Remote Devices",
    "Remove": "Remove",
@@ -161,6 +156,8 @@
    "Scanning": "Scanning",
    "Select the devices to share this folder with.": "Select the devices to share this folder with.",
    "Select the folders to share with this device.": "Select the folders to share with this device.",
+    "Send & Receive": "Send & Receive",
+    "Send Only": "Send Only",
    "Settings": "Settings",
    "Share": "Share",
    "Share Folder": "Share Folder",
@@ -168,7 +165,6 @@
    "Share With Devices": "Share With Devices",
    "Share this folder?": "Share this folder?",
    "Shared With": "Shared With",
-    "Short identifier for the folder. Must be the same on all cluster devices.": "Short identifier for the folder. Must be the same on all cluster devices.",
    "Show ID": "Show ID",
    "Show QR": "Show QR",
    "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.",
@@ -194,16 +190,13 @@
    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.",
    "The Syncthing admin interface is configured to allow remote access without a password.": "The Syncthing admin interface is configured to allow remote access without a password.",
    "The aggregated statistics are publicly available at the URL below.": "The aggregated statistics are publicly available at the URL below.",
-    "The aggregated statistics are publicly available at {%url%}.": "The aggregated statistics are publicly available at {{url}}.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.",
    "The device ID cannot be blank.": "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 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 device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "The device ID to enter here can be found in the \"Edit > 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 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.": "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 first command line parameter is the folder path and the second parameter is the relative path in the folder.": "The first command line parameter is the folder path and the second parameter is the relative path in the folder.",
    "The folder ID cannot be blank.": "The folder ID cannot be blank.",
-    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.",
    "The folder ID must be unique.": "The folder ID must be unique.",
    "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.",
@@ -243,9 +236,10 @@
    "Yes": "Yes",
    "You must keep at least one version.": "You must keep at least one version.",
    "days": "days",
+    "directories": "directories",
+    "files": "files",
    "full documentation": "full documentation",
    "items": "items",
    "{%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}})."
 }
--- a/gui/default/assets/lang/lang-it.json
+++ b/gui/default/assets/lang/lang-it.json
@@ -31,22 +31,21 @@
    "Command": "Comando",
    "Comment, when used at the start of a line": "Per commentare, va inserito all'inizio di una riga",
    "Compression": "Compressione",
+    "Configured": "Configurato",
    "Connection Error": "Errore di Connessione",
    "Connection Type": "Tipo di Connessione",
    "Copied from elsewhere": "Copiato da qualche altra parte",
    "Copied from original": "Copiato dall'originale",
    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 i seguenti Collaboratori:",
-    "Copyright © 2015 the following Contributors:": "Copyright © 2015 i seguenti Collaboratori:",
    "Danger!": "Pericolo!",
-    "Delete": "Elimina",
    "Deleted": "Cancellato",
    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Il dispositivo \"{{name}}\" ({{device}} - {{address}}) chiede di connettersi. Aggiungere il nuovo dispositivo?",
    "Device ID": "ID Dispositivo",
    "Device Identification": "Identificazione Dispositivo",
    "Device Name": "Nome Dispositivo",
-    "Device {%device%} ({%address%}) wants to connect. Add new device?": "Il dispositivo {{device}} ({{address}}) chiede di connettersi. Aggiungere il nuovo dispositivo?",
    "Devices": "Dispositivi",
    "Disconnected": "Disconnesso",
+    "Discovered": "Individuato",
    "Discovery": "Individuazione",
    "Documentation": "Documentazione",
    "Download Rate": "Velocità Download",
@@ -58,7 +57,6 @@
    "Editing": "Modifica di",
    "Enable NAT traversal": "Abilita NAT traversal",
    "Enable Relaying": "Abilita Reindirizzamento",
-    "Enable UPnP": "Attiva UPnP",
    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Inserisci indirizzi separati da virgola (\"tcp://ip:porta\", \"tcp://host:porta\")  oppure \"dynamic\" per effettuare il rilevamento automatico dell'indirizzo.",
    "Enter ignore patterns, one per line.": "Inserisci gli schemi di esclusione, uno per riga.",
    "Error": "Errore",
@@ -73,7 +71,6 @@
    "Folder": "Cartella",
    "Folder ID": "ID Cartella",
    "Folder Label": "Etichetta per la Cartella",
-    "Folder Master": "Cartella Principale",
    "Folder Path": "Percorso Cartella",
    "Folder Type": "Tipo di Cartella",
    "Folders": "Cartelle",
@@ -83,7 +80,6 @@
    "GUI Listen Addresses": "Indirizzi dell'Interfaccia Grafica",
    "Generate": "Genera",
    "Global Discovery": "Individuazione Globale",
-    "Global Discovery Server": "Server di Individuazione Globale",
    "Global Discovery Servers": "Server di Individuazione Globale",
    "Global State": "Stato Globale",
    "Help": "Aiuto",
@@ -98,10 +94,11 @@
    "Keep Versions": "Versioni Mantenute",
    "Largest First": "Prima il più grande",
    "Last File Received": "Ultimo File Ricevuto",
-    "Last Scan": "Ultima scansione",
+    "Last Scan": "Ultima Scansione",
    "Last seen": "Ultima connessione",
    "Later": "Più Tardi",
-    "Listeners": "In ascolto",
+    "Latest Change": "Ultima Modifica",
+    "Listeners": "In Ascolto",
    "Local Discovery": "Individuazione Locale",
    "Local State": "Stato Locale",
    "Local State (Total)": "Stato Locale (Totale)",
@@ -141,9 +138,7 @@
    "Quick guide to supported patterns": "Guida veloce agli schemi supportati",
    "RAM Utilization": "Utilizzo RAM",
    "Random": "Casuale",
-    "Relay Servers": "Server di Reindirizzamento",
-    "Relayed via": "Reindirizzato tramite",
-    "Relays": "Reindirizzamenti",
+    "Reduced by ignore patterns": "Ridotto da schemi di esclusione",
    "Release Notes": "Note di Rilascio",
    "Remote Devices": "Dispositivi Remoti",
    "Remove": "Rimuovi",
@@ -161,6 +156,8 @@
    "Scanning": "Scansione in corso",
    "Select the devices to share this folder with.": "Seleziona i dispositivi con i quali condividere questa cartella.",
    "Select the folders to share with this device.": "Seleziona le cartelle da condividere con questo dispositivo.",
+    "Send & Receive": "Invia & Ricevi",
+    "Send Only": "Invia Soltanto",
    "Settings": "Impostazioni",
    "Share": "Condividi",
    "Share Folder": "Condividi la Cartella",
@@ -168,7 +165,6 @@
    "Share With Devices": "Condividi con i Dispositivi",
    "Share this folder?": "Vuoi condividere questa cartella?",
    "Shared With": "Condiviso Con",
-    "Short identifier for the folder. Must be the same on all cluster devices.": "Breve identificatore della cartella. Deve essere lo stesso su tutti i dispositivi del cluster.",
    "Show ID": "Mostra ID",
    "Show QR": "Mostra QR",
    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Visibile al posto dell'ID Dispositivo nello stato del cluster. Negli altri dispositivi verrà presentato come nome predefinito opzionale.",
@@ -194,16 +190,13 @@
    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Sembra che Syncthing abbia problemi nell'elaborazione della tua richiesta. Aggiorna la pagina o riavvia Syncthing se il problema persiste.",
    "The Syncthing admin interface is configured to allow remote access without a password.": "L'interfaccia di amministrazione di Syncthing è configurata in modo da permettere l'accesso senza password.",
    "The aggregated statistics are publicly available at the URL below.": "Le statistiche aggregate sono disponibili pubblicamente all'URL seguente.",
-    "The aggregated statistics are publicly available at {%url%}.": "Le statistiche aggregate sono disponibili pubblicamente su {{url}}.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "La configurazione è stata salvata ma non attivata. Syncthing deve essere riavviato per attivare la nuova configurazione.",
    "The device ID cannot be blank.": "L'ID del dispositivo non può essere vuoto.",
    "The device ID to enter here can be found in the \"Actions > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "L'ID del dispositivo da inserire qui può essere trovato nella finestra \"Azioni> Mostra ID\" sull'altro dispositivo. Gli spazi e i trattini sono opzionali (ignorati).",
-    "The device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "L'ID del dispositivo da inserire qui può essere trovato nella finestra \"Modifica> Mostra ID\" sull'altro dispositivo. Gli spazi e i trattini sono opzionali (ignorati).",
    "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.": "Quotidianamente il software invia le statistiche di utilizzo in forma criptata. Questi dati riguardano i sistemi operativi utilizzati, le dimensioni delle cartelle e le versioni del software. Se i set di dati riportati vengono modificati, verrà mostrata nuovamente questa finestra di dialogo.",
    "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 dispositivo inserito non sembra valido. Dovrebbe essere una stringa di 52 o 56 caratteri costituita da lettere e numeri, con spazi e trattini opzionali.",
    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "Il primo parametro della riga di comando è il percorso della cartella e il secondo parametro è il percorso relativo nella cartella.",
    "The folder ID cannot be blank.": "L'ID della cartella non può essere vuoto.",
-    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "L'ID della cartella dev'essere un identificatore breve (64 caratteri o meno) costituito solamente da lettere, numeri, punti (.), trattini (-) e trattini bassi (_).",
    "The folder ID must be unique.": "L'ID della cartella dev'essere unico.",
    "The folder path cannot be blank.": "Il percorso della cartella non può essere vuoto.",
    "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.": "Vengono utilizzati i seguenti intervalli temporali: per la prima ora viene mantenuta una versione ogni 30 secondi, per il primo giorno viene mantenuta una versione ogni ora, per i primi 30 giorni viene mantenuta una versione al giorno, successivamente viene mantenuta una versione ogni settimana fino al periodo massimo impostato.",
@@ -232,7 +225,7 @@
    "Upgrade To {%version%}": "Aggiorna alla {{version}}",
    "Upgrading": "Aggiornamento",
    "Upload Rate": "Velocità Upload",
-    "Uptime": "Tempo di funzionamento",
+    "Uptime": "Tempo di Funzionamento",
    "Use HTTPS for GUI": "Utilizza HTTPS per l'interfaccia grafica",
    "Version": "Versione",
    "Versions Path": "Percorso Cartella Versioni",
@@ -243,9 +236,10 @@
    "Yes": "Sì",
    "You must keep at least one version.": "È necessario mantenere almeno una versione.",
    "days": "giorni",
+    "directories": "cartelle",
+    "files": "file",
    "full documentation": "documentazione completa",
    "items": "elementi",
    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} vuole condividere la cartella \"{{folder}}\".",
-    "{%device%} wants to share folder \"{%folderLabel%}\" ({%folder%}).": "{{device}} vuole condividere la cartella \"{{folderLabel}}\" ({{folder}}).",
    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} vuole condividere la cartella \"{{folderlabel}}\" ({{folder}})."
 }
--- a/gui/default/assets/lang/lang-ja.json
+++ b/gui/default/assets/lang/lang-ja.json
@@ -8,7 +8,7 @@
    "Add": "追加",
    "Add Device": "デバイスを追加",
    "Add Folder": "フォルダーを追加",
-    "Add Remote Device": "他のデバイスを追加",
+    "Add Remote Device": "接続先デバイスを追加",
    "Add new folder?": "新しいフォルダーとして追加しますか?",
    "Address": "アドレス",
    "Addresses": "アドレス",
@@ -31,22 +31,21 @@
    "Command": "コマンド",
    "Comment, when used at the start of a line": "行頭で使用された場合、コメント行",
    "Compression": "圧縮",
+    "Configured": "設定値",
    "Connection Error": "接続エラー",
    "Connection Type": "接続種別",
    "Copied from elsewhere": "別ファイルからコピー済",
    "Copied from original": "元ファイルからコピー済",
    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 the following Contributors:",
-    "Copyright © 2015 the following Contributors:": "Copyright © 2015 the following Contributors:",
    "Danger!": "危険",
-    "Delete": "削除",
    "Deleted": "削除",
    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "デバイス「{{name}}」 ({{address}} の {{device}}) が接続を求めています。新しいデバイスとして追加しますか?",
    "Device ID": "デバイスID",
    "Device Identification": "デバイス識別情報",
    "Device Name": "デバイス名",
-    "Device {%device%} ({%address%}) wants to connect. Add new device?": "デバイス {{device}} ({{address}}) が接続を求めています。新しいデバイスとして追加しますか?",
    "Devices": "デバイス",
    "Disconnected": "切断中",
+    "Discovered": "探索結果",
    "Discovery": "探索サーバー",
    "Documentation": "マニュアル",
    "Download Rate": "ダウンロード速度",
@@ -58,7 +57,6 @@
    "Editing": "編集中",
    "Enable NAT traversal": "NATトラバーサルを有効にする",
    "Enable Relaying": "中継サーバー経由の通信を有効にする",
-    "Enable UPnP": "UPnPを有効にする",
    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "アドレスを指定する場合は「tcp://IPアドレス:ポート」または「tcp://ホスト名:ポート」をコンマで区切って入力してください。自動探索を行う場合は「dynamic」と入力してください。",
    "Enter ignore patterns, one per line.": "無視するファイル名のパターンを、一行につき一条件で入力してください。",
    "Error": "エラー",
@@ -73,7 +71,6 @@
    "Folder": "フォルダー",
    "Folder ID": "フォルダーID",
    "Folder Label": "フォルダー名",
-    "Folder Master": "フォルダーのマスター",
    "Folder Path": "フォルダーパス",
    "Folder Type": "フォルダーの種類",
    "Folders": "フォルダー",
@@ -83,7 +80,6 @@
    "GUI Listen Addresses": "GUI待ち受けアドレスリスト",
    "Generate": "生成",
    "Global Discovery": "大域探索",
-    "Global Discovery Server": "大域探索サーバー",
    "Global Discovery Servers": "大域探索サーバー",
    "Global State": "グローバル状態",
    "Help": "ヘルプ",
@@ -101,6 +97,7 @@
    "Last Scan": "最終スキャン時刻",
    "Last seen": "最終接続日時",
    "Later": "後で設定",
+    "Latest Change": "最終更新内容",
    "Listeners": "待ち受けポート",
    "Local Discovery": "LAN内で探索",
    "Local State": "ローカル状態",
@@ -141,11 +138,9 @@
    "Quick guide to supported patterns": "サポートされているパターンの簡易ガイド",
    "RAM Utilization": "メモリ使用量",
    "Random": "ランダム",
-    "Relay Servers": "中継サーバー",
-    "Relayed via": "経由している中継サーバーのアドレス",
-    "Relays": "中継サーバー",
+    "Reduced by ignore patterns": "無視パターン該当分を除く",
    "Release Notes": "リリースノート",
-    "Remote Devices": "他のデバイス",
+    "Remote Devices": "接続先デバイス",
    "Remove": "除去",
    "Required identifier for the folder. Must be the same on all cluster devices.": "フォルダーの識別子で、必須です。このフォルダーを共有する全てのデバイス上で同一でなくてはなりません。",
    "Rescan": "再スキャン",
@@ -161,6 +156,8 @@
    "Scanning": "スキャン中",
    "Select the devices to share this folder with.": "このフォルダーを共有するデバイスを選択してください。",
    "Select the folders to share with this device.": "このデバイスと共有するフォルダーを選択してください。",
+    "Send & Receive": "送受信",
+    "Send Only": "送信のみ",
    "Settings": "設定",
    "Share": "共有",
    "Share Folder": "フォルダーを共有する",
@@ -168,7 +165,6 @@
    "Share With Devices": "共有対象のデバイス",
    "Share this folder?": "このフォルダーを共有しますか?",
    "Shared With": "共有相手",
-    "Short identifier for the folder. Must be the same on all cluster devices.": "このフォルダーの短い識別子。このフォルダーを共有する全てのデバイス上で同じである必要があります。",
    "Show ID": "IDを表示",
    "Show QR": "QRコードを表示",
    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "ステータス画面でデバイスIDの代わりに表示されます。他のデバイスに対してもデフォルトの名前として通知されます。",
@@ -194,16 +190,13 @@
    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "リクエストの処理に問題があるようです。問題が継続する場合、ページを更新するか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 aggregated statistics are publicly available at {%url%}.": "集計結果は {{url}} でどなたでもご覧いただけます。",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "設定が保存されましたが、まだ有効になっていません。新しい設定を有効にするにはSyncthingを再起動してください。",
    "The device ID cannot be blank.": "デバイスIDは空欄にできません。",
    "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).": "ここに入力するデバイスIDは、接続したい相手側デバイスの [メニュー]→[IDを表示] で確認することができます。スペースとハイフンは入力しなくてもかまいません。",
-    "The device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "ここに入力するデバイスIDは、接続したい相手側デバイスの [メニュー]→[IDを表示] で確認することができます。スペースとハイフンは入力しなくてもかまいません。",
    "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.": "入力されたデバイスIDが正しくありません。デバイスIDは、52文字または56文字のアルファベットと数字からなる文字列です。スペースとハイフンは入力してもしなくてもかまいません。",
    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "第1コマンドライン引数はフォルダーのパス、第2引数はフォルダー内の相対パスです。",
    "The folder ID cannot be blank.": "フォルダーIDは空欄にできません。",
-    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "フォルダーIDは64文字以内で、アルファベット、数字、ドット (.)、ハイフン (-)、アンダースコア (_) のみを使うことができます。",
    "The folder ID must be unique.": "フォルダーIDが重複しています。",
    "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.": "保存間隔は次の通りです。最近1時間は30秒ごとに古いバージョンを保存します。同様に、最近1日間は1時間ごとに、最近30日間は1日ごとに、その後最大寿命までは1週間ごとに、古いバージョンを保存します。",
@@ -243,9 +236,10 @@
    "Yes": "はい",
    "You must keep at least one version.": "少なくとも一つのバージョンを保存してください。",
    "days": "日",
+    "directories": "個のディレクトリ",
+    "files": "個のファイル",
    "full documentation": "詳細なマニュアル",
    "items": "項目",
    "{%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}}) を共有するよう求めています。"
 }
--- a/gui/default/assets/lang/lang-ko-KR.json
+++ b/gui/default/assets/lang/lang-ko-KR.json
@@ -31,22 +31,21 @@
    "Command": "커맨드",
    "Comment, when used at the start of a line": "명령행에서 시작을 할수 있어요.",
    "Compression": "압축",
+    "Configured": "설정됨",
    "Connection Error": "연결 에러",
    "Connection Type": "연결 종류",
    "Copied from elsewhere": "다른 곳에서 복사됨",
    "Copied from original": "원본에서 복사됨",
    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 the following Contributors:",
-    "Copyright © 2015 the following Contributors:": "Copyright © 2015 the following Contributors:",
    "Danger!": "경고!",
-    "Delete": "삭제",
    "Deleted": "삭제됨",
    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "다른 기기 {{device}} ({{address}}) 에서 접속을 요청했습니다. 새 장치를 추가하시겠습니까?",
    "Device ID": "기기 ID",
    "Device Identification": "기기 식별자",
    "Device Name": "기기 이름",
-    "Device {%device%} ({%address%}) wants to connect. Add new device?": "다른 기기 {{device}} ({{address}}) 에서 접속을 요청했습니다. 새 장치를 추가하시겠습니까?",
    "Devices": "기기",
    "Disconnected": "연결 끊김",
+    "Discovered": "탐색됨",
    "Discovery": "탐색",
    "Documentation": "문서",
    "Download Rate": "다운로드 속도",
@@ -58,7 +57,6 @@
    "Editing": "편집",
    "Enable NAT traversal": "NAT traversal 활성화",
    "Enable Relaying": "Relaying 활성화",
-    "Enable UPnP": "UPnP 활성화",
    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "주소 자동 검색을 하기 위해서는 \"ip:port\" 형식의 주소들을 쉼표로 구분해서 입력하거나 \"dynamic\"을 입력하세요.",
    "Enter ignore patterns, one per line.": "무시할 패턴을 한 줄에 하나씩 입력하세요.",
    "Error": "오류",
@@ -73,7 +71,6 @@
    "Folder": "폴더",
    "Folder ID": "폴더 ID",
    "Folder Label": "폴더 라벨",
-    "Folder Master": "폴더 소유자",
    "Folder Path": "폴더 경로",
    "Folder Type": "폴더 유형",
    "Folders": "폴더",
@@ -83,7 +80,6 @@
    "GUI Listen Addresses": "GUI 주소",
    "Generate": "생성",
    "Global Discovery": "글로벌 탐색",
-    "Global Discovery Server": "글로벌 탐색 서버",
    "Global Discovery Servers": "글로벌 탐색 서버",
    "Global State": "글로벌 서버 상태",
    "Help": "도움말",
@@ -101,6 +97,7 @@
    "Last Scan": "마지막 탐색",
    "Last seen": "마지막 접속",
    "Later": "나중에",
+    "Latest Change": "최신 변경",
    "Listeners": "수신자",
    "Local Discovery": "로컬 노드 검색",
    "Local State": "로컬 상태",
@@ -141,9 +138,7 @@
    "Quick guide to supported patterns": "지원하는 패턴에 대한 빠른 도움말",
    "RAM Utilization": "RAM 사용량",
    "Random": "무작위",
-    "Relay Servers": "중계 서버",
-    "Relayed via": "중계 중인 서버 주소",
-    "Relays": "중계",
+    "Reduced by ignore patterns": "Reduced by ignore patterns",
    "Release Notes": "릴리즈 노트",
    "Remote Devices": "원격 기기",
    "Remove": "삭제",
@@ -161,6 +156,8 @@
    "Scanning": "탐색중",
    "Select the devices to share this folder with.": "이 폴더를 공유할 장치를 선택합니다.",
    "Select the folders to share with this device.": "이 장치와 공유할 폴더를 선택합니다.",
+    "Send & Receive": "송신 & 수신",
+    "Send Only": "송신 전용",
    "Settings": "설정",
    "Share": "공유",
    "Share Folder": "폴더 공유",
@@ -168,7 +165,6 @@
    "Share With Devices": "공유할 기기",
    "Share this folder?": "이 폴더를 공유하시겠습니까?",
    "Shared With": "~와 공유",
-    "Short identifier for the folder. Must be the same on all cluster devices.": "간단한 폴더 식별자입니다. 모든 장치에서 동일해야 합니다.",
    "Show ID": "내 기기 ID",
    "Show QR": "QR 코드 보기",
    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "장치에 대한 아이디로 표시됩니다. 옵션에 얻은 기본이름으로 다른장치에 통보합니다.",
@@ -194,16 +190,13 @@
    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing에서 요청을 처리하는 중에 문제가 발생했습니다. 계속 문제가 발생하면 페이지를 다시 불러오거나 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 aggregated statistics are publicly available at {%url%}.": "수집된 통계는 {{URL}} 에서 공개적으로 볼 수 있습니다.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "설정이 저장되었지만 활성화되지 않았습니다. 설정을 활성화 하려면 Syncthing을 다시 시작하세요.",
    "The device ID cannot be blank.": "기기 ID는 비워 둘 수 없습니다.",
    "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).": "여기에 입력한 기기 ID가 다른 장치의 \"동작 - ID 보기\"에 표시됩니다. 공백과 하이픈은 세지 않습니다. 즉 무시됩니다.",
-    "The device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "여기에 입력한 기기 ID가 다른 장치의 \"편집 - ID 보기\"에 표시됩니다. 공백과 하이픈은 세지 않습니다. 즉 무시됩니다.",
    "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.": "입력한 기기 ID가 올바르지 않습니다. 52/56자의 알파벳과 숫자로 구성되어 있으며, 공백과 하이픈은 포함되지 않습니다.",
    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "첫 명령행 옵션은 폴더 경로이고 두 번째 명령행 옵션은 폴더의 상대 경로입니다.",
    "The folder ID cannot be blank.": "폴더 ID는 비워 둘 수 없습니다.",
-    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "폴더 ID는 문자, 숫자, 마침표(.), 붙임표(-), 밑줄 문자(_)로만 구성되어 있는 짧은 식별자(64자 이하)여야 합니다.",
    "The folder ID must be unique.": "폴더 ID는 중복될 수 없습니다.",
    "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초마다 유지되며, 첫 하루 동안은 매 시간, 첫 한 달 동안은 매 일마다 유지됩니다. 그리고 최대 날짜까지는 버전이 매 주마다 유지됩니다.",
@@ -243,9 +236,10 @@
    "Yes": "예",
    "You must keep at least one version.": "최소 한 개의 버전은 유지해야 합니다.",
    "days": "일",
+    "directories": "디렉토리",
+    "files": "파일",
    "full documentation": "전체 문서",
    "items": "항목",
    "{%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}})를 공유하길 원합니다."
 }
--- a/gui/default/assets/lang/lang-lt.json
+++ b/gui/default/assets/lang/lang-lt.json
@@ -31,34 +31,32 @@
    "Command": "Komanda",
    "Comment, when used at the start of a line": "Komentaras naudojamas naujoje eilutėje",
    "Compression": "Kompresija",
+    "Configured": "Sukonfigūruotas",
    "Connection Error": "Susijungimo klaida",
    "Connection Type": "Ryšio tipas",
    "Copied from elsewhere": "Nukopijuota iš kitur",
    "Copied from original": "Nukopijuota iš originalo",
    "Copyright © 2014-2016 the following Contributors:": "Autorių teisės © 2014-2016 šių bendraautorių:",
-    "Copyright © 2015 the following Contributors:": "Visos teisės saugomos © 2015 šių bendraautorių:",
    "Danger!": "Pavojus!",
-    "Delete": "Ištrinti",
    "Deleted": "Ištrinta",
    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Įrenginys \"{{name}}\" ({{device}} {{address}}) nori prisijungti. Pridėti naują įrenginį?",
    "Device ID": "Įrenginio ID",
    "Device Identification": "Įrenginio identifikacija",
    "Device Name": "Įrenginio pavadinimas",
-    "Device {%device%} ({%address%}) wants to connect. Add new device?": "Įrenginys {{device}} ({{address}}) nori prisijungti. Pridėti naują įrenginį?",
    "Devices": "Įrenginiai",
    "Disconnected": "Atsijungęs",
+    "Discovered": "Atrastas",
    "Discovery": "Lokacija",
    "Documentation": "Aprašymas",
    "Download Rate": "Parsisiuntimo greitis",
    "Downloaded": "Parsisiųstas",
    "Downloading": "Siunčiama",
    "Edit": "Redaguoti",
-    "Edit Device": "Keisti įrenginį",
-    "Edit Folder": "Keisti aplanką",
+    "Edit Device": "Redaguoti įrenginį",
+    "Edit Folder": "Redaguoti aplanką",
    "Editing": "Redagavimas",
    "Enable NAT traversal": "Leisti kirsti NAT",
    "Enable Relaying": "Įjungti retransliavimą",
-    "Enable UPnP": "Įjungti UPnP",
    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Įveskite kableliais atskirtus (\"tcp://ip:prievadas\", \"tcp://serveris:prievadas\") adresus arba \"dynamic\", kad atliktumėte automatinį adresų aptikimą.",
    "Enter ignore patterns, one per line.": "Suveskite nepaisomus šablonus, kiekvieną naujoje eilutėje.",
    "Error": "Klaida",
@@ -73,7 +71,6 @@
    "Folder": "Aplankas",
    "Folder ID": "Aplanko ID",
    "Folder Label": "Aplanko etiketė",
-    "Folder Master": "Aplanko vadovas",
    "Folder Path": "Kelias iki aplanko",
    "Folder Type": "Aplanko tipas",
    "Folders": "Aplankai",
@@ -83,12 +80,11 @@
    "GUI Listen Addresses": "Valdymo skydelio adresas",
    "Generate": "Sukurti",
    "Global Discovery": "Visuotinis  matomumas",
-    "Global Discovery Server": "Visuotinio matomumo serveris",
    "Global Discovery Servers": "Visuotinio matomumo serveriai",
    "Global State": "Visuotinė būsena",
    "Help": "Pagalba",
    "Home page": "Pagrindinis puslapis",
-    "Ignore": "Ignoruoti",
+    "Ignore": "Nepaisyti",
    "Ignore Patterns": "Nepaisyti šablonų",
    "Ignore Permissions": "Nepaisyti failų prieigos leidimų",
    "Incoming Rate Limit (KiB/s)": "Įeinančio srauto maksimalus greitis (KiB/s)",
@@ -101,6 +97,7 @@
    "Last Scan": "Paskutinis nuskaitymas",
    "Last seen": "Paskutinį kartą matytas",
    "Later": "Vėliau",
+    "Latest Change": "Paskutinis pakeitimas",
    "Listeners": "Klausytojai",
    "Local Discovery": "Vietinis matomumas",
    "Local State": "Vietinė būsena",
@@ -141,9 +138,7 @@
    "Quick guide to supported patterns": "Trumpas leistinų šablonų vadovas",
    "RAM Utilization": "Atminties naudojimas",
    "Random": "Atsitiktinė",
-    "Relay Servers": "Retransliavimo serveriai",
-    "Relayed via": "Retransliuojama per",
-    "Relays": "Retransliatoriai",
+    "Reduced by ignore patterns": "Sumažinta pagal nepaisomus šablonus",
    "Release Notes": "Laidos Informacija",
    "Remote Devices": "Nuotoliniai įrenginiai",
    "Remove": "Pašalinti",
@@ -161,6 +156,8 @@
    "Scanning": "Skenuojama",
    "Select the devices to share this folder with.": "Pasirinkite įrenginius, su kuriais dalinsitės šį aplanką.",
    "Select the folders to share with this device.": "Pasirinkite aplankus kuriais norite dalintis su šiuo įrenginiu.",
+    "Send & Receive": "Siųsti ir gauti",
+    "Send Only": "Tik siųsti",
    "Settings": "Nustatymai",
    "Share": "Dalintis",
    "Share Folder": "Dalintis aplanku",
@@ -168,7 +165,6 @@
    "Share With Devices": "Dalintis su įrenginiais",
    "Share this folder?": "Dalintis šiuo aplanku?",
    "Shared With": "Dalinamasi su",
-    "Short identifier for the folder. Must be the same on all cluster devices.": "Trumpas aplanko identifikatorius. Privalo būti toks pat visuose įrenginiuose.",
    "Show ID": "Rodyti ID",
    "Show QR": "Rodyti QR",
    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Grupės būsenoje rodomas vietoje įrenginio vardo. Kiti įrenginiai matys kaip pasirinktinį vardą.",
@@ -194,16 +190,13 @@
    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Atrodo, kad Syncthing, vykdydamas jūsų užklausą, susidūrė su problemomis. Prašome iš naujo įkelti puslapį, arba jei problema išlieka, iš naujo paleisti Syncthing.",
    "The Syncthing admin interface is configured to allow remote access without a password.": "Syncthing administratoriaus sąsaja yra sukonfigūruota taip, kad be slaptažodžio leistų nuotolinę prieigą.",
    "The aggregated statistics are publicly available at the URL below.": "Naudojimosi ataskaitą galite peržiūrėti žemiau nurodytu URL adresu.",
-    "The aggregated statistics are publicly available at {%url%}.": "Naudojimosi ataskaitą galite peržiūrėti adresu: {{url}}.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Nauji nustatymai išsaugoti, bet neaktyvuoti. Perleiskite Syncthing programą iš naujo norėdami įgalinti naujus nustatymus.",
    "The device ID cannot be blank.": "Įrenginio ID negali būti tuščias.",
    "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).": "Įrenginio ID, kurį čia reikia įvesti, galite rasti „Veiksmai > Rodyti ID“ dialoge kitame įrenginyje. Tarpai ir brūkšneliai nebūtini (ignoruojami).",
-    "The device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "Įrenginio ID, kurį čia reikia įvesti, gali būti rastas „Redaguoti > Rodyti ID“ dialoge kitame įrenginyje. Tarpai ir brūkšneliai nebūtini (ignoruojami).",
    "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.": "Kas dieną siunčiama šifruota naudojimo ataskaita. Ji naudojama sekti, kokios platformos naudojamos, aplankų dydžius ir programų versijas. Jei siunčiamų duomenų turinys pasikeis, šis dialogas bus parodytas iš naujo.",
    "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.": "Įvestas neteisingas įrenginio ID. Turi būti 52 ar 56 simbolių eilutė su raidėmis ir skaičiais kuriuos galima atskirti tarpu arba brūkšneliu.",
    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "Pirmasis komandų eilutės parametras yra aplanko kelias, o antrasis parametras yra santykinis kelias aplanke.",
    "The folder ID cannot be blank.": "Aplanko ID negali būti tuščias.",
-    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "Aplanko vardas negali būti ilgesnis nei 64 simboliai. Galima naudoti tik raides ir skaičius bet tašką (.), brūkšnelį (-) ir pabraukimą (_).",
    "The folder ID must be unique.": "Aplanko ID turi būti unikalus.",
    "The folder path cannot be blank.": "Kelias iki aplanko negali būti tuščias.",
    "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.": "Šie pertraukų nustatymai naudojami: pirmą valandą versijos laikomos 30 sekundžių, pirmą dieną versijos laikomos valandą, pirmas 30 dienų versijos laikomos parą, kol nebus viršytas nustatytas maksimalus amžius.",
@@ -243,9 +236,10 @@
    "Yes": "Taip",
    "You must keep at least one version.": "Būtina saugoti bent vieną versiją.",
    "days": "dienos",
+    "directories": "papkės",
+    "files": "failai",
    "full documentation": "pilna dokumentacija",
    "items": "įrašai",
    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} nori dalintis aplanku \"{{folder}}\"",
-    "{%device%} wants to share folder \"{%folderLabel%}\" ({%folder%}).": "{{device}} nori dalintis aplanku \"{{folderLabel}}\" ({{folder}}).",
    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} nori dalintis aplanku \"{{folderlabel}}\" ({{folder}})."
 }
--- a/gui/default/assets/lang/lang-nb.json
+++ b/gui/default/assets/lang/lang-nb.json
@@ -6,20 +6,20 @@
    "About": "Om",
    "Actions": "Handlinger",
    "Add": "Legg til",
-    "Add Device": "Legg til Enhet",
-    "Add Folder": "Legg til Mappe",
+    "Add Device": "Legg til enhet",
+    "Add Folder": "Legg til mappe",
    "Add Remote Device": "Legg til ekstern enhet",
    "Add new folder?": "Legg til ny mappe?",
    "Address": "Adresse",
    "Addresses": "Adresser",
    "Advanced": "Avansert",
-    "Advanced Configuration": "Avanserte Innstillinger",
+    "Advanced Configuration": "Avanserte innstillinger",
    "Advanced settings": "Avanserte innstillinger ",
    "All Data": "Alle data",
-    "Allow Anonymous Usage Reporting?": "Tillat Anonym Innsamling Av Brukerdata?",
+    "Allow Anonymous Usage Reporting?": "Tillat anonym innsamling av brukerdata?",
    "Alphabetic": "Alfabetisk",
    "An external command handles the versioning. It has to remove the file from the synced folder.": "En ekstern kommando håndterer versjonkontrollen. Den må fjerne filen fra den synkroniserte katalogen.",
-    "Anonymous Usage Reporting": "Anonym Innsamling Av Brukerdata",
+    "Anonymous Usage Reporting": "Anonym innsamling av brukerdata",
    "Any devices configured on an introducer device will be added to this device as well.": "Enheter konfigurert på en introduksjonsenhet vil også bli lagt til denne enheten.",
    "Automatic upgrades": "Automatiske oppdateringer",
    "Be careful!": "Vær forsiktig!",
@@ -31,38 +31,36 @@
    "Command": "Kommando",
    "Comment, when used at the start of a line": "Kommentar, når det blir brukt i starten av en linje.",
    "Compression": "Komprimering",
+    "Configured": "Konfigurert",
    "Connection Error": "Tilkoblingsfeil",
    "Connection Type": "Tilkoblingstype",
    "Copied from elsewhere": "Kopiert fra et annet sted",
    "Copied from original": "Kopiert fra original",
    "Copyright © 2014-2016 the following Contributors:": "Opphavsrett © 2014-2016 for følgende bidragsytere:",
-    "Copyright © 2015 the following Contributors:": "Opphavsrett © 2015 de følgende bidragsytere:",
    "Danger!": "Fare!",
-    "Delete": "Slett",
    "Deleted": "Slettet",
    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Enhet \"{{name}}\" ({{device}} på {{address}}) ønsker å koble til. Legge til ny enhet?",
    "Device ID": "Enhets ID",
    "Device Identification": "Enhetskjennemerke",
-    "Device Name": "Navn på Enhet",
-    "Device {%device%} ({%address%}) wants to connect. Add new device?": "Enhet {{device}} ({{address}}) ønsker å koble seg til. Legg til ny enhet?",
+    "Device Name": "Navn på enhet",
    "Devices": "Enheter",
    "Disconnected": "Frakoblet",
+    "Discovered": "Oppdaget",
    "Discovery": "Oppslag",
    "Documentation": "Dokumentasjon",
    "Download Rate": "Nedlastingsrate",
    "Downloaded": "Lastet ned",
    "Downloading": "Laster ned",
    "Edit": "Rediger",
-    "Edit Device": "Rediger Enhet",
-    "Edit Folder": "Rediger Mappe",
+    "Edit Device": "Rediger enhet",
+    "Edit Folder": "Rediger katalog",
    "Editing": "Redigerer",
    "Enable NAT traversal": "Slå på NAT traversering",
    "Enable Relaying": "Aktiver relésending",
-    "Enable UPnP": "Aktiver UPnP",
    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Skriv inn kommaseparerte (\"tcp://ip:port\", \"tcp://host:port\") adresser, eller ordet \"dynamic\" for å gjøre automatisk oppslag for adressen.",
    "Enter ignore patterns, one per line.": "Skriv inn mønster som skal utelates, ett per linje.",
    "Error": "Feilmelding",
-    "External File Versioning": "Ekstern Versjonskontroll",
+    "External File Versioning": "Ekstern versjonskontroll",
    "Failed Items": "Elementsynkronisering som har feilet",
    "File Pull Order": "Filenes Henterekkefølge",
    "File Versioning": "Versjonskontroll",
@@ -73,7 +71,6 @@
    "Folder": "Katalog",
    "Folder ID": "Mappe ID",
    "Folder Label": "Merkelapp for katalog",
-    "Folder Master": "Styrende Mappe",
    "Folder Path": "Mappeplassering",
    "Folder Type": "Katalogtype",
    "Folders": "Mapper",
@@ -83,41 +80,41 @@
    "GUI Listen Addresses": "GUI Lytteadresse",
    "Generate": "Generer",
    "Global Discovery": "Globalt oppslag",
-    "Global Discovery Server": "Global oppslagstjener",
    "Global Discovery Servers": "Globale oppslagstjenere",
-    "Global State": "Global Tilstand",
+    "Global State": "Global tilstand",
    "Help": "Hjelp",
    "Home page": "Hjemmeside",
    "Ignore": "Ignorer",
    "Ignore Patterns": "Utelatelsesmønster",
    "Ignore Permissions": "Ignorer Tilgangsbit",
-    "Incoming Rate Limit (KiB/s)": "Innkommende Hastighetsbegrensning (KiB/s)",
+    "Incoming Rate Limit (KiB/s)": "Innkommende hastighetsbegrensning (KiB/s)",
    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Feilaktige innstillinger kan skade innholdet i dine delte kataloger og hindre Syncthing i å fungere.",
    "Introducer": "Introduktør",
    "Inversion of the given condition (i.e. do not exclude)": "Invers av den gitte tilstanden (t.d. ikke ekskluder)",
-    "Keep Versions": "Behold Versjoner",
+    "Keep Versions": "Behold versjoner",
    "Largest First": "Største fil",
    "Last File Received": "Siste mottatte fil",
    "Last Scan": "Siste gjennomsøking",
    "Last seen": "Sist sett",
    "Later": "Senere",
+    "Latest Change": "Sist endret",
    "Listeners": "Lyttere",
    "Local Discovery": "Lokalt oppslag",
-    "Local State": "Lokal Tilstand",
-    "Local State (Total)": "Lokal Tilstand (Total)",
-    "Major Upgrade": "Hovedoppgradering",
-    "Master": "Hoved",
-    "Maximum Age": "Maksimal Levetid",
+    "Local State": "Lokal tilstand",
+    "Local State (Total)": "Lokal tilstand (Total)",
+    "Major Upgrade": "Storoppgradering",
+    "Master": "Beskyttet",
+    "Maximum Age": "Maksimal levetid",
    "Metadata Only": "Kun metadata",
    "Minimum Free Disk Space": "Nødvendig ledig diskplass",
    "Move to top of queue": "Flytt fremst i køen",
    "Multi level wildcard (matches multiple directory levels)": "Multinivåsøk (søker på flere mappenivå)",
    "Never": "Aldri",
-    "New Device": "Ny Enhet",
-    "New Folder": "Ny Mappe",
+    "New Device": "Ny enhet",
+    "New Folder": "Ny mappe",
    "Newest First": "Den nyeste først",
    "No": "Nei",
-    "No File Versioning": "Ingen Versjonskontroll",
+    "No File Versioning": "Ingen versjonskontroll",
    "Normal": "Normal",
    "Notice": "Merknader",
    "OK": "OK",
@@ -126,24 +123,22 @@
    "Optional descriptive label for the folder. Can be different on each device.": "Valgfri merkelapp på katalogen. Denne kan være ulik på forskjellige enheter",
    "Options": "Valg",
    "Out of Sync": "Ikke synkronisert",
-    "Out of Sync Items": "Ikke Synkroniserte Element",
-    "Outgoing Rate Limit (KiB/s)": "Utgående Hastighetsbegrensning (KiB/s)",
-    "Override Changes": "Overstyr Endringer",
+    "Out of Sync Items": "Ikke synkroniserte element",
+    "Outgoing Rate Limit (KiB/s)": "Utgående hastighetsbegrensning (KiB/s)",
+    "Override Changes": "Overstyr endringer",
    "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": "Plasseringen av mappen på datamaskinen. Denne vil bli opprettet dersom den ikke finnes. Krøllstrektegnet (~) kan brukes som forkortelse for",
    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Plasseringen for lagrede versjoner (la denne være tom for å bruke standard .stversions-mappen i mappen).",
    "Pause": "Oppholde",
    "Paused": "Oppholdt",
-    "Please consult the release notes before performing a major upgrade.": "Se \"release notes\" før en hovedoppgradering utføres.",
+    "Please consult the release notes before performing a major upgrade.": "Se \"release notes\" før en storoppgradering utføres.",
    "Please set a GUI Authentication User and Password in the Settings dialog.": "Vennligst angi bruker og passord for GUI-autentisering i innstillingsvinduet.",
    "Please wait": "Vennligst vent",
    "Preview": "Forhåndsvisning",
-    "Preview Usage Report": "Forhåndsvisning Av Datainnsamling",
+    "Preview Usage Report": "Forhåndsvisning av datainnsamling",
    "Quick guide to supported patterns": "Kjapp innføring i godkjente mønster",
    "RAM Utilization": "RAM-utnyttelse",
    "Random": "Tilfeldig",
-    "Relay Servers": "Relé servere",
-    "Relayed via": "Relé via",
-    "Relays": "Reléer",
+    "Reduced by ignore patterns": "Reduser med utelatelsesmønster",
    "Release Notes": "Utgivelsesnotat",
    "Remote Devices": "Andre enheter",
    "Remove": "Fjern",
@@ -152,8 +147,8 @@
    "Rescan All": "Gjennomsøk alt på nytt",
    "Rescan Interval": "Intervall for gjennomsøking",
    "Restart": "Omstart",
-    "Restart Needed": "Omstart Kreves",
-    "Restarting": "Starter På Ny",
+    "Restart Needed": "Omstart kreves",
+    "Restarting": "Starter på nytt",
    "Resume": "Gjenoppta",
    "Reused": "Gjenbrukt",
    "Save": "Lagre",
@@ -161,30 +156,31 @@
    "Scanning": "Gjennomsøker",
    "Select the devices to share this folder with.": "Velg enhetene du vil dele denne mappen med.",
    "Select the folders to share with this device.": "Velg hvilke mapper som skal deles med denne enheten.",
+    "Send & Receive": "Sende og motta",
+    "Send Only": "Bare sende",
    "Settings": "Innstillinger",
    "Share": "Del",
-    "Share Folder": "Del Mappe",
-    "Share Folders With Device": "Del Mapper Med Enhet",
-    "Share With Devices": "Del Med Enheter",
+    "Share Folder": "Del mappe",
+    "Share Folders With Device": "Del mapper med enhet",
+    "Share With Devices": "Del med enheter",
    "Share this folder?": "Dele denne mappen?",
    "Shared With": "Delt med",
-    "Short identifier for the folder. Must be the same on all cluster devices.": "Kort kjennemerke på mappen. Må være det samme på alle enheter i en gruppe.",
    "Show ID": "Vis ID",
    "Show QR": "Vis QR kode",
-    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Vis i stedet for Eining ID i gruppestatus. Vil bli kringkastet til andre enheter som et valgfritt standardnavn.",
-    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Vist i stedet for Mappe-ID i gruppestatus. Vil bli oppdatert til navnet enheten kringkaster dersom tomt.",
+    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Vis i stedet for enhets ID i gruppestatus. Vil bli kringkastet til andre enheter som et valgfritt standardnavn.",
+    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Vist i stedet for mappe ID i gruppestatus. Vil bli oppdatert til navnet enheten kringkaster dersom tomt.",
    "Shutdown": "Avslutt",
    "Shutdown Complete": "Avslutning fullført",
-    "Simple File Versioning": "Enkel Versjonskontroll",
+    "Simple File Versioning": "Enkel versjonskontroll",
    "Single level wildcard (matches within a directory only)": "Enkeltnivåsøk (søker kun i en mappe)",
    "Smallest First": "Den minste først",
    "Source Code": "Kildekode",
    "Staggered File Versioning": "Forskjøvet Versjonskontroll",
-    "Start Browser": "Start Nettleser",
+    "Start Browser": "Start nettleser",
    "Statistics": "Statistikk",
    "Stopped": "Stoppa",
    "Support": "Brukerstøtte",
-    "Sync Protocol Listen Addresses": "Lytteadresse For Synkroniseringsprotokoll",
+    "Sync Protocol Listen Addresses": "Lytteadresse for synkroniseringsprotokoll",
    "Syncing": "Synkroniserer",
    "Syncthing has been shut down.": "Syncthing har blitt slått av.",
    "Syncthing includes the following software or portions thereof:": "Syncthing inkluderer helt eller delvis følgende programvare:",
@@ -194,16 +190,13 @@
    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing ser ut til å ha støtt på et problem under behandling av din forespørsel. Vennligst oppfrisk nettleseren eller start Syncthing på nytt dersom problemet vedvarer.",
    "The Syncthing admin interface is configured to allow remote access without a password.": "Grensesnittet for administrering av Syncthing er satt til å tillate ekstern tilgang uten et passord.",
    "The aggregated statistics are publicly available at the URL below.": "Samlet statistikk er åpent tilgjengelig via URL som er angitt under",
-    "The aggregated statistics are publicly available at {%url%}.": "Samlet statistikk er åpent tilgjengelig på {{url}}.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Innstillingene har blitt lagret men ikke aktivert. Syncthing må starte på ny for å aktivere de nye innstillingene.",
    "The device ID cannot be blank.": "Enhets-ID kan ikke være tom.",
    "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).": "Enhets id som skal skrives her kan du finne i menyen \"Handlinger\" > \"Vis id\" på den andre enheten. Mellomrom og strek er valgfritt (ignoreres)",
-    "The device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "Enhet-IDen lagt til her kan hentes fram via \"Rediger > Vis ID\"-dialogboksen på den andre enheten. Mellomrom og bindestrek er valgfritt (blir ignorert).",
    "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.": "Kryptert informasjon om bruken av programmet blir gjort daglig. Dette blir brukt til å følge med på vanlig brukte systemoppsett, størrelser på mapper, og versjoner av programmet. Om datasettet endrer seg vil denne dialogboksen dukke opp og du vil bli bedt om å godkjenne dette.",
    "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.": "IDen for denne enheten er ikke godkjent. Det bør være 52 eller 56 tegn bestående av bokstaver og tall, valgfritt med mellomrom og bindestrek.",
    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "Den første kommandolinje-parameteren er katalog-filbanen, det andre parametere er den relative filbanen i katalogen.",
    "The folder ID cannot be blank.": "Mappe-ID kan ikke være tom.",
-    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "Mappe-IDen må være et kort kjennemerke (64 tegn eller mindre) bestående kun av bokstaver, tall og tegnene punktum (.), mellomrom (-) og strek (_).",
    "The folder ID must be unique.": "Mappe-ID må være unik.",
    "The folder path cannot be blank.": "Mappeplasseringen kan 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.": "Følgende intervall blir brukt: den første timen blir en versjon lagret hvert 30. sekund, den første dagen blir en versjon lagret hver time, de første 30 dagene blir en versjon lagret hver dag, og inntil maksimal levetid blir en versjon lagret hver uke.",
@@ -221,21 +214,21 @@
    "They are retried automatically and will be synced when the error is resolved.": "Disse hentes automatisk og vil synkroniseres når feilen er blitt utbedret.",
    "This Device": "Denne enheten",
    "This can easily give hackers access to read and change any files on your computer.": "Dette kan lett gi hackere tilgang til å lese og endre alle filer på datamaskinen din.",
-    "This is a major version upgrade.": "Dette er en hovedoppgradering",
-    "Trash Can File Versioning": "Papirkurv Versjonskontroll",
+    "This is a major version upgrade.": "Dette er en storoppgradering",
+    "Trash Can File Versioning": "Papirkurv versjonskontroll",
    "Unknown": "Ukjent",
    "Unshared": "Ikke delt",
    "Unused": "Ikke i bruk",
    "Up to Date": "Oppdatert",
    "Updated": "Oppdatert",
    "Upgrade": "Oppgradere",
-    "Upgrade To {%version%}": "Oppgrader Til {{version}}",
+    "Upgrade To {%version%}": "Oppgrader til {{version}}",
    "Upgrading": "Oppgraderer",
    "Upload Rate": "Opplastingsrate",
    "Uptime": "Oppetid",
    "Use HTTPS for GUI": "Bruk HTTPS for GUI",
    "Version": "Versjon",
-    "Versions Path": "Plassering Av Versjoner",
+    "Versions Path": "Plassering av versjoner",
    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Versjoner blir automatisk slettet når maksimal levetid er nådd eller når antall filer er oversteget.",
    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Advarsel, denne stien er en underkatalog i en eksisterende katalog \"{{otherFolder}}\".",
    "When adding a new device, keep in mind that this device must be added on the other side too.": "Merk at når en ny enhet blir lagt til må denne også legges til på andre siden.",
@@ -243,9 +236,10 @@
    "Yes": "Ja",
    "You must keep at least one version.": "Du må beholde minst én versjon",
    "days": "dager",
+    "directories": "kataloger",
+    "files": "filer",
    "full documentation": "all dokumentasjon",
    "items": "elementer",
    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} ønsker å dele mappen \"{{folder}}\".",
-    "{%device%} wants to share folder \"{%folderLabel%}\" ({%folder%}).": "{{device}} ønsker å dele katalogen \"{{folderLabel}}\" ({{folder}}).",
    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} ønsker å dele katalogen \"{{folderlabel}}\" ({{folder}})."
 }
--- a/gui/default/assets/lang/lang-nl.json
+++ b/gui/default/assets/lang/lang-nl.json
@@ -1,6 +1,6 @@
 {
    "A device with that ID is already added.": "Apparaat-ID reeds toegevoegd.",
-    "A negative number of days doesn't make sense.": "Een negatief aantal dagen is niet logisch.",
+    "A negative number of days doesn't make sense.": "Een negatief aantal dagen is niet zinvol.",
    "A new major version may not be compatible with previous versions.": "Een nieuwe major version is misschien niet compatibel met eerdere versies.",
    "API Key": "API-sleutel",
    "About": "Over",
@@ -9,7 +9,7 @@
    "Add Device": "Apparaat toevoegen",
    "Add Folder": "Map toevoegen",
    "Add Remote Device": "Voeg extern apparaat toe",
-    "Add new folder?": "Voeg nieuwe map toe?",
+    "Add new folder?": "Nieuwe map toevoegen?",
    "Address": "Adres",
    "Addresses": "Adressen",
    "Advanced": "Geavanceerd",
@@ -31,34 +31,32 @@
    "Command": "Commando",
    "Comment, when used at the start of a line": "Reageer indien gebruikt aan het begin van een lijn.",
    "Compression": "Compressie",
+    "Configured": "Geconfigureerd",
    "Connection Error": "Verbindingsfout",
    "Connection Type": "Soort verbinding",
    "Copied from elsewhere": "Gekopieerd vanaf elders",
    "Copied from original": "Gekopieerd van het origineel",
    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 voor de volgende bijdragers:",
-    "Copyright © 2015 the following Contributors:": "Copyright © 2015 de volgende Bijdragers:",
    "Danger!": "Let op!",
-    "Delete": "Verwijderen",
    "Deleted": "Verwijderd",
    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Apparaat \"{{name}}\" ({{device}} at {{address}}) wil verbinden. Wil je dit toestaan?",
    "Device ID": "Apparaat-ID",
    "Device Identification": "Apparaat-identificatie",
    "Device Name": "Naam apparaat",
-    "Device {%device%} ({%address%}) wants to connect. Add new device?": "Apparaat {{device}} ({{address}}) wil verbinding maken. Dit apparaat toevoegen?",
    "Devices": "Apparaten",
    "Disconnected": "Niet verbonden",
+    "Discovered": "Ontdekt",
    "Discovery": "Zoeken",
    "Documentation": "Documentatie",
    "Download Rate": "Downloadsnelheid",
    "Downloaded": "Gedownload",
    "Downloading": "Bezig met downloaden",
    "Edit": "Bewerk",
-    "Edit Device": "Bewerk apparaat",
-    "Edit Folder": "Bewerk map",
+    "Edit Device": "Edit Device",
+    "Edit Folder": "Edit Folder",
    "Editing": "Bezig met bewerken",
    "Enable NAT traversal": "Activeer NAT traversal",
    "Enable Relaying": "Activeer doorsturen",
-    "Enable UPnP": "UPnP gebruiken",
    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Voer door komma's gescheiden (\"tcp://ip:port\", \"tcp://host:port\") adressen in of voer \"dynamisch\" in om automatische ontdekking van het adres uit te voeren.",
    "Enter ignore patterns, one per line.": "Voer negeerpatronen in, één per regel.",
    "Error": "Fout",
@@ -73,7 +71,6 @@
    "Folder": "Map",
    "Folder ID": "Map-ID",
    "Folder Label": "Map label",
-    "Folder Master": "Hoofdmap",
    "Folder Path": "Maplocatie",
    "Folder Type": "Soort map",
    "Folders": "Mappen",
@@ -83,7 +80,6 @@
    "GUI Listen Addresses": "GUI-adres",
    "Generate": "Genereer",
    "Global Discovery": "Globaal zoeken",
-    "Global Discovery Server": "Globale zoekserver",
    "Global Discovery Servers": "Globale zoekservers",
    "Global State": "Globale status",
    "Help": "Help",
@@ -101,6 +97,7 @@
    "Last Scan": "Laatste scan",
    "Last seen": "Laatst gezien op",
    "Later": "Later",
+    "Latest Change": "Meest recente wijziging",
    "Listeners": "Luisteraars",
    "Local Discovery": "Lokaal zoeken",
    "Local State": "Lokale status",
@@ -141,9 +138,7 @@
    "Quick guide to supported patterns": "Snelgids voor ondersteunde patronen",
    "RAM Utilization": "Geheugengebruik",
    "Random": "Willekeurig",
-    "Relay Servers": "Doorstuurservers",
-    "Relayed via": "Doorgestuurd via",
-    "Relays": "Relais",
+    "Reduced by ignore patterns": "Verminderd door negeerpatronen",
    "Release Notes": "Release notes",
    "Remote Devices": "Externe apparaten",
    "Remove": "Verwijderen",
@@ -161,6 +156,8 @@
    "Scanning": "Aan het zoeken",
    "Select the devices to share this folder with.": "Selecteer de apparaten om deze map mee te delen.",
    "Select the folders to share with this device.": "Selecteer de mappen om met dit apparaat te delen.",
+    "Send & Receive": "Verzenden & Ontvangen",
+    "Send Only": "Alleen verzenden",
    "Settings": "Instellingen",
    "Share": "Delen",
    "Share Folder": "Deel map",
@@ -168,7 +165,6 @@
    "Share With Devices": "Delen met apparaten",
    "Share this folder?": "Deze map delen?",
    "Shared With": "Gedeeld met",
-    "Short identifier for the folder. Must be the same on all cluster devices.": "Korte aanduiding voor deze map. Moet dezelfde zijn op alle apparaten in het cluster.",
    "Show ID": "Toon ID",
    "Show QR": "QR tonen",
    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Wordt i.p.v. het apparaat-ID getoond in de clusterstatus. Deze naam wordt aan andere apparaten voorgesteld als optionele standaard naam.",
@@ -194,16 +190,13 @@
    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing lijkt een probleem te ondervinden met het verwerken van je verzoek. Refresh de pagina of herstart Syncthing als de problemen zich blijven voordoen. ",
    "The Syncthing admin interface is configured to allow remote access without a password.": "Syncthing's beheerdersinterface is ingesteld om externe toegang zonder wachtwoord toe te staan.",
    "The aggregated statistics are publicly available at the URL below.": "De geaggregeerde statistieken zijn publiek beschikbaar op de onderstaande URL.",
-    "The aggregated statistics are publicly available at {%url%}.": "The verzamelde statistieken zijn publiek beschikbaar op {{url}}",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "De configuratie is opslagen maar nog niet actief. Syncthing moet opnieuw opgestart worden om de nieuwe configuratie te activeren.",
    "The device ID cannot be blank.": "Het apparaat-ID mag niet leeg zijn.",
    "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).": "Het apparaat ID om hier in te vullen kan gevonden worden in het \"Actions > Show ID\" venster op de andere apparaten. Spaties en gedachtestreepjes zijn optioneel (en worden genegeerd). ",
-    "The device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "Het in te vullen apparaat-ID kan gevonden worden in het \"Aanpassen > Toon ID\" scherm op het andere apparaat. Spaties en streepjes zijn optioneel (worden genegeerd).",
    "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.": "Het versleutelde gebruiksrapport wordt dagelijks gestuurd en wordt gebruikt om de verschillende platformen, mappengrootte en versies op te volgen. Als de reeks gegevens wijzigt zal dit scherm opnieuw worden getoond.",
    "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.": "Dit apparaat-ID lijkt ongeldig. Het apparaat-ID bestaat uit 52 of 56 letters en cijfers, spaties en streepjes zijn optioneel.",
    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "De eerste parameter is het pad naar de map en de tweede parameter is het relatieve pad binnen die map.",
    "The folder ID cannot be blank.": "Het map-ID mag niet leeg zijn.",
-    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "De map-ID is een korte aanduiding (maximaal 64 tekens lang) en bestaat enkel uit letters, nummers, punten (.), streepjes (-) en onderstrepingstekens (_).",
    "The folder ID must be unique.": "Het map-ID moet uniek zijn.",
    "The folder path cannot be blank.": "De map locatie mag niet leeg zijn.",
    "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 volgende intervallen worden gebruikt: het eerste uur worden versies iedere 30 seconden bewaard, de eerste dag worden versies ieder uur bewaard, de eerste 30 dagen worden versies iedere dag bewaard, tot de maximale leeftijd worden versies iedere week bewaard.",
@@ -243,9 +236,10 @@
    "Yes": "Ja",
    "You must keep at least one version.": "Minstens 1 versie moet bewaard blijven.",
    "days": "dagen",
+    "directories": "Mappen",
+    "files": "Bestanden",
    "full documentation": "volledige documentatie",
    "items": "objecten",
    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} wil de map \"{{folder}}\" delen.",
-    "{%device%} wants to share folder \"{%folderLabel%}\" ({%folder%}).": "{{device}} wil de map \"{{folderLabel}}\" ({{folder}}) delen.",
    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} wil de map \"{{folderlabel}}\" ({{folder}}) delen."
 }
--- a/gui/default/assets/lang/lang-nn.json
+++ b/gui/default/assets/lang/lang-nn.json
@@ -1,6 +1,6 @@
 {
-    "A device with that ID is already added.": "Ein eining med den ID er allerede lagt til.",
-    "A negative number of days doesn't make sense.": "Eit negativt tal dagar har ikkje meining.",
+    "A device with that ID is already added.": "Ei eining med den ID-en er allereie lagt til.",
+    "A negative number of days doesn't make sense.": "Eit negativt tal dagar gir ikkje meining.",
    "A new major version may not be compatible with previous versions.": "Ein ny hovudversjon er ikkje nødvendigvis kompatibel med eldre versjonar. ",
    "API Key": "API-nøkkel",
    "About": "Om",
@@ -8,17 +8,17 @@
    "Add": "Legg til",
    "Add Device": "Legg Til Eining",
    "Add Folder": "Legg Til Mappe",
-    "Add Remote Device": "Lett Til Ekstern Eining",
+    "Add Remote Device": "Legg til ekstern eining",
    "Add new folder?": "Leggja til ny mappe?",
    "Address": "Adresse",
    "Addresses": "Adresser",
    "Advanced": "Avansert",
    "Advanced Configuration": "Avansert konfigurasjon",
-    "Advanced settings": "Avansert innstillingar",
+    "Advanced settings": "Avanserte innstillingar",
    "All Data": "Alle data",
    "Allow Anonymous Usage Reporting?": "Tillata anonymisert bruksrapportering?",
    "Alphabetic": "Alfabetisk",
-    "An external command handles the versioning. It has to remove the file from the synced folder.": "Ein ekstern kommando håndterer filutgåver. Den må sørge for at fila blir fjerna frå den synkroniserte mappa.",
+    "An external command handles the versioning. It has to remove the file from the synced folder.": "Ein ekstern kommando handterer filutgåver. Den må sørga for at fila blir fjerna frå den synkroniserte mappa.",
    "Anonymous Usage Reporting": "Anonymisert bruksrapportering",
    "Any devices configured on an introducer device will be added to this device as well.": "Einingar konfigurert på ei introduksjonseining vil òg verta lagt til denne eininga.",
    "Automatic upgrades": "Automatiske oppdateringar",
@@ -31,49 +31,46 @@
    "Command": "Kommando",
    "Comment, when used at the start of a line": "Kommentar, når brukt i starten av linja",
    "Compression": "Komprimering",
+    "Configured": "Konfigurert",
    "Connection Error": "Tilkoplingsfeil",
    "Connection Type": "Tilkoplingstype",
    "Copied from elsewhere": "Kopiert frå ein annan stad",
    "Copied from original": "Kopiert frå originalen",
-    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 the following Contributors:",
-    "Copyright © 2015 the following Contributors:": "Opphavsrett © 2015 og desse bidragsytarane:",
+    "Copyright © 2014-2016 the following Contributors:": "Opphavsrett © 2014-2016 for følgjande bidragsyterar:",
    "Danger!": "Fare!",
-    "Delete": "Slett",
    "Deleted": "Sletta",
-    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Eininga \"{{name}}\" {{device}} ({{address}}) vil kopla seg til. Vil du leggja ho til?",
+    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Eininga «{{name}}» {{device}} ({{address}}) vil kopla seg til. Vil du leggja ho til?",
    "Device ID": "Eining ID",
    "Device Identification": "Einingskjennemerke",
    "Device Name": "Namn På Eining",
-    "Device {%device%} ({%address%}) wants to connect. Add new device?": "Eininga {{device}} ({{address}}) vil kopla seg til. Vil du leggja ho til?",
    "Devices": "Einingar",
    "Disconnected": "Fråkopla",
+    "Discovered": "Oppdaga",
    "Discovery": "Oppdaging",
    "Documentation": "Dokumentasjon",
    "Download Rate": "Nedlastingsfart",
    "Downloaded": "Lasta ned",
    "Downloading": "Lastar ned",
    "Edit": "Rediger",
-    "Edit Device": "Rediger Eining",
-    "Edit Folder": "Rediger Mappe",
+    "Edit Device": "Rediger enhet",
+    "Edit Folder": "Rediger katalog",
    "Editing": "Redigerer",
    "Enable NAT traversal": "Slå på NAT-gjennomgang",
-    "Enable Relaying": "Aktiver Reléer",
-    "Enable UPnP": "Aktiver UPnP",
-    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Skriv inn adresser med komma mellom kvar adresse (\"tcp://ip:port\", \"tcp://host:port\"), eller \"dynamic\" for å automatisk søkja opp adressa.",
+    "Enable Relaying": "Aktiver relé",
+    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Skriv inn adresser med komma mellom kvar adresse («tcp://ip:port», «tcp://host:port»), eller «dynamic» for å automatisk søkja opp adressa.",
    "Enter ignore patterns, one per line.": "Skriv inn mønster som skal utelatast, eitt per linje.",
    "Error": "Feilmelding",
    "External File Versioning": "Ekstern filutgåvehandtering",
    "Failed Items": "Feilande element",
    "File Pull Order": "Henterekkefølge for filer",
    "File Versioning": "Filutgåvekontroll",
-    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Informasjon om filrettar vert ignorert når det blir leita etter endringar. Bruk på FAT filsystem. ",
+    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Informasjon om filrettar vert ignorert når det blir leita etter endringar. Bruk på FAT-filsystem. ",
    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Filer som Syncthing slettar eller skriv over vert flytta til katalogen .stversions.",
-    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Filer som Syncthing oppdaterar eller sletter vert flytta til ein datostempla versjon i .stversions-katalogen.",
+    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Filer som Syncthing oppdaterer eller slettar vert flytta til ein datostempla versjon i .stversions-katalogen.",
    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Filer er beskytta mot endringar gjort på andre einingar, men endringar gjort på denne eininga vert sende til resten av klyngja.",
    "Folder": "Mappe",
    "Folder ID": "Mappe ID",
-    "Folder Label": "Merkelapp for Mappe",
-    "Folder Master": "Styrande Mappe",
+    "Folder Label": "Merkelapp for mappa",
    "Folder Path": "Mappeplassering",
    "Folder Type": "Mappetype",
    "Folders": "Mapper",
@@ -83,8 +80,7 @@
    "GUI Listen Addresses": "GUI Lytteadresse",
    "Generate": "Generer",
    "Global Discovery": "Global søking",
-    "Global Discovery Server": "Global søkjetenar",
-    "Global Discovery Servers": "Globalsøkjetenarar",
+    "Global Discovery Servers": "Globale søkjetenarar",
    "Global State": "Global Tilstand",
    "Help": "Hjelp",
    "Home page": "Heimeside",
@@ -92,15 +88,16 @@
    "Ignore Patterns": "Utelatingsmønster",
    "Ignore Permissions": "Ignorer tilgangar",
    "Incoming Rate Limit (KiB/s)": "Innkomande hastigheitsgrense (KiB/s)",
-    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Feil innstillingar kan skade innhaldet i dine delte katalogar og hindre Syncthing i å fungere.",
+    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Feil innstillingar kan skada innhaldet i dine delte katalogar og hindra Syncthing i å fungera.",
    "Introducer": "Introduktør",
    "Inversion of the given condition (i.e. do not exclude)": "Det motsette av den gitte tilstanden (dvs. ekskluder ikkje)",
    "Keep Versions": "Behald Versjonar",
    "Largest First": "Største fyrst",
    "Last File Received": "Siste mottatte fila",
-    "Last Scan": "Siste Skanning",
+    "Last Scan": "Siste skanning",
    "Last seen": "Sist sett",
    "Later": "Seinare",
+    "Latest Change": "Siste endringar",
    "Listeners": "Lyttarar",
    "Local Discovery": "Lokal oppdaging",
    "Local State": "Lokal Tilstand",
@@ -117,37 +114,35 @@
    "New Folder": "Ny mappe",
    "Newest First": "Nyaste fyrst",
    "No": "Nei",
-    "No File Versioning": "Ingen filutgåvehandtering",
+    "No File Versioning": "Inga filutgåvehandtering",
    "Normal": "Normal",
    "Notice": "Merknad",
    "OK": "OK",
    "Off": "Av",
-    "Oldest First": "Elste fyrst",
-    "Optional descriptive label for the folder. Can be different on each device.": "Optional descriptive label for the folder. Can be different on each device.",
+    "Oldest First": "Eldste fyrst",
+    "Optional descriptive label for the folder. Can be different on each device.": "Valfri merkelapp på katalogen. Denne kan vera ulik på andre einingar.",
    "Options": "Val",
    "Out of Sync": "Ikkje synkronisert",
    "Out of Sync Items": "Ikkje-synkroniserte element",
    "Outgoing Rate Limit (KiB/s)": "Utgåande hastigheitsgrense (KiB/s)",
    "Override Changes": "Overstyr endringar",
    "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": "Plasseringa av mappa på datamaskinen. Vert oppretta om ho ikkje finst. Krøllstrekteiknet (~) kan brukast som forkorting for",
-    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Plasseringa for lagra versjonar (la denne vera tom for å bruka standard .stversions-mappa i mappa).",
+    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Plasseringa for lagra versjonar (la denne vera tom for å bruka standardmappa .stversions i mappa).",
    "Pause": "Stans",
    "Paused": "Stansa",
-    "Please consult the release notes before performing a major upgrade.": "Sjå \"release notes\" før ei hovudoppgradering vert utført.",
-    "Please set a GUI Authentication User and Password in the Settings dialog.": "Ver vennleg å set ein GUI brukar og passord i Innstillingar-dialogen.",
+    "Please consult the release notes before performing a major upgrade.": "Sjå utgjevingsmerknadene før ei hovudoppgradering vert utført.",
+    "Please set a GUI Authentication User and Password in the Settings dialog.": "Ver vennleg å laga ein GUI-brukar og eit passord i Innstillingar-dialogen.",
    "Please wait": "Gjer vel og vent",
    "Preview": "Førehandsvisning",
    "Preview Usage Report": "Førehandsvis bruksrapporten",
    "Quick guide to supported patterns": "Kjapp innføring i godkjente mønster",
    "RAM Utilization": "Minnebruk",
    "Random": "Tilfeldig",
-    "Relay Servers": "Relétenarar",
-    "Relayed via": "Relé via",
-    "Relays": "Reléer",
-    "Release Notes": "Utgivingsnotat",
-    "Remote Devices": "Eksterne Einingar",
+    "Reduced by ignore patterns": "Reduser med utelatelsesmønster",
+    "Release Notes": "Utgjevingsnotat",
+    "Remote Devices": "Eksterne einingar",
    "Remove": "Fjern",
-    "Required identifier for the folder. Must be the same on all cluster devices.": "Required identifier for the folder. Must be the same on all cluster devices.",
+    "Required identifier for the folder. Must be the same on all cluster devices.": "Påkravd identifikator for katalogen. Denne må vera lik på alle einingane i same klynge.",
    "Rescan": "Skann På Ny",
    "Rescan All": "Skann alle på nytt",
    "Rescan Interval": "Skanneintervall",
@@ -157,10 +152,12 @@
    "Resume": "Start",
    "Reused": "Gjenbrukt",
    "Save": "Lagre",
-    "Scan Time Remaining": "Gjenståande Skannetid",
+    "Scan Time Remaining": "Gjenståande skannetid",
    "Scanning": "Skannar",
    "Select the devices to share this folder with.": "Vel einingane du vil dela denne mappa med.",
    "Select the folders to share with this device.": "Vel mappene du vil dela med denne eininga.",
+    "Send & Receive": "Sende og motta",
+    "Send Only": "Bare sende",
    "Settings": "Innstillingar",
    "Share": "Del",
    "Share Folder": "Del mappe",
@@ -168,7 +165,6 @@
    "Share With Devices": "Del Med Einingar",
    "Share this folder?": "Dela denne mappa?",
    "Shared With": "Delt Med",
-    "Short identifier for the folder. Must be the same on all cluster devices.": "Kort kjennemerke på mappa. Må vera det same på alle einingane i klyngja.",
    "Show ID": "Vis ID",
    "Show QR": "Vis QR",
    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Vist i staden for einings-ID-en i klyngjestatusen. Vil verta kringkasta til dei andre einingane som eit valfritt standardnamn.",
@@ -191,38 +187,35 @@
    "Syncthing is restarting.": "Syncthing startar på ny.",
    "Syncthing is upgrading.": "Syncthing oppgraderer.",
    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing ser ut til å vera nede, eller så er det eit problem med nettilkoplinga di. Prøvar på ny …",
-    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing ser ut til å ha støtt på eit problem under behandling av din førespurnad. Vær vennleg å oppfrisk nettlesaren eller start Syncthing på nytt om problemet vedvarer.",
-    "The Syncthing admin interface is configured to allow remote access without a password.": "Syncthing sitt administreringsgrensesnitt er sett opp til å tillate ekstern tilgang uten passord.",
+    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing ser ut til å ha støtt på eit problem under behandling av førespurnaden din. Ver vennleg å oppfriska nettlesaren eller starta Syncthing på nytt om problemet varer ved.",
+    "The Syncthing admin interface is configured to allow remote access without a password.": "Administreringsgrensesnittet til Syncthing er sett opp til å tillata ekstern tilgang utan passord.",
    "The aggregated statistics are publicly available at the URL below.": "Samla statistikk er opent tilgjengeleg på URL-en nedanfor.",
-    "The aggregated statistics are publicly available at {%url%}.": "Samla statistikk er opent tilgjengeleg på {{url}}.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Instillingane har blitt lagra men ikkje aktivert. Syncthing må starta på ny for å aktivera dei nye instillingane.",
    "The device ID cannot be blank.": "Eining ID kan ikkje vera tom.",
-    "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 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 device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "Einings-ID-en du skal nytta her finn du i meldingsvindauget \"Rediger > Vis ID\" på den andre eininga. Mellomrom og bindestrek er valfrie (vert ignorert).",
-    "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.": "Den krypterte bruksrapporten vert send dagleg. Han vert nytta til å spora vanlege plattformer, mappestorleikar og programutgåvene. Om datasettet endrar seg, vil dette meldingsvindauget dukka opp att og du vil verta beden om å godkjenna det.",
+    "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).": "Einings-ID-en som skal oppgjevast her kan hentast fram via menyvalet «Handlingar > Vis ID» på den andre eininga. Mellomrom og bindestrek er valfritt (blir ignorert).",
+    "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.": "Den krypterte bruksrapporten vert send dagleg. Han vert nytta til å spora vanlege plattformer, mappestorleikar og programutgåvene. Om datasettet endrar seg, vil dette meldingsvindauget dukka opp att, og du vil verta beden om å godkjenna det.",
    "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.": "Einings-ID-en er ikkje gyldig. Han må vera på 52 eller 56 teikn og vera samansett av bokstavar og tal med valfrie mellomrom og bindestrekar.",
    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "Den første kommandolinjeparameteren er mappebana og den andre syner den relative bana i mappa.",
    "The folder ID cannot be blank.": "Mappe ID kan ikkje vera tom.",
-    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "Mappe-IDen må vera eit kort kjennemerke (64 teikn eller mindre) samansett kun av bokstavar, tal og teikna punktum (.), mellomrom (-) og strek (_).",
    "The folder ID must be unique.": "Mappe ID må vera unik.",
    "The folder path cannot be blank.": "Mappeplasseringa kan ikkje vera 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.": "Desse intervalla vert nytta: den fyrste timen vert ei utgåve lagra kvart 30. sekund, den fyrste dagen vert ei utgåve lagra kvar time, dei fyrste 30 dagane vert ei utgåve lagra kvar dag, og inntil høgaste alderen vert ei utgåve lagra kvar veke.",
-    "The following items could not be synchronized.": "Fyljande filer kunne ikkje synkroniserast.",
+    "The following items could not be synchronized.": "Fylgjande filer kunne ikkje synkroniserast.",
    "The maximum age must be a number and cannot be blank.": "Maksimal levetid må vera eit tal og kan ikkje vera tomt.",
-    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Høgaste tidsrom å behalda ei utgåve (i dagar, set til 0 for å behalda versjonane for alltid).",
-    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "Nødvendig ledig diskplass må vere eit tal mellom 0 og 100.",
-    "The number of days must be a number and cannot be blank.": "Tal på dagar må ver eit tal og kan ikkje vera tomt.",
+    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Høgaste tidsrom å spara på ei utgåve (i dagar; set til 0 for å spara på versjonane for alltid).",
+    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "Nødvendig ledig diskplass må vera eit tal mellom 0 og 100.",
+    "The number of days must be a number and cannot be blank.": "Tal på dagar må vera eit tal, og kan ikkje vera tomt.",
    "The number of days to keep files in the trash can. Zero means forever.": "Antall dagar å behalda filer i søppelkorga. Null betyr for alltid.",
    "The number of old versions to keep, per file.": "Tal på gamle versjonar ein skal behalda, per fil.",
    "The number of versions must be a number and cannot be blank.": "Tal på versjonar må vera eit tal og kan ikkje vera tomt.",
    "The path cannot be blank.": "Bana kan ikkje vera tom.",
-    "The rate limit must be a non-negative number (0: no limit)": "Hastigheitsgrensa må ver eit positivt tall (0: ingen grensa)",
+    "The rate limit must be a non-negative number (0: no limit)": "Hastigheitsgrensa må vera eit positivt tall (0: inga grense)",
    "The rescan interval must be a non-negative number of seconds.": "Talet på sekund i skanneintervallet kan ikkje vera negativt.",
    "They are retried automatically and will be synced when the error is resolved.": "Desse vil bli prøvd på nytt automatisk og vil bli synkronisert når feilen har blitt utbetra.",
-    "This Device": "Denne Eininga",
-    "This can easily give hackers access to read and change any files on your computer.": "Dette kan lett gje dataekspertar tilgang til å lese og endre vilkårlege filer på denne maskina.",
+    "This Device": "Denne eininga",
+    "This can easily give hackers access to read and change any files on your computer.": "Dette kan lett gje datasnokar tilgang til å lesa og endra vilkårlege filer på denne maskina.",
    "This is a major version upgrade.": "Dette er ei hovudoppgradering",
-    "Trash Can File Versioning": "Papirkorg filutgåvehandtering",
+    "Trash Can File Versioning": "Papirkorg-filutgåvehandtering",
    "Unknown": "Ukjent",
    "Unshared": "Ikkje delt",
    "Unused": "Ubrukt",
@@ -237,15 +230,16 @@
    "Version": "Versjon",
    "Versions Path": "Utgåvebane",
    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Utgåver vert automatisk sletta når maksimal levetid er nådd eller når det høgaste tillate talet på filer innan eit intervall vert overskride.",
-    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Warning, this path is a subdirectory of an existing folder \"{{otherFolder}}\".",
-    "When adding a new device, keep in mind that this device must be added on the other side too.": "Hugs at når ei ny eining vert lagt til må ho òg leggjast til på andre sida.",
+    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Åtvaring, denne bana er ei undermappe av den eksisterande mappa «{{otherFolder}}».",
+    "When adding a new device, keep in mind that this device must be added on the other side too.": "Hugs at når ei ny eining vert lagt til, må ho òg leggjast til på andre sida.",
    "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.": "Hugs at når ei ny mappe vert lagt til, vert mappe-ID-en brukt til å binda saman mappene mellom einingane. Det er skilnad på store og små bokstavar, så ID-ane må vera identiske på alle einingane.",
    "Yes": "Ja",
    "You must keep at least one version.": "Du må behalda minst ein versjon.",
    "days": "dagar",
+    "directories": "katalogar",
+    "files": "filer",
    "full documentation": "all dokumentasjon",
    "items": "element",
    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} ønskjer å dela mappa \"{{folder}}\".",
-    "{%device%} wants to share folder \"{%folderLabel%}\" ({%folder%}).": "{{device}} ønskjer å dela mappa \"{{folderLabel}}\" ({{folder}}).",
-    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} ønskjer å dela mappa \"{{folderLabel}}\" ({{folder}})."
+    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} ønskjer å dela mappa «{{folderLabel}}» ({{folder}})."
 }
--- a/gui/default/assets/lang/lang-pl.json
+++ b/gui/default/assets/lang/lang-pl.json
@@ -31,34 +31,32 @@
    "Command": "Polecenie",
    "Comment, when used at the start of a line": "Komentarz, jeżeli użyty na początku linii",
    "Compression": "Kompresja",
+    "Configured": "Skonfigurowane",
    "Connection Error": "Błąd połączenia",
    "Connection Type": "Rodzaj połączenia",
    "Copied from elsewhere": "Skopiowane z innego miejsca ",
    "Copied from original": "Skopiowane z oryginału",
    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016: ",
-    "Copyright © 2015 the following Contributors:": "Copyright © 2015: ",
    "Danger!": "Niebezpieczne!",
-    "Delete": "Usuń",
    "Deleted": "Usunięto",
    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Urządzenie \"{{name}}\" {{device}} ({{address}}) chce się połączyć. Dodać urządzenie?",
    "Device ID": "ID urządzenia",
    "Device Identification": "Identyfikator urządzenia",
    "Device Name": "Nazwa urządzenia",
-    "Device {%device%} ({%address%}) wants to connect. Add new device?": "Urządzenie {{device}} ({{address}}) chce się połączyć. Zezwolić?",
    "Devices": "Urządzenia",
    "Disconnected": "Rozłączony",
+    "Discovered": "Odkryte",
    "Discovery": "Odnajdywanie",
    "Documentation": "Dokumentacja",
    "Download Rate": "Prędkość pobierania",
    "Downloaded": "Pobrane",
    "Downloading": "Pobieranie",
    "Edit": "Edytuj",
-    "Edit Device": "Edytuj urządzenie",
-    "Edit Folder": "Edytuj folder",
+    "Edit Device": "Edit Device",
+    "Edit Folder": "Edit Folder",
    "Editing": "Edytowanie",
-    "Enable NAT traversal": "Enable NAT traversal",
+    "Enable NAT traversal": "Włącz trawersowanie NAT",
    "Enable Relaying": "Włącz przekazywanie",
-    "Enable UPnP": "Włącz UPnP",
    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Wpisz oddzielone przecinkiem adresy (\"tcp://ip:port\", \"tcp://host:port\") lub \"dynamic\" by przeprowadzić automatyczne odnalezienie adresu.",
    "Enter ignore patterns, one per line.": "Wprowadź wzorce ignorowania, jeden w każdej linii.",
    "Error": "Błąd",
@@ -73,7 +71,6 @@
    "Folder": "Folder",
    "Folder ID": "ID folderu",
    "Folder Label": "Etykieta folderu",
-    "Folder Master": "Główny folder",
    "Folder Path": "Ścieżka folderu",
    "Folder Type": "Rodzaj folderu",
    "Folders": "Foldery",
@@ -83,7 +80,6 @@
    "GUI Listen Addresses": "Adres nasłuchiwania",
    "Generate": "Generuj",
    "Global Discovery": "Globalne odnajdywanie",
-    "Global Discovery Server": "Globalny serwer rozgłoszeniowy",
    "Global Discovery Servers": "Globalne serwery odkrywania",
    "Global State": "Status globalny",
    "Help": "Pomoc",
@@ -101,12 +97,13 @@
    "Last Scan": "Czas ostatniego skanu",
    "Last seen": "Ostatnio widziany",
    "Later": "Później",
+    "Latest Change": "Latest Change",
    "Listeners": "Nasłuchujący",
    "Local Discovery": "Lokalne odnajdywanie",
    "Local State": "Status lokalny",
    "Local State (Total)": "Status lokalny (suma)",
    "Major Upgrade": "Ważna aktualizacja",
-    "Master": "Mistrz",
+    "Master": "Główny",
    "Maximum Age": "Maksymalny wiek",
    "Metadata Only": "Tylko metadane",
    "Minimum Free Disk Space": "Minimum wolnego miejsca na dysku",
@@ -141,9 +138,7 @@
    "Quick guide to supported patterns": "Krótki przewodnik po obsługiwanych wzorcach",
    "RAM Utilization": "Użycie pamięci RAM",
    "Random": "Losowo",
-    "Relay Servers": "Serwery przekazywania",
-    "Relayed via": "Przekazane przez",
-    "Relays": "Przekaźniki",
+    "Reduced by ignore patterns": "Ograniczono przez wzorce ignorowania",
    "Release Notes": "Informacje o wydaniu",
    "Remote Devices": "Urządzenia zdalne",
    "Remove": "Usuń",
@@ -161,6 +156,8 @@
    "Scanning": "Skanowanie",
    "Select the devices to share this folder with.": "Wybierz urządzenie, któremu udostępnić folder.",
    "Select the folders to share with this device.": "Wybierz foldery do współdzielenia z tym urządzeniem.",
+    "Send & Receive": "Send & Receive",
+    "Send Only": "Send Only",
    "Settings": "Ustawienia",
    "Share": "Udostępnij",
    "Share Folder": "Udostępnij folder",
@@ -168,7 +165,6 @@
    "Share With Devices": "Udostępnij dla urządzenia",
    "Share this folder?": "Udostępnić ten folder?",
    "Shared With": "Współdzielony z",
-    "Short identifier for the folder. Must be the same on all cluster devices.": "Krótki identyfikator folderu. Musi być taki sam na wszystkich urządzeniach.",
    "Show ID": "Pokaż ID",
    "Show QR": "Pokaż kod QR",
    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Pokazane w statusie zamiast ID urządzenia.Zostanie wysłane do innych urządzeń jako opcjonalna domyślna nazwa.",
@@ -193,17 +189,14 @@
    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing wydaje się być wyłączony lub jest problem z twoim połączeniem internetowym. Próbuje ponownie...",
    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing nie może przetworzyć twojego zapytania. Proszę przeładuj stronę lub zrestartuj Syncthing, jeśli problem pozostanie.",
    "The Syncthing admin interface is configured to allow remote access without a password.": "Interfejs administracyjny Syncthing jest skonfigurowany w sposób pozwalający na zdalny dostęp bez hasła.",
-    "The aggregated statistics are publicly available at the URL below.": "Zebrane statystyki są dostępne pod poniższym linkiem.",
-    "The aggregated statistics are publicly available at {%url%}.": "Zebrane statystyki są publicznie dostępne pod adresem {{url}}.",
+    "The aggregated statistics are publicly available at the URL below.": "Zebrane statystyki są publicznie dostępne pod poniższym linkiem.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Konfiguracja została zapisana lecz nie jest aktywna. Syncthing musi zostać zrestartowany aby aktywować nową konfiguracje.",
    "The device ID cannot be blank.": "ID urządzenia nie może być puste.",
    "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).": "ID urządzenia może być znalezione w \"Akcja > Pokaż ID\" na innym urządzeniu. Spacje i myślniki są opcjonalne (są one ignorowane).",
-    "The device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "ID urządzenia można znaleźć w \"Edytuj -> Pokaż ID\" na zdalnym urządzeniu.\nOdstępy i myślniki są opcjonalne (ignorowane)",
    "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.": "Zaszyfrowane raporty użycia są wysyłane codziennie. Są one używane w celach statystycznych platform, rozmiarów katalogów i wersji programu. Jeżeli zgłaszane dane ulegną zmianie, ponownie wyświetli się ta informacja.",
    "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.": "Wprowadzone ID urządzenia wygląda na niepoprawne. Musi zawierać 52 lub 56 znaków składających się z liter i cyfr. Odstępy i myślniki są opcjonalne.",
    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "Pierwszym parametrem linii komend jest ścieżka do folderu, a drugim względna ścieżka w folderze.",
    "The folder ID cannot be blank.": "ID folderu nie może być puste.",
-    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "ID folderu musi być krótkim identyfikatorem (64 lub mniej znaków) zawierać litery, cyfry, znaki kropki (.), myślnika (-) i podkreślenia (_).",
    "The folder ID must be unique.": "ID folderu musi być unikalne.",
    "The folder path cannot be blank.": "Ścieżka folderu nie może być pusta.",
    "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.": "Następujący interwał jest używany: dla pierwszej godziny wersja jest zachowywana co 30 sekund, dla pierwszego dnia wersja jest zachowywana co godzinę, dla pierwszego miesiąca wersja jest zachowywana codziennie, aż do maksymalnego odstępu zapisywania wersji co tydzień.",
@@ -237,15 +230,16 @@
    "Version": "Wersja",
    "Versions Path": "Ścieżka wersji",
    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Wersje zostają automatycznie usunięte jeżeli są starsze niż maksymalny wiek lub przekraczają liczbę dopuszczalnych wersji.",
-    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Ostrzerzenie, ta ścieżka to podkatalog istniejącego folderu \"{{otherFolder}}\".",
+    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Uwaga, ta ścieżka to podkatalog istniejącego folderu \"{{otherFolder}}\".",
    "When adding a new device, keep in mind that this device must be added on the other side too.": "Gdy dodajesz nowe urządzenie, pamiętaj że urządzenie musi zostać dodane także po drugiej stronie.",
    "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.": "Przy dodawaniu nowego folderu, pamiętaj, że ID użyte jest do łączenia folderów pomiędzy urządzeniami. Wielkość liter ciągu ma znaczenie musi zgadzać się na wszystkich urządzeniach.",
    "Yes": "Tak",
    "You must keep at least one version.": "Musisz posiadać przynajmniej jedną wersję",
    "days": "dni",
+    "directories": "katalogi",
+    "files": "pliki",
    "full documentation": "pełna dokumentacja",
    "items": "pozycji",
    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} chce udostępnić folder \"{{folder}}\"",
-    "{%device%} wants to share folder \"{%folderLabel%}\" ({%folder%}).": "{{device}} chce udostępnić folder \"{{folderLabel}}\" ({{folder}}).",
    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} chce udostępnić folder \"{{folderlabel}}\" ({{folder}})."
 }
--- a/gui/default/assets/lang/lang-pt-BR.json
+++ b/gui/default/assets/lang/lang-pt-BR.json
@@ -31,22 +31,21 @@
    "Command": "Comando",
    "Comment, when used at the start of a line": "Comentário, se usado no início de uma linha",
    "Compression": "Compressão",
+    "Configured": "Configurado",
    "Connection Error": "Erro de conexão",
    "Connection Type": "Tipo da conexão",
    "Copied from elsewhere": "Copiado de outro lugar",
    "Copied from original": "Copiado do original",
    "Copyright © 2014-2016 the following Contributors:": "Direitos reservados © 2014-2016 aos seguintes colaboradores:",
-    "Copyright © 2015 the following Contributors:": "Copyright © 2015. Direitos reservados aos seguintes colaboradores:",
    "Danger!": "Perigo!",
-    "Delete": "Apagar",
    "Deleted": "Apagado",
-    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Dispositivo \"{{name}}\" ({{device}} em {{address}}) deseja se conectar. Adicionar novo dispositivo?",
+    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Dispositivo \"{{name}}\" ({{device}} em {{address}}) quer se conectar. Adicionar novo dispositivo?",
    "Device ID": "ID do dispositivo",
    "Device Identification": "Identificação do dispositivo",
    "Device Name": "Nome do dispositivo",
-    "Device {%device%} ({%address%}) wants to connect. Add new device?": "O dispositivo {{device}} ({{address}}) quer se conectar. Adicionar novo dispositivo?",
    "Devices": "Dispositivos",
    "Disconnected": "Desconectado",
+    "Discovered": "Descoberto",
    "Discovery": "Descoberta",
    "Documentation": "Documentação",
    "Download Rate": "Velocidade de recepção",
@@ -58,7 +57,6 @@
    "Editing": "Editando",
    "Enable NAT traversal": "Habilitar NAT",
    "Enable Relaying": "Habilitar retransmissão",
-    "Enable UPnP": "Habilitar UPnP",
    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Insira endereços (\"tcp://ip:porta\", \"tcp://host:porta\") separados por vírgula ou \"dynamic\" para executar a descoberta automática do endereço.",
    "Enter ignore patterns, one per line.": "Insira os filtros, um por linha.",
    "Error": "Erro",
@@ -73,7 +71,6 @@
    "Folder": "Pasta",
    "Folder ID": "ID da pasta",
    "Folder Label": "Rótulo da pasta",
-    "Folder Master": "Pasta mestre",
    "Folder Path": "Caminho da pasta",
    "Folder Type": "Tipo da pasta",
    "Folders": "Pastas",
@@ -83,7 +80,6 @@
    "GUI Listen Addresses": "Endereços de escuta da interface",
    "Generate": "Gerar",
    "Global Discovery": "Descoberta global",
-    "Global Discovery Server": "Servidor de descoberta global",
    "Global Discovery Servers": "Servidores de descoberta global",
    "Global State": "Estado global",
    "Help": "Ajuda",
@@ -101,6 +97,7 @@
    "Last Scan": "Última verificação",
    "Last seen": "Visto por último em",
    "Later": "Depois",
+    "Latest Change": "Última mudança",
    "Listeners": "Escutadores",
    "Local Discovery": "Descoberta local",
    "Local State": "Estado local",
@@ -141,9 +138,7 @@
    "Quick guide to supported patterns": "Guia rápido dos padrões suportados",
    "RAM Utilization": "Uso de RAM",
    "Random": "Aleatória",
-    "Relay Servers": "Servidores de retransmissão",
-    "Relayed via": "Retransmitido via",
-    "Relays": "Retransmissores",
+    "Reduced by ignore patterns": "Reduzido por filtros",
    "Release Notes": "Notas de lançamento",
    "Remote Devices": "Dispositivos remotos",
    "Remove": "Remover",
@@ -161,6 +156,8 @@
    "Scanning": "Verificando",
    "Select the devices to share this folder with.": "Selecione os dispositivos com os quais esta pasta será compartilhada.",
    "Select the folders to share with this device.": "Selecione as pastas a serem compartilhadas com este dispositivo.",
+    "Send & Receive": "Envia e recebe",
+    "Send Only": "Somente envia",
    "Settings": "Configurações",
    "Share": "Compartilhar",
    "Share Folder": "Compartilhar pasta",
@@ -168,7 +165,6 @@
    "Share With Devices": "Compartilhar com os dispositivos",
    "Share this folder?": "Compartilhar esta pasta?",
    "Shared With": "Compartilhada com",
-    "Short identifier for the folder. Must be the same on all cluster devices.": "Identificador curto para a pasta. Deve ser igual em todos os dispositivos.",
    "Show ID": "Mostrar ID",
    "Show QR": "Mostrar QR Code",
    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Mostrado no lugar do ID do dispositivo no indicador de estado do grupo. Será divulgado aos outros dispositivos como um nome opcional e pré-definido.",
@@ -194,16 +190,13 @@
    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Parece que o Syncthing está tendo problemas no processamento da requisição. Por favor, atualize a página ou reinicie o Syncthing caso o problema persista.",
    "The Syncthing admin interface is configured to allow remote access without a password.": "A interface de administração do Syncthing está configurada para permitir acesso remoto sem uma senha.",
    "The aggregated statistics are publicly available at the URL below.": "As estatísticas agregadas estão disponíveis no endereço abaixo.",
-    "The aggregated statistics are publicly available at {%url%}.": "As estatísticas agregadas estão disponíveis publicamente em {{url}}.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "A configuração foi salva mas ainda não foi ativada. O Syncthing precisa ser reiniciado para a ativação da nova configuração.",
    "The device ID cannot be blank.": "O ID de dispositivo não pode ficar vazio.",
    "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).": "O ID do dispositivo a ser inserido aqui pode ser obtido no menu \"Ações > Mostrar ID\" do outro dispositivo. Espaços e hífens são opcionais (ignorados).",
-    "The device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "O ID do dispositivo a ser inserido aqui pode ser encontrado no menu \"Editar > Mostrar ID\" do outro dispositivo. Espaços e hífens são opcionais (ignorados).",
    "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.": "O relatório de uso é criptografado e enviado diariamente. É utilizado para rastrear plataformas, tamanhos de pastas e versões da aplicação. Caso o formato dos dados seja alterado, esta janela te avisará.",
    "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.": "O ID de dispositivo inserido não parece ser válido. Ele deve ter entre 52 e 56 caracteres e ser composto de letras e números, com espaços e hífens opcionais.",
    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "O primeiro argumento da linha de comando é o caminho da pasta e o segundo é o caminho relativo à pasta.",
    "The folder ID cannot be blank.": "O ID da pasta não pode ficar vazio.",
-    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "O ID da pasta deve ser um identificador curto (com 64 caracteres ou menos) e composto somente de letras, números, pontos (.), hífens (-) ou underscores (_).",
    "The folder ID must be unique.": "O ID da pasta deve ser único.",
    "The folder path cannot be blank.": "O caminho da pasta não pode ficar vazio.",
    "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ão utilizados os seguintes intervalos: na primeira hora é guardada uma versão a cada 30 segundos, no primeiro dia é guardada uma versão a cada hora, nos primeiros 30 dias é guardada uma versão por dia e, até que atinja a idade máxima, é guardada uma versão por semana.",
@@ -243,9 +236,10 @@
    "Yes": "Sim",
    "You must keep at least one version.": "Você deve manter pelo menos uma versão.",
    "days": "dias",
+    "directories": "diretórios",
+    "files": "arquivos",
    "full documentation": "documentação completa",
    "items": "itens",
    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} quer compartilhar a pasta \"{{folder}}\".",
-    "{%device%} wants to share folder \"{%folderLabel%}\" ({%folder%}).": "{{device}} deseja compartilhar a pasta \"{{folderLabel}}\" ({{folder}}).",
    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} quer compartilhar a pasta \"{{folderlabel}}\" ({{folder}})."
 }
--- a/gui/default/assets/lang/lang-pt-PT.json
+++ b/gui/default/assets/lang/lang-pt-PT.json
@@ -31,22 +31,21 @@
    "Command": "Comando",
    "Comment, when used at the start of a line": "Comentário, quando usado no início de uma linha",
    "Compression": "Compressão",
+    "Configured": "Configurado",
    "Connection Error": "Erro de ligação",
    "Connection Type": "Tipo de ligação",
    "Copied from elsewhere": "Copiado doutro sítio",
    "Copied from original": "Copiado do original",
    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 os seguintes contribuidores:",
-    "Copyright © 2015 the following Contributors:": "Copyright © 2015 os seguintes contribuidores:",
    "Danger!": "Perigo!",
-    "Delete": "Eliminar",
    "Deleted": "Eliminado",
    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "O dispositivo \"{{name}}\" ({{device}} em {{address}}) quer conectar-se. Adiciono este novo dispositivo?",
    "Device ID": "ID do dispositivo",
    "Device Identification": "Identificação do dispositivo",
    "Device Name": "Nome do dispositivo",
-    "Device {%device%} ({%address%}) wants to connect. Add new device?": "O dispositivo {{device}} ({{address}}) quer conectar-se. Adiciono este novo dispositivo?",
    "Devices": "Dispositivos",
    "Disconnected": "Desconectado",
+    "Discovered": "Descoberto",
    "Discovery": "Pesquisa",
    "Documentation": "Documentação",
    "Download Rate": "Velocidade de recepção",
@@ -58,7 +57,6 @@
    "Editing": "Editando",
    "Enable NAT traversal": "Activar travessia de NAT",
    "Enable Relaying": "Permitir retransmissão",
-    "Enable UPnP": "Activar UPnP",
    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Introduza endereços separados por vírgulas (\"tcp://ip:porto\", \"tcp://máquina:porto\") ou \"dynamic\" para detectar automaticamente os endereços.",
    "Enter ignore patterns, one per line.": "Escreva os padrões de exclusão, um por linha.",
    "Error": "Erro",
@@ -73,17 +71,15 @@
    "Folder": "Pasta",
    "Folder ID": "ID da pasta",
    "Folder Label": "Etiqueta da pasta",
-    "Folder Master": "Pasta mestre",
    "Folder Path": "Caminho da pasta",
    "Folder Type": "Tipo de pasta",
    "Folders": "Pastas",
-    "GUI": "GUI",
+    "GUI": "Interface gráfica",
    "GUI Authentication Password": "Senha da autenticação na interface gráfica",
    "GUI Authentication User": "Utilizador da autenticação na interface gráfica",
    "GUI Listen Addresses": "Endereço de escuta da interface gráfica",
    "Generate": "Gerar",
    "Global Discovery": "Pesquisa global",
-    "Global Discovery Server": "Servidor de pesquisa global",
    "Global Discovery Servers": "Servidores de pesquisa global",
    "Global State": "Estado global",
    "Help": "Ajuda",
@@ -101,6 +97,7 @@
    "Last Scan": "Última verificação",
    "Last seen": "Última vez que foi verificado",
    "Later": "Mais tarde",
+    "Latest Change": "Última alteração",
    "Listeners": "Auscultadores",
    "Local Discovery": "Pesquisa local",
    "Local State": "Estado local",
@@ -141,9 +138,7 @@
    "Quick guide to supported patterns": "Guia rápido dos padrões suportados",
    "RAM Utilization": "Utilização da RAM",
    "Random": "Aleatória",
-    "Relay Servers": "Servidores de retransmissão",
-    "Relayed via": "Retransmitido via",
-    "Relays": "Retransmissores",
+    "Reduced by ignore patterns": "Reduzido pelos padrões de exclusão",
    "Release Notes": "Notas de lançamento",
    "Remote Devices": "Dispositivos remotos",
    "Remove": "Remover",
@@ -161,6 +156,8 @@
    "Scanning": "Verificando",
    "Select the devices to share this folder with.": "Seleccione os dispositivos com os quais vai partilhar esta pasta.",
    "Select the folders to share with this device.": "Seleccione as pastas a partilhar com este dispositivo.",
+    "Send & Receive": "Enviar e receber",
+    "Send Only": "Enviar apenas",
    "Settings": "Configurações",
    "Share": "Partilhar",
    "Share Folder": "Partilhar pasta",
@@ -168,7 +165,6 @@
    "Share With Devices": "Partilhar com os dispositivos",
    "Share this folder?": "Partilhar esta pasta?",
    "Shared With": "Partilhada com",
-    "Short identifier for the folder. Must be the same on all cluster devices.": "Identificador curto para a pasta. Tem que ser igual em todos os dispositivos do grupo.",
    "Show ID": "Mostrar ID",
    "Show QR": "Mostrar QR",
    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Apresentado ao invés do ID do dispositivo no indicador de estado do grupo. Será divulgado aos outros dispositivos como um nome pré-definido opcional.",
@@ -194,16 +190,13 @@
    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "O Syncthing parece estar com problemas em processar o seu pedido. Tente recarregar a página ou reiniciar o Syncthing, se o problema persistir.",
    "The Syncthing admin interface is configured to allow remote access without a password.": "A interface de administração do Syncthing está configurada para permitir o acesso remoto sem pedir senha.",
    "The aggregated statistics are publicly available at the URL below.": "As estatísticas agregadas estão publicamente disponíveis no URL abaixo.",
-    "The aggregated statistics are publicly available at {%url%}.": "As estatísticas agrupadas estão disponíveis publicamente em {{url}}.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "A configuração foi gravada mas não activada. O Syncthing tem que reiniciar para activar a nova configuração.",
    "The device ID cannot be blank.": "O ID do dispositivo não pode estar vazio.",
    "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).": "O ID do dispositivo a colocar aqui pode ser obtido no menu \"Acções > Mostrar ID\" do outro dispositivo. Espaços e hífenes são opcionais (ignorados).",
-    "The device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "O ID do dispositivo a introduzir aqui pode ser encontrado no menu \"Editar > Mostrar ID\" do outro dispositivo. Espaços e hífenes são opcionais (ignorados).",
    "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.": "O relatório de utilização cifrado é enviado diariamente. É utilizado para rastrear plataformas comuns, tamanhos de pastas e versões da aplicação. Se o tipo de dados do relatório for alterado, será notificado novamente através desta janela.",
    "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.": "O ID do dispositivo fornecido não parece ser válido. Deveria ter 52 ou 56 caracteres constituídos por letras e números, com espaços e hífenes opcionais.",
    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "O primeiro parâmetro na linha de comandos é o caminho para a pasta e o segundo parâmetro é o caminho relativo dentro da pasta.",
    "The folder ID cannot be blank.": "O ID da pasta não pode estar vazio.",
-    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "O ID da pasta tem que ser um identificador curto (64 caracteres ou menos) e ser constituído somente por letras, números e os caracteres ponto (.), hífen (-) e sublinhado (_).",
    "The folder ID must be unique.": "O ID da pasta tem que ser único.",
    "The folder path cannot be blank.": "O caminho da pasta não pode estar vazio.",
    "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ão utilizados os seguintes intervalos: na primeira hora é guardada uma versão a cada 30 segundos, no primeiro dia é guardada uma versão a cada hora, nos primeiros 30 dias é guardada uma versão por dia e, até que atinja a idade máxima, é guardada uma versão por semana.",
@@ -243,9 +236,10 @@
    "Yes": "Sim",
    "You must keep at least one version.": "Tem que manter pelo menos uma versão.",
    "days": "dias",
+    "directories": "pastas",
+    "files": "ficheiros",
    "full documentation": "documentação completa",
    "items": "itens",
    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} quer partilhar a pasta \"{{folder}}\".",
-    "{%device%} wants to share folder \"{%folderLabel%}\" ({%folder%}).": "{{device}} quer partilhar a pasta \"{{folderLabel}}\" ({{folder}}).",
    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} quer partilhar a pasta \"{{folderlabel}}\" ({{folder}})."
 }
--- a/gui/default/assets/lang/lang-ru.json
+++ b/gui/default/assets/lang/lang-ru.json
@@ -31,22 +31,21 @@
    "Command": "Команда",
    "Comment, when used at the start of a line": "Комментарий, если используется в начале строки",
    "Compression": "Сжатие",
+    "Configured": "Сконфигурировано",
    "Connection Error": "Ошибка подключения",
    "Connection Type": "Тип соединения",
    "Copied from elsewhere": "Скопировано из другого места",
    "Copied from original": "Скопировано с оригинала",
    "Copyright © 2014-2016 the following Contributors:": "Авторские права © 2014–2016 принадлежат:",
-    "Copyright © 2015 the following Contributors:": "Все права защищены ©, 2015 участники:",
    "Danger!": "Опасно!",
-    "Delete": "Удалить",
    "Deleted": "Удалено",
    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Устройство «{{name}}» ({{device}} на {{address}}) хочет подключиться. Добавить новое устройство?",
    "Device ID": "ID устройства",
    "Device Identification": "Идентификация устройства",
    "Device Name": "Имя устройства",
-    "Device {%device%} ({%address%}) wants to connect. Add new device?": "Устройство {{device}} ({{address}}) хочет подключиться. Добавить новое устройство?",
    "Devices": "Устройства",
    "Disconnected": "Нет соединения",
+    "Discovered": "Обнаружено",
    "Discovery": "Обнаружение",
    "Documentation": "Документация",
    "Download Rate": "Скорость загрузки",
@@ -58,7 +57,6 @@
    "Editing": "Редактирование",
    "Enable NAT traversal": "Включить NAT traversal",
    "Enable Relaying": "Включить релеи",
-    "Enable UPnP": "Включить UPnP",
    "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.": "Введите шаблоны игнорирования, по одному на строку.",
    "Error": "Ошибка",
@@ -73,7 +71,6 @@
    "Folder": "Папка",
    "Folder ID": "ID папки",
    "Folder Label": "Ярлык папки",
-    "Folder Master": "Папка-оригинал",
    "Folder Path": "Путь к папке",
    "Folder Type": "Тип папки",
    "Folders": "Папки",
@@ -83,7 +80,6 @@
    "GUI Listen Addresses": "Адрес панели управления",
    "Generate": "Сгенерировать",
    "Global Discovery": "Глобальное обнаружение",
-    "Global Discovery Server": "Сервер глобального обнаружения",
    "Global Discovery Servers": "Серверы глобального обнаружения",
    "Global State": "Глобальное состояние",
    "Help": "Помощь",
@@ -101,6 +97,7 @@
    "Last Scan": "Последнее сканирование",
    "Last seen": "Был доступен",
    "Later": "Позже",
+    "Latest Change": "Последнее изменение",
    "Listeners": "Прослушиватель",
    "Local Discovery": "Локальное обнаружение",
    "Local State": "Локальное состояние",
@@ -141,9 +138,7 @@
    "Quick guide to supported patterns": "Краткое руководство по поддерживаемым шаблонам",
    "RAM Utilization": "Использование памяти",
    "Random": "Случайно",
-    "Relay Servers": "Релеи",
-    "Relayed via": "Релей через",
-    "Relays": "Релеи",
+    "Reduced by ignore patterns": "Уменьшено шаблонами игнорирования",
    "Release Notes": "Примечания к выпуску",
    "Remote Devices": "Удалённые устройства",
    "Remove": "Удалить",
@@ -161,6 +156,8 @@
    "Scanning": "Сканирование",
    "Select the devices to share this folder with.": "Выберите устройства, для которых будет доступна эта папка.",
    "Select the folders to share with this device.": "Выберите папки, которые будут доступны этому устройству.",
+    "Send & Receive": "Отправить и получить",
+    "Send Only": "Только отправить",
    "Settings": "Настройки",
    "Share": "Предоставить доступ",
    "Share Folder": "Предоставить доступ к папке",
@@ -168,7 +165,6 @@
    "Share With Devices": "Предоставить доступ устройствам",
    "Share this folder?": "Предоставить доступ к этой папке?",
    "Shared With": "Доступ предоставлен",
-    "Short identifier for the folder. Must be the same on all cluster devices.": "Короткий идентификатор папки. Должен быть одинаковым на всех устройствах кластера.",
    "Show ID": "Показать ID",
    "Show QR": "Показать QR-код",
    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Отображается вместо ID устройства в статусе группы. Будет разослан другим устройствам в качестве имени по умолчанию.",
@@ -194,16 +190,13 @@
    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing столкнулся с проблемой при обработке Вашего запроса. Пожалуйста, обновите страницу или перезапустите 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.": "Агрегированные статистические данные общедоступны по ссылке ниже.",
-    "The aggregated statistics are publicly available at {%url%}.": "Суммарная статистика общедоступна на {{url}}.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Конфигурация была сохранена, но не активирована. Syncthing должен быть перезапущен для применения новой конфигурации.",
    "The device ID cannot be blank.": "ID устройства не может быть пустым.",
    "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).": "Идентификатор устройства можно найти в диалоге «Действия → Показать ID» на другом устройстве. Пробелы и дефисы вводить не обязательно (игнорируются).",
-    "The device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "Идентификатор устройства можно найти в диалоге «Редактирование → Показать ID» на другом устройстве. Пробелы и дефисы вводить не обязательно (игнорируются).",
    "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.": "Введён недопустимый ID устройства. Он должен состоять из букв и цифр, может включать пробелы и дефисы, длина должна быть 52 или 56 символов.",
    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "Первый параметр командной строки - путь к папке, второй параметр - относительный путь в папке.",
    "The folder ID cannot be blank.": "ID папки не может быть пустым.",
-    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "ID папки должен быть коротким (не более 64 символов), должен состоять только из букв, цифр, точек (.), дефисов (-) или подчёркиваний (_).",
    "The folder ID must be unique.": "ID папки должен быть уникальным.",
    "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 дней - каждый день, после, до максимального срока - каждую неделю.",
@@ -243,9 +236,10 @@
    "Yes": "Да",
    "You must keep at least one version.": "Вы должны хранить как минимум одну версию.",
    "days": "дней",
+    "directories": "папок",
+    "files": "файлов",
    "full documentation": "полная документация",
    "items": "элементы",
    "{%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}})."
 }
--- a/gui/default/assets/lang/lang-sv.json
+++ b/gui/default/assets/lang/lang-sv.json
@@ -1,5 +1,5 @@
 {
-    "A device with that ID is already added.": "En enhet med det ID:t är redan tillagt.",
+    "A device with that ID is already added.": "En enhet med det ID är redan tillagt.",
    "A negative number of days doesn't make sense.": "Ett negativt antal dagar är inte rimligt.",
    "A new major version may not be compatible with previous versions.": "En ny huvudversion kan eventuellt vara inkompatibel med tidigare versioner.",
    "API Key": "API-nyckel",
@@ -19,35 +19,34 @@
    "Allow Anonymous Usage Reporting?": "Tillåt anonym användarstatistiksrapportering?",
    "Alphabetic": "Alfabetisk",
    "An external command handles the versioning. It has to remove the file from the synced folder.": "Ett externt kommando sköter versionshanteringen. Den behöver ta bort filen från den synkroniserade mappen.",
-    "Anonymous Usage Reporting": "Anonym användarstatistik rapportering",
-    "Any devices configured on an introducer device will be added to this device as well.": "Enheter konfigurerade på en introduktörsenhet kommer också att läggas till den här enheten.",
+    "Anonymous Usage Reporting": "Anonym användarstatistiksrapportering",
+    "Any devices configured on an introducer device will be added to this device as well.": "Alla enheter konfigurerade på en introduktörsenhet kommer också att läggas till den här enheten.",
    "Automatic upgrades": "Automatiska uppgraderingar",
    "Be careful!": "Var aktsam!",
    "Bugs": "Buggar",
-    "CPU Utilization": "CPU-användning",
+    "CPU Utilization": "CPU användning",
    "Changelog": "Ändringslogg",
    "Clean out after": "Rensa efteråt",
    "Close": "Stäng",
    "Command": "Kommando",
-    "Comment, when used at the start of a line": "Kommentar, vid användning i början av en rad.",
+    "Comment, when used at the start of a line": "Kommentara, vid användning i början av en rad.",
    "Compression": "Komprimering",
+    "Configured": "Konfigurerad",
    "Connection Error": "Anslutningsproblem",
    "Connection Type": "Anslutningstyp",
-    "Copied from elsewhere": "Kopierat utifrån",
+    "Copied from elsewhere": "Kopierat från annanstans",
    "Copied from original": "Kopierat från original",
    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 följande bidragare:",
-    "Copyright © 2015 the following Contributors:": "Copyright © 2015 följande medverkande:",
    "Danger!": "Fara!",
-    "Delete": "Ta bort",
    "Deleted": "Borttaget",
    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Enhet \"{{name}}\" ({{device}} på {{address}}) vill ansluta. Lägg till ny enhet?",
-    "Device ID": "Enhets ID",
+    "Device ID": "Enhet-ID",
    "Device Identification": "Enhetsidentifikation",
-    "Device Name": "Enhetens namn",
-    "Device {%device%} ({%address%}) wants to connect. Add new device?": "Enheten {{device}} ({{address}}) vill ansluta. Lägg till ny enhet?",
+    "Device Name": "Enhetsnamn",
    "Devices": "Enheter",
    "Disconnected": "Frånkopplad",
-    "Discovery": "Upptäckt",
+    "Discovered": "Upptäckt",
+    "Discovery": "Annonsering",
    "Documentation": "Dokumentation",
    "Download Rate": "Nedladdningshastighet",
    "Downloaded": "Hämtat",
@@ -58,7 +57,6 @@
    "Editing": "Redigerar",
    "Enable NAT traversal": "Aktivera NAT traversering",
    "Enable Relaying": "Aktivera reläa",
-    "Enable UPnP": "Aktivera UPnP",
    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Ange kommaseparerade (\"tcp://ip:port\", \"tcp://host:port\")-adresser eller ordet \"dynamic\" för att använda automatisk uppslagning.",
    "Enter ignore patterns, one per line.": "Ange ignorera mönster, en per rad.",
    "Error": "Fel",
@@ -66,46 +64,45 @@
    "Failed Items": "Misslyckade objekt",
    "File Pull Order": "Filhämtningsprioritering",
    "File Versioning": "Filversionshantering",
-    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Filrättigheter ignoreras vid sökning efter förändringar. Används på FAT-filsystem.",
-    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Filer flyttas till katalogen .stversions om de ersätts eller raderas av Syncthing.",
-    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Filer flyttas till datummärkta versioner i en .stversions-mapp när de ersatts eller raderats av Syncthing.",
+    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Filrättigheter ignoreras under sökning efter förändringar. Används på FAT-filsystem.",
+    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Filer flyttas till .stversions katalogen när de ersätts eller raderas av Syncthing.",
+    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Filer flyttas till datummärkta versioner i en .stversions mapp när de ersätts eller raderas av Syncthing.",
    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Filer skyddas från ändringar gjorda på andra enheter, men ändringar som görs på den här noden skickas till de andra klustermedlemmarna.",
    "Folder": "Katalog",
    "Folder ID": "Katalog-ID",
-    "Folder Label": "Katalog-etikett",
-    "Folder Master": "Huvudkatalog",
-    "Folder Path": "Katalog-sökväg",
+    "Folder Label": "Katalog etikett",
+    "Folder Path": "Katalog sökväg",
    "Folder Type": "Katalogtyp",
    "Folders": "Kataloger",
    "GUI": "Grafiskt gränssnitt",
-    "GUI Authentication Password": "Lösenord för GUI",
-    "GUI Authentication User": "Användare för GUI",
-    "GUI Listen Addresses": "Lyssningsadresser för GUI",
+    "GUI Authentication Password": "GUI autentiseringslösenord",
+    "GUI Authentication User": "GUI autentiseringsanvändare",
+    "GUI Listen Addresses": "GUI lyssnaradresser",
    "Generate": "Generera",
-    "Global Discovery": "Global upptäckt",
-    "Global Discovery Server": "Global upptäcktsserver",
-    "Global Discovery Servers": "Globala upptäcktsservrar",
+    "Global Discovery": "Global annonsering",
+    "Global Discovery Servers": "Globala annonseringsservrar",
    "Global State": "Global status",
    "Help": "Hjälp",
    "Home page": "Hemsida",
    "Ignore": "Ignorera",
    "Ignore Patterns": "Ignorera mönster",
    "Ignore Permissions": "Ignorera rättigheter",
-    "Incoming Rate Limit (KiB/s)": "Nedladdningshastighetsgräns (KiB/s)",
+    "Incoming Rate Limit (KiB/s)": "Inkommande hastighetsbegränsning (KiB/s)",
    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Inkorrekt konfiguration kan skada innehållet i katalogen and få Syncthing att sluta fungera.",
-    "Introducer": "introduktör",
-    "Inversion of the given condition (i.e. do not exclude)": "Vänder på villkoret, d.v.s. exkluderar inte.",
+    "Introducer": "Introduktör",
+    "Inversion of the given condition (i.e. do not exclude)": "Inversion av det givna tillståndet (d.v.s. exkluderar inte)",
    "Keep Versions": "Behåll versioner",
    "Largest First": "Största först",
    "Last File Received": "Senaste fil mottagen",
    "Last Scan": "Senaste skanning",
    "Last seen": "Senast sedd",
    "Later": "Senare",
+    "Latest Change": "Senaste ändring",
    "Listeners": "Lyssnare",
-    "Local Discovery": "Lokal upptäckt",
+    "Local Discovery": "Lokal annonsering",
    "Local State": "Lokal status",
    "Local State (Total)": "Lokal status (totalt)",
-    "Major Upgrade": "Stor uppgradering",
+    "Major Upgrade": "Större uppgradering",
    "Master": "Huvud",
    "Maximum Age": "Maximum ålder",
    "Metadata Only": "Endast metadata",
@@ -127,7 +124,7 @@
    "Options": "Alternativ",
    "Out of Sync": "Osynkroniserad",
    "Out of Sync Items": "Osynkroniserade objekt",
-    "Outgoing Rate Limit (KiB/s)": "Uppladdningshastighetsgräns (KiB/s)",
+    "Outgoing Rate Limit (KiB/s)": "Utgående hastighetsbegränsning (KiB/s)",
    "Override Changes": "Åsidosätt förändringar",
    "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": "Sökväg till katalogen på din dator. Kommer att skapas om det inte finns. Tecknet tilde (~) kan användas som en genväg för",
    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Sökväg där versioner sparas (lämna tomt för att använda .stversions i den ordinarie katalogen).",
@@ -139,28 +136,28 @@
    "Preview": "Förhandsgranska",
    "Preview Usage Report": "Förhandsgranska statistik",
    "Quick guide to supported patterns": "Snabb handledning till mönster som stöds",
-    "RAM Utilization": "RAM-användning",
+    "RAM Utilization": "RAM användning",
    "Random": "Slumpmässig",
-    "Relay Servers": "Reläservrar",
-    "Relayed via": "Vidarbefordras via",
-    "Relays": "Reläservrar",
+    "Reduced by ignore patterns": "Minskas med ignorera mönster",
    "Release Notes": "Versionsanteckningar",
    "Remote Devices": "Fjärrenheter",
    "Remove": "Ta bort",
    "Required identifier for the folder. Must be the same on all cluster devices.": "Krävs identifierare för katalogen. Måste vara densamma på alla kluster enheter.",
    "Rescan": "Skanna om",
    "Rescan All": "Skanna om alla",
-    "Rescan Interval": "Omskanningsintervall",
+    "Rescan Interval": "Återskanningsintervall",
    "Restart": "Starta om",
    "Restart Needed": "Omstart behövs",
    "Restarting": "Startar om",
    "Resume": "Återuppta",
-    "Reused": "Återanvänd",
+    "Reused": "Återanvänds",
    "Save": "Spara",
    "Scan Time Remaining": "Återstående skanningstid",
    "Scanning": "Skannar",
-    "Select the devices to share this folder with.": "Ange enheterna att dela den här katalogen med.",
+    "Select the devices to share this folder with.": "Ange enheterna som den här katalogen ska delas med.",
    "Select the folders to share with this device.": "Välj kataloger att dela med den här enheten.",
+    "Send & Receive": "Skicka & ta emot",
+    "Send Only": "Skicka endast",
    "Settings": "Inställningar",
    "Share": "Dela",
    "Share Folder": "Dela katalog",
@@ -168,11 +165,10 @@
    "Share With Devices": "Dela med enheter",
    "Share this folder?": "Dela denna katalog?",
    "Shared With": "Delad med",
-    "Short identifier for the folder. Must be the same on all cluster devices.": "Kort identifieringssträng för katalogen. Måste vara samma på alla enheter i klustret.",
    "Show ID": "Visa ID",
    "Show QR": "Visa QR",
-    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Visas i stället för enhetens ID. Skickas till andra enheter som namn på denna enhet.",
-    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Visas i stället för enhetens ID. Sätts till namnet på den andra enheten vid första anslutning om det lämnas tomt.",
+    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Visas istället för enhet-ID i klusterstatusen. Skickas till andra enheter som ett alternativt förvalt namn.",
+    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Visas i stället för enhet-ID i klusterstatusen. Kommer att uppdateras till namnet enheten annonserar om det lämnas tomt.",
    "Shutdown": "Stäng av",
    "Shutdown Complete": "Avstängning klar",
    "Simple File Versioning": "Enkel filversionshantering",
@@ -184,28 +180,25 @@
    "Statistics": "Statistik",
    "Stopped": "Stoppad",
    "Support": "Support",
-    "Sync Protocol Listen Addresses": "Synkroniseringsprotokollets lyssningsadresser",
+    "Sync Protocol Listen Addresses": "Synkroniseringsprotokollets lyssnaradresser",
    "Syncing": "Synkroniserar",
    "Syncthing has been shut down.": "Syncthing har stängts.",
    "Syncthing includes the following software or portions thereof:": "Syncthing innehåller följande mjukvarupaket eller delar av dem:",
    "Syncthing is restarting.": "Syncthing startar om.",
    "Syncthing is upgrading.": "Syncthing uppgraderas.",
-    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing verkar avstängd, eller finns det problem med din Internetanslutning. Försöker igen...",
+    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing verkar avstängd eller så är det problem med din Internetanslutning. Försöker igen...",
    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing verkar ha drabbats av ett problem med behandlingen av din begäran. Uppdatera sidan eller starta om Syncthing om problemet kvarstår.",
    "The Syncthing admin interface is configured to allow remote access without a password.": "Syncthing administratör gränssnittet är konfigurerat för att tillåta fjärrtillträde utan ett lösenord.",
-    "The aggregated statistics are publicly available at the URL below.": "Den aggregerade statistiken är offentligt tillgängliga på webbadressen nedan.",
-    "The aggregated statistics are publicly available at {%url%}.": "Sammanställd statistik finns publikt tillgänglig på {{url}}.",
+    "The aggregated statistics are publicly available at the URL below.": "Den aggregerade statistiken är offentligt tillgänglig på webbadressen nedan.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Konfigurationen har sparats men inte aktiverats. Syncthing måste startas om för att aktivera den nya konfigurationen.",
-    "The device ID cannot be blank.": "Enhetens ID kan inte vara tomt.",
-    "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).": "Enhetens ID som behövs här kan du hitta i \"Redigera > Visa ID\"-dialogen på den andra enheten. Mellanrum och bindestreck är valfria (ignoreras).",
-    "The device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "Enhetens ID som behövs här kan du hitta i \"Redigera > Visa ID\"-dialogen på den andra enheten. Mellanrum och bindestreck är valfria (ignoreras).",
-    "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.": "Den krypterade användarstatistiken skickas dagligen. Den används för att spåra vanliga plattformar, katalogstorlekar och versioner. Om datan som rapporteras ändras så kommer du att bli tillfrågad igen.",
-    "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 inmatade enhetens ID verkar inte korrekt. Det ska vara en 52 eller 56 teckens sträng bestående av siffror och bokstäver, eventuellt med mellanrum och bindestreck.",
+    "The device ID cannot be blank.": "Enhet-ID kan inte vara tomt.",
+    "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).": "Enhet-ID som behövs här kan du hitta i \"Åtgärder > Visa ID\"-dialogrutan på den andra enheten. Mellanrum och bindestreck är valfria (ignoreras).",
+    "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.": "Den krypterade användarstatistiken skickas dagligen. Den används för att spåra vanliga plattformar, katalogstorlekar och versioner. Om datat som rapporteras ändras så kommer du att bli tillfrågad igen.",
+    "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 inmatade enhet-ID verkar inte vara korrekt. Det ska vara en 52 eller 56 teckensträng bestående av siffror och bokstäver, eventuellt med mellanrum och bindestreck.",
    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "Den första kommandoparametern är sökvägen till mappen och den andra parametern är den relativa sökvägen i mappen.",
-    "The folder ID cannot be blank.": "Katalogens ID får inte vara tomt.",
-    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "Katalogens ID måste vara en kort sträng (64 tecken eller mindre), bestående av endast bokstäver, siffror, punkt (.), bindestreck (-) och understreck (_).",
-    "The folder ID must be unique.": "Katalogens ID måste vara unikt.",
-    "The folder path cannot be blank.": "Katalogsökvägen får inte vara tom.",
+    "The folder ID cannot be blank.": "Katalog-ID får inte vara tomt.",
+    "The folder ID must be unique.": "Katalog-ID måste vara unikt.",
+    "The folder path cannot be blank.": "Katalogsökvägen kan inte vara 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öljande intervallen används: varje 30 sekunder under den första timmen; varje timme under den första dagen; varje dag för de första 30 dagarna; varje vecka tills den maximala åldersgränsen uppnås.",
    "The following items could not be synchronized.": "Följande objekt kunde inte synkroniseras.",
    "The maximum age must be a number and cannot be blank.": "Åldersgränsen måste vara ett tal och kan inte lämnas tomt.",
@@ -227,25 +220,26 @@
    "Unshared": "Inte delad",
    "Unused": "Oanvänd",
    "Up to Date": "Uppdaterad",
-    "Updated": "Uppdaterad",
+    "Updated": "Uppdaterade",
    "Upgrade": "Uppgradering",
    "Upgrade To {%version%}": "Uppgradera till {{version}}",
    "Upgrading": "Uppgraderar",
    "Upload Rate": "Uppladdningshastighet",
-    "Uptime": "Tid sedan start",
+    "Uptime": "Drifttid",
    "Use HTTPS for GUI": "Använd HTTPS för GUI",
    "Version": "Version",
    "Versions Path": "Sökväg för versioner",
-    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Versioner tas bort automatiskt när de är äldre än den maximala åldersgränsen eller överstiger frekvensen i sitt interval.",
+    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Versioner tas bort automatiskt när de är äldre än den maximala åldersgränsen eller överstiger frekvensen i intervallet.",
    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Varning, denna sökväg är en underkatalog till en befintlig katalog \"{{otherFolder}}\".",
    "When adding a new device, keep in mind that this device must be added on the other side too.": "När du lägger till en ny enhet, kom ihåg att den här enheten måste läggas till på den andra enheten också.",
-    "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.": "När du lägger till ny katalog, tänk på att katalogens ID knyter ihop katalogen mellan olika noder. De måste vara exakt desamma mellan noder och stora eller små bokstäver har betydelse.",
+    "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.": "När du lägger till ny katalog, tänk på att katalog-ID knyter ihop kataloger mellan olika enheter. De skiftlägeskänsliga och måste matcha precis mellan alla enheter.",
    "Yes": "Ja",
    "You must keep at least one version.": "Du måste behålla åtminstone en version.",
    "days": "dagar",
+    "directories": "kataloger",
+    "files": "filer",
    "full documentation": "fullständig dokumentation",
    "items": "objekt",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} vill dela katalogen \"{{folder}}\".",
-    "{%device%} wants to share folder \"{%folderLabel%}\" ({%folder%}).": "{{device}} vill dela katalogen \"{{folderLabel}}\" ({{folder}}).",
-    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} vill dela katalogen \"{{folderlabel}}\" ({{folder}})."
+    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} vill dela katalog \"{{folder}}\".",
+    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} vill dela katalog \"{{folderlabel}}\" ({{folder}})."
 }
--- a/gui/default/assets/lang/lang-tr.json
+++ b/gui/default/assets/lang/lang-tr.json
@@ -1,28 +1,28 @@
 {
-    "A device with that ID is already added.": "Bu ID'yi taşıyan cihaz zaten eklendi.",
+    "A device with that ID is already added.": "Bu ID'yi taşıyan aygıt zaten eklendi.",
    "A negative number of days doesn't make sense.": "Eksi gün sayısı mantıklı bir ifade değil.",
-    "A new major version may not be compatible with previous versions.": "Yeni birincil sürümler önceki sürümlerle uyumlu olmayabilir.",
+    "A new major version may not be compatible with previous versions.": "Yeni ana sürüm önceki sürümlerle uyumlu olmayabilir.",
    "API Key": "API Anahtarı",
    "About": "Hakkında",
    "Actions": "Eylemler",
    "Add": "Ekle",
-    "Add Device": "Cihaz Ekle",
+    "Add Device": "Aygıt Ekle",
    "Add Folder": "Klasör Ekle",
-    "Add Remote Device": "Add Remote Device",
+    "Add Remote Device": "Uzak Aygıt Ekle",
    "Add new folder?": "Yeni klasör ekle?",
    "Address": "Adres",
    "Addresses": "Adresler",
    "Advanced": "Gelişmiş Düzey",
    "Advanced Configuration": "Gelişmiş Yapılandırma",
-    "Advanced settings": "Advanced settings",
-    "All Data": "Bütün Veriler",
+    "Advanced settings": "Gelişmiş ayarlar",
+    "All Data": "Tüm Veriler",
    "Allow Anonymous Usage Reporting?": "Anonim kullanımın raporlanmasına izin veriyor musun ?",
    "Alphabetic": "Alfabetik",
    "An external command handles the versioning. It has to remove the file from the synced folder.": "Sürümlendirme işlemini harici bir komut yürütüyor. Dosyayı eşzamanlama klasöründen kaldırmak zorunda.",
    "Anonymous Usage Reporting": "Anonim Kullanım Raporlama",
    "Any devices configured on an introducer device will be added to this device as well.": "Tanıtıcı bir cihazda yapılandırılan cihazlar bu cihaza da eklenecektir.",
    "Automatic upgrades": "Otomatik güncellemeler",
-    "Be careful!": "Dikkatli Ol!",
+    "Be careful!": "Dikkatli ol!",
    "Bugs": "Hatalar",
    "CPU Utilization": "İşlemci Kullanımı",
    "Changelog": "Değişim Günlüğü",
@@ -31,102 +31,99 @@
    "Command": "Komut",
    "Comment, when used at the start of a line": "Satır başında kullanıldığında açıklama özelliği taşır",
    "Compression": "Sıkıştırma",
+    "Configured": "Yapılandırıldı",
    "Connection Error": "Bağlantı hatası",
-    "Connection Type": "Connection Type",
+    "Connection Type": "Bağlantı Türü",
    "Copied from elsewhere": "Başka bir yerden kopyalanmış",
    "Copied from original": "Aslından kopyalanmış",
    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 the following Contributors:",
-    "Copyright © 2015 the following Contributors:": "Telif Hakkı © 2015 katkıda bulunanlar:",
    "Danger!": "Tehlike!",
-    "Delete": "Sil",
    "Deleted": "Silindi",
-    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Device \"{{name}}\" ({{device}} at {{address}}) wants to connect. Add new device?",
-    "Device ID": "Cihaz ID",
-    "Device Identification": "Cihaz Kimliği",
-    "Device Name": "Cihaz Adı",
-    "Device {%device%} ({%address%}) wants to connect. Add new device?": "Cihaz {{device}} ({{address}}) bağlanmak istiyor. Yeni cihaz ekle?",
-    "Devices": "Cihazlar",
+    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "\"{{name}}\" aygıtı ({{address}} adresindeki {{device}}) bağlanmak istiyor. Yeni aygıtı ekle?",
+    "Device ID": "Aygıt ID",
+    "Device Identification": "Aygıt Kimliği",
+    "Device Name": "Aygıt Adı",
+    "Devices": "Aygıtlar",
    "Disconnected": "Bağlantı Kesik",
-    "Discovery": "Discovery",
+    "Discovered": "Keşfedildi",
+    "Discovery": "Keşif",
    "Documentation": "Belgeleme",
    "Download Rate": "İndirme Hızı",
    "Downloaded": "İndirilmiş",
    "Downloading": "İndiriliyor",
    "Edit": "Düzenle",
-    "Edit Device": "Cihaz Düzenle",
-    "Edit Folder": "Klasör Düzenle",
+    "Edit Device": "Aygıtı Düzenle",
+    "Edit Folder": "Klasörü Düzenle",
    "Editing": "Düzenleniyor",
    "Enable NAT traversal": "Enable NAT traversal",
    "Enable Relaying": "Enable Relaying",
-    "Enable UPnP": "UPnP Etkinleştir",
    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Adreslerin keşfinin otomatik olarak gerçekleştirilmesi için ya adresleri virgülle ayırarak  (\"tcp://ip:port\", \"tcp://host:port\") girin, ya da \"dynamic\" kelimesini girin.",
    "Enter ignore patterns, one per line.": "Yoksayılacak/ihmal edilecek kalıp dizilerini her satıra bir tane olacak şekilde girin.",
    "Error": "Hata",
    "External File Versioning": "Harici Dosya Sürümlendirme",
-    "Failed Items": "Başarısız olunan Öğeler",
-    "File Pull Order": "File Pull Order",
+    "Failed Items": "Başarısız Olunan Ögeler",
+    "File Pull Order": "Dosya Koyma Düzeni",
    "File Versioning": "Dosya Sürümlendirme",
    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Değişimleri yoklarken dosya izin bilgilerini ihmal et. FAT dosya sistemlerinde kullanın.",
    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Dosyalar Syncthing tarafından yeri değiştirildiğinde ya da silindiğinde .stversions klasörüne taşınır.",
    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Dosyalar Syncthing tarafından yeri değiştirildiğinde ya da silindiğinde, tarih damgalı sürümleri .stversions klasörüne taşınır.",
-    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Dosyalar diğer cihazlarda yapılan değişikliklerden korunur, ancak bu cihazdaki değişiklikler kümedeki diğer cihazlara gönderilir.",
+    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Dosyalar diğer aygıtlarda yapılan değişikliklerden korunur, ancak bu aygıttaki değişiklikler kümedeki diğer aygıtlara gönderilir.",
    "Folder": "Klasör",
    "Folder ID": "Klasör ID",
-    "Folder Label": "Folder Label",
-    "Folder Master": "Ana Klasör",
+    "Folder Label": "Klasör Etiketi",
    "Folder Path": "Klasör Yolu",
-    "Folder Type": "Folder Type",
+    "Folder Type": "Klasör Türü",
    "Folders": "Klasörler",
-    "GUI": "GUI / Kullanıcı Grafik Arayüzü",
+    "GUI": "GUI / Grafiksel Kullanıcı Arayüzü",
    "GUI Authentication Password": "GUI Kimlik Doğrulaması için Kullanıcı Parolası",
    "GUI Authentication User": "GUI Kimlik Doğrulaması için Kullanıcı Adı",
    "GUI Listen Addresses": "GUI Dinleme/Bağlantı Adresleri",
    "Generate": "Oluştur",
    "Global Discovery": "Küresel Discovery",
-    "Global Discovery Server": "Küresel Discovery Sunucusu",
-    "Global Discovery Servers": "Global Discovery Servers",
+    "Global Discovery Servers": "Küresel Keşif Sunucuları",
    "Global State": "Küresel Durum",
    "Help": "Yardım",
-    "Home page": "Ana Sayfa",
+    "Home page": "Ana sayfa",
    "Ignore": "Yoksay",
    "Ignore Patterns": "Kalıpları Yoksay",
    "Ignore Permissions": "İzinleri yoksay",
-    "Incoming Rate Limit (KiB/s)": "İndirme Oranı Limiti (KiB/s)",
+    "Incoming Rate Limit (KiB/s)": "İndirme Oranı Sınırı (KiB/s)",
    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Yanlış yapılandırma klasör içeriğine zarar verebilir ve Syncthing'i çalışamaz hale getirebilir.",
    "Introducer": "Tanıtıcı",
    "Inversion of the given condition (i.e. do not exclude)": "Verilen koşulun ters çevirilmesi (örneğin: yok sayma)",
    "Keep Versions": "Sürümleri Tut",
    "Largest First": "En büyük olan önce",
    "Last File Received": "Alınan Son Dosya",
-    "Last Scan": "Last Scan",
-    "Last seen": "Son Görülen",
+    "Last Scan": "Son Tarama",
+    "Last seen": "Son görülme",
    "Later": "Sonra",
-    "Listeners": "Listeners",
+    "Latest Change": "Son Değişim",
+    "Listeners": "Dinleyiciler",
    "Local Discovery": "Yerel Discovery",
    "Local State": "Yerel Durum",
    "Local State (Total)": "Yerel Durum (Toplamı)",
    "Major Upgrade": "Birincil Yükseltme",
-    "Master": "Master",
+    "Master": "Ana",
    "Maximum Age": "Azami Süre",
-    "Metadata Only": "Sadece Üstveri",
+    "Metadata Only": "Yalnızca Üstveri",
    "Minimum Free Disk Space": "En Az Boş Disk Alanı",
    "Move to top of queue": "Kuyruğun başına taşı",
    "Multi level wildcard (matches multiple directory levels)": "Çoklu düzey wildcard (çok sayıda dizin düzeyinde eşleşme)",
    "Never": "Asla",
-    "New Device": "Yeni Cihaz",
+    "New Device": "Yeni Aygıt",
    "New Folder": "Yeni Klasör",
    "Newest First": "En yeni olan önce",
    "No": "Hayır",
    "No File Versioning": "Dosya Sürümlendirmesi Yok",
-    "Normal": "Normal",
+    "Normal": "Olağan",
    "Notice": "Uyarı",
    "OK": "Tamam",
    "Off": "Kapalı",
    "Oldest First": "En eski olan önce",
-    "Optional descriptive label for the folder. Can be different on each device.": "Optional descriptive label for the folder. Can be different on each device.",
+    "Optional descriptive label for the folder. Can be different on each device.": "Klasör için isteğe bağlı açıklayıcı etiket. Her aygıtta başka olabilir.",
    "Options": "Seçenekler",
    "Out of Sync": "Eşzamanlama Dışı",
-    "Out of Sync Items": "Eşzamanlama dışında kalan Öğeler",
+    "Out of Sync Items": "Eşzamanlama Dışında Kalan Ögeler",
    "Outgoing Rate Limit (KiB/s)": "Yükleme hız sınırı (KB/sn)",
    "Override Changes": "Değişiklikleri Geçersiz kıl",
    "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": "Yerel bilgisayardaki klasöre ulaşım yolu. Klasör yoksa yaratılacak. Tilde (~) karakterinin kısayol olarak kullanılabileceği yol",
@@ -141,13 +138,11 @@
    "Quick guide to supported patterns": "Desteklenen kalıplar için hızlı rehber",
    "RAM Utilization": "RAM Kullanımı",
    "Random": "Rastgele",
-    "Relay Servers": "Relay Servers",
-    "Relayed via": "Relayed via",
-    "Relays": "Röleler",
+    "Reduced by ignore patterns": "Reduced by ignore patterns",
    "Release Notes": "Sürüm Notları",
-    "Remote Devices": "Remote Devices",
+    "Remote Devices": "Uzak Aygıtlar",
    "Remove": "Kaldır",
-    "Required identifier for the folder. Must be the same on all cluster devices.": "Required identifier for the folder. Must be the same on all cluster devices.",
+    "Required identifier for the folder. Must be the same on all cluster devices.": "Klasör için tanımlayıcı gereklidir. Tüm küme cihazlarda aynı olmalıdır.",
    "Rescan": "Tekrar Tara",
    "Rescan All": "Tümünü Tekrar Tara",
    "Rescan Interval": "Tarama Aralığı",
@@ -159,24 +154,25 @@
    "Save": "Kaydet",
    "Scan Time Remaining": "Kalan Tarama Zamanı",
    "Scanning": "Taranıyor",
-    "Select the devices to share this folder with.": "Bu klasörü paylaşacağın cihazları seç.",
-    "Select the folders to share with this device.": "Bu cihazla paylaşılacak klasörleri seç.",
+    "Select the devices to share this folder with.": "Bu klasörü paylaşacağın aygıtları seç.",
+    "Select the folders to share with this device.": "Bu aygıtla paylaşılacak klasörleri seç.",
+    "Send & Receive": "Gönder & Al",
+    "Send Only": "Yalnızca Gönder",
    "Settings": "Ayarlar",
    "Share": "Paylaş",
    "Share Folder": "Paylaşım Klasörü",
-    "Share Folders With Device": "Klasörü Cihazla Paylaş",
-    "Share With Devices": "Cihazlar İle Paylaş",
-    "Share this folder?": "Bu klasörü paylaşmak istiyor musun?",
+    "Share Folders With Device": "Klasörü Aygıtla Paylaş",
+    "Share With Devices": "Aygıtlar İle Paylaş",
+    "Share this folder?": "Bu klasörü paylaş?",
    "Shared With": "Paylaşılan düğümler",
-    "Short identifier for the folder. Must be the same on all cluster devices.": "Klasörü için kısa tanımlayıcı. Tüm küme cihazlarda aynı olmalıdır.",
    "Show ID": "ID Göster",
    "Show QR": "QR Göster",
-    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Küme durumunda Cihaz ID yerine bunu göster. Varsayılan isim isteğe bağlı olarak diğer cihazlara ilan edilecektir.",
-    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Küme durumunda Cihaz ID yerine bunu göster. Eğer düğüm ismi boş bırakılırsa düğüm ismi güncellenip ilan edilecektir.",
+    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Küme durumunda Aygıt ID yerine bunu göster. Varsayılan ad isteğe bağlı olarak diğer aygıtlara ilan edilecektir.",
+    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Küme durumunda Aygıt ID yerine bunu göster. Eğer düğüm adı boş bırakılırsa düğüm adı güncellenip ilan edilecektir.",
    "Shutdown": "Kapat",
    "Shutdown Complete": "Kapatma İşlemi Tamamlandı",
    "Simple File Versioning": "Basit Dosya Sürümlendirme",
-    "Single level wildcard (matches within a directory only)": "Tekli düzey wildcard (sadece bir dizin içinde eşleşme)",
+    "Single level wildcard (matches within a directory only)": "Tekli düzey wildcard (yalnızca bir dizin içinde eşleşme)",
    "Smallest First": "En küçük olan önce",
    "Source Code": "Kaynak Kodu",
    "Staggered File Versioning": "Aşamalı Dosya Sürümlendirme",
@@ -193,21 +189,18 @@
    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing uygulaması çökmüş olabilir, veya internet bağlantınızda bir sorun var. Tekrar deniyor....",
    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing isteminizi işleme alırken bir sorunla karşılaştı. Lütfen sayfanızı yenileyin veya sorun devam ediyorsa Syncthing'i yeniden başlatın.",
    "The Syncthing admin interface is configured to allow remote access without a password.": "Syncthing yönetici arayüzü parolasız olarak uzaktan erişime izin verilecek şekilde yapılandırıldı.",
-    "The aggregated statistics are publicly available at the URL below.": "The aggregated statistics are publicly available at the URL below.",
-    "The aggregated statistics are publicly available at {%url%}.": "Toplanan halka açık istatistiklere ulaşabileceğiniz adres {{url}}.",
+    "The aggregated statistics are publicly available at the URL below.": "Toplanan istatistikler halka açık biçimde aşağıdaki adrestedir.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Yapılandırma kaydedildi ancak etkinleştirilmedi. Etkinleştirmek için Syncthing yeniden başlatılmalı.",
-    "The device ID cannot be blank.": "Cihaz ID boş olamaz.",
-    "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).": "Buraya girilecek olan aygıt ID'si diğer cihazlarda, \"Eylemler > ID Göster\" penceresinde bulunabilir. Boşluklar ve çizgiler isteğe bağlıdır (yoksayılmış).",
-    "The device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "Buraya girilecek cihaz ID'si diğer düğümde \"Düzenle > ID Göster\" menüsünden bulunabilir. Boşluk ve kısa çizginin olup olmaması önemli değildir. (İhmal edilir)",
-    "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.": "Şifrelenmiş kullanım bilgisi günlük olarak gönderilir. Platform, klasör büyüklüğü ve uygulama sürümü hakkında bilgi toplanır. Toplanan bilgi çeşidi değişecek olursa, sizden tekrar onay istenecek.",
-    "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.": "Girilen cihaz ID'si geçerli gibi gözükmüyor. 52 ya da 56 karakter uzunluğunda, harf ve rakamlardan oluşmalı. Boşlukların ve kısa çizgilerin olup olmaması önemli değildir.",
+    "The device ID cannot be blank.": "Aygıt ID boş olamaz.",
+    "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).": "Buraya girilecek olan aygıt ID'si diğer aygıtlarda, \"Eylemler > ID Göster\" penceresinde bulunabilir. Boşluklar ve çizgiler isteğe bağlıdır (yoksayılmış).",
+    "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.": "Şifrelenmiş kullanım bilgisi günlük olarak gönderilir. Platform, klasör büyüklüğü ve uygulama sürümü hakkında bilgi toplanır. Toplanan bilgi türü değişecek olursa, sizden yeniden onay istenecek.",
+    "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.": "Girilen aygıt ID'si geçerli gibi gözükmüyor. 52 ya da 56 karakter uzunluğunda, harf ve rakamlardan oluşmalı. Boşlukların ve kısa çizgilerin olup olmaması önemli değildir.",
    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "İlk komut satırı parametresi klasör yoludur; ikinci parametre ise klasördeki göreceli yoldur. ",
    "The folder ID cannot be blank.": "Klasör ID boş olamaz.",
-    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "Klasör ID uzun olmamalı (64 karakter ya da daha az). Sadece harf, rakam, nokta (.), kısa çizgi (-) ve alt çizgi (_) kullanabilirsiniz.",
    "The folder ID must be unique.": "Klasör ID benzersiz olmalıdır.",
    "The folder path cannot be blank.": "Klasör dizini boş bırakılamaz.",
    "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.": "Kullanılan zaman aralıkları: ilk bir saat zarfında her 30 saniyede bir, ilk gün zarfında saatte bir, ilk 30 gün zarfında her gün, azami süreye kadar geçen zamanda ise her hafta yeni bir sürüm değeri oluşturulur/tutulur.",
-    "The following items could not be synchronized.": "Aşağıdaki öğelerin eşzamanlama işlemi gerçekleştirilemedi.",
+    "The following items could not be synchronized.": "Aşağıdaki ögelerin eşzamanlama işlemi gerçekleştirilemedi.",
    "The maximum age must be a number and cannot be blank.": "Azami süre tanımı boş bırakılmamalı ve bir sayı olarak tanımlanmalıdır.",
    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Bir sürümün tutulması için belirlenen azami süre (sürümleri sürekli olarak tutabilmek için 0 değeri atayın)",
    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "En az boş disk alanı yüzde olarak 0 ve 100 (dahil) arasında kalan pozitif bir sayıyla tanımlanmalıdır.",
@@ -215,11 +208,11 @@
    "The number of days to keep files in the trash can. Zero means forever.": "Dosyaları çöp kutusunda tutma süresini tanımlayan gün sayısı. Sıfır devamlı/sürekli anlamına gelir.",
    "The number of old versions to keep, per file.": "Dosya başına saklanacak/tutulacak eski sürüm sayısı.",
    "The number of versions must be a number and cannot be blank.": "Sürümlerin sayısı sayı olmalı ve boş bırakılamaz.",
-    "The path cannot be blank.": "Dizin yolu boş bırakılamaz.",
+    "The path cannot be blank.": "Yol boş bırakılamaz.",
    "The rate limit must be a non-negative number (0: no limit)": "Hız sınırı pozitif bir sayı olmalıdır. (0: sınırsız)",
    "The rescan interval must be a non-negative number of seconds.": "Tarama zaman aralığı, saniye cinsinden negatif olmayan bir sayı olmalıdır.",
-    "They are retried automatically and will be synced when the error is resolved.": "Otomatik olarak yeniden deneniyor; hata giderildiğinde eşzamanlama gerçekleştirilecek.",
-    "This Device": "This Device",
+    "They are retried automatically and will be synced when the error is resolved.": "Kendiliğinden yeniden deneniyor; hata giderildiğinde eşzamanlama gerçekleştirilecek.",
+    "This Device": "Bu Aygıt",
    "This can easily give hackers access to read and change any files on your computer.": "Hacker'ların bilgisayarındaki dosyaları okuma ve değiştirme yetkisine kolayca erişebilmelerini sağlayabilir.",
    "This is a major version upgrade.": "Birincil sürüm yükseltmesidir.",
    "Trash Can File Versioning": "Çöp Kutusu Dosya Sürümleme",
@@ -237,15 +230,16 @@
    "Version": "Sürüm",
    "Versions Path": "Sürüm Dizin Yolu",
    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Sürümler, tanımlı azami süre veya belirlenen zaman aralığı için izin verilen dosya sayısı aşılmışsa kendiliğinden silinir.",
-    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Warning, this path is a subdirectory of an existing folder \"{{otherFolder}}\".",
-    "When adding a new device, keep in mind that this device must be added on the other side too.": "Yeni bir cihaz eklendiğinde, bu cihazın karşı tarafa da eklenmesi gerektiğini unutmayın.",
-    "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.": "Yeni bir klasör eklendiğinde, Klasör ID'nin klasörleri cihazlar arasında bağlantılandırmak için kullanıldığını unutmayın. Klasör ID'ler büyük - küçük harf duyarlıdır ve bütün cihazlarda tamı tamına eşleşmelidir.",
+    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Uyarı, bu yol var olan bir klasörün \"{{otherFolder}}\" alt klasörüdür.",
+    "When adding a new device, keep in mind that this device must be added on the other side too.": "Yeni bir aygıt eklendiğinde, bu aygıtın karşı tarafa da eklenmesi gerektiğini unutmayın.",
+    "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.": "Yeni bir klasör eklendiğinde, Klasör ID'nin klasörleri aygıtlar arasında bağlantılandırmak için kullanıldığını unutmayın. Klasör ID'ler büyük - küçük harf duyarlıdır ve tüm aygıtlarda tamı tamına eşleşmelidir.",
    "Yes": "Evet",
    "You must keep at least one version.": "En az bir sürümü tutmalısınız.",
-    "days": "günler",
+    "days": "gün",
+    "directories": "dizin",
+    "files": "dosya",
    "full documentation": "belgelendirme içeriğinin tümü",
    "items": "öğel",
    "{%device%} wants to share folder \"{%folder%}\".": "{{device}}  \"{{folder}}\" klasörünü paylaşmak istiyor.",
-    "{%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}})."
+    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}}, \"{{folderlabel}}\" ({{folder}}) klasörünü paylaşmak istiyor."
 }
--- a/gui/default/assets/lang/lang-uk.json
+++ b/gui/default/assets/lang/lang-uk.json
@@ -31,22 +31,21 @@
    "Command": "Команда",
    "Comment, when used at the start of a line": "Коментар, якщо використовується на початку рядка",
    "Compression": "Стиснення",
+    "Configured": "Налаштовано",
    "Connection Error": "Помилка з’єднання",
    "Connection Type": "Тип з*єднання",
    "Copied from elsewhere": "Скопійовано з іншого місця",
    "Copied from original": "Скопійовано з оригіналу",
    "Copyright © 2014-2016 the following Contributors:": "© 2014-2016 Всі права застережено, вклад внесли:",
-    "Copyright © 2015 the following Contributors:": "Copyright © 2015 наступних контриб’юторів:",
    "Danger!": "Небезпечно!",
-    "Delete": "Видалити",
    "Deleted": "Видалене",
    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Пристрій \"{{name}}\" ({{device}} за адресою {{address}}) намагається під’єднатися. Додати новий пристрій?",
    "Device ID": "ID пристрою",
    "Device Identification": "Ідентифікатор пристрою",
    "Device Name": "Назва пристрою",
-    "Device {%device%} ({%address%}) wants to connect. Add new device?": "Пристрій {{device}} ({{address}}) намагається під’єднатися. Додати новий пристрій?",
    "Devices": "Пристрої",
    "Disconnected": "З’єднання відсутнє",
+    "Discovered": "Виявлено",
    "Discovery": "Сервери координації NAT",
    "Documentation": "Документація",
    "Download Rate": "Швидкість завантаження",
@@ -58,7 +57,6 @@
    "Editing": "Редагування",
    "Enable NAT traversal": "Увімкнути NAT traversal",
    "Enable Relaying": "Увімкнути ретрансляцію (relaying)",
-    "Enable UPnP": "Увімкнути UPnP",
    "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.": "Введіть шаблони ігнорування, по одному на рядок.",
    "Error": "Помилка",
@@ -73,7 +71,6 @@
    "Folder": "Директорія",
    "Folder ID": "ID директорії",
    "Folder Label": "Мітка директорії",
-    "Folder Master": "Вважати за оригінал",
    "Folder Path": "Шлях до директорії",
    "Folder Type": "Тип директорії",
    "Folders": "Директорії",
@@ -83,7 +80,6 @@
    "GUI Listen Addresses": "Адреса доступу до панелі управління",
    "Generate": "Згенерувати",
    "Global Discovery": "Глобальне виявлення (internet)",
-    "Global Discovery Server": "Сервер для глобального виявлення",
    "Global Discovery Servers": "Сервери глобального виявлення \n(координації NAT)",
    "Global State": "Глобальний статус",
    "Help": "Допомога",
@@ -101,6 +97,7 @@
    "Last Scan": "Останнє сканування",
    "Last seen": "З’являвся останній раз",
    "Later": "Пізніше",
+    "Latest Change": "Найостанніша зміна",
    "Listeners": "Приймачі (TCP & Relay)",
    "Local Discovery": "Локальне виявлення (LAN)",
    "Local State": "Локальний статус",
@@ -141,9 +138,7 @@
    "Quick guide to supported patterns": "Швидкий посібник по шаблонам, що підтримуються",
    "RAM Utilization": "Використання RAM",
    "Random": "Випадково",
-    "Relay Servers": "Сервери ретрансляції",
-    "Relayed via": "Ретранслювати через",
-    "Relays": "Ретранслятори",
+    "Reduced by ignore patterns": "Зменшено шаблонами ігнорування",
    "Release Notes": "Примітки до випуску",
    "Remote Devices": "Віддалені пристрої",
    "Remove": "Видалити",
@@ -161,6 +156,8 @@
    "Scanning": "Сканування",
    "Select the devices to share this folder with.": "Оберіть пристрої, які матимуть доступ до цієї директорії.",
    "Select the folders to share with this device.": "Оберіть директорії до яких матиме доступ цей пристрій.",
+    "Send & Receive": "Відправити та отримати",
+    "Send Only": "Лише відправити",
    "Settings": "Налаштування",
    "Share": "Розповсюдити ",
    "Share Folder": "Розповсюдити каталог",
@@ -168,7 +165,6 @@
    "Share With Devices": "Розповсюдити між пристроями",
    "Share this folder?": "Розповсюдити цей каталог?",
    "Shared With": "Доступно для",
-    "Short identifier for the folder. Must be the same on all cluster devices.": "Короткий ідентифікатор для директорії. Має бути однаковим на усіх  пристроях кластеру.",
    "Show ID": "Показати ID",
    "Show QR": "Показати QR-код",
    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Показується замість ID пристрою в статусі кластера. Буде розголошено іншим вузлам як опціональне типове ім’я.",
@@ -194,16 +190,13 @@
    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Схоже на те, що Syncthing стикнувся з проблемою оброблюючи ваш запит. Будь ласка перезавантажте сторінку в браузері або перезапустіть 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.": "Зібрана статистика публічно доступна за наступним посиланням.",
-    "The aggregated statistics are publicly available at {%url%}.": "Зібрана статистика публічно доступна за посиланням {{url}}.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Конфігурацію збережено, але не активовано. Необхідно перезапустити Syncthing для того, щоби активувати нову конфігурацію.",
    "The device ID cannot be blank.": "ID пристрою не може бути порожнім.",
    "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).": "ID пристрою, який необхідно додати. Може бути знайдений у вікні \"Дії > Показати ID\" в меню іншого пристрою. Пробіли та тире необов'язкові (будуть проігноровні).",
-    "The device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "ID пристрою, який необхідно додати. Може бути знайдений у вікні \"Редагувати > Показати ID\" в меню іншого пристрою. Пробіли та тире необов'язкові (будуть проігноровні).",
    "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.": "Введений ID пристрою невалідний. Ідентифікатор має вигляд строки довжиною 52 або 56 символів, що містить цифри та літери, із опціональними пробілами та тире.",
    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "Перший параметр командного рядка це шлях до директорії, другий - відносний шлях у директорії.",
    "The folder ID cannot be blank.": "ID директорії не може бути порожнім.",
-    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "ID директорії повинен бути коротким ідентифікатором (64 символи або менше), що містить лише цифри та літери, знак крапки (.), тире (-) та нижнього підкреслення (_).",
    "The folder ID must be unique.": "ID директорії повинен бути унікальним.",
    "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 днів версія зберігається кожен день, опісля, до максимального строку, версія зберігається щотижня.",
@@ -243,9 +236,10 @@
    "Yes": "Так",
    "You must keep at least one version.": "Ви повинні зберігати щонайменше одну версію.",
    "days": "днів",
+    "directories": "директорії",
+    "files": "файли",
    "full documentation": "повна документація",
    "items": "елементи",
    "{%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}})."
 }
--- a/gui/default/assets/lang/lang-vi.json
+++ b/gui/default/assets/lang/lang-vi.json
@@ -31,34 +31,32 @@
    "Command": "Lệnh",
    "Comment, when used at the start of a line": "Bình luận, khi dùng trước đầu dòng",
    "Compression": "Nén",
+    "Configured": "Configured",
    "Connection Error": "Lỗi kết nối",
    "Connection Type": "Connection Type",
    "Copied from elsewhere": "Đã sao chép từ nơi khác",
    "Copied from original": "Đã sao chép từ nguồn",
    "Copyright © 2014-2016 the following Contributors:": "Bản quyền © 2014-2016 thuộc về các nhà cộng tác sau:",
-    "Copyright © 2015 the following Contributors:": "Bản quyền © 2015 thuộc về các nhà cộng tác sau:",
    "Danger!": "Nguy hiểm!",
-    "Delete": "Xoá",
    "Deleted": "Đã xoá",
    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Thiết bị \"{{name}}\" ({{device}} tại {{address}}) muốn kết nối. Thêm thiết bị mới?",
    "Device ID": "ID thiết bị",
    "Device Identification": "Danh tính thiết bị",
    "Device Name": "Tên thiết bị",
-    "Device {%device%} ({%address%}) wants to connect. Add new device?": "Thiết bị {{device}} ({{address}}) muốn kết nối. Thêm thiết bị mới?",
    "Devices": "Các thiết bị",
    "Disconnected": "Đã ngắt kết nối",
+    "Discovered": "Discovered",
    "Discovery": "Tìm thấy",
    "Documentation": "Tài liệu",
    "Download Rate": "Tốc độ tải xuống",
    "Downloaded": "Đã tải xuống",
    "Downloading": "Đang tải xuống",
    "Edit": "Chỉnh sửa",
-    "Edit Device": "Ch.sửa thiết bị",
-    "Edit Folder": "Ch.sửa thư mục",
+    "Edit Device": "Edit Device",
+    "Edit Folder": "Edit Folder",
    "Editing": "Đang ch.sửa",
    "Enable NAT traversal": "Enable NAT traversal",
    "Enable Relaying": "Bật chế độ ch.tiếp",
-    "Enable UPnP": "Bật UPnP",
    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Nhập các địa chỉ ngăn cách bởi dấu phẩy (\"tcp://ip:port\", \"tcp://host:port\") hoặc \"dynamic\" để tiến hành dò tìm địa chỉ tự động.",
    "Enter ignore patterns, one per line.": "Nhập các quy luật bỏ qua, từng dòng một.",
    "Error": "Lỗi",
@@ -73,7 +71,6 @@
    "Folder": "Thư mục",
    "Folder ID": "ID thư mục",
    "Folder Label": "Nhãn thư mục",
-    "Folder Master": "Thư mục Chủ",
    "Folder Path": "Đ.dẫn đến th.mục",
    "Folder Type": "Folder Type",
    "Folders": "Các th.mục",
@@ -83,7 +80,6 @@
    "GUI Listen Addresses": "Các đ.chỉ lắng nghe GUI",
    "Generate": "Tạo mới",
    "Global Discovery": "Dò tìm toàn cầu",
-    "Global Discovery Server": "Máy chủ dò tìm toàn cầu",
    "Global Discovery Servers": "Các m.chủ dò tìm toàn cầu",
    "Global State": "Tr.thái toàn cầu",
    "Help": "Trợ giúp",
@@ -101,6 +97,7 @@
    "Last Scan": "Last Scan",
    "Last seen": "Thấy lần cuối",
    "Later": "Để sau",
+    "Latest Change": "Latest Change",
    "Listeners": "Listeners",
    "Local Discovery": "Dò tìm cục bộ",
    "Local State": "Tr.thái cục bộ",
@@ -141,9 +138,7 @@
    "Quick guide to supported patterns": "H.dẫn sơ lược về các q.luật được hỗ trợ",
    "RAM Utilization": "Mức s.dụng RAM",
    "Random": "Ngẫu nhiên",
-    "Relay Servers": "M.chủ chuyển tiếp",
-    "Relayed via": "Ch.tiếp qua",
-    "Relays": "Các máy ch.tiếp",
+    "Reduced by ignore patterns": "Reduced by ignore patterns",
    "Release Notes": "Lịch sử phát hành",
    "Remote Devices": "Các thiết bị từ xa",
    "Remove": "Xoá",
@@ -161,6 +156,8 @@
    "Scanning": "Đang quét",
    "Select the devices to share this folder with.": "Chọn các thiết bị để chia sẻ thư mục này.",
    "Select the folders to share with this device.": "Chọn các thư mục để chia sẻ với thiết bị này.",
+    "Send & Receive": "Send & Receive",
+    "Send Only": "Send Only",
    "Settings": "Cài đặt",
    "Share": "Chia sẻ",
    "Share Folder": "Chia sẻ th.mục",
@@ -168,7 +165,6 @@
    "Share With Devices": "Chia sẻ với các th.bị",
    "Share this folder?": "Chia sẻ th.mục này?",
    "Shared With": "Đã ch.sẻ với",
-    "Short identifier for the folder. Must be the same on all cluster devices.": "Tên tắt cho thư mục. Phải trùng khớp trên tất cả thiết bị trong cụm.",
    "Show ID": "Hiển thị ID",
    "Show QR": "Hiển thị QR",
    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Hiển thị thay cho ID th.bị trong trạng thái cụm. Sẽ được giới thiệu đến các th.bị khác như tên mặc định tuỳ chọn.",
@@ -194,16 +190,13 @@
    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Có vẻ như Syncthing đang gặp phải v.đề khi x.lý yêu cầu của bạn. Xin làm mới trang hoặc kh.động lại Syncthing nếu v.đề vẫn còn tiếp diễn.",
    "The Syncthing admin interface is configured to allow remote access without a password.": "Giao diện q.trị của Syncthing được c.hình nhằm cho phép tr.cập từ xa không cần mật khẩu.",
    "The aggregated statistics are publicly available at the URL below.": "The aggregated statistics are publicly available at the URL below.",
-    "The aggregated statistics are publicly available at {%url%}.": "Thống kê tổng hợp được đăng công khai trên {{url}}.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Cấu hình đã được lưu nhưng chưa được kích hoạt. Syncthing phải khởi động lại để kích hoạt cấu hình mới. ",
    "The device ID cannot be blank.": "Không được để trống ID thiết bị.",
    "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).": "ID thiết bị cần nhập có thể được tìm thấy trong hộp thoại \"Thao tác > Hiển thị ID\" trên thiết bị kia. Khoảng trắng và gạch ngang là tuỳ chọn (bỏ qua).",
-    "The device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "ID th.bị cần nhập có thể được tìm thấy trong h.thoại \"Chỉnh sửa > Hiển thị ID\" trên th.bị kia. Khoảng trắng và gạch ngang là t.chọn (bỏ qua).",
    "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.": "Báo cáo s.dụng đã mã hoá sẽ được gửi đi hằng ngày. Nó được dùng để t.thập s.liệu về các HĐH phổ biến, kích cỡ th.mục và ph.bản ứng dụng. Nếu bộ d.liệu báo cáo có th.đổi, bạn sẽ được nhắc thông qua h.thoại này.",
    "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.": "ID thiết bị đã nhập không hợp lệ. Nó phải là một chuỗi từ 52 đến 56 ký tự, bao gồm chữ cái và các con số, với khoảng trắng và gạch ngang là tuỳ chọn.",
    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "Tham số dòng lệnh đầu tiên là đường dẫn thư mục và tham số thứ hai là đường dẫn tương đối trong thư mục.",
    "The folder ID cannot be blank.": "Không được để trống ID thư mục.",
-    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "ID thư mục phải là một tên tắt (64 ký tự hoặc ít hơn) chỉ bao gồm chữ cái, các con số và dấu chấm (.), gạch ngang (-) và gạch chân (_).",
    "The folder ID must be unique.": "ID thư mục phải là duy nhất.",
    "The folder path cannot be blank.": "Không được để trống đ.dẫn đến th.mục.",
    "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.": "Các khoảng th.gian sau đây sẽ được s.dụng: một phiên bản, trong giờ đầu tiên, được giữ lại mỗi 30 giây, trong ngày đầu tiên là mỗi giờ, trong 30 ngày đầu tiên là mỗi ngày, cho đến khi th.hạn tối đa mỗi ph.bản được giữ lại là mỗi tuần. ",
@@ -243,9 +236,10 @@
    "Yes": "Phải",
    "You must keep at least one version.": "Bạn phải giữ ít nhất một phiên bản.",
    "days": "ngày",
+    "directories": "directories",
+    "files": "files",
    "full documentation": "tài liệu đầy đủ",
    "items": "nội dung",
    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} muốn chia sẻ thư mục \"{{folder}}\".",
-    "{%device%} wants to share folder \"{%folderLabel%}\" ({%folder%}).": "{{device}} muốn chia sẻ thư mục \"{{folderLabel}}\" ({{folder}}).",
    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} wants to share folder \"{{folderlabel}}\" ({{folder}})."
 }
--- a/Show More
+++ b/Show More