Fix build on Solaris

Conflicts:
	internal/config/config_test.go

CONTRIBUTING.md

@@ -39,6 +39,17 @@ attention. In general, any open issues are fair game! Be prepared for a
 review](https://discourse.syncthing.net/t/733); it's all in the name of
 quality. :)
 
+You may be asked to "rebase" or "squash" your pull request before it's
+accepted. This means to make sure that the pull request:
+
+ - Is based on the latest commit on `master`.
+
+ - Only contains a single commit (exceptions to be made where
+   appropriate).
+
+ - Has a descriptive commit message, ending in `(fixes #123)` if it
+   resolves an existing issue.
+
 ## Licensing
 
 All contributions are made under the same MIT License as the rest of the

CONTRIBUTORS

@@ -8,6 +8,7 @@ Brandon Philips <brandon@ifup.org>
 Gilli Sigurdsson <gilli@vx.is>
 James Patterson <jamespatterson@operamail.com> <jpjp@users.noreply.github.com>
 Jens Diemer <github.com@jensdiemer.de> <git@jensdiemer.de>
+Lode Hoste <zillode@zillode.be>
 Marcin Dziadus <dziadus.marcin@gmail.com>
 Michael Tilli <pyfisch@gmail.com>
 Philippe Schommers <philippe@schommers.be>

Godeps/Godeps.json

@@ -37,7 +37,7 @@
 		},
 		{
 			"ImportPath": "github.com/bkaradzic/go-lz4",
-			"Rev": "77e2ba877bde9da31213bec75dbbe197fa507c21"
+			"Rev": "93a831dcee242be64a9cc9803dda84af25932de7"
 		},
 		{
 			"ImportPath": "github.com/calmh/xdr",
@@ -49,7 +49,7 @@
 		},
 		{
 			"ImportPath": "github.com/syndtr/goleveldb/leveldb",
-			"Rev": "2b99e8d4757bf06eeab1b0485d80b8ae1c088874"
+			"Rev": "9bca75c48d6c31becfbb127702b425e7226052e3"
 		},
 		{
 			"ImportPath": "github.com/vitrun/qart/coding",

Godeps/_workspace/src/github.com/bkaradzic/go-lz4/lz4-example/main.go

@@ -72,10 +72,18 @@ func main() {
 
 	if *decompress {
 		data, _ = ioutil.ReadAll(input)
-		data, _ = lz4.Decode(nil, data)
+		data, err = lz4.Decode(nil, data)
+		if err != nil {
+			fmt.Println("Failed to decode:", err)
+			return
+		}
 	} else {
 		data, _ = ioutil.ReadAll(input)
-		data, _ = lz4.Encode(nil, data)
+		data, err = lz4.Encode(nil, data)
+		if err != nil {
+			fmt.Println("Failed to encode:", err)
+			return
+		}
 	}
 
 	err = ioutil.WriteFile(args[1], data, 0644)

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

@@ -121,7 +121,7 @@ func Encode(dst, src []byte) ([]byte, error) {
 	)
 
 	for {
-		if int(e.pos)+4 >= len(e.src) {
+		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
 		}
@@ -158,7 +158,7 @@ func Encode(dst, src []byte) ([]byte, error) {
 		ref += minMatch
 		e.anchor = e.pos
 
-		for int(e.pos) < len(e.src) && e.src[e.pos] == e.src[ref] {
+		for int(e.pos) < len(e.src)-5 && e.src[e.pos] == e.src[ref] {
 			e.pos++
 			ref++
 		}

Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/cache/cache.go

@@ -128,7 +128,8 @@ const (
 type nodeState int
 
 const (
-	nodeEffective nodeState = iota
+	nodeZero nodeState = iota
+	nodeEffective
 	nodeEvicted
 	nodeDeleted
 )

Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/cache/cache_test.go

@@ -512,6 +512,56 @@ func TestLRUCache_Finalizer(t *testing.T) {
 	}
 }
 
+func BenchmarkLRUCache_Set(b *testing.B) {
+	c := NewLRUCache(0)
+	ns := c.GetNamespace(0)
+	b.ResetTimer()
+	for i := uint64(0); i < uint64(b.N); i++ {
+		set(ns, i, "", 1, nil)
+	}
+}
+
+func BenchmarkLRUCache_Get(b *testing.B) {
+	c := NewLRUCache(0)
+	ns := c.GetNamespace(0)
+	b.ResetTimer()
+	for i := uint64(0); i < uint64(b.N); i++ {
+		set(ns, i, "", 1, nil)
+	}
+	b.ResetTimer()
+	for i := uint64(0); i < uint64(b.N); i++ {
+		ns.Get(i, nil)
+	}
+}
+
+func BenchmarkLRUCache_Get2(b *testing.B) {
+	c := NewLRUCache(0)
+	ns := c.GetNamespace(0)
+	b.ResetTimer()
+	for i := uint64(0); i < uint64(b.N); i++ {
+		set(ns, i, "", 1, nil)
+	}
+	b.ResetTimer()
+	for i := uint64(0); i < uint64(b.N); i++ {
+		ns.Get(i, func() (charge int, value interface{}) {
+			return 0, nil
+		})
+	}
+}
+
+func BenchmarkLRUCache_Release(b *testing.B) {
+	c := NewLRUCache(0)
+	ns := c.GetNamespace(0)
+	handles := make([]Handle, b.N)
+	for i := uint64(0); i < uint64(b.N); i++ {
+		handles[i] = set(ns, i, "", 1, nil)
+	}
+	b.ResetTimer()
+	for _, h := range handles {
+		h.Release()
+	}
+}
+
 func BenchmarkLRUCache_SetRelease(b *testing.B) {
 	capacity := b.N / 100
 	if capacity <= 0 {
@@ -521,7 +571,7 @@ func BenchmarkLRUCache_SetRelease(b *testing.B) {
 	ns := c.GetNamespace(0)
 	b.ResetTimer()
 	for i := uint64(0); i < uint64(b.N); i++ {
-		set(ns, i, nil, 1, nil).Release()
+		set(ns, i, "", 1, nil).Release()
 	}
 }
 
@@ -538,10 +588,10 @@ func BenchmarkLRUCache_SetReleaseTwice(b *testing.B) {
 	nb := b.N - na
 
 	for i := uint64(0); i < uint64(na); i++ {
-		set(ns, i, nil, 1, nil).Release()
+		set(ns, i, "", 1, nil).Release()
 	}
 
 	for i := uint64(0); i < uint64(nb); i++ {
-		set(ns, i, nil, 1, nil).Release()
+		set(ns, i, "", 1, nil).Release()
 	}
 }

Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/cache/lru_cache.go

@@ -13,6 +13,13 @@ import (
 	"github.com/syndtr/goleveldb/leveldb/util"
 )
 
+// The LLRB implementation were taken from https://github.com/petar/GoLLRB.
+// Which contains the following header:
+//
+// Copyright 2010 Petar Maymounkov. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // lruCache represent a LRU cache state.
 type lruCache struct {
 	mu                sync.Mutex
@@ -74,11 +81,7 @@ func (c *lruCache) GetNamespace(id uint64) Namespace {
 		return ns
 	}
 
-	ns := &lruNs{
-		lru:   c,
-		id:    id,
-		table: make(map[uint64]*lruNode),
-	}
+	ns := &lruNs{lru: c, id: id}
 	c.table[id] = ns
 	return ns
 }
@@ -130,130 +133,267 @@ func (c *lruCache) evict() {
 }
 
 type lruNs struct {
-	lru   *lruCache
-	id    uint64
-	table map[uint64]*lruNode
-	state nsState
+	lru    *lruCache
+	id     uint64
+	rbRoot *lruNode
+	state  nsState
+}
+
+func (ns *lruNs) rbGetOrCreateNode(h *lruNode, key uint64) (hn, n *lruNode) {
+	if h == nil {
+		n = &lruNode{ns: ns, key: key}
+		return n, n
+	}
+
+	if key < h.key {
+		hn, n = ns.rbGetOrCreateNode(h.rbLeft, key)
+		if hn != nil {
+			h.rbLeft = hn
+		} else {
+			return nil, n
+		}
+	} else if key > h.key {
+		hn, n = ns.rbGetOrCreateNode(h.rbRight, key)
+		if hn != nil {
+			h.rbRight = hn
+		} else {
+			return nil, n
+		}
+	} else {
+		return nil, h
+	}
+
+	if rbIsRed(h.rbRight) && !rbIsRed(h.rbLeft) {
+		h = rbRotLeft(h)
+	}
+	if rbIsRed(h.rbLeft) && rbIsRed(h.rbLeft.rbLeft) {
+		h = rbRotRight(h)
+	}
+	if rbIsRed(h.rbLeft) && rbIsRed(h.rbRight) {
+		rbFlip(h)
+	}
+	return h, n
+}
+
+func (ns *lruNs) getOrCreateNode(key uint64) *lruNode {
+	hn, n := ns.rbGetOrCreateNode(ns.rbRoot, key)
+	if hn != nil {
+		ns.rbRoot = hn
+		ns.rbRoot.rbBlack = true
+	}
+	return n
+}
+
+func (ns *lruNs) rbGetNode(key uint64) *lruNode {
+	h := ns.rbRoot
+	for h != nil {
+		switch {
+		case key < h.key:
+			h = h.rbLeft
+		case key > h.key:
+			h = h.rbRight
+		default:
+			return h
+		}
+	}
+	return nil
+}
+
+func (ns *lruNs) getNode(key uint64) *lruNode {
+	return ns.rbGetNode(key)
+}
+
+func (ns *lruNs) rbDeleteNode(h *lruNode, key uint64) *lruNode {
+	if h == nil {
+		return nil
+	}
+
+	if key < h.key {
+		if h.rbLeft == nil { // key not present. Nothing to delete
+			return h
+		}
+		if !rbIsRed(h.rbLeft) && !rbIsRed(h.rbLeft.rbLeft) {
+			h = rbMoveLeft(h)
+		}
+		h.rbLeft = ns.rbDeleteNode(h.rbLeft, key)
+	} else {
+		if rbIsRed(h.rbLeft) {
+			h = rbRotRight(h)
+		}
+		// If @key equals @h.key and no right children at @h
+		if h.key == key && h.rbRight == nil {
+			return nil
+		}
+		if h.rbRight != nil && !rbIsRed(h.rbRight) && !rbIsRed(h.rbRight.rbLeft) {
+			h = rbMoveRight(h)
+		}
+		// If @key equals @h.key, and (from above) 'h.Right != nil'
+		if h.key == key {
+			var x *lruNode
+			h.rbRight, x = rbDeleteMin(h.rbRight)
+			if x == nil {
+				panic("logic")
+			}
+			x.rbLeft, h.rbLeft = h.rbLeft, nil
+			x.rbRight, h.rbRight = h.rbRight, nil
+			x.rbBlack = h.rbBlack
+			h = x
+		} else { // Else, @key is bigger than @h.key
+			h.rbRight = ns.rbDeleteNode(h.rbRight, key)
+		}
+	}
+
+	return rbFixup(h)
+}
+
+func (ns *lruNs) deleteNode(key uint64) {
+	ns.rbRoot = ns.rbDeleteNode(ns.rbRoot, key)
+	if ns.rbRoot != nil {
+		ns.rbRoot.rbBlack = true
+	}
+}
+
+func (ns *lruNs) rbIterateNodes(h *lruNode, pivot uint64, iter func(n *lruNode) bool) bool {
+	if h == nil {
+		return true
+	}
+	if h.key >= pivot {
+		if !ns.rbIterateNodes(h.rbLeft, pivot, iter) {
+			return false
+		}
+		if !iter(h) {
+			return false
+		}
+	}
+	return ns.rbIterateNodes(h.rbRight, pivot, iter)
+}
+
+func (ns *lruNs) iterateNodes(iter func(n *lruNode) bool) {
+	ns.rbIterateNodes(ns.rbRoot, 0, iter)
 }
 
 func (ns *lruNs) Get(key uint64, setf SetFunc) Handle {
 	ns.lru.mu.Lock()
+	defer ns.lru.mu.Unlock()
 
 	if ns.state != nsEffective {
-		ns.lru.mu.Unlock()
 		return nil
 	}
 
-	node, ok := ns.table[key]
-	if ok {
-		switch node.state {
-		case nodeEvicted:
-			// Insert to recent list.
-			node.state = nodeEffective
-			node.ref++
-			ns.lru.used += node.charge
-			ns.lru.evict()
-			fallthrough
-		case nodeEffective:
-			// Bump to front.
-			node.rRemove()
-			node.rInsert(&ns.lru.recent)
-		}
-		node.ref++
-	} else {
-		if setf == nil {
-			ns.lru.mu.Unlock()
+	var n *lruNode
+	if setf == nil {
+		n = ns.getNode(key)
+		if n == nil {
 			return nil
 		}
-
+	} else {
+		n = ns.getOrCreateNode(key)
+	}
+	switch n.state {
+	case nodeZero:
 		charge, value := setf()
 		if value == nil {
-			ns.lru.mu.Unlock()
+			ns.deleteNode(key)
 			return nil
 		}
-
-		node = &lruNode{
-			ns:     ns,
-			key:    key,
-			value:  value,
-			charge: charge,
-			ref:    1,
+		if charge < 0 {
+			charge = 0
 		}
-		ns.table[key] = node
+
+		n.value = value
+		n.charge = charge
+		n.state = nodeEvicted
 
 		ns.lru.size += charge
 		ns.lru.alive++
-		if charge > 0 {
-			node.ref++
-			node.rInsert(&ns.lru.recent)
-			ns.lru.used += charge
-			ns.lru.evict()
-		}
-	}
 
-	ns.lru.mu.Unlock()
-	return &lruHandle{node: node}
+		fallthrough
+	case nodeEvicted:
+		if n.charge == 0 {
+			break
+		}
+
+		// Insert to recent list.
+		n.state = nodeEffective
+		n.ref++
+		ns.lru.used += n.charge
+		ns.lru.evict()
+
+		fallthrough
+	case nodeEffective:
+		// Bump to front.
+		n.rRemove()
+		n.rInsert(&ns.lru.recent)
+	}
+	n.ref++
+
+	return &lruHandle{node: n}
 }
 
 func (ns *lruNs) Delete(key uint64, fin DelFin) bool {
 	ns.lru.mu.Lock()
+	defer ns.lru.mu.Unlock()
 
 	if ns.state != nsEffective {
 		if fin != nil {
 			fin(false, false)
 		}
-		ns.lru.mu.Unlock()
 		return false
 	}
 
-	node, exist := ns.table[key]
-	if !exist {
+	n := ns.getNode(key)
+	if n == nil {
 		if fin != nil {
 			fin(false, false)
 		}
-		ns.lru.mu.Unlock()
 		return false
+
 	}
 
-	switch node.state {
+	switch n.state {
+	case nodeEffective:
+		ns.lru.used -= n.charge
+		n.state = nodeDeleted
+		n.delfin = fin
+		n.rRemove()
+		n.derefNB()
+	case nodeEvicted:
+		n.state = nodeDeleted
+		n.delfin = fin
 	case nodeDeleted:
 		if fin != nil {
 			fin(true, true)
 		}
-		ns.lru.mu.Unlock()
 		return false
-	case nodeEffective:
-		ns.lru.used -= node.charge
-		node.state = nodeDeleted
-		node.delfin = fin
-		node.rRemove()
-		node.derefNB()
 	default:
-		node.state = nodeDeleted
-		node.delfin = fin
+		panic("invalid state")
 	}
 
-	ns.lru.mu.Unlock()
 	return true
 }
 
 func (ns *lruNs) purgeNB(fin PurgeFin) {
-	if ns.state != nsEffective {
-		return
-	}
-
-	for _, node := range ns.table {
-		switch node.state {
-		case nodeDeleted:
-		case nodeEffective:
-			ns.lru.used -= node.charge
-			node.state = nodeDeleted
-			node.purgefin = fin
-			node.rRemove()
-			node.derefNB()
-		default:
-			node.state = nodeDeleted
-			node.purgefin = fin
+	if ns.state == nsEffective {
+		var nodes []*lruNode
+		ns.iterateNodes(func(n *lruNode) bool {
+			nodes = append(nodes, n)
+			return true
+		})
+		for _, n := range nodes {
+			switch n.state {
+			case nodeEffective:
+				ns.lru.used -= n.charge
+				n.state = nodeDeleted
+				n.purgefin = fin
+				n.rRemove()
+				n.derefNB()
+			case nodeEvicted:
+				n.state = nodeDeleted
+				n.purgefin = fin
+			case nodeDeleted:
+			default:
+				panic("invalid state")
+			}
 		}
 	}
 }
@@ -265,22 +405,22 @@ func (ns *lruNs) Purge(fin PurgeFin) {
 }
 
 func (ns *lruNs) zapNB() {
-	if ns.state != nsEffective {
-		return
-	}
+	if ns.state == nsEffective {
+		ns.state = nsZapped
 
-	ns.state = nsZapped
+		ns.iterateNodes(func(n *lruNode) bool {
+			if n.state == nodeEffective {
+				ns.lru.used -= n.charge
+				n.rRemove()
+			}
+			ns.lru.size -= n.charge
+			n.state = nodeDeleted
+			n.fin()
 
-	for _, node := range ns.table {
-		if node.state == nodeEffective {
-			ns.lru.used -= node.charge
-			node.rRemove()
-		}
-		ns.lru.size -= node.charge
-		node.state = nodeDeleted
-		node.fin()
+			return true
+		})
+		ns.rbRoot = nil
 	}
-	ns.table = nil
 }
 
 func (ns *lruNs) Zap() {
@@ -293,7 +433,9 @@ func (ns *lruNs) Zap() {
 type lruNode struct {
 	ns *lruNs
 
-	rNext, rPrev *lruNode
+	rNext, rPrev    *lruNode
+	rbLeft, rbRight *lruNode
+	rbBlack         bool
 
 	key      uint64
 	value    interface{}
@@ -344,7 +486,7 @@ func (n *lruNode) derefNB() {
 	if n.ref == 0 {
 		if n.ns.state == nsEffective {
 			// Remove elemement.
-			delete(n.ns.table, n.key)
+			n.ns.deleteNode(n.key)
 			n.ns.lru.size -= n.charge
 			n.ns.lru.alive--
 			n.fin()
@@ -380,3 +522,92 @@ func (h *lruHandle) Release() {
 	h.node.deref()
 	h.node = nil
 }
+
+func rbIsRed(h *lruNode) bool {
+	if h == nil {
+		return false
+	}
+	return !h.rbBlack
+}
+
+func rbRotLeft(h *lruNode) *lruNode {
+	x := h.rbRight
+	if x.rbBlack {
+		panic("rotating a black link")
+	}
+	h.rbRight = x.rbLeft
+	x.rbLeft = h
+	x.rbBlack = h.rbBlack
+	h.rbBlack = false
+	return x
+}
+
+func rbRotRight(h *lruNode) *lruNode {
+	x := h.rbLeft
+	if x.rbBlack {
+		panic("rotating a black link")
+	}
+	h.rbLeft = x.rbRight
+	x.rbRight = h
+	x.rbBlack = h.rbBlack
+	h.rbBlack = false
+	return x
+}
+
+func rbFlip(h *lruNode) {
+	h.rbBlack = !h.rbBlack
+	h.rbLeft.rbBlack = !h.rbLeft.rbBlack
+	h.rbRight.rbBlack = !h.rbRight.rbBlack
+}
+
+func rbMoveLeft(h *lruNode) *lruNode {
+	rbFlip(h)
+	if rbIsRed(h.rbRight.rbLeft) {
+		h.rbRight = rbRotRight(h.rbRight)
+		h = rbRotLeft(h)
+		rbFlip(h)
+	}
+	return h
+}
+
+func rbMoveRight(h *lruNode) *lruNode {
+	rbFlip(h)
+	if rbIsRed(h.rbLeft.rbLeft) {
+		h = rbRotRight(h)
+		rbFlip(h)
+	}
+	return h
+}
+
+func rbFixup(h *lruNode) *lruNode {
+	if rbIsRed(h.rbRight) {
+		h = rbRotLeft(h)
+	}
+
+	if rbIsRed(h.rbLeft) && rbIsRed(h.rbLeft.rbLeft) {
+		h = rbRotRight(h)
+	}
+
+	if rbIsRed(h.rbLeft) && rbIsRed(h.rbRight) {
+		rbFlip(h)
+	}
+
+	return h
+}
+
+func rbDeleteMin(h *lruNode) (hn, n *lruNode) {
+	if h == nil {
+		return nil, nil
+	}
+	if h.rbLeft == nil {
+		return nil, h
+	}
+
+	if !rbIsRed(h.rbLeft) && !rbIsRed(h.rbLeft.rbLeft) {
+		h = rbMoveLeft(h)
+	}
+
+	h.rbLeft, n = rbDeleteMin(h.rbLeft)
+
+	return rbFixup(h), n
+}

Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_test.go

@@ -1210,7 +1210,7 @@ func TestDb_DeletionMarkers2(t *testing.T) {
 }
 
 func TestDb_CompactionTableOpenError(t *testing.T) {
-	h := newDbHarnessWopt(t, &opt.Options{MaxOpenFiles: 0})
+	h := newDbHarnessWopt(t, &opt.Options{CachedOpenFiles: -1})
 	defer h.close()
 
 	im := 10
@@ -1579,8 +1579,8 @@ func TestDb_BloomFilter(t *testing.T) {
 
 	const (
 		n              = 10000
-		indexOverheat  = 19898
-		filterOverheat = 19799
+		indexOverhead  = 19898
+		filterOverhead = 19799
 	)
 
 	// Populate multiple layers
@@ -1605,7 +1605,7 @@ func TestDb_BloomFilter(t *testing.T) {
 	cnt := int(h.stor.ReadCounter())
 	t.Logf("lookup of %d present keys yield %d sstable I/O reads", n, cnt)
 
-	if min, max := n+indexOverheat+filterOverheat, n+indexOverheat+filterOverheat+2*n/100; cnt < min || cnt > max {
+	if min, max := n+indexOverhead+filterOverhead, n+indexOverhead+filterOverhead+2*n/100; cnt < min || cnt > max {
 		t.Errorf("num of sstable I/O reads of present keys not in range of %d - %d, got %d", min, max, cnt)
 	}
 
@@ -1616,7 +1616,7 @@ func TestDb_BloomFilter(t *testing.T) {
 	}
 	cnt = int(h.stor.ReadCounter())
 	t.Logf("lookup of %d missing keys yield %d sstable I/O reads", n, cnt)
-	if max := 3*n/100 + indexOverheat + filterOverheat; cnt > max {
+	if max := 3*n/100 + indexOverhead + filterOverhead; cnt > max {
 		t.Errorf("num of sstable I/O reads of missing keys was more than %d, got %d", max, cnt)
 	}
 

Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/external_test.go

@@ -21,7 +21,7 @@ var _ = testutil.Defer(func() {
 			BlockRestartInterval: 5,
 			BlockSize:            50,
 			Compression:          opt.NoCompression,
-			MaxOpenFiles:         0,
+			CachedOpenFiles:      -1,
 			Strict:               opt.StrictAll,
 			WriteBuffer:          1000,
 		}
@@ -40,18 +40,17 @@ var _ = testutil.Defer(func() {
 		})
 
 		Describe("read test", func() {
-			testutil.AllKeyValueTesting(nil, func(kv testutil.KeyValue) testutil.DB {
+			testutil.AllKeyValueTesting(nil, nil, func(kv testutil.KeyValue) testutil.DB {
 				// Building the DB.
 				db := newTestingDB(o, nil, nil)
 				kv.IterateShuffled(nil, func(i int, key, value []byte) {
 					err := db.TestPut(key, value)
 					Expect(err).NotTo(HaveOccurred())
 				})
-				testutil.Defer("teardown", func() {
-					db.TestClose()
-				})
 
 				return db
+			}, func(db testutil.DB) {
+				db.(*testingDB).TestClose()
 			})
 		})
 	})

Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/memdb/memdb_test.go

@@ -129,7 +129,7 @@ var _ = testutil.Defer(func() {
 				}
 
 				return db
-			})
+			}, nil, nil)
 		})
 	})
 })

Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/opt/options.go

@@ -24,7 +24,7 @@ const (
 	DefaultBlockRestartInterval = 16
 	DefaultBlockSize            = 4 * KiB
 	DefaultCompressionType      = SnappyCompression
-	DefaultMaxOpenFiles         = 1000
+	DefaultCachedOpenFiles      = 500
 	DefaultWriteBuffer          = 4 * MiB
 )
 
@@ -125,6 +125,13 @@ type Options struct {
 	// The default value is 4KiB.
 	BlockSize int
 
+	// CachedOpenFiles defines number of open files to kept around when not
+	// in-use, the counting includes still in-use files.
+	// Set this to negative value to disable caching.
+	//
+	// The default value is 500.
+	CachedOpenFiles int
+
 	// Comparer defines a total ordering over the space of []byte keys: a 'less
 	// than' relationship. The same comparison algorithm must be used for reads
 	// and writes over the lifetime of the DB.
@@ -165,13 +172,6 @@ type Options struct {
 	// The default value is nil.
 	Filter filter.Filter
 
-	// MaxOpenFiles defines maximum number of open files to kept around
-	// (cached). This is not an hard limit, actual open files may exceed
-	// the defined value.
-	//
-	// The default value is 1000.
-	MaxOpenFiles int
-
 	// Strict defines the DB strict level.
 	Strict Strict
 
@@ -213,6 +213,15 @@ func (o *Options) GetBlockSize() int {
 	return o.BlockSize
 }
 
+func (o *Options) GetCachedOpenFiles() int {
+	if o == nil || o.CachedOpenFiles == 0 {
+		return DefaultCachedOpenFiles
+	} else if o.CachedOpenFiles < 0 {
+		return 0
+	}
+	return o.CachedOpenFiles
+}
+
 func (o *Options) GetComparer() comparer.Comparer {
 	if o == nil || o.Comparer == nil {
 		return comparer.DefaultComparer
@@ -248,13 +257,6 @@ func (o *Options) GetFilter() filter.Filter {
 	return o.Filter
 }
 
-func (o *Options) GetMaxOpenFiles() int {
-	if o == nil || o.MaxOpenFiles <= 0 {
-		return DefaultMaxOpenFiles
-	}
-	return o.MaxOpenFiles
-}
-
 func (o *Options) GetStrict(strict Strict) bool {
 	if o == nil || o.Strict == 0 {
 		return DefaultStrict&strict != 0

Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/session.go

@@ -58,7 +58,7 @@ func newSession(stor storage.Storage, o *opt.Options) (s *session, err error) {
 		storLock: storLock,
 	}
 	s.setOptions(o)
-	s.tops = newTableOps(s, s.o.GetMaxOpenFiles())
+	s.tops = newTableOps(s, s.o.GetCachedOpenFiles())
 	s.setVersion(&version{s: s})
 	s.log("log@legend F·NumFile S·FileSize N·Entry C·BadEntry B·BadBlock D·DeletedEntry L·Level Q·SeqNum T·TimeElapsed")
 	return

Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/block_test.go

@@ -59,7 +59,7 @@ var _ = testutil.Defer(func() {
 						// Make block.
 						br := Build(kv, restartInterval)
 						// Do testing.
-						testutil.KeyValueTesting(nil, br, kv.Clone())
+						testutil.KeyValueTesting(nil, kv.Clone(), br, nil, nil)
 					}
 
 					Describe(Text(), Test)

Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/table_test.go

@@ -104,11 +104,11 @@ var _ = testutil.Defer(func() {
 					if body != nil {
 						body(db.(tableWrapper).Reader)
 					}
-					testutil.KeyValueTesting(nil, db, *kv)
+					testutil.KeyValueTesting(nil, *kv, db, nil, nil)
 				}
 			}
 
-			testutil.AllKeyValueTesting(nil, Build)
+			testutil.AllKeyValueTesting(nil, Build, nil, nil)
 			Describe("with one key per block", Test(testutil.KeyValue_Generate(nil, 9, 1, 10, 512, 512), func(r *Reader) {
 				It("should have correct blocks number", func() {
 					indexBlock, err := r.readBlock(r.indexBH, true)

Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/testutil/kvtest.go

@@ -16,13 +16,22 @@ import (
 	"github.com/syndtr/goleveldb/leveldb/util"
 )
 
-func KeyValueTesting(rnd *rand.Rand, p DB, kv KeyValue) {
+func KeyValueTesting(rnd *rand.Rand, kv KeyValue, p DB, setup func(KeyValue) DB, teardown func(DB)) {
 	if rnd == nil {
 		rnd = NewRand()
 	}
 
-	if db, ok := p.(Find); ok {
-		It("Should find all keys with Find", func() {
+	if p == nil {
+		BeforeEach(func() {
+			p = setup(kv)
+		})
+		AfterEach(func() {
+			teardown(p)
+		})
+	}
+
+	It("Should find all keys with Find", func() {
+		if db, ok := p.(Find); ok {
 			ShuffledIndex(nil, kv.Len(), 1, func(i int) {
 				key_, key, value := kv.IndexInexact(i)
 
@@ -38,9 +47,11 @@ func KeyValueTesting(rnd *rand.Rand, p DB, kv KeyValue) {
 				Expect(rkey).Should(Equal(key))
 				Expect(rvalue).Should(Equal(value), "Value for key %q (%q)", key_, key)
 			})
-		})
+		}
+	})
 
-		It("Should return error if the key is not present", func() {
+	It("Should return error if the key is not present", func() {
+		if db, ok := p.(Find); ok {
 			var key []byte
 			if kv.Len() > 0 {
 				key_, _ := kv.Index(kv.Len() - 1)
@@ -49,11 +60,11 @@ func KeyValueTesting(rnd *rand.Rand, p DB, kv KeyValue) {
 			rkey, _, err := db.TestFind(key)
 			Expect(err).Should(HaveOccurred(), "Find for key %q yield key %q", key, rkey)
 			Expect(err).Should(Equal(util.ErrNotFound))
-		})
-	}
+		}
+	})
 
-	if db, ok := p.(Get); ok {
-		It("Should only find exact key with Get", func() {
+	It("Should only find exact key with Get", func() {
+		if db, ok := p.(Get); ok {
 			ShuffledIndex(nil, kv.Len(), 1, func(i int) {
 				key_, key, value := kv.IndexInexact(i)
 
@@ -69,11 +80,11 @@ func KeyValueTesting(rnd *rand.Rand, p DB, kv KeyValue) {
 					Expect(err).Should(Equal(util.ErrNotFound))
 				}
 			})
-		})
-	}
+		}
+	})
 
-	if db, ok := p.(NewIterator); ok {
-		TestIter := func(r *util.Range, _kv KeyValue) {
+	TestIter := func(r *util.Range, _kv KeyValue) {
+		if db, ok := p.(NewIterator); ok {
 			iter := db.TestNewIterator(r)
 			Expect(iter.Error()).ShouldNot(HaveOccurred())
 
@@ -84,45 +95,48 @@ func KeyValueTesting(rnd *rand.Rand, p DB, kv KeyValue) {
 
 			DoIteratorTesting(&t)
 		}
+	}
 
-		It("Should iterates and seeks correctly", func(done Done) {
-			TestIter(nil, kv.Clone())
-			done <- true
-		}, 3.0)
+	It("Should iterates and seeks correctly", func(done Done) {
+		TestIter(nil, kv.Clone())
+		done <- true
+	}, 3.0)
 
-		RandomIndex(rnd, kv.Len(), kv.Len(), func(i int) {
-			type slice struct {
-				r            *util.Range
-				start, limit int
-			}
+	RandomIndex(rnd, kv.Len(), kv.Len(), func(i int) {
+		type slice struct {
+			r            *util.Range
+			start, limit int
+		}
 
-			key_, _, _ := kv.IndexInexact(i)
-			for _, x := range []slice{
-				{&util.Range{Start: key_, Limit: nil}, i, kv.Len()},
-				{&util.Range{Start: nil, Limit: key_}, 0, i},
-			} {
-				It(fmt.Sprintf("Should iterates and seeks correctly of a slice %d .. %d", x.start, x.limit), func(done Done) {
-					TestIter(x.r, kv.Slice(x.start, x.limit))
-					done <- true
-				}, 3.0)
-			}
-		})
-
-		RandomRange(rnd, kv.Len(), kv.Len(), func(start, limit int) {
-			It(fmt.Sprintf("Should iterates and seeks correctly of a slice %d .. %d", start, limit), func(done Done) {
-				r := kv.Range(start, limit)
-				TestIter(&r, kv.Slice(start, limit))
+		key_, _, _ := kv.IndexInexact(i)
+		for _, x := range []slice{
+			{&util.Range{Start: key_, Limit: nil}, i, kv.Len()},
+			{&util.Range{Start: nil, Limit: key_}, 0, i},
+		} {
+			It(fmt.Sprintf("Should iterates and seeks correctly of a slice %d .. %d", x.start, x.limit), func(done Done) {
+				TestIter(x.r, kv.Slice(x.start, x.limit))
 				done <- true
 			}, 3.0)
-		})
-	}
+		}
+	})
+
+	RandomRange(rnd, kv.Len(), kv.Len(), func(start, limit int) {
+		It(fmt.Sprintf("Should iterates and seeks correctly of a slice %d .. %d", start, limit), func(done Done) {
+			r := kv.Range(start, limit)
+			TestIter(&r, kv.Slice(start, limit))
+			done <- true
+		}, 3.0)
+	})
 }
 
-func AllKeyValueTesting(rnd *rand.Rand, body func(kv KeyValue) DB) {
+func AllKeyValueTesting(rnd *rand.Rand, body, setup func(KeyValue) DB, teardown func(DB)) {
 	Test := func(kv *KeyValue) func() {
 		return func() {
-			db := body(*kv)
-			KeyValueTesting(rnd, db, *kv)
+			var p DB
+			if body != nil {
+				p = body(*kv)
+			}
+			KeyValueTesting(rnd, *kv, p, setup, teardown)
 		}
 	}
 

Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/util/range.go

@@ -25,6 +25,7 @@ func BytesPrefix(prefix []byte) *Range {
 			limit = make([]byte, i+1)
 			copy(limit, prefix)
 			limit[i] = c + 1
+			break
 		}
 	}
 	return &Range{prefix, limit}

build.go

@@ -67,75 +67,62 @@ func main() {
 
 	checkRequiredGoVersion()
 
-	if check() != nil {
-		setup()
-	}
-
 	if flag.NArg() == 0 {
 		install("./cmd/...")
 		return
 	}
 
-	switch flag.Arg(0) {
-	case "install":
-		pkg := "./cmd/..."
-		if flag.NArg() > 2 {
-			pkg = flag.Arg(1)
+	for _, cmd := range flag.Args() {
+		switch cmd {
+		case "setup":
+			setup()
+
+		case "install":
+			pkg := "./cmd/..."
+			install(pkg)
+
+		case "build":
+			pkg := "./cmd/syncthing"
+			var tags []string
+			if noupgrade {
+				tags = []string{"noupgrade"}
+			}
+			build(pkg, tags)
+
+		case "test":
+			pkg := "./..."
+			test(pkg)
+
+		case "assets":
+			assets()
+
+		case "xdr":
+			xdr()
+
+		case "translate":
+			translate()
+
+		case "transifex":
+			transifex()
+
+		case "deps":
+			deps()
+
+		case "tar":
+			buildTar()
+
+		case "zip":
+			buildZip()
+
+		case "clean":
+			clean()
+
+		default:
+			log.Fatalf("Unknown command %q", cmd)
 		}
-		install(pkg)
-
-	case "build":
-		pkg := "./cmd/syncthing"
-		if flag.NArg() > 2 {
-			pkg = flag.Arg(1)
-		}
-		var tags []string
-		if noupgrade {
-			tags = []string{"noupgrade"}
-		}
-		build(pkg, tags)
-
-	case "test":
-		pkg := "./..."
-		if flag.NArg() > 2 {
-			pkg = flag.Arg(1)
-		}
-		test(pkg)
-
-	case "assets":
-		assets()
-
-	case "xdr":
-		xdr()
-
-	case "translate":
-		translate()
-
-	case "transifex":
-		transifex()
-
-	case "deps":
-		deps()
-
-	case "tar":
-		buildTar()
-
-	case "zip":
-		buildZip()
-
-	case "clean":
-		clean()
-
-	default:
-		log.Fatalf("Unknown command %q", flag.Arg(0))
 	}
 }
 
-func check() error {
-	_, err := exec.LookPath("godep")
-	return err
-}
-
 func checkRequiredGoVersion() {
 	ver := run("go", "version")
 	re := regexp.MustCompile(`go version go(\d+\.\d+)`)
@@ -163,24 +150,25 @@ func setup() {
 }
 
 func test(pkg string) {
-	runPrint("godep", "go", "test", "-short", "-timeout", "10s", pkg)
+	setBuildEnv()
+	runPrint("go", "test", "-short", "-timeout", "10s", pkg)
 }
 
 func install(pkg string) {
 	os.Setenv("GOBIN", "./bin")
 	setBuildEnv()
-	runPrint("godep", "go", "install", "-ldflags", ldflags(), pkg)
+	runPrint("go", "install", "-ldflags", ldflags(), pkg)
 }
 
 func build(pkg string, tags []string) {
 	rmr("syncthing", "syncthing.exe")
-	args := []string{"go", "build", "-ldflags", ldflags()}
+	args := []string{"build", "-ldflags", ldflags()}
 	if len(tags) > 0 {
 		args = append(args, "-tags", strings.Join(tags, ","))
 	}
 	args = append(args, pkg)
 	setBuildEnv()
-	runPrint("godep", args...)
+	runPrint("go", args...)
 }
 
 func buildTar() {
@@ -230,14 +218,22 @@ func setBuildEnv() {
 	if goarch == "386" {
 		os.Setenv("GO386", "387")
 	}
+	wd, err := os.Getwd()
+	if err != nil {
+		log.Println("Warning: can't determine current dir:", err)
+		log.Println("Build might not work as expected")
+	}
+	os.Setenv("GOPATH", fmt.Sprintf("%s%c%s", filepath.Join(wd, "Godeps", "_workspace"), os.PathListSeparator, os.Getenv("GOPATH")))
+	log.Println("GOPATH=" + os.Getenv("GOPATH"))
 }
 
 func assets() {
-	runPipe("auto/gui.files.go", "godep", "go", "run", "cmd/genassets/main.go", "gui")
+	setBuildEnv()
+	runPipe("internal/auto/gui.files.go", "go", "run", "cmd/genassets/main.go", "gui")
 }
 
 func xdr() {
-	for _, f := range []string{"discover/packets", "files/leveldb", "protocol/message"} {
+	for _, f := range []string{"internal/discover/packets", "internal/files/leveldb", "internal/protocol/message"} {
 		runPipe(f+"_xdr.go", "go", "run", "./Godeps/_workspace/src/github.com/calmh/xdr/cmd/genxdr/main.go", "--", f+".go")
 	}
 }

build.sh

@@ -12,9 +12,9 @@ case "${1:-default}" in
 		;;
 
 	test)
-		ulimit -t 60 || true
-		ulimit -d 512000 || true
-		ulimit -m 512000 || true
+		ulimit -t 60 &>/dev/null || true
+		ulimit -d 512000 &>/dev/null || true
+		ulimit -m 512000 &>/dev/null || true
 
 		go run build.go "$1"
 		;;
@@ -68,9 +68,9 @@ case "${1:-default}" in
 		;;
 
 	test-cov)
-		ulimit -t 60 || true
-		ulimit -d 512000 || true
-		ulimit -m 512000 || true
+		ulimit -t 60 &>/dev/null || true
+		ulimit -d 512000 &>/dev/null || true
+		ulimit -m 512000 &>/dev/null || true
 
 		go get github.com/axw/gocov/gocov
 		go get github.com/AlekSi/gocov-xml

cmd/stindex/main.go

@@ -10,8 +10,8 @@ import (
 	"log"
 	"os"
 
-	"github.com/syncthing/syncthing/files"
-	"github.com/syncthing/syncthing/protocol"
+	"github.com/syncthing/syncthing/internal/files"
+	"github.com/syncthing/syncthing/internal/protocol"
 	"github.com/syndtr/goleveldb/leveldb"
 )
 

cmd/syncthing/gui.go

@@ -5,19 +5,15 @@
 package main
 
 import (
-	"bytes"
 	"crypto/tls"
-	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
-	"math/rand"
 	"mime"
 	"net"
 	"net/http"
 	"os"
 	"path/filepath"
-	"reflect"
 	"runtime"
 	"strconv"
 	"strings"
@@ -25,13 +21,13 @@ import (
 	"time"
 
 	"code.google.com/p/go.crypto/bcrypt"
-	"github.com/syncthing/syncthing/auto"
-	"github.com/syncthing/syncthing/config"
-	"github.com/syncthing/syncthing/events"
-	"github.com/syncthing/syncthing/logger"
-	"github.com/syncthing/syncthing/model"
-	"github.com/syncthing/syncthing/protocol"
-	"github.com/syncthing/syncthing/upgrade"
+	"github.com/syncthing/syncthing/internal/auto"
+	"github.com/syncthing/syncthing/internal/config"
+	"github.com/syncthing/syncthing/internal/events"
+	"github.com/syncthing/syncthing/internal/logger"
+	"github.com/syncthing/syncthing/internal/model"
+	"github.com/syncthing/syncthing/internal/protocol"
+	"github.com/syncthing/syncthing/internal/upgrade"
 	"github.com/vitrun/qart/qr"
 )
 
@@ -44,15 +40,10 @@ var (
 	configInSync = true
 	guiErrors    = []guiError{}
 	guiErrorsMut sync.Mutex
-	apiKey       string
 	modt         = time.Now().UTC().Format(http.TimeFormat)
 	eventSub     *events.BufferedSubscription
 )
 
-const (
-	unchangedPassword = "--password-unchanged--"
-)
-
 func init() {
 	l.AddHandler(logger.LevelWarn, showGuiError)
 	sub := events.Default.Subscribe(events.AllEvents)
@@ -60,39 +51,32 @@ func init() {
 }
 
 func startGUI(cfg config.GUIConfiguration, assetDir string, m *model.Model) error {
-	var listener net.Listener
 	var err error
-	if cfg.UseTLS {
-		cert, err := loadCert(confDir, "https-")
-		if err != nil {
-			l.Infoln("Loading HTTPS certificate:", err)
-			l.Infoln("Creating new HTTPS certificate")
-			newCertificate(confDir, "https-")
-			cert, err = loadCert(confDir, "https-")
-		}
-		if err != nil {
-			return err
-		}
-		tlsCfg := &tls.Config{
-			Certificates: []tls.Certificate{cert},
-			ServerName:   "syncthing",
-		}
-		listener, err = tls.Listen("tcp", cfg.Address, tlsCfg)
-		if err != nil {
-			return err
-		}
-	} else {
-		listener, err = net.Listen("tcp", cfg.Address)
-		if err != nil {
-			return err
-		}
+
+	cert, err := loadCert(confDir, "https-")
+	if err != nil {
+		l.Infoln("Loading HTTPS certificate:", err)
+		l.Infoln("Creating new HTTPS certificate")
+		newCertificate(confDir, "https-")
+		cert, err = loadCert(confDir, "https-")
+	}
+	if err != nil {
+		return err
+	}
+	tlsCfg := &tls.Config{
+		Certificates: []tls.Certificate{cert},
+		ServerName:   "syncthing",
 	}
 
-	apiKey = cfg.APIKey
-	loadCsrfTokens()
+	rawListener, err := net.Listen("tcp", cfg.Address)
+	if err != nil {
+		return err
+	}
+	listener := &DowngradingListener{rawListener, tlsCfg}
 
 	// The GET handlers
 	getRestMux := http.NewServeMux()
+	getRestMux.HandleFunc("/rest/ping", restPing)
 	getRestMux.HandleFunc("/rest/completion", withModel(m, restGetCompletion))
 	getRestMux.HandleFunc("/rest/config", restGetConfig)
 	getRestMux.HandleFunc("/rest/config/sync", restGetConfigInSync)
@@ -100,6 +84,7 @@ func startGUI(cfg config.GUIConfiguration, assetDir string, m *model.Model) erro
 	getRestMux.HandleFunc("/rest/discovery", restGetDiscovery)
 	getRestMux.HandleFunc("/rest/errors", restGetErrors)
 	getRestMux.HandleFunc("/rest/events", restGetEvents)
+	getRestMux.HandleFunc("/rest/ignores", withModel(m, restGetIgnores))
 	getRestMux.HandleFunc("/rest/lang", restGetLang)
 	getRestMux.HandleFunc("/rest/model", withModel(m, restGetModel))
 	getRestMux.HandleFunc("/rest/model/version", withModel(m, restGetModelVersion))
@@ -116,10 +101,12 @@ func startGUI(cfg config.GUIConfiguration, assetDir string, m *model.Model) erro
 
 	// The POST handlers
 	postRestMux := http.NewServeMux()
+	postRestMux.HandleFunc("/rest/ping", restPing)
 	postRestMux.HandleFunc("/rest/config", withModel(m, restPostConfig))
 	postRestMux.HandleFunc("/rest/discovery/hint", restPostDiscoveryHint)
 	postRestMux.HandleFunc("/rest/error", restPostError)
 	postRestMux.HandleFunc("/rest/error/clear", restClearErrors)
+	postRestMux.HandleFunc("/rest/ignores", withModel(m, restPostIgnores))
 	postRestMux.HandleFunc("/rest/model/override", withModel(m, restPostOverride))
 	postRestMux.HandleFunc("/rest/reset", restPostReset)
 	postRestMux.HandleFunc("/rest/restart", restPostRestart)
@@ -141,17 +128,27 @@ func startGUI(cfg config.GUIConfiguration, assetDir string, m *model.Model) erro
 
 	// Wrap everything in CSRF protection. The /rest prefix should be
 	// protected, other requests will grant cookies.
-	handler := csrfMiddleware("/rest", mux)
+	handler := csrfMiddleware("/rest", cfg.APIKey, mux)
 
 	// Add our version as a header to responses
 	handler = withVersionMiddleware(handler)
 
 	// Wrap everything in basic auth, if user/password is set.
-	if len(cfg.User) > 0 {
-		handler = basicAuthMiddleware(cfg.User, cfg.Password, handler)
+	if len(cfg.User) > 0 && len(cfg.Password) > 0 {
+		handler = basicAuthAndSessionMiddleware(cfg, handler)
 	}
 
-	go http.Serve(listener, handler)
+	// Redirect to HTTPS if we are supposed to
+	if cfg.UseTLS {
+		handler = redirectToHTTPSMiddleware(handler)
+	}
+
+	go func() {
+		err := http.Serve(listener, handler)
+		if err != nil {
+			panic(err)
+		}
+	}()
 	return nil
 }
 
@@ -168,6 +165,23 @@ func getPostHandler(get, post http.Handler) http.Handler {
 	})
 }
 
+func redirectToHTTPSMiddleware(h http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		// Add a generous access-control-allow-origin header since we may be
+		// redirecting REST requests over protocols
+		w.Header().Add("Access-Control-Allow-Origin", "*")
+
+		if r.TLS == nil {
+			// Redirect HTTP requests to HTTPS
+			r.URL.Host = r.Host
+			r.URL.Scheme = "https"
+			http.Redirect(w, r, r.URL.String(), http.StatusFound)
+		} else {
+			h.ServeHTTP(w, r)
+		}
+	})
+}
+
 func noCacheMiddleware(h http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set("Cache-Control", "no-cache")
@@ -188,8 +202,21 @@ func withModel(m *model.Model, h func(m *model.Model, w http.ResponseWriter, r *
 	}
 }
 
+func restPing(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Content-Type", "application/json; charset=utf-8")
+	json.NewEncoder(w).Encode(map[string]string{
+		"ping": "pong",
+	})
+}
+
 func restGetVersion(w http.ResponseWriter, r *http.Request) {
-	w.Write([]byte(Version))
+	w.Header().Set("Content-Type", "application/json; charset=utf-8")
+	json.NewEncoder(w).Encode(map[string]string{
+		"version":     Version,
+		"longVersion": LongVersion,
+		"os":          runtime.GOOS,
+		"arch":        runtime.GOARCH,
+	})
 }
 
 func restGetCompletion(m *model.Model, w http.ResponseWriter, r *http.Request) {
@@ -262,7 +289,7 @@ func restGetNeed(m *model.Model, w http.ResponseWriter, r *http.Request) {
 	var qs = r.URL.Query()
 	var repo = qs.Get("repo")
 
-	files := m.NeedFilesRepo(repo)
+	files := m.NeedFilesRepoLimited(repo, 100, 2500) // max 100 files or 2500 blocks
 
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	json.NewEncoder(w).Encode(files)
@@ -281,12 +308,8 @@ func restGetNodeStats(m *model.Model, w http.ResponseWriter, r *http.Request) {
 }
 
 func restGetConfig(w http.ResponseWriter, r *http.Request) {
-	encCfg := cfg
-	if encCfg.GUI.Password != "" {
-		encCfg.GUI.Password = unchangedPassword
-	}
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	json.NewEncoder(w).Encode(encCfg)
+	json.NewEncoder(w).Encode(cfg)
 }
 
 func restPostConfig(m *model.Model, w http.ResponseWriter, r *http.Request) {
@@ -297,49 +320,20 @@ func restPostConfig(m *model.Model, w http.ResponseWriter, r *http.Request) {
 		http.Error(w, err.Error(), 500)
 		return
 	} else {
-		if newCfg.GUI.Password == "" {
-			// Leave it empty
-		} else if newCfg.GUI.Password == unchangedPassword {
-			newCfg.GUI.Password = cfg.GUI.Password
-		} else {
-			hash, err := bcrypt.GenerateFromPassword([]byte(newCfg.GUI.Password), 0)
-			if err != nil {
-				l.Warnln("bcrypting password:", err)
-				http.Error(w, err.Error(), 500)
-				return
-			} else {
-				newCfg.GUI.Password = string(hash)
-			}
-		}
-
-		// Figure out if any changes require a restart
-
-		if len(cfg.Repositories) != len(newCfg.Repositories) {
-			configInSync = false
-		} else {
-			om := cfg.RepoMap()
-			nm := newCfg.RepoMap()
-			for id := range om {
-				if !reflect.DeepEqual(om[id], nm[id]) {
-					configInSync = false
-					break
+		if newCfg.GUI.Password != cfg.GUI.Password {
+			if newCfg.GUI.Password != "" {
+				hash, err := bcrypt.GenerateFromPassword([]byte(newCfg.GUI.Password), 0)
+				if err != nil {
+					l.Warnln("bcrypting password:", err)
+					http.Error(w, err.Error(), 500)
+					return
+				} else {
+					newCfg.GUI.Password = string(hash)
 				}
 			}
 		}
 
-		if len(cfg.Nodes) != len(newCfg.Nodes) {
-			configInSync = false
-		} else {
-			om := cfg.NodeMap()
-			nm := newCfg.NodeMap()
-			for k := range om {
-				if _, ok := nm[k]; !ok {
-					// A node was removed and another added
-					configInSync = false
-					break
-				}
-			}
-		}
+		// Start or stop usage reporting as appropriate
 
 		if newCfg.Options.URAccepted > cfg.Options.URAccepted {
 			// UR was enabled
@@ -355,14 +349,12 @@ func restPostConfig(m *model.Model, w http.ResponseWriter, r *http.Request) {
 			stopUsageReporting()
 		}
 
-		if !reflect.DeepEqual(cfg.Options, newCfg.Options) || !reflect.DeepEqual(cfg.GUI, newCfg.GUI) {
-			configInSync = false
-		}
-
 		// Activate and save
 
+		configInSync = !config.ChangeRequiresRestart(cfg, newCfg)
+		newCfg.Location = cfg.Location
+		newCfg.Save()
 		cfg = newCfg
-		saveConfig()
 	}
 }
 
@@ -424,7 +416,7 @@ func restGetSystem(w http.ResponseWriter, r *http.Request) {
 func restGetErrors(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	guiErrorsMut.Lock()
-	json.NewEncoder(w).Encode(guiErrors)
+	json.NewEncoder(w).Encode(map[string][]guiError{"errors": guiErrors})
 	guiErrorsMut.Unlock()
 }
 
@@ -467,6 +459,41 @@ func restGetReport(m *model.Model, w http.ResponseWriter, r *http.Request) {
 	json.NewEncoder(w).Encode(reportData(m))
 }
 
+func restGetIgnores(m *model.Model, w http.ResponseWriter, r *http.Request) {
+	qs := r.URL.Query()
+	w.Header().Set("Content-Type", "application/json; charset=utf-8")
+
+	ignores, err := m.GetIgnores(qs.Get("repo"))
+	if err != nil {
+		http.Error(w, err.Error(), 500)
+		return
+	}
+	json.NewEncoder(w).Encode(map[string][]string{
+		"ignore": ignores,
+	})
+}
+
+func restPostIgnores(m *model.Model, w http.ResponseWriter, r *http.Request) {
+	qs := r.URL.Query()
+
+	var data map[string][]string
+	err := json.NewDecoder(r.Body).Decode(&data)
+	r.Body.Close()
+
+	if err != nil {
+		http.Error(w, err.Error(), 500)
+		return
+	}
+
+	err = m.SetIgnores(qs.Get("repo"), data["ignore"])
+	if err != nil {
+		http.Error(w, err.Error(), 500)
+		return
+	}
+
+	restGetIgnores(m, w, r)
+}
+
 func restGetEvents(w http.ResponseWriter, r *http.Request) {
 	qs := r.URL.Query()
 	sinceStr := qs.Get("since")
@@ -547,7 +574,9 @@ func restPostUpgrade(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
-		restPostRestart(w, r)
+		flushResponse(`{"ok": "restarting"}`, w)
+		l.Infoln("Upgrading")
+		stop <- exitUpgrading
 	}
 }
 
@@ -599,56 +628,6 @@ func restGetPeerCompletion(m *model.Model, w http.ResponseWriter, r *http.Reques
 	json.NewEncoder(w).Encode(comp)
 }
 
-func basicAuthMiddleware(username string, passhash string, next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if validAPIKey(r.Header.Get("X-API-Key")) {
-			next.ServeHTTP(w, r)
-			return
-		}
-
-		error := func() {
-			time.Sleep(time.Duration(rand.Intn(100)+100) * time.Millisecond)
-			w.Header().Set("WWW-Authenticate", "Basic realm=\"Authorization Required\"")
-			http.Error(w, "Not Authorized", http.StatusUnauthorized)
-		}
-
-		hdr := r.Header.Get("Authorization")
-		if !strings.HasPrefix(hdr, "Basic ") {
-			error()
-			return
-		}
-
-		hdr = hdr[6:]
-		bs, err := base64.StdEncoding.DecodeString(hdr)
-		if err != nil {
-			error()
-			return
-		}
-
-		fields := bytes.SplitN(bs, []byte(":"), 2)
-		if len(fields) != 2 {
-			error()
-			return
-		}
-
-		if string(fields[0]) != username {
-			error()
-			return
-		}
-
-		if err := bcrypt.CompareHashAndPassword([]byte(passhash), fields[1]); err != nil {
-			error()
-			return
-		}
-
-		next.ServeHTTP(w, r)
-	})
-}
-
-func validAPIKey(k string) bool {
-	return len(apiKey) > 0 && k == apiKey
-}
-
 func embeddedStatic(assetDir string) http.Handler {
 	assets := auto.Assets()
 

cmd/syncthing/gui_auth.go

@@ -0,0 +1,90 @@
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// All rights reserved. Use of this source code is governed by an MIT-style
+// license that can be found in the LICENSE file.
+
+package main
+
+import (
+	"bytes"
+	"encoding/base64"
+	"math/rand"
+	"net/http"
+	"strings"
+	"sync"
+	"time"
+
+	"code.google.com/p/go.crypto/bcrypt"
+	"github.com/syncthing/syncthing/internal/config"
+)
+
+var (
+	sessions    = make(map[string]bool)
+	sessionsMut sync.Mutex
+)
+
+func basicAuthAndSessionMiddleware(cfg config.GUIConfiguration, next http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if cfg.APIKey != "" && r.Header.Get("X-API-Key") == cfg.APIKey {
+			next.ServeHTTP(w, r)
+			return
+		}
+
+		cookie, err := r.Cookie("sessionid")
+		if err == nil && cookie != nil {
+			sessionsMut.Lock()
+			_, ok := sessions[cookie.Value]
+			sessionsMut.Unlock()
+			if ok {
+				next.ServeHTTP(w, r)
+				return
+			}
+		}
+
+		error := func() {
+			time.Sleep(time.Duration(rand.Intn(100)+100) * time.Millisecond)
+			w.Header().Set("WWW-Authenticate", "Basic realm=\"Authorization Required\"")
+			http.Error(w, "Not Authorized", http.StatusUnauthorized)
+		}
+
+		hdr := r.Header.Get("Authorization")
+		if !strings.HasPrefix(hdr, "Basic ") {
+			error()
+			return
+		}
+
+		hdr = hdr[6:]
+		bs, err := base64.StdEncoding.DecodeString(hdr)
+		if err != nil {
+			error()
+			return
+		}
+
+		fields := bytes.SplitN(bs, []byte(":"), 2)
+		if len(fields) != 2 {
+			error()
+			return
+		}
+
+		if string(fields[0]) != cfg.User {
+			error()
+			return
+		}
+
+		if err := bcrypt.CompareHashAndPassword([]byte(cfg.Password), fields[1]); err != nil {
+			error()
+			return
+		}
+
+		sessionid := randomString(32)
+		sessionsMut.Lock()
+		sessions[sessionid] = true
+		sessionsMut.Unlock()
+		http.SetCookie(w, &http.Cookie{
+			Name:   "sessionid",
+			Value:  sessionid,
+			MaxAge: 0,
+		})
+
+		next.ServeHTTP(w, r)
+	})
+}

cmd/syncthing/gui_csrf.go

@@ -16,7 +16,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/syncthing/syncthing/osutil"
+	"github.com/syncthing/syncthing/internal/osutil"
 )
 
 var csrfTokens []string
@@ -25,10 +25,11 @@ var csrfMut sync.Mutex
 // Check for CSRF token on /rest/ URLs. If a correct one is not given, reject
 // the request with 403. For / and /index.html, set a new CSRF cookie if none
 // is currently set.
-func csrfMiddleware(prefix string, next http.Handler) http.Handler {
+func csrfMiddleware(prefix, apiKey string, next http.Handler) http.Handler {
+	loadCsrfTokens()
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		// Allow requests carrying a valid API key
-		if validAPIKey(r.Header.Get("X-API-Key")) {
+		if apiKey != "" && r.Header.Get("X-API-Key") == apiKey {
 			next.ServeHTTP(w, r)
 			return
 		}
@@ -76,13 +77,7 @@ func validCsrfToken(token string) bool {
 }
 
 func newCsrfToken() string {
-	bs := make([]byte, 30)
-	_, err := rand.Reader.Read(bs)
-	if err != nil {
-		l.Fatalln(err)
-	}
-
-	token := base64.StdEncoding.EncodeToString(bs)
+	token := randomString(30)
 
 	csrfMut.Lock()
 	csrfTokens = append(csrfTokens, token)
@@ -134,3 +129,13 @@ func loadCsrfTokens() {
 		csrfTokens = append(csrfTokens, s.Text())
 	}
 }
+
+func randomString(len int) string {
+	bs := make([]byte, len)
+	_, err := rand.Reader.Read(bs)
+	if err != nil {
+		l.Fatalln(err)
+	}
+
+	return base64.StdEncoding.EncodeToString(bs)
+}

cmd/syncthing/gui_windows.go

@@ -0,0 +1,52 @@
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// All rights reserved. Use of this source code is governed by an MIT-style
+// license that can be found in the LICENSE file.
+
+//+build windows
+
+package main
+
+import (
+	"syscall"
+	"time"
+)
+
+func init() {
+	go trackCPUUsage()
+}
+
+func trackCPUUsage() {
+	handle, err := syscall.GetCurrentProcess()
+	if err != nil {
+		l.Warnln("Cannot track CPU usage:", err)
+		return
+	}
+
+	var ctime, etime, ktime, utime syscall.Filetime
+	err = syscall.GetProcessTimes(handle, &ctime, &etime, &ktime, &utime)
+	if err != nil {
+		l.Warnln("Cannot track CPU usage:", err)
+		return
+	}
+
+	prevTime := ctime.Nanoseconds()
+	prevUsage := ktime.Nanoseconds() + utime.Nanoseconds() // Always overflows
+
+	for _ = range time.NewTicker(time.Second).C {
+		err := syscall.GetProcessTimes(handle, &ctime, &etime, &ktime, &utime)
+		if err != nil {
+			continue
+		}
+
+		curTime := time.Now().UnixNano()
+		timeDiff := curTime - prevTime
+		curUsage := ktime.Nanoseconds() + utime.Nanoseconds()
+		usageDiff := curUsage - prevUsage
+		cpuUsageLock.Lock()
+		copy(cpuUsagePercent[1:], cpuUsagePercent[0:])
+		cpuUsagePercent[0] = 100 * float64(usageDiff) / float64(timeDiff)
+		cpuUsageLock.Unlock()
+		prevTime = curTime
+		prevUsage = curUsage
+	}
+}

cmd/syncthing/heapprof.go

@@ -14,7 +14,8 @@ import (
 )
 
 func init() {
-	if os.Getenv("STHEAPPROFILE") != "" {
+	if innerProcess && os.Getenv("STHEAPPROFILE") != "" {
+		l.Debugln("Starting heap profiling")
 		go saveHeapProfiles()
 	}
 }

cmd/syncthing/limitedreader.go

@@ -0,0 +1,24 @@
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// All rights reserved. Use of this source code is governed by an MIT-style
+// license that can be found in the LICENSE file.
+
+package main
+
+import (
+	"io"
+
+	"github.com/juju/ratelimit"
+)
+
+type limitedReader struct {
+	r      io.Reader
+	bucket *ratelimit.Bucket
+}
+
+func (r *limitedReader) Read(buf []byte) (int, error) {
+	n, err := r.r.Read(buf)
+	if r.bucket != nil {
+		r.bucket.Wait(int64(n))
+	}
+	return n, err
+}

cmd/syncthing/main.go

@@ -16,7 +16,6 @@ import (
 	"net/http"
 	_ "net/http/pprof"
 	"os"
-	"os/exec"
 	"path/filepath"
 	"regexp"
 	"runtime"
@@ -28,16 +27,15 @@ import (
 
 	"code.google.com/p/go.crypto/bcrypt"
 	"github.com/juju/ratelimit"
-	"github.com/syncthing/syncthing/config"
-	"github.com/syncthing/syncthing/discover"
-	"github.com/syncthing/syncthing/events"
-	"github.com/syncthing/syncthing/files"
-	"github.com/syncthing/syncthing/logger"
-	"github.com/syncthing/syncthing/model"
-	"github.com/syncthing/syncthing/osutil"
-	"github.com/syncthing/syncthing/protocol"
-	"github.com/syncthing/syncthing/upgrade"
-	"github.com/syncthing/syncthing/upnp"
+	"github.com/syncthing/syncthing/internal/config"
+	"github.com/syncthing/syncthing/internal/discover"
+	"github.com/syncthing/syncthing/internal/events"
+	"github.com/syncthing/syncthing/internal/files"
+	"github.com/syncthing/syncthing/internal/logger"
+	"github.com/syncthing/syncthing/internal/model"
+	"github.com/syncthing/syncthing/internal/protocol"
+	"github.com/syncthing/syncthing/internal/upgrade"
+	"github.com/syncthing/syncthing/internal/upnp"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/opt"
 )
@@ -53,7 +51,16 @@ var (
 	GoArchExtra string // "", "v5", "v6", "v7"
 )
 
+const (
+	exitSuccess            = 0
+	exitError              = 1
+	exitNoUpgradeAvailable = 2
+	exitRestarting         = 3
+	exitUpgrading          = 4
+)
+
 var l = logger.DefaultLogger
+var innerProcess = os.Getenv("STNORESTART") != ""
 
 func init() {
 	if Version != "unknown-dev" {
@@ -76,17 +83,16 @@ func init() {
 }
 
 var (
-	cfg          config.Configuration
-	myID         protocol.NodeID
-	confDir      string
-	logFlags     int = log.Ltime
-	rateBucket   *ratelimit.Bucket
-	stop         = make(chan bool)
-	discoverer   *discover.Discoverer
-	lockConn     *net.TCPListener
-	lockPort     int
-	externalPort int
-	cert         tls.Certificate
+	cfg            config.Configuration
+	myID           protocol.NodeID
+	confDir        string
+	logFlags       int = log.Ltime
+	writeRateLimit *ratelimit.Bucket
+	readRateLimit  *ratelimit.Bucket
+	stop           = make(chan int)
+	discoverer     *discover.Discoverer
+	externalPort   int
+	cert           tls.Certificate
 )
 
 const (
@@ -153,16 +159,20 @@ func init() {
 	rand.Seed(time.Now().UnixNano())
 }
 
+// Command line options
+var (
+	reset             bool
+	showVersion       bool
+	doUpgrade         bool
+	doUpgradeCheck    bool
+	noBrowser         bool
+	generateDir       string
+	guiAddress        string
+	guiAuthentication string
+	guiAPIKey         string
+)
+
 func main() {
-	var reset bool
-	var showVersion bool
-	var doUpgrade bool
-	var doUpgradeCheck bool
-	var noBrowser bool
-	var generateDir string
-	var guiAddress string
-	var guiAuthentication string
-	var guiAPIKey string
 	flag.StringVar(&confDir, "home", getDefaultConfDir(), "Set configuration directory")
 	flag.BoolVar(&reset, "reset", false, "Prepare to resync from cluster")
 	flag.BoolVar(&showVersion, "version", false, "Show version")
@@ -188,7 +198,9 @@ func main() {
 		dir := expandTilde(generateDir)
 
 		info, err := os.Stat(dir)
-		l.FatalErr(err)
+		if err != nil {
+			l.Fatalln("generate:", err)
+		}
 		if !info.IsDir() {
 			l.Fatalln(dir, "is not a directory")
 		}
@@ -202,13 +214,24 @@ func main() {
 
 		newCertificate(dir, "")
 		cert, err = loadCert(dir, "")
-		l.FatalErr(err)
+		if err != nil {
+			l.Fatalln("load cert:", err)
+		}
 		if err == nil {
 			l.Infoln("Node ID:", protocol.NewNodeID(cert.Certificate[0]))
 		}
 		return
 	}
 
+	confDir = expandTilde(confDir)
+
+	if info, err := os.Stat(confDir); err == nil && !info.IsDir() {
+		l.Fatalln("Config directory", confDir, "is not a directory")
+	}
+
+	// Ensure that our home directory exists.
+	ensureDir(confDir, 0700)
+
 	if doUpgrade || doUpgradeCheck {
 		rel, err := upgrade.LatestRelease(strings.Contains(Version, "-beta"))
 		if err != nil {
@@ -217,12 +240,18 @@ func main() {
 
 		if upgrade.CompareVersions(rel.Tag, Version) <= 0 {
 			l.Infof("No upgrade available (current %q >= latest %q).", Version, rel.Tag)
-			os.Exit(2)
+			os.Exit(exitNoUpgradeAvailable)
 		}
 
 		l.Infof("Upgrade available (current %q < latest %q)", Version, rel.Tag)
 
 		if doUpgrade {
+			// Use leveldb database locks to protect against concurrent upgrades
+			_, err = leveldb.OpenFile(filepath.Join(confDir, "index"), &opt.Options{CachedOpenFiles: 100})
+			if err != nil {
+				l.Fatalln("Cannot upgrade, database seems to be locked. Is another copy of Syncthing already running?")
+			}
+
 			err = upgrade.UpgradeTo(rel, GoArchExtra)
 			if err != nil {
 				l.Fatalln("Upgrade:", err) // exits 1
@@ -234,12 +263,21 @@ func main() {
 		}
 	}
 
-	var err error
-	lockPort, err = getLockPort()
-	if err != nil {
-		l.Fatalln("Opening lock port:", err)
+	if reset {
+		resetRepositories()
+		return
 	}
 
+	if os.Getenv("STNORESTART") != "" {
+		syncthingMain()
+	} else {
+		monitorMain()
+	}
+}
+
+func syncthingMain() {
+	var err error
+
 	if len(os.Getenv("GOGC")) == 0 {
 		debug.SetGCPercent(25)
 	}
@@ -248,11 +286,9 @@ func main() {
 		runtime.GOMAXPROCS(runtime.NumCPU())
 	}
 
-	confDir = expandTilde(confDir)
-
 	events.Default.Log(events.Starting, map[string]string{"home": confDir})
 
-	if _, err := os.Stat(confDir); err != nil && confDir == getDefaultConfDir() {
+	if _, err = os.Stat(confDir); err != nil && confDir == getDefaultConfDir() {
 		// We are supposed to use the default configuration directory. It
 		// doesn't exist. In the past our default has been ~/.syncthing, so if
 		// that directory exists we move it to the new default location and
@@ -273,14 +309,14 @@ func main() {
 		}
 	}
 
-	// Ensure that our home directory exists and that we have a certificate and key.
-
-	ensureDir(confDir, 0700)
+	// Ensure that that we have a certificate and key.
 	cert, err = loadCert(confDir, "")
 	if err != nil {
 		newCertificate(confDir, "")
 		cert, err = loadCert(confDir, "")
-		l.FatalErr(err)
+		if err != nil {
+			l.Fatalln("load cert:", err)
+		}
 	}
 
 	myID = protocol.NewNodeID(cert.Certificate[0])
@@ -292,21 +328,14 @@ func main() {
 	// Prepare to be able to save configuration
 
 	cfgFile := filepath.Join(confDir, "config.xml")
-	go saveConfigLoop(cfgFile)
 
 	var myName string
 
 	// Load the configuration file, if it exists.
 	// If it does not, create a template.
 
-	cf, err := os.Open(cfgFile)
+	cfg, err = config.Load(cfgFile, myID)
 	if err == nil {
-		// Read config.xml
-		cfg, err = config.Load(cf, myID)
-		if err != nil {
-			l.Fatalln(err)
-		}
-		cf.Close()
 		myCfg := cfg.GetNodeConfiguration(myID)
 		if myCfg == nil || myCfg.Name == "" {
 			myName, _ = os.Hostname()
@@ -318,7 +347,7 @@ func main() {
 		myName, _ = os.Hostname()
 		defaultRepo := filepath.Join(getHomeDir(), "Sync")
 
-		cfg, err = config.Load(nil, myID)
+		cfg = config.New(cfgFile, myID)
 		cfg.Repositories = []config.RepositoryConfiguration{
 			{
 				ID:              "default",
@@ -336,26 +365,21 @@ func main() {
 		}
 
 		port, err := getFreePort("127.0.0.1", 8080)
-		l.FatalErr(err)
+		if err != nil {
+			l.Fatalln("get free port (GUI):", err)
+		}
 		cfg.GUI.Address = fmt.Sprintf("127.0.0.1:%d", port)
 
 		port, err = getFreePort("0.0.0.0", 22000)
-		l.FatalErr(err)
+		if err != nil {
+			l.Fatalln("get free port (BEP):", err)
+		}
 		cfg.Options.ListenAddress = []string{fmt.Sprintf("0.0.0.0:%d", port)}
 
-		saveConfig()
+		cfg.Save()
 		l.Infof("Edit %s to taste or use the GUI\n", cfgFile)
 	}
 
-	if reset {
-		resetRepositories()
-		return
-	}
-
-	if len(os.Getenv("STRESTART")) > 0 {
-		waitForParentExit()
-	}
-
 	if profiler := os.Getenv("STPROFILER"); len(profiler) > 0 {
 		go func() {
 			l.Debugln("Starting profiler on", profiler)
@@ -380,17 +404,20 @@ func main() {
 		MinVersion:             tls.VersionTLS12,
 	}
 
-	// If the write rate should be limited, set up a rate limiter for it.
+	// If the read or write rate should be limited, set up a rate limiter for it.
 	// This will be used on connections created in the connect and listen routines.
 
 	if cfg.Options.MaxSendKbps > 0 {
-		rateBucket = ratelimit.NewBucketWithRate(float64(1000*cfg.Options.MaxSendKbps), int64(5*1000*cfg.Options.MaxSendKbps))
+		writeRateLimit = ratelimit.NewBucketWithRate(float64(1000*cfg.Options.MaxSendKbps), int64(5*1000*cfg.Options.MaxSendKbps))
+	}
+	if cfg.Options.MaxRecvKbps > 0 {
+		readRateLimit = ratelimit.NewBucketWithRate(float64(1000*cfg.Options.MaxRecvKbps), int64(5*1000*cfg.Options.MaxRecvKbps))
 	}
 
 	// If this is the first time the user runs v0.9, archive the old indexes and config.
 	archiveLegacyConfig()
 
-	db, err := leveldb.OpenFile(filepath.Join(confDir, "index"), &opt.Options{MaxOpenFiles: 100})
+	db, err := leveldb.OpenFile(filepath.Join(confDir, "index"), &opt.Options{CachedOpenFiles: 100})
 	if err != nil {
 		l.Fatalln("Cannot open database:", err, "- Is another copy of Syncthing already running?")
 	}
@@ -411,8 +438,8 @@ nextRepo:
 		if repo.Invalid != "" {
 			continue
 		}
-
 		repo.Directory = expandTilde(repo.Directory)
+		m.AddRepo(repo)
 
 		fi, err := os.Stat(repo.Directory)
 		if m.LocalVersion(repo.ID) > 0 {
@@ -438,8 +465,6 @@ nextRepo:
 			cfg.Repositories[i].Invalid = err.Error()
 			continue nextRepo
 		}
-
-		m.AddRepo(repo)
 	}
 
 	// GUI
@@ -469,13 +494,15 @@ nextRepo:
 				proto = "https"
 			}
 
-			l.Infof("Starting web GUI on %s://%s/", proto, net.JoinHostPort(hostShow, strconv.Itoa(addr.Port)))
+			urlShow := fmt.Sprintf("%s://%s/", proto, net.JoinHostPort(hostShow, strconv.Itoa(addr.Port)))
+			l.Infoln("Starting web GUI on", urlShow)
 			err := startGUI(guiCfg, os.Getenv("STGUIASSETS"), m)
 			if err != nil {
 				l.Fatalln("Cannot start GUI:", err)
 			}
 			if !noBrowser && cfg.Options.StartBrowser && len(os.Getenv("STRESTART")) == 0 {
-				openURL(fmt.Sprintf("%s://%s:%d", proto, hostOpen, addr.Port))
+				urlOpen := fmt.Sprintf("%s://%s/", proto, net.JoinHostPort(hostOpen, strconv.Itoa(addr.Port)))
+				openURL(urlOpen)
 			}
 		}
 	}
@@ -525,6 +552,14 @@ nextRepo:
 		}
 	}
 
+	// The default port we announce, possibly modified by setupUPnP next.
+
+	addr, err := net.ResolveTCPAddr("tcp", cfg.Options.ListenAddress[0])
+	if err != nil {
+		l.Fatalln("Bad listen address:", err)
+	}
+	externalPort = addr.Port
+
 	// UPnP
 
 	if cfg.Options.UPnPEnabled {
@@ -581,14 +616,21 @@ nextRepo:
 		}()
 	}
 
-	go standbyMonitor()
+	if cfg.Options.RestartOnWakeup {
+		go standbyMonitor()
+	}
+
+	if cfg.Options.AutoUpgradeIntervalH > 0 {
+		go autoUpgrade()
+	}
 
 	events.Default.Log(events.StartupComplete, nil)
 	go generateEvents()
 
-	<-stop
+	code := <-stop
 
 	l.Okln("Exiting")
+	os.Exit(code)
 }
 
 func generateEvents() {
@@ -598,25 +640,6 @@ func generateEvents() {
 	}
 }
 
-func waitForParentExit() {
-	l.Infoln("Waiting for parent to exit...")
-	lockPortStr := os.Getenv("STRESTART")
-	lockPort, err := strconv.Atoi(lockPortStr)
-	if err != nil {
-		l.Warnln("Invalid lock port %q: %v", lockPortStr, err)
-	}
-	// Wait for the listen address to become free, indicating that the parent has exited.
-	for {
-		ln, err := net.Listen("tcp", fmt.Sprintf("127.0.0.1:%d", lockPort))
-		if err == nil {
-			ln.Close()
-			break
-		}
-		time.Sleep(250 * time.Millisecond)
-	}
-	l.Infoln("Continuing")
-}
-
 func setupUPnP() {
 	if len(cfg.Options.ListenAddress) == 1 {
 		_, portStr, err := net.SplitHostPort(cfg.Options.ListenAddress[0])
@@ -746,74 +769,12 @@ func archiveLegacyConfig() {
 
 func restart() {
 	l.Infoln("Restarting")
-	if os.Getenv("SMF_FMRI") != "" || os.Getenv("STNORESTART") != "" {
-		// Solaris SMF
-		l.Infoln("Service manager detected; exit instead of restart")
-		stop <- true
-		return
-	}
-
-	env := os.Environ()
-	newEnv := make([]string, 0, len(env))
-	for _, s := range env {
-		if !strings.HasPrefix(s, "STRESTART=") {
-			newEnv = append(newEnv, s)
-		}
-	}
-	newEnv = append(newEnv, fmt.Sprintf("STRESTART=%d", lockPort))
-
-	pgm, err := exec.LookPath(os.Args[0])
-	if err != nil {
-		l.Warnln("Cannot restart:", err)
-		return
-	}
-	proc, err := os.StartProcess(pgm, os.Args, &os.ProcAttr{
-		Env:   newEnv,
-		Files: []*os.File{os.Stdin, os.Stdout, os.Stderr},
-	})
-	if err != nil {
-		l.Fatalln(err)
-	}
-	proc.Release()
-	stop <- true
+	stop <- exitRestarting
 }
 
 func shutdown() {
-	stop <- true
-}
-
-var saveConfigCh = make(chan struct{})
-
-func saveConfigLoop(cfgFile string) {
-	for _ = range saveConfigCh {
-		fd, err := os.Create(cfgFile + ".tmp")
-		if err != nil {
-			l.Warnln("Saving config:", err)
-			continue
-		}
-
-		err = config.Save(fd, cfg)
-		if err != nil {
-			l.Warnln("Saving config:", err)
-			fd.Close()
-			continue
-		}
-
-		err = fd.Close()
-		if err != nil {
-			l.Warnln("Saving config:", err)
-			continue
-		}
-
-		err = osutil.Rename(cfgFile+".tmp", cfgFile)
-		if err != nil {
-			l.Warnln("Saving config:", err)
-		}
-	}
-}
-
-func saveConfig() {
-	saveConfigCh <- struct{}{}
+	l.Infoln("Shutting down")
+	stop <- exitSuccess
 }
 
 func listenConnect(myID protocol.NodeID, m *model.Model, tlsCfg *tls.Config) {
@@ -869,15 +830,20 @@ next:
 					continue next
 				}
 
-				// If rate limiting is set, we wrap the write side of the
-				// connection in a limiter.
+				// If rate limiting is set, we wrap the connection in a
+				// limiter.
 				var wr io.Writer = conn
-				if rateBucket != nil {
-					wr = &limitedWriter{conn, rateBucket}
+				if writeRateLimit != nil {
+					wr = &limitedWriter{conn, writeRateLimit}
+				}
+
+				var rd io.Reader = conn
+				if readRateLimit != nil {
+					rd = &limitedReader{conn, readRateLimit}
 				}
 
 				name := fmt.Sprintf("%s-%s", conn.LocalAddr(), conn.RemoteAddr())
-				protoConn := protocol.NewConnection(remoteID, conn, wr, m, name, nodeCfg.Compression)
+				protoConn := protocol.NewConnection(remoteID, rd, wr, m, name, nodeCfg.Compression)
 
 				l.Infof("Established secure connection to %s at %s", remoteID, name)
 				if debugNet {
@@ -908,9 +874,13 @@ func listenTLS(conns chan *tls.Conn, addr string, tlsCfg *tls.Config) {
 	}
 
 	tcaddr, err := net.ResolveTCPAddr("tcp", addr)
-	l.FatalErr(err)
+	if err != nil {
+		l.Fatalln("listen (BEP):", err)
+	}
 	listener, err := net.ListenTCP("tcp", tcaddr)
-	l.FatalErr(err)
+	if err != nil {
+		l.Fatalln("listen (BEP):", err)
+	}
 
 	for {
 		conn, err := listener.Accept()
@@ -1055,10 +1025,15 @@ func ensureDir(dir string, mode int) {
 	fi, err := os.Stat(dir)
 	if os.IsNotExist(err) {
 		err := os.MkdirAll(dir, 0700)
-		l.FatalErr(err)
+		if err != nil {
+			l.Fatalln(err)
+		}
 	} else if mode >= 0 && err == nil && int(fi.Mode()&0777) != mode {
 		err := os.Chmod(dir, os.FileMode(mode))
-		l.FatalErr(err)
+		// This can fail on crappy filesystems, nothing we can do about it.
+		if err != nil {
+			l.Warnln(err)
+		}
 	}
 }
 
@@ -1133,16 +1108,6 @@ func getFreePort(host string, ports ...int) (int, error) {
 	return addr.Port, nil
 }
 
-func getLockPort() (int, error) {
-	var err error
-	lockConn, err = net.ListenTCP("tcp", &net.TCPAddr{IP: net.IP{127, 0, 0, 1}})
-	if err != nil {
-		return 0, err
-	}
-	addr := lockConn.Addr().(*net.TCPAddr)
-	return addr.Port, nil
-}
-
 func overrideGUIConfig(originalCfg config.GUIConfiguration, address, authentication, apikey string) config.GUIConfiguration {
 	// Make a copy of the config
 	cfg := originalCfg
@@ -1193,13 +1158,54 @@ func overrideGUIConfig(originalCfg config.GUIConfiguration, address, authenticat
 }
 
 func standbyMonitor() {
+	restartDelay := time.Duration(60 * time.Second)
 	now := time.Now()
 	for {
 		time.Sleep(10 * time.Second)
 		if time.Since(now) > 2*time.Minute {
-			l.Infoln("Paused state detected, possibly woke up from standby.")
+			l.Infoln("Paused state detected, possibly woke up from standby. Restarting in", restartDelay)
+
+			// We most likely just woke from standby. If we restart
+			// immediately chances are we won't have networking ready. Give
+			// things a moment to stabilize.
+			time.Sleep(restartDelay)
+
 			restart()
+			return
 		}
 		now = time.Now()
 	}
 }
+
+func autoUpgrade() {
+	var skipped bool
+	interval := time.Duration(cfg.Options.AutoUpgradeIntervalH) * time.Hour
+	for {
+		if skipped {
+			time.Sleep(interval)
+		} else {
+			skipped = true
+		}
+
+		rel, err := upgrade.LatestRelease(strings.Contains(Version, "-beta"))
+		if err != nil {
+			l.Warnln("Automatic upgrade:", err)
+			continue
+		}
+
+		if upgrade.CompareVersions(rel.Tag, Version) <= 0 {
+			continue
+		}
+
+		l.Infof("Automatic upgrade (current %q < latest %q)", Version, rel.Tag)
+		err = upgrade.UpgradeTo(rel, GoArchExtra)
+		if err != nil {
+			l.Warnln("Automatic upgrade:", err)
+			continue
+		}
+		l.Warnf("Automatically upgraded to version %q. Restarting in 1 minute.", rel.Tag)
+		time.Sleep(time.Minute)
+		stop <- exitUpgrading
+		return
+	}
+}

cmd/syncthing/monitor.go

@@ -0,0 +1,182 @@
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// All rights reserved. Use of this source code is governed by an MIT-style
+// license that can be found in the LICENSE file.
+
+package main
+
+import (
+	"bufio"
+	"io"
+	"os"
+	"os/exec"
+	"os/signal"
+	"path/filepath"
+	"strings"
+	"sync"
+	"syscall"
+	"time"
+)
+
+var (
+	stdoutFirstLines []string // The first 10 lines of stdout
+	stdoutLastLines  []string // The last 50 lines of stdout
+	stdoutMut        sync.Mutex
+)
+
+const (
+	countRestarts = 5
+	loopThreshold = 15 * time.Second
+)
+
+func monitorMain() {
+	os.Setenv("STNORESTART", "yes")
+	l.SetPrefix("[monitor] ")
+
+	args := os.Args
+	var restarts [countRestarts]time.Time
+
+	sign := make(chan os.Signal, 1)
+	sigTerm := syscall.Signal(0xf)
+	signal.Notify(sign, os.Interrupt, sigTerm, os.Kill)
+
+	for {
+		if t := time.Since(restarts[0]); t < loopThreshold {
+			l.Warnf("%d restarts in %v; not retrying further", countRestarts, t)
+			os.Exit(exitError)
+		}
+
+		copy(restarts[0:], restarts[1:])
+		restarts[len(restarts)-1] = time.Now()
+
+		cmd := exec.Command(args[0], args[1:]...)
+
+		stderr, err := cmd.StderrPipe()
+		if err != nil {
+			l.Fatalln(err)
+		}
+
+		stdout, err := cmd.StdoutPipe()
+		if err != nil {
+			l.Fatalln(err)
+		}
+
+		l.Infoln("Starting syncthing")
+		err = cmd.Start()
+		if err != nil {
+			l.Fatalln(err)
+		}
+
+		stdoutMut.Lock()
+		stdoutFirstLines = make([]string, 0, 10)
+		stdoutLastLines = make([]string, 0, 50)
+		stdoutMut.Unlock()
+
+		go copyStderr(stderr)
+		go copyStdout(stdout)
+
+		exit := make(chan error)
+
+		go func() {
+			exit <- cmd.Wait()
+		}()
+
+		select {
+		case s := <-sign:
+			l.Infof("Signal %d received; exiting", s)
+			cmd.Process.Kill()
+			<-exit
+			return
+
+		case err = <-exit:
+			if err == nil {
+				// Successfull exit indicates an intentional shutdown
+				return
+			} else if exiterr, ok := err.(*exec.ExitError); ok {
+				if status, ok := exiterr.Sys().(syscall.WaitStatus); ok {
+					switch status.ExitStatus() {
+					case exitUpgrading:
+						// Restart the monitor process to release the .old
+						// binary as part of the upgrade process.
+						l.Infoln("Restarting monitor...")
+						os.Setenv("STNORESTART", "")
+						err := exec.Command(args[0], args[1:]...).Start()
+						if err != nil {
+							l.Warnln("restart:", err)
+						}
+						return
+					}
+				}
+			}
+		}
+
+		l.Infoln("Syncthing exited:", err)
+		time.Sleep(1 * time.Second)
+
+		// Let the next child process know that this is not the first time
+		// it's starting up.
+		os.Setenv("STRESTART", "yes")
+	}
+}
+
+func copyStderr(stderr io.ReadCloser) {
+	br := bufio.NewReader(stderr)
+
+	var panicFd *os.File
+	for {
+		line, err := br.ReadString('\n')
+		if err != nil {
+			return
+		}
+
+		if panicFd == nil {
+			os.Stderr.WriteString(line)
+
+			if strings.HasPrefix(line, "panic:") || strings.HasPrefix(line, "fatal error:") {
+				panicFd, err = os.Create(filepath.Join(confDir, time.Now().Format("panic-20060102-150405.log")))
+				if err != nil {
+					l.Warnln("Create panic log:", err)
+					continue
+				}
+
+				l.Warnf("Panic detected, writing to \"%s\"", panicFd.Name())
+				l.Warnln("Please create an issue at https://github.com/syncthing/syncthing/issues/ with the panic log attached")
+
+				panicFd.WriteString("Panic at " + time.Now().Format(time.RFC1123) + "\n")
+				stdoutMut.Lock()
+				for _, line := range stdoutFirstLines {
+					panicFd.WriteString(line)
+				}
+				panicFd.WriteString("...\n")
+				for _, line := range stdoutLastLines {
+					panicFd.WriteString(line)
+				}
+			}
+		}
+
+		if panicFd != nil {
+			panicFd.WriteString(line)
+		}
+	}
+}
+
+func copyStdout(stderr io.ReadCloser) {
+	br := bufio.NewReader(stderr)
+	for {
+		line, err := br.ReadString('\n')
+		if err != nil {
+			return
+		}
+
+		stdoutMut.Lock()
+		if len(stdoutFirstLines) < cap(stdoutFirstLines) {
+			stdoutFirstLines = append(stdoutFirstLines, line)
+		}
+		if l := len(stdoutLastLines); l == cap(stdoutLastLines) {
+			stdoutLastLines = stdoutLastLines[:l-1]
+		}
+		stdoutLastLines = append(stdoutLastLines, line)
+		stdoutMut.Unlock()
+
+		os.Stdout.WriteString(line)
+	}
+}

cmd/syncthing/perfstats_unix.go

@@ -12,10 +12,12 @@ import (
 	"runtime"
 	"syscall"
 	"time"
+
+	"github.com/syncthing/syncthing/internal/protocol"
 )
 
 func init() {
-	if os.Getenv("STPERFSTATS") != "" {
+	if innerProcess && os.Getenv("STPERFSTATS") != "" {
 		go savePerfStats(fmt.Sprintf("perfstats-%d.csv", syscall.Getpid()))
 	}
 }
@@ -30,6 +32,7 @@ func savePerfStats(file string) {
 	var prevTime int64
 	var rusage syscall.Rusage
 	var memstats runtime.MemStats
+	var prevIn, prevOut uint64
 
 	t0 := time.Now()
 	for t := range time.NewTicker(250 * time.Millisecond).C {
@@ -41,11 +44,18 @@ func savePerfStats(file string) {
 		cpuUsagePercent := 100 * float64(usageDiff) / float64(timeDiff)
 		prevTime = curTime
 		prevUsage = curUsage
+		in, out := protocol.TotalInOut()
+		var inRate, outRate float64
+		if timeDiff > 0 {
+			inRate = float64(in-prevIn) / (float64(timeDiff) / 1e9)    // bytes per second
+			outRate = float64(out-prevOut) / (float64(timeDiff) / 1e9) // bytes per second
+		}
+		prevIn, prevOut = in, out
 
 		runtime.ReadMemStats(&memstats)
 
 		startms := int(t.Sub(t0).Seconds() * 1000)
 
-		fmt.Fprintf(fd, "%d\t%f\t%d\t%d\n", startms, cpuUsagePercent, memstats.Alloc, memstats.Sys-memstats.HeapReleased)
+		fmt.Fprintf(fd, "%d\t%f\t%d\t%d\t%.0f\t%.0f\n", startms, cpuUsagePercent, memstats.Alloc, memstats.Sys-memstats.HeapReleased, inRate, outRate)
 	}
 }

cmd/syncthing/tls.go

@@ -5,6 +5,7 @@
 package main
 
 import (
+	"bufio"
 	"crypto/rand"
 	"crypto/rsa"
 	"crypto/sha256"
@@ -13,8 +14,10 @@ import (
 	"crypto/x509/pkix"
 	"encoding/binary"
 	"encoding/pem"
+	"io"
 	"math/big"
 	mr "math/rand"
+	"net"
 	"os"
 	"path/filepath"
 	"time"
@@ -42,7 +45,9 @@ func newCertificate(dir string, prefix string) {
 	l.Infoln("Generating RSA key and certificate...")
 
 	priv, err := rsa.GenerateKey(rand.Reader, tlsRSABits)
-	l.FatalErr(err)
+	if err != nil {
+		l.Fatalln("generate key:", err)
+	}
 
 	notBefore := time.Now()
 	notAfter := time.Date(2049, 12, 31, 23, 59, 59, 0, time.UTC)
@@ -61,15 +66,71 @@ func newCertificate(dir string, prefix string) {
 	}
 
 	derBytes, err := x509.CreateCertificate(rand.Reader, &template, &template, &priv.PublicKey, priv)
-	l.FatalErr(err)
+	if err != nil {
+		l.Fatalln("create cert:", err)
+	}
 
 	certOut, err := os.Create(filepath.Join(dir, prefix+"cert.pem"))
-	l.FatalErr(err)
-	pem.Encode(certOut, &pem.Block{Type: "CERTIFICATE", Bytes: derBytes})
-	certOut.Close()
+	if err != nil {
+		l.Fatalln("save cert:", err)
+	}
+	err = pem.Encode(certOut, &pem.Block{Type: "CERTIFICATE", Bytes: derBytes})
+	if err != nil {
+		l.Fatalln("save cert:", err)
+	}
+	err = certOut.Close()
+	if err != nil {
+		l.Fatalln("save cert:", err)
+	}
 
 	keyOut, err := os.OpenFile(filepath.Join(dir, prefix+"key.pem"), os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600)
-	l.FatalErr(err)
-	pem.Encode(keyOut, &pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(priv)})
-	keyOut.Close()
+	if err != nil {
+		l.Fatalln("save key:", err)
+	}
+	err = pem.Encode(keyOut, &pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(priv)})
+	if err != nil {
+		l.Fatalln("save key:", err)
+	}
+	err = keyOut.Close()
+	if err != nil {
+		l.Fatalln("save key:", err)
+	}
+}
+
+type DowngradingListener struct {
+	net.Listener
+	TLSConfig *tls.Config
+}
+
+type WrappedConnection struct {
+	io.Reader
+	net.Conn
+}
+
+func (l *DowngradingListener) Accept() (net.Conn, error) {
+	conn, err := l.Listener.Accept()
+	if err != nil {
+		return nil, err
+	}
+
+	br := bufio.NewReader(conn)
+	bs, err := br.Peek(1)
+	if err != nil {
+		// We hit a read error here, but the Accept() call succeeded so we must not return an error.
+		// We return the connection as is and let whoever tries to use it deal with the error.
+		return conn, nil
+	}
+
+	wrapper := &WrappedConnection{br, conn}
+
+	// 0x16 is the first byte of a TLS handshake
+	if bs[0] == 0x16 {
+		return tls.Server(wrapper, l.TLSConfig), nil
+	}
+
+	return wrapper, nil
+}
+
+func (c *WrappedConnection) Read(b []byte) (n int, err error) {
+	return c.Reader.Read(b)
 }

cmd/syncthing/usage_report.go

@@ -15,7 +15,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/syncthing/syncthing/model"
+	"github.com/syncthing/syncthing/internal/model"
 )
 
 // Current version number of the usage report, for acceptance purposes. If

config/config_test.go

@@ -1,378 +0,0 @@
-// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-// All rights reserved. Use of this source code is governed by an MIT-style
-// license that can be found in the LICENSE file.
-
-package config
-
-import (
-	"bytes"
-	"io"
-	"os"
-	"reflect"
-	"testing"
-
-	"github.com/syncthing/syncthing/protocol"
-)
-
-var node1, node2, node3, node4 protocol.NodeID
-
-func init() {
-	node1, _ = protocol.NodeIDFromString("AIR6LPZ7K4PTTUXQSMUUCPQ5YWOEDFIIQJUG7772YQXXR5YD6AWQ")
-	node2, _ = protocol.NodeIDFromString("GYRZZQB-IRNPV4Z-T7TC52W-EQYJ3TT-FDQW6MW-DFLMU42-SSSU6EM-FBK2VAY")
-	node3, _ = protocol.NodeIDFromString("LGFPDIT-7SKNNJL-VJZA4FC-7QNCRKA-CE753K7-2BW5QDK-2FOZ7FR-FEP57QJ")
-	node4, _ = protocol.NodeIDFromString("P56IOI7-MZJNU2Y-IQGDREY-DM2MGTI-MGL3BXN-PQ6W5BM-TBBZ4TJ-XZWICQ2")
-}
-
-func TestDefaultValues(t *testing.T) {
-	expected := OptionsConfiguration{
-		ListenAddress:      []string{"0.0.0.0:22000"},
-		GlobalAnnServer:    "announce.syncthing.net:22026",
-		GlobalAnnEnabled:   true,
-		LocalAnnEnabled:    true,
-		LocalAnnPort:       21025,
-		LocalAnnMCAddr:     "[ff32::5222]:21026",
-		ParallelRequests:   16,
-		MaxSendKbps:        0,
-		ReconnectIntervalS: 60,
-		StartBrowser:       true,
-		UPnPEnabled:        true,
-		UPnPLease:          0,
-		UPnPRenewal:        30,
-	}
-
-	cfg, err := Load(bytes.NewReader(nil), node1)
-	if err != io.EOF {
-		t.Error(err)
-	}
-
-	if !reflect.DeepEqual(cfg.Options, expected) {
-		t.Errorf("Default config differs;\n  E: %#v\n  A: %#v", expected, cfg.Options)
-	}
-}
-
-func TestNodeConfig(t *testing.T) {
-	v1data := []byte(`
-<configuration version="1">
-    <repository id="test" directory="~/Sync">
-        <node id="AIR6LPZ7K4PTTUXQSMUUCPQ5YWOEDFIIQJUG7772YQXXR5YD6AWQ" name="node one">
-            <address>a</address>
-        </node>
-        <node id="P56IOI7MZJNU2IQGDREYDM2MGTMGL3BXNPQ6W5BTBBZ4TJXZWICQ" name="node two">
-            <address>b</address>
-        </node>
-        <node id="AIR6LPZ7K4PTTUXQSMUUCPQ5YWOEDFIIQJUG7772YQXXR5YD6AWQ" name="node one">
-            <address>a</address>
-        </node>
-        <node id="P56IOI7MZJNU2IQGDREYDM2MGTMGL3BXNPQ6W5BTBBZ4TJXZWICQ" name="node two">
-            <address>b</address>
-        </node>
-    </repository>
-    <options>
-        <readOnly>true</readOnly>
-        <rescanIntervalS>600</rescanIntervalS>
-    </options>
-</configuration>
-`)
-
-	v2data := []byte(`
-<configuration version="2">
-    <repository id="test" directory="~/Sync" ro="true">
-        <node id="P56IOI7MZJNU2IQGDREYDM2MGTMGL3BXNPQ6W5BTBBZ4TJXZWICQ"/>
-        <node id="AIR6LPZ7K4PTTUXQSMUUCPQ5YWOEDFIIQJUG7772YQXXR5YD6AWQ"/>
-        <node id="C4YBIESWDUAIGU62GOSRXCRAAJDWVE3TKCPMURZE2LH5QHAF576A"/>
-        <node id="P56IOI7MZJNU2IQGDREYDM2MGTMGL3BXNPQ6W5BTBBZ4TJXZWICQ"/>
-        <node id="AIR6LPZ7K4PTTUXQSMUUCPQ5YWOEDFIIQJUG7772YQXXR5YD6AWQ"/>
-        <node id="C4YBIESWDUAIGU62GOSRXCRAAJDWVE3TKCPMURZE2LH5QHAF576A"/>
-    </repository>
-    <node id="AIR6LPZ7K4PTTUXQSMUUCPQ5YWOEDFIIQJUG7772YQXXR5YD6AWQ" name="node one">
-        <address>a</address>
-    </node>
-    <node id="P56IOI7MZJNU2IQGDREYDM2MGTMGL3BXNPQ6W5BTBBZ4TJXZWICQ" name="node two">
-        <address>b</address>
-    </node>
-    <options>
-        <rescanIntervalS>600</rescanIntervalS>
-    </options>
-</configuration>
-`)
-
-	v3data := []byte(`
-<configuration version="3">
-    <repository id="test" directory="~/Sync" ro="true" ignorePerms="false">
-        <node id="AIR6LPZ-7K4PTTV-UXQSMUU-CPQ5YWH-OEDFIIQ-JUG777G-2YQXXR5-YD6AWQR" compression="false"></node>
-        <node id="P56IOI7-MZJNU2Y-IQGDREY-DM2MGTI-MGL3BXN-PQ6W5BM-TBBZ4TJ-XZWICQ2" compression="false"></node>
-    </repository>
-    <node id="AIR6LPZ-7K4PTTV-UXQSMUU-CPQ5YWH-OEDFIIQ-JUG777G-2YQXXR5-YD6AWQR" name="node one" compression="true">
-        <address>a</address>
-    </node>
-    <node id="P56IOI7-MZJNU2Y-IQGDREY-DM2MGTI-MGL3BXN-PQ6W5BM-TBBZ4TJ-XZWICQ2" name="node two" compression="true">
-        <address>b</address>
-    </node>
-    <options>
-        <rescanIntervalS>600</rescanIntervalS>
-    </options>
-</configuration>`)
-
-	v4data := []byte(`
-<configuration version="4">
-    <repository id="test" directory="~/Sync" ro="true" ignorePerms="false" rescanIntervalS="600">
-        <node id="AIR6LPZ-7K4PTTV-UXQSMUU-CPQ5YWH-OEDFIIQ-JUG777G-2YQXXR5-YD6AWQR"></node>
-        <node id="P56IOI7-MZJNU2Y-IQGDREY-DM2MGTI-MGL3BXN-PQ6W5BM-TBBZ4TJ-XZWICQ2"></node>
-    </repository>
-    <node id="AIR6LPZ-7K4PTTV-UXQSMUU-CPQ5YWH-OEDFIIQ-JUG777G-2YQXXR5-YD6AWQR" name="node one" compression="true">
-        <address>a</address>
-    </node>
-    <node id="P56IOI7-MZJNU2Y-IQGDREY-DM2MGTI-MGL3BXN-PQ6W5BM-TBBZ4TJ-XZWICQ2" name="node two" compression="true">
-        <address>b</address>
-    </node>
-</configuration>`)
-
-	for i, data := range [][]byte{v1data, v2data, v3data, v4data} {
-		cfg, err := Load(bytes.NewReader(data), node1)
-		if err != nil {
-			t.Error(err)
-		}
-
-		expectedRepos := []RepositoryConfiguration{
-			{
-				ID:              "test",
-				Directory:       "~/Sync",
-				Nodes:           []RepositoryNodeConfiguration{{NodeID: node1}, {NodeID: node4}},
-				ReadOnly:        true,
-				RescanIntervalS: 600,
-			},
-		}
-		expectedNodes := []NodeConfiguration{
-			{
-				NodeID:      node1,
-				Name:        "node one",
-				Addresses:   []string{"a"},
-				Compression: true,
-			},
-			{
-				NodeID:      node4,
-				Name:        "node two",
-				Addresses:   []string{"b"},
-				Compression: true,
-			},
-		}
-		expectedNodeIDs := []protocol.NodeID{node1, node4}
-
-		if cfg.Version != 4 {
-			t.Errorf("%d: Incorrect version %d != 3", i, cfg.Version)
-		}
-		if !reflect.DeepEqual(cfg.Repositories, expectedRepos) {
-			t.Errorf("%d: Incorrect Repositories\n  A: %#v\n  E: %#v", i, cfg.Repositories, expectedRepos)
-		}
-		if !reflect.DeepEqual(cfg.Nodes, expectedNodes) {
-			t.Errorf("%d: Incorrect Nodes\n  A: %#v\n  E: %#v", i, cfg.Nodes, expectedNodes)
-		}
-		if !reflect.DeepEqual(cfg.Repositories[0].NodeIDs(), expectedNodeIDs) {
-			t.Errorf("%d: Incorrect NodeIDs\n  A: %#v\n  E: %#v", i, cfg.Repositories[0].NodeIDs(), expectedNodeIDs)
-		}
-
-		if len(cfg.NodeMap()) != len(expectedNodes) {
-			t.Errorf("Unexpected number of NodeMap() entries")
-		}
-		if len(cfg.RepoMap()) != len(expectedRepos) {
-			t.Errorf("Unexpected number of RepoMap() entries")
-		}
-	}
-}
-
-func TestNoListenAddress(t *testing.T) {
-	data := []byte(`<configuration version="1">
-    <options>
-        <listenAddress></listenAddress>
-    </options>
-</configuration>
-`)
-
-	cfg, err := Load(bytes.NewReader(data), node1)
-	if err != nil {
-		t.Error(err)
-	}
-
-	expected := []string{""}
-	if !reflect.DeepEqual(cfg.Options.ListenAddress, expected) {
-		t.Errorf("Unexpected ListenAddress %#v", cfg.Options.ListenAddress)
-	}
-}
-
-func TestOverriddenValues(t *testing.T) {
-	data := []byte(`<configuration version="2">
-    <options>
-       <listenAddress>:23000</listenAddress>
-        <allowDelete>false</allowDelete>
-        <globalAnnounceServer>syncthing.nym.se:22026</globalAnnounceServer>
-        <globalAnnounceEnabled>false</globalAnnounceEnabled>
-        <localAnnounceEnabled>false</localAnnounceEnabled>
-        <localAnnouncePort>42123</localAnnouncePort>
-        <localAnnounceMCAddr>quux:3232</localAnnounceMCAddr>
-        <parallelRequests>32</parallelRequests>
-        <maxSendKbps>1234</maxSendKbps>
-        <reconnectionIntervalS>6000</reconnectionIntervalS>
-        <startBrowser>false</startBrowser>
-        <upnpEnabled>false</upnpEnabled>
-        <upnpLeaseMinutes>60</upnpLeaseMinutes>
-        <upnpRenewalMinutes>15</upnpRenewalMinutes>
-    </options>
-</configuration>
-`)
-
-	expected := OptionsConfiguration{
-		ListenAddress:      []string{":23000"},
-		GlobalAnnServer:    "syncthing.nym.se:22026",
-		GlobalAnnEnabled:   false,
-		LocalAnnEnabled:    false,
-		LocalAnnPort:       42123,
-		LocalAnnMCAddr:     "quux:3232",
-		ParallelRequests:   32,
-		MaxSendKbps:        1234,
-		ReconnectIntervalS: 6000,
-		StartBrowser:       false,
-		UPnPEnabled:        false,
-		UPnPLease:          60,
-		UPnPRenewal:        15,
-	}
-
-	cfg, err := Load(bytes.NewReader(data), node1)
-	if err != nil {
-		t.Error(err)
-	}
-
-	if !reflect.DeepEqual(cfg.Options, expected) {
-		t.Errorf("Overridden config differs;\n  E: %#v\n  A: %#v", expected, cfg.Options)
-	}
-}
-
-func TestNodeAddressesDynamic(t *testing.T) {
-	data := []byte(`
-<configuration version="2">
-    <node id="AIR6LPZ7K4PTTUXQSMUUCPQ5YWOEDFIIQJUG7772YQXXR5YD6AWQ">
-        <address></address>
-    </node>
-    <node id="GYRZZQBIRNPV4T7TC52WEQYJ3TFDQW6MWDFLMU4SSSU6EMFBK2VA">
-    </node>
-    <node id="LGFPDIT7SKNNJVJZA4FC7QNCRKCE753K72BW5QD2FOZ7FRFEP57Q">
-        <address>dynamic</address>
-    </node>
-</configuration>
-`)
-
-	name, _ := os.Hostname()
-	expected := []NodeConfiguration{
-		{
-			NodeID:      node1,
-			Addresses:   []string{"dynamic"},
-			Compression: true,
-		},
-		{
-			NodeID:      node2,
-			Addresses:   []string{"dynamic"},
-			Compression: true,
-		},
-		{
-			NodeID:      node3,
-			Addresses:   []string{"dynamic"},
-			Compression: true,
-		},
-		{
-			NodeID:    node4,
-			Name:      name, // Set when auto created
-			Addresses: []string{"dynamic"},
-		},
-	}
-
-	cfg, err := Load(bytes.NewReader(data), node4)
-	if err != nil {
-		t.Error(err)
-	}
-
-	if !reflect.DeepEqual(cfg.Nodes, expected) {
-		t.Errorf("Nodes differ;\n  E: %#v\n  A: %#v", expected, cfg.Nodes)
-	}
-}
-
-func TestNodeAddressesStatic(t *testing.T) {
-	data := []byte(`
-<configuration version="3">
-    <node id="AIR6LPZ7K4PTTUXQSMUUCPQ5YWOEDFIIQJUG7772YQXXR5YD6AWQ">
-        <address>192.0.2.1</address>
-        <address>192.0.2.2</address>
-    </node>
-    <node id="GYRZZQBIRNPV4T7TC52WEQYJ3TFDQW6MWDFLMU4SSSU6EMFBK2VA">
-        <address>192.0.2.3:6070</address>
-        <address>[2001:db8::42]:4242</address>
-    </node>
-    <node id="LGFPDIT7SKNNJVJZA4FC7QNCRKCE753K72BW5QD2FOZ7FRFEP57Q">
-        <address>[2001:db8::44]:4444</address>
-        <address>192.0.2.4:6090</address>
-    </node>
-</configuration>
-`)
-
-	name, _ := os.Hostname()
-	expected := []NodeConfiguration{
-		{
-			NodeID:    node1,
-			Addresses: []string{"192.0.2.1", "192.0.2.2"},
-		},
-		{
-			NodeID:    node2,
-			Addresses: []string{"192.0.2.3:6070", "[2001:db8::42]:4242"},
-		},
-		{
-			NodeID:    node3,
-			Addresses: []string{"[2001:db8::44]:4444", "192.0.2.4:6090"},
-		},
-		{
-			NodeID:    node4,
-			Name:      name, // Set when auto created
-			Addresses: []string{"dynamic"},
-		},
-	}
-
-	cfg, err := Load(bytes.NewReader(data), node4)
-	if err != nil {
-		t.Error(err)
-	}
-
-	if !reflect.DeepEqual(cfg.Nodes, expected) {
-		t.Errorf("Nodes differ;\n  E: %#v\n  A: %#v", expected, cfg.Nodes)
-	}
-}
-
-func TestVersioningConfig(t *testing.T) {
-	data := []byte(`
-		<configuration version="2">
-			<repository id="test" directory="~/Sync" ro="true">
-				<versioning type="simple">
-					<param key="foo" val="bar"/>
-					<param key="baz" val="quux"/>
-				</versioning>
-			</repository>
-		</configuration>
-		`)
-
-	cfg, err := Load(bytes.NewReader(data), node4)
-	if err != nil {
-		t.Error(err)
-	}
-
-	vc := cfg.Repositories[0].Versioning
-	if vc.Type != "simple" {
-		t.Errorf(`vc.Type %q != "simple"`, vc.Type)
-	}
-	if l := len(vc.Params); l != 2 {
-		t.Errorf("len(vc.Params) %d != 2", l)
-	}
-
-	expected := map[string]string{
-		"foo": "bar",
-		"baz": "quux",
-	}
-	if !reflect.DeepEqual(vc.Params, expected) {
-		t.Errorf("vc.Params differ;\n  E: %#v\n  A: %#v", expected, vc.Params)
-	}
-}

gui/app.js

@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 /*jslint browser: true, continue: true, plusplus: true */
-/*global $: false, angular: false */
+/*global $: false, angular: false, console: false, validLangs: false */
 
 'use strict';
 
@@ -42,15 +42,15 @@ syncthing.controller('EventCtrl', function ($scope, $http) {
                 console.log("event", event.id, event.type, event.data);
                 $scope.$emit(event.type, event);
             });
-        };
+        }
 
         $scope.lastEvent = data[data.length - 1];
         lastID = $scope.lastEvent.id;
 
         setTimeout(function () {
             $http.get(urlbase + '/events?since=' + lastID)
-            .success(successFn)
-            .error(errorFn);
+                .success(successFn)
+                .error(errorFn);
         }, 500);
     };
 
@@ -59,8 +59,8 @@ syncthing.controller('EventCtrl', function ($scope, $http) {
 
         setTimeout(function () {
             $http.get(urlbase + '/events?limit=1')
-            .success(successFn)
-            .error(errorFn);
+                .success(successFn)
+                .error(errorFn);
         }, 1000);
     };
 
@@ -92,7 +92,7 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
     $scope.upgradeInfo = {};
     $scope.stats = {};
 
-    $http.get(urlbase+"/lang").success(function (langs) {
+    $http.get(urlbase + "/lang").success(function (langs) {
         // Find the first language in the list provided by the user's browser
         // that is a prefix of a language we have available. That is, "en"
         // sent by the browser will match "en" or "en-US", while "zh-TW" will
@@ -108,11 +108,11 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
                 // The langs returned by the /rest/langs call will be in lower
                 // case. We compare to the lowercase version of the language
                 // code we have as well.
-                possibleLang = possibleLang.toLowerCase()
+                possibleLang = possibleLang.toLowerCase();
                 if (possibleLang.length > lang.length) {
-                    return possibleLang.indexOf(lang) == 0;
+                    return possibleLang.indexOf(lang) === 0;
                 } else {
-                    return lang.indexOf(possibleLang) == 0;
+                    return lang.indexOf(possibleLang) === 0;
                 }
             });
             if (matching.length >= 1) {
@@ -122,9 +122,9 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
         }
         // Fallback if nothing matched
         $translate.use("en");
-    })
+    });
 
-    $(window).bind('beforeunload', function() {
+    $(window).bind('beforeunload', function () {
         navigatingAway = true;
     });
 
@@ -140,26 +140,30 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
         'rmdir': 'Del (dir)',
         'sync': 'Sync',
         'touch': 'Update',
-    }
+    };
     $scope.needIcons = {
         'rm': 'remove',
         'rmdir': 'remove',
         'sync': 'download',
         'touch': 'asterisk',
-    }
+    };
 
     $scope.$on('UIOnline', function (event, arg) {
         if (online && !restarting) {
             return;
         }
 
-        console.log('UIOnline');
-        $scope.init();
-        online = true;
-        restarting = false;
-        $('#networkError').modal('hide');
-        $('#restarting').modal('hide');
-        $('#shutdown').modal('hide');
+        if (restarting) {
+            document.location.reload(true);
+        } else {
+            console.log('UIOnline');
+            $scope.init();
+            online = true;
+            restarting = false;
+            $('#networkError').modal('hide');
+            $('#restarting').modal('hide');
+            $('#shutdown').modal('hide');
+        }
     });
 
     $scope.$on('UIOffline', function (event, arg) {
@@ -218,7 +222,7 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
     });
 
     $scope.$on('ConfigLoaded', function (event) {
-        if ($scope.config.Options.URAccepted == 0) {
+        if ($scope.config.Options.URAccepted === 0) {
             // If usage reporting has been neither accepted nor declined,
             // we want to ask the user to make a choice. But we don't want
             // to bug them during initial setup, so we set a cookie with
@@ -228,14 +232,22 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
 
             var firstVisit = document.cookie.replace(/(?:(?:^|.*;\s*)firstVisit\s*\=\s*([^;]*).*$)|^.*$/, "$1");
             if (!firstVisit) {
-                document.cookie = "firstVisit=" + Date.now() + ";max-age=" + 30*24*3600;
+                document.cookie = "firstVisit=" + Date.now() + ";max-age=" + 30 * 24 * 3600;
             } else {
-                if (+firstVisit < Date.now() - 4*3600*1000){
+                if (+firstVisit < Date.now() - 4 * 3600 * 1000) {
                     $('#ur').modal();
                 }
             }
         }
-    })
+    });
+
+    $scope.$on('ConfigSaved', function (event, arg) {
+        updateLocalConfig(arg.data);
+
+        $http.get(urlbase + '/config/sync').success(function (data) {
+            $scope.configInSync = data.configInSync;
+        });
+    });
 
     var debouncedFuncs = {};
 
@@ -252,6 +264,33 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
         debouncedFuncs[key]();
     }
 
+    function updateLocalConfig(config) {
+        var hasConfig = !isEmptyObject($scope.config);
+
+        $scope.config = config;
+        $scope.config.Options.ListenStr = $scope.config.Options.ListenAddress.join(', ');
+
+        $scope.nodes = $scope.config.Nodes;
+        $scope.nodes.forEach(function (nodeCfg) {
+            $scope.completion[nodeCfg.NodeID] = {
+                _total: 100,
+            };
+        });
+        $scope.nodes.sort(nodeCompare);
+
+        $scope.repos = repoMap($scope.config.Repositories);
+        Object.keys($scope.repos).forEach(function (repo) {
+            refreshRepo(repo);
+            $scope.repos[repo].Nodes.forEach(function (nodeCfg) {
+                refreshCompletion(nodeCfg.NodeID, repo);
+            });
+        });
+
+        if (!hasConfig) {
+            $scope.$emit('ConfigLoaded');
+        }
+    }
+
     function refreshSystem() {
         $http.get(urlbase + '/system').success(function (data) {
             $scope.myID = data.myID;
@@ -262,7 +301,7 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
 
     function refreshCompletion(node, repo) {
         if (node === $scope.myID) {
-            return
+            return;
         }
 
         var key = "refreshCompletion" + node + repo;
@@ -274,7 +313,8 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
                     }
                     $scope.completion[node][repo] = data.completion;
 
-                    var tot = 0, cnt = 0;
+                    var tot = 0,
+                        cnt = 0;
                     for (var cmp in $scope.completion[node]) {
                         if (cmp === "_total") {
                             continue;
@@ -294,8 +334,8 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
     function refreshConnectionStats() {
         $http.get(urlbase + '/connections').success(function (data) {
             var now = Date.now(),
-            td = (now - prevDate) / 1000,
-            id;
+                td = (now - prevDate) / 1000,
+                id;
 
             prevDate = now;
             for (id in data) {
@@ -317,38 +357,14 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
 
     function refreshErrors() {
         $http.get(urlbase + '/errors').success(function (data) {
-            $scope.errors = data;
+            $scope.errors = data.errors;
             console.log("refreshErrors", data);
         });
     }
 
     function refreshConfig() {
         $http.get(urlbase + '/config').success(function (data) {
-            var hasConfig = !isEmptyObject($scope.config);
-
-            $scope.config = data;
-            $scope.config.Options.ListenStr = $scope.config.Options.ListenAddress.join(', ');
-
-            $scope.nodes = $scope.config.Nodes;
-            $scope.nodes.forEach(function (nodeCfg) {
-                $scope.completion[nodeCfg.NodeID] = {
-                    _total: 100,
-                };
-            });
-            $scope.nodes.sort(nodeCompare);
-
-            $scope.repos = repoMap($scope.config.Repositories);
-            Object.keys($scope.repos).forEach(function (repo) {
-                refreshRepo(repo);
-                $scope.repos[repo].Nodes.forEach(function (nodeCfg) {
-                    refreshCompletion(nodeCfg.NodeID, repo);
-                });
-            });
-
-            if (!hasConfig) {
-                $scope.$emit('ConfigLoaded');
-            }
-
+            updateLocalConfig(data);
             console.log("refreshConfig", data);
         });
 
@@ -358,20 +374,24 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
     }
 
     var refreshNodeStats = debounce(function () {
-        $http.get(urlbase+"/stats/node").success(function (data) {
+        $http.get(urlbase + "/stats/node").success(function (data) {
             $scope.stats = data;
+            for (var node in $scope.stats) {
+                $scope.stats[node].LastSeen = new Date($scope.stats[node].LastSeen);
+                $scope.stats[node].LastSeenDays = (new Date() - $scope.stats[node].LastSeen) / 1000 / 86400;
+            }
             console.log("refreshNodeStats", data);
         });
     }, 500);
 
-    $scope.init = function() {
+    $scope.init = function () {
         refreshSystem();
         refreshConfig();
         refreshConnectionStats();
         refreshNodeStats();
 
         $http.get(urlbase + '/version').success(function (data) {
-            $scope.version = data;
+            $scope.version = data.version;
         });
 
         $http.get(urlbase + '/report').success(function (data) {
@@ -477,19 +497,10 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
         return '';
     };
 
-    $scope.nodeVer = function (nodeCfg) {
-        if (nodeCfg.NodeID === $scope.myID) {
-            return $scope.version;
-        }
-        var conn = $scope.connections[nodeCfg.NodeID];
-        if (conn) {
-            return conn.ClientVersion;
-        }
-        return '?';
-    };
-
     $scope.findNode = function (nodeID) {
-        var matches = $scope.nodes.filter(function (n) { return n.NodeID == nodeID; });
+        var matches = $scope.nodes.filter(function (n) {
+            return n.NodeID == nodeID;
+        });
         if (matches.length != 1) {
             return undefined;
         }
@@ -521,13 +532,19 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
         // Make a working copy
         $scope.tmpOptions = angular.copy($scope.config.Options);
         $scope.tmpOptions.UREnabled = ($scope.tmpOptions.URAccepted > 0);
+        $scope.tmpOptions.NodeName = $scope.thisNode().Name;
+        $scope.tmpOptions.AutoUpgradeEnabled = ($scope.tmpOptions.AutoUpgradeIntervalH > 0);
         $scope.tmpGUI = angular.copy($scope.config.GUI);
         $('#settings').modal();
     };
 
-    $scope.saveConfig = function() {
+    $scope.saveConfig = function () {
         var cfg = JSON.stringify($scope.config);
-        var opts = {headers: {'Content-Type': 'application/json'}};
+        var opts = {
+            headers: {
+                'Content-Type': 'application/json'
+            }
+        };
         $http.post(urlbase + '/config', cfg, opts).success(function () {
             $http.get(urlbase + '/config/sync').success(function (data) {
                 $scope.configInSync = data.configInSync;
@@ -538,24 +555,34 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
     $scope.saveSettings = function () {
         // Make sure something changed
         var changed = !angular.equals($scope.config.Options, $scope.tmpOptions) ||
-                      !angular.equals($scope.config.GUI, $scope.tmpGUI);
+            !angular.equals($scope.config.GUI, $scope.tmpGUI);
         if (changed) {
             // Check if usage reporting has been enabled or disabled
             if ($scope.tmpOptions.UREnabled && $scope.tmpOptions.URAccepted <= 0) {
                 $scope.tmpOptions.URAccepted = 1000;
-            } else if (!$scope.tmpOptions.UREnabled && $scope.tmpOptions.URAccepted > 0){
+            } else if (!$scope.tmpOptions.UREnabled && $scope.tmpOptions.URAccepted > 0) {
                 $scope.tmpOptions.URAccepted = -1;
             }
 
+            // Check if auto-upgrade has been enabled or disabled
+            if ($scope.tmpOptions.AutoUpgradeEnabled) {
+                $scope.tmpOptions.AutoUpgradeIntervalH = $scope.tmpOptions.AutoUpgradeIntervalH || 12;
+            } else {
+                $scope.tmpOptions.AutoUpgradeIntervalH = 0;
+            }
+
             // Check if protocol will need to be changed on restart
-            if($scope.config.GUI.UseTLS !== $scope.tmpGUI.UseTLS){
+            if ($scope.config.GUI.UseTLS !== $scope.tmpGUI.UseTLS) {
                 $scope.protocolChanged = true;
             }
 
             // Apply new settings locally
+            $scope.thisNode().Name = $scope.tmpOptions.NodeName;
             $scope.config.Options = angular.copy($scope.tmpOptions);
             $scope.config.GUI = angular.copy($scope.tmpGUI);
-            $scope.config.Options.ListenAddress = $scope.config.Options.ListenStr.split(',').map(function (x) { return x.trim(); });
+            $scope.config.Options.ListenAddress = $scope.config.Options.ListenStr.split(',').map(function (x) {
+                return x.trim();
+            });
 
             $scope.saveConfig();
         }
@@ -570,16 +597,16 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
         $scope.configInSync = true;
 
         // Switch webpage protocol if needed
-        if($scope.protocolChanged){
+        if ($scope.protocolChanged) {
             var protocol = 'http';
 
-            if($scope.config.GUI.UseTLS){
-               protocol = 'https';
+            if ($scope.config.GUI.UseTLS) {
+                protocol = 'https';
             }
 
-            setTimeout(function(){
+            setTimeout(function () {
                 window.location.protocol = protocol;
-            }, 1000);
+            }, 2500);
 
             $scope.protocolChanged = false;
         }
@@ -618,7 +645,11 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
     };
 
     $scope.addNode = function () {
-        $scope.currentNode = {AddressesStr: 'dynamic', Compression: true};
+        $scope.currentNode = {
+            AddressesStr: 'dynamic',
+            Compression: true,
+            Introducer: true
+        };
         $scope.editingExisting = false;
         $scope.editingSelf = false;
         $scope.nodeEditor.$setPristine();
@@ -650,7 +681,9 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
 
         $('#editNode').modal('hide');
         nodeCfg = $scope.currentNode;
-        nodeCfg.Addresses = nodeCfg.AddressesStr.split(',').map(function (x) { return x.trim(); });
+        nodeCfg.Addresses = nodeCfg.AddressesStr.split(',').map(function (x) {
+            return x.trim();
+        });
 
         done = false;
         for (i = 0; i < $scope.nodes.length; i++) {
@@ -672,7 +705,7 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
     };
 
     $scope.otherNodes = function () {
-        return $scope.nodes.filter(function (n){
+        return $scope.nodes.filter(function (n) {
             return n.NodeID !== $scope.myID;
         });
     };
@@ -753,7 +786,9 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
     };
 
     $scope.addRepo = function () {
-        $scope.currentRepo = {selectedNodes: {}};
+        $scope.currentRepo = {
+            selectedNodes: {}
+        };
         $scope.currentRepo.RescanIntervalS = 60;
         $scope.currentRepo.FileVersioningSelector = "none";
         $scope.currentRepo.simpleKeep = 5;
@@ -774,7 +809,9 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
         repoCfg.selectedNodes[$scope.myID] = true;
         for (var nodeID in repoCfg.selectedNodes) {
             if (repoCfg.selectedNodes[nodeID] === true) {
-                repoCfg.Nodes.push({NodeID: nodeID});
+                repoCfg.Nodes.push({
+                    NodeID: nodeID
+                });
             }
         }
         delete repoCfg.selectedNodes;
@@ -812,7 +849,7 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
         $scope.saveConfig();
     };
 
-    $scope.sharesRepo = function(repoCfg) {
+    $scope.sharesRepo = function (repoCfg) {
         var names = [];
         repoCfg.Nodes.forEach(function (node) {
             names.push($scope.nodeName($scope.findNode(node.NodeID)));
@@ -833,10 +870,55 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
         $scope.saveConfig();
     };
 
+    $scope.editIgnores = function () {
+        if (!$scope.editingExisting) {
+            return;
+        }
+
+        $('#editIgnoresButton').attr('disabled', 'disabled');
+        $http.get(urlbase + '/ignores?repo=' + encodeURIComponent($scope.currentRepo.ID))
+            .success(function (data) {
+                data.ignore = data.ignore || [];
+
+                $('#editRepo').modal('hide');
+                var textArea = $('#editIgnores textarea');
+
+                textArea.val(data.ignore.join('\n'));
+
+                $('#editIgnores').modal()
+                    .on('hidden.bs.modal', function () {
+                        $('#editRepo').modal();
+                    })
+                    .on('shown.bs.modal', function () {
+                        textArea.focus();
+                    });
+            })
+            .then(function () {
+                $('#editIgnoresButton').removeAttr('disabled');
+            });
+    };
+
+    $scope.saveIgnores = function () {
+        if (!$scope.editingExisting) {
+            return;
+        }
+
+        $http.post(urlbase + '/ignores?repo=' + encodeURIComponent($scope.currentRepo.ID), {
+            ignore: $('#editIgnores textarea').val().split('\n')
+        });
+    };
+
     $scope.setAPIKey = function (cfg) {
         cfg.APIKey = randomString(30, 32);
     };
 
+    $scope.showURPreview = function () {
+        $('#settings').modal('hide');
+        $('#urPreview').modal().on('hidden.bs.modal', function () {
+            $('#settings').modal();
+        });
+    };
+
     $scope.acceptUR = function () {
         $scope.config.Options.URAccepted = 1000; // Larger than the largest existing report version
         $scope.saveConfig();
@@ -862,7 +944,7 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
         var fDelete = 4096;
         var fDirectory = 16384;
 
-        if ((file.Flags & (fDelete+fDirectory)) === fDelete+fDirectory) {
+        if ((file.Flags & (fDelete + fDirectory)) === fDelete + fDirectory) {
             return 'rmdir';
         } else if ((file.Flags & fDelete) === fDelete) {
             return 'rm';
@@ -941,12 +1023,11 @@ function decimals(val, num) {
     return decs;
 }
 
-function randomString(len, bits)
-{
+function randomString(len, bits) {
     bits = bits || 36;
-    var outStr = "", newStr;
-    while (outStr.length < len)
-    {
+    var outStr = "",
+        newStr;
+    while (outStr.length < len) {
         newStr = Math.random().toString(bits).slice(2);
         outStr += newStr.slice(0, Math.min(newStr.length, (len - outStr.length)));
     }
@@ -964,7 +1045,7 @@ function isEmptyObject(obj) {
 function debounce(func, wait) {
     var timeout, args, context, timestamp, result, again;
 
-    var later = function() {
+    var later = function () {
         var last = Date.now() - timestamp;
         if (last < wait) {
             timeout = setTimeout(later, wait - last);
@@ -978,7 +1059,7 @@ function debounce(func, wait) {
         }
     };
 
-    return function() {
+    return function () {
         context = this;
         args = arguments;
         timestamp = Date.now();
@@ -1060,15 +1141,15 @@ syncthing.filter('basename', function () {
         if (!parts || parts.length < 1) {
             return input;
         }
-        return parts[parts.length-1];
+        return parts[parts.length - 1];
     };
 });
 
-syncthing.directive('uniqueRepo', function() {
+syncthing.directive('uniqueRepo', function () {
     return {
         require: 'ngModel',
-        link: function(scope, elm, attrs, ctrl) {
-            ctrl.$parsers.unshift(function(viewValue) {
+        link: function (scope, elm, attrs, ctrl) {
+            ctrl.$parsers.unshift(function (viewValue) {
                 if (scope.editingExisting) {
                     // we shouldn't validate
                     ctrl.$setValidity('uniqueRepo', true);
@@ -1085,16 +1166,16 @@ syncthing.directive('uniqueRepo', function() {
     };
 });
 
-syncthing.directive('validNodeid', function($http) {
+syncthing.directive('validNodeid', function ($http) {
     return {
         require: 'ngModel',
-        link: function(scope, elm, attrs, ctrl) {
-            ctrl.$parsers.unshift(function(viewValue) {
+        link: function (scope, elm, attrs, ctrl) {
+            ctrl.$parsers.unshift(function (viewValue) {
                 if (scope.editingExisting) {
                     // we shouldn't validate
                     ctrl.$setValidity('validNodeid', true);
                 } else {
-                    $http.get(urlbase + '/nodeid?id='+viewValue).success(function (resp) {
+                    $http.get(urlbase + '/nodeid?id=' + viewValue).success(function (resp) {
                         if (resp.error) {
                             ctrl.$setValidity('validNodeid', false);
                         } else {
@@ -1121,5 +1202,5 @@ syncthing.directive('modal', function () {
             close: '@',
             large: '@',
         },
-    }
+    };
 });

gui/index.html

@@ -30,17 +30,14 @@
       <p class="navbar-text hidden-xs">{{thisNodeName()}}</p>
       <ul class="nav navbar-nav navbar-right">
         <li ng-if="upgradeInfo.newer">
-          <button type="button" class="btn navbar-btn btn-default" href="" ng-click="upgrade()">
-          <span class="glyphicon glyphicon-chevron-up"></span>&emsp;
-          <span translate translate-value-version="{{upgradeInfo.latest}}">Upgrade To {%version%}</span>
+          <button type="button" class="btn navbar-btn btn-primary btn-sm" href="" ng-click="upgrade()">
+            <span class="glyphicon glyphicon-chevron-up"></span>&emsp;
+            <span translate translate-value-version="{{upgradeInfo.latest}}">Upgrade To {%version%}</span>
           </button>
         </li>
         <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span translate>Edit</spanq&nbsp;<b class="caret"></b></a>
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-cog"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="" ng-click="addRepo()"><span class="glyphicon glyphicon-hdd"></span>&emsp;<span translate>Add Repository</span></a></li>
-            <li><a href="" ng-click="addNode()"><span class="glyphicon glyphicon-retweet"></span>&emsp;<span translate>Add Node</span></a></li>
-            <li class="divider"></li>
             <li><a href="" ng-click="editSettings()"><span class="glyphicon glyphicon-cog"></span>&emsp;<span translate>Settings</span></a></li>
             <li><a href="" ng-click="idNode()"><span class="glyphicon glyphicon-qrcode"></span>&emsp;<span translate>Show ID</span></a></li>
             <li class="divider"></li>
@@ -82,199 +79,217 @@
       <div class="col-md-6">
         <div class="panel-group" id="repositories">
           <div class="panel panel-{{repoClass(repo.ID)}}" ng-repeat="repo in repoList()">
-            <div class="panel-heading">
+            <div class="panel-heading" data-toggle="collapse" data-parent="#repositories" href="#repo-{{$index}}" style="cursor: pointer">
               <h3 class="panel-title">
-                <a data-toggle="collapse" data-parent="#repositories" href="#repo-{{$index}}">
-                  <span class="glyphicon glyphicon-hdd"></span> {{repo.ID}}
-                  <span class="pull-right hidden-xs" ng-switch="repoStatus(repo.ID)">
-                    <span translate ng-switch-when="unknown">Unknown</span>
-                    <span translate ng-switch-when="stopped">Stopped</span>
-                    <span translate ng-switch-when="scanning">Scanning</span>
-                    <span ng-switch-when="syncing">
-                      <span translate>Syncing</span>
-                      ({{syncPercentage(repo.ID)}}%)
-                    </span>
-                    <span ng-switch-when="idle">
-                      <span translate>Idle</span>
-                      ({{syncPercentage(repo.ID)}}%)
-                    </span>
+                <span class="glyphicon glyphicon-hdd"></span>&emsp;{{repo.ID}}
+                <span class="pull-right hidden-xs" ng-switch="repoStatus(repo.ID)">
+                  <span translate ng-switch-when="unknown">Unknown</span>
+                  <span translate ng-switch-when="stopped">Stopped</span>
+                  <span translate ng-switch-when="scanning">Scanning</span>
+                  <span ng-switch-when="syncing">
+                    <span translate>Syncing</span>
+                    ({{syncPercentage(repo.ID)}}%)
                   </span>
-                </a>
+                  <span ng-switch-when="idle">
+                    <span translate>Idle</span>
+                    ({{syncPercentage(repo.ID)}}%)
+                  </span>
+                </span>
               </h3>
             </div>
-            <div id="repo-{{$index}}" class="panel-collapse collapse">
+            <div id="repo-{{$index}}" class="panel-collapse collapse" ng-class="{in: $index === 0}">
               <div class="panel-body">
-                  <table class="table table-condensed table-striped">
-                    <tbody>
-                      <tr>
-                        <th><span class="glyphicon glyphicon-tag"></span>&emsp;<span translate>Repository ID</span></th>
-                        <td class="text-right">{{repo.ID}}</td>
-                      </tr>
-                      <tr>
-                        <th><span class="glyphicon glyphicon-folder-open"></span>&emsp;<span translate>Folder</span></th>
-                        <td class="text-right">{{repo.Directory}}</td>
-                      </tr>
-                      <tr ng-if="model[repo.ID].invalid">
-                        <th><span class="glyphicon glyphicon-warning-sign"></span>&emsp;<span translate>Error</span></th>
-                        <td class="text-right">{{model[repo.ID].invalid}}</td>
-                      </tr>
-                      <tr>
-                        <th><span class="glyphicon glyphicon-globe"></span>&emsp;<span translate>Global Repository</span></th>
-                        <td class="text-right">{{model[repo.ID].globalFiles | alwaysNumber}} <span translate>items</span>, ~{{model[repo.ID].globalBytes | binary}}B</td>
-                      </tr>
-                      <tr>
-                        <th><span class="glyphicon glyphicon-home"></span>&emsp;<span translate>Local Repository</span></th>
-                        <td class="text-right">{{model[repo.ID].localFiles | alwaysNumber}} <span translate>items</span>, ~{{model[repo.ID].localBytes | binary}}B</td>
-                      </tr>
-                      <tr>
-                        <th><span class="glyphicon glyphicon-cloud-download"></span>&emsp;<span translate>Out Of Sync</span></th>
-                        <td class="text-right">
+                <table class="table table-condensed table-striped">
+                  <tbody>
+                    <tr>
+                      <th><span class="glyphicon glyphicon-tag"></span>&emsp;<span translate>Repository ID</span></th>
+                      <td class="text-right">{{repo.ID}}</td>
+                    </tr>
+                    <tr>
+                      <th><span class="glyphicon glyphicon-folder-open"></span>&emsp;<span translate>Folder</span></th>
+                      <td class="text-right">{{repo.Directory}}</td>
+                    </tr>
+                    <tr ng-if="model[repo.ID].invalid">
+                      <th><span class="glyphicon glyphicon-warning-sign"></span>&emsp;<span translate>Error</span></th>
+                      <td class="text-right">{{model[repo.ID].invalid}}</td>
+                    </tr>
+                    <tr>
+                      <th><span class="glyphicon glyphicon-globe"></span>&emsp;<span translate>Global Repository</span></th>
+                      <td class="text-right">{{model[repo.ID].globalFiles | alwaysNumber}} <span translate>items</span>, ~{{model[repo.ID].globalBytes | binary}}B</td>
+                    </tr>
+                    <tr>
+                      <th><span class="glyphicon glyphicon-home"></span>&emsp;<span translate>Local Repository</span></th>
+                      <td class="text-right">{{model[repo.ID].localFiles | alwaysNumber}} <span translate>items</span>, ~{{model[repo.ID].localBytes | binary}}B</td>
+                    </tr>
+                    <tr>
+                      <th><span class="glyphicon glyphicon-cloud-download"></span>&emsp;<span translate>Out Of Sync</span></th>
+                      <td class="text-right">
                         <a ng-if="model[repo.ID].needFiles > 0" ng-click="showNeed(repo.ID)" href="">{{model[repo.ID].needFiles | alwaysNumber}} <span translate>items</span>, ~{{model[repo.ID].needBytes | binary}}B</a>
                         <span ng-if="model[repo.ID].needFiles == 0">0 <span translate>items</span>, 0 B</span>
-                        </td>
-                      </tr>
-                      <tr>
-                        <th><span class="glyphicon glyphicon-lock"></span>&emsp;<span translate>Master Repo</span></th>
-                        <td class="text-right">
-                          <span translate ng-if="repo.ReadOnly">Yes</span>
-                          <span translate ng-if="!repo.ReadOnly">No</span>
-                        </td>
-                      </tr>
-                      <tr>
-                        <th><span class="glyphicon glyphicon-unchecked"></span>&emsp;<span translate>Ignore Permissions</span></th>
-                        <td class="text-right">
-                          <span translate ng-if="repo.IgnorePerms">Yes</span>
-                          <span translate ng-if="!repo.IgnorePerms">No</span>
-                        </td>
-                      </tr>
-                      <tr>
-                        <th><span class="glyphicon glyphicon-refresh"></span>&emsp;<span translate>Rescan Interval</span></th>
-                        <td class="text-right">{{repo.RescanIntervalS}} s</td>
-                      </tr>
-                      <tr>
-                        <th><span class="glyphicon glyphicon-share-alt"></span>&emsp;<span translate>Shared With</span></th>
-                        <td class="text-right">{{sharesRepo(repo)}}</td>
-                      </tr>
-                    </tbody>
-                  </table>
+                      </td>
+                    </tr>
+                    <tr>
+                      <th><span class="glyphicon glyphicon-lock"></span>&emsp;<span translate>Master Repo</span></th>
+                      <td class="text-right">
+                        <span translate ng-if="repo.ReadOnly">Yes</span>
+                        <span translate ng-if="!repo.ReadOnly">No</span>
+                      </td>
+                    </tr>
+                    <tr>
+                      <th><span class="glyphicon glyphicon-unchecked"></span>&emsp;<span translate>Ignore Permissions</span></th>
+                      <td class="text-right">
+                        <span translate ng-if="repo.IgnorePerms">Yes</span>
+                        <span translate ng-if="!repo.IgnorePerms">No</span>
+                      </td>
+                    </tr>
+                    <tr>
+                      <th><span class="glyphicon glyphicon-refresh"></span>&emsp;<span translate>Rescan Interval</span></th>
+                      <td class="text-right">{{repo.RescanIntervalS}} s</td>
+                    </tr>
+                    <tr>
+                      <th><span class="glyphicon glyphicon-share-alt"></span>&emsp;<span translate>Shared With</span></th>
+                      <td class="text-right">{{sharesRepo(repo)}}</td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <div class="panel-footer">
+                <button class="btn btn-sm btn-danger" ng-if="repo.ReadOnly && model[repo.ID].needFiles > 0" ng-click="override(repo.ID)" href=""><span class="glyphicon glyphicon-upload"></span>&emsp;<span translate>Override Changes</span></button>
                 <span class="pull-right">
-                  <a class="btn btn-sm btn-default" href="" ng-show="repoStatus(repo.ID) == 'idle'" ng-click="rescanRepo(repo.ID)"><span class="glyphicon glyphicon-refresh"></span>&emsp;<span translate>Rescan</span></a>
-                  <a class="btn btn-sm btn-primary" href="" ng-click="editRepo(repo)"><span class="glyphicon glyphicon-pencil"></span>&emsp;<span translate>Edit</span></a>
-                  <a class="btn btn-sm btn-danger" ng-if="repo.ReadOnly && model[repo.ID].needFiles > 0" ng-click="override(repo.ID)" href=""><span class="glyphicon glyphicon-upload"></span>&emsp;<span translate>Override Changes</span></a>
+                  <button class="btn btn-sm btn-default" href="" ng-show="repoStatus(repo.ID) == 'idle'" ng-click="rescanRepo(repo.ID)"><span class="glyphicon glyphicon-refresh"></span>&emsp;<span translate>Rescan</span></button>
+                  <button class="btn btn-sm btn-default" href="" ng-click="editRepo(repo)"><span class="glyphicon glyphicon-pencil"></span>&emsp;<span translate>Edit</span></button>
                 </span>
+                <div class="clearfix"></div>
               </div>
             </div>
           </div>
         </div>
+        <div class="form-group">
+          <button class="btn btn-sm btn-default pull-right" ng-click="addRepo()"><span class="glyphicon glyphicon-plus"></span>&emsp;<span translate>Add Repository</span></button>
+          <div class="clearfix"></div>
+        </div>
+        <hr class="visible-sm"/>
       </div>
 
       <!-- Node list (top right) -->
 
+      <!-- This node -->
+
       <div class="col-md-6">
-        <div class="panel-group" id="nodes">
-          <div class="panel panel-default" ng-repeat="nodeCfg in [thisNode()]">
-            <div class="panel-heading">
-              <h3 class="panel-title">
-                <a data-toggle="collapse" data-parent="#nodes" href="#node-this"><span class="glyphicon glyphicon-home"></span> {{nodeName(nodeCfg)}}</a>
-              </h3>
-            </div>
-            <div id="node-this" class="panel-collapse collapse in">
-              <div class="panel-body">
-                  <table class="table table-condensed table-striped">
-                    <tbody>
-                      <tr>
-                        <th><span class="glyphicon glyphicon-th"></span>&emsp;<span translate>RAM Utilization</span></th>
-                        <td class="text-right">{{system.sys | binary}}B</td>
-                      </tr>
-                      <tr>
-                        <th><span class="glyphicon glyphicon-tasks"></span>&emsp;<span translate>CPU Utilization</span></th>
-                        <td class="text-right">{{system.cpuPercent | alwaysNumber | natural:1}}%</td>
-                      </tr>
-                      <tr>
-                        <th><span class="glyphicon glyphicon-cloud-download"></span>&emsp;<span translate>Download Rate</span></th>
-                        <td class="text-right">{{connections['total'].inbps | metric}}bps ({{connections['total'].InBytesTotal | binary}}B)</td>
-                      </tr>
-                      <tr>
-                        <th><span class="glyphicon glyphicon-cloud-upload"></span>&emsp;<span translate>Upload Rate</span></th>
-                        <td class="text-right">{{connections['total'].outbps | metric}}bps ({{connections['total'].OutBytesTotal | binary}}B)</td>
-                      </tr>
-                      <tr ng-if="system.extAnnounceOK != undefined">
-                        <th><span class="glyphicon glyphicon-bullhorn"></span>&emsp;<span translate>Announce Server</span></th>
-                        <td class="text-right">
-                          <span class="data text-success" ng-if="system.extAnnounceOK"><span translate>Online</span></span>
-                          <span class="data text-danger" ng-if="!system.extAnnounceOK"><span translate>Offline</span></span>
-                        </td>
-                      </tr>
-                      <tr>
-                        <th><span class="glyphicon glyphicon-tag"></span>&emsp;<span translate>Version</span></th>
-                        <td class="text-right">{{version}}</td>
-                      </tr>
-                    </tbody>
-                  </table>
-                <span class="pull-right"><a class="btn btn-sm btn-primary" href="" ng-click="editNode(nodeCfg)"><span class="glyphicon glyphicon-pencil"></span>&emsp;<span translate>Edit</span></a></span>
-              </div>
+        <div class="panel panel-default" ng-repeat="nodeCfg in [thisNode()]">
+          <div class="panel-heading" data-toggle="collapse" href="#node-this" style="cursor: pointer">
+            <h3 class="panel-title">
+              <span class="glyphicon glyphicon-home"></span>&emsp;{{nodeName(nodeCfg)}}
+            </h3>
+          </div>
+          <div id="node-this" class="panel-collapse collapse in">
+            <div class="panel-body">
+              <table class="table table-condensed table-striped">
+                <tbody>
+                  <tr>
+                    <th><span class="glyphicon glyphicon-cloud-download"></span>&emsp;<span translate>Download Rate</span></th>
+                    <td class="text-right">{{connections['total'].inbps | metric}}bps ({{connections['total'].InBytesTotal | binary}}B)</td>
+                  </tr>
+                  <tr>
+                    <th><span class="glyphicon glyphicon-cloud-upload"></span>&emsp;<span translate>Upload Rate</span></th>
+                    <td class="text-right">{{connections['total'].outbps | metric}}bps ({{connections['total'].OutBytesTotal | binary}}B)</td>
+                  </tr>
+                  <tr>
+                    <th><span class="glyphicon glyphicon-th"></span>&emsp;<span translate>RAM Utilization</span></th>
+                    <td class="text-right">{{system.sys | binary}}B</td>
+                  </tr>
+                  <tr>
+                    <th><span class="glyphicon glyphicon-dashboard"></span>&emsp;<span translate>CPU Utilization</span></th>
+                    <td class="text-right">{{system.cpuPercent | alwaysNumber | natural:1}}%</td>
+                  </tr>
+                  <tr ng-if="system.extAnnounceOK != undefined">
+                    <th><span class="glyphicon glyphicon-bullhorn"></span>&emsp;<span translate>Global Discovery Server</span></th>
+                    <td class="text-right">
+                      <span class="data text-success" ng-if="system.extAnnounceOK"><span translate>Online</span></span>
+                      <span class="data text-danger" ng-if="!system.extAnnounceOK"><span translate>Offline</span></span>
+                    </td>
+                  </tr>
+                  <tr>
+                    <th><span class="glyphicon glyphicon-tag"></span>&emsp;<span translate>Version</span></th>
+                    <td class="text-right">{{version}}</td>
+                  </tr>
+                </tbody>
+              </table>
             </div>
           </div>
+        </div>
 
+        <!-- Remote nodes -->
+
+        <div class="panel-group" id="nodes">
           <div class="panel panel-{{nodeClass(nodeCfg)}}" ng-repeat="nodeCfg in otherNodes()">
-            <div class="panel-heading">
+            <div class="panel-heading" data-toggle="collapse" data-parent="#nodes" href="#node-{{$index}}" style="cursor: pointer">
               <h3 class="panel-title">
-                <a data-toggle="collapse" data-parent="#nodes" href="#node-{{$index}}">
-                  <span class="glyphicon glyphicon-retweet"></span>
-                  {{nodeName(nodeCfg)}}
-                  <span class="pull-right hidden-xs">
-                    <span ng-if="connections[nodeCfg.NodeID] && completion[nodeCfg.NodeID]._total == 100">
-                      <span translate>Up to Date</span> (100%)
-                    </span>
-                    <span ng-if="connections[nodeCfg.NodeID] && completion[nodeCfg.NodeID]._total < 100">
-                      <span translate>Syncing</span> ({{completion[nodeCfg.NodeID]._total | number:0}}%)
-                    </span>
-                    <span translate ng-if="!connections[nodeCfg.NodeID]">Disconnected</span>
+                <span class="glyphicon glyphicon-retweet"></span>&emsp;{{nodeName(nodeCfg)}}
+                <span class="pull-right hidden-xs">
+                  <span ng-if="connections[nodeCfg.NodeID] && completion[nodeCfg.NodeID]._total == 100">
+                    <span translate>Up to Date</span> (100%)
                   </span>
-                </a>
+                  <span ng-if="connections[nodeCfg.NodeID] && completion[nodeCfg.NodeID]._total < 100">
+                    <span translate>Syncing</span> ({{completion[nodeCfg.NodeID]._total | number:0}}%)
+                  </span>
+                  <span translate ng-if="!connections[nodeCfg.NodeID]">Disconnected</span>
+                </span>
               </h3>
             </div>
             <div id="node-{{$index}}" class="panel-collapse collapse">
               <div class="panel-body">
-                  <table class="table table-condensed table-striped">
-                    <tbody>
-                      <tr>
-                        <th><span class="glyphicon glyphicon-link"></span>&emsp;<span translate>Address</span></th>
-                        <td class="text-right">{{nodeAddr(nodeCfg)}}</td>
-                      </tr>
-                      <tr>
-                        <th><span class="glyphicon glyphicon-comment"></span>&emsp;<span translate>Synchronization</span></th>
-                        <td class="text-right">{{completion[nodeCfg.NodeID]._total | alwaysNumber | number:0}}%</td>
-                      </tr>
-                      <tr>
-                        <th><span class="glyphicon glyphicon-compressed"></span>&emsp;<span translate>Use Compression</span></th>
-                        <td translate ng-if="nodeCfg.Compression" class="text-right">Yes</td>
-                        <td translate ng-if="!nodeCfg.Compression" class="text-right">No</td>
-                      </tr>
-                      <tr>
-                        <th><span class="glyphicon glyphicon-cloud-download"></span>&emsp;<span translate>Download Rate</span></th>
-                        <td class="text-right">{{connections[nodeCfg.NodeID].inbps | metric}}bps ({{connections[nodeCfg.NodeID].InBytesTotal | binary}}B)</td>
-                      </tr>
-                      <tr>
-                        <th><span class="glyphicon glyphicon-cloud-upload"></span>&emsp;<span translate>Upload Rate</span></th>
-                        <td class="text-right">{{connections[nodeCfg.NodeID].outbps | metric}}bps ({{connections[nodeCfg.NodeID].OutBytesTotal | binary}}B)</td>
-                      </tr>
-                      <tr>
-                        <th><span class="glyphicon glyphicon-tag"></span>&emsp;<span translate>Version</span></th>
-                        <td class="text-right">{{nodeVer(nodeCfg)}}</td>
-                      </tr>
-                      <tr ng-if="!connections[nodeCfg.NodeID]">
-                        <th><span class="glyphicon glyphicon-eye-open"></span>&emsp;<span translate>Last seen</span></th>
-                        <td translate ng-if="stats[nodeCfg.NodeID].LastSeen.indexOf('1970') > -1" class="text-right">Never</td>
-                        <td ng-if="stats[nodeCfg.NodeID].LastSeen.indexOf('1970') < 0" class="text-right">{{stats[nodeCfg.NodeID].LastSeen | date:"yyyy-MM-dd HH:mm"}}</td>
-                      </tr>
-                    </tbody>
-                  </table>
-                <span class="pull-right"><a class="btn btn-sm btn-primary" href="" ng-click="editNode(nodeCfg)"><span class="glyphicon glyphicon-pencil"></span>&emsp;<span translate>Edit</span></a></span>
+                <table class="table table-condensed table-striped">
+                  <tbody>
+                    <tr ng-if="connections[nodeCfg.NodeID]">
+                      <th><span class="glyphicon glyphicon-cloud-download"></span>&emsp;<span translate>Download Rate</span></th>
+                      <td class="text-right">{{connections[nodeCfg.NodeID].inbps | metric}}bps ({{connections[nodeCfg.NodeID].InBytesTotal | binary}}B)</td>
+                    </tr>
+                    <tr ng-if="connections[nodeCfg.NodeID]">
+                      <th><span class="glyphicon glyphicon-cloud-upload"></span>&emsp;<span translate>Upload Rate</span></th>
+                      <td class="text-right">{{connections[nodeCfg.NodeID].outbps | metric}}bps ({{connections[nodeCfg.NodeID].OutBytesTotal | binary}}B)</td>
+                    </tr>
+                    <tr>
+                      <th><span class="glyphicon glyphicon-link"></span>&emsp;<span translate>Address</span></th>
+                      <td class="text-right">{{nodeAddr(nodeCfg)}}</td>
+                    </tr>
+                    <tr ng-if="connections[nodeCfg.NodeID]">
+                      <th><span class="glyphicon glyphicon-comment"></span>&emsp;<span translate>Synchronization</span></th>
+                      <td class="text-right">{{completion[nodeCfg.NodeID]._total | alwaysNumber | number:0}}%</td>
+                    </tr>
+                    <tr>
+                      <th><span class="glyphicon glyphicon-compressed"></span>&emsp;<span translate>Use Compression</span></th>
+                      <td translate ng-if="nodeCfg.Compression" class="text-right">Yes</td>
+                      <td translate ng-if="!nodeCfg.Compression" class="text-right">No</td>
+                    </tr>
+                    <tr>
+                      <th><span class="glyphicon glyphicon-thumbs-up"></span>&emsp;<span translate>Introducer</span></th>
+                      <td translate ng-if="nodeCfg.Introducer" class="text-right">Yes</td>
+                      <td translate ng-if="!nodeCfg.Introducer" class="text-right">No</td>
+                    </tr>
+                    <tr ng-if="connections[nodeCfg.NodeID]">
+                      <th><span class="glyphicon glyphicon-tag"></span>&emsp;<span translate>Version</span></th>
+                      <td class="text-right">{{connections[nodeCfg.NodeID].ClientVersion}}</td>
+                    </tr>
+                    <tr ng-if="!connections[nodeCfg.NodeID]">
+                      <th><span class="glyphicon glyphicon-eye-open"></span>&emsp;<span translate>Last seen</span></th>
+                      <td translate ng-if="!stats[nodeCfg.NodeID].LastSeenDays || stats[nodeCfg.NodeID].LastSeenDays >= 365" class="text-right">Never</td>
+                      <td ng-if="stats[nodeCfg.NodeID].LastSeenDays < 365" class="text-right">{{stats[nodeCfg.NodeID].LastSeen | date:"yyyy-MM-dd HH:mm"}}</td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <div class="panel-footer">
+                <span class="pull-right"><a class="btn btn-sm btn-default" href="" ng-click="editNode(nodeCfg)"><span class="glyphicon glyphicon-pencil"></span>&emsp;<span translate>Edit</span></a></span>
+                <div class="clearfix"></div>
               </div>
             </div>
           </div>
         </div>
+        <div class="form-group">
+          <button class="btn btn-sm btn-default pull-right" ng-click="addNode()"><span class="glyphicon glyphicon-plus"></span>&emsp;<span translate>Add Node</span></button>
+          <div class="clearfix"></div>
+        </div>
       </div>
     </div> <!-- /row -->
 
@@ -368,13 +383,13 @@
             </div>
             <div class="form-group">
               <label translate for="name">Node Name</label>
-              <input placeholder="Home Server" id="name" class="form-control" type="text" ng-model="currentNode.Name"></input>
+              <input id="name" class="form-control" type="text" ng-model="currentNode.Name"></input>
               <p translate ng-if="currentNode.NodeID == myID" class="help-block">Shown instead of Node ID in the cluster status. Will be advertised to other nodes as an optional default name.</p>
               <p translate ng-if="currentNode.NodeID != myID" class="help-block">Shown instead of Node ID in the cluster status. Will be updated to the name the node advertises if left empty.</p>
             </div>
             <div class="form-group">
               <label translate for="addresses">Addresses</label>
-              <input placeholder="dynamic" ng-disabled="currentNode.NodeID == myID" id="addresses" class="form-control" type="text" ng-model="currentNode.AddressesStr"></input>
+              <input ng-disabled="currentNode.NodeID == myID" id="addresses" class="form-control" type="text" ng-model="currentNode.AddressesStr"></input>
               <p translate class="help-block">Enter comma separated "ip:port" addresses or "dynamic" to perform automatic discovery of the address.</p>
             </div>
             <div ng-if="!editingSelf" class="form-group">
@@ -382,14 +397,23 @@
                 <label>
                   <input type="checkbox" ng-model="currentNode.Compression"> <span translate>Use Compression</span>
                 </label>
+                <p translate class="help-block">Compression is recommended in most setups.</p>
+              </div>
+            </div>
+            <div ng-if="!editingSelf" class="form-group">
+              <div class="checkbox">
+                <label>
+                  <input type="checkbox" ng-model="currentNode.Introducer"> <span translate>Introducer</span>
+                </label>
+                <p translate class="help-block">Any nodes configured on an introducer node will be added to this node as well.</p>
               </div>
             </div>
           </form>
         </div>
         <div class="modal-footer">
-          <button type="button" class="btn btn-primary" ng-click="saveNode()" ng-disabled="nodeEditor.$invalid"><span class="glyphicon glyphicon-ok"></span>&emsp;<span translate>Save</span></button>
-          <button type="button" class="btn btn-default" data-dismiss="modal"><span class="glyphicon glyphicon-remove"></span>&emsp;<span translate>Close</span></button>
-          <button ng-if="editingExisting && !editingSelf" type="button" class="btn btn-danger pull-left" ng-click="deleteNode()"><span class="glyphicon glyphicon-minus"></span>&emsp;<span translate>Delete</span></button>
+          <button type="button" class="btn btn-primary btn-sm" ng-click="saveNode()" ng-disabled="nodeEditor.$invalid"><span class="glyphicon glyphicon-ok"></span>&emsp;<span translate>Save</span></button>
+          <button type="button" class="btn btn-default btn-sm" data-dismiss="modal"><span class="glyphicon glyphicon-remove"></span>&emsp;<span translate>Close</span></button>
+          <button ng-if="editingExisting && !editingSelf" type="button" class="btn btn-danger pull-left btn-sm" ng-click="deleteNode()"><span class="glyphicon glyphicon-minus"></span>&emsp;<span translate>Delete</span></button>
         </div>
       </div>
     </div>
@@ -410,17 +434,17 @@
               <div class="col-md-12">
                 <div class="form-group" ng-class="{'has-error': repoEditor.repoID.$invalid && repoEditor.repoID.$dirty}">
                   <label for="repoID"><span translate>Repository ID</span></label>
-                  <input name="repoID" placeholder="documents" ng-disabled="editingExisting" id="repoID" class="form-control" type="text" ng-model="currentRepo.ID" required unique-repo ng-pattern="/^[a-zA-Z0-9-_.]{1,64}$/"></input>
+                  <input name="repoID" ng-disabled="editingExisting" id="repoID" class="form-control" type="text" ng-model="currentRepo.ID" required unique-repo ng-pattern="/^[a-zA-Z0-9-_.]{1,64}$/"></input>
                   <p class="help-block">
                     <span translate ng-if="repoEditor.repoID.$valid || repoEditor.repoID.$pristine">Short identifier for the repository. Must be the same on all cluster nodes.</span>
                     <span translate ng-if="repoEditor.repoID.$error.uniqueRepo">The repository ID must be unique.</span>
                     <span translate ng-if="repoEditor.repoID.$error.required && repoEditor.repoID.$dirty">The repository ID cannot be blank.</span>
-                    <span translate ng-if="repoEditor.repoID.$error.pattern && repoEditor.repoID.$dirty">The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the the dot (.), dash (-) and underscode (_) characters only.</span>
+                    <span translate ng-if="repoEditor.repoID.$error.pattern && repoEditor.repoID.$dirty">The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.</span>
                   </p>
                 </div>
                 <div class="form-group" ng-class="{'has-error': repoEditor.repoPath.$invalid && repoEditor.repoPath.$dirty}">
                   <label translate for="repoPath">Repository Path</label>
-                  <input name="repoPath" placeholder="~/Documents" ng-disabled="editingExisting" id="repoPath" class="form-control" type="text" ng-model="currentRepo.Directory" required></input>
+                  <input name="repoPath" ng-disabled="editingExisting" id="repoPath" class="form-control" type="text" ng-model="currentRepo.Directory" required></input>
                   <p class="help-block">
                     <span translate ng-if="repoEditor.repoPath.$valid || repoEditor.repoPath.$pristine">Path to the repository on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for</span> <code>{{system.tilde}}</code>.
                     <span translate ng-if="repoEditor.repoPath.$error.required && repoEditor.repoPath.$dirty">The repository path cannot be blank.</span>
@@ -428,7 +452,7 @@
                 </div>
                 <div class="form-group" ng-class="{'has-error': repoEditor.rescanIntervalS.$invalid && repoEditor.rescanIntervalS.$dirty}">
                   <label for="rescanIntervalS"><span translate>Rescan Interval</span> (s)</label>
-                  <input name="rescanIntervalS" placeholder="60" id="rescanIntervalS" class="form-control" type="number" ng-model="currentRepo.RescanIntervalS" required min="5"></input>
+                  <input name="rescanIntervalS" id="rescanIntervalS" class="form-control" type="number" ng-model="currentRepo.RescanIntervalS" required min="5"></input>
                   <p class="help-block">
                     <span translate ng-if="!repoEditor.rescanIntervalS.$valid && repoEditor.rescanIntervalS.$dirty">The rescan interval must be at least 5 seconds.</span>
                   </p>
@@ -504,7 +528,7 @@
                 </div>
                 <div class="form-group" ng-if="currentRepo.FileVersioningSelector == 'staggered'">
                   <label translate for="staggeredVersionsPath">Versions Path</label>
-                  <input name="staggeredVersionsPath" placeholder="" id="staggeredVersionsPath" class="form-control" type="text" ng-model="currentRepo.staggeredVersionsPath"></input>
+                  <input name="staggeredVersionsPath" id="staggeredVersionsPath" class="form-control" type="text" ng-model="currentRepo.staggeredVersionsPath"></input>
                   <p translate class="help-block">Path where versions should be stored (leave empty for the default .stversions folder in the repository).</p>
                 </div>
               </div>
@@ -513,9 +537,41 @@
           <div translate ng-show="!editingExisting">When adding a new repository, keep in mind that the Repository ID is used to tie repositories together between nodes. They are case sensitive and must match exactly between all nodes.</div>
         </div>
         <div class="modal-footer">
-          <button type="button" class="btn btn-primary" ng-click="saveRepo()" ng-disabled="repoEditor.$invalid"><span class="glyphicon glyphicon-ok"></span>&emsp;<span translate>Save</span></button>
-          <button type="button" class="btn btn-default" data-dismiss="modal"><span class="glyphicon glyphicon-remove"></span>&emsp;<span translate>Close</span></button>
-          <button ng-if="editingExisting" type="button" class="btn btn-danger pull-left" ng-click="deleteRepo()"><span class="glyphicon glyphicon-minus"></span>&emsp;<span translate>Delete</span></button>
+          <button type="button" class="btn btn-primary btn-sm" ng-click="saveRepo()" ng-disabled="repoEditor.$invalid"><span class="glyphicon glyphicon-ok"></span>&emsp;<span translate>Save</span></button>
+          <button type="button" class="btn btn-default btn-sm" data-dismiss="modal"><span class="glyphicon glyphicon-remove"></span>&emsp;<span translate>Close</span></button>
+          <button ng-if="editingExisting" type="button" class="btn btn-danger pull-left btn-sm" ng-click="deleteRepo()"><span class="glyphicon glyphicon-minus"></span>&emsp;<span translate>Delete</span></button>
+          <button id="editIgnoresButton" ng-if="editingExisting" type="button" class="btn btn-default pull-left btn-sm" ng-click="editIgnores()"><span class="glyphicon glyphicon-eye-close"></span>&emsp;<span translate>Ignore Patterns</span></button>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <!-- Ignores editor modal -->
+
+  <div id="editIgnores" class="modal fade" tabindex="-1">
+    <div class="modal-dialog modal-lg">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h4 class="modal-title" translate>Ignore Patterns</h4>
+        </div>
+        <div class="modal-body">
+          <p translate>Enter ignore patterns, one per line.</p>
+          <textarea class="form-control" rows="15"></textarea>
+
+          <hr/>
+
+          <p class="small"><span translate>Quick guide to supported patterns</span> (<a href="https://discourse.syncthing.net/t/80" translate>full documentation</a>):</p>
+          <dl class="dl-horizontal dl-narrow small">
+            <dt><code>!</code></dt> <dd><span translate>Inversion of the given condition (i.e. do not exclude)</span></dd>
+            <dt><code>*</code></dt> <dd><span translate>Single level wildcard (matches within a directory only)</span></dd>
+            <dt><code>**</code></dt> <dd><span translate>Multi level wildcard (matches multiple directory levels)</span></dd>
+            <dt><code>//</code></dt> <dd><span translate>Comment, when used at the start of a line</span></dd>
+          </dl>
+        </div>
+        <div class="modal-footer">
+          <div class="pull-left"><span translate>Editing</span> <code>{{currentRepo.Directory}}/.stignore</code></div>
+          <button type="button" class="btn btn-primary btn-sm" data-dismiss="modal" ng-click="saveIgnores()"><span class="glyphicon glyphicon-ok"></span>&emsp;<span translate>Save</span></button>
+          <button type="button" class="btn btn-default btn-sm" data-dismiss="modal"><span class="glyphicon glyphicon-remove"></span>&emsp;<span translate>Close</span></button>
         </div>
       </div>
     </div>
@@ -534,48 +590,52 @@
             <div class="row">
 
               <div class="col-md-6">
+                <div class="form-group">
+                  <label translate for="NodeName">Node Name</label>
+                  <input id="NodeName" class="form-control" type="text" ng-model="tmpOptions.NodeName">
+                </div>
                 <div class="form-group">
                   <label translate for="ListenStr">Sync Protocol Listen Addresses</label>
                   <input id="ListenStr" class="form-control" type="text" ng-model="tmpOptions.ListenStr">
                 </div>
+                <div class="form-group">
+                  <label translate for="MaxRecvKbps">Incoming Rate Limit (KiB/s)</label>
+                  <input id="MaxRecvKbps" class="form-control" type="number" ng-model="tmpOptions.MaxRecvKbps">
+                </div>
                 <div class="form-group">
                   <label translate for="MaxSendKbps">Outgoing Rate Limit (KiB/s)</label>
                   <input id="MaxSendKbps" class="form-control" type="number" ng-model="tmpOptions.MaxSendKbps">
                 </div>
-                <!--
-                <div class="form-group">
-                  <label translate for="ReconnectIntervalS">Reconnect Interval (s)</label>
-                  <input id="ReconnectIntervalS" class="form-control" type="number" ng-model="tmpOptions.ReconnectIntervalS">
-                </div>
-                <div class="form-group">
-                  <label translate for="ParallelRequests">Max Outstanding Requests</label>
-                  <input id="ParallelRequests" class="form-control" type="number" ng-model="tmpOptions.ParallelRequests">
-                </div>
-                <div class="form-group">
-                  <label translate for="MaxChangeKbps">Max File Change Rate (KiB/s)</label>
-                  <input id="MaxChangeKbps" class="form-control" type="number" ng-model="tmpOptions.MaxChangeKbps">
-                </div>
-                -->
-                <div class="form-group">
-                  <div class="checkbox">
-                    <label>
-                      <span translate>Enable UPnP</span> <input id="UPnPEnabled" type="checkbox" ng-model="tmpOptions.UPnPEnabled">
-                    </label>
+                <div class="col-md-6">
+                  <div class="form-group">
+                    <div class="checkbox">
+                      <label>
+                        <span translate>Enable UPnP</span> <input id="UPnPEnabled" type="checkbox" ng-model="tmpOptions.UPnPEnabled">
+                      </label>
+                    </div>
+                  </div>
+                  <div class="form-group">
+                    <div class="checkbox">
+                      <label>
+                        <span translate>Global Discovery</span> <input id="GlobalAnnEnabled" type="checkbox" ng-model="tmpOptions.GlobalAnnEnabled">
+                      </label>
+                    </div>
                   </div>
                 </div>
-
-                <div class="form-group">
-                  <div class="checkbox">
-                    <label>
-                      <span translate>Local Discovery</span> <input id="LocalAnnEnabled" type="checkbox" ng-model="tmpOptions.LocalAnnEnabled">
-                    </label>
+                <div class="col-md-6">
+                  <div class="form-group">
+                    <div class="checkbox">
+                      <label>
+                        <span translate>Automatic upgrades</span> <input id="AutoUpgradeEnabled" type="checkbox" ng-model="tmpOptions.AutoUpgradeEnabled">
+                      </label>
+                    </div>
                   </div>
-                </div>
-                <div class="form-group">
-                  <div class="checkbox">
-                    <label>
-                      <span translate>Global Discovery</span> <input id="GlobalAnnEnabled" type="checkbox" ng-model="tmpOptions.GlobalAnnEnabled">
-                    </label>
+                  <div class="form-group">
+                    <div class="checkbox">
+                      <label>
+                        <span translate>Local Discovery</span> <input id="LocalAnnEnabled" type="checkbox" ng-model="tmpOptions.LocalAnnEnabled">
+                      </label>
+                    </div>
                   </div>
                 </div>
                 <div class="form-group">
@@ -600,7 +660,7 @@
                 <div class="form-group">
                   <div class="checkbox">
                     <label>
-                    <span translate>Use HTTPS for GUI</span> <input id="UseTLS" type="checkbox" ng-model="tmpGUI.UseTLS">
+                      <span translate>Use HTTPS for GUI</span> <input id="UseTLS" type="checkbox" ng-model="tmpGUI.UseTLS">
                     </label>
                   </div>
                 </div>
@@ -614,7 +674,7 @@
                 <div class="form-group">
                   <div class="checkbox">
                     <label>
-                      <span translate>Anonymous Usage Reporting</span> <input id="UREnabled" type="checkbox" ng-model="tmpOptions.UREnabled">
+                      <span translate>Anonymous Usage Reporting</span> <input id="UREnabled" type="checkbox" ng-model="tmpOptions.UREnabled"> (<a translate ng-click="showURPreview()" href="#">Preview</a>)
                     </label>
                   </div>
                 </div>
@@ -632,8 +692,8 @@
           </form>
         </div>
         <div class="modal-footer">
-          <button type="button" class="btn btn-primary" ng-click="saveSettings()"><span class="glyphicon glyphicon-ok"></span>&emsp;<span translate>Save</span></button>
-          <button type="button" class="btn btn-default" data-dismiss="modal"><span class="glyphicon glyphicon-remove"></span>&emsp;<span translate>Close</span></button>
+          <button type="button" class="btn btn-primary btn-sm" ng-click="saveSettings()"><span class="glyphicon glyphicon-ok"></span>&emsp;<span translate>Save</span></button>
+          <button type="button" class="btn btn-default btn-sm" data-dismiss="modal"><span class="glyphicon glyphicon-remove"></span>&emsp;<span translate>Close</span></button>
         </div>
       </div>
     </div>
@@ -648,14 +708,34 @@
           <h4 translate class="modal-title">Allow Anonymous Usage Reporting?</h4>
         </div>
         <div class="modal-body">
-        <p translate>The encrypted usage report is sent daily. It is used to track common platforms, repo 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>
-        <button translate type="button" class="btn btn-default" ng-show="!reportPreview" ng-click="showReportPreview()">Preview Usage Report</button>
-        <pre ng-if="reportPreview"><small>{{reportData | json}}</small></pre>
+          <p translate>The encrypted usage report is sent daily. It is used to track common platforms, repo 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>
+          <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>
         <div class="modal-footer">
-          <button type="button" class="btn btn-success" ng-click="acceptUR()"><span class="glyphicon glyphicon-ok"></span>&emsp;<span translate>Yes</span></button>
-          <button type="button" class="btn btn-danger" ng-click="declineUR()"><span class="glyphicon glyphicon-remove"></span>&emsp;<span translate>No</span></button>
+          <button type="button" class="btn btn-success btn-sm" ng-click="acceptUR()"><span class="glyphicon glyphicon-ok"></span>&emsp;<span translate>Yes</span></button>
+          <button type="button" class="btn btn-danger btn-sm" ng-click="declineUR()"><span class="glyphicon glyphicon-remove"></span>&emsp;<span translate>No</span></button>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <!-- Usage report preview modal -->
+
+  <div id="urPreview" class="modal fade" tabindex="-1">
+    <div class="modal-dialog modal-lg">
+      <div class="modal-content">
+        <div class="modal-header alert alert-success">
+          <h4 translate class="modal-title">Anonymous Usage Reporting</h4>
+        </div>
+        <div class="modal-body">
+          <p translate>The encrypted usage report is sent daily. It is used to track common platforms, repo 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>
+          <pre><small>{{reportData | json}}</small></pre>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-success btn-sm" data-dismiss="modal"><span class="glyphicon glyphicon-ok"></span>&emsp;<span translate>OK</span></button>
         </div>
       </div>
     </div>
@@ -691,12 +771,13 @@
           <li>Ben Sidhom</li>
           <li>Brandon Philips</li>
           <li>Gilli Sigurdsson</li>
+          <li>James Patterson</li>
         </ul>
-        </div>
+      </div>
       <div class="col-md-6">
         <ul>
-          <li>James Patterson</li>
           <li>Jens Diemer</li>
+          <li>Lode Hoste</li>
           <li>Marcin Dziadus</li>
           <li>Michael Tilli</li>
           <li>Philippe Schommers</li>
@@ -704,7 +785,7 @@
           <li>Tully Robinson</li>
           <li>Veeti Paananen</li>
         </ul>
-        </div>
+      </div>
     </div>
     <hr/>
 

gui/lang/lang-bg.json

@@ -8,9 +8,12 @@
     "Allow Anonymous Usage Reporting?": "Разреши анонимен доклад за ползване на програмата?",
     "Announce Server": "Announce Server",
     "Anonymous Usage Reporting": "Анонимен Доклад",
+    "Any nodes configured on an introducer node will be added to this node as well.": "Any nodes configured on an introducer node will be added to this node as well.",
     "Bugs": "Бъгове",
     "CPU Utilization": "Натоварване на Процесора",
     "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": "Грешка при Свързването",
     "Copyright © 2014 Jakob Borg and the following Contributors:": "Правата запазени © 2014 Jakob Borg и следните Сътрудници:",
     "Delete": "Изтрий",
@@ -20,8 +23,10 @@
     "Edit": "Промени",
     "Edit Node": "Промени Машината",
     "Edit Repository": "Промени Папката",
+    "Editing": "Editing",
     "Enable UPnP": "Включи UPnP",
     "Enter comma separated \"ip:port\" addresses or \"dynamic\" to perform automatic discovery of the address.": "Въведи \"ip:port\" адреси разделени със запетая или \"dynamic\", за да извършиш автоматична връзка на адреси.",
+    "Enter ignore patterns, one per line.": "Enter ignore patterns, one per line.",
     "Error": "Грешка",
     "File Versioning": "Файлови Версии",
     "File permission bits are ignored when looking for changes. Use on FAT filesystems.": "Битовете за права за достъп са игнорирани, когато се проверява за промени. Използвай с файлови системи тип FAT.",
@@ -36,9 +41,13 @@
     "Global Discovery Server": "Сървър за Глобално Откриване",
     "Global Repository": "Глобална Папка",
     "Idle": "Без Работа",
+    "Ignore Patterns": "Ignore Patterns",
     "Ignore Permissions": "Игнорирай Права за Достъп",
+    "Incoming Rate Limit (KiB/s)": "Входящ Лимит на Скороста(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": "Пази Версии",
-    "Last seen": "Last seen",
+    "Last seen": "Последно видян",
     "Latest Release": "Най-новата Версия",
     "Local Discovery": "Локално Откриване",
     "Local Discovery Port": "Порт за Локално Откриване",
@@ -46,10 +55,11 @@
     "Master Repo": "Главна Папка",
     "Max File Change Rate (KiB/s)": "Макс. Скорост на Промяна (KiB/s)",
     "Max Outstanding Requests": "Макс. Неизпълени Заявки",
-    "Maximum Age": "Maximum Age",
-    "Never": "Never",
+    "Maximum Age": "Максимална Възраст",
+    "Multi level wildcard (matches multiple directory levels)": "Multi level wildcard (matches multiple directory levels)",
+    "Never": "Никога",
     "No": "Не",
-    "No File Versioning": "No File Versioning",
+    "No File Versioning": "Няма Файлови Версии",
     "Node ID": "Код на Машината",
     "Node Identification": "Идентификация на Машината",
     "Node Name": "Име на Машината",
@@ -61,16 +71,18 @@
     "Outgoing Rate Limit (KiB/s)": "Лимит на Изходящата Скорост (KiB/s)",
     "Override Changes": "Замени Промените",
     "Path to the repository on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Пътят до папката на този компютър. Ще бъде създадена ако не съществува. Символът тилда (~) може да бъде използван като заместител на",
-    "Path where versions should be stored (leave empty for the default .stversions folder in the repository).": "Path where versions should be stored (leave empty for the default .stversions folder in the repository).",
+    "Path where versions should be stored (leave empty for the default .stversions folder in the repository).": "Пътят, където версиите да бъдат складирани(остави празно за папката .stversions).",
     "Please wait": "Моля изчакай",
+    "Preview": "Preview",
     "Preview Usage Report": "Разгледай Доклада за Използване",
+    "Quick guide to supported patterns": "Quick guide to supported patterns",
     "RAM Utilization": "RAM Натоварване",
     "Reconnect Interval (s)": "Интервал(и) на Свързване",
     "Repository ID": "Идентификатор на Папката",
     "Repository Master": "Главна Папка",
     "Repository Path": "Път до Папката",
     "Rescan": "Повторно Сканиране",
-    "Rescan Interval": "Rescan Interval",
+    "Rescan Interval": "Интервал за Повторно Сканиране",
     "Rescan Interval (s)": "Интеравал(и) на Сканиране",
     "Restart": "Рестартирай",
     "Restart Needed": "Изискава се Рестартиране",
@@ -87,9 +99,10 @@
     "Shown instead of Node ID in the cluster status. Will be advertised to other nodes as an optional default name.": "Покажи вмест ID-то на Компютъра в статус на клъстъра. Ще бъде предлагано на други комютри като име по подразбиране.",
     "Shown instead of Node ID in the cluster status. Will be updated to the name the node advertises if left empty.": "Покажи вмест ID-то на Компютъра в статус на клъстъра. Ще бъде обновено с името по подразбиране изпратено от другия компютър.",
     "Shutdown": "Спри Програмата",
-    "Simple File Versioning": "Simple File Versioning",
+    "Simple File Versioning": "Просто Файлови Версии",
+    "Single level wildcard (matches within a directory only)": "Single level wildcard (matches within a directory only)",
     "Source Code": "Сорс Код",
-    "Staggered File Versioning": "Staggered File Versioning",
+    "Staggered File Versioning": "Наслагващи се Файлови Версии",
     "Start Browser": "Стартирай Браузъра",
     "Stopped": "Спряна",
     "Support / Forum": "Помощ / Форум",
@@ -106,18 +119,19 @@
     "The encrypted usage report is sent daily. It is used to track common platforms, repo sizes and app versions. If the reported data set is changed you will be prompted with this dialog again.": "Криптираният доклад се изпраща дневно. Използва се, за да следи общи платформи, размери на папки и версии на приложението. Ако събираните данни се променят, ще бъдете информиран с подобен на този диалог.",
     "The entered node ID does not look valid. It should be a 52 character string consisting of letters and numbers, with spaces and dashes being optional.": "Въведни код на машината не е валиден. Трябва да бъде 52 символа и да се състои от букви, цифри като интервалите и тиретата са пожелание.",
     "The entered node 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.": "Въведни код на машината не е валиден. Трябва да бъде 52 или 56 символа и да се състои от букви, цифри като интервалите и тиретата са пожелание.",
-    "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.",
-    "The maximum age must be a number and cannot be blank.": "The maximum age must be a number and cannot be blank.",
-    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "The maximum time to keep a version (in days, set to 0 to keep versions forever).",
+    "The 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.": "Използва се следния интервал: за първия час се пази версия всеки 30 секунди, за първия ден се пази версия всеки час, за първите 30 дена се пази версия всеки ден, до максимума се пази една версия всяка седмица.",
+    "The maximum age must be a number and cannot be blank.": "Максималната възраст трябва да е число и не може д ае празна.",
+    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Максималното време да се пазят весрсии (в дни, сложи 0, за да пазиш версии завинаги).",
     "The node ID cannot be blank.": "Кодът на машината не може да бъде празен.",
     "The node ID to enter here can be found in the \"Edit > Show ID\" dialog on the other node. Spaces and dashes are optional (ignored).": "Кодът на машината, който си въвел може да бъде намерен в \"Промени > Покажи Идентификатора\". Интервалите и тиретата са пожелание(биват прескачани).",
     "The number of old versions to keep, per file.": "Броят стари версии, които да бъдат пазени за всеки файл.",
     "The number of versions must be a number and cannot be blank.": "Броят версии трябва да бъде число и не може да бъде празно.",
     "The repository ID cannot be blank.": "Полето идентификатор на папка не може д абъде празно.",
+    "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.",
     "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the the dot (.), dash (-) and underscode (_) characters only.": "Идентификаторът на папка трябва да бъде къс(64 символа или по-малко) състоящ се само от букви, цифри, точка(.), тире(-) и подчерта (_).",
     "The repository ID must be unique.": "Идентификаторът на папката тряба да бъде уникален.",
     "The repository path cannot be blank.": "Пътят до папката не може да бъде празен.",
-    "The rescan interval must be at least 5 seconds.": "The rescan interval must be at least 5 seconds.",
+    "The rescan interval must be at least 5 seconds.": "Интервала за повторно сканиране трябва да бъде поне 5 секунди.",
     "Unknown": "Неясен",
     "Up to Date": "Актуален",
     "Upgrade To {%version%}": "Обновен До {{version}}",
@@ -127,11 +141,12 @@
     "Use Compression": "Използвай Компресиране",
     "Use HTTPS for GUI": "Използвай HTTPS за Потребителския Интерфейс",
     "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.",
+    "Versions Path": "Път до Версиите",
+    "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 node, keep in mind that this node must be added on the other side too.": "Когато добавяш нова машина помни, че твоята машина също трябва да бъде добавена от другата страна.",
     "When adding a new repository, keep in mind that the Repository ID is used to tie repositories together between nodes. They are case sensitive and must match exactly between all nodes.": "Когато добавяш нов идентификатор на папка помни, че той се използва за свързване на папките на различни машини. Главни/малки букви са от значение и трябва да са еднакви на всички машини.",
     "Yes": "Да",
     "You must keep at least one version.": "Трябва да пазиш поне една версия.",
+    "full documentation": "full documentation",
     "items": "артикула"
 }

gui/lang/lang-ca.json

@@ -8,9 +8,12 @@
     "Allow Anonymous Usage Reporting?": "Permetre l'enviament anònim d'informes d'ús?",
     "Announce Server": "Servidor d'anunciament",
     "Anonymous Usage Reporting": "Informe anònim d'ús",
+    "Any nodes configured on an introducer node will be added to this node as well.": "Any nodes configured on an introducer node will be added to this node as well.",
     "Bugs": "Bugs",
     "CPU Utilization": "Utilització del CPU",
     "Close": "Tancar",
+    "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": "Error de connexió",
     "Copyright © 2014 Jakob Borg and the following Contributors:": "Copyright © 2014 Jakob Borg i els següents contribuïdors",
     "Delete": "Esborrar",
@@ -20,8 +23,10 @@
     "Edit": "Editar",
     "Edit Node": "Editar Node",
     "Edit Repository": "Editar Repositori",
+    "Editing": "Editing",
     "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.": "Enter ignore patterns, one per line.",
     "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.",
@@ -36,7 +41,11 @@
     "Global Discovery Server": "Servidor de Descobriment Global",
     "Global Repository": "Repositori Global",
     "Idle": "Inactiu",
+    "Ignore Patterns": "Ignore Patterns",
     "Ignore Permissions": "Ignora Permisos",
+    "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": "Mantenir Versions",
     "Last seen": "Vist per última vegada",
     "Latest Release": "Última publicació",
@@ -47,6 +56,7 @@
     "Max File Change Rate (KiB/s)": "Tasa Màxima d'intercanvi de fitxer (KiB/s)",
     "Max Outstanding Requests": "Màxim de Peticions Pendents",
     "Maximum Age": "Antiguitat Màxima",
+    "Multi level wildcard (matches multiple directory levels)": "Multi level wildcard (matches multiple directory levels)",
     "Never": "Mai",
     "No": "No",
     "No File Versioning": "Sense Versionat de Fitxer",
@@ -63,7 +73,9 @@
     "Path to the repository on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Ruta del repositori 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 repository).": "Ruta on les versions s'haurien de guardar (deixa-ho buit per fer servir el directori .stversions per defecte al repositori)",
     "Please wait": "Si-us-plau espera",
+    "Preview": "Preview",
     "Preview Usage Report": "Vista Prèvia de l'Informe d'Ús",
+    "Quick guide to supported patterns": "Quick guide to supported patterns",
     "RAM Utilization": "Utilització de la RAM",
     "Reconnect Interval (s)": "Interval de Reconnexió (s)",
     "Repository ID": "ID del Repositori",
@@ -88,6 +100,7 @@
     "Shown instead of Node ID in the cluster status. Will be updated to the name the node advertises if left empty.": "Mostrat en comptes del ID del Node en l'estat del cluster. S'actualitzara al nom del node si es deixa buit.",
     "Shutdown": "Apagar",
     "Simple File Versioning": "Versionat de Fitxers Senzill",
+    "Single level wildcard (matches within a directory only)": "Single level wildcard (matches within a directory only)",
     "Source Code": "Codi Font",
     "Staggered File Versioning": "Versionat de Fitxers Esglaonat",
     "Start Browser": "Arrancar Navegador",
@@ -114,6 +127,7 @@
     "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 repository ID cannot be blank.": "El ID del repositori no pot estar en blanc.",
+    "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.",
     "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the the dot (.), dash (-) and underscode (_) characters only.": "El ID del repositori 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 repository ID must be unique.": "El ID del repositori ha de ser únic",
     "The repository path cannot be blank.": "La carpeta del repositori no pot estar en blanc.",
@@ -133,5 +147,6 @@
     "When adding a new repository, keep in mind that the Repository ID is used to tie repositories together between nodes. They are case sensitive and must match exactly between all nodes.": "Quan s'afegeix un nou repositori recorda que el ID del repositori s'utilitza per lligar repositoris entre nodes. Es distingeix entre majúscules i minúscules i ha de ser exactament iguals entre tots els nodes.",
     "Yes": "Si",
     "You must keep at least one version.": "Has de mantenir com a mínim una versió.",
+    "full documentation": "full documentation",
     "items": "Elements"
 }

gui/lang/lang-da.json

@@ -8,9 +8,12 @@
     "Allow Anonymous Usage Reporting?": "Tillad anonym brugerstatistik?",
     "Announce Server": "Opslagsserver",
     "Anonymous Usage Reporting": "Anonym brugerstatistik",
+    "Any nodes configured on an introducer node will be added to this node as well.": "Any nodes configured on an introducer node will be added to this node as well.",
     "Bugs": "Fejl",
     "CPU Utilization": "CPU-forbrug",
     "Close": "Luk",
+    "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": "Tilslutnings fejl",
     "Copyright © 2014 Jakob Borg and the following Contributors:": "Copyright © 2014 Jakob Borg og følgende bidragsydere:",
     "Delete": "Slet",
@@ -20,8 +23,10 @@
     "Edit": "Rediger",
     "Edit Node": "Rediger node",
     "Edit Repository": "Rediger lager",
+    "Editing": "Editing",
     "Enable UPnP": "Anvend UPnP",
     "Enter comma separated \"ip:port\" addresses or \"dynamic\" to perform automatic discovery of the address.": "Angiv kommaseparerat \"ip:port\"-adresser eller ordet \"dynamic\" for at benytte automatisk opslag.",
+    "Enter ignore patterns, one per line.": "Enter ignore patterns, one per line.",
     "Error": "Fejl",
     "File Versioning": "Filversionering",
     "File permission bits are ignored when looking for changes. Use on FAT filesystems.": "Filrettigheder tages der ikke hensyn til ved synkronisering. Anvend på FAT-filsystemer.",
@@ -36,7 +41,11 @@
     "Global Discovery Server": "Global opslagsserver",
     "Global Repository": "Global lagring",
     "Idle": "Inaktiv",
+    "Ignore Patterns": "Ignore Patterns",
     "Ignore Permissions": "Ignorér filrettigheder",
+    "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": "Behold versioner",
     "Last seen": "Last seen",
     "Latest Release": "Seneste udgivelse",
@@ -47,6 +56,7 @@
     "Max File Change Rate (KiB/s)": "Højeste filændringshastighed (KiB/s)",
     "Max Outstanding Requests": "Parallelitet",
     "Maximum Age": "Maximum Age",
+    "Multi level wildcard (matches multiple directory levels)": "Multi level wildcard (matches multiple directory levels)",
     "Never": "Never",
     "No": "Nej",
     "No File Versioning": "No File Versioning",
@@ -63,7 +73,9 @@
     "Path to the repository on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Sti til lagring på din lokale computer. Hvis biblioteket ikke findes vil det blive oprettet. Tegnet tilde (~) kan bruges som genvej til",
     "Path where versions should be stored (leave empty for the default .stversions folder in the repository).": "Path where versions should be stored (leave empty for the default .stversions folder in the repository).",
     "Please wait": "Vent venligst",
+    "Preview": "Preview",
     "Preview Usage Report": "Forhåndsvisning af forbrugsrapport",
+    "Quick guide to supported patterns": "Quick guide to supported patterns",
     "RAM Utilization": "RAM-forbrug",
     "Reconnect Interval (s)": "Gentilslutningsinterval (s)",
     "Repository ID": "Lagrings-ID",
@@ -88,6 +100,7 @@
     "Shown instead of Node ID in the cluster status. Will be updated to the name the node advertises if left empty.": "Shown instead of Node ID in the cluster status. Will be updated to the name the node advertises if left empty.",
     "Shutdown": "Luk ned",
     "Simple File Versioning": "Simple File Versioning",
+    "Single level wildcard (matches within a directory only)": "Single level wildcard (matches within a directory only)",
     "Source Code": "Kildekode",
     "Staggered File Versioning": "Staggered File Versioning",
     "Start Browser": "Start browser",
@@ -114,6 +127,7 @@
     "The number of old versions to keep, per file.": "Antallet af gamle versioner som gemmes, per fil.",
     "The number of versions must be a number and cannot be blank.": "Antallet af versioner skal være et tal, og kan ikke være blankt.",
     "The repository ID cannot be blank.": "Lagrings-ID kan ikke være blankt.",
+    "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.",
     "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the the dot (.), dash (-) and underscode (_) characters only.": "Lagrings-ID'et skal være en kort identificierende streng (64 karaktere eller mindre) bestående af bogstav-, tal-, punktum- (.), bindestreg- (-) og understregskaraktere (_).",
     "The repository ID must be unique.": "Lagrings-ID'et skal være unikt.",
     "The repository path cannot be blank.": "Lagringsstien kan ikke være blank.",
@@ -133,5 +147,6 @@
     "When adding a new repository, keep in mind that the Repository ID is used to tie repositories together between nodes. They are case sensitive and must match exactly between all nodes.": "Når du tilføjer en ny node skal du huske, at lagrings-ID'et bliver brugt til at knytte noder sammen. De er følsomme for store og små bogstaver og skal matche på alle noder.",
     "Yes": "Ja",
     "You must keep at least one version.": "Du skal beholde mindst én version.",
+    "full documentation": "full documentation",
     "items": "poster"
 }

gui/lang/lang-de.json

@@ -8,9 +8,12 @@
     "Allow Anonymous Usage Reporting?": "Übertragung von anonymen Nutzungsstatistiken erlauben?",
     "Announce Server": "Ankündigungs-Server",
     "Anonymous Usage Reporting": "Anonymer Nutzungsbericht",
+    "Any nodes configured on an introducer node will be added to this node as well.": "Any nodes configured on an introducer node will be added to this node as well.",
     "Bugs": "Fehler",
     "CPU Utilization": "Prozessorauslastung",
     "Close": "Schließen",
+    "Comment, when used at the start of a line": "Kommentar, wenn am Anfang der Zeile benutzt.",
+    "Compression is recommended in most setups.": "Compression is recommended in most setups.",
     "Connection Error": "Verbindungsfehler",
     "Copyright © 2014 Jakob Borg and the following Contributors:": "Copyright © 2014 Jakob Borg und folgende Unterstützer:",
     "Delete": "Löschen",
@@ -20,8 +23,10 @@
     "Edit": "Einstellungen bearbeiten",
     "Edit Node": "Knoten bearbeiten",
     "Edit Repository": "Verzeichnis ändern",
+    "Editing": "Bearbeitung",
     "Enable UPnP": "UPnP aktivieren",
     "Enter comma separated \"ip:port\" addresses or \"dynamic\" to perform automatic discovery of the address.": "Trage durch ein Komma getrennte \"IP:Port\" Adressen oder \"dynamic\" ein um automatische Adresserkennung durchzuführen.",
+    "Enter ignore patterns, one per line.": "Geben Sie Ignoriermuster ein, eines pro Zeile.",
     "Error": "Fehler",
     "File Versioning": "Dateiversionierung",
     "File permission bits are ignored when looking for changes. Use on FAT filesystems.": "Dateizugriffsrechte beim Suchen nach Veränderungen ignorieren. Bei FAT-Dateisystemen verwenden.",
@@ -36,7 +41,11 @@
     "Global Discovery Server": "Globaler Auffindungsserver",
     "Global Repository": "Globales Verzeichnis",
     "Idle": "Untätig",
+    "Ignore Patterns": "Ignoriermuster",
     "Ignore Permissions": "Berechtigungen ignorieren",
+    "Incoming Rate Limit (KiB/s)": "Eingehendes Datenratelimit (KiB/s)",
+    "Introducer": "Introducer",
+    "Inversion of the given condition (i.e. do not exclude)": "Umkehrung der angegebenen Bedingung (z.B. schließe nicht aus)",
     "Keep Versions": "Versionen erhalten",
     "Last seen": "Zuletzt online",
     "Latest Release": "Letzte Veröffentlichung",
@@ -47,6 +56,7 @@
     "Max File Change Rate (KiB/s)": "Maximale Datenänderungsrate (KiB/s)",
     "Max Outstanding Requests": "Max. ausstehende Anfragen",
     "Maximum Age": "Höchstalter",
+    "Multi level wildcard (matches multiple directory levels)": "Verschachteltes Maskenzeichen (wird für verschachtelte Verzeichnisse verwendet)",
     "Never": "Nie",
     "No": "Nein",
     "No File Versioning": "Keine Dateiversionierung",
@@ -63,7 +73,9 @@
     "Path to the repository 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",
     "Path where versions should be stored (leave empty for the default .stversions folder in the repository).": "Pfad in dem die Versionen gespeichert werden sollen (ohne Angabe wird der Ordner .stversions im Verzeichnis verwendet).",
     "Please wait": "Bitte warten",
+    "Preview": "Vorschau",
     "Preview Usage Report": "Vorschau des Nutzungsberichts",
+    "Quick guide to supported patterns": "Schnellanleitung zu den unterstützten Suchstrukturen",
     "RAM Utilization": "Verwendeter Arbeitsspeicher",
     "Reconnect Interval (s)": "Wiederverbindungsintervall (s)",
     "Repository ID": "Verzeichnis-ID",
@@ -88,6 +100,7 @@
     "Shown instead of Node ID in the cluster status. Will be updated to the name the node advertises if left empty.": "Wird anstatt der Knoten-ID im Verbunds-Status angezeigt. Wird auf den Namen aktualisiert, den der Knoten angibt.",
     "Shutdown": "Herunterfahren",
     "Simple File Versioning": "Einfache Dateiversionierung",
+    "Single level wildcard (matches within a directory only)": "Einzelnes Maskenzeichen (wird für ein einzelnes Verzeichnis verwendet)",
     "Source Code": "Sourcecode",
     "Staggered File Versioning": "Stufenweise Dateiversionierung",
     "Start Browser": "Starte Browser",
@@ -114,6 +127,7 @@
     "The number of old versions to keep, per file.": "Anzahl der alten Versionen, die von jeder Datei gespeichert werden sollen.",
     "The number of versions must be a number and cannot be blank.": "Die Anzahl von Versionen muss eine Zahl und darf nicht leer sein.",
     "The repository ID cannot be blank.": "Die Verzeichnis-ID darf nicht leer sein.",
+    "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "Die Verzeichnis-ID muss eine kurze Kennung (64 Zeichen oder weniger) sein. Sie kann nur aus Buchstaben, Zahlen und den Punkt- (.), Strich- (-), und Unterstrich- (_) Zeichen bestehen.",
     "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the the dot (.), dash (-) and underscode (_) characters only.": "Die Verzeichnis-ID muss eine kurze Kennung (64 Zeichen oder weniger) sein. Sie kann aus Buchstaben, Zahlen und den Punkt- (.), Strich- (-), und Unterstrich- (_) Zeichen bestehen.",
     "The repository ID must be unique.": "Die Verzeichnis-ID muss eindeutig sein.",
     "The repository path cannot be blank.": "Der Verzeichnis-Pfad kann nicht leer sein",
@@ -133,5 +147,6 @@
     "When adding a new repository, keep in mind that the Repository ID is used to tie repositories together between nodes. They are case sensitive and must match exactly between all nodes.": "Beim Hinzufügen eines neuen Verzeichnisses, beachte dass die Verzeichnis-ID dazu verwendet wird, Verzeichnisse zwischen Knoten zu verbinden. Die ID muss also auf allen Knoten gleich sein, Groß- und Kleinschreibung muss dabei beachtet werden.",
     "Yes": "Ja",
     "You must keep at least one version.": "Du musst mindestens eine Version behalten.",
+    "full documentation": "Komplette Dokumentation",
     "items": "Einträge"
 }

gui/lang/lang-el.json

@@ -8,9 +8,12 @@
     "Allow Anonymous Usage Reporting?": "Να επιτρέπεται Ανώνυμη Αποστολή Αναφοράς Χρήσης?",
     "Announce Server": "Διακομιστής Αναγγελίας",
     "Anonymous Usage Reporting": "Ανώνυμη Αναφορά Χρήσης",
+    "Any nodes configured on an introducer node will be added to this node as well.": "Any nodes configured on an introducer node will be added to this node as well.",
     "Bugs": "Bugs",
     "CPU Utilization": "Χρήση CPU",
     "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": "Σφάλμα Σύνδεσης",
     "Copyright © 2014 Jakob Borg and the following Contributors:": "Copyright © 2014 Jakob Borg και οι παρακάτω Συνεισφορείς:",
     "Delete": "Διαγραφή",
@@ -20,8 +23,10 @@
     "Edit": "Επεξεργασία",
     "Edit Node": "Επεξεργασία Κόμβου",
     "Edit Repository": "Επεξεργασία Αποθετηρίου",
+    "Editing": "Editing",
     "Enable UPnP": "Ενεργοποίηση UPnP",
     "Enter comma separated \"ip:port\" addresses or \"dynamic\" to perform automatic discovery of the address.": "Εισήγαγε διαχωρισμένα με κόμμα \"ip:port\" διευθύνσεις ή \"dynamic\", για να πραγματοποιηθεί η αυτόματη εξεύρεση διευθύνσεων.",
+    "Enter ignore patterns, one per line.": "Enter ignore patterns, one per line.",
     "Error": "Σφάλμα",
     "File Versioning": "File Versioning",
     "File permission bits are ignored when looking for changes. Use on FAT filesystems.": "Τα permission bits των αρχείων αγνοούνται όταν γίνεται αναζήτηση για αλλαγές. Χρήση σε FAT filesystems.",
@@ -36,7 +41,11 @@
     "Global Discovery Server": "Διακομιστής Ανεύρεσης Κόμβου",
     "Global Repository": "Global Repository",
     "Idle": "Ανενεργό",
+    "Ignore Patterns": "Ignore Patterns",
     "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": "Διατήρησε Εκδόσεις",
     "Last seen": "Last seen",
     "Latest Release": "Τελευταία Έκδοση",
@@ -47,6 +56,7 @@
     "Max File Change Rate (KiB/s)": "Max File Change Rate (KiB/s)",
     "Max Outstanding Requests": "Max Outstanding Requests",
     "Maximum Age": "Maximum Age",
+    "Multi level wildcard (matches multiple directory levels)": "Multi level wildcard (matches multiple directory levels)",
     "Never": "Never",
     "No": "Αριθμός",
     "No File Versioning": "No File Versioning",
@@ -63,7 +73,9 @@
     "Path to the repository on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Μονοπάτι του αποθετηρίου στον τοπικό υπολογιστή. Σε περίπτωση που δεν υπάρχει, θα δημιουργηθεί. Ο χαρακτήρας tilde (~) μπορεί να χρησιμοποιηθεί σαν συντόμευση για",
     "Path where versions should be stored (leave empty for the default .stversions folder in the repository).": "Path where versions should be stored (leave empty for the default .stversions folder in the repository).",
     "Please wait": "Παρακαλώ περιμένετε",
+    "Preview": "Preview",
     "Preview Usage Report": "Προεπισκόπηση αναφοράς χρήσης",
+    "Quick guide to supported patterns": "Quick guide to supported patterns",
     "RAM Utilization": "Χρήση RAM",
     "Reconnect Interval (s)": "Χρονικό διάστημα επανασύνδεσης (s)",
     "Repository ID": "ID Αποθετηρίου",
@@ -88,6 +100,7 @@
     "Shown instead of Node ID in the cluster status. Will be updated to the name the node advertises if left empty.": "Shown instead of Node ID in the cluster status. Will be updated to the name the node advertises if left empty.",
     "Shutdown": "Απενεργοποίηση",
     "Simple File Versioning": "Simple File Versioning",
+    "Single level wildcard (matches within a directory only)": "Single level wildcard (matches within a directory only)",
     "Source Code": "Πηγαίος Κώδικας",
     "Staggered File Versioning": "Staggered File Versioning",
     "Start Browser": "Έναρξη Φυλλομετρητή",
@@ -114,6 +127,7 @@
     "The number of old versions to keep, per file.": "The number of old versions to keep, per file.",
     "The number of versions must be a number and cannot be blank.": "Ο αριθμός εκδόσεων πρέπει να είναι αριθμός και σίγουρα όχι κενό.",
     "The repository ID cannot be blank.": "Το ID Αποθετηρίου δε μπορεί να είναι κενό.",
+    "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.",
     "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the the dot (.), dash (-) and underscode (_) characters only.": "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the the dot (.), dash (-) and underscode (_) characters only.",
     "The repository ID must be unique.": "Το ID Αποθετηρίου πρέπει να είναι μοναδικό.",
     "The repository path cannot be blank.": "Το μονοπάτι του αποθετηρίου δε μπορεί να είναι κενό.",
@@ -133,5 +147,6 @@
     "When adding a new repository, keep in mind that the Repository ID is used to tie repositories together between nodes. They are case sensitive and must match exactly between all nodes.": "Κατά την πρόσθεση νέου αποθετηρίου, να γνωρίζεται πως το ID Αποθετηρίου χρησιμοποιείται για να συνδέει Αποθετήρια μεταξύ κόμβων. Τα ID είναι case sensitive και θα πρέπει να είναι ταυτόσημα μεταξύ όλων των κόμβων.",
     "Yes": "Ναι",
     "You must keep at least one version.": "You must keep at least one version.",
+    "full documentation": "full documentation",
     "items": "items"
 }

gui/lang/lang-en.json

@@ -8,9 +8,12 @@
    "Allow Anonymous Usage Reporting?": "Allow Anonymous Usage Reporting?",
    "Announce Server": "Announce Server",
    "Anonymous Usage Reporting": "Anonymous Usage Reporting",
+   "Any nodes configured on an introducer node will be added to this node as well.": "Any nodes configured on an introducer node will be added to this node as well.",
    "Bugs": "Bugs",
    "CPU Utilization": "CPU Utilization",
    "Close": "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",
    "Copyright © 2014 Jakob Borg and the following Contributors:": "Copyright © 2014 Jakob Borg and the following Contributors:",
    "Delete": "Delete",
@@ -20,8 +23,10 @@
    "Edit": "Edit",
    "Edit Node": "Edit Node",
    "Edit Repository": "Edit Repository",
+   "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.",
+   "Enter ignore patterns, one per line.": "Enter ignore patterns, one per line.",
    "Error": "Error",
    "File Versioning": "File Versioning",
    "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.",
@@ -36,7 +41,11 @@
    "Global Discovery Server": "Global Discovery Server",
    "Global Repository": "Global Repository",
    "Idle": "Idle",
+   "Ignore Patterns": "Ignore Patterns",
    "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 seen": "Last seen",
    "Latest Release": "Latest Release",
@@ -47,6 +56,7 @@
    "Max File Change Rate (KiB/s)": "Max File Change Rate (KiB/s)",
    "Max Outstanding Requests": "Max Outstanding Requests",
    "Maximum Age": "Maximum Age",
+   "Multi level wildcard (matches multiple directory levels)": "Multi level wildcard (matches multiple directory levels)",
    "Never": "Never",
    "No": "No",
    "No File Versioning": "No File Versioning",
@@ -63,7 +73,9 @@
    "Path to the repository 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 repository on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for",
    "Path where versions should be stored (leave empty for the default .stversions folder in the repository).": "Path where versions should be stored (leave empty for the default .stversions folder in the repository).",
    "Please wait": "Please wait",
+   "Preview": "Preview",
    "Preview Usage Report": "Preview Usage Report",
+   "Quick guide to supported patterns": "Quick guide to supported patterns",
    "RAM Utilization": "RAM Utilization",
    "Reconnect Interval (s)": "Reconnect Interval (s)",
    "Repository ID": "Repository ID",
@@ -88,6 +100,7 @@
    "Shown instead of Node ID in the cluster status. Will be updated to the name the node advertises if left empty.": "Shown instead of Node ID in the cluster status. Will be updated to the name the node advertises if left empty.",
    "Shutdown": "Shutdown",
    "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",
    "Staggered File Versioning": "Staggered File Versioning",
    "Start Browser": "Start Browser",
@@ -114,6 +127,7 @@
    "The number of old versions to keep, per file.": "The number of old versions to keep, per file.",
    "The number of versions must be a number and cannot be blank.": "The number of versions must be a number and cannot be blank.",
    "The repository ID cannot be blank.": "The repository ID cannot be blank.",
+   "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.",
    "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the the dot (.), dash (-) and underscode (_) characters only.": "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the the dot (.), dash (-) and underscode (_) characters only.",
    "The repository ID must be unique.": "The repository ID must be unique.",
    "The repository path cannot be blank.": "The repository path cannot be blank.",
@@ -133,5 +147,6 @@
    "When adding a new repository, keep in mind that the Repository ID is used to tie repositories together between nodes. They are case sensitive and must match exactly between all nodes.": "When adding a new repository, keep in mind that the Repository ID is used to tie repositories together between nodes. They are case sensitive and must match exactly between all nodes.",
    "Yes": "Yes",
    "You must keep at least one version.": "You must keep at least one version.",
+   "full documentation": "full documentation",
    "items": "items"
 }

gui/lang/lang-es.json

@@ -8,9 +8,12 @@
     "Allow Anonymous Usage Reporting?": "Permitir reporte anónimo de uso?",
     "Announce Server": "Anunciar servidor",
     "Anonymous Usage Reporting": "Reporte anónimo de uso",
+    "Any nodes configured on an introducer node will be added to this node as well.": "Any nodes configured on an introducer node will be added to this node as well.",
     "Bugs": "Errores",
     "CPU Utilization": "Uso de la CPU",
     "Close": "Cerrar",
+    "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": "Error de conexión",
     "Copyright © 2014 Jakob Borg and the following Contributors:": "Derechos de autor © 2014 Jakob Borg y los siguientes  colaboradores:",
     "Delete": "Suprimir",
@@ -20,8 +23,10 @@
     "Edit": "Editar",
     "Edit Node": "Editar nodo",
     "Edit Repository": "Editar repositorio",
+    "Editing": "Editing",
     "Enable UPnP": "Permitir UPnP",
     "Enter comma separated \"ip:port\" addresses or \"dynamic\" to perform automatic discovery of the address.": "Ingrese las direcciones \"ip:port\" separadas por coma o \"dynamic\" para descubrir automáticamente las direcciones.",
+    "Enter ignore patterns, one per line.": "Enter ignore patterns, one per line.",
     "Error": "Error",
     "File Versioning": "Control de versiones",
     "File permission bits are ignored when looking for changes. Use on FAT filesystems.": "Los permisos de archivo son ignorados al buscar cambios. Usar en sistemas de archivos FAT.",
@@ -36,7 +41,11 @@
     "Global Discovery Server": "Servidor global de identificación",
     "Global Repository": "Repositorio global",
     "Idle": "Inactivo",
+    "Ignore Patterns": "Ignore Patterns",
     "Ignore Permissions": "Ignorar permisos",
+    "Incoming Rate Limit (KiB/s)": "Límite de velocidad de entrada (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": "Conservar versiones",
     "Last seen": "Visto por ultima vez",
     "Latest Release": "Última versión",
@@ -46,10 +55,11 @@
     "Master Repo": "Repositorio maestro",
     "Max File Change Rate (KiB/s)": "Tasa máxima de cambios (KiB/s)",
     "Max Outstanding Requests": "Cantidad máxima de peticiones pendientes",
-    "Maximum Age": "Maximum Age",
+    "Maximum Age": "Edad máxima",
+    "Multi level wildcard (matches multiple directory levels)": "Multi level wildcard (matches multiple directory levels)",
     "Never": "Nunca",
     "No": "No",
-    "No File Versioning": "No File Versioning",
+    "No File Versioning": "Sin control de versiones de archivos",
     "Node ID": "Nodo ID",
     "Node Identification": "Identificador del nodo",
     "Node Name": "Nodo nombre",
@@ -61,9 +71,11 @@
     "Outgoing Rate Limit (KiB/s)": "Tasa máxima de envío (KiB/s)",
     "Override Changes": "Reemplazar los cambios",
     "Path to the repository 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. La carpeta sera creada si no existe. El carácter tilde (~) puede ser utilizado como atajo de ",
-    "Path where versions should be stored (leave empty for the default .stversions folder in the repository).": "Path where versions should be stored (leave empty for the default .stversions folder in the repository).",
+    "Path where versions should be stored (leave empty for the default .stversions folder in the repository).": "Ruta donde se deben almacenar versiones (dejar vacío para la carpeta .stversions predeterminada en el repositorio).",
     "Please wait": "Aguarde por favor",
+    "Preview": "Vista previa",
     "Preview Usage Report": "Ver reporte de uso",
+    "Quick guide to supported patterns": "Quick guide to supported patterns",
     "RAM Utilization": "Utilización de RAM",
     "Reconnect Interval (s)": "Intervalo de reconexión (s)",
     "Repository ID": "ID de repositorio",
@@ -87,9 +99,10 @@
     "Shown instead of Node ID in the cluster status. Will be advertised to other nodes as an optional default name.": "Shown instead of Node ID in the cluster status. Will be advertised to other nodes as an optional default name.",
     "Shown instead of Node ID in the cluster status. Will be updated to the name the node advertises if left empty.": "Shown instead of Node ID in the cluster status. Will be updated to the name the node advertises if left empty.",
     "Shutdown": "Apagar",
-    "Simple File Versioning": "Simple File Versioning",
+    "Simple File Versioning": "Versiones simple de archivos",
+    "Single level wildcard (matches within a directory only)": "Single level wildcard (matches within a directory only)",
     "Source Code": "Código fuente",
-    "Staggered File Versioning": "Staggered File Versioning",
+    "Staggered File Versioning": "Versiones del archivo escalonado",
     "Start Browser": "Iniciar navegador",
     "Stopped": "Parado",
     "Support / Forum": "Soporte / Foro",
@@ -106,14 +119,15 @@
     "The encrypted usage report is sent daily. It is used to track common platforms, repo sizes and app versions. If the reported data set is changed you will be prompted with this dialog again.": "El reporte de uso se envía encriptado diariamente. Se utiliza para hacer un seguimiento de plataformas comunes, tamaño de repositorios y versión de aplicaciones. Si el conjunto de datos cambia sera notificado mediante este dialogo nuevamente.",
     "The entered node ID does not look valid. It should be a 52 character string consisting of letters and numbers, with spaces and dashes being optional.": "El ID de nodo ingresado no es valido. Debe ser una cadena  de al menos 52 caracteres consistente en letras y números, con espacios y guiones opcionales.",
     "The entered node 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 de nodo ingresado no es valido. Debe ser una cadena de 52 o de 56 caracteres consistente en letras y números, con espacios y guiones opcionales.",
-    "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.",
-    "The maximum age must be a number and cannot be blank.": "The maximum age must be a number and cannot be blank.",
-    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "The maximum time to keep a version (in days, set to 0 to keep versions forever).",
+    "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "Los siguientes intervalos se utilizan: para la primera hora una versión se mantiene cada 30 segundos, para el primer día de una versión se mantiene cada hora, durante los primeros 30 días de la versión se mantiene todos los días, hasta que la edad máxima de una versión se mantiene cada semana.",
+    "The maximum age must be a number and cannot be blank.": "La edad máxima debe ser un número y no puede estar en blanco.",
+    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "El tiempo máximo para mantener una versión (en días, establece en 0 para mantener versiones para siempre).",
     "The node ID cannot be blank.": "El ID de nodo no puede estar vacío.",
     "The node ID to enter here can be found in the \"Edit > Show ID\" dialog on the other node. Spaces and dashes are optional (ignored).": "El ID de nodo a ingresar aquí puede verse en la opción de menú \"Edición > Mostrar ID\" del otro nodo. Espacios y guiones son opcionales (ignorados).",
     "The number of old versions to keep, per file.": "El numero de versiones anteriores a conservar, por archivo.",
     "The number of versions must be a number and cannot be blank.": "El número de versiones debe ser un número y no puede estar vacío.",
     "The repository ID cannot be blank.": "El ID de repositorio no puede estar vacio.",
+    "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.",
     "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the the dot (.), dash (-) and underscode (_) characters only.": "El ID de repositorio debe ser una cadena corta (64 caracteres o menos) consistente solamente en letras, números, punto (.), guion (-) y guion bajo (_).",
     "The repository ID must be unique.": "El ID de repositorio debe ser único.",
     "The repository path cannot be blank.": "La ruta del repositorio no puede estar vacía.",
@@ -128,10 +142,11 @@
     "Use HTTPS for GUI": "Usar HTTPS para la GUI",
     "Version": "Versión",
     "Versions Path": "Ruta de versiones",
-    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "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.": "Las versiones se eliminan automáticamente si son mayores de la edad máxima o mayor que el número de archivos permitidos en un intervalo.",
     "When adding a new node, keep in mind that this node must be added on the other side too.": "Al agregar un nuevo nodo, recuerde que este nodo debe ser agregado en el otro lado también.",
     "When adding a new repository, keep in mind that the Repository ID is used to tie repositories together between nodes. They are case sensitive and must match exactly between all nodes.": "Al agregar un nuevo repositorio, tenga en mente que el ID de repositorio se utiliza para ligar los repositorios entre nodos. Distingue mayúsculas y minúsculas y debe ser exactamente igual en todos los nodos.",
     "Yes": "Si",
     "You must keep at least one version.": "Debe mantener al menos una versión",
+    "full documentation": "full documentation",
     "items": "Articulos"
 }

gui/lang/lang-fr.json

@@ -8,9 +8,12 @@
     "Allow Anonymous Usage Reporting?": "Autoriser le rapport anonyme de statistiques d'utilisation ?",
     "Announce Server": "Serveur d'annonce",
     "Anonymous Usage Reporting": "Rapport anonyme de statistiques d'utilisation",
+    "Any nodes configured on an introducer node will be added to this node as well.": "Any nodes configured on an introducer node will be added to this node as well.",
     "Bugs": "Bugs",
     "CPU Utilization": "Utilisation du CPU",
     "Close": "Fermer",
+    "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": "Erreur de connexion",
     "Copyright © 2014 Jakob Borg and the following Contributors:": "Copyright © 2014 Jakob Borg et les contributeurs suivants :",
     "Delete": "Supprimer",
@@ -20,8 +23,10 @@
     "Edit": "Éditer",
     "Edit Node": "Éditer le nœud",
     "Edit Repository": "Éditer le répertoire",
+    "Editing": "Editing",
     "Enable UPnP": "Activer l'UPnP",
     "Enter comma separated \"ip:port\" addresses or \"dynamic\" to perform automatic discovery of the address.": "Entrer les adresses \"ip:port\" séparées par une virgule ou \"dynamic\" afin d'activer la recherche automatique de l'adresse.",
+    "Enter ignore patterns, one per line.": "Enter ignore patterns, one per line.",
     "Error": "Erreur",
     "File Versioning": "Versions de fichier",
     "File permission bits are ignored when looking for changes. Use on FAT filesystems.": "Les permissions de fichier sont ignorées lors de la recherche de changements. À utiliser sur les systèmes de fichiers de type FAT.",
@@ -36,7 +41,11 @@
     "Global Discovery Server": "Serveur global de recherche",
     "Global Repository": "Répertoire global",
     "Idle": "Au repos",
+    "Ignore Patterns": "Ignore Patterns",
     "Ignore Permissions": "Ignorer les permissions",
+    "Incoming Rate Limit (KiB/s)": "Limite du débit entrant (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": "Conserver les versions",
     "Last seen": "Dernière apparition",
     "Latest Release": "Dernière version",
@@ -47,6 +56,7 @@
     "Max File Change Rate (KiB/s)": "Débit maximum de changement de fichier (KiB/s)",
     "Max Outstanding Requests": "Nombre maximum de demandes concurrentes de blocs de fichier",
     "Maximum Age": "Ancienneté maximum",
+    "Multi level wildcard (matches multiple directory levels)": "Multi level wildcard (matches multiple directory levels)",
     "Never": "Jamais",
     "No": "Non",
     "No File Versioning": "Pas de version de fichier",
@@ -63,7 +73,9 @@
     "Path to the repository on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Chemin du répertoire sur l'ordinateur local. Il sera créé si il n'existe pas. Le caractère tilde (~) peut être utilisé comme raccourci vers",
     "Path where versions should be stored (leave empty for the default .stversions folder in the repository).": "Chemin où les versions doivent être conservées (laisser vide pour le chemin par défaut de .stversions dans le répertoire)",
     "Please wait": "Merci de patienter",
+    "Preview": "Aperçu",
     "Preview Usage Report": "Aperçu du rapport de statistiques d'utilisation",
+    "Quick guide to supported patterns": "Quick guide to supported patterns",
     "RAM Utilization": "Utilisation de la RAM",
     "Reconnect Interval (s)": "Intervalle de reconnexion (s)",
     "Repository ID": "ID du répertoire",
@@ -88,6 +100,7 @@
     "Shown instead of Node ID in the cluster status. Will be updated to the name the node advertises if left empty.": "Affiché à la place de l'ID du nœud dans le statut du cluster. Sera mis à jour par le nom que le nœud annonce si laissé vide.",
     "Shutdown": "Éteindre",
     "Simple File Versioning": "Versions simples de fichier",
+    "Single level wildcard (matches within a directory only)": "Single level wildcard (matches within a directory only)",
     "Source Code": "Code source",
     "Staggered File Versioning": "Versions échelonnées de fichier",
     "Start Browser": "Démarrer le navigateur web",
@@ -114,6 +127,7 @@
     "The number of old versions to keep, per file.": "Le nombre d'anciennes versions à garder, par fichier.",
     "The number of versions must be a number and cannot be blank.": "Le nombre de version doit être un nombre et ne peut pas être vide.",
     "The repository ID cannot be blank.": "L'ID du répertoire ne peut être vide.",
+    "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.",
     "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the the dot (.), dash (-) and underscode (_) characters only.": "L'ID du répertoire doit être un identifiant court (64 caractères ou moins) comprenant des lettres, nombres, points (.), trait d'union (-) et tiret bas (_).",
     "The repository ID must be unique.": "L'ID du répertoire doit être unique.",
     "The repository path cannot be blank.": "Le chemin du répertoire ne peut pas être vide.",
@@ -133,5 +147,6 @@
     "When adding a new repository, keep in mind that the Repository ID is used to tie repositories together between nodes. They are case sensitive and must match exactly between all nodes.": "Lorsqu'un nouveau répertoire est ajouté, gardez à l'esprit que l'ID du répertoire est utilisé pour lier les répertoires à travers les nœuds. Ils sont sensibles à la casse et doivent être identiques à travers tous les nœuds.",
     "Yes": "Oui",
     "You must keep at least one version.": "Vous devez garder au minimum une version.",
+    "full documentation": "full documentation",
     "items": "éléments"
 }

gui/lang/lang-hu.json

@@ -8,9 +8,12 @@
     "Allow Anonymous Usage Reporting?": "Engedélyezed a névtelen felhasználási statisztikai adatok küldését?",
     "Announce Server": "Cím hirdető szerver",
     "Anonymous Usage Reporting": "Névtelen felhasználási statisztikák küldése",
+    "Any nodes configured on an introducer node will be added to this node as well.": "Any nodes configured on an introducer node will be added to this node as well.",
     "Bugs": "Hibák",
     "CPU Utilization": "Processzor használat",
     "Close": "Bezárás",
+    "Comment, when used at the start of a line": "Megjegyzés, a sor elején használva",
+    "Compression is recommended in most setups.": "Compression is recommended in most setups.",
     "Connection Error": "Kapcsolódási hiba",
     "Copyright © 2014 Jakob Borg and the following Contributors:": "Copyright © 2014 Jakob Borg és a következő Közreműködők",
     "Delete": "Törlés",
@@ -20,8 +23,10 @@
     "Edit": "Szerkesztés",
     "Edit Node": "Csomópont szerkesztése",
     "Edit Repository": "Tároló szerkesztése",
+    "Editing": "Szerkesztés",
     "Enable UPnP": "UPnP engedélyezése",
     "Enter comma separated \"ip:port\" addresses or \"dynamic\" to perform automatic discovery of the address.": "Add meg kettősponttal elválasztva \"ip:port\" a címet vagy add meg a \"dynamic\" szót az a cím automatikus észleléséhez.",
+    "Enter ignore patterns, one per line.": "Enter ignore patterns, one per line.",
     "Error": "Hiba",
     "File Versioning": "File verziózás",
     "File permission bits are ignored when looking for changes. Use on FAT filesystems.": "A file jogosultásgok figyelmen kívül hagyása. FAT file-rendszernél haszálatos.",
@@ -36,7 +41,11 @@
     "Global Discovery Server": "Globális csomópont kereséshez használt szerver",
     "Global Repository": "Globális tároló",
     "Idle": "Tétlen",
+    "Ignore Patterns": "Ignore Patterns",
     "Ignore Permissions": "Jogosultságok figyelmen kívül hagyása",
+    "Incoming Rate Limit (KiB/s)": "Bejövő sebesség korlát (KIB/mp)",
+    "Introducer": "Introducer",
+    "Inversion of the given condition (i.e. do not exclude)": "Inversion of the given condition (i.e. do not exclude)",
     "Keep Versions": "Verziók megtartása",
     "Last seen": "Utoljára látva",
     "Latest Release": "Utolsó kiadás",
@@ -47,6 +56,7 @@
     "Max File Change Rate (KiB/s)": "Maximális file változás sebessége (KiB/mp)",
     "Max Outstanding Requests": "Maximális kimenő kérés",
     "Maximum Age": "Maximális kor",
+    "Multi level wildcard (matches multiple directory levels)": "Több szintű joker (több könyvtár szintre érvényesül)",
     "Never": "Soha",
     "No": "Nem",
     "No File Versioning": "Nincs file verziózás",
@@ -63,7 +73,9 @@
     "Path to the repository on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "A tároló útvonala ezen a számítógépen. Amennyiben nem létezik automatikusan létrehozzuk. A hullámvonal (~) karakter használható a rövidítésre",
     "Path where versions should be stored (leave empty for the default .stversions folder in the repository).": "Az útvonal ahol a régi verziókat tároljuk (ha üresen hagyod akkor .stversions mappa lesz a neve).",
     "Please wait": "Kérem várj",
+    "Preview": "Előnézet",
     "Preview Usage Report": "Felhasználási adatok átnézése",
+    "Quick guide to supported patterns": "Quick guide to supported patterns",
     "RAM Utilization": "Memória használat",
     "Reconnect Interval (s)": "Újracsatlakozási intervallum (mp)",
     "Repository ID": "Tároló azonosító",
@@ -88,6 +100,7 @@
     "Shown instead of Node ID in the cluster status. Will be updated to the name the node advertises if left empty.": "A csomópont azonosító helyett jelenik meg a fürtben a státusznál. A csomópont neve a hirdetettre lesz llítva amennyiben az üresen van hagyva.",
     "Shutdown": "Leállítás",
     "Simple File Versioning": "Egyszerű file verziózás",
+    "Single level wildcard (matches within a directory only)": "Single level wildcard (matches within a directory only)",
     "Source Code": "Forráskód",
     "Staggered File Versioning": "Többszintű file verziózás",
     "Start Browser": "Böngésző indítása",
@@ -114,6 +127,7 @@
     "The number of old versions to keep, per file.": "Mennyi régi változatot tartsunk meg a file-okból",
     "The number of versions must be a number and cannot be blank.": "A megtartott változatok száma nem lehet üres",
     "The repository ID cannot be blank.": "A tároló azonosító nem lehet üres",
+    "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "A tároló azonosító egy rövid (maximálisan 64 karakteres) csak számokat, betűket, pontot (.), kötőjelet (-) illetve aláhúzást (_) tartalmazó karakterlánc.",
     "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the the dot (.), dash (-) and underscode (_) characters only.": "A tároló azonosító egy rövid (maximálisan 64 karakteres) csak számokat, betűket, pontot (.), kötőjelet (-) illetve aláhúzást (_) tartalmazó karakterlánc",
     "The repository ID must be unique.": "A tároló azonosítónak egyedinek kell lennie",
     "The repository path cannot be blank.": "A tároló útvonala nem lehet üres",
@@ -133,5 +147,6 @@
     "When adding a new repository, keep in mind that the Repository ID is used to tie repositories together between nodes. They are case sensitive and must match exactly between all nodes.": "Amikor hozzáadod a tárolót, tartsad észben, hogy a Tároló azonosító az ami összeköti a csomópontokat. Kis-nagybetű érzékeny, és pontosan ugyan úgy kell azokat megadni mindegyik csomóponton.",
     "Yes": "Igen",
     "You must keep at least one version.": "Legalább egy verziót meg kell tartanod",
+    "full documentation": "teljes dokumentáció",
     "items": "tételek"
 }

gui/lang/lang-it.json

@@ -8,9 +8,12 @@
     "Allow Anonymous Usage Reporting?": "Abilitare Statistiche Anonime di Utilizzo?",
     "Announce Server": "Server di Presenza Globale dei Nodi",
     "Anonymous Usage Reporting": "Statistiche Anonime di Utilizzo",
+    "Any nodes configured on an introducer node will be added to this node as well.": "Any nodes configured on an introducer node will be added to this node as well.",
     "Bugs": "Bug",
     "CPU Utilization": "Utilizzo CPU",
     "Close": "Chiudi",
+    "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": "Errore di Connessione",
     "Copyright © 2014 Jakob Borg and the following Contributors:": "Copyright © 2014 Jakob Borg e i seguenti Collaboratori:",
     "Delete": "Elimina",
@@ -20,8 +23,10 @@
     "Edit": "Modifica",
     "Edit Node": "Modifica Nodo",
     "Edit Repository": "Modifica Deposito",
+    "Editing": "Editing",
     "Enable UPnP": "Attiva UPnP",
     "Enter comma separated \"ip:port\" addresses or \"dynamic\" to perform automatic discovery of the address.": "Inserisci gli indirizzi \"ip:porta\" separati da una virgola, altrimenti inserisci \"dynamic\" per effettuare il rilevamento automatico dell'indirizzo.",
+    "Enter ignore patterns, one per line.": "Enter ignore patterns, one per line.",
     "Error": "Errore",
     "File Versioning": "Controllo Versione dei File",
     "File permission bits are ignored when looking for changes. Use on FAT filesystems.": "Il software evita i bit dei permessi dei file durante il controllo delle modifiche. Utilizzato nei filesystem FAT.",
@@ -36,7 +41,11 @@
     "Global Discovery Server": "Server di Ricerca Globale",
     "Global Repository": "Deposito Globale",
     "Idle": "Inattivo",
+    "Ignore Patterns": "Ignore Patterns",
     "Ignore Permissions": "Ignora Permessi",
+    "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": "Versioni Mantenute",
     "Last seen": "Last seen",
     "Latest Release": "Ultima Versione",
@@ -47,6 +56,7 @@
     "Max File Change Rate (KiB/s)": "Tasso Massimo di Cambiamento dei File (KiB/s)",
     "Max Outstanding Requests": "Numero Massimo di Richieste Simultanee per i Blocchi di File",
     "Maximum Age": "Durata Massima",
+    "Multi level wildcard (matches multiple directory levels)": "Multi level wildcard (matches multiple directory levels)",
     "Never": "Never",
     "No": "No",
     "No File Versioning": "Nessun Controllo Versione",
@@ -63,7 +73,9 @@
     "Path to the repository on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Percorso del deposito nel computer locale. Verrà creato se non esiste già. Il carattere tilde (~) può essere utilizzato come scorciatoia per",
     "Path where versions should be stored (leave empty for the default .stversions folder in the repository).": "Percorso di salvataggio delle versioni (lasciare vuoto per utilizzare la cartella predefinita .stversions nel deposito).",
     "Please wait": "Attendere prego",
+    "Preview": "Preview",
     "Preview Usage Report": "Anteprima Statistiche di Utilizzo",
+    "Quick guide to supported patterns": "Quick guide to supported patterns",
     "RAM Utilization": "Utilizzo RAM",
     "Reconnect Interval (s)": "Intervallo di Riconnessione (s)",
     "Repository ID": "ID Deposito",
@@ -88,6 +100,7 @@
     "Shown instead of Node ID in the cluster status. Will be updated to the name the node advertises if left empty.": "Shown instead of Node ID in the cluster status. Will be updated to the name the node advertises if left empty.",
     "Shutdown": "Arresta",
     "Simple File Versioning": "Controllo Versione Semplice",
+    "Single level wildcard (matches within a directory only)": "Single level wildcard (matches within a directory only)",
     "Source Code": "Codice Sorgente",
     "Staggered File Versioning": "Controllo Versione Cadenzato",
     "Start Browser": "Avvia Browser",
@@ -114,6 +127,7 @@
     "The number of old versions to keep, per file.": "Il numero di vecchie versioni da mantenere, per file.",
     "The number of versions must be a number and cannot be blank.": "Il numero di versioni dev'essere un numero e non può essere vuoto.",
     "The repository ID cannot be blank.": "L'ID del deposito non può essere vuoto.",
+    "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.",
     "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the the dot (.), dash (-) and underscode (_) characters only.": "L'ID del deposito dev'essere un identificatore breve (64 caratteri o meno) costituito solamente da lettere, numeri, punti (.), trattini (-) e trattini bassi (_).",
     "The repository ID must be unique.": "L'ID del deposito dev'essere unico.",
     "The repository path cannot be blank.": "Il percorso del deposito non può essere vuoto.",
@@ -133,5 +147,6 @@
     "When adding a new repository, keep in mind that the Repository ID is used to tie repositories together between nodes. They are case sensitive and must match exactly between all nodes.": "Quando aggiungi un nuovo deposito ricordati che gli ID vengono utilizzati per collegare i depositi nei nodi. Distinguono maiuscole e minuscole e devono corrispondere esattamente su tutti i nodi.",
     "Yes": "Sì",
     "You must keep at least one version.": "È necessario mantenere almeno una versione.",
+    "full documentation": "full documentation",
     "items": "elementi"
 }

gui/lang/lang-lt.json

@@ -8,9 +8,12 @@
     "Allow Anonymous Usage Reporting?": "Siųsti anonimišką vartojimo ataskaitą?",
     "Announce Server": "Aptikimų serveris",
     "Anonymous Usage Reporting": "Anoniminė vartojimo ataskaita",
+    "Any nodes configured on an introducer node will be added to this node as well.": "Any nodes configured on an introducer node will be added to this node as well.",
     "Bugs": "Klaidos",
     "CPU Utilization": "CAP sunaudojimas",
     "Close": "Uždaryti",
+    "Comment, when used at the start of a line": "Komentaras naudojamas naujoje eilutėje",
+    "Compression is recommended in most setups.": "Compression is recommended in most setups.",
     "Connection Error": "Susijungimo klaida",
     "Copyright © 2014 Jakob Borg and the following Contributors:": "Visos teisės saugomos © 2014 Jakob Borg ir šių bendraautorių:",
     "Delete": "Trinti",
@@ -20,8 +23,10 @@
     "Edit": "Redaguoti",
     "Edit Node": "Redaguoti mazgą",
     "Edit Repository": "Redaguoti saugyklą",
+    "Editing": "Redagavimas",
     "Enable UPnP": "Įjungti UPnP",
     "Enter comma separated \"ip:port\" addresses or \"dynamic\" to perform automatic discovery of the address.": "Įveskite dvitaškiu atskirtą \"ip:port\" adresą arba žodį \"dynamic\" norėdami gauti adresą automatiškai",
+    "Enter ignore patterns, one per line.": "Suveskite nepaisomus šablonus, kiekvieną naujoje eilutėje.",
     "Error": "Klaida",
     "File Versioning": "Versijų valdymas",
     "File permission bits are ignored when looking for changes. Use on FAT filesystems.": "Nekreipti dėmesio į failų naudojimosi leidimus.\nTaikyti  FAT sistemose.",
@@ -36,7 +41,11 @@
     "Global Discovery Server": "Visuotinio matomumo serveris",
     "Global Repository": "Visuotinė saugykla",
     "Idle": "Laisvas",
+    "Ignore Patterns": "Nepaisyti šablonų",
     "Ignore Permissions": "Nepaisyti failų prieigos leidimų",
+    "Incoming Rate Limit (KiB/s)": "Įeinančio srauto maksimalus greitis (KiB/s)",
+    "Introducer": "Introducer",
+    "Inversion of the given condition (i.e. do not exclude)": "Apversti sąlygas (pvz.: nenustoti naudoti)",
     "Keep Versions": "Saugojamų versijų kiekis",
     "Last seen": "Paskutinį kartą matytas",
     "Latest Release": "Paskutinė versija",
@@ -47,6 +56,7 @@
     "Max File Change Rate (KiB/s)": "Maksimalus failų apsikeitimo greitis (KiB/s)",
     "Max Outstanding Requests": "Maksimalus išeinančių užklausų skaičius",
     "Maximum Age": "Maksimalus amžius",
+    "Multi level wildcard (matches multiple directory levels)": "Keletos lygių pakaitos (atitinka keletą direktorijų lygių)",
     "Never": "Niekada",
     "No": "Ne",
     "No File Versioning": "Nėra versijų valdymo",
@@ -63,7 +73,9 @@
     "Path to the repository on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Kelias iki vietinės saugyklos.  Tildės ženklas (~) gali būti naudojamas nuorodai",
     "Path where versions should be stored (leave empty for the default .stversions folder in the repository).": "Kelias iki papkės kur saugomos senesnės versijos (palikite tuščią norėdami naudoti .stversions)",
     "Please wait": "Prašome palaukti",
+    "Preview": "Peržiūra",
     "Preview Usage Report": "Vartojimo statistikos peržiūra",
+    "Quick guide to supported patterns": "Trumpas leistinų šablonų vadovas",
     "RAM Utilization": "LKA panaudojimas",
     "Reconnect Interval (s)": "Pertrauka tarp susijungimų (s)",
     "Repository ID": "Saugyklos vardas",
@@ -88,6 +100,7 @@
     "Shown instead of Node ID in the cluster status. Will be updated to the name the node advertises if left empty.": "Grupės būsenoje rodomas vietoje mazgo vardo. Bus atnaujintas į mazgo vardą jei nieko neįrašysite.",
     "Shutdown": "Išjungti",
     "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",
     "Staggered File Versioning": "Pakopinis versijų valdymas",
     "Start Browser": "Paleisti naršyklę",
@@ -114,6 +127,7 @@
     "The number of old versions to keep, per file.": "Kiek failo versijų saugoti.",
     "The number of versions must be a number and cannot be blank.": "Versijų skaičius turi būti skaitmuo ir negali būti tuščias laukelis.",
     "The repository ID cannot be blank.": "Saugyklos vardas negali būti tuščias.",
+    "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "Saugyklos vardas negali būti ilgesnis nei 64 simboliai. Galima naudoti tik raides ir skaičius bet tašką (.), brūkšnelį (-) ir pabraukimą (_).",
     "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the the dot (.), dash (-) and underscode (_) characters only.": "Saugyklos vardas negali būti ilgesnis nei 64 simboliai. Galima naudoti tik raides ir skaičius bet tašką (.), brukšnelį (-) ir pabraukimą (_).",
     "The repository ID must be unique.": "Saugyklos vardas turi būti unikalus.",
     "The repository path cannot be blank.": "Kelias iki saugyklos negali būti tuščias.",
@@ -133,5 +147,6 @@
     "When adding a new repository, keep in mind that the Repository ID is used to tie repositories together between nodes. They are case sensitive and must match exactly between all nodes.": "Kai įvedate naują saugyklą neužmirškite, kad ji bus naudojama visuose mazguose. Svarbu visur įvesti visiškai tokį pat saugyklos vardą neužmirštant apie didžiąsias ir mažąsias raides.",
     "Yes": "Taip",
     "You must keep at least one version.": "Būtina saugoti bent vieną versiją.",
+    "full documentation": "pilna dokumentacija",
     "items": "įrašai"
 }

gui/lang/lang-nl.json

@@ -8,9 +8,12 @@
     "Allow Anonymous Usage Reporting?": "Bijhouden van anonieme gebruikers statistieken toestaan?",
     "Announce Server": "Aankondigings Server",
     "Anonymous Usage Reporting": "Bijhouden anonieme gebruikers statistieken",
+    "Any nodes configured on an introducer node will be added to this node as well.": "Any nodes configured on an introducer node will be added to this node as well.",
     "Bugs": "Fouten",
     "CPU Utilization": "CPU Gebruik",
     "Close": "Sluiten",
+    "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": "Verbindingsfout",
     "Copyright © 2014 Jakob Borg and the following Contributors:": "Copyright © 2014 Jakob Borg en de onderstaande bijdragers:",
     "Delete": "Verwijderen",
@@ -20,8 +23,10 @@
     "Edit": "Bewerk",
     "Edit Node": "Bewerk node",
     "Edit Repository": "Repository Bijwerken",
+    "Editing": "Editing",
     "Enable UPnP": "UPnP aanzetten",
     "Enter comma separated \"ip:port\" addresses or \"dynamic\" to perform automatic discovery of the address.": "Geef, gescheiden door komma's, \"ip:port\" adressen of \"dynamic\" voor het automatische vinden van de addressen.",
+    "Enter ignore patterns, one per line.": "Enter ignore patterns, one per line.",
     "Error": "Fout",
     "File Versioning": "Versiebeheer",
     "File permission bits are ignored when looking for changes. Use on FAT filesystems.": "Bestands permissiebits worden genegeerd wanneer naar veranderingen wordt gekeken. Gebruik dit op FAT bestandsystemen",
@@ -36,9 +41,13 @@
     "Global Discovery Server": "Globale zoekserver",
     "Global Repository": "Globale repository",
     "Idle": "Inactief",
+    "Ignore Patterns": "Ignore Patterns",
     "Ignore Permissions": "Rechten negeren",
+    "Incoming Rate Limit (KiB/s)": "Download snelheidslimiet (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": "Versies behouden",
-    "Last seen": "Last seen",
+    "Last seen": "Laatst gezien op",
     "Latest Release": "Laatste uitgave",
     "Local Discovery": "Lokaal zoeken",
     "Local Discovery Port": "Lokaal zoeken-poort",
@@ -47,7 +56,8 @@
     "Max File Change Rate (KiB/s)": "Maximale bestands uitwisselsnelheid (KiB/s)",
     "Max Outstanding Requests": "Maximaal aantal openstaande aanvragen",
     "Maximum Age": "Maximum leeftijd",
-    "Never": "Never",
+    "Multi level wildcard (matches multiple directory levels)": "Multi level wildcard (matches multiple directory levels)",
+    "Never": "Nooit",
     "No": "Nee",
     "No File Versioning": "Geen versiebeheer",
     "Node ID": "Node ID",
@@ -63,7 +73,9 @@
     "Path to the repository on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Pad naar de repository op de lokale computer. Word aangemaakt indien deze niet bestaat. Het tilde (~) karakter kan gebruikt worden als afkorting voor",
     "Path where versions should be stored (leave empty for the default .stversions folder in the repository).": "Pad waar de verschillende versies opgeslagen dienen te worden (laat leeg voor de standaard map '.stversion' in de repository).",
     "Please wait": "Even geduld",
+    "Preview": "Voorbeeld",
     "Preview Usage Report": "Bekijk gebruiksstatistieken",
+    "Quick guide to supported patterns": "Quick guide to supported patterns",
     "RAM Utilization": "RAM gebruik",
     "Reconnect Interval (s)": "Herverbind-interval (s)",
     "Repository ID": "Repository ID",
@@ -88,6 +100,7 @@
     "Shown instead of Node ID in the cluster status. Will be updated to the name the node advertises if left empty.": "De node naam wordt getoond in plaats van de node ID in het cluster status overzicht. Deze naam wordt geüpdatet met de naam die de node zelf adverteert indien dit veld leeg wordt gelaten.",
     "Shutdown": "Sluit af",
     "Simple File Versioning": "Eenvoudig versiebeheer",
+    "Single level wildcard (matches within a directory only)": "Single level wildcard (matches within a directory only)",
     "Source Code": "Broncode",
     "Staggered File Versioning": "Staggered File Versioning",
     "Start Browser": "Start browser",
@@ -114,6 +127,7 @@
     "The number of old versions to keep, per file.": "Het aantal versies dat bewaard moet worden per file.",
     "The number of versions must be a number and cannot be blank.": "Het aantal nummers moet een getal zijn en mag niet leeg blijven.",
     "The repository ID cannot be blank.": "Er moet een repository ID ingevoerd worden.",
+    "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.",
     "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the the dot (.), dash (-) and underscode (_) characters only.": "Het repository ID moet een korte naam zijn (met 64 karakters of minder) en mag alleen bestaan uit cijfers, letters, punten (.), streepjes (-) en liggende streepjes (_). ",
     "The repository ID must be unique.": "Het repository ID moet uniek zijn.",
     "The repository path cannot be blank.": "Het repository ID moet ingevuld worden.",
@@ -133,5 +147,6 @@
     "When adding a new repository, keep in mind that the Repository ID is used to tie repositories together between nodes. They are case sensitive and must match exactly between all nodes.": "Bedenk bij het toevoegen van een nieuwe repository dat het repository ID de repositores met elkaar verbindt tussen de nodes. Ze zijn hoofdlettergevoelig en moeten exact dezelfde naam hebben op alle nodes.",
     "Yes": "Ja",
     "You must keep at least one version.": "Minstens 1 versie moet bewaard blijven.",
+    "full documentation": "full documentation",
     "items": "objecten"
 }

gui/lang/lang-pt-PT.json

@@ -7,10 +7,13 @@
     "Addresses": "Endereços",
     "Allow Anonymous Usage Reporting?": "Permitir envio de relatórios anónimos de utilização?",
     "Announce Server": "Servidor de anúncios",
-    "Anonymous Usage Reporting": "Enviar de relatórios anónimos de utilização",
+    "Anonymous Usage Reporting": "Enviar relatórios anónimos de utilização",
+    "Any nodes configured on an introducer node will be added to this node as well.": "Any nodes configured on an introducer node will be added to this node as well.",
     "Bugs": "Erros",
     "CPU Utilization": "Utilização da CPU",
     "Close": "Fechar",
+    "Comment, when used at the start of a line": "Comentário, quando usado no início de uma linha",
+    "Compression is recommended in most setups.": "Compression is recommended in most setups.",
     "Connection Error": "Erro de ligação",
     "Copyright © 2014 Jakob Borg and the following Contributors:": "Direitos reservados © 2014 Jakob Borg e os seguintes contribuidores:",
     "Delete": "Eliminar",
@@ -20,8 +23,10 @@
     "Edit": "Editar",
     "Edit Node": "Editar nó",
     "Edit Repository": "Editar repositório",
+    "Editing": "Editando",
     "Enable UPnP": "Activar UPnP",
     "Enter comma separated \"ip:port\" addresses or \"dynamic\" to perform automatic discovery of the address.": "Introduza endereços \"ip:porto\" separados por vírgulas ou \"dynamic\" para descobrir automaticamente o endereço.",
+    "Enter ignore patterns, one per line.": "Coloque os padrões a ignorar, um por linha.",
     "Error": "Erro",
     "File Versioning": "Gestão de versões",
     "File permission bits are ignored when looking for changes. Use on FAT filesystems.": "As permissões do ficheiro são ignoradas ao procurar alterações. Utilize nos sistemas de ficheiros FAT.",
@@ -36,9 +41,13 @@
     "Global Discovery Server": "Servidor da busca global",
     "Global Repository": "Repositório global",
     "Idle": "Em espera",
+    "Ignore Patterns": "Ignorar padrões",
     "Ignore Permissions": "Ignorar permissões",
+    "Incoming Rate Limit (KiB/s)": "Limite de velocidade de recepção (KiB/s)",
+    "Introducer": "Introducer",
+    "Inversion of the given condition (i.e. do not exclude)": "Inversão de uma dada condição (ou seja, não excluir)",
     "Keep Versions": "Manter versões",
-    "Last seen": "Última vez que foi visto",
+    "Last seen": "Última vez que foi verificado",
     "Latest Release": "Última versão",
     "Local Discovery": "Busca local",
     "Local Discovery Port": "Porto da busca local",
@@ -47,6 +56,7 @@
     "Max File Change Rate (KiB/s)": "Velocidade máxima de alterações de ficheiros (KiB/s)",
     "Max Outstanding Requests": "Número máximo de pedidos pendentes",
     "Maximum Age": "Idade máxima",
+    "Multi level wildcard (matches multiple directory levels)": "Curinga multi-nível (faz corresponder a vários níveis de pastas)",
     "Never": "Nunca",
     "No": "Não",
     "No File Versioning": "Sem gestão de versões de ficheiros",
@@ -63,7 +73,9 @@
     "Path to the repository on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Caminho para o repositório no computador local. Será criado se não existir. O carácter (~) pode ser utilizado como atalho para",
     "Path where versions should be stored (leave empty for the default .stversions folder in the repository).": "Caminho onde as versões são guardadas (deixe vazio para usar a pasta pré-definida .stversions no repositório).",
     "Please wait": "Aguarde",
+    "Preview": "Previsão",
     "Preview Usage Report": "Pré-visualizar relatório de utilização",
+    "Quick guide to supported patterns": "Guia rápido dos padrões suportados",
     "RAM Utilization": "Utilização da RAM",
     "Reconnect Interval (s)": "Intervalo de reestabelecimento de ligação (s)",
     "Repository ID": "ID do repositório",
@@ -71,7 +83,7 @@
     "Repository Path": "Caminho do repositório",
     "Rescan": "Verificar agora",
     "Rescan Interval": "Intervalo entre verificações",
-    "Rescan Interval (s)": "Intervalo entre verificações (s)",
+    "Rescan Interval (s)": "Intervalo entre verificações (em segundos)",
     "Restart": "Reiniciar",
     "Restart Needed": "É preciso reiniciar",
     "Restarting": "Reiniciando",
@@ -88,6 +100,7 @@
     "Shown instead of Node ID in the cluster status. Will be updated to the name the node advertises if left empty.": "Apresentado ao invés do ID do nó na informação de estado do agrupamento. Será actualizado para o nome que o nó divulga, se for deixado em branco.",
     "Shutdown": "Desligar",
     "Simple File Versioning": "Gestão de versões de ficheiros simples",
+    "Single level wildcard (matches within a directory only)": "Curinga de um só nível (faz corresponder apenas dentro de uma pasta)",
     "Source Code": "Código fonte",
     "Staggered File Versioning": "Gestão de versões de ficheiros escalonada",
     "Start Browser": "Iniciar navegador",
@@ -114,6 +127,7 @@
     "The number of old versions to keep, per file.": "O número de versões antigas a manter, por ficheiro.",
     "The number of versions must be a number and cannot be blank.": "O número de versões tem que ser um número e não pode estar vazio.",
     "The repository ID cannot be blank.": "O ID do repositório não pode estar vazio.",
+    "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "O ID do repositório tem que ser um identificador curto (64 caracteres ou menos) e ser constituído somente por letras, números e os caracteres ponto (.), traço (-) e sublinhado (_).",
     "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the the dot (.), dash (-) and underscode (_) characters only.": "O ID do repositório tem que ser um identificador curto (64 caracteres ou menos) e consiste em letras, números e os caracteres ponto (.), traço (-) e (_).",
     "The repository ID must be unique.": "O ID do repositório tem que ser único.",
     "The repository path cannot be blank.": "O caminho do repositório não pode estar vazio.",
@@ -122,7 +136,7 @@
     "Up to Date": "Actualizado",
     "Upgrade To {%version%}": "Actualizar para {{version}}",
     "Upgrading": "Actualizando",
-    "Upload Rate": "Taxa de envio",
+    "Upload Rate": "Velocidade de envio",
     "Usage": "Utilização",
     "Use Compression": "Usar compressão",
     "Use HTTPS for GUI": "Utilizar HTTPS na interface gráfica",
@@ -133,5 +147,6 @@
     "When adding a new repository, keep in mind that the Repository ID is used to tie repositories together between nodes. They are case sensitive and must match exactly between all nodes.": "Quando adicionar um novo repositório, lembre-se que o ID do repositório é utilizado para juntar os repositórios entre nós. Os ID's são sensíveis às maiúsculas e minúsculas e têm que corresponder exactamente entre todos os nós.",
     "Yes": "Sim",
     "You must keep at least one version.": "Tem que manter pelo menos uma versão.",
+    "full documentation": "documentação completa",
     "items": "itens"
 }

gui/lang/lang-ru.json

@@ -8,9 +8,12 @@
     "Allow Anonymous Usage Reporting?": "Разрешить сбор анонимной статистики использования?",
     "Announce Server": "Сервер публикации",
     "Anonymous Usage Reporting": "Анонимная статистика использования",
+    "Any nodes configured on an introducer node will be added to this node as well.": "Any nodes configured on an introducer node will be added to this node as well.",
     "Bugs": "Ошибки",
     "CPU Utilization": "Загрузка ЦПУ",
     "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": "Ошибка подключения",
     "Copyright © 2014 Jakob Borg and the following Contributors:": "Все права защищены © 2014 Jakob Borg и следующие участники:",
     "Delete": "Удалить",
@@ -20,8 +23,10 @@
     "Edit": "Изменить",
     "Edit Node": "Изменить Узел",
     "Edit Repository": "Изменить Репозиторий",
+    "Editing": "Editing",
     "Enable UPnP": "Включить UPnP",
     "Enter comma separated \"ip:port\" addresses or \"dynamic\" to perform automatic discovery of the address.": " Введите пары \"IP:PORT\" разделённые запятыми, или слово \"dynamic\" для автоматического обнаружения адреса.",
+    "Enter ignore patterns, one per line.": "Enter ignore patterns, one per line.",
     "Error": "Ошибка",
     "File Versioning": "Управление версиями",
     "File permission bits are ignored when looking for changes. Use on FAT filesystems.": "Права доступа к файлам будут игнорироваться. Используйте на файловых системах типа FAT.",
@@ -36,9 +41,13 @@
     "Global Discovery Server": "Сервер глобального обнаружения",
     "Global Repository": "Глобальный репозиторий",
     "Idle": "Бездействует",
+    "Ignore Patterns": "Ignore Patterns",
     "Ignore Permissions": "Игнорировать файловые права доступа",
+    "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": "Количество хранимых версий",
-    "Last seen": "Last seen",
+    "Last seen": "Был доступен",
     "Latest Release": "Последняя версия",
     "Local Discovery": "Локальное обнаружение",
     "Local Discovery Port": "Порт локального обнаружения",
@@ -47,6 +56,7 @@
     "Max File Change Rate (KiB/s)": "Максимальная скорость изменения файлов (KiB/s)",
     "Max Outstanding Requests": "Максимальное количество исходящих запросов",
     "Maximum Age": "Максимальный срок",
+    "Multi level wildcard (matches multiple directory levels)": "Multi level wildcard (matches multiple directory levels)",
     "Never": "Никогда",
     "No": "Нет",
     "No File Versioning": "Без управления версиями файлов",
@@ -63,7 +73,9 @@
     "Path to the repository on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Путь к репозиторию на локальном компьютере. Если не существует, то будет создан. Знак тильды (~) может использоваться как ссылка",
     "Path where versions should be stored (leave empty for the default .stversions folder in the repository).": "Путь, куда нужно сохранять версии (оставьте пустым для папки .stversions в репозитории).",
     "Please wait": "Пожалуйста, подождите",
+    "Preview": "Предварительный просмотр",
     "Preview Usage Report": "Посмотреть отчёт об использовании",
+    "Quick guide to supported patterns": "Quick guide to supported patterns",
     "RAM Utilization": "Использование ОЗУ",
     "Reconnect Interval (s)": "Интервал переподключений (секунды)",
     "Repository ID": "ID Репозитория",
@@ -88,6 +100,7 @@
     "Shown instead of Node ID in the cluster status. Will be updated to the name the node advertises if left empty.": "Показано вместо идентификатора узла в статусе кластера. Будет обновлено именем, разглашённым узлом, если оставлено пустым.",
     "Shutdown": "Выключить",
     "Simple File Versioning": "Простое управление версиями файлов",
+    "Single level wildcard (matches within a directory only)": "Single level wildcard (matches within a directory only)",
     "Source Code": "Исходный код",
     "Staggered File Versioning": "Ступенчатое управление версиями файлов",
     "Start Browser": "Открыть браузер",
@@ -114,6 +127,7 @@
     "The number of old versions to keep, per file.": "Количество хранимых версий файла.",
     "The number of versions must be a number and cannot be blank.": "Количество версий должно быть числом и не может быть пустым.",
     "The repository ID cannot be blank.": "ID Репозитория не может быть пустым.",
+    "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.",
     "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the the dot (.), dash (-) and underscode (_) characters only.": "ID репозитория должен быть коротким id (64 символа или меньше) состоящий только из букв, цифр,  точек (.), тире (-) и нижнего подчёркивания (_).",
     "The repository ID must be unique.": "ID Репозитория должен быть уникальным.",
     "The repository path cannot be blank.": "Путь к репозиторию не может быть пустым.",
@@ -133,5 +147,6 @@
     "When adding a new repository, keep in mind that the Repository ID is used to tie repositories together between nodes. They are case sensitive and must match exactly between all nodes.": "Добавляя новый репозиторий помните, что ID репозитория используется для связи всех репозиториев между узлами. ID чувствительны к регистру и должны совпадать на всех узлах.",
     "Yes": "Да",
     "You must keep at least one version.": "Вы должны хранить как минимум одну версию.",
+    "full documentation": "full documentation",
     "items": "элементы"
 }

gui/lang/lang-sv.json

@@ -8,9 +8,12 @@
     "Allow Anonymous Usage Reporting?": "Tillåt anonym användarstatistik?",
     "Announce Server": "Uppslagningsserver",
     "Anonymous Usage Reporting": "Anonym användarstatistik",
+    "Any nodes configured on an introducer node will be added to this node as well.": "Any nodes configured on an introducer node will be added to this node as well.",
     "Bugs": "Buggar",
     "CPU Utilization": "CPU-användning",
     "Close": "Stäng",
+    "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": "Anslutningsproblem",
     "Copyright © 2014 Jakob Borg and the following Contributors:": "Copyright © 2014 Jakob Borg och de följande medarbetarna:",
     "Delete": "Radera",
@@ -20,8 +23,10 @@
     "Edit": "Redigera",
     "Edit Node": "Redigera nod",
     "Edit Repository": "Redigera lagring",
+    "Editing": "Editing",
     "Enable UPnP": "Använd UPnP",
     "Enter comma separated \"ip:port\" addresses or \"dynamic\" to perform automatic discovery of the address.": "Ange kommaseparerade \"ip:port\"-adresser eller ordet \"dynamic\" för att använda automatisk uppslagning.",
+    "Enter ignore patterns, one per line.": "Enter ignore patterns, one per line.",
     "Error": "Fel",
     "File Versioning": "Versionshantering",
     "File permission bits are ignored when looking for changes. Use on FAT filesystems.": "Filers rättighetsbitar tas inte hänsyn till vid synkronisering. Använd på FAT-filsystem.",
@@ -36,7 +41,11 @@
     "Global Discovery Server": "Global uppslagningsserver",
     "Global Repository": "Global lagring",
     "Idle": "Vilande",
+    "Ignore Patterns": "Ignore Patterns",
     "Ignore Permissions": "Ignorera filrättigheter",
+    "Incoming Rate Limit (KiB/s)": "Max nedladdningshastighet (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": "Behåll versioner",
     "Last seen": "Senast online",
     "Latest Release": "Senaste version",
@@ -47,6 +56,7 @@
     "Max File Change Rate (KiB/s)": "Högsta ändringshastighet (KiB/s)",
     "Max Outstanding Requests": "Paralellitet",
     "Maximum Age": "Högsta åldersgräns",
+    "Multi level wildcard (matches multiple directory levels)": "Multi level wildcard (matches multiple directory levels)",
     "Never": "Aldrig",
     "No": "Nej",
     "No File Versioning": "Ingen versionshantering",
@@ -58,12 +68,14 @@
     "Offline": "Ej tillgänglig",
     "Online": "Tillgänglig",
     "Out Of Sync": "Ur synk",
-    "Outgoing Rate Limit (KiB/s)": "Utgående hastighetsbegränsning (KiB/s)",
+    "Outgoing Rate Limit (KiB/s)": "Max uppladdningshastighet (KiB/s)",
     "Override Changes": "Skriv över ändringar",
     "Path to the repository 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 repository).": "Katalog där versioner sparas (lämna blankt för att använda .stversions i lagringskatalogen).",
     "Please wait": "Var god vänta",
+    "Preview": "Preview",
     "Preview Usage Report": "Förhandsgranska statistik",
+    "Quick guide to supported patterns": "Quick guide to supported patterns",
     "RAM Utilization": "Minnesanvändning",
     "Reconnect Interval (s)": "Anslutningsintervall (s)",
     "Repository ID": "Lagrings-ID",
@@ -88,6 +100,7 @@
     "Shown instead of Node ID in the cluster status. Will be updated to the name the node advertises if left empty.": "Visas istället för nod-ID. Sätts till namnet på den andra noden vid första anslutning om det lämnas blankt.",
     "Shutdown": "Stäng av",
     "Simple File Versioning": "Enkel versionshantering",
+    "Single level wildcard (matches within a directory only)": "Single level wildcard (matches within a directory only)",
     "Source Code": "Källkod",
     "Staggered File Versioning": "Versionshantering i intervall",
     "Start Browser": "Starta browser",
@@ -114,6 +127,7 @@
     "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 repository ID cannot be blank.": "Lagrings-ID kan inte vara blankt.",
+    "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.",
     "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the the dot (.), dash (-) and underscode (_) characters only.": "Lagrings-ID måste vara en kort identifierar (64 tecken eller mindre), bestående av endast bokstäver, siffror, punkt (.), bindestreck (-) och understräck (_).",
     "The repository ID must be unique.": "Lagrings-ID måste vara unikt.",
     "The repository path cannot be blank.": "Lagrings-ID kan inte lämnas blankt.",
@@ -133,5 +147,6 @@
     "When adding a new repository, keep in mind that the Repository ID is used to tie repositories together between nodes. They are case sensitive and must match exactly between all nodes.": "När du lägger till ny lagring, tänk på att lagrings-ID knyter ihop lagringen mellan olika noder. De måste vara exakt desamma mellan noder, och stora eller små bokstäver har betydelse.",
     "Yes": "Ja",
     "You must keep at least one version.": "Du måste behålla åtminstone en version.",
+    "full documentation": "full documentation",
     "items": "poster"
 }

gui/lang/lang-tr.json

@@ -8,9 +8,12 @@
     "Allow Anonymous Usage Reporting?": "Anonim kullanım raporlarına izin ver ?",
     "Announce Server": "Duyuru Sunucusu",
     "Anonymous Usage Reporting": "Anonim Kullanım Raporlama",
+    "Any nodes configured on an introducer node will be added to this node as well.": "Any nodes configured on an introducer node will be added to this node as well.",
     "Bugs": "Hatalar",
     "CPU Utilization": "İşlemci Kullanımı",
     "Close": "Kapat",
+    "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": "Bağlantı hatası",
     "Copyright © 2014 Jakob Borg and the following Contributors:": "Telif hakkı © 2014 Jakob Borg ve aşağıdaki katkıda bulunanlar",
     "Delete": "Sil",
@@ -20,8 +23,10 @@
     "Edit": "Seçenekler",
     "Edit Node": "Düğümü Düzenle",
     "Edit Repository": "Depoyu düzenle",
+    "Editing": "Editing",
     "Enable UPnP": "UPnP Etkinleştir",
     "Enter comma separated \"ip:port\" addresses or \"dynamic\" to perform automatic discovery of the address.": "IP adresleri eklemek için virgül ile ayırarak \"ip:port\" yazın, ya da \"dynamic\" yazarak otomatik bulma işlemini seçin.",
+    "Enter ignore patterns, one per line.": "Enter ignore patterns, one per line.",
     "Error": "Hata",
     "File Versioning": "Dosya Sürümlendirme",
     "File permission bits are ignored when looking for changes. Use on FAT filesystems.": "Değişim yoklarken dosya izin bilgilerini ihmal et. FAT dosya sisteminde kullanın.",
@@ -36,7 +41,11 @@
     "Global Discovery Server": "Küresel Keşif Sunucusu",
     "Global Repository": "Global Depo",
     "Idle": "Boşta",
+    "Ignore Patterns": "Ignore Patterns",
     "Ignore Permissions": "İzinleri yoksay",
+    "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": "Sürüm tut",
     "Last seen": "Last seen",
     "Latest Release": "Son sürüm",
@@ -47,6 +56,7 @@
     "Max File Change Rate (KiB/s)": "Mak. Dosya değiştirme oranı (KB/sn)",
     "Max Outstanding Requests": "Maks Öncellikli İstekler",
     "Maximum Age": "Maximum Age",
+    "Multi level wildcard (matches multiple directory levels)": "Multi level wildcard (matches multiple directory levels)",
     "Never": "Never",
     "No": "Hayır",
     "No File Versioning": "No File Versioning",
@@ -63,7 +73,9 @@
     "Path to the repository on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Yerel bilgisayardaki depoya ulaşım yolu. Dizin yoksa yaratılacak. (~) karakterinin kısayol olarak kullanılabileceği yol",
     "Path where versions should be stored (leave empty for the default .stversions folder in the repository).": "Path where versions should be stored (leave empty for the default .stversions folder in the repository).",
     "Please wait": "Lütfen Bekleyin",
+    "Preview": "Preview",
     "Preview Usage Report": "Kullanım raporunu gözden geçir",
+    "Quick guide to supported patterns": "Quick guide to supported patterns",
     "RAM Utilization": "RAM Kullanımı",
     "Reconnect Interval (s)": "Yeniden bağlanma süresi (sn)",
     "Repository ID": "Depo ID",
@@ -88,6 +100,7 @@
     "Shown instead of Node ID in the cluster status. Will be updated to the name the node advertises if left empty.": "Küme durumunda Düğüm ID yerine bunu göster.  Eğer düğüm ismi boş bırakılırsa düğüm ismi güncellenip ilan edilecektir.",
     "Shutdown": "Kapat",
     "Simple File Versioning": "Simple File Versioning",
+    "Single level wildcard (matches within a directory only)": "Single level wildcard (matches within a directory only)",
     "Source Code": "Kaynak Kodu",
     "Staggered File Versioning": "Staggered File Versioning",
     "Start Browser": "Tarayıcıyı Başlat",
@@ -114,6 +127,7 @@
     "The number of old versions to keep, per file.": "Dosya başına saklanacak eski sürüm.",
     "The number of versions must be a number and cannot be blank.": "Sürümlerin sayısı sayı olmalı ve boş bırakılamaz.",
     "The repository ID cannot be blank.": "Depo ID boş bırakılamaz.",
+    "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.",
     "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the the dot (.), dash (-) and underscode (_) characters only.": "Depo ID uzun olmamalı (64 karakter ya da daha az). Sadece harf, rakam, nokta (.), kısa çizgi (-) ve alt çizgi (_) kullanabilirsiniz.",
     "The repository ID must be unique.": "Depo ID'si benzersiz olmalıdır.",
     "The repository path cannot be blank.": "Depo yolu boş bırakılamaz.",
@@ -133,5 +147,6 @@
     "When adding a new repository, keep in mind that the Repository ID is used to tie repositories together between nodes. They are case sensitive and must match exactly between all nodes.": "Unutmayın ki; Depo ID, depoları düğümler arasında bağlamak için kullanılıyor. Büyük - küçük harf duyarlı, ve bütün düğümlerde aynı olmalı.",
     "Yes": "Evet",
     "You must keep at least one version.": "En az bir sürümü tutmalısınız.",
+    "full documentation": "full documentation",
     "items": "öğeler"
 }

gui/lang/lang-uk.json

@@ -8,9 +8,12 @@
     "Allow Anonymous Usage Reporting?": "Дозволити програмі збирати анонімну статистику викроистання?",
     "Announce Server": "Сервер анонсування",
     "Anonymous Usage Reporting": "Анонімна статистика використання",
+    "Any nodes configured on an introducer node will be added to this node as well.": "Any nodes configured on an introducer node will be added to this node as well.",
     "Bugs": "Помилки",
     "CPU Utilization": "Навантаження CPU",
     "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": "Помилка з’єднання",
     "Copyright © 2014 Jakob Borg and the following Contributors:": "Copyright © 2014 Jakob Borg та наступні контриб’ютори:",
     "Delete": "Видалити",
@@ -20,8 +23,10 @@
     "Edit": "Редагувати",
     "Edit Node": "Редагувати вузол",
     "Edit Repository": "Редагувати репозиторій",
+    "Editing": "Editing",
     "Enable UPnP": "Увімкнути UPnP",
     "Enter comma separated \"ip:port\" addresses or \"dynamic\" to perform automatic discovery of the address.": "Уведіть адреси \"ip:port\" розділені комою, або слово \"dynamic\" для здійснення автоматичного виявлення адреси.",
+    "Enter ignore patterns, one per line.": "Enter ignore patterns, one per line.",
     "Error": "Помилка",
     "File Versioning": "Керування версіями",
     "File permission bits are ignored when looking for changes. Use on FAT filesystems.": "Біти прав доступу до файлів будуть проігноровані під час визначення змін. Використовуйте на файлових системах FAT.",
@@ -36,7 +41,11 @@
     "Global Discovery Server": "Сервер для глобального виявлення",
     "Global Repository": "Глобальний репозиторій",
     "Idle": "Очікування",
+    "Ignore Patterns": "Ignore Patterns",
     "Ignore Permissions": "Ігнорувати права доступу до файлів",
+    "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": "Зберігати версії",
     "Last seen": "З’являвся останній раз",
     "Latest Release": "Останній реліз",
@@ -47,6 +56,7 @@
     "Max File Change Rate (KiB/s)": "Максимальна швидкість змінення файлів (КіБ/с)",
     "Max Outstanding Requests": "Максимальна кількість вихідних запитів",
     "Maximum Age": "Максимальний вік",
+    "Multi level wildcard (matches multiple directory levels)": "Multi level wildcard (matches multiple directory levels)",
     "Never": "Ніколи",
     "No": "Ні",
     "No File Versioning": "Версіонування вимкнено",
@@ -63,7 +73,9 @@
     "Path to the repository on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Шлях до репозиторія на локальному комп’ютері. Буде створений, якщо такий не існує. Символ тильди (~) може бути використаний як ярлик для",
     "Path where versions should be stored (leave empty for the default .stversions folder in the repository).": "Шлях, де повинні зберігатися версії (залиште порожнім для зберігання в директорію .stversions в репозиторії)",
     "Please wait": "Будь ласка, зачекайте",
+    "Preview": "Попередній перегляд",
     "Preview Usage Report": "Попередній перегляд статистичного звіту",
+    "Quick guide to supported patterns": "Quick guide to supported patterns",
     "RAM Utilization": "Використання RAM",
     "Reconnect Interval (s)": "Інтервал повторного з’єднання (с)",
     "Repository ID": "ID репозиторія",
@@ -88,6 +100,7 @@
     "Shown instead of Node ID in the cluster status. Will be updated to the name the node advertises if left empty.": "Показується замість ID вузла в статусі кластера. Буде оновлено ім’ям, яке розголошене вузлом, якщо залишити порожнім.",
     "Shutdown": "Вимкнути",
     "Simple File Versioning": "Просте версіонування",
+    "Single level wildcard (matches within a directory only)": "Single level wildcard (matches within a directory only)",
     "Source Code": "Сирцевий код",
     "Staggered File Versioning": "Поступове версіонування",
     "Start Browser": "Запустити браузер",
@@ -114,6 +127,7 @@
     "The number of old versions to keep, per file.": "Кількість старих версій, яку необхідно зберігати для кожного файлу.",
     "The number of versions must be a number and cannot be blank.": "Кількість версій повинна бути цифрою та не може бути порожньою.",
     "The repository ID cannot be blank.": "ID репозиторія не може бути порожнім.",
+    "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.",
     "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the the dot (.), dash (-) and underscode (_) characters only.": "ID репозиторія повинен бути коротким ідентифікатором (64 символи або менше), що містить лише цифри та літери, знак крапки (.), тире (-) та нижнього підкреслення (_).",
     "The repository ID must be unique.": "ID репозиторія повинен бути унікальним.",
     "The repository path cannot be blank.": "Шлях до репозиторія не може бути порожнім.",
@@ -133,5 +147,6 @@
     "When adding a new repository, keep in mind that the Repository ID is used to tie repositories together between nodes. They are case sensitive and must match exactly between all nodes.": "Коли додаєте новий репозиторій, пам’ятайте, що ID репозиторія використовується для того, щоб зв’язувати репозиторії разом між вузлами. Назви є чутливими до регістра та повинні співпадати точно між усіма вузлами.",
     "Yes": "Так",
     "You must keep at least one version.": "Ви повинні зберігати щонайменше одну версію.",
+    "full documentation": "full documentation",
     "items": "елементи"
 }

gui/lang/lang-zh-CN.json

@@ -8,9 +8,12 @@
     "Allow Anonymous Usage Reporting?": "允许匿名使用报告?",
     "Announce Server": "Announce服务器",
     "Anonymous Usage Reporting": "匿名使用报告",
+    "Any nodes configured on an introducer node will be added to this node as well.": "Any nodes configured on an introducer node will be added to this node as well.",
     "Bugs": "Bug汇报",
     "CPU Utilization": "CPU使用率",
     "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": "连接出错",
     "Copyright © 2014 Jakob Borg and the following Contributors:": "版权© 2014 Jakob Borg 及以下贡献者:",
     "Delete": "删除",
@@ -20,8 +23,10 @@
     "Edit": "选项",
     "Edit Node": "编辑节点",
     "Edit Repository": "编辑仓库",
+    "Editing": "Editing",
     "Enable UPnP": "开启UPnP",
     "Enter comma separated \"ip:port\" addresses or \"dynamic\" to perform automatic discovery of the address.": "输入以半角逗号分隔的\"ip:端口\"设置可用地址列表，或者输入\"dynamic\"表示自动寻找地址。",
+    "Enter ignore patterns, one per line.": "Enter ignore patterns, one per line.",
     "Error": "错误",
     "File Versioning": "版本控制",
     "File permission bits are ignored when looking for changes. Use on FAT filesystems.": "监控文件改变时，忽略文件权限位。用于FAT文件系统。",
@@ -36,7 +41,11 @@
     "Global Discovery Server": "用以在互联网上寻找节点的Announce服务器地址",
     "Global Repository": "全局仓库",
     "Idle": "空闲",
+    "Ignore Patterns": "Ignore Patterns",
     "Ignore Permissions": "忽略文件权限",
+    "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": "保留历史版本数量",
     "Last seen": "最后可见",
     "Latest Release": "最新版本",
@@ -47,6 +56,7 @@
     "Max File Change Rate (KiB/s)": "最大文件变化速率(千字节/每秒)",
     "Max Outstanding Requests": "同时可响应的请求数上限",
     "Maximum Age": "历史版本最长保留时间",
+    "Multi level wildcard (matches multiple directory levels)": "Multi level wildcard (matches multiple directory levels)",
     "Never": "从未",
     "No": "否",
     "No File Versioning": "不启用版本控制",
@@ -63,7 +73,9 @@
     "Path to the repository on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "该仓库的本地路径。如果该路径不存在，则会自动创建。波浪线字符(~)代表了以下文件夹：",
     "Path where versions should be stored (leave empty for the default .stversions folder in the repository).": "历史版本保存路径（若留空，则会保存在默认的.stversions文件夹）",
     "Please wait": "请稍候",
+    "Preview": "预览",
     "Preview Usage Report": "预览使用报告",
+    "Quick guide to supported patterns": "Quick guide to supported patterns",
     "RAM Utilization": "内存使用量",
     "Reconnect Interval (s)": "重连间隔(秒)",
     "Repository ID": "仓库ID",
@@ -88,6 +100,7 @@
     "Shown instead of Node ID in the cluster status. Will be updated to the name the node advertises if left empty.": "在节点群中，将会显示本名称，而不是节点ID。如果设置为空，则会使用目标节点提供的默认名称。",
     "Shutdown": "关闭Syncthing",
     "Simple File Versioning": "简易版本控制",
+    "Single level wildcard (matches within a directory only)": "Single level wildcard (matches within a directory only)",
     "Source Code": "源代码",
     "Staggered File Versioning": "阶段版本控制",
     "Start Browser": "启动浏览器",
@@ -114,6 +127,7 @@
     "The number of old versions to keep, per file.": "每个文件保留的版本数量上限。",
     "The number of versions must be a number and cannot be blank.": "保留版本数量必须为数字，且不能为空。",
     "The repository ID cannot be blank.": "仓库ID不能为空。",
+    "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.",
     "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the the dot (.), dash (-) and underscode (_) characters only.": "仓库ID的长度,必须在64字节或更少，只能包含字母，数字，点(.),以及下划线(_)",
     "The repository ID must be unique.": "仓库ID必须唯一。",
     "The repository path cannot be blank.": "仓库路径不能为空。",
@@ -133,5 +147,6 @@
     "When adding a new repository, keep in mind that the Repository ID is used to tie repositories together between nodes. They are case sensitive and must match exactly between all nodes.": "添加新仓库时需要注意，仓库ID是用来在不同节点间绑定关联的仓库的。仓库ID是大小写敏感的，而且在所有的节点中必须完全相同，才能正确建立同步。",
     "Yes": "是",
     "You must keep at least one version.": "您必须保留至少一个版本。",
+    "full documentation": "full documentation",
     "items": "条目"
 }

gui/lang/lang-zh-TW.json

@@ -8,9 +8,12 @@
     "Allow Anonymous Usage Reporting?": "允許匿名的使用資訊回報？",
     "Announce Server": "發佈伺服器",
     "Anonymous Usage Reporting": "匿名的使用資訊回報",
+    "Any nodes configured on an introducer node will be added to this node as well.": "Any nodes configured on an introducer node will be added to this node as well.",
     "Bugs": "程式錯誤",
     "CPU Utilization": "CPU 使用率",
     "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": "連線錯誤",
     "Copyright © 2014 Jakob Borg and the following Contributors:": "版權所有 © 2014 Jakob Borg 及以下貢獻者：",
     "Delete": "刪除",
@@ -20,8 +23,10 @@
     "Edit": "編輯",
     "Edit Node": "編輯節點",
     "Edit Repository": "編輯儲存庫",
+    "Editing": "Editing",
     "Enable UPnP": "啟用 UPnP",
     "Enter comma separated \"ip:port\" addresses or \"dynamic\" to perform automatic discovery of the address.": "輸入以半形逗號區隔的 \"ip:連接埠\" 位址，或著輸入 \"dynamic\" 以進行位址的自動探索",
+    "Enter ignore patterns, one per line.": "輸入忽略樣式，一行一種。",
     "Error": "錯誤",
     "File Versioning": "檔案版本控制",
     "File permission bits are ignored when looking for changes. Use on FAT filesystems.": "當在尋找變化時，檔案權限位元會被忽略。用於 FAT 檔案系統。",
@@ -36,7 +41,11 @@
     "Global Discovery Server": "全域探索伺服器",
     "Global Repository": "全域儲存庫",
     "Idle": "閒置",
+    "Ignore Patterns": "忽略樣式",
     "Ignore Permissions": "忽略權限",
+    "Incoming Rate Limit (KiB/s)": "連入速率限制 (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": "保留版本數",
     "Last seen": "最後發現時間",
     "Latest Release": "最新發佈",
@@ -45,8 +54,9 @@
     "Local Repository": "本地儲存庫",
     "Master Repo": "主儲存庫",
     "Max File Change Rate (KiB/s)": "最大檔案改變速率 (KiB/s)",
-    "Max Outstanding Requests": "最大未完成的請求",
+    "Max Outstanding Requests": "最多待處理的請求數",
     "Maximum Age": "最長存留時間",
+    "Multi level wildcard (matches multiple directory levels)": "Multi level wildcard (matches multiple directory levels)",
     "Never": "從未",
     "No": "否",
     "No File Versioning": "無檔案版本控制",
@@ -63,7 +73,9 @@
     "Path to the repository on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "儲存庫在本地電腦的路徑。若資料夾不存在則會建立。波浪符號 (~) 可用作下列資料夾的捷徑：",
     "Path where versions should be stored (leave empty for the default .stversions folder in the repository).": "儲存歷史版本的路徑 (若為空，則預設使用儲存庫中的 .stversions 資料夾)。",
     "Please wait": "請稍後",
+    "Preview": "預覽",
     "Preview Usage Report": "預覽使用資訊報告",
+    "Quick guide to supported patterns": "Quick guide to supported patterns",
     "RAM Utilization": "記憶體使用率",
     "Reconnect Interval (s)": "重新連接間隔 (秒)",
     "Repository ID": "儲存庫識別碼",
@@ -88,6 +100,7 @@
     "Shown instead of Node ID in the cluster status. Will be updated to the name the node advertises if left empty.": "代替節點識別碼顯示在叢集狀態中。本欄若未填寫則將被更新為此節點所廣播的名稱。",
     "Shutdown": "關閉",
     "Simple File Versioning": "簡單檔案版本控制",
+    "Single level wildcard (matches within a directory only)": "Single level wildcard (matches within a directory only)",
     "Source Code": "原始碼",
     "Staggered File Versioning": "變動式檔案版本控制",
     "Start Browser": "啟動瀏覽器",
@@ -114,6 +127,7 @@
     "The number of old versions to keep, per file.": "每個檔案要保留的舊版本數量。",
     "The number of versions must be a number and cannot be blank.": "每個檔案要保留的舊版本數量必須是數字且不能為空白。",
     "The repository ID cannot be blank.": "儲存庫識別碼不能為空白。",
+    "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "儲存庫識別碼必須為一段只包含半形英文字母、數字、點 (.)、連接符號 (-) 以及底線 (_) 的簡短識別碼 (不多於 64 個字元)",
     "The repository ID must be a short identifier (64 characters or less) consisting of letters, numbers and the the dot (.), dash (-) and underscode (_) characters only.": "儲存庫識別碼必須為一段只包含半形英文字母、數字、點 (.)、連接符號 (-) 以及底線 (_) 的簡短識別碼 (不多於 64 個字元)",
     "The repository ID must be unique.": "儲存庫識別碼必須為獨一無二的。",
     "The repository path cannot be blank.": "儲存庫路徑不能空白。",
@@ -133,5 +147,6 @@
     "When adding a new repository, keep in mind that the Repository ID is used to tie repositories together between nodes. They are case sensitive and must match exactly between all nodes.": "當新增一個儲存庫時，請記住，儲存庫識別碼是用來將節點之間的儲存庫綁定在一起的。它們有區分大小寫，且必須在所有節點之間完全相同。",
     "Yes": "是",
     "You must keep at least one version.": "您必須保留至少一個版本。",
+    "full documentation": "full documentation",
     "items": "個項目"
 }

gui/modal.html

@@ -10,7 +10,7 @@
       <div class="modal-body" ng-transclude>
       </div>
       <div ng-if="close" class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal"><span class="glyphicon glyphicon-remove"></span>&emsp;<span translate>Close</span></button>
+        <button type="button" class="btn btn-default btn-sm" data-dismiss="modal"><span class="glyphicon glyphicon-remove"></span>&emsp;<span translate>Close</span></button>
       </div>
     </div>
   </div>

gui/overrides.css

@@ -1,80 +1,97 @@
-    body {
-      padding-bottom: 70px;
-      font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-    }
+body {
+    padding-bottom: 70px;
+    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
 
-    h1, h2, h3, h4, h5 {
-      font-family: "Raleway", "Helvetica Neue", Helvetica, Arial, sans-serif;
-    }
+h1, h2, h3, h4, h5 {
+    font-family: "Raleway", "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
 
-    ul+h5 {
-      margin-top: 1.5em;
-    }
+ul+h5 {
+    margin-top: 1.5em;
+}
 
-    .text-monospace {
-      font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
-    }
+.text-monospace {
+    font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
+}
 
-    .table-condensed>thead>tr>th, .table-condensed>tbody>tr>th, .table-condensed>tfoot>tr>th, .table-condensed>thead>tr>td, .table-condensed>tbody>tr>td, .table-condensed>tfoot>tr>td {
-      border-top: none;
-    }
+.table-condensed>thead>tr>th, .table-condensed>tbody>tr>th, .table-condensed>tfoot>tr>th, .table-condensed>thead>tr>td, .table-condensed>tbody>tr>td, .table-condensed>tfoot>tr>td {
+    border-top: none;
+}
 
-    .logo {
-      margin: 0;
-      padding: 0;
-      top: -5px;
-      position: relative;
-    }
+.logo {
+    margin: 0;
+    padding: 0;
+    top: -5px;
+    position: relative;
+}
 
-    .list-no-bullet {
-      list-style-type: none
-    }
+.list-no-bullet {
+    list-style-type: none
+}
 
-    .li-column {
-      display: inline-block;
-      min-width: 7em;
-      margin-right: 1em;
-      background-color: rgb(236, 240, 241);
-      border-radius: 3px;
-      padding: 1px 4px;
-      margin: 2px 2px;
-    }
-    .li-column span.data {
-      margin-left: 0.5em;
-      min-width: 10em;
-      text-align: right;
-      display: inline-block;
-    }
+.li-column {
+    display: inline-block;
+    min-width: 7em;
+    margin-right: 1em;
+    background-color: rgb(236, 240, 241);
+    border-radius: 3px;
+    padding: 1px 4px;
+    margin: 2px 2px;
+}
+.li-column span.data {
+    margin-left: 0.5em;
+    min-width: 10em;
+    text-align: right;
+    display: inline-block;
+}
 
-    .ng-cloak {
-      display: none !important;
-    }
+.ng-cloak {
+    display: none !important;
+}
 
-    .table th {
-      white-space: nowrap;
-      font-weight: 400;
-    }
+.table th {
+    white-space: nowrap;
+    font-weight: 400;
+}
 
-    .table td {
-      padding-left: 20px !important;
-    }
+.table td {
+    padding-left: 20px !important;
+}
 
-    .table td.small-data {
-      white-space: nowrap;
-    }
+.table td.small-data {
+    white-space: nowrap;
+}
 
-    table.table-condensed {
-      table-layout: fixed;
-    }
+table.table-condensed {
+    table-layout: fixed;
+}
+table.table-condensed td {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+@media (max-width:767px) {
     table.table-condensed td {
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-    @media (max-width:767px) {
-      table.table-condensed td {
         /* for mobile phones to allow linebreaks in long repro folder/shared with
-         * columns. */
+        * columns. */
         white-space: normal;
-      }
     }
+}
+
+.navbar-right {
+    /* to align with panel */
+    padding-right: 15px;
+}
+
+.panel-body .table-condensed {
+    margin-bottom: 0;
+}
+
+.dl-horizontal.dl-narrow dt {
+    width: 40px;
+}
+
+.dl-horizontal.dl-narrow dd {
+    margin-left: 60px;
+}

integration/h2/config.xml

@@ -1,49 +0,0 @@
-<configuration version="2">
-    <repository id="default" directory="s2" ro="false" ignorePerms="false">
-        <node id="I6KAH7666SLLL5PFXSOAUFJCDZYAOMLEKCP2GB3BV5RQST3PSROA"></node>
-        <node id="JMFJCXBGZDE4BOCJE3VF65GYZNAIVJRET3J6HMRAUQIGJOFKNHMQ"></node>
-        <node id="373HSRPQLPNLIJYKZVQFP4PKZ6R2ZE6K3YD442UJHBGBQGWWXAHA"></node>
-        <versioning></versioning>
-        <syncorder></syncorder>
-    </repository>
-    <repository id="s12" directory="s12-2" ro="false" ignorePerms="false">
-        <node id="I6KAH7666SLLL5PFXSOAUFJCDZYAOMLEKCP2GB3BV5RQST3PSROA"></node>
-        <node id="JMFJCXBGZDE4BOCJE3VF65GYZNAIVJRET3J6HMRAUQIGJOFKNHMQ"></node>
-        <versioning></versioning>
-        <syncorder></syncorder>
-    </repository>
-    <repository id="s23" directory="s23-2" ro="false" ignorePerms="false">
-        <node id="JMFJCXBGZDE4BOCJE3VF65GYZNAIVJRET3J6HMRAUQIGJOFKNHMQ"></node>
-        <node id="373HSRPQLPNLIJYKZVQFP4PKZ6R2ZE6K3YD442UJHBGBQGWWXAHA"></node>
-        <versioning></versioning>
-        <syncorder></syncorder>
-    </repository>
-    <node id="I6KAH7666SLLL5PFXSOAUFJCDZYAOMLEKCP2GB3BV5RQST3PSROA" name="s1" compression="true">
-        <address>127.0.0.1:22001</address>
-    </node>
-    <node id="JMFJCXBGZDE4BOCJE3VF65GYZNAIVJRET3J6HMRAUQIGJOFKNHMQ" name="s2" compression="true">
-        <address>127.0.0.1:22002</address>
-    </node>
-    <node id="373HSRPQLPNLIJYKZVQFP4PKZ6R2ZE6K3YD442UJHBGBQGWWXAHA" name="s3">
-        <address>127.0.0.1:22003</address>
-    </node>
-    <gui enabled="true" tls="false">
-        <address>127.0.0.1:8082</address>
-        <apikey>abc123</apikey>
-    </gui>
-    <options>
-        <listenAddress>127.0.0.1:22002</listenAddress>
-        <globalAnnounceServer>announce.syncthing.net:22025</globalAnnounceServer>
-        <globalAnnounceEnabled>false</globalAnnounceEnabled>
-        <localAnnounceEnabled>true</localAnnounceEnabled>
-        <localAnnouncePort>21025</localAnnouncePort>
-        <parallelRequests>16</parallelRequests>
-        <maxSendKbps>0</maxSendKbps>
-        <rescanIntervalS>15</rescanIntervalS>
-        <reconnectionIntervalS>5</reconnectionIntervalS>
-        <maxChangeKbps>10000</maxChangeKbps>
-        <startBrowser>false</startBrowser>
-        <upnpEnabled>true</upnpEnabled>
-        <urAccepted>-1</urAccepted>
-    </options>
-</configuration>

integration/h4/config.xml

@@ -1,40 +0,0 @@
-<configuration version="2">
-    <repository id="unique" directory="s4" ro="false">
-        <node id="I6KAH7666SLLL5PFXSOAUFJCDZYAOMLEKCP2GB3BV5RQST3PSROA" name="s1"></node>
-        <node id="JMFJCXBGZDE4BOCJE3VF65GYZNAIVJRET3J6HMRAUQIGJOFKNHMQ" name="s2"></node>
-        <node id="373HSRPQLPNLIJYKZVQFP4PKZ6R2ZE6K3YD442UJHBGBQGWWXAHA" name="s3"></node>
-        <node id="EJHMPAQOGCVORISB4IS3SYYVJXTKJGLTU66DIQPGJ5D2GXGQ3OWQ" name="s4"></node>
-    </repository>
-    <repository id="default" directory="s4d" ro="false">
-        <node id="I6KAH7666SLLL5PFXSOAUFJCDZYAOMLEKCP2GB3BV5RQST3PSROA" name="s1"></node>
-    </repository>
-    <node id="I6KAH7666SLLL5PFXSOAUFJCDZYAOMLEKCP2GB3BV5RQST3PSROA" name="s1">
-        <address>127.0.0.1:22001</address>
-    </node>
-    <node id="JMFJCXBGZDE4BOCJE3VF65GYZNAIVJRET3J6HMRAUQIGJOFKNHMQ" name="s2">
-        <address>127.0.0.1:22002</address>
-    </node>
-    <node id="373HSRPQLPNLIJYKZVQFP4PKZ6R2ZE6K3YD442UJHBGBQGWWXAHA" name="s3">
-        <address>127.0.0.1:22003</address>
-    </node>
-    <node id="EJHMPAQOGCVORISB4IS3SYYVJXTKJGLTU66DIQPGJ5D2GXGQ3OWQ" name="s4">
-        <address>dynamic</address>
-    </node>
-    <gui enabled="true">
-        <address>127.0.0.1:8084</address>
-	<apikey>abc123</apikey>
-    </gui>
-    <options>
-        <listenAddress>:22004</listenAddress>
-        <globalAnnounceServer>announce.syncthing.net:22025</globalAnnounceServer>
-        <globalAnnounceEnabled>false</globalAnnounceEnabled>
-        <localAnnounceEnabled>true</localAnnounceEnabled>
-        <parallelRequests>16</parallelRequests>
-        <maxSendKbps>0</maxSendKbps>
-        <rescanIntervalS>60</rescanIntervalS>
-        <reconnectionIntervalS>10</reconnectionIntervalS>
-        <maxChangeKbps>10000</maxChangeKbps>
-        <startBrowser>false</startBrowser>
-        <upnpEnabled>false</upnpEnabled>
-    </options>
-</configuration>

internal/auto/auto_test.go

@@ -8,7 +8,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/syncthing/syncthing/auto"
+	"github.com/syncthing/syncthing/internal/auto"
 )
 
 func TestAssets(t *testing.T) {

internal/beacon/debug.go

@@ -8,7 +8,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/syncthing/syncthing/logger"
+	"github.com/syncthing/syncthing/internal/logger"
 )
 
 var (

internal/config/config.go

@@ -8,20 +8,22 @@ package config
 import (
 	"encoding/xml"
 	"fmt"
-	"io"
 	"os"
 	"reflect"
 	"sort"
 	"strconv"
 
 	"code.google.com/p/go.crypto/bcrypt"
-	"github.com/syncthing/syncthing/logger"
-	"github.com/syncthing/syncthing/protocol"
+	"github.com/syncthing/syncthing/internal/events"
+	"github.com/syncthing/syncthing/internal/logger"
+	"github.com/syncthing/syncthing/internal/osutil"
+	"github.com/syncthing/syncthing/internal/protocol"
 )
 
 var l = logger.DefaultLogger
 
 type Configuration struct {
+	Location     string                    `xml:"-" json:"-"`
 	Version      int                       `xml:"version,attr" default:"3"`
 	Repositories []RepositoryConfiguration `xml:"repository"`
 	Nodes        []NodeConfiguration       `xml:"node"`
@@ -99,6 +101,7 @@ type NodeConfiguration struct {
 	Addresses   []string        `xml:"address,omitempty"`
 	Compression bool            `xml:"compression,attr"`
 	CertName    string          `xml:"certName,attr,omitempty"`
+	Introducer  bool            `xml:"introducer,attr"`
 }
 
 type RepositoryNodeConfiguration struct {
@@ -109,20 +112,23 @@ type RepositoryNodeConfiguration struct {
 }
 
 type OptionsConfiguration struct {
-	ListenAddress      []string `xml:"listenAddress" default:"0.0.0.0:22000"`
-	GlobalAnnServer    string   `xml:"globalAnnounceServer" default:"announce.syncthing.net:22026"`
-	GlobalAnnEnabled   bool     `xml:"globalAnnounceEnabled" default:"true"`
-	LocalAnnEnabled    bool     `xml:"localAnnounceEnabled" default:"true"`
-	LocalAnnPort       int      `xml:"localAnnouncePort" default:"21025"`
-	LocalAnnMCAddr     string   `xml:"localAnnounceMCAddr" default:"[ff32::5222]:21026"`
-	ParallelRequests   int      `xml:"parallelRequests" default:"16"`
-	MaxSendKbps        int      `xml:"maxSendKbps"`
-	ReconnectIntervalS int      `xml:"reconnectionIntervalS" default:"60"`
-	StartBrowser       bool     `xml:"startBrowser" default:"true"`
-	UPnPEnabled        bool     `xml:"upnpEnabled" default:"true"`
-	UPnPLease          int      `xml:"upnpLeaseMinutes" default:"0"`
-	UPnPRenewal        int      `xml:"upnpRenewalMinutes" default:"30"`
-	URAccepted         int      `xml:"urAccepted"` // Accepted usage reporting version; 0 for off (undecided), -1 for off (permanently)
+	ListenAddress        []string `xml:"listenAddress" default:"0.0.0.0:22000"`
+	GlobalAnnServer      string   `xml:"globalAnnounceServer" default:"announce.syncthing.net:22026"`
+	GlobalAnnEnabled     bool     `xml:"globalAnnounceEnabled" default:"true"`
+	LocalAnnEnabled      bool     `xml:"localAnnounceEnabled" default:"true"`
+	LocalAnnPort         int      `xml:"localAnnouncePort" default:"21025"`
+	LocalAnnMCAddr       string   `xml:"localAnnounceMCAddr" default:"[ff32::5222]:21026"`
+	ParallelRequests     int      `xml:"parallelRequests" default:"16"`
+	MaxSendKbps          int      `xml:"maxSendKbps"`
+	MaxRecvKbps          int      `xml:"maxRecvKbps"`
+	ReconnectIntervalS   int      `xml:"reconnectionIntervalS" default:"60"`
+	StartBrowser         bool     `xml:"startBrowser" default:"true"`
+	UPnPEnabled          bool     `xml:"upnpEnabled" default:"true"`
+	UPnPLease            int      `xml:"upnpLeaseMinutes" default:"0"`
+	UPnPRenewal          int      `xml:"upnpRenewalMinutes" default:"30"`
+	URAccepted           int      `xml:"urAccepted"` // Accepted usage reporting version; 0 for off (undecided), -1 for off (permanently)
+	RestartOnWakeup      bool     `xml:"restartOnWakeup" default:"true"`
+	AutoUpgradeIntervalH int      `xml:"autoUpgradeIntervalH" default:"12"` // 0 for off
 
 	Deprecated_RescanIntervalS int    `xml:"rescanIntervalS,omitempty" json:"-"`
 	Deprecated_UREnabled       bool   `xml:"urEnabled,omitempty" json:"-"`
@@ -149,15 +155,24 @@ func (cfg *Configuration) NodeMap() map[protocol.NodeID]NodeConfiguration {
 	return m
 }
 
-func (cfg *Configuration) GetNodeConfiguration(nodeid protocol.NodeID) *NodeConfiguration {
+func (cfg *Configuration) GetNodeConfiguration(nodeID protocol.NodeID) *NodeConfiguration {
 	for i, node := range cfg.Nodes {
-		if node.NodeID == nodeid {
+		if node.NodeID == nodeID {
 			return &cfg.Nodes[i]
 		}
 	}
 	return nil
 }
 
+func (cfg *Configuration) GetRepoConfiguration(repoID string) *RepositoryConfiguration {
+	for i, repo := range cfg.Repositories {
+		if repo.ID == repoID {
+			return &cfg.Repositories[i]
+		}
+	}
+	return nil
+}
+
 func (cfg *Configuration) RepoMap() map[string]RepositoryConfiguration {
 	m := make(map[string]RepositoryConfiguration, len(cfg.Repositories))
 	for _, r := range cfg.Repositories {
@@ -227,14 +242,39 @@ func fillNilSlices(data interface{}) error {
 	return nil
 }
 
-func Save(wr io.Writer, cfg Configuration) error {
-	e := xml.NewEncoder(wr)
-	e.Indent("", "    ")
-	err := e.Encode(cfg)
+func (cfg *Configuration) Save() error {
+	fd, err := os.Create(cfg.Location + ".tmp")
 	if err != nil {
+		l.Warnln("Saving config:", err)
 		return err
 	}
-	_, err = wr.Write([]byte("\n"))
+
+	e := xml.NewEncoder(fd)
+	e.Indent("", "    ")
+	err = e.Encode(cfg)
+	if err != nil {
+		fd.Close()
+		return err
+	}
+	_, err = fd.Write([]byte("\n"))
+
+	if err != nil {
+		l.Warnln("Saving config:", err)
+		fd.Close()
+		return err
+	}
+
+	err = fd.Close()
+	if err != nil {
+		l.Warnln("Saving config:", err)
+		return err
+	}
+
+	err = osutil.Rename(cfg.Location+".tmp", cfg.Location)
+	if err != nil {
+		l.Warnln("Saving config:", err)
+	}
+	events.Default.Log(events.ConfigSaved, cfg)
 	return err
 }
 
@@ -252,18 +292,7 @@ func uniqueStrings(ss []string) []string {
 	return us
 }
 
-func Load(rd io.Reader, myID protocol.NodeID) (Configuration, error) {
-	var cfg Configuration
-
-	setDefaults(&cfg)
-	setDefaults(&cfg.Options)
-	setDefaults(&cfg.GUI)
-
-	var err error
-	if rd != nil {
-		err = xml.NewDecoder(rd).Decode(&cfg)
-	}
-
+func (cfg *Configuration) prepare(myID protocol.NodeID) {
 	fillNilSlices(&cfg.Options)
 
 	cfg.Options.ListenAddress = uniqueStrings(cfg.Options.ListenAddress)
@@ -312,17 +341,17 @@ func Load(rd io.Reader, myID protocol.NodeID) (Configuration, error) {
 
 	// Upgrade to v2 configuration if appropriate
 	if cfg.Version == 1 {
-		convertV1V2(&cfg)
+		convertV1V2(cfg)
 	}
 
 	// Upgrade to v3 configuration if appropriate
 	if cfg.Version == 2 {
-		convertV2V3(&cfg)
+		convertV2V3(cfg)
 	}
 
 	// Upgrade to v4 configuration if appropriate
 	if cfg.Version == 3 {
-		convertV3V4(&cfg)
+		convertV3V4(cfg)
 	}
 
 	// Hash old cleartext passwords
@@ -368,10 +397,76 @@ func Load(rd io.Reader, myID protocol.NodeID) (Configuration, error) {
 			n.Addresses = []string{"dynamic"}
 		}
 	}
+}
+
+func New(location string, myID protocol.NodeID) Configuration {
+	var cfg Configuration
+
+	cfg.Location = location
+
+	setDefaults(&cfg)
+	setDefaults(&cfg.Options)
+	setDefaults(&cfg.GUI)
+
+	cfg.prepare(myID)
+
+	return cfg
+}
+
+func Load(location string, myID protocol.NodeID) (Configuration, error) {
+	var cfg Configuration
+
+	cfg.Location = location
+
+	setDefaults(&cfg)
+	setDefaults(&cfg.Options)
+	setDefaults(&cfg.GUI)
+
+	fd, err := os.Open(location)
+	if err != nil {
+		return Configuration{}, err
+	}
+	err = xml.NewDecoder(fd).Decode(&cfg)
+	fd.Close()
+
+	cfg.prepare(myID)
 
 	return cfg, err
 }
 
+// ChangeRequiresRestart returns true if updating the configuration requires a
+// complete restart.
+func ChangeRequiresRestart(from, to Configuration) bool {
+	// Adding, removing or changing repos requires restart
+	if len(from.Repositories) != len(to.Repositories) {
+		return true
+	}
+	fromRepos := from.RepoMap()
+	toRepos := to.RepoMap()
+	for id := range fromRepos {
+		if !reflect.DeepEqual(fromRepos[id], toRepos[id]) {
+			return true
+		}
+	}
+
+	// Removing a node requires a restart. Adding one does not. Changing
+	// address or name does not.
+	fromNodes := from.NodeMap()
+	toNodes := to.NodeMap()
+	for nodeID := range fromNodes {
+		if _, ok := toNodes[nodeID]; !ok {
+			return true
+		}
+	}
+
+	// All of the generic options require restart
+	if !reflect.DeepEqual(from.Options, to.Options) || !reflect.DeepEqual(from.GUI, to.GUI) {
+		return true
+	}
+
+	return false
+}
+
 func convertV3V4(cfg *Configuration) {
 	// In previous versions, rescan interval was common for each repository.
 	// From now, it can be set independently. We have to make sure, that after upgrade

internal/config/config_test.go

@@ -0,0 +1,299 @@
+// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file).
+// All rights reserved. Use of this source code is governed by an MIT-style
+// license that can be found in the LICENSE file.
+
+package config
+
+import (
+	"os"
+	"reflect"
+	"testing"
+
+	"github.com/syncthing/syncthing/internal/protocol"
+)
+
+var node1, node2, node3, node4 protocol.NodeID
+
+func init() {
+	node1, _ = protocol.NodeIDFromString("AIR6LPZ7K4PTTUXQSMUUCPQ5YWOEDFIIQJUG7772YQXXR5YD6AWQ")
+	node2, _ = protocol.NodeIDFromString("GYRZZQB-IRNPV4Z-T7TC52W-EQYJ3TT-FDQW6MW-DFLMU42-SSSU6EM-FBK2VAY")
+	node3, _ = protocol.NodeIDFromString("LGFPDIT-7SKNNJL-VJZA4FC-7QNCRKA-CE753K7-2BW5QDK-2FOZ7FR-FEP57QJ")
+	node4, _ = protocol.NodeIDFromString("P56IOI7-MZJNU2Y-IQGDREY-DM2MGTI-MGL3BXN-PQ6W5BM-TBBZ4TJ-XZWICQ2")
+}
+
+func TestDefaultValues(t *testing.T) {
+	expected := OptionsConfiguration{
+		ListenAddress:        []string{"0.0.0.0:22000"},
+		GlobalAnnServer:      "announce.syncthing.net:22026",
+		GlobalAnnEnabled:     true,
+		LocalAnnEnabled:      true,
+		LocalAnnPort:         21025,
+		LocalAnnMCAddr:       "[ff32::5222]:21026",
+		ParallelRequests:     16,
+		MaxSendKbps:          0,
+		MaxRecvKbps:          0,
+		ReconnectIntervalS:   60,
+		StartBrowser:         true,
+		UPnPEnabled:          true,
+		UPnPLease:            0,
+		UPnPRenewal:          30,
+		RestartOnWakeup:      true,
+		AutoUpgradeIntervalH: 12,
+	}
+
+	cfg := New("test", node1)
+
+	if !reflect.DeepEqual(cfg.Options, expected) {
+		t.Errorf("Default config differs;\n  E: %#v\n  A: %#v", expected, cfg.Options)
+	}
+}
+
+func TestNodeConfig(t *testing.T) {
+	for i, ver := range []string{"v1", "v2", "v3", "v4"} {
+		cfg, err := Load("testdata/"+ver+".xml", node1)
+		if err != nil {
+			t.Error(err)
+		}
+
+		expectedRepos := []RepositoryConfiguration{
+			{
+				ID:              "test",
+				Directory:       "~/Sync",
+				Nodes:           []RepositoryNodeConfiguration{{NodeID: node1}, {NodeID: node4}},
+				ReadOnly:        true,
+				RescanIntervalS: 600,
+			},
+		}
+		expectedNodes := []NodeConfiguration{
+			{
+				NodeID:      node1,
+				Name:        "node one",
+				Addresses:   []string{"a"},
+				Compression: true,
+			},
+			{
+				NodeID:      node4,
+				Name:        "node two",
+				Addresses:   []string{"b"},
+				Compression: true,
+			},
+		}
+		expectedNodeIDs := []protocol.NodeID{node1, node4}
+
+		if cfg.Version != 4 {
+			t.Errorf("%d: Incorrect version %d != 3", i, cfg.Version)
+		}
+		if !reflect.DeepEqual(cfg.Repositories, expectedRepos) {
+			t.Errorf("%d: Incorrect Repositories\n  A: %#v\n  E: %#v", i, cfg.Repositories, expectedRepos)
+		}
+		if !reflect.DeepEqual(cfg.Nodes, expectedNodes) {
+			t.Errorf("%d: Incorrect Nodes\n  A: %#v\n  E: %#v", i, cfg.Nodes, expectedNodes)
+		}
+		if !reflect.DeepEqual(cfg.Repositories[0].NodeIDs(), expectedNodeIDs) {
+			t.Errorf("%d: Incorrect NodeIDs\n  A: %#v\n  E: %#v", i, cfg.Repositories[0].NodeIDs(), expectedNodeIDs)
+		}
+
+		if len(cfg.NodeMap()) != len(expectedNodes) {
+			t.Errorf("Unexpected number of NodeMap() entries")
+		}
+		if len(cfg.RepoMap()) != len(expectedRepos) {
+			t.Errorf("Unexpected number of RepoMap() entries")
+		}
+	}
+}
+
+func TestNoListenAddress(t *testing.T) {
+	cfg, err := Load("testdata/nolistenaddress.xml", node1)
+	if err != nil {
+		t.Error(err)
+	}
+
+	expected := []string{""}
+	if !reflect.DeepEqual(cfg.Options.ListenAddress, expected) {
+		t.Errorf("Unexpected ListenAddress %#v", cfg.Options.ListenAddress)
+	}
+}
+
+func TestOverriddenValues(t *testing.T) {
+	expected := OptionsConfiguration{
+		ListenAddress:        []string{":23000"},
+		GlobalAnnServer:      "syncthing.nym.se:22026",
+		GlobalAnnEnabled:     false,
+		LocalAnnEnabled:      false,
+		LocalAnnPort:         42123,
+		LocalAnnMCAddr:       "quux:3232",
+		ParallelRequests:     32,
+		MaxSendKbps:          1234,
+		MaxRecvKbps:          2341,
+		ReconnectIntervalS:   6000,
+		StartBrowser:         false,
+		UPnPEnabled:          false,
+		UPnPLease:            60,
+		UPnPRenewal:          15,
+		RestartOnWakeup:      false,
+		AutoUpgradeIntervalH: 24,
+	}
+
+	cfg, err := Load("testdata/overridenvalues.xml", node1)
+	if err != nil {
+		t.Error(err)
+	}
+
+	if !reflect.DeepEqual(cfg.Options, expected) {
+		t.Errorf("Overridden config differs;\n  E: %#v\n  A: %#v", expected, cfg.Options)
+	}
+}
+
+func TestNodeAddressesDynamic(t *testing.T) {
+	name, _ := os.Hostname()
+	expected := []NodeConfiguration{
+		{
+			NodeID:      node1,
+			Addresses:   []string{"dynamic"},
+			Compression: true,
+		},
+		{
+			NodeID:      node2,
+			Addresses:   []string{"dynamic"},
+			Compression: true,
+		},
+		{
+			NodeID:      node3,
+			Addresses:   []string{"dynamic"},
+			Compression: true,
+		},
+		{
+			NodeID:    node4,
+			Name:      name, // Set when auto created
+			Addresses: []string{"dynamic"},
+		},
+	}
+
+	cfg, err := Load("testdata/nodeaddressesdynamic.xml", node4)
+	if err != nil {
+		t.Error(err)
+	}
+
+	if !reflect.DeepEqual(cfg.Nodes, expected) {
+		t.Errorf("Nodes differ;\n  E: %#v\n  A: %#v", expected, cfg.Nodes)
+	}
+}
+
+func TestNodeAddressesStatic(t *testing.T) {
+	name, _ := os.Hostname()
+	expected := []NodeConfiguration{
+		{
+			NodeID:    node1,
+			Addresses: []string{"192.0.2.1", "192.0.2.2"},
+		},
+		{
+			NodeID:    node2,
+			Addresses: []string{"192.0.2.3:6070", "[2001:db8::42]:4242"},
+		},
+		{
+			NodeID:    node3,
+			Addresses: []string{"[2001:db8::44]:4444", "192.0.2.4:6090"},
+		},
+		{
+			NodeID:    node4,
+			Name:      name, // Set when auto created
+			Addresses: []string{"dynamic"},
+		},
+	}
+
+	cfg, err := Load("testdata/nodeaddressesstatic.xml", node4)
+	if err != nil {
+		t.Error(err)
+	}
+
+	if !reflect.DeepEqual(cfg.Nodes, expected) {
+		t.Errorf("Nodes differ;\n  E: %#v\n  A: %#v", expected, cfg.Nodes)
+	}
+}
+
+func TestVersioningConfig(t *testing.T) {
+	cfg, err := Load("testdata/versioningconfig.xml", node4)
+	if err != nil {
+		t.Error(err)
+	}
+
+	vc := cfg.Repositories[0].Versioning
+	if vc.Type != "simple" {
+		t.Errorf(`vc.Type %q != "simple"`, vc.Type)
+	}
+	if l := len(vc.Params); l != 2 {
+		t.Errorf("len(vc.Params) %d != 2", l)
+	}
+
+	expected := map[string]string{
+		"foo": "bar",
+		"baz": "quux",
+	}
+	if !reflect.DeepEqual(vc.Params, expected) {
+		t.Errorf("vc.Params differ;\n  E: %#v\n  A: %#v", expected, vc.Params)
+	}
+}
+
+func TestNewSaveLoad(t *testing.T) {
+	path := "testdata/temp.xml"
+	os.Remove(path)
+
+	exists := func(path string) bool {
+		_, err := os.Stat(path)
+		return err == nil
+	}
+
+	cfg := New(path, node1)
+
+	// To make the equality pass later
+	cfg.XMLName.Local = "configuration"
+
+	if exists(path) {
+		t.Error(path, "exists")
+	}
+
+	err := cfg.Save()
+	if err != nil {
+		t.Error(err)
+	}
+	if !exists(path) {
+		t.Error(path, "does not exist")
+	}
+
+	cfg2, err := Load(path, node1)
+	if err != nil {
+		t.Error(err)
+	}
+
+	if !reflect.DeepEqual(cfg, cfg2) {
+		t.Errorf("Configs are not equal;\n  E:  %#v\n  A:  %#v", cfg, cfg2)
+	}
+
+	cfg.GUI.User = "test"
+	cfg.Save()
+
+	cfg2, err = Load(path, node1)
+	if err != nil {
+		t.Error(err)
+	}
+
+	if cfg2.GUI.User != "test" || !reflect.DeepEqual(cfg, cfg2) {
+		t.Errorf("Configs are not equal;\n  E:  %#v\n  A:  %#v", cfg, cfg2)
+	}
+
+	os.Remove(path)
+}
+
+func TestPrepare(t *testing.T) {
+	var cfg Configuration
+
+	if cfg.Repositories != nil || cfg.Nodes != nil || cfg.Options.ListenAddress != nil {
+		t.Error("Expected nil")
+	}
+
+	cfg.prepare(node1)
+
+	if cfg.Repositories == nil || cfg.Nodes == nil || cfg.Options.ListenAddress == nil {
+		t.Error("Unexpected nil")
+	}
+}

internal/config/testdata/nodeaddressesdynamic.xml

@@ -0,0 +1,10 @@
+<configuration version="2">
+    <node id="AIR6LPZ7K4PTTUXQSMUUCPQ5YWOEDFIIQJUG7772YQXXR5YD6AWQ">
+        <address></address>
+    </node>
+    <node id="GYRZZQBIRNPV4T7TC52WEQYJ3TFDQW6MWDFLMU4SSSU6EMFBK2VA">
+    </node>
+    <node id="LGFPDIT7SKNNJVJZA4FC7QNCRKCE753K72BW5QD2FOZ7FRFEP57Q">
+        <address>dynamic</address>
+    </node>
+</configuration>

internal/config/testdata/nodeaddressesstatic.xml

@@ -0,0 +1,14 @@
+<configuration version="3">
+    <node id="AIR6LPZ7K4PTTUXQSMUUCPQ5YWOEDFIIQJUG7772YQXXR5YD6AWQ">
+        <address>192.0.2.1</address>
+        <address>192.0.2.2</address>
+    </node>
+    <node id="GYRZZQBIRNPV4T7TC52WEQYJ3TFDQW6MWDFLMU4SSSU6EMFBK2VA">
+        <address>192.0.2.3:6070</address>
+        <address>[2001:db8::42]:4242</address>
+    </node>
+    <node id="LGFPDIT7SKNNJVJZA4FC7QNCRKCE753K72BW5QD2FOZ7FRFEP57Q">
+        <address>[2001:db8::44]:4444</address>
+        <address>192.0.2.4:6090</address>
+    </node>
+</configuration>

internal/config/testdata/nolistenaddress.xml

@@ -0,0 +1,5 @@
+<configuration version="1">
+    <options>
+        <listenAddress></listenAddress>
+    </options>
+</configuration>

internal/config/testdata/overridenvalues.xml

@@ -0,0 +1,21 @@
+<configuration version="2">
+    <options>
+       <listenAddress>:23000</listenAddress>
+        <allowDelete>false</allowDelete>
+        <globalAnnounceServer>syncthing.nym.se:22026</globalAnnounceServer>
+        <globalAnnounceEnabled>false</globalAnnounceEnabled>
+        <localAnnounceEnabled>false</localAnnounceEnabled>
+        <localAnnouncePort>42123</localAnnouncePort>
+        <localAnnounceMCAddr>quux:3232</localAnnounceMCAddr>
+        <parallelRequests>32</parallelRequests>
+        <maxSendKbps>1234</maxSendKbps>
+        <maxRecvKbps>2341</maxRecvKbps>
+        <reconnectionIntervalS>6000</reconnectionIntervalS>
+        <startBrowser>false</startBrowser>
+        <upnpEnabled>false</upnpEnabled>
+        <upnpLeaseMinutes>60</upnpLeaseMinutes>
+        <upnpRenewalMinutes>15</upnpRenewalMinutes>
+        <restartOnWakeup>false</restartOnWakeup>
+        <autoUpgradeIntervalH>24</autoUpgradeIntervalH>
+    </options>
+</configuration>

internal/config/testdata/v1.xml

@@ -0,0 +1,20 @@
+<configuration version="1">
+    <repository id="test" directory="~/Sync">
+        <node id="AIR6LPZ7K4PTTUXQSMUUCPQ5YWOEDFIIQJUG7772YQXXR5YD6AWQ" name="node one">
+            <address>a</address>
+        </node>
+        <node id="P56IOI7MZJNU2IQGDREYDM2MGTMGL3BXNPQ6W5BTBBZ4TJXZWICQ" name="node two">
+            <address>b</address>
+        </node>
+        <node id="AIR6LPZ7K4PTTUXQSMUUCPQ5YWOEDFIIQJUG7772YQXXR5YD6AWQ" name="node one">
+            <address>a</address>
+        </node>
+        <node id="P56IOI7MZJNU2IQGDREYDM2MGTMGL3BXNPQ6W5BTBBZ4TJXZWICQ" name="node two">
+            <address>b</address>
+        </node>
+    </repository>
+    <options>
+        <readOnly>true</readOnly>
+        <rescanIntervalS>600</rescanIntervalS>
+    </options>
+</configuration>

internal/config/testdata/v2.xml

@@ -0,0 +1,19 @@
+<configuration version="2">
+    <repository id="test" directory="~/Sync" ro="true">
+        <node id="P56IOI7MZJNU2IQGDREYDM2MGTMGL3BXNPQ6W5BTBBZ4TJXZWICQ"/>
+        <node id="AIR6LPZ7K4PTTUXQSMUUCPQ5YWOEDFIIQJUG7772YQXXR5YD6AWQ"/>
+        <node id="C4YBIESWDUAIGU62GOSRXCRAAJDWVE3TKCPMURZE2LH5QHAF576A"/>
+        <node id="P56IOI7MZJNU2IQGDREYDM2MGTMGL3BXNPQ6W5BTBBZ4TJXZWICQ"/>
+        <node id="AIR6LPZ7K4PTTUXQSMUUCPQ5YWOEDFIIQJUG7772YQXXR5YD6AWQ"/>
+        <node id="C4YBIESWDUAIGU62GOSRXCRAAJDWVE3TKCPMURZE2LH5QHAF576A"/>
+    </repository>
+    <node id="AIR6LPZ7K4PTTUXQSMUUCPQ5YWOEDFIIQJUG7772YQXXR5YD6AWQ" name="node one">
+        <address>a</address>
+    </node>
+    <node id="P56IOI7MZJNU2IQGDREYDM2MGTMGL3BXNPQ6W5BTBBZ4TJXZWICQ" name="node two">
+        <address>b</address>
+    </node>
+    <options>
+        <rescanIntervalS>600</rescanIntervalS>
+    </options>
+</configuration>

internal/config/testdata/v3.xml

@@ -0,0 +1,15 @@
+<configuration version="3">
+    <repository id="test" directory="~/Sync" ro="true" ignorePerms="false">
+        <node id="AIR6LPZ-7K4PTTV-UXQSMUU-CPQ5YWH-OEDFIIQ-JUG777G-2YQXXR5-YD6AWQR" compression="false"></node>
+        <node id="P56IOI7-MZJNU2Y-IQGDREY-DM2MGTI-MGL3BXN-PQ6W5BM-TBBZ4TJ-XZWICQ2" compression="false"></node>
+    </repository>
+    <node id="AIR6LPZ-7K4PTTV-UXQSMUU-CPQ5YWH-OEDFIIQ-JUG777G-2YQXXR5-YD6AWQR" name="node one" compression="true">
+        <address>a</address>
+    </node>
+    <node id="P56IOI7-MZJNU2Y-IQGDREY-DM2MGTI-MGL3BXN-PQ6W5BM-TBBZ4TJ-XZWICQ2" name="node two" compression="true">
+        <address>b</address>
+    </node>
+    <options>
+        <rescanIntervalS>600</rescanIntervalS>
+    </options>
+</configuration>

internal/config/testdata/v4.xml

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

internal/config/testdata/versioningconfig.xml

@@ -0,0 +1,8 @@
+<configuration version="2">
+    <repository id="test" directory="~/Sync" ro="true">
+        <versioning type="simple">
+            <param key="foo" val="bar"/>
+            <param key="baz" val="quux"/>
+        </versioning>
+    </repository>
+</configuration>

internal/discover/debug.go

@@ -8,7 +8,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/syncthing/syncthing/logger"
+	"github.com/syncthing/syncthing/internal/logger"
 )
 
 var (

internal/discover/discover.go

@@ -14,9 +14,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/syncthing/syncthing/beacon"
-	"github.com/syncthing/syncthing/events"
-	"github.com/syncthing/syncthing/protocol"
+	"github.com/syncthing/syncthing/internal/beacon"
+	"github.com/syncthing/syncthing/internal/events"
+	"github.com/syncthing/syncthing/internal/protocol"
 )
 
 type Discoverer struct {
@@ -65,7 +65,10 @@ func (d *Discoverer) StartLocal(localPort int, localMCAddr string) {
 	if localPort > 0 {
 		bb, err := beacon.NewBroadcast(localPort)
 		if err != nil {
-			l.Infof("No IPv4 discovery possible (%v)", err)
+			if debug {
+				l.Debugln(err)
+			}
+			l.Infoln("Local discovery over IPv4 unavailable")
 		} else {
 			d.broadcastBeacon = bb
 			go d.recvAnnouncements(bb)
@@ -75,7 +78,10 @@ func (d *Discoverer) StartLocal(localPort int, localMCAddr string) {
 	if len(localMCAddr) > 0 {
 		mb, err := beacon.NewMulticast(localMCAddr)
 		if err != nil {
-			l.Infof("No IPv6 discovery possible (%v)", err)
+			if debug {
+				l.Debugln(err)
+			}
+			l.Infoln("Local discovery over IPv6 unavailable")
 		} else {
 			d.multicastBeacon = mb
 			go d.recvAnnouncements(mb)
@@ -83,7 +89,7 @@ func (d *Discoverer) StartLocal(localPort int, localMCAddr string) {
 	}
 
 	if d.broadcastBeacon == nil && d.multicastBeacon == nil {
-		l.Warnln("No local discovery method available")
+		l.Warnln("Local discovery unavailable")
 	} else {
 		d.localBcastTick = time.Tick(d.localBcastIntv)
 		d.forcedBcastTick = make(chan time.Time)
@@ -102,8 +108,10 @@ func (d *Discoverer) StartGlobal(server string, extPort uint16) {
 }
 
 func (d *Discoverer) StopGlobal() {
-	close(d.stopGlobal)
-	d.globalWG.Wait()
+	if d.stopGlobal != nil {
+		close(d.stopGlobal)
+		d.globalWG.Wait()
+	}
 }
 
 func (d *Discoverer) ExtAnnounceOK() bool {

internal/events/debug.go

@@ -8,7 +8,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/syncthing/syncthing/logger"
+	"github.com/syncthing/syncthing/internal/logger"
 )
 
 var (

internal/events/events.go

@@ -26,6 +26,7 @@ const (
 	ItemStarted
 	StateChanged
 	RepoRejected
+	ConfigSaved
 
 	AllEvents = ^EventType(0)
 )
@@ -56,6 +57,8 @@ func (t EventType) String() string {
 		return "StateChanged"
 	case RepoRejected:
 		return "RepoRejected"
+	case ConfigSaved:
+		return "ConfigSaved"
 	default:
 		return "Unknown"
 	}

internal/events/events_test.go

@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/syncthing/syncthing/events"
+	"github.com/syncthing/syncthing/internal/events"
 )
 
 var timeout = 100 * time.Millisecond

internal/files/debug.go

@@ -8,7 +8,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/syncthing/syncthing/logger"
+	"github.com/syncthing/syncthing/internal/logger"
 )
 
 var (

internal/files/leveldb.go

@@ -10,8 +10,8 @@ import (
 	"sort"
 	"sync"
 
-	"github.com/syncthing/syncthing/lamport"
-	"github.com/syncthing/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"
@@ -77,8 +77,8 @@ keyTypeNode (1 byte)
     repository (64 bytes)
         node (32 bytes)
             name (variable size)
-            	|
-            	scanner.File
+		|
+		scanner.File
 
 keyTypeGlobal (1 byte)
 	repository (64 bytes)
@@ -132,7 +132,7 @@ type deletionHandler func(db dbReader, batch dbWriter, repo, node, name []byte,
 type fileIterator func(f protocol.FileIntf) bool
 
 func ldbGenericReplace(db *leveldb.DB, repo, node []byte, fs []protocol.FileInfo, deleteFn deletionHandler) uint64 {
-	defer runtime.GC()
+	runtime.GC()
 
 	sort.Sort(fileList(fs)) // sort list on name, same as on disk
 
@@ -272,7 +272,7 @@ func ldbReplaceWithDelete(db *leveldb.DB, repo, node []byte, fs []protocol.FileI
 }
 
 func ldbUpdate(db *leveldb.DB, repo, node []byte, fs []protocol.FileInfo) uint64 {
-	defer runtime.GC()
+	runtime.GC()
 
 	batch := new(leveldb.Batch)
 	snap, err := db.GetSnapshot()
@@ -453,7 +453,7 @@ func ldbWithHave(db *leveldb.DB, repo, node []byte, truncate bool, fn fileIterat
 }
 
 func ldbWithAllRepoTruncated(db *leveldb.DB, repo []byte, fn func(node []byte, f protocol.FileInfoTruncated) bool) {
-	defer runtime.GC()
+	runtime.GC()
 
 	start := nodeKey(repo, nil, nil)                                                // before all repo/node files
 	limit := nodeKey(repo, protocol.LocalNodeID[:], []byte{0xff, 0xff, 0xff, 0xff}) // after all repo/node files
@@ -537,7 +537,7 @@ func ldbGetGlobal(db *leveldb.DB, repo, file []byte) protocol.FileInfo {
 }
 
 func ldbWithGlobal(db *leveldb.DB, repo []byte, truncate bool, fn fileIterator) {
-	defer runtime.GC()
+	runtime.GC()
 
 	start := globalKey(repo, nil)
 	limit := globalKey(repo, []byte{0xff, 0xff, 0xff, 0xff})
@@ -605,7 +605,7 @@ func ldbAvailability(db *leveldb.DB, repo, file []byte) []protocol.NodeID {
 }
 
 func ldbWithNeed(db *leveldb.DB, repo, node []byte, truncate bool, fn fileIterator) {
-	defer runtime.GC()
+	runtime.GC()
 
 	start := globalKey(repo, nil)
 	limit := globalKey(repo, []byte{0xff, 0xff, 0xff, 0xff})
@@ -678,13 +678,16 @@ outer:
 				if cont := fn(gf); !cont {
 					return
 				}
+
+				// This file is handled, no need to look further in the version list
+				continue outer
 			}
 		}
 	}
 }
 
 func ldbListRepos(db *leveldb.DB) []string {
-	defer runtime.GC()
+	runtime.GC()
 
 	start := []byte{keyTypeGlobal}
 	limit := []byte{keyTypeGlobal + 1}
@@ -714,7 +717,7 @@ func ldbListRepos(db *leveldb.DB) []string {
 }
 
 func ldbDropRepo(db *leveldb.DB, repo []byte) {
-	defer runtime.GC()
+	runtime.GC()
 
 	snap, err := db.GetSnapshot()
 	if err != nil {

internal/files/set.go

@@ -13,8 +13,8 @@ package files
 import (
 	"sync"
 
-	"github.com/syncthing/syncthing/lamport"
-	"github.com/syncthing/syncthing/protocol"
+	"github.com/syncthing/syncthing/internal/lamport"
+	"github.com/syncthing/syncthing/internal/protocol"
 	"github.com/syndtr/goleveldb/leveldb"
 )
 

internal/files/set_test.go

@@ -11,9 +11,9 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/syncthing/syncthing/files"
-	"github.com/syncthing/syncthing/lamport"
-	"github.com/syncthing/syncthing/protocol"
+	"github.com/syncthing/syncthing/internal/files"
+	"github.com/syncthing/syncthing/internal/lamport"
+	"github.com/syncthing/syncthing/internal/protocol"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/storage"
 )
@@ -782,6 +782,46 @@ func TestListDropRepo(t *testing.T) {
 	}
 }
 
+func TestGlobalNeedWithInvalid(t *testing.T) {
+	db, err := leveldb.Open(storage.NewMemStorage(), nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	s := files.NewSet("test1", db)
+
+	rem0 := fileList{
+		protocol.FileInfo{Name: "a", Version: 1002, Blocks: genBlocks(4)},
+		protocol.FileInfo{Name: "b", Version: 1002, Flags: protocol.FlagInvalid},
+		protocol.FileInfo{Name: "c", Version: 1002, Blocks: genBlocks(4)},
+	}
+	s.Replace(remoteNode0, rem0)
+
+	rem1 := fileList{
+		protocol.FileInfo{Name: "a", Version: 1002, Blocks: genBlocks(4)},
+		protocol.FileInfo{Name: "b", Version: 1002, Blocks: genBlocks(4)},
+		protocol.FileInfo{Name: "c", Version: 1002, Flags: protocol.FlagInvalid},
+	}
+	s.Replace(remoteNode1, rem1)
+
+	total := fileList{
+		// There's a valid copy of each file, so it should be merged
+		protocol.FileInfo{Name: "a", Version: 1002, Blocks: genBlocks(4)},
+		protocol.FileInfo{Name: "b", Version: 1002, Blocks: genBlocks(4)},
+		protocol.FileInfo{Name: "c", Version: 1002, Blocks: genBlocks(4)},
+	}
+
+	need := fileList(needList(s, protocol.LocalNodeID))
+	if fmt.Sprint(need) != fmt.Sprint(total) {
+		t.Errorf("Need incorrect;\n A: %v !=\n E: %v", need, total)
+	}
+
+	global := fileList(globalList(s))
+	if fmt.Sprint(global) != fmt.Sprint(total) {
+		t.Errorf("Global incorrect;\n A: %v !=\n E: %v", global, total)
+	}
+}
+
 func TestLongPath(t *testing.T) {
 	db, err := leveldb.Open(storage.NewMemStorage(), nil)
 	if err != nil {

internal/fnmatch/fnmatch.go

@@ -20,15 +20,22 @@ const (
 func Convert(pattern string, flags int) (*regexp.Regexp, error) {
 	any := "."
 
-	if runtime.GOOS == "windows" {
-		flags |= FNM_NOESCAPE
+	switch runtime.GOOS {
+	case "windows":
+		flags |= FNM_NOESCAPE | FNM_CASEFOLD
 		pattern = filepath.FromSlash(pattern)
 		if flags&FNM_PATHNAME != 0 {
 			any = "[^\\\\]"
 		}
-	} else if flags&FNM_PATHNAME != 0 {
-		any = "[^/]"
+	case "darwin":
+		flags |= FNM_CASEFOLD
+		fallthrough
+	default:
+		if flags&FNM_PATHNAME != 0 {
+			any = "[^/]"
+		}
 	}
+
 	if flags&FNM_NOESCAPE != 0 {
 		pattern = strings.Replace(pattern, "\\", "\\\\", -1)
 	} else {

internal/fnmatch/fnmatch_test.go

@@ -50,12 +50,17 @@ var testcases = []testcase{
 	{"**/foo.txt", "bar/baz/foo.txt", 0, true},
 	{"**/foo.txt", "bar/baz/foo.txt", FNM_PATHNAME, true},
 
-	{"foo.txt", "foo.TXT", 0, false},
 	{"foo.txt", "foo.TXT", FNM_CASEFOLD, true},
 }
 
 func TestMatch(t *testing.T) {
-	if runtime.GOOS != "windows" {
+	switch runtime.GOOS {
+	case "windows":
+		testcases = append(testcases, testcase{"foo.txt", "foo.TXT", 0, true})
+	case "darwin":
+		testcases = append(testcases, testcase{"foo.txt", "foo.TXT", 0, true})
+		fallthrough
+	default:
 		testcases = append(testcases, testcase{"f\\[ab\\]o.txt", "f[ab]o.txt", 0, true})
 		testcases = append(testcases, testcase{"foo\\.txt", "foo.txt", 0, true})
 		testcases = append(testcases, testcase{"foo\\*.txt", "foo*.txt", 0, true})

internal/ignore/ignore.go

@@ -13,7 +13,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/syncthing/syncthing/fnmatch"
+	"github.com/syncthing/syncthing/internal/fnmatch"
 )
 
 type Pattern struct {
@@ -122,6 +122,8 @@ func parseIgnoreFile(fd io.Reader, currentFile string, seen map[string]bool) (Pa
 		switch {
 		case line == "":
 			continue
+		case strings.HasPrefix(line, "//"):
+			continue
 		case strings.HasPrefix(line, "#"):
 			err = addPattern(line)
 		case strings.HasSuffix(line, "/**"):

internal/ignore/ignore_test.go

@@ -7,9 +7,10 @@ package ignore_test
 import (
 	"bytes"
 	"path/filepath"
+	"runtime"
 	"testing"
 
-	"github.com/syncthing/syncthing/ignore"
+	"github.com/syncthing/syncthing/internal/ignore"
 )
 
 func TestIgnore(t *testing.T) {
@@ -73,13 +74,13 @@ func TestExcludes(t *testing.T) {
 		{"ign2", true},
 		{"ibla2", true},
 		{"iex2", false},
-		{"ign1/ign", true},
-		{"ign1/ex", false},
-		{"ign1/iex2", false},
-		{"iex2/ign", false},
-		{"foo/bar/ign1", true},
-		{"foo/bar/ign2", true},
-		{"foo/bar/iex2", false},
+		{filepath.Join("ign1", "ign"), true},
+		{filepath.Join("ign1", "ex"), false},
+		{filepath.Join("ign1", "iex2"), false},
+		{filepath.Join("iex2", "ign"), false},
+		{filepath.Join("foo", "bar", "ign1"), true},
+		{filepath.Join("foo", "bar", "ign2"), true},
+		{filepath.Join("foo", "bar", "iex2"), false},
 	}
 
 	for _, tc := range tests {
@@ -106,3 +107,47 @@ func TestBadPatterns(t *testing.T) {
 		}
 	}
 }
+
+func TestCaseSensitivity(t *testing.T) {
+	ign, _ := ignore.Parse(bytes.NewBufferString("test"), ".stignore")
+
+	match := []string{"test"}
+	dontMatch := []string{"foo"}
+
+	switch runtime.GOOS {
+	case "darwin", "windows":
+		match = append(match, "TEST", "Test", "tESt")
+	default:
+		dontMatch = append(dontMatch, "TEST", "Test", "tESt")
+	}
+
+	for _, tc := range match {
+		if !ign.Match(tc) {
+			t.Errorf("Incorrect match for %q: should be matched", tc)
+		}
+	}
+
+	for _, tc := range dontMatch {
+		if ign.Match(tc) {
+			t.Errorf("Incorrect match for %q: should not be matched", tc)
+		}
+	}
+}
+
+func TestCommentsAndBlankLines(t *testing.T) {
+	stignore := `
+	// foo
+	//bar
+
+	//!baz
+	//#dex
+
+	//                        ips
+
+
+	`
+	pats, _ := ignore.Parse(bytes.NewBufferString(stignore), ".stignore")
+	if len(pats) > 0 {
+		t.Errorf("Expected no patterns")
+	}
+}