Translation update

Fall back to %AppData% is %LocalAppData% is blank (fixes #1446)

AUTHORS

@@ -13,6 +13,7 @@ Brendan Long <self@brendanlong.com>
 Caleb Callaway <enlightened.despot@gmail.com>
 Cathryne Linenweaver <cathryne.linenweaver@gmail.com> <Cathryne@users.noreply.github.com>
 Chris Joel <chris@scriptolo.gy>
+Colin Kennedy <moshen.colin@gmail.com>
 Daniel Martí <mvdan@mvdan.cc>
 Dennis Wilson <dw@risu.io>
 Dominik Heidler <dominik@heidler.eu>

Godeps/Godeps.json

@@ -31,7 +31,7 @@
 		},
 		{
 			"ImportPath": "github.com/syncthing/protocol",
-			"Rev": "2e2d479103df8fb721d55d59b0198d6c24f4865b"
+			"Rev": "1a4398cc55c8fe82a964097eaf59f2475b020a49"
 		},
 		{
 			"ImportPath": "github.com/syndtr/goleveldb/leveldb",

Godeps/_workspace/src/github.com/syncthing/protocol/compression.go

@@ -0,0 +1,53 @@
+// Copyright (C) 2015 The Protocol Authors.
+
+package protocol
+
+import "fmt"
+
+type Compression int
+
+const (
+	CompressMetadata Compression = iota // zero value is the default, default should be "metadata"
+	CompressNever
+	CompressAlways
+
+	compressionThreshold = 128 // don't bother compressing messages smaller than this many bytes
+)
+
+var compressionMarshal = map[Compression]string{
+	CompressNever:    "never",
+	CompressMetadata: "metadata",
+	CompressAlways:   "always",
+}
+
+var compressionUnmarshal = map[string]Compression{
+	// Legacy
+	"false": CompressNever,
+	"true":  CompressMetadata,
+
+	// Current
+	"never":    CompressNever,
+	"metadata": CompressMetadata,
+	"always":   CompressAlways,
+}
+
+func (c Compression) String() string {
+	s, ok := compressionMarshal[c]
+	if !ok {
+		return fmt.Sprintf("unknown:%d", c)
+	}
+	return s
+}
+
+func (c Compression) GoString() string {
+	return fmt.Sprintf("%q", c.String())
+}
+
+func (c Compression) MarshalText() ([]byte, error) {
+	return []byte(compressionMarshal[c]), nil
+}
+
+func (c *Compression) UnmarshalText(bs []byte) error {
+	*c = compressionUnmarshal[string(bs)]
+	return nil
+}

Godeps/_workspace/src/github.com/syncthing/protocol/compression_test.go

@@ -0,0 +1,49 @@
+// Copyright (C) 2015 The Protocol Authors.
+
+package protocol
+
+import "testing"
+
+func TestCompressionMarshal(t *testing.T) {
+	uTestcases := []struct {
+		s string
+		c Compression
+	}{
+		{"true", CompressMetadata},
+		{"false", CompressNever},
+		{"never", CompressNever},
+		{"metadata", CompressMetadata},
+		{"always", CompressAlways},
+		{"whatever", CompressMetadata},
+	}
+
+	mTestcases := []struct {
+		s string
+		c Compression
+	}{
+		{"never", CompressNever},
+		{"metadata", CompressMetadata},
+		{"always", CompressAlways},
+	}
+
+	var c Compression
+	for _, tc := range uTestcases {
+		err := c.UnmarshalText([]byte(tc.s))
+		if err != nil {
+			t.Error(err)
+		}
+		if c != tc.c {
+			t.Errorf("%s unmarshalled to %d, not %d", tc.s, c, tc.c)
+		}
+	}
+
+	for _, tc := range mTestcases {
+		bs, err := tc.c.MarshalText()
+		if err != nil {
+			t.Error(err)
+		}
+		if s := string(bs); s != tc.s {
+			t.Errorf("%d marshalled to %q, not %q", tc.c, s, tc.s)
+		}
+	}
+}

Godeps/_workspace/src/github.com/syncthing/protocol/message.go

@@ -7,7 +7,7 @@ package protocol
 import "fmt"
 
 type IndexMessage struct {
-	Folder  string // max:64
+	Folder  string
 	Files   []FileInfo
 	Flags   uint32
 	Options []Option // max:64
@@ -83,9 +83,9 @@ type ResponseMessage struct {
 }
 
 type ClusterConfigMessage struct {
-	ClientName    string   // max:64
-	ClientVersion string   // max:64
-	Folders       []Folder // max:64
+	ClientName    string // max:64
+	ClientVersion string // max:64
+	Folders       []Folder
 	Options       []Option // max:64
 }
 

Godeps/_workspace/src/github.com/syncthing/protocol/message_xdr.go

@@ -41,7 +41,7 @@ IndexMessage Structure:
 
 
 struct IndexMessage {
-	string Folder<64>;
+	string Folder<>;
 	FileInfo Files<>;
 	unsigned int Flags;
 	Option Options<64>;
@@ -74,9 +74,6 @@ func (o IndexMessage) AppendXDR(bs []byte) ([]byte, error) {
 }
 
 func (o IndexMessage) encodeXDR(xw *xdr.Writer) (int, error) {
-	if l := len(o.Folder); l > 64 {
-		return xw.Tot(), xdr.ElementSizeExceeded("Folder", l, 64)
-	}
 	xw.WriteString(o.Folder)
 	xw.WriteUint32(uint32(len(o.Files)))
 	for i := range o.Files {
@@ -111,7 +108,7 @@ func (o *IndexMessage) UnmarshalXDR(bs []byte) error {
 }
 
 func (o *IndexMessage) decodeXDR(xr *xdr.Reader) error {
-	o.Folder = xr.ReadStringMax(64)
+	o.Folder = xr.ReadString()
 	_FilesSize := int(xr.ReadUint32())
 	o.Files = make([]FileInfo, _FilesSize)
 	for i := range o.Files {
@@ -559,7 +556,7 @@ ClusterConfigMessage Structure:
 struct ClusterConfigMessage {
 	string ClientName<64>;
 	string ClientVersion<64>;
-	Folder Folders<64>;
+	Folder Folders<>;
 	Option Options<64>;
 }
 
@@ -598,9 +595,6 @@ func (o ClusterConfigMessage) encodeXDR(xw *xdr.Writer) (int, error) {
 		return xw.Tot(), xdr.ElementSizeExceeded("ClientVersion", l, 64)
 	}
 	xw.WriteString(o.ClientVersion)
-	if l := len(o.Folders); l > 64 {
-		return xw.Tot(), xdr.ElementSizeExceeded("Folders", l, 64)
-	}
 	xw.WriteUint32(uint32(len(o.Folders)))
 	for i := range o.Folders {
 		_, err := o.Folders[i].encodeXDR(xw)
@@ -636,9 +630,6 @@ func (o *ClusterConfigMessage) decodeXDR(xr *xdr.Reader) error {
 	o.ClientName = xr.ReadStringMax(64)
 	o.ClientVersion = xr.ReadStringMax(64)
 	_FoldersSize := int(xr.ReadUint32())
-	if _FoldersSize > 64 {
-		return xdr.ElementSizeExceeded("Folders", _FoldersSize, 64)
-	}
 	o.Folders = make([]Folder, _FoldersSize)
 	for i := range o.Folders {
 		(&o.Folders[i]).decodeXDR(xr)

Godeps/_workspace/src/github.com/syncthing/protocol/protocol.go

@@ -106,7 +106,7 @@ type rawConnection struct {
 	closed chan struct{}
 	once   sync.Once
 
-	compressionThreshold int // compress messages larger than this many bytes
+	compression Compression
 
 	rdbuf0 []byte // used & reused by readMessage
 	rdbuf1 []byte // used & reused by readMessage
@@ -135,25 +135,21 @@ const (
 	pingIdleTime = 60 * time.Second
 )
 
-func NewConnection(deviceID DeviceID, reader io.Reader, writer io.Writer, receiver Model, name string, compress bool) Connection {
+func NewConnection(deviceID DeviceID, reader io.Reader, writer io.Writer, receiver Model, name string, compress Compression) Connection {
 	cr := &countingReader{Reader: reader}
 	cw := &countingWriter{Writer: writer}
 
-	compThres := 1<<31 - 1 // compression disabled
-	if compress {
-		compThres = 128 // compress messages that are 128 bytes long or larger
-	}
 	c := rawConnection{
-		id:                   deviceID,
-		name:                 name,
-		receiver:             nativeModel{receiver},
-		state:                stateInitial,
-		cr:                   cr,
-		cw:                   cw,
-		outbox:               make(chan hdrMsg),
-		nextID:               make(chan int),
-		closed:               make(chan struct{}),
-		compressionThreshold: compThres,
+		id:          deviceID,
+		name:        name,
+		receiver:    nativeModel{receiver},
+		state:       stateInitial,
+		cr:          cr,
+		cw:          cw,
+		outbox:      make(chan hdrMsg),
+		nextID:      make(chan int),
+		closed:      make(chan struct{}),
+		compression: compress,
 	}
 
 	go c.readerLoop()
@@ -571,7 +567,15 @@ func (c *rawConnection) writerLoop() {
 					return
 				}
 
-				if len(uncBuf) >= c.compressionThreshold {
+				compress := false
+				switch c.compression {
+				case CompressAlways:
+					compress = true
+				case CompressMetadata:
+					compress = hm.hdr.msgType != messageTypeResponse
+				}
+
+				if compress && len(uncBuf) >= compressionThreshold {
 					// Use compression for large messages
 					hm.hdr.compression = true
 

Godeps/_workspace/src/github.com/syncthing/protocol/protocol_test.go

@@ -67,8 +67,8 @@ func TestPing(t *testing.T) {
 	ar, aw := io.Pipe()
 	br, bw := io.Pipe()
 
-	c0 := NewConnection(c0ID, ar, bw, nil, "name", true).(wireFormatConnection).next.(*rawConnection)
-	c1 := NewConnection(c1ID, br, aw, nil, "name", true).(wireFormatConnection).next.(*rawConnection)
+	c0 := NewConnection(c0ID, ar, bw, nil, "name", CompressAlways).(wireFormatConnection).next.(*rawConnection)
+	c1 := NewConnection(c1ID, br, aw, nil, "name", CompressAlways).(wireFormatConnection).next.(*rawConnection)
 
 	if ok := c0.ping(); !ok {
 		t.Error("c0 ping failed")
@@ -91,8 +91,8 @@ func TestPingErr(t *testing.T) {
 			eaw := &ErrPipe{PipeWriter: *aw, max: i, err: e}
 			ebw := &ErrPipe{PipeWriter: *bw, max: j, err: e}
 
-			c0 := NewConnection(c0ID, ar, ebw, m0, "name", true).(wireFormatConnection).next.(*rawConnection)
-			NewConnection(c1ID, br, eaw, m1, "name", true)
+			c0 := NewConnection(c0ID, ar, ebw, m0, "name", CompressAlways).(wireFormatConnection).next.(*rawConnection)
+			NewConnection(c1ID, br, eaw, m1, "name", CompressAlways)
 
 			res := c0.ping()
 			if (i < 8 || j < 8) && res {
@@ -167,8 +167,8 @@ func TestVersionErr(t *testing.T) {
 	ar, aw := io.Pipe()
 	br, bw := io.Pipe()
 
-	c0 := NewConnection(c0ID, ar, bw, m0, "name", true).(wireFormatConnection).next.(*rawConnection)
-	NewConnection(c1ID, br, aw, m1, "name", true)
+	c0 := NewConnection(c0ID, ar, bw, m0, "name", CompressAlways).(wireFormatConnection).next.(*rawConnection)
+	NewConnection(c1ID, br, aw, m1, "name", CompressAlways)
 
 	w := xdr.NewWriter(c0.cw)
 	w.WriteUint32(encodeHeader(header{
@@ -190,8 +190,8 @@ func TestTypeErr(t *testing.T) {
 	ar, aw := io.Pipe()
 	br, bw := io.Pipe()
 
-	c0 := NewConnection(c0ID, ar, bw, m0, "name", true).(wireFormatConnection).next.(*rawConnection)
-	NewConnection(c1ID, br, aw, m1, "name", true)
+	c0 := NewConnection(c0ID, ar, bw, m0, "name", CompressAlways).(wireFormatConnection).next.(*rawConnection)
+	NewConnection(c1ID, br, aw, m1, "name", CompressAlways)
 
 	w := xdr.NewWriter(c0.cw)
 	w.WriteUint32(encodeHeader(header{
@@ -213,8 +213,8 @@ func TestClose(t *testing.T) {
 	ar, aw := io.Pipe()
 	br, bw := io.Pipe()
 
-	c0 := NewConnection(c0ID, ar, bw, m0, "name", true).(wireFormatConnection).next.(*rawConnection)
-	NewConnection(c1ID, br, aw, m1, "name", true)
+	c0 := NewConnection(c0ID, ar, bw, m0, "name", CompressAlways).(wireFormatConnection).next.(*rawConnection)
+	NewConnection(c1ID, br, aw, m1, "name", CompressAlways)
 
 	c0.close(nil)
 

NICKS

@@ -28,6 +28,7 @@ kozec		<kozec@kozec.com>
 krozycki	<rozycki.karol@gmail.com>
 marcindziadus	<dziadus.marcin@gmail.com>
 marclaporte <marc@marclaporte.com>
+moshen		<moshen.colin@gmail.com>
 mvdan		<mvdan@mvdan.cc>
 peterhoeg	<peter@speartail.com>
 philips		<brandon@ifup.org>

cmd/syncthing/connections.go

@@ -104,15 +104,18 @@ next:
 					continue next
 				}
 
-				// If rate limiting is set, we wrap the connection in a
-				// limiter.
+				// If rate limiting is set, and based on the address we should
+				// limit the connection, then we wrap it in a limiter.
+
+				limit := shouldLimit(conn.RemoteAddr())
+
 				wr := io.Writer(conn)
-				if writeRateLimit != nil {
+				if limit && writeRateLimit != nil {
 					wr = &limitedWriter{conn, writeRateLimit}
 				}
 
 				rd := io.Reader(conn)
-				if readRateLimit != nil {
+				if limit && readRateLimit != nil {
 					rd = &limitedReader{conn, readRateLimit}
 				}
 
@@ -121,7 +124,7 @@ next:
 
 				l.Infof("Established secure connection to %s at %s", remoteID, name)
 				if debugNet {
-					l.Debugf("cipher suite %04X", conn.ConnectionState().CipherSuite)
+					l.Debugf("cipher suite: %04X in lan: %t", conn.ConnectionState().CipherSuite, !limit)
 				}
 				events.Default.Log(events.DeviceConnected, map[string]string{
 					"id":   remoteID.String(),
@@ -283,3 +286,20 @@ func setTCPOptions(conn *net.TCPConn) {
 		l.Infoln(err)
 	}
 }
+
+func shouldLimit(addr net.Addr) bool {
+	if cfg.Options().LimitBandwidthInLan {
+		return true
+	}
+
+	tcpaddr, ok := addr.(*net.TCPAddr)
+	if !ok {
+		return true
+	}
+	for _, lan := range lans {
+		if lan.Contains(tcpaddr.IP) {
+			return false
+		}
+	}
+	return !tcpaddr.IP.IsLoopback()
+}

cmd/syncthing/main.go

@@ -115,6 +115,7 @@ var (
 	externalPort   int
 	igd            *upnp.IGD
 	cert           tls.Certificate
+	lans           []*net.IPNet
 )
 
 const (
@@ -494,6 +495,10 @@ func syncthingMain() {
 		readRateLimit = ratelimit.NewBucketWithRate(float64(1000*opts.MaxRecvKbps), int64(5*1000*opts.MaxRecvKbps))
 	}
 
+	if opts.MaxRecvKbps > 0 || opts.MaxSendKbps > 0 {
+		lans, _ = osutil.GetLans()
+	}
+
 	dbFile := filepath.Join(confDir, "index")
 	dbOpts := &opt.Options{OpenFilesCacheCapacity: 100}
 	ldb, err := leveldb.OpenFile(dbFile, dbOpts)
@@ -943,7 +948,10 @@ func ensureDir(dir string, mode int) {
 func getDefaultConfDir() (string, error) {
 	switch runtime.GOOS {
 	case "windows":
-		return filepath.Join(os.Getenv("LocalAppData"), "Syncthing"), nil
+		if p := os.Getenv("LocalAppData"); p != "" {
+			return filepath.Join(p, "Syncthing"), nil
+		}
+		return filepath.Join(os.Getenv("AppData"), "Syncthing"), nil
 
 	case "darwin":
 		return osutil.ExpandTilde("~/Library/Application Support/Syncthing")

etc/linux-runit/README.md

@@ -9,7 +9,8 @@ other platforms also using runit.
     recommended to place it in a directory writeable by the running user
     so that automatic upgrades work.
 
- 3. Copy the edited `run` file to `/etc/service/syncthing/run`.
+ 3. Copy this directory (containing the edited `run` file and `log` folder) to
+    `/etc/service/syncthing`.
 
 Log output is sent to syslogd.
 

etc/linux-runit/log/run

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+exec logger -t syncthing
+

etc/linux-runit/run

@@ -4,5 +4,6 @@ export USERNAME=jb
 export HOME="/home/$USERNAME"
 export SYNCTHING="$HOME/bin/syncthing"
 
-setuidgid "$USERNAME" "$SYNCTHING" -logflags 0 2>&1 | logger -t syncthing
+exec 2>&1
+exec chpst -u "$USERNAME" "$SYNCTHING" -logflags 0
 

gui/assets/lang/lang-be.json

@@ -71,6 +71,7 @@
     "Local Discovery": "Лякальнае вызначэньне",
     "Local State": "Лякальны стан",
     "Maximum Age": "Maximum Age",
+    "Move to top of queue": "Move to top of queue",
     "Multi level wildcard (matches multiple directory levels)": "Multi level wildcard (matches multiple directory levels)",
     "Never": "Ніколі",
     "New Device": "New Device",
@@ -93,6 +94,7 @@
     "Quick guide to supported patterns": "Quick guide to supported patterns",
     "RAM Utilization": "Выкарыстаньне памяці",
     "Rescan": "Перачытаць",
+    "Rescan All": "Rescan All",
     "Rescan Interval": "Інтэрвал перачытваньня",
     "Restart": "Перастартаваць",
     "Restart Needed": "Патрэбна перастартоўваньне",

gui/assets/lang/lang-bg.json

@@ -71,6 +71,7 @@
     "Local Discovery": "Локално Откриване",
     "Local State": "Локално състояние",
     "Maximum Age": "Максимална Възраст",
+    "Move to top of queue": "Move to top of queue",
     "Multi level wildcard (matches multiple directory levels)": "Маска на много нива (покрива папки с много нива)",
     "Never": "Никога",
     "New Device": "Ново устройство",
@@ -93,6 +94,7 @@
     "Quick guide to supported patterns": "Бърз наръчник към поддържаните шаблони",
     "RAM Utilization": "RAM Натоварване",
     "Rescan": "Повторно Сканиране",
+    "Rescan All": "Rescan All",
     "Rescan Interval": "Интервал за Повторно Сканиране",
     "Restart": "Рестартирай",
     "Restart Needed": "Изискава се Рестартиране",

gui/assets/lang/lang-ca.json

@@ -71,6 +71,7 @@
     "Local Discovery": "Descobriment Local",
     "Local State": "Estat local",
     "Maximum Age": "Antiguitat Màxima",
+    "Move to top of queue": "Move to top of queue",
     "Multi level wildcard (matches multiple directory levels)": "Caràcter comodí de nivell múltiple (aparella en carpetes de nivells múltiples)",
     "Never": "Mai",
     "New Device": "Nou dispositiu",
@@ -93,6 +94,7 @@
     "Quick guide to supported patterns": "Guia ràpida per als possibles patrons",
     "RAM Utilization": "Utilització de la RAM",
     "Rescan": "Re-escanejar",
+    "Rescan All": "Rescan All",
     "Rescan Interval": "Interval de re-escaneig",
     "Restart": "Reiniciar",
     "Restart Needed": "És Necessari Reiniciar",

gui/assets/lang/lang-cs.json

@@ -27,7 +27,7 @@
     "Device Name": "Jméno přístroje",
     "Device {%device%} ({%address%}) wants to connect. Add new device?": "Přístroj {{device}} ({{address}}) žádá o připojení. Chcete ho přidat?",
     "Devices": "Přístroje",
-    "Disconnected": "Odpojeno",
+    "Disconnected": "Odpojen",
     "Documentation": "Dokumentace",
     "Download Rate": "Rychlost stahování",
     "Downloaded": "Staženo",
@@ -37,13 +37,13 @@
     "Edit Folder": "Upravit adresář",
     "Editing": "Upravuje se",
     "Enable UPnP": "Povolit UPnP",
-    "Enter comma separated \"ip:port\" addresses or \"dynamic\" to perform automatic discovery of the address.": "Vlož čárkou oddělené adresy \"ip:port\" nebo \"dynamic\" pro automatické zjištění adres. ",
+    "Enter comma separated \"ip:port\" addresses or \"dynamic\" to perform automatic discovery of the address.": "Vlož čárkou oddělené adresy \"ip:port\" nebo \"dynamic\" (pro automatické zjišťování adres). ",
     "Enter ignore patterns, one per line.": "Vložit ignorované vzory, jeden na řádek.",
     "Error": "Chyba",
     "File Versioning": "Verze souborů",
-    "File permission bits are ignored when looking for changes. Use on FAT filesystems.": "Bity označující práva souborů jsou ignorovány při hledání změn. Použít pro souborové systémy FAT.",
-    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by syncthing.": "Soubory jsou přesunuty do verzí označených daty v adresáři .stversions po nahrazení nebo smazání aplikací 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.": "Soubory jsou chráněny před změnami na ostatních přístrojích, ale změny provedené z tohoto umístění budou rozeslány na zbytek clusteru.",
+    "File permission bits are ignored when looking for changes. Use on FAT filesystems.": "Bity označující práva souborů jsou při hledání změn ignorovány. Použít pro souborové systémy FAT.",
+    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by syncthing.": "Po nahrazení nebo smazání aplikací Syncthing jsou soubory přesunuty do verzí označených daty v adresáři .stversions.",
+    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Soubory jsou chráněny před změnami na ostatních přístrojích, ale změny provedené z tohoto přístroje budou rozeslány na zbytek clusteru.",
     "Folder ID": "ID adresáře",
     "Folder Master": "Master adresář",
     "Folder Path": "Cesta k adresáři",
@@ -63,14 +63,15 @@
     "Introducer": "Zavaděč",
     "Inversion of the given condition (i.e. do not exclude)": "Prohození zadané podmínky (např. nevynechat)",
     "Keep Versions": "Ponechat verze",
-    "Last File Received": "Poslední soubor přijat",
-    "Last File Synced": "Poslední soubor synchronizován",
+    "Last File Received": "Poslední přijatý soubor",
+    "Last File Synced": "Poslední synchronizovaný soubor",
     "Last seen": "Naposledy spatřen",
     "Later": "Později",
     "Latest Release": "Poslední vydání",
     "Local Discovery": "Místní oznamování",
     "Local State": "Místní status",
     "Maximum Age": "Maximální časový limit",
+    "Move to top of queue": "Přesunout na začátek fronty",
     "Multi level wildcard (matches multiple directory levels)": "Víceúrovňový zástupný znak (shoda skrz více úrovní adresářů)",
     "Never": "Nikdy",
     "New Device": "Nový přístroj",
@@ -93,6 +94,7 @@
     "Quick guide to supported patterns": "Rychlá nápověda k podporovaným vzorům",
     "RAM Utilization": "Využití RAM",
     "Rescan": "Opakovat skenování",
+    "Rescan All": "Opakovat skenování všech",
     "Rescan Interval": "Interval opakování skenování",
     "Restart": "Restart",
     "Restart Needed": "Je nutný restart",
@@ -100,19 +102,19 @@
     "Reused": "Opakovaně použité",
     "Save": "Uložit",
     "Scanning": "Skenování",
-    "Select the devices to share this folder with.": "Vybrat přístroje se kterými sdílet tento adresář.",
-    "Select the folders to share with this device.": "Vybrat adresáře sdílené tomuto přístroji.",
+    "Select the devices to share this folder with.": "Vybrat přístroje, se kterými sdílet tento adresář.",
+    "Select the folders to share with this device.": "Vybrat adresáře sdílené s tímto přístrojem.",
     "Settings": "Nastavení",
     "Share": "Sdílet",
     "Share Folder": "Sdílet adresář",
-    "Share Folders With Device": "Sdílet adresáře tomuto přístroji",
+    "Share Folders With Device": "Sdílet adresáře s tímto přístrojem",
     "Share With Devices": "Sdílet s přístroji",
     "Share this folder?": "Sdílet tento adresář?",
     "Shared With": "Sdíleno s",
     "Short identifier for the folder. Must be the same on all cluster devices.": "Krátký identifikátor tohoto adresáře. Musí být stejný na všech přístrojích v clusteru.",
     "Show ID": "Zobrazit ID",
-    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Zobrazeno místo ID přístroje na náhledu stavu clusteru. Bude odesíláno ostatním přístrojům jako dodatečné výchozí jméno.",
-    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Zobrazeno místo ID přístroje na náhledu stavu clusteru. Bude aktualizováno na jméno které přístroj odesílá pokud nebylo vyplněno.",
+    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Zobrazeno místo ID přístroje na náhledu stavu clusteru. Bude odesíláno ostatním přístrojům jako výchozí jméno přístroje.",
+    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Zobrazeno místo ID přístroje na náhledu stavu clusteru. Pokud nebude vyplněno, bude nastaveno na jméno, které přístroj odesílá.",
     "Shutdown": "Vypnout",
     "Shutdown Complete": "Vypnutí dokončeno",
     "Simple File Versioning": "Jednoduché verze souborů",
@@ -135,9 +137,9 @@
     "The aggregated statistics are publicly available at {%url%}.": "Souhrnné statistiky jsou veřejně dostupné na {{url}}.",
     "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Konfigurace byla uložena, ale není aktivována. Pro aktivaci nové konfigurace je třeba restartovat Syncthing.",
     "The device ID cannot be blank.": "ID přístroje nemůže být prázdné.",
-    "The device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "ID přístroje, které je třeba vložit, lze nalézt v dialogu \"Upravit > Zobrazit ID\" na druhém přístroji. Mezery a pomlčky nejsou nutné (ignorovány).",
+    "The device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "ID přístroje, které je třeba vložit, lze nalézt v dialogu \"Upravit > Zobrazit ID\" na druhém přístroji. Mezery a pomlčky nejsou nutné (budou ignorovány).",
     "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.": "Šifrovaná data o využití jsou zasílána denně. Jsou používána pro zjištění nejobvyklejších platforem, velikosti adresářů a verzí aplikace. Pokud se hlášená data změní, budete opět upozorněni tímto dialogem.",
-    "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.": "Zadané ID přístroje není platné. Mělo by mít 52 nebo 56 znaků, být složeno z písmen a čísel s nepovinnými mezerami a pomlčkami.",
+    "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.": "Zadané ID přístroje není platné. Mělo by mít 52 nebo 56 znaků a mělo by obsahovat písmena a čísla. Mezery a pomlčky jsou nepovinné.",
     "The folder ID cannot be blank.": "ID adresáře nemůže být prázdné.",
     "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "ID adresáře musí být stručný popisek (64 znaků nebo méně) obsahující pouze písmena, čísla, tečku (.), pomlčku (-) a nebo podtržítko (_).",
     "The folder ID must be unique.": "ID adresáře musí být unikátní.",
@@ -147,11 +149,11 @@
     "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Maximální doba pro zachování verze (dny, zapsáním hodnoty 0 bude ponecháno navždy).",
     "The number of old versions to keep, per file.": "Počet starších verzí k zachování pro každý soubor.",
     "The number of versions must be a number and cannot be blank.": "Počet verzí musí být číslo a nemůže být prázdné.",
-    "The rescan interval must be a non-negative number of seconds.": "Interval pro opakování skenování musí být pozitivní číslo.",
+    "The rescan interval must be a non-negative number of seconds.": "Interval opakování skenování musí být pozitivní číslo.",
     "The rescan interval must be at least 5 seconds.": "Interval opakování skenování musí být delší než 5 sekund.",
     "Unknown": "Neznámý",
-    "Unshared": "Nesdílené",
-    "Unused": "Nepoužité",
+    "Unshared": "Nesdílený",
+    "Unused": "Nepoužitý",
     "Up to Date": "Aktuální",
     "Upgrade To {%version%}": "Aktualizovat na {{version}}",
     "Upgrading": "Aktualizuji",
@@ -162,7 +164,7 @@
     "Versions Path": "Cesta verzí",
     "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Verze jsou automaticky smazány, pokud jsou starší než maximální časový limit nebo překročí počet souborů povolených pro interval.",
     "When adding a new device, keep in mind that this device must be added on the other side too.": "Při přidávání nového přístroje mějte na paměti, že je ho třeba také zadat na druhé straně.",
-    "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Při přidávání nového adresáře mějte na paměti, že jeho ID je použito ke svázání adresářů napříč přístoji. Rozlišují malá a velká písmena a musí přesně souhlasit mezi všemi přístroji.",
+    "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Při přidávání nového adresáře mějte na paměti, že jeho ID je použito ke svázání adresářů napříč přístoji. Rozlišují se malá a velká písmena a musí přesně souhlasit mezi všemi přístroji.",
     "Yes": "Ano",
     "You must keep at least one version.": "Je třeba ponechat alespoň jednu verzi.",
     "full documentation": "plná dokumentace",

gui/assets/lang/lang-de.json

@@ -71,6 +71,7 @@
     "Local Discovery": "Lokale Auffindung",
     "Local State": "Lokaler Status",
     "Maximum Age": "Höchstalter",
+    "Move to top of queue": "An den Anfang der Warteschlange setzen",
     "Multi level wildcard (matches multiple directory levels)": "Verschachteltes Maskenzeichen (wird für verschachtelte Verzeichnisse verwendet)",
     "Never": "Nie",
     "New Device": "Neues Gerät",
@@ -93,6 +94,7 @@
     "Quick guide to supported patterns": "Schnellanleitung zu den unterstützten Suchstrukturen",
     "RAM Utilization": "RAM Auslastung",
     "Rescan": "Überprüfen",
+    "Rescan All": "Alle überprüfen",
     "Rescan Interval": "Suchintervall",
     "Restart": "Neustart",
     "Restart Needed": "Neustart notwendig",

gui/assets/lang/lang-el.json

@@ -9,11 +9,11 @@
     "Addresses": "Διευθύνσεις",
     "Allow Anonymous Usage Reporting?": "Να επιτρέπεται η αποστολή ανώνυμων στοιχείων χρήσης;",
     "Anonymous Usage Reporting": "Ανώνυμα στοιχεία χρήσης",
-    "Any devices configured on an introducer device will be added to this device as well.": "Όλες οι συσκευές που είναι δηλωμένες σε ένα βασικό κόμβο θα υπάρχουν και εδώ",
+    "Any devices configured on an introducer device will be added to this device as well.": "Αν δηλωθεί σαν «βασικός κόμβος», τότε όλες οι συσκευές που είναι δηλωμένες εκεί θα υπάρχουν και στον τοπικό κόμβο.",
     "Automatic upgrades": "Αυτόματη αναβάθμιση",
     "Bugs": "Bugs",
     "CPU Utilization": "Επιβάρυνση του επεξεργαστή",
-    "Changelog": "Λίστα αλλαγών",
+    "Changelog": "Πληροφορίες εκδόσεων",
     "Close": "Τέλος",
     "Comment, when used at the start of a line": "Σχόλιο, όταν χρησιμοποιείται στην αρχή μιας γραμμής",
     "Compression is recommended in most setups.": "Η συμπίεση προτείνεται στις περισσότερες εγκαταστάσεις",
@@ -43,7 +43,7 @@
     "File Versioning": "Τήρηση εκδόσεων",
     "File permission bits are ignored when looking for changes. Use on FAT filesystems.": "Να αγνοούνται τα δικαιώματα των αρχείων όταν γίνεται αναζήτηση για αλλαγές. Χρησιμοποιείται σε συστήματα αρχείων τύπου FAT.",
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by syncthing.": "Όταν τα αρχεία αντικατασταθούν ή διαγραφούν από το syncthing, τότε να μεταφέρονται χρονοσημασμένα σε φάκελο με το όνομα .stversions.",
-    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Τα αρχεία προστατεύονται από αλλαγές που γίνονται σε άλλες συσκευές, αλλά όποιες αλλαγές γίνουν σε αυτή τη συσκευή θα αποσταλούν στο όλη τη συστάδα συσκευών.",
+    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Τα αρχεία προστατεύονται από αλλαγές που γίνονται σε άλλες συσκευές, αλλά όποιες αλλαγές γίνουν σε αυτή τη συσκευή θα αποσταλούν σε όλη τη συστάδα συσκευών.",
     "Folder ID": "Ταυτότητα φακέλου",
     "Folder Master": "Να μην επιτρέπονται αλλαγές",
     "Folder Path": "Μονοπάτι φακέλου",
@@ -71,6 +71,7 @@
     "Local Discovery": "Τοπική ανεύρεση",
     "Local State": "Τοπική κατάσταση",
     "Maximum Age": "Μέγιστη ηλικία",
+    "Move to top of queue": "Μεταφορά στην αρχή της λίστας",
     "Multi level wildcard (matches multiple directory levels)": "Τελεστής μπαλαντέρ (*) για πολλά επίπεδα (χρησιμοποιείται για εμφωλευμένους φακέλους)",
     "Never": "Ποτέ",
     "New Device": "Νέα συσκευή",
@@ -85,7 +86,7 @@
     "Out of Sync Items": "Μη συγχρονισμένα αντικείμενα",
     "Outgoing Rate Limit (KiB/s)": "Ρυθμός αποστολής (KiB/s)",
     "Override Changes": "Να αντικατασταθούν οι αλλαγές",
-    "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Μονοπάτι του φακέλου σε αυτόν τον υπολογιστή. Αν δεν υπάρχει θα δημιουργηθεί. Η περισπωμένη (~) μπορεί να μπει σαν συντόμευση για",
+    "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Μονοπάτι του φακέλου σε αυτόν τον υπολογιστή. Αν δεν υπάρχει θα δημιουργηθεί. Η περισπωμένη (~) μπορεί να μπει σαν συντόμευση για το",
     "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Ο φάκελος στον οποίο θα αποθηκεύονται οι εκδόσεις των αρχείων (αν δεν οριστεί θα αποθηκεύονται στον υποφάκελο .stversions)",
     "Please wait": "Παρακαλώ περιμένετε",
     "Preview": "Προεπισκόπηση",
@@ -93,6 +94,7 @@
     "Quick guide to supported patterns": "Σύντομη βοήθεια σχετικά με τα πρότυπα αναζήτησης που υποστηρίζονται",
     "RAM Utilization": "Επιβάρυνση RAM",
     "Rescan": "Έλεγξε για αλλαγές",
+    "Rescan All": "Έλεγξέ τα όλα για αλλαγές",
     "Rescan Interval": "Κάθε πότε θα ελέγχεται για αλλαγές ",
     "Restart": "Επανεκκίνηση",
     "Restart Needed": "Απαιτείται επανεκκίνηση",

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

@@ -71,6 +71,7 @@
     "Local Discovery": "Local Discovery",
     "Local State": "Local State",
     "Maximum Age": "Maximum Age",
+    "Move to top of queue": "Move to top of queue",
     "Multi level wildcard (matches multiple directory levels)": "Multi level wildcard (matches multiple directory levels)",
     "Never": "Never",
     "New Device": "New Device",
@@ -93,6 +94,7 @@
     "Quick guide to supported patterns": "Quick guide to supported patterns",
     "RAM Utilization": "RAM Utilisation",
     "Rescan": "Rescan",
+    "Rescan All": "Rescan All",
     "Rescan Interval": "Rescan Interval",
     "Restart": "Restart",
     "Restart Needed": "Restart Needed",

gui/assets/lang/lang-en.json

@@ -7,6 +7,7 @@
    "Add new folder?": "Add new folder?",
    "Address": "Address",
    "Addresses": "Addresses",
+   "All Data": "All Data",
    "Allow Anonymous Usage Reporting?": "Allow Anonymous Usage Reporting?",
    "Anonymous Usage Reporting": "Anonymous Usage Reporting",
    "Any devices configured on an introducer device will be added to this device as well.": "Any devices configured on an introducer device will be added to this device as well.",
@@ -16,6 +17,7 @@
    "Changelog": "Changelog",
    "Close": "Close",
    "Comment, when used at the start of a line": "Comment, when used at the start of a line",
+   "Compression": "Compression",
    "Compression is recommended in most setups.": "Compression is recommended in most setups.",
    "Connection Error": "Connection Error",
    "Copied from elsewhere": "Copied from elsewhere",
@@ -71,6 +73,8 @@
    "Local Discovery": "Local Discovery",
    "Local State": "Local State",
    "Maximum Age": "Maximum Age",
+   "Metadata Only": "Metadata Only",
+   "Move to top of queue": "Move to top of queue",
    "Multi level wildcard (matches multiple directory levels)": "Multi level wildcard (matches multiple directory levels)",
    "Never": "Never",
    "New Device": "New Device",
@@ -79,6 +83,7 @@
    "No File Versioning": "No File Versioning",
    "Notice": "Notice",
    "OK": "OK",
+   "Off": "Off",
    "Offline": "Offline",
    "Online": "Online",
    "Out Of Sync": "Out Of Sync",
@@ -93,6 +98,7 @@
    "Quick guide to supported patterns": "Quick guide to supported patterns",
    "RAM Utilization": "RAM Utilization",
    "Rescan": "Rescan",
+   "Rescan All": "Rescan All",
    "Rescan Interval": "Rescan Interval",
    "Restart": "Restart",
    "Restart Needed": "Restart Needed",

gui/assets/lang/lang-es.json

@@ -71,6 +71,7 @@
     "Local Discovery": "Búsqueda en red local",
     "Local State": "Estado local",
     "Maximum Age": "Edad máxima",
+    "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)",
     "Never": "Nunca",
     "New Device": "Nuevo dispositivo",
@@ -93,6 +94,7 @@
     "Quick guide to supported patterns": "Guía rápida sobre los patrones soportados",
     "RAM Utilization": "Utilización de RAM",
     "Rescan": "Reescanear",
+    "Rescan All": "Reescanear todo",
     "Rescan Interval": "Intervalo de reescaneo",
     "Restart": "Reiniciar",
     "Restart Needed": "Es necesario reiniciar",

gui/assets/lang/lang-fr.json

@@ -4,12 +4,12 @@
     "Add": "Ajouter",
     "Add Device": "Ajouter un périphérique",
     "Add Folder": "Ajouter un répertoire",
-    "Add new folder?": "Ajouter un nouveau répertoire ?",
+    "Add new folder?": "Ajouter un nouveau dossier ?",
     "Address": "Adresse",
     "Addresses": "Adresses",
     "Allow Anonymous Usage Reporting?": "Autoriser le rapport anonyme de statistiques d'utilisation ?",
     "Anonymous Usage Reporting": "Rapport anonyme de statistiques d'utilisation",
-    "Any devices configured on an introducer device will be added to this device as well.": "Tout appareil ajouté depuis un appareil initiateur sera aussi ajouté sur cet appareil.",
+    "Any devices configured on an introducer device will be added to this device as well.": "Toute machine ajoutée depuis une machine initiatrice sera aussi ajoutée sur cette machine.",
     "Automatic upgrades": "Mises à jour automatiques",
     "Bugs": "Bugs",
     "CPU Utilization": "Utilisation du CPU",
@@ -47,7 +47,7 @@
     "Folder ID": "ID du répertoire",
     "Folder Master": "Répertoire maître",
     "Folder Path": "Chemin du répertoire",
-    "Folders": "Répertoires",
+    "Folders": "Dossiers",
     "GUI Authentication Password": "Mot de passe d'authentification GUI",
     "GUI Authentication User": "Utilisateur autorisé GUI",
     "GUI Listen Addresses": "Adresse du GUI",
@@ -71,10 +71,11 @@
     "Local Discovery": "Recherche locale",
     "Local State": "État local",
     "Maximum Age": "Ancienneté maximum",
+    "Move to top of queue": "Déplacer en haut de la file",
     "Multi level wildcard (matches multiple directory levels)": "Astérisque à plusieurs niveaux (correspond aux répertoires et sous-répertoires)",
     "Never": "Jamais",
     "New Device": "Nouvelle machine",
-    "New Folder": "Nouveau répertoire",
+    "New Folder": "Nouveau dossier",
     "No": "Non",
     "No File Versioning": "Pas de version de fichier",
     "Notice": "Notification",
@@ -85,7 +86,7 @@
     "Out of Sync Items": "Objets non synchronisés",
     "Outgoing Rate Limit (KiB/s)": "Limite du débit sortant (KiB/s)",
     "Override Changes": "Écraser les changements",
-    "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Chemin du répertoire sur l'ordinateur local. Il sera créé si il n'existe pas. Le caractère tilde (~) peut être utilisé comme raccourci vers",
+    "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": "Chemin du dossier sur l'ordinateur local. Il sera créé si il n'existe pas. Le caractère tilde (~) peut être utilisé comme raccourci vers",
     "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Chemin où les versions doivent être conservées (laisser vide pour le chemin par défaut de .stversions dans le répertoire)",
     "Please wait": "Merci de patienter",
     "Preview": "Aperçu",
@@ -93,6 +94,7 @@
     "Quick guide to supported patterns": "Guide rapide des masques supportés",
     "RAM Utilization": "Utilisation de la RAM",
     "Rescan": "Rescanner",
+    "Rescan All": "Re-analyser tout",
     "Rescan Interval": "Intervalle de scan",
     "Restart": "Redémarrer",
     "Restart Needed": "Redémarrage nécessaire",
@@ -101,22 +103,22 @@
     "Save": "Sauver",
     "Scanning": "En cours de scan",
     "Select the devices to share this folder with.": "Sélectionner les machines avec qui partager ce répertoire.",
-    "Select the folders to share with this device.": "Sélectionner les répertoires à partager avec cette machine.",
+    "Select the folders to share with this device.": "Sélectionner les dossiers à partager avec cette machine.",
     "Settings": "Configuration",
     "Share": "Partager",
-    "Share Folder": "Partager le répertoire",
-    "Share Folders With Device": "Partager des répertoires avec des machines",
+    "Share Folder": "Partager le dossier",
+    "Share Folders With Device": "Partager des dossiers avec des machines",
     "Share With Devices": "Partage avec des machines",
-    "Share this folder?": "Voulez-vous partager ce répertoire ?",
+    "Share this folder?": "Voulez-vous partager ce dossier ?",
     "Shared With": "Partagé avec",
-    "Short identifier for the folder. Must be the same on all cluster devices.": "Court identifiant du répertoire. Il doit être le même sur l'ensemble des machines du groupe.",
+    "Short identifier for the folder. Must be the same on all cluster devices.": "Court identifiant du dossier. Il doit être le même sur l'ensemble des machines du groupe.",
     "Show ID": "Montrer l'ID",
     "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Affiché à la place de l'ID de la machine dans le groupe. Sera proposé aux autres machines comme nom optionnel par défaut.",
     "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Affiché à la place de l'ID de la machine dans le groupe. Si laissé vide, il sera mis à jour par le nom proposé par la machine distante.",
     "Shutdown": "Éteindre",
     "Shutdown Complete": "Extinction terminée",
     "Simple File Versioning": "Suivi simple des versions de fichier",
-    "Single level wildcard (matches within a directory only)": "Astérisque à un seul niveau (correspond uniquement à l’intérieur du répertoire)",
+    "Single level wildcard (matches within a directory only)": "Astérisque à un seul niveau (correspond uniquement à l’intérieur du dossier)",
     "Source Code": "Code source",
     "Staggered File Versioning": "Versions échelonnées de fichier",
     "Start Browser": "Démarrer le navigateur web",
@@ -138,8 +140,8 @@
     "The device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "L'ID de l'appareil à renseigner peut être trouvé dans le menu \"Éditer > Montrer l'ID\" des autres nœuds. Les espaces et les tirets sont optionnels (ils seront ignorés).",
     "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.": "Le rapport d'utilisation chiffré est envoyé quotidiennement. Il sert à répertorier les plateformes utilisées, la taille des répertoires et les versions de l'application. Si les données rapportées sont modifiées cette boite de dialogue vous redemandera votre confirmation.",
     "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.": "L'ID de l'appareil inséré ne semble pas être valide. Il devrait ressembler à une chaîne de 52 ou 56 caractères comprenant des lettres, des chiffres et potentiellement des espaces et des traits d'union.",
-    "The folder ID cannot be blank.": "L'ID du répertoire ne peut être vide.",
-    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "L'ID du répertoire doit être un identifiant court (64 caractères ou moins) comprenant uniquement des lettres, nombres, points (.), traits d'union (-) et tirets bas (_).",
+    "The folder ID cannot be blank.": "L'identifiant (ID) du dossier ne peut être vide.",
+    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "L'ID du dossier doit être un identifiant court (64 caractères ou moins) comprenant uniquement des lettres, nombres, points (.), traits d'union (-) et tirets bas (_).",
     "The folder ID must be unique.": "L'ID du répertoire doit être unique.",
     "The folder path cannot be blank.": "Le chemin du répertoire ne peut pas être vide.",
     "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.": "Les intervalles suivant sont utilisés: la première heure une version est conservée chaque 30 secondes, le premier jour une version est conservée chaque heure, les premiers 30 jours une version est conservée chaque jour, jusqu'à la limite d'âge maximum une version est conservée chaque semaine.",
@@ -147,7 +149,7 @@
     "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Le temps maximum de conservation d'une version (en jours, mettre à 0 pour conserver les versions pour toujours)",
     "The number of old versions to keep, per file.": "Le nombre d'anciennes versions à garder, par fichier.",
     "The number of versions must be a number and cannot be blank.": "Le nombre de versions doit être numérique, et ne peut pas être vide.",
-    "The rescan interval must be a non-negative number of seconds.": "L'intervalle de scan ne doit pas être un nombre négatif de secondes.",
+    "The rescan interval must be a non-negative number of seconds.": "L'intervalle d'analyse ne doit pas être un nombre négatif de secondes.",
     "The rescan interval must be at least 5 seconds.": "L'intervalle de scan doit être d'au minimum 5 secondes.",
     "Unknown": "Inconnu",
     "Unshared": "Non partagé",
@@ -167,5 +169,5 @@
     "You must keep at least one version.": "Vous devez garder au minimum une version.",
     "full documentation": "documentation complète",
     "items": "éléments",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} veut partager le répertoire \"{{folder}}\"."
+    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} veut partager le dossier \"{{folder}}\"."
 }

gui/assets/lang/lang-hu.json

@@ -1,10 +1,10 @@
 {
     "API Key": "API kulcs",
     "About": "Névjegy",
-    "Add": "Add",
+    "Add": "Hozzáadás",
     "Add Device": "Eszköz hozzáadása",
     "Add Folder": "Mappa hozzáadása",
-    "Add new folder?": "Add new folder?",
+    "Add new folder?": " ",
     "Address": "Cím",
     "Addresses": "Címek",
     "Allow Anonymous Usage Reporting?": "Engedélyezed a névtelen felhasználási adatok küldését?",
@@ -13,7 +13,7 @@
     "Automatic upgrades": "Automatikus frissítés",
     "Bugs": "Hibák",
     "CPU Utilization": "Processzor használat",
-    "Changelog": "Changelog",
+    "Changelog": "Változások",
     "Close": "Bezárás",
     "Comment, when used at the start of a line": "Megjegyzés, a sor elején használva",
     "Compression is recommended in most setups.": "A tömörítés a a legtöbb esetben ajánlott",
@@ -25,8 +25,8 @@
     "Device ID": "Eszköz azonosító",
     "Device Identification": "Eszköz azonosító",
     "Device Name": "Eszköz neve",
-    "Device {%device%} ({%address%}) wants to connect. Add new device?": "Device {{device}} ({{address}}) wants to connect. Add new device?",
-    "Devices": "Devices",
+    "Device {%device%} ({%address%}) wants to connect. Add new device?": "{{device}} ({{address}}) csatlakozni szeretne.",
+    "Devices": "Eszközök",
     "Disconnected": "Kapcsolat bontva",
     "Documentation": "Dokumentáció",
     "Download Rate": "Letöltési sebesség",
@@ -56,25 +56,26 @@
     "Global Discovery Server": "Globális felfedező szerver",
     "Global State": "Globális állapot",
     "Idle": "Tétlen",
-    "Ignore": "Ignore",
+    "Ignore": "Visszautasítás",
     "Ignore Patterns": "Figyelmen kívül hagyás",
     "Ignore Permissions": "Jogosultságok figyelmen kívül hagyása",
     "Incoming Rate Limit (KiB/s)": "Bejövő sebesség korlát (KIB/mp)",
     "Introducer": "Bevezető",
     "Inversion of the given condition (i.e. do not exclude)": "A feltétel ellentéte (pl. ki nem hagyás)",
     "Keep Versions": "Megtartott verziók",
-    "Last File Received": "Last File Received",
+    "Last File Received": "Utolsó beérkezett fájl",
     "Last File Synced": "Utolsó szinkronizált fájl",
     "Last seen": "Utoljára látva",
-    "Later": "Later",
+    "Later": "Később",
     "Latest Release": "Utolsó kiadás",
     "Local Discovery": "Helyi felfedezés",
     "Local State": "Helyi állapot",
     "Maximum Age": "Maximális kor",
+    "Move to top of queue": "Move to top of queue",
     "Multi level wildcard (matches multiple directory levels)": "Több szintű helyettesítő karakter (több könyvtár szintre érvényesül)",
     "Never": "Soha",
-    "New Device": "New Device",
-    "New Folder": "New Folder",
+    "New Device": "Új eszköz",
+    "New Folder": "Új mappa",
     "No": "Nem",
     "No File Versioning": "Nincs fájl verziózás",
     "Notice": "Megjegyzés",
@@ -82,7 +83,7 @@
     "Offline": "Nincs kapcsolat",
     "Online": "Kapcsolódva",
     "Out Of Sync": "Nincs szinkronban",
-    "Out of Sync Items": "Out of Sync Items",
+    "Out of Sync Items": "Nem szinkronizált elemek",
     "Outgoing Rate Limit (KiB/s)": "Kimenő sávszélesség (KiB/mp)",
     "Override Changes": "Változtatások felülbírálása",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "A mappa elérési útja az eszközön. Amennyiben nem létezik, a program automatikusan létrehozza. A hullámvonal (~)  a következő helyettesítésre használható: ",
@@ -93,6 +94,7 @@
     "Quick guide to supported patterns": "Rövid útmutató a használható mintákról",
     "RAM Utilization": "Memória használat",
     "Rescan": "Átnézés",
+    "Rescan All": "Rescan All",
     "Rescan Interval": "Átnézési intervallum",
     "Restart": "Újraindítás",
     "Restart Needed": "Újraindítás szükséges",
@@ -103,25 +105,25 @@
     "Select the devices to share this folder with.": "Válaszd ki az eszközöket amelyekkel meg szeretnéd osztani a mappát",
     "Select the folders to share with this device.": "Válaszd ki a mappákat amiket meg szeretnél osztani ezzel az eszközzel",
     "Settings": "Beállítások",
-    "Share": "Share",
-    "Share Folder": "Share Folder",
+    "Share": "Megosztás",
+    "Share Folder": "Mappa megosztása",
     "Share Folders With Device": "Mappák megosztása az eszközzel",
     "Share With Devices": "Megosztás más eszközzel",
-    "Share this folder?": "Share this folder?",
+    "Share this folder?": "Megosztod ezt a mappát?",
     "Shared With": "Megosztva ezekkel:",
     "Short identifier for the folder. Must be the same on all cluster devices.": "Rövid azonosító. Minden megosztott eszközön azonosnak kell lennie.",
     "Show ID": "Azonosító mutatása",
     "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Az eszköz azonosító helyett jelenik meg. A többi eszközön alapértelmezett névként használható. ",
     "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Az eszköz azonosító helyett jelenik meg. Üresen hagyva az eszköz saját neve lesz használva ",
     "Shutdown": "Leállítás",
-    "Shutdown Complete": "Shutdown Complete",
+    "Shutdown Complete": "Leállítás",
     "Simple File Versioning": "Egyszerű fájl verziókövetés",
     "Single level wildcard (matches within a directory only)": "Egyszintű helyettesítő karakter (csak egy mappára érvényes)",
     "Source Code": "Forráskód",
     "Staggered File Versioning": "Többszintű fájl verziókövetés",
     "Start Browser": "Böngésző indítása",
     "Stopped": "Leállítva",
-    "Support": "Support",
+    "Support": "Támogatás",
     "Support / Forum": "Támogatás / Fórum",
     "Sync Protocol Listen Addresses": "Szinkronizációs protokoll címe",
     "Synchronization": "Szinkronizálás",
@@ -131,7 +133,7 @@
     "Syncthing is restarting.": "Syncthing újraindul",
     "Syncthing is upgrading.": "Syncthing frissül",
     "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Úgy tűnik, hogy a Syncthing nem működik, vagy valami probléma van az hálózati kapcsolattal. Újra próbálom...",
-    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing seems to be experiencing a problem processing your request. Please reload your browser 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.": "A Syncthing hibát észlelt a kérés teljesítése közben. Töltsd újra a böngészőt vagy indítsd újra a Syncthing-et amennyiben a hiba tartósan fennáll.",
     "The aggregated statistics are publicly available at {%url%}.": "Az összevont statisztikák nyilvánosan elérhetők a {{url}} címen.",
     "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "A beállítások elmentésre kerültek, de nem lettek aktiválva. Indítsd újra a Syncthing-et, hogy aktiváld őket.",
     "The device ID cannot be blank.": "Az eszköz azonosító nem lehet üres.",
@@ -166,6 +168,6 @@
     "Yes": "Igen",
     "You must keep at least one version.": "Legalább egy verziót meg kell tartanod",
     "full documentation": "teljes dokumentáció",
-    "items": "tételek",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} wants to share folder \"{{folder}}\"."
+    "items": "elemek",
+    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} meg szeretné osztani a \"{{folder}}\" nevű mappát."
 }

gui/assets/lang/lang-it.json

@@ -71,6 +71,7 @@
     "Local Discovery": "Individuazione Locale",
     "Local State": "Stato Locale",
     "Maximum Age": "Durata Massima",
+    "Move to top of queue": "Move to top of queue",
     "Multi level wildcard (matches multiple directory levels)": "Metacarattere multi-livello (corrisponde alle cartelle e alle sotto-cartelle)",
     "Never": "Mai",
     "New Device": "Nuovo Dispositivo",
@@ -93,6 +94,7 @@
     "Quick guide to supported patterns": "Guida veloce agli schemi supportati",
     "RAM Utilization": "Utilizzo RAM",
     "Rescan": "Riscansiona",
+    "Rescan All": "Rescan All",
     "Rescan Interval": "Intervallo Scansione",
     "Restart": "Riavvia",
     "Restart Needed": "Riavvio Necessario",
@@ -131,7 +133,7 @@
     "Syncthing is restarting.": "Riavvio di Syncthing in corso.",
     "Syncthing is upgrading.": "Aggiornamento di Syncthing in corso.",
     "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing sembra inattivo, oppure c'è un problema con la tua connessione a Internet. Nuovo tentativo…",
-    "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 reload your browser 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.": "Sembra che Syncthing non sia stato in grado di processare il tuo comando. Se il problema persiste, prova a ricaricare la pagina nel tuo navigatore, oppure a rilanciare Syncthing.",
     "The aggregated statistics are publicly available at {%url%}.": "Le statistiche aggregate sono disponibili pubblicamente su {{url}}.",
     "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "La configurazione è stata salvata ma non attivata. Devi riavviare Syncthing per attivare la nuova configurazione.",
     "The device ID cannot be blank.": "L'ID del dispositivo non può essere vuoto.",

gui/assets/lang/lang-lt.json

@@ -71,6 +71,7 @@
     "Local Discovery": "Vietinis matomumas",
     "Local State": "Vietinė būsena",
     "Maximum Age": "Maksimalus amžius",
+    "Move to top of queue": "Perkelti į eilės priekį",
     "Multi level wildcard (matches multiple directory levels)": "Keletos lygių pakaitos (atitinka keletą direktorijų lygių)",
     "Never": "Niekada",
     "New Device": "Naujas įrenginys",
@@ -93,6 +94,7 @@
     "Quick guide to supported patterns": "Trumpas leistinų šablonų vadovas",
     "RAM Utilization": "Atminties naudojimas",
     "Rescan": "Nuskaityti iš naujo",
+    "Rescan All": "Nuskaityti visus aplankus",
     "Rescan Interval": "Pertrauka tarp nuskaitymų",
     "Restart": "Perleisti",
     "Restart Needed": "Reikalingas perleidimas",

gui/assets/lang/lang-nb.json

@@ -71,6 +71,7 @@
     "Local Discovery": "Lokal Søking",
     "Local State": "Lokal Tilstand",
     "Maximum Age": "Maksimal Levetid",
+    "Move to top of queue": "Move to top of queue",
     "Multi level wildcard (matches multiple directory levels)": "Multinivåsøk (søker på flere mappenivå)",
     "Never": "Aldri",
     "New Device": "Ny Enhet",
@@ -93,6 +94,7 @@
     "Quick guide to supported patterns": "Kjapp innføring i godkjente mønster",
     "RAM Utilization": "RAM-utnyttelse",
     "Rescan": "Skann På Ny",
+    "Rescan All": "Rescan All",
     "Rescan Interval": "Skanneintervall",
     "Restart": "Omstart",
     "Restart Needed": "Omstart Kreves",

gui/assets/lang/lang-nl.json

@@ -71,6 +71,7 @@
     "Local Discovery": "Lokaal zoeken",
     "Local State": "Lokale status",
     "Maximum Age": "Maximum leeftijd",
+    "Move to top of queue": "Move to top of queue",
     "Multi level wildcard (matches multiple directory levels)": "Wildcard op meerder niveaus (toepasbaar op meerdere niveaus van folders)",
     "Never": "Nooit",
     "New Device": "Nieuw Apparaat",
@@ -93,6 +94,7 @@
     "Quick guide to supported patterns": "Snelgids voor ondersteunde patronen",
     "RAM Utilization": "RAM gebruik",
     "Rescan": "Opnieuw scannen",
+    "Rescan All": "Rescan All",
     "Rescan Interval": "Scanfrequentie",
     "Restart": "Herstart",
     "Restart Needed": "Herstart nodig",

gui/assets/lang/lang-nn.json

@@ -71,6 +71,7 @@
     "Local Discovery": "Lokal Søking",
     "Local State": "Lokal Tilstand",
     "Maximum Age": "Maksimal Levetid",
+    "Move to top of queue": "Move to top of queue",
     "Multi level wildcard (matches multiple directory levels)": "Multinivåsøk (søkjer på fleire mappenivå)",
     "Never": "Aldri",
     "New Device": "Ny Eining",
@@ -93,6 +94,7 @@
     "Quick guide to supported patterns": "Kjapp innføring i godkjente mønster",
     "RAM Utilization": "RAM-utnytting",
     "Rescan": "Skann På Ny",
+    "Rescan All": "Rescan All",
     "Rescan Interval": "Skanneintervall",
     "Restart": "Omstart",
     "Restart Needed": "Omstart Trengs",

gui/assets/lang/lang-pl.json

@@ -71,6 +71,7 @@
     "Local Discovery": "Lokalne odnajdywanie",
     "Local State": "Status lokalny",
     "Maximum Age": "Maksymalny wiek",
+    "Move to top of queue": "Move to top of queue",
     "Multi level wildcard (matches multiple directory levels)": "Wieloznaczność na poziomie katalogów i plików (uwzględnia nazwy folderów i plików)",
     "Never": "Nigdy",
     "New Device": "Nowe urządzenie",
@@ -93,6 +94,7 @@
     "Quick guide to supported patterns": "Krótki przewodnik po obsługiwanych wzorcach",
     "RAM Utilization": "Użycie pamięci RAM",
     "Rescan": "Skanuj ponownie",
+    "Rescan All": "Rescan All",
     "Rescan Interval": "Interwał skanowania",
     "Restart": "Uruchom ponownie",
     "Restart Needed": "Wymagane ponowne uruchomienie",

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

@@ -71,6 +71,7 @@
     "Local Discovery": "Descoberta local",
     "Local State": "Estado local",
     "Maximum Age": "Idade máxima",
+    "Move to top of queue": "Move to top of queue",
     "Multi level wildcard (matches multiple directory levels)": "Coringa multi-nível (faz corresponder a vários níveis de pastas)",
     "Never": "Nunca",
     "New Device": "Novo dispositivo",
@@ -93,6 +94,7 @@
     "Quick guide to supported patterns": "Guia rápido dos padrões suportados",
     "RAM Utilization": "Uso de RAM",
     "Rescan": "Verificar agora",
+    "Rescan All": "Rescan All",
     "Rescan Interval": "Intervalo entre verificações",
     "Restart": "Reiniciar",
     "Restart Needed": "É necessário reiniciar",

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

@@ -71,6 +71,7 @@
     "Local Discovery": "Busca local",
     "Local State": "Estado local",
     "Maximum Age": "Idade máxima",
+    "Move to top of queue": "Mover para o topo da fila",
     "Multi level wildcard (matches multiple directory levels)": "Caractere polivalente multi-nível (faz corresponder a vários níveis de pastas)",
     "Never": "Nunca",
     "New Device": "Novo dispositivo",
@@ -93,6 +94,7 @@
     "Quick guide to supported patterns": "Guia rápido dos padrões suportados",
     "RAM Utilization": "Utilização da RAM",
     "Rescan": "Verificar agora",
+    "Rescan All": "Verificar tudo",
     "Rescan Interval": "Intervalo entre verificações",
     "Restart": "Reiniciar",
     "Restart Needed": "É preciso reiniciar",

gui/assets/lang/lang-ru.json

@@ -38,7 +38,7 @@
     "Editing": "Редактирование",
     "Enable UPnP": "Включить UPnP",
     "Enter comma separated \"ip:port\" addresses or \"dynamic\" to perform automatic discovery of the address.": " Введите пары \"IP:PORT\" разделённые запятыми, или слово \"dynamic\" для автоматического обнаружения адреса.",
-    "Enter ignore patterns, one per line.": "Введите шаблон игнорирования, по-одному на строку.",
+    "Enter ignore patterns, one per line.": "Введите шаблоны игнорирования, по-одному на строку.",
     "Error": "Ошибка",
     "File Versioning": "Управление версиями",
     "File permission bits are ignored when looking for changes. Use on FAT filesystems.": "Права доступа к файлам будут игнорироваться. Используйте на файловых системах типа FAT.",
@@ -71,10 +71,11 @@
     "Local Discovery": "Локальное обнаружение",
     "Local State": "Локальное состояние",
     "Maximum Age": "Максимальный срок",
+    "Move to top of queue": "Поместить в начало очереди",
     "Multi level wildcard (matches multiple directory levels)": "Многоуровневая маска (поиск совпадений во всех подпапках)",
     "Never": "Никогда",
     "New Device": "Новое устройство",
-    "New Folder": "Новая напка",
+    "New Folder": "Новая папка",
     "No": "Нет",
     "No File Versioning": "Без управления версиями файлов",
     "Notice": "Внимание",
@@ -93,6 +94,7 @@
     "Quick guide to supported patterns": "Краткое руководство по поддерживаемым шаблонам",
     "RAM Utilization": "Использование ОЗУ",
     "Rescan": "Пересканирование",
+    "Rescan All": "Пересканировать все",
     "Rescan Interval": "Интервал пересканирования",
     "Restart": "Перезапуск",
     "Restart Needed": "Требуется перезапуск",

gui/assets/lang/lang-sv.json

@@ -71,6 +71,7 @@
     "Local Discovery": "Lokal uppslagning",
     "Local State": "Lokal status",
     "Maximum Age": "Högsta åldersgräns",
+    "Move to top of queue": "Move to top of queue",
     "Multi level wildcard (matches multiple directory levels)": "Jokertecken som representerar noll eller fler godtyckliga tecken, även över kataloggränser.",
     "Never": "Aldrig",
     "New Device": "Ny enhet",
@@ -93,6 +94,7 @@
     "Quick guide to supported patterns": "Snabb guide till filmönster som stöds",
     "RAM Utilization": "Minnesanvändning",
     "Rescan": "Uppdatera",
+    "Rescan All": "Rescan All",
     "Rescan Interval": "Uppdateringsintervall",
     "Restart": "Starta om",
     "Restart Needed": "Omstart behövs",

gui/assets/lang/lang-tr.json

@@ -71,6 +71,7 @@
     "Local Discovery": "Yerel bulma",
     "Local State": "Yerel Durum",
     "Maximum Age": "Azami Süre",
+    "Move to top of queue": "Move to top of queue",
     "Multi level wildcard (matches multiple directory levels)": "Çoklu düzey wildcard (çok sayıda dizin düzeyinde eşleşme)",
     "Never": "Asla",
     "New Device": "Yeni Cihaz",
@@ -93,6 +94,7 @@
     "Quick guide to supported patterns": "Desteklenen kalıplar için hızlı rehber",
     "RAM Utilization": "RAM Kullanımı",
     "Rescan": "Tekrar Tara",
+    "Rescan All": "Rescan All",
     "Rescan Interval": "Tarama Aralığı",
     "Restart": "Yeniden Başlat",
     "Restart Needed": "Yeniden başlatma gereklidir",

gui/assets/lang/lang-uk.json

@@ -71,6 +71,7 @@
     "Local Discovery": "Локальне виявлення",
     "Local State": "Локальний статус",
     "Maximum Age": "Максимальний вік",
+    "Move to top of queue": "Move to top of queue",
     "Multi level wildcard (matches multiple directory levels)": "Багаторівнева маска (пошук збігів в усіх піддиректоріях) ",
     "Never": "Ніколи",
     "New Device": "Новий пристрій",
@@ -93,6 +94,7 @@
     "Quick guide to supported patterns": "Швидкий посібник по шаблонам, що підтримуються",
     "RAM Utilization": "Використання RAM",
     "Rescan": "Пересканувати",
+    "Rescan All": "Rescan All",
     "Rescan Interval": "Інтервал для повторного сканування",
     "Restart": "Перезапуск",
     "Restart Needed": "Необхідний перезапуск",
@@ -152,7 +154,7 @@
     "Unknown": "Невідомо",
     "Unshared": "Не розповсюджується",
     "Unused": "Не використовується",
-    "Up to Date": "Актуальа версія",
+    "Up to Date": "Актуальна версія",
     "Upgrade To {%version%}": "Оновити до {{version}}",
     "Upgrading": "Оновлення",
     "Upload Rate": "Швидкість віддачі",

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

@@ -71,6 +71,7 @@
     "Local Discovery": "在局域网上寻找节点",
     "Local State": "本地状态",
     "Maximum Age": "历史版本最长保留时间",
+    "Move to top of queue": "移动到队列顶端",
     "Multi level wildcard (matches multiple directory levels)": "多级通配符（用以匹配多层文件夹）",
     "Never": "从未",
     "New Device": "新设备",
@@ -93,6 +94,7 @@
     "Quick guide to supported patterns": "支持的通配符的简单教程：",
     "RAM Utilization": "内存使用量",
     "Rescan": "重新扫描",
+    "Rescan All": "全部重新扫描",
     "Rescan Interval": "扫描间隔",
     "Restart": "重启syncthing",
     "Restart Needed": "需要重启Syncthing",

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

@@ -71,6 +71,7 @@
     "Local Discovery": "本地探索",
     "Local State": "本地狀態",
     "Maximum Age": "最長保留時間",
+    "Move to top of queue": "Move to top of queue",
     "Multi level wildcard (matches multiple directory levels)": "多階層萬用字元 (可比對多層資料夾)",
     "Never": "從未",
     "New Device": "新裝置",
@@ -93,6 +94,7 @@
     "Quick guide to supported patterns": "可支援樣式的快速指南",
     "RAM Utilization": "記憶體使用率",
     "Rescan": "重新掃描",
+    "Rescan All": "Rescan All",
     "Rescan Interval": "重新掃描間隔",
     "Restart": "重新啟動",
     "Restart Needed": "需要重新啟動",

gui/index.html

@@ -319,7 +319,7 @@
                       <span ng-if="announceServersFailed.length == 0" class="data text-success">
                         <span>OK</span>
                       </span>
-                      <span ng-if="announceServersFailed.length != 0" class="data text-danger">
+                      <span ng-if="announceServersFailed.length != 0" class="data" ng-class="{'text-danger': announceServersFailed.length == announceServersTotal}">
                         <span popover data-trigger="hover" data-placement="bottom" data-content="{{announceServersFailed.join('\n')}}">
                           {{announceServersTotal-announceServersFailed.length}}/{{announceServersTotal}}
                         </span>
@@ -370,9 +370,12 @@
                       <th><span class="glyphicon glyphicon-link"></span>&emsp;<span translate>Address</span></th>
                       <td class="text-right">{{deviceAddr(deviceCfg)}}</td>
                     </tr>
-                    <tr ng-if="!deviceCfg.Compression">
-                      <th><span class="glyphicon glyphicon-compressed"></span>&emsp;<span translate>Use Compression</span></th>
-                      <td translate class="text-right">No</td>
+                    <tr ng-if="deviceCfg.Compression != 'metadata'">
+                      <th><span class="glyphicon glyphicon-compressed"></span>&emsp;<span translate>Compression</span></th>
+                      <td class="text-right">
+                        <span ng-if="deviceCfg.Compression == 'always'" translate>All Data</span>
+                        <span ng-if="deviceCfg.Compression == 'never'" translate>Off</span>
+                      </td>
                     </tr>
                     <tr ng-if="deviceCfg.Introducer">
                       <th><span class="glyphicon glyphicon-thumbs-up"></span>&emsp;<span translate>Introducer</span></th>
@@ -502,12 +505,12 @@
               <p translate class="help-block">Enter comma separated "ip:port" addresses or "dynamic" to perform automatic discovery of the address.</p>
             </div>
             <div ng-if="!editingSelf" class="form-group">
-              <div class="checkbox">
-                <label>
-                  <input type="checkbox" ng-model="currentDevice.Compression"> <span translate>Use Compression</span>
-                </label>
-                <p translate class="help-block">Compression is recommended in most setups.</p>
-              </div>
+              <label translate>Compression</label>
+              <select class="form-control" ng-model="currentDevice.Compression">
+                <option value="always" translate>All Data</option>
+                <option value="metadata" translate>Metadata Only</option>
+                <option value="never" translate>Off</option>
+              </select>
             </div>
             <div ng-if="!editingSelf" class="form-group">
               <div class="checkbox">
@@ -949,6 +952,7 @@
           <li>Brendan Long</li>
           <li>Caleb Callaway</li>
           <li>Cathryne Linenweaver</li>
+          <li>Colin Kennedy</li>
           <li>Chris Joel</li>
           <li>Daniel Martí</li>
           <li>Dennis Wilson</li>

gui/scripts/syncthing/core/controllers/syncthingController.js

@@ -713,7 +713,7 @@ angular.module('syncthing.core')
                 .then(function () {
                     $scope.currentDevice = {
                         AddressesStr: 'dynamic',
-                        Compression: true,
+                        Compression: 'metadata',
                         Introducer: false,
                         selectedFolders: {}
                     };
@@ -758,7 +758,7 @@ angular.module('syncthing.core')
             var deviceCfg = {
                 DeviceID: device,
                 AddressesStr: 'dynamic',
-                Compression: true,
+                Compression: 'metadata',
                 Introducer: false,
                 selectedFolders: {}
             };

internal/config/config.go

@@ -36,7 +36,7 @@ import (
 
 var l = logger.DefaultLogger
 
-const CurrentVersion = 8
+const CurrentVersion = 9
 
 type Configuration struct {
 	Version        int                   `xml:"version,attr"`
@@ -146,12 +146,12 @@ func (c *VersioningConfiguration) UnmarshalXML(d *xml.Decoder, start xml.StartEl
 }
 
 type DeviceConfiguration struct {
-	DeviceID    protocol.DeviceID `xml:"id,attr"`
-	Name        string            `xml:"name,attr,omitempty"`
-	Addresses   []string          `xml:"address,omitempty"`
-	Compression bool              `xml:"compression,attr"`
-	CertName    string            `xml:"certName,attr,omitempty"`
-	Introducer  bool              `xml:"introducer,attr"`
+	DeviceID    protocol.DeviceID    `xml:"id,attr"`
+	Name        string               `xml:"name,attr,omitempty"`
+	Addresses   []string             `xml:"address,omitempty"`
+	Compression protocol.Compression `xml:"compression,attr"`
+	CertName    string               `xml:"certName,attr,omitempty"`
+	Introducer  bool                 `xml:"introducer,attr"`
 }
 
 type FolderDeviceConfiguration struct {
@@ -183,6 +183,7 @@ type OptionsConfiguration struct {
 	CacheIgnoredFiles       bool     `xml:"cacheIgnoredFiles" default:"true"`
 	ProgressUpdateIntervalS int      `xml:"progressUpdateIntervalS" default:"5"`
 	SymlinksEnabled         bool     `xml:"symlinksEnabled" default:"true"`
+	LimitBandwidthInLan     bool     `xml:"limitBandwidthInLan" default:"false"`
 
 	Deprecated_RescanIntervalS int    `xml:"rescanIntervalS,omitempty" json:"-"`
 	Deprecated_UREnabled       bool   `xml:"urEnabled,omitempty" json:"-"`
@@ -319,6 +320,9 @@ func (cfg *Configuration) prepare(myID protocol.DeviceID) {
 	if cfg.Version == 7 {
 		convertV7V8(cfg)
 	}
+	if cfg.Version == 8 {
+		convertV8V9(cfg)
+	}
 
 	// Hash old cleartext passwords
 	if len(cfg.GUI.Password) > 0 && cfg.GUI.Password[0] != '$' {
@@ -410,6 +414,13 @@ func ChangeRequiresRestart(from, to Configuration) bool {
 	return false
 }
 
+func convertV8V9(cfg *Configuration) {
+	// Compression is interpreted and serialized differently, but no enforced
+	// changes. Still need a new version number since the compression stuff
+	// isn't understandable by earlier versions.
+	cfg.Version = 9
+}
+
 func convertV7V8(cfg *Configuration) {
 	// Add IPv6 announce server
 	if len(cfg.Options.GlobalAnnServers) == 1 && cfg.Options.GlobalAnnServers[0] == "udp4://announce.syncthing.net:22026" {
@@ -497,7 +508,7 @@ func convertV2V3(cfg *Configuration) {
 	// compression on all existing new. New devices will get compression on by
 	// default by the GUI.
 	for i := range cfg.Deprecated_Nodes {
-		cfg.Deprecated_Nodes[i].Compression = true
+		cfg.Deprecated_Nodes[i].Compression = protocol.CompressMetadata
 	}
 
 	// The global discovery format and port number changed in v0.9. Having the

internal/config/config_test.go

@@ -55,6 +55,7 @@ func TestDefaultValues(t *testing.T) {
 		CacheIgnoredFiles:       true,
 		ProgressUpdateIntervalS: 5,
 		SymlinksEnabled:         true,
+		LimitBandwidthInLan:     false,
 	}
 
 	cfg := New(device1)
@@ -98,13 +99,13 @@ func TestDeviceConfig(t *testing.T) {
 				DeviceID:    device1,
 				Name:        "node one",
 				Addresses:   []string{"a"},
-				Compression: true,
+				Compression: protocol.CompressMetadata,
 			},
 			{
 				DeviceID:    device4,
 				Name:        "node two",
 				Addresses:   []string{"b"},
-				Compression: true,
+				Compression: protocol.CompressMetadata,
 			},
 		}
 		expectedDeviceIDs := []protocol.DeviceID{device1, device4}
@@ -158,6 +159,7 @@ func TestOverriddenValues(t *testing.T) {
 		CacheIgnoredFiles:       false,
 		ProgressUpdateIntervalS: 10,
 		SymlinksEnabled:         false,
+		LimitBandwidthInLan:     true,
 	}
 
 	cfg, err := Load("testdata/overridenvalues.xml", device1)
@@ -174,24 +176,22 @@ func TestDeviceAddressesDynamic(t *testing.T) {
 	name, _ := os.Hostname()
 	expected := map[protocol.DeviceID]DeviceConfiguration{
 		device1: {
-			DeviceID:    device1,
-			Addresses:   []string{"dynamic"},
-			Compression: true,
+			DeviceID:  device1,
+			Addresses: []string{"dynamic"},
 		},
 		device2: {
-			DeviceID:    device2,
-			Addresses:   []string{"dynamic"},
-			Compression: true,
+			DeviceID:  device2,
+			Addresses: []string{"dynamic"},
 		},
 		device3: {
-			DeviceID:    device3,
-			Addresses:   []string{"dynamic"},
-			Compression: true,
+			DeviceID:  device3,
+			Addresses: []string{"dynamic"},
 		},
 		device4: {
-			DeviceID:  device4,
-			Name:      name, // Set when auto created
-			Addresses: []string{"dynamic"},
+			DeviceID:    device4,
+			Name:        name, // Set when auto created
+			Addresses:   []string{"dynamic"},
+			Compression: protocol.CompressMetadata,
 		},
 	}
 
@@ -206,6 +206,43 @@ func TestDeviceAddressesDynamic(t *testing.T) {
 	}
 }
 
+func TestDeviceCompression(t *testing.T) {
+	name, _ := os.Hostname()
+	expected := map[protocol.DeviceID]DeviceConfiguration{
+		device1: {
+			DeviceID:    device1,
+			Addresses:   []string{"dynamic"},
+			Compression: protocol.CompressMetadata,
+		},
+		device2: {
+			DeviceID:    device2,
+			Addresses:   []string{"dynamic"},
+			Compression: protocol.CompressMetadata,
+		},
+		device3: {
+			DeviceID:    device3,
+			Addresses:   []string{"dynamic"},
+			Compression: protocol.CompressNever,
+		},
+		device4: {
+			DeviceID:    device4,
+			Name:        name, // Set when auto created
+			Addresses:   []string{"dynamic"},
+			Compression: protocol.CompressMetadata,
+		},
+	}
+
+	cfg, err := Load("testdata/devicecompression.xml", device4)
+	if err != nil {
+		t.Error(err)
+	}
+
+	actual := cfg.Devices()
+	if !reflect.DeepEqual(actual, expected) {
+		t.Errorf("Devices differ;\n  E: %#v\n  A: %#v", expected, actual)
+	}
+}
+
 func TestDeviceAddressesStatic(t *testing.T) {
 	name, _ := os.Hostname()
 	expected := map[protocol.DeviceID]DeviceConfiguration{
@@ -222,9 +259,10 @@ func TestDeviceAddressesStatic(t *testing.T) {
 			Addresses: []string{"[2001:db8::44]:4444", "192.0.2.4:6090"},
 		},
 		device4: {
-			DeviceID:  device4,
-			Name:      name, // Set when auto created
-			Addresses: []string{"dynamic"},
+			DeviceID:    device4,
+			Name:        name, // Set when auto created
+			Addresses:   []string{"dynamic"},
+			Compression: protocol.CompressMetadata,
 		},
 	}
 

internal/config/testdata/devicecompression.xml

@@ -0,0 +1,8 @@
+<configuration version="5">
+    <device id="AIR6LPZ7K4PTTUXQSMUUCPQ5YWOEDFIIQJUG7772YQXXR5YD6AWQ" compression="true">
+    </device>
+    <device id="GYRZZQBIRNPV4T7TC52WEQYJ3TFDQW6MWDFLMU4SSSU6EMFBK2VA" compression="metadata">
+    </device>
+    <device id="LGFPDIT7SKNNJVJZA4FC7QNCRKCE753K72BW5QD2FOZ7FRFEP57Q" compression="false">
+    </device>
+</configuration>

internal/config/testdata/overridenvalues.xml

@@ -21,5 +21,6 @@
         <cacheIgnoredFiles>false</cacheIgnoredFiles>
         <progressUpdateIntervalS>10</progressUpdateIntervalS>
         <symlinksEnabled>false</symlinksEnabled>
+        <limitBandwidthInLan>true</limitBandwidthInLan>
     </options>
 </configuration>

internal/config/testdata/v9.xml

@@ -0,0 +1,12 @@
+<configuration version="9">
+    <folder id="test" path="testdata" ro="true" ignorePerms="false" rescanIntervalS="600">
+        <device id="AIR6LPZ-7K4PTTV-UXQSMUU-CPQ5YWH-OEDFIIQ-JUG777G-2YQXXR5-YD6AWQR"></device>
+        <device id="P56IOI7-MZJNU2Y-IQGDREY-DM2MGTI-MGL3BXN-PQ6W5BM-TBBZ4TJ-XZWICQ2"></device>
+    </folder>
+    <device id="AIR6LPZ-7K4PTTV-UXQSMUU-CPQ5YWH-OEDFIIQ-JUG777G-2YQXXR5-YD6AWQR" name="node one" compression="metadata">
+        <address>a</address>
+    </device>
+    <device id="P56IOI7-MZJNU2Y-IQGDREY-DM2MGTI-MGL3BXN-PQ6W5BM-TBBZ4TJ-XZWICQ2" name="node two" compression="metadata">
+        <address>b</address>
+    </device>
+</configuration>

internal/discover/client_udp.go

@@ -94,7 +94,9 @@ func (d *UDPClient) broadcast(pkt []byte) {
 
 	conn, err := net.ListenUDP(d.url.Scheme, d.listenAddress)
 	for err != nil {
-		l.Warnf("discover %s: broadcast: %v; trying again in %v", d.url, err, d.errorRetryInterval)
+		if debug {
+			l.Debugf("discover %s: broadcast listen: %v; trying again in %v", d.url, err, d.errorRetryInterval)
+		}
 		select {
 		case <-d.stop:
 			return
@@ -106,7 +108,9 @@ func (d *UDPClient) broadcast(pkt []byte) {
 
 	remote, err := net.ResolveUDPAddr(d.url.Scheme, d.url.Host)
 	for err != nil {
-		l.Warnf("discover %s: broadcast: %v; trying again in %v", d.url, err, d.errorRetryInterval)
+		if debug {
+			l.Debugf("discover %s: broadcast resolve: %v; trying again in %v", d.url, err, d.errorRetryInterval)
+		}
 		select {
 		case <-d.stop:
 			return

internal/model/model.go

@@ -1146,6 +1146,7 @@ func (m *Model) ScanFolder(folder string) error {
 }
 
 func (m *Model) ScanFolderSub(folder, sub string) error {
+	sub = osutil.NativeFilename(sub)
 	if p := filepath.Clean(filepath.Join(folder, sub)); !strings.HasPrefix(p, folder) {
 		return errors.New("invalid subpath")
 	}
@@ -1162,6 +1163,18 @@ func (m *Model) ScanFolderSub(folder, sub string) error {
 
 	_ = ignores.Load(filepath.Join(folderCfg.Path, ".stignore")) // Ignore error, there might not be an .stignore
 
+	// Required to make sure that we start indexing at a directory we're already
+	// aware off.
+	for sub != "" {
+		if _, ok = fs.Get(protocol.LocalDeviceID, sub); ok {
+			break
+		}
+		sub = filepath.Dir(sub)
+		if sub == "." || sub == string(filepath.Separator) {
+			sub = ""
+		}
+	}
+
 	w := &scanner.Walker{
 		Dir:          folderCfg.Path,
 		Sub:          sub,

internal/osutil/lan_unix.go

@@ -0,0 +1,39 @@
+// Copyright (C) 2015 The Syncthing Authors.
+//
+// This program is free software: you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by the Free
+// Software Foundation, either version 3 of the License, or (at your option)
+// any later version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+// more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program. If not, see <http://www.gnu.org/licenses/>.
+
+// +build !windows
+
+package osutil
+
+import (
+	"net"
+)
+
+func GetLans() ([]*net.IPNet, error) {
+	addrs, err := net.InterfaceAddrs()
+	if err != nil {
+		return nil, err
+	}
+
+	nets := make([]*net.IPNet, 0, len(addrs))
+
+	for _, addr := range addrs {
+		net, ok := addr.(*net.IPNet)
+		if ok {
+			nets = append(nets, net)
+		}
+	}
+	return nets, nil
+}

internal/osutil/lan_windows.go

@@ -0,0 +1,88 @@
+// Copyright (C) 2015 The Syncthing Authors.
+//
+// This program is free software: you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by the Free
+// Software Foundation, either version 3 of the License, or (at your option)
+// any later version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+// more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program. If not, see <http://www.gnu.org/licenses/>.
+
+// +build windows
+
+package osutil
+
+import (
+	"net"
+	"os"
+	"strings"
+	"syscall"
+	"unsafe"
+)
+
+// Modified version of:
+// http://stackoverflow.com/questions/23529663/how-to-get-all-addresses-and-masks-from-local-interfaces-in-go
+// v4 only!
+
+func getAdapterList() (*syscall.IpAdapterInfo, error) {
+	b := make([]byte, 10240)
+	l := uint32(len(b))
+	a := (*syscall.IpAdapterInfo)(unsafe.Pointer(&b[0]))
+	// TODO(mikio): GetAdaptersInfo returns IP_ADAPTER_INFO that
+	// contains IPv4 address list only. We should use another API
+	// for fetching IPv6 stuff from the kernel.
+	err := syscall.GetAdaptersInfo(a, &l)
+	if err == syscall.ERROR_BUFFER_OVERFLOW {
+		b = make([]byte, l)
+		a = (*syscall.IpAdapterInfo)(unsafe.Pointer(&b[0]))
+		err = syscall.GetAdaptersInfo(a, &l)
+	}
+	if err != nil {
+		return nil, os.NewSyscallError("GetAdaptersInfo", err)
+	}
+	return a, nil
+}
+
+func GetLans() ([]*net.IPNet, error) {
+	ifaces, err := net.Interfaces()
+	if err != nil {
+		return nil, err
+	}
+
+	nets := make([]*net.IPNet, 0, len(ifaces))
+
+	aList, err := getAdapterList()
+	if err != nil {
+		return nil, err
+	}
+
+	for _, ifi := range ifaces {
+		for ai := aList; ai != nil; ai = ai.Next {
+			index := ai.Index
+
+			if ifi.Index == int(index) {
+				ipl := &ai.IpAddressList
+				for ; ipl != nil; ipl = ipl.Next {
+					ipStr := strings.Trim(string(ipl.IpAddress.String[:]), "\x00")
+					maskStr := strings.Trim(string(ipl.IpMask.String[:]), "\x00")
+					maskip := net.ParseIP(maskStr)
+					nets = append(nets, &net.IPNet{
+						IP: net.ParseIP(ipStr),
+						Mask: net.IPv4Mask(
+							maskip[net.IPv6len-net.IPv4len],
+							maskip[net.IPv6len-net.IPv4len+1],
+							maskip[net.IPv6len-net.IPv4len+2],
+							maskip[net.IPv6len-net.IPv4len+3],
+						),
+					})
+				}
+			}
+		}
+	}
+	return nets, err
+}