Translation update

Add ItemFinished event (fixes #1258)

AUTHORS

@@ -24,6 +24,7 @@ Jakob Borg <jakob@nym.se>
 James Patterson <jamespatterson@operamail.com> <jpjp@users.noreply.github.com>
 Jens Diemer <github.com@jensdiemer.de> <git@jensdiemer.de>
 Jochen Voss <voss@seehuhn.de>
+Karol Różycki <rozycki.karol@gmail.com>
 Lode Hoste <zillode@zillode.be>
 Marcin Dziadus <dziadus.marcin@gmail.com>
 Michael Jephcote <rewt0r@gmx.com> <Rewt0r@users.noreply.github.com>
@@ -33,6 +34,7 @@ Philippe Schommers <philippe@schommers.be>
 Phill Luby <phill.luby@newredo.com>
 Piotr Bejda <piotrb10@gmail.com>
 Ryan Sullivan <kayoticsully@gmail.com>
+Stefan Tatschner <stefan@sevenbyte.org>
 Tim Abell <tim@timwise.co.uk>
 Tomas Cerveny <kozec@kozec.com>
 Tully Robinson <tully@tojr.org>

Godeps/Godeps.json

@@ -5,10 +5,6 @@
 		"./cmd/..."
 	],
 	"Deps": [
-		{
-			"ImportPath": "github.com/AudriusButkevicius/lfu-go",
-			"Rev": "164bcecceb92fd6037f4d18a8d97b495ec6ef669"
-		},
 		{
 			"ImportPath": "github.com/bkaradzic/go-lz4",
 			"Rev": "93a831dcee242be64a9cc9803dda84af25932de7"
@@ -35,7 +31,7 @@
 		},
 		{
 			"ImportPath": "github.com/syncthing/protocol",
-			"Rev": "15bf5f583a88b7aaf0a5b810fcf5fb21da0a3b3f"
+			"Rev": "442e93d3fc7728d7560c8d039a4199a77879b9f6"
 		},
 		{
 			"ImportPath": "github.com/syndtr/goleveldb/leveldb",

Godeps/_workspace/src/github.com/AudriusButkevicius/lfu-go/LICENSE

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

Godeps/_workspace/src/github.com/AudriusButkevicius/lfu-go/README.md

@@ -1,19 +0,0 @@
-A simple LFU cache for golang.  Based on the paper [An O(1) algorithm for implementing the LFU cache eviction scheme](http://dhruvbird.com/lfu.pdf).
-
-Usage:
-
-```go
-import "github.com/dgrijalva/lfu-go"
-
-// Make a new thing
-c := lfu.New()
-
-// Set some values
-c.Set("myKey", myValue)
-
-// Retrieve some values
-myValue = c.Get("myKey")
-
-// Evict some values
-c.Evict(1)
-```

Godeps/_workspace/src/github.com/AudriusButkevicius/lfu-go/lfu.go

@@ -1,156 +0,0 @@
-package lfu
-
-import (
-	"container/list"
-	"sync"
-)
-
-type Eviction struct {
-	Key   string
-	Value interface{}
-}
-
-type Cache struct {
-	// If len > UpperBound, cache will automatically evict
-	// down to LowerBound.  If either value is 0, this behavior
-	// is disabled.
-	UpperBound      int
-	LowerBound      int
-	values          map[string]*cacheEntry
-	freqs           *list.List
-	len             int
-	lock            *sync.Mutex
-	EvictionChannel chan<- Eviction
-}
-
-type cacheEntry struct {
-	key      string
-	value    interface{}
-	freqNode *list.Element
-}
-
-type listEntry struct {
-	entries map[*cacheEntry]byte
-	freq    int
-}
-
-func New() *Cache {
-	c := new(Cache)
-	c.values = make(map[string]*cacheEntry)
-	c.freqs = list.New()
-	c.lock = new(sync.Mutex)
-	return c
-}
-
-func (c *Cache) Get(key string) interface{} {
-	c.lock.Lock()
-	defer c.lock.Unlock()
-	if e, ok := c.values[key]; ok {
-		c.increment(e)
-		return e.value
-	}
-	return nil
-}
-
-func (c *Cache) Set(key string, value interface{}) {
-	c.lock.Lock()
-	defer c.lock.Unlock()
-	if e, ok := c.values[key]; ok {
-		// value already exists for key.  overwrite
-		e.value = value
-		c.increment(e)
-	} else {
-		// value doesn't exist.  insert
-		e := new(cacheEntry)
-		e.key = key
-		e.value = value
-		c.values[key] = e
-		c.increment(e)
-		c.len++
-		// bounds mgmt
-		if c.UpperBound > 0 && c.LowerBound > 0 {
-			if c.len > c.UpperBound {
-				c.evict(c.len - c.LowerBound)
-			}
-		}
-	}
-}
-
-func (c *Cache) Len() int {
-	c.lock.Lock()
-	defer c.lock.Unlock()
-	return c.len
-}
-
-func (c *Cache) Evict(count int) int {
-	c.lock.Lock()
-	defer c.lock.Unlock()
-	return c.evict(count)
-}
-
-func (c *Cache) evict(count int) int {
-	// No lock here so it can be called
-	// from within the lock (during Set)
-	var evicted int
-	for i := 0; i < count; {
-		if place := c.freqs.Front(); place != nil {
-			for entry, _ := range place.Value.(*listEntry).entries {
-				if i < count {
-					if c.EvictionChannel != nil {
-						c.EvictionChannel <- Eviction{
-							Key:   entry.key,
-							Value: entry.value,
-						}
-					}
-					delete(c.values, entry.key)
-					c.remEntry(place, entry)
-					evicted++
-					c.len--
-					i++
-				}
-			}
-		}
-	}
-	return evicted
-}
-
-func (c *Cache) increment(e *cacheEntry) {
-	currentPlace := e.freqNode
-	var nextFreq int
-	var nextPlace *list.Element
-	if currentPlace == nil {
-		// new entry
-		nextFreq = 1
-		nextPlace = c.freqs.Front()
-	} else {
-		// move up
-		nextFreq = currentPlace.Value.(*listEntry).freq + 1
-		nextPlace = currentPlace.Next()
-	}
-
-	if nextPlace == nil || nextPlace.Value.(*listEntry).freq != nextFreq {
-		// create a new list entry
-		li := new(listEntry)
-		li.freq = nextFreq
-		li.entries = make(map[*cacheEntry]byte)
-		if currentPlace != nil {
-			nextPlace = c.freqs.InsertAfter(li, currentPlace)
-		} else {
-			nextPlace = c.freqs.PushFront(li)
-		}
-	}
-	e.freqNode = nextPlace
-	nextPlace.Value.(*listEntry).entries[e] = 1
-	if currentPlace != nil {
-		// remove from current position
-		c.remEntry(currentPlace, e)
-	}
-}
-
-func (c *Cache) remEntry(place *list.Element, entry *cacheEntry) {
-	entries := place.Value.(*listEntry).entries
-	delete(entries, entry)
-	if len(entries) == 0 {
-		c.freqs.Remove(place)
-	}
-}

Godeps/_workspace/src/github.com/AudriusButkevicius/lfu-go/lfu_test.go

@@ -1,68 +0,0 @@
-package lfu
-
-import (
-	"fmt"
-	"testing"
-)
-
-func TestLFU(t *testing.T) {
-	c := New()
-	c.Set("a", "a")
-	if v := c.Get("a"); v != "a" {
-		t.Errorf("Value was not saved: %v != 'a'", v)
-	}
-	if l := c.Len(); l != 1 {
-		t.Errorf("Length was not updated: %v != 1", l)
-	}
-
-	c.Set("b", "b")
-	if v := c.Get("b"); v != "b" {
-		t.Errorf("Value was not saved: %v != 'b'", v)
-	}
-	if l := c.Len(); l != 2 {
-		t.Errorf("Length was not updated: %v != 2", l)
-	}
-
-	c.Get("a")
-	evicted := c.Evict(1)
-	if v := c.Get("a"); v != "a" {
-		t.Errorf("Value was improperly evicted: %v != 'a'", v)
-	}
-	if v := c.Get("b"); v != nil {
-		t.Errorf("Value was not evicted: %v", v)
-	}
-	if l := c.Len(); l != 1 {
-		t.Errorf("Length was not updated: %v != 1", l)
-	}
-	if evicted != 1 {
-		t.Errorf("Number of evicted items is wrong: %v != 1", evicted)
-	}
-}
-
-func TestBoundsMgmt(t *testing.T) {
-	c := New()
-	c.UpperBound = 10
-	c.LowerBound = 5
-
-	for i := 0; i < 100; i++ {
-		c.Set(fmt.Sprintf("%v", i), i)
-	}
-	if c.Len() > 10 {
-		t.Errorf("Bounds management failed to evict properly: %v", c.Len())
-	}
-}
-
-func TestEviction(t *testing.T) {
-	ch := make(chan Eviction, 1)
-
-	c := New()
-	c.EvictionChannel = ch
-	c.Set("a", "b")
-	c.Evict(1)
-
-	ev := <-ch
-
-	if ev.Key != "a" || ev.Value.(string) != "b" {
-		t.Error("Incorrect item")
-	}
-}

Godeps/_workspace/src/github.com/bkaradzic/go-lz4/reader.go

@@ -1,194 +1,194 @@
-/*
- * Copyright 2011-2012 Branimir Karadzic. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *    1. Redistributions of source code must retain the above copyright notice, this
- *       list of conditions and the following disclaimer.
- *
- *    2. 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 COPYRIGHT HOLDER ``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 COPYRIGHT HOLDER 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.
- */
-
-package lz4
-
-import (
-	"encoding/binary"
-	"errors"
-	"io"
-)
-
-var (
-	// ErrCorrupt indicates the input was corrupt
-	ErrCorrupt = errors.New("corrupt input")
-)
-
-const (
-	mlBits  = 4
-	mlMask  = (1 << mlBits) - 1
-	runBits = 8 - mlBits
-	runMask = (1 << runBits) - 1
-)
-
-type decoder struct {
-	src  []byte
-	dst  []byte
-	spos uint32
-	dpos uint32
-	ref  uint32
-}
-
-func (d *decoder) readByte() (uint8, error) {
-	if int(d.spos) == len(d.src) {
-		return 0, io.EOF
-	}
-	b := d.src[d.spos]
-	d.spos++
-	return b, nil
-}
-
-func (d *decoder) getLen() (uint32, error) {
-
-	length := uint32(0)
-	ln, err := d.readByte()
-	if err != nil {
-		return 0, ErrCorrupt
-	}
-	for ln == 255 {
-		length += 255
-		ln, err = d.readByte()
-		if err != nil {
-			return 0, ErrCorrupt
-		}
-	}
-	length += uint32(ln)
-
-	return length, nil
-}
-
-func (d *decoder) cp(length, decr uint32) {
-
-	if int(d.ref+length) < int(d.dpos) {
-		copy(d.dst[d.dpos:], d.dst[d.ref:d.ref+length])
-	} else {
-		for ii := uint32(0); ii < length; ii++ {
-			d.dst[d.dpos+ii] = d.dst[d.ref+ii]
-		}
-	}
-	d.dpos += length
-	d.ref += length - decr
-}
-
-func (d *decoder) finish(err error) error {
-	if err == io.EOF {
-		return nil
-	}
-
-	return err
-}
-
-// Decode returns the decoded form of src.  The returned slice may be a
-// subslice of dst if it was large enough to hold the entire decoded block.
-func Decode(dst, src []byte) ([]byte, error) {
-
-	if len(src) < 4 {
-		return nil, ErrCorrupt
-	}
-
-	uncompressedLen := binary.LittleEndian.Uint32(src)
-
-	if uncompressedLen == 0 {
-		return nil, nil
-	}
-
-	if uncompressedLen > MaxInputSize {
-		return nil, ErrTooLarge
-	}
-
-	if dst == nil || len(dst) < int(uncompressedLen) {
-		dst = make([]byte, uncompressedLen)
-	}
-
-	d := decoder{src: src, dst: dst[:uncompressedLen], spos: 4}
-
-	decr := []uint32{0, 3, 2, 3}
-
-	for {
-		code, err := d.readByte()
-		if err != nil {
-			return d.dst, d.finish(err)
-		}
-
-		length := uint32(code >> mlBits)
-		if length == runMask {
-			ln, err := d.getLen()
-			if err != nil {
-				return nil, ErrCorrupt
-			}
-			length += ln
-		}
-
-		if int(d.spos+length) > len(d.src) {
-			return nil, ErrCorrupt
-		}
-
-		for ii := uint32(0); ii < length; ii++ {
-			d.dst[d.dpos+ii] = d.src[d.spos+ii]
-		}
-
-		d.spos += length
-		d.dpos += length
-
-		if int(d.spos) == len(d.src) {
-			return d.dst, nil
-		}
-
-		if int(d.spos+2) >= len(d.src) {
-			return nil, ErrCorrupt
-		}
-
-		back := uint32(d.src[d.spos]) | uint32(d.src[d.spos+1])<<8
-
-		if back > d.dpos {
-			return nil, ErrCorrupt
-		}
-
-		d.spos += 2
-		d.ref = d.dpos - back
-
-		length = uint32(code & mlMask)
-		if length == mlMask {
-			ln, err := d.getLen()
-			if err != nil {
-				return nil, ErrCorrupt
-			}
-			length += ln
-		}
-
-		literal := d.dpos - d.ref
-		if literal < 4 {
-			d.cp(4, decr[literal])
-		} else {
-			length += 4
-		}
-
-		if d.dpos+length > uncompressedLen {
-			return nil, ErrCorrupt
-		}
-
-		d.cp(length, 0)
-	}
-}
+/*
+ * Copyright 2011-2012 Branimir Karadzic. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *    1. Redistributions of source code must retain the above copyright notice, this
+ *       list of conditions and the following disclaimer.
+ *
+ *    2. 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 COPYRIGHT HOLDER ``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 COPYRIGHT HOLDER 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.
+ */
+
+package lz4
+
+import (
+	"encoding/binary"
+	"errors"
+	"io"
+)
+
+var (
+	// ErrCorrupt indicates the input was corrupt
+	ErrCorrupt = errors.New("corrupt input")
+)
+
+const (
+	mlBits  = 4
+	mlMask  = (1 << mlBits) - 1
+	runBits = 8 - mlBits
+	runMask = (1 << runBits) - 1
+)
+
+type decoder struct {
+	src  []byte
+	dst  []byte
+	spos uint32
+	dpos uint32
+	ref  uint32
+}
+
+func (d *decoder) readByte() (uint8, error) {
+	if int(d.spos) == len(d.src) {
+		return 0, io.EOF
+	}
+	b := d.src[d.spos]
+	d.spos++
+	return b, nil
+}
+
+func (d *decoder) getLen() (uint32, error) {
+
+	length := uint32(0)
+	ln, err := d.readByte()
+	if err != nil {
+		return 0, ErrCorrupt
+	}
+	for ln == 255 {
+		length += 255
+		ln, err = d.readByte()
+		if err != nil {
+			return 0, ErrCorrupt
+		}
+	}
+	length += uint32(ln)
+
+	return length, nil
+}
+
+func (d *decoder) cp(length, decr uint32) {
+
+	if int(d.ref+length) < int(d.dpos) {
+		copy(d.dst[d.dpos:], d.dst[d.ref:d.ref+length])
+	} else {
+		for ii := uint32(0); ii < length; ii++ {
+			d.dst[d.dpos+ii] = d.dst[d.ref+ii]
+		}
+	}
+	d.dpos += length
+	d.ref += length - decr
+}
+
+func (d *decoder) finish(err error) error {
+	if err == io.EOF {
+		return nil
+	}
+
+	return err
+}
+
+// Decode returns the decoded form of src.  The returned slice may be a
+// subslice of dst if it was large enough to hold the entire decoded block.
+func Decode(dst, src []byte) ([]byte, error) {
+
+	if len(src) < 4 {
+		return nil, ErrCorrupt
+	}
+
+	uncompressedLen := binary.LittleEndian.Uint32(src)
+
+	if uncompressedLen == 0 {
+		return nil, nil
+	}
+
+	if uncompressedLen > MaxInputSize {
+		return nil, ErrTooLarge
+	}
+
+	if dst == nil || len(dst) < int(uncompressedLen) {
+		dst = make([]byte, uncompressedLen)
+	}
+
+	d := decoder{src: src, dst: dst[:uncompressedLen], spos: 4}
+
+	decr := []uint32{0, 3, 2, 3}
+
+	for {
+		code, err := d.readByte()
+		if err != nil {
+			return d.dst, d.finish(err)
+		}
+
+		length := uint32(code >> mlBits)
+		if length == runMask {
+			ln, err := d.getLen()
+			if err != nil {
+				return nil, ErrCorrupt
+			}
+			length += ln
+		}
+
+		if int(d.spos+length) > len(d.src) {
+			return nil, ErrCorrupt
+		}
+
+		for ii := uint32(0); ii < length; ii++ {
+			d.dst[d.dpos+ii] = d.src[d.spos+ii]
+		}
+
+		d.spos += length
+		d.dpos += length
+
+		if int(d.spos) == len(d.src) {
+			return d.dst, nil
+		}
+
+		if int(d.spos+2) >= len(d.src) {
+			return nil, ErrCorrupt
+		}
+
+		back := uint32(d.src[d.spos]) | uint32(d.src[d.spos+1])<<8
+
+		if back > d.dpos {
+			return nil, ErrCorrupt
+		}
+
+		d.spos += 2
+		d.ref = d.dpos - back
+
+		length = uint32(code & mlMask)
+		if length == mlMask {
+			ln, err := d.getLen()
+			if err != nil {
+				return nil, ErrCorrupt
+			}
+			length += ln
+		}
+
+		literal := d.dpos - d.ref
+		if literal < 4 {
+			d.cp(4, decr[literal])
+		} else {
+			length += 4
+		}
+
+		if d.dpos+length > uncompressedLen {
+			return nil, ErrCorrupt
+		}
+
+		d.cp(length, 0)
+	}
+}

Godeps/_workspace/src/github.com/bkaradzic/go-lz4/writer.go

@@ -1,188 +1,188 @@
-/*
- * Copyright 2011-2012 Branimir Karadzic. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *    1. Redistributions of source code must retain the above copyright notice, this
- *       list of conditions and the following disclaimer.
- *
- *    2. 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 COPYRIGHT HOLDER ``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 COPYRIGHT HOLDER 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.
- */
-
-package lz4
-
-import "encoding/binary"
-import "errors"
-
-const (
-	minMatch              = 4
-	hashLog               = 17
-	hashTableSize         = 1 << hashLog
-	hashShift             = (minMatch * 8) - hashLog
-	incompressible uint32 = 128
-	uninitHash            = 0x88888888
-
-	// MaxInputSize is the largest buffer than can be compressed in a single block
-	MaxInputSize = 0x7E000000
-)
-
-var (
-	// ErrTooLarge indicates the input buffer was too large
-	ErrTooLarge = errors.New("input too large")
-)
-
-type encoder struct {
-	src       []byte
-	dst       []byte
-	hashTable []uint32
-	pos       uint32
-	anchor    uint32
-	dpos      uint32
-}
-
-// CompressBound returns the maximum length of a lz4 block, given it's uncompressed length
-func CompressBound(isize int) int {
-	if isize > MaxInputSize {
-		return 0
-	}
-	return isize + ((isize) / 255) + 16 + 4
-}
-
-func (e *encoder) writeLiterals(length, mlLen, pos uint32) {
-
-	ln := length
-
-	var code byte
-	if ln > runMask-1 {
-		code = runMask
-	} else {
-		code = byte(ln)
-	}
-
-	if mlLen > mlMask-1 {
-		e.dst[e.dpos] = (code << mlBits) + byte(mlMask)
-	} else {
-		e.dst[e.dpos] = (code << mlBits) + byte(mlLen)
-	}
-	e.dpos++
-
-	if code == runMask {
-		ln -= runMask
-		for ; ln > 254; ln -= 255 {
-			e.dst[e.dpos] = 255
-			e.dpos++
-		}
-
-		e.dst[e.dpos] = byte(ln)
-		e.dpos++
-	}
-
-	for ii := uint32(0); ii < length; ii++ {
-		e.dst[e.dpos+ii] = e.src[pos+ii]
-	}
-
-	e.dpos += length
-}
-
-// Encode returns the encoded form of src.  The returned array may be a
-// sub-slice of dst if it was large enough to hold the entire output.
-func Encode(dst, src []byte) ([]byte, error) {
-
-	if len(src) >= MaxInputSize {
-		return nil, ErrTooLarge
-	}
-
-	if n := CompressBound(len(src)); len(dst) < n {
-		dst = make([]byte, n)
-	}
-
-	e := encoder{src: src, dst: dst, hashTable: make([]uint32, hashTableSize)}
-
-	binary.LittleEndian.PutUint32(dst, uint32(len(src)))
-	e.dpos = 4
-
-	var (
-		step  uint32 = 1
-		limit        = incompressible
-	)
-
-	for {
-		if int(e.pos)+12 >= len(e.src) {
-			e.writeLiterals(uint32(len(e.src))-e.anchor, 0, e.anchor)
-			return e.dst[:e.dpos], nil
-		}
-
-		sequence := uint32(e.src[e.pos+3])<<24 | uint32(e.src[e.pos+2])<<16 | uint32(e.src[e.pos+1])<<8 | uint32(e.src[e.pos+0])
-
-		hash := (sequence * 2654435761) >> hashShift
-		ref := e.hashTable[hash] + uninitHash
-		e.hashTable[hash] = e.pos - uninitHash
-
-		if ((e.pos-ref)>>16) != 0 || uint32(e.src[ref+3])<<24|uint32(e.src[ref+2])<<16|uint32(e.src[ref+1])<<8|uint32(e.src[ref+0]) != sequence {
-			if e.pos-e.anchor > limit {
-				limit <<= 1
-				step += 1 + (step >> 2)
-			}
-			e.pos += step
-			continue
-		}
-
-		if step > 1 {
-			e.hashTable[hash] = ref - uninitHash
-			e.pos -= step - 1
-			step = 1
-			continue
-		}
-		limit = incompressible
-
-		ln := e.pos - e.anchor
-		back := e.pos - ref
-
-		anchor := e.anchor
-
-		e.pos += minMatch
-		ref += minMatch
-		e.anchor = e.pos
-
-		for int(e.pos) < len(e.src)-5 && e.src[e.pos] == e.src[ref] {
-			e.pos++
-			ref++
-		}
-
-		mlLen := e.pos - e.anchor
-
-		e.writeLiterals(ln, mlLen, anchor)
-		e.dst[e.dpos] = uint8(back)
-		e.dst[e.dpos+1] = uint8(back >> 8)
-		e.dpos += 2
-
-		if mlLen > mlMask-1 {
-			mlLen -= mlMask
-			for mlLen > 254 {
-				mlLen -= 255
-
-				e.dst[e.dpos] = 255
-				e.dpos++
-			}
-
-			e.dst[e.dpos] = byte(mlLen)
-			e.dpos++
-		}
-
-		e.anchor = e.pos
-	}
-}
+/*
+ * Copyright 2011-2012 Branimir Karadzic. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *    1. Redistributions of source code must retain the above copyright notice, this
+ *       list of conditions and the following disclaimer.
+ *
+ *    2. 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 COPYRIGHT HOLDER ``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 COPYRIGHT HOLDER 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.
+ */
+
+package lz4
+
+import "encoding/binary"
+import "errors"
+
+const (
+	minMatch              = 4
+	hashLog               = 17
+	hashTableSize         = 1 << hashLog
+	hashShift             = (minMatch * 8) - hashLog
+	incompressible uint32 = 128
+	uninitHash            = 0x88888888
+
+	// MaxInputSize is the largest buffer than can be compressed in a single block
+	MaxInputSize = 0x7E000000
+)
+
+var (
+	// ErrTooLarge indicates the input buffer was too large
+	ErrTooLarge = errors.New("input too large")
+)
+
+type encoder struct {
+	src       []byte
+	dst       []byte
+	hashTable []uint32
+	pos       uint32
+	anchor    uint32
+	dpos      uint32
+}
+
+// CompressBound returns the maximum length of a lz4 block, given it's uncompressed length
+func CompressBound(isize int) int {
+	if isize > MaxInputSize {
+		return 0
+	}
+	return isize + ((isize) / 255) + 16 + 4
+}
+
+func (e *encoder) writeLiterals(length, mlLen, pos uint32) {
+
+	ln := length
+
+	var code byte
+	if ln > runMask-1 {
+		code = runMask
+	} else {
+		code = byte(ln)
+	}
+
+	if mlLen > mlMask-1 {
+		e.dst[e.dpos] = (code << mlBits) + byte(mlMask)
+	} else {
+		e.dst[e.dpos] = (code << mlBits) + byte(mlLen)
+	}
+	e.dpos++
+
+	if code == runMask {
+		ln -= runMask
+		for ; ln > 254; ln -= 255 {
+			e.dst[e.dpos] = 255
+			e.dpos++
+		}
+
+		e.dst[e.dpos] = byte(ln)
+		e.dpos++
+	}
+
+	for ii := uint32(0); ii < length; ii++ {
+		e.dst[e.dpos+ii] = e.src[pos+ii]
+	}
+
+	e.dpos += length
+}
+
+// Encode returns the encoded form of src.  The returned array may be a
+// sub-slice of dst if it was large enough to hold the entire output.
+func Encode(dst, src []byte) ([]byte, error) {
+
+	if len(src) >= MaxInputSize {
+		return nil, ErrTooLarge
+	}
+
+	if n := CompressBound(len(src)); len(dst) < n {
+		dst = make([]byte, n)
+	}
+
+	e := encoder{src: src, dst: dst, hashTable: make([]uint32, hashTableSize)}
+
+	binary.LittleEndian.PutUint32(dst, uint32(len(src)))
+	e.dpos = 4
+
+	var (
+		step  uint32 = 1
+		limit        = incompressible
+	)
+
+	for {
+		if int(e.pos)+12 >= len(e.src) {
+			e.writeLiterals(uint32(len(e.src))-e.anchor, 0, e.anchor)
+			return e.dst[:e.dpos], nil
+		}
+
+		sequence := uint32(e.src[e.pos+3])<<24 | uint32(e.src[e.pos+2])<<16 | uint32(e.src[e.pos+1])<<8 | uint32(e.src[e.pos+0])
+
+		hash := (sequence * 2654435761) >> hashShift
+		ref := e.hashTable[hash] + uninitHash
+		e.hashTable[hash] = e.pos - uninitHash
+
+		if ((e.pos-ref)>>16) != 0 || uint32(e.src[ref+3])<<24|uint32(e.src[ref+2])<<16|uint32(e.src[ref+1])<<8|uint32(e.src[ref+0]) != sequence {
+			if e.pos-e.anchor > limit {
+				limit <<= 1
+				step += 1 + (step >> 2)
+			}
+			e.pos += step
+			continue
+		}
+
+		if step > 1 {
+			e.hashTable[hash] = ref - uninitHash
+			e.pos -= step - 1
+			step = 1
+			continue
+		}
+		limit = incompressible
+
+		ln := e.pos - e.anchor
+		back := e.pos - ref
+
+		anchor := e.anchor
+
+		e.pos += minMatch
+		ref += minMatch
+		e.anchor = e.pos
+
+		for int(e.pos) < len(e.src)-5 && e.src[e.pos] == e.src[ref] {
+			e.pos++
+			ref++
+		}
+
+		mlLen := e.pos - e.anchor
+
+		e.writeLiterals(ln, mlLen, anchor)
+		e.dst[e.dpos] = uint8(back)
+		e.dst[e.dpos+1] = uint8(back >> 8)
+		e.dpos += 2
+
+		if mlLen > mlMask-1 {
+			mlLen -= mlMask
+			for mlLen > 254 {
+				mlLen -= 255
+
+				e.dst[e.dpos] = 255
+				e.dpos++
+			}
+
+			e.dst[e.dpos] = byte(mlLen)
+			e.dpos++
+		}
+
+		e.anchor = e.pos
+	}
+}

Godeps/_workspace/src/github.com/calmh/xdr/cmd/genxdr/main.go

@@ -321,10 +321,10 @@ func generateDiagram(output io.Writer, s structInfo) {
 		case "bool":
 			fmt.Fprintf(output, "| %s |V|\n", center(name+" (V=0 or 1)", 59))
 			fmt.Fprintln(output, line)
-		case "uint16":
+		case "int16", "uint16":
 			fmt.Fprintf(output, "| %s | %s |\n", center("0x0000", 29), center(name, 29))
 			fmt.Fprintln(output, line)
-		case "uint32":
+		case "int32", "uint32":
 			fmt.Fprintf(output, "| %s |\n", center(name, 61))
 			fmt.Fprintln(output, line)
 		case "int64", "uint64":
@@ -374,6 +374,8 @@ func generateXdr(output io.Writer, s structInfo) {
 		}
 
 		switch tn {
+		case "int16", "int32":
+			fmt.Fprintf(output, "\tint %s%s;\n", fn, suf)
 		case "uint16", "uint32":
 			fmt.Fprintf(output, "\tunsigned int %s%s;\n", fn, suf)
 		case "int64":

NICKS

@@ -24,6 +24,7 @@ gillisig	<gilli@vx.is>
 jedie		<github.com@jensdiemer.de> <git@jensdiemer.de>
 jpjp		<jamespatterson@operamail.com> <jpjp@users.noreply.github.com>
 kozec		<kozec@kozec.com>
+krozycki	<rozycki.karol@gmail.com>
 marcindziadus	<dziadus.marcin@gmail.com>
 mvdan		<mvdan@mvdan.cc>
 peterhoeg	<peter@speartail.com>
@@ -31,6 +32,7 @@ philips		<brandon@ifup.org>
 piobpl		<piotrb10@gmail.com>
 pluby		<phill.luby@newredo.com>
 pyfisch		<pyfisch@gmail.com>
+rumpelsepp	<stefan@sevenbyte.org>
 qbit		<qbit@deftly.net>
 seehuhn		<voss@seehuhn.de>
 snnd		<dw@risu.io>

build.sh

@@ -3,6 +3,7 @@ set -euo pipefail
 IFS=$'\n\t'
 
 DOCKERIMGV=1.4.1-1
+STTRACE=${STTRACE:-}
 
 case "${1:-default}" in
 	default)
@@ -110,6 +111,7 @@ case "${1:-default}" in
 		docker run --rm -h syncthing-builder -u $(id -u) -t \
 			-v $(pwd):/go/src/github.com/syncthing/syncthing \
 			-w /go/src/github.com/syncthing/syncthing \
+			-e "STTRACE=$STTRACE" \
 			syncthing/build:$DOCKERIMGV \
 			sh -c './build.sh clean \
 				&& go vet ./cmd/... ./internal/... \
@@ -122,6 +124,7 @@ case "${1:-default}" in
 		docker run --rm -h syncthing-builder -u $(id -u) -t \
 			-v $(pwd):/go/src/github.com/syncthing/syncthing \
 			-w /go/src/github.com/syncthing/syncthing \
+			-e "STTRACE=$STTRACE" \
 			syncthing/build:$DOCKERIMGV \
 			sh -euxc './build.sh clean \
 				&& go run build.go -race \

cmd/syncthing/blockprof.go

@@ -0,0 +1,59 @@
+// Copyright (C) 2014 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/>.
+
+package main
+
+import (
+	"fmt"
+	"os"
+	"runtime"
+	"runtime/pprof"
+	"syscall"
+	"time"
+)
+
+func init() {
+	if innerProcess && os.Getenv("STBLOCKPROFILE") != "" {
+		profiler := pprof.Lookup("block")
+		if profiler == nil {
+			panic("Couldn't find block profiler")
+		}
+		l.Debugln("Starting block profiling")
+		go saveBlockingProfiles(profiler)
+	}
+}
+
+func saveBlockingProfiles(profiler *pprof.Profile) {
+	runtime.SetBlockProfileRate(1)
+
+	t0 := time.Now()
+	for t := range time.NewTicker(20 * time.Second).C {
+		startms := int(t.Sub(t0).Seconds() * 1000)
+
+		fd, err := os.Create(fmt.Sprintf("block-%05d-%07d.pprof", syscall.Getpid(), startms))
+		if err != nil {
+			panic(err)
+		}
+		err = profiler.WriteTo(fd, 0)
+		if err != nil {
+			panic(err)
+		}
+		err = fd.Close()
+		if err != nil {
+			panic(err)
+		}
+
+	}
+}

cmd/syncthing/gui.go

@@ -302,6 +302,15 @@ func restGetModel(m *model.Model, w http.ResponseWriter, r *http.Request) {
 	res["state"], res["stateChanged"] = m.State(folder)
 	res["version"] = m.CurrentLocalVersion(folder) + m.RemoteLocalVersion(folder)
 
+	ignorePatterns, _, _ := m.GetIgnores(folder)
+	res["ignorePatterns"] = false
+	for _, line := range ignorePatterns {
+		if len(line) > 0 && !strings.HasPrefix(line, "//") {
+			res["ignorePatterns"] = true
+			break
+		}
+	}
+
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	json.NewEncoder(w).Encode(res)
 }

cmd/syncthing/main.go

@@ -142,38 +142,41 @@ Development Settings
 The following environment variables modify syncthing's behavior in ways that
 are mostly useful for developers. Use with care.
 
- STGUIASSETS   Directory to load GUI assets from. Overrides compiled in assets.
+ STGUIASSETS     Directory to load GUI assets from. Overrides compiled in assets.
 
- STTRACE       A comma separated string of facilities to trace. The valid
-               facility strings are:
+ STTRACE         A comma separated string of facilities to trace. The valid
+                 facility strings are:
 
-               - "beacon"   (the beacon package)
-               - "discover" (the discover package)
-               - "events"   (the events package)
-               - "files"    (the files package)
-               - "net"      (the main package; connections & network messages)
-               - "model"    (the model package)
-               - "scanner"  (the scanner package)
-               - "stats"    (the stats package)
-               - "upnp"     (the upnp package)
-               - "xdr"      (the xdr package)
-               - "all"      (all of the above)
+                 - "beacon"   (the beacon package)
+                 - "discover" (the discover package)
+                 - "events"   (the events package)
+                 - "files"    (the files package)
+                 - "net"      (the main package; connections & network messages)
+                 - "model"    (the model package)
+                 - "scanner"  (the scanner package)
+                 - "stats"    (the stats package)
+                 - "upnp"     (the upnp package)
+                 - "xdr"      (the xdr package)
+                 - "all"      (all of the above)
 
- STPROFILER    Set to a listen address such as "127.0.0.1:9090" to start the
-               profiler with HTTP access.
+ STPROFILER      Set to a listen address such as "127.0.0.1:9090" to start the
+                 profiler with HTTP access.
 
- STCPUPROFILE  Write a CPU profile to cpu-$pid.pprof on exit.
+ STCPUPROFILE    Write a CPU profile to cpu-$pid.pprof on exit.
 
- STHEAPPROFILE Write heap profiles to heap-$pid-$timestamp.pprof each time
-               heap usage increases.
+ STHEAPPROFILE   Write heap profiles to heap-$pid-$timestamp.pprof each time
+                 heap usage increases.
 
- STPERFSTATS   Write running performance statistics to perf-$pid.csv. Not
-               supported on Windows.
+ STBLOCKPROFILE  Write block profiles to block-$pid-$timestamp.pprof every 20
+                 seconds.
 
- STNOUPGRADE   Disable automatic upgrades.
+ STPERFSTATS     Write running performance statistics to perf-$pid.csv. Not
+                 supported on Windows.
 
- GOMAXPROCS    Set the maximum number of CPU cores to use. Defaults to all
-               available CPU cores.`
+ STNOUPGRADE     Disable automatic upgrades.
+
+ GOMAXPROCS      Set the maximum number of CPU cores to use. Defaults to all
+                 available CPU cores.`
 )
 
 // Command line and environment options
@@ -658,7 +661,9 @@ func setupGUI(cfg *config.Wrapper, m *model.Model) {
 			}
 			if opts.StartBrowser && !noBrowser && !stRestarting {
 				urlOpen := fmt.Sprintf("%s://%s/", proto, net.JoinHostPort(hostOpen, strconv.Itoa(addr.Port)))
-				openURL(urlOpen)
+				// Can potentially block if the utility we are invoking doesn't
+				// fork, and just execs, hence keep it in it's own routine.
+				go openURL(urlOpen)
 			}
 		}
 	}
@@ -874,8 +879,10 @@ func resetFolders() {
 	suffix := fmt.Sprintf(".syncthing-reset-%d", time.Now().UnixNano())
 	for _, folder := range cfg.Folders() {
 		if _, err := os.Stat(folder.Path); err == nil {
-			l.Infof("Reset: Moving %s -> %s", folder.Path, folder.Path+suffix)
-			os.Rename(folder.Path, folder.Path+suffix)
+			base := filepath.Base(folder.Path)
+			dir := filepath.Dir(filepath.Join(folder.Path, ".."))
+			l.Infof("Reset: Moving %s -> %s", folder.Path, filepath.Join(dir, base+suffix))
+			os.Rename(folder.Path, filepath.Join(dir, base+suffix))
 		}
 	}
 

etc/linux-systemd/system/syncthing@.service

@@ -9,6 +9,9 @@ EnvironmentFile=-/etc/default/syncthing
 Environment=STNORESTART=yes
 ExecStart=/usr/bin/syncthing ${STARGS}
 Restart=on-failure
+RestartPreventExitStatus=1
+SuccessExitStatus=2
+RestartForceExitStatus=3 4
 
 [Install]
 WantedBy=multi-user.target

etc/linux-systemd/user/syncthing.service

@@ -7,6 +7,9 @@ EnvironmentFile=-%h/.config/syncthing/environment
 Environment=STNORESTART=yes
 ExecStart=/usr/bin/syncthing ${STARGS}
 Restart=on-failure
+RestartPreventExitStatus=1
+SuccessExitStatus=2
+RestartForceExitStatus=3 4
 
 [Install]
 WantedBy=cmdline.target

gui/assets/lang/lang-be.json

@@ -1,40 +1,40 @@
 {
     "API Key": "Ключ API",
     "About": "Аб праграме",
-    "Add": "Add",
+    "Add": "Дадаць",
     "Add Device": "Дадаць прыладу",
     "Add Folder": "Дадаць каталёг",
-    "Add new folder?": "Add new folder?",
+    "Add new folder?": "Дадаць новы каталёг ?",
     "Address": "Адрас",
     "Addresses": "Адрасы",
     "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.",
     "Automatic upgrades": "Automatic upgrades",
-    "Bugs": "Bugs",
-    "CPU Utilization": "CPU Utilization",
-    "Changelog": "Changelog",
-    "Close": "Close",
+    "Bugs": "Памылкі",
+    "CPU Utilization": "Выкарыстаньне працэсара",
+    "Changelog": "Сьпіс зьменаў",
+    "Close": "Зачыніць",
     "Comment, when used at the start of a line": "Comment, when used at the start of a line",
     "Compression is recommended in most setups.": "Compression is recommended in most setups.",
     "Connection Error": "Connection Error",
     "Copied from elsewhere": "Copied from elsewhere",
     "Copied from original": "Copied from original",
     "Copyright © 2014 Jakob Borg and the following Contributors:": "Copyright © 2014 Jakob Borg and the following Contributors:",
-    "Delete": "Delete",
-    "Device ID": "Device ID",
+    "Delete": "Выдаліць",
+    "Device ID": "ID прылады",
     "Device Identification": "Device Identification",
-    "Device Name": "Device Name",
+    "Device Name": "Назва прылады",
     "Device {%device%} ({%address%}) wants to connect. Add new device?": "Device {{device}} ({{address}}) wants to connect. Add new device?",
-    "Devices": "Devices",
+    "Devices": "Прылады",
     "Disconnected": "Disconnected",
-    "Documentation": "Documentation",
-    "Download Rate": "Download Rate",
+    "Documentation": "Дакумэнтацыя",
+    "Download Rate": "Хуткасьць спампоўваньня",
     "Downloaded": "Downloaded",
     "Downloading": "Downloading",
-    "Edit": "Edit",
-    "Edit Device": "Edit Device",
-    "Edit Folder": "Edit Folder",
+    "Edit": "Зьмяніць",
+    "Edit Device": "Зьмяніць прыладу",
+    "Edit Folder": "Зьмяніць каталёг",
     "Editing": "Editing",
     "Enable UPnP": "Enable UPnP",
     "Enter comma separated \"ip:port\" addresses or \"dynamic\" to perform automatic discovery of the address.": "Enter comma separated \"ip:port\" addresses or \"dynamic\" to perform automatic discovery of the address.",
@@ -44,32 +44,32 @@
     "File permission bits are ignored when looking for changes. Use on FAT filesystems.": "File permission bits are ignored when looking for changes. Use on FAT filesystems.",
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by syncthing.": "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by 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.": "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 ID",
+    "Folder ID": "ID каталёгу",
     "Folder Master": "Folder Master",
-    "Folder Path": "Folder Path",
-    "Folders": "Folders",
+    "Folder Path": "Шлях каталёгу",
+    "Folders": "Каталёгі",
     "GUI Authentication Password": "GUI Authentication Password",
     "GUI Authentication User": "GUI Authentication User",
     "GUI Listen Addresses": "GUI Listen Addresses",
     "Generate": "Generate",
     "Global Discovery": "Global Discovery",
     "Global Discovery Server": "Global Discovery Server",
-    "Global State": "Global State",
+    "Global State": "Глябальны стан",
     "Idle": "Idle",
     "Ignore": "Ignore",
     "Ignore Patterns": "Ignore Patterns",
-    "Ignore Permissions": "Ignore Permissions",
+    "Ignore Permissions": "Ігнараваць правы",
     "Incoming Rate Limit (KiB/s)": "Incoming Rate Limit (KiB/s)",
     "Introducer": "Introducer",
     "Inversion of the given condition (i.e. do not exclude)": "Inversion of the given condition (i.e. do not exclude)",
     "Keep Versions": "Keep Versions",
     "Last File Received": "Last File Received",
-    "Last File Synced": "Last File Synced",
+    "Last File Synced": "Апошні файл",
     "Last seen": "Last seen",
     "Later": "Later",
     "Latest Release": "Latest Release",
     "Local Discovery": "Local Discovery",
-    "Local State": "Local State",
+    "Local State": "Лякальны стан",
     "Maximum Age": "Maximum Age",
     "Multi level wildcard (matches multiple directory levels)": "Multi level wildcard (matches multiple directory levels)",
     "Never": "Never",
@@ -81,8 +81,8 @@
     "OK": "OK",
     "Offline": "Offline",
     "Online": "Online",
-    "Out Of Sync": "Out Of Sync",
-    "Out of Sync Items": "Out of Sync Items",
+    "Out Of Sync": "Несынхранізавана",
+    "Out of Sync Items": "Несынхранізаваныя складнікі",
     "Outgoing Rate Limit (KiB/s)": "Outgoing Rate Limit (KiB/s)",
     "Override Changes": "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",
@@ -91,18 +91,18 @@
     "Preview": "Preview",
     "Preview Usage Report": "Preview Usage Report",
     "Quick guide to supported patterns": "Quick guide to supported patterns",
-    "RAM Utilization": "RAM Utilization",
-    "Rescan": "Rescan",
-    "Rescan Interval": "Rescan Interval",
-    "Restart": "Restart",
-    "Restart Needed": "Restart Needed",
-    "Restarting": "Restarting",
+    "RAM Utilization": "Выкарыстаньне памяці",
+    "Rescan": "Перачытаць",
+    "Rescan Interval": "Інтэрвал перачытваньня",
+    "Restart": "Перастартаваць",
+    "Restart Needed": "Патрэбна перастартоўваньне",
+    "Restarting": "Перастартоўваньне",
     "Reused": "Reused",
-    "Save": "Save",
+    "Save": "Захаваць",
     "Scanning": "Scanning",
     "Select the devices to share this folder with.": "Select the devices to share this folder with.",
     "Select the folders to share with this device.": "Select the folders to share with this device.",
-    "Settings": "Settings",
+    "Settings": "Налады",
     "Share": "Share",
     "Share Folder": "Share Folder",
     "Share Folders With Device": "Share Folders With Device",
@@ -110,25 +110,25 @@
     "Share this folder?": "Share this folder?",
     "Shared With": "Shared With",
     "Short identifier for the folder. Must be the same on all cluster devices.": "Short identifier for the folder. Must be the same on all cluster devices.",
-    "Show ID": "Show ID",
+    "Show ID": "Паказаць ID",
     "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.",
-    "Shutdown": "Shutdown",
-    "Shutdown Complete": "Shutdown Complete",
+    "Shutdown": "Выключыць",
+    "Shutdown Complete": "Выключэньне завершанае",
     "Simple File Versioning": "Simple File Versioning",
     "Single level wildcard (matches within a directory only)": "Single level wildcard (matches within a directory only)",
-    "Source Code": "Source Code",
+    "Source Code": "Зыходнікі",
     "Staggered File Versioning": "Staggered File Versioning",
     "Start Browser": "Start Browser",
     "Stopped": "Stopped",
-    "Support": "Support",
-    "Support / Forum": "Support / Forum",
+    "Support": "Падтрымка",
+    "Support / Forum": "Падтрымка / Форум",
     "Sync Protocol Listen Addresses": "Sync Protocol Listen Addresses",
-    "Synchronization": "Synchronization",
+    "Synchronization": "Сынхранізацыя",
     "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 restarting.": "Syncthing перастартоўвае.",
     "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…",
     "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.",
@@ -152,13 +152,13 @@
     "Unknown": "Unknown",
     "Unshared": "Unshared",
     "Unused": "Unused",
-    "Up to Date": "Up to Date",
+    "Up to Date": "Найноўшае",
     "Upgrade To {%version%}": "Upgrade To {{version}}",
     "Upgrading": "Upgrading",
-    "Upload Rate": "Upload Rate",
+    "Upload Rate": "Хуткасьць запампоўваньня",
     "Use Compression": "Use Compression",
     "Use HTTPS for GUI": "Use HTTPS for GUI",
-    "Version": "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.",
     "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.",
@@ -166,6 +166,6 @@
     "Yes": "Yes",
     "You must keep at least one version.": "You must keep at least one version.",
     "full documentation": "full documentation",
-    "items": "items",
+    "items": "складнікаў",
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} wants to share folder \"{{folder}}\"."
 }

gui/assets/lang/lang-bg.json

@@ -1,10 +1,10 @@
 {
     "API Key": "API Ключ",
     "About": "За Програмата",
-    "Add": "Add",
+    "Add": "Добави",
     "Add Device": "Добави устройство",
     "Add Folder": "Добави папка",
-    "Add new folder?": "Add new folder?",
+    "Add new folder?": "Добави нова папка?",
     "Address": "Адрес",
     "Addresses": "Адреси",
     "Allow Anonymous Usage Reporting?": "Разреши анонимен доклад за ползване на програмата?",
@@ -13,7 +13,7 @@
     "Automatic upgrades": "Автоматични ъпдейти",
     "Bugs": "Бъгове",
     "CPU Utilization": "Натоварване на Процесора",
-    "Changelog": "Changelog",
+    "Changelog": "Сипъск с промени",
     "Close": "Затвори",
     "Comment, when used at the start of a line": "Коментар, използван в началото на реда",
     "Compression is recommended in most setups.": "Компресията е препоръчителна в повечето конфигурации.",
@@ -25,8 +25,8 @@
     "Device ID": "Идентификатор на устройство",
     "Device Identification": "Идентификация на устройство",
     "Device Name": "Име на устройство",
-    "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}}) желае да се свърже. Добави ново устройство?",
+    "Devices": "Устройства",
     "Disconnected": "Прекрати Връзката",
     "Documentation": "Документация",
     "Download Rate": "Скорост на Теглене",
@@ -56,25 +56,25 @@
     "Global Discovery Server": "Сървър за Глобално Откриване",
     "Global State": "Глобално състояние",
     "Idle": "Без Работа",
-    "Ignore": "Ignore",
+    "Ignore": "Игнорирай",
     "Ignore Patterns": "Шаблони за Игнориране",
     "Ignore Permissions": "Игнорирай Права за Достъп",
     "Incoming Rate Limit (KiB/s)": "Входящ Лимит на Скоростта (KiB/s)",
     "Introducer": "Introducer",
     "Inversion of the given condition (i.e. do not exclude)": "Обратното на даденото условие (пр. не изключвай)",
     "Keep Versions": "Пази Версии",
-    "Last File Received": "Last File Received",
+    "Last File Received": "Последния получен файл",
     "Last File Synced": "Последния синхронизиран файл",
     "Last seen": "Последно видян",
-    "Later": "Later",
+    "Later": "По-късно",
     "Latest Release": "Най-новата Версия",
     "Local Discovery": "Локално Откриване",
     "Local State": "Локално състояние",
     "Maximum Age": "Максимална Възраст",
     "Multi level wildcard (matches multiple directory levels)": "Маска на много нива (покрива папки с много нива)",
     "Never": "Никога",
-    "New Device": "New Device",
-    "New Folder": "New Folder",
+    "New Device": "Ново устройство",
+    "New Folder": "Нова папка",
     "No": "Не",
     "No File Versioning": "Няма Файлови Версии",
     "Notice": "Известие",
@@ -82,7 +82,7 @@
     "Offline": "Не е на линия",
     "Online": "На линия",
     "Out Of Sync": "Не Синхронизиран",
-    "Out of Sync Items": "Out of Sync Items",
+    "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": "Пътят до папката на този компютър. Ще бъде създадена ако не съществува. Символът тилда (~) може да бъде използван като заместител на",
@@ -103,35 +103,35 @@
     "Select the devices to share this folder with.": "Избери устройствата, с които да споделиш тази папка.",
     "Select the folders to share with this device.": "Изберете папките за споделяне с това устройство.",
     "Settings": "Настройки",
-    "Share": "Share",
-    "Share Folder": "Share Folder",
+    "Share": "Сподели",
+    "Share Folder": "Сподели папка",
     "Share Folders With Device": "Сподели папки с това устройство",
     "Share With Devices": "Сподели с устройства",
-    "Share this folder?": "Share this folder?",
+    "Share this folder?": "Сподели тази папка?",
     "Shared With": "Споделена със",
     "Short identifier for the folder. Must be the same on all cluster devices.": "Кратък идентификатор на папката. Трябва да бъде същият на всички компютри.",
     "Show ID": "Покажи Идентификатора",
     "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.": "Покажи вместо идентификатор на устройството в статус на клъстъра. Ще бъде обновено с името по подразбиране изпратено от другия компютър.",
     "Shutdown": "Спри Програмата",
-    "Shutdown Complete": "Shutdown Complete",
+    "Shutdown Complete": "Спирането завършено",
     "Simple File Versioning": "Опростени Файлови Версии",
     "Single level wildcard (matches within a directory only)": "Маска на едно ниво (покрива само в папка)",
     "Source Code": "Сорс Код",
     "Staggered File Versioning": "Наслагващи се Файлови Версии",
     "Start Browser": "Стартирай Браузъра",
     "Stopped": "Спряна",
-    "Support": "Support",
+    "Support": "Помощ",
     "Support / Forum": "Помощ / Форум",
     "Sync Protocol Listen Addresses": "Адрес за слушане на синхронизиращия протокол",
     "Synchronization": "Синхронизация",
     "Syncing": "Синхронизиране",
     "Syncthing has been shut down.": "Syncthing е спрян.",
     "Syncthing includes the following software or portions thereof:": "Syncthing включва следният софтуер пълно или частично:",
-    "Syncthing is restarting.": "Syncthing се рестартирва",
+    "Syncthing is restarting.": "Syncthing се рестартира",
     "Syncthing is upgrading.": "Syncthing се обновява.",
     "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing изглежда не е включен, или има проблем с интерент връзката. Повторен опит...",
-    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing 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.": "Syncthing има проблем при обработването на заявката. Моля, презаредете браузъра или рестартирайте Syncthing ако проблемът продължи.",
     "The aggregated statistics are publicly available at {%url%}.": "Сумарната статистика е публично достъпна на {{url}}.",
     "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Конфигурацията е запазена, но не е активирана. Syncthing трябва да рестартира, за да се активира новата конфигурация.",
     "The device ID cannot be blank.": "Полето идентификатор на устройство не може да бъде празно.",
@@ -167,5 +167,5 @@
     "You must keep at least one version.": "Трябва да пазиш поне една версия.",
     "full documentation": "пълна документация",
     "items": "артикула",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} wants to share folder \"{{folder}}\"."
+    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} желае да сподели папка \"{{folder}}\"."
 }

gui/assets/lang/lang-es.json

@@ -166,6 +166,6 @@
     "Yes": "Sí",
     "You must keep at least one version.": "Debe mantener al menos una versión",
     "full documentation": "documentación completa",
-    "items": "Ítems",
+    "items": "ítems",
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} quiere compartir repositorio \"{{folder}}\"."
 }

gui/assets/lang/lang-fr.json

@@ -26,7 +26,7 @@
     "Device Identification": "Identification de l'appareil",
     "Device Name": "Nom du périphérique",
     "Device {%device%} ({%address%}) wants to connect. Add new device?": "La machine {{device}} ({{address}}) veut se connecter. Voulez-vous ajouter cette machine ?",
-    "Devices": "Machine",
+    "Devices": "Machines",
     "Disconnected": "Déconnecté",
     "Documentation": "Documentation",
     "Download Rate": "Débit de réception",
@@ -49,7 +49,7 @@
     "Folder Path": "Chemin du répertoire",
     "Folders": "Répertoires",
     "GUI Authentication Password": "Mot de passe d'authentification GUI",
-    "GUI Authentication User": "Utilistateur autorisé GUI",
+    "GUI Authentication User": "Utilisateur autorisé GUI",
     "GUI Listen Addresses": "Adresse du GUI",
     "Generate": "Générer",
     "Global Discovery": "Recherche globale",

gui/assets/lang/lang-it.json

@@ -26,7 +26,7 @@
     "Device Identification": "Identificazione Dispositivo",
     "Device Name": "Nome Dispositivo",
     "Device {%device%} ({%address%}) wants to connect. Add new device?": "Il dispositivo {{device}} ({{address}}) chiede di connettersi. Aggiungere il nuovo dispositivo?",
-    "Devices": "Devices",
+    "Devices": "Dispositivi",
     "Disconnected": "Disconnesso",
     "Documentation": "Documentazione",
     "Download Rate": "Velocità Download",
@@ -63,7 +63,7 @@
     "Introducer": "Introduttore",
     "Inversion of the given condition (i.e. do not exclude)": "Inversione della condizione indicata (ad es. non escludere)",
     "Keep Versions": "Versioni Mantenute",
-    "Last File Received": "Last File Received",
+    "Last File Received": "Ultimo File Ricevuto",
     "Last File Synced": "Ultimo File Sincronizzato",
     "Last seen": "Ultima connessione",
     "Later": "Più Tardi",
@@ -82,7 +82,7 @@
     "Offline": "Non in linea",
     "Online": "In linea",
     "Out Of Sync": "Non Sincronizzati",
-    "Out of Sync Items": "Out of Sync Items",
+    "Out of Sync Items": "Elementi Non Sincronizzati",
     "Outgoing Rate Limit (KiB/s)": "Limite Velocità in Uscita (KiB/s)",
     "Override Changes": "Ignora Modifiche",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Percorso della cartella nel computer locale. Verrà creata se non esiste già. Il carattere tilde (~) può essere utilizzato come scorciatoia per",
@@ -114,14 +114,14 @@
     "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Visibile al posto dell'ID Dispositivo nello stato del cluster. Negli altri dispositivi verrà presentato come nome predefinito opzionale.",
     "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Visibile al posto dell'ID Dispositivo nello stato del cluster. Se viene lasciato vuoto, verrà utilizzato il nome proposto dal dispositivo.",
     "Shutdown": "Arresta",
-    "Shutdown Complete": "Shutdown Complete",
+    "Shutdown Complete": "Arresto Eseguito",
     "Simple File Versioning": "Controllo Versione Semplice",
     "Single level wildcard (matches within a directory only)": "Metacarattere di singolo livello (corrisponde solo all'interno di una cartella)",
     "Source Code": "Codice Sorgente",
     "Staggered File Versioning": "Controllo Versione Cadenzato",
     "Start Browser": "Avvia Browser",
     "Stopped": "Fermato",
-    "Support": "Support",
+    "Support": "Supporto",
     "Support / Forum": "Supporto / Forum",
     "Sync Protocol Listen Addresses": "Indirizzi del Protocollo di Sincronizzazione",
     "Synchronization": "Sincronizzazione",

gui/assets/lang/lang-nb.json

@@ -1,10 +1,10 @@
 {
     "API Key": "API-nøkkel",
     "About": "Om",
-    "Add": "Add",
+    "Add": "Legg til",
     "Add Device": "Legg Til Enhet",
     "Add Folder": "Legg Til Mappe",
-    "Add new folder?": "Add new folder?",
+    "Add new folder?": "Legg til ny mappe?",
     "Address": "Adresse",
     "Addresses": "Adresser",
     "Allow Anonymous Usage Reporting?": "Tillat Anonym Innsamling Av Brukerdata?",
@@ -13,25 +13,25 @@
     "Automatic upgrades": "Automatiske oppdateringer",
     "Bugs": "Programfeil",
     "CPU Utilization": "CPU-utnyttelse",
-    "Changelog": "Changelog",
+    "Changelog": "Endringslog",
     "Close": "Lukk",
     "Comment, when used at the start of a line": "Kommentar, når det blir brukt i starten av en linje.",
     "Compression is recommended in most setups.": "Komprimering er anbefalt i de fleste tilfeller.",
     "Connection Error": "Tilkoblingsfeil",
-    "Copied from elsewhere": "Copied from elsewhere",
-    "Copied from original": "Copied from original",
+    "Copied from elsewhere": "Kopiert fra et annet sted",
+    "Copied from original": "Kopiert fra original",
     "Copyright © 2014 Jakob Borg and the following Contributors:": "Copyright © 2014 Jakob Borg og følgende Bidragsytere:",
     "Delete": "Slett",
     "Device ID": "Enhet ID",
     "Device Identification": "Enhetskjennemerke",
     "Device Name": "Navn På Enhet",
-    "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?": "Enhet {{device}} ({{address}}) ønsker å koble seg til. Legg til ny enhet?",
+    "Devices": "Enheter",
     "Disconnected": "Frakoblet",
     "Documentation": "Dokumentasjon",
     "Download Rate": "Nedlastingsrate",
-    "Downloaded": "Downloaded",
-    "Downloading": "Downloading",
+    "Downloaded": "Lasted ned",
+    "Downloading": "Laster ned",
     "Edit": "Rediger",
     "Edit Device": "Rediger Enhet",
     "Edit Folder": "Rediger Mappe",
@@ -47,7 +47,7 @@
     "Folder ID": "Mappe ID",
     "Folder Master": "Styrende Mappe",
     "Folder Path": "Mappeplassering",
-    "Folders": "Folders",
+    "Folders": "Mapper",
     "GUI Authentication Password": "GUI Passord",
     "GUI Authentication User": "GUI Bruker",
     "GUI Listen Addresses": "GUI Lytteadresse",
@@ -56,25 +56,25 @@
     "Global Discovery Server": "Global Søkemotor",
     "Global State": "Global Tilstand",
     "Idle": "Pause",
-    "Ignore": "Ignore",
+    "Ignore": "Ignorer",
     "Ignore Patterns": "Utelatelsesmønster",
     "Ignore Permissions": "Ignorer Tilgangsbit",
     "Incoming Rate Limit (KiB/s)": "Innkommende Hastighetsbegrensning (KiB/s)",
     "Introducer": "Introduktør",
     "Inversion of the given condition (i.e. do not exclude)": "Invers av den gitte tilstanden (t.d. ikke ekskluder)",
     "Keep Versions": "Behold Versjoner",
-    "Last File Received": "Last File Received",
-    "Last File Synced": "Last File Synced",
+    "Last File Received": "Sist Mottatte Fil",
+    "Last File Synced": "Sist Synkroniserte Fil",
     "Last seen": "Sist sett",
-    "Later": "Later",
+    "Later": "Senere",
     "Latest Release": "Nyeste Versjon",
     "Local Discovery": "Lokal Søking",
     "Local State": "Lokal Tilstand",
     "Maximum Age": "Maksimal Levetid",
     "Multi level wildcard (matches multiple directory levels)": "Multinivåsøk (søker på flere mappenivå)",
     "Never": "Aldri",
-    "New Device": "New Device",
-    "New Folder": "New Folder",
+    "New Device": "Ny Enhet",
+    "New Folder": "Ny Mappe",
     "No": "Nei",
     "No File Versioning": "Ingen Versjonskontroll",
     "Notice": "Merknad",
@@ -82,7 +82,7 @@
     "Offline": "Frakobla",
     "Online": "Tilkobla",
     "Out Of Sync": "Ikke Synkronisert",
-    "Out of Sync Items": "Out of Sync Items",
+    "Out of Sync Items": "Ikke Synkroniserte Element",
     "Outgoing Rate Limit (KiB/s)": "Utgående Hastighetsbegrensning (KiB/s)",
     "Override Changes": "Overstyr Endringer",
     "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": "Plasseringen av mappen på datamaskinen. Blir opprettet om den ikke finnes. Krøllstrektegnet (~) kan brukes som forkortelse for",
@@ -97,17 +97,17 @@
     "Restart": "Omstart",
     "Restart Needed": "Omstart Kreves",
     "Restarting": "Starter På Ny",
-    "Reused": "Reused",
+    "Reused": "Gjenbrukt",
     "Save": "Lagre",
     "Scanning": "Skanner",
     "Select the devices to share this folder with.": "Velg enhetene du vil dele denne mappen med.",
-    "Select the folders to share with this device.": "Select the folders to share with this device.",
+    "Select the folders to share with this device.": "Velg hvilke mapper som skal deles med denne enheten.",
     "Settings": "Innstillinger",
-    "Share": "Share",
-    "Share Folder": "Share Folder",
-    "Share Folders With Device": "Share Folders With Device",
+    "Share": "Del",
+    "Share Folder": "Del Mappe",
+    "Share Folders With Device": "Del Mapper Med Enhet",
     "Share With Devices": "Del Med Enheter",
-    "Share this folder?": "Share this folder?",
+    "Share this folder?": "Dele denne mappen?",
     "Shared With": "Del Med",
     "Short identifier for the folder. Must be the same on all cluster devices.": "Kort kjennemerke på mappen. Må være det samme på alle enheter i en gruppe.",
     "Show ID": "Vis ID",
@@ -121,7 +121,7 @@
     "Staggered File Versioning": "Forskjøvet Versjonskontroll",
     "Start Browser": "Start Nettleser",
     "Stopped": "Stoppa",
-    "Support": "Support",
+    "Support": "Brukerstøtte",
     "Support / Forum": "Brukerstøtte / Forum",
     "Sync Protocol Listen Addresses": "Lytteadresse For Synkroniseringsprotokoll",
     "Synchronization": "Synkronisering",
@@ -150,8 +150,8 @@
     "The rescan interval must be a non-negative number of seconds.": "Antall sekund i skanneintervallet kan ikke være negativt.",
     "The rescan interval must be at least 5 seconds.": "Skanneintervallet må være minst 5 sekund.",
     "Unknown": "Ukjent",
-    "Unshared": "Unshared",
-    "Unused": "Unused",
+    "Unshared": "Ikke delt",
+    "Unused": "Ikke i bruk",
     "Up to Date": "Oppdatert",
     "Upgrade To {%version%}": "Oppgrader Til {{version}}",
     "Upgrading": "Oppgraderer",
@@ -167,5 +167,5 @@
     "You must keep at least one version.": "Du må beholde minst én versjon",
     "full documentation": "all dokumentasjon",
     "items": "element",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} wants to share folder \"{{folder}}\"."
+    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} ønsker å dele mappen \"{{folder}}\"."
 }

gui/assets/lang/lang-nn.json

@@ -1,10 +1,10 @@
 {
     "API Key": "API-nøkkel",
     "About": "Om",
-    "Add": "Add",
+    "Add": "Legg til",
     "Add Device": "Legg Til Eining",
     "Add Folder": "Legg Til Mappe",
-    "Add new folder?": "Add new folder?",
+    "Add new folder?": "Legg til ny mappe?",
     "Address": "Adresse",
     "Addresses": "Adresser",
     "Allow Anonymous Usage Reporting?": "Tillat Anonym Innsamling Av Brukardata?",
@@ -13,25 +13,25 @@
     "Automatic upgrades": "Automatiske oppdateringar",
     "Bugs": "Programfeil",
     "CPU Utilization": "CPU-utnytting",
-    "Changelog": "Changelog",
+    "Changelog": "Endringslog",
     "Close": "Lukk",
     "Comment, when used at the start of a line": "Kommentar, når det vert brukt i starten av ei linje.",
     "Compression is recommended in most setups.": "Komprimering er tilrådd i dei fleste høve.",
     "Connection Error": "Tilkoplingsfeil",
-    "Copied from elsewhere": "Copied from elsewhere",
-    "Copied from original": "Copied from original",
+    "Copied from elsewhere": "Kopiert frå ein annan stad",
+    "Copied from original": "Kopiert frå original",
     "Copyright © 2014 Jakob Borg and the following Contributors:": "Copyright © 2014 Jakob Borg og følgjande Bidragsytarar:",
     "Delete": "Slett",
     "Device ID": "Eining ID",
     "Device Identification": "Einingskjennemerke",
     "Device Name": "Namn På Eining",
-    "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?": "Eining {{device}} ({{address}}) vil kople seg til. Legg til eining?",
+    "Devices": "Einingar",
     "Disconnected": "Fråkopla",
     "Documentation": "Dokumentasjon",
     "Download Rate": "Nedlastingsrate",
-    "Downloaded": "Downloaded",
-    "Downloading": "Downloading",
+    "Downloaded": "Lasta ned",
+    "Downloading": "Lastar ned",
     "Edit": "Rediger",
     "Edit Device": "Rediger Eining",
     "Edit Folder": "Rediger Mappe",
@@ -47,7 +47,7 @@
     "Folder ID": "Mappe ID",
     "Folder Master": "Styrande Mappe",
     "Folder Path": "Mappeplassering",
-    "Folders": "Folders",
+    "Folders": "Mapper",
     "GUI Authentication Password": "GUI Passord",
     "GUI Authentication User": "GUI Brukar",
     "GUI Listen Addresses": "GUI Lytteadresse",
@@ -56,25 +56,25 @@
     "Global Discovery Server": "Global Søkjemotor",
     "Global State": "Global Tilstand",
     "Idle": "Pause",
-    "Ignore": "Ignore",
+    "Ignore": "Ignorer",
     "Ignore Patterns": "Utelatingsmønster",
     "Ignore Permissions": "Ignorer Tilgangsbit",
     "Incoming Rate Limit (KiB/s)": "Innkomande Hastigheitsgrense (KiB/s)",
     "Introducer": "Introduktør",
     "Inversion of the given condition (i.e. do not exclude)": "Invers av den gitte tilstanden (t.d. ikkje ekskluder)",
     "Keep Versions": "Behald Versjonar",
-    "Last File Received": "Last File Received",
-    "Last File Synced": "Last File Synced",
+    "Last File Received": "Sist Mottatte Fil",
+    "Last File Synced": "Sist Synkroniserte Fil",
     "Last seen": "Sist sett",
-    "Later": "Later",
+    "Later": "Seinare",
     "Latest Release": "Nyaste Versjon",
     "Local Discovery": "Lokal Søking",
     "Local State": "Lokal Tilstand",
     "Maximum Age": "Maksimal Levetid",
     "Multi level wildcard (matches multiple directory levels)": "Multinivåsøk (søkjer på fleire mappenivå)",
     "Never": "Aldri",
-    "New Device": "New Device",
-    "New Folder": "New Folder",
+    "New Device": "Ny Eining",
+    "New Folder": "Ny Mappe",
     "No": "Nei",
     "No File Versioning": "Ingen Versjonskontroll",
     "Notice": "Merknad",
@@ -82,7 +82,7 @@
     "Offline": "Fråkopla",
     "Online": "Tilkopla",
     "Out Of Sync": "Ikkje Synkronisert",
-    "Out of Sync Items": "Out of Sync Items",
+    "Out of Sync Items": "Ikkje Synkroniserte Element",
     "Outgoing Rate Limit (KiB/s)": "Utgåande Hastigheitsgrense (KiB/s)",
     "Override Changes": "Overstyr Endringar",
     "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": "Plasseringa av mappa på datamaskinen. Vert oppretta om ho ikkje finst. Krøllstrekteiknet (~) kan brukast som forkorting for",
@@ -97,17 +97,17 @@
     "Restart": "Omstart",
     "Restart Needed": "Omstart Trengs",
     "Restarting": "Startar På Ny",
-    "Reused": "Reused",
+    "Reused": "Gjenbrukt",
     "Save": "Lagre",
     "Scanning": "Skannar",
     "Select the devices to share this folder with.": "Vel einingane du vil dela denne mappa med.",
-    "Select the folders to share with this device.": "Select the folders to share with this device.",
+    "Select the folders to share with this device.": "Vel mappene du vil dela med denne eininga.",
     "Settings": "Innstillingar",
-    "Share": "Share",
-    "Share Folder": "Share Folder",
-    "Share Folders With Device": "Share Folders With Device",
+    "Share": "Del",
+    "Share Folder": "Del Mappe",
+    "Share Folders With Device": "Del Mapper Med Eining",
     "Share With Devices": "Del Med Einingar",
-    "Share this folder?": "Share this folder?",
+    "Share this folder?": "Del denne mappa?",
     "Shared With": "Delt Med",
     "Short identifier for the folder. Must be the same on all cluster devices.": "Kort kjennemerke på mappa. Må vera det same på alle einingar i ei gruppe.",
     "Show ID": "Vis ID",
@@ -121,7 +121,7 @@
     "Staggered File Versioning": "Forskyvd Versjonskontroll",
     "Start Browser": "Start Nettlesar",
     "Stopped": "Stoppa",
-    "Support": "Support",
+    "Support": "Brukarstøtte",
     "Support / Forum": "Brukarstøtte / Forum",
     "Sync Protocol Listen Addresses": "Lytteadresse For Synkroniseringsprotokoll",
     "Synchronization": "Synkronisering",
@@ -150,8 +150,8 @@
     "The rescan interval must be a non-negative number of seconds.": "Talet på sekund i skanneintervallet kan ikkje vera negativt.",
     "The rescan interval must be at least 5 seconds.": "Skanneintervallet må vera minst 5 sekund.",
     "Unknown": "Ukjent",
-    "Unshared": "Unshared",
-    "Unused": "Unused",
+    "Unshared": "Ikkje delt",
+    "Unused": "Ubrukt",
     "Up to Date": "Oppdatert",
     "Upgrade To {%version%}": "Oppgrader Til {{version}}",
     "Upgrading": "Oppgraderer",
@@ -167,5 +167,5 @@
     "You must keep at least one version.": "Du må behalda minst ein versjon.",
     "full documentation": "all dokumentasjon",
     "items": "element",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} wants to share folder \"{{folder}}\"."
+    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} vil dela mappa \"{{folder}}\"."
 }

gui/assets/lang/lang-pl.json

@@ -1,10 +1,10 @@
 {
     "API Key": "Klucz API",
     "About": "O Syncthing",
-    "Add": "Add",
+    "Add": "Dodaj",
     "Add Device": "Dodaj urządzenie",
     "Add Folder": "Dodaj folder",
-    "Add new folder?": "Add new folder?",
+    "Add new folder?": "Dodać nowy folder?",
     "Address": "Adres",
     "Addresses": "Adresy",
     "Allow Anonymous Usage Reporting?": "Zezwalaj na anonimowe statystyki użycia",
@@ -13,7 +13,7 @@
     "Automatic upgrades": "Automatyczne aktualizacje",
     "Bugs": "Błędy",
     "CPU Utilization": "Użycie CPU",
-    "Changelog": "Changelog",
+    "Changelog": "Historia zmian",
     "Close": "Zamknij",
     "Comment, when used at the start of a line": "Komentarz, jeżeli użyty na początku linii",
     "Compression is recommended in most setups.": "Kompresja jest zalecana w większości przypadków",
@@ -26,12 +26,12 @@
     "Device Identification": "Identyfikator urządzenia",
     "Device Name": "Nazwa urządzenia",
     "Device {%device%} ({%address%}) wants to connect. Add new device?": "Device {{device}} ({{address}}) wants to connect. Add new device?",
-    "Devices": "Devices",
+    "Devices": "Urządzenia",
     "Disconnected": "Rozłączony",
     "Documentation": "Dokumentacja",
     "Download Rate": "Prędkość pobierania",
-    "Downloaded": "Downloaded",
-    "Downloading": "Downloading",
+    "Downloaded": "Pobrane",
+    "Downloading": "Pobieranie",
     "Edit": "Edytuj",
     "Edit Device": "Edytuj urządzenie",
     "Edit Folder": "Edytuj folder",
@@ -47,7 +47,7 @@
     "Folder ID": "ID folderu",
     "Folder Master": "Główny folder",
     "Folder Path": "Ścieżka folderu",
-    "Folders": "Folders",
+    "Folders": "Foldery",
     "GUI Authentication Password": "Hasło",
     "GUI Authentication User": "Użytkownik",
     "GUI Listen Addresses": "Adres nasłuchiwania",
@@ -63,8 +63,8 @@
     "Introducer": "Wprowadzający",
     "Inversion of the given condition (i.e. do not exclude)": "Odwrócenie podanego wzorca (np. nie wykluczaj)",
     "Keep Versions": "Zachowuj wersje",
-    "Last File Received": "Last File Received",
-    "Last File Synced": "Last File Synced",
+    "Last File Received": "Ostatni otrzymany plik",
+    "Last File Synced": "Ostatni zsynchronizowany plik",
     "Last seen": "Ostatnio widziany",
     "Later": "Later",
     "Latest Release": "Najnowsza wersja",
@@ -73,8 +73,8 @@
     "Maximum Age": "Maksymalny wiek",
     "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": "New Device",
-    "New Folder": "New Folder",
+    "New Device": "Nowe urządzenie",
+    "New Folder": "Nowy folder",
     "No": "Nie",
     "No File Versioning": "Bez wersjonowania pliku",
     "Notice": "Wskazówka",
@@ -101,7 +101,7 @@
     "Save": "Zapisz",
     "Scanning": "Skanowanie",
     "Select the devices to share this folder with.": "Wybierz urządzenie, któremu udostępnić folder.",
-    "Select the folders to share with this device.": "Select the folders to share with this device.",
+    "Select the folders to share with this device.": "Wybierz foldery do współdzielenia z tym urządzeniem.",
     "Settings": "Ustawienia",
     "Share": "Share",
     "Share Folder": "Share Folder",
@@ -147,11 +147,11 @@
     "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Maksymalny czas zachowania wersji (w dniach, ustaw 0 aby zachować na zawsze)",
     "The number of old versions to keep, per file.": "Liczba wersji pliku do zachowania.",
     "The number of versions must be a number and cannot be blank.": "Liczba wersji musi być liczbą i nie może być pusta.",
-    "The rescan interval must be a non-negative number of seconds.": "The rescan interval must be a non-negative number of seconds.",
+    "The rescan interval must be a non-negative number of seconds.": "Interwał skanowania musi być niezerową liczbą sekund.",
     "The rescan interval must be at least 5 seconds.": "Interwał skanowania musi wynosić co najmniej 5 sekund.",
     "Unknown": "Nieznany",
     "Unshared": "Unshared",
-    "Unused": "Unused",
+    "Unused": "Nieużywane",
     "Up to Date": "Aktualny",
     "Upgrade To {%version%}": "Aktualizuj do {{version}}",
     "Upgrading": "Aktualizowanie",

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

@@ -82,7 +82,7 @@
     "Offline": "Desconectado",
     "Online": "Conectado",
     "Out Of Sync": "Não sincronizado",
-    "Out of Sync Items": "Itens dessincronizados",
+    "Out of Sync Items": "Itens não sincronizados",
     "Outgoing Rate Limit (KiB/s)": "Limite da velocidade de envio (KiB/s)",
     "Override Changes": "Sobrepor alterações",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Caminho para a pasta no computador local. Será criada, caso não exista. O caractere (~) pode ser utilizado como atalho para",

gui/assets/lang/lang-ru.json

@@ -1,10 +1,10 @@
 {
     "API Key": "Ключ API",
     "About": "О программе",
-    "Add": "Add",
+    "Add": "Добавить",
     "Add Device": "Добавить устройство",
     "Add Folder": "Добавить папку",
-    "Add new folder?": "Add new folder?",
+    "Add new folder?": "Добавить новую папку?",
     "Address": "Адрес",
     "Addresses": "Адреса",
     "Allow Anonymous Usage Reporting?": "Разрешить сбор анонимной статистики использования?",
@@ -13,7 +13,7 @@
     "Automatic upgrades": "Автообновление",
     "Bugs": "Ошибки",
     "CPU Utilization": "Загрузка ЦПУ",
-    "Changelog": "Changelog",
+    "Changelog": "Журнал изменений",
     "Close": "Закрыть",
     "Comment, when used at the start of a line": "Комментарий, если используется в начале строки",
     "Compression is recommended in most setups.": "Сжатие рекомендуется в большинстве случаев.",
@@ -25,8 +25,8 @@
     "Device ID": "ID устройства",
     "Device Identification": "Идентификация устройства",
     "Device Name": "Имя устройства",
-    "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}}) хочет подключиться. Добавить новое устройство?",
+    "Devices": "Устройства",
     "Disconnected": "Нет соединения",
     "Documentation": "Документация",
     "Download Rate": "Скорость загрузки",
@@ -56,25 +56,25 @@
     "Global Discovery Server": "Сервер глобального обнаружения",
     "Global State": "Глобальное состояние",
     "Idle": "Бездействует",
-    "Ignore": "Ignore",
+    "Ignore": "Игнорировать",
     "Ignore Patterns": "Шаблоны игнорирования",
     "Ignore Permissions": "Игнорировать файловые права доступа",
     "Incoming Rate Limit (KiB/s)": "Ограничение входящего потока (Кбит/сек)",
     "Introducer": "Рекомендатель",
     "Inversion of the given condition (i.e. do not exclude)": "Инвертировать текущее условие (например, исключить)",
     "Keep Versions": "Количество хранимых версий",
-    "Last File Received": "Last File Received",
+    "Last File Received": "Последний полученный файл",
     "Last File Synced": "Последний синхронизированный файл",
     "Last seen": "Был доступен",
-    "Later": "Later",
+    "Later": "Потом",
     "Latest Release": "Последняя версия",
     "Local Discovery": "Локальное обнаружение",
     "Local State": "Локальное состояние",
     "Maximum Age": "Максимальный срок",
     "Multi level wildcard (matches multiple directory levels)": "Многоуровневая маска (поиск совпадений во всех подпапках)",
     "Never": "Никогда",
-    "New Device": "New Device",
-    "New Folder": "New Folder",
+    "New Device": "Новое устройство",
+    "New Folder": "Новая напка",
     "No": "Нет",
     "No File Versioning": "Без управления версиями файлов",
     "Notice": "Внимание",
@@ -82,7 +82,7 @@
     "Offline": "Оффлайн",
     "Online": "Онлайн",
     "Out Of Sync": "Не синхронизировано",
-    "Out of Sync Items": "Out of Sync Items",
+    "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": "Путь к папке на локальном компьютере. Если её не существует, то она будет создана. Тильда (~) может использоваться как сокращение для",
@@ -103,25 +103,25 @@
     "Select the devices to share this folder with.": "Выберите устройства, для которых будет доступна эта папка.",
     "Select the folders to share with this device.": "Выберите папку для предоставления доступа данному устройству",
     "Settings": "Настройки",
-    "Share": "Share",
-    "Share Folder": "Share Folder",
+    "Share": "Предоставить доступ",
+    "Share Folder": "Предоставить доступ к папке",
     "Share Folders With Device": "Предоставить доступ устройству к папкам",
     "Share With Devices": "Предоставить доступ устройствам",
-    "Share this folder?": "Share this folder?",
+    "Share this folder?": "Предоставить доступ к этой папке?",
     "Shared With": "Доступ предоставлен",
     "Short identifier for the folder. Must be the same on all cluster devices.": "Короткий идентификатор папки. Должен быть одинаковым на всех устройствах кластера.",
     "Show ID": "Показать ID",
     "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Отображается вместо ID устройства в статусе группы. Будет разослан другим устройствам в качестве имени по умолчанию.",
     "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Отображается вместо ID устройства в статусе группы. Если поле не заполнено, то будет установлено имя, передаваемое этим устройством.",
     "Shutdown": "Выключить",
-    "Shutdown Complete": "Shutdown Complete",
+    "Shutdown Complete": "Выключено",
     "Simple File Versioning": "Простое управление версиями файлов",
     "Single level wildcard (matches within a directory only)": "Одноуровневая маска (поиск совпадений только внутри папки)",
     "Source Code": "Исходный код",
     "Staggered File Versioning": "Ступенчатое управление версиями файлов",
     "Start Browser": "Открыть браузер",
     "Stopped": "Остановлено",
-    "Support": "Support",
+    "Support": "Поддержка",
     "Support / Forum": "Поддержка / Форум",
     "Sync Protocol Listen Addresses": "Адрес протокола синхронизации",
     "Synchronization": "Синхронизация",
@@ -131,7 +131,7 @@
     "Syncthing is restarting.": "Перезапуск Syncthing",
     "Syncthing is upgrading.": "Обновление Syncthing ",
     "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Кажется, Syncthing не запущен или есть проблемы с подключением к Интернету. Переподключаюсь...",
-    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing 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.": "Похоже, у Syncthing возникла проблема с обработкой запроса. Обновите страницу в обозревателе или перезапустите Syncthing, если это не поможет.",
     "The aggregated statistics are publicly available at {%url%}.": "Суммарная статистика общедоступна на {{url}}.",
     "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Конфигурация была сохранена но не активирована. Для активации новой конфигурации необходимо рестартовать Syncthing.",
     "The device ID cannot be blank.": "ID устройства не может быть пустым.",

gui/assets/lang/lang-sv.json

@@ -9,7 +9,7 @@
     "Addresses": "Adresser",
     "Allow Anonymous Usage Reporting?": "Tillåt anonym användarstatistik?",
     "Anonymous Usage Reporting": "Anonym användarstatistik",
-    "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.",
+    "Any devices configured on an introducer device will be added to this device as well.": "Enheter konfigurerade på en introduktörsenhet kommer också att läggas till den här enheten.",
     "Automatic upgrades": "Automatisk uppgradering",
     "Bugs": "Buggar",
     "CPU Utilization": "CPU-användning",
@@ -20,13 +20,13 @@
     "Connection Error": "Anslutningsproblem",
     "Copied from elsewhere": "Kopierat utifrån",
     "Copied from original": "Oförändrat",
-    "Copyright © 2014 Jakob Borg and the following Contributors:": "Copyright © 2014 Jakob Borg och de följande medarbetarna:",
+    "Copyright © 2014 Jakob Borg and the following Contributors:": "Copyright © 2014 Jakob Borg och följande medarbetare:",
     "Delete": "Radera",
     "Device ID": "Enhets-ID",
     "Device Identification": "Enhetsidentifikation",
     "Device Name": "Enhetsnamn",
-    "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?": "Enheten {{device}} ({{address}}) vill ansluta. Lägg till ny enhet?",
+    "Devices": "Enheter",
     "Disconnected": "Ej ansluten",
     "Documentation": "Dokumentation",
     "Download Rate": "Nedladdningshastighet",
@@ -57,14 +57,14 @@
     "Global State": "Global status",
     "Idle": "Vilande",
     "Ignore": "Ignorera",
-    "Ignore Patterns": "Filmönster",
+    "Ignore Patterns": "Ignorerade filmönster",
     "Ignore Permissions": "Ignorera filrättigheter",
     "Incoming Rate Limit (KiB/s)": "Max nedladdningshastighet (KiB/s)",
-    "Introducer": "Introducer",
+    "Introducer": "introduktör",
     "Inversion of the given condition (i.e. do not exclude)": "Vänder på villkoret, d.v.s. exkluderar inte.",
     "Keep Versions": "Behåll versioner",
-    "Last File Received": "Last File Received",
-    "Last File Synced": "Senast uppdaterad fil",
+    "Last File Received": "Senast Mottagna Fil",
+    "Last File Synced": "Senast uppdaterade fil",
     "Last seen": "Senast online",
     "Later": "Senare",
     "Latest Release": "Senaste version",
@@ -77,16 +77,16 @@
     "New Folder": "Ny katalog",
     "No": "Nej",
     "No File Versioning": "Ingen versionshantering",
-    "Notice": "OBS",
+    "Notice": "Observera",
     "OK": "OK",
     "Offline": "Ej tillgänglig",
     "Online": "Tillgänglig",
-    "Out Of Sync": "Ur synk",
-    "Out of Sync Items": "Out of Sync Items",
+    "Out Of Sync": "Osynkad",
+    "Out of Sync Items": "Osynkade poster",
     "Outgoing Rate Limit (KiB/s)": "Max uppladdningshastighet (KiB/s)",
     "Override Changes": "Skriv över ändringar",
     "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": "Sökväg till katalogen på din dator. Kommer att skapas om det inte finns. Tecknet tilde (~) kan användas som en genväg för",
-    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Sökväg där versioner sparas (lämna blankt för att använda .stversions i den ordinarie katalogen).",
+    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Sökväg där versioner sparas (lämna tomt för att använda .stversions i den ordinarie katalogen).",
     "Please wait": "Var god vänta",
     "Preview": "Förhandsgranska",
     "Preview Usage Report": "Förhandsgranska statistik",
@@ -101,20 +101,20 @@
     "Save": "Spara",
     "Scanning": "Uppdaterar",
     "Select the devices to share this folder with.": "Ange enheterna att dela den här katalogen med.",
-    "Select the folders to share with this device.": "Välja kataloger att dela med den här enheten",
+    "Select the folders to share with this device.": "Välj kataloger att dela med den här enheten.",
     "Settings": "Inställningar",
     "Share": "Dela",
     "Share Folder": "Dela katalog",
     "Share Folders With Device": "Dela kataloger med enhet",
     "Share With Devices": "Dela med enheter",
     "Share this folder?": "Dela den här katalogen?",
-    "Shared With": "Delat med",
-    "Short identifier for the folder. Must be the same on all cluster devices.": "Kort identifieringssträng för katalogen. Måste vara samma på alla enheter i klustern.",
+    "Shared With": "Delad med",
+    "Short identifier for the folder. Must be the same on all cluster devices.": "Kort identifieringssträng för katalogen. Måste vara samma på alla enheter i klustret.",
     "Show ID": "Visa ID",
     "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Visas i stället för enhets-ID. Skickas till andra enheter som namn på denna enhet.",
-    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Visas i stället för enhets-ID. Sätts till namnet på den andra enheten vid första anslutning om det lämnas blankt.",
+    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Visas i stället för enhets-ID. Sätts till namnet på den andra enheten vid första anslutning om det lämnas tomt.",
     "Shutdown": "Stäng av",
-    "Shutdown Complete": "Shutdown Complete",
+    "Shutdown Complete": "Avstängning klar",
     "Simple File Versioning": "Enkel versionshantering",
     "Single level wildcard (matches within a directory only)": "Jokertecken som representerar noll eller fler godtyckliga tecken i ett filnamn.",
     "Source Code": "Källkod",
@@ -127,30 +127,30 @@
     "Synchronization": "Synkronisering",
     "Syncing": "Synkroniserar",
     "Syncthing has been shut down.": "Syncthing har stängts ner.",
-    "Syncthing includes the following software or portions thereof:": "Syncthing innehåller de följande mjukvarupaketen eller delar därav:",
+    "Syncthing includes the following software or portions thereof:": "Syncthing innehåller följande mjukvarupaket eller delar av dem:",
     "Syncthing is restarting.": "Syncthing startar om.",
     "Syncthing is upgrading.": "Syncthing uppgraderas.",
-    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing verkar avstängd, eller så är där ett problem med din Internetanslutning. Försöker igen...",
-    "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.",
-    "The aggregated statistics are publicly available at {%url%}.": "Aggregerad statistik finns publikt tillgänglig på {{url}}.",
+    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing verkar avstängd, eller finns det problem med din Internetanslutning. Försöker igen...",
+    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing verkar ha problem med att genomföra din förfrågan. Ladda om sidan i din webbläsare eller starta om Syncthing ifall problemet kvarstår.",
+    "The aggregated statistics are publicly available at {%url%}.": "Sammanställd statistik finns publikt tillgänglig på {{url}}.",
     "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Konfigurationen har sparats men inte aktiverats. Syncthing måste startas om för att aktivera den nya konfigurationen.",
-    "The device ID cannot be blank.": "Enhets-ID kan inte vara blankt.",
+    "The device ID cannot be blank.": "Enhets-ID kan inte vara tomt.",
     "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).": "Enhets-ID som behövs här kan du hitta i \"Redigera > Visa ID\"-dialogen på den andra enheten. Mellanrum och bindestreck är valfria (ignoreras).",
     "The encrypted usage report is sent daily. It is used to track common platforms, folder sizes and app versions. If the reported data set is changed you will be prompted with this dialog again.": "Den krypterade användarstatistiken skickas dagligen. Den används för att spåra vanliga plattformar, katalogstorlekar och versioner. Om datan som rapporteras ändras så kommer du att bli tillfrågad igen.",
     "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.": "Det inmatade enhets-ID:t verkar inte korrekt. Det ska vara en 52 eller 56 teckens sträng bestående av siffror och bokstäver, eventuellt med mellanrum och bindestreck.",
     "The folder ID cannot be blank.": "Ange ett enhets-ID.",
     "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "Katalog-ID:t måste vara en kort sträng (64 tecken eller mindre), bestående av endast bokstäver, siffror, punkt (.), bindestreck (-) och understreck (_).",
-    "The folder ID must be unique.": "Enhets-ID måste vara unikt.",
+    "The folder ID must be unique.": "Katalog-ID:t måste vara unikt.",
     "The folder path cannot be blank.": "Ange en sökväg.",
     "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 maximum age must be a number and cannot be blank.": "Åldersgränsen måste vara ett tal och kan inte lämnas blankt.",
-    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Den längsta tid att behålla en version (i dagar, sätt till 0 för att behålla versioner för evigt).",
+    "The maximum age must be a number and cannot be blank.": "Åldersgränsen måste vara ett tal och kan inte lämnas tomt.",
+    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Den längsta tiden att behålla en version (i dagar, sätt till 0 för att behålla versioner för evigt).",
     "The number of old versions to keep, per file.": "Antalet gamla versioner som ska behållas, per fil.",
-    "The number of versions must be a number and cannot be blank.": "Antalet versioner måste vara ett nummer och kan inte lämnas blankt.",
+    "The number of versions must be a number and cannot be blank.": "Antalet versioner måste vara ett nummer och kan inte lämnas tomt.",
     "The rescan interval must be a non-negative number of seconds.": "Förnyelseintervallet måste vara ett positivt antal sekunder",
     "The rescan interval must be at least 5 seconds.": "Uppdateringsintervallet måste vara minst 5 sekunder.",
     "Unknown": "Okänt",
-    "Unshared": "Odelat",
+    "Unshared": "Inte delad",
     "Unused": "Oanvänd",
     "Up to Date": "Helt uppdaterad",
     "Upgrade To {%version%}": "Uppgradera till {{version}}",
@@ -167,5 +167,5 @@
     "You must keep at least one version.": "Du måste behålla åtminstone en version.",
     "full documentation": "fullständig dokumentation",
     "items": "poster",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} wants to share folder \"{{folder}}\"."
+    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} vill dela katalogen \"{{folder}}\"."
 }

gui/index.html

@@ -64,12 +64,12 @@
 
   <div class="container">
 
-    <!-- First row, only shown if necessary; Restart warning -->
+    <!-- Panel: Restart Needed -->
 
     <div ng-if="!configInSync" class="row">
       <div class="col-md-12">
         <div class="panel panel-warning">
-          <div class="panel-heading"><h3 translate class="panel-title">Restart Needed</h3></div>
+          <div class="panel-heading"><h3 class="panel-title"><span class="glyphicon glyphicon-exclamation-sign"></span><span translate>Restart Needed</span></h3></div>
           <div class="panel-body">
             <p translate>The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.</p>
           </div>
@@ -81,6 +81,90 @@
       </div>
     </div>
 
+    <!-- Panel: New Device -->
+
+    <div ng-repeat="(device, event) in deviceRejections" class="row">
+      <div class="col-md-12">
+        <div class="panel panel-warning">
+          <div class="panel-heading">
+            <h3 class="panel-title">
+              <identicon data-value="device"></identicon>&emsp;<span translate>New Device</span>
+            </h3>
+          </div>
+          <div class="panel-body">
+            <p>
+              <small>{{ event.time | date:"H:mm:ss" }}:</small>
+              <span translate translate-value-device="{{ device }}" translate-value-address="{{ event.data.address }}">
+                Device {%device%} ({%address%}) wants to connect. Add new device?
+              <span>
+            </p>
+          </div>
+          <div class="panel-footer clearfix">
+            <div class="pull-right">
+              <button class="btn btn-sm btn-success" ng-click="addNewDeviceID(device)"><span class="glyphicon glyphicon-ok"></span>&emsp;<span translate>Add</span></button>
+              <button class="btn btn-sm btn-danger" ng-click="ignoreRejectedDevice(device)"><span class="glyphicon glyphicon-remove"></span>&emsp;<span translate>Ignore</span></button>
+              <button class="btn btn-sm btn-default" ng-click="dismissDeviceRejection(device)"><span class="glyphicon glyphicon-time"></span>&emsp;<span translate>Later</span></button>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <!-- Panel: New Folder -->
+
+    <div ng-repeat="(key, event) in folderRejections" class="row reject">
+      <div class="col-md-12">
+        <div class="panel panel-warning">
+          <div class="panel-heading">
+            <h3 class="panel-title"><span class="glyphicon glyphicon-hdd"></span>
+              <span translate ng-if="!folders[event.data.folder]">New Folder</span>
+              <span translate ng-if="folders[event.data.folder]">Share Folder</span>
+            </h3>
+          </div>
+          <div class="panel-body">
+            <p>
+              <small>{{ event.time | date:"H:mm:ss" }}:</small>
+              <span translate translate-value-device="{{ deviceName(findDevice(event.data.device)) }}" translate-value-folder="{{ event.data.folder }}">
+                {%device%} wants to share folder "{%folder%}".
+              </span>
+              <span translate ng-if="folders[event.data.folder]">Share this folder?</span>
+              <span translate ng-if="!folders[event.data.folder]">Add new folder?</span>
+            </p>
+          </div>
+          <div class="panel-footer clearfix">
+            <div class="pull-right">
+              <button class="btn btn-sm btn-success" ng-click="addFolderAndShare(event.data.folder, event.data.device)" ng-if="!folders[event.data.folder]">
+                <span class="glyphicon glyphicon-ok"></span>&emsp;<span translate>Add</span>
+              </button>
+              <button class="btn btn-sm btn-success" ng-click="shareFolderWithDevice(event.data.folder, event.data.device)" ng-if="folders[event.data.folder]">
+                <span class="glyphicon glyphicon-ok"></span>&emsp;<span translate>Share</span>
+              </button>
+              <button class="btn btn-sm btn-default" ng-click="dismissFolderRejection(event.data.folder, event.data.device)">
+                <span class="glyphicon glyphicon-time"></span>&emsp;<span translate>Later</span>
+              </button>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <!-- Panel: Notice -->
+
+    <div ng-if="errorList().length > 0" class="row">
+      <div class="col-md-12">
+        <div class="panel panel-warning">
+          <div class="panel-heading"><h3 class="panel-title"><span class="glyphicon glyphicon-exclamation-sign"></span><span translate>Notice</span></h3></div>
+          <div class="panel-body">
+            <p ng-repeat="err in errorList()"><small>{{err.Time | date:"H:mm:ss"}}:</small> {{friendlyDevices(err.Error)}}</p>
+          </div>
+          <div class="panel-footer">
+            <button type="button" class="pull-right btn btn-sm btn-default" ng-click="clearErrors()"><span class="glyphicon glyphicon-ok"></span>&emsp;<span translate>OK</span></button>
+            <div class="clearfix"></div>
+          </div>
+        </div>
+      </div>
+    </div>
+
     <!-- First regular row -->
 
     <div class="row">
@@ -140,6 +224,12 @@
                         <span translate>Yes</span>
                       </td>
                     </tr>
+                    <tr ng-if="model[folder.ID].ignorePatterns">
+                      <th><span class="glyphicon glyphicon-minus"></span>&emsp;<span translate>Ignore Patterns</span></th>
+                      <td class="text-right">
+                        <span translate>Yes</span>
+                      </td>
+                    </tr>
                     <tr ng-if="folder.IgnorePerms">
                       <th><span class="glyphicon glyphicon-unchecked"></span>&emsp;<span translate>Ignore Permissions</span></th>
                       <td class="text-right">
@@ -173,7 +263,7 @@
                 </table>
               </div>
               <div class="panel-footer">
-                <button class="btn btn-sm btn-danger" ng-if="folder.ReadOnly && model[folder.ID].needFiles > 0" ng-click="override(folder.ID)" href=""><span class="glyphicon glyphicon-upload"></span>&emsp;<span translate>Override Changes</span></button>
+                <button class="btn btn-sm btn-danger pull-left" ng-if="folder.ReadOnly && model[folder.ID].needFiles > 0" ng-click="override(folder.ID)" href=""><span class="glyphicon glyphicon-upload"></span>&emsp;<span translate>Override Changes</span></button>
                 <span class="pull-right">
                   <button class="btn btn-sm btn-default" href="" ng-show="folderStatus(folder) == 'idle'" ng-click="rescanFolder(folder.ID)"><span class="glyphicon glyphicon-refresh"></span>&emsp;<span translate>Rescan</span></button>
                   <button class="btn btn-sm btn-default" href="" ng-click="editFolder(folder)"><span class="glyphicon glyphicon-pencil"></span>&emsp;<span translate>Edit</span></button>
@@ -317,90 +407,6 @@
       </div>
     </div> <!-- /row -->
 
-    <!-- Device Rejections -->
-
-    <div ng-repeat="(device, event) in deviceRejections" class="row">
-      <div class="col-md-12">
-        <div class="panel panel-warning">
-          <div class="panel-heading">
-            <h3 class="panel-title">
-              <identicon data-value="device"></identicon>&emsp;<span translate>New Device</span>
-            </h3>
-          </div>
-          <div class="panel-body">
-            <p>
-              <small>{{ event.time | date:"H:mm:ss" }}:</small>
-              <span translate translate-value-device="{{ device }}" translate-value-address="{{ event.data.address }}">
-                Device {%device%} ({%address%}) wants to connect. Add new device?
-              <span>
-            </p>
-          </div>
-          <div class="panel-footer clearfix">
-            <div class="pull-right">
-              <button class="btn btn-sm btn-success" ng-click="addNewDeviceID(device)"><span class="glyphicon glyphicon-ok"></span>&emsp;<span translate>Add</span></button>
-              <button class="btn btn-sm btn-danger" ng-click="ignoreRejectedDevice(device)"><span class="glyphicon glyphicon-remove"></span>&emsp;<span translate>Ignore</span></button>
-              <button class="btn btn-sm btn-default" ng-click="dismissDeviceRejection(device)"><span class="glyphicon glyphicon-time"></span>&emsp;<span translate>Later</span></button>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <!-- Folder Rejections -->
-
-    <div ng-repeat="(key, event) in folderRejections" class="row reject">
-      <div class="col-md-12">
-        <div class="panel panel-warning">
-          <div class="panel-heading">
-            <h3 class="panel-title">
-              <span translate ng-if="!folders[event.data.folder]">New Folder</span>
-              <span translate ng-if="folders[event.data.folder]">Share Folder</span>
-            </h3>
-          </div>
-          <div class="panel-body">
-            <p>
-              <small>{{ event.time | date:"H:mm:ss" }}:</small>
-              <span translate translate-value-device="{{ deviceName(findDevice(event.data.device)) }}" translate-value-folder="{{ event.data.folder }}">
-                {%device%} wants to share folder "{%folder%}".
-              </span>
-              <span translate ng-if="folders[event.data.folder]">Share this folder?</span>
-              <span translate ng-if="!folders[event.data.folder]">Add new folder?</span>
-            </p>
-          </div>
-          <div class="panel-footer clearfix">
-            <div class="pull-right">
-              <button class="btn btn-sm btn-success" ng-click="addFolderAndShare(event.data.folder, event.data.device)" ng-if="!folders[event.data.folder]">
-                <span class="glyphicon glyphicon-ok"></span>&emsp;<span translate>Add</span>
-              </button>
-              <button class="btn btn-sm btn-success" ng-click="shareFolderWithDevice(event.data.folder, event.data.device)" ng-if="folders[event.data.folder]">
-                <span class="glyphicon glyphicon-ok"></span>&emsp;<span translate>Share</span>
-              </button>
-              <button class="btn btn-sm btn-default" ng-click="dismissFolderRejection(event.data.folder, event.data.device)">
-                <span class="glyphicon glyphicon-time"></span>&emsp;<span translate>Later</span>
-              </button>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <!-- Errors -->
-
-    <div ng-if="errorList().length > 0" class="row">
-      <div class="col-md-12">
-        <div class="panel panel-warning">
-          <div class="panel-heading"><h3 class="panel-title"><span translate>Notice</span></h3></div>
-          <div class="panel-body">
-            <p ng-repeat="err in errorList()"><small>{{err.Time | date:"H:mm:ss"}}:</small> {{friendlyDevices(err.Error)}}</p>
-          </div>
-          <div class="panel-footer">
-            <button type="button" class="pull-right btn btn-sm btn-default" ng-click="clearErrors()"><span class="glyphicon glyphicon-ok"></span>&emsp;<span translate>OK</span></button>
-            <div class="clearfix"></div>
-          </div>
-        </div>
-      </div>
-    </div>
-
   </div> <!-- /container -->
 
   <!-- Bottom bar -->
@@ -839,7 +845,7 @@
         </div>
         <div class="modal-body">
           <p translate>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.</p>
-          <p translate translate-value-url="https://data.syncthing.net">The aggregated statistics are publicly available at {%url%}.</p>
+          <p translate translate-value-url="<a href=&quot;https://data.syncthing.net&quot; target=&quot;_blank&quot;>https://data.syncthing.net</a>">The aggregated statistics are publicly available at {%url%}.</p>
           <button translate type="button" class="btn btn-default btn-sm" ng-show="!reportPreview" ng-click="showReportPreview()">Preview Usage Report</button>
           <pre ng-if="reportPreview"><small>{{reportData | json}}</small></pre>
         </div>
@@ -861,7 +867,7 @@
         </div>
         <div class="modal-body">
           <p translate>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.</p>
-          <p translate translate-value-url="https://data.syncthing.net">The aggregated statistics are publicly available at {%url%}.</p>
+          <p translate translate-value-url="<a href=&quot;https://data.syncthing.net&quot; target=&quot;_blank&quot;>https://data.syncthing.net</a>">The aggregated statistics are publicly available at {%url%}.</p>
           <pre><small>{{reportData | json}}</small></pre>
         </div>
         <div class="modal-footer">
@@ -906,9 +912,8 @@
       </tr>
       <tr ng-repeat="f in needed.queued" ng-init="a = needAction(f)">
         <td class="small-data"><span class="glyphicon glyphicon-{{needIcons[a]}}"></span> {{needActions[a]}}</td>
-        <td title="{{f.Name}}">{{f.Name | basename}}</td>
+        <td><a href="" ng-if="$index != 0" ng-click="bumpFile(neededFolder, f.Name)" title="{{'Move to top of queue' | translate}}"><span class="glyphicon glyphicon-eject"></span></a><span ng-if="$index != 0">&ensp;</span><span title="{{f.Name}}">{{f.Name | basename}}</span></td>
         <td class="text-right small-data">
-          <span ng-if="$index != 0" class="glyphicon glyphicon-chevron-up" ng-click="bumpFile(neededFolder, f.Name)"></span>
           <span ng-if="f.Size > 0">{{f.Size | binary}}B</span>
          </td>
       </tr>
@@ -954,6 +959,7 @@
           <li>James Patterson</li>
           <li>Jens Diemer</li>
           <li>Jochen Voss</li>
+          <li>Karol Różycki</li>
           <li>Lode Hoste</li>
           <li>Marcin Dziadus</li>
           <li>Michael Jephcote</li>
@@ -963,6 +969,7 @@
           <li>Phill Luby</li>
           <li>Piotr Bejda</li>
           <li>Ryan Sullivan</li>
+          <li>Stefan Tatschner</li>
           <li>Tim Abell</li>
           <li>Tomas Cerveny</li>
           <li>Tully Robinson</li>

internal/config/config.go

@@ -26,6 +26,7 @@ import (
 	"reflect"
 	"sort"
 	"strconv"
+	"strings"
 
 	"github.com/calmh/logger"
 	"github.com/syncthing/protocol"
@@ -261,6 +262,10 @@ func (cfg *Configuration) prepare(myID protocol.DeviceID) {
 			continue
 		}
 
+		if !strings.HasSuffix(folder.Path, string(filepath.Separator)) {
+			folder.Path += string(filepath.Separator)
+		}
+
 		if folder.ID == "" {
 			folder.ID = "default"
 		}

internal/config/config_test.go

@@ -19,6 +19,7 @@ import (
 	"fmt"
 	"os"
 	"reflect"
+	"runtime"
 	"testing"
 
 	"github.com/syncthing/protocol"
@@ -261,6 +262,23 @@ func TestVersioningConfig(t *testing.T) {
 	}
 }
 
+func TestIssue1262(t *testing.T) {
+	cfg, err := Load("testdata/issue-1262.xml", device4)
+	if err != nil {
+		t.Error(err)
+	}
+
+	actual := cfg.Folders()["test"].Path
+	expected := "e:/"
+	if runtime.GOOS == "windows" {
+		expected = `e:\`
+	}
+
+	if actual != expected {
+		t.Errorf("%q != %q", actual, expected)
+	}
+}
+
 func TestNewSaveLoad(t *testing.T) {
 	path := "testdata/temp.xml"
 	os.Remove(path)

internal/config/testdata/issue-1262.xml

@@ -0,0 +1,4 @@
+<configuration version="7">
+    <folder id="test" path="e:" ro="true" ignorePerms="false" rescanIntervalS="600">
+    </folder>
+</configuration>

internal/db/truncated.go

@@ -34,6 +34,17 @@ type FileInfoTruncated struct {
 	NumBlocks    int32
 }
 
+func ToTruncated(file protocol.FileInfo) FileInfoTruncated {
+	return FileInfoTruncated{
+		Name:         file.Name,
+		Flags:        file.Flags,
+		Modified:     file.Modified,
+		Version:      file.Version,
+		LocalVersion: file.LocalVersion,
+		NumBlocks:    int32(len(file.Blocks)),
+	}
+}
+
 func (f FileInfoTruncated) String() string {
 	return fmt.Sprintf("File{Name:%q, Flags:0%o, Modified:%d, Version:%d, Size:%d, NumBlocks:%d}",
 		f.Name, f.Flags, f.Modified, f.Version, f.Size(), f.NumBlocks)

internal/events/events.go

@@ -35,6 +35,7 @@ const (
 	LocalIndexUpdated
 	RemoteIndexUpdated
 	ItemStarted
+	ItemFinished
 	StateChanged
 	FolderRejected
 	ConfigSaved
@@ -65,6 +66,8 @@ func (t EventType) String() string {
 		return "RemoteIndexUpdated"
 	case ItemStarted:
 		return "ItemStarted"
+	case ItemFinished:
+		return "ItemFinished"
 	case StateChanged:
 		return "StateChanged"
 	case FolderRejected:

internal/model/model.go

@@ -755,7 +755,9 @@ func (m *Model) Request(deviceID protocol.DeviceID, folder, name string, offset
 		}
 		reader = strings.NewReader(target)
 	} else {
-		reader, err = os.Open(fn) // XXX: Inefficient, should cache fd?
+		// Cannot easily cache fd's because we might need to delete the file
+		// at any moment.
+		reader, err = os.Open(fn)
 		if err != nil {
 			return nil, err
 		}

internal/model/puller.go

@@ -25,8 +25,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/AudriusButkevicius/lfu-go"
-
 	"github.com/syncthing/protocol"
 	"github.com/syncthing/syncthing/internal/config"
 	"github.com/syncthing/syncthing/internal/db"
@@ -317,11 +315,6 @@ func (p *Puller) pullerIteration(ignores *ignore.Matcher) int {
 			return true
 		}
 
-		events.Default.Log(events.ItemStarted, map[string]string{
-			"folder": p.folder,
-			"item":   file.Name,
-		})
-
 		if debug {
 			l.Debugln(p, "handling", file.Name)
 		}
@@ -336,8 +329,9 @@ func (p *Puller) pullerIteration(ignores *ignore.Matcher) int {
 				df, ok := p.model.CurrentFolderFile(p.folder, file.Name)
 				// Local file can be already deleted, but with a lower version
 				// number, hence the deletion coming in again as part of
-				// WithNeed
-				if ok && !df.IsDeleted() {
+				// WithNeed, furthermore, the file can simply be of the wrong
+				// type if we haven't yet managed to pull it.
+				if ok && !df.IsDeleted() && !df.IsSymlink() && !df.IsDirectory() {
 					// Put files into buckets per first hash
 					key := string(df.Blocks[0].Hash)
 					buckets[key] = append(buckets[key], df)
@@ -345,6 +339,9 @@ func (p *Puller) pullerIteration(ignores *ignore.Matcher) int {
 			}
 		case file.IsDirectory() && !file.IsSymlink():
 			// A new or changed directory
+			if debug {
+				l.Debugln("Creating directory", file.Name)
+			}
 			p.handleDir(file)
 		default:
 			// A new or changed file or symlink. This is the only case where we
@@ -372,19 +369,25 @@ nextFile:
 
 		// Local file can be already deleted, but with a lower version
 		// number, hence the deletion coming in again as part of
-		// WithNeed
-		if !f.IsSymlink() && !f.IsDeleted() {
+		// WithNeed, furthermore, the file can simply be of the wrong type if
+		// the global index changed while we were processing this iteration.
+		if !f.IsDeleted() && !f.IsSymlink() && !f.IsDirectory() {
 			key := string(f.Blocks[0].Hash)
 			for i, candidate := range buckets[key] {
 				if scanner.BlocksEqual(candidate.Blocks, f.Blocks) {
 					// Remove the candidate from the bucket
-					l := len(buckets[key]) - 1
-					buckets[key][i] = buckets[key][l]
-					buckets[key] = buckets[key][:l]
+					lidx := len(buckets[key]) - 1
+					buckets[key][i] = buckets[key][lidx]
+					buckets[key] = buckets[key][:lidx]
+
+					// candidate is our current state of the file, where as the
+					// desired state with the delete bit set is in the deletion
+					// map.
+					desired := fileDeletions[candidate.Name]
 					// Remove the pending deletion (as we perform it by renaming)
 					delete(fileDeletions, candidate.Name)
 
-					p.renameFile(candidate, f)
+					p.renameFile(desired, f)
 
 					p.queue.Done(fileName)
 					continue nextFile
@@ -410,11 +413,18 @@ nextFile:
 	doneWg.Wait()
 
 	for _, file := range fileDeletions {
+		if debug {
+			l.Debugln("Deleting file", file.Name)
+		}
 		p.deleteFile(file)
 	}
 
 	for i := range dirDeletions {
-		p.deleteDir(dirDeletions[len(dirDeletions)-i-1])
+		dir := dirDeletions[len(dirDeletions)-i-1]
+		if debug {
+			l.Debugln("Deleting dir", dir.Name)
+		}
+		p.deleteDir(dir)
 	}
 
 	return changed
@@ -422,6 +432,20 @@ nextFile:
 
 // handleDir creates or updates the given directory
 func (p *Puller) handleDir(file protocol.FileInfo) {
+	var err error
+	events.Default.Log(events.ItemStarted, map[string]interface{}{
+		"folder":  p.folder,
+		"item":    file.Name,
+		"details": db.ToTruncated(file),
+	})
+	defer func() {
+		events.Default.Log(events.ItemFinished, map[string]interface{}{
+			"folder": p.folder,
+			"item":   file.Name,
+			"error":  err,
+		})
+	}()
+
 	realName := filepath.Join(p.dir, file.Name)
 	mode := os.FileMode(file.Flags & 0777)
 	if p.ignorePerms {
@@ -483,6 +507,20 @@ func (p *Puller) handleDir(file protocol.FileInfo) {
 
 // deleteDir attempts to delete the given directory
 func (p *Puller) deleteDir(file protocol.FileInfo) {
+	var err error
+	events.Default.Log(events.ItemStarted, map[string]interface{}{
+		"folder":  p.folder,
+		"item":    file.Name,
+		"details": db.ToTruncated(file),
+	})
+	defer func() {
+		events.Default.Log(events.ItemFinished, map[string]interface{}{
+			"folder": p.folder,
+			"item":   file.Name,
+			"error":  err,
+		})
+	}()
+
 	realName := filepath.Join(p.dir, file.Name)
 	// Delete any temporary files lying around in the directory
 	dir, _ := os.Open(realName)
@@ -494,7 +532,7 @@ func (p *Puller) deleteDir(file protocol.FileInfo) {
 			}
 		}
 	}
-	err := osutil.InWritableDir(os.Remove, realName)
+	err = osutil.InWritableDir(os.Remove, realName)
 	if err == nil || os.IsNotExist(err) {
 		p.model.updateLocal(p.folder, file)
 	} else {
@@ -504,9 +542,22 @@ func (p *Puller) deleteDir(file protocol.FileInfo) {
 
 // deleteFile attempts to delete the given file
 func (p *Puller) deleteFile(file protocol.FileInfo) {
+	var err error
+	events.Default.Log(events.ItemStarted, map[string]interface{}{
+		"folder":  p.folder,
+		"item":    file.Name,
+		"details": db.ToTruncated(file),
+	})
+	defer func() {
+		events.Default.Log(events.ItemFinished, map[string]interface{}{
+			"folder": p.folder,
+			"item":   file.Name,
+			"error":  err,
+		})
+	}()
+
 	realName := filepath.Join(p.dir, file.Name)
 
-	var err error
 	if p.versioner != nil {
 		err = osutil.InWritableDir(p.versioner.Archive, realName)
 	} else {
@@ -523,6 +574,30 @@ func (p *Puller) deleteFile(file protocol.FileInfo) {
 // renameFile attempts to rename an existing file to a destination
 // and set the right attributes on it.
 func (p *Puller) renameFile(source, target protocol.FileInfo) {
+	var err error
+	events.Default.Log(events.ItemStarted, map[string]interface{}{
+		"folder":  p.folder,
+		"item":    source.Name,
+		"details": db.ToTruncated(source),
+	})
+	events.Default.Log(events.ItemStarted, map[string]interface{}{
+		"folder":  p.folder,
+		"item":    target.Name,
+		"details": db.ToTruncated(source),
+	})
+	defer func() {
+		events.Default.Log(events.ItemFinished, map[string]interface{}{
+			"folder": p.folder,
+			"item":   source.Name,
+			"error":  err,
+		})
+		events.Default.Log(events.ItemFinished, map[string]interface{}{
+			"folder": p.folder,
+			"item":   target.Name,
+			"error":  err,
+		})
+	}()
+
 	if debug {
 		l.Debugln(p, "taking rename shortcut", source.Name, "->", target.Name)
 	}
@@ -530,7 +605,6 @@ func (p *Puller) renameFile(source, target protocol.FileInfo) {
 	from := filepath.Join(p.dir, source.Name)
 	to := filepath.Join(p.dir, target.Name)
 
-	var err error
 	if p.versioner != nil {
 		err = osutil.Copy(from, to)
 		if err == nil {
@@ -546,7 +620,11 @@ func (p *Puller) renameFile(source, target protocol.FileInfo) {
 	}
 
 	// Fix-up the metadata, and update the local index of the target file
-	p.shortcutFile(target)
+	err = p.shortcutFile(target)
+	if err != nil {
+		l.Infof("Puller (folder %q, file %q): rename from %q metadata: %v", p.folder, target.Name, source.Name, err)
+		return
+	}
 
 	// Source file already has the delete bit set.
 	// Because we got rid of the file (by renaming it), we just need to update
@@ -557,6 +635,12 @@ func (p *Puller) renameFile(source, target protocol.FileInfo) {
 // handleFile queues the copies and pulls as necessary for a single new or
 // changed file.
 func (p *Puller) handleFile(file protocol.FileInfo, copyChan chan<- copyBlocksState, finisherChan chan<- *sharedPullerState) {
+	events.Default.Log(events.ItemStarted, map[string]interface{}{
+		"folder":  p.folder,
+		"item":    file.Name,
+		"details": db.ToTruncated(file),
+	})
+
 	curFile, ok := p.model.CurrentFolderFile(p.folder, file.Name)
 
 	if ok && len(curFile.Blocks) == len(file.Blocks) && scanner.BlocksEqual(curFile.Blocks, file.Blocks) {
@@ -567,11 +651,17 @@ func (p *Puller) handleFile(file protocol.FileInfo, copyChan chan<- copyBlocksSt
 			l.Debugln(p, "taking shortcut on", file.Name)
 		}
 		p.queue.Done(file.Name)
+		var err error
 		if file.IsSymlink() {
-			p.shortcutSymlink(file)
+			err = p.shortcutSymlink(file)
 		} else {
-			p.shortcutFile(file)
+			err = p.shortcutFile(file)
 		}
+		events.Default.Log(events.ItemFinished, map[string]interface{}{
+			"folder": p.folder,
+			"item":   file.Name,
+			"error":  err,
+		})
 		return
 	}
 
@@ -641,10 +731,10 @@ func (p *Puller) handleFile(file protocol.FileInfo, copyChan chan<- copyBlocksSt
 
 // shortcutFile sets file mode and modification time, when that's the only
 // thing that has changed.
-func (p *Puller) shortcutFile(file protocol.FileInfo) {
+func (p *Puller) shortcutFile(file protocol.FileInfo) (err error) {
 	realName := filepath.Join(p.dir, file.Name)
 	if !p.ignorePerms {
-		err := os.Chmod(realName, os.FileMode(file.Flags&0777))
+		err = os.Chmod(realName, os.FileMode(file.Flags&0777))
 		if err != nil {
 			l.Infof("Puller (folder %q, file %q): shortcut: %v", p.folder, file.Name, err)
 			return
@@ -652,9 +742,10 @@ func (p *Puller) shortcutFile(file protocol.FileInfo) {
 	}
 
 	t := time.Unix(file.Modified, 0)
-	err := os.Chtimes(realName, t, t)
+	err = os.Chtimes(realName, t, t)
 	if err != nil {
 		if p.lenientMtimes {
+			err = nil
 			// We accept the failure with a warning here and allow the sync to
 			// continue. We'll sync the new mtime back to the other devices later.
 			// If they have the same problem & setting, we might never get in
@@ -667,17 +758,18 @@ func (p *Puller) shortcutFile(file protocol.FileInfo) {
 	}
 
 	p.model.updateLocal(p.folder, file)
+	return
 }
 
 // shortcutSymlink changes the symlinks type if necessery.
-func (p *Puller) shortcutSymlink(file protocol.FileInfo) {
-	err := symlinks.ChangeType(filepath.Join(p.dir, file.Name), file.Flags)
-	if err != nil {
+func (p *Puller) shortcutSymlink(file protocol.FileInfo) (err error) {
+	err = symlinks.ChangeType(filepath.Join(p.dir, file.Name), file.Flags)
+	if err == nil {
+		p.model.updateLocal(p.folder, file)
+	} else {
 		l.Infof("Puller (folder %q, file %q): symlink shortcut: %v", p.folder, file.Name, err)
-		return
 	}
-
-	p.model.updateLocal(p.folder, file)
+	return
 }
 
 // copierRoutine reads copierStates until the in channel closes and performs
@@ -698,19 +790,6 @@ func (p *Puller) copierRoutine(in <-chan copyBlocksState, pullChan chan<- pullBl
 			continue
 		}
 
-		evictionChan := make(chan lfu.Eviction)
-
-		fdCache := lfu.New()
-		fdCache.UpperBound = 50
-		fdCache.LowerBound = 20
-		fdCache.EvictionChannel = evictionChan
-
-		go func() {
-			for item := range evictionChan {
-				item.Value.(*os.File).Close()
-			}
-		}()
-
 		folderRoots := make(map[string]string)
 		p.model.fmut.RLock()
 		for folder, cfg := range p.model.folderCfgs {
@@ -721,22 +800,13 @@ func (p *Puller) copierRoutine(in <-chan copyBlocksState, pullChan chan<- pullBl
 		for _, block := range state.blocks {
 			buf = buf[:int(block.Size)]
 			found := p.model.finder.Iterate(block.Hash, func(folder, file string, index int32) bool {
-				path := filepath.Join(folderRoots[folder], file)
-
-				var fd *os.File
-
-				fdi := fdCache.Get(path)
-				if fdi != nil {
-					fd = fdi.(*os.File)
-				} else {
-					fd, err = os.Open(path)
-					if err != nil {
-						return false
-					}
-					fdCache.Set(path, fd)
+				fd, err := os.Open(filepath.Join(folderRoots[folder], file))
+				if err != nil {
+					return false
 				}
 
 				_, err = fd.ReadAt(buf, protocol.BlockSize*int64(index))
+				fd.Close()
 				if err != nil {
 					return false
 				}
@@ -782,8 +852,6 @@ func (p *Puller) copierRoutine(in <-chan copyBlocksState, pullChan chan<- pullBl
 				state.copyDone()
 			}
 		}
-		fdCache.Evict(fdCache.Len())
-		close(evictionChan)
 		out <- state.sharedPullerState
 	}
 }
@@ -851,6 +919,13 @@ func (p *Puller) pullerRoutine(in <-chan pullBlockState, out chan<- *sharedPulle
 
 func (p *Puller) performFinish(state *sharedPullerState) {
 	var err error
+	defer func() {
+		events.Default.Log(events.ItemFinished, map[string]interface{}{
+			"folder": p.folder,
+			"item":   state.file.Name,
+			"error":  err,
+		})
+	}()
 	// Set the correct permission bits on the new file
 	if !p.ignorePerms {
 		err = os.Chmod(state.tempName, os.FileMode(state.file.Flags&0777))
@@ -937,6 +1012,12 @@ func (p *Puller) finisherRoutine(in <-chan *sharedPullerState) {
 			p.queue.Done(state.file.Name)
 			if state.failed() == nil {
 				p.performFinish(state)
+			} else {
+				events.Default.Log(events.ItemFinished, map[string]interface{}{
+					"folder": p.folder,
+					"item":   state.file.Name,
+					"error":  state.failed(),
+				})
 			}
 			p.model.receivedFile(p.folder, state.file.Name)
 			if p.progressEmitter != nil {

test/logs/.gitignore

@@ -0,0 +1 @@
+*.out

test/syncthingprocess.go

@@ -50,7 +50,7 @@ type syncthingProcess struct {
 
 func (p *syncthingProcess) start() error {
 	if p.logfd == nil {
-		logfd, err := os.Create(p.instance + ".out")
+		logfd, err := os.Create("logs/" + getTestName() + "-" + p.instance + ".out")
 		if err != nil {
 			return err
 		}
@@ -94,7 +94,7 @@ func (p *syncthingProcess) stop() error {
 	p.cmd.Process.Signal(os.Kill)
 	p.cmd.Wait()
 
-	fd, err := os.Open(p.instance + ".out")
+	fd, err := os.Open(p.logfd.Name())
 	if err != nil {
 		return err
 	}

test/util.go

@@ -27,6 +27,7 @@ import (
 	"math/rand"
 	"os"
 	"path/filepath"
+	"runtime"
 	"sort"
 	"strings"
 	"time"
@@ -441,3 +442,21 @@ func isTimeout(err error) bool {
 	return strings.Contains(err.Error(), "use of closed network connection") ||
 		strings.Contains(err.Error(), "request cancelled while waiting")
 }
+
+func getTestName() string {
+	callers := make([]uintptr, 100)
+	runtime.Callers(1, callers)
+	for i, caller := range callers {
+		f := runtime.FuncForPC(caller)
+		if f != nil {
+			if f.Name() == "testing.tRunner" {
+				testf := runtime.FuncForPC(callers[i-1])
+				if testf != nil {
+					path := strings.Split(testf.Name(), ".")
+					return path[len(path)-1]
+				}
+			}
+		}
+	}
+	return time.Now().String()
+}