lib/config: Update size constraints and URL (ref #3086 )

gui, man: Update docs & translations
lib/upgrade: Don't attempt processing files larger than expected max binary size (ref #3045 )
2025-12-24 06:28:10 -05:00 · 2016-05-13 14:02:47 +02:00 · 2016-05-06 16:16:28 +02:00 · 2016-05-06 16:12:45 +02:00 · 2016-05-06 15:39:13 +02:00 · 2016-05-06 15:39:02 +02:00
242 changed files with 30909 additions and 2850 deletions
--- a/19
+++ b/19
@@ -1,8 +1,10 @@
 # This is the official list of Syncthing authors for copyright purposes.

 Aaron Bieber <qbit@deftly.net>
-Adam Piggott	<aD@simplypeachy.co.uk> <simplypeachy@users.noreply.github.com>
+Adam Piggott <aD@simplypeachy.co.uk> <simplypeachy@users.noreply.github.com>
+Alessandro G. <alessandro.g89@gmail.com>
 Alexander Graf <register-github@alex-graf.de>
+Anderson Mesquita <andersonvom@gmail.com>
 Andrew Dunham <andrew@du.nham.ca>
 Antony Male <antony.male@gmail.com>
 Arthur Axel fREW Schmidt <frew@afoolishmanifesto.com> <frioux@gmail.com>
@@ -11,6 +13,7 @@ Bart De Vries <devriesb@gmail.com>
 Ben Curthoys <ben@bencurthoys.com>
 Ben Schulz <ueomkail@gmail.com> <uok@users.noreply.github.com>
 Ben Sidhom <bsidhom@gmail.com>
+Benny Ng <benny.tpng@gmail.com>
 Brandon Philips <brandon@ifup.org>
 Brendan Long <self@brendanlong.com>
 Brian R. Becker <brbecker@gmail.com>
@@ -34,9 +37,10 @@ Felix Unterpaintner <bigbear2nd@gmail.com>
 Francois-Xavier Gsell <fxgsell@gmail.com>
 Frank Isemann <frank@isemann.name>
 Gilli Sigurdsson <gilli@vx.is>
+Jaakko Hannikainen <jgke@jgke.fi>
 Jacek Szafarkiewicz <szafar@linux.pl>
-Jakob Borg <jakob@nym.se>
 Jake Peterson <jake@acogdev.com>
+Jakob Borg <jakob@nym.se>
 James Patterson <jamespatterson@operamail.com> <jpjp@users.noreply.github.com>
 Jaroslav Malec <dzardacz@gmail.com>
 Jens Diemer <github.com@jensdiemer.de> <git@jensdiemer.de>
@@ -44,6 +48,8 @@ Jochen Voss <voss@seehuhn.de>
 Johan Vromans <jvromans@squirrel.nl>
 Karol Różycki <rozycki.karol@gmail.com>
 Ken'ichi Kamada <kamada@nanohz.org>
+Kevin Allen <kma1660@gmail.com>
+Laurent Etiemble <laurent.etiemble@gmail.com> <laurent.etiemble@monobjc.net>
 Lode Hoste <zillode@zillode.be>
 Lord Landon Agahnim <lordlandon@gmail.com>
 Marc Laporte <marc@marclaporte.com> <marc@laporte.name>
@@ -51,22 +57,29 @@ Marc Pujol <kilburn@la3.org>
 Marcin Dziadus <dziadus.marcin@gmail.com>
 Mateusz Naściszewski <matin1111@wp.pl>
 Matt Burke <mburke@amplify.com> <burkemw3@gmail.com>
+Max Schulze <max.schulze@online.de> <kralo@users.noreply.github.com>
 Michael Jephcote <rewt0r@gmx.com> <Rewt0r@users.noreply.github.com>
+Michael Ploujnikov <ploujj@gmail.com>
 Michael Tilli <pyfisch@gmail.com>
+Nate Morrison <natemorrison@gmail.com>
 Pascal Jungblut <github@pascalj.com> <mail@pascal-jungblut.com>
 Peter Hoeg <peter@speartail.com>
 Philippe Schommers <philippe@schommers.be>
 Phill Luby <phill.luby@newredo.com>
 Piotr Bejda <piotrb10@gmail.com>
 Ryan Sullivan <kayoticsully@gmail.com>
+Scott Klupfel <kluppy@going2blue.com>
 Sergey Mishin <ralder@yandex.ru>
-Stefan Tatschner <stefan@sevenbyte.org> <rumpelsepp@sevenbyte.org>
 Stefan Kuntz <stefan.github@gmail.com> <Stefan.github@gmail.com>
+Stefan Tatschner <stefan@sevenbyte.org> <rumpelsepp@sevenbyte.org>
 Tim Abell <tim@timwise.co.uk>
 Tobias Nygren <tnn@nygren.pp.se>
 Tomas Cerveny <kozec@kozec.com>
 Tully Robinson <tully@tojr.org>
 Tyler Brazier <tyler@tylerbrazier.com>
 Veeti Paananen <veeti.paananen@rojekti.fi>
+Victor Buinsky <vix_booja@tut.by>
 Vil Brekin <vilbrekin@gmail.com>
+William A. Kennington III <william@wkennington.com>
+Wulf Weich <wweich@users.noreply.github.com> <wweich@gmx.de>
 Yannic A. <eipiminusone+github@gmail.com> <eipiminus1@users.noreply.github.com>
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -1,6 +1,6 @@
 {
 	"ImportPath": "github.com/syncthing/syncthing",
-	"GoVersion": "go1.5.1",
+	"GoVersion": "go1.5.2",
 	"Packages": [
 		"./cmd/..."
 	],
@@ -19,7 +19,7 @@
 		},
 		{
 			"ImportPath": "github.com/calmh/xdr",
-			"Rev": "47c0042d09a827b81ee62497f99e5e0c7f0bd31c"
+			"Rev": "9eb3e1a622d9364deb39c831f7e5f164393d7e37"
 		},
 		{
 			"ImportPath": "github.com/golang/snappy",
@@ -31,7 +31,7 @@
 		},
 		{
 			"ImportPath": "github.com/kardianos/osext",
-			"Rev": "6e7f843663477789fac7c02def0d0909e969b4e5"
+			"Rev": "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc"
 		},
 		{
 			"ImportPath": "github.com/rcrowley/go-metrics",
--- a/Godeps/_workspace/src/github.com/calmh/xdr/cmd/genxdr/main.go
+++ b/Godeps/_workspace/src/github.com/calmh/xdr/cmd/genxdr/main.go
@@ -171,6 +171,39 @@ func (o *{{.TypeName}}) DecodeXDRFrom(xr *xdr.Reader) error {
 	return xr.Error()
 }`))

+var emptyTypeTpl = template.Must(template.New("encoder").Parse(`
+func (o {{.TypeName}}) EncodeXDR(w io.Writer) (int, error) {
+	return 0, nil
+}//+n
+
+func (o {{.TypeName}}) MarshalXDR() ([]byte, error) {
+	return nil, nil
+}//+n
+
+func (o {{.TypeName}}) MustMarshalXDR() []byte {
+	return nil
+}//+n
+
+func (o {{.TypeName}}) AppendXDR(bs []byte) ([]byte, error) {
+	return bs, nil
+}//+n
+
+func (o {{.TypeName}}) EncodeXDRInto(xw *xdr.Writer) (int, error) {
+	return xw.Tot(), xw.Error()
+}//+n
+
+func (o *{{.TypeName}}) DecodeXDR(r io.Reader) error {
+	return nil
+}//+n
+
+func (o *{{.TypeName}}) UnmarshalXDR(bs []byte) error {
+	return nil
+}//+n
+
+func (o *{{.TypeName}}) DecodeXDRFrom(xr *xdr.Reader) error {
+	return xr.Error()
+}`))
+
 var maxRe = regexp.MustCompile(`(?:\Wmax:)(\d+)(?:\s*,\s*(\d+))?`)

 type typeSet struct {
@@ -300,7 +333,14 @@ func generateCode(output io.Writer, s structInfo) {
 	fs := s.Fields

 	var buf bytes.Buffer
-	err := encodeTpl.Execute(&buf, map[string]interface{}{"TypeName": name, "Fields": fs})
+	var err error
+	if len(fs) == 0 {
+		// This is an empty type. We can create a quite simple codec for it.
+		err = emptyTypeTpl.Execute(&buf, map[string]interface{}{"TypeName": name})
+	} else {
+		// Generate with the default template.
+		err = encodeTpl.Execute(&buf, map[string]interface{}{"TypeName": name, "Fields": fs})
+	}
 	if err != nil {
 		panic(err)
 	}
@@ -326,6 +366,14 @@ func generateDiagram(output io.Writer, s structInfo) {
 	fs := s.Fields

 	fmt.Fprintln(output, sn+" Structure:")
+
+	if len(fs) == 0 {
+		fmt.Fprintln(output, "(contains no fields)")
+		fmt.Fprintln(output)
+		fmt.Fprintln(output)
+		return
+	}
+
 	fmt.Fprintln(output)
 	fmt.Fprintln(output, " 0                   1                   2                   3")
 	fmt.Fprintln(output, " 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1")
--- a/Godeps/_workspace/src/github.com/kardianos/osext/osext.go
+++ b/Godeps/_workspace/src/github.com/kardianos/osext/osext.go
@@ -7,12 +7,18 @@ package osext

 import "path/filepath"

+var cx, ce = executableClean()
+
+func executableClean() (string, error) {
+	p, err := executable()
+	return filepath.Clean(p), err
+}
+
 // Executable returns an absolute path that can be used to
 // re-invoke the current program.
 // It may not be valid after the current program exits.
 func Executable() (string, error) {
-	p, err := executable()
-	return filepath.Clean(p), err
+	return cx, ce
 }

 // Returns same path as Executable, returns just the folder
--- a/Godeps/_workspace/src/github.com/kardianos/osext/osext_procfs.go
+++ b/Godeps/_workspace/src/github.com/kardianos/osext/osext_procfs.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.

-// +build linux netbsd openbsd solaris dragonfly
+// +build linux netbsd solaris dragonfly

 package osext

@@ -27,7 +27,7 @@ func executable() (string, error) {
 		return execpath, nil
 	case "netbsd":
 		return os.Readlink("/proc/curproc/exe")
-	case "openbsd", "dragonfly":
+	case "dragonfly":
 		return os.Readlink("/proc/curproc/file")
 	case "solaris":
 		return os.Readlink(fmt.Sprintf("/proc/%d/path/a.out", os.Getpid()))
--- a/Godeps/_workspace/src/github.com/kardianos/osext/osext_sysctl.go
+++ b/Godeps/_workspace/src/github.com/kardianos/osext/osext_sysctl.go
@@ -2,12 +2,13 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.

-// +build darwin freebsd
+// +build darwin freebsd openbsd

 package osext

 import (
 	"os"
+	"os/exec"
 	"path/filepath"
 	"runtime"
 	"syscall"
@@ -23,6 +24,8 @@ func executable() (string, error) {
 		mib = [4]int32{1 /* CTL_KERN */, 14 /* KERN_PROC */, 12 /* KERN_PROC_PATHNAME */, -1}
 	case "darwin":
 		mib = [4]int32{1 /* CTL_KERN */, 38 /* KERN_PROCARGS */, int32(os.Getpid()), -1}
+	case "openbsd":
+		mib = [4]int32{1 /* CTL_KERN */, 55 /* KERN_PROC_ARGS */, int32(os.Getpid()), 1 /* KERN_PROC_ARGV */}
 	}

 	n := uintptr(0)
@@ -42,14 +45,58 @@ func executable() (string, error) {
 	if n == 0 { // This shouldn't happen.
 		return "", nil
 	}
-	for i, v := range buf {
-		if v == 0 {
-			buf = buf[:i]
-			break
+
+	var execPath string
+	switch runtime.GOOS {
+	case "openbsd":
+		// buf now contains **argv, with pointers to each of the C-style
+		// NULL terminated arguments.
+		var args []string
+		argv := uintptr(unsafe.Pointer(&buf[0]))
+	Loop:
+		for {
+			argp := *(**[1 << 20]byte)(unsafe.Pointer(argv))
+			if argp == nil {
+				break
+			}
+			for i := 0; uintptr(i) < n; i++ {
+				// we don't want the full arguments list
+				if string(argp[i]) == " " {
+					break Loop
+				}
+				if argp[i] != 0 {
+					continue
+				}
+				args = append(args, string(argp[:i]))
+				n -= uintptr(i)
+				break
+			}
+			if n < unsafe.Sizeof(argv) {
+				break
+			}
+			argv += unsafe.Sizeof(argv)
+			n -= unsafe.Sizeof(argv)
 		}
+		execPath = args[0]
+		// There is no canonical way to get an executable path on
+		// OpenBSD, so check PATH in case we are called directly
+		if execPath[0] != '/' && execPath[0] != '.' {
+			execIsInPath, err := exec.LookPath(execPath)
+			if err == nil {
+				execPath = execIsInPath
+			}
+		}
+	default:
+		for i, v := range buf {
+			if v == 0 {
+				buf = buf[:i]
+				break
+			}
+		}
+		execPath = string(buf)
 	}
+
 	var err error
-	execPath := string(buf)
 	// execPath will not be empty due to above checks.
 	// Try to get the absolute path if the execPath is not rooted.
 	if execPath[0] != '/' {
--- a/35
+++ b/35
@@ -1,28 +1,23 @@
 # This file maps email addresses used in commits to nicks used the changelog.

-AudriusButkevicius	<audrius.butkevicius@gmail.com>
-Cathryne	<cathryne.linenweaver@gmail.com> <Cathryne@users.noreply.github.com>
-KayoticSully	<kayoticsully@gmail.com>
-LordLandon	<lordlandon@gmail.com>
-Moter8		<moter8@gmail.com>
-Nutomic		<me@nutomic.com>
-Rewt0r		<rewt0r@gmx.com> <Rewt0r@users.noreply.github.com>
-Stefan-Code	<stefan.github@gmail.com> <Stefan.github@gmail.com>
-Vilbrekin	<vilbrekin@gmail.com>
-Zillode		<zillode@zillode.be>
 acogdev		<jake@acogdev.com>
 alex2108	<register-github@alex-graf.de>
+alessandro.g89	<alessandro.g89@gmail.com>
+andersonvom	<andersonvom@gmail.com>
 andrew-d	<andrew@du.nham.ca>
 asdil12		<dominik@heidler.eu>
+AudriusButkevicius	<audrius.butkevicius@gmail.com>
 bencurthoys	<ben@bencurthoys.com>
 bigbear2nd	<bigbear2nd@gmail.com>
 brbecker	<brbecker@gmail.com>
 brendanlong	<self@brendanlong.com>
 brgmnn      <dan.arne.bergmann@gmail.com> <brgmnn@users.noreply.github.com>
 bsidhom		<bsidhom@gmail.com>
+buinsky	<vix_booja@tut.by>
 burkemw3	<mburke@amplify.com> <burkemw3@gmail.com>
 calmh		<jakob@nym.se>
 canton7	<antony.male@gmail.com>
+Cathryne	<cathryne.linenweaver@gmail.com> <Cathryne@users.noreply.github.com>
 cdata		<chris@scriptolo.gy>
 cdhowie	<me@chrishowie.com>
 ceh		<emil@hessman.se>
@@ -36,37 +31,55 @@ frioux		<frew@afoolishmanifesto.com> <frioux@gmail.com>
 fti7	<frank@isemann.name>
 gillisig	<gilli@vx.is>
 hadogenes	<szafar@linux.pl>
+ironmig	<kma1660@gmail.com>
 jarlebring	<jarlebring@gmail.com>
 jedie		<github.com@jensdiemer.de> <git@jensdiemer.de>
+jgke	<jgke@jgke.fi>
 jpjp		<jamespatterson@operamail.com> <jpjp@users.noreply.github.com>
 kamadak		<kamada@nanohz.org>
+KayoticSully	<kayoticsully@gmail.com>
 kilburn		<kilburn@la3.org>
+kluppy	<kluppy@going2blue.com>
 kozec		<kozec@kozec.com>
+kralo	<max.schulze@online.de>
 krozycki	<rozycki.karol@gmail.com>
+letiemble	<laurent.etiemble@gmail.com> <laurent.etiemble@monobjc.net>
+LordLandon	<lordlandon@gmail.com>
 marcindziadus	<dziadus.marcin@gmail.com>
 marclaporte <marc@marclaporte.com>
 mateon1	<matin1111@wp.pl>
 mogwa1	<devriesb@gmail.com>
 moshen		<moshen.colin@gmail.com>
+Moter8		<moter8@gmail.com>
 mvdan		<mvdan@mvdan.cc>
+nrm21	<natemorrison@gmail.com>
+Nutomic		<me@nutomic.com>
 pascalj		<github@pascalj.com> <mail@pascal-jungblut.com>
 peterhoeg	<peter@speartail.com>
 philips		<brandon@ifup.org>
 piobpl		<piotrb10@gmail.com>
+plouj	<ploujj@gmail.com>
 pluby		<phill.luby@newredo.com>
 pyfisch		<pyfisch@gmail.com>
 qbit		<qbit@deftly.net>
 ralder		<ralder@yandex.ru>
+Rewt0r		<rewt0r@gmx.com> <Rewt0r@users.noreply.github.com>
 rumpelsepp	<stefan@sevenbyte.org> <rumpelsepp@sevenbyte.org>
 sciurius	<jvromans@squirrel.nl>
 seehuhn		<voss@seehuhn.de>
-snnd		<dw@risu.io>
 simplypeachy	<aD@simplypeachy.co.uk> <simplypeachy@users.noreply.github.com>
+snnd		<dw@risu.io>
+Stefan-Code	<stefan.github@gmail.com> <Stefan.github@gmail.com>
 timabell	<tim@timwise.co.uk>
 tnn2		<tnn@nygren.pp.se>
 tojrobinson	<tully@tojr.org>
+tpng		<benny.tpng@gmail.com>
 tylerbrazier	<tyler@tylerbrazier.com>
 uok		<ueomkail@gmail.com> <uok@users.noreply.github.com>
 veeti		<veeti.paananen@rojekti.fi>
+Vilbrekin	<vilbrekin@gmail.com>
+wkennington	<william@wkennington.com>
 wsgcsysadmin	<e.meitner@willystreet.coo>
+wweich	<wweich@users.noreply.github.com> <wweich@gmx.de>
+Zillode		<zillode@zillode.be>
 zukoo		<fxgsell@gmail.com>
--- a/README.md
+++ b/README.md
@@ -27,8 +27,12 @@ Take a look at the [getting started guide][2].
 There are a few examples for keeping Syncthing running in the background
 on your system in [the etc directory][3].

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

 ## Building

@@ -51,7 +55,10 @@ 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
 [3]: https://github.com/syncthing/syncthing/blob/master/etc
-[4]: https://webchat.freenode.net/
+[4]: http://www.freenode.net/irc_servers.shtml
 [5]: http://docs.syncthing.net/dev/building.html
 [6]: http://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
--- a/build.go
+++ b/build.go
@@ -26,6 +26,7 @@ import (
 	"runtime"
 	"strconv"
 	"strings"
+	"text/template"
 	"time"
 )

@@ -64,7 +65,7 @@ func main() {
 	flag.Parse()

 	switch goarch {
-	case "386", "amd64", "arm":
+	case "386", "amd64", "arm", "arm64", "ppc64", "ppc64le":
 		break
 	default:
 		log.Printf("Unknown goarch %q; proceed with caution!", goarch)
@@ -182,11 +183,23 @@ func setup() {
 	runPrint("go", "get", "-v", "github.com/tools/godep")
 	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")
 }

 func test(pkg string) {
 	setBuildEnv()
-	runPrint("go", "test", "-short", "-race", "-timeout", "60s", pkg)
+	useRace := runtime.GOARCH == "amd64"
+	switch runtime.GOOS {
+	case "darwin", "linux", "freebsd", "windows":
+	default:
+		useRace = false
+	}
+
+	if useRace {
+		runPrint("go", "test", "-short", "-race", "-timeout", "60s", pkg)
+	} else {
+		runPrint("go", "test", "-short", "-timeout", "60s", pkg)
+	}
 }

 func bench(pkg string) {
@@ -219,7 +232,7 @@ func build(pkg string, tags []string) {
 	}

 	rmr(binary)
-	args := []string{"build", "-ldflags", ldflags()}
+	args := []string{"build", "-i", "-v", "-ldflags", ldflags()}
 	if len(tags) > 0 {
 		args = append(args, "-tags", strings.Join(tags, ","))
 	}
@@ -254,6 +267,9 @@ func buildTar() {
 		files = append(files, archiveFile{src: file, dst: name + "/" + filepath.Base(file)})
 	}

+	if goos == "darwin" {
+		macosCodesign("syncthing")
+	}
 	tarGz(filename, files)
 	log.Println(filename)
 }
@@ -327,33 +343,32 @@ func buildDeb() {
 		}
 	}

-	control := `Package: syncthing
-Architecture: {{arch}}
-Depends: libc6
-Version: {{version}}
-Maintainer: Syncthing Release Management <release@syncthing.net>
-Description: Open Source Continuous File Synchronization
-	Syncthing does bidirectional synchronization of files between two or
-	more computers.
-`
-	changelog := `syncthing ({{version}}); urgency=medium
-
-  * Packaging of {{version}}.
-
- -- Jakob Borg <jakob@nym.se>  {{date}}
-`
-
-	control = strings.Replace(control, "{{arch}}", debarch, -1)
-	control = strings.Replace(control, "{{version}}", version[1:], -1)
-	changelog = strings.Replace(changelog, "{{arch}}", debarch, -1)
-	changelog = strings.Replace(changelog, "{{version}}", version[1:], -1)
-	changelog = strings.Replace(changelog, "{{date}}", time.Now().Format(time.RFC1123), -1)
-
 	os.MkdirAll("deb/DEBIAN", 0755)
-	ioutil.WriteFile("deb/DEBIAN/control", []byte(control), 0644)
-	ioutil.WriteFile("deb/DEBIAN/compat", []byte("9\n"), 0644)
-	ioutil.WriteFile("deb/DEBIAN/changelog", []byte(changelog), 0644)

+	data := map[string]string{
+		"arch":    debarch,
+		"version": version[1:],
+		"date":    time.Now().Format(time.RFC1123),
+	}
+	for _, file := range listFiles("debian") {
+		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())
+	}
 }

 func copyFile(src, dst string, perm os.FileMode) error {
@@ -405,24 +420,24 @@ func assets() {
 }

 func xdr() {
-	runPrint("go", "generate", "./lib/discover", "./lib/db", "./lib/protocol")
+	runPrint("go", "generate", "./lib/discover", "./lib/db", "./lib/protocol", "./lib/relay/protocol")
 }

 func translate() {
-	os.Chdir("gui/assets/lang")
-	runPipe("lang-en-new.json", "go", "run", "../../../script/translate.go", "lang-en.json", "../../")
+	os.Chdir("gui/default/assets/lang")
+	runPipe("lang-en-new.json", "go", "run", "../../../../script/translate.go", "lang-en.json", "../../../")
 	os.Remove("lang-en.json")
 	err := os.Rename("lang-en-new.json", "lang-en.json")
 	if err != nil {
 		log.Fatal(err)
 	}
-	os.Chdir("../../..")
+	os.Chdir("../../../..")
 }

 func transifex() {
-	os.Chdir("gui/assets/lang")
-	runPrint("go", "run", "../../../script/transifexdl.go")
-	os.Chdir("../../..")
+	os.Chdir("gui/default/assets/lang")
+	runPrint("go", "run", "../../../../script/transifexdl.go")
+	os.Chdir("../../../..")
 	assets()
 }

@@ -448,7 +463,6 @@ func ldflags() string {
 	fmt.Fprintf(b, " -X main.BuildStamp%c%d", sep, buildStamp())
 	fmt.Fprintf(b, " -X main.BuildUser%c%s", sep, buildUser())
 	fmt.Fprintf(b, " -X main.BuildHost%c%s", sep, buildHost())
-	fmt.Fprintf(b, " -X main.BuildEnv%c%s", sep, buildEnvironment())
 	return b.String()
 }

@@ -743,3 +757,22 @@ func lint(pkg string) {
 		}
 	}
 }
+
+func macosCodesign(file string) {
+	if pass := os.Getenv("CODESIGN_KEYCHAIN_PASS"); pass != "" {
+		bs, err := runError("security", "unlock-keychain", "-p", pass)
+		if err != nil {
+			log.Println("Codesign: unlocking keychain failed:", string(bs))
+			return
+		}
+	}
+
+	if id := os.Getenv("CODESIGN_IDENTITY"); id != "" {
+		bs, err := runError("codesign", "-s", id, file)
+		if err != nil {
+			log.Println("Codesign: signing failed:", string(bs))
+			return
+		}
+		log.Println("Codesign: successfully signed", file)
+	}
+}
--- a/build.sh
+++ b/build.sh
@@ -63,8 +63,9 @@ case "${1:-default}" in
 		;;

 	prerelease)
+		go run script/authors.go
 		build transifex
-		git add -A gui/assets/ lib/auto/
+		git add -A gui/default/assets/ lib/auto/
 		pushd man ; ./refresh.sh ; popd
 		git add -A man
 		;;
@@ -74,27 +75,26 @@ case "${1:-default}" in
 		;;

 	all)
-		build -goos darwin -goarch amd64 tar
+		platforms=(
+			darwin-amd64 dragonfly-amd64 freebsd-amd64 linux-amd64 netbsd-amd64 openbsd-amd64 solaris-amd64 windows-amd64
+			freebsd-386 linux-386 netbsd-386 openbsd-386 windows-386
+			linux-arm linux-arm64 linux-ppc64 linux-ppc64le
+		)

-		build -goos dragonfly -goarch amd64 tar
+		for plat in "${platforms[@]}"; do
+			echo Building "$plat"

-		build -goos freebsd -goarch 386 tar
-		build -goos freebsd -goarch amd64 tar
+			goos="${plat%-*}"
+			goarch="${plat#*-}"
+			dist="tar"

-		build -goos linux -goarch 386 tar
-		build -goos linux -goarch amd64 tar
-		build -goos linux -goarch arm tar
+			if [[ $goos == "windows" ]]; then
+				dist="zip"
+			fi

-		build -goos netbsd -goarch 386 tar
-		build -goos netbsd -goarch amd64 tar
-
-		build -goos openbsd -goarch 386 tar
-		build -goos openbsd -goarch amd64 tar
-
-		build -goos solaris -goarch amd64 tar
-
-		build -goos windows -goarch 386 zip
-		build -goos windows -goarch amd64 zip
+			build -goos "$goos" -goarch "$goarch" "$dist"
+			echo
+		done
 		;;

 	test-cov)
@@ -126,6 +126,15 @@ case "${1:-default}" in
 		fi
 		;;

+	test-xunit)
+		ulimit -t 600 &>/dev/null || true
+		ulimit -d 512000 &>/dev/null || true
+		ulimit -m 512000 &>/dev/null || true
+
+		(GOPATH="$(pwd)/Godeps/_workspace:$GOPATH" go test -v -race ./lib/... ./cmd/... || true) > tests.out
+		go2xunit -output tests.xml -fail < tests.out
+		;;
+
 	docker-all)
 		img=${DOCKERIMG:-syncthing/build:latest}
 		docker run --rm -h syncthing-builder -u $(id -u) -t \
--- a/cmd/syncthing/addresslister.go
+++ b/cmd/syncthing/addresslister.go
@@ -15,14 +15,14 @@ import (
 )

 type addressLister struct {
-	upnpSvc *upnpSvc
-	cfg     *config.Wrapper
+	upnpService *upnpService
+	cfg         *config.Wrapper
 }

-func newAddressLister(upnpSvc *upnpSvc, cfg *config.Wrapper) *addressLister {
+func newAddressLister(upnpService *upnpService, cfg *config.Wrapper) *addressLister {
 	return &addressLister{
-		upnpSvc: upnpSvc,
-		cfg:     cfg,
+		upnpService: upnpService,
+		cfg:         cfg,
 	}
 }

@@ -73,10 +73,10 @@ func (e *addressLister) addresses(includePrivateIPV4 bool) []string {
 		}
 	}

-	// Get an external port mapping from the upnpSvc, if it has one. If so,
+	// Get an external port mapping from the upnpService, if it has one. If so,
 	// add it as another unspecified address.
-	if e.upnpSvc != nil {
-		if port := e.upnpSvc.ExternalPort(); port != 0 {
+	if e.upnpService != nil {
+		if port := e.upnpService.ExternalPort(); port != 0 {
 			addrs = append(addrs, fmt.Sprintf("tcp://:%d", port))
 		}
 	}
--- a/cmd/syncthing/auditservice.go
+++ b/cmd/syncthing/auditservice.go
@@ -13,17 +13,17 @@ import (
 	"github.com/syncthing/syncthing/lib/events"
 )

-// The auditSvc subscribes to events and writes these in JSON format, one
+// The auditService subscribes to events and writes these in JSON format, one
 // event per line, to the specified writer.
-type auditSvc struct {
+type auditService struct {
 	w       io.Writer     // audit destination
 	stop    chan struct{} // signals time to stop
 	started chan struct{} // signals startup complete
 	stopped chan struct{} // signals stop complete
 }

-func newAuditSvc(w io.Writer) *auditSvc {
-	return &auditSvc{
+func newAuditService(w io.Writer) *auditService {
+	return &auditService{
 		w:       w,
 		stop:    make(chan struct{}),
 		started: make(chan struct{}),
@@ -32,7 +32,7 @@ func newAuditSvc(w io.Writer) *auditSvc {
 }

 // Serve runs the audit service.
-func (s *auditSvc) Serve() {
+func (s *auditService) Serve() {
 	defer close(s.stopped)
 	sub := events.Default.Subscribe(events.AllEvents)
 	defer events.Default.Unsubscribe(sub)
@@ -52,18 +52,18 @@ func (s *auditSvc) Serve() {
 }

 // Stop stops the audit service.
-func (s *auditSvc) Stop() {
+func (s *auditService) Stop() {
 	close(s.stop)
 }

 // WaitForStart returns once the audit service is ready to receive events, or
 // immediately if it's already running.
-func (s *auditSvc) WaitForStart() {
+func (s *auditService) WaitForStart() {
 	<-s.started
 }

 // WaitForStop returns once the audit service has stopped.
 // (Needed by the tests.)
-func (s *auditSvc) WaitForStop() {
+func (s *auditService) WaitForStop() {
 	<-s.stopped
 }
--- a/cmd/syncthing/auditservice_test.go
+++ b/cmd/syncthing/auditservice_test.go
@@ -17,13 +17,13 @@ import (

 func TestAuditService(t *testing.T) {
 	buf := new(bytes.Buffer)
-	svc := newAuditSvc(buf)
+	service := newAuditService(buf)

 	// Event sent before start, will not be logged
 	events.Default.Log(events.Ping, "the first event")

-	go svc.Serve()
-	svc.WaitForStart()
+	go service.Serve()
+	service.WaitForStart()

 	// Event that should end up in the audit log
 	events.Default.Log(events.Ping, "the second event")
@@ -31,8 +31,8 @@ func TestAuditService(t *testing.T) {
 	// We need to give the events time to arrive, since the channels are buffered etc.
 	time.Sleep(10 * time.Millisecond)

-	svc.Stop()
-	svc.WaitForStop()
+	service.Stop()
+	service.WaitForStop()

 	// This event should not be logged, since we have stopped.
 	events.Default.Log(events.Ping, "the third event")
--- a/cmd/syncthing/gui.go
+++ b/cmd/syncthing/gui.go
@@ -48,43 +48,60 @@ var (
 	startTime    = time.Now()
 )

-type apiSvc struct {
+type apiService struct {
 	id              protocol.DeviceID
 	cfg             *config.Wrapper
 	assetDir        string
+	themes          []string
 	model           *model.Model
 	eventSub        *events.BufferedSubscription
 	discoverer      *discover.CachingMux
-	relaySvc        *relay.Svc
-	listener        net.Listener
-	fss             *folderSummarySvc
-	stop            chan struct{}
-	systemConfigMut sync.Mutex
+	relayService    *relay.Service
+	fss             *folderSummaryService
+	systemConfigMut sync.Mutex    // serializes posts to /rest/system/config
+	stop            chan struct{} // signals intentional stop
+	configChanged   chan struct{} // signals intentional listener close due to config change
+	started         chan struct{} // signals startup complete, for testing only
+
+	listener    net.Listener
+	listenerMut sync.Mutex

 	guiErrors *logger.Recorder
 	systemLog *logger.Recorder
 }

-func newAPISvc(id protocol.DeviceID, cfg *config.Wrapper, assetDir string, m *model.Model, eventSub *events.BufferedSubscription, discoverer *discover.CachingMux, relaySvc *relay.Svc, errors, systemLog *logger.Recorder) (*apiSvc, error) {
-	svc := &apiSvc{
+func newAPIService(id protocol.DeviceID, cfg *config.Wrapper, assetDir string, m *model.Model, eventSub *events.BufferedSubscription, discoverer *discover.CachingMux, relayService *relay.Service, errors, systemLog *logger.Recorder) (*apiService, error) {
+	service := &apiService{
 		id:              id,
 		cfg:             cfg,
 		assetDir:        assetDir,
 		model:           m,
 		eventSub:        eventSub,
 		discoverer:      discoverer,
-		relaySvc:        relaySvc,
+		relayService:    relayService,
 		systemConfigMut: sync.NewMutex(),
+		stop:            make(chan struct{}),
+		configChanged:   make(chan struct{}),
+		listenerMut:     sync.NewMutex(),
 		guiErrors:       errors,
 		systemLog:       systemLog,
 	}

+	seen := make(map[string]struct{})
+	for file := range auto.Assets() {
+		theme := strings.Split(file, "/")[0]
+		if _, ok := seen[theme]; !ok {
+			seen[theme] = struct{}{}
+			service.themes = append(service.themes, theme)
+		}
+	}
+
 	var err error
-	svc.listener, err = svc.getListener(cfg.GUI())
-	return svc, err
+	service.listener, err = service.getListener(cfg.GUI())
+	return service, err
 }

-func (s *apiSvc) getListener(guiCfg config.GUIConfiguration) (net.Listener, error) {
+func (s *apiService) getListener(guiCfg config.GUIConfiguration) (net.Listener, error) {
 	cert, err := tls.LoadX509KeyPair(locations[locHTTPSCertFile], locations[locHTTPSKeyFile])
 	if err != nil {
 		l.Infoln("Loading HTTPS certificate:", err)
@@ -98,7 +115,7 @@ func (s *apiSvc) getListener(guiCfg config.GUIConfiguration) (net.Listener, erro
 			name = tlsDefaultCommonName
 		}

-		cert, err = tlsutil.NewCertificate(locations[locHTTPSCertFile], locations[locHTTPSKeyFile], name, tlsRSABits)
+		cert, err = tlsutil.NewCertificate(locations[locHTTPSCertFile], locations[locHTTPSKeyFile], name, httpsRSABits)
 	}
 	if err != nil {
 		return nil, err
@@ -130,8 +147,30 @@ func (s *apiSvc) getListener(guiCfg config.GUIConfiguration) (net.Listener, erro
 	return listener, nil
 }

-func (s *apiSvc) Serve() {
-	s.stop = make(chan struct{})
+func sendJSON(w http.ResponseWriter, jsonObject interface{}) {
+	w.Header().Set("Content-Type", "application/json; charset=utf-8")
+	// Marshalling might fail, in which case we should return a 500 with the
+	// actual error.
+	bs, err := json.Marshal(jsonObject)
+	if err != nil {
+		// This Marshal() can't fail though.
+		bs, _ = json.Marshal(map[string]string{"error": err.Error()})
+		http.Error(w, string(bs), http.StatusInternalServerError)
+		return
+	}
+	w.Write(bs)
+}
+
+func (s *apiService) Serve() {
+	s.listenerMut.Lock()
+	listener := s.listener
+	s.listenerMut.Unlock()
+
+	if listener == nil {
+		// Not much we can do here other than exit quickly. The supervisor
+		// will log an error at some point.
+		return
+	}

 	// The GET handlers
 	getRestMux := http.NewServeMux()
@@ -193,16 +232,25 @@ func (s *apiSvc) Serve() {
 	mux.HandleFunc("/qr/", s.getQR)

 	// Serve compiled in assets unless an asset directory was set (for development)
-	mux.Handle("/", embeddedStatic{
-		assetDir: s.assetDir,
-		assets:   auto.Assets(),
-	})
+	assets := &embeddedStatic{
+		theme:        s.cfg.GUI().Theme,
+		lastModified: time.Now(),
+		mut:          sync.NewRWMutex(),
+		assetDir:     s.assetDir,
+		assets:       auto.Assets(),
+	}
+	mux.Handle("/", assets)
+
+	s.cfg.Subscribe(assets)

 	guiCfg := s.cfg.GUI()

+	// Add the CORS handling
+	handler := corsMiddleware(mux)
+
 	// Wrap everything in CSRF protection. The /rest prefix should be
 	// protected, other requests will grant cookies.
-	handler := csrfMiddleware(s.id.String()[:5], "/rest", guiCfg.APIKey(), mux)
+	handler = csrfMiddleware(s.id.String()[:5], "/rest", guiCfg, handler)

 	// Add our version and ID as a header to responses
 	handler = withDetailsMiddleware(s.id, handler)
@@ -224,38 +272,52 @@ func (s *apiSvc) Serve() {
 		ReadTimeout: 10 * time.Second,
 	}

-	s.fss = newFolderSummarySvc(s.cfg, s.model)
+	s.fss = newFolderSummaryService(s.cfg, s.model)
 	defer s.fss.Stop()
 	s.fss.ServeBackground()

-	l.Infoln("API listening on", s.listener.Addr())
-	l.Infoln("GUI URL is", guiCfg.URL())
-	err := srv.Serve(s.listener)
+	l.Infoln("GUI and API listening on", listener.Addr())
+	l.Infoln("Access the GUI via the following URL:", guiCfg.URL())
+	if s.started != nil {
+		// only set when run by the tests
+		close(s.started)
+	}
+	err := srv.Serve(listener)

 	// The return could be due to an intentional close. Wait for the stop
 	// signal before returning. IF there is no stop signal within a second, we
 	// assume it was unintentional and log the error before retrying.
 	select {
 	case <-s.stop:
+	case <-s.configChanged:
 	case <-time.After(time.Second):
 		l.Warnln("API:", err)
 	}
 }

-func (s *apiSvc) Stop() {
+func (s *apiService) Stop() {
+	s.listenerMut.Lock()
+	listener := s.listener
+	s.listenerMut.Unlock()
+
 	close(s.stop)
-	s.listener.Close()
+
+	// listener may be nil here if we've had a config change to a broken
+	// configuration, in which case we shouldn't try to close it.
+	if listener != nil {
+		listener.Close()
+	}
 }

-func (s *apiSvc) String() string {
-	return fmt.Sprintf("apiSvc@%p", s)
+func (s *apiService) String() string {
+	return fmt.Sprintf("apiService@%p", s)
 }

-func (s *apiSvc) VerifyConfiguration(from, to config.Configuration) error {
+func (s *apiService) VerifyConfiguration(from, to config.Configuration) error {
 	return nil
 }

-func (s *apiSvc) CommitConfiguration(from, to config.Configuration) bool {
+func (s *apiService) CommitConfiguration(from, to config.Configuration) bool {
 	if to.GUI == from.GUI {
 		return true
 	}
@@ -264,7 +326,10 @@ func (s *apiSvc) CommitConfiguration(from, to config.Configuration) bool {
 	// must create a new listener before Serve() starts again. We can't create
 	// a new listener on the same port before the previous listener is closed.
 	// To assist in this little dance the Serve() method will wait for a
-	// signal on the stop channel after the listener has closed.
+	// signal on the configChanged channel after the listener has closed.
+
+	s.listenerMut.Lock()
+	defer s.listenerMut.Unlock()

 	s.listener.Close()

@@ -278,7 +343,7 @@ func (s *apiSvc) CommitConfiguration(from, to config.Configuration) bool {
 		return false
 	}

-	close(s.stop)
+	s.configChanged <- struct{}{}

 	return true
 }
@@ -317,11 +382,46 @@ func debugMiddleware(h http.Handler) http.Handler {
 					written = rf.Int()
 				}
 			}
-			l.Debugf("http: %s %q: status %d, %d bytes in %.02f ms", r.Method, r.URL.String(), status, written, ms)
+			httpl.Debugf("http: %s %q: status %d, %d bytes in %.02f ms", r.Method, r.URL.String(), status, written, ms)
 		}
 	})
 }

+func corsMiddleware(next http.Handler) http.Handler {
+	// Handle CORS headers and CORS OPTIONS request.
+	// CORS OPTIONS request are typically sent by browser during AJAX preflight
+	// when the browser initiate a POST request.
+	//
+	// As the OPTIONS request is unauthorized, this handler must be the first
+	// of the chain.
+	//
+	// See https://www.w3.org/TR/cors/ for details.
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		// Add a generous access-control-allow-origin header since we may be
+		// redirecting REST requests over protocols
+		w.Header().Add("Access-Control-Allow-Origin", "*")
+
+		// Process OPTIONS requests
+		if r.Method == "OPTIONS" {
+			// 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")
+			// The request is meant to be cached 10 minutes
+			w.Header().Set("Access-Control-Max-Age", "600")
+
+			// Indicate that no content will be returned
+			w.WriteHeader(204)
+
+			return
+		}
+
+		// For everything else, pass to the next handler
+		next.ServeHTTP(w, r)
+		return
+	})
+}
+
 func metricsMiddleware(h http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		t := metrics.GetOrRegisterTimer(r.URL.Path, nil)
@@ -333,15 +433,11 @@ func metricsMiddleware(h http.Handler) http.Handler {

 func redirectToHTTPSMiddleware(h http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		// Add a generous access-control-allow-origin header since we may be
-		// redirecting REST requests over protocols
-		w.Header().Add("Access-Control-Allow-Origin", "*")
-
 		if r.TLS == nil {
 			// Redirect HTTP requests to HTTPS
 			r.URL.Host = r.Host
 			r.URL.Scheme = "https"
-			http.Redirect(w, r, r.URL.String(), http.StatusFound)
+			http.Redirect(w, r, r.URL.String(), http.StatusTemporaryRedirect)
 		} else {
 			h.ServeHTTP(w, r)
 		}
@@ -365,16 +461,12 @@ func withDetailsMiddleware(id protocol.DeviceID, h http.Handler) http.Handler {
 	})
 }

-func (s *apiSvc) restPing(w http.ResponseWriter, r *http.Request) {
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	json.NewEncoder(w).Encode(map[string]string{
-		"ping": "pong",
-	})
+func (s *apiService) restPing(w http.ResponseWriter, r *http.Request) {
+	sendJSON(w, map[string]string{"ping": "pong"})
 }

-func (s *apiSvc) getSystemVersion(w http.ResponseWriter, r *http.Request) {
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	json.NewEncoder(w).Encode(map[string]string{
+func (s *apiService) getSystemVersion(w http.ResponseWriter, r *http.Request) {
+	sendJSON(w, map[string]string{
 		"version":     Version,
 		"codename":    Codename,
 		"longVersion": LongVersion,
@@ -383,29 +475,28 @@ func (s *apiSvc) getSystemVersion(w http.ResponseWriter, r *http.Request) {
 	})
 }

-func (s *apiSvc) getSystemDebug(w http.ResponseWriter, r *http.Request) {
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
+func (s *apiService) getSystemDebug(w http.ResponseWriter, r *http.Request) {
 	names := l.Facilities()
 	enabled := l.FacilityDebugging()
 	sort.Strings(enabled)
-	json.NewEncoder(w).Encode(map[string]interface{}{
+	sendJSON(w, map[string]interface{}{
 		"facilities": names,
 		"enabled":    enabled,
 	})
 }

-func (s *apiSvc) postSystemDebug(w http.ResponseWriter, r *http.Request) {
+func (s *apiService) postSystemDebug(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	q := r.URL.Query()
 	for _, f := range strings.Split(q.Get("enable"), ",") {
-		if f == "" {
+		if f == "" || l.ShouldDebug(f) {
 			continue
 		}
 		l.SetDebug(f, true)
 		l.Infof("Enabled debug data for %q", f)
 	}
 	for _, f := range strings.Split(q.Get("disable"), ",") {
-		if f == "" {
+		if f == "" || !l.ShouldDebug(f) {
 			continue
 		}
 		l.SetDebug(f, false)
@@ -413,7 +504,7 @@ func (s *apiSvc) postSystemDebug(w http.ResponseWriter, r *http.Request) {
 	}
 }

-func (s *apiSvc) getDBBrowse(w http.ResponseWriter, r *http.Request) {
+func (s *apiService) getDBBrowse(w http.ResponseWriter, r *http.Request) {
 	qs := r.URL.Query()
 	folder := qs.Get("folder")
 	prefix := qs.Get("prefix")
@@ -424,14 +515,10 @@ func (s *apiSvc) getDBBrowse(w http.ResponseWriter, r *http.Request) {
 		levels = -1
 	}

-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-
-	tree := s.model.GlobalDirectoryTree(folder, prefix, levels, dirsonly)
-
-	json.NewEncoder(w).Encode(tree)
+	sendJSON(w, s.model.GlobalDirectoryTree(folder, prefix, levels, dirsonly))
 }

-func (s *apiSvc) getDBCompletion(w http.ResponseWriter, r *http.Request) {
+func (s *apiService) getDBCompletion(w http.ResponseWriter, r *http.Request) {
 	var qs = r.URL.Query()
 	var folder = qs.Get("folder")
 	var deviceStr = qs.Get("device")
@@ -442,20 +529,15 @@ func (s *apiSvc) getDBCompletion(w http.ResponseWriter, r *http.Request) {
 		return
 	}

-	res := map[string]float64{
+	sendJSON(w, map[string]float64{
 		"completion": s.model.Completion(device, folder),
-	}
-
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	json.NewEncoder(w).Encode(res)
+	})
 }

-func (s *apiSvc) getDBStatus(w http.ResponseWriter, r *http.Request) {
+func (s *apiService) getDBStatus(w http.ResponseWriter, r *http.Request) {
 	qs := r.URL.Query()
 	folder := qs.Get("folder")
-	res := folderSummary(s.cfg, s.model, folder)
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	json.NewEncoder(w).Encode(res)
+	sendJSON(w, folderSummary(s.cfg, s.model, folder))
 }

 func folderSummary(cfg *config.Wrapper, m *model.Model, folder string) map[string]interface{} {
@@ -497,13 +579,13 @@ func folderSummary(cfg *config.Wrapper, m *model.Model, folder string) map[strin
 	return res
 }

-func (s *apiSvc) postDBOverride(w http.ResponseWriter, r *http.Request) {
+func (s *apiService) postDBOverride(w http.ResponseWriter, r *http.Request) {
 	var qs = r.URL.Query()
 	var folder = qs.Get("folder")
 	go s.model.Override(folder)
 }

-func (s *apiSvc) getDBNeed(w http.ResponseWriter, r *http.Request) {
+func (s *apiService) getDBNeed(w http.ResponseWriter, r *http.Request) {
 	qs := r.URL.Query()

 	folder := qs.Get("folder")
@@ -520,65 +602,61 @@ func (s *apiSvc) getDBNeed(w http.ResponseWriter, r *http.Request) {
 	progress, queued, rest, total := s.model.NeedFolderFiles(folder, page, perpage)

 	// Convert the struct to a more loose structure, and inject the size.
-	output := map[string]interface{}{
+	sendJSON(w, map[string]interface{}{
 		"progress": s.toNeedSlice(progress),
 		"queued":   s.toNeedSlice(queued),
 		"rest":     s.toNeedSlice(rest),
 		"total":    total,
 		"page":     page,
 		"perpage":  perpage,
-	}
-
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	json.NewEncoder(w).Encode(output)
+	})
 }

-func (s *apiSvc) getSystemConnections(w http.ResponseWriter, r *http.Request) {
-	var res = s.model.ConnectionStats()
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	json.NewEncoder(w).Encode(res)
+func (s *apiService) getSystemConnections(w http.ResponseWriter, r *http.Request) {
+	sendJSON(w, s.model.ConnectionStats())
 }

-func (s *apiSvc) getDeviceStats(w http.ResponseWriter, r *http.Request) {
-	var res = s.model.DeviceStatistics()
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	json.NewEncoder(w).Encode(res)
+func (s *apiService) getDeviceStats(w http.ResponseWriter, r *http.Request) {
+	sendJSON(w, s.model.DeviceStatistics())
 }

-func (s *apiSvc) getFolderStats(w http.ResponseWriter, r *http.Request) {
-	var res = s.model.FolderStatistics()
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	json.NewEncoder(w).Encode(res)
+func (s *apiService) getFolderStats(w http.ResponseWriter, r *http.Request) {
+	sendJSON(w, s.model.FolderStatistics())
 }

-func (s *apiSvc) getDBFile(w http.ResponseWriter, r *http.Request) {
+func (s *apiService) getDBFile(w http.ResponseWriter, r *http.Request) {
 	qs := r.URL.Query()
 	folder := qs.Get("folder")
 	file := qs.Get("file")
-	gf, _ := s.model.CurrentGlobalFile(folder, file)
-	lf, _ := s.model.CurrentFolderFile(folder, file)
+	gf, gfOk := s.model.CurrentGlobalFile(folder, file)
+	lf, lfOk := s.model.CurrentFolderFile(folder, file)
+
+	if !(gfOk || lfOk) {
+		// This file for sure does not exist.
+		http.Error(w, "No such object in the index", http.StatusNotFound)
+		return
+	}

 	av := s.model.Availability(folder, file)
-	json.NewEncoder(w).Encode(map[string]interface{}{
+	sendJSON(w, map[string]interface{}{
 		"global":       jsonFileInfo(gf),
 		"local":        jsonFileInfo(lf),
 		"availability": av,
 	})
 }

-func (s *apiSvc) getSystemConfig(w http.ResponseWriter, r *http.Request) {
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	json.NewEncoder(w).Encode(s.cfg.Raw())
+func (s *apiService) getSystemConfig(w http.ResponseWriter, r *http.Request) {
+	sendJSON(w, s.cfg.Raw())
 }

-func (s *apiSvc) postSystemConfig(w http.ResponseWriter, r *http.Request) {
+func (s *apiService) postSystemConfig(w http.ResponseWriter, r *http.Request) {
 	s.systemConfigMut.Lock()
 	defer s.systemConfigMut.Unlock()

 	to, err := config.ReadJSON(r.Body, myID)
 	if err != nil {
 		l.Warnln("decoding posted config:", err)
-		http.Error(w, err.Error(), 500)
+		http.Error(w, err.Error(), http.StatusBadRequest)
 		return
 	}

@@ -587,7 +665,7 @@ func (s *apiSvc) postSystemConfig(w http.ResponseWriter, r *http.Request) {
 			hash, err := bcrypt.GenerateFromPassword([]byte(to.GUI.Password), 0)
 			if err != nil {
 				l.Warnln("bcrypting password:", err)
-				http.Error(w, err.Error(), 500)
+				http.Error(w, err.Error(), http.StatusInternalServerError)
 				return
 			}

@@ -614,17 +692,16 @@ func (s *apiSvc) postSystemConfig(w http.ResponseWriter, r *http.Request) {
 	s.cfg.Save()
 }

-func (s *apiSvc) getSystemConfigInsync(w http.ResponseWriter, r *http.Request) {
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	json.NewEncoder(w).Encode(map[string]bool{"configInSync": configInSync})
+func (s *apiService) getSystemConfigInsync(w http.ResponseWriter, r *http.Request) {
+	sendJSON(w, map[string]bool{"configInSync": configInSync})
 }

-func (s *apiSvc) postSystemRestart(w http.ResponseWriter, r *http.Request) {
+func (s *apiService) postSystemRestart(w http.ResponseWriter, r *http.Request) {
 	s.flushResponse(`{"ok": "restarting"}`, w)
 	go restart()
 }

-func (s *apiSvc) postSystemReset(w http.ResponseWriter, r *http.Request) {
+func (s *apiService) postSystemReset(w http.ResponseWriter, r *http.Request) {
 	var qs = r.URL.Query()
 	folder := qs.Get("folder")

@@ -650,12 +727,12 @@ func (s *apiSvc) postSystemReset(w http.ResponseWriter, r *http.Request) {
 	go restart()
 }

-func (s *apiSvc) postSystemShutdown(w http.ResponseWriter, r *http.Request) {
+func (s *apiService) postSystemShutdown(w http.ResponseWriter, r *http.Request) {
 	s.flushResponse(`{"ok": "shutting down"}`, w)
 	go shutdown()
 }

-func (s *apiSvc) flushResponse(resp string, w http.ResponseWriter) {
+func (s *apiService) flushResponse(resp string, w http.ResponseWriter) {
 	w.Write([]byte(resp + "\n"))
 	f := w.(http.Flusher)
 	f.Flush()
@@ -664,7 +741,7 @@ func (s *apiSvc) flushResponse(resp string, w http.ResponseWriter) {
 var cpuUsagePercent [10]float64 // The last ten seconds
 var cpuUsageLock = sync.NewRWMutex()

-func (s *apiSvc) getSystemStatus(w http.ResponseWriter, r *http.Request) {
+func (s *apiService) getSystemStatus(w http.ResponseWriter, r *http.Request) {
 	var m runtime.MemStats
 	runtime.ReadMemStats(&m)

@@ -688,12 +765,12 @@ func (s *apiSvc) getSystemStatus(w http.ResponseWriter, r *http.Request) {
 		res["discoveryMethods"] = discoMethods
 		res["discoveryErrors"] = discoErrors
 	}
-	if s.relaySvc != nil {
+	if s.relayService != nil {
 		res["relaysEnabled"] = true
 		relayClientStatus := make(map[string]bool)
 		relayClientLatency := make(map[string]int)
-		for _, relay := range s.relaySvc.Relays() {
-			latency, ok := s.relaySvc.RelayStatus(relay)
+		for _, relay := range s.relayService.Relays() {
+			latency, ok := s.relayService.RelayStatus(relay)
 			relayClientStatus[relay] = ok
 			relayClientLatency[relay] = int(latency / time.Millisecond)
 		}
@@ -710,40 +787,37 @@ func (s *apiSvc) getSystemStatus(w http.ResponseWriter, r *http.Request) {
 	res["pathSeparator"] = string(filepath.Separator)
 	res["uptime"] = int(time.Since(startTime).Seconds())
 	res["startTime"] = startTime
+	res["themes"] = s.themes

-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	json.NewEncoder(w).Encode(res)
+	sendJSON(w, res)
 }

-func (s *apiSvc) getSystemError(w http.ResponseWriter, r *http.Request) {
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	json.NewEncoder(w).Encode(map[string][]logger.Line{
+func (s *apiService) getSystemError(w http.ResponseWriter, r *http.Request) {
+	sendJSON(w, map[string][]logger.Line{
 		"errors": s.guiErrors.Since(time.Time{}),
 	})
 }

-func (s *apiSvc) postSystemError(w http.ResponseWriter, r *http.Request) {
+func (s *apiService) postSystemError(w http.ResponseWriter, r *http.Request) {
 	bs, _ := ioutil.ReadAll(r.Body)
 	r.Body.Close()
 	l.Warnln(string(bs))
 }

-func (s *apiSvc) postSystemErrorClear(w http.ResponseWriter, r *http.Request) {
+func (s *apiService) postSystemErrorClear(w http.ResponseWriter, r *http.Request) {
 	s.guiErrors.Clear()
 }

-func (s *apiSvc) getSystemLog(w http.ResponseWriter, r *http.Request) {
+func (s *apiService) getSystemLog(w http.ResponseWriter, r *http.Request) {
 	q := r.URL.Query()
 	since, err := time.Parse(time.RFC3339, q.Get("since"))
 	l.Debugln(err)
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-
-	json.NewEncoder(w).Encode(map[string][]logger.Line{
+	sendJSON(w, map[string][]logger.Line{
 		"messages": s.systemLog.Since(since),
 	})
 }

-func (s *apiSvc) getSystemLogTxt(w http.ResponseWriter, r *http.Request) {
+func (s *apiService) getSystemLogTxt(w http.ResponseWriter, r *http.Request) {
 	q := r.URL.Query()
 	since, err := time.Parse(time.RFC3339, q.Get("since"))
 	l.Debugln(err)
@@ -754,7 +828,7 @@ func (s *apiSvc) getSystemLogTxt(w http.ResponseWriter, r *http.Request) {
 	}
 }

-func (s *apiSvc) getSystemHTTPMetrics(w http.ResponseWriter, r *http.Request) {
+func (s *apiService) getSystemHTTPMetrics(w http.ResponseWriter, r *http.Request) {
 	stats := make(map[string]interface{})
 	metrics.Each(func(name string, intf interface{}) {
 		if m, ok := intf.(*metrics.StandardTimer); ok {
@@ -774,8 +848,7 @@ func (s *apiSvc) getSystemHTTPMetrics(w http.ResponseWriter, r *http.Request) {
 	w.Write(bs)
 }

-func (s *apiSvc) getSystemDiscovery(w http.ResponseWriter, r *http.Request) {
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
+func (s *apiService) getSystemDiscovery(w http.ResponseWriter, r *http.Request) {
 	devices := make(map[string]discover.CacheEntry)

 	if s.discoverer != nil {
@@ -787,17 +860,15 @@ func (s *apiSvc) getSystemDiscovery(w http.ResponseWriter, r *http.Request) {
 		}
 	}

-	json.NewEncoder(w).Encode(devices)
+	sendJSON(w, devices)
 }

-func (s *apiSvc) getReport(w http.ResponseWriter, r *http.Request) {
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	json.NewEncoder(w).Encode(reportData(s.cfg, s.model))
+func (s *apiService) getReport(w http.ResponseWriter, r *http.Request) {
+	sendJSON(w, reportData(s.cfg, s.model))
 }

-func (s *apiSvc) getDBIgnores(w http.ResponseWriter, r *http.Request) {
+func (s *apiService) getDBIgnores(w http.ResponseWriter, r *http.Request) {
 	qs := r.URL.Query()
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")

 	ignores, patterns, err := s.model.GetIgnores(qs.Get("folder"))
 	if err != nil {
@@ -805,13 +876,13 @@ func (s *apiSvc) getDBIgnores(w http.ResponseWriter, r *http.Request) {
 		return
 	}

-	json.NewEncoder(w).Encode(map[string][]string{
+	sendJSON(w, map[string][]string{
 		"ignore":   ignores,
 		"patterns": patterns,
 	})
 }

-func (s *apiSvc) postDBIgnores(w http.ResponseWriter, r *http.Request) {
+func (s *apiService) postDBIgnores(w http.ResponseWriter, r *http.Request) {
 	qs := r.URL.Query()

 	var data map[string][]string
@@ -832,7 +903,7 @@ func (s *apiSvc) postDBIgnores(w http.ResponseWriter, r *http.Request) {
 	s.getDBIgnores(w, r)
 }

-func (s *apiSvc) getEvents(w http.ResponseWriter, r *http.Request) {
+func (s *apiService) getEvents(w http.ResponseWriter, r *http.Request) {
 	qs := r.URL.Query()
 	sinceStr := qs.Get("since")
 	limitStr := qs.Get("limit")
@@ -841,10 +912,10 @@ func (s *apiSvc) getEvents(w http.ResponseWriter, r *http.Request) {

 	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.
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-
-	// Flush before blocking, to indicate that we've received the request
-	// and that it should not be retried.
 	f := w.(http.Flusher)
 	f.Flush()

@@ -853,10 +924,10 @@ func (s *apiSvc) getEvents(w http.ResponseWriter, r *http.Request) {
 		evs = evs[len(evs)-limit:]
 	}

-	json.NewEncoder(w).Encode(evs)
+	sendJSON(w, evs)
 }

-func (s *apiSvc) getSystemUpgrade(w http.ResponseWriter, r *http.Request) {
+func (s *apiService) getSystemUpgrade(w http.ResponseWriter, r *http.Request) {
 	if noUpgrade {
 		http.Error(w, upgrade.ErrUpgradeUnsupported.Error(), 500)
 		return
@@ -872,38 +943,36 @@ func (s *apiSvc) getSystemUpgrade(w http.ResponseWriter, r *http.Request) {
 	res["newer"] = upgrade.CompareVersions(rel.Tag, Version) == upgrade.Newer
 	res["majorNewer"] = upgrade.CompareVersions(rel.Tag, Version) == upgrade.MajorNewer

-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	json.NewEncoder(w).Encode(res)
+	sendJSON(w, res)
 }

-func (s *apiSvc) getDeviceID(w http.ResponseWriter, r *http.Request) {
+func (s *apiService) getDeviceID(w http.ResponseWriter, r *http.Request) {
 	qs := r.URL.Query()
 	idStr := qs.Get("id")
 	id, err := protocol.DeviceIDFromString(idStr)
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
+
 	if err == nil {
-		json.NewEncoder(w).Encode(map[string]string{
+		sendJSON(w, map[string]string{
 			"id": id.String(),
 		})
 	} else {
-		json.NewEncoder(w).Encode(map[string]string{
+		sendJSON(w, map[string]string{
 			"error": err.Error(),
 		})
 	}
 }

-func (s *apiSvc) getLang(w http.ResponseWriter, r *http.Request) {
+func (s *apiService) getLang(w http.ResponseWriter, r *http.Request) {
 	lang := r.Header.Get("Accept-Language")
 	var langs []string
 	for _, l := range strings.Split(lang, ",") {
 		parts := strings.SplitN(l, ";", 2)
 		langs = append(langs, strings.ToLower(strings.TrimSpace(parts[0])))
 	}
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	json.NewEncoder(w).Encode(langs)
+	sendJSON(w, langs)
 }

-func (s *apiSvc) postSystemUpgrade(w http.ResponseWriter, r *http.Request) {
+func (s *apiService) postSystemUpgrade(w http.ResponseWriter, r *http.Request) {
 	rel, err := upgrade.LatestRelease(s.cfg.Options().ReleasesURL, Version)
 	if err != nil {
 		l.Warnln("getting latest release:", err)
@@ -925,7 +994,7 @@ func (s *apiSvc) postSystemUpgrade(w http.ResponseWriter, r *http.Request) {
 	}
 }

-func (s *apiSvc) postSystemPause(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")

@@ -938,7 +1007,7 @@ func (s *apiSvc) postSystemPause(w http.ResponseWriter, r *http.Request) {
 	s.model.PauseDevice(device)
 }

-func (s *apiSvc) postSystemResume(w http.ResponseWriter, r *http.Request) {
+func (s *apiService) postSystemResume(w http.ResponseWriter, r *http.Request) {
 	var qs = r.URL.Query()
 	var deviceStr = qs.Get("device")

@@ -951,7 +1020,7 @@ func (s *apiSvc) postSystemResume(w http.ResponseWriter, r *http.Request) {
 	s.model.ResumeDevice(device)
 }

-func (s *apiSvc) postDBScan(w http.ResponseWriter, r *http.Request) {
+func (s *apiService) postDBScan(w http.ResponseWriter, r *http.Request) {
 	qs := r.URL.Query()
 	folder := qs.Get("folder")
 	if folder != "" {
@@ -971,13 +1040,13 @@ func (s *apiSvc) postDBScan(w http.ResponseWriter, r *http.Request) {
 		errors := s.model.ScanFolders()
 		if len(errors) > 0 {
 			http.Error(w, "Error scanning folders", 500)
-			json.NewEncoder(w).Encode(errors)
+			sendJSON(w, errors)
 			return
 		}
 	}
 }

-func (s *apiSvc) postDBPrio(w http.ResponseWriter, r *http.Request) {
+func (s *apiService) postDBPrio(w http.ResponseWriter, r *http.Request) {
 	qs := r.URL.Query()
 	folder := qs.Get("folder")
 	file := qs.Get("file")
@@ -985,7 +1054,7 @@ func (s *apiSvc) postDBPrio(w http.ResponseWriter, r *http.Request) {
 	s.getDBNeed(w, r)
 }

-func (s *apiSvc) getQR(w http.ResponseWriter, r *http.Request) {
+func (s *apiService) getQR(w http.ResponseWriter, r *http.Request) {
 	var qs = r.URL.Query()
 	var text = qs.Get("text")
 	code, err := qr.Encode(text, qr.M)
@@ -998,7 +1067,7 @@ func (s *apiSvc) getQR(w http.ResponseWriter, r *http.Request) {
 	w.Write(code.PNG())
 }

-func (s *apiSvc) getPeerCompletion(w http.ResponseWriter, r *http.Request) {
+func (s *apiService) getPeerCompletion(w http.ResponseWriter, r *http.Request) {
 	tot := map[string]float64{}
 	count := map[string]float64{}

@@ -1019,12 +1088,10 @@ func (s *apiSvc) getPeerCompletion(w http.ResponseWriter, r *http.Request) {
 		comp[device] = int(tot[device] / count[device])
 	}

-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	json.NewEncoder(w).Encode(comp)
+	sendJSON(w, comp)
 }

-func (s *apiSvc) getSystemBrowse(w http.ResponseWriter, r *http.Request) {
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
+func (s *apiService) getSystemBrowse(w http.ResponseWriter, r *http.Request) {
 	qs := r.URL.Query()
 	current := qs.Get("current")
 	search, _ := osutil.ExpandTilde(current)
@@ -1043,12 +1110,16 @@ func (s *apiSvc) getSystemBrowse(w http.ResponseWriter, r *http.Request) {
 			}
 		}
 	}
-	json.NewEncoder(w).Encode(ret)
+
+	sendJSON(w, ret)
 }

 type embeddedStatic struct {
-	assetDir string
-	assets   map[string][]byte
+	theme        string
+	lastModified time.Time
+	mut          sync.RWMutex
+	assetDir     string
+	assets       map[string][]byte
 }

 func (s embeddedStatic) ServeHTTP(w http.ResponseWriter, r *http.Request) {
@@ -1071,13 +1142,21 @@ func (s embeddedStatic) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		}
 	}

-	bs, ok := s.assets[file]
+	s.mut.RLock()
+	theme := s.theme
+	modified := s.lastModified
+	s.mut.RUnlock()
+
+	bs, ok := s.assets[theme+"/"+file]
 	if !ok {
-		http.NotFound(w, r)
-		return
+		bs, ok = s.assets[config.DefaultTheme+"/"+file]
+		if !ok {
+			http.NotFound(w, r)
+			return
+		}
 	}

-	if r.Header.Get("If-Modified-Since") == auto.AssetsBuildDate {
+	if modifiedSince, err := time.Parse(r.Header.Get("If-Modified-Since"), http.TimeFormat); err == nil && modified.Before(modifiedSince) {
 		w.WriteHeader(http.StatusNotModified)
 		return
 	}
@@ -1096,7 +1175,7 @@ func (s embeddedStatic) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		gr.Close()
 	}
 	w.Header().Set("Content-Length", fmt.Sprintf("%d", len(bs)))
-	w.Header().Set("Last-Modified", auto.AssetsBuildDate)
+	w.Header().Set("Last-Modified", modified.Format(http.TimeFormat))
 	w.Header().Set("Cache-Control", "public")

 	w.Write(bs)
@@ -1129,7 +1208,28 @@ func (s embeddedStatic) mimeTypeForFile(file string) string {
 	}
 }

-func (s *apiSvc) toNeedSlice(fs []db.FileInfoTruncated) []jsonDBFileInfo {
+// VerifyConfiguration implements the config.Committer interface
+func (s *embeddedStatic) VerifyConfiguration(from, to config.Configuration) error {
+	return nil
+}
+
+// CommitConfiguration implements the config.Committer interface
+func (s *embeddedStatic) CommitConfiguration(from, to config.Configuration) bool {
+	s.mut.Lock()
+	if s.theme != to.GUI.Theme {
+		s.theme = to.GUI.Theme
+		s.lastModified = time.Now()
+	}
+	s.mut.Unlock()
+
+	return true
+}
+
+func (s *embeddedStatic) String() string {
+	return fmt.Sprintf("embeddedStatic@%p", s)
+}
+
+func (s *apiService) toNeedSlice(fs []db.FileInfoTruncated) []jsonDBFileInfo {
 	res := make([]jsonDBFileInfo, len(fs))
 	for i, f := range fs {
 		res[i] = jsonDBFileInfo(f)
@@ -1171,7 +1271,7 @@ type jsonVersionVector protocol.Vector
 func (v jsonVersionVector) MarshalJSON() ([]byte, error) {
 	res := make([]string, len(v))
 	for i, c := range v {
-		res[i] = fmt.Sprintf("%d:%d", c.ID, c.Value)
+		res[i] = fmt.Sprintf("%v:%d", c.ID, c.Value)
 	}
 	return json.Marshal(res)
 }
--- a/cmd/syncthing/gui_auth.go
+++ b/cmd/syncthing/gui_auth.go
@@ -33,9 +33,8 @@ func emitLoginAttempt(success bool, username string) {
 }

 func basicAuthAndSessionMiddleware(cookieName string, cfg config.GUIConfiguration, next http.Handler) http.Handler {
-	apiKey := cfg.APIKey()
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if apiKey != "" && r.Header.Get("X-API-Key") == apiKey {
+		if cfg.IsValidAPIKey(r.Header.Get("X-API-Key")) {
 			next.ServeHTTP(w, r)
 			return
 		}
--- a/cmd/syncthing/gui_csrf.go
+++ b/cmd/syncthing/gui_csrf.go
@@ -13,21 +13,29 @@ import (
 	"os"
 	"strings"

+	"github.com/syncthing/syncthing/lib/config"
 	"github.com/syncthing/syncthing/lib/osutil"
 	"github.com/syncthing/syncthing/lib/sync"
 )

+// csrfTokens is a list of valid tokens. It is sorted so that the most
+// recently used token is first in the list. New tokens are added to the front
+// of the list (as it is the most recently used at that time). The list is
+// pruned to a maximum of maxCsrfTokens, throwing away the least recently used
+// tokens.
 var csrfTokens []string
 var csrfMut = sync.NewMutex()

+const maxCsrfTokens = 25
+
 // Check for CSRF token on /rest/ URLs. If a correct one is not given, reject
 // the request with 403. For / and /index.html, set a new CSRF cookie if none
 // is currently set.
-func csrfMiddleware(unique, prefix, apiKey string, next http.Handler) http.Handler {
+func csrfMiddleware(unique string, prefix string, cfg config.GUIConfiguration, next http.Handler) http.Handler {
 	loadCsrfTokens()
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		// Allow requests carrying a valid API key
-		if apiKey != "" && r.Header.Get("X-API-Key") == apiKey {
+		if cfg.IsValidAPIKey(r.Header.Get("X-API-Key")) {
 			next.ServeHTTP(w, r)
 			return
 		}
@@ -36,6 +44,7 @@ func csrfMiddleware(unique, prefix, apiKey string, next http.Handler) http.Handl
 		if !strings.HasPrefix(r.URL.Path, prefix) {
 			cookie, err := r.Cookie("CSRF-Token-" + unique)
 			if err != nil || !validCsrfToken(cookie.Value) {
+				httpl.Debugln("new CSRF cookie in response to request for", r.URL)
 				cookie = &http.Cookie{
 					Name:  "CSRF-Token-" + unique,
 					Value: newCsrfToken(),
@@ -47,7 +56,13 @@ func csrfMiddleware(unique, prefix, apiKey string, next http.Handler) http.Handl
 		}

 		if r.Method == "GET" {
-			// Allow GET requests unconditionally
+			// Allow GET requests unconditionally, but if we got the CSRF
+			// token cookie do the verification anyway so we keep the
+			// csrfTokens list sorted by recent usage. We don't care about the
+			// outcome of the validity check.
+			if cookie, err := r.Cookie("CSRF-Token-" + unique); err == nil {
+				validCsrfToken(cookie.Value)
+			}
 			next.ServeHTTP(w, r)
 			return
 		}
@@ -66,8 +81,15 @@ func csrfMiddleware(unique, prefix, apiKey string, next http.Handler) http.Handl
 func validCsrfToken(token string) bool {
 	csrfMut.Lock()
 	defer csrfMut.Unlock()
-	for _, t := range csrfTokens {
+	for i, t := range csrfTokens {
 		if t == token {
+			if i > 0 {
+				// Move this token to the head of the list. Copy the tokens at
+				// the front one step to the right and then replace the token
+				// at the head.
+				copy(csrfTokens[1:], csrfTokens[:i+1])
+				csrfTokens[0] = token
+			}
 			return true
 		}
 	}
@@ -78,9 +100,9 @@ func newCsrfToken() string {
 	token := randomString(32)

 	csrfMut.Lock()
-	csrfTokens = append(csrfTokens, token)
-	if len(csrfTokens) > 10 {
-		csrfTokens = csrfTokens[len(csrfTokens)-10:]
+	csrfTokens = append([]string{token}, csrfTokens...)
+	if len(csrfTokens) > maxCsrfTokens {
+		csrfTokens = csrfTokens[:maxCsrfTokens]
 	}
 	defer csrfMut.Unlock()

--- a/cmd/syncthing/gui_test.go
+++ b/cmd/syncthing/gui_test.go
@@ -0,0 +1,91 @@
+// 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/.
+
+package main
+
+import (
+	"testing"
+
+	"github.com/syncthing/syncthing/lib/config"
+	"github.com/syncthing/syncthing/lib/protocol"
+	"github.com/thejerf/suture"
+)
+
+func TestCSRFToken(t *testing.T) {
+	t1 := newCsrfToken()
+	t2 := newCsrfToken()
+
+	t3 := newCsrfToken()
+	if !validCsrfToken(t3) {
+		t.Fatal("t3 should be valid")
+	}
+
+	for i := 0; i < 250; i++ {
+		if i%5 == 0 {
+			// t1 and t2 should remain valid by virtue of us checking them now
+			// and then.
+			if !validCsrfToken(t1) {
+				t.Fatal("t1 should be valid at iteration", i)
+			}
+			if !validCsrfToken(t2) {
+				t.Fatal("t2 should be valid at iteration", i)
+			}
+		}
+
+		// The newly generated token is always valid
+		t4 := newCsrfToken()
+		if !validCsrfToken(t4) {
+			t.Fatal("t4 should be valid at iteration", i)
+		}
+	}
+
+	if validCsrfToken(t3) {
+		t.Fatal("t3 should have expired by now")
+	}
+}
+
+func TestStopAfterBrokenConfig(t *testing.T) {
+	baseDirs["config"] = "../../test/h1" // to load HTTPS keys
+	expandLocations()
+
+	cfg := config.Configuration{
+		GUI: config.GUIConfiguration{
+			RawAddress: "127.0.0.1:0",
+			RawUseTLS:  false,
+		},
+	}
+	w := config.Wrap("/dev/null", cfg)
+
+	srv, err := newAPIService(protocol.LocalDeviceID, w, "", nil, nil, nil, nil, nil, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	srv.started = make(chan struct{})
+
+	sup := suture.NewSimple("test")
+	sup.Add(srv)
+	sup.ServeBackground()
+
+	<-srv.started
+
+	// Service is now running, listening on a random port on localhost. Now we
+	// request a config change to a completely invalid listen address. The
+	// commit will fail and the service will be in a broken state.
+
+	newCfg := config.Configuration{
+		GUI: config.GUIConfiguration{
+			RawAddress: "totally not a valid address",
+			RawUseTLS:  false,
+		},
+	}
+	if srv.CommitConfiguration(cfg, newCfg) {
+		t.Fatal("Config commit should have failed")
+	}
+
+	// Nonetheless, it should be fine to Stop() it without panic.
+
+	sup.Stop()
+}
--- a/cmd/syncthing/gui_windows.go
+++ b/cmd/syncthing/gui_windows.go
@@ -42,6 +42,10 @@ func trackCPUUsage() {

 		curTime := time.Now().UnixNano()
 		timeDiff := curTime - prevTime
+		// This is sometimes 0, no clue why.
+		if timeDiff == 0 {
+			continue
+		}
 		curUsage := ktime.Nanoseconds() + utime.Nanoseconds()
 		usageDiff := curUsage - prevUsage
 		cpuUsageLock.Lock()
--- a/cmd/syncthing/main.go
+++ b/cmd/syncthing/main.go
@@ -19,6 +19,7 @@ import (
 	_ "net/http/pprof"
 	"net/url"
 	"os"
+	"os/signal"
 	"path/filepath"
 	"regexp"
 	"runtime"
@@ -26,6 +27,7 @@ import (
 	"sort"
 	"strconv"
 	"strings"
+	"syscall"
 	"time"

 	"github.com/syncthing/syncthing/lib/config"
@@ -49,7 +51,6 @@ import (
 var (
 	Version     = "unknown-dev"
 	Codename    = "Beryllium Bedbug"
-	BuildEnv    = "default"
 	BuildStamp  = "0"
 	BuildDate   time.Time
 	BuildHost   = "unknown"
@@ -70,7 +71,8 @@ const (
 const (
 	bepProtocolName      = "bep/1.0"
 	tlsDefaultCommonName = "syncthing"
-	tlsRSABits           = 3072
+	httpsRSABits         = 2048
+	bepRSABits           = 0 // 384 bit ECDSA used instead
 	pingEventInterval    = time.Minute
 	maxSystemErrors      = 5
 	initialSystemLog     = 10
@@ -107,30 +109,19 @@ func init() {
 	BuildDate = time.Unix(int64(stamp), 0)

 	date := BuildDate.UTC().Format("2006-01-02 15:04:05 MST")
-	LongVersion = fmt.Sprintf(`syncthing %s "%s" (%s %s-%s %s) %s@%s %s`, Version, Codename, runtime.Version(), runtime.GOOS, runtime.GOARCH, BuildEnv, BuildUser, BuildHost, date)
-
-	if os.Getenv("STTRACE") != "" {
-		logFlags = log.Ltime | log.Ldate | log.Lmicroseconds | log.Lshortfile
-	}
+	LongVersion = fmt.Sprintf(`syncthing %s "%s" (%s %s-%s) %s@%s %s`, Version, Codename, runtime.Version(), runtime.GOOS, runtime.GOARCH, BuildUser, BuildHost, date)
 }

 var (
-	myID     protocol.DeviceID
-	confDir  string
-	logFlags = log.Ltime
-	stop     = make(chan int)
-	cert     tls.Certificate
-	lans     []*net.IPNet
+	myID protocol.DeviceID
+	stop = make(chan int)
+	cert tls.Certificate
+	lans []*net.IPNet
 )

 const (
 	usage      = "syncthing [options]"
 	extraUsage = `
-The default configuration directory is:
-
-  %s
-
-
 The -logflags value is a sum of the following:

   1  Date
@@ -150,34 +141,38 @@ Development Settings
 The following environment variables modify syncthing's behavior in ways that
 are mostly useful for developers. Use with care.

- STGUIASSETS     Directory to load GUI assets from. Overrides compiled in
-                 assets.
+ STNODEFAULTFOLDER Don't create a default folder when starting for the first
+                   time.  This variable will be ignored anytime after the first
+                   run.

- STTRACE         A comma separated string of facilities to trace. The valid
-                 facility strings listed below.
+ STGUIASSETS       Directory to load GUI assets from. Overrides compiled in
+                   assets.

- STPROFILER      Set to a listen address such as "127.0.0.1:9090" to start the
-                 profiler with HTTP access.
+ STTRACE           A comma separated string of facilities to trace. The valid
+                   facility strings listed below.

- STCPUPROFILE    Write a CPU profile to cpu-$pid.pprof on exit.
+ STPROFILER        Set to a listen address such as "127.0.0.1:9090" to start the
+                   profiler with HTTP access.

- STHEAPPROFILE   Write heap profiles to heap-$pid-$timestamp.pprof each time
-                 heap usage increases.
+ STCPUPROFILE      Write a CPU profile to cpu-$pid.pprof on exit.

- STBLOCKPROFILE  Write block profiles to block-$pid-$timestamp.pprof every 20
-                 seconds.
+ STHEAPPROFILE     Write heap profiles to heap-$pid-$timestamp.pprof each time
+                   heap usage increases.

- STPERFSTATS     Write running performance statistics to perf-$pid.csv. Not
-                 supported on Windows.
+ STBLOCKPROFILE    Write block profiles to block-$pid-$timestamp.pprof every 20
+                   seconds.

- STNOUPGRADE     Disable automatic upgrades.
+ STPERFSTATS       Write running performance statistics to perf-$pid.csv. Not
+                   supported on Windows.

- GOMAXPROCS      Set the maximum number of CPU cores to use. Defaults to all
-                 available CPU cores.
+ STNOUPGRADE       Disable automatic upgrades.

- 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).
+ 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).


 Debugging Facilities
@@ -188,170 +183,196 @@ The following are valid values for the STTRACE variable:
 %s`
 )

-// Command line and environment options
+// Environment options
 var (
+	noUpgrade       = os.Getenv("STNOUPGRADE") != ""
+	innerProcess    = os.Getenv("STNORESTART") != "" || os.Getenv("STMONITORED") != ""
+	noDefaultFolder = os.Getenv("STNODEFAULTFOLDER") != ""
+)
+
+type RuntimeOptions struct {
+	confDir        string
 	reset          bool
 	showVersion    bool
+	showPaths      bool
 	doUpgrade      bool
 	doUpgradeCheck bool
 	upgradeTo      string
 	noBrowser      bool
-	noConsole      bool
+	browserOnly    bool
+	hideConsole    bool
 	logFile        string
 	auditEnabled   bool
 	verbose        bool
 	paused         bool
-	noRestart      = os.Getenv("STNORESTART") != ""
-	noUpgrade      = os.Getenv("STNOUPGRADE") != ""
-	profiler       = os.Getenv("STPROFILER")
-	guiAssets      = os.Getenv("STGUIASSETS")
-	cpuProfile     = os.Getenv("STCPUPROFILE") != ""
-	stRestarting   = os.Getenv("STRESTART") != ""
-	innerProcess   = os.Getenv("STNORESTART") != "" || os.Getenv("STMONITORED") != ""
-)
+	guiAddress     string
+	guiAPIKey      string
+	generateDir    string
+	noRestart      bool
+	profiler       string
+	assetDir       string
+	cpuProfile     bool
+	stRestarting   bool
+	logFlags       int
+}

-func main() {
-	if runtime.GOOS == "windows" {
-		// On Windows, we use a log file by default. Setting the -logfile flag
-		// to "-" disables this behavior.
-		flag.StringVar(&logFile, "logfile", "", "Log file name (use \"-\" for stdout)")
-
-		// We also add an option to hide the console window
-		flag.BoolVar(&noConsole, "no-console", false, "Hide console window")
-	} else {
-		flag.StringVar(&logFile, "logfile", "-", "Log file name (use \"-\" for stdout)")
+func defaultRuntimeOptions() RuntimeOptions {
+	options := RuntimeOptions{
+		noRestart:    os.Getenv("STNORESTART") != "",
+		profiler:     os.Getenv("STPROFILER"),
+		assetDir:     os.Getenv("STGUIASSETS"),
+		cpuProfile:   os.Getenv("STCPUPROFILE") != "",
+		stRestarting: os.Getenv("STRESTART") != "",
+		logFlags:     log.Ltime,
 	}

-	var guiAddress, guiAPIKey string
-	var generateDir string
-	flag.StringVar(&generateDir, "generate", "", "Generate key and config in specified dir, then exit")
-	flag.StringVar(&guiAddress, "gui-address", guiAddress, "Override GUI address")
-	flag.StringVar(&guiAPIKey, "gui-apikey", guiAPIKey, "Override GUI API key")
-	flag.StringVar(&confDir, "home", "", "Set configuration directory")
-	flag.IntVar(&logFlags, "logflags", logFlags, "Select information in log line prefix")
-	flag.BoolVar(&noBrowser, "no-browser", false, "Do not start browser")
-	flag.BoolVar(&noRestart, "no-restart", noRestart, "Do not restart; just exit")
-	flag.BoolVar(&reset, "reset", false, "Reset the database")
-	flag.BoolVar(&doUpgrade, "upgrade", false, "Perform upgrade")
-	flag.BoolVar(&doUpgradeCheck, "upgrade-check", false, "Check for available upgrade")
-	flag.BoolVar(&showVersion, "version", false, "Show version")
-	flag.StringVar(&upgradeTo, "upgrade-to", upgradeTo, "Force upgrade directly from specified URL")
-	flag.BoolVar(&auditEnabled, "audit", false, "Write events to audit file")
-	flag.BoolVar(&verbose, "verbose", false, "Print verbose log output")
-	flag.BoolVar(&paused, "paused", false, "Start with all devices paused")
+	if os.Getenv("STTRACE") != "" {
+		options.logFlags = log.Ltime | log.Ldate | log.Lmicroseconds | log.Lshortfile
+	}

-	longUsage := fmt.Sprintf(extraUsage, baseDirs["config"], debugFacilities())
+	if runtime.GOOS != "windows" {
+		// On non-Windows, we explicitly default to "-" which means stdout. On
+		// Windows, the blank options.logFile will later be replaced with the
+		// default path, unless the user has manually specified "-" or
+		// something else.
+		options.logFile = "-"
+	}
+
+	return options
+}
+
+func parseCommandLineOptions() RuntimeOptions {
+	options := defaultRuntimeOptions()
+
+	flag.StringVar(&options.generateDir, "generate", "", "Generate key and config in specified dir, then exit")
+	flag.StringVar(&options.guiAddress, "gui-address", options.guiAddress, "Override GUI address (e.g. \"http://192.0.2.42:8443\")")
+	flag.StringVar(&options.guiAPIKey, "gui-apikey", options.guiAPIKey, "Override GUI API key")
+	flag.StringVar(&options.confDir, "home", "", "Set configuration directory")
+	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.doUpgrade, "upgrade", false, "Perform upgrade")
+	flag.BoolVar(&options.doUpgradeCheck, "upgrade-check", false, "Check for available upgrade")
+	flag.BoolVar(&options.showVersion, "version", false, "Show version")
+	flag.BoolVar(&options.showPaths, "paths", false, "Show configuration paths")
+	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.StringVar(&options.logFile, "logfile", options.logFile, "Log file name (use \"-\" for stdout)")
+	if runtime.GOOS == "windows" {
+		// Allow user to hide the console window
+		flag.BoolVar(&options.hideConsole, "no-console", false, "Hide console window")
+	}
+
+	longUsage := fmt.Sprintf(extraUsage, debugFacilities())
 	flag.Usage = usageFor(flag.CommandLine, usage, longUsage)
 	flag.Parse()

-	if guiAddress != "" {
+	return options
+}
+
+func main() {
+	options := parseCommandLineOptions()
+	l.SetFlags(options.logFlags)
+
+	if options.guiAddress != "" {
 		// The config picks this up from the environment.
-		os.Setenv("STGUIADDRESS", guiAddress)
+		os.Setenv("STGUIADDRESS", options.guiAddress)
 	}
-	if guiAPIKey != "" {
+	if options.guiAPIKey != "" {
 		// The config picks this up from the environment.
-		os.Setenv("STGUIAPIKEY", guiAPIKey)
+		os.Setenv("STGUIAPIKEY", options.guiAPIKey)
 	}

-	if noConsole {
+	if options.hideConsole {
 		osutil.HideConsole()
 	}

-	if confDir != "" {
+	if options.confDir != "" {
 		// Not set as default above because the string can be really long.
-		baseDirs["config"] = confDir
+		baseDirs["config"] = options.confDir
 	}

 	if err := expandLocations(); err != nil {
 		l.Fatalln(err)
 	}

-	if guiAssets == "" {
-		guiAssets = locations[locGUIAssets]
+	if options.logFile == "" {
+		// Blank means use the default logfile location. We must set this
+		// *after* expandLocations above.
+		options.logFile = locations[locLogFile]
 	}

-	if logFile == "" {
-		// Use the default log file location
-		logFile = locations[locLogFile]
+	if options.assetDir == "" {
+		// The asset dir is blank if STGUIASSETS wasn't set, in which case we
+		// should look for extra assets in the default place.
+		options.assetDir = locations[locGUIAssets]
 	}

-	if showVersion {
+	if options.showVersion {
 		fmt.Println(LongVersion)
 		return
 	}

-	l.SetFlags(logFlags)
-
-	if generateDir != "" {
-		generate(generateDir)
+	if options.showPaths {
+		showPaths()
 		return
 	}

-	if info, err := os.Stat(baseDirs["config"]); err == nil && !info.IsDir() {
-		l.Fatalln("Config directory", baseDirs["config"], "is not a directory")
+	if options.browserOnly {
+		openGUI()
+		return
+	}
+
+	if options.generateDir != "" {
+		generate(options.generateDir)
+		return
 	}

 	// Ensure that our home directory exists.
 	ensureDir(baseDirs["config"], 0700)

-	if upgradeTo != "" {
-		err := upgrade.ToURL(upgradeTo)
+	if options.upgradeTo != "" {
+		err := upgrade.ToURL(options.upgradeTo)
 		if err != nil {
 			l.Fatalln("Upgrade:", err) // exits 1
 		}
-		l.Okln("Upgraded from", upgradeTo)
+		l.Okln("Upgraded from", options.upgradeTo)
 		return
 	}

-	if doUpgrade || doUpgradeCheck {
-		releasesURL := "https://api.github.com/repos/syncthing/syncthing/releases?per_page=30"
-		if cfg, _, err := loadConfig(locations[locConfigFile]); err == nil {
-			releasesURL = cfg.Options().ReleasesURL
-		}
-		rel, err := upgrade.LatestRelease(releasesURL, Version)
-		if err != nil {
-			l.Fatalln("Upgrade:", err) // exits 1
-		}
-
-		if upgrade.CompareVersions(rel.Tag, Version) <= 0 {
-			l.Infof("No upgrade available (current %q >= latest %q).", Version, rel.Tag)
-			os.Exit(exitNoUpgradeAvailable)
-		}
-
-		l.Infof("Upgrade available (current %q < latest %q)", Version, rel.Tag)
-
-		if doUpgrade {
-			// Use leveldb database locks to protect against concurrent upgrades
-			_, err = db.Open(locations[locDatabase])
-			if err != nil {
-				l.Infoln("Attempting upgrade through running Syncthing...")
-				err = upgradeViaRest()
-				if err != nil {
-					l.Fatalln("Upgrade:", err)
-				}
-				l.Okln("Syncthing upgrading")
-				return
-			}
-
-			err = upgrade.To(rel)
-			if err != nil {
-				l.Fatalln("Upgrade:", err) // exits 1
-			}
-			l.Okf("Upgraded to %q", rel.Tag)
-		}
-
+	if options.doUpgradeCheck {
+		checkUpgrade()
 		return
 	}

-	if reset {
+	if options.doUpgrade {
+		release := checkUpgrade()
+		performUpgrade(release)
+		return
+	}
+
+	if options.reset {
 		resetDB()
 		return
 	}

-	if noRestart {
-		syncthingMain()
+	if options.noRestart {
+		syncthingMain(options)
 	} else {
-		monitorMain()
+		monitorMain(options)
+	}
+}
+
+func openGUI() {
+	cfg, _ := loadConfig()
+	if cfg.GUI().Enabled {
+		openURL(cfg.GUI().URL())
+	} else {
+		l.Warnln("Browser: GUI is currently disabled")
 	}
 }

@@ -360,17 +381,7 @@ func generate(generateDir string) {
 	if err != nil {
 		l.Fatalln("generate:", err)
 	}
-
-	info, err := os.Stat(dir)
-	if err == nil && !info.IsDir() {
-		l.Fatalln(dir, "is not a directory")
-	}
-	if err != nil && os.IsNotExist(err) {
-		err = osutil.MkdirAll(dir, 0700)
-		if err != nil {
-			l.Fatalln("generate:", err)
-		}
-	}
+	ensureDir(dir, 0700)

 	certFile, keyFile := filepath.Join(dir, "cert.pem"), filepath.Join(dir, "key.pem")
 	cert, err := tls.LoadX509KeyPair(certFile, keyFile)
@@ -378,7 +389,7 @@ func generate(generateDir string) {
 		l.Warnln("Key exists; will not overwrite.")
 		l.Infoln("Device ID:", protocol.NewDeviceID(cert.Certificate[0]))
 	} else {
-		cert, err = tlsutil.NewCertificate(certFile, keyFile, tlsDefaultCommonName, tlsRSABits)
+		cert, err = tlsutil.NewCertificate(certFile, keyFile, tlsDefaultCommonName, bepRSABits)
 		if err != nil {
 			l.Fatalln("Create certificate:", err)
 		}
@@ -427,14 +438,49 @@ func debugFacilities() string {
 	return b.String()
 }

-func upgradeViaRest() error {
-	cfg, err := config.Load(locations[locConfigFile], protocol.LocalDeviceID)
+func checkUpgrade() upgrade.Release {
+	cfg, _ := loadConfig()
+	releasesURL := cfg.Options().ReleasesURL
+	release, err := upgrade.LatestRelease(releasesURL, Version)
 	if err != nil {
-		return err
+		l.Fatalln("Upgrade:", err)
 	}
+
+	if upgrade.CompareVersions(release.Tag, Version) <= 0 {
+		noUpgradeMessage := "No upgrade available (current %q >= latest %q)."
+		l.Infof(noUpgradeMessage, Version, release.Tag)
+		os.Exit(exitNoUpgradeAvailable)
+	}
+
+	l.Infof("Upgrade available (current %q < latest %q)", Version, release.Tag)
+	return release
+}
+
+func performUpgrade(release upgrade.Release) {
+	// Use leveldb database locks to protect against concurrent upgrades
+	_, err := db.Open(locations[locDatabase])
+	if err == nil {
+		err = upgrade.To(release)
+		if err != nil {
+			l.Fatalln("Upgrade:", err)
+		}
+		l.Okf("Upgraded to %q", release.Tag)
+	} else {
+		l.Infoln("Attempting upgrade through running Syncthing...")
+		err = upgradeViaRest()
+		if err != nil {
+			l.Fatalln("Upgrade:", err)
+		}
+		l.Okln("Syncthing upgrading")
+		os.Exit(exitUpgrading)
+	}
+}
+
+func upgradeViaRest() error {
+	cfg, _ := loadConfig()
 	target := cfg.GUI().URL()
 	r, _ := http.NewRequest("POST", target+"/rest/system/upgrade", nil)
-	r.Header.Set("X-API-Key", cfg.GUI().APIKey())
+	r.Header.Set("X-API-Key", cfg.GUI().APIKey)

 	tr := &http.Transport{
 		Dial:            dialer.Dial,
@@ -461,26 +507,28 @@ func upgradeViaRest() error {
 	return err
 }

-func syncthingMain() {
+func syncthingMain(runtimeOptions RuntimeOptions) {
+	setupSignalHandling()
+
 	// Create a main service manager. We'll add things to this as we go along.
 	// We want any logging it does to go through our log system.
-	mainSvc := suture.New("main", suture.Spec{
+	mainService := suture.New("main", suture.Spec{
 		Log: func(line string) {
 			l.Debugln(line)
 		},
 	})
-	mainSvc.ServeBackground()
+	mainService.ServeBackground()

 	// Set a log prefix similar to the ID we will have later on, or early log
 	// lines look ugly.
 	l.SetPrefix("[start] ")

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

-	if verbose {
-		mainSvc.Add(newVerboseSvc())
+	if runtimeOptions.verbose {
+		mainService.Add(newVerboseService())
 	}

 	errors := logger.NewRecorder(l, logger.LevelWarn, maxSystemErrors, 0)
@@ -501,8 +549,8 @@ func syncthingMain() {
 	// Ensure that that we have a certificate and key.
 	cert, err := tls.LoadX509KeyPair(locations[locCertFile], locations[locKeyFile])
 	if err != nil {
-		l.Infof("Generating RSA key and certificate for %s...", tlsDefaultCommonName)
-		cert, err = tlsutil.NewCertificate(locations[locCertFile], locations[locKeyFile], tlsDefaultCommonName, tlsRSABits)
+		l.Infof("Generating ECDSA key and certificate for %s...", tlsDefaultCommonName)
+		cert, err = tlsutil.NewCertificate(locations[locCertFile], locations[locKeyFile], tlsDefaultCommonName, bepRSABits)
 		if err != nil {
 			l.Fatalln(err)
 		}
@@ -526,44 +574,17 @@ func syncthingMain() {
 		"myID": myID.String(),
 	})

-	// Prepare to be able to save configuration
-
-	cfgFile := locations[locConfigFile]
-
-	// Load the configuration file, if it exists.
-	// If it does not, create a template.
-
-	cfg, myName, err := loadConfig(cfgFile)
-	if err != nil {
-		if os.IsNotExist(err) {
-			l.Infoln("No config file; starting with empty defaults")
-			myName, _ = os.Hostname()
-			newCfg := defaultConfig(myName)
-			cfg = config.Wrap(cfgFile, newCfg)
-			cfg.Save()
-			l.Infof("Edit %s to taste or use the GUI\n", cfgFile)
-		} else {
-			l.Fatalln("Loading config:", err)
-		}
-	}
-
-	if cfg.Raw().OriginalVersion != config.CurrentVersion {
-		l.Infoln("Archiving a copy of old config file format")
-		// Archive a copy
-		osutil.Rename(cfgFile, cfgFile+fmt.Sprintf(".v%d", cfg.Raw().OriginalVersion))
-		// Save the new version
-		cfg.Save()
-	}
+	cfg := loadOrCreateConfig()

 	if err := checkShortIDs(cfg); err != nil {
-		l.Fatalln("Short device IDs are in conflict. Unlucky!\n  Regenerate the device ID of one if the following:\n  ", err)
+		l.Fatalln("Short device IDs are in conflict. Unlucky!\n  Regenerate the device ID of one of the following:\n  ", err)
 	}

-	if len(profiler) > 0 {
+	if len(runtimeOptions.profiler) > 0 {
 		go func() {
-			l.Debugln("Starting profiler on", profiler)
+			l.Debugln("Starting profiler on", runtimeOptions.profiler)
 			runtime.SetBlockProfileRate(1)
-			err := http.ListenAndServe(profiler, nil)
+			err := http.ListenAndServe(runtimeOptions.profiler, nil)
 			if err != nil {
 				l.Fatalln(err)
 			}
@@ -639,7 +660,14 @@ func syncthingMain() {
 		}
 	}

-	m := model.NewModel(cfg, myID, myName, "syncthing", Version, ldb, protectedFiles)
+	// Pack and optimize the database
+	if err := ldb.Compact(); err != nil {
+		// I don't think this is fatal, but who knows. If it is, we'll surely
+		// get an error when trying to write to the db later.
+		l.Infoln("Compacting database:", err)
+	}
+
+	m := model.NewModel(cfg, myID, myDeviceName(cfg), "syncthing", Version, ldb, protectedFiles)
 	cfg.Subscribe(m)

 	if t := os.Getenv("STDEADLOCKTIMEOUT"); len(t) > 0 {
@@ -651,7 +679,7 @@ func syncthingMain() {
 		m.StartDeadlockDetector(20 * time.Minute)
 	}

-	if paused {
+	if runtimeOptions.paused {
 		for device := range cfg.Devices() {
 			m.PauseDevice(device)
 		}
@@ -677,7 +705,7 @@ func syncthingMain() {
 		}
 	}

-	mainSvc.Add(m)
+	mainService.Add(m)

 	// The default port we announce, possibly modified by setupUPnP next.

@@ -698,33 +726,33 @@ func syncthingMain() {
 	// Start UPnP

 	if opts.UPnPEnabled {
-		upnpSvc := newUPnPSvc(cfg, addr.Port)
-		mainSvc.Add(upnpSvc)
+		upnpService := newUPnPService(cfg, addr.Port)
+		mainService.Add(upnpService)

 		// The external address tracker needs to know about the UPnP service
 		// so it can check for an external mapped port.
-		addrList = newAddressLister(upnpSvc, cfg)
+		addrList = newAddressLister(upnpService, cfg)
 	} else {
 		addrList = newAddressLister(nil, cfg)
 	}

 	// Start relay management

-	var relaySvc *relay.Svc
-	if opts.RelaysEnabled && (opts.GlobalAnnEnabled || opts.RelayWithoutGlobalAnn) {
-		relaySvc = relay.NewSvc(cfg, tlsCfg)
-		mainSvc.Add(relaySvc)
+	var relayService *relay.Service
+	if opts.RelaysEnabled {
+		relayService = relay.NewService(cfg, tlsCfg)
+		mainService.Add(relayService)
 	}

 	// Start discovery

 	cachedDiscovery := discover.NewCachingMux()
-	mainSvc.Add(cachedDiscovery)
+	mainService.Add(cachedDiscovery)

 	if cfg.Options().GlobalAnnEnabled {
 		for _, srv := range cfg.GlobalDiscoveryServers() {
 			l.Infoln("Using discovery server", srv)
-			gd, err := discover.NewGlobal(srv, cert, addrList, relaySvc)
+			gd, err := discover.NewGlobal(srv, cert, addrList, relayService)
 			if err != nil {
 				l.Warnln("Global discovery:", err)
 				continue
@@ -739,14 +767,14 @@ func syncthingMain() {

 	if cfg.Options().LocalAnnEnabled {
 		// v4 broadcasts
-		bcd, err := discover.NewLocal(myID, fmt.Sprintf(":%d", cfg.Options().LocalAnnPort), addrList, relaySvc)
+		bcd, err := discover.NewLocal(myID, fmt.Sprintf(":%d", cfg.Options().LocalAnnPort), addrList, relayService)
 		if err != nil {
 			l.Warnln("IPv4 local discovery:", err)
 		} else {
 			cachedDiscovery.Add(bcd, 0, 0, ipv4LocalDiscoveryPriority)
 		}
 		// v6 multicasts
-		mcd, err := discover.NewLocal(myID, cfg.Options().LocalAnnMCAddr, addrList, relaySvc)
+		mcd, err := discover.NewLocal(myID, cfg.Options().LocalAnnMCAddr, addrList, relayService)
 		if err != nil {
 			l.Warnln("IPv6 local discovery:", err)
 		} else {
@@ -756,14 +784,14 @@ func syncthingMain() {

 	// GUI

-	setupGUI(mainSvc, cfg, m, apiSub, cachedDiscovery, relaySvc, errors, systemLog)
+	setupGUI(mainService, cfg, m, apiSub, cachedDiscovery, relayService, errors, systemLog, runtimeOptions)

 	// Start connection management

-	connectionSvc := connections.NewConnectionSvc(cfg, myID, m, tlsCfg, cachedDiscovery, relaySvc, bepProtocolName, tlsDefaultCommonName, lans)
-	mainSvc.Add(connectionSvc)
+	connectionService := connections.NewConnectionService(cfg, myID, m, tlsCfg, cachedDiscovery, relayService, bepProtocolName, tlsDefaultCommonName, lans)
+	mainService.Add(connectionService)

-	if cpuProfile {
+	if runtimeOptions.cpuProfile {
 		f, err := os.Create(fmt.Sprintf("cpu-%d.pprof", os.Getpid()))
 		if err != nil {
 			log.Fatal(err)
@@ -821,17 +849,48 @@ func syncthingMain() {

 	code := <-stop

-	mainSvc.Stop()
+	mainService.Stop()

 	l.Okln("Exiting")

-	if cpuProfile {
+	if runtimeOptions.cpuProfile {
 		pprof.StopCPUProfile()
 	}

 	os.Exit(code)
 }

+func myDeviceName(cfg *config.Wrapper) string {
+	devices := cfg.Devices()
+	myName := devices[myID].Name
+	if myName == "" {
+		myName, _ = os.Hostname()
+	}
+	return myName
+}
+
+func setupSignalHandling() {
+	// Exit cleanly with "restarting" code on SIGHUP.
+
+	restartSign := make(chan os.Signal, 1)
+	sigHup := syscall.Signal(1)
+	signal.Notify(restartSign, sigHup)
+	go func() {
+		<-restartSign
+		stop <- exitRestarting
+	}()
+
+	// Exit with "success" code (no restart) on INT/TERM
+
+	stopSign := make(chan os.Signal, 1)
+	sigTerm := syscall.Signal(15)
+	signal.Notify(stopSign, os.Interrupt, sigTerm)
+	go func() {
+		<-stopSign
+		stop <- exitSuccess
+	}()
+}
+
 // 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.
@@ -848,47 +907,71 @@ func printHashRate() {
 	l.Infof("Single thread hash performance is ~%.*f MB/s", decimals, hashRate)
 }

-func loadConfig(cfgFile string) (*config.Wrapper, string, error) {
-	info, err := os.Stat(cfgFile)
-	if err != nil {
-		return nil, "", err
-	}
-	if !info.Mode().IsRegular() {
-		return nil, "", errors.New("configuration is not a file")
-	}
-
+func loadConfig() (*config.Wrapper, error) {
+	cfgFile := locations[locConfigFile]
 	cfg, err := config.Load(cfgFile, myID)
+
 	if err != nil {
-		return nil, "", err
+		l.Infoln("Error loading config file; using defaults for now")
+		myName, _ := os.Hostname()
+		newCfg := defaultConfig(myName)
+		cfg = config.Wrap(cfgFile, newCfg)
 	}

-	myCfg := cfg.Devices()[myID]
-	myName := myCfg.Name
-	if myName == "" {
-		myName, _ = os.Hostname()
-	}
-
-	return cfg, myName, nil
+	return cfg, err
 }

-func startAuditing(mainSvc *suture.Supervisor) {
+func loadOrCreateConfig() *config.Wrapper {
+	cfg, err := loadConfig()
+	if os.IsNotExist(err) {
+		cfg.Save()
+		l.Infof("Defaults saved. Edit %s to taste or use the GUI\n", cfg.ConfigPath())
+	} else if err != nil {
+		l.Fatalln("Config:", err)
+	}
+
+	if cfg.Raw().OriginalVersion != config.CurrentVersion {
+		err = archiveAndSaveConfig(cfg)
+		if err != nil {
+			l.Fatalln("Config archive:", err)
+		}
+	}
+
+	return cfg
+}
+
+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)
+	l.Infoln("Archiving a copy of old config file format at:", archivePath)
+	if err := osutil.Rename(cfg.ConfigPath(), archivePath); err != nil {
+		return err
+	}
+
+	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)
 	if err != nil {
 		l.Fatalln("Audit:", err)
 	}

-	auditSvc := newAuditSvc(fd)
-	mainSvc.Add(auditSvc)
+	auditService := newAuditService(fd)
+	mainService.Add(auditService)

 	// We wait for the audit service to fully start before we return, to
 	// ensure we capture all events from the start.
-	auditSvc.WaitForStart()
+	auditService.WaitForStart()

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

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

 	if !guiCfg.Enabled {
@@ -899,14 +982,14 @@ func setupGUI(mainSvc *suture.Supervisor, cfg *config.Wrapper, m *model.Model, a
 		l.Warnln("Insecure admin access is enabled.")
 	}

-	api, err := newAPISvc(myID, cfg, guiAssets, m, apiSub, discoverer, relaySvc, errors, systemLog)
+	api, err := newAPIService(myID, cfg, runtimeOptions.assetDir, m, apiSub, discoverer, relayService, errors, systemLog)
 	if err != nil {
 		l.Fatalln("Cannot start GUI:", err)
 	}
 	cfg.Subscribe(api)
-	mainSvc.Add(api)
+	mainService.Add(api)

-	if cfg.Options().StartBrowser && !noBrowser && !stRestarting {
+	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.
 		go openURL(guiCfg.URL())
@@ -914,18 +997,28 @@ func setupGUI(mainSvc *suture.Supervisor, cfg *config.Wrapper, m *model.Model, a
 }

 func defaultConfig(myName string) config.Configuration {
-	defaultFolder := config.NewFolderConfiguration("default", locations[locDefFolder])
-	defaultFolder.RescanIntervalS = 60
-	defaultFolder.MinDiskFreePct = 1
-	defaultFolder.Devices = []config.FolderDeviceConfiguration{{DeviceID: myID}}
-	defaultFolder.AutoNormalize = true
-	defaultFolder.MaxConflicts = -1
+	var defaultFolder config.FolderConfiguration
+
+	if !noDefaultFolder {
+		l.Infoln("Default folder created and/or linked to new config")
+
+		defaultFolder = config.NewFolderConfiguration("default", locations[locDefFolder])
+		defaultFolder.RescanIntervalS = 60
+		defaultFolder.MinDiskFreePct = 1
+		defaultFolder.Devices = []config.FolderDeviceConfiguration{{DeviceID: myID}}
+		defaultFolder.AutoNormalize = true
+		defaultFolder.MaxConflicts = -1
+	} else {
+		l.Infoln("We will skip creation of a default folder on first start since the proper envvar is set")
+	}

 	thisDevice := config.NewDeviceConfiguration(myID, myName)
 	thisDevice.Addresses = []string{"dynamic"}

 	newCfg := config.New(myID)
-	newCfg.Folders = []config.FolderConfiguration{defaultFolder}
+	if !noDefaultFolder {
+		newCfg.Folders = []config.FolderConfiguration{defaultFolder}
+	}
 	newCfg.Devices = []config.DeviceConfiguration{thisDevice}

 	port, err := getFreePort("127.0.0.1", 8384)
@@ -963,18 +1056,23 @@ func shutdown() {
 	stop <- exitSuccess
 }

-func ensureDir(dir string, mode int) {
-	fi, err := os.Stat(dir)
-	if os.IsNotExist(err) {
-		err := osutil.MkdirAll(dir, 0700)
-		if err != nil {
-			l.Fatalln(err)
-		}
-	} else if mode >= 0 && err == nil && int(fi.Mode()&0777) != mode {
-		err := os.Chmod(dir, os.FileMode(mode))
-		// This can fail on crappy filesystems, nothing we can do about it.
-		if err != nil {
-			l.Warnln(err)
+func ensureDir(dir string, mode os.FileMode) {
+	err := osutil.MkdirAll(dir, mode)
+	if err != nil {
+		l.Fatalln(err)
+	}
+
+	if fi, err := os.Stat(dir); err == nil {
+		// Apprently the stat may fail even though the mkdirall passed. If it
+		// does, we'll just assume things are in order and let other things
+		// fail (like loading or creating the config...).
+		currentMode := fi.Mode() & 0777
+		if currentMode != mode {
+			err := os.Chmod(dir, mode)
+			// This can fail on crappy filesystems, nothing we can do about it.
+			if err != nil {
+				l.Warnln(err)
+			}
 		}
 	}
 }
@@ -1110,7 +1208,7 @@ func cleanConfigDirectory() {
 // short ID:s; that is, that the devices in the cluster all have unique
 // initial 64 bits.
 func checkShortIDs(cfg *config.Wrapper) error {
-	exists := make(map[uint64]protocol.DeviceID)
+	exists := make(map[protocol.ShortID]protocol.DeviceID)
 	for deviceID := range cfg.Devices() {
 		shortID := deviceID.Short()
 		if otherID, ok := exists[shortID]; ok {
@@ -1120,3 +1218,13 @@ func checkShortIDs(cfg *config.Wrapper) error {
 	}
 	return nil
 }
+
+func showPaths() {
+	fmt.Printf("Configuration file:\n\t%s\n\n", locations[locConfigFile])
+	fmt.Printf("Database directory:\n\t%s\n\n", locations[locDatabase])
+	fmt.Printf("Device private key & certificate files:\n\t%s\n\t%s\n\n", locations[locKeyFile], locations[locCertFile])
+	fmt.Printf("HTTPS private key & certificate files:\n\t%s\n\t%s\n\n", locations[locHTTPSKeyFile], locations[locHTTPSCertFile])
+	fmt.Printf("Log file:\n\t%s\n\n", locations[locLogFile])
+	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])
+}
--- a/cmd/syncthing/monitor.go
+++ b/cmd/syncthing/monitor.go
@@ -34,13 +34,14 @@ const (
 	logFileMaxOpenTime    = time.Minute
 )

-func monitorMain() {
+func monitorMain(runtimeOptions RuntimeOptions) {
 	os.Setenv("STNORESTART", "yes")
 	os.Setenv("STMONITORED", "yes")
 	l.SetPrefix("[monitor] ")

 	var dst io.Writer = os.Stdout

+	logFile := runtimeOptions.logFile
 	if logFile != "-" {
 		var fileDst io.Writer = newAutoclosedFile(logFile, logFileAutoCloseDelay, logFileMaxOpenTime)

@@ -62,9 +63,12 @@ func monitorMain() {
 	args := os.Args
 	var restarts [countRestarts]time.Time

-	sign := make(chan os.Signal, 1)
-	sigTerm := syscall.Signal(0xf)
-	signal.Notify(sign, os.Interrupt, sigTerm, os.Kill)
+	stopSign := make(chan os.Signal, 1)
+	sigTerm := syscall.Signal(15)
+	signal.Notify(stopSign, os.Interrupt, sigTerm)
+	restartSign := make(chan os.Signal, 1)
+	sigHup := syscall.Signal(1)
+	signal.Notify(restartSign, sigHup)

 	for {
 		if t := time.Since(restarts[0]); t < loopThreshold {
@@ -124,12 +128,17 @@ func monitorMain() {
 		}()

 		select {
-		case s := <-sign:
+		case s := <-stopSign:
 			l.Infof("Signal %d received; exiting", s)
 			cmd.Process.Kill()
 			<-exit
 			return

+		case s := <-restartSign:
+			l.Infof("Signal %d received; restarting", s)
+			cmd.Process.Signal(sigHup)
+			err = <-exit
+
 		case err = <-exit:
 			if err == nil {
 				// Successful exit indicates an intentional shutdown
--- a/cmd/syncthing/summaryservice.go
+++ b/cmd/syncthing/summaryservice.go
@@ -16,9 +16,9 @@ import (
 	"github.com/thejerf/suture"
 )

-// The folderSummarySvc adds summary information events (FolderSummary and
+// The folderSummaryService adds summary information events (FolderSummary and
 // FolderCompletion) into the event stream at certain intervals.
-type folderSummarySvc struct {
+type folderSummaryService struct {
 	*suture.Supervisor

 	cfg       *config.Wrapper
@@ -35,9 +35,9 @@ type folderSummarySvc struct {
 	lastEventReqMut sync.Mutex
 }

-func newFolderSummarySvc(cfg *config.Wrapper, m *model.Model) *folderSummarySvc {
-	svc := &folderSummarySvc{
-		Supervisor:      suture.NewSimple("folderSummarySvc"),
+func newFolderSummaryService(cfg *config.Wrapper, m *model.Model) *folderSummaryService {
+	service := &folderSummaryService{
+		Supervisor:      suture.NewSimple("folderSummaryService"),
 		cfg:             cfg,
 		model:           m,
 		stop:            make(chan struct{}),
@@ -47,20 +47,20 @@ func newFolderSummarySvc(cfg *config.Wrapper, m *model.Model) *folderSummarySvc
 		lastEventReqMut: sync.NewMutex(),
 	}

-	svc.Add(serviceFunc(svc.listenForUpdates))
-	svc.Add(serviceFunc(svc.calculateSummaries))
+	service.Add(serviceFunc(service.listenForUpdates))
+	service.Add(serviceFunc(service.calculateSummaries))

-	return svc
+	return service
 }

-func (c *folderSummarySvc) Stop() {
+func (c *folderSummaryService) Stop() {
 	c.Supervisor.Stop()
 	close(c.stop)
 }

 // listenForUpdates subscribes to the event bus and makes note of folders that
 // need their data recalculated.
-func (c *folderSummarySvc) listenForUpdates() {
+func (c *folderSummaryService) listenForUpdates() {
 	sub := events.Default.Subscribe(events.LocalIndexUpdated | events.RemoteIndexUpdated | events.StateChanged)
 	defer events.Default.Unsubscribe(sub)

@@ -110,7 +110,7 @@ func (c *folderSummarySvc) listenForUpdates() {

 // calculateSummaries periodically recalculates folder summaries and
 // completion percentage, and sends the results on the event bus.
-func (c *folderSummarySvc) calculateSummaries() {
+func (c *folderSummaryService) calculateSummaries() {
 	const pumpInterval = 2 * time.Second
 	pump := time.NewTimer(pumpInterval)

@@ -139,7 +139,7 @@ func (c *folderSummarySvc) calculateSummaries() {

 // foldersToHandle returns the list of folders needing a summary update, and
 // clears the list.
-func (c *folderSummarySvc) foldersToHandle() []string {
+func (c *folderSummaryService) foldersToHandle() []string {
 	// We only recalculate summaries if someone is listening to events
 	// (a request to /rest/events has been made within the last
 	// pingEventInterval).
@@ -162,7 +162,7 @@ func (c *folderSummarySvc) foldersToHandle() []string {
 }

 // sendSummary send the summary events for a single folder
-func (c *folderSummarySvc) sendSummary(folder string) {
+func (c *folderSummaryService) sendSummary(folder string) {
 	// The folder summary contains how many bytes, files etc
 	// are in the folder and how in sync we are.
 	data := folderSummary(c.cfg, c.model, folder)
@@ -192,7 +192,7 @@ func (c *folderSummarySvc) sendSummary(folder string) {
 	}
 }

-func (c *folderSummarySvc) gotEventRequest() {
+func (c *folderSummaryService) gotEventRequest() {
 	c.lastEventReqMut.Lock()
 	c.lastEventReq = time.Now()
 	c.lastEventReqMut.Unlock()
--- a/cmd/syncthing/upnpservice.go
+++ b/cmd/syncthing/upnpservice.go
@@ -18,7 +18,7 @@ import (

 // The UPnP service runs a loop for discovery of IGDs (Internet Gateway
 // Devices) and setup/renewal of a port mapping.
-type upnpSvc struct {
+type upnpService struct {
 	cfg        *config.Wrapper
 	localPort  int
 	extPort    int
@@ -26,15 +26,15 @@ type upnpSvc struct {
 	stop       chan struct{}
 }

-func newUPnPSvc(cfg *config.Wrapper, localPort int) *upnpSvc {
-	return &upnpSvc{
+func newUPnPService(cfg *config.Wrapper, localPort int) *upnpService {
+	return &upnpService{
 		cfg:        cfg,
 		localPort:  localPort,
 		extPortMut: sync.NewMutex(),
 	}
 }

-func (s *upnpSvc) Serve() {
+func (s *upnpService) Serve() {
 	foundIGD := true
 	s.stop = make(chan struct{})

@@ -72,18 +72,18 @@ func (s *upnpSvc) Serve() {
 	}
 }

-func (s *upnpSvc) Stop() {
+func (s *upnpService) Stop() {
 	close(s.stop)
 }

-func (s *upnpSvc) ExternalPort() int {
+func (s *upnpService) ExternalPort() int {
 	s.extPortMut.Lock()
 	port := s.extPort
 	s.extPortMut.Unlock()
 	return port
 }

-func (s *upnpSvc) tryIGDs(igds []upnp.IGD, prevExtPort int) int {
+func (s *upnpService) tryIGDs(igds []upnp.IGD, prevExtPort int) int {
 	// Lets try all the IGDs we found and use the first one that works.
 	// TODO: Use all of them, and sort out the resulting mess to the
 	// discovery announcement code...
@@ -105,7 +105,7 @@ func (s *upnpSvc) tryIGDs(igds []upnp.IGD, prevExtPort int) int {
 	return 0
 }

-func (s *upnpSvc) tryIGD(igd upnp.IGD, suggestedPort int) (int, error) {
+func (s *upnpService) tryIGD(igd upnp.IGD, suggestedPort int) (int, error) {
 	var err error
 	leaseTime := s.cfg.Options().UPnPLeaseM * 60

--- a/cmd/syncthing/usage_report.go
+++ b/cmd/syncthing/usage_report.go
@@ -13,7 +13,6 @@ import (
 	"crypto/tls"
 	"encoding/json"
 	"fmt"
-	"net"
 	"net/http"
 	"runtime"
 	"sort"
@@ -61,9 +60,9 @@ func (m *usageReportingManager) VerifyConfiguration(from, to config.Configuratio
 func (m *usageReportingManager) CommitConfiguration(from, to config.Configuration) bool {
 	if to.Options.URAccepted >= usageReportVersion && m.sup == nil {
 		// Usage reporting was turned on; lets start it.
-		svc := newUsageReportingService(m.cfg, m.model)
+		service := newUsageReportingService(m.cfg, m.model)
 		m.sup = suture.NewSimple("usageReporting")
-		m.sup.Add(svc)
+		m.sup.Add(service)
 		m.sup.ServeBackground()
 	} else if to.Options.URAccepted < usageReportVersion && m.sup != nil {
 		// Usage reporting was turned off
@@ -79,7 +78,7 @@ func (m *usageReportingManager) String() string {
 }

 // reportData returns the data to be sent in a usage report. It's used in
-// various places, so not part of the usageReportingSvc object.
+// various places, so not part of the usageReportingManager object.
 func reportData(cfg *config.Wrapper, m *model.Model) map[string]interface{} {
 	res := make(map[string]interface{})
 	res["urVersion"] = usageReportVersion
@@ -122,10 +121,14 @@ func reportData(cfg *config.Wrapper, m *model.Model) map[string]interface{} {

 	var rescanIntvs []int
 	folderUses := map[string]int{
-		"readonly":      0,
-		"ignorePerms":   0,
-		"ignoreDelete":  0,
-		"autoNormalize": 0,
+		"readonly":            0,
+		"ignorePerms":         0,
+		"ignoreDelete":        0,
+		"autoNormalize":       0,
+		"simpleVersioning":    0,
+		"externalVersioning":  0,
+		"staggeredVersioning": 0,
+		"trashcanVersioning":  0,
 	}
 	for _, cfg := range cfg.Folders() {
 		rescanIntvs = append(rescanIntvs, cfg.RescanIntervalS)
@@ -142,6 +145,9 @@ func reportData(cfg *config.Wrapper, m *model.Model) map[string]interface{} {
 		if cfg.AutoNormalize {
 			folderUses["autoNormalize"]++
 		}
+		if cfg.Versioning.Type != "" {
+			folderUses[cfg.Versioning.Type+"Versioning"]++
+		}
 	}
 	sort.Ints(rescanIntvs)
 	res["rescanIntvs"] = rescanIntvs
@@ -184,8 +190,6 @@ func reportData(cfg *config.Wrapper, m *model.Model) map[string]interface{} {
 	for _, addr := range cfg.Options().GlobalAnnServers {
 		if addr == "default" || addr == "default-v4" || addr == "default-v6" {
 			defaultAnnounceServersDNS++
-		} else if stringIn(addr, config.DefaultDiscoveryServersIP) {
-			defaultAnnounceServersIP++
 		} else {
 			otherAnnounceServers++
 		}
@@ -221,15 +225,6 @@ func reportData(cfg *config.Wrapper, m *model.Model) map[string]interface{} {
 	return res
 }

-func stringIn(needle string, haystack []string) bool {
-	for _, s := range haystack {
-		if needle == s {
-			return true
-		}
-	}
-	return false
-}
-
 type usageReportingService struct {
 	cfg   *config.Wrapper
 	model *model.Model
@@ -249,19 +244,14 @@ func (s *usageReportingService) sendUsageReport() error {
 	var b bytes.Buffer
 	json.NewEncoder(&b).Encode(d)

-	transp := &http.Transport{}
-	client := &http.Client{Transport: transp}
-	if BuildEnv == "android" {
-		// This works around the lack of DNS resolution on Android... :(
-		transp.Dial = func(network, addr string) (net.Conn, error) {
-			return dialer.Dial(network, "194.126.249.13:443")
-		}
-	}
-
-	if s.cfg.Options().URPostInsecurely {
-		transp.TLSClientConfig = &tls.Config{
-			InsecureSkipVerify: true,
-		}
+	client := &http.Client{
+		Transport: &http.Transport{
+			Dial:  dialer.Dial,
+			Proxy: http.ProxyFromEnvironment,
+			TLSClientConfig: &tls.Config{
+				InsecureSkipVerify: s.cfg.Options().URPostInsecurely,
+			},
+		},
 	}
 	_, err := client.Post(s.cfg.Options().URURL, "application/json", &b)
 	return err
--- a/cmd/syncthing/verboseservice.go
+++ b/cmd/syncthing/verboseservice.go
@@ -15,25 +15,31 @@ import (

 // The verbose logging service subscribes to events and prints these in
 // verbose format to the console using INFO level.
-type verboseSvc struct {
+type verboseService struct {
 	stop    chan struct{} // signals time to stop
 	started chan struct{} // signals startup complete
 }

-func newVerboseSvc() *verboseSvc {
-	return &verboseSvc{
+func newVerboseService() *verboseService {
+	return &verboseService{
 		stop:    make(chan struct{}),
 		started: make(chan struct{}),
 	}
 }

 // Serve runs the verbose logging service.
-func (s *verboseSvc) Serve() {
+func (s *verboseService) Serve() {
 	sub := events.Default.Subscribe(events.AllEvents)
 	defer events.Default.Unsubscribe(sub)

-	// We're ready to start processing events.
-	close(s.started)
+	select {
+	case <-s.started:
+		// The started channel has already been closed; do nothing.
+	default:
+		// This is the first time around. Indicate that we're ready to start
+		// processing events.
+		close(s.started)
+	}

 	for {
 		select {
@@ -49,17 +55,17 @@ func (s *verboseSvc) Serve() {
 }

 // Stop stops the verbose logging service.
-func (s *verboseSvc) Stop() {
+func (s *verboseService) Stop() {
 	close(s.stop)
 }

 // WaitForStart returns once the verbose logging service is ready to receive
 // events, or immediately if it's already running.
-func (s *verboseSvc) WaitForStart() {
+func (s *verboseService) WaitForStart() {
 	<-s.started
 }

-func (s *verboseSvc) formatEvent(ev events.Event) string {
+func (s *verboseService) formatEvent(ev events.Event) string {
 	switch ev.Type {
 	case events.Ping, events.DownloadProgress, events.LocalIndexUpdated:
 		// Skip
@@ -96,7 +102,7 @@ func (s *verboseSvc) formatEvent(ev events.Event) string {
 		return fmt.Sprintf("Rejected unshared folder %q from device %v", data["folder"], data["device"])

 	case events.ItemStarted:
-		data := ev.Data.(map[string]interface{})
+		data := ev.Data.(map[string]string)
 		return fmt.Sprintf("Started syncing %q / %q (%v %v)", data["folder"], data["item"], data["action"], data["type"])
 	case events.ItemFinished:
 		data := ev.Data.(map[string]interface{})
--- a/debian/changelog
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+syncthing ({{.version}}); urgency=medium
+
+  * Packaging of {{.version}}.
+
+ -- Syncthing Release Management <release@syncthing.net>  {{.date}}
--- a/debian/compat
+++ b/debian/compat
@@ -0,0 +1 @@
+9
--- a/debian/control
+++ b/debian/control
@@ -0,0 +1,16 @@
+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/debian/postinst
+++ b/debian/postinst
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -euo pipefail
+
+if [[ ${1:-} == configure ]]; then
+	pkill -HUP -x syncthing || true
+fi
--- a/etc/linux-systemd/system/syncthing-resume.service
+++ b/etc/linux-systemd/system/syncthing-resume.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Restart Syncthing after resume
+After=suspend.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/pkill -HUP -x syncthing
+
+[Install]
+WantedBy=suspend.target
--- a/etc/linux-systemd/system/syncthing@.service
+++ b/etc/linux-systemd/system/syncthing@.service
@@ -6,10 +6,9 @@ Wants=syncthing-inotify@.service

 [Service]
 User=%i
-Environment=STNORESTART=yes
-ExecStart=/usr/bin/syncthing -no-browser -logflags=0
+ExecStart=/usr/bin/syncthing -no-browser -no-restart -logflags=0
 Restart=on-failure
-SuccessExitStatus=2 3 4
+SuccessExitStatus=3 4
 RestartForceExitStatus=3 4

 [Install]
--- a/etc/linux-systemd/user/syncthing.service
+++ b/etc/linux-systemd/user/syncthing.service
@@ -5,10 +5,9 @@ After=network.target
 Wants=syncthing-inotify.service

 [Service]
-Environment=STNORESTART=yes
-ExecStart=/usr/bin/syncthing -no-browser -logflags=0
+ExecStart=/usr/bin/syncthing -no-browser -no-restart -logflags=0
 Restart=on-failure
-SuccessExitStatus=2 3 4
+SuccessExitStatus=3 4
 RestartForceExitStatus=3 4

 [Install]
--- a/gui/assets/lang/lang-ro-RO.json
+++ b/gui/assets/lang/lang-ro-RO.json
@@ -1,225 +0,0 @@
-{
-    "A negative number of days doesn't make sense.": "A negative number of days doesn't make sense.",
-    "A new major version may not be compatible with previous versions.": "A new major version may not be compatible with previous versions.",
-    "API Key": "Cheie API",
-    "About": "Despre",
-    "Actions": "Actions",
-    "Add": "Adaugă",
-    "Add Device": "Adaugă Dispozitiv",
-    "Add Folder": "Adaugă Mapă",
-    "Add new folder?": "Adauga o mapă nouă?",
-    "Address": "Adresă",
-    "Addresses": "Adrese",
-    "Advanced": "Advanced",
-    "Advanced Configuration": "Configurari avansate",
-    "All Data": "Toate Datele",
-    "Allow Anonymous Usage Reporting?": "Permiteţi raportarea anonimă de folosire a aplicaţiei?",
-    "Alphabetic": "Alphabetic",
-    "An external command handles the versioning. It has to remove the file from the synced folder.": "O comandă externă administrează versiunile. Trebuie să şteargă documentul din fişierul sincronizat. ",
-    "Anonymous Usage Reporting": "Raport Anonim despre Folosirea Aplicației",
-    "Any devices configured on an introducer device will be added to this device as well.": "Toate dispozitivele configurate pe un dispozitiv iniţiator vor fi adăugate şi pe acest dispozitiv. ",
-    "Automatic upgrades": "Actualizare automată",
-    "Be careful!": "Fii atent!",
-    "Bugs": "Bug-uri",
-    "CPU Utilization": "CPU ",
-    "Changelog": "Noutăți",
-    "Clean out after": "Clean out after",
-    "Close": "Închide",
-    "Command": "Comandă",
-    "Comment, when used at the start of a line": "Comentariu, când este folosit la începutul unei linii",
-    "Compression": "Compresie",
-    "Connection Error": "Eroare de conexiune",
-    "Copied from elsewhere": "Copiat din altă parte",
-    "Copied from original": "Copiat  din original",
-    "Copyright © 2015 the following Contributors:": "Copyright ©2015 Următorii Contribuitori:",
-    "Danger!": "Danger!",
-    "Delete": "Şterge",
-    "Deleted": "Șters",
-    "Device ID": "ID Dispozitiv",
-    "Device Identification": "Identificare Dispozitiv",
-    "Device Name": "Nume Dispozitiv",
-    "Device {%device%} ({%address%}) wants to connect. Add new device?": "Dispozitivul{{dispoztiv}}({{adresă}})vrea sa se conecteze.Adaug un dispozitiv nou?",
-    "Devices": "Dispozitiv",
-    "Disconnected": "Deconectat",
-    "Discovery": "Discovery",
-    "Documentation": "Documentaţie",
-    "Download Rate": "Viteză de Descărcare",
-    "Downloaded": "Descărcat",
-    "Downloading": "Se descarcă",
-    "Edit": "Modifică",
-    "Edit Device": "Modifică Dispozitiv",
-    "Edit Folder": "Modifică Mapa",
-    "Editing": "Modificare",
-    "Enable UPnP": "Activează 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.": "Adaugă șabloanele de ignorare, câte una pe linie.",
-    "Error": "Eroare",
-    "External File Versioning": "Administrare externă a versiunilor documentului",
-    "Failed Items": "Failed Items",
-    "File Pull Order": "File Pull Order",
-    "File Versioning": "Versiune Fișier",
-    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Biții de autorizare sînt excluși cînd se analizează modificările. A se utiliza pe sisteme FAT. ",
-    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Files are moved to .stversions folder when replaced or deleted by Syncthing.",
-    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Documentele sînt mutate într-un fișier .stversions conținînd versiuni datate atunci cînd sînt șterse sau înlocuite de 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.": "Fișierele sunt protejate de schimbările făcute pe alte dispozitive dar schimbările efectuate pe acest dispozitiv vor fi trimise catre restul grupului.",
-    "Folder": "Mapă",
-    "Folder ID": "ID Mapă",
-    "Folder Master": "Master Măpi",
-    "Folder Path": "Locaţie Mapei",
-    "Folders": "Mapă",
-    "GUI": "GUI",
-    "GUI Authentication Password": "Parolă Interfaţă",
-    "GUI Authentication User": "User Interfaţă",
-    "GUI Listen Addresses": "Adresă Interfaţă",
-    "Generate": "Generează",
-    "Global Discovery": "Găsire Globală",
-    "Global Discovery Server": "Server pentru Găsirea Globală",
-    "Global State": "Status Global",
-    "Help": "Help",
-    "Home page": "Home page",
-    "Ignore": "Ignoră",
-    "Ignore Patterns": "Reguli de excludere",
-    "Ignore Permissions": "Ignoră Permisiuni",
-    "Incoming Rate Limit (KiB/s)": "Limită Viteză de Download (KB/s)",
-    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Incorrect configuration may damage your folder contents and render Syncthing inoperable.",
-    "Introducer": "Dispozitiv Inițiator",
-    "Inversion of the given condition (i.e. do not exclude)": "Inversarea condiției (de ex., nu exclude)",
-    "Keep Versions": "Păstrează Versiuni",
-    "Largest First": "Largest First",
-    "Last File Received": "Ultimul Fișier Primit",
-    "Last seen": "Ultima vizionare",
-    "Later": "Mai tîrziu",
-    "Local Discovery": "Găsire Locală",
-    "Local State": "Status Local",
-    "Local State (Total)": "Local State (Total)",
-    "Major Upgrade": "Major Upgrade",
-    "Maximum Age": "Vârsta Maximă",
-    "Metadata Only": "Doar Metadate",
-    "Minimum Free Disk Space": "Minimum Free Disk Space",
-    "Move to top of queue": "Mută la începutul listei",
-    "Multi level wildcard (matches multiple directory levels)": "Asterisc de nivel multiplu (corespunde fișierelor și sub-fișierelor)",
-    "Never": "Niciodată",
-    "New Device": "Dispozitiv Nou",
-    "New Folder": "Mapă Nouă",
-    "Newest First": "Newest First",
-    "No": "Nu",
-    "No File Versioning": "Fără versiuni ale documentelor",
-    "Notice": "Mențiuni",
-    "OK": "OK",
-    "Off": "Închis",
-    "Oldest First": "Oldest First",
-    "Options": "Opțiuni",
-    "Out of Sync": "Out of Sync",
-    "Out of Sync Items": "Elemente Nesincronizate",
-    "Outgoing Rate Limit (KiB/s)": "Limită Viteză de Upload (KB/s)",
-    "Override Changes": "Suprascrie Schimbări",
-    "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": "Localizarea fișierului în acest computer. Dacă nu există, va fi creat. Tilda (~) înlocuiește ",
-    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Locul unde vor fi stocate versiunile (a se lăsa neschimbat pentru fișierul .stversions din fișier). ",
-    "Pause": "Pauză",
-    "Paused": "Paused",
-    "Please consult the release notes before performing a major upgrade.": "Please consult the release notes before performing a major upgrade.",
-    "Please set a GUI Authentication User and Password in the Settings dialog.": "Please set a GUI Authentication User and Password in the Settings dialog.",
-    "Please wait": "Aşteaptă",
-    "Preview": "Previzualizează",
-    "Preview Usage Report": "Vezi raportul de utilizare",
-    "Quick guide to supported patterns": "Ghid rapid pentru regulile suportate",
-    "RAM Utilization": "RAM",
-    "Random": "Random",
-    "Relayed via": "Relayed via",
-    "Relays": "Relays",
-    "Release Notes": "Release Notes",
-    "Remove": "Remove",
-    "Rescan": "Rescanează",
-    "Rescan All": "Rescaneaza Tot",
-    "Rescan Interval": "Interval Scanare",
-    "Restart": "Restart",
-    "Restart Needed": "Restart Necesar",
-    "Restarting": "Se restartează",
-    "Resume": "Resume",
-    "Reused": "Refolosit",
-    "Save": "Salvează",
-    "Scan Time Remaining": "Scan Time Remaining",
-    "Scanning": "Scanează",
-    "Select the devices to share this folder with.": "Selectează dispozitivele pentru care să fie disponibil această mapă.",
-    "Select the folders to share with this device.": "Alege mapele pe care vrei sa le imparți cu acest dispozitiv.",
-    "Settings": "Setări",
-    "Share": "Împarte",
-    "Share Folder": "Împarte Mapa",
-    "Share Folders With Device": "Împarte Mapa Cu Dispozitivul",
-    "Share With Devices": "Împarte Cu Dispozitivul",
-    "Share this folder?": "Împarte această mapă?",
-    "Shared With": "Împarte Cu",
-    "Short identifier for the folder. Must be the same on all cluster devices.": "Identificator scurt al fișierului. Trebuie să fie același pe toate mașinile. ",
-    "Show ID": "Arată ID",
-    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Vizibil în locul ID-ului dispozitivului într-un grup. Va fi sugerat celorlalte dispozitive ca nume opţional. ",
-    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Vizibil în locul ID-ului dispozitivului într-un grup. Va fi înlocuit de numele sugerat de dispozitiv daca nu este completat. ",
-    "Shutdown": "Opreşte",
-    "Shutdown Complete": "Oprește Complet",
-    "Simple File Versioning": "Versiuni simple ale documentelor",
-    "Single level wildcard (matches within a directory only)": "Asterisc de nivel simplu (corespunde doar unui fişier)",
-    "Smallest First": "Smallest First",
-    "Source Code": "Cod Sursă",
-    "Staggered File Versioning": "Versiuni eşalonate ale documentelor",
-    "Start Browser": "Lansează Browser",
-    "Statistics": "Statistici",
-    "Stopped": "Oprit",
-    "Support": "Suport Tehnic",
-    "Sync Protocol Listen Addresses": "Adresa protocolului de sincronizare",
-    "Syncing": "Se sincronizează",
-    "Syncthing has been shut down.": "Sincronizarea a fost oprită.",
-    "Syncthing includes the following software or portions thereof:": "Syncthing include următoarele soft-uri sau părţi din ele:",
-    "Syncthing is restarting.": "Syncthing se restartează.",
-    "Syncthing is upgrading.": "Syncthing se actualizează.",
-    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing pare a fi oprit sau aveţi probleme cu conexiunea la internet. Reluare... ",
-    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing pare a avea probleme prelucrînd solicitarea dumneavoastră. Reîncărcaţi pagina sau porniţi Syncthing din nou dacă problema continuă. ",
-    "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 {%url%}.": "Statisticile în ansamblu sînt accesibile public la {{url}}.",
-    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Configuraţia a fost salvată dar nu şi activată. Syncthing trebuie să repornească pentru a activa noua configuraţie.",
-    "The device ID cannot be blank.": "ID-ul dispozitivului nu poate fi gol.",
-    "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-ul dispozitivului ce trebuie introdus aici poate fi aflat la \"Editează > Arată ID-ul\" pe celălalt dispozitiv. Spaţiile şi liniile oblice sînt opţionale (vor fi ignorate). ",
-    "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.": "Raportul codat de utilizare este trimit zilnic. Este folosit pentru studierea platformelor comune, dimensiunilor fişierelor şi versiunea aplicaţiilor. În cazul în care setul de date trimis este modificat, acest dialog va aparea din 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.": "ID-ul dispozitivului nu pare a fi valid.El trebuie sa fie format dintrun șir din 52 ori 56 de caractere formate din litere și cifre, cu spatii și linii opțional.",
-    "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.": "ID-ul mapei nu poate fi gol.",
-    "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.": "ID-ul mapei trebuie să fie unic.",
-    "The folder path cannot be blank.": "Locaţia mapei nu poate fi goală.",
-    "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.",
-    "The following items could not be synchronized.": "The following items could not be synchronized.",
-    "The maximum age must be a number and cannot be blank.": "Vârsta maximă trebuie să fie un număr şi nu poate fi goală.",
-    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Câte zile să se păstreze o versiune (setează 0 pentru nelimitat)",
-    "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 number of days must be a number and cannot be blank.": "The number of days must be a number and cannot be blank.",
-    "The number of days to keep files in the trash can. Zero means forever.": "Numărul de zile pentru a păstra fișierele in urnă.Zero înseamnă permanent.",
-    "The number of old versions to keep, per file.": "Numărul de versiuni vechi de salvat per fişier.",
-    "The number of versions must be a number and cannot be blank.": "Numărul de versiuni trebuie să fie un număr şi nu poate fi gol.",
-    "The path cannot be blank.": "Locația nu poate fi goală.",
-    "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
-    "The rescan interval must be a non-negative number of seconds.": "Intervalul de rescanare trebuie să nu fie un număr negativ de secunde. ",
-    "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 can easily give hackers access to read and change any files on your computer.": "This can easily give hackers access to read and change any files on your computer.",
-    "This is a major version upgrade.": "This is a major version upgrade.",
-    "Trash Can File Versioning": "Trash Can File Versioning",
-    "Unknown": "Necunoscut",
-    "Unshared": "Neîmpărțit",
-    "Unused": "Nefolosit",
-    "Up to Date": "La Zi",
-    "Updated": "Updated",
-    "Upgrade": "Upgrade",
-    "Upgrade To {%version%}": "Actualizează La Versiunea {{version}}",
-    "Upgrading": "Se Actualizează",
-    "Upload Rate": "Viteză Upload",
-    "Uptime": "Uptime",
-    "Use HTTPS for GUI": "Foloseşte HTTPS pentru interfaţă",
-    "Version": "Versiune",
-    "Versions Path": "Locaţie Versiuni",
-    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Versiunile sînt şterse în mod automat dacă sînt mai vechi decît vîrsta maximă sau depăşesc numărul de documente permise într-un anume interval. ",
-    "When adding a new device, keep in mind that this device must be added on the other side too.": "Când adaugi un dispozitiv nou, trebuie să adaugi şi dispozitivul curent în dispozitivul nou.",
-    "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.": "Cînd adăugaţi un fişier nou, nu uitaţi că ID-ul fişierului va rămîne acelaşi pe toate dispozitivele. Iar literele mari sînt diferite de literele mici. ",
-    "Yes": "Da",
-    "You must keep at least one version.": "Trebuie să păstrezi cel puţin o versiune.",
-    "days": "Zile",
-    "full documentation": "toată documentaţia",
-    "items": "obiecte",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{Dispozitivul}} vrea să transmită mapa {{Mapa}}"
-}
--- a/gui/assets/lang/prettyprint.js
+++ b/gui/assets/lang/prettyprint.js
@@ -1 +0,0 @@
-var langPrettyprint = {"bg":"Bulgarian","ca":"Catalan","ca@valencia":"Catalan (Valencian)","cs":"Czech","de":"German","el":"Greek","en":"English","en-GB":"English (United Kingdom)","es":"Spanish","es-ES":"Spanish (Spain)","fi":"Finnish","fr":"French","fr-CA":"French (Canada)","fy":"Western Frisian","hu":"Hungarian","it":"Italian","ja":"Japanese","ko-KR":"Korean (Korea)","lt":"Lithuanian","nb":"Norwegian Bokmål","nl":"Dutch","nn":"Norwegian Nynorsk","pl":"Polish","pt-BR":"Portuguese (Brazil)","pt-PT":"Portuguese (Portugal)","ro-RO":"Romanian (Romania)","ru":"Russian","sv":"Swedish","uk":"Ukrainian","zh-CN":"Chinese (China)","zh-TW":"Chinese (Taiwan)"}
--- a/gui/assets/lang/valid-langs.js
+++ b/gui/assets/lang/valid-langs.js
@@ -1 +0,0 @@
-var validLangs = ["bg","ca","ca@valencia","cs","de","el","en","en-GB","es","es-ES","fi","fr","fr-CA","fy","hu","it","ja","ko-KR","lt","nb","nl","nn","pl","pt-BR","pt-PT","ro-RO","ru","sv","uk","zh-CN","zh-TW"]
--- a/gui/dark/assets/css/overrides.css
+++ b/gui/dark/assets/css/overrides.css
@@ -0,0 +1,475 @@
+/*
+// Copyright (C) 2014 The Syncthing Authors.
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this file,
+// You can obtain one at http://mozilla.org/MPL/2.0/.
+
+*/
+
+body {
+    padding-bottom: 70px;
+    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+
+h1, h2, h3, h4, h5 {
+    font-family: "Raleway", "Helvetica Neue", Helvetica, Arial, sans-serif;
+    line-height: 1.25;
+}
+
+ul+h5 {
+    margin-top: 1.5em;
+}
+
+#content {
+    margin-bottom: 50px;
+}
+
+.panel-progress {
+    background: #3498db;
+    height: 3px;
+    left: 0;
+    position: absolute;
+    top: 0;
+    display: block;
+}
+
+.panel-title {
+    position: relative;
+    text-overflow: ellipsis;
+    overflow: hidden;
+}
+
+identicon {
+    display: inline-block;
+    position: relative;
+    width: 1em;
+    height: 1em;
+    line-height: 1;
+    margin-right: 5px;
+}
+
+.identicon {
+    width: 1em;
+    height: 1em;
+}
+
+.identicon rect {
+    fill: #333;
+}
+
+.checkbox {
+    margin-top: 0px;
+}
+
+.checkbox input[type="checkbox"], .radio input[type="radio"] {
+    float: none; /* issue #1197 */
+}
+
+.popover {
+    max-width: none;
+    min-width: 250px;
+}
+
+.panel-heading .fa, .modal-header .fa {
+    margin-right: 10px;
+}
+
+.panel-heading {
+    position: relative;
+    overflow: hidden;
+}
+
+.text-monospace {
+    font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
+}
+
+.table-condensed>thead>tr>th, .table-condensed>tbody>tr>th, .table-condensed>tfoot>tr>th, .table-condensed>thead>tr>td, .table-condensed>tbody>tr>td, .table-condensed>tfoot>tr>td {
+    border-top: none;
+}
+
+.logo {
+    margin: 0;
+    padding: 0;
+    top: -5px;
+    position: relative;
+}
+
+.list-no-bullet {
+    list-style-type: none
+}
+
+.li-column {
+    display: inline-block;
+    min-width: 7em;
+    margin-right: 1em;
+    background-color: rgb(236, 240, 241);
+    border-radius: 3px;
+    padding: 1px 4px;
+    margin: 2px 2px;
+}
+.li-column span.data {
+    margin-left: 0.5em;
+    min-width: 10em;
+    text-align: right;
+    display: inline-block;
+}
+
+.ng-cloak {
+    display: none !important;
+}
+
+.table th {
+    white-space: nowrap;
+    font-weight: 400;
+}
+
+.table td {
+    padding-left: 20px !important;
+}
+
+.table td.small-data {
+    white-space: nowrap;
+}
+
+table.table-condensed {
+    table-layout: fixed;
+}
+table.table-condensed td {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+@media (max-width:767px) {
+    table.table-condensed td {
+        /* for mobile phones to allow linebreaks in long repro folder/shared with
+        * columns. */
+        white-space: normal;
+    }
+}
+
+.navbar-right {
+    /* to align with panel */
+    padding-right: 15px;
+}
+
+/**
+ * Menu for select language
+ */
+
+@media (min-width:480px) and (max-width:649px) {
+    *[language-select] > .dropdown-menu {
+        width: 230px;
+    }
+}
+
+@media (min-width:650px) {
+    *[language-select] > .dropdown-menu > li {
+        width: 50%;
+        float: left;
+    }
+    *[language-select] > .dropdown-menu {
+        width: 440px;
+    }
+}
+
+
+@media (max-width:479px) {
+    .dropdown-menu {
+        padding-top: 55px;
+    }
+
+    nav .dropdown-toggle {
+        font-size: 14px;
+    }
+
+    .dropdown-toggle {
+        float: left;
+    }
+
+    .navbar-brand {
+        padding-left: 0;
+        padding-top: 16px;
+    }
+
+    .navbar-nav .open .dropdown-menu > li > a {
+        padding: 12px 15px 12px 25px;
+    }
+}
+
+
+.panel-body .table-condensed {
+    margin-bottom: 0;
+}
+
+.dl-horizontal.dl-narrow dt {
+    width: 40px;
+}
+
+.dl-horizontal.dl-narrow dd {
+    margin-left: 60px;
+}
+
+/**
+ * Progress bars with centered text
+ */
+
+.progress {
+    margin-bottom: 0px;
+    position: relative;
+}
+
+.progress span.frontal {
+    text-align: center;
+    position: absolute;
+    display: block;
+    width: 100%;
+}
+
+.three-columns {
+    -webkit-column-count: 3;
+    -moz-column-count: 3;
+    column-count: 3;
+}
+
+.two-columns {
+    -webkit-column-count: 2;
+    -moz-column-count: 2;
+    column-count: 2;
+}
+
+ul.three-columns li, ul.two-columns li {
+    padding-left: 0.5em;
+    text-indent: -0.5em;
+}
+
+/** Footer nav on small devices **/
+
+@media (max-width: 1199px) {
+    body {
+        padding-bottom: 0;
+    }
+
+    .navbar-fixed-bottom {
+        position: static;
+    }
+}
+
+
+/**
+
+Dark theme customizations start here.
+
+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-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 !important;
+}
+
+/* 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-color: #222 !important;
+    background-color: #222;
+}
+
+.modal-content {
+    border-color: #666 !important;
+    border-width: 2px !important;
+    background-color: #111 !important;
+}
+
+.modal-footer {
+    border-color: #111 !important;
+    background-color: #111 !important;
+}
+
+.alert-warning {
+    background-color: #c29d0b !important;
+}
+
+.alert-danger {
+    background-color: #d62c1a !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"] { /* 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;
+}
+
+
+/* progess 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;
+}
--- a/gui/default/assets/css/overrides.css
+++ b/gui/default/assets/css/overrides.css
@@ -39,6 +39,9 @@ ul+h5 {
    text-overflow: ellipsis;
    overflow: hidden;
 }
+.panel-title a:hover {
+  text-decoration: none;
+}

 identicon {
    display: inline-block;
@@ -245,12 +248,33 @@ ul.three-columns li, ul.two-columns li {

 /** Footer nav on small devices **/

-@media (max-width: 991px) {
+@media (max-width: 1199px) {
+    /* Stay at the end of the page, with space reserved for the footer
+    usually taking up two rows. */
+
+    html {
+        position: relative;
+        min-height: 100%;
+    }
+
    body {
-        padding-bottom: 0;
+        padding-bottom: 60px;
    }

    .navbar-fixed-bottom {
-        position: static;
+        position: absolute;
    }
 }
+
+@media (max-width: 768px) {
+    /* Layout after the normal contents, as this is when the footer switches
+    to a vertical layout. */
+
+    body {
+        padding-bottom: 0px;
+    }
+
+    .navbar-fixed-bottom {
+        position: relative;
+    }
+}
--- a/gui/default/assets/font/raleway-500.woff
+++ b/gui/default/assets/font/raleway-500.woff
--- a/gui/default/assets/font/raleway.css
+++ b/gui/default/assets/font/raleway.css
--- a/gui/default/assets/img/favicon.png
+++ b/gui/default/assets/img/favicon.png
--- a/gui/default/assets/img/logo-horizontal.svg
+++ b/gui/default/assets/img/logo-horizontal.svg
--- a/gui/default/assets/img/safari-pinned-tab.svg
+++ b/gui/default/assets/img/safari-pinned-tab.svg
--- a/gui/default/assets/lang/README-FIRST.txt
+++ b/gui/default/assets/lang/README-FIRST.txt
--- a/gui/default/assets/lang/lang-bg.json
+++ b/gui/default/assets/lang/lang-bg.json
@@ -1,4 +1,5 @@
 {
+    "A device with that ID is already added.": "Устройство с това ID е вече добавено.",
    "A negative number of days doesn't make sense.": "Няма логика в задаването на отрицателен брой дни.",
    "A new major version may not be compatible with previous versions.": "Нова основна версия, която може да не е съвмеситима с предишни версии.",
    "API Key": "API Ключ",
@@ -7,11 +8,13 @@
    "Add": "Добави",
    "Add Device": "Добави устройство",
    "Add Folder": "Добави папка",
+    "Add Remote Device": "Добави отдалечено устройство",
    "Add new folder?": "Добави нова папка?",
    "Address": "Адрес",
    "Addresses": "Адреси",
    "Advanced": "Допълнителни",
    "Advanced Configuration": "Допълнителни настройки",
+    "Advanced settings": "Допълнителни настройки",
    "All Data": "Всички данни",
    "Allow Anonymous Usage Reporting?": "Разреши анонимно докладване за употребата на програмата?",
    "Alphabetic": "Азбучен ред",
@@ -31,10 +34,12 @@
    "Connection Error": "Грешка при свързването",
    "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": "Име на устройство",
@@ -50,6 +55,8 @@
    "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.": "Добави шаблони за игнориране, по един на ред.",
@@ -64,6 +71,7 @@
    "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 Master": "Главна папка",
    "Folder Path": "Път до папката",
    "Folders": "Папки",
@@ -74,6 +82,7 @@
    "Generate": "Генерирай",
    "Global Discovery": "Глобално откриване",
    "Global Discovery Server": "Сървър за глобално откриване",
+    "Global Discovery Servers": "Сървъри за глобално откриване",
    "Global State": "Глобално състояние",
    "Help": "Помощ",
    "Home page": "Начална страница",
@@ -108,6 +117,7 @@
    "OK": "ОК",
    "Off": "Изключено",
    "Oldest First": "Първо най-старите",
+    "Optional descriptive label for the folder. Can be different on each device.": "Допълнително разяснеие за етикета на папката. Може да бъде различно всяко устройство.",
    "Options": "Настройки",
    "Out of Sync": "Несинхронизирано",
    "Out of Sync Items": "Несинхронизирани елементи",
@@ -125,10 +135,13 @@
    "Quick guide to supported patterns": "Бърз наръчник към поддържаните шаблони",
    "RAM Utilization": "RAM в употреба",
    "Random": "Произволен",
+    "Relay Servers": "Препращащи сървъри",
    "Relayed via": "Препратено през",
    "Relays": "Препращачи",
    "Release Notes": "Бележки по обновяването",
+    "Remote Devices": "Отделечени устройства",
    "Remove": "Премахни",
+    "Required identifier for the folder. Must be the same on all cluster devices.": "Задължителен идентификатор за тази папка. Трябва да бъде един и същ на всички устройства.",
    "Rescan": "Сканирай повторно",
    "Rescan All": "Сканирай повторно всички",
    "Rescan Interval": "Интервал за повторно сканиране",
@@ -151,6 +164,7 @@
    "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.": "Покажи вместо идентификатор на устройството в статус на клъстъра. Ще бъде предлагано на други комютри като име по подразбиране.",
    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Покажи вместо идентификатор на устройството в статус на клъстъра. Ще бъде обновено с името по подразбиране изпратено от другия компютър.",
    "Shutdown": "Спри програмата",
@@ -176,6 +190,7 @@
    "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 символа и да се състои от букви и цифри, като интервалите и тиретата са пожелание.",
@@ -197,6 +212,7 @@
    "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 can easily give hackers access to read and change any files on your computer.": "Това дава лесен достъп на хакери да разглеждат и променят всякакви файлове на компютъра Ви.",
    "This is a major version upgrade.": "Това е нова основна версия.",
    "Trash Can File Versioning": "Само на файловете в кошчето",
@@ -214,6 +230,7 @@
    "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%}\".": "Внимание, това е вътрешна папка на вече съществуваща папка \"{{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": "Да",
@@ -221,5 +238,7 @@
    "days": "дни",
    "full documentation": "пълна документация",
    "items": "елемента",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} желае да сподели папка \"{{folder}}\"."
+    "{%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
@@ -1,5 +1,6 @@
 {
-    "A negative number of days doesn't make sense.": "A negative number of days doesn't make sense.",
+    "A device with that ID is already added.": "Ja s'ha afegit un dispositiu amb aquesta ID.",
+    "A negative number of days doesn't make sense.": "Un nombre negatiu de dies no té sentit.",
    "A new major version may not be compatible with previous versions.": "Una nova versió major pot ser incompatible amb versions anteriors.",
    "API Key": "Clau API",
    "About": "Sobre",
@@ -7,11 +8,13 @@
    "Add": "Afegir",
    "Add Device": "Afegir dispositiu",
    "Add Folder": "Afegir carpeta",
+    "Add Remote Device": "Add Remote Device",
    "Add new folder?": "Afegir nova carpeta?",
    "Address": "Adreça",
    "Addresses": "Adreces",
-    "Advanced": "Advanced",
-    "Advanced Configuration": "Advanced Configuration",
+    "Advanced": "Avançat",
+    "Advanced Configuration": "Configuració Avançada",
+    "Advanced settings": "Advanced settings",
    "All Data": "Totes les dades",
    "Allow Anonymous Usage Reporting?": "Permetre l'enviament anònim d'informes d'ús?",
    "Alphabetic": "Alfabètic",
@@ -19,11 +22,11 @@
    "Anonymous Usage Reporting": "Informe anònim d'ús",
    "Any devices configured on an introducer device will be added to this device as well.": "Qualsevol dispositiu configurat en un dispositiu introductor també s'afegirà a aquest dispositiu.",
    "Automatic upgrades": "Actualitzacions automàtiques",
-    "Be careful!": "Be careful!",
+    "Be careful!": "Ves amb compte!",
    "Bugs": "Bugs",
    "CPU Utilization": "Utilització del CPU",
    "Changelog": "Historial de canvis",
-    "Clean out after": "Clean out after",
+    "Clean out after": "Netejar després",
    "Close": "Tancar",
    "Command": "Comando",
    "Comment, when used at the start of a line": "Comentari quan és usat al principi d'una línia",
@@ -31,17 +34,19 @@
    "Connection Error": "Error de connexió",
    "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!": "Danger!",
+    "Danger!": "Perill!",
    "Delete": "Esborrar",
-    "Deleted": "Deleted",
+    "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",
-    "Discovery": "Discovery",
+    "Discovery": "Descobriment",
    "Documentation": "Documentació",
    "Download Rate": "Tasca de descarrega",
    "Downloaded": "Descarregat",
@@ -50,21 +55,24 @@
    "Edit Device": "Modificar dispositiu",
    "Edit Folder": "Modificar carpeta",
    "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.": "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.": "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",
    "External File Versioning": "Versionat de fitxers extern",
-    "Failed Items": "Failed Items",
+    "Failed Items": "Elements fallats",
    "File Pull Order": "Ordre d'agafar fitxers",
    "File Versioning": "Versionat de Fitxers",
    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Els bits de permisos dels fitxers son ignorats quan es cerquen canvis. Utilitzar en sistemes de fitxers FAT.",
-    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Files are moved to .stversions folder when replaced or deleted by Syncthing.",
+    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Els fitxers són moguts a la carpeta .stversions quan són reemplaçats o esborrats per Syncthing.",
    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Els fitxers es mouen amb l'estampat de la data a la carpeta .stversions quan son substituïts o esborrats per 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.": "Els fitxers estan protegits de canvis fets per altres dispositius, però els canvis fets en aquest dispositiu seran enviats a la resta del cluster.",
-    "Folder": "Folder",
+    "Folder": "Carpeta",
    "Folder ID": "ID de carpeta",
-    "Folder Master": "Carpeta mestre",
+    "Folder Label": "Folder Label",
+    "Folder Master": "Carpeta mestra",
    "Folder Path": "Camí de carpeta",
    "Folders": "Carpetes",
    "GUI": "GUI",
@@ -74,14 +82,15 @@
    "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",
-    "Home page": "Home page",
+    "Home page": "Pàgina d'inici",
    "Ignore": "Ignorar",
    "Ignore Patterns": "Patrons d'ignoració",
    "Ignore Permissions": "Ignora Permisos",
-    "Incoming Rate Limit (KiB/s)": "Tasca Límit d'Entrada (KiB/s)",
-    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Incorrect configuration may damage your folder contents and render Syncthing inoperable.",
+    "Incoming Rate Limit (KiB/s)": "Límit de velocitat d'entrada (KiB/s)",
+    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Una configuració incorrecta pot malmetre els continguts de la teva carpeta i que Syncthing esdevingui inoperatiu.",
    "Introducer": "Introductor",
    "Inversion of the given condition (i.e. do not exclude)": "Inversió del patrò introduït",
    "Keep Versions": "Mantenir Versions",
@@ -91,11 +100,11 @@
    "Later": "Després",
    "Local Discovery": "Descobriment Local",
    "Local State": "Estat local",
-    "Local State (Total)": "Local State (Total)",
+    "Local State (Total)": "Estat local (Total)",
    "Major Upgrade": "Actualització major",
    "Maximum Age": "Antiguitat Màxima",
    "Metadata Only": "Només metadades",
-    "Minimum Free Disk Space": "Minimum Free Disk Space",
+    "Minimum Free Disk Space": "Espai de disc lliure mínim",
    "Move to top of queue": "Moure al primer de la cua",
    "Multi level wildcard (matches multiple directory levels)": "Caràcter comodí de nivell múltiple (aparella en carpetes de nivells múltiples)",
    "Never": "Mai",
@@ -108,37 +117,41 @@
    "OK": "OK",
    "Off": "Desactivar",
    "Oldest First": "Més antic primer",
-    "Options": "Options",
-    "Out of Sync": "Out of Sync",
+    "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": "Opcions",
+    "Out of Sync": "Fora de sincronia",
    "Out of Sync Items": "Arxius encara no sincronitzats",
-    "Outgoing Rate Limit (KiB/s)": "Tasca Límit de Sortida (KiB/s)",
+    "Outgoing Rate Limit (KiB/s)": "Límit de velocitat de sortida (KiB/s)",
    "Override Changes": "Sobreescriure Canvis",
    "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Ruta de la carpeta a l'equip local. Si no existeix serà creada. El caràcter (~) es pot fer servir com a drecera de",
    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Ruta on les versions s'haurien de guardar (deixa-ho buit per fer servir el directori .stversions per defecte a la carpeta)",
-    "Pause": "Pause",
-    "Paused": "Paused",
+    "Pause": "Pausa",
+    "Paused": "Pausat",
    "Please consult the release notes before performing a major upgrade.": "Si us plau consulta les notes de llançament abans de realitzar una actualització major.",
-    "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.": "Si us plau, estableix un usuari i contrasenya al GUI a través del quadre de diàleg de configuració.",
    "Please wait": "Si-us-plau espera",
    "Preview": "Vista prèvia",
    "Preview Usage Report": "Vista Prèvia de l'Informe d'Ús",
    "Quick guide to supported patterns": "Guia ràpida per als possibles patrons",
    "RAM Utilization": "Utilització de la RAM",
    "Random": "Aleatori",
-    "Relayed via": "Relayed via",
-    "Relays": "Relays",
+    "Relay Servers": "Relay Servers",
+    "Relayed via": "Retransmés a través",
+    "Relays": "Repetidors",
    "Release Notes": "Notes de llançament",
-    "Remove": "Remove",
+    "Remote Devices": "Remote Devices",
+    "Remove": "Esborrar",
+    "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": "Re-escanejar",
    "Rescan All": "Re-escanejar tot",
    "Rescan Interval": "Interval de re-escaneig",
    "Restart": "Reiniciar",
    "Restart Needed": "És Necessari Reiniciar",
    "Restarting": "Reiniciant",
-    "Resume": "Resume",
+    "Resume": "Reprendre",
    "Reused": "Reutilitzat",
    "Save": "Guardar",
-    "Scan Time Remaining": "Scan Time Remaining",
+    "Scan Time Remaining": "Temps d'escanejat restant",
    "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.",
@@ -151,6 +164,7 @@
    "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.",
    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Mostrat en comptes del ID del Node en l'estat del cluster. S'actualitzarà al nom del dispositiu si es deixa buit.",
    "Shutdown": "Apagar",
@@ -161,7 +175,7 @@
    "Source Code": "Codi Font",
    "Staggered File Versioning": "Versionat de Fitxers Esglaonat",
    "Start Browser": "Arrancar Navegador",
-    "Statistics": "Statistics",
+    "Statistics": "Estadístiques",
    "Stopped": "Aturat",
    "Support": "Suport",
    "Sync Protocol Listen Addresses": "Adreça d'escolta del Protocol Sync",
@@ -172,10 +186,11 @@
    "Syncthing is upgrading.": "Actualitzant syncthing.",
    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Synthing sembla parat, o hi ha algun problema amb la connexió a Internet. Reintentant...",
    "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.": "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.": "La interfície d'administració de Syncthing està configurada per permetre l'accés remot sense contrasenya.",
    "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.",
@@ -185,26 +200,27 @@
    "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.",
-    "The following items could not be synchronized.": "The following items could not be synchronized.",
+    "The following items could not be synchronized.": "Els següents elements no es poden sincronitzar.",
    "The maximum age must be a number and cannot be blank.": "La màxima antiguitat ha de ser un número i no pot estar en blanc.",
    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Temps màxim en mantenir una versió (en dies, si es deixa en 0 es mantenen les versions per sempre).",
-    "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 number of days must be a number and cannot be blank.": "The number of days must be a number and cannot be blank.",
-    "The number of days to keep files in the trash can. Zero means forever.": "The number of days to keep files in the trash can. Zero means forever.",
+    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "El percentatge d'espai de disc lliure mínim ha de ser un nombre positiu entre 0 i 100 (inclosos).",
+    "The number of days must be a number and cannot be blank.": "El nombre de dies ha de ser un número i no pot estar en blanc.",
+    "The number of days to keep files in the trash can. Zero means forever.": "El nombre de dies per guardar els fitxers a la paperera. Zero significa per sempre.",
    "The number of old versions to keep, per file.": "El nombre de versions antigues que es mantenen per fitxer.",
    "The number of versions must be a number and cannot be blank.": "El nombre de versions ha de ser un número i no es pot deixar en blanc.",
    "The path cannot be blank.": "El camí no pot estar en blanc.",
-    "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
+    "The rate limit must be a non-negative number (0: no limit)": "El límit de velocitat ha de ser un nombre positiu (0: sense límit)",
    "The rescan interval must be a non-negative number of seconds.": "El interval de re-escaneig ha der ser un nombre positiu de segons.",
-    "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 can easily give hackers access to read and change any files on your computer.": "This can easily give hackers access to read and change any files on your computer.",
+    "They are retried automatically and will be synced when the error is resolved.": "Són reintentats automàticament i seran sincronitzats quan l'error estigui resolt.",
+    "This Device": "This Device",
+    "This can easily give hackers access to read and change any files on your computer.": "Això pot donar facilment accés a hackers per llegir i canviar qualsevol fitxer del teu ordinador.",
    "This is a major version upgrade.": "Aquesta és una actualització de versió major.",
-    "Trash Can File Versioning": "Trash Can File Versioning",
+    "Trash Can File Versioning": "Paperera de versionat de fitxers",
    "Unknown": "Desconegut",
    "Unshared": "No compartit",
    "Unused": "No usat",
    "Up to Date": "Actualitzat",
-    "Updated": "Updated",
+    "Updated": "Actualitzat",
    "Upgrade": "Actualització",
    "Upgrade To {%version%}": "Actualitzar a {{version}}",
    "Upgrading": "Actualitzant",
@@ -214,12 +230,15 @@
    "Version": "Versió",
    "Versions Path": "Carpeta de les 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 son automàticament eliminades si son més antigues que el màxim d'antiguitat o si excedeixen del nombre de fitxers permesos en un interval.",
+    "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.": "Quan s'afegeix un nou dispositiu, recorda que aquest dispositiu tambè s'ha d'afegir a l'altre banda.",
    "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.": "Quan s'afegeix una nova carpeta recorda que el ID d'aquesta s'utilitza per lligar repositoris entre els dispositius. Es distingeix entre majúscules i minúscules i ha de ser exactament iguals entre tots els dispositius.",
    "Yes": "Si",
    "You must keep at least one version.": "Has de mantenir com a mínim una versió.",
-    "days": "days",
+    "days": "dies",
    "full documentation": "documentació sencera",
    "items": "Elements",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} vol compartir la carpeta \"{{folder}}\"."
+    "{%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
@@ -1,4 +1,5 @@
 {
+    "A device with that ID is already added.": "Un dispositiu amb eixa ID ja s'ha afegit.",
    "A negative number of days doesn't make sense.": "Un nombre negatiu de dies no té sentit.",
    "A new major version may not be compatible with previous versions.": "Una nova versión amb canvis importants pot no ser compatible amb versions prèvies.",
    "API Key": "Clau API",
@@ -7,11 +8,13 @@
    "Add": "Afegir",
    "Add Device": "Afegir dispositiu",
    "Add Folder": "Afegir carpeta",
+    "Add Remote Device": "Afegir Dispositiu Remot.",
    "Add new folder?": "Afegir nova carpeta?",
    "Address": "Direcció",
    "Addresses": "Direccions",
-    "Advanced": "Advanced",
-    "Advanced Configuration": "Advanced Configuration",
+    "Advanced": "Avançat",
+    "Advanced Configuration": "Configuració avançada",
+    "Advanced settings": "Ajustos avançats.",
    "All Data": "Totes les dades",
    "Allow Anonymous Usage Reporting?": "Permetre informes d'ús anònim?",
    "Alphabetic": "Alfabètic",
@@ -19,7 +22,7 @@
    "Anonymous Usage Reporting": "Informe d'ús anònim",
    "Any devices configured on an introducer device will be added to this device as well.": "Tots els dispositius configurats en un dispositiu presentador seràn afegits també a aquest dispositiu.",
    "Automatic upgrades": "Actualitzacions automàtiques",
-    "Be careful!": "Be careful!",
+    "Be careful!": "Tin precaució!",
    "Bugs": "Errors (Bugs)",
    "CPU Utilization": "Utilització de la CPU",
    "Changelog": "Registre de canvis",
@@ -31,17 +34,19 @@
    "Connection Error": "Error 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!": "Danger!",
+    "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",
-    "Discovery": "Discovery",
+    "Discovery": "Descobriment",
    "Documentation": "Documentació",
    "Download Rate": "Velocitat de descàrrega",
    "Downloaded": "Descarregat",
@@ -50,38 +55,42 @@
    "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.": "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.": "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",
    "External File Versioning": "Versionat extern de fitxers",
-    "Failed Items": "Failed Items",
+    "Failed Items": "Objectes fallits",
    "File Pull Order": "Ordre de fitxers del pull",
    "File Versioning": "Versionat de fitxer",
    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Els bits de permís del fitxer són ignorats quant es busquen els canvis. Utilitzar en sistemes de fitxers FAT.",
    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Els arxius es menejen a la carpeta .stversions quant són substituïts o esborrats per Syncthing.",
    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Els fitxers són canviats a versions amb indicació de data en una carpeta \".stversions\" quant són reemplaçats o esborrats per 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.": "Els fitxers són protegits dels canvis fets en altres dispositius, però els canvis fets en aquest dispositiu seràn enviats a la resta del grup (cluster).",
-    "Folder": "Folder",
+    "Folder": "Carpeta",
    "Folder ID": "ID de carpeta",
+    "Folder Label": "Etiqueta de la Carpeta",
    "Folder Master": "Carpeta principal",
    "Folder Path": "Ruta de la carpeta",
    "Folders": "Carpetes",
-    "GUI": "GUI",
+    "GUI": "IGU (Interfície Gràfica d'Usuari)",
    "GUI Authentication Password": "Password d'autenticació de l'Interfície Gràfica d'Usuari (GUI)",
    "GUI Authentication User": "Autenticació de l'usuari de l'Interfície Gràfica d'Usuari (GUI)",
    "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 Server": "Servidor de Descobriment Global",
+    "Global Discovery Servers": "Servidors de Descobriment Global",
    "Global State": "Estat global",
    "Help": "Ajuda",
-    "Home page": "Home page",
+    "Home page": "Pàgina inicial",
    "Ignore": "Ignorar",
    "Ignore Patterns": "Patrons a ignorar",
    "Ignore Permissions": "Permisos a ignorar",
    "Incoming Rate Limit (KiB/s)": "Límit de descàrrega (KiB/s)",
-    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Incorrect configuration may damage your folder contents and render Syncthing inoperable.",
+    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "La configuración incorrecta pot danyar el contingut de la teua carpeta i deixar Syncthing inoperatiu.",
    "Introducer": "Presentador",
    "Inversion of the given condition (i.e. do not exclude)": "Inversió de la condició donada (per exemple no excloure)",
    "Keep Versions": "Mantindre versions",
@@ -95,7 +104,7 @@
    "Major Upgrade": "Actualització important",
    "Maximum Age": "Edat màxima",
    "Metadata Only": "Sols metadades",
-    "Minimum Free Disk Space": "Minimum Free Disk Space",
+    "Minimum Free Disk Space": "Espai minim de disc lliure",
    "Move to top of queue": "Moure al principi de la cua",
    "Multi level wildcard (matches multiple directory levels)": "Comodí multinivell (coincideix amb múltiples nivells de directoris)",
    "Never": "Mai",
@@ -108,37 +117,41 @@
    "OK": "OK",
    "Off": "Off",
    "Oldest First": "El més vell primer",
-    "Options": "Options",
-    "Out of Sync": "Out of Sync",
+    "Optional descriptive label for the folder. Can be different on each device.": "Etiqueta descriptiva opcional per la carpeta. Pot ser diferent en cada dispositiu.",
+    "Options": "Opcions",
+    "Out of Sync": "Sense sincronització",
    "Out of Sync Items": "Dispositius sense sincronitzar",
    "Outgoing Rate Limit (KiB/s)": "Límit de pujada (KiB/s)",
    "Override Changes": "Sobreescriure els canvis",
    "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Ruta a la carpeta local en l'ordinador. Es crearà si no existeix. El caràcter tilde (~) es pot utilitzar com a drecera",
    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Ruta on les versions deurien estar emmagatzemades (deixar buit per a la carpeta .stversions en la carpeta).",
-    "Pause": "Pause",
-    "Paused": "Paused",
+    "Pause": "Pausa",
+    "Paused": "Pausat",
    "Please consult the release notes before performing a major upgrade.": "Per favor, consultar les notes de la versió abans de fer una actualització important.",
-    "Please set a GUI Authentication User and Password in the Settings dialog.": "Please set a GUI Authentication User and Password in the Settings dialog.",
+    "Please set a GUI Authentication User and Password in the Settings dialog.": "Per favor, estableix un usuari i password per a l'Interfície Gràfica d'Usuari en el menú d'Adjustos.",
    "Please wait": "Per favor, espere",
    "Preview": "Vista prèvia",
    "Preview Usage Report": "Informe d'ús de vista prèvia",
    "Quick guide to supported patterns": "Guía ràpida de patrons suportats",
    "RAM Utilization": "Utilització de la RAM",
    "Random": "Aleatori",
-    "Relayed via": "Relayed via",
-    "Relays": "Relays",
+    "Relay Servers": "Servidors de Transmissió",
+    "Relayed via": "Transmitit via",
+    "Relays": "Transmissions",
    "Release Notes": "Notes de la versió",
-    "Remove": "Remove",
+    "Remote Devices": "Dispositius Remots",
+    "Remove": "Eliminar",
+    "Required identifier for the folder. Must be the same on all cluster devices.": "Identificador necessari per la carpeta. Deu ser el mateix en tots els dispositius del cluster.",
    "Rescan": "Tornar a buscar",
    "Rescan All": "Tornar a buscar tot",
    "Rescan Interval": "Interval de nova busca",
    "Restart": "Reiniciar",
    "Restart Needed": "Reinici necesari",
    "Restarting": "Reiniciant",
-    "Resume": "Resume",
+    "Resume": "Continuar",
    "Reused": "Reutilitzat",
    "Save": "Gravar",
-    "Scan Time Remaining": "Scan Time Remaining",
+    "Scan Time Remaining": "Temps d'escaneig restant",
    "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.",
@@ -151,6 +164,7 @@
    "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.",
    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Mostrat en lloc de l'ID del dispositiu en l'estat del grup (cluster). S'actualitzarà al nom que el dispositiu anuncia si es deixa buit.",
    "Shutdown": "Apagar",
@@ -161,7 +175,7 @@
    "Source Code": "Codi font",
    "Staggered File Versioning": "Versionat de fitxers escalonat",
    "Start Browser": "Iniciar navegador",
-    "Statistics": "Statistics",
+    "Statistics": "Estadístiques",
    "Stopped": "Parat",
    "Support": "Suport",
    "Sync Protocol Listen Addresses": "Direccions d'escolta del protocol de sincronització",
@@ -172,10 +186,11 @@
    "Syncthing is upgrading.": "Syncthing està actualitzant-se.",
    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing pareix apagat o hi ha un problema amb la connexió a Internet. Tornant a intentar...",
    "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.": "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.": "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 {%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.",
@@ -185,19 +200,20 @@
    "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.",
-    "The following items could not be synchronized.": "The following items could not be synchronized.",
+    "The following items could not be synchronized.": "Els següents objectes no s'han pogut sincronitzar.",
    "The maximum age must be a number and cannot be blank.": "L'edat màxima deu ser un nombre i no pot estar buida.",
    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "El temps màxim per a guardar una versió (en dies, ficar 0 per a guardar les versions per a sempre).",
-    "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 porcentatge d'espai mínim lliure en el disc deu ser un nombre no negatiu entre 0 i 100 (ambdós inclosos).",
    "The number of days must be a number and cannot be blank.": "El nombre de dies deu ser un nombre i no pot estar en blanc.",
    "The number of days to keep files in the trash can. Zero means forever.": "El nombre de dies per a mantindre els arxius a la paperera. Cero vol dir \"per a sempre\".",
    "The number of old versions to keep, per file.": "El nombre de versions antigues per a guardar, per cada fitxer.",
    "The number of versions must be a number and cannot be blank.": "El nombre de versions deu ser un nombre i no pot estar buit.",
    "The path cannot be blank.": "La ruta no pot estar buida.",
-    "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
+    "The rate limit must be a non-negative number (0: no limit)": "El llímit del ritme deu ser un nombre no negatiu (0: sense llímit)",
    "The rescan interval must be a non-negative number of seconds.": "L'interval de reescaneig deu ser un nombre positiu de segons.",
-    "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 can easily give hackers access to read and change any files on your computer.": "This can easily give hackers access to read and change any files on your computer.",
+    "They are retried automatically and will be synced when the error is resolved.": "Es reintenta automàticament i es sincronitzaràn quant el resolga l'error.",
+    "This Device": "Aquest Dispositiu",
+    "This can easily give hackers access to read and change any files on your computer.": "Açò pot donar accés fàcilment als hackers per a llegir i canviar qualsevol fitxer al teu ordinador.",
    "This is a major version upgrade.": "Aquesta és una actualització important de la versió.",
    "Trash Can File Versioning": "Versionat d'arxius de la paperera",
    "Unknown": "Desconegut",
@@ -214,12 +230,15 @@
    "Version": "Versió",
    "Versions Path": "Ruta de les 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 s'esborren automàticament si són més antigues que l'edat màxima o excedixen el nombre de fitxer permesos en un interval.",
+    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Perill! Aquesta ruta és un subdirectori d'una carpeta que ja existeix nomenada \"{{otherFolder}}\".",
    "When adding a new device, keep in mind that this device must be added on the other side too.": "Quant s'afig un nou dispositiu, hi ha que tindre en compte que aquest dispositiu deu ser afegit també en l'altre costat.",
    "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.": "Quant s'afig una nova carpeta, hi ha que tindre en compte que l'ID de la carpeta s'utilitza per a juntar les carpetes entre dispositius. Són sensibles a les majúscules i deuen coincidir exactament entre tots els dispositius.",
    "Yes": "Sí",
    "You must keep at least one version.": "Es deu mantindre al menys una versió.",
-    "days": "days",
+    "days": "dies",
    "full documentation": "Documentació completa",
    "items": "Elements",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} vol compartit la carpeta \"{{folder}}\"."
+    "{%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
@@ -1,4 +1,5 @@
 {
+    "A device with that ID is already added.": "Přístroj s tímto ID je již přídán.",
    "A negative number of days doesn't make sense.": "Záporný počet dní nedává smysl.",
    "A new major version may not be compatible with previous versions.": "Nová důležitá verze nemusí být kompatibilní s předchozími verzemi.",
    "API Key": "API klíč",
@@ -7,11 +8,13 @@
    "Add": "Přidat",
    "Add Device": "Přidat přístroj",
    "Add Folder": "Přidat adresář",
+    "Add Remote Device": "Přidat vzdálené zařízení",
    "Add new folder?": "Přidat nový adresář?",
    "Address": "Adresa",
    "Addresses": "Adresy",
    "Advanced": "Pokročilé",
    "Advanced Configuration": "Pokročilá nastavení",
+    "Advanced settings": "Pokročilá nastavení",
    "All Data": "Všechna data",
    "Allow Anonymous Usage Reporting?": "Povolit anonymní hlášení o používání?",
    "Alphabetic": "Abecedně",
@@ -31,10 +34,12 @@
    "Connection Error": "Chyba 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",
@@ -50,6 +55,8 @@
    "Edit Device": "Upravit přístroj",
    "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.",
@@ -64,6 +71,7 @@
    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Soubory jsou chráněny před změnami na ostatních přístrojích, ale změny provedené z tohoto přístroje budou rozeslány na zbytek clusteru.",
    "Folder": "Adresář",
    "Folder ID": "ID adresáře",
+    "Folder Label": "Jmenovka adresáře",
    "Folder Master": "Master adresář",
    "Folder Path": "Cesta k adresáři",
    "Folders": "Adresáře",
@@ -74,6 +82,7 @@
    "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",
    "Home page": "Domovská stránka",
@@ -108,6 +117,7 @@
    "OK": "OK",
    "Off": "Vypnuta",
    "Oldest First": "Od nejstaršího",
+    "Optional descriptive label for the folder. Can be different on each device.": "Volitelný popisek adresáře. Může být rozdílný na každém zařízení.",
    "Options": "Nastavení",
    "Out of Sync": "Nesesynchronizováno",
    "Out of Sync Items": "Nesesynchronizované položky",
@@ -125,10 +135,13 @@
    "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",
    "Release Notes": "Poznámky k vydání",
+    "Remote Devices": "Vzdálená zařízení",
    "Remove": "Odstranit",
+    "Required identifier for the folder. Must be the same on all cluster devices.": "Požadovaný identifikátor adresáře. Musí být stejný na všech zařízeních.",
    "Rescan": "Opakovat skenování",
    "Rescan All": "Opakovat skenování všech",
    "Rescan Interval": "Interval opakování skenování",
@@ -151,6 +164,7 @@
    "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.",
    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Zobrazeno místo ID přístroje na náhledu stavu clusteru. Pokud nebude vyplněno, bude nastaveno na jméno, které přístroj odesílá.",
    "Shutdown": "Vypnout",
@@ -176,6 +190,7 @@
    "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é.",
@@ -197,6 +212,7 @@
    "The rate limit must be a non-negative number (0: no limit)": "Limit rychlosti musí být nezáporné číslo (0: bez limitu)",
    "The rescan interval must be a non-negative number of seconds.": "Interval opakování skenování musí být pozitivní číslo.",
    "They are retried automatically and will be synced when the error is resolved.": "Nové pokusy o synchronizaci budou probíhat automaticky a položky budou synchronizovány jakmile bude chyba odstraněna.",
+    "This Device": "Toto zařízení",
    "This can easily give hackers access to read and change any files on your computer.": "To může útočníkům jednoduše povolit čtení a úpravy souborů na vašem přístroji. ",
    "This is a major version upgrade.": "Toto je důležitá aktualizace.",
    "Trash Can File Versioning": "Verzování souborů v koši",
@@ -214,6 +230,7 @@
    "Version": "Verze",
    "Versions Path": "Cesta k verzím",
    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Verze jsou automaticky smazány, pokud jsou starší než maximální časový limit nebo překročí počet souborů povolených pro interval.",
+    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Varování: tato cesta je podadresářem existujícího adresáře \"{{otherFolder}}\".",
    "When adding a new device, keep in mind that this device must be added on the other side too.": "Při přidávání nového přístroje mějte na paměti, že je ho třeba také zadat na druhé straně.",
    "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.": "Při přidávání nového adresáře mějte na paměti, že jeho ID je použito ke svázání adresářů napříč přístoji. Rozlišují se malá a velká písmena a musí přesně souhlasit mezi všemi přístroji.",
    "Yes": "Ano",
@@ -221,5 +238,7 @@
    "days": "dní",
    "full documentation": "plná dokumentace",
    "items": "položky",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} chce sdílet adresář \"{{folder}}\"."
+    "{%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
@@ -0,0 +1,244 @@
+{
+    "A device with that ID is already added.": "A device with that ID is already added.",
+    "A negative number of days doesn't make sense.": "Et negativt antal dage giver ikke mening.",
+    "A new major version may not be compatible with previous versions.": "En ny versionsudgivelse er måske ikke kompatibel med tidligere versioner.",
+    "API Key": "API-nøgle",
+    "About": "Om",
+    "Actions": "Handlinger.",
+    "Add": "Tilføj",
+    "Add Device": "Tilføj enhed",
+    "Add Folder": "Tilføj mappe",
+    "Add Remote Device": "Add Remote Device",
+    "Add new folder?": "Tilføj ny mappe",
+    "Address": "Adresse",
+    "Addresses": "Adresser",
+    "Advanced": "Avanceret",
+    "Advanced Configuration": "Avanceret konfiguration",
+    "Advanced settings": "Advanced settings",
+    "All Data": "Alt data",
+    "Allow Anonymous Usage Reporting?": "Tillad anonym brugerstatistik?",
+    "Alphabetic": "Alfabetisk",
+    "An external command handles the versioning. It has to remove the file from the synced folder.": " ",
+    "Anonymous Usage Reporting": "Anonym brugerstatistik",
+    "Any devices configured on an introducer device will be added to this device as well.": "Alle enheder som er konfigueret som en introducerende enhed, vil også blive tilføjet til denne enhed.",
+    "Automatic upgrades": "Automatisk opdatering",
+    "Be careful!": "Vær forsigtig!",
+    "Bugs": "Fejl",
+    "CPU Utilization": "CPU-forbrug",
+    "Changelog": "Udgivelsesnoter",
+    "Clean out after": "Rens efter",
+    "Close": "Luk",
+    "Command": "Kommando",
+    "Comment, when used at the start of a line": "Kommentering som bruges i starten af en linje",
+    "Compression": "Anvend komprimering",
+    "Connection Error": "Tilslutnings fejl",
+    "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",
+    "Discovery": "Opslag",
+    "Documentation": "Dokumentation",
+    "Download Rate": "Downloadhastighed",
+    "Downloaded": "Downloadet",
+    "Downloading": "Downloader",
+    "Edit": "Rediger",
+    "Edit Device": "Rediger enhed",
+    "Edit Folder": "Rediger mappe",
+    "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",
+    "External File Versioning": "Ekstern fil-versionskontrol",
+    "Failed Items": "Mislykkede filer",
+    "File Pull Order": "Filhentnings rækkefølge",
+    "File Versioning": "Filversionering",
+    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Filtilladelses bits ignoreres når der søges efter ændringer. Bruges på FAT filsystemer.  ",
+    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Filer flyttes til .stversions mappen når de erstattes eller slettes af Syncthing.",
+    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Filer flyttes til data-stemplede versioner i en .stversions mappe når de erstattes eller slettes af 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 er beskyttet fra ændringer foretaget på andre enheder, men ændringerne på denne enhed vil blive sendt til alle andre tilknyttede enheder.",
+    "Folder": "Mappe",
+    "Folder ID": "Mappe-ID",
+    "Folder Label": "Folder Label",
+    "Folder Master": "Mastermappe",
+    "Folder Path": "Mappesti",
+    "Folders": "Mapper",
+    "GUI": "GUI",
+    "GUI Authentication Password": "GUI-kodeord",
+    "GUI Authentication User": "GUI-brugernavn",
+    "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",
+    "Home page": "Hjem",
+    "Ignore": "Ignorer",
+    "Ignore Patterns": "Ignoreringsmaske",
+    "Ignore Permissions": "Ignorér filrettigheder",
+    "Incoming Rate Limit (KiB/s)": "Indgående hastighedsbegrænsning (KiB/s)",
+    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Ukorrekt opsætning kan skade dine data og gøre Syncthing ude af stand til at fungere.",
+    "Introducer": "Introducerende enhed",
+    "Inversion of the given condition (i.e. do not exclude)": "Det omvendte (dvs. undlad ikke)",
+    "Keep Versions": "Behold versioner",
+    "Largest First": "Største først",
+    "Last File Received": "Sidste modtaget fil",
+    "Last seen": "Sidst set",
+    "Later": "Senere",
+    "Local Discovery": "Lokal opslag",
+    "Local State": "Lokal tilstand",
+    "Local State (Total)": "Lokal tilstand (total)",
+    "Major Upgrade": "Ny version",
+    "Maximum Age": "Maks alder",
+    "Metadata Only": "Kun metadata",
+    "Minimum Free Disk Space": "Mindst ledig diskplads",
+    "Move to top of queue": "Flyt til toppen af køen",
+    "Multi level wildcard (matches multiple directory levels)": "Flerniveau wildcard (matcher flere biblioteksniveauer)",
+    "Never": "Aldrig",
+    "New Device": "Ny enhed",
+    "New Folder": "Ny mappe",
+    "Newest First": "Nyeste først",
+    "No": "Nej",
+    "No File Versioning": "Ingen filversion",
+    "Notice": "OBS",
+    "OK": "OK",
+    "Off": "Slå fra",
+    "Oldest First": "Ældste først",
+    "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": "Indstillinger",
+    "Out of Sync": "Ikke synkroniseret",
+    "Out of Sync Items": "Endnu ikke synkroniserede filer",
+    "Outgoing Rate Limit (KiB/s)": "Udgående hastighedsbegrænsning (KiB/s)",
+    "Override Changes": "Overskriv ændringer",
+    "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Sti til den lokale mappe. Vil blive oprettet hvis den ikke findes. Tilde tegnet (~) kan bruges som en forkortelse for",
+    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Sti hvor versioner skal gemmes (efterlad tom for default .stversions mappe)",
+    "Pause": "Pause",
+    "Paused": "Pauset",
+    "Please consult the release notes before performing a major upgrade.": "Tjek venligst udgivelsesnoterne før opgradering til en ny version.",
+    "Please set a GUI Authentication User and Password in the Settings dialog.": "Sæt vensligt en GUI bruger og kodeord i opsætningsdialogen.",
+    "Please wait": "Vent venligst",
+    "Preview": "Forhåndsvisning",
+    "Preview Usage Report": "Forhåndsvisning af forbrugsrapport",
+    "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",
+    "Release Notes": "Udgivelsesnoter",
+    "Remote Devices": "Remote Devices",
+    "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.",
+    "Rescan": "Skan igen",
+    "Rescan All": "Skan alt igen",
+    "Rescan Interval": "Genskannings interval",
+    "Restart": "Genstart",
+    "Restart Needed": "Programmet kræver genstart",
+    "Restarting": "Genstarter",
+    "Resume": "Genoptag",
+    "Reused": "Genbrugt",
+    "Save": "Gem",
+    "Scan Time Remaining": "Tid tilbage af skanningen",
+    "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.",
+    "Settings": "Indstillinger",
+    "Share": "Del",
+    "Share Folder": "Delt mappe",
+    "Share Folders With Device": "Del mappe med enhed",
+    "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.",
+    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Vist istedet for Enheds ID i klynge status. Vil blive opdateret til det navn som enheden viser, hvis det ikke er udfyldt.",
+    "Shutdown": "Luk ned",
+    "Shutdown Complete": "Nedlukning fuldført",
+    "Simple File Versioning": "Simpel fil versioner",
+    "Single level wildcard (matches within a directory only)": "Enkeltnivau wildcard (matcher kun inden for en mapp)",
+    "Smallest First": "Mindste først",
+    "Source Code": "Kildekode",
+    "Staggered File Versioning": "Forskudte filversioner",
+    "Start Browser": "Start browser",
+    "Statistics": "Statistikker",
+    "Stopped": "Stoppet",
+    "Support": "Support",
+    "Sync Protocol Listen Addresses": "Lytteadresser for indgående forbindelser",
+    "Syncing": "Synkroniserer",
+    "Syncthing has been shut down.": "Syncthing er blevet lukket ned.",
+    "Syncthing includes the following software or portions thereof:": "Syncthing indeholder følgende software eller dele heraf:",
+    "Syncthing is restarting.": "Syncthing genstarter",
+    "Syncthing is upgrading.": "Syncthing opgraderer",
+    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing ser ud til at være stoppet eller oplever problemer med din internetforbindels. Prøver igen...",
+    "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 {%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.",
+    "The following items could not be synchronized.": "Følgende filer kunne ikke synkroniseres.",
+    "The maximum age must be a number and cannot be blank.": "Maks alder skal være et nummer og må ikke være tom",
+    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Maks tid gamle udgaver skal gemmes (i dage, sæt lig med 0 for at beholde gamle versioner for altid)",
+    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "Procentsatsen på den mindste ledige diskplads må ikke være negative og skal være mellem 0 og 100 (inklusiv).",
+    "The number of days must be a number and cannot be blank.": "Antallet af dage skal være et nummer og feltet må ikke være tomt",
+    "The number of days to keep files in the trash can. Zero means forever.": "Antal dage filer gemmes i skraldespanden. Nul betyder for evigt.",
+    "The number of old versions to keep, per file.": "Antallet af gamle versioner som gemmes, per fil.",
+    "The number of versions must be a number and cannot be blank.": "Antallet af versioner skal være et tal, og kan ikke være blankt.",
+    "The path cannot be blank.": "Stien må ikke være tom",
+    "The rate limit must be a non-negative number (0: no limit)": "Ratebegrænsningen må ikke være negative tal (0: ingen begrænsning)",
+    "The rescan interval must be a non-negative number of seconds.": "Genskanningsintervallet skal være et ikke-negativt antal sekunder",
+    "They are retried automatically and will be synced when the error is resolved.": "De prøves igen automatisk og vil blive synkroniseret når fejlen er løst.",
+    "This Device": "This Device",
+    "This can easily give hackers access to read and change any files on your computer.": "Dette gør det nemt for hackere at få adgang til at læse og ændre filer på din computer.",
+    "This is a major version upgrade.": "Dette er en ny version",
+    "Trash Can File Versioning": "Skraldespand fil versioner",
+    "Unknown": "Ukendt",
+    "Unshared": "Ikke delt",
+    "Unused": "Ubrugt",
+    "Up to Date": "Fuldt opdateret",
+    "Updated": "Opdateret",
+    "Upgrade": "Upgradér",
+    "Upgrade To {%version%}": "Opgradér til {{version}}",
+    "Upgrading": "Opgradere",
+    "Upload Rate": "Uploadhastighed",
+    "Uptime": "Oppetid",
+    "Use HTTPS for GUI": "Anvend HTTPS til GUI adgang",
+    "Version": "Version",
+    "Versions Path": "Versions-sti",
+    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Versioner slettes automatisk, hvis de er ældre end den satte maksimum alder eller overstiger det tilladte antal filer i et interval.",
+    "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.": "Når der tilføjes en ny enhed, vær da opmærksom på, at denne enhed også skal tilføjes på den anden side.",
+    "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 der tilføjes en ny enhed, vær da opmærksom på at samme ID bruges til at forbinde mapperne på de forskellige enheder. Der er forskel på store og små bogstaver, og ID skal være fuldstændig identisk på alle enheder.",
+    "Yes": "Ja",
+    "You must keep at least one version.": "Du skal beholde mindst én version.",
+    "days": "dage",
+    "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,4 +1,5 @@
 {
+    "A device with that ID is already added.": "Ein Gerät mit dieser ID existiert bereits.",
    "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",
@@ -7,11 +8,13 @@
    "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?",
    "Address": "Adresse",
    "Addresses": "Adressen",
    "Advanced": "Erweitert",
    "Advanced Configuration": "Erweiterte Konfiguration",
+    "Advanced settings": "Erweiterte Einstellungen",
    "All Data": "Alle Daten",
    "Allow Anonymous Usage Reporting?": "Übertragung von anonymen Nutzungsberichten erlauben?",
    "Alphabetic": "Alphabetisch",
@@ -31,10 +34,12 @@
    "Connection Error": "Verbindungsfehler",
    "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 Name": "Gerätename",
@@ -50,6 +55,8 @@
    "Edit Device": "Gerät bearbeiten",
    "Edit Folder": "Verzeichnis bearbeiten",
    "Editing": "Bearbeitet",
+    "Enable NAT traversal": "NAT-Traversal 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.",
@@ -59,11 +66,12 @@
    "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 Dateien von Syncthing ersetzt oder gelöscht werden sollen, werden sie vorher in den .stversions Ordner verschoben.",
+    "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 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",
    "Folders": "Verzeichnisse",
@@ -73,7 +81,8 @@
    "GUI Listen Addresses": "Adresse(n) für die Benutzeroberfläche",
    "Generate": "Generieren",
    "Global Discovery": "Globale Gerätesuche",
-    "Global Discovery Server": "Globaler Gerätesuchserver",
+    "Global Discovery Server": "Globale(r) Gerätesuchserver",
+    "Global Discovery Servers": "Globale Gerätesuchserver",
    "Global State": "Globaler Status",
    "Help": "Hilfe",
    "Home page": "Homepage",
@@ -86,7 +95,7 @@
    "Inversion of the given condition (i.e. do not exclude)": "Umkehrung der angegebenen Bedingung (z.B. schließe nicht aus)",
    "Keep Versions": "Versionen erhalten",
    "Largest First": "Größte zuerst",
-    "Last File Received": "Letzte empfangene Datei ",
+    "Last File Received": "Letzte Änderung",
    "Last seen": "Zuletzt online",
    "Later": "Später",
    "Local Discovery": "Lokale Gerätesuche",
@@ -108,27 +117,31 @@
    "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.",
    "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. Ordner werden erzeugt, wenn sie nicht existieren. Das Tilden-Zeichen (~) kann als Abkürzung benutzt werden für",
+    "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).",
    "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.",
-    "Please set a GUI Authentication User and Password in the Settings dialog.": "Bitte setze einen GUI Benutzer und ein Passwort in den Einstellungen.",
+    "Please set a GUI Authentication User and Password in the Settings dialog.": "Bitte setze einen Benutzer und ein Passwort für das GUI in den Einstellungen.",
    "Please wait": "Bitte warten",
    "Preview": "Vorschau",
    "Preview Usage Report": "Vorschau des Nutzungsberichts",
    "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",
    "Release Notes": "Veröffentlichungsnotizen",
+    "Remote Devices": "Remote-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.",
    "Rescan": "Neu scannen",
    "Rescan All": "Alle neu scannen",
    "Rescan Interval": "Scanintervall",
@@ -138,7 +151,7 @@
    "Resume": "Fortfahren",
    "Reused": "Erneut benutzt",
    "Save": "Speichern",
-    "Scan Time Remaining": "Scan Time Remaining",
+    "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",
@@ -151,6 +164,7 @@
    "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 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 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",
@@ -172,10 +186,11 @@
    "Syncthing is upgrading.": "Syncthing wird aktualisiert",
    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing scheint nicht erreichbar zu sein oder es gibt ein Problem mit Deiner Internetverbindung. Versuche erneut...",
    "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.": "Das Syncthing Administrationsoberfläche erlaubt mit den jetzigen Einstellungen einen Fernzugriff ohne ein Passwort.",
+    "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 {%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.",
@@ -197,7 +212,8 @@
    "The rate limit must be a non-negative number (0: no limit)": "Das Daterate-Limit muss eine nicht negative Anzahl sein (0 = kein Limit).",
    "The rescan interval must be a non-negative number of seconds.": "Das Scanintervall muss eine nicht negative Anzahl (in Sekunden) sein.",
    "They are retried automatically and will be synced when the error is resolved.": "Sie werden automatisch heruntergeladen und werden synchronisiert, wenn der Fehler behoben wurde.",
-    "This can easily give hackers access to read and change any files on your computer.": "Dies kann dazu führen, dass Eindringlinge relativ einfach auf Ihre Dateien zugreifen und diese ändern können.",
+    "This Device": "Dieses Gerät",
+    "This can easily give hackers access to read and change any files on your computer.": "Dies kann dazu führen, dass Unberechtigte relativ einfach auf Ihre Dateien zugreifen und diese ändern können.",
    "This is a major version upgrade.": "Dies ist eine neue Hauptversion.",
    "Trash Can File Versioning": "Papierkorb Dateiversionierung",
    "Unknown": "Unbekannt",
@@ -214,6 +230,7 @@
    "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}}\".",
    "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.",
    "Yes": "Ja",
@@ -221,5 +238,7 @@
    "days": "Tage",
    "full documentation": "Komplette Dokumentation",
    "items": "Objekte",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} möchte das Verzeichnis \"{{folder}}\" teilen."
+    "{%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."
 }
--- a/gui/default/assets/lang/lang-el.json
+++ b/gui/default/assets/lang/lang-el.json
@@ -1,4 +1,5 @@
 {
+    "A device with that ID is already added.": "Υπάρχει ήδη μια συσκευή με αυτή την ταυτότητα.",
    "A negative number of days doesn't make sense.": "Δε βγάζει νόημα ένας αρνητικός αριθμός ημερών.",
    "A new major version may not be compatible with previous versions.": "Μια νέα σημαντική έκδοση μπορεί να μην είναι συμβατή με τις προηγούμενες εκδόσεις.",
    "API Key": "Κλειδί API",
@@ -7,11 +8,13 @@
    "Add": "Προσθήκη",
    "Add Device": "Προσθήκη συσκευής",
    "Add Folder": "Προσθήκη φακέλου",
+    "Add Remote Device": "Add Remote Device",
    "Add new folder?": "Προσθήκη νέου φακέλου;",
    "Address": "Διεύθυνση",
    "Addresses": "Διευθύνσεις",
    "Advanced": "Προχωρημένες",
    "Advanced Configuration": "Προχωρημένες ρυθμίσεις",
+    "Advanced settings": "Advanced settings",
    "All Data": "Όλα τα δεδομένα",
    "Allow Anonymous Usage Reporting?": "Να επιτρέπεται η αποστολή ανώνυμων στοιχείων χρήσης;",
    "Alphabetic": "Αλφαβητικά",
@@ -31,17 +34,19 @@
    "Connection Error": "Σφάλμα σύνδεσης",
    "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 από τους παρακάτω συνεισφορείς:",
-    "Danger!": "Danger!",
+    "Danger!": "Προσοχή!",
    "Delete": "Διαγραφή",
    "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 Identification": "Ταυτότητα συσκευής",
    "Device Name": "Όνομα συσκευής",
    "Device {%device%} ({%address%}) wants to connect. Add new device?": "Η συσκευή {{device}} ({{address}}) επιθυμεί να συνδεθεί. Προσθήκη της νέας συσκευής1",
    "Devices": "Συσκευές",
    "Disconnected": "Αποσυνδεδεμένος",
-    "Discovery": "Discovery",
+    "Discovery": "Ανεύρεση συσκευών",
    "Documentation": "Τεκμηρίωση",
    "Download Rate": "Ταχύτητα λήψης",
    "Downloaded": "Έχει ληφθεί",
@@ -50,6 +55,8 @@
    "Edit Device": "Επεξεργασία συσκευής",
    "Edit Folder": "Επεξεργασία φακέλου",
    "Editing": "Επεξεργασία σε εξέλιξη",
+    "Enable NAT traversal": "Enable 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.": "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.": "Δώσε τα πρότυπα που θα αγνοηθούν, ένα σε κάθε γραμμή.",
@@ -64,6 +71,7 @@
    "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 Path": "Μονοπάτι φακέλου",
    "Folders": "Φάκελοι",
@@ -74,6 +82,7 @@
    "Generate": "Δημιουργία",
    "Global Discovery": "Καθολική ανεύρεση",
    "Global Discovery Server": "Διακομιστής καθολικής ανεύρεσης κόμβου",
+    "Global Discovery Servers": "Global Discovery Servers",
    "Global State": "Καθολική κατάσταση",
    "Help": "Βοήθεια",
    "Home page": "Αρχική σελίδα",
@@ -95,7 +104,7 @@
    "Major Upgrade": "Σημαντική αναβάθμιση",
    "Maximum Age": "Μέγιστη ηλικία",
    "Metadata Only": "Μόνο μεταδεδομένα",
-    "Minimum Free Disk Space": "Minimum Free Disk Space",
+    "Minimum Free Disk Space": "Ελάχιστος ελεύθερος αποθηκευτικός χώρος",
    "Move to top of queue": "Μεταφορά στην αρχή της λίστας",
    "Multi level wildcard (matches multiple directory levels)": "Τελεστής μπαλαντέρ (*) για πολλά επίπεδα (χρησιμοποιείται για εμφωλευμένους φακέλους)",
    "Never": "Ποτέ",
@@ -108,6 +117,7 @@
    "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.",
    "Options": "Επιλογές",
    "Out of Sync": "Μη συγχρονισμένα",
    "Out of Sync Items": "Μη συγχρονισμένα αντικείμενα",
@@ -115,30 +125,33 @@
    "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)",
-    "Pause": "Pause",
-    "Paused": "Paused",
+    "Pause": "Παύση",
+    "Paused": "Σε παύση",
    "Please consult the release notes before performing a major upgrade.": "Παρακαλούμε, πριν από την εκτέλεση μιας σημαντικής αναβάθμισης, να συμβουλευτείς το σημείωμα που τη συνοδεύει.  ",
-    "Please set a GUI Authentication User and Password in the Settings dialog.": "Please set a GUI Authentication User and Password in the Settings dialog.",
+    "Please set a GUI Authentication User and Password in the Settings dialog.": "Παρακαλώ όρισε στις ρυθμίσεις έναν χρήστη και έναν κωδικό πρόσβασης για τη διεπαφή.",
    "Please wait": "Παρακαλώ περιμένετε",
    "Preview": "Προεπισκόπηση",
    "Preview Usage Report": "Προεπισκόπηση αναφοράς χρήσης",
    "Quick guide to supported patterns": "Σύντομη βοήθεια σχετικά με τα πρότυπα αναζήτησης που υποστηρίζονται",
    "RAM Utilization": "Επιβάρυνση RAM",
    "Random": "Τυχαία",
-    "Relayed via": "Relayed via",
-    "Relays": "Relays",
+    "Relay Servers": "Διακομιστές αναμετάδοσης",
+    "Relayed via": "Αναμετάδοση μέσω",
+    "Relays": "Αναμεταδόσεις",
    "Release Notes": "Σημείωμα έκδοσης",
-    "Remove": "Remove",
+    "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.",
    "Rescan": "Έλεγξε για αλλαγές",
    "Rescan All": "Έλεγξέ τα όλα για αλλαγές",
    "Rescan Interval": "Κάθε πότε θα ελέγχεται για αλλαγές ",
    "Restart": "Επανεκκίνηση",
    "Restart Needed": "Απαιτείται επανεκκίνηση",
    "Restarting": "Επανεκκίνηση",
-    "Resume": "Resume",
+    "Resume": "Συνέχιση",
    "Reused": "Χρησιμοποιήθηκε ξανά",
    "Save": "Αποθήκευση",
-    "Scan Time Remaining": "Scan Time Remaining",
+    "Scan Time Remaining": "Εναπομείναντας χρόνος για τον έλεγχο ",
    "Scanning": "Έλεγχος για αλλαγές",
    "Select the devices to share this folder with.": "Διάλεξε τις συσκευές προς τις οποίες θα διαμοιράζεται αυτός ο φάκελος.",
    "Select the folders to share with this device.": "Διάλεξε ποιοι φάκελοι θα διαμοιράζονται προς αυτή τη συσκευή.",
@@ -151,6 +164,7 @@
    "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.": "Θα φαίνεται αντί για την ταυτότητα της συσκευής στην προβολή της κατάστασης ολόκληρης της συστάδας. Θα γνωστοποιείται σαν το προαιρετικό όνομα της συσκευής.",
    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Θα φαίνεται αντί για την ταυτότητα της συσκευής στην προβολή της κατάστασης ολόκληρης της συστάδας. Θα ενημερώνεται αυτόματα αν αλλάξει το όνομα της συσκευής.",
    "Shutdown": "Απενεργοποίηση",
@@ -172,10 +186,11 @@
    "Syncthing is upgrading.": "Το Syncthing αναβαθμίζεται.",
    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Το Syncthing φαίνεται πως είναι απενεργοποιημένο ή υπάρχει πρόβλημα στη σύνδεσή σου στο διαδίκτυο. Προσπαθώ πάλι…",
    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Το Syncthing φαίνεται να αντιμετωπίζει ένα πρόβλημα με την επεξεργασία του αιτήματός σου. Παρακαλούμε, αν το πρόβλημα συνεχίζει, ανανέωσε την σελίδα ή επανεκκίνησε το Syncthing.",
-    "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 Syncthing admin interface is configured to allow remote access without a password.": "Η διεπαφή διαχείρισης του Syncthing είναι ρυθμισμένη να επιτρέπει την πρόσβαση χωρίς κωδικό.",
    "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 χαρακτήρες (γράμματα και αριθμοί). Τα κενά και οι παύλες είναι προαιρετικά (αδιάφορα).",
@@ -188,16 +203,17 @@
    "The following items could not be synchronized.": "Δεν ήταν δυνατόν να συγχρονιστούν τα παρακάτω αρχεία.",
    "The maximum age must be a number and cannot be blank.": "Η μέγιστη ηλικία πρέπει να είναι αριθμός και σίγουρα όχι κενό.",
    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Η μέγιστη ηλικία παλιότερων εκδόσεων (σε ημέρες, αν δώσεις 0 οι παλιότερες εκδόσεις θα διατηρούνται για πάντα).",
-    "The 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).": "Το ποσοστό του ελάχιστου διαθέσιμου αποθηκευτικόυ χώρου πρέπει να είναι έναν μη-αρνητικός αριθμός μεταξύ του 0 και του 100 (συμπεριλαμβανομένων)",
    "The number of days must be a number and cannot be blank.": "Ο αριθμός ημερών πρέπει να είναι αριθμός και σίγουρα όχι κενό.",
    "The number of days to keep files in the trash can. Zero means forever.": "Ο αριθμός ημερών που θα διατηρούντα τα αρχεία στον κάδο. Μηδέν σημαίνει διατήρηση για πάντα.",
    "The number of old versions to keep, per file.": "Πόσες παλιότερες εκδόσεις θα διατηρούνται, ανά αρχείο.",
    "The number of versions must be a number and cannot be blank.": "Ο αριθμός εκδόσεων πρέπει να είναι αριθμός και σίγουρα όχι κενό.",
    "The path cannot be blank.": "Το μονοπάτι δεν μπορεί να είναι κενό.",
-    "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
+    "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 can easily give hackers access to read and change any files on your computer.": "This can easily give hackers access to read and change any files on your computer.",
+    "This Device": "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": "Ο κάδος μπορεί να τηρεί εκδόσεις",
    "Unknown": "Άγνωστο",
@@ -214,12 +230,15 @@
    "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}}\".",
    "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": "days",
+    "days": "Μέρες",
    "full documentation": "πλήρης τεκμηρίωση",
    "items": "εγγραφές",
-    "{%device%} wants to share folder \"{%folder%}\".": "Η συσκευή {{device}} θέλει να μοιράσει τον φάκελο «{{folder}}»."
+    "{%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}})."
 }
--- a/gui/default/assets/lang/lang-en-GB.json
+++ b/gui/default/assets/lang/lang-en-GB.json
@@ -1,4 +1,5 @@
 {
+    "A device with that ID is already added.": "A device with that ID is already added.",
    "A negative number of days doesn't make sense.": "A negative number of days doesn't make sense.",
    "A new major version may not be compatible with previous versions.": "A new major version may not be compatible with previous versions.",
    "API Key": "API Key",
@@ -7,11 +8,13 @@
    "Add": "Add",
    "Add Device": "Add Device",
    "Add Folder": "Add Folder",
+    "Add Remote Device": "Add Remote Device",
    "Add new folder?": "Add new folder?",
    "Address": "Address",
    "Addresses": "Addresses",
    "Advanced": "Advanced",
    "Advanced Configuration": "Advanced Configuration",
+    "Advanced settings": "Advanced settings",
    "All Data": "All Data",
    "Allow Anonymous Usage Reporting?": "Allow Anonymous Usage Reporting?",
    "Alphabetic": "Alphabetic",
@@ -31,10 +34,12 @@
    "Connection Error": "Connection Error",
    "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",
@@ -50,6 +55,8 @@
    "Edit Device": "Edit Device",
    "Edit Folder": "Edit Folder",
    "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.",
@@ -64,6 +71,7 @@
    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.",
    "Folder": "Folder",
    "Folder ID": "Folder ID",
+    "Folder Label": "Folder Label",
    "Folder Master": "Folder Master",
    "Folder Path": "Folder Path",
    "Folders": "Folders",
@@ -74,6 +82,7 @@
    "Generate": "Generate",
    "Global Discovery": "Global Discovery",
    "Global Discovery Server": "Global Discovery Server",
+    "Global Discovery Servers": "Global Discovery Servers",
    "Global State": "Global State",
    "Help": "Help",
    "Home page": "Home page",
@@ -108,6 +117,7 @@
    "OK": "OK",
    "Off": "Off",
    "Oldest First": "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.",
    "Options": "Options",
    "Out of Sync": "Out of Sync",
    "Out of Sync Items": "Out of Sync Items",
@@ -125,10 +135,13 @@
    "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",
    "Release Notes": "Release Notes",
+    "Remote Devices": "Remote Devices",
    "Remove": "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.",
    "Rescan": "Rescan",
    "Rescan All": "Rescan All",
    "Rescan Interval": "Rescan Interval",
@@ -151,6 +164,7 @@
    "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.",
    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.",
    "Shutdown": "Shutdown",
@@ -176,6 +190,7 @@
    "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.",
@@ -197,6 +212,7 @@
    "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
    "The rescan interval must be a non-negative number of seconds.": "The rescan interval must be a non-negative number of seconds.",
    "They are retried automatically and will be synced when the error is resolved.": "They are retried automatically and will be synced when the error is resolved.",
+    "This Device": "This Device",
    "This can easily give hackers access to read and change any files on your computer.": "This can easily give hackers access to read and change any files on your computer.",
    "This is a major version upgrade.": "This is a major version upgrade.",
    "Trash Can File Versioning": "Rubbish Bin File Versioning",
@@ -214,6 +230,7 @@
    "Version": "Version",
    "Versions Path": "Versions Path",
    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "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}}\".",
    "When adding a new device, keep in mind that this device must be added on the other side too.": "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.": "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": "Yes",
@@ -221,5 +238,7 @@
    "days": "days",
    "full documentation": "full documentation",
    "items": "items",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} wants to share folder \"{{folder}}\"."
+    "{%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
@@ -1,4 +1,5 @@
 {
+   "A device with that ID is already added.": "A device with that ID is already added.",
   "A negative number of days doesn't make sense.": "A negative number of days doesn't make sense.",
   "A new major version may not be compatible with previous versions.": "A new major version may not be compatible with previous versions.",
   "API Key": "API Key",
@@ -7,11 +8,13 @@
   "Add": "Add",
   "Add Device": "Add Device",
   "Add Folder": "Add Folder",
+   "Add Remote Device": "Add Remote Device",
   "Add new folder?": "Add new folder?",
   "Address": "Address",
   "Addresses": "Addresses",
   "Advanced": "Advanced",
   "Advanced Configuration": "Advanced Configuration",
+   "Advanced settings": "Advanced settings",
   "All Data": "All Data",
   "Allow Anonymous Usage Reporting?": "Allow Anonymous Usage Reporting?",
   "Alphabetic": "Alphabetic",
@@ -31,6 +34,7 @@
   "Connection Error": "Connection Error",
   "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",
@@ -50,6 +54,7 @@
   "Edit Device": "Edit Device",
   "Edit Folder": "Edit Folder",
   "Editing": "Editing",
+   "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.",
@@ -64,6 +69,7 @@
   "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.",
   "Folder": "Folder",
   "Folder ID": "Folder ID",
+   "Folder Label": "Folder Label",
   "Folder Master": "Folder Master",
   "Folder Path": "Folder Path",
   "Folders": "Folders",
@@ -74,6 +80,7 @@
   "Generate": "Generate",
   "Global Discovery": "Global Discovery",
   "Global Discovery Server": "Global Discovery Server",
+   "Global Discovery Servers": "Global Discovery Servers",
   "Global State": "Global State",
   "Help": "Help",
   "Home page": "Home page",
@@ -108,6 +115,7 @@
   "OK": "OK",
   "Off": "Off",
   "Oldest First": "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.",
   "Options": "Options",
   "Out of Sync": "Out of Sync",
   "Out of Sync Items": "Out of Sync Items",
@@ -125,10 +133,13 @@
   "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",
   "Release Notes": "Release Notes",
+   "Remote Devices": "Remote Devices",
   "Remove": "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.",
   "Rescan": "Rescan",
   "Rescan All": "Rescan All",
   "Rescan Interval": "Rescan Interval",
@@ -151,6 +162,7 @@
   "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.",
   "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.",
   "Shutdown": "Shutdown",
@@ -176,6 +188,7 @@
   "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.",
@@ -197,6 +210,7 @@
   "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
   "The rescan interval must be a non-negative number of seconds.": "The rescan interval must be a non-negative number of seconds.",
   "They are retried automatically and will be synced when the error is resolved.": "They are retried automatically and will be synced when the error is resolved.",
+   "This Device": "This Device",
   "This can easily give hackers access to read and change any files on your computer.": "This can easily give hackers access to read and change any files on your computer.",
   "This is a major version upgrade.": "This is a major version upgrade.",
   "Trash Can File Versioning": "Trash Can File Versioning",
@@ -221,5 +235,6 @@
   "days": "days",
   "full documentation": "full documentation",
   "items": "items",
-   "{%device%} wants to share folder \"{%folder%}\".": "{{device}} wants to share folder \"{{folder}}\"."
+   "{%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}})."
 }
--- a/gui/default/assets/lang/lang-es-ES.json
+++ b/gui/default/assets/lang/lang-es-ES.json
@@ -1,17 +1,20 @@
 {
+    "A device with that ID is already added.": "Ya se ha agregado un equipo con ese ID.",
    "A negative number of days doesn't make sense.": "Un número negativo de días no tiene sentido.",
    "A new major version may not be compatible with previous versions.": "Una nueva versión con cambios importantes puede no ser compatible con versiones anteriores.",
    "API Key": "Clave del API",
    "About": "Acerca de",
    "Actions": "Acciones",
-    "Add": "Añadir",
-    "Add Device": "Añadir dispositivo",
-    "Add Folder": "Añadir repositorio",
-    "Add new folder?": "¿Añadir una nueva carpeta?",
+    "Add": "Agregar",
+    "Add Device": "Agregar Dispositivo",
+    "Add Folder": "Agregar Carpeta",
+    "Add Remote Device": "Añadir Dispositivo Remoto",
+    "Add new folder?": "¿Agregar una carpeta nueva?",
    "Address": "Dirección",
    "Addresses": "Direcciones",
    "Advanced": "Avanzado",
    "Advanced Configuration": "Configuración Avanzada",
+    "Advanced settings": "Ajustes avanzados",
    "All Data": "Todos los datos",
    "Allow Anonymous Usage Reporting?": "¿Deseas permitir el envío anónimo de informes de uso?",
    "Alphabetic": "Alfabético",
@@ -22,23 +25,25 @@
    "Be careful!": "¡Ten cuidado!",
    "Bugs": "Errores (bugs)",
    "CPU Utilization": "Uso de CPU",
-    "Changelog": "Informe de cambios",
+    "Changelog": "Registro de cambios",
    "Clean out after": "Limpiar tras",
    "Close": "Cerrar",
-    "Command": "Comando",
+    "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",
    "Connection Error": "Error 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!": "Danger!",
-    "Delete": "Borrar",
-    "Deleted": "Borrado",
-    "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. ¿Añadir nuevo dispositivo?",
+    "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",
    "Discovery": "Descubrimiento",
@@ -50,13 +55,15 @@
    "Edit Device": "Editar dispositivo",
    "Edit Folder": "Editar repositorio",
    "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 separados por comas (\"tcp://ip:port\", \"tcp://host:port\") direcciones o \"dynamic\" para llevar a cabo la detección automática de la dirección.",
+    "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",
    "External File Versioning": "Versionado externo de fichero",
    "Failed Items": "Elementos fallidos",
-    "File Pull Order": "Orden de ficheros del pull",
+    "File Pull Order": "Orden de obtención de los ficheros",
    "File Versioning": "Versionado de ficheros",
    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Los bits de permiso de ficheros son ignorados cuando se buscan cambios. Utilizar en sistemas de ficheros FAT.",
    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Los archivos serán movidos a la carpeta .stversions cuando sean reemplazados o borrados por Syncthing.",
@@ -64,6 +71,7 @@
    "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 ficheros son protegidos por los cambios hechos en otros dispositivos, pero los cambios hechos en este dispositivo serán enviados al resto del grupo (cluster).",
    "Folder": "Carpeta",
    "Folder ID": "ID de carpeta",
+    "Folder Label": "Etiqueta de la Carpeta",
    "Folder Master": "Carpeta principal",
    "Folder Path": "Ruta de la carpeta",
    "Folders": "Carpetas",
@@ -74,6 +82,7 @@
    "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",
    "Home page": "Página de inicio",
@@ -108,6 +117,7 @@
    "OK": "OK",
    "Off": "Desconectar",
    "Oldest First": "El más antiguo primero",
+    "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": "No sincronizado",
    "Out of Sync Items": "Elementos no sincronizados",
@@ -118,28 +128,31 @@
    "Pause": "Pausar",
    "Paused": "Pausado",
    "Please consult the release notes before performing a major upgrade.": "Por favor, consultar las notas de la versión antes de realizar una actualización importante.",
-    "Please set a GUI Authentication User and Password in the Settings dialog.": "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, introduzca un Usuario y Contraseña para la Autenticación de la Interfaz de Usuario en el panel de Ajustes.",
    "Please wait": "Por favor, espere",
    "Preview": "Vista previa",
    "Preview Usage Report": "Informe de uso de vista previa",
    "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",
    "Release Notes": "Notas de la versión",
+    "Remote Devices": "Dispositivos Remotos",
    "Remove": "Eliminar",
-    "Rescan": "Volver a buscar",
-    "Rescan All": "Volver a buscar todo",
-    "Rescan Interval": "Intervalo de nueva búsqueda",
+    "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",
+    "Rescan All": "Volver a analizar Todo",
+    "Rescan Interval": "Intervalo de análisis",
    "Restart": "Reiniciar",
    "Restart Needed": "Reinicio necesario",
    "Restarting": "Reiniciando",
    "Resume": "Continuar",
    "Reused": "Reutilizado",
    "Save": "Guardar",
-    "Scan Time Remaining": "Scan Time Remaining",
-    "Scanning": "Rastreando",
+    "Scan Time Remaining": "Tiempo Restante de Escaneo",
+    "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.",
    "Settings": "Ajustes",
@@ -151,6 +164,7 @@
    "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.",
    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Se muestra en lugar del ID del dispositivo en el estado del grupo (cluster). Se actualizará al nombre que el dispositivo anuncia si se deja vacío.",
    "Shutdown": "Apagar",
@@ -172,10 +186,11 @@
    "Syncthing is upgrading.": "Syncthing se está actualizando.",
    "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.": "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.": "El panel de administración de Syncthing está configurado para permitir el acceso remoto sin contraseña.",
    "The aggregated statistics are publicly available at {%url%}.": "Las estadísticas agregadas están disponibles públicamente en {{url}}.",
    "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.",
@@ -197,7 +212,8 @@
    "The rate limit must be a non-negative number (0: no limit)": "El límite de velocidad debe ser un número no negativo (0: sin límite)",
    "The rescan interval must be a non-negative number of seconds.": "El intervalo de actualización debe ser un número positivo de segundos.",
    "They are retried automatically and will be synced when the error is resolved.": "Se reintentarán de forma automática y se sincronizarán cuando se resuelva el error.",
-    "This can easily give hackers access to read and change any files on your computer.": "This can easily give hackers access to read and change any files on your computer.",
+    "This Device": "Este Dispositivo",
+    "This can easily give hackers access to read and change any files on your computer.": "Esto podría permitir fácilmente el acceso a hackers para leer y modificar cualquier fichero de tu equipo.",
    "This is a major version upgrade.": "Hay una actualización importante.",
    "Trash Can File Versioning": "Versionado de archivos de la papelera",
    "Unknown": "Desconocido",
@@ -208,12 +224,13 @@
    "Upgrade": "Actualizar",
    "Upgrade To {%version%}": "Actualizar a {{version}}",
    "Upgrading": "Actualizando",
-    "Upload Rate": "Velocidad de actualización",
+    "Upload Rate": "Velocidad de subida",
    "Uptime": "Tiempo de funcionamiento",
    "Use HTTPS for GUI": "Usar HTTPS para la Interfaz Gráfica de Usuario (GUI)",
    "Version": "Versión",
    "Versions Path": "Ruta de las versiones",
    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Las versiones se borran automáticamente si son más antiguas que la edad máxima o exceden el número de ficheros permitidos en un intervalo.",
+    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Peligro! Esta ruta es un subdirectorio de una carpeta ya existente llamada \"{{otherFolder}}\".",
    "When adding a new device, keep in mind that this device must be added on the other side too.": "Cuando añada un nuevo dispositivo, tenga en cuenta que este debe añadirse también en el otro lado.",
    "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.": "Cuando añada una nueva carpeta, tenga en cuenta que su ID se usa para unir carpetas entre dispositivos. Son sensibles a las mayúsculas y deben coincidir exactamente entre todos los dispositivos.",
    "Yes": "Si",
@@ -221,5 +238,7 @@
    "days": "días",
    "full documentation": "Documentación completa",
    "items": "Elementos",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} quiere compartir la carpeta \"{{folder}}\"."
+    "{%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
@@ -1,17 +1,20 @@
 {
-    "A negative number of days doesn't make sense.": "Un número negativo no tiene sentido",
-    "A new major version may not be compatible with previous versions.": "Una versión mayor nueva puede ser incompatible con versiones anteriores.",
+    "A device with that ID is already added.": "Ya se ha agregado un dispositivo con esa ID.",
+    "A negative number of days doesn't make sense.": "Un número negativo de días no tiene sentido.",
+    "A new major version may not be compatible with previous versions.": "Una versión más reciente puede no ser compatible con las versiones anteriores.",
    "API Key": "Clave API",
    "About": "Acerca de",
    "Actions": "Acciones",
    "Add": "Agregar",
    "Add Device": "Agregar Dispositivo",
    "Add Folder": "Agregar Repositorio",
+    "Add Remote Device": "Agregar Dispositivo Remoto",
    "Add new folder?": "¿Agregar nueva carpeta?",
    "Address": "Dirección",
    "Addresses": "Direcciones",
    "Advanced": "Avanzada",
    "Advanced Configuration": "Configuración avanzada",
+    "Advanced settings": "Configuración avanzada",
    "All Data": "Todos los datos",
    "Allow Anonymous Usage Reporting?": "Permitir reporte anónimo de uso?",
    "Alphabetic": "Alfabético",
@@ -31,10 +34,12 @@
    "Connection Error": "Error 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!": "Danger!",
+    "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 ID": "ID del dispositivo",
    "Device Identification": "Identificación del dispositivo",
    "Device Name": "Nombre del dispositivo",
@@ -50,6 +55,8 @@
    "Edit Device": "Editar dispositivo",
    "Edit Folder": "Editar 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.",
    "Enter ignore patterns, one per line.": "Añadir patrones de exclusión, uno por línea.",
@@ -64,6 +71,7 @@
    "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 ID": "ID del repositorio",
+    "Folder Label": "Folder Label",
    "Folder Master": "Repositorio maestro",
    "Folder Path": "Ruta del repositorio",
    "Folders": "Repositorios",
@@ -74,6 +82,7 @@
    "Generate": "Generar",
    "Global Discovery": "Búsqueda en internet",
    "Global Discovery Server": "Servidor global de identificación",
+    "Global Discovery Servers": "Global Discovery Servers",
    "Global State": "Estado global",
    "Help": "Ayuda",
    "Home page": "Pagina de inicio",
@@ -108,6 +117,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.",
    "Options": "Opciones",
    "Out of Sync": "Fuera de sincronización",
    "Out of Sync Items": "Ítems no sincronizados",
@@ -125,10 +135,13 @@
    "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",
    "Release Notes": "Notas de lanzamiento",
+    "Remote Devices": "Dispositivos Remotos",
    "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.",
    "Rescan": "Reescanear",
    "Rescan All": "Reescanear todo",
    "Rescan Interval": "Intervalo de reescaneo",
@@ -138,7 +151,7 @@
    "Resume": "Reanudar",
    "Reused": "Reutilizado",
    "Save": "Guardar",
-    "Scan Time Remaining": "Scan Time Remaining",
+    "Scan Time Remaining": "Tiempo de Escaneo Restante",
    "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.",
@@ -151,6 +164,7 @@
    "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.",
    "Shutdown": "Apagar",
@@ -172,10 +186,11 @@
    "Syncthing is upgrading.": "Syncthing se está actualizando.",
    "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.": "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.": "La interfaz administrativa del Syncthing está configurada para permitir acceso remoto sin una contraseña.",
    "The aggregated statistics are publicly available at {%url%}.": "Las estadísticas acumuladas están disponibles públicamente en {{url}}.",
    "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 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.",
@@ -194,10 +209,11 @@
    "The number of old versions to keep, per file.": "El numero de versiones anteriores a conservar, por archivo.",
    "The number of versions must be a number and cannot be blank.": "El número de versiones debe ser un número y no puede estar vacío.",
    "The path cannot be blank.": "La ruta no puede estar vacía.",
-    "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
+    "The rate limit must be a non-negative number (0: no limit)": "El intervalo de reescaneo debe ser un número no negativo de segundos.  (0: no limit)",
    "The rescan interval must be a non-negative number of seconds.": "El intervalo de reescaneo debe ser un número no negativo de segundos.",
-    "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 can easily give hackers access to read and change any files on your computer.": "This can easily give hackers access to read and change any files on your computer.",
+    "They are retried automatically and will be synced when the error is resolved.": "Los archivos se sincronizan automáticamente cuando el error se resuelve.",
+    "This Device": "Este Dispositivo",
+    "This can easily give hackers access to read and change any files on your computer.": "Esto puede darle permiso a los hackers, podrán acceder a cualquier archivo, pudiéndolos leer y editar.",
    "This is a major version upgrade.": "Esta es una actualización de version mayor.",
    "Trash Can File Versioning": "Versiones como cubo de basura",
    "Unknown": "Desconocido",
@@ -214,6 +230,7 @@
    "Version": "Versión",
    "Versions Path": "Ruta de versiones",
    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Las versiones se eliminan automáticamente si son mayores de la edad máxima o mayor que el número de archivos permitidos en un intervalo.",
+    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Atención, esta dirección es un subdirectorio de un directorio existente \"{{otherFolder}}\".",
    "When adding a new device, keep in mind that this device must be added on the other side too.": "Al agregar un nuevo dispositivo, tenga en cuenta que este dispositivo se debe agregar en el otro lado tambié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.": "Al agregar un nuevo repositorio, tenga en cuenta que la ID del repositorio se utiliza para conectar los repositorios entre dispositivos. Se distingue entre mayúsculas y minúsculas y debe ser exactamente igual en todos los dispositivos.",
    "Yes": "Sí",
@@ -221,5 +238,7 @@
    "days": "días",
    "full documentation": "documentación completa",
    "items": "ítems",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} quiere compartir repositorio \"{{folder}}\"."
+    "{%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}})."
 }
--- a/gui/default/assets/lang/lang-fi.json
+++ b/gui/default/assets/lang/lang-fi.json
@@ -1,17 +1,20 @@
 {
+    "A device with that ID is already added.": "ID:llä on jo lisätty laite.",
    "A negative number of days doesn't make sense.": "Negatiivinen määrä päiviä ei ole järjellinen.",
-    "A new major version may not be compatible with previous versions.": "A new major version may not be compatible with previous versions.",
+    "A new major version may not be compatible with previous versions.": "Uusi pääversio ei välttämättä ole yhteensopiva aiempien versioiden kanssa.",
    "API Key": "API-avain",
    "About": "Tietoja",
-    "Actions": "Actions",
+    "Actions": "Muokkaa",
    "Add": "Lisää",
    "Add Device": "Lisää laite",
    "Add Folder": "Lisää kansio",
+    "Add Remote Device": "Add Remote Device",
    "Add new folder?": "Lisää uusi kansio?",
    "Address": "Osoite",
    "Addresses": "Osoitteet",
    "Advanced": "Advanced",
    "Advanced Configuration": "Advanced Configuration",
+    "Advanced settings": "Advanced settings",
    "All Data": "Kaikki data",
    "Allow Anonymous Usage Reporting?": "Salli anonyymi käyttöraportointi?",
    "Alphabetic": "Alphabetic",
@@ -31,17 +34,19 @@
    "Connection Error": "Yhteysvirhe",
    "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:",
-    "Danger!": "Danger!",
+    "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 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",
-    "Discovery": "Discovery",
+    "Discovery": "Etsintä",
    "Documentation": "Dokumentaatio",
    "Download Rate": "Latausmäärä",
    "Downloaded": "Ladattu",
@@ -50,12 +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",
    "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": "Failed Items",
+    "Failed Items": "Epäonnistuneet kohteet",
    "File Pull Order": "File Pull Order",
    "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ä.",
@@ -64,6 +71,7 @@
    "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 Path": "Kansion polku",
    "Folders": "Kansiot",
@@ -74,14 +82,15 @@
    "Generate": "Generoi",
    "Global Discovery": "Globaali etsintä",
    "Global Discovery Server": "Globaali etsintäpalvelin",
+    "Global Discovery Servers": "Globaalit etsintäpalvelimet",
    "Global State": "Globaali tila",
-    "Help": "Help",
+    "Help": "Apua",
    "Home page": "Kotisivu",
    "Ignore": "Ohita",
    "Ignore Patterns": "Ohituslausekkeet",
    "Ignore Permissions": "Jätä oikeudet huomiotta",
    "Incoming Rate Limit (KiB/s)": "Sisääntulevan liikenteen rajoitus (KiB/s)",
-    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Incorrect configuration may damage your folder contents and render Syncthing inoperable.",
+    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Virheelliset asetukset voivat vahingoittaa kansion sisältöä tai estää Syncthingin toiminnan.",
    "Introducer": "Esittelijä",
    "Inversion of the given condition (i.e. do not exclude)": "Käänteinen ehto (t.s. älä ohita)",
    "Keep Versions": "Säilytä versiot",
@@ -91,8 +100,8 @@
    "Later": "Myöhemmin",
    "Local Discovery": "Paikallinen etsintä",
    "Local State": "Paikallinen tila",
-    "Local State (Total)": "Local State (Total)",
-    "Major Upgrade": "Major Upgrade",
+    "Local State (Total)": "Paikallinen tila (Yhteensä)",
+    "Major Upgrade": "Pääversion päivitys.",
    "Maximum Age": "Maksimi-ikä",
    "Metadata Only": "Vain metadata",
    "Minimum Free Disk Space": "Vapaan levytilan vähimmäismäärä",
@@ -108,8 +117,9 @@
    "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",
-    "Out of Sync": "Out of Sync",
+    "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)",
    "Override Changes": "Ohita muutokset",
@@ -117,18 +127,21 @@
    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Polku jonne versiot tullaan tallentamaan (jätä tyhjäksi oletusvalintaa .stversions varten).",
    "Pause": "Keskeytä",
    "Paused": "Keskeytetty",
-    "Please consult the release notes before performing a major upgrade.": "Please consult the release notes before performing a major upgrade.",
-    "Please set a GUI Authentication User and Password in the Settings dialog.": "Please set a GUI Authentication User and Password in the Settings dialog.",
+    "Please consult the release notes before performing a major upgrade.": "Tutustu julkaisutietoihin ennen kuin teet pääversion päivityksen.",
+    "Please set a GUI Authentication User and Password in the Settings dialog.": "Ole hyvä ja aseta käyttäjätunnus ja salasana käyttöliittymää varten asetusvalikossa.",
    "Please wait": "Ole hyvä ja odota",
    "Preview": "Esikatselu",
    "Preview Usage Report": "Esikatsele käyttöraportti",
    "Quick guide to supported patterns": "Tuettujen lausekkeiden pikaohje",
    "RAM Utilization": "RAM:n käyttö",
    "Random": "Satunnaien",
-    "Relayed via": "Relayed via",
+    "Relay Servers": "Välityspalvelimet",
+    "Relayed via": "Käytetty välityspalvelin",
    "Relays": "Välityspalvelimet",
    "Release Notes": "Julkaisutiedot",
+    "Remote Devices": "Remote Devices",
    "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.",
    "Rescan": "Skannaa uudelleen",
    "Rescan All": "Skannaa kaikki uudelleen",
    "Rescan Interval": "Uudelleenskannauksen aikaväli",
@@ -138,7 +151,7 @@
    "Resume": "Jatka",
    "Reused": "Uudelleenkäytetty",
    "Save": "Tallenna",
-    "Scan Time Remaining": "Scan Time Remaining",
+    "Scan Time Remaining": "Skannausaikaa jäljellä",
    "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.",
@@ -151,6 +164,7 @@
    "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ä.",
    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Näytetään ryhmän tiedoissa laitteen ID:n sijaan. Tyhjä nimi päivitetään laitteen ilmoittamaksi nimeksi.",
    "Shutdown": "Sammuta",
@@ -172,10 +186,11 @@
    "Syncthing is upgrading.": "Syncthing päivittyy.",
    "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.": "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.": "Syncthingin hallintakäyttöliittymä on asetettu sallimaan ulkoiset yhteydet ilman salasanaa.",
    "The aggregated statistics are publicly available at {%url%}.": "Yhdistetyt tilastot ovat julkisesti saatavilla osoitteessa {{url}}.",
    "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.",
@@ -197,15 +212,16 @@
    "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 can easily give hackers access to read and change any files on your computer.": "This can easily give hackers access to read and change any files on your computer.",
-    "This is a major version upgrade.": "This is a major version upgrade.",
-    "Trash Can File Versioning": "Trash Can File Versioning",
+    "This Device": "This Device",
+    "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",
    "Unknown": "Tuntematon",
    "Unshared": "Jakamaton",
    "Unused": "Käyttämätön",
    "Up to Date": "Ajan tasalla",
-    "Updated": "Updated",
-    "Upgrade": "Upgrade",
+    "Updated": "Päivitetty",
+    "Upgrade": "Päivitys",
    "Upgrade To {%version%}": "Päivitä versioon {{version}}",
    "Upgrading": "Päivitetään",
    "Upload Rate": "Lähetysmäärä",
@@ -214,12 +230,15 @@
    "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}}\".",
    "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": "days",
+    "days": "päivää",
    "full documentation": "täysi dokumentaatio",
    "items": "kohteet",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} haluaa jakaa kansion \"{{folder}}\"."
+    "{%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}})."
 }
--- a/gui/default/assets/lang/lang-fr-CA.json
+++ b/gui/default/assets/lang/lang-fr-CA.json
@@ -1,4 +1,5 @@
 {
+    "A device with that ID is already added.": "A device with that ID is already added.",
    "A negative number of days doesn't make sense.": "Un nombre négatif de jours n'a pas de sens.",
    "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",
@@ -7,11 +8,13 @@
    "Add": "Ajouter",
    "Add Device": "Ajouter un périphérique",
    "Add Folder": "Ajouter un répertoire",
+    "Add Remote Device": "Add Remote Device",
    "Add new folder?": "Ajouter un nouveau dossier ?",
    "Address": "Adresse",
    "Addresses": "Adresses",
    "Advanced": "Avancé",
    "Advanced Configuration": "Configuration avancée",
+    "Advanced settings": "Advanced settings",
    "All Data": "Toutes les données",
    "Allow Anonymous Usage Reporting?": "Autoriser le rapport anonyme de statistiques d'utilisation ?",
    "Alphabetic": "Alphabétique",
@@ -31,10 +34,12 @@
    "Connection Error": "Erreur de connexion",
    "Copied from elsewhere": "Copié d'ailleurs",
    "Copied from original": "Copié depuis l'original",
+    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 the following Contributors:",
    "Copyright © 2015 the following Contributors:": "Copyright © 2015 Les contributeurs suivants:",
    "Danger!": "Danger!",
    "Delete": "Supprimer",
    "Deleted": "Supprimé",
+    "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 du périphérique",
    "Device Identification": "Identification de l'appareil",
    "Device Name": "Nom du périphérique",
@@ -50,6 +55,8 @@
    "Edit Device": "Éditer le périphérique",
    "Edit Folder": "Éditer le répertoire",
    "Editing": "Édition",
+    "Enable NAT traversal": "Enable NAT traversal",
+    "Enable Relaying": "Enable Relaying",
    "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.",
@@ -64,6 +71,7 @@
    "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.",
    "Folder": "Dossier",
    "Folder ID": "ID du répertoire",
+    "Folder Label": "Folder Label",
    "Folder Master": "Répertoire maître",
    "Folder Path": "Chemin du répertoire",
    "Folders": "Dossiers",
@@ -74,6 +82,7 @@
    "Generate": "Générer",
    "Global Discovery": "Recherche globale",
    "Global Discovery Server": "Serveur global de recherche",
+    "Global Discovery Servers": "Global Discovery Servers",
    "Global State": "État global",
    "Help": "Aide",
    "Home page": "Page d'accueil",
@@ -108,6 +117,7 @@
    "OK": "OK",
    "Off": "Éteint",
    "Oldest First": "Les plus anciens en premier",
+    "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",
    "Out of Sync": "Désynchronisé",
    "Out of Sync Items": "Objets non synchronisés",
@@ -125,10 +135,13 @@
    "Quick guide to supported patterns": "Guide rapide des masques supportés",
    "RAM Utilization": "Utilisation de la RAM",
    "Random": "Aléatoire",
+    "Relay Servers": "Relay Servers",
    "Relayed via": "Relayée par",
    "Relays": "Relais",
    "Release Notes": "Notes de version",
+    "Remote Devices": "Remote Devices",
    "Remove": "Enlever",
+    "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": "Rescanner",
    "Rescan All": "Réanalyser tout",
    "Rescan Interval": "Intervalle de scan",
@@ -151,6 +164,7 @@
    "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 appareils du groupe.",
    "Show ID": "Montrer l'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.": "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.",
    "Shutdown": "Éteindre",
@@ -176,6 +190,7 @@
    "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 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).": "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).": "L'ID de l'appareil à entrer peut être trouvé dans le menu \"Éditer > Montrer l'ID\" des autres appareils. 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 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.",
@@ -197,6 +212,7 @@
    "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 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": "This Device",
    "This can easily give hackers access to read and change any files on your computer.": "This can easily give hackers access to read and change any files on your computer.",
    "This is a major version upgrade.": "Ceci est une mise à jour majeure.",
    "Trash Can File Versioning": "Gestion des versions de fichier style poubelle.",
@@ -214,6 +230,7 @@
    "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%}\".": "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.": "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 répertoire est ajouté, gardez à l'esprit que son ID est utilisé pour lier les répertoires à travers les appareils. Les ID sont sensibles à la casse et doivent être identiques à travers tous les nœuds.",
    "Yes": "Oui",
@@ -221,5 +238,7 @@
    "days": "Jours",
    "full documentation": "documentation complète",
    "items": "éléments",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} veut partager le dossier \"{{folder}}\"."
+    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} veut partager le dossier \"{{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-fr.json
+++ b/gui/default/assets/lang/lang-fr.json
@@ -1,23 +1,26 @@
 {
+    "A device with that ID is already added.": "Une machine avec cet ID a déjà été ajoutée.",
    "A negative number of days doesn't make sense.": "Un nombre négatif de jours n'a pas de sens.",
    "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 un périphérique",
-    "Add Folder": "Ajouter un répertoire",
+    "Add Device": "Ajouter une machine",
+    "Add Folder": "Ajouter un dossier",
+    "Add Remote Device": "Ajouter une machine distante",
    "Add new folder?": "Ajouter un nouveau dossier ?",
    "Address": "Adresse",
    "Addresses": "Adresses",
    "Advanced": "Avancé",
    "Advanced Configuration": "Configuration avancée",
+    "Advanced settings": "Configuration avancée",
    "All Data": "Toutes les données",
    "Allow Anonymous Usage Reporting?": "Autoriser le rapport anonyme de statistiques d'utilisation ?",
    "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é.",
    "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.": "Toute machine ajoutée depuis une machine initiatrice sera aussi ajoutée sur cette machine.",
    "Automatic upgrades": "Mises à jour automatiques",
    "Be careful!": "Faites attention !",
    "Bugs": "Bugs",
@@ -31,41 +34,46 @@
    "Connection Error": "Erreur 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!": "Danger!",
+    "Danger!": "Attention !",
    "Delete": "Supprimer",
    "Deleted": "Supprimé",
-    "Device ID": "ID du périphérique",
-    "Device Identification": "Identification de l'appareil",
-    "Device Name": "Nom du périphérique",
-    "Device {%device%} ({%address%}) wants to connect. Add new device?": "L'appareil {{device}} ({{address}}) veut se connecter. Voulez-vous ajouter cette appareil ?",
-    "Devices": "Appareils",
+    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "La machine \"{{name}}\" ({{device}} sur {{address}}) veut se connecter. Ajouter cette nouvelle machine ?",
+    "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",
    "Disconnected": "Déconnecté",
    "Discovery": "Découverte",
    "Documentation": "Documentation",
-    "Download Rate": "Débit de réception",
+    "Download Rate": "Vitesse de réception",
    "Downloaded": "Téléchargé",
    "Downloading": "En cours de téléchargement",
    "Edit": "Éditer",
-    "Edit Device": "Éditer le périphérique",
-    "Edit Folder": "Éditer le répertoire",
+    "Edit Device": "Éditer la machine",
+    "Edit Folder": "Éditer le dossier",
    "Editing": "Édition",
+    "Enable NAT traversal": "Activer le transfert 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.",
    "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",
+    "Failed Items": "Fichiers en échec",
+    "File Pull Order": "Ordre de récupération des fichiers",
    "File Versioning": "Versions de fichier",
    "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 appareils, mais les changements réalisés sur cet appareil seront transférés aux autres appareils.",
+    "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 répertoire",
-    "Folder Master": "Répertoire maître",
-    "Folder Path": "Chemin du répertoire",
+    "Folder ID": "ID du dossier",
+    "Folder Label": "Étiquette du dossier",
+    "Folder Master": "Dossier maître",
+    "Folder Path": "Chemin du dossier",
    "Folders": "Dossiers",
    "GUI": "GUI",
    "GUI Authentication Password": "Mot de passe d'authentification GUI",
@@ -74,13 +82,14 @@
    "Generate": "Générer",
    "Global Discovery": "Recherche globale",
    "Global Discovery Server": "Serveur global de recherche",
+    "Global Discovery Servers": "Serveurs de découverte globale",
    "Global State": "État global",
    "Help": "Aide",
    "Home page": "Page d'accueil",
    "Ignore": "Ignorer",
    "Ignore Patterns": "Modèles à éviter",
    "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 (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",
    "Inversion of the given condition (i.e. do not exclude)": "Inverser la condition donnée (i.e. ne pas exclure)",
@@ -99,7 +108,7 @@
    "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)",
    "Never": "Jamais",
-    "New Device": "Nouvel appareil",
+    "New Device": "Nouvelle machine",
    "New Folder": "Nouveau dossier",
    "Newest First": "Les plus récents en premier",
    "No": "Non",
@@ -108,51 +117,56 @@
    "OK": "OK",
    "Off": "Éteint",
    "Oldest First": "Les plus anciens en premier",
+    "Optional descriptive label for the folder. Can be different on each device.": "Étiquette optionnelle pour le dossier. Peut être différente pour chaque machine.",
    "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": "Fichiers non synchronisés",
+    "Outgoing Rate Limit (KiB/s)": "Limite du débit d'émission (Ko/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 dossier sur l'ordinateur local sera créé si il n'existe pas. Le caractère tilde (~) 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",
    "Please consult the release notes before performing a major upgrade.": "Veuillez consulter les notes de version avant de réaliser une mise à jour majeure.",
-    "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.": "SVP, mettez un nom d'utilisateur et un mot de passe dans la fenêtre de paramétrage.",
    "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",
    "RAM Utilization": "Utilisation de la RAM",
    "Random": "Aléatoire",
+    "Relay Servers": "Serveurs relais",
    "Relayed via": "Relayée par",
    "Relays": "Relais",
    "Release Notes": "Notes de version",
+    "Remote Devices": "Machines distantes",
    "Remove": "Enlever",
-    "Rescan": "Rescanner",
+    "Required identifier for the folder. Must be the same on all cluster devices.": "Identifiant pour le dossier. Doit être le même sur l'ensemble des machines du cluster.",
+    "Rescan": "Réanalyse",
    "Rescan All": "Réanalyser tout",
-    "Rescan Interval": "Intervalle de scan",
+    "Rescan Interval": "Intervalle d'analyse",
    "Restart": "Redémarrer",
    "Restart Needed": "Redémarrage nécessaire",
    "Restarting": "Redémarrage",
    "Resume": "Résumer",
    "Reused": "Réutilisé",
    "Save": "Sauver",
-    "Scan Time Remaining": "Scan Time Remaining",
-    "Scanning": "En cours de scan",
-    "Select the devices to share this folder with.": "Sélectionner les appareils avec qui partager ce dossier.",
-    "Select the folders to share with this device.": "Sélectionner les dossiers à partager avec cet appareil.",
+    "Scan Time Remaining": "Intervalle entre chaque analyse",
+    "Scanning": "En cours d'analyse",
+    "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.",
    "Settings": "Configuration",
    "Share": "Partager",
    "Share Folder": "Partager le dossier",
-    "Share Folders With Device": "Partager des dossiers avec des appareils",
+    "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 appareils du groupe.",
-    "Show ID": "Montrer l'ID",
-    "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.",
+    "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.",
+    "Show ID": "Afficher l'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.",
    "Shutdown": "Éteindre",
    "Shutdown Complete": "Extinction terminée",
    "Simple File Versioning": "Suivi simple des versions de fichier",
@@ -172,20 +186,21 @@
    "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.",
-    "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 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 {%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 l'appareil ne peut être vide.",
-    "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 l'appareil à entrer peut être trouvé dans le menu \"Éditer > Montrer l'ID\" des autres appareils. Les espaces et les tirets sont optionnels (ils seront ignorés).",
+    "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 la machine à indiquer ici se trouve dans \"Actions > Afficher ID\" sur l'autre machine. 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 la machine à entrer peut être trouvé dans le menu \"Éditer > Montrer l'ID\" des autres machines. 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 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 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 répertoire doit être unique.",
-    "The folder path cannot be blank.": "Le chemin du répertoire ne peut pas être vide.",
+    "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 éléments suivants ne peuvent pas être synchronisés.",
+    "The following items could not be synchronized.": "Les fichiers suivants ne peuvent pas ê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 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).",
@@ -197,7 +212,8 @@
    "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 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 can easily give hackers access to read and change any files on your computer.": "This can easily give hackers access to read and change any files on your computer.",
+    "This Device": "Cette machine",
+    "This can easily give hackers access to read and change any files on your computer.": "Cela permet facilement aux pirates de lire et modifier n'importe quel fichier de votre machine.",
    "This is a major version upgrade.": "Ceci est une mise à jour majeure.",
    "Trash Can File Versioning": "Gestion des versions de fichier style poubelle.",
    "Unknown": "Inconnu",
@@ -208,18 +224,21 @@
    "Upgrade": "Mettre à jour",
    "Upgrade To {%version%}": "Mettre à jour vers {{version}}",
    "Upgrading": "Mise à jour de Syncthing",
-    "Upload Rate": "Débit d'envoi",
+    "Upload Rate": "Vitesse d'émission",
    "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.",
-    "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 répertoire est ajouté, gardez à l'esprit que son ID est utilisé pour lier les répertoires à travers les appareils. 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 dossier existant \"{{otherFolder}}\".",
+    "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.",
    "Yes": "Oui",
    "You must keep at least one version.": "Vous devez garder au minimum une version.",
    "days": "Jours",
    "full documentation": "documentation complète",
-    "items": "éléments",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} veut partager le dossier \"{{folder}}\"."
+    "items": "fichiers",
+    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} veut partager le dossier \"{{folder}}\".",
+    "{%device%} wants to share folder \"{%folderLabel%}\" ({%folder%}).": "{{device}} veut partager le dossier \"{{folderLabel}}\" ({{folder}}).",
+    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} veut partager le dossier \"{{folderLabel}}\" ({{folder}})."
 }
--- a/gui/default/assets/lang/lang-fy.json
+++ b/gui/default/assets/lang/lang-fy.json
@@ -1,23 +1,26 @@
 {
+    "A device with that ID is already added.": "In apparaat mei dat ID is al taheakke.",
    "A negative number of days doesn't make sense.": "In negatyf tal dagen soe healwiis wêze.",
    "A new major version may not be compatible with previous versions.": "In nije, wichtige ferzje koe wol ris net te kombinearjen wêze mei foargeande ferzjes.",
    "API Key": "API-kaai",
    "About": "Oer",
    "Actions": "Aksjes",
-    "Add": "Tafoegje",
-    "Add Device": "Apparaat tafoegje",
-    "Add Folder": "Map tafoegje",
-    "Add new folder?": "Nije map tafoegje?",
+    "Add": "Taheakje",
+    "Add Device": "Apparaat taheakje",
+    "Add Folder": "Map taheakje",
+    "Add Remote Device": "Apparaat op Ofstân Taheakje",
+    "Add new folder?": "Nije map taheakje?",
    "Address": "Adres",
    "Addresses": "Adressen",
    "Advanced": "Avansearre",
    "Advanced Configuration": "Avansearre konfiguraasje",
+    "Advanced settings": "Avansearre ynstellings",
    "All Data": "Alle data",
    "Allow Anonymous Usage Reporting?": "Anonime brûkensrapportaazje tastean?",
    "Alphabetic": "Alfabetysk",
    "An external command handles the versioning. It has to remove the file from the synced folder.": "In ekstern kommando soarget foar it ferzjebehear. It moat de triem út de syngronisearre map fuortsmite.",
    "Anonymous Usage Reporting": "Anonym brûkensrapportaazje",
-    "Any devices configured on an introducer device will be added to this device as well.": "Alle apparaten die op in 'yntrodusearjend apparaat' ynstelt binne, wurde ek oan dit apparaat tafoeget.",
+    "Any devices configured on an introducer device will be added to this device as well.": "Alle apparaten die op in 'yntrodusearjend apparaat' ynstelt binne, wurde ek op dit apparaat taheakke.",
    "Automatic upgrades": "Automatyske fernijings",
    "Be careful!": "Tink derom!",
    "Bugs": "Brekkings",
@@ -31,28 +34,32 @@
    "Connection Error": "Ferbiningsflater",
    "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": "Apparaat-identifikaasje",
-    "Device Name": "Apparaat-namme",
-    "Device {%device%} ({%address%}) wants to connect. Add new device?": "Apparaat {{device}} ({{address}}) wol ferbining meitsje. Nij apparaat tafoege?",
+    "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",
    "Discovery": "Untdekking",
    "Documentation": "Dokumintaasje",
-    "Download Rate": "Download-fluggens",
-    "Downloaded": "Downloaden",
-    "Downloading": "Oan it downloaden",
+    "Download Rate": "Ynlaadfluggens",
+    "Downloaded": "Ynladen",
+    "Downloading": "Oan it ynladen",
    "Edit": "Bewurkje",
    "Edit Device": "Apparaat bewurkje",
    "Edit Folder": "Map bewurkje",
    "Editing": "Bewurkjen",
+    "Enable NAT traversal": "Enable NAT traversal",
+    "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 \"dynamysk\" om automatyske ûntdekking fan it adres út te fieren.",
-    "Enter ignore patterns, one per line.": "Fier negear-patroanen yn, ien per rigel.",
+    "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",
    "External File Versioning": "Ekstern ferzjebehear foar triemen",
    "Failed Items": "Mislearre items",
@@ -61,19 +68,21 @@
    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Bits foar triemrjochten wurde negearre yn it sykjen foar feroarings. Brûk dit op FAT-triemsystemen.",
    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Triemen wurde ferset nei map .stversions wannear't troch Syncthing ferfangen of fuortsmiten.",
    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Triemen wurde ferset nei in mei datum stimpele ferzjes yn in .stversions map wannear troch Syncthing ferfangen of fuortsmiten.",
-    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Triemen binne ymmún foar feroarings makke troch oare apparaten, mar feroarings makke op dit apparaat wurde nei de rest ferstjoerd.",
+    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Triemen binne ymmún foar feroarings makke troch oare apparaten, mar feroarings makke op dit apparaat wurde nei de rest fan 'e bondel ferstjoerd.",
    "Folder": "Map",
    "Folder ID": "Map-ID",
+    "Folder Label": "Map-opskrift",
    "Folder Master": "Map-master",
    "Folder Path": "Map-paad",
    "Folders": "Mappen",
    "GUI": "GUI",
-    "GUI Authentication Password": "GUI-wachtwurd foar ferifikaasje",
-    "GUI Authentication User": "GUI-brûkerferifikaasje",
-    "GUI Listen Addresses": "GUI-harkadres",
+    "GUI Authentication Password": "Wachtwurd foar ferifikaasje yn GUI",
+    "GUI Authentication User": "Brûkers-ID foar ferifikaasje yn GUI",
+    "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",
    "Home page": "Hiemstee",
@@ -84,9 +93,9 @@
    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Ferkearde konfiguraasje kin de ynhâld fan jo mappen skeine en Syncthing unbrûkber meitsje.",
    "Introducer": "Yntrodusearrer",
    "Inversion of the given condition (i.e. do not exclude)": "Dizze betingst omkeare (d.w.z. net útslute) ",
-    "Keep Versions": "Ferzjes hâlde",
+    "Keep Versions": "Ferzjes bewarje",
    "Largest First": "Grutste earst",
-    "Last File Received": "Leste triem ûntfangen",
+    "Last File Received": "Leste triem ûntfongen",
    "Last seen": "Lêst sjoen",
    "Later": "Letter",
    "Local Discovery": "Lokale ûntdekking",
@@ -95,7 +104,7 @@
    "Major Upgrade": "Wichtige fernijing",
    "Maximum Age": "Maksimale âldens",
    "Metadata Only": "Allinnich metadata",
-    "Minimum Free Disk Space": "Maksimale frije skiifromte",
+    "Minimum Free Disk Space": "Minimale frije skiifromte",
    "Move to top of queue": "Fersette nei boppe oan de rige",
    "Multi level wildcard (matches multiple directory levels)": "Multi-nivo jokerteken (wildcard) (fergelykt mei meardere map-nivo's)",
    "Never": "Nea",
@@ -108,37 +117,41 @@
    "OK": "Okee",
    "Off": "Ut",
    "Oldest First": "Aldste earst",
+    "Optional descriptive label for the folder. Can be different on each device.": "Opsjoneel beskriuwend opskrift foar de map. Mei op ider apparaat oars wêze.",
    "Options": "Opsjes",
    "Out of Sync": "Net syngronisearre",
    "Out of Sync Items": "Net syngronisearre items",
    "Outgoing Rate Limit (KiB/s)": "Uploadfluggenslimyt (KiB/s)",
-    "Override Changes": "Feroarings oerfleane",
-    "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": "Paad nei de map op de lokale kompjûter. Wurd oanmakke at dizze net bestiet. It tilde teken (~) kin brûkt wurde as fluchkeppeling foar",
-    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Paad wêr de ferzjes bewarre wurde moatte (lit leech foar de standert .stversions-map yn de map).",
-    "Pause": "Skoft",
+    "Override Changes": "Feroarings oerskriuwe",
+    "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": "Paad nei de map op de lokale kompjûter. Wurd oanmakke as dizze net bestiet. It tilde teken (~) kin brûkt wurde as fluchkeppeling foar",
+    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Paad dêr't de ferzjes bewarre wurde moatte (leech litte foar de standert .stversions-map yn de map).",
+    "Pause": "Skoftsje",
    "Paused": "Skoftet",
-    "Please consult the release notes before performing a major upgrade.": "Lês graach de fernijingsnotysjes foardat in wichtige fernijing ynstallearre wurd.",
-    "Please set a GUI Authentication User and Password in the Settings dialog.": "Graach foar GUI-ferifikaasje in brûkers-ID en wachtwurd ynfiere in it ynstellingsdialooch",
-    "Please wait": "In amerijke graach",
+    "Please consult the release notes before performing a major upgrade.": "Foardat jo in wichtige fernijing ynstallearre, graach earst de fernijingsoantekenings lêze.",
+    "Please set a GUI Authentication User and Password in the Settings dialog.": "Graach foar GUI-ferifikaasje in brûkers-ID en wachtwurd ynstelle yn it ynstellingsdialooch.",
+    "Please wait": "In amerijke",
    "Preview": "Foarbyld",
-    "Preview Usage Report": "Foarbyld fan brûksrapport ",
+    "Preview Usage Report": "Foarbyld fan brûkensrapport ",
    "Quick guide to supported patterns": "Fluch-paadwizer foar stipe patroanen",
-    "RAM Utilization": "Rambrûken",
+    "RAM Utilization": "RAM-brûken",
    "Random": "Willekeurich",
+    "Relay Servers": "Trochjoutsjinners",
    "Relayed via": "Trochjûn fia",
    "Relays": "Trochjouers",
    "Release Notes": "Utjeftenotysjes",
+    "Remote Devices": "Apparaten op Ofstân",
    "Remove": "Fuortsmite",
-    "Rescan": "Opnij skenne",
-    "Rescan All": "Alles opnij skenne",
-    "Rescan Interval": "Ynterval foar opnij skenne",
-    "Restart": "Werstart",
+    "Required identifier for the folder. Must be the same on all cluster devices.": "Ferplicht ID foar de map. Moat op alle bondelapparaten itselde wêze.",
+    "Rescan": "Sken opnij",
+    "Rescan All": "Sken alles opnij",
+    "Rescan Interval": "Wersken ynterval",
+    "Restart": "Werstarte",
    "Restart Needed": "Werstart nedich",
    "Restarting": "Oan it werstarten",
    "Resume": "Trochgean",
    "Reused": "Opnij brûkt",
    "Save": "Bewarje",
-    "Scan Time Remaining": "Scan Time Remaining",
+    "Scan Time Remaining": "Oerbleaune skentiid",
    "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.",
@@ -149,46 +162,48 @@
    "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.": "Koart opskrift foar de map. Moat op alle apparaten itselde wêze.",
+    "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",
-    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Wurd yn de bondeltastân sjen litten ynstee fan apparaat-ID. Wurd nei oare apparaten advertearre as opsjonele standertnamme.",
-    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Wurd yn de bondeltastân sjen litten ynstee fan apparaat-ID. Wannear it leech litten wurd, wurd it fernijt nei de namme die it apparaat advertearret.",
+    "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.",
+    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Wurd yn de bondeltastân sjen litten ynstee fan apparaat-ID. Wannear't leech litten wurd, wurd it fernijt nei de namme die it apparaat útstjoert.",
    "Shutdown": "Ofslute",
    "Shutdown Complete": "Ofsluten klear",
-    "Simple File Versioning": "Ienfâldige triemferzjebehear",
-    "Single level wildcard (matches within a directory only)": "Inkel-nivo jokerteken (wildcard) (fergeliket allinich binnen in map)",
+    "Simple File Versioning": "Ienfâldich triemferzjebehear",
+    "Single level wildcard (matches within a directory only)": "Inkel-nivo jokerteken (wildcard) (fergeliket allinnich binnen in map)",
    "Smallest First": "Lytste earst",
    "Source Code": "Boarnekoade",
    "Staggered File Versioning": "Sprieden triemferzjebehear",
-    "Start Browser": "Browser starte",
+    "Start Browser": "Browser iepenje wannear't Syncthing start",
    "Statistics": "Statistiken",
    "Stopped": "Stoppe",
    "Support": "Understeuning",
-    "Sync Protocol Listen Addresses": "Sync-protokol harkadres",
+    "Sync Protocol Listen Addresses": "Sync-protokolharkadressen",
    "Syncing": "Oan it Syncen",
    "Syncthing has been shut down.": "Syncthing is útsetten",
    "Syncthing includes the following software or portions thereof:": "Syncthing befettet de folgende sêftguod of parten dêrfan:",
    "Syncthing is restarting.": "Syncthing oan it werstarten.",
    "Syncthing is upgrading.": "Syncthing is oan it fernijen.",
-    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "It liket dêrop dat Syncthing op dit stuit net rint, of der is in probleem mei jo ynternetferbining. ",
+    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "It liket dêrop dat Syncthing op dit stuit net rint, of der is in swierrichheid mei jo ynternetferbining. Wurd no opnij besocht...",
    "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 {%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.": "De apparaat-ID kin net leech wêze.",
-    "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 opsjoneel (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 folle brûkte platfoarmen, mapgruttens en appferzjes by te hâlden. At de rapportearre dataset feroare wurd, 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 yntypte apparaat-ID liket net falide. It moat in tekenrige (string) mei in lingte fan 52 of 56 karakters wêze, besteande út letters en nûmers, mei spaasjes en streepkes opsjoneel.",
-    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "De earste kommando-rigel-parameter is it paad fan de map, de twadde parameter is it relative paad yn de map.",
+    "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 de maksimale âldens wurd eltse wike in ferzje bewarre.",
+    "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.",
    "The following items could not be synchronized.": "De folgende items koene net syngronisearre wurde.",
-    "The maximum age must be a number and cannot be blank.": "De maksimale âldens moat in nûmer wêze en mei net leech wêze.",
+    "The maximum age must be a number and cannot be blank.": "De maksimale âldens moat in nûmer en net leech wêze.",
    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "De maksimale tiid dat in ferzje bewarre wurde moat (yn dagen, stel yn op 0 om ferzjes foar immer te bewarjen).",
-    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "It persintaazje maksimale frije skiifromte moat in posityf nûmer wêze tusken 0 en 100 (ynklusyf).",
+    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "It maksimale persintaazje frije skiifromte moat in posityf nûmer wêze tusken 0 en 100 (ynklusyf).",
    "The number of days must be a number and cannot be blank.": "It tal fan dagen moat in nûmer wêze en mei net leech wêze.",
    "The number of days to keep files in the trash can. Zero means forever.": "It tal fan dagen om triemen in it jiskefet te bewarjen. Nul (0) betsjuttet foar immer.",
    "The number of old versions to keep, per file.": "It tal fan âlde ferzjes om te bewarjen, de triem.",
@@ -196,8 +211,9 @@
    "The path cannot be blank.": "It paad mei net leech wêze.",
    "The rate limit must be a non-negative number (0: no limit)": "It fluggenslimyt moat in posityf nûmer wêze (0: gjin limyt)",
    "The rescan interval must be a non-negative number of seconds.": "It wersken-ynterfal moat in posityf tal fan sekonden wêze.",
-    "They are retried automatically and will be synced when the error is resolved.": "Dizze wurde automatysk opnij probearre en sille syngronisearre wurde wannear at de flater oplost is.",
-    "This can easily give hackers access to read and change any files on your computer.": "Dit kin samar hackers tagong jaan om samar wat triemen op jo kompjûter besjen en te feroarjen.",
+    "They are retried automatically and will be synced when the error is resolved.": "Sy wurde automatysk opnij probearre en sille syngronisearre wurde wannear at de flater oplost is.",
+    "This Device": "Dit Apparaat",
+    "This can easily give hackers access to read and change any files on your computer.": "Dit kin samar ynkringers (hackers) tagong jaan om elke triem op jo kompjûter te besjen en te feroarjen.",
    "This is a major version upgrade.": "Dit is in wichtige ferzjefernijing.",
    "Trash Can File Versioning": "Jiskefet-triemferzjebehear",
    "Unknown": "Unbekend",
@@ -208,18 +224,21 @@
    "Upgrade": "Fernije",
    "Upgrade To {%version%}": "Fernije nei {{version}}",
    "Upgrading": "Oan it fernijen",
-    "Upload Rate": "Upload-fluggens",
-    "Uptime": "Yn-it-wurk-tiid",
+    "Upload Rate": "Oplaadfluggens",
+    "Uptime": "Rintiid",
    "Use HTTPS for GUI": "Brûk HTTPS foar GUI",
    "Version": "Ferzje",
    "Versions Path": "Ferzjes-paad",
    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Ferzjes wurde automatysk fuortsmiten wannear't se âlder binne dan de maksimale âldens of wannear it tal fan triemen yn in ynterval grutter is dan tastean.",
-    "When adding a new device, keep in mind that this device must be added on the other side too.": "Hâld by it tafoegjen fan nij apparaat yn de holle dat it apparaat oan de oare kant ek tafoege wurde moat. ",
-    "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.": "Hâld by it tafoegjen fan nije map yn de holle dat de map-ID brûkt wurd om de mappen tusken apparaten mei-inoar te ferbinen. Se binne haadlettergefoelich en moatte oer alle apparaten krekt oerienkomme.",
+    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Warskôging, dit paad is in ûnderlizzende triemtafel fan in besteande map \"{{otherFolder}}\".",
+    "When adding a new device, keep in mind that this device must be added on the other side too.": "Hâld by it taheakjen fan in nij apparaat yn de holle dat it apparaat oan de oare kant ek taheakke wurde moat. ",
+    "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.": "Hâld by it taheakjen fan in nije map yn de holle dat de map-ID brûkt wurd om de mappen tusken apparaten mei-inoar te ferbinen. Se binne haadlettergefoelich en moatte oer alle apparaten eksakt oerienkomme.",
    "Yes": "Ja",
-    "You must keep at least one version.": "Jo moatte op syn minst ien ferzje bewarje.",
+    "You must keep at least one version.": "Jo moatte minstens ien ferzje bewarje.",
    "days": "dagen",
    "full documentation": "komplete dokumintaasje",
    "items": "items",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} wol map \"{{folder}}\" diele."
+    "{%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
@@ -1,24 +1,27 @@
 {
+    "A device with that ID is already added.": "Már van hozzáadott eszköz ezzel az azonosítóval.",
    "A negative number of days doesn't make sense.": "Negatív számú nap nincs értelmezve.",
-    "A new major version may not be compatible with previous versions.": "Az új főverzió nem kompatibilis az előző főverzióval.",
+    "A new major version may not be compatible with previous versions.": "Az új főverzió nem feltétlenül kompatibilis az előző főverziókkal.",
    "API Key": "API kulcs",
    "About": "Névjegy",
    "Actions": "Műveletek",
    "Add": "Hozzáadás",
    "Add Device": "Eszköz hozzáadása",
    "Add Folder": "Mappa hozzáadása",
+    "Add Remote Device": "Távoli eszköz hozzáadása",
    "Add new folder?": " Új mappa hozzáadás?",
    "Address": "Cím",
    "Addresses": "Címek",
    "Advanced": "Haladó",
    "Advanced Configuration": "Haladó beállítások",
+    "Advanced settings": "Haladó beállítások",
    "All Data": "Minden adat",
    "Allow Anonymous Usage Reporting?": "Engedélyezed a névtelen felhasználási adatok küldését?",
    "Alphabetic": "ABC rendben",
-    "An external command handles the versioning. It has to remove the file from the synced folder.": "Egy külső program kezeli a fájl verziózást. El kell távolítsa a fájlt a szinkronizált mappából.",
+    "An external command handles the versioning. It has to remove the file from the synced folder.": "Külső program kezeli a fájl verziókövetést. A fájlt  el kell távolítania a szinkronizált mappából.",
    "Anonymous Usage Reporting": "Névtelen felhasználási adatok küldése",
-    "Any devices configured on an introducer device will be added to this device as well.": "Minden eszköz ami a bevezető eszközön lett beállítva hozzá lesz adva ehhez az eszközhöz is.",
-    "Automatic upgrades": "Automatikus frissítés",
+    "Any devices configured on an introducer device will be added to this device as well.": "A bevezető eszközön beállított minden eszköz hozzá lesz adva ehhez az eszközhöz is.",
+    "Automatic upgrades": "Automatikus frissítések",
    "Be careful!": "Légy óvatos!",
    "Bugs": "Hibák",
    "CPU Utilization": "Processzor használat",
@@ -31,10 +34,12 @@
    "Connection Error": "Kapcsolódási hiba",
    "Copied from elsewhere": "Másolva máshonnan",
    "Copied from original": "Másolva az eredetiről",
-    "Copyright © 2015 the following Contributors:": "Copyright © 2015 az alábbi Közreműködők:",
-    "Danger!": "Danger!",
+    "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",
@@ -50,20 +55,23 @@
    "Edit Device": "Eszköz szerkesztése",
    "Edit Folder": "Mappa szerkesztése",
    "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",
    "Error": "Hiba",
-    "External File Versioning": "Külső fájl verziózás",
+    "External File Versioning": "Külső fájl verziókövetés",
    "Failed Items": "Hibás elemek",
    "File Pull Order": "Fájl küldési sorrend",
-    "File Versioning": "Fájl verziózás",
+    "File Versioning": "Fájl verziókövetés",
    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Fájl jogosultságok figyelmen kívül hagyása változások keresésekor. FAT fájlrendszerek használatakor.",
    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Ha a Syncthing áthelyezi vagy törli a fájlokat, akkor azok a .stversions mappába lesznek áthelyezve.",
-    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Ha a Syncthing áthelyezi vagy törli a fájlokat, akkor azok a .stversions mappába lesznek áthelyezve, időbélyegzővel ellátva.",
+    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Ha a Syncthing felülírja vagy törli a fájlokat, akkor azok a .stversions mappába lesznek áthelyezve, időbélyegzővel ellátva.",
    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "A fájlok védve vannak a más eszközökön történt változásokkal szemben, de az ezen az eszközön történt változások érvényesek lesznek a többire.",
    "Folder": "Mappa",
    "Folder ID": "Mappa azonosító",
+    "Folder Label": "Mappa címke",
    "Folder Master": "Központi mappa",
    "Folder Path": "Mappa elérési útja",
    "Folders": "Mappák",
@@ -73,9 +81,10 @@
    "GUI Listen Addresses": "Grafikus felület címe",
    "Generate": "Generálás",
    "Global Discovery": "Globális felfedezés",
-    "Global Discovery Server": "Globális felfedező szerver",
+    "Global Discovery Server": "Globális felfedező kiszolgáló",
+    "Global Discovery Servers": "Globális felfedező kiszolgálók",
    "Global State": "Globális állapot",
-    "Help": "Segítség",
+    "Help": "Súgó",
    "Home page": "Főoldal",
    "Ignore": "Figyelmen kívül hagyás",
    "Ignore Patterns": "Minták figyelmen kívül hagyása",
@@ -103,32 +112,36 @@
    "New Folder": "Új mappa",
    "Newest First": "Újabb először",
    "No": "Nem",
-    "No File Versioning": "Nincs fájl verziózás",
+    "No File Versioning": "Nincs fájl verziókövetés",
    "Notice": "Megjegyzés",
    "OK": "Rendben",
    "Off": "Kikapcsolva",
    "Oldest First": "Régebbi először",
+    "Optional descriptive label for the folder. Can be different on each device.": "A mappa kiegészítő leírása. Minden eszközön különböző lehet.",
    "Options": "Opciók",
    "Out of Sync": "Nincs szinkronban",
    "Out of Sync Items": "Nem szinkronizált elemek",
    "Outgoing Rate Limit (KiB/s)": "Kimenő sávszélesség (KiB/mp)",
    "Override Changes": "Változtatások felülbírálása",
    "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": "A mappa elérési útja az eszközön. Amennyiben nem létezik, a program automatikusan létrehozza. A hullámvonal (~)  a következő helyettesítésre használható: ",
-    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Elérési út ahol a verziók tárolásra kerülnek (szabadon hagyva az alapértelmezett .stversions mappa lesz használva)",
+    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "A verziók tárolására szolgáló elérési út (üresen hagyva az alapértelmezett .stversions mappa)",
    "Pause": "Szünet",
    "Paused": "Szünetel",
    "Please consult the release notes before performing a major upgrade.": "Nagyobb frissítés előtt ellenőrizni kell a kiadási megjegyzéseket.",
-    "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.": "Kérlek, állítsd be a grafikus felület felhasználónevét és jelszavát a Beállítások ablakban.",
    "Please wait": "Kérlek, várj",
    "Preview": "Előnézet",
    "Preview Usage Report": "Felhasználási adatok átnézése",
    "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",
    "Release Notes": "Kiadási megjegyzések",
+    "Remote Devices": "Távoli eszközök",
    "Remove": "Eltávolítás",
+    "Required identifier for the folder. Must be the same on all cluster devices.": "A mappa szükséges azonosítója. Minden fürtözött eszközön azonosnak kell lennie.",
    "Rescan": "Átnézés",
    "Rescan All": "Összes átnézése",
    "Rescan Interval": "Átnézési intervallum",
@@ -138,10 +151,10 @@
    "Resume": "Folytatás",
    "Reused": "Újrafelhasználva",
    "Save": "Mentés",
-    "Scan Time Remaining": "Scan Time Remaining",
+    "Scan Time Remaining": "Fennmaradó átnézési idő",
    "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",
+    "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.",
    "Settings": "Beállítások",
    "Share": "Megosztás",
    "Share Folder": "Mappa megosztása",
@@ -149,8 +162,9 @@
    "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 azonosító. Minden megosztott eszközön azonosnak kell lennie.",
+    "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ó. ",
    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Az eszköz azonosító helyett jelenik meg. Üresen hagyva az eszköz saját neve lesz használva ",
    "Shutdown": "Leállítás",
@@ -170,12 +184,13 @@
    "Syncthing includes the following software or portions thereof:": "Syncthing a következő programokat, vagy komponenseket tartalmazza.",
    "Syncthing is restarting.": "Syncthing újraindul",
    "Syncthing is upgrading.": "Syncthing frissül",
-    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Úgy tűnik, hogy a Syncthing nem működik, vagy valami probléma van az hálózati kapcsolattal. Újra próbálom...",
+    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Úgy tűnik, hogy a Syncthing nem működik, vagy valami probléma van a hálózati kapcsolattal. Újra próbálom...",
    "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.": "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.": "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 {%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.",
@@ -197,9 +212,10 @@
    "The rate limit must be a non-negative number (0: no limit)": "Az arány limitnek pozitív számnak kell lennie (0: nincs limit)",
    "The rescan interval must be a non-negative number of seconds.": "Az átnézési intervallum nullánál nagyobb másodperc érték kell legyen",
    "They are retried automatically and will be synced when the error is resolved.": "A hiba javítása után automatikusan újra megpróbálja a szinkronizálást.",
-    "This can easily give hackers access to read and change any files on your computer.": "This can easily give hackers access to read and change any files on your computer.",
+    "This Device": "Ez az eszköz",
+    "This can easily give hackers access to read and change any files on your computer.": "Így a hekkerek könnyedén hozzáférhetnek a számítógépen található fájlokhoz. ",
    "This is a major version upgrade.": "Ez egy főverzió frissítés.",
-    "Trash Can File Versioning": "Szemetes fájl verziózás",
+    "Trash Can File Versioning": "Szemetes fájl verziókövetés",
    "Unknown": "Ismeretlen",
    "Unshared": "Nincs megosztva",
    "Unused": "Nincs használatban",
@@ -214,6 +230,7 @@
    "Version": "Verzió",
    "Versions Path": "Verziók útvonala",
    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "A régi verziók automatikusan törlődnek, amennyiben öregebbek mint a maximum kor, vagy már több van belőlük mint az adott időszakban megtartható maximum.",
+    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Figyelem, ez az útvonal egy meglévő mappa alkönyvtára \"{{otherFolder}}\".",
    "When adding a new device, keep in mind that this device must be added on the other side too.": "Amikor új eszközt adsz hozzá, tartsd észben, hogy a másik oldalon ezt az eszközt is hozzá kell adni.",
    "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.": "Amikor új mappát adsz hozzá, tartsd észben, hogy a mappa azonosító arra való hogy összekösd a mappákat az eszközeiden. Az azonosító kisbetű-nagybetű érzékeny és pontosan egyeznie kell az eszközökön.",
    "Yes": "Igen",
@@ -221,5 +238,7 @@
    "days": "nap",
    "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 \"{%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
@@ -0,0 +1,244 @@
+{
+    "A device with that ID is already added.": "Perangkat dengan ID tersebut sudah ada.",
+    "A negative number of days doesn't make sense.": "Tidak mungkin jumlah hari dalam nilai negatif.",
+    "A new major version may not be compatible with previous versions.": "Versi penting yang baru mungkin tidak kompatibel dengan versi sebelumnya.",
+    "API Key": "API Key",
+    "About": "Tentang",
+    "Actions": "Aksi",
+    "Add": "Tambah",
+    "Add Device": "Tambah Perangkat",
+    "Add Folder": "Tambah Folder",
+    "Add Remote Device": "Add Remote Device",
+    "Add new folder?": "Tambah folder baru",
+    "Address": "Alamat",
+    "Addresses": "Alamat",
+    "Advanced": "Tingkat Lanjut",
+    "Advanced Configuration": "Konfigurasi Tingkat Lanjut",
+    "Advanced settings": "Advanced settings",
+    "All Data": "Semua Data",
+    "Allow Anonymous Usage Reporting?": "Aktifkan Laporan Penggunaan Anonim?",
+    "Alphabetic": "Alfabet",
+    "An external command handles the versioning. It has to remove the file from the synced folder.": "Perintah eksternal mengatur pemversian. Dia harus menghapus berkas dari folder yang tersinkronisasi.",
+    "Anonymous Usage Reporting": "Pelaporan Penggunaan Anonim",
+    "Any devices configured on an introducer device will be added to this device as well.": "Semua perangkat yang dikonfigurasi di perangkat pengenal akan ditambahkan di perangkat ini juga.",
+    "Automatic upgrades": "Ugrade Otomatis",
+    "Be careful!": "Harap hati-hati!",
+    "Bugs": "Bugs",
+    "CPU Utilization": "Penggunaan CPU",
+    "Changelog": "Log perubahan",
+    "Clean out after": "Bersihkan setelah",
+    "Close": "Tutup",
+    "Command": "Perintah",
+    "Comment, when used at the start of a line": "Komentar, digunakan saat awal baris",
+    "Compression": "Kompresi",
+    "Connection Error": "Koneksi Galat",
+    "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",
+    "Discovery": "Discovery",
+    "Documentation": "Dokumentasi",
+    "Download Rate": "Download Rate",
+    "Downloaded": "Terunduh",
+    "Downloading": "Mengunduh",
+    "Edit": "Sunting",
+    "Edit Device": "Sunting Perangkat",
+    "Edit Folder": "Sunting 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",
+    "External File Versioning": "Berkas pemversian eksternal",
+    "Failed Items": "Materi yang gagal",
+    "File Pull Order": "Urutan Penarikan Berkas",
+    "File Versioning": "Versi Berkas",
+    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Bit hak akses berkas diabaikan saat mencari perubahan. Digunakan pada sistem berkas FAT.",
+    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Berkas dipindahkan ke folder .stversions jika digantikan atau dihapus oleh Syncthing.",
+    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Berkas dipindahkan ke versi bertanggal dalam folder .stversions jika digantikan atau dihapus oleh 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.": "Berkas diproteksi dari perubahan oleh perangkat lain, tetapi perubahan yang dikirim dari perangkat ini akan dikirim ke perangkat lain dalam klaster.",
+    "Folder": "Folder",
+    "Folder ID": "ID Folder",
+    "Folder Label": "Folder Label",
+    "Folder Master": "Master Folder",
+    "Folder Path": "Path Folder",
+    "Folders": "Folder",
+    "GUI": "GUI",
+    "GUI Authentication Password": "Sandi Otentikasi GUI",
+    "GUI Authentication User": "Pengguna Otentikasi GUI",
+    "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",
+    "Home page": "Situs",
+    "Ignore": "Abaikan",
+    "Ignore Patterns": "Pola Pengabaian",
+    "Ignore Permissions": "Hak Akses Pengabaian",
+    "Incoming Rate Limit (KiB/s)": "Incoming Rate Limit (KiB/s)",
+    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Konfigurasi salah bisa merusak isi folder dan membuat Syncthing tidak bisa dijalankan.",
+    "Introducer": "Pengenal",
+    "Inversion of the given condition (i.e. do not exclude)": "Inversion of the given condition (i.e. do not exclude)",
+    "Keep Versions": "Keep Versions",
+    "Largest First": "Largest First",
+    "Last File Received": "Last File Received",
+    "Last seen": "Last seen",
+    "Later": "Later",
+    "Local Discovery": "Local Discovery",
+    "Local State": "Local State",
+    "Local State (Total)": "Local State (Total)",
+    "Major Upgrade": "Major Upgrade",
+    "Maximum Age": "Maximum Age",
+    "Metadata Only": "Metadata Only",
+    "Minimum Free Disk Space": "Minimum Free Disk Space",
+    "Move to top of queue": "Move to top of queue",
+    "Multi level wildcard (matches multiple directory levels)": "Multi level wildcard (matches multiple directory levels)",
+    "Never": "Never",
+    "New Device": "New Device",
+    "New Folder": "New Folder",
+    "Newest First": "Newest First",
+    "No": "No",
+    "No File Versioning": "No File Versioning",
+    "Notice": "Notice",
+    "OK": "OK",
+    "Off": "Off",
+    "Oldest First": "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.",
+    "Options": "Options",
+    "Out of Sync": "Out of Sync",
+    "Out of Sync Items": "Out of Sync Items",
+    "Outgoing Rate Limit (KiB/s)": "Outgoing Rate Limit (KiB/s)",
+    "Override Changes": "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 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).": "Path where versions should be stored (leave empty for the default .stversions folder in the folder).",
+    "Pause": "Pause",
+    "Paused": "Paused",
+    "Please consult the release notes before performing a major upgrade.": "Please consult the release notes before performing a major upgrade.",
+    "Please set a GUI Authentication User and Password in the Settings dialog.": "Please set a GUI Authentication User and Password in the Settings dialog.",
+    "Please wait": "Please wait",
+    "Preview": "Preview",
+    "Preview Usage Report": "Preview Usage Report",
+    "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",
+    "Release Notes": "Release Notes",
+    "Remote Devices": "Remote Devices",
+    "Remove": "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.",
+    "Rescan": "Rescan",
+    "Rescan All": "Rescan All",
+    "Rescan Interval": "Rescan Interval",
+    "Restart": "Restart",
+    "Restart Needed": "Restart Needed",
+    "Restarting": "Restarting",
+    "Resume": "Resume",
+    "Reused": "Reused",
+    "Save": "Save",
+    "Scan Time Remaining": "Scan Time Remaining",
+    "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.",
+    "Settings": "Settings",
+    "Share": "Share",
+    "Share Folder": "Share Folder",
+    "Share Folders With Device": "Share Folders With Device",
+    "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.",
+    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.",
+    "Shutdown": "Shutdown",
+    "Shutdown Complete": "Shutdown Complete",
+    "Simple File Versioning": "Simple File Versioning",
+    "Single level wildcard (matches within a directory only)": "Single level wildcard (matches within a directory only)",
+    "Smallest First": "Smallest First",
+    "Source Code": "Source Code",
+    "Staggered File Versioning": "Staggered File Versioning",
+    "Start Browser": "Start Browser",
+    "Statistics": "Statistics",
+    "Stopped": "Stopped",
+    "Support": "Support",
+    "Sync Protocol Listen Addresses": "Sync Protocol Listen Addresses",
+    "Syncing": "Syncing",
+    "Syncthing has been shut down.": "Syncthing has been shut down.",
+    "Syncthing includes the following software or portions thereof:": "Syncthing includes the following software or portions thereof:",
+    "Syncthing is restarting.": "Syncthing is restarting.",
+    "Syncthing is upgrading.": "Syncthing is upgrading.",
+    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…",
+    "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 {%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.",
+    "The following items could not be synchronized.": "The following items could not be synchronized.",
+    "The maximum age must be a number and cannot be blank.": "The maximum age must be a number and cannot be blank.",
+    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "The maximum time to keep a version (in days, set to 0 to keep versions forever).",
+    "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 number of days must be a number and cannot be blank.": "The number of days must be a number and cannot be blank.",
+    "The number of days to keep files in the trash can. Zero means forever.": "The number of days to keep files in the trash can. Zero means forever.",
+    "The number of old versions to keep, per file.": "The number of old versions to keep, per file.",
+    "The number of versions must be a number and cannot be blank.": "The number of versions must be a number and cannot be blank.",
+    "The path cannot be blank.": "The path cannot be blank.",
+    "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
+    "The rescan interval must be a non-negative number of seconds.": "The rescan interval must be a non-negative number of seconds.",
+    "They are retried automatically and will be synced when the error is resolved.": "They are retried automatically and will be synced when the error is resolved.",
+    "This Device": "This Device",
+    "This can easily give hackers access to read and change any files on your computer.": "This can easily give hackers access to read and change any files on your computer.",
+    "This is a major version upgrade.": "This is a major version upgrade.",
+    "Trash Can File Versioning": "Trash Can File Versioning",
+    "Unknown": "Unknown",
+    "Unshared": "Unshared",
+    "Unused": "Unused",
+    "Up to Date": "Up to Date",
+    "Updated": "Updated",
+    "Upgrade": "Upgrade",
+    "Upgrade To {%version%}": "Upgrade To {{version}}",
+    "Upgrading": "Upgrading",
+    "Upload Rate": "Upload Rate",
+    "Uptime": "Uptime",
+    "Use HTTPS for GUI": "Use HTTPS for GUI",
+    "Version": "Version",
+    "Versions Path": "Versions Path",
+    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "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}}\".",
+    "When adding a new device, keep in mind that this device must be added on the other side too.": "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.": "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": "Yes",
+    "You must keep at least one version.": "You must keep at least one version.",
+    "days": "days",
+    "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
@@ -1,4 +1,5 @@
 {
+    "A device with that ID is already added.": "Un dispositivo con questo ID è già stato aggiunto.",
    "A negative number of days doesn't make sense.": "Un numero di giorni negativo non ha alcun senso.",
    "A new major version may not be compatible with previous versions.": "Una nuova versione principale potrebbe non essere compatibile con le versioni precedenti.",
    "API Key": "Chiave API",
@@ -7,11 +8,13 @@
    "Add": "Aggiungi",
    "Add Device": "Aggiungi Dispositivo",
    "Add Folder": "Aggiungi Cartella",
+    "Add Remote Device": "Aggiungi Dispositivo Remoto",
    "Add new folder?": "Aggiungere una nuova cartella?",
    "Address": "Indirizzo",
    "Addresses": "Indirizzi",
    "Advanced": "Avanzato",
    "Advanced Configuration": "Configurazione avanzata",
+    "Advanced settings": "Impostazioni avanzate",
    "All Data": "Tutti i Dati",
    "Allow Anonymous Usage Reporting?": "Abilitare Statistiche Anonime di Utilizzo?",
    "Alphabetic": "Alfabetico",
@@ -31,10 +34,12 @@
    "Connection Error": "Errore 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",
@@ -50,6 +55,8 @@
    "Edit Device": "Modifica Dispositivo",
    "Edit Folder": "Modifica Cartella",
    "Editing": "Modifica di",
+    "Enable NAT traversal": "Abilita NAT trasversale",
+    "Enable Relaying": "Abilita relaying",
    "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.",
@@ -64,6 +71,7 @@
    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "I file sono protetti dalle modifiche effettuate negli altri dispositivi, ma le modifiche effettuate in questo dispositivo verranno inviate anche al resto del cluster.",
    "Folder": "Cartella",
    "Folder ID": "ID Cartella",
+    "Folder Label": "Etichetta per la cartella",
    "Folder Master": "Cartella Principale",
    "Folder Path": "Percorso Cartella",
    "Folders": "Cartelle",
@@ -73,7 +81,8 @@
    "GUI Listen Addresses": "Indirizzi dell'Interfaccia Grafica",
    "Generate": "Genera",
    "Global Discovery": "Individuazione Globale",
-    "Global Discovery Server": "Server di Ricerca Globale",
+    "Global Discovery Server": "Server di Individuazione Globale",
+    "Global Discovery Servers": "Servers di Individuazione Globale",
    "Global State": "Stato Globale",
    "Help": "Aiuto",
    "Home page": "Pagina home",
@@ -108,6 +117,7 @@
    "OK": "OK",
    "Off": "Disattiva",
    "Oldest First": "Prima il meno recente",
+    "Optional descriptive label for the folder. Can be different on each device.": "Etichetta descrittiva facoltativa della cartella. Può essere diversa su ogni dispositivo.",
    "Options": "Opzioni",
    "Out of Sync": "Non sincronizzato",
    "Out of Sync Items": "Elementi Non Sincronizzati",
@@ -125,10 +135,13 @@
    "Quick guide to supported patterns": "Guida veloce agli schemi supportati",
    "RAM Utilization": "Utilizzo RAM",
    "Random": "Casuale",
+    "Relay Servers": "Servers di relay",
    "Relayed via": "Reindirizzato tramite",
    "Relays": "Servers di reindirizzamento",
    "Release Notes": "Note di rilascio",
+    "Remote Devices": "Dispositivi Remoti",
    "Remove": "Rimuovi",
+    "Required identifier for the folder. Must be the same on all cluster devices.": "Identificatore obbligatorio della cartella. Deve essere lo stesso su tutti i dispositivi del cluster.",
    "Rescan": "Riscansiona",
    "Rescan All": "Riscansiona Tutto",
    "Rescan Interval": "Intervallo Scansione",
@@ -151,6 +164,7 @@
    "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.",
    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Visibile al posto dell'ID Dispositivo nello stato del cluster. Se viene lasciato vuoto, verrà utilizzato il nome proposto dal dispositivo.",
    "Shutdown": "Arresta",
@@ -176,6 +190,7 @@
    "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. Devi riavviare Syncthing 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).": "Trova l'ID nella finestra di dialogo \"Modifica > Mostra ID\" dell'altro dispositivo, poi inseriscilo qui. 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).": "Trova l'ID nella finestra di dialogo \"Modifica > Mostra ID\" dell'altro dispositivo, poi inseriscilo qui. 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 dati riportati sono cambiati, verrà mostrata di nuovo 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.",
@@ -197,6 +212,7 @@
    "The rate limit must be a non-negative number (0: no limit)": "Il limite di banda deve essere un numero non negativo (da 0 a infinito)",
    "The rescan interval must be a non-negative number of seconds.": "L'intervallo di scansione deve essere un numero superiore a zero secondi.",
    "They are retried automatically and will be synced when the error is resolved.": "Verranno effettuati tentativi in automatico e verranno sincronizzati quando l'errore sarà risolto.",
+    "This Device": "Questo Dispositivo",
    "This can easily give hackers access to read and change any files on your computer.": "Ciò potrebbe facilmente permettere agli hackers accesso alla lettura e modifica di qualunque file del tuo computer.",
    "This is a major version upgrade.": "Questo è un aggiornamento di versione principale",
    "Trash Can File Versioning": "Controllo Versione con Cestino",
@@ -214,6 +230,7 @@
    "Version": "Versione",
    "Versions Path": "Percorso Cartella Versioni",
    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Le versioni vengono eliminate automaticamente se superano la durata massima o il numero di file permessi in un determinato intervallo temporale.",
+    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Attenzione, questo percorso è una sottocartella di una cartella esistente \"{{otherFolder}}\".",
    "When adding a new device, keep in mind that this device must be added on the other side too.": "Anche nel nuovo dispositivo devi aggiungere l'ID di questo, con la stessa procedura.",
    "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.": "Quando aggiungi una nuova cartella, ricordati che gli ID vengono utilizzati per collegare le cartelle nei dispositivi. Distinguono maiuscole e minuscole e devono corrispondere esattamente su tutti i dispositivi.",
    "Yes": "Sì",
@@ -221,5 +238,7 @@
    "days": "giorni",
    "full documentation": "documentazione completa",
    "items": "elementi",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} vuole condividere la cartella \"{{folder}}\"."
+    "{%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
@@ -1,4 +1,5 @@
 {
+    "A device with that ID is already added.": "指定されたIDのデバイスは登録済みです。",
    "A negative number of days doesn't make sense.": "負の日数は指定できません。",
    "A new major version may not be compatible with previous versions.": "新しいメジャーバージョンは以前のバージョンと互換性がないかもしれません。",
    "API Key": "APIキー",
@@ -7,15 +8,17 @@
    "Add": "追加",
    "Add Device": "デバイスを追加",
    "Add Folder": "フォルダーを追加",
+    "Add Remote Device": "他のデバイスを追加",
    "Add new folder?": "新しいフォルダーとして追加しますか?",
    "Address": "アドレス",
    "Addresses": "アドレス",
    "Advanced": "高度な設定",
    "Advanced Configuration": "高度な設定",
+    "Advanced settings": "高度な設定",
    "All Data": "全てのデータ",
    "Allow Anonymous Usage Reporting?": "匿名で利用状況をレポートすることを許可しますか?",
    "Alphabetic": "アルファベット順",
-    "An external command handles the versioning. It has to remove the file from the synced folder.": "外部コマンドがバージョン管理を処理します。指定したコマンドが、同期フォルダーからファイルを削除する必要があります。",
+    "An external command handles the versioning. It has to remove the file from the synced folder.": "外部コマンドにバージョンを管理させます。ここで指定するコマンドは、同期フォルダーからファイルを削除するものでなくてはなりません。",
    "Anonymous Usage Reporting": "匿名での利用状況レポート",
    "Any devices configured on an introducer device will be added to this device as well.": "紹介者デバイス上で設定されたデバイスは、このデバイス上でも追加されます。",
    "Automatic upgrades": "自動アップグレード",
@@ -31,17 +34,19 @@
    "Connection Error": "接続エラー",
    "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": "切断中",
-    "Discovery": "Discovery",
+    "Discovery": "探索サーバー",
    "Documentation": "マニュアル",
    "Download Rate": "ダウンロード速度",
    "Downloaded": "ダウンロード済",
@@ -50,13 +55,15 @@
    "Edit Device": "デバイスの編集",
    "Edit Folder": "フォルダーの編集",
    "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": "エラー",
    "External File Versioning": "外部バージョン管理",
    "Failed Items": "失敗した項目",
-    "File Pull Order": "ファイルを取得する順番",
+    "File Pull Order": "ファイルを取得する順序",
    "File Versioning": "ファイルのバージョン管理",
    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "ファイルの変更を探すときにパーミッションを無視します。FATファイルシステムでご利用ください。",
    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Syncthingがファイルを置き換えたり削除したりするとき、古い内容を .stversions フォルダーに移動します。",
@@ -64,6 +71,7 @@
    "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": "フォルダーID",
+    "Folder Label": "フォルダー名",
    "Folder Master": "フォルダーのマスター",
    "Folder Path": "フォルダーパス",
    "Folders": "フォルダー",
@@ -72,8 +80,9 @@
    "GUI Authentication User": "GUI認証ユーザー名",
    "GUI Listen Addresses": "GUI待ち受けアドレスリスト",
    "Generate": "生成",
-    "Global Discovery": "グローバルディスカバリー",
-    "Global Discovery Server": "グローバルディスカバリーサーバー",
+    "Global Discovery": "大域探索",
+    "Global Discovery Server": "大域探索サーバー",
+    "Global Discovery Servers": "大域探索サーバー",
    "Global State": "グローバル状態",
    "Help": "ヘルプ",
    "Home page": "ホームページ",
@@ -89,7 +98,7 @@
    "Last File Received": "最後に受信したファイル",
    "Last seen": "最終接続日時",
    "Later": "後で設定",
-    "Local Discovery": "ローカルディスカバリー",
+    "Local Discovery": "LAN内で探索",
    "Local State": "ローカル状態",
    "Local State (Total)": "ローカル状態 (合計)",
    "Major Upgrade": "メジャーアップグレード",
@@ -108,6 +117,7 @@
    "OK": "OK",
    "Off": "オフ",
    "Oldest First": "古い順",
+    "Optional descriptive label for the folder. Can be different on each device.": "分かりやすいフォルダーの名前で、設定は任意です。デバイスごとに異なってもかまいません。",
    "Options": "オプション",
    "Out of Sync": "未同期",
    "Out of Sync Items": "同期の必要な項目",
@@ -125,10 +135,13 @@
    "Quick guide to supported patterns": "サポートされているパターンの簡易ガイド",
    "RAM Utilization": "メモリ使用量",
    "Random": "ランダム",
+    "Relay Servers": "中継サーバー",
    "Relayed via": "経由している中継サーバーのアドレス",
    "Relays": "中継サーバー",
    "Release Notes": "リリースノート",
+    "Remote Devices": "他のデバイス",
    "Remove": "除去",
+    "Required identifier for the folder. Must be the same on all cluster devices.": "フォルダーの識別子で、必須です。このフォルダーを共有する全てのデバイス上で同一でなくてはなりません。",
    "Rescan": "再スキャン",
    "Rescan All": "すべて再スキャン",
    "Rescan Interval": "再スキャン間隔",
@@ -151,8 +164,9 @@
    "Shared With": "共有相手",
    "Short identifier for the folder. Must be the same on all cluster devices.": "このフォルダーの短い識別子。このフォルダーを共有する全てのデバイス上で同じである必要があります。",
    "Show ID": "IDを表示",
-    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "クラスターステータスでデバイスIDの代わりに表示されます。他のデバイスに対してもデフォルトの名前として通知されます。",
-    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "クラスターステータスでデバイス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の代わりに表示されます。他のデバイスに対してもデフォルトの名前として通知されます。",
+    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "ステータス画面でデバイスIDの代わりに表示されます。空欄の場合、相手デバイスが通知してきた名前に更新されます。",
    "Shutdown": "シャットダウン",
    "Shutdown Complete": "シャットダウン完了",
    "Simple File Versioning": "単純バージョン管理",
@@ -166,16 +180,17 @@
    "Support": "サポート",
    "Sync Protocol Listen Addresses": "Syncプロトコルの待ち受けアドレスリスト",
    "Syncing": "同期中",
-    "Syncthing has been shut down.": "Syncthingがシャットダウンしました。",
-    "Syncthing includes the following software or portions thereof:": "Syncthingは以下のソフトウェアかその一部を内包しています:",
-    "Syncthing is restarting.": "Syncthingが再起動しています。",
-    "Syncthing is upgrading.": "Syncthingがアップグレード中です。",
+    "Syncthing has been shut down.": "Syncthingをシャットダウンしました。",
+    "Syncthing includes the following software or portions thereof:": "Syncthingは以下のソフトウェアまたはその一部を内包しています:",
+    "Syncthing is restarting.": "Syncthingを再起動しています。",
+    "Syncthing is upgrading.": "Syncthingをアップグレード中です。",
    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthingが落ちているか、インターネット接続に問題があります。リトライ中です…",
    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "リクエストの処理に問題があるようです。問題が継続する場合、ページを更新するかSyncthingを再起動してください。",
    "The Syncthing admin interface is configured to allow remote access without a password.": "Syncthingの管理画面が、パスワードなしで外部からアクセスできるように設定されています。",
    "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文字のアルファベットと数字からなる文字列です。スペースとハイフンは入力してもしなくてもかまいません。",
@@ -187,16 +202,17 @@
    "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週間ごとに、古いバージョンを保存します。",
    "The following items could not be synchronized.": "以下の項目は同期できませんでした。",
    "The maximum age must be a number and cannot be blank.": "最大寿命は数値を指定してください。空欄にはできません。",
-    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "古いバージョンを保存する最大日数 (0にすると永久的に保存します)。",
+    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "古いバージョンを保存する最大日数 (0を指定すると無期限になります)。",
    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "最小空きディスク容量はパーセントで、0から100の値を入力してください。",
    "The number of days must be a number and cannot be blank.": "日数は数値を指定してください。空欄にはできません。",
-    "The number of days to keep files in the trash can. Zero means forever.": "ゴミ箱にファイルを保存する日数。0だと永久的に保存します。",
+    "The number of days to keep files in the trash can. Zero means forever.": "ゴミ箱にファイルを保存する日数。0を指定すると無期限になります。",
    "The number of old versions to keep, per file.": "ファイルごとに古いバージョンをいくつ保存するかを指定します。",
    "The number of versions must be a number and cannot be blank.": "保存するバージョンの数は数値を指定してください。空欄にはできません。",
    "The path cannot be blank.": "パスは空欄にできません。",
-    "The rate limit must be a non-negative number (0: no limit)": "帯域制限の値として負の数は指定できません (0にすると制限を行いません)。",
+    "The 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 can easily give hackers access to read and change any files on your computer.": "この設定のままでは、あなたのコンピューターにある任意のファイルを、他者が簡単に盗み見たり書き換えたりすることができます。",
    "This is a major version upgrade.": "メジャーアップグレードです。",
    "Trash Can File Versioning": "ゴミ箱によるバージョン管理",
@@ -214,6 +230,7 @@
    "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%}\".": "警告: 入力されたパスは、設定済みのフォルダー「{{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.": "新しいフォルダーを追加する際、フォルダーIDはデバイス間でフォルダーの対応づけに使われることに注意してください。フォルダーIDは大文字と小文字が区別され、共有するすべてのデバイスの間で完全に一致しなくてはなりません。",
    "Yes": "はい",
@@ -221,5 +238,7 @@
    "days": "日",
    "full documentation": "詳細なマニュアル",
    "items": "項目",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} がフォルダー \"{{folder}}\" を共有するよう求めています。"
+    "{%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
@@ -1,4 +1,5 @@
 {
+    "A device with that ID is already added.": "A device with that ID is already added.",
    "A negative number of days doesn't make sense.": "A negative number of days doesn't make sense.",
    "A new major version may not be compatible with previous versions.": "새로운 메이저 버전은 이전 버전과 호환되지 않을 수 있습니다.",
    "API Key": "API 키",
@@ -7,11 +8,13 @@
    "Add": "추가",
    "Add Device": "기기 추가",
    "Add Folder": "폴더 추가",
+    "Add Remote Device": "Add Remote Device",
    "Add new folder?": "새로운 폴더를 추가하시겠습니까?",
    "Address": "주소",
    "Addresses": "주소",
    "Advanced": "Advanced",
    "Advanced Configuration": "Advanced Configuration",
+    "Advanced settings": "Advanced settings",
    "All Data": "전체 데이터",
    "Allow Anonymous Usage Reporting?": "익명 사용 보고서를 보내시겠습니까?",
    "Alphabetic": "알파벳순",
@@ -31,10 +34,12 @@
    "Connection Error": "연결 에러",
    "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!": "Danger!",
    "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": "기기 ID",
    "Device Identification": "기기 식별자",
    "Device Name": "기기 이름",
@@ -50,6 +55,8 @@
    "Edit Device": "기기 편집",
    "Edit Folder": "폴더 편집",
    "Editing": "편집",
+    "Enable NAT traversal": "Enable NAT traversal",
+    "Enable Relaying": "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 ignore patterns, one per line.": "무시할 패턴을 한 줄에 하나씩 입력하세요.",
@@ -64,6 +71,7 @@
    "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",
    "Folder ID": "폴더 ID",
+    "Folder Label": "Folder Label",
    "Folder Master": "폴더 소유자",
    "Folder Path": "폴더 경로",
    "Folders": "폴더",
@@ -74,6 +82,7 @@
    "Generate": "생성",
    "Global Discovery": "글로벌 탐색",
    "Global Discovery Server": "글로벌 탐색 서버",
+    "Global Discovery Servers": "Global Discovery Servers",
    "Global State": "글로벌 서버 상태",
    "Help": "도움말",
    "Home page": "Home page",
@@ -108,6 +117,7 @@
    "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.",
    "Options": "Options",
    "Out of Sync": "Out of Sync",
    "Out of Sync Items": "동기화되지 않은 항목",
@@ -125,10 +135,13 @@
    "Quick guide to supported patterns": "지원하는 패턴에 대한 빠른 도움말",
    "RAM Utilization": "RAM 사용량",
    "Random": "무작위",
+    "Relay Servers": "Relay Servers",
    "Relayed via": "Relayed via",
    "Relays": "Relays",
    "Release Notes": "릴리즈 노트",
+    "Remote Devices": "Remote Devices",
    "Remove": "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.",
    "Rescan": "재탐색",
    "Rescan All": "전체 재탐색",
    "Rescan Interval": "재탐색 간격",
@@ -151,6 +164,7 @@
    "Shared With": "~와 공유",
    "Short identifier for the folder. Must be the same on all cluster devices.": "간단한 폴더 식별자입니다. 모든 장치에서 동일해야 합니다.",
    "Show ID": "내 기기 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 updated to the name the device advertises if left empty.": "아이디가 비어있는 경우 기본 값으로 다른 장치에 업데이트 됩니다.",
    "Shutdown": "종료",
@@ -176,6 +190,7 @@
    "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).": "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).": "여기에 입력한 기기 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자의 알파벳과 숫자로 구성되어 있으며, 공백과 하이픈은 포함되지 않습니다.",
@@ -197,6 +212,7 @@
    "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
    "The rescan interval must be a non-negative number of seconds.": "재검색 간격은 초단위이며 양수로 입력해야 합니다.",
    "They are retried automatically and will be synced when the error is resolved.": "They are retried automatically and will be synced when the error is resolved.",
+    "This Device": "This Device",
    "This can easily give hackers access to read and change any files on your computer.": "This can easily give hackers access to read and change any files on your computer.",
    "This is a major version upgrade.": "이 업데이트는 메이저 버전입니다.",
    "Trash Can File Versioning": "Trash Can File Versioning",
@@ -214,6 +230,7 @@
    "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}}\".",
    "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.": "새 폴더를 추가할 시 폴더 ID는 장치간에 폴더를 묶을 때 사용됩니다. 대소문자를 구분하며 모든 장치에서 같은 ID를 사용해야 합니다.",
    "Yes": "예",
@@ -221,5 +238,7 @@
    "days": "days",
    "full documentation": "전체 문서",
    "items": "항목",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} 에서 폴더  \\\"{{folder}}\\\" 를 공유하길 원합니다."
+    "{%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}})."
 }
--- a/gui/default/assets/lang/lang-lt.json
+++ b/gui/default/assets/lang/lang-lt.json
@@ -1,4 +1,5 @@
 {
+    "A device with that ID is already added.": "Įrenginys su tokiu ID jau yra pridėtas.",
    "A negative number of days doesn't make sense.": "Privalo būti teigiamas skaičius.",
    "A new major version may not be compatible with previous versions.": "Nauja versija gali būti nesuderinama su senomis versijomis.",
    "API Key": "API raktas",
@@ -7,34 +8,38 @@
    "Add": "Pridėti",
    "Add Device": "Pridėti įrenginį",
    "Add Folder": "Pridėti aplanką",
+    "Add Remote Device": "Pridėti nuotolinį įrenginį",
    "Add new folder?": "Pridėti naują aplanką?",
    "Address": "Adresas",
    "Addresses": "Adresai",
-    "Advanced": "Pažangus",
-    "Advanced Configuration": "Pažangus nustatymai",
+    "Advanced": "Išplėstiniai",
+    "Advanced Configuration": "Išplėstinė konfigūracija",
+    "Advanced settings": "Išplėstiniai nustatymai",
    "All Data": "Visiems duomenims",
-    "Allow Anonymous Usage Reporting?": "Siųsti anonimišką vartojimo ataskaitą?",
+    "Allow Anonymous Usage Reporting?": "Siųsti anoniminę naudojimo ataskaitą?",
    "Alphabetic": "Abėcėlės tvarka",
    "An external command handles the versioning. It has to remove the file from the synced folder.": "Išorinė komanda apdoroja versijų valdymą. Ji turi pašalinti failą iš sinchronizuoto aplanko.",
-    "Anonymous Usage Reporting": "Anoniminė vartojimo ataskaita",
+    "Anonymous Usage Reporting": "Anoniminė naudojimo ataskaita",
    "Any devices configured on an introducer device will be added to this device as well.": "Visi supažindintojo įrenginiai bus pridėti prie jūsų įrenginių sąrašo.",
    "Automatic upgrades": "Automatiniai atnaujinimai",
    "Be careful!": "Būkite atsargūs!",
    "Bugs": "Klaidos",
    "CPU Utilization": "Procesoriaus panaudojimas",
    "Changelog": "Pasikeitimai",
-    "Clean out after": "Išvalyto po",
-    "Close": "Uždaryti",
+    "Clean out after": "Išvalyti po",
+    "Close": "Užverti",
    "Command": "Komanda",
    "Comment, when used at the start of a line": "Komentaras naudojamas naujoje eilutėje",
    "Compression": "Kompresija",
    "Connection Error": "Susijungimo klaida",
-    "Copied from elsewhere": "Nukopijuota iš betkur",
+    "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": "Trinti",
+    "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",
@@ -50,6 +55,8 @@
    "Edit Device": "Keisti įrenginį",
    "Edit Folder": "Keisti 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.",
@@ -61,11 +68,12 @@
    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Ieškant pakeitimų, į failų leidimų bitus yra nekreipiama dėmesio. Naudoti FAT failų sistemose.",
    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Failai perkeliami į .stversions aplanką kai tampa pakeisti arba ištrinti.",
    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Programai Syncthing pakeičiant ar ištrinant failus, jie yra perkeliami į datomis pažymėtas versijas, aplanke .stversions.",
-    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Failai apsaugoti nuo pakeitimų atliktų kituose įrenginiuose, bet pakeitimai šiame įrenginyje bus nusiųsti kitiems.",
+    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Failai yra apsaugoti nuo kituose įrenginiuose atliktų pakeitimų, bet pakeitimai šiame įrenginyje bus nusiųsti kitiems įrenginiams.",
    "Folder": "Aplankas",
    "Folder ID": "Aplanko ID",
+    "Folder Label": "Aplanko etiketė",
    "Folder Master": "Aplanko vadovas",
-    "Folder Path": "Kelias iki apkanko",
+    "Folder Path": "Kelias iki aplanko",
    "Folders": "Aplankai",
    "GUI": "Valdymo skydelis",
    "GUI Authentication Password": "Valdymo skydelio slaptažodis",
@@ -74,6 +82,7 @@
    "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",
@@ -108,15 +117,16 @@
    "OK": "Gerai",
    "Off": "Netaikoma",
    "Oldest First": "Seniausi pirmiau",
-    "Options": "Nustatymai",
+    "Optional descriptive label for the folder. Can be different on each device.": "Nebūtina aprašomoji aplanko etiketė. Kiekviename įrenginyje gali būti skirtinga.",
+    "Options": "Parametrai",
    "Out of Sync": "Išsisinchronizavę",
    "Out of Sync Items": "Nesutikrinta",
    "Outgoing Rate Limit (KiB/s)": "Išeinančio srauto maksimalus greitis (KiB/s)",
    "Override Changes": "Perrašyti pakeitimus",
    "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": "Kelias iki aplanko šiame kompiuteryje. Bus sukurtas, jei neegzistuoja. Tildės simbolis (~) gali būti naudojamas kaip trumpinys",
    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Kelias, kur bus saugomos versijos (palikite tuščią numatytam .stversions aplankui).",
-    "Pause": "Sustabdyti",
-    "Paused": "Sustabdyta",
+    "Pause": "Pristabdyti",
+    "Paused": "Pristabdyta",
    "Please consult the release notes before performing a major upgrade.": "Peržvelkite laidos informaciją prieš atlikdami stambų atnaujinimą.",
    "Please set a GUI Authentication User and Password in the Settings dialog.": "Prašome nustatymų dialoge nustatyti valdymo skydelio vartotojo vardą ir slaptažodį.",
    "Please wait": "Prašome palaukti",
@@ -125,10 +135,13 @@
    "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",
    "Release Notes": "Laidos Informacija",
+    "Remote Devices": "Nuotoliniai įrenginiai",
    "Remove": "Pašalinti",
+    "Required identifier for the folder. Must be the same on all cluster devices.": "Reikalaujamas aplanko identifikatorius. Privalo būti toks pats visuose įrenginiuose.",
    "Rescan": "Nuskaityti iš naujo",
    "Rescan All": "Nuskaityti visus aplankus",
    "Rescan Interval": "Pertrauka tarp nuskaitymų",
@@ -151,6 +164,7 @@
    "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ą.",
    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Grupės būsenoje rodomas vietoje įrenginio vardo. Bus atnaujintas į įrenginio vardą jei nieko neįrašysite.",
    "Shutdown": "Išjungti",
@@ -176,6 +190,7 @@
    "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.",
@@ -196,7 +211,8 @@
    "The path cannot be blank.": "Kelias negali būti tuščias.",
    "The rate limit must be a non-negative number (0: no limit)": "Srauto maksimalus greitis privalo būti ne neigiamas skaičius (0: nėra apribojimo)",
    "The rescan interval must be a non-negative number of seconds.": "Nuskaitymo dažnis negali būti neigiamas skaičius.",
-    "They are retried automatically and will be synced when the error is resolved.": "Failus bus automatiškai badoma parsiųsti dar kartą kai išspręsite klaidas",
+    "They are retried automatically and will be synced when the error is resolved.": "Failus bus automatiškai bandoma parsiųsti dar kartą kai išspręsite klaidas",
+    "This Device": "This Device",
    "This can easily give hackers access to read and change any files on your computer.": "Tai gali suteikti programišiams lengvą prieigą skaityti ir keisti bet kokius failus jūsų kompiuteryje.",
    "This is a major version upgrade.": "Tai yra stambus atnaujinimas.",
    "Trash Can File Versioning": "Šiukšliadėžės versijų valdymas",
@@ -214,6 +230,7 @@
    "Version": "Versija",
    "Versions Path": "Kelias iki versijos",
    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Versijos ištrinamos jei senesnės už nustatyta maksimalų amžių arba jei viršytas maksimalus failų skaičius per nustatytą laiko tarpą.",
+    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Įspėjimas, šis kelias yra esamo aplanko \"{{otherFolder}}\" pakatalogis.",
    "When adding a new device, keep in mind that this device must be added on the other side too.": "Pridėdami įrenginį, turėkite omeny, kad šis įrenginys taip pat turi būti pridėtas kitoje pusėje.",
    "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.": "Kai įvedate naują aplanką neužmirškite, kad jis bus naudojamas visuose įrenginiuose. Svarbu visur įvesti visiškai tokį pat aplanko vardą neužmirštant apie didžiąsias ir mažąsias raides.",
    "Yes": "Taip",
@@ -221,5 +238,7 @@
    "days": "dienos",
    "full documentation": "pilna dokumentacija",
    "items": "įrašai",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} nori dalintis aplanku \"{{folder}}\""
+    "{%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
@@ -1,4 +1,5 @@
 {
+    "A device with that ID is already added.": "En enhet med samme ID er allerede lagt til.",
    "A negative number of days doesn't make sense.": "Et negativt antall dager gir ikke mening.",
    "A new major version may not be compatible with previous versions.": "En ny hovedversjon er ikke nødvendigvis kompatibel med eldre versjoner.",
    "API Key": "API-nøkkel",
@@ -7,11 +8,13 @@
    "Add": "Legg til",
    "Add Device": "Legg til Enhet",
    "Add Folder": "Legg til Mappe",
+    "Add Remote Device": "Add Remote Device",
    "Add new folder?": "Legg til ny mappe?",
    "Address": "Adresse",
    "Addresses": "Adresser",
    "Advanced": "Avansert",
    "Advanced Configuration": "Avanserte Innstillinger",
+    "Advanced settings": "Advanced settings",
    "All Data": "Alle data",
    "Allow Anonymous Usage Reporting?": "Tillat Anonym Innsamling Av Brukerdata?",
    "Alphabetic": "Alfabetisk",
@@ -31,17 +34,19 @@
    "Connection Error": "Tilkoblingsfeil",
    "Copied from elsewhere": "Kopiert fra et annet sted",
    "Copied from original": "Kopiert fra original",
+    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 the following Contributors:",
    "Copyright © 2015 the following Contributors:": "Opphavsrett © 2015 de følgende bidragsytere:",
-    "Danger!": "Danger!",
+    "Danger!": "Fare!",
    "Delete": "Slett",
    "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": "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?",
    "Devices": "Enheter",
    "Disconnected": "Frakoblet",
-    "Discovery": "Oppdagelse",
+    "Discovery": "Oppslag",
    "Documentation": "Dokumentasjon",
    "Download Rate": "Nedlastingsrate",
    "Downloaded": "Lastet ned",
@@ -50,8 +55,10 @@
    "Edit Device": "Rediger Enhet",
    "Edit Folder": "Rediger Mappe",
    "Editing": "Redigerer",
+    "Enable NAT traversal": "Enable NAT traversal",
+    "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 \"dynamic\" for å automatisk finne adressen.",
+    "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",
@@ -64,16 +71,18 @@
    "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 beskyttet mot endringer som er gjort på andre enheter, men endringer som er gjort på denne enheten blir sendt til resten av gruppen.",
    "Folder": "Katalog",
    "Folder ID": "Mappe ID",
+    "Folder Label": "Folder Label",
    "Folder Master": "Styrende Mappe",
    "Folder Path": "Mappeplassering",
    "Folders": "Mapper",
    "GUI": "grafisk brukergrensesnitt",
-    "GUI Authentication Password": "GUI Passord",
-    "GUI Authentication User": "GUI Bruker",
+    "GUI Authentication Password": "Passord for GUI-autenisering",
+    "GUI Authentication User": "Bruker for GUI-autenisering",
    "GUI Listen Addresses": "GUI Lytteadresse",
    "Generate": "Generer",
-    "Global Discovery": "Global Søking",
-    "Global Discovery Server": "Global Søkemotor",
+    "Global Discovery": "Globalt oppslag",
+    "Global Discovery Server": "Global oppslagstjener",
+    "Global Discovery Servers": "Globale oppslagstjenere",
    "Global State": "Global Tilstand",
    "Help": "Hjelp",
    "Home page": "Hjemmeside",
@@ -89,7 +98,7 @@
    "Last File Received": "Sist Mottatte Fil",
    "Last seen": "Sist sett",
    "Later": "Senere",
-    "Local Discovery": "Lokal Søking",
+    "Local Discovery": "Lokalt oppslag",
    "Local State": "Lokal Tilstand",
    "Local State (Total)": "Lokal Tilstand (Total)",
    "Major Upgrade": "Hovedoppgradering",
@@ -108,6 +117,7 @@
    "OK": "OK",
    "Off": "Av",
    "Oldest First": "Den eldste først",
+    "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": "Valg",
    "Out of Sync": "Ikke synkronisert",
    "Out of Sync Items": "Ikke Synkroniserte Element",
@@ -118,28 +128,31 @@
    "Pause": "Oppholde",
    "Paused": "Oppholdt",
    "Please consult the release notes before performing a major upgrade.": "Se \"release notes\" før en hovedoppgradering utføres.",
-    "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.": "Vennligst angi bruker og passord for GUI-autentisering i innstillingsvinduet.",
    "Please wait": "Vennligst vent",
    "Preview": "Forhåndsvisning",
    "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",
    "Release Notes": "Utgivelsesnotat",
+    "Remote Devices": "Remote Devices",
    "Remove": "Fjern",
-    "Rescan": "Skann på nytt",
-    "Rescan All": "Skann alt på nytt",
-    "Rescan Interval": "Skanneintervall",
+    "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": "Gjennomsøk på nytt",
+    "Rescan All": "Gjennomsøk alt på nytt",
+    "Rescan Interval": "Intervall for gjennomsøking",
    "Restart": "Omstart",
    "Restart Needed": "Omstart Kreves",
    "Restarting": "Starter På Ny",
    "Resume": "Gjenoppta",
    "Reused": "Gjenbrukt",
    "Save": "Lagre",
-    "Scan Time Remaining": "Scan Time Remaining",
-    "Scanning": "Skanner",
+    "Scan Time Remaining": "Gjenstående tid for gjennomsøking",
+    "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.",
    "Settings": "Innstillinger",
@@ -148,12 +161,13 @@
    "Share Folders With Device": "Del Mapper Med Enhet",
    "Share With Devices": "Del Med Enheter",
    "Share this folder?": "Dele denne mappen?",
-    "Shared With": "Delt Med",
+    "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.",
-    "Shutdown": "Slå Av",
+    "Shutdown": "Avslutt",
    "Shutdown Complete": "Avslutning fullført",
    "Simple File Versioning": "Enkel Versjonskontroll",
    "Single level wildcard (matches within a directory only)": "Enkeltnivåsøk (søker kun i en mappe)",
@@ -172,10 +186,11 @@
    "Syncthing is upgrading.": "Syncthing oppgraderer.",
    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing ser ut til å være nede, eller så er det et problem med nettforbindelsen din. Prøver 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å 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.": "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.": "Grensesnittet for administrering av Syncthing er satt til å tillate ekstern tilgang uten et passord.",
    "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.",
@@ -195,9 +210,10 @@
    "The number of versions must be a number and cannot be blank.": "Antall versjoner må være et tall og kan ikke være tomt.",
    "The path cannot be blank.": "Plasseringen kan ikke være tom.",
    "The rate limit must be a non-negative number (0: no limit)": "Hastighetsbegrensningen kan ikke være et negativt tall (0: ingen begrensing)",
-    "The rescan interval must be a non-negative number of seconds.": "Antall sekund i skanneintervallet kan ikke være negativt.",
+    "The rescan interval must be a non-negative number of seconds.": "Antall sekund for intervallet kan ikke være negativt.",
    "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 can easily give hackers access to read and change any files on your computer.": "This can easily give hackers access to read and change any files on your computer.",
+    "This Device": "This Device",
+    "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",
    "Unknown": "Ukjent",
@@ -214,12 +230,15 @@
    "Version": "Versjon",
    "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%}\".": "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.": "Merk at når en ny enhet blir lagt til må denne også legges til på andre siden.",
    "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 en ny mappe blir lagt til, husk at Mappe-ID blir brukt til å binde sammen mapper mellom enheter. Det er forskjell på store og små bokstaver, så IDene må være identiske på alle enhetene.",
    "Yes": "Ja",
    "You must keep at least one version.": "Du må beholde minst én versjon",
    "days": "dager",
    "full documentation": "all dokumentasjon",
-    "items": "element",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} ønsker å dele mappen \"{{folder}}\"."
+    "items": "elementer",
+    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} ønsker å 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-nl.json
+++ b/gui/default/assets/lang/lang-nl.json
@@ -1,4 +1,5 @@
 {
+    "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 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",
@@ -7,11 +8,13 @@
    "Add": "Toevoegen",
    "Add Device": "Apparaat toevoegen",
    "Add Folder": "Map toevoegen",
+    "Add Remote Device": "Voeg extern apparaat toe",
    "Add new folder?": "Voeg nieuwe map toe?",
    "Address": "Adres",
    "Addresses": "Adressen",
    "Advanced": "Geavanceerd",
    "Advanced Configuration": "Geavanceerde configuratie",
+    "Advanced settings": "Geavanceerde instellingen",
    "All Data": "Alle gegevens",
    "Allow Anonymous Usage Reporting?": "Versturen van anonieme gebruikersstatistieken toestaan?",
    "Alphabetic": "Alfabetisch",
@@ -31,10 +34,12 @@
    "Connection Error": "Verbindingsfout",
    "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 contributanten:",
    "Copyright © 2015 the following Contributors:": "Copyright © 2015 de volgende Bijdragers:",
-    "Danger!": "Gevaar!",
+    "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",
@@ -50,6 +55,8 @@
    "Edit Device": "Bewerk apparaat",
    "Edit Folder": "Bewerk map",
    "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.",
@@ -64,6 +71,7 @@
    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Bestanden zijn beschermt tegen aanpassingen die gemaakt zijn door andere apparaten, maar aanpassingen op dit apparaat worden doorgestuurd naar de rest van het cluster.",
    "Folder": "Map",
    "Folder ID": "Map-ID",
+    "Folder Label": "Map label",
    "Folder Master": "Hoofdmap",
    "Folder Path": "Maplocatie",
    "Folders": "Mappen",
@@ -74,6 +82,7 @@
    "Generate": "Genereer",
    "Global Discovery": "Globaal zoeken",
    "Global Discovery Server": "Globale zoekserver",
+    "Global Discovery Servers": "Globale zoekservers",
    "Global State": "Globale status",
    "Help": "Help",
    "Home page": "Startpagina",
@@ -108,6 +117,7 @@
    "OK": "OK",
    "Off": "Uit",
    "Oldest First": "Oudste eerst",
+    "Optional descriptive label for the folder. Can be different on each device.": "Optioneel label met een beschrijving voor de map. Kan verschillend zijn op elk apparaat.",
    "Options": "Opties",
    "Out of Sync": "Niet gesynchroniseerd",
    "Out of Sync Items": "Niet-gesynchroniseerde items",
@@ -118,17 +128,20 @@
    "Pause": "Pauze",
    "Paused": "Gepauseerd",
    "Please consult the release notes before performing a major upgrade.": "Lees eerst de release notes voordat u een grote update uitvoert.",
-    "Please set a GUI Authentication User and Password in the Settings dialog.": "Stel een GUI Authentication User en wachtwoord in. Dit kan in het dialoogvenster met instellingen.",
+    "Please set a GUI Authentication User and Password in the Settings dialog.": "Stel een gebruikersnaam en wachtwoord in bij 'Instellingen'.",
    "Please wait": "Even geduld",
    "Preview": "Preview",
    "Preview Usage Report": "Preview gebruiksstatistieken",
    "Quick guide to supported patterns": "Snelgids voor ondersteunde patronen",
    "RAM Utilization": "Geheugengebruik",
    "Random": "Willekeurig",
+    "Relay Servers": "Doorstuurservers",
    "Relayed via": "Doorgestuurd via",
    "Relays": "Relais",
    "Release Notes": "Release notes",
+    "Remote Devices": "Externe apparaten",
    "Remove": "Verwijderen",
+    "Required identifier for the folder. Must be the same on all cluster devices.": "De identifier voor de map is verplicht. Dit moet hetzelfde zijn op alle apparaten in het cluster. ",
    "Rescan": "Opnieuw scannen",
    "Rescan All": "Scan alles opnieuw",
    "Rescan Interval": "Scanfrequentie",
@@ -138,7 +151,7 @@
    "Resume": "Hervatten",
    "Reused": "Hergebruikt",
    "Save": "Bewaar",
-    "Scan Time Remaining": "Scan Time Remaining",
+    "Scan Time Remaining": "Resterende scantijd",
    "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.",
@@ -151,6 +164,7 @@
    "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.",
    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Wordt in plaats van het apparaat-ID in de cluster status getoond. Zal geupdate worden naar de naam die het apparaat uitzend. ",
    "Shutdown": "Sluit af",
@@ -172,10 +186,11 @@
    "Syncthing is upgrading.": "Syncthing is aan het upgraden.",
    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing lijkt afgesloten te zijn, of er is een verbindingsprobleem met het internet. Nieuwe poging....",
    "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.": "De Syncthing admin interface is geconfigureerd om op afstand toegang zonder een wachtwoord toe te staan.",
+    "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 {%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.",
@@ -197,7 +212,8 @@
    "The rate limit must be a non-negative number (0: no limit)": "De snelheidslimiet moet een positief nummer zijn (0: geen limiet)",
    "The rescan interval must be a non-negative number of seconds.": "De scanfrequentie moet een positief getal in seconden zijn.",
    "They are retried automatically and will be synced when the error is resolved.": "Het wordt automatisch opnieuw geprobeerd. Bestanden worden gesynchroniseerd als de fout is hersteld.",
-    "This can easily give hackers access to read and change any files on your computer.": "Dit kan hackers eenvoudig toegang geven tot het lezen en wijzigen van bestanden op jouw computer.",
+    "This Device": "Dit apparaat",
+    "This can easily give hackers access to read and change any files on your computer.": "Dit kan kwaadwilligen eenvoudig toegang geven tot het lezen en wijzigen van bestanden op jouw computer.",
    "This is a major version upgrade.": "Dit is een grote update.",
    "Trash Can File Versioning": "Versiebeheer bestanden prullenbak",
    "Unknown": "Onbekend",
@@ -208,12 +224,13 @@
    "Upgrade": "Upgrade",
    "Upgrade To {%version%}": "Upgrade naar {{version}}",
    "Upgrading": "Bezig met upgrade",
-    "Upload Rate": "Upload snelheid",
+    "Upload Rate": "Uploadsnelheid",
    "Uptime": "Uptime",
    "Use HTTPS for GUI": "Gebruik HTTPS voor de GUI",
    "Version": "Versie",
    "Versions Path": "Bestandspad versies",
    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Versies worden automatisch verwijderd als deze ouder zijn dan de maximale leeftijd of als ze het maximaal aantal toegestane bestanden per interval overschrijden. ",
+    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Let op, dit bestandspad is een submap van een bestaande map \"{{otherFolder}}\".",
    "When adding a new device, keep in mind that this device must be added on the other side too.": "Wanneer een nieuw toestel wordt toegevoegd, houd er dan rekening mee dat dit toestel ook aan de andere kant moet worden toegevoegd.",
    "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.": "Houd er bij het toevoegen van nieuwe mappen rekening mee dat het map-ID gebruikt wordt om mappen tussen apparaten te verbinden. Dit ID is hoofdlettergevoelig en moet identiek zijn op andere apparaten.",
    "Yes": "Ja",
@@ -221,5 +238,7 @@
    "days": "dagen",
    "full documentation": "volledige documentatie",
    "items": "objecten",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} wil de map \"{{folder}}\" delen."
+    "{%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,4 +1,5 @@
 {
+    "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 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",
@@ -7,11 +8,13 @@
    "Add": "Legg til",
    "Add Device": "Legg Til Eining",
    "Add Folder": "Legg Til Mappe",
+    "Add Remote Device": "Add Remote Device",
    "Add new folder?": "Leggja til ny mappe?",
    "Address": "Adresse",
    "Addresses": "Adresser",
    "Advanced": "Avansert",
    "Advanced Configuration": "Avansert konfigurasjon",
+    "Advanced settings": "Advanced settings",
    "All Data": "Alle data",
    "Allow Anonymous Usage Reporting?": "Tillata anonymisert bruksrapportering?",
    "Alphabetic": "Alfabetisk",
@@ -31,10 +34,12 @@
    "Connection Error": "Tilkoplingsfeil",
    "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:",
-    "Danger!": "Danger!",
+    "Danger!": "Fare!",
    "Delete": "Slett",
    "Deleted": "Sletta",
+    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Device \"{{name}}\" ({{device}} at {{address}}) wants to connect. Add new device?",
    "Device ID": "Eining ID",
    "Device Identification": "Einingskjennemerke",
    "Device Name": "Namn På Eining",
@@ -50,6 +55,8 @@
    "Edit Device": "Rediger Eining",
    "Edit Folder": "Rediger Mappe",
    "Editing": "Redigerer",
+    "Enable NAT traversal": "Enable NAT traversal",
+    "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.",
    "Enter ignore patterns, one per line.": "Skriv inn mønster som skal utelatast, eitt per linje.",
@@ -64,6 +71,7 @@
    "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": "Folder Label",
    "Folder Master": "Styrande Mappe",
    "Folder Path": "Mappeplassering",
    "Folders": "Mapper",
@@ -74,6 +82,7 @@
    "Generate": "Generer",
    "Global Discovery": "Global søking",
    "Global Discovery Server": "Global søkjetenar",
+    "Global Discovery Servers": "Globalsøkjetenarar",
    "Global State": "Global Tilstand",
    "Help": "Hjelp",
    "Home page": "Heimeside",
@@ -108,6 +117,7 @@
    "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.",
    "Options": "Val",
    "Out of Sync": "Ikkje synkronisert",
    "Out of Sync Items": "Ikkje-synkroniserte element",
@@ -118,17 +128,20 @@
    "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.": "Please set a GUI Authentication User and Password in the Settings dialog.",
+    "Please set a GUI Authentication User and Password in the Settings dialog.": "Ver vennleg å set ein GUI brukar og 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": "Remote Devices",
    "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.",
    "Rescan": "Skann På Ny",
    "Rescan All": "Skann alle på nytt",
    "Rescan Interval": "Skanneintervall",
@@ -138,7 +151,7 @@
    "Resume": "Start",
    "Reused": "Gjenbrukt",
    "Save": "Lagre",
-    "Scan Time Remaining": "Scan Time Remaining",
+    "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.",
@@ -151,6 +164,7 @@
    "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.",
    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Vist i staden for mappe-ID-en i klyngjestatuses. Vil verta oppdatert til namnet eininga kringkastar dersom tomt.",
    "Shutdown": "Slå Av",
@@ -172,10 +186,11 @@
    "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.": "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.": "Syncthing sitt administreringsgrensesnitt er sett opp til å tillate ekstern tilgang uten passord.",
    "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 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.",
@@ -197,7 +212,8 @@
    "The rate limit must be a non-negative number (0: no limit)": "Hastigheitsgrensa må ver eit positivt tall (0: ingen grensa)",
    "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 can easily give hackers access to read and change any files on your computer.": "This can easily give hackers access to read and change any files on your computer.",
+    "This Device": "This Device",
+    "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 is a major version upgrade.": "Dette er ei hovudoppgradering",
    "Trash Can File Versioning": "Papirkorg filutgåvehandtering",
    "Unknown": "Ukjent",
@@ -214,6 +230,7 @@
    "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.",
    "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",
@@ -221,5 +238,7 @@
    "days": "dagar",
    "full documentation": "all dokumentasjon",
    "items": "element",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} ønskjer å dela mappa \"{{folder}}\"."
+    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} ønskjer å dela mappa \"{{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-pl.json
+++ b/gui/default/assets/lang/lang-pl.json
@@ -1,4 +1,5 @@
 {
+    "A device with that ID is already added.": "Urządzenie o tym ID jest już dodane.",
    "A negative number of days doesn't make sense.": "Ujemna ilość dni nie ma sensu.",
    "A new major version may not be compatible with previous versions.": "Nowa wersja może być niekompatybilna z poprzednimi wersjami.",
    "API Key": "Klucz API",
@@ -7,11 +8,13 @@
    "Add": "Dodaj",
    "Add Device": "Dodaj urządzenie",
    "Add Folder": "Dodaj folder",
+    "Add Remote Device": "Dodaj urządzenie zdalne",
    "Add new folder?": "Dodać nowy folder?",
    "Address": "Adres",
    "Addresses": "Adresy",
    "Advanced": "Zaawansowane",
    "Advanced Configuration": "Konfiguracja zaawansowana",
+    "Advanced settings": "Ustawienia zaawansowane",
    "All Data": "Wszystkie dane",
    "Allow Anonymous Usage Reporting?": "Zezwalaj na anonimowe statystyki użycia?",
    "Alphabetic": "Alfabetycznie",
@@ -31,10 +34,12 @@
    "Connection Error": "Błąd 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!": "Danger!",
+    "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",
@@ -50,6 +55,8 @@
    "Edit Device": "Edytuj urządzenie",
    "Edit Folder": "Edytuj folder",
    "Editing": "Edytowanie",
+    "Enable NAT traversal": "Enable NAT traversal",
+    "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.",
@@ -64,6 +71,7 @@
    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Pliki są zabezpieczone przed zmianami na innym urządzeniu, jednak zmiany w tym urządzeniu będą wysłane do reszty.",
    "Folder": "Folder",
    "Folder ID": "ID folderu",
+    "Folder Label": "Etykieta folderu",
    "Folder Master": "Główny folder",
    "Folder Path": "Ścieżka folderu",
    "Folders": "Foldery",
@@ -74,6 +82,7 @@
    "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",
    "Home page": "Strona domowa",
@@ -108,6 +117,7 @@
    "OK": "OK",
    "Off": "Wyłącz",
    "Oldest First": "Najstarsze na początku",
+    "Optional descriptive label for the folder. Can be different on each device.": "Opcjonalna opisowa etykieta dla folderu. Może być różna na każdym urządzeniu.",
    "Options": "Opcje",
    "Out of Sync": "Niezsynchronizowane",
    "Out of Sync Items": "Niezsynchronizowane pliki",
@@ -118,17 +128,20 @@
    "Pause": "Zatrzymaj",
    "Paused": "Zatrzymany",
    "Please consult the release notes before performing a major upgrade.": "Zaleca się przeanalizowanie \"release notes\" przed przeprowadzeniem znaczącej aktualizacji.",
-    "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.": "Ustaw proszę użytkownika i hasło dostępowe do GUI w Ustawieniach",
    "Please wait": "Proszę czekać",
    "Preview": "Podgląd",
    "Preview Usage Report": "Podgląd raportu użycia.",
    "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",
    "Release Notes": "Informacje o wydaniu",
+    "Remote Devices": "Urządzenia zdalne",
    "Remove": "Usuń",
+    "Required identifier for the folder. Must be the same on all cluster devices.": "Wymagany identyfikator dla folderu. Musi być taki sam dla wszystkich urządzeń.",
    "Rescan": "Skanuj ponownie",
    "Rescan All": "Skanuj wszystko ponownie",
    "Rescan Interval": "Interwał skanowania",
@@ -138,7 +151,7 @@
    "Resume": "Wznów",
    "Reused": "Ponownie użyte",
    "Save": "Zapisz",
-    "Scan Time Remaining": "Scan Time Remaining",
+    "Scan Time Remaining": "Pozostały czas skanowania",
    "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.",
@@ -151,6 +164,7 @@
    "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.",
    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Pokazane w statusie zamiast ID urządzenia. Zostanie zaktualizowane do nazwy urządzenia jeżeli pozostanie puste.",
    "Shutdown": "Wyłącz",
@@ -172,10 +186,11 @@
    "Syncthing is upgrading.": "Aktualizowanie Syncthing",
    "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.": "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.": "Interfejs administracyjny Syncthing jest skonfigurowany w sposób pozwalający na zdalny dostęp bez hasła.",
    "The aggregated statistics are publicly available at {%url%}.": "Zebrane statystyki są publicznie dostępne pod adresem {{url}}.",
    "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.",
@@ -197,7 +212,8 @@
    "The rate limit must be a non-negative number (0: no limit)": "Ograniczenie prędkości powinno być nieujemną liczbą całkowitą (0: brak ograniczeń)",
    "The rescan interval must be a non-negative number of seconds.": "Interwał skanowania musi być niezerową liczbą sekund.",
    "They are retried automatically and will be synced when the error is resolved.": "Ponowne próby zachodzą automatycznie, synchronizacja nastąpi po usunięciu usterki.",
-    "This can easily give hackers access to read and change any files on your computer.": "This can easily give hackers access to read and change any files on your computer.",
+    "This Device": "To urządzenie",
+    "This can easily give hackers access to read and change any files on your computer.": "Może to umożliwić osobom trzecim dostęp do odczytu i zmian dowolnych plików na urządzeniu.",
    "This is a major version upgrade.": "To jest ważna aktualizacja",
    "Trash Can File Versioning": "Kontrola werjsi plików w koszu",
    "Unknown": "Nieznany",
@@ -214,6 +230,7 @@
    "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}}\".",
    "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",
@@ -221,5 +238,7 @@
    "days": "dni",
    "full documentation": "pełna dokumentacja",
    "items": "pozycji",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} chce udostępnić folder \"{{folder}}\""
+    "{%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
@@ -1,4 +1,5 @@
 {
+    "A device with that ID is already added.": "Um dispositivo com este ID já foi adicionado.",
    "A negative number of days doesn't make sense.": "Um número negativo de dias não faz sentido.",
    "A new major version may not be compatible with previous versions.": "Uma nova versão principal pode não ser compatível com versões anteriores.",
    "API Key": "Chave da API",
@@ -7,11 +8,13 @@
    "Add": "Adicionar",
    "Add Device": "Adicionar dispositivo",
    "Add Folder": "Adicionar pasta",
+    "Add Remote Device": "Adicionar dispositivo remoto",
    "Add new folder?": "Adicionar nova pasta?",
    "Address": "Endereço",
    "Addresses": "Endereços",
    "Advanced": "Avançado",
    "Advanced Configuration": "Configuração avançada",
+    "Advanced settings": "Configurações avançadas",
    "All Data": "Todos os dados",
    "Allow Anonymous Usage Reporting?": "Permitir envio de relatórios anônimos de uso?",
    "Alphabetic": "Alfabética",
@@ -31,10 +34,12 @@
    "Connection Error": "Erro de 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 ID": "ID do dispositivo",
    "Device Identification": "Identificação do dispositivo",
    "Device Name": "Nome do dispositivo",
@@ -50,6 +55,8 @@
    "Edit Device": "Editar dispositivo",
    "Edit Folder": "Editar pasta",
    "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 padrões de exclusão, um por linha.",
@@ -64,6 +71,7 @@
    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Os arquivos estão protegidos contra alterações feitas em outros dispositivos, mas alterações feitas neste dispositivo serão enviadas ao resto dos dispositivos.",
    "Folder": "Pasta",
    "Folder ID": "ID da pasta",
+    "Folder Label": "Rótulo da pasta",
    "Folder Master": "Pasta mestre",
    "Folder Path": "Caminho da pasta",
    "Folders": "Pastas",
@@ -74,6 +82,7 @@
    "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",
    "Home page": "Página inicial",
@@ -108,6 +117,7 @@
    "OK": "OK",
    "Off": "Desligada",
    "Oldest First": "Mais antigo primeiro",
+    "Optional descriptive label for the folder. Can be different on each device.": "Descrição opcional da pasta. Pode ser diferente em cada dispositivo.",
    "Options": "Opções",
    "Out of Sync": "Fora de sincronia",
    "Out of Sync Items": "Fora de sincronia",
@@ -116,7 +126,7 @@
    "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": "Caminho para a pasta na máquina local. Será criado caso não exista. O caractere til (~) pode ser usado como um atalho para",
    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "O caminho onde as versões serão salvas (deixe vazio para usar a pasta padrão .stversions dentro desta pasta).",
    "Pause": "Pausar",
-    "Paused": "Pausada",
+    "Paused": "Em pausa",
    "Please consult the release notes before performing a major upgrade.": "Por favor, consulte as notas de lançamento antes de atualizar para uma versão \"major\".",
    "Please set a GUI Authentication User and Password in the Settings dialog.": "Por favor, defina um nome de usuário e senha para acesso à interface web, nas configurações.",
    "Please wait": "Aguarde",
@@ -125,10 +135,13 @@
    "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",
    "Release Notes": "Notas de lançamento",
+    "Remote Devices": "Dispositivos remotos",
    "Remove": "Remover",
+    "Required identifier for the folder. Must be the same on all cluster devices.": "Identificador obrigatório da pasta. Deve ser igual em todos os dispositivos do grupo.",
    "Rescan": "Verificar agora",
    "Rescan All": "Verificar todas",
    "Rescan Interval": "Intervalo entre verificações",
@@ -138,7 +151,7 @@
    "Resume": "Resumir",
    "Reused": "Reutilizado",
    "Save": "Salvar",
-    "Scan Time Remaining": "Scan Time Remaining",
+    "Scan Time Remaining": "Tempo de verificação restante",
    "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.",
@@ -151,6 +164,7 @@
    "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.",
    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Mostrado no lugar do ID do dispositivo no indicador de estado do grupo. Será atualizado para o nome que o dispositivo divulga, caso seja deixado em branco.",
    "Shutdown": "Desligar",
@@ -176,6 +190,7 @@
    "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.",
@@ -197,6 +212,7 @@
    "The rate limit must be a non-negative number (0: no limit)": "O limite de velocidade deve ser um número positivo (0: sem limite)",
    "The rescan interval must be a non-negative number of seconds.": "O intervalo entre verificações deve ser um número positivo de segundos.",
    "They are retried automatically and will be synced when the error is resolved.": "Serão tentadas automaticamente e sincronizadas após o erro ter sido resolvido.",
+    "This Device": "Este dispositivo",
    "This can easily give hackers access to read and change any files on your computer.": "Isto pode dar a hackers poder de leitura e escrita de qualquer arquivo em seu dispositivo.",
    "This is a major version upgrade.": "Esta é uma atualização para uma versão \"major\".",
    "Trash Can File Versioning": "Versionamento de arquivos da lixeira",
@@ -214,6 +230,7 @@
    "Version": "Versão",
    "Versions Path": "Caminho das versões",
    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "As versões são automaticamente apagadas se elas são mais antigas do que a idade máxima ou excederem o número de arquivos permitido em um intervalo.",
+    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Atenção, este caminho é um subdiretório de uma pasta já existente: \"{{otherFolder}}\".",
    "When adding a new device, keep in mind that this device must be added on the other side too.": "Quando estiver adicionando um dispositivo, lembre-se de que este dispositivo deve ser adicionado do outro lado também.",
    "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.": "Quando adicionar uma nova pasta, lembre-se que o ID da pasta é utilizado para ligar pastas entre dispositivos. Ele é sensível às diferenças entre maiúsculas e minúsculas e deve ser o mesmo em todos os dispositivos.",
    "Yes": "Sim",
@@ -221,5 +238,7 @@
    "days": "dias",
    "full documentation": "documentação completa",
    "items": "itens",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} quer compartilhar a pasta \"{{folder}}\"."
+    "{%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
@@ -1,4 +1,5 @@
 {
+    "A device with that ID is already added.": "Já tinha sido adicionado um dispositivo com esse ID.",
    "A negative number of days doesn't make sense.": "Um número negativo de dias não faz sentido.",
    "A new major version may not be compatible with previous versions.": "Uma nova versão principal pode não ser compatível com versões anteriores.",
    "API Key": "Chave da API",
@@ -7,11 +8,13 @@
    "Add": "Adicionar",
    "Add Device": "Adicionar dispositivo",
    "Add Folder": "Adicionar pasta",
+    "Add Remote Device": "Adicionar dispositivo remoto",
    "Add new folder?": "Adicionar nova pasta?",
    "Address": "Endereço",
    "Addresses": "Endereços",
    "Advanced": "Avançadas",
    "Advanced Configuration": "Configuração avançada",
+    "Advanced settings": "Configurações avançadas",
    "All Data": "Todos os dados",
    "Allow Anonymous Usage Reporting?": "Permitir envio de relatórios anónimos de utilização?",
    "Alphabetic": "Alfabética",
@@ -31,10 +34,12 @@
    "Connection Error": "Erro 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",
@@ -50,6 +55,8 @@
    "Edit Device": "Editar dispositivo",
    "Edit Folder": "Editar pasta",
    "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.",
@@ -64,6 +71,7 @@
    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Os ficheiros estão protegidos contra alterações feitas noutros dispositivos, mas alterações feitas neste dispositivo serão enviadas ao resto do grupo.",
    "Folder": "Pasta",
    "Folder ID": "ID da pasta",
+    "Folder Label": "Etiqueta da pasta",
    "Folder Master": "Pasta mestre",
    "Folder Path": "Caminho da pasta",
    "Folders": "Pastas",
@@ -74,6 +82,7 @@
    "Generate": "Gerar",
    "Global Discovery": "Detecção global",
    "Global Discovery Server": "Servidor de detecção global",
+    "Global Discovery Servers": "Servidores de detecção global",
    "Global State": "Estado global",
    "Help": "Ajuda",
    "Home page": "Página do projecto",
@@ -108,6 +117,7 @@
    "OK": "OK",
    "Off": "Desligada",
    "Oldest First": "Primeiro os mais antigos",
+    "Optional descriptive label for the folder. Can be different on each device.": "Etiqueta descritiva opcional para a pasta. Pode ser diferente em cada dispositivo.",
    "Options": "Opções",
    "Out of Sync": "Fora de sincronia",
    "Out of Sync Items": "Itens por sincronizar",
@@ -118,17 +128,20 @@
    "Pause": "Pausar",
    "Paused": "Em pausa",
    "Please consult the release notes before performing a major upgrade.": "Consulte as notas de lançamento antes de fazer uma actualização importante.",
-    "Please set a GUI Authentication User and Password in the Settings dialog.": "Por favor, defina um utilizador e senha de autenticação na interface gráfica, nas configurações.",
+    "Please set a GUI Authentication User and Password in the Settings dialog.": "Por favor, defina um utilizador e senha de autenticação para a interface gráfica, nas configurações.",
    "Please wait": "Aguarde",
    "Preview": "Previsão",
    "Preview Usage Report": "Pré-visualizar relatório de utilização",
    "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",
    "Release Notes": "Notas de lançamento",
+    "Remote Devices": "Dispositivos remotos",
    "Remove": "Remover",
+    "Required identifier for the folder. Must be the same on all cluster devices.": "Identificador obrigatório para a pasta. Tem que ser igual em todos os dispositivos do grupo.",
    "Rescan": "Verificar agora",
    "Rescan All": "Verificar todas agora",
    "Rescan Interval": "Intervalo entre verificações",
@@ -138,7 +151,7 @@
    "Resume": "Retomar",
    "Reused": "Reutilizado",
    "Save": "Gravar",
-    "Scan Time Remaining": "Tempo restante de rastreio",
+    "Scan Time Remaining": "Tempo restante da verificação",
    "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.",
@@ -151,6 +164,7 @@
    "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.",
    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Apresentado ao invés do ID do dispositivo no indicador de estado do grupo. Será actualizado para o nome que o dispositivo divulga, se for deixado em branco.",
    "Shutdown": "Desligar",
@@ -176,6 +190,7 @@
    "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.",
@@ -197,6 +212,7 @@
    "The rate limit must be a non-negative number (0: no limit)": "O limite de velocidade tem que ser um número que não seja negativo (0: sem limite)",
    "The rescan interval must be a non-negative number of seconds.": "O intervalo entre verificações tem que ser um valor não negativo de segundos.",
    "They are retried automatically and will be synced when the error is resolved.": "Será tentado automaticamente e os itens serão sincronizados assim que o erro seja resolvido.",
+    "This Device": "Este dispositivo",
    "This can easily give hackers access to read and change any files on your computer.": "Isso facilmente dará acesso aos piratas informáticos para lerem e modificarem quaisquer ficheiros no seu computador.",
    "This is a major version upgrade.": "Esta é uma actualização para uma versão importante.",
    "Trash Can File Versioning": "Reciclagem",
@@ -214,6 +230,7 @@
    "Version": "Versão",
    "Versions Path": "Caminho das versões",
    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "As versões são eliminadas automaticamente se forem mais antigas do que a idade máxima ou excederem o número máximo de ficheiros permitido num intervalo.",
+    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Aviso: Este caminho é uma subpasta da pasta \"{{otherFolder}}\" já existente.",
    "When adding a new device, keep in mind that this device must be added on the other side too.": "Quando adicionar um novo dispositivo, lembre-se que este dispositivo tem que ser adicionado do outro lado também.",
    "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.": "Quando adicionar uma nova pasta, lembre-se que o ID da pasta é utilizado para ligar as pastas entre dispositivos. É sensível às diferenças entre maiúsculas e minúsculas e tem que ter uma correspondência perfeita entre todos os dispositivos.",
    "Yes": "Sim",
@@ -221,5 +238,7 @@
    "days": "dias",
    "full documentation": "documentação completa",
    "items": "itens",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} quer partilhar a pasta \"{{folder}}\"."
+    "{%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
@@ -1,4 +1,5 @@
 {
+    "A device with that ID is already added.": "Устройство с таким ID уже добавлено.",
    "A negative number of days doesn't make sense.": "Отрицательное число дней не имеет значения.",
    "A new major version may not be compatible with previous versions.": "Новое обновление основной версии может быть несовместимо с предыдущими версиями.",
    "API Key": "Ключ API",
@@ -7,11 +8,13 @@
    "Add": "Добавить",
    "Add Device": "Добавить устройство",
    "Add Folder": "Добавить папку",
+    "Add Remote Device": "Добавить удалённое устройство",
    "Add new folder?": "Добавить новую папку?",
    "Address": "Адрес",
    "Addresses": "Адреса",
    "Advanced": "Дополнительно",
    "Advanced Configuration": "Дополнительные настройки",
+    "Advanced settings": "Дополнительные настройки",
    "All Data": "Все данные",
    "Allow Anonymous Usage Reporting?": "Разрешить сбор анонимной статистики использования?",
    "Alphabetic": "По алфавиту",
@@ -31,10 +34,12 @@
    "Connection Error": "Ошибка подключения",
    "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": "Имя устройства",
@@ -50,6 +55,8 @@
    "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.": "Введите шаблоны игнорирования, по одному на строку.",
@@ -64,6 +71,7 @@
    "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": "ID папки",
+    "Folder Label": "Ярлык папки",
    "Folder Master": "Папка-оригинал",
    "Folder Path": "Путь к папке",
    "Folders": "Папки",
@@ -74,6 +82,7 @@
    "Generate": "Сгенерировать",
    "Global Discovery": "Глобальное обнаружение",
    "Global Discovery Server": "Сервер глобального обнаружения",
+    "Global Discovery Servers": "Серверы глобального обнаружения",
    "Global State": "Глобальное состояние",
    "Help": "Помощь",
    "Home page": "Домашная страница",
@@ -108,6 +117,7 @@
    "OK": "ОК",
    "Off": "Отключить",
    "Oldest First": "Сначала старые",
+    "Optional descriptive label for the folder. Can be different on each device.": "Необязательное описательное название папки. Может различаться на разных устройствах.",
    "Options": "Настройки",
    "Out of Sync": "Нет синхронизации",
    "Out of Sync Items": "Не синхронизированные пункты",
@@ -125,10 +135,13 @@
    "Quick guide to supported patterns": "Краткое руководство по поддерживаемым шаблонам",
    "RAM Utilization": "Использование ОЗУ",
    "Random": "Случайно",
+    "Relay Servers": "Релеи",
    "Relayed via": "Релей через",
    "Relays": "Релеи",
    "Release Notes": "Замечания к версии",
+    "Remote Devices": "Удалённые устройства",
    "Remove": "Удалить",
+    "Required identifier for the folder. Must be the same on all cluster devices.": "Обязательный идентификатор папки. Должен быть одним и тем же на всех устройствах кластера.",
    "Rescan": "Пересканирование",
    "Rescan All": "Пересканировать все",
    "Rescan Interval": "Интервал пересканирования",
@@ -138,7 +151,7 @@
    "Resume": "Возобновить",
    "Reused": "Повторно использовано",
    "Save": "Сохранить",
-    "Scan Time Remaining": "Scan Time Remaining",
+    "Scan Time Remaining": "Оставшееся время сканирования",
    "Scanning": "Сканирование",
    "Select the devices to share this folder with.": "Выберите устройства, для которых будет доступна эта папка.",
    "Select the folders to share with this device.": "Выберите папку для предоставления доступа данному устройству",
@@ -151,6 +164,7 @@
    "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 устройства в статусе группы. Будет разослан другим устройствам в качестве имени по умолчанию.",
    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Отображается вместо ID устройства в статусе группы. Если поле не заполнено, то будет установлено имя, передаваемое этим устройством.",
    "Shutdown": "Выключить",
@@ -172,10 +186,11 @@
    "Syncthing is upgrading.": "Обновление Syncthing ",
    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Кажется, Syncthing не запущен или есть проблемы с подключением к Интернету. Переподключаюсь...",
    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing столкнулся с проблемой при обработке Вашего запроса. Пожалуйста, обновите страницу или перезапустите Syncthing если проблема повторится.",
-    "The Syncthing admin interface is configured to allow remote access without a password.": "Административный интерфейс Syncthing настроен разрешать удаленный доступ без пароля.",
+    "The Syncthing admin interface is configured to allow remote access without a password.": "Административный интерфейс Syncthing настроен для предоставления удаленного доступа без пароля.",
    "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 символов, ",
@@ -197,6 +212,7 @@
    "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 can easily give hackers access to read and change any files on your computer.": "Это может дать доступ хакерам для чтения и изменения любых файлов на вашем компьютере.",
    "This is a major version upgrade.": "Это обновление основной версии продукта.",
    "Trash Can File Versioning": "Использовать версионность для файлов в Корзине",
@@ -214,6 +230,7 @@
    "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%}\".": "Осторожно, этот путь является подкаталогом существующей папки «{{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.": "Когда добавляете новую папку, помните, что ID папок используются для того, чтобы связывать папки между всеми устройствами. Они чувствительны к регистру и должны совпадать на всех используемых устройствах.",
    "Yes": "Да",
@@ -221,5 +238,7 @@
    "days": "Дней",
    "full documentation": "полная документация",
    "items": "элементы",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} хочет поделиться папкой \"{{folder}}\"."
+    "{%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,4 +1,5 @@
 {
+    "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.": "Negativt antal dagar är inte troligt.",
    "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",
@@ -7,11 +8,13 @@
    "Add": "Lägg till",
    "Add Device": "Lägg till enhet",
    "Add Folder": "Lägg till katalog",
+    "Add Remote Device": "Lägg till fjärrenhet",
    "Add new folder?": "Lägg till katalog?",
    "Address": "Adress",
    "Addresses": "Adresser",
    "Advanced": "Avancerat",
    "Advanced Configuration": "Avancerad konfiguration",
+    "Advanced settings": "Avancerade inställningar",
    "All Data": "All data",
    "Allow Anonymous Usage Reporting?": "Tillåt anonym användarstatistik?",
    "Alphabetic": "Alfabetisk",
@@ -31,10 +34,12 @@
    "Connection Error": "Anslutningsproblem",
    "Copied from elsewhere": "Kopierat utifrån",
    "Copied from original": "Oförändrat",
+    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 följande bidragande:",
    "Copyright © 2015 the following Contributors:": "Copyright © 2015 följande medverkande:",
-    "Danger!": "Danger!",
+    "Danger!": "Fara!",
    "Delete": "Radera",
    "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 Identification": "Enhetsidentifikation",
    "Device Name": "Enhetsnamn",
@@ -50,6 +55,8 @@
    "Edit Device": "Redigera enhet",
    "Edit Folder": "Redigera katalog",
    "Editing": "Redigerar",
+    "Enable NAT traversal": "Aktivera NAT traversering",
+    "Enable Relaying": "Aktivera reläa",
    "Enable UPnP": "Använd 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 filmönster, ett per rad.",
@@ -64,6 +71,7 @@
    "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": "Huvudlagring",
    "Folder Path": "Sökväg",
    "Folders": "Kataloger",
@@ -74,6 +82,7 @@
    "Generate": "Skapa",
    "Global Discovery": "Global uppslagning",
    "Global Discovery Server": "Global uppslagningsserver",
+    "Global Discovery Servers": "Globala uppslagningsservrar",
    "Global State": "Global status",
    "Help": "Hjälp",
    "Home page": "Hemsida",
@@ -108,6 +117,7 @@
    "OK": "OK",
    "Off": "Av",
    "Oldest First": "Äldst först",
+    "Optional descriptive label for the folder. Can be different on each device.": "Valfri beskrivande etikett för katalogen. Kan vara olika på varje enhet.",
    "Options": "Alternativ",
    "Out of Sync": "Osynkad",
    "Out of Sync Items": "Osynkade poster",
@@ -118,17 +128,20 @@
    "Pause": "Paus",
    "Paused": "Pausad",
    "Please consult the release notes before performing a major upgrade.": "Läs igenom versionsnyheterna innan den stora uppgraderingen.",
-    "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.": "Ställ in ett grafiskt användarautentisering och lösenord i dialogrutan Inställningar.",
    "Please wait": "Var god vänta",
    "Preview": "Förhandsgranska",
    "Preview Usage Report": "Förhandsgranska statistik",
    "Quick guide to supported patterns": "Snabb guide till filmönster som stöds",
    "RAM Utilization": "Minnesanvändning",
    "Random": "Slumpmässig",
+    "Relay Servers": "Reläservrar",
    "Relayed via": "Vidarbefordras via",
    "Relays": "Vidarbefordringar",
    "Release Notes": "versionsnyheter",
+    "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 mappen. Måste vara densamma på alla kluster enheter.",
    "Rescan": "Uppdatera",
    "Rescan All": "Uppdatera alla",
    "Rescan Interval": "Uppdateringsintervall",
@@ -138,7 +151,7 @@
    "Resume": "Återuppta",
    "Reused": "Återanvänt",
    "Save": "Spara",
-    "Scan Time Remaining": "Scan Time Remaining",
+    "Scan Time Remaining": "Skanna Återstående Tid",
    "Scanning": "Uppdaterar",
    "Select the devices to share this folder with.": "Ange enheterna att dela den här katalogen med.",
    "Select the folders to share with this device.": "Välj kataloger att dela med den här enheten.",
@@ -151,6 +164,7 @@
    "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 enhets-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 enhets-ID. Sätts till namnet på den andra enheten vid första anslutning om det lämnas tomt.",
    "Shutdown": "Stäng av",
@@ -172,10 +186,11 @@
    "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 experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing verkar ha drabbats av ett problem. Uppdatera sidan eller starta om Syncthing om problemet kvarstår.",
-    "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 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 {%url%}.": "Sammanställd statistik finns publikt tillgänglig på {{url}}.",
    "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.": "Enhets-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).": "Enhets-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).": "Enhets-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 enhets-ID:t 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.",
@@ -197,7 +212,8 @@
    "The rate limit must be a non-negative number (0: no limit)": "Frekvensgränsen måste vara ett icke-negativt tal (0: ingen gräns)",
    "The rescan interval must be a non-negative number of seconds.": "Förnyelseintervallet måste vara ett positivt antal sekunder",
    "They are retried automatically and will be synced when the error is resolved.": "De omprövas automatiskt och kommer att synkroniseras när felet är löst.",
-    "This can easily give hackers access to read and change any files on your computer.": "This can easily give hackers access to read and change any files on your computer.",
+    "This Device": "Enheten",
+    "This can easily give hackers access to read and change any files on your computer.": "Detta kan lätt ge hackare tillgång till att läsa och ändra några filer på datorn.",
    "This is a major version upgrade.": "Det här är en stor uppgradering.",
    "Trash Can File Versioning": "Versionshantering på filer i papperskorgen",
    "Unknown": "Okänt",
@@ -214,6 +230,7 @@
    "Version": "Version",
    "Versions Path": "Katalog 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.",
+    "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 katalog-ID:t knyter ihop katalogen mellan olika noder. De måste vara exakt desamma mellan noder och stora eller små bokstäver har betydelse.",
    "Yes": "Ja",
@@ -221,5 +238,7 @@
    "days": "dagar",
    "full documentation": "fullständig dokumentation",
    "items": "poster",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} vill dela katalogen \"{{folder}}\"."
+    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} vill dela katalogen \"{{folder}}\".",
+    "{%device%} wants to share folder \"{%folderLabel%}\" ({%folder%}).": "{{device}} vill dela mappen \"{{folderLabel}}\" ({{folder}}).",
+    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} vill dela mappen \"{{folderlabel}}\" ({{folder}})."
 }
--- a/gui/default/assets/lang/lang-tr.json
+++ b/gui/default/assets/lang/lang-tr.json
@@ -0,0 +1,244 @@
+{
+    "A device with that ID is already added.": "Bu ID'yi taşıyan cihaz 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.",
+    "API Key": "API Anahtarı",
+    "About": "Hakkında",
+    "Actions": "Eylemler",
+    "Add": "Ekle",
+    "Add Device": "Cihaz Ekle",
+    "Add Folder": "Klasör Ekle",
+    "Add Remote Device": "Add Remote Device",
+    "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",
+    "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!",
+    "Bugs": "Hatalar",
+    "CPU Utilization": "İşlemci Kullanımı",
+    "Changelog": "Değişim Günlüğü",
+    "Clean out after": "Clean out after",
+    "Close": "Kapat",
+    "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",
+    "Connection Error": "Bağlantı hatası",
+    "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",
+    "Disconnected": "Bağlantı Kesik",
+    "Discovery": "Discovery",
+    "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",
+    "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",
+    "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.",
+    "Folder": "Klasör",
+    "Folder ID": "Klasör ID",
+    "Folder Label": "Folder Label",
+    "Folder Master": "Ana Klasör",
+    "Folder Path": "Klasör Yolu",
+    "Folders": "Klasörler",
+    "GUI": "GUI / Kullanıcı Grafik 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 State": "Küresel Durum",
+    "Help": "Yardım",
+    "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)",
+    "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 seen": "Son Görülen",
+    "Later": "Sonra",
+    "Local Discovery": "Yerel Discovery",
+    "Local State": "Yerel Durum",
+    "Local State (Total)": "Yerel Durum (Toplamı)",
+    "Major Upgrade": "Birincil Yükseltme",
+    "Maximum Age": "Azami Süre",
+    "Metadata Only": "Sadece Ü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 Folder": "Yeni Klasör",
+    "Newest First": "En yeni olan önce",
+    "No": "Hayır",
+    "No File Versioning": "Dosya Sürümlendirmesi Yok",
+    "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.",
+    "Options": "Seçenekler",
+    "Out of Sync": "Eşzamanlama Dışı",
+    "Out of Sync Items": "Eşzamanlama dışında kalan Öğeler",
+    "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",
+    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Sürümlerin saklanması gereken klasör yolu (öntanımlı .stversions klasörü için boş bırakın)",
+    "Pause": "Duraklat",
+    "Paused": "Duraklatıldı",
+    "Please consult the release notes before performing a major upgrade.": "Birincil bir yükseltme gerçekleştirmeden önce lütfen sürüm notlarını tetkik edin.",
+    "Please set a GUI Authentication User and Password in the Settings dialog.": "GUI üzerinden Kimlik Doğrulaması yapmak için Ayarlar penceresinde Kullanıcı ve Parola tanımlayın lütfen.",
+    "Please wait": "Lütfen Bekleyin",
+    "Preview": "Önizleme",
+    "Preview Usage Report": "Kullanım raporunu gözden geçir",
+    "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",
+    "Release Notes": "Sürüm Notları",
+    "Remote Devices": "Remote Devices",
+    "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.",
+    "Rescan": "Tekrar Tara",
+    "Rescan All": "Tümünü Tekrar Tara",
+    "Rescan Interval": "Tarama Aralığı",
+    "Restart": "Yeniden Başlat",
+    "Restart Needed": "Yeniden başlatma gereklidir",
+    "Restarting": "Yeniden başlatılıyor",
+    "Resume": "Devam Et/Sürdür",
+    "Reused": "Yeniden Kullanılan",
+    "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ç.",
+    "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?",
+    "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.",
+    "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)",
+    "Smallest First": "En küçük olan önce",
+    "Source Code": "Kaynak Kodu",
+    "Staggered File Versioning": "Aşamalı Dosya Sürümlendirme",
+    "Start Browser": "Tarayıcıyı Başlat",
+    "Statistics": "İstatistikler",
+    "Stopped": "Durduruldu",
+    "Support": "Destek",
+    "Sync Protocol Listen Addresses": "Sync Protokol Dinleme Adresleri",
+    "Syncing": "Eşzamanlama gerçekleştiriliyor",
+    "Syncthing has been shut down.": "Syncthing kapatıldı",
+    "Syncthing includes the following software or portions thereof:": "Syncthing aşağıdaki yazılımları veya bunların bölümlerini içermektedir:",
+    "Syncthing is restarting.": "Syncthing yeniden başlatılıyor.",
+    "Syncthing is upgrading.": "Syncthing yükseltiliyor.",
+    "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 {%url%}.": "Toplanan halka açık istatistiklere ulaşabileceğiniz adres {{url}}.",
+    "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 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 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.",
+    "The number of days must be a number and cannot be blank.": "Gün sayısı sayı olarak tanımlanmalıdır ve boş bırakılamaz.",
+    "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 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",
+    "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",
+    "Unknown": "Bilinmiyor",
+    "Unshared": "Paylaşılmayan",
+    "Unused": "Kullanılmayan",
+    "Up to Date": "Güncel",
+    "Updated": "Güncellendi",
+    "Upgrade": "Sürüm Yükseltme",
+    "Upgrade To {%version%}": "{{version}} sürümüne yükselt",
+    "Upgrading": "Yükseltiliyor",
+    "Upload Rate": "Yükleme hızı",
+    "Uptime": "Etkin Hizmet Süresi",
+    "Use HTTPS for GUI": "GUI için HTTPS kullan",
+    "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.",
+    "Yes": "Evet",
+    "You must keep at least one version.": "En az bir sürümü tutmalısınız.",
+    "days": "günler",
+    "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}})."
+}
--- a/gui/default/assets/lang/lang-uk.json
+++ b/gui/default/assets/lang/lang-uk.json
@@ -1,5 +1,6 @@
 {
-    "A negative number of days doesn't make sense.": "Від'ємна кількість днів не має сенсу.",
+    "A device with that ID is already added.": "Пристрій з таким ID вже додано раніше.",
+    "A negative number of days doesn't make sense.": "Від'ємна кількість днів немає сенсу.",
    "A new major version may not be compatible with previous versions.": "Нова мажорна версія може бути несумісною із попередніми версіями.",
    "API Key": "API ключ",
    "About": "Про програму",
@@ -7,11 +8,13 @@
    "Add": "Додати",
    "Add Device": "Додати пристрій",
    "Add Folder": "Додати директорію",
+    "Add Remote Device": "Додати віддалений пристрій",
    "Add new folder?": "Додати нову директорію?",
    "Address": "Адреса",
    "Addresses": "Адреси",
    "Advanced": "Розширені",
    "Advanced Configuration": "Розширена конфігурація",
+    "Advanced settings": "Розширені налаштування",
    "All Data": "Усі дані",
    "Allow Anonymous Usage Reporting?": "Дозволити програмі збирати анонімну статистику використання?",
    "Alphabetic": "За алфавітом",
@@ -31,25 +34,29 @@
    "Connection Error": "Помилка з’єднання",
    "Copied from elsewhere": "Скопійовано з іншого місця",
    "Copied from original": "Скопійовано з оригіналу",
+    "Copyright © 2014-2016 the following Contributors:": "© 2014-2016 Всі права застережено, вклад внесли:",
    "Copyright © 2015 the following Contributors:": "Copyright © 2015 наступних контриб’юторів:",
-    "Danger!": "Danger!",
+    "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": "З’єднання відсутнє",
-    "Discovery": "Discovery",
+    "Discovery": "Сервери обходу NAT",
    "Documentation": "Документація",
    "Download Rate": "Швидкість завантаження",
    "Downloaded": "Завантажено",
    "Downloading": "Завантаження",
    "Edit": "Редагувати",
-    "Edit Device": "Редагувати пристрій",
-    "Edit Folder": "Редагувати директорію",
+    "Edit Device": "Налаштування пристрою",
+    "Edit Folder": "Налаштування директорії",
    "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.": "Введіть шаблони ігнорування, по одному на рядок.",
@@ -61,10 +68,11 @@
    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Біти прав доступу до файлів будуть проігноровані під час пошуку змін. Використовуйте на файлових системах FAT.",
    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Файли, що замінюються або видаляються Syncthing, переміщуються у директорію .stversions. ",
    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Файли будуть поміщатися у директорію .stversions із відповідною позначкою часу, коли вони будуть замінятися або видалятися програмою.",
-    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Файли захищено від змін зроблених на інших пристроях, але зміни зроблені на цьому пристрої будуть надіслані решті кластеру.",
+    "Files are 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": "ID директорії",
-    "Folder Master": "Центральна директорія",
+    "Folder Label": "Мітка директорії",
+    "Folder Master": "Вважати за оригінал",
    "Folder Path": "Шлях до директорії",
    "Folders": "Директорії",
    "GUI": "Графічний інтерфейс",
@@ -72,13 +80,14 @@
    "GUI Authentication User": "Логін користувача для доступу до панелі управління",
    "GUI Listen Addresses": "Адреса доступу до панелі управління",
    "Generate": "Згенерувати",
-    "Global Discovery": "Глобальне виявлення",
+    "Global Discovery": "Глобальне виявлення (internet)",
    "Global Discovery Server": "Сервер для глобального виявлення",
+    "Global Discovery Servers": "Сервери глобального виявлення \n(координації обходу NAT)",
    "Global State": "Глобальний статус",
    "Help": "Допомога",
    "Home page": "Домашня сторінка",
    "Ignore": "Ігнорувати",
-    "Ignore Patterns": "Ігнорувати шаблони",
+    "Ignore Patterns": "Шаблони винятків",
    "Ignore Permissions": "Ігнорувати права доступу до файлів",
    "Incoming Rate Limit (KiB/s)": "Ліміт швидкості завантаження (КіБ/с)",
    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Невірна конфігурація може пошкодити вміст вашої директорії та зробити Syncthing недієздатним.",
@@ -89,7 +98,7 @@
    "Last File Received": "Останній завантажений файл",
    "Last seen": "З’являвся останній раз",
    "Later": "Пізніше",
-    "Local Discovery": "Локальне виявлення",
+    "Local Discovery": "Локальне виявлення (LAN)",
    "Local State": "Локальний статус",
    "Local State (Total)": "Локальний статус (загалом)",
    "Major Upgrade": "Мажорне оновлення",
@@ -108,27 +117,31 @@
    "OK": "Гаразд",
    "Off": "Вимкнути",
    "Oldest First": "Спершу старіші",
+    "Optional descriptive label for the folder. Can be different on each device.": "Необов'язкова косметична назва директорії. Не передається іншим пристроям.",
    "Options": "Опції",
    "Out of Sync": "Не синхронізовано",
    "Out of Sync Items": "Не синхронізовані елементи",
    "Outgoing Rate Limit (KiB/s)": "Ліміт швидкості віддачі (КіБ/с)",
-    "Override Changes": "Перезаписати зміни",
+    "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 в середині директорії)",
    "Pause": "Пауза",
    "Paused": "Призупинено",
    "Please consult the release notes before performing a major upgrade.": "Будь ласка перегляньте примітки до випуску перед мажорним оновленням. ",
-    "Please set a GUI Authentication User and Password in the Settings dialog.": "Please set a GUI Authentication User and Password in the Settings dialog.",
+    "Please set a GUI Authentication User and Password in the Settings dialog.": "Будь ласка, встановіть у налаштуваннях ім'я користувача та пароль до графічного інтерфейсу.",
    "Please wait": "Будь ласка, зачекайте",
    "Preview": "Попередній перегляд",
    "Preview Usage Report": "Попередній перегляд статистичного звіту",
    "Quick guide to supported patterns": "Швидкий посібник по шаблонам, що підтримуються",
    "RAM Utilization": "Використання RAM",
    "Random": "Випадково",
+    "Relay Servers": "Сервери ретрансляції",
    "Relayed via": "Ретранслювати через",
-    "Relays": "Ретрансляція",
+    "Relays": "Ретранслятори",
    "Release Notes": "Примітки до випуску",
+    "Remote Devices": "Віддалені пристрої",
    "Remove": "Видалити",
+    "Required identifier for the folder. Must be the same on all cluster devices.": "Обов'язковий унікальний ідентифікатор директорії. Має бути однаковим на усіх пристроях кластеру.",
    "Rescan": "Пересканувати",
    "Rescan All": "Пересканувати усе",
    "Rescan Interval": "Інтервал для повторного сканування",
@@ -138,7 +151,7 @@
    "Resume": "Продовжити",
    "Reused": "Використано вдруге",
    "Save": "Зберегти",
-    "Scan Time Remaining": "Scan Time Remaining",
+    "Scan Time Remaining": "Час до кінця сканування",
    "Scanning": "Сканування",
    "Select the devices to share this folder with.": "Оберіть пристрої, які матимуть доступ до цієї директорії.",
    "Select the folders to share with this device.": "Оберіть директорії до яких матиме доступ цей пристрій.",
@@ -151,6 +164,7 @@
    "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 пристрою в статусі кластера. Буде розголошено іншим вузлам як опціональне типове ім’я.",
    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Показується замість ID пристрою в статусі кластера. Буде оновлено ім’ям, яке розголошене пристроєм, якщо залишити порожнім.",
    "Shutdown": "Вимкнути",
@@ -164,7 +178,7 @@
    "Statistics": "Статистика",
    "Stopped": "Зупинено",
    "Support": "Підтримка",
-    "Sync Protocol Listen Addresses": "Адреса панелі управління",
+    "Sync Protocol Listen Addresses": "Адреса і вхідний порт протоколу синхронізації",
    "Syncing": "Синхронізація",
    "Syncthing has been shut down.": "Syncthing вимкнено (закрито).",
    "Syncthing includes the following software or portions thereof:": "Syncthing містить наступне програмне забезпечення (або його частини):",
@@ -172,11 +186,12 @@
    "Syncthing is upgrading.": "Syncthing оновлюється.",
    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Схоже на те, що Syncthing закритий, або виникла проблема із Інтернет-з’єднанням. Проводиться повторна спроба з’єднання…",
    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Схоже на те, що Syncthing стикнувся з проблемою оброблюючи ваш запит. Будь ласка перезавантажте сторінку в браузері або перезапустіть Syncthing.",
-    "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 Syncthing admin interface is configured to allow remote access without a password.": "Інтерфейс адміністрування Syncthing налаштовано на дозвіл віддаленого доступу без пароля.",
    "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 \"Edit > 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 \"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.": "Перший параметр командного рядка це шлях до директорії, другий - відносний шлях у директорії.",
@@ -197,7 +212,8 @@
    "The rate limit must be a non-negative number (0: no limit)": "Швидкість має бути додатнім числом.",
    "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 can easily give hackers access to read and change any files on your computer.": "This can easily give hackers access to read and change any files on your computer.",
+    "This Device": "Локальний пристрій",
+    "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": "Версіонування файлів у кошику ",
    "Unknown": "Невідомо",
@@ -214,12 +230,15 @@
    "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.": "Версії автоматично видаляються, якщо вони старше, ніж максимальний вік, або перевищують допустиму кількість файлів за інтервал.",
-    "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.": "Коли додаєте нову директорію, пам’ятайте, що ID цієї директорії використовується для того, щоб зв’язувати директорії разом між вузлами. Назви є чутливими до регістра та повинні співпадати точно між усіма вузлами.",
+    "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.": "Коли додаєте нову директорію, пам’ятайте, що ID цієї директорії використовується для того, щоб зв’язувати директорії разом між пристроями. Назви повинні точно співпадати між усіма пристроями, регістр символів має значення.",
    "Yes": "Так",
    "You must keep at least one version.": "Ви повинні зберігати щонайменше одну версію.",
    "days": "днів",
    "full documentation": "повна документація",
    "items": "елементи",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} хоче поділитися директорією \"{{folder}}\"."
+    "{%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
@@ -0,0 +1,244 @@
+{
+    "A device with that ID is already added.": "Đã có một thiết bị trùng ID.",
+    "A negative number of days doesn't make sense.": "Số ngày không được âm.",
+    "A new major version may not be compatible with previous versions.": "Phiên bản quan trọng mới có thể sẽ không tương thích với các bản cũ.",
+    "API Key": "Khoá API",
+    "About": "Thông tin về",
+    "Actions": "Thao tác",
+    "Add": "Thêm",
+    "Add Device": "Thêm thiết bị",
+    "Add Folder": "Thêm thư mục",
+    "Add Remote Device": "Thêm thiết bị từ xa",
+    "Add new folder?": "Thêm thư mục mới?",
+    "Address": "Địa chỉ",
+    "Addresses": "Các địa chỉ",
+    "Advanced": "Nâng cao",
+    "Advanced Configuration": "Cấu hình nâng cao",
+    "Advanced settings": "Cài đặt nâng cao",
+    "All Data": "Tất cả dữ liệu",
+    "Allow Anonymous Usage Reporting?": "Cho phép báo cáo sử dụng ẩn danh?",
+    "Alphabetic": "A-Z",
+    "An external command handles the versioning. It has to remove the file from the synced folder.": "Một lệnh ngoại vi chịu trách nhiệm phiên bản hoá. Nó sẽ xoá tập tin khỏi thư mục đã đồng bộ.",
+    "Anonymous Usage Reporting": "Báo cáo sử dụng ẩn danh",
+    "Any devices configured on an introducer device will be added to this device as well.": "Bất kỳ thiết bị nào liên kết với thiết bị giới thiệu cũng sẽ được thêm vào.",
+    "Automatic upgrades": "Cập nhật tự động",
+    "Be careful!": "Cẩn thận!",
+    "Bugs": "Lỗi",
+    "CPU Utilization": "Mức s.dụng CPU",
+    "Changelog": "Lịch sử thay đổi",
+    "Clean out after": "Dọn dẹp sau",
+    "Close": "Đóng",
+    "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",
+    "Connection Error": "Lỗi kết nối",
+    "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",
+    "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",
+    "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",
+    "External File Versioning": "Kiểu ngoại vi",
+    "Failed Items": "Các n.dung bị lỗi",
+    "File Pull Order": "Thứ tự pull tập tin",
+    "File Versioning": "Ph.bản hoá tập tin",
+    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Các ph.tử g.phép tập tin sẽ được bỏ qua khi t.kiếm th.đổi. Dùng trên h.thống tập tin FAT.",
+    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Các t.tin sẽ được chuyển tới th.mục .stversions khi bị th.thế hoặc xoá bởi Syncthing.",
+    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Các t.tin sẽ được chuyển tới các ph.bản được đ.dấu ng.tháng trong th.mục .stversions khi bị th.thế hoặc xoá bởi 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.": "Các t.tin được b.vệ khỏi những th.đổi trên các th.bị khác, nhưng những th.đổi trên th.bị này sẽ được chuyển tới các máy cụm còn lại.",
+    "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",
+    "Folders": "Các th.mục",
+    "GUI": "GUI",
+    "GUI Authentication Password": "Mật khẩu xác minh GUI",
+    "GUI Authentication User": "Người dùng xác minh GUI",
+    "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",
+    "Home page": "Trang chủ",
+    "Ignore": "Bỏ qua",
+    "Ignore Patterns": "Bỏ qua các quy luật",
+    "Ignore Permissions": "Bỏ qua các giấy phép",
+    "Incoming Rate Limit (KiB/s)": "Giới hạn t.độ đầu vào (KiB/s)",
+    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Cấu hình không đúng có thể làm mất mát dữ liệu và khiến Syncthing ngừng hoạt động.",
+    "Introducer": "Th.bị giới thiệu",
+    "Inversion of the given condition (i.e. do not exclude)": "Đảo ngược điều kiện cho trước (VD: không được loại trừ)",
+    "Keep Versions": "Giữ các ph.bản",
+    "Largest First": "Lớn nhất đầu tiên",
+    "Last File Received": "T.tin nhận được gần đây",
+    "Last seen": "Thấy lần cuối",
+    "Later": "Để sau",
+    "Local Discovery": "Dò tìm cục bộ",
+    "Local State": "Tr.thái cục bộ",
+    "Local State (Total)": "Tr.thái cục bộ (Tổng)",
+    "Major Upgrade": "Bản n.cấp q.trọng",
+    "Maximum Age": "Thời hạn tối đa",
+    "Metadata Only": "Chỉ siêu dữ liệu",
+    "Minimum Free Disk Space": "Dung lượng đĩa trống tối thiểu",
+    "Move to top of queue": "Chuyển đến đầu hàng chờ",
+    "Multi level wildcard (matches multiple directory levels)": "Ký tự thay thế đa cấp (phù hợp với đa cấp độ thư mục)",
+    "Never": "Chưa từng",
+    "New Device": "Thiết bị mới",
+    "New Folder": "Thư mục mới",
+    "Newest First": "Mới nhất đầu tiên",
+    "No": "Không",
+    "No File Versioning": "Không dùng",
+    "Notice": "Chú ý",
+    "OK": "OK",
+    "Off": "Tắt",
+    "Oldest First": "Cũ nhất đầu tiên",
+    "Optional descriptive label for the folder. Can be different on each device.": "Nhãn mô tả tuỳ chọn cho thư mục. Có thể khác nhau trên từng thiết bị.",
+    "Options": "Tuỳ chọn",
+    "Out of Sync": "Mất đồng bộ",
+    "Out of Sync Items": "Các n.dung mất đ.bộ",
+    "Outgoing Rate Limit (KiB/s)": "Giới hạn t.độ đầu ra (KiB/s)",
+    "Override Changes": "Ghi đè các th.đổi",
+    "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": "Đường dẫn đến thư mục trên máy cục bộ. Sẽ tạo mới nếu chưa hiện hữu. Dấu ngã (~) có thể được dùng làm lối tắt cho",
+    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Đường dẫn nơi các phiên bản được lưu trữ (nếu để trống, thư mục mặc định sẽ là .stversions).",
+    "Pause": "Tạm dừng",
+    "Paused": "Đã t.dừng",
+    "Please consult the release notes before performing a major upgrade.": "Hãy xem kỹ lịch sử phát hành trước khi tiến hành bản cập nhật q.trọng.",
+    "Please set a GUI Authentication User and Password in the Settings dialog.": "Hãy thiết lập tên ng.dùng và mật khẩu xác minh GUI trong hộp thoại Cài đặt.",
+    "Please wait": "Xin chờ",
+    "Preview": "Xem trước",
+    "Preview Usage Report": "Xem trước báo cáo s.dụng",
+    "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",
+    "Release Notes": "Lịch sử phát hành",
+    "Remote Devices": "Các thiết bị từ xa",
+    "Remove": "Xoá",
+    "Required identifier for the folder. Must be the same on all cluster devices.": "Tên tắt bắt buộc cho thư mục. Phải trùng khớp trên tất cả thiết bị trong cụm.",
+    "Rescan": "Quét lại",
+    "Rescan All": "Quét lại t.cả",
+    "Rescan Interval": "Kh.cách th.gian quét lại",
+    "Restart": "Kh.động lại",
+    "Restart Needed": "Cần kh.động lại",
+    "Restarting": "Đang kh.động lại",
+    "Resume": "Tiếp tục",
+    "Reused": "Đã s.dụng lại",
+    "Save": "Lưu",
+    "Scan Time Remaining": "Thời gian quét còn lại",
+    "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.",
+    "Settings": "Cài đặt",
+    "Share": "Chia sẻ",
+    "Share Folder": "Chia sẻ th.mục",
+    "Share Folders With Device": "Chia sẻ các th.mục với th.bị",
+    "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.",
+    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Hiển thị thay cho ID thiết bị trong trạng thái cụm. Nếu để trống sẽ được cập nhật thành tên mà thiết bị giới thiệu.",
+    "Shutdown": "Tắt",
+    "Shutdown Complete": "Tắt hoàn tất",
+    "Simple File Versioning": "Kiểu đơn giản",
+    "Single level wildcard (matches within a directory only)": "Ký tự thay thế đơn cấp (phù hợp với chỉ một thư mục)",
+    "Smallest First": "Nhỏ nhất đầu tiên",
+    "Source Code": "Mã nguồn",
+    "Staggered File Versioning": "Theo thời gian",
+    "Start Browser": "Mở trình duyệt",
+    "Statistics": "Thống kê",
+    "Stopped": "Đã dừng",
+    "Support": "Hỗ trợ",
+    "Sync Protocol Listen Addresses": "Đồng bộ các đ.chỉ l.nghe giao thức",
+    "Syncing": "Đang đ.bộ",
+    "Syncthing has been shut down.": "Đã tắt Syncthing.",
+    "Syncthing includes the following software or portions thereof:": "Syncthing bao gồm các ph.mềm hoặc ph.tử của các ph.mềm sau:",
+    "Syncthing is restarting.": "Syncthing đang kh.động lại.",
+    "Syncthing is upgrading.": "Syncthing đang n.cấp.",
+    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Có vẻ như Syncthing đang bị nghẽn hoặc là mạng của bạn có vấn đề. Đang thử lại...",
+    "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 {%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. ",
+    "The following items could not be synchronized.": "Không thể đồng bộ những nội dung sau.",
+    "The maximum age must be a number and cannot be blank.": "Thời hạn tối đa phải là một con số và không được để trống.",
+    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Th.gian t.đa một ph.bản được giữ lại (tính bằng ngày, nhập 0 để giữ tập tin mãi mãi).",
+    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "Phần trăm dung lượng đĩa trống tối thiểu phải là một số không âm (nằm trong khoảng) từ 0 đến 100.",
+    "The number of days must be a number and cannot be blank.": "Số ngày phải là một con số và không được để trống.",
+    "The number of days to keep files in the trash can. Zero means forever.": "Số ngày tập tin được giữ trong thùng rác. 0 nghĩa là mãi mãi.",
+    "The number of old versions to keep, per file.": "Số phiên bản cũ cần giữ lại với mỗi tập tin.",
+    "The number of versions must be a number and cannot be blank.": "Số phiên bản phải là một con số và không được để trống.",
+    "The path cannot be blank.": "Không được để trống đường dẫn.",
+    "The rate limit must be a non-negative number (0: no limit)": "Giới hạn tốc độ phải là một số không âm (0: không giới hạn)",
+    "The rescan interval must be a non-negative number of seconds.": "Khoảng thời gian quét lại phải là một số giây không âm.",
+    "They are retried automatically and will be synced when the error is resolved.": "Chúng sẽ được tự động thử lại và đồng bộ khi lỗi được khắc phục.",
+    "This Device": "Thiết bị này",
+    "This can easily give hackers access to read and change any files on your computer.": "Th.tác này có thể khiến tin tặc dễ dàng tr.cập để đọc và th.đổi bất kỳ t.tin nào trên máy của bạn.",
+    "This is a major version upgrade.": "Đây là bản nâng cấp quan trọng.",
+    "Trash Can File Versioning": "Kiểu thùng rác",
+    "Unknown": "Không biết",
+    "Unshared": "Chưa chia sẻ",
+    "Unused": "Chưa sử dụng",
+    "Up to Date": "Đã đồng bộ",
+    "Updated": "Đã cập nhật",
+    "Upgrade": "Nâng cấp",
+    "Upgrade To {%version%}": "Nâng cấp lên {{version}}",
+    "Upgrading": "Đang nâng cấp",
+    "Upload Rate": "Tốc độ tải lên",
+    "Uptime": "Th.gian h.động",
+    "Use HTTPS for GUI": "Sử dụng HTTPS cho GUI",
+    "Version": "Phiên bản",
+    "Versions Path": "Đ.dẫn đến các ph.bản",
+    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Các phiên bản sẽ tự động được xoá nếu chúng cũ hơn thời hạn tối đa hoặc vượt quá số tập tin cho phép trong một khoảng thời gian.",
+    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Cảnh báo, đường dẫn này là thư mục con của thư mục hiện hữu \"{{otherFolder}}\".",
+    "When adding a new device, keep in mind that this device must be added on the other side too.": "Khi thêm một thiết bị mới, hãy nhớ rằng thiết bị này cũng phải được thêm vào máy kia.",
+    "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.": "Khi thêm một thư mục mới, hãy nhớ rằng ID thư mục được dùng để gắn kết thư mục giữa các thiết bị với nhau. Chúng phải chính xác từng chữ, cả viết hoa và thường giữa tất cả thiết bị.",
+    "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",
+    "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/gui/default/assets/lang/lang-zh-CN.json
+++ b/gui/default/assets/lang/lang-zh-CN.json
@@ -1,26 +1,29 @@
 {
-    "A negative number of days doesn't make sense.": "天数不能为负。",
+    "A device with that ID is already added.": "您已添加过相同 ID 的设备",
+    "A negative number of days doesn't make sense.": "天数为负数没有意义。",
    "A new major version may not be compatible with previous versions.": "重大更新可能与之前的版本之间无法兼容",
    "API Key": "API Key",
    "About": "关于",
-    "Actions": "动作",
+    "Actions": "操作",
    "Add": "添加",
    "Add Device": "添加设备",
    "Add Folder": "添加文件夹",
+    "Add Remote Device": "添加远程设备",
    "Add new folder?": "添加新文件夹？",
    "Address": "地址",
    "Addresses": "地址列表",
    "Advanced": "高级",
-    "Advanced Configuration": "高级设置",
+    "Advanced Configuration": "高级配置",
+    "Advanced settings": "高级设置",
    "All Data": "所有数据",
    "Allow Anonymous Usage Reporting?": "允许匿名使用报告?",
    "Alphabetic": "字母顺序",
-    "An external command handles the versioning. It has to remove the file from the synced folder.": "使用外部命令接管版本控制。当文件在其他设备被删除时，本机的 Syncthing 会调用该外部命令，并将文件路径以参数形式传递给该命令。该命令必须自行从同步文件夹中删除该文件。",
+    "An external command handles the versioning. It has to remove the file from the synced folder.": "使用外部命令接管版本控制。该命令必须自行从同步文件夹中删除该文件。",
    "Anonymous Usage Reporting": "匿名使用报告",
    "Any devices configured on an introducer device will be added to this device as well.": "在介绍人设备上被添加的其它设备，也将会被添加到本机。",
    "Automatic upgrades": "自动升级",
    "Be careful!": "小心！",
-    "Bugs": "Bug汇报",
+    "Bugs": "问题回报",
    "CPU Utilization": "CPU使用率",
    "Changelog": "更新日志",
    "Clean out after": "在该时间后清除：",
@@ -31,10 +34,12 @@
    "Connection Error": "连接出错",
    "Copied from elsewhere": "从其他设备复制",
    "Copied from original": "从源复制",
+    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 以下贡献者：",
    "Copyright © 2015 the following Contributors:": "版权 ©2015 由下列贡献者所有：",
    "Danger!": "危险！",
    "Delete": "删除",
    "Deleted": "已删除",
+    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "设备 \"{{name}}\"（位于 {{address}} 的 {{device}}）请求连接。是否添加新设备？",
    "Device ID": "设备标识",
    "Device Identification": "设备标识",
    "Device Name": "设备名",
@@ -50,37 +55,41 @@
    "Edit Device": "编辑设备选项",
    "Edit Folder": "编辑文件夹选项",
    "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 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": "外部版本控制",
    "Failed Items": "失败的项目",
    "File Pull Order": "文件拉取顺序",
    "File Versioning": "版本控制",
-    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "当寻找文件变更时，忽略文件权限。用于FAT文件系统。",
+    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "当查找文件更改时，忽略文件权限位。用在 FAT文件系统上。",
    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "当文件被 Syncthing 替换或删时，将会被移动到 .stversions 文件夹",
    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "当某个文件在其他设备被替换或删除时，本设备将会在 .stversions 文件夹中保留该文件的备份，并在文件名中加入时间戳信息。",
    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "在其它设备中对该文件夹内文件的修改并不会被同步到本机，但是在本机上对其的修改，则会被同步到其它设备中。",
    "Folder": "文件夹",
    "Folder ID": "文件夹标识",
+    "Folder Label": "文件夹标签",
    "Folder Master": "主文件夹",
    "Folder Path": "文件夹路径",
    "Folders": "文件夹",
-    "GUI": "图形界面",
-    "GUI Authentication Password": "登陆web管理页面的密码",
-    "GUI Authentication User": "登陆web管理页面的用户名",
-    "GUI Listen Addresses": "web管理页面监听地址",
+    "GUI": "图形用户界面",
+    "GUI Authentication Password": "图形管理界面密码",
+    "GUI Authentication User": "图形管理界面用户名",
+    "GUI Listen Addresses": "图形管理界面监听地址",
    "Generate": "生成",
    "Global Discovery": "在互联网上寻找设备\n",
-    "Global Discovery Server": "用以在互联网上寻找设备的Announce服务器地址",
+    "Global Discovery Server": "全球发现服务器",
+    "Global Discovery Servers": "全球发现服务器",
    "Global State": "全局状态",
    "Help": "帮助",
    "Home page": "主页",
    "Ignore": "忽略",
    "Ignore Patterns": "忽略列表",
    "Ignore Permissions": "忽略文件权限",
-    "Incoming Rate Limit (KiB/s)": "下载速率限制（KiB/s）",
+    "Incoming Rate Limit (KiB/s)": "下载速率限制 (KiB/s)",
    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "错误的配置可能损坏您文件夹内的内容，使得 Syncthing 无法工作。",
    "Introducer": "介绍人设备",
    "Inversion of the given condition (i.e. do not exclude)": "对本条件取反（例如：不要排除某项）",
@@ -95,7 +104,7 @@
    "Major Upgrade": "重大更新",
    "Maximum Age": "历史版本最长保留时间",
    "Metadata Only": "仅元数据",
-    "Minimum Free Disk Space": "最低空闲磁盘空间",
+    "Minimum Free Disk Space": "最低可用磁盘空间",
    "Move to top of queue": "移动到队列顶端",
    "Multi level wildcard (matches multiple directory levels)": "多级通配符（用以匹配多层文件夹）",
    "Never": "从未",
@@ -108,6 +117,7 @@
    "OK": "确定",
    "Off": "关闭",
    "Oldest First": "旧文件优先",
+    "Optional descriptive label for the folder. Can be different on each device.": "可选的文件夹说明性标签。在不同设备上可以不一致。",
    "Options": "选项",
    "Out of Sync": "未同步",
    "Out of Sync Items": "未同步的项目",
@@ -125,10 +135,13 @@
    "Quick guide to supported patterns": "支持的通配符的简单教程：",
    "RAM Utilization": "内存使用量",
    "Random": "随机顺序",
+    "Relay Servers": "中继服务器",
    "Relayed via": "中转经由",
    "Relays": "中转",
    "Release Notes": "发布说明",
+    "Remote Devices": "远程设备",
    "Remove": "移除",
+    "Required identifier for the folder. Must be the same on all cluster devices.": "需要给文件夹设置标识。在所有丛设备上必须一致。",
    "Rescan": "重新扫描",
    "Rescan All": "全部重新扫描",
    "Rescan Interval": "扫描间隔",
@@ -138,7 +151,7 @@
    "Resume": "恢复",
    "Reused": "复用",
    "Save": "保存",
-    "Scan Time Remaining": "Scan Time Remaining",
+    "Scan Time Remaining": "扫描剩余时间",
    "Scanning": "扫描中",
    "Select the devices to share this folder with.": "选择将本文件夹共享给哪些设备",
    "Select the folders to share with this device.": "选择与该设备共享的文件夹。",
@@ -150,9 +163,10 @@
    "Share this folder?": "是否共享该文件夹？",
    "Shared With": "共享给",
    "Short identifier for the folder. Must be the same on all cluster devices.": "文件夹的别名。必须在所有设备上保持一致。",
-    "Show ID": "显示设备标示",
-    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "在设备丛中，显示该名称，而不是设备标识。亦会作为一个可选的默认名称被发送到其他设备。",
-    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "在设备丛中，将会显示本名称，而不是设备标识。如果设置为空，则会使用目标设备提供的默认名称。",
+    "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.": "在设备丛中，显示该名称，而不是设备 ID。亦会作为一个可选的默认名称被发送到其他设备。",
+    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "在设备丛中，将会显示本名称，而不是设备 ID。如果设置为空，则会使用目标设备提供的默认名称。",
    "Shutdown": "关闭 Syncthing",
    "Shutdown Complete": "关闭完成",
    "Simple File Versioning": "简易版本控制",
@@ -172,10 +186,11 @@
    "Syncthing is upgrading.": "Syncthing 正在升级",
    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing 似乎关闭了，或者您的网络连接存在故障。重试中...",
    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing 在处理您的请求时似乎遇到了问题。如果问题持续，请刷新页面，或重启 Syncthing。",
-    "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 Syncthing admin interface is configured to allow remote access without a password.": "当前配置允许在不使用密码的情况下远程访问 Syncthing 管理界面",
    "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).": "在这里所需要输入的设备 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).": "在这里所需要输入的设备标识，可以在目标设备的“选项->显示设备标识”中看到。空格和横线可选（将会被忽略）。",
    "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的字母和数字，空格和横线不算在内。",
@@ -184,11 +199,11 @@
    "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秒的仅保留一份。最近一天内的历史版本，更新间隔小于1小时的仅保留一份。最近一个月内的历史版本，更新间隔小于1天的仅保留一份。距离现在超过一个月且小于最长保留时间的，更新间隔小于1周的仅保留一份。",
+    "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "保留的历史版本会遵循以下条件：最近一小时内的历史版本，更新间隔小于三十秒的仅保留一份。最近一天内的历史版本，更新间隔小于一小时的仅保留一份。最近一个月内的历史版本，更新间隔小于一天的仅保留一份。距离现在超过一个月且小于最长保留时间的，更新间隔小于一周的仅保留一份。",
    "The following items could not be synchronized.": "下列项目无法被同步。",
    "The maximum age must be a number and cannot be blank.": "最长保留时间必须为数字，且不能为空。",
    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "历史版本保留的最长天数，0为永久保存",
-    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "最低空间磁盘空间的数值必须介于 0-100 的正整数",
+    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "最低可用磁盘空间的数值必须介于 0-100 的正整数",
    "The number of days must be a number and cannot be blank.": "天数必须为数字，且不能为空。",
    "The number of days to keep files in the trash can. Zero means forever.": "文件保存在回收站的天数。零表示永久。",
    "The number of old versions to keep, per file.": "每个文件保留的版本数量上限。",
@@ -197,8 +212,9 @@
    "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 can easily give hackers access to read and change any files on your computer.": "This can easily give hackers access to read and change any files on your computer.",
-    "This is a major version upgrade.": "这是一个重大版本更新。",
+    "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": "回收站式版本控制",
    "Unknown": "未知",
    "Unshared": "未共享",
@@ -210,16 +226,19 @@
    "Upgrading": "升级中",
    "Upload Rate": "上传速度",
    "Uptime": "已启动",
-    "Use HTTPS for GUI": "使用HTTPS连接web管理页面",
+    "Use HTTPS for GUI": "使用加密连接到图形管理页面",
    "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%}\".": "警告, 该路径是一个已经存在文件夹\"{{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.": "若你添加了新文件夹，记住文件夹标识是用以在不同设备间建立联系的。在不同设备间拥有相同标识的文件夹将会被同步。且文件夹标识大小写敏感。",
+    "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.": "若你添加了新文件夹，记住文件夹 ID 是用以在不同设备间建立联系的。在不同设备间拥有相同 ID 的文件夹将会被同步。且文件夹 ID 区分大小写。",
    "Yes": "是",
-    "You must keep at least one version.": "您必须保留至少一个版本。",
+    "You must keep at least one version.": "您必须保留至少一个版本",
    "days": "天",
    "full documentation": "完整文档",
    "items": "条目",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} 想将 “{{folder}}” 文件夹共享给您"
+    "{%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-zh-TW.json
+++ b/gui/default/assets/lang/lang-zh-TW.json
@@ -1,25 +1,28 @@
 {
+    "A device with that ID is already added.": "該裝置識別碼已被新增。",
    "A negative number of days doesn't make sense.": "一個負的天數並不合理。",
-    "A new major version may not be compatible with previous versions.": "一個新的主要版本可能與以前的版本並不相容。",
+    "A new major version may not be compatible with previous versions.": "新的主要版本可能與以前的版本不相容。",
    "API Key": "API 金鑰",
    "About": "關於",
    "Actions": "操作",
    "Add": "增加",
    "Add Device": "增加裝置",
    "Add Folder": "增加資料夾",
+    "Add Remote Device": "新增遠端裝置",
    "Add new folder?": "新增資料夾?",
    "Address": "位址",
    "Addresses": "位址",
    "Advanced": "進階",
-    "Advanced Configuration": "進階設定",
+    "Advanced Configuration": "進階配置",
+    "Advanced settings": "進階設定",
    "All Data": "全部資料",
-    "Allow Anonymous Usage Reporting?": "允許匿名的使用資訊回報？",
+    "Allow Anonymous Usage Reporting?": "允許匿名的使用資訊回報?",
    "Alphabetic": "字母順序",
    "An external command handles the versioning. It has to remove the file from the synced folder.": "An external command handles the versioning. It has to remove the file from the synced folder.",
    "Anonymous Usage Reporting": "匿名的使用資訊回報",
    "Any devices configured on an introducer device will be added to this device as well.": "任何在引入者裝置所設置的裝置將會一併新增至此裝置",
    "Automatic upgrades": "自動升級",
-    "Be careful!": "請小心！",
+    "Be careful!": "請小心!",
    "Bugs": "程式錯誤",
    "CPU Utilization": "CPU 使用",
    "Changelog": "更新日誌",
@@ -30,18 +33,20 @@
    "Compression": "壓縮",
    "Connection Error": "連線錯誤",
    "Copied from elsewhere": "從別處複製",
-    "Copied from original": "從原來複製",
+    "Copied from original": "從原處複製",
+    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 下列貢獻者：",
    "Copyright © 2015 the following Contributors:": "Copyright © 2015 下列貢獻者：",
-    "Danger!": "Danger!",
+    "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}}) 想要連線。要新增裝置嗎？",
+    "Device {%device%} ({%address%}) wants to connect. Add new device?": "裝置 {{device}} ({{address}}) 想要連線。要新增裝置嗎?",
    "Devices": "裝置",
    "Disconnected": "斷線",
-    "Discovery": "Discovery",
+    "Discovery": "探索",
    "Documentation": "說明文件",
    "Download Rate": "下載速率",
    "Downloaded": "已下載",
@@ -50,6 +55,8 @@
    "Edit Device": "編輯裝置",
    "Edit Folder": "編輯資料夾",
    "Editing": "正在編輯",
+    "Enable NAT traversal": "Enable 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.": "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.": "輸入忽略樣式，每行一種。",
@@ -64,24 +71,26 @@
    "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 Master": "主資料夾",
    "Folder Path": "資料夾路徑",
    "Folders": "資料夾",
    "GUI": "GUI",
    "GUI Authentication Password": "GUI 認證密碼",
-    "GUI Authentication User": "GUI 認證使用者名稱",
+    "GUI Authentication User": "GUI 使用者認證名稱",
    "GUI Listen Addresses": "GUI 監聽位址",
    "Generate": "產生",
    "Global Discovery": "全域探索",
    "Global Discovery Server": "全域探索伺服器",
+    "Global Discovery Servers": "全域探索伺服器",
    "Global State": "全域狀態",
    "Help": "說明",
    "Home page": "首頁",
    "Ignore": "忽略",
    "Ignore Patterns": "忽略樣式",
    "Ignore Permissions": "忽略權限",
-    "Incoming Rate Limit (KiB/s)": "連入速率限制 (KiB/s)",
-    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "不正確的設定可能會損壞你的資料夾內容，並引致 Syncthing 的不正當運作。",
+    "Incoming Rate Limit (KiB/s)": "傳入速率限制 (KiB/s)",
+    "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": "保留歷史版本數",
@@ -89,9 +98,9 @@
    "Last File Received": "最後接收的檔案",
    "Last seen": "最後發現時間",
    "Later": "稍後",
-    "Local Discovery": "本地探索",
-    "Local State": "本地狀態",
-    "Local State (Total)": "本地狀態 (總結)",
+    "Local Discovery": "本機探索",
+    "Local State": "本機狀態",
+    "Local State (Total)": "本機狀態 (總結)",
    "Major Upgrade": "重大更新",
    "Maximum Age": "最長保留時間",
    "Metadata Only": "僅中繼資料",
@@ -108,27 +117,31 @@
    "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.",
    "Options": "選項",
-    "Out of Sync": "Out of Sync",
+    "Out of Sync": "不同步",
    "Out of Sync Items": "不同步物件",
    "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 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 資料夾)。",
    "Pause": "暫停",
    "Paused": "暫停",
    "Please consult the release notes before performing a major upgrade.": "執行重大升級前請先參閱版本資訊。",
-    "Please set a GUI Authentication User and Password in the Settings dialog.": "Please set a GUI Authentication User and Password in the Settings dialog.",
+    "Please set a GUI Authentication User and Password in the Settings dialog.": "請在設定對話方塊內設置 GUI 使用者認證名稱及密碼。",
    "Please wait": "請稍後",
    "Preview": "預覽",
    "Preview Usage Report": "預覽使用資訊報告",
    "Quick guide to supported patterns": "可支援樣式的快速指南",
    "RAM Utilization": "記憶體使用",
    "Random": "隨機",
+    "Relay Servers": "中繼伺服器",
    "Relayed via": "中繼於",
    "Relays": "中繼點",
    "Release Notes": "版本資訊",
+    "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.",
    "Rescan": "重新掃描",
    "Rescan All": "全部重新掃描",
    "Rescan Interval": "重新掃描間隔",
@@ -147,10 +160,11 @@
    "Share Folder": "分享資料夾",
    "Share Folders With Device": "與裝置共享資料夾",
    "Share With Devices": "與這些裝置共享",
-    "Share this folder?": "分享此資料夾？",
+    "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.": "代替裝置識別碼顯示在叢集狀態中。這段文字將會廣播到其他的裝置作為一個可選的預設名稱。",
    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "代替裝置識別碼顯示在叢集狀態中。本欄若未填寫則將被更新為此裝置所廣播的名稱。",
    "Shutdown": "關閉",
@@ -170,13 +184,14 @@
    "Syncthing includes the following software or portions thereof:": "Syncthing 包括以下軟體或其中的一部分：",
    "Syncthing is restarting.": "Syncthing 正在重新啟動。",
    "Syncthing is upgrading.": "Syncthing 正在進行升級。",
-    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing 似乎下線了，或者您的網際網路連線出現問題。正在重試...",
+    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing 似乎離線了，或者您的網際網路連線出現問題。正在重試...",
    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing 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 {%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 \"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 \"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 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 first command line parameter is the folder path and the second parameter is the relative path in the folder.",
@@ -197,6 +212,7 @@
    "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 can easily give hackers access to read and change any files on your computer.": "This can easily give hackers access to read and change any files on your computer.",
    "This is a major version upgrade.": "這是一個主要版本更新。",
    "Trash Can File Versioning": "Trash Can File Versioning",
@@ -214,6 +230,7 @@
    "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}}\".",
    "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": "是",
@@ -221,5 +238,7 @@
    "days": "日",
    "full documentation": "完整說明文件",
    "items": "個項目",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} 想要分享資料夾 \"{{folder}}\"。"
+    "{%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/prettyprint.js
+++ b/gui/default/assets/lang/prettyprint.js
@@ -0,0 +1 @@
+var langPrettyprint = {"bg":"Bulgarian","ca":"Catalan","ca@valencia":"Catalan (Valencian)","cs":"Czech","da":"Danish","de":"German","el":"Greek","en":"English","en-GB":"English (United Kingdom)","es":"Spanish","es-ES":"Spanish (Spain)","fi":"Finnish","fr":"French","fr-CA":"French (Canada)","fy":"Western Frisian","hu":"Hungarian","id":"Indonesian","it":"Italian","ja":"Japanese","ko-KR":"Korean (Korea)","lt":"Lithuanian","nb":"Norwegian Bokmål","nl":"Dutch","nn":"Norwegian Nynorsk","pl":"Polish","pt-BR":"Portuguese (Brazil)","pt-PT":"Portuguese (Portugal)","ru":"Russian","sv":"Swedish","tr":"Turkish","uk":"Ukrainian","vi":"Vietnamese","zh-CN":"Chinese (China)","zh-TW":"Chinese (Taiwan)"}
--- a/gui/default/assets/lang/valid-langs.js
+++ b/gui/default/assets/lang/valid-langs.js
@@ -0,0 +1 @@
+var validLangs = ["bg","ca","ca@valencia","cs","da","de","el","en","en-GB","es","es-ES","fi","fr","fr-CA","fy","hu","id","it","ja","ko-KR","lt","nb","nl","nn","pl","pt-BR","pt-PT","ru","sv","tr","uk","vi","zh-CN","zh-TW"]
--- a/gui/default/index.html
+++ b/gui/default/index.html
@@ -15,6 +15,7 @@
  <meta name="description" content="">
  <meta name="author" content="">
  <link rel="shortcut icon" href="assets/img/favicon.png">
+  <link rel="mask-icon" href="assets/img/safari-pinned-tab.svg" color="#0882c8">

  <title ng-bind="thisDeviceName() + ' | Syncthing'"></title>
  <link href="vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet">
@@ -51,7 +52,7 @@
          <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="fa fa-cog"></span>&nbsp;<span translate>Actions</span> <span class="caret"></span></a>
          <ul class="dropdown-menu">
            <li><a href="" ng-click="editSettings()"><span class="fa fa-fw fa-cog"></span>&nbsp;<span translate>Settings</span></a></li>
-            <li><a href="" ng-click="idDevice()"><span class="fa fa-fw fa-qrcode"></span>&nbsp;<span translate>Show ID</span></a></li>
+            <li><a href="" ng-click="idDevice(thisDevice())"><span class="fa fa-fw fa-qrcode"></span>&nbsp;<span translate>Show ID</span></a></li>
            <li class="divider"></li>
            <li><a href="" ng-click="shutdown()"><span class="fa fa-fw fa-power-off"></span>&nbsp;<span translate>Shutdown</span></a></li>
            <li><a href="" ng-click="restart()"><span class="fa fa-fw fa-refresh"></span>&nbsp;<span translate>Restart</span></a></li>
@@ -121,21 +122,22 @@
        <div class="panel panel-warning">
          <div class="panel-heading">
            <h3 class="panel-title">
-              <identicon data-value="device"></identicon>&nbsp;<span translate>New Device</span>
+              <identicon data-value="device"></identicon>
+              <span translate>New Device</span>
+              <span class="pull-right">{{ event.time | date:"yyyy-MM-dd HH:mm:ss" }}</span>
            </h3>
          </div>
          <div class="panel-body">
            <p>
-              <small>{{ event.time | date:"yyyy-MM-dd HH:mm:ss" }}:</small>
              <span translate translate-value-device="{{ device }}" translate-value-address="{{ event.data.address }}">
                Device {%device%} ({%address%}) wants to connect. Add new device?
-              <span>
+              </span>
            </p>
          </div>
          <div class="panel-footer clearfix">
            <div class="pull-right">
-              <button type="button" class="btn btn-sm btn-success" ng-click="addNewDeviceID(device)">
-                <span class="fa fa-check"></span>&nbsp;<span translate>Add</span>
+              <button type="button" class="btn btn-sm btn-success" ng-click="addDevice(device)">
+                <span class="fa fa-plus"></span>&nbsp;<span translate>Add Device</span>
              </button>
              <button type="button" class="btn btn-sm btn-danger" ng-click="ignoreRejectedDevice(device)">
                <span class="fa fa-times"></span>&nbsp;<span translate>Ignore</span>
@@ -158,11 +160,11 @@
            <h3 class="panel-title"><span class="fa fa-folder"></span>
              <span translate ng-if="!folders[event.data.folder]">New Folder</span>
              <span translate ng-if="folders[event.data.folder]">Share Folder</span>
+              <span class="pull-right">{{ event.time | date:"yyyy-MM-dd HH:mm:ss" }}</span>
            </h3>
          </div>
          <div class="panel-body">
            <p>
-              <small>{{ event.time | date:"yyyy-MM-dd HH:mm:ss" }}:</small>
              <span translate translate-value-device="{{ deviceName(findDevice(event.data.device)) }}" translate-value-folder="{{ event.data.folder }}">
                {%device%} wants to share folder "{%folder%}".
              </span>
@@ -219,8 +221,9 @@
            <div class="panel-heading" data-toggle="collapse" data-parent="#folders" href="#folder-{{$index}}" style="cursor: pointer">
              <div class="panel-progress" ng-show="folderStatus(folder) == 'syncing'" ng-attr-style="width: {{syncPercentage(folder.id)}}%"></div>
              <div class="panel-progress" ng-show="folderStatus(folder) == 'scanning' && scanProgress[folder.id] != undefined" ng-attr-style="width: {{scanPercentage(folder.id)}}%"></div>
-              <h3 class="panel-title">
-                <span class="fa fa-folder hidden-xs"></span>{{folder.id}}
+              <h4 class="panel-title">
+                <span class="fa hidden-xs fa-fw" ng-class="[folder.readOnly ? 'fa-lock' : 'fa-folder']"></span>
+                <a href="#folder-{{$index}}">{{folder.id}}</a>
                <span class="pull-right text-{{folderClass(folder)}}" ng-switch="folderStatus(folder)">
                  <span ng-switch-when="unknown"><span class="hidden-xs" translate>Unknown</span><span class="visible-xs">&#9724;</span></span>
                  <span ng-switch-when="unshared"><span class="hidden-xs" translate>Unshared</span><span class="visible-xs">&#9724;</span></span>
@@ -239,7 +242,7 @@
                  </span>
                  <span ng-switch-when="outofsync"><span class="hidden-xs" translate>Out of Sync</span><span class="visible-xs">&#9724;</span></span>
                </span>
-              </h3>
+              </h4>
            </div>
            <div id="folder-{{$index}}" class="panel-collapse collapse">
              <div class="panel-body">
@@ -247,7 +250,7 @@
                  <tbody>
                    <tr>
                      <th><span class="fa fa-fw fa-folder-open"></span>&nbsp;<span translate>Folder Path</span></th>
-                      <td class="text-right">{{folder.path}}</td>
+                      <td class="text-right" title="{{folder.path}}">{{folder.path}}</td>
                    </tr>
                    <tr ng-if="model[folder.id].invalid || model[folder.id].error">
                      <th><span class="fa fa-fw fa-exclamation-triangle"></span>&nbsp;<span translate>Error</span></th>
@@ -377,12 +380,12 @@
      <!-- This device -->

      <div class="col-md-6">
-        <h3 translate>Devices</h3>
+        <h3 translate>This Device</h3>
        <div class="panel panel-default" ng-repeat="deviceCfg in [thisDevice()]">
          <div class="panel-heading" data-toggle="collapse" href="#device-this" style="cursor: pointer">
-            <h3 class="panel-title">
+            <h4 class="panel-title">
              <identicon data-value="deviceCfg.deviceID"></identicon>&emsp;{{deviceName(deviceCfg)}}
-            </h3>
+            </h4>
          </div>
          <div id="device-this" class="panel-collapse collapse in">
            <div class="panel-body">
@@ -440,7 +443,7 @@
                  </tr>
                  <tr>
                    <th><span class="fa fa-fw fa-tag"></span>&nbsp;<span translate>Version</span></th>
-                    <td class="text-right">{{versionString()}}</td>
+                    <td class="text-right" title="{{versionString()}}">{{versionString()}}</td>
                  </tr>
                </tbody>
              </table>
@@ -449,13 +452,13 @@
        </div>

        <!-- Remote devices -->
-
+        <h3 translate>Remote Devices</h3>
        <div class="panel-group" id="devices">
          <div class="panel panel-default" ng-repeat="deviceCfg in otherDevices()">
            <div class="panel-heading" data-toggle="collapse" data-parent="#devices" href="#device-{{$index}}" style="cursor: pointer">
              <div class="panel-progress" ng-show="deviceStatus(deviceCfg) == 'syncing'" ng-attr-style="width: {{completion[deviceCfg.deviceID]._total | number:0}}%"></div>
-              <h3 class="panel-title">
-                <identicon data-value="deviceCfg.deviceID"></identicon>&emsp;{{deviceName(deviceCfg)}}
+              <h4 class="panel-title">
+                <identicon data-value="deviceCfg.deviceID"></identicon>&emsp;<a href="#device-{{$index}}">{{deviceName(deviceCfg)}}</a>
                <span ng-switch="deviceStatus(deviceCfg)" class="pull-right text-{{deviceClass(deviceCfg)}}">
                  <span ng-switch-when="insync"><span class="hidden-xs" translate>Up to Date</span><span class="visible-xs">&#9724;</span></span>
                  <span ng-switch-when="syncing">
@@ -465,7 +468,7 @@
                  <span ng-switch-when="disconnected"><span class="hidden-xs" translate>Disconnected</span><span class="visible-xs">&#9724;</span></span>
                  <span ng-switch-when="unused"><span class="hidden-xs" translate>Unused</span><span class="visible-xs">&#9724;</span></span>
                </span>
-              </h3>
+              </h4>
            </div>
            <div id="device-{{$index}}" class="panel-collapse collapse">
              <div class="panel-body">
@@ -533,7 +536,7 @@
        </div>
        <div class="form-group">
          <button type="button" class="btn btn-sm btn-default pull-right" ng-click="addDevice()">
-            <span class="fa fa-plus"></span>&nbsp;<span translate>Add Device</span>
+            <span class="fa fa-plus"></span>&nbsp;<span translate>Add Remote Device</span>
          </button>
          <div class="clearfix"></div>
        </div>
@@ -579,9 +582,9 @@

  <!-- vendor scripts -->
  <script src="vendor/jquery/jquery-2.0.3.min.js"></script>
-  <script src="vendor/angular/angular.min.js"></script>
-  <script src="vendor/angular/angular-translate.min.js"></script>
-  <script src="vendor/angular/angular-translate-loader.min.js"></script>
+  <script src="vendor/angular/angular.js"></script>
+  <script src="vendor/angular/angular-translate.js"></script>
+  <script src="vendor/angular/angular-translate-loader-static-files.js"></script>
  <script src="vendor/angular/angular-dirPagination.js"></script>
  <script src="vendor/bootstrap/js/bootstrap.min.js"></script>
  <!-- / vendor scripts -->
--- a/gui/default/modal.html
+++ b/gui/default/modal.html
--- a/gui/default/syncthing/app.js
+++ b/gui/default/syncthing/app.js
@@ -53,6 +53,7 @@ syncthing.config(function ($httpProvider, $translateProvider, LocaleServiceProvi

    // language and localisation

+    $translateProvider.useSanitizeValueStrategy('escape');
    $translateProvider.useStaticFilesLoader({
        prefix: 'assets/lang/lang-',
        suffix: '.json'
--- a/gui/default/syncthing/core/aboutModalDirective.js
+++ b/gui/default/syncthing/core/aboutModalDirective.js
--- a/gui/default/syncthing/core/aboutModalView.html
+++ b/gui/default/syncthing/core/aboutModalView.html
@@ -14,7 +14,9 @@
      <ul class="list-unstyled three-columns" id="contributor-list">
        <li class="auto-generated">Aaron Bieber</li>
        <li class="auto-generated">Adam Piggott</li>
+        <li class="auto-generated">Alessandro G.</li>
        <li class="auto-generated">Alexander Graf</li>
+        <li class="auto-generated">Anderson Mesquita</li>
        <li class="auto-generated">Andrew Dunham</li>
        <li class="auto-generated">Antony Male</li>
        <li class="auto-generated">Arthur Axel fREW Schmidt</li>
@@ -23,6 +25,7 @@
        <li class="auto-generated">Ben Curthoys</li>
        <li class="auto-generated">Ben Schulz</li>
        <li class="auto-generated">Ben Sidhom</li>
+        <li class="auto-generated">Benny Ng</li>
        <li class="auto-generated">Brandon Philips</li>
        <li class="auto-generated">Brendan Long</li>
        <li class="auto-generated">Brian R. Becker</li>
@@ -46,6 +49,7 @@
        <li class="auto-generated">Francois-Xavier Gsell</li>
        <li class="auto-generated">Frank Isemann</li>
        <li class="auto-generated">Gilli Sigurdsson</li>
+        <li class="auto-generated">Jaakko Hannikainen</li>
        <li class="auto-generated">Jacek Szafarkiewicz</li>
        <li class="auto-generated">Jake Peterson</li>
        <li class="auto-generated">Jakob Borg</li>
@@ -56,6 +60,8 @@
        <li class="auto-generated">Johan Vromans</li>
        <li class="auto-generated">Karol Różycki</li>
        <li class="auto-generated">Ken'ichi Kamada</li>
+        <li class="auto-generated">Kevin Allen</li>
+        <li class="auto-generated">Laurent Etiemble</li>
        <li class="auto-generated">Lode Hoste</li>
        <li class="auto-generated">Lord Landon Agahnim</li>
        <li class="auto-generated">Marc Laporte</li>
@@ -63,14 +69,18 @@
        <li class="auto-generated">Marcin Dziadus</li>
        <li class="auto-generated">Mateusz Naściszewski</li>
        <li class="auto-generated">Matt Burke</li>
+        <li class="auto-generated">Max Schulze</li>
        <li class="auto-generated">Michael Jephcote</li>
+        <li class="auto-generated">Michael Ploujnikov</li>
        <li class="auto-generated">Michael Tilli</li>
+        <li class="auto-generated">Nate Morrison</li>
        <li class="auto-generated">Pascal Jungblut</li>
        <li class="auto-generated">Peter Hoeg</li>
        <li class="auto-generated">Philippe Schommers</li>
        <li class="auto-generated">Phill Luby</li>
        <li class="auto-generated">Piotr Bejda</li>
        <li class="auto-generated">Ryan Sullivan</li>
+        <li class="auto-generated">Scott Klupfel</li>
        <li class="auto-generated">Sergey Mishin</li>
        <li class="auto-generated">Stefan Kuntz</li>
        <li class="auto-generated">Stefan Tatschner</li>
@@ -80,7 +90,10 @@
        <li class="auto-generated">Tully Robinson</li>
        <li class="auto-generated">Tyler Brazier</li>
        <li class="auto-generated">Veeti Paananen</li>
+        <li class="auto-generated">Victor Buinsky</li>
        <li class="auto-generated">Vil Brekin</li>
+        <li class="auto-generated">William A. Kennington III</li>
+        <li class="auto-generated">Wulf Weich</li>
        <li class="auto-generated">Yannic A.</li>
      </ul>
    </div>
--- a/gui/default/syncthing/core/alwaysNumberFilter.js
+++ b/gui/default/syncthing/core/alwaysNumberFilter.js
--- a/gui/default/syncthing/core/basenameFilter.js
+++ b/gui/default/syncthing/core/basenameFilter.js
--- a/gui/default/syncthing/core/binaryFilter.js
+++ b/gui/default/syncthing/core/binaryFilter.js
--- a/gui/default/syncthing/core/durationFilter.js
+++ b/gui/default/syncthing/core/durationFilter.js
--- a/gui/default/syncthing/core/eventService.js
+++ b/gui/default/syncthing/core/eventService.js
--- a/gui/default/syncthing/core/httpErrorDialogDirective.js
+++ b/gui/default/syncthing/core/httpErrorDialogDirective.js
--- a/gui/default/syncthing/core/httpErrorDialogView.html
+++ b/gui/default/syncthing/core/httpErrorDialogView.html
--- a/gui/default/syncthing/core/identiconDirective.js
+++ b/gui/default/syncthing/core/identiconDirective.js
--- a/gui/default/syncthing/core/languageSelectDirective.js
+++ b/gui/default/syncthing/core/languageSelectDirective.js
--- a/gui/default/syncthing/core/lastErrorComponentFilter.js
+++ b/gui/default/syncthing/core/lastErrorComponentFilter.js
--- a/gui/default/syncthing/core/localeService.js
+++ b/gui/default/syncthing/core/localeService.js
--- a/gui/default/syncthing/core/majorUpgradeModalDirective.js
+++ b/gui/default/syncthing/core/majorUpgradeModalDirective.js
--- a/gui/default/syncthing/core/majorUpgradeModalView.html
+++ b/gui/default/syncthing/core/majorUpgradeModalView.html
--- a/gui/default/syncthing/core/modalDirective.js
+++ b/gui/default/syncthing/core/modalDirective.js
--- a/gui/default/syncthing/core/module.js
+++ b/gui/default/syncthing/core/module.js
--- a/gui/default/syncthing/core/naturalFilter.js
+++ b/gui/default/syncthing/core/naturalFilter.js
--- a/gui/default/syncthing/core/networkErrorDialogDirective.js
+++ b/gui/default/syncthing/core/networkErrorDialogDirective.js
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				var langPrettyprint = {"bg":"Bulgarian","ca":"Catalan","ca@valencia":"Catalan (Valencian)","cs":"Czech","de":"German","el":"Greek","en":"English","en-GB":"English (United Kingdom)","es":"Spanish","es-ES":"Spanish (Spain)","fi":"Finnish","fr":"French","fr-CA":"French (Canada)","fy":"Western Frisian","hu":"Hungarian","it":"Italian","ja":"Japanese","ko-KR":"Korean (Korea)","lt":"Lithuanian","nb":"Norwegian Bokmål","nl":"Dutch","nn":"Norwegian Nynorsk","pl":"Polish","pt-BR":"Portuguese (Brazil)","pt-PT":"Portuguese (Portugal)","ro-RO":"Romanian (Romania)","ru":"Russian","sv":"Swedish","uk":"Ukrainian","zh-CN":"Chinese (China)","zh-TW":"Chinese (Taiwan)"}
				`@@ -1 +0,0 @@`
				`var validLangs = ["bg","ca","ca@valencia","cs","de","el","en","en-GB","es","es-ES","fi","fr","fr-CA","fy","hu","it","ja","ko-KR","lt","nb","nl","nn","pl","pt-BR","pt-PT","ro-RO","ru","sv","uk","zh-CN","zh-TW"]`
				`@@ -0,0 +1 @@`
				var langPrettyprint = {"bg":"Bulgarian","ca":"Catalan","ca@valencia":"Catalan (Valencian)","cs":"Czech","da":"Danish","de":"German","el":"Greek","en":"English","en-GB":"English (United Kingdom)","es":"Spanish","es-ES":"Spanish (Spain)","fi":"Finnish","fr":"French","fr-CA":"French (Canada)","fy":"Western Frisian","hu":"Hungarian","id":"Indonesian","it":"Italian","ja":"Japanese","ko-KR":"Korean (Korea)","lt":"Lithuanian","nb":"Norwegian Bokmål","nl":"Dutch","nn":"Norwegian Nynorsk","pl":"Polish","pt-BR":"Portuguese (Brazil)","pt-PT":"Portuguese (Portugal)","ru":"Russian","sv":"Swedish","tr":"Turkish","uk":"Ukrainian","vi":"Vietnamese","zh-CN":"Chinese (China)","zh-TW":"Chinese (Taiwan)"}