lib/db: Don't panic on negative counts (#4761)

* lib/db: Don't panic on negative counts (fixes #4659)

So, negative counts should never happen and hence the original idea to
panic. However, this sucks as the panic will happen in a folder runner,
be automatically swallowed by suture, and the runner gets restarted but
now we are in a bad state. (Related: #4758)

At the time of writing the global list is somewhat in flux (we've
changed how ignored files are handled, invalid bits, etc.) and I think
that can cause unusual conditions here. Hence just fixing up the numbers
instead until the next full recount.

.github/CODEOWNERS

@@ -0,0 +1,2 @@
+/AUTHORS    @calmh
+/*.md       @calmh

AUTHORS

@@ -90,6 +90,7 @@ Michael Jephcote (Rewt0r) <rewt0r@gmx.com> <Rewt0r@users.noreply.github.com>
 Michael Ploujnikov (plouj) <ploujj@gmail.com>
 Michael Tilli (pyfisch) <pyfisch@gmail.com>
 Nate Morrison (nrm21) <natemorrison@gmail.com>
+Nicholas Rishel (PrototypeNM1) <rishel.nick@gmail.com> <PrototypeNM1@users.noreply.github.com>
 Niels Peter Roest (Niller303) <nielsproest@hotmail.com> <seje.niels@hotmail.com>
 Pascal Jungblut (pascalj) <github@pascalj.com> <mail@pascal-jungblut.com>
 Pawel Palenica (qepasa) <pawelpalenica11@gmail.com>

Dockerfile

@@ -0,0 +1,29 @@
+FROM golang:1.9 AS builder
+
+WORKDIR /go/src/github.com/syncthing/syncthing
+COPY . .
+
+ENV CGO_ENABLED=0
+ENV BUILD_HOST=syncthing.net
+ENV BUILD_USER=docker
+RUN rm -f syncthing && go run build.go build syncthing
+
+FROM alpine
+
+RUN apk add --no-cache ca-certificates
+
+COPY --from=builder /go/src/github.com/syncthing/syncthing/syncthing /bin/syncthing
+
+RUN echo 'syncthing:x:1000:1000::/var/syncthing:/sbin/nologin' >> /etc/passwd \
+    && echo 'syncthing:!::0:::::' >> /etc/shadow \
+    && mkdir /var/syncthing \
+    && chown syncthing /var/syncthing
+
+USER syncthing
+ENV STNOUPGRADE=1
+
+HEALTHCHECK --interval=1m --timeout=10s \
+  CMD nc -z localhost 8384 || exit 1
+
+ENTRYPOINT ["/bin/syncthing", "-home", "/var/syncthing/config", "-gui-address", "0.0.0.0:8384"]
+

README.md

@@ -87,8 +87,8 @@ D26E6ED000654A3E, available from https://syncthing.net/security.html and
 most key servers.
 
 There is also a built in automatic upgrade mechanism (disabled in some
-distribution channels) which uses a compiled in ECDSA signature. Mac OS
-X binaries are also properly code signed.
+distribution channels) which uses a compiled in ECDSA signature. macOS
+binaries are also properly code signed.
 
 ## Documentation
 

cmd/stdiscosrv/apisrv.go

@@ -18,6 +18,7 @@ import (
 	"net/http"
 	"net/url"
 	"strconv"
+	"strings"
 	"sync"
 	"time"
 
@@ -334,13 +335,14 @@ func fixupAddresses(remote net.IP, addresses []string) []string {
 
 		ip := net.ParseIP(host)
 		if host == "" || ip.IsUnspecified() {
-			// Do not use IPv6 remote address if requested scheme is tcp4
-			if uri.Scheme == "tcp4" && remote.To4() == nil {
+			// Do not use IPv6 remote address if requested scheme is ...4
+			// (i.e., tcp4, etc.)
+			if strings.HasSuffix(uri.Scheme, "4") && remote.To4() == nil {
 				continue
 			}
 
-			// Do not use IPv4 remote address if requested scheme is tcp6
-			if uri.Scheme == "tcp6" && remote.To4() != nil {
+			// Do not use IPv4 remote address if requested scheme is ...6
+			if strings.HasSuffix(uri.Scheme, "6") && remote.To4() != nil {
 				continue
 			}
 

cmd/syncthing/gui.go

@@ -112,6 +112,7 @@ type modelIntf interface {
 	State(folder string) (string, time.Time, error)
 	UsageReportingStats(version int, preview bool) map[string]interface{}
 	PullErrors(folder string) ([]model.FileError, error)
+	WatchError(folder string) error
 }
 
 type configIntf interface {
@@ -733,6 +734,11 @@ func folderSummary(cfg configIntf, m modelIntf, folder string) (map[string]inter
 		}
 	}
 
+	err = m.WatchError(folder)
+	if err != nil {
+		res["watchError"] = err.Error()
+	}
+
 	return res, nil
 }
 

cmd/syncthing/mocked_model_test.go

@@ -136,3 +136,7 @@ func (m *mockedModel) UsageReportingStats(version int, preview bool) map[string]
 func (m *mockedModel) PullErrors(folder string) ([]model.FileError, error) {
 	return nil, nil
 }
+
+func (m *mockedModel) WatchError(folder string) error {
+	return nil
+}

cmd/syncthing/usage_report.go

@@ -199,7 +199,6 @@ func reportData(cfg configIntf, m modelIntf, connectionsService connectionsIntf,
 		res["limitBandwidthInLan"] = opts.LimitBandwidthInLan
 		res["customReleaseURL"] = opts.ReleasesURL != "https://upgrades.syncthing.net/meta.json"
 		res["restartOnWakeup"] = opts.RestartOnWakeup
-		res["customStunServers"] = len(opts.StunServers) == 0 || opts.StunServers[0] != "default" || len(opts.StunServers) > 1
 
 		folderUsesV3 := map[string]int{
 			"scanProgressDisabled":    0,

etc/macos-launchd/README.md

@@ -1,5 +1,5 @@
 This directory contains an example for running Syncthing in the
-background under Mac OS X.
+background under macOS.
 
  1. Install the `syncthing` binary in a directory called `bin` in your
     home directory.

gui/default/assets/lang/lang-bg.json

@@ -33,6 +33,7 @@
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "Автоматичното обновяване вече предлага избор между стабилни версии и кандидат версии.",
     "Automatic upgrades": "Автоматично обновяване",
     "Automatically create or share folders that this device advertises at the default path.": "Автоматично създаване или споделяне на папки, които това устройство предлага в пътя по подразбиране.",
+    "Available debug logging facilities:": "Available debug logging facilities:",
     "Be careful!": "Внимание!",
     "Bugs": "Бъгове",
     "CPU Utilization": "Използван процесор",
@@ -64,6 +65,9 @@
     "Device that last modified the item": "Устройство, което последно промени обекта",
     "Devices": "Устройства",
     "Disabled": "Деактивирано",
+    "Disabled periodic scanning and disabled watching for changes": "Disabled periodic scanning and disabled watching for changes",
+    "Disabled periodic scanning and enabled watching for changes": "Disabled periodic scanning and enabled watching for changes",
+    "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:",
     "Disconnected": "Не е свързано",
     "Discovered": "Открит",
     "Discovery": "Откриване",
@@ -81,6 +85,7 @@
     "Editing {%path%}.": "Промяна на  {{path}}.",
     "Enable NAT traversal": "Разреши NAT traversal",
     "Enable Relaying": "Разреши препращане",
+    "Enabled": "Enabled",
     "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Въведете не отрицателно число (пр. \"2.35\") и изберете единица.\nПроцентите са като част от размера на цялото дисково пространство.",
     "Enter a non-privileged port number (1024 - 65535).": "Въведете непривилегирован номер на порт (1024-65535).",
     "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Въведете адреси разделени със запетая (\"tcp://ip:port\", \"tcp://host:port\") или \"dynamic\", за да автоматично откриване на наличните адреси.",
@@ -88,6 +93,7 @@
     "Error": "Грешка",
     "External File Versioning": "Външно управление на версиите",
     "Failed Items": "Неуспешни",
+    "Failed to setup, retrying": "Failed to setup, retrying",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Неуспешна връзка към IPv6 сървъри може да се очаква ако няма IPv6 свързаност.",
     "File Pull Order": "Ред на сваляне",
     "File Versioning": "Версии на файловете",
@@ -182,6 +188,9 @@
     "Pause": "Пауза",
     "Pause All": "Пауза на висчко",
     "Paused": "На пауза",
+    "Periodic scanning at given interval and disabled watching for changes": "Periodic scanning at given interval and disabled watching for changes",
+    "Periodic scanning at given interval and enabled watching for changes": "Periodic scanning at given interval and enabled watching for changes",
+    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:",
     "Please consult the release notes before performing a major upgrade.": "Моля прочети бележките по обновяването преди да започнеш.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Моля задайте потребителско име и парола за потребителския интерфейс в секцията Настройки.",
     "Please wait": "Моля изчакай",
@@ -204,6 +213,7 @@
     "Rescan": "Сканирай",
     "Rescan All": "Обнови всички",
     "Rescan Interval": "Интервал за повторно сканиране",
+    "Rescans": "Rescans",
     "Restart": "Рестартирай",
     "Restart Needed": "Изисква се рестартиране",
     "Restarting": "Рестартиране",
@@ -212,6 +222,7 @@
     "Resume": "Пусни",
     "Resume All": "Пускане на всичко",
     "Reused": "Повторно използван",
+    "Running": "Running",
     "Save": "Запази",
     "Scan Time Remaining": "Оставащо време за сканиране",
     "Scanning": "Сканиране",

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

@@ -33,6 +33,7 @@
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "L'actualització automàtica ara ofereix l'elecció entre les versions estables i les versions candidates.",
     "Automatic upgrades": "Actualitzacions automàtiques",
     "Automatically create or share folders that this device advertises at the default path.": "Automatically create or share folders that this device advertises at the default path.",
+    "Available debug logging facilities:": "Available debug logging facilities:",
     "Be careful!": "Tin precaució!",
     "Bugs": "Errors (Bugs)",
     "CPU Utilization": "Utilització de la CPU",
@@ -64,6 +65,9 @@
     "Device that last modified the item": "Device that last modified the item",
     "Devices": "Dispositius",
     "Disabled": "Disabled",
+    "Disabled periodic scanning and disabled watching for changes": "Disabled periodic scanning and disabled watching for changes",
+    "Disabled periodic scanning and enabled watching for changes": "Disabled periodic scanning and enabled watching for changes",
+    "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:",
     "Disconnected": "Desconnectat",
     "Discovered": "Descobert",
     "Discovery": "Descobriment",
@@ -81,6 +85,7 @@
     "Editing {%path%}.": "Editant {{path}}.",
     "Enable NAT traversal": "Permetre NAT transversal",
     "Enable Relaying": "Permetre Transmissions",
+    "Enabled": "Enabled",
     "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Introdueix un nombre no negatiu (per exemple, \"2.35\") i selecciona una unitat. Els percentatges són com a part del tamany total del disc.",
     "Enter a non-privileged port number (1024 - 65535).": "Introdueix un nombre de port sense privilegis (1024-65535).",
     "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Introdueix adreces separades per coma (\"tcp://ip:port\", \"tcp://host:port\") o \"dynamic\" per a realitzar el descobriment automàtic de l'adreça.",
@@ -88,6 +93,7 @@
     "Error": "Error",
     "External File Versioning": "Versionat extern de fitxers",
     "Failed Items": "Objectes fallits",
+    "Failed to setup, retrying": "Failed to setup, retrying",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "És possible que es produïsca una fallada al connectar als servidors IPv6 si no hi ha connectivitat IPv6.",
     "File Pull Order": "Ordre de fitxers del pull",
     "File Versioning": "Versionat de fitxer",
@@ -182,6 +188,9 @@
     "Pause": "Pausa",
     "Pause All": "Pausa Tot",
     "Paused": "Pausat",
+    "Periodic scanning at given interval and disabled watching for changes": "Periodic scanning at given interval and disabled watching for changes",
+    "Periodic scanning at given interval and enabled watching for changes": "Periodic scanning at given interval and enabled watching for changes",
+    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:",
     "Please consult the release notes before performing a major upgrade.": "Per favor, consultar les notes de la versió abans de fer una actualització important.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Per favor, estableix un usuari i password per a l'Interfície Gràfica d'Usuari en el menú d'Adjustos.",
     "Please wait": "Per favor, espere",
@@ -204,6 +213,7 @@
     "Rescan": "Tornar a buscar",
     "Rescan All": "Tornar a buscar tot",
     "Rescan Interval": "Interval de nova busca",
+    "Rescans": "Rescans",
     "Restart": "Reiniciar",
     "Restart Needed": "Reinici necesari",
     "Restarting": "Reiniciant",
@@ -212,6 +222,7 @@
     "Resume": "Continuar",
     "Resume All": "Continuar Tot",
     "Reused": "Reutilitzat",
+    "Running": "Running",
     "Save": "Gravar",
     "Scan Time Remaining": "Temps d'escaneig restant",
     "Scanning": "Rastrejant",

gui/default/assets/lang/lang-cs.json

@@ -33,6 +33,7 @@
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "Automatická aktualizace nyní nabízí volbu mezi stabilními vydáními a kandidáty na vydání.",
     "Automatic upgrades": "Automatické aktualizace",
     "Automatically create or share folders that this device advertises at the default path.": "Automaticky vytvářet nebo sdílet adresáře, které toto zařízení odesílá ve výchozí cestě.",
+    "Available debug logging facilities:": "Dostupná logovací zařízení pro ladění:",
     "Be careful!": "Pozor!",
     "Bugs": "Chyby",
     "CPU Utilization": "Využití CPU",
@@ -64,6 +65,9 @@
     "Device that last modified the item": "Poslední přístroj, který modifikoval položku",
     "Devices": "Přístroje",
     "Disabled": "Vypnuto",
+    "Disabled periodic scanning and disabled watching for changes": "Disabled periodic scanning and disabled watching for changes",
+    "Disabled periodic scanning and enabled watching for changes": "Disabled periodic scanning and enabled watching for changes",
+    "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:",
     "Disconnected": "Odpojen",
     "Discovered": "Nalezeno",
     "Discovery": "Oznamování",
@@ -81,6 +85,7 @@
     "Editing {%path%}.": "Editace {{path}}.",
     "Enable NAT traversal": "Povolit NAT přenos",
     "Enable Relaying": "Povolit přenašeče",
+    "Enabled": "Enabled",
     "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Zadajte kladné číslo (např. \"2.35\") a zvolte jednotku. Percenta znamenají část celkové velikosti disku.",
     "Enter a non-privileged port number (1024 - 65535).": "Zadejte číslo neprivilegovaného portu (1024-65535).",
     "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Zadejte adresy oddělené čárkou (\"tcp://ip:port\", \"tcp://host:port\") nebo \"dynamic\" pro automatické zjišťování adres.",
@@ -88,6 +93,7 @@
     "Error": "Chyba",
     "External File Versioning": "Externí verzování souborů",
     "Failed Items": "Selhalo",
+    "Failed to setup, retrying": "Nastavování selhalo, zkouším znova",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Je v pořádku, když připojení k IPv6 serverům selže, pokud není k dispozici IPv6 konektivita.",
     "File Pull Order": "Pořadí stahování souborů",
     "File Versioning": "Verzování souborů",
@@ -182,6 +188,9 @@
     "Pause": "Pozastavit",
     "Pause All": "Pozastavit vše",
     "Paused": "Pozastaveno",
+    "Periodic scanning at given interval and disabled watching for changes": "Periodic scanning at given interval and disabled watching for changes",
+    "Periodic scanning at given interval and enabled watching for changes": "Periodic scanning at given interval and enabled watching for changes",
+    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:",
     "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 set a GUI Authentication User and Password in the Settings dialog.": "Zadejte prosím přihlašovací jméno a heslo pro GUI v dialogu nastavení.",
     "Please wait": "Chvíli strpení",
@@ -204,6 +213,7 @@
     "Rescan": "Opakovat skenování",
     "Rescan All": "Opakovat skenování všech",
     "Rescan Interval": "Interval opakování skenování",
+    "Rescans": "Opakovaná skenování",
     "Restart": "Restart",
     "Restart Needed": "Je nutný restart",
     "Restarting": "Restartuji",
@@ -212,6 +222,7 @@
     "Resume": "Pokračovat",
     "Resume All": "Pokračovat (vše)",
     "Reused": "Opakovaně použité",
+    "Running": "Probíhá",
     "Save": "Uložit",
     "Scan Time Remaining": "Zbývající čas skenování",
     "Scanning": "Skenování",

gui/default/assets/lang/lang-da.json

@@ -33,6 +33,7 @@
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "Den automatiske opdatering tilbyder nu valget mellem stabile - og udgivelses kandidater.",
     "Automatic upgrades": "Automatisk opdatering",
     "Automatically create or share folders that this device advertises at the default path.": "Automatically create or share folders that this device advertises at the default path.",
+    "Available debug logging facilities:": "Available debug logging facilities:",
     "Be careful!": "Vær forsigtig!",
     "Bugs": "Fejl",
     "CPU Utilization": "CPU-forbrug",
@@ -64,6 +65,9 @@
     "Device that last modified the item": "Device that last modified the item",
     "Devices": "Enheder",
     "Disabled": "Disabled",
+    "Disabled periodic scanning and disabled watching for changes": "Disabled periodic scanning and disabled watching for changes",
+    "Disabled periodic scanning and enabled watching for changes": "Disabled periodic scanning and enabled watching for changes",
+    "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:",
     "Disconnected": "Ikke tilsluttet",
     "Discovered": "Opdaget",
     "Discovery": "Opslag",
@@ -81,6 +85,7 @@
     "Editing {%path%}.": "Redigerer {{path}}.",
     "Enable NAT traversal": "Aktiver NAT",
     "Enable Relaying": "Aktiver Relaying",
+    "Enabled": "Enabled",
     "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.",
     "Enter a non-privileged port number (1024 - 65535).": "Enter a non-privileged port number (1024 - 65535).",
     "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Angiv kommaseparerede adresser (\"tcp://ip:port\", \"tcp://host:port\") eller \"dynamic\" for at benytte automatisk opdagelse af adressen.",
@@ -88,6 +93,7 @@
     "Error": "Fejl",
     "External File Versioning": "Ekstern fil-versionskontrol",
     "Failed Items": "Mislykkede filer",
+    "Failed to setup, retrying": "Failed to setup, retrying",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Fejl i forbindelse med opkobling til IPv6 servere skal forventes hvis der ikke er IPv6 forbindelse. ",
     "File Pull Order": "Filhentnings rækkefølge",
     "File Versioning": "Filversionering",
@@ -182,6 +188,9 @@
     "Pause": "Pause",
     "Pause All": "Sæt alt på pause",
     "Paused": "Pauset",
+    "Periodic scanning at given interval and disabled watching for changes": "Periodic scanning at given interval and disabled watching for changes",
+    "Periodic scanning at given interval and enabled watching for changes": "Periodic scanning at given interval and enabled watching for changes",
+    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:",
     "Please consult the release notes before performing a major upgrade.": "Tjek venligst udgivelsesnoterne før opgradering til en ny version.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Sæt vensligt en GUI bruger og kodeord i opsætningsdialogen.",
     "Please wait": "Vent venligst",
@@ -204,6 +213,7 @@
     "Rescan": "Skan igen",
     "Rescan All": "Skan alt igen",
     "Rescan Interval": "Genskannings interval",
+    "Rescans": "Rescans",
     "Restart": "Genstart",
     "Restart Needed": "Programmet kræver genstart",
     "Restarting": "Genstarter",
@@ -212,6 +222,7 @@
     "Resume": "Genoptag",
     "Resume All": "Genoptag alt",
     "Reused": "Genbrugt",
+    "Running": "Running",
     "Save": "Gem",
     "Scan Time Remaining": "Tid tilbage af skanningen",
     "Scanning": "Opdaterer",

gui/default/assets/lang/lang-de.json

@@ -33,6 +33,7 @@
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "Die automatische Aktualisierung bietet jetzt die Wahl zwischen stabilen Veröffentlichungen und Veröffentlichungskandidaten.",
     "Automatic upgrades": "Automatische Aktualisierungen aktivieren",
     "Automatically create or share folders that this device advertises at the default path.": "Automatisch Ordner erstellen oder freigeben, die dieses Gerät im Standardpfad ankündigt.",
+    "Available debug logging facilities:": "Verfügbare Debugging-Möglichkeiten:",
     "Be careful!": "Vorsicht!",
     "Bugs": "Fehler",
     "CPU Utilization": "Prozessorauslastung",
@@ -64,6 +65,9 @@
     "Device that last modified the item": "Gerät, das das Element zuletzt geändert hat",
     "Devices": "Geräte",
     "Disabled": "Deaktiviert",
+    "Disabled periodic scanning and disabled watching for changes": "Disabled periodic scanning and disabled watching for changes",
+    "Disabled periodic scanning and enabled watching for changes": "Disabled periodic scanning and enabled watching for changes",
+    "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:",
     "Disconnected": "Getrennt",
     "Discovered": "Ermittelt",
     "Discovery": "Gerätesuche",
@@ -81,6 +85,7 @@
     "Editing {%path%}.": "Bearbeite {{path}}.",
     "Enable NAT traversal": "NAT-Durchdringung aktivieren",
     "Enable Relaying": "Weiterleitung aktivieren",
+    "Enabled": "Enabled",
     "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Geben Sie eine positive Zahl ein (z.B. \"2.35\") und wählen Sie eine Einheit. Prozentsätze sind Teil der gesamten Festplattengröße.",
     "Enter a non-privileged port number (1024 - 65535).": "Geben Sie eine nichtprivilegierte Portnummer ein (1024 - 65535).",
     "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Kommagetrennte Adressen (\"tcp://ip:port\", \"tcp://host:port\") oder \"dynamic\" eingeben, um die Adresse automatisch zu ermitteln.",
@@ -88,6 +93,7 @@
     "Error": "Fehler",
     "External File Versioning": "Externe Dateiversionierung",
     "Failed Items": "Fehlgeschlagene Objekte",
+    "Failed to setup, retrying": "Failed to setup, retrying",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Ein Verbindungsfehler zu IPv6-Servern ist zu erwarten, wenn es keine IPv6-Konnektivität gibt.",
     "File Pull Order": "Dateiübertragungsreihenfolge",
     "File Versioning": "Dateiversionierung",
@@ -182,6 +188,9 @@
     "Pause": "Pause",
     "Pause All": "Alles pausieren",
     "Paused": "Pausiert",
+    "Periodic scanning at given interval and disabled watching for changes": "Periodic scanning at given interval and disabled watching for changes",
+    "Periodic scanning at given interval and enabled watching for changes": "Periodic scanning at given interval and enabled watching for changes",
+    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:",
     "Please consult the release notes before performing a major upgrade.": "Bitte lesen Sie die Veröffentlichungshinweise bevor Sie eine Hauptversionsaktualisierung installieren.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Bitte lege einen Benutzer und ein Passwort für die Benutzeroberfläche in den Einstellungen fest.",
     "Please wait": "Bitte warten",
@@ -204,6 +213,7 @@
     "Rescan": "Neu scannen",
     "Rescan All": "Alle neu scannen",
     "Rescan Interval": "Scanintervall",
+    "Rescans": "Rescans",
     "Restart": "Neustart",
     "Restart Needed": "Neustart benötigt",
     "Restarting": "Wird neu gestartet",
@@ -212,6 +222,7 @@
     "Resume": "Fortsetzen",
     "Resume All": "Alles fortsetzen",
     "Reused": "Erneut benutzt",
+    "Running": "Running",
     "Save": "Speichern",
     "Scan Time Remaining": "Zeit für Scan verbleibend",
     "Scanning": "Scannen",

gui/default/assets/lang/lang-el.json

@@ -33,6 +33,7 @@
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "Για τις αυτόματες αναβαθμίσεις μπορείτε πλέον να επιλέξετε μεταξύ σταθερών εκδόσεων και υποψήφιων εκδόσεων.",
     "Automatic upgrades": "Αυτόματη αναβάθμιση",
     "Automatically create or share folders that this device advertises at the default path.": "Αυτόματη δημιουργία ή κοινή χρήση φακέλων τους οποίους ανακοινώνει αυτή η συσκευή στην προκαθορισμένη διαδρομή.",
+    "Available debug logging facilities:": "Διαθέσιμες επιλογές μηνυμάτων αποσφαλμάτωσης:",
     "Be careful!": "Με προσοχή!",
     "Bugs": "Bugs",
     "CPU Utilization": "Επιβάρυνση του επεξεργαστή",
@@ -64,6 +65,9 @@
     "Device that last modified the item": "Συσκευή από την οποία πραγματοποιήθηκε η τελευταία τροποποίηση του στοιχείου",
     "Devices": "Συσκευές",
     "Disabled": "Απενεργοποιημένη",
+    "Disabled periodic scanning and disabled watching for changes": "Έχουν απενεργοποιηθεί η τακτική σάρωση και η επιτήρηση αλλαγών",
+    "Disabled periodic scanning and enabled watching for changes": "Έχει απενεργοποιηθεί η τακτική σάρωση και ενεργοποιηθεί η επιτήρηση αλλαγών",
+    "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Έχει απενεργοποιηθεί η τακτική σάρωση και απέτυχε η ενεργοποίηση επιτήρησης αλλαγών. Γίνεται νέα προσπάθεια κάθε 1m:",
     "Disconnected": "Αποσυνδεδεμένη",
     "Discovered": "Βάσει ανεύρεσης",
     "Discovery": "Ανεύρεση συσκευών",
@@ -81,6 +85,7 @@
     "Editing {%path%}.": "Επεξεργασία του {{path}}.",
     "Enable NAT traversal": "Ενεργοποίηση διάσχισης NAT",
     "Enable Relaying": "Ενεργοποίηση αναμετάδοσης",
+    "Enabled": "Ενεργοποιημένη",
     "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Εισάγετε έναν μη αρνητικό αριθμό (π.χ. «2.35») και επιλέξτε μια μονάδα μέτρησης. Τα ποσοστά ισχύουν ως προς το συνολικό μέγεθος του δίσκου.",
     "Enter a non-privileged port number (1024 - 65535).": "Εισάγετε τον αριθμό μιας μη δεσμευμένης θύρας (1024 - 65535).",
     "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Εισάγετε τις διευθύνσεις χωρισμένες με κόμμα (\"tcp://ip:port\", \"tcp://host:port\") ή γράψτε \"dynamic\" για την αυτόματη ανεύρεση τους.",
@@ -88,6 +93,7 @@
     "Error": "Σφάλμα",
     "External File Versioning": "Εξωτερική τήρηση εκδόσεων",
     "Failed Items": "Αρχεία που απέτυχαν",
+    "Failed to setup, retrying": "Αποτυχία ενεργοποίησης, γίνεται νέα προσπάθεια",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Είναι φυσιολογική η αποτυχία σύνδεσης σε εξυπηρετητές IPv6 όταν δεν υπάρχει συνδεσιμότητα IPv6.",
     "File Pull Order": "Σειρά με την οποία θα κατεβαίνουν τα αρχεία",
     "File Versioning": "Τήρηση εκδόσεων αρχείων",
@@ -182,6 +188,9 @@
     "Pause": "Παύση",
     "Pause All": "Παύση όλων",
     "Paused": "Σε παύση",
+    "Periodic scanning at given interval and disabled watching for changes": "Τακτική σάρωση ανά καθορισμένο διάστημα και απενεργοποίηση επιτήρησης αλλαγών",
+    "Periodic scanning at given interval and enabled watching for changes": "Τακτική σάρωση ανά καθορισμένο διάστημα και ενεργοποίηση επιτήρησης αλλαγών",
+    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Τακτική σάρωση ανά καθορισμένο διάστημα και αποτυχία ενεργοποίησης επιτήρησης αλλαγών. Γίνεται νέα προσπάθεια κάθε 1m:",
     "Please consult the release notes before performing a major upgrade.": "Παρακαλούμε, πριν από την εκτέλεση μιας σημαντικής αναβάθμισης, να συμβουλευτείς το σημείωμα που τη συνοδεύει.  ",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Παρακαλώ όρισε στις ρυθμίσεις έναν χρήστη και έναν κωδικό πρόσβασης για τη διεπαφή.",
     "Please wait": "Παρακαλώ περιμένετε",
@@ -204,6 +213,7 @@
     "Rescan": "Έλεγξε για αλλαγές",
     "Rescan All": "Έλεγξέ τα όλα για αλλαγές",
     "Rescan Interval": "Κάθε πότε θα ελέγχεται για αλλαγές ",
+    "Rescans": "Επανασαρώσεις",
     "Restart": "Επανεκκίνηση",
     "Restart Needed": "Απαιτείται επανεκκίνηση",
     "Restarting": "Επανεκκίνηση",
@@ -212,6 +222,7 @@
     "Resume": "Συνέχεια",
     "Resume All": "Συνέχιση όλων",
     "Reused": "Χρησιμοποιήθηκε ξανά",
+    "Running": "Εκτελείται",
     "Save": "Αποθήκευση",
     "Scan Time Remaining": "Εναπομείναντας χρόνος για τον έλεγχο ",
     "Scanning": "Έλεγχος για αλλαγές",

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

@@ -33,6 +33,7 @@
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "Automatic upgrade now offers the choice between stable releases and release candidates.",
     "Automatic upgrades": "Automatic upgrades",
     "Automatically create or share folders that this device advertises at the default path.": "Automatically create or share folders that this device advertises at the default path.",
+    "Available debug logging facilities:": "Available debug logging facilities:",
     "Be careful!": "Be careful!",
     "Bugs": "Bugs",
     "CPU Utilization": "CPU Utilisation",
@@ -64,6 +65,9 @@
     "Device that last modified the item": "Device that last modified the item",
     "Devices": "Devices",
     "Disabled": "Disabled",
+    "Disabled periodic scanning and disabled watching for changes": "Disabled periodic scanning and disabled watching for changes",
+    "Disabled periodic scanning and enabled watching for changes": "Disabled periodic scanning and enabled watching for changes",
+    "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:",
     "Disconnected": "Disconnected",
     "Discovered": "Discovered",
     "Discovery": "Discovery",
@@ -81,6 +85,7 @@
     "Editing {%path%}.": "Editing {{path}}.",
     "Enable NAT traversal": "Enable NAT traversal",
     "Enable Relaying": "Enable Relaying",
+    "Enabled": "Enabled",
     "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.",
     "Enter a non-privileged port number (1024 - 65535).": "Enter a non-privileged port number (1024 - 65535).",
     "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.",
@@ -88,6 +93,7 @@
     "Error": "Error",
     "External File Versioning": "External File Versioning",
     "Failed Items": "Failed Items",
+    "Failed to setup, retrying": "Failed to setup, retrying",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.",
     "File Pull Order": "File Pull Order",
     "File Versioning": "File Versioning",
@@ -182,6 +188,9 @@
     "Pause": "Pause",
     "Pause All": "Pause All",
     "Paused": "Paused",
+    "Periodic scanning at given interval and disabled watching for changes": "Periodic scanning at given interval and disabled watching for changes",
+    "Periodic scanning at given interval and enabled watching for changes": "Periodic scanning at given interval and enabled watching for changes",
+    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:",
     "Please consult the release notes before performing a major upgrade.": "Please consult the release notes before performing a major upgrade.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Please set a GUI Authentication User and Password in the Settings dialogue.",
     "Please wait": "Please wait",
@@ -204,6 +213,7 @@
     "Rescan": "Rescan",
     "Rescan All": "Rescan All",
     "Rescan Interval": "Rescan Interval",
+    "Rescans": "Rescans",
     "Restart": "Restart",
     "Restart Needed": "Restart Needed",
     "Restarting": "Restarting",
@@ -212,6 +222,7 @@
     "Resume": "Resume",
     "Resume All": "Resume All",
     "Reused": "Reused",
+    "Running": "Running",
     "Save": "Save",
     "Scan Time Remaining": "Scan Time Remaining",
     "Scanning": "Scanning",

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

@@ -22,6 +22,7 @@
    "Allowed Networks": "Allowed Networks",
    "Alphabetic": "Alphabetic",
    "An external command handles the versioning. It has to remove the file from the shared folder.": "An external command handles the versioning. It has to remove the file from the shared folder.",
+   "An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.": "An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.",
    "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": "Anonymous Usage Reporting",
    "Anonymous usage report format has changed. Would you like to move to the new format?": "Anonymous usage report format has changed. Would you like to move to the new format?",
@@ -33,6 +34,7 @@
    "Automatic upgrade now offers the choice between stable releases and release candidates.": "Automatic upgrade now offers the choice between stable releases and release candidates.",
    "Automatic upgrades": "Automatic upgrades",
    "Automatically create or share folders that this device advertises at the default path.": "Automatically create or share folders that this device advertises at the default path.",
+   "Available debug logging facilities:": "Available debug logging facilities:",
    "Be careful!": "Be careful!",
    "Bugs": "Bugs",
    "CPU Utilization": "CPU Utilization",
@@ -64,6 +66,9 @@
    "Device that last modified the item": "Device that last modified the item",
    "Devices": "Devices",
    "Disabled": "Disabled",
+   "Disabled periodic scanning and disabled watching for changes": "Disabled periodic scanning and disabled watching for changes",
+   "Disabled periodic scanning and enabled watching for changes": "Disabled periodic scanning and enabled watching for changes",
+   "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:",
    "Disconnected": "Disconnected",
    "Discovered": "Discovered",
    "Discovery": "Discovery",
@@ -81,6 +86,7 @@
    "Editing {%path%}.": "Editing {{path}}.",
    "Enable NAT traversal": "Enable NAT traversal",
    "Enable Relaying": "Enable Relaying",
+   "Enabled": "Enabled",
    "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.",
    "Enter a non-privileged port number (1024 - 65535).": "Enter a non-privileged port number (1024 - 65535).",
    "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.",
@@ -88,6 +94,7 @@
    "Error": "Error",
    "External File Versioning": "External File Versioning",
    "Failed Items": "Failed Items",
+   "Failed to setup, retrying": "Failed to setup, retrying",
    "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.",
    "File Pull Order": "File Pull Order",
    "File Versioning": "File Versioning",
@@ -182,6 +189,9 @@
    "Pause": "Pause",
    "Pause All": "Pause All",
    "Paused": "Paused",
+   "Periodic scanning at given interval and disabled watching for changes": "Periodic scanning at given interval and disabled watching for changes",
+   "Periodic scanning at given interval and enabled watching for changes": "Periodic scanning at given interval and enabled watching for changes",
+   "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:",
    "Please consult the release notes before performing a major upgrade.": "Please consult the release notes before performing a major upgrade.",
    "Please set a GUI Authentication User and Password in the Settings dialog.": "Please set a GUI Authentication User and Password in the Settings dialog.",
    "Please wait": "Please wait",
@@ -204,6 +214,7 @@
    "Rescan": "Rescan",
    "Rescan All": "Rescan All",
    "Rescan Interval": "Rescan Interval",
+   "Rescans": "Rescans",
    "Restart": "Restart",
    "Restart Needed": "Restart Needed",
    "Restarting": "Restarting",
@@ -212,6 +223,7 @@
    "Resume": "Resume",
    "Resume All": "Resume All",
    "Reused": "Reused",
+   "Running": "Running",
    "Save": "Save",
    "Scan Time Remaining": "Scan Time Remaining",
    "Scanning": "Scanning",

gui/default/assets/lang/lang-eo.json

@@ -33,6 +33,7 @@
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "Aŭtomata ĝisdatigo nun proponas la elekton inter stabilaj eldonoj kaj kandidataj eldonoj.",
     "Automatic upgrades": "Aŭtomataj ĝisdatigoj",
     "Automatically create or share folders that this device advertises at the default path.": "Automatically create or share folders that this device advertises at the default path.",
+    "Available debug logging facilities:": "Available debug logging facilities:",
     "Be careful!": "Atentu!",
     "Bugs": "Bugoj",
     "CPU Utilization": "Ĉefprocesoro Uzo",
@@ -64,6 +65,9 @@
     "Device that last modified the item": "Device that last modified the item",
     "Devices": "Aparatoj",
     "Disabled": "Disabled",
+    "Disabled periodic scanning and disabled watching for changes": "Disabled periodic scanning and disabled watching for changes",
+    "Disabled periodic scanning and enabled watching for changes": "Disabled periodic scanning and enabled watching for changes",
+    "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:",
     "Disconnected": "Malkonektita",
     "Discovered": "Malkovrita",
     "Discovery": "Malkovro",
@@ -81,6 +85,7 @@
     "Editing {%path%}.": "Redaktado {{path}}.",
     "Enable NAT traversal": "Ŝaltu trairan NAT",
     "Enable Relaying": "Ŝaltu Relajsadon",
+    "Enabled": "Enabled",
     "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.",
     "Enter a non-privileged port number (1024 - 65535).": "Enter a non-privileged port number (1024 - 65535).",
     "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Enigi adresojn dividitajn per komoj (\"tcp://ip:port\", \"tcp://host:port\") aŭ \"dynamic\" por elfari aŭtomatan malkovradon de la adreso.",
@@ -88,6 +93,7 @@
     "Error": "Eraro",
     "External File Versioning": "Ekstera Versionado de Dosiero",
     "Failed Items": "Malsukcesaj Eroj",
+    "Failed to setup, retrying": "Failed to setup, retrying",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Malsukceso por konekti al IPv6 serviloj atendante se ekzistas neniu IPv6 konektebleco.",
     "File Pull Order": "Ordo por Tiri Dosieron",
     "File Versioning": "Versionado de Dosieroj",
@@ -182,6 +188,9 @@
     "Pause": "Paŭzu",
     "Pause All": "Paŭzu Ĉion",
     "Paused": "Paŭzita",
+    "Periodic scanning at given interval and disabled watching for changes": "Periodic scanning at given interval and disabled watching for changes",
+    "Periodic scanning at given interval and enabled watching for changes": "Periodic scanning at given interval and enabled watching for changes",
+    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:",
     "Please consult the release notes before performing a major upgrade.": "Bonvolu konsulti la eldonitajn notojn antaŭ elfari ĉefan ĝisdatigon.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Bonvolu agordi GUI Authentication Uzanto kaj Pasvorto en la agordoj dialogo.",
     "Please wait": "Bonvolu atendi",
@@ -204,6 +213,7 @@
     "Rescan": "Reskanu",
     "Rescan All": "Reskanu Ĉion",
     "Rescan Interval": "Reskana Intervalo",
+    "Rescans": "Rescans",
     "Restart": "Restartu",
     "Restart Needed": "Restarto Bezonata",
     "Restarting": "Restartado",
@@ -212,6 +222,7 @@
     "Resume": "Daŭrigu",
     "Resume All": "Daŭrigu Ĉion",
     "Reused": "Reuzita",
+    "Running": "Running",
     "Save": "Konservu",
     "Scan Time Remaining": "Skanada Restanta Tempo",
     "Scanning": "Skanado",

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

@@ -33,6 +33,7 @@
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "Ahora la actualización automática permite elegir entre versiones estables o versiones candidatas.",
     "Automatic upgrades": "Actualizaciones automáticas",
     "Automatically create or share folders that this device advertises at the default path.": "Automatically create or share folders that this device advertises at the default path.",
+    "Available debug logging facilities:": "Available debug logging facilities:",
     "Be careful!": "¡Ten cuidado!",
     "Bugs": "Errores",
     "CPU Utilization": "Uso de CPU",
@@ -64,6 +65,9 @@
     "Device that last modified the item": "Device that last modified the item",
     "Devices": "Dispositivos",
     "Disabled": "Disabled",
+    "Disabled periodic scanning and disabled watching for changes": "Disabled periodic scanning and disabled watching for changes",
+    "Disabled periodic scanning and enabled watching for changes": "Disabled periodic scanning and enabled watching for changes",
+    "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:",
     "Disconnected": "Desconectado",
     "Discovered": "Descubierto",
     "Discovery": "Descubrimiento",
@@ -81,6 +85,7 @@
     "Editing {%path%}.": "Editando {{path}}.",
     "Enable NAT traversal": "Permitir NAT transversal",
     "Enable Relaying": "Habilitar Retransmisión",
+    "Enabled": "Enabled",
     "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Introduce un número no negativo (por ejemplo, \"2.35\") y selecciona una unidad. Los porcentajes son como parte del tamaño total del disco.",
     "Enter a non-privileged port number (1024 - 65535).": "Introduce un puerto sin privilegios (1024 - 65535).",
     "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Introduzca las direcciones, separadas por comas (\"tcp://ip:port\", \"tcp://host:port\"), o \"dynamic\" para llevar a cabo el descubrimiento automático de la dirección.",
@@ -88,6 +93,7 @@
     "Error": "Error",
     "External File Versioning": "Versionado externo de fichero",
     "Failed Items": "Elementos fallidos",
+    "Failed to setup, retrying": "Failed to setup, retrying",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Se espera un fallo al conectar a los servidores IPv6 si no hay conectividad IPv6.",
     "File Pull Order": "Orden de obtención de los ficheros",
     "File Versioning": "Versionado de ficheros",
@@ -182,6 +188,9 @@
     "Pause": "Pausar",
     "Pause All": "Pausar todo",
     "Paused": "Pausado",
+    "Periodic scanning at given interval and disabled watching for changes": "Periodic scanning at given interval and disabled watching for changes",
+    "Periodic scanning at given interval and enabled watching for changes": "Periodic scanning at given interval and enabled watching for changes",
+    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:",
     "Please consult the release notes before performing a major upgrade.": "Por favor, consultar las notas de la versión antes de realizar una actualización importante.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Por favor, introduzca un Usuario y Contraseña para la Autenticación de la Interfaz de Usuario en el panel de Ajustes.",
     "Please wait": "Por favor, espere",
@@ -204,6 +213,7 @@
     "Rescan": "Volver a analizar",
     "Rescan All": "Volver a analizar Todo",
     "Rescan Interval": "Intervalo de análisis",
+    "Rescans": "Rescans",
     "Restart": "Reiniciar",
     "Restart Needed": "Reinicio necesario",
     "Restarting": "Reiniciando",
@@ -212,6 +222,7 @@
     "Resume": "Continuar",
     "Resume All": "Continuar todo",
     "Reused": "Reutilizado",
+    "Running": "Running",
     "Save": "Guardar",
     "Scan Time Remaining": "Tiempo Restante de Escaneo",
     "Scanning": "Analizando",

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

@@ -33,6 +33,7 @@
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "Ahora la actualización automática permite elegir entre versiones estables o versiones candidatas.",
     "Automatic upgrades": "Actualizaciones automáticas",
     "Automatically create or share folders that this device advertises at the default path.": "Crear o compartir automáticamente carpetas que este dispositivo anuncia en la ruta por defecto.",
+    "Available debug logging facilities:": "Available debug logging facilities:",
     "Be careful!": "¡Ten cuidado!",
     "Bugs": "Errores",
     "CPU Utilization": "Uso de CPU",
@@ -64,6 +65,9 @@
     "Device that last modified the item": "Dispositivo que modificó por última vez el ítem",
     "Devices": "Dispositivos",
     "Disabled": "Deshabilitado",
+    "Disabled periodic scanning and disabled watching for changes": "Disabled periodic scanning and disabled watching for changes",
+    "Disabled periodic scanning and enabled watching for changes": "Disabled periodic scanning and enabled watching for changes",
+    "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:",
     "Disconnected": "Desconectado",
     "Discovered": "Descubierto",
     "Discovery": "Descubrimiento",
@@ -81,6 +85,7 @@
     "Editing {%path%}.": "Editando {{path}}.",
     "Enable NAT traversal": "Permitir NAT transversal",
     "Enable Relaying": "Habilitar Retransmisión",
+    "Enabled": "Enabled",
     "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Introduce un número no negativo (por ejemplo, \"2.35\") y selecciona una unidad. Los porcentajes son como parte del tamaño total del disco.",
     "Enter a non-privileged port number (1024 - 65535).": "Introduce un puerto sin privilegios (1024 - 65535).",
     "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Introduzca las direcciones, separadas por comas (\"tcp://ip:port\", \"tcp://host:port\"), o \"dynamic\" para llevar a cabo el descubrimiento automático de la dirección.",
@@ -88,6 +93,7 @@
     "Error": "Error",
     "External File Versioning": "Versionado externo de fichero",
     "Failed Items": "Elementos fallidos",
+    "Failed to setup, retrying": "Failed to setup, retrying",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Se espera un fallo al conectar a los servidores IPv6 si no hay conectividad IPv6.",
     "File Pull Order": "Orden de obtención de los ficheros",
     "File Versioning": "Versionado de ficheros",
@@ -182,6 +188,9 @@
     "Pause": "Pausar",
     "Pause All": "Pausar todo",
     "Paused": "Pausado",
+    "Periodic scanning at given interval and disabled watching for changes": "Periodic scanning at given interval and disabled watching for changes",
+    "Periodic scanning at given interval and enabled watching for changes": "Periodic scanning at given interval and enabled watching for changes",
+    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:",
     "Please consult the release notes before performing a major upgrade.": "Por favor, consultar las notas de la versión antes de realizar una actualización importante.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Por favor, introduzca un Usuario y Contraseña para la Autenticación de la Interfaz de Usuario en el panel de Ajustes.",
     "Please wait": "Por favor, espere",
@@ -204,6 +213,7 @@
     "Rescan": "Volver a analizar",
     "Rescan All": "Volver a analizar Todo",
     "Rescan Interval": "Intervalo de análisis",
+    "Rescans": "Rescans",
     "Restart": "Reiniciar",
     "Restart Needed": "Reinicio necesario",
     "Restarting": "Reiniciando",
@@ -212,6 +222,7 @@
     "Resume": "Continuar",
     "Resume All": "Continuar todo",
     "Reused": "Reutilizado",
+    "Running": "Running",
     "Save": "Guardar",
     "Scan Time Remaining": "Tiempo Restante de Escaneo",
     "Scanning": "Analizando",

gui/default/assets/lang/lang-eu.json

@@ -33,6 +33,7 @@
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "Eguneratze automatiko sistemak iraunkor bertsioen eta aitzineko bertsioen artean hautatzea proposatzen du",
     "Automatic upgrades": "Eguneratze automatikoak",
     "Automatically create or share folders that this device advertises at the default path.": "Automatically create or share folders that this device advertises at the default path.",
+    "Available debug logging facilities:": "Available debug logging facilities:",
     "Be careful!": "Kasu emazu!",
     "Bugs": "Akatsak",
     "CPU Utilization": "Prozesadorearen erabiltzea",
@@ -64,6 +65,9 @@
     "Device that last modified the item": "Device that last modified the item",
     "Devices": "Tresnak",
     "Disabled": "Disabled",
+    "Disabled periodic scanning and disabled watching for changes": "Disabled periodic scanning and disabled watching for changes",
+    "Disabled periodic scanning and enabled watching for changes": "Disabled periodic scanning and enabled watching for changes",
+    "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:",
     "Disconnected": "Deskonektatua",
     "Discovered": "Agertua",
     "Discovery": "Agertzea",
@@ -81,6 +85,7 @@
     "Editing {%path%}.": "Muntatzea {{path}}",
     "Enable NAT traversal": "NAT translazioa aktibatu",
     "Enable Relaying": "Aldizkatzea posible",
+    "Enabled": "Enabled",
     "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Negatiboa ez den zenbaki bat hauta ezazu (\"2.35\" adib.) bai eta unitate bat. Disko osoaren  ehuneko espazioa",
     "Enter a non-privileged port number (1024 - 65535).": "Abantailatua ez den portu zenbalki bat sar ezazu (1024 - 65535)",
     "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": " (\"tcp://ip:ataka\", \"tcp://izena:ataka\") zuzenbideak sar, krakotx batez separatuak edo bestenaz \"dynamic\", zuzenbidearen xekatze automatikoa aktibatzeko",
@@ -88,6 +93,7 @@
     "Error": "Hutsa",
     "External File Versioning": "Fitxategi bertsioen kanpoko kudeaketa",
     "Failed Items": "Huts egin duten fitxategiak",
+    "Failed to setup, retrying": "Failed to setup, retrying",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "IPv6 zerbitzariei buruzko konexioak huts eginen du, IPv6 konektibitaterik ez bada",
     "File Pull Order": "Fitxategiak berreskuratzeko ordena",
     "File Versioning": "Fitxategiak zaintzeko metodoa",
@@ -182,6 +188,9 @@
     "Pause": "Pausa",
     "Pause All": "Geldi dena",
     "Paused": "Gelditua",
+    "Periodic scanning at given interval and disabled watching for changes": "Periodic scanning at given interval and disabled watching for changes",
+    "Periodic scanning at given interval and enabled watching for changes": "Periodic scanning at given interval and enabled watching for changes",
+    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:",
     "Please consult the release notes before performing a major upgrade.": "Aktualizatze garrantzitsu bat egin baino lehen, bertsioaren oharrak begira itzazu.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Konfigurazio leihoan asma itzazu erabiltzale izen bat eta pasahitz bat",
     "Please wait": "Pazientzia pixka bat, otoi",
@@ -204,6 +213,7 @@
     "Rescan": "Berriz eskaneatu",
     "Rescan All": "Dena berriz eskaneatu",
     "Rescan Interval": "Berriz eskaneatzeko tartea",
+    "Rescans": "Rescans",
     "Restart": "Berriz piztu",
     "Restart Needed": "Berriz piztea beharrezkoa",
     "Restarting": "Berriz piztea martxan",
@@ -212,6 +222,7 @@
     "Resume": "Berriz hastea",
     "Resume All": "Dena berriz hastea",
     "Reused": "Berriz erabilia",
+    "Running": "Running",
     "Save": "Grabatu",
     "Scan Time Remaining": "Gelditzen den azterketa denbora",
     "Scanning": "Azterketa martxan",

gui/default/assets/lang/lang-fi.json

@@ -1,332 +0,0 @@
-{
-    "A device with that ID is already added.": "ID:llä on jo lisätty laite.",
-    "A negative number of days doesn't make sense.": "Negatiivinen määrä päiviä ei ole järjellinen.",
-    "A new major version may not be compatible with previous versions.": "Uusi pääversio ei välttämättä ole yhteensopiva aiempien versioiden kanssa.",
-    "API Key": "API-avain",
-    "About": "Tietoja",
-    "Action": "Action",
-    "Actions": "Muokkaa",
-    "Add": "Lisää",
-    "Add Device": "Lisää laite",
-    "Add Folder": "Lisää kansio",
-    "Add Remote Device": "Lisää laite",
-    "Add devices from the introducer to our device list, for mutually shared folders.": "Add devices from the introducer to our device list, for mutually shared folders.",
-    "Add new folder?": "Lisää uusi kansio?",
-    "Address": "Osoite",
-    "Addresses": "Osoitteet",
-    "Advanced": "Lisäasetukset",
-    "Advanced Configuration": "Kehittyneet asetukset",
-    "Advanced settings": "Kehittyneet asetukset",
-    "All Data": "Kaikki data",
-    "Allow Anonymous Usage Reporting?": "Salli anonyymi käyttöraportointi?",
-    "Allowed Networks": "Allowed Networks",
-    "Alphabetic": "Aakkosellinen",
-    "An external command handles the versioning. It has to remove the file from the shared folder.": "An external command handles the versioning. It has to remove the file from the shared folder.",
-    "An external command handles the versioning. It has to remove the file from the synced folder.": "Ulkoinen komento hallitsee versionnin. Sen täytyy poistaa tiedosto synkronoidusta kansiosta.",
-    "Anonymous Usage Reporting": "Anonyymi käyttöraportointi",
-    "Anonymous usage report format has changed. Would you like to move to the new format?": "Anonymous usage report format has changed. Would you like to move to the new format?",
-    "Any devices configured on an introducer device will be added to this device as well.": "Kaikki esittelijäksi määritetyn laitteen tuntemat laitteet lisätään myös tähän laitteeseen.",
-    "Are you sure you want to remove device {%name%}?": "Are you sure you want to remove device {{name}}?",
-    "Are you sure you want to remove folder {%label%}?": "Are you sure you want to remove folder {{label}}?",
-    "Are you sure you want to restore {%count%} files?": "Are you sure you want to restore {{count}} files?",
-    "Auto Accept": "Auto Accept",
-    "Automatic upgrade now offers the choice between stable releases and release candidates.": "Automatic upgrade now offers the choice between stable releases and release candidates.",
-    "Automatic upgrades": "Automaattiset päivitykset",
-    "Automatically create or share folders that this device advertises at the default path.": "Automatically create or share folders that this device advertises at the default path.",
-    "Be careful!": "Ole varovainen!",
-    "Bugs": "Bugit",
-    "CPU Utilization": "CPU:n käyttö",
-    "Changelog": "Muutoshistoria",
-    "Clean out after": "Puhdista seuraavan ajan kuluttua",
-    "Click to see discovery failures": "Click to see discovery failures",
-    "Close": "Sulje",
-    "Command": "Komento",
-    "Comment, when used at the start of a line": "Kommentti, käytettäessä rivin alussa",
-    "Compression": "Pakkaus",
-    "Configured": "Konfiguroitu",
-    "Connection Error": "Yhteysvirhe",
-    "Connection Type": "Yhteyden tyyppi",
-    "Connections": "Connections",
-    "Copied from elsewhere": "Kopioitu muualta",
-    "Copied from original": "Kopioitu alkuperäisestä lähteestä",
-    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 seuraavat avustajat",
-    "Copyright © 2014-2017 the following Contributors:": "Copyright © 2014-2017 the following Contributors:",
-    "Creating ignore patterns, overwriting an existing file at {%path%}.": "Creating ignore patterns, overwriting an existing file at {{path}}.",
-    "Danger!": "Vaara!",
-    "Debugging Facilities": "Debugging Facilities",
-    "Default Folder Path": "Default Folder Path",
-    "Deleted": "Poistettu",
-    "Device": "Laite",
-    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Laite \"{{name}}\" {{device}} osoitteessa ({{address}}) haluaa yhdistää. Lisää uusi laite?",
-    "Device ID": "Laitteen ID",
-    "Device Identification": "Laitteen tunniste",
-    "Device Name": "Laitteen nimi",
-    "Device that last modified the item": "Device that last modified the item",
-    "Devices": "Laitteet",
-    "Disabled": "Disabled",
-    "Disconnected": "Yhteys katkaistu",
-    "Discovered": "Löydetty",
-    "Discovery": "Etsintä",
-    "Discovery Failures": "Discovery Failures",
-    "Do not restore": "Do not restore",
-    "Do not restore all": "Do not restore all",
-    "Documentation": "Dokumentaatio",
-    "Download Rate": "Latausmäärä",
-    "Downloaded": "Ladattu",
-    "Downloading": "Ladataan",
-    "Edit": "Muokkaa",
-    "Edit Device": "Muokkaa laitetta",
-    "Edit Folder": "Muokkaa kansiota",
-    "Editing": "Muokkaus",
-    "Editing {%path%}.": "Editing {{path}}.",
-    "Enable NAT traversal": "Aktivoi osoitteenmuunnoksen kierto",
-    "Enable Relaying": "Aktivoi yhteyden välitys",
-    "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.",
-    "Enter a non-privileged port number (1024 - 65535).": "Enter a non-privileged port number (1024 - 65535).",
-    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Syötä osoitteet pilkuilla erotettuina (\"tcp://ip:portti, tcp://nimi:portti\") tai \"dynamic\" käyttääksesi osoitteen automaattista selvitystä.",
-    "Enter ignore patterns, one per line.": "Syötä ohituslausekkeet, yksi riviä kohden.",
-    "Error": "Virhe",
-    "External File Versioning": "Ulkoinen tiedostoversionti",
-    "Failed Items": "Epäonnistuneet kohteet",
-    "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.",
-    "File Pull Order": "Tiedostojen noutojärjestys",
-    "File Versioning": "Tiedostoversiointi",
-    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Tiedostojen oikeusbitit jätetään huomiotta etsittäessä muutoksia. Käytä FAT-tiedostojärjestelmissä.",
-    "Files are moved to .stversions directory when replaced or deleted by Syncthing.": "Files are moved to .stversions directory when replaced or deleted by Syncthing.",
-    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Kun Syncthing poistaa tai korvaa tiedostoja, ne siirretään .stversions-hakemistoon.",
-    "Files are moved to date stamped versions in a .stversions directory when replaced or deleted by Syncthing.": "Files are moved to date stamped versions in a .stversions directory when replaced or deleted by Syncthing.",
-    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Tiedostot siirretään päivämäärällä merkityiksi versioiksi .stversions-kansioon, kun Syncthing korvaa tai poistaa ne.",
-    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Tiedostot on suojattu muilla laitteilla tehdyiltä muutoksilta, mutta tällä laitteella tehdyt muutokset lähetetään muuhun ryhmään.",
-    "Filesystem Notifications": "Filesystem Notifications",
-    "Filter by date": "Filter by date",
-    "Filter by name": "Filter by name",
-    "Folder": "Kansio",
-    "Folder ID": "Kansion ID",
-    "Folder Label": "Kansion nimi",
-    "Folder Path": "Kansion polku",
-    "Folder Type": "Kansion tyyppi",
-    "Folders": "Kansiot",
-    "GUI": "GUI",
-    "GUI Authentication Password": "GUI:n salasana",
-    "GUI Authentication User": "GUI:n käyttäjätunnus",
-    "GUI Listen Address": "GUI Listen Address",
-    "GUI Listen Addresses": "GUI:n kuunteluosoitteet",
-    "GUI Theme": "GUI Theme",
-    "General": "General",
-    "Generate": "Generoi",
-    "Global Changes": "Global Changes",
-    "Global Discovery": "Globaali etsintä",
-    "Global Discovery Servers": "Globaalit etsintäpalvelimet",
-    "Global State": "Globaali tila",
-    "Help": "Apua",
-    "Home page": "Kotisivu",
-    "Ignore": "Ohita",
-    "Ignore Patterns": "Ohituslausekkeet",
-    "Ignore Permissions": "Jätä oikeudet huomiotta",
-    "Incoming Rate Limit (KiB/s)": "Sisääntulevan liikenteen rajoitus (KiB/s)",
-    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Virheelliset asetukset voivat vahingoittaa kansion sisältöä tai estää Syncthingin toiminnan.",
-    "Introduced By": "Introduced By",
-    "Introducer": "Esittelijä",
-    "Inversion of the given condition (i.e. do not exclude)": "Käänteinen ehto (t.s. älä ohita)",
-    "Keep Versions": "Säilytä versiot",
-    "Largest First": "Suurin ensin",
-    "Last File Received": "Viimeksi vastaanotettu tiedosto",
-    "Last Scan": "Viimeisin skannaus",
-    "Last seen": "Nähty viimeksi",
-    "Later": "Myöhemmin",
-    "Latest Change": "Viimeisin muutos",
-    "Learn more": "Learn more",
-    "Listeners": "Kuuntelijat",
-    "Loading data...": "Loading data...",
-    "Loading...": "Loading...",
-    "Local Discovery": "Paikallinen etsintä",
-    "Local State": "Paikallinen tila",
-    "Local State (Total)": "Paikallinen tila (Yhteensä)",
-    "Log": "Log",
-    "Log tailing paused. Click here to continue.": "Log tailing paused. Click here to continue.",
-    "Logs": "Logs",
-    "Major Upgrade": "Pääversion päivitys.",
-    "Mass actions": "Mass actions",
-    "Master": "Pääkansio",
-    "Maximum Age": "Maksimi-ikä",
-    "Metadata Only": "Vain metadata",
-    "Minimum Free Disk Space": "Vapaan levytilan vähimmäismäärä",
-    "Mod. Device": "Mod. Device",
-    "Mod. Time": "Mod. Time",
-    "Move to top of queue": "Siirrä jonon alkuun",
-    "Multi level wildcard (matches multiple directory levels)": "Monitasoinen jokerimerkki (vaikuttaa useassa kansiotasossa)",
-    "Never": "Ei koskaan",
-    "New Device": "Uusi laite",
-    "New Folder": "Uusi kansio",
-    "Newest First": "Uusin ensin",
-    "No": "Ei",
-    "No File Versioning": "Ei tiedostoversiointia",
-    "No files will be deleted as a result of this operation.": "No files will be deleted as a result of this operation.",
-    "No upgrades": "Ei päivityksiä",
-    "Normal": "Normaali kansio",
-    "Notice": "Huomautus",
-    "OK": "OK",
-    "Off": "Pois",
-    "Oldest First": "Vanhin ensin",
-    "Optional descriptive label for the folder. Can be different on each device.": "Valinnainen kuvaava nimi kansiolle, joka voi olla eri jokaisella laitteella.",
-    "Options": "Valinnat",
-    "Out of Sync": "Ei ajan tasalla",
-    "Out of Sync Items": "Kohteet, jotka eivät ole ajan tasalla",
-    "Outgoing Rate Limit (KiB/s)": "Uloslähtevän liikenteen rajoitus (KiB/s)",
-    "Override Changes": "Ohita muutokset",
-    "Path": "Path",
-    "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Polku kansioon paikallisella tietokoneella. Kansio luodaan, ellei sitä ole olemassa. Tilde-merkkiä (~) voidaan käyttää oikotienä polulle",
-    "Path where new auto accepted folders will be created, as well as the default suggested path when adding new folders via the UI. Tilde character (~) expands to {%tilde%}.": "Path where new auto accepted folders will be created, as well as the default suggested path when adding new folders via the UI. Tilde character (~) expands to {{tilde}}.",
-    "Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).": "Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).",
-    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Polku jonne versiot tullaan tallentamaan (jätä tyhjäksi oletusvalintaa .stversions varten).",
-    "Pause": "Keskeytä",
-    "Pause All": "Pause All",
-    "Paused": "Keskeytetty",
-    "Please consult the release notes before performing a major upgrade.": "Tutustu julkaisutietoihin ennen kuin teet pääversion päivityksen.",
-    "Please set a GUI Authentication User and Password in the Settings dialog.": "Ole hyvä ja aseta käyttäjätunnus ja salasana käyttöliittymää varten asetusvalikossa.",
-    "Please wait": "Ole hyvä ja odota",
-    "Prefix indicating that the file can be deleted if preventing directory removal": "Prefix indicating that the file can be deleted if preventing directory removal",
-    "Prefix indicating that the pattern should be matched without case sensitivity": "Prefix indicating that the pattern should be matched without case sensitivity",
-    "Preview": "Esikatselu",
-    "Preview Usage Report": "Esikatsele käyttöraportti",
-    "Quick guide to supported patterns": "Tuettujen lausekkeiden pikaohje",
-    "RAM Utilization": "RAM:n käyttö",
-    "Random": "Satunnainen",
-    "Recent Changes": "Recent Changes",
-    "Reduced by ignore patterns": "Vähennetty ohituslausekkeiden perusteella",
-    "Release Notes": "Julkaisutiedot",
-    "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.",
-    "Remote Devices": "Laitteet",
-    "Remove": "Poista",
-    "Remove Device": "Remove Device",
-    "Remove Folder": "Remove Folder",
-    "Required identifier for the folder. Must be the same on all cluster devices.": "Pakollinen tunniste kansiolle, jonka täytyy olla sama kaikilla laitteilla.",
-    "Rescan": "Skannaa uudelleen",
-    "Rescan All": "Skannaa kaikki uudelleen",
-    "Rescan Interval": "Uudelleenskannauksen aikaväli",
-    "Restart": "Käynnistä uudelleen",
-    "Restart Needed": "Uudelleenkäynnistys tarvitaan",
-    "Restarting": "Käynnistetään uudelleen",
-    "Restore": "Restore",
-    "Restore Versions": "Restore Versions",
-    "Resume": "Jatka",
-    "Resume All": "Resume All",
-    "Reused": "Uudelleenkäytetty",
-    "Save": "Tallenna",
-    "Scan Time Remaining": "Skannausaikaa jäljellä",
-    "Scanning": "Skannataan",
-    "See external versioner help for supported templated command line parameters.": "See external versioner help for supported templated command line parameters.",
-    "See external versioning help for supported templated command line parameters.": "See external versioning help for supported templated command line parameters.",
-    "Select a version": "Select a version",
-    "Select latest version": "Select latest version",
-    "Select oldest version": "Select oldest version",
-    "Select the devices to share this folder with.": "Valitse laitteet, joiden kanssa tämä kansio jaetaan.",
-    "Select the folders to share with this device.": "Valitse kansiot jaettavaksi tämän laitteen kanssa.",
-    "Send & Receive": "Lähetä & vastaanota",
-    "Send Only": "Vain lähetys",
-    "Settings": "Asetukset",
-    "Share": "Jaa",
-    "Share Folder": "Jaa kansio",
-    "Share Folders With Device": "Jaa kansioita laitteen kanssa",
-    "Share With Devices": "Jaa laitteiden kanssa",
-    "Share this folder?": "Jaa tämä kansio?",
-    "Shared With": "Jaettu seuraavien kanssa",
-    "Show ID": "Näytä ID",
-    "Show QR": "Näytä QR-koodi",
-    "Show diff with previous version": "Show diff with previous version",
-    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Näytetään ryhmän tiedoissa laitteen ID:n sijaan. Ilmoitetaan muille laitteille vaihtoehtoisena oletusnimenä.",
-    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Näytetään ryhmän tiedoissa laitteen ID:n sijaan. Tyhjä nimi päivitetään laitteen ilmoittamaksi nimeksi.",
-    "Shutdown": "Sammuta",
-    "Shutdown Complete": "Sammutus valmis",
-    "Simple File Versioning": "Yksinkertainen tiedostoversiointi",
-    "Single level wildcard (matches within a directory only)": "Yksitasoinen jokerimerkki (vaikuttaa vain kyseisen kansion sisällä)",
-    "Size": "Size",
-    "Smallest First": "Pienin ensin",
-    "Some items could not be restored:": "Some items could not be restored:",
-    "Source Code": "Lähdekoodi",
-    "Stable releases and release candidates": "Vakaat julkaisut ja julkaisuehdokkaat",
-    "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.",
-    "Stable releases only": "Vain vakaat julkaisut",
-    "Staggered File Versioning": "Porrastettu tiedostoversiointi",
-    "Start Browser": "Käynnistä selain",
-    "Statistics": "Tilastot",
-    "Stopped": "Pysäytetty",
-    "Support": "Tuki",
-    "Sync Protocol Listen Addresses": "Synkronointiprotokollan kuunteluosoite",
-    "Syncing": "Synkronoidaan",
-    "Syncthing has been shut down.": "Syncthing on sammutettu.",
-    "Syncthing includes the following software or portions thereof:": "Syncthing sisältää seuraavat ohjelmistot tai sen osat:",
-    "Syncthing is restarting.": "Syncthing käynnistyy uudelleen.",
-    "Syncthing is upgrading.": "Syncthing päivittyy.",
-    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing näyttää olevan alhaalla tai internetyhteydessä on ongelma. Yritetään uudelleen...",
-    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing ei pysty käsittelemään pyyntöäsi. Ole hyvä ja päivitä sivu tai käynnistä Syncthing uudelleen, jos ongelma jatkuu.",
-    "The Syncthing admin interface is configured to allow remote access without a password.": "Syncthingin hallintakäyttöliittymä on asetettu sallimaan ulkoiset yhteydet ilman salasanaa.",
-    "The aggregated statistics are publicly available at the URL below.": "Koostetut tilastot ovat julkisesti saatavilla alla olevassa osoitteessa.",
-    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Asetukset on tallennettu, mutta niitä ei ole otettu käyttöön. Syncthingin täytyy käynnistyä uudelleen, jotta uudet asetukset saadaan käyttöön.",
-    "The device ID cannot be blank.": "Laitteen ID ei voi olla tyhjä.",
-    "The device ID to enter here can be found in the \"Actions > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "Tähän kohtaan syötettävän ID:n löytää \"Muokkaa > Näytä ID\" -valikosta toiselta laitteelta. Välit ja viivat ovat valinnaisia (jätetään huomiotta).",
-    "The encrypted usage report is sent daily. It is used to track common platforms, folder sizes and app versions. If the reported data set is changed you will be prompted with this dialog again.": "Salattu käyttöraportti lähetetään päivittäin. Sitä käytetään yleisimpien alustojen, kansioiden kokojen ja sovellusversioiden seuraamiseen. Jos raportitavan datan luonne muuttuu, sinua tullaan huomauttamaan tällä dialogilla uudelleen.",
-    "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.": "Syötetty laite-ID ei näytä kelpaavalta. Sen tulisi olla 52 tai 56 merkkiä pitkä, joka koostuu kirjaimista ja numeroista, jossa välit ja viivat ovat valinnaisia.",
-    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "Ensimmäinen komentoriviparametri on kansion polku, toinen parametri on suhteellinen polku kansion sisällä.",
-    "The folder ID cannot be blank.": "Kansion ID ei voi olla tyhjä.",
-    "The folder ID must be unique.": "Kansion ID:n tulee olla uniikki.",
-    "The folder path cannot be blank.": "Kansion polku ei voi olla tyhjä.",
-    "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "Seuraavat aikavälit ovat käytössä: ensimmäisen tunnin ajalta uusi versio säilytetään joka 30 sekunti, ensimmäisen päivän ajalta uusi versio säilytetään tunneittain ja ensimmäisen 30 päivän aikana uusi versio säilytetään päivittäin. Lopulta uusi versio säilytetään viikoittain, kunnes maksimi-ikä saavutetaan.",
-    "The following items could not be synchronized.": "Seuraavia nimikkeitä ei voitu synkronoida.",
-    "The maximum age must be a number and cannot be blank.": "Maksimi-iän tulee olla numero, eikä se voi olla tyhjä.",
-    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Maksimiaika versioiden säilytykseen (päivissä, aseta 0 säilyttääksesi versiot ikuisesti).",
-    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "Vapaan levytilan vähimmäismäärä prosentteina tulee olla positiivinen luku (suljetulta) väliltä 0-100.",
-    "The number of days must be a number and cannot be blank.": "Päivien määrän tulee olla numero, eikä se voi olla tyhjä.",
-    "The number of days to keep files in the trash can. Zero means forever.": "Montako päivää tiedostoja säilytetään roskakorissa. Nolla (0) = ikuisesti.",
-    "The number of old versions to keep, per file.": "Säilytettävien vanhojen versioiden määrä tiedostoa kohden.",
-    "The number of versions must be a number and cannot be blank.": "Versioiden määrän rulee olla numero, eikä se voi olla tyhjä.",
-    "The path cannot be blank.": "Polku ei voi olla tyhjä.",
-    "The rate limit must be a non-negative number (0: no limit)": "Nopeusrajan tulee olla positiivinen luku tai nolla. (0: ei rajaa)",
-    "The rescan interval must be a non-negative number of seconds.": "Uudelleenskannauksen aikavälin tulee olla ei-negatiivinen numero sekunteja.",
-    "They are retried automatically and will be synced when the error is resolved.": "Niiden synkronointia yritetään uudelleen automaattisesti.",
-    "This Device": "Tämä laite",
-    "This can easily give hackers access to read and change any files on your computer.": "Tämä voi helposti sallia vihamielisille tahoille pääsyn lukea ja muokata kaikkia tiedostojasi",
-    "This is a major version upgrade.": "Tämä on pääversion päivitys.",
-    "This setting controls the free space required on the home (i.e., index database) disk.": "This setting controls the free space required on the home (i.e., index database) disk.",
-    "Time": "Aika",
-    "Time the item was last modified": "Time the item was last modified",
-    "Trash Can File Versioning": "Roskakorin tiedostoversiointi",
-    "Type": "Tyyppi",
-    "Unavailable": "Unavailable",
-    "Unavailable/Disabled by administrator or maintainer": "Unavailable/Disabled by administrator or maintainer",
-    "Undecided (will prompt)": "Undecided (will prompt)",
-    "Unknown": "Tuntematon",
-    "Unshared": "Jakamaton",
-    "Unused": "Käyttämätön",
-    "Up to Date": "Ajan tasalla",
-    "Updated": "Päivitetty",
-    "Upgrade": "Päivitys",
-    "Upgrade To {%version%}": "Päivitä versioon {{version}}",
-    "Upgrading": "Päivitetään",
-    "Upload Rate": "Lähetysmäärä",
-    "Uptime": "Päälläoloaika",
-    "Usage reporting is always enabled for candidate releases.": "Usage reporting is always enabled for candidate releases.",
-    "Use HTTPS for GUI": "Käytä HTTPS:ää GUI:n kanssa",
-    "Version": "Versio",
-    "Versions": "Versions",
-    "Versions Path": "Versioiden polku",
-    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Versiot poistetaan automaattisesti mikäli ne ovat vanhempia kuin maksimi-ikä tai niiden määrä ylittää sallitun määrän tietyllä aikavälillä.",
-    "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "Varoitus: tämä polku on olemassa olevan kansion \"{{otherFolder}}\" yläkansio.",
-    "Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Warning, this path is a parent directory of an existing folder \"{{otherFolderLabel}}\" ({{otherFolder}}).",
-    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Varoitus: tämä polku on olemassa olevan kansion \"{{otherFolder}}\" alikansio.",
-    "Warning, this path is a subdirectory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Warning, this path is a subdirectory of an existing folder \"{{otherFolderLabel}}\" ({{otherFolder}}).",
-    "When adding a new device, keep in mind that this device must be added on the other side too.": "Lisättäessä laitetta, muista että tämä laite tulee myös lisätä toiseen laitteeseen.",
-    "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Lisättäessä uutta kansiota, muista että kansion ID:tä käytetään solmimaan kansiot yhteen laitteiden välillä. Ne ovat riippuvaisia kirjankoosta ja niiden tulee täsmätä kaikkien laitteiden välillä.",
-    "Yes": "Kyllä",
-    "You can also select one of these nearby devices:": "You can also select one of these nearby devices:",
-    "You can change your choice at any time in the Settings dialog.": "You can change your choice at any time in the Settings dialog.",
-    "You can read more about the two release channels at the link below.": "You can read more about the two release channels at the link below.",
-    "You must keep at least one version.": "Sinun tulee säilyttää ainakin yksi versio.",
-    "days": "päivää",
-    "directories": "kansiot",
-    "files": "tiedostot",
-    "full documentation": "täysi dokumentaatio",
-    "items": "kohteet",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} haluaa jakaa kansion \"{{folder}}\".",
-    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} haluaa jakaa kansion \"{{folderlabel}}\" ({{folder}})."
-}

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

@@ -33,6 +33,7 @@
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "Le système de mise à jour automatique propose le choix entre versions stables et versions préliminaires.",
     "Automatic upgrades": "Mises à jour automatiques",
     "Automatically create or share folders that this device advertises at the default path.": "Automatically create or share folders that this device advertises at the default path.",
+    "Available debug logging facilities:": "Available debug logging facilities:",
     "Be careful!": "Faites attention !",
     "Bugs": "Bugs",
     "CPU Utilization": "Utilisation du CPU",
@@ -64,6 +65,9 @@
     "Device that last modified the item": "Device that last modified the item",
     "Devices": "Appareil",
     "Disabled": "Disabled",
+    "Disabled periodic scanning and disabled watching for changes": "Disabled periodic scanning and disabled watching for changes",
+    "Disabled periodic scanning and enabled watching for changes": "Disabled periodic scanning and enabled watching for changes",
+    "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:",
     "Disconnected": "Déconnecté",
     "Discovered": "Découvert",
     "Discovery": "Découverte",
@@ -81,6 +85,7 @@
     "Editing {%path%}.": "Modification de {{path}}.",
     "Enable NAT traversal": "Activer transfert d'adresses NAT",
     "Enable Relaying": "Activer le relayage",
+    "Enabled": "Enabled",
     "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Nombre positif (p.ex, \"2.35\") et unité. Pourcentage de l'espace disque total.",
     "Enter a non-privileged port number (1024 - 65535).": "Enter a non-privileged port number (1024 - 65535).",
     "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Entrer les adresses (\"tcp://ip:port\" ou \"tcp://hôte:port\") séparées par une virgule, ou \"dynamic\" afin d'activer la recherche automatique de l'adresse.",
@@ -88,6 +93,7 @@
     "Error": "Erreur",
     "External File Versioning": "Gestion externe des versions de fichiers",
     "Failed Items": "Éléments en échec",
+    "Failed to setup, retrying": "Failed to setup, retrying",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "La connexion aux serveurs en IPv6 va échouer s'il n'y a pas de connectivité IPv6.",
     "File Pull Order": "Ordre de récupération de fichier",
     "File Versioning": "Méthode de préservation des fichiers",
@@ -182,6 +188,9 @@
     "Pause": "Pause",
     "Pause All": "Tout suspendre",
     "Paused": "En pause",
+    "Periodic scanning at given interval and disabled watching for changes": "Periodic scanning at given interval and disabled watching for changes",
+    "Periodic scanning at given interval and enabled watching for changes": "Periodic scanning at given interval and enabled watching for changes",
+    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:",
     "Please consult the release notes before performing a major upgrade.": "Veuillez consulter les notes de version avant de réaliser une mise à jour majeure.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Veuillez définir un nom d'utilisateur et un mot de passe dans les réglages.",
     "Please wait": "Merci de patienter",
@@ -204,6 +213,7 @@
     "Rescan": "Réanalyser",
     "Rescan All": "Tout réanalyser",
     "Rescan Interval": "Intervalle d'analyse",
+    "Rescans": "Rescans",
     "Restart": "Redémarrer",
     "Restart Needed": "Redémarrage nécessaire",
     "Restarting": "Redémarrage en cours",
@@ -212,6 +222,7 @@
     "Resume": "Reprise",
     "Resume All": "Tout libérer",
     "Reused": "Réutilisé",
+    "Running": "Running",
     "Save": "Enregistrer",
     "Scan Time Remaining": "Temps d'analyse restant",
     "Scanning": "Analyse en cours",

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

@@ -8,8 +8,8 @@
     "Actions": "Actions",
     "Add": "Ajouter",
     "Add Device": "Ajouter l'appareil",
-    "Add Folder": "Ajouter un partage",
-    "Add Remote Device": "Ajouter un appareil",
+    "Add Folder": "Ajouter un partage...",
+    "Add Remote Device": "Ajouter un appareil...",
     "Add devices from the introducer to our device list, for mutually shared folders.": "ATTENTION !!! Lui permettre d'ajouter et enlever des membres à toutes mes listes de membres des partages dont il fait (ou fera !) partie (ceci permet de créer automatiquement toutes les liaisons point à point possibles en complétant mes listes par les siennes, meilleur débit de réception par cumul des débits d'envoi, indépendance vis à vis de l'introducteur, etc).",
     "Add new folder?": "Ajouter ce partage ?",
     "Address": "Adresse",
@@ -21,7 +21,7 @@
     "Allow Anonymous Usage Reporting?": "Autoriser l'envoi de statistiques d'utilisation anonymisées ?",
     "Allowed Networks": "Réseaux autorisés",
     "Alphabetic": "Alphabétique",
-    "An external command handles the versioning. It has to remove the file from the shared folder.": "Une commande externe gère les versions de fichiers. Il lui incombe de supprimer les fichiers dans le répertoire synchronisé.",
+    "An external command handles the versioning. It has to remove the file from the shared folder.": "Une commande externe gère les versions de fichiers. Il lui incombe de supprimer les fichiers du répertoire partagé. Si le chemin contient des espaces, il doit être spécifié entre guillemets.",
     "An external command handles the versioning. It has to remove the file from the synced folder.": "Une commande externe gère les versions de fichiers. Il lui incombe de supprimer les fichiers dans le répertoire synchronisé.",
     "Anonymous Usage Reporting": "Rapport anonyme de statistiques d'utilisation",
     "Anonymous usage report format has changed. Would you like to move to the new format?": "Le format du rapport anonyme d'utilisation a changé. Voulez-vous passer au nouveau format ?",
@@ -33,6 +33,7 @@
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "Le système de mise à jour automatique propose le choix entre versions stables et versions préliminaires.",
     "Automatic upgrades": "Mises à jour automatiques",
     "Automatically create or share folders that this device advertises at the default path.": "ATTENTION !!! Créer ou partager automatiquement dans le chemin par défaut les partages que cet appareil annonce.",
+    "Available debug logging facilities:": "Outils de débogage disponibles :",
     "Be careful!": "Faites attention !",
     "Bugs": "Bugs",
     "CPU Utilization": "Utilisation du CPU",
@@ -53,8 +54,8 @@
     "Copyright © 2014-2017 the following Contributors:": "Copyright © 2014-2017, les contributeurs sont:",
     "Creating ignore patterns, overwriting an existing file at {%path%}.": "Création de masques d'exclusion, remplacement du fichier existant : {{path}}.",
     "Danger!": "Attention !",
-    "Debugging Facilities": "Outils de debogage",
-    "Default Folder Path": "Chemin par défaut des partages",
+    "Debugging Facilities": "Outils de débogage",
+    "Default Folder Path": "Chemin parent par défaut pour les nouveaux partages",
     "Deleted": "Supprimé",
     "Device": "Appareil",
     "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "\"{{name}}\" ({{device}}), appareil actuellement à {{address}}, demande à se connecter.\nAcceptez-vous de l'ajouter à votre liste d'appareils connus ?",
@@ -64,6 +65,9 @@
     "Device that last modified the item": "Dernier appareil modificateur",
     "Devices": "Appareils",
     "Disabled": "Désactivé",
+    "Disabled periodic scanning and disabled watching for changes": "Analyse périodique et surveillance des changements désactivées.",
+    "Disabled periodic scanning and enabled watching for changes": "Analyse périodique désactivée et surveillance des changements activée.",
+    "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Analyse périodique désactivée et échec d'activation de la surveillance des changements. Nouvel essai toutes les 1mn :",
     "Disconnected": "Déconnecté",
     "Discovered": "Découvert",
     "Discovery": "Découverte",
@@ -74,13 +78,14 @@
     "Download Rate": "Débit de réception",
     "Downloaded": "Reçu",
     "Downloading": "Réception",
-    "Edit": "Gérer",
+    "Edit": "Gérer...",
     "Edit Device": "Gérer l'appareil",
     "Edit Folder": "Gérer le partage",
     "Editing": "Modifications",
     "Editing {%path%}.": "Modification de {{path}}.",
     "Enable NAT traversal": "Activer la translation d'adresses (NAT)",
     "Enable Relaying": "Relayage possible",
+    "Enabled": "Activée",
     "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Nombre positif (p.ex, \"2.35\") et unité. Pourcentage de l'espace disque total.",
     "Enter a non-privileged port number (1024 - 65535).": "Entrez un n° de port non-privilégié (1024 - 65535)",
     "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Entrer les adresses (\"tcp://ip:port\" ou \"tcp://hôte:port\") séparées par une virgule, ou \"dynamic\" afin d'activer la recherche automatique de l'adresse.",
@@ -88,6 +93,7 @@
     "Error": "Erreur",
     "External File Versioning": "Gestion externe des versions de fichiers",
     "Failed Items": "Fichiers en échec",
+    "Failed to setup, retrying": "Échec, nouvel essai",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "La connexion aux serveurs en IPv6 va échouer s'il n'y a pas de connectivité IPv6.",
     "File Pull Order": "Ordre de récupération des fichiers",
     "File Versioning": "Méthode de préservation des fichiers",
@@ -121,7 +127,7 @@
     "Help": "Aide",
     "Home page": "Page d'accueil",
     "Ignore": "Ignorer",
-    "Ignore Patterns": "Exclusions ...",
+    "Ignore Patterns": "Exclusions...",
     "Ignore Permissions": "Ignorer les permissions",
     "Incoming Rate Limit (KiB/s)": "Limite du débit de réception (Kio/s)",
     "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Une configuration incorrecte peut créer des dommages dans vos répertoires et mettre Syncthing hors-service.",
@@ -182,6 +188,9 @@
     "Pause": "Pause",
     "Pause All": "Tout suspendre",
     "Paused": "En pause",
+    "Periodic scanning at given interval and disabled watching for changes": "Analyse périodique à intervalle défini et surveillance des changements désactivée.",
+    "Periodic scanning at given interval and enabled watching for changes": "Analyse périodique à intervalle défini et surveillance des changements activée.",
+    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Analyse périodique à intervalle défini et échec d'activation de la surveillance des changements. Nouvel essai toutes les 1mn :",
     "Please consult the release notes before performing a major upgrade.": "Veuillez consulter les notes de version avant de réaliser une mise à jour majeure.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Veuillez définir un nom d'utilisateur et un mot de passe dans la fenêtre de Configuration.",
     "Please wait": "Merci de patienter",
@@ -192,18 +201,19 @@
     "Quick guide to supported patterns": "Guide rapide des masques compatibles ci-dessous",
     "RAM Utilization": "Utilisation de la RAM",
     "Random": "Aléatoire",
-    "Recent Changes": "Changements récents",
+    "Recent Changes": "Changements récents...",
     "Reduced by ignore patterns": "(Limité par des masques d'exclusion)",
     "Release Notes": "Notes de version",
     "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Les versions préliminaires contiennent les dernières fonctionnalités et derniers correctifs. Elles sont identiques aux traditionnelles mises à jour bimensuelles.",
     "Remote Devices": "Autres appareils",
-    "Remove": "Supprimer",
+    "Remove": "Supprimer...",
     "Remove Device": "Supprimer l'appareil",
     "Remove Folder": "Supprimer le partage",
     "Required identifier for the folder. Must be the same on all cluster devices.": "Identifiant du partage. Doit être le même sur tous les appareils concernés (généré aléatoirement, mais modifiable à la création).",
     "Rescan": "Réanalyser",
     "Rescan All": "Tout réanalyser",
     "Rescan Interval": "Intervalle d'analyse",
+    "Rescans": "Surveillance",
     "Restart": "Redémarrer",
     "Restart Needed": "Redémarrage nécessaire",
     "Restarting": "Redémarrage en cours",
@@ -212,6 +222,7 @@
     "Resume": "Reprise",
     "Resume All": "Tout libérer",
     "Reused": "Réutilisé",
+    "Running": "En cours",
     "Save": "Enregistrer",
     "Scan Time Remaining": "Temps d'analyse restant",
     "Scanning": "Analyse en cours",
@@ -308,7 +319,7 @@
     "Usage reporting is always enabled for candidate releases.": "Les statistiques d'utilisation sont toujours envoyées pour les versions préliminaires.",
     "Use HTTPS for GUI": "Utiliser l'HTTPS pour le GUI",
     "Version": "Version",
-    "Versions": "Versions",
+    "Versions": "Restauration...",
     "Versions Path": "Emplacement des versions",
     "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Les plus anciennes versions seront supprimées automatiquement quand elles dépassent la durée maximum de conservation ou si leur nombre (par fichier) est supérieur à la limite prédéfinie pour l'intervalle.",
     "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "Attention, ce chemin est un répertoire parent d'au moins un partage existant (par exemple \"{{otherFolder}}\"). Si c'est bien ce que vous souhaitez, vous devriez créer un nouveau sous-répertoire, sinon ceci peut causer des problèmes tels que duplications et/ou suppressions intempestives de fichiers.",

gui/default/assets/lang/lang-fy.json

@@ -33,6 +33,7 @@
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "Automatyske fernijing biedt no de kar tusken stabyle ferzjes en ferzje kandidaten",
     "Automatic upgrades": "Automatyske fernijings",
     "Automatically create or share folders that this device advertises at the default path.": "Meitsje of diel automatysk mappen dy't dit apparaat advertearret op it standert paad.",
+    "Available debug logging facilities:": "Beskikbere debug-lochfoarsjennings:",
     "Be careful!": "Tink derom!",
     "Bugs": "Brekkings",
     "CPU Utilization": "CPU-brûken",
@@ -64,6 +65,9 @@
     "Device that last modified the item": "Apparaat dat dit item it lêst oanpast hat",
     "Devices": "Apparaten",
     "Disabled": "Utskeakele",
+    "Disabled periodic scanning and disabled watching for changes": "Disabled periodic scanning and disabled watching for changes",
+    "Disabled periodic scanning and enabled watching for changes": "Disabled periodic scanning and enabled watching for changes",
+    "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:",
     "Disconnected": "Ferbining ferbrutsen",
     "Discovered": "Untdekt",
     "Discovery": "Untdekking",
@@ -81,6 +85,7 @@
     "Editing {%path%}.": "{{path}} wurd bewurke.",
     "Enable NAT traversal": "NAT-trochkruse ynskeakelje",
     "Enable Relaying": "Trochjaan tastean",
+    "Enabled": "Enabled",
     "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Fier in net-negatyf nûmer yn (bygelyks \"2.35\") en selektearje in ienheid. Percentages stean foar it part fan de totale skiifromte.",
     "Enter a non-privileged port number (1024 - 65535).": "Fier in net-befoarrjochte poart-nûmer yn (1024 - 65535).",
     "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Fier troch komma's skieden (\"tcp://ip:port\", \"tcp://host:port\") adressen yn of \"dynamic\" om automatyske ûntdekking fan it adres út te fieren.",
@@ -88,6 +93,7 @@
     "Error": "Flater",
     "External File Versioning": "Ekstern ferzjebehear foar triemen",
     "Failed Items": "Mislearre items",
+    "Failed to setup, retrying": "Failed to setup, retrying",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": " Mislearjen fan it ferbinen mei IPv6-tsjinners wurd ferwachte as der gjin stipe foar IPv6-ferbinings is.",
     "File Pull Order": "Triemlûkfolchoarder",
     "File Versioning": "Triemferzjebehear",
@@ -182,6 +188,9 @@
     "Pause": "Skoftsje",
     "Pause All": "Alles skoftsje",
     "Paused": "Skoftet",
+    "Periodic scanning at given interval and disabled watching for changes": "Periodic scanning at given interval and disabled watching for changes",
+    "Periodic scanning at given interval and enabled watching for changes": "Periodic scanning at given interval and enabled watching for changes",
+    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:",
     "Please consult the release notes before performing a major upgrade.": "Foardat jo in wichtige fernijing ynstallearre, graach earst de fernijingsoantekenings lêze.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Graach foar GUI-ferifikaasje in brûkers-ID en wachtwurd ynstelle yn it ynstellingsdialooch.",
     "Please wait": "In amerijke",
@@ -204,6 +213,7 @@
     "Rescan": "Sken opnij",
     "Rescan All": "Sken alles opnij",
     "Rescan Interval": "Wersken ynterval",
+    "Rescans": "Rescans",
     "Restart": "Werstarte",
     "Restart Needed": "Werstart nedich",
     "Restarting": "Oan it werstarten",
@@ -212,6 +222,7 @@
     "Resume": "Trochgean",
     "Resume All": "Alles trochgean litte",
     "Reused": "Opnij brûkt",
+    "Running": "Running",
     "Save": "Bewarje",
     "Scan Time Remaining": "Oerbleaune skentiid",
     "Scanning": "Oan it skennen",

gui/default/assets/lang/lang-hu.json

@@ -33,6 +33,7 @@
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "Az automatikus frissítés most lehetőséget kínál a stabil és az előzetes kiadások közötti választásra.",
     "Automatic upgrades": "Automatikus frissítések",
     "Automatically create or share folders that this device advertises at the default path.": "Az eszköz alapértelmezett útvonalon hirdetett mappáinak automatikus létrehozása vagy megosztása",
+    "Available debug logging facilities:": "Elérhető hibakeresésnaplózási képességek:",
     "Be careful!": "Óvatosan!",
     "Bugs": "Hibák",
     "CPU Utilization": "Processzorhasználat",
@@ -64,6 +65,9 @@
     "Device that last modified the item": "Az eszköz, amely utoljára módosította az elemet",
     "Devices": "Eszközök",
     "Disabled": "Letiltva",
+    "Disabled periodic scanning and disabled watching for changes": "A periodikus átnézés és a változások keresése letiltva",
+    "Disabled periodic scanning and enabled watching for changes": "A periodikus átnézés letiltva a változások keresése engedélyezve",
+    "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "A periodikus átnézés letiltva és a változások keresésének beállítása sikertelen, 1 percenként újrapróbálkozás:",
     "Disconnected": "Kapcsolat bontva",
     "Discovered": "Felfedezett",
     "Discovery": "Felfedezés",
@@ -81,6 +85,7 @@
     "Editing {%path%}.": "{{path}} szerkesztése.",
     "Enable NAT traversal": "NAT bejárás engedélyezése",
     "Enable Relaying": "Közvetítés engedélyezése",
+    "Enabled": "Engedélyezve",
     "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Adj meg egy nem-negatív számot (pl. \"2.35\") és válassz egy mértékegységet. A százalékok a teljes lemezméretre vonatkoznak.",
     "Enter a non-privileged port number (1024 - 65535).": "Adj meg egy nem privilegizált port számot (1024 - 65535).",
     "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. ",
@@ -88,6 +93,7 @@
     "Error": "Hiba",
     "External File Versioning": "Külső fájlverzió-követés",
     "Failed Items": "Hibás elemek",
+    "Failed to setup, retrying": "Telepítés nem sikerült, újrapróbálkozás",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Mivel nincs IPv6 kapcsolat, ezért várhatóan nem fog sikerülni IPv6-os szerverekhez csatlakozni.",
     "File Pull Order": "Fájlküldési sorrend",
     "File Versioning": "Fájlverzió-követés",
@@ -182,6 +188,9 @@
     "Pause": "Szünet",
     "Pause All": "Mindent szüneteltet",
     "Paused": "Szünetel",
+    "Periodic scanning at given interval and disabled watching for changes": "Periodikus átnézés a megadott időközönként és a változások keresése letiltva",
+    "Periodic scanning at given interval and enabled watching for changes": "Periodikus átnézés a megadott időközönként és a változások keresése engedélyezve",
+    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Periodikus átnézés a megadott időközönként és a változások keresésének beállítása sikertelen, 1 percenként újrapróbálkozás:",
     "Please consult the release notes before performing a major upgrade.": "Nagyobb frissítés előtt ellenőrizni kell a kiadási megjegyzéseket.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Be kell állítani a grafikus felület felhasználónevét és jelszavát a Beállítások párbeszédablakban.",
     "Please wait": "Türelem",
@@ -204,6 +213,7 @@
     "Rescan": "Átnézés",
     "Rescan All": "Összes átnézése",
     "Rescan Interval": "Átnézési intervallum",
+    "Rescans": "Átnézések",
     "Restart": "Újraindítás",
     "Restart Needed": "Újraindítás szükséges",
     "Restarting": "Újraindulás",
@@ -212,6 +222,7 @@
     "Resume": "Folytatás",
     "Resume All": "Mindent folytat",
     "Reused": "Újrafelhasználva",
+    "Running": "Fut",
     "Save": "Mentés",
     "Scan Time Remaining": "Fennmaradó átnézési idő",
     "Scanning": "Átnézés",

gui/default/assets/lang/lang-it.json

@@ -29,10 +29,11 @@
     "Are you sure you want to remove device {%name%}?": "Sei sicuro di voler rimuovere il dispositivo {{name}}?",
     "Are you sure you want to remove folder {%label%}?": "Sei sicuro di voler rimuovere la cartella {{label}}?",
     "Are you sure you want to restore {%count%} files?": "Sei sicuro di voler ripristinare {{count}} file?",
-    "Auto Accept": "Auto Accept",
+    "Auto Accept": "Accettazione Automatica",
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "Aggiornamenti automatici offrono la scelta tra rilasci stabili e candidati di rilascio.",
     "Automatic upgrades": "Aggiornamenti automatici",
-    "Automatically create or share folders that this device advertises at the default path.": "Automatically create or share folders that this device advertises at the default path.",
+    "Automatically create or share folders that this device advertises at the default path.": "Crea o condividi automaticamente le cartelle che questo dispositivo presenta sul percorso predefinito.",
+    "Available debug logging facilities:": "Servizi di debug disponibili:",
     "Be careful!": "Fai attenzione!",
     "Bugs": "Bug",
     "CPU Utilization": "Utilizzo CPU",
@@ -46,30 +47,33 @@
     "Configured": "Configurato",
     "Connection Error": "Errore di Connessione",
     "Connection Type": "Tipo di Connessione",
-    "Connections": "Connections",
+    "Connections": "Connessioni",
     "Copied from elsewhere": "Copiato da qualche altra parte",
     "Copied from original": "Copiato dall'originale",
     "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 i seguenti Collaboratori:",
     "Copyright © 2014-2017 the following Contributors:": "Copyright © 2014-2017 i seguenti Collaboratori:",
     "Creating ignore patterns, overwriting an existing file at {%path%}.": "Creazione di schemi di esclusione, sovrascrivendo un file esistente in {{path}}.",
     "Danger!": "Pericolo!",
-    "Debugging Facilities": "Debugging Facilities",
-    "Default Folder Path": "Default Folder Path",
+    "Debugging Facilities": "Servizi di Debug",
+    "Default Folder Path": "Percorso Cartella di Default",
     "Deleted": "Cancellato",
     "Device": "Dispositivo",
     "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Il dispositivo \"{{name}}\" ({{device}} - {{address}}) chiede di connettersi. Aggiungere il nuovo dispositivo?",
     "Device ID": "ID Dispositivo",
     "Device Identification": "Identificazione Dispositivo",
     "Device Name": "Nome Dispositivo",
-    "Device that last modified the item": "Device that last modified the item",
+    "Device that last modified the item": "Dispositivo che ha modificato l'elemento per ultimo",
     "Devices": "Dispositivi",
     "Disabled": "Disabilitato",
+    "Disabled periodic scanning and disabled watching for changes": "Scansione periodica disabilitata e verifica cambiamenti disabilitata",
+    "Disabled periodic scanning and enabled watching for changes": "Scansione periodica disabilitata e verifica cambiamenti abilitata",
+    "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Scansione periodica disabilitata e configurazione fallita della verifica cambiamenti, nuovo tentativo ogni 1m:",
     "Disconnected": "Disconnesso",
     "Discovered": "Individuato",
     "Discovery": "Individuazione",
     "Discovery Failures": "Individuazione Fallita",
-    "Do not restore": "Do not restore",
-    "Do not restore all": "Do not restore all",
+    "Do not restore": "Non ripristinare",
+    "Do not restore all": "Non ripristinare tutto",
     "Documentation": "Documentazione",
     "Download Rate": "Velocità Download",
     "Downloaded": "Scaricato",
@@ -81,6 +85,7 @@
     "Editing {%path%}.": "Modifica di {{path}}.",
     "Enable NAT traversal": "Abilita NAT traversal",
     "Enable Relaying": "Abilita Reindirizzamento",
+    "Enabled": "Abilitato",
     "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Inserisci un numero non negativo (ad esempio \"2.35\") e seleziona un'unità. Le percentuali sono parte della dimensione totale del disco.",
     "Enter a non-privileged port number (1024 - 65535).": "Inserisci un numero di porta non-privilegiata (1024 - 65535).",
     "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.",
@@ -88,6 +93,7 @@
     "Error": "Errore",
     "External File Versioning": "Controllo Versione Esterno",
     "Failed Items": "Elementi Errati",
+    "Failed to setup, retrying": "Configurazione fallita, riprovo",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "La connessione a server IPv6 fallisce se non c'è connettività IPv6.",
     "File Pull Order": "Ordine Prelievo File",
     "File Versioning": "Controllo Versione File",
@@ -98,8 +104,8 @@
     "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.",
     "Filesystem Notifications": "Notifiche del filesystem",
-    "Filter by date": "Filter by date",
-    "Filter by name": "Filter by name",
+    "Filter by date": "Filtra per data",
+    "Filter by name": "Filtra per nome",
     "Folder": "Cartella",
     "Folder ID": "ID Cartella",
     "Folder Label": "Etichetta per la Cartella",
@@ -112,7 +118,7 @@
     "GUI Listen Address": "Indirizzo dell'Interfaccia Grafica",
     "GUI Listen Addresses": "Indirizzi dell'Interfaccia Grafica",
     "GUI Theme": "Tema GUI",
-    "General": "General",
+    "General": "Generale",
     "Generate": "Genera",
     "Global Changes": "Modifiche Globali",
     "Global Discovery": "Individuazione Globale",
@@ -137,22 +143,22 @@
     "Latest Change": "Ultima Modifica",
     "Learn more": "Impara di piu",
     "Listeners": "In Ascolto",
-    "Loading data...": "Loading data...",
-    "Loading...": "Loading...",
+    "Loading data...": "Caricamento dati...",
+    "Loading...": "Caricamento...",
     "Local Discovery": "Individuazione Locale",
     "Local State": "Stato Locale",
     "Local State (Total)": "Stato Locale (Totale)",
     "Log": "Log",
-    "Log tailing paused. Click here to continue.": "Log tailing paused. Click here to continue.",
-    "Logs": "Logs",
+    "Log tailing paused. Click here to continue.": "Visualizzazione log in pausa. Clicca qui per continuare.",
+    "Logs": "Log",
     "Major Upgrade": "Aggiornamento Principale",
-    "Mass actions": "Mass actions",
+    "Mass actions": "Azioni di massa",
     "Master": "Principale",
     "Maximum Age": "Durata Massima",
     "Metadata Only": "Solo i Metadati",
     "Minimum Free Disk Space": "Minimo Spazio Libero su Disco",
-    "Mod. Device": "Mod. Device",
-    "Mod. Time": "Mod. Time",
+    "Mod. Device": "Mod. Dispositivo",
+    "Mod. Time": "Mod. Tempo",
     "Move to top of queue": "Posiziona in cima alla coda",
     "Multi level wildcard (matches multiple directory levels)": "Metacarattere multi-livello (per corrispondenze in più livelli di cartelle)",
     "Never": "Mai",
@@ -161,7 +167,7 @@
     "Newest First": "Prima il più recente",
     "No": "No",
     "No File Versioning": "Nessun Controllo Versione",
-    "No files will be deleted as a result of this operation.": "No files will be deleted as a result of this operation.",
+    "No files will be deleted as a result of this operation.": "Nessun file verrà eliminato come risultato di questa operazione.",
     "No upgrades": "Senza aggiornamenti",
     "Normal": "Normale",
     "Notice": "Avviso",
@@ -176,12 +182,15 @@
     "Override Changes": "Ignora le Modifiche",
     "Path": "Percorso",
     "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 new auto accepted folders will be created, as well as the default suggested path when adding new folders via the UI. Tilde character (~) expands to {%tilde%}.": "Path where new auto accepted folders will be created, as well as the default suggested path when adding new folders via the UI. Tilde character (~) expands to {{tilde}}.",
+    "Path where new auto accepted folders will be created, as well as the default suggested path when adding new folders via the UI. Tilde character (~) expands to {%tilde%}.": "Percorso in cui verranno create nuove cartelle accettate automaticamente, nonché il percorso suggerito di default quando si aggiungono nuove cartelle tramite l'interfaccia utente. Il carattere Tilde (~) si espande in {{tilde}}.",
     "Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).": "Percorso di salvataggio delle versioni (lasciare vuoto per utilizzare la cartella predefinita .stversions in questa cartella).",
     "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",
     "Pause All": "Pausa Tutti",
     "Paused": "In Pausa",
+    "Periodic scanning at given interval and disabled watching for changes": "Scansione periodica a intervalli determinati e verifica cambiamenti disabilitata",
+    "Periodic scanning at given interval and enabled watching for changes": "Scansione periodica a intervalli determinati e verifica cambiamenti abilitata",
+    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Scansione periodica a intervalli determinati e configurazione fallita della verifica cambiamenti, nuovo tentativo ogni 1m:",
     "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 set a GUI Authentication User and Password in the Settings dialog.": "Per favore impostare Utente e Password dell'Interfaccia Grafica nelle Impostazioni.",
     "Please wait": "Attendere prego",
@@ -192,34 +201,36 @@
     "Quick guide to supported patterns": "Guida veloce agli schemi supportati",
     "RAM Utilization": "Utilizzo RAM",
     "Random": "Casuale",
-    "Recent Changes": "Recent Changes",
+    "Recent Changes": "Cambiamenti Recenti",
     "Reduced by ignore patterns": "Ridotto da schemi di esclusione",
     "Release Notes": "Note di Rilascio",
     "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Candidati di rilascio contengono le ultime funzionalita e aggiustamenti. Sono simili ai rilasci bisettimanali di Syncthing.",
     "Remote Devices": "Dispositivi Remoti",
     "Remove": "Rimuovi",
-    "Remove Device": "Remove Device",
-    "Remove Folder": "Remove Folder",
+    "Remove Device": "Rimuovi Dispositivo",
+    "Remove Folder": "Rimuovi Cartella",
     "Required identifier for the folder. Must be the same on all cluster devices.": "Identificatore obbligatorio della cartella. Deve essere lo stesso su tutti i dispositivi del cluster.",
     "Rescan": "Riscansiona",
     "Rescan All": "Riscansiona Tutto",
     "Rescan Interval": "Intervallo Scansione",
+    "Rescans": "Ri-scansione",
     "Restart": "Riavvia",
     "Restart Needed": "Riavvio Necessario",
     "Restarting": "Riavvio",
-    "Restore": "Restore",
-    "Restore Versions": "Restore Versions",
+    "Restore": "Ripristina",
+    "Restore Versions": "Ripristina Versioni",
     "Resume": "Riprendi",
     "Resume All": "Riprendi Tutti",
     "Reused": "Riutilizzato",
+    "Running": "In esecuzione",
     "Save": "Salva",
     "Scan Time Remaining": "Tempo di Scansione Rimanente",
     "Scanning": "Scansione in corso",
     "See external versioner help for supported templated command line parameters.": "Consultare la guida al controllo di versione per i modelli dei parametri di riga di comando supportati.",
     "See external versioning help for supported templated command line parameters.": "Consultare la guida al controllo di versione per i modelli dei parametri di riga di comando supportati.",
     "Select a version": "Seleziona una versione",
-    "Select latest version": "Select latest version",
-    "Select oldest version": "Select oldest version",
+    "Select latest version": "Seleziona l'ultima versione",
+    "Select oldest version": "Seleziona la versione più vecchia",
     "Select the devices to share this folder with.": "Seleziona i dispositivi con i quali condividere questa cartella.",
     "Select the folders to share with this device.": "Seleziona le cartelle da condividere con questo dispositivo.",
     "Send & Receive": "Invia & Ricevi",
@@ -240,9 +251,9 @@
     "Shutdown Complete": "Arresto Eseguito",
     "Simple File Versioning": "Controllo Versione Semplice",
     "Single level wildcard (matches within a directory only)": "Metacarattere di singolo livello (per corrispondenze solo all'interno di una cartella)",
-    "Size": "Size",
+    "Size": "Dimensione",
     "Smallest First": "Prima il più piccolo",
-    "Some items could not be restored:": "Some items could not be restored:",
+    "Some items could not be restored:": "Alcuni elementi non possono essere ripristinati:",
     "Source Code": "Codice Sorgente",
     "Stable releases and release candidates": "Rilasci stabili e candidati di rilascio",
     "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "Rilasci stabili sono in ritardo di circa due settimane. Durante questo tempo verranno testati come candidati di rilascio.",
@@ -289,11 +300,11 @@
     "This is a major version upgrade.": "Questo è un aggiornamento di versione principale",
     "This setting controls the free space required on the home (i.e., index database) disk.": "Questa impostazione controlla lo spazio libero richiesto sul disco home (cioè, database di indice).",
     "Time": "Tempo",
-    "Time the item was last modified": "Time the item was last modified",
+    "Time the item was last modified": "Ora dell'ultima modifica degli elementi",
     "Trash Can File Versioning": "Controllo Versione con Cestino",
     "Type": "Tipo",
-    "Unavailable": "Unavailable",
-    "Unavailable/Disabled by administrator or maintainer": "Unavailable/Disabled by administrator or maintainer",
+    "Unavailable": "Non disponibile",
+    "Unavailable/Disabled by administrator or maintainer": "Non disponibile/Disabilitato dall'amministratore o dal manutentore",
     "Undecided (will prompt)": "Non deciso (verrà richiesto)",
     "Unknown": "Sconosciuto",
     "Unshared": "Non Condiviso",
@@ -308,7 +319,7 @@
     "Usage reporting is always enabled for candidate releases.": "Segnalazioni di utilizzo sono sempre abilitati per candidati di rilascio.",
     "Use HTTPS for GUI": "Utilizza HTTPS per l'interfaccia grafica",
     "Version": "Versione",
-    "Versions": "Versions",
+    "Versions": "Versioni",
     "Versions Path": "Percorso Cartella Versioni",
     "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Le versioni vengono eliminate automaticamente se superano la durata massima o il numero di file permessi in un determinato intervallo temporale.",
     "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "Attenzione, questo percorso è una cartella superiore di una cartella esistente \"{{otherFolder}}\".",

gui/default/assets/lang/lang-ja.json

@@ -33,6 +33,7 @@
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "自動アップグレードは、安定版とリリース候補版のいずれかを選べるようになりました。",
     "Automatic upgrades": "自動アップグレード",
     "Automatically create or share folders that this device advertises at the default path.": "Automatically create or share folders that this device advertises at the default path.",
+    "Available debug logging facilities:": "Available debug logging facilities:",
     "Be careful!": "注意！",
     "Bugs": "バグ",
     "CPU Utilization": "CPU使用率",
@@ -64,6 +65,9 @@
     "Device that last modified the item": "Device that last modified the item",
     "Devices": "デバイス",
     "Disabled": "無効",
+    "Disabled periodic scanning and disabled watching for changes": "Disabled periodic scanning and disabled watching for changes",
+    "Disabled periodic scanning and enabled watching for changes": "Disabled periodic scanning and enabled watching for changes",
+    "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:",
     "Disconnected": "切断中",
     "Discovered": "探索結果",
     "Discovery": "探索サーバー",
@@ -81,6 +85,7 @@
     "Editing {%path%}.": "{{path}} を編集中",
     "Enable NAT traversal": "NATトラバーサルを有効にする",
     "Enable Relaying": "中継サーバー経由の通信を有効にする",
+    "Enabled": "Enabled",
     "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "0以上の数 (例: 2.35) を入力し、単位を選択してください。パーセントはディスク容量全体に対する割合です。",
     "Enter a non-privileged port number (1024 - 65535).": "非特権ポート番号 (1024 - 65535) を入力してください。",
     "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "アドレスを指定する場合は「tcp://IPアドレス:ポート, tcp://ホスト名:ポート」のようにコンマで区切って入力してください。自動探索を行う場合は「dynamic」と入力してください。",
@@ -88,6 +93,7 @@
     "Error": "エラー",
     "External File Versioning": "外部バージョン管理",
     "Failed Items": "失敗した項目",
+    "Failed to setup, retrying": "Failed to setup, retrying",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "お使いのネットワークがIPv6を利用していない場合、IPv6のサーバーへの接続に失敗しても異常ではありません。",
     "File Pull Order": "ファイルを取得する順序",
     "File Versioning": "ファイルのバージョン管理",
@@ -182,6 +188,9 @@
     "Pause": "一時停止",
     "Pause All": "すべて一時停止",
     "Paused": "一時停止中",
+    "Periodic scanning at given interval and disabled watching for changes": "Periodic scanning at given interval and disabled watching for changes",
+    "Periodic scanning at given interval and enabled watching for changes": "Periodic scanning at given interval and enabled watching for changes",
+    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:",
     "Please consult the release notes before performing a major upgrade.": "メジャーアップグレードを行う前にリリースノートを参照してください。",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "設定ダイアログから、GUI認証ユーザー名とパスワードを設定してください。",
     "Please wait": "お待ちください",
@@ -204,6 +213,7 @@
     "Rescan": "再スキャン",
     "Rescan All": "すべて再スキャン",
     "Rescan Interval": "再スキャン間隔",
+    "Rescans": "Rescans",
     "Restart": "再起動",
     "Restart Needed": "再起動が必要です",
     "Restarting": "再起動中",
@@ -212,6 +222,7 @@
     "Resume": "再開",
     "Resume All": "すべて再開",
     "Reused": "中断後再利用",
+    "Running": "Running",
     "Save": "保存",
     "Scan Time Remaining": "スキャン残り時間",
     "Scanning": "スキャン中",

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

@@ -33,6 +33,7 @@
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "자동 업데이트를 이제 안정 버전과 출시 후보 사이에 선택 할 수 있게 됩니다.",
     "Automatic upgrades": "자동 업데이트",
     "Automatically create or share folders that this device advertises at the default path.": "Automatically create or share folders that this device advertises at the default path.",
+    "Available debug logging facilities:": "Available debug logging facilities:",
     "Be careful!": "주의!",
     "Bugs": "버그",
     "CPU Utilization": "CPU 사용률",
@@ -54,7 +55,7 @@
     "Creating ignore patterns, overwriting an existing file at {%path%}.": "무시 패턴 만들기, {{path}}에 존재하는 파일을 덮어쓰기 합니다",
     "Danger!": "경고!",
     "Debugging Facilities": "Debugging Facilities",
-    "Default Folder Path": "Default Folder Path",
+    "Default Folder Path": "기본 폴더 경로",
     "Deleted": "삭제됨",
     "Device": "기기",
     "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "다른 기기 {{device}} ({{address}}) 에서 접속을 요청했습니다. 새 장치를 추가하시겠습니까?",
@@ -64,12 +65,15 @@
     "Device that last modified the item": "Device that last modified the item",
     "Devices": "기기",
     "Disabled": "비활성화",
+    "Disabled periodic scanning and disabled watching for changes": "Disabled periodic scanning and disabled watching for changes",
+    "Disabled periodic scanning and enabled watching for changes": "Disabled periodic scanning and enabled watching for changes",
+    "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:",
     "Disconnected": "연결 끊김",
     "Discovered": "탐색됨",
     "Discovery": "탐색",
     "Discovery Failures": "탐색 실패",
-    "Do not restore": "Do not restore",
-    "Do not restore all": "Do not restore all",
+    "Do not restore": "복구 하지 않기",
+    "Do not restore all": "모두 복구 하지 않기",
     "Documentation": "문서",
     "Download Rate": "다운로드 속도",
     "Downloaded": "다운로드됨",
@@ -81,6 +85,7 @@
     "Editing {%path%}.": "{{path}} 수정하기.",
     "Enable NAT traversal": "NAT traversal 활성화",
     "Enable Relaying": "Relaying 활성화",
+    "Enabled": "Enabled",
     "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "음수가 아닌 수 (예, \"2.35\") 를 입력 후 단위를 선택하세요. 백분율은 총 디스크 크기의 일부입니다.",
     "Enter a non-privileged port number (1024 - 65535).": "비 특권 포트 번호를 입력하세요 (1024 - 65535).",
     "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "주소 자동 검색을 하기 위해서는 \"ip:port\" 형식의 주소들을 쉼표로 구분해서 입력하거나 \"dynamic\"을 입력하세요.",
@@ -88,6 +93,7 @@
     "Error": "오류",
     "External File Versioning": "외부 파일 버전 관리",
     "Failed Items": "실패한 항목",
+    "Failed to setup, retrying": "Failed to setup, retrying",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "IPv6 네트워크에 연결되지 않은 경우 IPv6 서버에 연결 할 수 없습니다.",
     "File Pull Order": "파일 동기화 순서",
     "File Versioning": "파일 버전 관리",
@@ -98,8 +104,8 @@
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "파일이 Syncthing에 의해서 교체되거나 삭제되면 .stversions 폴더에 있는 날짜가 바뀐 버전으로 이동됩니다.",
     "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "다른 장치가 파일을 편집할 수 없으며 반드시 이 장치의 내용을 기준으로 동기화합니다.",
     "Filesystem Notifications": "파일시스템 알림",
-    "Filter by date": "Filter by date",
-    "Filter by name": "Filter by name",
+    "Filter by date": "날짜별 정렬",
+    "Filter by name": "이름별 정렬",
     "Folder": "폴더",
     "Folder ID": "폴더 ID",
     "Folder Label": "폴더 라벨",
@@ -112,7 +118,7 @@
     "GUI Listen Address": "GUI 주소",
     "GUI Listen Addresses": "GUI 주소",
     "GUI Theme": "GUI 테마",
-    "General": "General",
+    "General": "일반",
     "Generate": "생성",
     "Global Changes": "전체 변경 사항",
     "Global Discovery": "글로벌 탐색",
@@ -137,14 +143,14 @@
     "Latest Change": "최신 변경",
     "Learn more": "더 알아보기",
     "Listeners": "수신자",
-    "Loading data...": "Loading data...",
-    "Loading...": "Loading...",
+    "Loading data...": "데이터 불러오는중...",
+    "Loading...": "불러오는 중...",
     "Local Discovery": "로컬 노드 검색",
     "Local State": "로컬 상태",
     "Local State (Total)": "로컬 상태 (합계)",
-    "Log": "Log",
-    "Log tailing paused. Click here to continue.": "Log tailing paused. Click here to continue.",
-    "Logs": "Logs",
+    "Log": "기록",
+    "Log tailing paused. Click here to continue.": "기록 출력이 일시정지됨. 계속하려면 여기를 클릭하십시오. ",
+    "Logs": "기록",
     "Major Upgrade": "메이저 업데이트",
     "Mass actions": "Mass actions",
     "Master": "마스터",
@@ -182,6 +188,9 @@
     "Pause": "일시 중지",
     "Pause All": "모두 일시 중지",
     "Paused": "일시 중지됨",
+    "Periodic scanning at given interval and disabled watching for changes": "Periodic scanning at given interval and disabled watching for changes",
+    "Periodic scanning at given interval and enabled watching for changes": "Periodic scanning at given interval and enabled watching for changes",
+    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:",
     "Please consult the release notes before performing a major upgrade.": "메이저 업데이트를 하기 전에 먼저 릴리즈 노트를 살펴보세요.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "설정에서 GUI 인증용 User와 암호를 입력해주세요.",
     "Please wait": "기다려 주십시오",
@@ -192,26 +201,28 @@
     "Quick guide to supported patterns": "지원하는 패턴에 대한 빠른 도움말",
     "RAM Utilization": "RAM 사용량",
     "Random": "무작위",
-    "Recent Changes": "Recent Changes",
+    "Recent Changes": "최근 변경",
     "Reduced by ignore patterns": "무시 패턴으로 축소",
     "Release Notes": "릴리즈 노트",
     "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "출시 후보는 최신 기능과 버그 픽스를 포함 하고 있습니다. 이 버전은 예전 방식인 2주 주기 Syncthing 출시와 비슷합니다.",
     "Remote Devices": "원격 기기",
     "Remove": "삭제",
-    "Remove Device": "Remove Device",
-    "Remove Folder": "Remove Folder",
+    "Remove Device": "기기 제거",
+    "Remove Folder": "폴더 제거",
     "Required identifier for the folder. Must be the same on all cluster devices.": "폴더 식별자가 필요합니다. 모든 장치에서 동일해야 합니다.",
     "Rescan": "재탐색",
     "Rescan All": "전체 재탐색",
     "Rescan Interval": "재탐색 간격",
+    "Rescans": "Rescans",
     "Restart": "재시작",
     "Restart Needed": "재시작 필요함",
     "Restarting": "재시작 중",
-    "Restore": "Restore",
+    "Restore": "복구",
     "Restore Versions": "Restore Versions",
     "Resume": "재개",
     "Resume All": "모두 재개",
     "Reused": "재개",
+    "Running": "Running",
     "Save": "저장",
     "Scan Time Remaining": "탐색 남은 시간",
     "Scanning": "탐색중",
@@ -240,7 +251,7 @@
     "Shutdown Complete": "종료 완료",
     "Simple File Versioning": "간단한 파일 버전 관리",
     "Single level wildcard (matches within a directory only)": "단일 레벨 와일드카드 (하나의 디렉토리만 일치하는 경우)",
-    "Size": "Size",
+    "Size": "크기",
     "Smallest First": "작은 파일순",
     "Some items could not be restored:": "Some items could not be restored:",
     "Source Code": "소스 코드",
@@ -292,7 +303,7 @@
     "Time the item was last modified": "Time the item was last modified",
     "Trash Can File Versioning": "휴지통을 통한 파일 버전 관리",
     "Type": "종류",
-    "Unavailable": "Unavailable",
+    "Unavailable": "불가능",
     "Unavailable/Disabled by administrator or maintainer": "Unavailable/Disabled by administrator or maintainer",
     "Undecided (will prompt)": "Undecided (will prompt)",
     "Unknown": "알 수 없음",
@@ -308,7 +319,7 @@
     "Usage reporting is always enabled for candidate releases.": "출시 후보 버전에서는 사용 보고서가 항상 활성화 됩니다.",
     "Use HTTPS for GUI": "GUI에서 HTTPS 프로토콜 사용",
     "Version": "버전",
-    "Versions": "Versions",
+    "Versions": "버전",
     "Versions Path": "버전 저장 경로",
     "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "최대 보존 기간보다 오래되었거나 지정한 개수를 넘긴 버전은 자동으로 삭제됩니다.",
     "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "경고, 이 경로는 현재 존재하는 폴더 \"{{otherFolder}}\" 의 상위 폴더 입니다.",

gui/default/assets/lang/lang-lt.json

@@ -33,6 +33,7 @@
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "Automatiniai atnaujinimai dabar siūlo pasirinkimą tarp stabilių versijų ir kandidatinių versijų.",
     "Automatic upgrades": "Automatiniai atnaujinimai",
     "Automatically create or share folders that this device advertises at the default path.": "Automatiškai sukurti ar dalintis aplankais, kuriuos šis įrenginys skelbia numatytajame kelyje.",
+    "Available debug logging facilities:": "Prieinamos derinimo registravimo priemonės:",
     "Be careful!": "Būkite atsargūs!",
     "Bugs": "Klaidos",
     "CPU Utilization": "Procesoriaus panaudojimas",
@@ -64,6 +65,9 @@
     "Device that last modified the item": "Įrenginys, kuris paskutinis modifikavo elementą",
     "Devices": "Įrenginiai",
     "Disabled": "Išjungta",
+    "Disabled periodic scanning and disabled watching for changes": "Išjungtas periodinis nuskaitymas ir išjungtas pakeitimų stebėjimas",
+    "Disabled periodic scanning and enabled watching for changes": "Išjungtas periodinis nuskaitymas ir įjungtas pakeitimų stebėjimas",
+    "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Išjungtas periodinis nuskaitymas ir nepavykęs nustatyti pakeitimų stebėjimas, bandoma iš naujo kas 1 min.:",
     "Disconnected": "Atsijungęs",
     "Discovered": "Atrastas",
     "Discovery": "Lokacija",
@@ -81,6 +85,7 @@
     "Editing {%path%}.": "Redaguojama {{path}}.",
     "Enable NAT traversal": "Leisti kirsti NAT",
     "Enable Relaying": "Įjungti retransliavimą",
+    "Enabled": "Įjungta",
     "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Įveskite neneigiamąjį skaičių (pvz., \"2.35\") ir pasirinkite įtaisą. Procentai yra skaičiuojami kaip viso disko dydžio dalis.",
     "Enter a non-privileged port number (1024 - 65535).": "Įveskite neprivilegijuoto prievado numerį (1024 - 65535).",
     "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Įveskite kableliais atskirtus (\"tcp://ip:prievadas\", \"tcp://serveris:prievadas\") adresus arba \"dynamic\", kad atliktumėte automatinį adresų aptikimą.",
@@ -88,6 +93,7 @@
     "Error": "Klaida",
     "External File Versioning": "Išorinis versijų valdymas",
     "Failed Items": "Nepavykę siuntimai",
+    "Failed to setup, retrying": "Nepavyko nustatyti, bandoma iš naujo",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Nesėkmė prisijungti prie IPv6 serverių yra tikėtina, jei nėra IPv6 ryšio.",
     "File Pull Order": "Failų siuntimo tvarka",
     "File Versioning": "Versijų valdymas",
@@ -182,6 +188,9 @@
     "Pause": "Pristabdyti",
     "Pause All": "Pristabdyti visus",
     "Paused": "Pristabdyta",
+    "Periodic scanning at given interval and disabled watching for changes": "Periodinis nuskaitymas nurodytu intervalu ir išjungtas pakeitimų stebėjimas",
+    "Periodic scanning at given interval and enabled watching for changes": "Periodinis nuskaitymas nurodytu intervalu ir įjungtas pakeitimų stebėjimas",
+    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Periodinis nuskaitymas nurodytu intervalu ir nepavykęs nustatyti pakeitimų stebėjimas, bandoma iš naujo kas 1 min.:",
     "Please consult the release notes before performing a major upgrade.": "Peržvelkite laidos informaciją prieš atlikdami stambų atnaujinimą.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Prašome nustatymų dialoge nustatyti valdymo skydelio vartotojo vardą ir slaptažodį.",
     "Please wait": "Prašome palaukti",
@@ -204,6 +213,7 @@
     "Rescan": "Nuskaityti iš naujo",
     "Rescan All": "Nuskaityti visus aplankus",
     "Rescan Interval": "Pertrauka tarp nuskaitymų",
+    "Rescans": "Nuskaitymai",
     "Restart": "Perleisti",
     "Restart Needed": "Reikalingas perleidimas",
     "Restarting": "Persileidžia",
@@ -212,6 +222,7 @@
     "Resume": "Pratęsti",
     "Resume All": "Pratęsti visus",
     "Reused": "Pakartotinas",
+    "Running": "Vykdoma",
     "Save": "Išsaugoti",
     "Scan Time Remaining": "Likęs nuskaitymo laikas",
     "Scanning": "Skenuojama",

gui/default/assets/lang/lang-nb.json

@@ -33,6 +33,7 @@
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "Automatisk oppgradering lar deg nå få valget mellom ferdige utgaver og utgivelseskandidater.",
     "Automatic upgrades": "Automatiske oppdateringer",
     "Automatically create or share folders that this device advertises at the default path.": "Opprett eller del mapper automatisk i mapper som denne enheten melder som forvalgt mappe.",
+    "Available debug logging facilities:": "Tilgjengelige funksjoner for logging i feilrettingsøyemed:",
     "Be careful!": "Vær forsiktig!",
     "Bugs": "Programfeil",
     "CPU Utilization": "CPU-utnyttelse",
@@ -64,6 +65,9 @@
     "Device that last modified the item": "Enheten som sist endret elementet",
     "Devices": "Enheter",
     "Disabled": "Avskrudd",
+    "Disabled periodic scanning and disabled watching for changes": "Disabled periodic scanning and disabled watching for changes",
+    "Disabled periodic scanning and enabled watching for changes": "Disabled periodic scanning and enabled watching for changes",
+    "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:",
     "Disconnected": "Frakoblet",
     "Discovered": "Oppdaget",
     "Discovery": "Oppslag",
@@ -81,6 +85,7 @@
     "Editing {%path%}.": "Redigerer {{path}}.",
     "Enable NAT traversal": "Slå på NAT-traversering",
     "Enable Relaying": "Aktiver reléforsendelse",
+    "Enabled": "Enabled",
     "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Skriv inn et ikke-negativt nummer (f.eks. \"2.35\") og velg en enhet. Prosenter er deler av total diskstørrelse.",
     "Enter a non-privileged port number (1024 - 65535).": "Skriv inn et ikke-priviligert portnummer (1024-65535).",
     "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Skriv inn kommaseparerte (\"tcp://ip:port\", \"tcp://host:port\") adresser, eller ordet \"dynamic\" for å gjøre automatisk oppslag i adressen.",
@@ -88,6 +93,7 @@
     "Error": "Feilmelding",
     "External File Versioning": "Ekstern versjonskontroll",
     "Failed Items": "Elementsynkronisering som har mislyktes",
+    "Failed to setup, retrying": "Failed to setup, retrying",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Å ikke klare å koble til IPv6-tjenere er forventet hvis det ikke er noen IPv6-tilknytning.",
     "File Pull Order": "Filenes henterekkefølge",
     "File Versioning": "Versjonskontroll",
@@ -182,6 +188,9 @@
     "Pause": "Oppholde",
     "Pause All": "Sett alt på pause",
     "Paused": "Oppholdt",
+    "Periodic scanning at given interval and disabled watching for changes": "Periodic scanning at given interval and disabled watching for changes",
+    "Periodic scanning at given interval and enabled watching for changes": "Periodic scanning at given interval and enabled watching for changes",
+    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:",
     "Please consult the release notes before performing a major upgrade.": "Sjekk utgivelsesnotatene før en storoppgradering utføres.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Vennligst angi bruker og passord for GUI-autentisering i innstillingsvinduet.",
     "Please wait": "Vent",
@@ -204,6 +213,7 @@
     "Rescan": "Gjennomsøk på nytt",
     "Rescan All": "Gjennomsøk alt på nytt",
     "Rescan Interval": "Intervall for gjennomsøking",
+    "Rescans": "Rescans",
     "Restart": "Omstart",
     "Restart Needed": "Omstart kreves",
     "Restarting": "Starter på nytt",
@@ -212,6 +222,7 @@
     "Resume": "Gjenoppta",
     "Resume All": "Gjenoppta alt",
     "Reused": "Gjenbrukt",
+    "Running": "Running",
     "Save": "Lagre",
     "Scan Time Remaining": "Gjenstående tid for gjennomsøking",
     "Scanning": "Gjennomsøker",

gui/default/assets/lang/lang-nl.json

@@ -21,18 +21,19 @@
     "Allow Anonymous Usage Reporting?": "Versturen van anonieme gebruikersstatistieken toestaan?",
     "Allowed Networks": "Toegestane netwerken",
     "Alphabetic": "Alfabetisch",
-    "An external command handles the versioning. It has to remove the file from the shared folder.": "Een extern commando regelt het versiebeheer. Dit moet het bestand verwijderen van de gedeelde map.",
+    "An external command handles the versioning. It has to remove the file from the shared folder.": "Een externe opdracht regelt het versiebeheer. Dit moet het bestand verwijderen uit de gedeelde map.",
     "An external command handles the versioning. It has to remove the file from the synced folder.": "Een extern commando regelt het versiebeheer. Dit moet het bestand verwijderen van de gesynchroniseerde map.",
     "Anonymous Usage Reporting": "Anonieme gebruikersstatistieken",
-    "Anonymous usage report format has changed. Would you like to move to the new format?": "Het formaat voor anonieme gebruikersrapporten is gewijzigd. Wil je naar het nieuwe formaat overschakelen?",
+    "Anonymous usage report format has changed. Would you like to move to the new format?": "Het formaat voor anonieme gebruikersrapporten is gewijzigd. Wilt u naar het nieuwe formaat overschakelen?",
     "Any devices configured on an introducer device will be added to this device as well.": "Apparaten die geconfigureerd worden op een introductieapparaat zullen ook aan dit apparaat worden toegevoegd.",
-    "Are you sure you want to remove device {%name%}?": "Weet je zeker dat je apparaat {{name}} wil verwijderen?",
-    "Are you sure you want to remove folder {%label%}?": "Weet je zeker dat je map {{label}} wil verwijderen?",
-    "Are you sure you want to restore {%count%} files?": "Weet je zeker dat je {{count}} bestanden wil herstellen?",
+    "Are you sure you want to remove device {%name%}?": "Weet u zeker dat u apparaat {{name}} wilt verwijderen?",
+    "Are you sure you want to remove folder {%label%}?": "Weet u zeker dat u map {{label}} wilt verwijderen?",
+    "Are you sure you want to restore {%count%} files?": "Weet u zeker dat u {{count}} bestanden wilt herstellen?",
     "Auto Accept": "Automatisch aanvaarden",
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "Automatisch bijwerken biedt nu de keuze tussen stabiele uitgaven en uitgavekandidaten.",
     "Automatic upgrades": "Automatische upgrades",
     "Automatically create or share folders that this device advertises at the default path.": "Automatisch mappen die dit apparaat aankondigt aanmaken of delen in de standaardlocatie.",
+    "Available debug logging facilities:": "Beschikbare debuglogmogelijkheden:",
     "Be careful!": "Wees voorzichtig!",
     "Bugs": "Bugs",
     "CPU Utilization": "CPU-gebruik",
@@ -49,21 +50,24 @@
     "Connections": "Verbindingen",
     "Copied from elsewhere": "Gekopieerd vanaf elders",
     "Copied from original": "Gekopieerd van het origineel",
-    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 voor de volgende bijdragers:",
-    "Copyright © 2014-2017 the following Contributors:": "Copyright © 2014-2017 voor de volgende bijdragers:",
+    "Copyright © 2014-2016 the following Contributors:": "Auteursrecht © 2014-2016 voor de volgende bijdragers:",
+    "Copyright © 2014-2017 the following Contributors:": "Auteursrecht © 2014-2017 voor de volgende bijdragers:",
     "Creating ignore patterns, overwriting an existing file at {%path%}.": "Negeerpatronen worden aangemaakt, bestaand bestand wordt overschreven op {{path}}.",
     "Danger!": "Let op!",
     "Debugging Facilities": "Debugmogelijkheden",
     "Default Folder Path": "Standaardmaplocatie",
     "Deleted": "Verwijderd",
     "Device": "Apparaat",
-    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Apparaat \"{{name}}\" ({{device}} at {{address}}) wil verbinden. Wil je dit toestaan?",
+    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Apparaat \"{{name}}\" ({{device}} at {{address}}) wil verbinden. Wilt u dit toestaan?",
     "Device ID": "Apparaat-ID",
     "Device Identification": "Apparaat-identificatie",
     "Device Name": "Naam apparaat",
     "Device that last modified the item": "Apparaat dat het item laatst gewijzigd heeft",
     "Devices": "Apparaten",
     "Disabled": "Uitgeschakeld",
+    "Disabled periodic scanning and disabled watching for changes": "Disabled periodic scanning and disabled watching for changes",
+    "Disabled periodic scanning and enabled watching for changes": "Disabled periodic scanning and enabled watching for changes",
+    "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:",
     "Disconnected": "Niet verbonden",
     "Discovered": "Ontdekt",
     "Discovery": "Ontdekken",
@@ -75,12 +79,13 @@
     "Downloaded": "Gedownload",
     "Downloading": "Bezig met downloaden",
     "Edit": "Bewerk",
-    "Edit Device": "Bewerk apparaat",
+    "Edit Device": "Apparaat bewerken",
     "Edit Folder": "Map bewerken",
     "Editing": "Bezig met bewerken",
     "Editing {%path%}.": "Bezig met bewerken van {{path}}.",
     "Enable NAT traversal": "NAT traversal inschakelen",
     "Enable Relaying": "Doorsturen inschakelen",
+    "Enabled": "Ingeschakeld",
     "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Voer een positief nummer in (bijv. \"2.35\") en selecteer een eenheid. Percentages zijn een onderdeel van de totale schijfgrootte.",
     "Enter a non-privileged port number (1024 - 65535).": "Voer een niet-geprivilegieerd poortnummer in (1024 - 65535).",
     "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.",
@@ -88,6 +93,7 @@
     "Error": "Fout",
     "External File Versioning": "Extern versiebeheer voor bestanden",
     "Failed Items": "Mislukte items",
+    "Failed to setup, retrying": "Instellen mislukt, opnieuw proberen",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Als er geen IPv6-connectiviteit is worden problemen bij verbinden met IPv6-servers verwacht.",
     "File Pull Order": "Volgorde ontvangen bestanden",
     "File Versioning": "Versiebeheer",
@@ -97,12 +103,12 @@
     "Files are moved to date stamped versions in a .stversions directory when replaced or deleted by Syncthing.": "Bestanden worden niet door Syncthing vervangen of verwijderd, maar verplaatst naar de map .stversions.",
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Bestanden worden niet door Syncthing vervangen of verwijderd, maar verplaatst naar de map .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.": "Bestanden zijn beschermt tegen aanpassingen die gemaakt zijn door andere apparaten, maar aanpassingen op dit apparaat worden doorgestuurd naar de rest van het cluster.",
-    "Filesystem Notifications": "Bestandssysteemmeldingen",
+    "Filesystem Notifications": "Meldingen van bestandssysteem",
     "Filter by date": "Filteren op datum",
     "Filter by name": "Filteren op naam",
     "Folder": "Map",
     "Folder ID": "Map-ID",
-    "Folder Label": "Map label",
+    "Folder Label": "Maplabel",
     "Folder Path": "Maplocatie",
     "Folder Type": "Soort map",
     "Folders": "Mappen",
@@ -143,10 +149,10 @@
     "Local State": "Lokale status",
     "Local State (Total)": "Lokale status (totaal)",
     "Log": "Logboek",
-    "Log tailing paused. Click here to continue.": "Log tailing paused. Click here to continue.",
+    "Log tailing paused. Click here to continue.": "Loggen gepauzeerd. Klik hier om verder te gaan.",
     "Logs": "Logboeken",
     "Major Upgrade": "Grote update",
-    "Mass actions": "Mass actions",
+    "Mass actions": "Groepsacties",
     "Master": "Master",
     "Maximum Age": "Maximum leeftijd",
     "Metadata Only": "Alleen metadata",
@@ -182,6 +188,9 @@
     "Pause": "Pauze",
     "Pause All": "Alles pauzeren",
     "Paused": "Gepauseerd",
+    "Periodic scanning at given interval and disabled watching for changes": "Periodic scanning at given interval and disabled watching for changes",
+    "Periodic scanning at given interval and enabled watching for changes": "Periodic scanning at given interval and enabled watching for changes",
+    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:",
     "Please consult the release notes before performing a major upgrade.": "Lees eerst de release notes voordat u een grote update uitvoert.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Stel een gebruikersnaam en wachtwoord in bij 'Instellingen'.",
     "Please wait": "Even geduld",
@@ -204,6 +213,7 @@
     "Rescan": "Opnieuw scannen",
     "Rescan All": "Scan alles opnieuw",
     "Rescan Interval": "Scanfrequentie",
+    "Rescans": "Rescans",
     "Restart": "Herstart",
     "Restart Needed": "Herstart nodig",
     "Restarting": "Herstarten",
@@ -212,6 +222,7 @@
     "Resume": "Hervatten",
     "Resume All": "Alles hervatten",
     "Reused": "Hergebruikt",
+    "Running": "Draaiend",
     "Save": "Bewaar",
     "Scan Time Remaining": "Resterende scantijd",
     "Scanning": "Aan het zoeken",
@@ -222,7 +233,7 @@
     "Select oldest version": "Oudste versie selecteren",
     "Select the devices to share this folder with.": "Selecteer de apparaten om deze map mee te delen.",
     "Select the folders to share with this device.": "Selecteer de mappen om met dit apparaat te delen.",
-    "Send & Receive": "Verzenden & Ontvangen",
+    "Send & Receive": "Verzenden & ontvangen",
     "Send Only": "Alleen verzenden",
     "Settings": "Instellingen",
     "Share": "Delen",
@@ -264,7 +275,7 @@
     "The aggregated statistics are publicly available at the URL below.": "De geaggregeerde statistieken zijn publiek beschikbaar op de onderstaande URL.",
     "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "De configuratie is opslagen maar nog niet actief. Syncthing moet opnieuw opgestart worden om de nieuwe configuratie te activeren.",
     "The device ID cannot be blank.": "Het apparaat-ID mag niet leeg zijn.",
-    "The device ID to enter here can be found in the \"Actions > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "Het apparaat ID om hier in te vullen kan gevonden worden in het \"Actions > Show ID\" venster op de andere apparaten. Spaties en gedachtestreepjes zijn optioneel (en worden genegeerd). ",
+    "The device ID to enter here can be found in the \"Actions > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "De hier in te vullen apparaat-ID kan gevonden worden in het \"Acties > ID weergeven\"-venster op de andere apparaten. Spaties en gedachtestreepjes zijn optioneel (en worden genegeerd). ",
     "The encrypted usage report is sent daily. It is used to track common platforms, folder sizes and app versions. If the reported data set is changed you will be prompted with this dialog again.": "Het versleutelde gebruiksrapport wordt dagelijks gestuurd en wordt gebruikt om de verschillende platformen, mappengrootte en versies op te volgen. Als de reeks gegevens wijzigt zal dit scherm opnieuw worden getoond.",
     "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.": "Dit apparaat-ID lijkt ongeldig. Het apparaat-ID bestaat uit 52 of 56 letters en cijfers, spaties en streepjes zijn optioneel.",
     "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "De eerste parameter is het pad naar de map en de tweede parameter is het relatieve pad binnen die map.",
@@ -285,7 +296,7 @@
     "The rescan interval must be a non-negative number of seconds.": "De scanfrequentie moet een positief getal in seconden zijn.",
     "They are retried automatically and will be synced when the error is resolved.": "Het wordt automatisch opnieuw geprobeerd. Bestanden worden gesynchroniseerd als de fout is hersteld.",
     "This Device": "Dit apparaat",
-    "This can easily give hackers access to read and change any files on your computer.": "Dit kan kwaadwilligen eenvoudig toegang geven tot het lezen en wijzigen van bestanden op jouw computer.",
+    "This can easily give hackers access to read and change any files on your computer.": "Dit kan kwaadwilligen eenvoudig toegang geven tot het lezen en wijzigen van bestanden op uw computer.",
     "This is a major version upgrade.": "Dit is een grote update.",
     "This setting controls the free space required on the home (i.e., index database) disk.": "Deze instelling beheert de benodigde vrije ruimte op de home (index database) schijf.",
     "Time": "Tijd",
@@ -319,8 +330,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.": "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 can also select one of these nearby devices:": "U kunt ook een van de apparaten die dichtbij zijn selecteren:",
-    "You can change your choice at any time in the Settings dialog.": "Je kan je keuze op elk moment aanpassen in de Instellingen.",
-    "You can read more about the two release channels at the link below.": "Je kan meer te weten komen over de twee uitgavekanalen via de link hieronder.",
+    "You can change your choice at any time in the Settings dialog.": "U kunt uw keuze op elk moment aanpassen in de Instellingen.",
+    "You can read more about the two release channels at the link below.": "U kunt meer te weten komen over de twee uitgavekanalen via onderstaande link.",
     "You must keep at least one version.": "Minstens 1 versie moet bewaard blijven.",
     "days": "dagen",
     "directories": "Mappen",

gui/default/assets/lang/lang-pl.json

@@ -33,6 +33,7 @@
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "Automatyczne aktualizacje pozwalają teraz wybrać pomiędzy wydaniami stabilnymi a wersjami kandydującymi.",
     "Automatic upgrades": "Automatyczne aktualizacje",
     "Automatically create or share folders that this device advertises at the default path.": "Automatically create or share folders that this device advertises at the default path.",
+    "Available debug logging facilities:": "Available debug logging facilities:",
     "Be careful!": "Uważaj!",
     "Bugs": "Błędy",
     "CPU Utilization": "Użycie CPU",
@@ -64,6 +65,9 @@
     "Device that last modified the item": "Device that last modified the item",
     "Devices": "Urządzenia",
     "Disabled": "Wyłączone",
+    "Disabled periodic scanning and disabled watching for changes": "Disabled periodic scanning and disabled watching for changes",
+    "Disabled periodic scanning and enabled watching for changes": "Disabled periodic scanning and enabled watching for changes",
+    "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:",
     "Disconnected": "Rozłączony",
     "Discovered": "Odkryte",
     "Discovery": "Odnajdywanie",
@@ -81,6 +85,7 @@
     "Editing {%path%}.": "Edytowanie {{path}}.",
     "Enable NAT traversal": "Włącz trawersowanie NAT",
     "Enable Relaying": "Włącz przekazywanie",
+    "Enabled": "Enabled",
     "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Wpisz nieujemną liczbę (np. \"2.35\") oraz wybierz jednostkę. Wartość procentowa odnosi się do rozmiaru całego dysku.",
     "Enter a non-privileged port number (1024 - 65535).": "Wpisz nieuprzywilejowany numer portu (1024-65535).",
     "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Wpisz oddzielone przecinkiem adresy (\"tcp://ip:port\", \"tcp://host:port\") lub \"dynamic\" by przeprowadzić automatyczne odnalezienie adresu.",
@@ -88,6 +93,7 @@
     "Error": "Błąd",
     "External File Versioning": "Zewnętrzne wersjonowanie pliku",
     "Failed Items": "Niepowodzenia",
+    "Failed to setup, retrying": "Failed to setup, retrying",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Błąd połączenia do serwerów IPv6 może wystąpić, jeśli brakuje połączenia po IPv6 w ogóle.",
     "File Pull Order": "Kolejność pobierania plików",
     "File Versioning": "Kontrola wersji",
@@ -182,6 +188,9 @@
     "Pause": "Zatrzymaj",
     "Pause All": "Zatrzymaj wszystkie",
     "Paused": "Zatrzymany",
+    "Periodic scanning at given interval and disabled watching for changes": "Periodic scanning at given interval and disabled watching for changes",
+    "Periodic scanning at given interval and enabled watching for changes": "Periodic scanning at given interval and enabled watching for changes",
+    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:",
     "Please consult the release notes before performing a major upgrade.": "Zaleca się przeanalizowanie \"release notes\" przed przeprowadzeniem znaczącej aktualizacji.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Ustaw proszę użytkownika i hasło dostępowe do GUI w Ustawieniach",
     "Please wait": "Proszę czekać",
@@ -204,6 +213,7 @@
     "Rescan": "Skanuj ponownie",
     "Rescan All": "Skanuj wszystko ponownie",
     "Rescan Interval": "Interwał skanowania",
+    "Rescans": "Rescans",
     "Restart": "Uruchom ponownie",
     "Restart Needed": "Wymagane ponowne uruchomienie",
     "Restarting": "Uruchamianie ponowne",
@@ -212,6 +222,7 @@
     "Resume": "Wznów",
     "Resume All": "Wznów wszystkie",
     "Reused": "Ponownie użyte",
+    "Running": "Running",
     "Save": "Zapisz",
     "Scan Time Remaining": "Pozostały czas skanowania",
     "Scanning": "Skanowanie",

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

@@ -1,5 +1,5 @@
 {
-    "A device with that ID is already added.": "Um dispositivo com esta ID já foi adicionado.",
+    "A device with that ID is already added.": "Um dispositivo com este ID já foi adicionado.",
     "A negative number of days doesn't make sense.": "Um número negativo de dias não faz sentido.",
     "A new major version may not be compatible with previous versions.": "Uma nova versão principal pode não ser compatível com versões anteriores.",
     "API Key": "Chave da API",
@@ -26,13 +26,14 @@
     "Anonymous Usage Reporting": "Relatórios anônimos de uso",
     "Anonymous usage report format has changed. Would you like to move to the new format?": "O formato do relatório anônimo de uso mudou. Gostaria de usar o formato novo?",
     "Any devices configured on an introducer device will be added to this device as well.": "Quaisquer dispositivos configurados em um apresentador também serão adicionados a este dispositivo.",
-    "Are you sure you want to remove device {%name%}?": "Are you sure you want to remove device {{name}}?",
-    "Are you sure you want to remove folder {%label%}?": "Are you sure you want to remove folder {{label}}?",
-    "Are you sure you want to restore {%count%} files?": "Are you sure you want to restore {{count}} files?",
-    "Auto Accept": "Auto Accept",
+    "Are you sure you want to remove device {%name%}?": "Tem certeza de que deseja remover o dispositivo {{name}}?",
+    "Are you sure you want to remove folder {%label%}?": "Tem certeza de que deseja remover a pasta {{name}}?",
+    "Are you sure you want to restore {%count%} files?": "Tem certeza de que deseja restaurar {{count}} arquivo(s)?",
+    "Auto Accept": "Aceitar automaticamente",
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "A atualização automática agora oferece a escolha entre versões estáveis e candidatas ao lançamento.",
     "Automatic upgrades": "Atualizações automáticas",
-    "Automatically create or share folders that this device advertises at the default path.": "Automatically create or share folders that this device advertises at the default path.",
+    "Automatically create or share folders that this device advertises at the default path.": "Criar ou compartilhar automaticamente pastas que este dispositivo anuncia no caminho padrão.",
+    "Available debug logging facilities:": "Facilidades de depuração disponíveis:",
     "Be careful!": "Tenha cuidado!",
     "Bugs": "Erros",
     "CPU Utilization": "Uso de CPU",
@@ -46,30 +47,33 @@
     "Configured": "Configurado",
     "Connection Error": "Erro de conexão",
     "Connection Type": "Tipo da conexão",
-    "Connections": "Connections",
+    "Connections": "Conexões",
     "Copied from elsewhere": "Copiado de outro lugar",
     "Copied from original": "Copiado do original",
     "Copyright © 2014-2016 the following Contributors:": "Direitos reservados © 2014-2016 aos seguintes colaboradores:",
     "Copyright © 2014-2017 the following Contributors:": "Copyright © 2014-2017 dos seguintes Colaboradores:",
     "Creating ignore patterns, overwriting an existing file at {%path%}.": "Criando filtros, sobrescrevendo o arquivo {{path}}.",
     "Danger!": "Perigo!",
-    "Debugging Facilities": "Debugging Facilities",
-    "Default Folder Path": "Default Folder Path",
+    "Debugging Facilities": "Facilidades de depuração",
+    "Default Folder Path": "Caminho padrão da pasta",
     "Deleted": "Apagado",
     "Device": "Dispositivo",
     "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Dispositivo \"{{name}}\" ({{device}} em {{address}}) quer se conectar. Adicionar novo dispositivo?",
     "Device ID": "ID do dispositivo",
     "Device Identification": "Identificação do dispositivo",
     "Device Name": "Nome do dispositivo",
-    "Device that last modified the item": "Device that last modified the item",
+    "Device that last modified the item": "Dispositivo que modificou o item pela última vez",
     "Devices": "Dispositivos",
     "Disabled": "Desabilitado",
+    "Disabled periodic scanning and disabled watching for changes": "Verificação periódica e verificação automática de mudanças desabilitadas",
+    "Disabled periodic scanning and enabled watching for changes": "Verificação periódica desabilitada. Verificação automática de mudanças habilitada.",
+    "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Verificação periódica desabilitada. Não foi possível configurar a verificação automática de mudanças, tentando novamente a cada 1 minuto:",
     "Disconnected": "Desconectado",
     "Discovered": "Descoberto",
     "Discovery": "Descoberta",
     "Discovery Failures": "Falhas na descoberta",
-    "Do not restore": "Do not restore",
-    "Do not restore all": "Do not restore all",
+    "Do not restore": "Não restaurar",
+    "Do not restore all": "Não restaurar nenhum",
     "Documentation": "Documentação",
     "Download Rate": "Velocidade de recepção",
     "Downloaded": "Recebido",
@@ -81,6 +85,7 @@
     "Editing {%path%}.": "Editando {{path}}.",
     "Enable NAT traversal": "Habilitar NAT",
     "Enable Relaying": "Habilitar retransmissão",
+    "Enabled": "Habilitado",
     "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Insira um número não negativo (por exemplo, 2.35) e escolha uma unidade. Porcentagens são como parte do tamanho total do disco.",
     "Enter a non-privileged port number (1024 - 65535).": "Insira um número de porta não privilegiada (1024-65535).",
     "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.",
@@ -88,6 +93,7 @@
     "Error": "Erro",
     "External File Versioning": "Externo",
     "Failed Items": "Itens com falha",
+    "Failed to setup, retrying": "Não foi possível configurar, tentando novamente",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Falhas na conexão a servidores IPv6 são esperadas caso não haja conectividade IPv6.",
     "File Pull Order": "Ordem de retirada do arquivo",
     "File Versioning": "Versionamento de arquivos",
@@ -98,8 +104,8 @@
     "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 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.",
     "Filesystem Notifications": "Notificação do Sistema de Arquivos",
-    "Filter by date": "Filter by date",
-    "Filter by name": "Filter by name",
+    "Filter by date": "Filtrar por data",
+    "Filter by name": "Filtrar por nome",
     "Folder": "Pasta",
     "Folder ID": "ID da pasta",
     "Folder Label": "Rótulo da pasta",
@@ -112,7 +118,7 @@
     "GUI Listen Address": "Endereço de escuta da interface web",
     "GUI Listen Addresses": "Endereços de escuta da interface",
     "GUI Theme": "Tema da interface",
-    "General": "General",
+    "General": "Geral",
     "Generate": "Gerar",
     "Global Changes": "Alterações globais",
     "Global Discovery": "Descoberta global",
@@ -137,16 +143,16 @@
     "Latest Change": "Última mudança",
     "Learn more": "Saiba mais",
     "Listeners": "Escutadores",
-    "Loading data...": "Loading data...",
-    "Loading...": "Loading...",
+    "Loading data...": "Carregando dados...",
+    "Loading...": "Carregando",
     "Local Discovery": "Descoberta local",
     "Local State": "Estado local",
     "Local State (Total)": "Estado local (total)",
     "Log": "Log",
-    "Log tailing paused. Click here to continue.": "Log tailing paused. Click here to continue.",
+    "Log tailing paused. Click here to continue.": "Observação do log pausada. Clique aqui para continuar.",
     "Logs": "Logs",
     "Major Upgrade": "Atualização \"major\"",
-    "Mass actions": "Mass actions",
+    "Mass actions": "Ações em massa",
     "Master": "Mestre",
     "Maximum Age": "Idade máxima",
     "Metadata Only": "Somente metadados",
@@ -161,7 +167,7 @@
     "Newest First": "Mais novo primeiro",
     "No": "Não",
     "No File Versioning": "Desligado",
-    "No files will be deleted as a result of this operation.": "No files will be deleted as a result of this operation.",
+    "No files will be deleted as a result of this operation.": "Nenhum arquivo será apagado como resultado desta operação",
     "No upgrades": "Sem atualizações",
     "Normal": "Normal",
     "Notice": "Aviso",
@@ -176,12 +182,15 @@
     "Override Changes": "Sobrescrever alterações",
     "Path": "Caminho",
     "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 new auto accepted folders will be created, as well as the default suggested path when adding new folders via the UI. Tilde character (~) expands to {%tilde%}.": "Path where new auto accepted folders will be created, as well as the default suggested path when adding new folders via the UI. Tilde character (~) expands to {{tilde}}.",
+    "Path where new auto accepted folders will be created, as well as the default suggested path when adding new folders via the UI. Tilde character (~) expands to {%tilde%}.": "Caminho onde novas pastas aceitas automaticamente serão criadas, bem como o caminho padrão sugerido na adição de novas pastas pela interface. O caractere til (~) é substituído por {{tilde}}.",
     "Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).": "Caminho do diretório onde as versões são salvas (deixe em branco para que seja o diretório padrão .stversions dentro da pasta compartilhada). ",
     "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",
     "Pause All": "Pausar Todas",
     "Paused": "Em pausa",
+    "Periodic scanning at given interval and disabled watching for changes": "Verificação periódica habilitada no intervalo escolhido. Verificação automática de mudanças desabilitada",
+    "Periodic scanning at given interval and enabled watching for changes": "Verificação periódica habilitada no intervalo escolhido. Verificação automática de mudanças habilitada",
+    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Verificação periódica habilitada no intervalo escolhido. Não foi possível configurar a verificação automática de mudanças, tentando novamente a cada 1 minuto:",
     "Please consult the release notes before performing a major upgrade.": "Por favor, consulte as notas de lançamento antes de atualizar para uma versão \"major\".",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Por favor, defina um nome de usuário e senha para acesso à interface web, nas configurações.",
     "Please wait": "Aguarde",
@@ -192,34 +201,36 @@
     "Quick guide to supported patterns": "Guia rápido dos padrões suportados",
     "RAM Utilization": "Uso de RAM",
     "Random": "Aleatória",
-    "Recent Changes": "Mudanças Recentes",
+    "Recent Changes": "Mudanças recentes",
     "Reduced by ignore patterns": "Reduzido por filtros",
     "Release Notes": "Notas de lançamento",
     "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Versões candidatas ao lançamento possuem os recursos e correções mais recentes. Elas são similares às tradicionais versões quinzenais.",
     "Remote Devices": "Dispositivos remotos",
     "Remove": "Remover",
-    "Remove Device": "Remove Device",
+    "Remove Device": "Remover dispositivo",
     "Remove Folder": "Remover pasta",
     "Required identifier for the folder. Must be the same on all cluster devices.": "Identificador obrigatório da pasta. Deve ser igual em todos os dispositivos do grupo.",
     "Rescan": "Verificar agora",
     "Rescan All": "Verificar todas",
     "Rescan Interval": "Intervalo entre verificações",
+    "Rescans": "Verificações",
     "Restart": "Reiniciar",
     "Restart Needed": "É necessário reiniciar",
     "Restarting": "Reiniciando",
-    "Restore": "Restore",
-    "Restore Versions": "Restore Versions",
+    "Restore": "Restaurar",
+    "Restore Versions": "Restaurar versões",
     "Resume": "Resumir",
     "Resume All": "Resumir Todas",
     "Reused": "Reutilizado",
+    "Running": "Rodando",
     "Save": "Salvar",
     "Scan Time Remaining": "Tempo de verificação restante",
     "Scanning": "Verificando",
     "See external versioner help for supported templated command line parameters.": "Consulte a ajuda sobre versionamento externo para modelos de parâmetros de linha de comando aceitos.",
     "See external versioning help for supported templated command line parameters.": "Consulte a ajuda sobre versionamento externo para modelos de parâmetros de linha de comando aceitos.",
     "Select a version": "Selecione uma versão",
-    "Select latest version": "Select latest version",
-    "Select oldest version": "Select oldest version",
+    "Select latest version": "Escolher a última versão",
+    "Select oldest version": "Escolher a versão mais antiga",
     "Select the devices to share this folder with.": "Selecione os dispositivos com os quais esta pasta será compartilhada.",
     "Select the folders to share with this device.": "Selecione as pastas a serem compartilhadas com este dispositivo.",
     "Send & Receive": "Envia e recebe",
@@ -240,9 +251,9 @@
     "Shutdown Complete": "Desligamento completado",
     "Simple File Versioning": "Simples",
     "Single level wildcard (matches within a directory only)": "Coringa de único nível (faz corresponder apenas dentro de uma pasta)",
-    "Size": "Size",
+    "Size": "Tamanho",
     "Smallest First": "Menor primeiro",
-    "Some items could not be restored:": "Some items could not be restored:",
+    "Some items could not be restored:": "Alguns itens não puderam ser restaurados:",
     "Source Code": "Código-fonte",
     "Stable releases and release candidates": "Versões estáveis e candidatas ao lançamento",
     "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "Versões estáveis são lançadas aproximadamente a cada duas semanas. Durante esse tempo elas são testadas como candidatas.",
@@ -289,11 +300,11 @@
     "This is a major version upgrade.": "Esta é uma atualização para uma versão \"major\".",
     "This setting controls the free space required on the home (i.e., index database) disk.": "Este ajuste controla o espaço livre necessário no disco que contém o banco de dados do Syncthing.",
     "Time": "Hora",
-    "Time the item was last modified": "Time the item was last modified",
+    "Time the item was last modified": "Momento em que o item foi modificado pela última vez",
     "Trash Can File Versioning": "Lixeira",
     "Type": "Tipo",
-    "Unavailable": "Unavailable",
-    "Unavailable/Disabled by administrator or maintainer": "Unavailable/Disabled by administrator or maintainer",
+    "Unavailable": "Não disponível",
+    "Unavailable/Disabled by administrator or maintainer": "Não disponível ou desabilitado pelo administrador ou mantenedor",
     "Undecided (will prompt)": "Não tenho certeza (perguntar sempre)",
     "Unknown": "Desconhecida",
     "Unshared": "Não compartilhada",
@@ -308,7 +319,7 @@
     "Usage reporting is always enabled for candidate releases.": "O relatório de uso está sempre habilitado em versões candidatas ao lançamento",
     "Use HTTPS for GUI": "Usar HTTPS para a interface web",
     "Version": "Versão",
-    "Versions": "Versions",
+    "Versions": "Versões",
     "Versions Path": "Caminho do versionamento",
     "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "As versões são automaticamente apagadas se elas são mais antigas do que a idade máxima ou excederem o número de arquivos permitido em um intervalo.",
     "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "Aviso: este caminho é o diretório pai da pasta \"{{otherFolder}}\".",

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

@@ -33,6 +33,7 @@
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "A actualização automática agora oferece a escolha entre versões estáveis e candidatas a lançamento.",
     "Automatic upgrades": "Actualizações automáticas",
     "Automatically create or share folders that this device advertises at the default path.": "Criar ou partilhar, de forma automática e no caminho predefinido, pastas que este dispositivo publicita.",
+    "Available debug logging facilities:": "Recursos de registo de depuração disponíveis:",
     "Be careful!": "Tenha cuidado!",
     "Bugs": "Erros",
     "CPU Utilization": "Utilização da CPU",
@@ -64,6 +65,9 @@
     "Device that last modified the item": "Último dispositivo a modificar o item",
     "Devices": "Dispositivos",
     "Disabled": "Desactivado",
+    "Disabled periodic scanning and disabled watching for changes": "Verificação periódica desactivada e vigilância de alterações desactivada",
+    "Disabled periodic scanning and enabled watching for changes": "Verificação periódica desactivada e vigilância de alterações activada",
+    "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Verificação periódica desactivada e falha ao preparar a vigilância de alterações, tentando novamente a cada minuto:",
     "Disconnected": "Desconectado",
     "Discovered": "Descoberto",
     "Discovery": "Pesquisa",
@@ -81,6 +85,7 @@
     "Editing {%path%}.": "Editando {{path}}.",
     "Enable NAT traversal": "Activar travessia de NAT",
     "Enable Relaying": "Permitir retransmissão",
+    "Enabled": "Activada",
     "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Escreva um número positivo (ex.: \"2.35\") e seleccione uma unidade. Percentagens são relativas ao tamanho total do disco.",
     "Enter a non-privileged port number (1024 - 65535).": "Escreva um número de porto não-privilegiado (1024-65535).",
     "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Introduza endereços separados por vírgulas (\"tcp://ip:porto\", \"tcp://máquina:porto\") ou \"dynamic\" para detectar automaticamente os endereços.",
@@ -88,6 +93,7 @@
     "Error": "Erro",
     "External File Versioning": "Externa",
     "Failed Items": "Itens que falharam",
+    "Failed to setup, retrying": "A preparação falhou, tentando novamente",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "São esperadas falhas na ligação a servidores IPv6 se não existir conectividade IPv6.",
     "File Pull Order": "Ordem de obtenção de ficheiros",
     "File Versioning": "Gestão de versões de ficheiros",
@@ -182,6 +188,9 @@
     "Pause": "Pausar",
     "Pause All": "Pausar todas",
     "Paused": "Em pausa",
+    "Periodic scanning at given interval and disabled watching for changes": "Verificação periódica num dado intervalo e vigilância de alterações desactivada",
+    "Periodic scanning at given interval and enabled watching for changes": "Verificação periódica num dado intervalo e vigilância de alterações activada",
+    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Verificação periódica num dado intervalo e falha ao preparar a vigilância de alterações, tentando novamente a cada minuto:",
     "Please consult the release notes before performing a major upgrade.": "Consulte as notas de lançamento antes de fazer uma actualização importante.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Por favor, defina um utilizador e senha de autenticação para a interface gráfica, nas configurações.",
     "Please wait": "Aguarde",
@@ -204,6 +213,7 @@
     "Rescan": "Verificar agora",
     "Rescan All": "Verificar todas agora",
     "Rescan Interval": "Intervalo entre verificações",
+    "Rescans": "Novas verificações",
     "Restart": "Reiniciar",
     "Restart Needed": "É preciso reiniciar",
     "Restarting": "Reiniciando",
@@ -212,6 +222,7 @@
     "Resume": "Retomar",
     "Resume All": "Retomar todas",
     "Reused": "Reutilizado",
+    "Running": "Em execução",
     "Save": "Gravar",
     "Scan Time Remaining": "Tempo restante da verificação",
     "Scanning": "Verificando",

gui/default/assets/lang/lang-ru.json

@@ -26,13 +26,14 @@
     "Anonymous Usage Reporting": "Анонимный отчет об использовании",
     "Anonymous usage report format has changed. Would you like to move to the new format?": "Формат анонимных отчётов изменился. Вы хотите переключиться на новый формат?",
     "Any devices configured on an introducer device will be added to this device as well.": "Все устройства, подключённые к устройству-рекомендателю, будут добавлены к текущему устройству.",
-    "Are you sure you want to remove device {%name%}?": "Are you sure you want to remove device {{name}}?",
-    "Are you sure you want to remove folder {%label%}?": "Are you sure you want to remove folder {{label}}?",
-    "Are you sure you want to restore {%count%} files?": "Are you sure you want to restore {{count}} files?",
+    "Are you sure you want to remove device {%name%}?": "Вы уверены, что хотите удалить устройство {{name}}?",
+    "Are you sure you want to remove folder {%label%}?": "Вы уверены, что хотите удалить папку {{label}}?",
+    "Are you sure you want to restore {%count%} files?": "Вы уверены, что хотите восстановить {{count}} файлов?",
     "Auto Accept": "Auto Accept",
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "Автоматическое обновление теперь предлагает выбор между стабильными выпусками и кандидатами в релизы.",
     "Automatic upgrades": "Автообновление",
     "Automatically create or share folders that this device advertises at the default path.": "Automatically create or share folders that this device advertises at the default path.",
+    "Available debug logging facilities:": "Available debug logging facilities:",
     "Be careful!": "Будьте осторожны!",
     "Bugs": "Ошибки",
     "CPU Utilization": "Загрузка ЦП",
@@ -64,11 +65,14 @@
     "Device that last modified the item": "Устройство, последним изменившее объект",
     "Devices": "Устройства",
     "Disabled": "Отключено",
+    "Disabled periodic scanning and disabled watching for changes": "Disabled periodic scanning and disabled watching for changes",
+    "Disabled periodic scanning and enabled watching for changes": "Disabled periodic scanning and enabled watching for changes",
+    "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:",
     "Disconnected": "Нет соединения",
     "Discovered": "Обнаружено",
     "Discovery": "Обнаружение",
     "Discovery Failures": "Ошибки обнаружения",
-    "Do not restore": "Do not restore",
+    "Do not restore": "Не восстанавливать",
     "Do not restore all": "Do not restore all",
     "Documentation": "Документация",
     "Download Rate": "Скорость загрузки",
@@ -81,6 +85,7 @@
     "Editing {%path%}.": "Правка {{path}}.",
     "Enable NAT traversal": "Включить NAT traversal",
     "Enable Relaying": "Включить релеи",
+    "Enabled": "Enabled",
     "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.",
     "Enter a non-privileged port number (1024 - 65535).": "Введите непривилегированный порт (1024—65535).",
     "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Введите через запятую («tcp://ip:port», «tcp://host:port») адреса, либо «dynamic», чтобы выполнить автоматическое обнаружение адреса.",
@@ -88,6 +93,7 @@
     "Error": "Ошибка",
     "External File Versioning": "Внешний контроль версий файлов",
     "Failed Items": "Сбои",
+    "Failed to setup, retrying": "Failed to setup, retrying",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Если нет IPv6-соединений, при подключении к IPv6-серверам произойдёт ошибка.",
     "File Pull Order": "Порядок получения файлов",
     "File Versioning": "Управление версиями",
@@ -98,8 +104,8 @@
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Файлы с временнОй меткой версии помещаются в папку .stversions при их замене или удалении 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.": "Файлы защищены от изменений сделанных на других устройствах, но изменения сделанные на этом устройстве будут отправлены всему кластеру.",
     "Filesystem Notifications": "Уведомления файловой системы",
-    "Filter by date": "Filter by date",
-    "Filter by name": "Filter by name",
+    "Filter by date": "Отфильтровать по дате",
+    "Filter by name": "Отфильтровать по имени",
     "Folder": "Папка",
     "Folder ID": "ID папки",
     "Folder Label": "Ярлык папки",
@@ -161,7 +167,7 @@
     "Newest First": "Сначала новые",
     "No": "Нет",
     "No File Versioning": "Без управления версиями файлов",
-    "No files will be deleted as a result of this operation.": "No files will be deleted as a result of this operation.",
+    "No files will be deleted as a result of this operation.": "В результате этой операции никакие файлы не будут удалены",
     "No upgrades": "Нет обновлений",
     "Normal": "Нормально",
     "Notice": "Внимание",
@@ -182,6 +188,9 @@
     "Pause": "Пауза",
     "Pause All": "Приостановить все",
     "Paused": "Приостановлено",
+    "Periodic scanning at given interval and disabled watching for changes": "Periodic scanning at given interval and disabled watching for changes",
+    "Periodic scanning at given interval and enabled watching for changes": "Periodic scanning at given interval and enabled watching for changes",
+    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:",
     "Please consult the release notes before performing a major upgrade.": "Перед проведением обновления основной версии ознакомтесь, пожалуйста, с Замечаниями к версии",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Установите имя пользователя и пароль для интерфейса в настройках",
     "Please wait": "Пожалуйста, подождите",
@@ -204,22 +213,24 @@
     "Rescan": "Пересканировать",
     "Rescan All": "Пересканировать все",
     "Rescan Interval": "Интервал пересканирования",
+    "Rescans": "Rescans",
     "Restart": "Перезапустить",
     "Restart Needed": "Требуется перезапуск",
     "Restarting": "Перезапуск",
-    "Restore": "Restore",
+    "Restore": "Восстановить",
     "Restore Versions": "Restore Versions",
     "Resume": "Возобновить",
     "Resume All": "Возобновить все",
     "Reused": "Повторно использовано",
+    "Running": "Запущено",
     "Save": "Сохранить",
     "Scan Time Remaining": "Оставшееся время сканирования",
     "Scanning": "Сканирование",
     "See external versioner help for supported templated command line parameters.": "See external versioner help for supported templated command line parameters.",
     "See external versioning help for supported templated command line parameters.": "See external versioning help for supported templated command line parameters.",
     "Select a version": "Выберите версию",
-    "Select latest version": "Select latest version",
-    "Select oldest version": "Select oldest version",
+    "Select latest version": "Выбрать последнюю версию",
+    "Select oldest version": "Выбрать самую старую версию",
     "Select the devices to share this folder with.": "Выберите устройства, для которых будет доступна эта папка.",
     "Select the folders to share with this device.": "Выберите папки, которые будут доступны этому устройству.",
     "Send & Receive": "Отправить и получить",
@@ -308,7 +319,7 @@
     "Usage reporting is always enabled for candidate releases.": "Отправка отчётов об использовании всегда включена для кандидатов в релизы.",
     "Use HTTPS for GUI": "Использовать HTTPS для панели управления",
     "Version": "Версия",
-    "Versions": "Versions",
+    "Versions": "Версии",
     "Versions Path": "Путь к версиям",
     "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Версии удаляются автоматически, если они существуют дольше максимального срока или превышают разрешённое количество файлов за интервал.",
     "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "Внимание! Этот путь — родительская директория уже существующей папки «{{otherFolder}}».",

gui/default/assets/lang/lang-sk.json

@@ -33,6 +33,7 @@
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "Automatická aktualizácia teraz ponúka voľbu medzi stabilnými vydaniami a kandidátmi na vydanie.",
     "Automatic upgrades": "Automatické aktualizácie",
     "Automatically create or share folders that this device advertises at the default path.": "Automaticky vytvoriť alebo zdieľať adresáre, ktoré toto zariadenie ohlasuje, v predvolenom adresári.",
+    "Available debug logging facilities:": "Available debug logging facilities:",
     "Be careful!": "Buď opatrný!",
     "Bugs": "Chyby",
     "CPU Utilization": "Využitie CPU",
@@ -64,6 +65,9 @@
     "Device that last modified the item": "Zariadenie, ktoré naposledy pozmenilo položku",
     "Devices": "Zariadenia",
     "Disabled": "Odpojené",
+    "Disabled periodic scanning and disabled watching for changes": "Disabled periodic scanning and disabled watching for changes",
+    "Disabled periodic scanning and enabled watching for changes": "Disabled periodic scanning and enabled watching for changes",
+    "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:",
     "Disconnected": "Odpojené",
     "Discovered": "Zistené",
     "Discovery": "Zisťovanie",
@@ -81,6 +85,7 @@
     "Editing {%path%}.": "Úprava {{path}}.",
     "Enable NAT traversal": "Povoliť priechod NAT",
     "Enable Relaying": "Povoliť prenosové uzly",
+    "Enabled": "Povolené",
     "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Vložte kladné číslo (napr. \"2,35\") a zvoľte jednotku. Percentá sa zobrazujú ako časť celkovej veľkosti disku.",
     "Enter a non-privileged port number (1024 - 65535).": "Vložte číslo neprivilegovaného portu (1024-65535).",
     "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Zadaj čiarkou oddelené  (\"tcp://ip:port\", \"tcp://host:port\") adresy alebo \"dynamic\" na automatické zistenie adresy.",
@@ -88,6 +93,7 @@
     "Error": "Chyba",
     "External File Versioning": "Externé spracovanie verzií súborov",
     "Failed Items": "Zlyhané položky",
+    "Failed to setup, retrying": "Failed to setup, retrying",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Zlyhanie pripojenia k IPv6 serverom je očakávané ak neexistujú žiadne IPv6 pripojenia.",
     "File Pull Order": "Poradie sťahovania súborov",
     "File Versioning": "Verzie súborov",
@@ -182,6 +188,9 @@
     "Pause": "Pozastaviť",
     "Pause All": "Pozastaviť všetky",
     "Paused": "Pozastavené",
+    "Periodic scanning at given interval and disabled watching for changes": "Periodic scanning at given interval and disabled watching for changes",
+    "Periodic scanning at given interval and enabled watching for changes": "Periodic scanning at given interval and enabled watching for changes",
+    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:",
     "Please consult the release notes before performing a major upgrade.": "Pred spustením hlavnej aktualizácie si prosím prečítajte poznámky k vydaniu.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Zadajte prosím prihlasovanie meno a heslo v dialógovom okne nastavení.",
     "Please wait": "Prosím čakajte",
@@ -204,6 +213,7 @@
     "Rescan": "Opakovať skenovanie",
     "Rescan All": "Opakovať skenovanie všetkých",
     "Rescan Interval": "Interval opakovania skenovania",
+    "Rescans": "Rescans",
     "Restart": "Reštart",
     "Restart Needed": "Potrebný reštart",
     "Restarting": "Reštartovanie",
@@ -212,6 +222,7 @@
     "Resume": "Pokračovať",
     "Resume All": "Pokračuj so všetkými",
     "Reused": "Opakovane použité",
+    "Running": "Running",
     "Save": "Uložiť",
     "Scan Time Remaining": "Zostávajúci čas skenovania",
     "Scanning": "Skenovanie",

gui/default/assets/lang/lang-sv.json

@@ -29,10 +29,11 @@
     "Are you sure you want to remove device {%name%}?": "Är du säker på att du vill ta bort enheten {{name}}?",
     "Are you sure you want to remove folder {%label%}?": "Är du säker på att du vill ta bort mappen {{label}}?",
     "Are you sure you want to restore {%count%} files?": "Är du säker på att du vill återställa {{count}} filer?",
-    "Auto Accept": "Auto acceptera",
+    "Auto Accept": "Acceptera automatiskt",
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "Automatisk uppgradering erbjuder nu valet mellan stabila utgåvor och utgåvskandidater.",
     "Automatic upgrades": "Automatiska uppgraderingar",
     "Automatically create or share folders that this device advertises at the default path.": "Skapa eller dela automatiskt mappar som den här enheten annonserar på standardsökvägen.",
+    "Available debug logging facilities:": "Tillgängliga felsökningsfunktioner:",
     "Be careful!": "Var aktsam!",
     "Bugs": "Buggar",
     "CPU Utilization": "CPU användning",
@@ -58,12 +59,15 @@
     "Deleted": "Tog bort",
     "Device": "Enhet",
     "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Enhet \"{{name}}\" ({{device}} på {{address}}) vill ansluta. Lägg till ny enhet?",
-    "Device ID": "Enhet-ID",
-    "Device Identification": "Enhetsidentifikation",
+    "Device ID": "Enhetens ID",
+    "Device Identification": "Enhetens identifikation",
     "Device Name": "Enhetsnamn",
     "Device that last modified the item": "Enhet som senast ändrade objektet",
     "Devices": "Enheter",
     "Disabled": "Inaktiverad",
+    "Disabled periodic scanning and disabled watching for changes": "Disabled periodic scanning and disabled watching for changes",
+    "Disabled periodic scanning and enabled watching for changes": "Disabled periodic scanning and enabled watching for changes",
+    "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:",
     "Disconnected": "Frånkopplad",
     "Discovered": "Upptäckt",
     "Discovery": "Annonsering",
@@ -81,6 +85,7 @@
     "Editing {%path%}.": "Redigerar {{path}}.",
     "Enable NAT traversal": "Aktivera NAT traversering",
     "Enable Relaying": "Aktivera vidarebefordra",
+    "Enabled": "Enabled",
     "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Ange ett icke-negativt antal (t.ex., \"2.35\") och välj en enhet. Procenttalen är som en del av den totala diskstorleken.",
     "Enter a non-privileged port number (1024 - 65535).": "Ange ett icke-privilegierat portnummer (1024 - 65535).",
     "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Ange kommaseparerade (\"tcp://ip:port\", \"tcp://host:port\")-adresser eller ordet \"dynamic\" för att använda automatisk uppslagning.",
@@ -88,6 +93,7 @@
     "Error": "Fel",
     "External File Versioning": "Extern filversionshantering",
     "Failed Items": "Misslyckade objekt",
+    "Failed to setup, retrying": "Failed to setup, retrying",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Misslyckande med att ansluta till IPv6-servrar förväntas om ingen IPv6-anslutning finns.",
     "File Pull Order": "Filhämtningsprioritering",
     "File Versioning": "Filversionshantering",
@@ -101,17 +107,17 @@
     "Filter by date": "Filtrera efter datum",
     "Filter by name": "Filtrera efter namn",
     "Folder": "Mapp",
-    "Folder ID": "Mapp-ID",
+    "Folder ID": "Mappens ID",
     "Folder Label": "Mapp-etikett",
     "Folder Path": "Mappsökväg",
     "Folder Type": "Mapptyp",
     "Folders": "Mappar",
     "GUI": "Grafiskt gränssnitt",
-    "GUI Authentication Password": "GUI autentiseringslösenord",
-    "GUI Authentication User": "GUI autentiseringsanvändare",
-    "GUI Listen Address": "GUI lyssnaradress",
-    "GUI Listen Addresses": "GUI lyssnaradresser",
-    "GUI Theme": "GUI tema",
+    "GUI Authentication Password": "Gränssnittets autentiseringslösenord",
+    "GUI Authentication User": "Gränssnittets autentiseringsanvändare",
+    "GUI Listen Address": "Gränssnittets lyssnaradress",
+    "GUI Listen Addresses": "Gränssnittets lyssnaradresser",
+    "GUI Theme": "Gränssnittets tema",
     "General": "Allmänt",
     "Generate": "Generera",
     "Global Changes": "Globala ändringar",
@@ -119,7 +125,7 @@
     "Global Discovery Servers": "Globala annonseringsservrar",
     "Global State": "Globalt tillstånd",
     "Help": "Hjälp",
-    "Home page": "Hemsida",
+    "Home page": "Webbplats",
     "Ignore": "Ignorera",
     "Ignore Patterns": "Ignorera mönster",
     "Ignore Permissions": "Ignorera rättigheter",
@@ -146,7 +152,7 @@
     "Log tailing paused. Click here to continue.": "Log tailing paused. Click here to continue.",
     "Logs": "Loggar",
     "Major Upgrade": "Större uppgradering",
-    "Mass actions": "Mass actions",
+    "Mass actions": "Massåtgärder",
     "Master": "Huvud",
     "Maximum Age": "Maximum ålder",
     "Metadata Only": "Endast metadata",
@@ -182,6 +188,9 @@
     "Pause": "Paus",
     "Pause All": "Pausa alla",
     "Paused": "Pausad",
+    "Periodic scanning at given interval and disabled watching for changes": "Periodic scanning at given interval and disabled watching for changes",
+    "Periodic scanning at given interval and enabled watching for changes": "Periodic scanning at given interval and enabled watching for changes",
+    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:",
     "Please consult the release notes before performing a major upgrade.": "Läs igenom versionsnyheterna innan den stora uppgraderingen.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Ställ in ett grafiska gränssnittets användarautentisering och lösenord i inställningsdialogrutan.",
     "Please wait": "Var god vänta",
@@ -204,14 +213,16 @@
     "Rescan": "Skanna om",
     "Rescan All": "Skanna om alla",
     "Rescan Interval": "Återskanningsintervall",
+    "Rescans": "Rescans",
     "Restart": "Starta om",
     "Restart Needed": "Omstart behövs",
     "Restarting": "Startar om",
     "Restore": "Återställ",
-    "Restore Versions": "Restore Versions",
+    "Restore Versions": "Återställ versioner",
     "Resume": "Återuppta",
     "Resume All": "Återuppta alla",
     "Reused": "Återanvänds",
+    "Running": "Running",
     "Save": "Spara",
     "Scan Time Remaining": "Återstående skanningstid",
     "Scanning": "Skannar",
@@ -264,12 +275,12 @@
     "The aggregated statistics are publicly available at the URL below.": "Den aggregerade statistiken är offentligt tillgänglig på webbadressen nedan.",
     "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Konfigurationen har sparats men inte aktiverats. Syncthing måste startas om för att aktivera den nya konfigurationen.",
     "The device ID cannot be blank.": "Enhetens ID kan inte vara tomt.",
-    "The device ID to enter here can be found in the \"Actions > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "Enhet-ID som behövs här kan du hitta i \"Åtgärder > Visa ID\"-dialogrutan på den andra enheten. Mellanrum och bindestreck är valfria (ignoreras).",
+    "The device ID to enter here can be found in the \"Actions > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "Enhetens ID som behövs här kan du hitta i \"Åtgärder > Visa ID\"-dialogrutan på den andra enheten. Mellanrum och bindestreck är valfria (ignoreras).",
     "The encrypted usage report is sent daily. It is used to track common platforms, folder sizes and app versions. If the reported data set is changed you will be prompted with this dialog again.": "Den krypterade användarstatistiken skickas dagligen. Den används för att spåra vanliga plattformar, mappstorlekar och versioner. Om datat som rapporteras ändras så kommer du att bli tillfrågad igen.",
-    "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.": "Det inmatade enhet-ID verkar inte vara korrekt. Det ska vara en 52 eller 56 teckensträng bestående av siffror och bokstäver, eventuellt med mellanrum och bindestreck.",
+    "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.": "Det inmatade enhetens ID verkar inte vara korrekt. Det ska vara en 52 eller 56 teckensträng bestående av siffror och bokstäver, eventuellt med mellanrum och bindestreck.",
     "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "Den första kommandoparametern är sökvägen till mappen och den andra parametern är den relativa sökvägen i katalogen.",
-    "The folder ID cannot be blank.": "Mapp-ID:t får inte vara tomt.",
-    "The folder ID must be unique.": "Mapp-ID:t måste vara unikt.",
+    "The folder ID cannot be blank.": "Mappens ID får inte vara tomt.",
+    "The folder ID must be unique.": "Mappens ID måste vara unik.",
     "The folder path cannot be blank.": "Mapp-sökvägen kan inte vara tom.",
     "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "De följande intervallen används: varje 30 sekunder under den första timmen; varje timme under den första dagen; varje dag för de första 30 dagarna; varje vecka tills den maximala åldersgränsen uppnås.",
     "The following items could not be synchronized.": "Följande objekt kunde inte synkroniseras.",
@@ -306,7 +317,7 @@
     "Upload Rate": "Uppladdningshastighet",
     "Uptime": "Drifttid",
     "Usage reporting is always enabled for candidate releases.": "Användningsrapportering är alltid aktiverad för kandidatutgåvor.",
-    "Use HTTPS for GUI": "Använd HTTPS för GUI",
+    "Use HTTPS for GUI": "Använd HTTPS för gränssnittet",
     "Version": "Version",
     "Versions": "Versioner",
     "Versions Path": "Sökväg för versioner",
@@ -316,7 +327,7 @@
     "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Varning, denna sökväg är en underkatalog till en befintlig mapp \"{{otherFolder}}\".",
     "Warning, this path is a subdirectory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Varning, denna sökväg är en undermapp av en befintlig mapp \"{{otherFolderLabel}}\" ({{otherFolder}}).",
     "When adding a new device, keep in mind that this device must be added on the other side too.": "När du lägger till en ny enhet, kom ihåg att den här enheten måste läggas till på den andra enheten också.",
-    "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "När du lägger till ny mapp, tänk på att mapp-ID knyter ihop mappar mellan olika enheter. De skiftlägeskänsliga och måste matcha precis mellan alla enheter.",
+    "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 mapp, tänk på att mappens ID knyter ihop mappar mellan olika enheter. De skiftlägeskänsliga och måste matcha precis mellan alla enheter.",
     "Yes": "Ja",
     "You can also select one of these nearby devices:": "Du kan också välja en av dessa närliggande enheter:",
     "You can change your choice at any time in the Settings dialog.": "Du kan ändra ditt val när som helst i inställningsdialogrutan.",

gui/default/assets/lang/lang-tr.json

@@ -33,6 +33,7 @@
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "Kendiliğinden yükseltme artık kararlı dağıtımlar ve sürüm adayları arasında seçim yapmayı sağlıyor.",
     "Automatic upgrades": "Kendiliğinden yükseltmeler",
     "Automatically create or share folders that this device advertises at the default path.": "Automatically create or share folders that this device advertises at the default path.",
+    "Available debug logging facilities:": "Available debug logging facilities:",
     "Be careful!": "Dikkatli ol!",
     "Bugs": "Yazılım Hataları",
     "CPU Utilization": "İşlemci Kullanımı",
@@ -64,6 +65,9 @@
     "Device that last modified the item": "Device that last modified the item",
     "Devices": "Aygıtlar",
     "Disabled": "Disabled",
+    "Disabled periodic scanning and disabled watching for changes": "Disabled periodic scanning and disabled watching for changes",
+    "Disabled periodic scanning and enabled watching for changes": "Disabled periodic scanning and enabled watching for changes",
+    "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:",
     "Disconnected": "Bağlantı Kesik",
     "Discovered": "Keşfedildi",
     "Discovery": "Keşif",
@@ -81,6 +85,7 @@
     "Editing {%path%}.": "Editing {{path}}.",
     "Enable NAT traversal": "NAT çaprazlamasına izin ver",
     "Enable Relaying": "Enable Relaying",
+    "Enabled": "Enabled",
     "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.",
     "Enter a non-privileged port number (1024 - 65535).": "Enter a non-privileged port number (1024 - 65535).",
     "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Adreslerin kendiliğinden keşfedilebilmesi için ya adresleri virgülle ayırarak  (\"tcp://ip:port\", \"tcp://host:port\") girin, ya da \"dynamic\" sözcüğünü girin.",
@@ -88,6 +93,7 @@
     "Error": "Hata",
     "External File Versioning": "Harici Dosya Sürümleme İşlemi",
     "Failed Items": "Başarısız Olunan Ögeler",
+    "Failed to setup, retrying": "Failed to setup, retrying",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.",
     "File Pull Order": "Dosya Çekme Sırası",
     "File Versioning": "Dosya Sürümleme İşlemi",
@@ -182,6 +188,9 @@
     "Pause": "Duraklat",
     "Pause All": "Tümünü Duraklat",
     "Paused": "Duraklatıldı",
+    "Periodic scanning at given interval and disabled watching for changes": "Periodic scanning at given interval and disabled watching for changes",
+    "Periodic scanning at given interval and enabled watching for changes": "Periodic scanning at given interval and enabled watching for changes",
+    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:",
     "Please consult the release notes before performing a major upgrade.": "Birincil bir yükseltme gerçekleştirmeden önce lütfen sürüm notlarını tetkik edin.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "GUI üzerinden Kimlik Doğrulaması yapmak için Ayarlar penceresinde Kullanıcı ve Parola tanımlayın lütfen.",
     "Please wait": "Lütfen Bekleyin",
@@ -204,6 +213,7 @@
     "Rescan": "Tekrar Tara",
     "Rescan All": "Tümünü Tekrar Tara",
     "Rescan Interval": "Tarama Aralığı",
+    "Rescans": "Rescans",
     "Restart": "Yeniden Başlat",
     "Restart Needed": "Yeniden başlatma gereklidir",
     "Restarting": "Yeniden başlatılıyor",
@@ -212,6 +222,7 @@
     "Resume": "Devam Et/Sürdür",
     "Resume All": "Tümünü Devam Ettir",
     "Reused": "Yeniden Kullanılan",
+    "Running": "Running",
     "Save": "Kaydet",
     "Scan Time Remaining": "Kalan Tarama Zamanı",
     "Scanning": "Taranıyor",

gui/default/assets/lang/lang-uk.json

@@ -26,13 +26,14 @@
     "Anonymous Usage Reporting": "Анонімна статистика використання",
     "Anonymous usage report format has changed. Would you like to move to the new format?": "Змінився формат анонімного звіту про користування. Бажаєте перейти на новий формат?",
     "Any devices configured on an introducer device will be added to this device as well.": "Усі пристрої, налаштовані на пристрої-рекомендувачі, будуть додані до поточного пристрою.",
-    "Are you sure you want to remove device {%name%}?": "Are you sure you want to remove device {{name}}?",
-    "Are you sure you want to remove folder {%label%}?": "Are you sure you want to remove folder {{label}}?",
-    "Are you sure you want to restore {%count%} files?": "Are you sure you want to restore {{count}} files?",
-    "Auto Accept": "Auto Accept",
+    "Are you sure you want to remove device {%name%}?": "Чи ви впевнені в необхідності видалити пристрій {{name}}?",
+    "Are you sure you want to remove folder {%label%}?": "Чи ви впевнені в необхідності видалити директорію {{label}}?",
+    "Are you sure you want to restore {%count%} files?": "Чи ви впевнені в необхідності відновити наступну к-сть файлів: {{count}} ?",
+    "Auto Accept": "Затверджувати автоматично пропоновані віддаленим пристроєм каталоги",
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "Автоматиче оновлення зараз дозволяє обирати між стабільними випусками та реліз-кандидатами.",
     "Automatic upgrades": "Автоматичні оновлення",
-    "Automatically create or share folders that this device advertises at the default path.": "Automatically create or share folders that this device advertises at the default path.",
+    "Automatically create or share folders that this device advertises at the default path.": "Автоматично створювати або поширювати каталоги, які цей пристрій декларує як створені по замовчанню.",
+    "Available debug logging facilities:": "Доступні засоби журналу для відладки:",
     "Be careful!": "Будьте обережні!",
     "Bugs": "Помилки",
     "CPU Utilization": "Навантаження CPU",
@@ -46,30 +47,33 @@
     "Configured": "Налаштовано",
     "Connection Error": "Помилка з’єднання",
     "Connection Type": "Тип з*єднання",
-    "Connections": "Connections",
+    "Connections": "З'єднання",
     "Copied from elsewhere": "Скопійовано з іншого місця",
     "Copied from original": "Скопійовано з оригіналу",
     "Copyright © 2014-2016 the following Contributors:": "© 2014-2016 Всі права застережено, вклад внесли:",
     "Copyright © 2014-2017 the following Contributors:": "© 2014-2017 Всі права застережено, вклад внесли:",
     "Creating ignore patterns, overwriting an existing file at {%path%}.": "Створення шаблонів винятків з перезаписом існуючого файлу {{path}}.",
     "Danger!": "Небезпечно!",
-    "Debugging Facilities": "Debugging Facilities",
-    "Default Folder Path": "Default Folder Path",
+    "Debugging Facilities": "Засоби відладки",
+    "Default Folder Path": "Шлях до директорії по замовчанню",
     "Deleted": "Видалене",
     "Device": "Пристрій",
     "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Пристрій \"{{name}}\" ({{device}} за адресою {{address}}) намагається під’єднатися. Додати новий пристрій?",
     "Device ID": "ID пристрою",
     "Device Identification": "Ідентифікатор пристрою",
     "Device Name": "Назва пристрою",
-    "Device that last modified the item": "Device that last modified the item",
+    "Device that last modified the item": "Пристрій, що останнім змінив елемент",
     "Devices": "Пристрої",
     "Disabled": "Вимкнено",
+    "Disabled periodic scanning and disabled watching for changes": "Disabled periodic scanning and disabled watching for changes",
+    "Disabled periodic scanning and enabled watching for changes": "Disabled periodic scanning and enabled watching for changes",
+    "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:",
     "Disconnected": "З’єднання відсутнє",
     "Discovered": "Виявлено",
     "Discovery": "Сервери координації NAT",
     "Discovery Failures": "Помилки виявлення",
-    "Do not restore": "Do not restore",
-    "Do not restore all": "Do not restore all",
+    "Do not restore": "Не відновлювати",
+    "Do not restore all": "Не відновлювати все",
     "Documentation": "Документація",
     "Download Rate": "Швидкість завантаження",
     "Downloaded": "Завантажено",
@@ -81,6 +85,7 @@
     "Editing {%path%}.": "Редагування {{path}}.",
     "Enable NAT traversal": "Увімкнути NAT traversal",
     "Enable Relaying": "Увімкнути ретрансляцію (relaying)",
+    "Enabled": "Enabled",
     "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Введіть невід'ємне число (напр. \"2.35\") та виберіть пристрій. Проценти від загального дискового простору.",
     "Enter a non-privileged port number (1024 - 65535).": "Введіть номер непривілейованого порту (1024 - 65535).",
     "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Введіть розділені комою (\"tcp://ip:port\", \"tcp://host:port\") адреси або \"dynamic\" для автоматичного визначення адреси.",
@@ -88,6 +93,7 @@
     "Error": "Помилка",
     "External File Versioning": "Зовнішне керування версіями",
     "Failed Items": "Невдалі",
+    "Failed to setup, retrying": "Failed to setup, retrying",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "За відсутності IPv6-з'єднання очікується неможливість підключення до IPv6-серверів.",
     "File Pull Order": "Порядок витягнення файлів",
     "File Versioning": "Керування версіями",
@@ -98,8 +104,8 @@
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Файли будуть поміщатися у директорію .stversions із відповідною позначкою часу, коли вони будуть замінятися або видалятися програмою.",
     "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Вміст папки захищено від змін, зроблених на інших пристроях, але зміни зроблені на цьому пристрої можна розіслати решті пристроїв кластеру.",
     "Filesystem Notifications": "Повідомлення файлової системи",
-    "Filter by date": "Filter by date",
-    "Filter by name": "Filter by name",
+    "Filter by date": "Фільтрувати по даті",
+    "Filter by name": "Фільтрувати по імені",
     "Folder": "Директорія",
     "Folder ID": "ID директорії",
     "Folder Label": "Мітка директорії",
@@ -112,7 +118,7 @@
     "GUI Listen Address": "Адреса прослуховування GUI",
     "GUI Listen Addresses": "Адреса доступу до панелі управління",
     "GUI Theme": "Тема інтерфейсу",
-    "General": "General",
+    "General": "Загальні",
     "Generate": "Згенерувати",
     "Global Changes": "Глобальні зміни",
     "Global Discovery": "Глобальне виявлення (internet)",
@@ -137,22 +143,22 @@
     "Latest Change": "Найостанніша зміна",
     "Learn more": "Дізнатися більше",
     "Listeners": "Приймачі (TCP & Relay)",
-    "Loading data...": "Loading data...",
-    "Loading...": "Loading...",
+    "Loading data...": "Дані завантажуються...",
+    "Loading...": "Завантаження...",
     "Local Discovery": "Локальне виявлення (LAN)",
     "Local State": "Локальний статус",
     "Local State (Total)": "Локальний статус (загалом)",
-    "Log": "Log",
-    "Log tailing paused. Click here to continue.": "Log tailing paused. Click here to continue.",
-    "Logs": "Logs",
+    "Log": "Журнал",
+    "Log tailing paused. Click here to continue.": "Перемотка журналу призупинена. Натиснути для продовження.",
+    "Logs": "Журнали",
     "Major Upgrade": "Мажорне оновлення",
-    "Mass actions": "Mass actions",
+    "Mass actions": "Масові операції",
     "Master": "Головний",
     "Maximum Age": "Максимальний вік",
     "Metadata Only": "Тільки метадані",
     "Minimum Free Disk Space": "Мінімальний вільний простір на диску",
-    "Mod. Device": "Mod. Device",
-    "Mod. Time": "Mod. Time",
+    "Mod. Device": "Модифікований пристрій:",
+    "Mod. Time": "Час модифікації:",
     "Move to top of queue": "Пересунути у початок черги",
     "Multi level wildcard (matches multiple directory levels)": "Багаторівнева маска (пошук збігів в усіх піддиректоріях) ",
     "Never": "Ніколи",
@@ -161,10 +167,10 @@
     "Newest First": "Спершу новіші",
     "No": "Ні",
     "No File Versioning": "Версіонування вимкнено",
-    "No files will be deleted as a result of this operation.": "No files will be deleted as a result of this operation.",
+    "No files will be deleted as a result of this operation.": "В результаті цієї операції не було видалено жодного файлу.",
     "No upgrades": "Немає оновлень",
     "Normal": "Нормальний",
-    "Notice": "Повідомлення",
+    "Notice": "Зауваження",
     "OK": "Гаразд",
     "Off": "Вимкнути",
     "Oldest First": "Спершу старіші",
@@ -176,12 +182,15 @@
     "Override Changes": "Розіслати мою версію",
     "Path": "Шлях",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Шлях до директорії на локальному комп’ютері. Буде створений, якщо такий не існує. Символ тильди (~) може бути використаний як ярлик для",
-    "Path where new auto accepted folders will be created, as well as the default suggested path when adding new folders via the UI. Tilde character (~) expands to {%tilde%}.": "Path where new auto accepted folders will be created, as well as the default suggested path when adding new folders via the UI. Tilde character (~) expands to {{tilde}}.",
+    "Path where new auto accepted folders will be created, as well as the default suggested path when adding new folders via the UI. Tilde character (~) expands to {%tilde%}.": "Шлях, за яким будуть розташовані запропоновані віддаленим пристроєм директорії, які були автоматично затверджені. Звідси ж буде починатися вибір розташування каталогів обміну, які добавлені вручну через інтерфейс.\nЗнак тильди (~) розгортається як  {{tilde}}.",
     "Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).": "Шлях, де повинні зберігатися версії (залиште порожнім для зберігання в .stversions в середині директорії)",
     "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Шлях, де повинні зберігатися версії (залиште порожнім для зберігання в .stversions в середині директорії)",
     "Pause": "Пауза",
     "Pause All": "Призупинити все",
     "Paused": "Призупинено",
+    "Periodic scanning at given interval and disabled watching for changes": "Periodic scanning at given interval and disabled watching for changes",
+    "Periodic scanning at given interval and enabled watching for changes": "Periodic scanning at given interval and enabled watching for changes",
+    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:",
     "Please consult the release notes before performing a major upgrade.": "Будь ласка перегляньте примітки до випуску перед мажорним оновленням. ",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Будь ласка, встановіть у налаштуваннях ім'я користувача та пароль до графічного інтерфейсу.",
     "Please wait": "Будь ласка, зачекайте",
@@ -198,28 +207,30 @@
     "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Реліз-кандидати містять найостанніші функції та виправлення. Вони схожі на традиційні щодвотижневі випуски Syncthing.",
     "Remote Devices": "Віддалені пристрої",
     "Remove": "Видалити",
-    "Remove Device": "Remove Device",
-    "Remove Folder": "Remove Folder",
+    "Remove Device": "Видалити пристрій",
+    "Remove Folder": "Видалити директорію",
     "Required identifier for the folder. Must be the same on all cluster devices.": "Обов'язковий унікальний ідентифікатор директорії. Має бути однаковим на усіх пристроях кластеру.",
     "Rescan": "Пересканувати",
     "Rescan All": "Пересканувати усе",
     "Rescan Interval": "Інтервал для повторного сканування",
+    "Rescans": "Rescans",
     "Restart": "Перезапуск",
     "Restart Needed": "Необхідний перезапуск",
     "Restarting": "Відбувається перезапуск",
-    "Restore": "Restore",
-    "Restore Versions": "Restore Versions",
+    "Restore": "Відновити",
+    "Restore Versions": "Відновлення за версією",
     "Resume": "Продовжити",
     "Resume All": "Продовжити всі",
     "Reused": "Використано вдруге",
+    "Running": "Running",
     "Save": "Зберегти",
     "Scan Time Remaining": "Час до кінця сканування",
     "Scanning": "Сканування",
     "See external versioner help for supported templated command line parameters.": "Переглянути допомогу по зовнішньому версіонуванню для підтримуваних шаблонних параметрів командного рядка.",
     "See external versioning help for supported templated command line parameters.": "Переглянути допомогу по зовнішньому версіонуванню для підтримуваних шаблонних параметрів командного рядка.",
     "Select a version": "Обрати версію",
-    "Select latest version": "Select latest version",
-    "Select oldest version": "Select oldest version",
+    "Select latest version": "Обрати найновішу версію",
+    "Select oldest version": "Обрати найстарішу версію",
     "Select the devices to share this folder with.": "Оберіть пристрої, які матимуть доступ до цієї директорії.",
     "Select the folders to share with this device.": "Оберіть директорії до яких матиме доступ цей пристрій.",
     "Send & Receive": "Відправити та отримати",
@@ -240,9 +251,9 @@
     "Shutdown Complete": "Вимикання завершене",
     "Simple File Versioning": "Просте версіонування",
     "Single level wildcard (matches within a directory only)": "Однорівнева маска (пошук збігів лише в середині директорії) ",
-    "Size": "Size",
+    "Size": "Розмір",
     "Smallest First": "Спершу найменші",
-    "Some items could not be restored:": "Some items could not be restored:",
+    "Some items could not be restored:": "Деякі елементи не можуть бути відновлені: ",
     "Source Code": "Сирцевий код",
     "Stable releases and release candidates": "Стабільні випуски та реліз-кандидати",
     "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "Стабільні випуски затримуються на два тижні. У цей час вони тестуються як реліз-кандидати.",
@@ -289,11 +300,11 @@
     "This is a major version upgrade.": "Це оновлення мажорної версії",
     "This setting controls the free space required on the home (i.e., index database) disk.": "Це налаштування визначає необхідний вільний простір на домашньому (тобто той, що містить базу даних) диску.",
     "Time": "Час",
-    "Time the item was last modified": "Time the item was last modified",
+    "Time the item was last modified": "Час останньої зміни елемента:",
     "Trash Can File Versioning": "Версіонування файлів у кошику ",
     "Type": "Тип",
-    "Unavailable": "Unavailable",
-    "Unavailable/Disabled by administrator or maintainer": "Unavailable/Disabled by administrator or maintainer",
+    "Unavailable": "Недоступно",
+    "Unavailable/Disabled by administrator or maintainer": "Недоступно/заборонено адміністратором або куратором",
     "Undecided (will prompt)": "Невизначено (буде запитано)",
     "Unknown": "Невідомо",
     "Unshared": "Не розповсюджується",
@@ -308,7 +319,7 @@
     "Usage reporting is always enabled for candidate releases.": "Звіти про користування завжди увімкнені для реліз-кандидатів.",
     "Use HTTPS for GUI": "Використовувати HTTPS для доступу до панелі управління",
     "Version": "Версія",
-    "Versions": "Versions",
+    "Versions": "Версії",
     "Versions Path": "Шлях до версій",
     "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Версії автоматично видаляються, якщо вони старше, ніж максимальний вік, або перевищують допустиму кількість файлів за інтервал.",
     "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "Увага, цей шлях є батьківським каталогом директорії \"{{otherFolder}}\", що й так синхронізується .",
@@ -319,7 +330,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 can also select one of these nearby devices:": "Ви також можете обрати один із сусідніх пристроїв:",
-    "You can change your choice at any time in the Settings dialog.": "Ви завжди можете змінити свій вибір у Налаштуваннях.",
+    "You can change your choice at any time in the Settings dialog.": "Ви завжди можете змінити свій вибір у вікні Налаштувань.",
     "You can read more about the two release channels at the link below.": "Ви можете прочитати більше про два канали випусків за посиланням нижче.",
     "You must keep at least one version.": "Ви повинні зберігати щонайменше одну версію.",
     "days": "днів",

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

@@ -33,6 +33,7 @@
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "自动升级现在提供了稳定版本和发布候选版之间的选择。",
     "Automatic upgrades": "自动升级",
     "Automatically create or share folders that this device advertises at the default path.": "自动地创建或共享这个设备在默认路径通告的文件夹。",
+    "Available debug logging facilities:": "可用的调试日志功能：",
     "Be careful!": "小心！",
     "Bugs": "问题回报",
     "CPU Utilization": "CPU使用率",
@@ -64,6 +65,9 @@
     "Device that last modified the item": "最近修改该项的设备",
     "Devices": "设备",
     "Disabled": "已禁用",
+    "Disabled periodic scanning and disabled watching for changes": "已禁用定期扫描和更改监视",
+    "Disabled periodic scanning and enabled watching for changes": "已禁用定期扫描并启用更改监视",
+    "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "已禁用定期扫描但设置更改监视失败，正在以每 1m 一次重试：",
     "Disconnected": "连接已断开",
     "Discovered": "已发现",
     "Discovery": "设备发现",
@@ -81,6 +85,7 @@
     "Editing {%path%}.": "正在编辑 {{path}}。",
     "Enable NAT traversal": "启用 NAT 遍历",
     "Enable Relaying": "开启中继",
+    "Enabled": "已启用",
     "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "输入一个非负数（例如“2.35”）并选择单位。%表示占磁盘总容量的百分比。",
     "Enter a non-privileged port number (1024 - 65535).": "输入一个非特权的端口号 (1024 - 65535)。",
     "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "输入以半角逗号分隔的 (\"tcp://ip:port\", \"tcp://host:port\") 设备地址列表，或者输入 \"dynamic\" 以自动发现设备地址。",
@@ -88,6 +93,7 @@
     "Error": "错误",
     "External File Versioning": "外部版本控制",
     "Failed Items": "失败的项目",
+    "Failed to setup, retrying": "设置失败，正在重试。",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "如果本机没有配置IPv6，则无法连接IPv6服务器是正常的。",
     "File Pull Order": "文件拉取顺序",
     "File Versioning": "版本控制",
@@ -182,6 +188,9 @@
     "Pause": "暂停",
     "Pause All": "全部暂停",
     "Paused": "已暂停",
+    "Periodic scanning at given interval and disabled watching for changes": "正以给定的间隔定期扫描并已禁用更改监视",
+    "Periodic scanning at given interval and enabled watching for changes": "正以给定的间隔定期扫描并已启用更改监视",
+    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "正以给定的间隔定期扫描但设置更改监视失败，正在以每 1m 一次重试：",
     "Please consult the release notes before performing a major upgrade.": "请在进行重大更新前查看发布说明。",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "请在设置对话框中设置 GUI 验证用户及其密码。",
     "Please wait": "请稍候",
@@ -204,6 +213,7 @@
     "Rescan": "重新扫描",
     "Rescan All": "全部重新扫描",
     "Rescan Interval": "扫描间隔",
+    "Rescans": "Rescans",
     "Restart": "重启 Syncthing",
     "Restart Needed": "需要重启 Syncthing",
     "Restarting": "重启中",
@@ -212,6 +222,7 @@
     "Resume": "恢复",
     "Resume All": "全部恢复",
     "Reused": "复用",
+    "Running": "运行中",
     "Save": "保存",
     "Scan Time Remaining": "扫描剩余时间",
     "Scanning": "扫描中",

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

@@ -28,11 +28,12 @@
     "Any devices configured on an introducer device will be added to this device as well.": "任何在引入者裝置所設置的裝置將會一併新增至此裝置",
     "Are you sure you want to remove device {%name%}?": "確定要移除 {{name}} 裝置？",
     "Are you sure you want to remove folder {%label%}?": "確定要移除 {{label}} 資料夾？",
-    "Are you sure you want to restore {%count%} files?": "Are you sure you want to restore {{count}} files?",
+    "Are you sure you want to restore {%count%} files?": "確定想要還原 {{count}} 個檔案？",
     "Auto Accept": "自動接受",
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "自動更新目前有穩定發行版及發行候選版可供選擇。",
     "Automatic upgrades": "自動升級",
     "Automatically create or share folders that this device advertises at the default path.": "自動在預設資料夾路徑建立或分享該裝置推薦的資料夾。",
+    "Available debug logging facilities:": "可用的除錯日誌工具：",
     "Be careful!": "請小心！",
     "Bugs": "程式錯誤",
     "CPU Utilization": "CPU 使用",
@@ -53,7 +54,7 @@
     "Copyright © 2014-2017 the following Contributors:": "Copyright © 2014-2017 下列貢獻者：",
     "Creating ignore patterns, overwriting an existing file at {%path%}.": "建立忽略樣式，覆蓋已存在的 {{path}}。",
     "Danger!": "危險!",
-    "Debugging Facilities": "Debugging Facilities",
+    "Debugging Facilities": "除錯工具",
     "Default Folder Path": "預設資料夾路徑",
     "Deleted": "已刪除",
     "Device": "裝置",
@@ -64,12 +65,15 @@
     "Device that last modified the item": "前次修改裝置",
     "Devices": "裝置",
     "Disabled": "關閉",
+    "Disabled periodic scanning and disabled watching for changes": "已關閉定期掃描及觀察變動",
+    "Disabled periodic scanning and enabled watching for changes": "已關閉定期掃描及啟用觀察變動",
+    "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "已關閉定期掃描，無法設定觀察變動，每 1 分鐘重試：",
     "Disconnected": "斷線",
     "Discovered": "已發現",
     "Discovery": "探索",
     "Discovery Failures": "探索失敗",
-    "Do not restore": "Do not restore",
-    "Do not restore all": "Do not restore all",
+    "Do not restore": "不要還原",
+    "Do not restore all": "不要還原全部",
     "Documentation": "說明文件",
     "Download Rate": "下載速率",
     "Downloaded": "已下載",
@@ -81,6 +85,7 @@
     "Editing {%path%}.": "正在編輯 {{path}} 。",
     "Enable NAT traversal": "啟用 NAT 穿透",
     "Enable Relaying": "啟用中繼",
+    "Enabled": "啟用",
     "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "請輸入一非負數（如：\"2.35\"）並選擇一個單位。百分比表示佔用磁碟容量的大小。",
     "Enter a non-privileged port number (1024 - 65535).": "輸入一個非特權通訊埠號 (1024 - 65535)。",
     "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "輸入以半形逗號區隔的位址 (\"tcp://ip:port\", \"tcp://host:port\")，或輸入 \"dynamic\" 以進行位址的自動探索",
@@ -88,6 +93,7 @@
     "Error": "錯誤",
     "External File Versioning": "外部檔案版本控制",
     "Failed Items": "失敗的項目",
+    "Failed to setup, retrying": "無法設定，正在重試",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "若未配置 IPv6，則無法連接 IPv6 伺服器係屬正常。",
     "File Pull Order": "提取檔案的順序",
     "File Versioning": "檔案版本控制",
@@ -98,8 +104,8 @@
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "當檔案被 Syncthing 取代或刪除時，它們將被移至 .stversions 資料夾並添加日期戳記。",
     "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "其他裝置做的改變不會影響到此裝置的檔案，但在此裝置上的變化將被發送到叢集中的其他部分。",
     "Filesystem Notifications": "檔案系統通知",
-    "Filter by date": "Filter by date",
-    "Filter by name": "Filter by name",
+    "Filter by date": "以日期篩選",
+    "Filter by name": "以名稱篩選",
     "Folder": "資料夾",
     "Folder ID": "資料夾識別碼",
     "Folder Label": "資料夾標籤",
@@ -137,16 +143,16 @@
     "Latest Change": "最近變動",
     "Learn more": "瞭解更多",
     "Listeners": "監聽者",
-    "Loading data...": "Loading data...",
-    "Loading...": "Loading...",
+    "Loading data...": "正在載入資料...",
+    "Loading...": "正在載入...",
     "Local Discovery": "本機探索",
     "Local State": "本機狀態",
     "Local State (Total)": "本機狀態 (總結)",
-    "Log": "Log",
-    "Log tailing paused. Click here to continue.": "Log tailing paused. Click here to continue.",
-    "Logs": "Logs",
+    "Log": "日誌",
+    "Log tailing paused. Click here to continue.": "跟隨日誌暫停。點選這裡以繼續。",
+    "Logs": "日誌",
     "Major Upgrade": "重大更新",
-    "Mass actions": "Mass actions",
+    "Mass actions": "大量操作",
     "Master": "主要的",
     "Maximum Age": "最長保留時間",
     "Metadata Only": "僅中繼資料",
@@ -182,6 +188,9 @@
     "Pause": "暫停",
     "Pause All": "全部暫停",
     "Paused": "暫停",
+    "Periodic scanning at given interval and disabled watching for changes": "在一定的時間間隔，定期掃描及關閉觀察變動",
+    "Periodic scanning at given interval and enabled watching for changes": "在一定的時間間隔，定期掃描及啟用觀察變動",
+    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "在一定的時間間隔，定期掃描，無法設定觀察變動，每 1 分鐘重試：",
     "Please consult the release notes before performing a major upgrade.": "執行重大升級前請先參閱版本資訊。",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "請在設定對話方塊內設置 GUI 使用者認證名稱及密碼。",
     "Please wait": "請稍後",
@@ -204,22 +213,24 @@
     "Rescan": "重新掃描",
     "Rescan All": "全部重新掃描",
     "Rescan Interval": "重新掃描間隔",
+    "Rescans": "重新掃描",
     "Restart": "重新啟動",
     "Restart Needed": "需要重新啟動",
     "Restarting": "正在重新啟動",
-    "Restore": "Restore",
-    "Restore Versions": "Restore Versions",
+    "Restore": "還原",
+    "Restore Versions": "還原版本",
     "Resume": "繼續",
     "Resume All": "全部繼續",
     "Reused": "重用",
+    "Running": "正在執行",
     "Save": "儲存",
     "Scan Time Remaining": "剩餘掃描時間",
     "Scanning": "正在掃描",
     "See external versioner help for supported templated command line parameters.": "關於命令列模板參數請參閱外部版本管理說明。",
     "See external versioning help for supported templated command line parameters.": "查看關於命令列模板參數請參閱外部版本管理說明。",
     "Select a version": "選擇一個版本",
-    "Select latest version": "Select latest version",
-    "Select oldest version": "Select oldest version",
+    "Select latest version": "選擇最新的版本",
+    "Select oldest version": "選擇最舊的版本",
     "Select the devices to share this folder with.": "選擇要共享這個資料夾的裝置。",
     "Select the folders to share with this device.": "選擇要共享這個資料夾的裝置。",
     "Send & Receive": "傳送及接收",
@@ -240,9 +251,9 @@
     "Shutdown Complete": "關閉完成",
     "Simple File Versioning": "簡單檔案版本控制",
     "Single level wildcard (matches within a directory only)": "單階層萬用字元 (只在單個資料夾階層內比對)",
-    "Size": "Size",
+    "Size": "大小",
     "Smallest First": "最小的優先",
-    "Some items could not be restored:": "Some items could not be restored:",
+    "Some items could not be restored:": "有些項目無法被還原：",
     "Source Code": "原始碼",
     "Stable releases and release candidates": "穩定發行版及發行候選版",
     "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "穩定發行版大約延遲兩週發佈。這段期間將作為發行候選版來測試。",
@@ -308,7 +319,7 @@
     "Usage reporting is always enabled for candidate releases.": "發行候選版永遠回報使用數據",
     "Use HTTPS for GUI": "為 GUI 使用 HTTPS",
     "Version": "版本",
-    "Versions": "Versions",
+    "Versions": "版本",
     "Versions Path": "歷史版本路徑",
     "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "當檔案歷史版本的存留時間大於設定的最大值，或是其數量在一段時間內超出允許值時，則會被刪除。",
     "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "警告，此路徑是現存資料夾 \"{{otherFolder}}\" 的上級目錄。",

gui/default/assets/lang/prettyprint.js

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

gui/default/assets/lang/valid-langs.js

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

gui/default/index.html

@@ -371,16 +371,39 @@
                         <span translate>Yes</span>
                       </td>
                     </tr>
-                    <tr ng-if="folder.fsNotifications">
-                      <th><span class="fa fa-fw fa-bolt"></span>&nbsp;<span translate>Filesystem Notifications</span></th>
+                    <tr>
+                      <th><span class="fa fa-fw fa-refresh"></span>&nbsp;<span translate>Rescans</span></th>
                       <td class="text-right">
-                        <span translate>Yes</span>
+                        <div ng-if="folder.rescanIntervalS > 0">
+                          <span ng-if="!folder.fsWatcherEnabled" tooltip data-original-title="{{'Periodic scanning at given interval and disabled watching for changes' | translate}}">
+                            <span class="fa fa-clock-o"></span>&nbsp;{{folder.rescanIntervalS | duration}}&ensp;
+                            <span class="fa fa-eye-slash"></span>&nbsp;<span translate>Disabled</span>
+                          </span>
+                          <span ng-if="folder.fsWatcherEnabled && (!model[folder.id].watchError || folder.paused)" tooltip data-original-title="{{'Periodic scanning at given interval and enabled watching for changes' | translate}}">
+                            <span class="fa fa-clock-o"></span>&nbsp;{{folder.rescanIntervalS | duration}}&ensp;
+                            <span class="fa fa-eye"></span>&nbsp;<span translate>Enabled</span>
+                          </span>
+                          <span ng-if="folder.fsWatcherEnabled && !folder.paused && model[folder.id].watchError" tooltip data-original-title="{{'Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:' | translate}}<br/>{{model[folder.id].watchError}}">
+                            <span class="fa fa-clock-o"></span>&nbsp;{{folder.rescanIntervalS | duration}}&ensp;
+                            <span class="fa fa-eye-slash"></span>&nbsp;<span translate>Failed to setup, retrying</span>
+                          </span>
+                        </div>
+                        <div ng-if="folder.rescanIntervalS <= 0">
+                          <span ng-if="!folder.fsWatcherEnabled" tooltip data-original-title="{{'Disabled periodic scanning and disabled watching for changes' | translate}}">
+                            <span class="fa fa-clock-o"></span>&nbsp;<span translate>Disabled</span>&ensp;
+                            <span class="fa fa-eye-slash"></span>&nbsp;<span translate>Disabled</span>
+                          </span>
+                          <span ng-if="folder.fsWatcherEnabled && (!model[folder.id].watchError || folder.paused)" tooltip data-original-title="{{'Disabled periodic scanning and enabled watching for changes' | translate}}">
+                            <span class="fa fa-clock-o"></span>&nbsp;<span translate>Disabled</span>&ensp;
+                            <span class="fa fa-eye"></span>&nbsp;<span translate>Enabled</span>
+                          </span>
+                          <span ng-if="folder.fsWatcherEnabled && !folder.paused && model[folder.id].watchError" tooltip data-original-title="{{'Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:' | translate}}<br/>{{model[folder.id].watchError}}">
+                            <span class="fa fa-clock-o"></span>&nbsp;<span translate>Disabled</span>&ensp;
+                            <span class="fa fa-eye-slash"></span>&nbsp;<span translate>Failed to setup, retrying</span>
+                          </span>
+                        </div>
                       </td>
                     </tr>
-                    <tr ng-if="(folder.rescanIntervalS != 60 && !folder.fsNotifications) || (folder.rescanIntervalS != 3600 && folder.fsNotifications)">
-                      <th><span class="fa fa-fw fa-refresh"></span>&nbsp;<span translate>Rescan Interval</span></th>
-                      <td class="text-right">{{folder.rescanIntervalS}} s</td>
-                    </tr>
                     <tr ng-if="folder.order != 'random'">
                       <th><span class="fa fa-fw fa-sort"></span>&nbsp;<span translate>File Pull Order</span></th>
                       <td class="text-right" ng-switch="folder.order">
@@ -439,7 +462,7 @@
                   <button type="button" class="btn btn-default btn-sm" ng-click="restoreVersions.show(folder.id)" ng-if="folder.versioning.type">
                     <span class="fa fa-undo"></span>&nbsp;<span translate>Versions</span>
                   </button>
-                  <button type="button" class="btn btn-sm btn-default" ng-click="rescanFolder(folder.id)" ng-show="['idle', 'stopped', 'unshared'].indexOf(folderStatus(folder)) > -1">
+                  <button type="button" class="btn btn-sm btn-default" ng-click="rescanFolder(folder.id)" ng-show="['idle', 'stopped', 'unshared', 'outofsync'].indexOf(folderStatus(folder)) > -1">
                     <span class="fa fa-refresh"></span>&nbsp;<span translate>Rescan</span>
                   </button>
                   <button type="button" class="btn btn-sm btn-default" ng-click="editFolder(folder)">

gui/default/syncthing/core/aboutModalView.html

@@ -12,7 +12,7 @@
     <p translate>Copyright &copy; 2014-2017 the following Contributors:</p>
     <div class="row">
       <div class="col-md-12" id="contributor-list">
-Jakob Borg, Audrius Butkevicius, Alexander Graf, Anderson Mesquita, Antony Male, Ben Schulz, Caleb Callaway, Daniel Harte, Lars K.W. Gohlke, Lode Hoste, Michael Ploujnikov, Nate Morrison, Philippe Schommers, Ryan Sullivan, Sergey Mishin, Simon Frei, Stefan Tatschner, Aaron Bieber, Adam Piggott, Adel Qalieh, Alessandro G., Alexandre Viau, Andrew Dunham, Andrey D, Antoine Lamielle, Arthur Axel fREW Schmidt, Bart De Vries, Ben Curthoys, Ben Shepherd, Ben Sidhom, Benny Ng, Brandon Philips, Brendan Long, Brian R. Becker, Carsten Hagemann, Cathryne Linenweaver, Cedric Staniewski, Chris Howie, Chris Joel, Colin Kennedy, Daniel Bergmann, Daniel Martí, Darshil Chanpura, David Rimmer, Denis A., Dennis Wilson, Dmitry Saveliev, Dominik Heidler, Elias Jarlebring, Emil Hessman, Erik Meitner, Federico Castagnini, Felix Ableitner, Felix Unterpaintner, Francois-Xavier Gsell, Frank Isemann, Gilli Sigurdsson, Heiko Zuerker, Jaakko Hannikainen, Jacek Szafarkiewicz, Jake Peterson, James Patterson, Jaroslav Malec, Jaya Chithra, Jens Diemer, Jochen Voss, Johan Vromans, Jose Manuel Delicado, Karol Różycki, Kelong Cong, Ken'ichi Kamada, Kevin Allen, Kevin White, Jr., Kurt Fitzner, Laurent Etiemble, Leo Arias, Liu Siyuan, Lord Landon Agahnim, Majed Abdulaziz, Marc Laporte, Marc Pujol, Marcin Dziadus, Mark Pulford, Mateusz Naściszewski, Matt Burke, Max Schulze, Michael Jephcote, Michael Tilli, Niels Peter Roest, Pascal Jungblut, Pawel Palenica, Peter Hoeg, Phill Luby, Piotr Bejda, Robert Carosi, Roman Zaynetdinov, Ross Smith II, Sacheendra Talluri, Scott Klupfel, Stefan Kuntz, Suhas Gundimeda, Taylor Khan, Tim Abell, Tim Howes, Tobias Nygren, Tobias Tom, Tomas Cerveny, Tully Robinson, Tyler Brazier, Unrud, Veeti Paananen, Victor Buinsky, Vil Brekin, William A. Kennington III, Wulf Weich, Xavier O., Yannic A.
+Jakob Borg, Audrius Butkevicius, Alexander Graf, Anderson Mesquita, Antony Male, Ben Schulz, Caleb Callaway, Daniel Harte, Lars K.W. Gohlke, Lode Hoste, Michael Ploujnikov, Nate Morrison, Philippe Schommers, Ryan Sullivan, Sergey Mishin, Simon Frei, Stefan Tatschner, Aaron Bieber, Adam Piggott, Adel Qalieh, Alessandro G., Alexandre Viau, Andrew Dunham, Andrey D, Antoine Lamielle, Arthur Axel fREW Schmidt, Bart De Vries, Ben Curthoys, Ben Shepherd, Ben Sidhom, Benny Ng, Brandon Philips, Brendan Long, Brian R. Becker, Carsten Hagemann, Cathryne Linenweaver, Cedric Staniewski, Chris Howie, Chris Joel, Colin Kennedy, Daniel Bergmann, Daniel Martí, Darshil Chanpura, David Rimmer, Denis A., Dennis Wilson, Dmitry Saveliev, Dominik Heidler, Elias Jarlebring, Emil Hessman, Erik Meitner, Federico Castagnini, Felix Ableitner, Felix Unterpaintner, Francois-Xavier Gsell, Frank Isemann, Gilli Sigurdsson, Heiko Zuerker, Jaakko Hannikainen, Jacek Szafarkiewicz, Jake Peterson, James Patterson, Jaroslav Malec, Jaya Chithra, Jens Diemer, Jochen Voss, Johan Vromans, Jose Manuel Delicado, Karol Różycki, Kelong Cong, Ken'ichi Kamada, Kevin Allen, Kevin White, Jr., Kurt Fitzner, Laurent Etiemble, Leo Arias, Liu Siyuan, Lord Landon Agahnim, Majed Abdulaziz, Marc Laporte, Marc Pujol, Marcin Dziadus, Mark Pulford, Mateusz Naściszewski, Matt Burke, Max Schulze, Michael Jephcote, Michael Tilli, Nicholas Rishel, Niels Peter Roest, Pascal Jungblut, Pawel Palenica, Peter Hoeg, Phill Luby, Piotr Bejda, Robert Carosi, Roman Zaynetdinov, Ross Smith II, Sacheendra Talluri, Scott Klupfel, Stefan Kuntz, Suhas Gundimeda, Taylor Khan, Tim Abell, Tim Howes, Tobias Nygren, Tobias Tom, Tomas Cerveny, Tully Robinson, Tyler Brazier, Unrud, Veeti Paananen, Victor Buinsky, Vil Brekin, William A. Kennington III, Wulf Weich, Xavier O., Yannic A.
     </div>
     </div>
     <hr/>

gui/default/syncthing/core/logViewerModalView.html

@@ -13,7 +13,7 @@
       </div>
 
       <div id="log-viewer-facilities" class="tab-pane">
-        <label>Available debug logging facilities:</label>
+        <label translate>Available debug logging facilities:</label>
         <table class="table table-condensed table-striped">
           <tbody>
             <tr ng-repeat="(name, data) in logging.facilities">

gui/default/syncthing/core/syncthingController.js

@@ -731,10 +731,6 @@ angular.module('syncthing.core')
                 return 'unknown';
             }
 
-            if ($scope.model[folderCfg.id].invalid) {
-                return 'stopped';
-            }
-
             var state = '' + $scope.model[folderCfg.id].state;
             if (state === 'error') {
                 return 'stopped'; // legacy, the state is called "stopped" in the GUI
@@ -2151,7 +2147,7 @@ angular.module('syncthing.core')
             }
 
             var os = {
-                'darwin': 'Mac OS X',
+                'darwin': 'macOS',
                 'dragonfly': 'DragonFly BSD',
                 'freebsd': 'FreeBSD',
                 'openbsd': 'OpenBSD',

gui/default/syncthing/folder/editFolderModalView.html

@@ -176,7 +176,7 @@
               <p translate class="help-block">Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).</p>
             </div>
             <div class="form-group" ng-if="currentFolder.fileVersioningSelector=='external'" ng-class="{'has-error': folderEditor.externalCommand.$invalid && folderEditor.externalCommand.$dirty}">
-              <p translate class="help-block">An external command handles the versioning. It has to remove the file from the shared folder.</p>
+              <p translate class="help-block">An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.</p>
               <label translate for="externalCommand">Command</label>
               <input name="externalCommand" id="externalCommand" class="form-control" type="text" ng-model="currentFolder.externalCommand" required="" aria-required="true" />
               <p class="help-block">

gui/default/vendor/fancytree/LICENSE

@@ -0,0 +1,21 @@
+Copyright 2008-2018 Martin Wendt,
+http://wwWendt.de/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

gui/default/vendor/moment/LICENSE

@@ -0,0 +1,22 @@
+Copyright (c) JS Foundation and other contributors
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.

lib/config/config.go

@@ -39,8 +39,6 @@ const (
 var (
 	// DefaultTCPPort defines default TCP port used if the URI does not specify one, for example tcp://0.0.0.0
 	DefaultTCPPort = 22000
-	// DefaultKCPPort defines default KCP (UDP) port used if the URI does not specify one, for example kcp://0.0.0.0
-	DefaultKCPPort = 22020
 	// DefaultListenAddresses should be substituted when the configuration
 	// contains <listenAddress>default</listenAddress>. This is done by the
 	// "consumer" of the configuration as we don't want these saved to the
@@ -48,7 +46,6 @@ var (
 	DefaultListenAddresses = []string{
 		util.Address("tcp", net.JoinHostPort("0.0.0.0", strconv.Itoa(DefaultTCPPort))),
 		"dynamic+https://relays.syncthing.net/endpoint",
-		util.Address("kcp", net.JoinHostPort("0.0.0.0", strconv.Itoa(DefaultKCPPort))),
 	}
 	// DefaultDiscoveryServersV4 should be substituted when the configuration
 	// contains <globalAnnounceServer>default-v4</globalAnnounceServer>.
@@ -65,25 +62,6 @@ var (
 	// DefaultDiscoveryServers should be substituted when the configuration
 	// contains <globalAnnounceServer>default</globalAnnounceServer>.
 	DefaultDiscoveryServers = append(DefaultDiscoveryServersV4, DefaultDiscoveryServersV6...)
-	// DefaultStunServers should be substituted when the configuration
-	// contains <stunServer>default</stunServer>.
-	DefaultStunServers = []string{
-		"stun.callwithus.com:3478",
-		"stun.counterpath.com:3478",
-		"stun.counterpath.net:3478",
-		"stun.ekiga.net:3478",
-		"stun.ideasip.com:3478",
-		"stun.internetcalls.com:3478",
-		"stun.schlund.de:3478",
-		"stun.sipgate.net:10000",
-		"stun.sipgate.net:3478",
-		"stun.voip.aebc.com:3478",
-		"stun.voiparound.com:3478",
-		"stun.voipbuster.com:3478",
-		"stun.voipstunt.com:3478",
-		"stun.voxgratia.org:3478",
-		"stun.xten.com:3478",
-	}
 	// DefaultTheme is the default and fallback theme for the web UI.
 	DefaultTheme = "default"
 )
@@ -260,6 +238,10 @@ func (cfg *Configuration) clean() error {
 		folder := &cfg.Folders[i]
 		folder.prepare()
 
+		if folder.ID == "" {
+			return fmt.Errorf("folder with empty ID in configuration")
+		}
+
 		if _, ok := seenFolders[folder.ID]; ok {
 			return fmt.Errorf("duplicate folder ID %q in configuration", folder.ID)
 		}
@@ -376,6 +358,16 @@ func (cfg *Configuration) clean() error {
 	}
 	cfg.IgnoredDevices = newIgnoredDevices
 
+	// Deprecated protocols are removed from the list of listeners and
+	// device addresses. So far just kcp*.
+	for _, prefix := range []string{"kcp"} {
+		cfg.Options.ListenAddresses = filterURLSchemePrefix(cfg.Options.ListenAddresses, prefix)
+		for i := range cfg.Devices {
+			dev := &cfg.Devices[i]
+			dev.Addresses = filterURLSchemePrefix(dev.Addresses, prefix)
+		}
+	}
+
 	return nil
 }
 
@@ -764,3 +756,21 @@ func cleanSymlinks(filesystem fs.Filesystem, dir string) {
 		return nil
 	})
 }
+
+// filterURLSchemePrefix returns the list of addresses after removing all
+// entries whose URL scheme matches the given prefix.
+func filterURLSchemePrefix(addrs []string, prefix string) []string {
+	for i := 0; i < len(addrs); i++ {
+		uri, err := url.Parse(addrs[i])
+		if err != nil {
+			continue
+		}
+		if strings.HasPrefix(uri.Scheme, prefix) {
+			// Remove this entry
+			copy(addrs[i:], addrs[i+1:])
+			addrs = addrs[:len(addrs)-1]
+			i--
+		}
+	}
+	return addrs
+}

lib/config/config_test.go

@@ -68,13 +68,6 @@ func TestDefaultValues(t *testing.T) {
 		TempIndexMinBlocks:      10,
 		UnackedNotificationIDs:  []string{},
 		WeakHashSelectionMethod: WeakHashAuto,
-		StunKeepaliveS:          24,
-		StunServers:             []string{"default"},
-		KCPCongestionControl:    true,
-		KCPReceiveWindowSize:    128,
-		KCPSendWindowSize:       128,
-		KCPUpdateIntervalMs:     25,
-		KCPFastResend:           false,
 		DefaultFolderPath:       "~",
 		SetLowPriority:          true,
 	}
@@ -217,13 +210,6 @@ func TestOverriddenValues(t *testing.T) {
 			"channelNotification", // added in 17->18 migration
 		},
 		WeakHashSelectionMethod: WeakHashNever,
-		StunKeepaliveS:          10,
-		StunServers:             []string{"a.stun.com", "b.stun.com"},
-		KCPCongestionControl:    false,
-		KCPReceiveWindowSize:    1280,
-		KCPSendWindowSize:       1280,
-		KCPUpdateIntervalMs:     1000,
-		KCPFastResend:           true,
 		DefaultFolderPath:       "/media/syncthing",
 		SetLowPriority:          false,
 	}
@@ -869,3 +855,132 @@ func TestIssue4219(t *testing.T) {
 		t.Error("Folder abcd123 should not be ignored")
 	}
 }
+
+func TestInvalidDeviceIDRejected(t *testing.T) {
+	// This test verifies that we properly reject invalid device IDs when
+	// deserializing a JSON config.
+
+	cases := []struct {
+		id string
+		ok bool
+	}{
+		// a genuine device ID
+		{"GYRZZQB-IRNPV4Z-T7TC52W-EQYJ3TT-FDQW6MW-DFLMU42-SSSU6EM-FBK2VAY", true},
+		// incorrect check digit
+		{"GYRZZQB-IRNPV4A-T7TC52W-EQYJ3TT-FDQW6MW-DFLMU42-SSSU6EM-FBK2VAY", false},
+		// missing digit
+		{"GYRZZQB-IRNPV4Z-T7TC52W-EQYJ3TT-FDQW6MW-DFLMU42-SSSU6EM-FBK2VA", false},
+		// clearly broken
+		{"invalid", false},
+		// accepted as the empty device ID for historical reasons...
+		{"", true},
+	}
+
+	for _, tc := range cases {
+		cfg := defaultConfigAsMap()
+
+		// Change the device ID of the first device to "invalid". Fast and loose
+		// with the type assertions as we know what the JSON decoder returns.
+		devs := cfg["devices"].([]interface{})
+		dev0 := devs[0].(map[string]interface{})
+		dev0["deviceID"] = tc.id
+		devs[0] = dev0
+
+		invalidJSON, err := json.Marshal(cfg)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		_, err = ReadJSON(bytes.NewReader(invalidJSON), device1)
+		if tc.ok && err != nil {
+			t.Errorf("unexpected error for device ID %q: %v", tc.id, err)
+		} else if !tc.ok && err == nil {
+			t.Errorf("device ID %q, expected error but got nil", tc.id)
+		}
+	}
+}
+
+func TestInvalidFolderIDRejected(t *testing.T) {
+	// This test verifies that we properly reject invalid folder IDs when
+	// deserializing a JSON config.
+
+	cases := []struct {
+		id string
+		ok bool
+	}{
+		// a reasonable folder ID
+		{"foo", true},
+		// empty is not OK
+		{"", false},
+	}
+
+	for _, tc := range cases {
+		cfg := defaultConfigAsMap()
+
+		// Change the folder ID of the first folder to the empty string.
+		// Fast and loose with the type assertions as we know what the JSON
+		// decoder returns.
+		devs := cfg["folders"].([]interface{})
+		dev0 := devs[0].(map[string]interface{})
+		dev0["id"] = tc.id
+		devs[0] = dev0
+
+		invalidJSON, err := json.Marshal(cfg)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		_, err = ReadJSON(bytes.NewReader(invalidJSON), device1)
+		if tc.ok && err != nil {
+			t.Errorf("unexpected error for folder ID %q: %v", tc.id, err)
+		} else if !tc.ok && err == nil {
+			t.Errorf("folder ID %q, expected error but got nil", tc.id)
+		}
+	}
+}
+
+func TestFilterURLSchemePrefix(t *testing.T) {
+	cases := []struct {
+		before []string
+		prefix string
+		after  []string
+	}{
+		{[]string{}, "kcp", []string{}},
+		{[]string{"tcp://foo"}, "kcp", []string{"tcp://foo"}},
+		{[]string{"kcp://foo"}, "kcp", []string{}},
+		{[]string{"tcp6://foo", "kcp6://foo"}, "kcp", []string{"tcp6://foo"}},
+		{[]string{"kcp6://foo", "tcp6://foo"}, "kcp", []string{"tcp6://foo"}},
+		{
+			[]string{"tcp://foo", "tcp4://foo", "kcp://foo", "kcp4://foo", "banana://foo", "banana4://foo", "banananas!"},
+			"kcp",
+			[]string{"tcp://foo", "tcp4://foo", "banana://foo", "banana4://foo", "banananas!"},
+		},
+	}
+
+	for _, tc := range cases {
+		res := filterURLSchemePrefix(tc.before, tc.prefix)
+		if !reflect.DeepEqual(res, tc.after) {
+			t.Errorf("filterURLSchemePrefix => %q, expected %q", res, tc.after)
+		}
+	}
+}
+
+// defaultConfigAsMap returns a valid default config as a JSON-decoded
+// map[string]interface{}. This is useful to override random elements and
+// re-encode into JSON.
+func defaultConfigAsMap() map[string]interface{} {
+	cfg := New(device1)
+	cfg.Devices = append(cfg.Devices, NewDeviceConfiguration(device2, "name"))
+	cfg.Folders = append(cfg.Folders, NewFolderConfiguration(device1, "default", "default", fs.FilesystemTypeBasic, "/tmp"))
+	bs, err := json.Marshal(cfg)
+	if err != nil {
+		// can't happen
+		panic(err)
+	}
+	var tmp map[string]interface{}
+	if err := json.Unmarshal(bs, &tmp); err != nil {
+		// can't happen
+		panic(err)
+	}
+	return tmp
+}

lib/config/optionsconfiguration.go

@@ -134,14 +134,6 @@ type OptionsConfiguration struct {
 	UnackedNotificationIDs  []string                `xml:"unackedNotificationID" json:"unackedNotificationIDs"`
 	TrafficClass            int                     `xml:"trafficClass" json:"trafficClass"`
 	WeakHashSelectionMethod WeakHashSelectionMethod `xml:"weakHashSelectionMethod" json:"weakHashSelectionMethod" restart:"true"`
-	StunServers             []string                `xml:"stunServer" json:"stunServers" default:"default"`
-	StunKeepaliveS          int                     `xml:"stunKeepaliveSeconds" json:"stunKeepaliveSeconds" default:"24"`
-	KCPNoDelay              bool                    `xml:"kcpNoDelay" json:"kcpNoDelay" default:"false"`
-	KCPUpdateIntervalMs     int                     `xml:"kcpUpdateIntervalMs" json:"kcpUpdateIntervalMs" default:"25"`
-	KCPFastResend           bool                    `xml:"kcpFastResend" json:"kcpFastResend" default:"false"`
-	KCPCongestionControl    bool                    `xml:"kcpCongestionControl" json:"kcpCongestionControl" default:"true"`
-	KCPSendWindowSize       int                     `xml:"kcpSendWindowSize" json:"kcpSendWindowSize" default:"128"`
-	KCPReceiveWindowSize    int                     `xml:"kcpReceiveWindowSize" json:"kcpReceiveWindowSize" default:"128"`
 	DefaultFolderPath       string                  `xml:"defaultFolderPath" json:"defaultFolderPath" default:"~"`
 	SetLowPriority          bool                    `xml:"setLowPriority" json:"setLowPriority" default:"true"`
 

lib/config/testdata/overridenvalues.xml

@@ -35,14 +35,6 @@
         <overwriteRemoteDeviceNamesOnConnect>true</overwriteRemoteDeviceNamesOnConnect>
         <tempIndexMinBlocks>100</tempIndexMinBlocks>
         <weakHashSelectionMethod>never</weakHashSelectionMethod>
-        <stunKeepaliveSeconds>10</stunKeepaliveSeconds>
-        <stunServer>a.stun.com</stunServer>
-        <stunServer>b.stun.com</stunServer>
-        <kcpCongestionControl>false</kcpCongestionControl>
-        <kcpReceiveWindowSize>1280</kcpReceiveWindowSize>
-        <kcpSendWindowSize>1280</kcpSendWindowSize>
-        <kcpUpdateIntervalMs>1000</kcpUpdateIntervalMs>
-        <kcpFastResend>true</kcpFastResend>
         <defaultFolderPath>/media/syncthing</defaultFolderPath>
         <setLowPriority>false</setLowPriority>
     </options>

lib/config/wrapper.go

@@ -15,7 +15,6 @@ import (
 	"github.com/syncthing/syncthing/lib/fs"
 	"github.com/syncthing/syncthing/lib/osutil"
 	"github.com/syncthing/syncthing/lib/protocol"
-	"github.com/syncthing/syncthing/lib/rand"
 	"github.com/syncthing/syncthing/lib/sync"
 	"github.com/syncthing/syncthing/lib/util"
 )
@@ -433,29 +432,6 @@ func (w *Wrapper) setRequiresRestart() {
 	atomic.StoreUint32(&w.requiresRestart, 1)
 }
 
-func (w *Wrapper) StunServers() []string {
-	var addresses []string
-	for _, addr := range w.cfg.Options.StunServers {
-		switch addr {
-		case "default":
-			addresses = append(addresses, DefaultStunServers...)
-		default:
-			addresses = append(addresses, addr)
-		}
-	}
-
-	addresses = util.UniqueStrings(addresses)
-
-	// Shuffle
-	l := len(addresses)
-	for i := range addresses {
-		r := rand.Intn(l)
-		addresses[i], addresses[r] = addresses[r], addresses[i]
-	}
-
-	return addresses
-}
-
 func (w *Wrapper) MyName() string {
 	w.mut.Lock()
 	myID := w.cfg.MyID

lib/connections/config.go

@@ -6,28 +6,7 @@
 
 package connections
 
-import (
-	"time"
-
-	"github.com/xtaci/smux"
-)
-
 const (
 	tcpPriority   = 10
-	kcpPriority   = 50
 	relayPriority = 200
-
-	// KCP filter priorities
-	kcpNoFilterPriority           = 100
-	kcpConversationFilterPriority = 20
-	kcpStunFilterPriority         = 10
-)
-
-var (
-	smuxConfig = &smux.Config{
-		KeepAliveInterval: 10 * time.Second,
-		KeepAliveTimeout:  30 * time.Second,
-		MaxFrameSize:      4096,
-		MaxReceiveBuffer:  4 * 1024 * 1024,
-	}
 )

lib/connections/connections_test.go

@@ -6,8 +6,13 @@
 
 package connections
 
-import "testing"
-import "net/url"
+import (
+	"net/url"
+	"testing"
+
+	"github.com/syncthing/syncthing/lib/config"
+	"github.com/syncthing/syncthing/lib/protocol"
+)
 
 func TestFixupPort(t *testing.T) {
 	cases := [][2]string{
@@ -105,3 +110,60 @@ func TestAllowedNetworks(t *testing.T) {
 		}
 	}
 }
+
+func TestGetDialer(t *testing.T) {
+	mustParseURI := func(v string) *url.URL {
+		uri, err := url.Parse(v)
+		if err != nil {
+			panic(err)
+		}
+		return uri
+	}
+
+	cases := []struct {
+		uri        *url.URL
+		ok         bool
+		disabled   bool
+		deprecated bool
+	}{
+		{mustParseURI("tcp://1.2.3.4:5678"), true, false, false},   // ok
+		{mustParseURI("tcp4://1.2.3.4:5678"), true, false, false},  // ok
+		{mustParseURI("kcp://1.2.3.4:5678"), false, false, true},   // deprecated
+		{mustParseURI("relay://1.2.3.4:5678"), false, true, false}, // disabled
+		{mustParseURI("http://1.2.3.4:5678"), false, false, false}, // generally bad
+		{mustParseURI("bananas!"), false, false, false},            // wat
+	}
+
+	cfg := config.New(protocol.LocalDeviceID)
+	cfg.Options.RelaysEnabled = false
+
+	for _, tc := range cases {
+		df, err := getDialerFactory(cfg, tc.uri)
+		if tc.ok && err != nil {
+			t.Errorf("getDialerFactory(%q) => %v, expected nil err", tc.uri, err)
+		}
+		if tc.ok && df == nil {
+			t.Errorf("getDialerFactory(%q) => nil factory, expected non-nil", tc.uri)
+		}
+		if tc.deprecated && err != errDeprecated {
+			t.Errorf("getDialerFactory(%q) => %v, expected %v", tc.uri, err, errDeprecated)
+		}
+		if tc.disabled && err != errDisabled {
+			t.Errorf("getDialerFactory(%q) => %v, expected %v", tc.uri, err, errDisabled)
+		}
+
+		lf, err := getListenerFactory(cfg, tc.uri)
+		if tc.ok && err != nil {
+			t.Errorf("getListenerFactory(%q) => %v, expected nil err", tc.uri, err)
+		}
+		if tc.ok && lf == nil {
+			t.Errorf("getListenerFactory(%q) => nil factory, expected non-nil", tc.uri)
+		}
+		if tc.deprecated && err != errDeprecated {
+			t.Errorf("getListenerFactory(%q) => %v, expected %v", tc.uri, err, errDeprecated)
+		}
+		if tc.disabled && err != errDisabled {
+			t.Errorf("getListenerFactory(%q) => %v, expected %v", tc.uri, err, errDisabled)
+		}
+	}
+}

lib/connections/deprecated.go

@@ -0,0 +1,36 @@
+// Copyright (C) 2018 The Syncthing Authors.
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this file,
+// You can obtain one at https://mozilla.org/MPL/2.0/.
+
+package connections
+
+import "github.com/syncthing/syncthing/lib/config"
+
+// deprecatedListener is never valid
+type deprecatedListener struct {
+	listenerFactory
+}
+
+func (deprecatedListener) Valid(_ config.Configuration) error {
+	return errDeprecated
+}
+
+// deprecatedDialer is never valid
+type deprecatedDialer struct {
+	dialerFactory
+}
+
+func (deprecatedDialer) Valid(_ config.Configuration) error {
+	return errDeprecated
+}
+
+func init() {
+	listeners["kcp"] = deprecatedListener{}
+	listeners["kcp4"] = deprecatedListener{}
+	listeners["kcp6"] = deprecatedListener{}
+	dialers["kcp"] = deprecatedDialer{}
+	dialers["kcp4"] = deprecatedDialer{}
+	dialers["kcp6"] = deprecatedDialer{}
+}

lib/connections/kcp_dial.go

@@ -1,112 +0,0 @@
-// Copyright (C) 2016 The Syncthing Authors.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at http://mozilla.org/MPL/2.0/.
-
-package connections
-
-import (
-	"crypto/tls"
-	"net/url"
-	"time"
-
-	"github.com/syncthing/syncthing/lib/config"
-	"github.com/syncthing/syncthing/lib/protocol"
-	"github.com/xtaci/kcp-go"
-	"github.com/xtaci/smux"
-)
-
-func init() {
-	factory := &kcpDialerFactory{}
-	for _, scheme := range []string{"kcp", "kcp4", "kcp6"} {
-		dialers[scheme] = factory
-	}
-}
-
-type kcpDialer struct {
-	cfg    *config.Wrapper
-	tlsCfg *tls.Config
-}
-
-func (d *kcpDialer) Dial(id protocol.DeviceID, uri *url.URL) (internalConn, error) {
-	uri = fixupPort(uri, config.DefaultKCPPort)
-
-	var conn *kcp.UDPSession
-	var err error
-
-	// Try to dial via an existing listening connection
-	// giving better changes punching through NAT.
-	if f := getDialingFilter(); f != nil {
-		conn, err = kcp.NewConn(uri.Host, nil, 0, 0, f.NewConn(kcpConversationFilterPriority, &kcpConversationFilter{}))
-		l.Debugf("dial %s using existing conn on %s", uri.String(), conn.LocalAddr())
-	} else {
-		conn, err = kcp.DialWithOptions(uri.Host, nil, 0, 0)
-	}
-	if err != nil {
-		return internalConn{}, err
-	}
-
-	opts := d.cfg.Options()
-
-	conn.SetStreamMode(true)
-	conn.SetACKNoDelay(false)
-	conn.SetWindowSize(opts.KCPSendWindowSize, opts.KCPReceiveWindowSize)
-	conn.SetNoDelay(boolInt(opts.KCPNoDelay), opts.KCPUpdateIntervalMs, boolInt(opts.KCPFastResend), boolInt(!opts.KCPCongestionControl))
-
-	ses, err := smux.Client(conn, smuxConfig)
-	if err != nil {
-		conn.Close()
-		return internalConn{}, err
-	}
-
-	ses.SetDeadline(time.Now().Add(10 * time.Second))
-	stream, err := ses.OpenStream()
-	if err != nil {
-		ses.Close()
-		return internalConn{}, err
-	}
-	ses.SetDeadline(time.Time{})
-
-	tc := tls.Client(&sessionClosingStream{stream, ses}, d.tlsCfg)
-	tc.SetDeadline(time.Now().Add(time.Second * 10))
-	err = tc.Handshake()
-	if err != nil {
-		tc.Close()
-		return internalConn{}, err
-	}
-	tc.SetDeadline(time.Time{})
-
-	return internalConn{tc, connTypeKCPClient, kcpPriority}, nil
-}
-
-func (d *kcpDialer) RedialFrequency() time.Duration {
-	// For restricted NATs, the UDP mapping will potentially only be open for 20-30 seconds
-	// hence try dialing just as often.
-	return time.Duration(d.cfg.Options().StunKeepaliveS) * time.Second
-}
-
-type kcpDialerFactory struct{}
-
-func (kcpDialerFactory) New(cfg *config.Wrapper, tlsCfg *tls.Config) genericDialer {
-	return &kcpDialer{
-		cfg:    cfg,
-		tlsCfg: tlsCfg,
-	}
-}
-
-func (kcpDialerFactory) Priority() int {
-	return kcpPriority
-}
-
-func (kcpDialerFactory) AlwaysWAN() bool {
-	return false
-}
-
-func (kcpDialerFactory) Enabled(cfg config.Configuration) bool {
-	return true
-}
-
-func (kcpDialerFactory) String() string {
-	return "KCP Dialer"
-}

lib/connections/kcp_listen.go

@@ -1,326 +0,0 @@
-// Copyright (C) 2016 The Syncthing Authors.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at http://mozilla.org/MPL/2.0/.
-
-package connections
-
-import (
-	"crypto/tls"
-	"net"
-	"net/url"
-	"strings"
-	"sync"
-	"sync/atomic"
-	"time"
-
-	"github.com/AudriusButkevicius/pfilter"
-	"github.com/ccding/go-stun/stun"
-	"github.com/xtaci/kcp-go"
-	"github.com/xtaci/smux"
-
-	"github.com/syncthing/syncthing/lib/config"
-	"github.com/syncthing/syncthing/lib/nat"
-)
-
-const stunRetryInterval = 5 * time.Minute
-
-func init() {
-	factory := &kcpListenerFactory{}
-	for _, scheme := range []string{"kcp", "kcp4", "kcp6"} {
-		listeners[scheme] = factory
-	}
-}
-
-type kcpListener struct {
-	onAddressesChangedNotifier
-
-	uri     *url.URL
-	cfg     *config.Wrapper
-	tlsCfg  *tls.Config
-	stop    chan struct{}
-	conns   chan internalConn
-	factory listenerFactory
-	nat     atomic.Value
-
-	address *url.URL
-	err     error
-	mut     sync.RWMutex
-}
-
-func (t *kcpListener) Serve() {
-	t.mut.Lock()
-	t.err = nil
-	t.mut.Unlock()
-
-	network := strings.Replace(t.uri.Scheme, "kcp", "udp", -1)
-
-	packetConn, err := net.ListenPacket(network, t.uri.Host)
-	if err != nil {
-		t.mut.Lock()
-		t.err = err
-		t.mut.Unlock()
-		l.Infoln("Listen (BEP/kcp):", err)
-		return
-	}
-	filterConn := pfilter.NewPacketFilter(packetConn)
-	kcpConn := filterConn.NewConn(kcpNoFilterPriority, nil)
-	stunConn := filterConn.NewConn(kcpStunFilterPriority, &stunFilter{
-		ids: make(map[string]time.Time),
-	})
-
-	filterConn.Start()
-	registerFilter(filterConn)
-
-	listener, err := kcp.ServeConn(nil, 0, 0, kcpConn)
-	if err != nil {
-		t.mut.Lock()
-		t.err = err
-		t.mut.Unlock()
-		l.Infoln("Listen (BEP/kcp):", err)
-		return
-	}
-
-	defer listener.Close()
-	defer stunConn.Close()
-	defer kcpConn.Close()
-	defer deregisterFilter(filterConn)
-	defer packetConn.Close()
-
-	l.Infof("KCP listener (%v) starting", kcpConn.LocalAddr())
-	defer l.Infof("KCP listener (%v) shutting down", kcpConn.LocalAddr())
-
-	go t.stunRenewal(stunConn)
-
-	for {
-		listener.SetDeadline(time.Now().Add(time.Second))
-		conn, err := listener.AcceptKCP()
-
-		select {
-		case <-t.stop:
-			if err == nil {
-				conn.Close()
-			}
-			return
-		default:
-		}
-		if err != nil {
-			if err, ok := err.(net.Error); !ok || !err.Timeout() {
-				l.Warnln("Listen (BEP/kcp): Accepting connection:", err)
-			}
-			continue
-		}
-
-		opts := t.cfg.Options()
-
-		conn.SetStreamMode(true)
-		conn.SetACKNoDelay(false)
-		conn.SetWindowSize(opts.KCPSendWindowSize, opts.KCPReceiveWindowSize)
-		conn.SetNoDelay(boolInt(opts.KCPNoDelay), opts.KCPUpdateIntervalMs, boolInt(opts.KCPFastResend), boolInt(!opts.KCPCongestionControl))
-
-		l.Debugln("connect from", conn.RemoteAddr())
-
-		ses, err := smux.Server(conn, smuxConfig)
-		if err != nil {
-			l.Debugln("smux server:", err)
-			conn.Close()
-			continue
-		}
-
-		ses.SetDeadline(time.Now().Add(10 * time.Second))
-		stream, err := ses.AcceptStream()
-		if err != nil {
-			l.Debugln("smux accept:", err)
-			ses.Close()
-			continue
-		}
-		ses.SetDeadline(time.Time{})
-
-		tc := tls.Server(&sessionClosingStream{stream, ses}, t.tlsCfg)
-		tc.SetDeadline(time.Now().Add(time.Second * 10))
-		err = tc.Handshake()
-		if err != nil {
-			l.Debugln("TLS handshake (BEP/kcp):", err)
-			tc.Close()
-			continue
-		}
-		tc.SetDeadline(time.Time{})
-
-		t.conns <- internalConn{tc, connTypeKCPServer, kcpPriority}
-	}
-}
-
-func (t *kcpListener) Stop() {
-	close(t.stop)
-}
-
-func (t *kcpListener) URI() *url.URL {
-	return t.uri
-}
-
-func (t *kcpListener) WANAddresses() []*url.URL {
-	uris := t.LANAddresses()
-	t.mut.RLock()
-	if t.address != nil {
-		uris = append(uris, t.address)
-	}
-	t.mut.RUnlock()
-	return uris
-}
-
-func (t *kcpListener) LANAddresses() []*url.URL {
-	return []*url.URL{t.uri}
-}
-
-func (t *kcpListener) Error() error {
-	t.mut.RLock()
-	err := t.err
-	t.mut.RUnlock()
-	return err
-}
-
-func (t *kcpListener) String() string {
-	return t.uri.String()
-}
-
-func (t *kcpListener) Factory() listenerFactory {
-	return t.factory
-}
-
-func (t *kcpListener) NATType() string {
-	v := t.nat.Load().(stun.NATType)
-	if v == stun.NATUnknown || v == stun.NATError {
-		return "unknown"
-	}
-	return v.String()
-}
-
-func (t *kcpListener) stunRenewal(listener net.PacketConn) {
-	client := stun.NewClientWithConnection(listener)
-	client.SetSoftwareName("syncthing")
-
-	var natType stun.NATType
-	var extAddr *stun.Host
-	var udpAddr *net.UDPAddr
-	var err error
-
-	oldType := stun.NATUnknown
-
-	for {
-
-	disabled:
-		if t.cfg.Options().StunKeepaliveS < 1 {
-			time.Sleep(time.Second)
-			oldType = stun.NATUnknown
-			t.nat.Store(stun.NATUnknown)
-			t.mut.Lock()
-			t.address = nil
-			t.mut.Unlock()
-			continue
-		}
-
-		for _, addr := range t.cfg.StunServers() {
-			// Resolve the address, so that in case the server advertises two
-			// IPs, we always hit the same one, as otherwise, the mapping might
-			// expire as we hit the other address, and cause us to flip flop
-			// between servers/external addresses, as a result flooding discovery
-			// servers.
-			udpAddr, err = net.ResolveUDPAddr("udp", addr)
-			if err != nil {
-				l.Debugf("%s stun addr resolution on %s: %s", t.uri, addr, err)
-				continue
-			}
-			client.SetServerAddr(udpAddr.String())
-
-			natType, extAddr, err = client.Discover()
-			if err != nil || extAddr == nil {
-				l.Debugf("%s stun discovery on %s: %s", t.uri, addr, err)
-				continue
-			}
-
-			// The stun server is most likely borked, try another one.
-			if natType == stun.NATError || natType == stun.NATUnknown || natType == stun.NATBlocked {
-				l.Debugf("%s stun discovery on %s resolved to %s", t.uri, addr, natType)
-				continue
-			}
-
-			if oldType != natType {
-				l.Infof("%s detected NAT type: %s", t.uri, natType)
-				t.nat.Store(natType)
-				oldType = natType
-			}
-
-			// We can't punch through this one, so no point doing keepalives
-			// and such, just try again in a minute and hope that the NAT type changes.
-			if !isPunchable(natType) {
-				break
-			}
-
-			for {
-				changed := false
-
-				uri := *t.uri
-				uri.Host = extAddr.TransportAddr()
-
-				t.mut.Lock()
-
-				if t.address == nil || t.address.String() != uri.String() {
-					l.Infof("%s resolved external address %s (via %s)", t.uri, uri.String(), addr)
-					t.address = &uri
-					changed = true
-				}
-				t.mut.Unlock()
-
-				// This will most likely result in a call to WANAddresses() which tries to
-				// get t.mut, so notify while unlocked.
-				if changed {
-					t.notifyAddressesChanged(t)
-				}
-
-				select {
-				case <-time.After(time.Duration(t.cfg.Options().StunKeepaliveS) * time.Second):
-				case <-t.stop:
-					return
-				}
-
-				if t.cfg.Options().StunKeepaliveS < 1 {
-					goto disabled
-				}
-
-				extAddr, err = client.Keepalive()
-				if err != nil {
-					l.Debugf("%s stun keepalive on %s: %s (%v)", t.uri, addr, err, extAddr)
-					break
-				}
-			}
-		}
-
-		// We failed to contact all provided stun servers or the nat is not punchable.
-		// Chillout for a while.
-		time.Sleep(stunRetryInterval)
-	}
-}
-
-type kcpListenerFactory struct{}
-
-func (f *kcpListenerFactory) New(uri *url.URL, cfg *config.Wrapper, tlsCfg *tls.Config, conns chan internalConn, natService *nat.Service) genericListener {
-	l := &kcpListener{
-		uri:     fixupPort(uri, config.DefaultKCPPort),
-		cfg:     cfg,
-		tlsCfg:  tlsCfg,
-		conns:   conns,
-		stop:    make(chan struct{}),
-		factory: f,
-	}
-	l.nat.Store(stun.NATUnknown)
-	return l
-}
-
-func (kcpListenerFactory) Enabled(cfg config.Configuration) bool {
-	return true
-}
-
-func isPunchable(natType stun.NATType) bool {
-	return natType == stun.NATNone || natType == stun.NATPortRestricted || natType == stun.NATRestricted || natType == stun.NATFull
-}

lib/connections/kcp_misc.go

@@ -1,194 +0,0 @@
-// Copyright (C) 2016 The Syncthing Authors.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at http://mozilla.org/MPL/2.0/.
-
-package connections
-
-import (
-	"bytes"
-	"encoding/binary"
-	"net"
-	"sort"
-	"sync"
-	"sync/atomic"
-	"time"
-
-	"github.com/AudriusButkevicius/pfilter"
-	"github.com/xtaci/kcp-go"
-	"github.com/xtaci/smux"
-)
-
-var (
-	mut     sync.Mutex
-	filters filterList
-)
-
-func init() {
-	kcp.BlacklistDuration = 10 * time.Minute
-}
-
-type filterList []*pfilter.PacketFilter
-
-// Sort connections by whether they are unspecified or not, as connections
-// listening on all addresses are more useful.
-func (f filterList) Len() int      { return len(f) }
-func (f filterList) Swap(i, j int) { f[i], f[j] = f[j], f[i] }
-func (f filterList) Less(i, j int) bool {
-	iIsUnspecified := false
-	jIsUnspecified := false
-	if host, _, err := net.SplitHostPort(f[i].LocalAddr().String()); err == nil {
-		iIsUnspecified = net.ParseIP(host).IsUnspecified()
-	}
-	if host, _, err := net.SplitHostPort(f[j].LocalAddr().String()); err == nil {
-		jIsUnspecified = net.ParseIP(host).IsUnspecified()
-	}
-	return (iIsUnspecified && !jIsUnspecified) || (iIsUnspecified && jIsUnspecified)
-}
-
-// As we open listen KCP connections, we register them here, so that Dial calls through
-// KCP could reuse them. This way we will hopefully work around restricted NATs by
-// dialing via the same connection we are listening on, creating a mapping on our NAT
-// to that IP, and hoping that the other end will try to dial our listen address and
-// using the mapping we've established when we dialed.
-func getDialingFilter() *pfilter.PacketFilter {
-	mut.Lock()
-	defer mut.Unlock()
-	if len(filters) == 0 {
-		return nil
-	}
-	return filters[0]
-}
-
-func registerFilter(filter *pfilter.PacketFilter) {
-	mut.Lock()
-	defer mut.Unlock()
-	filters = append(filters, filter)
-	sort.Sort(filterList(filters))
-}
-
-func deregisterFilter(filter *pfilter.PacketFilter) {
-	mut.Lock()
-	defer mut.Unlock()
-
-	for i, f := range filters {
-		if f == filter {
-			copy(filters[i:], filters[i+1:])
-			filters[len(filters)-1] = nil
-			filters = filters[:len(filters)-1]
-			break
-		}
-	}
-	sort.Sort(filterList(filters))
-}
-
-// Filters
-
-type kcpConversationFilter struct {
-	convID uint32
-}
-
-func (f *kcpConversationFilter) Outgoing(out []byte, addr net.Addr) {
-	if !f.isKCPConv(out) {
-		panic("not a kcp conversation")
-	}
-	atomic.StoreUint32(&f.convID, binary.LittleEndian.Uint32(out[:4]))
-}
-
-func (kcpConversationFilter) isKCPConv(data []byte) bool {
-	// Need at least 5 bytes
-	if len(data) < 5 {
-		return false
-	}
-
-	// First 4 bytes convID
-	// 5th byte is cmd
-	// IKCP_CMD_PUSH    = 81 // cmd: push data
-	// IKCP_CMD_ACK     = 82 // cmd: ack
-	// IKCP_CMD_WASK    = 83 // cmd: window probe (ask)
-	// IKCP_CMD_WINS    = 84 // cmd: window size (tell)
-	return 80 < data[4] && data[4] < 85
-}
-
-func (f *kcpConversationFilter) ClaimIncoming(in []byte, addr net.Addr) bool {
-	if f.isKCPConv(in) {
-		convID := atomic.LoadUint32(&f.convID)
-		return convID != 0 && binary.LittleEndian.Uint32(in[:4]) == convID
-	}
-	return false
-}
-
-type stunFilter struct {
-	ids map[string]time.Time
-	mut sync.Mutex
-}
-
-func (f *stunFilter) Outgoing(out []byte, addr net.Addr) {
-	if !f.isStunPayload(out) {
-		panic("not a stun payload")
-	}
-	id := string(out[8:20])
-	f.mut.Lock()
-	f.ids[id] = time.Now().Add(time.Minute)
-	f.reap()
-	f.mut.Unlock()
-}
-
-func (f *stunFilter) ClaimIncoming(in []byte, addr net.Addr) bool {
-	if f.isStunPayload(in) {
-		id := string(in[8:20])
-		f.mut.Lock()
-		_, ok := f.ids[id]
-		f.reap()
-		f.mut.Unlock()
-		return ok
-	}
-	return false
-}
-
-func (f *stunFilter) isStunPayload(data []byte) bool {
-	// Need at least 20 bytes
-	if len(data) < 20 {
-		return false
-	}
-
-	// First two bits always unset, and should always send magic cookie.
-	return data[0]&0xc0 == 0 && bytes.Equal(data[4:8], []byte{0x21, 0x12, 0xA4, 0x42})
-}
-
-func (f *stunFilter) reap() {
-	now := time.Now()
-	for id, timeout := range f.ids {
-		if timeout.Before(now) {
-			delete(f.ids, id)
-		}
-	}
-}
-
-type sessionClosingStream struct {
-	*smux.Stream
-	session *smux.Session
-}
-
-func (w *sessionClosingStream) Close() error {
-	err1 := w.Stream.Close()
-
-	deadline := time.Now().Add(5 * time.Second)
-	for w.session.NumStreams() > 0 && time.Now().Before(deadline) {
-		time.Sleep(200 * time.Millisecond)
-	}
-
-	err2 := w.session.Close()
-	if err1 != nil {
-		return err1
-	}
-	return err2
-}
-
-func boolInt(b bool) int {
-	if b {
-		return 1
-	}
-	return 0
-}

lib/connections/relay_dial.go

@@ -85,8 +85,11 @@ func (relayDialerFactory) AlwaysWAN() bool {
 	return true
 }
 
-func (relayDialerFactory) Enabled(cfg config.Configuration) bool {
-	return cfg.Options.RelaysEnabled
+func (relayDialerFactory) Valid(cfg config.Configuration) error {
+	if !cfg.Options.RelaysEnabled {
+		return errDisabled
+	}
+	return nil
 }
 
 func (relayDialerFactory) String() string {

lib/connections/relay_listen.go

@@ -190,6 +190,9 @@ func (f *relayListenerFactory) New(uri *url.URL, cfg *config.Wrapper, tlsCfg *tl
 	}
 }
 
-func (relayListenerFactory) Enabled(cfg config.Configuration) bool {
-	return cfg.Options.RelaysEnabled
+func (relayListenerFactory) Valid(cfg config.Configuration) error {
+	if !cfg.Options.RelaysEnabled {
+		return errDisabled
+	}
+	return nil
 }

lib/connections/service.go

@@ -39,6 +39,11 @@ var (
 	listeners = make(map[string]listenerFactory, 0)
 )
 
+var (
+	errDisabled   = errors.New("disabled by configuration")
+	errDeprecated = errors.New("deprecated protocol")
+)
+
 const (
 	perDeviceWarningIntv = 15 * time.Minute
 	tlsHandshakeTimeout  = 10 * time.Second
@@ -149,10 +154,6 @@ func NewService(cfg *config.Wrapper, myID protocol.DeviceID, mdl Model, tlsCfg *
 	return service
 }
 
-var (
-	errDisabled = errors.New("disabled by configuration")
-)
-
 func (s *Service) handle() {
 next:
 	for c := range s.conns {
@@ -293,7 +294,7 @@ func (s *Service) connect() {
 
 		bestDialerPrio := 1<<31 - 1 // worse prio won't build on 32 bit
 		for _, df := range dialers {
-			if !df.Enabled(cfg) {
+			if df.Valid(cfg) != nil {
 				continue
 			}
 			if prio := df.Priority(); prio < bestDialerPrio {
@@ -367,13 +368,18 @@ func (s *Service) connect() {
 					}
 				}
 
-				dialerFactory, err := s.getDialerFactory(cfg, uri)
-				if err == errDisabled {
-					l.Debugln(dialerFactory, "for", uri, "is disabled")
+				dialerFactory, err := getDialerFactory(cfg, uri)
+				switch err {
+				case nil:
+					// all good
+				case errDisabled:
+					l.Debugln("Dialer for", uri, "is disabled")
 					continue
-				}
-				if err != nil {
-					l.Infof("%v for %v: %v", dialerFactory, uri, err)
+				case errDeprecated:
+					l.Debugln("Dialer for", uri, "is deprecated")
+					continue
+				default:
+					l.Infof("Dialer for %v: %v", uri, err)
 					continue
 				}
 
@@ -537,13 +543,18 @@ func (s *Service) CommitConfiguration(from, to config.Configuration) bool {
 			continue
 		}
 
-		factory, err := s.getListenerFactory(to, uri)
-		if err == errDisabled {
+		factory, err := getListenerFactory(to, uri)
+		switch err {
+		case nil:
+			// all good
+		case errDisabled:
 			l.Debugln("Listener for", uri, "is disabled")
 			continue
-		}
-		if err != nil {
-			l.Infof("Getting listener factory for %v: %v", uri, err)
+		case errDeprecated:
+			l.Debugln("Listener for", uri, "is deprecated")
+			continue
+		default:
+			l.Infof("Listener for %v: %v", uri, err)
 			continue
 		}
 
@@ -552,7 +563,7 @@ func (s *Service) CommitConfiguration(from, to config.Configuration) bool {
 	}
 
 	for addr, listener := range s.listeners {
-		if _, ok := seen[addr]; !ok || !listener.Factory().Enabled(to) {
+		if _, ok := seen[addr]; !ok || listener.Factory().Valid(to) != nil {
 			l.Debugln("Stopping listener", addr)
 			s.listenerSupervisor.Remove(s.listenerTokens[addr])
 			delete(s.listenerTokens, addr)
@@ -633,27 +644,25 @@ func (s *Service) NATType() string {
 	return "unknown"
 }
 
-func (s *Service) getDialerFactory(cfg config.Configuration, uri *url.URL) (dialerFactory, error) {
+func getDialerFactory(cfg config.Configuration, uri *url.URL) (dialerFactory, error) {
 	dialerFactory, ok := dialers[uri.Scheme]
 	if !ok {
 		return nil, fmt.Errorf("unknown address scheme %q", uri.Scheme)
 	}
-
-	if !dialerFactory.Enabled(cfg) {
-		return nil, errDisabled
+	if err := dialerFactory.Valid(cfg); err != nil {
+		return nil, err
 	}
 
 	return dialerFactory, nil
 }
 
-func (s *Service) getListenerFactory(cfg config.Configuration, uri *url.URL) (listenerFactory, error) {
+func getListenerFactory(cfg config.Configuration, uri *url.URL) (listenerFactory, error) {
 	listenerFactory, ok := listeners[uri.Scheme]
 	if !ok {
 		return nil, fmt.Errorf("unknown address scheme %q", uri.Scheme)
 	}
-
-	if !listenerFactory.Enabled(cfg) {
-		return nil, errDisabled
+	if err := listenerFactory.Valid(cfg); err != nil {
+		return nil, err
 	}
 
 	return listenerFactory, nil

lib/connections/structs.go

@@ -54,8 +54,6 @@ const (
 	connTypeRelayServer
 	connTypeTCPClient
 	connTypeTCPServer
-	connTypeKCPClient
-	connTypeKCPServer
 )
 
 func (t connType) String() string {
@@ -68,10 +66,6 @@ func (t connType) String() string {
 		return "tcp-client"
 	case connTypeTCPServer:
 		return "tcp-server"
-	case connTypeKCPClient:
-		return "kcp-client"
-	case connTypeKCPServer:
-		return "kcp-server"
 	default:
 		return "unknown-type"
 	}
@@ -83,8 +77,6 @@ func (t connType) Transport() string {
 		return "relay"
 	case connTypeTCPClient, connTypeTCPServer:
 		return "tcp"
-	case connTypeKCPClient, connTypeKCPServer:
-		return "kcp"
 	default:
 		return "unknown"
 	}
@@ -122,7 +114,7 @@ type dialerFactory interface {
 	New(*config.Wrapper, *tls.Config) genericDialer
 	Priority() int
 	AlwaysWAN() bool
-	Enabled(config.Configuration) bool
+	Valid(config.Configuration) error
 	String() string
 }
 
@@ -133,7 +125,7 @@ type genericDialer interface {
 
 type listenerFactory interface {
 	New(*url.URL, *config.Wrapper, *tls.Config, chan internalConn, *nat.Service) genericListener
-	Enabled(config.Configuration) bool
+	Valid(config.Configuration) error
 }
 
 type genericListener interface {

lib/connections/tcp_dial.go

@@ -77,8 +77,9 @@ func (tcpDialerFactory) AlwaysWAN() bool {
 	return false
 }
 
-func (tcpDialerFactory) Enabled(cfg config.Configuration) bool {
-	return true
+func (tcpDialerFactory) Valid(_ config.Configuration) error {
+	// Always valid
+	return nil
 }
 
 func (tcpDialerFactory) String() string {

lib/connections/tcp_listen.go

@@ -193,6 +193,7 @@ func (f *tcpListenerFactory) New(uri *url.URL, cfg *config.Wrapper, tlsCfg *tls.
 	}
 }
 
-func (tcpListenerFactory) Enabled(cfg config.Configuration) bool {
-	return true
+func (tcpListenerFactory) Valid(_ config.Configuration) error {
+	// Always valid
+	return nil
 }

lib/db/benchmark_test.go

@@ -4,8 +4,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
-// +build benchmark
-
 package db_test
 
 import (
@@ -16,17 +14,18 @@ import (
 	"testing"
 
 	"github.com/syncthing/syncthing/lib/db"
+	"github.com/syncthing/syncthing/lib/fs"
 	"github.com/syncthing/syncthing/lib/protocol"
 )
 
 var files, oneFile, firstHalf, secondHalf []protocol.FileInfo
-var fs *db.FileSet
+var s *db.FileSet
 
 func init() {
 	for i := 0; i < 1000; i++ {
 		files = append(files, protocol.FileInfo{
 			Name:    fmt.Sprintf("file%d", i),
-			Version: protocol.Vector{{ID: myID, Value: 1000}},
+			Version: protocol.Vector{[]protocol.Counter{{ID: myID, Value: 1000}}},
 			Blocks:  genBlocks(i),
 		})
 	}
@@ -37,9 +36,9 @@ func init() {
 	oneFile = firstHalf[middle-1 : middle]
 
 	ldb, _ := tempDB()
-	fs = db.NewFileSet("test", ldb)
-	fs.Replace(remoteDevice0, files)
-	fs.Replace(protocol.LocalDeviceID, firstHalf)
+	s = db.NewFileSet("test)", fs.NewFilesystem(fs.FilesystemTypeBasic, "."), ldb)
+	replace(s, remoteDevice0, files)
+	replace(s, protocol.LocalDeviceID, firstHalf)
 }
 
 func tempDB() (*db.Instance, string) {
@@ -63,8 +62,8 @@ func BenchmarkReplaceAll(b *testing.B) {
 
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		m := db.NewFileSet("test", ldb)
-		m.Replace(protocol.LocalDeviceID, files)
+		m := db.NewFileSet("test)", fs.NewFilesystem(fs.FilesystemTypeBasic, "."), ldb)
+		replace(m, protocol.LocalDeviceID, files)
 	}
 
 	b.ReportAllocs()
@@ -78,9 +77,9 @@ func BenchmarkUpdateOneChanged(b *testing.B) {
 
 	for i := 0; i < b.N; i++ {
 		if i%1 == 0 {
-			fs.Update(protocol.LocalDeviceID, changed)
+			s.Update(protocol.LocalDeviceID, changed)
 		} else {
-			fs.Update(protocol.LocalDeviceID, oneFile)
+			s.Update(protocol.LocalDeviceID, oneFile)
 		}
 	}
 
@@ -89,7 +88,7 @@ func BenchmarkUpdateOneChanged(b *testing.B) {
 
 func BenchmarkUpdateOneUnchanged(b *testing.B) {
 	for i := 0; i < b.N; i++ {
-		fs.Update(protocol.LocalDeviceID, oneFile)
+		s.Update(protocol.LocalDeviceID, oneFile)
 	}
 
 	b.ReportAllocs()
@@ -98,7 +97,7 @@ func BenchmarkUpdateOneUnchanged(b *testing.B) {
 func BenchmarkNeedHalf(b *testing.B) {
 	for i := 0; i < b.N; i++ {
 		count := 0
-		fs.WithNeed(protocol.LocalDeviceID, func(fi db.FileIntf) bool {
+		s.WithNeed(protocol.LocalDeviceID, func(fi db.FileIntf) bool {
 			count++
 			return true
 		})
@@ -113,7 +112,7 @@ func BenchmarkNeedHalf(b *testing.B) {
 func BenchmarkHave(b *testing.B) {
 	for i := 0; i < b.N; i++ {
 		count := 0
-		fs.WithHave(protocol.LocalDeviceID, func(fi db.FileIntf) bool {
+		s.WithHave(protocol.LocalDeviceID, func(fi db.FileIntf) bool {
 			count++
 			return true
 		})
@@ -128,7 +127,7 @@ func BenchmarkHave(b *testing.B) {
 func BenchmarkGlobal(b *testing.B) {
 	for i := 0; i < b.N; i++ {
 		count := 0
-		fs.WithGlobal(func(fi db.FileIntf) bool {
+		s.WithGlobal(func(fi db.FileIntf) bool {
 			count++
 			return true
 		})
@@ -143,7 +142,7 @@ func BenchmarkGlobal(b *testing.B) {
 func BenchmarkNeedHalfTruncated(b *testing.B) {
 	for i := 0; i < b.N; i++ {
 		count := 0
-		fs.WithNeedTruncated(protocol.LocalDeviceID, func(fi db.FileIntf) bool {
+		s.WithNeedTruncated(protocol.LocalDeviceID, func(fi db.FileIntf) bool {
 			count++
 			return true
 		})
@@ -158,7 +157,7 @@ func BenchmarkNeedHalfTruncated(b *testing.B) {
 func BenchmarkHaveTruncated(b *testing.B) {
 	for i := 0; i < b.N; i++ {
 		count := 0
-		fs.WithHaveTruncated(protocol.LocalDeviceID, func(fi db.FileIntf) bool {
+		s.WithHaveTruncated(protocol.LocalDeviceID, func(fi db.FileIntf) bool {
 			count++
 			return true
 		})
@@ -173,7 +172,7 @@ func BenchmarkHaveTruncated(b *testing.B) {
 func BenchmarkGlobalTruncated(b *testing.B) {
 	for i := 0; i < b.N; i++ {
 		count := 0
-		fs.WithGlobalTruncated(func(fi db.FileIntf) bool {
+		s.WithGlobalTruncated(func(fi db.FileIntf) bool {
 			count++
 			return true
 		})

lib/db/leveldb_transactions.go

@@ -168,7 +168,7 @@ insert:
 	if insertedAt == 0 {
 		// We just inserted a new newest version. Fixup the global size
 		// calculation.
-		if !file.Version.Equal(oldFile.Version) {
+		if !file.Version.Equal(oldFile.Version) || file.Invalid != oldFile.Invalid {
 			meta.addFile(globalDeviceID, file)
 			if hasOldFile {
 				// We have the old file that was removed at the head of the list.

lib/db/meta.go

@@ -134,8 +134,24 @@ func (m *metadataTracker) removeFile(dev protocol.DeviceID, f FileIntf) {
 	}
 	cp.Bytes -= f.FileSize()
 
-	if cp.Deleted < 0 || cp.Files < 0 || cp.Directories < 0 || cp.Symlinks < 0 {
-		panic("bug: removed more than added")
+	// If we've run into an impossible situation, correct it for now and set
+	// the created timestamp to zero. Next time we start up the metadata
+	// will be seen as infinitely old and recalculated from scratch.
+	if cp.Deleted < 0 {
+		cp.Deleted = 0
+		m.counts.Created = 0
+	}
+	if cp.Files < 0 {
+		cp.Files = 0
+		m.counts.Created = 0
+	}
+	if cp.Directories < 0 {
+		cp.Directories = 0
+		m.counts.Created = 0
+	}
+	if cp.Symlinks < 0 {
+		cp.Symlinks = 0
+		m.counts.Created = 0
 	}
 
 	m.mut.Unlock()

lib/db/set.go

@@ -124,6 +124,10 @@ func (s *FileSet) Drop(device protocol.DeviceID) {
 
 func (s *FileSet) Update(device protocol.DeviceID, fs []protocol.FileInfo) {
 	l.Debugf("%s Update(%v, [%d])", s.folder, device, len(fs))
+
+	// do not modify fs in place, it is still used in outer scope
+	fs = append([]protocol.FileInfo(nil), fs...)
+
 	normalizeFilenames(fs)
 
 	s.updateMutex.Lock()

lib/db/set_test.go

@@ -447,10 +447,10 @@ func TestGlobalReset(t *testing.T) {
 	m := db.NewFileSet("test)", fs.NewFilesystem(fs.FilesystemTypeBasic, "."), ldb)
 
 	local := []protocol.FileInfo{
-		{Name: "a", Version: protocol.Vector{Counters: []protocol.Counter{{ID: myID, Value: 1000}}}},
-		{Name: "b", Version: protocol.Vector{Counters: []protocol.Counter{{ID: myID, Value: 1000}}}},
-		{Name: "c", Version: protocol.Vector{Counters: []protocol.Counter{{ID: myID, Value: 1000}}}},
-		{Name: "d", Version: protocol.Vector{Counters: []protocol.Counter{{ID: myID, Value: 1000}}}},
+		{Name: "a", Sequence: 1, Version: protocol.Vector{Counters: []protocol.Counter{{ID: myID, Value: 1000}}}},
+		{Name: "b", Sequence: 2, Version: protocol.Vector{Counters: []protocol.Counter{{ID: myID, Value: 1000}}}},
+		{Name: "c", Sequence: 3, Version: protocol.Vector{Counters: []protocol.Counter{{ID: myID, Value: 1000}}}},
+		{Name: "d", Sequence: 4, Version: protocol.Vector{Counters: []protocol.Counter{{ID: myID, Value: 1000}}}},
 	}
 
 	remote := []protocol.FileInfo{
@@ -464,8 +464,8 @@ func TestGlobalReset(t *testing.T) {
 	g := globalList(m)
 	sort.Sort(fileList(g))
 
-	if fmt.Sprint(g) != fmt.Sprint(local) {
-		t.Errorf("Global incorrect;\n%v !=\n%v", g, local)
+	if diff, equal := messagediff.PrettyDiff(local, g); !equal {
+		t.Errorf("Global incorrect;\nglobal: %v\n!=\nlocal: %v\ndiff:\n%s", g, local, diff)
 	}
 
 	replace(m, remoteDevice0, remote)
@@ -474,8 +474,8 @@ func TestGlobalReset(t *testing.T) {
 	g = globalList(m)
 	sort.Sort(fileList(g))
 
-	if fmt.Sprint(g) != fmt.Sprint(local) {
-		t.Errorf("Global incorrect;\n%v !=\n%v", g, local)
+	if diff, equal := messagediff.PrettyDiff(local, g); !equal {
+		t.Errorf("Global incorrect;\nglobal: %v\n!=\nlocal: %v\ndiff:\n%s", g, local, diff)
 	}
 }
 
@@ -606,6 +606,7 @@ func TestGlobalNeedWithInvalid(t *testing.T) {
 		protocol.FileInfo{Name: "a", Version: protocol.Vector{Counters: []protocol.Counter{{ID: myID, Value: 1002}}}, Blocks: genBlocks(4)},
 		protocol.FileInfo{Name: "b", Version: protocol.Vector{Counters: []protocol.Counter{{ID: myID, Value: 1002}}}, Invalid: true},
 		protocol.FileInfo{Name: "c", Version: protocol.Vector{Counters: []protocol.Counter{{ID: myID, Value: 1002}}}, Blocks: genBlocks(4)},
+		protocol.FileInfo{Name: "d", Version: protocol.Vector{Counters: []protocol.Counter{{ID: remoteDevice0.Short(), Value: 1002}}}},
 	}
 	replace(s, remoteDevice0, rem0)
 
@@ -613,6 +614,7 @@ func TestGlobalNeedWithInvalid(t *testing.T) {
 		protocol.FileInfo{Name: "a", Version: protocol.Vector{Counters: []protocol.Counter{{ID: myID, Value: 1002}}}, Blocks: genBlocks(4)},
 		protocol.FileInfo{Name: "b", Version: protocol.Vector{Counters: []protocol.Counter{{ID: myID, Value: 1002}}}, Blocks: genBlocks(4)},
 		protocol.FileInfo{Name: "c", Version: protocol.Vector{Counters: []protocol.Counter{{ID: myID, Value: 1002}}}, Invalid: true},
+		protocol.FileInfo{Name: "d", Version: protocol.Vector{Counters: []protocol.Counter{{ID: myID, Value: 1002}}}, Invalid: true, ModifiedS: 10},
 	}
 	replace(s, remoteDevice1, rem1)
 
@@ -621,6 +623,8 @@ func TestGlobalNeedWithInvalid(t *testing.T) {
 		protocol.FileInfo{Name: "a", Version: protocol.Vector{Counters: []protocol.Counter{{ID: myID, Value: 1002}}}, Blocks: genBlocks(4)},
 		protocol.FileInfo{Name: "b", Version: protocol.Vector{Counters: []protocol.Counter{{ID: myID, Value: 1002}}}, Blocks: genBlocks(4)},
 		protocol.FileInfo{Name: "c", Version: protocol.Vector{Counters: []protocol.Counter{{ID: myID, Value: 1002}}}, Blocks: genBlocks(4)},
+		// in conflict and older, but still wins as the other is invalid
+		protocol.FileInfo{Name: "d", Version: protocol.Vector{Counters: []protocol.Counter{{ID: remoteDevice0.Short(), Value: 1002}}}},
 	}
 
 	need := fileList(needList(s, protocol.LocalDeviceID))
@@ -820,6 +824,47 @@ func TestDropFiles(t *testing.T) {
 	}
 }
 
+func TestIssue4701(t *testing.T) {
+	ldb := db.OpenMemory()
+
+	s := db.NewFileSet("test)", fs.NewFilesystem(fs.FilesystemTypeBasic, "."), ldb)
+
+	localHave := fileList{
+		protocol.FileInfo{Name: "a", Version: protocol.Vector{Counters: []protocol.Counter{{ID: myID, Value: 1000}}}},
+		protocol.FileInfo{Name: "b", Version: protocol.Vector{Counters: []protocol.Counter{{ID: myID, Value: 1000}}}, Invalid: true},
+	}
+
+	s.Update(protocol.LocalDeviceID, localHave)
+
+	if c := s.LocalSize(); c.Files != 1 {
+		t.Errorf("Expected 1 local file, got %v", c.Files)
+	}
+	if c := s.GlobalSize(); c.Files != 1 {
+		t.Errorf("Expected 1 global file, got %v", c.Files)
+	}
+
+	localHave[1].Invalid = false
+	s.Update(protocol.LocalDeviceID, localHave)
+
+	if c := s.LocalSize(); c.Files != 2 {
+		t.Errorf("Expected 2 local files, got %v", c.Files)
+	}
+	if c := s.GlobalSize(); c.Files != 2 {
+		t.Errorf("Expected 2 global files, got %v", c.Files)
+	}
+
+	localHave[0].Invalid = true
+	localHave[1].Invalid = true
+	s.Update(protocol.LocalDeviceID, localHave)
+
+	if c := s.LocalSize(); c.Files != 0 {
+		t.Errorf("Expected 0 local files, got %v", c.Files)
+	}
+	if c := s.GlobalSize(); c.Files != 0 {
+		t.Errorf("Expected 0 global files, got %v", c.Files)
+	}
+}
+
 func replace(fs *db.FileSet, device protocol.DeviceID, files []protocol.FileInfo) {
 	fs.Drop(device)
 	fs.Update(device, files)

lib/fs/basicfs_watch_test.go

@@ -35,10 +35,7 @@ func TestMain(m *testing.M) {
 		panic("Cannot get real path to working dir")
 	}
 	testDirAbs = filepath.Join(dir, testDir)
-	testFs = newBasicFilesystem(testDirAbs)
-	if l.ShouldDebug("filesystem") {
-		testFs = &logFilesystem{testFs}
-	}
+	testFs = NewFilesystem(FilesystemTypeBasic, testDirAbs)
 
 	backendBuffer = 10
 	defer func() {
@@ -70,8 +67,11 @@ func TestWatchIgnore(t *testing.T) {
 	expectedEvents := []Event{
 		{file, NonRemove},
 	}
+	allowedEvents := []Event{
+		{name, NonRemove},
+	}
 
-	testScenario(t, name, testCase, expectedEvents, false, ignored)
+	testScenario(t, name, testCase, expectedEvents, allowedEvents, ignored)
 }
 
 func TestWatchRename(t *testing.T) {
@@ -94,8 +94,13 @@ func TestWatchRename(t *testing.T) {
 		{old, Remove},
 		destEvent,
 	}
+	allowedEvents := []Event{
+		{name, NonRemove},
+	}
 
-	testScenario(t, name, testCase, expectedEvents, false, "")
+	// set the "allow others" flag because we might get the create of
+	// "oldfile" initially
+	testScenario(t, name, testCase, expectedEvents, allowedEvents, "")
 }
 
 // TestWatchOutside checks that no changes from outside the folder make it in
@@ -153,17 +158,23 @@ func TestWatchSubpath(t *testing.T) {
 func TestWatchOverflow(t *testing.T) {
 	name := "overflow"
 
-	testCase := func() {
-		for i := 0; i < 5*backendBuffer; i++ {
-			createTestFile(name, "file"+strconv.Itoa(i))
-		}
-	}
-
 	expectedEvents := []Event{
 		{".", NonRemove},
 	}
 
-	testScenario(t, name, testCase, expectedEvents, true, "")
+	allowedEvents := []Event{
+		{name, NonRemove},
+	}
+
+	testCase := func() {
+		for i := 0; i < 5*backendBuffer; i++ {
+			file := "file" + strconv.Itoa(i)
+			createTestFile(name, file)
+			allowedEvents = append(allowedEvents, Event{file, NonRemove})
+		}
+	}
+
+	testScenario(t, name, testCase, expectedEvents, allowedEvents, "")
 }
 
 // path relative to folder root, also creates parent dirs if necessary
@@ -192,20 +203,14 @@ func sleepMs(ms int) {
 	time.Sleep(time.Duration(ms) * time.Millisecond)
 }
 
-func testScenario(t *testing.T, name string, testCase func(), expectedEvents []Event, allowOthers bool, ignored string) {
+func testScenario(t *testing.T, name string, testCase func(), expectedEvents, allowedEvents []Event, ignored string) {
 	if err := testFs.MkdirAll(name, 0755); err != nil {
 		panic(fmt.Sprintf("Failed to create directory %s: %s", name, err))
 	}
-
-	// Tests pick up the previously created files/dirs, probably because
-	// they get flushed to disk with a delay.
-	initDelayMs := 500
-	if runtime.GOOS == "darwin" {
-		initDelayMs = 2000
-	}
-	sleepMs(initDelayMs)
+	defer testFs.RemoveAll(name)
 
 	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 
 	if ignored != "" {
 		ignored = filepath.Join(name, ignored)
@@ -216,29 +221,19 @@ func testScenario(t *testing.T, name string, testCase func(), expectedEvents []E
 		panic(err)
 	}
 
-	go testWatchOutput(t, name, eventChan, expectedEvents, allowOthers, ctx, cancel)
-
-	timeoutDuration := 2 * time.Second
-	if runtime.GOOS == "darwin" {
-		timeoutDuration *= 2
-	}
-	timeout := time.NewTimer(timeoutDuration)
+	go testWatchOutput(t, name, eventChan, expectedEvents, allowedEvents, ctx, cancel)
 
 	testCase()
 
 	select {
-	case <-timeout.C:
+	case <-time.NewTimer(time.Minute).C:
 		t.Errorf("Timed out before receiving all expected events")
-		cancel()
-	case <-ctx.Done():
-	}
 
-	if err := testFs.RemoveAll(name); err != nil {
-		panic(fmt.Sprintf("Failed to remove directory %s: %s", name, err))
+	case <-ctx.Done():
 	}
 }
 
-func testWatchOutput(t *testing.T, name string, in <-chan Event, expectedEvents []Event, allowOthers bool, ctx context.Context, cancel context.CancelFunc) {
+func testWatchOutput(t *testing.T, name string, in <-chan Event, expectedEvents, allowedEvents []Event, ctx context.Context, cancel context.CancelFunc) {
 	var expected = make(map[Event]struct{})
 	for _, ev := range expectedEvents {
 		ev.Name = filepath.Join(name, ev.Name)
@@ -265,7 +260,7 @@ func testWatchOutput(t *testing.T, name string, in <-chan Event, expectedEvents
 		}
 
 		if _, ok := expected[received]; !ok {
-			if allowOthers {
+			if len(allowedEvents) > 0 {
 				sleepMs(100) // To facilitate overflow
 				continue
 			}

lib/fs/debug.go

@@ -18,5 +18,12 @@ var (
 )
 
 func init() {
-	l.SetDebug("fs", strings.Contains(os.Getenv("STTRACE"), "fs") || os.Getenv("STTRACE") == "all")
+	logger.DefaultLogger.NewFacility("walkfs", "Filesystem access while walking")
+	switch {
+	case strings.Contains(os.Getenv("STTRACE"), "walkfs") || os.Getenv("STTRACE") == "all":
+		l.SetDebug("walkfs", true)
+		fallthrough
+	case strings.Contains(os.Getenv("STTRACE"), "fs"):
+		l.SetDebug("fs", true)
+	}
 }

lib/fs/filesystem.go

@@ -160,7 +160,7 @@ func NewFilesystem(fsType FilesystemType, uri string) Filesystem {
 	var fs Filesystem
 	switch fsType {
 	case FilesystemTypeBasic:
-		fs = NewWalkFilesystem(newBasicFilesystem(uri))
+		fs = newBasicFilesystem(uri)
 	default:
 		l.Debugln("Unknown filesystem", fsType, uri)
 		fs = &errorFilesystem{
@@ -170,10 +170,15 @@ func NewFilesystem(fsType FilesystemType, uri string) Filesystem {
 		}
 	}
 
-	if l.ShouldDebug("filesystem") {
-		fs = &logFilesystem{fs}
+	if l.ShouldDebug("walkfs") {
+		return NewWalkFilesystem(&logFilesystem{fs})
 	}
-	return fs
+
+	if l.ShouldDebug("fs") {
+		return &logFilesystem{NewWalkFilesystem(fs)}
+	}
+
+	return NewWalkFilesystem(fs)
 }
 
 // IsInternal returns true if the file, as a path relative to the folder

lib/fs/walkfs.go

@@ -46,7 +46,7 @@ func (f *walkFilesystem) walk(path string, info FileInfo, walkFn WalkFunc) error
 		return err
 	}
 
-	if !info.IsDir() {
+	if !info.IsDir() && path != "." {
 		return nil
 	}
 

lib/ignore/ignore.go

@@ -156,6 +156,8 @@ func (m *Matcher) parseLocked(r io.Reader, file string) error {
 	// Error is saved and returned at the end. We process the patterns
 	// (possibly blank) anyway.
 
+	m.lines = lines
+
 	newHash := hashPatterns(patterns)
 	if newHash == m.curHash {
 		// We've already loaded exactly these patterns.
@@ -163,7 +165,6 @@ func (m *Matcher) parseLocked(r io.Reader, file string) error {
 	}
 
 	m.curHash = newHash
-	m.lines = lines
 	m.patterns = patterns
 	if m.withCache {
 		m.matches = newCache(patterns)
@@ -304,7 +305,7 @@ func loadIgnoreFile(fs fs.Filesystem, file string, cd ChangeDetector) (fs.File,
 	return fd, info, err
 }
 
-func loadParseIncludeFile(filesystem fs.Filesystem, file string, cd ChangeDetector, linesSeen map[string]struct{}) ([]string, []Pattern, error) {
+func loadParseIncludeFile(filesystem fs.Filesystem, file string, cd ChangeDetector, linesSeen map[string]struct{}) ([]Pattern, error) {
 	// Allow escaping the folders filesystem.
 	// TODO: Deprecate, somehow?
 	if filesystem.Type() == fs.FilesystemTypeBasic {
@@ -317,18 +318,19 @@ func loadParseIncludeFile(filesystem fs.Filesystem, file string, cd ChangeDetect
 	}
 
 	if cd.Seen(filesystem, file) {
-		return nil, nil, fmt.Errorf("multiple include of ignore file %q", file)
+		return nil, fmt.Errorf("multiple include of ignore file %q", file)
 	}
 
 	fd, info, err := loadIgnoreFile(filesystem, file, cd)
 	if err != nil {
-		return nil, nil, err
+		return nil, err
 	}
 	defer fd.Close()
 
 	cd.Remember(filesystem, file, info.ModTime())
 
-	return parseIgnoreFile(filesystem, fd, file, cd, linesSeen)
+	_, patterns, err := parseIgnoreFile(filesystem, fd, file, cd, linesSeen)
+	return patterns, err
 }
 
 func parseIgnoreFile(fs fs.Filesystem, fd io.Reader, currentFile string, cd ChangeDetector, linesSeen map[string]struct{}) ([]string, []Pattern, error) {
@@ -395,14 +397,6 @@ func parseIgnoreFile(fs fs.Filesystem, fd io.Reader, currentFile string, cd Chan
 				return fmt.Errorf("invalid pattern %q in ignore file (%v)", line, err)
 			}
 			patterns = append(patterns, pattern)
-		} else if strings.HasPrefix(line, "#include ") {
-			includeRel := strings.TrimSpace(line[len("#include "):])
-			includeFile := filepath.Join(filepath.Dir(currentFile), includeRel)
-			_, includePatterns, err := loadParseIncludeFile(fs, includeFile, cd, linesSeen)
-			if err != nil {
-				return fmt.Errorf("include of %q: %v", includeRel, err)
-			}
-			patterns = append(patterns, includePatterns...)
 		} else {
 			// Path name or pattern, add it so it matches files both in
 			// current directory and subdirs.
@@ -441,8 +435,13 @@ func parseIgnoreFile(fs fs.Filesystem, fd io.Reader, currentFile string, cd Chan
 
 		line = filepath.ToSlash(line)
 		switch {
-		case strings.HasPrefix(line, "#"):
-			err = addPattern(line)
+		case strings.HasPrefix(line, "#include"):
+			includeRel := strings.TrimSpace(line[len("#include "):])
+			includeFile := filepath.Join(filepath.Dir(currentFile), includeRel)
+			var includePatterns []Pattern
+			if includePatterns, err = loadParseIncludeFile(fs, includeFile, cd, linesSeen); err == nil {
+				patterns = append(patterns, includePatterns...)
+			}
 		case strings.HasSuffix(line, "/**"):
 			err = addPattern(line)
 		case strings.HasSuffix(line, "/"):

lib/ignore/ignore_test.go

@@ -186,7 +186,6 @@ func TestBadPatterns(t *testing.T) {
 		"**/[",
 		"#include nonexistent",
 		"#include .stignore",
-		"!#include makesnosense",
 	}
 
 	for _, pat := range badPatterns {
@@ -930,3 +929,55 @@ func TestDuplicateLines(t *testing.T) {
 		t.Fatalf("Parsed patterns differ when manually removing duplicate lines")
 	}
 }
+
+func TestIssue4680(t *testing.T) {
+	stignore := `
+	#snapshot
+	`
+
+	testcases := []struct {
+		file    string
+		matches bool
+	}{
+		{"#snapshot", true},
+		{"#snapshot/foo", true},
+	}
+
+	pats := New(fs.NewFilesystem(fs.FilesystemTypeBasic, "."), WithCache(true))
+	err := pats.Parse(bytes.NewBufferString(stignore), ".stignore")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	for _, tc := range testcases {
+		res := pats.Match(tc.file).IsIgnored()
+		if res != tc.matches {
+			t.Errorf("Matches(%q) == %v, expected %v", tc.file, res, tc.matches)
+		}
+	}
+}
+
+func TestIssue4689(t *testing.T) {
+	stignore := `// orig`
+
+	pats := New(fs.NewFilesystem(fs.FilesystemTypeBasic, "."), WithCache(true))
+	err := pats.Parse(bytes.NewBufferString(stignore), ".stignore")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if lines := pats.Lines(); len(lines) != 1 || lines[0] != "// orig" {
+		t.Fatalf("wrong lines parsing original comment:\n%q", lines)
+	}
+
+	stignore = `// new`
+
+	err = pats.Parse(bytes.NewBufferString(stignore), ".stignore")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if lines := pats.Lines(); len(lines) != 1 || lines[0] != "// new" {
+		t.Fatalf("wrong lines parsing changed comment:\n%v", lines)
+	}
+}

lib/model/folder.go

@@ -8,12 +8,17 @@ package model
 
 import (
 	"context"
+	"errors"
 	"time"
 
 	"github.com/syncthing/syncthing/lib/config"
+	"github.com/syncthing/syncthing/lib/ignore"
+	"github.com/syncthing/syncthing/lib/sync"
 	"github.com/syncthing/syncthing/lib/watchaggregator"
 )
 
+var errWatchNotStarted error = errors.New("not started")
+
 type folder struct {
 	stateTracker
 	config.FolderConfiguration
@@ -26,6 +31,8 @@ type folder struct {
 	watchCancel         context.CancelFunc
 	watchChan           chan []string
 	restartWatchChan    chan struct{}
+	watchErr            error
+	watchErrMut         sync.Mutex
 }
 
 func newFolder(model *Model, cfg config.FolderConfiguration) folder {
@@ -41,6 +48,8 @@ func newFolder(model *Model, cfg config.FolderConfiguration) folder {
 		model:               model,
 		initialScanFinished: make(chan struct{}),
 		watchCancel:         func() {},
+		watchErr:            errWatchNotStarted,
+		watchErrMut:         sync.NewMutex(),
 	}
 }
 
@@ -127,28 +136,22 @@ func (f *folder) scanTimerFired() {
 	f.scan.Reschedule()
 }
 
-func (f *folder) startWatch() {
-	ctx, cancel := context.WithCancel(f.ctx)
-	f.model.fmut.RLock()
-	ignores := f.model.folderIgnores[f.folderID]
-	f.model.fmut.RUnlock()
-	eventChan, err := f.Filesystem().Watch(".", ignores, ctx, f.IgnorePerms)
-	if err != nil {
-		l.Warnf("Failed to start filesystem watcher for folder %s: %v", f.Description(), err)
-	} else {
-		f.watchChan = make(chan []string)
-		f.watchCancel = cancel
-		watchaggregator.Aggregate(eventChan, f.watchChan, f.FolderConfiguration, f.model.cfg, ctx)
-		l.Infoln("Started filesystem watcher for folder", f.Description())
-	}
+func (f *folder) WatchError() error {
+	f.watchErrMut.Lock()
+	defer f.watchErrMut.Unlock()
+	return f.watchErr
 }
 
-func (f *folder) restartWatch() {
+// stopWatch immediately aborts watching and may be called asynchronously
+func (f *folder) stopWatch() {
 	f.watchCancel()
-	f.startWatch()
-	f.Scan(nil)
+	f.watchErrMut.Lock()
+	f.watchErr = errWatchNotStarted
+	f.watchErrMut.Unlock()
 }
 
+// scheduleWatchRestart makes sure watching is restarted from the main for loop
+// in a folder's Serve and thus may be called asynchronously (e.g. when ignores change).
 func (f *folder) scheduleWatchRestart() {
 	select {
 	case f.restartWatchChan <- struct{}{}:
@@ -159,6 +162,56 @@ func (f *folder) scheduleWatchRestart() {
 	}
 }
 
+// restartWatch should only ever be called synchronously. If you want to use
+// this asynchronously, you should probably use scheduleWatchRestart instead.
+func (f *folder) restartWatch() {
+	f.stopWatch()
+	f.startWatch()
+	f.Scan(nil)
+}
+
+// startWatch should only ever be called synchronously. If you want to use
+// this asynchronously, you should probably use scheduleWatchRestart instead.
+func (f *folder) startWatch() {
+	ctx, cancel := context.WithCancel(f.ctx)
+	f.model.fmut.RLock()
+	ignores := f.model.folderIgnores[f.folderID]
+	f.model.fmut.RUnlock()
+	f.watchChan = make(chan []string)
+	f.watchCancel = cancel
+	go f.startWatchAsync(ctx, ignores)
+}
+
+// startWatchAsync tries to start the filesystem watching and retries every minute on failure.
+// It is a convenience function that should not be used except in startWatch.
+func (f *folder) startWatchAsync(ctx context.Context, ignores *ignore.Matcher) {
+	timer := time.NewTimer(0)
+	for {
+		select {
+		case <-timer.C:
+			eventChan, err := f.Filesystem().Watch(".", ignores, ctx, f.IgnorePerms)
+			f.watchErrMut.Lock()
+			prevErr := f.watchErr
+			f.watchErr = err
+			f.watchErrMut.Unlock()
+			if err != nil {
+				if prevErr == errWatchNotStarted {
+					l.Warnf("Failed to start filesystem watcher for folder %s: %v", f.Description(), err)
+				} else {
+					l.Debugf("Failed to start filesystem watcher for folder %s again: %v", f.Description(), err)
+				}
+				timer.Reset(time.Minute)
+				continue
+			}
+			watchaggregator.Aggregate(eventChan, f.watchChan, f.FolderConfiguration, f.model.cfg, ctx)
+			l.Debugln("Started filesystem watcher for folder", f.Description())
+			return
+		case <-ctx.Done():
+			return
+		}
+	}
+}
+
 func (f *folder) setError(err error) {
 	_, _, oldErr := f.getState()
 	if (err != nil && oldErr != nil && oldErr.Error() == err.Error()) || (err == nil && oldErr == nil) {
@@ -177,7 +230,7 @@ func (f *folder) setError(err error) {
 
 	if f.FSWatcherEnabled {
 		if err != nil {
-			f.watchCancel()
+			f.stopWatch()
 		} else {
 			f.scheduleWatchRestart()
 		}

lib/model/model.go

@@ -65,6 +65,7 @@ type service interface {
 	Stop()
 	CheckHealth() error
 	PullErrors() []FileError
+	WatchError() error
 
 	getState() (folderState, time.Time, error)
 	setState(state folderState)
@@ -823,66 +824,52 @@ func (m *Model) RemoteNeedFolderFiles(device protocol.DeviceID, folder string, p
 // Index is called when a new device is connected and we receive their full index.
 // Implements the protocol.Model interface.
 func (m *Model) Index(deviceID protocol.DeviceID, folder string, fs []protocol.FileInfo) {
-	l.Debugf("IDX(in): %s %q: %d files", deviceID, folder, len(fs))
-
-	if !m.folderSharedWith(folder, deviceID) {
-		l.Debugf("Unexpected folder ID %q sent from device %q; ensure that the folder exists and that this device is selected under \"Share With\" in the folder configuration.", folder, deviceID)
-		return
-	}
-
-	m.fmut.RLock()
-	files, ok := m.folderFiles[folder]
-	runner := m.folderRunners[folder]
-	m.fmut.RUnlock()
-
-	if !ok {
-		l.Fatalf("Index for nonexistent folder %q", folder)
-	}
-
-	if runner != nil {
-		// Runner may legitimately not be set if this is the "cleanup" Index
-		// message at startup.
-		defer runner.SchedulePull()
-	}
-
-	m.pmut.RLock()
-	m.deviceDownloads[deviceID].Update(folder, makeForgetUpdate(fs))
-	m.pmut.RUnlock()
-
-	files.Drop(deviceID)
-	files.Update(deviceID, fs)
-
-	events.Default.Log(events.RemoteIndexUpdated, map[string]interface{}{
-		"device":  deviceID.String(),
-		"folder":  folder,
-		"items":   len(fs),
-		"version": files.Sequence(deviceID),
-	})
+	m.handleIndex(deviceID, folder, fs, false)
 }
 
 // IndexUpdate is called for incremental updates to connected devices' indexes.
 // Implements the protocol.Model interface.
 func (m *Model) IndexUpdate(deviceID protocol.DeviceID, folder string, fs []protocol.FileInfo) {
-	l.Debugf("%v IDXUP(in): %s / %q: %d files", m, deviceID, folder, len(fs))
+	m.handleIndex(deviceID, folder, fs, true)
+}
+
+func (m *Model) handleIndex(deviceID protocol.DeviceID, folder string, fs []protocol.FileInfo, update bool) {
+	op := "Index"
+	if update {
+		op += " update"
+	}
+
+	l.Debugf("%v (in): %s / %q: %d files", op, deviceID, folder, len(fs))
 
 	if !m.folderSharedWith(folder, deviceID) {
-		l.Debugf("Update for unexpected folder ID %q sent from device %q; ensure that the folder exists and that this device is selected under \"Share With\" in the folder configuration.", folder, deviceID)
+		l.Debugf("%v for unexpected folder ID %q sent from device %q; ensure that the folder exists and that this device is selected under \"Share With\" in the folder configuration.", op, folder, deviceID)
 		return
 	}
 
 	m.fmut.RLock()
-	files := m.folderFiles[folder]
-	runner, ok := m.folderRunners[folder]
+	files, existing := m.folderFiles[folder]
+	runner, running := m.folderRunners[folder]
 	m.fmut.RUnlock()
 
-	if !ok {
-		l.Fatalf("IndexUpdate for nonexistent folder %q", folder)
+	if !existing {
+		l.Fatalf("%v for nonexistent folder %q", op, folder)
+	}
+
+	if running {
+		defer runner.SchedulePull()
+	} else if update {
+		// Runner may legitimately not be set if this is the "cleanup" Index
+		// message at startup.
+		l.Fatalf("%v for not running folder %q", op, folder)
 	}
 
 	m.pmut.RLock()
 	m.deviceDownloads[deviceID].Update(folder, makeForgetUpdate(fs))
 	m.pmut.RUnlock()
 
+	if !update {
+		files.Drop(deviceID)
+	}
 	files.Update(deviceID, fs)
 
 	events.Default.Log(events.RemoteIndexUpdated, map[string]interface{}{
@@ -891,8 +878,6 @@ func (m *Model) IndexUpdate(deviceID protocol.DeviceID, folder string, fs []prot
 		"items":   len(fs),
 		"version": files.Sequence(deviceID),
 	})
-
-	runner.SchedulePull()
 }
 
 func (m *Model) folderSharedWith(folder string, deviceID protocol.DeviceID) bool {
@@ -1970,7 +1955,7 @@ func (m *Model) internalScanFolderSubdirs(ctx context.Context, folder string, su
 
 	runner.setState(FolderScanning)
 
-	fchan, err := scanner.Walk(ctx, scanner.Config{
+	fchan := scanner.Walk(ctx, scanner.Config{
 		Folder:                folderCfg.ID,
 		Subs:                  subDirs,
 		Matcher:               ignores,
@@ -1986,14 +1971,7 @@ func (m *Model) internalScanFolderSubdirs(ctx context.Context, folder string, su
 		UseWeakHashes:         weakhash.Enabled,
 	})
 
-	if err != nil {
-		// The error we get here is likely an OS level error, which might not be
-		// as readable as our health check errors. Check if we can get a health
-		// check error first, and use that if it's available.
-		if ferr := runner.CheckHealth(); ferr != nil {
-			err = ferr
-		}
-		runner.setError(err)
+	if err := runner.CheckHealth(); err != nil {
 		return err
 	}
 
@@ -2098,7 +2076,7 @@ func (m *Model) internalScanFolderSubdirs(ctx context.Context, folder string, su
 		})
 
 		if iterError != nil {
-			l.Debugln("Stopping scan of folder %s due to: %s", folderCfg.Description(), err)
+			l.Debugln("Stopping scan of folder %s due to: %s", folderCfg.Description(), iterError)
 			return iterError
 		}
 	}
@@ -2236,6 +2214,15 @@ func (m *Model) PullErrors(folder string) ([]FileError, error) {
 	return m.folderRunners[folder].PullErrors(), nil
 }
 
+func (m *Model) WatchError(folder string) error {
+	m.fmut.RLock()
+	defer m.fmut.RUnlock()
+	if err := m.checkFolderRunningLocked(folder); err != nil {
+		return err
+	}
+	return m.folderRunners[folder].WatchError()
+}
+
 func (m *Model) Override(folder string) {
 	m.fmut.RLock()
 	fs, ok := m.folderFiles[folder]

lib/protocol/benchmark_test.go

@@ -9,7 +9,6 @@ import (
 	"testing"
 
 	"github.com/syncthing/syncthing/lib/dialer"
-	"github.com/xtaci/kcp-go"
 )
 
 func BenchmarkRequestsRawTCP(b *testing.B) {
@@ -29,23 +28,6 @@ func BenchmarkRequestsRawTCP(b *testing.B) {
 	benchmarkRequestsConnPair(b, conn0, conn1)
 }
 
-func BenchmarkRequestsRawKCP(b *testing.B) {
-	// Benchmarks the rate at which we can serve requests over a single,
-	// unencrypted KCP channel over the loopback interface.
-
-	// Get a connected KCP pair
-	conn0, conn1, err := getKCPConnectionPair()
-	if err != nil {
-		b.Fatal(err)
-	}
-
-	defer conn0.Close()
-	defer conn1.Close()
-
-	// Bench it
-	benchmarkRequestsConnPair(b, conn0, conn1)
-}
-
 func BenchmarkRequestsTLSoTCP(b *testing.B) {
 	conn0, conn1, err := getTCPConnectionPair()
 	if err != nil {
@@ -56,16 +38,6 @@ func BenchmarkRequestsTLSoTCP(b *testing.B) {
 	benchmarkRequestsTLS(b, conn0, conn1)
 }
 
-func BenchmarkRequestsTLSoKCP(b *testing.B) {
-	conn0, conn1, err := getKCPConnectionPair()
-	if err != nil {
-		b.Fatal(err)
-	}
-	defer conn0.Close()
-	defer conn1.Close()
-	benchmarkRequestsTLS(b, conn0, conn1)
-}
-
 func benchmarkRequestsTLS(b *testing.B, conn0, conn1 net.Conn) {
 	// Benchmarks the rate at which we can serve requests over a single,
 	// TLS encrypted channel over the loopback interface.
@@ -166,35 +138,6 @@ func getTCPConnectionPair() (net.Conn, net.Conn, error) {
 	return conn0, conn1, nil
 }
 
-func getKCPConnectionPair() (net.Conn, net.Conn, error) {
-	lst, err := kcp.Listen("127.0.0.1:0")
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var conn0 net.Conn
-	var err0 error
-	done := make(chan struct{})
-	go func() {
-		conn0, err0 = lst.Accept()
-		close(done)
-	}()
-
-	// Dial the connection
-	conn1, err := kcp.Dial(lst.Addr().String())
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// Check any error from accept
-	<-done
-	if err0 != nil {
-		return nil, nil, err0
-	}
-
-	return conn0, conn1, nil
-}
-
 func negotiateTLS(cert tls.Certificate, conn0, conn1 net.Conn) (net.Conn, net.Conn) {
 	cfg := &tls.Config{
 		Certificates:           []tls.Certificate{cert},

lib/protocol/bep_extensions.go

@@ -95,6 +95,11 @@ func (f FileInfo) SequenceNo() int64 {
 // WinsConflict returns true if "f" is the one to choose when it is in
 // conflict with "other".
 func (f FileInfo) WinsConflict(other FileInfo) bool {
+	// If only one of the files is invalid, that one loses
+	if f.IsInvalid() != other.IsInvalid() {
+		return !f.IsInvalid()
+	}
+
 	// If a modification is in conflict with a delete, we pick the
 	// modification.
 	if !f.IsDeleted() && other.IsDeleted() {

lib/protocol/conflict_test.go

@@ -9,6 +9,7 @@ func TestWinsConflict(t *testing.T) {
 		// The first should always win over the second
 		{{ModifiedS: 42}, {ModifiedS: 41}},
 		{{ModifiedS: 41}, {ModifiedS: 42, Deleted: true}},
+		{{Deleted: true}, {ModifiedS: 10, Invalid: true}},
 		{{ModifiedS: 41, Version: Vector{[]Counter{{42, 2}, {43, 1}}}}, {ModifiedS: 41, Version: Vector{[]Counter{{42, 1}, {43, 2}}}}},
 	}
 

lib/scanner/infinitefs_test.go

@@ -31,6 +31,10 @@ func (i infiniteFS) Lstat(name string) (fs.FileInfo, error) {
 	return fakeInfo{name, i.filesize}, nil
 }
 
+func (i infiniteFS) Stat(name string) (fs.FileInfo, error) {
+	return fakeInfo{name, i.filesize}, nil
+}
+
 func (i infiniteFS) DirNames(name string) ([]string, error) {
 	// Returns a list of fake files and directories. Names are such that
 	// files appear before directories - this makes it so the scanner will

lib/scanner/walk.go

@@ -8,7 +8,6 @@ package scanner
 
 import (
 	"context"
-	"errors"
 	"runtime"
 	"sync/atomic"
 	"time"
@@ -76,7 +75,7 @@ type CurrentFiler interface {
 	CurrentFile(name string) (protocol.FileInfo, bool)
 }
 
-func Walk(ctx context.Context, cfg Config) (chan protocol.FileInfo, error) {
+func Walk(ctx context.Context, cfg Config) chan protocol.FileInfo {
 	w := walker{cfg}
 
 	if w.CurrentFiler == nil {
@@ -98,13 +97,9 @@ type walker struct {
 
 // Walk returns the list of files found in the local folder by scanning the
 // file system. Files are blockwise hashed.
-func (w *walker) walk(ctx context.Context) (chan protocol.FileInfo, error) {
+func (w *walker) walk(ctx context.Context) chan protocol.FileInfo {
 	l.Debugln("Walk", w.Subs, w.BlockSize, w.Matcher)
 
-	if err := w.checkDir(); err != nil {
-		return nil, err
-	}
-
 	toHashChan := make(chan protocol.FileInfo)
 	finishedChan := make(chan protocol.FileInfo)
 
@@ -126,7 +121,7 @@ func (w *walker) walk(ctx context.Context) (chan protocol.FileInfo, error) {
 	// and feed inputs directly from the walker.
 	if w.ProgressTickIntervalS < 0 {
 		newParallelHasher(ctx, w.Filesystem, w.BlockSize, w.Hashers, finishedChan, toHashChan, nil, nil, w.UseWeakHashes)
-		return finishedChan, nil
+		return finishedChan
 	}
 
 	// Defaults to every 2 seconds.
@@ -198,7 +193,7 @@ func (w *walker) walk(ctx context.Context) (chan protocol.FileInfo, error) {
 		close(realToHashChan)
 	}()
 
-	return finishedChan, nil
+	return finishedChan
 }
 
 func (w *walker) walkAndHashFiles(ctx context.Context, fchan, dchan chan protocol.FileInfo) fs.WalkFunc {
@@ -480,21 +475,6 @@ func (w *walker) normalizePath(path string, info fs.FileInfo) (normPath string,
 	return normPath, false
 }
 
-func (w *walker) checkDir() error {
-	info, err := w.Filesystem.Lstat(".")
-	if err != nil {
-		return err
-	}
-
-	if !info.IsDir() {
-		return errors.New(w.Filesystem.URI() + ": not a directory")
-	}
-
-	l.Debugln("checkDir", w.Filesystem.Type(), w.Filesystem.URI(), info)
-
-	return nil
-}
-
 func PermsEqual(a, b uint32) bool {
 	switch runtime.GOOS {
 	case "windows":

lib/scanner/walk_test.go

@@ -12,6 +12,7 @@ import (
 	"crypto/rand"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -61,7 +62,7 @@ func TestWalkSub(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	fchan, err := Walk(context.TODO(), Config{
+	fchan := Walk(context.TODO(), Config{
 		Filesystem: fs.NewFilesystem(fs.FilesystemTypeBasic, "testdata"),
 		Subs:       []string{"dir2"},
 		BlockSize:  128 * 1024,
@@ -72,9 +73,6 @@ func TestWalkSub(t *testing.T) {
 	for f := range fchan {
 		files = append(files, f)
 	}
-	if err != nil {
-		t.Fatal(err)
-	}
 
 	// The directory contains two files, where one is ignored from a higher
 	// level. We should see only the directory and one of the files.
@@ -98,17 +96,13 @@ func TestWalk(t *testing.T) {
 	}
 	t.Log(ignores)
 
-	fchan, err := Walk(context.TODO(), Config{
+	fchan := Walk(context.TODO(), Config{
 		Filesystem: fs.NewFilesystem(fs.FilesystemTypeBasic, "testdata"),
 		BlockSize:  128 * 1024,
 		Matcher:    ignores,
 		Hashers:    2,
 	})
 
-	if err != nil {
-		t.Fatal(err)
-	}
-
 	var tmp []protocol.FileInfo
 	for f := range fchan {
 		tmp = append(tmp, f)
@@ -121,27 +115,6 @@ func TestWalk(t *testing.T) {
 	}
 }
 
-func TestWalkError(t *testing.T) {
-	_, err := Walk(context.TODO(), Config{
-		Filesystem: fs.NewFilesystem(fs.FilesystemTypeBasic, "testdata-missing"),
-		BlockSize:  128 * 1024,
-		Hashers:    2,
-	})
-
-	if err == nil {
-		t.Error("no error from missing directory")
-	}
-
-	_, err = Walk(context.TODO(), Config{
-		Filesystem: fs.NewFilesystem(fs.FilesystemTypeBasic, "testdata/bar"),
-		BlockSize:  128 * 1024,
-	})
-
-	if err == nil {
-		t.Error("no error from non-directory")
-	}
-}
-
 func TestVerify(t *testing.T) {
 	blocksize := 16
 	// data should be an even multiple of blocksize long
@@ -292,39 +265,25 @@ func TestWalkSymlinkUnix(t *testing.T) {
 	}
 
 	// Create a folder with a symlink in it
-
 	os.RemoveAll("_symlinks")
-	defer os.RemoveAll("_symlinks")
-
 	os.Mkdir("_symlinks", 0755)
-	os.Symlink("destination", "_symlinks/link")
+	defer os.RemoveAll("_symlinks")
+	os.Symlink("../testdata", "_symlinks/link")
 
-	// Scan it
+	for _, path := range []string{".", "link"} {
+		// Scan it
+		files, _ := walkDir(fs.NewFilesystem(fs.FilesystemTypeBasic, "_symlinks"), path)
 
-	fchan, err := Walk(context.TODO(), Config{
-		Filesystem: fs.NewFilesystem(fs.FilesystemTypeBasic, "_symlinks"),
-		BlockSize:  128 * 1024,
-	})
-
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	var files []protocol.FileInfo
-	for f := range fchan {
-		files = append(files, f)
-	}
-
-	// Verify that we got one symlink and with the correct attributes
-
-	if len(files) != 1 {
-		t.Errorf("expected 1 symlink, not %d", len(files))
-	}
-	if len(files[0].Blocks) != 0 {
-		t.Errorf("expected zero blocks for symlink, not %d", len(files[0].Blocks))
-	}
-	if files[0].SymlinkTarget != "destination" {
-		t.Errorf("expected symlink to have target destination, not %q", files[0].SymlinkTarget)
+		// Verify that we got one symlink and with the correct attributes
+		if len(files) != 1 {
+			t.Errorf("expected 1 symlink, not %d", len(files))
+		}
+		if len(files[0].Blocks) != 0 {
+			t.Errorf("expected zero blocks for symlink, not %d", len(files[0].Blocks))
+		}
+		if files[0].SymlinkTarget != "../testdata" {
+			t.Errorf("expected symlink to have target destination, not %q", files[0].SymlinkTarget)
+		}
 	}
 }
 
@@ -334,41 +293,57 @@ func TestWalkSymlinkWindows(t *testing.T) {
 	}
 
 	// Create a folder with a symlink in it
-
 	os.RemoveAll("_symlinks")
-	defer os.RemoveAll("_symlinks")
-
 	os.Mkdir("_symlinks", 0755)
-	if err := osutil.DebugSymlinkForTestsOnly("destination", "_symlinks/link"); err != nil {
+	defer os.RemoveAll("_symlinks")
+	if err := osutil.DebugSymlinkForTestsOnly("../testdata", "_symlinks/link"); err != nil {
 		// Probably we require permissions we don't have.
 		t.Skip(err)
 	}
 
-	// Scan it
+	for _, path := range []string{".", "link"} {
+		// Scan it
+		files, _ := walkDir(fs.NewFilesystem(fs.FilesystemTypeBasic, "_symlinks"), path)
 
-	fchan, err := Walk(context.TODO(), Config{
-		Filesystem: fs.NewFilesystem(fs.FilesystemTypeBasic, "_symlinks"),
-		BlockSize:  128 * 1024,
-	})
+		// Verify that we got zero symlinks
+		if len(files) != 0 {
+			t.Errorf("expected zero symlinks, not %d", len(files))
+		}
+	}
+}
 
+func TestWalkRootSymlink(t *testing.T) {
+	// Create a folder with a symlink in it
+	tmp, err := ioutil.TempDir("", "")
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer os.RemoveAll(tmp)
 
-	var files []protocol.FileInfo
-	for f := range fchan {
-		files = append(files, f)
+	link := tmp + "/link"
+	dest, _ := filepath.Abs("testdata/dir1")
+	if err := osutil.DebugSymlinkForTestsOnly(dest, link); err != nil {
+		if runtime.GOOS == "windows" {
+			// Probably we require permissions we don't have.
+			t.Skip("Need admin permissions or developer mode to run symlink test on Windows: " + err.Error())
+		} else {
+			t.Fatal(err)
+		}
 	}
 
-	// Verify that we got zero symlinks
-
-	if len(files) != 0 {
-		t.Errorf("expected zero symlinks, not %d", len(files))
+	// Scan it
+	files, err := walkDir(fs.NewFilesystem(fs.FilesystemTypeBasic, link), ".")
+	if err != nil {
+		t.Fatal("Expected no error when root folder path is provided via a symlink: " + err.Error())
+	}
+	// Verify that we got two files
+	if len(files) != 2 {
+		t.Errorf("expected two files, not %d", len(files))
 	}
 }
 
 func walkDir(fs fs.Filesystem, dir string) ([]protocol.FileInfo, error) {
-	fchan, err := Walk(context.TODO(), Config{
+	fchan := Walk(context.TODO(), Config{
 		Filesystem:    fs,
 		Subs:          []string{dir},
 		BlockSize:     128 * 1024,
@@ -376,10 +351,6 @@ func walkDir(fs fs.Filesystem, dir string) ([]protocol.FileInfo, error) {
 		Hashers:       2,
 	})
 
-	if err != nil {
-		return nil, err
-	}
-
 	var tmp []protocol.FileInfo
 	for f := range fchan {
 		tmp = append(tmp, f)
@@ -478,17 +449,13 @@ func TestStopWalk(t *testing.T) {
 
 	const numHashers = 4
 	ctx, cancel := context.WithCancel(context.Background())
-	fchan, err := Walk(ctx, Config{
+	fchan := Walk(ctx, Config{
 		Filesystem:            fs,
 		BlockSize:             128 * 1024,
 		Hashers:               numHashers,
 		ProgressTickIntervalS: -1, // Don't attempt to build the full list of files before starting to scan...
 	})
 
-	if err != nil {
-		t.Fatal(err)
-	}
-
 	// Receive a few entries to make sure the walker is up and running,
 	// scanning both files and dirs. Do some quick sanity tests on the
 	// returned file entries to make sure we are not just reading crap from

lib/upgrade/upgrade_common.go

@@ -225,15 +225,20 @@ func versionParts(v string) ([]int, []interface{}) {
 	return release, prerelease
 }
 
-func releaseName(tag string) string {
+func releaseNames(tag string) []string {
 	// We must ensure that the release asset matches the expected naming
 	// standard, containing both the architecture/OS and the tag name we
 	// expect. This protects against malformed release data potentially
 	// tricking us into doing a downgrade.
 	switch runtime.GOOS {
 	case "darwin":
-		return fmt.Sprintf("syncthing-macosx-%s-%s.", runtime.GOARCH, tag)
+		return []string{
+			fmt.Sprintf("syncthing-macos-%s-%s.", runtime.GOARCH, tag),
+			fmt.Sprintf("syncthing-macosx-%s-%s.", runtime.GOARCH, tag),
+		}
 	default:
-		return fmt.Sprintf("syncthing-%s-%s-%s.", runtime.GOOS, runtime.GOARCH, tag)
+		return []string{
+			fmt.Sprintf("syncthing-%s-%s-%s.", runtime.GOOS, runtime.GOARCH, tag),
+		}
 	}
 }

lib/upgrade/upgrade_supported.go

@@ -147,13 +147,18 @@ func SelectLatestRelease(rels []Release, current string, upgradeToPreReleases bo
 			l.Debugln("skipping pre-release", rel.Tag)
 			continue
 		}
+
+		expectedReleases := releaseNames(rel.Tag)
+	nextAsset:
 		for _, asset := range rel.Assets {
 			assetName := path.Base(asset.Name)
 			// Check for the architecture
-			expectedRelease := releaseName(rel.Tag)
-			if strings.HasPrefix(assetName, expectedRelease) {
-				l.Debugln("selected", rel.Tag)
-				selected = rel
+			for _, expRel := range expectedReleases {
+				if strings.HasPrefix(assetName, expRel) {
+					l.Debugln("selected", rel.Tag)
+					selected = rel
+					break nextAsset
+				}
 			}
 		}
 	}
@@ -167,14 +172,15 @@ func SelectLatestRelease(rels []Release, current string, upgradeToPreReleases bo
 
 // Upgrade to the given release, saving the previous binary with a ".old" extension.
 func upgradeTo(binary string, rel Release) error {
-	expectedRelease := releaseName(rel.Tag)
-	l.Debugf("expected release asset %q", expectedRelease)
+	expectedReleases := releaseNames(rel.Tag)
 	for _, asset := range rel.Assets {
 		assetName := path.Base(asset.Name)
 		l.Debugln("considering release", assetName)
 
-		if strings.HasPrefix(assetName, expectedRelease) {
-			return upgradeToURL(assetName, binary, asset.URL)
+		for _, expRel := range expectedReleases {
+			if strings.HasPrefix(assetName, expRel) {
+				return upgradeToURL(assetName, binary, asset.URL)
+			}
 		}
 	}
 

lib/upgrade/upgrade_test.go

@@ -9,6 +9,7 @@
 package upgrade
 
 import (
+	"runtime"
 	"strings"
 	"testing"
 )
@@ -100,7 +101,7 @@ func TestSelectedRelease(t *testing.T) {
 				Prerelease: strings.Contains(c, "-"),
 				Assets: []Asset{
 					// There must be a matching asset or it will not get selected
-					{Name: releaseName(c)},
+					{Name: releaseNames(c)[0]},
 				},
 			})
 		}
@@ -115,3 +116,40 @@ func TestSelectedRelease(t *testing.T) {
 		}
 	}
 }
+
+func TestSelectedReleaseMacOS(t *testing.T) {
+	if runtime.GOOS != "darwin" {
+		t.Skip("macOS only")
+	}
+
+	// The alterantives that we expect should work
+	assetNames := []string{
+		"syncthing-macos-amd64-v0.14.47.tar.gz",
+		"syncthing-macosx-amd64-v0.14.47.tar.gz",
+	}
+
+	for _, assetName := range assetNames {
+		// Provide one release with the given asset name
+		rels := []Release{
+			{
+				Tag:        "v0.14.47",
+				Prerelease: false,
+				Assets: []Asset{
+					{Name: assetName},
+				},
+			},
+		}
+
+		// Check that it is selected and the asset is as epected
+		sel, err := SelectLatestRelease(rels, "v0.14.46", false)
+		if err != nil {
+			t.Fatal("Unexpected error:", err)
+		}
+		if sel.Tag != "v0.14.47" {
+			t.Error("wrong tag selected:", sel.Tag)
+		}
+		if sel.Assets[0].Name != assetName {
+			t.Error("wrong asset selected:", sel.Assets[0].Name)
+		}
+	}
+}

lib/versioner/external.go

@@ -10,6 +10,7 @@ import (
 	"errors"
 	"os"
 	"os/exec"
+	"runtime"
 	"strings"
 
 	"github.com/syncthing/syncthing/lib/fs"
@@ -30,6 +31,10 @@ type External struct {
 func NewExternal(folderID string, filesystem fs.Filesystem, params map[string]string) Versioner {
 	command := params["command"]
 
+	if runtime.GOOS == "windows" {
+		command = strings.Replace(command, `\`, `\\`, -1)
+	}
+
 	s := External{
 		command:    command,
 		filesystem: filesystem,

man/stdiscosrv.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "STDISCOSRV" "1" "Jan 15, 2018" "v0.14" "Syncthing"
+.TH "STDISCOSRV" "1" "Feb 11, 2018" "v0.14" "Syncthing"
 .SH NAME
 stdiscosrv \- Syncthing Discovery Server
 .
@@ -374,6 +374,6 @@ Server and Syncthing using Nginx, \fI\%Let’s Encrypt\fP <\fBhttps://letsencryp
 .SH AUTHOR
 The Syncthing Authors
 .SH COPYRIGHT
-2015, The Syncthing Authors
+2014-2018, The Syncthing Authors
 .\" Generated by docutils manpage writer.
 .

man/strelaysrv.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "STRELAYSRV" "1" "Jan 15, 2018" "v0.14" "Syncthing"
+.TH "STRELAYSRV" "1" "Feb 11, 2018" "v0.14" "Syncthing"
 .SH NAME
 strelaysrv \- Syncthing Relay Server
 .
@@ -271,6 +271,6 @@ Please consult Linux distribution documentation to persist firewall rules.
 .SH AUTHOR
 The Syncthing Authors
 .SH COPYRIGHT
-2015, The Syncthing Authors
+2014-2018, The Syncthing Authors
 .\" Generated by docutils manpage writer.
 .

man/syncthing-bep.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-BEP" "7" "Jan 15, 2018" "v0.14" "Syncthing"
+.TH "SYNCTHING-BEP" "7" "Feb 11, 2018" "v0.14" "Syncthing"
 .SH NAME
 syncthing-bep \- Block Exchange Protocol v1
 .
@@ -285,6 +285,7 @@ message Folder {
     bool   ignore_permissions   = 4;
     bool   ignore_delete        = 5;
     bool   disable_temp_indexes = 6;
+    bool   paused               = 7;
 
     repeated Device devices = 16;
 }
@@ -335,6 +336,8 @@ The \fBdisable temp indexes\fP field is set for folders that will not dispatch
 and do not wish to receive progress updates about partially downloaded files
 via Download Progress messages.
 .sp
+The \fBpaused\fP field is set for folders that are currently paused.
+.sp
 The \fBdevices\fP field is a list of devices participating in sharing this
 folder.
 .SS Fields (Device Message)
@@ -433,9 +436,10 @@ enum FileInfoType {
 }
 
 message BlockInfo {
-    int64 offset = 1;
-    int32 size   = 2;
-    bytes hash   = 3;
+    int64 offset     = 1;
+    int32 size       = 2;
+    bytes hash       = 3;
+    uint32 weak_hash = 4;
 }
 
 message Vector {
@@ -1055,6 +1059,6 @@ _
 .SH AUTHOR
 The Syncthing Authors
 .SH COPYRIGHT
-2015, The Syncthing Authors
+2014-2018, The Syncthing Authors
 .\" Generated by docutils manpage writer.
 .

man/syncthing-config.5

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-CONFIG" "5" "Jan 15, 2018" "v0.14" "Syncthing"
+.TH "SYNCTHING-CONFIG" "5" "Feb 11, 2018" "v0.14" "Syncthing"
 .SH NAME
 syncthing-config \- Syncthing Configuration
 .
@@ -874,6 +874,6 @@ send\-only mode for just the configuration folder.
 .SH AUTHOR
 The Syncthing Authors
 .SH COPYRIGHT
-2015, The Syncthing Authors
+2014-2018, The Syncthing Authors
 .\" Generated by docutils manpage writer.
 .

man/syncthing-device-ids.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-DEVICE-IDS" "7" "Jan 15, 2018" "v0.14" "Syncthing"
+.TH "SYNCTHING-DEVICE-IDS" "7" "Feb 11, 2018" "v0.14" "Syncthing"
 .SH NAME
 syncthing-device-ids \- Understanding Device IDs
 .
@@ -30,7 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.SH DESCRIPTION
 .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
@@ -235,32 +234,9 @@ As far as I know, these are the issues or potential issues with the
 above mechanism.
 .SS Discovery Spoofing
 .sp
-Currently, neither the local nor global discovery mechanism is protected
-by crypto. This means that any device can in theory announce itself for
-any device ID and potentially receive connections for that device.
-.sp
-This could be a denial of service attack (we can’t find the real device
-for a given device ID, so can’t 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:
-.INDENT 0.0
-.IP \(bu 2
-Announcements could be signed by the device private key. This
-requires already having the public key to verify.
-.IP \(bu 2
-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 the device to tell the truth.
-.IP \(bu 2
-The user could statically configure IP or host name for the devices.
-.IP \(bu 2
-The user could run a trusted global server.
-.UNINDENT
-.sp
-It’s something we might want to look at at some point, but not a huge
-problem as I see it.
+Currently, the local discovery mechanism isn’t protected by crypto. This
+means that any device can in theory announce itself for any device ID and
+potentially receive connections for that device from the local network.
 .SS Long Device IDs are Painful
 .sp
 It’s a mouthful to read over the phone, annoying to type into an SMS or even
@@ -284,6 +260,6 @@ accepting the connection.
 .SH AUTHOR
 The Syncthing Authors
 .SH COPYRIGHT
-2015, The Syncthing Authors
+2014-2018, The Syncthing Authors
 .\" Generated by docutils manpage writer.
 .

man/syncthing-event-api.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-EVENT-API" "7" "Jan 15, 2018" "v0.14" "Syncthing"
+.TH "SYNCTHING-EVENT-API" "7" "Feb 11, 2018" "v0.14" "Syncthing"
 .SH NAME
 syncthing-event-api \- Event API
 .
@@ -33,34 +33,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .SH DESCRIPTION
 .sp
 Syncthing provides a simple long polling interface for exposing events from the
-core utility towards a GUI.
-.sp
-To receive events, perform a HTTP GET of \fB/rest/events\fP or
-\fB/rest/events/disk\fP\&. The latter returns only local\-change\-detected and
-remote\-change\-detected events, the former all other events unless filtered.
-.sp
-To filter the event list, in effect creating a specific subscription for
-only the desired event types, add a parameter
-\fBevents=EventTypeA,EventTypeB,...\fP where the event types are any from the
-list below.
-.sp
-The optional parameter \fBsince=<lastSeenID>\fP sets the ID of the last event
-you’ve already seen. Syncthing returns a JSON encoded array of event objects,
-starting at the event just after the one with this last seen ID. The default
-value is 0, which returns all events. There is a limit to the number of events
-buffered, so if the rate of events is high or the time between polling calls is
-long some events might be missed. This can be detected by noting a discontinuity
-in the event IDs.
-.sp
-If no new events are produced since \fB<lastSeenID>\fP, the HTTP call blocks and
-waits for new events to happen before returning. By default it times out after
-60 seconds returning an empty array. The time out duration can be customized
-with the optional parameter \fBtimeout=seconds\fP\&.
-.sp
-To receive only a limited number of events, add the \fBlimit=n\fP parameter with a
-suitable value for \fBn\fP and only the \fIlast\fP \fBn\fP events will be returned. This
-can be used to catch up with the latest event ID after a disconnection for
-example: \fB/rest/events?since=0&limit=1\fP\&.
+core utility towards a GUI. To receive events, see events\-get\&.
 .SH EVENT STRUCTURE
 .sp
 Each event is represented by an object similar to the following:
@@ -883,6 +856,6 @@ seconds and is now in state \fBidle\fP\&.
 .SH AUTHOR
 The Syncthing Authors
 .SH COPYRIGHT
-2015, The Syncthing Authors
+2014-2018, The Syncthing Authors
 .\" Generated by docutils manpage writer.
 .