lib/model: Also handle missing parent dir non-regular items (#5048)

This is an improvement of PR #4493 and related to (and maybe fixing) #4961
and #4475. Maybe fixing, because there is no clear reproducer for that
problem.

The previous PR added a mechanism to resurrect missing parent directories,
if there is a valid child file to be pulled. The same mechanism does not
exist for dirs and symlinks, even though a missing parent can happen for
those items as well. Therefore this PR extends the resurrection to all types
of pulled items.

In addition I moved the IsDeleted branch while iterating over
processDirectly to the existing IsDeleted branch in the WithNeed iteration.
This saves one pointless assignment and IsDeleted query. Also

.gitignore

@@ -17,3 +17,9 @@ RELEASE
 deb
 lib/auto/gui.files.go
 snapcraft.yaml
+prime/
+snap/
+parts/
+stage/
+*.snap
+*.bz2

AUTHORS

@@ -15,6 +15,7 @@ Alexander Graf (alex2108) <register-github@alex-graf.de>
 Alexandre Viau (aviau) <alexandre@alexandreviau.net> <aviau@debian.org>
 Anderson Mesquita (andersonvom) <andersonvom@gmail.com>
 Andrew Dunham (andrew-d) <andrew@du.nham.ca>
+Andrew Rabert (nvllsvm) <ar@nullsum.net>
 Andrey D (scienmind) <scintertech@cryptolab.net>
 Antoine Lamielle (0x010C) <antoine.lamielle@0x010c.fr> <gh@0x010c.fr>
 Antony Male (canton7) <antony.male@gmail.com>
@@ -57,6 +58,7 @@ Gilli Sigurdsson (gillisig) <gilli@vx.is>
 Graham Miln (grahammiln) <graham.miln@dssw.co.uk> <graham.miln@miln.eu>
 Harrison Jones (harrisonhjones) <harrisonhjones@users.noreply.github.com>
 Heiko Zuerker (Smiley73) <heiko@zuerker.org>
+Ian Johnson (anonymouse64) <ian.johnson@canonical.com> <person.uwsome@gmail.com>
 Jaakko Hannikainen (jgke) <jgke@jgke.fi>
 Jacek Szafarkiewicz (hadogenes) <szafar@linux.pl>
 Jake Peterson (acogdev) <jake@acogdev.com>
@@ -65,6 +67,7 @@ James Patterson (jpjp) <jamespatterson@operamail.com> <jpjp@users.noreply.github
 Jaroslav Malec (dzarda) <dzardacz@gmail.com>
 Jaya Chithra (jayachithra) <s.k.jayachithra@gmail.com>
 Jens Diemer (jedie) <github.com@jensdiemer.de> <git@jensdiemer.de>
+Jerry Jacobs (xor-gate) <jerry.jacobs@xor-gate.org> <xor-gate@users.noreply.github.com>
 Jochen Voss (seehuhn) <voss@seehuhn.de>
 Johan Vromans (sciurius) <jvromans@squirrel.nl>
 John Rinehart (fuzzybear3965) <johnrichardrinehart@gmail.com>

CONDUCT.md

@@ -1,92 +1,73 @@
-## Conduct
+# Contributor Covenant Code of Conduct
 
-* We are committed to providing a friendly, safe and welcoming
-  environment for all, regardless of gender, sexual orientation,
-  disability, ethnicity, religion, or similar personal characteristic.
+## Our Pledge
 
-* On IRC, please avoid using overtly sexual nicknames or other nicknames
-  that might detract from a friendly, safe and welcoming environment for
-  all.
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+education, socio-economic status, nationality, personal appearance, race,
+religion, or sexual identity and orientation.
 
-* Please be kind and courteous. There's no need to be mean or rude.
+## Our Standards
 
-* Respect that people have differences of opinion and that every design
-  or implementation choice carries a trade-off and numerous costs. There
-  is seldom a right answer.
+Examples of behavior that contributes to creating a positive environment
+include:
 
-* Please keep unstructured critique to a minimum. If you have solid
-  ideas you want to experiment with, make a fork and see how it works.
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
 
-* We will exclude you from interaction if you insult, demean or harass
-  anyone. That is not welcome behaviour. We interpret the term
-  "harassment" as including the definition in the <a
-  href="http://citizencodeofconduct.org/">Citizen Code of Conduct</a>;
-  if you have any lack of clarity about what might be included in that
-  concept, please read their definition. In particular, we don't
-  tolerate behavior that excludes people in socially marginalized
-  groups.
+Examples of unacceptable behavior by participants include:
 
-* Private harassment is also unacceptable. No matter who you are, if you
-  feel you have been or are being harassed or made uncomfortable by a
-  community member, please contact one of the channel ops or any of the
-  Syncthing core team immediately. Whether you're a regular  contributor
-  or a newcomer, we care about making this community a safe place for
-  you and we've got your back.
+* The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
 
-* Likewise any spamming, trolling, flaming, baiting or other
-  attention-stealing behaviour is not welcome.
+## Our Responsibilities
 
-## Moderation
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
 
-These are the policies for upholding our community's standards of
-conduct in our communication channels, most notably in Syncthing-related
-IRC channels and on the web forum.
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
 
-1. Remarks that violate the Syncthing standards of conduct, including
-   hateful, hurtful, oppressive, or exclusionary remarks, are not
-   allowed. (Cursing is allowed, but never targeting another user, and
-   never in a hateful manner.)
+## Scope
 
-2. Remarks that moderators find inappropriate, whether listed in the
-   code of conduct or not, are also not allowed.
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
 
-3. Moderators will first respond to such remarks with a warning.
+## Enforcement
 
-4. If the warning is unheeded, the user will be "kicked," i.e., kicked
-   out of the communication channel to cool off.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at security@syncthing.net. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
 
-5. If the user comes back and continues to make trouble, they will be
-   banned, i.e., indefinitely excluded.
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
 
-6. Moderators may choose at their discretion to un-ban the user if it
-   was a first offense and they offer the offended party a genuine
-   apology.
+## Attribution
 
-7. If a moderator bans someone and you think it was unjustified, please
-   take it up with that moderator, or with a different moderator, **in
-   private**. Complaints about bans in-channel are not allowed.
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
 
-8. Moderators are held to a higher standard than other community
-   members. If a moderator creates an inappropriate situation, they
-   should expect less leeway than others.
-
-In the Syncthing community we strive to go the extra step to look out
-for each other. Don't just aim to be technically unimpeachable, try to
-be your best self. In particular, avoid flirting with offensive or
-sensitive issues, particularly if they're off-topic; this all too
-often leads to unnecessary fights, hurt feelings, and damaged trust;
-worse, it can drive people away from the community entirely.
-
-And if someone takes issue with something you said or did, resist the
-urge to be defensive. Just stop doing what it was they complained about
-and apologize. Even if you feel you were misinterpreted or unfairly
-accused, chances are good there was something you could've communicated
-better — remember that it's your responsibility to make your fellow
-community members comfortable. Everyone wants to get along and we are
-all here first and foremost because we want to talk about cool
-technology. You will find that people will be eager to assume good
-intent and forgive as long as you earn their trust.
-
-*Adapted from the [Rust Code of Conduct](https://github.com/rust-lang/rust/wiki/Note-development-policy#conduct)*
-
-*Adapted from the [Node.js Policy on Trolling](http://blog.izs.me/post/30036893703/policy-on-trolling)*
+[homepage]: https://www.contributor-covenant.org

Dockerfile

@@ -18,15 +18,14 @@ RUN apk add --no-cache ca-certificates
 
 COPY --from=builder /go/src/github.com/syncthing/syncthing/syncthing /bin/syncthing
 
-RUN echo 'syncthing:x:1000:1000::/var/syncthing:/sbin/nologin' >> /etc/passwd \
-    && echo 'syncthing:!::0:::::' >> /etc/shadow \
-    && chown syncthing /var/syncthing
+RUN apk add --no-cache su-exec
 
-USER syncthing
 ENV STNOUPGRADE=1
+ENV PUID=1000
+ENV PGID=1000
 
 HEALTHCHECK --interval=1m --timeout=10s \
   CMD nc -z localhost 8384 || exit 1
 
-ENTRYPOINT ["/bin/syncthing", "-home", "/var/syncthing/config", "-gui-address", "0.0.0.0:8384"]
-
+ENTRYPOINT chown $PUID:$PGID /var/syncthing \
+    && su-exec $PUID:$PGID /bin/syncthing -home /var/syncthing/config -gui-address 0.0.0.0:8384

README-Docker.md

@@ -11,8 +11,8 @@ The exposed volumes are by default:
 
 You can add more folders and map them as you prefer.
 
-Note that Syncthing runs as UID 1000 in the container. This UID must have
-permission to read and modify the files in the containers.
+Note that Syncthing runs as UID 1000 and GID 1000 by default. These may be
+altered with the ``PUID`` and ``PGID`` environment variables.
 
 Example usage:
 

build.go

@@ -47,6 +47,7 @@ var (
 	installSuffix string
 	pkgdir        string
 	debugBinary   bool
+	timeout       = "120s"
 )
 
 type target struct {
@@ -238,8 +239,6 @@ func main() {
 	// might have installed during "build.go setup".
 	os.Setenv("PATH", fmt.Sprintf("%s%cbin%c%s", os.Getenv("GOPATH"), os.PathSeparator, os.PathListSeparator, os.Getenv("PATH")))
 
-	checkArchitecture()
-
 	// Invoking build.go with no parameters at all builds everything (incrementally),
 	// which is what you want for maximum error checking during development.
 	if flag.NArg() == 0 {
@@ -261,15 +260,6 @@ func main() {
 	}
 }
 
-func checkArchitecture() {
-	switch goarch {
-	case "386", "amd64", "arm", "arm64", "ppc64", "ppc64le", "mips", "mipsle":
-		break
-	default:
-		log.Printf("Unknown goarch %q; proceed with caution!", goarch)
-	}
-}
-
 func runCommand(cmd string, target target) {
 	switch cmd {
 	case "setup":
@@ -401,9 +391,9 @@ func test(pkgs ...string) {
 	}
 
 	if useRace {
-		runPrint("go", append([]string{"test", "-short", "-race", "-timeout", "60s", "-tags", "purego"}, pkgs...)...)
+		runPrint("go", append([]string{"test", "-short", "-race", "-timeout", timeout, "-tags", "purego"}, pkgs...)...)
 	} else {
-		runPrint("go", append([]string{"test", "-short", "-timeout", "60s", "-tags", "purego"}, pkgs...)...)
+		runPrint("go", append([]string{"test", "-short", "-timeout", timeout, "-tags", "purego"}, pkgs...)...)
 	}
 }
 
@@ -628,6 +618,8 @@ func buildSnap(target target) {
 	snaparch := goarch
 	if snaparch == "armhf" {
 		goarch = "arm"
+	} else if snaparch == "i386" {
+		goarch = "386"
 	}
 	snapver := version
 	if strings.HasPrefix(snapver, "v") {
@@ -638,9 +630,10 @@ func buildSnap(target target) {
 		snapgrade = "stable"
 	}
 	err = tmpl.Execute(f, map[string]string{
-		"Version":      snapver,
-		"Architecture": snaparch,
-		"Grade":        snapgrade,
+		"Version":            snapver,
+		"HostArchitecture":   runtime.GOARCH,
+		"TargetArchitecture": snaparch,
+		"Grade":              snapgrade,
 	})
 	if err != nil {
 		log.Fatal(err)
@@ -747,12 +740,12 @@ func listFiles(dir string) []string {
 }
 
 func rebuildAssets() {
-	runPipe("lib/auto/gui.files.go", "go", "run", "script/genassets.go", "gui")
-	runPipe("cmd/strelaypoolsrv/auto/gui.go", "go", "run", "script/genassets.go", "cmd/strelaypoolsrv/gui")
+	os.Setenv("SOURCE_DATE_EPOCH", fmt.Sprint(buildStamp()))
+	runPrint("go", "generate", "github.com/syncthing/syncthing/lib/auto", "github.com/syncthing/syncthing/cmd/strelaypoolsrv/auto")
 }
 
 func lazyRebuildAssets() {
-	if shouldRebuildAssets("lib/auto/gui.files.go", "gui") || shouldRebuildAssets("cmd/strelaypoolsrv/auto/gui.go", "cmd/strelaypoolsrv/auto/gui") {
+	if shouldRebuildAssets("lib/auto/gui.files.go", "gui") || shouldRebuildAssets("cmd/strelaypoolsrv/auto/gui.files.go", "cmd/strelaypoolsrv/auto/gui") {
 		rebuildAssets()
 	}
 }
@@ -979,7 +972,7 @@ func buildHost() string {
 func buildArch() string {
 	os := goos
 	if os == "darwin" {
-		os = "macosx"
+		os = "macos"
 	}
 	return fmt.Sprintf("%s-%s", os, goarch)
 }

cmd/stcli/cmd_general.go

@@ -5,6 +5,7 @@ package main
 import (
 	"encoding/json"
 	"fmt"
+	"os"
 
 	"github.com/AudriusButkevicius/cli"
 )
@@ -23,6 +24,12 @@ func init() {
 			Requires: &cli.Requires{},
 			Action:   generalStatus,
 		},
+		{
+			Name:     "config",
+			Usage:    "Configuration",
+			Requires: &cli.Requires{},
+			Action:   generalConfiguration,
+		},
 		{
 			Name:     "restart",
 			Usage:    "Restart syncthing",
@@ -70,6 +77,15 @@ func generalStatus(c *cli.Context) {
 	fmt.Println("Config in sync")
 }
 
+func generalConfiguration(c *cli.Context) {
+	response := httpGet(c, "system/config")
+	var jsResponse interface{}
+	json.Unmarshal(responseToBArray(response), &jsResponse)
+	enc := json.NewEncoder(os.Stdout)
+	enc.SetIndent("", "  ")
+	enc.Encode(jsResponse)
+}
+
 func generalVersion(c *cli.Context) {
 	response := httpGet(c, "system/version")
 	version := make(map[string]interface{})

cmd/stdiscosrv/database.go

@@ -195,6 +195,7 @@ func (s *levelDBStore) statisticsServe(trigger <-chan struct{}, done chan<- stru
 		nowNanos := t0.UnixNano()
 		cutoff24h := t0.Add(-24 * time.Hour).UnixNano()
 		cutoff1w := t0.Add(-7 * 24 * time.Hour).UnixNano()
+		cutoff2Mon := t0.Add(-60 * 24 * time.Hour).UnixNano()
 		current, last24h, last1w, inactive, errors := 0, 0, 0, 0, 0
 
 		iter := s.db.NewIterator(&util.Range{}, nil)
@@ -217,6 +218,17 @@ func (s *levelDBStore) statisticsServe(trigger <-chan struct{}, done chan<- stru
 				last24h++
 			case rec.Seen > cutoff1w:
 				last1w++
+			case rec.Seen > cutoff2Mon:
+				inactive++
+			case rec.Missed < cutoff2Mon:
+				// It hasn't been seen lately and we haven't recorded
+				// someone asking for this device in a long time either;
+				// delete the record.
+				if err := s.db.Delete(iter.Key(), nil); err != nil {
+					databaseOperations.WithLabelValues(dbOpDelete, dbResError).Inc()
+				} else {
+					databaseOperations.WithLabelValues(dbOpDelete, dbResSuccess).Inc()
+				}
 			default:
 				inactive++
 			}

cmd/stdiscosrv/stats.go

@@ -95,6 +95,7 @@ const (
 	dbOpGet             = "get"
 	dbOpPut             = "put"
 	dbOpMerge           = "merge"
+	dbOpDelete          = "delete"
 	dbResSuccess        = "success"
 	dbResNotFound       = "not_found"
 	dbResError          = "error"

cmd/stfindignored/main.go

@@ -0,0 +1,44 @@
+// Copyright (C) 2018 The Syncthing Authors.
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this file,
+// You can obtain one at https://mozilla.org/MPL/2.0/.
+
+// Commmand stfindignored lists ignored files under a given folder root.
+package main
+
+import (
+	"flag"
+	"fmt"
+	"os"
+
+	"github.com/syncthing/syncthing/lib/fs"
+	"github.com/syncthing/syncthing/lib/ignore"
+)
+
+func main() {
+	flag.Parse()
+	root := flag.Arg(0)
+	if root == "" {
+		root = "."
+	}
+
+	vfs := fs.NewWalkFilesystem(fs.NewFilesystem(fs.FilesystemTypeBasic, root))
+
+	ign := ignore.New(vfs)
+	if err := ign.Load(".stignore"); err != nil {
+		fmt.Fprintf(os.Stderr, "Fatal: loading ignores: %v\n", err)
+		os.Exit(1)
+	}
+
+	vfs.Walk(".", func(path string, info fs.FileInfo, err error) error {
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "Warning: %s: %v\n", path, err)
+			return fs.SkipDir
+		}
+		if ign.Match(path).IsIgnored() {
+			fmt.Println(path)
+		}
+		return nil
+	})
+}

cmd/strelaypoolsrv/auto/.gitignore

@@ -1 +1 @@
-gui.go
+gui.files.go

cmd/strelaypoolsrv/auto/doc.go

@@ -0,0 +1,10 @@
+// Copyright (C) 2018 The Syncthing Authors.
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this file,
+// You can obtain one at https://mozilla.org/MPL/2.0/.
+
+//go:generate go run ../../../script/genassets.go -o gui.files.go ../gui
+
+// Package auto contains auto generated files for web assets.
+package auto

cmd/strelaypoolsrv/gui/index.html

@@ -10,7 +10,7 @@
 
     <title>Relay stats</title>
     <link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" rel="stylesheet"/>
-    <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.6.1/css/font-awesome.min.css"/>
+    <link rel="stylesheet" href="//use.fontawesome.com/releases/v5.0.13/css/all.css"/>
 
     <style>
       #map {
@@ -58,37 +58,37 @@
               <th rowspan="2">
                 <a ng-click="sortType = 'stats.numActiveSessions'; sortReverse = !sortReverse">
                   Sessions
-                  <span ng-show="sortType == 'stats.numActiveSessions' && !sortReverse" class="fa fa-caret-down"></span>
-                  <span ng-show="sortType == 'stats.numActiveSessions' && sortReverse" class="fa fa-caret-up"></span>
+                  <span ng-show="sortType == 'stats.numActiveSessions' && !sortReverse" class="fas fa-caret-down"></span>
+                  <span ng-show="sortType == 'stats.numActiveSessions' && sortReverse" class="fas fa-caret-up"></span>
                 </a>
               </th>
               <th rowspan="2">
                 <a ng-click="sortType = 'stats.numConnections'; sortReverse = !sortReverse">
                   Connections
-                  <span ng-show="sortType == 'stats.numConnections' && !sortReverse" class="fa fa-caret-down"></span>
-                  <span ng-show="sortType == 'stats.numConnections' && sortReverse" class="fa fa-caret-up"></span>
+                  <span ng-show="sortType == 'stats.numConnections' && !sortReverse" class="fas fa-caret-down"></span>
+                  <span ng-show="sortType == 'stats.numConnections' && sortReverse" class="fas fa-caret-up"></span>
                 </a>
               </th>
               <th rowspan="2">
                 <a ng-click="sortType = 'stats.bytesProxied'; sortReverse = !sortReverse">
                   Data relayed
-                  <span ng-show="sortType == 'stats.bytesProxied' && !sortReverse" class="fa fa-caret-down"></span>
-                  <span ng-show="sortType == 'stats.bytesProxied' && sortReverse" class="fa fa-caret-up"></span>
+                  <span ng-show="sortType == 'stats.bytesProxied' && !sortReverse" class="fas fa-caret-down"></span>
+                  <span ng-show="sortType == 'stats.bytesProxied' && sortReverse" class="fas fa-caret-up"></span>
                 </a>
               </th>
               <th colspan="6" class="text-center">Transfer rate in the last period</th>
               <th rowspan="2">
                 <a ng-click="sortType = 'stats.uptimeSeconds'; sortReverse = !sortReverse">
                   Uptime hours
-                  <span ng-show="sortType == 'stats.uptimeSeconds' && !sortReverse" class="fa fa-caret-down"></span>
-                  <span ng-show="sortType == 'status.uptimeSeconds' && sortReverse" class="fa fa-caret-up"></span>
+                  <span ng-show="sortType == 'stats.uptimeSeconds' && !sortReverse" class="fas fa-caret-down"></span>
+                  <span ng-show="sortType == 'status.uptimeSeconds' && sortReverse" class="fas fa-caret-up"></span>
                 </a>
               </th>
               <th rowspan="2">
                 <a ng-click="sortType = 'stats.options[\'provided-by\'] || \'\''; sortReverse = !sortReverse">
                   Provided by
-                  <span ng-show="sortType == 'stats.options[\'provided-by\'] || \'\'' && !sortReverse" class="fa fa-caret-down"></span>
-                  <span ng-show="sortType == 'stats.options[\'provided-by\'] || \'\'' && sortReverse" class="fa fa-caret-up"></span>
+                  <span ng-show="sortType == 'stats.options[\'provided-by\'] || \'\'' && !sortReverse" class="fas fa-caret-down"></span>
+                  <span ng-show="sortType == 'stats.options[\'provided-by\'] || \'\'' && sortReverse" class="fas fa-caret-up"></span>
                 </a>
               </th>
             </tr>
@@ -96,43 +96,43 @@
               <th>
                 <a ng-click="sortType = 'stats.kbps10s1m5m15m30m60m[0]'; sortReverse = !sortReverse">
                   10s
-                  <span ng-show="sortType == 'stats.kbps10s1m5m15m30m60m[0]' && !sortReverse" class="fa fa-caret-down"></span>
-                  <span ng-show="sortType == 'stats.kbps10s1m5m15m30m60m[0]' && sortReverse" class="fa fa-caret-up"></span>
+                  <span ng-show="sortType == 'stats.kbps10s1m5m15m30m60m[0]' && !sortReverse" class="fas fa-caret-down"></span>
+                  <span ng-show="sortType == 'stats.kbps10s1m5m15m30m60m[0]' && sortReverse" class="fas fa-caret-up"></span>
                 </a>
               </th>
               <th>
                 <a ng-click="sortType = 'stats.kbps10s1m5m15m30m60m[1]'; sortReverse = !sortReverse">
                   1m
-                  <span ng-show="sortType == 'stats.kbps10s1m5m15m30m60m[1]' && !sortReverse" class="fa fa-caret-down"></span>
-                  <span ng-show="sortType == 'stats.kbps10s1m5m15m30m60m[1]' && sortReverse" class="fa fa-caret-up"></span>
+                  <span ng-show="sortType == 'stats.kbps10s1m5m15m30m60m[1]' && !sortReverse" class="fas fa-caret-down"></span>
+                  <span ng-show="sortType == 'stats.kbps10s1m5m15m30m60m[1]' && sortReverse" class="fas fa-caret-up"></span>
                 </a>
               </th>
               <th>
                 <a ng-click="sortType = 'stats.kbps10s1m5m15m30m60m[2]'; sortReverse = !sortReverse">
                   5m
-                  <span ng-show="sortType == 'stats.kbps10s1m5m15m30m60m[2]' && !sortReverse" class="fa fa-caret-down"></span>
-                  <span ng-show="sortType == 'stats.kbps10s1m5m15m30m60m[2]' && sortReverse" class="fa fa-caret-up"></span>
+                  <span ng-show="sortType == 'stats.kbps10s1m5m15m30m60m[2]' && !sortReverse" class="fas fa-caret-down"></span>
+                  <span ng-show="sortType == 'stats.kbps10s1m5m15m30m60m[2]' && sortReverse" class="fas fa-caret-up"></span>
                 </a>
               </th>
               <th>
                 <a ng-click="sortType = 'stats.kbps10s1m5m15m30m60m[3]'; sortReverse = !sortReverse">
                   15m
-                  <span ng-show="sortType == 'stats.kbps10s1m5m15m30m60m[3]' && !sortReverse" class="fa fa-caret-down"></span>
-                  <span ng-show="sortType == 'stats.kbps10s1m5m15m30m60m[3]' && sortReverse" class="fa fa-caret-up"></span>
+                  <span ng-show="sortType == 'stats.kbps10s1m5m15m30m60m[3]' && !sortReverse" class="fas fa-caret-down"></span>
+                  <span ng-show="sortType == 'stats.kbps10s1m5m15m30m60m[3]' && sortReverse" class="fas fa-caret-up"></span>
                 </a>
               </th>
               <th>
                 <a ng-click="sortType = 'stats.kbps10s1m5m15m30m60m[4]'; sortReverse = !sortReverse">
                   30m
-                  <span ng-show="sortType == 'stats.kbps10s1m5m15m30m60m[4]' && !sortReverse" class="fa fa-caret-down"></span>
-                  <span ng-show="sortType == 'stats.kbps10s1m5m15m30m60m[4]' && sortReverse" class="fa fa-caret-up"></span>
+                  <span ng-show="sortType == 'stats.kbps10s1m5m15m30m60m[4]' && !sortReverse" class="fas fa-caret-down"></span>
+                  <span ng-show="sortType == 'stats.kbps10s1m5m15m30m60m[4]' && sortReverse" class="fas fa-caret-up"></span>
                 </a>
               </th>
               <th>
                 <a ng-click="sortType = 'stats.kbps10s1m5m15m30m60m[5]'; sortReverse = !sortReverse">
                   60m
-                  <span ng-show="sortType == 'stats.kbps10s1m5m15m30m60m[5]' && !sortReverse" class="fa fa-caret-down"></span>
-                  <span ng-show="sortType == 'stats.kbps10s1m5m15m30m60m[5]' && sortReverse" class="fa fa-caret-up"></span>
+                  <span ng-show="sortType == 'stats.kbps10s1m5m15m30m60m[5]' && !sortReverse" class="fas fa-caret-down"></span>
+                  <span ng-show="sortType == 'stats.kbps10s1m5m15m30m60m[5]' && sortReverse" class="fas fa-caret-up"></span>
                 </a>
               </th>
             </tr>

cmd/syncthing/gui.go

@@ -219,14 +219,14 @@ func sendJSON(w http.ResponseWriter, jsonObject interface{}) {
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	// Marshalling might fail, in which case we should return a 500 with the
 	// actual error.
-	bs, err := json.Marshal(jsonObject)
+	bs, err := json.MarshalIndent(jsonObject, "", "  ")
 	if err != nil {
 		// This Marshal() can't fail though.
 		bs, _ = json.Marshal(map[string]string{"error": err.Error()})
 		http.Error(w, string(bs), http.StatusInternalServerError)
 		return
 	}
-	w.Write(bs)
+	fmt.Fprintf(w, "%s\n", bs)
 }
 
 func (s *apiService) Serve() {
@@ -1497,13 +1497,16 @@ func (f jsonFileInfo) MarshalJSON() ([]byte, error) {
 		"size":          f.Size,
 		"permissions":   fmt.Sprintf("%#o", f.Permissions),
 		"deleted":       f.Deleted,
-		"invalid":       f.Invalid,
+		"invalid":       protocol.FileInfo(f).IsInvalid(),
+		"ignored":       protocol.FileInfo(f).IsIgnored(),
+		"mustRescan":    protocol.FileInfo(f).MustRescan(),
 		"noPermissions": f.NoPermissions,
 		"modified":      protocol.FileInfo(f).ModTime(),
 		"modifiedBy":    f.ModifiedBy.String(),
 		"sequence":      f.Sequence,
 		"numBlocks":     len(f.Blocks),
 		"version":       jsonVersionVector(f.Version),
+		"localFlags":    f.LocalFlags,
 	})
 }
 
@@ -1516,11 +1519,16 @@ func (f jsonDBFileInfo) MarshalJSON() ([]byte, error) {
 		"size":          f.Size,
 		"permissions":   fmt.Sprintf("%#o", f.Permissions),
 		"deleted":       f.Deleted,
-		"invalid":       f.Invalid,
+		"invalid":       db.FileInfoTruncated(f).IsInvalid(),
+		"ignored":       db.FileInfoTruncated(f).IsIgnored(),
+		"mustRescan":    db.FileInfoTruncated(f).MustRescan(),
 		"noPermissions": f.NoPermissions,
 		"modified":      db.FileInfoTruncated(f).ModTime(),
 		"modifiedBy":    f.ModifiedBy.String(),
 		"sequence":      f.Sequence,
+		"numBlocks":     nil, // explicitly unknown
+		"version":       jsonVersionVector(f.Version),
+		"localFlags":    f.LocalFlags,
 	})
 }
 

cmd/syncthing/gui_statics.go

@@ -131,9 +131,11 @@ func (s *staticsServer) serveAsset(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Last-Modified", modified.Format(http.TimeFormat))
 	w.Header().Set("Etag", etag)
 
-	if t, err := time.Parse(http.TimeFormat, r.Header.Get("If-Modified-Since")); err == nil && modified.Add(time.Second).After(t) {
-		w.WriteHeader(http.StatusNotModified)
-		return
+	if t, err := time.Parse(http.TimeFormat, r.Header.Get("If-Modified-Since")); err == nil {
+		if modified.Equal(t) || modified.Before(t) {
+			w.WriteHeader(http.StatusNotModified)
+			return
+		}
 	}
 
 	if match := r.Header.Get("If-None-Match"); match != "" {

cmd/syncthing/main.go

@@ -702,7 +702,7 @@ func syncthingMain(runtimeOptions RuntimeOptions) {
 	dbFile := locations[locDatabase]
 	ldb, err := db.Open(dbFile)
 	if err != nil {
-		l.Fatalln("Cannot open database:", err, "- Is another copy of Syncthing already running?")
+		l.Fatalln("Error opening database:", err)
 	}
 
 	if runtimeOptions.resetDeltaIdxs {
@@ -751,9 +751,6 @@ func syncthingMain(runtimeOptions RuntimeOptions) {
 		miscDB.PutString("prevVersion", Version)
 	}
 
-	// Potential database transitions
-	ldb.UpdateSchema()
-
 	m := model.NewModel(cfg, myID, "syncthing", Version, ldb, protectedFiles)
 
 	if t := os.Getenv("STDEADLOCKTIMEOUT"); t != "" {

cmd/syncthing/summaryservice.go

@@ -60,7 +60,7 @@ func (c *folderSummaryService) Stop() {
 // listenForUpdates subscribes to the event bus and makes note of folders that
 // need their data recalculated.
 func (c *folderSummaryService) listenForUpdates() {
-	sub := events.Default.Subscribe(events.LocalIndexUpdated | events.RemoteIndexUpdated | events.StateChanged | events.RemoteDownloadProgress | events.DeviceConnected)
+	sub := events.Default.Subscribe(events.LocalIndexUpdated | events.RemoteIndexUpdated | events.StateChanged | events.RemoteDownloadProgress | events.DeviceConnected | events.FolderWatchStateChanged)
 	defer events.Default.Unsubscribe(sub)
 
 	for {
@@ -105,14 +105,14 @@ func (c *folderSummaryService) listenForUpdates() {
 					// c.immediate must be nonblocking so that we can continue
 					// handling events.
 
+					c.foldersMut.Lock()
 					select {
 					case c.immediate <- folder:
-						c.foldersMut.Lock()
 						delete(c.folders, folder)
-						c.foldersMut.Unlock()
-
 					default:
+						c.folders[folder] = struct{}{}
 					}
+					c.foldersMut.Unlock()
 				}
 
 			default:

cmd/syncthing/usage_report.go

@@ -79,7 +79,8 @@ func reportData(cfg configIntf, m modelIntf, connectionsService connectionsIntf,
 
 	var rescanIntvs []int
 	folderUses := map[string]int{
-		"readonly":            0,
+		"sendonly":            0,
+		"sendreceive":         0,
 		"ignorePerms":         0,
 		"ignoreDelete":        0,
 		"autoNormalize":       0,
@@ -91,8 +92,11 @@ func reportData(cfg configIntf, m modelIntf, connectionsService connectionsIntf,
 	for _, cfg := range cfg.Folders() {
 		rescanIntvs = append(rescanIntvs, cfg.RescanIntervalS)
 
-		if cfg.Type == config.FolderTypeSendOnly {
-			folderUses["readonly"]++
+		switch cfg.Type {
+		case config.FolderTypeSendOnly:
+			folderUses["sendonly"]++
+		case config.FolderTypeSendReceive:
+			folderUses["sendreceive"]++
 		}
 		if cfg.IgnorePerms {
 			folderUses["ignorePerms"]++

gui/default/assets/lang/lang-bg.json

@@ -65,6 +65,7 @@
     "Device ID": "Идентификатор на устройство",
     "Device Identification": "Идентификатор на устройство",
     "Device Name": "Име на устройството",
+    "Device rate limits": "Device rate limits",
     "Device that last modified the item": "Устройство, което последно промени обекта",
     "Devices": "Устройства",
     "Disabled": "Деактивирано",
@@ -109,6 +110,7 @@
     "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.": "Защитава файловете от промени направени на други устройства, но промените направени на това устройство ще бъдат синхронизирани с останалите устройства.",
     "Filesystem Notifications": "Известия на системата",
+    "Filesystem Watcher Errors": "Filesystem Watcher Errors",
     "Filter by date": "Филтриране по дата",
     "Filter by name": "Филтриране по име",
     "Folder": "Папка",
@@ -117,6 +119,7 @@
     "Folder Path": "Път до папката",
     "Folder Type": "Вид папка",
     "Folders": "Папки",
+    "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.",
     "Full Rescan Interval (s)": "Интервал(и) на пълно повторно сканирване",
     "GUI": "Потребителски интерфейс",
     "GUI Authentication Password": "Парола за интерфейса",
@@ -156,6 +159,7 @@
     "Local State (Total)": "Локално състояние (общо)",
     "Log": "Доклад",
     "Log tailing paused. Click here to continue.": "Докладът е замразен. Натиснете, за да продължите.",
+    "Log tailing paused. Scroll to bottom continue.": "Log tailing paused. Scroll to bottom continue.",
     "Logs": "Доклади",
     "Major Upgrade": "Основно Обновяване",
     "Mass actions": "Действия за всички",
@@ -249,6 +253,7 @@
     "Share With Devices": "Споделяне с устройства",
     "Share this folder?": "Сподели тази папка?",
     "Shared With": "Споделена с",
+    "Sharing": "Sharing",
     "Show ID": "Покажи идентификатора",
     "Show QR": "Покажи QR",
     "Show diff with previous version": "Показване на разликите спрямо предната версия",

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

@@ -65,6 +65,7 @@
     "Device ID": "ID del dispositiu",
     "Device Identification": "Identificació del dispositiu",
     "Device Name": "Nom del dispositiu",
+    "Device rate limits": "Device rate limits",
     "Device that last modified the item": "El dispositiu que va modificar el item per última vegada",
     "Devices": "Dispositius",
     "Disabled": "Desactivat",
@@ -109,6 +110,7 @@
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Els fitxers són canviats a versions amb indicació de data en una carpeta \".stversions\" quant són reemplaçats o esborrats per Syncthing.",
     "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Els fitxers són protegits dels canvis fets en altres dispositius, però els canvis fets en aquest dispositiu seràn enviats a la resta del grup (cluster).",
     "Filesystem Notifications": "Notificacions del Sistema de Fitxers",
+    "Filesystem Watcher Errors": "Filesystem Watcher Errors",
     "Filter by date": "Filtrar per data",
     "Filter by name": "Filtrar per nom",
     "Folder": "Carpeta",
@@ -117,6 +119,7 @@
     "Folder Path": "Ruta de la carpeta",
     "Folder Type": "Tipus de carpeta",
     "Folders": "Carpetes",
+    "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.",
     "Full Rescan Interval (s)": "Interval de l'Escaneig Complet (segons)",
     "GUI": "IGU (Interfície Gràfica d'Usuari)",
     "GUI Authentication Password": "Password d'autenticació de l'Interfície Gràfica d'Usuari (GUI)",
@@ -156,6 +159,7 @@
     "Local State (Total)": "Estat Local (Total)",
     "Log": "Registre",
     "Log tailing paused. Click here to continue.": "Pausada l'adició de dades al registre. Polsa ací per continuar.",
+    "Log tailing paused. Scroll to bottom continue.": "Log tailing paused. Scroll to bottom continue.",
     "Logs": "Registres",
     "Major Upgrade": "Actualització important",
     "Mass actions": "Accions en masa",
@@ -249,6 +253,7 @@
     "Share With Devices": "Compartir amb els dispositius",
     "Share this folder?": "Compartir aquesta carpeta?",
     "Shared With": "Compartit amb",
+    "Sharing": "Sharing",
     "Show ID": "Mostrar ID",
     "Show QR": "Mostrar QR",
     "Show diff with previous version": "Mostrar les diferències amb la versió prèvia",

gui/default/assets/lang/lang-cs.json

@@ -65,6 +65,7 @@
     "Device ID": "ID přístroje",
     "Device Identification": "Identifikace přístroje",
     "Device Name": "Jméno přístroje",
+    "Device rate limits": "Device rate limits",
     "Device that last modified the item": "Poslední přístroj, který modifikoval položku",
     "Devices": "Přístroje",
     "Disabled": "Vypnuto",
@@ -109,6 +110,7 @@
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Po nahrazení nebo smazání aplikací Syncthing jsou soubory přesunuty do verzí označených daty ve složce .stversions.",
     "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Soubory jsou chráněny před změnami na ostatních přístrojích, ale změny provedené z tohoto přístroje budou rozeslány na zbytek clusteru.",
     "Filesystem Notifications": "Oznámení souborového systému",
+    "Filesystem Watcher Errors": "Chyby sledování soubor. systému",
     "Filter by date": "Vybrat podle data",
     "Filter by name": "Vybrat podle názvu",
     "Folder": "Adresář",
@@ -117,6 +119,7 @@
     "Folder Path": "Cesta k adresáři",
     "Folder Type": "Typ adresáře",
     "Folders": "Adresáře",
+    "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "Pokus o sledování změn v těchto adresářích selhal. Budeme to znovu zkoušet každou minutu, takže se to možná brzo povede. Pokud ne, pokuste se najít příčinu. případně požádejte o pomoc.",
     "Full Rescan Interval (s)": "Interval (y) plného skenu",
     "GUI": "GUI",
     "GUI Authentication Password": "Přihlašovací heslo pro GUI",
@@ -156,6 +159,7 @@
     "Local State (Total)": "Místní status (Celkem)",
     "Log": "Log",
     "Log tailing paused. Click here to continue.": "Log pozastaven. Klikněte zde pro pokračování.",
+    "Log tailing paused. Scroll to bottom continue.": "Log tailing paused. Scroll to bottom continue.",
     "Logs": "Logy",
     "Major Upgrade": "Důležitá aktualizace",
     "Mass actions": "Hromadné akce",
@@ -249,6 +253,7 @@
     "Share With Devices": "Sdílet s přístroji",
     "Share this folder?": "Sdílet tento adresář?",
     "Shared With": "Sdíleno s",
+    "Sharing": "Sharing",
     "Show ID": "Zobrazit ID",
     "Show QR": "Zobrazit QR",
     "Show diff with previous version": "Ukázat rozdíl oproti předchozí verzi",

gui/default/assets/lang/lang-da.json

@@ -65,6 +65,7 @@
     "Device ID": "Enheds-ID",
     "Device Identification": "Enhedsidentifikation",
     "Device Name": "Enhedsnavn",
+    "Device rate limits": "Device rate limits",
     "Device that last modified the item": "Device that last modified the item",
     "Devices": "Enheder",
     "Disabled": "Disabled",
@@ -109,6 +110,7 @@
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Filer flyttes til data-stemplede versioner i en .stversions mappe når de erstattes eller slettes af 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.": "Filer er beskyttet fra ændringer foretaget på andre enheder, men ændringerne på denne enhed vil blive sendt til alle andre tilknyttede enheder.",
     "Filesystem Notifications": "Filesystem Notifications",
+    "Filesystem Watcher Errors": "Filesystem Watcher Errors",
     "Filter by date": "Filter by date",
     "Filter by name": "Filter by name",
     "Folder": "Mappe",
@@ -117,6 +119,7 @@
     "Folder Path": "Mappesti",
     "Folder Type": "Mappetype",
     "Folders": "Mapper",
+    "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.",
     "Full Rescan Interval (s)": "Full Rescan Interval (s)",
     "GUI": "GUI",
     "GUI Authentication Password": "GUI-kodeord",
@@ -156,6 +159,7 @@
     "Local State (Total)": "Lokal tilstand (total)",
     "Log": "Log",
     "Log tailing paused. Click here to continue.": "Log tailing paused. Click here to continue.",
+    "Log tailing paused. Scroll to bottom continue.": "Log tailing paused. Scroll to bottom continue.",
     "Logs": "Logs",
     "Major Upgrade": "Ny version",
     "Mass actions": "Mass actions",
@@ -249,6 +253,7 @@
     "Share With Devices": "Del med enhed",
     "Share this folder?": "Del denne mappe",
     "Shared With": "Delt med",
+    "Sharing": "Sharing",
     "Show ID": "Vis ID",
     "Show QR": "Vis QR",
     "Show diff with previous version": "Show diff with previous version",

gui/default/assets/lang/lang-de.json

@@ -65,6 +65,7 @@
     "Device ID": "Gerätekennung",
     "Device Identification": "Geräteidentifikation",
     "Device Name": "Gerätename",
+    "Device rate limits": "Device rate limits",
     "Device that last modified the item": "Gerät, das das Element zuletzt geändert hat",
     "Devices": "Geräte",
     "Disabled": "Deaktiviert",
@@ -109,6 +110,7 @@
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Dateien werden mit Datumsstempel versioniert und in den .stversions Ordner verschoben, wenn sie von Syncthing ersetzt oder gelöscht werden.",
     "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Dateien sind auf diesem Gerät schreibgeschützt. Auf diesem Gerät durchgeführte Veränderungen werden aber auf den Rest des Verbunds übertragen.",
     "Filesystem Notifications": "Dateisystembenachrichtigungen",
+    "Filesystem Watcher Errors": "Filesystem Watcher Errors",
     "Filter by date": "Nach Datum sortieren",
     "Filter by name": "Nach Name sortieren",
     "Folder": "Ordner",
@@ -117,6 +119,7 @@
     "Folder Path": "Ordnerpfad",
     "Folder Type": "Ordnertyp",
     "Folders": "Ordner",
+    "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.",
     "Full Rescan Interval (s)": "Vollständiger Suchintervall (s)",
     "GUI": "GUI",
     "GUI Authentication Password": "Passwort für Zugang zur Benutzeroberfläche",
@@ -156,6 +159,7 @@
     "Local State (Total)": "Lokaler Status (Gesamt)",
     "Log": "Protokoll",
     "Log tailing paused. Click here to continue.": "Protokollaufzeichnungen sind pausiert. Klicken Sie hier um fortzufahren.",
+    "Log tailing paused. Scroll to bottom continue.": "Log tailing paused. Scroll to bottom continue.",
     "Logs": "Protokolle",
     "Major Upgrade": "Hauptversionsaktualisierung",
     "Mass actions": "Massenaktionen",
@@ -249,6 +253,7 @@
     "Share With Devices": "Teile mit diesen Geräten",
     "Share this folder?": "Diesen Ordner teilen?",
     "Shared With": "Geteilt mit",
+    "Sharing": "Sharing",
     "Show ID": "Eigene Kennung",
     "Show QR": "Zeige QR Code",
     "Show diff with previous version": "Unterschied zur vorherigen Version anzeigen",

gui/default/assets/lang/lang-el.json

@@ -65,6 +65,7 @@
     "Device ID": "Ταυτότητα συσκευής",
     "Device Identification": "Ταυτότητα συσκευής",
     "Device Name": "Όνομα συσκευής",
+    "Device rate limits": "Device rate limits",
     "Device that last modified the item": "Συσκευή από την οποία πραγματοποιήθηκε η τελευταία τροποποίηση του στοιχείου",
     "Devices": "Συσκευές",
     "Disabled": "Απενεργοποιημένη",
@@ -109,6 +110,7 @@
     "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.": "Τα αρχεία προστατεύονται από αλλαγές που γίνονται σε άλλες συσκευές, αλλά όποιες αλλαγές γίνουν σε αυτή τη συσκευή θα αποσταλούν σε όλη τη συστάδα συσκευών.",
     "Filesystem Notifications": "Ειδοποιήσεις συστήματος αρχείων",
+    "Filesystem Watcher Errors": "Filesystem Watcher Errors",
     "Filter by date": "Φιλτράρισμα κατά ημερομηνία",
     "Filter by name": "Φιλτράρισμα κατά όνομα",
     "Folder": "Φάκελος",
@@ -117,6 +119,7 @@
     "Folder Path": "Μονοπάτι φακέλου",
     "Folder Type": "Τύπος φακέλου",
     "Folders": "Φάκελοι",
+    "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.",
     "Full Rescan Interval (s)": "Διάστημα πλήρων επανασαρώσεων (s)",
     "GUI": "Γραφικό περιβάλλον",
     "GUI Authentication Password": "Κωδικός για την πρόσβαση στη διεπαφή",
@@ -156,6 +159,7 @@
     "Local State (Total)": "Τοπική κατάσταση (συνολικά)",
     "Log": "Αρχείο καταγραφής",
     "Log tailing paused. Click here to continue.": "Η αυτόματη κύλιση έχει διακοπεί. Πατήστε εδώ για να συνεχιστεί.",
+    "Log tailing paused. Scroll to bottom continue.": "Log tailing paused. Scroll to bottom continue.",
     "Logs": "Αρχεία καταγραφής",
     "Major Upgrade": "Σημαντική αναβάθμιση",
     "Mass actions": "Μαζικές ενέργειες",
@@ -249,6 +253,7 @@
     "Share With Devices": "Διαμοίρασε με αυτές τις συσκευές",
     "Share this folder?": "Να διαμοιραστεί αυτός ο φάκελος;",
     "Shared With": "Διαμοιράζεται με",
+    "Sharing": "Sharing",
     "Show ID": "Εμφάνιση ταυτότητας",
     "Show QR": "Δείξε τον κωδικό QR",
     "Show diff with previous version": "Εμφάνιση διαφορών με προηγούμενη έκδοση",

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

@@ -65,6 +65,7 @@
     "Device ID": "Device ID",
     "Device Identification": "Device Identification",
     "Device Name": "Device Name",
+    "Device rate limits": "Device rate limits",
     "Device that last modified the item": "Device that last modified the item",
     "Devices": "Devices",
     "Disabled": "Disabled",
@@ -109,6 +110,7 @@
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.",
     "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.",
     "Filesystem Notifications": "Filesystem Notifications",
+    "Filesystem Watcher Errors": "Filesystem Watcher Errors",
     "Filter by date": "Filter by date",
     "Filter by name": "Filter by name",
     "Folder": "Folder",
@@ -117,6 +119,7 @@
     "Folder Path": "Folder Path",
     "Folder Type": "Folder Type",
     "Folders": "Folders",
+    "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.",
     "Full Rescan Interval (s)": "Full Rescan Interval (s)",
     "GUI": "GUI",
     "GUI Authentication Password": "GUI Authentication Password",
@@ -156,6 +159,7 @@
     "Local State (Total)": "Local State (Total)",
     "Log": "Log",
     "Log tailing paused. Click here to continue.": "Log tailing paused. Click here to continue.",
+    "Log tailing paused. Scroll to bottom continue.": "Log tailing paused. Scroll to bottom continue.",
     "Logs": "Logs",
     "Major Upgrade": "Major Upgrade",
     "Mass actions": "Mass actions",
@@ -249,6 +253,7 @@
     "Share With Devices": "Share With Devices",
     "Share this folder?": "Share this folder?",
     "Shared With": "Shared With",
+    "Sharing": "Sharing",
     "Show ID": "Show ID",
     "Show QR": "Show QR",
     "Show diff with previous version": "Show diff with previous version",

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

@@ -65,6 +65,7 @@
    "Device ID": "Device ID",
    "Device Identification": "Device Identification",
    "Device Name": "Device Name",
+   "Device rate limits": "Device rate limits",
    "Device that last modified the item": "Device that last modified the item",
    "Devices": "Devices",
    "Disabled": "Disabled",
@@ -109,6 +110,7 @@
    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.",
    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.",
    "Filesystem Notifications": "Filesystem Notifications",
+   "Filesystem Watcher Errors": "Filesystem Watcher Errors",
    "Filter by date": "Filter by date",
    "Filter by name": "Filter by name",
    "Folder": "Folder",
@@ -117,6 +119,7 @@
    "Folder Path": "Folder Path",
    "Folder Type": "Folder Type",
    "Folders": "Folders",
+   "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.",
    "Full Rescan Interval (s)": "Full Rescan Interval (s)",
    "GUI": "GUI",
    "GUI Authentication Password": "GUI Authentication Password",
@@ -156,6 +159,7 @@
    "Local State (Total)": "Local State (Total)",
    "Log": "Log",
    "Log tailing paused. Click here to continue.": "Log tailing paused. Click here to continue.",
+   "Log tailing paused. Scroll to bottom continue.": "Log tailing paused. Scroll to bottom continue.",
    "Logs": "Logs",
    "Major Upgrade": "Major Upgrade",
    "Mass actions": "Mass actions",
@@ -249,6 +253,7 @@
    "Share With Devices": "Share With Devices",
    "Share this folder?": "Share this folder?",
    "Shared With": "Shared With",
+   "Sharing": "Sharing",
    "Show ID": "Show ID",
    "Show QR": "Show QR",
    "Show diff with previous version": "Show diff with previous version",

gui/default/assets/lang/lang-eo.json

@@ -65,6 +65,7 @@
     "Device ID": "Aparato ID",
     "Device Identification": "Identigo de Aparato",
     "Device Name": "Nomo de Aparato",
+    "Device rate limits": "Device rate limits",
     "Device that last modified the item": "Device that last modified the item",
     "Devices": "Aparatoj",
     "Disabled": "Disabled",
@@ -109,6 +110,7 @@
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Dosieroj estas movigitaj al datostampitaj versioj en .stversions dosierujoj kiam ili estas anstataŭigitaj aŭ forigitaj en 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.": "Dosieroj estas protektataj kontraŭ ŝanĝoj faritaj en aliaj aparatoj, sed ŝanĝoj faritaj en ĉi tiu aparato estos senditaj al cetera parto de la grupo.",
     "Filesystem Notifications": "Filesystem Notifications",
+    "Filesystem Watcher Errors": "Filesystem Watcher Errors",
     "Filter by date": "Filter by date",
     "Filter by name": "Filter by name",
     "Folder": "Dosierujo",
@@ -117,6 +119,7 @@
     "Folder Path": "Dosieruja Vojo",
     "Folder Type": "Dosieruja Tipo",
     "Folders": "Dosierujoj",
+    "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.",
     "Full Rescan Interval (s)": "Full Rescan Interval (s)",
     "GUI": "Grafika Interfaco",
     "GUI Authentication Password": "Pasvorta Aŭtentigo en Grafika Interfaco",
@@ -156,6 +159,7 @@
     "Local State (Total)": "Loka Stato (Tuta)",
     "Log": "Log",
     "Log tailing paused. Click here to continue.": "Log tailing paused. Click here to continue.",
+    "Log tailing paused. Scroll to bottom continue.": "Log tailing paused. Scroll to bottom continue.",
     "Logs": "Logs",
     "Major Upgrade": "Ĉefa Ĝisdatigo",
     "Mass actions": "Mass actions",
@@ -249,6 +253,7 @@
     "Share With Devices": "Komunigu Kun Aparatoj",
     "Share this folder?": "Komunigi ĉi tiun dosierujon?",
     "Shared With": "Komunigita Kun",
+    "Sharing": "Sharing",
     "Show ID": "Montru ID",
     "Show QR": "Montru QR",
     "Show diff with previous version": "Show diff with previous version",

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

@@ -65,6 +65,7 @@
     "Device ID": "ID del Dispositivo",
     "Device Identification": "Identificación del Dispositivo",
     "Device Name": "Nombre del Dispositivo",
+    "Device rate limits": "Device rate limits",
     "Device that last modified the item": "Device that last modified the item",
     "Devices": "Dispositivos",
     "Disabled": "Disabled",
@@ -109,6 +110,7 @@
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Los ficheros son cambiados a versiones con indicación de fecha en una carpeta \".stversions\" cuando son reemplazados o borrados por 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.": "Los ficheros son protegidos por los cambios hechos en otros dispositivos, pero los cambios hechos en este dispositivo serán enviados al resto del grupo (cluster).",
     "Filesystem Notifications": "Filesystem Notifications",
+    "Filesystem Watcher Errors": "Filesystem Watcher Errors",
     "Filter by date": "Filter by date",
     "Filter by name": "Filter by name",
     "Folder": "Carpeta",
@@ -117,6 +119,7 @@
     "Folder Path": "Ruta de la carpeta",
     "Folder Type": "Tipo de carpeta",
     "Folders": "Carpetas",
+    "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.",
     "Full Rescan Interval (s)": "Full Rescan Interval (s)",
     "GUI": "GUI",
     "GUI Authentication Password": "Password de la Interfaz Gráfica de Usuario (GUI)",
@@ -156,6 +159,7 @@
     "Local State (Total)": "Estado Local (Total)",
     "Log": "Log",
     "Log tailing paused. Click here to continue.": "Log tailing paused. Click here to continue.",
+    "Log tailing paused. Scroll to bottom continue.": "Log tailing paused. Scroll to bottom continue.",
     "Logs": "Logs",
     "Major Upgrade": "Actualización importante",
     "Mass actions": "Mass actions",
@@ -249,6 +253,7 @@
     "Share With Devices": "Compartir con dispositivos",
     "Share this folder?": "¿Deseas compartir esta carpeta?",
     "Shared With": "Compartir con",
+    "Sharing": "Sharing",
     "Show ID": "Mostrar ID",
     "Show QR": "Mostrar QR",
     "Show diff with previous version": "Show diff with previous version",

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

@@ -65,6 +65,7 @@
     "Device ID": "ID del Dispositivo",
     "Device Identification": "Identificación del Dispositivo",
     "Device Name": "Nombre del Dispositivo",
+    "Device rate limits": "Device rate limits",
     "Device that last modified the item": "Dispositivo que modificó por última vez el ítem",
     "Devices": "Dispositivos",
     "Disabled": "Deshabilitado",
@@ -109,6 +110,7 @@
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Los ficheros son cambiados a versiones con indicación de fecha en una carpeta \".stversions\" cuando son reemplazados o borrados por 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.": "Los ficheros son protegidos por los cambios hechos en otros dispositivos, pero los cambios hechos en este dispositivo serán enviados al resto del grupo (cluster).",
     "Filesystem Notifications": "Notificaciones del sistema de archivos",
+    "Filesystem Watcher Errors": "Filesystem Watcher Errors",
     "Filter by date": "Filtrar por fecha",
     "Filter by name": "Filtrar por nombre",
     "Folder": "Carpeta",
@@ -117,6 +119,7 @@
     "Folder Path": "Ruta de la carpeta",
     "Folder Type": "Tipo de carpeta",
     "Folders": "Carpetas",
+    "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.",
     "Full Rescan Interval (s)": "Full Rescan Interval (s)",
     "GUI": "GUI",
     "GUI Authentication Password": "Password de la Interfaz Gráfica de Usuario (GUI)",
@@ -156,6 +159,7 @@
     "Local State (Total)": "Estado Local (Total)",
     "Log": "Registro",
     "Log tailing paused. Click here to continue.": "Seguimiento del registro pausado. Haga clic aquí para continuar.",
+    "Log tailing paused. Scroll to bottom continue.": "Log tailing paused. Scroll to bottom continue.",
     "Logs": "Registros",
     "Major Upgrade": "Actualización importante",
     "Mass actions": "Acción masiva",
@@ -249,6 +253,7 @@
     "Share With Devices": "Compartir con dispositivos",
     "Share this folder?": "¿Deseas compartir esta carpeta?",
     "Shared With": "Compartir con",
+    "Sharing": "Sharing",
     "Show ID": "Mostrar ID",
     "Show QR": "Mostrar QR",
     "Show diff with previous version": "Mostrar la diferencia con la versión anterior",

gui/default/assets/lang/lang-eu.json

@@ -65,6 +65,7 @@
     "Device ID": "Tresnaren ID-a",
     "Device Identification": "Tresnaren identifikazioa",
     "Device Name": "Tresnaren izena",
+    "Device rate limits": "Device rate limits",
     "Device that last modified the item": "Device that last modified the item",
     "Devices": "Tresnak",
     "Disabled": "Disabled",
@@ -109,6 +110,7 @@
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": ".stbersioak azpi karpetan lekutuko eta ordu-markatuko dira fitxeroak, egitura errelatibo berdin batean, Syncthing-ek aldatu edo ezeztatuko dituelarik.",
     "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Beste tresnetan eginak izanen diren aldaketetatik zainduak izanen dira fitxeroak; haatik, tresna huntan egindako aldaketak besteeri hedatuak izanen dira.",
     "Filesystem Notifications": "Filesystem Notifications",
+    "Filesystem Watcher Errors": "Filesystem Watcher Errors",
     "Filter by date": "Filter by date",
     "Filter by name": "Filter by name",
     "Folder": "Partekatze",
@@ -117,6 +119,7 @@
     "Folder Path": "Partekatzearen sustrai bidea",
     "Folder Type": "Partekatze mota",
     "Folders": "Partekatzeak",
+    "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.",
     "Full Rescan Interval (s)": "Full Rescan Interval (s)",
     "GUI": "Interfaze grafikoa",
     "GUI Authentication Password": "Interfaze grafiko pasahitza",
@@ -156,6 +159,7 @@
     "Local State (Total)": "Lekuko egoera (Osoa)",
     "Log": "Log",
     "Log tailing paused. Click here to continue.": "Log tailing paused. Click here to continue.",
+    "Log tailing paused. Scroll to bottom continue.": "Log tailing paused. Scroll to bottom continue.",
     "Logs": "Logs",
     "Major Upgrade": "Eguneratze nagusia",
     "Mass actions": "Mass actions",
@@ -249,6 +253,7 @@
     "Share With Devices": "Tresnekin partekatu",
     "Share this folder?": "Partekatze hau onartzen duzu?",
     "Shared With": "...ekin partekatua",
+    "Sharing": "Sharing",
     "Show ID": "Erakutsi ene ID-a",
     "Show QR": "Erakutsi QR-a",
     "Show diff with previous version": "Show diff with previous version",

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

@@ -65,6 +65,7 @@
     "Device ID": "ID de l'appareil",
     "Device Identification": "Identifiant de l'appareil",
     "Device Name": "Nom de l'appareil",
+    "Device rate limits": "Device rate limits",
     "Device that last modified the item": "Device that last modified the item",
     "Devices": "Appareil",
     "Disabled": "Disabled",
@@ -109,6 +110,7 @@
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Quand ils sont remplacés ou supprimés par Syncthing, les fichiers sont déplacés et horodatés vers le sous-répertoire .stversions dans une arborescence relative identique à celle de l'original.",
     "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 celui-ci seront transférés aux autres.",
     "Filesystem Notifications": "Filesystem Notifications",
+    "Filesystem Watcher Errors": "Filesystem Watcher Errors",
     "Filter by date": "Filter by date",
     "Filter by name": "Filter by name",
     "Folder": "Partage",
@@ -117,6 +119,7 @@
     "Folder Path": "Chemin racine du partage",
     "Folder Type": "Type de partage",
     "Folders": "Partages",
+    "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.",
     "Full Rescan Interval (s)": "Full Rescan Interval (s)",
     "GUI": "Interface graphique",
     "GUI Authentication Password": "Mot de passe d'authentification GUI",
@@ -156,6 +159,7 @@
     "Local State (Total)": "État local (Total)",
     "Log": "Log",
     "Log tailing paused. Click here to continue.": "Log tailing paused. Click here to continue.",
+    "Log tailing paused. Scroll to bottom continue.": "Log tailing paused. Scroll to bottom continue.",
     "Logs": "Logs",
     "Major Upgrade": "Mise à jour majeure",
     "Mass actions": "Mass actions",
@@ -249,6 +253,7 @@
     "Share With Devices": "Synchroniser avec des appareils",
     "Share this folder?": "Acceptez-vous ce partage ?",
     "Shared With": "Synchronisé avec",
+    "Sharing": "Sharing",
     "Show ID": "Afficher mon ID",
     "Show QR": "Afficher l'image QR",
     "Show diff with previous version": "Show diff with previous version",

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

@@ -65,6 +65,7 @@
     "Device ID": "ID de l'appareil",
     "Device Identification": "Identifiant de l'appareil",
     "Device Name": "Nom convivial local de l'appareil",
+    "Device rate limits": "Limitations de débit",
     "Device that last modified the item": "Dernier appareil modificateur",
     "Devices": "Appareils",
     "Disabled": "Désactivé",
@@ -101,7 +102,7 @@
     "Failed to setup, retrying": "Échec, nouvel essai",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "La connexion aux serveurs en IPv6 va échouer s'il n'y a pas de connectivité IPv6.",
     "File Pull Order": "Ordre de récupération des fichiers",
-    "File Versioning": "Méthode de préservation des fichiers",
+    "File Versioning": "Préservation des fichiers",
     "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 directory when replaced or deleted by Syncthing.": "Les fichiers sont déplacés dans le sous-répertoire .stversions quand ils sont remplacés ou supprimés par Syncthing. Leurs chemins d'accès relatifs y sont recréés si besoin.",
     "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Les fichiers sont déplacés dans le sous-répertoire .stversions quand ils sont remplacés ou supprimés par Syncthing. Leurs chemins d'accès relatifs y sont recréés si besoin.",
@@ -109,6 +110,7 @@
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Quand ils sont remplacés ou supprimés par Syncthing, les fichiers sont déplacés et horodatés vers le sous-répertoire .stversions dans une arborescence relative identique à celle de l'original.",
     "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 celui-ci seront transférés aux autres.",
     "Filesystem Notifications": "Notifications du système de fichiers",
+    "Filesystem Watcher Errors": "Erreurs de la surveillance du système de fichiers",
     "Filter by date": "Filtrer par date",
     "Filter by name": "Filtrer par nom",
     "Folder": "Partage",
@@ -117,6 +119,7 @@
     "Folder Path": "Chemin racine du partage",
     "Folder Type": "Type de partage",
     "Folders": "Partages",
+    "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "Une erreur s'est produite pour les partages suivants lors du démarrage de la surveillance des changements. Une nouvelle tentative a lieu toutes les minutes, et les erreurs devraient disparaître rapidement. Si elles persistent, essayez de corriger le problème sous-jacent et demandez de l'aide si vous n'y parvenez pas.",
     "Full Rescan Interval (s)": "Intervalle de réanalyse complète (s)",
     "GUI": "Interface graphique",
     "GUI Authentication Password": "Mot de passe d'authentification GUI",
@@ -156,6 +159,7 @@
     "Local State (Total)": "État local (Total)",
     "Log": "Journal",
     "Log tailing paused. Click here to continue.": "La file d'attente du journal est en pause. Cliquer ici pour continuer.",
+    "Log tailing paused. Scroll to bottom continue.": "Le fil du journal est en pause. Faites défiler vers le bas pour continuer.",
     "Logs": "Journaux",
     "Major Upgrade": "Mise à jour majeure",
     "Mass actions": "Actions multiples",
@@ -172,7 +176,7 @@
     "New Folder": "Nouveau partage",
     "Newest First": "Les plus récents en premier",
     "No": "Non",
-    "No File Versioning": "Pas de poubelle",
+    "No File Versioning": "Sans",
     "No files will be deleted as a result of this operation.": "Aucun fichier ne sera supprimé à la suite de cette opération.",
     "No upgrades": "Pas de mises à jour",
     "Normal": "Normal",
@@ -232,7 +236,7 @@
     "Running": "En cours",
     "Save": "Enregistrer",
     "Scan Time Remaining": "Temps d'analyse restant",
-    "Scanning": "Détection des changements",
+    "Scanning": "Analyse",
     "See external versioner help for supported templated command line parameters.": "Voir l'aide sur la préservation externe des fichiers pour les paramètres supportés en lignes de commande dans les modèles.",
     "See external versioning help for supported templated command line parameters.": "Consulter l'aide à la gestion externe des versions pour voir les paramètres de ligne de commande supportés.",
     "Select a version": "Choisissez une version",
@@ -249,6 +253,7 @@
     "Share With Devices": "Synchroniser avec des appareils",
     "Share this folder?": "Acceptez-vous ce partage ?",
     "Shared With": "Participant(s)",
+    "Sharing": "Partage",
     "Show ID": "Afficher mon ID",
     "Show QR": "Afficher le QR",
     "Show diff with previous version": "Afficher les différences avec la version précédente",

gui/default/assets/lang/lang-fy.json

@@ -65,6 +65,7 @@
     "Device ID": "Apparaat-ID",
     "Device Identification": "Apparaatidentifikaasje",
     "Device Name": "Apparaatnamme",
+    "Device rate limits": "Apparaatfluggenslimiet",
     "Device that last modified the item": "Apparaat dat dit item it lêst oanpast hat",
     "Devices": "Apparaten",
     "Disabled": "Utskeakele",
@@ -109,6 +110,7 @@
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Triemen wurde ferset nei in mei datum stimpele ferzjes yn in .stversions map wannear troch Syncthing ferfangen of fuortsmiten.",
     "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Triemen binne ymmún foar feroarings makke troch oare apparaten, mar feroarings makke op dit apparaat wurde nei de rest fan 'e bondel ferstjoerd.",
     "Filesystem Notifications": "Meldingen fan Triemsysteem",
+    "Filesystem Watcher Errors": "Triemsysteemsjoggerflaters",
     "Filter by date": "Op datum filterje",
     "Filter by name": "Op namme filterje",
     "Folder": "Map",
@@ -117,6 +119,7 @@
     "Folder Path": "Map-paad",
     "Folder Type": "Maptype",
     "Folders": "Mappen",
+    "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "By it starten fan it sjen foar feroarings is der foar de folgende mappen is in flater ûnstean. It wurd eltse minuut opnij besike, dus de flaters koene wol ris gau fuortgean. At se der bliuwe, besykje dan it ûnderlizzende probleem te ferhelpen en freegje om help dat dit net slagget.",
     "Full Rescan Interval (s)": "Folledich wersken ynterfal (s)",
     "GUI": "GUI",
     "GUI Authentication Password": "Wachtwurd foar ferifikaasje yn GUI",
@@ -156,6 +159,7 @@
     "Local State (Total)": "Lokale tastân (Folledich)",
     "Log": "Loch",
     "Log tailing paused. Click here to continue.": "Loch-sturt skofte. Klik hjir om fjirder te gean.",
+    "Log tailing paused. Scroll to bottom continue.": "Log tailing paused. Scroll to bottom continue.",
     "Logs": "Lochs",
     "Major Upgrade": "Wichtige fernijing",
     "Mass actions": "Massa-aksjes",
@@ -249,6 +253,7 @@
     "Share With Devices": "Diele mei apparaten",
     "Share this folder?": "Dizze map diele?",
     "Shared With": "Dielt mei",
+    "Sharing": "Dielen",
     "Show ID": "ID sjen litte",
     "Show QR": "QR sjen litte",
     "Show diff with previous version": "Ferskil (diff) mei de foarige ferzje sjen litte",

gui/default/assets/lang/lang-hu.json

@@ -41,7 +41,7 @@
     "CPU Utilization": "Processzorhasználat",
     "Changelog": "Változások",
     "Clean out after": "Takarítás",
-    "Click to see discovery failures": "Kattints ide a feltérképezési hibák megtekintéséhez",
+    "Click to see discovery failures": "Kattints ide a felfedezési hibák megtekintéséhez",
     "Close": "Bezárás",
     "Command": "Parancs",
     "Comment, when used at the start of a line": "Megjegyzés, a sor elején használva",
@@ -65,6 +65,7 @@
     "Device ID": "Eszközazonosító",
     "Device Identification": "Eszközazonosító",
     "Device Name": "Eszköz neve",
+    "Device rate limits": "Eszköz sávszélessége",
     "Device that last modified the item": "Az eszköz, amely utoljára módosította az elemet",
     "Devices": "Eszközök",
     "Disabled": "Letiltva",
@@ -92,7 +93,7 @@
     "Enabled": "Engedélyezve",
     "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Adj meg egy nem-negatív számot (pl. \"2.35\") és válassz egy mértékegységet. A százalékok a teljes lemezméretre vonatkoznak.",
     "Enter a non-privileged port number (1024 - 65535).": "Adj meg egy nem privilegizált port számot (1024 - 65535).",
-    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Vesszővel elválasztva több cím is bevihető (\"tcp://ip:port\", \"tcp://host:port\"), az automatikus felderítéshez a 'dynamic' kulcsszó használatos. ",
+    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Vesszővel elválasztva több cím is megadható (\"tcp://ip:port\", \"tcp://host:port\"), az automatikus felfedezéshez a 'dynamic' kulcsszó használatos. ",
     "Enter ignore patterns, one per line.": "A kihagyási mintákból soronként egyet kell megadni.",
     "Error": "Hiba",
     "External File Versioning": "Külső fájlverzió-követés",
@@ -109,6 +110,7 @@
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Ha a Syncthing felülírja vagy törli a fájlokat, akkor azok a .stversions mappába lesznek áthelyezve, időbélyegzővel ellátva.",
     "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "A fájlok védve vannak a más eszközökön történt változásokkal szemben, de az ezen az eszközön történt változások érvényesek lesznek a többire.",
     "Filesystem Notifications": "Fájlrendszer értesítések",
+    "Filesystem Watcher Errors": "Fájlrendszerfigyelési hibák",
     "Filter by date": "Szűrés dátumra",
     "Filter by name": "Szűrés névre",
     "Folder": "Mappa",
@@ -117,6 +119,7 @@
     "Folder Path": "Mappa elérési útvonala",
     "Folder Type": "Mappatípus",
     "Folders": "Mappák",
+    "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "Az alábbi mappák figyelésének indításakor hibák léptek fel. Minden percben megismétlődik a próbálkozás, így a hibák valószínűleg el fognak tűnni. Ha mégsem, meg kell próbálni javítani az előidéző hibát vagy segítséget kérni.",
     "Full Rescan Interval (s)": "Teljes átnézési intervallum (mp)",
     "GUI": "Grafikus felület",
     "GUI Authentication Password": "Grafikus felület jelszava",
@@ -156,7 +159,8 @@
     "Local State (Total)": "Helyi állapot (teljes)",
     "Log": "Napló",
     "Log tailing paused. Click here to continue.": "Napló utolsó sorainak figyelése leállítva. Ide kattintva lehet folytatni.",
-    "Logs": "Naplfájlok",
+    "Log tailing paused. Scroll to bottom continue.": "Napló utolsó sorainak figyelése leállítva. Görgetve lehet folytatni.",
+    "Logs": "Naplófájlok",
     "Major Upgrade": "Főverzió-frissítés",
     "Mass actions": "Tömeges műveletek",
     "Master": "Központi",
@@ -249,8 +253,9 @@
     "Share With Devices": "Megosztás más eszközzel",
     "Share this folder?": "Megosztható ez a mappa?",
     "Shared With": "Megosztva ezekkel:",
-    "Show ID": "Azonosító mutatása",
-    "Show QR": "QR-kód mutatása",
+    "Sharing": "Megosztás",
+    "Show ID": "Azonosító megjelenítése",
+    "Show QR": "QR-kód megjelenítése",
     "Show diff with previous version": "Előző verzió eltérésének megjelenítése",
     "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Az eszközazonosító helyett jelenik meg. A többi eszközön alapértelmezett névként használható. ",
     "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Az eszközazonosító helyett jelenik meg. Üresen hagyva az eszköz saját neve lesz alkalmazva.",

gui/default/assets/lang/lang-it.json

@@ -65,6 +65,7 @@
     "Device ID": "ID Dispositivo",
     "Device Identification": "Identificazione Dispositivo",
     "Device Name": "Nome Dispositivo",
+    "Device rate limits": "Limiti di velocità del dispositivo",
     "Device that last modified the item": "Dispositivo che ha modificato l'elemento per ultimo",
     "Devices": "Dispositivi",
     "Disabled": "Disabilitato",
@@ -109,6 +110,7 @@
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "I file sostituiti o eliminati da Syncthing vengono datati e spostati in una cartella .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.": "I file sono protetti dalle modifiche effettuate negli altri dispositivi, ma le modifiche effettuate in questo dispositivo verranno inviate anche al resto del cluster.",
     "Filesystem Notifications": "Notifiche del filesystem",
+    "Filesystem Watcher Errors": "Errori nel monitoraggio del filesystem",
     "Filter by date": "Filtra per data",
     "Filter by name": "Filtra per nome",
     "Folder": "Cartella",
@@ -117,6 +119,7 @@
     "Folder Path": "Percorso Cartella",
     "Folder Type": "Tipo di Cartella",
     "Folders": "Cartelle",
+    "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "Per le seguenti cartelle si è verificato un errore durante l'avvio della ricerca delle modifiche. Sarà ripetuto ogni minuto, quindi gli errori potrebbero risolversi presto. Se persistono, prova a risolvere il problema sottostante e chiedi aiuto se non puoi.",
     "Full Rescan Interval (s)": "Intervallo di scansione completa (s)",
     "GUI": "Interfaccia Grafica Utente",
     "GUI Authentication Password": "Password dell'Interfaccia Grafica",
@@ -156,6 +159,7 @@
     "Local State (Total)": "Stato Locale (Totale)",
     "Log": "Log",
     "Log tailing paused. Click here to continue.": "Visualizzazione log in pausa. Clicca qui per continuare.",
+    "Log tailing paused. Scroll to bottom continue.": "Log tailing paused. Scroll to bottom continue.",
     "Logs": "Log",
     "Major Upgrade": "Aggiornamento Principale",
     "Mass actions": "Azioni di massa",
@@ -249,6 +253,7 @@
     "Share With Devices": "Condividi con i Dispositivi",
     "Share this folder?": "Vuoi condividere questa cartella?",
     "Shared With": "Condiviso Con",
+    "Sharing": "Condivisione",
     "Show ID": "Mostra ID",
     "Show QR": "Mostra QR",
     "Show diff with previous version": "Mostra le differenze con la versione precedente",

gui/default/assets/lang/lang-ja.json

@@ -65,6 +65,7 @@
     "Device ID": "デバイスID",
     "Device Identification": "デバイスID",
     "Device Name": "デバイス名",
+    "Device rate limits": "Device rate limits",
     "Device that last modified the item": "Device that last modified the item",
     "Devices": "デバイス",
     "Disabled": "無効",
@@ -109,6 +110,7 @@
     "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.": "ファイルを他のデバイスによる変更から保護します。一方、このデバイスでの変更は他のデバイスに送信されます。",
     "Filesystem Notifications": "Filesystem Notifications",
+    "Filesystem Watcher Errors": "Filesystem Watcher Errors",
     "Filter by date": "Filter by date",
     "Filter by name": "Filter by name",
     "Folder": "フォルダー",
@@ -117,6 +119,7 @@
     "Folder Path": "フォルダーパス",
     "Folder Type": "フォルダーの種類",
     "Folders": "フォルダー",
+    "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.",
     "Full Rescan Interval (s)": "Full Rescan Interval (s)",
     "GUI": "GUI",
     "GUI Authentication Password": "GUI認証パスワード",
@@ -156,6 +159,7 @@
     "Local State (Total)": "ローカル状態 (合計)",
     "Log": "Log",
     "Log tailing paused. Click here to continue.": "Log tailing paused. Click here to continue.",
+    "Log tailing paused. Scroll to bottom continue.": "Log tailing paused. Scroll to bottom continue.",
     "Logs": "Logs",
     "Major Upgrade": "メジャーアップグレード",
     "Mass actions": "Mass actions",
@@ -249,6 +253,7 @@
     "Share With Devices": "共有するデバイス",
     "Share this folder?": "このフォルダーを共有しますか？",
     "Shared With": "共有中のデバイス",
+    "Sharing": "Sharing",
     "Show ID": "IDを表示",
     "Show QR": "QRコードを表示",
     "Show diff with previous version": "前バージョンとの差分を表示",

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

@@ -65,6 +65,7 @@
     "Device ID": "기기 ID",
     "Device Identification": "기기 식별자",
     "Device Name": "기기 이름",
+    "Device rate limits": "Device rate limits",
     "Device that last modified the item": "항목을 마지막으로 수정 한 기기",
     "Devices": "기기",
     "Disabled": "비활성화",
@@ -109,6 +110,7 @@
     "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.": "다른 장치가 파일을 편집할 수 없으며 반드시 이 장치의 내용을 기준으로 동기화합니다.",
     "Filesystem Notifications": "파일시스템 알림",
+    "Filesystem Watcher Errors": "Filesystem Watcher Errors",
     "Filter by date": "날짜별 정렬",
     "Filter by name": "이름별 정렬",
     "Folder": "폴더",
@@ -117,6 +119,7 @@
     "Folder Path": "폴더 경로",
     "Folder Type": "폴더 유형",
     "Folders": "폴더",
+    "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.",
     "Full Rescan Interval (s)": "전체 탐색 간격 (s)",
     "GUI": "GUI",
     "GUI Authentication Password": "GUI 인증 비밀번호",
@@ -156,6 +159,7 @@
     "Local State (Total)": "로컬 상태 (합계)",
     "Log": "기록",
     "Log tailing paused. Click here to continue.": "기록 출력이 일시정지됨. 계속하려면 여기를 클릭하십시오. ",
+    "Log tailing paused. Scroll to bottom continue.": "Log tailing paused. Scroll to bottom continue.",
     "Logs": "기록",
     "Major Upgrade": "메이저 업데이트",
     "Mass actions": "Mass actions",
@@ -249,6 +253,7 @@
     "Share With Devices": "공유할 기기",
     "Share this folder?": "이 폴더를 공유하시겠습니까?",
     "Shared With": "~와 공유",
+    "Sharing": "Sharing",
     "Show ID": "내 기기 ID",
     "Show QR": "QR 코드 보기",
     "Show diff with previous version": "이전 버전과 변경사항 보기",

gui/default/assets/lang/lang-lt.json

@@ -65,6 +65,7 @@
     "Device ID": "Įrenginio ID",
     "Device Identification": "Įrenginio identifikacija",
     "Device Name": "Įrenginio pavadinimas",
+    "Device rate limits": "Įrenginio spartos apribojimai",
     "Device that last modified the item": "Įrenginys, kuris paskutinis modifikavo elementą",
     "Devices": "Įrenginiai",
     "Disabled": "Išjungta",
@@ -109,6 +110,7 @@
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Programai Syncthing pakeičiant ar ištrinant failus, jie yra perkeliami į datomis pažymėtas versijas, aplanke .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.": "Failai yra apsaugoti nuo kituose įrenginiuose atliktų pakeitimų, bet pakeitimai šiame įrenginyje bus nusiųsti kitiems įrenginiams.",
     "Filesystem Notifications": "Failų sistemos pranešimai",
+    "Filesystem Watcher Errors": "Failų sistemos prižiūrėtojo klaidos",
     "Filter by date": "Filtruoti pagal datą",
     "Filter by name": "Filtruoti pagal pavadinimą",
     "Folder": "Aplankas",
@@ -117,6 +119,7 @@
     "Folder Path": "Kelias iki aplanko",
     "Folder Type": "Aplanko tipas",
     "Folders": "Aplankai",
+    "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "Pradėjus stebėti pakeitimus, šiuose aplankuose atsirado klaidų. Kiekvieną minutę bus bandoma iš naujo, taigi, klaidos gali išnykti. Jeigu jos neišnyks, pabandykite išspręsti slypinčią problemą, o jeigu neįstengiate, paprašykite pagalbos.",
     "Full Rescan Interval (s)": "Pilno nuskaitymo iš naujo intervalas (s)",
     "GUI": "Valdymo skydelis",
     "GUI Authentication Password": "Valdymo skydelio slaptažodis",
@@ -156,6 +159,7 @@
     "Local State (Total)": "Vietinė būsena (Bendrai)",
     "Log": "Žurnalas",
     "Log tailing paused. Click here to continue.": "Žurnalo galas pristabdytas. Spustelėkite čia, norėdami tęsti.",
+    "Log tailing paused. Scroll to bottom continue.": "Žurnalo galas pristabdytas. Slinkite į apačią, norėdami tęsti.",
     "Logs": "Žurnalai",
     "Major Upgrade": "Stambus atnaujinimas",
     "Mass actions": "Masiniai veiksmai",
@@ -249,6 +253,7 @@
     "Share With Devices": "Dalintis su įrenginiais",
     "Share this folder?": "Dalintis šiuo aplanku?",
     "Shared With": "Dalinamasi su",
+    "Sharing": "Dalinamasis",
     "Show ID": "Rodyti ID",
     "Show QR": "Rodyti QR",
     "Show diff with previous version": "Rodyti skirtumus su ankstesne versija",

gui/default/assets/lang/lang-nb.json

@@ -65,6 +65,7 @@
     "Device ID": "Enhets-ID",
     "Device Identification": "Enhetskjennemerke",
     "Device Name": "Navn på enhet",
+    "Device rate limits": "Device rate limits",
     "Device that last modified the item": "Enheten som sist endret elementet",
     "Devices": "Enheter",
     "Disabled": "Avskrudd",
@@ -109,6 +110,7 @@
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Filer flyttes til en datostemplet versjon i .stversions-mappa når den oppdateres eller slettes av 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.": "Filer er beskyttet mot endringer som er gjort på andre enheter, men endringer som er gjort på denne enheten blir sendt til resten av gruppen.",
     "Filesystem Notifications": "Filsystemvarsler ",
+    "Filesystem Watcher Errors": "Filesystem Watcher Errors",
     "Filter by date": "Filtrer etter dato",
     "Filter by name": "Filtrer etter navn",
     "Folder": "Mappe",
@@ -117,6 +119,7 @@
     "Folder Path": "Mappeplassering",
     "Folder Type": "Mappetype",
     "Folders": "Mapper",
+    "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.",
     "Full Rescan Interval (s)": "Intervall for fullstendig omskanning (s)",
     "GUI": "grafisk brukergrensesnitt",
     "GUI Authentication Password": "Passord for GUI-autenisering",
@@ -156,6 +159,7 @@
     "Local State (Total)": "Lokal tilstand (total)",
     "Log": "Logg",
     "Log tailing paused. Click here to continue.": "Tail-utdata pauset. Klikk her for å fortsette.",
+    "Log tailing paused. Scroll to bottom continue.": "Log tailing paused. Scroll to bottom continue.",
     "Logs": "Logger",
     "Major Upgrade": "Storoppgradering",
     "Mass actions": "Massehandlinger",
@@ -249,6 +253,7 @@
     "Share With Devices": "Del med enheter",
     "Share this folder?": "Del denne mappa?",
     "Shared With": "Delt med",
+    "Sharing": "Sharing",
     "Show ID": "Vis ID",
     "Show QR": "Vis QR-kode",
     "Show diff with previous version": "Vis diff med forrige version",

gui/default/assets/lang/lang-nl-BE.json

@@ -109,6 +109,7 @@
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Bestanden worden niet door Syncthing vervangen of verwijderd, maar verplaatst naar de map .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.": "Bestanden zijn beschermd tegen aanpassingen die gemaakt zijn door andere apparaten, maar aanpassingen op dit apparaat worden doorgestuurd naar de rest van de cluster.",
     "Filesystem Notifications": "Meldingen van bestandssysteem",
+    "Filesystem Watcher Errors": "Filesystem Watcher Errors",
     "Filter by date": "Filteren op datum",
     "Filter by name": "Filteren op naam",
     "Folder": "Map",
@@ -117,6 +118,7 @@
     "Folder Path": "Maplocatie",
     "Folder Type": "Soort map",
     "Folders": "Mappen",
+    "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.",
     "Full Rescan Interval (s)": "Interval voor volledig opnieuw scannen (s)",
     "GUI": "GUI",
     "GUI Authentication Password": "GUI-wachtwoord",

gui/default/assets/lang/lang-nl.json

@@ -1,7 +1,7 @@
 {
-    "A device with that ID is already added.": "Apparaat-ID reeds toegevoegd.",
-    "A negative number of days doesn't make sense.": "Een negatief aantal dagen is niet zinvol.",
-    "A new major version may not be compatible with previous versions.": "Een nieuwe major version is misschien niet compatibel met eerdere versies.",
+    "A device with that ID is already added.": "Er is al een apparaat met die ID toegevoegd.",
+    "A negative number of days doesn't make sense.": "Een negatief aantal dagen heeft geen zin.",
+    "A new major version may not be compatible with previous versions.": "Een nieuwe hoofdversie is mogelijk niet compatibel met eerdere versies.",
     "API Key": "API-sleutel",
     "About": "Over",
     "Action": "Actie",
@@ -10,9 +10,9 @@
     "Add Device": "Apparaat toevoegen",
     "Add Folder": "Map toevoegen",
     "Add Remote Device": "Extern apparaat toevoegen",
-    "Add devices from the introducer to our device list, for mutually shared folders.": "Voeg apparaten van het introductieapparaat toe aan de lijst met apparaten voor gemeenschappelijk gedeelde mappen.",
+    "Add devices from the introducer to our device list, for mutually shared folders.": "Apparaten van het introductie-apparaat aan onze lijst met apparaten toevoegen, voor gemeenschappelijk gedeelde mappen.",
     "Add new folder?": "Nieuwe map toevoegen?",
-    "Additionally the full rescan interval will be increased (times 60, i.e. new default of 1h). You can also configure it manually for every folder later after choosing No.": "Het interval van volledige scan zal daarbij ook vermeerderd worden (maal 60, dit is een nieuwe standaard van 1 uur). U kunt het later voor elke map manueel configureren nadat u nee kiest.",
+    "Additionally the full rescan interval will be increased (times 60, i.e. new default of 1h). You can also configure it manually for every folder later after choosing No.": "Het interval van volledige scan zal daarbij ook vermeerderd worden (maal 60, dit is een nieuwe standaardwaarde van 1 uur). U kunt het later voor elke map manueel configureren nadat u nee kiest.",
     "Address": "Adres",
     "Addresses": "Adressen",
     "Advanced": "Geavanceerd",
@@ -22,36 +22,36 @@
     "Allow Anonymous Usage Reporting?": "Versturen van anonieme gebruikersstatistieken toestaan?",
     "Allowed Networks": "Toegestane netwerken",
     "Alphabetic": "Alfabetisch",
-    "An external command handles the versioning. It has to remove the file from the shared folder.": "Een externe opdracht regelt het versiebeheer. Dit moet het bestand verwijderen uit de gedeelde map.",
-    "An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.": "Een externe opdracht regelt het versiebeheer. Dit moet het bestand verwijderen uit de gedeelde map. Als het pad naar de toepassing spaties bevat, moet dit tussen aanhalingstekens geplaatst worden.",
-    "An external command handles the versioning. It has to remove the file from the synced folder.": "Een extern commando regelt het versiebeheer. Dit moet het bestand verwijderen van de gesynchroniseerde map.",
+    "An external command handles the versioning. It has to remove the file from the shared folder.": "Een externe opdracht regelt het versiebeheer. Hij moet het bestand verwijderen uit de gedeelde map.",
+    "An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.": "Een externe opdracht regelt het versiebeheer. Hij moet het bestand verwijderen uit de gedeelde map. Als het pad naar de toepassing spaties bevat, moet dit tussen aanhalingstekens geplaatst worden.",
+    "An external command handles the versioning. It has to remove the file from the synced folder.": "Een externe opdracht regelt het versiebeheer. Hij moet het bestand verwijderen uit de gesynchroniseerde map.",
     "Anonymous Usage Reporting": "Anonieme gebruikersstatistieken",
     "Anonymous usage report format has changed. Would you like to move to the new format?": "Het formaat voor anonieme gebruikersrapporten is gewijzigd. Wilt u naar het nieuwe formaat overschakelen?",
-    "Any devices configured on an introducer device will be added to this device as well.": "Apparaten die geconfigureerd worden op een introductieapparaat zullen ook aan dit apparaat worden toegevoegd.",
+    "Any devices configured on an introducer device will be added to this device as well.": "Apparaten die geconfigureerd worden op een introductie-apparaat zullen ook aan dit apparaat worden toegevoegd.",
     "Are you sure you want to remove device {%name%}?": "Weet u zeker dat u apparaat {{name}} wilt verwijderen?",
     "Are you sure you want to remove folder {%label%}?": "Weet u zeker dat u map {{label}} wilt verwijderen?",
     "Are you sure you want to restore {%count%} files?": "Weet u zeker dat u {{count}} bestanden wilt herstellen?",
     "Auto Accept": "Automatisch aanvaarden",
-    "Automatic upgrade now offers the choice between stable releases and release candidates.": "Automatisch bijwerken biedt nu de keuze tussen stabiele uitgaven en uitgavekandidaten.",
+    "Automatic upgrade now offers the choice between stable releases and release candidates.": "Automatisch bijwerken biedt nu de keuze tussen stabiele releases en release canditates.",
     "Automatic upgrades": "Automatische upgrades",
-    "Automatically create or share folders that this device advertises at the default path.": "Automatisch mappen die dit apparaat aankondigt aanmaken of delen in de standaardlocatie.",
-    "Available debug logging facilities:": "Beschikbare debuglogmogelijkheden:",
+    "Automatically create or share folders that this device advertises at the default path.": "Automatisch mappen die dit apparaat aankondigt aanmaken of delen op de standaardlocatie.",
+    "Available debug logging facilities:": "Beschikbare debuglog-mogelijkheden:",
     "Be careful!": "Wees voorzichtig!",
     "Bugs": "Bugs",
     "CPU Utilization": "CPU-gebruik",
-    "Changelog": "Logboek",
-    "Clean out after": "Schoon op na",
+    "Changelog": "Wijzigingenlogboek",
+    "Clean out after": "Opruimen na",
     "Click to see discovery failures": "Klikken om ontdekkingsproblemen weer te geven",
     "Close": "Sluiten",
-    "Command": "Commando",
-    "Comment, when used at the start of a line": "Reageer indien gebruikt aan het begin van een lijn.",
+    "Command": "Opdracht",
+    "Comment, when used at the start of a line": "Opmerking, wanneer gebruikt aan het begin van een regel",
     "Compression": "Compressie",
     "Configured": "Geconfigureerd",
     "Connection Error": "Verbindingsfout",
     "Connection Type": "Soort verbinding",
     "Connections": "Verbindingen",
-    "Continuously watching for changes is now available within Syncthing. This will detect changes on disk and issue a scan on only the modified paths. The benefits are that changes are propagated quicker and that less full scans are required.": "Continu opvolgen voor wijzigingen is nu beschikbaar in Syncthing. Dit zal wijzigingen op een schijf detecteren en een scan uitvoeren op alleen de gewijzigde paden. De voordelen zijn dat wijzigingen sneller doorgevoerd worden en dat minder volledige scans nodig zijn.",
-    "Copied from elsewhere": "Gekopieerd vanaf elders",
+    "Continuously watching for changes is now available within Syncthing. This will detect changes on disk and issue a scan on only the modified paths. The benefits are that changes are propagated quicker and that less full scans are required.": "Continu opvolgen van wijzigingen is nu beschikbaar in Syncthing. Dit zal wijzigingen op een schijf detecteren en een scan uitvoeren op alleen de gewijzigde paden. De voordelen zijn dat wijzigingen sneller doorgevoerd worden en dat minder volledige scans nodig zijn.",
+    "Copied from elsewhere": "Gekopieerd van ergens anders",
     "Copied from original": "Gekopieerd van het origineel",
     "Copyright © 2014-2016 the following Contributors:": "Auteursrecht © 2014-2016 voor de volgende bijdragers:",
     "Copyright © 2014-2017 the following Contributors:": "Auteursrecht © 2014-2017 voor de volgende bijdragers:",
@@ -61,19 +61,20 @@
     "Default Folder Path": "Standaardmaplocatie",
     "Deleted": "Verwijderd",
     "Device": "Apparaat",
-    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Apparaat \"{{name}}\" ({{device}} at {{address}}) wil verbinden. Wilt u dit toestaan?",
+    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Apparaat \"{{name}}\" ({{device}} op {{address}}) wil verbinden. Nieuw apparaat toevoegen?",
     "Device ID": "Apparaat-ID",
     "Device Identification": "Apparaat-identificatie",
     "Device Name": "Naam apparaat",
+    "Device rate limits": "Snelheidsbegrenzingen apparaat",
     "Device that last modified the item": "Apparaat dat het item laatst gewijzigd heeft",
     "Devices": "Apparaten",
     "Disabled": "Uitgeschakeld",
-    "Disabled periodic scanning and disabled watching for changes": "Periodiek scannen uitgeschakeld & niet op de hoogte van updates",
-    "Disabled periodic scanning and enabled watching for changes": "Periodiek scannen uitgeschakeld maar op de hoogte van updates!",
-    "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Period scannen uitgeschakeld & falende updatesynchronisatie(s)...",
+    "Disabled periodic scanning and disabled watching for changes": "Periodiek scannen uitgeschakeld en opvolgen van wijzigingen uitgeschakeld",
+    "Disabled periodic scanning and enabled watching for changes": "Periodiek scannen uitgeschakeld en opvolgen van wijzigingen ingeschakeld",
+    "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Periodiek scannen uitgeschakeld en instellen van opvolgen van wijzigingen mislukt. Elke minuut wordt opnieuw geprobeerd:",
     "Disconnected": "Niet verbonden",
     "Discovered": "Ontdekt",
-    "Discovery": "Ontdekken",
+    "Discovery": "Ontdekking",
     "Discovery Failures": "Ontdekkingsproblemen",
     "Do not restore": "Niet herstellen",
     "Do not restore all": "Niet alles herstellen",
@@ -81,34 +82,35 @@
     "Documentation": "Documentatie",
     "Download Rate": "Downloadsnelheid",
     "Downloaded": "Gedownload",
-    "Downloading": "Bezig met downloaden",
-    "Edit": "Bewerk",
+    "Downloading": "Downloaden",
+    "Edit": "Bewerken",
     "Edit Device": "Apparaat bewerken",
     "Edit Folder": "Map bewerken",
-    "Editing": "Bezig met bewerken",
-    "Editing {%path%}.": "Bezig met bewerken van {{path}}.",
+    "Editing": "Bewerken",
+    "Editing {%path%}.": "{{path}} bewerken.",
     "Enable NAT traversal": "NAT traversal inschakelen",
-    "Enable Relaying": "Doorsturen inschakelen",
+    "Enable Relaying": "Relaying inschakelen",
     "Enabled": "Ingeschakeld",
-    "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Voer een positief nummer in (bijv. \"2.35\") en selecteer een eenheid. Percentages zijn een onderdeel van de totale schijfgrootte.",
-    "Enter a non-privileged port number (1024 - 65535).": "Voer een niet-geprivilegieerd poortnummer in (1024 - 65535).",
-    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Voer door komma's gescheiden (\"tcp://ip:port\", \"tcp://host:port\") adressen in of voer \"dynamisch\" in om automatische ontdekking van het adres uit te voeren.",
-    "Enter ignore patterns, one per line.": "Voer negeerpatronen in, één per regel.",
+    "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Voer een positief getal in (bijv. \"2.35\") en selecteer een eenheid. Percentages zijn als deel van de totale schijfgrootte.",
+    "Enter a non-privileged port number (1024 - 65535).": "Voer een niet-gereserveerd poortnummer in (1024 - 65535).",
+    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Voer door komma's gescheiden (\"tcp://ip:port\", \"tcp://host:port\") adressen in of \"dynamic\" om automatische ontdekking van het adres uit te voeren.",
+    "Enter ignore patterns, one per line.": "Negeerpatronen invoeren, één per regel.",
     "Error": "Fout",
-    "External File Versioning": "Extern versiebeheer voor bestanden",
+    "External File Versioning": "Extern versiebeheer",
     "Failed Items": "Mislukte items",
     "Failed to load ignore patterns": "Laden van negeerpatronen mislukt",
     "Failed to setup, retrying": "Instellen mislukt, opnieuw proberen",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Als er geen IPv6-connectiviteit is worden problemen bij verbinden met IPv6-servers verwacht.",
-    "File Pull Order": "Volgorde ontvangen bestanden",
+    "File Pull Order": "Volgorde voor binnenhalen van bestanden",
     "File Versioning": "Versiebeheer",
-    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Toegangsrechten voor bestanden worden genegeerd bij het zoeken naar wijzigingen. Gebruik voor FAT-bestandssystemen.",
-    "Files are moved to .stversions directory when replaced or deleted by Syncthing.": "Verwijderde of vervangen bestanden worden verplaatst naar de map .stversions.",
-    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Verwijderde of vervangen bestanden worden verplaatst naar de map .stversions.",
-    "Files are moved to date stamped versions in a .stversions directory when replaced or deleted by Syncthing.": "Bestanden worden niet door Syncthing vervangen of verwijderd, maar verplaatst naar de map .stversions.",
-    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Bestanden worden niet door Syncthing vervangen of verwijderd, maar verplaatst naar de map .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.": "Bestanden zijn beschermt tegen aanpassingen die gemaakt zijn door andere apparaten, maar aanpassingen op dit apparaat worden doorgestuurd naar de rest van het cluster.",
+    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Bits voor bestandsmachtigingen worden genegeerd bij het zoeken naar wijzigingen. Gebruik voor FAT-bestandssystemen.",
+    "Files are moved to .stversions directory when replaced or deleted by Syncthing.": "Bestanden worden verplaatst naar de .stversions-map wanneer ze vervangen of verwijderd zijn door Syncthing.",
+    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Bestanden worden verplaatst naar de .stversions-map wanneer ze vervangen of verwijderd zijn door Syncthing.",
+    "Files are moved to date stamped versions in a .stversions directory when replaced or deleted by Syncthing.": "Bestanden worden verplaatst naar versies met tijdsaanduiding in een .stversions-map wanneer ze vervangen of verwijderd zijn door Syncthing.",
+    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Bestanden worden verplaatst naar versies met tijdsaanduiding in een .stversions-map wanneer ze vervangen of verwijderd zijn door 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.": "Bestanden zijn beschermd tegen wijzigingen die op andere apparaten gemaakt zijn, maar wijzigingen die op dit apparaat gemaakt zijn, worden naar de rest van de cluster verzonden.",
     "Filesystem Notifications": "Meldingen van bestandssysteem",
+    "Filesystem Watcher Errors": "Fouten van bestandssysteem-opvolger",
     "Filter by date": "Filteren op datum",
     "Filter by name": "Filteren op naam",
     "Folder": "Map",
@@ -117,56 +119,58 @@
     "Folder Path": "Maplocatie",
     "Folder Type": "Soort map",
     "Folders": "Mappen",
+    "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "Voor de volgende mappen trad een fout op tijdens het beginnen opvolgen van wijzigingen. Er zal elke minuut opnieuw geprobeerd worden, dus de fouten kunnen snel verdwijnen. Als ze blijven voorkomen, probeer dan het onderliggende probleem op te lossen en vraag om hulp als u dat niet kunt.",
     "Full Rescan Interval (s)": "Interval voor volledig opnieuw scannen (s)",
     "GUI": "GUI",
     "GUI Authentication Password": "GUI-wachtwoord",
     "GUI Authentication User": "GUI-gebruikersnaam",
     "GUI Listen Address": "GUI-luisteradres",
-    "GUI Listen Addresses": "GUI-adres",
+    "GUI Listen Addresses": "GUI-luisteradressen",
     "GUI Theme": "GUI-thema",
     "General": "Algemeen",
-    "Generate": "Genereer",
-    "Global Changes": "Algemene veranderingen",
-    "Global Discovery": "Globaal zoeken",
+    "Generate": "Genereren",
+    "Global Changes": "Algemene wijzigingen",
+    "Global Discovery": "Globale ontdekking",
     "Global Discovery Servers": "Globale ontdekkingsservers",
     "Global State": "Globale status",
     "Help": "Help",
     "Home page": "Startpagina",
-    "Ignore": "Negeer",
-    "Ignore Patterns": "Bestanden negeren",
-    "Ignore Permissions": "Negeer bestandspermissies",
-    "Incoming Rate Limit (KiB/s)": "Limiteer downloadsnelheid (KiB/s)",
-    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Een verkeerde configuratie kan bestanden in mappen beschadigen en/of Syncthing onbruikbaar maken.",
+    "Ignore": "Negeren",
+    "Ignore Patterns": "Negeerpatronen",
+    "Ignore Permissions": "Machtigingen negeren",
+    "Incoming Rate Limit (KiB/s)": "Begrenzing downloadsnelheid (KiB/s)",
+    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Verkeerde configuratie kan de inhoud van uw map beschadigen en Syncthing onbruikbaar maken.",
     "Introduced By": "Geïntroduceerd door",
     "Introducer": "Introductie-apparaat",
-    "Inversion of the given condition (i.e. do not exclude)": "Inversie van de gegeven voorwaarde (i.e. niet uitsluiten)",
+    "Inversion of the given condition (i.e. do not exclude)": "Inversie van de gegeven voorwaarde (d.w.z. niet uitsluiten)",
     "Keep Versions": "Versies behouden",
     "Largest First": "Grootste eerst",
     "Last File Received": "Laatst ontvangen bestand",
     "Last Scan": "Laatste scan",
     "Last seen": "Laatst gezien op",
     "Later": "Later",
-    "Latest Change": "Meest recente wijziging",
+    "Latest Change": "Laatste wijziging",
     "Learn more": "Lees meer",
     "Listeners": "Luisteraars",
     "Loading data...": "Gegevens laden...",
     "Loading...": "Laden...",
-    "Local Discovery": "Lokaal zoeken",
+    "Local Discovery": "Lokale ontdekking",
     "Local State": "Lokale status",
     "Local State (Total)": "Lokale status (totaal)",
     "Log": "Logboek",
     "Log tailing paused. Click here to continue.": "Loggen gepauzeerd. Klik hier om verder te gaan.",
+    "Log tailing paused. Scroll to bottom continue.": "Loggen gepauzeerd. Naar beneden scrollen om door te gaan.",
     "Logs": "Logboeken",
-    "Major Upgrade": "Grote update",
+    "Major Upgrade": "Grote upgrade",
     "Mass actions": "Groepsacties",
     "Master": "Master",
-    "Maximum Age": "Maximum leeftijd",
+    "Maximum Age": "Maximale leeftijd",
     "Metadata Only": "Alleen metadata",
     "Minimum Free Disk Space": "Minimale vrije schijfruimte",
     "Mod. Device": "Wijzigend apparaat",
     "Mod. Time": "Tijdstip van wijziging",
-    "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)",
+    "Move to top of queue": "Naar begin van wachtrij verplaatsen",
+    "Multi level wildcard (matches multiple directory levels)": "Wildcard op meerdere niveaus (komt overeen met meerdere mapniveaus)",
     "Never": "Nooit",
     "New Device": "Nieuw apparaat",
     "New Folder": "Nieuwe map",
@@ -177,177 +181,178 @@
     "No upgrades": "Geen upgrades",
     "Normal": "Normaal",
     "Notice": "Mededeling",
-    "OK": "OK",
+    "OK": "Ok",
     "Off": "Uit",
     "Oldest First": "Oudste eerst",
     "Optional descriptive label for the folder. Can be different on each device.": "Optioneel label met een beschrijving voor de map. Kan verschillend zijn op elk apparaat.",
     "Options": "Opties",
     "Out of Sync": "Niet gesynchroniseerd",
     "Out of Sync Items": "Niet-gesynchroniseerde items",
-    "Outgoing Rate Limit (KiB/s)": "Uitgaande snelheidslimiet (KiB/s)",
-    "Override Changes": "Veranderingen overschrijven",
+    "Outgoing Rate Limit (KiB/s)": "Begrenzing uploadsnelheid (KiB/s)",
+    "Override Changes": "Wijzigingen overschrijven",
     "Path": "Pad",
-    "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Locatie van de map op de lokale computer. Als deze niet bestaat zal de map aangemaakt worden. De tilde (~) kan gebruikt worden als snelkoppeling voor ",
-    "Path where new auto accepted folders will be created, as well as the default suggested path when adding new folders via the UI. Tilde character (~) expands to {%tilde%}.": "Locatie waar nieuwe automatisch aanvaarde mappen aangemaakt zullen worden, evenals de standaard voorgestelde locatie bij toevoegen van nieuwe mappen in de gebruikersinterface. Een tilde (~) zet uit tot {{tilde}}.",
-    "Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).": "Pad waar de verschillende versies opgeslagen moeten worden (laat leeg voor de standaardmap '.stversion' in de gedeelde map).",
-    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Betandspad waar de versies opgeslagen moeten worden (leeg laten voor de standaard .stversions subfolder).",
-    "Pause": "Pauze",
+    "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": "Pad naar de map op de lokale computer. Zal aangemaakt worden als het niet bestaat. De tilde (~) kan gebruikt worden als snelkoppeling voor",
+    "Path where new auto accepted folders will be created, as well as the default suggested path when adding new folders via the UI. Tilde character (~) expands to {%tilde%}.": "Pad waar nieuwe automatisch aanvaarde mappen aangemaakt zullen worden, evenals het standaard voorgestelde pad bij toevoegen van nieuwe mappen via de gebruikersinterface. Een tilde (~) zet uit tot {{tilde}}.",
+    "Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).": "Pad waar versies opgeslagen moeten worden (leeg laten voor de standaard .stversion-map in de gedeelde map).",
+    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Pad waar versies opgeslagen moeten worden (leeg laten voor de standaard .stversion-map in de map).",
+    "Pause": "Pauzeren",
     "Pause All": "Alles pauzeren",
-    "Paused": "Gepauseerd",
-    "Periodic scanning at given interval and disabled watching for changes": "Periodieke interval-scans maar nog niet op de hoogte van updates",
-    "Periodic scanning at given interval and enabled watching for changes": "Periodieke interval-scans en gelukkig synchroon lopende updates!",
-    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Periodieke interval-scans & helaas falende synchronisatieupdating",
+    "Paused": "Gepauzeerd",
+    "Periodic scanning at given interval and disabled watching for changes": "Periodiek scannen met opgegeven interval; opvolgen van wijzigingen uitgeschakeld",
+    "Periodic scanning at given interval and enabled watching for changes": "Periodiek scannen met opgegeven interval; opvolgen van wijzigingen ingeschakeld",
+    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Periodiek scannen met opgegeven interval; instellen van opvolgen van wijzigingen mislukt. Om de minuut opnieuw proberen:",
     "Permissions": "Machtigingen",
-    "Please consult the release notes before performing a major upgrade.": "Lees eerst de release notes voordat u een grote update uitvoert.",
-    "Please set a GUI Authentication User and Password in the Settings dialog.": "Stel een gebruikersnaam en wachtwoord in bij 'Instellingen'.",
+    "Please consult the release notes before performing a major upgrade.": "Lees eerst de release-opmerkingen voordat u een grote upgrade uitvoert.",
+    "Please set a GUI Authentication User and Password in the Settings dialog.": "Stel een gebruikersnaam en wachtwoord voor GUI-authenticatie in via het instellingen-venster.",
     "Please wait": "Even geduld",
-    "Prefix indicating that the file can be deleted if preventing directory removal": "Voorvoegsel dat aangeeft dat het bestand kan worden verwijderd als het bestand het verwijderen van een map voorkomt",
-    "Prefix indicating that the pattern should be matched without case sensitivity": "Voorvoegsel dat aangeeft dat het patroon hoofdletterongevoelig moet worden vergeleken",
-    "Preview": "Preview",
-    "Preview Usage Report": "Preview gebruiksstatistieken",
+    "Prefix indicating that the file can be deleted if preventing directory removal": "Voorvoegsel dat aangeeft dat het bestand kan verwijderd worden als het bestand het verwijderen van een map voorkomt",
+    "Prefix indicating that the pattern should be matched without case sensitivity": "Voorvoegsel dat aangeeft dat het patroon niet hoofdlettergevoelig moet overeenkomen",
+    "Preview": "Voorbeeld",
+    "Preview Usage Report": "Voorbeeld van gebruiksrapport",
     "Quick guide to supported patterns": "Snelgids voor ondersteunde patronen",
-    "RAM Utilization": "Geheugengebruik",
+    "RAM Utilization": "RAM-gebruik",
     "Random": "Willekeurig",
     "Recent Changes": "Recente wijzigingen",
     "Reduced by ignore patterns": "Verminderd door negeerpatronen",
-    "Release Notes": "Release notes",
-    "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Uitgavekandidaten bevatten de laatste nieuwe functionaliteit en oplossingen voor problemen. Ze lijken op de traditionele, tweemaal per week, Syncthing-uitgaven.",
+    "Release Notes": "Release-opmerkingen",
+    "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Release candidates bevatten de laatste functies en oplossingen voor problemen. Ze lijken op de traditionele tweewekelijkse Syncthing-releases.",
     "Remote Devices": "Externe apparaten",
     "Remove": "Verwijderen",
     "Remove Device": "Apparaat verwijderen",
     "Remove Folder": "Map verwijderen",
-    "Required identifier for the folder. Must be the same on all cluster devices.": "De identifier voor de map is verplicht. Dit moet hetzelfde zijn op alle apparaten in het cluster. ",
+    "Required identifier for the folder. Must be the same on all cluster devices.": "Verplichte identificatiecode voor de map. Moet hetzelfde zijn op alle apparaten in de cluster. \n",
     "Rescan": "Opnieuw scannen",
-    "Rescan All": "Scan alles opnieuw",
-    "Rescan Interval": "Scanfrequentie",
+    "Rescan All": "Alles opnieuw scannen",
+    "Rescan Interval": "Scan-interval",
     "Rescans": "Rescans",
-    "Restart": "Herstart",
-    "Restart Needed": "Herstart nodig",
-    "Restarting": "Herstarten",
+    "Restart": "Opnieuw starten",
+    "Restart Needed": "Opnieuw starten is nodig",
+    "Restarting": "Opnieuw starten",
     "Restore": "Herstellen",
     "Restore Versions": "Versies herstellen",
     "Resume": "Hervatten",
     "Resume All": "Alles hervatten",
-    "Reused": "Hergebruikt",
+    "Reused": "Opnieuw gebruikt",
     "Running": "Draaiend",
-    "Save": "Bewaar",
+    "Save": "Opslaan",
     "Scan Time Remaining": "Resterende scantijd",
-    "Scanning": "Aan het zoeken",
-    "See external versioner help for supported templated command line parameters.": "Zie de documentatie van de externe versie voor ondersteunde command line parameters.",
-    "See external versioning help for supported templated command line parameters.": "Bekijk de documentatie van het extern versiebeheer voor ondersteunde opdrachtregelparameters.",
+    "Scanning": "Scannen",
+    "See external versioner help for supported templated command line parameters.": "Bekijk de documentatie van de externe versiebeheerder voor ondersteunde sjabloon-opdrachtregelparameters.",
+    "See external versioning help for supported templated command line parameters.": "Bekijk de documentatie van extern versiebeheer voor ondersteunde sjabloon-opdrachtregelparameters.",
     "Select a version": "Selecteer een versie",
-    "Select latest version": "Meest recente versie selecteren",
+    "Select latest version": "Laatste versie selecteren",
     "Select oldest version": "Oudste versie selecteren",
     "Select the devices to share this folder with.": "Selecteer de apparaten om deze map mee te delen.",
-    "Select the folders to share with this device.": "Selecteer de mappen om met dit apparaat te delen.",
-    "Send & Receive": "Verzenden & ontvangen",
+    "Select the folders to share with this device.": "Selecteer de mappen om te delen met dit apparaat.",
+    "Send & Receive": "Verzenden en ontvangen",
     "Send Only": "Alleen verzenden",
     "Settings": "Instellingen",
     "Share": "Delen",
-    "Share Folder": "Deel map",
-    "Share Folders With Device": "Deel mappen met apparaat",
+    "Share Folder": "Map dele",
+    "Share Folders With Device": "Mappen delen met apparaat",
     "Share With Devices": "Delen met apparaten",
     "Share this folder?": "Deze map delen?",
     "Shared With": "Gedeeld met",
-    "Show ID": "Toon ID",
-    "Show QR": "QR tonen",
-    "Show diff with previous version": "Verschil met vorige versie tonen",
-    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Wordt i.p.v. het apparaat-ID getoond in de clusterstatus. Deze naam wordt aan andere apparaten voorgesteld als optionele standaard naam.",
-    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Wordt in plaats van het apparaat-ID in de cluster status getoond. Zal geupdate worden naar de naam die het apparaat uitzend. ",
-    "Shutdown": "Sluit af",
+    "Sharing": "Delen",
+    "Show ID": "ID weergeven",
+    "Show QR": "QR weergeven",
+    "Show diff with previous version": "Verschil met vorige versie weergeven",
+    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Weergegeven in plaats van de apparaat-ID in de cluster-status. Zal aan andere apparaten voorgesteld worden als een optionele standaardnaam.",
+    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Weergegeven in plaats van de apparaat-ID in de clusterstatus. Zal bijgewerkt worden met de naam die het apparaat voorstelt wanneer leeg gelaten.",
+    "Shutdown": "Afsluiten",
     "Shutdown Complete": "Afsluiten voltooid",
     "Simple File Versioning": "Eenvoudig versiebeheer",
-    "Single level wildcard (matches within a directory only)": "Wildcard op enkelvoudig niveau (alleen toepasbaar binnen een map)",
+    "Single level wildcard (matches within a directory only)": "Wildcard op enkelvoudig niveau (komt alleen overeen binnen een map)",
     "Size": "Grootte",
     "Smallest First": "Kleinste eerst",
-    "Some items could not be restored:": "Sommige items konden niet hersteld worden.",
+    "Some items could not be restored:": "Sommige items konden niet hersteld worden:",
     "Source Code": "Broncode",
-    "Stable releases and release candidates": "Stabiele versies en release candidates",
-    "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "Stabiele uitgaven zijn met ongeveer twee weken vertraagd. Tijdens deze periode worden ze als uitgavekandidaten getest.",
-    "Stable releases only": "Alleen stabiele versies",
-    "Staggered File Versioning": "Gelaagd versiebeheer",
-    "Start Browser": "Start browser",
+    "Stable releases and release candidates": "Stabiele releases en release candidates",
+    "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "Stabiele releases worden met ongeveer twee weken uitgesteld. Tijdens deze periode worden ze als release canditates getest.",
+    "Stable releases only": "Alleen stabiele releases",
+    "Staggered File Versioning": "Gespreid versiebeheer",
+    "Start Browser": "Browser starten",
     "Statistics": "Statistieken",
     "Stopped": "Gestopt",
-    "Support": "Support",
-    "Sync Protocol Listen Addresses": "Synchronisatie protocol luister adres",
-    "Syncing": "Aan het synchroniseren",
-    "Syncthing has been shut down.": "Syncthing is afgesloten",
-    "Syncthing includes the following software or portions thereof:": "De volgende software of delen daarvan zijn onderdeel van syncthing:",
+    "Support": "Ondersteuning",
+    "Sync Protocol Listen Addresses": "Luisteradressen synchronisatieprotocol",
+    "Syncing": "Synchroniseren",
+    "Syncthing has been shut down.": "Syncthing werd afgesloten.",
+    "Syncthing includes the following software or portions thereof:": "Syncthing bevat de volgende software of delen daarvan:",
     "Syncthing is restarting.": "Syncthing is aan het herstarten.",
     "Syncthing is upgrading.": "Syncthing is aan het upgraden.",
-    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing lijkt afgesloten te zijn, of er is een verbindingsprobleem met het internet. Nieuwe poging....",
-    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing lijkt een probleem te ondervinden met het verwerken van je verzoek. Refresh de pagina of herstart Syncthing als de problemen zich blijven voordoen. ",
-    "The Syncthing admin interface is configured to allow remote access without a password.": "Syncthing's beheerdersinterface is ingesteld om externe toegang zonder wachtwoord toe te staan.",
-    "The aggregated statistics are publicly available at the URL below.": "De geaggregeerde statistieken zijn publiek beschikbaar op de onderstaande URL.",
-    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "De configuratie is opslagen maar nog niet actief. Syncthing moet opnieuw opgestart worden om de nieuwe configuratie te activeren.",
-    "The device ID cannot be blank.": "Het apparaat-ID mag niet leeg zijn.",
-    "The device ID to enter here can be found in the \"Actions > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "De hier in te vullen apparaat-ID kan gevonden worden in het \"Acties > ID weergeven\"-venster op de andere apparaten. Spaties en gedachtestreepjes zijn optioneel (en worden genegeerd). ",
-    "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.": "Het versleutelde gebruiksrapport wordt dagelijks gestuurd en wordt gebruikt om de verschillende platformen, mappengrootte en versies op te volgen. Als de reeks gegevens wijzigt zal dit scherm opnieuw worden getoond.",
-    "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.": "Dit apparaat-ID lijkt ongeldig. Het apparaat-ID bestaat uit 52 of 56 letters en cijfers, spaties en streepjes zijn optioneel.",
-    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "De eerste parameter is het pad naar de map en de tweede parameter is het relatieve pad binnen die map.",
-    "The folder ID cannot be blank.": "Het map-ID mag niet leeg zijn.",
-    "The folder ID must be unique.": "Het map-ID moet uniek zijn.",
-    "The folder path cannot be blank.": "De map locatie mag niet leeg zijn.",
+    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing lijkt gestopt te zijn, of er is een probleem met uw internetverbinding. Opnieuw proberen...",
+    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing lijkt een probleem te ondervinden met het verwerken van uw verzoek. Vernieuw de pagina of start Syncthing opnieuw als het probleem zich blijft voordoen. ",
+    "The Syncthing admin interface is configured to allow remote access without a password.": "De beheerdersinterface van Syncthing is ingesteld om externe toegang zonder wachtwoord toe te staan.",
+    "The aggregated statistics are publicly available at the URL below.": "De verzamelde statistieken zijn publiek beschikbaar op de onderstaande URL.",
+    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "De configuratie is opslagen maar nog niet ingeschakeld. Syncthing moet opnieuw gestart worden om de nieuwe configuratie in te schakelen.",
+    "The device ID cannot be blank.": "De apparaat-ID mag niet leeg zijn.",
+    "The device ID to enter here can be found in the \"Actions > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "De hier in te vullen apparaat-ID kan gevonden worden in het venster \"Acties > ID weergeven\" op het andere apparaat. Spaties en streepjes zijn optioneel (en worden genegeerd).",
+    "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.": "Het versleutelde gebruiksrapport wordt dagelijks verzonden. Het wordt gebruikt om veelgebruikte platformen, mapgroottes en app-versies te volgen. Als de gerapporteerde dataset gewijzigd wordt, zal dit dialoogvenster opnieuw weergegeven worden.",
+    "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.": "De opgegeven apparaat-ID ziet er niet goed uit. Het moet een reeks van 52 of 56 tekens zijn, bestaande uit letters en cijfers, waarbij spaties en streepjes optioneel zijn.",
+    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "De eerste opdrachtregelparameter is het pad naar de map en de tweede parameter is het relatieve pad binnen de map.",
+    "The folder ID cannot be blank.": "De map-ID mag niet leeg zijn.",
+    "The folder ID must be unique.": "De map-ID moet uniek zijn.",
+    "The folder path cannot be blank.": "Het pad naar de map mag niet leeg zijn.",
     "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "De volgende intervallen worden gebruikt: het eerste uur worden versies iedere 30 seconden bewaard, de eerste dag worden versies ieder uur bewaard, de eerste 30 dagen worden versies iedere dag bewaard, tot de maximale leeftijd worden versies iedere week bewaard.",
-    "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).": "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.",
+    "The following items could not be synchronized.": "De volgende items konden niet gesynchroniseerd worden.",
+    "The maximum age must be a number and cannot be blank.": "De maximumleeftijd moet een getal zijn en mag niet leeg zijn.",
+    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "De maximale tijd om een versie te bewaren (in dagen, instellen op 0 om versies voor altijd te bewaren).",
+    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "Het percentage minimale vrije schijfruimte moet een positief getal tussen 0 en 100 zijn.",
+    "The number of days must be a number and cannot be blank.": "Het aantal dagen moet een getal zijn en mag niet leeg zijn.",
+    "The number of days to keep files in the trash can. Zero means forever.": "Het aantal dagen om bestanden in de prullenbak te bewaren. Nul betekent voor altijd.",
+    "The number of old versions to keep, per file.": "Het aantal te bewaren oude versies, per bestand.",
+    "The number of versions must be a number and cannot be blank.": "Het aantal versies moet een getal zijn en mag niet leeg ziijn.",
+    "The path cannot be blank.": "Het pad mag niet leeg zijn.",
+    "The rate limit must be a non-negative number (0: no limit)": "De snelheidsbegrenzing moet een positief nummer zijn (0: geen begrenzing)",
+    "The rescan interval must be a non-negative number of seconds.": "Het interval voor opnieuw scannen moet een positief getal in seconden zijn.",
+    "They are retried automatically and will be synced when the error is resolved.": "Ze worden automatisch opnieuw geprobeerd en zullen gesynchroniseerd worden wanneer de fout opgelost is.",
     "This Device": "Dit apparaat",
-    "This can easily give hackers access to read and change any files on your computer.": "Dit kan kwaadwilligen eenvoudig toegang geven tot het lezen en wijzigen van bestanden op uw computer.",
-    "This is a major version upgrade.": "Dit is een grote update.",
-    "This setting controls the free space required on the home (i.e., index database) disk.": "Deze instelling beheert de benodigde vrije ruimte op de home (index database) schijf.",
+    "This can easily give hackers access to read and change any files on your computer.": "Dit kan hackers eenvoudig toegang geven om bestanden op uw computer te lezen en te wijzigen.",
+    "This is a major version upgrade.": "Dit is een grote versie-upgrade.",
+    "This setting controls the free space required on the home (i.e., index database) disk.": "Deze instelling bepaalt de benodigde vrije ruimte op de home-schijf (d.w.z. de indexdatabase).",
     "Time": "Tijd",
     "Time the item was last modified": "Tijdstip waarop het item laatst gewijzigd is",
-    "Trash Can File Versioning": "Versiebeheer bestanden prullenbak",
+    "Trash Can File Versioning": "Versiebeheer prullenbak",
     "Type": "Type",
     "Unavailable": "Niet beschikbaar",
     "Unavailable/Disabled by administrator or maintainer": "Niet beschikbaar of uitgeschakeld door administrator of beheerder",
-    "Undecided (will prompt)": "Onbeslist (bevestiging vragen)",
+    "Undecided (will prompt)": "Onbeslist (zal bevestiging vragen)",
     "Unknown": "Onbekend",
     "Unshared": "Niet gedeeld",
-    "Unused": "Ongebruikt",
-    "Up to Date": "Gesynchroniseerd",
+    "Unused": "Niet gebruikt",
+    "Up to Date": "Up-to-date",
     "Updated": "Bijgewerkt",
-    "Upgrade": "Upgrade",
-    "Upgrade To {%version%}": "Upgrade naar {{version}}",
-    "Upgrading": "Bezig met upgrade",
+    "Upgrade": "Upgraden",
+    "Upgrade To {%version%}": "Upgraden naar {{version}}",
+    "Upgrading": "Upgraden",
     "Upload Rate": "Uploadsnelheid",
-    "Uptime": "Uptime",
-    "Usage reporting is always enabled for candidate releases.": "Rapportage van gebruik is altijd ingeschakeld voor de candidate releases.",
-    "Use HTTPS for GUI": "Gebruik HTTPS voor de GUI",
+    "Uptime": "Bedrijfstijd",
+    "Usage reporting is always enabled for candidate releases.": "Gebruiksrapportering is altijd ingeschakeld voor de kandidaat-releases.",
+    "Use HTTPS for GUI": "HTTPS gebruiken voor GUI",
     "Version": "Versie",
     "Versions": "Versies",
-    "Versions Path": "Bestandspad versies",
-    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Versies worden automatisch verwijderd als deze ouder zijn dan de maximale leeftijd of als ze het maximaal aantal toegestane bestanden per interval overschrijden. ",
+    "Versions Path": "Pad voor versies",
+    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Versies worden automatisch verwijderd als deze ouder zijn dan de maximale leeftijd of als ze het maximaal aantal toegestane bestanden in een interval overschrijden.",
     "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "Waarschuwing, dit pad is een bovenliggende map van een bestaande map \"{{otherFolder}}\".",
     "Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Waarschuwing, dit pad is een bovenliggende map van een bestaande map \"{{otherFolderLabel}}\" ({{otherFolder}}).",
-    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Let op, dit bestandspad is een submap van een bestaande map \"{{otherFolder}}\".",
+    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Waarschuwing, dit ppad is een onderliggende map van een bestaande map \"{{otherFolder}}\".",
     "Warning, this path is a subdirectory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Waarschuwing, dit pad is een onderliggende map van een bestaande map \"{{otherFolderLabel}}\" ({{otherFolder}}).",
     "Warning: If you are using an external watcher like {%syncthingInotify%}, you should make sure it is deactivated.": "Waarschuwing: als u een externe opvolger gebruikt zoals {{syncthingInotify}}, moet u zich ervan verzekeren dat die uitgeschakeld is.",
     "Watch for Changes": "Wijzigingen opvolgen",
     "Watching for Changes": "Wijzigingen opvolgen",
-    "When adding a new device, keep in mind that this device must be added on the other side too.": "Wanneer een nieuw toestel wordt toegevoegd, houd er dan rekening mee dat dit toestel ook aan de andere kant moet worden toegevoegd.",
-    "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.": "Houd er bij het toevoegen van nieuwe mappen rekening mee dat het map-ID gebruikt wordt om mappen tussen apparaten te verbinden. Dit ID is hoofdlettergevoelig en moet identiek zijn op andere apparaten.",
+    "When adding a new device, keep in mind that this device must be added on the other side too.": "Houd er bij het toevoegen van een nieuw apparaat rekening mee dat dit apparaat ook aan de andere kant moet toegevoegd worden.",
+    "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.": "Houd er bij het toevoegen van een nieuwe map rekening mee dat de map-ID gebruikt wordt om mappen aan elkaar te koppelen tussen apparaten. Ze zijn hoofdlettergevoelig en moeten exact overeenkomen op alle apparaten.",
     "Yes": "Ja",
-    "You can also select one of these nearby devices:": "U kunt ook een van de apparaten die dichtbij zijn selecteren:",
-    "You can change your choice at any time in the Settings dialog.": "U kunt uw keuze op elk moment aanpassen in de Instellingen.",
-    "You can read more about the two release channels at the link below.": "U kunt meer te weten komen over de twee uitgavekanalen via onderstaande link.",
-    "You must keep at least one version.": "Minstens 1 versie moet bewaard blijven.",
+    "You can also select one of these nearby devices:": "U kunt ook een van deze apparaten in de buurt selecteren:",
+    "You can change your choice at any time in the Settings dialog.": "U kunt uw keuze op elk moment aanpassen in het instellingen-venster.",
+    "You can read more about the two release channels at the link below.": "U kunt meer te weten komen over de twee release-kanalen via onderstaande link.",
+    "You must keep at least one version.": "U moet minstens één versie bewaren.",
     "days": "dagen",
-    "directories": "Mappen",
-    "files": "Bestanden",
+    "directories": "mappen",
+    "files": "bestanden",
     "full documentation": "volledige documentatie",
-    "items": "objecten",
+    "items": "items",
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} wil de map \"{{folder}}\" delen.",
     "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} wil de map \"{{folderlabel}}\" ({{folder}}) delen."
 }

gui/default/assets/lang/lang-pl.json

@@ -65,6 +65,7 @@
     "Device ID": "ID urządzenia",
     "Device Identification": "Identyfikator urządzenia",
     "Device Name": "Nazwa urządzenia",
+    "Device rate limits": "Device rate limits",
     "Device that last modified the item": "Urządzenie, które jako ostatnie zmodyfikowało element",
     "Devices": "Urządzenia",
     "Disabled": "Wyłączone",
@@ -109,6 +110,7 @@
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Pliki przenoszone są do wersji oznaczonych datą w folderze .stversions kiedy są zastępowane bądź usuwane przez 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.": "Pliki są zabezpieczone przed zmianami na innym urządzeniu, jednak zmiany w tym urządzeniu będą wysłane do reszty.",
     "Filesystem Notifications": "Powiadomienia systemowe",
+    "Filesystem Watcher Errors": "Filesystem Watcher Errors",
     "Filter by date": "Filtruj według daty",
     "Filter by name": "Filtruj według nazwy",
     "Folder": "Folder",
@@ -117,6 +119,7 @@
     "Folder Path": "Ścieżka folderu",
     "Folder Type": "Rodzaj folderu",
     "Folders": "Foldery",
+    "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.",
     "Full Rescan Interval (s)": "Interwał pełnego skanowania (s)",
     "GUI": "GUI",
     "GUI Authentication Password": "Hasło",
@@ -156,6 +159,7 @@
     "Local State (Total)": "Status lokalny (suma)",
     "Log": "Log",
     "Log tailing paused. Click here to continue.": "Śledzenie loga wstrzymane. Kliknij tutaj aby wznowić",
+    "Log tailing paused. Scroll to bottom continue.": "Log tailing paused. Scroll to bottom continue.",
     "Logs": "Logi",
     "Major Upgrade": "Ważna aktualizacja",
     "Mass actions": "Działania masowe",
@@ -249,6 +253,7 @@
     "Share With Devices": "Udostępnij dla urządzenia",
     "Share this folder?": "Udostępnić ten folder?",
     "Shared With": "Współdzielony z",
+    "Sharing": "Sharing",
     "Show ID": "Pokaż ID",
     "Show QR": "Pokaż kod QR",
     "Show diff with previous version": "Pokaż różnice z poprzednią wersją",

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

@@ -65,6 +65,7 @@
     "Device ID": "ID do dispositivo",
     "Device Identification": "Identificação do dispositivo",
     "Device Name": "Nome do dispositivo",
+    "Device rate limits": "Device rate limits",
     "Device that last modified the item": "Dispositivo que modificou o item pela última vez",
     "Devices": "Dispositivos",
     "Disabled": "Desabilitado",
@@ -109,6 +110,7 @@
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Os arquivos são renomeados com suas datas na pasta .stversions quando substituídos ou removidos pelo 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.": "Os arquivos estão protegidos contra alterações feitas em outros dispositivos, mas alterações feitas neste dispositivo serão enviadas ao resto dos dispositivos.",
     "Filesystem Notifications": "Notificação do Sistema de Arquivos",
+    "Filesystem Watcher Errors": "Filesystem Watcher Errors",
     "Filter by date": "Filtrar por data",
     "Filter by name": "Filtrar por nome",
     "Folder": "Pasta",
@@ -117,6 +119,7 @@
     "Folder Path": "Caminho da pasta",
     "Folder Type": "Tipo da pasta",
     "Folders": "Pastas",
+    "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.",
     "Full Rescan Interval (s)": "Full Rescan Interval (s)",
     "GUI": "Interface gráfica",
     "GUI Authentication Password": "Senha para acesso à interface",
@@ -156,6 +159,7 @@
     "Local State (Total)": "Estado local (total)",
     "Log": "Log",
     "Log tailing paused. Click here to continue.": "Observação do log pausada. Clique aqui para continuar.",
+    "Log tailing paused. Scroll to bottom continue.": "Log tailing paused. Scroll to bottom continue.",
     "Logs": "Logs",
     "Major Upgrade": "Atualização \"major\"",
     "Mass actions": "Ações em massa",
@@ -249,6 +253,7 @@
     "Share With Devices": "Compartilhar com os dispositivos",
     "Share this folder?": "Compartilhar esta pasta?",
     "Shared With": "Compartilhada com",
+    "Sharing": "Sharing",
     "Show ID": "Mostrar ID",
     "Show QR": "Mostrar QR Code",
     "Show diff with previous version": "Mostrar diferenças da versão anterior",

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

@@ -65,6 +65,7 @@
     "Device ID": "ID do dispositivo",
     "Device Identification": "Identificação do dispositivo",
     "Device Name": "Nome do dispositivo",
+    "Device rate limits": "Limites de velocidade do dispositivo",
     "Device that last modified the item": "Último dispositivo a modificar o item",
     "Devices": "Dispositivos",
     "Disabled": "Desactivada",
@@ -109,6 +110,7 @@
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Os ficheiros são movidos para versões carimbadas com o tempo numa pasta .stversions, ao serem substituídos ou apagados pelo 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.": "Os ficheiros estão protegidos contra alterações feitas noutros dispositivos, mas alterações feitas neste dispositivo serão enviadas ao resto do grupo.",
     "Filesystem Notifications": "Notificações do sistema de ficheiros",
+    "Filesystem Watcher Errors": "Erros da vigilância do sistema de ficheiros",
     "Filter by date": "Filtrar por data",
     "Filter by name": "Filtrar por nome",
     "Folder": "Pasta",
@@ -117,6 +119,7 @@
     "Folder Path": "Caminho da pasta",
     "Folder Type": "Tipo de pasta",
     "Folders": "Pastas",
+    "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "Nas pastas seguintes ocorreu um erro durante o arranque da vigilância de alterações. Será tentado novamente a cada minuto, por isso os erros poderão desaparecer brevemente. Se persistirem, tente resolver o erro subjacente e, caso não consiga, peça ajuda.",
     "Full Rescan Interval (s)": "Intervalo entre verificações completas (s)",
     "GUI": "Interface gráfica",
     "GUI Authentication Password": "Senha da autenticação na interface gráfica",
@@ -156,6 +159,7 @@
     "Local State (Total)": "Estado local (total)",
     "Log": "Registo",
     "Log tailing paused. Click here to continue.": "O acompanhamento do final do registo está em pausa. Clique aqui para continuar.",
+    "Log tailing paused. Scroll to bottom continue.": "O acompanhamento do final do registo está em pausa. Desloque para o final para continuar.",
     "Logs": "Registos",
     "Major Upgrade": "Actualização importante",
     "Mass actions": "Acções em massa",
@@ -249,6 +253,7 @@
     "Share With Devices": "Partilhar com os dispositivos",
     "Share this folder?": "Partilhar esta pasta?",
     "Shared With": "Partilhada com",
+    "Sharing": "Partilha",
     "Show ID": "Mostrar ID",
     "Show QR": "Mostrar QR",
     "Show diff with previous version": "Mostrar diferenças em relação à versão anterior",

gui/default/assets/lang/lang-ru.json

@@ -31,11 +31,11 @@
     "Are you sure you want to remove device {%name%}?": "Вы уверены, что хотите удалить устройство {{name}}?",
     "Are you sure you want to remove folder {%label%}?": "Вы уверены, что хотите удалить папку {{label}}?",
     "Are you sure you want to restore {%count%} files?": "Вы уверены, что хотите восстановить {{count}} файлов?",
-    "Auto Accept": "Auto Accept",
+    "Auto Accept": "Автопринятие",
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "Автоматическое обновление теперь предлагает выбор между стабильными выпусками и кандидатами в релизы.",
     "Automatic upgrades": "Автообновление",
     "Automatically create or share folders that this device advertises at the default path.": "Automatically create or share folders that this device advertises at the default path.",
-    "Available debug logging facilities:": "Available debug logging facilities:",
+    "Available debug logging facilities:": "Доступные средства отладочного журнала:",
     "Be careful!": "Будьте осторожны!",
     "Bugs": "Ошибки",
     "CPU Utilization": "Загрузка ЦП",
@@ -65,6 +65,7 @@
     "Device ID": "ID устройства",
     "Device Identification": "Идентификация устройства",
     "Device Name": "Имя устройства",
+    "Device rate limits": "Device rate limits",
     "Device that last modified the item": "Устройство, последним изменившее объект",
     "Devices": "Устройства",
     "Disabled": "Отключено",
@@ -77,7 +78,7 @@
     "Discovery Failures": "Ошибки обнаружения",
     "Do not restore": "Не восстанавливать",
     "Do not restore all": "Do not restore all",
-    "Do you want to enable watching for changes for all your folders?": "Do you want to enable watching for changes for all your folders?",
+    "Do you want to enable watching for changes for all your folders?": "Хотите включить слежение за изменениями для всех своих папок?",
     "Documentation": "Документация",
     "Download Rate": "Скорость загрузки",
     "Downloaded": "Загружено",
@@ -89,7 +90,7 @@
     "Editing {%path%}.": "Правка {{path}}.",
     "Enable NAT traversal": "Включить NAT traversal",
     "Enable Relaying": "Включить релеи",
-    "Enabled": "Enabled",
+    "Enabled": "Включено",
     "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.",
     "Enter a non-privileged port number (1024 - 65535).": "Введите непривилегированный порт (1024—65535).",
     "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Введите через запятую («tcp://ip:port», «tcp://host:port») адреса, либо «dynamic», чтобы выполнить автоматическое обнаружение адреса.",
@@ -98,7 +99,7 @@
     "External File Versioning": "Внешний контроль версий файлов",
     "Failed Items": "Сбои",
     "Failed to load ignore patterns": "Failed to load ignore patterns",
-    "Failed to setup, retrying": "Failed to setup, retrying",
+    "Failed to setup, retrying": "Не удалось настроить, пробуем ещё",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Если нет IPv6-соединений, при подключении к IPv6-серверам произойдёт ошибка.",
     "File Pull Order": "Порядок получения файлов",
     "File Versioning": "Управление версиями",
@@ -109,6 +110,7 @@
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Файлы с временнОй меткой версии помещаются в папку .stversions при их замене или удалении 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.": "Файлы защищены от изменений сделанных на других устройствах, но изменения сделанные на этом устройстве будут отправлены всему кластеру.",
     "Filesystem Notifications": "Уведомления файловой системы",
+    "Filesystem Watcher Errors": "Filesystem Watcher Errors",
     "Filter by date": "Отфильтровать по дате",
     "Filter by name": "Отфильтровать по имени",
     "Folder": "Папка",
@@ -117,6 +119,7 @@
     "Folder Path": "Путь к папке",
     "Folder Type": "Тип папки",
     "Folders": "Папки",
+    "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.",
     "Full Rescan Interval (s)": "Full Rescan Interval (s)",
     "GUI": "Интерфейс",
     "GUI Authentication Password": "Пароль для доступа к панели управления",
@@ -156,9 +159,10 @@
     "Local State (Total)": "Локальное состояние (всего)",
     "Log": "Журнал",
     "Log tailing paused. Click here to continue.": "Log tailing paused. Click here to continue.",
+    "Log tailing paused. Scroll to bottom continue.": "Log tailing paused. Scroll to bottom continue.",
     "Logs": "Журналы",
     "Major Upgrade": "Обновление основной версии",
-    "Mass actions": "Mass actions",
+    "Mass actions": "Массовые действия",
     "Master": "Мастер",
     "Maximum Age": "Максимальный срок",
     "Metadata Only": "Только метаданные",
@@ -197,7 +201,7 @@
     "Periodic scanning at given interval and disabled watching for changes": "Periodic scanning at given interval and disabled watching for changes",
     "Periodic scanning at given interval and enabled watching for changes": "Periodic scanning at given interval and enabled watching for changes",
     "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:",
-    "Permissions": "Permissions",
+    "Permissions": "Разрешения",
     "Please consult the release notes before performing a major upgrade.": "Перед проведением обновления основной версии ознакомтесь, пожалуйста, с Замечаниями к версии",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Установите имя пользователя и пароль для интерфейса в настройках",
     "Please wait": "Пожалуйста, подождите",
@@ -220,12 +224,12 @@
     "Rescan": "Пересканировать",
     "Rescan All": "Пересканировать все",
     "Rescan Interval": "Интервал пересканирования",
-    "Rescans": "Rescans",
+    "Rescans": "Ресканы",
     "Restart": "Перезапустить",
     "Restart Needed": "Требуется перезапуск",
     "Restarting": "Перезапуск",
     "Restore": "Восстановить",
-    "Restore Versions": "Restore Versions",
+    "Restore Versions": "Восстановить версии",
     "Resume": "Возобновить",
     "Resume All": "Возобновить все",
     "Reused": "Повторно использовано",
@@ -249,6 +253,7 @@
     "Share With Devices": "Предоставить доступ устройствам",
     "Share this folder?": "Предоставить доступ к этой папке?",
     "Shared With": "Доступ предоставлен",
+    "Sharing": "Sharing",
     "Show ID": "Показать ID",
     "Show QR": "Показать QR-код",
     "Show diff with previous version": "Показать различия с предыдущей версией",
@@ -260,7 +265,7 @@
     "Single level wildcard (matches within a directory only)": "Одноуровневая маска (поиск совпадений только внутри папки)",
     "Size": "Размер",
     "Smallest First": "Сначала маленькие",
-    "Some items could not be restored:": "Some items could not be restored:",
+    "Some items could not be restored:": "Не удалось восстановить некоторые объекты:",
     "Source Code": "Исходный код",
     "Stable releases and release candidates": "Стабильные выпуски и кандидаты в релизы",
     "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "Стабильные выпуски выходят с задержкой около двух недель. За это время они проходят тестирование в качестве кандидатов в релизы.",
@@ -334,8 +339,8 @@
     "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Осторожно, этот путь является подкаталогом существующей папки «{{otherFolder}}».",
     "Warning, this path is a subdirectory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Внимание! Этот путь — поддиректория уже существующей папки «{{otherFolderLabel}}» ({{otherFolder}}).",
     "Warning: If you are using an external watcher like {%syncthingInotify%}, you should make sure it is deactivated.": "Warning: If you are using an external watcher like {{syncthingInotify}}, you should make sure it is deactivated.",
-    "Watch for Changes": "Watch for Changes",
-    "Watching for Changes": "Watching for Changes",
+    "Watch for Changes": "Следить за изменениями",
+    "Watching for Changes": "Слежение за изменениями",
     "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 папок используются для того, чтобы связывать папки между всеми устройствами. Они чувствительны к регистру и должны совпадать на всех используемых устройствах.",
     "Yes": "Да",

gui/default/assets/lang/lang-sk.json

@@ -65,6 +65,7 @@
     "Device ID": "ID zariadenia",
     "Device Identification": "Identifikácia zariadenia",
     "Device Name": "Názov zariadenia",
+    "Device rate limits": "Device rate limits",
     "Device that last modified the item": "Zariadenie, ktoré naposledy pozmenilo položku",
     "Devices": "Zariadenia",
     "Disabled": "Odpojené",
@@ -109,6 +110,7 @@
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Súbory premiestnené alebo zmazané aplikáciou Syncthing sú premenované na verziu s dátumom a presunuté do adresára .stversions.",
     "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Soubory sú chránené pred zmenami na ostatních zariadeniach, ale zmeny provedené z tohto zariadenia budú rozoslané na zvyšok klastra.",
     "Filesystem Notifications": "Oznamy súborového systému",
+    "Filesystem Watcher Errors": "Filesystem Watcher Errors",
     "Filter by date": "Filtrovanie podľa dátumu",
     "Filter by name": "Filtrovanie podľa mena",
     "Folder": "Adresár",
@@ -117,6 +119,7 @@
     "Folder Path": "Cesta k adresáru",
     "Folder Type": "Typ adresára",
     "Folders": "Adresáre",
+    "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.",
     "Full Rescan Interval (s)": "Full Rescan Interval (s)",
     "GUI": "GUI",
     "GUI Authentication Password": "Prihlasovacie heslo do GUI",
@@ -156,6 +159,7 @@
     "Local State (Total)": "Lokálny status (celkový)",
     "Log": "Záznam",
     "Log tailing paused. Click here to continue.": "Posúvanie záznamu prerušené. Klikni pre pokračovanie.",
+    "Log tailing paused. Scroll to bottom continue.": "Log tailing paused. Scroll to bottom continue.",
     "Logs": "Záznamy",
     "Major Upgrade": "Hlavná aktualizácia",
     "Mass actions": "Hromadná akcia",
@@ -249,6 +253,7 @@
     "Share With Devices": "Zdieľať so zariadeniami",
     "Share this folder?": "Zdieľať tento adresár?",
     "Shared With": "Zdieľané s",
+    "Sharing": "Sharing",
     "Show ID": "Zobraziť ID",
     "Show QR": "Zobraziť QR",
     "Show diff with previous version": "Ukázať rozdiely s predchádzajúcou verziou",

gui/default/assets/lang/lang-sv.json

@@ -50,7 +50,7 @@
     "Connection Error": "Anslutningsproblem",
     "Connection Type": "Anslutningstyp",
     "Connections": "Anslutningar",
-    "Continuously watching for changes is now available within Syncthing. This will detect changes on disk and issue a scan on only the modified paths. The benefits are that changes are propagated quicker and that less full scans are required.": "Continuously watching for changes is now available within Syncthing. This will detect changes on disk and issue a scan on only the modified paths. The benefits are that changes are propagated quicker and that less full scans are required.",
+    "Continuously watching for changes is now available within Syncthing. This will detect changes on disk and issue a scan on only the modified paths. The benefits are that changes are propagated quicker and that less full scans are required.": "Kontinuerligt utkik efter ändringar är nu tillgängligt för Syncthing. Detta kommer att upptäcka ändringar på disken och utfärda en skanning på endast de modifierade sökvägarna. Fördelarna är att förändringar sprids snabbare och att mindre fullständiga skanningar krävs.",
     "Copied from elsewhere": "Kopierat från annanstans",
     "Copied from original": "Kopierat från original",
     "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 följande bidragare:",
@@ -65,6 +65,7 @@
     "Device ID": "Enhetens ID",
     "Device Identification": "Enhetens identifikation",
     "Device Name": "Enhetsnamn",
+    "Device rate limits": "Enhetshastighetsgränser",
     "Device that last modified the item": "Enhet som senast ändrade objektet",
     "Devices": "Enheter",
     "Disabled": "Inaktiverad",
@@ -77,7 +78,7 @@
     "Discovery Failures": "Upptäcktsmisslyckanden",
     "Do not restore": "Återställ inte",
     "Do not restore all": "Återställ inte allt",
-    "Do you want to enable watching for changes for all your folders?": "Vill du aktivera håll utkik efter förändringar på alla dina mappar?",
+    "Do you want to enable watching for changes for all your folders?": "Vill du aktivera håll utkik efter ändringar på alla dina mappar?",
     "Documentation": "Dokumentation",
     "Download Rate": "Hämtningshastighet",
     "Downloaded": "Hämtat",
@@ -109,6 +110,7 @@
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Filer flyttas till datummärkta versioner i en .stversions mapp när de ersätts eller tas bort av 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.": "Filer skyddas från ändringar gjorda på andra enheter, men ändringar som görs på den här noden skickas till de andra klustermedlemmarna.",
     "Filesystem Notifications": "filsystemsnotifieringar",
+    "Filesystem Watcher Errors": "Filsystem bevakarfel",
     "Filter by date": "Filtrera efter datum",
     "Filter by name": "Filtrera efter namn",
     "Folder": "Mapp",
@@ -117,6 +119,7 @@
     "Folder Path": "Mappsökväg",
     "Folder Type": "Mapptyp",
     "Folders": "Mappar",
+    "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "För följande mappar uppstod ett fel när du började bevaka ändringar. Det kommer att omförsökas varje minut, så felen kan försvinna snart. Om de fortsätter, försök att åtgärda det underliggande problemet och fråga om hjälp om du inte kan.",
     "Full Rescan Interval (s)": "Fullständig omskanningsintervall(er)",
     "GUI": "Grafiskt gränssnitt",
     "GUI Authentication Password": "Gränssnittets autentiseringslösenord",
@@ -155,7 +158,8 @@
     "Local State": "Lokalt tillstånd",
     "Local State (Total)": "Lokalt tillstånd (totalt)",
     "Log": "Logg",
-    "Log tailing paused. Click here to continue.": "Log tailing paused. Click here to continue.",
+    "Log tailing paused. Click here to continue.": "Loggning pausad. Klicka här för att fortsätta.",
+    "Log tailing paused. Scroll to bottom continue.": "Log tailing paused. Scroll to bottom continue.",
     "Logs": "Loggar",
     "Major Upgrade": "Större uppgradering",
     "Mass actions": "Massåtgärder",
@@ -249,6 +253,7 @@
     "Share With Devices": "Dela med enheter",
     "Share this folder?": "Dela denna mapp?",
     "Shared With": "Delad med",
+    "Sharing": "Delning",
     "Show ID": "Visa ID",
     "Show QR": "Visa QR",
     "Show diff with previous version": "Visa skillnad med tidigare version",
@@ -333,9 +338,9 @@
     "Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Varning, denna sökväg är en överordnad mapp av en befintlig mapp \"{{otherFolderLabel}}\" ({{otherFolder}}).",
     "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Varning, denna sökväg är en underkatalog till en befintlig mapp \"{{otherFolder}}\".",
     "Warning, this path is a subdirectory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Varning, denna sökväg är en undermapp av en befintlig mapp \"{{otherFolderLabel}}\" ({{otherFolder}}).",
-    "Warning: If you are using an external watcher like {%syncthingInotify%}, you should make sure it is deactivated.": "Warning: If you are using an external watcher like {{syncthingInotify}}, you should make sure it is deactivated.",
-    "Watch for Changes": "Håll utkik efter förändringar",
-    "Watching for Changes": "Håller utkik efter förändringar",
+    "Warning: If you are using an external watcher like {%syncthingInotify%}, you should make sure it is deactivated.": "Varning: Om du använder en extern bevakare som {{syncthingInotify}}, bör du se till att den är inaktiverad.",
+    "Watch for Changes": "Håll utkik efter ändringar",
+    "Watching for Changes": "Håller utkik efter ändringar",
     "When adding a new device, keep in mind that this device must be added on the other side too.": "När du lägger till en ny enhet, kom ihåg att den här enheten måste läggas till på den andra enheten också.",
     "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.": "När du lägger till ny mapp, tänk på att mappens ID knyter ihop mappar mellan olika enheter. De skiftlägeskänsliga och måste matcha precis mellan alla enheter.",
     "Yes": "Ja",

gui/default/assets/lang/lang-tr.json

@@ -1,353 +0,0 @@
-{
-    "A device with that ID is already added.": "Bu ID'yi taşıyan aygıt zaten eklendi.",
-    "A negative number of days doesn't make sense.": "Eksi gün sayısı mantıklı bir ifade değil.",
-    "A new major version may not be compatible with previous versions.": "Yeni ana sürüm, önceki sürümlerle uyumlu olmayabilir.",
-    "API Key": "API Anahtarı",
-    "About": "Hakkında",
-    "Action": "Eylem",
-    "Actions": "Eylemler",
-    "Add": "Ekle",
-    "Add Device": "Aygıt Ekle",
-    "Add Folder": "Klasör Ekle",
-    "Add Remote Device": "Uzak Aygıt Ekle",
-    "Add devices from the introducer to our device list, for mutually shared folders.": "Add devices from the introducer to our device list, for mutually shared folders.",
-    "Add new folder?": "Yeni klasör ekle?",
-    "Additionally the full rescan interval will be increased (times 60, i.e. new default of 1h). You can also configure it manually for every folder later after choosing No.": "Additionally the full rescan interval will be increased (times 60, i.e. new default of 1h). You can also configure it manually for every folder later after choosing No.",
-    "Address": "Adres",
-    "Addresses": "Adresler",
-    "Advanced": "Gelişmiş Düzey",
-    "Advanced Configuration": "Gelişmiş Yapılandırma",
-    "Advanced settings": "Gelişmiş ayarlar",
-    "All Data": "Tüm Veriler",
-    "Allow Anonymous Usage Reporting?": "Anonim kullanımın raporlanmasına izin veriyor musun ?",
-    "Allowed Networks": "Allowed Networks",
-    "Alphabetic": "Alfabetik",
-    "An external command handles the versioning. It has to remove the file from the shared folder.": "An external command handles the versioning. It has to remove the file from the shared folder.",
-    "An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.": "An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.",
-    "An external command handles the versioning. It has to remove the file from the synced folder.": "Sürümleme işlemini harici bir komut yürütüyor. Dosyayı eşzamanlama klasöründen kaldırmak zorunda.",
-    "Anonymous Usage Reporting": "Anonim Kullanım Raporlaması",
-    "Anonymous usage report format has changed. Would you like to move to the new format?": "Anonymous usage report format has changed. Would you like to move to the new format?",
-    "Any devices configured on an introducer device will be added to this device as well.": "Tanıtıcı bir cihaz üzerinde yapılandırılan cihazlar bu cihaza da eklenecektir.",
-    "Are you sure you want to remove device {%name%}?": "Are you sure you want to remove device {{name}}?",
-    "Are you sure you want to remove folder {%label%}?": "Are you sure you want to remove folder {{label}}?",
-    "Are you sure you want to restore {%count%} files?": "Are you sure you want to restore {{count}} files?",
-    "Auto Accept": "Auto Accept",
-    "Automatic upgrade now offers the choice between stable releases and release candidates.": "Kendiliğinden yükseltme artık kararlı dağıtımlar ve sürüm adayları arasında seçim yapmayı sağlıyor.",
-    "Automatic upgrades": "Kendiliğinden yükseltmeler",
-    "Automatically create or share folders that this device advertises at the default path.": "Automatically create or share folders that this device advertises at the default path.",
-    "Available debug logging facilities:": "Available debug logging facilities:",
-    "Be careful!": "Dikkatli ol!",
-    "Bugs": "Yazılım Hataları",
-    "CPU Utilization": "İşlemci Kullanımı",
-    "Changelog": "Değişim Günlüğü",
-    "Clean out after": "Şundan sonra temizle",
-    "Click to see discovery failures": "Click to see discovery failures",
-    "Close": "Kapat",
-    "Command": "Komut",
-    "Comment, when used at the start of a line": "Satır başında kullanıldığında açıklama özelliği taşır",
-    "Compression": "Sıkıştırma",
-    "Configured": "Yapılandırıldı",
-    "Connection Error": "Bağlantı hatası",
-    "Connection Type": "Bağlantı Türü",
-    "Connections": "Connections",
-    "Continuously watching for changes is now available within Syncthing. This will detect changes on disk and issue a scan on only the modified paths. The benefits are that changes are propagated quicker and that less full scans are required.": "Continuously watching for changes is now available within Syncthing. This will detect changes on disk and issue a scan on only the modified paths. The benefits are that changes are propagated quicker and that less full scans are required.",
-    "Copied from elsewhere": "Başka bir yerden kopyalanmış",
-    "Copied from original": "Aslından kopyalanmış",
-    "Copyright © 2014-2016 the following Contributors:": "Telif Hakkı © 2014-2016 takip eden Katkıcılar:",
-    "Copyright © 2014-2017 the following Contributors:": "Telif Hakkı © 2014-2017 takip eden Katkıcılar:",
-    "Creating ignore patterns, overwriting an existing file at {%path%}.": "Creating ignore patterns, overwriting an existing file at {{path}}.",
-    "Danger!": "Tehlike!",
-    "Debugging Facilities": "Debugging Facilities",
-    "Default Folder Path": "Default Folder Path",
-    "Deleted": "Silindi",
-    "Device": "Aygıt",
-    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "\"{{name}}\" aygıtı ({{address}} adresindeki {{device}}) bağlanmak istiyor. Yeni aygıtı ekliyor musun?",
-    "Device ID": "Aygıt ID",
-    "Device Identification": "Aygıt Kimliği",
-    "Device Name": "Aygıt Adı",
-    "Device that last modified the item": "Device that last modified the item",
-    "Devices": "Aygıtlar",
-    "Disabled": "Disabled",
-    "Disabled periodic scanning and disabled watching for changes": "Disabled periodic scanning and disabled watching for changes",
-    "Disabled periodic scanning and enabled watching for changes": "Disabled periodic scanning and enabled watching for changes",
-    "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:",
-    "Disconnected": "Bağlantı Kesik",
-    "Discovered": "Keşfedildi",
-    "Discovery": "Keşif",
-    "Discovery Failures": "Discovery Failures",
-    "Do not restore": "Do not restore",
-    "Do not restore all": "Do not restore all",
-    "Do you want to enable watching for changes for all your folders?": "Do you want to enable watching for changes for all your folders?",
-    "Documentation": "Belgeleme",
-    "Download Rate": "İndirme Hızı",
-    "Downloaded": "İndirilmiş",
-    "Downloading": "İndiriliyor",
-    "Edit": "Düzenle",
-    "Edit Device": "Aygıtı Düzenle",
-    "Edit Folder": "Klasörü Düzenle",
-    "Editing": "Düzenleniyor",
-    "Editing {%path%}.": "Editing {{path}}.",
-    "Enable NAT traversal": "NAT çaprazlamasına izin ver",
-    "Enable Relaying": "Enable Relaying",
-    "Enabled": "Enabled",
-    "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.",
-    "Enter a non-privileged port number (1024 - 65535).": "Enter a non-privileged port number (1024 - 65535).",
-    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Adreslerin kendiliğinden keşfedilebilmesi için ya adresleri virgülle ayırarak  (\"tcp://ip:port\", \"tcp://host:port\") girin, ya da \"dynamic\" sözcüğünü girin.",
-    "Enter ignore patterns, one per line.": "Gözardı edilmesini istediğiniz kalıp dizilerini her satıra bir tane olacak şekilde girin.",
-    "Error": "Hata",
-    "External File Versioning": "Harici Dosya Sürümleme İşlemi",
-    "Failed Items": "Başarısız Olunan Ögeler",
-    "Failed to load ignore patterns": "Failed to load ignore patterns",
-    "Failed to setup, retrying": "Failed to setup, retrying",
-    "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.",
-    "File Pull Order": "Dosya Çekme Sırası",
-    "File Versioning": "Dosya Sürümleme İşlemi",
-    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Değişimleri tararken dosya izin bilgilerini gözardı et. FAT dosya sistemlerinde kullanın.",
-    "Files are moved to .stversions directory when replaced or deleted by Syncthing.": "Files are moved to .stversions directory when replaced or deleted by Syncthing.",
-    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Dosyalar Syncthing tarafından yeri değiştirildiğinde ya da silindiğinde .stversions klasörüne taşınır.",
-    "Files are moved to date stamped versions in a .stversions directory when replaced or deleted by Syncthing.": "Files are moved to date stamped versions in a .stversions directory when replaced or deleted by Syncthing.",
-    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Dosyalar Syncthing tarafından yeri değiştirildiğinde ya da silindiğinde, tarih damgalı sürümleri .stversions klasörüne taşınır.",
-    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Dosyalar diğer aygıtlarda yapılan değişikliklerden korunur, ancak bu aygıttaki değişiklikler kümedeki diğer aygıtlara gönderilir.",
-    "Filesystem Notifications": "Filesystem Notifications",
-    "Filter by date": "Filter by date",
-    "Filter by name": "Filter by name",
-    "Folder": "Klasör",
-    "Folder ID": "Klasör ID",
-    "Folder Label": "Klasör Etiketi",
-    "Folder Path": "Klasör Yolu",
-    "Folder Type": "Klasör Türü",
-    "Folders": "Klasörler",
-    "Full Rescan Interval (s)": "Full Rescan Interval (s)",
-    "GUI": "GUI / Grafiksel Kullanıcı Arayüzü",
-    "GUI Authentication Password": "GUI Kimlik Doğrulaması için Kullanıcı Parolası",
-    "GUI Authentication User": "GUI Kimlik Doğrulaması için Kullanıcı Adı",
-    "GUI Listen Address": "GUI Listen Address",
-    "GUI Listen Addresses": "GUI Dinleme/Bağlantı Adresleri",
-    "GUI Theme": "GUI Gövdesi",
-    "General": "General",
-    "Generate": "Oluştur",
-    "Global Changes": "Küresel Değişiklikler",
-    "Global Discovery": "Küresel Discovery",
-    "Global Discovery Servers": "Küresel Keşif Sunucuları",
-    "Global State": "Küresel Durum",
-    "Help": "Yardım",
-    "Home page": "Ana sayfa",
-    "Ignore": "Yoksay",
-    "Ignore Patterns": "Gözardı Edilen Kalıp Dizileri",
-    "Ignore Permissions": "İzinleri Gözardı Et",
-    "Incoming Rate Limit (KiB/s)": "İndirme Oranı Sınırı (KiB/s)",
-    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Yanlış yapılandırma klasör içeriğine zarar verebilir ve Syncthing'i çalışamaz hale getirebilir.",
-    "Introduced By": "Tanıtan",
-    "Introducer": "Tanıtıcı",
-    "Inversion of the given condition (i.e. do not exclude)": "Verilen koşulun ters çevirilmesi (örneğin: yok sayma)",
-    "Keep Versions": "Sürümleri Tut",
-    "Largest First": "En büyük olan önce",
-    "Last File Received": "Alınan Son Dosya",
-    "Last Scan": "Son Tarama",
-    "Last seen": "Son görülme",
-    "Later": "Sonra",
-    "Latest Change": "Son Değişim",
-    "Learn more": "Daha çoğunu öğren",
-    "Listeners": "Dinleyiciler",
-    "Loading data...": "Loading data...",
-    "Loading...": "Loading...",
-    "Local Discovery": "Yerel Discovery",
-    "Local State": "Yerel Durum",
-    "Local State (Total)": "Yerel Durum (Toplamı)",
-    "Log": "Log",
-    "Log tailing paused. Click here to continue.": "Log tailing paused. Click here to continue.",
-    "Logs": "Logs",
-    "Major Upgrade": "Birincil Yükseltme",
-    "Mass actions": "Mass actions",
-    "Master": "Ana",
-    "Maximum Age": "Azami Süre",
-    "Metadata Only": "Yalnızca Üstveri",
-    "Minimum Free Disk Space": "En Az Boş Disk Alanı",
-    "Mod. Device": "Mod. Device",
-    "Mod. Time": "Mod. Time",
-    "Move to top of queue": "Kuyruğun başına taşı",
-    "Multi level wildcard (matches multiple directory levels)": "Çoklu düzey wildcard (çok sayıda dizin düzeyinde eşleşme)",
-    "Never": "Asla",
-    "New Device": "Yeni Aygıt",
-    "New Folder": "Yeni Klasör",
-    "Newest First": "En yeni olan önce",
-    "No": "Hayır",
-    "No File Versioning": "Dosya Sürümleme İşlemi Yok",
-    "No files will be deleted as a result of this operation.": "No files will be deleted as a result of this operation.",
-    "No upgrades": "Yükseltme yok",
-    "Normal": "Olağan",
-    "Notice": "Uyarı",
-    "OK": "Tamam",
-    "Off": "Kapalı",
-    "Oldest First": "En eski olan önce",
-    "Optional descriptive label for the folder. Can be different on each device.": "Klasör için isteğe bağlı açıklayıcı etiket. Her aygıtta başka olabilir.",
-    "Options": "Seçenekler",
-    "Out of Sync": "Eşzamanlama Dışı",
-    "Out of Sync Items": "Eşzamanlama Dışında Kalan Ögeler",
-    "Outgoing Rate Limit (KiB/s)": "Yükleme hız sınırı (KB/sn)",
-    "Override Changes": "Değişiklikleri Geçersiz kıl",
-    "Path": "Yol",
-    "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": "Yerel bilgisayardaki klasöre ulaşım yolu. Klasör yoksa yaratılacak. Tilde (~) karakterinin kısayol olarak kullanılabileceği yol",
-    "Path where new auto accepted folders will be created, as well as the default suggested path when adding new folders via the UI. Tilde character (~) expands to {%tilde%}.": "Path where new auto accepted folders will be created, as well as the default suggested path when adding new folders via the UI. Tilde character (~) expands to {{tilde}}.",
-    "Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).": "Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).",
-    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Sürümlerin saklanması için gereken klasör yolu (öntanımlı .stversions klasörü için boş bırakın)",
-    "Pause": "Duraklat",
-    "Pause All": "Tümünü Duraklat",
-    "Paused": "Duraklatıldı",
-    "Periodic scanning at given interval and disabled watching for changes": "Periodic scanning at given interval and disabled watching for changes",
-    "Periodic scanning at given interval and enabled watching for changes": "Periodic scanning at given interval and enabled watching for changes",
-    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:",
-    "Permissions": "Permissions",
-    "Please consult the release notes before performing a major upgrade.": "Birincil bir yükseltme gerçekleştirmeden önce lütfen sürüm notlarını tetkik edin.",
-    "Please set a GUI Authentication User and Password in the Settings dialog.": "GUI üzerinden Kimlik Doğrulaması yapmak için Ayarlar penceresinde Kullanıcı ve Parola tanımlayın lütfen.",
-    "Please wait": "Lütfen Bekleyin",
-    "Prefix indicating that the file can be deleted if preventing directory removal": "Prefix indicating that the file can be deleted if preventing directory removal",
-    "Prefix indicating that the pattern should be matched without case sensitivity": "Prefix indicating that the pattern should be matched without case sensitivity",
-    "Preview": "Önizleme",
-    "Preview Usage Report": "Kullanım raporunu gözden geçir",
-    "Quick guide to supported patterns": "Desteklenen kalıp dizileri için hızlı rehber",
-    "RAM Utilization": "RAM Kullanımı",
-    "Random": "Rastgele",
-    "Recent Changes": "Recent Changes",
-    "Reduced by ignore patterns": "Gözardı edilen kalıp dizileri tarafından daraltıldı",
-    "Release Notes": "Sürüm Notları",
-    "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Sürüm adayları en son özellikleri ve hata düzeltmelerini içerir. Bunlar, geleneksel olarak iki haftada bir yayımlanan Syncthing dağıtımlarına benzer.",
-    "Remote Devices": "Uzak Aygıtlar",
-    "Remove": "Kaldır",
-    "Remove Device": "Remove Device",
-    "Remove Folder": "Remove Folder",
-    "Required identifier for the folder. Must be the same on all cluster devices.": "Klasör için tanımlayıcı gereklidir. Tüm küme cihazlarda aynı olmalıdır.",
-    "Rescan": "Tekrar Tara",
-    "Rescan All": "Tümünü Tekrar Tara",
-    "Rescan Interval": "Tarama Aralığı",
-    "Rescans": "Rescans",
-    "Restart": "Yeniden Başlat",
-    "Restart Needed": "Yeniden başlatma gereklidir",
-    "Restarting": "Yeniden başlatılıyor",
-    "Restore": "Restore",
-    "Restore Versions": "Restore Versions",
-    "Resume": "Devam Et/Sürdür",
-    "Resume All": "Tümünü Devam Ettir",
-    "Reused": "Yeniden Kullanılan",
-    "Running": "Running",
-    "Save": "Kaydet",
-    "Scan Time Remaining": "Kalan Tarama Zamanı",
-    "Scanning": "Taranıyor",
-    "See external versioner help for supported templated command line parameters.": "See external versioner help for supported templated command line parameters.",
-    "See external versioning help for supported templated command line parameters.": "See external versioning help for supported templated command line parameters.",
-    "Select a version": "Select a version",
-    "Select latest version": "Select latest version",
-    "Select oldest version": "Select oldest version",
-    "Select the devices to share this folder with.": "Bu klasörü paylaşacağın aygıtları seç.",
-    "Select the folders to share with this device.": "Bu aygıtla paylaşılacak klasörleri seç.",
-    "Send & Receive": "Gönder & Al",
-    "Send Only": "Yalnızca Gönder",
-    "Settings": "Ayarlar",
-    "Share": "Paylaş",
-    "Share Folder": "Paylaşım Klasörü",
-    "Share Folders With Device": "Klasörleri Aygıtla Paylaş",
-    "Share With Devices": "Aygıtlar İle Paylaş",
-    "Share this folder?": "Bu klasörü paylaş?",
-    "Shared With": "Paylaşılan düğümler",
-    "Show ID": "ID Göster",
-    "Show QR": "QR Göster",
-    "Show diff with previous version": "Show diff with previous version",
-    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Küme durumunda Aygıt ID yerine bunu göster. Varsayılan ad isteğe bağlı olarak diğer aygıtlara ilan edilecektir.",
-    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Küme durumunda Aygıt ID yerine bunu göster. Eğer düğüm adı boş bırakılırsa düğüm adı güncellenip ilan edilecektir.",
-    "Shutdown": "Kapat",
-    "Shutdown Complete": "Kapatma İşlemi Tamamlandı",
-    "Simple File Versioning": "Basit Dosya Sürümleme İşlemi",
-    "Single level wildcard (matches within a directory only)": "Tekli düzey wildcard (yalnızca bir dizin içinde eşleşme)",
-    "Size": "Size",
-    "Smallest First": "En küçük olan önce",
-    "Some items could not be restored:": "Some items could not be restored:",
-    "Source Code": "Kaynak Kodu",
-    "Stable releases and release candidates": "Kararlı dağıtımlar ve sürüm adayları",
-    "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "Kararlı dağıtımlar aşağı yukarı iki hafta gecikir. Bu zaman zarfında sürüm adayı olarak sınanırlar.",
-    "Stable releases only": "Yalnızca kararlı dağıtımlar",
-    "Staggered File Versioning": "Aşamalı Dosya Sürümleme İşlemi",
-    "Start Browser": "Tarayıcıyı Başlat",
-    "Statistics": "İstatistikler",
-    "Stopped": "Durduruldu",
-    "Support": "Destek",
-    "Sync Protocol Listen Addresses": "Sync Protokol Dinleme Adresleri",
-    "Syncing": "Eşzamanlama gerçekleştiriliyor",
-    "Syncthing has been shut down.": "Syncthing kapatıldı",
-    "Syncthing includes the following software or portions thereof:": "Syncthing aşağıdaki yazılımları veya bunların bölümlerini içermektedir:",
-    "Syncthing is restarting.": "Syncthing yeniden başlatılıyor.",
-    "Syncthing is upgrading.": "Syncthing yükseltiliyor.",
-    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing uygulaması çökmüş olabilir, veya internet bağlantınızda bir sorun var. Tekrar deniyor....",
-    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing isteminizi işleme alırken bir sorunla karşılaştı. Lütfen sayfanızı yenileyin veya sorun devam ediyorsa Syncthing'i yeniden başlatın.",
-    "The Syncthing admin interface is configured to allow remote access without a password.": "Syncthing yönetici arayüzü parolasız olarak uzaktan erişime izin verilecek şekilde yapılandırıldı.",
-    "The aggregated statistics are publicly available at the URL below.": "Toplanan istatistikler halka açık biçimde aşağıdaki adrestedir.",
-    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Yapılandırma kaydedildi ancak etkinleştirilmedi. Etkinleştirmek için Syncthing yeniden başlatılmalı.",
-    "The device ID cannot be blank.": "Aygıt ID değeri boş bırakılamaz.",
-    "The device ID to enter here can be found in the \"Actions > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "Buraya girilecek olan aygıt ID'si diğer aygıtlarda \"Eylemler > ID Göster\" penceresinde bulunabilir. Boşluklar ve çizgiler isteğe bağlıdır (gözardı edilmiş).",
-    "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.": "Şifrelenmiş kullanım bilgisi günlük olarak gönderilir. Platform, klasör büyüklüğü ve uygulama sürümü hakkında bilgi toplanır. Toplanan bilgi türü değişecek olursa, sizden yeniden onay istenecek.",
-    "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.": "Girilen aygıt ID'si geçerli gibi gözükmüyor. 52 ya da 56 karakter uzunluğunda, harf ve rakamlardan oluşmalı. Boşlukların ve kısa çizgilerin olup olmaması önemli değildir.",
-    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "İlk komut satırı parametresi klasör yoludur; ikinci parametre ise klasördeki göreceli yoldur. ",
-    "The folder ID cannot be blank.": "Klasör ID değeri boş bırakılamaz",
-    "The folder ID must be unique.": "Klasör ID benzersiz olmalıdır.",
-    "The folder path cannot be blank.": "Klasör yolu boş bırakılamaz.",
-    "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.": "Kullanılan zaman aralıkları: ilk bir saat zarfında her 30 saniyede bir, ilk gün zarfında saatte bir, ilk 30 gün zarfında her gün, azami süreye kadar geçen zamanda ise her hafta yeni bir sürüm değeri oluşturulur/tutulur.",
-    "The following items could not be synchronized.": "Aşağıdaki ögelerin eşzamanlama işlemi gerçekleştirilemedi.",
-    "The maximum age must be a number and cannot be blank.": "Azami süre tanımı boş bırakılmamalı ve bir sayı olarak tanımlanmalıdır.",
-    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Bir sürümün tutulması için belirlenen azami süre (sürümleri sürekli olarak tutabilmek için 0 değeri atayın)",
-    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "En küçük boş disk alanı yüzde olarak 0 ve 100 (dahil) arasında kalan pozitif bir sayıyla tanımlanmalıdır.",
-    "The number of days must be a number and cannot be blank.": "Gün sayısı boş bırakılmamalı ve bir sayı olarak tanımlanmalıdır.",
-    "The number of days to keep files in the trash can. Zero means forever.": "Dosyaları çöp kutusunda tutma süresini tanımlayan gün sayısı. Sıfır devamlı/sürekli anlamına gelir.",
-    "The number of old versions to keep, per file.": "Dosya başına saklanacak/tutulacak eski sürüm sayısı.",
-    "The number of versions must be a number and cannot be blank.": "Sürümlerin sayısı boş bırakılamamalı ve bir sayı olarak tanımlanmalıdır.",
-    "The path cannot be blank.": "Yol tanımı boş bırakılamaz.",
-    "The rate limit must be a non-negative number (0: no limit)": "Hız sınırı pozitif bir sayı olmalıdır. (0: sınırsız)",
-    "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.": "Kendiliğinden yeniden deneniyor; hata giderildiğinde eşzamanlama gerçekleştirilecek.",
-    "This Device": "Bu Aygıt",
-    "This can easily give hackers access to read and change any files on your computer.": "Hacker'ların bilgisayarındaki dosyaları okuma ve değiştirme yetkisine kolayca erişmelerini sağlayabilir.",
-    "This is a major version upgrade.": "Ana sürüm yükseltmesidir.",
-    "This setting controls the free space required on the home (i.e., index database) disk.": "This setting controls the free space required on the home (i.e., index database) disk.",
-    "Time": "Zaman",
-    "Time the item was last modified": "Time the item was last modified",
-    "Trash Can File Versioning": "Çöp Kutusu Dosya Sürümleme İşlemi",
-    "Type": "Tür",
-    "Unavailable": "Unavailable",
-    "Unavailable/Disabled by administrator or maintainer": "Unavailable/Disabled by administrator or maintainer",
-    "Undecided (will prompt)": "Undecided (will prompt)",
-    "Unknown": "Bilinmiyor",
-    "Unshared": "Paylaşılmayan",
-    "Unused": "Kullanılmayan",
-    "Up to Date": "Güncel",
-    "Updated": "Güncellendi",
-    "Upgrade": "Sürüm Yükseltme",
-    "Upgrade To {%version%}": "{{version}} sürümüne yükselt",
-    "Upgrading": "Yükseltiliyor",
-    "Upload Rate": "Yükleme hızı",
-    "Uptime": "Çalışma Zamanı",
-    "Usage reporting is always enabled for candidate releases.": "Kullanım raporu sürüm adayları için her zaman etkindir.",
-    "Use HTTPS for GUI": "GUI için HTTPS kullan",
-    "Version": "Sürüm",
-    "Versions": "Versions",
-    "Versions Path": "Sürümler için Klasör Yolu",
-    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Sürümler, tanımlı azami süre veya belirlenen zaman aralığı için izin verilen dosya sayısı aşılmışsa kendiliğinden silinir.",
-    "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "Uyarı ! Bu yol varolan \"{{otherFolder}}\" klasörünün üst dizinidir.",
-    "Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Uyarı ! Bu yol varolan \"{{otherFolderLabel}}\" ({{otherFolder}}) klasörünün üst dizinidir.",
-    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Uyarı ! Bu yol varolan \"{{otherFolder}}\" klasörünün alt dizinidir.",
-    "Warning, this path is a subdirectory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Uyarı ! Bu yol var olan \"{{otherFolderLabel}}\" ({{otherFolder}}) klasörünün alt dizinidir.",
-    "Warning: If you are using an external watcher like {%syncthingInotify%}, you should make sure it is deactivated.": "Warning: If you are using an external watcher like {{syncthingInotify}}, you should make sure it is deactivated.",
-    "Watch for Changes": "Watch for Changes",
-    "Watching for Changes": "Watching for Changes",
-    "When adding a new device, keep in mind that this device must be added on the other side too.": "Yeni bir aygıt eklendiğinde, bu aygıtın karşı tarafa da eklenmesi gerektiğini unutmayın.",
-    "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.": "Yeni bir klasör eklendiğinde, Klasör ID'nin klasörleri aygıtlar arasında bağlantılandırmak için kullanıldığını unutmayın. Klasör ID'ler büyük - küçük harf duyarlıdır ve tüm aygıtlarda tamı tamına eşleşmelidir.",
-    "Yes": "Evet",
-    "You can also select one of these nearby devices:": "You can also select one of these nearby devices:",
-    "You can change your choice at any time in the Settings dialog.": "Seçiminizi herhangi bir zamanda Ayarlar penceresinde değiştirebilirsiniz.",
-    "You can read more about the two release channels at the link below.": "İki dağıtım kanalıyla ilgili daha çoğunu aşağıdaki bağlantıdan okuyabilirsiniz.",
-    "You must keep at least one version.": "En az bir sürümü tutmalısınız.",
-    "days": "gün",
-    "directories": "dizinler",
-    "files": "dosyalar",
-    "full documentation": "belgelendirme içeriğinin tümü",
-    "items": "öğeler",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}}  \"{{folder}}\" klasörünü paylaşmak istiyor.",
-    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} \"{{folderlabel}}\" ({{folder}}) klasörünü paylaşmak istiyor."
-}

gui/default/assets/lang/lang-uk.json

@@ -65,6 +65,7 @@
     "Device ID": "ID пристрою",
     "Device Identification": "Ідентифікатор пристрою",
     "Device Name": "Назва пристрою",
+    "Device rate limits": "Device rate limits",
     "Device that last modified the item": "Пристрій, що останнім змінив елемент",
     "Devices": "Пристрої",
     "Disabled": "Вимкнено",
@@ -109,6 +110,7 @@
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by 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.": "Вміст папки захищено від змін, зроблених на інших пристроях, але зміни зроблені на цьому пристрої можна розіслати решті пристроїв кластеру.",
     "Filesystem Notifications": "Повідомлення файлової системи",
+    "Filesystem Watcher Errors": "Filesystem Watcher Errors",
     "Filter by date": "Фільтрувати по даті",
     "Filter by name": "Фільтрувати по імені",
     "Folder": "Директорія",
@@ -117,6 +119,7 @@
     "Folder Path": "Шлях до директорії",
     "Folder Type": "Тип директорії",
     "Folders": "Директорії",
+    "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.",
     "Full Rescan Interval (s)": "Інтервал повного пересканування (секунди)",
     "GUI": "Графічний інтерфейс",
     "GUI Authentication Password": "Пароль для доступу до панелі управління",
@@ -156,6 +159,7 @@
     "Local State (Total)": "Локальний статус (загалом)",
     "Log": "Журнал",
     "Log tailing paused. Click here to continue.": "Перемотка журналу призупинена. Натиснути для продовження.",
+    "Log tailing paused. Scroll to bottom continue.": "Log tailing paused. Scroll to bottom continue.",
     "Logs": "Журнали",
     "Major Upgrade": "Мажорне оновлення",
     "Mass actions": "Масові операції",
@@ -249,6 +253,7 @@
     "Share With Devices": "Розповсюдити між пристроями",
     "Share this folder?": "Розповсюдити цей каталог?",
     "Shared With": "Доступно для",
+    "Sharing": "Sharing",
     "Show ID": "Показати ID",
     "Show QR": "Показати QR-код",
     "Show diff with previous version": "Показати відмінності від попередньої версії",

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

@@ -65,6 +65,7 @@
     "Device ID": "设备 ID",
     "Device Identification": "设备标识",
     "Device Name": "设备名",
+    "Device rate limits": "设备速率限制",
     "Device that last modified the item": "最近修改该项的设备",
     "Devices": "设备",
     "Disabled": "已禁用",
@@ -109,6 +110,7 @@
     "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by 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.": "在其它设备中对该文件夹内文件的修改并不会被同步到本机，但是在本机上对其的修改，则会被同步到其它设备中。",
     "Filesystem Notifications": "文件系统通知",
+    "Filesystem Watcher Errors": "文件系统监视器错误",
     "Filter by date": "按日期筛选",
     "Filter by name": "按名称筛选",
     "Folder": "文件夹",
@@ -117,6 +119,7 @@
     "Folder Path": "文件夹路径",
     "Folder Type": "文件夹类型",
     "Folders": "文件夹",
+    "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "开始监视下列文件夹时发生错误。由于每分钟都会重试，所以错误可能很快就消失。如果它们仍存在，请试着修复潜在问题，如不会则请求帮助。",
     "Full Rescan Interval (s)": "完整扫描间隔",
     "GUI": "图形用户界面",
     "GUI Authentication Password": "图形管理界面密码",
@@ -156,6 +159,7 @@
     "Local State (Total)": "本地状态汇总",
     "Log": "日志",
     "Log tailing paused. Click here to continue.": "已暂停日志跟踪。点击此处以继续。",
+    "Log tailing paused. Scroll to bottom continue.": "已暂停日志跟踪。滚动到底部以继续。",
     "Logs": "日志",
     "Major Upgrade": "重大更新",
     "Mass actions": "批量操作",
@@ -249,6 +253,7 @@
     "Share With Devices": "共享给",
     "Share this folder?": "是否共享该文件夹？",
     "Shared With": "共享给",
+    "Sharing": "共享",
     "Show ID": "显示 ID",
     "Show QR": "显示 QR 码",
     "Show diff with previous version": "显示与先前版本的差异",

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

@@ -65,6 +65,7 @@
     "Device ID": "裝置識別碼",
     "Device Identification": "裝置識別",
     "Device Name": "裝置名稱",
+    "Device rate limits": "Device rate limits",
     "Device that last modified the item": "前次修改裝置",
     "Devices": "裝置",
     "Disabled": "停用",
@@ -109,6 +110,7 @@
     "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.": "其他裝置做的改變不會影響此裝置上的檔案，但在此裝置上的變動將被發送到叢集的其他部分。",
     "Filesystem Notifications": "檔案系統通知",
+    "Filesystem Watcher Errors": "Filesystem Watcher Errors",
     "Filter by date": "以日期篩選",
     "Filter by name": "以名稱篩選",
     "Folder": "資料夾",
@@ -117,6 +119,7 @@
     "Folder Path": "資料夾路徑",
     "Folder Type": "資料夾類型",
     "Folders": "資料夾",
+    "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.",
     "Full Rescan Interval (s)": "完全重新掃描間隔 (秒)",
     "GUI": "GUI",
     "GUI Authentication Password": "GUI 認證密碼",
@@ -156,6 +159,7 @@
     "Local State (Total)": "本機狀態 (總結)",
     "Log": "日誌",
     "Log tailing paused. Click here to continue.": "跟隨日誌暫停。點選這裡以繼續。",
+    "Log tailing paused. Scroll to bottom continue.": "Log tailing paused. Scroll to bottom continue.",
     "Logs": "日誌",
     "Major Upgrade": "重大更新",
     "Mass actions": "大量操作",
@@ -249,6 +253,7 @@
     "Share With Devices": "與這些裝置共享",
     "Share this folder?": "分享此資料夾?",
     "Shared With": "與誰共享",
+    "Sharing": "Sharing",
     "Show ID": "顯示識別碼",
     "Show QR": "顯示 QR 碼",
     "Show diff with previous version": "顯示與前一個版本的差異",

gui/default/assets/lang/prettyprint.js

@@ -1 +1 @@
-var langPrettyprint = {"bg":"Bulgarian","ca@valencia":"Catalan (Valencian)","cs":"Czech","da":"Danish","de":"German","el":"Greek","en":"English","en-GB":"English (United Kingdom)","eo":"Esperanto","es":"Spanish","es-ES":"Spanish (Spain)","eu":"Basque","fr":"French","fr-CA":"French (Canada)","fy":"Western Frisian","hu":"Hungarian","it":"Italian","ja":"Japanese","ko-KR":"Korean (Korea)","lt":"Lithuanian","nb":"Norwegian Bokmål","nl":"Dutch","nl-BE":"Dutch (Belgium)","pl":"Polish","pt-BR":"Portuguese (Brazil)","pt-PT":"Portuguese (Portugal)","ru":"Russian","sk":"Slovak","sv":"Swedish","tr":"Turkish","uk":"Ukrainian","zh-CN":"Chinese (China)","zh-TW":"Chinese (Taiwan)"}
+var langPrettyprint = {"bg":"Bulgarian","ca@valencia":"Catalan (Valencian)","cs":"Czech","da":"Danish","de":"German","el":"Greek","en":"English","en-GB":"English (United Kingdom)","eo":"Esperanto","es":"Spanish","es-ES":"Spanish (Spain)","eu":"Basque","fr":"French","fr-CA":"French (Canada)","fy":"Western Frisian","hu":"Hungarian","it":"Italian","ja":"Japanese","ko-KR":"Korean (Korea)","lt":"Lithuanian","nb":"Norwegian Bokmål","nl":"Dutch","pl":"Polish","pt-BR":"Portuguese (Brazil)","pt-PT":"Portuguese (Portugal)","ru":"Russian","sk":"Slovak","sv":"Swedish","uk":"Ukrainian","zh-CN":"Chinese (China)","zh-TW":"Chinese (Taiwan)"}

gui/default/assets/lang/valid-langs.js

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

gui/default/index.html

@@ -19,9 +19,9 @@
 
   <title ng-bind="thisDeviceName() + ' | Syncthing'"></title>
   <link href="vendor/bootstrap/css/bootstrap.css" rel="stylesheet"/>
-  <link href="vendor/bootstrap/css/daterangepicker.css" rel="stylesheet"/>
+  <link href="vendor/daterangepicker/daterangepicker.css" rel="stylesheet"/>
   <link href="assets/font/raleway.css" rel="stylesheet"/>
-  <link href="vendor/font-awesome/css/font-awesome.css" rel="stylesheet"/>
+  <link href="vendor/font-awesome/css/fontawesome-all.css" rel="stylesheet"/>
   <link href="assets/css/overrides.css" rel="stylesheet"/>
   <link href="assets/css/theme.css" rel="stylesheet"/>
   <link href="vendor/fancytree/css/ui.fancytree.css" rel="stylesheet"/>
@@ -42,45 +42,45 @@
       <ul class="nav navbar-nav navbar-right">
         <li ng-if="upgradeInfo && upgradeInfo.newer" class="upgrade-newer">
           <button type="button" class="btn navbar-btn btn-primary btn-sm" ng-click="upgrade()">
-            <span class="fa fa-arrow-circle-up"></span>
+            <span class="fas fa-arrow-circle-up"></span>
             <span class="hidden-xs" translate translate-value-version="{{upgradeInfo.latest}}">Upgrade To {%version%}</span>
           </button>
         </li>
         <li ng-if="upgradeInfo && upgradeInfo.majorNewer" class="upgrade-newer-major">
           <button type="button" class="btn navbar-btn btn-danger btn-sm" data-toggle="modal" data-target="#majorUpgrade">
-            <span class="fa fa-arrow-circle-up"></span>
+            <span class="fas fa-arrow-circle-up"></span>
             <span class="hidden-xs" translate translate-value-version="{{upgradeInfo.latest}}">Upgrade To {%version%}</span>
           </button>
         </li>
         <li class="dropdown" language-select></li>
         <li>
           <a class="navbar-link" href="https://docs.syncthing.net/intro/gui.html" target="_blank">
-            <span class="fa fa-question-circle"></span>
+            <span class="fas fa-question-circle"></span>
             <span class="hidden-xs" translate>Help</span>
           </a>
         </li>
         <li class="dropdown action-menu">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
-            <span class="fa fa-cog"></span>
+            <span class="fas fa-cog"></span>
             <span class="hidden-xs" translate>Actions</span>
             <span class="caret"></span>
           </a>
           <ul class="dropdown-menu">
-            <li><a href="" ng-click="editSettings()"><span class="fa fa-fw fa-cog"></span>&nbsp;<span translate>Settings</span></a></li>
-            <li><a href="" data-toggle="modal" data-target="#idqr" ng-click="currentDevice=thisDevice()"><span class="fa fa-fw fa-qrcode"></span>&nbsp;<span translate>Show ID</span></a></li>
+            <li><a href="" ng-click="editSettings()"><span class="fas fa-fw fa-cog"></span>&nbsp;<span translate>Settings</span></a></li>
+            <li><a href="" data-toggle="modal" data-target="#idqr" ng-click="currentDevice=thisDevice()"><span class="fas fa-fw fa-qrcode"></span>&nbsp;<span translate>Show ID</span></a></li>
             <li class="divider" aria-hidden="true"></li>
-            <li><a href="" ng-click="shutdown()"><span class="fa fa-fw fa-power-off"></span>&nbsp;<span translate>Shutdown</span></a></li>
-            <li><a href="" ng-click="restart()"><span class="fa fa-fw fa-refresh"></span>&nbsp;<span translate>Restart</span></a></li>
+            <li><a href="" ng-click="shutdown()"><span class="fas fa-fw fa-power-off"></span>&nbsp;<span translate>Shutdown</span></a></li>
+            <li><a href="" ng-click="restart()"><span class="fas fa-fw fa-sync"></span>&nbsp;<span translate>Restart</span></a></li>
             <li class="divider" aria-hidden="true"></li>
             <li class="visible-xs">
               <a href="https://docs.syncthing.net/intro/gui.html" target="_blank">
-                <span class="fa fa-fw fa-book"></span>&nbsp;<span translate>Help</span>
+                <span class="fas fa-fw fa-question-circle"></span>&nbsp;<span translate>Help</span>
               </a>
             </li>
-            <li><a href="" data-toggle="modal" data-target="#about"><span class="fa fa-fw fa-heart-o"></span>&nbsp;<span translate>About</span></a></li>
+            <li><a href="" data-toggle="modal" data-target="#about"><span class="far fa-fw fa-heart"></span>&nbsp;<span translate>About</span></a></li>
             <li class="divider" aria-hidden="true"></li>
-            <li><a href="" ng-click="advanced()"><span class="fa fa-fw fa-cogs"></span>&nbsp;<span translate>Advanced</span></a></li>
-            <li><a href="" ng-click="logging.show()"><span class="fa fa-fw fa-book"></span>&nbsp;<span translate>Logs</span></a></li>
+            <li><a href="" ng-click="advanced()"><span class="fas fa-fw fa-cogs"></span>&nbsp;<span translate>Advanced</span></a></li>
+            <li><a href="" ng-click="logging.show()"><span class="far fa-fw fa-file-alt"></span>&nbsp;<span translate>Logs</span></a></li>
           </ul>
         </li>
       </ul>
@@ -97,7 +97,7 @@
           <div class="panel-heading">
             <h3 class="panel-title">
               <div class="panel-icon">
-                <span class="fa fa-exclamation-circle"></span>
+                <span class="fas fa-exclamation-circle"></span>
               </div>
               <span translate>Danger!</span>
             </h3>
@@ -111,7 +111,7 @@
           </div>
           <div class="panel-footer">
             <button type="button" class="btn btn-sm btn-default pull-right" ng-click="editSettings()">
-              <span class="fa fa-cog"></span>&nbsp;<span translate>Settings</span>
+              <span class="fas fa-cog"></span>&nbsp;<span translate>Settings</span>
             </button>
             <div class="clearfix"></div>
           </div>
@@ -127,7 +127,7 @@
           <div class="panel-heading">
             <h3 class="panel-title">
               <div class="panel-icon">
-                <span class="fa fa-exclamation-circle"></span>
+                <span class="fas fa-exclamation-circle"></span>
               </div>
               <span translate>Restart Needed</span>
             </h3>
@@ -137,7 +137,7 @@
           </div>
           <div class="panel-footer">
             <button type="button" class="btn btn-sm btn-default pull-right" ng-click="restart()">
-              <span class="fa fa-refresh"></span>&nbsp;<span translate>Restart</span>
+              <span class="fas fa-sync"></span>&nbsp;<span translate>Restart</span>
             </button>
             <div class="clearfix"></div>
           </div>
@@ -167,13 +167,13 @@
           <div class="panel-footer clearfix">
             <div class="pull-right">
               <button type="button" class="btn btn-sm btn-success" ng-click="addDevice(device, event.data.name)">
-                <span class="fa fa-plus"></span>&nbsp;<span translate>Add Device</span>
+                <span class="fas fa-plus"></span>&nbsp;<span translate>Add Device</span>
               </button>
               <button type="button" class="btn btn-sm btn-danger" ng-click="ignoreRejectedDevice(device)">
-                <span class="fa fa-times"></span>&nbsp;<span translate>Ignore</span>
+                <span class="fas fa-times"></span>&nbsp;<span translate>Ignore</span>
               </button>
               <button type="button" class="btn btn-sm btn-default" ng-click="dismissDeviceRejection(device)">
-                <span class="fa fa-clock-o"></span>&nbsp;<span translate>Later</span>
+                <span class="far fa-clock"></span>&nbsp;<span translate>Later</span>
               </button>
             </div>
           </div>
@@ -189,7 +189,7 @@
           <div class="panel-heading">
             <h3 class="panel-title">
               <div class="panel-icon">
-                <span class="fa fa-folder"></span>
+                <span class="fas fa-folder"></span>
               </div>
               <span translate ng-if="!folders[event.data.folder]">New Folder</span>
               <span translate ng-if="folders[event.data.folder]">Share Folder</span>
@@ -211,16 +211,16 @@
           <div class="panel-footer clearfix">
             <div class="pull-right">
               <button type="button" class="btn btn-sm btn-success" ng-click="addFolderAndShare(event.data.folder, event.data.folderLabel, event.data.device)" ng-if="!folders[event.data.folder]">
-                <span class="fa fa-check"></span>&nbsp;<span translate>Add</span>
+                <span class="fas fa-check"></span>&nbsp;<span translate>Add</span>
               </button>
               <button type="button" class="btn btn-sm btn-success" ng-click="shareFolderWithDevice(event.data.folder, event.data.device)" ng-if="folders[event.data.folder]">
-                <span class="fa fa-check"></span>&nbsp;<span translate>Share</span>
+                <span class="fas fa-check"></span>&nbsp;<span translate>Share</span>
               </button>
               <button type="button" class="btn btn-sm btn-default" ng-click="dismissFolderRejection(event.data.folder, event.data.device)">
-                <span class="fa fa-clock-o"></span>&nbsp;<span translate>Later</span>
+                <span class="far fa-clock"></span>&nbsp;<span translate>Later</span>
               </button>
               <button type="button" class="btn btn-sm btn-default" ng-click="ignoreRejectedFolder(event.data.folder, event.data.device)">
-                <span class="fa fa-times"></span>&nbsp;<span translate>Ignore</span>
+                <span class="fas fa-times"></span>&nbsp;<span translate>Ignore</span>
               </button>
             </div>
           </div>
@@ -236,7 +236,7 @@
           <div class="panel-heading">
             <h3 class="panel-title">
               <div class="panel-icon">
-                <span class="fa fa-exclamation-circle"></span>
+                <span class="fas fa-exclamation-circle"></span>
               </div>
               <span translate>Notice</span>
             </h3>
@@ -249,7 +249,7 @@
           </div>
           <div class="panel-footer">
             <button type="button" class="btn btn-sm btn-default pull-right" ng-click="clearErrors()">
-              <span class="fa fa-check"></span>&nbsp;<span translate>OK</span>
+              <span class="fas fa-check"></span>&nbsp;<span translate>OK</span>
             </button>
             <div class="clearfix"></div>
           </div>
@@ -257,6 +257,33 @@
       </div>
     </div>
 
+    <!-- Panel: FS watcher errors -->
+
+    <div ng-if="sizeOf(fsWatcherErrorMap()) > 0" class="row">
+      <div class="col-md-12">
+        <div class="panel panel-warning">
+          <div class="panel-heading">
+            <h3 class="panel-title">
+              <div class="panel-icon">
+                <span class="fas fa-exclamation-circle"></span>
+              </div>
+              <span translate>Filesystem Watcher Errors</span>
+            </h3>
+          </div>
+          <div class="panel-body">
+            <p>
+              <span translate>For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.</span>&emsp;<a href="https://forum.syncthing.net" target="_blank"><span class="fas fa-question-circle"></span>&nbsp;<span translate>Support</span></a>
+            </p>
+            <table>
+              <tr ng-repeat="(id, err) in fsWatcherErrorMap()">
+                <td>{{folderLabel(id)}}</td><td>{{err}}</td>
+              </tr>
+            </table>
+          </div>
+        </div>
+      </div>
+    </div>
+
     <div ng-if="config && config.options && config.options.unackedNotificationIDs" ng-include="'syncthing/core/notifications.html'"></div>
 
     <!-- First regular row -->
@@ -270,11 +297,11 @@
         <div class="panel-group" id="folders">
           <div class="panel panel-default" ng-repeat="folder in folderList()">
             <button class="btn panel-heading" data-toggle="collapse" data-parent="#folders" data-target="#folder-{{$index}}" aria-expanded="false">
-              <div class="panel-progress" ng-show="folderStatus(folder) == 'syncing'" ng-attr-style="width: {{syncPercentage(folder.id)}}%"></div>
-              <div class="panel-progress" ng-show="folderStatus(folder) == 'scanning' && scanProgress[folder.id] != undefined" ng-attr-style="width: {{scanPercentage(folder.id)}}%"></div>
+              <div class="panel-progress" ng-show="folderStatus(folder) == 'syncing'" ng-attr-style="width: {{syncPercentage(folder.id) | percent}}"></div>
+              <div class="panel-progress" ng-show="folderStatus(folder) == 'scanning' && scanProgress[folder.id] != undefined" ng-attr-style="width: {{scanPercentage(folder.id) | percent}}"></div>
               <h4 class="panel-title">
                 <div class="panel-icon hidden-xs">
-                  <span class="fa fa-fw" ng-class="[folder.type == 'readonly' ? 'fa-lock' : 'fa-folder']"></span>
+                  <span ng-class="[folder.type == 'sendonly' ? 'fas fa-fw fa-lock' : 'fas fa-fw fa-folder']"></span>
                 </div>
                 <div class="panel-status pull-right text-{{folderClass(folder)}}" ng-switch="folderStatus(folder)">
                   <span ng-switch-when="paused"><span class="hidden-xs" translate>Paused</span><span class="visible-xs">&#9724;</span></span>
@@ -284,14 +311,14 @@
                   <span ng-switch-when="scanning">
                     <span class="hidden-xs" translate>Scanning</span>
                     <span class="hidden-xs" ng-if="scanPercentage(folder.id) != undefined">
-                      ({{scanPercentage(folder.id)}}%)
+                      ({{scanPercentage(folder.id) | percent}})
                     </span>
                     <span class="visible-xs">&#9724;</span>
                   </span>
                   <span ng-switch-when="idle"><span class="hidden-xs" translate>Up to Date</span><span class="visible-xs">&#9724;</span></span>
                   <span ng-switch-when="syncing">
                     <span class="hidden-xs" translate>Syncing</span>
-                    <span ng-show="syncRemaining(folder.id)">({{syncPercentage(folder.id)}}%, {{syncRemaining(folder.id) | binary}}B)</span>
+                    <span ng-show="syncRemaining(folder.id)">({{syncPercentage(folder.id) | percent}}, {{syncRemaining(folder.id) | binary}}B)</span>
                   </span>
                   <span ng-switch-when="outofsync"><span class="hidden-xs" translate>Out of Sync</span><span class="visible-xs">&#9724;</span></span>
                 </div>
@@ -305,107 +332,106 @@
                 <table class="table table-condensed table-striped">
                   <tbody>
                     <tr ng-show="folder.label != undefined && folder.label.length > 0">
-                      <th><span class="fa fa-fw fa-folder-open"></span>&nbsp;<span translate>Folder ID</span></th>
+                      <th><span class="fas fa-fw fa-info-circle"></span>&nbsp;<span translate>Folder ID</span></th>
                       <td class="text-right no-overflow-ellipse">{{folder.id}}</td>
                     </tr>
                     <tr>
-                      <th><span class="fa fa-fw fa-folder-open"></span>&nbsp;<span translate>Folder Path</span></th>
+                      <th><span class="fas fa-fw fa-folder-open"></span>&nbsp;<span translate>Folder Path</span></th>
                       <td class="text-right">
                         <span tooltip data-original-title="{{folder.path}}">{{folder.path}}</span>
                       </td>
                     </tr>
                     <tr ng-if="!folder.paused && (model[folder.id].invalid || model[folder.id].error)">
-                      <th><span class="fa fa-fw fa-exclamation-triangle"></span>&nbsp;<span translate>Error</span></th>
+                      <th><span class="fas fa-fw fa-exclamation-triangle"></span>&nbsp;<span translate>Error</span></th>
                       <td class="text-right">{{model[folder.id].invalid || model[folder.id].error}}</td>
                     </tr>
                     <tr ng-if="!folder.paused">
-                      <th><span class="fa fa-fw fa-globe"></span>&nbsp;<span translate>Global State</span></th>
+                      <th><span class="fas fa-fw fa-globe"></span>&nbsp;<span translate>Global State</span></th>
                       <td class="text-right">
                         <span tooltip data-original-title="{{model[folder.id].globalFiles | alwaysNumber | localeNumber}} {{'files' | translate}}, {{model[folder.id].globalDirectories | alwaysNumber | localeNumber}} {{'directories' | translate}}, ~{{model[folder.id].globalBytes | binary}}B">
-                          <span class="fa fa-files-o"></span>&nbsp;{{model[folder.id].globalFiles | alwaysNumber | localeNumber}}&ensp;
-                          <span class="fa fa-folder-o"></span>&nbsp;{{model[folder.id].globalDirectories | alwaysNumber | localeNumber}}&ensp;
-                          <span class="fa fa-hdd-o"></span>&nbsp;~{{model[folder.id].globalBytes | binary}}B
+                          <span class="far fa-copy"></span>&nbsp;{{model[folder.id].globalFiles | alwaysNumber | localeNumber}}&ensp;
+                          <span class="far fa-folder"></span>&nbsp;{{model[folder.id].globalDirectories | alwaysNumber | localeNumber}}&ensp;
+                          <span class="far fa-hdd"></span>&nbsp;~{{model[folder.id].globalBytes | binary}}B
                         </span>
                       </td>
                     </tr>
                     <tr ng-if="!folder.paused">
-                      <th><span class="fa fa-fw fa-home"></span>&nbsp;<span translate>Local State</span></th>
+                      <th><span class="fas fa-fw fa-home"></span>&nbsp;<span translate>Local State</span></th>
                       <td class="text-right">
                         <span tooltip data-original-title="{{model[folder.id].localFiles | alwaysNumber | localeNumber}} {{'files' | translate}}, {{model[folder.id].localDirectories | alwaysNumber | localeNumber}} {{'directories' | translate}}, ~{{model[folder.id].localBytes | binary}}B">
-                          <span class="fa fa-files-o"></span>&nbsp;{{model[folder.id].localFiles | alwaysNumber | localeNumber}}&ensp;
-                          <span class="fa fa-folder-o"></span>&nbsp;{{model[folder.id].localDirectories | alwaysNumber | localeNumber}}&ensp;
-                          <span class="fa fa-hdd-o"></span>&nbsp;~{{model[folder.id].localBytes | binary}}B
-                          <span ng-if="model[folder.id].ignorePatterns"><br/><i><small translate class="text-muted">Reduced by ignore patterns</small></i></span>
+                          <span class="far fa-copy"></span>&nbsp;{{model[folder.id].localFiles | alwaysNumber | localeNumber}}&ensp;
+                          <span class="far fa-folder"></span>&nbsp;{{model[folder.id].localDirectories | alwaysNumber | localeNumber}}&ensp;
+                          <span class="far fa-hdd"></span>&nbsp;~{{model[folder.id].localBytes | binary}}B<!-- get rid of the annoying trailing whitespace
+                          --><span ng-if="model[folder.id].ignorePatterns"><br/><i><small translate class="text-muted">Reduced by ignore patterns</small></i></span>
                         </span>
                       </td>
                     </tr>
                     <tr ng-if="neededItems(folder.id) > 0">
-                      <th><span class="fa fa-fw fa-cloud-download"></span>&nbsp;<span translate>Out of Sync Items</span></th>
+                      <th><span class="fas fa-fw fa-cloud-download-alt"></span>&nbsp;<span translate>Out of Sync Items</span></th>
                       <td class="text-right">
                         <a href="" ng-click="showNeed(folder.id)">{{neededItems(folder.id) | alwaysNumber}} <span translate>items</span>, ~{{model[folder.id].needBytes | binary}}B</a>
                       </td>
                     </tr>
                     <tr ng-if="folderStatus(folder) === 'scanning' && scanRate(folder.id) > 0">
-                      <th><span class="fa fa-fw fa-hourglass-2"></span>&nbsp;<span translate>Scan Time Remaining</span></th>
+                      <th><span class="fas fa-fw fa-hourglass-half"></span>&nbsp;<span translate>Scan Time Remaining</span></th>
                       <td class="text-right">
                         <span tooltip data-original-title="{{scanRate(folder.id) | binary}}B/s">~ {{scanRemaining(folder.id)}}</span>
                       </td>
                     </tr>
                     <tr ng-if="hasFailedFiles(folder.id)">
-                      <th><span class="fa fa-fw fa-exclamation-circle"></span>&nbsp;<span translate>Failed Items</span></th>
+                      <th><span class="fas fa-fw fa-exclamation-circle"></span>&nbsp;<span translate>Failed Items</span></th>
                       <!-- Show the number of failed items as a link to bring up the list. -->
                       <td class="text-right">
                         <a href="" ng-click="showFailed(folder.id)">{{model[folder.id].pullErrors | alwaysNumber | localeNumber}}&nbsp;<span translate>items</span></a>
                       </td>
                     </tr>
-                    <tr ng-if="folder.type != 'readwrite'">
-                      <th><span class="fa fa-fw fa-lock"></span>&nbsp;<span translate>Folder Type</span></th>
+                    <tr ng-if="folder.type != 'sendreceive'">
+                      <th><span class="fas fa-fw fa-lock"></span>&nbsp;<span translate>Folder Type</span></th>
                       <td class="text-right">
-                        <span ng-if="folder.type == 'readonly'" translate>Send Only</span>
-                        <span ng-if="folder.type != 'readonly'">{{ folder.type.charAt(0).toUpperCase() + folder.type.slice(1) }}</span>
+                        <span ng-if="folder.type == 'sendonly'" translate>Send Only</span>
                       </td>
                     </tr>
                     <tr ng-if="folder.ignorePerms">
-                      <th><span class="fa fa-fw fa-minus-square-o"></span>&nbsp;<span translate>Ignore Permissions</span></th>
+                      <th><span class="far fa-fw fa-minus-square"></span>&nbsp;<span translate>Ignore Permissions</span></th>
                       <td class="text-right">
                         <span translate>Yes</span>
                       </td>
                     </tr>
                     <tr>
-                      <th><span class="fa fa-fw fa-refresh"></span>&nbsp;<span translate>Rescans</span></th>
+                      <th><span class="fas fa-fw fa-sync"></span>&nbsp;<span translate>Rescans</span></th>
                       <td class="text-right">
                         <div ng-if="folder.rescanIntervalS > 0">
                           <span ng-if="!folder.fsWatcherEnabled" tooltip data-original-title="{{'Periodic scanning at given interval and disabled watching for changes' | translate}}">
-                            <span class="fa fa-clock-o"></span>&nbsp;{{folder.rescanIntervalS | duration}}&ensp;
-                            <span class="fa fa-eye-slash"></span>&nbsp;<span translate>Disabled</span>
+                            <span class="far fa-clock"></span>&nbsp;{{folder.rescanIntervalS | duration}}&ensp;
+                            <span class="fas fa-eye-slash"></span>&nbsp;<span translate>Disabled</span>
                           </span>
-                          <span ng-if="folder.fsWatcherEnabled && (!model[folder.id].watchError || folder.paused)" tooltip data-original-title="{{'Periodic scanning at given interval and enabled watching for changes' | translate}}">
-                            <span class="fa fa-clock-o"></span>&nbsp;{{folder.rescanIntervalS | duration}}&ensp;
-                            <span class="fa fa-eye"></span>&nbsp;<span translate>Enabled</span>
+                          <span ng-if="folder.fsWatcherEnabled && (!model[folder.id].watchError || folder.paused || folderStatus(folder) === 'stopped')" tooltip data-original-title="{{'Periodic scanning at given interval and enabled watching for changes' | translate}}">
+                            <span class="far fa-clock"></span>&nbsp;{{folder.rescanIntervalS | duration}}&ensp;
+                            <span class="fas fa-eye"></span>&nbsp;<span translate>Enabled</span>
                           </span>
-                          <span ng-if="folder.fsWatcherEnabled && !folder.paused && model[folder.id].watchError" tooltip data-original-title="{{'Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:' | translate}}<br/>{{model[folder.id].watchError}}">
-                            <span class="fa fa-clock-o"></span>&nbsp;{{folder.rescanIntervalS | duration}}&ensp;
-                            <span class="fa fa-eye-slash"></span>&nbsp;<span translate>Failed to setup, retrying</span>
+                          <span ng-if="folder.fsWatcherEnabled && !folder.paused && folderStatus(folder) !== 'stopped' && model[folder.id].watchError" tooltip data-original-title="{{'Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:' | translate}}<br/>{{model[folder.id].watchError}}">
+                            <span class="far fa-clock"></span>&nbsp;{{folder.rescanIntervalS | duration}}&ensp;
+                            <span class="fas fa-eye-slash"></span>&nbsp;<span translate>Failed to setup, retrying</span>
                           </span>
                         </div>
                         <div ng-if="folder.rescanIntervalS <= 0">
                           <span ng-if="!folder.fsWatcherEnabled" tooltip data-original-title="{{'Disabled periodic scanning and disabled watching for changes' | translate}}">
-                            <span class="fa fa-clock-o"></span>&nbsp;<span translate>Disabled</span>&ensp;
-                            <span class="fa fa-eye-slash"></span>&nbsp;<span translate>Disabled</span>
+                            <span class="far fa-clock"></span>&nbsp;<span translate>Disabled</span>&ensp;
+                            <span class="fas fa-eye-slash"></span>&nbsp;<span translate>Disabled</span>
                           </span>
-                          <span ng-if="folder.fsWatcherEnabled && (!model[folder.id].watchError || folder.paused)" tooltip data-original-title="{{'Disabled periodic scanning and enabled watching for changes' | translate}}">
-                            <span class="fa fa-clock-o"></span>&nbsp;<span translate>Disabled</span>&ensp;
-                            <span class="fa fa-eye"></span>&nbsp;<span translate>Enabled</span>
+                          <span ng-if="folder.fsWatcherEnabled && (!model[folder.id].watchError || folder.paused || folderStatus(folder) === 'stopped')" tooltip data-original-title="{{'Disabled periodic scanning and enabled watching for changes' | translate}}">
+                            <span class="far fa-clock"></span>&nbsp;<span translate>Disabled</span>&ensp;
+                            <span class="fas fa-eye"></span>&nbsp;<span translate>Enabled</span>
                           </span>
-                          <span ng-if="folder.fsWatcherEnabled && !folder.paused && model[folder.id].watchError" tooltip data-original-title="{{'Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:' | translate}}<br/>{{model[folder.id].watchError}}">
-                            <span class="fa fa-clock-o"></span>&nbsp;<span translate>Disabled</span>&ensp;
-                            <span class="fa fa-eye-slash"></span>&nbsp;<span translate>Failed to setup, retrying</span>
+                          <span ng-if="folder.fsWatcherEnabled && !folder.paused && folderStatus(folder) !== 'stopped' && model[folder.id].watchError" tooltip data-original-title="{{'Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:' | translate}}<br/>{{model[folder.id].watchError}}">
+                            <span class="far fa-clock"></span>&nbsp;<span translate>Disabled</span>&ensp;
+                            <span class="fas fa-eye-slash"></span>&nbsp;<span translate>Failed to setup, retrying</span>
                           </span>
                         </div>
                       </td>
                     </tr>
                     <tr ng-if="folder.order != 'random'">
-                      <th><span class="fa fa-fw fa-sort"></span>&nbsp;<span translate>File Pull Order</span></th>
+                      <th><span class="fas fa-fw fa-sort"></span>&nbsp;<span translate>File Pull Order</span></th>
                       <td class="text-right" ng-switch="folder.order">
                         <span ng-switch-when="random" translate>Random</span>
                         <span ng-switch-when="alphabetic" translate>Alphabetic</span>
@@ -416,7 +442,7 @@
                       </td>
                     </tr>
                     <tr ng-if="folder.versioning.type">
-                      <th><span class="fa fa-fw fa-files-o"></span>&nbsp;<span translate>File Versioning</span></th>
+                      <th><span class="far fa-fw fa-copy"></span>&nbsp;<span translate>File Versioning</span></th>
                       <td class="text-right" ng-switch="folder.versioning.type">
                         <span ng-switch-when="trashcan" translate>Trash Can File Versioning</span>
                         <span ng-switch-when="staggered" translate>Staggered File Versioning</span>
@@ -425,18 +451,18 @@
                       </td>
                     </tr>
                     <tr>
-                      <th><span class="fa fa-fw fa-share-alt"></span>&nbsp;<span translate>Shared With</span></th>
+                      <th><span class="fas fa-fw fa-share-alt"></span>&nbsp;<span translate>Shared With</span></th>
                       <td class="text-right" ng-attr-title="{{sharesFolder(folder)}}">{{sharesFolder(folder)}}</td>
                     </tr>
                     <tr ng-if="folderStats[folder.id].lastScan">
-                      <th><span class="fa fa-fw fa-clock-o"></span>&nbsp;<span translate>Last Scan</span></th>
+                      <th><span class="far fa-fw fa-clock"></span>&nbsp;<span translate>Last Scan</span></th>
                       <td translate ng-if="folderStats[folder.id].lastScanDays >= 365" class="text-right">Never</td>
                       <td ng-if="folderStats[folder.id].lastScanDays < 365" class="text-right">
                         <span>{{folderStats[folder.id].lastScan | date:'yyyy-MM-dd HH:mm:ss'}}</span>
                       </td>
                     </tr>
-                    <tr ng-if="folder.type != 'readonly' && folderStats[folder.id].lastFile && folderStats[folder.id].lastFile.filename">
-                      <th><span class="fa fa-fw fa-exchange"></span>&nbsp;<span translate>Latest Change</span></th>
+                    <tr ng-if="folder.type != 'sendonly' && folderStats[folder.id].lastFile && folderStats[folder.id].lastFile.filename">
+                      <th><span class="fas fa-fw fa-exchange-alt"></span>&nbsp;<span translate>Latest Change</span></th>
                       <td class="text-right">
                         <span tooltip data-original-title="{{folderStats[folder.id].lastFile.filename}} @ {{folderStats[folder.id].lastFile.at | date:'yyyy-MM-dd HH:mm:ss'}}">
                           <span translate ng-if="!folderStats[folder.id].lastFile.deleted">Updated</span>
@@ -449,24 +475,24 @@
                 </table>
               </div>
               <div class="panel-footer">
-                <button type="button" class="btn btn-sm btn-danger pull-left" ng-click="override(folder.id)" ng-if="folderStatus(folder) == 'outofsync' && folder.type == 'readonly'">
-                  <span class="fa fa-arrow-circle-up"></span>&nbsp;<span translate>Override Changes</span>
+                <button type="button" class="btn btn-sm btn-danger pull-left" ng-click="override(folder.id)" ng-if="folderStatus(folder) == 'outofsync' && folder.type == 'sendonly'">
+                  <span class="fas fa-arrow-circle-up"></span>&nbsp;<span translate>Override Changes</span>
                 </button>
                 <span class="pull-right">
                   <button ng-if="!folder.paused" type="button" class="btn btn-sm btn-default" ng-click="setFolderPause(folder.id, true)">
-                    <span class="fa fa-pause"></span>&nbsp;<span translate>Pause</span>
+                    <span class="fas fa-pause"></span>&nbsp;<span translate>Pause</span>
                   </button>
                   <button ng-if="folder.paused" type="button" class="btn btn-sm btn-default" ng-click="setFolderPause(folder.id, false)">
-                    <span class="fa fa-play"></span>&nbsp;<span translate>Resume</span>
+                    <span class="fas fa-play"></span>&nbsp;<span translate>Resume</span>
                   </button>
                   <button type="button" class="btn btn-default btn-sm" ng-click="restoreVersions.show(folder.id)" ng-if="folder.versioning.type">
-                    <span class="fa fa-undo"></span>&nbsp;<span translate>Versions</span>
+                    <span class="fas fa-undo"></span>&nbsp;<span translate>Versions</span>
                   </button>
-                  <button type="button" class="btn btn-sm btn-default" ng-click="rescanFolder(folder.id)" ng-show="['idle', 'stopped', 'unshared', 'outofsync'].indexOf(folderStatus(folder)) > -1">
-                    <span class="fa fa-refresh"></span>&nbsp;<span translate>Rescan</span>
+                  <button type="button" class="btn btn-sm btn-default" ng-click="rescanFolder(folder.id)" ng-disabled="['idle', 'stopped', 'unshared', 'outofsync'].indexOf(folderStatus(folder)) < 0">
+                    <span class="fas fa-sync"></span>&nbsp;<span translate>Rescan</span>
                   </button>
                   <button type="button" class="btn btn-sm btn-default" ng-click="editFolder(folder)">
-                    <span class="fa fa-pencil"></span>&nbsp;<span translate>Edit</span>
+                    <span class="fas fa-pencil-alt"></span>&nbsp;<span translate>Edit</span>
                   </button>
                 </span>
                 <div class="clearfix"></div>
@@ -476,16 +502,16 @@
         </div>
         <span class="pull-right">
           <button type="button" class="btn btn-sm btn-default" ng-click="setAllFoldersPause(true)" ng-if="isAtleastOneFolderPausedStateSetTo(false)">
-            <span class="fa fa-pause"></span>&nbsp;<span translate>Pause All</span>
+            <span class="fas fa-pause"></span>&nbsp;<span translate>Pause All</span>
           </button>
           <button type="button" class="btn btn-sm btn-default" ng-click="setAllFoldersPause(false)" ng-if="isAtleastOneFolderPausedStateSetTo(true)">
-            <span class="fa fa-play"></span>&nbsp;<span translate>Resume All</span>
+            <span class="fas fa-play"></span>&nbsp;<span translate>Resume All</span>
           </button>
           <button type="button" class="btn btn-sm btn-default" ng-click="rescanAllFolders()">
-            <span class="fa fa-refresh"></span>&nbsp;<span translate>Rescan All</span>
+            <span class="fas fa-sync"></span>&nbsp;<span translate>Rescan All</span>
           </button>
           <button type="button" class="btn btn-sm btn-default" ng-click="addFolder()">
-            <span class="fa fa-plus"></span>&nbsp;<span translate>Add Folder</span>
+            <span class="fas fa-plus"></span>&nbsp;<span translate>Add Folder</span>
           </button>
         </span>
         <div class="clearfix"></div>
@@ -510,7 +536,7 @@
               <table class="table table-condensed table-striped">
                 <tbody>
                   <tr>
-                    <th><span class="fa fa-fw fa-cloud-download"></span>&nbsp;<span translate>Download Rate</span></th>
+                    <th><span class="fas fa-fw fa-cloud-download-alt"></span>&nbsp;<span translate>Download Rate</span></th>
                     <td class="text-right">
                       <a href="#" class="toggler" ng-click="toggleUnits()">
                         <span ng-if="!metricRates">{{connectionsTotal.inbps | binary}}B/s</span>
@@ -520,7 +546,7 @@
                     </td>
                   </tr>
                   <tr>
-                    <th><span class="fa fa-fw fa-cloud-upload"></span>&nbsp;<span translate>Upload Rate</span></th>
+                    <th><span class="fas fa-fw fa-cloud-upload-alt"></span>&nbsp;<span translate>Upload Rate</span></th>
                     <td class="text-right">
                       <a href="#" class="toggler" ng-click="toggleUnits()">
                         <span ng-if="!metricRates">{{connectionsTotal.outbps | binary}}B/s</span>
@@ -530,24 +556,24 @@
                     </td>
                   </tr>
                   <tr>
-                    <th><span class="fa fa-fw fa-home"></span>&nbsp;<span translate>Local State (Total)</span></th>
+                    <th><span class="fas fa-fw fa-home"></span>&nbsp;<span translate>Local State (Total)</span></th>
                     <td class="text-right">
                         <span tooltip data-original-title="{{localStateTotal.files | alwaysNumber | localeNumber}} {{'files' | translate}}, {{ localStateTotal.directories | alwaysNumber | localeNumber}} {{'directories' | translate}}, ~{{ localStateTotal.bytes | binary}}B">
-                        <span class="fa fa-files-o"></span>&nbsp;{{localStateTotal.files | alwaysNumber | localeNumber}}&ensp;
-                        <span class="fa fa-folder-o"></span>&nbsp;{{localStateTotal.directories| alwaysNumber | localeNumber}}&ensp;
-                        <span class="fa fa-hdd-o"></span>&nbsp;~{{localStateTotal.bytes | binary}}B
+                        <span class="far fa-copy"></span>&nbsp;{{localStateTotal.files | alwaysNumber | localeNumber}}&ensp;
+                        <span class="far fa-folder"></span>&nbsp;{{localStateTotal.directories| alwaysNumber | localeNumber}}&ensp;
+                        <span class="far fa-hdd"></span>&nbsp;~{{localStateTotal.bytes | binary}}B
                     </td>
                   </tr>
                   <tr>
-                    <th><span class="fa fa-fw fa-th"></span>&nbsp;<span translate>RAM Utilization</span></th>
+                    <th><span class="fas fa-fw fa-microchip"></span>&nbsp;<span translate>RAM Utilization</span></th>
                     <td class="text-right">{{system.sys | binary}}B</td>
                   </tr>
                   <tr>
-                    <th><span class="fa fa-fw fa-tachometer"></span>&nbsp;<span translate>CPU Utilization</span></th>
-                    <td class="text-right">{{system.cpuPercent | alwaysNumber | localeNumber:2}}%</td>
+                    <th><span class="fas fa-fw fa-tachometer-alt"></span>&nbsp;<span translate>CPU Utilization</span></th>
+                    <td class="text-right">{{system.cpuPercent | alwaysNumber | percent}}</td>
                   </tr>
                   <tr>
-                    <th><span class="fa fa-fw fa-sitemap"></span>&nbsp;<span translate>Listeners</span></th>
+                    <th><span class="fas fa-fw fa-sitemap"></span>&nbsp;<span translate>Listeners</span></th>
                     <td class="text-right">
                       <span ng-if="listenersFailed.length == 0" class="data text-success">
                         <span>{{listenersTotal}}/{{listenersTotal}}</span>
@@ -560,7 +586,7 @@
                     </td>
                   </tr>
                   <tr ng-if="system.discoveryEnabled">
-                    <th><span class="fa fa-fw fa-map-signs"></span>&nbsp;<span translate>Discovery</span></th>
+                    <th><span class="fas fa-fw fa-map-signs"></span>&nbsp;<span translate>Discovery</span></th>
                     <td class="text-right">
                       <span ng-if="discoveryFailed.length == 0" class="data text-success">
                         <span>{{discoveryTotal}}/{{discoveryTotal}}</span>
@@ -573,11 +599,11 @@
                     </td>
                   </tr>
                   <tr>
-                    <th><span class="fa fa-fw fa-clock-o"></span>&nbsp;<span translate>Uptime</span></th>
+                    <th><span class="far fa-fw fa-clock"></span>&nbsp;<span translate>Uptime</span></th>
                     <td class="text-right">{{system.uptime | duration:"m"}}</td>
                   </tr>
                   <tr>
-                    <th><span class="fa fa-fw fa-tag"></span>&nbsp;<span translate>Version</span></th>
+                    <th><span class="fas fa-fw fa-tag"></span>&nbsp;<span translate>Version</span></th>
                     <td class="text-right">
                       <span tooltip data-original-title="{{versionString()}}">{{versionString()}}</span>
                     </td>
@@ -593,13 +619,13 @@
         <div class="panel-group" id="devices">
           <div class="panel panel-default" ng-repeat="deviceCfg in otherDevices()">
             <button class="btn panel-heading" data-toggle="collapse" data-parent="#devices" data-target="#device-{{$index}}" aria-expanded="false">
-              <div class="panel-progress" ng-show="deviceStatus(deviceCfg) == 'syncing'" ng-attr-style="width: {{completion[deviceCfg.deviceID]._total | number:0}}%"></div>
+              <div class="panel-progress" ng-show="deviceStatus(deviceCfg) == 'syncing'" ng-attr-style="width: {{completion[deviceCfg.deviceID]._total | percent}}"></div>
               <h4 class="panel-title">
                 <identicon class="panel-icon" data-value="deviceCfg.deviceID"></identicon>
                 <span ng-switch="deviceStatus(deviceCfg)" class="pull-right text-{{deviceClass(deviceCfg)}}">
                   <span ng-switch-when="insync"><span class="hidden-xs" translate>Up to Date</span><span class="visible-xs">&#9724;</span></span>
                   <span ng-switch-when="syncing">
-                    <span class="hidden-xs" translate>Syncing</span> ({{completion[deviceCfg.deviceID]._total | number:0}}%, {{completion[deviceCfg.deviceID]._needBytes | binary}}B)
+                    <span class="hidden-xs" translate>Syncing</span> ({{completion[deviceCfg.deviceID]._total | percent}}, {{completion[deviceCfg.deviceID]._needBytes | binary}}B)
                   </span>
                   <span ng-switch-when="paused"><span class="hidden-xs" translate>Paused</span><span class="visible-xs">&#9724;</span></span>
                   <span ng-switch-when="disconnected"><span class="hidden-xs" translate>Disconnected</span><span class="visible-xs">&#9724;</span></span>
@@ -613,7 +639,7 @@
                 <table class="table table-condensed table-striped">
                   <tbody>
                     <tr ng-if="connections[deviceCfg.deviceID].connected">
-                      <th><span class="fa fa-fw fa-cloud-download"></span>&nbsp;<span translate>Download Rate</span></th>
+                      <th><span class="fas fa-fw fa-cloud-download-alt"></span>&nbsp;<span translate>Download Rate</span></th>
                       <td class="text-right">
                         <a href="#" class="toggler" ng-click="toggleUnits()">
                           <span ng-if="!metricRates">{{connections[deviceCfg.deviceID].inbps | binary}}B/s</span>
@@ -623,7 +649,7 @@
                       </td>
                     </tr>
                     <tr ng-if="connections[deviceCfg.deviceID].connected">
-                      <th><span class="fa fa-fw fa-cloud-upload"></span>&nbsp;<span translate>Upload Rate</span></th>
+                      <th><span class="fas fa-fw fa-cloud-upload-alt"></span>&nbsp;<span translate>Upload Rate</span></th>
                       <td class="text-right">
                         <a href="#" class="toggler" ng-click="toggleUnits()">
                           <span ng-if="!metricRates">{{connections[deviceCfg.deviceID].outbps | binary}}B/s</span>
@@ -633,13 +659,13 @@
                       </td>
                     </tr>
                     <tr ng-if="deviceStatus(deviceCfg) == 'syncing'">
-                      <th><span class="fa fa-fw fa-exchange"></span>&nbsp;<span translate>Out of Sync Items</span></th>
+                      <th><span class="fas fa-fw fa-exchange-alt"></span>&nbsp;<span translate>Out of Sync Items</span></th>
                       <td class="text-right">
                         <a href="" ng-click="showRemoteNeed(deviceCfg)">{{completion[deviceCfg.deviceID]._needItems | alwaysNumber | localeNumber}} <span translate>items</span>, ~{{completion[deviceCfg.deviceID]._needBytes | binary}}B</a>
                       </td>
                     </tr>
                     <tr>
-                      <th><span class="fa fa-fw fa-link"></span>&nbsp<span translate>Address</span></th>
+                      <th><span class="fas fa-fw fa-link"></span>&nbsp<span translate>Address</span></th>
                       <td ng-if="connections[deviceCfg.deviceID].connected" class="text-right">
                         <span tooltip data-original-title="{{ connections[deviceCfg.deviceID].type.indexOf('Relay') > -1 ? '' : connections[deviceCfg.deviceID].type }}">
                           {{deviceAddr(deviceCfg)}}
@@ -651,41 +677,41 @@
                       </td>
                     </tr>
                     <tr ng-if="connections[deviceCfg.deviceID].connected && connections[deviceCfg.deviceID].type.indexOf('Relay') > -1" tooltip data-original-title="Connections via relays might be rate limited by the relay">
-                      <th><span class="fa fa-fw fa-warning text-danger"></span>&nbsp;<span translate>Connection Type</span></th>
+                      <th><span class="fas fa-fw fa-exclamation-triangle text-danger"></span>&nbsp;<span translate>Connection Type</span></th>
                       <td class="text-right">{{connections[deviceCfg.deviceID].type}}</td>
                     </tr>
-                    <tr ng-if="deviceCfg.allowedNetworks">
-                      <th><span class="fa fa-fw fa-filter"></span>&nbsp;<span translate>Allowed Networks</span></th>
+                    <tr ng-if="deviceCfg.allowedNetworks.length > 0">
+                      <th><span class="fas fa-fw fa-filter"></span>&nbsp;<span translate>Allowed Networks</span></th>
                       <td class="text-right">
                         <span>{{deviceCfg.allowedNetworks.join(", ")}}</span>
                       </td>
                     </tr>
                     <tr ng-if="deviceCfg.compression != 'metadata'">
-                      <th><span class="fa fa-fw fa-compress"></span>&nbsp;<span translate>Compression</span></th>
+                      <th><span class="fas fa-fw fa-compress"></span>&nbsp;<span translate>Compression</span></th>
                       <td class="text-right">
                         <span ng-if="deviceCfg.compression == 'always'" translate>All Data</span>
                         <span ng-if="deviceCfg.compression == 'never'" translate>Off</span>
                       </td>
                     </tr>
                     <tr ng-if="deviceCfg.introducer">
-                      <th><span class="fa fa-fw fa-thumbs-o-up"></span>&nbsp;<span translate>Introducer</span></th>
+                      <th><span class="far fa-fw fa-thumbs-up"></span>&nbsp;<span translate>Introducer</span></th>
                       <td translate class="text-right">Yes</td>
                     </tr>
                     <tr ng-if="deviceCfg.introducedBy">
-                      <th><span class="fa fa-fw fa-meh-o"></span>&nbsp;<span translate>Introduced By</span></th>
+                      <th><span class="far fa-fw fa-meh"></span>&nbsp;<span translate>Introduced By</span></th>
                       <td class="text-right">{{ deviceName(findDevice(deviceCfg.introducedBy)) || deviceCfg.introducedBy.substring(0, 5) }}</td>
                     </tr>
                     <tr ng-if="connections[deviceCfg.deviceID].clientVersion">
-                      <th><span class="fa fa-fw fa-tag"></span>&nbsp;<span translate>Version</span></th>
+                      <th><span class="fas fa-fw fa-tag"></span>&nbsp;<span translate>Version</span></th>
                       <td class="text-right">{{connections[deviceCfg.deviceID].clientVersion}}</td>
                     </tr>
                     <tr ng-if="!connections[deviceCfg.deviceID].connected">
-                      <th><span class="fa fa-fw fa-eye"></span>&nbsp;<span translate>Last seen</span></th>
+                      <th><span class="fas fa-fw fa-eye"></span>&nbsp;<span translate>Last seen</span></th>
                       <td translate ng-if="!deviceStats[deviceCfg.deviceID].lastSeenDays || deviceStats[deviceCfg.deviceID].lastSeenDays >= 365" class="text-right">Never</td>
                       <td ng-if="deviceStats[deviceCfg.deviceID].lastSeenDays < 365" class="text-right">{{deviceStats[deviceCfg.deviceID].lastSeen | date:"yyyy-MM-dd HH:mm:ss"}}</td>
                     </tr>
                     <tr ng-if="deviceFolders(deviceCfg).length > 0">
-                      <th><span class="fa fa-fw fa-folder"></span>&nbsp;<span translate>Folders</span></th>
+                      <th><span class="fas fa-fw fa-folder"></span>&nbsp;<span translate>Folders</span></th>
                       <td class="text-right" ng-attr-title="{{deviceFolders(deviceCfg).map(folderLabel).join(', ')}}">{{deviceFolders(deviceCfg).map(folderLabel).join(", ")}}</td>
                     </tr>
                   </tbody>
@@ -694,13 +720,13 @@
               <div class="panel-footer">
                 <span class="pull-right">
                   <button ng-if="!deviceCfg.paused" type="button" class="btn btn-sm btn-default" ng-click="setDevicePause(deviceCfg.deviceID, true)">
-                    <span class="fa fa-pause"></span>&nbsp;<span translate>Pause</span>
+                    <span class="fas fa-pause"></span>&nbsp;<span translate>Pause</span>
                   </button>
                   <button ng-if="deviceCfg.paused" type="button" class="btn btn-sm btn-default" ng-click="setDevicePause(deviceCfg.deviceID, false)">
-                    <span class="fa fa-play"></span>&nbsp;<span translate>Resume</span>
+                    <span class="fas fa-play"></span>&nbsp;<span translate>Resume</span>
                   </button>
                   <button type="button" class="btn btn-sm btn-default" ng-click="editDevice(deviceCfg)">
-                    <span class="fa fa-pencil"></span>&nbsp;<span translate>Edit</span>
+                    <span class="fas fa-pencil-alt"></span>&nbsp;<span translate>Edit</span>
                   </button>
                 </span>
                 <div class="clearfix"></div>
@@ -711,10 +737,10 @@
         <div class="form-group">
           <span class="pull-right">
             <button type="button" class="btn btn-sm btn-default" ng-click="globalChanges()">
-              <span class="fa fa-fw fa-info-circle"></span>&nbsp;<span translate>Recent Changes</span>
+              <span class="fas fa-fw fa-info-circle"></span>&nbsp;<span translate>Recent Changes</span>
             </button>
             <button type="button" class="btn btn-sm btn-default" ng-click="addDevice()">
-              <span class="fa fa-plus"></span>&nbsp;<span translate>Add Remote Device</span>
+              <span class="fas fa-plus"></span>&nbsp;<span translate>Add Remote Device</span>
             </button>
           </span>
           <div class="clearfix"></div>
@@ -729,14 +755,14 @@
   <nav class="navbar navbar-default navbar-fixed-bottom">
     <div class="container">
       <ul class="nav navbar-nav">
-        <li><a class="navbar-link" href="https://syncthing.net/" target="_blank"><span class="fa fa-home"></span>&nbsp;<span translate>Home page</span></a></li>
-        <li><a class="navbar-link" href="https://docs.syncthing.net/" target="_blank"><span class="fa fa-book"></span>&nbsp;<span translate>Documentation</span></a></li>
-        <li><a class="navbar-link" href="https://forum.syncthing.net" target="_blank"><span class="fa fa-question-circle"></span>&nbsp;<span translate>Support</span></a></li>
-        <li><a class="navbar-link" href="https://data.syncthing.net/" target="_blank"><span class="fa fa-bar-chart"></span>&nbsp;<span translate>Statistics</span></a></li>
-        <li><a class="navbar-link" href="https://github.com/syncthing/syncthing/releases" target="_blank"><span class="fa fa-file-text-o"></span>&nbsp;<span translate>Changelog</span></a></li>
-        <li><a class="navbar-link" href="https://github.com/syncthing/syncthing/issues" target="_blank"><span class="fa fa-bug"></span>&nbsp;<span translate>Bugs</span></a></li>
-        <li><a class="navbar-link" href="https://github.com/syncthing/syncthing" target="_blank"><span class="fa fa-wrench"></span>&nbsp;<span translate>Source Code</span></a></li>
-        <li><a class="navbar-link" href="https://twitter.com/syncthing" target="_blank"><span class="fa fa-twitter"></span>&nbsp;Twitter</a></li>
+        <li><a class="navbar-link" href="https://syncthing.net/" target="_blank"><span class="fas fa-home"></span>&nbsp;<span translate>Home page</span></a></li>
+        <li><a class="navbar-link" href="https://docs.syncthing.net/" target="_blank"><span class="fas fa-book"></span>&nbsp;<span translate>Documentation</span></a></li>
+        <li><a class="navbar-link" href="https://forum.syncthing.net" target="_blank"><span class="fas fa-question-circle"></span>&nbsp;<span translate>Support</span></a></li>
+        <li><a class="navbar-link" href="https://data.syncthing.net/" target="_blank"><span class="fas fa-chart-bar"></span>&nbsp;<span translate>Statistics</span></a></li>
+        <li><a class="navbar-link" href="https://github.com/syncthing/syncthing/releases" target="_blank"><span class="far fa-file-alt"></span>&nbsp;<span translate>Changelog</span></a></li>
+        <li><a class="navbar-link" href="https://github.com/syncthing/syncthing/issues" target="_blank"><span class="fas fa-bug"></span>&nbsp;<span translate>Bugs</span></a></li>
+        <li><a class="navbar-link" href="https://github.com/syncthing/syncthing" target="_blank"><span class="fas fa-wrench"></span>&nbsp;<span translate>Source Code</span></a></li>
+        <li><a class="navbar-link" href="https://twitter.com/syncthing" target="_blank"><span class="fab fa-twitter"></span>&nbsp;Twitter</a></li>
       </ul>
     </div>
   </nav>
@@ -775,7 +801,7 @@
   <script type="text/javascript" src="vendor/angular/angular-dirPagination.js"></script>
   <script type="text/javascript" src="vendor/moment/moment.js"></script>
   <script type="text/javascript" src="vendor/bootstrap/js/bootstrap.js"></script>
-  <script type="text/javascript" src="vendor/bootstrap/js/daterangepicker.js"></script>
+  <script type="text/javascript" src="vendor/daterangepicker/daterangepicker.js"></script>
   <script type="text/javascript" src="vendor/fancytree/jquery.fancytree-all-deps.js"></script>
   <!-- / vendor scripts -->
 
@@ -785,6 +811,7 @@
   <script type="text/javascript" src="syncthing/core/basenameFilter.js"></script>
   <script type="text/javascript" src="syncthing/core/binaryFilter.js"></script>
   <script type="text/javascript" src="syncthing/core/localeNumberFilter.js"></script>
+  <script type="text/javascript" src="syncthing/core/percentFilter.js"></script>
   <script type="text/javascript" src="syncthing/core/durationFilter.js"></script>
   <script type="text/javascript" src="syncthing/core/eventService.js"></script>
   <script type="text/javascript" src="syncthing/core/identiconDirective.js"></script>

gui/default/modal.html

@@ -11,7 +11,7 @@
       <div class="modal-header {{status == 'default' ? '' : 'alert alert-'+status }}">
         <h4 class="modal-title">
           <div ng-if="icon" class="panel-icon">
-            <span class="fa fa-{{icon}}"></span>
+            <span class="{{icon}}"></span>
           </div>
           {{heading}}
         </h4>

gui/default/syncthing/app.js

@@ -195,3 +195,56 @@ function buildTree(children) {
 
     return root.children;
 }
+
+// unitPrefixed converts the input such that it returns a string representation
+// <1000 (<1024) with the metric unit prefix suffixed. I.e. when calling this with
+// binary == true, you need to suffix an additon 'i'.  The "biggest" prefix used
+// is 'T', numbers > 1000T are just returned as such big numbers. If ever deemed
+// useful 'P' can be added easily.
+function unitPrefixed(input, binary) {
+    if (input === undefined || isNaN(input)) {
+        return '0 ';
+    }
+    var factor = 1000;
+    var i = '';
+    if (binary) {
+        factor = 1024;
+        i = 'i'
+    }
+    if (input > factor * factor * factor * factor * 1000) {
+        // Don't show any decimals for more than 4 digits
+        input /= factor * factor * factor * factor;
+        return input.toLocaleString(undefined, {maximumFractionDigits: 0}) + ' T' + i;
+    }
+    // Show 3 significant digits (e.g. 123T or 2.54T)
+    if (input > factor * factor * factor * factor) {
+        input /= factor * factor * factor * factor;
+        return input.toLocaleString(undefined, {maximumSignificantDigits: 3}) + ' T' + i;
+    }
+    if (input > factor * factor * factor) {
+        input /= factor * factor * factor;
+        if (binary && input >= 1000) {
+            return input.toLocaleString(undefined, {maximumFractionDigits: 0}) + ' G' + i;
+        }
+        return input.toLocaleString(undefined, {maximumSignificantDigits: 3}) + ' G' + i;
+    }
+    if (input > factor * factor) {
+        input /= factor * factor;
+        if (binary && input >= 1000) {
+            return input.toLocaleString(undefined, {maximumFractionDigits: 0}) + ' M' + i;
+        }
+        return input.toLocaleString(undefined, {maximumSignificantDigits: 3}) + ' M' + i;
+    }
+    if (input > factor) {
+        input /= factor;
+        var prefix = ' k';
+        if (binary) {
+            prefix = ' K';
+        }
+        if (binary && input >= 1000) {
+            return input.toLocaleString(undefined, {maximumFractionDigits: 0}) + prefix + i;
+        }
+        return input.toLocaleString(undefined, {maximumSignificantDigits: 3}) + prefix + i;
+    }
+    return Math.round(input).toLocaleString() + ' ';
+};

gui/default/syncthing/core/aboutModalView.html

@@ -1,4 +1,4 @@
-<modal id="about" status="info" icon="heart-o" heading="{{'About' | translate}}" large="yes" closeable="yes">
+<modal id="about" status="info" icon="far fa-heart" heading="{{'About' | translate}}" large="yes" closeable="yes">
   <div class="modal-body">
     <h1 class="text-center">
       <img alt="Syncthing" src="assets/img/logo-horizontal.svg" style="vertical-align: -16px" height="100" width="366"/>
@@ -12,7 +12,7 @@
     <p translate>Copyright &copy; 2014-2017 the following Contributors:</p>
     <div class="row">
       <div class="col-md-12" id="contributor-list">
-Jakob Borg, Audrius Butkevicius, Simon Frei, Alexander Graf, Anderson Mesquita, Antony Male, Ben Schulz, Caleb Callaway, Daniel Harte, Lars K.W. Gohlke, Lode Hoste, Michael Ploujnikov, Nate Morrison, Philippe Schommers, Ryan Sullivan, Sergey Mishin, Stefan Tatschner, Wulf Weich, Aaron Bieber, Adam Piggott, Adel Qalieh, Alessandro G., Alexandre Viau, Andrew Dunham, Andrey D, Antoine Lamielle, Arthur Axel fREW Schmidt, Bart De Vries, Ben Curthoys, Ben Shepherd, Ben Sidhom, Benny Ng, Brandon Philips, Brendan Long, Brian R. Becker, Carsten Hagemann, Cathryne Linenweaver, Cedric Staniewski, Chris Howie, Chris Joel, Colin Kennedy, Daniel Bergmann, Daniel Martí, Darshil Chanpura, David Rimmer, Denis A., Dennis Wilson, Dmitry Saveliev, Dominik Heidler, Elias Jarlebring, Emil Hessman, Erik Meitner, Federico Castagnini, Felix Ableitner, Felix Unterpaintner, Francois-Xavier Gsell, Frank Isemann, Gilli Sigurdsson, Graham Miln, Harrison Jones, Heiko Zuerker, Jaakko Hannikainen, Jacek Szafarkiewicz, Jake Peterson, James Patterson, Jaroslav Malec, Jaya Chithra, Jens Diemer, Jochen Voss, Johan Vromans, John Rinehart, Jose Manuel Delicado, Karol Różycki, Kelong Cong, Ken'ichi Kamada, Kevin Allen, Kevin White, Jr., Kurt Fitzner, Laurent Etiemble, Leo Arias, Liu Siyuan, Lord Landon Agahnim, Majed Abdulaziz, Marc Laporte, Marc Pujol, Marcin Dziadus, Mark Pulford, Mateusz Naściszewski, Matt Burke, Max Schulze, Michael Jephcote, Michael Tilli, Nicholas Rishel, Niels Peter Roest, Nils Jakobi, Pascal Jungblut, Pawel Palenica, Peter Hoeg, Peter Marquardt, Phill Luby, Piotr Bejda, Pramodh KP, Robert Carosi, Roman Zaynetdinov, Ross Smith II, Sacheendra Talluri, Scott Klupfel, Stefan Kuntz, Suhas Gundimeda, Taylor Khan, Tim Abell, Tim Howes, Tobias Nygren, Tobias Tom, Tomas Cerveny, Tully Robinson, Tyler Brazier, Unrud, Veeti Paananen, Victor Buinsky, Vil Brekin, William A. Kennington III, Xavier O., Yannic A., xjtdy888
+Jakob Borg, Audrius Butkevicius, Simon Frei, Alexander Graf, Alexandre Viau, Anderson Mesquita, Antony Male, Ben Schulz, Caleb Callaway, Daniel Harte, Lars K.W. Gohlke, Lode Hoste, Michael Ploujnikov, Nate Morrison, Philippe Schommers, Ryan Sullivan, Sergey Mishin, Stefan Tatschner, Wulf Weich, Aaron Bieber, Adam Piggott, Adel Qalieh, Alessandro G., Andrew Dunham, Andrew Rabert, Andrey D, Antoine Lamielle, Arthur Axel fREW Schmidt, Bart De Vries, Ben Curthoys, Ben Shepherd, Ben Sidhom, Benny Ng, Brandon Philips, Brendan Long, Brian R. Becker, Carsten Hagemann, Cathryne Linenweaver, Cedric Staniewski, Chris Howie, Chris Joel, Colin Kennedy, Daniel Bergmann, Daniel Martí, Darshil Chanpura, David Rimmer, Denis A., Dennis Wilson, Dmitry Saveliev, Dominik Heidler, Elias Jarlebring, Emil Hessman, Erik Meitner, Federico Castagnini, Felix Ableitner, Felix Unterpaintner, Francois-Xavier Gsell, Frank Isemann, Gilli Sigurdsson, Graham Miln, Harrison Jones, Heiko Zuerker, Ian Johnson, Jaakko Hannikainen, Jacek Szafarkiewicz, Jake Peterson, James Patterson, Jaroslav Malec, Jaya Chithra, Jens Diemer, Jerry Jacobs, Jochen Voss, Johan Vromans, John Rinehart, Jose Manuel Delicado, Karol Różycki, Kelong Cong, Ken'ichi Kamada, Kevin Allen, Kevin White, Jr., Kurt Fitzner, Laurent Etiemble, Leo Arias, Liu Siyuan, Lord Landon Agahnim, Majed Abdulaziz, Marc Laporte, Marc Pujol, Marcin Dziadus, Mark Pulford, Mateusz Naściszewski, Matt Burke, Max Schulze, Michael Jephcote, Michael Tilli, Nicholas Rishel, Niels Peter Roest, Nils Jakobi, Pascal Jungblut, Pawel Palenica, Peter Hoeg, Peter Marquardt, Phill Luby, Piotr Bejda, Pramodh KP, Robert Carosi, Roman Zaynetdinov, Ross Smith II, Sacheendra Talluri, Scott Klupfel, Stefan Kuntz, Suhas Gundimeda, Taylor Khan, Tim Abell, Tim Howes, Tobias Nygren, Tobias Tom, Tomas Cerveny, Tully Robinson, Tyler Brazier, Unrud, Veeti Paananen, Victor Buinsky, Vil Brekin, William A. Kennington III, Xavier O., Yannic A., xjtdy888
     </div>
     </div>
     <hr/>
@@ -28,7 +28,6 @@ Jakob Borg, Audrius Butkevicius, Simon Frei, Alexander Graf, Anderson Mesquita,
       <li><a href="https://github.com/gogo/protobuf">gogo/protobuf</a>, Copyright &copy; 2013 The GoGo Authors.</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/jackpal/gateway">jackpal/gateway</a>, Copyright &copy; 2010 Jack Palevich.</li>
-      <li><a href="https://github.com/kardianos/osext">kardianos/osext</a>, Copyright &copy; 2012 Daniel Theophanes.</li>
       <li><a href="https://github.com/minio/sha256-simd">minio/sha256-simd</a>, Copyright &copy; 2016 Minio, Inc.</li>
       <li><a href="https://github.com/rcrowley/go-metrics">rcrowley/go-metrics</a>, Copyright &copy; 2012 Richard Crowley.</li>
       <li><a href="https://github.com/sasha-s/go-deadlock">sasha-s/go-deadlock</a>, Copyright &copy; 2016 sasha-s</li>
@@ -41,7 +40,7 @@ Jakob Borg, Audrius Butkevicius, Simon Frei, Alexander Graf, Anderson Mesquita,
   </div>
   <div class="modal-footer">
     <button type="button" class="btn btn-default btn-sm" data-dismiss="modal">
-      <span class="fa fa-times"></span>&nbsp;<span translate>Close</span>
+      <span class="fas fa-times"></span>&nbsp;<span translate>Close</span>
     </button>
   </div>
 </modal>

gui/default/syncthing/core/binaryFilter.js

@@ -1,21 +1,6 @@
 angular.module('syncthing.core')
     .filter('binary', function () {
         return function (input) {
-            if (input === undefined || isNaN(input)) {
-                return '0 ';
-            }
-            if (input > 1024 * 1024 * 1024) {
-                input /= 1024 * 1024 * 1024;
-                return input.toLocaleString(undefined, {maximumFractionDigits: 2}) + ' Gi';
-            }
-            if (input > 1024 * 1024) {
-                input /= 1024 * 1024;
-                return input.toLocaleString(undefined, {maximumFractionDigits: 2}) + ' Mi';
-            }
-            if (input > 1024) {
-                input /= 1024;
-                return input.toLocaleString(undefined, {maximumFractionDigits: 2}) + ' Ki';
-            }
-            return Math.round(input).toLocaleString(undefined, {maximumFractionDigits: 2}) + ' ';
+            return unitPrefixed(input, true);
         };
     });

gui/default/syncthing/core/discoveryFailuresModalView.html

@@ -1,4 +1,4 @@
-<modal id="discovery-failures" status="danger" icon="exclamation-circle" heading="{{'Discovery Failures' | translate}}" large="yes" closeable="yes">
+<modal id="discovery-failures" status="danger" icon="fas fa-exclamation-circle" heading="{{'Discovery Failures' | translate}}" large="yes" closeable="yes">
   <div class="modal-body">
     <ul>
       <li ng-repeat="failure in discoveryFailed">{{failure}}</li>
@@ -15,7 +15,7 @@
   </div>
   <div class="modal-footer">
     <button type="button" class="btn btn-default btn-sm" data-dismiss="modal">
-      <span class="fa fa-times"></span>&nbsp;<span translate>Close</span>
+      <span class="fas fa-times"></span>&nbsp;<span translate>Close</span>
     </button>
   </div>
 </modal>

gui/default/syncthing/core/httpErrorDialogView.html

@@ -1,4 +1,4 @@
-<modal id="httpError" status="danger" icon="exclamation-circle" heading="{{'Connection Error' | translate}}" large="no" closeable="no">
+<modal id="httpError" status="danger" icon="fas fa-exclamation-circle" heading="{{'Connection Error' | translate}}" large="no" closeable="no">
   <div class="modal-body">
     <p translate>
       Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.

gui/default/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="false"><span class="fa fa-globe"></span><span class="hidden-xs">&nbsp;{{localesNames[currentLocale] || "English"}}</span> <span class="caret"></span></a>'+
+                    '<a ng-if="visible" href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><span class="fas fa-globe"></span><span class="hidden-xs">&nbsp;{{localesNames[currentLocale] || "English"}}</span> <span class="caret"></span></a>'+
                     '<ul ng-if="visible" class="dropdown-menu">'+
                         '<li ng-repeat="name in localesNamesInvKeys" ng-class="{active: localesNamesInv[name]==currentLocale}">'+
                             '<a href="#" data-ng-click="changeLanguage(localesNamesInv[name])">{{name}}</a>'+

gui/default/syncthing/core/localeNumberFilter.js

@@ -1,9 +1,6 @@
 angular.module('syncthing.core')
     .filter('localeNumber', function () {
-        return function (input, decimals) {
-            if (typeof(decimals) !== 'undefined') {
-                return input.toLocaleString(undefined, {maximumFractionDigits: decimals});
-            }
+        return function (input) {
             return input.toLocaleString();
         };
-    });
+    });

gui/default/syncthing/core/logViewerModalView.html

@@ -1,4 +1,4 @@
-<modal id="logViewer" icon="book" status="default" heading="{{'Logs' | translate}}" large="yes" closeable="yes">
+<modal id="logViewer" status="default" icon="far fa-file-alt" heading="{{'Logs' | translate}}" large="yes" closeable="yes">
   <div class="modal-body">
     <ul class="nav nav-tabs">
       <li class="active"><a data-toggle="tab" href="#log-viewer-log" translate>Log</a></li>
@@ -8,8 +8,8 @@
 
       <div id="log-viewer-log" class="tab-pane in active">
         <label translate ng-if="logging.logEntries.length == 0">Loading...</label>
-        <textarea ng-focus="logging.paused = true" ng-blur="logging.paused = false" id="logViewerText" class="form-control" rows="20" ng-if="logging.logEntries.length != 0" readonly style="font-family: Consolas; font-size: 11px; overflow: auto;">{{ logging.content() }}</textarea>
-        <p translate class="help-block" ng-style="{'visibility': logging.paused ? 'visible' : 'hidden'}">Log tailing paused. Click here to continue.</p>
+        <textarea id="logViewerText" class="form-control" rows="20" ng-if="logging.logEntries.length != 0" readonly style="font-family: Consolas; font-size: 11px; overflow: auto;">{{ logging.content() }}</textarea>
+        <p translate class="help-block" ng-style="{'visibility': logging.paused ? 'visible' : 'hidden'}">Log tailing paused. Scroll to bottom continue.</p>
       </div>
 
       <div id="log-viewer-facilities" class="tab-pane">
@@ -30,7 +30,7 @@
   </div>
   <div class="modal-footer">
     <button type="button" class="btn btn-default btn-sm" data-dismiss="modal">
-      <span class="fa fa-times"></span>&nbsp;<span translate>Close</span>
+      <span class="fas fa-times"></span>&nbsp;<span translate>Close</span>
     </button>
   </div>
 </modal>

gui/default/syncthing/core/majorUpgradeModalView.html

@@ -1,4 +1,4 @@
-<modal id="majorUpgrade" status="danger" icon="arrow-circle-up" heading="{{'Major Upgrade' | translate}}" large="no" closeable="yes">
+<modal id="majorUpgrade" status="danger" icon="fas fa-arrow-circle-up" heading="{{'Major Upgrade' | translate}}" large="no" closeable="yes">
   <div class="modal-body">
     <p>
       <span translate>This is a major version upgrade.</span>
@@ -11,10 +11,10 @@
   </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>
+      <span class="fas 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>
+      <span class="fas fa-times"></span>&nbsp;<span translate>Close</span>
     </button>
   </div>
 </modal>

gui/default/syncthing/core/metricFilter.js

@@ -1,21 +1,6 @@
 angular.module('syncthing.core')
     .filter('metric', function () {
         return function (input) {
-            if (input === undefined || isNaN(input)) {
-                return '0 ';
-            }
-            if (input > 1000 * 1000 * 1000) {
-                input /= 1000 * 1000 * 1000;
-                return input.toLocaleString(undefined, {maximumFractionDigits: 2}) + ' G';
-            }
-            if (input > 1000 * 1000) {
-                input /= 1000 * 1000;
-                return input.toLocaleString(undefined, {maximumFractionDigits: 2}) + ' M';
-            }
-            if (input > 1000) {
-                input /= 1000;
-                return input.toLocaleString(undefined, {maximumFractionDigits: 2}) + ' k';
-            }
-            return Math.round(input).toLocaleString(undefined, {maximumFractionDigits: 2}) + ' ';
+            return unitPrefixed(input, false);
         };
     });

gui/default/syncthing/core/networkErrorDialogView.html

@@ -1,4 +1,4 @@
-<modal id="networkError" status="danger" icon="exclamation-circle" heading="{{'Connection Error' | translate}}" large="no" closeable="no">
+<modal id="networkError" status="danger" icon="fas fa-exclamation-circle" heading="{{'Connection Error' | translate}}" large="no" closeable="no">
   <div class="modal-body">
     <p translate>
       Syncthing seems to be down, or there is a problem with your Internet connection. Retrying&hellip;

gui/default/syncthing/core/notifications.html

@@ -1,13 +1,13 @@
 <!--
 <notification id='exampleNotification'>
   <div class="panel panel-warning">
-    <div class="panel-heading"><h3 class="panel-title"><span class="fa fa-exclamation-circle"></span><span translate>Notice</span></h3></div>
+    <div class="panel-heading"><h3 class="panel-title"><span class="fas fa-exclamation-circle"></span><span translate>Notice</span></h3></div>
     <div class="panel-body">
       <p translate>This is an example notification. ID of the notification should be appended to Options.UnackedNotificationIDs of the config.</p>
     </div>
     <div class="panel-footer">
       <button type="button" class="btn btn-sm btn-default pull-right" ng-click="dismissNotification('exampleNotification')">
-        <span class="fa fa-check"></span>&nbsp;<span translate>OK</span>
+        <span class="fas fa-check"></span>&nbsp;<span translate>OK</span>
       </button>
       <div class="clearfix"></div>
     </div>
@@ -18,7 +18,7 @@
 <notification id="channelNotification">
   <div class="panel panel-success">
     <div class="panel-heading">
-      <h3 class="panel-title"><span class="fa fa-flash"></span>&nbsp;<span translate>Automatic upgrades</span></h3>
+      <h3 class="panel-title"><span class="fas fa-bolt"></span>&nbsp;<span translate>Automatic upgrades</span></h3>
     </div>
     <div class="panel-body">
       <p translate>Automatic upgrade now offers the choice between stable releases and release candidates.</p>
@@ -28,14 +28,14 @@
       <span translate>You can read more about the two release channels at the link below.</span>
       </p>
       <p translate>You can change your choice at any time in the Settings dialog.</p>
-      <p><a href="https://docs.syncthing.net/users/releases.html"><span class="fa fa-fw fa-book"></span>&nbsp;<span translate>Learn more</span></a></p>
+      <p><a href="https://docs.syncthing.net/users/releases.html"><span class="fas fa-info-circle"></span>&nbsp;<span translate>Learn more</span></a></p>
     </div>
     <div class="panel-footer">
       <button type="button" class="btn btn-sm btn-default pull-right" ng-click="editSettings(); dismissNotification('channelNotification')">
-        <span class="fa fa-cog"></span>&nbsp;<span translate>Settings</span>
+        <span class="fas fa-cog"></span>&nbsp;<span translate>Settings</span>
       </button>
       <button type="button" class="btn btn-sm btn-default" ng-click="dismissNotification('channelNotification')">
-        <span class="fa fa-check"></span>&nbsp;<span translate>OK</span>
+        <span class="fas fa-check"></span>&nbsp;<span translate>OK</span>
       </button>
       <div class="clearfix"></div>
     </div>
@@ -45,11 +45,11 @@
 <notification id="fsWatcherNotification">
   <div class="panel panel-success">
     <div class="panel-heading">
-      <h3 class="panel-title"><span class="fa fa-flash"></span>&ensp;<span translate>Watching for Changes</span></h3>
+      <h3 class="panel-title"><span class="fas fa-bolt"></span>&ensp;<span translate>Watching for Changes</span></h3>
     </div>
     <div class="panel-body">
       <p translate>Continuously watching for changes is now available within Syncthing. This will detect changes on disk and issue a scan on only the modified paths. The benefits are that changes are propagated quicker and that less full scans are required.</p>
-      <p><a href="https://docs.syncthing.net/users/syncing.html#scanning"><span class="fa fa-fw fa-book"></span>&nbsp;<span translate>Learn more</span></a></p>
+      <p><a href="https://docs.syncthing.net/users/syncing.html#scanning"><span class="fas fa-info-circle"></span>&nbsp;<span translate>Learn more</span></a></p>
       <p>
         <span translate>Do you want to enable watching for changes for all your folders?</span><br/>
         <span translate>Additionally the full rescan interval will be increased (times 60, i.e. new default of 1h). You can also configure it manually for every folder later after choosing No.</span>
@@ -59,10 +59,10 @@
     <div class="panel-footer clearfix">
       <div class="pull-right">
         <button type="button" class="btn btn-primary btn-sm" ng-click="activateAllFsWatchers(); dismissNotification('fsWatcherNotification')">
-          <span class="fa fa-check"></span>&nbsp;<span translate>Yes</span>
+          <span class="fas fa-check"></span>&nbsp;<span translate>Yes</span>
         </button>
         <button type="button" class="btn btn-default btn-sm" ng-click="dismissNotification('fsWatcherNotification')">
-          <span class="fa fa-times"></span>&nbsp;<span translate>No</span>
+          <span class="fas fa-times"></span>&nbsp;<span translate>No</span>
         </button>
       </div>
       <div class="clearfix"></div>

gui/default/syncthing/core/percentFilter.js

@@ -0,0 +1,15 @@
+angular.module('syncthing.core')
+    .filter('percent', function () {
+        return function (input) {
+            // Prevent 0.00%
+            if (input === undefined || input < 0.01) {
+                return 0 + '%';
+            }
+            // Hard limit at two decimals
+            if (input < 0.1) {
+                return input.toLocaleString(undefined, {maximumFractionDigits: 2}) + '%';
+            }
+            // "Soft" limit at two significant digits (e.g. 1.2%, not 1.27%)
+            return input.toLocaleString(undefined, {maximumSignificantDigits: 2}) + '%';
+        };
+    });

gui/default/syncthing/core/restartingDialogView.html

@@ -1,4 +1,4 @@
-<modal id="restarting" status="info" icon="refresh" heading="{{'Restarting' | translate}}" large="no" closeable="no">
+<modal id="restarting" status="info" icon="fas fa-hourglass-half" heading="{{'Restarting' | translate}}" large="no" closeable="no">
   <div class="modal-body">
     <p>
       <span translate>Syncthing is restarting.</span>

gui/default/syncthing/core/shutdownDialogView.html

@@ -1,4 +1,4 @@
-<modal id="shutdown" status="success" icon="power-off" heading="{{'Shutdown Complete' | translate}}" large="no" closeable="no">
+<modal id="shutdown" status="success" icon="fas fa-power-off" heading="{{'Shutdown Complete' | translate}}" large="no" closeable="no">
   <div class="modal-body">
     <p translate>
       Syncthing has been shut down.

gui/default/syncthing/core/syncthingController.js

@@ -62,7 +62,7 @@ angular.module('syncthing.core')
 
         $scope.folderDefaults = {
             selectedDevices: {},
-            type: "readwrite",
+            type: "sendreceive",
             rescanIntervalS: 3600,
             fsWatcherDelayS: 10,
             fsWatcherEnabled: true,
@@ -102,10 +102,10 @@ angular.module('syncthing.core')
             'touch': 'Update'
         };
         $scope.needIcons = {
-            'rm': 'trash-o',
-            'rmdir': 'trash-o',
-            'sync': 'arrow-circle-o-down',
-            'touch': 'asterisk'
+            'rm': 'far fa-fw fa-trash-alt',
+            'rmdir': 'far fa-fw fa-trash-alt',
+            'sync': 'far fa-fw arrow-alt-circle-down',
+            'touch': 'fas fa-fw fa-asterisk'
         };
 
         $scope.$on(Events.ONLINE, function () {
@@ -1097,8 +1097,14 @@ angular.module('syncthing.core')
             show: function() {
                 $scope.logging.refreshFacilities();
                 $scope.logging.timer = $timeout($scope.logging.fetch);
-                $('#logViewer').modal().on('hidden.bs.modal', function () {
+                var textArea = $('#logViewerText');
+                textArea.on("scroll", $scope.logging.onScroll);
+                $('#logViewer').modal().on('shown.bs.modal', function() {
+                    // Scroll to bottom.
+                    textArea.scrollTop(textArea[0].scrollHeight);
+                }).on('hidden.bs.modal', function () {
                     $timeout.cancel($scope.logging.timer);
+                    textArea.off("scroll", $scope.logging.onScroll);
                     $scope.logging.timer = null;
                     $scope.logging.entries = [];
                 });
@@ -1113,6 +1119,14 @@ angular.module('syncthing.core')
                     .success($scope.logging.refreshFacilities)
                     .error($scope.emitHTTPError);
             },
+            onScroll: function() {
+                var textArea = $('#logViewerText');
+                var scrollTop = textArea.prop('scrollTop');
+                var scrollHeight = textArea.prop('scrollHeight');
+                $scope.logging.paused = scrollHeight > (scrollTop + textArea.outerHeight());
+                // Browser events do not cause redraw, trigger manually.
+                $scope.$apply();
+            },
             timer: null,
             entries: [],
             paused: false,
@@ -1125,7 +1139,7 @@ angular.module('syncthing.core')
             },
             fetch: function() {
                 var textArea = $('#logViewerText');
-                if (textArea.is(":focus")) {
+                if ($scope.logging.paused) {
                     if (!$scope.logging.timer) return;
                     $scope.logging.timer = $timeout($scope.logging.fetch, 500);
                     return;
@@ -1139,11 +1153,14 @@ angular.module('syncthing.core')
                 $http.get(urlbase + '/system/log' + (last ? '?since=' + encodeURIComponent(last) : '')).success(function (data) {
                     if (!$scope.logging.timer) return;
                     $scope.logging.timer = $timeout($scope.logging.fetch, 2000);
-                    if (!textArea.is(":focus")) {
+                    if (!$scope.logging.paused) {
                         if (data.messages) {
                             $scope.logging.entries.push.apply($scope.logging.entries, data.messages);
+                            // Wait for the text area to be redrawn, adding new lines, and then scroll to bottom.
+                            $timeout(function() {
+                                textArea.scrollTop(textArea[0].scrollHeight);
+                            });
                         }
-                        textArea.scrollTop(textArea[0].scrollHeight);
                     }
                 });
             }
@@ -1466,6 +1483,16 @@ angular.module('syncthing.core')
             $http.post(urlbase + '/system/error/clear');
         };
 
+        $scope.fsWatcherErrorMap = function () {
+            var errs = {}
+            $.each($scope.folders, function (id, cfg) {
+                if (cfg.fsWatcherEnabled && $scope.model[cfg.id] && $scope.model[id].watchError && !cfg.paused && $scope.folderStatus(cfg) !== 'stopped') {
+                    errs[id] = $scope.model[id].watchError;
+                }
+            });
+            return errs;
+        }
+
         $scope.friendlyDevices = function (str) {
             for (var i = 0; i < $scope.devices.length; i++) {
                 var cfg = $scope.devices[i];
@@ -1506,13 +1533,13 @@ angular.module('syncthing.core')
             $scope.currentFolder.path = pathJoin($scope.config.options.defaultFolderPath, newvalue);
         });
 
-        $scope.$watch('currentFolder.fsWatcherEnabled', function (newvalue) {
-            if (newvalue) {
+        $scope.fsWatcherToggled = function () {
+            if ($scope.currentFolder.fsWatcherEnabled) {
                 $scope.currentFolder.rescanIntervalS = 3600;
             } else {
                 $scope.currentFolder.rescanIntervalS = 60;
             }
-        });
+        };
 
         $scope.loadFormIntoScope = function (form) {
             console.log('loadFormIntoScope',form.$name);
@@ -1548,7 +1575,7 @@ angular.module('syncthing.core')
         $scope.editFolder = function (folderCfg) {
             $scope.editingExisting = true;
             $scope.currentFolder = angular.copy(folderCfg);
-            if ($scope.currentFolder.path.slice(-1) === $scope.system.pathSeparator) {
+            if ($scope.currentFolder.path.length > 1 && $scope.currentFolder.path.slice(-1) === $scope.system.pathSeparator) {
                 $scope.currentFolder.path = $scope.currentFolder.path.slice(0, -1);
             }
             $scope.currentFolder.selectedDevices = {};
@@ -1760,6 +1787,9 @@ angular.module('syncthing.core')
         };
 
         $scope.folderLabel = function (folderID) {
+            if (!$scope.folders[folderID]) {
+                return folderID;
+            }
             var label = $scope.folders[folderID].label;
             return label.length > 0 ? label : folderID;
         }
@@ -2245,6 +2275,9 @@ angular.module('syncthing.core')
         };
 
         $scope.sizeOf = function (dict) {
+            if (dict === undefined) {
+                return 0;
+            }
             return Object.keys(dict).length;
         };
 

gui/default/syncthing/core/upgradingDialogView.html

@@ -1,4 +1,4 @@
-<modal id="upgrading" status="info" icon="arrow-circle-up" heading="{{'Upgrading' | translate}}" large="no" closeable="no">
+<modal id="upgrading" status="info" icon="fas fa-arrow-circle-up" heading="{{'Upgrading' | translate}}" large="no" closeable="no">
   <div class="modal-body">
     <p>
       <span translate>Syncthing is upgrading.</span>

gui/default/syncthing/development/logbar.html

@@ -5,8 +5,8 @@
         <div id="log" class="col-xs-8">
             <span>
                 JS:
-                <span class="dev-error fa fa-exclamation-triangle"> errors <span id="log_error">0</span></span>
-                <span class="dev-warn fa fa-frown-o"> warn <span id="log_warn">0</span></span>
+                <span class="dev-error fas fa-exclamation-triangle"> errors <span id="log_error">0</span></span>
+                <span class="dev-warn far fa-frown"> warn <span id="log_warn">0</span></span>
             </span>
         </div>
     </div>

gui/default/syncthing/device/editDeviceModalView.html

@@ -1,122 +1,156 @@
-<modal id="editDevice" status="default" icon="{{editingExisting ? 'pencil' : 'desktop'}}" heading="{{editingExisting ? 'Edit Device' : 'Add Device' | translate}}" large="yes" closeable="yes">
+<modal id="editDevice" status="default" icon="{{editingExisting ? 'fas fa-pencil-alt' : 'fas fa-desktop'}}" heading="{{editingExisting ? 'Edit Device' : 'Add Device' | translate}}" large="yes" closeable="yes">
   <div class="modal-body">
     <form role="form" name="deviceEditor">
-      <div class="form-group" ng-class="{'has-error': deviceEditor.deviceID.$invalid && deviceEditor.deviceID.$dirty}" ng-init="loadFormIntoScope(deviceEditor)">
-        <label translate for="deviceID">Device ID</label>
-        <div ng-if="!editingExisting">
-          <input name="deviceID" id="deviceID" class="form-control text-monospace" type="text" ng-model="currentDevice.deviceID" required="" valid-deviceid list="discovery-list" aria-required="true"/>
-          <datalist id="discovery-list">
-            <option ng-repeat="id in discovery" value="{{id}}" />
-          </datalist>
-          <p class="help-block" ng-if="discovery">
-            <span translate>You can also select one of these nearby devices:</span>
-            <ul>
-              <li ng-repeat="id in discovery"><a ng-click="currentDevice.deviceID = id">{{id}}</a></li>
-            </ul>
-          </p>
-          <p class="help-block">
-            <span translate ng-if="deviceEditor.deviceID.$valid || deviceEditor.deviceID.$pristine">The device ID to enter here can be found in the "Actions > Show ID" dialog on the other device. Spaces and dashes are optional (ignored).</span>
-            <span translate ng-show="deviceEditor.deviceID.$valid || deviceEditor.deviceID.$pristine">When adding a new device, keep in mind that this device must be added on the other side too.</span>
-            <span translate ng-if="deviceEditor.deviceID.$error.required && deviceEditor.deviceID.$dirty">The device ID cannot be blank.</span>
-            <span translate ng-if="deviceEditor.deviceID.$error.validDeviceid && deviceEditor.deviceID.$dirty">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.</span>
-            <span translate ng-if="deviceEditor.deviceID.$error.unique && deviceEditor.deviceID.$dirty">A device with that ID is already added.</span>
-          </p>
-        </div>
-        <div ng-if="editingExisting" class="well well-sm text-monospace" select-on-click>{{currentDevice.deviceID}}</div>
-      </div>
-      <div class="row">
-        <div class="col-md-6">
+      <ul class="nav nav-tabs" ng-init="loadFormIntoScope(folderEditor)">
+        <li class="active"><a data-toggle="tab" href="#device-general"><span class="fas fa-cog"></span><span translate>General</span></a></li>
+        <li><a data-toggle="tab" href="#device-sharing"><span class="fas fa-share-alt"></span><span translate>Sharing</span></a></li>
+        <li><a data-toggle="tab" href="#device-advanced"><span class="fas fa-cogs"></span><span translate>Advanced</span></a></li>
+      </ul>
+      <div class="tab-content">
+        <div id="device-general" class="tab-pane in active">
+          <div class="form-group" ng-class="{'has-error': deviceEditor.deviceID.$invalid && deviceEditor.deviceID.$dirty}" ng-init="loadFormIntoScope(deviceEditor)">
+            <label translate for="deviceID">Device ID</label>
+            <div ng-if="!editingExisting">
+              <input name="deviceID" id="deviceID" class="form-control text-monospace" type="text" ng-model="currentDevice.deviceID" required="" valid-deviceid list="discovery-list" aria-required="true"/>
+              <datalist id="discovery-list">
+                <option ng-repeat="id in discovery" value="{{id}}"/>
+              </datalist>
+              <p class="help-block" ng-if="discovery">
+                <span translate>You can also select one of these nearby devices:</span>
+                <ul>
+                  <li ng-repeat="id in discovery"><a ng-click="currentDevice.deviceID = id">{{id}}</a></li>
+                </ul>
+              </p>
+              <p class="help-block">
+                <span translate ng-if="deviceEditor.deviceID.$valid || deviceEditor.deviceID.$pristine">The device ID to enter here can be found in the "Actions > Show ID" dialog on the other device. Spaces and dashes are optional (ignored).</span>
+                <span translate ng-show="deviceEditor.deviceID.$valid || deviceEditor.deviceID.$pristine">When adding a new device, keep in mind that this device must be added on the other side too.</span>
+                <span translate ng-if="deviceEditor.deviceID.$error.required && deviceEditor.deviceID.$dirty">The device ID cannot be blank.</span>
+                <span translate ng-if="deviceEditor.deviceID.$error.validDeviceid && deviceEditor.deviceID.$dirty">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.</span>
+                <span translate ng-if="deviceEditor.deviceID.$error.unique && deviceEditor.deviceID.$dirty">A device with that ID is already added.</span>
+              </p>
+            </div>
+            <div ng-if="editingExisting" class="well well-sm text-monospace" select-on-click>{{currentDevice.deviceID}}</div>
+          </div>
           <div class="form-group">
             <label translate for="name">Device Name</label>
-            <input id="name" class="form-control" type="text" ng-model="currentDevice.name" />
+            <input id="name" class="form-control" type="text" ng-model="currentDevice.name"/>
             <p translate ng-if="currentDevice.deviceID == myID" class="help-block">Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.</p>
             <p translate ng-if="currentDevice.deviceID != myID" class="help-block">Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.</p>
           </div>
         </div>
-        <div class="col-md-6">
-          <div class="form-group">
-            <label translate for="addresses">Addresses</label>
-            <input ng-disabled="currentDevice.deviceID == myID" id="addresses" class="form-control" type="text" ng-model="currentDevice._addressesStr"></input>
-            <p translate class="help-block">Enter comma separated  ("tcp://ip:port", "tcp://host:port") addresses or "dynamic" to perform automatic discovery of the address.</p>
-          </div>
-        </div>
-      </div>
-      <div class="row">
-        <div class="col-md-6">
-          <div class="form-group">
-            <label translate>Compression</label>
-            <select class="form-control" ng-model="currentDevice.compression">
-              <option value="always" translate>All Data</option>
-              <option value="metadata" translate>Metadata Only</option>
-              <option value="never" translate>Off</option>
-            </select>
-          </div>
-        </div>
-        <div class="col-md-6">
-        </div>
-      </div>
-      <div class="row">
-        <div class="col-md-6">
-          <div class="form-group">
-            <div class="checkbox">
-              <label>
-                <input type="checkbox" ng-model="currentDevice.introducer">
-                <span translate>Introducer</span>
-                <p translate class="help-block">Add devices from the introducer to our device list, for mutually shared folders.</p>
-              </label>
-            </div>
-          </div>
-        </div>
-        <div class="col-md-6">
-          <div class="form-group">
-            <div class="checkbox">
-              <label>
-                <input type="checkbox" ng-model="currentDevice.autoAcceptFolders">
-                <span translate>Auto Accept</span>
-                <p translate class="help-block">Automatically create or share folders that this device advertises at the default path.</p>
-              </label>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="row">
-        <div class="col-md-12">
-          <div class="form-group">
-            <label translate for="folders">Share Folders With Device</label>
-            <p translate class="help-block">Select the folders to share with this device.</p>
-            <div class="row">
-              <div class="col-md-4" ng-repeat="folder in folderList()">
+        <div class="tab-pane" id="device-sharing">
+          <div class="row">
+            <div class="col-md-6">
+              <div class="form-group">
                 <div class="checkbox">
-                  <label ng-if="folder.label.length == 0">
-                    <input type="checkbox" ng-model="currentDevice.selectedFolders[folder.id]">&nbsp;{{folder.id}}
+                  <label>
+                    <input type="checkbox" ng-model="currentDevice.introducer">
+                    <span translate>Introducer</span>
+                    <p translate class="help-block">Add devices from the introducer to our device list, for mutually shared folders.</p>
                   </label>
-                  <label ng-if="folder.label.length != 0">
-                    <input type="checkbox" ng-model="currentDevice.selectedFolders[folder.id]">&nbsp;<span tooltip data-original-title="{{folder.id}}">{{folder.label}}</span>
+                </div>
+              </div>
+            </div>
+            <div class="col-md-6">
+              <div class="form-group">
+                <div class="checkbox">
+                  <label>
+                    <input type="checkbox" ng-model="currentDevice.autoAcceptFolders">
+                    <span translate>Auto Accept</span>
+                    <p translate class="help-block">Automatically create or share folders that this device advertises at the default path.</p>
                   </label>
                 </div>
               </div>
             </div>
           </div>
+          <div class="row">
+            <div class="col-md-12">
+              <div class="form-group">
+                <label translate for="folders">Share Folders With Device</label>
+                <p translate class="help-block">Select the folders to share with this device.</p>
+                <div class="row">
+                  <div class="col-md-4" ng-repeat="folder in folderList()">
+                    <div class="checkbox">
+                      <label ng-if="folder.label.length == 0">
+                        <input type="checkbox" ng-model="currentDevice.selectedFolders[folder.id]">&nbsp;{{folder.id}}
+                      </label>
+                      <label ng-if="folder.label.length != 0">
+                        <input type="checkbox" ng-model="currentDevice.selectedFolders[folder.id]">&nbsp; <span tooltip data-original-title="{{folder.id}}">{{folder.label}}</span>
+                      </label>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="tab-pane" id="device-advanced">
+          <div class="row form-group">
+            <div class="col-md-6">
+              <div class="form-group">
+                <label translate for="addresses">Addresses</label>
+                <input ng-disabled="currentDevice.deviceID == myID" id="addresses" class="form-control" type="text" ng-model="currentDevice._addressesStr"></input>
+                <p translate class="help-block">Enter comma separated  ("tcp://ip:port", "tcp://host:port") addresses or "dynamic" to perform automatic discovery of the address.</p>
+              </div>
+            </div>
+            <div class="col-md-6">
+              <div class="form-group">
+                <label translate>Compression</label>
+                <select class="form-control" ng-model="currentDevice.compression">
+                  <option value="always" translate>All Data</option>
+                  <option value="metadata" translate>Metadata Only</option>
+                  <option value="never" translate>Off</option>
+                </select>
+              </div>
+            </div>
+          </div>
+          <div class="row form-group">
+            <div class="col-md-12">
+              <label translate>Device rate limits</label>
+              <div class="row">
+                <div class="col-md-6">
+                  <div ng-class="{'has-error': deviceEditor.maxSendKbps.$invalid && deviceEditor.maxSendKbps.$dirty}">
+                    <div class="row">
+                      <span class="col-md-8" translate>Outgoing Rate Limit (KiB/s)</span>
+                      <div class="col-md-4">
+                        <input name="maxSendKbps" id="maxSendKbps" class="form-control" type="number" pattern="\d+" ng-model="currentDevice.maxSendKbps" min="0"/>
+                      </div>
+                    </div>
+                    <p class="help-block" ng-if="!deviceEditor.maxSendKbps.$valid && deviceEditor.maxSendKbps.$dirty" translate>The rate limit must be a non-negative number (0: no limit)</p>
+                  </div>
+                </div>
+                <div class="col-md-6" ng-class="{'has-error': deviceEditor.maxRecvKbps.$invalid && deviceEditor.maxRecvKbps.$dirty}">
+                  <div class="row">
+                    <span class="col-md-8" translate>Outgoing Rate Limit (KiB/s)</span>
+                    <div class="col-md-4">
+                      <input name="maxRecvKbps" id="maxRecvKbps" class="form-control" type="number" pattern="\d+" ng-model="currentDevice.maxRecvKbps" min="0"/>
+                    </div>
+                  </div>
+                  <p class="help-block" ng-if="!deviceEditor.maxRecvKbps.$valid && deviceEditor.maxRecvKbps.$dirty" translate>The rate limit must be a non-negative number (0: no limit)</p>
+                </div>
+              </div>
+            </div>
+          </div>
         </div>
       </div>
     </form>
   </div>
   <div class="modal-footer">
     <button type="button" class="btn btn-primary btn-sm" ng-click="saveDevice()" ng-disabled="deviceEditor.$invalid">
-      <span class="fa fa-check"></span>&nbsp;<span translate>Save</span>
+      <span class="fas fa-check"></span>&nbsp;<span translate>Save</span>
     </button>
     <button type="button" class="btn btn-default btn-sm" data-toggle="modal" data-target="#idqr" ng-if="editingExisting || deviceEditor.deviceID.$valid">
-      <span class="fa fa-qrcode"></span>&nbsp;<span translate>Show QR</span>
+      <span class="fas fa-qrcode"></span>&nbsp;<span translate>Show QR</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>
+      <span class="fas fa-times"></span>&nbsp;<span translate>Close</span>
     </button>
     <div ng-if="editingExisting" class="pull-left">
       <button type="button" class="btn btn-warning btn-sm disabled" ng-if="willBeReintroducedBy" tooltip data-original-title="This device will be reintroduced by {{ willBeReintroducedBy }}">
-        <span class="fa fa-minus-circle"></span>&nbsp;<span translate>Remove</span>
+        <span class="fas fa-minus-circle"></span>&nbsp;<span translate>Remove</span>
       </button>
       <button type="button" class="btn btn-warning btn-sm" data-toggle="modal" data-target="#remove-device-confirmation" ng-if="!willBeReintroducedBy">
-        <span class="fa fa-minus-circle"></span>&nbsp;<span translate>Remove</span>
+        <span class="fas fa-minus-circle"></span>&nbsp;<span translate>Remove</span>
       </button>
     </div>
   </div>

gui/default/syncthing/device/globalChangesModalView.html

@@ -1,5 +1,5 @@
 <style> th, td { padding: 6px; } </style>
-<modal id="globalChanges" status="default" icon="{{'info-circle'}}" heading="{{'Recent Changes' | translate}}" large="yes" closeable="yes">
+<modal id="globalChanges" status="default" icon="fas fa-info-circle" heading="{{'Recent Changes' | translate}}" large="yes" closeable="yes">
     <div class="modal-body">
       <div class="table-responsive">
         <table class="table-condensed table-striped table" style="table-layout: auto;">
@@ -29,7 +29,7 @@
     </div>
     <div class="modal-footer">
         <button type="button" class="btn btn-default btn-sm" data-dismiss="modal">
-        <span class="fa fa-times"></span>&nbsp;<span translate>Close</span>
+        <span class="fas fa-times"></span>&nbsp;<span translate>Close</span>
         </button>
     </div>
 </modal>

gui/default/syncthing/device/idqrModalView.html

@@ -1,11 +1,11 @@
-<modal id="idqr" status="info" icon="qrcode" heading="{{'Device Identification' | translate}} - {{deviceName(currentDevice)}}" large="yes" closeable="yes">
+<modal id="idqr" status="info" icon="fas fa-qrcode" heading="{{'Device Identification' | translate}} - {{deviceName(currentDevice)}}" large="yes" closeable="yes">
   <div class="modal-body">
     <div class="well well-sm text-monospace text-center" select-on-click>{{currentDevice.deviceID}}</div>
     <img ng-if="currentDevice.deviceID" class="center-block img-thumbnail" ng-src="qr/?text={{currentDevice.deviceID}}" alt="qr code"/>
   </div>
   <div class="modal-footer">
     <button type="button" class="btn btn-default btn-sm" data-dismiss="modal">
-      <span class="fa fa-times"></span>&nbsp;<span translate>Close</span>
+      <span class="fas fa-times"></span>&nbsp;<span translate>Close</span>
     </button>
   </div>
 </modal>

gui/default/syncthing/device/removeDeviceDialogView.html

@@ -1,4 +1,4 @@
-<modal id="remove-device-confirmation" status="warning" icon="exclamation-circle" heading="{{'Remove Device' | translate}}" large="no" closeable="yes">
+<modal id="remove-device-confirmation" status="warning" icon="fas fa-question-circle" heading="{{'Remove Device' | translate}}" large="no" closeable="yes">
   <div class="modal-body">
     <p ng-model="currentDevice.name" style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">
       <span translate translate-value-name="{{currentDevice.name}}">Are you sure you want to remove device {%name%}?</span>
@@ -6,10 +6,10 @@
   </div>
   <div class="modal-footer">
     <button type="button" class="btn btn-warning pull-left btn-sm" data-dismiss="modal" ng-click="deleteDevice()">
-      <span class="fa fa-minus-circle"></span>&nbsp;<span translate>Yes</span>
+      <span class="fas fa-check"></span>&nbsp;<span translate>Yes</span>
     </button>
     <button type="button" class="btn btn-default btn-sm" data-dismiss="modal">
-      <span class="fa fa-times"></span>&nbsp;<span translate>No</span>
+      <span class="fas fa-times"></span>&nbsp;<span translate>No</span>
     </button>
   </div>
 </modal>

gui/default/syncthing/folder/editFolderModalView.html

@@ -1,11 +1,11 @@
-<modal id="editFolder" status="default" icon="{{editingExisting ? 'pencil' : 'folder'}}" heading="{{editingExisting ? 'Edit Folder' : 'Add Folder' | translate}}" large="yes" closeable="yes">
+<modal id="editFolder" status="default" icon="{{editingExisting ? 'fas fa-pencil-alt' : 'fas fa-folder'}}" heading="{{editingExisting ? 'Edit Folder' : 'Add Folder' | translate}}" large="yes" closeable="yes">
   <div class="modal-body">
     <form role="form" name="folderEditor">
       <ul class="nav nav-tabs" ng-init="loadFormIntoScope(folderEditor)">
-        <li class="active"><a data-toggle="tab" href="#folder-general" translate>General</a></li>
-        <li><a data-toggle="tab" href="#folder-versioning" translate>File Versioning</a></li>
-        <li><a data-toggle="tab" href="#folder-ignores" translate>Ignore Patterns</a></li>
-        <li><a data-toggle="tab" href="#folder-advanced" translate>Advanced</a></li>
+        <li class="active"><a data-toggle="tab" href="#folder-general"><span class="fas fa-cog"></span> <span translate>General</span></a></li>
+        <li><a data-toggle="tab" href="#folder-versioning"><span class="fas fa-copy"></span> <span translate>File Versioning</span></a></li>
+        <li><a data-toggle="tab" href="#folder-ignores"><span class="fas fa-filter"></span> <span translate>Ignore Patterns</span></a></li>
+        <li><a data-toggle="tab" href="#folder-advanced"><span class="fas fa-cogs"></span> <span translate>Advanced</span></a></li>
       </ul>
       <div class="tab-content">
         <div id="folder-general" class="tab-pane in active">
@@ -57,7 +57,7 @@
         </div>
         <div id="folder-versioning" class="tab-pane">
           <div class="form-group">
-            <label translate>File Versioning</label>&emsp;<a href="https://docs.syncthing.net/users/versioning.html" target="_blank"><span class="fa fa-book"></span>&nbsp;<span translate>Help</span></a>
+            <label translate>File Versioning</label>&emsp;<a href="https://docs.syncthing.net/users/versioning.html" target="_blank"><span class="fas fa-question-circle"></span>&nbsp;<span translate>Help</span></a>
             <select class="form-control" ng-model="currentFolder.fileVersioningSelector">
               <option value="none" translate>No File Versioning</option>
               <option value="trashcan" translate>Trash Can File Versioning</option>
@@ -136,10 +136,10 @@
           <div class="row form-group" ng-class="{'has-error': folderEditor.rescanIntervalS.$invalid && folderEditor.rescanIntervalS.$dirty}">
             <div class="col-md-12">
               <label translate>Scanning</label>
-              &nbsp;<a href="https://docs.syncthing.net/users/syncing.html#scanning" target="_blank"><span class="fa fa-book"></span>&nbsp;<span translate>Help</span></a></br>
+              &nbsp;<a href="https://docs.syncthing.net/users/syncing.html#scanning" target="_blank"><span class="fas fa-question-circle"></span>&nbsp;<span translate>Help</span></a></br>
               <div class="row">
                 <div class="col-md-6">
-                  <input type="checkbox" ng-model="currentFolder.fsWatcherEnabled" tooltip data-original-title="{{'Use notifications from the filesystem to detect changed items.' | translate }}">&nbsp;<span translate>Watch for Changes</span>
+                  <input type="checkbox" ng-model="currentFolder.fsWatcherEnabled" ng-change="fsWatcherToggled()" tooltip data-original-title="{{'Use notifications from the filesystem to detect changed items.' | translate }}">&nbsp;<span translate>Watch for Changes</span>
                 </div>
                 <div class="col-md-6">
                   <div class="row">
@@ -158,12 +158,12 @@
           <div class="row">
             <div class="col-md-6 form-group">
               <label translate>Folder Type</label>
-              &nbsp;<a href="https://docs.syncthing.net/users/foldertypes.html" target="_blank"><span class="fa fa-book"></span>&nbsp;<span translate>Help</span></a>
+              &nbsp;<a href="https://docs.syncthing.net/users/foldertypes.html" target="_blank"><span class="fas fa-question-circle"></span>&nbsp;<span translate>Help</span></a>
               <select class="form-control" ng-model="currentFolder.type">
-                <option value="readwrite" translate>Send &amp; Receive</option>
-                <option value="readonly" translate>Send Only</option>
+                <option value="sendreceive" translate>Send &amp; Receive</option>
+                <option value="sendonly" translate>Send Only</option>
               </select>
-              <p ng-if="currentFolder.type == 'readonly'" translate class="help-block">Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.</p>
+              <p ng-if="currentFolder.type == 'sendonly'" translate class="help-block">Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.</p>
             </div>
             <div class="col-md-6 form-group">
               <label translate>File Pull Order</label>
@@ -202,11 +202,9 @@
               <label translate>Permissions</label><br/>
               <input type="checkbox" ng-model="currentFolder.ignorePerms"/> <span translate>Ignore</span>
               <p translate class="help-block">File permission bits are ignored when looking for changes. Use on FAT file systems.</p>
-                </select></div>
-                <p class="col-xs-12 help-block" ng-show="folderEditor.minDiskFree.$invalid">
-                  <span translate>Enter a non-negative number (e.g., "2.35") and select a unit. Percentages are as part of the total disk size.</span>
-                </p>
-              </div>
+              <p class="col-xs-12 help-block" ng-show="folderEditor.minDiskFree.$invalid">
+                <span translate>Enter a non-negative number (e.g., "2.35") and select a unit. Percentages are as part of the total disk size.</span>
+              </p>
             </div>
           </div>
         </div>
@@ -215,13 +213,13 @@
   </div>
   <div class="modal-footer">
     <button type="button" class="btn btn-primary btn-sm" ng-click="saveFolder()" ng-disabled="folderEditor.$invalid">
-      <span class="fa fa-check"></span>&nbsp;<span translate>Save</span>
+      <span class="fas fa-check"></span>&nbsp;<span translate>Save</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>
+      <span class="fas fa-times"></span>&nbsp;<span translate>Close</span>
     </button>
     <button type="button" class="btn btn-warning pull-left btn-sm" data-toggle="modal" data-target="#remove-folder-confirmation" ng-if="editingExisting">
-      <span class="fa fa-minus-circle"></span>&nbsp;<span translate>Remove</span>
+      <span class="fas fa-minus-circle"></span>&nbsp;<span translate>Remove</span>
     </button>
   </div>
 </modal>

gui/default/syncthing/folder/removeFolderDialogView.html

@@ -1,4 +1,4 @@
-<modal id="remove-folder-confirmation" status="warning" icon="exclamation-circle" heading="{{'Remove Folder' | translate}}" large="no" closeable="yes">
+<modal id="remove-folder-confirmation" status="warning" icon="fas fa-question-circle" heading="{{'Remove Folder' | translate}}" large="no" closeable="yes">
   <div class="modal-body">
     <p style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">
       <span translate translate-value-label="{{currentFolder.label}}">Are you sure you want to remove folder {%label%}?</span>
@@ -9,10 +9,10 @@
   </div>
   <div class="modal-footer">
     <button type="button" class="btn btn-warning pull-left btn-sm" data-dismiss="modal" ng-click="deleteFolder(currentFolder.id)">
-      <span class="fa fa-minus-circle"></span>&nbsp;<span translate>Yes</span>
+      <span class="fas fa-check"></span>&nbsp;<span translate>Yes</span>
     </button>
     <button type="button" class="btn btn-default btn-sm" data-dismiss="modal">
-      <span class="fa fa-times"></span>&nbsp;<span translate>No</span>
+      <span class="fas fa-times"></span>&nbsp;<span translate>No</span>
     </button>
   </div>
 </modal>

gui/default/syncthing/folder/restoreVersionsConfirmation.html

@@ -1,4 +1,4 @@
-<modal id="restore-versions-confirmation" status="warning" icon="exclamation-circle" heading="{{'Restore Versions' | translate}}" large="no" closeable="yes">
+<modal id="restore-versions-confirmation" status="warning" icon="fas fa-question-circle" heading="{{'Restore Versions' | translate}}" large="no" closeable="yes">
   <div class="modal-body">
     <p style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">
       <span translate-value-count="{{restoreVersions.selectionCount()}}" translate>Are you sure you want to restore {%count%} files?</span>
@@ -6,10 +6,10 @@
   </div>
   <div class="modal-footer">
     <button type="button" class="btn btn-warning pull-left btn-sm" data-dismiss="modal" ng-click="restoreVersions.restore()">
-      <span class="fa fa-check"></span>&nbsp;<span translate>Yes</span>
+      <span class="fas fa-check"></span>&nbsp;<span translate>Yes</span>
     </button>
     <button type="button" class="btn btn-default btn-sm" data-dismiss="modal">
-      <span class="fa fa-times"></span>&nbsp;<span translate>No</span>
+      <span class="fas fa-times"></span>&nbsp;<span translate>No</span>
     </button>
   </div>
 </modal>

gui/default/syncthing/folder/restoreVersionsModalView.html

@@ -1,4 +1,4 @@
-<modal id="restoreVersions" status="default" heading="{{'Restore Versions' | translate}}" large="yes" closeable="yes">
+<modal id="restoreVersions" status="default" icon="fas fa-undo" heading="{{'Restore Versions' | translate}}" large="yes" closeable="yes">
   <div class="modal-body">
     <span translate ng-if="!restoreVersions.versions && !restoreVersions.errors">Loading data...</span>
     <div ng-if="restoreVersions.versions">
@@ -42,10 +42,10 @@
   </div>
   <div class="modal-footer">
     <button type="button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#restore-versions-confirmation" ng-if="restoreVersions.versions" ng-disabled="restoreVersions.selectionCount() < 1">
-      <span class="fa fa-check"></span>&nbsp;<span translate>Restore</span>
+      <span class="fas fa-check"></span>&nbsp;<span translate>Restore</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>
+      <span class="fas fa-times"></span>&nbsp;<span translate>Close</span>
     </button>
   </div>
 </modal>

gui/default/syncthing/settings/advancedSettingsModalView.html

@@ -1,4 +1,4 @@
-<modal id="advanced" status="danger" icon="cog" heading="{{'Advanced Configuration' | translate}}" large="yes" closeable="yes">
+<modal id="advanced" status="danger" icon="fas fa-cogs" heading="{{'Advanced Configuration' | translate}}" large="yes" closeable="yes">
   <div class="modal-body">
 
     <p class="text-danger">
@@ -94,10 +94,10 @@
 
     <div class="modal-footer">
       <button type="button" class="btn btn-primary btn-sm" ng-click="saveAdvanced()">
-        <span class="fa fa-check"></span>&nbsp;<span translate>Save</span>
+        <span class="fas fa-check"></span>&nbsp;<span translate>Save</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>
+        <span class="fas fa-times"></span>&nbsp;<span translate>Close</span>
       </button>
     </div>
 

gui/default/syncthing/settings/settingsModalView.html

@@ -1,4 +1,4 @@
-<modal id="settings" status="default" icon="cog" heading="{{'Settings' | translate}}" large="yes" closeable="yes">
+<modal id="settings" status="default" icon="fas fa-cog" heading="{{'Settings' | translate}}" large="yes" closeable="yes">
   <div class="modal-body">
     <form role="form" name="settingsEditor">
       <ul class="nav nav-tabs">
@@ -40,7 +40,7 @@
                   <input type="text" readonly class="text-monospace form-control" value="{{tmpGUI.apiKey || '-'}}"/>
                   <span class="input-group-btn">
                     <button type="button" class="btn btn-default btn-secondary" ng-click="setAPIKey(tmpGUI)">
-                      <span class="fa fa-repeat"></span>&nbsp;<span translate>Generate</span>
+                      <span class="fas fa-redo"></span>&nbsp;<span translate>Generate</span>
                     </button>
                   </span>
                 </div>
@@ -67,7 +67,7 @@
             </div>
             <div class="col-md-6">
               <div class="form-group">
-                <label translate>Automatic upgrades</label>&emsp;<a href="https://docs.syncthing.net/users/releases.html" target="_blank"><span class="fa fa-fw fa-book"></span>&nbsp;<span translate>Help</span></a>
+                <label translate>Automatic upgrades</label>&emsp;<a href="https://docs.syncthing.net/users/releases.html" target="_blank"><span class="fas fa-question-circle"></span>&nbsp;<span translate>Help</span></a>
                 <select class="form-control" ng-model="tmpOptions.upgrades" ng-if="upgradeInfo">
                   <option value="none" translate>No upgrades</option>
                   <option value="stable" translate>Stable releases only</option>
@@ -92,7 +92,7 @@
 
         <div id="settings-gui" class="tab-pane">
           <div class="form-group"  ng-class="{'has-error': settingsEditor.Address.$invalid && settingsEditor.Address.$dirty}">
-            <label translate for="Address">GUI Listen Address</label>&emsp;<a href="https://docs.syncthing.net/users/guilisten.html" target="_blank"><span class="fa fa-fw fa-book"></span>&nbsp;<span translate>Help</span></a>
+            <label translate for="Address">GUI Listen Address</label>&emsp;<a href="https://docs.syncthing.net/users/guilisten.html" target="_blank"><span class="fas fa-question-circle"></span>&nbsp;<span translate>Help</span></a>
             <input id="Address" name="Address" class="form-control" type="text" ng-model="tmpGUI.address" ng-pattern="/.*:0*((102[4-9])|(10[3-9][0-9])|(1[1-9][0-9][0-9])|([2-9][0-9][0-9][0-9])|([1-6]\d{4}))$/"/>
               <p class="help-block" ng-show="settingsEditor.Address.$invalid" translate>
                 Enter a non-privileged port number (1024 - 65535).
@@ -153,7 +153,7 @@
 
         <div id="settings-connections" class="tab-pane">
           <div class="form-group">
-            <label translate for="ListenAddressesStr">Sync Protocol Listen Addresses</label>&emsp;<a href="https://docs.syncthing.net/users/config.html#listen-addresses" target="_blank"><span class="fa fa-fw fa-book"></span>&nbsp;<span translate>Help</span></a>
+            <label translate for="ListenAddressesStr">Sync Protocol Listen Addresses</label>&emsp;<a href="https://docs.syncthing.net/users/config.html#listen-addresses" target="_blank"><span class="fas fa-question-circle"></span>&nbsp;<span translate>Help</span></a>
             <input id="ListenAddressesStr" class="form-control" type="text" ng-model="tmpOptions._listenAddressesStr"/>
           </div>
           <div class="row">
@@ -234,10 +234,10 @@
 
   <div class="modal-footer">
     <button type="button" class="btn btn-primary btn-sm" ng-click="saveSettings()">
-      <span class="fa fa-check"></span>&nbsp;<span translate>Save</span>
+      <span class="fas fa-check"></span>&nbsp;<span translate>Save</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>
+      <span class="fas fa-times"></span>&nbsp;<span translate>Close</span>
     </button>
   </div>
 

gui/default/syncthing/transfer/failedFilesModalView.html

@@ -1,4 +1,4 @@
-<modal id="failed" status="warning" icon="exclamation-circle" heading="{{'Failed Items' | translate}}" large="yes" closeable="yes">
+<modal id="failed" status="warning" icon="fas fa-exclamation-circle" heading="{{'Failed Items' | translate}}" large="yes" closeable="yes">
   <div class="modal-body">
     <p>
       <span translate>The following items could not be synchronized.</span>
@@ -20,7 +20,7 @@
   </div>
   <div class="modal-footer">
     <button type="button" class="btn btn-default btn-sm" data-dismiss="modal">
-      <span class="fa fa-times"></span>&nbsp;<span translate>Close</span>
+      <span class="fas fa-times"></span>&nbsp;<span translate>Close</span>
     </button>
   </div>
 </modal>

gui/default/syncthing/transfer/neededFilesModalView.html

@@ -1,4 +1,4 @@
-<modal id="needed" status="info" icon="cloud-download" heading="{{'Out of Sync Items' | translate}}" large="yes" closeable="yes">
+<modal id="needed" status="info" icon="fas fa-cloud-download-alt" heading="{{'Out of Sync Items' | translate}}" large="yes" closeable="yes">
 
   <div class="modal-body">
   
@@ -18,7 +18,7 @@
 
         <!-- Icon -->
         <td class="small-data col-xs-2">
-          <span class="fa fa-fw fa-{{needIcons[f.action]}}"></span> {{needActions[f.action]}}
+          <span class="{{needIcons[f.action]}}"></span> {{needActions[f.action]}}
         </td>
 
         <!-- Name -->
@@ -28,7 +28,7 @@
           </span>
           <span ng-if="f.type == 'queued'">
             <a href="" ng-click="bumpFile(neededFolder, f.name)" tooltip data-original-title="{{'Move to top of queue' | translate}}">
-              <span class="fa fa-eject"></span>
+              <span class="fas fa-eject"></span>
             </a>
             <span tooltip data-original-title="{{f.name}}">&nbsp;{{f.name | basename}}</span>
           </span>
@@ -38,11 +38,11 @@
         <td class="col-xs-4">
           <div ng-if="f.type == 'progress' && f.action == 'sync' && progress[neededFolder] && progress[neededFolder][f.name]">
             <div class="progress">
-              <div class="progress-bar progress-bar-success" style="width: {{progress[neededFolder][f.name].reused}}%"></div>
-              <div class="progress-bar" style="width: {{progress[neededFolder][f.name].copiedFromOrigin}}%"></div>
-              <div class="progress-bar progress-bar-info" style="width: {{progress[neededFolder][f.name].copiedFromElsewhere}}%"></div>
-              <div class="progress-bar progress-bar-warning" style="width: {{progress[neededFolder][f.name].pulled}}%"></div>
-              <div class="progress-bar progress-bar-danger progress-bar-striped active" style="width: {{progress[neededFolder][f.name].pulling}}%"></div>
+              <div class="progress-bar progress-bar-success" style="width: {{progress[neededFolder][f.name].reused | percent}}"></div>
+              <div class="progress-bar" style="width: {{progress[neededFolder][f.name].copiedFromOrigin | percent}}"></div>
+              <div class="progress-bar progress-bar-info" style="width: {{progress[neededFolder][f.name].copiedFromElsewhere | percent}}"></div>
+              <div class="progress-bar progress-bar-warning" style="width: {{progress[neededFolder][f.name].pulled | percent}}"></div>
+              <div class="progress-bar progress-bar-danger progress-bar-striped active" style="width: {{progress[neededFolder][f.name].pulling | percent}}"></div>
               <span class="show frontal">
                 {{progress[neededFolder][f.name].bytesDone | binary}}B / {{progress[neededFolder][f.name].bytesTotal | binary}}B
               </span>
@@ -67,7 +67,7 @@
 
   <div class="modal-footer">
     <button type="button" class="btn btn-default btn-sm" data-dismiss="modal">
-      <span class="fa fa-times"></span>&nbsp;<span translate>Close</span>
+      <span class="fas fa-times"></span>&nbsp;<span translate>Close</span>
     </button>
   </div>
 

gui/default/syncthing/transfer/remoteNeededFilesModalView.html

@@ -1,4 +1,4 @@
-<modal id="remoteNeed" status="info" icon="exchange" heading="{{'Out of Sync Items' | translate}} - {{deviceName(remoteNeedDevice)}}" large="yes" closeable="yes">
+<modal id="remoteNeed" status="info" icon="fas fa-exchange-alt" heading="{{'Out of Sync Items' | translate}} - {{deviceName(remoteNeedDevice)}}" large="yes" closeable="yes">
   <div class="modal-body">
     <div ng-if="sizeOf(remoteNeed) == 0">
       <span translate>Loading data...</span>

gui/default/syncthing/usagereport/usageReportModalView.html

@@ -1,4 +1,4 @@
-<modal id="ur" status="info" icon="bar-chart" heading="{{'Allow Anonymous Usage Reporting?' | translate}}" large="yes" closeable="no">
+<modal id="ur" status="info" icon="fas fa-question-circle" heading="{{'Allow Anonymous Usage Reporting?' | translate}}" large="yes" closeable="no">
   <div class="modal-body">
     <div ng-if="config.options.urAccepted > 0 && config.options.urAccepted < system.urVersionMax">
       <p translate>Anonymous usage report format has changed. Would you like to move to the new format?</p>
@@ -9,16 +9,16 @@
       <p><a href="https://data.syncthing.net/" target="_blank">https://data.syncthing.net/</a></p>
     </div>
     <button type="button" class="btn btn-default btn-sm" ng-click="showReportPreview()" ng-show="!reportPreview">
-      <span class="fa fa-file-text-o"></span>&nbsp;<span translate>Preview Usage Report</span>
+      <span class="far fa-file-alt"></span>&nbsp;<span translate>Preview Usage Report</span>
     </button>
     <pre ng-if="reportPreview"><small>{{reportData | json}}</small></pre>
   </div>
   <div class="modal-footer">
     <button type="button" class="btn btn-success btn-sm" ng-click="acceptUR()">
-      <span class="fa fa-check"></span>&nbsp;<span translate>Yes</span>
+      <span class="fas fa-check"></span>&nbsp;<span translate>Yes</span>
     </button>
     <button type="button" class="btn btn-danger btn-sm" ng-click="declineUR()">
-      <span class="fa fa-times"></span>&nbsp;<span translate>No</span>
+      <span class="fas fa-times"></span>&nbsp;<span translate>No</span>
     </button>
   </div>
 </modal>

gui/default/syncthing/usagereport/usageReportPreviewModalView.html

@@ -1,4 +1,4 @@
-<modal id="urPreview" status="success" icon="bar-chart" heading="{{'Anonymous Usage Reporting' | translate}}" large="yes" closeable="yes">
+<modal id="urPreview" status="success" icon="fas fa-chart-bar" heading="{{'Anonymous Usage Reporting' | translate}}" large="yes" closeable="yes">
   <div class="modal-body">
     <p translate>
       The encrypted usage report is sent daily. It is used to track common platforms, folder sizes and app versions. If the reported data set is changed you will be prompted with this dialog again.
@@ -23,7 +23,7 @@
   </div>
   <div class="modal-footer">
     <button type="button" class="btn btn-default btn-sm" data-dismiss="modal">
-      <span class="fa fa-times"></span>&nbsp;<span translate>Close</span>
+      <span class="fas fa-times"></span>&nbsp;<span translate>Close</span>
     </button>
   </div>
 </modal>

gui/default/vendor/angular/angular-dirPagination.js.LICENSE

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

gui/default/vendor/angular/angular-sanitize.js

@@ -2,6 +2,25 @@
  * @license AngularJS v1.3.20
  * (c) 2010-2014 Google, Inc. http://angularjs.org
  * License: MIT
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
  */
 (function(window, angular, undefined) {'use strict';
 

gui/default/vendor/angular/angular-sanitize.js.LICENSE

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

gui/default/vendor/angular/angular-translate-loader-static-files.js.LICENSE

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

gui/default/vendor/angular/angular-translate.js.LICENSE

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

gui/default/vendor/angular/angular.js

@@ -2,6 +2,25 @@
  * @license AngularJS v1.3.20
  * (c) 2010-2014 Google, Inc. http://angularjs.org
  * License: MIT
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
  */
 (function(window, document, undefined) {'use strict';
 

gui/default/vendor/angular/angular.js.LICENSE

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

gui/default/vendor/bootstrap/LICENSE

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

gui/default/vendor/bootstrap/css/daterangepicker.css

@@ -1,269 +0,0 @@
-.daterangepicker {
-  position: absolute;
-  color: inherit;
-  background-color: #fff;
-  border-radius: 4px;
-  width: 278px;
-  padding: 4px;
-  margin-top: 1px;
-  top: 100px;
-  left: 20px;
-  /* Calendars */ }
-  .daterangepicker:before, .daterangepicker:after {
-    position: absolute;
-    display: inline-block;
-    border-bottom-color: rgba(0, 0, 0, 0.2);
-    content: ''; }
-  .daterangepicker:before {
-    top: -7px;
-    border-right: 7px solid transparent;
-    border-left: 7px solid transparent;
-    border-bottom: 7px solid #ccc; }
-  .daterangepicker:after {
-    top: -6px;
-    border-right: 6px solid transparent;
-    border-bottom: 6px solid #fff;
-    border-left: 6px solid transparent; }
-  .daterangepicker.opensleft:before {
-    right: 9px; }
-  .daterangepicker.opensleft:after {
-    right: 10px; }
-  .daterangepicker.openscenter:before {
-    left: 0;
-    right: 0;
-    width: 0;
-    margin-left: auto;
-    margin-right: auto; }
-  .daterangepicker.openscenter:after {
-    left: 0;
-    right: 0;
-    width: 0;
-    margin-left: auto;
-    margin-right: auto; }
-  .daterangepicker.opensright:before {
-    left: 9px; }
-  .daterangepicker.opensright:after {
-    left: 10px; }
-  .daterangepicker.dropup {
-    margin-top: -5px; }
-    .daterangepicker.dropup:before {
-      top: initial;
-      bottom: -7px;
-      border-bottom: initial;
-      border-top: 7px solid #ccc; }
-    .daterangepicker.dropup:after {
-      top: initial;
-      bottom: -6px;
-      border-bottom: initial;
-      border-top: 6px solid #fff; }
-  .daterangepicker.dropdown-menu {
-    max-width: none;
-    z-index: 3001; }
-  .daterangepicker.single .ranges, .daterangepicker.single .calendar {
-    float: none; }
-  .daterangepicker.show-calendar .calendar {
-    display: block; }
-  .daterangepicker .calendar {
-    display: none;
-    max-width: 270px;
-    margin: 4px; }
-    .daterangepicker .calendar.single .calendar-table {
-      border: none; }
-    .daterangepicker .calendar th, .daterangepicker .calendar td {
-      white-space: nowrap;
-      text-align: center;
-      min-width: 32px; }
-  .daterangepicker .calendar-table {
-    border: 1px solid #fff;
-    padding: 4px;
-    border-radius: 4px;
-    background-color: #fff; }
-  .daterangepicker table {
-    width: 100%;
-    margin: 0; }
-  .daterangepicker td, .daterangepicker th {
-    text-align: center;
-    width: 20px;
-    height: 20px;
-    border-radius: 4px;
-    border: 1px solid transparent;
-    white-space: nowrap;
-    cursor: pointer; }
-    .daterangepicker td.available:hover, .daterangepicker th.available:hover {
-      background-color: #eee;
-      border-color: transparent;
-      color: inherit; }
-    .daterangepicker td.week, .daterangepicker th.week {
-      font-size: 80%;
-      color: #ccc; }
-  .daterangepicker td.off, .daterangepicker td.off.in-range, .daterangepicker td.off.start-date, .daterangepicker td.off.end-date {
-    background-color: #fff;
-    border-color: transparent;
-    color: #999; }
-  .daterangepicker td.in-range {
-    background-color: #ebf4f8;
-    border-color: transparent;
-    color: #000;
-    border-radius: 0; }
-  .daterangepicker td.start-date {
-    border-radius: 4px 0 0 4px; }
-  .daterangepicker td.end-date {
-    border-radius: 0 4px 4px 0; }
-  .daterangepicker td.start-date.end-date {
-    border-radius: 4px; }
-  .daterangepicker td.active, .daterangepicker td.active:hover {
-    background-color: #357ebd;
-    border-color: transparent;
-    color: #fff; }
-  .daterangepicker th.month {
-    width: auto; }
-  .daterangepicker td.disabled, .daterangepicker option.disabled {
-    color: #999;
-    cursor: not-allowed;
-    text-decoration: line-through; }
-  .daterangepicker select.monthselect, .daterangepicker select.yearselect {
-    font-size: 12px;
-    padding: 1px;
-    height: auto;
-    margin: 0;
-    cursor: default; }
-  .daterangepicker select.monthselect {
-    margin-right: 2%;
-    width: 56%; }
-  .daterangepicker select.yearselect {
-    width: 40%; }
-  .daterangepicker select.hourselect, .daterangepicker select.minuteselect, .daterangepicker select.secondselect, .daterangepicker select.ampmselect {
-    width: 50px;
-    margin-bottom: 0; }
-  .daterangepicker .input-mini {
-    border: 1px solid #ccc;
-    border-radius: 4px;
-    color: #555;
-    height: 30px;
-    line-height: 30px;
-    display: block;
-    vertical-align: middle;
-    margin: 0 0 5px 0;
-    padding: 0 6px 0 28px;
-    width: 100%; }
-    .daterangepicker .input-mini.active {
-      border: 1px solid #08c;
-      border-radius: 4px; }
-  .daterangepicker .daterangepicker_input {
-    position: relative; }
-    .daterangepicker .daterangepicker_input i {
-      position: absolute;
-      left: 8px;
-      top: 8px; }
-  .daterangepicker.rtl .input-mini {
-    padding-right: 28px;
-    padding-left: 6px; }
-  .daterangepicker.rtl .daterangepicker_input i {
-    left: auto;
-    right: 8px; }
-  .daterangepicker .calendar-time {
-    text-align: center;
-    margin: 5px auto;
-    line-height: 30px;
-    position: relative;
-    padding-left: 28px; }
-    .daterangepicker .calendar-time select.disabled {
-      color: #ccc;
-      cursor: not-allowed; }
-
-.ranges {
-  font-size: 11px;
-  float: none;
-  margin: 4px;
-  text-align: left; }
-  .ranges ul {
-    list-style: none;
-    margin: 0 auto;
-    padding: 0;
-    width: 100%; }
-  .ranges li {
-    font-size: 13px;
-    background-color: #f5f5f5;
-    border: 1px solid #f5f5f5;
-    border-radius: 4px;
-    color: #08c;
-    padding: 3px 12px;
-    margin-bottom: 8px;
-    cursor: pointer; }
-    .ranges li:hover {
-      background-color: #08c;
-      border: 1px solid #08c;
-      color: #fff; }
-    .ranges li.active {
-      background-color: #08c;
-      border: 1px solid #08c;
-      color: #fff; }
-
-/*  Larger Screen Styling */
-@media (min-width: 564px) {
-  .daterangepicker {
-    width: auto; }
-    .daterangepicker .ranges ul {
-      width: 160px; }
-    .daterangepicker.single .ranges ul {
-      width: 100%; }
-    .daterangepicker.single .calendar.left {
-      clear: none; }
-    .daterangepicker.single.ltr .ranges, .daterangepicker.single.ltr .calendar {
-      float: left; }
-    .daterangepicker.single.rtl .ranges, .daterangepicker.single.rtl .calendar {
-      float: right; }
-    .daterangepicker.ltr {
-      direction: ltr;
-      text-align: left; }
-      .daterangepicker.ltr .calendar.left {
-        clear: left;
-        margin-right: 0; }
-        .daterangepicker.ltr .calendar.left .calendar-table {
-          border-right: none;
-          border-top-right-radius: 0;
-          border-bottom-right-radius: 0; }
-      .daterangepicker.ltr .calendar.right {
-        margin-left: 0; }
-        .daterangepicker.ltr .calendar.right .calendar-table {
-          border-left: none;
-          border-top-left-radius: 0;
-          border-bottom-left-radius: 0; }
-      .daterangepicker.ltr .left .daterangepicker_input {
-        padding-right: 12px; }
-      .daterangepicker.ltr .calendar.left .calendar-table {
-        padding-right: 12px; }
-      .daterangepicker.ltr .ranges, .daterangepicker.ltr .calendar {
-        float: left; }
-    .daterangepicker.rtl {
-      direction: rtl;
-      text-align: right; }
-      .daterangepicker.rtl .calendar.left {
-        clear: right;
-        margin-left: 0; }
-        .daterangepicker.rtl .calendar.left .calendar-table {
-          border-left: none;
-          border-top-left-radius: 0;
-          border-bottom-left-radius: 0; }
-      .daterangepicker.rtl .calendar.right {
-        margin-right: 0; }
-        .daterangepicker.rtl .calendar.right .calendar-table {
-          border-right: none;
-          border-top-right-radius: 0;
-          border-bottom-right-radius: 0; }
-      .daterangepicker.rtl .left .daterangepicker_input {
-        padding-left: 12px; }
-      .daterangepicker.rtl .calendar.left .calendar-table {
-        padding-left: 12px; }
-      .daterangepicker.rtl .ranges, .daterangepicker.rtl .calendar {
-        text-align: right;
-        float: right; } }
-@media (min-width: 730px) {
-  .daterangepicker .ranges {
-    width: auto; }
-  .daterangepicker.ltr .ranges {
-    float: left; }
-  .daterangepicker.rtl .ranges {
-    float: right; }
-  .daterangepicker .calendar.left {
-    clear: none !important; } }

gui/default/vendor/daterangepicker/LICENSE

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

gui/default/vendor/daterangepicker/daterangepicker.css

@@ -0,0 +1,392 @@
+.daterangepicker {
+  position: absolute;
+  color: inherit;
+  background-color: #fff;
+  border-radius: 4px;
+  border: 1px solid #ddd;
+  width: 278px;
+  max-width: none;
+  padding: 0;
+  margin-top: 7px;
+  top: 100px;
+  left: 20px;
+  z-index: 3001;
+  display: none;
+  font-family: arial;
+  font-size: 15px;
+  line-height: 1em;
+}
+
+.daterangepicker:before, .daterangepicker:after {
+  position: absolute;
+  display: inline-block;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  content: '';
+}
+
+.daterangepicker:before {
+  top: -7px;
+  border-right: 7px solid transparent;
+  border-left: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+}
+
+.daterangepicker:after {
+  top: -6px;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #fff;
+  border-left: 6px solid transparent;
+}
+
+.daterangepicker.opensleft:before {
+  right: 9px;
+}
+
+.daterangepicker.opensleft:after {
+  right: 10px;
+}
+
+.daterangepicker.openscenter:before {
+  left: 0;
+  right: 0;
+  width: 0;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.daterangepicker.openscenter:after {
+  left: 0;
+  right: 0;
+  width: 0;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.daterangepicker.opensright:before {
+  left: 9px;
+}
+
+.daterangepicker.opensright:after {
+  left: 10px;
+}
+
+.daterangepicker.drop-up {
+  margin-top: -7px;
+}
+
+.daterangepicker.drop-up:before {
+  top: initial;
+  bottom: -7px;
+  border-bottom: initial;
+  border-top: 7px solid #ccc;
+}
+
+.daterangepicker.drop-up:after {
+  top: initial;
+  bottom: -6px;
+  border-bottom: initial;
+  border-top: 6px solid #fff;
+}
+
+.daterangepicker.single .daterangepicker .ranges, .daterangepicker.single .calendar {
+  float: none;
+}
+
+.daterangepicker.single .drp-selected {
+  display: none;
+}
+
+.daterangepicker.show-calendar .calendar {
+  display: block;
+}
+
+.daterangepicker.show-calendar .drp-buttons {
+  display: block;
+}
+
+.daterangepicker.auto-apply .drp-buttons {
+  display: none;
+}
+
+.daterangepicker .calendar {
+  display: none;
+  max-width: 270px;
+}
+
+.daterangepicker .calendar.left {
+  padding: 12px 0 12px 8px;
+}
+
+.daterangepicker .calendar.right {
+  padding: 12px 8px;
+}
+
+.daterangepicker .calendar.single .calendar-table {
+  border: none;
+}
+
+.daterangepicker .calendar-table .next span, .daterangepicker .calendar-table .prev span {
+  color: #fff;
+  border: solid black;
+  border-width: 0 2px 2px 0;
+  border-radius: 0;
+  display: inline-block;
+  padding: 3px;
+}
+
+.daterangepicker .calendar-table .next span {
+  transform: rotate(-45deg);
+  -webkit-transform: rotate(-45deg);
+}
+
+.daterangepicker .calendar-table .prev span {
+  transform: rotate(135deg);
+  -webkit-transform: rotate(135deg);
+}
+
+.daterangepicker .calendar-table th, .daterangepicker .calendar-table td {
+  white-space: nowrap;
+  text-align: center;
+  vertical-align: middle;
+  min-width: 32px;
+  width: 32px;
+  height: 24px;
+  line-height: 24px;
+  font-size: 12px;
+  border-radius: 4px;
+  border: 1px solid transparent;
+  white-space: nowrap;
+  cursor: pointer;
+}
+
+.daterangepicker .calendar-table {
+  border: 1px solid #fff;
+  border-radius: 4px;
+  background-color: #fff;
+}
+
+.daterangepicker .calendar-table table {
+  width: 100%;
+  margin: 0;
+  border-spacing: 0;
+  border-collapse: collapse;
+}
+
+.daterangepicker td.available:hover, .daterangepicker th.available:hover {
+  background-color: #eee;
+  border-color: transparent;
+  color: inherit;
+}
+
+.daterangepicker td.week, .daterangepicker th.week {
+  font-size: 80%;
+  color: #ccc;
+}
+
+.daterangepicker td.off, .daterangepicker td.off.in-range, .daterangepicker td.off.start-date, .daterangepicker td.off.end-date {
+  background-color: #fff;
+  border-color: transparent;
+  color: #999;
+}
+
+.daterangepicker td.in-range {
+  background-color: #ebf4f8;
+  border-color: transparent;
+  color: #000;
+  border-radius: 0;
+}
+
+.daterangepicker td.start-date {
+  border-radius: 4px 0 0 4px;
+}
+
+.daterangepicker td.end-date {
+  border-radius: 0 4px 4px 0;
+}
+
+.daterangepicker td.start-date.end-date {
+  border-radius: 4px;
+}
+
+.daterangepicker td.active, .daterangepicker td.active:hover {
+  background-color: #357ebd;
+  border-color: transparent;
+  color: #fff;
+}
+
+.daterangepicker th.month {
+  width: auto;
+}
+
+.daterangepicker td.disabled, .daterangepicker option.disabled {
+  color: #999;
+  cursor: not-allowed;
+  text-decoration: line-through;
+}
+
+.daterangepicker select.monthselect, .daterangepicker select.yearselect {
+  font-size: 12px;
+  padding: 1px;
+  height: auto;
+  margin: 0;
+  cursor: default;
+}
+
+.daterangepicker select.monthselect {
+  margin-right: 2%;
+  width: 56%;
+}
+
+.daterangepicker select.yearselect {
+  width: 40%;
+}
+
+.daterangepicker select.hourselect, .daterangepicker select.minuteselect, .daterangepicker select.secondselect, .daterangepicker select.ampmselect {
+  width: 50px;
+  margin: 0 auto;
+  background: #eee;
+  border: 1px solid #eee;
+  padding: 2px;
+  outline: 0;
+  font-size: 12px;
+}
+
+.daterangepicker .calendar-time {
+  text-align: center;
+  margin: 4px auto 0 auto;
+  line-height: 30px;
+  position: relative;
+}
+
+.daterangepicker .calendar-time select.disabled {
+  color: #ccc;
+  cursor: not-allowed;
+}
+
+.daterangepicker .drp-buttons {
+  clear: both;
+  text-align: right;
+  padding: 8px 12px;
+  border-top: 1px solid #ddd;
+  display: none;
+  line-height: 12px;
+  vertical-align: middle;
+}
+
+.daterangepicker .drp-selected {
+  display: inline-block;
+  font-size: 12px;
+  padding-right: 8px;
+}
+
+.daterangepicker .drp-buttons .btn {
+  margin-left: 8px;
+  font-size: 12px;
+  font-weight: bold;
+  padding: 4px 8px;
+}
+
+.daterangepicker.show-ranges .calendar.left {
+  border-left: 1px solid #ddd;
+}
+
+.daterangepicker .ranges {
+  float: none;
+  text-align: left;
+  margin: 0;
+}
+
+.daterangepicker.show-calendar .ranges {
+  margin-top: 12px;
+}
+
+.daterangepicker .ranges ul {
+  list-style: none;
+  margin: 0 auto;
+  padding: 0;
+  width: 100%;
+}
+
+.daterangepicker .ranges li {
+  font-size: 12px;
+  padding: 8px 12px;
+  cursor: pointer;
+}
+
+.daterangepicker .ranges li:hover {
+  background-color: #eee;
+}
+
+.daterangepicker .ranges li.active {
+  background-color: #08c;
+  color: #fff;
+}
+
+/*  Larger Screen Styling */
+@media (min-width: 564px) {
+  .daterangepicker {
+    width: auto; }
+    .daterangepicker .ranges ul {
+      width: 160px; }
+    .daterangepicker.single .ranges ul {
+      width: 100%; }
+    .daterangepicker.single .calendar.left {
+      clear: none; }
+    .daterangepicker.single.ltr .ranges, .daterangepicker.single.ltr .calendar {
+      float: left; }
+    .daterangepicker.single.rtl .ranges, .daterangepicker.single.rtl .calendar {
+      float: right; }
+    .daterangepicker.ltr {
+      direction: ltr;
+      text-align: left; }
+      .daterangepicker.ltr .calendar.left {
+        clear: left;
+        margin-right: 0; }
+        .daterangepicker.ltr .calendar.left .calendar-table {
+          border-right: none;
+          border-top-right-radius: 0;
+          border-bottom-right-radius: 0; }
+      .daterangepicker.ltr .calendar.right {
+        margin-left: 0; }
+        .daterangepicker.ltr .calendar.right .calendar-table {
+          border-left: none;
+          border-top-left-radius: 0;
+          border-bottom-left-radius: 0; }
+      .daterangepicker.ltr .left .daterangepicker_input {
+        padding-right: 12px; }
+      .daterangepicker.ltr .calendar.left .calendar-table {
+        padding-right: 12px; }
+      .daterangepicker.ltr .ranges, .daterangepicker.ltr .calendar {
+        float: left; }
+    .daterangepicker.rtl {
+      direction: rtl;
+      text-align: right; }
+      .daterangepicker.rtl .calendar.left {
+        clear: right;
+        margin-left: 0; }
+        .daterangepicker.rtl .calendar.left .calendar-table {
+          border-left: none;
+          border-top-left-radius: 0;
+          border-bottom-left-radius: 0; }
+      .daterangepicker.rtl .calendar.right {
+        margin-right: 0; }
+        .daterangepicker.rtl .calendar.right .calendar-table {
+          border-right: none;
+          border-top-right-radius: 0;
+          border-bottom-right-radius: 0; }
+      .daterangepicker.rtl .left .daterangepicker_input {
+        padding-left: 12px; }
+      .daterangepicker.rtl .calendar.left .calendar-table {
+        padding-left: 12px; }
+      .daterangepicker.rtl .ranges, .daterangepicker.rtl .calendar {
+        text-align: right;
+        float: right; } }
+@media (min-width: 730px) {
+  .daterangepicker .ranges {
+    width: auto; }
+  .daterangepicker.ltr .ranges {
+    float: left; }
+  .daterangepicker.rtl .ranges {
+    float: right; }
+  .daterangepicker .calendar.left {
+    clear: none !important; } }

gui/default/vendor/daterangepicker/daterangepicker.js

@@ -1,16 +1,17 @@
 /**
-* @version: 2.1.25
+* @version: 3.0.0
 * @author: Dan Grossman http://www.dangrossman.info/
-* @copyright: Copyright (c) 2012-2017 Dan Grossman. All rights reserved.
+* @copyright: Copyright (c) 2012-2018 Dan Grossman. All rights reserved.
 * @license: Licensed under the MIT license. See http://www.opensource.org/licenses/mit-license.php
-* @website: https://www.daterangepicker.com/
+* @website: http://www.daterangepicker.com/
 */
-// Follow the UMD template https://github.com/umdjs/umd/blob/master/templates/returnExportsGlobal.js
+// Following the UMD template https://github.com/umdjs/umd/blob/master/templates/returnExportsGlobal.js
 (function (root, factory) {
     if (typeof define === 'function' && define.amd) {
         // AMD. Make globaly available as well
         define(['moment', 'jquery'], function (moment, jquery) {
-            return (root.daterangepicker = factory(moment, jquery));
+            if (!jquery.fn) jquery.fn = {}; // webpack server rendering
+            return factory(moment, jquery);
         });
     } else if (typeof module === 'object' && module.exports) {
         // Node / Browserify
@@ -20,7 +21,8 @@
             jQuery = require('jquery');
             if (!jQuery.fn) jQuery.fn = {};
         }
-        module.exports = factory(require('moment'), jQuery);
+        var moment = (typeof window != 'undefined' && typeof window.moment != 'undefined') ? window.moment : require('moment');
+        module.exports = factory(moment, jQuery);
     } else {
         // Browser globals
         root.daterangepicker = factory(root.moment, root.jQuery);
@@ -35,10 +37,12 @@
         this.endDate = moment().endOf('day');
         this.minDate = false;
         this.maxDate = false;
-        this.dateLimit = false;
+        this.maxSpan = false;
         this.autoApply = false;
         this.singleDatePicker = false;
         this.showDropdowns = false;
+        this.minYear = moment().subtract(100, 'year').format('YYYY');
+        this.maxYear = moment().add(100, 'year').format('YYYY');
         this.showWeekNumbers = false;
         this.showISOWeekNumbers = false;
         this.showCustomRangeLabel = true;
@@ -60,8 +64,8 @@
             this.drops = 'up';
 
         this.buttonClasses = 'btn btn-sm';
-        this.applyClass = 'btn-success';
-        this.cancelClass = 'btn-default';
+        this.applyButtonClasses = 'btn-primary';
+        this.cancelButtonClasses = 'btn-default';
 
         this.locale = {
             direction: 'ltr',
@@ -93,34 +97,21 @@
 
         //html template for the picker UI
         if (typeof options.template !== 'string' && !(options.template instanceof $))
-            options.template = '<div class="daterangepicker dropdown-menu">' +
+            options.template = 
+            '<div class="daterangepicker">' +
+                '<div class="ranges"></div>' +
                 '<div class="calendar left">' +
-                    '<div class="daterangepicker_input">' +
-                      '<input class="input-mini form-control" type="text" name="daterangepicker_start" value="" />' +
-                      '<i class="fa fa-calendar glyphicon glyphicon-calendar"></i>' +
-                      '<div class="calendar-time">' +
-                        '<div></div>' +
-                        '<i class="fa fa-clock-o glyphicon glyphicon-time"></i>' +
-                      '</div>' +
-                    '</div>' +
                     '<div class="calendar-table"></div>' +
+                    '<div class="calendar-time"></div>' +
                 '</div>' +
                 '<div class="calendar right">' +
-                    '<div class="daterangepicker_input">' +
-                      '<input class="input-mini form-control" type="text" name="daterangepicker_end" value="" />' +
-                      '<i class="fa fa-calendar glyphicon glyphicon-calendar"></i>' +
-                      '<div class="calendar-time">' +
-                        '<div></div>' +
-                        '<i class="fa fa-clock-o glyphicon glyphicon-time"></i>' +
-                      '</div>' +
-                    '</div>' +
                     '<div class="calendar-table"></div>' +
+                    '<div class="calendar-time"></div>' +
                 '</div>' +
-                '<div class="ranges">' +
-                    '<div class="range_inputs">' +
-                        '<button class="applyBtn" disabled="disabled" type="button"></button> ' +
-                        '<button class="cancelBtn" type="button"></button>' +
-                    '</div>' +
+                '<div class="drp-buttons">' +
+                    '<span class="drp-selected"></span>' +
+                    '<button class="cancelBtn" type="button"></button>' +
+                    '<button class="applyBtn" disabled="disabled" type="button"></button> ' +
                 '</div>' +
             '</div>';
 
@@ -202,14 +193,23 @@
         if (this.maxDate && this.endDate.isAfter(this.maxDate))
             this.endDate = this.maxDate.clone();
 
-        if (typeof options.applyClass === 'string')
-            this.applyClass = options.applyClass;
+        if (typeof options.applyButtonClasses === 'string')
+            this.applyButtonClasses = options.applyButtonClasses;
 
-        if (typeof options.cancelClass === 'string')
-            this.cancelClass = options.cancelClass;
+        if (typeof options.applyClass === 'string') //backwards compat
+            this.applyButtonClasses = options.applyClass;
 
-        if (typeof options.dateLimit === 'object')
-            this.dateLimit = options.dateLimit;
+        if (typeof options.cancelButtonClasses === 'string')
+            this.cancelButtonClasses = options.cancelButtonClasses;
+
+        if (typeof options.cancelClass === 'string') //backwards compat
+            this.cancelButtonClasses = options.cancelClass;
+
+        if (typeof options.maxSpan === 'object')
+            this.maxSpan = options.maxSpan;
+
+        if (typeof options.dateLimit === 'object') //backwards compat
+            this.maxSpan = options.dateLimit;
 
         if (typeof options.opens === 'string')
             this.opens = options.opens;
@@ -232,6 +232,12 @@
         if (typeof options.showDropdowns === 'boolean')
             this.showDropdowns = options.showDropdowns;
 
+        if (typeof options.minYear === 'number')
+            this.minYear = options.minYear;
+
+        if (typeof options.maxYear === 'number')
+            this.maxYear = options.maxYear;
+
         if (typeof options.showCustomRangeLabel === 'boolean')
             this.showCustomRangeLabel = options.showCustomRangeLabel;
 
@@ -317,14 +323,14 @@
                 else
                     end = moment(options.ranges[range][1]);
 
-                // If the start or end date exceed those allowed by the minDate or dateLimit
+                // If the start or end date exceed those allowed by the minDate or maxSpan
                 // options, shorten the range to the allowable period.
                 if (this.minDate && start.isBefore(this.minDate))
                     start = this.minDate.clone();
 
                 var maxDate = this.maxDate;
-                if (this.dateLimit && maxDate && start.clone().add(this.dateLimit).isAfter(maxDate))
-                    maxDate = start.clone().add(this.dateLimit);
+                if (this.maxSpan && maxDate && start.clone().add(this.maxSpan).isAfter(maxDate))
+                    maxDate = start.clone().add(this.maxSpan);
                 if (maxDate && end.isAfter(maxDate))
                     end = maxDate.clone();
 
@@ -367,22 +373,20 @@
         if (this.timePicker && this.autoApply)
             this.autoApply = false;
 
-        if (this.autoApply && typeof options.ranges !== 'object') {
-            this.container.find('.ranges').hide();
-        } else if (this.autoApply) {
-            this.container.find('.applyBtn, .cancelBtn').addClass('hide');
+        if (this.autoApply) {
+            this.container.addClass('auto-apply');
         }
 
+        if (typeof options.ranges === 'object')
+            this.container.addClass('show-ranges');
+
         if (this.singleDatePicker) {
             this.container.addClass('single');
             this.container.find('.calendar.left').addClass('single');
             this.container.find('.calendar.left').show();
             this.container.find('.calendar.right').hide();
-            this.container.find('.daterangepicker_input input, .daterangepicker_input > i').hide();
-            if (this.timePicker) {
-                this.container.find('.ranges ul').hide();
-            } else {
-                this.container.find('.ranges').hide();
+            if (!this.timePicker) {
+                this.container.addClass('auto-apply');
             }
         }
 
@@ -392,17 +396,12 @@
 
         this.container.addClass('opens' + this.opens);
 
-        //swap the position of the predefined ranges if opens right
-        if (typeof options.ranges !== 'undefined' && this.opens == 'right') {
-            this.container.find('.ranges').prependTo( this.container.find('.calendar.left').parent() );
-        }
-
         //apply CSS classes and labels to buttons
         this.container.find('.applyBtn, .cancelBtn').addClass(this.buttonClasses);
-        if (this.applyClass.length)
-            this.container.find('.applyBtn').addClass(this.applyClass);
-        if (this.cancelClass.length)
-            this.container.find('.cancelBtn').addClass(this.cancelClass);
+        if (this.applyButtonClasses.length)
+            this.container.find('.applyBtn').addClass(this.applyButtonClasses);
+        if (this.cancelButtonClasses.length)
+            this.container.find('.cancelBtn').addClass(this.cancelButtonClasses);
         this.container.find('.applyBtn').html(this.locale.applyLabel);
         this.container.find('.cancelBtn').html(this.locale.cancelLabel);
 
@@ -414,32 +413,27 @@
             .on('click.daterangepicker', '.prev', $.proxy(this.clickPrev, this))
             .on('click.daterangepicker', '.next', $.proxy(this.clickNext, this))
             .on('mousedown.daterangepicker', 'td.available', $.proxy(this.clickDate, this))
-            .on('mouseenter.daterangepicker', 'td.available', $.proxy(this.hoverDate, this))
-            .on('mouseleave.daterangepicker', 'td.available', $.proxy(this.updateFormInputs, this))
             .on('change.daterangepicker', 'select.yearselect', $.proxy(this.monthOrYearChanged, this))
             .on('change.daterangepicker', 'select.monthselect', $.proxy(this.monthOrYearChanged, this))
             .on('change.daterangepicker', 'select.hourselect,select.minuteselect,select.secondselect,select.ampmselect', $.proxy(this.timeChanged, this))
-            .on('click.daterangepicker', '.daterangepicker_input input', $.proxy(this.showCalendars, this))
-            .on('focus.daterangepicker', '.daterangepicker_input input', $.proxy(this.formInputsFocused, this))
-            .on('blur.daterangepicker', '.daterangepicker_input input', $.proxy(this.formInputsBlurred, this))
-            .on('change.daterangepicker', '.daterangepicker_input input', $.proxy(this.formInputsChanged, this));
 
         this.container.find('.ranges')
+            .on('click.daterangepicker', 'li', $.proxy(this.clickRange, this))
+
+        this.container.find('.drp-buttons')
             .on('click.daterangepicker', 'button.applyBtn', $.proxy(this.clickApply, this))
             .on('click.daterangepicker', 'button.cancelBtn', $.proxy(this.clickCancel, this))
-            .on('click.daterangepicker', 'li', $.proxy(this.clickRange, this))
-            .on('mouseenter.daterangepicker', 'li', $.proxy(this.hoverRange, this))
-            .on('mouseleave.daterangepicker', 'li', $.proxy(this.updateFormInputs, this));
 
         if (this.element.is('input') || this.element.is('button')) {
             this.element.on({
                 'click.daterangepicker': $.proxy(this.show, this),
                 'focus.daterangepicker': $.proxy(this.show, this),
                 'keyup.daterangepicker': $.proxy(this.elementChanged, this),
-                'keydown.daterangepicker': $.proxy(this.keydown, this)
+                'keydown.daterangepicker': $.proxy(this.keydown, this) //IE 11 compatibility
             });
         } else {
             this.element.on('click.daterangepicker', $.proxy(this.toggle, this));
+            this.element.on('keydown.daterangepicker', $.proxy(this.toggle, this));
         }
 
         //
@@ -499,7 +493,7 @@
                 this.endDate = moment(endDate);
 
             if (!this.timePicker)
-                this.endDate = this.endDate.endOf('day');
+                this.endDate = this.endDate.add(1,'d').startOf('day').subtract(1,'second');
 
             if (this.timePicker && this.timePickerIncrement)
                 this.endDate.minute(Math.round(this.endDate.minute() / this.timePickerIncrement) * this.timePickerIncrement);
@@ -510,11 +504,13 @@
             if (this.maxDate && this.endDate.isAfter(this.maxDate))
                 this.endDate = this.maxDate.clone();
 
-            if (this.dateLimit && this.startDate.clone().add(this.dateLimit).isBefore(this.endDate))
-                this.endDate = this.startDate.clone().add(this.dateLimit);
+            if (this.maxSpan && this.startDate.clone().add(this.maxSpan).isBefore(this.endDate))
+                this.endDate = this.startDate.clone().add(this.maxSpan);
 
             this.previousRightTime = this.endDate.clone();
 
+            this.container.find('.drp-selected').html(this.startDate.format(this.locale.format) + this.locale.separator + this.endDate.format(this.locale.format));
+
             if (!this.isShowing)
                 this.updateElement();
 
@@ -539,13 +535,8 @@
                     this.container.find('.right .calendar-time select').removeAttr('disabled').removeClass('disabled');
                 }
             }
-            if (this.endDate) {
-                this.container.find('input[name="daterangepicker_end"]').removeClass('active');
-                this.container.find('input[name="daterangepicker_start"]').addClass('active');
-            } else {
-                this.container.find('input[name="daterangepicker_end"]').addClass('active');
-                this.container.find('input[name="daterangepicker_start"]').removeClass('active');
-            }
+            if (this.endDate)
+                this.container.find('.drp-selected').html(this.startDate.format(this.locale.format) + this.locale.separator + this.endDate.format(this.locale.format));
             this.updateMonthsInView();
             this.updateCalendars();
             this.updateFormInputs();
@@ -706,7 +697,7 @@
                 html += '<th></th>';
 
             if ((!minDate || minDate.isBefore(calendar.firstDay)) && (!this.linkedCalendars || side == 'left')) {
-                html += '<th class="prev available"><i class="fa fa-' + arrow.left + ' glyphicon glyphicon-' + arrow.left + '"></i></th>';
+                html += '<th class="prev available"><span></span></th>';
             } else {
                 html += '<th></th>';
             }
@@ -716,8 +707,8 @@
             if (this.showDropdowns) {
                 var currentMonth = calendar[1][1].month();
                 var currentYear = calendar[1][1].year();
-                var maxYear = (maxDate && maxDate.year()) || (currentYear + 5);
-                var minYear = (minDate && minDate.year()) || (currentYear - 50);
+                var maxYear = (maxDate && maxDate.year()) || (this.maxYear);
+                var minYear = (minDate && minDate.year()) || (this.minYear);
                 var inMinYear = currentYear == minYear;
                 var inMaxYear = currentYear == maxYear;
 
@@ -748,7 +739,7 @@
 
             html += '<th colspan="5" class="month">' + dateHtml + '</th>';
             if ((!maxDate || maxDate.isAfter(calendar.lastDay)) && (!this.linkedCalendars || side == 'right' || this.singleDatePicker)) {
-                html += '<th class="next available"><i class="fa fa-' + arrow.right + ' glyphicon glyphicon-' + arrow.right + '"></i></th>';
+                html += '<th class="next available"><span></span></th>';
             } else {
                 html += '<th></th>';
             }
@@ -768,10 +759,10 @@
             html += '</thead>';
             html += '<tbody>';
 
-            //adjust maxDate to reflect the dateLimit setting in order to
-            //grey out end dates beyond the dateLimit
-            if (this.endDate == null && this.dateLimit) {
-                var maxLimit = this.startDate.clone().add(this.dateLimit).endOf('day');
+            //adjust maxDate to reflect the maxSpan setting in order to
+            //grey out end dates beyond the maxSpan
+            if (this.endDate == null && this.maxSpan) {
+                var maxLimit = this.startDate.clone().add(this.maxSpan).endOf('day');
                 if (!maxDate || maxLimit.isBefore(maxDate)) {
                     maxDate = maxLimit;
                 }
@@ -865,8 +856,8 @@
 
             var html, selected, minDate, maxDate = this.maxDate;
 
-            if (this.dateLimit && (!this.maxDate || this.startDate.clone().add(this.dateLimit).isAfter(this.maxDate)))
-                maxDate = this.startDate.clone().add(this.dateLimit);
+            if (this.maxSpan && (!this.maxDate || this.startDate.clone().add(this.maxSpan).isAfter(this.maxDate)))
+                maxDate = this.startDate.clone().add(this.maxSpan);
 
             if (side == 'left') {
                 selected = this.startDate.clone();
@@ -876,12 +867,12 @@
                 minDate = this.startDate;
 
                 //Preserve the time already selected
-                var timeSelector = this.container.find('.calendar.right .calendar-time div');
+                var timeSelector = this.container.find('.calendar.right .calendar-time');
                 if (timeSelector.html() != '') {
 
-                    selected.hour(timeSelector.find('.hourselect option:selected').val() || selected.hour());
-                    selected.minute(timeSelector.find('.minuteselect option:selected').val() || selected.minute());
-                    selected.second(timeSelector.find('.secondselect option:selected').val() || selected.second());
+                    selected.hour(selected.hour() || timeSelector.find('.hourselect option:selected').val());
+                    selected.minute(selected.minute() || timeSelector.find('.minuteselect option:selected').val());
+                    selected.second(selected.second() || timeSelector.find('.secondselect option:selected').val());
 
                     if (!this.timePicker24Hour) {
                         var ampm = timeSelector.find('.ampmselect option:selected').val();
@@ -1014,20 +1005,12 @@
                 html += '</select>';
             }
 
-            this.container.find('.calendar.' + side + ' .calendar-time div').html(html);
+            this.container.find('.calendar.' + side + ' .calendar-time').html(html);
 
         },
 
         updateFormInputs: function() {
 
-            //ignore mouse movements while an above-calendar text input has focus
-            if (this.container.find('input[name=daterangepicker_start]').is(":focus") || this.container.find('input[name=daterangepicker_end]').is(":focus"))
-                return;
-
-            this.container.find('input[name=daterangepicker_start]').val(this.startDate.format(this.locale.format));
-            if (this.endDate)
-                this.container.find('input[name=daterangepicker_end]').val(this.endDate.format(this.locale.format));
-
             if (this.singleDatePicker || (this.endDate && (this.startDate.isBefore(this.endDate) || this.startDate.isSame(this.endDate)))) {
                 this.container.find('button.applyBtn').removeAttr('disabled');
             } else {
@@ -1052,7 +1035,7 @@
                 containerTop = this.element.offset().top - this.container.outerHeight() - parentOffset.top;
             else
                 containerTop = this.element.offset().top + this.element.outerHeight() - parentOffset.top;
-            this.container[this.drops == 'up' ? 'addClass' : 'removeClass']('dropup');
+            this.container[this.drops == 'up' ? 'addClass' : 'removeClass']('drop-up');
 
             if (this.opens == 'left') {
                 this.container.css({
@@ -1135,7 +1118,7 @@
 
             //if a new date range was selected, invoke the user callback function
             if (!this.startDate.isSame(this.oldStartDate) || !this.endDate.isSame(this.oldEndDate))
-                this.callback(this.startDate, this.endDate, this.chosenLabel);
+                this.callback(this.startDate.clone(), this.endDate.clone(), this.chosenLabel);
 
             //if picker is attached to a text input, update it
             this.updateElement();
@@ -1181,24 +1164,6 @@
             this.element.trigger('hideCalendar.daterangepicker', this);
         },
 
-        hoverRange: function(e) {
-
-            //ignore mouse movements while an above-calendar text input has focus
-            if (this.container.find('input[name=daterangepicker_start]').is(":focus") || this.container.find('input[name=daterangepicker_end]').is(":focus"))
-                return;
-
-            var label = e.target.getAttribute('data-range-key');
-
-            if (label == this.locale.customRangeLabel) {
-                this.updateView();
-            } else {
-                var dates = this.ranges[label];
-                this.container.find('input[name=daterangepicker_start]').val(dates[0].format(this.locale.format));
-                this.container.find('input[name=daterangepicker_end]').val(dates[1].format(this.locale.format));
-            }
-
-        },
-
         clickRange: function(e) {
             var label = e.target.getAttribute('data-range-key');
             this.chosenLabel = label;
@@ -1260,12 +1225,6 @@
             var cal = $(e.target).parents('.calendar');
             var date = cal.hasClass('left') ? this.leftCalendar.calendar[row][col] : this.rightCalendar.calendar[row][col];
 
-            if (this.endDate && !this.container.find('input[name=daterangepicker_start]').is(":focus")) {
-                this.container.find('input[name=daterangepicker_start]').val(date.format(this.locale.format));
-            } else if (!this.endDate && !this.container.find('input[name=daterangepicker_end]').is(":focus")) {
-                this.container.find('input[name=daterangepicker_end]').val(date.format(this.locale.format));
-            }
-
             //highlight the dates between the start date and the date being hovered as a potential end date
             var leftCalendar = this.leftCalendar;
             var rightCalendar = this.rightCalendar;
@@ -1370,17 +1329,19 @@
             var customRange = true;
             var i = 0;
             for (var range in this.ranges) {
-                if (this.timePicker) {
-                    if (this.startDate.isSame(this.ranges[range][0]) && this.endDate.isSame(this.ranges[range][1])) {
+              if (this.timePicker) {
+                    var format = this.timePickerSeconds ? "YYYY-MM-DD hh:mm:ss" : "YYYY-MM-DD hh:mm";
+                    //ignore times when comparing dates if time picker seconds is not enabled
+                    if (this.startDate.format(format) == this.ranges[range][0].format(format) && this.endDate.format(format) == this.ranges[range][1].format(format)) {
                         customRange = false;
-                        this.chosenLabel = this.container.find('.ranges li:eq(' + i + ')').addClass('active').html();
+                        this.chosenLabel = this.container.find('.ranges li:eq(' + i + ')').addClass('active').attr('data-range-key');
                         break;
                     }
                 } else {
                     //ignore times when comparing dates if time picker is not enabled
                     if (this.startDate.format('YYYY-MM-DD') == this.ranges[range][0].format('YYYY-MM-DD') && this.endDate.format('YYYY-MM-DD') == this.ranges[range][1].format('YYYY-MM-DD')) {
                         customRange = false;
-                        this.chosenLabel = this.container.find('.ranges li:eq(' + i + ')').addClass('active').html();
+                        this.chosenLabel = this.container.find('.ranges li:eq(' + i + ')').addClass('active').attr('data-range-key');
                         break;
                     }
                 }
@@ -1388,7 +1349,7 @@
             }
             if (customRange) {
                 if (this.showCustomRangeLabel) {
-                    this.chosenLabel = this.container.find('.ranges li:last').addClass('active').html();
+                    this.chosenLabel = this.container.find('.ranges li:last').addClass('active').attr('data-range-key');
                 } else {
                     this.chosenLabel = null;
                 }
@@ -1498,72 +1459,9 @@
 
         },
 
-        formInputsChanged: function(e) {
-            var isRight = $(e.target).closest('.calendar').hasClass('right');
-            var start = moment(this.container.find('input[name="daterangepicker_start"]').val(), this.locale.format);
-            var end = moment(this.container.find('input[name="daterangepicker_end"]').val(), this.locale.format);
-
-            if (start.isValid() && end.isValid()) {
-
-                if (isRight && end.isBefore(start))
-                    start = end.clone();
-
-                this.setStartDate(start);
-                this.setEndDate(end);
-
-                if (isRight) {
-                    this.container.find('input[name="daterangepicker_start"]').val(this.startDate.format(this.locale.format));
-                } else {
-                    this.container.find('input[name="daterangepicker_end"]').val(this.endDate.format(this.locale.format));
-                }
-
-            }
-
-            this.updateView();
-        },
-
-        formInputsFocused: function(e) {
-
-            // Highlight the focused input
-            this.container.find('input[name="daterangepicker_start"], input[name="daterangepicker_end"]').removeClass('active');
-            $(e.target).addClass('active');
-
-            // Set the state such that if the user goes back to using a mouse, 
-            // the calendars are aware we're selecting the end of the range, not
-            // the start. This allows someone to edit the end of a date range without
-            // re-selecting the beginning, by clicking on the end date input then
-            // using the calendar.
-            var isRight = $(e.target).closest('.calendar').hasClass('right');
-            if (isRight) {
-                this.endDate = null;
-                this.setStartDate(this.startDate.clone());
-                this.updateView();
-            }
-
-        },
-
-        formInputsBlurred: function(e) {
-
-            // this function has one purpose right now: if you tab from the first
-            // text input to the second in the UI, the endDate is nulled so that
-            // you can click another, but if you tab out without clicking anything
-            // or changing the input value, the old endDate should be retained
-
-            if (!this.endDate) {
-                var val = this.container.find('input[name="daterangepicker_end"]').val();
-                var end = moment(val, this.locale.format);
-                if (end.isValid()) {
-                    this.setEndDate(end);
-                    this.updateView();
-                }
-            }
-
-        },
-
         elementChanged: function() {
             if (!this.element.is('input')) return;
             if (!this.element.val().length) return;
-            if (this.element.val().length < this.locale.format.length) return;
 
             var dateString = this.element.val().split(this.locale.separator),
                 start = null,
@@ -1591,6 +1489,14 @@
             if ((e.keyCode === 9) || (e.keyCode === 13)) {
                 this.hide();
             }
+
+            //hide on esc and prevent propagation
+            if (e.keyCode === 27) {
+                e.preventDefault();
+                e.stopPropagation();
+
+                this.hide();
+            }
         },
 
         updateElement: function() {
@@ -1612,11 +1518,12 @@
     };
 
     $.fn.daterangepicker = function(options, callback) {
+        var implementOptions = $.extend(true, {}, $.fn.daterangepicker.defaultOptions, options);
         this.each(function() {
             var el = $(this);
             if (el.data('daterangepicker'))
                 el.data('daterangepicker').remove();
-            el.data('daterangepicker', new DateRangePicker(el, options, callback));
+            el.data('daterangepicker', new DateRangePicker(el, implementOptions, callback));
         });
         return this;
     };