vendor: Update github.com/gogo/protobuf, keeping all files

gvt fetch -a, because we need the protobuf files etc for regeneration

AUTHORS

@@ -37,6 +37,7 @@ Colin Kennedy (moshen) <moshen.colin@gmail.com>
 Daniel Bergmann (brgmnn) <dan.arne.bergmann@gmail.com> <brgmnn@users.noreply.github.com>
 Daniel Harte (norgeous) <daniel@harte.me> <daniel@danielharte.co.uk> <norgeous@users.noreply.github.com>
 Daniel Martí (mvdan) <mvdan@mvdan.cc>
+Darshil Chanpura (dtchanpura) <dtchanpura@gmail.com> <dcprime314@gmail.com>
 David Rimmer (dinosore) <dinosore@dbrsoftware.co.uk>
 Denis A. (dva) <denisva@gmail.com>
 Dennis Wilson (snnd) <dw@risu.io>
@@ -99,6 +100,7 @@ Sergey Mishin (ralder) <ralder@yandex.ru>
 Simon Frei (imsodin) <freisim93@gmail.com>
 Stefan Kuntz (Stefan-Code) <stefan.github@gmail.com> <Stefan.github@gmail.com>
 Stefan Tatschner (rumpelsepp) <stefan@sevenbyte.org> <rumpelsepp@sevenbyte.org>
+Suhas Gundimeda (snugghash) <suhas.gundimeda@gmail.com> <snugghash@gmail.com>
 Tim Abell (timabell) <tim@timwise.co.uk>
 Tim Howes (timhowes) <timhowes@berkeley.edu>
 Tobias Nygren (tnn2) <tnn@nygren.pp.se>

NICKS

@@ -36,6 +36,8 @@ ceh <emil@hessman.se>
 cqcallaw <enlightened.despot@gmail.com>
 damajor <damajor@gmail.com>
 dinosore <dinosore@dbrsoftware.co.uk>
+dtchanpura <dtchanpura@gmail.com>
+dtchanpura <dcprime314@gmail.com>
 dva <denisva@gmail.com>
 dzarda <dzardacz@gmail.com>
 eipiminus1 <eipiminusone+github@gmail.com>
@@ -114,6 +116,8 @@ sciurius <jvromans@squirrel.nl>
 seehuhn <voss@seehuhn.de>
 Smiley73 <heiko@zuerker.org>
 snnd <dw@risu.io>
+snugghash <suhas.gundimeda@gmail.com>
+snugghash <snugghash@gmail.com>
 Stefan-Code <stefan.github@gmail.com>
 Stefan-Code <Stefan.github@gmail.com>
 timabell <tim@timwise.co.uk>

build.go

@@ -44,6 +44,10 @@ var (
 
 type target struct {
 	name              string
+	debname           string
+	debdeps           []string
+	debpost           string
+	description       string
 	buildPkg          string
 	binaryName        string
 	archiveFiles      []archiveFile
@@ -66,9 +70,13 @@ var targets = map[string]target{
 	},
 	"syncthing": {
 		// The default target for "build", "install", "tar", "zip", "deb", etc.
-		name:       "syncthing",
-		buildPkg:   "./cmd/syncthing",
-		binaryName: "syncthing", // .exe will be added automatically for Windows builds
+		name:        "syncthing",
+		debname:     "syncthing",
+		debdeps:     []string{"libc6", "procps"},
+		debpost:     "script/post-upgrade",
+		description: "Open Source Continuous File Synchronization",
+		buildPkg:    "./cmd/syncthing",
+		binaryName:  "syncthing", // .exe will be added automatically for Windows builds
 		archiveFiles: []archiveFile{
 			{src: "{{binary}}", dst: "{{binary}}", perm: 0755},
 			{src: "README.md", dst: "README.txt", perm: 0644},
@@ -98,9 +106,12 @@ var targets = map[string]target{
 		},
 	},
 	"stdiscosrv": {
-		name:       "stdiscosrv",
-		buildPkg:   "./cmd/stdiscosrv",
-		binaryName: "stdiscosrv", // .exe will be added automatically for Windows builds
+		name:        "stdiscosrv",
+		debname:     "syncthing-discosrv",
+		debdeps:     []string{"libc6"},
+		description: "Syncthing Discovery Server",
+		buildPkg:    "./cmd/stdiscosrv",
+		binaryName:  "stdiscosrv", // .exe will be added automatically for Windows builds
 		archiveFiles: []archiveFile{
 			{src: "{{binary}}", dst: "{{binary}}", perm: 0755},
 			{src: "cmd/stdiscosrv/README.md", dst: "README.txt", perm: 0644},
@@ -109,17 +120,20 @@ var targets = map[string]target{
 		},
 		installationFiles: []archiveFile{
 			{src: "{{binary}}", dst: "deb/usr/bin/{{binary}}", perm: 0755},
-			{src: "cmd/stdiscosrv/README.md", dst: "deb/usr/share/doc/stdiscosrv/README.txt", perm: 0644},
-			{src: "cmd/stdiscosrv/LICENSE", dst: "deb/usr/share/doc/stdiscosrv/LICENSE.txt", perm: 0644},
-			{src: "AUTHORS", dst: "deb/usr/share/doc/stdiscosrv/AUTHORS.txt", perm: 0644},
+			{src: "cmd/stdiscosrv/README.md", dst: "deb/usr/share/doc/syncthing-discosrv/README.txt", perm: 0644},
+			{src: "cmd/stdiscosrv/LICENSE", dst: "deb/usr/share/doc/syncthing-discosrv/LICENSE.txt", perm: 0644},
+			{src: "AUTHORS", dst: "deb/usr/share/doc/syncthing-discosrv/AUTHORS.txt", perm: 0644},
 			{src: "man/stdiscosrv.1", dst: "deb/usr/share/man/man1/stdiscosrv.1", perm: 0644},
 		},
 		tags: []string{"purego"},
 	},
 	"strelaysrv": {
-		name:       "strelaysrv",
-		buildPkg:   "./cmd/strelaysrv",
-		binaryName: "strelaysrv", // .exe will be added automatically for Windows builds
+		name:        "strelaysrv",
+		debname:     "syncthing-relaysrv",
+		debdeps:     []string{"libc6"},
+		description: "Syncthing Relay Server",
+		buildPkg:    "./cmd/strelaysrv",
+		binaryName:  "strelaysrv", // .exe will be added automatically for Windows builds
 		archiveFiles: []archiveFile{
 			{src: "{{binary}}", dst: "{{binary}}", perm: 0755},
 			{src: "cmd/strelaysrv/README.md", dst: "README.txt", perm: 0644},
@@ -128,16 +142,19 @@ var targets = map[string]target{
 		},
 		installationFiles: []archiveFile{
 			{src: "{{binary}}", dst: "deb/usr/bin/{{binary}}", perm: 0755},
-			{src: "cmd/strelaysrv/README.md", dst: "deb/usr/share/doc/strelaysrv/README.txt", perm: 0644},
-			{src: "cmd/strelaysrv/LICENSE", dst: "deb/usr/share/doc/strelaysrv/LICENSE.txt", perm: 0644},
-			{src: "AUTHORS", dst: "deb/usr/share/doc/strelaysrv/AUTHORS.txt", perm: 0644},
+			{src: "cmd/strelaysrv/README.md", dst: "deb/usr/share/doc/syncthing-relaysrv/README.txt", perm: 0644},
+			{src: "cmd/strelaysrv/LICENSE", dst: "deb/usr/share/doc/syncthing-relaysrv/LICENSE.txt", perm: 0644},
+			{src: "AUTHORS", dst: "deb/usr/share/doc/syncthing-relaysrv/AUTHORS.txt", perm: 0644},
 			{src: "man/strelaysrv.1", dst: "deb/usr/share/man/man1/strelaysrv.1", perm: 0644},
 		},
 	},
 	"strelaypoolsrv": {
-		name:       "strelaypoolsrv",
-		buildPkg:   "./cmd/strelaypoolsrv",
-		binaryName: "strelaypoolsrv", // .exe will be added automatically for Windows builds
+		name:        "strelaypoolsrv",
+		debname:     "syncthing-relaypoolsrv",
+		debdeps:     []string{"libc6"},
+		description: "Syncthing Relay Pool Server",
+		buildPkg:    "./cmd/strelaypoolsrv",
+		binaryName:  "strelaypoolsrv", // .exe will be added automatically for Windows builds
 		archiveFiles: []archiveFile{
 			{src: "{{binary}}", dst: "{{binary}}", perm: 0755},
 			{src: "cmd/strelaypoolsrv/README.md", dst: "README.txt", perm: 0644},
@@ -146,9 +163,9 @@ var targets = map[string]target{
 		},
 		installationFiles: []archiveFile{
 			{src: "{{binary}}", dst: "deb/usr/bin/{{binary}}", perm: 0755},
-			{src: "cmd/strelaypoolsrv/README.md", dst: "deb/usr/share/doc/relaysrv/README.txt", perm: 0644},
-			{src: "cmd/strelaypoolsrv/LICENSE", dst: "deb/usr/share/doc/relaysrv/LICENSE.txt", perm: 0644},
-			{src: "AUTHORS", dst: "deb/usr/share/doc/relaysrv/AUTHORS.txt", perm: 0644},
+			{src: "cmd/strelaypoolsrv/README.md", dst: "deb/usr/share/doc/syncthing-relaypoolsrv/README.txt", perm: 0644},
+			{src: "cmd/strelaypoolsrv/LICENSE", dst: "deb/usr/share/doc/syncthing-relaypoolsrv/LICENSE.txt", perm: 0644},
+			{src: "AUTHORS", dst: "deb/usr/share/doc/syncthing-relaypoolsrv/AUTHORS.txt", perm: 0644},
 		},
 	},
 }
@@ -528,15 +545,26 @@ func buildDeb(target target) {
 		// than just 0.14.26. This rectifies that.
 		debver = strings.Replace(debver, "-", "~", -1)
 	}
-	runPrint("fpm", "-t", "deb", "-s", "dir", "-C", "deb",
-		"-n", "syncthing", "-v", debver, "-a", debarch,
-		"--vendor", maintainer, "-m", maintainer,
-		"-d", "libc6",
-		"-d", "procps", // because postinst script
+	args := []string{
+		"-t", "deb",
+		"-s", "dir",
+		"-C", "deb",
+		"-n", target.debname,
+		"-v", debver,
+		"-a", debarch,
+		"-m", maintainer,
+		"--vendor", maintainer,
+		"--description", target.description,
 		"--url", "https://syncthing.net/",
-		"--description", "Open Source Continuous File Synchronization",
-		"--after-upgrade", "script/post-upgrade",
-		"--license", "MPL-2")
+		"--license", "MPL-2",
+	}
+	for _, dep := range target.debdeps {
+		args = append(args, "-d", dep)
+	}
+	if target.debpost != "" {
+		args = append(args, "--after-upgrade", target.debpost)
+	}
+	runPrint("fpm", args...)
 }
 
 func buildSnap(target target) {

build.sh

@@ -61,9 +61,9 @@ case "${1:-default}" in
 	prerelease)
 		go run script/authors.go
 		build transifex
-		git add -A gui/default/assets/ lib/auto/
 		pushd man ; ./refresh.sh ; popd
-		git add -A man
+		git add -A gui man
+		git commit -m 'gui, man: Update docs & translations'
 		;;
 
 	noupgrade)
@@ -93,40 +93,6 @@ case "${1:-default}" in
 		done
 		;;
 
-	test-cov)
-		ulimit -t 600 &>/dev/null || true
-		ulimit -d 512000 &>/dev/null || true
-		ulimit -m 512000 &>/dev/null || true
-
-		echo "mode: set" > coverage.out
-		fail=0
-
-		# For every package in the repo
-		for dir in $(go list ./lib/... ./cmd/...) ; do
-			# run the tests
-			GOPATH="$(pwd)/Godeps/_workspace:$GOPATH" go test -coverprofile=profile.out $dir
-			if [ -f profile.out ] ; then
-				# and if there was test output, append it to coverage.out
-				grep -v "mode: " profile.out >> coverage.out
-				rm profile.out
-			fi
-		done
-
-		notCovered=$(egrep -c '\s0$' coverage.out)
-		total=$(wc -l coverage.out | awk '{print $1}')
-		coverPct=$(awk "BEGIN{print (1 - $notCovered / $total) * 100}")
-		echo "Total coverage is $coverPct%"
-
-		gocov convert coverage.out | gocov-xml > coverage.xml
-
-		# This is usually run from within Jenkins. If it is, we need to
-		# tweak the paths in coverage.xml so cobertura finds the
-		# source.
-		if [[ "${WORKSPACE:-default}" != "default" ]] ; then
-			sed "s#$WORKSPACE##g" < coverage.xml > coverage.xml.new && mv coverage.xml.new coverage.xml
-		fi
-		;;
-
 	test-xunit)
 		ulimit -t 600 &>/dev/null || true
 		ulimit -d 512000 &>/dev/null || true

cmd/strelaypoolsrv/gui/index.html

@@ -138,7 +138,7 @@
             </tr>
           </thead>
           <tbody>
-            <tr ng-repeat="relay in relays | orderBy:sortType:sortReverse:sortCompare">
+            <tr ng-repeat="relay in relays | orderBy:sortType:sortReverse:sortCompare" ng-mouseover="relay.showMarker()" ng-mouseleave="relay.hideMarker()">
               <td>{{ relay.address }}</td>
               <td ng-if="relay.status === undefined" colspan="11" class="text-center">Looking up...</td>
               <td ng-if-start="relay.status !== undefined">{{ relay.status.numActiveSessions }}</td>
@@ -307,13 +307,16 @@
           content: $compile($scope.tooltipTemplate)(scope)[0],
         });
 
-        relay.marker.addListener('mouseover', function() {
+        relay.showMarker = function() {
           relay.marker.info.open($scope.map, relay.marker);
-        });
+        }
 
-        relay.marker.addListener('mouseout', function() {
+        relay.hideMarker = function() {
           relay.marker.info.close();
-        });
+        }
+
+        relay.marker.addListener('mouseover', relay.showMarker);
+        relay.marker.addListener('mouseout', relay.hideMarker);
 
         $scope.mapBounds.extend(relay.marker.position);
     }

cmd/syncthing/cpuusage.go

@@ -0,0 +1,59 @@
+// Copyright (C) 2017 The Syncthing Authors.
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this file,
+// You can obtain one at https://mozilla.org/MPL/2.0/.
+
+package main
+
+import (
+	"math"
+	"time"
+
+	metrics "github.com/rcrowley/go-metrics"
+)
+
+const cpuTickRate = 5 * time.Second
+
+type cpuService struct {
+	avg  metrics.EWMA
+	stop chan struct{}
+}
+
+func newCPUService() *cpuService {
+	return &cpuService{
+		// 10 second average. Magic alpha value comes from looking at EWMA package
+		// definitions of EWMA1, EWMA5. The tick rate *must* be five seconds (hard
+		// coded in the EWMA package).
+		avg:  metrics.NewEWMA(1 - math.Exp(-float64(cpuTickRate)/float64(time.Second)/10.0)),
+		stop: make(chan struct{}),
+	}
+}
+
+func (s *cpuService) Serve() {
+	// Initialize prevUsage to an actual value returned by cpuUsage
+	// instead of zero, because at least Windows returns a huge negative
+	// number here that then slowly increments...
+	prevUsage := cpuUsage()
+	ticker := time.NewTicker(cpuTickRate)
+	defer ticker.Stop()
+	for {
+		select {
+		case <-ticker.C:
+			curUsage := cpuUsage()
+			s.avg.Update(int64((curUsage - prevUsage) / time.Millisecond))
+			prevUsage = curUsage
+			s.avg.Tick()
+		case <-s.stop:
+			return
+		}
+	}
+}
+
+func (s *cpuService) Stop() {
+	close(s.stop)
+}
+
+func (s *cpuService) Rate() float64 {
+	return s.avg.Rate()
+}

cmd/syncthing/cpuusage_windows.go

@@ -16,6 +16,7 @@ func cpuUsage() time.Duration {
 	if err != nil {
 		return 0
 	}
+	defer syscall.CloseHandle(handle)
 
 	var ctime, etime, ktime, utime syscall.Filetime
 	if err := syscall.GetProcessTimes(handle, &ctime, &etime, &ktime, &utime); err != nil {

cmd/syncthing/gui.go

@@ -11,7 +11,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
-	"math"
 	"net"
 	"net/http"
 	"os"
@@ -69,6 +68,7 @@ type apiService struct {
 	configChanged      chan struct{} // signals intentional listener close due to config change
 	started            chan string   // signals startup complete by sending the listener address, for testing only
 	startedOnce        chan struct{} // the service has started successfully at least once
+	cpu                rater
 
 	guiErrors logger.Recorder
 	systemLog logger.Recorder
@@ -121,7 +121,11 @@ type connectionsIntf interface {
 	Status() map[string]interface{}
 }
 
-func newAPIService(id protocol.DeviceID, cfg configIntf, httpsCertFile, httpsKeyFile, assetDir string, m modelIntf, defaultSub, diskSub events.BufferedSubscription, discoverer discover.CachingMux, connectionsService connectionsIntf, errors, systemLog logger.Recorder) *apiService {
+type rater interface {
+	Rate() float64
+}
+
+func newAPIService(id protocol.DeviceID, cfg configIntf, httpsCertFile, httpsKeyFile, assetDir string, m modelIntf, defaultSub, diskSub events.BufferedSubscription, discoverer discover.CachingMux, connectionsService connectionsIntf, errors, systemLog logger.Recorder, cpu rater) *apiService {
 	service := &apiService{
 		id:            id,
 		cfg:           cfg,
@@ -142,6 +146,7 @@ func newAPIService(id protocol.DeviceID, cfg configIntf, httpsCertFile, httpsKey
 		startedOnce:        make(chan struct{}),
 		guiErrors:          errors,
 		systemLog:          systemLog,
+		cpu:                cpu,
 	}
 
 	return service
@@ -847,30 +852,6 @@ func (s *apiService) flushResponse(resp string, w http.ResponseWriter) {
 	f.Flush()
 }
 
-// 10 second average. Magic alpha value comes from looking at EWMA package
-// definitions of EWMA1, EWMA5. The tick rate *must* be five seconds (hard
-// coded in the EWMA package).
-var cpuTickRate = 5 * time.Second
-var cpuAverage = metrics.NewEWMA(1 - math.Exp(-float64(cpuTickRate)/float64(time.Second)/10.0))
-
-func init() {
-	if !innerProcess {
-		return
-	}
-	go func() {
-		// Initialize prevUsage to an actual value returned by cpuUsage
-		// instead of zero, because at least Windows returns a huge negative
-		// number here that then slowly increments...
-		prevUsage := cpuUsage()
-		for range time.NewTicker(cpuTickRate).C {
-			curUsage := cpuUsage()
-			cpuAverage.Update(int64((curUsage - prevUsage) / time.Millisecond))
-			prevUsage = curUsage
-			cpuAverage.Tick()
-		}
-	}()
-}
-
 func (s *apiService) getSystemStatus(w http.ResponseWriter, r *http.Request) {
 	var m runtime.MemStats
 	runtime.ReadMemStats(&m)
@@ -899,7 +880,7 @@ func (s *apiService) getSystemStatus(w http.ResponseWriter, r *http.Request) {
 	res["connectionServiceStatus"] = s.connectionsService.Status()
 	// cpuUsage.Rate() is in milliseconds per second, so dividing by ten
 	// gives us percent
-	res["cpuPercent"] = cpuAverage.Rate() / 10 / float64(runtime.NumCPU())
+	res["cpuPercent"] = s.cpu.Rate() / 10 / float64(runtime.NumCPU())
 	res["pathSeparator"] = string(filepath.Separator)
 	res["uptime"] = int(time.Since(startTime).Seconds())
 	res["startTime"] = startTime

cmd/syncthing/gui_test.go

@@ -71,7 +71,7 @@ func TestStopAfterBrokenConfig(t *testing.T) {
 	}
 	w := config.Wrap("/dev/null", cfg)
 
-	srv := newAPIService(protocol.LocalDeviceID, w, "../../test/h1/https-cert.pem", "../../test/h1/https-key.pem", "", nil, nil, nil, nil, nil, nil, nil)
+	srv := newAPIService(protocol.LocalDeviceID, w, "../../test/h1/https-cert.pem", "../../test/h1/https-key.pem", "", nil, nil, nil, nil, nil, nil, nil, nil)
 	srv.started = make(chan string)
 
 	sup := suture.NewSimple("test")
@@ -475,11 +475,12 @@ func startHTTP(cfg *mockedConfig) (string, error) {
 	connections := new(mockedConnections)
 	errorLog := new(mockedLoggerRecorder)
 	systemLog := new(mockedLoggerRecorder)
+	cpu := new(mockedCPUService)
 	addrChan := make(chan string)
 
 	// Instantiate the API service
 	svc := newAPIService(protocol.LocalDeviceID, cfg, httpsCertFile, httpsKeyFile, assetDir, model,
-		eventSub, diskEventSub, discoverer, connections, errorLog, systemLog)
+		eventSub, diskEventSub, discoverer, connections, errorLog, systemLog, cpu)
 	svc.started = addrChan
 
 	// Actually start the API service
@@ -930,7 +931,7 @@ func TestEventMasks(t *testing.T) {
 	cfg := new(mockedConfig)
 	defSub := new(mockedEventSub)
 	diskSub := new(mockedEventSub)
-	svc := newAPIService(protocol.LocalDeviceID, cfg, "", "", "", nil, defSub, diskSub, nil, nil, nil, nil)
+	svc := newAPIService(protocol.LocalDeviceID, cfg, "", "", "", nil, defSub, diskSub, nil, nil, nil, nil, nil)
 
 	if mask := svc.getEventMask(""); mask != defaultEventMask {
 		t.Errorf("incorrect default mask %x != %x", int64(mask), int64(defaultEventMask))

cmd/syncthing/main.go

@@ -269,7 +269,7 @@ func defaultRuntimeOptions() RuntimeOptions {
 	}
 
 	if os.Getenv("STTRACE") != "" {
-		options.logFlags = log.Ltime | log.Ldate | log.Lmicroseconds | log.Lshortfile
+		options.logFlags = logger.DebugFlags
 	}
 
 	if runtime.GOOS != "windows" {
@@ -427,34 +427,6 @@ 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 {
@@ -795,7 +767,7 @@ func syncthingMain(runtimeOptions RuntimeOptions) {
 		ldb.ConvertSymlinkTypes()
 	}
 
-	m := model.NewModel(cfg, myID, myDeviceName(cfg), "syncthing", Version, ldb, protectedFiles)
+	m := model.NewModel(cfg, myID, "syncthing", Version, ldb, protectedFiles)
 
 	if t := os.Getenv("STDEADLOCKTIMEOUT"); len(t) > 0 {
 		it, err := strconv.Atoi(t)
@@ -941,6 +913,10 @@ func syncthingMain(runtimeOptions RuntimeOptions) {
 		}
 	}
 
+	if isSuperUser() {
+		l.Warnln("Syncthing should not run as a privileged or system user. Please consider using a normal user account.")
+	}
+
 	events.Default.Log(events.StartupComplete, map[string]string{
 		"myID": myID.String(),
 	})
@@ -960,15 +936,6 @@ func syncthingMain(runtimeOptions RuntimeOptions) {
 	os.Exit(code)
 }
 
-func myDeviceName(cfg *config.Wrapper) string {
-	devices := cfg.Devices()
-	myName := devices[myID].Name
-	if myName == "" {
-		myName, _ = os.Hostname()
-	}
-	return myName
-}
-
 func setupSignalHandling() {
 	// Exit cleanly with "restarting" code on SIGHUP.
 
@@ -1098,7 +1065,10 @@ func setupGUI(mainService *suture.Supervisor, cfg *config.Wrapper, m *model.Mode
 		l.Warnln("Insecure admin access is enabled.")
 	}
 
-	api := newAPIService(myID, cfg, locations[locHTTPSCertFile], locations[locHTTPSKeyFile], runtimeOptions.assetDir, m, defaultSub, diskSub, discoverer, connectionsService, errors, systemLog)
+	cpu := newCPUService()
+	mainService.Add(cpu)
+
+	api := newAPIService(myID, cfg, locations[locHTTPSCertFile], locations[locHTTPSKeyFile], runtimeOptions.assetDir, m, defaultSub, diskSub, discoverer, connectionsService, errors, systemLog, cpu)
 	cfg.Subscribe(api)
 	mainService.Add(api)
 

cmd/syncthing/mocked_cpuusage_test.go

@@ -0,0 +1,13 @@
+// Copyright (C) 2017 The Syncthing Authors.
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this file,
+// You can obtain one at https://mozilla.org/MPL/2.0/.
+
+package main
+
+type mockedCPUService struct{}
+
+func (*mockedCPUService) Rate() float64 {
+	return 42
+}

cmd/syncthing/superuser_unix.go

@@ -0,0 +1,17 @@
+// Copyright (C) 2017 The Syncthing Authors.
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this file,
+// You can obtain one at https://mozilla.org/MPL/2.0/.
+
+// +build !windows
+
+package main
+
+import (
+	"os"
+)
+
+func isSuperUser() bool {
+	return os.Geteuid() == 0
+}

cmd/syncthing/superuser_windows.go

@@ -0,0 +1,41 @@
+// Copyright (C) 2017 The Syncthing Authors.
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this file,
+// You can obtain one at https://mozilla.org/MPL/2.0/.
+
+package main
+
+import "syscall"
+
+// https://msdn.microsoft.com/en-us/library/windows/desktop/aa379649(v=vs.85).aspx
+const securityLocalSystemRID = "S-1-5-18"
+
+func isSuperUser() bool {
+	tok, err := syscall.OpenCurrentProcessToken()
+	if err != nil {
+		l.Debugln("OpenCurrentProcessToken:", err)
+		return false
+	}
+	defer tok.Close()
+
+	user, err := tok.GetTokenUser()
+	if err != nil {
+		l.Debugln("GetTokenUser:", err)
+		return false
+	}
+
+	if user.User.Sid == nil {
+		l.Debugln("sid is nil")
+		return false
+	}
+
+	sid, err := user.User.Sid.String()
+	if err != nil {
+		l.Debugln("Sid.String():", err)
+		return false
+	}
+
+	l.Debugf("SID: %q", sid)
+	return sid == securityLocalSystemRID
+}

etc/linux-systemd/README.md

@@ -5,4 +5,4 @@ This directory contains configuration files for running Syncthing under the
 systemd user service. For further documentation take a look at the [systemd
 section][1] on https://docs.syncthing.net.
 
-[1]: https://docs.syncthing.net/users/autostart.html#systemd
+[1]: https://docs.syncthing.net/users/autostart.html#using-systemd

gui/default/assets/css/overrides.css

@@ -100,6 +100,11 @@ ul+h5 {
     white-space: nowrap;
 }
 
+/* Removing text decoration on anchor link hover pull request: #4135 */
+.table td.small-data span a:hover {
+    text-decoration: none;
+}
+
 table.table-condensed {
     table-layout: fixed;
 }
@@ -266,6 +271,21 @@ ul.three-columns li, ul.two-columns li {
     z-index: 980;
 }
 
+.globalChanges-path-col {
+  /* These are technically the same, but use both */
+  overflow-wrap: break-word;
+  word-wrap: break-word;
+
+  -ms-word-break: break-all;
+  /* This is the dangerous one in WebKit, as it breaks things wherever */
+  word-break: break-all;
+  /* Instead use this non-standard one: */
+  word-break: break-word;
+}
+.globalChanges-time-col {
+    width: 100px;
+}
+
 /** Footer nav on small devices **/
 @media (max-width: 1199px) {
     /* Stay at the end of the page, with space reserved for the footer

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

@@ -158,6 +158,8 @@
     "Please consult the release notes before performing a major upgrade.": "Моля прочети бележките по обновяването преди да започнеш.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Моля задайте потребителско име и парола за потребителския интерфейс в секцията Настройки.",
     "Please wait": "Моля изчакай",
+    "Prefix indicating that the file can be deleted if preventing directory removal": "Представка, която индикира, че файлът може да бъде изтрит ако пречи на премахването на папка",
+    "Prefix indicating that the pattern should be matched without case sensitivity": "Представка, която индикира, че зададения шаблон трябва да бъде проверен без значение за главни/малки букви",
     "Preview": "Преглед",
     "Preview Usage Report": "Разгледай доклада за използване",
     "Quick guide to supported patterns": "Бърз наръчник към поддържаните шаблони",

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

@@ -4,13 +4,13 @@
     "A new major version may not be compatible with previous versions.": "Una nova versión amb canvis importants pot no ser compatible amb versions prèvies.",
     "API Key": "Clau API",
     "About": "Sobre",
-    "Action": "Action",
+    "Action": "Acció",
     "Actions": "Accions",
     "Add": "Afegir",
     "Add Device": "Afegir dispositiu",
     "Add Folder": "Afegir carpeta",
     "Add Remote Device": "Afegir Dispositiu Remot.",
-    "Add devices from the introducer to our device list, for mutually shared folders.": "Add devices from the introducer to our device list, for mutually shared folders.",
+    "Add devices from the introducer to our device list, for mutually shared folders.": "Afegir dispositius des-de l'introductor a la nostra llista de dispositius, per a tindre carpetes compartides mútuament",
     "Add new folder?": "Afegir nova carpeta?",
     "Address": "Direcció",
     "Addresses": "Direccions",
@@ -19,20 +19,20 @@
     "Advanced settings": "Ajustos avançats.",
     "All Data": "Totes les dades",
     "Allow Anonymous Usage Reporting?": "Permetre informes d'ús anònim?",
-    "Allowed Networks": "Allowed Networks",
+    "Allowed Networks": "Xarxes permeses",
     "Alphabetic": "Alfabètic",
-    "An external command handles the versioning. It has to remove the file from the shared folder.": "An external command handles the versioning. It has to remove the file from the shared folder.",
+    "An external command handles the versioning. It has to remove the file from the shared folder.": "Un command extern maneja les versions. Té que eliminar el fitxer de la carpeta compartida.",
     "An external command handles the versioning. It has to remove the file from the synced folder.": "Un comando extern controla el versionat. És necessari eliminar el fitxer de la carpeta sincronitzada.",
     "Anonymous Usage Reporting": "Informe d'ús anònim",
     "Any devices configured on an introducer device will be added to this device as well.": "Tots els dispositius configurats en un dispositiu presentador seràn afegits també a aquest dispositiu.",
-    "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.": "L'actualització automàtica ara ofereix l'elecció entre les versions estables i les versions candidates.",
     "Automatic upgrades": "Actualitzacions automàtiques",
     "Be careful!": "Tin precaució!",
     "Bugs": "Errors (Bugs)",
     "CPU Utilization": "Utilització de la CPU",
     "Changelog": "Registre de canvis",
     "Clean out after": "Netejar després de",
-    "Click to see discovery failures": "Click to see discovery failures",
+    "Click to see discovery failures": "Clica per a vore els fallos en el descobriment",
     "Close": "Tancar",
     "Command": "Comando",
     "Comment, when used at the start of a line": "Comentar, quant s'utilitza al principi d'una línia",
@@ -43,11 +43,11 @@
     "Copied from elsewhere": "Copiat de qualsevol lloc",
     "Copied from original": "Copiat de l'original",
     "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 els següents Col·laboradors:",
-    "Copyright © 2014-2017 the following Contributors:": "Copyright © 2014-2017 the following Contributors:",
-    "Creating ignore patterns, overwriting an existing file at {%path%}.": "Creating ignore patterns, overwriting an existing file at {{path}}.",
+    "Copyright © 2014-2017 the following Contributors:": "Copyright © 2014-2017 els següents Col·laboradors:",
+    "Creating ignore patterns, overwriting an existing file at {%path%}.": "Creant patrons a ignorar, sobreescriguent un fitxer que ja existeix a {{path}}.",
     "Danger!": "Perill!",
     "Deleted": "Esborrat",
-    "Device": "Device",
+    "Device": "Dispositiu",
     "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Dispositiu \"{{name}}\" ({{device}} a l'adreça {{address}}) vol connectar. Afegir nou dispositiu?",
     "Device ID": "ID del dispositiu",
     "Device Identification": "Identificació del dispositiu",
@@ -56,7 +56,7 @@
     "Disconnected": "Desconnectat",
     "Discovered": "Descobert",
     "Discovery": "Descobriment",
-    "Discovery Failures": "Discovery Failures",
+    "Discovery Failures": "Fallades al Descobriment",
     "Documentation": "Documentació",
     "Download Rate": "Velocitat de descàrrega",
     "Downloaded": "Descarregat",
@@ -65,23 +65,23 @@
     "Edit Device": "Editar Dispositiu",
     "Edit Folder": "Editar Carpeta",
     "Editing": "Editant",
-    "Editing {%path%}.": "Editing {{path}}.",
+    "Editing {%path%}.": "Editant {{path}}.",
     "Enable NAT traversal": "Permetre NAT transversal",
     "Enable Relaying": "Permetre Transmissions",
-    "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.",
-    "Enter a non-privileged port number (1024 - 65535).": "Enter a non-privileged port number (1024 - 65535).",
+    "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Introdueix un nombre no negatiu (per exemple, \"2.35\") i selecciona una unitat. Els percentatges són com a part del tamany total del disc.",
+    "Enter a non-privileged port number (1024 - 65535).": "Introdueix un nombre de port sense privilegis (1024-65535).",
     "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Introdueix adreces separades per coma (\"tcp://ip:port\", \"tcp://host:port\") o \"dynamic\" per a realitzar el descobriment automàtic de l'adreça.",
     "Enter ignore patterns, one per line.": "Introduïr patrons a ignorar, un per línia.",
     "Error": "Error",
     "External File Versioning": "Versionat extern de fitxers",
     "Failed Items": "Objectes fallits",
-    "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.",
+    "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "És possible que es produïsca una fallada al connectar als servidors IPv6 si no hi ha connectivitat IPv6.",
     "File Pull Order": "Ordre de fitxers del pull",
     "File Versioning": "Versionat de fitxer",
     "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Els bits de permís del fitxer són ignorats quant es busquen els canvis. Utilitzar en sistemes de fitxers FAT.",
-    "Files are moved to .stversions directory when replaced or deleted by Syncthing.": "Files are moved to .stversions directory when replaced or deleted by Syncthing.",
+    "Files are moved to .stversions directory when replaced or deleted by Syncthing.": "Els fitxers seràn moguts al directori .stversions quant siguen reemplaçats o esborrats per Syncthing.",
     "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Els arxius es menejen a la carpeta .stversions quant són substituïts o esborrats per Syncthing.",
-    "Files are moved to date stamped versions in a .stversions directory when replaced or deleted by Syncthing.": "Files are moved to date stamped versions in a .stversions directory when replaced or deleted by Syncthing.",
+    "Files are moved to date stamped versions in a .stversions directory when replaced or deleted by Syncthing.": "Els arxius seran moguts a un directori .stversions a versions amb control de la data quan siguen reemplaçats o esborrats per Syncthing.",
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Els fitxers són canviats a versions amb indicació de data en una carpeta \".stversions\" quant són reemplaçats o esborrats per Syncthing.",
     "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Els fitxers són protegits dels canvis fets en altres dispositius, però els canvis fets en aquest dispositiu seràn enviats a la resta del grup (cluster).",
     "Folder": "Carpeta",
@@ -93,11 +93,11 @@
     "GUI": "IGU (Interfície Gràfica d'Usuari)",
     "GUI Authentication Password": "Password d'autenticació de l'Interfície Gràfica d'Usuari (GUI)",
     "GUI Authentication User": "Autenticació de l'usuari de l'Interfície Gràfica d'Usuari (GUI)",
-    "GUI Listen Address": "GUI Listen Address",
+    "GUI Listen Address": "Adreça d'Escolta de l'Interfície Gràfica d'Usuari (GUI).",
     "GUI Listen Addresses": "Direcció d'escolta de l'Interfície Gràfica d'Usuari (GUI)",
-    "GUI Theme": "GUI Theme",
+    "GUI Theme": "Tema de l'Interfície Gràfica d'Usuari (GUI)",
     "Generate": "Generar",
-    "Global Changes": "Global Changes",
+    "Global Changes": "Canvis Globals",
     "Global Discovery": "Descobriment global",
     "Global Discovery Servers": "Servidors de Descobriment Global",
     "Global State": "Estat global",
@@ -108,7 +108,7 @@
     "Ignore Permissions": "Permisos a ignorar",
     "Incoming Rate Limit (KiB/s)": "Límit de descàrrega (KiB/s)",
     "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "La configuración incorrecta pot danyar el contingut de la teua carpeta i deixar Syncthing inoperatiu.",
-    "Introduced By": "Introduced By",
+    "Introduced By": "Introduït Per",
     "Introducer": "Presentador",
     "Inversion of the given condition (i.e. do not exclude)": "Inversió de la condició donada (per exemple no excloure)",
     "Keep Versions": "Mantindre versions",
@@ -118,7 +118,7 @@
     "Last seen": "Vist per última vegada",
     "Later": "Més tard",
     "Latest Change": "Últim Canvi",
-    "Learn more": "Learn more",
+    "Learn more": "Saber més",
     "Listeners": "Escoltants",
     "Local Discovery": "Descobriment local",
     "Local State": "Estat local",
@@ -136,7 +136,7 @@
     "Newest First": "El més nou primer",
     "No": "No",
     "No File Versioning": "Sense versionat de fitxer",
-    "No upgrades": "No upgrades",
+    "No upgrades": "Sense actualitzacions",
     "Normal": "Normal",
     "Notice": "Avís",
     "OK": "OK",
@@ -148,16 +148,18 @@
     "Out of Sync Items": "Dispositius sense sincronitzar",
     "Outgoing Rate Limit (KiB/s)": "Límit de pujada (KiB/s)",
     "Override Changes": "Sobreescriure els canvis",
-    "Path": "Path",
+    "Path": "Ruta",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Ruta a la carpeta local en l'ordinador. Es crearà si no existeix. El caràcter tilde (~) es pot utilitzar com a drecera",
-    "Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).": "Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).",
+    "Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).": "La ruta on deuen guardar-se les versions (deixar buit per al directori per defecte .stversions en la carpeta compartida).",
     "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Ruta on les versions deurien estar emmagatzemades (deixar buit per a la carpeta .stversions en la carpeta).",
     "Pause": "Pausa",
-    "Pause All": "Pause All",
+    "Pause All": "Pausa Tot",
     "Paused": "Pausat",
     "Please consult the release notes before performing a major upgrade.": "Per favor, consultar les notes de la versió abans de fer una actualització important.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Per favor, estableix un usuari i password per a l'Interfície Gràfica d'Usuari en el menú d'Adjustos.",
     "Please wait": "Per favor, espere",
+    "Prefix indicating that the file can be deleted if preventing directory removal": "Prefix indicating that the file can be deleted if preventing directory removal",
+    "Prefix indicating that the pattern should be matched without case sensitivity": "Prefix indicating that the pattern should be matched without case sensitivity",
     "Preview": "Vista prèvia",
     "Preview Usage Report": "Informe d'ús de vista prèvia",
     "Quick guide to supported patterns": "Guía ràpida de patrons suportats",
@@ -165,7 +167,7 @@
     "Random": "Aleatori",
     "Reduced by ignore patterns": "Reduït ignorant patrons",
     "Release Notes": "Notes de la versió",
-    "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 versions candidates (Release Candidates) contenen les darreres característiques i arreglos. Són paregudes a les versions tradicionals bi-semanals de Syncthing. ",
     "Remote Devices": "Dispositius Remots",
     "Remove": "Eliminar",
     "Required identifier for the folder. Must be the same on all cluster devices.": "Identificador necessari per la carpeta. Deu ser el mateix en tots els dispositius del cluster.",
@@ -176,7 +178,7 @@
     "Restart Needed": "Reinici necesari",
     "Restarting": "Reiniciant",
     "Resume": "Continuar",
-    "Resume All": "Resume All",
+    "Resume All": "Continuar Tot",
     "Reused": "Reutilitzat",
     "Save": "Gravar",
     "Scan Time Remaining": "Temps d'escaneig restant",
@@ -202,9 +204,9 @@
     "Single level wildcard (matches within a directory only)": "Comodí de nivell únic (coincideix sols dins d'un directori)",
     "Smallest First": "El més xicotet primer",
     "Source Code": "Codi font",
-    "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": "Versions estables i versions candidates",
+    "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "Les versions estables es retrasen sobre dos setmanes. Durant aquest temps es fiquen a prova com versions candidates.",
+    "Stable releases only": "Solament versions estables",
     "Staggered File Versioning": "Versionat de fitxers escalonat",
     "Start Browser": "Iniciar navegador",
     "Statistics": "Estadístiques",
@@ -245,10 +247,10 @@
     "This Device": "Aquest Dispositiu",
     "This can easily give hackers access to read and change any files on your computer.": "Açò pot donar accés fàcilment als hackers per a llegir i canviar qualsevol fitxer al teu ordinador.",
     "This is a major version upgrade.": "Aquesta és una actualització important de la versió.",
-    "This setting controls the free space required on the home (i.e., index database) disk.": "This setting controls the free space required on the home (i.e., index database) disk.",
-    "Time": "Time",
+    "This setting controls the free space required on the home (i.e., index database) disk.": "Aquest ajust controla l'espai lliure requerit en el disc inicial (per exemple, la base de dades de l'index).",
+    "Time": "Temps",
     "Trash Can File Versioning": "Versionat d'arxius de la paperera",
-    "Type": "Type",
+    "Type": "Tipus",
     "Unknown": "Desconegut",
     "Unshared": "No compartit",
     "Unused": "No utilitzat",
@@ -259,20 +261,20 @@
     "Upgrading": "Actualitzant",
     "Upload Rate": "Velocitat d'actualització",
     "Uptime": "Temps de funcionament",
-    "Usage reporting is always enabled for candidate releases.": "Usage reporting is always enabled for candidate releases.",
-    "Use HTTPS for GUI": "Utilitzar HTTP per a l'Interfície Gràfica d'Usuari (GUI)",
+    "Usage reporting is always enabled for candidate releases.": "Els informes d'ús sempre estan activats per a les versions candidates.",
+    "Use HTTPS for GUI": "Utilitzar HTTPS per a l'Interfície Gràfica d'Usuari (GUI)",
     "Version": "Versió",
     "Versions Path": "Ruta de les versions",
     "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Les versions s'esborren automàticament si són més antigues que l'edat màxima o excedixen el nombre de fitxer permesos en un 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 subdirectory of an existing folder \"{%otherFolder%}\".": "Perill! Aquesta ruta és un subdirectori d'una carpeta que ja existeix nomenada \"{{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 parent directory of an existing folder \"{%otherFolder%}\".": "Perill! Esta ruta és un directori pare d'una carpeta ja existent \"{{otherFolder}}\".",
+    "Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Perill! Esta ruta és un directori pare d'una carpeta existent \"{{otherFolderLabel}}\" ({{otherFolder}}).",
+    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Perill! Esta ruta és un subdirectori d'una carpeta que ja existeix nomenada \"{{otherFolder}}\".",
+    "Warning, this path is a subdirectory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Perill! Esta ruta és un subdirectori de una carpeta existent \"{{otherFolderLabel}}\" ({{otherFolder}}).",
     "When adding a new device, keep in mind that this device must be added on the other side too.": "Quant s'afig un nou dispositiu, hi ha que tindre en compte que aquest dispositiu deu ser afegit també en l'altre costat.",
     "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Quant s'afig una nova carpeta, hi ha que tindre en compte que l'ID de la carpeta s'utilitza per a juntar les carpetes entre dispositius. Són sensibles a les majúscules i deuen coincidir exactament entre tots els dispositius.",
     "Yes": "Sí",
-    "You 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.": "Pots canviar la teua elecció en qualsevol moment en el dialog Ajustos",
+    "You can read more about the two release channels at the link below.": "Pots llegir més sobre els dos canals de versions en l'enllaç de baix.",
     "You must keep at least one version.": "Es deu mantindre al menys una versió.",
     "days": "dies",
     "directories": "directoris",

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

@@ -10,7 +10,7 @@
     "Add Device": "Přidat přístroj",
     "Add Folder": "Přidat adresář",
     "Add Remote Device": "Přidat vzdálené zařízení",
-    "Add devices from the introducer to our device list, for mutually shared folders.": "Přidat zařízení ze zavaděče do našeho seznamu zařízení (pro vzájemně sdílené adresáře.)",
+    "Add devices from the introducer to our device list, for mutually shared folders.": "Přidat zařízení ze zavaděče do našeho seznamu zařízení, pro vzájemně sdílené adresáře.",
     "Add new folder?": "Přidat nový adresář?",
     "Address": "Adresa",
     "Addresses": "Adresy",
@@ -93,7 +93,7 @@
     "GUI": "GUI",
     "GUI Authentication Password": "Přihlašovací heslo pro GUI",
     "GUI Authentication User": "Přihlašovací jméno pro GUI",
-    "GUI Listen Address": "GUI Listen Address",
+    "GUI Listen Address": "Adresa naslouchání GUI",
     "GUI Listen Addresses": "Adresa naslouchání GUI",
     "GUI Theme": "Grafické téma",
     "Generate": "Generovat",
@@ -158,6 +158,8 @@
     "Please consult the release notes before performing a major upgrade.": "Před spuštěním důležité aktualizace si nejdříve přečtěte poznámky k vydání nové verze.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Zadejte prosím přihlašovací jméno a heslo pro GUI v dialogu nastavení.",
     "Please wait": "Chvíli strpení",
+    "Prefix indicating that the file can be deleted if preventing directory removal": "Prefix indicating that the file can be deleted if preventing directory removal",
+    "Prefix indicating that the pattern should be matched without case sensitivity": "Prefix indicating that the pattern should be matched without case sensitivity",
     "Preview": "Náhled",
     "Preview Usage Report": "Náhled záznamu o využítí",
     "Quick guide to supported patterns": "Rychlá nápověda k podporovaným vzorům",

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

@@ -158,6 +158,8 @@
     "Please consult the release notes before performing a major upgrade.": "Tjek venligst udgivelsesnoterne før opgradering til en ny version.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Sæt vensligt en GUI bruger og kodeord i opsætningsdialogen.",
     "Please wait": "Vent venligst",
+    "Prefix indicating that the file can be deleted if preventing directory removal": "Prefix indicating that the file can be deleted if preventing directory removal",
+    "Prefix indicating that the pattern should be matched without case sensitivity": "Prefix indicating that the pattern should be matched without case sensitivity",
     "Preview": "Forhåndsvisning",
     "Preview Usage Report": "Forhåndsvisning af forbrugsrapport",
     "Quick guide to supported patterns": "Hurtig guide til supporteret mønstre",

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

@@ -158,6 +158,8 @@
     "Please consult the release notes before performing a major upgrade.": "Bitte lesen Sie die Veröffentlichungsnotizen bevor Sie eine neue Hauptversion installieren.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Bitte setze einen Benutzer und ein Passwort für das GUI in den Einstellungen.",
     "Please wait": "Bitte warten",
+    "Prefix indicating that the file can be deleted if preventing directory removal": "Prefix indicating that the file can be deleted if preventing directory removal",
+    "Prefix indicating that the pattern should be matched without case sensitivity": "Prefix indicating that the pattern should be matched without case sensitivity",
     "Preview": "Vorschau",
     "Preview Usage Report": "Vorschau des Nutzungsberichts",
     "Quick guide to supported patterns": "Schnellanleitung zu den unterstützten Mustern",

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

@@ -10,7 +10,7 @@
     "Add Device": "Προσθήκη συσκευής",
     "Add Folder": "Προσθήκη φακέλου",
     "Add Remote Device": "Προσθήκη Απομακρυσμένης Συσκευής",
-    "Add devices from the introducer to our device list, for mutually shared folders.": "Προσθήκη συσκευών από τον βασικό κόμβο στη λίστα συσκευών μας για όσους κοινούς φακέλους υπάρχουν μεταξύ τους.",
+    "Add devices from the introducer to our device list, for mutually shared folders.": "Προσθήκη συσκευών από το Βασικό κόμβο στη λίστα συσκευών μας, για όσους κοινούς φακέλους υπάρχουν μεταξύ τους.",
     "Add new folder?": "Προσθήκη νέου φακέλου;",
     "Address": "Διεύθυνση",
     "Addresses": "Διευθύνσεις",
@@ -69,7 +69,7 @@
     "Enable NAT traversal": "Ενεργοποίηση διάσχισης NAT",
     "Enable Relaying": "Ενεργοποίηση αναμετάδοσης",
     "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Εισάγετε έναν μη αρνητικό αριθμό (π.χ. «2.35») και επιλέξτε μια μονάδα μέτρησης. Τα ποσοστά ισχύουν ως προς το συνολικό μέγεθος του δίσκου.",
-    "Enter a non-privileged port number (1024 - 65535).": "Enter a non-privileged port number (1024 - 65535).",
+    "Enter a non-privileged port number (1024 - 65535).": "Εισάγετε τον αριθμό μιας μη δεσμευμένης θύρας (1024 - 65535).",
     "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Εισάγετε τις διευθύνσεις χωρισμένες με κόμμα (\"tcp://ip:port\", \"tcp://host:port\") ή γράψτε \"dynamic\" για την αυτόματη ανεύρεση τους.",
     "Enter ignore patterns, one per line.": "Δώσε τα πρότυπα που θα αγνοηθούν, ένα σε κάθε γραμμή.",
     "Error": "Σφάλμα",
@@ -93,7 +93,7 @@
     "GUI": "Γραφικό περιβάλλον",
     "GUI Authentication Password": "Κωδικός για την πρόσβαση στη διεπαφή",
     "GUI Authentication User": "Χρηστώνυμο για την πρόσβαση στη διεπαφή",
-    "GUI Listen Address": "GUI Listen Address",
+    "GUI Listen Address": "Διεύθυνση ακρόασης γραφικού περιβάλλοντος (GUI)",
     "GUI Listen Addresses": "Διευθύνσεις από τις οποίες θα είναι προσβάσιμη η διεπαφή",
     "GUI Theme": "Θέμα GUI",
     "Generate": "Δημιουργία",
@@ -158,6 +158,8 @@
     "Please consult the release notes before performing a major upgrade.": "Παρακαλούμε, πριν από την εκτέλεση μιας σημαντικής αναβάθμισης, να συμβουλευτείς το σημείωμα που τη συνοδεύει.  ",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Παρακαλώ όρισε στις ρυθμίσεις έναν χρήστη και έναν κωδικό πρόσβασης για τη διεπαφή.",
     "Please wait": "Παρακαλώ περιμένετε",
+    "Prefix indicating that the file can be deleted if preventing directory removal": "Πρόθεμα που δείχνει ότι το αρχείο θα μπορεί να διαγραφεί αν εμποδίζει τη διαγραφή καταλόγου",
+    "Prefix indicating that the pattern should be matched without case sensitivity": "Πρόθεμα που δείχνει ότι αντιστοίχιση του προτύπου θα γίνεται χωρίς διάκριση πεζών και κεφαλαίων χαρακτήρων",
     "Preview": "Προεπισκόπηση",
     "Preview Usage Report": "Προεπισκόπηση αναφοράς χρήσης",
     "Quick guide to supported patterns": "Σύντομη βοήθεια σχετικά με τα πρότυπα αναζήτησης που υποστηρίζονται",

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

@@ -158,6 +158,8 @@
     "Please consult the release notes before performing a major upgrade.": "Please consult the release notes before performing a major upgrade.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Please set a GUI Authentication User and Password in the Settings dialogue.",
     "Please wait": "Please wait",
+    "Prefix indicating that the file can be deleted if preventing directory removal": "Prefix indicating that the file can be deleted if preventing directory removal",
+    "Prefix indicating that the pattern should be matched without case sensitivity": "Prefix indicating that the pattern should be matched without case sensitivity",
     "Preview": "Preview",
     "Preview Usage Report": "Preview Usage Report",
     "Quick guide to supported patterns": "Quick guide to supported patterns",

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

@@ -158,6 +158,8 @@
    "Please consult the release notes before performing a major upgrade.": "Please consult the release notes before performing a major upgrade.",
    "Please set a GUI Authentication User and Password in the Settings dialog.": "Please set a GUI Authentication User and Password in the Settings dialog.",
    "Please wait": "Please wait",
+   "Prefix indicating that the file can be deleted if preventing directory removal": "Prefix indicating that the file can be deleted if preventing directory removal",
+   "Prefix indicating that the pattern should be matched without case sensitivity": "Prefix indicating that the pattern should be matched without case sensitivity",
    "Preview": "Preview",
    "Preview Usage Report": "Preview Usage Report",
    "Quick guide to supported patterns": "Quick guide to supported patterns",

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

@@ -158,6 +158,8 @@
     "Please consult the release notes before performing a major upgrade.": "Bonvolu konsulti la eldonitajn notojn antaŭ elfari ĉefan ĝisdatigon.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Bonvolu agordi GUI Authentication Uzanto kaj Pasvorto en la agordoj dialogo.",
     "Please wait": "Bonvolu atendi",
+    "Prefix indicating that the file can be deleted if preventing directory removal": "Prefix indicating that the file can be deleted if preventing directory removal",
+    "Prefix indicating that the pattern should be matched without case sensitivity": "Prefix indicating that the pattern should be matched without case sensitivity",
     "Preview": "Antaŭrigardo",
     "Preview Usage Report": "Antaŭrigardo Uzada Raporto",
     "Quick guide to supported patterns": "Rapida gvidisto al subtenata ŝablonoj",

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

@@ -10,7 +10,7 @@
     "Add Device": "Agregar el dispositivo",
     "Add Folder": "Agregar Carpeta",
     "Add Remote Device": "Añadir un dispositivo",
-    "Add devices from the introducer to our device list, for mutually shared folders.": "Add devices from the introducer to our device list, for mutually shared folders.",
+    "Add devices from the introducer to our device list, for mutually shared folders.": "Añadir dispositivos desde el introductor a nuestra lista de dispositivos, para las carpetas compartidas mutuamente.",
     "Add new folder?": "¿Agregar una carpeta nueva?",
     "Address": "Dirección",
     "Addresses": "Direcciones",
@@ -19,9 +19,9 @@
     "Advanced settings": "Ajustes avanzados",
     "All Data": "Todos los datos",
     "Allow Anonymous Usage Reporting?": "¿Deseas permitir el envío anónimo de informes de uso?",
-    "Allowed Networks": "Allowed Networks",
+    "Allowed Networks": "Redes permitidas",
     "Alphabetic": "Alfabético",
-    "An external command handles the versioning. It has to remove the file from the shared folder.": "An external command handles the versioning. It has to remove the file from the shared folder.",
+    "An external command handles the versioning. It has to remove the file from the shared folder.": "Un comando externo gestiona las versiones. Tiene que eliminar el fichero de la carpeta compartida.",
     "An external command handles the versioning. It has to remove the file from the synced folder.": "Un comando externo controla la versión. El fichero debe ser eliminado de la carpeta sincronizada.",
     "Anonymous Usage Reporting": "Informe anónimo de uso",
     "Any devices configured on an introducer device will be added to this device as well.": "Cualquier dispositivo configurado en un dispositivo de introducción será añadido también.",
@@ -32,7 +32,7 @@
     "CPU Utilization": "Uso de CPU",
     "Changelog": "Registro de cambios",
     "Clean out after": "Limpiar tras",
-    "Click to see discovery failures": "Click to see discovery failures",
+    "Click to see discovery failures": "Clica para ver fallos de descubrimiento.",
     "Close": "Cerrar",
     "Command": "Acción",
     "Comment, when used at the start of a line": "Comentar, cuando se usa al comienzo de una línea",
@@ -44,7 +44,7 @@
     "Copied from original": "Copiado del original",
     "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 los siguientes Colaboradores:",
     "Copyright © 2014-2017 the following Contributors:": "Copyright © 2014-2017 Los siguientes colaboradores:",
-    "Creating ignore patterns, overwriting an existing file at {%path%}.": "Creating ignore patterns, overwriting an existing file at {{path}}.",
+    "Creating ignore patterns, overwriting an existing file at {%path%}.": "Crear patrones a ignorar, sobreescribiendo un fichero existente en {{path}}.",
     "Danger!": "¡Peligro!",
     "Deleted": "Eliminado",
     "Device": "Dispositivo",
@@ -56,7 +56,7 @@
     "Disconnected": "Desconectado",
     "Discovered": "Descubierto",
     "Discovery": "Descubrimiento",
-    "Discovery Failures": "Discovery Failures",
+    "Discovery Failures": "Fallos de Descubrimiento",
     "Documentation": "Documentación",
     "Download Rate": "Velocidad de descarga",
     "Downloaded": "Descargado",
@@ -65,23 +65,23 @@
     "Edit Device": "Editar Dispositivo",
     "Edit Folder": "Editar Carpeta",
     "Editing": "Editando",
-    "Editing {%path%}.": "Editing {{path}}.",
+    "Editing {%path%}.": "Editando {{path}}.",
     "Enable NAT traversal": "Permitir NAT transversal",
     "Enable Relaying": "Habilitar Retransmisión",
-    "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.",
-    "Enter a non-privileged port number (1024 - 65535).": "Enter a non-privileged port number (1024 - 65535).",
+    "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Introduce un número no negativo (por ejemplo, \"2.35\") y selecciona una unidad. Los porcentajes son como parte del tamaño total del disco.",
+    "Enter a non-privileged port number (1024 - 65535).": "Introduce un puerto sin privilegios (1024 - 65535).",
     "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Introduzca las direcciones, separadas por comas (\"tcp://ip:port\", \"tcp://host:port\"), o \"dynamic\" para llevar a cabo el descubrimiento automático de la dirección.",
     "Enter ignore patterns, one per line.": "Introducir patrones a ignorar, uno por línea.",
     "Error": "Error",
     "External File Versioning": "Versionado externo de fichero",
     "Failed Items": "Elementos fallidos",
-    "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.",
+    "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Se espera un fallo al conectar a los servidores IPv6 si no hay conectividad IPv6.",
     "File Pull Order": "Orden de obtención de los ficheros",
     "File Versioning": "Versionado de ficheros",
     "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Los bits de permiso de ficheros son ignorados cuando se buscan cambios. Utilizar en sistemas de ficheros FAT.",
-    "Files are moved to .stversions directory when replaced or deleted by Syncthing.": "Files are moved to .stversions directory when replaced or deleted by Syncthing.",
+    "Files are moved to .stversions directory when replaced or deleted by Syncthing.": "Los ficheros son movidos a la carpeta .stversions cuando son reemplazados o borrados por Syncthing.",
     "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Los archivos serán movidos a la carpeta .stversions cuando sean reemplazados o borrados por Syncthing.",
-    "Files are moved to date stamped versions in a .stversions directory when replaced or deleted by Syncthing.": "Files are moved to date stamped versions in a .stversions directory when replaced or deleted by Syncthing.",
+    "Files are moved to date stamped versions in a .stversions directory when replaced or deleted by Syncthing.": "Los ficheros son movidos a una carpeta .stversions a versiones con control de fecha cuando son reemplazados o borrados por Syncthing.",
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Los ficheros son cambiados a versiones con indicación de fecha en una carpeta \".stversions\" cuando son reemplazados o borrados por Syncthing.",
     "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Los ficheros son protegidos por los cambios hechos en otros dispositivos, pero los cambios hechos en este dispositivo serán enviados al resto del grupo (cluster).",
     "Folder": "Carpeta",
@@ -93,7 +93,7 @@
     "GUI": "GUI",
     "GUI Authentication Password": "Password de la Interfaz Gráfica de Usuario (GUI)",
     "GUI Authentication User": "Autentificación de usuario de la Interfaz Gráfica de Usuario (GUI)",
-    "GUI Listen Address": "GUI Listen Address",
+    "GUI Listen Address": "Dirección de Escucha del GUI.",
     "GUI Listen Addresses": "Direcciones de escucha de la Interfaz Gráfica de Usuario (GUI)",
     "GUI Theme": "Tema GUI",
     "Generate": "Generar",
@@ -150,7 +150,7 @@
     "Override Changes": "Anular cambios",
     "Path": "Parche",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Ruta a la carpeta en la máquina local. Se creará si no existe. El carácter de la tilde (~) puede usarse como atajo.",
-    "Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).": "Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).",
+    "Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).": "La ruta donde las versiones deben ser almacenadas (dejar vacío para el directorio .stversions por defecto en la carpeta compartida).",
     "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Ruta donde se almacenarán las versiones (dejar vacío para usar la carpeta por defecto \".stversions\").",
     "Pause": "Pausar",
     "Pause All": "Pausar todo",
@@ -158,6 +158,8 @@
     "Please consult the release notes before performing a major upgrade.": "Por favor, consultar las notas de la versión antes de realizar una actualización importante.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Por favor, introduzca un Usuario y Contraseña para la Autenticación de la Interfaz de Usuario en el panel de Ajustes.",
     "Please wait": "Por favor, espere",
+    "Prefix indicating that the file can be deleted if preventing directory removal": "Prefix indicating that the file can be deleted if preventing directory removal",
+    "Prefix indicating that the pattern should be matched without case sensitivity": "Prefix indicating that the pattern should be matched without case sensitivity",
     "Preview": "Vista previa",
     "Preview Usage Report": "Informe de uso de vista previa",
     "Quick guide to supported patterns": "Guía rápida de patrones soportados",
@@ -245,7 +247,7 @@
     "This Device": "Este Dispositivo",
     "This can easily give hackers access to read and change any files on your computer.": "Esto podría permitir fácilmente el acceso a hackers para leer y modificar cualquier fichero de tu equipo.",
     "This is a major version upgrade.": "Hay una actualización importante.",
-    "This setting controls the free space required on the home (i.e., index database) disk.": "This setting controls the free space required on the home (i.e., index database) disk.",
+    "This setting controls the free space required on the home (i.e., index database) disk.": "Este ajuste controla el espacio libre necesario en el disco principal (por ejemplo, el índice de la base de datos).",
     "Time": "Hora",
     "Trash Can File Versioning": "Versionado de archivos de la papelera",
     "Type": "Tipo",

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

@@ -1,284 +1,286 @@
 {
-    "A device with that ID is already added.": "Ya se ha agregado un dispositivo con esa ID.",
+    "A device with that ID is already added.": "Ya se ha agregado un equipo con ese ID.",
     "A negative number of days doesn't make sense.": "Un número negativo de días no tiene sentido.",
-    "A new major version may not be compatible with previous versions.": "Una versión más reciente puede no ser compatible con las versiones anteriores.",
-    "API Key": "Clave API",
+    "A new major version may not be compatible with previous versions.": "Una nueva versión con cambios importantes puede no ser compatible con versiones anteriores.",
+    "API Key": "Clave del API",
     "About": "Acerca de",
-    "Action": "Acción ",
+    "Action": "Acción",
     "Actions": "Acciones",
     "Add": "Agregar",
-    "Add Device": "Agregar Dispositivo",
-    "Add Folder": "Agregar Repositorio",
-    "Add Remote Device": "Agregar Dispositivo Remoto",
-    "Add devices from the introducer to our device list, for mutually shared folders.": "Add devices from the introducer to our device list, for mutually shared folders.",
-    "Add new folder?": "¿Agregar nueva carpeta?",
+    "Add Device": "Agregar el dispositivo",
+    "Add Folder": "Agregar Carpeta",
+    "Add Remote Device": "Añadir un dispositivo",
+    "Add devices from the introducer to our device list, for mutually shared folders.": "Añadir dispositivos desde el introductor a nuestra lista de dispositivos, para las carpetas compartidas mutuamente.",
+    "Add new folder?": "¿Agregar una carpeta nueva?",
     "Address": "Dirección",
     "Addresses": "Direcciones",
-    "Advanced": "Avanzada",
-    "Advanced Configuration": "Configuración avanzada",
-    "Advanced settings": "Optiones avanzadas",
+    "Advanced": "Avanzado",
+    "Advanced Configuration": "Configuración Avanzada",
+    "Advanced settings": "Ajustes avanzados",
     "All Data": "Todos los datos",
-    "Allow Anonymous Usage Reporting?": "Permitir reporte anónimo de uso?",
-    "Allowed Networks": "Allowed Networks",
+    "Allow Anonymous Usage Reporting?": "¿Deseas permitir el envío anónimo de informes de uso?",
+    "Allowed Networks": "Redes permitidas",
     "Alphabetic": "Alfabético",
-    "An external command handles the versioning. It has to remove the file from the shared folder.": "An external command handles the versioning. It has to remove the file from the shared folder.",
-    "An external command handles the versioning. It has to remove the file from the synced folder.": "Un comando exterior maneja el control de versiones. Éste tiene que eliminar el archivo de la carpeta sincronizada.",
-    "Anonymous Usage Reporting": "Reporte anónimo de uso",
-    "Any devices configured on an introducer device will be added to this device as well.": "Cualquier dispositivo configurado en un dispositivo introductor será también agregado a tu propio dispositivo.",
-    "Automatic upgrade now offers the choice between stable releases and release candidates.": "La actualización automática ofrece la opción entre versiones estables y versiones preliminares.",
+    "An external command handles the versioning. It has to remove the file from the shared folder.": "Un comando externo gestiona las versiones. Tiene que eliminar el fichero de la carpeta compartida.",
+    "An external command handles the versioning. It has to remove the file from the synced folder.": "Un comando externo controla la versión. El fichero debe ser eliminado de la carpeta sincronizada.",
+    "Anonymous Usage Reporting": "Informe anónimo de uso",
+    "Any devices configured on an introducer device will be added to this device as well.": "Cualquier dispositivo configurado en un dispositivo de introducción será añadido también.",
+    "Automatic upgrade now offers the choice between stable releases and release candidates.": "Ahora la actualización automática permite elegir entre versiones estables o versiones candidatas.",
     "Automatic upgrades": "Actualizaciones automáticas",
-    "Be careful!": "¡Sé cuidadoso!",
+    "Be careful!": "¡Ten cuidado!",
     "Bugs": "Errores",
     "CPU Utilization": "Uso de CPU",
     "Changelog": "Registro de cambios",
-    "Clean out after": "Limpiar después",
-    "Click to see discovery failures": "Click to see discovery failures",
+    "Clean out after": "Limpiar tras",
+    "Click to see discovery failures": "Clica para ver fallos de descubrimiento.",
     "Close": "Cerrar",
-    "Command": "Comando",
-    "Comment, when used at the start of a line": "Comentario, cuando es utilizado al inicio de una línea.",
+    "Command": "Acción",
+    "Comment, when used at the start of a line": "Comentar, cuando se usa al comienzo de una línea",
     "Compression": "Compresión",
     "Configured": "Configurado",
     "Connection Error": "Error de conexión",
     "Connection Type": "Tipo de conexión",
-    "Copied from elsewhere": "Copiado desde otra parte.",
+    "Copied from elsewhere": "Copiado de otro sitio",
     "Copied from original": "Copiado del original",
-    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 los siguientes contribuidores:",
-    "Copyright © 2014-2017 the following Contributors:": "Copyright © 2014-2017 los siguientes contribuidores:",
-    "Creating ignore patterns, overwriting an existing file at {%path%}.": "Creating ignore patterns, overwriting an existing file at {{path}}.",
-    "Danger!": "Peligro!",
-    "Deleted": "Suprimido",
+    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 los siguientes Colaboradores:",
+    "Copyright © 2014-2017 the following Contributors:": "Copyright © 2014-2017 Los siguientes colaboradores:",
+    "Creating ignore patterns, overwriting an existing file at {%path%}.": "Crear patrones a ignorar, sobreescribiendo un fichero existente en {{path}}.",
+    "Danger!": "¡Peligro!",
+    "Deleted": "Eliminado",
     "Device": "Dispositivo",
-    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Dispositivo \"{{name}}\" ({{device}} en {{address}}) quiere conectar. ¿Añadir nuevo dispositivo?",
-    "Device ID": "ID del dispositivo",
-    "Device Identification": "Identificación del dispositivo",
-    "Device Name": "Nombre del dispositivo",
+    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "El dispositivo \"{{name}}\" ({{device}} en la dirección {{address}}) quiere conectarse. Añadir nuevo dispositivo?",
+    "Device ID": "ID del Dispositivo",
+    "Device Identification": "Identificación del Dispositivo",
+    "Device Name": "Nombre del Dispositivo",
     "Devices": "Dispositivos",
     "Disconnected": "Desconectado",
     "Discovered": "Descubierto",
-    "Discovery": "Búsqueda",
-    "Discovery Failures": "Discovery Failures",
+    "Discovery": "Descubrimiento",
+    "Discovery Failures": "Fallos de Descubrimiento",
     "Documentation": "Documentación",
-    "Download Rate": "Tasa de descarga",
+    "Download Rate": "Velocidad de descarga",
     "Downloaded": "Descargado",
     "Downloading": "Descargando",
     "Edit": "Editar",
-    "Edit Device": "Cambiando dispositivo",
-    "Edit Folder": "Cambiando repositorio",
+    "Edit Device": "Editar Dispositivo",
+    "Edit Folder": "Editar Carpeta",
     "Editing": "Editando",
-    "Editing {%path%}.": "Editing {{path}}.",
-    "Enable NAT traversal": "Habilitar NAT trasversal",
+    "Editing {%path%}.": "Editando {{path}}.",
+    "Enable NAT traversal": "Permitir NAT transversal",
     "Enable Relaying": "Habilitar Retransmisión",
-    "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.",
-    "Enter a non-privileged port number (1024 - 65535).": "Enter a non-privileged port number (1024 - 65535).",
-    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Introduce las direcciones (\"tcp://ip:puerto\", \"tcp://huésped:puerto\") separadas por comas, o \"dynamic\" para ejecutar un descubrimiento automático de la dirección. ",
-    "Enter ignore patterns, one per line.": "Añadir patrones de exclusión, uno por línea.",
+    "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Introduce un número no negativo (por ejemplo, \"2.35\") y selecciona una unidad. Los porcentajes son como parte del tamaño total del disco.",
+    "Enter a non-privileged port number (1024 - 65535).": "Introduce un puerto sin privilegios (1024 - 65535).",
+    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Introduzca las direcciones, separadas por comas (\"tcp://ip:port\", \"tcp://host:port\"), o \"dynamic\" para llevar a cabo el descubrimiento automático de la dirección.",
+    "Enter ignore patterns, one per line.": "Introducir patrones a ignorar, uno por línea.",
     "Error": "Error",
-    "External File Versioning": "Control de versiones externo",
-    "Failed Items": "Artículos fallidos",
-    "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.",
-    "File Pull Order": "Orden para coger ficheros",
-    "File Versioning": "Control de versiones",
-    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Los permisos de archivo son ignorados al buscar cambios. Usar el sistemas de archivos FAT.",
-    "Files are moved to .stversions directory when replaced or deleted by Syncthing.": "Files are moved to .stversions directory when replaced or deleted by Syncthing.",
-    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Los archivos son movidos al directorio .stversions cuando son reemplazados o eliminados por Syncthing. Sus caminos de accesos relativos son recreados aquí si necesidad. ",
-    "Files are moved to date stamped versions in a .stversions directory when replaced or deleted by Syncthing.": "Files are moved to date stamped versions in a .stversions directory when replaced or deleted by Syncthing.",
-    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Lo archivos son movidos al directorio .stversions y renombrados a versiones marcadas por fecha cuando son reemplazados o eliminados por Syncthing, Sus caminos de accesos relativos son recreados aquí si necesidad.",
-    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Los archivos están protegidos frente a los cambios realizados en otros dispositivos, peros los cambios realizados en este dispositivo serán envíados al resto del grupo",
-    "Folder": "Repositorio",
-    "Folder ID": "ID del repositorio",
-    "Folder Label": "Etiqueta de Carpeta",
-    "Folder Path": "Ruta del repositorio",
-    "Folder Type": "Tipo de Carpeta",
-    "Folders": "Repositorios",
+    "External File Versioning": "Versionado externo de fichero",
+    "Failed Items": "Elementos fallidos",
+    "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Se espera un fallo al conectar a los servidores IPv6 si no hay conectividad IPv6.",
+    "File Pull Order": "Orden de obtención de los ficheros",
+    "File Versioning": "Versionado de ficheros",
+    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Los bits de permiso de ficheros son ignorados cuando se buscan cambios. Utilizar en sistemas de ficheros FAT.",
+    "Files are moved to .stversions directory when replaced or deleted by Syncthing.": "Los ficheros son movidos a la carpeta .stversions cuando son reemplazados o borrados por Syncthing.",
+    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Los archivos serán movidos a la carpeta .stversions cuando sean reemplazados o borrados por Syncthing.",
+    "Files are moved to date stamped versions in a .stversions directory when replaced or deleted by Syncthing.": "Los ficheros son movidos a una carpeta .stversions a versiones con control de fecha cuando son reemplazados o borrados por Syncthing.",
+    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Los ficheros son cambiados a versiones con indicación de fecha en una carpeta \".stversions\" cuando son reemplazados o borrados por Syncthing.",
+    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Los ficheros son protegidos por los cambios hechos en otros dispositivos, pero los cambios hechos en este dispositivo serán enviados al resto del grupo (cluster).",
+    "Folder": "Carpeta",
+    "Folder ID": "ID de carpeta",
+    "Folder Label": "Etiqueta de la Carpeta",
+    "Folder Path": "Ruta de la carpeta",
+    "Folder Type": "Tipo de carpeta",
+    "Folders": "Carpetas",
     "GUI": "GUI",
-    "GUI Authentication Password": "Contraseña de autenticación de la GUI",
-    "GUI Authentication User": "Usuario de la GUI",
-    "GUI Listen Address": "GUI Listen Address",
-    "GUI Listen Addresses": "Direcciones de escucha para la GUI.",
-    "GUI Theme": "Apariencia de la GUI",
+    "GUI Authentication Password": "Password de la Interfaz Gráfica de Usuario (GUI)",
+    "GUI Authentication User": "Autentificación de usuario de la Interfaz Gráfica de Usuario (GUI)",
+    "GUI Listen Address": "Dirección de Escucha del GUI.",
+    "GUI Listen Addresses": "Direcciones de escucha de la Interfaz Gráfica de Usuario (GUI)",
+    "GUI Theme": "Tema GUI",
     "Generate": "Generar",
-    "Global Changes": "Últimas modificaciones",
-    "Global Discovery": "Búsqueda en internet",
-    "Global Discovery Servers": "Servidores globales de identificación",
+    "Global Changes": "Cambios globales",
+    "Global Discovery": "Descubrimiento global",
+    "Global Discovery Servers": "Servidores Globales de Descubrimiento",
     "Global State": "Estado global",
     "Help": "Ayuda",
-    "Home page": "Pagina de inicio",
+    "Home page": "Página de inicio",
     "Ignore": "Ignorar",
-    "Ignore Patterns": "Patrones de exclusión",
-    "Ignore Permissions": "Ignorar permisos",
-    "Incoming Rate Limit (KiB/s)": "Límite de velocidad de entrada (KiB/s)",
-    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Configuración incorrecta puede dañar los contenidos de la carpeta y hacer Syncthing inoperable.",
+    "Ignore Patterns": "Patrones a ignorar",
+    "Ignore Permissions": "Permisos a ignorar",
+    "Incoming Rate Limit (KiB/s)": "Límite de descarga (KiB/s)",
+    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Una configuración incorrecta puede dañar los contenidos de la carpeta y hacer  que Syncthing no funcione.",
     "Introduced By": "Introducido por",
-    "Introducer": "Dispositivo introductor",
-    "Inversion of the given condition (i.e. do not exclude)": "Inversión de la condición dada (es decir, no excluir)",
-    "Keep Versions": "Conservar versiones",
+    "Introducer": "Presentador",
+    "Inversion of the given condition (i.e. do not exclude)": "Inversión de la condición dada (por ejemplo, \"no excluir\")",
+    "Keep Versions": "Mantener versiones",
     "Largest First": "Más grande primero",
     "Last File Received": "Última actualización",
     "Last Scan": "Último escaneo",
-    "Last seen": "Visto por ultima vez",
+    "Last seen": "Visto por última vez",
     "Later": "Más tarde",
-    "Latest Change": "Último cambio",
+    "Latest Change": "Último Cambio",
     "Learn more": "Saber más",
-    "Listeners": "Receptor",
-    "Local Discovery": "Búsqueda en red local",
+    "Listeners": "Oyentes",
+    "Local Discovery": "Descubrimiento local",
     "Local State": "Estado local",
-    "Local State (Total)": "Estado local (total)",
-    "Major Upgrade": "Actualización mayor",
+    "Local State (Total)": "Estado Local (Total)",
+    "Major Upgrade": "Actualización importante",
     "Master": "Maestro",
     "Maximum Age": "Edad máxima",
     "Metadata Only": "Sólo metadatos",
     "Minimum Free Disk Space": "Espacio mínimo libre en disco",
-    "Move to top of queue": "Mover al principio de la cola.",
-    "Multi level wildcard (matches multiple directory levels)": "Carácter comodín multinivel (coincide en el directorio y  sus subdirectorios)",
+    "Move to top of queue": "Mover al principio de la cola",
+    "Multi level wildcard (matches multiple directory levels)": "Comodín multinivel (coincide con múltiples niveles de directorio)",
     "Never": "Nunca",
-    "New Device": "Nuevo dispositivo",
-    "New Folder": "Nuevo repositorio",
-    "Newest First": "Nuevo primero",
+    "New Device": "Nuevo Dispositivo",
+    "New Folder": "Nueva Carpeta",
+    "Newest First": "El más nuevo primero",
     "No": "No",
-    "No File Versioning": "Sin control de versiones de archivos",
-    "No upgrades": "No actualizaciones",
+    "No File Versioning": "Sin versionado de fichero",
+    "No upgrades": "Sin actualizaciones",
     "Normal": "Normal",
     "Notice": "Aviso",
     "OK": "OK",
-    "Off": "Apagado",
-    "Oldest First": "Antiguo primero",
+    "Off": "Desconectar",
+    "Oldest First": "El más antiguo primero",
     "Optional descriptive label for the folder. Can be different on each device.": "Etiqueta descriptiva opcional para la carpeta. Puede ser diferente en cada dispositivo.",
     "Options": "Opciones",
-    "Out of Sync": "Fuera de sincronización",
-    "Out of Sync Items": "Ítems no sincronizados",
-    "Outgoing Rate Limit (KiB/s)": "Tasa máxima de envío (KiB/s)",
-    "Override Changes": "Reemplazar los cambios",
-    "Path": "Ruta",
-    "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Ruta del repositorio en el equipo local. Será creado si no existe. El carácter tilde (~) puede ser utilizado como atajo de ",
-    "Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).": "Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).",
-    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Ruta donde serán guardas las versiones (dejar vacío para usar el directorio predifinido \".stversions\" en el repositorio)",
-    "Pause": "Pausa",
-    "Pause All": "Todos en pausa",
-    "Paused": "En pausa",
-    "Please consult the release notes before performing a major upgrade.": "Por favor consulta las notas de lanzamiento antes de realizar una actualizacón mayor.",
-    "Please set a GUI Authentication User and Password in the Settings dialog.": "Por favor, establece un Usuario y Contraseña de Autenticación en la GUI en el diálogo de Configuración",
-    "Please wait": "Aguarde por favor",
+    "Out of Sync": "No sincronizado",
+    "Out of Sync Items": "Elementos no sincronizados",
+    "Outgoing Rate Limit (KiB/s)": "Límite de subida (KiB/s)",
+    "Override Changes": "Anular cambios",
+    "Path": "Parche",
+    "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Ruta a la carpeta en la máquina local. Se creará si no existe. El carácter de la tilde (~) puede usarse como atajo.",
+    "Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).": "La ruta donde las versiones deben ser almacenadas (dejar vacío para el directorio .stversions por defecto en la carpeta compartida).",
+    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Ruta donde se almacenarán las versiones (dejar vacío para usar la carpeta por defecto \".stversions\").",
+    "Pause": "Pausar",
+    "Pause All": "Pausar todo",
+    "Paused": "Pausado",
+    "Please consult the release notes before performing a major upgrade.": "Por favor, consultar las notas de la versión antes de realizar una actualización importante.",
+    "Please set a GUI Authentication User and Password in the Settings dialog.": "Por favor, introduzca un Usuario y Contraseña para la Autenticación de la Interfaz de Usuario en el panel de Ajustes.",
+    "Please wait": "Por favor, espere",
+    "Prefix indicating that the file can be deleted if preventing directory removal": "Prefix indicating that the file can be deleted if preventing directory removal",
+    "Prefix indicating that the pattern should be matched without case sensitivity": "Prefix indicating that the pattern should be matched without case sensitivity",
     "Preview": "Vista previa",
-    "Preview Usage Report": "Ver reporte de uso",
-    "Quick guide to supported patterns": "Guía rápida sobre los patrones soportados",
-    "RAM Utilization": "Utilización de RAM",
+    "Preview Usage Report": "Informe de uso de vista previa",
+    "Quick guide to supported patterns": "Guía rápida de patrones soportados",
+    "RAM Utilization": "Uso de RAM",
     "Random": "Aleatorio",
-    "Reduced by ignore patterns": "(Restringido por patrones de exclusión)",
-    "Release Notes": "Notas de lanzamiento",
-    "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Las versiones preliminares contienen las últimas funcionalidades y los últimos correctivos. Son idénticas a las actualizaciones bimensuales tradicionales.",
+    "Reduced by ignore patterns": "Reducido por patrones de ignorar",
+    "Release Notes": "Notas de la versión",
+    "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Las versiones candidatas contienen las últimas funcionalidades y correcciones. Son similares a las tradicionales versiones bisemanales de Syncthing.",
     "Remote Devices": "Otros dispositivos",
     "Remove": "Eliminar",
-    "Required identifier for the folder. Must be the same on all cluster devices.": "Identificación requerida para la carpeta. Debe ser la misma en todos los dispositivos del grupo.",
-    "Rescan": "Reescanear",
-    "Rescan All": "Reescanear todo",
-    "Rescan Interval": "Intervalo de reescaneo",
+    "Required identifier for the folder. Must be the same on all cluster devices.": "Identificador requerido para la carpeta. Debe ser el mismo en todos los dispositivos del clúster.",
+    "Rescan": "Volver a analizar",
+    "Rescan All": "Volver a analizar Todo",
+    "Rescan Interval": "Intervalo de análisis",
     "Restart": "Reiniciar",
-    "Restart Needed": "Es necesario reiniciar",
+    "Restart Needed": "Reinicio necesario",
     "Restarting": "Reiniciando",
-    "Resume": "Reanudar",
-    "Resume All": "Reanudar todos",
+    "Resume": "Continuar",
+    "Resume All": "Continuar todo",
     "Reused": "Reutilizado",
     "Save": "Guardar",
-    "Scan Time Remaining": "Tiempo de Escaneo Restante",
-    "Scanning": "Actualización",
-    "Select the devices to share this folder with.": "Seleccione los dispositivos con los cuales compartir este repositorio.",
-    "Select the folders to share with this device.": "Seleccione los repositorios para compartir con este dispositivo.",
-    "Send & Receive": "Envío y recepción",
-    "Send Only": "Envío (lectura sola)",
-    "Settings": "Configuración",
+    "Scan Time Remaining": "Tiempo Restante de Escaneo",
+    "Scanning": "Analizando",
+    "Select the devices to share this folder with.": "Selecciona los dispositivos con los que compartir esta carpeta.",
+    "Select the folders to share with this device.": "Selecciona las carpetas para compartir con este dispositivo.",
+    "Send & Receive": "Enviar y Recibir",
+    "Send Only": "Solo Enviar",
+    "Settings": "Ajustes",
     "Share": "Compartir",
-    "Share Folder": "Compartir repositorio",
-    "Share Folders With Device": "Compartir repositorios con dispositivo",
-    "Share With Devices": "Compartir con los dispositivos",
-    "Share this folder?": "¿Compartir este repositorio?",
-    "Shared With": "Compartido con",
+    "Share Folder": "Compartir carpeta",
+    "Share Folders With Device": "Compartir carpetas con dispositivo",
+    "Share With Devices": "Compartir con dispositivos",
+    "Share this folder?": "¿Deseas compartir esta carpeta?",
+    "Shared With": "Compartir con",
     "Show ID": "Mostrar ID",
     "Show QR": "Mostrar QR",
-    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Mostrado en lugar de la ID del dispositivo en el estado del grupo. Será sugerido a otros dispositivos como nombre fácil de usar predeterminado opcional.",
-    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Mostrado en lugar de la ID del dispositivo en el estado del grupo. Si se deja en blanco, será llenado por el nombre fácil de usar sugerido por el dispositivo.",
+    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Se muestra en lugar del ID del dispositivo en el estado del grupo (cluster). Se notificará a los otros dispositivos como nombre opcional por defecto.",
+    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Se muestra en lugar del ID del dispositivo en el estado del grupo (cluster). Se actualizará al nombre que el dispositivo anuncia si se deja vacío.",
     "Shutdown": "Apagar",
-    "Shutdown Complete": "Apagado completado",
-    "Simple File Versioning": "Versiones simple de archivos",
-    "Single level wildcard (matches within a directory only)": "Carácter comodín de un solo nivel (coincide sólo dentro de un directorio)",
-    "Smallest First": "Más pequeño primero",
+    "Shutdown Complete": "Apagar completamente",
+    "Simple File Versioning": "Versionado simple de fichero",
+    "Single level wildcard (matches within a directory only)": "Comodín de nivel único (coincide solamente dentro de un directorio)",
+    "Smallest First": "El más pequeño primero",
     "Source Code": "Código fuente",
-    "Stable releases and release candidates": "Versiones stables y preliminares",
-    "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "Las versiones estables son trasladadas de cerca de dos semanas. Durante este tiempo son sometidas a un test como versiones preliminares.",
-    "Stable releases only": "Versiones estables solamente",
-    "Staggered File Versioning": "Versiones del archivo escalonado",
-    "Start Browser": "Iniciar navegador",
+    "Stable releases and release candidates": "Versiones estables y versiones candidatas",
+    "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "Las versiones estables son publicadas cada dos semanas. Durante este tiempo son probadas como versiones candidatas.",
+    "Stable releases only": "Solo versiones estables",
+    "Staggered File Versioning": "Versionado escalonado de fichero",
+    "Start Browser": "Iniciar el navegador",
     "Statistics": "Estadísticas",
-    "Stopped": "Parado",
+    "Stopped": "Detenido",
     "Support": "Forum",
-    "Sync Protocol Listen Addresses": "Dirección de escucha del protocolo de sincronización",
-    "Syncing": "Sincronización",
-    "Syncthing has been shut down.": "La sincronización esta apagada",
-    "Syncthing includes the following software or portions thereof:": "Syncthing incluye los siguientes softwares o partes de ellos:",
-    "Syncthing is restarting.": "Syncthing está reiniciando.",
+    "Sync Protocol Listen Addresses": "Direcciones de escucha del protocolo de sincronización",
+    "Syncing": "Sincronizando",
+    "Syncthing has been shut down.": "Syncthing se ha detenido.",
+    "Syncthing includes the following software or portions thereof:": "Syncthing incluye el siguiente software o partes de él:",
+    "Syncthing is restarting.": "Syncthing se está reiniciando.",
     "Syncthing is upgrading.": "Syncthing se está actualizando.",
-    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing parece estar apagado, o hay un problema con su conexión de Internet. Reintentando...",
-    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing parece estar experimentando un problema al procesar su solicitud. Por favor, recargue el navegador o reinicie Syncthing si el problema persiste.",
-    "The Syncthing admin interface is configured to allow remote access without a password.": "La interfaz administrativa del Syncthing está configurada para permitir acceso remoto sin una contraseña.",
-    "The aggregated statistics are publicly available at the URL below.": "Las estadísticas agregadas están disponibles públicamente en la dirección de abajo.",
-    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "La configuración ha sido guardada pero no activada.\nSyncthing debe reiniciarse para activar la nueva configuración.",
-    "The device ID cannot be blank.": "La ID del dispositivo no puede estar en blanco.",
-    "The device ID to enter here can be found in the \"Actions > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "La ID de dispositivo a introducir ser puede encontrar en el menú \"Acciones > Mostrar ID\" en el otro dispositivo. Espacios y guiones son opcionales (ignorados). ",
-    "The encrypted usage report is sent daily. It is used to track common platforms, folder sizes and app versions. If the reported data set is changed you will be prompted with this dialog again.": "El informe de uso se envía encriptado diariamente. Se utiliza para hacer un seguimiento de plataformas comunes, tamaño de repositorios y versiones de la aplicación. Si el conjunto de datos cambia será notificado mediante este dialogo nuevamente.",
-    "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.": "La ID del dispositivo introducida no es válida. Debe ser una cadena de 52 o 56 caracteres consistente en letras y números, con espacios y guiones opcionales.",
-    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "El primer argumento es la ruta de la carpeta y el segundo argumento es la ruta relativa de esta carpeta.",
-    "The folder ID cannot be blank.": "La ID del repositorio no puede estar en blanco.",
-    "The folder ID must be unique.": "La ID del repositorio debe ser única.",
-    "The folder path cannot be blank.": "La ruta del repositorio no puede estar vacía.",
-    "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "Los siguientes intervalos se utilizan: para la primera hora una versión se mantiene cada 30 segundos, para el primer día de una versión se mantiene cada hora, durante los primeros 30 días de la versión se mantiene todos los días, hasta que la edad máxima de una versión se mantiene cada semana.",
-    "The following items could not be synchronized.": "Los siguientes artículos no pueden ser sincronizados.",
-    "The maximum age must be a number and cannot be blank.": "La edad máxima debe ser un número y no puede estar en blanco.",
-    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "El tiempo máximo para mantener una versión (en días, establece en 0 para mantener versiones para siempre).",
-    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "El porcentaje de espacio libre en disco mínimo debe ser un número no negativo entre 0 y 100 (incluidos).",
-    "The number of days must be a number and cannot be blank.": "El número de días debe ser un número y no puede estar vacío.",
-    "The number of days to keep files in the trash can. Zero means forever.": "El tiempo máximo para mantener un archivo en el cubo de basura (en días, establece en 0 para mantener versiones para siempre).",
-    "The number of old versions to keep, per file.": "El numero de versiones anteriores a conservar, por archivo.",
+    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing parece no estar activo o hay un problema con tu conexión de internet. Reintentando...",
+    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing tiene problemas para procesar tu solicitud. Por favor, actualiza la página o reinicia Syncthing si el problema persiste.",
+    "The Syncthing admin interface is configured to allow remote access without a password.": "El panel de administración de Syncthing está configurado para permitir el acceso remoto sin contraseña.",
+    "The aggregated statistics are publicly available at the URL below.": "Las estadísticas agragadas están disponibles públicamente en la URL de abajo.",
+    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "La configuración ha sido grabada pero no activada. Syncthing debe reiniciarse para activar la nueva configuración.",
+    "The device ID cannot be blank.": "La ID del dispositivo no puede estar vacía.",
+    "The device ID to enter here can be found in the \"Actions > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "El ID del dispositivo que hay que introducir aquí se puede encontrar en el diálogo \"Acciones > Mostrar ID\" en el otro dispositivo. Los espacios y las barras son opcionales (ignorados).",
+    "The encrypted usage report is sent daily. It is used to track common platforms, folder sizes and app versions. If the reported data set is changed you will be prompted with this dialog again.": "El informe encriptado de uso se envía diariamente. Se usa para rastrear plataformas comunes, tamaños de carpetas y versiones de la aplicación. Si el conjunto de datos enviados en el informes se cambia, se le pedirá a usted autorización de nuevo.",
+    "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.": "La ID del dispositivo introducida no parece válida. Debe ser una cadena de 52 ó 56 caracteres formada por letras y números, con espacios y guiones opcionales.",
+    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "El primer parámetro del comando es la ruta de la carpeta y el segundo es la ruta relativa en la carpeta.",
+    "The folder ID cannot be blank.": "La ID de la carpeta no puede estar vacía.",
+    "The folder ID must be unique.": "La ID de la carpeta debe ser única.",
+    "The folder path cannot be blank.": "La ruta de la carpeta no puede estar en blanco.",
+    "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "Se utilizan los siguientes intervalos: para la primera hora se mantiene una versión cada 30 segundos, para el primer día se mantiene una versión cada hora, para los primeros 30 días se mantiene una versión diaria hasta la edad máxima de una semana.",
+    "The following items could not be synchronized.": "Los siguientes elementos no pueden ser sincronizados.",
+    "The maximum age must be a number and cannot be blank.": "La edad máxima debe ser un número y no puede estar vacía.",
+    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "El tiempo máximo para mantener una versión en días (introducir 0 para mantener las versiones indefinidamente).",
+    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "El porcentaje de espacio libre mínimo debe ser un número no negativo entre 0 y 100 (ambos inclusive).",
+    "The number of days must be a number and cannot be blank.": "El número de días debe ser un número y no puede estar en blanco.",
+    "The number of days to keep files in the trash can. Zero means forever.": "El número de días para mantener los archivos en la papelera. Cero significa \"para siempre\".",
+    "The number of old versions to keep, per file.": "El número de versiones a antiguas a mantener para cada fichero.",
     "The number of versions must be a number and cannot be blank.": "El número de versiones debe ser un número y no puede estar vacío.",
     "The path cannot be blank.": "La ruta no puede estar vacía.",
-    "The rate limit must be a non-negative number (0: no limit)": "El intervalo de reescaneo debe ser un número no negativo de segundos.  (0: no limit)",
-    "The rescan interval must be a non-negative number of seconds.": "El intervalo de reescaneo debe ser un número no negativo de segundos.",
-    "They are retried automatically and will be synced when the error is resolved.": "Los archivos se sincronizan automáticamente cuando el error se resuelve.",
+    "The rate limit must be a non-negative number (0: no limit)": "El límite de velocidad debe ser un número no negativo (0: sin límite)",
+    "The rescan interval must be a non-negative number of seconds.": "El intervalo de actualización debe ser un número positivo de segundos.",
+    "They are retried automatically and will be synced when the error is resolved.": "Se reintentarán de forma automática y se sincronizarán cuando se resuelva el error.",
     "This Device": "Este Dispositivo",
-    "This can easily give hackers access to read and change any files on your computer.": "Esto puede darle permiso a los hackers, podrán acceder a cualquier archivo, pudiéndolos leer y editar.",
-    "This is a major version upgrade.": "Esta es una actualización de version mayor.",
-    "This setting controls the free space required on the home (i.e., index database) disk.": "This setting controls the free space required on the home (i.e., index database) disk.",
-    "Time": "Tiempo",
-    "Trash Can File Versioning": "Versiones como cubo de basura",
+    "This can easily give hackers access to read and change any files on your computer.": "Esto podría permitir fácilmente el acceso a hackers para leer y modificar cualquier fichero de tu equipo.",
+    "This is a major version upgrade.": "Hay una actualización importante.",
+    "This setting controls the free space required on the home (i.e., index database) disk.": "Este ajuste controla el espacio libre necesario en el disco principal (por ejemplo, el índice de la base de datos).",
+    "Time": "Hora",
+    "Trash Can File Versioning": "Versionado de archivos de la papelera",
     "Type": "Tipo",
     "Unknown": "Desconocido",
     "Unshared": "No compartido",
-    "Unused": "No utilizado",
+    "Unused": "No usado",
     "Up to Date": "Actualizado",
     "Updated": "Actualizado",
     "Upgrade": "Actualizar",
     "Upgrade To {%version%}": "Actualizar a {{version}}",
     "Upgrading": "Actualizando",
-    "Upload Rate": "Tasa de subida",
-    "Uptime": "Tiempo en funcionamiento",
-    "Usage reporting is always enabled for candidate releases.": "Reportes anónimos de uso siempre estan enviados en las versions preliminares.",
-    "Use HTTPS for GUI": "Usar HTTPS para la GUI",
+    "Upload Rate": "Velocidad de subida",
+    "Uptime": "Tiempo de funcionamiento",
+    "Usage reporting is always enabled for candidate releases.": "El informe de uso está siempre habilitado en las versiones candidatas.",
+    "Use HTTPS for GUI": "Usar HTTPS para la Interfaz Gráfica de Usuario (GUI)",
     "Version": "Versión",
-    "Versions Path": "Ruta de versiones",
-    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Las versiones se eliminan automáticamente si son mayores de la edad máxima o mayor que el número de archivos permitidos en un intervalo.",
-    "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "Atención, esta ruta es un repertorio allegado por lo menos de un reparto existente (por ejemplo \" {{otherFolder}} \"). Si usted continúa, usted debería crear un nuevo subdirectorio, si no esto puede causar problemas tales como duplicaciones y/o supresiones intempestivas de ficheros.",
-    "Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Atención, esta ruta es un repertorio allegado por lo menos de un reparto existente (por ejemplo \" {{otherFolderLabel}} \" ({{otherFolder}})). Si usted continúa, usted debería crear un nuevo subdirectorio, si no esto puede causar problemas tales como duplicaciones y/o supresiones intempestivas de ficheros.",
-    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Atención, esta dirección es un subdirectorio de un directorio existente \"{{otherFolder}}\".",
-    "Warning, this path is a subdirectory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "ATENCIÓN, esta ruta es un subdirectorio del reparto existente \" {{otherFolderLabel}} \" ({{otherFolder}}). Esto puede causar problemas tales como duplicaciones y/o supresiones intempestivas de ficheros.",
-    "When adding a new device, keep in mind that this device must be added on the other side too.": "Al agregar un nuevo dispositivo, tenga en cuenta que este dispositivo se debe agregar en el otro lado también.",
-    "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Al agregar un nuevo repositorio, tenga en cuenta que la ID del repositorio se utiliza para conectar los repositorios entre dispositivos. Se distingue entre mayúsculas y minúsculas y debe ser exactamente igual en todos los dispositivos.",
-    "Yes": "Sí",
-    "You can change your choice at any time in the Settings dialog.": "Usted puede cambiar su elección en el cuadro de diálogo Configuración.",
-    "You can read more about the two release channels at the link below.": "Usted puede saber más sobre ambos canales de distribución vía el lazo más abajo.",
-    "You must keep at least one version.": "Debe mantener al menos una versión",
+    "Versions Path": "Ruta de las versiones",
+    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Las versiones se borran automáticamente si son más antiguas que la edad máxima o exceden el número de ficheros permitidos en un intervalo.",
+    "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "¡Peligro! Esta ruta es un directorio principal de la carpeta ya existente \"{{otherFolder}}\".",
+    "Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "'Peligro! Esta ruta es un subdirectorio de la carpeta ya existente \"{{otherFolderLabel}}\"  ({{otherFolder}}).",
+    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Peligro! Esta ruta es un subdirectorio de una carpeta ya existente llamada \"{{otherFolder}}\".",
+    "Warning, this path is a subdirectory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Peligro, esta ruta es un subdirectorio de una carpeta ya existente llamada \"{{otherFolderLabel}}\" ({{otherFolder}}).",
+    "When adding a new device, keep in mind that this device must be added on the other side too.": "Cuando añada un nuevo dispositivo, tenga en cuenta que este debe añadirse también en el otro lado.",
+    "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Cuando añada una nueva carpeta, tenga en cuenta que su ID se usa para unir carpetas entre dispositivos. Son sensibles a las mayúsculas y deben coincidir exactamente entre todos los dispositivos.",
+    "Yes": "Si",
+    "You can change your choice at any time in the Settings dialog.": "Puedes cambiar tu elección en cualquier momento en el panel de Ajustes.",
+    "You can read more about the two release channels at the link below.": "Puedes leer más sobre los dos método de publicación de versiones en el siguiente enlace.",
+    "You must keep at least one version.": "Debes mantener al menos una versión.",
     "days": "días",
     "directories": "directorios",
     "files": "archivos",
-    "full documentation": "documentación completa",
-    "items": "ítems",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} quiere compartir repositorio \"{{folder}}\".",
+    "full documentation": "Documentación completa",
+    "items": "Elementos",
+    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} quiere compartir la carpeta \"{{folder}}\".",
     "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} quiere compartir la carpeta \"{{folderlabel}}\" ({{folder}})."
 }

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

@@ -1,16 +1,16 @@
 {
     "A device with that ID is already added.": "Id hori duen tresna bat jadanik bada",
     "A negative number of days doesn't make sense.": "0 edo zenbaki positiboa onartzen da bakarrik",
-    "A new major version may not be compatible with previous versions.": "Aldaketa garrantzitsuak dituen bertsio berria beharbada ez da bateragarria izango bertsio zaharragoekin.",
+    "A new major version may not be compatible with previous versions.": "Aldaketa garrantzitsuak dituen bertsio berri bat ez da beharbada bateragarria izanen bertsio zaharragoekin.",
     "API Key": "API giltza",
     "About": "Honi buruz",
-    "Action": "Ekintza",
+    "Action": "Egintza",
     "Actions": "Egintzak",
     "Add": "Gehitu",
     "Add Device": "Tresna gehitu",
     "Add Folder": "Karpeta gehitu",
-    "Add Remote Device": "Urruneko tresna bat gehitu",
-    "Add devices from the introducer to our device list, for mutually shared folders.": "Add devices from the introducer to our device list, for mutually shared folders.",
+    "Add Remote Device": "Urrundikako tresna bat gehitu",
+    "Add devices from the introducer to our device list, for mutually shared folders.": "Gure tresna zerrendan tresnak gehitzea baimendu, partekatzeetan.",
     "Add new folder?": "Karpeta berria gehitu?",
     "Address": "Helbidea",
     "Addresses": "Helbideak",
@@ -19,20 +19,20 @@
     "Advanced settings": "Parametro aitzinatuak",
     "All Data": "Datu guziak",
     "Allow Anonymous Usage Reporting?": "Izenik gabeko erabiltze erreportak baimendu?",
-    "Allowed Networks": "Allowed Networks",
+    "Allowed Networks": "Sare baimenduak",
     "Alphabetic": "Alfabetikoa",
-    "An external command handles the versioning. It has to remove the file from the shared folder.": "An external command handles the versioning. It has to remove the file from the shared folder.",
+    "An external command handles the versioning. It has to remove the file from the shared folder.": "Kanpoko kontrolagailu  batek fitxategien bertsioak kudeatzen ditu. Fitxategiak kendu behar ditu errepertorio sinkronizatuan.",
     "An external command handles the versioning. It has to remove the file from the synced folder.": "Kanpoko kontrolagailu batek fitxeroen bertsioak erabiltzen ditu. Fitxeroak errepertorio sinkronizatutik desagertaraztea berari doakio.",
     "Anonymous Usage Reporting": "Izenik gabeko erabiltze erreportak",
     "Any devices configured on an introducer device will be added to this device as well.": "Sarrarazle deitzen duzun tresna batean gehitua izanen den edozein tresna, zurean ere gehitua izanen da.",
-    "Automatic upgrade now offers the choice between stable releases and release candidates.": "Eguneratze automatiko sistemak iraunkor ala aitzin bertsioen arteko aukera proposatzen du",
+    "Automatic upgrade now offers the choice between stable releases and release candidates.": "Eguneratze automatiko sistemak iraunkor bertsioen eta aitzineko bertsioen artean hautatzea proposatzen du",
     "Automatic upgrades": "Eguneratze automatikoak",
     "Be careful!": "Kasu emazu!",
     "Bugs": "Akatsak",
     "CPU Utilization": "Prozesadorearen erabiltzea",
     "Changelog": "Bertsioen historia",
     "Clean out after": "Garbi …. epearen ondotik",
-    "Click to see discovery failures": "Click to see discovery failures",
+    "Click to see discovery failures": "Klik egin hutsegiteak ikusteko",
     "Close": "Hetsi",
     "Command": "Kontrolagailua",
     "Comment, when used at the start of a line": "Komentarioa, lerro baten hastean delarik",
@@ -44,241 +44,243 @@
     "Copied from original": "Jatorrizkotik kopiatua",
     "Copyright © 2014-2016 the following Contributors:": "Copyright 2014-2016, ekarle hauk:",
     "Copyright © 2014-2017 the following Contributors:": "Copyright 2014-2017, ekarle hauk:",
-    "Creating ignore patterns, overwriting an existing file at {%path%}.": "Creating ignore patterns, overwriting an existing file at {{path}}.",
+    "Creating ignore patterns, overwriting an existing file at {%path%}.": "Baztertze modelo batzuen sortzea, dagoen fitxategiari ordaina ezartzea: {{path}}",
     "Danger!": "Lanjera !",
     "Deleted": "Kendua",
     "Device": "Tresna",
-    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Makina \"{{name}}\" ({{device}} izan {{address}}) konektatu nahi du. Gaineratu berri makina ?",
-    "Device ID": "Makina ID",
+    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Tresna \"{{name}}\" ({{device}} {{address}} era) konektatu nahi du. Onhartzen duzu ?",
+    "Device ID": "Tresnaren ID-a",
     "Device Identification": "Tresnaren identifikazioa",
-    "Device Name": "Makina izen",
-    "Devices": "Makinak",
-    "Disconnected": "Desloturik",
-    "Discovered": "Ziloa",
-    "Discovery": "Aurkikuntza",
-    "Discovery Failures": "Discovery Failures",
-    "Documentation": "Dokumentazio",
-    "Download Rate": "Deskargatze emari",
-    "Downloaded": "Telekargatua",
-    "Downloading": "Deskargatze",
+    "Device Name": "Tresnaren izena",
+    "Devices": "Tresnak",
+    "Disconnected": "Deskonektatua",
+    "Discovered": "Agertua",
+    "Discovery": "Agertzea",
+    "Discovery Failures": "Agertze hutsegiteak",
+    "Documentation": "Dokumentazioa",
+    "Download Rate": "Deskargatzearen bit-tasa",
+    "Downloaded": "Deskargatua",
+    "Downloading": "Deskargatzea",
     "Edit": "Aldatu",
-    "Edit Device": "Aldaketa tresna",
-    "Edit Folder": "Aldaketa partekatze",
-    "Editing": "Aldaketa",
-    "Editing {%path%}.": "Editing {{path}}.",
-    "Enable NAT traversal": "Ahalbidetu NAT",
-    "Enable Relaying": "Ahalbidetu lekua hartu",
-    "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.",
-    "Enter a non-privileged port number (1024 - 65535).": "Enter a non-privileged port number (1024 - 65535).",
-    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": " (\"tcp://ip:port\", \"tcp://nom:port\") zuzenbideak sar, krakotx batez separatuak edo bestenaz \"dynamic\", zuzenbidearen xekatze automatikoa aktibatzeko\nTu peux traduire nom et port mot à mot dans la parenthèse, c'est pas des variables du programme, juste du texte explicatif",
-    "Enter ignore patterns, one per line.": "Ezkluzio filtroak sar, lerro batean bakar bat",
-    "Error": "Huts",
-    "External File Versioning": "Fitxero bertsioen kanpoko kudeaketa",
-    "Failed Items": "Fitxategiken huts",
-    "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.",
-    "File Pull Order": "Fitxategiak irekitzeko agindua",
-    "File Versioning": "Artxiboak babesteko metodoa",
-    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Aldaketa bilaketetan fitxero baimenen bitak ez dira kontuan hartuko. Fitxero FAT sistimetan erabilia.",
-    "Files are moved to .stversions directory when replaced or deleted by Syncthing.": "Files are moved to .stversions directory when replaced or deleted by Syncthing.",
+    "Edit Device": "Tresna aldatzea",
+    "Edit Folder": "Partekatze aldatzea",
+    "Editing": "Aldaketak",
+    "Editing {%path%}.": "Muntatzea {{path}}",
+    "Enable NAT traversal": "NAT translazioa aktibatu",
+    "Enable Relaying": "Aldizkatzea posible",
+    "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Negatiboa ez den zenbaki bat hauta ezazu (\"2.35\" adib.) bai eta unitate bat. Disko osoaren  ehuneko espazioa",
+    "Enter a non-privileged port number (1024 - 65535).": "Abantailatua ez den portu zenbalki bat sar ezazu (1024 - 65535)",
+    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": " (\"tcp://ip:ataka\", \"tcp://izena:ataka\") zuzenbideak sar, krakotx batez separatuak edo bestenaz \"dynamic\", zuzenbidearen xekatze automatikoa aktibatzeko",
+    "Enter ignore patterns, one per line.": "Ezkluzio filtroak sar, lerro bakoitzean bat bakarrik.",
+    "Error": "Hutsa",
+    "External File Versioning": "Fitxategi bertsioen kanpoko kudeaketa",
+    "Failed Items": "Huts egin duten fitxategiak",
+    "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "IPv6 zerbitzariei buruzko konexioak huts eginen du, IPv6 konektibitaterik ez bada",
+    "File Pull Order": "Fitxategiak berreskuratzeko ordena",
+    "File Versioning": "Fitxategiak zaintzeko metodoa",
+    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Aldaketa bilaketetan, fitxeroen baimen bitak ez dira kontuan hartuko. Fitxero FAT sistimetan erabilia.",
+    "Files are moved to .stversions directory when replaced or deleted by Syncthing.": "Fitxategiak .stbersioak errepertorioan lekutuak dira, Syncthing-ek ordezkatzen edo kentzen dituelarik",
     "Files are moved to .stversions folder when replaced or deleted by Syncthing.": ".stbersioak azpi karpetan lekutuko dira fitxeroak, Syncthing-ek aldatu edo ezeztatuko dituelarik. Beren helbide errelatiboak hor berean berriz sortuak izanen dira, behar balin bada",
-    "Files are moved to date stamped versions in a .stversions directory when replaced or deleted by Syncthing.": "Files are moved to date stamped versions in a .stversions directory when replaced or deleted by Syncthing.",
-    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": ".stbersioak azpi karpetan lekutuko eta ordu-markatuko dira fitxeroak, Syncthing-ek aldatu edo ezeztatuko dituelarik. Beren helbide errelatiboak hor berean berriz sortuak izanen dira, behar balin bada",
-    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Beste tresnetan eginak izanen diren aldaketetatik zainduak izanen dira fitxeroak; haatik, tresna huntan egindako aldaketak besteeri hedatuak izanen dira",
+    "Files are moved to date stamped versions in a .stversions directory when replaced or deleted by Syncthing.": "Syncthing-ek aldatzen edo kentzen dituelarik, fitxeroak \".stbertsioak\" peko-errepertoriorat lekutuak dira, jatorrizkoaren berdin berdina den zuhaitz-formako batean",
+    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": ".stbersioak azpi karpetan lekutuko eta ordu-markatuko dira fitxeroak, egitura errelatibo berdin batean, Syncthing-ek aldatu edo ezeztatuko dituelarik.",
+    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Beste tresnetan eginak izanen diren aldaketetatik zainduak izanen dira fitxeroak; haatik, tresna huntan egindako aldaketak besteeri hedatuak izanen dira.",
     "Folder": "Partekatze",
-    "Folder ID": "Partekatze ID",
-    "Folder Label": "Partekatze izengoiti",
-    "Folder Path": "Partekatze bidexka",
+    "Folder ID": "ID partekatze",
+    "Folder Label": "Partekatzearen izena",
+    "Folder Path": "Partekatzearen sustrai bidea",
     "Folder Type": "Partekatze mota",
-    "Folders": "Partekatzek",
-    "GUI": "Interfaze grafiko",
-    "GUI Authentication Password": "Interfaze grafiko pasahitz",
-    "GUI Authentication User": "Interfaze grafiko erabiltzaile",
-    "GUI Listen Address": "GUI Listen Address",
-    "GUI Listen Addresses": "Interfaze grafiko helbide",
-    "GUI Theme": "GUI Theme",
+    "Folders": "Partekatzeak",
+    "GUI": "Interfaze grafikoa",
+    "GUI Authentication Password": "Interfaze grafiko pasahitza",
+    "GUI Authentication User": "Interfaze grafiko erabiltzaile baimendua",
+    "GUI Listen Address": "Interfaze grafiko helbidea",
+    "GUI Listen Addresses": "Interfaze grafiko helbideak",
+    "GUI Theme": "Interfaze grafiko tema",
     "Generate": "Sortu",
-    "Global Changes": "Global Changes",
-    "Global Discovery": "Aurkikuntza oso",
-    "Global Discovery Servers": "Aurkikuntza oso zerbitzarik",
-    "Global State": "Oso egoera",
-    "Help": "Aiuta",
-    "Home page": "Errezibitze",
-    "Ignore": "Baztertu",
-    "Ignore Patterns": "Bazterketak arauk",
-    "Ignore Permissions": "Baztertu baimenek",
-    "Incoming Rate Limit (KiB/s)": "Deskargatze emari gehieneko (KiB/s)",
-    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Langer !!!!",
-    "Introduced By": "Introduced By",
-    "Introducer": "Abiarazle",
+    "Global Changes": "Azken aldaketak",
+    "Global Discovery": "Aurkikuntza  orokorra",
+    "Global Discovery Servers": "Orokor aurkikuntza zerbitzaria",
+    "Global State": "Egoera orokorra",
+    "Help": "Laguntza",
+    "Home page": "Harrera",
+    "Ignore": "Kontuan ez hartu",
+    "Ignore Patterns": "Baztertzeak",
+    "Ignore Permissions": "Baimenak kontuan ez hartu",
+    "Incoming Rate Limit (KiB/s)": "Deskargatze emari muga (KiB/s)",
+    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Behar ez den konfigurazio batek zuen partekatzetan makurrak egin ditzake eta Syncthing ezin erabilia utzi",
+    "Introduced By": "...k sartua",
+    "Introducer": "Tresna sarrarazlea",
     "Inversion of the given condition (i.e. do not exclude)": "Emana izan den baldintza alderantziz eman (i.e ez baztertu)",
     "Keep Versions": "Gorde bertsioak",
     "Largest First": "Handienak lehenik",
-    "Last File Received": " Fitxategi azken eskuratu",
-    "Last Scan": "Azterketa azken",
+    "Last File Received": " Azkenik eskuratu fitxategia",
+    "Last Scan": "Azken azterketa",
     "Last seen": "Azken agerraldia",
     "Later": "Berantago",
-    "Latest Change": "Asken aldaketa",
-    "Learn more": "Learn more",
+    "Latest Change": "Azken aldaketa",
+    "Learn more": "Gehiago jakiteko",
     "Listeners": "Entzungailuak",
     "Local Discovery": "Lekuko aurkikuntza",
     "Local State": "Lekuko egoera",
-    "Local State (Total)": "Lekuko egoera (Oso)",
-    "Major Upgrade": "Nagusi eguneratu",
-    "Master": "Nagusi",
-    "Maximum Age": "Goren adin",
+    "Local State (Total)": "Lekuko egoera (Osoa)",
+    "Major Upgrade": "Eguneratze nagusia",
+    "Master": "Nagusia",
+    "Maximum Age": "Adin gehiena",
     "Metadata Only": "Metadatuak bakarrik",
-    "Minimum Free Disk Space": "Diskoan leku libre gutxieneko",
-    "Move to top of queue": "Igurikatze zerrenda bururat lekuz alda",
-    "Multi level wildcard (matches multiple directory levels)": "Hein askorentzako jokerra (errepertorio eta azpi errepertorioeri  dagokiona)",
+    "Minimum Free Disk Space": "Diskoan gutieneko leku libroa ",
+    "Move to top of queue": "Lerro bururat lekuz alda",
+    "Multi level wildcard (matches multiple directory levels)": "Hein anitzerako jokerra (errepertorio eta azpi errepertorioeri  dagokiona)",
     "Never": "Sekulan",
-    "New Device": "Berria makina",
-    "New Folder": "Berri partekatze",
-    "Newest First": "Gehien gertatu berri lehen",
+    "New Device": "Tresna berria",
+    "New Folder": "Partekatze berria",
+    "Newest First": "Berrienak lehenik",
     "No": "Ez",
-    "No File Versioning": "Ez babestu",
-    "No upgrades": "No upgrades",
-    "Normal": "Normal",
+    "No File Versioning": "Fitxategi bersioen kontrolik ez",
+    "No upgrades": "Eguneratzerik ez",
+    "Normal": "Normala",
     "Notice": "Jakinaraztea",
     "OK": "Ados",
     "Off": "Desgaitu",
-    "Oldest First": "Gehien zahar lehen",
-    "Optional descriptive label for the folder. Can be different on each device.": "Partikatzearen izen hautuzkoa eta atsegina, zure gisa. Tresna bakotxean desberdina izaiten ahal da.",
-    "Options": "Hautuk",
+    "Oldest First": "Zaharrenak lehenik",
+    "Optional descriptive label for the folder. Can be different on each device.": "Partekatzearen izen hautuzkoa eta atsegina, zure gisa. Tresna bakotxean desberdina izaiten ahal da.",
+    "Options": "Hautuzkoak",
     "Out of Sync": "Ez sinkronizatua",
     "Out of Sync Items": "Ez sinkronizatu elementuak",
-    "Outgoing Rate Limit (KiB/s)": "Bidaltze emari gehieneko (KiB/s)",
+    "Outgoing Rate Limit (KiB/s)": "Bidaltze emari gehienekoa (KiB/s)",
     "Override Changes": "Aldaketak desegin",
     "Path": "Bidexka",
-    "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": "Bertako tresnaren karpetari buruzko bidea. Ez balin bada, asmatu beharko da bat. Vous pouvez entrer un chemin absolu (p.ex \"/home/moi/Sync/Exemple\") ou relatif à celui du programme (p.ex \"..\\Partages\\Exemple\" - utile pour installation portable). Tildea (~, edo ~+Espazioa Windows XP+Azerty-n) erabil litzateke bide motz gisa",
-    "Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).": "Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).",
-    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Kopiak kontserbatzeko bidea (hutsa utzezazu, .stversioen karpetaren bide ohituan).",
+    "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": "Lekuko tresnaren partekatzeari buruzko bidea. Ez balitz, asmatu beharko da bat. Programarenari, baitezpadako bide bat sartzen ahal duzu (adibidez \"/home/ni/Sync/Etsenplua\") edo bestenaz bide errelatibo bat (adibidez \"..\\Partekatzeak\\Etsenplua\" - instalazio mugikor batentzat baliagarria). Tildea (~, edo ~+Espazioa Windows XP+Azerty-n) erabil litzateke laburbide gisa",
+    "Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).": "Kopiak kontserbatzeko bidea (hutsa utz ezazu, .steversioen ohizko bidearentzat, dosier partekatuan)",
+    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Kopiak kontserbatzeko bidea (hutsa utz ezazu, .stversioen ohizko dosierarentzat, karpeta partekatuan)",
     "Pause": "Pausa",
-    "Pause All": "Pause All",
-    "Paused": "Geldirik",
+    "Pause All": "Geldi dena",
+    "Paused": "Gelditua",
     "Please consult the release notes before performing a major upgrade.": "Aktualizatze garrantzitsu bat egin baino lehen, bertsioaren oharrak begira itzazu.",
-    "Please set a GUI Authentication User and Password in the Settings dialog.": "Konfigurazio leihoan asma itzazu erabiltzale izen bat eta sartzeko giltza bat",
-    "Please wait": "Oraino pazientzia pixka bat har ezazu",
+    "Please set a GUI Authentication User and Password in the Settings dialog.": "Konfigurazio leihoan asma itzazu erabiltzale izen bat eta pasahitz bat",
+    "Please wait": "Pazientzia pixka bat, otoi",
+    "Prefix indicating that the file can be deleted if preventing directory removal": "Prefix indicating that the file can be deleted if preventing directory removal",
+    "Prefix indicating that the pattern should be matched without case sensitivity": "Prefix indicating that the pattern should be matched without case sensitivity",
     "Preview": "Aurrebista",
-    "Preview Usage Report": "Erabiltze aurrebista",
-    "Quick guide to supported patterns": "Filtro ez onartuen txostena :",
-    "RAM Utilization": "RAM erabiltze",
-    "Random": "Aleatorio",
-    "Reduced by ignore patterns": "(Mugatu baztertzek patroikez)",
+    "Preview Usage Report": "Erabiltze estatistika txostenaren aurrebista",
+    "Quick guide to supported patterns": "Eredu konpatibleen gidaliburuxka",
+    "RAM Utilization": "RAM aren erabiltzea",
+    "Random": "Aleatorioa",
+    "Reduced by ignore patterns": "Baztertze eredu batzuk mugatuak",
     "Release Notes": "Bertsioen notak",
-    "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": "Besteak makinak",
+    "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Azken zuzenketak eta funtzionalitateak edukitzen dituzte aitzin-bertsioek. Bi hilabete guziz egiten diren eguneratzeen berdinak dira.",
+    "Remote Devices": "Beste tresnak",
     "Remove": "Kendu",
-    "Required identifier for the folder. Must be the same on all cluster devices.": "Partikatzearen erabilzaile izena. Diren tresna guzietan berdin berdina izan behar du",
-    "Rescan": "Berreskanea",
-    "Rescan All": "Berreskanea guzia",
-    "Rescan Interval": "Arte berreskanea",
-    "Restart": "Berriz abiatu",
+    "Required identifier for the folder. Must be the same on all cluster devices.": "Partekatzearen erabilzaile izena. Dauden tresna guzietan berdin berdina izan behar du",
+    "Rescan": "Berriz eskaneatu",
+    "Rescan All": "Dena berriz eskaneatu",
+    "Rescan Interval": "Berriz eskaneatzeko tartea",
+    "Restart": "Berriz piztu",
     "Restart Needed": "Berriz piztea beharrezkoa",
     "Restarting": "Berriz piztea martxan",
-    "Resume": "Berriz hasi",
-    "Resume All": "Resume All",
+    "Resume": "Berriz hastea",
+    "Resume All": "Dena berriz hastea",
     "Reused": "Berriz erabilia",
-    "Save": "Begiratu",
-    "Scan Time Remaining": "Gelditzen den denbora azterketa",
-    "Scanning": "Etengabeko azterketa",
-    "Select the devices to share this folder with.": "Honekin sinkronizatua:",
-    "Select the folders to share with this device.": "Tresna hunek erabiltzen dituen banaketak hauta",
-    "Send & Receive": "Igorri & Artu",
-    "Send Only": "Bakarrik igorri",
-    "Settings": "Egokitzek",
-    "Share": "Banatu",
-    "Share Folder": "Banatu",
-    "Share Folders With Device": "Partekatu makinakekin",
-    "Share With Devices": "Partekatuekin makinak",
-    "Share this folder?": "Banatze hau onartzen duzu?",
-    "Shared With": "Partekatuekin",
-    "Show ID": "Erakutsi ene ID",
-    "Show QR": "Erakutsi QR",
-    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Tresnaren ID-aren ordez erakutsia, taldearen egoeran. Beste tresneri erakutsia izanen da, izen erabilgarria bezala",
+    "Save": "Grabatu",
+    "Scan Time Remaining": "Gelditzen den azterketa denbora",
+    "Scanning": "Azterketa martxan",
+    "Select the devices to share this folder with.": " Tresnak hauta itzazu partekatze honekin sinkronizatzeko ",
+    "Select the folders to share with this device.": "Tresna honek erabiltzen dituen partekatzeak hauta itzazu",
+    "Send & Receive": "Igorri eta errezibitu",
+    "Send Only": "Igorrri bakarrik",
+    "Settings": "Konfigurazioa",
+    "Share": "Partekatu",
+    "Share Folder": "Partekatzea",
+    "Share Folders With Device": "Tresnarekin partekatzeak",
+    "Share With Devices": "Tresnekin partekatu",
+    "Share this folder?": "Partekatze hau onartzen duzu?",
+    "Shared With": "...ekin partekatua",
+    "Show ID": "Erakutsi ene ID-a",
+    "Show QR": "Erakutsi QR-a",
+    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Tresnaren ID-aren ordez erakutsia, taldearen egoeran. Beste tresneri erakutsia izanen da, izen erabilgarri bat bezala",
     "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Tresnaren ID-aren ordez erakutsia, taldearen egoeran. Hutsa utzia balin bada, urrun den tresnak proposatu izenarekin aktualizatua izanen da",
-    "Shutdown": "Utzi",
+    "Shutdown": "Geldi",
     "Shutdown Complete": "Gelditua!",
-    "Simple File Versioning": "Bertsioen segitze sinplifikatuak",
+    "Simple File Versioning": "Bertsioen segitze sinplifikatua",
     "Single level wildcard (matches within a directory only)": "Hein bakar bateko jokerra (karpetaren barnean bakarrik dagokiona)",
-    "Smallest First": "Tipienak lehenik",
-    "Source Code": "Iturri kode",
-    "Stable releases and release candidates": "Stable releases and release candidates",
-    "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.",
-    "Stable releases only": "Stable releases only",
-    "Staggered File Versioning": "Bertsio eskaleratuak",
-    "Start Browser": "Web nabigatzailea pitz",
-    "Statistics": "Statistikak",
+    "Smallest First": "Ttipienak lehenik",
+    "Source Code": "Iturri kodea",
+    "Stable releases and release candidates": "iraunkor eta aintzin-bertsioak",
+    "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "Iraunkor bertsioak bi astez (nonbait han) gibelatuak dira. Bitartean, aintzin-bertsio gisa probatuak izanen dira.",
+    "Stable releases only": "Iraunkor bertsioak bakarrik",
+    "Staggered File Versioning": "Bertsio mailakatuak",
+    "Start Browser": "Web nabigatzailea piztu",
+    "Statistics": "Estatistikak",
     "Stopped": "Gelditua!",
     "Support": "Foroa",
     "Sync Protocol Listen Addresses": "Sinkronizatu protokoloaren entzun zuzenbideak",
-    "Syncing": "Sinkronizazio joaira",
+    "Syncing": "Sinkronizazioa martxan",
     "Syncthing has been shut down.": "Syncthing gelditua izan da",
     "Syncthing includes the following software or portions thereof:": "Syncthing-ek programa hauk integratzen ditu (edo programa hauetatik datozten elementuak):",
     "Syncthing is restarting.": "Syncthing berriz pizten ari",
     "Syncthing is upgrading.": "Syncthing aktualizatzen ari da",
     "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Iduri luke Syncthing gelditua dela, edo bestenaz arrazo bat bada interneten konekzioarekin. Berriz entsea zaitez…",
-    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Iduri luke Syncthing arazo bat duela zure eskaeraren tratatzeko. Otoi, horria freska ezazu edo bestenaz Syncthing berriz pitz arazoak segitzen badu.",
-    "The Syncthing admin interface is configured to allow remote access without a password.": "Syncthing administrazio interfazea pentsatua da urrundikako irisbideak sekretu hitz gabe onartzeko !!!",
-    "The aggregated statistics are publicly available at the URL below.": "Estadistikak zuzen bide honetan publikoki ikusgarri dira",
-    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Konfigurazioa grabatua izan da bainan ez aktibatua. Syncthing berriz piztu behar da konfigurazio berriaren berriz aktibatzeko.",
+    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Iduri luke Syncthing-ek arazo bat duela zure eskaera tratatzeko. Otoi, orrialdea freska ezazu edo bestenaz, arazoak segitzen badu, Syncthing berriz pitz ezazu .",
+    "The Syncthing admin interface is configured to allow remote access without a password.": "Syncthing-en administrazio interfazea pentsatua da urrundikako helbideak pasahitzik gabe onartzeko !",
+    "The aggregated statistics are publicly available at the URL below.": "Estadistikak zuzen bide honetan publikoki ikusgarriak dira",
+    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Konfigurazioa grabatua izan da bainan ez aktibatua. Syncthing berriz piztu behar da konfigurazio berria berriz aktibatzeko.",
     "The device ID cannot be blank.": "Tresnaren ID-a ez da hutsa izaiten ahal.",
-    "The device ID to enter here can be found in the \"Actions > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "Tresnaren ID-a atxemaiten ahal da \"Ekintzak > Tresna urrunduaren \"ID-a erakuts\" menuan. Espazio eta gioiak ez dira beharrezkoak.",
-    "The encrypted usage report is sent daily. It is used to track common platforms, folder sizes and app versions. If the reported data set is changed you will be prompted with this dialog again.": "Erabileraren zifratu txostena egun guziz igorria da. Erabili diren plataformak, banaketeen neurriak eta aplikazioaren bertsioen zerendatzeko balio du.",
-    "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.": "Sartu den tresnaren ID-ak iduri du ez duela balio. 52 edo 56-ko ezaugarriko kadena baten itxura behar luke, hizkiak, zifrak eta baita ere tarte edo gioiez egina",
-    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "Agingailu lerroaren lehen parametroa banatua den karpetaren bidea da, eta bigarrena karpetan den errelatibo bidea",
-    "The folder ID cannot be blank.": "banatzearen ID-a ez da hutsa izaiten ahal",
-    "The folder ID must be unique.": "Banatzearen ID-ak bakarra izan behar du",
-    "The folder path cannot be blank.": "Karpetari buruzko bidea ez da hutsa izaiten ahal",
-    "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "Hunako tarteak erabiliak dira: oren bateko denboraldian bertsio bat kontserbatua da 30 segundu guziz. Egun batekoan,bertsio bat egunero. Handik harat, adinaren mugetan egonez, bertsio bat astero.",
+    "The device ID to enter here can be found in the \"Actions > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "Sartu behar den tresnaren ID-a atxemaiten ahal da menuan \"Ekintzak > ID-a erakuts\" (tresna urrunduarena). Espazio eta gioiak ez dira beharrezkoak.",
+    "The encrypted usage report is sent daily. It is used to track common platforms, folder sizes and app versions. If the reported data set is changed you will be prompted with this dialog again.": "Erabileraren zifratu txostena egun guziz igorria da. Erabili diren plataformak, partekatzeen neurriak eta aplikazioaren bertsioen zerendatzeko balio du. Datu orokorrak aldatzen balin badira, mezu honen bidez ontzat emaitea eskatua izanen zaizu.\nErabiltzearen zifratu txostena egun guziz igorria da. Balio du erabiliak izan diren plataformak, partekatzeen izaria eta aplikazioaren bertsioak zerrendatzeko. Datu orokorrek aldatuak izan behar balute, mezu honen bidez ontzat emaitea eskatua izanen zaizu. Zure erabakia aldatzen ahal duzu Ekintzak/Konfigurazioa-ren bidez, baita igortzeen maiztasuna Ekintzak/ aitzinatua/Opzioak -en bidez.",
+    "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.": "Sartu den tresnaren ID-ak iduri du ez duela balio. 52 edo 56-ko ezaugarriko kadena baten itxura behar luke, hizkiak, zifrak eta baita ere tarte edo gioiez egina.",
+    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "Agingailu lerroaren lehen parametroa partekatzearen bidea da, eta bigarrena partekatzean den bide errelatiboa.",
+    "The folder ID cannot be blank.": "Partekatzearen ID-a ez da hutsa izaiten ahal",
+    "The folder ID must be unique.": "Partekatzearen ID-a bakarra izan behar da",
+    "The folder path cannot be blank.": "Partekatzeari buruzko bidea ez da hutsa izaiten ahal",
+    "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "Hunako tarteak erabiliak dira: lehen orduan bertsio bat kontserbatua da 30 segundu guziz. Lehen egunean, bertsio bat ordu bakoitz, lehen 30 egunetan bertsio bat egunero. Handik harat, adinaren mugetan egonez, bertsio bat astero.",
     "The following items could not be synchronized.": "Ondoko fitxero hauk ez dira sinkronizatuak ahal izan",
     "The maximum age must be a number and cannot be blank.": "Gehieneko adinak zenbaki bat behar du izan eta ez da hutsa izaiten ahal.",
     "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Bertsio baten kontserbatzeko epe haundiena (egunez behar du izan. Jar ezazu zerotan bertsioak betirako atxikitzeko)",
     "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "Diskoaren ehuneko espazioa hutsak zenbaki positibo bat behar du izan, 0 eta 100-en artekoa (100 barne)",
     "The number of days must be a number and cannot be blank.": "Egunen kopuruak numerikoa izan behar du eta ez da hutsa izaiten ahal",
-    "The number of days to keep files in the trash can. Zero means forever.": "Zikin ontziko elgar hizketen kontserbatzeko egun kopurua. Beti 0 erran nahi du.",
-    "The number of old versions to keep, per file.": "Atxikitzeko diren lehenagoko bertsio kopurua,fitxero bakotxarentzat",
-    "The number of versions must be a number and cannot be blank.": "Bertsio kopuruak numerikoa behar du izan eta ez da hutsa izaiten ahal",
+    "The number of days to keep files in the trash can. Zero means forever.": "Zikin ontzian elgar hizketak kontserbatzeko egun kopurua. Zerok \"betirako\" erran nahi du.",
+    "The number of old versions to keep, per file.": "Atxikitzeko diren lehenagoko bertsioen kopurua, fitxero bakoitzarentzat",
+    "The number of versions must be a number and cannot be blank.": "Bertsioen kopuruak numerikoa behar du izan eta ez da hutsa izaiten ahal",
     "The path cannot be blank.": "Bidea ez da hutsa izaiten ahal",
-    "The rate limit must be a non-negative number (0: no limit)": "Ixuriaren neurria ez da negatiboa izaiten ahal (0 = mugarik gabekoa)",
-    "The rescan interval must be a non-negative number of seconds.": "Ikerketaren tartea ez da segundu kopuru negatiboa izaiten ahal",
-    "They are retried automatically and will be synced when the error is resolved.": "Akatsa zuzendua izanen delarik, automatikoki berriz entseatuak et sinkronizatuak izanen dira",
-    "This Device": "Makina hau",
-    "This can easily give hackers access to read and change any files on your computer.": "Hunek errexki irakurtzen eta aldatzen uzten ahal du zure ordenagailuko edozein fitxero, nahiz eta sartu denak ez haizu!",
+    "The rate limit must be a non-negative number (0: no limit)": "Ixuriaren emaria ez da negatiboa izaiten ahal (0 = mugarik gabekoa)",
+    "The rescan interval must be a non-negative number of seconds.": "Ikerketaren tartea ez da segundo kopuru negatiboa izaiten ahal",
+    "They are retried automatically and will be synced when the error is resolved.": "Errorea zuzendua izanen delarik, automatikoki berriz entseatuak et sinkronizatuak izanen dira",
+    "This Device": "Tresna hau",
+    "This can easily give hackers access to read and change any files on your computer.": "Hunek errexki irakurtzen eta aldatzen uzten ahal du zure ordenagailuko edozein fitxero, nahiz eta sartu denak ez haizu izan!",
     "This is a major version upgrade.": "Aktualizatze garrantzitsu bat da",
-    "This setting controls the free space required on the home (i.e., index database) disk.": "This setting controls the free space required on the home (i.e., index database) disk.",
-    "Time": "Denbora",
+    "This setting controls the free space required on the home (i.e., index database) disk.": "Behar den espazio kontrolatzen du egokitze honek, zure erabiltzale partekatzea geritzatzen duen diskoan (hori da, indexazio datu-basean)",
+    "Time": "Ordua",
     "Trash Can File Versioning": "Zakarrontzia",
     "Type": "Mota",
-    "Unknown": "Ez ezaguna",
-    "Unshared": "Partekatu ez den",
+    "Unknown": "Ezezaguna",
+    "Unshared": "Partekatua ez dena",
     "Unused": "Ez baliatua",
-    "Up to Date": "Egun",
-    "Updated": "Berritu",
+    "Up to Date": "Eguneratua",
+    "Updated": "Berritua",
     "Upgrade": "Aktualizatu",
-    "Upgrade To {%version%}": "Egunetaratzea {{version}}-i buruz",
+    "Upgrade To {%version%}": "Egunetaratu {{version}}-ari buruz",
     "Upgrading": "Syncthing-en egunetaratzea",
-    "Upload Rate": "Bidaltze emari",
-    "Uptime": "Denbora ibiltze",
-    "Usage reporting is always enabled for candidate releases.": "Usage reporting is always enabled for candidate releases.",
-    "Use HTTPS for GUI": "HTTPS-a erabil GUI-arentzat",
-    "Version": "Bertsio",
-    "Versions Path": "Bertsioen egon tokia",
-    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Bertsioak automatikoki ezeztatuak izanen dira, kontserbatzeko iraupen denbora pasatua badute edo bitartean onartua den kopurua gainditua balin bada",
-    "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "Warning, this path is a parent directory of an existing folder \"{{otherFolder}}\".",
-    "Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Warning, this path is a parent directory of an existing folder \"{{otherFolderLabel}}\" ({{otherFolder}}).",
-    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Kasu emazu, \"{{otherFolder}}\" banaketa azpi-karpetaren bidea da. Arazoak emaiten ahal ditu, fitxero batzuen ezeztatze edo duplikatzeak batez ere.",
-    "Warning, this path is a subdirectory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Kasu emazu, \"{{otherFolderLabel}}\" ({{otherFolder}}) banaketa azpi-karpetaren bidea da. Arazoak emaiten ahal ditu, fitxero batzuen ezeztatze edo duplikatzeak batez ere.",
+    "Upload Rate": "Igortze emaria",
+    "Uptime": "Erabiltze denbora",
+    "Usage reporting is always enabled for candidate releases.": "Erabiltze estatiskitak aintzin-bertsioetan beti igorriak dira",
+    "Use HTTPS for GUI": "HTTPS-a erabil ezazu GUI-arentzat",
+    "Version": "Bertsioa",
+    "Versions Path": "Bertsioen kokalekua",
+    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Bertsioak automatikoki ezeztatuak izanen dira, kontserbatzeko iraupen denbora pasatua badute edo bitartean onartua den kopurua (fitxategi bakoitzean) gainditua balin bada",
+    "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "Kasu, bide hau dagoen partekatze baten karpeta ahaidea da  (adibidez, \"{{otherFolder}}\"). Segitzen baduzu, azpi-karpeta berri bat sortu behar duzu, bestenaz arazoak sortzen ahal dira, fitxategi  kentzeak edo doblatzeak.",
+    "Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Kasu, bide hau dagoen partekatze baten karpeta ahaidea da  (adibidez, \"{{otherFolderLabel}}\" ({{otherFolder}}). ",
+    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Kasu, bide hau \"{{otherFolder}}\" partekatzearen azpi-karpeta da. Arazoak emaiten ahal ditu, fitxategi kentzeak edo doblatzeak, adibidez.",
+    "Warning, this path is a subdirectory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Kasu, bide hau \"{{otherFolderLabel}}\" ({{otherFolder}}) partekatzearen azpi-karpeta da. Arazoak emaiten ahal ditu, fitxategi kentzeak edo doblatzeak, adibidez.",
     "When adding a new device, keep in mind that this device must be added on the other side too.": "Tresna bat gehitzen duzularik, gogoan atxik ezazu zurea bestaldean gehitu behar dela ere",
-    "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.": "Tresna bat gehitzen delarik, gogoan atxik ezazu bere IDa erabilia dela errepertorioak lotzeko tresnen bitartez. ID-a hautskorra da eta banatze huntan parte hartzen duten tresna guzietan berdina izanen da",
+    "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.": "Partekatze bat gehitzen delarik, gogoan atxik ezazu bere IDa erabilia dela errepertorioak lotzeko tresnen bitartez. ID-a hautskorra da eta partekatze hontan parte hartzen duten tresna guzietan berdina izan behar du.",
     "Yes": "Bai",
-    "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.": "Zure hautua aldatzen ahal duzu \"Konfigurazio\" leihatilan",
+    "You can read more about the two release channels at the link below.": "Bi banaketa kanal hauen bidez gehiago jakin dezakezu, lokarri honen bidez ",
     "You must keep at least one version.": "Bertsio bat bederen behar duzu atxiki",
     "days": "Egunak",
-    "directories": "karpetak",
-    "files": "fitxategik",
+    "directories": "Karpetak",
+    "files": "Fitxategiak",
     "full documentation": "Dokumentazio osoa",
     "items": "Elementuak",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} banaketa \"{{folder}}\" gomitatzen zaitu.",
-    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}}  \"{{folderlabel}}\" ({{folder}}) gomitatzen zaitu."
+    "{%device%} wants to share folder \"{%folder%}\".": "{{device}}k \"{{folder}}\" partekatze hontan gomitatzen zaitu.",
+    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}}k  \"{{folderlabel}}\" ({{folder}}) hontan gomitatzen zaitu."
 }

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

@@ -158,6 +158,8 @@
     "Please consult the release notes before performing a major upgrade.": "Tutustu julkaisutietoihin ennen kuin teet pääversion päivityksen.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Ole hyvä ja aseta käyttäjätunnus ja salasana käyttöliittymää varten asetusvalikossa.",
     "Please wait": "Ole hyvä ja odota",
+    "Prefix indicating that the file can be deleted if preventing directory removal": "Prefix indicating that the file can be deleted if preventing directory removal",
+    "Prefix indicating that the pattern should be matched without case sensitivity": "Prefix indicating that the pattern should be matched without case sensitivity",
     "Preview": "Esikatselu",
     "Preview Usage Report": "Esikatsele käyttöraportti",
     "Quick guide to supported patterns": "Tuettujen lausekkeiden pikaohje",

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

@@ -158,6 +158,8 @@
     "Please consult the release notes before performing a major upgrade.": "Veuillez consulter les notes de version avant de réaliser une mise à jour majeure.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Veuillez définir un nom d'utilisateur et un mot de passe dans les réglages.",
     "Please wait": "Merci de patienter",
+    "Prefix indicating that the file can be deleted if preventing directory removal": "Prefix indicating that the file can be deleted if preventing directory removal",
+    "Prefix indicating that the pattern should be matched without case sensitivity": "Prefix indicating that the pattern should be matched without case sensitivity",
     "Preview": "Aperçu",
     "Preview Usage Report": "Aperçu du rapport de statistiques d'utilisation",
     "Quick guide to supported patterns": "Guide rapide des masques compatibles ci-dessous",

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

@@ -10,7 +10,7 @@
     "Add Device": "Ajouter l'appareil",
     "Add Folder": "Ajouter un partage",
     "Add Remote Device": "Ajouter un appareil",
-    "Add devices from the introducer to our device list, for mutually shared folders.": "Lui permettre d'ajouter et enlever des membres à toutes mes listes de membres de partages dont il fait partie (ceci permet de créer toutes les liaisons point à point possibles en complétant mes listes par les siennes, meilleur débit de réception par cumul des débits d'envoi, indépendance vis à vis de l'introducteur, etc).",
+    "Add devices from the introducer to our device list, for mutually shared folders.": "Lui permettre d'ajouter et enlever des membres à toutes mes listes de membres des partages dont il fait (ou fera !) partie (ceci permet de créer toutes les liaisons point à point possibles en complétant mes listes par les siennes, meilleur débit de réception par cumul des débits d'envoi, indépendance vis à vis de l'introducteur, etc).",
     "Add new folder?": "Ajouter ce partage ?",
     "Address": "Adresse",
     "Addresses": "Adresses",
@@ -24,7 +24,7 @@
     "An external command handles the versioning. It has to remove the file from the shared folder.": "Une commande externe gère les versions de fichiers. Il lui incombe de supprimer les fichiers dans le répertoire synchronisé.",
     "An external command handles the versioning. It has to remove the file from the 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.": "Lui permettre d'ajouter et enlever des membres à toutes mes listes de membres de partages dont il fait partie (ceci permet de créer toutes les liaisons point à point possibles en complétant mes listes par les siennes, meilleur débit de réception par cumul des débits d'envoi, indépendance vis à vis de l'introducteur, etc).",
+    "Any devices configured on an introducer device will be added to this device as well.": "Lui permettre d'ajouter et enlever des membres à toutes mes listes de membres des partages dont il fait (ou fera !) partie (ceci permet de créer toutes les liaisons point à point possibles en complétant mes listes par les siennes, meilleur débit de réception par cumul des débits d'envoi, indépendance vis à vis de l'introducteur, etc).",
     "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 !",
@@ -37,7 +37,7 @@
     "Command": "Commande",
     "Comment, when used at the start of a line": "Commentaire lorsque utilisé en début de ligne",
     "Compression": "Compression",
-    "Configured": "Configuré",
+    "Configured": "Configurée",
     "Connection Error": "Erreur de connexion",
     "Connection Type": "Type de connexion",
     "Copied from elsewhere": "Copié d'ailleurs",
@@ -158,6 +158,8 @@
     "Please consult the release notes before performing a major upgrade.": "Veuillez consulter les notes de version avant de réaliser une mise à jour majeure.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Veuillez définir un nom d'utilisateur et un mot de passe dans la fenêtre de Configuration.",
     "Please wait": "Merci de patienter",
+    "Prefix indicating that the file can be deleted if preventing directory removal": "Ce préfixe autorise la suppression des fichiers pour permettre la suppression de répertoires.",
+    "Prefix indicating that the pattern should be matched without case sensitivity": "Ce préfixe, inutile sur Windows et Mac OS, indique que le masque d'exclusion est insensible à la casse.",
     "Preview": "Aperçu",
     "Preview Usage Report": "Aperçu du rapport de statistiques d'utilisation",
     "Quick guide to supported patterns": "Guide rapide des masques compatibles ci-dessous",
@@ -182,13 +184,13 @@
     "Scan Time Remaining": "Temps d'analyse restant",
     "Scanning": "Analyse en cours",
     "Select the devices to share this folder with.": "Synchroniser avec :",
-    "Select the folders to share with this device.": "Sélectionner les partages auxquels participe cet appareil.",
+    "Select the folders to share with this device.": "Sélectionner les partages auxquels cet appareil doit participer :",
     "Send & Receive": "Envoi & réception",
     "Send Only": "Envoi (lecture seule)",
     "Settings": "Configuration",
     "Share": "Partager",
     "Share Folder": "Partager",
-    "Share Folders With Device": "Partages avec cet appareil",
+    "Share Folders With Device": "Participe à ces partages",
     "Share With Devices": "Synchroniser avec des appareils",
     "Share this folder?": "Acceptez-vous ce partage ?",
     "Shared With": "Synchronisé avec",
@@ -264,7 +266,7 @@
     "Version": "Version",
     "Versions Path": "Emplacement des versions",
     "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Les plus anciennes versions seront supprimées automatiquement quand elles dépassent la durée maximum de conservation ou si leur nombre (par fichier) est supérieur à la limite prédéfinie pour l'intervalle.",
-    "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "Attention, ce chemin est un répertoire parent d'au moins un partage existant (par exemple \"{{otherFolder}}\"). Si vous continuez, vous devriez créer un nouveau sous-répertoire, sinon ceci peut causer des problèmes tels que duplications et/ou suppressions intempestives de fichiers.",
+    "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "Attention, ce chemin est un répertoire parent d'au moins un partage existant (par exemple \"{{otherFolder}}\"). Si c'est bien ce que vous souhaitez, vous devriez créer un nouveau sous-répertoire, sinon ceci peut causer des problèmes tels que duplications et/ou suppressions intempestives de fichiers.",
     "Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Attention, ce chemin est un répertoire parent d'au moins un partage existant (par exemple \"{{otherFolderLabel}}\" ({{otherFolder}})). Si vous continuez, vous devriez créer un nouveau sous-répertoire, sinon ceci peut causer des problèmes tels que duplications et/ou suppressions intempestives de fichiers.",
     "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "ATTENTION, ce chemin est un sous-répertoire du partage existant \"{{otherFolder}}\". Ceci peut causer des problèmes tels que duplications et/ou suppressions intempestives de fichiers.",
     "Warning, this path is a subdirectory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "ATTENTION, ce chemin est un sous-répertoire du partage existant \"{{otherFolderLabel}}\" ({{otherFolder}}). Ceci peut causer des problèmes tels que duplications et/ou suppressions intempestives de fichiers.",

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

@@ -69,13 +69,13 @@
     "Enable NAT traversal": "NAT-trochkruse ynskeakelje",
     "Enable Relaying": "Trochjaan tastean",
     "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Fier in net-negatyf nûmer yn (bygelyks \"2.35\") en selektearje in ienheid. Percentages stean foar it part fan de totale skiifromte.",
-    "Enter a non-privileged port number (1024 - 65535).": "Enter a non-privileged port number (1024 - 65535).",
+    "Enter a non-privileged port number (1024 - 65535).": "Fier in net-befoarrjochte poart-nûmer yn (1024 - 65535).",
     "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Fier troch komma's skieden (\"tcp://ip:port\", \"tcp://host:port\") adressen yn of \"dynamic\" om automatyske ûntdekking fan it adres út te fieren.",
     "Enter ignore patterns, one per line.": "Fier negearpatroanen yn, ien per rigel.",
     "Error": "Flater",
     "External File Versioning": "Ekstern ferzjebehear foar triemen",
     "Failed Items": "Mislearre items",
-    "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Konneksje mei IPv6-tsjinners wol lykwols net slagje sûnder IPv6-ferbining is.",
+    "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": " Mislearjen fan it ferbinen mei IPv6-tsjinners wurd ferwachte as der gjin stipe foar IPv6-ferbinings is.",
     "File Pull Order": "Triemlûkfolchoarder",
     "File Versioning": "Triemferzjebehear",
     "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Bits foar triemrjochten wurde negearre yn it sykjen foar feroarings. Brûk dit op FAT-triemsystemen.",
@@ -93,7 +93,7 @@
     "GUI": "GUI",
     "GUI Authentication Password": "Wachtwurd foar ferifikaasje yn GUI",
     "GUI Authentication User": "Brûkers-ID foar ferifikaasje yn GUI",
-    "GUI Listen Address": "GUI Listen Address",
+    "GUI Listen Address": "GUI-harkadres",
     "GUI Listen Addresses": "Harkadres foar GUI",
     "GUI Theme": "Ynterfaasjetema",
     "Generate": "Generearje",
@@ -158,6 +158,8 @@
     "Please consult the release notes before performing a major upgrade.": "Foardat jo in wichtige fernijing ynstallearre, graach earst de fernijingsoantekenings lêze.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Graach foar GUI-ferifikaasje in brûkers-ID en wachtwurd ynstelle yn it ynstellingsdialooch.",
     "Please wait": "In amerijke",
+    "Prefix indicating that the file can be deleted if preventing directory removal": "Prefiks dy't oanjout dat de triem fourtsmiten wurde kin wannear dit it ferwiderjen belet.",
+    "Prefix indicating that the pattern should be matched without case sensitivity": "Prefiks dy't oanjout dat fergelykings mei it patroans net haadlettergefoelich wêze sille.",
     "Preview": "Foarbyld",
     "Preview Usage Report": "Foarbyld fan brûkensrapport ",
     "Quick guide to supported patterns": "Fluch-paadwizer foar stipe patroanen",

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

@@ -158,6 +158,8 @@
     "Please consult the release notes before performing a major upgrade.": "Nagyobb frissítés előtt ellenőrizni kell a kiadási megjegyzéseket.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Be kell állítani a grafikus felület felhasználónevét és jelszavát a Beállítások párbeszédablakban.",
     "Please wait": "Türelem",
+    "Prefix indicating that the file can be deleted if preventing directory removal": "Prefix indicating that the file can be deleted if preventing directory removal",
+    "Prefix indicating that the pattern should be matched without case sensitivity": "Prefix indicating that the pattern should be matched without case sensitivity",
     "Preview": "Előnézet",
     "Preview Usage Report": "Használati jelentés áttekintése",
     "Quick guide to supported patterns": "Rövid útmutató a használható mintákról",

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

@@ -158,6 +158,8 @@
     "Please consult the release notes before performing a major upgrade.": "Please consult the release notes before performing a major upgrade.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Please set a GUI Authentication User and Password in the Settings dialog.",
     "Please wait": "Please wait",
+    "Prefix indicating that the file can be deleted if preventing directory removal": "Prefix indicating that the file can be deleted if preventing directory removal",
+    "Prefix indicating that the pattern should be matched without case sensitivity": "Prefix indicating that the pattern should be matched without case sensitivity",
     "Preview": "Preview",
     "Preview Usage Report": "Preview Usage Report",
     "Quick guide to supported patterns": "Quick guide to supported patterns",

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

@@ -69,7 +69,7 @@
     "Enable NAT traversal": "Abilita NAT traversal",
     "Enable Relaying": "Abilita Reindirizzamento",
     "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Inserisci un numero non negativo (ad esempio \"2.35\") e seleziona un'unità. Le percentuali sono parte della dimensione totale del disco.",
-    "Enter a non-privileged port number (1024 - 65535).": "Enter a non-privileged port number (1024 - 65535).",
+    "Enter a non-privileged port number (1024 - 65535).": "Inserisci un numero di porta non-privilegiata (1024 - 65535).",
     "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Inserisci indirizzi separati da virgola (\"tcp://ip:porta\", \"tcp://host:porta\")  oppure \"dynamic\" per effettuare il rilevamento automatico dell'indirizzo.",
     "Enter ignore patterns, one per line.": "Inserisci gli schemi di esclusione, uno per riga.",
     "Error": "Errore",
@@ -93,7 +93,7 @@
     "GUI": "Interfaccia Grafica Utente",
     "GUI Authentication Password": "Password dell'Interfaccia Grafica",
     "GUI Authentication User": "Utente dell'Interfaccia Grafica",
-    "GUI Listen Address": "GUI Listen Address",
+    "GUI Listen Address": "Indirizzo dell'Interfaccia Grafica",
     "GUI Listen Addresses": "Indirizzi dell'Interfaccia Grafica",
     "GUI Theme": "Tema GUI",
     "Generate": "Genera",
@@ -158,6 +158,8 @@
     "Please consult the release notes before performing a major upgrade.": "Si prega di consultare le note di rilascio prima di eseguire un aggiornamento principale.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Per favore impostare Utente e Password dell'Interfaccia Grafica nelle Impostazioni.",
     "Please wait": "Attendere prego",
+    "Prefix indicating that the file can be deleted if preventing directory removal": "Prefisso che indica che il file può essere eliminato se impedisce la rimozione della cartella",
+    "Prefix indicating that the pattern should be matched without case sensitivity": "Prefisso che indica che lo schema deve essere abbinato senza tener conto delle maiuscole",
     "Preview": "Anteprima",
     "Preview Usage Report": "Anteprima Statistiche di Utilizzo",
     "Quick guide to supported patterns": "Guida veloce agli schemi supportati",

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

@@ -158,6 +158,8 @@
     "Please consult the release notes before performing a major upgrade.": "メジャーアップグレードを行う前にリリースノートを参照してください。",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "設定ダイアログから、GUI認証ユーザー名とパスワードを設定してください。",
     "Please wait": "お待ちください",
+    "Prefix indicating that the file can be deleted if preventing directory removal": "このファイルが中に残っているためにディレクトリを削除できない場合、このファイルごと消してもよいことを示す接頭辞",
+    "Prefix indicating that the pattern should be matched without case sensitivity": "大文字・小文字を同一視してマッチさせる接頭辞",
     "Preview": "プレビュー",
     "Preview Usage Report": "利用状況レポートのプレビュー",
     "Quick guide to supported patterns": "サポートされているパターンの簡易ガイド",

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

@@ -158,12 +158,14 @@
     "Please consult the release notes before performing a major upgrade.": "메이저 업데이트를 하기 전에 먼저 릴리즈 노트를 살펴보세요.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "설정에서 GUI 인증용 User와 암호를 입력해주세요.",
     "Please wait": "기다려 주십시오",
+    "Prefix indicating that the file can be deleted if preventing directory removal": "디렉토리 제거를 방지 할 경우 파일을 삭제할 수 있음을 나타내는 접두사",
+    "Prefix indicating that the pattern should be matched without case sensitivity": "대소 문자를 구분하지 않고 패턴을 일치시켜야 함을 나타내는 접두사",
     "Preview": "미리보기",
     "Preview Usage Report": "사용 보고서 미리보기",
     "Quick guide to supported patterns": "지원하는 패턴에 대한 빠른 도움말",
     "RAM Utilization": "RAM 사용량",
     "Random": "무작위",
-    "Reduced by ignore patterns": "Reduced by ignore patterns",
+    "Reduced by ignore patterns": "무시 패턴으로 축소",
     "Release Notes": "릴리즈 노트",
     "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "출시 후보는 최신 기능과 버그 픽스를 포함 하고 있습니다. 이 버전은 예전 방식인 2주 주기 Syncthing 출시와 비슷합니다.",
     "Remote Devices": "원격 기기",

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

@@ -158,6 +158,8 @@
     "Please consult the release notes before performing a major upgrade.": "Peržvelkite laidos informaciją prieš atlikdami stambų atnaujinimą.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Prašome nustatymų dialoge nustatyti valdymo skydelio vartotojo vardą ir slaptažodį.",
     "Please wait": "Prašome palaukti",
+    "Prefix indicating that the file can be deleted if preventing directory removal": "Priešdelis, nurodantis, kad failas gali būti ištrintas tuo atveju, jei neleidžia šalinti katalogo",
+    "Prefix indicating that the pattern should be matched without case sensitivity": "Priešdelis, nurodantis, kad šablonas turėtų būti atitiktas neskiriant raidžių dydžio",
     "Preview": "Peržiūra",
     "Preview Usage Report": "Naudojimo ataskaitos peržiūra",
     "Quick guide to supported patterns": "Trumpas leistinų šablonų vadovas",

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

@@ -158,6 +158,8 @@
     "Please consult the release notes before performing a major upgrade.": "Sjekk utgivelsesnotatene før en storoppgradering utføres.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Vennligst angi bruker og passord for GUI-autentisering i innstillingsvinduet.",
     "Please wait": "Vent",
+    "Prefix indicating that the file can be deleted if preventing directory removal": "Prefix indicating that the file can be deleted if preventing directory removal",
+    "Prefix indicating that the pattern should be matched without case sensitivity": "Prefix indicating that the pattern should be matched without case sensitivity",
     "Preview": "Forhåndsvisning",
     "Preview Usage Report": "Forhåndsvisning av datainnsamling",
     "Quick guide to supported patterns": "Kjapp innføring i godkjente mønster",
@@ -268,7 +270,7 @@
     "Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Advarsel, denne stien er en foreldremappe for en eksisterende mappe \"{{otherFolderLabel}}\" ({{otherFolder}}).",
     "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Advarsel, denne stien er en undermappe i en eksisterende mappe \"{{otherFolder}}\".",
     "Warning, this path is a subdirectory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Advarsel, denne stien er en undermappe for en eksisterende mappe \"{{otherFolderLabel}}\" ({{otherFolder}}).",
-    "When adding a new device, keep in mind that this device must be added on the other side too.": "Merk at når en ny enhet blir lagt til må denne også legges til på andre siden.",
+    "When adding a new device, keep in mind that this device must be added on the other side too.": "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.": "Når en ny mappe blir lagt til, husk at Mappe-ID blir brukt til å binde sammen mapper mellom enheter. Det er forskjell på store og små bokstaver, så IDene må være identiske på alle enhetene.",
     "Yes": "Ja",
     "You can change your choice at any time in the Settings dialog.": "Du kan endre ditt valg når som helst i innstillingene.",

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

@@ -93,7 +93,7 @@
     "GUI": "GUI",
     "GUI Authentication Password": "GUI-wachtwoord",
     "GUI Authentication User": "GUI-gebruikersnaam",
-    "GUI Listen Address": "GUI Listen Address",
+    "GUI Listen Address": "GUI-luisteradres",
     "GUI Listen Addresses": "GUI-adres",
     "GUI Theme": "GUI-thema",
     "Generate": "Genereer",
@@ -158,6 +158,8 @@
     "Please consult the release notes before performing a major upgrade.": "Lees eerst de release notes voordat u een grote update uitvoert.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Stel een gebruikersnaam en wachtwoord in bij 'Instellingen'.",
     "Please wait": "Even geduld",
+    "Prefix indicating that the file can be deleted if preventing directory removal": "Prefix indicating that the file can be deleted if preventing directory removal",
+    "Prefix indicating that the pattern should be matched without case sensitivity": "Prefix indicating that the pattern should be matched without case sensitivity",
     "Preview": "Preview",
     "Preview Usage Report": "Preview gebruiksstatistieken",
     "Quick guide to supported patterns": "Snelgids voor ondersteunde patronen",

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

@@ -158,6 +158,8 @@
     "Please consult the release notes before performing a major upgrade.": "Sjå utgjevingsmerknadene før ei hovudoppgradering vert utført.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Ver vennleg å laga ein GUI-brukar og eit passord i Innstillingar-dialogen.",
     "Please wait": "Gjer vel og vent",
+    "Prefix indicating that the file can be deleted if preventing directory removal": "Prefix indicating that the file can be deleted if preventing directory removal",
+    "Prefix indicating that the pattern should be matched without case sensitivity": "Prefix indicating that the pattern should be matched without case sensitivity",
     "Preview": "Førehandsvisning",
     "Preview Usage Report": "Førehandsvis bruksrapporten",
     "Quick guide to supported patterns": "Kjapp innføring i godkjente mønster",

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

@@ -108,7 +108,7 @@
     "Ignore Permissions": "Ignoruj uprawnienia",
     "Incoming Rate Limit (KiB/s)": "Ograniczenie prędkości odbierania (KiB/s)",
     "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Niepoprawna konfiguracja może uszkodzić zawartośc Twojego folderu i uczynić Syncthing niedziałającym.",
-    "Introduced By": "Wprowadzony Przez",
+    "Introduced By": "Wprowadzony przez",
     "Introducer": "Wprowadzający",
     "Inversion of the given condition (i.e. do not exclude)": "Odwrócenie podanego wzorca (np. nie wykluczaj)",
     "Keep Versions": "Zachowuj wersje",
@@ -136,7 +136,7 @@
     "Newest First": "Najnowsze na początku",
     "No": "Nie",
     "No File Versioning": "Bez wersjonowania pliku",
-    "No upgrades": "Bez aktualizacji",
+    "No upgrades": "Brak aktualizacji",
     "Normal": "Zwykły",
     "Notice": "Wskazówka",
     "OK": "OK",
@@ -158,6 +158,8 @@
     "Please consult the release notes before performing a major upgrade.": "Zaleca się przeanalizowanie \"release notes\" przed przeprowadzeniem znaczącej aktualizacji.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Ustaw proszę użytkownika i hasło dostępowe do GUI w Ustawieniach",
     "Please wait": "Proszę czekać",
+    "Prefix indicating that the file can be deleted if preventing directory removal": "Prefix indicating that the file can be deleted if preventing directory removal",
+    "Prefix indicating that the pattern should be matched without case sensitivity": "Prefix indicating that the pattern should be matched without case sensitivity",
     "Preview": "Podgląd",
     "Preview Usage Report": "Podgląd raportu użycia.",
     "Quick guide to supported patterns": "Krótki przewodnik po obsługiwanych wzorcach",

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

@@ -158,6 +158,8 @@
     "Please consult the release notes before performing a major upgrade.": "Por favor, consulte as notas de lançamento antes de atualizar para uma versão \"major\".",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Por favor, defina um nome de usuário e senha para acesso à interface web, nas configurações.",
     "Please wait": "Aguarde",
+    "Prefix indicating that the file can be deleted if preventing directory removal": "Prefix indicating that the file can be deleted if preventing directory removal",
+    "Prefix indicating that the pattern should be matched without case sensitivity": "Prefix indicating that the pattern should be matched without case sensitivity",
     "Preview": "Visualizar",
     "Preview Usage Report": "Visualizar relatório de uso",
     "Quick guide to supported patterns": "Guia rápido dos padrões suportados",

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

@@ -1,5 +1,5 @@
 {
-    "A device with that ID is already added.": "Já foi adicionado um dispositivo com esse ID anteriormente.",
+    "A device with that ID is already added.": "Já foi adicionado um dispositivo com esse ID anteriormente.lavelwildcard\n",
     "A negative number of days doesn't make sense.": "Um número negativo de dias não faz sentido.",
     "A new major version may not be compatible with previous versions.": "Uma nova versão principal pode não ser compatível com versões anteriores.",
     "API Key": "Chave da API",
@@ -158,6 +158,8 @@
     "Please consult the release notes before performing a major upgrade.": "Consulte as notas de lançamento antes de fazer uma actualização importante.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Por favor, defina um utilizador e senha de autenticação para a interface gráfica, nas configurações.",
     "Please wait": "Aguarde",
+    "Prefix indicating that the file can be deleted if preventing directory removal": "Prefixo para indicar que o ficheiro pode ser eliminado se estiver a impedir a eliminação da pasta",
+    "Prefix indicating that the pattern should be matched without case sensitivity": "Prefixo para indicar que o padrão não diferencia entre maiúsculas e minúsculas",
     "Preview": "Previsão",
     "Preview Usage Report": "Pré-visualizar relatório de utilização",
     "Quick guide to supported patterns": "Guia rápido dos padrões suportados",

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

@@ -158,6 +158,8 @@
     "Please consult the release notes before performing a major upgrade.": "Перед проведением обновления основной версии ознакомтесь, пожалуйста, с Замечаниями к версии",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Установите имя пользователя и пароль для интерфейса в настройках",
     "Please wait": "Пожалуйста, подождите",
+    "Prefix indicating that the file can be deleted if preventing directory removal": "Prefix indicating that the file can be deleted if preventing directory removal",
+    "Prefix indicating that the pattern should be matched without case sensitivity": "Prefix indicating that the pattern should be matched without case sensitivity",
     "Preview": "Предварительный просмотр",
     "Preview Usage Report": "Посмотреть отчёт об использовании",
     "Quick guide to supported patterns": "Краткое руководство по поддерживаемым шаблонам",

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

@@ -18,7 +18,7 @@
     "Advanced Configuration": "Pokročilá konfigurácia",
     "Advanced settings": "Pokročilé nastavenia",
     "All Data": "Všetky dáta",
-    "Allow Anonymous Usage Reporting?": "Povoliť anoynmné hlásenie o použivaní?",
+    "Allow Anonymous Usage Reporting?": "Povoliť anoynmné hlásenia o použivaní?",
     "Allowed Networks": "Povolené siete",
     "Alphabetic": "Abecedne",
     "An external command handles the versioning. It has to remove the file from the shared folder.": "Externý príkaz obstaráva verzie. Musí odstrániť ",
@@ -28,11 +28,11 @@
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "Automatická aktualizácia teraz ponúka voľbu medzi stabilnými vydaniami a kandidátmi na vydanie.",
     "Automatic upgrades": "Automatické aktualizácie",
     "Be careful!": "Buď opatrný!",
-    "Bugs": "Cyhby",
+    "Bugs": "Chyby",
     "CPU Utilization": "Využitie CPU",
     "Changelog": "Záznam zmien",
     "Clean out after": "Vyčistenie po",
-    "Click to see discovery failures": "Klikni pre zobrazenie zlyhaní objavovania.",
+    "Click to see discovery failures": "Kliknite pre zobrazenie zlyhaní zisťovania.",
     "Close": "Zatvoriť",
     "Command": "Príkaz",
     "Comment, when used at the start of a line": "Komentár, keď použité na začiatku riadku",
@@ -44,7 +44,7 @@
     "Copied from original": "Skopírované z originálu",
     "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 následujúci prispivatelia:",
     "Copyright © 2014-2017 the following Contributors:": "Copyright © 2014-2017 následujúci prispivatelia:",
-    "Creating ignore patterns, overwriting an existing file at {%path%}.": "Creating ignore patterns, overwriting an existing file at {{path}}.",
+    "Creating ignore patterns, overwriting an existing file at {%path%}.": "Vytváranie vzorov ignorovania, prepísanie existujúceho súboru v {{path}}.",
     "Danger!": "Pozor!",
     "Deleted": "Zmazané",
     "Device": "Zariadenie",
@@ -54,9 +54,9 @@
     "Device Name": "Názov zariadenia",
     "Devices": "Zariadenia",
     "Disconnected": "Odpojené",
-    "Discovered": "Objavené",
-    "Discovery": "Objavenie",
-    "Discovery Failures": "Zlyhania objavovania",
+    "Discovered": "Zistené",
+    "Discovery": "Zisťovanie",
+    "Discovery Failures": "Zlyhania zisťovania",
     "Documentation": "Dokumentácia",
     "Download Rate": "Rýchlosť sťahovania",
     "Downloaded": "Stiahnuté",
@@ -69,7 +69,7 @@
     "Enable NAT traversal": "Povoliť priechod NAT",
     "Enable Relaying": "Povoliť prenosové uzly",
     "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Vložte kladné číslo (napr. \"2,35\") a zvoľte jednotku. Percentá sa zobrazujú ako časť celkovej veľkosti disku.",
-    "Enter a non-privileged port number (1024 - 65535).": "Enter a non-privileged port number (1024 - 65535).",
+    "Enter a non-privileged port number (1024 - 65535).": "Vložte číslo neprivilegovaného portu (1024-65535).",
     "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Zadaj čiarkou oddelené  (\"tcp://ip:port\", \"tcp://host:port\") adresy alebo \"dynamic\" na automatické zistenie adresy.",
     "Enter ignore patterns, one per line.": "Zadaj ignorované vzory, jeden na riadok.",
     "Error": "Chyba",
@@ -93,14 +93,14 @@
     "GUI": "GUI",
     "GUI Authentication Password": "Prihlasovacie heslo do GUI",
     "GUI Authentication User": "Prihlasovacie meno do GUI",
-    "GUI Listen Address": "GUI Listen Address",
+    "GUI Listen Address": "Adresa pre prístup do GUI",
     "GUI Listen Addresses": "Adresa pre prístup do GUI",
     "GUI Theme": "Grafická téma GUI",
     "Generate": "Generovať",
     "Global Changes": "Globálne zmeny",
-    "Global Discovery": "Globálne hľadanie",
-    "Global Discovery Servers": "Global Discovery Servers",
-    "Global State": "Global State",
+    "Global Discovery": "Globálne vyhľadávanie",
+    "Global Discovery Servers": "Globálne zisťovacie servery",
+    "Global State": "Globálny status",
     "Help": "Pomoc",
     "Home page": "Domovská stránka",
     "Ignore": "Ignorovať",
@@ -158,6 +158,8 @@
     "Please consult the release notes before performing a major upgrade.": "Pred spustením hlavnej aktualizácie si prosím prečítajte poznámky k vydaniu.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Zadajte prosím prihlasovanie meno a heslo v dialógovom okne nastavení.",
     "Please wait": "Prosím čakajte",
+    "Prefix indicating that the file can be deleted if preventing directory removal": "Prefix označujúci, že súbor môže byť odstránený, ak bráni odstráneniu adresára.",
+    "Prefix indicating that the pattern should be matched without case sensitivity": "Prefix označujúci, že vzory by mali ignorovať veľkosť písma.",
     "Preview": "Náhľad",
     "Preview Usage Report": "Náhľad záznamu o používaní",
     "Quick guide to supported patterns": "Rýchly sprievodca podporovanými vzormi",
@@ -165,7 +167,7 @@
     "Random": "Náhodne",
     "Reduced by ignore patterns": "Znížené o ignorované vzory",
     "Release Notes": "Poznámky k vydaniu",
-    "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 vydanie obsahujú najnovšie vlastnosti a opravy. Sú podobné tradičným dvojtýždenným vydaniam programu Syncthing.",
     "Remote Devices": "Vzdialené zariadenia",
     "Remove": "Odstrániť",
     "Required identifier for the folder. Must be the same on all cluster devices.": "Potrebný identifikátor pre adresár. Musí byť rovnaký na všetkých zariadeniach v skupine.",
@@ -186,99 +188,99 @@
     "Send & Receive": "Prijímať a odosielať",
     "Send Only": "Iba odosielať",
     "Settings": "Nastavenia",
-    "Share": "Share",
-    "Share Folder": "Share Folder",
-    "Share Folders With Device": "Share Folders With Device",
-    "Share With Devices": "Share With Devices",
-    "Share this folder?": "Share this folder?",
-    "Shared With": "Shared With",
-    "Show ID": "Show ID",
-    "Show QR": "Show QR",
-    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.",
-    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.",
+    "Share": "Zdieľať",
+    "Share Folder": "Zdieľať adresár",
+    "Share Folders With Device": "Zdieľať adresáre so zariadením",
+    "Share With Devices": "Zdieľať so zariadeniami",
+    "Share this folder?": "Zdieľať tento adresár?",
+    "Shared With": "Zdieľané s",
+    "Show ID": "Zobraziť ID",
+    "Show QR": "Zobraziť QR",
+    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Zobrazované namiesto ID zariadenia v štatúte klastra. Toto pomenovanie bude oznamovať ostatným zariadeniam ako voliteľné predvolené pomenovanie.",
+    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Zobrazované namiesto ID zariadenia v klastri. Ak je ponechané prázdne, bude nahradené pomenovaním, ktoré oznamuje zariadenie.",
     "Shutdown": "Vypnutie",
-    "Shutdown Complete": "Shutdown Complete",
+    "Shutdown Complete": "Vypnutie ukončené",
     "Simple File Versioning": "Jednoduché verzie súborov",
     "Single level wildcard (matches within a directory only)": "Single level wildcard (matches within a directory only)",
-    "Smallest First": "Smallest First",
-    "Source Code": "Source Code",
-    "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",
+    "Smallest First": "Najmenší najprv",
+    "Source Code": "Zdrojový kód",
+    "Stable releases and release candidates": "Stabilné verzie a kandidáti na vydanie",
+    "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "Stabilné vydania sú odložené asi o dva týždne. Počas tejto doby prechádzajú testovaním ako kandidáti na vydanie.",
+    "Stable releases only": "Iba stabilné verzie",
     "Staggered File Versioning": "Rozložené verzie súborov",
-    "Start Browser": "Start Browser",
-    "Statistics": "Statistics",
-    "Stopped": "Stopped",
-    "Support": "Support",
-    "Sync Protocol Listen Addresses": "Sync Protocol Listen Addresses",
-    "Syncing": "Syncing",
-    "Syncthing has been shut down.": "Syncthing has been shut down.",
-    "Syncthing includes the following software or portions thereof:": "Syncthing includes the following software or portions thereof:",
-    "Syncthing is restarting.": "Syncthing is restarting.",
-    "Syncthing is upgrading.": "Syncthing is upgrading.",
-    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…",
+    "Start Browser": "Spusti prehliadač",
+    "Statistics": "Štatistika",
+    "Stopped": "Zastavené",
+    "Support": "Podpora",
+    "Sync Protocol Listen Addresses": "Adresa načúvania synchronizačného protokolu",
+    "Syncing": "Synchronizácia",
+    "Syncthing has been shut down.": "Syncthing bol vypnutý.",
+    "Syncthing includes the following software or portions thereof:": "Syncthing obsahuje nasledujúci software nebo jeho časti:",
+    "Syncthing is restarting.": "Syncthing sa reštartuje.",
+    "Syncthing is upgrading.": "Syncthing sa aktualizuje.",
+    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing se zdá byť nefunkčný, alebo je problém s internetovým pripojením. Opakujem...",
     "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.",
     "The Syncthing admin interface is configured to allow remote access without a password.": "The Syncthing admin interface is configured to allow remote access without a password.",
-    "The aggregated statistics are publicly available at the URL below.": "The aggregated statistics are publicly available at the URL below.",
+    "The aggregated statistics are publicly available at the URL below.": "Súhrnné štatistiky sú verejne dostupné na uvedenej URL.",
     "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.",
-    "The device ID cannot be blank.": "The device ID cannot be blank.",
-    "The device ID to enter here can be found in the \"Actions > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "The device ID to enter here can be found in the \"Actions > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).",
+    "The device ID cannot be blank.": "ID zariadenia nemôže byť prázdne.",
+    "The device ID to enter here can be found in the \"Actions > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "ID zariadenie pre vloženie môžete nájsť na druhom zariadení v dialógu \"Akcia > Zobraziť ID\". Medzery a pomlčky sú voliteľné (ignorované).",
     "The encrypted usage report is sent daily. It is used to track common platforms, folder sizes and app versions. If the reported data set is changed you will be prompted with this dialog again.": "The encrypted usage report is sent daily. It is used to track common platforms, folder sizes and app versions. If the reported data set is changed you will be prompted with this dialog again.",
     "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.": "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.",
     "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "The first command line parameter is the folder path and the second parameter is the relative path in the folder.",
     "The folder ID cannot be blank.": "The folder ID cannot be blank.",
-    "The folder ID must be unique.": "The folder ID must be unique.",
-    "The folder path cannot be blank.": "The folder path cannot be blank.",
+    "The folder ID must be unique.": "ID adresára musí byť jedinečné.",
+    "The folder path cannot be blank.": "Cesta k adresáru nemôže byť prázdna.",
     "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.",
     "The following items could not be synchronized.": "The following items could not be synchronized.",
-    "The maximum age must be a number and cannot be blank.": "The maximum age must be a number and cannot be blank.",
+    "The maximum age must be a number and cannot be blank.": "Maximálny vek musí byť číslo a nemôže byť prázdne.",
     "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "The maximum time to keep a version (in days, set to 0 to keep versions forever).",
-    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).",
-    "The number of days must be a number and cannot be blank.": "The number of days must be a number and cannot be blank.",
-    "The number of days to keep files in the trash can. Zero means forever.": "The number of days to keep files in the trash can. Zero means forever.",
-    "The number of old versions to keep, per file.": "The number of old versions to keep, per file.",
-    "The number of versions must be a number and cannot be blank.": "The number of versions must be a number and cannot be blank.",
-    "The path cannot be blank.": "The path cannot be blank.",
-    "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
+    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "Minimálne voľné miesto na disku v percentách musí byť kladné číslo medzi 0 a 100 (vrátane).",
+    "The number of days must be a number and cannot be blank.": "Počet dní musí byť číslo a nemôže byť prázdny.",
+    "The number of days to keep files in the trash can. Zero means forever.": "Počet dní pre uchovanie súborov v koši. Nula znamená navždy.",
+    "The number of old versions to keep, per file.": "Počet uchovávaných starších verzií pre každý súbor.",
+    "The number of versions must be a number and cannot be blank.": "Počet verzií musí byť číslo a nemôže byť prázdny.",
+    "The path cannot be blank.": "Cesta nemôže byť prázdna.",
+    "The rate limit must be a non-negative number (0: no limit)": "Limit rýchlosti musí byť kladné číslo (0: bez limitu)",
     "The rescan interval must be a non-negative number of seconds.": "The rescan interval must be a non-negative number of seconds.",
     "They are retried automatically and will be synced when the error is resolved.": "They are retried automatically and will be synced when the error is resolved.",
-    "This Device": "This Device",
+    "This Device": "Toto zariadenie",
     "This can easily give hackers access to read and change any files on your computer.": "This can easily give hackers access to read and change any files on your computer.",
-    "This is a major version upgrade.": "This is a major version upgrade.",
-    "This setting controls the free space required on the home (i.e., index database) disk.": "This setting controls the free space required on the home (i.e., index database) disk.",
-    "Time": "Time",
+    "This is a major version upgrade.": "Toto je hlavná aktualizácia.",
+    "This setting controls the free space required on the home (i.e., index database) disk.": "Toto nastavenie kontroluje voľné miesto požadované na domovskom disku (napr. indexová databáza).",
+    "Time": "Čas",
     "Trash Can File Versioning": "Verzie súborov v koši",
-    "Type": "Type",
-    "Unknown": "Unknown",
-    "Unshared": "Unshared",
-    "Unused": "Unused",
-    "Up to Date": "Up to Date",
-    "Updated": "Updated",
-    "Upgrade": "Upgrade",
-    "Upgrade To {%version%}": "Upgrade To {{version}}",
-    "Upgrading": "Upgrading",
-    "Upload Rate": "Upload Rate",
-    "Uptime": "Uptime",
-    "Usage reporting is always enabled for candidate releases.": "Usage reporting is always enabled for candidate releases.",
+    "Type": "Typ",
+    "Unknown": "Neznáme",
+    "Unshared": "Nezdieľané",
+    "Unused": "Nepoužité",
+    "Up to Date": "Aktuálne",
+    "Updated": "Aktualizované",
+    "Upgrade": "Aktualizácia",
+    "Upgrade To {%version%}": "Aktualizovať na {{version}}",
+    "Upgrading": "Aktualizácia",
+    "Upload Rate": "Rýchlosť odosielania",
+    "Uptime": "Doba prevádzky",
+    "Usage reporting is always enabled for candidate releases.": "Hlásenia o používaní sú pri kandidátoch na vydanie vždy povolené.",
     "Use HTTPS for GUI": "Use HTTPS for GUI",
-    "Version": "Version",
-    "Versions Path": "Versions Path",
-    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.",
+    "Version": "Verzia",
+    "Versions Path": "Cesta k verziám",
+    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Verzie sú automaticky zmazané ak sú staršie ako je maximálny časový limit alebo presiahnu počet súborov povolených v danom intervale.",
     "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "Warning, this path is a parent directory of an existing folder \"{{otherFolder}}\".",
     "Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Warning, this path is a parent directory of an existing folder \"{{otherFolderLabel}}\" ({{otherFolder}}).",
     "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Warning, this path is a subdirectory of an existing folder \"{{otherFolder}}\".",
     "Warning, this path is a subdirectory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Warning, this path is a subdirectory of an existing folder \"{{otherFolderLabel}}\" ({{otherFolder}}).",
     "When adding a new device, keep in mind that this device must be added on the other side too.": "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.": "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.",
-    "Yes": "Yes",
-    "You can change your choice at any time in the Settings dialog.": "You can change your choice at any time in the Settings dialog.",
-    "You can read more about the two release channels at the link below.": "You can read more about the two release channels at the link below.",
-    "You must keep at least one version.": "You must keep at least one version.",
-    "days": "days",
-    "directories": "directories",
-    "files": "files",
-    "full documentation": "full documentation",
-    "items": "items",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} wants to share folder \"{{folder}}\".",
-    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} wants to share folder \"{{folderlabel}}\" ({{folder}})."
+    "Yes": "Áno",
+    "You can change your choice at any time in the Settings dialog.": "Voľbu môžete kedykoľvek zmeniť v dialógu Nastavenia.",
+    "You can read more about the two release channels at the link below.": "O dvoch vydávacích kanáloch si môžete viacej prečítať v odkaze nižšie.",
+    "You must keep at least one version.": "Musíte ponechať aspoň jednu verziu",
+    "days": "dní",
+    "directories": "adresáre",
+    "files": "súbory",
+    "full documentation": "úplná dokumntácia",
+    "items": "položiek",
+    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} chce zdieľať adresár \"{{folder}}\".",
+    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} chce zdieľať adresár \"{{folderlabel}}\" ({{folder}})."
 }

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

@@ -88,7 +88,7 @@
     "Folder ID": "Mapp-ID",
     "Folder Label": "Mapp-etikett",
     "Folder Path": "Mappsökväg",
-    "Folder Type": "Mapptyp",
+    "Folder Type": "Mapp-typ",
     "Folders": "Mappar",
     "GUI": "Grafiskt gränssnitt",
     "GUI Authentication Password": "GUI autentiseringslösenord",
@@ -158,6 +158,8 @@
     "Please consult the release notes before performing a major upgrade.": "Läs igenom versionsnyheterna innan den stora uppgraderingen.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Ställ in ett grafiska gränssnittets användarautentisering och lösenord i inställningsdialogrutan.",
     "Please wait": "Var god vänta",
+    "Prefix indicating that the file can be deleted if preventing directory removal": "Prefix som indikerar att filen kan raderas om det förhindrar borttagning av katalog",
+    "Prefix indicating that the pattern should be matched without case sensitivity": "Prefix som indikerar att mönstret ska matchas utan skiftlägeskänslighet",
     "Preview": "Förhandsgranska",
     "Preview Usage Report": "Förhandsgranska statistik",
     "Quick guide to supported patterns": "Snabb handledning till mönster som stöds",
@@ -228,7 +230,7 @@
     "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "Den första kommandoparametern är sökvägen till mappen och den andra parametern är den relativa sökvägen i katalogen.",
     "The folder ID cannot be blank.": "Mapp-ID får inte vara tomt.",
     "The folder ID must be unique.": "Mapp-ID måste vara unikt.",
-    "The folder path cannot be blank.": "Mappsökvägen kan inte vara tom.",
+    "The folder path cannot be blank.": "Mapp-sökvägen kan inte vara tom.",
     "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "De följande intervallen används: varje 30 sekunder under den första timmen; varje timme under den första dagen; varje dag för de första 30 dagarna; varje vecka tills den maximala åldersgränsen uppnås.",
     "The following items could not be synchronized.": "Följande objekt kunde inte synkroniseras.",
     "The maximum age must be a number and cannot be blank.": "Åldersgränsen måste vara ett tal och kan inte lämnas tomt.",

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

@@ -158,6 +158,8 @@
     "Please consult the release notes before performing a major upgrade.": "Birincil bir yükseltme gerçekleştirmeden önce lütfen sürüm notlarını tetkik edin.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "GUI üzerinden Kimlik Doğrulaması yapmak için Ayarlar penceresinde Kullanıcı ve Parola tanımlayın lütfen.",
     "Please wait": "Lütfen Bekleyin",
+    "Prefix indicating that the file can be deleted if preventing directory removal": "Prefix indicating that the file can be deleted if preventing directory removal",
+    "Prefix indicating that the pattern should be matched without case sensitivity": "Prefix indicating that the pattern should be matched without case sensitivity",
     "Preview": "Önizleme",
     "Preview Usage Report": "Kullanım raporunu gözden geçir",
     "Quick guide to supported patterns": "Desteklenen kalıp dizileri için hızlı rehber",

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

@@ -65,11 +65,11 @@
     "Edit Device": "Налаштування пристрою",
     "Edit Folder": "Налаштування директорії",
     "Editing": "Редагування",
-    "Editing {%path%}.": "Editing {{path}}.",
+    "Editing {%path%}.": "Редагування {{path}}.",
     "Enable NAT traversal": "Увімкнути NAT traversal",
     "Enable Relaying": "Увімкнути ретрансляцію (relaying)",
-    "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.",
-    "Enter a non-privileged port number (1024 - 65535).": "Enter a non-privileged port number (1024 - 65535).",
+    "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Введіть невід'ємне число (напр. \"2.35\") та виберіть пристрій. Проценти від загального дискового простору.",
+    "Enter a non-privileged port number (1024 - 65535).": "Введіть номер непривілейованого порту (1024 - 65535).",
     "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Введіть розділені комою (\"tcp://ip:port\", \"tcp://host:port\") адреси або \"dynamic\" для автоматичного визначення адреси.",
     "Enter ignore patterns, one per line.": "Введіть шаблони ігнорування, по одному на рядок.",
     "Error": "Помилка",
@@ -93,7 +93,7 @@
     "GUI": "Графічний інтерфейс",
     "GUI Authentication Password": "Пароль для доступу до панелі управління",
     "GUI Authentication User": "Логін користувача для доступу до панелі управління",
-    "GUI Listen Address": "GUI Listen Address",
+    "GUI Listen Address": "Адреса прослуховування GUI",
     "GUI Listen Addresses": "Адреса доступу до панелі управління",
     "GUI Theme": "Тема інтерфейсу",
     "Generate": "Згенерувати",
@@ -158,6 +158,8 @@
     "Please consult the release notes before performing a major upgrade.": "Будь ласка перегляньте примітки до випуску перед мажорним оновленням. ",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Будь ласка, встановіть у налаштуваннях ім'я користувача та пароль до графічного інтерфейсу.",
     "Please wait": "Будь ласка, зачекайте",
+    "Prefix indicating that the file can be deleted if preventing directory removal": "Префікс означає, що файл може бути видалений при запобіганні видаленню директорії",
+    "Prefix indicating that the pattern should be matched without case sensitivity": "Префікс означає, що шаблон має збігатися без чутливості до регістру",
     "Preview": "Попередній перегляд",
     "Preview Usage Report": "Попередній перегляд статистичного звіту",
     "Quick guide to supported patterns": "Швидкий посібник по шаблонам, що підтримуються",

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

@@ -158,6 +158,8 @@
     "Please consult the release notes before performing a major upgrade.": "Hãy xem kỹ lịch sử phát hành trước khi tiến hành bản cập nhật q.trọng.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Hãy thiết lập tên ng.dùng và mật khẩu xác minh GUI trong hộp thoại Cài đặt.",
     "Please wait": "Xin chờ",
+    "Prefix indicating that the file can be deleted if preventing directory removal": "Prefix indicating that the file can be deleted if preventing directory removal",
+    "Prefix indicating that the pattern should be matched without case sensitivity": "Prefix indicating that the pattern should be matched without case sensitivity",
     "Preview": "Xem trước",
     "Preview Usage Report": "Xem trước báo cáo s.dụng",
     "Quick guide to supported patterns": "H.dẫn sơ lược về các q.luật được hỗ trợ",

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

@@ -158,6 +158,8 @@
     "Please consult the release notes before performing a major upgrade.": "请在进行重大更新前查看发布说明。",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "请在设置对话框中设置 GUI 验证用户及其密码。",
     "Please wait": "请稍候",
+    "Prefix indicating that the file can be deleted if preventing directory removal": "Prefix indicating that the file can be deleted if preventing directory removal",
+    "Prefix indicating that the pattern should be matched without case sensitivity": "Prefix indicating that the pattern should be matched without case sensitivity",
     "Preview": "预览",
     "Preview Usage Report": "预览使用报告",
     "Quick guide to supported patterns": "支持的通配符的简单教程：",

gui/default/index.html

@@ -216,6 +216,9 @@
               <button type="button" class="btn btn-sm btn-default" ng-click="dismissFolderRejection(event.data.folder, event.data.device)">
                 <span class="fa fa-clock-o"></span>&nbsp;<span translate>Later</span>
               </button>
+              <button type="button" class="btn btn-sm btn-default" ng-click="ignoreRejectedFolder(event.data.folder, event.data.device)">
+                <span class="fa fa-times"></span>&nbsp;<span translate>Ignore</span>
+              </button>
             </div>
           </div>
         </div>
@@ -493,7 +496,12 @@
                   </tr>
                   <tr>
                     <th><span class="fa fa-fw fa-home"></span>&nbsp;<span translate>Local State (Total)</span></th>
-                    <td class="text-right">{{localStateTotal.files | alwaysNumber}} <span translate>items</span>, ~{{localStateTotal.bytes | binary}}B</td>
+                    <td class="text-right">
+                        <span tooltip data-original-title="{{localStateTotal.files | alwaysNumber}} {{'files' | translate}}, {{ localStateTotal.directories | alwaysNumber}} {{'directories' | translate}}, ~{{ localStateTotal.bytes | binary}}B">
+                        <span class="fa fa-files-o"></span>&nbsp;{{localStateTotal.files | alwaysNumber}}&ensp;
+                        <span class="fa fa-folder-o"></span>&nbsp;{{localStateTotal.directories| alwaysNumber}}&ensp;
+                        <span class="fa fa-hdd-o"></span>&nbsp;~{{localStateTotal.bytes | binary}}B
+                    </td>
                   </tr>
                   <tr>
                     <th><span class="fa fa-fw fa-th"></span>&nbsp;<span translate>RAM Utilization</span></th>

gui/default/syncthing/core/aboutModalView.html

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

gui/default/syncthing/core/pathIsSubDirDirective.js

@@ -20,22 +20,22 @@ angular.module('syncthing.core')
                         }).every(function(e) { return e });
                     }
 
-                    scope.pathIsSubFolder = false;
-                    scope.pathIsParentFolder = false;
-                    scope.otherFolder = "";
-                    scope.otherFolderLabel = "";
+                    scope.folderPathErrors.isSub = false;
+                    scope.folderPathErrors.isParent = false;
+                    scope.folderPathErrors.otherID = "";
+                    scope.folderPathErrors.otherLabel = "";
                     for (var folderID in scope.folders) {
                         if (isSubDir(scope.folders[folderID].path, viewValue)) {
-                            scope.otherFolder = folderID;
-                            scope.otherFolderLabel = scope.folders[folderID].label;
-                            scope.pathIsSubFolder = true;
+                            scope.folderPathErrors.otherID = folderID;
+                            scope.folderPathErrors.otherLabel = scope.folders[folderID].label;
+                            scope.folderPathErrors.isSub = true;
                             break;
                         }
                         if (viewValue !== "" &&
                             isSubDir(viewValue, scope.folders[folderID].path)) {
-                            scope.otherFolder = folderID;
-                            scope.otherFolderLabel = scope.folders[folderID].label;
-                            scope.pathIsParentFolder = true;
+                            scope.folderPathErrors.otherID = folderID;
+                            scope.folderPathErrors.otherLabel = scope.folders[folderID].label;
+                            scope.folderPathErrors.isParent = true;
                             break;
                         }
                     }

gui/default/syncthing/core/syncthingController.js

@@ -53,31 +53,33 @@ angular.module('syncthing.core')
         $scope.themes = [];
         $scope.globalChangeEvents = {};
         $scope.metricRates = false;
+        $scope.folderPathErrors = {};
 
         try {
             $scope.metricRates = (window.localStorage["metricRates"] == "true");
         } catch (exception) { }
 
         $scope.folderDefaults = {
-                selectedDevices: {},
-                type: "readwrite",
-                rescanIntervalS: 60,
-                minDiskFree: {value: 1, unit: "%"},
-                maxConflicts: 10,
-                fsync: true,
-                order: "random",
-                fileVersioningSelector: "none",
-                trashcanClean: 0,
-                simpleKeep: 5,
-                staggeredMaxAge: 365,
-                staggeredCleanInterval: 3600,
-                staggeredVersionsPath: "",
-                externalCommand: "",
-                autoNormalize: true
+            selectedDevices: {},
+            type: "readwrite",
+            rescanIntervalS: 60,
+            minDiskFree: {value: 1, unit: "%"},
+            maxConflicts: 10,
+            fsync: true,
+            order: "random",
+            fileVersioningSelector: "none",
+            trashcanClean: 0,
+            simpleKeep: 5,
+            staggeredMaxAge: 365,
+            staggeredCleanInterval: 3600,
+            staggeredVersionsPath: "",
+            externalCommand: "",
+            autoNormalize: true
         };
 
         $scope.localStateTotal = {
             bytes: 0,
+            directories: 0,
             files: 0
         };
 
@@ -447,12 +449,14 @@ angular.module('syncthing.core')
         function recalcLocalStateTotal () {
             $scope.localStateTotal = {
                 bytes: 0,
+                directories: 0,
                 files: 0
             };
 
             for (var f in $scope.model) {
                $scope.localStateTotal.bytes += $scope.model[f].localBytes;
                $scope.localStateTotal.files += $scope.model[f].localFiles;
+               $scope.localStateTotal.directories += $scope.model[f].localDirectories;
             }
         }
 
@@ -1101,14 +1105,14 @@ angular.module('syncthing.core')
                     });
                 });
 
-                $scope.saveConfig();
+                $scope.saveConfig(function () {
+                    if (themeChanged) {
+                        document.location.reload(true);
+                    }
+                });
             }
 
             $('#settings').modal("hide");
-
-            if (themeChanged) {
-              document.location.reload(true);
-            }
         };
 
         $scope.saveAdvanced = function () {
@@ -1365,6 +1369,13 @@ angular.module('syncthing.core')
             $('#globalChanges').modal();
         };
 
+        $scope.editFolderModal = function () {
+            $scope.folderPathErrors = {};
+            $scope.folderEditor.$setPristine();
+            $('#editIgnores textarea').val("");
+            $('#editFolder').modal();
+        };
+
         $scope.editFolder = function (folderCfg) {
             $scope.currentFolder = angular.copy(folderCfg);
             if ($scope.currentFolder.path.slice(-1) === $scope.system.pathSeparator) {
@@ -1409,18 +1420,15 @@ angular.module('syncthing.core')
             $scope.currentFolder.externalCommand = $scope.currentFolder.externalCommand || "";
 
             $scope.editingExisting = true;
-            $scope.folderEditor.$setPristine();
-            $('#editFolder').modal();
+            $scope.editFolderModal();
         };
 
         $scope.addFolder = function () {
-            $scope.currentFolder = angular.copy($scope.folderDefaults);
-            $scope.editingExisting = false;
-            $('#editIgnores textarea').val("");
-            $scope.folderEditor.$setPristine();
             $http.get(urlbase + '/svc/random/string?length=10').success(function (data) {
+                $scope.currentFolder = angular.copy($scope.folderDefaults);
                 $scope.currentFolder.id = (data.random.substr(0, 5) + '-' + data.random.substr(5, 5)).toLowerCase();
-                $('#editFolder').modal();
+                $scope.editingExisting = false;
+                $scope.editFolderModal();
             });
         };
 
@@ -1435,8 +1443,7 @@ angular.module('syncthing.core')
             $scope.currentFolder.selectedDevices[device] = true;
 
             $scope.editingExisting = false;
-            $scope.folderEditor.$setPristine();
-            $('#editFolder').modal();
+            $scope.editFolderModal();
         };
 
         $scope.shareFolderWithDevice = function (folder, device) {
@@ -1528,6 +1535,12 @@ angular.module('syncthing.core')
             delete $scope.folderRejections[folder + "-" + device];
         };
 
+        $scope.ignoreRejectedFolder = function (folder, device) {
+            $scope.config.ignoredFolders.push(folder);
+            $scope.saveConfig();
+            $scope.dismissFolderRejection(folder, device);
+        };
+
         $scope.sharesFolder = function (folderCfg) {
             var names = [];
             folderCfg.devices.forEach(function (device) {
@@ -1651,6 +1664,9 @@ angular.module('syncthing.core')
         $scope.showFailed = function (folder) {
             $scope.failedCurrent = $scope.failed[folder];
             $scope.failedFolderPath = $scope.folders[folder].path;
+            if ($scope.failedFolderPath[$scope.failedFolderPath.length - 1] !== $scope.system.pathSeparator) {
+                $scope.failedFolderPath += $scope.system.pathSeparator;
+            }
             $('#failed').modal().on('hidden.bs.modal', function () {
                 $scope.failedCurrent = undefined;
             });

gui/default/syncthing/device/globalChangesModalView.html

@@ -14,8 +14,8 @@
             <td ng-if="!changeEvent.data.modifiedBy"><span translate>Unknown</span></td>
             <td>{{changeEvent.data.action}}</td>
             <td>{{changeEvent.data.type}}</td>
-            <td>{{changeEvent.data.path}}</td>
-            <td>{{changeEvent.time | date:'medium'}}</td>
+            <td class="globalChanges-path-col">{{changeEvent.data.path}}</td>
+            <td class="globalChanges-time-col">{{changeEvent.time | date:"yyyy-MM-dd HH:mm:ss"}}</td>
           </tr>
         </table>
     </div>
@@ -24,4 +24,4 @@
         <span class="fa fa-times"></span>&nbsp;<span translate>Close</span>
         </button>
     </div>
-</model>
+</modal>

gui/default/syncthing/folder/editFolderModalView.html

@@ -26,12 +26,12 @@
               <option ng-repeat="directory in directoryList" value="{{ directory }}" />
             </datalist>
             <p class="help-block">
-              <span translate ng-if="folderEditor.folderPath.$valid || folderEditor.folderPath.$pristine">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</span> <code>{{system.tilde}}</code>.
+              <span ng-if="folderEditor.folderPath.$valid || folderEditor.folderPath.$pristine"><span translate>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</span> <code>{{system.tilde}}</code>.</br></span>
               <span translate ng-if="folderEditor.folderPath.$error.required && folderEditor.folderPath.$dirty">The folder path cannot be blank.</span>
-              <span class="text-danger" translate translate-value-other-folder="{{otherFolder}}" ng-if="pathIsSubFolder && otherFolderLabel.length == 0">Warning, this path is a subdirectory of an existing folder "{%otherFolder%}".</span>
-              <span class="text-danger" translate translate-value-other-folder="{{otherFolder}}" translate-value-other-folder-label="{{otherFolderLabel}}" ng-if="pathIsSubFolder && otherFolderLabel.length != 0">Warning, this path is a subdirectory of an existing folder "{%otherFolderLabel%}" ({%otherFolder%}).</span>
-              <span class="text-danger" translate translate-value-other-folder="{{otherFolder}}" ng-if="pathIsParentFolder && otherFolderLabel.length == 0">Warning, this path is a parent directory of an existing folder "{%otherFolder%}".</span>
-              <span class="text-danger" translate translate-value-other-folder="{{otherFolder}}" translate-value-other-folder-label="{{otherFolderLabel}}" ng-if="pathIsParentFolder && otherFolderLabel.length != 0">Warning, this path is a parent directory of an existing folder "{%otherFolderLabel%}" ({%otherFolder%}).</span>
+              <span class="text-danger" translate translate-value-other-folder="{{folderPathErrors.otherID}}" ng-if="folderPathErrors.isSub && folderPathErrors.otherLabel.length == 0">Warning, this path is a subdirectory of an existing folder "{%otherFolder%}".</span>
+              <span class="text-danger" translate translate-value-other-folder="{{folderPathErrors.otherID}}" translate-value-other-folder-label="{{folderPathErrors.otherLabel}}" ng-if="folderPathErrors.isSub && folderPathErrors.otherLabel.length != 0">Warning, this path is a subdirectory of an existing folder "{%otherFolderLabel%}" ({%otherFolder%}).</span>
+              <span class="text-danger" translate translate-value-other-folder="{{folderPathErrors.otherID}}" ng-if="folderPathErrors.isParent && folderPathErrors.otherLabel.length == 0">Warning, this path is a parent directory of an existing folder "{%otherFolder%}".</span>
+              <span class="text-danger" translate translate-value-other-folder="{{folderPathErrors.otherID}}" translate-value-other-folder-label="{{folderPathErrors.otherLabel}}" ng-if="folderPathErrors.isParent && folderPathErrors.otherLabel.length != 0">Warning, this path is a parent directory of an existing folder "{%otherFolderLabel%}" ({%otherFolder%}).</span>
             </p>
           </div>
         </div>

gui/default/syncthing/folder/editIgnoresModalView.html

@@ -7,6 +7,8 @@
 
     <p class="small"><span translate>Quick guide to supported patterns</span> (<a href="https://docs.syncthing.net/users/ignoring.html" target="_blank" translate>full documentation</a>):</p>
     <dl class="dl-horizontal dl-narrow small">
+      <dt><code>(?d)</code></dt> <dd><b><span translate>Prefix indicating that the file can be deleted if preventing directory removal</span></b></dd>
+      <dt><code>(?i)</code></dt> <dd><span translate>Prefix indicating that the pattern should be matched without case sensitivity</span></dd>
       <dt><code>!</code></dt> <dd><span translate>Inversion of the given condition (i.e. do not exclude)</span></dd>
       <dt><code>*</code></dt> <dd><span translate>Single level wildcard (matches within a directory only)</span></dd>
       <dt><code>**</code></dt> <dd><span translate>Multi level wildcard (matches multiple directory levels)</span></dd>

jenkins/common.bash

@@ -65,7 +65,30 @@ function test {
 
 function testWithCoverage {
     echo Test with coverage
-    CGO_ENABLED=1 ./build.sh test-cov
+    CGO_ENABLED=1
+
+    echo "mode: set" > coverage.out
+    fail=0
+
+    # For every package in the repo
+    for dir in $(go list ./lib/... ./cmd/...) ; do
+        # run the tests
+        GOPATH="$(pwd)/Godeps/_workspace:$GOPATH" go test -coverprofile=profile.out $dir
+        if [ -f profile.out ] ; then
+            # and if there was test output, append it to coverage.out
+            grep -v "mode: " profile.out >> coverage.out
+            rm profile.out
+        fi
+    done
+
+    gocov convert coverage.out | gocov-xml > coverage.xml
+
+    # This is usually run from within Jenkins. If it is, we need to
+    # tweak the paths in coverage.xml so cobertura finds the
+    # source.
+    if [[ "${WORKSPACE:-default}" != "default" ]] ; then
+        sed "s#$WORKSPACE##g" < coverage.xml > coverage.xml.new && mv coverage.xml.new coverage.xml
+    fi
 
     notCovered=$(egrep -c '\s0$' coverage.out)
     total=$(wc -l coverage.out | awk '{print $1}')
@@ -73,6 +96,8 @@ function testWithCoverage {
     echo "$coverPct" > "coverage.txt"
     echo "Test coverage is $coverPct%%"
     echo
+
+    CGO_ENABLED=0 # reset to before
 }
 
 function buildSource {

lib/config/config.go

@@ -155,9 +155,11 @@ type Configuration struct {
 	GUI            GUIConfiguration      `xml:"gui" json:"gui"`
 	Options        OptionsConfiguration  `xml:"options" json:"options"`
 	IgnoredDevices []protocol.DeviceID   `xml:"ignoredDevice" json:"ignoredDevices"`
+	IgnoredFolders []string              `xml:"ignoredFolder" json:"ignoredFolders"`
 	XMLName        xml.Name              `xml:"configuration" json:"-"`
 
-	OriginalVersion int `xml:"-" json:"-"` // The version we read from disk, before any conversion
+	MyID            protocol.DeviceID `xml:"-" json:"-"` // Provided by the instantiator.
+	OriginalVersion int               `xml:"-" json:"-"` // The version we read from disk, before any conversion
 }
 
 func (cfg Configuration) Copy() Configuration {
@@ -181,6 +183,10 @@ func (cfg Configuration) Copy() Configuration {
 	newCfg.IgnoredDevices = make([]protocol.DeviceID, len(cfg.IgnoredDevices))
 	copy(newCfg.IgnoredDevices, cfg.IgnoredDevices)
 
+	// FolderConfiguraion.ID is type string
+	newCfg.IgnoredFolders = make([]string, len(cfg.IgnoredFolders))
+	copy(newCfg.IgnoredFolders, cfg.IgnoredFolders)
+
 	return newCfg
 }
 
@@ -198,6 +204,8 @@ func (cfg *Configuration) WriteXML(w io.Writer) error {
 func (cfg *Configuration) prepare(myID protocol.DeviceID) error {
 	var myName string
 
+	cfg.MyID = myID
+
 	// Ensure this device is present in the config
 	for _, device := range cfg.Devices {
 		if device.DeviceID == myID {
@@ -235,6 +243,9 @@ func (cfg *Configuration) clean() error {
 	if cfg.IgnoredDevices == nil {
 		cfg.IgnoredDevices = []protocol.DeviceID{}
 	}
+	if cfg.IgnoredFolders == nil {
+		cfg.IgnoredFolders = []string{}
+	}
 	if cfg.Options.AlwaysLocalNets == nil {
 		cfg.Options.AlwaysLocalNets = []string{}
 	}

lib/config/folderconfiguration.go

@@ -46,7 +46,7 @@ type FolderConfiguration struct {
 	cachedPath string
 
 	DeprecatedReadOnly       bool    `xml:"ro,attr,omitempty" json:"-"`
-	DeprecatedMinDiskFreePct float64 `xml:"minDiskFreePct" json:"-"`
+	DeprecatedMinDiskFreePct float64 `xml:"minDiskFreePct,omitempty" json:"-"`
 }
 
 type FolderDeviceConfiguration struct {

lib/config/wrapper.go

@@ -321,6 +321,19 @@ func (w *Wrapper) IgnoredDevice(id protocol.DeviceID) bool {
 	return false
 }
 
+// IgnoredFolder returns whether or not share attempts for the given
+// folder should be silently ignored.
+func (w *Wrapper) IgnoredFolder(folder string) bool {
+	w.mut.Lock()
+	defer w.mut.Unlock()
+	for _, nfolder := range w.cfg.IgnoredFolders {
+		if folder == nfolder {
+			return true
+		}
+	}
+	return false
+}
+
 // Device returns the configuration for the given device and an "ok" bool.
 func (w *Wrapper) Device(id protocol.DeviceID) (DeviceConfiguration, bool) {
 	w.mut.Lock()
@@ -431,3 +444,11 @@ func (w *Wrapper) StunServers() []string {
 
 	return addresses
 }
+
+func (w *Wrapper) MyName() string {
+	w.mut.Lock()
+	myID := w.cfg.MyID
+	w.mut.Unlock()
+	cfg, _ := w.Device(myID)
+	return cfg.Name
+}

lib/connections/kcp_dial.go

@@ -61,11 +61,14 @@ func (d *kcpDialer) Dial(id protocol.DeviceID, uri *url.URL) (internalConn, erro
 		conn.Close()
 		return internalConn{}, err
 	}
+
+	ses.SetDeadline(time.Now().Add(10 * time.Second))
 	stream, err := ses.OpenStream()
 	if err != nil {
 		ses.Close()
 		return internalConn{}, err
 	}
+	ses.SetDeadline(time.Time{})
 
 	tc := tls.Client(&sessionClosingStream{stream, ses}, d.tlsCfg)
 	tc.SetDeadline(time.Now().Add(time.Second * 10))

lib/connections/kcp_listen.go

@@ -123,12 +123,14 @@ func (t *kcpListener) Serve() {
 			continue
 		}
 
+		ses.SetDeadline(time.Now().Add(10 * time.Second))
 		stream, err := ses.AcceptStream()
 		if err != nil {
 			l.Debugln("smux accept:", err)
 			ses.Close()
 			continue
 		}
+		ses.SetDeadline(time.Time{})
 
 		tc := tls.Server(&sessionClosingStream{stream, ses}, t.tlsCfg)
 		tc.SetDeadline(time.Now().Add(time.Second * 10))
@@ -185,7 +187,6 @@ func (t *kcpListener) stunRenewal(listener net.PacketConn) {
 	client := stun.NewClientWithConnection(listener)
 	client.SetSoftwareName("syncthing")
 
-	var uri url.URL
 	var natType stun.NATType
 	var extAddr *stun.Host
 	var err error
@@ -225,10 +226,12 @@ func (t *kcpListener) stunRenewal(listener net.PacketConn) {
 
 			for {
 				changed := false
-				uri = *t.uri
+
+				uri := *t.uri
 				uri.Host = extAddr.TransportAddr()
 
 				t.mut.Lock()
+
 				if t.address == nil || t.address.String() != uri.String() {
 					l.Infof("%s resolved external address %s (via %s)", t.uri, uri.String(), addr)
 					t.address = &uri

lib/ignore/cache.go

@@ -8,6 +8,12 @@ package ignore
 
 import "time"
 
+type nower interface {
+	Now() time.Time
+}
+
+var clock = nower(defaultClock{})
+
 type cache struct {
 	patterns []Pattern
 	entries  map[string]cacheEntry
@@ -27,7 +33,7 @@ func newCache(patterns []Pattern) *cache {
 
 func (c *cache) clean(d time.Duration) {
 	for k, v := range c.entries {
-		if time.Since(v.access) > d {
+		if clock.Now().Sub(v.access) > d {
 			delete(c.entries, k)
 		}
 	}
@@ -36,7 +42,7 @@ func (c *cache) clean(d time.Duration) {
 func (c *cache) get(key string) (Result, bool) {
 	entry, ok := c.entries[key]
 	if ok {
-		entry.access = time.Now()
+		entry.access = clock.Now()
 		c.entries[key] = entry
 	}
 	return entry.result, ok
@@ -50,3 +56,9 @@ func (c *cache) len() int {
 	l := len(c.entries)
 	return l
 }
+
+type defaultClock struct{}
+
+func (defaultClock) Now() time.Time {
+	return time.Now()
+}

lib/ignore/cache_test.go

@@ -12,6 +12,13 @@ import (
 )
 
 func TestCache(t *testing.T) {
+	fc := new(fakeClock)
+	oldClock := clock
+	clock = fc
+	defer func() {
+		clock = oldClock
+	}()
+
 	c := newCache(nil)
 
 	res, ok := c.get("nonexistent")
@@ -52,11 +59,11 @@ func TestCache(t *testing.T) {
 
 	// Sleep and access, to get some data for clean
 
-	time.Sleep(500 * time.Millisecond)
+	*fc += 500 // milliseconds
 
 	c.get("true")
 
-	time.Sleep(100 * time.Millisecond)
+	*fc += 100 // milliseconds
 
 	// "false" was accessed ~600 ms ago, "true" was accessed ~100 ms ago.
 	// This should clean out "false" but not "true"
@@ -75,3 +82,11 @@ func TestCache(t *testing.T) {
 		t.Errorf("item should have been cleaned")
 	}
 }
+
+type fakeClock int64 // milliseconds
+
+func (f *fakeClock) Now() time.Time {
+	t := time.Unix(int64(*f)/1000, (int64(*f)%1000)*int64(time.Millisecond))
+	*f++
+	return t
+}

lib/ignore/ignore.go

@@ -64,24 +64,59 @@ func (r Result) IsCaseFolded() bool {
 	return r&resultFoldCase == resultFoldCase
 }
 
-type Matcher struct {
-	lines     []string
-	patterns  []Pattern
-	withCache bool
-	matches   *cache
-	curHash   string
-	stop      chan struct{}
-	modtimes  map[string]time.Time
-	mut       sync.Mutex
+// The ChangeDetector is responsible for determining if files have changed
+// on disk. It gets told to Remember() files (name and modtime) and will
+// then get asked if a file has been Seen() (i.e., Remember() has been
+// called on it) and if any of the files have Changed(). To forget all
+// files, call Reset().
+type ChangeDetector interface {
+	Remember(name string, modtime time.Time)
+	Seen(name string) bool
+	Changed() bool
+	Reset()
 }
 
-func New(withCache bool) *Matcher {
-	m := &Matcher{
-		withCache: withCache,
-		stop:      make(chan struct{}),
-		mut:       sync.NewMutex(),
+type Matcher struct {
+	lines          []string
+	patterns       []Pattern
+	withCache      bool
+	matches        *cache
+	curHash        string
+	stop           chan struct{}
+	changeDetector ChangeDetector
+	mut            sync.Mutex
+}
+
+// An Option can be passed to New()
+type Option func(*Matcher)
+
+// WithCache enables or disables lookup caching. The default is disabled.
+func WithCache(v bool) Option {
+	return func(m *Matcher) {
+		m.withCache = v
 	}
-	if withCache {
+}
+
+// WithChangeDetector sets a custom ChangeDetector. The default is to simply
+// use the on disk modtime for comparison.
+func WithChangeDetector(cd ChangeDetector) Option {
+	return func(m *Matcher) {
+		m.changeDetector = cd
+	}
+}
+
+func New(opts ...Option) *Matcher {
+	m := &Matcher{
+		stop: make(chan struct{}),
+		mut:  sync.NewMutex(),
+	}
+	for _, opt := range opts {
+		opt(m)
+	}
+	if m.changeDetector == nil {
+		m.changeDetector = newModtimeChecker()
+	}
+	if m.withCache {
 		go m.clean(2 * time.Hour)
 	}
 	return m
@@ -91,7 +126,7 @@ func (m *Matcher) Load(file string) error {
 	m.mut.Lock()
 	defer m.mut.Unlock()
 
-	if m.patternsUnchanged(file) {
+	if m.changeDetector.Seen(file) && !m.changeDetector.Changed() {
 		return nil
 	}
 
@@ -108,9 +143,8 @@ func (m *Matcher) Load(file string) error {
 		return err
 	}
 
-	m.modtimes = map[string]time.Time{
-		file: info.ModTime(),
-	}
+	m.changeDetector.Reset()
+	m.changeDetector.Remember(file, info.ModTime())
 
 	return m.parseLocked(fd, file)
 }
@@ -122,7 +156,7 @@ func (m *Matcher) Parse(r io.Reader, file string) error {
 }
 
 func (m *Matcher) parseLocked(r io.Reader, file string) error {
-	lines, patterns, err := parseIgnoreFile(r, file, m.modtimes)
+	lines, patterns, err := parseIgnoreFile(r, file, m.changeDetector)
 	// Error is saved and returned at the end. We process the patterns
 	// (possibly blank) anyway.
 
@@ -142,28 +176,8 @@ func (m *Matcher) parseLocked(r io.Reader, file string) error {
 	return err
 }
 
-// patternsUnchanged returns true if none of the files making up the loaded
-// patterns have changed since last check.
-func (m *Matcher) patternsUnchanged(file string) bool {
-	if _, ok := m.modtimes[file]; !ok {
-		return false
-	}
-
-	for filename, modtime := range m.modtimes {
-		info, err := os.Stat(filename)
-		if err != nil {
-			return false
-		}
-		if !info.ModTime().Equal(modtime) {
-			return false
-		}
-	}
-
-	return true
-}
-
 func (m *Matcher) Match(file string) (result Result) {
-	if m == nil {
+	if m == nil || file == "." {
 		return resultNotMatched
 	}
 
@@ -284,8 +298,8 @@ func hashPatterns(patterns []Pattern) string {
 	return fmt.Sprintf("%x", h.Sum(nil))
 }
 
-func loadIgnoreFile(file string, modtimes map[string]time.Time) ([]string, []Pattern, error) {
-	if _, ok := modtimes[file]; ok {
+func loadIgnoreFile(file string, cd ChangeDetector) ([]string, []Pattern, error) {
+	if cd.Seen(file) {
 		return nil, nil, fmt.Errorf("multiple include of ignore file %q", file)
 	}
 
@@ -299,12 +313,13 @@ func loadIgnoreFile(file string, modtimes map[string]time.Time) ([]string, []Pat
 	if err != nil {
 		return nil, nil, err
 	}
-	modtimes[file] = info.ModTime()
 
-	return parseIgnoreFile(fd, file, modtimes)
+	cd.Remember(file, info.ModTime())
+
+	return parseIgnoreFile(fd, file, cd)
 }
 
-func parseIgnoreFile(fd io.Reader, currentFile string, modtimes map[string]time.Time) ([]string, []Pattern, error) {
+func parseIgnoreFile(fd io.Reader, currentFile string, cd ChangeDetector) ([]string, []Pattern, error) {
 	var lines []string
 	var patterns []Pattern
 
@@ -371,7 +386,7 @@ func parseIgnoreFile(fd io.Reader, currentFile string, modtimes map[string]time.
 		} else if strings.HasPrefix(line, "#include ") {
 			includeRel := line[len("#include "):]
 			includeFile := filepath.Join(filepath.Dir(currentFile), includeRel)
-			includeLines, includePatterns, err := loadIgnoreFile(includeFile, modtimes)
+			includeLines, includePatterns, err := loadIgnoreFile(includeFile, cd)
 			if err != nil {
 				return fmt.Errorf("include of %q: %v", includeRel, err)
 			}
@@ -466,3 +481,41 @@ func WriteIgnores(path string, content []string) error {
 
 	return nil
 }
+
+// modtimeChecker is the default implementation of ChangeDetector
+type modtimeChecker struct {
+	modtimes map[string]time.Time
+}
+
+func newModtimeChecker() *modtimeChecker {
+	return &modtimeChecker{
+		modtimes: map[string]time.Time{},
+	}
+}
+
+func (c *modtimeChecker) Remember(name string, modtime time.Time) {
+	c.modtimes[name] = modtime
+}
+
+func (c *modtimeChecker) Seen(name string) bool {
+	_, ok := c.modtimes[name]
+	return ok
+}
+
+func (c *modtimeChecker) Reset() {
+	c.modtimes = map[string]time.Time{}
+}
+
+func (c *modtimeChecker) Changed() bool {
+	for name, modtime := range c.modtimes {
+		info, err := os.Stat(name)
+		if err != nil {
+			return true
+		}
+		if !info.ModTime().Equal(modtime) {
+			return true
+		}
+	}
+
+	return false
+}

lib/ignore/ignore_test.go

@@ -18,7 +18,7 @@ import (
 )
 
 func TestIgnore(t *testing.T) {
-	pats := New(true)
+	pats := New(WithCache(true))
 	err := pats.Load("testdata/.stignore")
 	if err != nil {
 		t.Fatal(err)
@@ -68,7 +68,7 @@ func TestExcludes(t *testing.T) {
 	i*2
 	!ign2
 	`
-	pats := New(true)
+	pats := New(WithCache(true))
 	err := pats.Parse(bytes.NewBufferString(stignore), ".stignore")
 	if err != nil {
 		t.Fatal(err)
@@ -113,7 +113,7 @@ func TestFlagOrder(t *testing.T) {
 	(?i)(?d)(?d)!ign9
 	(?d)(?d)!ign10
 	`
-	pats := New(true)
+	pats := New(WithCache(true))
 	err := pats.Parse(bytes.NewBufferString(stignore), ".stignore")
 	if err != nil {
 		t.Fatal(err)
@@ -148,7 +148,7 @@ func TestDeletables(t *testing.T) {
 	ign7
 	(?i)ign8
 	`
-	pats := New(true)
+	pats := New(WithCache(true))
 	err := pats.Parse(bytes.NewBufferString(stignore), ".stignore")
 	if err != nil {
 		t.Fatal(err)
@@ -187,7 +187,7 @@ func TestBadPatterns(t *testing.T) {
 	}
 
 	for _, pat := range badPatterns {
-		err := New(true).Parse(bytes.NewBufferString(pat), ".stignore")
+		err := New(WithCache(true)).Parse(bytes.NewBufferString(pat), ".stignore")
 		if err == nil {
 			t.Errorf("No error for pattern %q", pat)
 		}
@@ -195,7 +195,7 @@ func TestBadPatterns(t *testing.T) {
 }
 
 func TestCaseSensitivity(t *testing.T) {
-	ign := New(true)
+	ign := New(WithCache(true))
 	err := ign.Parse(bytes.NewBufferString("test"), ".stignore")
 	if err != nil {
 		t.Error(err)
@@ -247,7 +247,7 @@ func TestCaching(t *testing.T) {
 
 	fd2.WriteString("/y/\n")
 
-	pats := New(true)
+	pats := New(WithCache(true))
 	err = pats.Load(fd1.Name())
 	if err != nil {
 		t.Fatal(err)
@@ -354,7 +354,7 @@ func TestCommentsAndBlankLines(t *testing.T) {
 
 
 	`
-	pats := New(true)
+	pats := New(WithCache(true))
 	err := pats.Parse(bytes.NewBufferString(stignore), ".stignore")
 	if err != nil {
 		t.Error(err)
@@ -382,7 +382,7 @@ flamingo
 *.crow
 *.crow
 	`
-	pats := New(false)
+	pats := New()
 	err := pats.Parse(bytes.NewBufferString(stignore), ".stignore")
 	if err != nil {
 		b.Error(err)
@@ -424,7 +424,7 @@ flamingo
 	}
 
 	// Load the patterns
-	pats := New(true)
+	pats := New(WithCache(true))
 	err = pats.Load(fd.Name())
 	if err != nil {
 		b.Fatal(err)
@@ -460,7 +460,7 @@ func TestCacheReload(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	pats := New(true)
+	pats := New(WithCache(true))
 	err = pats.Load(fd.Name())
 	if err != nil {
 		t.Fatal(err)
@@ -515,7 +515,7 @@ func TestCacheReload(t *testing.T) {
 }
 
 func TestHash(t *testing.T) {
-	p1 := New(true)
+	p1 := New(WithCache(true))
 	err := p1.Load("testdata/.stignore")
 	if err != nil {
 		t.Fatal(err)
@@ -531,7 +531,7 @@ func TestHash(t *testing.T) {
 	/ffile
 	lost+found
 	`
-	p2 := New(true)
+	p2 := New(WithCache(true))
 	err = p2.Parse(bytes.NewBufferString(stignore), ".stignore")
 	if err != nil {
 		t.Fatal(err)
@@ -546,7 +546,7 @@ func TestHash(t *testing.T) {
 	/ffile
 	lost+found
 	`
-	p3 := New(true)
+	p3 := New(WithCache(true))
 	err = p3.Parse(bytes.NewBufferString(stignore), ".stignore")
 	if err != nil {
 		t.Fatal(err)
@@ -570,7 +570,7 @@ func TestHash(t *testing.T) {
 }
 
 func TestHashOfEmpty(t *testing.T) {
-	p1 := New(true)
+	p1 := New(WithCache(true))
 	err := p1.Load("testdata/.stignore")
 	if err != nil {
 		t.Fatal(err)
@@ -608,7 +608,7 @@ func TestWindowsPatterns(t *testing.T) {
 	a/b
 	c\d
 	`
-	pats := New(true)
+	pats := New(WithCache(true))
 	err := pats.Parse(bytes.NewBufferString(stignore), ".stignore")
 	if err != nil {
 		t.Fatal(err)
@@ -633,7 +633,7 @@ func TestAutomaticCaseInsensitivity(t *testing.T) {
 	A/B
 	c/d
 	`
-	pats := New(true)
+	pats := New(WithCache(true))
 	err := pats.Parse(bytes.NewBufferString(stignore), ".stignore")
 	if err != nil {
 		t.Fatal(err)
@@ -652,7 +652,7 @@ func TestCommas(t *testing.T) {
 	foo,bar.txt
 	{baz,quux}.txt
 	`
-	pats := New(true)
+	pats := New(WithCache(true))
 	err := pats.Parse(bytes.NewBufferString(stignore), ".stignore")
 	if err != nil {
 		t.Fatal(err)
@@ -683,7 +683,7 @@ func TestIssue3164(t *testing.T) {
 	(?d)(?i)/foo
 	(?d)(?i)**/bar
 	`
-	pats := New(true)
+	pats := New(WithCache(true))
 	err := pats.Parse(bytes.NewBufferString(stignore), ".stignore")
 	if err != nil {
 		t.Fatal(err)
@@ -719,7 +719,7 @@ func TestIssue3174(t *testing.T) {
 	stignore := `
 	*ä*
 	`
-	pats := New(true)
+	pats := New(WithCache(true))
 	err := pats.Parse(bytes.NewBufferString(stignore), ".stignore")
 	if err != nil {
 		t.Fatal(err)
@@ -734,7 +734,7 @@ func TestIssue3639(t *testing.T) {
 	stignore := `
 	foo/
 	`
-	pats := New(true)
+	pats := New(WithCache(true))
 	err := pats.Parse(bytes.NewBufferString(stignore), ".stignore")
 	if err != nil {
 		t.Fatal(err)
@@ -767,7 +767,7 @@ func TestIssue3674(t *testing.T) {
 		{"as/dc", true},
 	}
 
-	pats := New(true)
+	pats := New(WithCache(true))
 	err := pats.Parse(bytes.NewBufferString(stignore), ".stignore")
 	if err != nil {
 		t.Fatal(err)
@@ -799,7 +799,7 @@ func TestGobwasGlobIssue18(t *testing.T) {
 		{"bbaa", false},
 	}
 
-	pats := New(true)
+	pats := New(WithCache(true))
 	err := pats.Parse(bytes.NewBufferString(stignore), ".stignore")
 	if err != nil {
 		t.Fatal(err)
@@ -843,3 +843,32 @@ func TestIsInternal(t *testing.T) {
 		}
 	}
 }
+
+func TestRoot(t *testing.T) {
+	stignore := `
+	!/a
+	/*
+	`
+
+	testcases := []struct {
+		file    string
+		matches bool
+	}{
+		{".", false},
+		{"a", false},
+		{"b", true},
+	}
+
+	pats := New(WithCache(true))
+	err := pats.Parse(bytes.NewBufferString(stignore), ".stignore")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	for _, tc := range testcases {
+		res := pats.Match(tc.file).IsIgnored()
+		if res != tc.matches {
+			t.Errorf("Matches(%q) == %v, expected %v", tc.file, res, tc.matches)
+		}
+	}
+}

lib/logger/logger.go

@@ -28,6 +28,8 @@ const (
 	NumLevels
 )
 
+const DebugFlags = log.Ltime | log.Ldate | log.Lmicroseconds | log.Lshortfile
+
 // A MessageHandler is called with the log level and message text.
 type MessageHandler func(l LogLevel, msg string)
 
@@ -215,6 +217,7 @@ func (l *logger) SetDebug(facility string, enabled bool) {
 	l.mut.Lock()
 	l.debug[facility] = enabled
 	l.mut.Unlock()
+	l.SetFlags(DebugFlags)
 }
 
 // FacilityDebugging returns the set of facilities that have debugging

lib/model/model.go

@@ -77,7 +77,6 @@ type Model struct {
 	cacheIgnoredFiles bool
 	protectedFiles    []string
 
-	deviceName    string
 	clientName    string
 	clientVersion string
 
@@ -123,7 +122,7 @@ var (
 // NewModel creates and starts a new model. The model starts in read-only mode,
 // where it sends index information to connected peers and responds to requests
 // for file data without altering the local folder in any way.
-func NewModel(cfg *config.Wrapper, id protocol.DeviceID, deviceName, clientName, clientVersion string, ldb *db.Instance, protectedFiles []string) *Model {
+func NewModel(cfg *config.Wrapper, id protocol.DeviceID, clientName, clientVersion string, ldb *db.Instance, protectedFiles []string) *Model {
 	m := &Model{
 		Supervisor: suture.New("model", suture.Spec{
 			Log: func(line string) {
@@ -138,7 +137,6 @@ func NewModel(cfg *config.Wrapper, id protocol.DeviceID, deviceName, clientName,
 		shortID:             id.Short(),
 		cacheIgnoredFiles:   cfg.Options().CacheIgnoredFiles,
 		protectedFiles:      protectedFiles,
-		deviceName:          deviceName,
 		clientName:          clientName,
 		clientVersion:       clientVersion,
 		folderCfgs:          make(map[string]config.FolderConfiguration),
@@ -316,7 +314,7 @@ func (m *Model) addFolderLocked(cfg config.FolderConfiguration) {
 		m.deviceFolders[device.DeviceID] = append(m.deviceFolders[device.DeviceID], cfg.ID)
 	}
 
-	ignores := ignore.New(m.cacheIgnoredFiles)
+	ignores := ignore.New(ignore.WithCache(m.cacheIgnoredFiles))
 	if err := ignores.Load(filepath.Join(cfg.Path(), ".stignore")); err != nil && !os.IsNotExist(err) {
 		l.Warnln("Loading ignores:", err)
 	}
@@ -811,6 +809,11 @@ func (m *Model) ClusterConfig(deviceID protocol.DeviceID, cm protocol.ClusterCon
 			continue
 		}
 
+		if m.cfg.IgnoredFolder(folder.ID) {
+			l.Infof("Ignoring folder %s from device %s since we are configured to", folder.Description(), deviceID)
+			continue
+		}
+
 		if !m.folderSharedWithLocked(folder.ID, deviceID) {
 			events.Default.Log(events.FolderRejected, map[string]string{
 				"folder":      folder.ID,
@@ -1257,7 +1260,7 @@ func (m *Model) GetIgnores(folder string) ([]string, []string, error) {
 	}
 
 	if cfg, ok := m.cfg.Folders()[folder]; ok {
-		matcher := ignore.New(false)
+		matcher := ignore.New()
 		path := filepath.Join(cfg.Path(), ".stignore")
 		if err := matcher.Load(path); err != nil {
 			return nil, nil, err
@@ -1320,9 +1323,13 @@ func (m *Model) OnHello(remoteID protocol.DeviceID, addr net.Addr, hello protoco
 }
 
 // GetHello is called when we are about to connect to some remote device.
-func (m *Model) GetHello(protocol.DeviceID) protocol.HelloIntf {
+func (m *Model) GetHello(id protocol.DeviceID) protocol.HelloIntf {
+	name := ""
+	if _, ok := m.cfg.Device(id); ok {
+		name = m.cfg.MyName()
+	}
 	return &protocol.Hello{
-		DeviceName:    m.deviceName,
+		DeviceName:    name,
 		ClientName:    m.clientName,
 		ClientVersion: m.clientVersion,
 	}
@@ -1634,7 +1641,8 @@ func (m *Model) diskChangeDetected(folderCfg config.FolderConfiguration, files [
 
 		// Two different events can be fired here based on what EventType is passed into function
 		events.Default.Log(typeOfEvent, map[string]string{
-			"folderID":   folderCfg.ID,
+			"folder":     folderCfg.ID,
+			"folderID":   folderCfg.ID, // incorrect, deprecated, kept for historical compliance
 			"label":      folderCfg.Label,
 			"action":     action,
 			"type":       objType,

lib/model/model_test.go

@@ -88,7 +88,7 @@ func init() {
 func TestRequest(t *testing.T) {
 	db := db.OpenMemory()
 
-	m := NewModel(defaultConfig, protocol.LocalDeviceID, "device", "syncthing", "dev", db, nil)
+	m := NewModel(defaultConfig, protocol.LocalDeviceID, "syncthing", "dev", db, nil)
 
 	// device1 shares default, but device2 doesn't
 	m.AddFolder(defaultFolderConfig)
@@ -166,7 +166,7 @@ func BenchmarkIndex_100(b *testing.B) {
 
 func benchmarkIndex(b *testing.B, nfiles int) {
 	db := db.OpenMemory()
-	m := NewModel(defaultConfig, protocol.LocalDeviceID, "device", "syncthing", "dev", db, nil)
+	m := NewModel(defaultConfig, protocol.LocalDeviceID, "syncthing", "dev", db, nil)
 	m.AddFolder(defaultFolderConfig)
 	m.StartFolder("default")
 	m.ServeBackground()
@@ -196,7 +196,7 @@ func BenchmarkIndexUpdate_10000_1(b *testing.B) {
 
 func benchmarkIndexUpdate(b *testing.B, nfiles, nufiles int) {
 	db := db.OpenMemory()
-	m := NewModel(defaultConfig, protocol.LocalDeviceID, "device", "syncthing", "dev", db, nil)
+	m := NewModel(defaultConfig, protocol.LocalDeviceID, "syncthing", "dev", db, nil)
 	m.AddFolder(defaultFolderConfig)
 	m.StartFolder("default")
 	m.ServeBackground()
@@ -356,7 +356,7 @@ func (f *fakeConnection) sendIndexUpdate() {
 
 func BenchmarkRequestOut(b *testing.B) {
 	db := db.OpenMemory()
-	m := NewModel(defaultConfig, protocol.LocalDeviceID, "device", "syncthing", "dev", db, nil)
+	m := NewModel(defaultConfig, protocol.LocalDeviceID, "syncthing", "dev", db, nil)
 	m.AddFolder(defaultFolderConfig)
 	m.ServeBackground()
 	defer m.Stop()
@@ -386,7 +386,7 @@ func BenchmarkRequestOut(b *testing.B) {
 
 func BenchmarkRequestInSingleFile(b *testing.B) {
 	db := db.OpenMemory()
-	m := NewModel(defaultConfig, protocol.LocalDeviceID, "device", "syncthing", "dev", db, nil)
+	m := NewModel(defaultConfig, protocol.LocalDeviceID, "syncthing", "dev", db, nil)
 	m.AddFolder(defaultFolderConfig)
 	m.ServeBackground()
 	defer m.Stop()
@@ -426,7 +426,7 @@ func TestDeviceRename(t *testing.T) {
 	cfg := config.Wrap("tmpconfig.xml", rawCfg)
 
 	db := db.OpenMemory()
-	m := NewModel(cfg, protocol.LocalDeviceID, "device", "syncthing", "dev", db, nil)
+	m := NewModel(cfg, protocol.LocalDeviceID, "syncthing", "dev", db, nil)
 
 	if cfg.Devices()[device1].Name != "" {
 		t.Errorf("Device already has a name")
@@ -512,7 +512,7 @@ func TestClusterConfig(t *testing.T) {
 
 	db := db.OpenMemory()
 
-	m := NewModel(config.Wrap("/tmp/test", cfg), protocol.LocalDeviceID, "device", "syncthing", "dev", db, nil)
+	m := NewModel(config.Wrap("/tmp/test", cfg), protocol.LocalDeviceID, "syncthing", "dev", db, nil)
 	m.AddFolder(cfg.Folders[0])
 	m.AddFolder(cfg.Folders[1])
 	m.ServeBackground()
@@ -586,7 +586,7 @@ func TestIntroducer(t *testing.T) {
 
 		wcfg := config.Wrap("/tmp/test", cfg)
 
-		m := NewModel(wcfg, protocol.LocalDeviceID, "device", "syncthing", "dev", db, nil)
+		m := NewModel(wcfg, protocol.LocalDeviceID, "syncthing", "dev", db, nil)
 		for _, folder := range cfg.Folders {
 			m.AddFolder(folder)
 		}
@@ -953,14 +953,6 @@ func changeIgnores(t *testing.T, m *Model, expected []string) {
 
 	ignores = append(ignores, "pox")
 
-	if runtime.GOOS == "darwin" {
-		// Mac has seconds-only timestamp precision, which tricks the ignore
-		// system into thinking the file has not changed. Work around it in
-		// an ugly way...
-		time.Sleep(time.Second)
-	} else {
-		time.Sleep(time.Millisecond)
-	}
 	err = m.SetIgnores("default", ignores)
 	if err != nil {
 		t.Error(err)
@@ -1002,7 +994,7 @@ func TestIgnores(t *testing.T) {
 	ioutil.WriteFile("testdata/.stignore", []byte(".*\nquux\n"), 0644)
 
 	db := db.OpenMemory()
-	m := NewModel(defaultConfig, protocol.LocalDeviceID, "device", "syncthing", "dev", db, nil)
+	m := NewModel(defaultConfig, protocol.LocalDeviceID, "syncthing", "dev", db, nil)
 	m.ServeBackground()
 	defer m.Stop()
 
@@ -1011,6 +1003,14 @@ func TestIgnores(t *testing.T) {
 	m.AddFolder(defaultFolderConfig)
 	m.StartFolder("default")
 
+	// Reach in and update the ignore matcher to one that always does
+	// reloads when asked to, instead of checking file mtimes. This is
+	// because we will be changing the files on disk often enough that the
+	// mtimes will be unreliable to determine change status.
+	m.fmut.Lock()
+	m.folderIgnores["default"] = ignore.New(ignore.WithCache(true), ignore.WithChangeDetector(newAlwaysChanged()))
+	m.fmut.Unlock()
+
 	// Make sure the initial scan has finished (ScanFolders is blocking)
 	m.ScanFolders()
 
@@ -1073,7 +1073,7 @@ func TestROScanRecovery(t *testing.T) {
 
 	os.RemoveAll(fcfg.RawPath)
 
-	m := NewModel(cfg, protocol.LocalDeviceID, "device", "syncthing", "dev", ldb, nil)
+	m := NewModel(cfg, protocol.LocalDeviceID, "syncthing", "dev", ldb, nil)
 	m.AddFolder(fcfg)
 	m.StartFolder("default")
 	m.ServeBackground()
@@ -1160,7 +1160,7 @@ func TestRWScanRecovery(t *testing.T) {
 
 	os.RemoveAll(fcfg.RawPath)
 
-	m := NewModel(cfg, protocol.LocalDeviceID, "device", "syncthing", "dev", ldb, nil)
+	m := NewModel(cfg, protocol.LocalDeviceID, "syncthing", "dev", ldb, nil)
 	m.AddFolder(fcfg)
 	m.StartFolder("default")
 	m.ServeBackground()
@@ -1225,7 +1225,7 @@ func TestRWScanRecovery(t *testing.T) {
 
 func TestGlobalDirectoryTree(t *testing.T) {
 	db := db.OpenMemory()
-	m := NewModel(defaultConfig, protocol.LocalDeviceID, "device", "syncthing", "dev", db, nil)
+	m := NewModel(defaultConfig, protocol.LocalDeviceID, "syncthing", "dev", db, nil)
 	m.AddFolder(defaultFolderConfig)
 	m.ServeBackground()
 	defer m.Stop()
@@ -1477,7 +1477,7 @@ func TestGlobalDirectoryTree(t *testing.T) {
 
 func TestGlobalDirectorySelfFixing(t *testing.T) {
 	db := db.OpenMemory()
-	m := NewModel(defaultConfig, protocol.LocalDeviceID, "device", "syncthing", "dev", db, nil)
+	m := NewModel(defaultConfig, protocol.LocalDeviceID, "syncthing", "dev", db, nil)
 	m.AddFolder(defaultFolderConfig)
 	m.ServeBackground()
 
@@ -1652,7 +1652,7 @@ func BenchmarkTree_100_10(b *testing.B) {
 
 func benchmarkTree(b *testing.B, n1, n2 int) {
 	db := db.OpenMemory()
-	m := NewModel(defaultConfig, protocol.LocalDeviceID, "device", "syncthing", "dev", db, nil)
+	m := NewModel(defaultConfig, protocol.LocalDeviceID, "syncthing", "dev", db, nil)
 	m.AddFolder(defaultFolderConfig)
 	m.ServeBackground()
 
@@ -1787,7 +1787,7 @@ func TestIssue3028(t *testing.T) {
 	// Create a model and default folder
 
 	db := db.OpenMemory()
-	m := NewModel(defaultConfig, protocol.LocalDeviceID, "device", "syncthing", "dev", db, nil)
+	m := NewModel(defaultConfig, protocol.LocalDeviceID, "syncthing", "dev", db, nil)
 	defCfg := defaultFolderConfig.Copy()
 	defCfg.RescanIntervalS = 86400
 	m.AddFolder(defCfg)
@@ -1843,7 +1843,7 @@ func TestIssue3164(t *testing.T) {
 	f := protocol.FileInfo{
 		Name: "issue3164",
 	}
-	m := ignore.New(false)
+	m := ignore.New()
 	if err := m.Parse(bytes.NewBufferString("(?d)oktodelete"), ""); err != nil {
 		t.Fatal(err)
 	}
@@ -1865,7 +1865,7 @@ func TestScanNoDatabaseWrite(t *testing.T) {
 	// something actually changed.
 
 	db := db.OpenMemory()
-	m := NewModel(defaultConfig, protocol.LocalDeviceID, "device", "syncthing", "dev", db, nil)
+	m := NewModel(defaultConfig, protocol.LocalDeviceID, "syncthing", "dev", db, nil)
 	m.AddFolder(defaultFolderConfig)
 	m.StartFolder("default")
 	m.ServeBackground()
@@ -1949,7 +1949,7 @@ func TestIssue2782(t *testing.T) {
 	defer os.RemoveAll(testDir)
 
 	db := db.OpenMemory()
-	m := NewModel(defaultConfig, protocol.LocalDeviceID, "device", "syncthing", "dev", db, nil)
+	m := NewModel(defaultConfig, protocol.LocalDeviceID, "syncthing", "dev", db, nil)
 	m.AddFolder(config.NewFolderConfiguration("default", "~/"+testName+"/synclink/"))
 	m.StartFolder("default")
 	m.ServeBackground()
@@ -1975,7 +1975,7 @@ func TestIndexesForUnknownDevicesDropped(t *testing.T) {
 		t.Error("expected two devices")
 	}
 
-	m := NewModel(defaultConfig, protocol.LocalDeviceID, "device", "syncthing", "dev", dbi, nil)
+	m := NewModel(defaultConfig, protocol.LocalDeviceID, "syncthing", "dev", dbi, nil)
 	m.AddFolder(defaultFolderConfig)
 	m.StartFolder("default")
 
@@ -2009,7 +2009,7 @@ func TestSharedWithClearedOnDisconnect(t *testing.T) {
 
 	wcfg := config.Wrap("/tmp/test", cfg)
 
-	m := NewModel(wcfg, protocol.LocalDeviceID, "device", "syncthing", "dev", dbi, nil)
+	m := NewModel(wcfg, protocol.LocalDeviceID, "syncthing", "dev", dbi, nil)
 	m.AddFolder(fcfg)
 	m.StartFolder(fcfg.ID)
 	m.ServeBackground()
@@ -2123,7 +2123,7 @@ func TestIssue3496(t *testing.T) {
 	// checks on the completion calculation stuff.
 
 	dbi := db.OpenMemory()
-	m := NewModel(defaultConfig, protocol.LocalDeviceID, "device", "syncthing", "dev", dbi, nil)
+	m := NewModel(defaultConfig, protocol.LocalDeviceID, "syncthing", "dev", dbi, nil)
 	m.AddFolder(defaultFolderConfig)
 	m.StartFolder("default")
 	m.ServeBackground()
@@ -2196,7 +2196,7 @@ func TestIssue3496(t *testing.T) {
 
 func TestIssue3804(t *testing.T) {
 	dbi := db.OpenMemory()
-	m := NewModel(defaultConfig, protocol.LocalDeviceID, "device", "syncthing", "dev", dbi, nil)
+	m := NewModel(defaultConfig, protocol.LocalDeviceID, "syncthing", "dev", dbi, nil)
 	m.AddFolder(defaultFolderConfig)
 	m.StartFolder("default")
 	m.ServeBackground()
@@ -2211,7 +2211,7 @@ func TestIssue3804(t *testing.T) {
 
 func TestIssue3829(t *testing.T) {
 	dbi := db.OpenMemory()
-	m := NewModel(defaultConfig, protocol.LocalDeviceID, "device", "syncthing", "dev", dbi, nil)
+	m := NewModel(defaultConfig, protocol.LocalDeviceID, "syncthing", "dev", dbi, nil)
 	m.AddFolder(defaultFolderConfig)
 	m.StartFolder("default")
 	m.ServeBackground()
@@ -2248,7 +2248,7 @@ func TestNoRequestsFromPausedDevices(t *testing.T) {
 
 	wcfg := config.Wrap("/tmp/test", cfg)
 
-	m := NewModel(wcfg, protocol.LocalDeviceID, "device", "syncthing", "dev", dbi, nil)
+	m := NewModel(wcfg, protocol.LocalDeviceID, "syncthing", "dev", dbi, nil)
 	m.AddFolder(fcfg)
 	m.StartFolder(fcfg.ID)
 	m.ServeBackground()
@@ -2490,3 +2490,31 @@ func (fakeAddr) Network() string {
 func (fakeAddr) String() string {
 	return "address"
 }
+
+// alwaysChanges is an ignore.ChangeDetector that always returns true on Changed()
+type alwaysChanged struct {
+	seen map[string]struct{}
+}
+
+func newAlwaysChanged() *alwaysChanged {
+	return &alwaysChanged{
+		seen: make(map[string]struct{}),
+	}
+}
+
+func (c *alwaysChanged) Remember(name string, _ time.Time) {
+	c.seen[name] = struct{}{}
+}
+
+func (c *alwaysChanged) Reset() {
+	c.seen = make(map[string]struct{})
+}
+
+func (c *alwaysChanged) Seen(name string) bool {
+	_, ok := c.seen[name]
+	return ok
+}
+
+func (c *alwaysChanged) Changed() bool {
+	return true
+}

lib/model/requests_test.go

@@ -215,7 +215,7 @@ func setupModelWithConnection() (*Model, *fakeConnection) {
 	w := config.Wrap("/tmp/cfg", cfg)
 
 	db := db.OpenMemory()
-	m := NewModel(w, device1, "device", "syncthing", "dev", db, nil)
+	m := NewModel(w, device1, "syncthing", "dev", db, nil)
 	m.AddFolder(cfg.Folders[0])
 	m.ServeBackground()
 	m.StartFolder("default")

lib/model/rwfolder.go

@@ -852,7 +852,9 @@ func (f *sendReceiveFolder) deleteFile(file protocol.FileInfo) {
 		// of deleting. Also merge with the version vector we had, to indicate
 		// we have resolved the conflict.
 		file.Version = file.Version.Merge(cur.Version)
-		err = osutil.InWritableDir(f.moveForConflict, realName)
+		err = osutil.InWritableDir(func(name string) error {
+			return f.moveForConflict(name, file.ModifiedBy.String())
+		}, realName)
 	} else if f.versioner != nil {
 		err = osutil.InWritableDir(f.versioner.Archive, realName)
 	} else {
@@ -1454,7 +1456,10 @@ func (f *sendReceiveFolder) performFinish(state *sharedPullerState) error {
 			// we have resolved the conflict.
 
 			state.file.Version = state.file.Version.Merge(state.version)
-			if err = osutil.InWritableDir(f.moveForConflict, state.realName); err != nil {
+			err = osutil.InWritableDir(func(name string) error {
+				return f.moveForConflict(name, state.file.ModifiedBy.String())
+			}, state.realName)
+			if err != nil {
 				return err
 			}
 
@@ -1661,7 +1666,7 @@ func removeAvailability(availabilities []Availability, availability Availability
 	return availabilities
 }
 
-func (f *sendReceiveFolder) moveForConflict(name string) error {
+func (f *sendReceiveFolder) moveForConflict(name string, lastModBy string) error {
 	if strings.Contains(filepath.Base(name), ".sync-conflict-") {
 		l.Infoln("Conflict for", name, "which is already a conflict copy; not copying again.")
 		if err := os.Remove(name); err != nil && !os.IsNotExist(err) {
@@ -1679,7 +1684,7 @@ func (f *sendReceiveFolder) moveForConflict(name string) error {
 
 	ext := filepath.Ext(name)
 	withoutExt := name[:len(name)-len(ext)]
-	newName := withoutExt + time.Now().Format(".sync-conflict-20060102-150405") + ext
+	newName := withoutExt + time.Now().Format(".sync-conflict-20060102-150405-") + lastModBy + ext
 	err := os.Rename(name, newName)
 	if os.IsNotExist(err) {
 		// We were supposed to move a file away but it does not exist. Either
@@ -1689,7 +1694,7 @@ func (f *sendReceiveFolder) moveForConflict(name string) error {
 		err = nil
 	}
 	if f.MaxConflicts > -1 {
-		matches, gerr := osutil.Glob(withoutExt + ".sync-conflict-????????-??????" + ext)
+		matches, gerr := osutil.Glob(withoutExt + ".sync-conflict-????????-??????*" + ext)
 		if gerr == nil && len(matches) > f.MaxConflicts {
 			sort.Sort(sort.Reverse(sort.StringSlice(matches)))
 			for _, match := range matches[f.MaxConflicts:] {

lib/model/rwfolder_test.go

@@ -71,7 +71,7 @@ func setUpFile(filename string, blockNumbers []int) protocol.FileInfo {
 
 func setUpModel(file protocol.FileInfo) *Model {
 	db := db.OpenMemory()
-	model := NewModel(defaultConfig, protocol.LocalDeviceID, "device", "syncthing", "dev", db, nil)
+	model := NewModel(defaultConfig, protocol.LocalDeviceID, "syncthing", "dev", db, nil)
 	model.AddFolder(defaultFolderConfig)
 	// Update index
 	model.updateLocalsFromScanning("default", []protocol.FileInfo{file})
@@ -476,7 +476,7 @@ func TestDeregisterOnFailInCopy(t *testing.T) {
 
 	db := db.OpenMemory()
 
-	m := NewModel(defaultConfig, protocol.LocalDeviceID, "device", "syncthing", "dev", db, nil)
+	m := NewModel(defaultConfig, protocol.LocalDeviceID, "syncthing", "dev", db, nil)
 	m.AddFolder(defaultFolderConfig)
 
 	f := setUpSendReceiveFolder(m)
@@ -549,7 +549,7 @@ func TestDeregisterOnFailInPull(t *testing.T) {
 	defer os.Remove("testdata/" + ignore.TempName("filex"))
 
 	db := db.OpenMemory()
-	m := NewModel(defaultConfig, protocol.LocalDeviceID, "device", "syncthing", "dev", db, nil)
+	m := NewModel(defaultConfig, protocol.LocalDeviceID, "syncthing", "dev", db, nil)
 	m.AddFolder(defaultFolderConfig)
 
 	f := setUpSendReceiveFolder(m)

lib/protocol/deviceid.go

@@ -11,9 +11,8 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/syncthing/syncthing/lib/sha256"
-
 	"github.com/calmh/luhn"
+	"github.com/syncthing/syncthing/lib/sha256"
 )
 
 const DeviceIDLength = 32
@@ -124,7 +123,7 @@ func (n *DeviceID) UnmarshalText(bs []byte) error {
 		copy(n[:], dec)
 		return nil
 	default:
-		return errors.New("device ID invalid: incorrect length")
+		return fmt.Errorf("%q: device ID invalid: incorrect length", bs)
 	}
 }
 
@@ -145,7 +144,7 @@ func (n *DeviceID) MarshalTo(bs []byte) (int, error) {
 func (n *DeviceID) Unmarshal(bs []byte) error {
 	// Used by protobuf marshaller.
 	if len(bs) < DeviceIDLength {
-		return errors.New("not enough data")
+		return fmt.Errorf("%q: not enough data", bs)
 	}
 	copy((*n)[:], bs)
 	return nil
@@ -170,7 +169,7 @@ func luhnify(s string) (string, error) {
 
 func unluhnify(s string) (string, error) {
 	if len(s) != 56 {
-		return "", fmt.Errorf("unsupported string length %d", len(s))
+		return "", fmt.Errorf("%q: unsupported string length %d", s, len(s))
 	}
 
 	res := make([]string, 0, 4)
@@ -181,7 +180,7 @@ func unluhnify(s string) (string, error) {
 			return "", err
 		}
 		if g := fmt.Sprintf("%s%c", p, l); g != s[i*14:(i+1)*14] {
-			return "", errors.New("check digit incorrect")
+			return "", fmt.Errorf("%q: check digit incorrect", s)
 		}
 		res = append(res, p)
 	}

lib/scanner/walk_test.go

@@ -54,7 +54,7 @@ func init() {
 }
 
 func TestWalkSub(t *testing.T) {
-	ignores := ignore.New(false)
+	ignores := ignore.New()
 	err := ignores.Load("testdata/.stignore")
 	if err != nil {
 		t.Fatal(err)
@@ -90,7 +90,7 @@ func TestWalkSub(t *testing.T) {
 }
 
 func TestWalk(t *testing.T) {
-	ignores := ignore.New(false)
+	ignores := ignore.New()
 	err := ignores.Load("testdata/.stignore")
 	if err != nil {
 		t.Fatal(err)

man/stdiscosrv.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "STDISCOSRV" "1" "April 23, 2017" "v0.14" "Syncthing"
+.TH "STDISCOSRV" "1" "May 17, 2017" "v0.14" "Syncthing"
 .SH NAME
 stdiscosrv \- Syncthing Discovery Server
 .

man/strelaysrv.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "STRELAYSRV" "1" "April 23, 2017" "v0.14" "Syncthing"
+.TH "STRELAYSRV" "1" "May 17, 2017" "v0.14" "Syncthing"
 .SH NAME
 strelaysrv \- Syncthing Relay Server
 .

man/syncthing-bep.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-BEP" "7" "April 23, 2017" "v0.14" "Syncthing"
+.TH "SYNCTHING-BEP" "7" "May 17, 2017" "v0.14" "Syncthing"
 .SH NAME
 syncthing-bep \- Block Exchange Protocol v1
 .

man/syncthing-config.5

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-CONFIG" "5" "April 23, 2017" "v0.14" "Syncthing"
+.TH "SYNCTHING-CONFIG" "5" "May 17, 2017" "v0.14" "Syncthing"
 .SH NAME
 syncthing-config \- Syncthing Configuration
 .

man/syncthing-device-ids.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-DEVICE-IDS" "7" "April 23, 2017" "v0.14" "Syncthing"
+.TH "SYNCTHING-DEVICE-IDS" "7" "May 17, 2017" "v0.14" "Syncthing"
 .SH NAME
 syncthing-device-ids \- Understanding Device IDs
 .

man/syncthing-event-api.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-EVENT-API" "7" "April 23, 2017" "v0.14" "Syncthing"
+.TH "SYNCTHING-EVENT-API" "7" "May 17, 2017" "v0.14" "Syncthing"
 .SH NAME
 syncthing-event-api \- Event API
 .

man/syncthing-faq.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-FAQ" "7" "April 23, 2017" "v0.14" "Syncthing"
+.TH "SYNCTHING-FAQ" "7" "May 17, 2017" "v0.14" "Syncthing"
 .SH NAME
 syncthing-faq \- Frequently Asked Questions
 .
@@ -110,10 +110,10 @@ manner. This means that renaming a large file will not cause a retransmission of
 that file. Additionally, appending data to existing large files should be
 handled efficiently as well.
 .sp
-Temporary files are used to store partial data downloaded from other devices.
-They are automatically removed whenever a file transfer has been completed or
-after the configured amount of time which is set in the configuration file (24
-hours by default).
+Temporary files are used to store partial data
+downloaded from other devices. They are automatically removed whenever a file
+transfer has been completed or after the configured amount of time which is set
+in the configuration file (24 hours by default).
 .SS Why is the sync so slow?
 .sp
 When troubleshooting a slow sync, there are a number of things to check.

man/syncthing-globaldisco.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-GLOBALDISCO" "7" "April 23, 2017" "v0.14" "Syncthing"
+.TH "SYNCTHING-GLOBALDISCO" "7" "May 17, 2017" "v0.14" "Syncthing"
 .SH NAME
 syncthing-globaldisco \- Global Discovery Protocol v3
 .

man/syncthing-localdisco.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-LOCALDISCO" "7" "April 23, 2017" "v0.14" "Syncthing"
+.TH "SYNCTHING-LOCALDISCO" "7" "May 17, 2017" "v0.14" "Syncthing"
 .SH NAME
 syncthing-localdisco \- Local Discovery Protocol v4
 .

man/syncthing-networking.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-NETWORKING" "7" "April 23, 2017" "v0.14" "Syncthing"
+.TH "SYNCTHING-NETWORKING" "7" "May 17, 2017" "v0.14" "Syncthing"
 .SH NAME
 syncthing-networking \- Firewall Setup
 .

man/syncthing-relay.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-RELAY" "7" "April 23, 2017" "v0.14" "Syncthing"
+.TH "SYNCTHING-RELAY" "7" "May 17, 2017" "v0.14" "Syncthing"
 .SH NAME
 syncthing-relay \- Relay Protocol v1
 .

man/syncthing-rest-api.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-REST-API" "7" "April 23, 2017" "v0.14" "Syncthing"
+.TH "SYNCTHING-REST-API" "7" "May 17, 2017" "v0.14" "Syncthing"
 .SH NAME
 syncthing-rest-api \- REST API
 .
@@ -72,8 +72,10 @@ Returns the current configuration.
           "autoNormalize": true,
           "minDiskFreePct": 1,
           "versioning": {
-            "type": "",
-            "params": {}
+            "type": "simple",
+            "params": {
+              "keep": "5"
+            }
           },
           "copiers": 0,
           "pullers": 0,
@@ -144,7 +146,6 @@ Returns the current configuration.
         "keepTemporariesH": 24,
         "cacheIgnoredFiles": false,
         "progressUpdateIntervalS": 5,
-        "symlinksEnabled": true,
         "limitBandwidthInLan": false,
         "minHomeDiskFreePct": 1,
         "releasesURL": "https://upgrades.syncthing.net/meta.json",

man/syncthing-security.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-SECURITY" "7" "April 23, 2017" "v0.14" "Syncthing"
+.TH "SYNCTHING-SECURITY" "7" "May 17, 2017" "v0.14" "Syncthing"
 .SH NAME
 syncthing-security \- Security Principles
 .

man/syncthing-stignore.5

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-STIGNORE" "5" "April 23, 2017" "v0.14" "Syncthing"
+.TH "SYNCTHING-STIGNORE" "5" "May 17, 2017" "v0.14" "Syncthing"
 .SH NAME
 syncthing-stignore \- Prevent files from being synchronized to other nodes
 .

man/syncthing-versioning.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-VERSIONING" "7" "April 23, 2017" "v0.14" "Syncthing"
+.TH "SYNCTHING-VERSIONING" "7" "May 17, 2017" "v0.14" "Syncthing"
 .SH NAME
 syncthing-versioning \- Keep automatic backups of deleted files by other nodes
 .

man/syncthing.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING" "1" "April 23, 2017" "v0.14" "Syncthing"
+.TH "SYNCTHING" "1" "May 17, 2017" "v0.14" "Syncthing"
 .SH NAME
 syncthing \- Syncthing
 .

script/translate.go

@@ -24,7 +24,7 @@ var attrRe = regexp.MustCompile(`\{\{'([^']+)'\s+\|\s+translate\}\}`)
 
 // exceptions to the untranslated text warning
 var noStringRe = regexp.MustCompile(
-	`^((\W*\{\{.*?\}\} ?.?\W*)+(\.stignore)?|[^a-zA-Z]+.?[^a-zA-Z]*|Twitter|JS\W?|DEV|https?://\S+)$`)
+	`^((\W*\{\{.*?\}\} ?.?\/?.?(bps)?\W*)+(\.stignore)?|[^a-zA-Z]+.?[^a-zA-Z]*|[kMGT]?B|Twitter|JS\W?|DEV|https?://\S+)$`)
 
 // exceptions to the untranslated text warning specific to aboutModalView.html
 var aboutRe = regexp.MustCompile(`^([^/]+/[^/]+|(The Go Pro|Font Awesome ).+)$`)
@@ -40,7 +40,6 @@ func generalNode(n *html.Node, filename string) {
 			for _, a := range n.Attr {
 				if a.Key == "translate" {
 					translate = true
-					break
 				} else if a.Key == "id" && (a.Val == "contributor-list" ||
 					a.Val == "copyright-notices") {
 					// Don't translate a list of names and

vendor/github.com/gogo/protobuf/.gitignore

@@ -0,0 +1,3 @@
+._*
+*.js
+*.js.map

vendor/github.com/gogo/protobuf/.mailmap

@@ -0,0 +1,8 @@
+Walter Schulze	<awalterschulze@gmail.com>	Walter Schulze <walter@vastech.co.za>
+Walter Schulze	<awalterschulze@gmail.com>	<walter@vastech.co.za>
+Walter Schulze	<awalterschulze@gmail.com>  awalterschulze <awalterschulze@gmail.com>
+Walter Schulze	<awalterschulze@gmail.com>	awalterschulze@gmail.com <awalterschulze@gmail.com>
+John Tuley		<john@tuley.org>			<jtuley@pivotal.io>
+Anton Povarov 	<anton.povarov@gmail.com>	<antoxa@corp.badoo.com>
+Denis Smirnov 	<denis.smirnov.91@gmail.com> dennwc
+DongYun Kang    <ceram1000@gmail.com>		<ceram1000@gmail.com>

vendor/github.com/gogo/protobuf/.travis.yml

@@ -0,0 +1,20 @@
+env:
+  - PROTOBUF_VERSION=2.6.1
+  - PROTOBUF_VERSION=3.0.2
+  - PROTOBUF_VERSION=3.3.0
+
+before_install:
+  - ./install-protobuf.sh
+  - PATH=/home/travis/bin:$PATH protoc --version
+
+script:
+  - PATH=/home/travis/bin:$PATH make buildserverall
+  - echo $TRAVIS_GO_VERSION
+  - if [ "$TRAVIS_GO_VERSION" == 1.8 ] && [[ "$PROTOBUF_VERSION" == 3.3.0 ]]; then ! git status --porcelain | read || (git status; git diff; exit 1); fi
+
+language: go
+
+go:
+  - 1.7.1
+  - 1.8
+

vendor/github.com/gogo/protobuf/AUTHORS

@@ -0,0 +1,14 @@
+# This is the official list of GoGo authors for copyright purposes.
+# This file is distinct from the CONTRIBUTORS file, which
+# lists people.  For example, employees are listed in CONTRIBUTORS,
+# but not in AUTHORS, because the employer holds the copyright.
+
+# Names should be added to this file as one of
+#     Organization's name
+#     Individual's name <submission email address>
+#     Individual's name <submission email address> <email2> <emailN>
+
+# Please keep the list sorted.
+
+Vastech SA (PTY) LTD
+Walter Schulze <awalterschulze@gmail.com>

vendor/github.com/gogo/protobuf/CONTRIBUTORS

@@ -0,0 +1,19 @@
+Anton Povarov <anton.povarov@gmail.com>
+Brian Goff <cpuguy83@gmail.com>
+Clayton Coleman <ccoleman@redhat.com>
+Denis Smirnov <denis.smirnov.91@gmail.com>
+DongYun Kang <ceram1000@gmail.com>
+Dwayne Schultz <dschultz@pivotal.io>
+Georg Apitz <gapitz@pivotal.io>
+Gustav Paul <gustav.paul@gmail.com>
+Johan Brandhorst <johan.brandhorst@gmail.com>
+John Shahid <jvshahid@gmail.com>
+John Tuley <john@tuley.org>
+Laurent <laurent@adyoulike.com>
+Patrick Lee <patrick@dropbox.com>
+Sergio Arbeo <serabe@gmail.com>
+Stephen J Day <stephen.day@docker.com>
+Tamir Duberstein <tamird@gmail.com>
+Todd Eisenberger <teisenberger@dropbox.com>
+Tormod Erevik Lea <tormodlea@gmail.com>
+Walter Schulze <awalterschulze@gmail.com>

vendor/github.com/gogo/protobuf/GOLANG_CONTRIBUTORS

@@ -0,0 +1,5 @@
+The contributors to the Go protobuf repository:
+
+# This source code was written by the Go contributors.
+# The master list of contributors is in the main Go distribution,
+# visible at http://tip.golang.org/CONTRIBUTORS.

vendor/github.com/gogo/protobuf/Makefile

@@ -0,0 +1,154 @@
+# Protocol Buffers for Go with Gadgets
+#
+# Copyright (c) 2013, The GoGo Authors. All rights reserved.
+# http://github.com/gogo/protobuf
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+GO_VERSION:=$(shell go version)
+
+.PHONY: nuke regenerate tests clean install gofmt vet contributors
+
+all: clean install regenerate install tests errcheck vet
+
+buildserverall: clean install regenerate install tests vet js
+
+install:
+	go install ./proto
+	go install ./gogoproto
+	go install ./jsonpb
+	go install ./protoc-gen-gogo
+	go install ./protoc-gen-gofast
+	go install ./protoc-gen-gogofast
+	go install ./protoc-gen-gogofaster
+	go install ./protoc-gen-gogoslick
+	go install ./protoc-gen-gostring
+	go install ./protoc-min-version
+	go install ./protoc-gen-combo
+	go install ./gogoreplace
+
+clean:
+	go clean ./...
+
+nuke:
+	go clean -i ./...
+
+gofmt:
+	gofmt -l -s -w .
+
+regenerate:
+	make -C protoc-gen-gogo/descriptor regenerate
+	make -C protoc-gen-gogo/plugin regenerate
+	make -C protoc-gen-gogo/testdata regenerate
+	make -C gogoproto regenerate
+	make -C proto/testdata regenerate
+	make -C jsonpb/jsonpb_test_proto regenerate
+	make -C _conformance regenerate
+	make -C types regenerate
+	make -C test regenerate
+	make -C test/example regenerate
+	make -C test/unrecognized regenerate
+	make -C test/group regenerate
+	make -C test/unrecognizedgroup regenerate
+	make -C test/enumstringer regenerate
+	make -C test/unmarshalmerge regenerate
+	make -C test/moredefaults regenerate
+	make -C test/issue8 regenerate
+	make -C test/enumprefix regenerate
+	make -C test/enumcustomname regenerate
+	make -C test/packed regenerate
+	make -C test/protosize regenerate
+	make -C test/tags regenerate
+	make -C test/oneof regenerate
+	make -C test/oneof3 regenerate
+	make -C test/theproto3 regenerate
+	make -C test/mapsproto2 regenerate
+	make -C test/issue42order regenerate
+	make -C proto generate-test-pbs
+	make -C test/importdedup regenerate
+	make -C test/custombytesnonstruct regenerate
+	make -C test/required regenerate
+	make -C test/casttype regenerate
+	make -C test/castvalue regenerate
+	make -C vanity/test regenerate
+	make -C test/sizeunderscore regenerate
+	make -C test/issue34 regenerate
+	make -C test/empty-issue70 regenerate
+	make -C test/indeximport-issue72 regenerate
+	make -C test/fuzztests regenerate
+	make -C test/oneofembed regenerate
+	make -C test/asymetric-issue125 regenerate
+	make -C test/filedotname regenerate
+	make -C test/nopackage regenerate
+	make -C test/types regenerate
+	make -C test/proto3extension regenerate
+	make -C test/stdtypes regenerate
+	make -C test/data regenerate
+	make -C test/typedecl regenerate
+	make -C test/issue260 regenerate
+	make -C test/issue261 regenerate
+	make -C test/issue262 regenerate
+	make -C test/enumdecl regenerate
+	make -C test/typedecl_all regenerate
+	make -C test/enumdecl_all regenerate
+	make gofmt
+
+tests:
+	go build ./test/enumprefix
+	go test ./...
+
+vet:
+	go vet ./...
+	go tool vet --shadow .
+
+errcheck:
+	go get github.com/kisielk/errcheck
+	errcheck ./test/...
+
+drone:
+	sudo apt-get install protobuf-compiler
+	(cd $(GOPATH)/src/github.com/gogo/protobuf && make buildserverall)
+
+testall:
+	go get -u github.com/golang/protobuf/proto
+	make -C protoc-gen-gogo/testdata test
+	make -C vanity/test test
+	make -C test/registration test
+	make tests
+
+bench:
+	(cd test/mixbench && go build .)
+	(cd test/mixbench && ./mixbench)
+
+contributors:
+	git log --format='%aN <%aE>' | sort -fu > CONTRIBUTORS
+
+js:
+ifeq (go1.8, $(findstring go1.8, $(GO_VERSION)))
+	go get github.com/gopherjs/gopherjs
+	gopherjs build github.com/gogo/protobuf/protoc-gen-gogo
+endif
+
+update:
+	(cd protobuf && make update)