Docs & translations update

Add XUnit compatible test results

Godeps/Godeps.json

@@ -31,7 +31,7 @@
 		},
 		{
 			"ImportPath": "github.com/kardianos/osext",
-			"Rev": "431e263e413efe4446ede50cec4819b26659fbe7"
+			"Rev": "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc"
 		},
 		{
 			"ImportPath": "github.com/rcrowley/go-metrics",

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 solaris dragonfly freebsd
+// +build linux netbsd solaris dragonfly
 
 package osext
 
@@ -27,8 +27,6 @@ func executable() (string, error) {
 		return execpath, nil
 	case "netbsd":
 		return os.Readlink("/proc/curproc/exe")
-	case "freebsd":
-		return os.Readlink("/proc/curproc/file")
 	case "dragonfly":
 		return os.Readlink("/proc/curproc/file")
 	case "solaris":

Godeps/_workspace/src/github.com/kardianos/osext/osext_sysctl.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 darwin openbsd
+// +build darwin freebsd openbsd
 
 package osext
 

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

build.go

@@ -182,6 +182,7 @@ 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) {

build.sh

@@ -125,6 +125,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 \

cmd/syncthing/gui_csrf.go

@@ -17,9 +17,16 @@ import (
 	"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.
@@ -36,6 +43,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 +55,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 +80,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 +99,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()
 

cmd/syncthing/gui_test.go

@@ -0,0 +1,42 @@
+// 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"
+
+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")
+	}
+}

cmd/syncthing/main.go

@@ -146,34 +146,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
@@ -186,8 +190,9 @@ The following are valid values for the STTRACE variable:
 
 // Environment options
 var (
-	noUpgrade    = os.Getenv("STNOUPGRADE") != ""
-	innerProcess = os.Getenv("STNORESTART") != "" || os.Getenv("STMONITORED") != ""
+	noUpgrade       = os.Getenv("STNOUPGRADE") != ""
+	innerProcess    = os.Getenv("STNORESTART") != "" || os.Getenv("STMONITORED") != ""
+	noDefaultFolder = os.Getenv("STNODEFAULTFOLDER") != ""
 )
 
 type RuntimeOptions struct {
@@ -990,18 +995,28 @@ func setupGUI(mainService *suture.Supervisor, cfg *config.Wrapper, m *model.Mode
 }
 
 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)

gui/assets/lang/lang-bg.json

@@ -51,6 +51,7 @@
     "Edit Device": "Промени устройство",
     "Edit Folder": "Промени папка",
     "Editing": "Променяне",
+    "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.": "Добави шаблони за игнориране, по един на ред.",
@@ -75,6 +76,7 @@
     "Generate": "Генерирай",
     "Global Discovery": "Глобално откриване",
     "Global Discovery Server": "Сървър за глобално откриване",
+    "Global Discovery Servers": "Сървъри за глобално откриване",
     "Global State": "Глобално състояние",
     "Help": "Помощ",
     "Home page": "Начална страница",
@@ -126,6 +128,7 @@
     "Quick guide to supported patterns": "Бърз наръчник към поддържаните шаблони",
     "RAM Utilization": "RAM в употреба",
     "Random": "Произволен",
+    "Relay Servers": "Препращащи сървъри",
     "Relayed via": "Препратено през",
     "Relays": "Препращачи",
     "Release Notes": "Бележки по обновяването",

gui/assets/lang/lang-ca.json

@@ -51,6 +51,7 @@
     "Edit Device": "Modificar dispositiu",
     "Edit Folder": "Modificar carpeta",
     "Editing": "Modificant",
+    "Enable Relaying": "Enable Relaying",
     "Enable UPnP": "Habilitat UPnP",
     "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Introdueix adreces separades per comes (\"tcp://ip:port\", \"tcp://host:port\") o \"dinàmic\" per realitzar descobriments automàtics de l'adreça.",
     "Enter ignore patterns, one per line.": "Introduex patrons a ignorar, un per línia.",
@@ -75,6 +76,7 @@
     "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": "Pàgina d'inici",
@@ -126,6 +128,7 @@
     "Quick guide to supported patterns": "Guia ràpida per als possibles patrons",
     "RAM Utilization": "Utilització de la RAM",
     "Random": "Aleatori",
+    "Relay Servers": "Relay Servers",
     "Relayed via": "Retransmés a través",
     "Relays": "Repetidors",
     "Release Notes": "Notes de llançament",

gui/assets/lang/lang-ca@valencia.json

@@ -51,6 +51,7 @@
     "Edit Device": "Editar dispositiu",
     "Edit Folder": "Editar carpeta",
     "Editing": "Editant",
+    "Enable Relaying": "Enable Relaying",
     "Enable UPnP": "Activar UPnp",
     "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Introdueix adreces separades per coma (\"tcp://ip:port\", \"tcp://host:port\") o \"dynamic\" per a realitzar el descobriment automàtic de l'adreça.",
     "Enter ignore patterns, one per line.": "Introduïr patrons a ignorar, un per línia.",
@@ -75,6 +76,7 @@
     "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": "Pàgina inicial",
@@ -126,6 +128,7 @@
     "Quick guide to supported patterns": "Guía ràpida de patrons suportats",
     "RAM Utilization": "Utilització de la RAM",
     "Random": "Aleatori",
+    "Relay Servers": "Relay Servers",
     "Relayed via": "Transmitit via",
     "Relays": "Transmissions",
     "Release Notes": "Notes de la versió",

gui/assets/lang/lang-cs.json

@@ -51,6 +51,7 @@
     "Edit Device": "Upravit přístroj",
     "Edit Folder": "Upravit adresář",
     "Editing": "Upravuje se",
+    "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.",
@@ -75,6 +76,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",
@@ -126,6 +128,7 @@
     "Quick guide to supported patterns": "Rychlá nápověda k podporovaným vzorům",
     "RAM Utilization": "Využití RAM",
     "Random": "Náhodně",
+    "Relay Servers": "Přenášecí servery",
     "Relayed via": "Přenášené přes",
     "Relays": "Přenašeče",
     "Release Notes": "Poznámky k vydání",

gui/assets/lang/lang-da.json

@@ -51,6 +51,7 @@
     "Edit Device": "Rediger enhed",
     "Edit Folder": "Rediger mappe",
     "Editing": "Redigerer",
+    "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.",
@@ -75,6 +76,7 @@
     "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",
@@ -126,6 +128,7 @@
     "Quick guide to supported patterns": "Hurtig guide til supporteret mønstre",
     "RAM Utilization": "RAM-forbrug",
     "Random": "Tilfældig",
+    "Relay Servers": "Relay Servers",
     "Relayed via": "Passeret gennem",
     "Relays": "Passager",
     "Release Notes": "Udgivelsesnoter",

gui/assets/lang/lang-de.json

@@ -51,6 +51,7 @@
     "Edit Device": "Gerät bearbeiten",
     "Edit Folder": "Verzeichnis bearbeiten",
     "Editing": "Bearbeitet",
+    "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.",
@@ -74,7 +75,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",
@@ -87,7 +89,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",
@@ -119,13 +121,14 @@
     "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",
@@ -152,7 +155,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": "Show QR",
+    "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",
@@ -174,7 +177,7 @@
     "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.": "Die Syncthing-Administrationsoberfläche erlaubt mit den jetzigen Einstellungen einen Fernzugriff ohne 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.",
@@ -199,7 +202,7 @@
     "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 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",

gui/assets/lang/lang-el.json

@@ -51,6 +51,7 @@
     "Edit Device": "Επεξεργασία συσκευής",
     "Edit Folder": "Επεξεργασία φακέλου",
     "Editing": "Επεξεργασία σε εξέλιξη",
+    "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.": "Δώσε τα πρότυπα που θα αγνοηθούν, ένα σε κάθε γραμμή.",
@@ -75,6 +76,7 @@
     "Generate": "Δημιουργία",
     "Global Discovery": "Καθολική ανεύρεση",
     "Global Discovery Server": "Διακομιστής καθολικής ανεύρεσης κόμβου",
+    "Global Discovery Servers": "Global Discovery Servers",
     "Global State": "Καθολική κατάσταση",
     "Help": "Βοήθεια",
     "Home page": "Αρχική σελίδα",
@@ -126,6 +128,7 @@
     "Quick guide to supported patterns": "Σύντομη βοήθεια σχετικά με τα πρότυπα αναζήτησης που υποστηρίζονται",
     "RAM Utilization": "Επιβάρυνση RAM",
     "Random": "Τυχαία",
+    "Relay Servers": "Relay Servers",
     "Relayed via": "Relayed via",
     "Relays": "Relays",
     "Release Notes": "Σημείωμα έκδοσης",

gui/assets/lang/lang-en-GB.json

@@ -51,6 +51,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.",
@@ -75,6 +76,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",
@@ -126,6 +128,7 @@
     "Quick guide to supported patterns": "Quick guide to supported patterns",
     "RAM Utilization": "RAM Utilisation",
     "Random": "Random",
+    "Relay Servers": "Relay Servers",
     "Relayed via": "Relayed via",
     "Relays": "Relays",
     "Release Notes": "Release Notes",

gui/assets/lang/lang-en.json

@@ -51,6 +51,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.",
@@ -75,6 +76,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",
@@ -126,6 +128,7 @@
    "Quick guide to supported patterns": "Quick guide to supported patterns",
    "RAM Utilization": "RAM Utilization",
    "Random": "Random",
+   "Relay Servers": "Relay Servers",
    "Relayed via": "Relayed via",
    "Relays": "Relays",
    "Release Notes": "Release Notes",

gui/assets/lang/lang-es-ES.json

@@ -51,6 +51,7 @@
     "Edit Device": "Editar dispositivo",
     "Edit Folder": "Editar repositorio",
     "Editing": "Editando",
+    "Enable Relaying": "Enable Relaying",
     "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 ignore patterns, one per line.": "Introducir patrones a ignorar, uno por línea.",
@@ -75,6 +76,7 @@
     "Generate": "Generar",
     "Global Discovery": "Descubrimiento global",
     "Global Discovery Server": "Servidor de descubrimiento global",
+    "Global Discovery Servers": "Global Discovery Servers",
     "Global State": "Estado global",
     "Help": "Ayuda",
     "Home page": "Página de inicio",
@@ -126,6 +128,7 @@
     "Quick guide to supported patterns": "Guía rápida de patrones soportados",
     "RAM Utilization": "Uso de RAM",
     "Random": "Aleatorio",
+    "Relay Servers": "Relay Servers",
     "Relayed via": "Respaldada a través",
     "Relays": "Respaldos",
     "Release Notes": "Notas de la versión",

gui/assets/lang/lang-es.json

@@ -51,6 +51,7 @@
     "Edit Device": "Editar dispositivo",
     "Edit Folder": "Editar repositorio",
     "Editing": "Editando",
+    "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.",
@@ -75,6 +76,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",
@@ -126,6 +128,7 @@
     "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",

gui/assets/lang/lang-fi.json

@@ -51,6 +51,7 @@
     "Edit Device": "Muokkaa laitetta",
     "Edit Folder": "Muokkaa kansiota",
     "Editing": "Muokkaus",
+    "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.",
@@ -75,6 +76,7 @@
     "Generate": "Generoi",
     "Global Discovery": "Globaali etsintä",
     "Global Discovery Server": "Globaali etsintäpalvelin",
+    "Global Discovery Servers": "Global Discovery Servers",
     "Global State": "Globaali tila",
     "Help": "Help",
     "Home page": "Kotisivu",
@@ -126,6 +128,7 @@
     "Quick guide to supported patterns": "Tuettujen lausekkeiden pikaohje",
     "RAM Utilization": "RAM:n käyttö",
     "Random": "Satunnaien",
+    "Relay Servers": "Relay Servers",
     "Relayed via": "Relayed via",
     "Relays": "Välityspalvelimet",
     "Release Notes": "Julkaisutiedot",

gui/assets/lang/lang-fr-CA.json

@@ -51,6 +51,7 @@
     "Edit Device": "Éditer le périphérique",
     "Edit Folder": "Éditer le répertoire",
     "Editing": "Édition",
+    "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.",
@@ -75,6 +76,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",
@@ -126,6 +128,7 @@
     "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",

gui/assets/lang/lang-fr.json

@@ -51,6 +51,7 @@
     "Edit Device": "Éditer le périphérique",
     "Edit Folder": "Éditer le répertoire",
     "Editing": "Édition",
+    "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.",
@@ -75,6 +76,7 @@
     "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",
@@ -126,6 +128,7 @@
     "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",
@@ -152,7 +155,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",
+    "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 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",

gui/assets/lang/lang-fy.json

@@ -1,5 +1,5 @@
 {
-    "A device with that ID is already added.": "A device with that ID is already added.",
+    "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",
@@ -51,6 +51,7 @@
     "Edit Device": "Apparaat bewurkje",
     "Edit Folder": "Map bewurkje",
     "Editing": "Bewurkjen",
+    "Enable Relaying": "Trochjaan tastean",
     "Enable UPnP": "UPnP oansette",
     "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Fier troch komma's skieden (\"tcp://ip:port\", \"tcp://host:port\") adressen yn of \"dynamic\" om automatyske ûntdekking fan it adres út te fieren.",
     "Enter ignore patterns, one per line.": "Fier negearpatroanen yn, ien per rigel.",
@@ -75,6 +76,7 @@
     "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",
@@ -126,6 +128,7 @@
     "Quick guide to supported patterns": "Fluch-paadwizer foar stipe patroanen",
     "RAM Utilization": "RAM-brûken",
     "Random": "Willekeurich",
+    "Relay Servers": "Trochjoutsjinners",
     "Relayed via": "Trochjûn fia",
     "Relays": "Trochjouers",
     "Release Notes": "Utjeftenotysjes",
@@ -152,7 +155,7 @@
     "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.",
     "Show ID": "ID sjen litte",
-    "Show QR": "Show QR",
+    "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 bondel-tastân sjen litten ynstee fan apparaat-ID. Wannear't leech litten wurd, wurd it fernijt nei de namme die it apparaat útstjoert.",
     "Shutdown": "Ofslute",

gui/assets/lang/lang-hu.json

@@ -51,6 +51,7 @@
     "Edit Device": "Eszköz szerkesztése",
     "Edit Folder": "Mappa szerkesztése",
     "Editing": "Szerkesztés",
+    "Enable Relaying": "Enable Relaying",
     "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",
@@ -75,6 +76,7 @@
     "Generate": "Generálás",
     "Global Discovery": "Globális felfedezés",
     "Global Discovery Server": "Globális felfedező szerver",
+    "Global Discovery Servers": "Global Discovery Servers",
     "Global State": "Globális állapot",
     "Help": "Segítség",
     "Home page": "Főoldal",
@@ -126,6 +128,7 @@
     "Quick guide to supported patterns": "Rövid útmutató a használható mintákról",
     "RAM Utilization": "Memória használat",
     "Random": "Véletlenszerű",
+    "Relay Servers": "Relay Servers",
     "Relayed via": "Közvetítve",
     "Relays": "Közvetítések",
     "Release Notes": "Kiadási megjegyzések",

gui/assets/lang/lang-it.json

@@ -51,6 +51,7 @@
     "Edit Device": "Modifica Dispositivo",
     "Edit Folder": "Modifica Cartella",
     "Editing": "Modifica di",
+    "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.",
@@ -74,7 +75,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",
@@ -126,6 +128,7 @@
     "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",

gui/assets/lang/lang-ja.json

@@ -1,5 +1,5 @@
 {
-    "A device with that ID is already added.": "入力されたIDのデバイスはすでに追加されています。",
+    "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キー",
@@ -16,7 +16,7 @@
     "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": "自動アップグレード",
@@ -42,7 +42,7 @@
     "Device {%device%} ({%address%}) wants to connect. Add new device?": "デバイス {{device}} ({{address}}) が接続を求めています。新しいデバイスとして追加しますか?",
     "Devices": "デバイス",
     "Disconnected": "切断中",
-    "Discovery": "ディスカバリーサーバー",
+    "Discovery": "探索サーバー",
     "Documentation": "マニュアル",
     "Download Rate": "ダウンロード速度",
     "Downloaded": "ダウンロード済",
@@ -51,13 +51,14 @@
     "Edit Device": "デバイスの編集",
     "Edit Folder": "フォルダーの編集",
     "Editing": "編集中",
+    "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 フォルダーに移動します。",
@@ -73,8 +74,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": "ホームページ",
@@ -90,7 +92,7 @@
     "Last File Received": "最後に受信したファイル",
     "Last seen": "最終接続日時",
     "Later": "後で設定",
-    "Local Discovery": "ローカルディスカバリー",
+    "Local Discovery": "LAN内で探索",
     "Local State": "ローカル状態",
     "Local State (Total)": "ローカル状態 (合計)",
     "Major Upgrade": "メジャーアップグレード",
@@ -126,6 +128,7 @@
     "Quick guide to supported patterns": "サポートされているパターンの簡易ガイド",
     "RAM Utilization": "メモリ使用量",
     "Random": "ランダム",
+    "Relay Servers": "中継サーバー",
     "Relayed via": "経由している中継サーバーのアドレス",
     "Relays": "中継サーバー",
     "Release Notes": "リリースノート",
@@ -153,8 +156,8 @@
     "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の代わりに表示されます。空欄の場合デバイスが名乗る名前に更新されます。",
+    "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": "単純バージョン管理",
@@ -168,10 +171,10 @@
     "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の管理画面が、パスワードなしで外部からアクセスできるように設定されています。",
@@ -189,14 +192,14 @@
     "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 can easily give hackers access to read and change any files on your computer.": "この設定のままでは、あなたのコンピューターにある任意のファイルを、他者が簡単に盗み見たり書き換えたりすることができます。",

gui/assets/lang/lang-ko-KR.json

@@ -51,6 +51,7 @@
     "Edit Device": "기기 편집",
     "Edit Folder": "폴더 편집",
     "Editing": "편집",
+    "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.": "무시할 패턴을 한 줄에 하나씩 입력하세요.",
@@ -75,6 +76,7 @@
     "Generate": "생성",
     "Global Discovery": "글로벌 탐색",
     "Global Discovery Server": "글로벌 탐색 서버",
+    "Global Discovery Servers": "Global Discovery Servers",
     "Global State": "글로벌 서버 상태",
     "Help": "도움말",
     "Home page": "Home page",
@@ -126,6 +128,7 @@
     "Quick guide to supported patterns": "지원하는 패턴에 대한 빠른 도움말",
     "RAM Utilization": "RAM 사용량",
     "Random": "무작위",
+    "Relay Servers": "Relay Servers",
     "Relayed via": "Relayed via",
     "Relays": "Relays",
     "Release Notes": "릴리즈 노트",

gui/assets/lang/lang-lt.json

@@ -51,6 +51,7 @@
     "Edit Device": "Keisti įrenginį",
     "Edit Folder": "Keisti aplanką",
     "Editing": "Redagavimas",
+    "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.",
@@ -75,6 +76,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",
@@ -126,6 +128,7 @@
     "Quick guide to supported patterns": "Trumpas leistinų šablonų vadovas",
     "RAM Utilization": "Atminties naudojimas",
     "Random": "Atsitiktinė",
+    "Relay Servers": "Retransliavimo serveriai",
     "Relayed via": "Retransliuojama per",
     "Relays": "Retransliatoriai",
     "Release Notes": "Laidos Informacija",

gui/assets/lang/lang-nb.json

@@ -42,7 +42,7 @@
     "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",
@@ -51,8 +51,9 @@
     "Edit Device": "Rediger Enhet",
     "Edit Folder": "Rediger Mappe",
     "Editing": "Redigerer",
+    "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",
@@ -73,8 +74,9 @@
     "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",
@@ -90,7 +92,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",
@@ -126,6 +128,7 @@
     "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",

gui/assets/lang/lang-nl.json

@@ -1,5 +1,5 @@
 {
-    "A device with that ID is already added.": "A device with that ID is already added.",
+    "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",
@@ -51,6 +51,7 @@
     "Edit Device": "Bewerk apparaat",
     "Edit Folder": "Bewerk map",
     "Editing": "Bezig met bewerken",
+    "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.",
@@ -75,6 +76,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",
@@ -126,6 +128,7 @@
     "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",
@@ -152,7 +155,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": "Show QR",
+    "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",

gui/assets/lang/lang-nn.json

@@ -1,5 +1,5 @@
 {
-    "A device with that ID is already added.": "A device with that ID is already added.",
+    "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",
@@ -33,7 +33,7 @@
     "Copied from elsewhere": "Kopiert frå ein annan stad",
     "Copied from original": "Kopiert frå originalen",
     "Copyright © 2015 the following Contributors:": "Opphavsrett © 2015 og desse bidragsytarane:",
-    "Danger!": "Danger!",
+    "Danger!": "Fare!",
     "Delete": "Slett",
     "Deleted": "Sletta",
     "Device ID": "Eining ID",
@@ -51,6 +51,7 @@
     "Edit Device": "Rediger Eining",
     "Edit Folder": "Rediger Mappe",
     "Editing": "Redigerer",
+    "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.",
@@ -75,6 +76,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",
@@ -119,13 +121,14 @@
     "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",
@@ -139,7 +142,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.",
@@ -152,7 +155,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": "Show QR",
+    "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",
@@ -174,7 +177,7 @@
     "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.",
@@ -199,7 +202,7 @@
     "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 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",

gui/assets/lang/lang-pl.json

@@ -51,6 +51,7 @@
     "Edit Device": "Edytuj urządzenie",
     "Edit Folder": "Edytuj folder",
     "Editing": "Edytowanie",
+    "Enable Relaying": "Enable Relaying",
     "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.",
@@ -75,6 +76,7 @@
     "Generate": "Generuj",
     "Global Discovery": "Globalne odnajdywanie",
     "Global Discovery Server": "Globalny serwer rozgłoszeniowy",
+    "Global Discovery Servers": "Global Discovery Servers",
     "Global State": "Status globalny",
     "Help": "Pomoc",
     "Home page": "Strona domowa",
@@ -126,6 +128,7 @@
     "Quick guide to supported patterns": "Krótki przewodnik po obsługiwanych wzorcach",
     "RAM Utilization": "Użycie pamięci RAM",
     "Random": "Losowo",
+    "Relay Servers": "Relay Servers",
     "Relayed via": "Przekazane przez",
     "Relays": "Przekaźniki",
     "Release Notes": "Informacje o wydaniu",

gui/assets/lang/lang-pt-BR.json

@@ -51,6 +51,7 @@
     "Edit Device": "Editar dispositivo",
     "Edit Folder": "Editar pasta",
     "Editing": "Editando",
+    "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.",
@@ -75,6 +76,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",
@@ -126,6 +128,7 @@
     "Quick guide to supported patterns": "Guia rápido dos padrões suportados",
     "RAM Utilization": "Uso de RAM",
     "Random": "Aleatória",
+    "Relay Servers": "Servidores de retransmissão",
     "Relayed via": "Retransmitido via",
     "Relays": "Retransmissores",
     "Release Notes": "Notas de lançamento",

gui/assets/lang/lang-pt-PT.json

@@ -51,6 +51,7 @@
     "Edit Device": "Editar dispositivo",
     "Edit Folder": "Editar pasta",
     "Editing": "Editando",
+    "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.",
@@ -75,6 +76,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",
@@ -126,6 +128,7 @@
     "Quick guide to supported patterns": "Guia rápido dos padrões suportados",
     "RAM Utilization": "Utilização da RAM",
     "Random": "Aleatória",
+    "Relay Servers": "Servidores de retransmissão",
     "Relayed via": "Retransmitido via",
     "Relays": "Retransmissores",
     "Release Notes": "Notas de lançamento",

gui/assets/lang/lang-ro-RO.json

@@ -51,6 +51,7 @@
     "Edit Device": "Modifică Dispozitiv",
     "Edit Folder": "Modifică Mapa",
     "Editing": "Modificare",
+    "Enable Relaying": "Enable Relaying",
     "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.",
@@ -75,6 +76,7 @@
     "Generate": "Generează",
     "Global Discovery": "Găsire Globală",
     "Global Discovery Server": "Server pentru Găsirea Globală",
+    "Global Discovery Servers": "Global Discovery Servers",
     "Global State": "Status Global",
     "Help": "Help",
     "Home page": "Home page",
@@ -126,6 +128,7 @@
     "Quick guide to supported patterns": "Ghid rapid pentru regulile suportate",
     "RAM Utilization": "RAM",
     "Random": "Random",
+    "Relay Servers": "Relay Servers",
     "Relayed via": "Relayed via",
     "Relays": "Relays",
     "Release Notes": "Release Notes",

gui/assets/lang/lang-ru.json

@@ -51,6 +51,7 @@
     "Edit Device": "Изменить устройство",
     "Edit Folder": "Изменить папку",
     "Editing": "Редактирование",
+    "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.": "Введите шаблоны игнорирования, по одному на строку.",
@@ -75,6 +76,7 @@
     "Generate": "Сгенерировать",
     "Global Discovery": "Глобальное обнаружение",
     "Global Discovery Server": "Сервер глобального обнаружения",
+    "Global Discovery Servers": "Серверы глобального обнаружения",
     "Global State": "Глобальное состояние",
     "Help": "Помощь",
     "Home page": "Домашная страница",
@@ -126,6 +128,7 @@
     "Quick guide to supported patterns": "Краткое руководство по поддерживаемым шаблонам",
     "RAM Utilization": "Использование ОЗУ",
     "Random": "Случайно",
+    "Relay Servers": "Релеи",
     "Relayed via": "Релей через",
     "Relays": "Релеи",
     "Release Notes": "Замечания к версии",

gui/assets/lang/lang-sv.json

@@ -51,6 +51,7 @@
     "Edit Device": "Redigera enhet",
     "Edit Folder": "Redigera katalog",
     "Editing": "Redigerar",
+    "Enable Relaying": "Enable Relaying",
     "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.",
@@ -75,6 +76,7 @@
     "Generate": "Skapa",
     "Global Discovery": "Global uppslagning",
     "Global Discovery Server": "Global uppslagningsserver",
+    "Global Discovery Servers": "Global Discovery Servers",
     "Global State": "Global status",
     "Help": "Hjälp",
     "Home page": "Hemsida",
@@ -126,6 +128,7 @@
     "Quick guide to supported patterns": "Snabb guide till filmönster som stöds",
     "RAM Utilization": "Minnesanvändning",
     "Random": "Slumpmässig",
+    "Relay Servers": "Relay Servers",
     "Relayed via": "Vidarbefordras via",
     "Relays": "Vidarbefordringar",
     "Release Notes": "versionsnyheter",

gui/assets/lang/lang-tr.json

@@ -51,6 +51,7 @@
     "Edit Device": "Cihaz Düzenle",
     "Edit Folder": "Klasör Düzenle",
     "Editing": "Düzenleniyor",
+    "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.",
@@ -75,6 +76,7 @@
     "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",
@@ -96,7 +98,7 @@
     "Major Upgrade": "Birincil Yükseltme",
     "Maximum Age": "Azami Süre",
     "Metadata Only": "Sadece Üstveri",
-    "Minimum Free Disk Space": "Minimum Boş Disk Alanı",
+    "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",
@@ -126,8 +128,9 @@
     "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": "Relays",
+    "Relays": "Röleler",
     "Release Notes": "Sürüm Notları",
     "Remove": "Kaldır",
     "Rescan": "Tekrar Tara",
@@ -152,7 +155,7 @@
     "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": "Show QR",
+    "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",
@@ -190,7 +193,7 @@
     "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).": "Minimum boş disk alanı yüzde olarak 0 ve 100 (dahil) arasında kalan pozitif bir sayıyla tanımlanmalıdır.",
+    "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ı.",
@@ -222,6 +225,6 @@
     "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": "öğeler",
+    "items": "öğel",
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}}  \"{{folder}}\" klasörünü paylaşmak istiyor."
 }

gui/assets/lang/lang-uk.json

@@ -51,6 +51,7 @@
     "Edit Device": "Редагувати пристрій",
     "Edit Folder": "Редагувати директорію",
     "Editing": "Редагування",
+    "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.": "Введіть розділені комою (\"tcp://ip:port\", \"tcp://host:port\") адреси або \"dynamic\" для автоматичного визначення адреси.",
     "Enter ignore patterns, one per line.": "Введіть шаблони ігнорування, по одному на рядок.",
@@ -75,6 +76,7 @@
     "Generate": "Згенерувати",
     "Global Discovery": "Глобальне виявлення",
     "Global Discovery Server": "Сервер для глобального виявлення",
+    "Global Discovery Servers": "Global Discovery Servers",
     "Global State": "Глобальний статус",
     "Help": "Допомога",
     "Home page": "Домашня сторінка",
@@ -126,6 +128,7 @@
     "Quick guide to supported patterns": "Швидкий посібник по шаблонам, що підтримуються",
     "RAM Utilization": "Використання RAM",
     "Random": "Випадково",
+    "Relay Servers": "Relay Servers",
     "Relayed via": "Ретранслювати через",
     "Relays": "Ретрансляція",
     "Release Notes": "Примітки до випуску",

gui/assets/lang/lang-vi.json

@@ -51,6 +51,7 @@
     "Edit Device": "Chỉnh sửa thiết bị",
     "Edit Folder": "Chỉnh sửa thư mục",
     "Editing": "Đang chỉnh sửa",
+    "Enable Relaying": "Enable Relaying",
     "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 dấu phẩy ngăn cách các địa chỉ (\"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 quy luật bỏ qua, từng dòng một.",
@@ -75,6 +76,7 @@
     "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": "Global Discovery Servers",
     "Global State": "Hiện trạng toàn cầu",
     "Help": "Trợ giúp",
     "Home page": "Trang chủ",
@@ -126,6 +128,7 @@
     "Quick guide to supported patterns": "Hướng dẫn sơ lược về các quy luật được hỗ trợ",
     "RAM Utilization": "Mức sử dụng RAM",
     "Random": "Ngẫu nhiên",
+    "Relay Servers": "Relay Servers",
     "Relayed via": "Chuyển tiếp qua",
     "Relays": "Các máy chuyển tiếp",
     "Release Notes": "Lược sử phát hành",

gui/assets/lang/lang-zh-CN.json

@@ -4,7 +4,7 @@
     "A new major version may not be compatible with previous versions.": "重大更新可能与之前的版本之间无法兼容",
     "API Key": "API Key",
     "About": "关于",
-    "Actions": "动作",
+    "Actions": "操作",
     "Add": "添加",
     "Add Device": "添加设备",
     "Add Folder": "添加文件夹",
@@ -51,6 +51,7 @@
     "Edit Device": "编辑设备选项",
     "Edit Folder": "编辑文件夹选项",
     "Editing": "正在编辑",
+    "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.": "请输入忽略表达式，每行一条",
@@ -75,6 +76,7 @@
     "Generate": "生成",
     "Global Discovery": "在互联网上寻找设备\n",
     "Global Discovery Server": "全球发现服务器",
+    "Global Discovery Servers": "全球发现服务器",
     "Global State": "全局状态",
     "Help": "帮助",
     "Home page": "主页",
@@ -126,6 +128,7 @@
     "Quick guide to supported patterns": "支持的通配符的简单教程：",
     "RAM Utilization": "内存使用量",
     "Random": "随机顺序",
+    "Relay Servers": "中继服务器",
     "Relayed via": "中转经由",
     "Relays": "中转",
     "Release Notes": "发布说明",

gui/assets/lang/lang-zh-TW.json

@@ -51,6 +51,7 @@
     "Edit Device": "編輯裝置",
     "Edit Folder": "編輯資料夾",
     "Editing": "正在編輯",
+    "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.": "輸入忽略樣式，每行一種。",
@@ -75,6 +76,7 @@
     "Generate": "產生",
     "Global Discovery": "全域探索",
     "Global Discovery Server": "全域探索伺服器",
+    "Global Discovery Servers": "Global Discovery Servers",
     "Global State": "全域狀態",
     "Help": "說明",
     "Home page": "首頁",
@@ -126,6 +128,7 @@
     "Quick guide to supported patterns": "可支援樣式的快速指南",
     "RAM Utilization": "記憶體使用",
     "Random": "隨機",
+    "Relay Servers": "Relay Servers",
     "Relayed via": "中繼於",
     "Relays": "中繼點",
     "Release Notes": "版本資訊",

gui/syncthing/core/syncthingController.js

@@ -353,6 +353,7 @@ angular.module('syncthing.core')
             $scope.config = config;
             $scope.config.options._listenAddressStr = $scope.config.options.listenAddress.join(', ');
             $scope.config.options._globalAnnounceServersStr = $scope.config.options.globalAnnounceServers.join(', ');
+            $scope.config.options._relayServersStr = $scope.config.options.relayServers.join(', ');
 
             $scope.devices = $scope.config.devices;
             $scope.devices.forEach(function (deviceCfg) {
@@ -890,7 +891,7 @@ angular.module('syncthing.core')
                 $scope.config.options = angular.copy($scope.tmpOptions);
                 $scope.config.gui = angular.copy($scope.tmpGUI);
 
-                ['listenAddress', 'globalAnnounceServers'].forEach(function (key) {
+                ['listenAddress', 'globalAnnounceServers', 'relayServers'].forEach(function (key) {
                     $scope.config.options[key] = $scope.config.options["_" + key + "Str"].split(/[ ,]+/).map(function (x) {
                         return x.trim();
                     });
@@ -1200,7 +1201,7 @@ angular.module('syncthing.core')
             };
             $scope.currentFolder.rescanIntervalS = 60;
             $scope.currentFolder.minDiskFreePct = 1;
-            $scope.currentFolder.maxConflicts = -1;
+            $scope.currentFolder.maxConflicts = 10;
             $scope.currentFolder.order = "random";
             $scope.currentFolder.fileVersioningSelector = "none";
             $scope.currentFolder.trashcanClean = 0;
@@ -1222,7 +1223,7 @@ angular.module('syncthing.core')
                 selectedDevices: {},
                 rescanIntervalS: 60,
                 minDiskFreePct: 1,
-                maxConflicts: -1,
+                maxConflicts: 10,
                 order: "random",
                 fileVersioningSelector: "none",
                 trashcanClean: 0,

gui/syncthing/settings/settingsModalView.html

@@ -13,10 +13,12 @@
               <label translate for="DeviceName">Device Name</label>
               <input id="DeviceName" class="form-control" type="text" ng-model="tmpOptions.deviceName">
             </div>
+
             <div class="form-group">
               <label translate for="ListenAddressStr">Sync Protocol Listen Addresses</label>
               <input id="ListenAddressStr" class="form-control" type="text" ng-model="tmpOptions._listenAddressStr">
             </div>
+
             <div class="form-group" ng-class="{'has-error': settingsEditor.MaxRecvKbps.$invalid && settingsEditor.MaxRecvKbps.$dirty}">
               <label translate for="MaxRecvKbps">Incoming Rate Limit (KiB/s)</label>
               <input id="MaxRecvKbps" name="MaxRecvKbps" class="form-control" type="number" ng-model="tmpOptions.maxRecvKbps" min="0">
@@ -24,6 +26,7 @@
                 <span translate ng-if="settingsEditor.MaxRecvKbps.$error.min && settingsEditor.MaxRecvKbps.$dirty">The rate limit must be a non-negative number (0: no limit)</span>
               </p>
             </div>
+
             <div class="form-group" ng-class="{'has-error': settingsEditor.MaxSendKbps.$invalid && settingsEditor.MaxSendKbps.$dirty}">
               <label translate for="MaxSendKbps">Outgoing Rate Limit (KiB/s)</label>
               <input id="MaxSendKbps" name="MaxSendKbps" class="form-control" type="number" ng-model="tmpOptions.maxSendKbps" min="0">
@@ -31,41 +34,53 @@
                 <span translate ng-if="settingsEditor.MaxSendKbps.$error.min && settingsEditor.MaxSendKbps.$dirty">The rate limit must be a non-negative number (0: no limit)</span>
               </p>
             </div>
-            <div class="col-md-6">
-              <div class="form-group">
-                <div class="checkbox">
-                  <label>
-                    <input id="UPnPEnabled" type="checkbox" ng-model="tmpOptions.upnpEnabled"> <span translate>Enable UPnP</span>
-                  </label>
+
+            <div class="row">
+              <div class="col-md-6">
+                <div class="form-group">
+                  <div class="checkbox">
+                    <label>
+                      <input id="UPnPEnabled" type="checkbox" ng-model="tmpOptions.upnpEnabled"> <span translate>Enable UPnP</span>
+                    </label>
+                  </div>
                 </div>
               </div>
-              <div class="form-group">
-                <div class="checkbox">
-                  <label>
-                    <input id="GlobalAnnEnabled" type="checkbox" ng-model="tmpOptions.globalAnnounceEnabled"> <span translate>Global Discovery</span>
-                  </label>
+              <div class="col-md-6">
+                <div class="form-group">
+                  <div class="checkbox">
+                    <label>
+                      <input id="LocalAnnEnabled" type="checkbox" ng-model="tmpOptions.localAnnounceEnabled"> <span translate>Local Discovery</span>
+                    </label>
+                  </div>
                 </div>
               </div>
             </div>
-            <div class="col-md-6">
-              <div class="form-group">
-                <div class="checkbox">
-                  <label>
-                    <input id="LocalAnnEnabled" type="checkbox" ng-model="tmpOptions.localAnnounceEnabled"> <span translate>Local Discovery</span>
-                  </label>
-                </div>
-              </div>
-              <div class="form-group">
-                <div class="checkbox">
-                  <label ng-if="upgradeInfo">
-                    <input id="AutoUpgradeEnabled" type="checkbox" ng-model="tmpOptions.autoUpgradeEnabled"> <span translate>Automatic upgrades</span>
-                  </label>
-                </div>
+
+            <div class="form-group">
+              <div class="checkbox">
+                <label>
+                  <input id="RelaysEnabled" type="checkbox" ng-model="tmpOptions.relaysEnabled"> <span translate>Enable Relaying</span>
+                </label>
               </div>
             </div>
+
             <div class="clearfix"></div>
             <div class="form-group">
-              <label translate for="GlobalAnnServersStr">Global Discovery Server</label>
+              <label translate for="RelayServersStr">Relay Servers</label>
+              <input ng-disabled="!tmpOptions.relaysEnabled" id="RelayServersStr" class="form-control" type="text" ng-model="tmpOptions._relayServersStr">
+            </div>
+
+            <div class="form-group">
+              <div class="checkbox">
+                <label>
+                  <input id="GlobalAnnEnabled" type="checkbox" ng-model="tmpOptions.globalAnnounceEnabled"> <span translate>Global Discovery</span>
+                </label>
+              </div>
+            </div>
+
+            <div class="clearfix"></div>
+            <div class="form-group">
+              <label translate for="GlobalAnnServersStr">Global Discovery Servers</label>
               <input ng-disabled="!tmpOptions.globalAnnounceEnabled" id="GlobalAnnServersStr" class="form-control" type="text" ng-model="tmpOptions._globalAnnounceServersStr">
             </div>
           </div>
@@ -104,6 +119,13 @@
                 </label>
               </div>
             </div>
+            <div class="form-group" ng-if="upgradeInfo">
+              <div class="checkbox">
+                <label>
+                  <input id="AutoUpgradeEnabled" type="checkbox" ng-model="tmpOptions.autoUpgradeEnabled"> <span translate>Automatic upgrades</span>
+                </label>
+              </div>
+            </div>
 
             <hr />
 

lib/connections/connections_tcp.go

@@ -23,6 +23,7 @@ func init() {
 }
 
 func tcpDialer(uri *url.URL, tlsCfg *tls.Config) (*tls.Conn, error) {
+	// Check that there is a port number in uri.Host, otherwise add one.
 	host, port, err := net.SplitHostPort(uri.Host)
 	if err != nil && strings.HasPrefix(err.Error(), "missing port") {
 		// addr is on the form "1.2.3.4"
@@ -32,13 +33,9 @@ func tcpDialer(uri *url.URL, tlsCfg *tls.Config) (*tls.Conn, error) {
 		uri.Host = net.JoinHostPort(host, "22000")
 	}
 
-	raddr, err := net.ResolveTCPAddr("tcp", uri.Host)
-	if err != nil {
-		l.Debugln(err)
-		return nil, err
-	}
-
-	conn, err := dialer.Dial(raddr.Network(), raddr.String())
+	// Don't try to resolve the address before dialing. The dialer may be a
+	// proxy, and we should let the proxy do the resolving in that case.
+	conn, err := dialer.Dial("tcp", uri.Host)
 	if err != nil {
 		l.Debugln(err)
 		return nil, err

lib/discover/cache.go

@@ -26,7 +26,7 @@ type CachingMux struct {
 	*suture.Supervisor
 	finders []cachedFinder
 	caches  []*cache
-	mut     sync.Mutex
+	mut     sync.RWMutex
 }
 
 // A cachedFinder is a Finder with associated cache timeouts.
@@ -54,7 +54,7 @@ type cachedError interface {
 func NewCachingMux() *CachingMux {
 	return &CachingMux{
 		Supervisor: suture.NewSimple("discover.cachingMux"),
-		mut:        sync.NewMutex(),
+		mut:        sync.NewRWMutex(),
 	}
 }
 
@@ -75,7 +75,7 @@ func (m *CachingMux) Add(finder Finder, cacheTime, negCacheTime time.Duration, p
 func (m *CachingMux) Lookup(deviceID protocol.DeviceID) (direct []string, relays []Relay, err error) {
 	var pdirect []prioritizedAddress
 
-	m.mut.Lock()
+	m.mut.RLock()
 	for i, finder := range m.finders {
 		if cacheEntry, ok := m.caches[i].Get(deviceID); ok {
 			// We have a cache entry. Lets see what it says.
@@ -129,7 +129,7 @@ func (m *CachingMux) Lookup(deviceID protocol.DeviceID) (direct []string, relays
 			m.caches[i].Set(deviceID, entry)
 		}
 	}
-	m.mut.Unlock()
+	m.mut.RUnlock()
 
 	direct = uniqueSortedAddrs(pdirect)
 	relays = uniqueSortedRelays(relays)
@@ -149,12 +149,12 @@ func (m *CachingMux) Error() error {
 }
 
 func (m *CachingMux) ChildErrors() map[string]error {
-	m.mut.Lock()
 	children := make(map[string]error, len(m.finders))
+	m.mut.RLock()
 	for _, f := range m.finders {
 		children[f.String()] = f.Error()
 	}
-	m.mut.Unlock()
+	m.mut.RUnlock()
 	return children
 }
 
@@ -163,7 +163,7 @@ func (m *CachingMux) Cache() map[protocol.DeviceID]CacheEntry {
 	// children's caches.
 	res := make(map[protocol.DeviceID]CacheEntry)
 
-	m.mut.Lock()
+	m.mut.RLock()
 	for i := range m.finders {
 		// Each finder[i] has a corresponding cache at cache[i]. Go through it
 		// and populate the total, if it's newer than what's already in there.
@@ -183,7 +183,7 @@ func (m *CachingMux) Cache() map[protocol.DeviceID]CacheEntry {
 			}
 		}
 	}
-	m.mut.Unlock()
+	m.mut.RUnlock()
 
 	return res
 }

lib/discover/cache_test.go

@@ -91,3 +91,55 @@ func (f *fakeDiscovery) String() string {
 func (f *fakeDiscovery) Cache() map[protocol.DeviceID]CacheEntry {
 	return nil
 }
+
+func TestCacheSlowLookup(t *testing.T) {
+	c := NewCachingMux()
+	c.ServeBackground()
+	defer c.Stop()
+
+	// Add a slow discovery service.
+
+	started := make(chan struct{})
+	f1 := &slowDiscovery{time.Second, started}
+	c.Add(f1, time.Minute, 0, 0)
+
+	// Start a lookup, which will take at least a second
+
+	t0 := time.Now()
+	go c.Lookup(protocol.LocalDeviceID)
+	<-started // The slow lookup method has been called so we're inside the lock
+
+	// It should be possible to get ChildErrors while it's running
+
+	c.ChildErrors()
+
+	// Only a small amount of time should have passed, not the full second
+
+	diff := time.Since(t0)
+	if diff > 500*time.Millisecond {
+		t.Error("ChildErrors was blocked for", diff)
+	}
+}
+
+type slowDiscovery struct {
+	delay   time.Duration
+	started chan struct{}
+}
+
+func (f *slowDiscovery) Lookup(deviceID protocol.DeviceID) (direct []string, relays []Relay, err error) {
+	close(f.started)
+	time.Sleep(f.delay)
+	return nil, nil, nil
+}
+
+func (f *slowDiscovery) Error() error {
+	return nil
+}
+
+func (f *slowDiscovery) String() string {
+	return "fake"
+}
+
+func (f *slowDiscovery) Cache() map[protocol.DeviceID]CacheEntry {
+	return nil
+}

lib/model/rwfolder.go

@@ -14,6 +14,7 @@ import (
 	"os"
 	"path/filepath"
 	"sort"
+	"strings"
 	"time"
 
 	"github.com/syncthing/syncthing/lib/config"
@@ -1493,6 +1494,14 @@ func removeDevice(devices []protocol.DeviceID, device protocol.DeviceID) []proto
 }
 
 func (p *rwFolder) moveForConflict(name string) error {
+	if strings.Contains(filepath.Base(name), ".sync-conflict-") {
+		l.Infoln("Conflict for", name, "which is already a conflict copy; not copying again.")
+		if err := osutil.Remove(name); err != nil && !os.IsNotExist(err) {
+			return err
+		}
+		return nil
+	}
+
 	if p.maxConflicts == 0 {
 		if err := osutil.Remove(name); err != nil && !os.IsNotExist(err) {
 			return err

lib/protocol/protocol_test.go

@@ -34,7 +34,6 @@ func TestMain(m *testing.M) {
 }
 
 func TestHeaderFunctions(t *testing.T) {
-	t.Parallel()
 	f := func(ver, id, typ int) bool {
 		ver = int(uint(ver) % 16)
 		id = int(uint(id) % 4096)
@@ -49,7 +48,6 @@ func TestHeaderFunctions(t *testing.T) {
 }
 
 func TestHeaderLayout(t *testing.T) {
-	t.Parallel()
 	var e, a uint32
 
 	// Version are the first four bits
@@ -75,7 +73,6 @@ func TestHeaderLayout(t *testing.T) {
 }
 
 func TestPing(t *testing.T) {
-	t.Parallel()
 	ar, aw := io.Pipe()
 	br, bw := io.Pipe()
 
@@ -95,7 +92,6 @@ func TestPing(t *testing.T) {
 }
 
 func TestVersionErr(t *testing.T) {
-	t.Parallel()
 	m0 := newTestModel()
 	m1 := newTestModel()
 
@@ -123,7 +119,6 @@ func TestVersionErr(t *testing.T) {
 }
 
 func TestTypeErr(t *testing.T) {
-	t.Parallel()
 	m0 := newTestModel()
 	m1 := newTestModel()
 
@@ -151,7 +146,6 @@ func TestTypeErr(t *testing.T) {
 }
 
 func TestClose(t *testing.T) {
-	t.Parallel()
 	m0 := newTestModel()
 	m1 := newTestModel()
 
@@ -187,7 +181,6 @@ func TestClose(t *testing.T) {
 }
 
 func TestElementSizeExceededNested(t *testing.T) {
-	t.Parallel()
 	m := ClusterConfigMessage{
 		ClientName: "longstringlongstringlongstringinglongstringlongstringlonlongstringlongstringlon",
 	}
@@ -198,7 +191,6 @@ func TestElementSizeExceededNested(t *testing.T) {
 }
 
 func TestMarshalIndexMessage(t *testing.T) {
-	t.Parallel()
 	f := func(m1 IndexMessage) bool {
 		for i, f := range m1.Files {
 			m1.Files[i].CachedSize = 0
@@ -219,7 +211,6 @@ func TestMarshalIndexMessage(t *testing.T) {
 }
 
 func TestMarshalRequestMessage(t *testing.T) {
-	t.Parallel()
 	f := func(m1 RequestMessage) bool {
 		return testMarshal(t, "request", &m1, &RequestMessage{})
 	}
@@ -230,7 +221,6 @@ func TestMarshalRequestMessage(t *testing.T) {
 }
 
 func TestMarshalResponseMessage(t *testing.T) {
-	t.Parallel()
 	f := func(m1 ResponseMessage) bool {
 		if len(m1.Data) == 0 {
 			m1.Data = nil
@@ -244,7 +234,6 @@ func TestMarshalResponseMessage(t *testing.T) {
 }
 
 func TestMarshalClusterConfigMessage(t *testing.T) {
-	t.Parallel()
 	f := func(m1 ClusterConfigMessage) bool {
 		return testMarshal(t, "clusterconfig", &m1, &ClusterConfigMessage{})
 	}
@@ -255,7 +244,6 @@ func TestMarshalClusterConfigMessage(t *testing.T) {
 }
 
 func TestMarshalCloseMessage(t *testing.T) {
-	t.Parallel()
 	f := func(m1 CloseMessage) bool {
 		return testMarshal(t, "close", &m1, &CloseMessage{})
 	}

man/syncthing-bep.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-BEP" "7" "January 01, 2016" "v0.12" "Syncthing"
+.TH "SYNCTHING-BEP" "7" "January 07, 2016" "v0.12" "Syncthing"
 .SH NAME
 syncthing-bep \- Block Exchange Protocol v1
 .

man/syncthing-config.5

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-CONFIG" "5" "January 01, 2016" "v0.12" "Syncthing"
+.TH "SYNCTHING-CONFIG" "5" "January 07, 2016" "v0.12" "Syncthing"
 .SH NAME
 syncthing-config \- Syncthing Configuration
 .
@@ -194,7 +194,8 @@ True if the folder is read only (Master mode; will not be modified by
 Syncthing) on this device.
 .TP
 .B rescanIntervalS
-The rescan interval, in seconds.
+The rescan interval, in seconds. Can be set to zero to disable when external
+plugins are used to trigger rescans.
 .TP
 .B ignorePerms
 True if the folder should ignore permissions.
@@ -527,7 +528,7 @@ Attempt to renew the lease after this many minutes.
 When scanning for UPnP devices, wait this long for responses.
 .TP
 .B urAccepted
-Whether the user as accepted to submit anonymous usage data. The default,
+Whether the user has accepted to submit anonymous usage data. The default,
 \fB0\fP, mean the user has not made a choice, and Syncthing will ask at some
 point in the future. \fB\-1\fP means no, a number above zero means that that
 version of usage reporting has been accepted.
@@ -540,7 +541,7 @@ reporting is enabled.
 The URL to post usage report data to, when enabled.
 .TP
 .B urPostInsecurely
-When true, the UR URL can be http instead of https, or have a self signed
+When true, the UR URL can be http instead of https, or have a self\-signed
 certificate. The default is \fBfalse\fP\&.
 .TP
 .B urInitialDelayS
@@ -564,13 +565,8 @@ Whether to cache the results of ignore pattern evaluation. Performance at
 the price of memory.
 .TP
 .B progressUpdateIntervalS
-.
-\fBNOTE:\fP
-.INDENT 7.0
-.INDENT 3.5
-Requires explanation.
-.UNINDENT
-.UNINDENT
+How often in seconds the progress of ongoing downloads is made available to
+the GUI.
 .TP
 .B symlinksEnabled
 Whether to sync symlinks, if supported by the system.
@@ -586,10 +582,10 @@ unless you\(aqre very short on memory, in which case you want to set this to
 .TP
 .B pingTimeoutS
 Ping\-timeout in seconds. Don\(aqt change it unless you are having issues due to
-slow response time (slow connection/cpu) and large index exchanges
+slow response time (slow connection/cpu) and large index exchanges.
 .TP
 .B pingIdleTimeS
-ping interval in seconds. Don\(aqt change it unless you feel it\(aqs necessary.
+Ping interval in seconds. Don\(aqt change it unless you feel it\(aqs necessary.
 .TP
 .B minHomeDiskFreePct
 The percentage of space that should be available on the partition holding
@@ -605,7 +601,7 @@ using the same configuration files) can cause issues. This is easy to do
 accidentally if you sync your home folder between devices. A common symptom
 of syncing configuration files is two devices ending up with the same Device ID.
 .sp
-If you want to use syncthing to backup your configuration files, it is recommended
+If you want to use Syncthing to backup your configuration files, it is recommended
 that the files you are backing up are in a folder\-master to prevent other
 devices from overwriting the per device configuration. The folder on the remote
 device(s) should not be used as configuration for the remote devices.

man/syncthing-device-ids.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-DEVICE-IDS" "7" "January 01, 2016" "v0.12" "Syncthing"
+.TH "SYNCTHING-DEVICE-IDS" "7" "January 07, 2016" "v0.12" "Syncthing"
 .SH NAME
 syncthing-device-ids \- Understanding Device IDs
 .

man/syncthing-event-api.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-EVENT-API" "7" "January 01, 2016" "v0.12" "Syncthing"
+.TH "SYNCTHING-EVENT-API" "7" "January 07, 2016" "v0.12" "Syncthing"
 .SH NAME
 syncthing-event-api \- Event API
 .

man/syncthing-faq.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-FAQ" "7" "January 01, 2016" "v0.12" "Syncthing"
+.TH "SYNCTHING-FAQ" "7" "January 07, 2016" "v0.12" "Syncthing"
 .SH NAME
 syncthing-faq \- Frequently Asked Questions
 .

man/syncthing-globaldisco.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-GLOBALDISCO" "7" "January 01, 2016" "v0.12" "Syncthing"
+.TH "SYNCTHING-GLOBALDISCO" "7" "January 07, 2016" "v0.12" "Syncthing"
 .SH NAME
 syncthing-globaldisco \- Global Discovery Protocol v3
 .

man/syncthing-localdisco.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-LOCALDISCO" "7" "January 01, 2016" "v0.12" "Syncthing"
+.TH "SYNCTHING-LOCALDISCO" "7" "January 07, 2016" "v0.12" "Syncthing"
 .SH NAME
 syncthing-localdisco \- Local Discovery Protocol v3
 .

man/syncthing-networking.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-NETWORKING" "7" "January 01, 2016" "v0.12" "Syncthing"
+.TH "SYNCTHING-NETWORKING" "7" "January 07, 2016" "v0.12" "Syncthing"
 .SH NAME
 syncthing-networking \- Firewall Setup
 .

man/syncthing-relay.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-RELAY" "7" "January 01, 2016" "v0.12" "Syncthing"
+.TH "SYNCTHING-RELAY" "7" "January 07, 2016" "v0.12" "Syncthing"
 .SH NAME
 syncthing-relay \- Relay Protocol v1
 .

man/syncthing-rest-api.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-REST-API" "7" "January 01, 2016" "v0.12" "Syncthing"
+.TH "SYNCTHING-REST-API" "7" "January 07, 2016" "v0.12" "Syncthing"
 .SH NAME
 syncthing-rest-api \- REST API
 .

man/syncthing-security.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-SECURITY" "7" "January 01, 2016" "v0.12" "Syncthing"
+.TH "SYNCTHING-SECURITY" "7" "January 07, 2016" "v0.12" "Syncthing"
 .SH NAME
 syncthing-security \- Security Principles
 .

man/syncthing-stignore.5

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-STIGNORE" "5" "January 01, 2016" "v0.12" "Syncthing"
+.TH "SYNCTHING-STIGNORE" "5" "January 07, 2016" "v0.12" "Syncthing"
 .SH NAME
 syncthing-stignore \- Prevent files from being synchronized to other nodes
 .

man/syncthing-versioning.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "TODO" "7" "January 01, 2016" "v0.12" "Syncthing"
+.TH "TODO" "7" "January 07, 2016" "v0.12" "Syncthing"
 .SH NAME
 Todo \- Keep automatic backups of deleted files by other nodes
 .

man/syncthing.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING" "1" "January 01, 2016" "v0.12" "Syncthing"
+.TH "SYNCTHING" "1" "January 07, 2016" "v0.12" "Syncthing"
 .SH NAME
 syncthing \- Syncthing
 .