readme: Formatting

GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4578

.mailmap

@@ -1 +0,0 @@
-NICKS

AUTHORS

@@ -3,7 +3,9 @@
 #
 #    Name Name Name (nickname) <email1@example.com> <email2@example.com>
 #
-# The NICKS list is auto generated from this file.
+# After changing this list, run "go run script/authors.go" to sort and update
+# the GUI HTML.
+#
 
 Aaron Bieber (qbit) <qbit@deftly.net>
 Adam Piggott (ProactiveServices) <aD@simplypeachy.co.uk> <simplypeachy@users.noreply.github.com> <ProactiveServices@users.noreply.github.com>
@@ -41,6 +43,7 @@ Darshil Chanpura (dtchanpura) <dtchanpura@gmail.com> <dcprime314@gmail.com>
 David Rimmer (dinosore) <dinosore@dbrsoftware.co.uk>
 Denis A. (dva) <denisva@gmail.com>
 Dennis Wilson (snnd) <dw@risu.io>
+Dmitry Saveliev (dsaveliev) <d.e.saveliev@gmail.com>
 Dominik Heidler (asdil12) <dominik@heidler.eu>
 Elias Jarlebring (jarlebring) <jarlebring@gmail.com>
 Emil Hessman (ceh) <emil@hessman.se>
@@ -89,6 +92,7 @@ Michael Tilli (pyfisch) <pyfisch@gmail.com>
 Nate Morrison (nrm21) <natemorrison@gmail.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>
 Peter Hoeg (peterhoeg) <peter@speartail.com>
 Philippe Schommers (filoozoom) <philippe@schommers.be>
 Phill Luby (pluby) <phill.luby@newredo.com>

NICKS

@@ -1,151 +0,0 @@
-# This file maps email addresses used in commits to nicks used the changelog.
-# It is auto generated from the AUTHORS file by script/authors.go.
-
-0x010C <antoine.lamielle@0x010c.fr>
-0x010C <gh@0x010c.fr>
-acogdev <jake@acogdev.com>
-adelq <aqalieh95@gmail.com>
-adelq <adelq@users.noreply.github.com>
-alessandro.g89 <alessandro.g89@gmail.com>
-alex2108 <register-github@alex-graf.de>
-andersonvom <andersonvom@gmail.com>
-andrew-d <andrew@du.nham.ca>
-asdil12 <dominik@heidler.eu>
-AudriusButkevicius <audrius.butkevicius@gmail.com>
-aviau <alexandre@alexandreviau.net>
-aviau <aviau@debian.org>
-bencurthoys <ben@bencurthoys.com>
-benshep <bjashepherd@gmail.com>
-bigbear2nd <bigbear2nd@gmail.com>
-brbecker <brbecker@gmail.com>
-brendanlong <self@brendanlong.com>
-brgmnn <dan.arne.bergmann@gmail.com>
-brgmnn <brgmnn@users.noreply.github.com>
-bsidhom <bsidhom@gmail.com>
-buinsky <vix_booja@tut.by>
-burkemw3 <mburke@amplify.com>
-burkemw3 <burkemw3@gmail.com>
-calmh <jakob@nym.se>
-calmh <jakob@kastelo.net>
-canton7 <antony.male@gmail.com>
-Cathryne <cathryne.linenweaver@gmail.com>
-Cathryne <Cathryne@users.noreply.github.com>
-cdata <chris@scriptolo.gy>
-cdhowie <me@chrishowie.com>
-ceh <emil@hessman.se>
-cqcallaw <enlightened.despot@gmail.com>
-damajor <damajor@gmail.com>
-dinosore <dinosore@dbrsoftware.co.uk>
-dtchanpura <dtchanpura@gmail.com>
-dtchanpura <dcprime314@gmail.com>
-dva <denisva@gmail.com>
-dzarda <dzardacz@gmail.com>
-eipiminus1 <eipiminusone+github@gmail.com>
-eipiminus1 <eipiminus1@users.noreply.github.com>
-elopio <yo@elopio.net>
-facastagnini <federico.castagnini@gmail.com>
-filoozoom <philippe@schommers.be>
-frioux <frew@afoolishmanifesto.com>
-frioux <frioux@gmail.com>
-fti7 <frank@isemann.name>
-gillisig <gilli@vx.is>
-hadogenes <szafar@linux.pl>
-imsodin <freisim93@gmail.com>
-ironmig <kma1660@gmail.com>
-jarlebring <jarlebring@gmail.com>
-jayachithra <s.k.jayachithra@gmail.com>
-jedie <github.com@jensdiemer.de>
-jedie <git@jensdiemer.de>
-jgke <jgke@jgke.fi>
-jmdaweb <jmdaweb@hotmail.com>
-jmdaweb <jmdaweb@users.noreply.github.com>
-jpjp <jamespatterson@operamail.com>
-jpjp <jpjp@users.noreply.github.com>
-kamadak <kamada@nanohz.org>
-KayoticSully <kayoticsully@gmail.com>
-kc1212 <kc04bc@gmx.com>
-kc1212 <kc1212@users.noreply.github.com>
-kilburn <kilburn@la3.org>
-kluppy <kluppy@going2blue.com>
-kozec <kozec@kozec.com>
-kralo <max.schulze@online.de>
-kralo <kralo@users.noreply.github.com>
-krozycki <rozycki.karol@gmail.com>
-Kudalufi <kurt@va1der.ca>
-Kudalufi <kurt.fitzner@gmail.com>
-kwhite17 <kevinwhite1710@gmail.com>
-letiemble <laurent.etiemble@gmail.com>
-letiemble <laurent.etiemble@monobjc.net>
-liusy182 <liusy182@gmail.com>
-liusy182 <liusy182@hotmail.com>
-lkwg82 <lkwg82@gmx.de>
-LordLandon <lordlandon@gmail.com>
-majedev <majed.alhajry@gmail.com>
-marcindziadus <dziadus.marcin@gmail.com>
-marclaporte <marc@marclaporte.com>
-marclaporte <marc@laporte.name>
-mateon1 <matin1111@wp.pl>
-mogwa1 <devriesb@gmail.com>
-moshen <moshen.colin@gmail.com>
-Moter8 <moter8@gmail.com>
-mpx <mark@kyne.com.au>
-mvdan <mvdan@mvdan.cc>
-nelsonkhan <nelsonkhan@gmail.com>
-Niller303 <nielsproest@hotmail.com>
-Niller303 <seje.niels@hotmail.com>
-norgeous <daniel@harte.me>
-norgeous <daniel@danielharte.co.uk>
-norgeous <norgeous@users.noreply.github.com>
-nov1n <robert@carosi.nl>
-nrm21 <natemorrison@gmail.com>
-Nutomic <me@nutomic.com>
-pascalj <github@pascalj.com>
-pascalj <mail@pascal-jungblut.com>
-peterhoeg <peter@speartail.com>
-philips <brandon@ifup.org>
-piobpl <piotrb10@gmail.com>
-plouj <ploujj@gmail.com>
-pluby <phill.luby@newredo.com>
-ProactiveServices <aD@simplypeachy.co.uk>
-ProactiveServices <simplypeachy@users.noreply.github.com>
-ProactiveServices <ProactiveServices@users.noreply.github.com>
-pyfisch <pyfisch@gmail.com>
-qbit <qbit@deftly.net>
-ralder <ralder@yandex.ru>
-rasa <ross@smithii.com>
-Rewt0r <rewt0r@gmx.com>
-Rewt0r <Rewt0r@users.noreply.github.com>
-rumpelsepp <stefan@sevenbyte.org>
-rumpelsepp <rumpelsepp@sevenbyte.org>
-sacheendra <sacheendra.t@gmail.com>
-scienmind <scintertech@cryptolab.net>
-sciurius <jvromans@squirrel.nl>
-seehuhn <voss@seehuhn.de>
-Smiley73 <heiko@zuerker.org>
-snnd <dw@risu.io>
-snugghash <suhas.gundimeda@gmail.com>
-snugghash <snugghash@gmail.com>
-Stefan-Code <stefan.github@gmail.com>
-Stefan-Code <Stefan.github@gmail.com>
-timabell <tim@timwise.co.uk>
-timhowes <timhowes@berkeley.edu>
-tnn2 <tnn@nygren.pp.se>
-tobiastom <t.tom@succont.de>
-tojrobinson <tully@tojr.org>
-tpng <benny.tpng@gmail.com>
-tylerbrazier <tyler@tylerbrazier.com>
-Unrud <unrud@openaliasbox.org>
-Unrud <Unrud@users.noreply.github.com>
-uok <ueomkail@gmail.com>
-uok <uok@users.noreply.github.com>
-veeti <veeti.paananen@rojekti.fi>
-Vilbrekin <vilbrekin@gmail.com>
-wkennington <william@wkennington.com>
-WSGCSysadmin <e.meitner@willystreet.coop>
-wweich <wweich@users.noreply.github.com>
-wweich <wweich@gmx.de>
-wweich <wulf@weich-kr.de>
-xduugu <cedric@gmx.ca>
-zaynetro <romanznet@gmail.com>
-Zillode <zillode@zillode.be>
-zukoo <fxgsell@gmail.com>

README.md

@@ -20,36 +20,36 @@ commentary, see the full [Goals document][13].
 
 Syncthing should be:
 
-1. Safe From Data Loss
+1. **Safe From Data Loss**
 
    Protecting the user's data is paramount. We take every reasonable
    precaution to avoid corrupting the user's files.
 
-2. Secure Against Attackers
+2. **Secure Against Attackers**
 
    Again, protecting the user's data is paramount. Regardless of our other
    goals we must never allow the user's data to be susceptible to
    eavesdropping or modification by unauthorized parties.
 
-3. Easy to Use
+3. **Easy to Use**
 
    Syncthing should be approachable, understandable and inclusive.
 
-4. Automatic
+4. **Automatic**
 
    User interaction should be required only when absolutely necessary.
 
-5. Universally Available
+5. **Universally Available**
 
    Syncthing should run on every common computer. We are mindful that the
    latest technology is not always available to any given individual.
 
-6. For Individuals
+6. **For Individuals**
 
    Syncthing is primarily about empowering the individual user with safe,
    secure and easy to use file synchronization.
 
-7. Everything Else
+7. **Everything Else**
 
    There are many things we care about that don't make it on to the list. It
    is fine to optimize for these values, as long as they are not in conflict

cmd/syncthing/gui.go

@@ -112,12 +112,12 @@ type configIntf interface {
 	GUI() config.GUIConfiguration
 	RawCopy() config.Configuration
 	Options() config.OptionsConfiguration
-	Replace(cfg config.Configuration) error
+	Replace(cfg config.Configuration) (config.Waiter, error)
 	Subscribe(c config.Committer)
 	Folders() map[string]config.FolderConfiguration
 	Devices() map[protocol.DeviceID]config.DeviceConfiguration
-	SetDevice(config.DeviceConfiguration) error
-	SetDevices([]config.DeviceConfiguration) error
+	SetDevice(config.DeviceConfiguration) (config.Waiter, error)
+	SetDevices([]config.DeviceConfiguration) (config.Waiter, error)
 	Save() error
 	ListenAddresses() []string
 	RequiresRestart() bool
@@ -809,7 +809,7 @@ func (s *apiService) postSystemConfig(w http.ResponseWriter, r *http.Request) {
 
 	// Activate and save
 
-	if err := s.cfg.Replace(to); err != nil {
+	if _, err := s.cfg.Replace(to); err != nil {
 		l.Warnln("Replacing config:", err)
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
@@ -1201,7 +1201,7 @@ func (s *apiService) makeDevicePauseHandler(paused bool) http.HandlerFunc {
 			cfgs = append(cfgs, cfg)
 		}
 
-		if err := s.cfg.SetDevices(cfgs); err != nil {
+		if _, err := s.cfg.SetDevices(cfgs); err != nil {
 			http.Error(w, err.Error(), 500)
 		}
 	}

cmd/syncthing/main.go

@@ -1080,14 +1080,7 @@ func defaultConfig(cfgFile string) *config.Wrapper {
 
 	if !noDefaultFolder {
 		l.Infoln("Default folder created and/or linked to new config")
-		defaultFolder = config.NewFolderConfiguration("default", fs.FilesystemTypeBasic, locations[locDefFolder])
-		defaultFolder.Label = "Default Folder"
-		defaultFolder.RescanIntervalS = 60
-		defaultFolder.FSWatcherDelayS = 10
-		defaultFolder.MinDiskFree = config.Size{Value: 1, Unit: "%"}
-		defaultFolder.Devices = []config.FolderDeviceConfiguration{{DeviceID: myID}}
-		defaultFolder.AutoNormalize = true
-		defaultFolder.MaxConflicts = -1
+		defaultFolder = config.NewFolderConfiguration(myID, "default", "Default Folder", fs.FilesystemTypeBasic, locations[locDefFolder])
 	} else {
 		l.Infoln("We will skip creation of a default folder on first start since the proper envvar is set")
 	}
@@ -1331,7 +1324,7 @@ func setPauseState(cfg *config.Wrapper, paused bool) {
 	for i := range raw.Folders {
 		raw.Folders[i].Paused = paused
 	}
-	if err := cfg.Replace(raw); err != nil {
+	if _, err := cfg.Replace(raw); err != nil {
 		l.Fatalln("Cannot adjust paused state:", err)
 	}
 }

cmd/syncthing/mocked_config_test.go

@@ -34,8 +34,8 @@ func (c *mockedConfig) Options() config.OptionsConfiguration {
 	return config.OptionsConfiguration{}
 }
 
-func (c *mockedConfig) Replace(cfg config.Configuration) error {
-	return nil
+func (c *mockedConfig) Replace(cfg config.Configuration) (config.Waiter, error) {
+	return nil, nil
 }
 
 func (c *mockedConfig) Subscribe(cm config.Committer) {}
@@ -48,12 +48,12 @@ func (c *mockedConfig) Devices() map[protocol.DeviceID]config.DeviceConfiguratio
 	return nil
 }
 
-func (c *mockedConfig) SetDevice(config.DeviceConfiguration) error {
-	return nil
+func (c *mockedConfig) SetDevice(config.DeviceConfiguration) (config.Waiter, error) {
+	return nil, nil
 }
 
-func (c *mockedConfig) SetDevices([]config.DeviceConfiguration) error {
-	return nil
+func (c *mockedConfig) SetDevices([]config.DeviceConfiguration) (config.Waiter, error) {
+	return nil, nil
 }
 
 func (c *mockedConfig) Save() error {

gui/default/assets/css/overrides.css

@@ -367,3 +367,7 @@ ul.three-columns li, ul.two-columns li {
          width: 100%;
     }
 }
+
+.tab-content {
+    padding-top: 10px;
+}

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

@@ -26,6 +26,8 @@
     "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%}?": "Сигурни ли сте, че искате да премахнете устройство {{name}}?",
+    "Are you sure you want to remove folder {%label%}?": "Сигурни ли сте, че искате да премахнете папка {{label}}?",
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "Автоматичното обновяване вече предлага избор между стабилни версии и кандидат версии.",
     "Automatic upgrades": "Автоматично обновяване",
     "Be careful!": "Внимание!",
@@ -139,6 +141,7 @@
     "Newest First": "Първо най-новите",
     "No": "Не",
     "No File Versioning": "Без версии",
+    "No files will be deleted as a result of this operation.": "Няма да бъдат изтрити файлове като резултат от тази операция.",
     "No upgrades": "Няма обновления",
     "Normal": "Нормален",
     "Notice": "Известие",
@@ -174,6 +177,8 @@
     "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Кандидат версиите съдържат най-новата функционалност и поправки. Те са близки до традиционните дву-седмични Synchthing обновления.",
     "Remote Devices": "Чужди устройства",
     "Remove": "Премахни",
+    "Remove Device": "Премахване на устройство",
+    "Remove Folder": "Премахване на папка",
     "Required identifier for the folder. Must be the same on all cluster devices.": "Задължителен идентификатор за тази папка. Трябва да бъде един и същ на всички устройства.",
     "Rescan": "Сканирай",
     "Rescan All": "Обнови всички",

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

@@ -26,6 +26,8 @@
     "Anonymous Usage Reporting": "Informe d'ús anònim",
     "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.": "Tots els dispositius configurats en un dispositiu presentador seràn afegits també a aquest dispositiu.",
+    "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}}?",
     "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",
     "Be careful!": "Tin precaució!",
@@ -139,6 +141,7 @@
     "Newest First": "El més nou primer",
     "No": "No",
     "No File Versioning": "Sense versionat de fitxer",
+    "No files will be deleted as a result of this operation.": "No files will be deleted as a result of this operation.",
     "No upgrades": "Sense actualitzacions",
     "Normal": "Normal",
     "Notice": "Avís",
@@ -174,6 +177,8 @@
     "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Les versions candidates (Release Candidates) contenen les darreres característiques i arreglos. Són paregudes a les versions tradicionals bi-semanals de Syncthing. ",
     "Remote Devices": "Dispositius Remots",
     "Remove": "Eliminar",
+    "Remove Device": "Remove Device",
+    "Remove Folder": "Remove Folder",
     "Required identifier for the folder. Must be the same on all cluster devices.": "Identificador necessari per la carpeta. Deu ser el mateix en tots els dispositius del cluster.",
     "Rescan": "Tornar a buscar",
     "Rescan All": "Tornar a buscar tot",

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

@@ -26,6 +26,8 @@
     "Anonymous Usage Reporting": "Anonymní hlášení o používání",
     "Anonymous usage report format has changed. Would you like to move to the new format?": "Formát anonymního hlášení o používání byl změněn. Chcete přejít na nový formát?",
     "Any devices configured on an introducer device will be added to this device as well.": "Jakékoliv přístroje nakonfigurované na zavaděči budou přidány také na tento přístroj.",
+    "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}}?",
     "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",
     "Be careful!": "Pozor!",
@@ -139,6 +141,7 @@
     "Newest First": "Od nejnovějšího",
     "No": "Ne",
     "No File Versioning": "Bez verzování souborů",
+    "No files will be deleted as a result of this operation.": "No files will be deleted as a result of this operation.",
     "No upgrades": "Žádné aktualizace",
     "Normal": "Normální",
     "Notice": "Oznámení",
@@ -174,6 +177,8 @@
     "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Kandidáti na vydání obsahují nejnovější změny a opravy. Podobají se tradičním dvoutýdenním vydáním Syncthing.",
     "Remote Devices": "Vzdálená zařízení",
     "Remove": "Odstranit",
+    "Remove Device": "Remove Device",
+    "Remove Folder": "Remove Folder",
     "Required identifier for the folder. Must be the same on all cluster devices.": "Požadovaný identifikátor adresáře. Musí být stejný na všech zařízeních.",
     "Rescan": "Opakovat skenování",
     "Rescan All": "Opakovat skenování všech",

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

@@ -26,6 +26,8 @@
     "Anonymous Usage Reporting": "Anonym brugerstatistik",
     "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.": "Alle enheder som er konfigueret som en introducerende enhed, vil også blive tilføjet til denne enhed.",
+    "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}}?",
     "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",
     "Be careful!": "Vær forsigtig!",
@@ -139,6 +141,7 @@
     "Newest First": "Nyeste først",
     "No": "Nej",
     "No File Versioning": "Ingen filversion",
+    "No files will be deleted as a result of this operation.": "No files will be deleted as a result of this operation.",
     "No upgrades": "Ingen opgraderinger",
     "Normal": "Normal",
     "Notice": "OBS",
@@ -174,6 +177,8 @@
     "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Udgivelseskandidater indeholder alle de nyeste funktioner og rettelser. De er ens med de traditionelle 2 ugers Syncthing udgivelser.",
     "Remote Devices": "Fjernenheder ",
     "Remove": "Fjern",
+    "Remove Device": "Remove Device",
+    "Remove Folder": "Remove Folder",
     "Required identifier for the folder. Must be the same on all cluster devices.": "Nødvendig identifikation af mappen. Dette skal være det samme på alle enheder.",
     "Rescan": "Skan igen",
     "Rescan All": "Skan alt igen",

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

@@ -26,6 +26,8 @@
     "Anonymous Usage Reporting": "Anonymer Nutzungsbericht",
     "Anonymous usage report format has changed. Would you like to move to the new format?": "Das Format der anonymen Nutzungsberichte wurde geändert. Möchten Sie auf das neue Format umsteigen?",
     "Any devices configured on an introducer device will be added to this device as well.": "Alle Geräte, die beim Verteilergerät eingetragen sind, werden auch bei diesem Gerät hinzugefügt.",
+    "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}}?",
     "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 Updates aktivieren",
     "Be careful!": "Vorsicht!",
@@ -139,6 +141,7 @@
     "Newest First": "Neueste zuerst",
     "No": "Nein",
     "No File Versioning": "Keine Dateiversionierung",
+    "No files will be deleted as a result of this operation.": "No files will be deleted as a result of this operation.",
     "No upgrades": "Keine Updates",
     "Normal": "Normal",
     "Notice": "Hinweis",
@@ -174,6 +177,8 @@
     "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Veröffentlichungskandidaten enthalten die neuesten Funktionen und Verbesserungen. Sie gleichen den üblichen zweiwöchentlichen Syncthing-Veröffentlichungen.",
     "Remote Devices": "Fern-Geräte",
     "Remove": "Entfernen",
+    "Remove Device": "Remove Device",
+    "Remove Folder": "Remove Folder",
     "Required identifier for the folder. Must be the same on all cluster devices.": "Erforderlicher Bezeichner für den Ordner. Muss auf allen Verbund-Geräten gleich sein.",
     "Rescan": "Neu scannen",
     "Rescan All": "Alle neu scannen",
@@ -188,8 +193,8 @@
     "Scan Time Remaining": "Zeit für Scan verbleibend",
     "Scanning": "Scannen",
     "See external versioner help for supported templated command line parameters.": "Siehe externe Versionshilfe für unterstützte Befehlszeilenparameter.",
-    "See external versioning help for supported templated command line parameters.": "Siehe externe Versionshilfe für unterstützte Befehlszeilenparameter.",
-    "Select a version": "Version auswählen",
+    "See external versioning help for supported templated command line parameters.": "Siehe Hilfe zur externen Versionierung für unterstützte Befehlszeilenparameter.",
+    "Select a version": "Wähle eine Version",
     "Select the devices to share this folder with.": "Wähle die Geräte aus, mit denen Du diesen Ordner teilen willst.",
     "Select the folders to share with this device.": "Wähle die Ordner aus, die Du mit diesem Gerät teilen möchtest",
     "Send & Receive": "Senden & empfangen",

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

@@ -26,6 +26,8 @@
     "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%}?": "Σίγουρα επιθυμείτε να αφαιρέσετε τη συσκευή {{name}};",
+    "Are you sure you want to remove folder {%label%}?": "Σίγουρα επιθυμείτε να αφαιρέσετε τον φάκελο {{label}};",
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "Για τις αυτόματες αναβαθμίσεις μπορείτε πλέον να επιλέξετε μεταξύ σταθερών εκδόσεων και υποψήφιων εκδόσεων.",
     "Automatic upgrades": "Αυτόματη αναβάθμιση",
     "Be careful!": "Με προσοχή!",
@@ -139,6 +141,7 @@
     "Newest First": "Το νεότερο πρώτα",
     "No": "Όχι",
     "No File Versioning": "Να μην τηρούνται εκδόσεις",
+    "No files will be deleted as a result of this operation.": "Δεν πρόκειται να διαγραφούν αρχεία με αυτή την ενέργεια.",
     "No upgrades": "Απενεργοποιημένες",
     "Normal": "Κανονικός",
     "Notice": "Σημείωση",
@@ -174,6 +177,8 @@
     "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 Folder": "Αφαίρεση φακέλου",
     "Required identifier for the folder. Must be the same on all cluster devices.": "Απαραίτητο αναγνωριστικό για τον φάκελο. Πρέπει να είναι το ίδιο σε όλες τις συσκευές με τις οποίες διαμοιράζεται ο φάκελος αυτός.",
     "Rescan": "Έλεγξε για αλλαγές",
     "Rescan All": "Έλεγξέ τα όλα για αλλαγές",

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

@@ -26,6 +26,8 @@
     "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?",
     "Any devices configured on an introducer device will be added to this device as well.": "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}}?",
     "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",
     "Be careful!": "Be careful!",
@@ -139,6 +141,7 @@
     "Newest First": "Newest First",
     "No": "No",
     "No File Versioning": "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 upgrades": "No upgrades",
     "Normal": "Normal",
     "Notice": "Notice",
@@ -174,6 +177,8 @@
     "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 fortnightly Syncthing releases.",
     "Remote Devices": "Remote Devices",
     "Remove": "Remove",
+    "Remove Device": "Remove Device",
+    "Remove Folder": "Remove Folder",
     "Required identifier for the folder. Must be the same on all cluster devices.": "Required identifier for the folder. Must be the same on all cluster devices.",
     "Rescan": "Rescan",
     "Rescan All": "Rescan All",

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

@@ -26,8 +26,12 @@
    "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?",
    "Any devices configured on an introducer device will be added to this device as well.": "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}}?",
+   "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": "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.",
    "Be careful!": "Be careful!",
    "Bugs": "Bugs",
    "CPU Utilization": "CPU Utilization",
@@ -41,12 +45,14 @@
    "Configured": "Configured",
    "Connection Error": "Connection Error",
    "Connection Type": "Connection Type",
+   "Connections": "Connections",
    "Copied from elsewhere": "Copied from elsewhere",
    "Copied from original": "Copied from original",
    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 the following Contributors:",
    "Copyright © 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!": "Danger!",
+   "Default Folder Path": "Default Folder Path",
    "Deleted": "Deleted",
    "Device": "Device",
    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Device \"{{name}}\" ({{device}} at {{address}}) wants to connect. Add new device?",
@@ -99,6 +105,7 @@
    "GUI Listen Address": "GUI Listen Address",
    "GUI Listen Addresses": "GUI Listen Addresses",
    "GUI Theme": "GUI Theme",
+   "General": "General",
    "Generate": "Generate",
    "Global Changes": "Global Changes",
    "Global Discovery": "Global Discovery",
@@ -139,6 +146,7 @@
    "Newest First": "Newest First",
    "No": "No",
    "No File Versioning": "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 upgrades": "No upgrades",
    "Normal": "Normal",
    "Notice": "Notice",
@@ -153,6 +161,7 @@
    "Override Changes": "Override Changes",
    "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": "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 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).": "Path where versions should be stored (leave empty for the default .stversions folder in the folder).",
    "Pause": "Pause",
@@ -174,6 +183,8 @@
    "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": "Remote Devices",
    "Remove": "Remove",
+   "Remove Device": "Remove Device",
+   "Remove Folder": "Remove Folder",
    "Required identifier for the folder. Must be the same on all cluster devices.": "Required identifier for the folder. Must be the same on all cluster devices.",
    "Rescan": "Rescan",
    "Rescan All": "Rescan All",
@@ -259,6 +270,8 @@
    "Time": "Time",
    "Trash Can File Versioning": "Trash Can File Versioning",
    "Type": "Type",
+   "Unavailable": "Unavailable",
+   "Unavailable/Disabled by administrator or maintainer": "Unavailable/Disabled by administrator or maintainer",
    "Undecided (will prompt)": "Undecided (will prompt)",
    "Unknown": "Unknown",
    "Unshared": "Unshared",

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

@@ -26,6 +26,8 @@
     "Anonymous Usage Reporting": "Anonima Raporto de Uzado",
     "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.": "Ajna aparatoj agorditaj sur enkondukanto aparato estos ankaŭ aldonita al ĉi tiu aparato.",
+    "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}}?",
     "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",
     "Be careful!": "Atentu!",
@@ -139,6 +141,7 @@
     "Newest First": "Plejnova Unue",
     "No": "Ne",
     "No File Versioning": "Sen Dosiera Versionado",
+    "No files will be deleted as a result of this operation.": "No files will be deleted as a result of this operation.",
     "No upgrades": "Sen ĝisdatigoj",
     "Normal": "Normala",
     "Notice": "Avizo",
@@ -174,6 +177,8 @@
     "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Kandidataj eldonoj enhavas la lastajn trajtojn kaj korektojn. Ili estas similaj al la tradiciaj dusemajnaj Syncthing ĵetoj.",
     "Remote Devices": "Foraj Aparatoj",
     "Remove": "Forigu",
+    "Remove Device": "Remove Device",
+    "Remove Folder": "Remove Folder",
     "Required identifier for the folder. Must be the same on all cluster devices.": "Nepra identigilo por la dosierujo. Devas esti la sama en ĉiuj aparatoj de la grupo.",
     "Rescan": "Reskanu",
     "Rescan All": "Reskanu Ĉion",

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

@@ -26,6 +26,8 @@
     "Anonymous Usage Reporting": "Informe anónimo de uso",
     "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.": "Cualquier dispositivo configurado en un dispositivo de introducción será añadido también.",
+    "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}}?",
     "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",
     "Be careful!": "¡Ten cuidado!",
@@ -139,6 +141,7 @@
     "Newest First": "El más nuevo primero",
     "No": "No",
     "No File Versioning": "Sin versionado de fichero",
+    "No files will be deleted as a result of this operation.": "No files will be deleted as a result of this operation.",
     "No upgrades": "Sin actualizaciones",
     "Normal": "Normal",
     "Notice": "Aviso",
@@ -174,6 +177,8 @@
     "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Las versiones candidatas contienen las últimas funcionalidades y correcciones. Son similares a las tradicionales versiones bisemanales de Syncthing.",
     "Remote Devices": "Otros dispositivos",
     "Remove": "Eliminar",
+    "Remove Device": "Remove Device",
+    "Remove Folder": "Remove Folder",
     "Required identifier for the folder. Must be the same on all cluster devices.": "Identificador requerido para la carpeta. Debe ser el mismo en todos los dispositivos del clúster.",
     "Rescan": "Volver a analizar",
     "Rescan All": "Volver a analizar Todo",

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

@@ -26,6 +26,8 @@
     "Anonymous Usage Reporting": "Informe anónimo de uso",
     "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.": "Cualquier dispositivo configurado en un dispositivo de introducción será añadido también.",
+    "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}}?",
     "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",
     "Be careful!": "¡Ten cuidado!",
@@ -139,6 +141,7 @@
     "Newest First": "El más nuevo primero",
     "No": "No",
     "No File Versioning": "Sin versionado de fichero",
+    "No files will be deleted as a result of this operation.": "No files will be deleted as a result of this operation.",
     "No upgrades": "Sin actualizaciones",
     "Normal": "Normal",
     "Notice": "Aviso",
@@ -174,6 +177,8 @@
     "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Las versiones candidatas contienen las últimas funcionalidades y correcciones. Son similares a las tradicionales versiones bisemanales de Syncthing.",
     "Remote Devices": "Otros dispositivos",
     "Remove": "Eliminar",
+    "Remove Device": "Remove Device",
+    "Remove Folder": "Remove Folder",
     "Required identifier for the folder. Must be the same on all cluster devices.": "Identificador requerido para la carpeta. Debe ser el mismo en todos los dispositivos del clúster.",
     "Rescan": "Volver a analizar",
     "Rescan All": "Volver a analizar Todo",

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

@@ -26,6 +26,8 @@
     "Anonymous Usage Reporting": "Izenik gabeko erabiltze erreportak",
     "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.": "Sarrarazle deitzen duzun tresna batean gehitua izanen den edozein tresna, zurean ere gehitua izanen da.",
+    "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}}?",
     "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",
     "Be careful!": "Kasu emazu!",
@@ -139,6 +141,7 @@
     "Newest First": "Berrienak lehenik",
     "No": "Ez",
     "No File Versioning": "Fitxategi bersioen kontrolik ez",
+    "No files will be deleted as a result of this operation.": "No files will be deleted as a result of this operation.",
     "No upgrades": "Eguneratzerik ez",
     "Normal": "Normala",
     "Notice": "Jakinaraztea",
@@ -174,6 +177,8 @@
     "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Azken zuzenketak eta funtzionalitateak edukitzen dituzte aitzin-bertsioek. Bi hilabete guziz egiten diren eguneratzeen berdinak dira.",
     "Remote Devices": "Beste tresnak",
     "Remove": "Kendu",
+    "Remove Device": "Remove Device",
+    "Remove Folder": "Remove Folder",
     "Required identifier for the folder. Must be the same on all cluster devices.": "Partekatzearen erabilzaile izena. Dauden tresna guzietan berdin berdina izan behar du",
     "Rescan": "Berriz eskaneatu",
     "Rescan All": "Dena berriz eskaneatu",

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

@@ -26,6 +26,8 @@
     "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}}?",
     "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",
     "Be careful!": "Ole varovainen!",
@@ -139,6 +141,7 @@
     "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",
@@ -174,6 +177,8 @@
     "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",

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

@@ -26,6 +26,8 @@
     "Anonymous Usage Reporting": "Rapport anonyme de statistiques d'utilisation",
     "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.": "Lui permettre d'ajouter et enlever des membres à toutes mes listes de membres de partages dont il fait partie (ceci permet de créer 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).",
+    "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}}?",
     "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",
     "Be careful!": "Faites attention !",
@@ -139,6 +141,7 @@
     "Newest First": "Les plus récents en premier",
     "No": "Non",
     "No File Versioning": "Pas de préservation",
+    "No files will be deleted as a result of this operation.": "No files will be deleted as a result of this operation.",
     "No upgrades": "Pas de mises à jour",
     "Normal": "Normal",
     "Notice": "Notification",
@@ -174,6 +177,8 @@
     "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": "Enlever",
+    "Remove Device": "Remove Device",
+    "Remove Folder": "Remove Folder",
     "Required identifier for the folder. Must be the same on all cluster devices.": "Identifiant du partage. Doit être le même sur tous les appareils concernés.",
     "Rescan": "Réanalyser",
     "Rescan All": "Tout réanalyser",

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

@@ -26,6 +26,8 @@
     "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 ?",
     "Any devices configured on an introducer device will be added to this device as well.": "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 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).",
+    "Are you sure you want to remove device {%name%}?": "Êtes-vous sûr de vouloir enlever l'appareil {{name}} ?",
+    "Are you sure you want to remove folder {%label%}?": "Êtes-vous sûr de vouloir enlever le partage {{label}} ?",
     "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",
     "Be careful!": "Faites attention !",
@@ -139,6 +141,7 @@
     "Newest First": "Les plus récents en premier",
     "No": "Non",
     "No File Versioning": "Pas de préservation",
+    "No files will be deleted as a result of this operation.": "Aucun fichier ne sera supprimé à la suite de cette opération.",
     "No upgrades": "Pas de mises à jour",
     "Normal": "Normal",
     "Notice": "Notification",
@@ -174,6 +177,8 @@
     "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 Device": "Enlever l'appareil",
+    "Remove Folder": "Enlever 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",
@@ -189,9 +194,9 @@
     "Scanning": "Analyse en cours",
     "See external versioner help for supported templated command line parameters.": "Voir l'aide sur la préservation externe des fichiers pour les paramètres supportés en lignes de commande dans les modèles.",
     "See external versioning help for supported templated command line parameters.": "Consulter l'aide à la gestion externe des versions pour voir les paramètres de ligne de commande supportés.",
-    "Select a version": "Sélectionnez une version",
+    "Select a version": "Choisissez une version",
     "Select the devices to share this folder with.": "Synchroniser avec :",
-    "Select the folders to share with this device.": "Sélectionner les partages auxquels cet appareil doit participer :",
+    "Select the folders to share with this device.": "Choisir les partages auxquels cet appareil doit participer :",
     "Send & Receive": "Envoi & réception",
     "Send Only": "Envoi (lecture seule)",
     "Settings": "Configuration",
@@ -259,7 +264,7 @@
     "Time": "Heure",
     "Trash Can File Versioning": "Style poubelle",
     "Type": "Type",
-    "Undecided (will prompt)": "Choix différé (Une question sera affichée)",
+    "Undecided (will prompt)": "Choix différé (Une question sera affichée plus tard)",
     "Unknown": "Inconnu",
     "Unshared": "Non partagé",
     "Unused": "Non utilisé",

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

@@ -26,6 +26,8 @@
     "Anonymous Usage Reporting": "Anonym brûkensrapportaazje",
     "Anonymous usage report format has changed. Would you like to move to the new format?": "It formaat fan de rapportaazje fan anonime gebrûksynformaasje is feroare. Wolle jo op dit nije formaat oerstappe?",
     "Any devices configured on an introducer device will be added to this device as well.": "Alle apparaten die op in 'yntrodusearjend apparaat' ynstelt binne, wurde ek op dit apparaat taheakke.",
+    "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}}?",
     "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",
     "Be careful!": "Tink derom!",
@@ -139,6 +141,7 @@
     "Newest First": "Nijste earst",
     "No": "Nee",
     "No File Versioning": "Gjin triemferzjebehear",
+    "No files will be deleted as a result of this operation.": "No files will be deleted as a result of this operation.",
     "No upgrades": "Gjin fernijings",
     "Normal": "Normaal",
     "Notice": "Notysje",
@@ -174,6 +177,8 @@
     "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Ferzje kandidaten hawwe de lêste mooglikheden en ferbetterings. Se binne allyksa de tradisjonele twa-wyklikse Syncthing ferzjes.",
     "Remote Devices": "Apparaten op Ofstân",
     "Remove": "Fuortsmite",
+    "Remove Device": "Remove Device",
+    "Remove Folder": "Remove Folder",
     "Required identifier for the folder. Must be the same on all cluster devices.": "Ferplicht ID foar de map. Moat op alle bondelapparaten itselde wêze.",
     "Rescan": "Sken opnij",
     "Rescan All": "Sken alles opnij",

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

@@ -26,6 +26,8 @@
     "Anonymous Usage Reporting": "Névtelen felhasználási adatok küldése",
     "Anonymous usage report format has changed. Would you like to move to the new format?": "A névtelen használati jelentés formátuma megváltozott. Szeretnél áttérni az új formátumra?",
     "Any devices configured on an introducer device will be added to this device as well.": "A bevezető eszközön beállított minden eszköz hozzá lesz adva ehhez az eszközhöz is.",
+    "Are you sure you want to remove device {%name%}?": "Biztos, hogy el akarod távolítani az eszközt: {{name}}?",
+    "Are you sure you want to remove folder {%label%}?": "Biztos, hogy el akarod távolítani a mappát: {{label}}?",
     "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",
     "Be careful!": "Óvatosan!",
@@ -139,6 +141,7 @@
     "Newest First": "Újabb először",
     "No": "Nem",
     "No File Versioning": "Nincs fájlverzió-követés",
+    "No files will be deleted as a result of this operation.": "A művelet eredményeként egyetlen fájl sem lesz törölve.",
     "No upgrades": "Nincsenek frissítések",
     "Normal": "Normál",
     "Notice": "Megjegyzés",
@@ -174,6 +177,8 @@
     "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Az előzetes kiadások tartalmazzák a legújabb fejlesztéseket és javításokat. Ezek hasonlóak a hagyományos, kétheti Syncthing kiadásokhoz.",
     "Remote Devices": "Távoli eszközök",
     "Remove": "Eltávolítás",
+    "Remove Device": "Eszköz eltávolítás",
+    "Remove Folder": "Mappa eltávolítás",
     "Required identifier for the folder. Must be the same on all cluster devices.": "A mappa szükséges azonosítója. Minden fürtözött eszközön azonosnak kell lennie.",
     "Rescan": "Átnézés",
     "Rescan All": "Összes átnézése",

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

@@ -26,6 +26,8 @@
     "Anonymous Usage Reporting": "Statistiche Anonime di Utilizzo",
     "Anonymous usage report format has changed. Would you like to move to the new format?": "Il formato delle statistiche anonime di utilizzo è cambiato. Vuoi passare al nuovo formato?",
     "Any devices configured on an introducer device will be added to this device as well.": "Qualsiasi dispositivo configurato in un introduttore verrà aggiunto anche a questo dispositivo.",
+    "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}}?",
     "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",
     "Be careful!": "Fai attenzione!",
@@ -139,6 +141,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 upgrades": "Senza aggiornamenti",
     "Normal": "Normale",
     "Notice": "Avviso",
@@ -174,6 +177,8 @@
     "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",
     "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",

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

@@ -21,11 +21,13 @@
     "Allow Anonymous Usage Reporting?": "匿名で使用状況をレポートすることを許可しますか？",
     "Allowed Networks": "許可されているネットワーク",
     "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 synced folder.": "外部コマンドにバージョンを管理させます。ここで指定するコマンドは、同期フォルダーからファイルを削除するものでなくてはなりません。",
     "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?",
+    "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}}?",
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "自動アップグレードは、安定版とリリース候補版のいずれかを選べるようになりました。",
     "Automatic upgrades": "自動アップグレード",
     "Be careful!": "注意！",
@@ -54,7 +56,7 @@
     "Device Identification": "デバイスID",
     "Device Name": "デバイス名",
     "Devices": "デバイス",
-    "Disabled": "Disabled",
+    "Disabled": "無効",
     "Disconnected": "切断中",
     "Discovered": "探索結果",
     "Discovery": "探索サーバー",
@@ -139,6 +141,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 upgrades": "アップグレードしない",
     "Normal": "通常",
     "Notice": "通知",
@@ -152,7 +155,7 @@
     "Outgoing Rate Limit (KiB/s)": "上り帯域制限 (KiB/s)",
     "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 to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "ローカルコンピュータ上のフォルダーパス。フォルダーが存在しない場合は作成されます。チルダ (~) で以下のフォルダーを短縮入力できます:",
     "Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).": "古いバージョンを保存するパス (空欄の場合、デフォルトで共有フォルダー内の .stversions ディレクトリ)",
     "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "古いバージョンを保存するパス (空欄の場合、デフォルトでフォルダー内の .stversions フォルダー)",
     "Pause": "一時停止",
@@ -174,6 +177,8 @@
     "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "リリース候補版には最新の機能と修正が含まれます。これは従来の隔週リリースに近いものです。",
     "Remote Devices": "接続先デバイス",
     "Remove": "除去",
+    "Remove Device": "Remove Device",
+    "Remove Folder": "Remove Folder",
     "Required identifier for the folder. Must be the same on all cluster devices.": "フォルダーの識別子で、必須です。このフォルダーを共有する全てのデバイス上で同一でなくてはなりません。",
     "Rescan": "再スキャン",
     "Rescan All": "すべて再スキャン",
@@ -188,8 +193,8 @@
     "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 a version",
+    "See external versioning help for supported templated command line parameters.": "使用可能なコマンドラインパラメータについてはヘルプの外部バージョン管理の項目を参照してください。",
+    "Select a version": "バージョンを選択してください",
     "Select the devices to share this folder with.": "このフォルダーを共有するデバイスを選択してください。",
     "Select the folders to share with this device.": "このデバイスと共有するフォルダーを選択してください。",
     "Send & Receive": "送受信",
@@ -203,7 +208,7 @@
     "Shared With": "共有中のデバイス",
     "Show ID": "IDを表示",
     "Show QR": "QRコードを表示",
-    "Show diff with previous version": "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.": "ステータス画面でデバイスIDの代わりに表示されます。他のデバイスに対してもデフォルトの名前として通知されます。",
     "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "ステータス画面でデバイスIDの代わりに表示されます。空欄にすると相手側デバイスが通知してきた名前で更新されます。",
     "Shutdown": "シャットダウン",
@@ -229,7 +234,7 @@
     "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthingが落ちているか、インターネット接続に問題があります。リトライ中です…",
     "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "リクエストの処理に問題があるようです。問題が継続する場合、ページを更新するかSyncthingを再起動してください。",
     "The Syncthing admin interface is configured to allow remote access without a password.": "Syncthingの管理画面が、パスワードなしで外部からアクセスできるように設定されています。",
-    "The aggregated statistics are publicly available at the URL below.": "集計結果は次のURLで公開されています。",
+    "The aggregated statistics are publicly available at the URL below.": "集計結果は以下のURLで公開されています。",
     "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "設定が保存されましたが、まだ有効になっていません。新しい設定を有効にするにはSyncthingを再起動してください。",
     "The device ID cannot be blank.": "デバイスIDを入力してください。",
     "The device ID to enter here can be found in the \"Actions > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "ここに入力するデバイスIDは、接続したい相手側デバイスの [メニュー]→[IDを表示] で確認できます。スペースとハイフンは入力しなくてもかまいません。",
@@ -259,7 +264,7 @@
     "Time": "日時",
     "Trash Can File Versioning": "ゴミ箱によるバージョン管理",
     "Type": "タイプ",
-    "Undecided (will prompt)": "Undecided (will prompt)",
+    "Undecided (will prompt)": "未決定(再確認する)",
     "Unknown": "不明",
     "Unshared": "非共有",
     "Unused": "未使用",

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

@@ -26,6 +26,8 @@
     "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}}?",
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "자동 업데이트를 이제 안정 버전과 출시 후보 사이에 선택 할 수 있게 됩니다.",
     "Automatic upgrades": "자동 업데이트",
     "Be careful!": "주의!",
@@ -139,6 +141,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 upgrades": "업데이트 안함",
     "Normal": "일반",
     "Notice": "공지",
@@ -174,6 +177,8 @@
     "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",
     "Required identifier for the folder. Must be the same on all cluster devices.": "폴더 식별자가 필요합니다. 모든 장치에서 동일해야 합니다.",
     "Rescan": "재탐색",
     "Rescan All": "전체 재탐색",

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

@@ -26,6 +26,8 @@
     "Anonymous Usage Reporting": "Anoniminė naudojimo ataskaita",
     "Anonymous usage report format has changed. Would you like to move to the new format?": "Anoniminės naudojimo ataskaitos formatas pasikeitė. Ar norėtumėte pereiti prie naujojo formato?",
     "Any devices configured on an introducer device will be added to this device as well.": "Visi supažindintojo įrenginiai bus pridėti prie jūsų įrenginių sąrašo.",
+    "Are you sure you want to remove device {%name%}?": "Ar tikrai norite pašalinti įrenginį {{name}}?",
+    "Are you sure you want to remove folder {%label%}?": "Ar tikrai norite pašalinti aplanką {{label}}?",
     "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",
     "Be careful!": "Būkite atsargūs!",
@@ -139,6 +141,7 @@
     "Newest First": "Naujausi pirmiau",
     "No": "Ne",
     "No File Versioning": "Nėra versijų valdymo",
+    "No files will be deleted as a result of this operation.": "Šios operacijos rezultate nebus pašalinti jokie failai.",
     "No upgrades": "Be atnaujinimų",
     "Normal": "Normalus",
     "Notice": "Įspėjimas",
@@ -174,6 +177,8 @@
     "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Kandidatinėse versijose yra naujausios ypatybės ir pataisymai. Šios versijos yra panašios į tradicines, du kartus per mėnesį išleidžiamas Syncthing versijas.",
     "Remote Devices": "Nuotoliniai įrenginiai",
     "Remove": "Pašalinti",
+    "Remove Device": "Šalinti įrenginį",
+    "Remove Folder": "Šalinti aplanką",
     "Required identifier for the folder. Must be the same on all cluster devices.": "Reikalaujamas aplanko identifikatorius. Privalo būti toks pats visuose įrenginiuose.",
     "Rescan": "Nuskaityti iš naujo",
     "Rescan All": "Nuskaityti visus aplankus",

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

@@ -26,6 +26,8 @@
     "Anonymous Usage Reporting": "Anonym innsamling av brukerdata",
     "Anonymous usage report format has changed. Would you like to move to the new format?": "Det anonyme bruksrapportformatet har endret seg. Ønsker du å gå over til det nye formatet?",
     "Any devices configured on an introducer device will be added to this device as well.": "Enheter satt opp på en introduksjonsenhet vil også bli lagt til denne enheten.",
+    "Are you sure you want to remove device {%name%}?": "Er du sikker på at du ønsker å fjerne enheten {{name}}?",
+    "Are you sure you want to remove folder {%label%}?": "Er du sikker på at du ønsker å fjerne mappen {{label}}?",
     "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",
     "Be careful!": "Vær forsiktig!",
@@ -139,6 +141,7 @@
     "Newest First": "Den nyeste først",
     "No": "Nei",
     "No File Versioning": "Ingen versjonskontroll",
+    "No files will be deleted as a result of this operation.": "Ingen filer vil bli slettet som følge av denne operasjonen.",
     "No upgrades": "Ingen oppgraderinger",
     "Normal": "Normal",
     "Notice": "Merknader",
@@ -174,6 +177,8 @@
     "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Utgivelseskandidater inneholder de seneste problemfiksene og funksjonene. De ligner på de tradisjonelle Syncthing-utgivelsene som kom hver andre uke.",
     "Remote Devices": "Andre enheter",
     "Remove": "Fjern",
+    "Remove Device": "Fjern enhet",
+    "Remove Folder": "Fjern mappe",
     "Required identifier for the folder. Must be the same on all cluster devices.": "Påkrevd identifikator for mappa. Denne må være lik på alle enheter i samme klynge.",
     "Rescan": "Gjennomsøk på nytt",
     "Rescan All": "Gjennomsøk alt på nytt",

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

@@ -26,6 +26,8 @@
     "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?",
     "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?",
     "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",
     "Be careful!": "Wees voorzichtig!",
@@ -139,6 +141,7 @@
     "Newest First": "Nieuwste eerst",
     "No": "Nee",
     "No File Versioning": "Geen versiebeheer",
+    "No files will be deleted as a result of this operation.": "Deze handeling zal geen bestanden verwijderen.",
     "No upgrades": "Geen upgrades",
     "Normal": "Normaal",
     "Notice": "Mededeling",
@@ -174,6 +177,8 @@
     "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Uitgavekandidaten bevatten de laatste nieuwe functionaliteit en oplossingen voor problemen. Ze lijken op de traditionele, tweemaal per week, Syncthing-uitgaven.",
     "Remote Devices": "Externe apparaten",
     "Remove": "Verwijderen",
+    "Remove Device": "Apparaat verwijderen",
+    "Remove Folder": "Map verwijderen",
     "Required identifier for the folder. Must be the same on all cluster devices.": "De identifier voor de map is verplicht. Dit moet hetzelfde zijn op alle apparaten in het cluster. ",
     "Rescan": "Opnieuw scannen",
     "Rescan All": "Scan alles opnieuw",

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

@@ -26,6 +26,8 @@
     "Anonymous Usage Reporting": "Anonymisert bruksrapportering",
     "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.": "Einingar konfigurert på ei introduksjonseining vil òg verta lagt til denne eininga.",
+    "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}}?",
     "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": "Automatiske oppdateringar",
     "Be careful!": "Ver varsam!",
@@ -139,6 +141,7 @@
     "Newest First": "Nyaste fyrst",
     "No": "Nei",
     "No File Versioning": "Inga filutgåvehandtering",
+    "No files will be deleted as a result of this operation.": "No files will be deleted as a result of this operation.",
     "No upgrades": "No upgrades",
     "Normal": "Normal",
     "Notice": "Merknad",
@@ -174,6 +177,8 @@
     "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": "Eksterne einingar",
     "Remove": "Fjern",
+    "Remove Device": "Remove Device",
+    "Remove Folder": "Remove Folder",
     "Required identifier for the folder. Must be the same on all cluster devices.": "Påkravd identifikator for katalogen. Denne må vera lik på alle einingane i same klynge.",
     "Rescan": "Skann På Ny",
     "Rescan All": "Skann alle på nytt",

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

@@ -26,6 +26,8 @@
     "Anonymous Usage Reporting": "Anonimowe statystyki użycia",
     "Anonymous usage report format has changed. Would you like to move to the new format?": "Format anonimowego raportu zużycia uległ zmianie.\nCzy chcesz przejść na nowy format?",
     "Any devices configured on an introducer device will be added to this device as well.": "Wszystkie urządzenia skonfigurowane na urządzeniu wprowadzającym zostaną dodane także do tego urządzenia.",
+    "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}}?",
     "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",
     "Be careful!": "Uważaj!",
@@ -139,6 +141,7 @@
     "Newest First": "Najnowsze na początku",
     "No": "Nie",
     "No File Versioning": "Bez wersjonowania pliku",
+    "No files will be deleted as a result of this operation.": "No files will be deleted as a result of this operation.",
     "No upgrades": "Brak aktualizacji",
     "Normal": "Zwykły",
     "Notice": "Wskazówka",
@@ -174,6 +177,8 @@
     "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Wydania kandydujące zawierają najnowsze funkcje oraz poprawki błędów. Są one podobne do tradycyjnych co dwutygodniowych wydań Syncthing.",
     "Remote Devices": "Urządzenia zdalne",
     "Remove": "Usuń",
+    "Remove Device": "Remove Device",
+    "Remove Folder": "Remove Folder",
     "Required identifier for the folder. Must be the same on all cluster devices.": "Wymagany identyfikator dla folderu. Musi być taki sam na wszystkich urządzeniach.",
     "Rescan": "Skanuj ponownie",
     "Rescan All": "Skanuj wszystko ponownie",

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

@@ -26,6 +26,8 @@
     "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}}?",
     "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",
     "Be careful!": "Tenha cuidado!",
@@ -139,6 +141,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 upgrades": "Sem atualizações",
     "Normal": "Normal",
     "Notice": "Aviso",
@@ -174,6 +177,8 @@
     "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 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",

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

@@ -26,6 +26,8 @@
     "Anonymous Usage Reporting": "Enviar relatórios anónimos de utilização",
     "Anonymous usage report format has changed. Would you like to move to the new format?": "O formato do relatório anónimo de utilização foi alterado. Gostaria de mudar para o novo formato?",
     "Any devices configured on an introducer device will be added to this device as well.": "Quaisquer dispositivos configurados num dispositivo apresentador serão também adicionados a este dispositivo.",
+    "Are you sure you want to remove device {%name%}?": "Tem a certeza que quer remover o dispositivo {{name}}?",
+    "Are you sure you want to remove folder {%label%}?": "Tem a certeza que quer remover a pasta {{label}}?",
     "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",
     "Be careful!": "Tenha cuidado!",
@@ -139,6 +141,7 @@
     "Newest First": "Primeiro os mais recentes",
     "No": "Não",
     "No File Versioning": "Nenhuma",
+    "No files will be deleted as a result of this operation.": "Nenhum ficheiro será eliminado como resultado desta operação.",
     "No upgrades": "Sem actualizações",
     "Normal": "Normal",
     "Notice": "Avisos",
@@ -174,6 +177,8 @@
     "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Versões candidatas a lançamento contêm as funcionalidades e as correcções mais recentes. São semelhantes aos tradicionais lançamentos bi-semanais do Syncthing.",
     "Remote Devices": "Dispositivos remotos",
     "Remove": "Remover",
+    "Remove Device": "Remover dispositivo",
+    "Remove Folder": "Remover pasta",
     "Required identifier for the folder. Must be the same on all cluster devices.": "Identificador obrigatório para a pasta. Tem que ser igual em todos os dispositivos do grupo.",
     "Rescan": "Verificar agora",
     "Rescan All": "Verificar todas agora",

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

@@ -26,6 +26,8 @@
     "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}}?",
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "Автоматическое обновление теперь предлагает выбор между стабильными выпусками и кандидатами в релизы.",
     "Automatic upgrades": "Автообновление",
     "Be careful!": "Будьте осторожны!",
@@ -54,7 +56,7 @@
     "Device Identification": "Идентификация устройства",
     "Device Name": "Имя устройства",
     "Devices": "Устройства",
-    "Disabled": "Disabled",
+    "Disabled": "Отключено",
     "Disconnected": "Нет соединения",
     "Discovered": "Обнаружено",
     "Discovery": "Обнаружение",
@@ -86,7 +88,7 @@
     "Files are moved to date stamped versions in a .stversions directory when replaced or deleted by Syncthing.": "Когда Syncthing изменяет или удаляет файлы, их версии с таймштампами помещаются в папку .stversions",
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Файлы с временнОй меткой версии помещаются в папку .stversions при их замене или удалении 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": "Filesystem Notifications",
+    "Filesystem Notifications": "Уведомления файловой системы",
     "Folder": "Папка",
     "Folder ID": "ID папки",
     "Folder Label": "Ярлык папки",
@@ -139,6 +141,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 upgrades": "Нет обновлений",
     "Normal": "Нормально",
     "Notice": "Внимание",
@@ -174,6 +177,8 @@
     "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",
     "Required identifier for the folder. Must be the same on all cluster devices.": "Обязательный идентификатор папки. Должен быть одним и тем же на всех устройствах кластера.",
     "Rescan": "Пересканировать",
     "Rescan All": "Пересканировать все",

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

@@ -26,6 +26,8 @@
     "Anonymous Usage Reporting": "Anonymné hlásenie o používaní",
     "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.": "Všetky zariadenia nakonfigurované na uvádzači budú tiež pridané na tomto zariadení.",
+    "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}}?",
     "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",
     "Be careful!": "Buď opatrný!",
@@ -139,6 +141,7 @@
     "Newest First": "Najnovší najprv",
     "No": "Nie",
     "No File Versioning": "Bez verzií súbor",
+    "No files will be deleted as a result of this operation.": "No files will be deleted as a result of this operation.",
     "No upgrades": "Bez aktualizácií",
     "Normal": "Normalny",
     "Notice": "Oznámenie",
@@ -174,6 +177,8 @@
     "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Kandidáti na vydanie obsahujú najnovšie vlastnosti a opravy. Sú podobné tradičným dvojtýždenným vydaniam programu Syncthing.",
     "Remote Devices": "Vzdialené zariadenia",
     "Remove": "Odstrániť",
+    "Remove Device": "Remove Device",
+    "Remove Folder": "Remove Folder",
     "Required identifier for the folder. Must be the same on all cluster devices.": "Potrebný identifikátor pre adresár. Musí byť rovnaký na všetkých zariadeniach v skupine.",
     "Rescan": "Opakovať skenovanie",
     "Rescan All": "Opakovať skenovanie všetkých",

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

@@ -26,6 +26,8 @@
     "Anonymous Usage Reporting": "Anonym användarstatistiksrapportering",
     "Anonymous usage report format has changed. Would you like to move to the new format?": "Anonymt användningsrapportformat har ändrats. Vill du flytta till det nya formatet?",
     "Any devices configured on an introducer device will be added to this device as well.": "Alla enheter konfigurerade på en introduktör enhet kommer också att läggas till den här enheten.",
+    "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}}?",
     "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",
     "Be careful!": "Var aktsam!",
@@ -124,8 +126,8 @@
     "Learn more": "Ta reda på mer",
     "Listeners": "Lyssnare",
     "Local Discovery": "Lokal annonsering",
-    "Local State": "Lokal tillstånd",
-    "Local State (Total)": "Lokal tillstånd (totalt)",
+    "Local State": "Lokalt tillstånd",
+    "Local State (Total)": "Lokalt tillstånd (totalt)",
     "Major Upgrade": "Större uppgradering",
     "Master": "Huvud",
     "Maximum Age": "Maximum ålder",
@@ -139,6 +141,7 @@
     "Newest First": "Nyast först",
     "No": "Nej",
     "No File Versioning": "Ingen filversionshantering",
+    "No files will be deleted as a result of this operation.": "Inga filer kommer att tas bort till följd av denna operation.",
     "No upgrades": "Inga uppgraderingar",
     "Normal": "Normal",
     "Notice": "Observera",
@@ -174,6 +177,8 @@
     "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Utgåvskandidater innehåller de senaste funktionerna och korrigeringarna. De är lika de traditionella Syncthing-utgåvorna som kommer ut varannan vecka.",
     "Remote Devices": "Fjärrenheter",
     "Remove": "Ta bort",
+    "Remove Device": "Ta bort enhet",
+    "Remove Folder": "Ta bort mapp",
     "Required identifier for the folder. Must be the same on all cluster devices.": "Krävs identifierare för mappen. Måste vara densamma på alla kluster enheter.",
     "Rescan": "Skanna om",
     "Rescan All": "Skanna om alla",

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

@@ -26,6 +26,8 @@
     "Anonymous Usage Reporting": "Anonim Kullanım Raporlaması",
     "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.": "Tanıtıcı bir cihaz üzerinde yapılandırılan cihazlar bu cihaza da eklenecektir.",
+    "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}}?",
     "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",
     "Be careful!": "Dikkatli ol!",
@@ -139,6 +141,7 @@
     "Newest First": "En yeni olan önce",
     "No": "Hayır",
     "No File Versioning": "Dosya Sürümleme İşlemi Yok",
+    "No files will be deleted as a result of this operation.": "No files will be deleted as a result of this operation.",
     "No upgrades": "Yükseltme yok",
     "Normal": "Olağan",
     "Notice": "Uyarı",
@@ -174,6 +177,8 @@
     "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Sürüm adayları en son özellikleri ve hata düzeltmelerini içerir. Bunlar, geleneksel olarak iki haftada bir yayımlanan Syncthing dağıtımlarına benzer.",
     "Remote Devices": "Uzak Aygıtlar",
     "Remove": "Kaldır",
+    "Remove Device": "Remove Device",
+    "Remove Folder": "Remove Folder",
     "Required identifier for the folder. Must be the same on all cluster devices.": "Klasör için tanımlayıcı gereklidir. Tüm küme cihazlarda aynı olmalıdır.",
     "Rescan": "Tekrar Tara",
     "Rescan All": "Tümünü Tekrar Tara",

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

@@ -26,6 +26,8 @@
     "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}}?",
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "Автоматиче оновлення зараз дозволяє обирати між стабільними випусками та реліз-кандидатами.",
     "Automatic upgrades": "Автоматичні оновлення",
     "Be careful!": "Будьте обережні!",
@@ -139,6 +141,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 upgrades": "Немає оновлень",
     "Normal": "Нормальний",
     "Notice": "Повідомлення",
@@ -174,6 +177,8 @@
     "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",
     "Required identifier for the folder. Must be the same on all cluster devices.": "Обов'язковий унікальний ідентифікатор директорії. Має бути однаковим на усіх пристроях кластеру.",
     "Rescan": "Пересканувати",
     "Rescan All": "Пересканувати усе",

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

@@ -1,296 +0,0 @@
-{
-    "A device with that ID is already added.": "Đã có một thiết bị trùng ID.",
-    "A negative number of days doesn't make sense.": "Số ngày không được âm.",
-    "A new major version may not be compatible with previous versions.": "Phiên bản quan trọng mới có thể sẽ không tương thích với các bản cũ.",
-    "API Key": "Khoá API",
-    "About": "Thông tin về",
-    "Action": "Action",
-    "Actions": "Thao tác",
-    "Add": "Thêm",
-    "Add Device": "Thêm thiết bị",
-    "Add Folder": "Thêm thư mục",
-    "Add Remote Device": "Thêm thiết bị từ xa",
-    "Add 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?": "Thêm thư mục mới?",
-    "Address": "Địa chỉ",
-    "Addresses": "Các địa chỉ",
-    "Advanced": "Nâng cao",
-    "Advanced Configuration": "Cấu hình nâng cao",
-    "Advanced settings": "Cài đặt nâng cao",
-    "All Data": "Tất cả dữ liệu",
-    "Allow Anonymous Usage Reporting?": "Cho phép báo cáo sử dụng ẩn danh?",
-    "Allowed Networks": "Allowed Networks",
-    "Alphabetic": "A-Z",
-    "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.": "Một lệnh ngoại vi chịu trách nhiệm phiên bản hoá. Nó sẽ xoá tập tin khỏi thư mục đã đồng bộ.",
-    "Anonymous Usage Reporting": "Báo cáo sử dụng ẩn danh",
-    "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.": "Bất kỳ thiết bị nào liên kết với thiết bị giới thiệu cũng sẽ được thêm vào.",
-    "Automatic 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": "Cập nhật tự động",
-    "Be careful!": "Cẩn thận!",
-    "Bugs": "Lỗi",
-    "CPU Utilization": "Mức s.dụng CPU",
-    "Changelog": "Lịch sử thay đổi",
-    "Clean out after": "Dọn dẹp sau",
-    "Click to see discovery failures": "Click to see discovery failures",
-    "Close": "Đóng",
-    "Command": "Lệnh",
-    "Comment, when used at the start of a line": "Bình luận, khi dùng trước đầu dòng",
-    "Compression": "Nén",
-    "Configured": "Configured",
-    "Connection Error": "Lỗi kết nối",
-    "Connection Type": "Connection Type",
-    "Copied from elsewhere": "Đã sao chép từ nơi khác",
-    "Copied from original": "Đã sao chép từ nguồn",
-    "Copyright © 2014-2016 the following Contributors:": "Bản quyền © 2014-2016 thuộc về các nhà cộng tác sau:",
-    "Copyright © 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!": "Nguy hiểm!",
-    "Deleted": "Đã xoá",
-    "Device": "Device",
-    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Thiết bị \"{{name}}\" ({{device}} tại {{address}}) muốn kết nối. Thêm thiết bị mới?",
-    "Device ID": "ID thiết bị",
-    "Device Identification": "Danh tính thiết bị",
-    "Device Name": "Tên thiết bị",
-    "Devices": "Các thiết bị",
-    "Disabled": "Disabled",
-    "Disconnected": "Đã ngắt kết nối",
-    "Discovered": "Discovered",
-    "Discovery": "Tìm thấy",
-    "Discovery Failures": "Discovery Failures",
-    "Documentation": "Tài liệu",
-    "Download Rate": "Tốc độ tải xuống",
-    "Downloaded": "Đã tải xuống",
-    "Downloading": "Đang tải xuống",
-    "Edit": "Chỉnh sửa",
-    "Edit Device": "Edit Device",
-    "Edit Folder": "Edit Folder",
-    "Editing": "Đang ch.sửa",
-    "Editing {%path%}.": "Editing {{path}}.",
-    "Enable NAT traversal": "Enable NAT traversal",
-    "Enable Relaying": "Bật chế độ ch.tiếp",
-    "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.": "Nhập các địa chỉ ngăn cách bởi dấu phẩy (\"tcp://ip:port\", \"tcp://host:port\") hoặc \"dynamic\" để tiến hành dò tìm địa chỉ tự động.",
-    "Enter ignore patterns, one per line.": "Nhập các quy luật bỏ qua, từng dòng một.",
-    "Error": "Lỗi",
-    "External File Versioning": "Kiểu ngoại vi",
-    "Failed Items": "Các n.dung bị lỗi",
-    "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": "Thứ tự pull tập tin",
-    "File Versioning": "Ph.bản hoá tập tin",
-    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Các ph.tử g.phép tập tin sẽ được bỏ qua khi t.kiếm th.đổi. Dùng trên h.thống tập tin FAT.",
-    "Files are moved to .stversions 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.": "Các t.tin sẽ được chuyển tới th.mục .stversions khi bị th.thế hoặc xoá bởi Syncthing.",
-    "Files are moved to date stamped versions in a .stversions 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.": "Các t.tin sẽ được chuyển tới các ph.bản được đ.dấu ng.tháng trong th.mục .stversions khi bị th.thế hoặc xoá bởi Syncthing.",
-    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Các t.tin được b.vệ khỏi những th.đổi trên các th.bị khác, nhưng những th.đổi trên th.bị này sẽ được chuyển tới các máy cụm còn lại.",
-    "Filesystem Notifications": "Filesystem Notifications",
-    "Folder": "Thư mục",
-    "Folder ID": "ID thư mục",
-    "Folder Label": "Nhãn thư mục",
-    "Folder Path": "Đ.dẫn đến th.mục",
-    "Folder Type": "Folder Type",
-    "Folders": "Các th.mục",
-    "GUI": "GUI",
-    "GUI Authentication Password": "Mật khẩu xác minh GUI",
-    "GUI Authentication User": "Người dùng xác minh GUI",
-    "GUI Listen Address": "GUI Listen Address",
-    "GUI Listen Addresses": "Các đ.chỉ lắng nghe GUI",
-    "GUI Theme": "GUI Theme",
-    "Generate": "Tạo mới",
-    "Global Changes": "Global Changes",
-    "Global Discovery": "Dò tìm toàn cầu",
-    "Global Discovery Servers": "Các m.chủ dò tìm toàn cầu",
-    "Global State": "Tr.thái toàn cầu",
-    "Help": "Trợ giúp",
-    "Home page": "Trang chủ",
-    "Ignore": "Bỏ qua",
-    "Ignore Patterns": "Bỏ qua các quy luật",
-    "Ignore Permissions": "Bỏ qua các giấy phép",
-    "Incoming Rate Limit (KiB/s)": "Giới hạn t.độ đầu vào (KiB/s)",
-    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Cấu hình không đúng có thể làm mất mát dữ liệu và khiến Syncthing ngừng hoạt động.",
-    "Introduced By": "Introduced By",
-    "Introducer": "Th.bị giới thiệu",
-    "Inversion of the given condition (i.e. do not exclude)": "Đảo ngược điều kiện cho trước (VD: không được loại trừ)",
-    "Keep Versions": "Giữ các ph.bản",
-    "Largest First": "Lớn nhất đầu tiên",
-    "Last File Received": "T.tin nhận được gần đây",
-    "Last Scan": "Last Scan",
-    "Last seen": "Thấy lần cuối",
-    "Later": "Để sau",
-    "Latest Change": "Latest Change",
-    "Learn more": "Learn more",
-    "Listeners": "Listeners",
-    "Local Discovery": "Dò tìm cục bộ",
-    "Local State": "Tr.thái cục bộ",
-    "Local State (Total)": "Tr.thái cục bộ (Tổng)",
-    "Major Upgrade": "Bản n.cấp q.trọng",
-    "Master": "Master",
-    "Maximum Age": "Thời hạn tối đa",
-    "Metadata Only": "Chỉ siêu dữ liệu",
-    "Minimum Free Disk Space": "Dung lượng đĩa trống tối thiểu",
-    "Move to top of queue": "Chuyển đến đầu hàng chờ",
-    "Multi level wildcard (matches multiple directory levels)": "Ký tự thay thế đa cấp (phù hợp với đa cấp độ thư mục)",
-    "Never": "Chưa từng",
-    "New Device": "Thiết bị mới",
-    "New Folder": "Thư mục mới",
-    "Newest First": "Mới nhất đầu tiên",
-    "No": "Không",
-    "No File Versioning": "Không dùng",
-    "No upgrades": "No upgrades",
-    "Normal": "Normal",
-    "Notice": "Chú ý",
-    "OK": "OK",
-    "Off": "Tắt",
-    "Oldest First": "Cũ nhất đầu tiên",
-    "Optional descriptive label for the folder. Can be different on each device.": "Nhãn mô tả tuỳ chọn cho thư mục. Có thể khác nhau trên từng thiết bị.",
-    "Options": "Tuỳ chọn",
-    "Out of Sync": "Mất đồng bộ",
-    "Out of Sync Items": "Các n.dung mất đ.bộ",
-    "Outgoing Rate Limit (KiB/s)": "Giới hạn t.độ đầu ra (KiB/s)",
-    "Override Changes": "Ghi đè các th.đổi",
-    "Path": "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": "Đường dẫn đến thư mục trên máy cục bộ. Sẽ tạo mới nếu chưa hiện hữu. Dấu ngã (~) có thể được dùng làm lối tắt cho",
-    "Path where versions should be stored (leave empty for the default .stversions 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).": "Đường dẫn nơi các phiên bản được lưu trữ (nếu để trống, thư mục mặc định sẽ là .stversions).",
-    "Pause": "Tạm dừng",
-    "Pause All": "Pause All",
-    "Paused": "Đã t.dừng",
-    "Please consult the release notes before performing a major upgrade.": "Hãy xem kỹ lịch sử phát hành trước khi tiến hành bản cập nhật q.trọng.",
-    "Please set a GUI Authentication User and Password in the Settings dialog.": "Hãy thiết lập tên ng.dùng và mật khẩu xác minh GUI trong hộp thoại Cài đặt.",
-    "Please wait": "Xin chờ",
-    "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": "Xem trước",
-    "Preview Usage Report": "Xem trước báo cáo s.dụng",
-    "Quick guide to supported patterns": "H.dẫn sơ lược về các q.luật được hỗ trợ",
-    "RAM Utilization": "Mức s.dụng RAM",
-    "Random": "Ngẫu nhiên",
-    "Recent Changes": "Recent Changes",
-    "Reduced by ignore patterns": "Reduced by ignore patterns",
-    "Release Notes": "Lịch sử phát hành",
-    "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": "Các thiết bị từ xa",
-    "Remove": "Xoá",
-    "Required identifier for the folder. Must be the same on all cluster devices.": "Tên tắt bắt buộc cho thư mục. Phải trùng khớp trên tất cả thiết bị trong cụm.",
-    "Rescan": "Quét lại",
-    "Rescan All": "Quét lại t.cả",
-    "Rescan Interval": "Kh.cách th.gian quét lại",
-    "Restart": "Kh.động lại",
-    "Restart Needed": "Cần kh.động lại",
-    "Restarting": "Đang kh.động lại",
-    "Resume": "Tiếp tục",
-    "Resume All": "Resume All",
-    "Reused": "Đã s.dụng lại",
-    "Save": "Lưu",
-    "Scan Time Remaining": "Thời gian quét còn lại",
-    "Scanning": "Đang quét",
-    "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 the devices to share this folder with.": "Chọn các thiết bị để chia sẻ thư mục này.",
-    "Select the folders to share with this device.": "Chọn các thư mục để chia sẻ với thiết bị này.",
-    "Send & Receive": "Send & Receive",
-    "Send Only": "Send Only",
-    "Settings": "Cài đặt",
-    "Share": "Chia sẻ",
-    "Share Folder": "Chia sẻ th.mục",
-    "Share Folders With Device": "Chia sẻ các th.mục với th.bị",
-    "Share With Devices": "Chia sẻ với các th.bị",
-    "Share this folder?": "Chia sẻ th.mục này?",
-    "Shared With": "Đã ch.sẻ với",
-    "Show ID": "Hiển thị ID",
-    "Show QR": "Hiển thị QR",
-    "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.": "Hiển thị thay cho ID th.bị trong trạng thái cụm. Sẽ được giới thiệu đến các th.bị khác như tên mặc định tuỳ chọn.",
-    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Hiển thị thay cho ID thiết bị trong trạng thái cụm. Nếu để trống sẽ được cập nhật thành tên mà thiết bị giới thiệu.",
-    "Shutdown": "Tắt",
-    "Shutdown Complete": "Tắt hoàn tất",
-    "Simple File Versioning": "Kiểu đơn giản",
-    "Single level wildcard (matches within a directory only)": "Ký tự thay thế đơn cấp (phù hợp với chỉ một thư mục)",
-    "Smallest First": "Nhỏ nhất đầu tiên",
-    "Source Code": "Mã nguồn",
-    "Stable releases and release candidates": "Stable releases and release candidates",
-    "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": "Stable releases only",
-    "Staggered File Versioning": "Theo thời gian",
-    "Start Browser": "Mở trình duyệt",
-    "Statistics": "Thống kê",
-    "Stopped": "Đã dừng",
-    "Support": "Hỗ trợ",
-    "Sync Protocol Listen Addresses": "Đồng bộ các đ.chỉ l.nghe giao thức",
-    "Syncing": "Đang đ.bộ",
-    "Syncthing has been shut down.": "Đã tắt Syncthing.",
-    "Syncthing includes the following software or portions thereof:": "Syncthing bao gồm các ph.mềm hoặc ph.tử của các ph.mềm sau:",
-    "Syncthing is restarting.": "Syncthing đang kh.động lại.",
-    "Syncthing is upgrading.": "Syncthing đang n.cấp.",
-    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Có vẻ như Syncthing đang bị nghẽn hoặc là mạng của bạn có vấn đề. Đang thử lại...",
-    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Có vẻ như Syncthing đang gặp phải v.đề khi x.lý yêu cầu của bạn. Xin làm mới trang hoặc kh.động lại Syncthing nếu v.đề vẫn còn tiếp diễn.",
-    "The Syncthing admin interface is configured to allow remote access without a password.": "Giao diện q.trị của Syncthing được c.hình nhằm cho phép tr.cập từ xa không cần mật khẩu.",
-    "The aggregated statistics are publicly available at the URL below.": "The aggregated statistics are publicly available at the URL below.",
-    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Cấu hình đã được lưu nhưng chưa được kích hoạt. Syncthing phải khởi động lại để kích hoạt cấu hình mới. ",
-    "The device ID cannot be blank.": "Không được để trống ID thiết bị.",
-    "The device ID to enter here can be found in the \"Actions > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "ID thiết bị cần nhập có thể được tìm thấy trong hộp thoại \"Thao tác > Hiển thị ID\" trên thiết bị kia. Khoảng trắng và gạch ngang là tuỳ chọn (bỏ qua).",
-    "The encrypted usage report is sent daily. It is used to track common platforms, folder sizes and app versions. If the reported data set is changed you will be prompted with this dialog again.": "Báo cáo s.dụng đã mã hoá sẽ được gửi đi hằng ngày. Nó được dùng để t.thập s.liệu về các HĐH phổ biến, kích cỡ th.mục và ph.bản ứng dụng. Nếu bộ d.liệu báo cáo có th.đổi, bạn sẽ được nhắc thông qua h.thoại này.",
-    "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.": "ID thiết bị đã nhập không hợp lệ. Nó phải là một chuỗi từ 52 đến 56 ký tự, bao gồm chữ cái và các con số, với khoảng trắng và gạch ngang là tuỳ chọn.",
-    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "Tham số dòng lệnh đầu tiên là đường dẫn thư mục và tham số thứ hai là đường dẫn tương đối trong thư mục.",
-    "The folder ID cannot be blank.": "Không được để trống ID thư mục.",
-    "The folder ID must be unique.": "ID thư mục phải là duy nhất.",
-    "The folder path cannot be blank.": "Không được để trống đ.dẫn đến th.mục.",
-    "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "Các khoảng th.gian sau đây sẽ được s.dụng: một phiên bản, trong giờ đầu tiên, được giữ lại mỗi 30 giây, trong ngày đầu tiên là mỗi giờ, trong 30 ngày đầu tiên là mỗi ngày, cho đến khi th.hạn tối đa mỗi ph.bản được giữ lại là mỗi tuần. ",
-    "The following items could not be synchronized.": "Không thể đồng bộ những nội dung sau.",
-    "The maximum age must be a number and cannot be blank.": "Thời hạn tối đa phải là một con số và không được để trống.",
-    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Th.gian t.đa một ph.bản được giữ lại (tính bằng ngày, nhập 0 để giữ tập tin mãi mãi).",
-    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "Phần trăm dung lượng đĩa trống tối thiểu phải là một số không âm (nằm trong khoảng) từ 0 đến 100.",
-    "The number of days must be a number and cannot be blank.": "Số ngày phải là một con số và không được để trống.",
-    "The number of days to keep files in the trash can. Zero means forever.": "Số ngày tập tin được giữ trong thùng rác. 0 nghĩa là mãi mãi.",
-    "The number of old versions to keep, per file.": "Số phiên bản cũ cần giữ lại với mỗi tập tin.",
-    "The number of versions must be a number and cannot be blank.": "Số phiên bản phải là một con số và không được để trống.",
-    "The path cannot be blank.": "Không được để trống đường dẫn.",
-    "The rate limit must be a non-negative number (0: no limit)": "Giới hạn tốc độ phải là một số không âm (0: không giới hạn)",
-    "The rescan interval must be a non-negative number of seconds.": "Khoảng thời gian quét lại phải là một số giây không âm.",
-    "They are retried automatically and will be synced when the error is resolved.": "Chúng sẽ được tự động thử lại và đồng bộ khi lỗi được khắc phục.",
-    "This Device": "Thiết bị này",
-    "This can easily give hackers access to read and change any files on your computer.": "Th.tác này có thể khiến tin tặc dễ dàng tr.cập để đọc và th.đổi bất kỳ t.tin nào trên máy của bạn.",
-    "This is a major version upgrade.": "Đây là bản nâng cấp quan trọng.",
-    "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": "Time",
-    "Trash Can File Versioning": "Kiểu thùng rác",
-    "Type": "Type",
-    "Undecided (will prompt)": "Undecided (will prompt)",
-    "Unknown": "Không biết",
-    "Unshared": "Chưa chia sẻ",
-    "Unused": "Chưa sử dụng",
-    "Up to Date": "Đã đồng bộ",
-    "Updated": "Đã cập nhật",
-    "Upgrade": "Nâng cấp",
-    "Upgrade To {%version%}": "Nâng cấp lên {{version}}",
-    "Upgrading": "Đang nâng cấp",
-    "Upload Rate": "Tốc độ tải lên",
-    "Uptime": "Th.gian h.động",
-    "Usage reporting is always enabled for candidate releases.": "Usage reporting is always enabled for candidate releases.",
-    "Use HTTPS for GUI": "Sử dụng HTTPS cho GUI",
-    "Version": "Phiên bản",
-    "Versions Path": "Đ.dẫn đến các ph.bản",
-    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Các phiên bản sẽ tự động được xoá nếu chúng cũ hơn thời hạn tối đa hoặc vượt quá số tập tin cho phép trong một khoảng thời gian.",
-    "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "Warning, this path is a parent directory of an existing folder \"{{otherFolder}}\".",
-    "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%}\".": "Cảnh báo, đường dẫn này là thư mục con của thư mục hiện hữu \"{{otherFolder}}\".",
-    "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.": "Khi thêm một thiết bị mới, hãy nhớ rằng thiết bị này cũng phải được thêm vào máy kia.",
-    "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Khi thêm một thư mục mới, hãy nhớ rằng ID thư mục được dùng để gắn kết thư mục giữa các thiết bị với nhau. Chúng phải chính xác từng chữ, cả viết hoa và thường giữa tất cả thiết bị.",
-    "Yes": "Phải",
-    "You 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.": "Bạn phải giữ ít nhất một phiên bản.",
-    "days": "ngày",
-    "directories": "directories",
-    "files": "files",
-    "full documentation": "tài liệu đầy đủ",
-    "items": "nội dung",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} muốn chia sẻ thư mục \"{{folder}}\".",
-    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} wants to share folder \"{{folderlabel}}\" ({{folder}})."
-}

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

@@ -26,6 +26,8 @@
     "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}}?",
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "自动升级现提供了稳定版本和发布候选版之间的选择。",
     "Automatic upgrades": "自动升级",
     "Be careful!": "小心！",
@@ -139,6 +141,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 upgrades": "无更新",
     "Normal": "普通",
     "Notice": "提示",
@@ -174,6 +177,8 @@
     "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",
     "Required identifier for the folder. Must be the same on all cluster devices.": "需要给文件夹设置标识。在所有丛设备上必须一致。",
     "Rescan": "重新扫描",
     "Rescan All": "全部重新扫描",

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

@@ -26,6 +26,8 @@
     "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}}?",
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "自動更新目前有穩定發行版及發行候選版可供選擇。",
     "Automatic upgrades": "自動升級",
     "Be careful!": "請小心！",
@@ -139,6 +141,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 upgrades": "不更新",
     "Normal": "正常的",
     "Notice": "注意",
@@ -174,6 +177,8 @@
     "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",
     "Required identifier for the folder. Must be the same on all cluster devices.": "資料夾的識別字。必須在叢集內所有的裝置上皆相同。",
     "Rescan": "重新掃描",
     "Rescan All": "全部重新掃描",

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","nn":"Norwegian Nynorsk","pl":"Polish","pt-BR":"Portuguese (Brazil)","pt-PT":"Portuguese (Portugal)","ru":"Russian","sk":"Slovak","sv":"Swedish","tr":"Turkish","uk":"Ukrainian","vi":"Vietnamese","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","fi":"Finnish","fr":"French","fr-CA":"French (Canada)","fy":"Western Frisian","hu":"Hungarian","it":"Italian","ja":"Japanese","ko-KR":"Korean (Korea)","lt":"Lithuanian","nb":"Norwegian Bokmål","nl":"Dutch","nn":"Norwegian Nynorsk","pl":"Polish","pt-BR":"Portuguese (Brazil)","pt-PT":"Portuguese (Portugal)","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","nn","pl","pt-BR","pt-PT","ru","sk","sv","tr","uk","vi","zh-CN","zh-TW"]
+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","nn","pl","pt-BR","pt-PT","ru","sk","sv","tr","uk","zh-CN","zh-TW"]

gui/default/index.html

@@ -402,7 +402,7 @@
                       <th><span class="fa fa-fw fa-share-alt"></span>&nbsp;<span translate>Shared With</span></th>
                       <td class="text-right" ng-attr-title="{{sharesFolder(folder)}}">{{sharesFolder(folder)}}</td>
                     </tr>
-                    <tr>
+                    <tr ng-if="folderStats[folder.id].lastScan">
                       <th><span class="fa fa-fw fa-clock-o"></span>&nbsp;<span translate>Last Scan</span></th>
                       <td translate ng-if="folderStats[folder.id].lastScanDays >= 365" class="text-right">Never</td>
                       <td ng-if="folderStats[folder.id].lastScanDays < 365" class="text-right">
@@ -725,6 +725,8 @@
   <ng-include src="'syncthing/core/majorUpgradeModalView.html'"></ng-include>
   <ng-include src="'syncthing/core/aboutModalView.html'"></ng-include>
   <ng-include src="'syncthing/core/discoveryFailuresModalView.html'"></ng-include>
+  <ng-include src="'syncthing/folder/removeFolderDialogView.html'"></ng-include>
+  <ng-include src="'syncthing/device/removeDeviceDialogView.html'"></ng-include>
 
   <!-- vendor scripts -->
   <script type="text/javascript" src="vendor/jquery/jquery-2.2.2.js"></script>

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, 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, 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, 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/device/editDeviceModalView.html

@@ -24,31 +24,59 @@
         </div>
         <div ng-if="editingExisting" class="well well-sm text-monospace" select-on-click>{{currentDevice.deviceID}}</div>
       </div>
-      <div class="form-group">
-        <label translate for="name">Device Name</label>
-        <input id="name" class="form-control" type="text" ng-model="currentDevice.name" />
-        <p translate ng-if="currentDevice.deviceID == myID" class="help-block">Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.</p>
-        <p translate ng-if="currentDevice.deviceID != myID" class="help-block">Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.</p>
+      <div class="row">
+        <div class="col-md-6">
+          <div class="form-group">
+            <label translate for="name">Device Name</label>
+            <input id="name" class="form-control" type="text" ng-model="currentDevice.name" />
+            <p translate ng-if="currentDevice.deviceID == myID" class="help-block">Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.</p>
+            <p translate ng-if="currentDevice.deviceID != myID" class="help-block">Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.</p>
+          </div>
+        </div>
+        <div class="col-md-6">
+          <div class="form-group">
+            <label translate for="addresses">Addresses</label>
+            <input ng-disabled="currentDevice.deviceID == myID" id="addresses" class="form-control" type="text" ng-model="currentDevice._addressesStr"></input>
+            <p translate class="help-block">Enter comma separated  ("tcp://ip:port", "tcp://host:port") addresses or "dynamic" to perform automatic discovery of the address.</p>
+          </div>
+        </div>
       </div>
-      <div class="form-group">
-        <label translate for="addresses">Addresses</label>
-        <input ng-disabled="currentDevice.deviceID == myID" id="addresses" class="form-control" type="text" ng-model="currentDevice._addressesStr"></input>
-        <p translate class="help-block">Enter comma separated  ("tcp://ip:port", "tcp://host:port") addresses or "dynamic" to perform automatic discovery of the address.</p>
+      <div class="row">
+        <div class="col-md-6">
+          <div class="form-group">
+            <label translate>Compression</label>
+            <select class="form-control" ng-model="currentDevice.compression">
+              <option value="always" translate>All Data</option>
+              <option value="metadata" translate>Metadata Only</option>
+              <option value="never" translate>Off</option>
+            </select>
+          </div>
+        </div>
+        <div class="col-md-6">
+        </div>
       </div>
-      <div class="form-group">
-        <label translate>Compression</label>
-        <select class="form-control" ng-model="currentDevice.compression">
-          <option value="always" translate>All Data</option>
-          <option value="metadata" translate>Metadata Only</option>
-          <option value="never" translate>Off</option>
-        </select>
-      </div>
-      <div class="form-group">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" ng-model="currentDevice.introducer"> <span translate>Introducer</span>
-          </label>
-          <p translate class="help-block">Add devices from the introducer to our device list, for mutually shared folders.</p>
+      <div class="row">
+        <div class="col-md-6">
+          <div class="form-group">
+            <div class="checkbox">
+              <label>
+                <input type="checkbox" ng-model="currentDevice.introducer">
+                <span translate>Introducer</span>
+                <p translate class="help-block">Add devices from the introducer to our device list, for mutually shared folders.</p>
+              </label>
+            </div>
+          </div>
+        </div>
+        <div class="col-md-6">
+          <div class="form-group">
+            <div class="checkbox">
+              <label>
+                <input type="checkbox" ng-model="currentDevice.autoAcceptFolders">
+                <span translate>Auto Accept</span>
+                <p translate class="help-block">Automatically create or share folders that this device advertises at the default path.</p>
+              </label>
+            </div>
+          </div>
         </div>
       </div>
       <div class="row">
@@ -87,7 +115,7 @@
       <button type="button" class="btn btn-warning btn-sm disabled" ng-if="willBeReintroducedBy" tooltip data-original-title="This device will be reintroduced by {{ willBeReintroducedBy }}">
         <span class="fa fa-minus-circle"></span>&nbsp;<span translate>Remove</span>
       </button>
-      <button type="button" class="btn btn-warning btn-sm" ng-click="deleteDevice()" ng-if="!willBeReintroducedBy">
+      <button type="button" class="btn btn-warning btn-sm" data-toggle="modal" data-target="#remove-device-confirmation" ng-if="!willBeReintroducedBy">
         <span class="fa fa-minus-circle"></span>&nbsp;<span translate>Remove</span>
       </button>
     </div>

gui/default/syncthing/device/removeDeviceDialogView.html

@@ -0,0 +1,15 @@
+<modal id="remove-device-confirmation" status="warning" icon="exclamation-circle" heading="{{'Remove Device' | translate}}" large="no" closeable="yes">
+    <div class="modal-body">
+        <p ng-model="currentDevice.name" style=" overflow : hidden; text-overflow: ellipsis; white-space: nowrap;">
+            <span  translate translate-value-name="{{currentDevice.name}}">Are you sure you want to remove device {%name%}?</span>
+        </p>
+    </div>
+    <div class="modal-footer">
+        <button type="button" class="btn btn-warning pull-left btn-sm" data-dismiss="modal" ng-click="deleteDevice()">
+            <span class="fa fa-minus-circle"></span>&nbsp;<span translate>Yes</span>
+        </button>
+        <button type="button" class="btn btn-default btn-sm" data-dismiss="modal">
+            <span class="fa fa-times"></span>&nbsp;<span translate>No</span>
+        </button>
+    </div>
+</modal>

gui/default/syncthing/folder/editFolderModalView.html

@@ -199,7 +199,7 @@
     <button type="button" class="btn btn-default btn-sm" data-dismiss="modal">
       <span class="fa fa-times"></span>&nbsp;<span translate>Close</span>
     </button>
-    <button type="button" class="btn btn-warning pull-left btn-sm" ng-click="deleteFolder(currentFolder.id)" ng-if="editingExisting">
+    <button type="button" class="btn btn-warning pull-left btn-sm" data-toggle="modal" data-target="#remove-folder-confirmation" ng-if="editingExisting">
       <span class="fa fa-minus-circle"></span>&nbsp;<span translate>Remove</span>
     </button>
   </div>

gui/default/syncthing/folder/removeFolderDialogView.html

@@ -0,0 +1,18 @@
+<modal id="remove-folder-confirmation" status="warning" icon="exclamation-circle" heading="{{'Remove Folder' | translate}}" large="no" closeable="yes">
+    <div class="modal-body">
+        <p ng-model="currentFolder.label" style=" overflow : hidden; text-overflow: ellipsis; white-space: nowrap;">
+            <span  translate translate-value-label="{{currentFolder.label}}">Are you sure you want to remove folder {%label%}?</span>
+        </p>
+        <p translate>
+            No files will be deleted as a result of this operation.
+        </p>
+    </div>
+    <div class="modal-footer">
+        <button type="button" class="btn btn-warning pull-left btn-sm" data-dismiss="modal" ng-click="deleteFolder(currentFolder.id)">
+            <span class="fa fa-minus-circle"></span>&nbsp;<span translate>Yes</span>
+        </button>
+        <button type="button" class="btn btn-default btn-sm" data-dismiss="modal">
+            <span class="fa fa-times"></span>&nbsp;<span translate>No</span>
+        </button>
+    </div>
+</modal>

gui/default/syncthing/settings/settingsModalView.html

@@ -1,36 +1,180 @@
 <modal id="settings" status="default" icon="cog" heading="{{'Settings' | translate}}" large="yes" closeable="yes">
   <div class="modal-body">
     <form role="form" name="settingsEditor">
-      <div class="row">
-
-        <div class="col-md-6">
+      <ul class="nav nav-tabs">
+        <li class="active"><a data-toggle="tab" href="#settings-general" translate>General</a></li>
+        <li><a data-toggle="tab" href="#settings-gui" translate>GUI</a></li>
+        <li><a data-toggle="tab" href="#settings-connections" translate>Connections</a></li>
+      </ul>
+      <div class="tab-content">
+        <div id="settings-general" class="tab-pane in active">
           <div class="form-group">
             <label translate for="DeviceName">Device Name</label>
             <input id="DeviceName" class="form-control" type="text" ng-model="tmpOptions.deviceName"/>
           </div>
 
+          <div class="row">
+            <div class="col-md-6">
+              <div class="form-horizontal">
+                <div class="form-group" ng-class="{'has-error': settingsEditor.minHomeDiskFree.$invalid && settingsEditor.minHomeDiskFree.$dirty}">
+                  <label class="col-xs-12" for="minHomeDiskFree"><span translate>Minimum Free Disk Space</span></label><br/>
+                  <div class="col-xs-9"><input name="minHomeDiskFree" id="minHomeDiskFree" class="form-control" type="number" ng-model="tmpOptions.minHomeDiskFree.value" required=""  aria-required="true" min="0" step="0.01"/></div>
+                  <div class="col-xs-3"><select class="col-sm-3 form-control" ng-model="tmpOptions.minHomeDiskFree.unit">
+                    <option value="%">%</option>
+                    <option value="kB">kB</option>
+                    <option value="MB">MB</option>
+                    <option value="GB">GB</option>
+                    <option value="TB">TB</option>
+                  </select></div>
+                  <p class="col-xs-12 help-block">
+                    <span translate ng-show="settingsEditor.minHomeDiskFree.$invalid">Enter a non-negative number (e.g., "2.35") and select a unit. Percentages are as part of the total disk size.</span>
+                    <span translate ng-hide="settingsEditor.minHomeDiskFree.$invalid">This setting controls the free space required on the home (i.e., index database) disk.</span>
+                  </p>
+                </div>
+              </div>
+            </div>
+            <div class="col-md-6">
+              <div class="form-group">
+                <label translate>API Key</label>
+                <div class="input-group">
+                  <input type="text" readonly class="text-monospace form-control" value="{{tmpGUI.apiKey || '-'}}"/>
+                  <span class="input-group-btn">
+                    <button type="button" class="btn btn-default btn-secondary" ng-click="setAPIKey(tmpGUI)">
+                      <span class="fa fa-repeat"></span>&nbsp;<span translate>Generate</span>
+                    </button>
+                  </span>
+                </div>
+              </div>
+            </div>
+          </div>
+
+          <div class="row">
+            <div class="col-md-6">
+              <div class="form-group">
+                <div ng-if="tmpOptions.upgrades != 'candidate'">
+                  <label translate for="urVersion">Anonymous Usage Reporting</label> (<a href="" translate data-toggle="modal" data-target="#urPreview">Preview</a>)
+                  <select class="form-control" id="urVersion" ng-model="tmpOptions._urAcceptedStr">
+                    <option ng-repeat="n in urVersions()" value="{{n}}">{{'Version' | translate}} {{n}}</option>
+                    <!-- 1 does not exist, as we did not support incremental formats back then. -->
+                    <option value="0" translate>Undecided (will prompt)</option>
+                    <option value="-1" translate>Disabled</option>
+                  </select>
+                </div>
+                <p class="help-block" ng-if="tmpOptions.upgrades == 'candidate'">
+                  <span translate>Usage reporting is always enabled for candidate releases.</span> (<a href="" translate data-toggle="modal" data-target="#urPreview">Preview</a>)
+                </p>
+              </div>
+            </div>
+            <div class="col-md-6">
+              <div class="form-group">
+                <label translate>Automatic upgrades</label>&emsp;<a href="https://docs.syncthing.net/users/releases.html" target="_blank"><span class="fa fa-fw fa-book"></span>&nbsp;<span translate>Help</span></a>
+                <select class="form-control" ng-model="tmpOptions.upgrades" ng-if="upgradeInfo">
+                  <option value="none" translate>No upgrades</option>
+                  <option value="stable" translate>Stable releases only</option>
+                  <option value="candidate" translate>Stable releases and release candidates</option>
+                </select>
+                <p class="help-block" ng-if="!upgradeInfo">
+                  <span translate>Unavailable/Disabled by administrator or maintainer</span>
+                </p>
+              </div>
+            </div>
+          </div>
+          <div class="form-group">
+            <label translate for="urVersion">Default Folder Path</label>
+            <input id="DefaultFolderPath" class="form-control" type="text" ng-model="tmpOptions.defaultFolderPath"/>
+            <p class="help-block">
+              <span translate translate-value-tilde="{{system.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%}.
+              </span>
+            </p>
+          </div>
+        </div>
+
+        <div id="settings-gui" class="tab-pane">
+          <div class="form-group"  ng-class="{'has-error': settingsEditor.Address.$invalid && settingsEditor.Address.$dirty}">
+            <label translate for="Address">GUI Listen Address</label>&emsp;<a href="https://docs.syncthing.net/users/guilisten.html" target="_blank"><span class="fa fa-fw fa-book"></span>&nbsp;<span translate>Help</span></a>
+            <input id="Address" name="Address" class="form-control" type="text" ng-model="tmpGUI.address" ng-pattern="/.*:0*((102[4-9])|(10[3-9][0-9])|(1[1-9][0-9][0-9])|([2-9][0-9][0-9][0-9])|([1-6]\d{4}))$/"/>
+              <p class="help-block" ng-show="settingsEditor.Address.$invalid" translate>
+                Enter a non-privileged port number (1024 - 65535).
+              </p>
+          </div>
+          <div class="row">
+            <div class="col-md-6">
+              <div class="form-group">
+                <label translate for="User">GUI Authentication User</label>
+                <input id="User" class="form-control" type="text" ng-model="tmpGUI.user"/>
+              </div>
+            </div>
+            <div class="col-md-6">
+              <div class="form-group">
+                <label translate for="Password">GUI Authentication Password</label>
+                <input id="Password" class="form-control" type="password" ng-model="tmpGUI.password" ng-trim="false"/>
+              </div>
+            </div>
+          </div>
+          <div class="row">
+            <div class="col-md-6">
+              <div class="form-group">
+                <div class="checkbox">
+                  <label>
+                    <input id="UseTLS" type="checkbox" ng-model="tmpGUI.useTLS"/> <span translate>Use HTTPS for GUI</span>
+                  </label>
+                </div>
+              </div>
+            </div>
+            <div class="col-md-6">
+              <div class="form-group">
+                <div class="checkbox">
+                  <label>
+                    <input id="StartBrowser" type="checkbox" ng-model="tmpOptions.startBrowser"/> <span translate>Start Browser</span>
+                  </label>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="row">
+            <div class="col-md-6">
+              <div class="form-group">
+                <label translate>GUI Theme</label>
+                <select class="form-control" ng-model="tmpGUI.theme" ng-if="themes.length > 1">
+                  <option ng-repeat="theme in themes.sort()" value="{{ theme }}">
+                    {{ themeName(theme) }}
+                  </option>
+                </select>
+                <p class="help-block" ng-if="themes.length < 2">
+                  <span translate>Unavailable</span>
+                </p>
+              </div>
+            </div>
+            <div class="col-md-6">
+            </div>
+          </div>
+        </div>
+        <div id="settings-connections" class="tab-pane">
           <div class="form-group">
             <label translate for="ListenAddressesStr">Sync Protocol Listen Addresses</label>&emsp;<a href="https://docs.syncthing.net/users/config.html#listen-addresses" target="_blank"><span class="fa fa-fw fa-book"></span>&nbsp;<span translate>Help</span></a>
-
             <input id="ListenAddressesStr" class="form-control" type="text" ng-model="tmpOptions._listenAddressesStr"/>
           </div>
-
-          <div class="form-group" ng-class="{'has-error': settingsEditor.MaxRecvKbps.$invalid && settingsEditor.MaxRecvKbps.$dirty}">
-            <label translate for="MaxRecvKbps">Incoming Rate Limit (KiB/s)</label>
-            <input id="MaxRecvKbps" name="MaxRecvKbps" class="form-control" type="number" ng-model="tmpOptions.maxRecvKbps" min="0"/>
-            <p class="help-block">
-              <span translate ng-if="settingsEditor.MaxRecvKbps.$error.min && settingsEditor.MaxRecvKbps.$dirty">The rate limit must be a non-negative number (0: no limit)</span>
-            </p>
+          <div class="row">
+            <div class="col-md-6">
+              <div class="form-group" ng-class="{'has-error': settingsEditor.MaxRecvKbps.$invalid && settingsEditor.MaxRecvKbps.$dirty}">
+                <label translate for="MaxRecvKbps">Incoming Rate Limit (KiB/s)</label>
+                <input id="MaxRecvKbps" name="MaxRecvKbps" class="form-control" type="number" ng-model="tmpOptions.maxRecvKbps" min="0"/>
+                <p class="help-block">
+                  <span translate ng-if="settingsEditor.MaxRecvKbps.$error.min && settingsEditor.MaxRecvKbps.$dirty">The rate limit must be a non-negative number (0: no limit)</span>
+                </p>
+              </div>
+            </div>
+            <div class="col-md-6">
+              <div class="form-group" ng-class="{'has-error': settingsEditor.MaxSendKbps.$invalid && settingsEditor.MaxSendKbps.$dirty}">
+                <label translate for="MaxSendKbps">Outgoing Rate Limit (KiB/s)</label>
+                <input id="MaxSendKbps" name="MaxSendKbps" class="form-control" type="number" ng-model="tmpOptions.maxSendKbps" min="0"/>
+                <p class="help-block">
+                  <span translate ng-if="settingsEditor.MaxSendKbps.$error.min && settingsEditor.MaxSendKbps.$dirty">The rate limit must be a non-negative number (0: no limit)</span>
+                </p>
+              </div>
+            </div>
           </div>
-
-          <div class="form-group" ng-class="{'has-error': settingsEditor.MaxSendKbps.$invalid && settingsEditor.MaxSendKbps.$dirty}">
-            <label translate for="MaxSendKbps">Outgoing Rate Limit (KiB/s)</label>
-            <input id="MaxSendKbps" name="MaxSendKbps" class="form-control" type="number" ng-model="tmpOptions.maxSendKbps" min="0"/>
-            <p class="help-block">
-              <span translate ng-if="settingsEditor.MaxSendKbps.$error.min && settingsEditor.MaxSendKbps.$dirty">The rate limit must be a non-negative number (0: no limit)</span>
-            </p>
-          </div>
-
           <div class="row">
             <div class="col-md-6">
               <div class="form-group">
@@ -51,7 +195,6 @@
               </div>
             </div>
           </div>
-
           <div class="row">
             <div class="col-md-6">
               <div class="form-group">
@@ -72,106 +215,16 @@
               </div>
             </div>
           </div>
-
-          <div class="clearfix"></div>
-          <div class="form-group">
-            <label translate for="GlobalAnnServersStr">Global Discovery Servers</label>
-            <input ng-disabled="!tmpOptions.globalAnnounceEnabled" id="GlobalAnnServersStr" class="form-control" type="text" ng-model="tmpOptions._globalAnnounceServersStr"/>
-          </div>
-
-          <div class="form-horizontal">
-            <div class="form-group" ng-class="{'has-error': settingsEditor.minHomeDiskFree.$invalid && settingsEditor.minHomeDiskFree.$dirty}">
-              <label class="col-xs-12" for="minHomeDiskFree"><span translate>Minimum Free Disk Space</span></label><br/>
-              <div class="col-xs-9"><input name="minHomeDiskFree" id="minHomeDiskFree" class="form-control" type="number" ng-model="tmpOptions.minHomeDiskFree.value" required=""  aria-required="true" min="0" step="0.01"/></div>
-              <div class="col-xs-3"><select class="col-sm-3 form-control" ng-model="tmpOptions.minHomeDiskFree.unit">
-                <option value="%">%</option>
-                <option value="kB">kB</option>
-                <option value="MB">MB</option>
-                <option value="GB">GB</option>
-                <option value="TB">TB</option>
-              </select></div>
-              <p class="col-xs-12 help-block">
-                <span translate ng-show="settingsEditor.minHomeDiskFree.$invalid">Enter a non-negative number (e.g., "2.35") and select a unit. Percentages are as part of the total disk size.</span>
-                <span translate ng-hide="settingsEditor.minHomeDiskFree.$invalid">This setting controls the free space required on the home (i.e., index database) disk.</span>
-              </p>
+          <div class="row">
+            <div class="col-md-6">
+              <div class="form-group">
+                <label translate for="GlobalAnnServersStr">Global Discovery Servers</label>
+                <input ng-disabled="!tmpOptions.globalAnnounceEnabled" id="GlobalAnnServersStr" class="form-control" type="text" ng-model="tmpOptions._globalAnnounceServersStr"/>
+              </div>
+            <div>
+            <div class="col-md-6">
             </div>
           </div>
-
-        </div>
-
-        <div class="col-md-6">
-          <div class="form-group"  ng-class="{'has-error': settingsEditor.Address.$invalid && settingsEditor.Address.$dirty}">
-            <label translate for="Address">GUI Listen Address</label>&emsp;<a href="https://docs.syncthing.net/users/guilisten.html" target="_blank"><span class="fa fa-fw fa-book"></span>&nbsp;<span translate>Help</span></a>
-            <input id="Address" name="Address" class="form-control" type="text" ng-model="tmpGUI.address" ng-pattern="/.*:0*((102[4-9])|(10[3-9][0-9])|(1[1-9][0-9][0-9])|([2-9][0-9][0-9][0-9])|([1-6]\d{4}))$/"/>
-              <p class="help-block" ng-show="settingsEditor.Address.$invalid" translate>
-                Enter a non-privileged port number (1024 - 65535).
-              </p>
-          </div>
-          <div class="form-group">
-            <label translate for="User">GUI Authentication User</label>
-            <input id="User" class="form-control" type="text" ng-model="tmpGUI.user"/>
-          </div>
-          <div class="form-group">
-            <label translate for="Password">GUI Authentication Password</label>
-            <input id="Password" class="form-control" type="password" ng-model="tmpGUI.password" ng-trim="false"/>
-          </div>
-          <div class="form-group">
-            <div class="checkbox">
-              <label>
-                <input id="UseTLS" type="checkbox" ng-model="tmpGUI.useTLS"/> <span translate>Use HTTPS for GUI</span>
-              </label>
-            </div>
-          </div>
-          <div class="form-group">
-            <div class="checkbox">
-              <label>
-                <input id="StartBrowser" type="checkbox" ng-model="tmpOptions.startBrowser"/> <span translate>Start Browser</span>
-              </label>
-            </div>
-          </div>
-          <div class="form-group" ng-if="upgradeInfo">
-            <label translate>Automatic upgrades</label>&emsp;<a href="https://docs.syncthing.net/users/releases.html" target="_blank"><span class="fa fa-fw fa-book"></span>&nbsp;<span translate>Help</span></a>
-            <select class="form-control" ng-model="tmpOptions.upgrades">
-              <option value="none" translate>No upgrades</option>
-              <option value="stable" translate>Stable releases only</option>
-              <option value="candidate" translate>Stable releases and release candidates</option>
-            </select>
-          </div>
-
-          <div class="form-group">
-            <div ng-if="tmpOptions.upgrades != 'candidate'">
-              <label translate for="urVersion">Anonymous Usage Reporting</label> (<a href="" translate data-toggle="modal" data-target="#urPreview">Preview</a>)
-              <select class="form-control" id="urVersion" ng-model="tmpOptions._urAcceptedStr">
-                <option ng-repeat="n in urVersions()" value="{{n}}">{{'Version' | translate}} {{n}}</option>
-                <!-- 1 does not exist, as we did not support incremental formats back then. -->
-                <option value="0" translate>Undecided (will prompt)</option>
-                <option value="-1" translate>Disabled</option>
-              </select>
-            </div>
-            <p class="help-block" ng-if="tmpOptions.upgrades == 'candidate'">
-              <span translate>Usage reporting is always enabled for candidate releases.</span> (<a href="" translate data-toggle="modal" data-target="#urPreview">Preview</a>)
-            </p>
-          </div>
-
-          <hr />
-
-          <div class="form-group">
-            <label translate>API Key</label>
-            <div class="well well-sm text-monospace" select-on-click>{{tmpGUI.apiKey || "-"}}</div>
-            <button type="button" class="btn btn-sm btn-default" ng-click="setAPIKey(tmpGUI)">
-              <span class="fa fa-repeat"></span>&nbsp;<span translate>Generate</span>
-            </button>
-          </div>
-
-          <div class="form-group" ng-if="themes.length > 1">
-            <label translate>GUI Theme</label>
-            <select class="form-control" ng-model="tmpGUI.theme">
-              <option ng-repeat="theme in themes.sort()" value="{{ theme }}">
-                {{ themeName(theme) }}
-              </option>
-            </select>
-          </div>
-
         </div>
       </div>
     </form>

lib/config/commit_test.go

@@ -52,7 +52,7 @@ func TestReplaceCommit(t *testing.T) {
 	// Replace config. We should get back a clean response and the config
 	// should change.
 
-	err := w.Replace(Configuration{Version: 1})
+	_, err := w.Replace(Configuration{Version: 1})
 	if err != nil {
 		t.Fatal("Should not have a validation error:", err)
 	}
@@ -69,7 +69,7 @@ func TestReplaceCommit(t *testing.T) {
 	sub0 := requiresRestart{committed: make(chan struct{}, 1)}
 	w.Subscribe(sub0)
 
-	err = w.Replace(Configuration{Version: 2})
+	_, err = w.Replace(Configuration{Version: 2})
 	if err != nil {
 		t.Fatal("Should not have a validation error:", err)
 	}
@@ -87,7 +87,7 @@ func TestReplaceCommit(t *testing.T) {
 
 	w.Subscribe(validationError{})
 
-	err = w.Replace(Configuration{Version: 3})
+	_, err = w.Replace(Configuration{Version: 3})
 	if err == nil {
 		t.Fatal("Should have a validation error")
 	}

lib/config/config_test.go

@@ -10,6 +10,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
+	"io/ioutil"
 	"os"
 	"path/filepath"
 	"reflect"
@@ -20,6 +21,7 @@ import (
 
 	"github.com/d4l3k/messagediff"
 	"github.com/syncthing/syncthing/lib/fs"
+	"github.com/syncthing/syncthing/lib/osutil"
 	"github.com/syncthing/syncthing/lib/protocol"
 )
 
@@ -430,6 +432,62 @@ func TestFolderPath(t *testing.T) {
 	}
 }
 
+func TestFolderCheckPath(t *testing.T) {
+	n, err := ioutil.TempDir("", "")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = os.MkdirAll(filepath.Join(n, "dir", ".stfolder"), os.FileMode(0777))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	testcases := []struct {
+		path string
+		err  error
+	}{
+		{
+			path: "",
+			err:  errMarkerMissing,
+		},
+		{
+			path: "does not exist",
+			err:  errPathMissing,
+		},
+		{
+			path: "dir",
+			err:  nil,
+		},
+	}
+
+	err = osutil.DebugSymlinkForTestsOnly(filepath.Join(n, "dir"), filepath.Join(n, "link"))
+	if err == nil {
+		t.Log("running with symlink check")
+		testcases = append(testcases, struct {
+			path string
+			err  error
+		}{
+			path: "link",
+			err:  nil,
+		})
+	} else if runtime.GOOS != "windows" {
+		t.Log("running without symlink check")
+		t.Fatal(err)
+	}
+
+	for _, testcase := range testcases {
+		cfg := FolderConfiguration{
+			Path:       filepath.Join(n, testcase.path),
+			MarkerName: DefaultMarkerName,
+		}
+
+		if err := cfg.CheckPath(); testcase.err != err {
+			t.Errorf("unexpected error in case %s: %s != %s", testcase.path, err, testcase.err)
+		}
+	}
+}
+
 func TestNewSaveLoad(t *testing.T) {
 	path := "testdata/temp.xml"
 	os.Remove(path)
@@ -768,7 +826,7 @@ func TestSharesRemovedOnDeviceRemoval(t *testing.T) {
 		t.Error("Should have less devices")
 	}
 
-	err = wrapper.Replace(raw)
+	_, err = wrapper.Replace(raw)
 	if err != nil {
 		t.Errorf("Failed: %s", err)
 	}

lib/config/deviceconfiguration.go

@@ -19,6 +19,7 @@ type DeviceConfiguration struct {
 	IntroducedBy             protocol.DeviceID    `xml:"introducedBy,attr" json:"introducedBy"`
 	Paused                   bool                 `xml:"paused" json:"paused"`
 	AllowedNetworks          []string             `xml:"allowedNetwork,omitempty" json:"allowedNetworks"`
+	AutoAcceptFolders        bool                 `xml:"autoAcceptFolders" json:"autoAcceptFolders"`
 }
 
 func NewDeviceConfiguration(id protocol.DeviceID, name string) DeviceConfiguration {

lib/config/folderconfiguration.go

@@ -13,18 +13,20 @@ import (
 
 	"github.com/syncthing/syncthing/lib/fs"
 	"github.com/syncthing/syncthing/lib/protocol"
+	"github.com/syncthing/syncthing/lib/util"
 )
 
 var (
-	errPathMissing   = errors.New("folder path missing")
-	errMarkerMissing = errors.New("folder marker missing")
+	errPathNotDirectory = errors.New("folder path not a directory")
+	errPathMissing      = errors.New("folder path missing")
+	errMarkerMissing    = errors.New("folder marker missing")
 )
 
 const DefaultMarkerName = ".stfolder"
 
 type FolderConfiguration struct {
 	ID                    string                      `xml:"id,attr" json:"id"`
-	Label                 string                      `xml:"label,attr" json:"label"`
+	Label                 string                      `xml:"label,attr" json:"label" restart:"false"`
 	FilesystemType        fs.FilesystemType           `xml:"filesystemType" json:"filesystemType"`
 	Path                  string                      `xml:"path,attr" json:"path"`
 	Type                  FolderType                  `xml:"type,attr" json:"type"`
@@ -61,11 +63,18 @@ type FolderDeviceConfiguration struct {
 	IntroducedBy protocol.DeviceID `xml:"introducedBy,attr" json:"introducedBy"`
 }
 
-func NewFolderConfiguration(id string, fsType fs.FilesystemType, path string) FolderConfiguration {
+func NewFolderConfiguration(myID protocol.DeviceID, id, label string, fsType fs.FilesystemType, path string) FolderConfiguration {
 	f := FolderConfiguration{
-		ID:             id,
-		FilesystemType: fsType,
-		Path:           path,
+		ID:              id,
+		Label:           label,
+		RescanIntervalS: 60,
+		FSWatcherDelayS: 10,
+		MinDiskFree:     Size{Value: 1, Unit: "%"},
+		Devices:         []FolderDeviceConfiguration{{DeviceID: myID}},
+		AutoNormalize:   true,
+		MaxConflicts:    -1,
+		FilesystemType:  fsType,
+		Path:            path,
 	}
 	f.prepare()
 	return f
@@ -124,12 +133,28 @@ func (f *FolderConfiguration) CreateMarker() error {
 // CheckPath returns nil if the folder root exists and contains the marker file
 func (f *FolderConfiguration) CheckPath() error {
 	fi, err := f.Filesystem().Stat(".")
-	if err != nil || !fi.IsDir() {
+	if err != nil {
+		if !fs.IsNotExist(err) {
+			return err
+		}
 		return errPathMissing
 	}
 
+	// Users might have the root directory as a symlink or reparse point.
+	// Furthermore, OneDrive bullcrap uses a magic reparse point to the cloudz...
+	// Yet it's impossible for this to happen, as filesystem adds a trailing
+	// path separator to the root, so even if you point the filesystem at a file
+	// Stat ends up calling stat on C:\dir\file\ which, fails with "is not a directory"
+	// in the error check above, and we don't even get to here.
+	if !fi.IsDir() && !fi.IsSymlink() {
+		return errPathNotDirectory
+	}
+
 	_, err = f.Filesystem().Stat(f.MarkerName)
 	if err != nil {
+		if !fs.IsNotExist(err) {
+			return err
+		}
 		return errMarkerMissing
 	}
 
@@ -201,6 +226,25 @@ func (f *FolderConfiguration) prepare() {
 	}
 }
 
+// RequiresRestartOnly returns a copy with only the attributes that require
+// restart on change.
+func (f FolderConfiguration) RequiresRestartOnly() FolderConfiguration {
+	copy := f
+
+	// Manual handling for things that are not taken care of by the tag
+	// copier, yet should not cause a restart.
+	copy.cachedFilesystem = nil
+
+	blank := FolderConfiguration{}
+	util.CopyMatchingTag(&blank, &copy, "restart", func(v string) bool {
+		if len(v) > 0 && v != "false" {
+			panic(fmt.Sprintf(`unexpected tag value: %s. expected untagged or "false"`, v))
+		}
+		return v == "false"
+	})
+	return copy
+}
+
 type FolderDeviceConfigurationList []FolderDeviceConfiguration
 
 func (l FolderDeviceConfigurationList) Less(a, b int) bool {

lib/config/optionsconfiguration.go

@@ -10,6 +10,8 @@ import (
 	"encoding/json"
 	"encoding/xml"
 	"fmt"
+
+	"github.com/syncthing/syncthing/lib/util"
 )
 
 type WeakHashSelectionMethod int
@@ -96,11 +98,11 @@ func (WeakHashSelectionMethod) ParseDefault(value string) (interface{}, error) {
 
 type OptionsConfiguration struct {
 	ListenAddresses         []string                `xml:"listenAddress" json:"listenAddresses" default:"default"`
-	GlobalAnnServers        []string                `xml:"globalAnnounceServer" json:"globalAnnounceServers" json:"globalAnnounceServer" default:"default"`
-	GlobalAnnEnabled        bool                    `xml:"globalAnnounceEnabled" json:"globalAnnounceEnabled" default:"true"`
-	LocalAnnEnabled         bool                    `xml:"localAnnounceEnabled" json:"localAnnounceEnabled" default:"true"`
-	LocalAnnPort            int                     `xml:"localAnnouncePort" json:"localAnnouncePort" default:"21027"`
-	LocalAnnMCAddr          string                  `xml:"localAnnounceMCAddr" json:"localAnnounceMCAddr" default:"[ff12::8384]:21027"`
+	GlobalAnnServers        []string                `xml:"globalAnnounceServer" json:"globalAnnounceServers" json:"globalAnnounceServer" default:"default" restart:"true"`
+	GlobalAnnEnabled        bool                    `xml:"globalAnnounceEnabled" json:"globalAnnounceEnabled" default:"true" restart:"true"`
+	LocalAnnEnabled         bool                    `xml:"localAnnounceEnabled" json:"localAnnounceEnabled" default:"true" restart:"true"`
+	LocalAnnPort            int                     `xml:"localAnnouncePort" json:"localAnnouncePort" default:"21027" restart:"true"`
+	LocalAnnMCAddr          string                  `xml:"localAnnounceMCAddr" json:"localAnnounceMCAddr" default:"[ff12::8384]:21027" restart:"true"`
 	MaxSendKbps             int                     `xml:"maxSendKbps" json:"maxSendKbps"`
 	MaxRecvKbps             int                     `xml:"maxRecvKbps" json:"maxRecvKbps"`
 	ReconnectIntervalS      int                     `xml:"reconnectionIntervalS" json:"reconnectionIntervalS" default:"60"`
@@ -117,21 +119,21 @@ type OptionsConfiguration struct {
 	URURL                   string                  `xml:"urURL" json:"urURL" default:"https://data.syncthing.net/newdata"`
 	URPostInsecurely        bool                    `xml:"urPostInsecurely" json:"urPostInsecurely" default:"false"` // For testing
 	URInitialDelayS         int                     `xml:"urInitialDelayS" json:"urInitialDelayS" default:"1800"`
-	RestartOnWakeup         bool                    `xml:"restartOnWakeup" json:"restartOnWakeup" default:"true"`
-	AutoUpgradeIntervalH    int                     `xml:"autoUpgradeIntervalH" json:"autoUpgradeIntervalH" default:"12"` // 0 for off
-	UpgradeToPreReleases    bool                    `xml:"upgradeToPreReleases" json:"upgradeToPreReleases"`              // when auto upgrades are enabled
-	KeepTemporariesH        int                     `xml:"keepTemporariesH" json:"keepTemporariesH" default:"24"`         // 0 for off
-	CacheIgnoredFiles       bool                    `xml:"cacheIgnoredFiles" json:"cacheIgnoredFiles" default:"false"`
+	RestartOnWakeup         bool                    `xml:"restartOnWakeup" json:"restartOnWakeup" default:"true" restart:"true"`
+	AutoUpgradeIntervalH    int                     `xml:"autoUpgradeIntervalH" json:"autoUpgradeIntervalH" default:"12" restart:"true"` // 0 for off
+	UpgradeToPreReleases    bool                    `xml:"upgradeToPreReleases" json:"upgradeToPreReleases" restart:"true"`              // when auto upgrades are enabled
+	KeepTemporariesH        int                     `xml:"keepTemporariesH" json:"keepTemporariesH" default:"24"`                        // 0 for off
+	CacheIgnoredFiles       bool                    `xml:"cacheIgnoredFiles" json:"cacheIgnoredFiles" default:"false" restart:"true"`
 	ProgressUpdateIntervalS int                     `xml:"progressUpdateIntervalS" json:"progressUpdateIntervalS" default:"5"`
 	LimitBandwidthInLan     bool                    `xml:"limitBandwidthInLan" json:"limitBandwidthInLan" default:"false"`
 	MinHomeDiskFree         Size                    `xml:"minHomeDiskFree" json:"minHomeDiskFree" default:"1 %"`
-	ReleasesURL             string                  `xml:"releasesURL" json:"releasesURL" default:"https://upgrades.syncthing.net/meta.json"`
+	ReleasesURL             string                  `xml:"releasesURL" json:"releasesURL" default:"https://upgrades.syncthing.net/meta.json" restart:"true"`
 	AlwaysLocalNets         []string                `xml:"alwaysLocalNet" json:"alwaysLocalNets"`
 	OverwriteRemoteDevNames bool                    `xml:"overwriteRemoteDeviceNamesOnConnect" json:"overwriteRemoteDeviceNamesOnConnect" default:"false"`
 	TempIndexMinBlocks      int                     `xml:"tempIndexMinBlocks" json:"tempIndexMinBlocks" default:"10"`
 	UnackedNotificationIDs  []string                `xml:"unackedNotificationID" json:"unackedNotificationIDs"`
 	TrafficClass            int                     `xml:"trafficClass" json:"trafficClass"`
-	WeakHashSelectionMethod WeakHashSelectionMethod `xml:"weakHashSelectionMethod" json:"weakHashSelectionMethod"`
+	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"`
@@ -162,3 +164,17 @@ func (orig OptionsConfiguration) Copy() OptionsConfiguration {
 	copy(c.UnackedNotificationIDs, orig.UnackedNotificationIDs)
 	return c
 }
+
+// RequiresRestartOnly returns a copy with only the attributes that require
+// restart on change.
+func (orig OptionsConfiguration) RequiresRestartOnly() OptionsConfiguration {
+	copy := orig
+	blank := OptionsConfiguration{}
+	util.CopyMatchingTag(&blank, &copy, "restart", func(v string) bool {
+		if len(v) > 0 && v != "true" {
+			panic(fmt.Sprintf(`unexpected tag value: %s. expected untagged or "true"`, v))
+		}
+		return v != "true"
+	})
+	return copy
+}

lib/config/wrapper.go

@@ -45,6 +45,15 @@ type Committer interface {
 	String() string
 }
 
+// Waiter allows to wait for the given config operation to complete.
+type Waiter interface {
+	Wait()
+}
+
+type noopWaiter struct{}
+
+func (noopWaiter) Wait() {}
+
 // A wrapper around a Configuration that manages loads, saves and published
 // notifications of changes to registered Handlers
 
@@ -130,37 +139,25 @@ func (w *Wrapper) RawCopy() Configuration {
 	return w.cfg.Copy()
 }
 
-// ReplaceBlocking swaps the current configuration object for the given one,
-// and waits for subscribers to be notified.
-func (w *Wrapper) ReplaceBlocking(cfg Configuration) error {
-	w.mut.Lock()
-	wg := sync.NewWaitGroup()
-	err := w.replaceLocked(cfg, wg)
-	w.mut.Unlock()
-	wg.Wait()
-	return err
-}
-
 // Replace swaps the current configuration object for the given one.
-func (w *Wrapper) Replace(cfg Configuration) error {
+func (w *Wrapper) Replace(cfg Configuration) (Waiter, error) {
 	w.mut.Lock()
 	defer w.mut.Unlock()
-
-	return w.replaceLocked(cfg, nil)
+	return w.replaceLocked(cfg)
 }
 
-func (w *Wrapper) replaceLocked(to Configuration, wg sync.WaitGroup) error {
+func (w *Wrapper) replaceLocked(to Configuration) (Waiter, error) {
 	from := w.cfg
 
 	if err := to.clean(); err != nil {
-		return err
+		return noopWaiter{}, err
 	}
 
 	for _, sub := range w.subs {
 		l.Debugln(sub, "verifying configuration")
 		if err := sub.VerifyConfiguration(from, to); err != nil {
 			l.Debugln(sub, "rejected config:", err)
-			return err
+			return noopWaiter{}, err
 		}
 	}
 
@@ -168,23 +165,19 @@ func (w *Wrapper) replaceLocked(to Configuration, wg sync.WaitGroup) error {
 	w.deviceMap = nil
 	w.folderMap = nil
 
-	w.notifyListeners(from, to, wg)
-
-	return nil
+	return w.notifyListeners(from, to), nil
 }
 
-func (w *Wrapper) notifyListeners(from, to Configuration, wg sync.WaitGroup) {
-	if wg != nil {
-		wg.Add(len(w.subs))
-	}
+func (w *Wrapper) notifyListeners(from, to Configuration) Waiter {
+	wg := sync.NewWaitGroup()
+	wg.Add(len(w.subs))
 	for _, sub := range w.subs {
 		go func(commiter Committer) {
 			w.notifyListener(commiter, from.Copy(), to.Copy())
-			if wg != nil {
-				wg.Done()
-			}
+			wg.Done()
 		}(sub)
 	}
+	return wg
 }
 
 func (w *Wrapper) notifyListener(sub Committer, from, to Configuration) {
@@ -211,7 +204,7 @@ func (w *Wrapper) Devices() map[protocol.DeviceID]DeviceConfiguration {
 
 // SetDevices adds new devices to the configuration, or overwrites existing
 // devices with the same ID.
-func (w *Wrapper) SetDevices(devs []DeviceConfiguration) error {
+func (w *Wrapper) SetDevices(devs []DeviceConfiguration) (Waiter, error) {
 	w.mut.Lock()
 	defer w.mut.Unlock()
 
@@ -231,17 +224,17 @@ func (w *Wrapper) SetDevices(devs []DeviceConfiguration) error {
 		}
 	}
 
-	return w.replaceLocked(newCfg, nil)
+	return w.replaceLocked(newCfg)
 }
 
 // SetDevice adds a new device to the configuration, or overwrites an existing
 // device with the same ID.
-func (w *Wrapper) SetDevice(dev DeviceConfiguration) error {
+func (w *Wrapper) SetDevice(dev DeviceConfiguration) (Waiter, error) {
 	return w.SetDevices([]DeviceConfiguration{dev})
 }
 
 // RemoveDevice removes the device from the configuration
-func (w *Wrapper) RemoveDevice(id protocol.DeviceID) error {
+func (w *Wrapper) RemoveDevice(id protocol.DeviceID) (Waiter, error) {
 	w.mut.Lock()
 	defer w.mut.Unlock()
 
@@ -255,10 +248,10 @@ func (w *Wrapper) RemoveDevice(id protocol.DeviceID) error {
 		}
 	}
 	if !removed {
-		return nil
+		return noopWaiter{}, nil
 	}
 
-	return w.replaceLocked(newCfg, nil)
+	return w.replaceLocked(newCfg)
 }
 
 // Folders returns a map of folders. Folder structures should not be changed,
@@ -277,7 +270,7 @@ func (w *Wrapper) Folders() map[string]FolderConfiguration {
 
 // SetFolder adds a new folder to the configuration, or overwrites an existing
 // folder with the same ID.
-func (w *Wrapper) SetFolder(fld FolderConfiguration) error {
+func (w *Wrapper) SetFolder(fld FolderConfiguration) (Waiter, error) {
 	w.mut.Lock()
 	defer w.mut.Unlock()
 
@@ -294,7 +287,7 @@ func (w *Wrapper) SetFolder(fld FolderConfiguration) error {
 		newCfg.Folders = append(w.cfg.Folders, fld)
 	}
 
-	return w.replaceLocked(newCfg, nil)
+	return w.replaceLocked(newCfg)
 }
 
 // Options returns the current options configuration object.
@@ -305,12 +298,12 @@ func (w *Wrapper) Options() OptionsConfiguration {
 }
 
 // SetOptions replaces the current options configuration object.
-func (w *Wrapper) SetOptions(opts OptionsConfiguration) error {
+func (w *Wrapper) SetOptions(opts OptionsConfiguration) (Waiter, error) {
 	w.mut.Lock()
 	defer w.mut.Unlock()
 	newCfg := w.cfg.Copy()
 	newCfg.Options = opts
-	return w.replaceLocked(newCfg, nil)
+	return w.replaceLocked(newCfg)
 }
 
 // GUI returns the current GUI configuration object.
@@ -321,12 +314,12 @@ func (w *Wrapper) GUI() GUIConfiguration {
 }
 
 // SetGUI replaces the current GUI configuration object.
-func (w *Wrapper) SetGUI(gui GUIConfiguration) error {
+func (w *Wrapper) SetGUI(gui GUIConfiguration) (Waiter, error) {
 	w.mut.Lock()
 	defer w.mut.Unlock()
 	newCfg := w.cfg.Copy()
 	newCfg.GUI = gui
-	return w.replaceLocked(newCfg, nil)
+	return w.replaceLocked(newCfg)
 }
 
 // IgnoredDevice returns whether or not connection attempts from the given

lib/connections/service.go

@@ -14,6 +14,7 @@ import (
 	"net/url"
 	"sort"
 	"strings"
+	stdsync "sync"
 	"time"
 
 	"github.com/syncthing/syncthing/lib/config"
@@ -758,7 +759,7 @@ func dialParallel(deviceID protocol.DeviceID, dialTargets []dialTarget) (interna
 	for _, prio := range priorities {
 		tgts := dialTargetBuckets[prio]
 		res := make(chan internalConn, len(tgts))
-		wg := sync.NewWaitGroup()
+		wg := stdsync.WaitGroup{}
 		for _, tgt := range tgts {
 			wg.Add(1)
 			go func(tgt dialTarget) {

lib/db/leveldb.go

@@ -36,7 +36,7 @@ func (l VersionList) String() string {
 			b.WriteString(", ")
 		}
 		copy(id[:], v.Device)
-		fmt.Fprintf(&b, "{%d, %v}", v.Version, id)
+		fmt.Fprintf(&b, "{%v, %v}", v.Version, id)
 	}
 	b.WriteString("}")
 	return b.String()

lib/db/leveldb_dbinstance.go

@@ -404,7 +404,7 @@ func (db *Instance) withNeed(folder, device []byte, truncate bool, needAllInvali
 				break
 			}
 
-			l.Debugf("need folder=%q device=%v name=%q need=%v have=%v invalid=%v haveV=%d globalV=%d globalDev=%v", folder, protocol.DeviceIDFromBytes(device), name, need, have, haveFileVersion.Invalid, haveFileVersion.Version, needVersion, needDevice)
+			l.Debugf("need folder=%q device=%v name=%q need=%v have=%v invalid=%v haveV=%v globalV=%v globalDev=%v", folder, protocol.DeviceIDFromBytes(device), name, need, have, haveFileVersion.Invalid, haveFileVersion.Version, needVersion, needDevice)
 
 			if cont := fn(gf); !cont {
 				return
@@ -589,7 +589,7 @@ func (db *Instance) AddInvalidToGlobal(folder, device []byte) int {
 		if file.Invalid {
 			changed++
 
-			l.Debugf("add invalid to global; folder=%q device=%v file=%q version=%d", folder, protocol.DeviceIDFromBytes(device), file.Name, file.Version)
+			l.Debugf("add invalid to global; folder=%q device=%v file=%q version=%v", folder, protocol.DeviceIDFromBytes(device), file.Name, file.Version)
 
 			// this is an adapted version of readWriteTransaction.updateGlobal
 			name := []byte(file.Name)

lib/db/leveldb_transactions.go

@@ -86,7 +86,7 @@ func (t readWriteTransaction) insertFile(folder, device []byte, file protocol.Fi
 // file. If the device is already present in the list, the version is updated.
 // If the file does not have an entry in the global list, it is created.
 func (t readWriteTransaction) updateGlobal(folder, device []byte, file protocol.FileInfo, globalSize *sizeTracker) bool {
-	l.Debugf("update global; folder=%q device=%v file=%q version=%d", folder, protocol.DeviceIDFromBytes(device), file.Name, file.Version)
+	l.Debugf("update global; folder=%q device=%v file=%q version=%v invalid=%v", folder, protocol.DeviceIDFromBytes(device), file.Name, file.Version, file.Invalid)
 	name := []byte(file.Name)
 	gk := t.db.globalKey(folder, name)
 	svl, _ := t.Get(gk, nil) // skip error, we check len(svl) != 0 later

lib/db/set_test.go

@@ -89,7 +89,7 @@ func (l fileList) String() string {
 	var b bytes.Buffer
 	b.WriteString("[]protocol.FileList{\n")
 	for _, f := range l {
-		fmt.Fprintf(&b, "  %q: #%d, %d bytes, %d blocks, perms=%o\n", f.Name, f.Version, f.Size, len(f.Blocks), f.Permissions)
+		fmt.Fprintf(&b, "  %q: #%v, %d bytes, %d blocks, perms=%o\n", f.Name, f.Version, f.Size, len(f.Blocks), f.Permissions)
 	}
 	b.WriteString("}")
 	return b.String()

lib/events/events.go

@@ -8,6 +8,7 @@
 package events
 
 import (
+	"encoding/json"
 	"errors"
 	"runtime"
 	"time"
@@ -118,6 +119,18 @@ func (t EventType) MarshalText() ([]byte, error) {
 	return []byte(t.String()), nil
 }
 
+func (t *EventType) UnmarshalJSON(b []byte) error {
+	var s string
+
+	if err := json.Unmarshal(b, &s); err != nil {
+		return err
+	}
+
+	*t = UnmarshalEventType(s)
+
+	return nil
+}
+
 func UnmarshalEventType(s string) EventType {
 	switch s {
 	case "Starting":

lib/events/events_test.go

@@ -7,6 +7,7 @@
 package events
 
 import (
+	"encoding/json"
 	"fmt"
 	"testing"
 	"time"
@@ -321,3 +322,20 @@ func TestSinceUsesSubscriptionId(t *testing.T) {
 		t.Fatal("Incorrect number of events:", len(events))
 	}
 }
+
+func TestUnmarshalEvent(t *testing.T) {
+	var event Event
+
+	s := `
+	{
+		"id": 1,
+		"globalID": 1,
+		"time": "2006-01-02T15:04:05.999999999Z",
+		"type": "Starting",
+		"data": {}
+	}`
+
+	if err := json.Unmarshal([]byte(s), &event); err != nil {
+		t.Fatal("Failed to unmarshal event:", err)
+	}
+}

lib/fs/basicfs_watch_test.go

@@ -218,7 +218,11 @@ func testScenario(t *testing.T, name string, testCase func(), expectedEvents []E
 
 	go testWatchOutput(t, name, eventChan, expectedEvents, allowOthers, ctx, cancel)
 
-	timeout := time.NewTimer(2 * time.Second)
+	timeoutDuration := 2 * time.Second
+	if runtime.GOOS == "darwin" {
+		timeoutDuration *= 2
+	}
+	timeout := time.NewTimer(timeoutDuration)
 
 	testCase()
 

lib/model/model.go

@@ -892,6 +892,8 @@ func (m *Model) ClusterConfig(deviceID protocol.DeviceID, cm protocol.ClusterCon
 	}
 
 	dbLocation := filepath.Dir(m.db.Location())
+	changed := false
+	deviceCfg := m.cfg.Devices()[deviceID]
 
 	// See issue #3802 - in short, we can't send modern symlink entries to older
 	// clients.
@@ -901,6 +903,13 @@ func (m *Model) ClusterConfig(deviceID protocol.DeviceID, cm protocol.ClusterCon
 		dropSymlinks = true
 	}
 
+	// Needs to happen outside of the fmut, as can cause CommitConfiguration
+	if deviceCfg.AutoAcceptFolders {
+		for _, folder := range cm.Folders {
+			changed = m.handleAutoAccepts(deviceCfg, folder) || changed
+		}
+	}
+
 	m.fmut.Lock()
 	var paused []string
 	for _, folder := range cm.Folders {
@@ -927,6 +936,7 @@ func (m *Model) ClusterConfig(deviceID protocol.DeviceID, cm protocol.ClusterCon
 			l.Infof("Unexpected folder %s sent from device %q; ensure that the folder exists and that this device is selected under \"Share With\" in the folder configuration.", folder.Description(), deviceID)
 			continue
 		}
+
 		if !folder.DisableTempIndexes {
 			tempIndexFolders = append(tempIndexFolders, folder.ID)
 		}
@@ -1021,8 +1031,7 @@ func (m *Model) ClusterConfig(deviceID protocol.DeviceID, cm protocol.ClusterCon
 		}
 	}
 
-	var changed = false
-	if deviceCfg := m.cfg.Devices()[deviceID]; deviceCfg.Introducer {
+	if deviceCfg.Introducer {
 		foldersDevices, introduced := m.handleIntroductions(deviceCfg, cm)
 		if introduced {
 			changed = true
@@ -1063,6 +1072,11 @@ func (m *Model) handleIntroductions(introducerCfg config.DeviceConfiguration, cm
 		// the folder.
 	nextDevice:
 		for _, device := range folder.Devices {
+			// No need to share with self.
+			if device.ID == m.id {
+				continue
+			}
+
 			foldersDevices.set(device.ID, folder.ID)
 
 			if _, ok := m.cfg.Devices()[device.ID]; !ok {
@@ -1081,7 +1095,8 @@ func (m *Model) handleIntroductions(introducerCfg config.DeviceConfiguration, cm
 
 			// We don't yet share this folder with this device. Add the device
 			// to sharing list of the folder.
-			m.introduceDeviceToFolder(device, folder, introducerCfg)
+			l.Infof("Sharing folder %s with %v (vouched for by introducer %v)", folder.Description(), device.ID, introducerCfg.DeviceID)
+			m.shareFolderWithDeviceLocked(device.ID, folder.ID, introducerCfg.DeviceID)
 			changed = true
 		}
 	}
@@ -1089,7 +1104,7 @@ func (m *Model) handleIntroductions(introducerCfg config.DeviceConfiguration, cm
 	return foldersDevices, changed
 }
 
-// handleIntroductions handles removals of devices/shares that are removed by an introducer device
+// handleDeintroductions handles removals of devices/shares that are removed by an introducer device
 func (m *Model) handleDeintroductions(introducerCfg config.DeviceConfiguration, cm protocol.ClusterConfig, foldersDevices folderDeviceSet) bool {
 	changed := false
 	foldersIntroducedByOthers := make(folderDeviceSet)
@@ -1142,6 +1157,51 @@ func (m *Model) handleDeintroductions(introducerCfg config.DeviceConfiguration,
 	return changed
 }
 
+// handleAutoAccepts handles adding and sharing folders for devices that have
+// AutoAcceptFolders set to true.
+func (m *Model) handleAutoAccepts(deviceCfg config.DeviceConfiguration, folder protocol.Folder) bool {
+	if _, ok := m.cfg.Folder(folder.ID); !ok {
+		defaultPath := m.cfg.Options().DefaultFolderPath
+		defaultPathFs := fs.NewFilesystem(fs.FilesystemTypeBasic, defaultPath)
+		for _, path := range []string{folder.Label, folder.ID} {
+			if _, err := defaultPathFs.Lstat(path); !fs.IsNotExist(err) {
+				continue
+			}
+
+			fcfg := config.NewFolderConfiguration(m.id, folder.ID, folder.Label, fs.FilesystemTypeBasic, filepath.Join(defaultPath, path))
+
+			// Need to wait for the waiter, as this calls CommitConfiguration,
+			// which sets up the folder and as we return from this call,
+			// ClusterConfig starts poking at m.folderFiles and other things
+			// that might not exist until the config is committed.
+			w, _ := m.cfg.SetFolder(fcfg)
+			w.Wait()
+
+			// This needs to happen under a lock.
+			m.fmut.Lock()
+			w = m.shareFolderWithDeviceLocked(deviceCfg.DeviceID, folder.ID, protocol.DeviceID{})
+			m.fmut.Unlock()
+			w.Wait()
+			l.Infof("Auto-accepted %s folder %s at path %s", deviceCfg.DeviceID, folder.Description(), fcfg.Path)
+			return true
+		}
+		l.Infof("Failed to auto-accept folder %s from %s due to path conflict", folder.Description(), deviceCfg.DeviceID)
+		return false
+	}
+
+	// Folder already exists.
+	if !m.folderSharedWith(folder.ID, deviceCfg.DeviceID) {
+		m.fmut.Lock()
+		w := m.shareFolderWithDeviceLocked(deviceCfg.DeviceID, folder.ID, protocol.DeviceID{})
+		m.fmut.Unlock()
+		w.Wait()
+		l.Infof("Shared %s with %s due to auto-accept", folder.ID, deviceCfg.DeviceID)
+		return true
+	}
+
+	return false
+}
+
 func (m *Model) introduceDevice(device protocol.Device, introducerCfg config.DeviceConfiguration) {
 	addresses := []string{"dynamic"}
 	for _, addr := range device.Addresses {
@@ -1170,18 +1230,17 @@ func (m *Model) introduceDevice(device protocol.Device, introducerCfg config.Dev
 	m.cfg.SetDevice(newDeviceCfg)
 }
 
-func (m *Model) introduceDeviceToFolder(device protocol.Device, folder protocol.Folder, introducerCfg config.DeviceConfiguration) {
-	l.Infof("Sharing folder %s with %v (vouched for by introducer %v)", folder.Description(), device.ID, introducerCfg.DeviceID)
+func (m *Model) shareFolderWithDeviceLocked(deviceID protocol.DeviceID, folder string, introducer protocol.DeviceID) config.Waiter {
+	m.deviceFolders[deviceID] = append(m.deviceFolders[deviceID], folder)
+	m.folderDevices.set(deviceID, folder)
 
-	m.deviceFolders[device.ID] = append(m.deviceFolders[device.ID], folder.ID)
-	m.folderDevices.set(device.ID, folder.ID)
-
-	folderCfg := m.cfg.Folders()[folder.ID]
+	folderCfg := m.cfg.Folders()[folder]
 	folderCfg.Devices = append(folderCfg.Devices, config.FolderDeviceConfiguration{
-		DeviceID:     device.ID,
-		IntroducedBy: introducerCfg.DeviceID,
+		DeviceID:     deviceID,
+		IntroducedBy: introducer,
 	})
-	m.cfg.SetFolder(folderCfg)
+	w, _ := m.cfg.SetFolder(folderCfg)
+	return w
 }
 
 // Closed is called when a connection has been closed
@@ -1486,7 +1545,7 @@ func (m *Model) AddConnection(conn connections.Connection, hello protocol.HelloR
 	conn.ClusterConfig(cm)
 
 	device, ok := m.cfg.Devices()[deviceID]
-	if ok && (device.Name == "" || m.cfg.Options().OverwriteRemoteDevNames) {
+	if ok && (device.Name == "" || m.cfg.Options().OverwriteRemoteDevNames) && hello.DeviceName != "" {
 		device.Name = hello.DeviceName
 		m.cfg.SetDevice(device)
 		m.cfg.Save()
@@ -2366,10 +2425,10 @@ func (m *Model) CommitConfiguration(from, to config.Configuration) bool {
 		if _, ok := fromFolders[folderID]; !ok {
 			// A folder was added.
 			if cfg.Paused {
-				l.Infoln(m, "Paused folder", cfg.Description())
+				l.Infoln("Paused folder", cfg.Description())
 				cfg.CreateRoot()
 			} else {
-				l.Infoln(m, "Adding folder", cfg.Description())
+				l.Infoln("Adding folder", cfg.Description())
 				m.AddFolder(cfg)
 				m.StartFolder(folderID)
 			}
@@ -2385,13 +2444,8 @@ func (m *Model) CommitConfiguration(from, to config.Configuration) bool {
 		}
 
 		// This folder exists on both sides. Settings might have changed.
-		// Check if anything differs, apart from the label.
-		toCfgCopy := toCfg
-		fromCfgCopy := fromCfg
-		fromCfgCopy.Label = ""
-		toCfgCopy.Label = ""
-
-		if !reflect.DeepEqual(fromCfgCopy, toCfgCopy) {
+		// Check if anything differs that requires a restart.
+		if !reflect.DeepEqual(fromCfg.RequiresRestartOnly(), toCfg.RequiresRestartOnly()) {
 			m.RestartFolder(toCfg)
 		}
 
@@ -2431,25 +2485,9 @@ func (m *Model) CommitConfiguration(from, to config.Configuration) bool {
 	}
 
 	// Some options don't require restart as those components handle it fine
-	// by themselves.
-	from.Options.URAccepted = to.Options.URAccepted
-	from.Options.URSeen = to.Options.URSeen
-	from.Options.URUniqueID = to.Options.URUniqueID
-	from.Options.ListenAddresses = to.Options.ListenAddresses
-	from.Options.RelaysEnabled = to.Options.RelaysEnabled
-	from.Options.UnackedNotificationIDs = to.Options.UnackedNotificationIDs
-	from.Options.MaxRecvKbps = to.Options.MaxRecvKbps
-	from.Options.MaxSendKbps = to.Options.MaxSendKbps
-	from.Options.LimitBandwidthInLan = to.Options.LimitBandwidthInLan
-	from.Options.StunKeepaliveS = to.Options.StunKeepaliveS
-	from.Options.StunServers = to.Options.StunServers
-	// All of the other generic options require restart. Or at least they may;
-	// removing this check requires going through those options carefully and
-	// making sure there are individual services that handle them correctly.
-	// This code is the "original" requires-restart check and protects other
-	// components that haven't yet been converted to VerifyConfig/CommitConfig
-	// handling.
-	if !reflect.DeepEqual(from.Options, to.Options) {
+	// by themselves. Compare the options structs containing only the
+	// attributes that require restart and act apprioriately.
+	if !reflect.DeepEqual(from.Options.RequiresRestartOnly(), to.Options.RequiresRestartOnly()) {
 		l.Debugln(m, "requires restart, options differ")
 		return false
 	}

lib/model/model_test.go

@@ -18,6 +18,7 @@ import (
 	"path/filepath"
 	"runtime"
 	"strconv"
+	"strings"
 	"sync"
 	"testing"
 	"time"
@@ -36,13 +37,14 @@ var device1, device2 protocol.DeviceID
 var defaultConfig *config.Wrapper
 var defaultFolderConfig config.FolderConfiguration
 var defaultFs fs.Filesystem
+var defaultAutoAcceptCfg config.Configuration
 
 func init() {
 	device1, _ = protocol.DeviceIDFromString("AIR6LPZ-7K4PTTV-UXQSMUU-CPQ5YWH-OEDFIIQ-JUG777G-2YQXXR5-YD6AWQR")
 	device2, _ = protocol.DeviceIDFromString("GYRZZQB-IRNPV4Z-T7TC52W-EQYJ3TT-FDQW6MW-DFLMU42-SSSU6EM-FBK2VAY")
 	defaultFs = fs.NewFilesystem(fs.FilesystemTypeBasic, "testdata")
 
-	defaultFolderConfig = config.NewFolderConfiguration("default", fs.FilesystemTypeBasic, "testdata")
+	defaultFolderConfig = config.NewFolderConfiguration(protocol.LocalDeviceID, "default", "default", fs.FilesystemTypeBasic, "testdata")
 	defaultFolderConfig.Devices = []config.FolderDeviceConfiguration{{DeviceID: device1}}
 	_defaultConfig := config.Configuration{
 		Folders: []config.FolderConfiguration{defaultFolderConfig},
@@ -53,6 +55,17 @@ func init() {
 		},
 	}
 	defaultConfig = config.Wrap("/tmp/test", _defaultConfig)
+	defaultAutoAcceptCfg = config.Configuration{
+		Devices: []config.DeviceConfiguration{
+			{
+				DeviceID:          device1,
+				AutoAcceptFolders: true,
+			},
+		},
+		Options: config.OptionsConfiguration{
+			DefaultFolderPath: "testdata",
+		},
+	}
 }
 
 var testDataExpected = map[string]protocol.FileInfo{
@@ -87,6 +100,20 @@ func init() {
 	}
 }
 
+func newState(cfg config.Configuration) (*config.Wrapper, *Model) {
+	db := db.OpenMemory()
+
+	wcfg := config.Wrap("/tmp/test", cfg)
+
+	m := NewModel(wcfg, protocol.LocalDeviceID, "syncthing", "dev", db, nil)
+	for _, folder := range cfg.Folders {
+		m.AddFolder(folder)
+	}
+	m.ServeBackground()
+	m.AddConnection(&fakeConnection{id: device1}, protocol.HelloResult{})
+	return wcfg, m
+}
+
 func TestRequest(t *testing.T) {
 	db := db.OpenMemory()
 
@@ -609,20 +636,6 @@ func TestIntroducer(t *testing.T) {
 		return false
 	}
 
-	newState := func(cfg config.Configuration) (*config.Wrapper, *Model) {
-		db := db.OpenMemory()
-
-		wcfg := config.Wrap("/tmp/test", cfg)
-
-		m := NewModel(wcfg, protocol.LocalDeviceID, "syncthing", "dev", db, nil)
-		for _, folder := range cfg.Folders {
-			m.AddFolder(folder)
-		}
-		m.ServeBackground()
-		m.AddConnection(&fakeConnection{id: device1}, protocol.HelloResult{})
-		return wcfg, m
-	}
-
 	wcfg, m := newState(config.Configuration{
 		Devices: []config.DeviceConfiguration{
 			{
@@ -970,6 +983,237 @@ func TestIntroducer(t *testing.T) {
 	}
 }
 
+func TestAutoAcceptRejected(t *testing.T) {
+	// Nothing happens if AutoAcceptFolders not set
+	tcfg := defaultAutoAcceptCfg.Copy()
+	tcfg.Devices[0].AutoAcceptFolders = false
+	wcfg, m := newState(tcfg)
+	id := srand.String(8)
+	defer os.RemoveAll(filepath.Join("testdata", id))
+	m.ClusterConfig(device1, protocol.ClusterConfig{
+		Folders: []protocol.Folder{
+			{
+				ID:    id,
+				Label: id,
+			},
+		},
+	})
+
+	if _, ok := wcfg.Folder(id); ok || m.folderSharedWith(id, device1) {
+		t.Error("unexpected shared", id)
+	}
+}
+
+func TestAutoAcceptNewFolder(t *testing.T) {
+	// New folder
+	wcfg, m := newState(defaultAutoAcceptCfg)
+	id := srand.String(8)
+	defer os.RemoveAll(filepath.Join("testdata", id))
+	m.ClusterConfig(device1, protocol.ClusterConfig{
+		Folders: []protocol.Folder{
+			{
+				ID:    id,
+				Label: id,
+			},
+		},
+	})
+	if _, ok := wcfg.Folder(id); !ok || !m.folderSharedWith(id, device1) {
+		t.Error("expected shared", id)
+	}
+}
+
+func TestAutoAcceptMultipleFolders(t *testing.T) {
+	// Multiple new folders
+	wcfg, m := newState(defaultAutoAcceptCfg)
+	id1 := srand.String(8)
+	defer os.RemoveAll(filepath.Join("testdata", id1))
+	id2 := srand.String(8)
+	defer os.RemoveAll(filepath.Join("testdata", id2))
+	m.ClusterConfig(device1, protocol.ClusterConfig{
+		Folders: []protocol.Folder{
+			{
+				ID:    id1,
+				Label: id1,
+			},
+			{
+				ID:    id2,
+				Label: id2,
+			},
+		},
+	})
+	if _, ok := wcfg.Folder(id1); !ok || !m.folderSharedWith(id1, device1) {
+		t.Error("expected shared", id1)
+	}
+	if _, ok := wcfg.Folder(id2); !ok || !m.folderSharedWith(id2, device1) {
+		t.Error("expected shared", id2)
+	}
+}
+
+func TestAutoAcceptExistingFolder(t *testing.T) {
+	// Existing folder
+	id := srand.String(8)
+	idOther := srand.String(8) // To check that path does not get changed.
+	defer os.RemoveAll(filepath.Join("testdata", id))
+
+	tcfg := defaultAutoAcceptCfg.Copy()
+	tcfg.Folders = []config.FolderConfiguration{
+		{
+			ID:   id,
+			Path: filepath.Join("testdata", idOther), // To check that path does not get changed.
+		},
+	}
+	wcfg, m := newState(tcfg)
+	if _, ok := wcfg.Folder(id); !ok || m.folderSharedWith(id, device1) {
+		t.Error("missing folder, or shared", id)
+	}
+	m.ClusterConfig(device1, protocol.ClusterConfig{
+		Folders: []protocol.Folder{
+			{
+				ID:    id,
+				Label: id,
+			},
+		},
+	})
+
+	if fcfg, ok := wcfg.Folder(id); !ok || !m.folderSharedWith(id, device1) || fcfg.Path != filepath.Join("testdata", idOther) {
+		t.Error("missing folder, or unshared, or path changed", id)
+	}
+}
+
+func TestAutoAcceptNewAndExistingFolder(t *testing.T) {
+	// New and existing folder
+	id1 := srand.String(8)
+	defer os.RemoveAll(filepath.Join("testdata", id1))
+	id2 := srand.String(8)
+	defer os.RemoveAll(filepath.Join("testdata", id2))
+
+	tcfg := defaultAutoAcceptCfg.Copy()
+	tcfg.Folders = []config.FolderConfiguration{
+		{
+			ID:   id1,
+			Path: filepath.Join("testdata", id1), // from previous test case, to verify that path doesn't get changed.
+		},
+	}
+	wcfg, m := newState(tcfg)
+	if _, ok := wcfg.Folder(id1); !ok || m.folderSharedWith(id1, device1) {
+		t.Error("missing folder, or shared", id1)
+	}
+	m.ClusterConfig(device1, protocol.ClusterConfig{
+		Folders: []protocol.Folder{
+			{
+				ID:    id1,
+				Label: id1,
+			},
+			{
+				ID:    id2,
+				Label: id2,
+			},
+		},
+	})
+
+	for i, id := range []string{id1, id2} {
+		if _, ok := wcfg.Folder(id); !ok || !m.folderSharedWith(id, device1) {
+			t.Error("missing folder, or unshared", i, id)
+		}
+	}
+}
+
+func TestAutoAcceptAlreadyShared(t *testing.T) {
+	// Already shared
+	id := srand.String(8)
+	defer os.RemoveAll(filepath.Join("testdata", id))
+	tcfg := defaultAutoAcceptCfg.Copy()
+	tcfg.Folders = []config.FolderConfiguration{
+		{
+			ID:   id,
+			Path: filepath.Join("testdata", id),
+			Devices: []config.FolderDeviceConfiguration{
+				{
+					DeviceID: device1,
+				},
+			},
+		},
+	}
+	wcfg, m := newState(tcfg)
+	if _, ok := wcfg.Folder(id); !ok || !m.folderSharedWith(id, device1) {
+		t.Error("missing folder, or not shared", id)
+	}
+	m.ClusterConfig(device1, protocol.ClusterConfig{
+		Folders: []protocol.Folder{
+			{
+				ID:    id,
+				Label: id,
+			},
+		},
+	})
+
+	if _, ok := wcfg.Folder(id); !ok || !m.folderSharedWith(id, device1) {
+		t.Error("missing folder, or not shared", id)
+	}
+}
+
+func TestAutoAcceptNameConflict(t *testing.T) {
+	id := srand.String(8)
+	label := srand.String(8)
+	os.MkdirAll(filepath.Join("testdata", id), 0777)
+	os.MkdirAll(filepath.Join("testdata", label), 0777)
+	defer os.RemoveAll(filepath.Join("testdata", id))
+	defer os.RemoveAll(filepath.Join("testdata", label))
+	wcfg, m := newState(defaultAutoAcceptCfg)
+	m.ClusterConfig(device1, protocol.ClusterConfig{
+		Folders: []protocol.Folder{
+			{
+				ID:    id,
+				Label: label,
+			},
+		},
+	})
+	if _, ok := wcfg.Folder(id); ok || m.folderSharedWith(id, device1) {
+		t.Error("unexpected folder", id)
+	}
+}
+
+func TestAutoAcceptPrefersLabel(t *testing.T) {
+	// Prefers label, falls back to ID.
+	wcfg, m := newState(defaultAutoAcceptCfg)
+	id := srand.String(8)
+	label := srand.String(8)
+	defer os.RemoveAll(filepath.Join("testdata", id))
+	defer os.RemoveAll(filepath.Join("testdata", label))
+	m.ClusterConfig(device1, protocol.ClusterConfig{
+		Folders: []protocol.Folder{
+			{
+				ID:    id,
+				Label: label,
+			},
+		},
+	})
+	if fcfg, ok := wcfg.Folder(id); !ok || !m.folderSharedWith(id, device1) || !strings.HasSuffix(fcfg.Path, label) {
+		t.Error("expected shared, or wrong path", id, label, fcfg.Path)
+	}
+}
+
+func TestAutoAcceptFallsBackToID(t *testing.T) {
+	// Prefers label, falls back to ID.
+	wcfg, m := newState(defaultAutoAcceptCfg)
+	id := srand.String(8)
+	label := srand.String(8)
+	os.MkdirAll(filepath.Join("testdata", label), 0777)
+	defer os.RemoveAll(filepath.Join("testdata", label))
+	defer os.RemoveAll(filepath.Join("testdata", id))
+	m.ClusterConfig(device1, protocol.ClusterConfig{
+		Folders: []protocol.Folder{
+			{
+				ID:    id,
+				Label: label,
+			},
+		},
+	})
+	if fcfg, ok := wcfg.Folder(id); !ok || !m.folderSharedWith(id, device1) || !strings.HasSuffix(fcfg.Path, id) {
+		t.Error("expected shared, or wrong path", id, label, fcfg.Path)
+	}
+}
+
 func changeIgnores(t *testing.T, m *Model, expected []string) {
 	arrEqual := func(a, b []string) bool {
 		if len(a) != len(b) {
@@ -1877,39 +2121,6 @@ func TestIssue3028(t *testing.T) {
 	}
 }
 
-func TestIssue3164(t *testing.T) {
-	os.RemoveAll("testdata/issue3164")
-	defer os.RemoveAll("testdata/issue3164")
-
-	if err := os.MkdirAll("testdata/issue3164/oktodelete/foobar", 0777); err != nil {
-		t.Fatal(err)
-	}
-	if err := ioutil.WriteFile("testdata/issue3164/oktodelete/foobar/file", []byte("Hello"), 0644); err != nil {
-		t.Fatal(err)
-	}
-	if err := ioutil.WriteFile("testdata/issue3164/oktodelete/file", []byte("Hello"), 0644); err != nil {
-		t.Fatal(err)
-	}
-	f := protocol.FileInfo{
-		Name: "issue3164",
-	}
-	m := ignore.New(defaultFs)
-	if err := m.Parse(bytes.NewBufferString("(?d)oktodelete"), ""); err != nil {
-		t.Fatal(err)
-	}
-
-	fl := sendReceiveFolder{
-		dbUpdates: make(chan dbUpdateJob, 1),
-		fs:        fs.NewFilesystem(fs.FilesystemTypeBasic, "testdata"),
-	}
-
-	fl.deleteDir(f, m)
-
-	if _, err := os.Stat("testdata/issue3164"); !os.IsNotExist(err) {
-		t.Fatal(err)
-	}
-}
-
 func TestIssue4357(t *testing.T) {
 	db := db.OpenMemory()
 	cfg := defaultConfig.RawCopy()
@@ -1920,7 +2131,9 @@ func TestIssue4357(t *testing.T) {
 	defer m.Stop()
 
 	// Force the model to wire itself and add the folders
-	if err := wrapper.ReplaceBlocking(cfg); err != nil {
+	p, err := wrapper.Replace(cfg)
+	p.Wait()
+	if err != nil {
 		t.Error(err)
 	}
 
@@ -1931,7 +2144,9 @@ func TestIssue4357(t *testing.T) {
 	newCfg := wrapper.RawCopy()
 	newCfg.Folders[0].Paused = true
 
-	if err := wrapper.ReplaceBlocking(newCfg); err != nil {
+	p, err = wrapper.Replace(newCfg)
+	p.Wait()
+	if err != nil {
 		t.Error(err)
 	}
 
@@ -1943,7 +2158,9 @@ func TestIssue4357(t *testing.T) {
 		t.Error("should still have folder in config")
 	}
 
-	if err := wrapper.ReplaceBlocking(config.Configuration{}); err != nil {
+	p, err = wrapper.Replace(config.Configuration{})
+	p.Wait()
+	if err != nil {
 		t.Error(err)
 	}
 
@@ -1952,7 +2169,9 @@ func TestIssue4357(t *testing.T) {
 	}
 
 	// Add the folder back, should be running
-	if err := wrapper.ReplaceBlocking(cfg); err != nil {
+	p, err = wrapper.Replace(cfg)
+	p.Wait()
+	if err != nil {
 		t.Error(err)
 	}
 
@@ -1964,7 +2183,9 @@ func TestIssue4357(t *testing.T) {
 	}
 
 	// Should not panic when removing a running folder.
-	if err := wrapper.ReplaceBlocking(config.Configuration{}); err != nil {
+	p, err = wrapper.Replace(config.Configuration{})
+	p.Wait()
+	if err != nil {
 		t.Error(err)
 	}
 
@@ -2066,7 +2287,7 @@ func TestIssue2782(t *testing.T) {
 
 	db := db.OpenMemory()
 	m := NewModel(defaultConfig, protocol.LocalDeviceID, "syncthing", "dev", db, nil)
-	m.AddFolder(config.NewFolderConfiguration("default", fs.FilesystemTypeBasic, "~/"+testName+"/synclink/"))
+	m.AddFolder(config.NewFolderConfiguration(protocol.LocalDeviceID, "default", "default", fs.FilesystemTypeBasic, "~/"+testName+"/synclink/"))
 	m.StartFolder("default")
 	m.ServeBackground()
 	defer m.Stop()
@@ -2111,7 +2332,7 @@ func TestIndexesForUnknownDevicesDropped(t *testing.T) {
 func TestSharedWithClearedOnDisconnect(t *testing.T) {
 	dbi := db.OpenMemory()
 
-	fcfg := config.NewFolderConfiguration("default", fs.FilesystemTypeBasic, "testdata")
+	fcfg := config.NewFolderConfiguration(protocol.LocalDeviceID, "default", "default", fs.FilesystemTypeBasic, "testdata")
 	fcfg.Devices = []config.FolderDeviceConfiguration{
 		{DeviceID: device1},
 		{DeviceID: device2},
@@ -2177,7 +2398,7 @@ func TestSharedWithClearedOnDisconnect(t *testing.T) {
 	cfg = cfg.Copy()
 	cfg.Devices = cfg.Devices[:1]
 
-	if err := wcfg.Replace(cfg); err != nil {
+	if _, err := wcfg.Replace(cfg); err != nil {
 		t.Error(err)
 	}
 
@@ -2350,7 +2571,7 @@ func TestNoRequestsFromPausedDevices(t *testing.T) {
 
 	dbi := db.OpenMemory()
 
-	fcfg := config.NewFolderConfiguration("default", fs.FilesystemTypeBasic, "testdata")
+	fcfg := config.NewFolderConfiguration(protocol.LocalDeviceID, "default", "default", fs.FilesystemTypeBasic, "testdata")
 	fcfg.Devices = []config.FolderDeviceConfiguration{
 		{DeviceID: device1},
 		{DeviceID: device2},
@@ -2507,6 +2728,147 @@ func TestCustomMarkerName(t *testing.T) {
 	}
 }
 
+func TestRemoveDirWithContent(t *testing.T) {
+	defer func() {
+		defaultFs.RemoveAll("dirwith")
+	}()
+
+	defaultFs.MkdirAll("dirwith", 0755)
+	content := filepath.Join("dirwith", "content")
+	fd, err := defaultFs.Create(content)
+	if err != nil {
+		t.Fatal(err)
+		return
+	}
+	fd.Close()
+
+	dbi := db.OpenMemory()
+	m := NewModel(defaultConfig, protocol.LocalDeviceID, "syncthing", "dev", dbi, nil)
+	m.AddFolder(defaultFolderConfig)
+	m.StartFolder("default")
+	m.ServeBackground()
+	defer m.Stop()
+	m.ScanFolder("default")
+
+	dir, ok := m.CurrentFolderFile("default", "dirwith")
+	if !ok {
+		t.Fatalf("Can't get dir \"dirwith\" after initial scan")
+	}
+	dir.Deleted = true
+	dir.Version = dir.Version.Update(device1.Short()).Update(device1.Short())
+
+	file, ok := m.CurrentFolderFile("default", content)
+	if !ok {
+		t.Fatalf("Can't get file \"%v\" after initial scan", content)
+	}
+	file.Deleted = true
+	file.Version = file.Version.Update(device1.Short()).Update(device1.Short())
+
+	m.IndexUpdate(device1, "default", []protocol.FileInfo{dir, file})
+
+	// Is there something we could trigger on instead of just waiting?
+	timeout := time.NewTimer(5 * time.Second)
+	for {
+		dir, ok := m.CurrentFolderFile("default", "dirwith")
+		if !ok {
+			t.Fatalf("Can't get dir \"dirwith\" after index update")
+		}
+		file, ok := m.CurrentFolderFile("default", content)
+		if !ok {
+			t.Fatalf("Can't get file \"%v\" after index update", content)
+		}
+		if dir.Deleted && file.Deleted {
+			return
+		}
+
+		select {
+		case <-timeout.C:
+			if !dir.Deleted && !file.Deleted {
+				t.Errorf("Neither the dir nor its content was deleted before timing out.")
+			} else if !dir.Deleted {
+				t.Errorf("The dir was not deleted before timing out.")
+			} else {
+				t.Errorf("The content of the dir was not deleted before timing out.")
+			}
+			return
+		default:
+			time.Sleep(100 * time.Millisecond)
+		}
+	}
+}
+
+func TestIssue4475(t *testing.T) {
+	defer func() {
+		defaultFs.RemoveAll("delDir")
+	}()
+
+	err := defaultFs.MkdirAll("delDir", 0755)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	dbi := db.OpenMemory()
+	m := NewModel(defaultConfig, protocol.LocalDeviceID, "syncthing", "dev", dbi, nil)
+	m.AddFolder(defaultFolderConfig)
+	m.StartFolder("default")
+	m.ServeBackground()
+	defer m.Stop()
+	m.ScanFolder("default")
+
+	// Scenario: Dir is deleted locally and before syncing/index exchange
+	// happens, a file is create in that dir on the remote.
+	// This should result in the directory being recreated and added to the
+	// db locally.
+
+	if err = defaultFs.RemoveAll("delDir"); err != nil {
+		t.Fatal(err)
+	}
+
+	m.ScanFolder("default")
+
+	conn := addFakeConn(m, device1)
+	conn.folder = "default"
+
+	if !m.folderSharedWith("default", device1) {
+		t.Fatal("not shared with device1")
+	}
+
+	fileName := filepath.Join("delDir", "file")
+	conn.addFile(fileName, 0644, protocol.FileInfoTypeFile, nil)
+	conn.sendIndexUpdate()
+
+	// Is there something we could trigger on instead of just waiting?
+	timeout := time.NewTimer(5 * time.Second)
+	created := false
+	for {
+		if !created {
+			if _, ok := m.CurrentFolderFile("default", fileName); ok {
+				created = true
+			}
+		} else {
+			dir, ok := m.CurrentFolderFile("default", "delDir")
+			if !ok {
+				t.Fatalf("can't get dir from db")
+			}
+			if !dir.Deleted {
+				return
+			}
+		}
+
+		select {
+		case <-timeout.C:
+			if created {
+				t.Errorf("Timed out before file from remote was created")
+			} else {
+				t.Errorf("Timed out before directory was resurrected in db")
+			}
+			return
+		default:
+			time.Sleep(100 * time.Millisecond)
+		}
+	}
+}
+
 func addFakeConn(m *Model, dev protocol.DeviceID) *fakeConnection {
 	fc := &fakeConnection{id: dev, model: m}
 	m.AddConnection(fc, protocol.HelloResult{})

lib/model/requests_test.go

@@ -216,7 +216,7 @@ func TestRequestVersioningSymlinkAttack(t *testing.T) {
 		panic("Failed to create temporary testing dir")
 	}
 	cfg := defaultConfig.RawCopy()
-	cfg.Folders[0] = config.NewFolderConfiguration("default", fs.FilesystemTypeBasic, tmpFolder)
+	cfg.Folders[0] = config.NewFolderConfiguration(protocol.LocalDeviceID, "default", "default", fs.FilesystemTypeBasic, tmpFolder)
 	cfg.Folders[0].Devices = []config.FolderDeviceConfiguration{
 		{DeviceID: device1},
 		{DeviceID: device2},
@@ -292,7 +292,7 @@ func setupModelWithConnection() (*Model, *fakeConnection, string) {
 		panic("Failed to create temporary testing dir")
 	}
 	cfg := defaultConfig.RawCopy()
-	cfg.Folders[0] = config.NewFolderConfiguration("default", fs.FilesystemTypeBasic, tmpFolder)
+	cfg.Folders[0] = config.NewFolderConfiguration(protocol.LocalDeviceID, "default", "default", fs.FilesystemTypeBasic, tmpFolder)
 	cfg.Folders[0].Devices = []config.FolderDeviceConfiguration{
 		{DeviceID: device1},
 		{DeviceID: device2},

lib/model/rwfolder.go

@@ -60,6 +60,9 @@ var (
 	activity               = newDeviceActivity()
 	errNoDevice            = errors.New("peers who had this file went away, or the file has changed while syncing. will retry later")
 	errSymlinksUnsupported = errors.New("symlinks not supported")
+	errDirHasToBeScanned   = errors.New("directory contains unexpected files, scheduling scan")
+	errDirHasIgnored       = errors.New("directory contains ignored files (see ignore documentation for (?d) prefix)")
+	errDirNotEmpty         = errors.New("directory is not empty")
 )
 
 const (
@@ -92,7 +95,6 @@ type sendReceiveFolder struct {
 	pause     time.Duration
 
 	queue         *jobQueue
-	dbUpdates     chan dbUpdateJob
 	pullScheduled chan struct{}
 
 	errors    map[string]string // path -> error string
@@ -251,17 +253,21 @@ func (f *sendReceiveFolder) pull(prevIgnoreHash string) (curIgnoreHash string, s
 	curIgnoreHash = curIgnores.Hash()
 	ignoresChanged := curIgnoreHash != prevIgnoreHash
 
-	l.Debugln(f, "pulling")
+	l.Debugf("%v pulling (ignoresChanged=%v)", f, ignoresChanged)
 
 	f.setState(FolderSyncing)
 	f.clearErrors()
+
+	scanChan := make(chan string)
+	go f.pullScannerRoutine(scanChan)
+
 	var changed int
 	tries := 0
 
 	for {
 		tries++
 
-		changed := f.pullerIteration(curIgnores, ignoresChanged)
+		changed = f.pullerIteration(curIgnores, ignoresChanged, scanChan)
 		l.Debugln(f, "changed", changed)
 
 		if changed == 0 {
@@ -294,6 +300,8 @@ func (f *sendReceiveFolder) pull(prevIgnoreHash string) (curIgnoreHash string, s
 
 	f.setState(FolderIdle)
 
+	close(scanChan)
+
 	if changed == 0 {
 		return curIgnoreHash, true
 	}
@@ -305,23 +313,23 @@ func (f *sendReceiveFolder) pull(prevIgnoreHash string) (curIgnoreHash string, s
 // returns the number items that should have been synced (even those that
 // might have failed). One puller iteration handles all files currently
 // flagged as needed in the folder.
-func (f *sendReceiveFolder) pullerIteration(ignores *ignore.Matcher, ignoresChanged bool) int {
+func (f *sendReceiveFolder) pullerIteration(ignores *ignore.Matcher, ignoresChanged bool, scanChan chan<- string) int {
 	pullChan := make(chan pullBlockState)
 	copyChan := make(chan copyBlocksState)
 	finisherChan := make(chan *sharedPullerState)
+	dbUpdateChan := make(chan dbUpdateJob)
 
-	updateWg := sync.NewWaitGroup()
-	copyWg := sync.NewWaitGroup()
 	pullWg := sync.NewWaitGroup()
+	copyWg := sync.NewWaitGroup()
 	doneWg := sync.NewWaitGroup()
+	updateWg := sync.NewWaitGroup()
 
 	l.Debugln(f, "c", f.Copiers, "p", f.Pullers)
 
-	f.dbUpdates = make(chan dbUpdateJob)
 	updateWg.Add(1)
 	go func() {
-		// dbUpdaterRoutine finishes when f.dbUpdates is closed
-		f.dbUpdaterRoutine()
+		// dbUpdaterRoutine finishes when dbUpdateChan is closed
+		f.dbUpdaterRoutine(dbUpdateChan)
 		updateWg.Done()
 	}()
 
@@ -346,7 +354,7 @@ func (f *sendReceiveFolder) pullerIteration(ignores *ignore.Matcher, ignoresChan
 	doneWg.Add(1)
 	// finisherRoutine finishes when finisherChan is closed
 	go func() {
-		f.finisherRoutine(finisherChan)
+		f.finisherRoutine(ignores, finisherChan, dbUpdateChan, scanChan)
 		doneWg.Done()
 	}()
 
@@ -370,6 +378,7 @@ func (f *sendReceiveFolder) pullerIteration(ignores *ignore.Matcher, ignoresChan
 
 	iterate(protocol.LocalDeviceID, func(intf db.FileIntf) bool {
 		if f.IgnoreDelete && intf.IsDeleted() {
+			l.Debugln(f, "ignore file deletion (config)", intf.FileName())
 			return true
 		}
 
@@ -387,7 +396,7 @@ func (f *sendReceiveFolder) pullerIteration(ignores *ignore.Matcher, ignoresChan
 		case ignores.ShouldIgnore(file.Name):
 			file.Invalidate(f.model.id.Short())
 			l.Debugln(f, "Handling ignored file", file)
-			f.dbUpdates <- dbUpdateJob{file, dbUpdateInvalidate}
+			dbUpdateChan <- dbUpdateJob{file, dbUpdateInvalidate}
 
 		case file.IsDeleted():
 			processDirectly = append(processDirectly, file)
@@ -410,7 +419,7 @@ func (f *sendReceiveFolder) pullerIteration(ignores *ignore.Matcher, ignoresChan
 		case runtime.GOOS == "windows" && file.IsSymlink():
 			file.Invalidate(f.model.id.Short())
 			l.Debugln(f, "Invalidating symlink (unsupported)", file.Name)
-			f.dbUpdates <- dbUpdateJob{file, dbUpdateInvalidate}
+			dbUpdateChan <- dbUpdateJob{file, dbUpdateInvalidate}
 
 		default:
 			// Directories, symlinks
@@ -463,11 +472,12 @@ func (f *sendReceiveFolder) pullerIteration(ignores *ignore.Matcher, ignoresChan
 
 		case fi.IsDirectory() && !fi.IsSymlink():
 			l.Debugln(f, "Handling directory", fi.Name)
-			f.handleDir(fi)
+			f.handleDir(fi, dbUpdateChan)
 
 		case fi.IsSymlink():
+			l.Debugln("Handling symlink", fi.Name)
 			l.Debugln(f, "Handling symlink", fi.Name)
-			f.handleSymlink(fi)
+			f.handleSymlink(fi, dbUpdateChan)
 
 		default:
 			l.Warnln(fi)
@@ -522,13 +532,33 @@ nextFile:
 			continue
 		}
 
+		dirName := filepath.Dir(fi.Name)
+
 		// Verify that the thing we are handling lives inside a directory,
 		// and not a symlink or empty space.
-		if err := osutil.TraversesSymlink(f.fs, filepath.Dir(fi.Name)); err != nil {
+		if err := osutil.TraversesSymlink(f.fs, dirName); err != nil {
 			f.newError("traverses q", fi.Name, err)
 			continue
 		}
 
+		// issues #114 and #4475: This works around a race condition
+		// between two devices, when one device removes a directory and the
+		// other creates a file in it. However that happens, we end up with
+		// a directory for "foo" with the delete bit, but a file "foo/bar"
+		// that we want to sync. We never create the directory, and hence
+		// fail to create the file and end up looping forever on it. This
+		// breaks that by creating the directory and scheduling a scan,
+		// where it will be found and the delete bit on it removed.  The
+		// user can then clean up as they like...
+		if _, err := f.fs.Lstat(dirName); fs.IsNotExist(err) {
+			l.Debugln("%v resurrecting parent directory of %v", f, fi.Name)
+			if err := f.fs.MkdirAll(dirName, 0755); err != nil {
+				f.newError("resurrecting parent dir", fi.Name, err)
+				continue
+			}
+			scanChan <- dirName
+		}
+
 		// Check our list of files to be removed for a match, in which case
 		// we can just do a rename instead.
 		key := string(fi.Blocks[0].Hash)
@@ -546,7 +576,7 @@ nextFile:
 				// Remove the pending deletion (as we perform it by renaming)
 				delete(fileDeletions, candidate.Name)
 
-				f.renameFile(desired, fi)
+				f.renameFile(desired, fi, dbUpdateChan)
 
 				f.queue.Done(fileName)
 				continue nextFile
@@ -554,7 +584,7 @@ nextFile:
 		}
 
 		// Handle the file normally, by coping and pulling, etc.
-		f.handleFile(fi, copyChan, finisherChan)
+		f.handleFile(fi, copyChan, finisherChan, dbUpdateChan)
 	}
 
 	// Signal copy and puller routines that we are done with the in data for
@@ -572,24 +602,24 @@ nextFile:
 
 	for _, file := range fileDeletions {
 		l.Debugln(f, "Deleting file", file.Name)
-		f.deleteFile(file)
+		f.deleteFile(file, dbUpdateChan)
 	}
 
 	for i := range dirDeletions {
 		dir := dirDeletions[len(dirDeletions)-i-1]
 		l.Debugln(f, "Deleting dir", dir.Name)
-		f.deleteDir(dir, ignores)
+		f.handleDeleteDir(dir, ignores, dbUpdateChan, scanChan)
 	}
 
-	// Wait for db updates to complete
-	close(f.dbUpdates)
+	// Wait for db updates and scan scheduling to complete
+	close(dbUpdateChan)
 	updateWg.Wait()
 
 	return changed
 }
 
 // handleDir creates or updates the given directory
-func (f *sendReceiveFolder) handleDir(file protocol.FileInfo) {
+func (f *sendReceiveFolder) handleDir(file protocol.FileInfo, dbUpdateChan chan<- dbUpdateJob) {
 	// Used in the defer closure below, updated by the function body. Take
 	// care not declare another err.
 	var err error
@@ -657,7 +687,7 @@ func (f *sendReceiveFolder) handleDir(file protocol.FileInfo) {
 		}
 
 		if err = osutil.InWritableDir(mkdir, f.fs, file.Name); err == nil {
-			f.dbUpdates <- dbUpdateJob{file, dbUpdateHandleDir}
+			dbUpdateChan <- dbUpdateJob{file, dbUpdateHandleDir}
 		} else {
 			f.newError("dir mkdir", file.Name, err)
 		}
@@ -673,16 +703,16 @@ func (f *sendReceiveFolder) handleDir(file protocol.FileInfo) {
 	// don't handle modification times on directories, because that sucks...)
 	// It's OK to change mode bits on stuff within non-writable directories.
 	if f.ignorePermissions(file) {
-		f.dbUpdates <- dbUpdateJob{file, dbUpdateHandleDir}
+		dbUpdateChan <- dbUpdateJob{file, dbUpdateHandleDir}
 	} else if err := f.fs.Chmod(file.Name, mode|(fs.FileMode(info.Mode())&retainBits)); err == nil {
-		f.dbUpdates <- dbUpdateJob{file, dbUpdateHandleDir}
+		dbUpdateChan <- dbUpdateJob{file, dbUpdateHandleDir}
 	} else {
 		f.newError("dir chmod", file.Name, err)
 	}
 }
 
 // handleSymlink creates or updates the given symlink
-func (f *sendReceiveFolder) handleSymlink(file protocol.FileInfo) {
+func (f *sendReceiveFolder) handleSymlink(file protocol.FileInfo, dbUpdateChan chan<- dbUpdateJob) {
 	// Used in the defer closure below, updated by the function body. Take
 	// care not declare another err.
 	var err error
@@ -735,14 +765,14 @@ func (f *sendReceiveFolder) handleSymlink(file protocol.FileInfo) {
 	}
 
 	if err = osutil.InWritableDir(createLink, f.fs, file.Name); err == nil {
-		f.dbUpdates <- dbUpdateJob{file, dbUpdateHandleSymlink}
+		dbUpdateChan <- dbUpdateJob{file, dbUpdateHandleSymlink}
 	} else {
 		f.newError("symlink create", file.Name, err)
 	}
 }
 
-// deleteDir attempts to delete the given directory
-func (f *sendReceiveFolder) deleteDir(file protocol.FileInfo, matcher *ignore.Matcher) {
+// handleDeleteDir attempts to remove a directory that was deleted on a remote
+func (f *sendReceiveFolder) handleDeleteDir(file protocol.FileInfo, ignores *ignore.Matcher, dbUpdateChan chan<- dbUpdateJob, scanChan chan<- string) {
 	// Used in the defer closure below, updated by the function body. Take
 	// care not declare another err.
 	var err error
@@ -764,33 +794,18 @@ func (f *sendReceiveFolder) deleteDir(file protocol.FileInfo, matcher *ignore.Ma
 		})
 	}()
 
-	// Delete any temporary files lying around in the directory
+	err = f.deleteDir(file.Name, ignores, scanChan)
 
-	files, _ := f.fs.DirNames(file.Name)
-	for _, dirFile := range files {
-		fullDirFile := filepath.Join(file.Name, dirFile)
-		if fs.IsTemporary(dirFile) || (matcher != nil && matcher.Match(fullDirFile).IsDeletable()) {
-			f.fs.RemoveAll(fullDirFile)
-		}
-	}
-
-	err = osutil.InWritableDir(f.fs.Remove, f.fs, file.Name)
-	if err == nil || fs.IsNotExist(err) {
-		// It was removed or it doesn't exist to start with
-		f.dbUpdates <- dbUpdateJob{file, dbUpdateDeleteDir}
-	} else if _, serr := f.fs.Lstat(file.Name); serr != nil && !fs.IsPermission(serr) {
-		// We get an error just looking at the directory, and it's not a
-		// permission problem. Lets assume the error is in fact some variant
-		// of "file does not exist" (possibly expressed as some parent being a
-		// file and not a directory etc) and that the delete is handled.
-		f.dbUpdates <- dbUpdateJob{file, dbUpdateDeleteDir}
-	} else {
+	if err != nil {
 		f.newError("delete dir", file.Name, err)
+		return
 	}
+
+	dbUpdateChan <- dbUpdateJob{file, dbUpdateDeleteDir}
 }
 
 // deleteFile attempts to delete the given file
-func (f *sendReceiveFolder) deleteFile(file protocol.FileInfo) {
+func (f *sendReceiveFolder) deleteFile(file protocol.FileInfo, dbUpdateChan chan<- dbUpdateJob) {
 	// Used in the defer closure below, updated by the function body. Take
 	// care not declare another err.
 	var err error
@@ -829,13 +844,13 @@ func (f *sendReceiveFolder) deleteFile(file protocol.FileInfo) {
 
 	if err == nil || fs.IsNotExist(err) {
 		// It was removed or it doesn't exist to start with
-		f.dbUpdates <- dbUpdateJob{file, dbUpdateDeleteFile}
+		dbUpdateChan <- dbUpdateJob{file, dbUpdateDeleteFile}
 	} else if _, serr := f.fs.Lstat(file.Name); serr != nil && !fs.IsPermission(serr) {
 		// We get an error just looking at the file, and it's not a permission
 		// problem. Lets assume the error is in fact some variant of "file
 		// does not exist" (possibly expressed as some parent being a file and
 		// not a directory etc) and that the delete is handled.
-		f.dbUpdates <- dbUpdateJob{file, dbUpdateDeleteFile}
+		dbUpdateChan <- dbUpdateJob{file, dbUpdateDeleteFile}
 	} else {
 		f.newError("delete file", file.Name, err)
 	}
@@ -843,7 +858,7 @@ func (f *sendReceiveFolder) deleteFile(file protocol.FileInfo) {
 
 // renameFile attempts to rename an existing file to a destination
 // and set the right attributes on it.
-func (f *sendReceiveFolder) renameFile(source, target protocol.FileInfo) {
+func (f *sendReceiveFolder) renameFile(source, target protocol.FileInfo, dbUpdateChan chan<- dbUpdateJob) {
 	// Used in the defer closure below, updated by the function body. Take
 	// care not declare another err.
 	var err error
@@ -899,7 +914,7 @@ func (f *sendReceiveFolder) renameFile(source, target protocol.FileInfo) {
 		// of the source and the creation of the target. Fix-up the metadata,
 		// and update the local index of the target file.
 
-		f.dbUpdates <- dbUpdateJob{source, dbUpdateDeleteFile}
+		dbUpdateChan <- dbUpdateJob{source, dbUpdateDeleteFile}
 
 		err = f.shortcutFile(target)
 		if err != nil {
@@ -908,7 +923,7 @@ func (f *sendReceiveFolder) renameFile(source, target protocol.FileInfo) {
 			return
 		}
 
-		f.dbUpdates <- dbUpdateJob{target, dbUpdateHandleFile}
+		dbUpdateChan <- dbUpdateJob{target, dbUpdateHandleFile}
 	} else {
 		// We failed the rename so we have a source file that we still need to
 		// get rid of. Attempt to delete it instead so that we make *some*
@@ -921,7 +936,7 @@ func (f *sendReceiveFolder) renameFile(source, target protocol.FileInfo) {
 			return
 		}
 
-		f.dbUpdates <- dbUpdateJob{source, dbUpdateDeleteFile}
+		dbUpdateChan <- dbUpdateJob{source, dbUpdateDeleteFile}
 	}
 }
 
@@ -961,7 +976,7 @@ func (f *sendReceiveFolder) renameFile(source, target protocol.FileInfo) {
 
 // handleFile queues the copies and pulls as necessary for a single new or
 // changed file.
-func (f *sendReceiveFolder) handleFile(file protocol.FileInfo, copyChan chan<- copyBlocksState, finisherChan chan<- *sharedPullerState) {
+func (f *sendReceiveFolder) handleFile(file protocol.FileInfo, copyChan chan<- copyBlocksState, finisherChan chan<- *sharedPullerState, dbUpdateChan chan<- dbUpdateJob) {
 	curFile, hasCurFile := f.model.CurrentFolderFile(f.folderID, file.Name)
 
 	have, need := scanner.BlockDiff(curFile.Blocks, file.Blocks)
@@ -993,7 +1008,7 @@ func (f *sendReceiveFolder) handleFile(file protocol.FileInfo, copyChan chan<- c
 		if err != nil {
 			f.newError("shortcut", file.Name, err)
 		} else {
-			f.dbUpdates <- dbUpdateJob{file, dbUpdateShortcutFile}
+			dbUpdateChan <- dbUpdateJob{file, dbUpdateShortcutFile}
 		}
 
 		return
@@ -1352,7 +1367,7 @@ func (f *sendReceiveFolder) pullerRoutine(in <-chan pullBlockState, out chan<- *
 	}
 }
 
-func (f *sendReceiveFolder) performFinish(state *sharedPullerState) error {
+func (f *sendReceiveFolder) performFinish(ignores *ignore.Matcher, state *sharedPullerState, dbUpdateChan chan<- dbUpdateJob, scanChan chan<- string) error {
 	// Set the correct permission bits on the new file
 	if !f.ignorePermissions(state.file) {
 		if err := f.fs.Chmod(state.tempName, fs.FileMode(state.file.Permissions&0777)); err != nil {
@@ -1406,14 +1421,7 @@ func (f *sendReceiveFolder) performFinish(state *sharedPullerState) error {
 		}
 
 		if changed {
-			// Scan() is synchronous (i.e. blocks until the scan is
-			// completed and returns an error), but a scan can't happen
-			// while we're in the puller routine. Request the scan in the
-			// background and it'll be handled when the current pulling
-			// sweep is complete. As we do retries, we'll queue the scan
-			// for this file up to ten times, but the last nine of those
-			// scans will be cheap...
-			go f.Scan([]string{state.curFile.Name})
+			scanChan <- state.curFile.Name
 			return fmt.Errorf("file modified but not rescanned; will try again later")
 		}
 
@@ -1423,11 +1431,7 @@ func (f *sendReceiveFolder) performFinish(state *sharedPullerState) error {
 			// archived for conflicts, only removed (which of course fails for
 			// non-empty directories).
 
-			// TODO: This is the place where we want to remove temporary files
-			// and future hard ignores before attempting a directory delete.
-			// Should share code with f.deletDir().
-
-			if err = osutil.InWritableDir(f.fs.Remove, f.fs, state.file.Name); err != nil {
+			if err = f.deleteDir(state.file.Name, ignores, scanChan); err != nil {
 				return err
 			}
 
@@ -1466,11 +1470,11 @@ func (f *sendReceiveFolder) performFinish(state *sharedPullerState) error {
 	f.fs.Chtimes(state.file.Name, state.file.ModTime(), state.file.ModTime()) // never fails
 
 	// Record the updated file in the index
-	f.dbUpdates <- dbUpdateJob{state.file, dbUpdateHandleFile}
+	dbUpdateChan <- dbUpdateJob{state.file, dbUpdateHandleFile}
 	return nil
 }
 
-func (f *sendReceiveFolder) finisherRoutine(in <-chan *sharedPullerState) {
+func (f *sendReceiveFolder) finisherRoutine(ignores *ignore.Matcher, in <-chan *sharedPullerState, dbUpdateChan chan<- dbUpdateJob, scanChan chan<- string) {
 	for state := range in {
 		if closed, err := state.finalClose(); closed {
 			l.Debugln(f, "closing", state.file.Name)
@@ -1478,7 +1482,7 @@ func (f *sendReceiveFolder) finisherRoutine(in <-chan *sharedPullerState) {
 			f.queue.Done(state.file.Name)
 
 			if err == nil {
-				err = f.performFinish(state)
+				err = f.performFinish(ignores, state, dbUpdateChan, scanChan)
 			}
 
 			if err != nil {
@@ -1522,7 +1526,7 @@ func (f *sendReceiveFolder) Jobs() ([]string, []string) {
 
 // dbUpdaterRoutine aggregates db updates and commits them in batches no
 // larger than 1000 items, and no more delayed than 2 seconds.
-func (f *sendReceiveFolder) dbUpdaterRoutine() {
+func (f *sendReceiveFolder) dbUpdaterRoutine(dbUpdateChan <-chan dbUpdateJob) {
 	const maxBatchTime = 2 * time.Second
 
 	batch := make([]dbUpdateJob, 0, maxBatchSizeFiles)
@@ -1591,7 +1595,7 @@ func (f *sendReceiveFolder) dbUpdaterRoutine() {
 loop:
 	for {
 		select {
-		case job, ok := <-f.dbUpdates:
+		case job, ok := <-dbUpdateChan:
 			if !ok {
 				break loop
 			}
@@ -1618,6 +1622,25 @@ loop:
 	}
 }
 
+// pullScannerRoutine aggregates paths to be scanned after pulling. The scan is
+// scheduled once when scanChan is closed (scanning can not happen during pulling).
+func (f *sendReceiveFolder) pullScannerRoutine(scanChan <-chan string) {
+	toBeScanned := make(map[string]struct{})
+
+	for path := range scanChan {
+		toBeScanned[path] = struct{}{}
+	}
+
+	if len(toBeScanned) != 0 {
+		scanList := make([]string, 0, len(toBeScanned))
+		for path := range toBeScanned {
+			l.Debugln(f, "scheduling scan after pulling for", path)
+			scanList = append(scanList, path)
+		}
+		f.Scan(scanList)
+	}
+}
+
 func (f *sendReceiveFolder) inConflict(current, replacement protocol.Vector) bool {
 	if current.Concurrent(replacement) {
 		// Obvious case
@@ -1698,7 +1721,7 @@ func (f *sendReceiveFolder) newError(context, path string, err error) {
 	if _, ok := f.errors[path]; ok {
 		return
 	}
-	l.Infof("Puller (folder %q, file %q): %s: %v", f.Description(), path, context, err)
+	l.Infof("Puller (folder %s, file %q): %s: %v", f.Description(), path, context, err)
 	f.errors[path] = fmt.Sprintf("%s: %s", context, err.Error())
 }
 
@@ -1731,6 +1754,66 @@ func (f *sendReceiveFolder) IgnoresUpdated() {
 	f.SchedulePull()
 }
 
+// deleteDir attempts to delete a directory. It checks for files/dirs inside
+// the directory and removes them if possible or returns an error if it fails
+func (f *sendReceiveFolder) deleteDir(dir string, ignores *ignore.Matcher, scanChan chan<- string) error {
+	files, _ := f.fs.DirNames(dir)
+
+	toBeDeleted := make([]string, 0, len(files))
+
+	hasIgnored := false
+	hasKnown := false
+	hasToBeScanned := false
+
+	for _, dirFile := range files {
+		fullDirFile := filepath.Join(dir, dirFile)
+		if fs.IsTemporary(dirFile) || ignores.Match(fullDirFile).IsDeletable() {
+			toBeDeleted = append(toBeDeleted, fullDirFile)
+		} else if ignores != nil && ignores.Match(fullDirFile).IsIgnored() {
+			hasIgnored = true
+		} else if cf, ok := f.model.CurrentFolderFile(f.ID, fullDirFile); !ok || cf.IsDeleted() || cf.IsInvalid() {
+			// Something appeared in the dir that we either are not
+			// aware of at all, that we think should be deleted or that
+			// is invalid, but not currently ignored -> schedule scan
+			scanChan <- fullDirFile
+			hasToBeScanned = true
+		} else {
+			// Dir contains file that is valid according to db and
+			// not ignored -> something weird is going on
+			hasKnown = true
+		}
+	}
+
+	if hasToBeScanned {
+		return errDirHasToBeScanned
+	}
+	if hasIgnored {
+		return errDirHasIgnored
+	}
+	if hasKnown {
+		return errDirNotEmpty
+	}
+
+	for _, del := range toBeDeleted {
+		f.fs.RemoveAll(del)
+	}
+
+	err := osutil.InWritableDir(f.fs.Remove, f.fs, dir)
+	if err == nil || fs.IsNotExist(err) {
+		// It was removed or it doesn't exist to start with
+		return nil
+	}
+	if _, serr := f.fs.Lstat(dir); serr != nil && !fs.IsPermission(serr) {
+		// We get an error just looking at the directory, and it's not a
+		// permission problem. Lets assume the error is in fact some variant
+		// of "file does not exist" (possibly expressed as some parent being a
+		// file and not a directory etc) and that the delete is handled.
+		return nil
+	}
+
+	return err
+}
+
 // A []fileError is sent as part of an event and will be JSON serialized.
 type fileError struct {
 	Path string `json:"path"`

lib/model/rwfolder_test.go

@@ -7,9 +7,11 @@
 package model
 
 import (
+	"bytes"
 	"context"
 	"crypto/rand"
 	"io"
+	"io/ioutil"
 	"os"
 	"path/filepath"
 	"testing"
@@ -17,6 +19,7 @@ import (
 
 	"github.com/syncthing/syncthing/lib/db"
 	"github.com/syncthing/syncthing/lib/fs"
+	"github.com/syncthing/syncthing/lib/ignore"
 	"github.com/syncthing/syncthing/lib/protocol"
 	"github.com/syncthing/syncthing/lib/scanner"
 	"github.com/syncthing/syncthing/lib/sync"
@@ -116,8 +119,9 @@ func TestHandleFile(t *testing.T) {
 	m := setUpModel(existingFile)
 	f := setUpSendReceiveFolder(m)
 	copyChan := make(chan copyBlocksState, 1)
+	dbUpdateChan := make(chan dbUpdateJob, 1)
 
-	f.handleFile(requiredFile, copyChan, nil)
+	f.handleFile(requiredFile, copyChan, nil, dbUpdateChan)
 
 	// Receive the results
 	toCopy := <-copyChan
@@ -157,8 +161,9 @@ func TestHandleFileWithTemp(t *testing.T) {
 	m := setUpModel(existingFile)
 	f := setUpSendReceiveFolder(m)
 	copyChan := make(chan copyBlocksState, 1)
+	dbUpdateChan := make(chan dbUpdateJob, 1)
 
-	f.handleFile(requiredFile, copyChan, nil)
+	f.handleFile(requiredFile, copyChan, nil, dbUpdateChan)
 
 	// Receive the results
 	toCopy := <-copyChan
@@ -207,11 +212,12 @@ func TestCopierFinder(t *testing.T) {
 	copyChan := make(chan copyBlocksState)
 	pullChan := make(chan pullBlockState, 4)
 	finisherChan := make(chan *sharedPullerState, 1)
+	dbUpdateChan := make(chan dbUpdateJob, 1)
 
 	// Run a single fetcher routine
 	go f.copierRoutine(copyChan, pullChan, finisherChan)
 
-	f.handleFile(requiredFile, copyChan, finisherChan)
+	f.handleFile(requiredFile, copyChan, finisherChan, dbUpdateChan)
 
 	pulls := []pullBlockState{<-pullChan, <-pullChan, <-pullChan, <-pullChan}
 	finish := <-finisherChan
@@ -331,13 +337,14 @@ func TestWeakHash(t *testing.T) {
 	copyChan := make(chan copyBlocksState)
 	pullChan := make(chan pullBlockState, expectBlocks)
 	finisherChan := make(chan *sharedPullerState, 1)
+	dbUpdateChan := make(chan dbUpdateJob, 1)
 
 	// Run a single fetcher routine
 	go fo.copierRoutine(copyChan, pullChan, finisherChan)
 
 	// Test 1 - no weak hashing, file gets fully repulled (`expectBlocks` pulls).
 	fo.WeakHashThresholdPct = 101
-	fo.handleFile(desiredFile, copyChan, finisherChan)
+	fo.handleFile(desiredFile, copyChan, finisherChan, dbUpdateChan)
 
 	var pulls []pullBlockState
 	for len(pulls) < expectBlocks {
@@ -365,7 +372,7 @@ func TestWeakHash(t *testing.T) {
 
 	// Test 2 - using weak hash, expectPulls blocks pulled.
 	fo.WeakHashThresholdPct = -1
-	fo.handleFile(desiredFile, copyChan, finisherChan)
+	fo.handleFile(desiredFile, copyChan, finisherChan, dbUpdateChan)
 
 	pulls = pulls[:0]
 	for len(pulls) < expectPulls {
@@ -444,11 +451,12 @@ func TestLastResortPulling(t *testing.T) {
 	copyChan := make(chan copyBlocksState)
 	pullChan := make(chan pullBlockState, 1)
 	finisherChan := make(chan *sharedPullerState, 1)
+	dbUpdateChan := make(chan dbUpdateJob, 1)
 
 	// Run a single copier routine
 	go f.copierRoutine(copyChan, pullChan, finisherChan)
 
-	f.handleFile(file, copyChan, finisherChan)
+	f.handleFile(file, copyChan, finisherChan, dbUpdateChan)
 
 	// Copier should hash empty file, realise that the region it has read
 	// doesn't match the hash which was advertised by the block map, fix it
@@ -491,11 +499,12 @@ func TestDeregisterOnFailInCopy(t *testing.T) {
 	pullChan := make(chan pullBlockState)
 	finisherBufferChan := make(chan *sharedPullerState)
 	finisherChan := make(chan *sharedPullerState)
+	dbUpdateChan := make(chan dbUpdateJob, 1)
 
 	go f.copierRoutine(copyChan, pullChan, finisherBufferChan)
-	go f.finisherRoutine(finisherChan)
+	go f.finisherRoutine(ignore.New(defaultFs), finisherChan, dbUpdateChan, make(chan string))
 
-	f.handleFile(file, copyChan, finisherChan)
+	f.handleFile(file, copyChan, finisherChan, dbUpdateChan)
 
 	// Receive a block at puller, to indicate that at least a single copier
 	// loop has been performed.
@@ -564,12 +573,13 @@ func TestDeregisterOnFailInPull(t *testing.T) {
 	pullChan := make(chan pullBlockState)
 	finisherBufferChan := make(chan *sharedPullerState)
 	finisherChan := make(chan *sharedPullerState)
+	dbUpdateChan := make(chan dbUpdateJob, 1)
 
 	go f.copierRoutine(copyChan, pullChan, finisherBufferChan)
 	go f.pullerRoutine(pullChan, finisherBufferChan)
-	go f.finisherRoutine(finisherChan)
+	go f.finisherRoutine(ignore.New(defaultFs), finisherChan, dbUpdateChan, make(chan string))
 
-	f.handleFile(file, copyChan, finisherChan)
+	f.handleFile(file, copyChan, finisherChan, dbUpdateChan)
 
 	// Receive at finisher, we should error out as puller has nowhere to pull
 	// from.
@@ -607,3 +617,37 @@ func TestDeregisterOnFailInPull(t *testing.T) {
 		t.Fatal("Didn't get anything to the finisher")
 	}
 }
+
+func TestIssue3164(t *testing.T) {
+	m := setUpModel(protocol.FileInfo{})
+	f := setUpSendReceiveFolder(m)
+
+	defaultFs.RemoveAll("issue3164")
+	defer defaultFs.RemoveAll("issue3164")
+
+	if err := defaultFs.MkdirAll("issue3164/oktodelete/foobar", 0777); err != nil {
+		t.Fatal(err)
+	}
+	if err := ioutil.WriteFile("testdata/issue3164/oktodelete/foobar/file", []byte("Hello"), 0644); err != nil {
+		t.Fatal(err)
+	}
+	if err := ioutil.WriteFile("testdata/issue3164/oktodelete/file", []byte("Hello"), 0644); err != nil {
+		t.Fatal(err)
+	}
+	file := protocol.FileInfo{
+		Name: "issue3164",
+	}
+
+	matcher := ignore.New(defaultFs)
+	if err := matcher.Parse(bytes.NewBufferString("(?d)oktodelete"), ""); err != nil {
+		t.Fatal(err)
+	}
+
+	dbUpdateChan := make(chan dbUpdateJob, 1)
+
+	f.handleDeleteDir(file, matcher, dbUpdateChan, make(chan string))
+
+	if _, err := defaultFs.Stat("testdata/issue3164"); !fs.IsNotExist(err) {
+		t.Fatal(err)
+	}
+}

lib/model/sharedpullerstate.go

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

lib/nat/registry.go

@@ -7,9 +7,8 @@
 package nat
 
 import (
+	"sync"
 	"time"
-
-	"github.com/syncthing/syncthing/lib/sync"
 )
 
 type DiscoverFunc func(renewal, timeout time.Duration) []Device
@@ -21,7 +20,7 @@ func Register(provider DiscoverFunc) {
 }
 
 func discoverAll(renewal, timeout time.Duration) map[string]Device {
-	wg := sync.NewWaitGroup()
+	wg := &sync.WaitGroup{}
 	wg.Add(len(providers))
 
 	c := make(chan Device)

lib/osutil/symlink.go

@@ -0,0 +1,21 @@
+// Copyright (C) 2017 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/.
+
+// +build !windows
+
+package osutil
+
+import (
+	"os"
+)
+
+// DebugSymlinkForTestsOnly is not and should not be used in Syncthing code,
+// hence the cumbersome name to make it obvious if this ever leaks. Its
+// reason for existence is the Windows version, which allows creating
+// symlinks when non-elevated.
+func DebugSymlinkForTestsOnly(oldname, newname string) error {
+	return os.Symlink(oldname, newname)
+}

lib/osutil/symlink_windows.go

@@ -0,0 +1,137 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package osutil
+
+import (
+	"os"
+	"path/filepath"
+	"syscall"
+)
+
+// DebugSymlinkForTestsOnly is os.Symlink taken from the 1.9.2 stdlib,
+// hacked with the SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE flag to
+// create symlinks when not elevated.
+//
+// This is not and should not be used in Syncthing code, hence the
+// cumbersome name to make it obvious if this ever leaks. Nonetheless it's
+// useful in tests.
+func DebugSymlinkForTestsOnly(oldname, newname string) error {
+	// CreateSymbolicLink is not supported before Windows Vista
+	if syscall.LoadCreateSymbolicLink() != nil {
+		return &os.LinkError{"symlink", oldname, newname, syscall.EWINDOWS}
+	}
+
+	// '/' does not work in link's content
+	oldname = filepath.FromSlash(oldname)
+
+	// need the exact location of the oldname when its relative to determine if its a directory
+	destpath := oldname
+	if !filepath.IsAbs(oldname) {
+		destpath = filepath.Dir(newname) + `\` + oldname
+	}
+
+	fi, err := os.Lstat(destpath)
+	isdir := err == nil && fi.IsDir()
+
+	n, err := syscall.UTF16PtrFromString(fixLongPath(newname))
+	if err != nil {
+		return &os.LinkError{"symlink", oldname, newname, err}
+	}
+	o, err := syscall.UTF16PtrFromString(fixLongPath(oldname))
+	if err != nil {
+		return &os.LinkError{"symlink", oldname, newname, err}
+	}
+
+	var flags uint32
+	if isdir {
+		flags |= syscall.SYMBOLIC_LINK_FLAG_DIRECTORY
+	}
+	flags |= 0x02 // SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE
+	err = syscall.CreateSymbolicLink(n, o, flags)
+	if err != nil {
+		return &os.LinkError{"symlink", oldname, newname, err}
+	}
+	return nil
+}
+
+// fixLongPath returns the extended-length (\\?\-prefixed) form of
+// path when needed, in order to avoid the default 260 character file
+// path limit imposed by Windows. If path is not easily converted to
+// the extended-length form (for example, if path is a relative path
+// or contains .. elements), or is short enough, fixLongPath returns
+// path unmodified.
+//
+// See https://msdn.microsoft.com/en-us/library/windows/desktop/aa365247(v=vs.85).aspx#maxpath
+func fixLongPath(path string) string {
+	// Do nothing (and don't allocate) if the path is "short".
+	// Empirically (at least on the Windows Server 2013 builder),
+	// the kernel is arbitrarily okay with < 248 bytes. That
+	// matches what the docs above say:
+	// "When using an API to create a directory, the specified
+	// path cannot be so long that you cannot append an 8.3 file
+	// name (that is, the directory name cannot exceed MAX_PATH
+	// minus 12)." Since MAX_PATH is 260, 260 - 12 = 248.
+	//
+	// The MSDN docs appear to say that a normal path that is 248 bytes long
+	// will work; empirically the path must be less then 248 bytes long.
+	if len(path) < 248 {
+		// Don't fix. (This is how Go 1.7 and earlier worked,
+		// not automatically generating the \\?\ form)
+		return path
+	}
+
+	// The extended form begins with \\?\, as in
+	// \\?\c:\windows\foo.txt or \\?\UNC\server\share\foo.txt.
+	// The extended form disables evaluation of . and .. path
+	// elements and disables the interpretation of / as equivalent
+	// to \. The conversion here rewrites / to \ and elides
+	// . elements as well as trailing or duplicate separators. For
+	// simplicity it avoids the conversion entirely for relative
+	// paths or paths containing .. elements. For now,
+	// \\server\share paths are not converted to
+	// \\?\UNC\server\share paths because the rules for doing so
+	// are less well-specified.
+	if len(path) >= 2 && path[:2] == `\\` {
+		// Don't canonicalize UNC paths.
+		return path
+	}
+	if !filepath.IsAbs(path) {
+		// Relative path
+		return path
+	}
+
+	const prefix = `\\?`
+
+	pathbuf := make([]byte, len(prefix)+len(path)+len(`\`))
+	copy(pathbuf, prefix)
+	n := len(path)
+	r, w := 0, len(prefix)
+	for r < n {
+		switch {
+		case os.IsPathSeparator(path[r]):
+			// empty block
+			r++
+		case path[r] == '.' && (r+1 == n || os.IsPathSeparator(path[r+1])):
+			// /./
+			r++
+		case r+1 < n && path[r] == '.' && path[r+1] == '.' && (r+2 == n || os.IsPathSeparator(path[r+2])):
+			// /../ is currently unhandled
+			return path
+		default:
+			pathbuf[w] = '\\'
+			w++
+			for ; r < n && !os.IsPathSeparator(path[r]); r++ {
+				pathbuf[w] = path[r]
+				w++
+			}
+		}
+	}
+	// A drive's root directory needs a trailing \
+	if w == len(`\\?\c:`) {
+		pathbuf[w] = '\\'
+		w++
+	}
+	return string(pathbuf[:w])
+}

lib/scanner/walk_test.go

@@ -23,6 +23,7 @@ import (
 	"github.com/d4l3k/messagediff"
 	"github.com/syncthing/syncthing/lib/fs"
 	"github.com/syncthing/syncthing/lib/ignore"
+	"github.com/syncthing/syncthing/lib/osutil"
 	"github.com/syncthing/syncthing/lib/protocol"
 	"golang.org/x/text/unicode/norm"
 )
@@ -337,7 +338,7 @@ func TestWalkSymlinkWindows(t *testing.T) {
 	defer os.RemoveAll("_symlinks")
 
 	os.Mkdir("_symlinks", 0755)
-	if err := os.Symlink("destination", "_symlinks/link"); err != nil {
+	if err := osutil.DebugSymlinkForTestsOnly("destination", "_symlinks/link"); err != nil {
 		// Probably we require permissions we don't have.
 		t.Skip(err)
 	}

lib/upnp/upnp.go

@@ -44,11 +44,11 @@ import (
 	"net/url"
 	"runtime"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/syncthing/syncthing/lib/dialer"
 	"github.com/syncthing/syncthing/lib/nat"
-	"github.com/syncthing/syncthing/lib/sync"
 )
 
 func init() {
@@ -85,7 +85,7 @@ func Discover(renewal, timeout time.Duration) []nat.Device {
 
 	resultChan := make(chan IGD)
 
-	wg := sync.NewWaitGroup()
+	wg := &sync.WaitGroup{}
 
 	for _, intf := range interfaces {
 		// Interface flags seem to always be 0 on Windows

lib/util/utils.go

@@ -7,6 +7,7 @@
 package util
 
 import (
+	"fmt"
 	"net/url"
 	"reflect"
 	"sort"
@@ -70,6 +71,36 @@ func SetDefaults(data interface{}) error {
 	return nil
 }
 
+// CopyMatchingTag copies fields tagged tag:"value" from "from" struct onto "to" struct.
+func CopyMatchingTag(from interface{}, to interface{}, tag string, shouldCopy func(value string) bool) {
+	fromStruct := reflect.ValueOf(from).Elem()
+	fromType := fromStruct.Type()
+
+	toStruct := reflect.ValueOf(to).Elem()
+	toType := toStruct.Type()
+
+	if fromType != toType {
+		panic(fmt.Sprintf("non equal types: %s != %s", fromType, toType))
+	}
+
+	for i := 0; i < toStruct.NumField(); i++ {
+		fromField := fromStruct.Field(i)
+		toField := toStruct.Field(i)
+
+		if !toField.CanSet() {
+			// Unexported fields
+			continue
+		}
+
+		structTag := toType.Field(i).Tag
+
+		v := structTag.Get(tag)
+		if shouldCopy(v) {
+			toField.Set(fromField)
+		}
+	}
+}
+
 // UniqueStrings returns a list on unique strings, trimming and sorting them
 // at the same time.
 func UniqueStrings(ss []string) []string {

lib/util/utils_test.go

@@ -169,3 +169,61 @@ func TestAddress(t *testing.T) {
 		}
 	}
 }
+
+func TestCopyMatching(t *testing.T) {
+	type Nested struct {
+		A int
+	}
+	type Test struct {
+		CopyA  int
+		CopyB  []string
+		CopyC  Nested
+		CopyD  *Nested
+		NoCopy int `restart:"true"`
+	}
+
+	from := Test{
+		CopyA: 1,
+		CopyB: []string{"friend", "foe"},
+		CopyC: Nested{
+			A: 2,
+		},
+		CopyD: &Nested{
+			A: 3,
+		},
+		NoCopy: 4,
+	}
+
+	to := Test{
+		CopyA: 11,
+		CopyB: []string{"foot", "toe"},
+		CopyC: Nested{
+			A: 22,
+		},
+		CopyD: &Nested{
+			A: 33,
+		},
+		NoCopy: 44,
+	}
+
+	// Copy empty fields
+	CopyMatchingTag(&from, &to, "restart", func(v string) bool {
+		return v != "true"
+	})
+
+	if to.CopyA != 1 {
+		t.Error("CopyA")
+	}
+	if len(to.CopyB) != 2 || to.CopyB[0] != "friend" || to.CopyB[1] != "foe" {
+		t.Error("CopyB")
+	}
+	if to.CopyC.A != 2 {
+		t.Error("CopyC")
+	}
+	if to.CopyD.A != 3 {
+		t.Error("CopyC")
+	}
+	if to.NoCopy != 44 {
+		t.Error("NoCopy")
+	}
+}

lib/versioner/empty_dir_tracker.go

@@ -0,0 +1,51 @@
+// Copyright (C) 2017 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 versioner
+
+import (
+	"path/filepath"
+	"sort"
+
+	"github.com/syncthing/syncthing/lib/fs"
+)
+
+type emptyDirTracker map[string]struct{}
+
+func (t emptyDirTracker) addDir(path string) {
+	if path == "." {
+		return
+	}
+	t[path] = struct{}{}
+}
+
+// Remove all dirs from the path to the file
+func (t emptyDirTracker) addFile(path string) {
+	dir := filepath.Dir(path)
+	for dir != "." {
+		delete(t, dir)
+		dir = filepath.Dir(dir)
+	}
+}
+
+func (t emptyDirTracker) emptyDirs() []string {
+	empty := []string{}
+	for dir := range t {
+		empty = append(empty, dir)
+	}
+	sort.Sort(sort.Reverse(sort.StringSlice(empty)))
+	return empty
+}
+
+func (t emptyDirTracker) deleteEmptyDirs(fs fs.Filesystem) {
+	for _, path := range t.emptyDirs() {
+		l.Debugln("Cleaner: deleting empty directory", path)
+		err := fs.Remove(path)
+		if err != nil {
+			l.Warnln("Versioner: can't remove directory", path, err)
+		}
+	}
+}

lib/versioner/empty_dir_tracker_test.go

@@ -0,0 +1,75 @@
+// Copyright (C) 2017 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 versioner
+
+import (
+	"path/filepath"
+	"testing"
+
+	"github.com/d4l3k/messagediff"
+)
+
+// TestEmptyDirs models the following .stversions structure:
+// .stversions/
+// ├── keep1
+// │   └── file1
+// ├── keep2
+// │   └── keep21
+// │       └── keep22
+// │           └── file1
+// ├── remove1
+// └── remove2
+//     └── remove21
+//         └── remove22
+func TestEmptyDirs(t *testing.T) {
+	var paths = []struct {
+		path   string
+		isFile bool
+	}{
+		{".", false},
+		{"keep1", false},
+		{"keep1/file1", true},
+		{"keep2", false},
+		{"keep2/keep21", false},
+		{"keep2/keep21/keep22", false},
+		{"keep2/keep21/keep22/file1", true},
+		{"remove1", false},
+		{"remove2", false},
+		{"remove2/remove21", false},
+		{"remove2/remove21/remove22", false},
+	}
+
+	var expected = []string{
+		"remove2/remove21/remove22",
+		"remove2/remove21",
+		"remove2",
+		"remove1",
+	}
+
+	// For compatibility with Windows
+	for i, p := range paths {
+		paths[i].path = filepath.FromSlash(p.path)
+	}
+
+	for i, p := range expected {
+		expected[i] = filepath.FromSlash(p)
+	}
+
+	dirTracker := make(emptyDirTracker)
+	for _, p := range paths {
+		if p.isFile {
+			dirTracker.addFile(p.path)
+		} else {
+			dirTracker.addDir(p.path)
+		}
+	}
+
+	result := dirTracker.emptyDirs()
+	if diff, equal := messagediff.PrettyDiff(expected, result); !equal {
+		t.Errorf("Incorrect empty directories list; got %v, expected %v\n%v", result, expected, diff)
+	}
+}

lib/versioner/staggered.go

@@ -111,34 +111,31 @@ func (v *Staggered) clean() {
 	}
 
 	versionsPerFile := make(map[string][]string)
-	filesPerDir := make(map[string]int)
+	dirTracker := make(emptyDirTracker)
 
-	err := v.versionsFs.Walk(".", func(path string, f fs.FileInfo, err error) error {
+	walkFn := func(path string, f fs.FileInfo, err error) error {
 		if err != nil {
 			return err
 		}
 
 		if f.IsDir() && !f.IsSymlink() {
-			filesPerDir[path] = 0
-			if path != "." {
-				dir := filepath.Dir(path)
-				filesPerDir[dir]++
-			}
-		} else {
-			// Regular file, or possibly a symlink.
-			ext := filepath.Ext(path)
-			versionTag := filenameTag(path)
-			dir := filepath.Dir(path)
-			withoutExt := path[:len(path)-len(ext)-len(versionTag)-1]
-			name := withoutExt + ext
-
-			filesPerDir[dir]++
-			versionsPerFile[name] = append(versionsPerFile[name], path)
+			dirTracker.addDir(path)
+			return nil
 		}
 
+		// Regular file, or possibly a symlink.
+		ext := filepath.Ext(path)
+		versionTag := filenameTag(path)
+		withoutExt := path[:len(path)-len(ext)-len(versionTag)-1]
+		name := withoutExt + ext
+
+		dirTracker.addFile(path)
+		versionsPerFile[name] = append(versionsPerFile[name], path)
+
 		return nil
-	})
-	if err != nil {
+	}
+
+	if err := v.versionsFs.Walk(".", walkFn); err != nil {
 		l.Warnln("Versioner: error scanning versions dir", err)
 		return
 	}
@@ -148,17 +145,7 @@ func (v *Staggered) clean() {
 		v.expire(versionList)
 	}
 
-	for path, numFiles := range filesPerDir {
-		if numFiles > 0 {
-			continue
-		}
-
-		l.Debugln("Cleaner: deleting empty directory", path)
-		err = v.versionsFs.Remove(path)
-		if err != nil {
-			l.Warnln("Versioner: can't remove directory", path, err)
-		}
-	}
+	dirTracker.deleteEmptyDirs(v.versionsFs)
 
 	l.Debugln("Cleaner: Finished cleaning", v.versionsFs)
 }

lib/versioner/trashcan.go

@@ -130,22 +130,15 @@ func (t *Trashcan) cleanoutArchive() error {
 	}
 
 	cutoff := time.Now().Add(time.Duration(-24*t.cleanoutDays) * time.Hour)
-	currentDir := ""
-	filesInDir := 0
+	dirTracker := make(emptyDirTracker)
+
 	walkFn := func(path string, info fs.FileInfo, err error) error {
 		if err != nil {
 			return err
 		}
 
-		if info.IsDir() {
-			// We have entered a new directory. Lets check if the previous
-			// directory was empty and try to remove it. We ignore failure for
-			// the time being.
-			if currentDir != "" && filesInDir == 0 {
-				t.fs.Remove(currentDir)
-			}
-			currentDir = path
-			filesInDir = 0
+		if info.IsDir() && !info.IsSymlink() {
+			dirTracker.addDir(path)
 			return nil
 		}
 
@@ -155,7 +148,7 @@ func (t *Trashcan) cleanoutArchive() error {
 		} else {
 			// Keep this file, and remember it so we don't unnecessarily try
 			// to remove this directory.
-			filesInDir++
+			dirTracker.addFile(path)
 		}
 		return nil
 	}
@@ -164,10 +157,7 @@ func (t *Trashcan) cleanoutArchive() error {
 		return err
 	}
 
-	// The last directory seen by the walkFn may not have been removed as it
-	// should be.
-	if currentDir != "" && filesInDir == 0 {
-		t.fs.Remove(currentDir)
-	}
+	dirTracker.deleteEmptyDirs(t.fs)
+
 	return nil
 }

lib/versioner/trashcan_test.go

@@ -31,8 +31,10 @@ func TestTrashcanCleanout(t *testing.T) {
 		{"testdata/.stversions/keep1/file2", false},
 		{"testdata/.stversions/keep2/file1", false},
 		{"testdata/.stversions/keep2/file2", true},
+		{"testdata/.stversions/keep3/keepsubdir/file1", false},
 		{"testdata/.stversions/remove/file1", true},
 		{"testdata/.stversions/remove/file2", true},
+		{"testdata/.stversions/remove/removesubdir/file1", true},
 	}
 
 	os.RemoveAll("testdata")
@@ -65,6 +67,10 @@ func TestTrashcanCleanout(t *testing.T) {
 		}
 	}
 
+	if _, err := os.Lstat("testdata/.stversions/keep3"); os.IsNotExist(err) {
+		t.Error("directory with non empty subdirs should not be removed")
+	}
+
 	if _, err := os.Lstat("testdata/.stversions/remove"); !os.IsNotExist(err) {
 		t.Error("empty directory should have been removed")
 	}

man/stdiscosrv.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "STDISCOSRV" "1" "September 08, 2017" "v0.14" "Syncthing"
+.TH "STDISCOSRV" "1" "Dec 04, 2017" "v0.14" "Syncthing"
 .SH NAME
 stdiscosrv \- Syncthing Discovery Server
 .
@@ -51,17 +51,17 @@ can run a discovery server and point Syncthing installations to it.
 .INDENT 0.0
 .TP
 .B \-cert=<file>
-Certificate file (default "cert.pem").
+Certificate file (default “cert.pem”).
 .UNINDENT
 .INDENT 0.0
 .TP
 .B \-db\-backend=<string>
-Database backend to use (default "ql").
+Database backend to use (default “ql”).
 .UNINDENT
 .INDENT 0.0
 .TP
 .B \-db\-dsn=<string>
-Database DSN (default "memory://stdiscosrv").
+Database DSN (default “memory://stdiscosrv”).
 .UNINDENT
 .INDENT 0.0
 .TP
@@ -76,7 +76,7 @@ Listen on HTTP (behind an HTTPS proxy).
 .INDENT 0.0
 .TP
 .B \-key=<file>
-Key file (default "key.pem").
+Key file (default “key.pem”).
 .UNINDENT
 .INDENT 0.0
 .TP
@@ -96,7 +96,7 @@ Limiter cache entries (default 10240).
 .INDENT 0.0
 .TP
 .B \-listen=<address>
-Listen address (default ":8443").
+Listen address (default “:8443”).
 .UNINDENT
 .INDENT 0.0
 .TP
@@ -107,8 +107,8 @@ File to write periodic operation stats to.
 .sp
 By default, Syncthing uses a number of global discovery servers, signified by
 the entry \fBdefault\fP in the list of discovery servers. To make Syncthing use
-your own instance of stdiscosrv, open up Syncthing\(aqs web GUI. Go to settings,
-Global Discovery Server and add stdiscosrv\(aqs host address to the comma\-separated
+your own instance of stdiscosrv, open up Syncthing’s web GUI. Go to settings,
+Global Discovery Server and add stdiscosrv’s host address to the comma\-separated
 list, e.g. \fBhttps://disco.example.com:8443/v2/\fP\&. Note that stdiscosrv uses port
 8443 by default. For stdiscosrv to be available over the internet with a dynamic
 IP address, you will need a dynamic DNS service.
@@ -119,7 +119,7 @@ entry from the list.
 .SS Description
 .sp
 This guide assumes that you have already set up Syncthing. If you
-haven\(aqt yet, head over to getting\-started first.
+haven’t yet, head over to getting\-started first.
 .SS Installing
 .sp
 Go to \fI\%releases\fP <\fBhttps://build.syncthing.net/job/stdiscosrv\fP> and
@@ -129,7 +129,7 @@ this in whatever way you are most comfortable with; double clicking should
 work in any graphical environment. At first start, stdiscosrv will generate the
 directory \fB/var/stdiscosrv\fP (\fBX:\evar\estdiscosrv\fP on Windows, where X is the
 partition \fBstdiscosrv.exe\fP is executed from) with configuration. If the user
-running \fBstdiscosrv\fP doesn\(aqt have permission to do so, create the directory
+running \fBstdiscosrv\fP doesn’t have permission to do so, create the directory
 and set the owner appropriately or use the command line switches (see below)
 to select a different location.
 .SS Configuring
@@ -151,10 +151,10 @@ from clients there are three options:
 .IP \(bu 2
 Use a CA\-signed certificate pair for the domain name you will use for the
 discovery server. This is like any other HTTPS website; clients will
-authenticate the server based on it\(aqs certificate and domain name.
+authenticate the server based on it’s certificate and domain name.
 .IP \(bu 2
 Use any certificate pair and let clients authenticate the server based on
-it\(aqs "device ID" (similar to Syncthing\-to\-Syncthing authentication). In
+it’s “device ID” (similar to Syncthing\-to\-Syncthing authentication). In
 this case, using \fBsyncthing \-generate\fP is a good option to create a
 certificate pair.
 .IP \(bu 2
@@ -163,7 +163,7 @@ reverse proxy. See below for configuration.
 .UNINDENT
 .sp
 For the first two options, the discovery server must be given the paths to
-the certificate and key at startup. This isn\(aqt necessary with the \fBhttp\fP flag:
+the certificate and key at startup. This isn’t necessary with the \fBhttp\fP flag:
 .INDENT 0.0
 .INDENT 3.5
 .sp
@@ -176,7 +176,7 @@ Server device ID is 7DDRT7J\-UICR4PM\-PBIZYL3\-MZOJ7X7\-EX56JP6\-IK6HHMW\-S7EK32
 .UNINDENT
 .UNINDENT
 .sp
-The discovery server prints it\(aqs device ID at startup. In the case where you
+The discovery server prints it’s device ID at startup. In the case where you
 are using a non CA signed certificate, this device ID (fingerprint) must be
 given to the clients in the discovery server URL:
 .INDENT 0.0
@@ -218,10 +218,10 @@ Run the discovery server using the \-http flag  \fBstdiscosrv \-http\fP\&.
 .IP \(bu 2
 SSL certificate/key configured for the reverse proxy
 .IP \(bu 2
-The "X\-Forwarded\-For" http header must be passed through with the client\(aqs
+The “X\-Forwarded\-For” http header must be passed through with the client’s
 real IP address
 .IP \(bu 2
-The "X\-SSL\-Cert" must be passed through with the PEM\-encoded client SSL
+The “X\-SSL\-Cert” must be passed through with the PEM\-encoded client SSL
 certificate
 .IP \(bu 2
 The proxy must request the client SSL certificate but not require it to be
@@ -296,10 +296,10 @@ server {
 .UNINDENT
 .sp
 An example of automating the SSL certificates and reverse\-proxying the Discovery
-Server and Syncthing using Nginx, \fI\%Let\(aqs Encrypt\fP <\fBhttps://letsencrypt.org/\fP> and Docker can be found \fI\%here\fP <\fBhttps://forum.syncthing.net/t/docker-syncthing-and-syncthing-discovery-behind-nginx-reverse-proxy-with-lets-encrypt/6880\fP>\&.
+Server and Syncthing using Nginx, \fI\%Let’s Encrypt\fP <\fBhttps://letsencrypt.org/\fP> and Docker can be found \fI\%here\fP <\fBhttps://forum.syncthing.net/t/docker-syncthing-and-syncthing-discovery-behind-nginx-reverse-proxy-with-lets-encrypt/6880\fP>\&.
 .SH SEE ALSO
 .sp
-\fIsyncthing\-networking(7)\fP, \fIsyncthing\-faq(7)\fP
+\fBsyncthing\-networking(7)\fP, \fBsyncthing\-faq(7)\fP
 .SH AUTHOR
 The Syncthing Authors
 .SH COPYRIGHT

man/strelaysrv.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "STRELAYSRV" "1" "September 08, 2017" "v0.14" "Syncthing"
+.TH "STRELAYSRV" "1" "Dec 04, 2017" "v0.14" "Syncthing"
 .SH NAME
 strelaysrv \- Syncthing Relay Server
 .
@@ -72,12 +72,12 @@ Global rate limit, in bytes/s.
 .INDENT 0.0
 .TP
 .B \-keys=<dir>
-Directory where cert.pem and key.pem is stored (default ".").
+Directory where cert.pem and key.pem is stored (default “.”).
 .UNINDENT
 .INDENT 0.0
 .TP
 .B \-listen=<listen addr>
-Protocol listen address (default ":22067").
+Protocol listen address (default “:22067”).
 .UNINDENT
 .INDENT 0.0
 .TP
@@ -127,13 +127,13 @@ How often pings are sent (default 1m0s).
 .TP
 .B \-pools=<pool addresses>
 Comma separated list of relay pool addresses to join (default
-"\fI\%http://relays.syncthing.net/endpoint\fP"). Blank to disable announcement to
+“\fI\%http://relays.syncthing.net/endpoint\fP”). Blank to disable announcement to
 a pool, thereby remaining a private relay.
 .UNINDENT
 .INDENT 0.0
 .TP
 .B \-protocol=<string>
-Protocol used for listening. \(aqtcp\(aq for IPv4 and IPv6, \(aqtcp4\(aq for IPv4, \(aqtcp6\(aq for IPv6 (default "tcp").
+Protocol used for listening. ‘tcp’ for IPv4 and IPv6, ‘tcp4’ for IPv4, ‘tcp6’ for IPv6 (default “tcp”).
 .UNINDENT
 .INDENT 0.0
 .TP
@@ -143,7 +143,7 @@ An optional description about who provides the relay.
 .INDENT 0.0
 .TP
 .B \-status\-srv=<listen addr>
-Listen address for status service (blank to disable) (default ":22070").
+Listen address for status service (blank to disable) (default “:22070”).
 Status service is used by the relay pool server UI for displaying stats (data transfered, number of clients, etc.)
 .UNINDENT
 .SH SETTING UP
@@ -191,7 +191,7 @@ relay://private\-relay\-1.example.com:443/?id=ITZRNXE\-YNROGBZ\-HXTH5P7\-VK5NYE5
 .UNINDENT
 .UNINDENT
 .sp
-The relay\(aqs device ID is output on start\-up.
+The relay’s device ID is output on start\-up.
 .SS Running on port 443 as an unprivileged user
 .sp
 It is recommended that you run the relay on port 443 (or another port which is
@@ -213,7 +213,7 @@ iptables \-t nat \-A PREROUTING \-i eth0 \-p tcp \-\-dport 443 \-j REDIRECT \-\-
 .UNINDENT
 .UNINDENT
 .sp
-Or, if you\(aqre using \fBufw\fP, add the following to \fB/etc/ufw/before.rules\fP:
+Or, if you’re using \fBufw\fP, add the following to \fB/etc/ufw/before.rules\fP:
 .INDENT 0.0
 .INDENT 3.5
 .sp
@@ -266,8 +266,8 @@ iptables \-I INPUT \-p tcp \-\-dport 22070 \-j ACCEPT
 Please consult Linux distribution documentation to persist firewall rules.
 .SH SEE ALSO
 .sp
-\fIsyncthing\-relay(7)\fP, \fIsyncthing\-faq(7)\fP,
-\fIsyncthing\-networking(7)\fP
+\fBsyncthing\-relay(7)\fP, \fBsyncthing\-faq(7)\fP,
+\fBsyncthing\-networking(7)\fP
 .SH AUTHOR
 The Syncthing Authors
 .SH COPYRIGHT

man/syncthing-bep.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-BEP" "7" "September 08, 2017" "v0.14" "Syncthing"
+.TH "SYNCTHING-BEP" "7" "Dec 04, 2017" "v0.14" "Syncthing"
 .SH NAME
 syncthing-bep \- Block Exchange Protocol v1
 .
@@ -44,8 +44,8 @@ other devices in the cluster.
 File data is described and transferred in units of \fIblocks\fP, each being
 128 KiB (131072 bytes) in size.
 .sp
-The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
-"SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this
+The key words “MUST”, “MUST NOT”, “REQUIRED”, “SHALL”, “SHALL NOT”,
+“SHOULD”, “SHOULD NOT”, “RECOMMENDED”, “MAY”, and “OPTIONAL” in this
 document are to be interpreted as described in RFC 2119.
 .SH TRANSPORT AND AUTHENTICATION
 .sp
@@ -70,8 +70,8 @@ v             ...             v
 .UNINDENT
 .sp
 The encryption and authentication layer SHALL use TLS 1.2 or a higher
-revision. A strong cipher suite SHALL be used, with "strong cipher
-suite" being defined as being without known weaknesses and providing
+revision. A strong cipher suite SHALL be used, with “strong cipher
+suite” being defined as being without known weaknesses and providing
 Perfect Forward Secrecy (PFS). Examples of strong cipher suites are
 given at the end of this document. This is not to be taken as an
 exhaustive list of allowed cipher suites but represents best practices
@@ -83,7 +83,7 @@ connection. Possibilities include certificates signed by a common
 trusted CA, preshared certificates, preshared certificate fingerprints
 or certificate pinning combined with some out of band first
 verification. The reference implementation uses preshared certificate
-fingerprints (SHA\-256) referred to as "Device IDs".
+fingerprints (SHA\-256) referred to as “Device IDs”.
 .sp
 There is no required order or synchronization among BEP messages except
 as noted per message type \- any message type may be sent at any time and
@@ -92,9 +92,9 @@ another.
 .sp
 The underlying transport protocol MUST guarantee reliable packet delivery.
 .sp
-In this document, in diagrams and text, "bit 0" refers to the \fImost
-significant\fP bit of a word; "bit 15" is thus the least significant bit of a
-16 bit word (int16) and "bit 31" is the least significant bit of a 32 bit
+In this document, in diagrams and text, “bit 0” refers to the \fImost
+significant\fP bit of a word; “bit 15” is thus the least significant bit of a
+16 bit word (int16) and “bit 31” is the least significant bit of a 32 bit
 word (int32). Non protocol buffer integers are always represented in network
 byte order (i.e., big endian) and are signed unless stated otherwise, but
 when describing message lengths negative values do not make sense and the
@@ -107,7 +107,7 @@ message is \fIvalid\fP with all fields empty \- for example, an index entry for
 file that does not have a name is not useful and MAY be rejected by the
 implementation. However the folder label is for human consumption only so an
 empty label should be accepted \- the implementation will have to choose some
-way to represent the folder, perhaps by using the ID in it\(aqs place or
+way to represent the folder, perhaps by using the ID in it’s place or
 automatically generating a label.
 .SH PRE-AUTHENTICATION MESSAGES
 .sp
@@ -169,7 +169,7 @@ name or host name, for the remote device.
 The \fBclient_name\fP and \fBclient_version\fP identifies the implementation. The
 values SHOULD  be simple strings identifying the implementation name, as a
 user would expect to see it, and the version string in the same manner. An
-example client name is "syncthing" and an example client version is "v0.7.2".
+example client name is “syncthing” and an example client version is “v0.7.2”.
 The client version field SHOULD follow the patterns laid out in the \fI\%Semantic
 Versioning\fP <\fBhttp://semver.org/\fP> standard.
 .sp
@@ -460,7 +460,7 @@ The \fBfiles\fP field is a list of files making up the index information.
 The \fBname\fP is the file name path relative to the folder root. Like all
 strings in BEP, the Name is always in UTF\-8 NFC regardless of operating
 system or file system specific conventions. The name field uses the slash
-character ("/") as path separator, regardless of the implementation\(aqs
+character (“/”) as path separator, regardless of the implementation’s
 operating system conventions. The combination of folder and name uniquely
 identifies each file in a cluster.
 .sp
@@ -519,7 +519,7 @@ symlink type. It is empty for all other entry types.
 .SS Request
 .sp
 The Request message expresses the desire to receive a data block
-corresponding to a part of a certain file in the peer\(aqs folder.
+corresponding to a part of a certain file in the peer’s folder.
 .SS Protocol Buffer Schema
 .INDENT 0.0
 .INDENT 3.5
@@ -542,7 +542,7 @@ message Request {
 .SS Fields
 .sp
 The \fBid\fP is the request identifier. It will be matched in the
-corresponding \fBRequest\fP message. Each outstanding request must have a
+corresponding \fBResponse\fP message. Each outstanding request must have a
 unique ID.
 .sp
 The \fBfolder\fP and \fBname\fP fields are as documented for the Index message.
@@ -556,7 +556,7 @@ requested hash. The other device MAY reuse a block from a different file and
 offset having the same size and hash, if one exists.
 .sp
 The \fBfrom temporary\fP field is set to indicate that the read should be
-performed from the temporary file (converting name to it\(aqs temporary form)
+performed from the temporary file (converting name to it’s temporary form)
 and falling back to the non temporary file if any error occurs. Knowledge of
 contents of temporary files comes from DownloadProgress messages.
 .SS Response
@@ -754,7 +754,7 @@ directions.
 .sp
 In send\-only mode, a device does not apply any updates from the cluster, but
 publishes changes of its local folder to the cluster as usual. The local
-folder can be seen as a "master copy" that is never affected by the actions
+folder can be seen as a “master copy” that is never affected by the actions
 of other cluster devices.
 .INDENT 0.0
 .INDENT 3.5
@@ -783,7 +783,7 @@ index data.
 For situations with large indexes or frequent reconnects this can be quite
 inefficient. A mechanism can then be used to retain index data between
 connections and only transmit any changes since that data on connection
-start. This is called "delta indexes". To enable this mechanism the
+start. This is called “delta indexes”. To enable this mechanism the
 \fBsequence\fP and \fBindex ID\fP fields are used.
 .INDENT 0.0
 .TP
@@ -832,7 +832,7 @@ Update messages rather than sending a very large Index message.
 The Syncthing implementation imposes a hard limit of 500,000,000 bytes on
 all messages. Attempting to send or receive a larger message will result in
 a connection close. This size was chosen to accommodate Index messages
-containing a large block list. It\(aqs intended that the limit may be further
+containing a large block list. It’s intended that the limit may be further
 reduced in a future protocol update supporting variable block sizes (and
 thus shorter block lists for large files).
 .SH EXAMPLE EXCHANGE
@@ -943,7 +943,7 @@ T}	T{
 T}
 _
 T{
-\&...
+…
 T}	T{
 T}	T{
 T}

man/syncthing-config.5

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-CONFIG" "5" "September 08, 2017" "v0.14" "Syncthing"
+.TH "SYNCTHING-CONFIG" "5" "Dec 04, 2017" "v0.14" "Syncthing"
 .SH NAME
 syncthing-config \- Syncthing Configuration
 .
@@ -58,7 +58,7 @@ directory the following files are located:
 The configuration file, in XML format.
 .TP
 .B \fBcert.pem\fP, \fBkey.pem\fP
-The device\(aqs RSA public and private key. These form the basis for the
+The device’s RSA public and private key. These form the basis for the
 device ID. The key must be kept private.
 .TP
 .B \fBhttps\-cert.pem\fP, \fBhttps\-key.pem\fP
@@ -81,9 +81,10 @@ The following shows an example of the default configuration file (IDs will diffe
 .sp
 .nf
 .ft C
-<configuration version="14">
-    <folder id="zj2AA\-q55a7" label="Default Folder (zj2AA\-q55a7)" path="/Users/jb/Sync/" type="readwrite" rescanIntervalS="60" ignorePerms="false" autoNormalize="true">
+<configuration version="26">
+    <folder id="zj2AA\-q55a7" label="Default Folder" path="/Users/jb/Sync/" type="readwrite" rescanIntervalS="60" fsWatcherEnabled="false" fsWatcherDelayS="10" ignorePerms="false" autoNormalize="true">
         <device id="3LT2GA5\-CQI4XJM\-WTZ264P\-MLOGMHL\-MCRLDNT\-MZV4RD3\-KA745CL\-OGAERQZ"></device>
+        <filesystemType>basic</filesystemType>
         <minDiskFree unit="%">1</minDiskFree>
         <versioning></versioning>
         <copiers>0</copiers>
@@ -92,17 +93,19 @@ The following shows an example of the default configuration file (IDs will diffe
         <order>random</order>
         <ignoreDelete>false</ignoreDelete>
         <scanProgressIntervalS>0</scanProgressIntervalS>
-        <pullerSleepS>0</pullerSleepS>
         <pullerPauseS>0</pullerPauseS>
         <maxConflicts>\-1</maxConflicts>
         <disableSparseFiles>false</disableSparseFiles>
         <disableTempIndexes>false</disableTempIndexes>
-        <fsync>false</fsync>
+        <paused>false</paused>
+        <weakHashThresholdPct>25</weakHashThresholdPct>
+        <markerName>.stfolder</markerName>
     </folder>
-    <device id="3LT2GA5\-CQI4XJM\-WTZ264P\-MLOGMHL\-MCRLDNT\-MZV4RD3\-KA745CL\-OGAERQZ" name="syno" compression="metadata" introducer="false">
+    <device id="3LT2GA5\-CQI4XJM\-WTZ264P\-MLOGMHL\-MCRLDNT\-MZV4RD3\-KA745CL\-OGAERQZ" name="syno" compression="metadata" introducer="false" skipIntroductionRemovals="false" introducedBy="">
         <address>dynamic</address>
+        <paused>false</paused>
     </device>
-    <gui enabled="true" tls="false">
+    <gui enabled="true" tls="false" debugging="false">
         <address>127.0.0.1:8384</address>
         <apikey>k1dnz1Dd0rzTBjjFFh7CXPnrF12C49B1</apikey>
         <theme>default</theme>
@@ -125,21 +128,34 @@ The following shows an example of the default configuration file (IDs will diffe
         <natRenewalMinutes>30</natRenewalMinutes>
         <natTimeoutSeconds>10</natTimeoutSeconds>
         <urAccepted>0</urAccepted>
-        <urUniqueID></urUniqueID>
+        <urSeen>0</urSeen>
+        <urUniqueID>LFWe2vn3</urUniqueID>
         <urURL>https://data.syncthing.net/newdata</urURL>
         <urPostInsecurely>false</urPostInsecurely>
         <urInitialDelayS>1800</urInitialDelayS>
         <restartOnWakeup>true</restartOnWakeup>
         <autoUpgradeIntervalH>12</autoUpgradeIntervalH>
+        <upgradeToPreReleases>false</upgradeToPreReleases>
         <keepTemporariesH>24</keepTemporariesH>
         <cacheIgnoredFiles>false</cacheIgnoredFiles>
         <progressUpdateIntervalS>5</progressUpdateIntervalS>
         <limitBandwidthInLan>false</limitBandwidthInLan>
         <minHomeDiskFree unit="%">1</minHomeDiskFree>
-        <releasesURL>https://api.github.com/repos/syncthing/syncthing/releases?per_page=30</releasesURL>
+        <releasesURL>https://upgrades.syncthing.net/meta.json</releasesURL>
         <overwriteRemoteDeviceNamesOnConnect>false</overwriteRemoteDeviceNamesOnConnect>
         <tempIndexMinBlocks>10</tempIndexMinBlocks>
+        <trafficClass>0</trafficClass>
+        <weakHashSelectionMethod>auto</weakHashSelectionMethod>
+        <stunServer>default</stunServer>
+        <stunKeepaliveSeconds>24</stunKeepaliveSeconds>
+        <kcpNoDelay>false</kcpNoDelay>
+        <kcpUpdateIntervalMs>25</kcpUpdateIntervalMs>
+        <kcpFastResend>false</kcpFastResend>
+        <kcpCongestionControl>true</kcpCongestionControl>
+        <kcpSendWindowSize>128</kcpSendWindowSize>
+        <kcpReceiveWindowSize>128</kcpReceiveWindowSize>
         <defaultFolderPath>~</defaultFolderPath>
+        <minHomeDiskFreePct>0</minHomeDiskFreePct>
     </options>
 </configuration>
 .ft P
@@ -147,22 +163,55 @@ The following shows an example of the default configuration file (IDs will diffe
 .UNINDENT
 .UNINDENT
 .SH CONFIGURATION ELEMENT
+.INDENT 0.0
+.INDENT 3.5
 .sp
-This is the root element.
+.nf
+.ft C
+<configuration version="26">
+    <folder></folder>
+    <device></device>
+    <gui></gui>
+    <options></options>
+    <ignoredDevice>5SYI2FS\-LW6YAXI\-JJDYETS\-NDBBPIO\-256MWBO\-XDPXWVG\-24QPUM4\-PDW4UQU</ignoredDevice>
+    <ignoredFolder>bd7q3\-zskm5</ignoredDevice>
+</configuration>
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.sp
+This is the root element. It has one attribute:
 .INDENT 0.0
 .TP
 .B version
 The config version. Increments whenever a change is made that requires
 migration from previous formats.
 .UNINDENT
+.sp
+It contains the elements described in the following sections and these two
+additional child elements:
+.INDENT 0.0
+.TP
+.B ignoredDevice
+Contains the ID of the device that should be ignored. Connection attempts
+from this device are logged to the console but never displayed in the web
+GUI.
+.TP
+.B ignoredFolder
+Contains the ID of the folder that should be ignored. This folder will
+always be skipped when advertised from a remote device, i.e. this will be
+logged, but there will be no dialog about it in the web GUI.
+.UNINDENT
 .SH FOLDER ELEMENT
 .INDENT 0.0
 .INDENT 3.5
 .sp
 .nf
 .ft C
-<folder id="zj2AA\-q55a7" label="Default Folder (zj2AA\-q55a7)" path="/Users/jb/Sync/" type="readwrite" rescanIntervalS="60" ignorePerms="false" autoNormalize="true" ro="false">
-    <device id="3LT2GA5\-CQI4XJM\-WTZ264P\-MLOGMHL\-MCRLDNT\-MZV4RD3\-KA745CL\-OGAERQZ" introducedBy="2CYF2WQ\-AKZO2QZ\-JAKWLYD\-AGHMQUM\-BGXUOIS\-GYILW34\-HJG3DUK\-LRRYQAR"></device>
+<folder id="zj2AA\-q55a7" label="Default Folder" path="/Users/jb/Sync/" type="readwrite" rescanIntervalS="60" fsWatcherEnabled="false" fsWatcherDelayS="10" ignorePerms="false" autoNormalize="true">
+    <device id="3LT2GA5\-CQI4XJM\-WTZ264P\-MLOGMHL\-MCRLDNT\-MZV4RD3\-KA745CL\-OGAERQZ"></device>
+    <filesystemType>basic</filesystemType>
     <minDiskFree unit="%">1</minDiskFree>
     <versioning></versioning>
     <copiers>0</copiers>
@@ -171,12 +220,13 @@ migration from previous formats.
     <order>random</order>
     <ignoreDelete>false</ignoreDelete>
     <scanProgressIntervalS>0</scanProgressIntervalS>
-    <pullerSleepS>0</pullerSleepS>
     <pullerPauseS>0</pullerPauseS>
     <maxConflicts>\-1</maxConflicts>
     <disableSparseFiles>false</disableSparseFiles>
     <disableTempIndexes>false</disableTempIndexes>
-    <fsync>false</fsync>
+    <paused>false</paused>
+    <weakHashThresholdPct>25</weakHashThresholdPct>
+    <markerName>.stfolder</markerName>
 </folder>
 .ft P
 .fi
@@ -208,7 +258,7 @@ Controls how the folder is handled by Syncthing. Possible values are:
 The folder is in default mode. Sending local and accepting remote changes.
 .TP
 .B readonly
-The folder is in "send\-only" mode \-\- it will not be modified by
+The folder is in “send\-only” mode – it will not be modified by
 Syncthing on this device.
 .UNINDENT
 .TP
@@ -216,6 +266,13 @@ Syncthing on this device.
 The rescan interval, in seconds. Can be set to zero to disable when external
 plugins are used to trigger rescans.
 .TP
+.B fsWatcherEnabled
+If enabled this detects changes to files in the folder and scans them.
+.TP
+.B fsWatcherDelayS
+The duration during which changes detected are accumulated, before a scan is
+scheduled (only takes effect if fsWatcherEnabled is true).
+.TP
 .B ignorePerms
 True if the folder should ignore permissions.
 .TP
@@ -257,7 +314,7 @@ versioning
 .B copiers, pullers, hashers
 The number of copier, puller and hasher routines to use, or zero for the
 system determined optimum. These are low level performance options for
-advanced users only; do not change unless requested to or you\(aqve actually
+advanced users only; do not change unless requested to or you’ve actually
 read and understood the code yourself. :)
 .TP
 .B order
@@ -288,9 +345,9 @@ delete files from other devices.
 The interval with which scan progress information is sent to the GUI. Zero
 means the default value (two seconds).
 .TP
-.B pullerSleepS, pullerPauseS
-Tweaks for rate limiting the puller. Don\(aqt change these unless you know
-what you\(aqre doing.
+.B pullerPauseS
+Tweak for rate limiting the puller when it retries pulling files. Don’t
+change these unless you know what you’re doing.
 .TP
 .B maxConflicts
 The maximum number of conflict copies to keep around for any given file.
@@ -307,9 +364,30 @@ By default, devices exchange information about blocks available in
 transfers that are still in progress. When set to true, such information
 is not exchanged for this folder.
 .TP
+.B paused
+True if this folder is (temporarily) suspended.
+.TP
+.B weakHashThresholdPct
+Use weak hash if more than the given percentage of the file has changed. Set
+to \-1 to always use weak hash. Default value is 25.
+.TP
+.B markerName
+Name of a directory or file in the folder root to be used as
+marker\-faq\&. Default is “.stfolder”.
+.TP
 .B fsync
+Deprecated since version v0.14.37.
+
+.sp
 Transfer updated (from other devices) files to permanent storage before
 committing the changes to the internal database.
+.TP
+.B pullerSleepS
+Deprecated since version v0.14.41.
+
+.sp
+Tweak for rate limiting the puller. Don’t change these unless you know
+what you’re doing.
 .UNINDENT
 .SH DEVICE ELEMENT
 .INDENT 0.0
@@ -317,11 +395,13 @@ committing the changes to the internal database.
 .sp
 .nf
 .ft C
-<device id="5SYI2FS\-LW6YAXI\-JJDYETS\-NDBBPIO\-256MWBO\-XDPXWVG\-24QPUM4\-PDW4UQU" name="syno" compression="metadata" introducer="false" introducedBy="2CYF2WQ\-AKZO2QZ\-JAKWLYD\-AGHMQUM\-BGXUOIS\-GYILW34\-HJG3DUK\-LRRYQAR">
+<device id="5SYI2FS\-LW6YAXI\-JJDYETS\-NDBBPIO\-256MWBO\-XDPXWVG\-24QPUM4\-PDW4UQU" name="syno" compression="metadata" introducer="false" skipIntroductionRemovals="false" introducedBy="2CYF2WQ\-AKZO2QZ\-JAKWLYD\-AGHMQUM\-BGXUOIS\-GYILW34\-HJG3DUK\-LRRYQAR">
     <address>dynamic</address>
 </device>
 <device id="2CYF2WQ\-AKZO2QZ\-JAKWLYD\-AGHMQUM\-BGXUOIS\-GYILW34\-HJG3DUK\-LRRYQAR" name="syno local" compression="metadata" introducer="false">
     <address>tcp://192.0.2.1:22001</address>
+    <paused>true<paused>
+    <allowedNetwork>192.168.0.0/16<allowedNetwork>
 </device>
 .ft P
 .fi
@@ -382,11 +462,16 @@ to even if the original introducer is no longer listing the remote device as kno
 Defines which device has introduced us to this device. Used only for following de\-introductions.
 .UNINDENT
 .sp
-In addition, one or more \fBaddress\fP child elements must be present. Each
-contains an address or host name to use when attempting to connect to this device and will
-be tried in order. Entries other than \fBdynamic\fP must be prefixed with \fBtcp://\fP (dual\-stack), \fBtcp4://\fP (IPv4 only) or \fBtcp6://\fP (IPv6 only). Note that IP addresses need not use tcp4/tcp6; these are optional. Accepted formats are:
+From following child elements at least one \fBaddress\fP child must exist.
 .INDENT 0.0
 .TP
+.B address
+Contains an address or host name to use when attempting to connect to this device.
+Entries other than \fBdynamic\fP must be prefixed with \fBtcp://\fP (dual\-stack),
+\fBtcp4://\fP (IPv4 only) or \fBtcp6://\fP (IPv6 only). Note that IP addresses need
+not use tcp4/tcp6; these are optional. Accepted formats are:
+.INDENT 7.0
+.TP
 .B IPv4 address (\fBtcp://192.0.2.42\fP)
 The default port (22000) is used.
 .TP
@@ -402,35 +487,32 @@ The address and port is used as given. The address must be enclosed in
 square brackets.
 .TP
 .B Host name (\fBtcp6://fileserver\fP)
-The host name will be used on the default port (22000) and connections will be attempted only via IPv6.
+The host name will be used on the default port (22000) and connections
+will be attempted only via IPv6.
 .TP
 .B Host name and port (\fBtcp://fileserver:12345\fP)
-The host name will be used on the given port and connections will be attempted via both IPv4 and IPv6, depending on name resolution.
+The host name will be used on the given port and connections will be
+attempted via both IPv4 and IPv6, depending on name resolution.
 .TP
 .B \fBdynamic\fP
-The word \fBdynamic\fP (without \fBtcp://\fP prefix) means to use local and global discovery to find the
-device.
+The word \fBdynamic\fP (without \fBtcp://\fP prefix) means to use local and
+global discovery to find the device.
 .UNINDENT
-.SH IGNOREDDEVICE ELEMENT
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-<ignoredDevice>5SYI2FS\-LW6YAXI\-JJDYETS\-NDBBPIO\-256MWBO\-XDPXWVG\-24QPUM4\-PDW4UQU</ignoredDevice>
-.ft P
-.fi
+.TP
+.B paused
+True if synchronization with this devices is (temporarily) suspended.
+.TP
+.B allowedNetwork
+If given, this restricts connections to this device to only this network
+(see allowed\-networks).
 .UNINDENT
-.UNINDENT
-.sp
-This optional element lists device IDs that have been specifically ignored. One element must be present for each device ID. Connection attempts from these devices are logged to the console but never displayed in the web GUI.
 .SH GUI ELEMENT
 .INDENT 0.0
 .INDENT 3.5
 .sp
 .nf
 .ft C
-<gui enabled="true" tls="false">
+<gui enabled="true" tls="false" debugging="false">
     <address>127.0.0.1:8384</address>
     <apikey>l7jSbCqPD95JYZ0g8vi4ZLAMg3ulnN1b</apikey>
     <theme>default</theme>
@@ -453,8 +535,8 @@ If set to \fBtrue\fP, TLS (HTTPS) will be enforced. Non\-HTTPS requests will
 be redirected to HTTPS. When this is set to \fBfalse\fP, TLS connections are
 still possible but it is not mandatory.
 .TP
-.B theme
-The name of the theme to use.
+.B debugging
+This enables profiling and additional debugging endpoints in the rest\-api\&.
 .UNINDENT
 .sp
 The following child elements may be present:
@@ -484,6 +566,13 @@ Contains the bcrypt hash of the real password.
 .TP
 .B apikey
 If set, this is the API key that enables usage of the REST interface.
+.TP
+.B insecureAdminAccess
+If true, this allows access to the web GUI from outside (i.e. not localhost)
+without authorization. A warning will displayed about this setting on startup.
+.TP
+.B theme
+The name of the theme to use.
 .UNINDENT
 .SH OPTIONS ELEMENT
 .INDENT 0.0
@@ -560,12 +649,6 @@ The port on which to listen and send IPv4 broadcast announcements to.
 .B localAnnounceMCAddr
 The group address and port to join and send IPv6 multicast announcements on.
 .TP
-.B relayServer
-Lists one or more relay servers, on the format \fBrelay://hostname:port\fP\&.
-Alternatively, a relay list can be loaded over https by using an URL like
-\fBdynamic+https://somehost/path\fP\&. The default loads the list of relays
-from the relay pool server, \fBrelays.syncthing.net\fP\&.
-.TP
 .B maxSendKbps
 Outgoing data rate limit, in kibibytes per second.
 .TP
@@ -604,6 +687,9 @@ Whether the user has accepted to submit anonymous usage data. The default,
 point in the future. \fB\-1\fP means no, a number above zero means that that
 version of usage reporting has been accepted.
 .TP
+.B urSeen
+The highest usage reporting version that has already been shown in the web GUI.
+.TP
 .B urUniqueID
 The unique ID sent together with the usage report. Generated when usage
 reporting is enabled.
@@ -627,6 +713,10 @@ waking from sleep mode (i.e. a folded up laptop).
 Check for a newer version after this many hours. Set to zero to disable
 automatic upgrades.
 .TP
+.B upgradeToPreReleases
+If true, automatical upgrades include release candidates (see
+release\-channels).
+.TP
 .B keepTemporariesH
 Keep temporary failed transfers for this many hours. While the temporaries
 are kept, the data they contain need not be transferred again.
@@ -644,18 +734,6 @@ the GUI.
 Whether to apply bandwidth limits to devices in the same broadcast domain
 as the local device.
 .TP
-.B databaseBlockCacheMiB
-Override the automatically calculated database block cache size. Don\(aqt,
-unless you\(aqre very short on memory, in which case you want to set this to
-\fB8\fP\&.
-.TP
-.B pingTimeoutS
-Ping\-timeout in seconds. Don\(aqt change it unless you are having issues due to
-slow response time (slow connection/cpu) and large index exchanges.
-.TP
-.B pingIdleTimeS
-Ping interval in seconds. Don\(aqt change it unless you feel it\(aqs necessary.
-.TP
 .B minHomeDiskFree
 The minimum required free space that should be available on the
 partition holding the configuration and index. Accepted units are \fB%\fP, \fBkB\fP,
@@ -664,6 +742,9 @@ partition holding the configuration and index. Accepted units are \fB%\fP, \fBkB
 .B releasesURL
 The URL from which release information is loaded, for automatic upgrades.
 .TP
+.B alwaysLocalNet
+Network that should be considered as local given in CIDR notation.
+.TP
 .B overwriteRemoteDeviceNamesOnConnect
 If set, device names will always be overwritten with the name given by
 remote on each connection. By default, the name that the remote device
@@ -673,9 +754,64 @@ announces will only be adopted when a name has not already been set.
 When exchanging index information for incomplete transfers, only take
 into account files that have at least this many blocks.
 .TP
+.B unackedNotificationID
+ID of a notification to be displayed in the web GUI. Will be removed once
+the user acknowledged it (e.g. an transition notice on an upgrade).
+.TP
+.B trafficClass
+Specify a type of service (TOS)/traffic class of outgoing packets.
+.TP
+.B weakHashSelectionMethod
+Specify whether weak hashing is used, possible options are
+\fBWeakHashAlways\fP, \fBWeakHashNever\fP and \fBWeakHashAuto\fP\&. Deciding
+automatically means running benchmarks at startup to decide whether the
+performance impact is acceptable (this is the default).
+.TP
+.B stunServer
+Server to be used for STUN, given as ip:port. The keyword \fBdefault\fP gets
+expanded to
+\fBstun.callwithus.com:3478\fP, \fBstun.counterpath.com:3478\fP,
+\fBstun.counterpath.net:3478\fP, \fBstun.ekiga.net:3478\fP,
+\fBstun.ideasip.com:3478\fP, \fBstun.internetcalls.com:3478\fP,
+\fBstun.schlund.de:3478\fP, \fBstun.sipgate.net:10000\fP,
+\fBstun.sipgate.net:3478\fP, \fBstun.voip.aebc.com:3478\fP,
+\fBstun.voiparound.com:3478\fP, \fBstun.voipbuster.com:3478\fP,
+\fBstun.voipstunt.com:3478\fP, \fBstun.voxgratia.org:3478\fP and
+\fBstun.xten.com:3478\fP (this is the default).
+.TP
+.B stunKeepaliveSeconds
+Interval in seconds between contacting a STUN server to
+maintain NAT mapping. Default is \fB24\fP and you can set it to \fB0\fP to
+disable contacting STUN servers.
+.TP
+.B kcpNoDelay, kcpUpdateIntervalMs, kcpFastResend, kcpCongestionControl, kcpSendWindowSize, kcpReceiveWindowSize
+Various KCP tweaking parameters.
+.TP
 .B defaultFolderPath
 The UI will propose to create new folders at this path. This can be disabled by
 setting this to an empty string.
+.TP
+.B relayServer
+Deprecated since version v0.13.0: You can now specify custom relay servers with \fBlistenAddress\fP\&.
+
+.sp
+Lists one or more relay servers, on the format \fBrelay://hostname:port\fP\&.
+Alternatively, a relay list can be loaded over https by using an URL like
+\fBdynamic+https://somehost/path\fP\&. The default loads the list of relays
+from the relay pool server, \fBrelays.syncthing.net\fP\&.
+.TP
+.B pingTimeoutS
+Deprecated since version v0.12.0.
+
+.sp
+Ping\-timeout in seconds. Don’t change it unless you are having issues due to
+slow response time (slow connection/cpu) and large index exchanges.
+.TP
+.B pingIdleTimeS
+Deprecated since version v0.12.0.
+
+.sp
+Ping interval in seconds. Don’t change it unless you feel it’s necessary.
 .UNINDENT
 .SS Listen Addresses
 .sp
@@ -741,9 +877,9 @@ that the files you are backing up are in a folder\-sendonly to prevent other
 devices from overwriting the per device configuration. The folder on the remote
 device(s) should not be used as configuration for the remote devices.
 .sp
-If you\(aqd like to sync your home folder in non\-send\-only mode, you may add the
+If you’d like to sync your home folder in non\-send\-only mode, you may add the
 folder that stores the configuration files to the ignore list\&.
-If you\(aqd also like to backup your configuration files, add another folder in
+If you’d also like to backup your configuration files, add another folder in
 send\-only mode for just the configuration folder.
 .SH AUTHOR
 The Syncthing Authors

man/syncthing-device-ids.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-DEVICE-IDS" "7" "September 08, 2017" "v0.14" "Syncthing"
+.TH "SYNCTHING-DEVICE-IDS" "7" "Dec 04, 2017" "v0.14" "Syncthing"
 .SH NAME
 syncthing-device-ids \- Understanding Device IDs
 .
@@ -33,8 +33,8 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .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
-interchangeably have been "key ID" since the device ID is a direct property of
+resolution, authentication and authorization. The term “device ID” could
+interchangeably have been “key ID” since the device ID is a direct property of
 the public key in use.
 .SH KEYS
 .sp
@@ -43,7 +43,7 @@ startup, Syncthing will create a public/private keypair.
 .sp
 Currently this is a 3072 bit RSA key. The keys are saved in the form of the
 private key (\fBkey.pem\fP) and a self signed certificate (\fBcert.pem\fP). The self
-signing part doesn\(aqt actually add any security or functionality as far as
+signing part doesn’t actually add any security or functionality as far as
 Syncthing is concerned but it enables the use of the keys in a standard TLS
 exchange.
 .sp
@@ -94,7 +94,7 @@ Certificate:
 .sp
 We can see here that the certificate is little more than a container for the
 public key; the serial number is zero and the Issuer and Subject are both
-"syncthing" where a qualified name might otherwise be expected.
+“syncthing” where a qualified name might otherwise be expected.
 .sp
 An advanced user could replace the \fBkey.pem\fP and \fBcert.pem\fP files with a
 keypair generated directly by the \fBopenssl\fP utility or other mechanism.
@@ -138,7 +138,7 @@ MFZWI3D\-BONSGYC\-YLTMRWG\-C43ENR5\-QXGZDMM\-FZWI3DP\-BONSGYY\-LTMRWAD
 .UNINDENT
 .SS Connection Establishment
 .sp
-Now we know what device IDs are, here\(aqs how they are used in Syncthing. When
+Now we know what device IDs are, here’s how they are used in Syncthing. When
 you add a device ID to the configuration, Syncthing will attempt to
 connect to that device. The first thing we need to do is figure out the IP and
 port to connect to. There are three possibilities here:
@@ -150,13 +150,13 @@ dynamic DNS setup this might be a good option.
 .IP \(bu 2
 Using local discovery, if enabled. Every Syncthing instance on a LAN
 periodically broadcasts information about itself (device ID, address,
-port number). If we\(aqve seen one of these broadcasts for a given
-device ID that\(aqs where we try to connect.
+port number). If we’ve seen one of these broadcasts for a given
+device ID that’s where we try to connect.
 .IP \(bu 2
 Using global discovery, if enabled. Every Syncthing instance
 announces itself to the global discovery service (device ID and
 external port number \- the internal address is not announced to the
-global server). If we don\(aqt have a static address and haven\(aqt seen
+global server). If we don’t have a static address and haven’t seen
 any local announcements the global discovery server will be queried
 for an address.
 .UNINDENT
@@ -188,11 +188,11 @@ The SHA\-256 hash is cryptographically collision resistant. This means
 that there is no way that we know of to create two different messages
 with the same hash.
 .sp
-You can argue that of course there are collisions \- there\(aqs an infinite
+You can argue that of course there are collisions \- there’s an infinite
 amount of inputs and a finite amount of outputs \- so by definition there
 are infinitely many messages that result in the same hash.
 .sp
-I\(aqm going to quote \fI\%stack
+I’m going to quote \fI\%stack
 overflow\fP <\fBhttps://stackoverflow.com/questions/4014090/is-it-safe-to-ignore-the-possibility-of-sha-collisions-in-practice\fP>
 here:
 .INDENT 0.0
@@ -203,28 +203,28 @@ civilization\-as\-we\- know\-it, and killing off a few billion people ?
 It can be argued that any unlucky event with a probability lower
 than that is not actually very important.
 .sp
-If we have a "perfect" hash function with output size n, and we have
+If we have a “perfect” hash function with output size n, and we have
 p messages to hash (individual message length is not important),
 then probability of collision is about p2/2n+1 (this is an
-approximation which is valid for "small" p, i.e. substantially
+approximation which is valid for “small” p, i.e. substantially
 smaller than 2n/2). For instance, with SHA\-256 (n=256) and one
 billion messages (p=10^9) then the probability is about 4.3*10^\-60.
 .sp
 A mass\-murderer space rock happens about once every 30 million years
 on average. This leads to a probability of such an event occurring
-in the next second to about 10^\-15. That\(aqs 45 orders of magnitude
+in the next second to about 10^\-15. That’s 45 orders of magnitude
 more probable than the SHA\-256 collision. Briefly stated, if you
 find SHA\-256 collisions scary then your priorities are wrong.
 .UNINDENT
 .UNINDENT
 .sp
-It\(aqs also worth noting that the property of SHA\-256 that we are using is not
+It’s also worth noting that the property of SHA\-256 that we are using is not
 simply collision resistance but resistance to a preimage attack, i.e. even if
-you can find two messages that result in a hash collision that doesn\(aqt help you
+you can find two messages that result in a hash collision that doesn’t help you
 attack Syncthing (or TLS in general). You need to create a message that hashes
-to exactly the hash that my certificate already has or you won\(aqt get in.
+to exactly the hash that my certificate already has or you won’t get in.
 .sp
-Note also that it\(aqs not good enough to find a random blob of bits that happen to
+Note also that it’s not good enough to find a random blob of bits that happen to
 have the same hash as my certificate. You need to create a valid DER\-encoded,
 signed certificate that has the same hash as mine. The difficulty of this is
 staggeringly far beyond the already staggering difficulty of finding a SHA\-256
@@ -239,8 +239,8 @@ 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\(aqt find the real device
-for a given device ID, so can\(aqt connect to it and sync). It could also
+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
@@ -259,21 +259,21 @@ The user could statically configure IP or host name for the devices.
 The user could run a trusted global server.
 .UNINDENT
 .sp
-It\(aqs something we might want to look at at some point, but not a huge
+It’s something we might want to look at at some point, but not a huge
 problem as I see it.
 .SS Long Device IDs are Painful
 .sp
-It\(aqs a mouthful to read over the phone, annoying to type into an SMS or even
+It’s a mouthful to read over the phone, annoying to type into an SMS or even
 into a computer. And it needs to be done twice, once for each side.
 .sp
-This isn\(aqt a vulnerability as such, but a user experience problem. There are
+This isn’t a vulnerability as such, but a user experience problem. There are
 various possible solutions:
 .INDENT 0.0
 .IP \(bu 2
-Use shorter device IDs with verification based on the full ID ("You
+Use shorter device IDs with verification based on the full ID (“You
 entered MFZWI3; I found and connected to a device with the ID
 MFZWI3\-DBONSG\-YYLTMR\-WGC43E\-NRQXGZ\-DMMFZW\-I3DBON\-SGYYLT\-MRWA, please
-confirm that this is correct").
+confirm that this is correct”).
 .IP \(bu 2
 Use shorter device IDs with an out of band authentication, a la
 Bluetooth pairing. You enter a one time PIN into Syncthing and give

man/syncthing-event-api.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-EVENT-API" "7" "September 08, 2017" "v0.14" "Syncthing"
+.TH "SYNCTHING-EVENT-API" "7" "Dec 04, 2017" "v0.14" "Syncthing"
 .SH NAME
 syncthing-event-api \- Event API
 .
@@ -37,10 +37,15 @@ 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.
+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\(aqve already seen. Syncthing returns a JSON encoded array of event objects,
+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
@@ -181,8 +186,8 @@ Generated each time a connection to a device has been terminated.
 .INDENT 0.0
 .INDENT 3.5
 The error key contains the cause for disconnection, which might not
-necessarily be an error as such. Specifically, "EOF" and "unexpected
-EOF" both signify TCP connection termination, either due to the other
+necessarily be an error as such. Specifically, “EOF” and “unexpected
+EOF” both signify TCP connection termination, either due to the other
 device restarting or going offline or due to a network change.
 .UNINDENT
 .UNINDENT

man/syncthing-faq.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-FAQ" "7" "September 08, 2017" "v0.14" "Syncthing"
+.TH "SYNCTHING-FAQ" "7" "Dec 04, 2017" "v0.14" "Syncthing"
 .SH NAME
 syncthing-faq \- Frequently Asked Questions
 .
@@ -39,10 +39,10 @@ machine will automatically be replicated to your other devices. We believe your
 data is your data alone and you deserve to choose where it is stored. Therefore
 Syncthing does not upload your data to the cloud but exchanges your data across
 your machines as soon as they are online at the same time.
-.SS Is it "syncthing", "Syncthing" or "SyncThing"?
+.SS Is it “syncthing”, “Syncthing” or “SyncThing”?
 .sp
-It\(aqs \fBSyncthing\fP, although the command and source repository is spelled
-\fBsyncthing\fP so it may be referred to in that way as well. It\(aqs definitely not
+It’s \fBSyncthing\fP, although the command and source repository is spelled
+\fBsyncthing\fP so it may be referred to in that way as well. It’s definitely not
 SyncThing, even though the abbreviation \fBst\fP is used in some
 circumstances and file names.
 .SS How does Syncthing differ from BitTorrent/Resilio Sync?
@@ -118,9 +118,9 @@ in the configuration file (24 hours by default).
 .sp
 When troubleshooting a slow sync, there are a number of things to check.
 .sp
-First of all, verify that you are not connected via a relay. In the "Remote
-Devices" list on the right side of the GUI, double check that you see
-"Address: <some address>" and \fInot\fP "Relay: <some address>".
+First of all, verify that you are not connected via a relay. In the “Remote
+Devices” list on the right side of the GUI, double check that you see
+“Address: <some address>” and \fInot\fP “Relay: <some address>”.
 [image]
 .sp
 If you are connected via a relay, this is because a direct connection could
@@ -152,7 +152,7 @@ There is a certain amount of housekeeping that must be done to track the
 current and available versions of each file in the index database.
 .IP 4. 3
 By default Syncthing uses periodic scanning every 60 seconds to detect
-file changes. This means checking every file\(aqs modification time and
+file changes. This means checking every file’s modification time and
 comparing it to the database. This can cause spikes of CPU usage for large
 folders.
 .UNINDENT
@@ -166,20 +166,20 @@ To limit the amount of CPU used when syncing and scanning, set the
 environment variable \fBGOMAXPROCS\fP to the maximum number of CPU cores
 Syncthing should use at any given moment. For example, \fBGOMAXPROCS=2\fP on a
 machine with four cores will limit Syncthing to no more than half the
-system\(aqs CPU power.
+system’s CPU power.
 .sp
 To reduce CPU spikes from scanning activity, use a filesystem notifications
 plugin. This is delivered by default via Synctrayzor, Syncthing\-GTK and on
 Android. For other setups, consider using \fI\%syncthing\-inotify\fP <\fBhttps://github.com/syncthing/syncthing-inotify\fP>\&.
 .SS Should I keep my device IDs secret?
 .sp
-No. The IDs are not sensitive. Given a device ID it\(aqs possible to find the IP
+No. The IDs are not sensitive. Given a device ID it’s possible to find the IP
 address for that device, if global discovery is enabled on it. Knowing the device
-ID doesn\(aqt help you actually establish a connection to that device or get a list
+ID doesn’t help you actually establish a connection to that device or get a list
 of files, etc.
 .sp
-For a connection to be established, both devices need to know about the other\(aqs
-device ID. It\(aqs not possible (in practice) to forge a device ID. (To forge a
+For a connection to be established, both devices need to know about the other’s
+device ID. It’s not possible (in practice) to forge a device ID. (To forge a
 device ID you need to create a TLS certificate with that specific SHA\-256 hash.
 If you can do that, you can spoof any TLS certificate. The world is your
 oyster!)
@@ -206,19 +206,30 @@ device where it was deleted.
 Beware that the \fB<filename>.sync\-conflict\-<date>\-<time>.<ext>\fP files are
 treated as normal files after they are created, so they are propagated between
 devices. We do this because the conflict is detected and resolved on one device,
-creating the \fBsync\-conflict\fP file, but it\(aqs just as much of a conflict
-everywhere else and we don\(aqt know which of the conflicting files is the "best"
-from the user point of view. Moreover, if there\(aqs something that automatically
-causes a conflict on change you\(aqll end up with \fBsync\-conflict\-...sync\-conflict
+creating the \fBsync\-conflict\fP file, but it’s just as much of a conflict
+everywhere else and we don’t know which of the conflicting files is the “best”
+from the user point of view. Moreover, if there’s something that automatically
+causes a conflict on change you’ll end up with \fBsync\-conflict\-...sync\-conflict
 \-...\-sync\-conflict\fP files.
+.SS How do I serve a folder from a read only filesystem?
+.sp
+Syncthing requires a “folder marker” to indicate that the folder is present
+and healthy. By default this is a directory called \fB\&.stfolder\fP that is
+created by Syncthing when the folder is added. If this folder can’t be
+created (you are serving files from a CD or something) you can instead set
+the advanced config \fBMarker Name\fP to the name of some file or folder that
+you know will always exist in the folder.
+.SS I really hate the \fB\&.stfolder\fP directory, can I remove it?
+.sp
+See the previous question.
 .SS Am I able to use nested Syncthing folders?
 .sp
 Do not nest shared folders. This behaviour is in no way supported,
 recommended or coded for in any way, and comes with many pitfalls.
 .SS How do I rename/move a synced folder?
 .sp
-Syncthing doesn\(aqt have a direct way to do this, as it\(aqs potentially
-dangerous to do so if you\(aqre not careful \- it may result in data loss if
+Syncthing doesn’t have a direct way to do this, as it’s potentially
+dangerous to do so if you’re not careful \- it may result in data loss if
 something goes wrong during the move and is synchronized to your other
 devices.
 .sp
@@ -226,8 +237,8 @@ The easy way to rename or move a synced folder on the local system is to
 remove the folder in the Syncthing UI, move it on disk, then re\-add it using
 the new path.
 .sp
-It\(aqs best to do this when the folder is already in sync between your
-devices, as it is otherwise unpredictable which changes will "win" after the
+It’s best to do this when the folder is already in sync between your
+devices, as it is otherwise unpredictable which changes will “win” after the
 move. Changes made on other devices may be overwritten, or changes made
 locally may be overwritten by those on other devices.
 .sp
@@ -240,7 +251,7 @@ to configure listening ports such that they do not overlap (see config).
 .SS Does Syncthing support syncing between folders on the same system?
 .sp
 No. Syncthing is not designed to sync locally and the overhead involved in
-doing so using Syncthing\(aqs method would be wasteful. There are better
+doing so using Syncthing’s method would be wasteful. There are better
 programs to achieve this such as rsync or Unison.
 .SS When I do have two distinct Syncthing\-managed folders on two hosts, how does Syncthing handle moving files between them?
 .sp
@@ -277,7 +288,7 @@ The patterns in .stignore are glob patterns, where brackets are used to
 denote character ranges. That is, the pattern \fBq[abc]x\fP will match the
 files \fBqax\fP, \fBqbx\fP and \fBqcx\fP\&.
 .sp
-To match an actual file \fIcalled\fP \fBq[abc]x\fP the pattern needs to "escape"
+To match an actual file \fIcalled\fP \fBq[abc]x\fP the pattern needs to “escape”
 the brackets, like so: \fBq\e[abc\e]x\fP\&.
 .sp
 On Windows, escaping special characters is not supported as the \fB\e\fP
@@ -286,7 +297,7 @@ such as \fB[\fP and \fB?\fP are not allowed in file names on Windows.
 .SS Why is the setup more complicated than BitTorrent/Resilio Sync?
 .sp
 Security over convenience. In Syncthing you have to setup both sides to
-connect two devices. An attacker can\(aqt do much with a stolen device ID, because
+connect two devices. An attacker can’t do much with a stolen device ID, because
 you have to add the device on the other side too. You have better control
 where your files are transferred.
 .sp
@@ -342,7 +353,7 @@ $ ssh \-L 9090:127.0.0.1:8384 user@othercomputer.example.com
 will log you into othercomputer.example.com, and present the \fIremote\fP
 Syncthing GUI on \fI\%http://localhost:9090\fP on your \fIlocal\fP computer.
 .sp
-If you only want to access the remote gui and don\(aqt want the terminal
+If you only want to access the remote gui and don’t want the terminal
 session, use this example,
 .INDENT 0.0
 .INDENT 3.5
@@ -367,7 +378,7 @@ Another Windows way to run ssh is to install gow.
 .sp
 The easiest way to install gow is with chocolatey.
 \fI\%https://chocolatey.org/\fP
-.SS Why do I get "Host check error" in the GUI/API?
+.SS Why do I get “Host check error” in the GUI/API?
 .sp
 Since version 0.14.6 Syncthing does an extra security check when the GUI/API
 is bound to localhost \- namely that the browser is talking to localhost.
@@ -392,8 +403,8 @@ Bind the GUI/API to a non\-localhost listen port.
 In all cases, username/password authentication and HTTPS should be used.
 .SS My Syncthing database is corrupt
 .sp
-This is almost always a result of bad RAM, storage device or other hardware. When the index database is found to be corrupt Syncthing cannot operate and will note this in the logs and exit. To overcome this delete the \fI\%database folder\fP <\fBhttps://docs.syncthing.net/users/config.html#description\fP> inside Syncthing\(aqs home directory and re\-start Syncthing. It will then need to perform a full re\-hashing of all shared folders. You should check your system in case the underlying cause is indeed faulty hardware which may put the system at risk of further data loss.
-.SS I don\(aqt like the GUI or the theme. Can it be changed?
+This is almost always a result of bad RAM, storage device or other hardware. When the index database is found to be corrupt Syncthing cannot operate and will note this in the logs and exit. To overcome this delete the \fI\%database folder\fP <\fBhttps://docs.syncthing.net/users/config.html#description\fP> inside Syncthing’s home directory and re\-start Syncthing. It will then need to perform a full re\-hashing of all shared folders. You should check your system in case the underlying cause is indeed faulty hardware which may put the system at risk of further data loss.
+.SS I don’t like the GUI or the theme. Can it be changed?
 .sp
 You can change the theme in the settings. Syncthing ships with other themes
 than the default.
@@ -404,7 +415,7 @@ By default, Syncthing will look for a directory \fBgui\fP inside the Syncthing
 home folder. To change the directory to look for themes, you need to set the
 STGUIASSETS environment variable. To get the concrete directory, run
 syncthing with the \fB\-paths\fP parameter. It will print all the relevant paths,
-including the "GUI override directory".
+including the “GUI override directory”.
 .sp
 To add e.g. a red theme, you can create the file \fBred/assets/css/theme.css\fP
 inside the GUI override directory to override the default CSS styles.
@@ -421,7 +432,7 @@ crashes and other bugs.
 .SS Where do Syncthing logs go to?
 .sp
 Syncthing logs to stdout by default. On Windows Syncthing by default also
-creates \fBsyncthing.log\fP in Syncthing\(aqs home directory (run \fBsyncthing
+creates \fBsyncthing.log\fP in Syncthing’s home directory (run \fBsyncthing
 \-paths\fP to see where that is). Command line option \fB\-logfile\fP can be used
 to specify a user\-defined logfile.
 .SS How can I view the history of changes?
@@ -448,7 +459,7 @@ it initiates the conflict resolution procedure, which in the end results in a co
 up\-to\-date state with all the neighbours.
 .SS How do I upgrade Syncthing?
 .sp
-If you use a package manager such as Debian\(aqs apt\-get, you should upgrade
+If you use a package manager such as Debian’s apt\-get, you should upgrade
 using the package manager. If you use the binary packages linked from
 Syncthing.net, you can use Syncthing built in automatic upgrades.
 .INDENT 0.0
@@ -476,14 +487,14 @@ version. We suggest to use the GitHub API at
 the JSON response.
 .SS How do I run Syncthing as a daemon process on Linux?
 .sp
-If you\(aqre using systemd, runit, or upstart, we already ship examples, check
+If you’re using systemd, runit, or upstart, we already ship examples, check
 \fI\%https://github.com/syncthing/syncthing/tree/master/etc\fP for example
 configurations.
 .sp
-If however you\(aqre not using one of these tools, you have a couple of options.
-If your system has a tool called \fBstart\-stop\-daemon\fP installed (that\(aqs the name
+If however you’re not using one of these tools, you have a couple of options.
+If your system has a tool called \fBstart\-stop\-daemon\fP installed (that’s the name
 of the command, not the package), look into the local documentation for that, it
-will almost certainly cover 100% of what you want to do.  If you don\(aqt have
+will almost certainly cover 100% of what you want to do.  If you don’t have
 \fBstart\-stop\-daemon\fP, there are a bunch of other software packages you could use
 to do this.  The most well known is called daemontools, and can be found in the
 standard package repositories for  almost every modern Linux distribution.

man/syncthing-globaldisco.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-GLOBALDISCO" "7" "September 08, 2017" "v0.14" "Syncthing"
+.TH "SYNCTHING-GLOBALDISCO" "7" "Dec 04, 2017" "v0.14" "Syncthing"
 .SH NAME
 syncthing-globaldisco \- Global Discovery Protocol v3
 .
@@ -34,7 +34,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .sp
 A device should announce itself at startup. It does this by an HTTPS POST to
 the announce server URL. Standard discovery currently requires the path to be
-"/v2/", yet this can be up to the discovery server. The POST has a JSON payload
+“/v2/”, yet this can be up to the discovery server. The POST has a JSON payload
 listing connection addresses (if any):
 .INDENT 0.0
 .INDENT 3.5
@@ -49,9 +49,9 @@ listing connection addresses (if any):
 .UNINDENT
 .UNINDENT
 .sp
-It\(aqs OK for the "addresses" field to be either the empty list (\fB[]\fP),
+It’s OK for the “addresses” field to be either the empty list (\fB[]\fP),
 \fBnull\fP, or missing entirely. An announcement with the field missing
-or empty is however not useful...
+or empty is however not useful…
 .sp
 Any empty or unspecified IP addresses (i.e. addresses like \fBtcp://:22000\fP,
 \fBtcp://0.0.0.0:22000\fP, \fBtcp://[::]:22000\fP) are interpreted as referring to
@@ -63,7 +63,7 @@ authentication. The device ID is deduced from the presented certificate.
 .sp
 The server response is empty, with code \fB204\fP (No Content) on success. If no
 certificate was presented, status \fB403\fP (Forbidden) is returned. If the
-posted data doesn\(aqt conform to the expected format, \fB400\fP (Bad Request) is
+posted data doesn’t conform to the expected format, \fB400\fP (Bad Request) is
 returned.
 .sp
 In successful responses, the server may return a \fBReannounce\-After\fP header
@@ -80,14 +80,14 @@ Many Requests).
 .SH QUERIES
 .sp
 Queries are performed as HTTPS GET requests to the announce server URL. The
-requested device ID is passed as the query parameter "device", in canonical
+requested device ID is passed as the query parameter “device”, in canonical
 string form, i.e. \fBhttps://announce.syncthing.net/v2/?device=ABC12345\-....\fP
 .sp
 Successful responses will have status code \fB200\fP (OK) and carry a JSON payload
 of the same format as the announcement above. The response will not contain
 empty or unspecified addresses.
 .sp
-If the "device" query parameter is missing or malformed, the status code 400
+If the “device” query parameter is missing or malformed, the status code 400
 (Bad Request) is returned.
 .sp
 If the device ID is of a valid format but not found in the registry, 404 (Not

man/syncthing-localdisco.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-LOCALDISCO" "7" "September 08, 2017" "v0.14" "Syncthing"
+.TH "SYNCTHING-LOCALDISCO" "7" "Dec 04, 2017" "v0.14" "Syncthing"
 .SH NAME
 syncthing-localdisco \- Local Discovery Protocol v4
 .

man/syncthing-networking.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-NETWORKING" "7" "September 08, 2017" "v0.14" "Syncthing"
+.TH "SYNCTHING-NETWORKING" "7" "Dec 04, 2017" "v0.14" "Syncthing"
 .SH NAME
 syncthing-networking \- Firewall Setup
 .
@@ -72,7 +72,7 @@ Port \fB21027/UDP\fP (for discovery broadcasts on IPv4 and multicasts on IPv6)
 .UNINDENT
 .SS Uncomplicated Firewall (ufw)
 .sp
-If you\(aqre using \fBufw\fP on Linux and have installed the \fI\%Syncthing package\fP <\fBhttps://apt.syncthing.net/\fP>, you can allow the necessary ports by running:
+If you’re using \fBufw\fP on Linux and have installed the \fI\%Syncthing package\fP <\fBhttps://apt.syncthing.net/\fP>, you can allow the necessary ports by running:
 .INDENT 0.0
 .INDENT 3.5
 .sp

man/syncthing-relay.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-RELAY" "7" "September 08, 2017" "v0.14" "Syncthing"
+.TH "SYNCTHING-RELAY" "7" "Dec 04, 2017" "v0.14" "Syncthing"
 .SH NAME
 syncthing-relay \- Relay Protocol v1
 .
@@ -37,7 +37,7 @@ connect to each other directly otherwise. This is usually due to both devices
 being behind a NAT and neither side being able to open a port which would
 be directly accessible from the internet.
 .sp
-A relay was designed to relay BEP protocol, hence the reliance on device ID\(aqs
+A relay was designed to relay BEP protocol, hence the reliance on device ID’s
 in the protocol spec, but at the same time it is general enough that could be
 reused by other protocols or applications, as the data transferred between two
 devices which use a relay is completely obscure and does not affect the
@@ -92,14 +92,14 @@ exists.
 After the client has joined, no more messages are exchanged apart from
 Ping/Pong messages for general connection keep alive checking.
 .sp
-From this point onwards, the client stand\-by\(aqs and waits for SessionInvitation
+From this point onwards, the client stand\-by’s and waits for SessionInvitation
 messages from the relay, which implies that some other device is trying to
 connect with you. SessionInvitation message contains the unique session key
 which then can be used to establish a connection in session mode.
 .sp
 If the client fails to send a JoinRelayRequest message within the first ping
 interval, the connection is terminated.
-If the client fails to send a message (even if it\(aqs a ping message) every minute
+If the client fails to send a message (even if it’s a ping message) every minute
 (by default), the connection is terminated.
 .SS Temporary protocol submode
 .sp
@@ -574,7 +574,7 @@ identify which session you are trying to connect to.
 .B : Address
 An optional IP address on which the relay server is expecting you to
 connect, in order to start a connection in session mode.
-Empty/all zero IP should be replaced with the relay\(aqs public IP address that
+Empty/all zero IP should be replaced with the relay’s public IP address that
 was used when establishing the protocol mode connection.
 .TP
 .B : Port
@@ -585,14 +585,14 @@ in order to start a connection in session mode.
 Because both sides connecting to the relay use the client side of the socket,
 and some protocols behave differently depending if the connection starts on
 the server side or the client side, this boolean indicates which side of the
-connection this client should assume it\(aqs getting. The value is inverted in
+connection this client should assume it’s getting. The value is inverted in
 the invitation which is sent to the other device, so that there is always
 one client socket, and one server socket.
 .UNINDENT
 .SH HOW SYNCTHING USES RELAYS, AND GENERAL SECURITY
 .sp
 In the case of Syncthing and BEP, when two devices connect via relay, they
-start their standard TLS connection encapsulated within the relay\(aqs plain\-text
+start their standard TLS connection encapsulated within the relay’s plain\-text
 session connection, effectively upgrading the plain\-text connection to a TLS
 connection.
 .sp

man/syncthing-rest-api.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-REST-API" "7" "September 08, 2017" "v0.14" "Syncthing"
+.TH "SYNCTHING-REST-API" "7" "Dec 04, 2017" "v0.14" "Syncthing"
 .SH NAME
 syncthing-rest-api \- REST API
 .
@@ -48,7 +48,7 @@ with \fBcurl\fP\&.
 .SS GET /rest/system/browse
 .sp
 Returns a list of directories matching the path given by the optional parameter
-\fBcurrent\fP\&. The path can use \fI\%patterns as described in Go\(aqs filepath package\fP <\fBhttps://golang.org/pkg/path/filepath/#Match\fP>\&. A \(aq*\(aq will always be appended
+\fBcurrent\fP\&. The path can use \fI\%patterns as described in Go’s filepath package\fP <\fBhttps://golang.org/pkg/path/filepath/#Match\fP>\&. A ‘*’ will always be appended
 to the given path (e.g. \fB/tmp/\fP matches all its subdirectories). If the option
 \fBcurrent\fP is not given, filesystem root paths are returned.
 .INDENT 0.0
@@ -670,7 +670,10 @@ folder. Takes \fBdevice\fP and \fBfolder\fP parameters.
 .nf
 .ft C
 {
-  "completion": 0
+  "completion": 100,
+  "globalBytes": 156793013575,
+  "needBytes": 0,
+  "needDeletes": 0
 }
 .ft P
 .fi
@@ -856,8 +859,8 @@ Response contains the same output as \fBGET /rest/db/need\fP
 Request immediate scan. Takes the optional parameters \fBfolder\fP (folder ID),
 \fBsub\fP (path relative to the folder root) and \fBnext\fP (time in seconds). If
 \fBfolder\fP is omitted or empty all folders are scanned. If \fBsub\fP is given,
-only this path (and children, in case it\(aqs a directory) is scanned. The \fBnext\fP
-argument delays Syncthing\(aqs automated rescan interval for a given amount of
+only this path (and children, in case it’s a directory) is scanned. The \fBnext\fP
+argument delays Syncthing’s automated rescan interval for a given amount of
 seconds.
 .sp
 Requesting scan of a path that no longer exists, but previously did, is
@@ -928,10 +931,15 @@ 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.
+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\(aqve already seen. Syncthing returns a JSON encoded array of event objects,
+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
@@ -1072,8 +1080,8 @@ Generated each time a connection to a device has been terminated.
 .INDENT 0.0
 .INDENT 3.5
 The error key contains the cause for disconnection, which might not
-necessarily be an error as such. Specifically, "EOF" and "unexpected
-EOF" both signify TCP connection termination, either due to the other
+necessarily be an error as such. Specifically, “EOF” and “unexpected
+EOF” both signify TCP connection termination, either due to the other
 device restarting or going offline or due to a network change.
 .UNINDENT
 .UNINDENT

man/syncthing-security.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-SECURITY" "7" "September 08, 2017" "v0.14" "Syncthing"
+.TH "SYNCTHING-SECURITY" "7" "Dec 04, 2017" "v0.14" "Syncthing"
 .SH NAME
 syncthing-security \- Security Principles
 .
@@ -92,7 +92,7 @@ Automatic upgrades default to \fBon\fP (unless Syncthing was compiled with
 upgrades disabled).
 .sp
 Even when automatic upgrades are disabled in the configuration, an upgrade check
-as above is done when the GUI is loaded, in order to show the "Upgrade to ..."
+as above is done when the GUI is loaded, in order to show the “Upgrade to …”
 button when necessary. This can be disabled only by compiling Syncthing with
 upgrades disabled.
 .sp
@@ -106,7 +106,7 @@ information about the user or device.
 When usage reporting is enabled, Syncthing reports usage data at startup and
 then every 24 hours. The report is sent as an HTTPS POST to the usage reporting
 server, currently hosted by \fI\%@calmh\fP <\fBhttps://github.com/calmh\fP>\&. The contents of the usage report can
-be seen behind the "Preview" link in settings. Usage reporting defaults to
+be seen behind the “Preview” link in settings. Usage reporting defaults to
 \fBoff\fP but the GUI will ask once about enabling it, shortly after the first
 install.
 .sp
@@ -130,13 +130,13 @@ case.
 .sp
 When relaying is enabled, Syncthing will look up the pool of public relays
 and establish a connection to one of them (the best, based on an internal
-heuristic). The selected relay server will learn the connecting device\(aqs
+heuristic). The selected relay server will learn the connecting device’s
 device ID. Relay servers can be run by \fBanyone in the general public\fP\&.
 Relaying defaults to \fBon\fP\&. Syncthing can be configured to disable
 relaying, or only use specific relays.
 .sp
 If a relay connections is required between two devices, the relay will learn
-the other device\(aqs device ID as well.
+the other device’s device ID as well.
 .sp
 Any data exchanged between the two devices is encrypted as usual and not
 subject to inspection by the relay.
@@ -161,7 +161,7 @@ synced files. Here are some general principles to protect your files:
 If a device of yours is lost, make sure to revoke its access from your other
 devices.
 .IP 2. 3
-If you\(aqre syncing confidential data on an encrypted disk to guard against
+If you’re syncing confidential data on an encrypted disk to guard against
 device theft, put the Syncthing config folder on the same encrypted disk to
 avoid leaking keys and metadata. Or, use whole disk encryption.
 .UNINDENT

man/syncthing-stignore.5

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-STIGNORE" "5" "September 08, 2017" "v0.14" "Syncthing"
+.TH "SYNCTHING-STIGNORE" "5" "Dec 04, 2017" "v0.14" "Syncthing"
 .SH NAME
 syncthing-stignore \- Prevent files from being synchronized to other nodes
 .
@@ -96,7 +96,7 @@ are \fIincluded\fP (that is, \fInot\fP ignored). This can be used to override
 more general patterns that follow. Note that files in ignored
 directories can not be re\-included this way. This is due to the fact
 that Syncthing stops scanning when it reaches an ignored directory,
-so doesn\(aqt know what files it might contain.
+so doesn’t know what files it might contain.
 .IP \(bu 2
 A pattern beginning with a \fB(?i)\fP prefix enables case\-insensitive pattern
 matching. \fB(?i)test\fP matches \fBtest\fP, \fBTEST\fP and \fBtEsT\fP\&. The
@@ -116,8 +116,8 @@ Windows does not support escaping \fB\e[foo \- bar\e]\fP\&.
 \fBNOTE:\fP
 .INDENT 0.0
 .INDENT 3.5
-Prefixes can be specified in any order (e.g. "(?d)(?i)"), but cannot be in a
-single pair of parentheses (not "(?di)").
+Prefixes can be specified in any order (e.g. “(?d)(?i)”), but cannot be in a
+single pair of parentheses (not “(?di)”).
 .UNINDENT
 .UNINDENT
 .SH EXAMPLE
@@ -163,8 +163,8 @@ qu*
 .UNINDENT
 .UNINDENT
 .sp
-all files and directories called "foo", ending in a "2" or starting with
-"qu" will be ignored. The end result becomes:
+all files and directories called “foo”, ending in a “2” or starting with
+“qu” will be ignored. The end result becomes:
 .INDENT 0.0
 .INDENT 3.5
 .sp
@@ -196,24 +196,24 @@ directory itself. If you want the pattern to match the directory and its
 content, make sure it does not have a \fB/\fP at the end of the pattern.
 .UNINDENT
 .UNINDENT
-.SH EFFECTS ON "IN SYNC" STATUS
+.SH EFFECTS ON “IN SYNC” STATUS
 .sp
 Currently the effects on who is in sync with what can be a bit confusing
 when using ignore patterns. This should be cleared up in a future
-version...
+version…
 .sp
 Assume two devices, Alice and Bob, where Alice has 100 files to share, but
-Bob ignores 25 of these. From Alice\(aqs point of view Bob will become
+Bob ignores 25 of these. From Alice’s point of view Bob will become
 about 75% in sync (the actual number depends on the sizes of the
-individual files) and remain in "Syncing" state even though it is in
-fact not syncing anything (\fI\%issue #623\fP <\fBhttps://github.com/syncthing/syncthing/issues/623\fP>). From Bob\(aqs point of view, it\(aqs
+individual files) and remain in “Syncing” state even though it is in
+fact not syncing anything (\fI\%issue #623\fP <\fBhttps://github.com/syncthing/syncthing/issues/623\fP>). From Bob’s point of view, it’s
 100% up to date but will show fewer files in both the local and global
 view.
 .sp
 If Bob adds files that have already been synced to the ignore list, they
-will remain in the "global" view but disappear from the "local" view.
+will remain in the “global” view but disappear from the “local” view.
 The end result is more files in the global folder than in the local,
-but still 100% in sync (\fI\%issue #624\fP <\fBhttps://github.com/syncthing/syncthing/issues/624\fP>). From Alice\(aqs point of view, Bob
+but still 100% in sync (\fI\%issue #624\fP <\fBhttps://github.com/syncthing/syncthing/issues/624\fP>). From Alice’s point of view, Bob
 will remain 100% in sync until the next reconnect, because Bob has
 already announced that he has the files that are now suddenly ignored.
 .SH AUTHOR

man/syncthing-versioning.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-VERSIONING" "7" "September 08, 2017" "v0.14" "Syncthing"
+.TH "SYNCTHING-VERSIONING" "7" "Dec 04, 2017" "v0.14" "Syncthing"
 .SH NAME
 syncthing-versioning \- Keep automatic backups of deleted files by other nodes
 .
@@ -33,13 +33,13 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .SH DESCRIPTION
 .sp
 Syncthing supports archiving the old version of a file when it is deleted or
-replaced with a newer version from the cluster. This is called "file
-versioning" and uses one of the available \fIversioning strategies\fP described
+replaced with a newer version from the cluster. This is called “file
+versioning” and uses one of the available \fIversioning strategies\fP described
 below. File versioning is configured per folder, on a per\-device basis, and
-defaults to "no file versioning", i.e. no old copies of files are kept.
+defaults to “no file versioning”, i.e. no old copies of files are kept.
 .SH TRASH CAN FILE VERSIONING
 .sp
-This versioning strategy emulates the common "trash can" approach. When a file
+This versioning strategy emulates the common “trash can” approach. When a file
 is deleted or replaced due to a change on a remote device, it is a moved to
 the trash can in the \fB\&.stversions\fP folder. If a file with the same name was
 already in the trash can it is replaced.
@@ -51,26 +51,26 @@ this to zero prevents any files from being removed from the trash can
 automatically.
 .SH SIMPLE FILE VERSIONING
 .sp
-With "Simple File Versioning" files are moved to the \fB\&.stversions\fP folder
+With “Simple File Versioning” files are moved to the \fB\&.stversions\fP folder
 (inside your shared folder) when replaced or deleted on a remote device. This
-option also takes a value in an input titled "Keep Versions" which tells
+option also takes a value in an input titled “Keep Versions” which tells
 Syncthing how many old versions of the file it should keep. For example, if
 you set this value to 5, if a file is replaced 5 times on a remote device, you
-will see 5 time\-stamped versions on that file in the ".stversions" folder on
+will see 5 time\-stamped versions on that file in the “.stversions” folder on
 the other devices sharing the same folder.
 .SH STAGGERED FILE VERSIONING
 .sp
-With "Staggered File Versioning" files are also moved to a different folder
-when replaced or deleted on a remote device (just like "Simple File
-Versioning"), however, versions are automatically deleted if they are older
+With “Staggered File Versioning” files are also moved to a different folder
+when replaced or deleted on a remote device (just like “Simple File
+Versioning”), however, versions are automatically deleted if they are older
 than the maximum age or exceed the number of files allowed in an interval.
 .sp
-With this versioning method it\(aqs possible to specify where the versions are
+With this versioning method it’s possible to specify where the versions are
 stored, with the default being the \fB\&.stversions\fP folder inside the normal
-folder path. If you set a custom version path, please ensure that it\(aqs on the
+folder path. If you set a custom version path, please ensure that it’s on the
 same partition or filesystem as the regular folder path, as moving files there
 may otherwise fail. You can use an absolute path (this is recommended) or a
-relative path. Relative paths are interpreted relative to Syncthing\(aqs current
+relative path. Relative paths are interpreted relative to Syncthing’s current
 or startup directory.
 .sp
 The following intervals are used and they each have a maximum number of files
@@ -91,7 +91,7 @@ Until maximum age, the most recent version is kept every week.
 .TP
 .B Maximum Age
 The maximum time to keep a version in days. For example, to keep replaced or
-deleted files in the ".stversions" folder for an entire year, use 365. If
+deleted files in the “.stversions” folder for an entire year, use 365. If
 only for 10 days, use 10. \fBNote: Set to 0 to keep versions forever.\fP
 .UNINDENT
 .SH EXTERNAL FILE VERSIONING
@@ -111,7 +111,7 @@ Path to the file within the folder
 .SS Example for Unixes
 .sp
 Lets say I want to keep the latest version of each file as they are replaced
-or removed; essentially I want a "trash can"\-like behavior. For this, I create
+or removed; essentially I want a “trash can”\-like behavior. For this, I create
 the following script and store it as \fB/Users/jb/bin/onlylatest.sh\fP (i.e. the
 \fBbin\fP directory in my home directory):
 .INDENT 0.0
@@ -142,7 +142,7 @@ mv \-f "$folderpath/$filepath" "$versionspath/$filepath"
 I must ensure that the script has execute permissions (\fBchmod 755
 onlylatest.sh\fP), then configure Syncthing with command \fB/Users/jb/bin/onlylatest.sh %FOLDER_PATH% %FILE_PATH%\fP
 .sp
-Lets assume I have a folder "default" in ~/Sync, and that within that folder
+Lets assume I have a folder “default” in ~/Sync, and that within that folder
 there is a file \fBdocs/letter.txt\fP that is being replaced or deleted. The
 script will be called as if I ran this from the command line:
 .INDENT 0.0
@@ -161,7 +161,7 @@ The script will then move the file in question to
 that may already have been there.
 .SS Example for Windows
 .sp
-On Windows we can use a batch script to perform the same "trash can"\-like
+On Windows we can use a batch script to perform the same “trash can”\-like
 behavior as mentioned above. I created the following script and saved it as
 \fBC:\eUsers\emfrnd\eScripts\eonlylatest.bat\fP\&.
 .INDENT 0.0

man/syncthing.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING" "1" "September 08, 2017" "v0.14" "Syncthing"
+.TH "SYNCTHING" "1" "Dec 04, 2017" "v0.14" "Syncthing"
 .SH NAME
 syncthing \- Syncthing
 .
@@ -36,11 +36,12 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .sp
 .nf
 .ft C
-syncthing [\-audit] [\-auditfile=<file|\-|\-\->] [\-browser\-only] [\-generate=<dir>]
-          [\-gui\-address=<address>] [\-gui\-apikey=<key>] [\-home=<dir>] [\-logfile=<filename>]
-          [\-logflags=<flags>] [\-no\-browser] [\-no\-console] [\-no\-restart] [\-paths] [\-paused]
-          [\-reset\-database] [\-reset\-deltas] [\-upgrade] [\-upgrade\-check] [\-upgrade\-to=<url>]
-          [\-verbose] [\-version]
+syncthing [\-audit] [\-auditfile=<file|\-|\-\->] [\-browser\-only] [device\-id]
+          [\-generate=<dir>] [\-gui\-address=<address>] [\-gui\-apikey=<key>]
+          [\-home=<dir>] [\-logfile=<filename>] [\-logflags=<flags>]
+          [\-no\-browser] [\-no\-console] [\-no\-restart] [\-paths] [\-paused]
+          [\-reset\-database] [\-reset\-deltas] [\-unpaused] [\-upgrade]
+          [\-upgrade\-check] [\-upgrade\-to=<url>] [\-verbose] [\-version]
 .ft P
 .fi
 .UNINDENT
@@ -66,6 +67,16 @@ Use specified file or stream (\fB"\-"\fP for stdout, \fB"\-\-"\fP for stderr) fo
 .UNINDENT
 .INDENT 0.0
 .TP
+.B \-browser\-only
+Open the web UI in a browser for an already running Syncthing instance.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-device\-id
+Print device ID to command line.
+.UNINDENT
+.INDENT 0.0
+.TP
 .B \-generate=<dir>
 Generate key and config in specified dir, then exit.
 .UNINDENT
@@ -129,8 +140,15 @@ Print the paths used for configuration, keys, database, GUI overrides, default s
 .UNINDENT
 .INDENT 0.0
 .TP
+.B \-paused
+Start with all devices and folders paused.
+.UNINDENT
+.INDENT 0.0
+.TP
 .B \-reset\-database
 Reset the database, forcing a full rescan and resync.
+Create \fI\&.stfolder\fP folders in each sync folder if they do not already exist.
+\fBCaution\fP: Ensure that all sync folders which are mountpoints are already mounted. Inconsistent versions may result if the mountpoint is later mounted and contains older versions.
 .UNINDENT
 .INDENT 0.0
 .TP
@@ -139,6 +157,11 @@ Reset delta index IDs, forcing a full index exchange.
 .UNINDENT
 .INDENT 0.0
 .TP
+.B \-unpaused
+Start with all devices and folders unpaused.
+.UNINDENT
+.INDENT 0.0
+.TP
 .B \-upgrade
 Perform upgrade.
 .UNINDENT
@@ -194,14 +217,14 @@ over 128+N on Unix usually represent the signal which caused the process to
 exit. For example, \fB128 + 9 (SIGKILL) = 137\fP\&.
 .SH DEVELOPMENT SETTINGS
 .sp
-The following environment variables modify Syncthing\(aqs behavior in ways that
+The following environment variables modify Syncthing’s behavior in ways that
 are mostly useful for developers. Use with care.
 If you start Syncthing from within service managers like systemd or supervisor,
 path expansion may not be supported.
 .INDENT 0.0
 .TP
 .B STNODEFAULTFOLDER
-Don\(aqt create a default folder when starting for the first time. This
+Don’t create a default folder when starting for the first time. This
 variable will be ignored anytime after the first run.
 .TP
 .B STGUIASSETS
@@ -292,7 +315,7 @@ All of the above.
 .UNINDENT
 .TP
 .B STPROFILER
-Set to a listen address such as "127.0.0.1:9090" to start the profiler with
+Set to a listen address such as “127.0.0.1:9090” to start the profiler with
 HTTP access.
 .TP
 .B STCPUPROFILE
@@ -329,7 +352,7 @@ Disable automatic upgrades.
 .TP
 .B STHASHING
 Specify which hashing package to use. Defaults to automatic based on
-performance. Specify "minio" (compatibility) or "standard" for the default Go implementation.
+performance. Specify “minio” (compatibility) or “standard” for the default Go implementation.
 .TP
 .B GOMAXPROCS
 Set the maximum number of CPU cores to use. Defaults to all available CPU
@@ -342,10 +365,10 @@ numbers keep peak memory usage down, at the price of CPU usage
 .UNINDENT
 .SH SEE ALSO
 .sp
-\fIsyncthing\-config(5)\fP, \fIsyncthing\-stignore(5)\fP,
-\fIsyncthing\-device\-ids(7)\fP, \fIsyncthing\-security(7)\fP,
-\fIsyncthing\-networking(7)\fP, \fIsyncthing\-versioning(7)\fP,
-\fIsyncthing\-faq(7)\fP
+\fBsyncthing\-config(5)\fP, \fBsyncthing\-stignore(5)\fP,
+\fBsyncthing\-device\-ids(7)\fP, \fBsyncthing\-security(7)\fP,
+\fBsyncthing\-networking(7)\fP, \fBsyncthing\-versioning(7)\fP,
+\fBsyncthing\-faq(7)\fP
 .SH AUTHOR
 The Syncthing Authors
 .SH COPYRIGHT