Docs & translations update

An error on opening .stignore will satisfy os.IsNotExist() and not be
reported. Other errors will be reported and stop the folder, including
is-not-exist errors from #include as these are passed through fmt.Errorf.

Also fixes minor issue where we would not print cause of folder stopping
to the log.

Also fixes minor issue with capitalization of errors.

AUTHORS

@@ -1,6 +1,7 @@
 # This is the official list of Syncthing authors for copyright purposes.
 
 Aaron Bieber <qbit@deftly.net>
+Adam Piggott	<aD@simplypeachy.co.uk> <simplypeachy@users.noreply.github.com>
 Alexander Graf <register-github@alex-graf.de>
 Andrew Dunham <andrew@du.nham.ca>
 Antony Male <antony.male@gmail.com>
@@ -47,6 +48,7 @@ Lord Landon Agahnim <lordlandon@gmail.com>
 Marc Laporte <marc@marclaporte.com> <marc@laporte.name>
 Marc Pujol <kilburn@la3.org>
 Marcin Dziadus <dziadus.marcin@gmail.com>
+Matt Burke <mburke@amplify.com>
 Michael Jephcote <rewt0r@gmx.com> <Rewt0r@users.noreply.github.com>
 Michael Tilli <pyfisch@gmail.com>
 Pascal Jungblut <github@pascalj.com> <mail@pascal-jungblut.com>
@@ -56,7 +58,7 @@ Phill Luby <phill.luby@newredo.com>
 Piotr Bejda <piotrb10@gmail.com>
 Ryan Sullivan <kayoticsully@gmail.com>
 Sergey Mishin <ralder@yandex.ru>
-Stefan Tatschner <stefan@sevenbyte.org>
+Stefan Tatschner <stefan@sevenbyte.org> <rumpelsepp@sevenbyte.org>
 Tim Abell <tim@timwise.co.uk>
 Tobias Nygren <tnn@nygren.pp.se>
 Tomas Cerveny <kozec@kozec.com>

Godeps/Godeps.json

@@ -47,7 +47,8 @@
 		},
 		{
 			"ImportPath": "github.com/thejerf/suture",
-			"Rev": "fc7aaeabdc43fe41c5328efa1479ffea0b820978"
+			"Comment": "v1.0.1",
+			"Rev": "99c1f2d613756768fc4299acd9dc621e11ed3fd7"
 		},
 		{
 			"ImportPath": "github.com/vitrun/qart/coding",

Godeps/_workspace/src/github.com/thejerf/suture/README.md

@@ -43,3 +43,14 @@ easily fit into the OTP paradigm. It ought to someday be considered a good
 idea to distribute libraries that provide some sort of supervisor tree
 functionality out of the box. It is possible to provide this functionality
 without explicitly depending on the Suture library.
+
+Changelog
+---------
+
+suture uses semantic versioning.
+
+1. 1.0.0
+  * Initial release.
+2. 1.0.1
+  * Fixed data race on the .state variable.
+

Godeps/_workspace/src/github.com/thejerf/suture/suture.go

@@ -59,6 +59,7 @@ import (
 	"log"
 	"math"
 	"runtime"
+	"sync"
 	"sync/atomic"
 	"time"
 )
@@ -123,7 +124,6 @@ type Supervisor struct {
 	lastFail         time.Time
 	failures         float64
 	restartQueue     []serviceID
-	state            uint8
 	serviceCounter   serviceID
 	control          chan supervisorMessage
 	resumeTimer      <-chan time.Time
@@ -143,6 +143,9 @@ type Supervisor struct {
 	// a minimal chunk.
 	getNow    func() time.Time
 	getResume func(time.Duration) <-chan time.Time
+
+	sync.Mutex
+	state uint8
 }
 
 // Spec is used to pass arguments to the New function to create a
@@ -373,6 +376,7 @@ func (s *Supervisor) Add(service Service) ServiceToken {
 		supervisor.logBackoff = s.logBackoff
 	}
 
+	s.Lock()
 	if s.state == notRunning {
 		id := s.serviceCounter
 		s.serviceCounter++
@@ -380,8 +384,10 @@ func (s *Supervisor) Add(service Service) ServiceToken {
 		s.services[id] = service
 		s.restartQueue = append(s.restartQueue, id)
 
+		s.Unlock()
 		return ServiceToken{uint64(s.id)<<32 | uint64(id)}
 	}
+	s.Unlock()
 
 	response := make(chan serviceID)
 	s.control <- addService{service, response}
@@ -408,16 +414,19 @@ func (s *Supervisor) Serve() {
 	}
 
 	defer func() {
+		s.Lock()
 		s.state = notRunning
+		s.Unlock()
 	}()
 
+	s.Lock()
 	if s.state != notRunning {
-		// FIXME: Don't explain why I don't need a semaphore, just use one
-		// This doesn't use a semaphore because it's just a sanity check.
+		s.Unlock()
 		panic("Running a supervisor while it is already running?")
 	}
 
 	s.state = normal
+	s.Unlock()
 
 	// for all the services I currently know about, start them
 	for _, id := range s.restartQueue {
@@ -472,7 +481,9 @@ func (s *Supervisor) Serve() {
 			// excessive thrashing
 			// FIXME: Ought to permit some spacing of these functions, rather
 			// than simply hammering through them
+			s.Lock()
 			s.state = normal
+			s.Unlock()
 			s.failures = 0
 			s.logBackoff(s, false)
 			for _, id := range s.restartQueue {
@@ -499,7 +510,9 @@ func (s *Supervisor) handleFailedService(id serviceID, err interface{}, stacktra
 	}
 
 	if s.failures > s.failureThreshold {
+		s.Lock()
 		s.state = paused
+		s.Unlock()
 		s.logBackoff(s, true)
 		s.resumeTimer = s.getResume(s.failureBackoff)
 	}
@@ -511,7 +524,13 @@ func (s *Supervisor) handleFailedService(id serviceID, err interface{}, stacktra
 	// It is possible for a service to be no longer monitored
 	// by the time we get here. In that case, just ignore it.
 	if monitored {
-		if s.state == normal {
+		// this may look dangerous because the state could change, but this
+		// code is only ever run in the one goroutine that is permitted to
+		// change the state, so nothing else will.
+		s.Lock()
+		curState := s.state
+		s.Unlock()
+		if curState == normal {
 			s.runService(failedService, id)
 			s.logFailure(s, failedService, s.failures, s.failureThreshold, true, err, stacktrace)
 		} else {

Godeps/_workspace/src/github.com/thejerf/suture/suture_simple_test.go

@@ -17,7 +17,7 @@ func (i *Incrementor) Serve() {
 	for {
 		select {
 		case i.next <- i.current:
-			i.current += 1
+			i.current++
 		case <-i.stop:
 			// We sync here just to guarantee the output of "Stopping the service",
 			// so this passes the test reliably.

Godeps/_workspace/src/github.com/thejerf/suture/suture_test.go

@@ -478,6 +478,22 @@ func TestNilSupervisorAdd(t *testing.T) {
 	s.Add(s)
 }
 
+// https://github.com/thejerf/suture/issues/11
+//
+// The purpose of this test is to verify that it does not cause data races,
+// so there are no obvious assertions.
+func TestIssue11(t *testing.T) {
+	t.Parallel()
+
+	s := NewSimple("main")
+	s.ServeBackground()
+
+	subsuper := NewSimple("sub")
+	s.Add(subsuper)
+
+	subsuper.Add(NewService("may cause data race"))
+}
+
 // http://golangtutorials.blogspot.com/2011/10/gotest-unit-testing-and-benchmarking-go.html
 // claims test function are run in the same order as the source file...
 // I'm not sure if this is part of the contract, though. Especially in the
@@ -509,7 +525,7 @@ func (s *FailableService) Serve() {
 		everMultistarted = true
 		panic("Multi-started the same service! " + s.name)
 	}
-	s.existing += 1
+	s.existing++
 
 	s.started <- true
 
@@ -522,13 +538,13 @@ func (s *FailableService) Serve() {
 			case Happy:
 				// Do nothing on purpose. Life is good!
 			case Fail:
-				s.existing -= 1
+				s.existing--
 				if useStopChan {
 					s.stop <- true
 				}
 				return
 			case Panic:
-				s.existing -= 1
+				s.existing--
 				panic("Panic!")
 			case Hang:
 				// or more specifically, "hang until I release you"
@@ -537,7 +553,7 @@ func (s *FailableService) Serve() {
 				useStopChan = true
 			}
 		case <-s.shutdown:
-			s.existing -= 1
+			s.existing--
 			if useStopChan {
 				s.stop <- true
 			}

NICKS

@@ -18,6 +18,7 @@ brbecker	<brbecker@gmail.com>
 brendanlong	<self@brendanlong.com>
 brgmnn      <dan.arne.bergmann@gmail.com> <brgmnn@users.noreply.github.com>
 bsidhom		<bsidhom@gmail.com>
+burkemw3	<mburke@amplify.com>
 calmh		<jakob@nym.se>
 canton7	<antony.male@gmail.com>
 cdata		<chris@scriptolo.gy>
@@ -52,10 +53,11 @@ pluby		<phill.luby@newredo.com>
 pyfisch		<pyfisch@gmail.com>
 qbit		<qbit@deftly.net>
 ralder		<ralder@yandex.ru>
-rumpelsepp	<stefan@sevenbyte.org>
+rumpelsepp	<stefan@sevenbyte.org> <rumpelsepp@sevenbyte.org>
 sciurius	<jvromans@squirrel.nl>
 seehuhn		<voss@seehuhn.de>
 snnd		<dw@risu.io>
+simplypeachy	<aD@simplypeachy.co.uk> <simplypeachy@users.noreply.github.com>
 timabell	<tim@timwise.co.uk>
 tnn2		<tnn@nygren.pp.se>
 tojrobinson	<tully@tojr.org>

cmd/syncthing/main.go

@@ -214,11 +214,12 @@ func main() {
 	if runtime.GOOS == "windows" {
 		// On Windows, we use a log file by default. Setting the -logfile flag
 		// to "-" disables this behavior.
-
 		flag.StringVar(&logFile, "logfile", "", "Log file name (use \"-\" for stdout)")
 
 		// We also add an option to hide the console window
 		flag.BoolVar(&noConsole, "no-console", false, "Hide console window")
+	} else {
+		flag.StringVar(&logFile, "logfile", "-", "Log file name (use \"-\" for stdout)")
 	}
 
 	flag.StringVar(&generateDir, "generate", "", "Generate key and config in specified dir, then exit")
@@ -257,14 +258,9 @@ func main() {
 		guiAssets = locations[locGUIAssets]
 	}
 
-	if runtime.GOOS == "windows" {
-		if logFile == "" {
-			// Use the default log file location
-			logFile = locations[locLogFile]
-		} else if logFile == "-" {
-			// Don't use a logFile
-			logFile = ""
-		}
+	if logFile == "" {
+		// Use the default log file location
+		logFile = locations[locLogFile]
 	}
 
 	if showVersion {

cmd/syncthing/monitor.go

@@ -40,7 +40,7 @@ func monitorMain() {
 	var err error
 	var dst io.Writer = os.Stdout
 
-	if logFile != "" {
+	if logFile != "-" {
 		var fileDst io.Writer
 
 		fileDst, err = os.Create(logFile)

etc/linux-systemd/system/syncthing@.service

@@ -2,6 +2,7 @@
 Description=Syncthing - Open Source Continuous File Synchronization for %I
 Documentation=http://docs.syncthing.net/
 After=network.target
+Wants=syncthing-inotify@.service
 
 [Service]
 User=%i

etc/linux-systemd/user/syncthing.service

@@ -2,6 +2,7 @@
 Description=Syncthing - Open Source Continuous File Synchronization
 Documentation=http://docs.syncthing.net/
 After=network.target
+Wants=syncthing-inotify.service
 
 [Service]
 Environment=STNORESTART=yes

gui/assets/css/overrides.css

@@ -14,6 +14,7 @@ body {
 
 h1, h2, h3, h4, h5 {
     font-family: "Raleway", "Helvetica Neue", Helvetica, Arial, sans-serif;
+    line-height: 1.25;
 }
 
 ul+h5 {

gui/assets/lang/lang-bg.json

@@ -113,6 +113,8 @@
     "Override Changes": "Замени Промените",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Пътят до папката на този компютър. Ще бъде създадена ако не съществува. Символът тилда (~) може да бъде използван като заместител на",
     "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Пътят, където версиите да бъдат складирани(остави празно за папката .stversions).",
+    "Pause": "Пауза",
+    "Paused": "На пауза",
     "Please consult the release notes before performing a major upgrade.": "Моля прочети бележките по обновяването преди да започнеш.",
     "Please wait": "Моля изчакай",
     "Preview": "Преглед",
@@ -130,6 +132,7 @@
     "Restart": "Рестартирай",
     "Restart Needed": "Изискава се Рестартиране",
     "Restarting": "Рестартиране",
+    "Resume": "Пусни",
     "Reused": "Повторно използван",
     "Save": "Запази",
     "Scanning": "Сканиране",
@@ -209,6 +212,7 @@
     "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Когато добавяш нов идентификатор на папка помни, че той се използва за свързване на папките на различни устройства. Главни/малки букви са от значение и трябва да са еднакви на всички устройства.",
     "Yes": "Да",
     "You must keep at least one version.": "Трябва да пазиш поне една версия.",
+    "days": "дни",
     "full documentation": "пълна документация",
     "items": "артикула",
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} желае да сподели папка \"{{folder}}\"."

gui/assets/lang/lang-ca.json

@@ -113,6 +113,8 @@
     "Override Changes": "Sobreescriure Canvis",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Ruta de la carpeta a l'equip local. Si no existeix serà creada. El caràcter (~) es pot fer servir com a drecera de",
     "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Ruta on les versions s'haurien de guardar (deixa-ho buit per fer servir el directori .stversions per defecte a la carpeta)",
+    "Pause": "Pause",
+    "Paused": "Paused",
     "Please consult the release notes before performing a major upgrade.": "Si us plau consulta les notes de llançament abans de realitzar una actualització major.",
     "Please wait": "Si-us-plau espera",
     "Preview": "Vista prèvia",
@@ -130,6 +132,7 @@
     "Restart": "Reiniciar",
     "Restart Needed": "És Necessari Reiniciar",
     "Restarting": "Reiniciant",
+    "Resume": "Resume",
     "Reused": "Reutilitzat",
     "Save": "Guardar",
     "Scanning": "Escanejant",
@@ -209,6 +212,7 @@
     "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Quan s'afegeix una nova carpeta recorda que el ID d'aquesta s'utilitza per lligar repositoris entre els dispositius. Es distingeix entre majúscules i minúscules i ha de ser exactament iguals entre tots els dispositius.",
     "Yes": "Si",
     "You must keep at least one version.": "Has de mantenir com a mínim una versió.",
+    "days": "days",
     "full documentation": "documentació sencera",
     "items": "Elements",
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} vol compartir la carpeta \"{{folder}}\"."

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

@@ -113,6 +113,8 @@
     "Override Changes": "Sobreescriure els canvis",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Ruta a la carpeta local en l'ordinador. Es crearà si no existeix. El caràcter tilde (~) es pot utilitzar com a drecera",
     "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Ruta on les versions deurien estar emmagatzemades (deixar buit per a la carpeta .stversions en la carpeta).",
+    "Pause": "Pause",
+    "Paused": "Paused",
     "Please consult the release notes before performing a major upgrade.": "Per favor, consultar les notes de la versió abans de fer una actualització important.",
     "Please wait": "Per favor, espere",
     "Preview": "Vista prèvia",
@@ -130,6 +132,7 @@
     "Restart": "Reiniciar",
     "Restart Needed": "Reinici necesari",
     "Restarting": "Reiniciant",
+    "Resume": "Resume",
     "Reused": "Reutilitzat",
     "Save": "Gravar",
     "Scanning": "Rastrejant",
@@ -209,6 +212,7 @@
     "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Quant s'afig una nova carpeta, hi ha que tindre en compte que l'ID de la carpeta s'utilitza per a juntar les carpetes entre dispositius. Són sensibles a les majúscules i deuen coincidir exactament entre tots els dispositius.",
     "Yes": "Sí",
     "You must keep at least one version.": "Es deu mantindre al menys una versió.",
+    "days": "days",
     "full documentation": "Documentació completa",
     "items": "Elements",
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} vol compartit la carpeta \"{{folder}}\"."

gui/assets/lang/lang-cs.json

@@ -113,6 +113,8 @@
     "Override Changes": "Přepsat změny",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Cesta k adresáři na lokálním počítači. Pokud neexistuje, bude vytvořen. Znak vlnovky (~) může být použit jako zkratka pro",
     "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Cesta pro ukládání verzí (nechat prázdné pro výchozí podadresář .stversions v adresářích).",
+    "Pause": "Pozastavit",
+    "Paused": "Pozastaveno",
     "Please consult the release notes before performing a major upgrade.": "Před spuštěním důležité aktualizace si nejdříve přečtěte poznámky k vydání nové verze.",
     "Please wait": "Chvíli strpení",
     "Preview": "Náhled",
@@ -130,6 +132,7 @@
     "Restart": "Restart",
     "Restart Needed": "Je nutný restart",
     "Restarting": "Restartuji",
+    "Resume": "Pokračovat",
     "Reused": "Opakovaně použité",
     "Save": "Uložit",
     "Scanning": "Skenování",
@@ -154,7 +157,7 @@
     "Source Code": "Zdrojový kód",
     "Staggered File Versioning": "Postupné verzování souborů",
     "Start Browser": "Otevřít prohlížeč",
-    "Statistics": "Statistika",
+    "Statistics": "Statistiky",
     "Stopped": "Pozastaveno",
     "Support": "Podpora",
     "Sync Protocol Listen Addresses": "Adresa naslouchání synchronizačního protokolu",
@@ -209,6 +212,7 @@
     "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Při přidávání nového adresáře mějte na paměti, že jeho ID je použito ke svázání adresářů napříč přístoji. Rozlišují se malá a velká písmena a musí přesně souhlasit mezi všemi přístroji.",
     "Yes": "Ano",
     "You must keep at least one version.": "Je třeba ponechat alespoň jednu verzi.",
+    "days": "dní",
     "full documentation": "plná dokumentace",
     "items": "položky",
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} chce sdílet adresář \"{{folder}}\"."

gui/assets/lang/lang-de.json

@@ -15,7 +15,7 @@
     "All Data": "Alle Daten",
     "Allow Anonymous Usage Reporting?": "Übertragung von anonymen Nutzungsberichten erlauben?",
     "Alphabetic": "Alphabetisch",
-    "An external command handles the versioning. It has to remove the file from the synced folder.": "Ein externer Programmaufruf handhabt die Versionierung. Es muss die Datei aus dem zu synchronisierendem Ordner entfernen.",
+    "An external command handles the versioning. It has to remove the file from the synced folder.": "Ein externer Programmaufruf handhabt die Versionierung. Es muss die Datei aus dem zu synchronisierendem Verzeichnis entfernen.",
     "Anonymous Usage Reporting": "Anonymer Nutzungsbericht",
     "Any devices configured on an introducer device will be added to this device as well.": "Alle Geräte, die beim Verteiler eingetragen sind, werden auch bei diesem Gerät eingetragen",
     "Automatic upgrades": "automatische Updates",
@@ -23,7 +23,7 @@
     "Bugs": "Fehler",
     "CPU Utilization": "Prozessorauslastung",
     "Changelog": "Änderungsprotokoll",
-    "Clean out after": "Aufräumen nach",
+    "Clean out after": "Löschen nach",
     "Close": "Schließen",
     "Command": "Kommando",
     "Comment, when used at the start of a line": "Kommentar, wenn am Anfang der Zeile benutzt.",
@@ -33,9 +33,9 @@
     "Copied from original": "Vom Original kopiert",
     "Copyright © 2015 the following Contributors:": "Copyright © 2015 die folgenden Unterstützer:",
     "Delete": "Löschen",
-    "Deleted": "gelöscht",
+    "Deleted": "Gelöscht",
     "Device ID": "Geräte ID",
-    "Device Identification": "Gerät Identifikation",
+    "Device Identification": "Geräte Identifikation",
     "Device Name": "Gerätename",
     "Device {%device%} ({%address%}) wants to connect. Add new device?": "Gerät {{device}} ({{address}}) möchte sich verbinden. Gerät hinzufügen?",
     "Devices": "Geräte",
@@ -47,19 +47,19 @@
     "Edit": "Bearbeiten",
     "Edit Device": "Gerät bearbeiten",
     "Edit Folder": "Verzeichnis bearbeiten",
-    "Editing": "Bearbeiten",
+    "Editing": "Bearbeitet",
     "Enable UPnP": "UPnP aktivieren",
-    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Geben Sie durch Komma getrennte Adressen an (\"tcp://ip:port\", \"tcp://host:port\") oder \"dynamic\", um die Adresse automatisch zu ermitteln.",
+    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Kommagetrennte Adressen (\"tcp://ip:port\", \"tcp://host:port\") oder \"dynamic\" eingeben, um die Adresse automatisch zu ermitteln.",
     "Enter ignore patterns, one per line.": "Geben Sie Ignoriermuster ein, eines pro Zeile.",
     "Error": "Fehler",
     "External File Versioning": "Externe Dateiversionierung",
-    "Failed Items": "Fehlgeschlagene Dateien",
+    "Failed Items": "Fehlgeschlagene Objekte",
     "File Pull Order": "Dateiübertragungsreihenfolge",
     "File Versioning": "Dateiversionierung",
     "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Dateizugriffsrechte beim Suchen nach Veränderungen ignorieren. Bei FAT-Dateisystemen zu verwenden.",
-    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Dateien werden, bevor Syncthing sie löscht oder ersetzt, als datierte Versionen in ein Verzeichnis namens .stversions verschoben.",
-    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Dateien werden, bevor Syncthing sie löscht oder ersetzt, als datierte Versionen in ein Verzeichnis namens .stversions verschoben.",
-    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Dateien sind vor Veränderung durch andere Geräte geschützt. Auf diesem Gerät durchgeführte Veränderungen werden aber auf den Rest des Verbunds übertragen.",
+    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Wenn Dateien von Syncthing ersetzt oder gelöscht werden sollen, werden sie vorher in den .stversions Ordner verschoben.",
+    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Dateien werden, bevor Syncthing sie löscht oder ersetzt, datiert in das Verzeichnis .stversions verschoben.",
+    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Dateien sind auf diesem Gerät schreibgeschützt. Auf diesem Gerät durchgeführte Veränderungen werden aber auf den Rest des Verbunds übertragen.",
     "Folder": "Verzeichnis",
     "Folder ID": "Verzeichnis ID",
     "Folder Master": "Master Verzeichnis - schreibgeschützt",
@@ -71,7 +71,7 @@
     "GUI Listen Addresses": "Adresse(n) für die Benutzeroberfläche",
     "Generate": "Generieren",
     "Global Discovery": "Globale Gerätesuche",
-    "Global Discovery Server": "Globale(r) Indexserver",
+    "Global Discovery Server": "Globaler Gerätesuchserver",
     "Global State": "Globaler Status",
     "Help": "Hilfe",
     "Home page": "Homepage",
@@ -93,7 +93,7 @@
     "Major Upgrade": "Hauptversionsupgrade",
     "Maximum Age": "Höchstalter",
     "Metadata Only": "Nur Metadaten",
-    "Minimum Free Disk Space": "Minimal freier Fetsplattenspeicher",
+    "Minimum Free Disk Space": "Minimal freier Festplattenspeicher",
     "Move to top of queue": "An den Anfang der Warteschlange setzen",
     "Multi level wildcard (matches multiple directory levels)": "Verschachteltes Maskenzeichen (wird für verschachtelte Verzeichnisse verwendet)",
     "Never": "Nie",
@@ -111,17 +111,19 @@
     "Out of Sync Items": "Nicht synchronisierte Objekte",
     "Outgoing Rate Limit (KiB/s)": "Limit Datenrate (ausgehend) (KB/s)",
     "Override Changes": "Änderungen überschreiben",
-    "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Pfad zum Verzeichnis auf dem lokalen Rechner. Wird erzeugt, wenn es nicht existiert. Das Tilden-Zeichen (~) kann als Abkürzung benutzt werden für",
-    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Pfad in dem die Versionen gespeichert werden sollen (ohne Angabe wird das Verzeichnis .stversions im Verzeichnis verwendet).",
-    "Please consult the release notes before performing a major upgrade.": "BItte lesen Sie die Veröffentlichungsnotizen bevor Sie eine neue Hauptversion installieren.",
+    "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Pfad zum Verzeichnis auf dem lokalen Gerät. Ordner werden erzeugt, wenn sie nicht existieren. Das Tilden-Zeichen (~) kann als Abkürzung benutzt werden für",
+    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Pfad in dem alte Dateiversionen gespeichert werden sollen (ohne Angabe wird das Verzeichnis .stversions im Verzeichnis verwendet).",
+    "Pause": "Pause",
+    "Paused": "Pausiert",
+    "Please consult the release notes before performing a major upgrade.": "Bitte lesen Sie die Veröffentlichungsnotizen bevor Sie eine neue Hauptversion installieren.",
     "Please wait": "Bitte warten",
     "Preview": "Vorschau",
     "Preview Usage Report": "Vorschau des Nutzungsberichts",
-    "Quick guide to supported patterns": "Schnellanleitung zu den unterstützten Suchstrukturen",
+    "Quick guide to supported patterns": "Schnellanleitung zu den unterstützten Mustern",
     "RAM Utilization": "RAM Auslastung",
     "Random": "Zufall",
-    "Relayed via": "Relayed via",
-    "Relays": "Relays",
+    "Relayed via": "Weitergeleitet über",
+    "Relays": "Weiterleitungen",
     "Release Notes": "Veröffentlichungsnotizen",
     "Remove": "Entfernen",
     "Rescan": "Neu scannen",
@@ -130,9 +132,10 @@
     "Restart": "Neustart",
     "Restart Needed": "Neustart benötigt",
     "Restarting": "Wird neu gestartet",
+    "Resume": "Fortfahren",
     "Reused": "Erneut benutzt",
     "Save": "Speichern",
-    "Scanning": "Scanning",
+    "Scanning": "Scannen",
     "Select the devices to share this folder with.": "Wähle die Geräte aus, mit denen Du dieses Verzeichnis teilen willst.",
     "Select the folders to share with this device.": "Wähle die Verzeichnisse aus, die du mit diesem Gerät teilen möchtest",
     "Settings": "Einstellungen",
@@ -144,8 +147,8 @@
     "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",
-    "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 weitergegeben.",
-    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Wird anstatt der Geräte ID im Verbunds-Status angezeigt. Wird auf den Namen aktualisiert, den das Gerät angibt.",
+    "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 anstatt der Geräte ID im Verbunds-Status angezeigt.Wird auf den Namen aktualisiert, den das Gerät angibt, wenn nichts eingetragen wird.",
     "Shutdown": "Herunterfahren",
     "Shutdown Complete": "Vollständig Heruntergefahren",
     "Simple File Versioning": "Einfache Dateiversionierung",
@@ -160,13 +163,13 @@
     "Sync Protocol Listen Addresses": "Adresse(n) für das Synchronisierungsprotokoll",
     "Syncing": "Synchronisiere",
     "Syncthing has been shut down.": "Syncthing wurde heruntergefahren.",
-    "Syncthing includes the following software or portions thereof:": "Syncthing enthält die folgende Software oder Teile davon:",
+    "Syncthing includes the following software or portions thereof:": "Syncthing enthält die folgende Software oder Teile von:",
     "Syncthing is restarting.": "Syncthing wird neu gestartet",
     "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.": "Es scheint als ob Syncthing ein Problem mit der Verarbeitung ihrer Eingabe hat. Bitte laden sie die Seite neu oder führen sie einen Neustart von Syncthing durch, falls das Problem weiterhin besteht.",
+    "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 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 nicht aktiviert. Syncthing muss neugestartet werden um die neue Konfiguration zu übernehmen.",
+    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Die Konfiguration wurde gespeichert, aber noch nicht aktiviert. Syncthing muss neugestartet werden, um die neue Konfiguration zu übernehmen.",
     "The device ID cannot be blank.": "Die Geräte ID darf nicht leer sein.",
     "The device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "Die hier einzutragende Geräte ID kann im \"Bearbeiten > Zeige ID\"-Dialog auf dem anderen Gerät gefunden werden. Leerzeichen und Bindestriche sind optional (werden ignoriert).",
     "The encrypted usage report is sent daily. It is used to track common platforms, folder sizes and app versions. If the reported data set is changed you will be prompted with this dialog again.": "Der verschlüsselte Nutzungsbericht wird täglich gesendet. Er wird verwendet, um Statistiken über verwendete Betriebssysteme, Verzeichnis-Größen und Programm-Versionen zu erstellen. Sollte der Bericht in Zukunft weitere Daten erfassen, wird dieses Fenster erneut angezeigt.",
@@ -175,19 +178,19 @@
     "The folder ID cannot be blank.": "Die Verzeichnis ID darf nicht leer sein.",
     "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "Die Verzeichnis ID muss eine kurze Bezeichnung haben (64 Zeichen oder weniger). Sie darf nur aus Buchstaben, Zahlen und dem Punkt- (.), Bindestrich- (-), und Unterstrich- (_) Zeichen bestehen.",
     "The folder ID must be unique.": "Die Verzeichnis ID darf nur einmal existieren.",
-    "The folder path cannot be blank.": "Der Verzeichnispfad darf nicht leer sein",
-    "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "Es wird in folgenden Abständen versioniert: in der ersten Stunde wird alle 30 Sekunden eine Version behalten, am ersten Tag eine jede Stunde, in den ersten 30 Tagen eine jeden Tag, danach wird bis zum Höchstalter eine Version pro Woche beibehalten.",
-    "The following items could not be synchronized.": "Die folgenden Dateien konnten nicht synchronisiert werden.",
+    "The folder path cannot be blank.": "Der Verzeichnispfad darf nicht leer sein.",
+    "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "Es wird in folgenden Abständen versioniert: In der ersten Stunde wird alle 30 Sekunden eine Version behalten, am ersten Tag eine jede Stunde, in den ersten 30 Tagen eine jeden Tag. Danach wird bis zum angegebenen Höchstalter eine Version pro Woche behalten.",
+    "The following items could not be synchronized.": "Die folgenden Objekte konnten nicht synchronisiert werden.",
     "The maximum age must be a number and cannot be blank.": "Das Höchstalter muss angegeben werden und eine Zahl sein.",
-    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Die längste Zeit, die alte Versionen vorgehalten werden (in Tagen, 0 bedeutet, alte Versionen für immer zu behalten).",
+    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Die längste Zeit, die alte Versionen vorgehalten werden (in Tagen) (0 um alte Versionen für immer zu behalten).",
     "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "Der Prozentsatz des minimal freien Festplattenspeichers muss eine nichtnegative Zahl zwischen (inklusive) 0 und 100 sein. ",
-    "The number of days must be a number and cannot be blank.": "Die Anzahl von Versionen muss eine Zahl und darf nicht leer sein.",
+    "The number of days must be a number and cannot be blank.": "Die Anzahl von Versionen muss eine Ganzzahl und darf nicht leer sein.",
     "The number of days to keep files in the trash can. Zero means forever.": "Dauer in Tagen für welche die Dateien aufgehoben werden sollen. 0 bedeutet für immer.",
-    "The number of old versions to keep, per file.": "Anzahl der alten Versionen, die von jeder Datei gespeichert werden sollen.",
-    "The number of versions must be a number and cannot be blank.": "Die Anzahl von Versionen muss eine Zahl und darf nicht leer sein.",
+    "The number of old versions to keep, per file.": "Anzahl der alten Versionen, die von jeder Datei behalten werden sollen.",
+    "The number of versions must be a number and cannot be blank.": "Die Anzahl von Versionen muss eine Ganzzahl und darf nicht leer sein.",
     "The path cannot be blank.": "Der Pfad darf nicht leer sein.",
-    "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 von Sekunden sein.",
+    "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 is a major version upgrade.": "Dies ist eine neue Hauptversion.",
     "Trash Can File Versioning": "Papierkorb Dateiversionierung",
@@ -195,7 +198,7 @@
     "Unshared": "Ungeteilt",
     "Unused": "Ungenutzt",
     "Up to Date": "Aktuell",
-    "Updated": "aktualisiert",
+    "Updated": "Aktualisiert",
     "Upgrade": "Upgrade",
     "Upgrade To {%version%}": "Update auf {{version}}",
     "Upgrading": "Wird aktualisiert",
@@ -204,12 +207,13 @@
     "Use HTTPS for GUI": "HTTPS für Benutzeroberfläche benutzen",
     "Version": "Version",
     "Versions Path": "Versionierungspfad",
-    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Alte Versionen werden automatisch gelöscht, wenn sie älter als das angegebene Höchstalter sind oder die Höchstzahl der Dateien je Zeitabschnitt überschritten wird.",
-    "When adding a new device, keep in mind that this device must be added on the other side too.": "Beachte beim Hinzufügen eines neuen Gerätes, dass dieses Gerät auch auf der Gegenseite hinzugefügt werden muss.",
-    "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Beim Hinzufügen eines neuen Verzeichnisses beachte, dass die Verzeichnis ID dazu verwendet wird, Verzeichnisse zwischen Geräten zu verbinden. Die ID muss also auf allen Geräten gleich sein, die Groß- und Kleinschreibung muss dabei beachtet werden.",
+    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Alte Dateiversionen werden automatisch gelöscht, wenn sie älter als das angegebene Höchstalter sind oder die angegebene Höchstzahl an Dateien erreicht ist.",
+    "When adding a new device, keep in mind that this device must be added on the other side too.": "Beachte beim Hinzufügen eines neuen Gerätes, dass dieses Gerät auch auf den anderen Geräten hinzugefügt werden muss.",
+    "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Beachte bitte beim Hinzufügen eines neuen Verzeichnisses, dass die Verzeichnis ID dazu verwendet wird, Verzeichnisse zwischen Geräten zu verbinden. Die ID muss also auf allen Geräten gleich sein, die Groß- und Kleinschreibung muss dabei beachtet werden.",
     "Yes": "Ja",
     "You must keep at least one version.": "Du musst mindestens eine Version behalten.",
+    "days": "Tage",
     "full documentation": "Komplette Dokumentation",
-    "items": "Einträge",
+    "items": "Objekte",
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} möchte das Verzeichnis \"{{folder}}\" teilen."
 }

gui/assets/lang/lang-el.json

@@ -113,6 +113,8 @@
     "Override Changes": "Να αντικατασταθούν οι αλλαγές",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Μονοπάτι του φακέλου σε αυτόν τον υπολογιστή. Αν δεν υπάρχει θα δημιουργηθεί. Η περισπωμένη (~) μπορεί να μπει σαν συντόμευση για το",
     "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Ο φάκελος στον οποίο θα αποθηκεύονται οι εκδόσεις των αρχείων (αν δεν οριστεί θα αποθηκεύονται στον υποφάκελο .stversions)",
+    "Pause": "Pause",
+    "Paused": "Paused",
     "Please consult the release notes before performing a major upgrade.": "Παρακαλούμε, πριν από την εκτέλεση μιας σημαντικής αναβάθμισης, να συμβουλευτείς το σημείωμα που τη συνοδεύει.  ",
     "Please wait": "Παρακαλώ περιμένετε",
     "Preview": "Προεπισκόπηση",
@@ -130,6 +132,7 @@
     "Restart": "Επανεκκίνηση",
     "Restart Needed": "Απαιτείται επανεκκίνηση",
     "Restarting": "Επανεκκίνηση",
+    "Resume": "Resume",
     "Reused": "Χρησιμοποιήθηκε ξανά",
     "Save": "Αποθήκευση",
     "Scanning": "Έλεγχος για αλλαγές",
@@ -209,6 +212,7 @@
     "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Όταν προσθέτεις έναν νέο φάκελο, θυμήσου πως η ταυτότητα ενός φακέλου χρησιμοποιείται για να να συσχετίσει φακέλους μεταξύ συσκευών. Η ταυτότητα του φακέλου θα πρέπει να είναι η ίδια σε όλες τις συσκευές και έχουν σημασία τα πεζά ή κεφαλαία γράμματα.",
     "Yes": "Ναι",
     "You must keep at least one version.": "Πρέπει να τηρήσεις τουλάχιστον μια έκδοση.",
+    "days": "days",
     "full documentation": "πλήρης τεκμηρίωση",
     "items": "εγγραφές",
     "{%device%} wants to share folder \"{%folder%}\".": "Η συσκευή {{device}} θέλει να μοιράσει τον φάκελο «{{folder}}»."

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

@@ -113,6 +113,8 @@
     "Override Changes": "Override Changes",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for",
     "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Path where versions should be stored (leave empty for the default .stversions folder in the folder).",
+    "Pause": "Pause",
+    "Paused": "Paused",
     "Please consult the release notes before performing a major upgrade.": "Please consult the release notes before performing a major upgrade.",
     "Please wait": "Please wait",
     "Preview": "Preview",
@@ -130,6 +132,7 @@
     "Restart": "Restart",
     "Restart Needed": "Restart Needed",
     "Restarting": "Restarting",
+    "Resume": "Resume",
     "Reused": "Reused",
     "Save": "Save",
     "Scanning": "Scanning",
@@ -209,6 +212,7 @@
     "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.",
     "Yes": "Yes",
     "You must keep at least one version.": "You must keep at least one version.",
+    "days": "days",
     "full documentation": "full documentation",
     "items": "items",
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} wants to share folder \"{{folder}}\"."

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

@@ -113,6 +113,8 @@
     "Override Changes": "Anular cambios",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Ruta a la carpeta en la máquina local. Se creará si no existe. El carácter de la tilde (~) puede usarse como atajo.",
     "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Ruta donde se almacenarán las versiones (dejar vacío para usar la carpeta por defecto \".stversions\").",
+    "Pause": "Pause",
+    "Paused": "Paused",
     "Please consult the release notes before performing a major upgrade.": "Por favor, consultar las notas de la versión antes de realizar una actualización importante.",
     "Please wait": "Por favor, espere",
     "Preview": "Vista previa",
@@ -130,6 +132,7 @@
     "Restart": "Reiniciar",
     "Restart Needed": "Reinicio necesario",
     "Restarting": "Reiniciando",
+    "Resume": "Resume",
     "Reused": "Reutilizado",
     "Save": "Guardar",
     "Scanning": "Rastreando",
@@ -209,6 +212,7 @@
     "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Cuando añada una nueva carpeta, tenga en cuenta que su ID se usa para unir carpetas entre dispositivos. Son sensibles a las mayúsculas y deben coincidir exactamente entre todos los dispositivos.",
     "Yes": "Si",
     "You must keep at least one version.": "Debes mantener al menos una versión.",
+    "days": "days",
     "full documentation": "Documentación completa",
     "items": "Elementos",
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} quiere compartir la carpeta \"{{folder}}\"."

gui/assets/lang/lang-es.json

@@ -7,11 +7,11 @@
     "Add": "Agregar",
     "Add Device": "Agregar Dispositivo",
     "Add Folder": "Agregar Repositorio",
-    "Add new folder?": "¿Agregar nuevo repositorio?",
+    "Add new folder?": "¿Agregar nueva carpeta?",
     "Address": "Dirección",
     "Addresses": "Direcciones",
-    "Advanced": "Advanced",
-    "Advanced Configuration": "Advanced Configuration",
+    "Advanced": "Avanzada",
+    "Advanced Configuration": "Configuración avanzada",
     "All Data": "Todos los datos",
     "Allow Anonymous Usage Reporting?": "Permitir reporte anónimo de uso?",
     "Alphabetic": "Alfabético",
@@ -19,7 +19,7 @@
     "Anonymous Usage Reporting": "Reporte anónimo de uso",
     "Any devices configured on an introducer device will be added to this device as well.": "Cualquier dispositivo configurado en un dispositivo introductor será también agregado a este dispositivo.",
     "Automatic upgrades": "Actualizaciones automáticas",
-    "Be careful!": "Be careful!",
+    "Be careful!": "¡Sé cuidadoso!",
     "Bugs": "Errores",
     "CPU Utilization": "Uso de CPU",
     "Changelog": "Registro de cambios",
@@ -53,14 +53,14 @@
     "Enter ignore patterns, one per line.": "Añadir patrones de exclusión, uno por línea.",
     "Error": "Error",
     "External File Versioning": "Control de versiones externo",
-    "Failed Items": "Failed Items",
+    "Failed Items": "Artículos fallidos",
     "File Pull Order": "Orden para coger ficheros",
     "File Versioning": "Control de versiones",
     "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Los permisos de archivo son ignorados al buscar cambios. Usar el sistemas de archivos FAT.",
     "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Los archivos son movidos al directorio .stversions cuando son reemplazados o eliminados por Syncthing.",
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Lo archivos son movidos al directorio .stversions y renombrados a versiones marcadas por fecha cuando son reemplazados o eliminados por Syncthing,",
     "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Los archivos están protegidos frente a los cambios realizados en otros dispositivos, peros los cambios realizados en este dispositivo serán envíados al resto del grupo",
-    "Folder": "Folder",
+    "Folder": "Carpeta",
     "Folder ID": "ID del repositorio",
     "Folder Master": "Repositorio maestro",
     "Folder Path": "Ruta del repositorio",
@@ -106,13 +106,15 @@
     "OK": "OK",
     "Off": "Apagado",
     "Oldest First": "Antiguo primero",
-    "Options": "Options",
+    "Options": "Opciones",
     "Out of Sync": "Out of Sync",
     "Out of Sync Items": "Ítems no sincronizados",
     "Outgoing Rate Limit (KiB/s)": "Tasa máxima de envío (KiB/s)",
     "Override Changes": "Reemplazar los cambios",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Ruta del repositorio en el equipo local. Será creado si no existe. El carácter tilde (~) puede ser utilizado como atajo de ",
     "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Ruta donde serán guardas las versiones (dejar vacío para usar el directorio predifinido \".stversions\" en el repositorio)",
+    "Pause": "Pausa",
+    "Paused": "En pausa",
     "Please consult the release notes before performing a major upgrade.": "Por favor consulta las notas de lanzamiento antes de realizar una actualizacón mayor.",
     "Please wait": "Aguarde por favor",
     "Preview": "Vista previa",
@@ -123,13 +125,14 @@
     "Relayed via": "Relayed via",
     "Relays": "Relays",
     "Release Notes": "Notas de lanzamiento",
-    "Remove": "Remove",
+    "Remove": "Eliminar",
     "Rescan": "Reescanear",
     "Rescan All": "Reescanear todo",
     "Rescan Interval": "Intervalo de reescaneo",
     "Restart": "Reiniciar",
     "Restart Needed": "Es necesario reiniciar",
     "Restarting": "Reiniciando",
+    "Resume": "Resume",
     "Reused": "Reutilizado",
     "Save": "Guardar",
     "Scanning": "Actualización",
@@ -154,7 +157,7 @@
     "Source Code": "Código fuente",
     "Staggered File Versioning": "Versiones del archivo escalonado",
     "Start Browser": "Iniciar navegador",
-    "Statistics": "Statistics",
+    "Statistics": "Estadísticas",
     "Stopped": "Parado",
     "Support": "Soporte",
     "Sync Protocol Listen Addresses": "Dirección de escucha del protocolo de sincronización",
@@ -177,7 +180,7 @@
     "The folder ID must be unique.": "La ID del repositorio debe ser única.",
     "The folder path cannot be blank.": "La ruta del repositorio no puede estar vacía.",
     "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "Los siguientes intervalos se utilizan: para la primera hora una versión se mantiene cada 30 segundos, para el primer día de una versión se mantiene cada hora, durante los primeros 30 días de la versión se mantiene todos los días, hasta que la edad máxima de una versión se mantiene cada semana.",
-    "The following items could not be synchronized.": "The following items could not be synchronized.",
+    "The following items could not be synchronized.": "Los siguientes artículos no pueden ser sincronizados.",
     "The maximum age must be a number and cannot be blank.": "La edad máxima debe ser un número y no puede estar en blanco.",
     "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "El tiempo máximo para mantener una versión (en días, establece en 0 para mantener versiones para siempre).",
     "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).",
@@ -209,6 +212,7 @@
     "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Al agregar un nuevo repositorio, tenga en cuenta que la ID del repositorio se utiliza para conectar los repositorios entre dispositivos. Se distingue entre mayúsculas y minúsculas y debe ser exactamente igual en todos los dispositivos.",
     "Yes": "Sí",
     "You must keep at least one version.": "Debe mantener al menos una versión",
+    "days": "days",
     "full documentation": "documentación completa",
     "items": "ítems",
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} quiere compartir repositorio \"{{folder}}\"."

gui/assets/lang/lang-fi.json

@@ -113,6 +113,8 @@
     "Override Changes": "Ohita muutokset",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Polku kansioon paikallisella tietokoneella. Kansio luodaan, ellei sitä ole olemassa. Tilde-merkkiä (~) voidaan käyttää oikotienä polulle",
     "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Polku jonne versiot tullaan tallentamaan (jätä tyhjäksi oletusvalintaa .stversions varten).",
+    "Pause": "Pause",
+    "Paused": "Paused",
     "Please consult the release notes before performing a major upgrade.": "Please consult the release notes before performing a major upgrade.",
     "Please wait": "Ole hyvä ja odota",
     "Preview": "Esikatselu",
@@ -130,6 +132,7 @@
     "Restart": "Käynnistä uudelleen",
     "Restart Needed": "Uudelleenkäynnistys tarvitaan",
     "Restarting": "Käynnistetään uudelleen",
+    "Resume": "Resume",
     "Reused": "Uudelleenkäytetty",
     "Save": "Tallenna",
     "Scanning": "Skannataan",
@@ -209,6 +212,7 @@
     "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Lisättäessä uutta kansiota, muista että kansion ID:tä käytetään solmimaan kansiot yhteen laitteiden välillä. Ne ovat riippuvaisia kirjankoosta ja niiden tulee täsmätä kaikkien laitteiden välillä.",
     "Yes": "Kyllä",
     "You must keep at least one version.": "Sinun tulee säilyttää ainakin yksi versio.",
+    "days": "days",
     "full documentation": "täysi dokumentaatio",
     "items": "kohteet",
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} haluaa jakaa kansion \"{{folder}}\"."

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

@@ -113,6 +113,8 @@
     "Override Changes": "Écraser les changements",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Le chemin du dossier sur l'ordinateur local sera créé si il n'existe pas. Le caractère tilde (~) peut être utilisé comme raccourci vers",
     "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Chemin où les versions doivent être conservées (laisser vide pour le chemin par défaut de .stversions dans le répertoire)",
+    "Pause": "Pause",
+    "Paused": "En pause",
     "Please consult the release notes before performing a major upgrade.": "Veuillez consulter les notes de version avant de réaliser une mise à jour majeure.",
     "Please wait": "Merci de patienter",
     "Preview": "Aperçu",
@@ -130,6 +132,7 @@
     "Restart": "Redémarrer",
     "Restart Needed": "Redémarrage nécessaire",
     "Restarting": "Redémarrage",
+    "Resume": "Résumer",
     "Reused": "Réutilisé",
     "Save": "Sauver",
     "Scanning": "En cours de scan",
@@ -209,6 +212,7 @@
     "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Lorsqu'un nouveau répertoire est ajouté, gardez à l'esprit que son ID est utilisé pour lier les répertoires à travers les appareils. Les ID sont sensibles à la casse et doivent être identiques à travers tous les nœuds.",
     "Yes": "Oui",
     "You must keep at least one version.": "Vous devez garder au minimum une version.",
+    "days": "Jours",
     "full documentation": "documentation complète",
     "items": "éléments",
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} veut partager le dossier \"{{folder}}\"."

gui/assets/lang/lang-fr.json

@@ -113,6 +113,8 @@
     "Override Changes": "Écraser les changements",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Le chemin du dossier sur l'ordinateur local sera créé si il n'existe pas. Le caractère tilde (~) peut être utilisé comme raccourci vers",
     "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Chemin où les versions doivent être conservées (laisser vide pour le chemin par défaut de .stversions dans le répertoire)",
+    "Pause": "Pause",
+    "Paused": "En pause",
     "Please consult the release notes before performing a major upgrade.": "Veuillez consulter les notes de version avant de réaliser une mise à jour majeure.",
     "Please wait": "Merci de patienter",
     "Preview": "Aperçu",
@@ -130,6 +132,7 @@
     "Restart": "Redémarrer",
     "Restart Needed": "Redémarrage nécessaire",
     "Restarting": "Redémarrage",
+    "Resume": "Résumer",
     "Reused": "Réutilisé",
     "Save": "Sauver",
     "Scanning": "En cours de scan",
@@ -209,6 +212,7 @@
     "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Lorsqu'un nouveau répertoire est ajouté, gardez à l'esprit que son ID est utilisé pour lier les répertoires à travers les appareils. Les ID sont sensibles à la casse et doivent être identiques à travers tous les nœuds.",
     "Yes": "Oui",
     "You must keep at least one version.": "Vous devez garder au minimum une version.",
+    "days": "Jours",
     "full documentation": "documentation complète",
     "items": "éléments",
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} veut partager le dossier \"{{folder}}\"."

gui/assets/lang/lang-hu.json

@@ -3,15 +3,15 @@
     "A new major version may not be compatible with previous versions.": "Az új főverzió nem kompatibilis az előző főverzióval.",
     "API Key": "API kulcs",
     "About": "Névjegy",
-    "Actions": "Tevékenységek",
+    "Actions": "Műveletek",
     "Add": "Hozzáadás",
     "Add Device": "Eszköz hozzáadása",
     "Add Folder": "Mappa hozzáadása",
-    "Add new folder?": " ",
+    "Add new folder?": " Új mappa hozzáadás?",
     "Address": "Cím",
     "Addresses": "Címek",
-    "Advanced": "Speciális",
-    "Advanced Configuration": "Speciális beállítások",
+    "Advanced": "Haladó",
+    "Advanced Configuration": "Haladó beállítások",
     "All Data": "Minden adat",
     "Allow Anonymous Usage Reporting?": "Engedélyezed a névtelen felhasználási adatok küldését?",
     "Alphabetic": "ABC rendben",
@@ -23,7 +23,7 @@
     "Bugs": "Hibák",
     "CPU Utilization": "Processzor használat",
     "Changelog": "Változások",
-    "Clean out after": "Clean out after",
+    "Clean out after": "Takarítás",
     "Close": "Bezárás",
     "Command": "Parancs",
     "Comment, when used at the start of a line": "Megjegyzés, a sor elején használva",
@@ -37,7 +37,7 @@
     "Device ID": "Eszköz azonosító",
     "Device Identification": "Eszköz azonosító",
     "Device Name": "Eszköz neve",
-    "Device {%device%} ({%address%}) wants to connect. Add new device?": "{{device}} ({{address}}) csatlakozni szeretne.",
+    "Device {%device%} ({%address%}) wants to connect. Add new device?": "{{device}} ({{address}}) csatlakozni szeretne. Hozzáadod az új eszközt?",
     "Devices": "Eszközök",
     "Disconnected": "Kapcsolat bontva",
     "Documentation": "Dokumentáció",
@@ -49,14 +49,14 @@
     "Edit Folder": "Mappa szerkesztése",
     "Editing": "Szerkesztés",
     "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.": "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.": "Vesszővel elválasztva több cím is bevihető (\"tcp://ip:port\", \"tcp://host:port\"), az automatikus felderítéshez a 'dynamic' kulcsszó használatos. ",
     "Enter ignore patterns, one per line.": "Figyelmen kívül hagyáshoz ide írhatod a mintákat, soronként egyet",
     "Error": "Hiba",
     "External File Versioning": "Külső fájl verziózás",
-    "Failed Items": "Failed Items",
+    "Failed Items": "Hibás elemek",
     "File Pull Order": "Fájl küldési sorrend",
     "File Versioning": "Fájl verziózás",
-    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Fájl jogosultságok figyelmen kívül hagyása változások keresésekor. FAT fájlrendszereken használatakor.",
+    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Fájl jogosultságok figyelmen kívül hagyása változások keresésekor. FAT fájlrendszerek használatakor.",
     "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Ha a Syncthing áthelyezi vagy törli a fájlokat, akkor azok a .stversions mappába lesznek áthelyezve.",
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Ha a Syncthing áthelyezi vagy törli a fájlokat, akkor azok a .stversions mappába lesznek áthelyezve, időbélyegzővel ellátva.",
     "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "A fájlok védve vannak a más eszközökön történt változásokkal szemben, de az ezen az eszközön történt változások érvényesek lesznek a többire.",
@@ -65,7 +65,7 @@
     "Folder Master": "Központi mappa",
     "Folder Path": "Mappa elérési útja",
     "Folders": "Mappák",
-    "GUI": "Felület",
+    "GUI": "Grafikus felület",
     "GUI Authentication Password": "Grafikus felület jelszava",
     "GUI Authentication User": "Grafikus felület felhasználó neve ",
     "GUI Listen Addresses": "Grafikus felület címe",
@@ -75,11 +75,11 @@
     "Global State": "Globális állapot",
     "Help": "Segítség",
     "Home page": "Főoldal",
-    "Ignore": "Visszautasítás",
-    "Ignore Patterns": "Figyelmen kívül hagyás",
+    "Ignore": "Figyelmen kívül hagyás",
+    "Ignore Patterns": "Minták figyelmen kívül hagyása",
     "Ignore Permissions": "Jogosultságok figyelmen kívül hagyása",
     "Incoming Rate Limit (KiB/s)": "Bejövő sebesség korlát (KIB/mp)",
-    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Incorrect configuration may damage your folder contents and render Syncthing inoperable.",
+    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Helytelen konfiguráció esetén károsodhat a mappák tartalma és működésképtelenné válhat a Syncthing.",
     "Introducer": "Bevezető",
     "Inversion of the given condition (i.e. do not exclude)": "A feltétel ellentéte (pl. ki nem hagyás)",
     "Keep Versions": "Megtartott verziók",
@@ -93,7 +93,7 @@
     "Major Upgrade": "Főverzió frissítés",
     "Maximum Age": "Maximális kor",
     "Metadata Only": "Csak metaadatok",
-    "Minimum Free Disk Space": "Minimum Free Disk Space",
+    "Minimum Free Disk Space": "Minimális szabad lemezterület",
     "Move to top of queue": "Sor elejére mozgatás",
     "Multi level wildcard (matches multiple directory levels)": "Több szintű helyettesítő karakter (több könyvtár szintre érvényesül)",
     "Never": "Soha",
@@ -106,30 +106,33 @@
     "OK": "Rendben",
     "Off": "Kikapcsolva",
     "Oldest First": "Régebbi először",
-    "Options": "Options",
-    "Out of Sync": "Out of Sync",
+    "Options": "Opciók",
+    "Out of Sync": "Nincs szinkronban",
     "Out of Sync Items": "Nem szinkronizált elemek",
     "Outgoing Rate Limit (KiB/s)": "Kimenő sávszélesség (KiB/mp)",
     "Override Changes": "Változtatások felülbírálása",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "A mappa elérési útja az eszközön. Amennyiben nem létezik, a program automatikusan létrehozza. A hullámvonal (~)  a következő helyettesítésre használható: ",
     "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Elérési út ahol a verziók tárolásra kerülnek (szabadon hagyva az alapértelmezett .stversions mappa lesz használva)",
-    "Please consult the release notes before performing a major upgrade.": "Please consult the release notes before performing a major upgrade.",
+    "Pause": "Szünet",
+    "Paused": "Szünetel",
+    "Please consult the release notes before performing a major upgrade.": "Nagyobb frissítés előtt ellenőrizni kell a kiadási megjegyzéseket.",
     "Please wait": "Kérlek, várj",
     "Preview": "Előnézet",
     "Preview Usage Report": "Felhasználási adatok átnézése",
     "Quick guide to supported patterns": "Rövid útmutató a használható mintákról",
     "RAM Utilization": "Memória használat",
     "Random": "Véletlenszerű",
-    "Relayed via": "Relayed via",
-    "Relays": "Relays",
+    "Relayed via": "Közvetítve",
+    "Relays": "Közvetítések",
     "Release Notes": "Kiadási megjegyzések",
-    "Remove": "Remove",
+    "Remove": "Eltávolítás",
     "Rescan": "Átnézés",
     "Rescan All": "Összes átnézése",
     "Rescan Interval": "Átnézési intervallum",
     "Restart": "Újraindítás",
     "Restart Needed": "Újraindítás szükséges",
     "Restarting": "Újraindulás",
+    "Resume": "Folytatás",
     "Reused": "Újrafelhasználva",
     "Save": "Mentés",
     "Scanning": "Átnézés",
@@ -147,7 +150,7 @@
     "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Az eszköz azonosító helyett jelenik meg. A többi eszközön alapértelmezett névként használható. ",
     "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Az eszköz azonosító helyett jelenik meg. Üresen hagyva az eszköz saját neve lesz használva ",
     "Shutdown": "Leállítás",
-    "Shutdown Complete": "Leállítás",
+    "Shutdown Complete": "Leállítás kész",
     "Simple File Versioning": "Egyszerű fájl verziókövetés",
     "Single level wildcard (matches within a directory only)": "Egyszintű helyettesítő karakter (csak egy mappára érvényes)",
     "Smallest First": "Kisebb előbb",
@@ -164,7 +167,7 @@
     "Syncthing is restarting.": "Syncthing újraindul",
     "Syncthing is upgrading.": "Syncthing frissül",
     "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Úgy tűnik, hogy a Syncthing nem működik, vagy valami probléma van az hálózati kapcsolattal. Újra próbálom...",
-    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.",
+    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Úgy tűnik, hogy a Syncthing problémába ütközött a kérés feldolgozása során. Ha a probléma továbbra is fennáll, akkor frissíteni kell az oldalt, vagy újra kell indítani a Syncthinget.",
     "The aggregated statistics are publicly available at {%url%}.": "Az összevont statisztikák nyilvánosan elérhetők a {{url}} címen.",
     "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "A beállítások elmentésre kerültek, de nem lettek aktiválva. Indítsd újra a Syncthing-et, hogy aktiváld őket.",
     "The device ID cannot be blank.": "Az eszköz azonosító nem lehet üres.",
@@ -180,17 +183,17 @@
     "The following items could not be synchronized.": "A következő elemek nem szinkronizálhatóak.",
     "The maximum age must be a number and cannot be blank.": "A maximális kornak számnak kell lenni és nem lehet üres",
     "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "A verziók megtartásának maximális ideje (napokban, ha 0-t adsz meg örökre megmaradnak).",
-    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).",
+    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "A minimális szabad terület százalékos. nem-negatív érték 0 és 100 között",
     "The number of days must be a number and cannot be blank.": "A napok száma szám kell legyen és nem lehet üres.",
-    "The number of days to keep files in the trash can. Zero means forever.": "A napok száma ameddig a fájlok meg lesznek tartva a lomtárban. A 0 azt jelenti örökre.",
+    "The number of days to keep files in the trash can. Zero means forever.": "A napok száma ameddig a fájlok meg lesznek tartva a szemetesben. A 0 azt jelenti örökre.",
     "The number of old versions to keep, per file.": "A megtartott régi verziók száma, fájlonként.",
     "The number of versions must be a number and cannot be blank.": "A megtartott verziók száma nem lehet üres",
     "The path cannot be blank.": "Elérési út nem lehet üres.",
-    "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
+    "The rate limit must be a non-negative number (0: no limit)": "Az arány limitnek pozitív számnak kell lennie (0: nincs limit)",
     "The rescan interval must be a non-negative number of seconds.": "Az átnézési intervallum nullánál nagyobb másodperc érték kell legyen",
-    "They are retried automatically and will be synced when the error is resolved.": "They are retried automatically and will be synced when the error is resolved.",
+    "They are retried automatically and will be synced when the error is resolved.": "A hiba javítása után automatikusan újra megpróbálja a szinkronizálást.",
     "This is a major version upgrade.": "Ez egy főverzió frissítés.",
-    "Trash Can File Versioning": "Lomtár fájl verziózás",
+    "Trash Can File Versioning": "Szemetes fájl verziózás",
     "Unknown": "Ismeretlen",
     "Unshared": "Nincs megosztva",
     "Unused": "Nincs használatban",
@@ -201,7 +204,7 @@
     "Upgrading": "Frissítés",
     "Upload Rate": "Feltöltési sebesség",
     "Uptime": "Üzemidő",
-    "Use HTTPS for GUI": "HTTPS használata a GUI-hoz",
+    "Use HTTPS for GUI": "HTTPS használata a felülethez",
     "Version": "Verzió",
     "Versions Path": "Verziók útvonala",
     "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "A régi verziók automatikusan törlődnek, amennyiben öregebbek mint a maximum kor, vagy már több van belőlük mint az adott időszakban megtartható maximum.",
@@ -209,7 +212,8 @@
     "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Amikor új mappát adsz hozzá, tartsd észben, hogy a mappa azonosító arra való hogy összekösd a mappákat az eszközeiden. Az azonosító kisbetű-nagybetű érzékeny és pontosan egyeznie kell az eszközökön.",
     "Yes": "Igen",
     "You must keep at least one version.": "Legalább egy verziót meg kell tartanod",
+    "days": "nap",
     "full documentation": "teljes dokumentáció",
-    "items": "elemek",
+    "items": "elem",
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} meg szeretné osztani a \"{{folder}}\" nevű mappát."
 }

gui/assets/lang/lang-it.json

@@ -10,8 +10,8 @@
     "Add new folder?": "Aggiungere una nuova cartella?",
     "Address": "Indirizzo",
     "Addresses": "Indirizzi",
-    "Advanced": "Advanced",
-    "Advanced Configuration": "Advanced Configuration",
+    "Advanced": "Avanzato",
+    "Advanced Configuration": "Configurazione avanzata",
     "All Data": "Tutti i Dati",
     "Allow Anonymous Usage Reporting?": "Abilitare Statistiche Anonime di Utilizzo?",
     "Alphabetic": "Alfabetico",
@@ -19,7 +19,7 @@
     "Anonymous Usage Reporting": "Statistiche Anonime di Utilizzo",
     "Any devices configured on an introducer device will be added to this device as well.": "Qualsiasi dispositivo configurato in un introduttore verrà aggiunto anche a questo dispositivo.",
     "Automatic upgrades": "Aggiornamenti automatici",
-    "Be careful!": "Be careful!",
+    "Be careful!": "Fai attenzione!",
     "Bugs": "Bug",
     "CPU Utilization": "Utilizzo CPU",
     "Changelog": "Changelog",
@@ -49,23 +49,23 @@
     "Edit Folder": "Modifica Cartella",
     "Editing": "Modifica di",
     "Enable UPnP": "Attiva UPnP",
-    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.",
+    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Inserisci indirizzi separati da virgola (\"tcp://ip:porta\", \"tcp://host:porta\")  oppure \"dynamic\" per effettuare il rilevamento automatico dell'indirizzo.",
     "Enter ignore patterns, one per line.": "Inserisci gli schemi di esclusione, uno per riga.",
     "Error": "Errore",
     "External File Versioning": "Controllo Versione Esterno",
-    "Failed Items": "Failed Items",
+    "Failed Items": "Elementi errati",
     "File Pull Order": "Ordine di prelievo dei file",
     "File Versioning": "Controllo Versione dei File",
     "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Il software evita i bit dei permessi dei file durante il controllo delle modifiche. Utilizzato nei filesystem FAT.",
     "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "I file sono spostati nella certella .stversions quando vengono sostituiti o cancellati da Syncthing.",
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "I file sostituiti o eliminati da Syncthing vengono datati e spostati in una cartella .stversions.",
     "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "I file sono protetti dalle modifiche effettuate negli altri dispositivi, ma le modifiche effettuate in questo dispositivo verranno inviate anche al resto del cluster.",
-    "Folder": "Folder",
+    "Folder": "Cartella",
     "Folder ID": "ID Cartella",
     "Folder Master": "Cartella Principale",
     "Folder Path": "Percorso Cartella",
     "Folders": "Cartelle",
-    "GUI": "GUI",
+    "GUI": "Interfaccia grafica utente",
     "GUI Authentication Password": "Password di Autenticazione dell'Utente",
     "GUI Authentication User": "Utente dell'Interfaccia Grafica",
     "GUI Listen Addresses": "Indirizzi dell'Interfaccia Grafica",
@@ -74,12 +74,12 @@
     "Global Discovery Server": "Server di Ricerca Globale",
     "Global State": "Stato Globale",
     "Help": "Aiuto",
-    "Home page": "Home page",
+    "Home page": "Pagina home",
     "Ignore": "Ignora",
     "Ignore Patterns": "Schemi Esclusione File",
     "Ignore Permissions": "Ignora Permessi",
     "Incoming Rate Limit (KiB/s)": "Limite Velocità in Ingresso (KiB/s)",
-    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Incorrect configuration may damage your folder contents and render Syncthing inoperable.",
+    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Una configurazione incorretta potrebbe danneggiare il contenuto delle cartelle e rendere Syncthing inoperativo.",
     "Introducer": "Introduttore",
     "Inversion of the given condition (i.e. do not exclude)": "Inversione della condizione indicata (ad es. non escludere)",
     "Keep Versions": "Versioni Mantenute",
@@ -93,7 +93,7 @@
     "Major Upgrade": "Aggiornamento principale",
     "Maximum Age": "Durata Massima",
     "Metadata Only": "Solo i Metadati",
-    "Minimum Free Disk Space": "Minimum Free Disk Space",
+    "Minimum Free Disk Space": "Minimo spazio libero su disco",
     "Move to top of queue": "Posiziona in cima alla coda",
     "Multi level wildcard (matches multiple directory levels)": "Metacarattere multi-livello (corrisponde alle cartelle e alle sotto-cartelle)",
     "Never": "Mai",
@@ -106,13 +106,15 @@
     "OK": "OK",
     "Off": "Disattiva",
     "Oldest First": "Prima il meno recente",
-    "Options": "Options",
-    "Out of Sync": "Out of Sync",
+    "Options": "Opzioni",
+    "Out of Sync": "Non sincronizzato",
     "Out of Sync Items": "Elementi Non Sincronizzati",
     "Outgoing Rate Limit (KiB/s)": "Limite Velocità in Uscita (KiB/s)",
     "Override Changes": "Ignora Modifiche",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Percorso della cartella nel computer locale. Verrà creata se non esiste già. Il carattere tilde (~) può essere utilizzato come scorciatoia per",
     "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Percorso di salvataggio delle versioni (lasciare vuoto per utilizzare la cartella predefinita .stversions in questa cartella).",
+    "Pause": "Pausa",
+    "Paused": "In pausa",
     "Please consult the release notes before performing a major upgrade.": "Si prega di consultare le note di rilascio prima di eseguire un aggiornamento principale.",
     "Please wait": "Attendere prego",
     "Preview": "Anteprima",
@@ -120,16 +122,17 @@
     "Quick guide to supported patterns": "Guida veloce agli schemi supportati",
     "RAM Utilization": "Utilizzo RAM",
     "Random": "Casuale",
-    "Relayed via": "Relayed via",
-    "Relays": "Relays",
+    "Relayed via": "Reindirizzato tramite",
+    "Relays": "Servers di reindirizzamento",
     "Release Notes": "Note di rilascio",
-    "Remove": "Remove",
+    "Remove": "Rimuovi",
     "Rescan": "Riscansiona",
     "Rescan All": "Riscansiona Tutto",
     "Rescan Interval": "Intervallo Scansione",
     "Restart": "Riavvia",
     "Restart Needed": "Riavvio Necessario",
     "Restarting": "Riavvio",
+    "Resume": "Riprendi",
     "Reused": "Riutilizzato",
     "Save": "Salva",
     "Scanning": "Scansione in corso",
@@ -154,7 +157,7 @@
     "Source Code": "Codice Sorgente",
     "Staggered File Versioning": "Controllo Versione Cadenzato",
     "Start Browser": "Avvia Browser",
-    "Statistics": "Statistics",
+    "Statistics": "Statistiche",
     "Stopped": "Fermato",
     "Support": "Supporto",
     "Sync Protocol Listen Addresses": "Indirizzi del Protocollo di Sincronizzazione",
@@ -177,18 +180,18 @@
     "The folder ID must be unique.": "L'ID della cartella dev'essere unico.",
     "The folder path cannot be blank.": "Il percorso della cartella non può essere vuoto.",
     "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "Vengono utilizzati i seguenti intervalli temporali: per la prima ora viene mantenuta una versione ogni 30 secondi, per il primo giorno viene mantenuta una versione ogni ora, per i primi 30 giorni viene mantenuta una versione al giorno, successivamente viene mantenuta una versione ogni settimana fino al periodo massimo impostato.",
-    "The following items could not be synchronized.": "The following items could not be synchronized.",
+    "The following items could not be synchronized.": "Non è stato possibile sincronizzare i seguenti elementi",
     "The maximum age must be a number and cannot be blank.": "La durata massima dev'essere un numero e non può essere vuoto.",
     "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "La durata massima di una versione (in giorni, imposta a 0 per mantenere le versioni per sempre).",
-    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).",
+    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "Lo spazio libero minimo su disco deve essere un numero non negativo tra 0 e 100 (inclusi)",
     "The number of days must be a number and cannot be blank.": "Il numero di giorni deve essere un numero e non può essere vuoto.",
     "The number of days to keep files in the trash can. Zero means forever.": "Il numero di giorni per conservare i file nel cestino. Zero significa per sempre.",
     "The number of old versions to keep, per file.": "Il numero di vecchie versioni da mantenere, per file.",
     "The number of versions must be a number and cannot be blank.": "Il numero di versioni dev'essere un numero e non può essere vuoto.",
     "The path cannot be blank.": "Il percorso non può essere vuoto.",
-    "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
+    "The rate limit must be a non-negative number (0: no limit)": "Il limite di banda deve essere un numero non negativo (da 0 a infinito)",
     "The rescan interval must be a non-negative number of seconds.": "L'intervallo di scansione deve essere un numero superiore a zero secondi.",
-    "They are retried automatically and will be synced when the error is resolved.": "They are retried automatically and will be synced when the error is resolved.",
+    "They are retried automatically and will be synced when the error is resolved.": "Verranno effettuati tentativi in automatico e verranno sincronizzati quando l'errore sarà risolto.",
     "This is a major version upgrade.": "Questo è un aggiornamento di versione principale",
     "Trash Can File Versioning": "Controllo Versione con Cestino",
     "Unknown": "Sconosciuto",
@@ -209,6 +212,7 @@
     "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Quando aggiungi una nuova cartella, ricordati che gli ID vengono utilizzati per collegare le cartelle nei dispositivi. Distinguono maiuscole e minuscole e devono corrispondere esattamente su tutti i dispositivi.",
     "Yes": "Sì",
     "You must keep at least one version.": "È necessario mantenere almeno una versione.",
+    "days": "giorni",
     "full documentation": "documentazione completa",
     "items": "elementi",
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} vuole condividere la cartella \"{{folder}}\"."

gui/assets/lang/lang-ja.json

@@ -113,6 +113,8 @@
     "Override Changes": "他のデバイスの変更を上書きする",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "ローカルコンピュータ上のフォルダーパス。存在しない場合は作成されます。チルダ (~) で次のフォルダーを短縮入力できます:",
     "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "古いバージョンを保存するパス (空欄の場合、デフォルトで .stversions になります)。",
+    "Pause": "一時停止",
+    "Paused": "一時停止中",
     "Please consult the release notes before performing a major upgrade.": "メジャーアップグレードを行う前にリリースノートを参照してください。",
     "Please wait": "お待ちください",
     "Preview": "プレビュー",
@@ -120,8 +122,8 @@
     "Quick guide to supported patterns": "サポートされているパターンの簡易ガイド",
     "RAM Utilization": "メモリ使用量",
     "Random": "ランダム",
-    "Relayed via": "Relayed via",
-    "Relays": "Relays",
+    "Relayed via": "経由している中継サーバーのアドレス",
+    "Relays": "中継サーバー",
     "Release Notes": "リリースノート",
     "Remove": "除去",
     "Rescan": "再スキャン",
@@ -130,6 +132,7 @@
     "Restart": "再起動",
     "Restart Needed": "再起動が必要です",
     "Restarting": "再起動中",
+    "Resume": "再開",
     "Reused": "中断後再利用",
     "Save": "保存",
     "Scanning": "スキャン中",
@@ -209,6 +212,7 @@
     "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "新しいフォルダーを追加する際、フォルダーIDはデバイス間でフォルダーの対応づけに使われることに注意してください。フォルダーIDは大文字と小文字が区別され、共有するすべてのデバイスの間で完全に一致しなくてはなりません。",
     "Yes": "はい",
     "You must keep at least one version.": "少なくとも一つのバージョンを保存してください。",
+    "days": "日",
     "full documentation": "詳細なマニュアル",
     "items": "項目",
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} がフォルダー \"{{folder}}\" を共有するよう求めています。"

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

@@ -113,6 +113,8 @@
     "Override Changes": "덮어쓰기",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "로컬 컴퓨터에 있는 폴더의 경로를 지정합니다. 존재하지 않는 폴더일 경우 자동으로 생성됩니다. 물결 기호 (~)는 아래와 같은 폴더를 나타냅니다.",
     "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "버전을 보관할 경로 (비워둘 시 기본값 .stversions 폴더로 지정됨)",
+    "Pause": "Pause",
+    "Paused": "Paused",
     "Please consult the release notes before performing a major upgrade.": "메이저 업데이트를 하기 전에 먼저 릴리즈 노트를 살펴보세요.",
     "Please wait": "기다려 주십시오",
     "Preview": "미리보기",
@@ -130,6 +132,7 @@
     "Restart": "재시작",
     "Restart Needed": "재시작 필요함",
     "Restarting": "재시작 중",
+    "Resume": "Resume",
     "Reused": "재개",
     "Save": "저장",
     "Scanning": "탐색중",
@@ -209,6 +212,7 @@
     "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "새 폴더를 추가할 시 폴더 ID는 장치간에 폴더를 묶을 때 사용됩니다. 대소문자를 구분하며 모든 장치에서 같은 ID를 사용해야 합니다.",
     "Yes": "예",
     "You must keep at least one version.": "최소 한 개의 버전은 유지해야 합니다.",
+    "days": "days",
     "full documentation": "전체 문서",
     "items": "항목",
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} 에서 폴더  \\\"{{folder}}\\\" 를 공유하길 원합니다."

gui/assets/lang/lang-lt.json

@@ -113,6 +113,8 @@
     "Override Changes": "Perrašyti pakeitimus",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Kelias iki aplanko šiame kompiuteryje. Bus sukurtas, jei neegzistuoja. Tildės simbolis (~) gali būti naudojamas kaip trumpinys",
     "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Kelias, kur bus saugomos versijos (palikite tuščią numatytam .stversions aplankui).",
+    "Pause": "Pause",
+    "Paused": "Paused",
     "Please consult the release notes before performing a major upgrade.": "Peržvelkite laidos informaciją prieš atlikdami stambų atnaujinimą.",
     "Please wait": "Prašome palaukti",
     "Preview": "Peržiūra",
@@ -130,6 +132,7 @@
     "Restart": "Perleisti",
     "Restart Needed": "Reikalingas perleidimas",
     "Restarting": "Persileidžia",
+    "Resume": "Resume",
     "Reused": "Pakartotinas",
     "Save": "Išsaugoti",
     "Scanning": "Skenuojama",
@@ -186,7 +189,7 @@
     "The number of old versions to keep, per file.": "Kiek failo versijų saugoti.",
     "The number of versions must be a number and cannot be blank.": "Versijų skaičius turi būti skaitmuo ir negali būti tuščias laukelis.",
     "The path cannot be blank.": "Kelias negali būti tuščias.",
-    "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
+    "The rate limit must be a non-negative number (0: no limit)": "Srauto maksimalus greitis privalo būti ne neigiamas skaičius (0: nėra apribojimo)",
     "The rescan interval must be a non-negative number of seconds.": "Nuskaitymo dažnis negali būti neigiamas skaičius.",
     "They are retried automatically and will be synced when the error is resolved.": "They are retried automatically and will be synced when the error is resolved.",
     "This is a major version upgrade.": "Tai yra stambus atnaujinimas.",
@@ -209,6 +212,7 @@
     "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Kai įvedate naują aplanką neužmirškite, kad jis bus naudojamas visuose įrenginiuose. Svarbu visur įvesti visiškai tokį pat aplanko vardą neužmirštant apie didžiąsias ir mažąsias raides.",
     "Yes": "Taip",
     "You must keep at least one version.": "Būtina saugoti bent vieną versiją.",
+    "days": "days",
     "full documentation": "pilna dokumentacija",
     "items": "įrašai",
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} nori dalintis aplanku \"{{folder}}\""

gui/assets/lang/lang-nb.json

@@ -5,8 +5,8 @@
     "About": "Om",
     "Actions": "Handlinger",
     "Add": "Legg til",
-    "Add Device": "Legg Til Enhet",
-    "Add Folder": "Legg Til Mappe",
+    "Add Device": "Legg til Enhet",
+    "Add Folder": "Legg til Mappe",
     "Add new folder?": "Legg til ny mappe?",
     "Address": "Adresse",
     "Addresses": "Adresser",
@@ -22,7 +22,7 @@
     "Be careful!": "Vær forsiktig!",
     "Bugs": "Programfeil",
     "CPU Utilization": "CPU-utnyttelse",
-    "Changelog": "Endringslog",
+    "Changelog": "Endringslogg",
     "Clean out after": "Tøm etter",
     "Close": "Lukk",
     "Command": "Kommando",
@@ -31,28 +31,28 @@
     "Connection Error": "Tilkoblingsfeil",
     "Copied from elsewhere": "Kopiert fra et annet sted",
     "Copied from original": "Kopiert fra original",
-    "Copyright © 2015 the following Contributors:": "Kopirett © 2015 de følgende bidragsytere:",
+    "Copyright © 2015 the following Contributors:": "Opphavsrett © 2015 de følgende bidragsytere:",
     "Delete": "Slett",
     "Deleted": "Slettet",
     "Device ID": "Enhets ID",
     "Device Identification": "Enhetskjennemerke",
-    "Device Name": "Navn På Enhet",
+    "Device Name": "Navn på Enhet",
     "Device {%device%} ({%address%}) wants to connect. Add new device?": "Enhet {{device}} ({{address}}) ønsker å koble seg til. Legg til ny enhet?",
     "Devices": "Enheter",
     "Disconnected": "Frakoblet",
     "Documentation": "Dokumentasjon",
     "Download Rate": "Nedlastingsrate",
-    "Downloaded": "Lasted ned",
+    "Downloaded": "Lastet ned",
     "Downloading": "Laster ned",
     "Edit": "Rediger",
     "Edit Device": "Rediger Enhet",
     "Edit Folder": "Rediger Mappe",
     "Editing": "Redigerer",
     "Enable UPnP": "Aktiver UPnP",
-    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.",
+    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Skriv inn kommaseparerte (\"tcp://ip:port\", \"tcp://host:port\") adresser, eller \"dynamic\" for å automatisk finne adressen.",
     "Enter ignore patterns, one per line.": "Skriv inn mønster som skal utelates, ett per linje.",
     "Error": "Feilmelding",
-    "External File Versioning": "Ekstern versjonskontroll",
+    "External File Versioning": "Ekstern Versjonskontroll",
     "Failed Items": "Elementsynkronisering som har feilet",
     "File Pull Order": "Filenes Henterekkefølge",
     "File Versioning": "Versjonskontroll",
@@ -94,7 +94,7 @@
     "Maximum Age": "Maksimal Levetid",
     "Metadata Only": "Kun metadata",
     "Minimum Free Disk Space": "Nødvendig ledig diskplass",
-    "Move to top of queue": "Flytt til topp av kø",
+    "Move to top of queue": "Flytt fremst i køen",
     "Multi level wildcard (matches multiple directory levels)": "Multinivåsøk (søker på flere mappenivå)",
     "Never": "Aldri",
     "New Device": "Ny Enhet",
@@ -102,7 +102,7 @@
     "Newest First": "Den nyeste først",
     "No": "Nei",
     "No File Versioning": "Ingen Versjonskontroll",
-    "Notice": "Merknad",
+    "Notice": "Merknader",
     "OK": "OK",
     "Off": "Av",
     "Oldest First": "Den eldste først",
@@ -113,6 +113,8 @@
     "Override Changes": "Overstyr Endringer",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Plasseringen av mappen på datamaskinen. Denne vil bli opprettet dersom den ikke finnes. Krøllstrektegnet (~) kan brukes som forkortelse for",
     "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Plasseringen for lagrede versjoner (la denne være tom for å bruke standard .stversions-mappen i mappen).",
+    "Pause": "Oppholde",
+    "Paused": "Oppholdt",
     "Please consult the release notes before performing a major upgrade.": "Se \"release notes\" før en hovedoppgradering utføres.",
     "Please wait": "Vennligst vent",
     "Preview": "Forhåndsvisning",
@@ -120,8 +122,8 @@
     "Quick guide to supported patterns": "Kjapp innføring i godkjente mønster",
     "RAM Utilization": "RAM-utnyttelse",
     "Random": "Tilfeldig",
-    "Relayed via": "Relayed via",
-    "Relays": "Relays",
+    "Relayed via": "Relé via",
+    "Relays": "Reléer",
     "Release Notes": "Utgivelsesnotat",
     "Remove": "Fjern",
     "Rescan": "Skann på nytt",
@@ -130,6 +132,7 @@
     "Restart": "Omstart",
     "Restart Needed": "Omstart Kreves",
     "Restarting": "Starter På Ny",
+    "Resume": "Gjenoppta",
     "Reused": "Gjenbrukt",
     "Save": "Lagre",
     "Scanning": "Skanner",
@@ -141,7 +144,7 @@
     "Share Folders With Device": "Del Mapper Med Enhet",
     "Share With Devices": "Del Med Enheter",
     "Share this folder?": "Dele denne mappen?",
-    "Shared With": "Del Med",
+    "Shared With": "Delt Med",
     "Short identifier for the folder. Must be the same on all cluster devices.": "Kort kjennemerke på mappen. Må være det samme på alle enheter i en gruppe.",
     "Show ID": "Vis ID",
     "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Vis i stedet for Eining ID i gruppestatus. Vil bli kringkastet til andre enheter som et valgfritt standardnavn.",
@@ -190,7 +193,7 @@
     "The rescan interval must be a non-negative number of seconds.": "Antall sekund i skanneintervallet kan ikke være negativt.",
     "They are retried automatically and will be synced when the error is resolved.": "Disse hentes automatisk og vil synkroniseres når feilen er blitt utbedret.",
     "This is a major version upgrade.": "Dette er en hovedoppgradering",
-    "Trash Can File Versioning": "Fil versjonskontroll i papirkurven",
+    "Trash Can File Versioning": "Fil Versjonskontroll i papirkurven",
     "Unknown": "Ukjent",
     "Unshared": "Ikke delt",
     "Unused": "Ikke i bruk",
@@ -209,6 +212,7 @@
     "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Når en ny mappe blir lagt til, husk at Mappe-ID blir brukt til å binde sammen mapper mellom enheter. Det er forskjell på store og små bokstaver, så IDene må være identiske på alle enhetene.",
     "Yes": "Ja",
     "You must keep at least one version.": "Du må beholde minst én versjon",
+    "days": "dager",
     "full documentation": "all dokumentasjon",
     "items": "element",
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} ønsker å dele mappen \"{{folder}}\"."

gui/assets/lang/lang-nl.json

@@ -49,7 +49,7 @@
     "Edit Folder": "Bewerk map",
     "Editing": "Bezig met bewerken",
     "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 of \"dynamisch\" in om automatische ontdekking van het adres uit te voeren.",
+    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Voer door komma's gescheiden (\"tcp://ip:port\", \"tcp://host:port\") adressen in of voer \"dynamisch\" in om automatische ontdekking van het adres uit te voeren.",
     "Enter ignore patterns, one per line.": "Voer negeerpatronen in, één per regel.",
     "Error": "Fout",
     "External File Versioning": "Extern versiebeheer voor bestanden",
@@ -113,6 +113,8 @@
     "Override Changes": "Veranderingen overschrijven",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Locatie van de map op de lokale computer. Als deze niet bestaat zal de map aangemaakt worden. De tilde (~) kan gebruikt worden als snelkoppeling voor ",
     "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Betandspad waar de versies opgeslagen moeten worden (leeg laten voor de standaard .stversions subfolder).",
+    "Pause": "Pauze",
+    "Paused": "Gepauseerd",
     "Please consult the release notes before performing a major upgrade.": "Lees eerst de release notes voordat u een grote update uitvoert.",
     "Please wait": "Even geduld",
     "Preview": "Preview",
@@ -130,6 +132,7 @@
     "Restart": "Herstart",
     "Restart Needed": "Herstart nodig",
     "Restarting": "Herstarten",
+    "Resume": "Hervatten",
     "Reused": "Hergebruikt",
     "Save": "Bewaar",
     "Scanning": "Aan het zoeken",
@@ -209,6 +212,7 @@
     "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Houd er bij het toevoegen van nieuwe mappen rekening mee dat het map-ID gebruikt wordt om mappen tussen apparaten te verbinden. Dit ID is hoofdlettergevoelig en moet identiek zijn op andere apparaten.",
     "Yes": "Ja",
     "You must keep at least one version.": "Minstens 1 versie moet bewaard blijven.",
+    "days": "dagen",
     "full documentation": "volledige documentatie",
     "items": "objecten",
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} wil de map \"{{folder}}\" delen."

gui/assets/lang/lang-nn.json

@@ -3,7 +3,7 @@
     "A new major version may not be compatible with previous versions.": "A new major version may not be compatible with previous versions.",
     "API Key": "API-nøkkel",
     "About": "Om",
-    "Actions": "Actions",
+    "Actions": "Handlingar",
     "Add": "Legg til",
     "Add Device": "Legg Til Eining",
     "Add Folder": "Legg Til Mappe",
@@ -11,7 +11,7 @@
     "Address": "Adresse",
     "Addresses": "Adresser",
     "Advanced": "Avansert",
-    "Advanced Configuration": "Advanced Configuration",
+    "Advanced Configuration": "Avansert konfigurasjon",
     "All Data": "Alle data",
     "Allow Anonymous Usage Reporting?": "Tillata anonymisert bruksrapportering?",
     "Alphabetic": "Alfabetisk",
@@ -31,7 +31,7 @@
     "Connection Error": "Tilkoplingsfeil",
     "Copied from elsewhere": "Kopiert frå ein annan stad",
     "Copied from original": "Kopiert frå originalen",
-    "Copyright © 2015 the following Contributors:": "Copyright © 2015 the following Contributors:",
+    "Copyright © 2015 the following Contributors:": "Opphavsrett © 2015 og desse bidragsytarane:",
     "Delete": "Slett",
     "Deleted": "Sletta",
     "Device ID": "Eining ID",
@@ -49,7 +49,7 @@
     "Edit Folder": "Rediger Mappe",
     "Editing": "Redigerer",
     "Enable UPnP": "Aktiver UPnP",
-    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.",
+    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Skriv inn adresser med komma mellom kvar adresse (\"tcp://ip:port\", \"tcp://host:port\"), eller \"dynamic\" for å automatisk søkja opp adressa.",
     "Enter ignore patterns, one per line.": "Skriv inn mønster som skal utelatast, eitt per linje.",
     "Error": "Feilmelding",
     "External File Versioning": "Ekstern filutgåvehandtering",
@@ -65,7 +65,7 @@
     "Folder Master": "Styrande Mappe",
     "Folder Path": "Mappeplassering",
     "Folders": "Mapper",
-    "GUI": "GUI",
+    "GUI": "grafisk brukargrensesnitt",
     "GUI Authentication Password": "GUI Passord",
     "GUI Authentication User": "GUI Brukar",
     "GUI Listen Addresses": "GUI Lytteadresse",
@@ -83,7 +83,7 @@
     "Introducer": "Introduktør",
     "Inversion of the given condition (i.e. do not exclude)": "Det motsette av den gitte tilstanden (dvs. ekskluder ikkje)",
     "Keep Versions": "Behald Versjonar",
-    "Largest First": "Largest First",
+    "Largest First": "Største fyrst",
     "Last File Received": "Siste mottatte fila",
     "Last seen": "Sist sett",
     "Later": "Seinare",
@@ -106,13 +106,15 @@
     "OK": "OK",
     "Off": "Av",
     "Oldest First": "Elste fyrst",
-    "Options": "Options",
+    "Options": "Val",
     "Out of Sync": "Ikkje synkronisert",
     "Out of Sync Items": "Ikkje-synkroniserte element",
     "Outgoing Rate Limit (KiB/s)": "Utgåande hastigheitsgrense (KiB/s)",
     "Override Changes": "Overstyr endringar",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Plasseringa av mappa på datamaskinen. Vert oppretta om ho ikkje finst. Krøllstrekteiknet (~) kan brukast som forkorting for",
     "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Plasseringa for lagra versjonar (la denne vera tom for å bruka standard .stversions-mappa i mappa).",
+    "Pause": "Stans",
+    "Paused": "Stansa",
     "Please consult the release notes before performing a major upgrade.": "Please consult the release notes before performing a major upgrade.",
     "Please wait": "Gjer vel og vent",
     "Preview": "Førehandsvisning",
@@ -122,14 +124,15 @@
     "Random": "Tilfeldig",
     "Relayed via": "Relayed via",
     "Relays": "Relays",
-    "Release Notes": "Release Notes",
-    "Remove": "Remove",
+    "Release Notes": "Utgivingsnotat",
+    "Remove": "Fjern",
     "Rescan": "Skann På Ny",
     "Rescan All": "Skann alle på nytt",
     "Rescan Interval": "Skanneintervall",
     "Restart": "Omstart",
     "Restart Needed": "Omstart Trengs",
     "Restarting": "Startar På Ny",
+    "Resume": "Start",
     "Reused": "Gjenbrukt",
     "Save": "Lagre",
     "Scanning": "Skannar",
@@ -154,7 +157,7 @@
     "Source Code": "Kildekode",
     "Staggered File Versioning": "Forskuva filutgåvehandtering",
     "Start Browser": "Start Nettlesar",
-    "Statistics": "Statistics",
+    "Statistics": "Statistikk",
     "Stopped": "Stoppa",
     "Support": "Brukarstøtte",
     "Sync Protocol Listen Addresses": "Lytteadresse For Synkroniseringsprotokoll",
@@ -177,16 +180,16 @@
     "The folder ID must be unique.": "Mappe ID må vera unik.",
     "The folder path cannot be blank.": "Mappeplasseringa kan ikkje vera tom.",
     "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "Desse intervalla vert nytta: den fyrste timen vert ei utgåve lagra kvart 30. sekund, den fyrste dagen vert ei utgåve lagra kvar time, dei fyrste 30 dagane vert ei utgåve lagra kvar dag, og inntil høgaste alderen vert ei utgåve lagra kvar veke.",
-    "The following items could not be synchronized.": "The following items could not be synchronized.",
+    "The following items could not be synchronized.": "Fyljande filer kunne ikkje synkroniserast.",
     "The maximum age must be a number and cannot be blank.": "Maksimal levetid må vera eit tal og kan ikkje vera tomt.",
     "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Høgaste tidsrom å behalda ei utgåve (i dagar, set til 0 for å behalda versjonane for alltid).",
     "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).",
-    "The number of days must be a number and cannot be blank.": "The number of days must be a number and cannot be blank.",
+    "The number of days must be a number and cannot be blank.": "Tal på dagar må ver eit tal og kan ikkje vera tomt.",
     "The number of days to keep files in the trash can. Zero means forever.": "The number of days to keep files in the trash can. Zero means forever.",
     "The number of old versions to keep, per file.": "Tal på gamle versjonar ein skal behalda, per fil.",
     "The number of versions must be a number and cannot be blank.": "Tal på versjonar må vera eit tal og kan ikkje vera tomt.",
     "The path cannot be blank.": "Bana kan ikkje vera tom.",
-    "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
+    "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.": "They are retried automatically and will be synced when the error is resolved.",
     "This is a major version upgrade.": "This is a major version upgrade.",
@@ -209,6 +212,7 @@
     "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Hugs at når ei ny mappe vert lagt til, vert mappe-ID-en brukt til å binda saman mappene mellom einingane. Det er skilnad på store og små bokstavar, så ID-ane må vera identiske på alle einingane.",
     "Yes": "Ja",
     "You must keep at least one version.": "Du må behalda minst ein versjon.",
+    "days": "days",
     "full documentation": "all dokumentasjon",
     "items": "element",
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} ønskjer å dela mappa \"{{folder}}\"."

gui/assets/lang/lang-pl.json

@@ -113,6 +113,8 @@
     "Override Changes": "Nadpisz zmiany",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Ścieżka do lokalnego folderu. Zostanie utworzona jeżeli nie istnieje.\nZnak tyldy (~) może zostać użyty jako skrót do",
     "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Ścieżka gdzie będą przechowywane wersje (pozostaw puste dla domyślnego folderu .stversions)",
+    "Pause": "Pause",
+    "Paused": "Paused",
     "Please consult the release notes before performing a major upgrade.": "Zaleca się przeanalizowanie \"release notes\" przed przeprowadzeniem znaczącej aktualizacji.",
     "Please wait": "Proszę czekać",
     "Preview": "Podgląd",
@@ -130,6 +132,7 @@
     "Restart": "Uruchom ponownie",
     "Restart Needed": "Wymagane ponowne uruchomienie",
     "Restarting": "Uruchamianie ponowne",
+    "Resume": "Resume",
     "Reused": "Ponownie użyte",
     "Save": "Zapisz",
     "Scanning": "Skanowanie",
@@ -209,6 +212,7 @@
     "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Przy dodawaniu nowego folderu, pamiętaj, że ID użyte jest do łączenia folderów pomiędzy urządzeniami. Wielkość liter ciągu ma znaczenie musi zgadzać się na wszystkich urządzeniach.",
     "Yes": "Tak",
     "You must keep at least one version.": "Musisz posiadać przynajmniej jedną wersję",
+    "days": "days",
     "full documentation": "pełna dokumentacja",
     "items": "pozycji",
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} chce udostępnić folder \"{{folder}}\""

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

@@ -37,7 +37,7 @@
     "Device ID": "ID do dispositivo",
     "Device Identification": "Identificação do dispositivo",
     "Device Name": "Nome do dispositivo",
-    "Device {%device%} ({%address%}) wants to connect. Add new device?": "Dispositivo {{device}} ({{address}}) quer se conectar. Adicionar novo dispositivo?",
+    "Device {%device%} ({%address%}) wants to connect. Add new device?": "O dispositivo {{device}} ({{address}}) quer se conectar. Adicionar novo dispositivo?",
     "Devices": "Dispositivos",
     "Disconnected": "Desconectado",
     "Documentation": "Documentação",
@@ -49,7 +49,7 @@
     "Edit Folder": "Editar pasta",
     "Editing": "Editando",
     "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 de endereço.",
+    "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.",
     "Error": "Erro",
     "External File Versioning": "Versionamento externo de arquivo",
@@ -57,9 +57,9 @@
     "File Pull Order": "Ordem de retirada do arquivo",
     "File Versioning": "Versionamento de arquivos",
     "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Os bits de permissão de um arquivo são ignorados durante as verificações. Use em sistemas de arquivo FAT.",
-    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Os arquivos são motivos para a pasta .stversions quando substituídos ou apagados pelo Syncthing.",
-    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Os arquivos são renomeados com suas datas na pasta .stversions quando são substituídos ou removidos pelo Syncthing.",
-    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Os arquivos estão protegidos contra alterações feitas em outros dispositivos, mas alterações feitas neste dispositivo serão enviadas ao resto do grupo.",
+    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Os arquivos são movidos para a pasta .stversions quando substituídos ou apagados pelo Syncthing.",
+    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Os arquivos são renomeados com suas datas na pasta .stversions após serem substituídos ou removidos pelo Syncthing.",
+    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Os arquivos estão protegidos contra alterações feitas em outros dispositivos, mas alterações feitas neste dispositivo serão enviadas ao resto dos dispositivos.",
     "Folder": "Pasta",
     "Folder ID": "ID da pasta",
     "Folder Master": "Pasta mestre",
@@ -113,6 +113,8 @@
     "Override Changes": "Sobrescrever mudanças",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Caminho para a pasta na máquina local. Será criado caso não exista. O caractere til (~) pode ser usado como um atalho para",
     "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "O caminho onde as versões serão salvas (deixe vazio para usar a pasta padrão .stversions dentro desta pasta).",
+    "Pause": "Pausar",
+    "Paused": "Pausada",
     "Please consult the release notes before performing a major upgrade.": "Por favor, consulte as notas de lançamento antes de atualizar para uma versão \"major\".",
     "Please wait": "Aguarde",
     "Preview": "Visualizar",
@@ -130,6 +132,7 @@
     "Restart": "Reiniciar",
     "Restart Needed": "É necessário reiniciar",
     "Restarting": "Reiniciando",
+    "Resume": "Resumir",
     "Reused": "Reutilizado",
     "Save": "Salvar",
     "Scanning": "Verificando",
@@ -137,14 +140,14 @@
     "Select the folders to share with this device.": "Selecione as pastas a serem compartilhadas com este dispositivo.",
     "Settings": "Configurações",
     "Share": "Compartilhar",
-    "Share Folder": "Compartilhar Pasta",
+    "Share Folder": "Compartilhar pasta",
     "Share Folders With Device": "Compartilhar pastas com o dispositivo",
     "Share With Devices": "Compartilhar com os dispositivos",
     "Share this folder?": "Compartilhar esta pasta?",
     "Shared With": "Compartilhada com",
     "Short identifier for the folder. Must be the same on all cluster devices.": "Identificador curto para a pasta. Deve ser igual em todos os dispositivos.",
     "Show ID": "Mostrar ID",
-    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Mostrado no lugar do ID do dispositivo no indicador de estado do grupo. Será divulgado aos outros dispositivos como um nome pré-definido opcional.",
+    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Mostrado no lugar do ID do dispositivo no indicador de estado do grupo. Será divulgado aos outros dispositivos como um nome opcional e pré-definido.",
     "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Mostrado no lugar do ID do dispositivo no indicador de estado do grupo. Será atualizado para o nome que o dispositivo divulga, caso seja deixado em branco.",
     "Shutdown": "Desligar",
     "Shutdown Complete": "Desligamento completado",
@@ -169,11 +172,11 @@
     "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "A configuração foi salva mas ainda não foi ativada. O Syncthing precisa ser reiniciado para a ativação da nova configuração.",
     "The device ID cannot be blank.": "O ID de dispositivo não pode ficar vazio.",
     "The device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "O ID do dispositivo a ser inserido aqui pode ser encontrado no menu \"Editar > Mostrar ID\" do outro dispositivo. Espaços e hífens são opcionais (ignorados).",
-    "The encrypted usage report is sent daily. It is used to track common platforms, folder sizes and app versions. If the reported data set is changed you will be prompted with this dialog again.": "O relatório criptografado de uso é enviado diariamente. É utilizado para rastrear plataformas, tamanhos de pastas e versões da aplicação. Caso o formato dos dados seja alterado, esta janela te avisará.",
+    "The encrypted usage report is sent daily. It is used to track common platforms, folder sizes and app versions. If the reported data set is changed you will be prompted with this dialog again.": "O relatório de uso é criptografado e enviado diariamente. É utilizado para rastrear plataformas, tamanhos de pastas e versões da aplicação. Caso o formato dos dados seja alterado, esta janela te avisará.",
     "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.": "O ID de dispositivo inserido não parece ser válido. Ele deve ter entre 52 e 56 caracteres e ser composto de letras e números, com espaços e hífens opcionais.",
     "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "O primeiro argumento da linha de comando é o caminho da pasta e o segundo é o caminho relativo à pasta.",
     "The folder ID cannot be blank.": "O ID da pasta não pode ficar vazio.",
-    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "O ID da pasta deve ser um identificador curto (com 64 caracteres ou menos), composto somente de letras, números, pontos (.), hífens (-) ou underscores (_).",
+    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "O ID da pasta deve ser um identificador curto (com 64 caracteres ou menos) e composto somente de letras, números, pontos (.), hífens (-) ou underscores (_).",
     "The folder ID must be unique.": "O ID da pasta deve ser único.",
     "The folder path cannot be blank.": "O caminho da pasta não pode ficar vazio.",
     "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "São utilizados os seguintes intervalos: na primeira hora é guardada uma versão a cada 30 segundos, no primeiro dia é guardada uma versão a cada hora, nos primeiros 30 dias é guardada uma versão por dia e, até que atinja a idade máxima, é guardada uma versão por semana.",
@@ -181,7 +184,7 @@
     "The maximum age must be a number and cannot be blank.": "A idade máxima deve ser um valor numérico. O campo não pode ficar vazio.",
     "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "O número máximo de dias em que uma versão é guardada. (Use 0 para manter para sempre).",
     "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "A porcentagem de espaço livre mínimo no disco deve ser um número positivo entre 0 e 100 (inclusive).",
-    "The number of days must be a number and cannot be blank.": "O número de dias deve ser um número valido e não pode ficar em branco.",
+    "The number of days must be a number and cannot be blank.": "O número de dias deve ser um número válido e não pode ficar em branco.",
     "The number of days to keep files in the trash can. Zero means forever.": "O número de dias em que são mantidos os arquivos da lixeira. Zero significa para sempre.",
     "The number of old versions to keep, per file.": "O número de versões antigas a serem mantidas, por arquivo.",
     "The number of versions must be a number and cannot be blank.": "O número de versões deve ser um valor numérico. O campo não pode ficar vazio.",
@@ -194,7 +197,7 @@
     "Unknown": "Desconhecida",
     "Unshared": "Não compartilhada",
     "Unused": "Não utilizado",
-    "Up to Date": "Sincronizada",
+    "Up to Date": "Em sincronia",
     "Updated": "Atualizado",
     "Upgrade": "Atualização",
     "Upgrade To {%version%}": "Atualizar para {{version}}",
@@ -206,9 +209,10 @@
     "Versions Path": "Caminho das versões",
     "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "As versões são automaticamente apagadas se elas são mais antigas do que a idade máxima ou excederem o número de arquivos permitido em um intervalo.",
     "When adding a new device, keep in mind that this device must be added on the other side too.": "Quando estiver adicionando um dispositivo, lembre-se de que este dispositivo deve ser adicionado do outro lado também.",
-    "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Quando adicionar uma nova pasta, lembre-se que o ID da pasta é utilizado para ligar pastas entre dispositivos. Ele é sensível às diferenças entre maiúsculas e minúsculas e devem ser iguais em todos os dispositivos.",
+    "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Quando adicionar uma nova pasta, lembre-se que o ID da pasta é utilizado para ligar pastas entre dispositivos. Ele é sensível às diferenças entre maiúsculas e minúsculas e deve ser o mesmo em todos os dispositivos.",
     "Yes": "Sim",
     "You must keep at least one version.": "Você deve manter pelo menos uma versão.",
+    "days": "dias",
     "full documentation": "documentação completa",
     "items": "itens",
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} quer compartilhar a pasta \"{{folder}}\"."

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

@@ -113,6 +113,8 @@
     "Override Changes": "Sobrepor alterações",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Caminho para a pasta no computador local. Será criada, caso não exista. O caractere (~) pode ser utilizado como atalho para",
     "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Caminho onde as versões são guardadas (deixe vazio para usar a pasta pré-definida .stversions dentro da pasta a que se refere).",
+    "Pause": "Pausar",
+    "Paused": "Em pausa",
     "Please consult the release notes before performing a major upgrade.": "Consulte as notas de lançamento antes de fazer uma actualização importante.",
     "Please wait": "Aguarde",
     "Preview": "Previsão",
@@ -130,6 +132,7 @@
     "Restart": "Reiniciar",
     "Restart Needed": "É preciso reiniciar",
     "Restarting": "Reiniciando",
+    "Resume": "Retomar",
     "Reused": "Reutilizado",
     "Save": "Gravar",
     "Scanning": "Verificando",
@@ -209,6 +212,7 @@
     "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Quando adicionar uma nova pasta, lembre-se que o ID da pasta é utilizado para ligar as pastas entre dispositivos. É sensível às diferenças entre maiúsculas e minúsculas e tem que ter uma correspondência perfeita entre todos os dispositivos.",
     "Yes": "Sim",
     "You must keep at least one version.": "Tem que manter pelo menos uma versão.",
+    "days": "dias",
     "full documentation": "documentação completa",
     "items": "itens",
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} quer partilhar a pasta \"{{folder}}\"."

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

@@ -113,6 +113,8 @@
     "Override Changes": "Suprascrie Schimbări",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Localizarea fișierului în acest computer. Dacă nu există, va fi creat. Tilda (~) înlocuiește ",
     "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Locul unde vor fi stocate versiunile (a se lăsa neschimbat pentru fișierul .stversions din fișier). ",
+    "Pause": "Pause",
+    "Paused": "Paused",
     "Please consult the release notes before performing a major upgrade.": "Please consult the release notes before performing a major upgrade.",
     "Please wait": "Aşteaptă",
     "Preview": "Previzualizează",
@@ -130,6 +132,7 @@
     "Restart": "Restart",
     "Restart Needed": "Restart Necesar",
     "Restarting": "Se restartează",
+    "Resume": "Resume",
     "Reused": "Refolosit",
     "Save": "Salvează",
     "Scanning": "Scanează",
@@ -209,6 +212,7 @@
     "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Cînd adăugaţi un fişier nou, nu uitaţi că ID-ul fişierului va rămîne acelaşi pe toate dispozitivele. Iar literele mari sînt diferite de literele mici. ",
     "Yes": "Da",
     "You must keep at least one version.": "Trebuie să păstrezi cel puţin o versiune.",
+    "days": "days",
     "full documentation": "toată documentaţia",
     "items": "obiecte",
     "{%device%} wants to share folder \"{%folder%}\".": "{{Dispozitivul}} vrea să transmită mapa {{Mapa}}"

gui/assets/lang/lang-ru.json

@@ -49,7 +49,7 @@
     "Edit Folder": "Изменить папку",
     "Editing": "Редактирование",
     "Enable UPnP": "Включить UPnP",
-    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.",
+    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Введите адреса через запятую (\"tcp://ip:port\", \"tcp://host:port\") или \"dynamic\" для автоматического поиска адресов.",
     "Enter ignore patterns, one per line.": "Введите шаблоны игнорирования, по одному на строку.",
     "Error": "Ошибка",
     "External File Versioning": "Внешний контроль версий файлов",
@@ -113,6 +113,8 @@
     "Override Changes": "Перезаписать изменения",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Путь к папке на локальном компьютере. Если её не существует, то она будет создана. Тильда (~) может использоваться как сокращение для",
     "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Путь, где должны храниться версии (оставьте пустым, чтобы использовать папку по умолчанию .stversions внутри папки).",
+    "Pause": "Пауза",
+    "Paused": "Остановлено",
     "Please consult the release notes before performing a major upgrade.": "Перед проведением обновления основной версии ознакомтесь, пожалуйста, с Замечаниями к версии",
     "Please wait": "Пожалуйста, подождите",
     "Preview": "Предварительный просмотр",
@@ -120,8 +122,8 @@
     "Quick guide to supported patterns": "Краткое руководство по поддерживаемым шаблонам",
     "RAM Utilization": "Использование ОЗУ",
     "Random": "Случайно",
-    "Relayed via": "Relayed via",
-    "Relays": "Relays",
+    "Relayed via": "Релей через",
+    "Relays": "Релеи",
     "Release Notes": "Замечания к версии",
     "Remove": "Удалить",
     "Rescan": "Пересканирование",
@@ -130,6 +132,7 @@
     "Restart": "Перезапуск",
     "Restart Needed": "Требуется перезапуск",
     "Restarting": "Перезапуск",
+    "Resume": "Возобновить",
     "Reused": "Повторно использовано",
     "Save": "Сохранить",
     "Scanning": "Сканирование",
@@ -186,7 +189,7 @@
     "The number of old versions to keep, per file.": "Количество хранимых версий файла.",
     "The number of versions must be a number and cannot be blank.": "Количество версий должно быть числом и не может быть пустым.",
     "The path cannot be blank.": "Путь не может быть пустым.",
-    "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
+    "The rate limit must be a non-negative number (0: no limit)": "Скорость должна быть неотрицательным числом (0: нет ограничения)",
     "The rescan interval must be a non-negative number of seconds.": "Интервал пересканирования должен быть неотрицательным количеством секунд.",
     "They are retried automatically and will be synced when the error is resolved.": "Будут синхронизированы автоматически когда ошибка будет исправлена.",
     "This is a major version upgrade.": "Это обновление основной версии продукта.",
@@ -209,6 +212,7 @@
     "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Когда добавляете новую папку, помните, что ID папок используются для того, чтобы связывать папки между всеми устройствами. Они чувствительны к регистру и должны совпадать на всех используемых устройствах.",
     "Yes": "Да",
     "You must keep at least one version.": "Вы должны хранить как минимум одну версию.",
+    "days": "Дней",
     "full documentation": "полная документация",
     "items": "элементы",
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} хочет поделиться папкой \"{{folder}}\"."

gui/assets/lang/lang-sv.json

@@ -113,6 +113,8 @@
     "Override Changes": "Skriv över ändringar",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Sökväg till katalogen på din dator. Kommer att skapas om det inte finns. Tecknet tilde (~) kan användas som en genväg för",
     "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Sökväg där versioner sparas (lämna tomt för att använda .stversions i den ordinarie katalogen).",
+    "Pause": "Pause",
+    "Paused": "Paused",
     "Please consult the release notes before performing a major upgrade.": "Läs igenom versionsnyheterna innan den stora uppgraderingen.",
     "Please wait": "Var god vänta",
     "Preview": "Förhandsgranska",
@@ -130,6 +132,7 @@
     "Restart": "Starta om",
     "Restart Needed": "Omstart behövs",
     "Restarting": "Startar om",
+    "Resume": "Resume",
     "Reused": "Återanvänt",
     "Save": "Spara",
     "Scanning": "Uppdaterar",
@@ -209,6 +212,7 @@
     "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "När du lägger till ny katalog, tänk på att katalog-ID:t knyter ihop katalogen mellan olika noder. De måste vara exakt desamma mellan noder och stora eller små bokstäver har betydelse.",
     "Yes": "Ja",
     "You must keep at least one version.": "Du måste behålla åtminstone en version.",
+    "days": "days",
     "full documentation": "fullständig dokumentation",
     "items": "poster",
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} vill dela katalogen \"{{folder}}\"."

gui/assets/lang/lang-tr.json

@@ -1,215 +0,0 @@
-{
-    "A negative number of days doesn't make sense.": "A negative number of days doesn't make sense.",
-    "A new major version may not be compatible with previous versions.": "A new major version may not be compatible with previous versions.",
-    "API Key": "API Anahtarı",
-    "About": "Hakkında",
-    "Actions": "Actions",
-    "Add": "Ekle",
-    "Add Device": "Cihaz Ekle",
-    "Add Folder": "Klasör Ekle",
-    "Add new folder?": "Yeni klasör ekle?",
-    "Address": "Adres",
-    "Addresses": "Adresler",
-    "Advanced": "Advanced",
-    "Advanced Configuration": "Advanced Configuration",
-    "All Data": "All Data",
-    "Allow Anonymous Usage Reporting?": "Anonim kullanım raporlarına izin ver ?",
-    "Alphabetic": "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": "Anonim Kullanım Raporlama",
-    "Any devices configured on an introducer device will be added to this device as well.": "Tanıtıcı bir cihazda yapılandırılan cihazlar bu cihaza da eklenecektir.",
-    "Automatic upgrades": "Otomatik güncellemeler",
-    "Be careful!": "Be careful!",
-    "Bugs": "Hatalar",
-    "CPU Utilization": "İşlemci Kullanımı",
-    "Changelog": "Değişim Günlüğü",
-    "Clean out after": "Clean out after",
-    "Close": "Kapat",
-    "Command": "Command",
-    "Comment, when used at the start of a line": "Satır başında kullanıldığında açıklama özelliği taşır",
-    "Compression": "Sıkıştırma",
-    "Connection Error": "Bağlantı hatası",
-    "Copied from elsewhere": "Başka bir yerden kopyalanmış",
-    "Copied from original": "Aslından kopyalanmış",
-    "Copyright © 2015 the following Contributors:": "Telif Hakkı © 2015 Katkıda bulunanlar:",
-    "Delete": "Sil",
-    "Deleted": "Deleted",
-    "Device ID": "Cihaz ID",
-    "Device Identification": "Cihaz Kimliği",
-    "Device Name": "Cihaz Adı",
-    "Device {%device%} ({%address%}) wants to connect. Add new device?": "Cihaz {{device}} ({{address}}) bağlanmak istiyor. Yeni cihaz ekle?",
-    "Devices": "Cihazlar",
-    "Disconnected": "Bağlantı Kesik",
-    "Documentation": "Dokümantasyon",
-    "Download Rate": "İndirme Hızı",
-    "Downloaded": "İndirilmiş",
-    "Downloading": "İndiriliyor",
-    "Edit": "Seçenekler",
-    "Edit Device": "Cihaz Düzenle",
-    "Edit Folder": "Klasör Düzenle",
-    "Editing": "Düzenleniyor",
-    "Enable UPnP": "UPnP Etkinleştir",
-    "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.": "Yoksayılacak kalıp dizilerini her satıra bir tane olacak şekilde girin.",
-    "Error": "Hata",
-    "External File Versioning": "Harici Dosya Sürümlendirme",
-    "Failed Items": "Failed Items",
-    "File Pull Order": "File Pull Order",
-    "File Versioning": "Dosya Sürümlendirme",
-    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Değişimleri yoklarken dosya izin bilgilerini ihmal et. FAT dosya sistemlerinde kullanın.",
-    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Files are moved to .stversions folder when replaced or deleted by Syncthing.",
-    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Dosyalar Syncthing tarafından değiştirildiğinde ya da silindiğinde, tarih damgalı sürümleri .stversions dizinine taşınır.",
-    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Dosyalar diğer cihazlarda yapılan değişikliklerden korunur, ancak bu cihazdaki değişiklikler kümedeki diğer cihazlara gönderilir.",
-    "Folder": "Folder",
-    "Folder ID": "Klasör ID",
-    "Folder Master": "Ana Klasör",
-    "Folder Path": "Klasör Yolu",
-    "Folders": "Klasörler",
-    "GUI": "GUI",
-    "GUI Authentication Password": "Kullanıcı arayüzü şifresi",
-    "GUI Authentication User": "Kullanıcı arayüzü kullanıcı ismi",
-    "GUI Listen Addresses": "Kullanıcı arayüzü bağlantı adresi",
-    "Generate": "Oluştur",
-    "Global Discovery": "Küresel Keşif",
-    "Global Discovery Server": "Küresel Keşif Sunucusu",
-    "Global State": "Küresel Durum",
-    "Help": "Help",
-    "Home page": "Home page",
-    "Ignore": "Yoksay",
-    "Ignore Patterns": "Kalıpları Yoksay",
-    "Ignore Permissions": "İzinleri yoksay",
-    "Incoming Rate Limit (KiB/s)": "İndirme Oranı Limiti (KiB/s)",
-    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Incorrect configuration may damage your folder contents and render Syncthing inoperable.",
-    "Introducer": "Tanıtıcı",
-    "Inversion of the given condition (i.e. do not exclude)": "Verilen koşulun ters çevirilmesi (örneğin: yok sayma)",
-    "Keep Versions": "Sürüm tut",
-    "Largest First": "Largest First",
-    "Last File Received": "Alınan Son Dosya",
-    "Last seen": "Son Görülen",
-    "Later": "Sonra",
-    "Local Discovery": "Yerel bulma",
-    "Local State": "Yerel Durum",
-    "Local State (Total)": "Local State (Total)",
-    "Major Upgrade": "Major Upgrade",
-    "Maximum Age": "Azami Süre",
-    "Metadata Only": "Metadata Only",
-    "Minimum Free Disk Space": "Minimum Free Disk Space",
-    "Move to top of queue": "Move to top of queue",
-    "Multi level wildcard (matches multiple directory levels)": "Çoklu düzey wildcard (çok sayıda dizin düzeyinde eşleşme)",
-    "Never": "Asla",
-    "New Device": "Yeni Cihaz",
-    "New Folder": "Yeni Klasör",
-    "Newest First": "Newest First",
-    "No": "Hayır",
-    "No File Versioning": "Sürümlendirme Yok",
-    "Notice": "Uyarı",
-    "OK": "Tamam",
-    "Off": "Off",
-    "Oldest First": "Oldest First",
-    "Options": "Options",
-    "Out of Sync": "Out of Sync",
-    "Out of Sync Items": "Eşzamanlanmayan Öğeler",
-    "Outgoing Rate Limit (KiB/s)": "Yükleme hız sınırı (KB/sn)",
-    "Override Changes": "Değişiklikleri Geçersiz kıl",
-    "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Yerel bilgisayardaki klasöre ulaşım yolu. Dizin yoksa yaratılacak. (~) karakterinin kısayol olarak kullanılabileceği yol",
-    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Sürümlerin saklanması gereken yol (klasördeki öntanımlı .stversions klasörü için boş bırakın)",
-    "Please consult the release notes before performing a major upgrade.": "Please consult the release notes before performing a major upgrade.",
-    "Please wait": "Lütfen Bekleyin",
-    "Preview": "Önizleme",
-    "Preview Usage Report": "Kullanım raporunu gözden geçir",
-    "Quick guide to supported patterns": "Desteklenen kalıplar için hızlı rehber",
-    "RAM Utilization": "RAM Kullanımı",
-    "Random": "Random",
-    "Relayed via": "Relayed via",
-    "Relays": "Relays",
-    "Release Notes": "Release Notes",
-    "Remove": "Remove",
-    "Rescan": "Tekrar Tara",
-    "Rescan All": "Tümünü Tekrar Tara",
-    "Rescan Interval": "Tarama Aralığı",
-    "Restart": "Yeniden Başlat",
-    "Restart Needed": "Yeniden başlatma gereklidir",
-    "Restarting": "Yeniden başlatılıyor",
-    "Reused": "Yeniden Kullanılan",
-    "Save": "Kaydet",
-    "Scanning": "Taranıyor",
-    "Select the devices to share this folder with.": "Bu klasörü paylaşacağın cihazları seç.",
-    "Select the folders to share with this device.": "Bu cihazla paylaşılacak klasörleri seç.",
-    "Settings": "Ayarlar",
-    "Share": "Paylaş",
-    "Share Folder": "Paylaşım Klasörü",
-    "Share Folders With Device": "Klasörü Cihazla Paylaş",
-    "Share With Devices": "Cihazlar İle Paylaş",
-    "Share this folder?": "Bu klasörü paylaşmak istiyor musun?",
-    "Shared With": "Paylaşılan düğümler",
-    "Short identifier for the folder. Must be the same on all cluster devices.": "Klasörü için kısa tanımlayıcı. Tüm küme cihazlarda aynı olmalıdır.",
-    "Show ID": "ID Göster",
-    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Küme durumunda Cihaz ID yerine bunu göster. Varsayılan isim isteğe bağlı olarak diğer cihazlara ilan edilecektir.",
-    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Küme durumunda Cihaz ID yerine bunu göster. Eğer düğüm ismi boş bırakılırsa düğüm ismi güncellenip ilan edilecektir.",
-    "Shutdown": "Kapat",
-    "Shutdown Complete": "Kapatma İşlemi Tamamlandı",
-    "Simple File Versioning": "Basit Dosya Sürümlendirme",
-    "Single level wildcard (matches within a directory only)": "Tekli düzey wildcard (sadece bir dizin içinde eşleşme)",
-    "Smallest First": "Smallest First",
-    "Source Code": "Kaynak Kodu",
-    "Staggered File Versioning": "Aşamalı Dosya Sürümlendirme",
-    "Start Browser": "Tarayıcıyı Başlat",
-    "Statistics": "Statistics",
-    "Stopped": "Durduruldu",
-    "Support": "Destek",
-    "Sync Protocol Listen Addresses": "Sync Protokol Dinleme Adresleri",
-    "Syncing": "Senkronize ediliyor",
-    "Syncthing has been shut down.": "Syncthing durduruldu",
-    "Syncthing includes the following software or portions thereof:": "Syncthing aşağıdaki yazılımları veya bunların bölümlerini içermektedir:",
-    "Syncthing is restarting.": "Syncthing yeniden başlatılıyor.",
-    "Syncthing is upgrading.": "Syncthing yükseltiliyor.",
-    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing görünüşe durdu veya internetin bağlantınızda problem var. Tekrar deniyor....",
-    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing isteminizi işleme alırken bir sorunla karşılaştı. Lütfen sayfanızı yenileyin veya sorun devam ediyorsa Syncthing'i yeniden başlatın.",
-    "The aggregated statistics are publicly available at {%url%}.": "Toplanan halka açık istatistiklere ulaşabileceğiniz adres {{url}}.",
-    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Ayarlar kaydedildi ancak aktifleştirilmedi. Aktifleştirmek için Syncthing yeniden başlatılmalı.",
-    "The device ID cannot be blank.": "Cihaz ID boş olamaz.",
-    "The device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "Buraya girilecek cihaz ID'si diğer düğümde \"Düzenle > ID Göster\" menüsünden bulunabilir. Boşluk ve kısa çizginin olup olmaması önemli değildir. (İhmal edilir)",
-    "The encrypted usage report is sent daily. It is used to track common platforms, folder sizes and app versions. If the reported data set is changed you will be prompted with this dialog again.": "Şifrelenmiş kullanım bilgisi günlük olarak gönderilir. Platform, klasör büyüklüğü ve uygulama sürümü hakkında bilgi toplanır. Toplanan bilgi çeşidi değişecek olursa, sizden tekrar onay istenecek.",
-    "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.": "Girilen cihaz ID'si geçerli gibi gözükmüyor. 52 ya da 56 karakter uzunluğunda, harf ve rakamlardan oluşmalı. Boşlukların ve kısa çizgilerin olup olmaması önemli değildir.",
-    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "The first command line parameter is the folder path and the second parameter is the relative path in the folder.",
-    "The folder ID cannot be blank.": "Klasör ID boş olamaz.",
-    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "Klasör ID uzun olmamalı (64 karakter ya da daha az). Sadece harf, rakam, nokta (.), kısa çizgi (-) ve alt çizgi (_) kullanabilirsiniz.",
-    "The folder ID must be unique.": "Klasör ID benzersiz olmalıdır.",
-    "The folder path cannot be blank.": "Klasör dizini boş bırakılamaz.",
-    "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "Kullanılan zaman aralıkları : ilk bir saat içinde her 30 saniyede, ilk günde her saatte, ilk 30 günde her gün, azami süreye kadar geçen zamanda ise her hafta yeni sürüm değeri oluşturulur.",
-    "The following items could not be synchronized.": "The following items could not be synchronized.",
-    "The maximum age must be a number and cannot be blank.": "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 daimi 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).": "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).",
-    "The number of days must be a number and cannot be blank.": "The number of days must be a number and cannot be blank.",
-    "The number of days to keep files in the trash can. Zero means forever.": "The number of days to keep files in the trash can. Zero means forever.",
-    "The number of old versions to keep, per file.": "Dosya başına saklanacak eski sürüm.",
-    "The number of versions must be a number and cannot be blank.": "Sürümlerin sayısı sayı olmalı ve boş bırakılamaz.",
-    "The path cannot be blank.": "Dizin yolu boş bırakılamaz.",
-    "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
-    "The rescan interval must be a non-negative number of seconds.": "Tarama zaman aralığı, saniye cinsinden negatif olmayan bir sayı olmalıdır.",
-    "They are retried automatically and will be synced when the error is resolved.": "They are retried automatically and will be synced when the error is resolved.",
-    "This is a major version upgrade.": "This is a major version upgrade.",
-    "Trash Can File Versioning": "Trash Can File Versioning",
-    "Unknown": "Bilinmiyor",
-    "Unshared": "Paylaşılmayan",
-    "Unused": "Kullanılmayan",
-    "Up to Date": "Güncel",
-    "Updated": "Updated",
-    "Upgrade": "Upgrade",
-    "Upgrade To {%version%}": "{{version}} sürümüne yükselt",
-    "Upgrading": "Yükseltiliyor",
-    "Upload Rate": "Yükleme hızı",
-    "Uptime": "Uptime",
-    "Use HTTPS for GUI": "GUI için HTTPS kullan",
-    "Version": "Sürüm",
-    "Versions Path": "Sürüm Dizini",
-    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Sürümler, tanımlı azami süre veya belirlenen zaman aralığı için izin verilen dosya sayısı aşılmışsa kendiliğinden silinir.",
-    "When adding a new device, keep in mind that this device must be added on the other side too.": "Yeni bir cihaz eklendiğinde, bu cihazın karşı tarafa da eklenmesi gerektiğini unutmayın.",
-    "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Yeni bir klasör eklendiğinde, Klasör ID'nin klasörleri cihazlar arasında bağlantılandırmak için kullanıldığını unutmayın. Klasör ID'ler büyük - küçük harf duyarlıdır ve bütün cihazlarda tamı tamına eşleşmelidir.",
-    "Yes": "Evet",
-    "You must keep at least one version.": "En az bir sürümü tutmalısınız.",
-    "full documentation": "belgelendirme içeriğinin tümü",
-    "items": "öğeler",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}}  \"{{folder}}\" klasörünü paylaşmak istiyor."
-}

gui/assets/lang/lang-uk.json

@@ -49,7 +49,7 @@
     "Edit Folder": "Редагувати директорію",
     "Editing": "Редагування",
     "Enable UPnP": "Увімкнути UPnP",
-    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.",
+    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Введіть розділені комою (\"tcp://ip:port\", \"tcp://host:port\") адреси або \"dynamic\" для автоматичного визначення адреси.",
     "Enter ignore patterns, one per line.": "Введіть шаблони ігнорування, по одному на рядок.",
     "Error": "Помилка",
     "External File Versioning": "Зовнішне керування версіями",
@@ -74,7 +74,7 @@
     "Global Discovery Server": "Сервер для глобального виявлення",
     "Global State": "Глобальний статус",
     "Help": "Допомога",
-    "Home page": "Home page",
+    "Home page": "Домашня сторінка",
     "Ignore": "Ігнорувати",
     "Ignore Patterns": "Ігнорувати шаблони",
     "Ignore Permissions": "Ігнорувати права доступу до файлів",
@@ -93,7 +93,7 @@
     "Major Upgrade": "Мажорне оновлення",
     "Maximum Age": "Максимальний вік",
     "Metadata Only": "Тільки метадані",
-    "Minimum Free Disk Space": "Minimum Free Disk Space",
+    "Minimum Free Disk Space": "Мінімальний вільний простір на диску",
     "Move to top of queue": "Пересунути у початок черги",
     "Multi level wildcard (matches multiple directory levels)": "Багаторівнева маска (пошук збігів в усіх піддиректоріях) ",
     "Never": "Ніколи",
@@ -113,6 +113,8 @@
     "Override Changes": "Перезаписати зміни",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Шлях до директорії на локальному комп’ютері. Буде створений, якщо такий не існує. Символ тильди (~) може бути використаний як ярлик для",
     "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Шлях, де повинні зберігатися версії (залиште порожнім для зберігання в .stversions в середині директорії)",
+    "Pause": "Пауза",
+    "Paused": "Призупинено",
     "Please consult the release notes before performing a major upgrade.": "Будь ласка перегляньте примітки до випуску перед мажорним оновленням. ",
     "Please wait": "Будь ласка, зачекайте",
     "Preview": "Попередній перегляд",
@@ -120,16 +122,17 @@
     "Quick guide to supported patterns": "Швидкий посібник по шаблонам, що підтримуються",
     "RAM Utilization": "Використання RAM",
     "Random": "Випадково",
-    "Relayed via": "Relayed via",
-    "Relays": "Relays",
+    "Relayed via": "Ретранслювати через",
+    "Relays": "Ретрансляція",
     "Release Notes": "Примітки до випуску",
-    "Remove": "Remove",
+    "Remove": "Видалити",
     "Rescan": "Пересканувати",
     "Rescan All": "Пересканувати усе",
     "Rescan Interval": "Інтервал для повторного сканування",
     "Restart": "Перезапуск",
     "Restart Needed": "Необхідний перезапуск",
     "Restarting": "Відбувається перезапуск",
+    "Resume": "Продовжити",
     "Reused": "Використано вдруге",
     "Save": "Зберегти",
     "Scanning": "Сканування",
@@ -154,7 +157,7 @@
     "Source Code": "Сирцевий код",
     "Staggered File Versioning": "Поступове версіонування",
     "Start Browser": "Запустити браузер",
-    "Statistics": "Statistics",
+    "Statistics": "Статистика",
     "Stopped": "Зупинено",
     "Support": "Підтримка",
     "Sync Protocol Listen Addresses": "Адреса панелі управління",
@@ -180,13 +183,13 @@
     "The following items could not be synchronized.": "Наступні пункти не можуть бути синхронізовані.",
     "The maximum age must be a number and cannot be blank.": "Максимальний термін повинен бути числом та не може бути пустим.",
     "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Максимальний термін, щоб зберігати версію (у днях, вствновіть в 0, щоби зберігати версії назавжди).",
-    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).",
+    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "Відсоток мінімального вільного простору на диску має бути додатнім числом від 0 до 100 включно.",
     "The number of days must be a number and cannot be blank.": "Кількість днів має бути числом і не може бути порожнім.",
     "The number of days to keep files in the trash can. Zero means forever.": "Кількість днів зберігання файлів у кошику. Нуль означає назавжди.",
     "The number of old versions to keep, per file.": "Кількість старих версій, яку необхідно зберігати для кожного файлу.",
     "The number of versions must be a number and cannot be blank.": "Кількість версій повинна бути цифрою та не може бути порожньою.",
     "The path cannot be blank.": "Шлях не може бути порожнім.",
-    "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
+    "The rate limit must be a non-negative number (0: no limit)": "Швидкість має бути додатнім числом.",
     "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 is a major version upgrade.": "Це оновлення мажорної версії",
@@ -209,6 +212,7 @@
     "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Коли додаєте нову директорію, пам’ятайте, що ID цієї директорії використовується для того, щоб зв’язувати директорії разом між вузлами. Назви є чутливими до регістра та повинні співпадати точно між усіма вузлами.",
     "Yes": "Так",
     "You must keep at least one version.": "Ви повинні зберігати щонайменше одну версію.",
+    "days": "днів",
     "full documentation": "повна документація",
     "items": "елементи",
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} хоче поділитися директорією \"{{folder}}\"."

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

@@ -113,6 +113,8 @@
     "Override Changes": "撤销改变",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "文件夹在本地的路径。如果不存在，则会被创建。波浪线符号（~）是如下路径的缩略符：",
     "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "用来存储历史版本的文件夹（留空则将默认会存储在.stversions文件夹中）",
+    "Pause": "暂停",
+    "Paused": "暂停中",
     "Please consult the release notes before performing a major upgrade.": "请在进行重大更新前查看发布说明。",
     "Please wait": "请稍候",
     "Preview": "预览",
@@ -130,6 +132,7 @@
     "Restart": "重启 Syncthing",
     "Restart Needed": "需要重启 Syncthing",
     "Restarting": "重启中",
+    "Resume": "恢复",
     "Reused": "复用",
     "Save": "保存",
     "Scanning": "扫描中",
@@ -209,6 +212,7 @@
     "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "若你添加了新文件夹，记住文件夹标识是用以在不同设备间建立联系的。在不同设备间拥有相同标识的文件夹将会被同步。且文件夹标识大小写敏感。",
     "Yes": "是",
     "You must keep at least one version.": "您必须保留至少一个版本。",
+    "days": "days",
     "full documentation": "完整文档",
     "items": "条目",
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} 想将 “{{folder}}” 文件夹共享给您"

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

@@ -113,6 +113,8 @@
     "Override Changes": "置換改變",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "資料夾在本地電腦的路徑。若資料夾不存在則會建立。波浪符號 (~) 可用作下列資料夾的捷徑：",
     "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "儲存歷史版本的路徑 (若為空，則預設使用資料夾中的 .stversions 資料夾)。",
+    "Pause": "Pause",
+    "Paused": "Paused",
     "Please consult the release notes before performing a major upgrade.": "執行重大升級前請先參閱版本資訊。",
     "Please wait": "請稍後",
     "Preview": "預覽",
@@ -130,6 +132,7 @@
     "Restart": "重新啟動",
     "Restart Needed": "需要重新啟動",
     "Restarting": "正在重新啟動",
+    "Resume": "Resume",
     "Reused": "Reused",
     "Save": "儲存",
     "Scanning": "正在掃描",
@@ -209,6 +212,7 @@
     "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "當新增一個資料夾時，請記住，資料夾識別碼是用來將裝置之間的資料夾綁定在一起的。它們有區分大小寫，且必須在所有裝置之間完全相同。",
     "Yes": "是",
     "You must keep at least one version.": "您必須保留至少一個版本。",
+    "days": "days",
     "full documentation": "完整說明文件",
     "items": "個項目",
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} 想要分享資料夾 \"{{folder}}\"。"

gui/assets/lang/prettyprint.js

@@ -1 +1 @@
-var langPrettyprint = {"bg":"Bulgarian","ca":"Catalan","ca@valencia":"Catalan (Valencian)","cs":"Czech","de":"German","el":"Greek","en":"English","en-GB":"English (United Kingdom)","es":"Spanish","es-ES":"Spanish (Spain)","fi":"Finnish","fr":"French","fr-CA":"French (Canada)","hu":"Hungarian","it":"Italian","ja":"Japanese","ko-KR":"Korean (Korea)","lt":"Lithuanian","nb":"Norwegian Bokmål","nl":"Dutch","nn":"Norwegian Nynorsk","pl":"Polish","pt-BR":"Portuguese (Brazil)","pt-PT":"Portuguese (Portugal)","ro-RO":"Romanian (Romania)","ru":"Russian","sv":"Swedish","tr":"Turkish","uk":"Ukrainian","zh-CN":"Chinese (China)","zh-TW":"Chinese (Taiwan)"}
+var langPrettyprint = {"bg":"Bulgarian","ca":"Catalan","ca@valencia":"Catalan (Valencian)","cs":"Czech","de":"German","el":"Greek","en":"English","en-GB":"English (United Kingdom)","es":"Spanish","es-ES":"Spanish (Spain)","fi":"Finnish","fr":"French","fr-CA":"French (Canada)","hu":"Hungarian","it":"Italian","ja":"Japanese","ko-KR":"Korean (Korea)","lt":"Lithuanian","nb":"Norwegian Bokmål","nl":"Dutch","nn":"Norwegian Nynorsk","pl":"Polish","pt-BR":"Portuguese (Brazil)","pt-PT":"Portuguese (Portugal)","ro-RO":"Romanian (Romania)","ru":"Russian","sv":"Swedish","uk":"Ukrainian","zh-CN":"Chinese (China)","zh-TW":"Chinese (Taiwan)"}

gui/assets/lang/valid-langs.js

@@ -1 +1 @@
-var validLangs = ["bg","ca","ca@valencia","cs","de","el","en","en-GB","es","es-ES","fi","fr","fr-CA","hu","it","ja","ko-KR","lt","nb","nl","nn","pl","pt-BR","pt-PT","ro-RO","ru","sv","tr","uk","zh-CN","zh-TW"]
+var validLangs = ["bg","ca","ca@valencia","cs","de","el","en","en-GB","es","es-ES","fi","fr","fr-CA","hu","it","ja","ko-KR","lt","nb","nl","nn","pl","pt-BR","pt-PT","ro-RO","ru","sv","uk","zh-CN","zh-TW"]

gui/syncthing/app.js

@@ -24,7 +24,6 @@ var urlbase = 'rest';
 
 syncthing.config(function ($httpProvider, $translateProvider, LocaleServiceProvider) {
     $httpProvider.interceptors.push(function xHeadersResponseInterceptor() {
-        var guiVersion = null;
         var deviceId = null;
 
         return {
@@ -38,14 +37,6 @@ syncthing.config(function ($httpProvider, $translateProvider, LocaleServiceProvi
                     return response;
                 }
 
-                responseVersion = headers['x-syncthing-version'];
-
-                if (!guiVersion) {
-                    guiVersion = responseVersion;
-                } else if (guiVersion != responseVersion) {
-                    document.location.reload(true);
-                }
-
                 if (!deviceId) {
                     deviceId = headers['x-syncthing-id'];
                     if (deviceId) {

gui/syncthing/core/aboutModalView.html

@@ -13,6 +13,7 @@
     <div class="col-md-12">
       <ul class="list-unstyled three-columns" id="contributor-list">
         <li class="auto-generated">Aaron Bieber</li>
+        <li class="auto-generated">Adam Piggott</li>
         <li class="auto-generated">Alexander Graf</li>
         <li class="auto-generated">Andrew Dunham</li>
         <li class="auto-generated">Antony Male</li>
@@ -59,6 +60,7 @@
         <li class="auto-generated">Marc Laporte</li>
         <li class="auto-generated">Marc Pujol</li>
         <li class="auto-generated">Marcin Dziadus</li>
+        <li class="auto-generated">Matt Burke</li>
         <li class="auto-generated">Michael Jephcote</li>
         <li class="auto-generated">Michael Tilli</li>
         <li class="auto-generated">Pascal Jungblut</li>

gui/syncthing/core/syncthingController.js

@@ -89,6 +89,12 @@ angular.module('syncthing.core')
             refreshFolderStats();
 
             $http.get(urlbase + '/system/version').success(function (data) {
+                if ($scope.version.version && $scope.version.version != data.version) {
+                    // We already have a version response, but it differs from
+                    // the new one. Reload the full GUI in case it's changed.
+                    document.location.reload(true);
+                }
+
                 $scope.version = data;
             }).error($scope.emitHTTPError);
 

gui/syncthing/folder/editFolderModalView.html

@@ -40,8 +40,8 @@
                 </p>
               </div>
               <div class="form-group" ng-class="{'has-error': folderEditor.minDiskFreePct.$invalid && folderEditor.minDiskFreePct.$dirty}">
-                <label for="minDiskFreePct"><span translate>Minimum Free Disk Space</span> (0-100%)</label>
-                <input name="minDiskFreePct" id="minDiskFreePct" class="form-control" type="number" ng-model="currentFolder.minDiskFreePct" required min="0" max="100"></input>
+                <label for="minDiskFreePct"><span translate>Minimum Free Disk Space</span> (0.0 - 100.0%)</label>
+                <input name="minDiskFreePct" id="minDiskFreePct" class="form-control" type="number" ng-model="currentFolder.minDiskFreePct" required min="0.0" max="100.0"></input>
                 <p class="help-block">
                   <span translate ng-if="!folderEditor.minDiskFreePct.$valid && folderEditor.minDiskFreePct.$dirty">The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).</span>
                 </p>

lib/beacon/multicast.go

@@ -8,7 +8,6 @@ package beacon
 
 import (
 	"errors"
-	"fmt"
 	"net"
 
 	"golang.org/x/net/ipv6"
@@ -28,7 +27,7 @@ func NewMulticast(addr string) (*Multicast, error) {
 		return nil, err
 	}
 
-	conn, err := net.ListenPacket("udp6", fmt.Sprintf("[::]:%d", gaddr.Port))
+	conn, err := net.ListenPacket("udp6", addr)
 	if err != nil {
 		return nil, err
 	}

lib/config/config.go

@@ -74,7 +74,7 @@ type FolderConfiguration struct {
 	RescanIntervalS int                         `xml:"rescanIntervalS,attr" json:"rescanIntervalS"`
 	IgnorePerms     bool                        `xml:"ignorePerms,attr" json:"ignorePerms"`
 	AutoNormalize   bool                        `xml:"autoNormalize,attr" json:"autoNormalize"`
-	MinDiskFreePct  int                         `xml:"minDiskFreePct" json:"minDiskFreePct"`
+	MinDiskFreePct  float64                     `xml:"minDiskFreePct" json:"minDiskFreePct"`
 	Versioning      VersioningConfiguration     `xml:"versioning" json:"versioning"`
 	Copiers         int                         `xml:"copiers" json:"copiers"` // This defines how many files are handled concurrently.
 	Pullers         int                         `xml:"pullers" json:"pullers"` // Defines how many blocks are fetched at the same time, possibly between separate copier routines.
@@ -238,7 +238,7 @@ type OptionsConfiguration struct {
 	DatabaseBlockCacheMiB   int      `xml:"databaseBlockCacheMiB" json:"databaseBlockCacheMiB" default:"0"`
 	PingTimeoutS            int      `xml:"pingTimeoutS" json:"pingTimeoutS" default:"30"`
 	PingIdleTimeS           int      `xml:"pingIdleTimeS" json:"pingIdleTimeS" default:"60"`
-	MinHomeDiskFreePct      int      `xml:"minHomeDiskFreePct" json:"minHomeDiskFreePct" default:"1"`
+	MinHomeDiskFreePct      float64  `xml:"minHomeDiskFreePct" json:"minHomeDiskFreePct" default:"1"`
 }
 
 func (orig OptionsConfiguration) Copy() OptionsConfiguration {
@@ -534,6 +534,13 @@ func setDefaults(data interface{}) error {
 				}
 				f.SetInt(i)
 
+			case float64:
+				i, err := strconv.ParseFloat(v, 64)
+				if err != nil {
+					return err
+				}
+				f.SetFloat(i)
+
 			case bool:
 				f.SetBool(v == "true")
 

lib/config/config_test.go

@@ -166,7 +166,7 @@ func TestOverriddenValues(t *testing.T) {
 		DatabaseBlockCacheMiB:   42,
 		PingTimeoutS:            60,
 		PingIdleTimeS:           120,
-		MinHomeDiskFreePct:      5,
+		MinHomeDiskFreePct:      5.2,
 	}
 
 	cfg, err := Load("testdata/overridenvalues.xml", device1)

lib/config/testdata/overridenvalues.xml

@@ -26,6 +26,6 @@
         <databaseBlockCacheMiB>42</databaseBlockCacheMiB>
         <pingTimeoutS>60</pingTimeoutS>
         <pingIdleTimeS>120</pingIdleTimeS>
-        <minHomeDiskFreePct>5</minHomeDiskFreePct>
+        <minHomeDiskFreePct>5.2</minHomeDiskFreePct>
     </options>
 </configuration>

lib/events/events.go

@@ -90,7 +90,7 @@ func (t EventType) MarshalText() ([]byte, error) {
 const BufferSize = 64
 
 type Logger struct {
-	subs   map[int]*Subscription
+	subs   []*Subscription
 	nextID int
 	mutex  sync.Mutex
 }
@@ -104,7 +104,6 @@ type Event struct {
 
 type Subscription struct {
 	mask    EventType
-	id      int
 	events  chan Event
 	timeout *time.Timer
 }
@@ -118,7 +117,6 @@ var (
 
 func NewLogger() *Logger {
 	return &Logger{
-		subs:  make(map[int]*Subscription),
 		mutex: sync.NewMutex(),
 	}
 }
@@ -128,13 +126,13 @@ func (l *Logger) Log(t EventType, data interface{}) {
 	if debug {
 		dl.Debugln("log", l.nextID, t.String(), data)
 	}
+	l.nextID++
 	e := Event{
 		ID:   l.nextID,
 		Time: time.Now(),
 		Type: t,
 		Data: data,
 	}
-	l.nextID++
 	for _, s := range l.subs {
 		if s.mask&t != 0 {
 			select {
@@ -154,12 +152,10 @@ func (l *Logger) Subscribe(mask EventType) *Subscription {
 	}
 	s := &Subscription{
 		mask:    mask,
-		id:      l.nextID,
 		events:  make(chan Event, BufferSize),
 		timeout: time.NewTimer(0),
 	}
-	l.nextID++
-	l.subs[s.id] = s
+	l.subs = append(l.subs, s)
 	l.mutex.Unlock()
 	return s
 }
@@ -169,7 +165,15 @@ func (l *Logger) Unsubscribe(s *Subscription) {
 	if debug {
 		dl.Debugln("unsubscribe")
 	}
-	delete(l.subs, s.id)
+	for i, ss := range l.subs {
+		if s == ss {
+			last := len(l.subs) - 1
+			l.subs[i] = l.subs[last]
+			l.subs[last] = nil
+			l.subs = l.subs[:last]
+			break
+		}
+	}
 	close(s.events)
 	l.mutex.Unlock()
 }

lib/events/events_test.go

@@ -134,6 +134,7 @@ func TestIDs(t *testing.T) {
 	s := l.Subscribe(events.AllEvents)
 	defer l.Unsubscribe(s)
 	l.Log(events.DeviceConnected, "foo")
+	_ = l.Subscribe(events.AllEvents)
 	l.Log(events.DeviceConnected, "bar")
 
 	ev, err := s.Poll(timeout)
@@ -152,8 +153,8 @@ func TestIDs(t *testing.T) {
 	if ev.Data.(string) != "bar" {
 		t.Fatal("Incorrect event:", ev)
 	}
-	if !(ev.ID > id) {
-		t.Fatalf("ID not incremented (%d !> %d)", ev.ID, id)
+	if ev.ID != id+1 {
+		t.Fatalf("ID not incremented (%d != %d)", ev.ID, id+1)
 	}
 }
 

lib/fnmatch/fnmatch.go

@@ -38,14 +38,6 @@ func Convert(pattern string, flags int) (*regexp.Regexp, error) {
 		}
 	}
 
-	// Support case insensitive ignores. We do the loop because we may in some
-	// circumstances end up with multiple insensitivity prefixes
-	// ("(?i)(?i)foo"), which should be accepted.
-	for ignore := strings.TrimPrefix(pattern, "(?i)"); ignore != pattern; ignore = strings.TrimPrefix(pattern, "(?i)") {
-		flags |= CaseFold
-		pattern = ignore
-	}
-
 	if flags&NoEscape != 0 {
 		pattern = strings.Replace(pattern, "\\", "\\\\", -1)
 	} else {

lib/fnmatch/fnmatch_test.go

@@ -53,10 +53,6 @@ var testcases = []testcase{
 	{"**/foo.txt", "bar/baz/foo.txt", PathName, true},
 
 	{"foo.txt", "foo.TXT", CaseFold, true},
-	{"(?i)foo.txt", "foo.TXT", 0, true},
-	{"(?i)(?i)foo.txt", "foo.TXT", 0, true}, // repeated prefix should be fine
-	{"(?i)**foo.txt", "/dev/tmp/foo.TXT", 0, true},
-	{"(?i)!**foo.txt", "/dev/tmp/foo.TXT", 0, false},
 
 	// These characters are literals in glob, but not in regexp.
 	{"hey$hello", "hey$hello", 0, true},

lib/ignore/ignore.go

@@ -206,45 +206,52 @@ func parseIgnoreFile(fd io.Reader, currentFile string, seen map[string]bool) ([]
 			include = false
 		}
 
+		flags := fnmatch.PathName
+		if strings.HasPrefix(line, "(?i)") {
+			line = line[4:]
+			flags |= fnmatch.CaseFold
+		}
+
 		if strings.HasPrefix(line, "/") {
 			// Pattern is rooted in the current dir only
-			exp, err := fnmatch.Convert(line[1:], fnmatch.PathName)
+			exp, err := fnmatch.Convert(line[1:], flags)
 			if err != nil {
-				return fmt.Errorf("Invalid pattern %q in ignore file", line)
+				return fmt.Errorf("invalid pattern %q in ignore file", line)
 			}
 			patterns = append(patterns, Pattern{exp, include})
 		} else if strings.HasPrefix(line, "**/") {
 			// Add the pattern as is, and without **/ so it matches in current dir
-			exp, err := fnmatch.Convert(line, fnmatch.PathName)
+			exp, err := fnmatch.Convert(line, flags)
 			if err != nil {
-				return fmt.Errorf("Invalid pattern %q in ignore file", line)
+				return fmt.Errorf("invalid pattern %q in ignore file", line)
 			}
 			patterns = append(patterns, Pattern{exp, include})
 
-			exp, err = fnmatch.Convert(line[3:], fnmatch.PathName)
+			exp, err = fnmatch.Convert(line[3:], flags)
 			if err != nil {
-				return fmt.Errorf("Invalid pattern %q in ignore file", line)
+				return fmt.Errorf("invalid pattern %q in ignore file", line)
 			}
 			patterns = append(patterns, Pattern{exp, include})
 		} else if strings.HasPrefix(line, "#include ") {
-			includeFile := filepath.Join(filepath.Dir(currentFile), line[len("#include "):])
+			includeRel := line[len("#include "):]
+			includeFile := filepath.Join(filepath.Dir(currentFile), includeRel)
 			includes, err := loadIgnoreFile(includeFile, seen)
 			if err != nil {
-				return err
+				return fmt.Errorf("include of %q: %v", includeRel, err)
 			}
 			patterns = append(patterns, includes...)
 		} else {
 			// Path name or pattern, add it so it matches files both in
 			// current directory and subdirs.
-			exp, err := fnmatch.Convert(line, fnmatch.PathName)
+			exp, err := fnmatch.Convert(line, flags)
 			if err != nil {
-				return fmt.Errorf("Invalid pattern %q in ignore file", line)
+				return fmt.Errorf("invalid pattern %q in ignore file", line)
 			}
 			patterns = append(patterns, Pattern{exp, include})
 
-			exp, err = fnmatch.Convert("**/"+line, fnmatch.PathName)
+			exp, err = fnmatch.Convert("**/"+line, flags)
 			if err != nil {
-				return fmt.Errorf("Invalid pattern %q in ignore file", line)
+				return fmt.Errorf("invalid pattern %q in ignore file", line)
 			}
 			patterns = append(patterns, Pattern{exp, include})
 		}

lib/model/model.go

@@ -1144,7 +1144,9 @@ func (m *Model) AddFolder(cfg config.FolderConfiguration) {
 	}
 
 	ignores := ignore.New(m.cacheIgnoredFiles)
-	_ = ignores.Load(filepath.Join(cfg.Path(), ".stignore")) // Ignore error, there might not be an .stignore
+	if err := ignores.Load(filepath.Join(cfg.Path(), ".stignore")); err != nil && !os.IsNotExist(err) {
+		l.Warnln("Loading ignores:", err)
+	}
 	m.folderIgnores[cfg.ID] = ignores
 
 	m.fmut.Unlock()
@@ -1231,10 +1233,17 @@ func (m *Model) internalScanFolderSubs(folder string, subs []string) error {
 	}
 
 	if err := m.CheckFolderHealth(folder); err != nil {
+		runner.setError(err)
+		l.Infof("Stopping folder %s due to error: %s", folder, err)
 		return err
 	}
 
-	_ = ignores.Load(filepath.Join(folderCfg.Path(), ".stignore")) // Ignore error, there might not be an .stignore
+	if err := ignores.Load(filepath.Join(folderCfg.Path(), ".stignore")); err != nil && !os.IsNotExist(err) {
+		err = fmt.Errorf("loading ignores: %v", err)
+		runner.setError(err)
+		l.Infof("Stopping folder %s due to error: %s", folder, err)
+		return err
+	}
 
 	// Required to make sure that we start indexing at a directory we're already
 	// aware off.
@@ -1424,8 +1433,16 @@ func (m *Model) numHashers(folder string) int {
 		return folderCfg.Hashers
 	}
 
+	if runtime.GOOS == "windows" || runtime.GOOS == "darwin" {
+		// Interactive operating systems; don't load the system too heavily by
+		// default.
+		return 1
+	}
+
+	// For other operating systems and architectures, lets try to get some
+	// work done... Divide the available CPU cores among the configured
+	// folders.
 	if perFolder := runtime.GOMAXPROCS(-1) / numFolders; perFolder > 0 {
-		// We have CPUs to spare, divide them per folder.
 		return perFolder
 	}
 
@@ -1662,9 +1679,9 @@ func (m *Model) BringToFront(folder, file string) {
 // CheckFolderHealth checks the folder for common errors and returns the
 // current folder error, or nil if the folder is healthy.
 func (m *Model) CheckFolderHealth(id string) error {
-	if minFree := float64(m.cfg.Options().MinHomeDiskFreePct); minFree > 0 {
+	if minFree := m.cfg.Options().MinHomeDiskFreePct; minFree > 0 {
 		if free, err := osutil.DiskFreePercentage(m.cfg.ConfigPath()); err == nil && free < minFree {
-			return errors.New("home disk is out of space")
+			return errors.New("home disk has insufficient free space")
 		}
 	}
 
@@ -1674,29 +1691,41 @@ func (m *Model) CheckFolderHealth(id string) error {
 	}
 
 	fi, err := os.Stat(folder.Path())
-	if v, ok := m.CurrentLocalVersion(id); ok && v > 0 {
-		// Safety check. If the cached index contains files but the
-		// folder doesn't exist, we have a problem. We would assume
-		// that all files have been deleted which might not be the case,
-		// so mark it as invalid instead.
-		if err != nil || !fi.IsDir() {
+
+	v, ok := m.CurrentLocalVersion(id)
+	indexHasFiles := ok && v > 0
+
+	if indexHasFiles {
+		// There are files in the folder according to the index, so it must
+		// have existed and had a correct marker at some point. Verify that
+		// this is still the case.
+
+		switch {
+		case err != nil || !fi.IsDir():
 			err = errors.New("folder path missing")
-		} else if !folder.HasMarker() {
+
+		case !folder.HasMarker():
 			err = errors.New("folder marker missing")
-		} else if free, errDfp := osutil.DiskFreePercentage(folder.Path()); errDfp == nil && free < float64(folder.MinDiskFreePct) {
-			err = errors.New("out of disk space")
+
+		case !folder.ReadOnly:
+			// Check for free space, if it isn't a master folder. We aren't
+			// going to change the contents of master folders, so we don't
+			// care about the amount of free space there.
+			if free, errDfp := osutil.DiskFreePercentage(folder.Path()); errDfp == nil && free < folder.MinDiskFreePct {
+				err = errors.New("insufficient free space")
+			}
 		}
-	} else if os.IsNotExist(err) {
-		// If we don't have any files in the index, and the directory
-		// doesn't exist, try creating it.
-		err = osutil.MkdirAll(folder.Path(), 0700)
-		if err == nil {
+	} else {
+		// It's a blank folder, so this may the first time we're looking at
+		// it. Attempt to create and tag with our marker as appropriate.
+
+		if os.IsNotExist(err) {
+			err = osutil.MkdirAll(folder.Path(), 0700)
+		}
+
+		if err == nil && !folder.HasMarker() {
 			err = folder.CreateMarker()
 		}
-	} else if !folder.HasMarker() {
-		// If we don't have any files in the index, and the path does exist
-		// but the marker is not there, create it.
-		err = folder.CreateMarker()
 	}
 
 	m.fmut.RLock()

lib/model/rwfolder.go

@@ -212,6 +212,12 @@ func (p *rwFolder) Serve() {
 				continue
 			}
 
+			if err := p.model.CheckFolderHealth(p.folder); err != nil {
+				l.Infoln("Skipping folder", p.folder, "pull due to folder error:", err)
+				p.pullTimer.Reset(nextPullIntv)
+				continue
+			}
+
 			p.model.fmut.RLock()
 			curIgnores := p.model.folderIgnores[p.folder]
 			p.model.fmut.RUnlock()
@@ -451,7 +457,6 @@ func (p *rwFolder) pullerIteration(ignores *ignore.Matcher) int {
 	// !!!
 
 	changed := 0
-	pullFileSize := int64(0)
 
 	fileDeletions := map[string]protocol.FileInfo{}
 	dirDeletions := []protocol.FileInfo{}
@@ -500,7 +505,6 @@ func (p *rwFolder) pullerIteration(ignores *ignore.Matcher) int {
 		default:
 			// A new or changed file or symlink. This is the only case where we
 			// do stuff concurrently in the background
-			pullFileSize += file.Size()
 			p.queue.Push(file.Name, file.Size(), file.Modified)
 		}
 
@@ -508,17 +512,6 @@ func (p *rwFolder) pullerIteration(ignores *ignore.Matcher) int {
 		return true
 	})
 
-	// Check if we are able to store all files on disk
-	if pullFileSize > 0 {
-		folder, ok := p.model.cfg.Folders()[p.folder]
-		if ok {
-			if free, err := osutil.DiskFreeBytes(folder.Path()); err == nil && free < pullFileSize {
-				l.Infof("Puller (folder %q): insufficient disk space available to pull %d files (%.2fMB)", p.folder, changed, float64(pullFileSize)/1024/1024)
-				return 0
-			}
-		}
-	}
-
 	// Reorder the file queue according to configuration
 
 	switch p.order {
@@ -971,6 +964,12 @@ func (p *rwFolder) handleFile(file protocol.FileInfo, copyChan chan<- copyBlocks
 		return
 	}
 
+	if free, err := osutil.DiskFreeBytes(p.dir); err == nil && free < file.Size() {
+		l.Warnf(`Folder "%s": insufficient disk space in %s for %s: have %.2f MiB, need %.2f MiB`, p.dir, file.Name, float64(free)/1024/1024, float64(file.Size())/1024/1024)
+		p.newError(file.Name, errors.New("insufficient space"))
+		return
+	}
+
 	events.Default.Log(events.ItemStarted, map[string]string{
 		"folder": p.folder,
 		"item":   file.Name,

lib/model/sharedpullerstate.go

@@ -86,8 +86,24 @@ func (s *sharedPullerState) tempFile() (io.WriterAt, error) {
 	// here.
 	dir := filepath.Dir(s.tempName)
 	if info, err := os.Stat(dir); err != nil {
-		s.failLocked("dst stat dir", err)
-		return nil, err
+		if os.IsNotExist(err) {
+			// XXX: This works around a bug elsewhere, a race condition when
+			// things are deleted while being synced. However that happens, we
+			// end up with a directory for "foo" with the delete bit, but a
+			// file "foo/bar" that we want to sync. We never create the
+			// directory, and hence fail to create the file and end up looping
+			// forever on it. This breaks that by creating the directory; on
+			// next scan it'll be found and the delete bit on it is removed.
+			// The user can then clean up as they like...
+			l.Infoln("Resurrecting directory", dir)
+			if err := os.MkdirAll(dir, 0755); err != nil {
+				s.failLocked("resurrect dir", err)
+				return nil, err
+			}
+		} else {
+			s.failLocked("dst stat dir", err)
+			return nil, err
+		}
 	} else if info.Mode()&0200 == 0 {
 		err := os.Chmod(dir, 0755)
 		if !s.ignorePerms && err == nil {

man/syncthing-config.5

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-CONFIG" "5" "August 20, 2015" "v0.11" "Syncthing"
+.TH "SYNCTHING-CONFIG" "5" "October 01, 2015" "v0.11" "Syncthing"
 .SH NAME
 syncthing-config \- Syncthing Configuration
 .
@@ -411,7 +411,7 @@ The listen address for incoming sync connections. See the \fBaddress\fP
 element under the \fI\%GUI Element\fP for allowed syntax.
 .TP
 .B globalAnnounceServer
-A URI to a global announce (discvoery) server. Allowed protocol prefixes
+A URI to a global announce (discovery) server. Allowed protocol prefixes
 are \fBudp4://\fP (UDP over IPv4), \fBudp6://\fP (UDP over IPv6) and
 \fBudp://\fP (UDP over any available protocol).
 .TP

man/syncthing-device-ids.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-DEVICE-IDS" "7" "August 20, 2015" "v0.11" "Syncthing"
+.TH "SYNCTHING-DEVICE-IDS" "7" "October 01, 2015" "v0.11" "Syncthing"
 .SH NAME
 syncthing-device-ids \- Understanding Device IDs
 .
@@ -34,12 +34,12 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .sp
 Every device is identified by a device ID. The device ID is used for address
 resolution, authentication and authorization. The term "device ID" could
-interchangably have been "key ID" since the device ID is a direct properties of
+interchangably have been "key ID" since the device ID is a direct property of
 the public key in use.
 .SH KEYS
 .sp
 To understand device IDs we need to look at the underlying mechanisms. At first
-startup, Syncthing will create an public/private key pair.
+startup, Syncthing will create a public/private keypair.
 .sp
 Currently this is a 3072 bit RSA key. The keys are saved in the form of the
 private key (\fBkey.pem\fP) and a self signed certificate (\fBcert.pem\fP). The self
@@ -104,10 +104,10 @@ To form a device ID the SHA\-256 hash of the certificate data in DER form is
 calculated. This means the hash covers all information under the
 \fBCertificate:\fP section above.
 .sp
-The hashing results in a 256 bit hash, which we encode using base32. Base32
-encodes five bits per character, so we need 256 / 5 = 51.2 characters to encode
+The hashing results in a 256 bit hash which we encode using base32. Base32
+encodes five bits per character so we need 256 / 5 = 51.2 characters to encode
 the device ID. This becomes 52 characters in practice, but 52 characters of
-base32 would decode to 260 bits which is not an whole number of bytes. The
+base32 would decode to 260 bits which is not a whole number of bytes. The
 base32 encoding adds padding to 280 bits (the next multiple of both 5 and 8
 bits) so the resulting ID looks something like:
 .INDENT 0.0
@@ -121,7 +121,7 @@ MFZWI3DBONSGYYLTMRWGC43ENRQXGZDMMFZWI3DBONSGYYLTMRWA====
 .UNINDENT
 .UNINDENT
 .sp
-The padding (\fB====\fP) is stripped away, the device ID split in four
+The padding (\fB====\fP) is stripped away, the device ID split into four
 groups, and \fI\%check
 digits\fP <\fBhttps://forum.syncthing.net/t/v0-9-0-new-device-id-format/478\fP>
 are added for each group. For presentation purposes the device ID is
@@ -138,14 +138,14 @@ MFZWI3D\-BONSGYC\-YLTMRWG\-C43ENR5\-QXGZDMM\-FZWI3DP\-BONSGYY\-LTMRWAD
 .UNINDENT
 .SS Connection Establishment
 .sp
-So now we know what device IDs are, here\(aqs how they are used in Syncthing. When
-you add a device ID to the syncthing configuration, Syncthing will attempt to
+Now we know what device IDs are, here\(aqs how they are used in Syncthing. When
+you add a device ID to the configuration, Syncthing will attempt to
 connect to that device. The first thing we need to do is figure out the IP and
-port to connect to. There\(aqs three possibilities here;
+port to connect to. There are three possibilities here:
 .INDENT 0.0
 .IP \(bu 2
 The IP and port can be set statically in the configuration. The IP
-can equally well be a hostname, so if you have a static IP or a
+can equally well be a host name, so if you have a static IP or a
 dynamic DNS setup this might be a good option.
 .IP \(bu 2
 Using local discovery, if enabled. Every Syncthing instance on a LAN
@@ -161,14 +161,13 @@ any local announcements the global discovery server will be queried
 for an address.
 .UNINDENT
 .sp
-Once we have and address and port a TCP connection is established and a TLS
+Once we have an address and port a TCP connection is established and a TLS
 handshake performed. As part of the handshake both devices present their
 certificates. Once the handshake has completed and the peer certificate is
-known, the following steps are performed.
+known, the following steps are performed:
 .INDENT 0.0
 .IP 1. 3
-Calculate the remote device ID by using the process above on the
-received certificate.
+Calculate the remote device ID by processing the received certificate as above.
 .IP 2. 3
 Weed out a few possible misconfigurations \- i.e. if the device ID is
 that of the local device or of a device we already have an active
@@ -190,7 +189,7 @@ that there is no way that we know of to create two different messages
 with the same hash.
 .sp
 You can argue that of course there are collisions \- there\(aqs an infinite
-amount of inputs and a finite amount of outputs, so per definition there
+amount of inputs and a finite amount of outputs \- so by definition there
 are infinitely many messages that result in the same hash.
 .sp
 I\(aqm going to quote \fI\%stack
@@ -220,13 +219,13 @@ find SHA\-256 collisions scary then your priorities are wrong.
 .UNINDENT
 .sp
 It\(aqs also worth noting that the property of SHA\-256 that we are using is not
-simply collision resistance but resistance to a preimage attack. I.e. even if
+simply collision resistance but resistance to a preimage attack, i.e. even if
 you can find two messages that result in a hash collision that doesn\(aqt help you
 attack Syncthing (or TLS in general). You need to create a message that hashes
 to exactly the hash that my certificate already has or you won\(aqt get in.
 .sp
 Note also that it\(aqs not good enough to find a random blob of bits that happen to
-have the same hash as my certificate. You need to create a valid DER\- encoded,
+have the same hash as my certificate. You need to create a valid DER\-encoded,
 signed certificate that has the same hash as mine. The difficulty of this is
 staggeringly far beyond the already staggering difficulty of finding a SHA\-256
 collision.
@@ -245,7 +244,7 @@ for a given device ID, so can\(aqt connect to it and sync). It could also
 be an intelligence gathering attack; if I spoof a given ID, I can see
 which devices try to connect to it.
 .sp
-It could be mitigated in several ways;
+It could be mitigated in several ways:
 .INDENT 0.0
 .IP \(bu 2
 Announcements could be signed by the device private key. This
@@ -255,7 +254,7 @@ Announcements to the global announce server could be done using TLS,
 so the server calculates the device ID based on the certificate
 instead of trusting to the device to tell the truth.
 .IP \(bu 2
-The user could statically configure IP or hostname for the devices.
+The user could statically configure IP or host name for the devices.
 .IP \(bu 2
 The user could run a trusted global server.
 .UNINDENT
@@ -274,7 +273,7 @@ various possible solutions:
 Use shorter device IDs with verification based on the full ID ("You
 entered MFZWI3; I found and connected to a device with the ID
 MFZWI3\-DBONSG\-YYLTMR\-WGC43E\-NRQXGZ\-DMMFZW\-I3DBON\-SGYYLT\-MRWA, please
-confirm that this is correct.").
+confirm that this is correct").
 .IP \(bu 2
 Use shorter device IDs with an out of band authentication, a la
 Bluetooth pairing. You enter a one time PIN into Syncthing and give

man/syncthing-event-api.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-EVENT-API" "7" "August 20, 2015" "v0.11" "Syncthing"
+.TH "SYNCTHING-EVENT-API" "7" "October 01, 2015" "v0.11" "Syncthing"
 .SH NAME
 syncthing-event-api \- Event API
 .
@@ -602,7 +602,7 @@ configuration etc.
 .fi
 .UNINDENT
 .UNINDENT
-.SS StartupCompleted
+.SS StartupComplete
 .sp
 Emitted exactly once, when initialization is complete and Syncthing is
 ready to start exchanging data with other devices.

man/syncthing-faq.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-FAQ" "7" "August 20, 2015" "v0.11" "Syncthing"
+.TH "SYNCTHING-FAQ" "7" "October 01, 2015" "v0.11" "Syncthing"
 .SH NAME
 syncthing-faq \- Frequently Asked Questions
 .
@@ -260,7 +260,7 @@ bugs.
 .sp
 Syncthing logs to stdout by default. On Windows Syncthing by default also
 creates \fBsyncthing.log\fP in Syncthing\(aqs home directory (check \fB\-help\fP to see
-where that is).
+where that is). Command line option \fB\-logfile\fP can be used to specify user\-defined logfile.
 .SS How do I upgrade Syncthing?
 .INDENT 0.0
 .IP \(bu 2

man/syncthing-networking.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-NETWORKING" "7" "August 20, 2015" "v0.11" "Syncthing"
+.TH "SYNCTHING-NETWORKING" "7" "October 01, 2015" "v0.11" "Syncthing"
 .SH NAME
 syncthing-networking \- Firewall Setup
 .
@@ -93,11 +93,6 @@ ssh \-L 9999:localhost:8384 machine
 This will bind to your local port 9999 and forward all connections from there to
 port 8384 on the target machine. This still works even if Syncthing is bound to
 listen on localhost only.
-.sp
-You can forward multiple ports corresponding to many machines this way, but
-because Syncthing uses session cookies for the entire domain (i.e. your local
-machine), you will need to connect to each control panel in a separate browser
-instance or explicitly issue a browser reload when switching between them.
 .SH AUTHOR
 The Syncthing Authors
 .SH COPYRIGHT

man/syncthing-rest-api.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-REST-API" "7" "August 20, 2015" "v0.11" "Syncthing"
+.TH "SYNCTHING-REST-API" "7" "October 01, 2015" "v0.11" "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" "August 20, 2015" "v0.11" "Syncthing"
+.TH "SYNCTHING-SECURITY" "7" "October 01, 2015" "v0.11" "Syncthing"
 .SH NAME
 syncthing-security \- Security Principles
 .
@@ -36,11 +36,11 @@ possible for an attacker to join a cluster uninvited, and it should not be
 possible to extract private information from intercepted traffic. Currently this
 is implemented as follows.
 .sp
-All traffic is protected by TLS. To prevent uninvited nodes from joining a
-cluster, the certificate fingerprint of each node is compared to a preset list
-of acceptable nodes at connection establishment. The fingerprint is computed as
-the SHA\-256 hash of the certificate and displayed in BASE32 encoding to form a
-reasonably compact and convenient string.
+All device to device traffic is protected by TLS. To prevent uninvited nodes
+from joining a cluster, the certificate fingerprint of each node is compared
+to a preset list of acceptable nodes at connection establishment. The
+fingerprint is computed as the SHA\-256 hash of the certificate and displayed
+in BASE32 encoding to form a reasonably compact and convenient string.
 .sp
 Incoming requests for file data are verified to the extent that the requested
 file name must exist in the local index and the global model.
@@ -51,15 +51,20 @@ for reporting security vulnerabilities, please see the official \fI\%security pa
 .SS Global Discovery
 .sp
 When global discovery is enabled, Syncthing sends an announcement packet every
-30 minutes to the global discovery server, so that it can keep a mapping between
-your device ID and external IP. Also, when connecting to other devices that have
-not been seen on the local network, a query is sent to the global discovery
-server containing the device ID of the requested device. The discovery server is
+30 minutes to the global discovery server so that it can keep a mapping
+between your device ID and external IP. The packets contain the device ID and
+listening port. Also, when connecting to other devices that have not been seen
+on the local network, a query is sent to the global discovery server
+containing the device ID of the requested device. The discovery server is
 currently hosted by \fI\%@calmh\fP <\fBhttps://github.com/calmh\fP>\&. Global discovery defaults to \fBon\fP\&.
 .sp
 When turned off, devices with dynamic addresses not on the local network cannot
 be found and connected to.
 .sp
+An eavesdropper on the Internet can deduce which machines are running
+Syncthing with global discovery enabled, what their device IDs are, and what
+device IDs they are attempting to connect to via global discovery.
+.sp
 If a different global discovery server is configured, no data is sent to the
 default global discovery server.
 .SS Local Discovery

man/syncthing-stignore.5

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-STIGNORE" "5" "August 20, 2015" "v0.11" "Syncthing"
+.TH "SYNCTHING-STIGNORE" "5" "October 01, 2015" "v0.11" "Syncthing"
 .SH NAME
 syncthing-stignore \- Prevent files from being synchronized to other nodes
 .
@@ -93,7 +93,7 @@ matching. \fB(?i)test\fP matches \fBtest\fP, \fBTEST\fP and \fBtEsT\fP\&. The
 \fB(?i)\fP prefix can be combined with other patterns, for example the
 pattern \fB(?i)!picture*.png\fP indicates that \fBPicture1.PNG\fP should
 be synchronized. Note that case\-insensitive patterns must start with
-\fB(?i)\fP when combined with other flags.
+\fB(?i)\fP when combined with other flags. On Mac OS and Windows, patterns are always case\-insensitive.
 .IP \(bu 2
 A line beginning with \fB//\fP is a comment and has no effect.
 .UNINDENT

man/syncthing-versioning.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "TODO" "7" "August 20, 2015" "v0.11" "Syncthing"
+.TH "TODO" "7" "October 01, 2015" "v0.11" "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" "August 20, 2015" "v0.11" "Syncthing"
+.TH "SYNCTHING" "1" "October 01, 2015" "v0.11" "Syncthing"
 .SH NAME
 syncthing \- Syncthing
 .
@@ -38,9 +38,9 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .ft C
 syncthing [\-audit] [\-generate=<dir>] [\-gui\-address=<address>]
           [\-gui\-apikey=<key>] [\-gui\-authentication=<username:password>]
-          [\-home=<dir>] [\-logflags=<flags>] [\-no\-browser] [\-no\-console]
-          [\-no\-restart] [\-reset] [\-upgrade] [\-upgrade\-check] [\-upgrade\-to=<url>]
-          [\-verbose] [\-version]
+          [\-home=<dir>] [\-logfile=<filename>] [\-logflags=<flags>] [\-no\-browser]
+          [\-no\-console] [\-no\-restart] [\-reset] [\-upgrade] [\-upgrade\-check]
+          [\-upgrade\-to=<url>] [\-verbose] [\-version]
 .ft P
 .fi
 .UNINDENT
@@ -87,6 +87,11 @@ Set configuration directory. The default configuration directory is:
 .UNINDENT
 .INDENT 0.0
 .TP
+.B \-logfile=<filename>
+Set destination filename for logging (use \fB"\-"\fP for stdout, which is the default option).
+.UNINDENT
+.INDENT 0.0
+.TP
 .B \-logflags=<flags>
 Select information in log line prefix, default 2. The \fB\-logflags\fP value is
 a sum of the following:

test/ignore_test.go

@@ -31,10 +31,17 @@ func TestIgnores(t *testing.T) {
 
 	// Create eight empty files and directories
 
-	files := []string{"f1", "f2", "f3", "f4", "f11", "f12", "f13", "f14"}
 	dirs := []string{"d1", "d2", "d3", "d4", "d11", "d12", "d13", "d14"}
+	files := []string{"f1", "f2", "f3", "f4", "f11", "f12", "f13", "f14", "d1/f1.TXT"}
 	all := append(files, dirs...)
 
+	for _, dir := range dirs {
+		err := os.Mkdir(filepath.Join("s1", dir), 0755)
+		if err != nil {
+			t.Fatal(err)
+		}
+	}
+
 	for _, file := range files {
 		fd, err := os.Create(filepath.Join("s1", file))
 		if err != nil {
@@ -43,13 +50,6 @@ func TestIgnores(t *testing.T) {
 		fd.Close()
 	}
 
-	for _, dir := range dirs {
-		err := os.Mkdir(filepath.Join("s1", dir), 0755)
-		if err != nil {
-			t.Fatal(err)
-		}
-	}
-
 	var syms []string
 	if symlinksSupported() {
 		syms = []string{"s1", "s2", "s3", "s4", "s11", "s12", "s13", "s14"}
@@ -81,7 +81,7 @@ func TestIgnores(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	_, err = fd.WriteString("f1*\nf2\nd1*\nd2\ns1*\ns2") // [fds][34] only non-ignored items
+	_, err = fd.WriteString("f1*\nf2\nd1*\nd2\ns1*\ns2\n(?i)*.txt") // [fds][34] only non-ignored items
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -130,7 +130,7 @@ func TestIgnores(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	expected = len(all) * 7 / 8 // seven out of eight items of each type should remain
+	expected = len(all)*7/8 + 1 // seven out of eight items of each type should remain, plus the foo.TXT
 	if m.LocalFiles != expected {
 		t.Fatalf("Incorrect number of files after second ignore, %d != %d", m.LocalFiles, expected)
 	}