cmd/syncthing: Environment handling for upgrade restarts (fixes #3970 )

lib/events: Make test even less timing dependent
lib/events: Overflow test should calculate average log time
2017-02-07 21:25:33 +01:00 · 2017-02-07 08:57:39 +01:00 · 2017-02-07 08:47:53 +01:00 · 2017-02-07 08:28:02 +01:00 · 2017-02-07 07:25:09 +00:00 · 2017-02-06 13:42:39 +01:00
50 changed files with 449 additions and 212 deletions
@@ -1,13 +1,17 @@
 # Syncthing

-[![Latest Build (Official)](https://img.shields.io/jenkins/s/http/build.syncthing.net/syncthing.svg?style=flat-square&label=unix%20build)](http://build.syncthing.net/job/syncthing/lastBuild/)
+[![Latest Linux & Cross Build](https://img.shields.io/jenkins/s/http/build.syncthing.net/syncthing.svg?style=flat-square&label=linux+%26+cross)](http://build.syncthing.net/job/syncthing/lastBuild/)
+[![Latest Windows Build](https://img.shields.io/jenkins/s/http/build.syncthing.net/syncthing-windows.svg?style=flat-square&label=windows)](http://build.syncthing.net/job/syncthing/lastBuild/)
+[![Latest Mac Build](https://img.shields.io/jenkins/s/http/build.syncthing.net/syncthing-mac.svg?style=flat-square&label=mac)](http://build.syncthing.net/job/syncthing/lastBuild/)
+[![Latest Solaris Build](https://img.shields.io/jenkins/s/http/build.syncthing.net/syncthing-solaris.svg?style=flat-square&label=solaris)](http://build.syncthing.net/job/syncthing/lastBuild/)
 [![API Documentation](https://img.shields.io/badge/api-Godoc-blue.svg?style=flat-square)](http://godoc.org/github.com/syncthing/syncthing)
 [![MPLv2 License](https://img.shields.io/badge/license-MPLv2-blue.svg?style=flat-square)](https://www.mozilla.org/MPL/2.0/)
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/88/badge)](https://bestpractices.coreinfrastructure.org/projects/88)
+[![Go Report Card](https://goreportcard.com/badge/github.com/syncthing/syncthing)](https://goreportcard.com/report/github.com/syncthing/syncthing)

 ## Goals

-Syncthing is a **continous file synchronization program**. It synchronizes
+Syncthing is a **continuous file synchronization program**. It synchronizes
 files between two or more computers. We strive to fulfill the goals below.
 The goals are listed in order of importance, the most important one being
 the first. This is the summary version of the goal list - for more
@@ -585,7 +585,7 @@ func buildSnap(target target) {
 		snapver = snapver[1:]
 	}
 	snapgrade := "devel"
-	if matched, _ := regexp.MatchString(`^\d+\.\d+\.\d+$`, snapver); matched {
+	if matched, _ := regexp.MatchString(`^\d+\.\d+\.\d+(-rc.\d+)?$`, snapver); matched {
 		snapgrade = "stable"
 	}
 	err = tmpl.Execute(f, map[string]string{
@@ -343,7 +343,7 @@ func (s *apiService) Serve() {
 		s.started <- listener.Addr().String()
 	}

-	// Indicate successfull initial startup, to ourselves and to interested
+	// Indicate successful initial startup, to ourselves and to interested
 	// listeners (i.e. the thing that starts the browser).
 	select {
 	case <-s.startedOnce:
@@ -1140,18 +1140,17 @@ func (s *apiService) postDBScan(w http.ResponseWriter, r *http.Request) {
 	qs := r.URL.Query()
 	folder := qs.Get("folder")
 	if folder != "" {
+		subs := qs["sub"]
+		err := s.model.ScanFolderSubdirs(folder, subs)
+		if err != nil {
+			http.Error(w, err.Error(), 500)
+			return
+		}
 		nextStr := qs.Get("next")
 		next, err := strconv.Atoi(nextStr)
 		if err == nil {
 			s.model.DelayScan(folder, time.Duration(next)*time.Second)
 		}
-
-		subs := qs["sub"]
-		err = s.model.ScanFolderSubdirs(folder, subs)
-		if err != nil {
-			http.Error(w, err.Error(), 500)
-			return
-		}
 	} else {
 		errors := s.model.ScanFolders()
 		if len(errors) > 0 {
@@ -46,6 +46,7 @@ import (
 	"github.com/syncthing/syncthing/lib/symlinks"
 	"github.com/syncthing/syncthing/lib/tlsutil"
 	"github.com/syncthing/syncthing/lib/upgrade"
+	"github.com/syncthing/syncthing/lib/weakhash"

 	"github.com/thejerf/suture"

@@ -411,6 +412,34 @@ func main() {
 		return
 	}

+	// ---BEGIN TEMPORARY HACK---
+	//
+	// Remove once v0.14.21-v0.14.22 are rare enough. Those versions,
+	// essentially:
+	//
+	// 1. os.Setenv("STMONITORED", "yes")
+	// 2. os.Setenv("STNORESTART", "")
+	//
+	// where the intention was for 2 to cancel out 1 instead of setting
+	// STNORESTART to the empty value. We check for exactly this combination
+	// and pretend that neither was set. Looking through os.Environ lets us
+	// distinguish. Luckily, we weren't smart enough to use os.Unsetenv.
+
+	matches := 0
+	for _, str := range os.Environ() {
+		if str == "STNORESTART=" {
+			matches++
+		}
+		if str == "STMONITORED=yes" {
+			matches++
+		}
+	}
+	if matches == 2 {
+		innerProcess = false
+	}
+
+	// ---END TEMPORARY HACK---
+
 	if innerProcess || options.noRestart {
 		syncthingMain(options)
 	} else {
@@ -623,8 +652,10 @@ func syncthingMain(runtimeOptions RuntimeOptions) {

 	sha256.SelectAlgo()
 	sha256.Report()
-	perf := cpuBench(3, 150*time.Millisecond)
-	l.Infof("Actual hashing performance is %.02f MB/s", perf)
+	perfWithWeakHash := cpuBench(3, 150*time.Millisecond, true)
+	l.Infof("Hashing performance with weak hash is %.02f MB/s", perfWithWeakHash)
+	perfWithoutWeakHash := cpuBench(3, 150*time.Millisecond, false)
+	l.Infof("Hashing performance without weak hash is %.02f MB/s", perfWithoutWeakHash)

 	// Emit the Starting event, now that we know who we are.

@@ -680,6 +711,22 @@ func syncthingMain(runtimeOptions RuntimeOptions) {
 		symlinks.Supported = false
 	}

+	if opts.WeakHashSelectionMethod == config.WeakHashAuto {
+		if perfWithoutWeakHash*0.8 > perfWithWeakHash {
+			l.Infof("Weak hash disabled, as it has an unacceptable performance impact.")
+			weakhash.Enabled = false
+		} else {
+			l.Infof("Weak hash enabled, as it has an acceptable performance impact.")
+			weakhash.Enabled = true
+		}
+	} else if opts.WeakHashSelectionMethod == config.WeakHashNever {
+		l.Infof("Disabling weak hash")
+		weakhash.Enabled = false
+	} else if opts.WeakHashSelectionMethod == config.WeakHashAlways {
+		l.Infof("Enabling weak hash")
+		weakhash.Enabled = true
+	}
+
 	if (opts.MaxRecvKbps > 0 || opts.MaxSendKbps > 0) && !opts.LimitBandwidthInLan {
 		lans, _ = osutil.GetLans()
 		for _, lan := range opts.AlwaysLocalNets {
@@ -9,6 +9,7 @@ package main
 import (
 	"github.com/syncthing/syncthing/lib/config"
 	"github.com/syncthing/syncthing/lib/protocol"
+	"github.com/syncthing/syncthing/lib/util"
 )

 type mockedConfig struct {
@@ -24,7 +25,9 @@ func (c *mockedConfig) ListenAddresses() []string {
 }

 func (c *mockedConfig) RawCopy() config.Configuration {
-	return config.Configuration{}
+	cfg := config.Configuration{}
+	util.SetDefaults(&cfg.Options)
+	return cfg
 }

 func (c *mockedConfig) Options() config.OptionsConfiguration {
@@ -35,7 +35,6 @@ const (
 )

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

 	var dst io.Writer = os.Stdout
@@ -69,6 +68,8 @@ func monitorMain(runtimeOptions RuntimeOptions) {
 	sigHup := syscall.Signal(1)
 	signal.Notify(restartSign, sigHup)

+	childEnv := childEnv()
+	first := true
 	for {
 		if t := time.Since(restarts[0]); t < loopThreshold {
 			l.Warnf("%d restarts in %v; not retrying further", countRestarts, t)
@@ -79,6 +80,7 @@ func monitorMain(runtimeOptions RuntimeOptions) {
 		restarts[len(restarts)-1] = time.Now()

 		cmd := exec.Command(args[0], args[1:]...)
+		cmd.Env = childEnv

 		stderr, err := cmd.StderrPipe()
 		if err != nil {
@@ -96,10 +98,6 @@ func monitorMain(runtimeOptions RuntimeOptions) {
 			l.Fatalln(err)
 		}

-		// Let the next child process know that this is not the first time
-		// it's starting up.
-		os.Setenv("STRESTART", "yes")
-
 		stdoutMut.Lock()
 		stdoutFirstLines = make([]string, 0, 10)
 		stdoutLastLines = make([]string, 0, 50)
@@ -149,7 +147,6 @@ func monitorMain(runtimeOptions RuntimeOptions) {
 						// Restart the monitor process to release the .old
 						// binary as part of the upgrade process.
 						l.Infoln("Restarting monitor...")
-						os.Setenv("STNORESTART", "")
 						if err = restartMonitor(args); err != nil {
 							l.Warnln("Restart:", err)
 						}
@@ -161,6 +158,13 @@ func monitorMain(runtimeOptions RuntimeOptions) {

 		l.Infoln("Syncthing exited:", err)
 		time.Sleep(1 * time.Second)
+
+		if first {
+			// Let the next child process know that this is not the first time
+			// it's starting up.
+			childEnv = append(childEnv, "STRESTART=yes")
+			first = false
+		}
 	}
 }

@@ -409,3 +413,19 @@ func (f *autoclosedFile) closerLoop() {
 		}
 	}
 }
+
+// Returns the desired child environment, properly filtered and added to.
+func childEnv() []string {
+	var env []string
+	for _, str := range os.Environ() {
+		if strings.HasPrefix("STNORESTART=", str) {
+			continue
+		}
+		if strings.HasPrefix("STMONITORED=", str) {
+			continue
+		}
+		env = append(env, str)
+	}
+	env = append(env, "STMONITORED=yes")
+	return env
+}
@@ -113,7 +113,8 @@ func reportData(cfg configIntf, m modelIntf) map[string]interface{} {
 	var mem runtime.MemStats
 	runtime.ReadMemStats(&mem)
 	res["memoryUsageMiB"] = (mem.Sys - mem.HeapReleased) / 1024 / 1024
-	res["sha256Perf"] = cpuBench(5, 125*time.Millisecond)
+	res["sha256Perf"] = cpuBench(5, 125*time.Millisecond, false)
+	res["hashPerf"] = cpuBench(5, 125*time.Millisecond, true)

 	bytes, err := memorySize()
 	if err == nil {
@@ -286,10 +287,14 @@ func (s *usageReportingService) Stop() {
 }

 // cpuBench returns CPU performance as a measure of single threaded SHA-256 MiB/s
-func cpuBench(iterations int, duration time.Duration) float64 {
+func cpuBench(iterations int, duration time.Duration, useWeakHash bool) float64 {
+	dataSize := 16 * protocol.BlockSize
+	bs := make([]byte, dataSize)
+	rand.Reader.Read(bs)
+
 	var perf float64
 	for i := 0; i < iterations; i++ {
-		if v := cpuBenchOnce(duration); v > perf {
+		if v := cpuBenchOnce(duration, useWeakHash, bs); v > perf {
 			perf = v
 		}
 	}
@@ -299,17 +304,13 @@ func cpuBench(iterations int, duration time.Duration) float64 {

 var blocksResult []protocol.BlockInfo // so the result is not optimized away

-func cpuBenchOnce(duration time.Duration) float64 {
-	dataSize := 16 * protocol.BlockSize
-	bs := make([]byte, dataSize)
-	rand.Reader.Read(bs)
-
+func cpuBenchOnce(duration time.Duration, useWeakHash bool, bs []byte) float64 {
 	t0 := time.Now()
 	b := 0
 	for time.Since(t0) < duration {
 		r := bytes.NewReader(bs)
-		blocksResult, _ = scanner.Blocks(r, protocol.BlockSize, int64(dataSize), nil, true)
-		b += dataSize
+		blocksResult, _ = scanner.Blocks(r, protocol.BlockSize, int64(len(bs)), nil, useWeakHash)
+		b += len(bs)
 	}
 	d := time.Since(t0)
 	return float64(int(float64(b)/d.Seconds()/(1<<20)*100)) / 100
@@ -22,7 +22,7 @@
    "An external command handles the versioning. It has to remove the file from the synced folder.": "Друга команда се занимава с версиите. Тази команда трябва да премахни файла от синхронизираната папка.",
    "Anonymous Usage Reporting": "Анонимен доклад",
    "Any devices configured on an introducer device will be added to this device as well.": "Устройства настроени да представят други устройства също ще бъдат добавени към това устройство.",
-    "Automatic upgrade now offers the choice between stable releases and release candidates.": "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": "Автоматично обновяване",
    "Be careful!": "Внимание!",
    "Bugs": "Бъгове",
@@ -105,7 +105,7 @@
    "Last seen": "Последно видяно",
    "Later": "По-късно",
    "Latest Change": "Последна промяна",
-    "Learn more": "Learn more",
+    "Learn more": "Научете повече",
    "Listeners": "Синхронизиращи устройства",
    "Local Discovery": "Локално откриване",
    "Local State": "Локално състояние",
@@ -150,7 +150,7 @@
    "Random": "Произволен",
    "Reduced by ignore patterns": "Намалено посредством шаблон за игнориране",
    "Release Notes": "Бележки по обновяването",
-    "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.",
+    "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Кандидат версиите съдържат най-новата функционалност и поправки. Те са близки до традиционните дву-седмични Synchthing обновления.",
    "Remote Devices": "Чужди устройства",
    "Remove": "Премахни",
    "Required identifier for the folder. Must be the same on all cluster devices.": "Задължителен идентификатор за тази папка. Трябва да бъде един и същ на всички устройства.",
@@ -187,7 +187,7 @@
    "Smallest First": "Първо най-малките",
    "Source Code": "Сорс код",
    "Stable releases and release candidates": "Стабилни версии и кандидати за стабилни версии",
-    "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "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": "Само стабилни версии",
    "Staggered File Versioning": "Наслагващи се версии",
    "Start Browser": "Стартирай браузъра",
@@ -254,8 +254,8 @@
    "When adding a new device, keep in mind that this device must be added on the other side too.": "Когато добавяш ново устройство помни, че твоето устройство също трябва да бъде добавено от другата страна.",
    "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Когато добавяш нов идентификатор на папка помни, че той се използва за свързване на папките на различни устройства. Главни/малки букви са от значение и трябва да са еднакви на всички устройства.",
    "Yes": "Да",
-    "You 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 can change your choice at any time in the Settings dialog.": "Може да промените решението си по всяко време в прозореца Настройки.",
+    "You can read more about the two release channels at the link below.": "Може да научите допълнително за двата канала на версии, следвайки връзката по-долу.",
    "You must keep at least one version.": "Трябва да пазиш поне една версия.",
    "days": "дни",
    "directories": "директории",
@@ -4,7 +4,7 @@
    "A new major version may not be compatible with previous versions.": "Nová důležitá verze nemusí být kompatibilní s předchozími verzemi.",
    "API Key": "API klíč",
    "About": "O aplikaci",
-    "Action": "Action",
+    "Action": "Akce",
    "Actions": "Akce",
    "Add": "Přidat",
    "Add Device": "Přidat přístroj",
@@ -22,7 +22,7 @@
    "An external command handles the versioning. It has to remove the file from the synced folder.": "Verzování obstarává externí příkaz. Musí odstranit soubor ze sdíleného adresáře.",
    "Anonymous Usage Reporting": "Anonymní hlášení o používání",
    "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.",
-    "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 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!",
    "Bugs": "Chyby",
@@ -39,10 +39,10 @@
    "Copied from elsewhere": "Zkopírováno odjinud",
    "Copied from original": "Zkopírováno z originálu",
    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 následující přispěvatelé:",
-    "Copyright © 2014-2017 the following Contributors:": "Copyright © 2014-2017 the following Contributors:",
+    "Copyright © 2014-2017 the following Contributors:": "Copyright © 2014-2017 následující přispěvatelé:",
    "Danger!": "Pozor!",
    "Deleted": "Smazáno",
-    "Device": "Device",
+    "Device": "Zařízení",
    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Zařízení \"{{name}}\" ({{device}} na {{address}}) se chce připojit. Přidat nové zařízení?",
    "Device ID": "ID přístroje",
    "Device Identification": "Identifikace přístroje",
@@ -82,9 +82,9 @@
    "GUI Authentication Password": "Přihlašovací heslo pro GUI",
    "GUI Authentication User": "Přihlašovací jméno pro GUI",
    "GUI Listen Addresses": "Adresa naslouchání GUI",
-    "GUI Theme": "GUI Theme",
+    "GUI Theme": "Grafické téma",
    "Generate": "Generovat",
-    "Global Changes": "Global Changes",
+    "Global Changes": "Globální změny",
    "Global Discovery": "Globální oznamování",
    "Global Discovery Servers": "Servery globálního oznamování",
    "Global State": "Globální status",
@@ -95,7 +95,7 @@
    "Ignore Permissions": "Ignorovat oprávnění",
    "Incoming Rate Limit (KiB/s)": "Omezení příchozí rychlosti (KiB/s)",
    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Nesprávné nastavení může poškodit obsah Vašich adresářů a učinit Syncthing nefunkční.",
-    "Introduced By": "Introduced By",
+    "Introduced By": "Zavedl",
    "Introducer": "Zavaděč",
    "Inversion of the given condition (i.e. do not exclude)": "Prohození zadané podmínky (např. nevynechat)",
    "Keep Versions": "Ponechat verze",
@@ -105,7 +105,7 @@
    "Last seen": "Naposledy spatřen",
    "Later": "Později",
    "Latest Change": "Poslední změna",
-    "Learn more": "Learn more",
+    "Learn more": "Zjistěte více",
    "Listeners": "Naslouchající",
    "Local Discovery": "Místní oznamování",
    "Local State": "Místní status",
@@ -123,7 +123,7 @@
    "Newest First": "Od nejnovějšího",
    "No": "Ne",
    "No File Versioning": "Bez verzování souborů",
-    "No upgrades": "No upgrades",
+    "No upgrades": "Žádné aktualizace",
    "Normal": "Normální",
    "Notice": "Oznámení",
    "OK": "OK",
@@ -135,7 +135,7 @@
    "Out of Sync Items": "Nesesynchronizované položky",
    "Outgoing Rate Limit (KiB/s)": "Omezení odchozí rychlosti (KiB/s)",
    "Override Changes": "Přepsat změny",
-    "Path": "Path",
+    "Path": "Cesta",
    "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Cesta k adresáři na lokálním počítači. Pokud neexistuje, bude vytvořen. Znak vlnovky (~) může být použit jako zkratka pro",
    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Cesta pro ukládání verzí (nechat prázdné pro výchozí podadresář .stversions v adresářích).",
    "Pause": "Pozastavit",
@@ -150,7 +150,7 @@
    "Random": "Náhodně",
    "Reduced by ignore patterns": "Redukováno o ignorované vzory",
    "Release Notes": "Poznámky k vydání",
-    "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.",
+    "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",
    "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.",
@@ -186,9 +186,9 @@
    "Single level wildcard (matches within a directory only)": "Jednoúrovňový zástupný znak (shody pouze uvnitř adresáře)",
    "Smallest First": "Od nejmenšího",
    "Source Code": "Zdrojový kód",
-    "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",
+    "Stable releases and release candidates": "Stabilní vydání a kandidáti na vydání",
+    "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "Stabilní vydání jsou opožděna zhruba o dva týdny. Po tuto dobu se testují jako kandidáti na vydání.",
+    "Stable releases only": "Pouze stabilní vydání",
    "Staggered File Versioning": "Postupné verzování souborů",
    "Start Browser": "Otevřít prohlížeč",
    "Statistics": "Statistiky",
@@ -229,9 +229,9 @@
    "This Device": "Toto zařízení",
    "This can easily give hackers access to read and change any files on your computer.": "To může útočníkům jednoduše povolit čtení a úpravy souborů na vašem přístroji. ",
    "This is a major version upgrade.": "Toto je důležitá aktualizace.",
-    "Time": "Time",
+    "Time": "Čas",
    "Trash Can File Versioning": "Verzování souborů v koši",
-    "Type": "Type",
+    "Type": "Typ",
    "Unknown": "Neznámý",
    "Unshared": "Nesdílený",
    "Unused": "Nepoužitý",
@@ -242,20 +242,20 @@
    "Upgrading": "Aktualizuji",
    "Upload Rate": "Rychlost odesílání",
    "Uptime": "Celkový čas běhu",
-    "Usage reporting is always enabled for candidate releases.": "Usage reporting is always enabled for candidate releases.",
+    "Usage reporting is always enabled for candidate releases.": "Hlášení o používání je pro kandidáty na vydání vždy zapnuto.",
    "Use HTTPS for GUI": "Použít HTTPS pro grafické rozhraní",
    "Version": "Verze",
    "Versions Path": "Cesta k verzím",
    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Verze jsou automaticky smazány, pokud jsou starší než maximální časový limit nebo překročí počet souborů povolených pro interval.",
-    "Warning, this path is a 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 parent directory of an existing folder \"{%otherFolder%}\".": "Varování, tato cesta je nadřazeným adresářem existujícího adresáře \"{{otherFolder}}\".",
+    "Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Varování, tato cesta je nadřazeným adresářem existujícího adresáře \"{{otherFolderLabel}}\" ({{otherFolder}}).",
    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Varování: tato cesta je podadresářem existujícího adresáře \"{{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}}).",
+    "Warning, this path is a subdirectory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Varování, tato cesta je podadresářem existujícího adresáře \"{{otherFolderLabel}}\" ({{otherFolder}}).",
    "When adding a new device, keep in mind that this device must be added on the other side too.": "Při přidávání nového přístroje mějte na paměti, že je ho třeba také zadat na druhé straně.",
    "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Při přidávání nového adresáře mějte na paměti, že jeho ID je použito ke svázání adresářů napříč přístoji. Rozlišují se malá a velká písmena a musí přesně souhlasit mezi všemi přístroji.",
    "Yes": "Ano",
-    "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 can change your choice at any time in the Settings dialog.": "Vaši volbu můžete kdykoliv změnit v dialogu nastavení.",
+    "You can read more about the two release channels at the link below.": "O kandidátech na vydání si můžete přečíst více v odkazu níže.",
    "You must keep at least one version.": "Je třeba ponechat alespoň jednu verzi.",
    "days": "dní",
    "directories": "složek",
@@ -22,7 +22,7 @@
    "An external command handles the versioning. It has to remove the file from the synced folder.": "Ein externer Programmaufruf handhabt die Versionierung. Es muss die Datei aus dem zu synchronisierendem Ordner entfernen.",
    "Anonymous Usage Reporting": "Anonymer Nutzungsbericht",
    "Any devices configured on an introducer device will be added to this device as well.": "Alle Geräte, die beim Verteiler eingetragen sind, werden auch bei diesem Gerät eingetragen",
-    "Automatic upgrade now offers the choice between stable releases and release candidates.": "Das automatische Update bietet jetzt die Möglichkeit zwischen stabilen Veröffentlichungen und Veröffentlichungskandidaten.",
+    "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!",
    "Bugs": "Fehler",
@@ -105,7 +105,7 @@
    "Last seen": "Zuletzt online",
    "Later": "Später",
    "Latest Change": "Letzte Änderung",
-    "Learn more": "Erfahre mehr",
+    "Learn more": "Mehr erfahren",
    "Listeners": "Zuhörer",
    "Local Discovery": "Lokale Gerätesuche",
    "Local State": "Lokaler Status",
@@ -150,7 +150,7 @@
    "Random": "Zufall",
    "Reduced by ignore patterns": "Durch Ignoriermuster reduziert",
    "Release Notes": "Veröffentlichungsnotizen",
-    "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Veröffentlichungskandidaten enthalten die neuesten Features und Verbesserungen. Sie entsprechen den traditionellen zweiwöchentlichen Syncthing Veröffentlichungen.",
+    "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 entsprechen den traditionellen zweiwöchentlichen Syncthing-Veröffentlichungen.",
    "Remote Devices": "Fern-Geräte",
    "Remove": "Entfernen",
    "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.",
@@ -187,7 +187,7 @@
    "Smallest First": "Kleinstes zuerst",
    "Source Code": "Quellcode",
    "Stable releases and release candidates": "Stabile Veröffentlichungen und Veröffentlichungskandidaten",
-    "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "Stabile Veröffentlichungen werden ca 2 Wochen verzögert. Während dieser Zeit durchlaufen sie eine Testphase als Veröffentlichungskandidaten",
+    "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "Stabile Veröffentlichungen werden ca. 2 Wochen verzögert. Während dieser Zeit durchlaufen sie eine Testphase als Veröffentlichungskandidaten.",
    "Stable releases only": "Ausschließlich stabile Releases",
    "Staggered File Versioning": "Stufenweise Dateiversionierung",
    "Start Browser": "Browser starten",
@@ -242,7 +242,7 @@
    "Upgrading": "Wird aktualisiert",
    "Upload Rate": "Upload",
    "Uptime": "Betriebszeit",
-    "Usage reporting is always enabled for candidate releases.": "Nutzungsauswertung ist immer aktiviert für Veröffentlichungskandidaten",
+    "Usage reporting is always enabled for candidate releases.": "Nutzungsauswertung ist für Veröffentlichungskandidaten immer aktiviert.",
    "Use HTTPS for GUI": "HTTPS für Benutzeroberfläche benutzen",
    "Version": "Version",
    "Versions Path": "Versionierungspfad",
@@ -254,7 +254,7 @@
    "When adding a new device, keep in mind that this device must be added on the other side too.": "Beachte beim Hinzufügen eines neuen Gerätes, dass dieses Gerät auch auf den anderen Geräten hinzugefügt werden muss.",
    "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Beachte bitte beim Hinzufügen eines neuen Ordners, dass die Ordnerkennung dazu verwendet wird, Ordner zwischen Geräten zu verbinden. Die Kennung muss also auf allen Geräten gleich sein, die Groß- und Kleinschreibung muss dabei beachtet werden.",
    "Yes": "Ja",
-    "You can change your choice at any time in the Settings dialog.": "Sie können ihre Wahl jederzeit in den Einstellungen ändern.",
+    "You can change your choice at any time in the Settings dialog.": "Sie können Ihre Wahl jederzeit in den Einstellungen ändern.",
    "You can read more about the two release channels at the link below.": "Über den untenstehenden Link können Sie mehr über die zwei Veröffentlichungskanäle erfahren.",
    "You must keep at least one version.": "Du musst mindestens eine Version behalten.",
    "days": "Tage",
@@ -22,7 +22,7 @@
    "An external command handles the versioning. It has to remove the file from the synced folder.": "Une commande externe gère les versions de fichiers. Il lui incombe de supprimer les fichiers dans le répertoire synchronisé.",
    "Anonymous Usage Reporting": "Rapport anonyme de statistiques d'utilisation",
    "Any devices configured on an introducer device will be added to this device as well.": "Tout appareil ajouté sur un appareil introducteur sera aussi ajouté sur votre propre appareil.",
-    "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 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 !",
    "Bugs": "Bugs",
@@ -105,7 +105,7 @@
    "Last seen": "Dernière apparition",
    "Later": "Plus tard",
    "Latest Change": "Dernier changement",
-    "Learn more": "Learn more",
+    "Learn more": "En savoir plus",
    "Listeners": "Systèmes à l'écoute",
    "Local Discovery": "Découverte locale",
    "Local State": "État local",
@@ -150,7 +150,7 @@
    "Random": "Aléatoire",
    "Reduced by ignore patterns": "(Limité par des masques d'exclusion)",
    "Release Notes": "Notes de version",
-    "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "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.": "Les mises à jour 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",
    "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.",
@@ -187,7 +187,7 @@
    "Smallest First": "Les plus petits d'abord",
    "Source Code": "Code source",
    "Stable releases and release candidates": "Versions stables et préliminaires",
-    "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 are delayed by about two weeks. During this time they go through testing as release candidates.": "Les mises à jour stables sont reportées d'environ deux semaines. Pendant ce temps elles sont testées en tant que versions préliminaires.",
    "Stable releases only": "Seulement les versions stables",
    "Staggered File Versioning": "Versions échelonnées",
    "Start Browser": "Lancer le navigateur web",
@@ -254,8 +254,8 @@
    "When adding a new device, keep in mind that this device must be added on the other side too.": "Lorsque vous ajoutez un appareil, gardez à l'esprit que le votre doit aussi être ajouté de l'autre coté.",
    "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Lorsqu'un nouveau partage est ajouté, gardez à l'esprit que son ID est utilisée pour lier les répertoires à travers les appareils. L'ID est sensible à la casse et sera forcément la même sur tous les appareils participant à ce partage.",
    "Yes": "Oui",
-    "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 can change your choice at any time in the Settings dialog.": "Vous pouvez changer votre choix dans la boîte de dialogue \"Configuration\".",
+    "You can read more about the two release channels at the link below.": "Vous pouvez en savoir plus sur les deux canaux de distribution via le lien ci-dessous.",
    "You must keep at least one version.": "Vous devez garder au minimum une version.",
    "days": "Jours",
    "directories": "répertoires",
@@ -22,7 +22,7 @@
    "An external command handles the versioning. It has to remove the file from the synced folder.": "Une commande externe gère les versions de fichiers. Il lui incombe de supprimer les fichiers dans le répertoire synchronisé.",
    "Anonymous Usage Reporting": "Rapport anonyme de statistiques d'utilisation",
    "Any devices configured on an introducer device will be added to this device as well.": "Tout appareil ajouté sur un appareil introducteur sera aussi ajouté sur votre propre appareil.",
-    "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 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 !",
    "Bugs": "Bugs",
@@ -105,7 +105,7 @@
    "Last seen": "Dernière apparition",
    "Later": "Plus tard",
    "Latest Change": "Dernier changement",
-    "Learn more": "Learn more",
+    "Learn more": "En savoir plus",
    "Listeners": "Systèmes en écoute",
    "Local Discovery": "Découverte locale",
    "Local State": "État local",
@@ -150,7 +150,7 @@
    "Random": "Aléatoire",
    "Reduced by ignore patterns": "(Limité par des masques d'exclusion)",
    "Release Notes": "Notes de version",
-    "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "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.": "Les mises à jour 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",
    "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.",
@@ -187,7 +187,7 @@
    "Smallest First": "Les plus petits d'abord",
    "Source Code": "Code source",
    "Stable releases and release candidates": "Versions stables et préliminaires",
-    "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 are delayed by about two weeks. During this time they go through testing as release candidates.": "Les mises à jour stables sont reportées d'environ deux semaines. Pendant ce temps elles sont testées en tant que versions préliminaires.",
    "Stable releases only": "Seulement les versions stables",
    "Staggered File Versioning": "Versions échelonnées",
    "Start Browser": "Lancer le navigateur web",
@@ -254,8 +254,8 @@
    "When adding a new device, keep in mind that this device must be added on the other side too.": "Lorsque vous ajoutez un appareil, gardez à l'esprit que le votre doit aussi être ajouté de l'autre coté.",
    "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Lorsqu'un nouveau partage est ajouté, gardez à l'esprit que son ID est utilisée pour lier les répertoires à travers les appareils. L'ID est sensible à la casse et sera forcément la même sur tous les appareils participant à ce partage.",
    "Yes": "Oui",
-    "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 can change your choice at any time in the Settings dialog.": "Vous pouvez changer votre choix dans la boîte de dialogue \"Configuration\".",
+    "You can read more about the two release channels at the link below.": "Vous pouvez en savoir plus sur les deux canaux de distribution via le lien ci-dessous.",
    "You must keep at least one version.": "Vous devez garder au minimum une version.",
    "days": "Jours",
    "directories": "répertoires",
@@ -22,7 +22,7 @@
    "An external command handles the versioning. It has to remove the file from the synced folder.": "Külső program kezeli a fájlverzió-követést. Az távolítja el a fájlt a szinkronizált mappából.",
    "Anonymous Usage Reporting": "Névtelen felhasználási adatok küldése",
    "Any devices configured on an introducer device will be added to this device as well.": "A bevezető eszközön beállított minden eszköz hozzá lesz adva ehhez az eszközhöz is.",
-    "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 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!",
    "Bugs": "Hibák",
@@ -105,7 +105,7 @@
    "Last seen": "Utoljára látva",
    "Later": "Később",
    "Latest Change": "Utolsó módosítás",
-    "Learn more": "Learn more",
+    "Learn more": "Tudj meg többet",
    "Listeners": "Kapcsolatok",
    "Local Discovery": "Helyi felfedezés",
    "Local State": "Helyi állapot",
@@ -150,7 +150,7 @@
    "Random": "Véletlenszerű",
    "Reduced by ignore patterns": "Kihagyási mintákkal csökkentve",
    "Release Notes": "Kiadási megjegyzések",
-    "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.",
+    "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",
    "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.",
@@ -187,7 +187,7 @@
    "Smallest First": "Kisebb először",
    "Source Code": "Forráskód",
    "Stable releases and release candidates": "Stabil és előzetes kiadások ",
-    "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 are delayed by about two weeks. During this time they go through testing as release candidates.": "A stabil kiadások nagyjából két héttel el vannak csúsztatva. Ez alatt előzetes kiadásként tesztelésen mennek keresztül.",
    "Stable releases only": "Csak stabil kiadások",
    "Staggered File Versioning": "Többszintű fájlverzió-követés",
    "Start Browser": "Böngésző indítása",
@@ -254,8 +254,8 @@
    "When adding a new device, keep in mind that this device must be added on the other side too.": "Új eszköz hozzáadásakor nem szabad elfeledkezni arról, hogy a másik oldalon ezt az eszközt is hozzá kell adni.",
    "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Új eszköz hozzáadásakor észben kell tartani, hogy a mappaazonosító arra való, hogy összekösse a mappákat az eszközökön. Az azonosító kisbetű-nagybetű érzékeny és pontosan egyeznie kell az eszközökön.",
    "Yes": "Igen",
-    "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 can change your choice at any time in the Settings dialog.": "A beállításoknál bármikor módosíthatod a választásodat.",
+    "You can read more about the two release channels at the link below.": "A két kiadási csatornáról az alábbi linken olvashatsz további információkat.",
    "You must keep at least one version.": "Legalább egy verziót meg kell tartani.",
    "days": "nap",
    "directories": "mappa",
@@ -22,7 +22,7 @@
    "An external command handles the versioning. It has to remove the file from the synced folder.": "外部コマンドにバージョンを管理させます。ここで指定するコマンドは、同期フォルダーからファイルを削除するものでなくてはなりません。",
    "Anonymous Usage Reporting": "匿名での利用状況レポート",
    "Any devices configured on an introducer device will be added to this device as well.": "紹介者デバイス上で設定されたデバイスは、このデバイス上でも追加されます。",
-    "Automatic upgrade now offers the choice between stable releases and release candidates.": "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": "自動アップグレード",
    "Be careful!": "注意してください。",
    "Bugs": "バグ",
@@ -105,7 +105,7 @@
    "Last seen": "最終接続日時",
    "Later": "後で設定",
    "Latest Change": "最終変更内容",
-    "Learn more": "Learn more",
+    "Learn more": "詳細を確認する",
    "Listeners": "待ち受けポート",
    "Local Discovery": "LAN内で探索",
    "Local State": "ローカル状態",
@@ -150,7 +150,7 @@
    "Random": "ランダム",
    "Reduced by ignore patterns": "無視パターン該当分を除く",
    "Release Notes": "リリースノート",
-    "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.",
+    "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "リリース候補版には最新の機能と修正が含まれます。これは従来の隔週リリースに近いものです。",
    "Remote Devices": "接続先デバイス",
    "Remove": "除去",
    "Required identifier for the folder. Must be the same on all cluster devices.": "フォルダーの識別子で、必須です。このフォルダーを共有する全てのデバイス上で同一でなくてはなりません。",
@@ -187,7 +187,7 @@
    "Smallest First": "小さい順",
    "Source Code": "ソースコード",
    "Stable releases and release candidates": "安定リリース版とリリース候補版",
-    "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "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.": "安定リリース版はおよそ2週間後にリリースされます。その間にリリース候補版としてテストされます。",
    "Stable releases only": "安定リリース版のみ",
    "Staggered File Versioning": "期間別バージョン管理",
    "Start Browser": "起動時にウェブブラウザーで状態を表示する",
@@ -254,8 +254,8 @@
    "When adding a new device, keep in mind that this device must be added on the other side too.": "新しいデバイスを追加する際は、相手側のデバイスにもこのデバイスを追加する必要があることに留意してください。",
    "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "新しいフォルダーを追加する際、フォルダーIDはデバイス間でフォルダーの対応づけに使われることに注意してください。フォルダーIDは大文字と小文字が区別され、共有するすべてのデバイスの間で完全に一致しなくてはなりません。",
    "Yes": "はい",
-    "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 can change your choice at any time in the Settings dialog.": "どちらを選ぶかは設定ダイアログからいつでも変更できます。",
+    "You can read more about the two release channels at the link below.": "2種類のリリースチャネルについての詳細は、以下のリンク先を参照してください。",
    "You must keep at least one version.": "少なくとも一つのバージョンを保存してください。",
    "days": "日",
    "directories": "個のディレクトリ",
@@ -22,7 +22,7 @@
    "An external command handles the versioning. It has to remove the file from the synced folder.": "Išorinė komanda apdoroja versijų valdymą. Ji turi pašalinti failą iš sinchronizuoto aplanko.",
    "Anonymous Usage Reporting": "Anoniminė naudojimo ataskaita",
    "Any devices configured on an introducer device will be added to this device as well.": "Visi supažindintojo įrenginiai bus pridėti prie jūsų įrenginių sąrašo.",
-    "Automatic upgrade now offers the choice between stable releases and release candidates.": "Automatic upgrade now offers the choice between stable releases and release candidates.",
+    "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!",
    "Bugs": "Klaidos",
@@ -105,7 +105,7 @@
    "Last seen": "Paskutinį kartą matytas",
    "Later": "Vėliau",
    "Latest Change": "Paskutinis pakeitimas",
-    "Learn more": "Learn more",
+    "Learn more": "Sužinoti daugiau",
    "Listeners": "Klausytojai",
    "Local Discovery": "Vietinis matomumas",
    "Local State": "Vietinė būsena",
@@ -150,7 +150,7 @@
    "Random": "Atsitiktinė",
    "Reduced by ignore patterns": "Sumažinta pagal nepaisomus šablonus",
    "Release Notes": "Laidos Informacija",
-    "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.",
+    "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",
    "Required identifier for the folder. Must be the same on all cluster devices.": "Reikalaujamas aplanko identifikatorius. Privalo būti toks pats visuose įrenginiuose.",
@@ -187,7 +187,7 @@
    "Smallest First": "Mažiausi pirmiau",
    "Source Code": "Išeities kodas",
    "Stable releases and release candidates": "Stabilios versijos ir kandidatinės versijos",
-    "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 are delayed by about two weeks. During this time they go through testing as release candidates.": "Stabilios versijos pasirodo maždaug dvi savaites vėliau. Per tą laiką, jos pereina testavimą kaip kandidatinės versijos.",
    "Stable releases only": "Tik stabilios versijos",
    "Staggered File Versioning": "Pakopinis versijų valdymas",
    "Start Browser": "Paleisti naršyklę",
@@ -254,8 +254,8 @@
    "When adding a new device, keep in mind that this device must be added on the other side too.": "Pridėdami įrenginį, turėkite omeny, kad šis įrenginys taip pat turi būti pridėtas kitoje pusėje.",
    "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Kai įvedate naują aplanką neužmirškite, kad jis bus naudojamas visuose įrenginiuose. Svarbu visur įvesti visiškai tokį pat aplanko vardą neužmirštant apie didžiąsias ir mažąsias raides.",
    "Yes": "Taip",
-    "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 can change your choice at any time in the Settings dialog.": "Jūs bet kuriuo metu galite pakeisti savo pasirinkimą nustatymų dialoge.",
+    "You can read more about the two release channels at the link below.": "Jūs galite perskaityti daugiau apie šiuos du laidos kanalus, pasinaudodami žemiau esančia nuoroda.",
    "You must keep at least one version.": "Būtina saugoti bent vieną versiją.",
    "days": "dienos",
    "directories": "papkės",
@@ -22,7 +22,7 @@
    "An external command handles the versioning. It has to remove the file from the synced folder.": "Um programa externo controla o versionamento. Ele tem que remover o arquivo da pasta sincronizada.",
    "Anonymous Usage Reporting": "Relatórios anônimos de uso",
    "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.",
-    "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 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!",
    "Bugs": "Erros",
@@ -105,7 +105,7 @@
    "Last seen": "Visto por último em",
    "Later": "Depois",
    "Latest Change": "Última mudança",
-    "Learn more": "Learn more",
+    "Learn more": "Saiba mais",
    "Listeners": "Escutadores",
    "Local Discovery": "Descoberta local",
    "Local State": "Estado local",
@@ -150,7 +150,7 @@
    "Random": "Aleatória",
    "Reduced by ignore patterns": "Reduzido por filtros",
    "Release Notes": "Notas de lançamento",
-    "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "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.": "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",
    "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.",
@@ -187,7 +187,7 @@
    "Smallest First": "Menor primeiro",
    "Source Code": "Código-fonte",
    "Stable releases and release candidates": "Versões estáveis e candidatas ao lançamento",
-    "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "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.": "Versões estáveis são lançadas aproximadamente a cada duas semanas. Durante esse tempo elas são testadas como candidatas.",
    "Stable releases only": "Somente versões estáveis",
    "Staggered File Versioning": "Escalonado",
    "Start Browser": "Iniciar navegador",
@@ -254,8 +254,8 @@
    "When adding a new device, keep in mind that this device must be added on the other side too.": "Quando estiver adicionando um dispositivo, lembre-se de que este dispositivo deve ser adicionado do outro lado também.",
    "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Quando adicionar uma nova pasta, lembre-se que o ID da pasta é utilizado para ligar pastas entre dispositivos. Ele é sensível às diferenças entre maiúsculas e minúsculas e deve ser o mesmo em todos os dispositivos.",
    "Yes": "Sim",
-    "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 can change your choice at any time in the Settings dialog.": "Você pode mudar de ideia a qualquer momento na tela de configurações.",
+    "You can read more about the two release channels at the link below.": "Você pode se informar melhor sobre os dois canais de lançamento no link abaixo.",
    "You must keep at least one version.": "Você deve manter pelo menos uma versão.",
    "days": "dias",
    "directories": "diretórios",
@@ -22,7 +22,7 @@
    "An external command handles the versioning. It has to remove the file from the synced folder.": "Um comando externo trata do controle de versões. Esse comando tem que remover o ficheiro da pasta sincronizada.",
    "Anonymous Usage Reporting": "Enviar relatórios anónimos de utilização",
    "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.",
-    "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 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!",
    "Bugs": "Erros",
@@ -105,7 +105,7 @@
    "Last seen": "Última vez que foi verificado",
    "Later": "Mais tarde",
    "Latest Change": "Última alteração",
-    "Learn more": "Learn more",
+    "Learn more": "Saiba mais",
    "Listeners": "Auscultadores",
    "Local Discovery": "Pesquisa local",
    "Local State": "Estado local",
@@ -150,7 +150,7 @@
    "Random": "Aleatória",
    "Reduced by ignore patterns": "Reduzido por padrões de exclusão",
    "Release Notes": "Notas de lançamento",
-    "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.",
+    "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",
    "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.",
@@ -187,7 +187,7 @@
    "Smallest First": "Primeiro os menores",
    "Source Code": "Código fonte",
    "Stable releases and release candidates": "Versões estáveis e versões candidatas a lançamento",
-    "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 are delayed by about two weeks. During this time they go through testing as release candidates.": "Versões estáveis são adiadas por cerca de duas semanas. Durante esse tempo são submetidas a testes como versões candidatas a lançamento.",
    "Stable releases only": "Somente versões estáveis",
    "Staggered File Versioning": "Escalonada",
    "Start Browser": "Iniciar navegador",
@@ -254,8 +254,8 @@
    "When adding a new device, keep in mind that this device must be added on the other side too.": "Quando adicionar um novo dispositivo, lembre-se que este dispositivo tem que ser adicionado do outro lado também.",
    "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Quando adicionar uma nova pasta, lembre-se que o ID da pasta é utilizado para ligar as pastas entre dispositivos. É sensível às diferenças entre maiúsculas e minúsculas e tem que ter uma correspondência perfeita entre todos os dispositivos.",
    "Yes": "Sim",
-    "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 can change your choice at any time in the Settings dialog.": "Pode modificar a sua escolha em qualquer altura nas configurações.",
+    "You can read more about the two release channels at the link below.": "Pode ler mais sobre os dois canais de lançamento na ligação abaixo.",
    "You must keep at least one version.": "Tem que manter pelo menos uma versão.",
    "days": "dias",
    "directories": "pastas",
@@ -22,7 +22,7 @@
    "An external command handles the versioning. It has to remove the file from the synced folder.": "Ett externt kommando sköter versionshanteringen. Den behöver ta bort filen från den synkroniserade katalogen.",
    "Anonymous Usage Reporting": "Anonym användarstatistiksrapportering",
    "Any devices configured on an introducer device will be added to this device as well.": "Alla enheter konfigurerade på en introduktörsenhet kommer också att läggas till den här enheten.",
-    "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 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!",
    "Bugs": "Buggar",
@@ -105,7 +105,7 @@
    "Last seen": "Senast sedd",
    "Later": "Senare",
    "Latest Change": "Senaste ändring",
-    "Learn more": "Learn more",
+    "Learn more": "Ta reda på mer",
    "Listeners": "Lyssnare",
    "Local Discovery": "Lokal annonsering",
    "Local State": "Lokal status",
@@ -150,7 +150,7 @@
    "Random": "Slumpmässig",
    "Reduced by ignore patterns": "Minskas med ignorera mönster",
    "Release Notes": "Versionsanteckningar",
-    "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.",
+    "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",
    "Required identifier for the folder. Must be the same on all cluster devices.": "Krävs identifierare för katalogen. Måste vara densamma på alla kluster enheter.",
@@ -187,7 +187,7 @@
    "Smallest First": "Minst först",
    "Source Code": "Källkod",
    "Stable releases and release candidates": "Stabila utgåvor och utgåvskandidater",
-    "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 are delayed by about two weeks. During this time they go through testing as release candidates.": "Stabila utgåvor är försenade med cirka två veckor. Under denna tid de går igenom tester som utgåvskandidater.",
    "Stable releases only": "Endast stabila utgåvor",
    "Staggered File Versioning": "Filversionshantering i intervall",
    "Start Browser": "Starta webbläsare",
@@ -254,8 +254,8 @@
    "When adding a new device, keep in mind that this device must be added on the other side too.": "När du lägger till en ny enhet, kom ihåg att den här enheten måste läggas till på den andra enheten också.",
    "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "När du lägger till ny katalog, tänk på att katalog-ID knyter ihop kataloger mellan olika enheter. De skiftlägeskänsliga och måste matcha precis mellan alla enheter.",
    "Yes": "Ja",
-    "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 can change your choice at any time in the Settings dialog.": "Du kan ändra ditt val när som helst i inställningsdialogrutan.",
+    "You can read more about the two release channels at the link below.": "Du kan läsa mer om de två publiceringsskanalerna på länken nedan.",
    "You must keep at least one version.": "Du måste behålla åtminstone en version.",
    "days": "dagar",
    "directories": "kataloger",
@@ -332,6 +332,19 @@ func convertV17V18(cfg *Configuration) {
 	cfg.Version = 18
 }

+func convertV16V17(cfg *Configuration) {
+	for i := range cfg.Folders {
+		cfg.Folders[i].Fsync = true
+	}
+
+	cfg.Version = 17
+}
+
+func convertV15V16(cfg *Configuration) {
+	// Triggers a database tweak
+	cfg.Version = 16
+}
+
 func convertV14V15(cfg *Configuration) {
 	// Undo v0.13.0 broken migration

@@ -347,19 +360,6 @@ func convertV14V15(cfg *Configuration) {
 	cfg.Version = 15
 }

-func convertV15V16(cfg *Configuration) {
-	// Triggers a database tweak
-	cfg.Version = 16
-}
-
-func convertV16V17(cfg *Configuration) {
-	for i := range cfg.Folders {
-		cfg.Folders[i].Fsync = true
-	}
-
-	cfg.Version = 17
-}
-
 func convertV13V14(cfg *Configuration) {
 	// Not using the ignore cache is the new default. Disable it on existing
 	// configurations.
@@ -65,6 +65,7 @@ func TestDefaultValues(t *testing.T) {
 		OverwriteRemoteDevNames: false,
 		TempIndexMinBlocks:      10,
 		UnackedNotificationIDs:  []string{},
+		WeakHashSelectionMethod: WeakHashAuto,
 	}

 	cfg := New(device1)
@@ -203,6 +204,7 @@ func TestOverriddenValues(t *testing.T) {
 		UnackedNotificationIDs: []string{
 			"channelNotification", // added in 17->18 migration
 		},
+		WeakHashSelectionMethod: WeakHashNever,
 	}

 	os.Unsetenv("STNOUPGRADE")
@@ -6,43 +6,132 @@

 package config

+import (
+	"encoding/json"
+	"encoding/xml"
+	"fmt"
+)
+
+type WeakHashSelectionMethod int
+
+const (
+	WeakHashAuto WeakHashSelectionMethod = iota
+	WeakHashAlways
+	WeakHashNever
+)
+
+func (m WeakHashSelectionMethod) MarshalString() (string, error) {
+	switch m {
+	case WeakHashAuto:
+		return "auto", nil
+	case WeakHashAlways:
+		return "always", nil
+	case WeakHashNever:
+		return "never", nil
+	default:
+		return "", fmt.Errorf("unrecognized hash selection method")
+	}
+}
+
+func (m WeakHashSelectionMethod) String() string {
+	s, err := m.MarshalString()
+	if err != nil {
+		panic(err)
+	}
+	return s
+}
+
+func (m *WeakHashSelectionMethod) UnmarshalString(value string) error {
+	switch value {
+	case "auto":
+		*m = WeakHashAuto
+		return nil
+	case "always":
+		*m = WeakHashAlways
+		return nil
+	case "never":
+		*m = WeakHashNever
+		return nil
+	}
+	return fmt.Errorf("unrecognized hash selection method")
+}
+
+func (m WeakHashSelectionMethod) MarshalJSON() ([]byte, error) {
+	val, err := m.MarshalString()
+	if err != nil {
+		return nil, err
+	}
+	return json.Marshal(val)
+}
+
+func (m *WeakHashSelectionMethod) UnmarshalJSON(data []byte) error {
+	var value string
+	if err := json.Unmarshal(data, &value); err != nil {
+		return err
+	}
+	return m.UnmarshalString(value)
+}
+
+func (m WeakHashSelectionMethod) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
+	val, err := m.MarshalString()
+	if err != nil {
+		return err
+	}
+	return e.EncodeElement(val, start)
+}
+
+func (m *WeakHashSelectionMethod) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
+	var value string
+	if err := d.DecodeElement(&value, &start); err != nil {
+		return err
+	}
+	return m.UnmarshalString(value)
+}
+
+func (WeakHashSelectionMethod) ParseDefault(value string) (interface{}, error) {
+	var m WeakHashSelectionMethod
+	err := m.UnmarshalString(value)
+	return m, err
+}
+
 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"`
-	MaxSendKbps             int      `xml:"maxSendKbps" json:"maxSendKbps"`
-	MaxRecvKbps             int      `xml:"maxRecvKbps" json:"maxRecvKbps"`
-	ReconnectIntervalS      int      `xml:"reconnectionIntervalS" json:"reconnectionIntervalS" default:"60"`
-	RelaysEnabled           bool     `xml:"relaysEnabled" json:"relaysEnabled" default:"true"`
-	RelayReconnectIntervalM int      `xml:"relayReconnectIntervalM" json:"relayReconnectIntervalM" default:"10"`
-	StartBrowser            bool     `xml:"startBrowser" json:"startBrowser" default:"true"`
-	NATEnabled              bool     `xml:"natEnabled" json:"natEnabled" default:"true"`
-	NATLeaseM               int      `xml:"natLeaseMinutes" json:"natLeaseMinutes" default:"60"`
-	NATRenewalM             int      `xml:"natRenewalMinutes" json:"natRenewalMinutes" default:"30"`
-	NATTimeoutS             int      `xml:"natTimeoutSeconds" json:"natTimeoutSeconds" default:"10"`
-	URAccepted              int      `xml:"urAccepted" json:"urAccepted"` // Accepted usage reporting version; 0 for off (undecided), -1 for off (permanently)
-	URUniqueID              string   `xml:"urUniqueID" json:"urUniqueId"` // Unique ID for reporting purposes, regenerated when UR is turned on.
-	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"`
-	ProgressUpdateIntervalS int      `xml:"progressUpdateIntervalS" json:"progressUpdateIntervalS" default:"5"`
-	SymlinksEnabled         bool     `xml:"symlinksEnabled" json:"symlinksEnabled" default:"true"`
-	LimitBandwidthInLan     bool     `xml:"limitBandwidthInLan" json:"limitBandwidthInLan" default:"false"`
-	MinHomeDiskFreePct      float64  `xml:"minHomeDiskFreePct" json:"minHomeDiskFreePct" default:"1"`
-	ReleasesURL             string   `xml:"releasesURL" json:"releasesURL" default:"https://upgrades.syncthing.net/meta.json"`
-	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"`
+	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"`
+	MaxSendKbps             int                     `xml:"maxSendKbps" json:"maxSendKbps"`
+	MaxRecvKbps             int                     `xml:"maxRecvKbps" json:"maxRecvKbps"`
+	ReconnectIntervalS      int                     `xml:"reconnectionIntervalS" json:"reconnectionIntervalS" default:"60"`
+	RelaysEnabled           bool                    `xml:"relaysEnabled" json:"relaysEnabled" default:"true"`
+	RelayReconnectIntervalM int                     `xml:"relayReconnectIntervalM" json:"relayReconnectIntervalM" default:"10"`
+	StartBrowser            bool                    `xml:"startBrowser" json:"startBrowser" default:"true"`
+	NATEnabled              bool                    `xml:"natEnabled" json:"natEnabled" default:"true"`
+	NATLeaseM               int                     `xml:"natLeaseMinutes" json:"natLeaseMinutes" default:"60"`
+	NATRenewalM             int                     `xml:"natRenewalMinutes" json:"natRenewalMinutes" default:"30"`
+	NATTimeoutS             int                     `xml:"natTimeoutSeconds" json:"natTimeoutSeconds" default:"10"`
+	URAccepted              int                     `xml:"urAccepted" json:"urAccepted"` // Accepted usage reporting version; 0 for off (undecided), -1 for off (permanently)
+	URUniqueID              string                  `xml:"urUniqueID" json:"urUniqueId"` // Unique ID for reporting purposes, regenerated when UR is turned on.
+	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"`
+	ProgressUpdateIntervalS int                     `xml:"progressUpdateIntervalS" json:"progressUpdateIntervalS" default:"5"`
+	SymlinksEnabled         bool                    `xml:"symlinksEnabled" json:"symlinksEnabled" default:"true"`
+	LimitBandwidthInLan     bool                    `xml:"limitBandwidthInLan" json:"limitBandwidthInLan" default:"false"`
+	MinHomeDiskFreePct      float64                 `xml:"minHomeDiskFreePct" json:"minHomeDiskFreePct" default:"1"`
+	ReleasesURL             string                  `xml:"releasesURL" json:"releasesURL" default:"https://upgrades.syncthing.net/meta.json"`
+	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"`

 	DeprecatedUPnPEnabled  bool     `xml:"upnpEnabled,omitempty" json:"-"`
 	DeprecatedUPnPLeaseM   int      `xml:"upnpLeaseMinutes,omitempty" json:"-"`
@@ -34,5 +34,6 @@
        <releasesURL>https://localhost/releases</releasesURL>
        <overwriteRemoteDeviceNamesOnConnect>true</overwriteRemoteDeviceNamesOnConnect>
        <tempIndexMinBlocks>100</tempIndexMinBlocks>
+        <weakHashSelectionMethod>never</weakHashSelectionMethod>
    </options>
 </configuration>
@@ -51,6 +51,8 @@ const (

 var runningTests = false

+const eventLogTimeout = 15 * time.Millisecond
+
 func (t EventType) String() string {
 	switch t {
 	case Starting:
@@ -122,6 +124,7 @@ type Logger struct {
 	subs                []*Subscription
 	nextSubscriptionIDs []int
 	nextGlobalID        int
+	timeout             *time.Timer
 	mutex               sync.Mutex
 }

@@ -149,9 +152,16 @@ var (
 )

 func NewLogger() *Logger {
-	return &Logger{
-		mutex: sync.NewMutex(),
+	l := &Logger{
+		mutex:   sync.NewMutex(),
+		timeout: time.NewTimer(time.Second),
 	}
+	// Make sure the timer is in the stopped state and hasn't fired anything
+	// into the channel.
+	if !l.timeout.Stop() {
+		<-l.timeout.C
+	}
+	return l
 }

 func (l *Logger) Log(t EventType, data interface{}) {
@@ -171,10 +181,21 @@ func (l *Logger) Log(t EventType, data interface{}) {
 			e.SubscriptionID = l.nextSubscriptionIDs[i]
 			l.nextSubscriptionIDs[i]++

+			l.timeout.Reset(eventLogTimeout)
+			timedOut := false
+
 			select {
 			case s.events <- e:
-			default:
+			case <-l.timeout.C:
 				// if s.events is not ready, drop the event
+				timedOut = true
+			}
+
+			// If stop returns false it already sent something to the
+			// channel. If we didn't already read it above we must do so now
+			// or we get a spurious timeout on the next loop.
+			if !l.timeout.Stop() && !timedOut {
+				<-l.timeout.C
 			}
 		}
 	}
@@ -12,7 +12,7 @@ import (
 	"time"
 )

-const timeout = 100 * time.Millisecond
+const timeout = time.Second

 func init() {
 	runningTests = true
@@ -101,12 +101,20 @@ func TestBufferOverflow(t *testing.T) {
 	s := l.Subscribe(AllEvents)
 	defer l.Unsubscribe(s)

+	// The first BufferSize events will be logged pretty much
+	// instantaneously. The next BufferSize events will each block for up to
+	// 15ms, plus overhead from race detector and thread scheduling latency
+	// etc. This latency can sometimes be significant and is incurred for
+	// each call. We just verify that the whole test completes in a
+	// reasonable time, taking no more than 15 seconds in total.
+
 	t0 := time.Now()
-	for i := 0; i < BufferSize*2; i++ {
+	const nEvents = BufferSize * 2
+	for i := 0; i < nEvents; i++ {
 		l.Log(DeviceConnected, "foo")
 	}
-	if time.Since(t0) > timeout {
-		t.Fatalf("Logging took too long")
+	if d := time.Since(t0); d > 15*time.Second {
+		t.Fatal("Logging took too long,", d, "avg", d/nEvents, "expected <", eventLogTimeout)
 	}
 }

@@ -45,7 +45,7 @@ func TestMtimeFS(t *testing.T) {
 		t.Error("Should not have failed:", err)
 	}

-	// All of the calls were successfull, so an Lstat on them should return
+	// All of the calls were successful, so an Lstat on them should return
 	// the test timestamp.

 	for _, file := range []string{"testdata/exists0", "testdata/exists1", "testdata/exists2"} {
@@ -37,6 +37,7 @@ import (
 	"github.com/syncthing/syncthing/lib/sync"
 	"github.com/syncthing/syncthing/lib/upgrade"
 	"github.com/syncthing/syncthing/lib/versioner"
+	"github.com/syncthing/syncthing/lib/weakhash"
 	"github.com/thejerf/suture"
 )

@@ -1813,7 +1814,7 @@ func (m *Model) internalScanFolderSubdirs(folder string, subDirs []string) error
 		ShortID:               m.shortID,
 		ProgressTickIntervalS: folderCfg.ScanProgressIntervalS,
 		Cancel:                cancel,
-		UseWeakHashes:         folderCfg.WeakHashThresholdPct < 100,
+		UseWeakHashes:         weakhash.Enabled,
 	})

 	if err != nil {
@@ -1221,23 +1221,34 @@ func (f *sendReceiveFolder) copierRoutine(in <-chan copyBlocksState, pullChan ch
 		f.model.fmut.RUnlock()

 		var weakHashFinder *weakhash.Finder
-		blocksPercentChanged := 0
-		if tot := len(state.file.Blocks); tot > 0 {
-			blocksPercentChanged = (tot - state.have) * 100 / tot
-		}

-		if blocksPercentChanged >= f.WeakHashThresholdPct {
-			hashesToFind := make([]uint32, 0, len(state.blocks))
-			for _, block := range state.blocks {
-				if block.WeakHash != 0 {
-					hashesToFind = append(hashesToFind, block.WeakHash)
+		if weakhash.Enabled {
+			blocksPercentChanged := 0
+			if tot := len(state.file.Blocks); tot > 0 {
+				blocksPercentChanged = (tot - state.have) * 100 / tot
+			}
+
+			if blocksPercentChanged >= f.WeakHashThresholdPct {
+				hashesToFind := make([]uint32, 0, len(state.blocks))
+				for _, block := range state.blocks {
+					if block.WeakHash != 0 {
+						hashesToFind = append(hashesToFind, block.WeakHash)
+					}
 				}
-			}

-			weakHashFinder, err = weakhash.NewFinder(state.realName, protocol.BlockSize, hashesToFind)
-			if err != nil {
-				l.Debugln("weak hasher", err)
+				if len(hashesToFind) > 0 {
+					weakHashFinder, err = weakhash.NewFinder(state.realName, protocol.BlockSize, hashesToFind)
+					if err != nil {
+						l.Debugln("weak hasher", err)
+					}
+				} else {
+					l.Debugf("not weak hashing %s. file did not contain any weak hashes", state.file.Name)
+				}
+			} else {
+				l.Debugf("not weak hashing %s. not enough changed %.02f < %d", state.file.Name, blocksPercentChanged, f.WeakHashThresholdPct)
 			}
+		} else {
+			l.Debugf("not weak hashing %s. weak hashing disabled", state.file.Name)
 		}

 		for _, block := range state.blocks {
@@ -234,7 +234,7 @@ func TestTimeoutCond(t *testing.T) {
 	// See the comments in runLocks

 	const (
-		// Low values to avoid being intrusive in continous testing. Can be
+		// Low values to avoid being intrusive in continuous testing. Can be
 		// increased significantly for stress testing.
 		iterations = 100
 		routines   = 10
@@ -25,6 +25,17 @@ func SetDefaults(data interface{}) error {

 		v := tag.Get("default")
 		if len(v) > 0 {
+			if parser, ok := f.Interface().(interface {
+				ParseDefault(string) (interface{}, error)
+			}); ok {
+				val, err := parser.ParseDefault(v)
+				if err != nil {
+					panic(err)
+				}
+				f.Set(reflect.ValueOf(val))
+				continue
+			}
+
 			switch f.Interface().(type) {
 			case string:
 				f.SetString(v)
@@ -8,12 +8,21 @@ package util

 import "testing"

+type Defaulter struct {
+	Value string
+}
+
+func (Defaulter) ParseDefault(v string) (interface{}, error) {
+	return Defaulter{Value: v}, nil
+}
+
 func TestSetDefaults(t *testing.T) {
 	x := &struct {
-		A string  `default:"string"`
-		B int     `default:"2"`
-		C float64 `default:"2.2"`
-		D bool    `default:"true"`
+		A string    `default:"string"`
+		B int       `default:"2"`
+		C float64   `default:"2.2"`
+		D bool      `default:"true"`
+		E Defaulter `default:"defaulter"`
 	}{}

 	if x.A != "" {
@@ -24,6 +33,8 @@ func TestSetDefaults(t *testing.T) {
 		t.Errorf("float failed")
 	} else if x.D {
 		t.Errorf("bool failed")
+	} else if x.E.Value != "" {
+		t.Errorf("defaulter failed")
 	}

 	if err := SetDefaults(x); err != nil {
@@ -38,6 +49,8 @@ func TestSetDefaults(t *testing.T) {
 		t.Errorf("float failed")
 	} else if !x.D {
 		t.Errorf("bool failed")
+	} else if x.E.Value != "defaulter" {
+		t.Errorf("defaulter failed")
 	}
 }

@@ -21,11 +21,15 @@ const (
 	maxWeakhashFinderHits = 10
 )

+var (
+	Enabled = true
+)
+
 // Find finds all the blocks of the given size within io.Reader that matches
 // the hashes provided, and returns a hash -> slice of offsets within reader
 // map, that produces the same weak hash.
 func Find(ir io.Reader, hashesToFind []uint32, size int) (map[uint32][]int64, error) {
-	if ir == nil {
+	if ir == nil || len(hashesToFind) == 0 {
 		return nil, nil
 	}

@@ -45,7 +49,7 @@ func Find(ir io.Reader, hashesToFind []uint32, size int) (map[uint32][]int64, er

 	offsets := make(map[uint32][]int64)
 	for _, hashToFind := range hashesToFind {
-		offsets[hashToFind] = nil
+		offsets[hashToFind] = make([]int64, 0, maxWeakhashFinderHits)
 	}

 	var i int64
@@ -39,8 +39,8 @@ func TestFinder(t *testing.T) {
 	defer finder.Close()

 	expected := map[uint32][]int64{
-		65143183: []int64{1, 27, 53, 79},
-		65798547: []int64{2, 28, 54, 80},
+		65143183: {1, 27, 53, 79},
+		65798547: {2, 28, 54, 80},
 	}
 	actual := make(map[uint32][]int64)

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "STDISCOSRV" "1" "February 03, 2017" "v0.14" "Syncthing"
+.TH "STDISCOSRV" "1" "February 06, 2017" "v0.14" "Syncthing"
 .SH NAME
 stdiscosrv \- Syncthing Discovery Server
 .
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "STRELAYSRV" "1" "February 03, 2017" "v0.14" "Syncthing"
+.TH "STRELAYSRV" "1" "February 06, 2017" "v0.14" "Syncthing"
 .SH NAME
 strelaysrv \- Syncthing Relay Server
 .
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-BEP" "7" "February 03, 2017" "v0.14" "Syncthing"
+.TH "SYNCTHING-BEP" "7" "February 06, 2017" "v0.14" "Syncthing"
 .SH NAME
 syncthing-bep \- Block Exchange Protocol v1
 .
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-CONFIG" "5" "February 03, 2017" "v0.14" "Syncthing"
+.TH "SYNCTHING-CONFIG" "5" "February 06, 2017" "v0.14" "Syncthing"
 .SH NAME
 syncthing-config \- Syncthing Configuration
 .
@@ -641,7 +641,9 @@ How often in seconds the progress of ongoing downloads is made available to
 the GUI.
 .TP
 .B symlinksEnabled
-Whether to sync symlinks, if supported by the system.
+Whether to sync symlinks, if supported by the system. Symlinks are supported
+on all platforms except for Windows, where they are ignored. Syncthing does
+not differentiate between different types of symlinks.
 .TP
 .B limitBandwidthInLan
 Whether to apply bandwidth limits to devices in the same broadcast domain
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-DEVICE-IDS" "7" "February 03, 2017" "v0.14" "Syncthing"
+.TH "SYNCTHING-DEVICE-IDS" "7" "February 06, 2017" "v0.14" "Syncthing"
 .SH NAME
 syncthing-device-ids \- Understanding Device IDs
 .
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-EVENT-API" "7" "February 03, 2017" "v0.14" "Syncthing"
+.TH "SYNCTHING-EVENT-API" "7" "February 06, 2017" "v0.14" "Syncthing"
 .SH NAME
 syncthing-event-api \- Event API
 .
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-FAQ" "7" "February 03, 2017" "v0.14" "Syncthing"
+.TH "SYNCTHING-FAQ" "7" "February 06, 2017" "v0.14" "Syncthing"
 .SH NAME
 syncthing-faq \- Frequently Asked Questions
 .
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-GLOBALDISCO" "7" "February 03, 2017" "v0.14" "Syncthing"
+.TH "SYNCTHING-GLOBALDISCO" "7" "February 06, 2017" "v0.14" "Syncthing"
 .SH NAME
 syncthing-globaldisco \- Global Discovery Protocol v3
 .
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-LOCALDISCO" "7" "February 03, 2017" "v0.14" "Syncthing"
+.TH "SYNCTHING-LOCALDISCO" "7" "February 06, 2017" "v0.14" "Syncthing"
 .SH NAME
 syncthing-localdisco \- Local Discovery Protocol v4
 .
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-NETWORKING" "7" "February 03, 2017" "v0.14" "Syncthing"
+.TH "SYNCTHING-NETWORKING" "7" "February 06, 2017" "v0.14" "Syncthing"
 .SH NAME
 syncthing-networking \- Firewall Setup
 .
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-RELAY" "7" "February 03, 2017" "v0.14" "Syncthing"
+.TH "SYNCTHING-RELAY" "7" "February 06, 2017" "v0.14" "Syncthing"
 .SH NAME
 syncthing-relay \- Relay Protocol v1
 .
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-REST-API" "7" "February 03, 2017" "v0.14" "Syncthing"
+.TH "SYNCTHING-REST-API" "7" "February 06, 2017" "v0.14" "Syncthing"
 .SH NAME
 syncthing-rest-api \- REST API
 .
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-SECURITY" "7" "February 03, 2017" "v0.14" "Syncthing"
+.TH "SYNCTHING-SECURITY" "7" "February 06, 2017" "v0.14" "Syncthing"
 .SH NAME
 syncthing-security \- Security Principles
 .
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-STIGNORE" "5" "February 03, 2017" "v0.14" "Syncthing"
+.TH "SYNCTHING-STIGNORE" "5" "February 06, 2017" "v0.14" "Syncthing"
 .SH NAME
 syncthing-stignore \- Prevent files from being synchronized to other nodes
 .
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-VERSIONING" "7" "February 03, 2017" "v0.14" "Syncthing"
+.TH "SYNCTHING-VERSIONING" "7" "February 06, 2017" "v0.14" "Syncthing"
 .SH NAME
 syncthing-versioning \- Keep automatic backups of deleted files by other nodes
 .
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING" "1" "February 03, 2017" "v0.14" "Syncthing"
+.TH "SYNCTHING" "1" "February 06, 2017" "v0.14" "Syncthing"
 .SH NAME
 syncthing \- Syncthing
 .
@@ -79,7 +79,7 @@ func walkerFor(basePath string) filepath.WalkFunc {
 }

 type templateVars struct {
-	Assets    []asset
+	Assets []asset
 }

 func main() {
@@ -88,7 +88,7 @@ func main() {
 	filepath.Walk(flag.Arg(0), walkerFor(flag.Arg(0)))
 	var buf bytes.Buffer
 	tpl.Execute(&buf, templateVars{
-		Assets:    assets,
+		Assets: assets,
 	})
 	bs, err := format.Source(buf.Bytes())
 	if err != nil {
@@ -22,5 +22,5 @@ parts:
    plugin: dump
    stage:
      - syncthing
-    snap:
+    prime:
      - syncthing
Author	SHA1	Message	Date
Jakob Borg	204f125ab3	cmd/syncthing: Environment handling for upgrade restarts (fixes #3970 )	2017-02-07 21:25:33 +01:00
Jakob Borg	9fda9642d3	lib/events: Make test even less timing dependent	2017-02-07 08:57:39 +01:00
Jakob Borg	dfd2c464b6	lib/events: Overflow test should calculate average log time	2017-02-07 08:47:53 +01:00
Jakob Borg	5a1ee7f0b0	gui, man: Update docs & translations	2017-02-07 08:28:02 +01:00
Jakob Borg	fdcbd54cd7	lib/events: Be more resilient against dropping events (fixes #3952 ) Instead of just immediately dropping the event if the subscription isn't ready to receive it, give it 15 ms to catch up. The value 15 ms is grabbed out of thin air - it just seems reasonable to me. The timer juggling makes the event send pretty much exactly twice as slow as it was before, but we're still under a microsecond. I think it's negligible compared to whatever event that just happened that we're interested in logging (usually a file operation of some kind). benchmark old ns/op new ns/op delta BenchmarkBufferedSub-8 475 950 +100.00% benchmark old allocs new allocs delta BenchmarkBufferedSub-8 4 4 +0.00% benchmark old bytes new bytes delta BenchmarkBufferedSub-8 104 117 +12.50% GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3960	2017-02-07 07:25:09 +00:00
Jakob Borg	e14741a58c	cmd/syncthing: Speed up the CPU benchmark Not the measured performance, just the wall clock time it takes to complete. The random generation was dominating.	2017-02-06 13:42:39 +01:00
Audrius Butkevicius	67acef1794	lib/weakhash, lib/model, cmd/syncthing: Decide if to use weakhash on startup (fixes #3938 ) GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3949	2017-02-06 10:27:11 +00:00
Simon FreiandJakob Borg	237893ead3	cmd/syncthing: Only delay next scan (via REST) if the scan succeeds GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3927	2017-02-05 18:17:44 +00:00
Jakob Borg	2590536ef3	readme: Spelling error in bold in the first sentence Nobody reads this, right?	2017-02-05 18:58:12 +01:00
Jakob Borg	dc91995475	readme: Go report card badge	2017-02-05 18:54:25 +01:00
Jakob Borg	3655c97850	cmd/syncthing, lib/fs, lib/sync: Spelling in comments	2017-02-05 18:51:52 +01:00
Jakob Borg	c0f3f06cfb	lib/weakhash, script: gofmt -s	2017-02-05 18:49:57 +01:00
Jakob Borg	05450ca034	readme: More build badges	2017-02-05 18:46:17 +01:00
Jakob Borg	c005e61151	snapcraft: s/snap/prime (fixes #3955 )	2017-02-05 15:03:36 +01:00
Jakob Borg	63e0b53e8b	build: Set snap grade "stable" for release candidates	2017-02-05 14:42:29 +01:00