Translation update

Add ItemFinished event (fixes #1258)

.gitignore

@@ -1,4 +1,4 @@
-syncthing
+./syncthing
 syncthing.exe
 *.tar.gz
 *.zip

AUTHORS

@@ -24,14 +24,17 @@ 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>
 Michael Tilli <pyfisch@gmail.com>
 Peter Hoeg <peter@speartail.com>
 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>

CONTRIBUTING.md

@@ -33,8 +33,8 @@ latest info on Transifex.
 
 Every contribution is welcome. If you want to contribute but are unsure
 where to start, any open issues are fair game! Be prepared for a
-[certain amount of review](https://discourse.syncthing.net/t/733); it's
-all in the name of quality. :) Following the points below will make this
+[certain amount of review](https://github.com/syncthing/syncthing/wiki/FAQ#why-are-you-being-so-hard-on-my-pull-request);
+it's all in the name of quality. :) Following the points below will make this
 a smoother process.
 
 Individuals making significant and valuable contributions are given
@@ -105,8 +105,8 @@ add yourself as a separate commit in your first pull request.
 
 ## Building
 
-[See the documentation](http://discourse.syncthing.net/t/44) on how to
-get started with a build environment.
+[See the documentation](https://github.com/syncthing/syncthing/wiki/Building)
+on how to get started with a build environment.
 
 ## Branches
 
@@ -133,7 +133,7 @@ Yes please!
 
 ## Documentation
 
-[Over here!](http://discourse.syncthing.net/category/documentation)
+[Over here!](https://github.com/syncthing/syncthing/wiki)
 
 ## License
 

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"
@@ -17,18 +13,26 @@
 			"ImportPath": "github.com/calmh/logger",
 			"Rev": "f50d32b313bec2933a3e1049f7416a29f3413d29"
 		},
+		{
+			"ImportPath": "github.com/calmh/luhn",
+			"Rev": "0c8388ff95fa92d4094011e5a04fc99dea3d1632"
+		},
 		{
 			"ImportPath": "github.com/calmh/osext",
 			"Rev": "9bf61584e5f1f172e8766ddc9022d9c401faaa5e"
 		},
 		{
 			"ImportPath": "github.com/calmh/xdr",
-			"Rev": "214788d8fedfc310c18eca9ed12be408a5054cd5"
+			"Rev": "ff948d7666c5e0fd18d398f6278881724d36a90b"
 		},
 		{
 			"ImportPath": "github.com/juju/ratelimit",
 			"Rev": "f9f36d11773655c0485207f0ad30dc2655f69d56"
 		},
+		{
+			"ImportPath": "github.com/syncthing/protocol",
+			"Rev": "442e93d3fc7728d7560c8d039a4199a77879b9f6"
+		},
 		{
 			"ImportPath": "github.com/syndtr/goleveldb/leveldb",
 			"Rev": "63c9e642efad852f49e20a6f90194cae112fd2ac"
@@ -51,19 +55,19 @@
 		},
 		{
 			"ImportPath": "golang.org/x/crypto/bcrypt",
-			"Rev": "731db29863ea7213d9556d0170afb38987f401d4"
+			"Rev": "4ed45ec682102c643324fae5dff8dab085b6c300"
 		},
 		{
 			"ImportPath": "golang.org/x/crypto/blowfish",
-			"Rev": "731db29863ea7213d9556d0170afb38987f401d4"
+			"Rev": "4ed45ec682102c643324fae5dff8dab085b6c300"
 		},
 		{
 			"ImportPath": "golang.org/x/text/transform",
-			"Rev": "985ee5acfaf1ff6712c7c99438752f8e09416ccb"
+			"Rev": "c980adc4a823548817b9c47d38c6ca6b7d7d8b6a"
 		},
 		{
 			"ImportPath": "golang.org/x/text/unicode/norm",
-			"Rev": "985ee5acfaf1ff6712c7c99438752f8e09416ccb"
+			"Rev": "c980adc4a823548817b9c47d38c6ca6b7d7d8b6a"
 		}
 	]
 }

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/luhn/LICENSE

@@ -0,0 +1,19 @@
+Copyright (C) 2014 Jakob Borg
+
+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/calmh/luhn/luhn.go

@@ -1,17 +1,4 @@
-// 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/>.
+// Copyright (C) 2014 Jakob Borg
 
 // Package luhn generates and validates Luhn mod N check digits.
 package luhn

Godeps/_workspace/src/github.com/calmh/luhn/luhn_test.go

@@ -1,24 +1,11 @@
-// 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/>.
+// Copyright (C) 2014 Jakob Borg
 
 package luhn_test
 
 import (
 	"testing"
 
-	"github.com/syncthing/syncthing/internal/luhn"
+	"github.com/calmh/luhn"
 )
 
 func TestGenerate(t *testing.T) {

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":

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

@@ -0,0 +1,4 @@
+# This is the official list of Protocol Authors for copyright purposes.
+
+Audrius Butkevicius <audrius.butkevicius@gmail.com>
+Jakob Borg <jakob@nym.se>

Godeps/_workspace/src/github.com/syncthing/protocol/CONTRIBUTING.md

@@ -0,0 +1,76 @@
+## Reporting Bugs
+
+Please file bugs in the [Github Issue
+Tracker](https://github.com/syncthing/protocol/issues).
+
+## Contributing Code
+
+Every contribution is welcome. Following the points below will make this
+a smoother process.
+
+Individuals making significant and valuable contributions are given
+commit-access to the project. If you make a significant contribution and
+are not considered for commit-access, please contact any of the
+Syncthing core team members.
+
+All nontrivial contributions should go through the pull request
+mechanism for internal review. Determining what is "nontrivial" is left
+at the discretion of the contributor.
+
+### Authorship
+
+All code authors are listed in the AUTHORS file. Commits must be made
+with the same name and email as listed in the AUTHORS file. To
+accomplish this, ensure that your git configuration is set correctly
+prior to making your first commit;
+
+    $ git config --global user.name "Jane Doe"
+    $ git config --global user.email janedoe@example.com
+
+You must be reachable on the given email address. If you do not wish to
+use your real name for whatever reason, using a nickname or pseudonym is
+perfectly acceptable.
+
+## Coding Style
+
+- Follow the conventions laid out in [Effective Go](https://golang.org/doc/effective_go.html)
+  as much as makes sense.
+
+- All text files use Unix line endings.
+
+- Each commit should be `go fmt` clean.
+
+- The commit message subject should be a single short sentence
+  describing the change, starting with a capital letter.
+
+- Commits that resolve an existing issue must include the issue number
+  as `(fixes #123)` at the end of the commit message subject.
+
+- Imports are grouped per `goimports` standard; that is, standard
+  library first, then third party libraries after a blank line.
+
+- A contribution solving a single issue or introducing a single new
+  feature should probably be a single commit based on the current
+  `master` branch. You may be asked to "rebase" or "squash" your pull
+  request to make sure this is the case, especially if there have been
+  amendments during review.
+
+## Licensing
+
+All contributions are made under the same MIT license as the rest of the
+project, except documentation, user interface text and translation
+strings which are licensed under the Creative Commons Attribution 4.0
+International License. You retain the copyright to code you have
+written.
+
+When accepting your first contribution, the maintainer of the project
+will ensure that you are added to the AUTHORS file. You are welcome to
+add yourself as a separate commit in your first pull request.
+
+## Tests
+
+Yes please!
+
+## License
+
+MIT

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

@@ -0,0 +1,19 @@
+Copyright (C) 2014-2015 The Protocol Authors
+
+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/syncthing/protocol/README.md

@@ -0,0 +1,13 @@
+The BEPv1 Protocol
+==================
+
+[![Latest Build](http://img.shields.io/jenkins/s/http/build.syncthing.net/protocol.svg?style=flat-square)](http://build.syncthing.net/job/protocol/lastBuild/)
+[![API Documentation](http://img.shields.io/badge/api-Godoc-blue.svg?style=flat-square)](http://godoc.org/github.com/syncthing/protocol)
+[![MIT License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](http://opensource.org/licenses/MIT)
+
+This is the protocol implementation used by Syncthing.
+
+License
+=======
+
+MIT

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

@@ -1,17 +1,4 @@
-// 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/>.
+// Copyright (C) 2014 The Protocol Authors.
 
 package protocol
 

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

@@ -0,0 +1,62 @@
+// Copyright (C) 2014 The Protocol Authors.
+
+package protocol
+
+import (
+	"io"
+	"sync/atomic"
+	"time"
+)
+
+type countingReader struct {
+	io.Reader
+	tot  int64 // bytes
+	last int64 // unix nanos
+}
+
+var (
+	totalIncoming int64
+	totalOutgoing int64
+)
+
+func (c *countingReader) Read(bs []byte) (int, error) {
+	n, err := c.Reader.Read(bs)
+	atomic.AddInt64(&c.tot, int64(n))
+	atomic.AddInt64(&totalIncoming, int64(n))
+	atomic.StoreInt64(&c.last, time.Now().UnixNano())
+	return n, err
+}
+
+func (c *countingReader) Tot() int64 {
+	return atomic.LoadInt64(&c.tot)
+}
+
+func (c *countingReader) Last() time.Time {
+	return time.Unix(0, atomic.LoadInt64(&c.last))
+}
+
+type countingWriter struct {
+	io.Writer
+	tot  int64 // bytes
+	last int64 // unix nanos
+}
+
+func (c *countingWriter) Write(bs []byte) (int, error) {
+	n, err := c.Writer.Write(bs)
+	atomic.AddInt64(&c.tot, int64(n))
+	atomic.AddInt64(&totalOutgoing, int64(n))
+	atomic.StoreInt64(&c.last, time.Now().UnixNano())
+	return n, err
+}
+
+func (c *countingWriter) Tot() int64 {
+	return atomic.LoadInt64(&c.tot)
+}
+
+func (c *countingWriter) Last() time.Time {
+	return time.Unix(0, atomic.LoadInt64(&c.last))
+}
+
+func TotalInOut() (int64, int64) {
+	return atomic.LoadInt64(&totalIncoming), atomic.LoadInt64(&totalOutgoing)
+}

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

@@ -0,0 +1,15 @@
+// Copyright (C) 2014 The Protocol Authors.
+
+package protocol
+
+import (
+	"os"
+	"strings"
+
+	"github.com/calmh/logger"
+)
+
+var (
+	debug = strings.Contains(os.Getenv("STTRACE"), "protocol") || os.Getenv("STTRACE") == "all"
+	l     = logger.DefaultLogger
+)

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

@@ -1,17 +1,4 @@
-// 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/>.
+// Copyright (C) 2014 The Protocol Authors.
 
 package protocol
 
@@ -24,7 +11,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/syncthing/syncthing/internal/luhn"
+	"github.com/calmh/luhn"
 )
 
 type DeviceID [32]byte

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

@@ -1,17 +1,4 @@
-// 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/>.
+// Copyright (C) 2014 The Protocol Authors.
 
 package protocol
 

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

@@ -0,0 +1,4 @@
+// Copyright (C) 2014 The Protocol Authors.
+
+// Package protocol implements the Block Exchange Protocol.
+package protocol

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

@@ -1,17 +1,4 @@
-// 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/>.
+// Copyright (C) 2014 The Protocol Authors.
 
 package protocol
 

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

@@ -1,19 +1,5 @@
-// 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/>.
+// Copyright (C) 2014 The Protocol Authors.
 
-//go:generate -command genxdr go run ../../Godeps/_workspace/src/github.com/calmh/xdr/cmd/genxdr/main.go
 //go:generate genxdr -o message_xdr.go message.go
 
 package protocol
@@ -31,8 +17,8 @@ type FileInfo struct {
 	Name         string // max:8192
 	Flags        uint32
 	Modified     int64
-	Version      uint64
-	LocalVersion uint64
+	Version      int64
+	LocalVersion int64
 	Blocks       []BlockInfo
 }
 
@@ -73,7 +59,7 @@ func (f FileInfo) HasPermissionBits() bool {
 
 type BlockInfo struct {
 	Offset int64 // noencode (cache only)
-	Size   uint32
+	Size   int32
 	Hash   []byte // max:64
 }
 
@@ -84,8 +70,8 @@ func (b BlockInfo) String() string {
 type RequestMessage struct {
 	Folder  string // max:64
 	Name    string // max:8192
-	Offset  uint64
-	Size    uint32
+	Offset  int64
+	Size    int32
 	Hash    []byte // max:64
 	Flags   uint32
 	Options []Option // max:64
@@ -93,7 +79,7 @@ type RequestMessage struct {
 
 type ResponseMessage struct {
 	Data  []byte
-	Error uint32
+	Error int32
 }
 
 type ClusterConfigMessage struct {
@@ -120,7 +106,7 @@ type Folder struct {
 type Device struct {
 	ID              []byte // max:32
 	Flags           uint32
-	MaxLocalVersion uint64
+	MaxLocalVersion int64
 }
 
 type Option struct {
@@ -130,7 +116,7 @@ type Option struct {
 
 type CloseMessage struct {
 	Reason string // max:1024
-	Code   uint32
+	Code   int32
 }
 
 type EmptyMessage struct{}

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

@@ -168,8 +168,8 @@ struct FileInfo {
 	string Name<8192>;
 	unsigned int Flags;
 	hyper Modified;
-	unsigned hyper Version;
-	unsigned hyper LocalVersion;
+	hyper Version;
+	hyper LocalVersion;
 	BlockInfo Blocks<>;
 }
 
@@ -206,8 +206,8 @@ func (o FileInfo) encodeXDR(xw *xdr.Writer) (int, error) {
 	xw.WriteString(o.Name)
 	xw.WriteUint32(o.Flags)
 	xw.WriteUint64(uint64(o.Modified))
-	xw.WriteUint64(o.Version)
-	xw.WriteUint64(o.LocalVersion)
+	xw.WriteUint64(uint64(o.Version))
+	xw.WriteUint64(uint64(o.LocalVersion))
 	xw.WriteUint32(uint32(len(o.Blocks)))
 	for i := range o.Blocks {
 		_, err := o.Blocks[i].encodeXDR(xw)
@@ -233,8 +233,8 @@ func (o *FileInfo) decodeXDR(xr *xdr.Reader) error {
 	o.Name = xr.ReadStringMax(8192)
 	o.Flags = xr.ReadUint32()
 	o.Modified = int64(xr.ReadUint64())
-	o.Version = xr.ReadUint64()
-	o.LocalVersion = xr.ReadUint64()
+	o.Version = int64(xr.ReadUint64())
+	o.LocalVersion = int64(xr.ReadUint64())
 	_BlocksSize := int(xr.ReadUint32())
 	o.Blocks = make([]BlockInfo, _BlocksSize)
 	for i := range o.Blocks {
@@ -261,7 +261,7 @@ BlockInfo Structure:
 
 
 struct BlockInfo {
-	unsigned int Size;
+	int Size;
 	opaque Hash<64>;
 }
 
@@ -292,7 +292,7 @@ func (o BlockInfo) AppendXDR(bs []byte) ([]byte, error) {
 }
 
 func (o BlockInfo) encodeXDR(xw *xdr.Writer) (int, error) {
-	xw.WriteUint32(o.Size)
+	xw.WriteUint32(uint32(o.Size))
 	if l := len(o.Hash); l > 64 {
 		return xw.Tot(), xdr.ElementSizeExceeded("Hash", l, 64)
 	}
@@ -312,7 +312,7 @@ func (o *BlockInfo) UnmarshalXDR(bs []byte) error {
 }
 
 func (o *BlockInfo) decodeXDR(xr *xdr.Reader) error {
-	o.Size = xr.ReadUint32()
+	o.Size = int32(xr.ReadUint32())
 	o.Hash = xr.ReadBytesMax(64)
 	return xr.Error()
 }
@@ -361,8 +361,8 @@ RequestMessage Structure:
 struct RequestMessage {
 	string Folder<64>;
 	string Name<8192>;
-	unsigned hyper Offset;
-	unsigned int Size;
+	hyper Offset;
+	int Size;
 	opaque Hash<64>;
 	unsigned int Flags;
 	Option Options<64>;
@@ -403,8 +403,8 @@ func (o RequestMessage) encodeXDR(xw *xdr.Writer) (int, error) {
 		return xw.Tot(), xdr.ElementSizeExceeded("Name", l, 8192)
 	}
 	xw.WriteString(o.Name)
-	xw.WriteUint64(o.Offset)
-	xw.WriteUint32(o.Size)
+	xw.WriteUint64(uint64(o.Offset))
+	xw.WriteUint32(uint32(o.Size))
 	if l := len(o.Hash); l > 64 {
 		return xw.Tot(), xdr.ElementSizeExceeded("Hash", l, 64)
 	}
@@ -437,8 +437,8 @@ func (o *RequestMessage) UnmarshalXDR(bs []byte) error {
 func (o *RequestMessage) decodeXDR(xr *xdr.Reader) error {
 	o.Folder = xr.ReadStringMax(64)
 	o.Name = xr.ReadStringMax(8192)
-	o.Offset = xr.ReadUint64()
-	o.Size = xr.ReadUint32()
+	o.Offset = int64(xr.ReadUint64())
+	o.Size = int32(xr.ReadUint32())
 	o.Hash = xr.ReadBytesMax(64)
 	o.Flags = xr.ReadUint32()
 	_OptionsSize := int(xr.ReadUint32())
@@ -471,7 +471,7 @@ ResponseMessage Structure:
 
 struct ResponseMessage {
 	opaque Data<>;
-	unsigned int Error;
+	int Error;
 }
 
 */
@@ -502,7 +502,7 @@ func (o ResponseMessage) AppendXDR(bs []byte) ([]byte, error) {
 
 func (o ResponseMessage) encodeXDR(xw *xdr.Writer) (int, error) {
 	xw.WriteBytes(o.Data)
-	xw.WriteUint32(o.Error)
+	xw.WriteUint32(uint32(o.Error))
 	return xw.Tot(), xw.Error()
 }
 
@@ -519,7 +519,7 @@ func (o *ResponseMessage) UnmarshalXDR(bs []byte) error {
 
 func (o *ResponseMessage) decodeXDR(xr *xdr.Reader) error {
 	o.Data = xr.ReadBytes()
-	o.Error = xr.ReadUint32()
+	o.Error = int32(xr.ReadUint32())
 	return xr.Error()
 }
 
@@ -766,7 +766,7 @@ Device Structure:
 struct Device {
 	opaque ID<32>;
 	unsigned int Flags;
-	unsigned hyper MaxLocalVersion;
+	hyper MaxLocalVersion;
 }
 
 */
@@ -801,7 +801,7 @@ func (o Device) encodeXDR(xw *xdr.Writer) (int, error) {
 	}
 	xw.WriteBytes(o.ID)
 	xw.WriteUint32(o.Flags)
-	xw.WriteUint64(o.MaxLocalVersion)
+	xw.WriteUint64(uint64(o.MaxLocalVersion))
 	return xw.Tot(), xw.Error()
 }
 
@@ -819,7 +819,7 @@ func (o *Device) UnmarshalXDR(bs []byte) error {
 func (o *Device) decodeXDR(xr *xdr.Reader) error {
 	o.ID = xr.ReadBytesMax(32)
 	o.Flags = xr.ReadUint32()
-	o.MaxLocalVersion = xr.ReadUint64()
+	o.MaxLocalVersion = int64(xr.ReadUint64())
 	return xr.Error()
 }
 
@@ -923,7 +923,7 @@ CloseMessage Structure:
 
 struct CloseMessage {
 	string Reason<1024>;
-	unsigned int Code;
+	int Code;
 }
 
 */
@@ -957,7 +957,7 @@ func (o CloseMessage) encodeXDR(xw *xdr.Writer) (int, error) {
 		return xw.Tot(), xdr.ElementSizeExceeded("Reason", l, 1024)
 	}
 	xw.WriteString(o.Reason)
-	xw.WriteUint32(o.Code)
+	xw.WriteUint32(uint32(o.Code))
 	return xw.Tot(), xw.Error()
 }
 
@@ -974,7 +974,7 @@ func (o *CloseMessage) UnmarshalXDR(bs []byte) error {
 
 func (o *CloseMessage) decodeXDR(xr *xdr.Reader) error {
 	o.Reason = xr.ReadStringMax(1024)
-	o.Code = xr.ReadUint32()
+	o.Code = int32(xr.ReadUint32())
 	return xr.Error()
 }
 

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

@@ -1,17 +1,4 @@
-// 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/>.
+// Copyright (C) 2014 The Protocol Authors.
 
 // +build darwin
 

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

@@ -1,17 +1,4 @@
-// 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/>.
+// Copyright (C) 2014 The Protocol Authors.
 
 // +build !windows,!darwin
 

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

@@ -1,17 +1,4 @@
-// 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/>.
+// Copyright (C) 2014 The Protocol Authors.
 
 // +build windows
 

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

@@ -1,17 +1,4 @@
-// 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/>.
+// Copyright (C) 2014 The Protocol Authors.
 
 package protocol
 
@@ -235,8 +222,8 @@ func (c *rawConnection) Request(folder string, name string, offset int64, size i
 	ok := c.send(id, messageTypeRequest, RequestMessage{
 		Folder: folder,
 		Name:   name,
-		Offset: uint64(offset),
-		Size:   uint32(size),
+		Offset: offset,
+		Size:   int32(size),
 	})
 	if !ok {
 		return nil, ErrClosed
@@ -477,14 +464,40 @@ func (c *rawConnection) handleIndex(im IndexMessage) {
 	if debug {
 		l.Debugf("Index(%v, %v, %d files)", c.id, im.Folder, len(im.Files))
 	}
-	c.receiver.Index(c.id, im.Folder, im.Files)
+	c.receiver.Index(c.id, im.Folder, filterIndexMessageFiles(im.Files))
 }
 
 func (c *rawConnection) handleIndexUpdate(im IndexMessage) {
 	if debug {
 		l.Debugf("queueing IndexUpdate(%v, %v, %d files)", c.id, im.Folder, len(im.Files))
 	}
-	c.receiver.IndexUpdate(c.id, im.Folder, im.Files)
+	c.receiver.IndexUpdate(c.id, im.Folder, filterIndexMessageFiles(im.Files))
+}
+
+func filterIndexMessageFiles(fs []FileInfo) []FileInfo {
+	var out []FileInfo
+	for i, f := range fs {
+		switch f.Name {
+		case "", ".", "..", "/": // A few obviously invalid filenames
+			l.Infof("Dropping invalid filename %q from incoming index", f.Name)
+			if out == nil {
+				// Most incoming updates won't contain anything invalid, so we
+				// delay the allocation and copy to output slice until we
+				// really need to do it, then copy all the so var valid files
+				// to it.
+				out = make([]FileInfo, i, len(fs)-1)
+				copy(out, fs)
+			}
+		default:
+			if out != nil {
+				out = append(out, f)
+			}
+		}
+	}
+	if out != nil {
+		return out
+	}
+	return fs
 }
 
 func (c *rawConnection) handleRequest(msgID int, req RequestMessage) {
@@ -693,8 +706,8 @@ func (c *rawConnection) pingerLoop() {
 
 type Statistics struct {
 	At            time.Time
-	InBytesTotal  uint64
-	OutBytesTotal uint64
+	InBytesTotal  int64
+	OutBytesTotal int64
 }
 
 func (c *rawConnection) Statistics() Statistics {

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

@@ -1,17 +1,4 @@
-// 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/>.
+// Copyright (C) 2014 The Protocol Authors.
 
 package protocol
 

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

@@ -1,17 +1,4 @@
-// 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/>.
+// Copyright (C) 2014 The Protocol Authors.
 
 package protocol
 

NICKS

@@ -4,6 +4,7 @@ AudriusButkevicius	<audrius.butkevicius@gmail.com>
 Cathryne	<cathryne.linenweaver@gmail.com> <Cathryne@users.noreply.github.com>
 KayoticSully	<kayoticsully@gmail.com>
 Nutomic		<me@nutomic.com>
+Rewt0r		<rewt0r@gmx.com> <Rewt0r@users.noreply.github.com>
 Vilbrekin	<vilbrekin@gmail.com>
 Zillode		<zillode@zillode.be>
 alex2108	<register-github@alex-graf.de>
@@ -23,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>
@@ -30,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.go

@@ -301,7 +301,7 @@ func assets() {
 }
 
 func xdr() {
-	runPrint("go", "generate", "./internal/discover", "./internal/files", "./internal/protocol")
+	runPrint("go", "generate", "./internal/discover", "./internal/db")
 }
 
 func translate() {

build.sh

@@ -2,7 +2,8 @@
 set -euo pipefail
 IFS=$'\n\t'
 
-DOCKERIMGV=1.4-5
+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 \

changelog.sh

@@ -5,5 +5,5 @@ if [[ -z $since ]] ; then
 	since="$(git describe --abbrev=0 HEAD^).."
 fi
 
-git log --pretty=format:'* %s (%h, @%aN)' "$since" | egrep 'fixes #\d|ref #\d'
+git log --reverse --pretty=format:'* %s, @%aN)' "$since" | egrep 'fixes #\d|ref #\d' | sed 's/),/,/' | sed 's/fixes #/#/g' | sed 's/ref #/#/g'
 

check-contrib.sh

@@ -16,7 +16,8 @@ no-docs-typos() {
 	grep -v f1120d7aa936c0658429edef0037792520b46334 |\
 	grep -v a9339d0627fff439879d157c75077f02c9fac61b |\
 	grep -v 254c63763a3ad42fd82259f1767db526cff94a14 |\
-	grep -v 4b76ec40c07078beaa2c5e250ed7d9bd6276a718
+	grep -v 4b76ec40c07078beaa2c5e250ed7d9bd6276a718 |\
+	grep -v ffc39dfbcb34eacc3ea12327a02b6e7741a2c207
 }
 
 print-missing-authors() {

cmd/genassets/main.go

@@ -45,7 +45,7 @@ func Assets() map[string][]byte {
 	var gr *gzip.Reader
 {{range $asset := .assets}}
 	bs, _ = base64.StdEncoding.DecodeString("{{$asset.Data}}")
-	gr, _ = gzip.NewReader(bytes.NewBuffer(bs))
+	gr, _ = gzip.NewReader(bytes.NewReader(bs))
 	bs, _ = ioutil.ReadAll(gr)
 	assets["{{$asset.Name}}"] = bs
 {{end}}

cmd/stfileinfo/main.go

@@ -21,7 +21,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/syncthing/syncthing/internal/protocol"
+	"github.com/syncthing/protocol"
 	"github.com/syncthing/syncthing/internal/scanner"
 )
 

cmd/stfinddevice/main.go

@@ -20,8 +20,8 @@ import (
 	"log"
 	"os"
 
+	"github.com/syncthing/protocol"
 	"github.com/syncthing/syncthing/internal/discover"
-	"github.com/syncthing/syncthing/internal/protocol"
 )
 
 func main() {

cmd/stindex/main.go

@@ -21,8 +21,8 @@ import (
 	"log"
 	"os"
 
-	"github.com/syncthing/syncthing/internal/files"
-	"github.com/syncthing/syncthing/internal/protocol"
+	"github.com/syncthing/protocol"
+	"github.com/syncthing/syncthing/internal/db"
 	"github.com/syndtr/goleveldb/leveldb"
 )
 
@@ -34,17 +34,17 @@ func main() {
 	device := flag.String("device", "", "Device ID (blank for global)")
 	flag.Parse()
 
-	db, err := leveldb.OpenFile(flag.Arg(0), nil)
+	ldb, err := leveldb.OpenFile(flag.Arg(0), nil)
 	if err != nil {
 		log.Fatal(err)
 	}
 
-	fs := files.NewSet(*folder, db)
+	fs := db.NewFileSet(*folder, ldb)
 
 	if *device == "" {
 		log.Printf("*** Global index for folder %q", *folder)
-		fs.WithGlobalTruncated(func(fi files.FileIntf) bool {
-			f := fi.(files.FileInfoTruncated)
+		fs.WithGlobalTruncated(func(fi db.FileIntf) bool {
+			f := fi.(db.FileInfoTruncated)
 			fmt.Println(f)
 			fmt.Println("\t", fs.Availability(f.Name))
 			return true
@@ -55,8 +55,8 @@ func main() {
 			log.Fatal(err)
 		}
 		log.Printf("*** Have index for folder %q device %q", *folder, n)
-		fs.WithHaveTruncated(n, func(fi files.FileIntf) bool {
-			f := fi.(files.FileInfoTruncated)
+		fs.WithHaveTruncated(n, func(fi db.FileIntf) bool {
+			f := fi.(db.FileInfoTruncated)
 			fmt.Println(f)
 			return true
 		})

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

@@ -32,14 +32,14 @@ import (
 	"time"
 
 	"github.com/calmh/logger"
+	"github.com/syncthing/protocol"
 	"github.com/syncthing/syncthing/internal/auto"
 	"github.com/syncthing/syncthing/internal/config"
+	"github.com/syncthing/syncthing/internal/db"
 	"github.com/syncthing/syncthing/internal/discover"
 	"github.com/syncthing/syncthing/internal/events"
-	"github.com/syncthing/syncthing/internal/files"
 	"github.com/syncthing/syncthing/internal/model"
 	"github.com/syncthing/syncthing/internal/osutil"
-	"github.com/syncthing/syncthing/internal/protocol"
 	"github.com/syncthing/syncthing/internal/upgrade"
 	"github.com/vitrun/qart/qr"
 	"golang.org/x/crypto/bcrypt"
@@ -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)
 }
@@ -784,7 +793,7 @@ func mimeTypeForFile(file string) string {
 	}
 }
 
-func toNeedSlice(fs []files.FileInfoTruncated) []map[string]interface{} {
+func toNeedSlice(fs []db.FileInfoTruncated) []map[string]interface{} {
 	output := make([]map[string]interface{}, len(fs))
 	for i, file := range fs {
 		output[i] = map[string]interface{}{
@@ -794,7 +803,7 @@ func toNeedSlice(fs []files.FileInfoTruncated) []map[string]interface{} {
 			"Version":      file.Version,
 			"LocalVersion": file.LocalVersion,
 			"NumBlocks":    file.NumBlocks,
-			"Size":         files.BlocksToSize(file.NumBlocks),
+			"Size":         db.BlocksToSize(int(file.NumBlocks)),
 		}
 	}
 	return output

cmd/syncthing/main.go

@@ -37,13 +37,13 @@ import (
 
 	"github.com/calmh/logger"
 	"github.com/juju/ratelimit"
+	"github.com/syncthing/protocol"
 	"github.com/syncthing/syncthing/internal/config"
+	"github.com/syncthing/syncthing/internal/db"
 	"github.com/syncthing/syncthing/internal/discover"
 	"github.com/syncthing/syncthing/internal/events"
-	"github.com/syncthing/syncthing/internal/files"
 	"github.com/syncthing/syncthing/internal/model"
 	"github.com/syncthing/syncthing/internal/osutil"
-	"github.com/syncthing/syncthing/internal/protocol"
 	"github.com/syncthing/syncthing/internal/symlinks"
 	"github.com/syncthing/syncthing/internal/upgrade"
 	"github.com/syncthing/syncthing/internal/upnp"
@@ -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
@@ -489,21 +492,21 @@ func syncthingMain() {
 		readRateLimit = ratelimit.NewBucketWithRate(float64(1000*opts.MaxRecvKbps), int64(5*1000*opts.MaxRecvKbps))
 	}
 
-	db, err := leveldb.OpenFile(filepath.Join(confDir, "index"), &opt.Options{OpenFilesCacheCapacity: 100})
+	ldb, err := leveldb.OpenFile(filepath.Join(confDir, "index"), &opt.Options{OpenFilesCacheCapacity: 100})
 	if err != nil {
 		l.Fatalln("Cannot open database:", err, "- Is another copy of Syncthing already running?")
 	}
 
 	// Remove database entries for folders that no longer exist in the config
 	folders := cfg.Folders()
-	for _, folder := range files.ListFolders(db) {
+	for _, folder := range db.ListFolders(ldb) {
 		if _, ok := folders[folder]; !ok {
 			l.Infof("Cleaning data for dropped folder %q", folder)
-			files.DropFolder(db, folder)
+			db.DropFolder(ldb, folder)
 		}
 	}
 
-	m := model.NewModel(cfg, myName, "syncthing", Version, db)
+	m := model.NewModel(cfg, myName, "syncthing", Version, ldb)
 
 	sanityCheckFolders(cfg, m)
 
@@ -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))
 		}
 	}
 

cmd/syncthing/main_test.go

@@ -19,10 +19,10 @@ import (
 	"os"
 	"testing"
 
+	"github.com/syncthing/protocol"
 	"github.com/syncthing/syncthing/internal/config"
-	"github.com/syncthing/syncthing/internal/files"
+	"github.com/syncthing/syncthing/internal/db"
 	"github.com/syncthing/syncthing/internal/model"
-	"github.com/syncthing/syncthing/internal/protocol"
 
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/storage"
@@ -44,11 +44,11 @@ func TestSanityCheck(t *testing.T) {
 		}
 	}
 
-	db, _ := leveldb.Open(storage.NewMemStorage(), nil)
+	ldb, _ := leveldb.Open(storage.NewMemStorage(), nil)
 
 	// Case 1 - new folder, directory and marker created
 
-	m := model.NewModel(cfg, "device", "syncthing", "dev", db)
+	m := model.NewModel(cfg, "device", "syncthing", "dev", ldb)
 	sanityCheckFolders(cfg, m)
 
 	if cfg.Folders()["folder"].Invalid != "" {
@@ -75,7 +75,7 @@ func TestSanityCheck(t *testing.T) {
 		Folders: []config.FolderConfiguration{fcfg},
 	})
 
-	m = model.NewModel(cfg, "device", "syncthing", "dev", db)
+	m = model.NewModel(cfg, "device", "syncthing", "dev", ldb)
 	sanityCheckFolders(cfg, m)
 
 	if cfg.Folders()["folder"].Invalid != "" {
@@ -91,12 +91,12 @@ func TestSanityCheck(t *testing.T) {
 
 	// Case 3 - marker missing
 
-	set := files.NewSet("folder", db)
+	set := db.NewFileSet("folder", ldb)
 	set.Update(protocol.LocalDeviceID, []protocol.FileInfo{
 		{Name: "dummyfile"},
 	})
 
-	m = model.NewModel(cfg, "device", "syncthing", "dev", db)
+	m = model.NewModel(cfg, "device", "syncthing", "dev", ldb)
 	sanityCheckFolders(cfg, m)
 
 	if cfg.Folders()["folder"].Invalid != "folder marker missing" {
@@ -110,7 +110,7 @@ func TestSanityCheck(t *testing.T) {
 		Folders: []config.FolderConfiguration{fcfg},
 	})
 
-	m = model.NewModel(cfg, "device", "syncthing", "dev", db)
+	m = model.NewModel(cfg, "device", "syncthing", "dev", ldb)
 	sanityCheckFolders(cfg, m)
 
 	if cfg.Folders()["folder"].Invalid != "folder path missing" {

cmd/syncthing/memsize_darwin.go

@@ -22,7 +22,7 @@ import (
 	"strings"
 )
 
-func memorySize() (uint64, error) {
+func memorySize() (int64, error) {
 	cmd := exec.Command("sysctl", "hw.memsize")
 	out, err := cmd.Output()
 	if err != nil {
@@ -32,7 +32,7 @@ func memorySize() (uint64, error) {
 	if len(fs) != 2 {
 		return 0, errors.New("sysctl parse error")
 	}
-	bytes, err := strconv.ParseUint(fs[1], 10, 64)
+	bytes, err := strconv.ParseInt(fs[1], 10, 64)
 	if err != nil {
 		return 0, err
 	}

cmd/syncthing/memsize_linux.go

@@ -23,7 +23,7 @@ import (
 	"strings"
 )
 
-func memorySize() (uint64, error) {
+func memorySize() (int64, error) {
 	f, err := os.Open("/proc/meminfo")
 	if err != nil {
 		return 0, err
@@ -40,7 +40,7 @@ func memorySize() (uint64, error) {
 		return 0, errors.New("/proc/meminfo parse error 2")
 	}
 
-	kb, err := strconv.ParseUint(fs[1], 10, 64)
+	kb, err := strconv.ParseInt(fs[1], 10, 64)
 	if err != nil {
 		return 0, err
 	}

cmd/syncthing/memsize_solaris.go

@@ -22,14 +22,14 @@ import (
 	"strconv"
 )
 
-func memorySize() (uint64, error) {
+func memorySize() (int64, error) {
 	cmd := exec.Command("prtconf", "-m")
 	out, err := cmd.CombinedOutput()
 	if err != nil {
 		return 0, err
 	}
 
-	mb, err := strconv.ParseUint(string(out), 10, 64)
+	mb, err := strconv.ParseInt(string(out), 10, 64)
 	if err != nil {
 		return 0, err
 	}

cmd/syncthing/memsize_unimpl.go

@@ -19,6 +19,6 @@ package main
 
 import "errors"
 
-func memorySize() (uint64, error) {
+func memorySize() (int64, error) {
 	return 0, errors.New("not implemented")
 }

cmd/syncthing/memsize_windows.go

@@ -26,7 +26,7 @@ var (
 	globalMemoryStatusEx, _ = syscall.GetProcAddress(kernel32, "GlobalMemoryStatusEx")
 )
 
-func memorySize() (uint64, error) {
+func memorySize() (int64, error) {
 	var memoryStatusEx [64]byte
 	binary.LittleEndian.PutUint32(memoryStatusEx[:], 64)
 	p := uintptr(unsafe.Pointer(&memoryStatusEx[0]))
@@ -36,5 +36,5 @@ func memorySize() (uint64, error) {
 		return 0, callErr
 	}
 
-	return binary.LittleEndian.Uint64(memoryStatusEx[8:]), nil
+	return int64(binary.LittleEndian.Uint64(memoryStatusEx[8:])), nil
 }

cmd/syncthing/perfstats_unix.go

@@ -24,7 +24,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/syncthing/syncthing/internal/protocol"
+	"github.com/syncthing/protocol"
 )
 
 func init() {
@@ -43,7 +43,7 @@ func savePerfStats(file string) {
 	var prevTime int64
 	var rusage syscall.Rusage
 	var memstats runtime.MemStats
-	var prevIn, prevOut uint64
+	var prevIn, prevOut int64
 
 	t0 := time.Now()
 	for t := range time.NewTicker(250 * time.Millisecond).C {

docker/Dockerfile

@@ -1,7 +1,7 @@
 FROM debian:squeeze
 MAINTAINER Jakob Borg <jakob@nym.se>
 
-ENV GOLANG_VERSION 1.4
+ENV GOLANG_VERSION 1.4.1
 
 # SCMs for "go get", gcc for cgo
 RUN apt-get update && apt-get install -y \
@@ -34,14 +34,14 @@ RUN go get github.com/calmh/gonative \
 
 # Rebuild the special and missing versions, using patches as appropriate
 
-RUN mkdir /tmp/patches
-ADD *.patch /tmp/patches/
-RUN bash -xec '\
-	cd /usr/local/go ; \
-	for patch in /tmp/patches/*.patch ; do \
-		patch -p0 < "$patch" ; \
-	done \
-	'
+# RUN mkdir /tmp/patches
+# ADD *.patch /tmp/patches/
+# RUN bash -xec '\
+#	cd /usr/local/go ; \
+#	for patch in /tmp/patches/*.patch ; do \
+#		patch -p0 < "$patch" ; \
+#	done \
+#	'
 
 RUN bash -xec '\
                 cd /usr/local/go/src; \

docker/go-9102.patch

@@ -1,22 +0,0 @@
---- src/syscall/route_openbsd.go.orig	Fri Jul 25 23:38:47 2014
-+++ src/syscall/route_openbsd.go	Fri Jul 25 23:39:20 2014
-@@ -12,16 +12,16 @@ func (any *anyMessage) toRoutingMessage(b []byte) Rout
- 	switch any.Type {
- 	case RTM_ADD, RTM_DELETE, RTM_CHANGE, RTM_GET, RTM_LOSING, RTM_REDIRECT, RTM_MISS, RTM_LOCK, RTM_RESOLVE:
- 		p := (*RouteMessage)(unsafe.Pointer(any))
--		return &RouteMessage{Header: p.Header, Data: b[SizeofRtMsghdr:any.Msglen]}
-+		return &RouteMessage{Header: p.Header, Data: b[p.Header.Hdrlen:any.Msglen]}
- 	case RTM_IFINFO:
- 		p := (*InterfaceMessage)(unsafe.Pointer(any))
--		return &InterfaceMessage{Header: p.Header, Data: b[SizeofIfMsghdr:any.Msglen]}
-+		return &InterfaceMessage{Header: p.Header, Data: b[p.Header.Hdrlen:any.Msglen]}
- 	case RTM_IFANNOUNCE:
- 		p := (*InterfaceAnnounceMessage)(unsafe.Pointer(any))
- 		return &InterfaceAnnounceMessage{Header: p.Header}
- 	case RTM_NEWADDR, RTM_DELADDR:
- 		p := (*InterfaceAddrMessage)(unsafe.Pointer(any))
--		return &InterfaceAddrMessage{Header: p.Header, Data: b[SizeofIfaMsghdr:any.Msglen]}
-+		return &InterfaceAddrMessage{Header: p.Header, Data: b[p.Header.Hdrlen:any.Msglen]}
- 	}
- 	return nil
- }

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,7 +81,8 @@
     "OK": "OK",
     "Offline": "Offline",
     "Online": "Online",
-    "Out Of Sync": "Out Of Sync",
+    "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",
@@ -90,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",
@@ -109,24 +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": "Выключыць",
+    "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.",
@@ -150,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.",
@@ -164,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,6 +82,7 @@
     "Offline": "Не е на линия",
     "Online": "На линия",
     "Out Of Sync": "Не Синхронизиран",
+    "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": "Пътят до папката на този компютър. Ще бъде създадена ако не съществува. Символът тилда (~) може да бъде използван като заместител на",
@@ -102,34 +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": "Спирането завършено",
     "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.": "Полето идентификатор на устройство не може да бъде празно.",
@@ -165,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-ca.json

@@ -0,0 +1,171 @@
+{
+    "API Key": "Clau API",
+    "About": "Sobre",
+    "Add": "Afegir",
+    "Add Device": "Afegir dispositiu",
+    "Add Folder": "Afegir carpeta",
+    "Add new folder?": "Afegir nova carpeta?",
+    "Address": "Adreça",
+    "Addresses": "Adreces",
+    "Allow Anonymous Usage Reporting?": "Permetre l'enviament anònim d'informes d'ús?",
+    "Anonymous Usage Reporting": "Informe anònim d'ús",
+    "Any devices configured on an introducer device will be added to this device as well.": "Qualsevol dispositiu configurat com a dispositiu introductor s'afegirà a aquest dispositiu tambè.",
+    "Automatic upgrades": "Actualitzacions automàtiques",
+    "Bugs": "Bugs",
+    "CPU Utilization": "Utilització del CPU",
+    "Changelog": "Historial de canvis",
+    "Close": "Tancar",
+    "Comment, when used at the start of a line": "Comentari quan és usat al principi d'una línia",
+    "Compression is recommended in most setups.": "Generalment, la compressió és recomanada.",
+    "Connection Error": "Error de connexió",
+    "Copied from elsewhere": "Copiat d'un altre lloc",
+    "Copied from original": "Copiat de l'original",
+    "Copyright © 2014 Jakob Borg and the following Contributors:": "Drets d'autor © 2014 Jakob Borg i els següents contribuïdors:",
+    "Delete": "Esborrar",
+    "Device ID": "ID del dispositiu",
+    "Device Identification": "Identificació del dispositiu",
+    "Device Name": "Nom del dispositiu",
+    "Device {%device%} ({%address%}) wants to connect. Add new device?": "El dispositiu {{device}} ({{address}}) vol conectar-se. Afegir nou dispositiu?",
+    "Devices": "Dispositius",
+    "Disconnected": "Desconnectat",
+    "Documentation": "Documentació",
+    "Download Rate": "Tasca de descarrega",
+    "Downloaded": "Descarregat",
+    "Downloading": "Descarregant",
+    "Edit": "Editar",
+    "Edit Device": "Modificar dispositiu",
+    "Edit Folder": "Modificar carpeta",
+    "Editing": "Modificant",
+    "Enable UPnP": "Habilitat UPnP",
+    "Enter comma separated \"ip:port\" addresses or \"dynamic\" to perform automatic discovery of the address.": "Introduir, separat per comes, adreces \"ip:port\" o \"dynamic\" per descobrir automàticament les adreces.",
+    "Enter ignore patterns, one per line.": "Introduïx els patrons d'ignoració, un per línia.",
+    "Error": "Error",
+    "File Versioning": "Versionat de Fitxers",
+    "File permission bits are ignored when looking for changes. Use on FAT filesystems.": "Els bits de permisos dels fitxers son ignorats quan es cerquen canvis. Utilitzar en sistemes de fitxers FAT.",
+    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by syncthing.": "Els fitxers es mouen amb l'estampat de la data a la carpeta .stversions quan son substituïts o esborrats per syncthing.",
+    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Els fitxers estan protegits de canvis fets per altres dispositius, però els canvis fets en aquest dispositiu seran enviats a la resta del cluster.",
+    "Folder ID": "ID de carpeta",
+    "Folder Master": "Carpeta mestre",
+    "Folder Path": "Camí de carpeta",
+    "Folders": "Carpetes",
+    "GUI Authentication Password": "Contrasenya d'autenticació GUI",
+    "GUI Authentication User": "Usuari d'autenticació GUI",
+    "GUI Listen Addresses": "Adreça d'escolta del GUI",
+    "Generate": "Generar",
+    "Global Discovery": "Descobriment Global",
+    "Global Discovery Server": "Servidor de Descobriment Global",
+    "Global State": "Estat global",
+    "Idle": "Inactiu",
+    "Ignore": "Ignorar",
+    "Ignore Patterns": "Patrons d'ignoració",
+    "Ignore Permissions": "Ignora Permisos",
+    "Incoming Rate Limit (KiB/s)": "Tasca Límit d'Entrada (KiB/s)",
+    "Introducer": "Introductor",
+    "Inversion of the given condition (i.e. do not exclude)": "Inversió del patrò introduït",
+    "Keep Versions": "Mantenir Versions",
+    "Last File Received": "Últim fitxer rebut",
+    "Last File Synced": "Últim fitxer sincronitzat",
+    "Last seen": "Vist per última vegada",
+    "Later": "Després",
+    "Latest Release": "Última publicació",
+    "Local Discovery": "Descobriment Local",
+    "Local State": "Estat local",
+    "Maximum Age": "Antiguitat Màxima",
+    "Multi level wildcard (matches multiple directory levels)": "Caràcter comodí de nivell múltiple (aparella en carpetes de nivells múltiples)",
+    "Never": "Mai",
+    "New Device": "Nou dispositiu",
+    "New Folder": "Nova carpeta",
+    "No": "No",
+    "No File Versioning": "Sense Versionat de Fitxer",
+    "Notice": "Avís",
+    "OK": "OK",
+    "Offline": "Desconnectat",
+    "Online": "Connectat",
+    "Out Of Sync": "Fora de la Sincronització",
+    "Out of Sync Items": "Arxius encara no sincronitzats",
+    "Outgoing Rate Limit (KiB/s)": "Tasca Límit de Sortida (KiB/s)",
+    "Override Changes": "Sobreescriure Canvis",
+    "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Ruta de la carpeta a l'equip local. Si no existeix serà creada. El caràcter (~) es pot fer servir com a drecera de",
+    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Ruta on les versions s'haurien de guardar (deixa-ho buit per fer servir el directori .stversions per defecte a la carpeta)",
+    "Please wait": "Si-us-plau espera",
+    "Preview": "Vista prèvia",
+    "Preview Usage Report": "Vista Prèvia de l'Informe d'Ús",
+    "Quick guide to supported patterns": "Guia ràpida per als possibles patrons",
+    "RAM Utilization": "Utilització de la RAM",
+    "Rescan": "Re-escanejar",
+    "Rescan Interval": "Interval de re-escaneig",
+    "Restart": "Reiniciar",
+    "Restart Needed": "És Necessari Reiniciar",
+    "Restarting": "Reiniciant",
+    "Reused": "Reutilitzat",
+    "Save": "Guardar",
+    "Scanning": "Escanejant",
+    "Select the devices to share this folder with.": "Selecciona els dispositius en els quals compartir aquesta carpeta.",
+    "Select the folders to share with this device.": "Selecciona la carpeta per a compartir en aquest dispositiu.",
+    "Settings": "Preferències",
+    "Share": "Compartir",
+    "Share Folder": "Compartir carpeta",
+    "Share Folders With Device": "Compartir carpetes en dispositiu",
+    "Share With Devices": "Compartir en dispositius",
+    "Share this folder?": "Compartir aquesta carpeta?",
+    "Shared With": "Compartir Amb",
+    "Short identifier for the folder. Must be the same on all cluster devices.": "Breva identificació per a la carpeta. Té que ser la mateixa per tots els dispositius del cluster.",
+    "Show ID": "Mostrar ID",
+    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Mostrat en comptes del ID del Node en l'estat del cluster. Serà advertit als altres dispositius com un nom opcional per defecte.",
+    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Mostrat en comptes del ID del Node en l'estat del cluster. S'actualitzarà al nom del dispositiu si es deixa buit.",
+    "Shutdown": "Apagar",
+    "Shutdown Complete": "Apagat complet",
+    "Simple File Versioning": "Versionat de Fitxers Senzill",
+    "Single level wildcard (matches within a directory only)": "Caràcter comodí de nivell singular (aparella sóls en una carpeta)",
+    "Source Code": "Codi Font",
+    "Staggered File Versioning": "Versionat de Fitxers Esglaonat",
+    "Start Browser": "Arrancar Navegador",
+    "Stopped": "Aturat",
+    "Support": "Suport",
+    "Support / Forum": "Suport / Fòrum",
+    "Sync Protocol Listen Addresses": "Adreça d'escolta del Protocol Sync",
+    "Synchronization": "Sincronització",
+    "Syncing": "Synthing",
+    "Syncthing has been shut down.": "S'ha aturat el synthing.",
+    "Syncthing includes the following software or portions thereof:": "Syncthing inclou el següent programari o parts dels mateixos:",
+    "Syncthing is restarting.": "Reiniciant syncthing.",
+    "Syncthing is upgrading.": "Actualitzant syncthing.",
+    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Synthing sembla parat, o hi ha algun problema amb la connexió a Internet. Reintentant...",
+    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing sembla estar experimentant un problema en processar la teva sol·licitud. Si us plau, recarregeu el navegador o reinicieu Syncthing si el problema persisteix.",
+    "The aggregated statistics are publicly available at {%url%}.": "Les estadístiques agregades estan públicament disponibles a {{url}}.",
+    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "La configuració s'ha guardar però no s'ha activat. S'ha de reiniciar el synthing per activar la nova configuració.",
+    "The device ID cannot be blank.": "El ID del dispositiu no pot estar en blanc.",
+    "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).": "El ID del dispositiu per introduir ací es pot trobar al diàleg \"Editar > Mostrar ID\" en l'altre dispositiu. Els espais i les barres son opcionals (s'ignoren).",
+    "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.": "L'informe d'ús encriptat s'envia diàriament. Es fa servir per rastrejar plataformes habituals, mides de carpetes i versions de l'aplicació. Si es canvia el conjunt de dades reportades es demanarà amb aquest diàleg de nou.",
+    "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.": "El ID del dispositiu introduït no sembla vàlid. Hauria de tenir 52 o 56 caràcters amb lletres i números, els espais i les barres son opcionals.",
+    "The folder ID cannot be blank.": "El ID del dispositiu no pot estar en blanc.",
+    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "El ID de la carpeta ha de ser un identificador curt (64 caràcters o menys) format només per lletres, nombres i el punt (.), barra (-) i barra baixa (_).",
+    "The folder ID must be unique.": "El ID de la carpeta ha de ser únic.",
+    "The folder path cannot be blank.": "El camí a la carpeta no pot estar en blanc.",
+    "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.": "Es fan servir els següents intervals: per la primera hora es manté una versió cada 30 segons, pel primer dia es manté una versió cada hora, pel primer cada 30 dies es manté una versió cada dia, fins el màxim d'antiguitat es manté una versió cada setmana.",
+    "The maximum age must be a number and cannot be blank.": "La màxima antiguitat ha de ser un número i no pot estar en blanc.",
+    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Temps màxim en mantenir una versió (en dies, si es deixa en 0 es mantenen les versions per sempre).",
+    "The number of old versions to keep, per file.": "El nombre de versions antigues que es mantenen per fitxer.",
+    "The number of versions must be a number and cannot be blank.": "El nombre de versions ha de ser un número i no es pot deixar en blanc.",
+    "The rescan interval must be a non-negative number of seconds.": "El interval de re-escaneig ha der ser un nombre positiu de segons.",
+    "The rescan interval must be at least 5 seconds.": "El interval de re-escaneig ha de ser com a mínim de 5 segons.",
+    "Unknown": "Desconegut",
+    "Unshared": "No compartit",
+    "Unused": "No usat",
+    "Up to Date": "Actualitzat",
+    "Upgrade To {%version%}": "Actualitzar a {{version}}",
+    "Upgrading": "Actualitzant",
+    "Upload Rate": "Tasca de Pujada",
+    "Use Compression": "Utilitza compressió",
+    "Use HTTPS for GUI": "Utilitzar HTTPS pel GUI",
+    "Version": "Versió",
+    "Versions Path": "Carpeta de les Versions",
+    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Les versions son automàticament eliminades si son més antigues que el màxim d'antiguitat o si excedeixen del nombre de fitxers permesos en un interval.",
+    "When adding a new device, keep in mind that this device must be added on the other side too.": "Quan s'afegeix un nou dispositiu, recorda que aquest dispositiu tambè s'ha d'afegir a l'altre banda.",
+    "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Quan s'afegeix una nova carpeta recorda que el ID d'aquesta s'utilitza per lligar repositoris entre els dispositius. Es distingeix entre majúscules i minúscules i ha de ser exactament iguals entre tots els dispositius.",
+    "Yes": "Si",
+    "You must keep at least one version.": "Has de mantenir com a mínim una versió.",
+    "full documentation": "documentació sencera",
+    "items": "Elements",
+    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} vol compartir la carpeta \"{{folder}}\"."
+}

gui/assets/lang/lang-cs.json

@@ -82,6 +82,7 @@
     "Offline": "Offline",
     "Online": "Online",
     "Out Of Sync": "Nesesynchronizováno",
+    "Out of Sync Items": "Nesesynchronizované položky",
     "Outgoing Rate Limit (KiB/s)": "Omezení odchozí rychlosti (KiB/s)",
     "Override Changes": "Přepsat změny",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Cesta k adresáři na lokálním počítači. Pokud neexistuje, bude vytvořen. Znak vlnovky (~) může být použit jako zkratka pro",
@@ -113,6 +114,7 @@
     "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Zobrazeno místo ID přístroje na náhledu stavu clusteru. Bude odesíláno ostatním přístrojům jako dodatečné výchozí jméno.",
     "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Zobrazeno místo ID přístroje na náhledu stavu clusteru. Bude aktualizováno na jméno které přístroj odesílá pokud nebylo vyplněno.",
     "Shutdown": "Vypnout",
+    "Shutdown Complete": "Vypnutí ukončeno",
     "Simple File Versioning": "Jednoduché verze souborů",
     "Single level wildcard (matches within a directory only)": "Jednoúrovňový zástupný znak (shody pouze uvnitř adresáře)",
     "Source Code": "Zdrojový kód",

gui/assets/lang/lang-de.json

@@ -82,6 +82,7 @@
     "Offline": "Offline",
     "Online": "Online",
     "Out Of Sync": "Nicht synchronisiert",
+    "Out of Sync Items": "Nicht synchronisierte Objekte",
     "Outgoing Rate Limit (KiB/s)": "Ausgehendes Datenratelimit (KiB/s)",
     "Override Changes": "Änderungen überschreiben",
     "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": "Pfad zum Verzeichnis auf dem lokalen Rechner. Wird erzeugt, wenn es nicht existiert. Das Tilden-Zeichen (~) kann als Abkürzung benutzt werden für",
@@ -113,6 +114,7 @@
     "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Wird anstatt der Geräte ID im Verbunds-Status angezeigt. Wird als optionaler Standardname an andere Geräte bekannt gegeben.",
     "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Wird anstatt der Geräte ID im Verbunds-Status angezeigt. Wird auf den Namen aktualisiert, den das Gerät angibt.",
     "Shutdown": "Herunterfahren",
+    "Shutdown Complete": "Vollständig Heruntergefahren",
     "Simple File Versioning": "Einfache Dateiversionierung",
     "Single level wildcard (matches within a directory only)": "Einzelnes Maskenzeichen (wird für ein einzelnes Verzeichnis verwendet)",
     "Source Code": "Quellcode",

gui/assets/lang/lang-es.json

@@ -13,7 +13,7 @@
     "Automatic upgrades": "Actualizaciones automáticas",
     "Bugs": "Errores",
     "CPU Utilization": "Uso de la CPU",
-    "Changelog": "Changelog",
+    "Changelog": "Registro de cambios",
     "Close": "Cerrar",
     "Comment, when used at the start of a line": "Comentario, cuando es utilizado al inicio de una línea.",
     "Compression is recommended in most setups.": "La compresión de datos es recomendada para la mayoría de las configuraciones.",
@@ -26,7 +26,7 @@
     "Device Identification": "Identificación del dispositivo",
     "Device Name": "Nombre del dispositivo",
     "Device {%device%} ({%address%}) wants to connect. Add new device?": "El dispositivo {{device}} ({{address}}) se quiere conectar. ¿Agregar nuevo dispositivo?",
-    "Devices": "Devices",
+    "Devices": "Dispositivos",
     "Disconnected": "Desconectado",
     "Documentation": "Documentación",
     "Download Rate": "Tasa de descarga",
@@ -63,7 +63,7 @@
     "Introducer": "Introductor",
     "Inversion of the given condition (i.e. do not exclude)": "Inversión de la condición dada (es decir, no excluir)",
     "Keep Versions": "Conservar versiones",
-    "Last File Received": "Last File Received",
+    "Last File Received": "Último archivo recibido",
     "Last File Synced": "Último archivo sincronizado.",
     "Last seen": "Visto por ultima vez",
     "Later": "Más tarde",
@@ -82,6 +82,7 @@
     "Offline": "Fuera de linea",
     "Online": "En linea",
     "Out Of Sync": "Fuera de sincronización",
+    "Out of Sync Items": "Ítems no sincronizados",
     "Outgoing Rate Limit (KiB/s)": "Tasa máxima de envío (KiB/s)",
     "Override Changes": "Reemplazar los cambios",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Ruta del repositorio en el equipo local. Será creado si no existe. El carácter tilde (~) puede ser utilizado como atajo de ",
@@ -113,13 +114,14 @@
     "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Mostrado en lugar de la ID del dispositivo en el estado del grupo. Será sugerido a otros dispositivos como nombre predeterminado opcional.",
     "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Mostrado en lugar de la ID del dispositivo en el estado del grupo. Si se deja en blanco, será usado el nombre sugerido por el dispositivo.",
     "Shutdown": "Apagar",
+    "Shutdown Complete": "Apagado completado",
     "Simple File Versioning": "Versiones simple de archivos",
     "Single level wildcard (matches within a directory only)": "Carácter comodín de un solo nivel (coincide sólo dentro de un directorio)",
     "Source Code": "Código fuente",
     "Staggered File Versioning": "Versiones del archivo escalonado",
     "Start Browser": "Iniciar navegador",
     "Stopped": "Parado",
-    "Support": "Support",
+    "Support": "Soporte",
     "Support / Forum": "Soporte / Foro",
     "Sync Protocol Listen Addresses": "Dirección de escucha del protocolo de sincronización",
     "Synchronization": "Sincronización",
@@ -164,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",
@@ -82,6 +82,7 @@
     "Offline": "Offline",
     "Online": "Online",
     "Out Of Sync": "Non synchronisé",
+    "Out of Sync Items": "Objets non synchronisés",
     "Outgoing Rate Limit (KiB/s)": "Limite du débit sortant (KiB/s)",
     "Override Changes": "Écraser les changements",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Chemin du répertoire sur l'ordinateur local. Il sera créé si il n'existe pas. Le caractère tilde (~) peut être utilisé comme raccourci vers",
@@ -105,7 +106,7 @@
     "Share": "Partager",
     "Share Folder": "Partager le répertoire",
     "Share Folders With Device": "Partager des répertoires avec des machines",
-    "Share With Devices": "Partager avec les machines",
+    "Share With Devices": "Partage avec des machines",
     "Share this folder?": "Voulez-vous partager ce répertoire ?",
     "Shared With": "Partagé avec",
     "Short identifier for the folder. Must be the same on all cluster devices.": "Court identifiant du répertoire. Il doit être le même sur l'ensemble des machines du groupe.",
@@ -113,6 +114,7 @@
     "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Affiché à la place de l'ID de la machine dans le groupe. Sera proposé aux autres machines comme nom optionnel par défaut.",
     "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Affiché à la place de l'ID de la machine dans le groupe. Si laissé vide, il sera mis à jour par le nom proposé par la machine distante.",
     "Shutdown": "Éteindre",
+    "Shutdown Complete": "Extinction terminée",
     "Simple File Versioning": "Suivi simple des versions de fichier",
     "Single level wildcard (matches within a directory only)": "Astérisque à un seul niveau (correspond uniquement à l’intérieur du répertoire)",
     "Source Code": "Code source",

gui/assets/lang/lang-hu.json

@@ -82,6 +82,7 @@
     "Offline": "Nincs kapcsolat",
     "Online": "Kapcsolódva",
     "Out Of Sync": "Nincs szinkronban",
+    "Out of Sync Items": "Out of Sync Items",
     "Outgoing Rate Limit (KiB/s)": "Kimenő sávszélesség (KiB/mp)",
     "Override Changes": "Változtatások felülbírálása",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "A mappa elérési útja az eszközön. Amennyiben nem létezik, a program automatikusan létrehozza. A hullámvonal (~)  a következő helyettesítésre használható: ",
@@ -113,6 +114,7 @@
     "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Az eszköz azonosító helyett jelenik meg. A többi eszközön alapértelmezett névként használható. ",
     "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Az eszköz azonosító helyett jelenik meg. Üresen hagyva az eszköz saját neve lesz használva ",
     "Shutdown": "Leállítás",
+    "Shutdown Complete": "Shutdown Complete",
     "Simple File Versioning": "Egyszerű fájl verziókövetés",
     "Single level wildcard (matches within a directory only)": "Egyszintű helyettesítő karakter (csak egy mappára érvényes)",
     "Source Code": "Forráskód",

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,6 +82,7 @@
     "Offline": "Non in linea",
     "Online": "In linea",
     "Out Of Sync": "Non Sincronizzati",
+    "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",
@@ -113,13 +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": "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-lt.json

@@ -82,6 +82,7 @@
     "Offline": "Atsijungęs",
     "Online": "Prisijungęs",
     "Out Of Sync": "Nesutikrinta",
+    "Out of Sync Items": "Nesutikrinta",
     "Outgoing Rate Limit (KiB/s)": "Išeinančio srauto maksimalus greitis (KiB/s)",
     "Override Changes": "Perrašyti pakeitimus",
     "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": "Kelias iki aplanko šiame kompiuteryje. Bus sukurtas, jei neegzistuoja. Tildės simbolis (~) gali būti naudojamas kaip trumpinys",
@@ -113,6 +114,7 @@
     "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Grupės būsenoje rodomas vietoje įrenginio vardo. Kiti įrenginiai matys kaip pasirinktinį vardą.",
     "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Grupės būsenoje rodomas vietoje įrenginio vardo. Bus atnaujintas į įrenginio vardą jei nieko neįrašysite.",
     "Shutdown": "Išjungti",
+    "Shutdown Complete": "Sėkmingai išjungta",
     "Simple File Versioning": "Supaprastintas versijų valdymas",
     "Single level wildcard (matches within a directory only)": "Vieno lygio pakaitos (atitinka tik vieną direktorijos lygį)",
     "Source Code": "Išeities kodas",

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,6 +82,7 @@
     "Offline": "Frakobla",
     "Online": "Tilkobla",
     "Out Of Sync": "Ikke Synkronisert",
+    "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",
@@ -96,30 +97,31 @@
     "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",
     "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Vis i stedet for Eining ID i gruppestatus. Vil bli kringkastet til andre enheter som et valgfritt standardnavn.",
     "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Vist i stedet for Mappe-ID i gruppestatus. Vil bli oppdatert til navnet enheten kringkaster dersom tomt.",
     "Shutdown": "Slå Av",
+    "Shutdown Complete": "Shutdown Complete",
     "Simple File Versioning": "Enkel Versjonskontroll",
     "Single level wildcard (matches within a directory only)": "Enkeltnivåsøk (søker kun i en mappe)",
     "Source Code": "Kildekode",
     "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",
@@ -148,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",
@@ -165,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-nl.json

@@ -82,6 +82,7 @@
     "Offline": "Offline",
     "Online": "Online",
     "Out Of Sync": "Niet gesynchroniseerd",
+    "Out of Sync Items": "Out of Sync Items",
     "Outgoing Rate Limit (KiB/s)": "Uitgaande snelheidslimiet (KiB/s)",
     "Override Changes": "Veranderingen overschrijven",
     "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": "Locatie van de folder op de lokale computer. Zal aangemaakt worden wanneer deze niet bestaat. De tilde (~) kan gebruikt in plaats van",
@@ -113,6 +114,7 @@
     "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Wordt getoond in plaats van de toestel ID in de cluster staat. Wordt doorgegeven aan andere toestellen as een bijkomende standaard toestelnaam.",
     "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Wordt getoond in plaats van de toestel ID in de cluster staat. Wanneer leeg wordt deze aangepast met de naam aangekondigd door het toestel.",
     "Shutdown": "Sluit af",
+    "Shutdown Complete": "Shutdown Complete",
     "Simple File Versioning": "Eenvoudig versiebeheer",
     "Single level wildcard (matches within a directory only)": "Wildcard op enkel niveau (toepasbaar binnen een enkele folder)",
     "Source Code": "Broncode",

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,6 +82,7 @@
     "Offline": "Fråkopla",
     "Online": "Tilkopla",
     "Out Of Sync": "Ikkje Synkronisert",
+    "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",
@@ -96,30 +97,31 @@
     "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",
     "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Vis i staden for Eining ID i gruppestatus. Vil verta kringkasta til andre einingar som eit valfritt standardnamn.",
     "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Vist i staden for Mappe-ID i gruppestatus. Vil verta oppdatert til namnet eininga kringkastar dersom tomt.",
     "Shutdown": "Slå Av",
+    "Shutdown Complete": "Shutdown Complete",
     "Simple File Versioning": "Enkel Versjonskontroll",
     "Single level wildcard (matches within a directory only)": "Enkeltnivåsøk (søkjer kun i ei mappe)",
     "Source Code": "Kildekode",
     "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",
@@ -148,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",
@@ -165,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",
@@ -82,6 +82,7 @@
     "Offline": "Rozłączony",
     "Online": "Połączony",
     "Out Of Sync": "Niezsynchronizowane",
+    "Out of Sync Items": "Out of Sync Items",
     "Outgoing Rate Limit (KiB/s)": "Ograniczenie prędkości wysyłania (KiB/s)",
     "Override Changes": "Nadpisz zmiany",
     "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": "Ścieżka do lokalnego folderu. Zostanie utworzona jeżeli nie istnieje.\nZnak tyldy (~) może zostać użyty jako skrót do",
@@ -100,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",
@@ -113,6 +114,7 @@
     "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Pokazane w statusie zamiast ID urządzenia.Zostanie wysłane do innych urządzeń jako opcjonalna domyślna nazwa.",
     "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Pokazane w statusie zamiast ID urządzenia. Zostanie zaktualizowane do nazwy urządzenia jeżeli pozostanie puste.",
     "Shutdown": "Wyłącz",
+    "Shutdown Complete": "Shutdown Complete",
     "Simple File Versioning": "Proste wersjonowanie pliku",
     "Single level wildcard (matches within a directory only)": "Wieloznaczność na poziomie plików (uwzględnia nazwy plików)",
     "Source Code": "Kod źródłowy",
@@ -145,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,6 +82,7 @@
     "Offline": "Desconectado",
     "Online": "Conectado",
     "Out Of Sync": "Não sincronizado",
+    "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",
@@ -113,6 +114,7 @@
     "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Apresentado ao invés do ID do dispositivo no indicador de estado do grupo. Será divulgado aos outros dispositivos como um nome pré-definido opcional.",
     "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Apresentado ao invés do ID do dispositivo no indicador de estado do grupo. Será actualizado para o nome que o dispositivo divulga, se for deixado em branco.",
     "Shutdown": "Desligar",
+    "Shutdown Complete": "Encerramento completado",
     "Simple File Versioning": "Gestão de versões de ficheiros simples",
     "Single level wildcard (matches within a directory only)": "Caractere polivalente de um só nível (faz corresponder apenas dentro de uma pasta)",
     "Source Code": "Código fonte",

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,6 +82,7 @@
     "Offline": "Оффлайн",
     "Online": "Онлайн",
     "Out Of Sync": "Не синхронизировано",
+    "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": "Путь к папке на локальном компьютере. Если её не существует, то она будет создана. Тильда (~) может использоваться как сокращение для",
@@ -102,24 +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": "Выключено",
     "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": "Синхронизация",
@@ -129,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,15 +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": "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",
@@ -100,19 +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": "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",
@@ -125,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}}",
@@ -165,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/assets/lang/lang-zh-CN.json

@@ -1,10 +1,10 @@
 {
     "API Key": "API Key",
     "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": "Bug汇报",
     "CPU Utilization": "CPU使用率",
-    "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": "设备ID",
     "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": "用以在互联网上寻找节点的Announce服务器地址",
     "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,6 +82,7 @@
     "Offline": "离线",
     "Online": "在线",
     "Out Of Sync": "未同步",
+    "Out of Sync Items": "未同步的项目",
     "Outgoing Rate Limit (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": "文件夹在本地的路径。如果不存在，则会被创建。波浪线符号（~）是如下路径的缩略符：",
@@ -102,24 +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": "关闭Syncthing",
+    "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": "同步完成度",
@@ -129,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不能为空",
@@ -165,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-zh-TW.json

@@ -26,7 +26,7 @@
     "Device Identification": "裝置識別",
     "Device Name": "裝置名稱",
     "Device {%device%} ({%address%}) wants to connect. Add new device?": "裝置 {{device}} ({{address}}) 想要連線。要新增裝置嗎？",
-    "Devices": "Devices",
+    "Devices": "裝置",
     "Disconnected": "斷線",
     "Documentation": "說明文件",
     "Download Rate": "下載速率",
@@ -82,6 +82,7 @@
     "Offline": "離線",
     "Online": "上線",
     "Out Of Sync": "不同步",
+    "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": "資料夾在本地電腦的路徑。若資料夾不存在則會建立。波浪符號 (~) 可用作下列資料夾的捷徑：",
@@ -113,13 +114,14 @@
     "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",
     "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": "同步作業",

gui/assets/lang/valid-langs.js

@@ -1 +1 @@
-var validLangs = ["be","bg","cs","de","en","es","fr","hu","it","lt","nb","nl","nn","pl","pt-PT","ru","sv","zh-CN","zh-TW"]
+var validLangs = ["be","bg","ca","cs","de","en","es","fr","hu","it","lt","nb","nl","nn","pl","pt-PT","ru","sv","zh-CN","zh-TW"]

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">
@@ -150,6 +240,13 @@
                       <th><span class="glyphicon glyphicon-refresh"></span>&emsp;<span translate>Rescan Interval</span></th>
                       <td class="text-right">{{folder.RescanIntervalS}} s</td>
                     </tr>
+                    <tr ng-if="folder.Versioning.Type">
+                      <th><span class="glyphicon glyphicon-tags"></span>&emsp;<span translate>File Versioning</span></th>
+                      <td class="text-right" ng-switch="folder.Versioning.Type">
+                        <span ng-switch-when="staggered" translate>Staggered File Versioning</span>
+                        <span ng-switch-when="simple" translate>Simple File Versioning</span>
+                      </td>
+                    </tr>
                     <tr>
                       <th><span class="glyphicon glyphicon-share-alt"></span>&emsp;<span translate>Shared With</span></th>
                       <td class="text-right">{{sharesFolder(folder)}}</td>
@@ -166,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>
@@ -310,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 -->
@@ -401,11 +414,11 @@
   <nav class="navbar navbar-default navbar-fixed-bottom">
     <div class="container">
       <ul class="nav navbar-nav">
-        <li><a class="navbar-link" href="https://github.com/syncthing/syncthing/wiki"><span class="glyphicon glyphicon-book"></span>&ensp;<span translate>Documentation</span></a></li>
-        <li><a class="navbar-link" href="https://discourse.syncthing.net"><span class="glyphicon glyphicon-question-sign"></span>&ensp;<span translate>Support</span></a></li>
-        <li><a class="navbar-link" href="https://github.com/syncthing/syncthing/releases"><span class="glyphicon glyphicon-info-sign"></span>&ensp;<span translate>Changelog</span></a></li>
-        <li><a class="navbar-link" href="https://github.com/syncthing/syncthing/issues"><span class="glyphicon glyphicon-warning-sign"></span>&ensp;<span translate>Bugs</span></a></li>
-        <li><a class="navbar-link" href="https://github.com/syncthing/syncthing"><span class="glyphicon glyphicon-wrench"></span>&ensp;<span translate>Source Code</span></a></li>
+        <li><a class="navbar-link" href="https://github.com/syncthing/syncthing/wiki" target="_blank"><span class="glyphicon glyphicon-book"></span>&ensp;<span translate>Documentation</span></a></li>
+        <li><a class="navbar-link" href="https://discourse.syncthing.net" target="_blank"><span class="glyphicon glyphicon-question-sign"></span>&ensp;<span translate>Support</span></a></li>
+        <li><a class="navbar-link" href="https://github.com/syncthing/syncthing/releases" target="_blank"><span class="glyphicon glyphicon-info-sign"></span>&ensp;<span translate>Changelog</span></a></li>
+        <li><a class="navbar-link" href="https://github.com/syncthing/syncthing/issues" target="_blank"><span class="glyphicon glyphicon-warning-sign"></span>&ensp;<span translate>Bugs</span></a></li>
+        <li><a class="navbar-link" href="https://github.com/syncthing/syncthing" target="_blank"><span class="glyphicon glyphicon-wrench"></span>&ensp;<span translate>Source Code</span></a></li>
       </ul>
     </div>
   </nav>
@@ -832,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>
@@ -854,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">
@@ -899,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>
@@ -947,14 +959,17 @@
           <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>
           <li>Michael Tilli</li>
           <li>Peter Hoeg</li>
           <li>Philippe Schommers</li>
           <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>

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

@@ -11,27 +11,6 @@ angular.module('syncthing.core')
 
         function initController() {
             LocaleService.autoConfigLocale();
-
-            refreshSystem();
-            refreshConfig();
-            refreshConnectionStats();
-            refreshDeviceStats();
-            refreshFolderStats();
-
-            $http.get(urlbase + '/version').success(function (data) {
-                $scope.version = data.version;
-            }).error($scope.emitHTTPError);
-
-            $http.get(urlbase + '/report').success(function (data) {
-                $scope.reportData = data;
-            }).error($scope.emitHTTPError);
-
-            $http.get(urlbase + '/upgrade').success(function (data) {
-                $scope.upgradeInfo = data;
-            }).error(function () {
-                $scope.upgradeInfo = null;
-            });
-
             setInterval($scope.refresh, 10000);
         }
 
@@ -85,7 +64,27 @@ angular.module('syncthing.core')
             }
 
             console.log('UIOnline');
-            initController();
+
+            refreshSystem();
+            refreshConfig();
+            refreshConnectionStats();
+            refreshDeviceStats();
+            refreshFolderStats();
+
+            $http.get(urlbase + '/version').success(function (data) {
+                $scope.version = data.version;
+            }).error($scope.emitHTTPError);
+
+            $http.get(urlbase + '/report').success(function (data) {
+                $scope.reportData = data;
+            }).error($scope.emitHTTPError);
+
+            $http.get(urlbase + '/upgrade').success(function (data) {
+                $scope.upgradeInfo = data;
+            }).error(function () {
+                $scope.upgradeInfo = null;
+            });
+
             online = true;
             restarting = false;
             $('#networkError').modal('hide');

internal/config/config.go

@@ -26,10 +26,11 @@ import (
 	"reflect"
 	"sort"
 	"strconv"
+	"strings"
 
 	"github.com/calmh/logger"
+	"github.com/syncthing/protocol"
 	"github.com/syncthing/syncthing/internal/osutil"
-	"github.com/syncthing/syncthing/internal/protocol"
 	"golang.org/x/crypto/bcrypt"
 )
 
@@ -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,9 +19,10 @@ import (
 	"fmt"
 	"os"
 	"reflect"
+	"runtime"
 	"testing"
 
-	"github.com/syncthing/syncthing/internal/protocol"
+	"github.com/syncthing/protocol"
 )
 
 var device1, device2, device3, device4 protocol.DeviceID
@@ -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/config/wrapper.go

@@ -21,9 +21,9 @@ import (
 	"path/filepath"
 	"sync"
 
+	"github.com/syncthing/protocol"
 	"github.com/syncthing/syncthing/internal/events"
 	"github.com/syncthing/syncthing/internal/osutil"
-	"github.com/syncthing/syncthing/internal/protocol"
 )
 
 // An interface to handle configuration changes, and a wrapper type á la
@@ -264,6 +264,7 @@ func (w *Wrapper) Save() error {
 	if err != nil {
 		return err
 	}
+	defer os.Remove(fd.Name())
 
 	err = w.cfg.WriteXML(fd)
 	if err != nil {

internal/db/blockmap.go

@@ -13,14 +13,14 @@
 // 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 files provides a set type to track local/remote files with newness
+// Package db provides a set type to track local/remote files with newness
 // checks. We must do a certain amount of normalization in here. We will get
 // fed paths with either native or wire-format separators and encodings
 // depending on who calls us. We transform paths to wire-format (NFC and
 // slashes) on the way to the database, and transform to native format
 // (varying separator and encoding) on the way back out.
 
-package files
+package db
 
 import (
 	"bytes"
@@ -28,9 +28,9 @@ import (
 	"sort"
 	"sync"
 
+	"github.com/syncthing/protocol"
 	"github.com/syncthing/syncthing/internal/config"
 	"github.com/syncthing/syncthing/internal/osutil"
-	"github.com/syncthing/syncthing/internal/protocol"
 
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/util"
@@ -160,7 +160,7 @@ func (f *BlockFinder) Changed(cfg config.Configuration) error {
 // the block) or false to continue iterating for whatever reason.
 // The iterator finally returns the result, whether or not a satisfying block
 // was eventually found.
-func (f *BlockFinder) Iterate(hash []byte, iterFn func(string, string, uint32) bool) bool {
+func (f *BlockFinder) Iterate(hash []byte, iterFn func(string, string, int32) bool) bool {
 	f.mut.RLock()
 	folders := f.folders
 	f.mut.RUnlock()
@@ -171,7 +171,7 @@ func (f *BlockFinder) Iterate(hash []byte, iterFn func(string, string, uint32) b
 
 		for iter.Next() && iter.Error() == nil {
 			folder, file := fromBlockKey(iter.Key())
-			index := binary.BigEndian.Uint32(iter.Value())
+			index := int32(binary.BigEndian.Uint32(iter.Value()))
 			if iterFn(folder, osutil.NativeFilename(file), index) {
 				return true
 			}
@@ -182,7 +182,7 @@ func (f *BlockFinder) Iterate(hash []byte, iterFn func(string, string, uint32) b
 
 // A method for repairing incorrect blockmap entries, removes the old entry
 // and replaces it with a new entry for the given block
-func (f *BlockFinder) Fix(folder, file string, index uint32, oldHash, newHash []byte) error {
+func (f *BlockFinder) Fix(folder, file string, index int32, oldHash, newHash []byte) error {
 	buf := make([]byte, 4)
 	binary.BigEndian.PutUint32(buf, uint32(index))
 

internal/db/blockmap_test.go

@@ -13,13 +13,13 @@
 // 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 files
+package db
 
 import (
 	"testing"
 
+	"github.com/syncthing/protocol"
 	"github.com/syncthing/syncthing/internal/config"
-	"github.com/syncthing/syncthing/internal/protocol"
 
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/storage"
@@ -32,7 +32,7 @@ func genBlocks(n int) []protocol.BlockInfo {
 		for j := range h {
 			h[j] = byte(i + j)
 		}
-		b[i].Size = uint32(i)
+		b[i].Size = int32(i)
 		b[i].Hash = h
 	}
 	return b
@@ -103,21 +103,21 @@ func TestBlockMapAddUpdateWipe(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	f.Iterate(f1.Blocks[0].Hash, func(folder, file string, index uint32) bool {
+	f.Iterate(f1.Blocks[0].Hash, func(folder, file string, index int32) bool {
 		if folder != "folder1" || file != "f1" || index != 0 {
 			t.Fatal("Mismatch")
 		}
 		return true
 	})
 
-	f.Iterate(f2.Blocks[0].Hash, func(folder, file string, index uint32) bool {
+	f.Iterate(f2.Blocks[0].Hash, func(folder, file string, index int32) bool {
 		if folder != "folder1" || file != "f2" || index != 0 {
 			t.Fatal("Mismatch")
 		}
 		return true
 	})
 
-	f.Iterate(f3.Blocks[0].Hash, func(folder, file string, index uint32) bool {
+	f.Iterate(f3.Blocks[0].Hash, func(folder, file string, index int32) bool {
 		t.Fatal("Unexpected block")
 		return true
 	})
@@ -132,17 +132,17 @@ func TestBlockMapAddUpdateWipe(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	f.Iterate(f1.Blocks[0].Hash, func(folder, file string, index uint32) bool {
+	f.Iterate(f1.Blocks[0].Hash, func(folder, file string, index int32) bool {
 		t.Fatal("Unexpected block")
 		return false
 	})
 
-	f.Iterate(f2.Blocks[0].Hash, func(folder, file string, index uint32) bool {
+	f.Iterate(f2.Blocks[0].Hash, func(folder, file string, index int32) bool {
 		t.Fatal("Unexpected block")
 		return false
 	})
 
-	f.Iterate(f3.Blocks[0].Hash, func(folder, file string, index uint32) bool {
+	f.Iterate(f3.Blocks[0].Hash, func(folder, file string, index int32) bool {
 		if folder != "folder1" || file != "f3" || index != 0 {
 			t.Fatal("Mismatch")
 		}
@@ -189,7 +189,7 @@ func TestBlockFinderLookup(t *testing.T) {
 	}
 
 	counter := 0
-	f.Iterate(f1.Blocks[0].Hash, func(folder, file string, index uint32) bool {
+	f.Iterate(f1.Blocks[0].Hash, func(folder, file string, index int32) bool {
 		counter++
 		switch counter {
 		case 1:
@@ -217,7 +217,7 @@ func TestBlockFinderLookup(t *testing.T) {
 	}
 
 	counter = 0
-	f.Iterate(f1.Blocks[0].Hash, func(folder, file string, index uint32) bool {
+	f.Iterate(f1.Blocks[0].Hash, func(folder, file string, index int32) bool {
 		counter++
 		switch counter {
 		case 1:
@@ -239,7 +239,7 @@ func TestBlockFinderLookup(t *testing.T) {
 func TestBlockFinderFix(t *testing.T) {
 	db, f := setup()
 
-	iterFn := func(folder, file string, index uint32) bool {
+	iterFn := func(folder, file string, index int32) bool {
 		return true
 	}
 

internal/db/concurrency_test.go

@@ -13,7 +13,7 @@
 // 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 files_test
+package db_test
 
 import (
 	"crypto/rand"

internal/db/debug.go

@@ -13,7 +13,7 @@
 // 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 files
+package db
 
 import (
 	"os"

internal/db/leveldb.go

@@ -16,7 +16,7 @@
 //go:generate -command genxdr go run ../../Godeps/_workspace/src/github.com/calmh/xdr/cmd/genxdr/main.go
 //go:generate genxdr -o leveldb_xdr.go leveldb.go
 
-package files
+package db
 
 import (
 	"bytes"
@@ -25,8 +25,8 @@ import (
 	"sort"
 	"sync"
 
+	"github.com/syncthing/protocol"
 	"github.com/syncthing/syncthing/internal/lamport"
-	"github.com/syncthing/syncthing/internal/protocol"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/iterator"
 	"github.com/syndtr/goleveldb/leveldb/opt"
@@ -34,11 +34,11 @@ import (
 )
 
 var (
-	clockTick uint64
+	clockTick int64
 	clockMut  sync.Mutex
 )
 
-func clock(v uint64) uint64 {
+func clock(v int64) int64 {
 	clockMut.Lock()
 	defer clockMut.Unlock()
 	if v > clockTick {
@@ -56,7 +56,7 @@ const (
 )
 
 type fileVersion struct {
-	version uint64
+	version int64
 	device  []byte
 }
 
@@ -164,9 +164,9 @@ func globalKeyFolder(key []byte) []byte {
 	return folder[:izero]
 }
 
-type deletionHandler func(db dbReader, batch dbWriter, folder, device, name []byte, dbi iterator.Iterator) uint64
+type deletionHandler func(db dbReader, batch dbWriter, folder, device, name []byte, dbi iterator.Iterator) int64
 
-func ldbGenericReplace(db *leveldb.DB, folder, device []byte, fs []protocol.FileInfo, deleteFn deletionHandler) uint64 {
+func ldbGenericReplace(db *leveldb.DB, folder, device []byte, fs []protocol.FileInfo, deleteFn deletionHandler) int64 {
 	runtime.GC()
 
 	sort.Sort(fileList(fs)) // sort list on name, same as in the database
@@ -197,7 +197,7 @@ func ldbGenericReplace(db *leveldb.DB, folder, device []byte, fs []protocol.File
 
 	moreDb := dbi.Next()
 	fsi := 0
-	var maxLocalVer uint64
+	var maxLocalVer int64
 
 	for {
 		var newName, oldName []byte
@@ -288,9 +288,9 @@ func ldbGenericReplace(db *leveldb.DB, folder, device []byte, fs []protocol.File
 	return maxLocalVer
 }
 
-func ldbReplace(db *leveldb.DB, folder, device []byte, fs []protocol.FileInfo) uint64 {
+func ldbReplace(db *leveldb.DB, folder, device []byte, fs []protocol.FileInfo) int64 {
 	// TODO: Return the remaining maxLocalVer?
-	return ldbGenericReplace(db, folder, device, fs, func(db dbReader, batch dbWriter, folder, device, name []byte, dbi iterator.Iterator) uint64 {
+	return ldbGenericReplace(db, folder, device, fs, func(db dbReader, batch dbWriter, folder, device, name []byte, dbi iterator.Iterator) int64 {
 		// Database has a file that we are missing. Remove it.
 		if debugDB {
 			l.Debugf("delete; folder=%q device=%v name=%q", folder, protocol.DeviceIDFromBytes(device), name)
@@ -304,8 +304,8 @@ func ldbReplace(db *leveldb.DB, folder, device []byte, fs []protocol.FileInfo) u
 	})
 }
 
-func ldbReplaceWithDelete(db *leveldb.DB, folder, device []byte, fs []protocol.FileInfo) uint64 {
-	return ldbGenericReplace(db, folder, device, fs, func(db dbReader, batch dbWriter, folder, device, name []byte, dbi iterator.Iterator) uint64 {
+func ldbReplaceWithDelete(db *leveldb.DB, folder, device []byte, fs []protocol.FileInfo) int64 {
+	return ldbGenericReplace(db, folder, device, fs, func(db dbReader, batch dbWriter, folder, device, name []byte, dbi iterator.Iterator) int64 {
 		var tf FileInfoTruncated
 		err := tf.UnmarshalXDR(dbi.Value())
 		if err != nil {
@@ -335,7 +335,7 @@ func ldbReplaceWithDelete(db *leveldb.DB, folder, device []byte, fs []protocol.F
 	})
 }
 
-func ldbUpdate(db *leveldb.DB, folder, device []byte, fs []protocol.FileInfo) uint64 {
+func ldbUpdate(db *leveldb.DB, folder, device []byte, fs []protocol.FileInfo) int64 {
 	runtime.GC()
 
 	batch := new(leveldb.Batch)
@@ -356,7 +356,7 @@ func ldbUpdate(db *leveldb.DB, folder, device []byte, fs []protocol.FileInfo) ui
 		snap.Release()
 	}()
 
-	var maxLocalVer uint64
+	var maxLocalVer int64
 	for _, f := range fs {
 		name := []byte(f.Name)
 		fk := deviceKey(folder, device, name)
@@ -406,7 +406,7 @@ func ldbUpdate(db *leveldb.DB, folder, device []byte, fs []protocol.FileInfo) ui
 	return maxLocalVer
 }
 
-func ldbInsert(batch dbWriter, folder, device []byte, file protocol.FileInfo) uint64 {
+func ldbInsert(batch dbWriter, folder, device []byte, file protocol.FileInfo) int64 {
 	if debugDB {
 		l.Debugf("insert; folder=%q device=%v %v", folder, protocol.DeviceIDFromBytes(device), file)
 	}
@@ -428,7 +428,7 @@ func ldbInsert(batch dbWriter, folder, device []byte, file protocol.FileInfo) ui
 // ldbUpdateGlobal adds this device+version to the version list for the given
 // file. If the device is already present in the list, the version is updated.
 // If the file does not have an entry in the global list, it is created.
-func ldbUpdateGlobal(db dbReader, batch dbWriter, folder, device, file []byte, version uint64) bool {
+func ldbUpdateGlobal(db dbReader, batch dbWriter, folder, device, file []byte, version int64) bool {
 	if debugDB {
 		l.Debugf("update global; folder=%q device=%v file=%q version=%d", folder, protocol.DeviceIDFromBytes(device), file, version)
 	}
@@ -586,6 +586,17 @@ func ldbWithAllFolderTruncated(db *leveldb.DB, folder []byte, fn func(device []b
 		if err != nil {
 			panic(err)
 		}
+
+		switch f.Name {
+		case "", ".", "..", "/": // A few obviously invalid filenames
+			l.Infof("Dropping invalid filename %q from database", f.Name)
+			batch := new(leveldb.Batch)
+			ldbRemoveFromGlobal(db, batch, folder, device, nil)
+			batch.Delete(dbi.Key())
+			db.Write(batch, nil)
+			continue
+		}
+
 		if cont := fn(device, f); !cont {
 			return
 		}
@@ -787,7 +798,7 @@ outer:
 
 		have := false // If we have the file, any version
 		need := false // If we have a lower version of the file
-		var haveVersion uint64
+		var haveVersion int64
 		for _, v := range vl.versions {
 			if bytes.Compare(v.device, device) == 0 {
 				have = true

internal/db/leveldb_test.go

@@ -13,7 +13,7 @@
 // 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 files
+package db
 
 import (
 	"bytes"

internal/db/leveldb_xdr.go

@@ -2,7 +2,7 @@
 // This file is automatically generated by genxdr. Do not edit.
 // ************************************************************
 
-package files
+package db
 
 import (
 	"bytes"
@@ -31,7 +31,7 @@ fileVersion Structure:
 
 
 struct fileVersion {
-	unsigned hyper version;
+	hyper version;
 	opaque device<>;
 }
 
@@ -62,7 +62,7 @@ func (o fileVersion) AppendXDR(bs []byte) ([]byte, error) {
 }
 
 func (o fileVersion) encodeXDR(xw *xdr.Writer) (int, error) {
-	xw.WriteUint64(o.version)
+	xw.WriteUint64(uint64(o.version))
 	xw.WriteBytes(o.device)
 	return xw.Tot(), xw.Error()
 }
@@ -79,7 +79,7 @@ func (o *fileVersion) UnmarshalXDR(bs []byte) error {
 }
 
 func (o *fileVersion) decodeXDR(xr *xdr.Reader) error {
-	o.version = xr.ReadUint64()
+	o.version = int64(xr.ReadUint64())
 	o.device = xr.ReadBytes()
 	return xr.Error()
 }

internal/db/set.go

@@ -13,25 +13,25 @@
 // 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 files provides a set type to track local/remote files with newness
+// Package db provides a set type to track local/remote files with newness
 // checks. We must do a certain amount of normalization in here. We will get
 // fed paths with either native or wire-format separators and encodings
 // depending on who calls us. We transform paths to wire-format (NFC and
 // slashes) on the way to the database, and transform to native format
 // (varying separator and encoding) on the way back out.
-package files
+package db
 
 import (
 	"sync"
 
+	"github.com/syncthing/protocol"
 	"github.com/syncthing/syncthing/internal/lamport"
 	"github.com/syncthing/syncthing/internal/osutil"
-	"github.com/syncthing/syncthing/internal/protocol"
 	"github.com/syndtr/goleveldb/leveldb"
 )
 
-type Set struct {
-	localVersion map[protocol.DeviceID]uint64
+type FileSet struct {
+	localVersion map[protocol.DeviceID]int64
 	mutex        sync.Mutex
 	folder       string
 	db           *leveldb.DB
@@ -54,9 +54,9 @@ type FileIntf interface {
 // continue iteration, false to stop.
 type Iterator func(f FileIntf) bool
 
-func NewSet(folder string, db *leveldb.DB) *Set {
-	var s = Set{
-		localVersion: make(map[protocol.DeviceID]uint64),
+func NewFileSet(folder string, db *leveldb.DB) *FileSet {
+	var s = FileSet{
+		localVersion: make(map[protocol.DeviceID]int64),
 		folder:       folder,
 		db:           db,
 		blockmap:     NewBlockMap(db, folder),
@@ -81,7 +81,7 @@ func NewSet(folder string, db *leveldb.DB) *Set {
 	return &s
 }
 
-func (s *Set) Replace(device protocol.DeviceID, fs []protocol.FileInfo) {
+func (s *FileSet) Replace(device protocol.DeviceID, fs []protocol.FileInfo) {
 	if debug {
 		l.Debugf("%s Replace(%v, [%d])", s.folder, device, len(fs))
 	}
@@ -99,7 +99,7 @@ func (s *Set) Replace(device protocol.DeviceID, fs []protocol.FileInfo) {
 	}
 }
 
-func (s *Set) ReplaceWithDelete(device protocol.DeviceID, fs []protocol.FileInfo) {
+func (s *FileSet) ReplaceWithDelete(device protocol.DeviceID, fs []protocol.FileInfo) {
 	if debug {
 		l.Debugf("%s ReplaceWithDelete(%v, [%d])", s.folder, device, len(fs))
 	}
@@ -115,7 +115,7 @@ func (s *Set) ReplaceWithDelete(device protocol.DeviceID, fs []protocol.FileInfo
 	}
 }
 
-func (s *Set) Update(device protocol.DeviceID, fs []protocol.FileInfo) {
+func (s *FileSet) Update(device protocol.DeviceID, fs []protocol.FileInfo) {
 	if debug {
 		l.Debugf("%s Update(%v, [%d])", s.folder, device, len(fs))
 	}
@@ -140,55 +140,55 @@ func (s *Set) Update(device protocol.DeviceID, fs []protocol.FileInfo) {
 	}
 }
 
-func (s *Set) WithNeed(device protocol.DeviceID, fn Iterator) {
+func (s *FileSet) WithNeed(device protocol.DeviceID, fn Iterator) {
 	if debug {
 		l.Debugf("%s WithNeed(%v)", s.folder, device)
 	}
 	ldbWithNeed(s.db, []byte(s.folder), device[:], false, nativeFileIterator(fn))
 }
 
-func (s *Set) WithNeedTruncated(device protocol.DeviceID, fn Iterator) {
+func (s *FileSet) WithNeedTruncated(device protocol.DeviceID, fn Iterator) {
 	if debug {
 		l.Debugf("%s WithNeedTruncated(%v)", s.folder, device)
 	}
 	ldbWithNeed(s.db, []byte(s.folder), device[:], true, nativeFileIterator(fn))
 }
 
-func (s *Set) WithHave(device protocol.DeviceID, fn Iterator) {
+func (s *FileSet) WithHave(device protocol.DeviceID, fn Iterator) {
 	if debug {
 		l.Debugf("%s WithHave(%v)", s.folder, device)
 	}
 	ldbWithHave(s.db, []byte(s.folder), device[:], false, nativeFileIterator(fn))
 }
 
-func (s *Set) WithHaveTruncated(device protocol.DeviceID, fn Iterator) {
+func (s *FileSet) WithHaveTruncated(device protocol.DeviceID, fn Iterator) {
 	if debug {
 		l.Debugf("%s WithHaveTruncated(%v)", s.folder, device)
 	}
 	ldbWithHave(s.db, []byte(s.folder), device[:], true, nativeFileIterator(fn))
 }
 
-func (s *Set) WithGlobal(fn Iterator) {
+func (s *FileSet) WithGlobal(fn Iterator) {
 	if debug {
 		l.Debugf("%s WithGlobal()", s.folder)
 	}
 	ldbWithGlobal(s.db, []byte(s.folder), false, nativeFileIterator(fn))
 }
 
-func (s *Set) WithGlobalTruncated(fn Iterator) {
+func (s *FileSet) WithGlobalTruncated(fn Iterator) {
 	if debug {
 		l.Debugf("%s WithGlobalTruncated()", s.folder)
 	}
 	ldbWithGlobal(s.db, []byte(s.folder), true, nativeFileIterator(fn))
 }
 
-func (s *Set) Get(device protocol.DeviceID, file string) (protocol.FileInfo, bool) {
+func (s *FileSet) Get(device protocol.DeviceID, file string) (protocol.FileInfo, bool) {
 	f, ok := ldbGet(s.db, []byte(s.folder), device[:], []byte(osutil.NormalizedFilename(file)))
 	f.Name = osutil.NativeFilename(f.Name)
 	return f, ok
 }
 
-func (s *Set) GetGlobal(file string) (protocol.FileInfo, bool) {
+func (s *FileSet) GetGlobal(file string) (protocol.FileInfo, bool) {
 	fi, ok := ldbGetGlobal(s.db, []byte(s.folder), []byte(osutil.NormalizedFilename(file)), false)
 	if !ok {
 		return protocol.FileInfo{}, false
@@ -198,7 +198,7 @@ func (s *Set) GetGlobal(file string) (protocol.FileInfo, bool) {
 	return f, true
 }
 
-func (s *Set) GetGlobalTruncated(file string) (FileInfoTruncated, bool) {
+func (s *FileSet) GetGlobalTruncated(file string) (FileInfoTruncated, bool) {
 	fi, ok := ldbGetGlobal(s.db, []byte(s.folder), []byte(osutil.NormalizedFilename(file)), true)
 	if !ok {
 		return FileInfoTruncated{}, false
@@ -208,11 +208,11 @@ func (s *Set) GetGlobalTruncated(file string) (FileInfoTruncated, bool) {
 	return f, true
 }
 
-func (s *Set) Availability(file string) []protocol.DeviceID {
+func (s *FileSet) Availability(file string) []protocol.DeviceID {
 	return ldbAvailability(s.db, []byte(s.folder), []byte(osutil.NormalizedFilename(file)))
 }
 
-func (s *Set) LocalVersion(device protocol.DeviceID) uint64 {
+func (s *FileSet) LocalVersion(device protocol.DeviceID) int64 {
 	s.mutex.Lock()
 	defer s.mutex.Unlock()
 	return s.localVersion[device]

internal/db/set_test.go

@@ -13,7 +13,7 @@
 // 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 files_test
+package db_test
 
 import (
 	"bytes"
@@ -22,9 +22,9 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/syncthing/syncthing/internal/files"
+	"github.com/syncthing/protocol"
+	"github.com/syncthing/syncthing/internal/db"
 	"github.com/syncthing/syncthing/internal/lamport"
-	"github.com/syncthing/syncthing/internal/protocol"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/storage"
 )
@@ -43,15 +43,15 @@ func genBlocks(n int) []protocol.BlockInfo {
 		for j := range h {
 			h[j] = byte(i + j)
 		}
-		b[i].Size = uint32(i)
+		b[i].Size = int32(i)
 		b[i].Hash = h
 	}
 	return b
 }
 
-func globalList(s *files.Set) []protocol.FileInfo {
+func globalList(s *db.FileSet) []protocol.FileInfo {
 	var fs []protocol.FileInfo
-	s.WithGlobal(func(fi files.FileIntf) bool {
+	s.WithGlobal(func(fi db.FileIntf) bool {
 		f := fi.(protocol.FileInfo)
 		fs = append(fs, f)
 		return true
@@ -59,9 +59,9 @@ func globalList(s *files.Set) []protocol.FileInfo {
 	return fs
 }
 
-func haveList(s *files.Set, n protocol.DeviceID) []protocol.FileInfo {
+func haveList(s *db.FileSet, n protocol.DeviceID) []protocol.FileInfo {
 	var fs []protocol.FileInfo
-	s.WithHave(n, func(fi files.FileIntf) bool {
+	s.WithHave(n, func(fi db.FileIntf) bool {
 		f := fi.(protocol.FileInfo)
 		fs = append(fs, f)
 		return true
@@ -69,9 +69,9 @@ func haveList(s *files.Set, n protocol.DeviceID) []protocol.FileInfo {
 	return fs
 }
 
-func needList(s *files.Set, n protocol.DeviceID) []protocol.FileInfo {
+func needList(s *db.FileSet, n protocol.DeviceID) []protocol.FileInfo {
 	var fs []protocol.FileInfo
-	s.WithNeed(n, func(fi files.FileIntf) bool {
+	s.WithNeed(n, func(fi db.FileIntf) bool {
 		f := fi.(protocol.FileInfo)
 		fs = append(fs, f)
 		return true
@@ -106,12 +106,12 @@ func (l fileList) String() string {
 func TestGlobalSet(t *testing.T) {
 	lamport.Default = lamport.Clock{}
 
-	db, err := leveldb.Open(storage.NewMemStorage(), nil)
+	ldb, err := leveldb.Open(storage.NewMemStorage(), nil)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	m := files.NewSet("test", db)
+	m := db.NewFileSet("test", ldb)
 
 	local0 := fileList{
 		protocol.FileInfo{Name: "a", Version: 1000, Blocks: genBlocks(1)},
@@ -267,12 +267,12 @@ func TestGlobalSet(t *testing.T) {
 func TestNeedWithInvalid(t *testing.T) {
 	lamport.Default = lamport.Clock{}
 
-	db, err := leveldb.Open(storage.NewMemStorage(), nil)
+	ldb, err := leveldb.Open(storage.NewMemStorage(), nil)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	s := files.NewSet("test", db)
+	s := db.NewFileSet("test", ldb)
 
 	localHave := fileList{
 		protocol.FileInfo{Name: "a", Version: 1000, Blocks: genBlocks(1)},
@@ -309,12 +309,12 @@ func TestNeedWithInvalid(t *testing.T) {
 func TestUpdateToInvalid(t *testing.T) {
 	lamport.Default = lamport.Clock{}
 
-	db, err := leveldb.Open(storage.NewMemStorage(), nil)
+	ldb, err := leveldb.Open(storage.NewMemStorage(), nil)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	s := files.NewSet("test", db)
+	s := db.NewFileSet("test", ldb)
 
 	localHave := fileList{
 		protocol.FileInfo{Name: "a", Version: 1000, Blocks: genBlocks(1)},
@@ -346,12 +346,12 @@ func TestUpdateToInvalid(t *testing.T) {
 func TestInvalidAvailability(t *testing.T) {
 	lamport.Default = lamport.Clock{}
 
-	db, err := leveldb.Open(storage.NewMemStorage(), nil)
+	ldb, err := leveldb.Open(storage.NewMemStorage(), nil)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	s := files.NewSet("test", db)
+	s := db.NewFileSet("test", ldb)
 
 	remote0Have := fileList{
 		protocol.FileInfo{Name: "both", Version: 1001, Blocks: genBlocks(2)},
@@ -387,11 +387,11 @@ func TestInvalidAvailability(t *testing.T) {
 }
 
 func TestLocalDeleted(t *testing.T) {
-	db, err := leveldb.Open(storage.NewMemStorage(), nil)
+	ldb, err := leveldb.Open(storage.NewMemStorage(), nil)
 	if err != nil {
 		t.Fatal(err)
 	}
-	m := files.NewSet("test", db)
+	m := db.NewFileSet("test", ldb)
 	lamport.Default = lamport.Clock{}
 
 	local1 := []protocol.FileInfo{
@@ -462,7 +462,7 @@ func TestLocalDeleted(t *testing.T) {
 }
 
 func Benchmark10kReplace(b *testing.B) {
-	db, err := leveldb.Open(storage.NewMemStorage(), nil)
+	ldb, err := leveldb.Open(storage.NewMemStorage(), nil)
 	if err != nil {
 		b.Fatal(err)
 	}
@@ -474,7 +474,7 @@ func Benchmark10kReplace(b *testing.B) {
 
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		m := files.NewSet("test", db)
+		m := db.NewFileSet("test", ldb)
 		m.ReplaceWithDelete(protocol.LocalDeviceID, local)
 	}
 }
@@ -485,12 +485,12 @@ func Benchmark10kUpdateChg(b *testing.B) {
 		remote = append(remote, protocol.FileInfo{Name: fmt.Sprintf("file%d", i), Version: 1000})
 	}
 
-	db, err := leveldb.Open(storage.NewMemStorage(), nil)
+	ldb, err := leveldb.Open(storage.NewMemStorage(), nil)
 	if err != nil {
 		b.Fatal(err)
 	}
 
-	m := files.NewSet("test", db)
+	m := db.NewFileSet("test", ldb)
 	m.Replace(remoteDevice0, remote)
 
 	var local []protocol.FileInfo
@@ -517,11 +517,11 @@ func Benchmark10kUpdateSme(b *testing.B) {
 		remote = append(remote, protocol.FileInfo{Name: fmt.Sprintf("file%d", i), Version: 1000})
 	}
 
-	db, err := leveldb.Open(storage.NewMemStorage(), nil)
+	ldb, err := leveldb.Open(storage.NewMemStorage(), nil)
 	if err != nil {
 		b.Fatal(err)
 	}
-	m := files.NewSet("test", db)
+	m := db.NewFileSet("test", ldb)
 	m.Replace(remoteDevice0, remote)
 
 	var local []protocol.FileInfo
@@ -543,12 +543,12 @@ func Benchmark10kNeed2k(b *testing.B) {
 		remote = append(remote, protocol.FileInfo{Name: fmt.Sprintf("file%d", i), Version: 1000})
 	}
 
-	db, err := leveldb.Open(storage.NewMemStorage(), nil)
+	ldb, err := leveldb.Open(storage.NewMemStorage(), nil)
 	if err != nil {
 		b.Fatal(err)
 	}
 
-	m := files.NewSet("test", db)
+	m := db.NewFileSet("test", ldb)
 	m.Replace(remoteDevice0, remote)
 
 	var local []protocol.FileInfo
@@ -576,12 +576,12 @@ func Benchmark10kHaveFullList(b *testing.B) {
 		remote = append(remote, protocol.FileInfo{Name: fmt.Sprintf("file%d", i), Version: 1000})
 	}
 
-	db, err := leveldb.Open(storage.NewMemStorage(), nil)
+	ldb, err := leveldb.Open(storage.NewMemStorage(), nil)
 	if err != nil {
 		b.Fatal(err)
 	}
 
-	m := files.NewSet("test", db)
+	m := db.NewFileSet("test", ldb)
 	m.Replace(remoteDevice0, remote)
 
 	var local []protocol.FileInfo
@@ -609,12 +609,12 @@ func Benchmark10kGlobal(b *testing.B) {
 		remote = append(remote, protocol.FileInfo{Name: fmt.Sprintf("file%d", i), Version: 1000})
 	}
 
-	db, err := leveldb.Open(storage.NewMemStorage(), nil)
+	ldb, err := leveldb.Open(storage.NewMemStorage(), nil)
 	if err != nil {
 		b.Fatal(err)
 	}
 
-	m := files.NewSet("test", db)
+	m := db.NewFileSet("test", ldb)
 	m.Replace(remoteDevice0, remote)
 
 	var local []protocol.FileInfo
@@ -637,12 +637,12 @@ func Benchmark10kGlobal(b *testing.B) {
 }
 
 func TestGlobalReset(t *testing.T) {
-	db, err := leveldb.Open(storage.NewMemStorage(), nil)
+	ldb, err := leveldb.Open(storage.NewMemStorage(), nil)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	m := files.NewSet("test", db)
+	m := db.NewFileSet("test", ldb)
 
 	local := []protocol.FileInfo{
 		{Name: "a", Version: 1000},
@@ -678,12 +678,12 @@ func TestGlobalReset(t *testing.T) {
 }
 
 func TestNeed(t *testing.T) {
-	db, err := leveldb.Open(storage.NewMemStorage(), nil)
+	ldb, err := leveldb.Open(storage.NewMemStorage(), nil)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	m := files.NewSet("test", db)
+	m := db.NewFileSet("test", ldb)
 
 	local := []protocol.FileInfo{
 		{Name: "a", Version: 1000},
@@ -719,12 +719,12 @@ func TestNeed(t *testing.T) {
 }
 
 func TestLocalVersion(t *testing.T) {
-	db, err := leveldb.Open(storage.NewMemStorage(), nil)
+	ldb, err := leveldb.Open(storage.NewMemStorage(), nil)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	m := files.NewSet("test", db)
+	m := db.NewFileSet("test", ldb)
 
 	local1 := []protocol.FileInfo{
 		{Name: "a", Version: 1000},
@@ -758,12 +758,12 @@ func TestLocalVersion(t *testing.T) {
 }
 
 func TestListDropFolder(t *testing.T) {
-	db, err := leveldb.Open(storage.NewMemStorage(), nil)
+	ldb, err := leveldb.Open(storage.NewMemStorage(), nil)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	s0 := files.NewSet("test0", db)
+	s0 := db.NewFileSet("test0", ldb)
 	local1 := []protocol.FileInfo{
 		{Name: "a", Version: 1000},
 		{Name: "b", Version: 1000},
@@ -771,7 +771,7 @@ func TestListDropFolder(t *testing.T) {
 	}
 	s0.Replace(protocol.LocalDeviceID, local1)
 
-	s1 := files.NewSet("test1", db)
+	s1 := db.NewFileSet("test1", ldb)
 	local2 := []protocol.FileInfo{
 		{Name: "d", Version: 1002},
 		{Name: "e", Version: 1002},
@@ -782,7 +782,7 @@ func TestListDropFolder(t *testing.T) {
 	// Check that we have both folders and their data is in the global list
 
 	expectedFolderList := []string{"test0", "test1"}
-	if actualFolderList := files.ListFolders(db); !reflect.DeepEqual(actualFolderList, expectedFolderList) {
+	if actualFolderList := db.ListFolders(ldb); !reflect.DeepEqual(actualFolderList, expectedFolderList) {
 		t.Fatalf("FolderList mismatch\nE: %v\nA: %v", expectedFolderList, actualFolderList)
 	}
 	if l := len(globalList(s0)); l != 3 {
@@ -794,10 +794,10 @@ func TestListDropFolder(t *testing.T) {
 
 	// Drop one of them and check that it's gone.
 
-	files.DropFolder(db, "test1")
+	db.DropFolder(ldb, "test1")
 
 	expectedFolderList = []string{"test0"}
-	if actualFolderList := files.ListFolders(db); !reflect.DeepEqual(actualFolderList, expectedFolderList) {
+	if actualFolderList := db.ListFolders(ldb); !reflect.DeepEqual(actualFolderList, expectedFolderList) {
 		t.Fatalf("FolderList mismatch\nE: %v\nA: %v", expectedFolderList, actualFolderList)
 	}
 	if l := len(globalList(s0)); l != 3 {
@@ -809,12 +809,12 @@ func TestListDropFolder(t *testing.T) {
 }
 
 func TestGlobalNeedWithInvalid(t *testing.T) {
-	db, err := leveldb.Open(storage.NewMemStorage(), nil)
+	ldb, err := leveldb.Open(storage.NewMemStorage(), nil)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	s := files.NewSet("test1", db)
+	s := db.NewFileSet("test1", ldb)
 
 	rem0 := fileList{
 		protocol.FileInfo{Name: "a", Version: 1002, Blocks: genBlocks(4)},
@@ -849,12 +849,12 @@ func TestGlobalNeedWithInvalid(t *testing.T) {
 }
 
 func TestLongPath(t *testing.T) {
-	db, err := leveldb.Open(storage.NewMemStorage(), nil)
+	ldb, err := leveldb.Open(storage.NewMemStorage(), nil)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	s := files.NewSet("test", db)
+	s := db.NewFileSet("test", ldb)
 
 	var b bytes.Buffer
 	for i := 0; i < 100; i++ {

internal/db/truncated.go

@@ -16,12 +16,12 @@
 //go:generate -command genxdr go run ../../Godeps/_workspace/src/github.com/calmh/xdr/cmd/genxdr/main.go
 //go:generate genxdr -o truncated_xdr.go truncated.go
 
-package files
+package db
 
 import (
 	"fmt"
 
-	"github.com/syncthing/syncthing/internal/protocol"
+	"github.com/syncthing/protocol"
 )
 
 // Used for unmarshalling a FileInfo structure but skipping the block list.
@@ -29,9 +29,20 @@ type FileInfoTruncated struct {
 	Name         string // max:8192
 	Flags        uint32
 	Modified     int64
-	Version      uint64
-	LocalVersion uint64
-	NumBlocks    uint32
+	Version      int64
+	LocalVersion int64
+	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 {
@@ -44,7 +55,7 @@ func (f FileInfoTruncated) Size() int64 {
 	if f.IsDeleted() || f.IsDirectory() {
 		return 128
 	}
-	return BlocksToSize(f.NumBlocks)
+	return BlocksToSize(int(f.NumBlocks))
 }
 
 func (f FileInfoTruncated) IsDeleted() bool {
@@ -67,7 +78,7 @@ func (f FileInfoTruncated) HasPermissionBits() bool {
 	return f.Flags&protocol.FlagNoPermBits == 0
 }
 
-func BlocksToSize(num uint32) int64 {
+func BlocksToSize(num int) int64 {
 	if num < 2 {
 		return protocol.BlockSize / 2
 	}

internal/db/truncated_xdr.go

@@ -2,7 +2,7 @@
 // This file is automatically generated by genxdr. Do not edit.
 // ************************************************************
 
-package files
+package db
 
 import (
 	"bytes"
@@ -46,9 +46,9 @@ struct FileInfoTruncated {
 	string Name<8192>;
 	unsigned int Flags;
 	hyper Modified;
-	unsigned hyper Version;
-	unsigned hyper LocalVersion;
-	unsigned int NumBlocks;
+	hyper Version;
+	hyper LocalVersion;
+	int NumBlocks;
 }
 
 */
@@ -84,9 +84,9 @@ func (o FileInfoTruncated) encodeXDR(xw *xdr.Writer) (int, error) {
 	xw.WriteString(o.Name)
 	xw.WriteUint32(o.Flags)
 	xw.WriteUint64(uint64(o.Modified))
-	xw.WriteUint64(o.Version)
-	xw.WriteUint64(o.LocalVersion)
-	xw.WriteUint32(o.NumBlocks)
+	xw.WriteUint64(uint64(o.Version))
+	xw.WriteUint64(uint64(o.LocalVersion))
+	xw.WriteUint32(uint32(o.NumBlocks))
 	return xw.Tot(), xw.Error()
 }
 
@@ -105,8 +105,8 @@ func (o *FileInfoTruncated) decodeXDR(xr *xdr.Reader) error {
 	o.Name = xr.ReadStringMax(8192)
 	o.Flags = xr.ReadUint32()
 	o.Modified = int64(xr.ReadUint64())
-	o.Version = xr.ReadUint64()
-	o.LocalVersion = xr.ReadUint64()
-	o.NumBlocks = xr.ReadUint32()
+	o.Version = int64(xr.ReadUint64())
+	o.LocalVersion = int64(xr.ReadUint64())
+	o.NumBlocks = int32(xr.ReadUint32())
 	return xr.Error()
 }

internal/discover/client.go

@@ -20,7 +20,7 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/syncthing/syncthing/internal/protocol"
+	"github.com/syncthing/protocol"
 )
 
 type Factory func(*url.URL, *Announce) (Client, error)

internal/discover/client_test.go

@@ -23,7 +23,7 @@ import (
 
 	"testing"
 
-	"github.com/syncthing/syncthing/internal/protocol"
+	"github.com/syncthing/protocol"
 )
 
 var device protocol.DeviceID

internal/discover/client_udp.go

@@ -24,7 +24,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/syncthing/syncthing/internal/protocol"
+	"github.com/syncthing/protocol"
 )
 
 func init() {

internal/discover/discover.go

@@ -25,9 +25,9 @@ import (
 	"sync"
 	"time"
 
+	"github.com/syncthing/protocol"
 	"github.com/syncthing/syncthing/internal/beacon"
 	"github.com/syncthing/syncthing/internal/events"
-	"github.com/syncthing/syncthing/internal/protocol"
 )
 
 type Discoverer struct {