Docs & translation update

Clarify and correct handling of existing files/directories when pulling

Godeps/Godeps.json

@@ -9,6 +9,10 @@
 			"ImportPath": "github.com/bkaradzic/go-lz4",
 			"Rev": "4f7c2045dbd17b802370e2e6022200468abf02ba"
 		},
+		{
+			"ImportPath": "github.com/calmh/du",
+			"Rev": "3c0690cca16228b97741327b1b6781397afbdb24"
+		},
 		{
 			"ImportPath": "github.com/calmh/logger",
 			"Rev": "c96f6a1a8c7b6bf2f4860c667867d90174799eb2"

Godeps/_workspace/src/github.com/calmh/du/LICENSE

@@ -0,0 +1,24 @@
+This is free and unencumbered software released into the public domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a compiled
+binary, for any purpose, commercial or non-commercial, and by any
+means.
+
+In jurisdictions that recognize copyright laws, the author or authors
+of this software dedicate any and all copyright interest in the
+software to the public domain. We make this dedication for the benefit
+of the public at large and to the detriment of our heirs and
+successors. We intend this dedication to be an overt act of
+relinquishment in perpetuity of all present and future rights to this
+software under copyright law.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+For more information, please refer to <http://unlicense.org>

Godeps/_workspace/src/github.com/calmh/du/README.md

@@ -0,0 +1,14 @@
+du
+==
+
+Get total and available disk space on a given volume.
+
+Documentation
+-------------
+
+http://godoc.org/github.com/calmh/du
+
+License
+-------
+
+Public Domain

Godeps/_workspace/src/github.com/calmh/du/cmd/du/main.go

@@ -0,0 +1,21 @@
+package main
+
+import (
+	"fmt"
+	"log"
+	"os"
+
+	"github.com/calmh/du"
+)
+
+var KB = int64(1024)
+
+func main() {
+	usage, err := du.Get(os.Args[1])
+	if err != nil {
+		log.Fatal(err)
+	}
+	fmt.Println("Free:", usage.FreeBytes/(KB*KB), "MiB")
+	fmt.Println("Available:", usage.AvailBytes/(KB*KB), "MiB")
+	fmt.Println("Size:", usage.TotalBytes/(KB*KB), "MiB")
+}

Godeps/_workspace/src/github.com/calmh/du/diskusage.go

@@ -0,0 +1,8 @@
+package du
+
+// Usage holds information about total and available storage on a volume.
+type Usage struct {
+	TotalBytes int64 // Size of volume
+	FreeBytes  int64 // Unused size
+	AvailBytes int64 // Available to a non-privileged user
+}

Godeps/_workspace/src/github.com/calmh/du/diskusage_posix.go

@@ -0,0 +1,24 @@
+// +build !windows,!netbsd,!openbsd,!solaris
+
+package du
+
+import (
+	"path/filepath"
+	"syscall"
+)
+
+// Get returns the Usage of a given path, or an error if usage data is
+// unavailable.
+func Get(path string) (Usage, error) {
+	var stat syscall.Statfs_t
+	err := syscall.Statfs(filepath.Clean(path), &stat)
+	if err != nil {
+		return Usage{}, err
+	}
+	u := Usage{
+		FreeBytes:  int64(stat.Bfree) * int64(stat.Bsize),
+		TotalBytes: int64(stat.Blocks) * int64(stat.Bsize),
+		AvailBytes: int64(stat.Bavail) * int64(stat.Bsize),
+	}
+	return u, nil
+}

Godeps/_workspace/src/github.com/calmh/du/diskusage_unsupported.go

@@ -0,0 +1,13 @@
+// +build netbsd openbsd solaris
+
+package du
+
+import "errors"
+
+var ErrUnsupported = errors.New("unsupported platform")
+
+// Get returns the Usage of a given path, or an error if usage data is
+// unavailable.
+func Get(path string) (Usage, error) {
+	return Usage{}, ErrUnsupported
+}

Godeps/_workspace/src/github.com/calmh/du/diskusage_windows.go

@@ -0,0 +1,27 @@
+package du
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+// Get returns the Usage of a given path, or an error if usage data is
+// unavailable.
+func Get(path string) (Usage, error) {
+	h := syscall.MustLoadDLL("kernel32.dll")
+	c := h.MustFindProc("GetDiskFreeSpaceExW")
+
+	var u Usage
+
+	ret, _, err := c.Call(
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(path))),
+		uintptr(unsafe.Pointer(&u.FreeBytes)),
+		uintptr(unsafe.Pointer(&u.TotalBytes)),
+		uintptr(unsafe.Pointer(&u.AvailBytes)))
+
+	if ret == 0 {
+		return u, err
+	}
+
+	return u, nil
+}

build.go

@@ -36,6 +36,7 @@ var (
 	goos      string
 	noupgrade bool
 	version   string
+	goVersion float64
 	race      bool
 )
 
@@ -70,7 +71,7 @@ func main() {
 		log.Printf("Unknown goarch %q; proceed with caution!", goarch)
 	}
 
-	checkRequiredGoVersion()
+	goVersion, _ = checkRequiredGoVersion()
 
 	if flag.NArg() == 0 {
 		var tags []string
@@ -80,9 +81,9 @@ func main() {
 		install("./cmd/...", tags)
 
 		vet("./cmd/syncthing")
-		vet("./internal/...")
+		vet("./lib/...")
 		lint("./cmd/syncthing")
-		lint("./internal/...")
+		lint("./lib/...")
 		return
 	}
 
@@ -142,11 +143,11 @@ func main() {
 
 		case "vet":
 			vet("./cmd/syncthing")
-			vet("./internal/...")
+			vet("./lib/...")
 
 		case "lint":
 			lint("./cmd/syncthing")
-			lint("./internal/...")
+			lint("./lib/...")
 
 		default:
 			log.Fatalf("Unknown command %q", cmd)
@@ -154,7 +155,7 @@ func main() {
 	}
 }
 
-func checkRequiredGoVersion() {
+func checkRequiredGoVersion() (float64, bool) {
 	ver := run("go", "version")
 	re := regexp.MustCompile(`go version go(\d+\.\d+)`)
 	if m := re.FindSubmatch(ver); len(m) == 2 {
@@ -163,14 +164,16 @@ func checkRequiredGoVersion() {
 		f, err := strconv.ParseFloat(vs, 64)
 		if err != nil {
 			log.Printf("*** Couldn't parse Go version out of %q.\n*** This isn't known to work, proceed on your own risk.", vs)
-			return
+			return 0, false
 		}
 		if f < minGoVersion {
 			log.Fatalf("*** Go version %.01f is less than required %.01f.\n*** This is known not to work, not proceeding.", f, minGoVersion)
 		}
-	} else {
-		log.Printf("*** Unknown Go version %q.\n*** This isn't known to work, proceed on your own risk.", ver)
+		return f, true
 	}
+
+	log.Printf("*** Unknown Go version %q.\n*** This isn't known to work, proceed on your own risk.", ver)
+	return 0, false
 }
 
 func setup() {
@@ -178,6 +181,8 @@ func setup() {
 	runPrint("go", "get", "-v", "golang.org/x/tools/cmd/vet")
 	runPrint("go", "get", "-v", "golang.org/x/net/html")
 	runPrint("go", "get", "-v", "github.com/tools/godep")
+	runPrint("go", "get", "-v", "github.com/axw/gocov/gocov")
+	runPrint("go", "get", "-v", "github.com/AlekSi/gocov-xml")
 }
 
 func test(pkg string) {
@@ -402,16 +407,16 @@ func setBuildEnv() {
 
 func assets() {
 	setBuildEnv()
-	runPipe("internal/auto/gui.files.go", "go", "run", "cmd/genassets/main.go", "gui")
+	runPipe("lib/auto/gui.files.go", "go", "run", "script/genassets.go", "gui")
 }
 
 func xdr() {
-	runPrint("go", "generate", "./internal/discover", "./internal/db")
+	runPrint("go", "generate", "./lib/discover", "./lib/db")
 }
 
 func translate() {
 	os.Chdir("gui/assets/lang")
-	runPipe("lang-en-new.json", "go", "run", "../../../cmd/translate/main.go", "lang-en.json", "../../index.html")
+	runPipe("lang-en-new.json", "go", "run", "../../../script/translate.go", "lang-en.json", "../../")
 	os.Remove("lang-en.json")
 	err := os.Rename("lang-en-new.json", "lang-en.json")
 	if err != nil {
@@ -422,7 +427,7 @@ func translate() {
 
 func transifex() {
 	os.Chdir("gui/assets/lang")
-	runPrint("go", "run", "../../../cmd/transifexdl/main.go")
+	runPrint("go", "run", "../../../script/transifexdl.go")
 	os.Chdir("../../..")
 	assets()
 }
@@ -438,13 +443,18 @@ func clean() {
 }
 
 func ldflags() string {
-	var b bytes.Buffer
+	sep := ' '
+	if goVersion > 1.4 {
+		sep = '='
+	}
+
+	b := new(bytes.Buffer)
 	b.WriteString("-w")
-	b.WriteString(fmt.Sprintf(" -X main.Version %s", version))
-	b.WriteString(fmt.Sprintf(" -X main.BuildStamp %d", buildStamp()))
-	b.WriteString(fmt.Sprintf(" -X main.BuildUser %s", buildUser()))
-	b.WriteString(fmt.Sprintf(" -X main.BuildHost %s", buildHost()))
-	b.WriteString(fmt.Sprintf(" -X main.BuildEnv %s", buildEnvironment()))
+	fmt.Fprintf(b, " -X main.Version%c%s", sep, version)
+	fmt.Fprintf(b, " -X main.BuildStamp%c%d", sep, buildStamp())
+	fmt.Fprintf(b, " -X main.BuildUser%c%s", sep, buildUser())
+	fmt.Fprintf(b, " -X main.BuildHost%c%s", sep, buildHost())
+	fmt.Fprintf(b, " -X main.BuildEnv%c%s", sep, buildEnvironment())
 	return b.String()
 }
 
@@ -742,7 +752,9 @@ func vet(pkg string) {
 		if falseAlarmComposites.Match(line) || exitStatus.Match(line) {
 			continue
 		}
-		log.Printf("%s", line)
+		if len(line) > 0 {
+			log.Printf("%s", line)
+		}
 	}
 }
 
@@ -758,6 +770,8 @@ func lint(pkg string) {
 		if analCommentPolicy.Match(line) {
 			continue
 		}
-		log.Printf("%s", line)
+		if len(line) > 0 {
+			log.Printf("%s", line)
+		}
 	}
 }

build.sh

@@ -4,92 +4,97 @@ IFS=$'\n\t'
 
 STTRACE=${STTRACE:-}
 
+script() {
+	name="$1"
+	shift
+	go run "script/$name.go" "$@"
+}
+
+build() {
+	go run build.go "$@"
+}
+
 case "${1:-default}" in
 	default)
-		go run build.go
+		build
 		;;
 
 	clean)
-		go run build.go "$1"
-		;;
-
-	test)
-		ulimit -t 60 &>/dev/null || true
-		ulimit -d 512000 &>/dev/null || true
-		ulimit -m 512000 &>/dev/null || true
-		go run build.go test
-		;;
-
-	bench)
-		LOGGER_DISCARD=1 go run build.go bench | go run benchfilter.go
+		build "$@"
 		;;
 
 	tar)
-		go run build.go "$1"
+		build "$@"
 		;;
 
 	deps)
-		go run build.go "$1"
+		build "$@"
 		;;
 
 	assets)
-		go run build.go "$1"
+		build "$@"
 		;;
 
 	xdr)
-		go run build.go "$1"
+		build "$@"
 		;;
 
 	translate)
-		go run build.go "$1"
-		;;
-
-	prerelease)
-		go run build.go transifex
-		git add -A gui/assets/ internal/auto/
-		pushd man ; ./refresh.sh ; popd
-		git add -A man
-		echo
-		echo Changelog:
-		go run changelog.go
+		build "$@"
 		;;
 
 	deb)
-		go run build.go "$1"
-		;;
-
-	noupgrade)
-		go run build.go -no-upgrade tar
-		;;
-
-	all)
-		go run build.go -goos darwin -goarch amd64 tar
-		go run build.go -goos darwin -goarch 386 tar
-
-		go run build.go -goos dragonfly -goarch 386 tar
-		go run build.go -goos dragonfly -goarch amd64 tar
-
-		go run build.go -goos freebsd -goarch 386 tar
-		go run build.go -goos freebsd -goarch amd64 tar
-
-		go run build.go -goos linux -goarch 386 tar
-		go run build.go -goos linux -goarch amd64 tar
-		go run build.go -goos linux -goarch arm tar
-
-		go run build.go -goos netbsd -goarch 386 tar
-		go run build.go -goos netbsd -goarch amd64 tar
-
-		go run build.go -goos openbsd -goarch 386 tar
-		go run build.go -goos openbsd -goarch amd64 tar
-
-		go run build.go -goos solaris -goarch amd64 tar
-
-		go run build.go -goos windows -goarch 386 zip
-		go run build.go -goos windows -goarch amd64 zip
+		build "$@"
 		;;
 
 	setup)
-		echo "Don't worry, just build."
+		build "$@"
+		;;
+
+	test)
+		ulimit -t 600 &>/dev/null || true
+		ulimit -d 512000 &>/dev/null || true
+		ulimit -m 512000 &>/dev/null || true
+		LOGGER_DISCARD=1 build test
+		;;
+
+	bench)
+		LOGGER_DISCARD=1 build bench | script benchfilter
+		;;
+
+	prerelease)
+		build transifex
+		git add -A gui/assets/ lib/auto/
+		pushd man ; ./refresh.sh ; popd
+		git add -A man
+		;;
+
+	noupgrade)
+		build -no-upgrade tar
+		;;
+
+	all)
+		build -goos darwin -goarch amd64 tar
+
+		build -goos dragonfly -goarch amd64 tar
+
+		build -goos freebsd -goarch 386 tar
+		build -goos freebsd -goarch amd64 tar
+
+		build -goos linux -goarch 386 tar
+		build -goos linux -goarch amd64 tar
+		build -goos linux -goarch arm tar
+
+		build -goos netbsd -goarch 386 tar
+		build -goos netbsd -goarch amd64 tar
+
+		build -goos openbsd -goarch 386 tar
+		build -goos openbsd -goarch amd64 tar
+
+		build -goos solaris -goarch amd64 tar
+
+		build -goos windows -goarch 386 zip
+		build -goos windows -goarch amd64 zip
 		;;
 
 	test-cov)
@@ -97,9 +102,6 @@ case "${1:-default}" in
 		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
-
 		echo "mode: set" > coverage.out
 		fail=0
 
@@ -125,11 +127,12 @@ case "${1:-default}" in
 		;;
 
 	docker-all)
+		img=${DOCKERIMG:-syncthing/build:latest}
 		docker run --rm -h syncthing-builder -u $(id -u) -t \
 			-v $(pwd):/go/src/github.com/syncthing/syncthing \
 			-w /go/src/github.com/syncthing/syncthing \
 			-e "STTRACE=$STTRACE" \
-			syncthing/build:latest \
+			"$img" \
 			sh -c './build.sh clean \
 				&& ./build.sh test-cov \
 				&& ./build.sh bench \
@@ -137,11 +140,12 @@ case "${1:-default}" in
 		;;
 
 	docker-test)
+		img=${DOCKERIMG:-syncthing/build:latest}
 		docker run --rm -h syncthing-builder -u $(id -u) -t \
 			-v $(pwd):/go/src/github.com/syncthing/syncthing \
 			-w /go/src/github.com/syncthing/syncthing \
 			-e "STTRACE=$STTRACE" \
-			syncthing/build:latest \
+			"$img" \
 			sh -euxc './build.sh clean \
 				&& go run build.go -race \
 				&& export GOPATH=$(pwd)/Godeps/_workspace:$GOPATH \
@@ -151,21 +155,23 @@ case "${1:-default}" in
 		;;
 
 	docker-lint)
+		img=${DOCKERIMG:-syncthing/build:latest}
 		docker run --rm -h syncthing-builder -u $(id -u) -t \
 			-v $(pwd):/go/src/github.com/syncthing/syncthing \
 			-w /go/src/github.com/syncthing/syncthing \
 			-e "STTRACE=$STTRACE" \
-			syncthing/build:latest \
+			"$img" \
 			sh -euxc 'go run build.go lint'
 		;;
 
 
 	docker-vet)
+		img=${DOCKERIMG:-syncthing/build:latest}
 		docker run --rm -h syncthing-builder -u $(id -u) -t \
 			-v $(pwd):/go/src/github.com/syncthing/syncthing \
 			-w /go/src/github.com/syncthing/syncthing \
 			-e "STTRACE=$STTRACE" \
-			syncthing/build:latest \
+			"$img" \
 			sh -euxc 'go run build.go vet'
 		;;
 

check-contrib.sh

@@ -1,53 +0,0 @@
-#!/bin/bash
-
-missing-authors() {
-	for email in $(git log --format=%ae HEAD | sort | uniq) ; do
-		grep -q "$email" AUTHORS || echo $email
-	done
-}
-
-no-docs-typos() {
-	# Commits that are known to not change code
-	grep -v 63bd0136fb40a91efaa279cb4b4159d82e8e6904 |\
-	grep -v 4e2feb6fbc791bb8a2daf0ab8efb10775d66343e |\
-	grep -v f2459ef3319b2f060dbcdacd0c35a1788a94b8bd |\
-	grep -v b61f418bf2d1f7d5a9d7088a20a2a448e5e66801 |\
-	grep -v f0621207e3953711f9ab86d99724f1d0faac45b1 |\
-	grep -v f1120d7aa936c0658429edef0037792520b46334 |\
-	grep -v a9339d0627fff439879d157c75077f02c9fac61b |\
-	grep -v 254c63763a3ad42fd82259f1767db526cff94a14 |\
-	grep -v 4b76ec40c07078beaa2c5e250ed7d9bd6276a718 |\
-	grep -v ffc39dfbcb34eacc3ea12327a02b6e7741a2c207 |\
-	grep -v 32a76901a91ff0f663db6f0830e0aedec946e4d0 |\
-	grep -v af3288043a49bcc28f8ae3060852a09de552fe5f |\
-	grep -v 3626003f680bad3e63677982576d3a05421e88e9
-}
-
-print-missing-authors() {
-	for email in $(missing-authors) ; do
-		git log --author="$email" --format="%H %ae %s" | no-docs-typos
-	done
-}
-
-print-missing-copyright() {
-	find . -name \*.go | xargs egrep -L 'Copyright|automatically generated' | grep -v Godeps | grep -v internal/auto/
-}
-
-authors=$(print-missing-authors)
-if [[ ! -z $authors ]] ; then
-	echo '***'
-	echo Author emails not in AUTHORS:
-	echo $authors
-	echo '***'
-	exit 1
-fi
-
-copy=$(print-missing-copyright)
-if [[ ! -z $copy ]] ; then
-	echo ***
-	echo Files missing copyright notice:
-	echo $copy
-	echo ***
-	exit 1
-fi
-

cmd/stcompdirs/main.go

@@ -16,7 +16,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/syncthing/syncthing/internal/symlinks"
+	"github.com/syncthing/syncthing/lib/symlinks"
 )
 
 func main() {

cmd/stfileinfo/main.go

@@ -13,7 +13,7 @@ import (
 	"path/filepath"
 
 	"github.com/syncthing/protocol"
-	"github.com/syncthing/syncthing/internal/scanner"
+	"github.com/syncthing/syncthing/lib/scanner"
 )
 
 func main() {

cmd/stfinddevice/main.go

@@ -12,7 +12,7 @@ import (
 	"os"
 
 	"github.com/syncthing/protocol"
-	"github.com/syncthing/syncthing/internal/discover"
+	"github.com/syncthing/syncthing/lib/discover"
 )
 
 func main() {

cmd/stindex/main.go

@@ -14,7 +14,7 @@ import (
 	"os"
 
 	"github.com/syncthing/protocol"
-	"github.com/syncthing/syncthing/internal/db"
+	"github.com/syncthing/syncthing/lib/db"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/opt"
 )

cmd/syncthing/audit.go

@@ -10,7 +10,7 @@ import (
 	"encoding/json"
 	"io"
 
-	"github.com/syncthing/syncthing/internal/events"
+	"github.com/syncthing/syncthing/lib/events"
 )
 
 // The auditSvc subscribes to events and writes these in JSON format, one

cmd/syncthing/auditsvc_test.go

@@ -12,7 +12,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/syncthing/syncthing/internal/events"
+	"github.com/syncthing/syncthing/lib/events"
 )
 
 func TestAuditService(t *testing.T) {

cmd/syncthing/connections.go

@@ -15,9 +15,9 @@ import (
 	"time"
 
 	"github.com/syncthing/protocol"
-	"github.com/syncthing/syncthing/internal/config"
-	"github.com/syncthing/syncthing/internal/events"
-	"github.com/syncthing/syncthing/internal/model"
+	"github.com/syncthing/syncthing/lib/config"
+	"github.com/syncthing/syncthing/lib/events"
+	"github.com/syncthing/syncthing/lib/model"
 	"github.com/thejerf/suture"
 )
 

cmd/syncthing/gui.go

@@ -26,15 +26,15 @@ import (
 
 	"github.com/calmh/logger"
 	"github.com/syncthing/protocol"
-	"github.com/syncthing/syncthing/internal/auto"
-	"github.com/syncthing/syncthing/internal/config"
-	"github.com/syncthing/syncthing/internal/db"
-	"github.com/syncthing/syncthing/internal/discover"
-	"github.com/syncthing/syncthing/internal/events"
-	"github.com/syncthing/syncthing/internal/model"
-	"github.com/syncthing/syncthing/internal/osutil"
-	"github.com/syncthing/syncthing/internal/sync"
-	"github.com/syncthing/syncthing/internal/upgrade"
+	"github.com/syncthing/syncthing/lib/auto"
+	"github.com/syncthing/syncthing/lib/config"
+	"github.com/syncthing/syncthing/lib/db"
+	"github.com/syncthing/syncthing/lib/discover"
+	"github.com/syncthing/syncthing/lib/events"
+	"github.com/syncthing/syncthing/lib/model"
+	"github.com/syncthing/syncthing/lib/osutil"
+	"github.com/syncthing/syncthing/lib/sync"
+	"github.com/syncthing/syncthing/lib/upgrade"
 	"github.com/vitrun/qart/qr"
 	"golang.org/x/crypto/bcrypt"
 )

cmd/syncthing/gui_auth.go

@@ -14,8 +14,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/syncthing/syncthing/internal/config"
-	"github.com/syncthing/syncthing/internal/sync"
+	"github.com/syncthing/syncthing/lib/config"
+	"github.com/syncthing/syncthing/lib/sync"
 	"golang.org/x/crypto/bcrypt"
 )
 

cmd/syncthing/gui_csrf.go

@@ -13,8 +13,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/syncthing/syncthing/internal/osutil"
-	"github.com/syncthing/syncthing/internal/sync"
+	"github.com/syncthing/syncthing/lib/osutil"
+	"github.com/syncthing/syncthing/lib/sync"
 )
 
 var csrfTokens []string

cmd/syncthing/locations.go

@@ -13,7 +13,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/syncthing/syncthing/internal/osutil"
+	"github.com/syncthing/syncthing/lib/osutil"
 )
 
 type locationEnum string

cmd/syncthing/main.go

@@ -28,14 +28,14 @@ import (
 	"github.com/calmh/logger"
 	"github.com/juju/ratelimit"
 	"github.com/syncthing/protocol"
-	"github.com/syncthing/syncthing/internal/config"
-	"github.com/syncthing/syncthing/internal/db"
-	"github.com/syncthing/syncthing/internal/discover"
-	"github.com/syncthing/syncthing/internal/events"
-	"github.com/syncthing/syncthing/internal/model"
-	"github.com/syncthing/syncthing/internal/osutil"
-	"github.com/syncthing/syncthing/internal/symlinks"
-	"github.com/syncthing/syncthing/internal/upgrade"
+	"github.com/syncthing/syncthing/lib/config"
+	"github.com/syncthing/syncthing/lib/db"
+	"github.com/syncthing/syncthing/lib/discover"
+	"github.com/syncthing/syncthing/lib/events"
+	"github.com/syncthing/syncthing/lib/model"
+	"github.com/syncthing/syncthing/lib/osutil"
+	"github.com/syncthing/syncthing/lib/symlinks"
+	"github.com/syncthing/syncthing/lib/upgrade"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/errors"
 	"github.com/syndtr/goleveldb/leveldb/opt"
@@ -454,6 +454,11 @@ func syncthingMain() {
 		runtime.GOMAXPROCS(runtime.NumCPU())
 	}
 
+	// Attempt to increase the limit on number of open files to the maximum
+	// allowed, in case we have many peers. We don't really care enough to
+	// report the error if there is one.
+	osutil.MaximizeOpenFileLimit()
+
 	// Ensure that that we have a certificate and key.
 	cert, err := tls.LoadX509KeyPair(locations[locCertFile], locations[locKeyFile])
 	if err != nil {
@@ -837,6 +842,7 @@ func defaultConfig(myName string) config.Configuration {
 			ID:              "default",
 			RawPath:         locations[locDefFolder],
 			RescanIntervalS: 60,
+			MinDiskFreePct:  1,
 			Devices:         []config.FolderDeviceConfiguration{{DeviceID: myID}},
 		},
 	}

cmd/syncthing/main_test.go

@@ -11,9 +11,9 @@ import (
 	"testing"
 
 	"github.com/syncthing/protocol"
-	"github.com/syncthing/syncthing/internal/config"
-	"github.com/syncthing/syncthing/internal/db"
-	"github.com/syncthing/syncthing/internal/model"
+	"github.com/syncthing/syncthing/lib/config"
+	"github.com/syncthing/syncthing/lib/db"
+	"github.com/syncthing/syncthing/lib/model"
 
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/storage"

cmd/syncthing/monitor.go

@@ -17,8 +17,8 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/syncthing/syncthing/internal/osutil"
-	"github.com/syncthing/syncthing/internal/sync"
+	"github.com/syncthing/syncthing/lib/osutil"
+	"github.com/syncthing/syncthing/lib/sync"
 )
 
 var (

cmd/syncthing/summarysvc.go

@@ -9,9 +9,9 @@ package main
 import (
 	"time"
 
-	"github.com/syncthing/syncthing/internal/events"
-	"github.com/syncthing/syncthing/internal/model"
-	"github.com/syncthing/syncthing/internal/sync"
+	"github.com/syncthing/syncthing/lib/events"
+	"github.com/syncthing/syncthing/lib/model"
+	"github.com/syncthing/syncthing/lib/sync"
 	"github.com/thejerf/suture"
 )
 

cmd/syncthing/upnpsvc.go

@@ -10,8 +10,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/syncthing/syncthing/internal/config"
-	"github.com/syncthing/syncthing/internal/upnp"
+	"github.com/syncthing/syncthing/lib/config"
+	"github.com/syncthing/syncthing/lib/upnp"
 )
 
 // The UPnP service runs a loop for discovery of IGDs (Internet Gateway

cmd/syncthing/usage_report.go

@@ -17,8 +17,8 @@ import (
 	"runtime"
 	"time"
 
-	"github.com/syncthing/syncthing/internal/config"
-	"github.com/syncthing/syncthing/internal/model"
+	"github.com/syncthing/syncthing/lib/config"
+	"github.com/syncthing/syncthing/lib/model"
 	"github.com/thejerf/suture"
 )
 

cmd/syncthing/verbose.go

@@ -9,7 +9,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/syncthing/syncthing/internal/events"
+	"github.com/syncthing/syncthing/lib/events"
 )
 
 // The verbose logging service subscribes to events and prints these in

gui/assets/css/overrides.css

@@ -67,7 +67,7 @@ identicon {
     top: 1px;
 }
 
-.panel-heading .glyphicon {
+.panel-heading .fa, .modal-header .fa {
     margin-right: 10px;
 }
 

gui/assets/lang/lang-bg.json

@@ -184,6 +184,7 @@
     "The number of old versions to keep, per file.": "Броят стари версии, които да бъдат пазени за всеки файл.",
     "The number of versions must be a number and cannot be blank.": "Броят версии трябва да бъде число и не може да бъде празно.",
     "The path cannot be blank.": "Пътят неможе да бъде празен.",
+    "The rate limit must be a non-negative number (0: no limit)": "Ограничението на скорста трябва да бъде положително число (0: неограничено)",
     "The rescan interval must be a non-negative number of seconds.": "Интервала на сканиране трябва да бъде не отрицателно число в секунди.",
     "They are retried automatically and will be synced when the error is resolved.": "Ще бъдат спрени и автоматично синхронизирани, когато грешката бъде оправена.",
     "This is a major version upgrade.": "Това е нова основна версия.",

gui/assets/lang/lang-ca.json

@@ -184,6 +184,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 path cannot be blank.": "El camí no pot estar en blanc.",
+    "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
     "The rescan interval must be a non-negative number of seconds.": "El interval de re-escaneig ha der ser un nombre positiu de segons.",
     "They are retried automatically and will be synced when the error is resolved.": "They are retried automatically and will be synced when the error is resolved.",
     "This is a major version upgrade.": "Aquesta és una actualització de versió major.",

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

@@ -184,6 +184,7 @@
     "The number of old versions to keep, per file.": "El nombre de versions antigues per a guardar, per cada fitxer.",
     "The number of versions must be a number and cannot be blank.": "El nombre de versions deu ser un nombre i no pot estar buit.",
     "The path cannot be blank.": "La ruta no pot estar buida.",
+    "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
     "The rescan interval must be a non-negative number of seconds.": "L'interval de reescaneig deu ser un nombre positiu de segons.",
     "They are retried automatically and will be synced when the error is resolved.": "They are retried automatically and will be synced when the error is resolved.",
     "This is a major version upgrade.": "Aquesta és una actualització important de la versió.",

gui/assets/lang/lang-cs.json

@@ -93,7 +93,7 @@
     "Major Upgrade": "Důležitá aktualizace",
     "Maximum Age": "Maximální časový limit",
     "Metadata Only": "Pouze metadata",
-    "Minimum Free Disk Space": "Minimum Free Disk Space",
+    "Minimum Free Disk Space": "Minimální velikost volného místa na disku",
     "Move to top of queue": "Přesunout na začátek fronty",
     "Multi level wildcard (matches multiple directory levels)": "Víceúrovňový zástupný znak (shoda skrz více úrovní adresářů)",
     "Never": "Nikdy",
@@ -121,7 +121,7 @@
     "RAM Utilization": "Využití RAM",
     "Random": "Náhodně",
     "Release Notes": "Poznámky k vydání",
-    "Remove": "Remove",
+    "Remove": "Odstranit",
     "Rescan": "Opakovat skenování",
     "Rescan All": "Opakovat skenování všech",
     "Rescan Interval": "Interval opakování skenování",
@@ -178,12 +178,13 @@
     "The following items could not be synchronized.": "Následující položky nemohly být synchronizovány.",
     "The maximum age must be a number and cannot be blank.": "Nejvyšší stáří je třeba zadat v podobě čísla a nemůže být prázdné.",
     "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Maximální doba pro zachování verze (dny, zapsáním hodnoty 0 bude ponecháno navždy).",
-    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).",
+    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "Procentuální údaj minimální velikosti volného místa na disku musí být číslo mezi 0 až 100 (včetně).",
     "The number of days must be a number and cannot be blank.": "Počet dní musí být číslo a nesmí být prázdný.",
     "The number of days to keep files in the trash can. Zero means forever.": "Počet dní, po který budou soubory uchovány v koši. Nula znamená navždy.",
     "The number of old versions to keep, per file.": "Počet starších verzí k zachování pro každý soubor.",
     "The number of versions must be a number and cannot be blank.": "Počet verzí musí být číslo a nemůže být prázdné.",
     "The path cannot be blank.": "Cesta nesmí být prázdná.",
+    "The rate limit must be a non-negative number (0: no limit)": "Limit rychlosti musí být nezáporné číslo (0: bez limitu)",
     "The rescan interval must be a non-negative number of seconds.": "Interval opakování skenování musí být pozitivní číslo.",
     "They are retried automatically and will be synced when the error is resolved.": "Nové pokusy o synchronizaci budou probíhat automaticky a položky budou synchronizovány jakmile bude chyba odstraněna.",
     "This is a major version upgrade.": "Toto je důležitá aktualizace.",

gui/assets/lang/lang-de.json

@@ -93,7 +93,7 @@
     "Major Upgrade": "Hauptversionsupgrade",
     "Maximum Age": "Höchstalter",
     "Metadata Only": "Nur Metadaten",
-    "Minimum Free Disk Space": "Minimum Free Disk Space",
+    "Minimum Free Disk Space": "Minimal freier Fetsplattenspeicher",
     "Move to top of queue": "An den Anfang der Warteschlange setzen",
     "Multi level wildcard (matches multiple directory levels)": "Verschachteltes Maskenzeichen (wird für verschachtelte Verzeichnisse verwendet)",
     "Never": "Nie",
@@ -121,7 +121,7 @@
     "RAM Utilization": "RAM Auslastung",
     "Random": "Zufall",
     "Release Notes": "Veröffentlichungsnotizen",
-    "Remove": "Remove",
+    "Remove": "Entfernen",
     "Rescan": "Neu scannen",
     "Rescan All": "Alle neu scannen",
     "Rescan Interval": "Scanintervall",
@@ -178,12 +178,13 @@
     "The following items could not be synchronized.": "Die folgenden Dateien konnten nicht synchronisiert werden.",
     "The maximum age must be a number and cannot be blank.": "Das Höchstalter muss angegeben werden und eine Zahl sein.",
     "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Die längste Zeit, die alte Versionen vorgehalten werden (in Tagen, 0 bedeutet, alte Versionen für immer zu behalten).",
-    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).",
+    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "Der Prozentsatz des minimal freien Festplattenspeichers muss eine nichtnegative Zahl zwischen (inklusive) 0 und 100 sein. ",
     "The number of days must be a number and cannot be blank.": "Die Anzahl von Versionen muss eine Zahl und darf nicht leer sein.",
     "The number of days to keep files in the trash can. Zero means forever.": "Dauer in Tagen für welche die Dateien aufgehoben werden sollen. 0 bedeutet für immer.",
     "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 path cannot be blank.": "Der Pfad darf nicht leer sein.",
+    "The rate limit must be a non-negative number (0: no limit)": "Das Daterate-Limit muss eine nicht negative Anzahl sein (0: kein Limit)",
     "The rescan interval must be a non-negative number of seconds.": "Das Scanintervall muss eine nicht negative Anzahl von Sekunden sein.",
     "They are retried automatically and will be synced when the error is resolved.": "Sie werden automatisch heruntergeladen und werden synchronisiert, wenn der Fehler behoben wurde.",
     "This is a major version upgrade.": "Dies ist eine neue Hauptversion.",

gui/assets/lang/lang-el.json

@@ -184,6 +184,7 @@
     "The number of old versions to keep, per file.": "Πόσες παλιότερες εκδόσεις θα διατηρούνται, ανά αρχείο.",
     "The number of versions must be a number and cannot be blank.": "Ο αριθμός εκδόσεων πρέπει να είναι αριθμός και σίγουρα όχι κενό.",
     "The path cannot be blank.": "Το μονοπάτι δεν μπορεί να είναι κενό.",
+    "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
     "The rescan interval must be a non-negative number of seconds.": "Ο χρόνος επανελέγχου για αλλαγές είναι σε δευτερόλεπτα (δηλ. θετικός αριθμός).",
     "They are retried automatically and will be synced when the error is resolved.": "Όταν επιλυθεί το σφάλμα θα κατεβούν και θα συχρονιστούν αυτόματα.",
     "This is a major version upgrade.": "Αυτή είναι μιας σημαντική αναβάθμιση.",

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

@@ -184,6 +184,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 path cannot be blank.": "The path cannot be blank.",
+    "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
     "The rescan interval must be a non-negative number of seconds.": "The rescan interval must be a non-negative number of seconds.",
     "They are retried automatically and will be synced when the error is resolved.": "They are retried automatically and will be synced when the error is resolved.",
     "This is a major version upgrade.": "This is a major version upgrade.",

gui/assets/lang/lang-en.json

@@ -50,7 +50,6 @@
    "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 comma separated addresses (\"ip:port\", \"host:port\") or \"dynamic\" to perform automatic discovery of the address.": "Enter comma separated addresses (\"ip:port\", \"host:port\") or \"dynamic\" to perform automatic discovery of the address.",
    "Enter ignore patterns, one per line.": "Enter ignore patterns, one per line.",
    "Error": "Error",
    "External File Versioning": "External File Versioning",
@@ -94,6 +93,7 @@
    "Major Upgrade": "Major Upgrade",
    "Maximum Age": "Maximum Age",
    "Metadata Only": "Metadata Only",
+   "Minimum Free Disk Space": "Minimum Free Disk Space",
    "Move to top of queue": "Move to top of queue",
    "Multi level wildcard (matches multiple directory levels)": "Multi level wildcard (matches multiple directory levels)",
    "Never": "Never",
@@ -121,6 +121,7 @@
    "RAM Utilization": "RAM Utilization",
    "Random": "Random",
    "Release Notes": "Release Notes",
+   "Remove": "Remove",
    "Rescan": "Rescan",
    "Rescan All": "Rescan All",
    "Rescan Interval": "Rescan Interval",
@@ -171,18 +172,19 @@
    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "The first command line parameter is the folder path and the second parameter is the relative path in the folder.",
    "The folder ID cannot be blank.": "The folder ID cannot be blank.",
    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.",
-   "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscore (_) characters only.": "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscore (_) characters only.",
    "The folder ID must be unique.": "The folder ID must be unique.",
    "The folder path cannot be blank.": "The folder path cannot be blank.",
    "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.",
    "The following items could not be synchronized.": "The following items could not be synchronized.",
    "The maximum age must be a number and cannot be blank.": "The maximum age must be a number and cannot be blank.",
    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "The maximum time to keep a version (in days, set to 0 to keep versions forever).",
+   "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).",
    "The number of days must be a number and cannot be blank.": "The number of days must be a number and cannot be blank.",
    "The number of days to keep files in the trash can. Zero means forever.": "The number of days to keep files in the trash can. Zero means forever.",
    "The number of old versions to keep, per file.": "The number of old versions to keep, per file.",
    "The number of versions must be a number and cannot be blank.": "The number of versions must be a number and cannot be blank.",
    "The path cannot be blank.": "The path cannot be blank.",
+   "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
    "The rescan interval must be a non-negative number of seconds.": "The rescan interval must be a non-negative number of seconds.",
    "They are retried automatically and will be synced when the error is resolved.": "They are retried automatically and will be synced when the error is resolved.",
    "This is a major version upgrade.": "This is a major version upgrade.",

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

@@ -184,6 +184,7 @@
     "The number of old versions to keep, per file.": "El número de versiones a antiguas a mantener para cada fichero.",
     "The number of versions must be a number and cannot be blank.": "El número de versiones debe ser un número y no puede estar vacío.",
     "The path cannot be blank.": "La ruta no puede estar vacía.",
+    "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
     "The rescan interval must be a non-negative number of seconds.": "El intervalo de actualización debe ser un número positivo de segundos.",
     "They are retried automatically and will be synced when the error is resolved.": "They are retried automatically and will be synced when the error is resolved.",
     "This is a major version upgrade.": "Hay una actualización importante.",

gui/assets/lang/lang-es.json

@@ -184,6 +184,7 @@
     "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 path cannot be blank.": "La ruta no puede estar vacía.",
+    "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
     "The rescan interval must be a non-negative number of seconds.": "El intervalo de reescaneo debe ser un número no negativo de segundos.",
     "They are retried automatically and will be synced when the error is resolved.": "They are retried automatically and will be synced when the error is resolved.",
     "This is a major version upgrade.": "Esta es una actualización de version mayor.",

gui/assets/lang/lang-fi.json

@@ -184,6 +184,7 @@
     "The number of old versions to keep, per file.": "Säilytettävien vanhojen versioiden määrä tiedostoa kohden.",
     "The number of versions must be a number and cannot be blank.": "Versioiden määrän rulee olla numero, eikä se voi olla tyhjä.",
     "The path cannot be blank.": "Polku ei voi olla tyhjä.",
+    "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
     "The rescan interval must be a non-negative number of seconds.": "Uudelleenskannauksen aikavälin tulee olla ei-negatiivinen numero sekunteja.",
     "They are retried automatically and will be synced when the error is resolved.": "They are retried automatically and will be synced when the error is resolved.",
     "This is a major version upgrade.": "This is a major version upgrade.",

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

@@ -0,0 +1,213 @@
+{
+    "A negative number of days doesn't make sense.": "Un nombre négatif de jours n'a pas de sens.",
+    "A new major version may not be compatible with previous versions.": "Une nouvelle version majeure peut présenter des incompatibilités avec les versions antérieures.",
+    "API Key": "Clé API",
+    "About": "À propos",
+    "Actions": "Actions",
+    "Add": "Ajouter",
+    "Add Device": "Ajouter un périphérique",
+    "Add Folder": "Ajouter un répertoire",
+    "Add new folder?": "Ajouter un nouveau dossier ?",
+    "Address": "Adresse",
+    "Addresses": "Adresses",
+    "Advanced": "Avancé",
+    "Advanced Configuration": "Configuration avancée",
+    "All Data": "Toutes les données",
+    "Allow Anonymous Usage Reporting?": "Autoriser le rapport anonyme de statistiques d'utilisation ?",
+    "Alphabetic": "Alphabétique",
+    "An external command handles the versioning. It has to remove the file from the synced folder.": "Une commande externe gère les versions de fichiers. Elle supprime les fichiers dans le dossier synchronisé.",
+    "Anonymous Usage Reporting": "Rapport anonyme de statistiques d'utilisation",
+    "Any devices configured on an introducer device will be added to this device as well.": "Toute machine ajoutée depuis une machine introductrice sera aussi ajoutée sur cette machine.",
+    "Automatic upgrades": "Mises à jour automatiques",
+    "Be careful!": "Faites attention !",
+    "Bugs": "Bugs",
+    "CPU Utilization": "Utilisation du CPU",
+    "Changelog": "Historique des changements",
+    "Clean out after": "Nettoyer après",
+    "Close": "Fermer",
+    "Command": "Commande",
+    "Comment, when used at the start of a line": "Commentaire lorsque utilisé en début de ligne",
+    "Compression": "Compression",
+    "Connection Error": "Erreur de connexion",
+    "Copied from elsewhere": "Copié d'ailleurs",
+    "Copied from original": "Copié depuis l'original",
+    "Copyright © 2015 the following Contributors:": "Copyright © 2015 Les contributeurs suivants:",
+    "Delete": "Supprimer",
+    "Deleted": "Supprimé",
+    "Device ID": "ID du périphérique",
+    "Device Identification": "Identification de l'appareil",
+    "Device Name": "Nom du périphérique",
+    "Device {%device%} ({%address%}) wants to connect. Add new device?": "L'appareil {{device}} ({{address}}) veut se connecter. Voulez-vous ajouter cette appareil ?",
+    "Devices": "Appareil",
+    "Disconnected": "Déconnecté",
+    "Documentation": "Documentation",
+    "Download Rate": "Débit de réception",
+    "Downloaded": "Téléchargé",
+    "Downloading": "En cours de téléchargement",
+    "Edit": "Éditer",
+    "Edit Device": "Éditer le périphérique",
+    "Edit Folder": "Éditer le répertoire",
+    "Editing": "Édition",
+    "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.": "Entrer les masques de filtrage, un par ligne.",
+    "Error": "Erreur",
+    "External File Versioning": "Gestion externe des versions de fichiers",
+    "Failed Items": "Éléments en échec",
+    "File Pull Order": "Ordre de récupération de fichier",
+    "File Versioning": "Versions de fichier",
+    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Les bits de permission de fichier sont ignorés lors de la recherche de changements. Utilisé sur les systèmes de fichiers FAT.",
+    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Les fichiers sont déplacés vers le dossier .stversions quand ils sont remplacés ou effacés par Syncthing.",
+    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Les fichiers sont déplacés, avec horodatage, dans le dossier .stversions quand ils sont remplacés ou supprimés par Syncthing.",
+    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Les fichiers sont protégés des changements réalisés sur les autres appareils, mais les changements réalisés sur cet appareil seront transférés aux autres appareils.",
+    "Folder": "Dossier",
+    "Folder ID": "ID du répertoire",
+    "Folder Master": "Répertoire maître",
+    "Folder Path": "Chemin du répertoire",
+    "Folders": "Dossiers",
+    "GUI": "GUI",
+    "GUI Authentication Password": "Mot de passe d'authentification GUI",
+    "GUI Authentication User": "Utilisateur autorisé GUI",
+    "GUI Listen Addresses": "Adresse du GUI",
+    "Generate": "Générer",
+    "Global Discovery": "Recherche globale",
+    "Global Discovery Server": "Serveur global de recherche",
+    "Global State": "État global",
+    "Help": "Aide",
+    "Home page": "Page d'accueil",
+    "Ignore": "Ignorer",
+    "Ignore Patterns": "Modèles à éviter",
+    "Ignore Permissions": "Ignorer les permissions",
+    "Incoming Rate Limit (KiB/s)": "Limite du débit entrant (KiB/s)",
+    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Une configuration incorrecte peut créer des dommages dans vos dossiers et mettre hors-service Syncthing",
+    "Introducer": "Initiateur",
+    "Inversion of the given condition (i.e. do not exclude)": "Inverser la condition donnée (i.e. ne pas exclure)",
+    "Keep Versions": "Conserver les versions",
+    "Largest First": "Les plus volumineux en premier",
+    "Last File Received": "Dernier fichier reçu",
+    "Last seen": "Dernière apparition",
+    "Later": "Plus tard",
+    "Local Discovery": "Recherche locale",
+    "Local State": "État local",
+    "Local State (Total)": "État local (Total)",
+    "Major Upgrade": "Mise à jour majeure",
+    "Maximum Age": "Ancienneté maximum",
+    "Metadata Only": "Métadonnées uniquement",
+    "Minimum Free Disk Space": "Espace disque libre minimum",
+    "Move to top of queue": "Déplacer en haut de la file",
+    "Multi level wildcard (matches multiple directory levels)": "Astérisque à plusieurs niveaux (correspond aux répertoires et sous-répertoires)",
+    "Never": "Jamais",
+    "New Device": "Nouvel appareil",
+    "New Folder": "Nouveau dossier",
+    "Newest First": "Les plus récents en premier",
+    "No": "Non",
+    "No File Versioning": "Pas de version de fichier",
+    "Notice": "Notification",
+    "OK": "OK",
+    "Off": "Éteint",
+    "Oldest First": "Les plus anciens en premier",
+    "Options": "Options",
+    "Out of Sync": "Désynchronisé",
+    "Out of Sync Items": "Objets non synchronisés",
+    "Outgoing Rate Limit (KiB/s)": "Limite du débit sortant (KiB/s)",
+    "Override Changes": "Écraser les changements",
+    "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Le chemin du dossier sur l'ordinateur local sera créé si il n'existe pas. Le caractère tilde (~) peut être utilisé comme raccourci vers",
+    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Chemin où les versions doivent être conservées (laisser vide pour le chemin par défaut de .stversions dans le répertoire)",
+    "Please consult the release notes before performing a major upgrade.": "Veuillez consulter les notes de version avant de réaliser une mise à jour majeure.",
+    "Please wait": "Merci de patienter",
+    "Preview": "Aperçu",
+    "Preview Usage Report": "Aperçu du rapport de statistiques d'utilisation",
+    "Quick guide to supported patterns": "Guide rapide des masques supportés",
+    "RAM Utilization": "Utilisation de la RAM",
+    "Random": "Aléatoire",
+    "Release Notes": "Notes de version",
+    "Remove": "Enlever",
+    "Rescan": "Rescanner",
+    "Rescan All": "Réanalyser tout",
+    "Rescan Interval": "Intervalle de scan",
+    "Restart": "Redémarrer",
+    "Restart Needed": "Redémarrage nécessaire",
+    "Restarting": "Redémarrage",
+    "Reused": "Réutilisé",
+    "Save": "Sauver",
+    "Scanning": "En cours de scan",
+    "Select the devices to share this folder with.": "Sélectionner les appareils avec qui partager ce dossier.",
+    "Select the folders to share with this device.": "Sélectionner les dossiers à partager avec cet appareil.",
+    "Settings": "Configuration",
+    "Share": "Partager",
+    "Share Folder": "Partager le dossier",
+    "Share Folders With Device": "Partager des dossiers avec des appareils",
+    "Share With Devices": "Partage avec des appareils",
+    "Share this folder?": "Voulez-vous partager ce dossier ?",
+    "Shared With": "Partagé avec",
+    "Short identifier for the folder. Must be the same on all cluster devices.": "Identifiant court du dossier. Il doit être le même sur l'ensemble des appareils du groupe.",
+    "Show ID": "Montrer l'ID",
+    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Affiché à la place de l'ID de l'appareil dans le groupe. Sera proposé aux autres appareils comme nom optionnel par défaut.",
+    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Affiché à la place de l'ID de l'appareil dans le groupe. Si laissé vide, il sera mis à jour par le nom proposé par l'appareil distant.",
+    "Shutdown": "Éteindre",
+    "Shutdown Complete": "Extinction terminée",
+    "Simple File Versioning": "Suivi simple des versions de fichier",
+    "Single level wildcard (matches within a directory only)": "Astérisque à un seul niveau (correspond uniquement à l’intérieur du dossier)",
+    "Smallest First": "Les plus petits en premier",
+    "Source Code": "Code source",
+    "Staggered File Versioning": "Versions échelonnées de fichier",
+    "Start Browser": "Démarrer le navigateur web",
+    "Statistics": "Statistiques",
+    "Stopped": "Arrêté",
+    "Support": "Aide",
+    "Sync Protocol Listen Addresses": "Adresse d'écoute du protocole de synchronisation",
+    "Syncing": "En cours de synchronisation",
+    "Syncthing has been shut down.": "Syncthing a été éteint.",
+    "Syncthing includes the following software or portions thereof:": "Syncthing intègre les logiciels suivants (ou des éléments provenant de ces logiciels) :",
+    "Syncthing is restarting.": "Syncthing est cours de redémarrage.",
+    "Syncthing is upgrading.": "Syncthing est cours de mise à jour.",
+    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing semble être éteint, ou il y a un problème avec votre connexion Internet. Nouvelle tentative ...",
+    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing semble avoir un problème pour traiter votre demande. S'il vous plait, rafraichissez la page ou redémarrer Syncthing si le problème persiste.",
+    "The aggregated statistics are publicly available at {%url%}.": "Les statistiques agrégées sont disponibles publiquement à l'adresse {{url}}.",
+    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "La configuration a été enregistrée mais pas activée. Syncthing doit redémarrer afin d'activer la nouvelle configuration.",
+    "The device ID cannot be blank.": "L'ID de l'appareil ne peut être vide.",
+    "The device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "L'ID de l'appareil à entrer peut être trouvé dans le menu \"Éditer > Montrer l'ID\" des autres appareils. Les espaces et les tirets sont optionnels (ils seront ignorés).",
+    "The encrypted usage report is sent daily. It is used to track common platforms, folder sizes and app versions. If the reported data set is changed you will be prompted with this dialog again.": "Le rapport d'utilisation chiffré est envoyé quotidiennement. Il sert à répertorier les plateformes utilisées, la taille des dossiers et les versions de l'application. Si les données rapportées sont modifiées cette boite de dialogue vous redemandera votre confirmation.",
+    "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.": "L'ID de l'appareil inséré ne semble pas être valide. Il devrait ressembler à une chaîne de 52 ou 56 caractères comprenant des lettres, des chiffres et potentiellement des espaces et des traits d'union.",
+    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "Le premier paramètre de ligne de commande est le chemin du dossier, et le second est le chemin relatif dans le dossier.",
+    "The folder ID cannot be blank.": "L'identifiant (ID) du dossier ne peut être vide.",
+    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "L'ID du dossier doit être un identifiant court (64 caractères ou moins) comprenant uniquement des lettres, chiffre, points (.), traits d'union (-) et tirets bas (_).",
+    "The folder ID must be unique.": "L'ID du répertoire doit être unique.",
+    "The folder path cannot be blank.": "Le chemin du répertoire ne peut pas être vide.",
+    "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "Les intervalles suivant sont utilisés: la première heure une version est conservée chaque 30 secondes, le premier jour une version est conservée chaque heure, les premiers 30 jours une version est conservée chaque jour, jusqu'à la limite d'âge maximum une version est conservée chaque semaine.",
+    "The following items could not be synchronized.": "Les éléments suivants ne peuvent pas être synchronisés.",
+    "The maximum age must be a number and cannot be blank.": "L'âge maximum doit être un nombre et ne peut être vide.",
+    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Le temps maximum de conservation d'une version (en jours, mettre à 0 pour conserver les versions pour toujours)",
+    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "Le pourcentage d'espace disque libre doit être un nombre positif compris entre 0 et 100 (inclus).",
+    "The number of days must be a number and cannot be blank.": "Le nombre de jours doit être numérique et ne peut pas être vide.",
+    "The number of days to keep files in the trash can. Zero means forever.": "Le nombre de jours de conservation des fichiers dans la poubelle. Zéro signifie toujours.",
+    "The number of old versions to keep, per file.": "Le nombre d'anciennes versions à garder, par fichier.",
+    "The number of versions must be a number and cannot be blank.": "Le nombre de versions doit être numérique, et ne peut pas être vide.",
+    "The path cannot be blank.": "Le chemin ne peut pas être vide.",
+    "The rate limit must be a non-negative number (0: no limit)": "La limite de débit ne doit pas être négative (0: Aucune limite)",
+    "The rescan interval must be a non-negative number of seconds.": "L'intervalle d'analyse ne doit pas être un nombre négatif de secondes.",
+    "They are retried automatically and will be synced when the error is resolved.": "Ils seront réessayés automatiquement et synchronisés quand l'erreur sera résolue.",
+    "This is a major version upgrade.": "Ceci est une mise à jour majeure.",
+    "Trash Can File Versioning": "Gestion des versions de fichier style poubelle.",
+    "Unknown": "Inconnu",
+    "Unshared": "Non partagé",
+    "Unused": "Non utilisé",
+    "Up to Date": "Synchronisé",
+    "Updated": "Mis à jour",
+    "Upgrade": "Mettre à jour",
+    "Upgrade To {%version%}": "Mettre à jour vers {{version}}",
+    "Upgrading": "Mise à jour de Syncthing",
+    "Upload Rate": "Débit d'envoi",
+    "Uptime": "Durée de fonctionnement",
+    "Use HTTPS for GUI": "Utiliser l'HTTPS pour le GUI",
+    "Version": "Version",
+    "Versions Path": "Emplacement des versions",
+    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Les versions seront supprimées automatiquement, si elles dépassent la durée maximum de conservation, ou si leur nombre est supérieur à la valeur autorisée dans l'intervalle.",
+    "When adding a new device, keep in mind that this device must be added on the other side too.": "Lorsqu'un appareil est ajouté, gardez à l'esprit que cet appareil doit aussi être ajouté de l'autre coté.",
+    "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Lorsqu'un nouveau répertoire est ajouté, gardez à l'esprit que son ID est utilisé pour lier les répertoires à travers les appareils. Les ID 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": "documentation complète",
+    "items": "éléments",
+    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} veut partager le dossier \"{{folder}}\"."
+}

gui/assets/lang/lang-fr.json

@@ -26,7 +26,7 @@
     "Clean out after": "Nettoyer après",
     "Close": "Fermer",
     "Command": "Commande",
-    "Comment, when used at the start of a line": "Commentaire, lorsque utilisé en début de ligne",
+    "Comment, when used at the start of a line": "Commentaire lorsque utilisé en début de ligne",
     "Compression": "Compression",
     "Connection Error": "Erreur de connexion",
     "Copied from elsewhere": "Copié d'ailleurs",
@@ -54,12 +54,12 @@
     "Error": "Erreur",
     "External File Versioning": "Gestion externe des versions de fichiers",
     "Failed Items": "Éléments en échec",
-    "File Pull Order": "Ordre d'envoi de fichier",
+    "File Pull Order": "Ordre de récupération de fichier",
     "File Versioning": "Versions de fichier",
     "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Les bits de permission de fichier sont ignorés lors de la recherche de changements. Utilisé sur les systèmes de fichiers FAT.",
     "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Les fichiers sont déplacés vers le dossier .stversions quand ils sont remplacés ou effacés par Syncthing.",
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Les fichiers sont déplacés, avec horodatage, dans le dossier .stversions quand ils sont remplacés ou supprimés par Syncthing.",
-    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Les fichiers sont protégés des changements réalisés sur les autres appareils, mais les changements réalisés sur cet appareil seront transférés au reste du groupe.",
+    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Les fichiers sont protégés des changements réalisés sur les autres appareils, mais les changements réalisés sur cet appareil seront transférés aux autres appareils.",
     "Folder": "Dossier",
     "Folder ID": "ID du répertoire",
     "Folder Master": "Répertoire maître",
@@ -79,7 +79,7 @@
     "Ignore Patterns": "Modèles à éviter",
     "Ignore Permissions": "Ignorer les permissions",
     "Incoming Rate Limit (KiB/s)": "Limite du débit entrant (KiB/s)",
-    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Une configuration incorrecte peut créer des dommages dans vos dossier et mettre hors-service Syncthing",
+    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Une configuration incorrecte peut créer des dommages dans vos dossiers et mettre hors-service Syncthing",
     "Introducer": "Initiateur",
     "Inversion of the given condition (i.e. do not exclude)": "Inverser la condition donnée (i.e. ne pas exclure)",
     "Keep Versions": "Conserver les versions",
@@ -89,11 +89,11 @@
     "Later": "Plus tard",
     "Local Discovery": "Recherche locale",
     "Local State": "État local",
-    "Local State (Total)": "Etat local (Total)",
+    "Local State (Total)": "État local (Total)",
     "Major Upgrade": "Mise à jour majeure",
     "Maximum Age": "Ancienneté maximum",
     "Metadata Only": "Métadonnées uniquement",
-    "Minimum Free Disk Space": "Minimum Free Disk Space",
+    "Minimum Free Disk Space": "Espace disque libre minimum",
     "Move to top of queue": "Déplacer en haut de la file",
     "Multi level wildcard (matches multiple directory levels)": "Astérisque à plusieurs niveaux (correspond aux répertoires et sous-répertoires)",
     "Never": "Jamais",
@@ -121,7 +121,7 @@
     "RAM Utilization": "Utilisation de la RAM",
     "Random": "Aléatoire",
     "Release Notes": "Notes de version",
-    "Remove": "Remove",
+    "Remove": "Enlever",
     "Rescan": "Rescanner",
     "Rescan All": "Réanalyser tout",
     "Rescan Interval": "Intervalle de scan",
@@ -131,7 +131,7 @@
     "Reused": "Réutilisé",
     "Save": "Sauver",
     "Scanning": "En cours de scan",
-    "Select the devices to share this folder with.": "Sélectionner les appareils avec qui partager ce répertoire.",
+    "Select the devices to share this folder with.": "Sélectionner les appareils avec qui partager ce dossier.",
     "Select the folders to share with this device.": "Sélectionner les dossiers à partager avec cet appareil.",
     "Settings": "Configuration",
     "Share": "Partager",
@@ -143,7 +143,7 @@
     "Short identifier for the folder. Must be the same on all cluster devices.": "Identifiant court du dossier. Il doit être le même sur l'ensemble des appareils du groupe.",
     "Show ID": "Montrer l'ID",
     "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Affiché à la place de l'ID de l'appareil dans le groupe. Sera proposé aux autres appareils comme nom optionnel par défaut.",
-    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Affiché à la place de l'ID de l'appareil dans le groupe. Si laissé vide, il sera mis à jour par le nom proposé par l'appareil distante.",
+    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Affiché à la place de l'ID de l'appareil dans le groupe. Si laissé vide, il sera mis à jour par le nom proposé par l'appareil distant.",
     "Shutdown": "Éteindre",
     "Shutdown Complete": "Extinction terminée",
     "Simple File Versioning": "Suivi simple des versions de fichier",
@@ -162,12 +162,12 @@
     "Syncthing is restarting.": "Syncthing est cours de redémarrage.",
     "Syncthing is upgrading.": "Syncthing est cours de mise à jour.",
     "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing semble être éteint, ou il y a un problème avec votre connexion Internet. Nouvelle tentative ...",
-    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing semble avoir un problème pour traiter votre demande. S'il vous plaît, rafraîchissez la page ou redémarrer Syncthing si le problème persiste.",
+    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing semble avoir un problème pour traiter votre demande. S'il vous plait, rafraichissez la page ou redémarrer Syncthing si le problème persiste.",
     "The aggregated statistics are publicly available at {%url%}.": "Les statistiques agrégées sont disponibles publiquement à l'adresse {{url}}.",
     "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "La configuration a été enregistrée mais pas activée. Syncthing doit redémarrer afin d'activer la nouvelle configuration.",
     "The device ID cannot be blank.": "L'ID de l'appareil ne peut être vide.",
     "The device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "L'ID de l'appareil à entrer peut être trouvé dans le menu \"Éditer > Montrer l'ID\" des autres appareils. Les espaces et les tirets sont optionnels (ils seront ignorés).",
-    "The encrypted usage report is sent daily. It is used to track common platforms, folder sizes and app versions. If the reported data set is changed you will be prompted with this dialog again.": "Le rapport d'utilisation chiffré est envoyé quotidiennement. Il sert à répertorier les plateformes utilisées, la taille des répertoires et les versions de l'application. Si les données rapportées sont modifiées cette boite de dialogue vous redemandera votre confirmation.",
+    "The encrypted usage report is sent daily. It is used to track common platforms, folder sizes and app versions. If the reported data set is changed you will be prompted with this dialog again.": "Le rapport d'utilisation chiffré est envoyé quotidiennement. Il sert à répertorier les plateformes utilisées, la taille des dossiers et les versions de l'application. Si les données rapportées sont modifiées cette boite de dialogue vous redemandera votre confirmation.",
     "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.": "L'ID de l'appareil inséré ne semble pas être valide. Il devrait ressembler à une chaîne de 52 ou 56 caractères comprenant des lettres, des chiffres et potentiellement des espaces et des traits d'union.",
     "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "Le premier paramètre de ligne de commande est le chemin du dossier, et le second est le chemin relatif dans le dossier.",
     "The folder ID cannot be blank.": "L'identifiant (ID) du dossier ne peut être vide.",
@@ -178,22 +178,23 @@
     "The following items could not be synchronized.": "Les éléments suivants ne peuvent pas être synchronisés.",
     "The maximum age must be a number and cannot be blank.": "L'âge maximum doit être un nombre et ne peut être vide.",
     "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Le temps maximum de conservation d'une version (en jours, mettre à 0 pour conserver les versions pour toujours)",
-    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).",
+    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "Le pourcentage d'espace disque libre doit être un nombre positif compris entre 0 et 100 (inclus).",
     "The number of days must be a number and cannot be blank.": "Le nombre de jours doit être numérique et ne peut pas être vide.",
     "The number of days to keep files in the trash can. Zero means forever.": "Le nombre de jours de conservation des fichiers dans la poubelle. Zéro signifie toujours.",
     "The number of old versions to keep, per file.": "Le nombre d'anciennes versions à garder, par fichier.",
     "The number of versions must be a number and cannot be blank.": "Le nombre de versions doit être numérique, et ne peut pas être vide.",
     "The path cannot be blank.": "Le chemin ne peut pas être vide.",
+    "The rate limit must be a non-negative number (0: no limit)": "La limite de débit ne doit pas être négative (0: Aucune limite)",
     "The rescan interval must be a non-negative number of seconds.": "L'intervalle d'analyse ne doit pas être un nombre négatif de secondes.",
     "They are retried automatically and will be synced when the error is resolved.": "Ils seront réessayés automatiquement et synchronisés quand l'erreur sera résolue.",
-    "This is a major version upgrade.": "Ceci est une mise à jour majeure",
+    "This is a major version upgrade.": "Ceci est une mise à jour majeure.",
     "Trash Can File Versioning": "Gestion des versions de fichier style poubelle.",
     "Unknown": "Inconnu",
     "Unshared": "Non partagé",
     "Unused": "Non utilisé",
     "Up to Date": "Synchronisé",
     "Updated": "Mis à jour",
-    "Upgrade": "Mise à jour",
+    "Upgrade": "Mettre à jour",
     "Upgrade To {%version%}": "Mettre à jour vers {{version}}",
     "Upgrading": "Mise à jour de Syncthing",
     "Upload Rate": "Débit d'envoi",

gui/assets/lang/lang-hu.json

@@ -184,6 +184,7 @@
     "The number of old versions to keep, per file.": "A megtartott régi verziók száma, fájlonként.",
     "The number of versions must be a number and cannot be blank.": "A megtartott verziók száma nem lehet üres",
     "The path cannot be blank.": "Elérési út nem lehet üres.",
+    "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
     "The rescan interval must be a non-negative number of seconds.": "Az átnézési intervallum nullánál nagyobb másodperc érték kell legyen",
     "They are retried automatically and will be synced when the error is resolved.": "They are retried automatically and will be synced when the error is resolved.",
     "This is a major version upgrade.": "Ez egy főverzió frissítés.",

gui/assets/lang/lang-it.json

@@ -184,6 +184,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 path cannot be blank.": "Il percorso non può essere vuoto.",
+    "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
     "The rescan interval must be a non-negative number of seconds.": "L'intervallo di scansione deve essere un numero superiore a zero secondi.",
     "They are retried automatically and will be synced when the error is resolved.": "They are retried automatically and will be synced when the error is resolved.",
     "This is a major version upgrade.": "Questo è un aggiornamento di versione principale",

gui/assets/lang/lang-ja.json

@@ -1,212 +1,213 @@
 {
-    "A negative number of days doesn't make sense.": "負の日数は無理です。",
-    "A new major version may not be compatible with previous versions.": "新しいメジャーバージョンは以前のバージョンと互換性がないかもしれません",
+    "A negative number of days doesn't make sense.": "負の日数は指定できません。",
+    "A new major version may not be compatible with previous versions.": "新しいメジャーバージョンは以前のバージョンと互換性がないかもしれません。",
     "API Key": "APIキー",
     "About": "Syncthingについて",
     "Actions": "メニュー",
     "Add": "追加",
-    "Add Device": "デバイスの追加",
-    "Add Folder": "フォルダの追加",
-    "Add new folder?": "フォルダを新規作成しますか？",
+    "Add Device": "デバイスを追加",
+    "Add Folder": "フォルダーを追加",
+    "Add new folder?": "新しいフォルダーとして追加しますか?",
     "Address": "アドレス",
     "Addresses": "アドレス",
-    "Advanced": "高度",
+    "Advanced": "高度な設定",
     "Advanced Configuration": "高度な設定",
     "All Data": "全てのデータ",
-    "Allow Anonymous Usage Reporting?": "匿名での利用者状況のレポートを許可しますか？",
-    "Alphabetic": "ABC順",
-    "An external command handles the versioning. It has to remove the file from the synced folder.": "バージョニングを行う外部コマンド。同期フォルダからファイルを削除する必要があります。",
-    "Anonymous Usage Reporting": "匿名での利用者状況レポート",
-    "Any devices configured on an introducer device will be added to this device as well.": "紹介デバイスで設定されたデバイスはここにも追加されます。",
-    "Automatic upgrades": "自動アップデート",
-    "Be careful!": "注意してください",
+    "Allow Anonymous Usage Reporting?": "匿名で利用状況をレポートすることを許可しますか?",
+    "Alphabetic": "アルファベット順",
+    "An external command handles the versioning. It has to remove the file from the synced folder.": "外部コマンドがバージョン管理を処理します。指定したコマンドが、同期フォルダーからファイルを削除する必要があります。",
+    "Anonymous Usage Reporting": "匿名での利用状況レポート",
+    "Any devices configured on an introducer device will be added to this device as well.": "紹介者デバイス上で設定されたデバイスは、このデバイス上でも追加されます。",
+    "Automatic upgrades": "自動アップグレード",
+    "Be careful!": "注意してください。",
     "Bugs": "バグ",
     "CPU Utilization": "CPU使用率",
     "Changelog": "更新履歴",
-    "Clean out after": "後で掃除",
+    "Clean out after": "以下の期間後に完全に削除する",
     "Close": "閉じる",
     "Command": "コマンド",
-    "Comment, when used at the start of a line": "行頭で使用されるコメント",
+    "Comment, when used at the start of a line": "行頭で使用された場合、コメント行",
     "Compression": "圧縮",
     "Connection Error": "接続エラー",
-    "Copied from elsewhere": "他の所からコピーしました",
-    "Copied from original": "オリジナルからコピーしました",
-    "Copyright © 2015 the following Contributors:": "Copyright © 2015 以下の協力者たちの皆さん:",
+    "Copied from elsewhere": "別ファイルからコピー済",
+    "Copied from original": "元ファイルからコピー済",
+    "Copyright © 2015 the following Contributors:": "Copyright © 2015 the following Contributors:",
     "Delete": "削除",
-    "Deleted": "削除した",
+    "Deleted": "削除",
     "Device ID": "デバイスID",
-    "Device Identification": "デバイスの身分証明書",
-    "Device Name": "デバイスの名前",
-    "Device {%device%} ({%address%}) wants to connect. Add new device?": "デバイス{{device}} ({{address}})が接続しますか？　",
+    "Device Identification": "デバイス識別情報",
+    "Device Name": "デバイス名",
+    "Device {%device%} ({%address%}) wants to connect. Add new device?": "デバイス {{device}} ({{address}}) が接続を求めています。新しいデバイスとして追加しますか?",
     "Devices": "デバイス",
-    "Disconnected": "切断されました",
+    "Disconnected": "切断中",
     "Documentation": "マニュアル",
-    "Download Rate": "ダウンロード率",
+    "Download Rate": "ダウンロード速度",
     "Downloaded": "ダウンロード済",
     "Downloading": "ダウンロード中",
     "Edit": "編集",
-    "Edit Device": "デバイスの変更",
-    "Edit Folder": "フォルダーの変更",
+    "Edit Device": "デバイスの編集",
+    "Edit Folder": "フォルダーの編集",
     "Editing": "編集中",
-    "Enable UPnP": "UPnPを許可する",
-    "Enter comma separated \"ip:port\" addresses or \"dynamic\" to perform automatic discovery of the address.": "自動接続の場合は「dynamic」またはカンマ区切り「IPアドレス:ポート」を入力をしてください",
-    "Enter ignore patterns, one per line.": "無視パターンを入力してください。一列一条件。",
+    "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": "エラー",
-    "External File Versioning": "外部ファイルバージョニング",
-    "Failed Items": "失敗したアイテム",
-    "File Pull Order": "ファイルの引き順番",
-    "File Versioning": "ファイルバージョニング",
-    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "更新時、ファイルパーミッションの設定が無視されます。FATファイルシステムでご利用ください。",
-    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Syncthingによって移動や削除が行われるとファイルは.stversionsフォルダに移されます。",
-    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Syncthingによって移動や削除が行われるとファイルは.stversionsフォルダ内のタイムスタンプバージョンに移されます。",
-    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "ファイルは他デバイスによる変更から保護されます。しかしこのデバイス上での変更は他のクラスタに送信されます。",
+    "External File Versioning": "外部バージョン管理",
+    "Failed Items": "失敗した項目",
+    "File Pull Order": "ファイルを取得する順番",
+    "File Versioning": "ファイルのバージョン管理",
+    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "ファイルの変更を探すときにパーミッションを無視します。FATファイルシステムでご利用ください。",
+    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Syncthingがファイルを置き換えたり削除したりするとき、古い内容を .stversions フォルダーに移動します。",
+    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Syncthingがファイルを置き換えたり削除したりするとき、古い内容はファイル名にタイムスタンプを付けて .stversions フォルダーに移動します。",
+    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "ファイルを他のデバイスによる変更から保護します。一方、このデバイスでの変更は他のデバイスに送信されます。",
     "Folder": "フォルダー",
-    "Folder ID": "フォルダID",
-    "Folder Master": "フォルダのマスター",
-    "Folder Path": "フォルダパス",
-    "Folders": "フォルダ",
+    "Folder ID": "フォルダーID",
+    "Folder Master": "フォルダーのマスター",
+    "Folder Path": "フォルダーパス",
+    "Folders": "フォルダー",
     "GUI": "GUI",
-    "GUI Authentication Password": "GUI 認証パスワード",
-    "GUI Authentication User": "GUI 認証ユーザー",
-    "GUI Listen Addresses": "GUIリスンアドレス",
+    "GUI Authentication Password": "GUI認証パスワード",
+    "GUI Authentication User": "GUI認証ユーザー名",
+    "GUI Listen Addresses": "GUI待ち受けアドレスリスト",
     "Generate": "生成",
     "Global Discovery": "グローバルディスカバリー",
     "Global Discovery Server": "グローバルディスカバリーサーバー",
     "Global State": "グローバル状態",
     "Help": "ヘルプ",
-    "Home page": "Home page",
+    "Home page": "ホームページ",
     "Ignore": "無視",
-    "Ignore Patterns": "パターンを無視する",
-    "Ignore Permissions": "アクセス許可を無視する",
-    "Incoming Rate Limit (KiB/s)": "着信率制限(KiB/s)",
-    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "不正な設定はフォルダーコンテンツに損害を与え、Syncthingの表示を操作できなくなる可能性があります。",
-    "Introducer": "紹介デバイス",
-    "Inversion of the given condition (i.e. do not exclude)": "条件の裏（と言うのは省かないで）",
-    "Keep Versions": "バージョン保持",
+    "Ignore Patterns": "無視するファイル名",
+    "Ignore Permissions": "パーミッションを無視する",
+    "Incoming Rate Limit (KiB/s)": "下り帯域制限 (KiB/s)",
+    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "間違った設定を行うと、フォルダーの内容を壊したり、Syncthingを操作不能にしたりする可能性があります。",
+    "Introducer": "紹介者デバイス",
+    "Inversion of the given condition (i.e. do not exclude)": "条件の否定 (つまり、無視しないという意味になります)",
+    "Keep Versions": "保存するバージョンの数",
     "Largest First": "大きい順",
-    "Last File Received": "最後に受けとったファイル",
-    "Last seen": "最後に見た",
-    "Later": "後",
+    "Last File Received": "最後に受信したファイル",
+    "Last seen": "最終接続日時",
+    "Later": "後で設定",
     "Local Discovery": "ローカルディスカバリー",
     "Local State": "ローカル状態",
-    "Local State (Total)": "ローカル状態（総和）",
+    "Local State (Total)": "ローカル状態 (合計)",
     "Major Upgrade": "メジャーアップグレード",
-    "Maximum Age": "再",
-    "Metadata Only": "メータデータだけ",
-    "Minimum Free Disk Space": "Minimum Free Disk Space",
+    "Maximum Age": "最大寿命",
+    "Metadata Only": "メタデータのみ",
+    "Minimum Free Disk Space": "同期を停止する最小空きディスク容量",
     "Move to top of queue": "最優先にする",
-    "Multi level wildcard (matches multiple directory levels)": "広範なワイルドカード(複数のディレクトリに適用されます)",
-    "Never": "決して",
+    "Multi level wildcard (matches multiple directory levels)": "多階層ワイルドカード (複数のディレクトリ階層にマッチします)",
+    "Never": "接続記録なし",
     "New Device": "新規デバイス",
-    "New Folder": "新規フォルダ",
+    "New Folder": "新規フォルダー",
     "Newest First": "新しい順",
     "No": "いいえ",
-    "No File Versioning": "ファイルバージョニング不利用",
+    "No File Versioning": "バージョン管理をしない",
     "Notice": "通知",
     "OK": "OK",
     "Off": "オフ",
     "Oldest First": "古い順",
     "Options": "オプション",
-    "Out of Sync": "同期外",
-    "Out of Sync Items": "シンクアイテム外",
-    "Outgoing Rate Limit (KiB/s)": "発信率制限(KiB/s)",
-    "Override Changes": "変更をオーバーライドする",
-    "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "ローカルコンピュータ上のフォルダパス。存在しない場合は作成されます。チルダ(~)をショートカットで利用することができます",
-    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "バージョンが保持されるパス(空欄の場合、デフォルトで.stversionsになります)",
-    "Please consult the release notes before performing a major upgrade.": "メジャーアップグレードをする前にリリースノートを参考してください。",
+    "Out of Sync": "未同期",
+    "Out of Sync Items": "同期の必要な項目",
+    "Outgoing Rate Limit (KiB/s)": "上り帯域制限 (KiB/s)",
+    "Override Changes": "他のデバイスの変更を上書きする",
+    "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "ローカルコンピュータ上のフォルダーパス。存在しない場合は作成されます。チルダ (~) で次のフォルダーを短縮入力できます:",
+    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "古いバージョンを保存するパス (空欄の場合、デフォルトで .stversions になります)。",
+    "Please consult the release notes before performing a major upgrade.": "メジャーアップグレードを行う前にリリースノートを参照してください。",
     "Please wait": "お待ちください",
     "Preview": "プレビュー",
     "Preview Usage Report": "利用状況レポートのプレビュー",
     "Quick guide to supported patterns": "サポートされているパターンの簡易ガイド",
-    "RAM Utilization": "メモリ利用率",
+    "RAM Utilization": "メモリ使用量",
     "Random": "ランダム",
     "Release Notes": "リリースノート",
-    "Remove": "Remove",
+    "Remove": "除去",
     "Rescan": "再スキャン",
     "Rescan All": "すべて再スキャン",
-    "Rescan Interval": "再スキャンの間隔",
+    "Rescan Interval": "再スキャン間隔",
     "Restart": "再起動",
     "Restart Needed": "再起動が必要です",
     "Restarting": "再起動中",
-    "Reused": "再使用されている",
+    "Reused": "中断後再利用",
     "Save": "保存",
     "Scanning": "スキャン中",
-    "Select the devices to share this folder with.": "このフォルダをシェアするデバイスを選んでください。",
-    "Select the folders to share with this device.": "このデバイスでシェアしたいフォルダを選んでください",
+    "Select the devices to share this folder with.": "このフォルダーを共有するデバイスを選択してください。",
+    "Select the folders to share with this device.": "このデバイスと共有するフォルダーを選択してください。",
     "Settings": "設定",
     "Share": "共有",
-    "Share Folder": "フォルダを共有する",
-    "Share Folders With Device": "デバイスでフォルダをシェアする",
-    "Share With Devices": "デバイスでシェアする",
-    "Share this folder?": "このフォルダを共有しますか？",
-    "Shared With": "シェアされている",
-    "Short identifier for the folder. Must be the same on all cluster devices.": "このフォルダの短いID。全てのデバイス上で同じである必要があります。",
+    "Share Folder": "フォルダーを共有する",
+    "Share Folders With Device": "このデバイスと共有するフォルダー",
+    "Share With Devices": "共有対象のデバイス",
+    "Share this folder?": "このフォルダーを共有しますか?",
+    "Shared With": "共有相手",
+    "Short identifier for the folder. Must be the same on all cluster devices.": "このフォルダーの短い識別子。このフォルダーを共有する全てのデバイス上で同じである必要があります。",
     "Show ID": "IDを表示",
-    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "クラスタステータスでデバイスIDの代わりに表示されます。他のデバイス上でもこれがデフォルトとして表示されます。",
-    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "クラスタステータスでデバイスIDの代わりに表示されます。空欄の場合デバイスが要請する名前に更新されます。",
+    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "クラスターステータスでデバイスIDの代わりに表示されます。他のデバイスに対してもデフォルトの名前として通知されます。",
+    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "クラスターステータスでデバイスIDの代わりに表示されます。空欄の場合デバイスが名乗る名前に更新されます。",
     "Shutdown": "シャットダウン",
     "Shutdown Complete": "シャットダウン完了",
-    "Simple File Versioning": "簡易ファイルバージョニング",
-    "Single level wildcard (matches within a directory only)": "ワイルドカード(一つのディレクトリだけに適用されます)",
+    "Simple File Versioning": "単純バージョン管理",
+    "Single level wildcard (matches within a directory only)": "ワイルドカード (単一のディレクトリ内だけでマッチします)",
     "Smallest First": "小さい順",
     "Source Code": "ソースコード",
-    "Staggered File Versioning": "簡易ファイルバージョニング",
-    "Start Browser": "ブラウザーを起動する",
-    "Statistics": "Statistics",
-    "Stopped": "止り",
+    "Staggered File Versioning": "期間別バージョン管理",
+    "Start Browser": "起動時にウェブブラウザーで状態を表示する",
+    "Statistics": "統計情報",
+    "Stopped": "停止中",
     "Support": "サポート",
-    "Sync Protocol Listen Addresses": "同期プロトコル待ち受けるアドレス",
+    "Sync Protocol Listen Addresses": "Syncプロトコルの待ち受けアドレスリスト",
     "Syncing": "同期中",
     "Syncthing has been shut down.": "Syncthingがシャットダウンしました。",
     "Syncthing includes the following software or portions thereof:": "Syncthingは以下のソフトウェアかその一部を内包しています:",
-    "Syncthing is restarting.": "Syncthingが再起動しています",
-    "Syncthing is upgrading.": "Syncthingがアップグレード中です",
+    "Syncthing is restarting.": "Syncthingが再起動しています。",
+    "Syncthing is upgrading.": "Syncthingがアップグレード中です。",
     "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthingが落ちているか、インターネット接続に問題があります。リトライ中です…",
     "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "リクエストの処理に問題があるようです。問題が継続する場合、ページを更新するかSyncthingを再起動してください。",
-    "The aggregated statistics are publicly available at {%url%}.": "全体の統計は{{url}}でご覧いただけます。",
-    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "設定がセーブされましたが、有効にはなっていません。設定を有効にするにはSyncthingを再起動する必要があります。",
-    "The device ID cannot be blank.": "デバイスIDは空欄にできません",
-    "The device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "ここで入力したデバイスIDは他デバイス上の\"編集 > IDを表示\"で見ることができます。スペースとハイフンは無視されます。",
-    "The encrypted usage report is sent daily. It is used to track common platforms, folder sizes and app versions. If the reported data set is changed you will be prompted with this dialog again.": "暗号化された使用状況レポートが\b日ごとに送られます。これはプラットフォーム、フォルダの大きさ、アプリのバージョンを追跡するために利用されます。レポートのデータが変更された場合、このダイアログがまた表示されます。",
-    "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.": "入力されたデバイスIDが正しくありません。52から56文字のアルファベットと数字かスペース、ハイフンの列である必要があります。",
-    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "第一コマンドパラメータはフォルダパス、第二パラメータはフォルダ内の相対パスです。",
-    "The folder ID cannot be blank.": "フォルダIDは空欄にできません",
-    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "フォルダID(64文字以内)は数字、ドット(.)、ハイフン(-)、アンダースコア(_)で構成されている必要があります。",
-    "The folder ID must be unique.": "フォルダIDは固有である必要があります。",
-    "The folder path cannot be blank.": "フォルダーパスは空欄にできません",
-    "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 following items could not be synchronized.": "以下のアイテムは同期できませんでした。",
-    "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 minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).",
-    "The number of days must be a number and cannot be blank.": "日数は番号である必要があり、空欄ではいけません。",
-    "The number of days to keep files in the trash can. Zero means forever.": "ゴミ箱にファイルを保持する日数。0だと永続的に保持します。",
-    "The number of old versions to keep, per file.": "ファイルごとの保持する古いバージョンの数",
-    "The number of versions must be a number and cannot be blank.": "バージョンの数は番号である必要があり、空欄ではいけません。",
-    "The path cannot be blank.": "パスは空欄にできません",
-    "The rescan interval must be a non-negative number of seconds.": "リスキャン間隔はマイナス秒ではいけません。",
-    "They are retried automatically and will be synced when the error is resolved.": "エラーが解決した時それらは自動的にリトライし同期を試みます。",
-    "This is a major version upgrade.": "メージャーアップグレードです。",
-    "Trash Can File Versioning": "ゴミ箱のファイルバージョニング",
+    "The aggregated statistics are publicly available at {%url%}.": "集計結果は {{url}} でどなたでもご覧いただけます。",
+    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "設定が保存されましたが、まだ有効になっていません。新しい設定を有効にするにはSyncthingを再起動してください。",
+    "The device ID cannot be blank.": "デバイスIDは空欄にできません。",
+    "The device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "ここに入力するデバイスIDは、接続したいデバイスの \"メニュー > IDを表示\" で確認することができます。スペースとハイフンは入力しなくてもかまいません。",
+    "The encrypted usage report is sent daily. It is used to track common platforms, folder sizes and app versions. If the reported data set is changed you will be prompted with this dialog again.": "利用状況レポートは暗号化されて毎日送信されます。この情報はプラットフォーム、フォルダの大きさ、アプリのバージョンを調査するために使われます。レポートのデータが変更された場合、このダイアログがまた表示されます。",
+    "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.": "入力されたデバイスIDが正しくありません。デバイスIDは、52文字または56文字のアルファベットと数字からなる文字列です。スペースとハイフンは入力してもしなくてもかまいません。",
+    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "第1コマンドライン引数はフォルダーのパス、第2引数はフォルダー内の相対パスです。",
+    "The folder ID cannot be blank.": "フォルダーIDは空欄にできません。",
+    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "フォルダーIDは64文字以内で、アルファベット、数字、ドット (.)、ハイフン (-)、アンダースコア (_) のみを使うことができます。",
+    "The folder ID must be unique.": "フォルダーIDが重複しています。",
+    "The folder path cannot be blank.": "フォルダーパスは空欄にできません。",
+    "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.": "保存間隔は次の通りです。最近1時間は30秒ごとに古いバージョンを保存します。同様に、最近1日間は1時間ごとに、最近30日間は1日ごとに、その後最大寿命までは1週間ごとに、古いバージョンを保存します。",
+    "The following items could not be synchronized.": "以下の項目は同期できませんでした。",
+    "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 minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "最小空きディスク容量はパーセントで、0から100の値を入力してください。",
+    "The number of days must be a number and cannot be blank.": "日数は数値を指定してください。空欄にはできません。",
+    "The number of days to keep files in the trash can. Zero means forever.": "ゴミ箱にファイルを保存する日数。0だと永久的に保存します。",
+    "The number of old versions to keep, per file.": "ファイルごとに古いバージョンをいくつ保存するかを指定します。",
+    "The number of versions must be a number and cannot be blank.": "保存するバージョンの数は数値を指定してください。空欄にはできません。",
+    "The path cannot be blank.": "パスは空欄にできません。",
+    "The rate limit must be a non-negative number (0: no limit)": "帯域制限の値として負の数は指定できません (0にすると制限を行いません)。",
+    "The rescan interval must be a non-negative number of seconds.": "再スキャン間隔として負の数は指定できません。",
+    "They are retried automatically and will be synced when the error is resolved.": "エラーが解決すると、自動的に再試行され同期されます。",
+    "This is a major version upgrade.": "メジャーアップグレードです。",
+    "Trash Can File Versioning": "ゴミ箱によるバージョン管理",
     "Unknown": "不明",
-    "Unshared": "シェアされていない",
-    "Unused": "使われていない",
+    "Unshared": "非共有",
+    "Unused": "未使用",
     "Up to Date": "最新",
-    "Updated": "更新済み",
+    "Updated": "更新",
     "Upgrade": "アップグレード",
-    "Upgrade To {%version%}": "{{version}}にアップグレードする",
+    "Upgrade To {%version%}": "{{version}} にアップグレードする",
     "Upgrading": "アップグレード中",
-    "Upload Rate": "アップロード率",
+    "Upload Rate": "アップロード速度",
     "Uptime": "稼働時間",
-    "Use HTTPS for GUI": "GUIにHTTPSを使う",
+    "Use HTTPS for GUI": "GUIにHTTPSを使用する",
     "Version": "バージョン",
-    "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 device, keep in mind that this device must be added on the other side too.": "新しいデバイスを加える際、そのデバイスにもこのデバイスを加える必要があることを留意してください。",
-    "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "新しいフォルダを追加する際、フォルダIDはケースセンシティブで全てのデバイス上で完全に同じである必要があります。",
+    "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 device, keep in mind that this device must be added on the other side too.": "新しいデバイスを追加する際、そのデバイスにもこのデバイスを追加する必要があることに留意してください。",
+    "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "新しいフォルダーを追加する際、フォルダーIDはデバイス間でフォルダーの対応づけに使われることに注意してください。フォルダーIDは大文字と小文字が区別され、共有するすべてのデバイスの間で完全に一致しなくてはなりません。",
     "Yes": "はい",
-    "You must keep at least one version.": "バージョン一つ少なくとも保持してください",
-    "full documentation": "完全マニュアル",
-    "items": "アイテム",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}}がフォルダ\"{{folder}}\"をシェアしがたっています。"
+    "You must keep at least one version.": "少なくとも一つのバージョンを保存してください。",
+    "full documentation": "詳細なマニュアル",
+    "items": "項目",
+    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} がフォルダー \"{{folder}}\" を共有するよう求めています。"
 }

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

@@ -184,6 +184,7 @@
     "The number of old versions to keep, per file.": "각 파일별로 유지할 이전 버전의 개수를 지정합니다.",
     "The number of versions must be a number and cannot be blank.": "버전 개수는 숫자여야 하며 비워 둘 수 없습니다.",
     "The path cannot be blank.": "경로는 비워 둘 수 없습니다.",
+    "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
     "The rescan interval must be a non-negative number of seconds.": "재검색 간격은 초단위이며 양수로 입력해야 합니다.",
     "They are retried automatically and will be synced when the error is resolved.": "They are retried automatically and will be synced when the error is resolved.",
     "This is a major version upgrade.": "이 업데이트는 메이저 버전입니다.",

gui/assets/lang/lang-lt.json

@@ -19,7 +19,7 @@
     "Anonymous Usage Reporting": "Anoniminė vartojimo ataskaita",
     "Any devices configured on an introducer device will be added to this device as well.": "Visi supažindintojo įrenginiai bus pridėti prie jūsų įrenginių sąrašo.",
     "Automatic upgrades": "Automatiniai atnaujinimai",
-    "Be careful!": "Be careful!",
+    "Be careful!": "Būkite atsargūs!",
     "Bugs": "Klaidos",
     "CPU Utilization": "Procesoriaus panaudojimas",
     "Changelog": "Pasikeitimai",
@@ -93,7 +93,7 @@
     "Major Upgrade": "Stambus atnaujinimas",
     "Maximum Age": "Maksimalus amžius",
     "Metadata Only": "Metaduomenims",
-    "Minimum Free Disk Space": "Minimum Free Disk Space",
+    "Minimum Free Disk Space": "Minimum laisvos vietos diske",
     "Move to top of queue": "Perkelti į eilės priekį",
     "Multi level wildcard (matches multiple directory levels)": "Keletos lygių pakaitos (atitinka keletą direktorijų lygių)",
     "Never": "Niekada",
@@ -106,8 +106,8 @@
     "OK": "Gerai",
     "Off": "Netaikoma",
     "Oldest First": "Seniausi pirmiau",
-    "Options": "Options",
-    "Out of Sync": "Out of Sync",
+    "Options": "Nustatymai",
+    "Out of Sync": "Išsisinchronizavę",
     "Out of Sync Items": "Nesutikrinta",
     "Outgoing Rate Limit (KiB/s)": "Išeinančio srauto maksimalus greitis (KiB/s)",
     "Override Changes": "Perrašyti pakeitimus",
@@ -121,7 +121,7 @@
     "RAM Utilization": "Atminties naudojimas",
     "Random": "Atsitiktinė",
     "Release Notes": "Laidos Informacija",
-    "Remove": "Remove",
+    "Remove": "Pašalinti",
     "Rescan": "Nuskaityti iš naujo",
     "Rescan All": "Nuskaityti visus aplankus",
     "Rescan Interval": "Pertrauka tarp nuskaitymų",
@@ -152,7 +152,7 @@
     "Source Code": "Išeities kodas",
     "Staggered File Versioning": "Pakopinis versijų valdymas",
     "Start Browser": "Paleisti naršyklę",
-    "Statistics": "Statistics",
+    "Statistics": "Statistika",
     "Stopped": "Sustabdyta",
     "Support": "Pagalba",
     "Sync Protocol Listen Addresses": "Sutapatinimo taisyklių adresas",
@@ -184,6 +184,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 path cannot be blank.": "Kelias negali būti tuščias.",
+    "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
     "The rescan interval must be a non-negative number of seconds.": "Nuskaitymo dažnis negali būti neigiamas skaičius.",
     "They are retried automatically and will be synced when the error is resolved.": "They are retried automatically and will be synced when the error is resolved.",
     "This is a major version upgrade.": "Tai yra stambus atnaujinimas.",

gui/assets/lang/lang-nb.json

@@ -53,7 +53,7 @@
     "Enter ignore patterns, one per line.": "Skriv inn mønster som skal utelates, ett per linje.",
     "Error": "Feilmelding",
     "External File Versioning": "Ekstern versjonskontroll",
-    "Failed Items": "Failed Items",
+    "Failed Items": "Elementsynkronisering som har feilet",
     "File Pull Order": "Filenes Henterekkefølge",
     "File Versioning": "Versjonskontroll",
     "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Fil bit-rettigheter ignoreres når forandringer oppdages. Bruk FAT filsystem. ",
@@ -65,7 +65,7 @@
     "Folder Master": "Styrende Mappe",
     "Folder Path": "Mappeplassering",
     "Folders": "Mapper",
-    "GUI": "GUI",
+    "GUI": "grafisk brukergrensesnitt",
     "GUI Authentication Password": "GUI Passord",
     "GUI Authentication User": "GUI Bruker",
     "GUI Listen Addresses": "GUI Lytteadresse",
@@ -93,7 +93,7 @@
     "Major Upgrade": "Hovedoppgradering",
     "Maximum Age": "Maksimal Levetid",
     "Metadata Only": "Kun metadata",
-    "Minimum Free Disk Space": "Minimum Free Disk Space",
+    "Minimum Free Disk Space": "Nødvendig ledig diskplass",
     "Move to top of queue": "Flytt til topp av kø",
     "Multi level wildcard (matches multiple directory levels)": "Multinivåsøk (søker på flere mappenivå)",
     "Never": "Aldri",
@@ -121,7 +121,7 @@
     "RAM Utilization": "RAM-utnyttelse",
     "Random": "TIlfeldig",
     "Release Notes": "Utgivelsesnotat",
-    "Remove": "Remove",
+    "Remove": "Fjern",
     "Rescan": "Skann på nytt",
     "Rescan All": "Skann alt på nytt",
     "Rescan Interval": "Skanneintervall",
@@ -178,14 +178,15 @@
     "The following items could not be synchronized.": "Følgende filer kunne ikke synkroniseres.",
     "The maximum age must be a number and cannot be blank.": "Maksimal levetid må være et tall og kan ikke være tomt.",
     "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Maksimal tid å beholde en versjon (i dager, sett til 0 for å beholde versjoner på ubegrenset tid).",
-    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).",
+    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "Nødvendig ledig diskplass må være et tall mellom 0 og 100.",
     "The number of days must be a number and cannot be blank.": "Antall dager må være et tall og kan ikke være tomt.",
     "The number of days to keep files in the trash can. Zero means forever.": "Antall dager man skal bevare filene i papirkurven. Null betyr for alltid.",
     "The number of old versions to keep, per file.": "Antall gamle versjoner å beholde, per fil.",
     "The number of versions must be a number and cannot be blank.": "Antall versjoner må være et tall og kan ikke være tomt.",
     "The path cannot be blank.": "Plasseringen kan ikke være tom.",
+    "The rate limit must be a non-negative number (0: no limit)": "Hastighetsbegrensningen kan ikke være et negativt tall (0: ingen begrensing)",
     "The rescan interval must be a non-negative number of seconds.": "Antall sekund i skanneintervallet kan ikke være negativt.",
-    "They are retried automatically and will be synced when the error is resolved.": "They are retried automatically and will be synced when the error is resolved.",
+    "They are retried automatically and will be synced when the error is resolved.": "Disse hentes automatisk og vil synkroniseres når feilen er blitt utbedret.",
     "This is a major version upgrade.": "Dette er en hovedoppgradering",
     "Trash Can File Versioning": "Fil versjonskontroll i papirkurven",
     "Unknown": "Ukjent",

gui/assets/lang/lang-nl.json

@@ -93,7 +93,7 @@
     "Major Upgrade": "Grote update",
     "Maximum Age": "Maximum leeftijd",
     "Metadata Only": "Alleen metadata",
-    "Minimum Free Disk Space": "Minimum Free Disk Space",
+    "Minimum Free Disk Space": "Minimale vrije schijfruimte",
     "Move to top of queue": "Verplaats naar het begin van de wachtrij",
     "Multi level wildcard (matches multiple directory levels)": "Wildcard op meerdere niveaus (toepasbaar op meerdere mapniveaus)",
     "Never": "Nooit",
@@ -121,7 +121,7 @@
     "RAM Utilization": "Geheugengebruik",
     "Random": "Willekeurig",
     "Release Notes": "Release notes",
-    "Remove": "Remove",
+    "Remove": "Verwijderen",
     "Rescan": "Opnieuw scannen",
     "Rescan All": "Scan alles opnieuw",
     "Rescan Interval": "Scanfrequentie",
@@ -178,12 +178,13 @@
     "The following items could not be synchronized.": "De volgende bestanden konden niet worden gesynchroniseerd.",
     "The maximum age must be a number and cannot be blank.": "De maximum leeftijd moet uit cijfers bestaan en mag niet leeggelaten worden.",
     "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "De maximale tijdsduur om een versie te bewaren (in dagen, gebruik 0 om versies voor altijd te bewaren).",
-    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).",
+    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "Het percentage minimale vrije schijfruimte dient een positief nummer tussen 0 en 100 (inclusief) te zijn.",
     "The number of days must be a number and cannot be blank.": "Het aantal dagen moet een getal zijn en kan niet leeg gelaten worden.",
     "The number of days to keep files in the trash can. Zero means forever.": "Het aantal dagen dat bestanden in de prullenbak blijven. Type 0 voor oneindig.",
     "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 path cannot be blank.": "Het bestandspad mag niet leeg zijn.",
+    "The rate limit must be a non-negative number (0: no limit)": "De snelheidslimiet moet een positief nummer zijn (0: geen limiet)",
     "The rescan interval must be a non-negative number of seconds.": "De scanfrequentie moet een positief getal in seconden zijn.",
     "They are retried automatically and will be synced when the error is resolved.": "Het wordt automatisch opnieuw geprobeerd. Bestanden worden gesynchroniseerd als de fout is hersteld.",
     "This is a major version upgrade.": "Dit is een grote update.",

gui/assets/lang/lang-nn.json

@@ -184,6 +184,7 @@
     "The number of old versions to keep, per file.": "Tal på gamle versjonar ein skal behalda, per fil.",
     "The number of versions must be a number and cannot be blank.": "Tal på versjonar må vera eit tal og kan ikkje vera tomt.",
     "The path cannot be blank.": "Bana kan ikkje vera tom.",
+    "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
     "The rescan interval must be a non-negative number of seconds.": "Talet på sekund i skanneintervallet kan ikkje vera negativt.",
     "They are retried automatically and will be synced when the error is resolved.": "They are retried automatically and will be synced when the error is resolved.",
     "This is a major version upgrade.": "This is a major version upgrade.",

gui/assets/lang/lang-pl.json

@@ -184,6 +184,7 @@
     "The number of old versions to keep, per file.": "Liczba wersji pliku do zachowania.",
     "The number of versions must be a number and cannot be blank.": "Liczba wersji musi być liczbą i nie może być pusta.",
     "The path cannot be blank.": "Ścieżka nie może być pusta.",
+    "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
     "The rescan interval must be a non-negative number of seconds.": "Interwał skanowania musi być niezerową liczbą sekund.",
     "They are retried automatically and will be synced when the error is resolved.": "Ponowne próby zachodzą automatycznie, synchronizacja nastąpi po usunięciu usterki.",
     "This is a major version upgrade.": "To jest ważna aktualizacja",

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

@@ -93,7 +93,7 @@
     "Major Upgrade": "Atualização \"major\"",
     "Maximum Age": "Idade máxima",
     "Metadata Only": "Somente metadados",
-    "Minimum Free Disk Space": "Minimum Free Disk Space",
+    "Minimum Free Disk Space": "Espaço livre mínimo no disco",
     "Move to top of queue": "Mover para o topo da lista",
     "Multi level wildcard (matches multiple directory levels)": "Coringa multi-nível (faz corresponder a vários níveis de pastas)",
     "Never": "Nunca",
@@ -121,7 +121,7 @@
     "RAM Utilization": "Uso de RAM",
     "Random": "Aleatória",
     "Release Notes": "Notas de lançamento",
-    "Remove": "Remove",
+    "Remove": "Remover",
     "Rescan": "Verificar agora",
     "Rescan All": "Verificar todas",
     "Rescan Interval": "Intervalo entre verificações",
@@ -178,12 +178,13 @@
     "The following items could not be synchronized.": "Os itens a seguir não puderam ser sincronizados.",
     "The maximum age must be a number and cannot be blank.": "A idade máxima deve ser um valor numérico. O campo não pode ficar vazio.",
     "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "O número máximo de dias em que uma versão é guardada. (Use 0 para manter para sempre).",
-    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).",
+    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "A porcentagem de espaço livre mínimo no disco deve ser um número positivo entre 0 e 100 (inclusive).",
     "The number of days must be a number and cannot be blank.": "O número de dias deve ser um número valido e não pode ficar em branco.",
     "The number of days to keep files in the trash can. Zero means forever.": "O número de dias em que são mantidos os arquivos da lixeira. Zero significa para sempre.",
     "The number of old versions to keep, per file.": "O número de versões antigas a serem mantidas, por arquivo.",
     "The number of versions must be a number and cannot be blank.": "O número de versões deve ser um valor numérico. O campo não pode ficar vazio.",
     "The path cannot be blank.": "O caminho não pode ficar vazio.",
+    "The rate limit must be a non-negative number (0: no limit)": "O limite de velocidade deve ser um número positivo (0: sem limite)",
     "The rescan interval must be a non-negative number of seconds.": "O intervalo entre verificações deve ser um número positivo de segundos.",
     "They are retried automatically and will be synced when the error is resolved.": "Serão tentadas automaticamente e sincronizadas após o erro ter sido resolvido.",
     "This is a major version upgrade.": "Esta é uma atualização para uma versão \"major\".",

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

@@ -93,7 +93,7 @@
     "Major Upgrade": "Actualização importante",
     "Maximum Age": "Idade máxima",
     "Metadata Only": "Metadados apenas",
-    "Minimum Free Disk Space": "Minimum Free Disk Space",
+    "Minimum Free Disk Space": "Espaço livre mínimo no disco",
     "Move to top of queue": "Mover para o topo da fila",
     "Multi level wildcard (matches multiple directory levels)": "Caractere polivalente multi-nível (faz corresponder a vários níveis de pastas)",
     "Never": "Nunca",
@@ -121,7 +121,7 @@
     "RAM Utilization": "Utilização da RAM",
     "Random": "Aleatória",
     "Release Notes": "Notas de lançamento",
-    "Remove": "Remove",
+    "Remove": "Remover",
     "Rescan": "Verificar agora",
     "Rescan All": "Verificar todas agora",
     "Rescan Interval": "Intervalo entre verificações",
@@ -178,12 +178,13 @@
     "The following items could not be synchronized.": "Não foi possível sincronizar os elementos seguintes.",
     "The maximum age must be a number and cannot be blank.": "A idade máxima tem que ser um número e não pode estar vazia.",
     "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Tempo máximo, em dias, para manter uma versão (use 0 para manter a versão para sempre).",
-    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).",
+    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "A percentagem de espaço livre mínimo no disco tem que ser um número não negativo entre 0 e 100 (inclusive).",
     "The number of days must be a number and cannot be blank.": "O número de dias tem que ser um número e não pode estar em branco.",
     "The number of days to keep files in the trash can. Zero means forever.": "O número de dias a manter os ficheiros na reciclagem. Zero significa para sempre.",
     "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 path cannot be blank.": "O caminho não pode estar vazio.",
+    "The rate limit must be a non-negative number (0: no limit)": "O limite de velocidade tem que ser um número que não seja negativo (0: sem limite)",
     "The rescan interval must be a non-negative number of seconds.": "O intervalo entre verificações tem que ser um valor não negativo de segundos.",
     "They are retried automatically and will be synced when the error is resolved.": "Será tentado automaticamente e os itens serão sincronizados assim que o erro seja resolvido.",
     "This is a major version upgrade.": "Esta é uma actualização para uma versão importante.",

gui/assets/lang/lang-ro-RO.json

@@ -184,6 +184,7 @@
     "The number of old versions to keep, per file.": "Numărul de versiuni vechi de salvat per fişier.",
     "The number of versions must be a number and cannot be blank.": "Numărul de versiuni trebuie să fie un număr şi nu poate fi gol.",
     "The path cannot be blank.": "Locația nu poate fi goală.",
+    "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
     "The rescan interval must be a non-negative number of seconds.": "Intervalul de rescanare trebuie să nu fie un număr negativ de secunde. ",
     "They are retried automatically and will be synced when the error is resolved.": "They are retried automatically and will be synced when the error is resolved.",
     "This is a major version upgrade.": "This is a major version upgrade.",

gui/assets/lang/lang-ru.json

@@ -93,7 +93,7 @@
     "Major Upgrade": "Обновление основной версии",
     "Maximum Age": "Максимальный срок",
     "Metadata Only": "Только метаданные",
-    "Minimum Free Disk Space": "Minimum Free Disk Space",
+    "Minimum Free Disk Space": "Минимальное свободное место на диске",
     "Move to top of queue": "Поместить в начало очереди",
     "Multi level wildcard (matches multiple directory levels)": "Многоуровневая маска (поиск совпадений во всех подпапках)",
     "Never": "Никогда",
@@ -121,7 +121,7 @@
     "RAM Utilization": "Использование ОЗУ",
     "Random": "Случайно",
     "Release Notes": "Замечания к версии",
-    "Remove": "Remove",
+    "Remove": "Удалить",
     "Rescan": "Пересканирование",
     "Rescan All": "Пересканировать все",
     "Rescan Interval": "Интервал пересканирования",
@@ -178,12 +178,13 @@
     "The following items could not be synchronized.": "Невозможно синхронизировать следующие объекты",
     "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 minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).",
+    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "Минимальное свободное место на диске должно быть в процентах между 0 и 100 включительно.",
     "The number of days must be a number and cannot be blank.": "Количество дней должно быть числом и не может быть пустым.",
     "The number of days to keep files in the trash can. Zero means forever.": "Количество дней хранения файлов в корзине. Ноль значит навсегда.",
     "The number of old versions to keep, per file.": "Количество хранимых версий файла.",
     "The number of versions must be a number and cannot be blank.": "Количество версий должно быть числом и не может быть пустым.",
     "The path cannot be blank.": "Путь не может быть пустым.",
+    "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
     "The rescan interval must be a non-negative number of seconds.": "Интервал пересканирования должен быть неотрицательным количеством секунд.",
     "They are retried automatically and will be synced when the error is resolved.": "Будут синхронизированы автоматически когда ошибка будет исправлена.",
     "This is a major version upgrade.": "Это обновление основной версии продукта.",

gui/assets/lang/lang-sv.json

@@ -184,6 +184,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 tomt.",
     "The path cannot be blank.": "Ange en sökväg",
+    "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
     "The rescan interval must be a non-negative number of seconds.": "Förnyelseintervallet måste vara ett positivt antal sekunder",
     "They are retried automatically and will be synced when the error is resolved.": "They are retried automatically and will be synced when the error is resolved.",
     "This is a major version upgrade.": "Det här är en stor uppgradering.",

gui/assets/lang/lang-tr.json

@@ -184,6 +184,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 path cannot be blank.": "Dizin yolu boş bırakılamaz.",
+    "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
     "The rescan interval must be a non-negative number of seconds.": "Tarama zaman aralığı, saniye cinsinden negatif olmayan bir sayı olmalıdır.",
     "They are retried automatically and will be synced when the error is resolved.": "They are retried automatically and will be synced when the error is resolved.",
     "This is a major version upgrade.": "This is a major version upgrade.",

gui/assets/lang/lang-uk.json

@@ -184,6 +184,7 @@
     "The number of old versions to keep, per file.": "Кількість старих версій, яку необхідно зберігати для кожного файлу.",
     "The number of versions must be a number and cannot be blank.": "Кількість версій повинна бути цифрою та не може бути порожньою.",
     "The path cannot be blank.": "Шлях не може бути порожнім.",
+    "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
     "The rescan interval must be a non-negative number of seconds.": "Інтервал повторного сканування повинен бути неід’ємною величиною.",
     "They are retried automatically and will be synced when the error is resolved.": "Вони будуть автоматично повторно синхронізовані, коли помилку буде усунено. ",
     "This is a major version upgrade.": "Це оновлення мажорної версії",

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

@@ -93,7 +93,7 @@
     "Major Upgrade": "重大更新",
     "Maximum Age": "历史版本最长保留时间",
     "Metadata Only": "仅元数据",
-    "Minimum Free Disk Space": "Minimum Free Disk Space",
+    "Minimum Free Disk Space": "最低空闲磁盘空间",
     "Move to top of queue": "移动到队列顶端",
     "Multi level wildcard (matches multiple directory levels)": "多级通配符（用以匹配多层文件夹）",
     "Never": "从未",
@@ -121,7 +121,7 @@
     "RAM Utilization": "内存使用量",
     "Random": "随机顺序",
     "Release Notes": "发布说明",
-    "Remove": "Remove",
+    "Remove": "移除",
     "Rescan": "重新扫描",
     "Rescan All": "全部重新扫描",
     "Rescan Interval": "扫描间隔",
@@ -178,12 +178,13 @@
     "The following items could not be synchronized.": "下列项目无法被同步。",
     "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 minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).",
+    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "最低空间磁盘空间的数值必须介于 0-100 的正整数",
     "The number of days must be a number and cannot be blank.": "天数必须为数字，且不能为空。",
     "The number of days to keep files in the trash can. Zero means forever.": "文件保存在回收站的天数。零表示永久。",
     "The number of old versions to keep, per file.": "每个文件保留的版本数量上限。",
     "The number of versions must be a number and cannot be blank.": "保留版本数量必须为数字，且不能为空。",
     "The path cannot be blank.": "路径不能为空",
+    "The rate limit must be a non-negative number (0: no limit)": "传输速度限制为非负整数（0 表示不限制）",
     "The rescan interval must be a non-negative number of seconds.": "扫描间隔单位为秒，且不能为负数。",
     "They are retried automatically and will be synced when the error is resolved.": "系统将会自动重试，当错误被解决时，它们将会被同步。",
     "This is a major version upgrade.": "这是一个重大版本更新。",

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

@@ -184,6 +184,7 @@
     "The number of old versions to keep, per file.": "每個檔案要保留的舊版本數量。",
     "The number of versions must be a number and cannot be blank.": "每個檔案要保留的舊版本數量必須是數字且不能為空白。",
     "The path cannot be blank.": "路徑不能空白。",
+    "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
     "The rescan interval must be a non-negative number of seconds.": "重新掃描間隔必須為一個非負數的秒數。",
     "They are retried automatically and will be synced when the error is resolved.": "They are retried automatically and will be synced when the error is resolved.",
     "This is a major version upgrade.": "這是一個主要版本更新。",

gui/assets/lang/prettyprint.js

@@ -1 +1 @@
-var langPrettyprint = {"bg":"Bulgarian","ca":"Catalan","ca@valencia":"Catalan (Valencian)","cs":"Czech","de":"German","el":"Greek","en":"English","en-GB":"English (United Kingdom)","es":"Spanish","es-ES":"Spanish (Spain)","fi":"Finnish","fr":"French","hu":"Hungarian","it":"Italian","ja":"Japanese","ko-KR":"Korean (Korea)","lt":"Lithuanian","nb":"Norwegian Bokmål","nl":"Dutch","nn":"Norwegian Nynorsk","pl":"Polish","pt-BR":"Portuguese (Brazil)","pt-PT":"Portuguese (Portugal)","ro-RO":"Romanian (Romania)","ru":"Russian","sv":"Swedish","tr":"Turkish","uk":"Ukrainian","zh-CN":"Chinese (China)","zh-TW":"Chinese (Taiwan)"}
+var langPrettyprint = {"bg":"Bulgarian","ca":"Catalan","ca@valencia":"Catalan (Valencian)","cs":"Czech","de":"German","el":"Greek","en":"English","en-GB":"English (United Kingdom)","es":"Spanish","es-ES":"Spanish (Spain)","fi":"Finnish","fr":"French","fr-CA":"French (Canada)","hu":"Hungarian","it":"Italian","ja":"Japanese","ko-KR":"Korean (Korea)","lt":"Lithuanian","nb":"Norwegian Bokmål","nl":"Dutch","nn":"Norwegian Nynorsk","pl":"Polish","pt-BR":"Portuguese (Brazil)","pt-PT":"Portuguese (Portugal)","ro-RO":"Romanian (Romania)","ru":"Russian","sv":"Swedish","tr":"Turkish","uk":"Ukrainian","zh-CN":"Chinese (China)","zh-TW":"Chinese (Taiwan)"}

gui/assets/lang/valid-langs.js

@@ -1 +1 @@
-var validLangs = ["bg","ca","ca@valencia","cs","de","el","en","en-GB","es","es-ES","fi","fr","hu","it","ja","ko-KR","lt","nb","nl","nn","pl","pt-BR","pt-PT","ro-RO","ru","sv","tr","uk","zh-CN","zh-TW"]
+var validLangs = ["bg","ca","ca@valencia","cs","de","el","en","en-GB","es","es-ES","fi","fr","fr-CA","hu","it","ja","ko-KR","lt","nb","nl","nn","pl","pt-BR","pt-PT","ro-RO","ru","sv","tr","uk","zh-CN","zh-TW"]

gui/modal.html

@@ -10,14 +10,16 @@
     <div class="modal-content">
       <div class="modal-header alert alert-{{status}}">
         <h4 class="modal-title">
-          <span ng-if="icon" class="glyphicon glyphicon-{{icon}}"></span>
+          <span ng-if="icon" class="fa fa-{{icon}}"></span>
           {{title}}
         </h4>
       </div>
       <div class="modal-body" ng-transclude>
       </div>
       <div ng-if="close" class="modal-footer">
-        <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 type="button" class="btn btn-default btn-sm" data-dismiss="modal">
+          <span class="fa fa-times"></span>&nbsp;<span translate>Close</span>
+        </button>
       </div>
     </div>
   </div>

gui/scripts/syncthing/core/filters/groupFilter.js

@@ -1,25 +0,0 @@
-/**
- * Groups input in chunks of the specified size
- *
- * E.g. [1, 2, 3, 4, 5] with groupSize = 3 => [[1, 2, 3], [4, 5]]
- * Uses pmkr.memoize to avoid infdig, see 'Johnny Hauser's "Filter Stablize" Solution'
- * here: http://sobrepere.com/blog/2014/10/14/creating-groupby-filter-angularjs/
- */
-angular.module('syncthing.core')
-    .filter('group', [
-        'pmkr.filterStabilize', 
-        function (stabilize) {
-            return stabilize(function(items, groupSize) {
-                var groups = [];
-                var inner;
-                for (var i = 0; i < items.length; i++) {
-                    if (i % groupSize === 0) {
-                        inner = [];
-                        groups.push(inner);
-                    }
-                    inner.push(items[i]);
-                }
-                return groups;
-            });
-        }
-    ]);

gui/scripts/syncthing/core/services/filterStabilize.js

@@ -1,27 +0,0 @@
-/**
- * m59peacemaker's filterStabilize
- *
- * See https://github.com/m59peacemaker/angular-pmkr-components/tree/master/src/services/filterStabilize
- * Released under the MIT license
- */
-angular.module('syncthing.core')
-    .factory('pmkr.filterStabilize', [
-        'pmkr.memoize',
-        function(memoize) {
-            function service(fn) {
-                function filter() {
-                    var args = [].slice.call(arguments);
-                    // always pass a copy of the args so that the original input can't be modified
-                    args = angular.copy(args);
-                    // return the `fn` return value or input reference (makes `fn` return optional)
-                    var filtered = fn.apply(this, args) || args[0];
-                    return filtered;
-                }
-
-                var memoized = memoize(filter);
-                return memoized;
-
-            }
-            return service;
-        }
-    ]);

gui/scripts/syncthing/core/services/memoize.js

@@ -1,28 +0,0 @@
-/**
- * m59peacemaker's memoize
- * 
- * See https://github.com/m59peacemaker/angular-pmkr-components/tree/master/src/services/memoize
- * Released under the MIT license
- */
-angular.module('syncthing.core')
-    .factory('pmkr.memoize', [
-        function() {
-            function service() {
-                return memoizeFactory.apply(this, arguments);
-            }
-            function memoizeFactory(fn) {
-                var cache = {};
-                function memoized() {
-                    var args = [].slice.call(arguments);
-                    var key = JSON.stringify(args);
-                    if (cache.hasOwnProperty(key)) {
-                        return cache[key];
-                    }
-                    cache[key] = fn.apply(this, arguments);
-                    return cache[key];
-                }
-                return memoized;
-            }
-            return service;
-        }
-    ]);

gui/syncthing/app.js

@@ -11,7 +11,13 @@
 var syncthing = angular.module('syncthing', [
     'angularUtils.directives.dirPagination',
     'pascalprecht.translate',
-    'syncthing.core'
+
+    'syncthing.core',
+    'syncthing.device',
+    'syncthing.folder',
+    'syncthing.settings',
+    'syncthing.transfer',
+    'syncthing.usagereport'
 ]);
 
 var urlbase = 'rest';
@@ -20,26 +26,26 @@ syncthing.config(function ($httpProvider, $translateProvider, LocaleServiceProvi
     $httpProvider.interceptors.push(function xHeadersResponseInterceptor() {
         var guiVersion = null;
         var deviceId = null;
-        
+
         return {
             response: function onResponse(response) {
                 var headers = response.headers();
                 var responseVersion;
                 var deviceIdShort;
-                
+
                 // angular template cache sends no headers
                 if(Object.keys(headers).length === 0) {
                     return response;
                 }
-                
+
                 responseVersion = headers['x-syncthing-version'];
-                
+
                 if (!guiVersion) {
                     guiVersion = responseVersion;
                 } else if (guiVersion != responseVersion) {
                     document.location.reload(true);
                 }
-                
+
                 if (!deviceId) {
                     deviceId = headers['x-syncthing-id'];
                     if (deviceId) {
@@ -48,7 +54,7 @@ syncthing.config(function ($httpProvider, $translateProvider, LocaleServiceProvi
                         $httpProvider.defaults.xsrfCookieName = 'CSRF-Token-' + deviceIdShort;
                     }
                 }
-                
+
                 return response;
             }
         };
@@ -165,4 +171,3 @@ function debounce(func, wait) {
         return result;
     };
 }
-

gui/syncthing/core/aboutModalDirective.js

@@ -0,0 +1,7 @@
+angular.module('syncthing.core')
+    .directive('aboutModal', function () {
+        return {
+            restrict: 'A',
+            templateUrl: 'syncthing/core/aboutModalView.html'
+        };
+});

gui/syncthing/core/aboutModalView.html

@@ -0,0 +1,91 @@
+<modal id="about" status="info" icon="heart-o" title="{{'About' | translate}}" large="yes" close="yes">
+  <h1 class="text-center"><img alt="Syncthing" title="Syncthing" src="assets/img/logo-horizontal.svg" style="vertical-align: -16px" height="100" width="366"/><br/><small>{{versionString()}}</small></h1>
+  <hr/>
+
+  <p translate>Copyright &copy; 2015 the following Contributors:</p>
+  <div class="row">
+    <div class="col-md-12">
+      <ul class="list-unstyled three-columns" id="contributor-list">
+        <li class="auto-generated">Aaron Bieber</li>
+        <li class="auto-generated">Alexander Graf</li>
+        <li class="auto-generated">Andrew Dunham</li>
+        <li class="auto-generated">Antony Male</li>
+        <li class="auto-generated">Arthur Axel fREW Schmidt</li>
+        <li class="auto-generated">Audrius Butkevicius</li>
+        <li class="auto-generated">Bart De Vries</li>
+        <li class="auto-generated">Ben Curthoys</li>
+        <li class="auto-generated">Ben Schulz</li>
+        <li class="auto-generated">Ben Sidhom</li>
+        <li class="auto-generated">Brandon Philips</li>
+        <li class="auto-generated">Brendan Long</li>
+        <li class="auto-generated">Brian R. Becker</li>
+        <li class="auto-generated">Caleb Callaway</li>
+        <li class="auto-generated">Carsten Hagemann</li>
+        <li class="auto-generated">Cathryne Linenweaver</li>
+        <li class="auto-generated">Chris Howie</li>
+        <li class="auto-generated">Chris Joel</li>
+        <li class="auto-generated">Colin Kennedy</li>
+        <li class="auto-generated">Daniel Bergmann</li>
+        <li class="auto-generated">Daniel Martí</li>
+        <li class="auto-generated">Denis A.</li>
+        <li class="auto-generated">Dennis Wilson</li>
+        <li class="auto-generated">Dominik Heidler</li>
+        <li class="auto-generated">Elias Jarlebring</li>
+        <li class="auto-generated">Emil Hessman</li>
+        <li class="auto-generated">Erik Meitner</li>
+        <li class="auto-generated">Federico Castagnini</li>
+        <li class="auto-generated">Felix Ableitner</li>
+        <li class="auto-generated">Felix Unterpaintner</li>
+        <li class="auto-generated">Francois-Xavier Gsell</li>
+        <li class="auto-generated">Frank Isemann</li>
+        <li class="auto-generated">Gilli Sigurdsson</li>
+        <li class="auto-generated">Jacek Szafarkiewicz</li>
+        <li class="auto-generated">Jakob Borg</li>
+        <li class="auto-generated">James Patterson</li>
+        <li class="auto-generated">Jaroslav Malec</li>
+        <li class="auto-generated">Jens Diemer</li>
+        <li class="auto-generated">Jochen Voss</li>
+        <li class="auto-generated">Johan Vromans</li>
+        <li class="auto-generated">Karol Różycki</li>
+        <li class="auto-generated">Ken'ichi Kamada</li>
+        <li class="auto-generated">Lode Hoste</li>
+        <li class="auto-generated">Lord Landon Agahnim</li>
+        <li class="auto-generated">Marc Laporte</li>
+        <li class="auto-generated">Marc Pujol</li>
+        <li class="auto-generated">Marcin Dziadus</li>
+        <li class="auto-generated">Michael Jephcote</li>
+        <li class="auto-generated">Michael Tilli</li>
+        <li class="auto-generated">Pascal Jungblut</li>
+        <li class="auto-generated">Peter Hoeg</li>
+        <li class="auto-generated">Philippe Schommers</li>
+        <li class="auto-generated">Phill Luby</li>
+        <li class="auto-generated">Piotr Bejda</li>
+        <li class="auto-generated">Ryan Sullivan</li>
+        <li class="auto-generated">Sergey Mishin</li>
+        <li class="auto-generated">Stefan Tatschner</li>
+        <li class="auto-generated">Tim Abell</li>
+        <li class="auto-generated">Tobias Nygren</li>
+        <li class="auto-generated">Tomas Cerveny</li>
+        <li class="auto-generated">Tully Robinson</li>
+        <li class="auto-generated">Veeti Paananen</li>
+        <li class="auto-generated">Vil Brekin</li>
+      </ul>
+    </div>
+  </div>
+  <hr/>
+
+  <p translate>Syncthing includes the following software or portions thereof:</p>
+  <ul class="list-unstyled two-columns">
+    <li><a href="https://golang.org">The Go Programming Language</a>, Copyright &copy; 2012 The Go Authors.</li>
+    <li><a href="https://github.com/bkaradzic/go-lz4">bkaradzic/go-lz4</a>, Copyright &copy; 2011-2012 Branimir Karadzic, 2013 Damian Gryski.</li>
+    <li><a href="https://github.com/kardianos/osext">kardianos/osext</a>, Copyright &copy; 2012 Daniel Theophanes.</li>
+    <li><a href="https://github.com/golang/snappy">golang/snappy</a>, Copyright &copy; 2011 The Snappy-Go Authors.</li>
+    <li><a href="https://github.com/juju/ratelimit">juju/ratelimit</a>, Copyright &copy; 2015 Canonical Ltd.</li>
+    <li><a href="https://github.com/thejerf/suture">thejerf/suture</a>, Copyright &copy; 2014-2015 Barracuda Networks, Inc.</li>
+    <li><a href="https://github.com/syndtr/goleveldb">syndtr/goleveldb</a>, Copyright &copy; 2012, Suryandaru Triandana</li>
+    <li><a href="https://github.com/vitrun/qart">vitrun/qart</a>, Copyright &copy; The Go Authors.</li>
+    <li><a href="https://angularjs.org/">AngularJS</a>, Copyright &copy; 2010-2015 Google, Inc.</li>
+    <li><a href="http://getbootstrap.com/">Bootstrap</a>, Copyright &copy; 2011-2015 Twitter, Inc.</li>
+    <li><a href="http://fontawesome.io/">Font Awesome</a>, Copyright &copy; 2015 Dave Gandy</li>
+  </ul>
+</modal>

gui/syncthing/core/durationFilter.js

@@ -21,11 +21,11 @@ angular.module('syncthing.core')
                 var t = (input/SECONDS_IN[k] | 0); // Math.floor
 
                 if (t > 0) {
-                    result += " " + t + k; 
+                    result += " " + t + k;
                 }
 
                 if (precision == k) {
-                    return result ? result : "<1" + k; 
+                    return result ? result : "<1" + k;
                 } else {
                     input %= SECONDS_IN[k];
                 }

gui/syncthing/core/httpErrorDialogDirective.js

@@ -0,0 +1,7 @@
+angular.module('syncthing.core')
+    .directive('httpErrorDialog', function () {
+        return {
+            restrict: 'A',
+            templateUrl: 'syncthing/core/httpErrorDialogView.html'
+        };
+});

gui/syncthing/core/httpErrorDialogView.html

@@ -0,0 +1,5 @@
+<modal id="httpError" status="danger" icon="exclamation-circle" title="{{'Connection Error' | translate}}">
+	<p translate>
+	  Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.
+	</p>
+</modal>

gui/syncthing/core/languageSelectDirective.js

@@ -4,7 +4,7 @@ angular.module('syncthing.core')
         return {
             restrict: 'EA',
             template:
-                    '<a ng-if="visible" href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="true"><span class="glyphicon glyphicon-globe"></span>&nbsp;{{localesNames[currentLocale] || "English"}} <span class="caret"></span></a>'+
+                    '<a ng-if="visible" href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="true"><span class="fa fa-globe"></span>&nbsp;{{localesNames[currentLocale] || "English"}} <span class="caret"></span></a>'+
                     '<ul ng-if="visible" class="dropdown-menu">'+
                         '<li ng-repeat="(i,name) in localesNames" ng-class="{active: i==currentLocale}">'+
                             '<a href="#" data-ng-click="changeLanguage(i)">{{name}}</a>'+

gui/syncthing/core/majorUpgradeModalDirective.js

@@ -0,0 +1,7 @@
+angular.module('syncthing.core')
+    .directive('majorUpgradeModal', function () {
+        return {
+            restrict: 'A',
+            templateUrl: 'syncthing/core/majorUpgradeModalView.html'
+        };
+});

gui/syncthing/core/majorUpgradeModalView.html

@@ -0,0 +1,29 @@
+<div id="majorUpgrade" class="modal fade" tabindex="-1" data-backdrop="true" data-keyboard="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header alert alert-danger">
+        <h4 class="modal-title">
+          <span class="fa fa-arrow-circle-up"></span><span translate>Major Upgrade</span>
+        </h4>
+      </div>
+      <div class="modal-body">
+        <p>
+          <span translate>This is a major version upgrade.</span>
+          <span translate>A new major version may not be compatible with previous versions.</span>
+          <span translate>Please consult the release notes before performing a major upgrade.</span>
+        </p>
+        <p>
+          <a href="https://github.com/syncthing/syncthing/releases/tag/{{upgradeInfo.latest}}" target="_blank" translate>Release Notes</a>
+        </p>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-primary btn-sm" ng-click="upgrade()">
+          <span class="fa fa-check"></span>&nbsp;<span translate>Upgrade</span>
+        </button>
+        <button type="button" class="btn btn-default btn-sm" data-dismiss="modal">
+          <span class="fa fa-times"></span>&nbsp;<span translate>Close</span>
+        </button>
+      </div>
+    </div>
+  </div>
+</div>

gui/syncthing/core/networkErrorDialogDirective.js

@@ -0,0 +1,7 @@
+angular.module('syncthing.core')
+    .directive('networkErrorDialog', function () {
+        return {
+            restrict: 'A',
+            templateUrl: 'syncthing/core/networkErrorDialogView.html'
+        };
+});

gui/syncthing/core/networkErrorDialogView.html

@@ -0,0 +1,5 @@
+<modal id="networkError" status="danger" icon="exclamation-circle" title="{{'Connection Error' | translate}}">
+	<p translate>
+	  Syncthing seems to be down, or there is a problem with your Internet connection. Retrying&hellip;
+	</p>
+</modal>

gui/syncthing/core/restartingDialogDirective.js

@@ -0,0 +1,7 @@
+angular.module('syncthing.core')
+    .directive('restartingDialog', function () {
+        return {
+            restrict: 'A',
+            templateUrl: 'syncthing/core/restartingDialogView.html'
+        };
+});

gui/syncthing/core/restartingDialogView.html

@@ -0,0 +1,3 @@
+<modal id="restarting" status="info" icon="refresh" title="{{'Restarting' | translate}}">
+	<p><span translate>Syncthing is restarting.</span> <span translate>Please wait</span>...</p>
+</modal>

gui/syncthing/core/shutdownDialogDirective.js

@@ -0,0 +1,7 @@
+angular.module('syncthing.core')
+    .directive('shutdownDialog', function () {
+        return {
+            restrict: 'A',
+            templateUrl: 'syncthing/core/shutdownDialogView.html'
+        };
+});

gui/syncthing/core/shutdownDialogView.html

@@ -0,0 +1,3 @@
+<modal id="shutdown" status="success" icon="power-off" title="{{'Shutdown Complete' | translate}}">
+	<p translate>Syncthing has been shut down.</p>
+</modal>

gui/syncthing/core/syncthingController.js

@@ -69,9 +69,9 @@ angular.module('syncthing.core')
             'touch': 'Update'
         };
         $scope.needIcons = {
-            'rm': 'remove',
-            'rmdir': 'remove',
-            'sync': 'download',
+            'rm': 'trash-o',
+            'rmdir': 'trash-o',
+            'sync': 'arrow-circle-o-down',
             'touch': 'asterisk'
         };
 
@@ -1057,6 +1057,7 @@ angular.module('syncthing.core')
                 selectedDevices: {}
             };
             $scope.currentFolder.rescanIntervalS = 60;
+            $scope.currentFolder.minDiskFreePct = 1;
             $scope.currentFolder.order = "random";
             $scope.currentFolder.fileVersioningSelector = "none";
             $scope.currentFolder.trashcanClean = 0;
@@ -1077,6 +1078,8 @@ angular.module('syncthing.core')
                 id: folder,
                 selectedDevices: {},
                 rescanIntervalS: 60,
+                minDiskFreePct: 1,
+                order: "random",
                 fileVersioningSelector: "none",
                 trashcanClean: 0,
                 simpleKeep: 5,

gui/syncthing/core/upgradingDialogDirective.js

@@ -0,0 +1,7 @@
+angular.module('syncthing.core')
+    .directive('upgradingDialog', function () {
+        return {
+            restrict: 'A',
+            templateUrl: 'syncthing/core/upgradingDialogView.html'
+        };
+});

gui/syncthing/core/upgradingDialogView.html

@@ -0,0 +1,3 @@
+<modal id="upgrading" status="info" icon="arrow-circle-up" title="{{'Upgrading' | translate}}">
+	<p><span translate>Syncthing is upgrading.</span> <span translate>Please wait</span>...</p>
+</modal>