chore(db): process "unchanged" files anyway (#9755)

Skipping these makes the sequence numbering inconcistent; we've received
a file and suppsedly added it to the database, but if you check the
sequence number afterwards it didn't increase, i.e., we trigger [this
failure
condition](47f48faed7/lib/model/indexhandler.go (L447-L459))
and, similarly, a future update will look like there was a hole in the
numbering.

I propose to at least temporarily remove this optimisation in order for
things to make more sense. Is there a reason to keep this beyond saving
some database operations?

.github/CODEOWNERS

@@ -1,2 +0,0 @@
-/AUTHORS    @calmh
-/*.md       @calmh

.github/workflows/build-infra-dockers.yaml

@@ -7,7 +7,7 @@ on:
       - infra-*
 
 env:
-  GO_VERSION: "~1.22.0"
+  GO_VERSION: "~1.23.0"
   CGO_ENABLED: "0"
   BUILD_USER: docker
   BUILD_HOST: github.syncthing.net

.github/workflows/build-syncthing.yaml

@@ -12,7 +12,7 @@ env:
   # The go version to use for builds. We set check-latest to true when
   # installing, so we get the latest patch version that matches the
   # expression.
-  GO_VERSION: "~1.22.0"
+  GO_VERSION: "~1.23.0"
 
   # Optimize compatibility on the slow archictures.
   GO386: softfloat
@@ -48,7 +48,7 @@ jobs:
         runner: ["windows-latest", "ubuntu-latest", "macos-latest"]
         # The oldest version in this list should match what we have in our go.mod.
         # Variables don't seem to be supported here, or we could have done something nice.
-        go: ["~1.21.7", "~1.22.0"]
+        go: ["~1.22.6", "~1.23.0"]
     runs-on: ${{ matrix.runner }}
     steps:
       - name: Set git to use LF
@@ -238,7 +238,9 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: packages-linux
-          path: syncthing-linux-*.tar.gz
+          path: |
+            syncthing-linux-*.tar.gz
+            compat.json
 
   #
   # macOS
@@ -514,7 +516,7 @@ jobs:
 
       - name: Install signing tool
         run: |
-          go install ./cmd/stsigtool
+          go install ./cmd/dev/stsigtool
 
       - name: Sign archives
         run: |
@@ -642,19 +644,20 @@ jobs:
           cd packages
           "$GITHUB_WORKSPACE/tools/generate-release-json" "$BASE_URL" > nightly.json
         env:
-          BASE_URL: https://syncthing.ams3.digitaloceanspaces.com/nightly/
+          BASE_URL: ${{ secrets.NIGHTLY_BASE_URL }}
 
       - name: Push artifacts
         uses: docker://docker.io/rclone/rclone:latest
         env:
-          RCLONE_CONFIG_SPACES_TYPE: s3
-          RCLONE_CONFIG_SPACES_PROVIDER: DigitalOcean
-          RCLONE_CONFIG_SPACES_ACCESS_KEY_ID: ${{ secrets.SPACES_KEY }}
-          RCLONE_CONFIG_SPACES_SECRET_ACCESS_KEY: ${{ secrets.SPACES_SECRET }}
-          RCLONE_CONFIG_SPACES_ENDPOINT: ams3.digitaloceanspaces.com
-          RCLONE_CONFIG_SPACES_ACL: public-read
+          RCLONE_CONFIG_OBJSTORE_TYPE: s3
+          RCLONE_CONFIG_OBJSTORE_PROVIDER: ${{ secrets.S3_PROVIDER }}
+          RCLONE_CONFIG_OBJSTORE_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
+          RCLONE_CONFIG_OBJSTORE_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
+          RCLONE_CONFIG_OBJSTORE_ENDPOINT: ${{ secrets.S3_ENDPOINT }}
+          RCLONE_CONFIG_OBJSTORE_REGION: ${{ secrets.S3_REGION }}
+          RCLONE_CONFIG_OBJSTORE_ACL: public-read
         with:
-          args: sync packages spaces:syncthing/nightly
+          args: sync packages objstore:${{ secrets.S3_BUCKET }}/nightly
 
   #
   # Push release artifacts to Spaces
@@ -696,29 +699,31 @@ jobs:
           version=$(go run build.go version)
           echo "VERSION=$version" >> $GITHUB_ENV
 
-      - name: Push to Spaces (${{ env.VERSION }})
+      - name: Push to object store (${{ env.VERSION }})
         uses: docker://docker.io/rclone/rclone:latest
         env:
-          RCLONE_CONFIG_SPACES_TYPE: s3
-          RCLONE_CONFIG_SPACES_PROVIDER: DigitalOcean
-          RCLONE_CONFIG_SPACES_ACCESS_KEY_ID: ${{ secrets.SPACES_KEY }}
-          RCLONE_CONFIG_SPACES_SECRET_ACCESS_KEY: ${{ secrets.SPACES_SECRET }}
-          RCLONE_CONFIG_SPACES_ENDPOINT: ams3.digitaloceanspaces.com
-          RCLONE_CONFIG_SPACES_ACL: public-read
+          RCLONE_CONFIG_OBJSTORE_TYPE: s3
+          RCLONE_CONFIG_OBJSTORE_PROVIDER: ${{ secrets.S3_PROVIDER }}
+          RCLONE_CONFIG_OBJSTORE_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
+          RCLONE_CONFIG_OBJSTORE_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
+          RCLONE_CONFIG_OBJSTORE_ENDPOINT: ${{ secrets.S3_ENDPOINT }}
+          RCLONE_CONFIG_OBJSTORE_REGION: ${{ secrets.S3_REGION }}
+          RCLONE_CONFIG_OBJSTORE_ACL: public-read
         with:
-          args: sync packages spaces:syncthing/release/${{ env.VERSION }}
+          args: sync packages objstore:${{ secrets.S3_BUCKET }}/release/${{ env.VERSION }}
 
-      - name: Push to Spaces (latest)
+      - name: Push to object store (latest)
         uses: docker://docker.io/rclone/rclone:latest
         env:
-          RCLONE_CONFIG_SPACES_TYPE: s3
-          RCLONE_CONFIG_SPACES_PROVIDER: DigitalOcean
-          RCLONE_CONFIG_SPACES_ACCESS_KEY_ID: ${{ secrets.SPACES_KEY }}
-          RCLONE_CONFIG_SPACES_SECRET_ACCESS_KEY: ${{ secrets.SPACES_SECRET }}
-          RCLONE_CONFIG_SPACES_ENDPOINT: ams3.digitaloceanspaces.com
-          RCLONE_CONFIG_SPACES_ACL: public-read
+          RCLONE_CONFIG_OBJSTORE_TYPE: s3
+          RCLONE_CONFIG_OBJSTORE_PROVIDER: ${{ secrets.S3_PROVIDER }}
+          RCLONE_CONFIG_OBJSTORE_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
+          RCLONE_CONFIG_OBJSTORE_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
+          RCLONE_CONFIG_OBJSTORE_ENDPOINT: ${{ secrets.S3_ENDPOINT }}
+          RCLONE_CONFIG_OBJSTORE_REGION: ${{ secrets.S3_REGION }}
+          RCLONE_CONFIG_OBJSTORE_ACL: public-read
         with:
-          args: sync spaces:syncthing/release/${{ env.VERSION }} spaces:syncthing/release/latest
+          args: sync objstore:${{ secrets.S3_BUCKET }}/release/${{ env.VERSION }} objstore:${{ secrets.S3_BUCKET }}/release/latest
 
   #
   # Build and push to Docker Hub

.gitignore

@@ -18,3 +18,4 @@ deb
 /repos
 /proto/scripts/protoc-gen-gosyncthing
 /gui/next-gen-gui
+/compat.json

.policy.yml

@@ -0,0 +1,93 @@
+# This is the policy-bot configuration for this repository. It controls
+# which approvals are required for any given pull request. The format is
+# described at https://github.com/palantir/policy-bot. The syntax of the
+# policy can be verified by the bot:
+# curl https://pb.syncthing.net/api/validate -X PUT -T .policy.yml
+
+# The policy below is what is required for any pull request.
+policy:
+  approval:
+    - subject is conventional commit
+    - project metadata requires maintainer approval
+    - or:
+      - is approved by a syncthing contributor
+      - is a translation or dependency update by a contributor
+      - is a trivial change by a contributor
+
+  # Additionally, contributors can disapprove of a PR
+  disapproval:
+    requires:
+      teams:
+        - syncthing/contributors
+
+# The rules for the policy are described below.
+
+approval_rules:
+
+  # All commits (PRs before squashing) should have a valid conventional
+  # commit type subject.
+  - name: subject is conventional commit
+    requires:
+      conditions:
+        title:
+          matches:
+            - '^(feat|fix|docs|chore|refactor|build): [a-z].+'
+            - '^(feat|fix|docs|chore|refactor|build)\(\w+(, \w+)*\): [a-z].+'
+
+  # Changes to important project metadata and documentation, including this
+  # policy, require signoff by a maintainer
+  - name: project metadata requires maintainer approval
+    if:
+      changed_files:
+        paths:
+          - ^[^/]+\.md
+          - ^\.policy\.yml
+          - ^\.github/
+          - ^LICENSE
+    requires:
+      count: 1
+      teams:
+        - syncthing/maintainers
+
+  # Regular pull requests require approval by an active contributor
+  - name: is approved by a syncthing contributor
+    requires:
+      count: 1
+      teams:
+        - syncthing/contributors
+
+  # Changes to some files (translations, dependencies, compatibility) do not
+  # require approval if they were proposed by a contributor and have a
+  # matching commit subject
+  - name: is a translation or dependency update by a contributor
+    if:
+      only_changed_files:
+        paths:
+          - ^gui/default/assets/lang/
+          - ^go\.mod$
+          - ^go\.sum$
+          - ^compat\.yaml$
+      title:
+        matches:
+          - '^chore\(gui\):'
+          - '^build\(deps\):'
+          - '^build\(compat\):'
+      has_author_in:
+        teams:
+          - syncthing/contributors
+
+  # If the change is small and the label "trivial" is added, we accept that
+  # on trust. These PRs can be audited after the fact as appropriate.
+  # Features are not trivial.
+  - name: is a trivial change by a contributor
+    if:
+      modified_lines:
+        total: "< 25"
+      title:
+        not_matches:
+          - '^feat'
+      has_labels:
+        - trivial
+      has_author_in:
+        teams:
+          - syncthing/contributors

AUTHORS

@@ -141,6 +141,7 @@ greatroar <61184462+greatroar@users.noreply.github.com>
 Greg <gco@jazzhaiku.com>
 guangwu <guoguangwu@magic-shield.com>
 gudvinr <gudvinr@gmail.com>
+Gusted <postmaster@gusted.xyz> <williamzijl7@hotmail.com>
 Han Boetes <han@boetes.org>
 HansK-p <42314815+HansK-p@users.noreply.github.com>
 Harrison Jones (harrisonhjones) <harrisonhjones@users.noreply.github.com>
@@ -209,6 +210,7 @@ Liu Siyuan (liusy182) <liusy182@gmail.com> <liusy182@hotmail.com>
 Lode Hoste (Zillode) <zillode@zillode.be>
 Lord Landon Agahnim (LordLandon) <lordlandon@gmail.com>
 LSmithx2 <42276854+lsmithx2@users.noreply.github.com>
+luchenhan <168071714+luchenhan@users.noreply.github.com>
 Lukas Lihotzki <lukas@lihotzki.de>
 Luke Hamburg <1992842+luckman212@users.noreply.github.com>
 luzpaz <luzpaz@users.noreply.github.com>
@@ -231,6 +233,7 @@ Matteo Ruina <matteo.ruina@gmail.com>
 Maurizio Tomasi <ziotom78@gmail.com>
 Max <github@germancoding.com>
 Max Schulze (kralo) <max.schulze@online.de> <kralo@users.noreply.github.com>
+maxice8 <30738253+maxice8@users.noreply.github.com>
 MaximAL <almaximal@ya.ru>
 Maxime Thirouin <m@moox.io>
 Maximilian <maxi.rostock@outlook.de> <public@complexvector.space>
@@ -300,10 +303,13 @@ Scott Klupfel (kluppy) <kluppy@going2blue.com>
 sec65 <106604020+sec65@users.noreply.github.com>
 Sergey Mishin (ralder) <ralder@yandex.ru>
 Sertonix <83883937+Sertonix@users.noreply.github.com>
+Severin von Wnuck-Lipinski <ss7@live.de>
 Shaarad Dalvi <60266155+shaaraddalvi@users.noreply.github.com> <shdalv@microsoft.com>
 Simon Frei (imsodin) <freisim93@gmail.com>
 Simon Mwepu <simonmwepu@gmail.com>
+Simon Pickup <simon@pickupinfinity.com>
 Sly_tom_cat <slytomcat@mail.ru>
+Sonu Kumar Saw <31889738+dev-saw99@users.noreply.github.com>
 Stefan Kuntz (Stefan-Code) <stefan.github@gmail.com> <Stefan.github@gmail.com>
 Stefan Tatschner (rumpelsepp) <stefan@sevenbyte.org> <rumpelsepp@sevenbyte.org> <stefan@rumpelsepp.org>
 Steven Eckhoff <steven.eckhoff.opensource@gmail.com>
@@ -323,6 +329,7 @@ Tobias Tom (tobiastom) <t.tom@succont.de>
 Tom Jakubowski <tom@crystae.net>
 Tomasz Wilczyński <5626656+tomasz1986@users.noreply.github.com> <twilczynski@naver.com>
 Tommy Thorn <tommy-github-email@thorn.ws>
+Tommy van der Vorst <tommy-github@pixelspark.nl> <tommy@pixelspark.nl>
 Tully Robinson (tojrobinson) <tully@tojr.org>
 Tyler Brazier (tylerbrazier) <tyler@tylerbrazier.com>
 Tyler Kropp <kropptyler@gmail.com>
@@ -335,6 +342,7 @@ Vil Brekin (Vilbrekin) <vilbrekin@gmail.com>
 villekalliomaki <53118179+villekalliomaki@users.noreply.github.com>
 Vladimir Rusinov <vrusinov@google.com> <vladimir.rusinov@gmail.com>
 wangguoliang <liangcszzu@163.com>
+WangXi <xib1102@icloud.com>
 Will Rouesnel <wrouesnel@wrouesnel.com>
 William A. Kennington III (wkennington) <william@wkennington.com>
 wouter bolsterlee <wouter@bolsterl.ee>

Dockerfile.strelaypoolsrv

@@ -11,14 +11,6 @@ LABEL org.opencontainers.image.authors="The Syncthing Project" \
 
 EXPOSE 8080
 
-RUN apk add --no-cache ca-certificates su-exec curl
-ENV PUID=1000 PGID=1000 MAXMIND_KEY=
-
-RUN mkdir /var/strelaypoolsrv && chown 1000 /var/strelaypoolsrv
-USER 1000
-
 COPY strelaypoolsrv-linux-${TARGETARCH} /bin/strelaypoolsrv
-COPY script/strelaypoolsrv-entrypoint.sh /bin/entrypoint.sh
 
-WORKDIR /var/strelaypoolsrv
-ENTRYPOINT ["/bin/entrypoint.sh", "/bin/strelaypoolsrv", "-listen", ":8080"]
+ENTRYPOINT ["/bin/strelaypoolsrv", "-listen", ":8080"]

README-Docker.md

@@ -49,6 +49,11 @@ services:
       - 22000:22000/udp # QUIC file transfers
       - 21027:21027/udp # Receive local discovery broadcasts
     restart: unless-stopped
+    healthcheck:
+      test: curl -fkLsS -m 2 127.0.0.1:8384/rest/noauth/health | grep -o --color=never OK || exit 1
+      interval: 1m
+      timeout: 10s
+      retries: 3
 ```
 
 ## Discovery
@@ -84,6 +89,11 @@ services:
       - /wherever/st-sync:/var/syncthing
     network_mode: host
     restart: unless-stopped
+    healthcheck:
+      test: curl -fkLsS -m 2 127.0.0.1:8384/rest/noauth/health | grep -o --color=never OK || exit 1
+      interval: 1m
+      timeout: 10s
+      retries: 3
 ```
 
 Be aware that syncthing alone is now in control of what interfaces and ports it

build.go

@@ -4,8 +4,8 @@
 // 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:build ignore
-// +build ignore
+//go:build tools
+// +build tools
 
 package main
 
@@ -33,8 +33,9 @@ import (
 	"text/template"
 	"time"
 
-	_ "github.com/syncthing/syncthing/lib/automaxprocs"
 	buildpkg "github.com/syncthing/syncthing/lib/build"
+	"github.com/syncthing/syncthing/lib/upgrade"
+	"sigs.k8s.io/yaml"
 )
 
 var (
@@ -119,7 +120,6 @@ var targets = map[string]target{
 			{src: "man/syncthing-security.7", dst: "deb/usr/share/man/man7/syncthing-security.7", perm: 0644},
 			{src: "man/syncthing-versioning.7", dst: "deb/usr/share/man/man7/syncthing-versioning.7", perm: 0644},
 			{src: "etc/linux-systemd/system/syncthing@.service", dst: "deb/lib/systemd/system/syncthing@.service", perm: 0644},
-			{src: "etc/linux-systemd/system/syncthing-resume.service", dst: "deb/lib/systemd/system/syncthing-resume.service", perm: 0644},
 			{src: "etc/linux-systemd/user/syncthing.service", dst: "deb/usr/lib/systemd/user/syncthing.service", perm: 0644},
 			{src: "etc/linux-sysctl/30-syncthing.conf", dst: "deb/usr/lib/sysctl.d/30-syncthing.conf", perm: 0644},
 			{src: "etc/firewall-ufw/syncthing", dst: "deb/etc/ufw/applications.d/syncthing", perm: 0644},
@@ -193,37 +193,37 @@ var targets = map[string]target{
 		debname:     "syncthing-relaypoolsrv",
 		debdeps:     []string{"libc6"},
 		description: "Syncthing Relay Pool Server",
-		buildPkgs:   []string{"github.com/syncthing/syncthing/cmd/strelaypoolsrv"},
+		buildPkgs:   []string{"github.com/syncthing/syncthing/cmd/infra/strelaypoolsrv"},
 		binaryName:  "strelaypoolsrv", // .exe will be added automatically for Windows builds
 		archiveFiles: []archiveFile{
 			{src: "{{binary}}", dst: "{{binary}}", perm: 0755},
-			{src: "cmd/strelaypoolsrv/README.md", dst: "README.txt", perm: 0644},
-			{src: "cmd/strelaypoolsrv/LICENSE", dst: "LICENSE.txt", perm: 0644},
+			{src: "cmd/infra/strelaypoolsrv/README.md", dst: "README.txt", perm: 0644},
+			{src: "cmd/infra/strelaypoolsrv/LICENSE", dst: "LICENSE.txt", perm: 0644},
 			{src: "AUTHORS", dst: "AUTHORS.txt", perm: 0644},
 		},
 		installationFiles: []archiveFile{
 			{src: "{{binary}}", dst: "deb/usr/bin/{{binary}}", perm: 0755},
-			{src: "cmd/strelaypoolsrv/README.md", dst: "deb/usr/share/doc/syncthing-relaypoolsrv/README.txt", perm: 0644},
-			{src: "cmd/strelaypoolsrv/LICENSE", dst: "deb/usr/share/doc/syncthing-relaypoolsrv/LICENSE.txt", perm: 0644},
+			{src: "cmd/infra/strelaypoolsrv/README.md", dst: "deb/usr/share/doc/syncthing-relaypoolsrv/README.txt", perm: 0644},
+			{src: "cmd/infra/strelaypoolsrv/LICENSE", dst: "deb/usr/share/doc/syncthing-relaypoolsrv/LICENSE.txt", perm: 0644},
 			{src: "AUTHORS", dst: "deb/usr/share/doc/syncthing-relaypoolsrv/AUTHORS.txt", perm: 0644},
 		},
 	},
 	"stupgrades": {
 		name:        "stupgrades",
 		description: "Syncthing Upgrade Check Server",
-		buildPkgs:   []string{"github.com/syncthing/syncthing/cmd/stupgrades"},
+		buildPkgs:   []string{"github.com/syncthing/syncthing/cmd/infra/stupgrades"},
 		binaryName:  "stupgrades",
 	},
 	"stcrashreceiver": {
 		name:        "stcrashreceiver",
 		description: "Syncthing Crash Server",
-		buildPkgs:   []string{"github.com/syncthing/syncthing/cmd/stcrashreceiver"},
+		buildPkgs:   []string{"github.com/syncthing/syncthing/cmd/infra/stcrashreceiver"},
 		binaryName:  "stcrashreceiver",
 	},
 	"ursrv": {
 		name:        "ursrv",
 		description: "Syncthing Usage Reporting Server",
-		buildPkgs:   []string{"github.com/syncthing/syncthing/cmd/ursrv"},
+		buildPkgs:   []string{"github.com/syncthing/syncthing/cmd/infra/ursrv"},
 		binaryName:  "ursrv",
 	},
 }
@@ -232,15 +232,11 @@ func initTargets() {
 	all := targets["all"]
 	pkgs, _ := filepath.Glob("cmd/*")
 	for _, pkg := range pkgs {
-		pkg = filepath.Base(pkg)
-		if strings.HasPrefix(pkg, ".") {
-			// ignore dotfiles
+		if files, err := filepath.Glob(pkg + "/*.go"); err != nil || len(files) == 0 {
+			// No go files in the directory
 			continue
 		}
-		if noupgrade && pkg == "stupgrades" {
-			continue
-		}
-		all.buildPkgs = append(all.buildPkgs, fmt.Sprintf("github.com/syncthing/syncthing/cmd/%s", pkg))
+		all.buildPkgs = append(all.buildPkgs, fmt.Sprintf("github.com/syncthing/syncthing/%s", pkg))
 	}
 	targets["all"] = all
 
@@ -344,9 +340,11 @@ func runCommand(cmd string, target target) {
 
 	case "tar":
 		buildTar(target, tags)
+		writeCompatJSON()
 
 	case "zip":
 		buildZip(target, tags)
+		writeCompatJSON()
 
 	case "deb":
 		buildDeb(target)
@@ -836,12 +834,12 @@ func listFiles(dir string) []string {
 
 func rebuildAssets() {
 	os.Setenv("SOURCE_DATE_EPOCH", fmt.Sprint(buildStamp()))
-	runPrint(goCmd, "generate", "github.com/syncthing/syncthing/lib/api/auto", "github.com/syncthing/syncthing/cmd/strelaypoolsrv/auto")
+	runPrint(goCmd, "generate", "github.com/syncthing/syncthing/lib/api/auto", "github.com/syncthing/syncthing/cmd/infra/strelaypoolsrv/auto")
 }
 
 func lazyRebuildAssets() {
 	shouldRebuild := shouldRebuildAssets("lib/api/auto/gui.files.go", "gui") ||
-		shouldRebuildAssets("cmd/strelaypoolsrv/auto/gui.files.go", "cmd/strelaypoolsrv/gui")
+		shouldRebuildAssets("cmd/infra/strelaypoolsrv/auto/gui.files.go", "cmd/infra/strelaypoolsrv/gui")
 
 	if withNextGenGUI {
 		shouldRebuild = buildNextGenGUI() || shouldRebuild
@@ -1559,3 +1557,29 @@ func nextPatchVersion(ver string) string {
 	digits[len(digits)-1] = strconv.Itoa(n + 1)
 	return strings.Join(digits, ".")
 }
+
+func writeCompatJSON() {
+	bs, err := os.ReadFile("compat.yaml")
+	if err != nil {
+		log.Fatal("Reading compat.yaml:", err)
+	}
+
+	var entries []upgrade.ReleaseCompatibility
+	if err := yaml.Unmarshal(bs, &entries); err != nil {
+		log.Fatal("Parsing compat.yaml:", err)
+	}
+
+	rt := runtime.Version()
+	for _, e := range entries {
+		if !strings.HasPrefix(rt, e.Runtime) {
+			continue
+		}
+		bs, _ := json.MarshalIndent(e, "", "  ")
+		if err := os.WriteFile("compat.json", bs, 0o644); err != nil {
+			log.Fatal("Writing compat.json:", err)
+		}
+		return
+	}
+
+	log.Fatalf("runtime %v not found in compat.yaml", rt)
+}

build.sh

@@ -26,7 +26,7 @@ case "${1:-default}" in
 		build weblate
 		pushd man ; ./refresh.sh ; popd
 		git add -A gui man AUTHORS
-		git commit -m 'gui, man, authors: Update docs, translations, and contributors'
+		git commit -m 'chore(gui, man, authors): update docs, translations, and contributors'
 		;;
 
 	*)

cmd/dev/stcompdirs/main.go

@@ -7,6 +7,7 @@
 package main
 
 import (
+	"crypto/sha256"
 	"errors"
 	"flag"
 	"fmt"
@@ -16,7 +17,6 @@ import (
 	"path/filepath"
 
 	_ "github.com/syncthing/syncthing/lib/automaxprocs"
-	"github.com/syncthing/syncthing/lib/sha256"
 )
 
 func main() {

cmd/dev/stwatchfile/main.go

@@ -7,6 +7,7 @@
 package main
 
 import (
+	"crypto/sha256"
 	"flag"
 	"fmt"
 	"io"
@@ -14,7 +15,6 @@ import (
 	"time"
 
 	_ "github.com/syncthing/syncthing/lib/automaxprocs"
-	"github.com/syncthing/syncthing/lib/sha256"
 )
 
 func main() {

cmd/infra/stcrashreceiver/main.go

@@ -14,6 +14,7 @@ package main
 
 import (
 	"context"
+	"crypto/sha256"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -21,25 +22,29 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
+	"regexp"
+	"strings"
 
 	"github.com/alecthomas/kong"
 	raven "github.com/getsentry/raven-go"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	_ "github.com/syncthing/syncthing/lib/automaxprocs"
-	"github.com/syncthing/syncthing/lib/sha256"
+	"github.com/syncthing/syncthing/lib/build"
 	"github.com/syncthing/syncthing/lib/ur"
 )
 
 const maxRequestSize = 1 << 20 // 1 MiB
 
 type cli struct {
-	Dir           string `help:"Parent directory to store crash and failure reports in" env:"REPORTS_DIR" default:"."`
-	DSN           string `help:"Sentry DSN" env:"SENTRY_DSN"`
-	Listen        string `help:"HTTP listen address" default:":8080" env:"LISTEN_ADDRESS"`
-	MaxDiskFiles  int    `help:"Maximum number of reports on disk" default:"100000" env:"MAX_DISK_FILES"`
-	MaxDiskSizeMB int64  `help:"Maximum disk space to use for reports" default:"1024" env:"MAX_DISK_SIZE_MB"`
-	SentryQueue   int    `help:"Maximum number of reports to queue for sending to Sentry" default:"64" env:"SENTRY_QUEUE"`
-	DiskQueue     int    `help:"Maximum number of reports to queue for writing to disk" default:"64" env:"DISK_QUEUE"`
+	Dir            string `help:"Parent directory to store crash and failure reports in" env:"REPORTS_DIR" default:"."`
+	DSN            string `help:"Sentry DSN" env:"SENTRY_DSN"`
+	Listen         string `help:"HTTP listen address" default:":8080" env:"LISTEN_ADDRESS"`
+	MaxDiskFiles   int    `help:"Maximum number of reports on disk" default:"100000" env:"MAX_DISK_FILES"`
+	MaxDiskSizeMB  int64  `help:"Maximum disk space to use for reports" default:"1024" env:"MAX_DISK_SIZE_MB"`
+	SentryQueue    int    `help:"Maximum number of reports to queue for sending to Sentry" default:"64" env:"SENTRY_QUEUE"`
+	DiskQueue      int    `help:"Maximum number of reports to queue for writing to disk" default:"64" env:"DISK_QUEUE"`
+	MetricsListen  string `help:"HTTP listen address for metrics" default:":8081" env:"METRICS_LISTEN_ADDRESS"`
+	IngorePatterns string `help:"File containing ignore patterns (regexp)" env:"IGNORE_PATTERNS" type:"existingfile"`
 }
 
 func main() {
@@ -62,19 +67,38 @@ func main() {
 	}
 	go ss.Serve(context.Background())
 
+	var ip *ignorePatterns
+	if params.IngorePatterns != "" {
+		var err error
+		ip, err = loadIgnorePatterns(params.IngorePatterns)
+		if err != nil {
+			log.Fatalf("Failed to load ignore patterns: %v", err)
+		}
+	}
+
 	cr := &crashReceiver{
 		store:  ds,
 		sentry: ss,
+		ignore: ip,
 	}
 
 	mux.Handle("/", cr)
 	mux.HandleFunc("/ping", func(w http.ResponseWriter, req *http.Request) {
 		w.Write([]byte("OK"))
 	})
-	mux.Handle("/metrics", promhttp.Handler())
+
+	if params.MetricsListen != "" {
+		mmux := http.NewServeMux()
+		mmux.Handle("/metrics", promhttp.Handler())
+		go func() {
+			if err := http.ListenAndServe(params.MetricsListen, mmux); err != nil {
+				log.Fatalln("HTTP serve metrics:", err)
+			}
+		}()
+	}
 
 	if params.DSN != "" {
-		mux.HandleFunc("/newcrash/failure", handleFailureFn(params.DSN, filepath.Join(params.Dir, "failure_reports")))
+		mux.HandleFunc("/newcrash/failure", handleFailureFn(params.DSN, filepath.Join(params.Dir, "failure_reports"), ip))
 	}
 
 	log.SetOutput(os.Stdout)
@@ -83,7 +107,7 @@ func main() {
 	}
 }
 
-func handleFailureFn(dsn, failureDir string) func(w http.ResponseWriter, req *http.Request) {
+func handleFailureFn(dsn, failureDir string, ignore *ignorePatterns) func(w http.ResponseWriter, req *http.Request) {
 	return func(w http.ResponseWriter, req *http.Request) {
 		result := "failure"
 		defer func() {
@@ -98,6 +122,11 @@ func handleFailureFn(dsn, failureDir string) func(w http.ResponseWriter, req *ht
 			return
 		}
 
+		if ignore.match(bs) {
+			result = "ignored"
+			return
+		}
+
 		var reports []ur.FailureReport
 		err = json.Unmarshal(bs, &reports)
 		if err != nil {
@@ -110,7 +139,7 @@ func handleFailureFn(dsn, failureDir string) func(w http.ResponseWriter, req *ht
 			return
 		}
 
-		version, err := parseVersion(reports[0].Version)
+		version, err := build.ParseVersion(reports[0].Version)
 		if err != nil {
 			http.Error(w, err.Error(), 400)
 			return
@@ -158,3 +187,42 @@ func saveFailureWithGoroutines(data ur.FailureData, failureDir string) (string,
 	}
 	return reportServer + path, nil
 }
+
+type ignorePatterns struct {
+	patterns []*regexp.Regexp
+}
+
+func loadIgnorePatterns(path string) (*ignorePatterns, error) {
+	bs, err := os.ReadFile(path)
+	if err != nil {
+		return nil, err
+	}
+
+	var patterns []*regexp.Regexp
+	for _, line := range strings.Split(string(bs), "\n") {
+		line = strings.TrimSpace(line)
+		if line == "" {
+			continue
+		}
+		re, err := regexp.Compile(line)
+		if err != nil {
+			return nil, err
+		}
+		patterns = append(patterns, re)
+	}
+
+	log.Printf("Loaded %d ignore patterns", len(patterns))
+	return &ignorePatterns{patterns: patterns}, nil
+}
+
+func (i *ignorePatterns) match(report []byte) bool {
+	if i == nil {
+		return false
+	}
+	for _, re := range i.patterns {
+		if re.Match(report) {
+			return true
+		}
+	}
+	return false
+}

cmd/infra/stcrashreceiver/sentry.go

@@ -18,6 +18,7 @@ import (
 
 	raven "github.com/getsentry/raven-go"
 	"github.com/maruel/panicparse/v2/stack"
+	"github.com/syncthing/syncthing/lib/build"
 )
 
 const reportServer = "https://crash.syncthing.net/report/"
@@ -105,7 +106,7 @@ func parseCrashReport(path string, report []byte) (*raven.Packet, error) {
 		return nil, errors.New("no first line")
 	}
 
-	version, err := parseVersion(string(parts[0]))
+	version, err := build.ParseVersion(string(parts[0]))
 	if err != nil {
 		return nil, err
 	}
@@ -143,12 +144,12 @@ func parseCrashReport(path string, report []byte) (*raven.Packet, error) {
 	}
 
 	// Lock the source code loader to the version we are processing here.
-	if version.commit != "" {
+	if version.Commit != "" {
 		// We have a commit hash, so we know exactly which source to use
-		loader.LockWithVersion(version.commit)
-	} else if strings.HasPrefix(version.tag, "v") {
+		loader.LockWithVersion(version.Commit)
+	} else if strings.HasPrefix(version.Tag, "v") {
 		// Lets hope the tag is close enough
-		loader.LockWithVersion(version.tag)
+		loader.LockWithVersion(version.Tag)
 	} else {
 		// Last resort
 		loader.LockWithVersion("main")
@@ -215,106 +216,26 @@ func crashReportFingerprint(message string) []string {
 	return []string{"{{ default }}", message}
 }
 
-// syncthing v1.1.4-rc.1+30-g6aaae618-dirty-crashrep "Erbium Earthworm" (go1.12.5 darwin-amd64) jb@kvin.kastelo.net 2019-05-23 16:08:14 UTC [foo, bar]
-// or, somewhere along the way the "+" in the version tag disappeared:
-// syncthing v1.23.7-dev.26.gdf7b56ae.dirty-stversionextra "Fermium Flea" (go1.20.5 darwin-arm64) jb@ok.kastelo.net 2023-07-12 06:55:26 UTC [Some Wrapper, purego, stnoupgrade]
-var (
-	longVersionRE = regexp.MustCompile(`syncthing\s+(v[^\s]+)\s+"([^"]+)"\s\(([^\s]+)\s+([^-]+)-([^)]+)\)\s+([^\s]+)[^\[]*(?:\[(.+)\])?$`)
-	gitExtraRE    = regexp.MustCompile(`\.\d+\.g[0-9a-f]+`) // ".1.g6aaae618"
-	gitExtraSepRE = regexp.MustCompile(`[.-]`)              // dot or dash
-)
-
-type version struct {
-	version  string   // "v1.1.4-rc.1+30-g6aaae618-dirty-crashrep"
-	tag      string   // "v1.1.4-rc.1"
-	commit   string   // "6aaae618", blank when absent
-	codename string   // "Erbium Earthworm"
-	runtime  string   // "go1.12.5"
-	goos     string   // "darwin"
-	goarch   string   // "amd64"
-	builder  string   // "jb@kvin.kastelo.net"
-	extra    []string // "foo", "bar"
-}
-
-func (v version) environment() string {
-	if v.commit != "" {
-		return "Development"
-	}
-	if strings.Contains(v.tag, "-rc.") {
-		return "Candidate"
-	}
-	if strings.Contains(v.tag, "-") {
-		return "Beta"
-	}
-	return "Stable"
-}
-
-func parseVersion(line string) (version, error) {
-	m := longVersionRE.FindStringSubmatch(line)
-	if len(m) == 0 {
-		return version{}, errors.New("unintelligeble version string")
-	}
-
-	v := version{
-		version:  m[1],
-		codename: m[2],
-		runtime:  m[3],
-		goos:     m[4],
-		goarch:   m[5],
-		builder:  m[6],
-	}
-
-	// Split the version tag into tag and commit. This is old style
-	// v1.2.3-something.4+11-g12345678 or newer with just dots
-	// v1.2.3-something.4.11.g12345678 or v1.2.3-dev.11.g12345678.
-	parts := []string{v.version}
-	if strings.Contains(v.version, "+") {
-		parts = strings.Split(v.version, "+")
-	} else {
-		idxs := gitExtraRE.FindStringIndex(v.version)
-		if len(idxs) > 0 {
-			parts = []string{v.version[:idxs[0]], v.version[idxs[0]+1:]}
-		}
-	}
-	v.tag = parts[0]
-	if len(parts) > 1 {
-		fields := gitExtraSepRE.Split(parts[1], -1)
-		if len(fields) >= 2 && strings.HasPrefix(fields[1], "g") {
-			v.commit = fields[1][1:]
-		}
-	}
-
-	if len(m) >= 8 && m[7] != "" {
-		tags := strings.Split(m[7], ",")
-		for i := range tags {
-			tags[i] = strings.TrimSpace(tags[i])
-		}
-		v.extra = tags
-	}
-
-	return v, nil
-}
-
-func packet(version version, reportType string) *raven.Packet {
+func packet(version build.VersionParts, reportType string) *raven.Packet {
 	pkt := &raven.Packet{
 		Platform:    "go",
-		Release:     version.tag,
-		Environment: version.environment(),
+		Release:     version.Tag,
+		Environment: version.Environment(),
 		Tags: raven.Tags{
-			raven.Tag{Key: "version", Value: version.version},
-			raven.Tag{Key: "tag", Value: version.tag},
-			raven.Tag{Key: "codename", Value: version.codename},
-			raven.Tag{Key: "runtime", Value: version.runtime},
-			raven.Tag{Key: "goos", Value: version.goos},
-			raven.Tag{Key: "goarch", Value: version.goarch},
-			raven.Tag{Key: "builder", Value: version.builder},
+			raven.Tag{Key: "version", Value: version.Version},
+			raven.Tag{Key: "tag", Value: version.Tag},
+			raven.Tag{Key: "codename", Value: version.Codename},
+			raven.Tag{Key: "runtime", Value: version.Runtime},
+			raven.Tag{Key: "goos", Value: version.GOOS},
+			raven.Tag{Key: "goarch", Value: version.GOARCH},
+			raven.Tag{Key: "builder", Value: version.Builder},
 			raven.Tag{Key: "report_type", Value: reportType},
 		},
 	}
-	if version.commit != "" {
-		pkt.Tags = append(pkt.Tags, raven.Tag{Key: "commit", Value: version.commit})
+	if version.Commit != "" {
+		pkt.Tags = append(pkt.Tags, raven.Tag{Key: "commit", Value: version.Commit})
 	}
-	for _, tag := range version.extra {
+	for _, tag := range version.Extra {
 		pkt.Tags = append(pkt.Tags, raven.Tag{Key: tag, Value: "1"})
 	}
 	return pkt

cmd/infra/stcrashreceiver/sentry_test.go

@@ -12,66 +12,6 @@ import (
 	"testing"
 )
 
-func TestParseVersion(t *testing.T) {
-	cases := []struct {
-		longVersion string
-		parsed      version
-	}{
-		{
-			longVersion: `syncthing v1.1.4-rc.1+30-g6aaae618-dirty-crashrep "Erbium Earthworm" (go1.12.5 darwin-amd64) jb@kvin.kastelo.net 2019-05-23 16:08:14 UTC`,
-			parsed: version{
-				version:  "v1.1.4-rc.1+30-g6aaae618-dirty-crashrep",
-				tag:      "v1.1.4-rc.1",
-				commit:   "6aaae618",
-				codename: "Erbium Earthworm",
-				runtime:  "go1.12.5",
-				goos:     "darwin",
-				goarch:   "amd64",
-				builder:  "jb@kvin.kastelo.net",
-			},
-		},
-		{
-			longVersion: `syncthing v1.1.4-rc.1+30-g6aaae618-dirty-crashrep "Erbium Earthworm" (go1.12.5 darwin-amd64) jb@kvin.kastelo.net 2019-05-23 16:08:14 UTC [foo, bar]`,
-			parsed: version{
-				version:  "v1.1.4-rc.1+30-g6aaae618-dirty-crashrep",
-				tag:      "v1.1.4-rc.1",
-				commit:   "6aaae618",
-				codename: "Erbium Earthworm",
-				runtime:  "go1.12.5",
-				goos:     "darwin",
-				goarch:   "amd64",
-				builder:  "jb@kvin.kastelo.net",
-				extra:    []string{"foo", "bar"},
-			},
-		},
-		{
-			longVersion: `syncthing v1.23.7-dev.26.gdf7b56ae-stversionextra "Fermium Flea" (go1.20.5 darwin-arm64) jb@ok.kastelo.net 2023-07-12 06:55:26 UTC [Some Wrapper, purego, stnoupgrade]`,
-			parsed: version{
-				version:  "v1.23.7-dev.26.gdf7b56ae-stversionextra",
-				tag:      "v1.23.7-dev",
-				commit:   "df7b56ae",
-				codename: "Fermium Flea",
-				runtime:  "go1.20.5",
-				goos:     "darwin",
-				goarch:   "arm64",
-				builder:  "jb@ok.kastelo.net",
-				extra:    []string{"Some Wrapper", "purego", "stnoupgrade"},
-			},
-		},
-	}
-
-	for _, tc := range cases {
-		v, err := parseVersion(tc.longVersion)
-		if err != nil {
-			t.Errorf("%s\nerror: %v\n", tc.longVersion, err)
-			continue
-		}
-		if fmt.Sprint(v) != fmt.Sprint(tc.parsed) {
-			t.Errorf("%s\nA: %v\nE: %v\n", tc.longVersion, v, tc.parsed)
-		}
-	}
-}
-
 func TestParseReport(t *testing.T) {
 	bs, err := os.ReadFile("_testdata/panic.log")
 	if err != nil {

cmd/infra/stcrashreceiver/stcrashreceiver.go

@@ -12,11 +12,16 @@ import (
 	"net/http"
 	"path"
 	"strings"
+	"sync"
 )
 
 type crashReceiver struct {
 	store  *diskStore
 	sentry *sentryService
+	ignore *ignorePatterns
+
+	ignoredMut sync.RWMutex
+	ignored    map[string]struct{}
 }
 
 func (r *crashReceiver) ServeHTTP(w http.ResponseWriter, req *http.Request) {
@@ -64,6 +69,12 @@ func (r *crashReceiver) serveGet(reportID string, w http.ResponseWriter, _ *http
 // serveHead responds to HEAD requests by checking if the named report
 // already exists in the system.
 func (r *crashReceiver) serveHead(reportID string, w http.ResponseWriter, _ *http.Request) {
+	r.ignoredMut.RLock()
+	_, ignored := r.ignored[reportID]
+	r.ignoredMut.RUnlock()
+	if ignored {
+		return // found
+	}
 	if !r.store.Exists(reportID) {
 		http.Error(w, "Not found", http.StatusNotFound)
 	}
@@ -76,6 +87,15 @@ func (r *crashReceiver) servePut(reportID string, w http.ResponseWriter, req *ht
 		metricCrashReportsTotal.WithLabelValues(result).Inc()
 	}()
 
+	r.ignoredMut.RLock()
+	_, ignored := r.ignored[reportID]
+	r.ignoredMut.RUnlock()
+	if ignored {
+		result = "ignored_cached"
+		io.Copy(io.Discard, req.Body)
+		return // found
+	}
+
 	// Read at most maxRequestSize of report data.
 	log.Println("Receiving report", reportID)
 	lr := io.LimitReader(req.Body, maxRequestSize)
@@ -86,6 +106,17 @@ func (r *crashReceiver) servePut(reportID string, w http.ResponseWriter, req *ht
 		return
 	}
 
+	if r.ignore.match(bs) {
+		r.ignoredMut.Lock()
+		if r.ignored == nil {
+			r.ignored = make(map[string]struct{})
+		}
+		r.ignored[reportID] = struct{}{}
+		r.ignoredMut.Unlock()
+		result = "ignored"
+		return
+	}
+
 	result = "success"
 
 	// Store the report

cmd/infra/stcrashreceiver/util.go

@@ -9,14 +9,13 @@ package main
 import (
 	"bytes"
 	"compress/gzip"
+	"crypto/sha256"
 	"fmt"
 	"net"
 	"net/http"
 	"os"
 	"path/filepath"
 	"time"
-
-	"github.com/syncthing/syncthing/lib/sha256"
 )
 
 // userIDFor returns a string we can use as the user ID for the purpose of

cmd/infra/strelaypoolsrv/README.md

@@ -21,4 +21,3 @@ See `relaypoolsrv -help` for configuration options.
 
 [oschwald/geoip2-golang](https://github.com/oschwald/geoip2-golang), [oschwald/maxminddb-golang](https://github.com/oschwald/maxminddb-golang), Copyright (C) 2015 [Gregory J. Oschwald](mailto:oschwald@gmail.com).
 
-[lib/pq](https://github.com/lib/pq)</a>, Copyright (C) 2011-2013 'pq' Contributors Portions Copyright (C) 2011 Blake Mizerany.

cmd/infra/strelaypoolsrv/auto/doc.go

@@ -4,7 +4,7 @@
 // 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
+//go:generate go run ../../../../script/genassets.go -o gui.files.go ../gui
 
 // Package auto contains auto generated files for web assets.
 package auto

cmd/infra/strelaypoolsrv/gui/index.html

@@ -259,7 +259,7 @@
       return a.value > b.value ? 1 : -1;
     }
 
-    $http.get("/endpoint").then(function(response) {
+    $http.get("/endpoint/full").then(function(response) {
       $scope.relays = response.data.relays;
 
       angular.forEach($scope.relays, function(relay) {
@@ -338,7 +338,7 @@
         relay.showMarker = function() {
           relay.marker.openPopup();
         }
-        
+
         relay.hideMarker = function() {
           relay.marker.closePopup();
         }
@@ -347,7 +347,7 @@
 
     function addCircleToMap(relay) {
       console.log(relay.location.latitude)
-      L.circle([relay.location.latitude, relay.location.longitude], 
+      L.circle([relay.location.latitude, relay.location.longitude],
         {
           radius: ((relay.stats.bytesProxied * 100) / $scope.totals.bytesProxied) * 10000,
           color: "FF0000",

cmd/infra/strelaypoolsrv/main.go

@@ -21,15 +21,13 @@ import (
 	"time"
 
 	lru "github.com/hashicorp/golang-lru/v2"
-	"github.com/oschwald/geoip2-golang"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
-	"github.com/syncthing/syncthing/cmd/strelaypoolsrv/auto"
+	"github.com/syncthing/syncthing/cmd/infra/strelaypoolsrv/auto"
 	"github.com/syncthing/syncthing/lib/assets"
 	_ "github.com/syncthing/syncthing/lib/automaxprocs"
-	"github.com/syncthing/syncthing/lib/httpcache"
+	"github.com/syncthing/syncthing/lib/geoip"
 	"github.com/syncthing/syncthing/lib/protocol"
-	"github.com/syncthing/syncthing/lib/rand"
 	"github.com/syncthing/syncthing/lib/relay/client"
 	"github.com/syncthing/syncthing/lib/sync"
 	"github.com/syncthing/syncthing/lib/tlsutil"
@@ -51,6 +49,10 @@ type relay struct {
 	StatsRetrieved time.Time `json:"statsRetrieved"`
 }
 
+type relayShort struct {
+	URL string `json:"url"`
+}
+
 type stats struct {
 	StartTime          time.Time `json:"startTime"`
 	UptimeSeconds      int       `json:"uptimeSeconds"`
@@ -95,16 +97,18 @@ var (
 	testCert          tls.Certificate
 	knownRelaysFile   = filepath.Join(os.TempDir(), "strelaypoolsrv_known_relays")
 	listen            = ":80"
+	metricsListen     = ":8081"
 	dir               string
 	evictionTime      = time.Hour
 	debug             bool
 	permRelaysFile    string
 	ipHeader          string
-	geoipPath         string
 	proto             string
 	statsRefresh      = time.Minute
 	requestQueueLen   = 64
 	requestProcessors = 8
+	geoipLicenseKey   = os.Getenv("GEOIP_LICENSE_KEY")
+	geoipAccountID, _ = strconv.Atoi(os.Getenv("GEOIP_ACCOUNT_ID"))
 
 	requests chan request
 
@@ -124,40 +128,45 @@ func main() {
 	log.SetFlags(log.Lshortfile)
 
 	flag.StringVar(&listen, "listen", listen, "Listen address")
+	flag.StringVar(&metricsListen, "metrics-listen", metricsListen, "Metrics listen address")
 	flag.StringVar(&dir, "keys", dir, "Directory where http-cert.pem and http-key.pem is stored for TLS listening")
 	flag.BoolVar(&debug, "debug", debug, "Enable debug output")
 	flag.DurationVar(&evictionTime, "eviction", evictionTime, "After how long the relay is evicted")
 	flag.StringVar(&permRelaysFile, "perm-relays", "", "Path to list of permanent relays")
 	flag.StringVar(&knownRelaysFile, "known-relays", knownRelaysFile, "Path to list of current relays")
 	flag.StringVar(&ipHeader, "ip-header", "", "Name of header which holds clients ip:port. Only meaningful when running behind a reverse proxy.")
-	flag.StringVar(&geoipPath, "geoip", "GeoLite2-City.mmdb", "Path to GeoLite2-City database")
 	flag.StringVar(&proto, "protocol", "tcp", "Protocol used for listening. 'tcp' for IPv4 and IPv6, 'tcp4' for IPv4, 'tcp6' for IPv6")
 	flag.DurationVar(&statsRefresh, "stats-refresh", statsRefresh, "Interval at which to refresh relay stats")
 	flag.IntVar(&requestQueueLen, "request-queue", requestQueueLen, "Queue length for incoming test requests")
 	flag.IntVar(&requestProcessors, "request-processors", requestProcessors, "Number of request processor routines")
+	flag.StringVar(&geoipLicenseKey, "geoip-license-key", geoipLicenseKey, "License key for GeoIP database")
 
 	flag.Parse()
 
 	requests = make(chan request, requestQueueLen)
+	geoip, err := geoip.NewGeoLite2CityProvider(context.Background(), geoipAccountID, geoipLicenseKey, os.TempDir())
+	if err != nil {
+		log.Fatalln("Failed to create GeoIP provider:", err)
+	}
+	go geoip.Serve(context.TODO())
 
 	var listener net.Listener
-	var err error
 
 	if permRelaysFile != "" {
-		permanentRelays = loadRelays(permRelaysFile)
+		permanentRelays = loadRelays(permRelaysFile, geoip)
 	}
 
 	testCert = createTestCertificate()
 
 	for i := 0; i < requestProcessors; i++ {
-		go requestProcessor()
+		go requestProcessor(geoip)
 	}
 
 	// Load relays from cache in the background.
 	// Load them in a serial fashion to make sure any genuine requests
 	// are not dropped.
 	go func() {
-		for _, relay := range loadRelays(knownRelaysFile) {
+		for _, relay := range loadRelays(knownRelaysFile, geoip) {
 			resultChan := make(chan result)
 			requests <- request{relay, resultChan, nil}
 			result := <-resultChan
@@ -213,15 +222,40 @@ func main() {
 		log.Fatalln("listen:", err)
 	}
 
-	handler := http.NewServeMux()
-	handler.HandleFunc("/", handleAssets)
-	handler.Handle("/endpoint", httpcache.SinglePath(http.HandlerFunc(handleRequest), 15*time.Second))
-	handler.HandleFunc("/metrics", handleMetrics)
+	if metricsListen != "" {
+		mmux := http.NewServeMux()
+		mmux.HandleFunc("/metrics", handleMetrics)
+		go func() {
+			if err := http.ListenAndServe(metricsListen, mmux); err != nil {
+				log.Fatalln("HTTP serve metrics:", err)
+			}
+		}()
+	}
+
+	getMux := http.NewServeMux()
+	getMux.HandleFunc("/", handleAssets)
+	getMux.HandleFunc("/endpoint", withAPIMetrics(handleEndpointShort))
+	getMux.HandleFunc("/endpoint/full", withAPIMetrics(handleEndpointFull))
+
+	postMux := http.NewServeMux()
+	postMux.HandleFunc("/endpoint", withAPIMetrics(handleRegister))
+
+	handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		switch r.Method {
+		case http.MethodGet, http.MethodHead, http.MethodOptions:
+			getMux.ServeHTTP(w, r)
+		case http.MethodPost:
+			postMux.ServeHTTP(w, r)
+		default:
+			http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
+		}
+	})
 
 	srv := http.Server{
 		Handler:     handler,
 		ReadTimeout: 10 * time.Second,
 	}
+	srv.SetKeepAlivesEnabled(false)
 
 	err = srv.Serve(listener)
 	if err != nil {
@@ -255,39 +289,24 @@ func handleAssets(w http.ResponseWriter, r *http.Request) {
 	assets.Serve(w, r, as)
 }
 
-func handleRequest(w http.ResponseWriter, r *http.Request) {
-	timer := prometheus.NewTimer(apiRequestsSeconds.WithLabelValues(r.Method))
-
-	w = NewLoggingResponseWriter(w)
-	defer func() {
-		timer.ObserveDuration()
-		lw := w.(*loggingResponseWriter)
-		apiRequestsTotal.WithLabelValues(r.Method, strconv.Itoa(lw.statusCode)).Inc()
-	}()
-
-	if ipHeader != "" {
-		hdr := r.Header.Get(ipHeader)
-		fields := strings.Split(hdr, ",")
-		if len(fields) > 0 {
-			r.RemoteAddr = strings.TrimSpace(fields[len(fields)-1])
-		}
-	}
-	w.Header().Set("Access-Control-Allow-Origin", "*")
-	switch r.Method {
-	case "GET":
-		handleGetRequest(w, r)
-	case "POST":
-		handlePostRequest(w, r)
-	default:
-		if debug {
-			log.Println("Unhandled HTTP method", r.Method)
-		}
-		http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
+func withAPIMetrics(next http.HandlerFunc) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		timer := prometheus.NewTimer(apiRequestsSeconds.WithLabelValues(r.Method))
+		w = NewLoggingResponseWriter(w)
+		defer func() {
+			timer.ObserveDuration()
+			lw := w.(*loggingResponseWriter)
+			apiRequestsTotal.WithLabelValues(r.Method, strconv.Itoa(lw.statusCode)).Inc()
+		}()
+		next(w, r)
 	}
 }
 
-func handleGetRequest(rw http.ResponseWriter, r *http.Request) {
+// handleEndpointFull returns the relay list with full metadata and
+// statistics. Large, and expensive.
+func handleEndpointFull(rw http.ResponseWriter, r *http.Request) {
 	rw.Header().Set("Content-Type", "application/json; charset=utf-8")
+	rw.Header().Set("Access-Control-Allow-Origin", "*")
 
 	mut.RLock()
 	relays := make([]*relay, len(permanentRelays)+len(knownRelays))
@@ -295,17 +314,38 @@ func handleGetRequest(rw http.ResponseWriter, r *http.Request) {
 	copy(relays[n:], knownRelays)
 	mut.RUnlock()
 
-	// Shuffle
-	rand.Shuffle(relays)
-
 	_ = json.NewEncoder(rw).Encode(map[string][]*relay{
 		"relays": relays,
 	})
 }
 
-func handlePostRequest(w http.ResponseWriter, r *http.Request) {
+// handleEndpointShort returns the relay list with only the URL.
+func handleEndpointShort(rw http.ResponseWriter, r *http.Request) {
+	rw.Header().Set("Content-Type", "application/json; charset=utf-8")
+	rw.Header().Set("Access-Control-Allow-Origin", "*")
+
+	mut.RLock()
+	relays := make([]relayShort, 0, len(permanentRelays)+len(knownRelays))
+	for _, r := range append(permanentRelays, knownRelays...) {
+		relays = append(relays, relayShort{URL: slimURL(r.URL)})
+	}
+	mut.RUnlock()
+
+	_ = json.NewEncoder(rw).Encode(map[string][]relayShort{
+		"relays": relays,
+	})
+}
+
+func handleRegister(w http.ResponseWriter, r *http.Request) {
 	// Get the IP address of the client
 	rhost := r.RemoteAddr
+	if ipHeader != "" {
+		hdr := r.Header.Get(ipHeader)
+		fields := strings.Split(hdr, ",")
+		if len(fields) > 0 {
+			rhost = strings.TrimSpace(fields[len(fields)-1])
+		}
+	}
 	if host, _, err := net.SplitHostPort(rhost); err == nil {
 		rhost = host
 	}
@@ -425,19 +465,19 @@ func handlePostRequest(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-func requestProcessor() {
+func requestProcessor(geoip *geoip.Provider) {
 	for request := range requests {
 		if request.queueTimer != nil {
 			request.queueTimer.ObserveDuration()
 		}
 
 		timer := prometheus.NewTimer(relayTestActionsSeconds.WithLabelValues("test"))
-		handleRelayTest(request)
+		handleRelayTest(request, geoip)
 		timer.ObserveDuration()
 	}
 }
 
-func handleRelayTest(request request) {
+func handleRelayTest(request request, geoip *geoip.Provider) {
 	if debug {
 		log.Println("Request for", request.relay)
 	}
@@ -450,7 +490,7 @@ func handleRelayTest(request request) {
 	}
 
 	stats := fetchStats(request.relay)
-	location := getLocation(request.relay.uri.Host)
+	location := getLocation(request.relay.uri.Host, geoip)
 
 	mut.Lock()
 	if stats != nil {
@@ -523,7 +563,7 @@ func evict(relay *relay) func() {
 	}
 }
 
-func loadRelays(file string) []*relay {
+func loadRelays(file string, geoip *geoip.Provider) []*relay {
 	content, err := os.ReadFile(file)
 	if err != nil {
 		log.Println("Failed to load relays: " + err.Error())
@@ -547,7 +587,7 @@ func loadRelays(file string) []*relay {
 
 		relays = append(relays, &relay{
 			URL:      line,
-			Location: getLocation(uri.Host),
+			Location: getLocation(uri.Host, geoip),
 			uri:      uri,
 		})
 		if debug {
@@ -580,21 +620,16 @@ func createTestCertificate() tls.Certificate {
 	return cert
 }
 
-func getLocation(host string) location {
+func getLocation(host string, geoip *geoip.Provider) location {
 	timer := prometheus.NewTimer(locationLookupSeconds)
 	defer timer.ObserveDuration()
-	db, err := geoip2.Open(geoipPath)
-	if err != nil {
-		return location{}
-	}
-	defer db.Close()
 
 	addr, err := net.ResolveTCPAddr("tcp", host)
 	if err != nil {
 		return location{}
 	}
 
-	city, err := db.City(addr.IP)
+	city, err := geoip.City(addr.IP)
 	if err != nil {
 		return location{}
 	}
@@ -660,3 +695,16 @@ func (b *errorTracker) IsBlocked(host string) bool {
 	}
 	return false
 }
+
+func slimURL(u string) string {
+	p, err := url.Parse(u)
+	if err != nil {
+		return u
+	}
+	newQuery := url.Values{}
+	if id := p.Query().Get("id"); id != "" {
+		newQuery.Set("id", id)
+	}
+	p.RawQuery = newQuery.Encode()
+	return p.String()
+}

cmd/infra/strelaypoolsrv/main_test.go

@@ -42,7 +42,7 @@ func TestHandleGetRequest(t *testing.T) {
 
 	w := httptest.NewRecorder()
 	w.Body = new(bytes.Buffer)
-	handleGetRequest(w, httptest.NewRequest("GET", "/", nil))
+	handleEndpointFull(w, httptest.NewRequest("GET", "/", nil))
 
 	result := make(map[string][]*relay)
 	err := json.NewDecoder(w.Body).Decode(&result)
@@ -92,3 +92,18 @@ func TestCanonicalizeQueryValues(t *testing.T) {
 		t.Errorf("expected %q, got %q", exp, str)
 	}
 }
+
+func TestSlimURL(t *testing.T) {
+	cases := []struct {
+		in, out string
+	}{
+		{"http://example.com/", "http://example.com/"},
+		{"relay://192.0.2.42:22067/?globalLimitBps=0&id=EIC6B3M-EIC6B3M-EIC6B3M-EIC6B3M-EIC6B3M-EIC6B3M-EIC6B3M-EIC6B3M&networkTimeout=2m0s&pingInterval=1m0s&providedBy=Test&sessionLimitBps=0&statusAddr=%3A22070", "relay://192.0.2.42:22067/?id=EIC6B3M-EIC6B3M-EIC6B3M-EIC6B3M-EIC6B3M-EIC6B3M-EIC6B3M-EIC6B3M"},
+	}
+
+	for _, c := range cases {
+		if got := slimURL(c.in); got != c.out {
+			t.Errorf("expected %q, got %q", c.out, got)
+		}
+	}
+}

cmd/infra/strelaypoolsrv/stats.go

@@ -6,27 +6,12 @@ import (
 	"encoding/json"
 	"net"
 	"net/http"
-	"os"
 	"time"
 
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/client_golang/prometheus/collectors"
 	"github.com/syncthing/syncthing/lib/sync"
 )
 
-func init() {
-	processCollectorOpts := collectors.ProcessCollectorOpts{
-		Namespace: "syncthing_relaypoolsrv",
-		PidFn: func() (int, error) {
-			return os.Getpid(), nil
-		},
-	}
-
-	prometheus.MustRegister(
-		collectors.NewProcessCollector(processCollectorOpts),
-	)
-}
-
 var (
 	statusClient = http.Client{
 		Timeout: 5 * time.Second,

cmd/infra/stupgrades/main.go

@@ -0,0 +1,351 @@
+// Copyright (C) 2019 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/.
+
+package main
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"io"
+	"log/slog"
+	"net"
+	"net/http"
+	"os"
+	"regexp"
+	"sort"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/alecthomas/kong"
+	"github.com/prometheus/client_golang/prometheus/promhttp"
+	_ "github.com/syncthing/syncthing/lib/automaxprocs"
+	"github.com/syncthing/syncthing/lib/httpcache"
+	"github.com/syncthing/syncthing/lib/upgrade"
+)
+
+type cli struct {
+	Listen        string        `default:":8080" help:"Listen address"`
+	MetricsListen string        `default:":8082" help:"Listen address for metrics"`
+	URL           string        `short:"u" default:"https://api.github.com/repos/syncthing/syncthing/releases?per_page=25" help:"GitHub releases url"`
+	Forward       []string      `short:"f" help:"Forwarded pages, format: /path->https://example/com/url"`
+	CacheTime     time.Duration `default:"15m" help:"Cache time"`
+}
+
+func main() {
+	var params cli
+	kong.Parse(&params)
+	slog.SetDefault(slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{
+		Level: slog.LevelInfo,
+	})))
+
+	if err := server(&params); err != nil {
+		fmt.Printf("Error: %v\n", err)
+		os.Exit(1)
+	}
+}
+
+func server(params *cli) error {
+	if params.MetricsListen != "" {
+		mux := http.NewServeMux()
+		mux.Handle("/metrics", promhttp.Handler())
+		metricsListen, err := net.Listen("tcp", params.MetricsListen)
+		if err != nil {
+			return fmt.Errorf("metrics: %w", err)
+		}
+		slog.Info("Metrics listener started", "addr", params.MetricsListen)
+		go func() {
+			if err := http.Serve(metricsListen, mux); err != nil {
+				slog.Warn("Metrics server returned", "error", err)
+			}
+		}()
+	}
+
+	cache := &cachedReleases{url: params.URL}
+	if err := cache.Update(context.Background()); err != nil {
+		return fmt.Errorf("initial cache update: %w", err)
+	} else {
+		slog.Info("Initial cache update done")
+	}
+
+	go func() {
+		for range time.NewTicker(params.CacheTime).C {
+			slog.Info("Refreshing cached releases", "url", params.URL)
+			if err := cache.Update(context.Background()); err != nil {
+				slog.Error("Failed to refresh cached releases", "url", params.URL, "error", err)
+			}
+		}
+	}()
+
+	ghRels := &githubReleases{cache: cache}
+	mux := http.NewServeMux()
+	mux.HandleFunc("/ping", ghRels.servePing)
+	mux.HandleFunc("/meta.json", ghRels.serveReleases)
+
+	for _, fwd := range params.Forward {
+		path, url, ok := strings.Cut(fwd, "->")
+		if !ok {
+			return fmt.Errorf("invalid forward: %q", fwd)
+		}
+		slog.Info("Forwarding", "from", path, "to", url)
+		name := strings.ReplaceAll(path, "/", "_")
+		mux.Handle(path, httpcache.SinglePath(&proxy{name: name, url: url}, params.CacheTime))
+	}
+
+	srv := &http.Server{
+		Addr:         params.Listen,
+		Handler:      mux,
+		ReadTimeout:  5 * time.Second,
+		WriteTimeout: 10 * time.Second,
+	}
+	srv.SetKeepAlivesEnabled(false)
+
+	srvListener, err := net.Listen("tcp", params.Listen)
+	if err != nil {
+		return fmt.Errorf("listen: %w", err)
+	}
+	slog.Info("Main listener started", "addr", params.Listen)
+
+	return srv.Serve(srvListener)
+}
+
+type githubReleases struct {
+	cache *cachedReleases
+}
+
+func (p *githubReleases) servePing(w http.ResponseWriter, req *http.Request) {
+	rels := p.cache.Releases()
+
+	if len(rels) == 0 {
+		http.Error(w, "No releases available", http.StatusServiceUnavailable)
+		return
+	}
+
+	w.Header().Set("Syncthing-Num-Releases", strconv.Itoa(len(rels)))
+	w.WriteHeader(http.StatusOK)
+}
+
+func (p *githubReleases) serveReleases(w http.ResponseWriter, req *http.Request) {
+	rels := p.cache.Releases()
+
+	ua := req.Header.Get("User-Agent")
+	osv := req.Header.Get("Syncthing-Os-Version")
+	if ua != "" && osv != "" {
+		// We should determine the compatibility of the releases.
+		rels = filterForCompabitility(rels, ua, osv)
+	} else {
+		metricFilterCalls.WithLabelValues("no-ua-or-osversion").Inc()
+	}
+
+	rels = filterForLatest(rels)
+
+	w.Header().Set("Content-Type", "application/json; charset=utf-8")
+	w.Header().Set("Access-Control-Allow-Origin", "*")
+	w.Header().Set("Access-Control-Allow-Methods", "GET")
+	w.Header().Set("Cache-Control", "public, max-age=900")
+	w.Header().Set("Vary", "User-Agent, Syncthing-Os-Version")
+	_ = json.NewEncoder(w).Encode(rels)
+
+	metricUpgradeChecks.Inc()
+}
+
+type proxy struct {
+	name string
+	url  string
+}
+
+func (p *proxy) ServeHTTP(w http.ResponseWriter, req *http.Request) {
+	req, err := http.NewRequestWithContext(req.Context(), http.MethodGet, p.url, nil)
+	if err != nil {
+		metricHTTPRequests.WithLabelValues(p.name, "error").Inc()
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		metricHTTPRequests.WithLabelValues(p.name, "error").Inc()
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+	defer resp.Body.Close()
+	metricHTTPRequests.WithLabelValues(p.name, "success").Inc()
+
+	ct := resp.Header.Get("Content-Type")
+	w.Header().Set("Content-Type", ct)
+	if resp.StatusCode == http.StatusOK {
+		w.Header().Set("Cache-Control", "public, max-age=900")
+		w.Header().Set("Access-Control-Allow-Origin", "*")
+		w.Header().Set("Access-Control-Allow-Methods", "GET")
+	}
+	w.WriteHeader(resp.StatusCode)
+	if strings.HasPrefix(ct, "application/json") {
+		// Special JSON handling; clean it up a bit.
+		var v interface{}
+		if err := json.NewDecoder(resp.Body).Decode(&v); err != nil {
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
+		_ = json.NewEncoder(w).Encode(v)
+	} else {
+		_, _ = io.Copy(w, resp.Body)
+	}
+}
+
+// filterForLatest returns the latest stable and prerelease only. If the
+// stable version is newer (comes first in the list) there is no need to go
+// looking for a prerelease at all.
+func filterForLatest(rels []upgrade.Release) []upgrade.Release {
+	var filtered []upgrade.Release
+	var havePre bool
+	for _, rel := range rels {
+		if !rel.Prerelease {
+			// We found a stable version, we're good now.
+			filtered = append(filtered, rel)
+			break
+		}
+		if rel.Prerelease && !havePre {
+			// We remember the first prerelease we find.
+			filtered = append(filtered, rel)
+			havePre = true
+		}
+	}
+	return filtered
+}
+
+var userAgentOSArchExp = regexp.MustCompile(`^syncthing.*\(.+ (\w+)-(\w+)\)$`)
+
+func filterForCompabitility(rels []upgrade.Release, ua, osv string) []upgrade.Release {
+	osArch := userAgentOSArchExp.FindStringSubmatch(ua)
+	if len(osArch) != 3 {
+		metricFilterCalls.WithLabelValues("bad-os-arch").Inc()
+		return rels
+	}
+	os := osArch[1]
+
+	var filtered []upgrade.Release
+	for _, rel := range rels {
+		if rel.Compatibility == nil {
+			// No requirements means it's compatible with everything.
+			filtered = append(filtered, rel)
+			continue
+		}
+
+		req, ok := rel.Compatibility.Requirements[os]
+		if !ok {
+			// No entry for the current OS means it's compatible.
+			filtered = append(filtered, rel)
+			continue
+		}
+
+		if upgrade.CompareVersions(osv, req) >= 0 {
+			filtered = append(filtered, rel)
+			continue
+		}
+	}
+
+	if len(filtered) != len(rels) {
+		metricFilterCalls.WithLabelValues("filtered").Inc()
+	} else {
+		metricFilterCalls.WithLabelValues("unchanged").Inc()
+	}
+
+	return filtered
+}
+
+type cachedReleases struct {
+	url     string
+	mut     sync.RWMutex
+	current []upgrade.Release
+}
+
+func (c *cachedReleases) Releases() []upgrade.Release {
+	c.mut.RLock()
+	defer c.mut.RUnlock()
+	return c.current
+}
+
+func (c *cachedReleases) Update(ctx context.Context) error {
+	rels, err := fetchGithubReleases(ctx, c.url)
+	if err != nil {
+		return err
+	}
+	c.mut.Lock()
+	c.current = rels
+	c.mut.Unlock()
+	return nil
+}
+
+func fetchGithubReleases(ctx context.Context, url string) ([]upgrade.Release, error) {
+	req, err := http.NewRequestWithContext(context.TODO(), http.MethodGet, url, nil)
+	if err != nil {
+		metricHTTPRequests.WithLabelValues("github-releases", "error").Inc()
+		return nil, err
+	}
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		metricHTTPRequests.WithLabelValues("github-releases", "error").Inc()
+		return nil, err
+	}
+	defer resp.Body.Close()
+	var rels []upgrade.Release
+	if err := json.NewDecoder(resp.Body).Decode(&rels); err != nil {
+		metricHTTPRequests.WithLabelValues("github-releases", "error").Inc()
+		return nil, err
+	}
+	metricHTTPRequests.WithLabelValues("github-releases", "success").Inc()
+
+	// Move the URL used for browser downloads to the URL field, and remove
+	// the browser URL field. This avoids going via the GitHub API for
+	// downloads, since Syncthing uses the URL field.
+	for _, rel := range rels {
+		for j, asset := range rel.Assets {
+			rel.Assets[j].URL = asset.BrowserURL
+			rel.Assets[j].BrowserURL = ""
+		}
+	}
+
+	addReleaseCompatibility(ctx, rels)
+
+	sort.Sort(upgrade.SortByRelease(rels))
+	return rels, nil
+}
+
+func addReleaseCompatibility(ctx context.Context, rels []upgrade.Release) {
+	for i := range rels {
+		rel := &rels[i]
+		for i, asset := range rel.Assets {
+			if asset.Name != "compat.json" {
+				continue
+			}
+
+			// Load compat.json into the Compatibility field
+			req, err := http.NewRequestWithContext(ctx, http.MethodGet, asset.URL, nil)
+			if err != nil {
+				metricHTTPRequests.WithLabelValues("compat-json", "error").Inc()
+				break
+			}
+			resp, err := http.DefaultClient.Do(req)
+			if err != nil {
+				metricHTTPRequests.WithLabelValues("compat-json", "error").Inc()
+				break
+			}
+			if resp.StatusCode != http.StatusOK {
+				metricHTTPRequests.WithLabelValues("compat-json", "error").Inc()
+				resp.Body.Close()
+				break
+			}
+			_ = json.NewDecoder(io.LimitReader(resp.Body, 10<<10)).Decode(&rel.Compatibility)
+			metricHTTPRequests.WithLabelValues("compat-json", "success").Inc()
+			resp.Body.Close()
+
+			// Remove compat.json from the asset list since it's been processed
+			rel.Assets = append(rel.Assets[:i], rel.Assets[i+1:]...)
+			break
+		}
+	}
+}

cmd/infra/stupgrades/metrics.go

@@ -0,0 +1,30 @@
+// Copyright (C) 2024 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/.
+
+package main
+
+import (
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promauto"
+)
+
+var (
+	metricUpgradeChecks = promauto.NewCounter(prometheus.CounterOpts{
+		Namespace: "syncthing",
+		Subsystem: "upgrade",
+		Name:      "metadata_requests",
+	})
+	metricFilterCalls = promauto.NewCounterVec(prometheus.CounterOpts{
+		Namespace: "syncthing",
+		Subsystem: "upgrade",
+		Name:      "filter_calls",
+	}, []string{"result"})
+	metricHTTPRequests = promauto.NewCounterVec(prometheus.CounterOpts{
+		Namespace: "syncthing",
+		Subsystem: "upgrade",
+		Name:      "http_requests",
+	}, []string{"target", "result"})
+)

cmd/infra/ursrv/main.go

@@ -8,22 +8,22 @@ package main
 
 import (
 	"log"
+	"log/slog"
 	"os"
 
 	"github.com/alecthomas/kong"
-	"github.com/syncthing/syncthing/cmd/ursrv/aggregate"
-	"github.com/syncthing/syncthing/cmd/ursrv/serve"
+	"github.com/syncthing/syncthing/cmd/infra/ursrv/serve"
 	_ "github.com/syncthing/syncthing/lib/automaxprocs"
 )
 
 type CLI struct {
-	Serve     serve.CLI     `cmd:"" default:""`
-	Aggregate aggregate.CLI `cmd:""`
+	Serve serve.CLI `cmd:"" default:""`
 }
 
 func main() {
-	log.SetFlags(log.Ltime | log.Ldate | log.Lshortfile)
-	log.SetOutput(os.Stdout)
+	slog.SetDefault(slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{
+		Level: slog.LevelInfo,
+	})))
 
 	var cli CLI
 	ctx := kong.Parse(&cli)

cmd/infra/ursrv/serve/metrics.go

@@ -0,0 +1,46 @@
+// Copyright (C) 2023 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/.
+
+package serve
+
+import (
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promauto"
+)
+
+var (
+	metricReportsTotal = promauto.NewCounterVec(prometheus.CounterOpts{
+		Namespace: "syncthing",
+		Subsystem: "ursrv_v2",
+		Name:      "incoming_reports_total",
+	}, []string{"result"})
+	metricsCollectsTotal = promauto.NewCounter(prometheus.CounterOpts{
+		Namespace: "syncthing",
+		Subsystem: "ursrv_v2",
+		Name:      "collects_total",
+	})
+	metricsCollectSecondsTotal = promauto.NewCounter(prometheus.CounterOpts{
+		Namespace: "syncthing",
+		Subsystem: "ursrv_v2",
+		Name:      "collect_seconds_total",
+	})
+	metricsCollectSecondsLast = promauto.NewGauge(prometheus.GaugeOpts{
+		Namespace: "syncthing",
+		Subsystem: "ursrv_v2",
+		Name:      "collect_seconds_last",
+	})
+	metricsWriteSecondsLast = promauto.NewGauge(prometheus.GaugeOpts{
+		Namespace: "syncthing",
+		Subsystem: "ursrv_v2",
+		Name:      "write_seconds_last",
+	})
+)
+
+func init() {
+	metricReportsTotal.WithLabelValues("fail")
+	metricReportsTotal.WithLabelValues("replace")
+	metricReportsTotal.WithLabelValues("accept")
+}

cmd/infra/ursrv/serve/prometheus.go

@@ -0,0 +1,314 @@
+// Copyright (C) 2024 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/.
+
+package serve
+
+import (
+	"reflect"
+	"slices"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/syncthing/syncthing/lib/ur/contract"
+)
+
+const namePrefix = "syncthing_usage_"
+
+type metricsSet struct {
+	srv *server
+
+	gauges         map[string]prometheus.Gauge
+	gaugeVecs      map[string]*prometheus.GaugeVec
+	gaugeVecLabels map[string][]string
+	summaries      map[string]*metricSummary
+
+	collectMut    sync.Mutex
+	collectCutoff time.Duration
+}
+
+func newMetricsSet(srv *server) *metricsSet {
+	s := &metricsSet{
+		srv:            srv,
+		gauges:         make(map[string]prometheus.Gauge),
+		gaugeVecs:      make(map[string]*prometheus.GaugeVec),
+		gaugeVecLabels: make(map[string][]string),
+		summaries:      make(map[string]*metricSummary),
+		collectCutoff:  -24 * time.Hour,
+	}
+
+	var initForType func(reflect.Type)
+	initForType = func(t reflect.Type) {
+		for i := 0; i < t.NumField(); i++ {
+			field := t.Field(i)
+			if field.Type.Kind() == reflect.Struct {
+				initForType(field.Type)
+				continue
+			}
+			name, typ, label := fieldNameTypeLabel(field)
+			sname, labels := nameConstLabels(name)
+			switch typ {
+			case "gauge":
+				s.gauges[name] = prometheus.NewGauge(prometheus.GaugeOpts{
+					Name:        namePrefix + sname,
+					ConstLabels: labels,
+				})
+			case "summary":
+				s.summaries[name] = newMetricSummary(namePrefix+sname, nil, labels)
+			case "gaugeVec":
+				s.gaugeVecLabels[name] = append(s.gaugeVecLabels[name], label)
+			case "summaryVec":
+				s.summaries[name] = newMetricSummary(namePrefix+sname, []string{label}, labels)
+			}
+		}
+	}
+	initForType(reflect.ValueOf(contract.Report{}).Type())
+
+	for name, labels := range s.gaugeVecLabels {
+		s.gaugeVecs[name] = prometheus.NewGaugeVec(prometheus.GaugeOpts{
+			Name: namePrefix + name,
+		}, labels)
+	}
+
+	return s
+}
+
+func fieldNameTypeLabel(rf reflect.StructField) (string, string, string) {
+	metric := rf.Tag.Get("metric")
+	name, typ, ok := strings.Cut(metric, ",")
+	if !ok {
+		return "", "", ""
+	}
+	gv, label, ok := strings.Cut(typ, ":")
+	if ok {
+		typ = gv
+	}
+	return name, typ, label
+}
+
+func nameConstLabels(name string) (string, prometheus.Labels) {
+	if name == "-" {
+		return "", nil
+	}
+	name, labels, ok := strings.Cut(name, "{")
+	if !ok {
+		return name, nil
+	}
+	lls := strings.Split(labels[:len(labels)-1], ",")
+	m := make(map[string]string)
+	for _, l := range lls {
+		k, v, _ := strings.Cut(l, "=")
+		m[k] = v
+	}
+	return name, m
+}
+
+func (s *metricsSet) addReport(r *contract.Report) {
+	gaugeVecs := make(map[string][]string)
+	s.addReportStruct(reflect.ValueOf(r).Elem(), gaugeVecs)
+	for name, lv := range gaugeVecs {
+		s.gaugeVecs[name].WithLabelValues(lv...).Add(1)
+	}
+}
+
+func (s *metricsSet) addReportStruct(v reflect.Value, gaugeVecs map[string][]string) {
+	t := v.Type()
+	for i := 0; i < v.NumField(); i++ {
+		field := v.Field(i)
+		if field.Kind() == reflect.Struct {
+			s.addReportStruct(field, gaugeVecs)
+			continue
+		}
+
+		name, typ, label := fieldNameTypeLabel(t.Field(i))
+		switch typ {
+		case "gauge":
+			switch v := field.Interface().(type) {
+			case int:
+				s.gauges[name].Add(float64(v))
+			case string:
+				s.gaugeVecs[name].WithLabelValues(v).Add(1)
+			case bool:
+				if v {
+					s.gauges[name].Add(1)
+				}
+			}
+		case "gaugeVec":
+			var labelValue string
+			switch v := field.Interface().(type) {
+			case string:
+				labelValue = v
+			case int:
+				labelValue = strconv.Itoa(v)
+			case map[string]int:
+				for k, v := range v {
+					labelValue = k
+					field.SetInt(int64(v))
+					break
+				}
+			}
+			if _, ok := gaugeVecs[name]; !ok {
+				gaugeVecs[name] = make([]string, len(s.gaugeVecLabels[name]))
+			}
+			for i, l := range s.gaugeVecLabels[name] {
+				if l == label {
+					gaugeVecs[name][i] = labelValue
+					break
+				}
+			}
+		case "summary", "summaryVec":
+			switch v := field.Interface().(type) {
+			case int:
+				s.summaries[name].Observe("", float64(v))
+			case float64:
+				s.summaries[name].Observe("", v)
+			case []int:
+				for _, v := range v {
+					s.summaries[name].Observe("", float64(v))
+				}
+			case map[string]int:
+				for k, v := range v {
+					if k == "" {
+						// avoid empty string labels as those are the sign
+						// of a non-vec summary
+						k = "unknown"
+					}
+					s.summaries[name].Observe(k, float64(v))
+				}
+			}
+		}
+	}
+}
+
+func (s *metricsSet) Describe(c chan<- *prometheus.Desc) {
+	for _, g := range s.gauges {
+		g.Describe(c)
+	}
+	for _, g := range s.gaugeVecs {
+		g.Describe(c)
+	}
+	for _, g := range s.summaries {
+		g.Describe(c)
+	}
+}
+
+func (s *metricsSet) Collect(c chan<- prometheus.Metric) {
+	s.collectMut.Lock()
+	defer s.collectMut.Unlock()
+
+	t0 := time.Now()
+	defer func() {
+		dur := time.Since(t0).Seconds()
+		metricsCollectSecondsLast.Set(dur)
+		metricsCollectSecondsTotal.Add(dur)
+		metricsCollectsTotal.Inc()
+	}()
+
+	for _, g := range s.gauges {
+		g.Set(0)
+	}
+	for _, g := range s.gaugeVecs {
+		g.Reset()
+	}
+	for _, g := range s.summaries {
+		g.Reset()
+	}
+
+	cutoff := time.Now().Add(s.collectCutoff)
+	s.srv.reports.Range(func(key string, r *contract.Report) bool {
+		if s.collectCutoff < 0 && r.Received.Before(cutoff) {
+			s.srv.reports.Delete(key)
+			return true
+		}
+		s.addReport(r)
+		return true
+	})
+
+	for _, g := range s.gauges {
+		c <- g
+	}
+	for _, g := range s.gaugeVecs {
+		g.Collect(c)
+	}
+	for _, g := range s.summaries {
+		g.Collect(c)
+	}
+}
+
+type metricSummary struct {
+	name   string
+	values map[string][]float64
+	zeroes map[string]int
+
+	qDesc     *prometheus.Desc
+	countDesc *prometheus.Desc
+	sumDesc   *prometheus.Desc
+	zDesc     *prometheus.Desc
+}
+
+func newMetricSummary(name string, labels []string, constLabels prometheus.Labels) *metricSummary {
+	return &metricSummary{
+		name:      name,
+		values:    make(map[string][]float64),
+		zeroes:    make(map[string]int),
+		qDesc:     prometheus.NewDesc(name, "", append(labels, "quantile"), constLabels),
+		countDesc: prometheus.NewDesc(name+"_nonzero_count", "", labels, constLabels),
+		sumDesc:   prometheus.NewDesc(name+"_sum", "", labels, constLabels),
+		zDesc:     prometheus.NewDesc(name+"_zero_count", "", labels, constLabels),
+	}
+}
+
+func (q *metricSummary) Observe(labelValue string, v float64) {
+	if v == 0 {
+		q.zeroes[labelValue]++
+		return
+	}
+	q.values[labelValue] = append(q.values[labelValue], v)
+}
+
+func (q *metricSummary) Describe(c chan<- *prometheus.Desc) {
+	c <- q.qDesc
+	c <- q.countDesc
+	c <- q.sumDesc
+	c <- q.zDesc
+}
+
+func (q *metricSummary) Collect(c chan<- prometheus.Metric) {
+	for lv, vs := range q.values {
+		var labelVals []string
+		if lv != "" {
+			labelVals = []string{lv}
+		}
+
+		c <- prometheus.MustNewConstMetric(q.countDesc, prometheus.GaugeValue, float64(len(vs)), labelVals...)
+		c <- prometheus.MustNewConstMetric(q.zDesc, prometheus.GaugeValue, float64(q.zeroes[lv]), labelVals...)
+
+		var sum float64
+		for _, v := range vs {
+			sum += v
+		}
+		c <- prometheus.MustNewConstMetric(q.sumDesc, prometheus.GaugeValue, sum, labelVals...)
+
+		if len(vs) == 0 {
+			return
+		}
+
+		slices.Sort(vs)
+		c <- prometheus.MustNewConstMetric(q.qDesc, prometheus.GaugeValue, vs[0], append(labelVals, "0")...)
+		c <- prometheus.MustNewConstMetric(q.qDesc, prometheus.GaugeValue, vs[len(vs)*5/100], append(labelVals, "0.05")...)
+		c <- prometheus.MustNewConstMetric(q.qDesc, prometheus.GaugeValue, vs[len(vs)/2], append(labelVals, "0.5")...)
+		c <- prometheus.MustNewConstMetric(q.qDesc, prometheus.GaugeValue, vs[len(vs)*9/10], append(labelVals, "0.9")...)
+		c <- prometheus.MustNewConstMetric(q.qDesc, prometheus.GaugeValue, vs[len(vs)*95/100], append(labelVals, "0.95")...)
+		c <- prometheus.MustNewConstMetric(q.qDesc, prometheus.GaugeValue, vs[len(vs)-1], append(labelVals, "1")...)
+	}
+}
+
+func (q *metricSummary) Reset() {
+	clear(q.values)
+	clear(q.zeroes)
+}

cmd/infra/ursrv/serve/serve.go

@@ -0,0 +1,408 @@
+// 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/.
+
+package serve
+
+import (
+	"bufio"
+	"compress/gzip"
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"log/slog"
+	"net"
+	"net/http"
+	"os"
+	"regexp"
+	"strings"
+	"time"
+
+	_ "net/http/pprof"
+
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promhttp"
+	"github.com/puzpuzpuz/xsync/v3"
+
+	"github.com/syncthing/syncthing/lib/build"
+	"github.com/syncthing/syncthing/lib/geoip"
+	"github.com/syncthing/syncthing/lib/s3"
+	"github.com/syncthing/syncthing/lib/ur/contract"
+)
+
+type CLI struct {
+	Listen          string        `env:"UR_LISTEN" help:"Usage reporting & metrics endpoint listen address" default:"0.0.0.0:8080"`
+	ListenInternal  string        `env:"UR_LISTEN_INTERNAL" help:"Internal metrics endpoint listen address" default:"0.0.0.0:8082"`
+	GeoIPLicenseKey string        `env:"UR_GEOIP_LICENSE_KEY"`
+	GeoIPAccountID  int           `env:"UR_GEOIP_ACCOUNT_ID"`
+	DumpFile        string        `env:"UR_DUMP_FILE" default:"reports.jsons.gz"`
+	DumpInterval    time.Duration `env:"UR_DUMP_INTERVAL" default:"5m"`
+
+	S3Endpoint    string `name:"s3-endpoint" hidden:"true" env:"UR_S3_ENDPOINT"`
+	S3Region      string `name:"s3-region" hidden:"true" env:"UR_S3_REGION"`
+	S3Bucket      string `name:"s3-bucket" hidden:"true" env:"UR_S3_BUCKET"`
+	S3AccessKeyID string `name:"s3-access-key-id" hidden:"true" env:"UR_S3_ACCESS_KEY_ID"`
+	S3SecretKey   string `name:"s3-secret-key" hidden:"true" env:"UR_S3_SECRET_KEY"`
+}
+
+var (
+	compilerRe         = regexp.MustCompile(`\(([A-Za-z0-9()., -]+) \w+-\w+(?:| android| default)\) ([\w@.-]+)`)
+	knownDistributions = []distributionMatch{
+		// Maps well known builders to the official distribution method that
+		// they represent
+
+		{regexp.MustCompile(`\steamcity@build\.syncthing\.net`), "GitHub"},
+		{regexp.MustCompile(`\sjenkins@build\.syncthing\.net`), "GitHub"},
+		{regexp.MustCompile(`\sbuilder@github\.syncthing\.net`), "GitHub"},
+
+		{regexp.MustCompile(`\sdeb@build\.syncthing\.net`), "APT"},
+		{regexp.MustCompile(`\sdebian@github\.syncthing\.net`), "APT"},
+
+		{regexp.MustCompile(`\sdocker@syncthing\.net`), "Docker Hub"},
+		{regexp.MustCompile(`\sdocker@build.syncthing\.net`), "Docker Hub"},
+		{regexp.MustCompile(`\sdocker@github.syncthing\.net`), "Docker Hub"},
+
+		{regexp.MustCompile(`\sandroid-builder@github\.syncthing\.net`), "Google Play"},
+		{regexp.MustCompile(`\sandroid-.*teamcity@build\.syncthing\.net`), "Google Play"},
+
+		{regexp.MustCompile(`\sandroid-.*vagrant@basebox-stretch64`), "F-Droid"},
+		{regexp.MustCompile(`\svagrant@bullseye`), "F-Droid"},
+		{regexp.MustCompile(`\svagrant@bookworm`), "F-Droid"},
+
+		{regexp.MustCompile(`Anwender@NET2017`), "Syncthing-Fork (3rd party)"},
+
+		{regexp.MustCompile(`\sbuilduser@(archlinux|svetlemodry)`), "Arch (3rd party)"},
+		{regexp.MustCompile(`\ssyncthing@archlinux`), "Arch (3rd party)"},
+		{regexp.MustCompile(`@debian`), "Debian (3rd party)"},
+		{regexp.MustCompile(`@fedora`), "Fedora (3rd party)"},
+		{regexp.MustCompile(`\sbrew@`), "Homebrew (3rd party)"},
+		{regexp.MustCompile(`\sroot@buildkitsandbox`), "LinuxServer.io (3rd party)"},
+		{regexp.MustCompile(`\sports@freebsd`), "FreeBSD (3rd party)"},
+		{regexp.MustCompile(`\snix@nix`), "Nix (3rd party)"},
+		{regexp.MustCompile(`.`), "Others"},
+	}
+)
+
+type distributionMatch struct {
+	matcher      *regexp.Regexp
+	distribution string
+}
+
+func (cli *CLI) Run() error {
+	slog.Info("Starting", "version", build.Version)
+
+	// Listening
+
+	urListener, err := net.Listen("tcp", cli.Listen)
+	if err != nil {
+		slog.Error("Failed to listen (usage reports)", "error", err)
+		return err
+	}
+	slog.Info("Listening (usage reports)", "address", urListener.Addr())
+
+	internalListener, err := net.Listen("tcp", cli.ListenInternal)
+	if err != nil {
+		slog.Error("Failed to listen (internal)", "error", err)
+		return err
+	}
+	slog.Info("Listening (internal)", "address", internalListener.Addr())
+
+	var geo *geoip.Provider
+	if cli.GeoIPAccountID != 0 && cli.GeoIPLicenseKey != "" {
+		geo, err = geoip.NewGeoLite2CityProvider(context.Background(), cli.GeoIPAccountID, cli.GeoIPLicenseKey, os.TempDir())
+		if err != nil {
+			slog.Error("Failed to load GeoIP", "error", err)
+			return err
+		}
+		go geo.Serve(context.TODO())
+	}
+
+	// s3
+
+	var s3sess *s3.Session
+	if cli.S3Endpoint != "" {
+		s3sess, err = s3.NewSession(cli.S3Endpoint, cli.S3Region, cli.S3Bucket, cli.S3AccessKeyID, cli.S3SecretKey)
+		if err != nil {
+			slog.Error("Failed to create S3 session", "error", err)
+			return err
+		}
+	}
+
+	if _, err := os.Stat(cli.DumpFile); err != nil && s3sess != nil {
+		if err := cli.downloadDumpFile(s3sess); err != nil {
+			slog.Error("Failed to download dump file", "error", err)
+		}
+	}
+
+	// server
+
+	srv := &server{
+		geo:     geo,
+		reports: xsync.NewMapOf[string, *contract.Report](),
+	}
+
+	if fd, err := os.Open(cli.DumpFile); err == nil {
+		gr, err := gzip.NewReader(fd)
+		if err == nil {
+			srv.load(gr)
+		}
+		fd.Close()
+	}
+
+	go func() {
+		for range time.Tick(cli.DumpInterval) {
+			if err := cli.saveDumpFile(srv, s3sess); err != nil {
+				slog.Error("Failed to write dump file", "error", err)
+			}
+		}
+	}()
+
+	// The internal metrics endpoint just serves metrics about what the
+	// server is doing.
+
+	http.Handle("/metrics", promhttp.Handler())
+
+	internalSrv := http.Server{
+		ReadTimeout:  5 * time.Second,
+		WriteTimeout: 15 * time.Second,
+	}
+	go internalSrv.Serve(internalListener)
+
+	// New external metrics endpoint accepts reports from clients and serves
+	// aggregated usage reporting metrics.
+
+	ms := newMetricsSet(srv)
+	reg := prometheus.NewRegistry()
+	reg.MustRegister(ms)
+
+	mux := http.NewServeMux()
+	mux.Handle("/metrics", promhttp.HandlerFor(reg, promhttp.HandlerOpts{}))
+	mux.HandleFunc("/newdata", srv.handleNewData)
+	mux.HandleFunc("/ping", srv.handlePing)
+
+	metricsSrv := http.Server{
+		ReadTimeout:  5 * time.Second,
+		WriteTimeout: 15 * time.Second,
+		Handler:      mux,
+	}
+
+	slog.Info("Ready to serve")
+	return metricsSrv.Serve(urListener)
+}
+
+func (cli *CLI) downloadDumpFile(s3sess *s3.Session) error {
+	latestKey, err := s3sess.LatestKey()
+	if err != nil {
+		return fmt.Errorf("list latest S3 key: %w", err)
+	}
+	fd, err := os.Create(cli.DumpFile)
+	if err != nil {
+		return fmt.Errorf("create dump file: %w", err)
+	}
+	if err := s3sess.Download(fd, latestKey); err != nil {
+		_ = fd.Close()
+		return fmt.Errorf("download dump file: %w", err)
+	}
+	if err := fd.Close(); err != nil {
+		return fmt.Errorf("close dump file: %w", err)
+	}
+	slog.Info("Dump file downloaded", "key", latestKey)
+	return nil
+}
+
+func (cli *CLI) saveDumpFile(srv *server, s3sess *s3.Session) error {
+	fd, err := os.Create(cli.DumpFile + ".tmp")
+	if err != nil {
+		return fmt.Errorf("creating dump file: %w", err)
+	}
+	gw := gzip.NewWriter(fd)
+	if err := srv.save(gw); err != nil {
+		return fmt.Errorf("saving dump file: %w", err)
+	}
+	if err := gw.Close(); err != nil {
+		fd.Close()
+		return fmt.Errorf("closing gzip writer: %w", err)
+	}
+	if err := fd.Close(); err != nil {
+		return fmt.Errorf("closing dump file: %w", err)
+	}
+	if err := os.Rename(cli.DumpFile+".tmp", cli.DumpFile); err != nil {
+		return fmt.Errorf("renaming dump file: %w", err)
+	}
+	slog.Info("Dump file saved")
+
+	if s3sess != nil {
+		key := fmt.Sprintf("reports-%s.jsons.gz", time.Now().UTC().Format("2006-01-02"))
+		fd, err := os.Open(cli.DumpFile)
+		if err != nil {
+			return fmt.Errorf("opening dump file: %w", err)
+		}
+		if err := s3sess.Upload(fd, key); err != nil {
+			return fmt.Errorf("uploading dump file: %w", err)
+		}
+		_ = fd.Close()
+		slog.Info("Dump file uploaded")
+	}
+
+	return nil
+}
+
+type server struct {
+	geo     *geoip.Provider
+	reports *xsync.MapOf[string, *contract.Report]
+}
+
+func (s *server) handlePing(w http.ResponseWriter, r *http.Request) {
+}
+
+func (s *server) handleNewData(w http.ResponseWriter, r *http.Request) {
+	result := "fail"
+	defer func() {
+		// result is "accept" (new report), "replace" (existing report) or
+		// "fail"
+		metricReportsTotal.WithLabelValues(result).Inc()
+	}()
+
+	defer r.Body.Close()
+
+	if r.Method != http.MethodPost {
+		http.Error(w, "Method Not Allowed", http.StatusMethodNotAllowed)
+		return
+	}
+
+	addr := r.Header.Get("X-Forwarded-For")
+	if addr != "" {
+		addr = strings.Split(addr, ", ")[0]
+	} else {
+		addr = r.RemoteAddr
+	}
+
+	if host, _, err := net.SplitHostPort(addr); err == nil {
+		addr = host
+	}
+
+	log := slog.With("addr", addr)
+
+	if net.ParseIP(addr) == nil {
+		addr = ""
+	}
+
+	var rep contract.Report
+
+	lr := &io.LimitedReader{R: r.Body, N: 40 * 1024}
+	bs, _ := io.ReadAll(lr)
+	if err := json.Unmarshal(bs, &rep); err != nil {
+		log.Error("Failed to decode JSON", "error", err)
+		http.Error(w, "JSON Decode Error", http.StatusInternalServerError)
+		return
+	}
+
+	rep.Received = time.Now()
+	rep.Date = rep.Received.UTC().Format("20060102")
+	rep.Address = addr
+
+	if err := rep.Validate(); err != nil {
+		log.Error("Failed to validate report", "error", err)
+		http.Error(w, "Validation Error", http.StatusInternalServerError)
+		return
+	}
+
+	if s.addReport(&rep) {
+		result = "replace"
+	} else {
+		result = "accept"
+	}
+}
+
+func (s *server) addReport(rep *contract.Report) bool {
+	if s.geo != nil {
+		if ip := net.ParseIP(rep.Address); ip != nil {
+			if city, err := s.geo.City(ip); err == nil {
+				rep.Country = city.Country.Names["en"]
+				rep.CountryCode = city.Country.IsoCode
+			}
+		}
+	}
+	if rep.Country == "" {
+		rep.Country = "Unknown"
+	}
+	if rep.CountryCode == "" {
+		rep.CountryCode = "ZZ"
+	}
+
+	rep.Version = transformVersion(rep.Version)
+	if strings.Contains(rep.Version, ".") {
+		split := strings.SplitN(rep.Version, ".", 3)
+		if len(split) == 3 {
+			rep.MajorVersion = strings.Join(split[:2], ".")
+		}
+	}
+	rep.OS, rep.Arch, _ = strings.Cut(rep.Platform, "-")
+
+	if m := compilerRe.FindStringSubmatch(rep.LongVersion); len(m) == 3 {
+		rep.Compiler = m[1]
+		rep.Builder = m[2]
+	}
+	for _, d := range knownDistributions {
+		if d.matcher.MatchString(rep.LongVersion) {
+			rep.Distribution = d.distribution
+			break
+		}
+	}
+
+	_, loaded := s.reports.LoadAndStore(rep.UniqueID, rep)
+	return loaded
+}
+
+func (s *server) save(w io.Writer) error {
+	bw := bufio.NewWriter(w)
+	enc := json.NewEncoder(bw)
+	var err error
+	s.reports.Range(func(k string, v *contract.Report) bool {
+		err = enc.Encode(v)
+		return err == nil
+	})
+	if err != nil {
+		return err
+	}
+	return bw.Flush()
+}
+
+func (s *server) load(r io.Reader) {
+	dec := json.NewDecoder(r)
+	s.reports.Clear()
+	for {
+		var rep contract.Report
+		if err := dec.Decode(&rep); errors.Is(err, io.EOF) {
+			break
+		} else if err != nil {
+			slog.Error("Failed to load record", "error", err)
+			break
+		}
+		s.addReport(&rep)
+	}
+	slog.Info("Loaded reports", "count", s.reports.Size())
+}
+
+var (
+	plusRe  = regexp.MustCompile(`(\+.*|[.-]dev\..*)$`)
+	plusStr = "-dev"
+)
+
+// transformVersion returns a version number formatted correctly, with all
+// development versions aggregated into one.
+func transformVersion(v string) string {
+	if v == "unknown-dev" {
+		return v
+	}
+	if !strings.HasPrefix(v, "v") {
+		v = "v" + v
+	}
+	v = plusRe.ReplaceAllString(v, plusStr)
+
+	return v
+}

cmd/stdiscosrv/amqp.go

@@ -0,0 +1,257 @@
+// Copyright (C) 2024 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/.
+
+package main
+
+import (
+	"context"
+	"fmt"
+	"io"
+	"log"
+
+	amqp "github.com/rabbitmq/amqp091-go"
+	"github.com/syncthing/syncthing/lib/protocol"
+	"github.com/thejerf/suture/v4"
+)
+
+type amqpReplicator struct {
+	suture.Service
+	broker   string
+	sender   *amqpSender
+	receiver *amqpReceiver
+	outbox   chan ReplicationRecord
+}
+
+func newAMQPReplicator(broker, clientID string, db database) *amqpReplicator {
+	svc := suture.New("amqpReplicator", suture.Spec{PassThroughPanics: true})
+
+	sender := &amqpSender{
+		broker:   broker,
+		clientID: clientID,
+		outbox:   make(chan ReplicationRecord, replicationOutboxSize),
+	}
+	svc.Add(sender)
+
+	receiver := &amqpReceiver{
+		broker:   broker,
+		clientID: clientID,
+		db:       db,
+	}
+	svc.Add(receiver)
+
+	return &amqpReplicator{
+		Service:  svc,
+		broker:   broker,
+		sender:   sender,
+		receiver: receiver,
+		outbox:   make(chan ReplicationRecord, replicationOutboxSize),
+	}
+}
+
+func (s *amqpReplicator) send(key *protocol.DeviceID, ps []DatabaseAddress, seen int64) {
+	s.sender.send(key, ps, seen)
+}
+
+type amqpSender struct {
+	broker   string
+	clientID string
+	outbox   chan ReplicationRecord
+}
+
+func (s *amqpSender) Serve(ctx context.Context) error {
+	conn, ch, err := amqpChannel(s.broker)
+	if err != nil {
+		return err
+	}
+	defer ch.Close()
+	defer conn.Close()
+
+	buf := make([]byte, 1024)
+	for {
+		select {
+		case rec := <-s.outbox:
+			size := rec.Size()
+			if len(buf) < size {
+				buf = make([]byte, size)
+			}
+
+			n, err := rec.MarshalTo(buf)
+			if err != nil {
+				replicationSendsTotal.WithLabelValues("error").Inc()
+				return fmt.Errorf("replication marshal: %w", err)
+			}
+
+			err = ch.PublishWithContext(ctx,
+				"discovery", // exchange
+				"",          // routing key
+				false,       // mandatory
+				false,       // immediate
+				amqp.Publishing{
+					ContentType: "application/protobuf",
+					Body:        buf[:n],
+					AppId:       s.clientID,
+				})
+			if err != nil {
+				replicationSendsTotal.WithLabelValues("error").Inc()
+				return fmt.Errorf("replication publish: %w", err)
+			}
+
+			replicationSendsTotal.WithLabelValues("success").Inc()
+
+		case <-ctx.Done():
+			return nil
+		}
+	}
+}
+
+func (s *amqpSender) String() string {
+	return fmt.Sprintf("amqpSender(%q)", s.broker)
+}
+
+func (s *amqpSender) send(key *protocol.DeviceID, ps []DatabaseAddress, seen int64) {
+	item := ReplicationRecord{
+		Key:       key[:],
+		Addresses: ps,
+		Seen:      seen,
+	}
+
+	// The send should never block. The inbox is suitably buffered for at
+	// least a few seconds of stalls, which shouldn't happen in practice.
+	select {
+	case s.outbox <- item:
+	default:
+		replicationSendsTotal.WithLabelValues("drop").Inc()
+	}
+}
+
+type amqpReceiver struct {
+	broker   string
+	clientID string
+	db       database
+}
+
+func (s *amqpReceiver) Serve(ctx context.Context) error {
+	conn, ch, err := amqpChannel(s.broker)
+	if err != nil {
+		return err
+	}
+	defer ch.Close()
+	defer conn.Close()
+
+	msgs, err := amqpConsume(ch)
+	if err != nil {
+		return err
+	}
+
+	for {
+		select {
+		case msg, ok := <-msgs:
+			if !ok {
+				return fmt.Errorf("subscription closed: %w", io.EOF)
+			}
+
+			// ignore messages from ourself
+			if msg.AppId == s.clientID {
+				continue
+			}
+
+			var rec ReplicationRecord
+			if err := rec.Unmarshal(msg.Body); err != nil {
+				replicationRecvsTotal.WithLabelValues("error").Inc()
+				return fmt.Errorf("replication unmarshal: %w", err)
+			}
+			id, err := protocol.DeviceIDFromBytes(rec.Key)
+			if err != nil {
+				id, err = protocol.DeviceIDFromString(string(rec.Key))
+			}
+			if err != nil {
+				log.Println("Replication device ID:", err)
+				replicationRecvsTotal.WithLabelValues("error").Inc()
+				continue
+			}
+
+			if err := s.db.merge(&id, rec.Addresses, rec.Seen); err != nil {
+				return fmt.Errorf("replication database merge: %w", err)
+			}
+
+			replicationRecvsTotal.WithLabelValues("success").Inc()
+
+		case <-ctx.Done():
+			return nil
+		}
+	}
+}
+
+func (s *amqpReceiver) String() string {
+	return fmt.Sprintf("amqpReceiver(%q)", s.broker)
+}
+
+func amqpChannel(dst string) (*amqp.Connection, *amqp.Channel, error) {
+	conn, err := amqp.Dial(dst)
+	if err != nil {
+		return nil, nil, fmt.Errorf("AMQP dial: %w", err)
+	}
+
+	ch, err := conn.Channel()
+	if err != nil {
+		return nil, nil, fmt.Errorf("AMQP channel: %w", err)
+	}
+
+	err = ch.ExchangeDeclare(
+		"discovery", // name
+		"fanout",    // type
+		false,       // durable
+		false,       // auto-deleted
+		false,       // internal
+		false,       // no-wait
+		nil,         // arguments
+	)
+	if err != nil {
+		return nil, nil, fmt.Errorf("AMQP declare exchange: %w", err)
+	}
+
+	return conn, ch, nil
+}
+
+func amqpConsume(ch *amqp.Channel) (<-chan amqp.Delivery, error) {
+	q, err := ch.QueueDeclare(
+		"",    // name
+		false, // durable
+		false, // delete when unused
+		true,  // exclusive
+		false, // no-wait
+		nil,   // arguments
+	)
+	if err != nil {
+		return nil, fmt.Errorf("AMQP declare queue: %w", err)
+	}
+
+	err = ch.QueueBind(
+		q.Name,      // queue name
+		"",          // routing key
+		"discovery", // exchange
+		false,
+		nil,
+	)
+	if err != nil {
+		return nil, fmt.Errorf("AMQP bind queue: %w", err)
+	}
+
+	msgs, err := ch.Consume(
+		q.Name, // queue
+		"",     // consumer
+		true,   // auto-ack
+		false,  // exclusive
+		false,  // no-local
+		false,  // no-wait
+		nil,    // args
+	)
+	if err != nil {
+		return nil, fmt.Errorf("AMQP consume: %w", err)
+	}
+
+	return msgs, nil
+}

cmd/stdiscosrv/apisrv.go

@@ -22,7 +22,7 @@ import (
 	"net"
 	"net/http"
 	"net/url"
-	"sort"
+	"slices"
 	"strconv"
 	"strings"
 	"sync"
@@ -39,15 +39,20 @@ type announcement struct {
 }
 
 type apiSrv struct {
-	addr     string
-	cert     tls.Certificate
-	db       database
-	listener net.Listener
-	repl     replicator // optional
-	useHTTP  bool
+	addr           string
+	cert           tls.Certificate
+	db             database
+	listener       net.Listener
+	repl           replicator // optional
+	useHTTP        bool
+	compression    bool
+	gzipWriters    sync.Pool
+	seenTracker    *retryAfterTracker
+	notSeenTracker *retryAfterTracker
+}
 
-	mapsMut sync.Mutex
-	misses  map[string]int32
+type replicator interface {
+	send(key *protocol.DeviceID, addrs []DatabaseAddress, seen int64)
 }
 
 type requestID int64
@@ -60,18 +65,30 @@ type contextKey int
 
 const idKey contextKey = iota
 
-func newAPISrv(addr string, cert tls.Certificate, db database, repl replicator, useHTTP bool) *apiSrv {
+func newAPISrv(addr string, cert tls.Certificate, db database, repl replicator, useHTTP, compression bool) *apiSrv {
 	return &apiSrv{
-		addr:    addr,
-		cert:    cert,
-		db:      db,
-		repl:    repl,
-		useHTTP: useHTTP,
-		misses:  make(map[string]int32),
+		addr:        addr,
+		cert:        cert,
+		db:          db,
+		repl:        repl,
+		useHTTP:     useHTTP,
+		compression: compression,
+		seenTracker: &retryAfterTracker{
+			name:         "seenTracker",
+			bucketStarts: time.Now(),
+			desiredRate:  250,
+			currentDelay: notFoundRetryUnknownMinSeconds,
+		},
+		notSeenTracker: &retryAfterTracker{
+			name:         "notSeenTracker",
+			bucketStarts: time.Now(),
+			desiredRate:  250,
+			currentDelay: notFoundRetryUnknownMaxSeconds / 2,
+		},
 	}
 }
 
-func (s *apiSrv) Serve(_ context.Context) error {
+func (s *apiSrv) Serve(ctx context.Context) error {
 	if s.useHTTP {
 		listener, err := net.Listen("tcp", s.addr)
 		if err != nil {
@@ -105,6 +122,11 @@ func (s *apiSrv) Serve(_ context.Context) error {
 		ErrorLog:       log.New(io.Discard, "", 0),
 	}
 
+	go func() {
+		<-ctx.Done()
+		srv.Shutdown(context.Background())
+	}()
+
 	err := srv.Serve(s.listener)
 	if err != nil {
 		log.Println("Serve:", err)
@@ -181,8 +203,7 @@ func (s *apiSrv) handleGET(w http.ResponseWriter, req *http.Request) {
 		return
 	}
 
-	key := deviceID.String()
-	rec, err := s.db.get(key)
+	rec, err := s.db.get(&deviceID)
 	if err != nil {
 		// some sort of internal error
 		lookupRequestsTotal.WithLabelValues("internal_error").Inc()
@@ -192,28 +213,14 @@ func (s *apiSrv) handleGET(w http.ResponseWriter, req *http.Request) {
 	}
 
 	if len(rec.Addresses) == 0 {
-		lookupRequestsTotal.WithLabelValues("not_found").Inc()
-
-		s.mapsMut.Lock()
-		misses := s.misses[key]
-		if misses < rec.Misses {
-			misses = rec.Misses + 1
+		var afterS int
+		if rec.Seen == 0 {
+			afterS = s.notSeenTracker.retryAfterS()
+			lookupRequestsTotal.WithLabelValues("not_found_ever").Inc()
 		} else {
-			misses++
+			afterS = s.seenTracker.retryAfterS()
+			lookupRequestsTotal.WithLabelValues("not_found_recent").Inc()
 		}
-		s.misses[key] = misses
-		s.mapsMut.Unlock()
-
-		if misses%notFoundMissesWriteInterval == 0 {
-			rec.Misses = misses
-			rec.Missed = time.Now().UnixNano()
-			rec.Addresses = nil
-			// rec.Seen retained from get
-			s.db.put(key, rec)
-		}
-
-		afterS := notFoundRetryAfterSeconds(int(misses))
-		retryAfterHistogram.Observe(float64(afterS))
 		w.Header().Set("Retry-After", strconv.Itoa(afterS))
 		http.Error(w, "Not Found", http.StatusNotFound)
 		return
@@ -225,10 +232,16 @@ func (s *apiSrv) handleGET(w http.ResponseWriter, req *http.Request) {
 	var bw io.Writer = w
 
 	// Use compression if the client asks for it
-	if strings.Contains(req.Header.Get("Accept-Encoding"), "gzip") {
+	if s.compression && strings.Contains(req.Header.Get("Accept-Encoding"), "gzip") {
+		gw, ok := s.gzipWriters.Get().(*gzip.Writer)
+		if ok {
+			gw.Reset(w)
+		} else {
+			gw = gzip.NewWriter(w)
+		}
 		w.Header().Set("Content-Encoding", "gzip")
-		gw := gzip.NewWriter(bw)
 		defer gw.Close()
+		defer s.gzipWriters.Put(gw)
 		bw = gw
 	}
 
@@ -291,25 +304,25 @@ func (s *apiSrv) Stop() {
 }
 
 func (s *apiSrv) handleAnnounce(deviceID protocol.DeviceID, addresses []string) error {
-	key := deviceID.String()
 	now := time.Now()
 	expire := now.Add(addressExpiryTime).UnixNano()
 
+	// The address slice must always be sorted for database merges to work
+	// properly.
+	slices.Sort(addresses)
+	addresses = slices.Compact(addresses)
+
 	dbAddrs := make([]DatabaseAddress, len(addresses))
 	for i := range addresses {
 		dbAddrs[i].Address = addresses[i]
 		dbAddrs[i].Expires = expire
 	}
 
-	// The address slice must always be sorted for database merges to work
-	// properly.
-	sort.Sort(databaseAddressOrder(dbAddrs))
-
 	seen := now.UnixNano()
 	if s.repl != nil {
-		s.repl.send(key, dbAddrs, seen)
+		s.repl.send(&deviceID, dbAddrs, seen)
 	}
-	return s.db.merge(key, dbAddrs, seen)
+	return s.db.merge(&deviceID, dbAddrs, seen)
 }
 
 func handlePing(w http.ResponseWriter, _ *http.Request) {
@@ -359,7 +372,7 @@ func certificateBytes(req *http.Request) ([]byte, error) {
 		}
 
 		bs = pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: hdr})
-	} else if hdr := req.Header.Get("X-Forwarded-Tls-Client-Cert"); hdr != "" {
+	} else if cert := req.Header.Get("X-Forwarded-Tls-Client-Cert"); cert != "" {
 		// Traefik 2 passtlsclientcert
 		//
 		// The certificate is in PEM format, maybe with URL encoding
@@ -367,19 +380,36 @@ func certificateBytes(req *http.Request) ([]byte, error) {
 		// statements. We need to decode, reinstate the newlines every 64
 		// character and add statements for the PEM decoder
 
-		if strings.Contains(hdr, "%") {
-			if unesc, err := url.QueryUnescape(hdr); err == nil {
-				hdr = unesc
+		if strings.Contains(cert, "%") {
+			if unesc, err := url.QueryUnescape(cert); err == nil {
+				cert = unesc
 			}
 		}
 
-		for i := 64; i < len(hdr); i += 65 {
-			hdr = hdr[:i] + "\n" + hdr[i:]
+		const (
+			header = "-----BEGIN CERTIFICATE-----"
+			footer = "-----END CERTIFICATE-----"
+		)
+
+		var b bytes.Buffer
+		b.Grow(len(header) + 1 + len(cert) + len(cert)/64 + 1 + len(footer) + 1)
+
+		b.WriteString(header)
+		b.WriteByte('\n')
+
+		for i := 0; i < len(cert); i += 64 {
+			end := i + 64
+			if end > len(cert) {
+				end = len(cert)
+			}
+			b.WriteString(cert[i:end])
+			b.WriteByte('\n')
 		}
 
-		hdr = "-----BEGIN CERTIFICATE-----\n" + hdr
-		hdr += "\n-----END CERTIFICATE-----\n"
-		bs = []byte(hdr)
+		b.WriteString(footer)
+		b.WriteByte('\n')
+
+		bs = b.Bytes()
 	}
 
 	if bs == nil {
@@ -444,7 +474,6 @@ func fixupAddresses(remote *net.TCPAddr, addresses []string) []string {
 				// remote is nil, unable to determine host IP
 				continue
 			}
-
 		}
 
 		// If zero port was specified, use remote port.
@@ -494,15 +523,44 @@ func errorRetryAfterString() string {
 	return strconv.Itoa(errorRetryAfterSeconds + rand.Intn(errorRetryFuzzSeconds))
 }
 
-func notFoundRetryAfterSeconds(misses int) int {
-	retryAfterS := notFoundRetryMinSeconds + notFoundRetryIncSeconds*misses
-	if retryAfterS > notFoundRetryMaxSeconds {
-		retryAfterS = notFoundRetryMaxSeconds
-	}
-	retryAfterS += rand.Intn(notFoundRetryFuzzSeconds)
-	return retryAfterS
-}
-
 func reannounceAfterString() string {
 	return strconv.Itoa(reannounceAfterSeconds + rand.Intn(reannounzeFuzzSeconds))
 }
+
+type retryAfterTracker struct {
+	name        string
+	desiredRate float64 // requests per second
+
+	mut          sync.Mutex
+	lastCount    int       // requests in the last bucket
+	curCount     int       // requests in the current bucket
+	bucketStarts time.Time // start of the current bucket
+	currentDelay int       // current delay in seconds
+}
+
+func (t *retryAfterTracker) retryAfterS() int {
+	now := time.Now()
+	t.mut.Lock()
+	if durS := now.Sub(t.bucketStarts).Seconds(); durS > float64(t.currentDelay) {
+		t.bucketStarts = now
+		t.lastCount = t.curCount
+		lastRate := float64(t.lastCount) / durS
+
+		switch {
+		case t.currentDelay > notFoundRetryUnknownMinSeconds &&
+			lastRate < 0.75*t.desiredRate:
+			t.currentDelay = max(8*t.currentDelay/10, notFoundRetryUnknownMinSeconds)
+		case t.currentDelay < notFoundRetryUnknownMaxSeconds &&
+			lastRate > 1.25*t.desiredRate:
+			t.currentDelay = min(3*t.currentDelay/2, notFoundRetryUnknownMaxSeconds)
+		}
+
+		t.curCount = 0
+	}
+	if t.curCount == 0 {
+		retryAfterLevel.WithLabelValues(t.name).Set(float64(t.currentDelay))
+	}
+	t.curCount++
+	t.mut.Unlock()
+	return t.currentDelay + rand.Intn(t.currentDelay/4)
+}

cmd/stdiscosrv/apisrv_test.go

@@ -7,9 +7,20 @@
 package main
 
 import (
+	"context"
+	"crypto/tls"
 	"fmt"
+	"io"
 	"net"
+	"net/http"
+	"net/http/httptest"
+	"os"
+	"regexp"
+	"strings"
 	"testing"
+
+	"github.com/syncthing/syncthing/lib/protocol"
+	"github.com/syncthing/syncthing/lib/tlsutil"
 )
 
 func TestFixupAddresses(t *testing.T) {
@@ -94,3 +105,79 @@ func addr(host string, port int) *net.TCPAddr {
 		Port: port,
 	}
 }
+
+func BenchmarkAPIRequests(b *testing.B) {
+	db := newInMemoryStore(b.TempDir(), 0, nil)
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	go db.Serve(ctx)
+	api := newAPISrv("127.0.0.1:0", tls.Certificate{}, db, nil, true, true)
+	srv := httptest.NewServer(http.HandlerFunc(api.handler))
+
+	kf := b.TempDir() + "/cert"
+	crt, err := tlsutil.NewCertificate(kf+".crt", kf+".key", "localhost", 7)
+	if err != nil {
+		b.Fatal(err)
+	}
+	certBs, err := os.ReadFile(kf + ".crt")
+	if err != nil {
+		b.Fatal(err)
+	}
+	certBs = regexp.MustCompile(`---[^\n]+---\n`).ReplaceAll(certBs, nil)
+	certString := string(strings.ReplaceAll(string(certBs), "\n", " "))
+
+	devID := protocol.NewDeviceID(crt.Certificate[0])
+	devIDString := devID.String()
+
+	b.Run("Announce", func(b *testing.B) {
+		b.ReportAllocs()
+		url := srv.URL + "/v2/?device=" + devIDString
+		for i := 0; i < b.N; i++ {
+			req, _ := http.NewRequest(http.MethodPost, url, strings.NewReader(`{"addresses":["tcp://10.10.10.10:42000"]}`))
+			req.Header.Set("X-Forwarded-Tls-Client-Cert", certString)
+			resp, err := http.DefaultClient.Do(req)
+			if err != nil {
+				b.Fatal(err)
+			}
+			resp.Body.Close()
+			if resp.StatusCode != http.StatusNoContent {
+				b.Fatalf("unexpected status %s", resp.Status)
+			}
+		}
+	})
+
+	b.Run("Lookup", func(b *testing.B) {
+		b.ReportAllocs()
+		url := srv.URL + "/v2/?device=" + devIDString
+		for i := 0; i < b.N; i++ {
+			req, _ := http.NewRequest(http.MethodGet, url, nil)
+			resp, err := http.DefaultClient.Do(req)
+			if err != nil {
+				b.Fatal(err)
+			}
+			io.Copy(io.Discard, resp.Body)
+			resp.Body.Close()
+			if resp.StatusCode != http.StatusOK {
+				b.Fatalf("unexpected status %s", resp.Status)
+			}
+		}
+	})
+
+	b.Run("LookupNoCompression", func(b *testing.B) {
+		b.ReportAllocs()
+		url := srv.URL + "/v2/?device=" + devIDString
+		for i := 0; i < b.N; i++ {
+			req, _ := http.NewRequest(http.MethodGet, url, nil)
+			req.Header.Set("Accept-Encoding", "identity") // disable compression
+			resp, err := http.DefaultClient.Do(req)
+			if err != nil {
+				b.Fatal(err)
+			}
+			io.Copy(io.Discard, resp.Body)
+			resp.Body.Close()
+			if resp.StatusCode != http.StatusOK {
+				b.Fatalf("unexpected status %s", resp.Status)
+			}
+		}
+	})
+}

cmd/stdiscosrv/database.go

@@ -10,17 +10,24 @@
 package main
 
 import (
+	"bufio"
+	"cmp"
 	"context"
+	"encoding/binary"
+	"errors"
+	"io"
 	"log"
-	"net"
-	"net/url"
-	"sort"
+	"os"
+	"path"
+	"runtime"
+	"slices"
+	"strings"
 	"time"
 
-	"github.com/syncthing/syncthing/lib/sliceutil"
-	"github.com/syndtr/goleveldb/leveldb"
-	"github.com/syndtr/goleveldb/leveldb/storage"
-	"github.com/syndtr/goleveldb/leveldb/util"
+	"github.com/puzpuzpuz/xsync/v3"
+	"github.com/syncthing/syncthing/lib/protocol"
+	"github.com/syncthing/syncthing/lib/rand"
+	"github.com/syncthing/syncthing/lib/s3"
 )
 
 type clock interface {
@@ -34,380 +41,400 @@ func (defaultClock) Now() time.Time {
 }
 
 type database interface {
-	put(key string, rec DatabaseRecord) error
-	merge(key string, addrs []DatabaseAddress, seen int64) error
-	get(key string) (DatabaseRecord, error)
+	put(key *protocol.DeviceID, rec DatabaseRecord) error
+	merge(key *protocol.DeviceID, addrs []DatabaseAddress, seen int64) error
+	get(key *protocol.DeviceID) (DatabaseRecord, error)
 }
 
-type levelDBStore struct {
-	db         *leveldb.DB
-	inbox      chan func()
-	clock      clock
-	marshalBuf []byte
+type inMemoryStore struct {
+	m             *xsync.MapOf[protocol.DeviceID, DatabaseRecord]
+	dir           string
+	flushInterval time.Duration
+	s3            *s3.Session
+	objKey        string
+	clock         clock
 }
 
-func newLevelDBStore(dir string) (*levelDBStore, error) {
-	db, err := leveldb.OpenFile(dir, levelDBOptions)
+func newInMemoryStore(dir string, flushInterval time.Duration, s3sess *s3.Session) *inMemoryStore {
+	hn, err := os.Hostname()
 	if err != nil {
-		return nil, err
+		hn = rand.String(8)
 	}
-	return &levelDBStore{
-		db:    db,
-		inbox: make(chan func(), 16),
-		clock: defaultClock{},
-	}, nil
-}
-
-func newMemoryLevelDBStore() (*levelDBStore, error) {
-	db, err := leveldb.Open(storage.NewMemStorage(), nil)
-	if err != nil {
-		return nil, err
+	s := &inMemoryStore{
+		m:             xsync.NewMapOf[protocol.DeviceID, DatabaseRecord](),
+		dir:           dir,
+		flushInterval: flushInterval,
+		s3:            s3sess,
+		objKey:        hn + ".db",
+		clock:         defaultClock{},
 	}
-	return &levelDBStore{
-		db:    db,
-		inbox: make(chan func(), 16),
-		clock: defaultClock{},
-	}, nil
-}
-
-func (s *levelDBStore) put(key string, rec DatabaseRecord) error {
-	t0 := time.Now()
-	defer func() {
-		databaseOperationSeconds.WithLabelValues(dbOpPut).Observe(time.Since(t0).Seconds())
-	}()
-
-	rc := make(chan error)
-
-	s.inbox <- func() {
-		size := rec.Size()
-		if len(s.marshalBuf) < size {
-			s.marshalBuf = make([]byte, size)
+	nr, err := s.read()
+	if os.IsNotExist(err) && s3sess != nil {
+		// Try to read from AWS
+		latestKey, cerr := s3sess.LatestKey()
+		if cerr != nil {
+			log.Println("Error reading database from S3:", err)
+			return s
 		}
-		n, _ := rec.MarshalTo(s.marshalBuf)
-		rc <- s.db.Put([]byte(key), s.marshalBuf[:n], nil)
+		fd, cerr := os.Create(path.Join(s.dir, "records.db"))
+		if cerr != nil {
+			log.Println("Error creating database file:", err)
+			return s
+		}
+		if cerr := s3sess.Download(fd, latestKey); cerr != nil {
+			log.Printf("Error reading database from S3: %v", err)
+		}
+		_ = fd.Close()
+		nr, err = s.read()
 	}
-
-	err := <-rc
 	if err != nil {
-		databaseOperations.WithLabelValues(dbOpPut, dbResError).Inc()
-	} else {
-		databaseOperations.WithLabelValues(dbOpPut, dbResSuccess).Inc()
+		log.Println("Error reading database:", err)
 	}
-
-	return err
+	log.Printf("Read %d records from database", nr)
+	s.expireAndCalculateStatistics()
+	return s
 }
 
-func (s *levelDBStore) merge(key string, addrs []DatabaseAddress, seen int64) error {
+func (s *inMemoryStore) put(key *protocol.DeviceID, rec DatabaseRecord) error {
+	t0 := time.Now()
+	s.m.Store(*key, rec)
+	databaseOperations.WithLabelValues(dbOpPut, dbResSuccess).Inc()
+	databaseOperationSeconds.WithLabelValues(dbOpPut).Observe(time.Since(t0).Seconds())
+	return nil
+}
+
+func (s *inMemoryStore) merge(key *protocol.DeviceID, addrs []DatabaseAddress, seen int64) error {
 	t0 := time.Now()
-	defer func() {
-		databaseOperationSeconds.WithLabelValues(dbOpMerge).Observe(time.Since(t0).Seconds())
-	}()
 
-	rc := make(chan error)
 	newRec := DatabaseRecord{
 		Addresses: addrs,
 		Seen:      seen,
 	}
 
-	s.inbox <- func() {
-		// grab the existing record
-		oldRec, err := s.get(key)
-		if err != nil {
-			// "not found" is not an error from get, so this is serious
-			// stuff only
-			rc <- err
-			return
-		}
-		newRec = merge(newRec, oldRec)
+	oldRec, _ := s.m.Load(*key)
+	newRec = merge(oldRec, newRec)
+	s.m.Store(*key, newRec)
 
-		// We replicate s.put() functionality here ourselves instead of
-		// calling it because we want to serialize our get above together
-		// with the put in the same function.
-		size := newRec.Size()
-		if len(s.marshalBuf) < size {
-			s.marshalBuf = make([]byte, size)
-		}
-		n, _ := newRec.MarshalTo(s.marshalBuf)
-		rc <- s.db.Put([]byte(key), s.marshalBuf[:n], nil)
-	}
+	databaseOperations.WithLabelValues(dbOpMerge, dbResSuccess).Inc()
+	databaseOperationSeconds.WithLabelValues(dbOpMerge).Observe(time.Since(t0).Seconds())
 
-	err := <-rc
-	if err != nil {
-		databaseOperations.WithLabelValues(dbOpMerge, dbResError).Inc()
-	} else {
-		databaseOperations.WithLabelValues(dbOpMerge, dbResSuccess).Inc()
-	}
-
-	return err
+	return nil
 }
 
-func (s *levelDBStore) get(key string) (DatabaseRecord, error) {
+func (s *inMemoryStore) get(key *protocol.DeviceID) (DatabaseRecord, error) {
 	t0 := time.Now()
 	defer func() {
 		databaseOperationSeconds.WithLabelValues(dbOpGet).Observe(time.Since(t0).Seconds())
 	}()
 
-	keyBs := []byte(key)
-	val, err := s.db.Get(keyBs, nil)
-	if err == leveldb.ErrNotFound {
+	rec, ok := s.m.Load(*key)
+	if !ok {
 		databaseOperations.WithLabelValues(dbOpGet, dbResNotFound).Inc()
 		return DatabaseRecord{}, nil
 	}
-	if err != nil {
-		databaseOperations.WithLabelValues(dbOpGet, dbResError).Inc()
-		return DatabaseRecord{}, err
-	}
 
-	var rec DatabaseRecord
-
-	if err := rec.Unmarshal(val); err != nil {
-		databaseOperations.WithLabelValues(dbOpGet, dbResUnmarshalError).Inc()
-		return DatabaseRecord{}, nil
-	}
-
-	rec.Addresses = expire(rec.Addresses, s.clock.Now().UnixNano())
+	rec.Addresses = expire(rec.Addresses, s.clock.Now())
 	databaseOperations.WithLabelValues(dbOpGet, dbResSuccess).Inc()
 	return rec, nil
 }
 
-func (s *levelDBStore) Serve(ctx context.Context) error {
-	t := time.NewTimer(0)
-	defer t.Stop()
-	defer s.db.Close()
+func (s *inMemoryStore) Serve(ctx context.Context) error {
+	if s.flushInterval <= 0 {
+		<-ctx.Done()
+		return nil
+	}
 
-	// Start the statistics serve routine. It will exit with us when
-	// statisticsTrigger is closed.
-	statisticsTrigger := make(chan struct{})
-	statisticsDone := make(chan struct{})
-	go s.statisticsServe(statisticsTrigger, statisticsDone)
+	t := time.NewTimer(s.flushInterval)
+	defer t.Stop()
 
 loop:
 	for {
 		select {
-		case fn := <-s.inbox:
-			// Run function in serialized order.
-			fn()
-
 		case <-t.C:
-			// Trigger the statistics routine to do its thing in the
-			// background.
-			statisticsTrigger <- struct{}{}
-
-		case <-statisticsDone:
-			// The statistics routine is done with one iteratation, schedule
-			// the next.
-			t.Reset(databaseStatisticsInterval)
+			log.Println("Calculating statistics")
+			s.expireAndCalculateStatistics()
+			log.Println("Flushing database")
+			if err := s.write(); err != nil {
+				log.Println("Error writing database:", err)
+			}
+			log.Println("Finished flushing database")
+			t.Reset(s.flushInterval)
 
 		case <-ctx.Done():
 			// We're done.
-			close(statisticsTrigger)
 			break loop
 		}
 	}
 
-	// Also wait for statisticsServe to return
-	<-statisticsDone
+	return s.write()
+}
+
+func (s *inMemoryStore) expireAndCalculateStatistics() {
+	now := s.clock.Now()
+	cutoff24h := now.Add(-24 * time.Hour).UnixNano()
+	cutoff1w := now.Add(-7 * 24 * time.Hour).UnixNano()
+	current, currentIPv4, currentIPv6, currentIPv6GUA, last24h, last1w := 0, 0, 0, 0, 0, 0
+
+	n := 0
+	s.m.Range(func(key protocol.DeviceID, rec DatabaseRecord) bool {
+		if n%1000 == 0 {
+			runtime.Gosched()
+		}
+		n++
+
+		addresses := expire(rec.Addresses, now)
+		if len(addresses) == 0 {
+			rec.Addresses = nil
+			s.m.Store(key, rec)
+		} else if len(addresses) != len(rec.Addresses) {
+			rec.Addresses = addresses
+			s.m.Store(key, rec)
+		}
+
+		switch {
+		case len(rec.Addresses) > 0:
+			current++
+			seenIPv4, seenIPv6, seenIPv6GUA := false, false, false
+			for _, addr := range rec.Addresses {
+				// We do fast and loose matching on strings here instead of
+				// parsing the address and the IP and doing "proper" checks,
+				// to keep things fast and generate less garbage.
+				if strings.Contains(addr.Address, "[") {
+					seenIPv6 = true
+					if strings.Contains(addr.Address, "[2") {
+						seenIPv6GUA = true
+					}
+				} else {
+					seenIPv4 = true
+				}
+				if seenIPv4 && seenIPv6 && seenIPv6GUA {
+					break
+				}
+			}
+			if seenIPv4 {
+				currentIPv4++
+			}
+			if seenIPv6 {
+				currentIPv6++
+			}
+			if seenIPv6GUA {
+				currentIPv6GUA++
+			}
+		case rec.Seen > cutoff24h:
+			last24h++
+		case rec.Seen > cutoff1w:
+			last1w++
+		default:
+			// drop the record if it's older than a week
+			s.m.Delete(key)
+		}
+		return true
+	})
+
+	databaseKeys.WithLabelValues("current").Set(float64(current))
+	databaseKeys.WithLabelValues("currentIPv4").Set(float64(currentIPv4))
+	databaseKeys.WithLabelValues("currentIPv6").Set(float64(currentIPv6))
+	databaseKeys.WithLabelValues("currentIPv6GUA").Set(float64(currentIPv6GUA))
+	databaseKeys.WithLabelValues("last24h").Set(float64(last24h))
+	databaseKeys.WithLabelValues("last1w").Set(float64(last1w))
+	databaseStatisticsSeconds.Set(time.Since(now).Seconds())
+}
+
+func (s *inMemoryStore) write() (err error) {
+	t0 := time.Now()
+	defer func() {
+		if err == nil {
+			databaseWriteSeconds.Set(time.Since(t0).Seconds())
+			databaseLastWritten.Set(float64(t0.Unix()))
+		}
+	}()
+
+	dbf := path.Join(s.dir, "records.db")
+	fd, err := os.Create(dbf + ".tmp")
+	if err != nil {
+		return err
+	}
+	bw := bufio.NewWriter(fd)
+
+	var buf []byte
+	var rangeErr error
+	now := s.clock.Now()
+	cutoff1w := now.Add(-7 * 24 * time.Hour).UnixNano()
+	n := 0
+	s.m.Range(func(key protocol.DeviceID, value DatabaseRecord) bool {
+		if n%1000 == 0 {
+			runtime.Gosched()
+		}
+		n++
+
+		if value.Seen < cutoff1w {
+			// drop the record if it's older than a week
+			return true
+		}
+		rec := ReplicationRecord{
+			Key:       key[:],
+			Addresses: value.Addresses,
+			Seen:      value.Seen,
+		}
+		s := rec.Size()
+		if s+4 > len(buf) {
+			buf = make([]byte, s+4)
+		}
+		n, err := rec.MarshalTo(buf[4:])
+		if err != nil {
+			rangeErr = err
+			return false
+		}
+		binary.BigEndian.PutUint32(buf, uint32(n))
+		if _, err := bw.Write(buf[:n+4]); err != nil {
+			rangeErr = err
+			return false
+		}
+		return true
+	})
+	if rangeErr != nil {
+		_ = fd.Close()
+		return rangeErr
+	}
+
+	if err := bw.Flush(); err != nil {
+		_ = fd.Close
+		return err
+	}
+	if err := fd.Close(); err != nil {
+		return err
+	}
+	if err := os.Rename(dbf+".tmp", dbf); err != nil {
+		return err
+	}
+
+	// Upload to S3
+	if s.s3 != nil {
+		fd, err = os.Open(dbf)
+		if err != nil {
+			log.Printf("Error uploading database to S3: %v", err)
+			return nil
+		}
+		defer fd.Close()
+		if err := s.s3.Upload(fd, s.objKey); err != nil {
+			log.Printf("Error uploading database to S3: %v", err)
+		}
+		log.Println("Finished uploading database")
+	}
 
 	return nil
 }
 
-func (s *levelDBStore) statisticsServe(trigger <-chan struct{}, done chan<- struct{}) {
-	defer close(done)
+func (s *inMemoryStore) read() (int, error) {
+	fd, err := os.Open(path.Join(s.dir, "records.db"))
+	if err != nil {
+		return 0, err
+	}
+	defer fd.Close()
 
-	for range trigger {
-		t0 := time.Now()
-		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, currentIPv4, currentIPv6, last24h, last1w, inactive, errors := 0, 0, 0, 0, 0, 0, 0
-
-		iter := s.db.NewIterator(&util.Range{}, nil)
-		for iter.Next() {
-			// Attempt to unmarshal the record and count the
-			// failure if there's something wrong with it.
-			var rec DatabaseRecord
-			if err := rec.Unmarshal(iter.Value()); err != nil {
-				errors++
-				continue
-			}
-
-			// If there are addresses that have not expired it's a current
-			// record, otherwise account it based on when it was last seen
-			// (last 24 hours or last week) or finally as inactice.
-			addrs := expire(rec.Addresses, nowNanos)
-			switch {
-			case len(addrs) > 0:
-				current++
-				seenIPv4, seenIPv6 := false, false
-				for _, addr := range addrs {
-					uri, err := url.Parse(addr.Address)
-					if err != nil {
-						continue
-					}
-					host, _, err := net.SplitHostPort(uri.Host)
-					if err != nil {
-						continue
-					}
-					if ip := net.ParseIP(host); ip != nil && ip.To4() != nil {
-						seenIPv4 = true
-					} else if ip != nil {
-						seenIPv6 = true
-					}
-					if seenIPv4 && seenIPv6 {
-						break
-					}
-				}
-				if seenIPv4 {
-					currentIPv4++
-				}
-				if seenIPv6 {
-					currentIPv6++
-				}
-			case rec.Seen > cutoff24h:
-				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++
+	br := bufio.NewReader(fd)
+	var buf []byte
+	nr := 0
+	for {
+		var n uint32
+		if err := binary.Read(br, binary.BigEndian, &n); err != nil {
+			if errors.Is(err, io.EOF) {
+				break
 			}
+			return nr, err
+		}
+		if int(n) > len(buf) {
+			buf = make([]byte, n)
+		}
+		if _, err := io.ReadFull(br, buf[:n]); err != nil {
+			return nr, err
+		}
+		rec := ReplicationRecord{}
+		if err := rec.Unmarshal(buf[:n]); err != nil {
+			return nr, err
+		}
+		key, err := protocol.DeviceIDFromBytes(rec.Key)
+		if err != nil {
+			key, err = protocol.DeviceIDFromString(string(rec.Key))
+		}
+		if err != nil {
+			log.Println("Bad device ID:", err)
+			continue
 		}
 
-		iter.Release()
-
-		databaseKeys.WithLabelValues("current").Set(float64(current))
-		databaseKeys.WithLabelValues("currentIPv4").Set(float64(currentIPv4))
-		databaseKeys.WithLabelValues("currentIPv6").Set(float64(currentIPv6))
-		databaseKeys.WithLabelValues("last24h").Set(float64(last24h))
-		databaseKeys.WithLabelValues("last1w").Set(float64(last1w))
-		databaseKeys.WithLabelValues("inactive").Set(float64(inactive))
-		databaseKeys.WithLabelValues("error").Set(float64(errors))
-		databaseStatisticsSeconds.Set(time.Since(t0).Seconds())
-
-		// Signal that we are done and can be scheduled again.
-		done <- struct{}{}
+		slices.SortFunc(rec.Addresses, DatabaseAddress.Cmp)
+		rec.Addresses = slices.CompactFunc(rec.Addresses, DatabaseAddress.Equal)
+		s.m.Store(key, DatabaseRecord{
+			Addresses: expire(rec.Addresses, s.clock.Now()),
+			Seen:      rec.Seen,
+		})
+		nr++
 	}
+	return nr, nil
 }
 
 // merge returns the merged result of the two database records a and b. The
 // result is the union of the two address sets, with the newer expiry time
-// chosen for any duplicates.
+// chosen for any duplicates. The address list in a is overwritten and
+// reused for the result.
 func merge(a, b DatabaseRecord) DatabaseRecord {
 	// Both lists must be sorted for this to work.
-	if !sort.IsSorted(databaseAddressOrder(a.Addresses)) {
-		log.Println("Warning: bug: addresses not correctly sorted in merge")
-		a.Addresses = sortedAddressCopy(a.Addresses)
-	}
-	if !sort.IsSorted(databaseAddressOrder(b.Addresses)) {
-		// no warning because this is the side we read from disk and it may
-		// legitimately predate correct sorting.
-		b.Addresses = sortedAddressCopy(b.Addresses)
-	}
 
-	res := DatabaseRecord{
-		Addresses: make([]DatabaseAddress, 0, len(a.Addresses)+len(b.Addresses)),
-		Seen:      a.Seen,
-	}
-	if b.Seen > a.Seen {
-		res.Seen = b.Seen
-	}
+	a.Seen = max(a.Seen, b.Seen)
 
 	aIdx := 0
 	bIdx := 0
-	aAddrs := a.Addresses
-	bAddrs := b.Addresses
-loop:
-	for {
-		switch {
-		case aIdx == len(aAddrs) && bIdx == len(bAddrs):
-			// both lists are exhausted, we are done
-			break loop
-
-		case aIdx == len(aAddrs):
-			// a is exhausted, pick from b and continue
-			res.Addresses = append(res.Addresses, bAddrs[bIdx])
-			bIdx++
-			continue
-
-		case bIdx == len(bAddrs):
-			// b is exhausted, pick from a and continue
-			res.Addresses = append(res.Addresses, aAddrs[aIdx])
-			aIdx++
-			continue
-		}
-
-		// We have values left on both sides.
-		aVal := aAddrs[aIdx]
-		bVal := bAddrs[bIdx]
-
-		switch {
-		case aVal.Address == bVal.Address:
-			// update for same address, pick newer
-			if aVal.Expires > bVal.Expires {
-				res.Addresses = append(res.Addresses, aVal)
-			} else {
-				res.Addresses = append(res.Addresses, bVal)
-			}
+	for aIdx < len(a.Addresses) && bIdx < len(b.Addresses) {
+		switch cmp.Compare(a.Addresses[aIdx].Address, b.Addresses[bIdx].Address) {
+		case 0:
+			// a == b, choose the newer expiry time
+			a.Addresses[aIdx].Expires = max(a.Addresses[aIdx].Expires, b.Addresses[bIdx].Expires)
 			aIdx++
 			bIdx++
-
-		case aVal.Address < bVal.Address:
-			// a is smallest, pick it and continue
-			res.Addresses = append(res.Addresses, aVal)
+		case -1:
+			// a < b, keep a and move on
 			aIdx++
-
-		default:
-			// b is smallest, pick it and continue
-			res.Addresses = append(res.Addresses, bVal)
+		case 1:
+			// a > b, insert b before a
+			a.Addresses = append(a.Addresses[:aIdx], append([]DatabaseAddress{b.Addresses[bIdx]}, a.Addresses[aIdx:]...)...)
 			bIdx++
 		}
 	}
-	return res
+	if bIdx < len(b.Addresses) {
+		a.Addresses = append(a.Addresses, b.Addresses[bIdx:]...)
+	}
+
+	return a
 }
 
 // expire returns the list of addresses after removing expired entries.
 // Expiration happen in place, so the slice given as the parameter is
-// destroyed. Internal order is not preserved.
-func expire(addrs []DatabaseAddress, now int64) []DatabaseAddress {
-	i := 0
-	for i < len(addrs) {
-		if addrs[i].Expires < now {
-			addrs = sliceutil.RemoveAndZero(addrs, i)
+// destroyed. Internal order is preserved.
+func expire(addrs []DatabaseAddress, now time.Time) []DatabaseAddress {
+	cutoff := now.UnixNano()
+	naddrs := addrs[:0]
+	for i := range addrs {
+		if i > 0 && addrs[i].Address == addrs[i-1].Address {
+			// Skip duplicates
 			continue
 		}
-		i++
+		if addrs[i].Expires >= cutoff {
+			naddrs = append(naddrs, addrs[i])
+		}
 	}
-	return addrs
+	if len(naddrs) == 0 {
+		return nil
+	}
+	return naddrs
 }
 
-func sortedAddressCopy(addrs []DatabaseAddress) []DatabaseAddress {
-	sorted := make([]DatabaseAddress, len(addrs))
-	copy(sorted, addrs)
-	sort.Sort(databaseAddressOrder(sorted))
-	return sorted
+func (d DatabaseAddress) Cmp(other DatabaseAddress) (n int) {
+	if c := cmp.Compare(d.Address, other.Address); c != 0 {
+		return c
+	}
+	return cmp.Compare(d.Expires, other.Expires)
 }
 
-type databaseAddressOrder []DatabaseAddress
-
-func (s databaseAddressOrder) Less(a, b int) bool {
-	return s[a].Address < s[b].Address
-}
-
-func (s databaseAddressOrder) Swap(a, b int) {
-	s[a], s[b] = s[b], s[a]
-}
-
-func (s databaseAddressOrder) Len() int {
-	return len(s)
+func (d DatabaseAddress) Equal(other DatabaseAddress) bool {
+	return d.Address == other.Address
 }

cmd/stdiscosrv/database.pb.go

@@ -25,9 +25,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 
 type DatabaseRecord struct {
 	Addresses []DatabaseAddress `protobuf:"bytes,1,rep,name=addresses,proto3" json:"addresses"`
-	Misses    int32             `protobuf:"varint,2,opt,name=misses,proto3" json:"misses,omitempty"`
 	Seen      int64             `protobuf:"varint,3,opt,name=seen,proto3" json:"seen,omitempty"`
-	Missed    int64             `protobuf:"varint,4,opt,name=missed,proto3" json:"missed,omitempty"`
 }
 
 func (m *DatabaseRecord) Reset()         { *m = DatabaseRecord{} }
@@ -64,7 +62,7 @@ func (m *DatabaseRecord) XXX_DiscardUnknown() {
 var xxx_messageInfo_DatabaseRecord proto.InternalMessageInfo
 
 type ReplicationRecord struct {
-	Key       string            `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
+	Key       []byte            `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
 	Addresses []DatabaseAddress `protobuf:"bytes,2,rep,name=addresses,proto3" json:"addresses"`
 	Seen      int64             `protobuf:"varint,3,opt,name=seen,proto3" json:"seen,omitempty"`
 }
@@ -149,24 +147,23 @@ func init() {
 func init() { proto.RegisterFile("database.proto", fileDescriptor_b90fe3356ea5df07) }
 
 var fileDescriptor_b90fe3356ea5df07 = []byte{
-	// 270 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x90, 0x41, 0x4a, 0xc4, 0x30,
-	0x18, 0x85, 0x9b, 0x49, 0x1d, 0x99, 0x08, 0xa3, 0x06, 0x94, 0x20, 0x12, 0x4b, 0xdd, 0x74, 0xd5,
-	0x01, 0x5d, 0xb9, 0x74, 0xd0, 0x0b, 0xe4, 0x06, 0xe9, 0xe4, 0x77, 0x08, 0x3a, 0x4d, 0x49, 0x2a,
-	0xe8, 0x29, 0xf4, 0x58, 0x5d, 0xce, 0xd2, 0x95, 0x68, 0x7b, 0x11, 0x69, 0x26, 0x55, 0x14, 0x37,
-	0xb3, 0x7b, 0xdf, 0xff, 0xbf, 0x97, 0xbc, 0x84, 0x4c, 0x95, 0xac, 0x65, 0x21, 0x1d, 0xe4, 0x95,
-	0x35, 0xb5, 0xa1, 0xf1, 0x4a, 0xea, 0xf2, 0xe4, 0xdc, 0x42, 0x65, 0xdc, 0xcc, 0x8f, 0x8a, 0xc7,
-	0xbb, 0xd9, 0xd2, 0x2c, 0x8d, 0x07, 0xaf, 0x36, 0xd6, 0xf4, 0x05, 0x91, 0xe9, 0x4d, 0x48, 0x0b,
-	0x58, 0x18, 0xab, 0xe8, 0x15, 0x99, 0x48, 0xa5, 0x2c, 0x38, 0x07, 0x8e, 0xa1, 0x04, 0x67, 0x7b,
-	0x17, 0x47, 0x79, 0x7f, 0x62, 0x3e, 0x18, 0xaf, 0x37, 0xeb, 0x79, 0xdc, 0xbc, 0x9f, 0x45, 0xe2,
-	0xc7, 0x4d, 0x8f, 0xc9, 0x78, 0xa5, 0x7d, 0x6e, 0x94, 0xa0, 0x6c, 0x47, 0x04, 0xa2, 0x94, 0xc4,
-	0x0e, 0xa0, 0x64, 0x38, 0x41, 0x19, 0x16, 0x5e, 0x7f, 0x7b, 0x15, 0x8b, 0xfd, 0x34, 0x50, 0x5a,
-	0x93, 0x43, 0x01, 0xd5, 0x83, 0x5e, 0xc8, 0x5a, 0x9b, 0x32, 0x74, 0x3a, 0x20, 0xf8, 0x1e, 0x9e,
-	0x19, 0x4a, 0x50, 0x36, 0x11, 0xbd, 0xfc, 0xdd, 0x72, 0xb4, 0x55, 0xcb, 0x7f, 0xda, 0xa4, 0xb7,
-	0x64, 0xff, 0x4f, 0x8e, 0x32, 0xb2, 0x1b, 0x32, 0xe1, 0xde, 0x01, 0xfb, 0x0d, 0x3c, 0x55, 0xda,
-	0x86, 0x77, 0x62, 0x31, 0xe0, 0xfc, 0xb4, 0xf9, 0xe4, 0x51, 0xd3, 0x72, 0xb4, 0x6e, 0x39, 0xfa,
-	0x68, 0x39, 0x7a, 0xed, 0x78, 0xb4, 0xee, 0x78, 0xf4, 0xd6, 0xf1, 0xa8, 0x18, 0xfb, 0x3f, 0xbf,
-	0xfc, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x7a, 0xa2, 0xf6, 0x1e, 0xb0, 0x01, 0x00, 0x00,
+	// 243 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x4b, 0x49, 0x2c, 0x49,
+	0x4c, 0x4a, 0x2c, 0x4e, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0xc9, 0x4d, 0xcc, 0xcc,
+	0x93, 0x52, 0x2e, 0x4a, 0x2d, 0xc8, 0x2f, 0xd6, 0x07, 0x0b, 0x25, 0x95, 0xa6, 0xe9, 0xa7, 0xe7,
+	0xa7, 0xe7, 0x83, 0x39, 0x60, 0x16, 0x44, 0xa9, 0x52, 0x3c, 0x17, 0x9f, 0x0b, 0x54, 0x73, 0x50,
+	0x6a, 0x72, 0x7e, 0x51, 0x8a, 0x90, 0x25, 0x17, 0x67, 0x62, 0x4a, 0x4a, 0x51, 0x6a, 0x71, 0x71,
+	0x6a, 0xb1, 0x04, 0xa3, 0x02, 0xb3, 0x06, 0xb7, 0x91, 0xa8, 0x1e, 0xc8, 0x40, 0x3d, 0x98, 0x42,
+	0x47, 0x88, 0xb4, 0x13, 0xcb, 0x89, 0x7b, 0xf2, 0x0c, 0x41, 0x08, 0xd5, 0x42, 0x42, 0x5c, 0x2c,
+	0xc5, 0xa9, 0xa9, 0x79, 0x12, 0xcc, 0x0a, 0x8c, 0x1a, 0xcc, 0x41, 0x60, 0xb6, 0x52, 0x09, 0x97,
+	0x60, 0x50, 0x6a, 0x41, 0x4e, 0x66, 0x72, 0x62, 0x49, 0x66, 0x7e, 0x1e, 0xd4, 0x0e, 0x01, 0x2e,
+	0xe6, 0xec, 0xd4, 0x4a, 0x09, 0x46, 0x05, 0x46, 0x0d, 0x9e, 0x20, 0x10, 0x13, 0xd5, 0x56, 0x26,
+	0x8a, 0x6d, 0x75, 0xe5, 0xe2, 0x47, 0xd3, 0x27, 0x24, 0xc1, 0xc5, 0x0e, 0xd5, 0x03, 0xb6, 0x97,
+	0x33, 0x08, 0xc6, 0x05, 0xc9, 0xa4, 0x56, 0x14, 0x64, 0x16, 0x81, 0x6d, 0x06, 0x99, 0x01, 0xe3,
+	0x3a, 0xc9, 0x9c, 0x78, 0x28, 0xc7, 0x70, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f,
+	0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c, 0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c,
+	0x49, 0x6c, 0xe0, 0x20, 0x34, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0xc6, 0x0b, 0x9b, 0x77, 0x7f,
+	0x01, 0x00, 0x00,
 }
 
 func (m *DatabaseRecord) Marshal() (dAtA []byte, err error) {
@@ -189,21 +186,11 @@ func (m *DatabaseRecord) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
-	if m.Missed != 0 {
-		i = encodeVarintDatabase(dAtA, i, uint64(m.Missed))
-		i--
-		dAtA[i] = 0x20
-	}
 	if m.Seen != 0 {
 		i = encodeVarintDatabase(dAtA, i, uint64(m.Seen))
 		i--
 		dAtA[i] = 0x18
 	}
-	if m.Misses != 0 {
-		i = encodeVarintDatabase(dAtA, i, uint64(m.Misses))
-		i--
-		dAtA[i] = 0x10
-	}
 	if len(m.Addresses) > 0 {
 		for iNdEx := len(m.Addresses) - 1; iNdEx >= 0; iNdEx-- {
 			{
@@ -328,15 +315,9 @@ func (m *DatabaseRecord) Size() (n int) {
 			n += 1 + l + sovDatabase(uint64(l))
 		}
 	}
-	if m.Misses != 0 {
-		n += 1 + sovDatabase(uint64(m.Misses))
-	}
 	if m.Seen != 0 {
 		n += 1 + sovDatabase(uint64(m.Seen))
 	}
-	if m.Missed != 0 {
-		n += 1 + sovDatabase(uint64(m.Missed))
-	}
 	return n
 }
 
@@ -447,25 +428,6 @@ func (m *DatabaseRecord) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
-		case 2:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Misses", wireType)
-			}
-			m.Misses = 0
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowDatabase
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				m.Misses |= int32(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
 		case 3:
 			if wireType != 0 {
 				return fmt.Errorf("proto: wrong wireType = %d for field Seen", wireType)
@@ -485,25 +447,6 @@ func (m *DatabaseRecord) Unmarshal(dAtA []byte) error {
 					break
 				}
 			}
-		case 4:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Missed", wireType)
-			}
-			m.Missed = 0
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowDatabase
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				m.Missed |= int64(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
 		default:
 			iNdEx = preIndex
 			skippy, err := skipDatabase(dAtA[iNdEx:])
@@ -558,7 +501,7 @@ func (m *ReplicationRecord) Unmarshal(dAtA []byte) error {
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field Key", wireType)
 			}
-			var stringLen uint64
+			var byteLen int
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
 					return ErrIntOverflowDatabase
@@ -568,23 +511,25 @@ func (m *ReplicationRecord) Unmarshal(dAtA []byte) error {
 				}
 				b := dAtA[iNdEx]
 				iNdEx++
-				stringLen |= uint64(b&0x7F) << shift
+				byteLen |= int(b&0x7F) << shift
 				if b < 0x80 {
 					break
 				}
 			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
+			if byteLen < 0 {
 				return ErrInvalidLengthDatabase
 			}
-			postIndex := iNdEx + intStringLen
+			postIndex := iNdEx + byteLen
 			if postIndex < 0 {
 				return ErrInvalidLengthDatabase
 			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Key = string(dAtA[iNdEx:postIndex])
+			m.Key = append(m.Key[:0], dAtA[iNdEx:postIndex]...)
+			if m.Key == nil {
+				m.Key = []byte{}
+			}
 			iNdEx = postIndex
 		case 2:
 			if wireType != 2 {

cmd/stdiscosrv/database.proto

@@ -17,15 +17,11 @@ option (gogoproto.goproto_sizecache_all) = false;
 
 message DatabaseRecord {
     repeated DatabaseAddress addresses = 1 [(gogoproto.nullable) = false];
-    int32                    misses    = 2; // Number of lookups* without hits
     int64                    seen      = 3; // Unix nanos, last device announce
-    int64                    missed    = 4; // Unix nanos, last* failed lookup
 }
 
-// *) Not every lookup results in a write, so may not be completely accurate
-
 message ReplicationRecord {
-    string                   key       = 1;
+    bytes                    key       = 1; // raw 32 byte device ID
     repeated DatabaseAddress addresses = 2 [(gogoproto.nullable) = false];
     int64                    seen      = 3; // Unix nanos, last device announce
 }

cmd/stdiscosrv/database_test.go

@@ -11,29 +11,25 @@ import (
 	"fmt"
 	"testing"
 	"time"
+
+	"github.com/syncthing/syncthing/lib/protocol"
 )
 
 func TestDatabaseGetSet(t *testing.T) {
-	db, err := newMemoryLevelDBStore()
-	if err != nil {
-		t.Fatal(err)
-	}
+	db := newInMemoryStore(t.TempDir(), 0, nil)
 	ctx, cancel := context.WithCancel(context.Background())
 	go db.Serve(ctx)
 	defer cancel()
 
 	// Check missing record
 
-	rec, err := db.get("abcd")
+	rec, err := db.get(&protocol.EmptyDeviceID)
 	if err != nil {
 		t.Error("not found should not be an error")
 	}
 	if len(rec.Addresses) != 0 {
 		t.Error("addresses should be empty")
 	}
-	if rec.Misses != 0 {
-		t.Error("missing should be zero")
-	}
 
 	// Set up a clock
 
@@ -46,13 +42,13 @@ func TestDatabaseGetSet(t *testing.T) {
 	rec.Addresses = []DatabaseAddress{
 		{Address: "tcp://1.2.3.4:5", Expires: tc.Now().Add(time.Minute).UnixNano()},
 	}
-	if err := db.put("abcd", rec); err != nil {
+	if err := db.put(&protocol.EmptyDeviceID, rec); err != nil {
 		t.Fatal(err)
 	}
 
 	// Verify it
 
-	rec, err = db.get("abcd")
+	rec, err = db.get(&protocol.EmptyDeviceID)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -72,13 +68,13 @@ func TestDatabaseGetSet(t *testing.T) {
 	addrs := []DatabaseAddress{
 		{Address: "tcp://6.7.8.9:0", Expires: tc.Now().Add(time.Minute).UnixNano()},
 	}
-	if err := db.merge("abcd", addrs, tc.Now().UnixNano()); err != nil {
+	if err := db.merge(&protocol.EmptyDeviceID, addrs, tc.Now().UnixNano()); err != nil {
 		t.Fatal(err)
 	}
 
 	// Verify it
 
-	rec, err = db.get("abcd")
+	rec, err = db.get(&protocol.EmptyDeviceID)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -101,7 +97,7 @@ func TestDatabaseGetSet(t *testing.T) {
 
 	// Verify it
 
-	rec, err = db.get("abcd")
+	rec, err = db.get(&protocol.EmptyDeviceID)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -114,40 +110,18 @@ func TestDatabaseGetSet(t *testing.T) {
 		t.Error("incorrect address")
 	}
 
-	// Put a record with misses
-
-	rec = DatabaseRecord{Misses: 42, Missed: tc.Now().UnixNano()}
-	if err := db.put("efgh", rec); err != nil {
-		t.Fatal(err)
-	}
-
-	// Verify it
-
-	rec, err = db.get("efgh")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(rec.Addresses) != 0 {
-		t.Log(rec.Addresses)
-		t.Fatal("should have no addresses")
-	}
-	if rec.Misses != 42 {
-		t.Log(rec.Misses)
-		t.Error("incorrect misses")
-	}
-
 	// Set an address
 
 	addrs = []DatabaseAddress{
 		{Address: "tcp://6.7.8.9:0", Expires: tc.Now().Add(time.Minute).UnixNano()},
 	}
-	if err := db.merge("efgh", addrs, tc.Now().UnixNano()); err != nil {
+	if err := db.merge(&protocol.GlobalDeviceID, addrs, tc.Now().UnixNano()); err != nil {
 		t.Fatal(err)
 	}
 
 	// Verify it
 
-	rec, err = db.get("efgh")
+	rec, err = db.get(&protocol.GlobalDeviceID)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -155,10 +129,6 @@ func TestDatabaseGetSet(t *testing.T) {
 		t.Log(rec.Addresses)
 		t.Fatal("should have one address")
 	}
-	if rec.Misses != 0 {
-		t.Log(rec.Misses)
-		t.Error("should have no misses")
-	}
 }
 
 func TestFilter(t *testing.T) {
@@ -190,13 +160,95 @@ func TestFilter(t *testing.T) {
 	}
 
 	for _, tc := range cases {
-		res := expire(tc.a, 10)
+		res := expire(tc.a, time.Unix(0, 10))
 		if fmt.Sprint(res) != fmt.Sprint(tc.b) {
 			t.Errorf("Incorrect result %v, expected %v", res, tc.b)
 		}
 	}
 }
 
+func TestMerge(t *testing.T) {
+	cases := []struct {
+		a, b, res []DatabaseAddress
+	}{
+		{nil, nil, nil},
+		{
+			nil,
+			[]DatabaseAddress{{Address: "a", Expires: 10}},
+			[]DatabaseAddress{{Address: "a", Expires: 10}},
+		},
+		{
+			nil,
+			[]DatabaseAddress{{Address: "a", Expires: 10}, {Address: "b", Expires: 10}, {Address: "c", Expires: 10}},
+			[]DatabaseAddress{{Address: "a", Expires: 10}, {Address: "b", Expires: 10}, {Address: "c", Expires: 10}},
+		},
+		{
+			[]DatabaseAddress{{Address: "a", Expires: 10}},
+			[]DatabaseAddress{{Address: "a", Expires: 15}},
+			[]DatabaseAddress{{Address: "a", Expires: 15}},
+		},
+		{
+			[]DatabaseAddress{{Address: "a", Expires: 10}},
+			[]DatabaseAddress{{Address: "b", Expires: 15}},
+			[]DatabaseAddress{{Address: "a", Expires: 10}, {Address: "b", Expires: 15}},
+		},
+		{
+			[]DatabaseAddress{{Address: "a", Expires: 10}, {Address: "b", Expires: 15}},
+			[]DatabaseAddress{{Address: "a", Expires: 15}, {Address: "b", Expires: 15}},
+			[]DatabaseAddress{{Address: "a", Expires: 15}, {Address: "b", Expires: 15}},
+		},
+		{
+			[]DatabaseAddress{{Address: "a", Expires: 10}, {Address: "b", Expires: 15}},
+			[]DatabaseAddress{{Address: "b", Expires: 15}, {Address: "c", Expires: 20}},
+			[]DatabaseAddress{{Address: "a", Expires: 10}, {Address: "b", Expires: 15}, {Address: "c", Expires: 20}},
+		},
+		{
+			[]DatabaseAddress{{Address: "a", Expires: 10}, {Address: "b", Expires: 15}},
+			[]DatabaseAddress{{Address: "b", Expires: 5}, {Address: "c", Expires: 20}},
+			[]DatabaseAddress{{Address: "a", Expires: 10}, {Address: "b", Expires: 15}, {Address: "c", Expires: 20}},
+		},
+		{
+			[]DatabaseAddress{{Address: "y", Expires: 10}, {Address: "z", Expires: 10}},
+			[]DatabaseAddress{{Address: "a", Expires: 5}, {Address: "b", Expires: 15}},
+			[]DatabaseAddress{{Address: "a", Expires: 5}, {Address: "b", Expires: 15}, {Address: "y", Expires: 10}, {Address: "z", Expires: 10}},
+		},
+		{
+			[]DatabaseAddress{{Address: "a", Expires: 10}, {Address: "b", Expires: 15}, {Address: "d", Expires: 10}},
+			[]DatabaseAddress{{Address: "b", Expires: 5}, {Address: "c", Expires: 20}},
+			[]DatabaseAddress{{Address: "a", Expires: 10}, {Address: "b", Expires: 15}, {Address: "c", Expires: 20}, {Address: "d", Expires: 10}},
+		},
+	}
+
+	for _, tc := range cases {
+		rec := merge(DatabaseRecord{Addresses: tc.a}, DatabaseRecord{Addresses: tc.b})
+		if fmt.Sprint(rec.Addresses) != fmt.Sprint(tc.res) {
+			t.Errorf("Incorrect result %v, expected %v", rec.Addresses, tc.res)
+		}
+		rec = merge(DatabaseRecord{Addresses: tc.b}, DatabaseRecord{Addresses: tc.a})
+		if fmt.Sprint(rec.Addresses) != fmt.Sprint(tc.res) {
+			t.Errorf("Incorrect result %v, expected %v", rec.Addresses, tc.res)
+		}
+	}
+}
+
+func BenchmarkMergeEqual(b *testing.B) {
+	for i := 0; i < b.N; i++ {
+		ar := []DatabaseAddress{{Address: "a", Expires: 10}, {Address: "b", Expires: 15}}
+		br := []DatabaseAddress{{Address: "a", Expires: 15}, {Address: "b", Expires: 10}}
+		res := merge(DatabaseRecord{Addresses: ar}, DatabaseRecord{Addresses: br})
+		if len(res.Addresses) != 2 {
+			b.Fatal("wrong length")
+		}
+		if res.Addresses[0].Address != "a" || res.Addresses[1].Address != "b" {
+			b.Fatal("wrong address")
+		}
+		if res.Addresses[0].Expires != 15 || res.Addresses[1].Expires != 15 {
+			b.Fatal("wrong expiry")
+		}
+	}
+	b.ReportAllocs() // should be zero per operation
+}
+
 type testClock struct {
 	now time.Time
 }

cmd/stdiscosrv/main.go

@@ -9,21 +9,23 @@ package main
 import (
 	"context"
 	"crypto/tls"
-	"flag"
 	"log"
-	"net"
 	"net/http"
 	"os"
+	"os/signal"
 	"runtime"
-	"strings"
 	"time"
 
+	_ "net/http/pprof"
+
+	"github.com/alecthomas/kong"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	_ "github.com/syncthing/syncthing/lib/automaxprocs"
 	"github.com/syncthing/syncthing/lib/build"
 	"github.com/syncthing/syncthing/lib/protocol"
+	"github.com/syncthing/syncthing/lib/rand"
+	"github.com/syncthing/syncthing/lib/s3"
 	"github.com/syncthing/syncthing/lib/tlsutil"
-	"github.com/syndtr/goleveldb/leveldb/opt"
 	"github.com/thejerf/suture/v4"
 )
 
@@ -38,17 +40,12 @@ const (
 	errorRetryAfterSeconds = 1500
 	errorRetryFuzzSeconds  = 300
 
-	// Retry for not found is minSeconds + failures * incSeconds +
-	// random(fuzz), where failures is the number of consecutive lookups
-	// with no answer, up to maxSeconds. The fuzz is applied after capping
-	// to maxSeconds.
-	notFoundRetryMinSeconds  = 60
-	notFoundRetryMaxSeconds  = 3540
-	notFoundRetryIncSeconds  = 10
-	notFoundRetryFuzzSeconds = 60
-
-	// How often (in requests) we serialize the missed counter to database.
-	notFoundMissesWriteInterval = 10
+	// Retry for not found is notFoundRetrySeenSeconds for records we have
+	// seen an announcement for (but it's not active right now) and
+	// notFoundRetryUnknownSeconds for records we have never seen (or not
+	// seen within the last week).
+	notFoundRetryUnknownMinSeconds = 60
+	notFoundRetryUnknownMaxSeconds = 3600
 
 	httpReadTimeout    = 5 * time.Second
 	httpWriteTimeout   = 5 * time.Second
@@ -58,164 +55,116 @@ const (
 	replicationOutboxSize = 10000
 )
 
-// These options make the database a little more optimized for writes, at
-// the expense of some memory usage and risk of losing writes in a (system)
-// crash.
-var levelDBOptions = &opt.Options{
-	NoSync:      true,
-	WriteBuffer: 32 << 20, // default 4<<20
-}
-
 var debug = false
 
+type CLI struct {
+	Cert          string `group:"Listen" help:"Certificate file" default:"./cert.pem" env:"DISCOVERY_CERT_FILE"`
+	Key           string `group:"Listen" help:"Key file" default:"./key.pem" env:"DISCOVERY_KEY_FILE"`
+	HTTP          bool   `group:"Listen" help:"Listen on HTTP (behind an HTTPS proxy)" env:"DISCOVERY_HTTP"`
+	Compression   bool   `group:"Listen" help:"Enable GZIP compression of responses" env:"DISCOVERY_COMPRESSION"`
+	Listen        string `group:"Listen" help:"Listen address" default:":8443" env:"DISCOVERY_LISTEN"`
+	MetricsListen string `group:"Listen" help:"Metrics listen address" env:"DISCOVERY_METRICS_LISTEN"`
+
+	DBDir           string        `group:"Database" help:"Database directory" default:"." env:"DISCOVERY_DB_DIR"`
+	DBFlushInterval time.Duration `group:"Database" help:"Interval between database flushes" default:"5m" env:"DISCOVERY_DB_FLUSH_INTERVAL"`
+
+	DBS3Endpoint    string `name:"db-s3-endpoint" group:"Database (S3 backup)" hidden:"true" help:"S3 endpoint for database" env:"DISCOVERY_DB_S3_ENDPOINT"`
+	DBS3Region      string `name:"db-s3-region" group:"Database (S3 backup)" hidden:"true" help:"S3 region for database" env:"DISCOVERY_DB_S3_REGION"`
+	DBS3Bucket      string `name:"db-s3-bucket" group:"Database (S3 backup)" hidden:"true" help:"S3 bucket for database" env:"DISCOVERY_DB_S3_BUCKET"`
+	DBS3AccessKeyID string `name:"db-s3-access-key-id" group:"Database (S3 backup)" hidden:"true" help:"S3 access key ID for database" env:"DISCOVERY_DB_S3_ACCESS_KEY_ID"`
+	DBS3SecretKey   string `name:"db-s3-secret-key" group:"Database (S3 backup)" hidden:"true" help:"S3 secret key for database" env:"DISCOVERY_DB_S3_SECRET_KEY"`
+
+	AMQPAddress string `group:"AMQP replication" hidden:"true" help:"Address to AMQP broker" env:"DISCOVERY_AMQP_ADDRESS"`
+
+	Debug   bool `short:"d" help:"Print debug output" env:"DISCOVERY_DEBUG"`
+	Version bool `short:"v" help:"Print version and exit"`
+}
+
 func main() {
-	var listen string
-	var dir string
-	var metricsListen string
-	var replicationListen string
-	var replicationPeers string
-	var certFile string
-	var keyFile string
-	var replCertFile string
-	var replKeyFile string
-	var useHTTP bool
-	var largeDB bool
-
 	log.SetOutput(os.Stdout)
-	log.SetFlags(0)
 
-	flag.StringVar(&certFile, "cert", "./cert.pem", "Certificate file")
-	flag.StringVar(&keyFile, "key", "./key.pem", "Key file")
-	flag.StringVar(&dir, "db-dir", "./discovery.db", "Database directory")
-	flag.BoolVar(&debug, "debug", false, "Print debug output")
-	flag.BoolVar(&useHTTP, "http", false, "Listen on HTTP (behind an HTTPS proxy)")
-	flag.StringVar(&listen, "listen", ":8443", "Listen address")
-	flag.StringVar(&metricsListen, "metrics-listen", "", "Metrics listen address")
-	flag.StringVar(&replicationPeers, "replicate", "", "Replication peers, id@address, comma separated")
-	flag.StringVar(&replicationListen, "replication-listen", ":19200", "Replication listen address")
-	flag.StringVar(&replCertFile, "replication-cert", "", "Certificate file for replication")
-	flag.StringVar(&replKeyFile, "replication-key", "", "Key file for replication")
-	flag.BoolVar(&largeDB, "large-db", false, "Use larger database settings")
-	showVersion := flag.Bool("version", false, "Show version")
-	flag.Parse()
+	var cli CLI
+	kong.Parse(&cli)
+	debug = cli.Debug
 
 	log.Println(build.LongVersionFor("stdiscosrv"))
-	if *showVersion {
+	if cli.Version {
 		return
 	}
 
 	buildInfo.WithLabelValues(build.Version, runtime.Version(), build.User, build.Date.UTC().Format("2006-01-02T15:04:05Z")).Set(1)
 
-	if largeDB {
-		levelDBOptions.BlockCacheCapacity = 64 << 20
-		levelDBOptions.BlockSize = 64 << 10
-		levelDBOptions.CompactionTableSize = 16 << 20
-		levelDBOptions.CompactionTableSizeMultiplier = 2.0
-		levelDBOptions.WriteBuffer = 64 << 20
-		levelDBOptions.CompactionL0Trigger = 8
-	}
-
-	cert, err := tls.LoadX509KeyPair(certFile, keyFile)
-	if os.IsNotExist(err) {
-		log.Println("Failed to load keypair. Generating one, this might take a while...")
-		cert, err = tlsutil.NewCertificate(certFile, keyFile, "stdiscosrv", 20*365)
-		if err != nil {
-			log.Fatalln("Failed to generate X509 key pair:", err)
-		}
-	} else if err != nil {
-		log.Fatalln("Failed to load keypair:", err)
-	}
-	devID := protocol.NewDeviceID(cert.Certificate[0])
-	log.Println("Server device ID is", devID)
-
-	replCert := cert
-	if replCertFile != "" && replKeyFile != "" {
-		replCert, err = tls.LoadX509KeyPair(replCertFile, replKeyFile)
-		if err != nil {
-			log.Fatalln("Failed to load replication keypair:", err)
-		}
-	}
-	replDevID := protocol.NewDeviceID(replCert.Certificate[0])
-	log.Println("Replication device ID is", replDevID)
-
-	// Parse the replication specs, if any.
-	var allowedReplicationPeers []protocol.DeviceID
-	var replicationDestinations []string
-	parts := strings.Split(replicationPeers, ",")
-	for _, part := range parts {
-		if part == "" {
-			continue
-		}
-
-		fields := strings.Split(part, "@")
-		switch len(fields) {
-		case 2:
-			// This is an id@address specification. Grab the address for the
-			// destination list. Try to resolve it once to catch obvious
-			// syntax errors here rather than having the sender service fail
-			// repeatedly later.
-			_, err := net.ResolveTCPAddr("tcp", fields[1])
+	var cert tls.Certificate
+	if !cli.HTTP {
+		var err error
+		cert, err = tls.LoadX509KeyPair(cli.Cert, cli.Key)
+		if os.IsNotExist(err) {
+			log.Println("Failed to load keypair. Generating one, this might take a while...")
+			cert, err = tlsutil.NewCertificate(cli.Cert, cli.Key, "stdiscosrv", 20*365)
 			if err != nil {
-				log.Fatalln("Resolving address:", err)
+				log.Fatalln("Failed to generate X509 key pair:", err)
 			}
-			replicationDestinations = append(replicationDestinations, fields[1])
-			fallthrough // N.B.
-
-		case 1:
-			// The first part is always a device ID.
-			id, err := protocol.DeviceIDFromString(fields[0])
-			if err != nil {
-				log.Fatalln("Parsing device ID:", err)
-			}
-			if id == protocol.EmptyDeviceID {
-				log.Fatalf("Missing device ID for peer in %q", part)
-			}
-			allowedReplicationPeers = append(allowedReplicationPeers, id)
-
-		default:
-			log.Fatalln("Unrecognized replication spec:", part)
+		} else if err != nil {
+			log.Fatalln("Failed to load keypair:", err)
 		}
+		devID := protocol.NewDeviceID(cert.Certificate[0])
+		log.Println("Server device ID is", devID)
 	}
 
 	// Root of the service tree.
 	main := suture.New("main", suture.Spec{
 		PassThroughPanics: true,
+		Timeout:           2 * time.Minute,
 	})
 
-	// Start the database.
-	db, err := newLevelDBStore(dir)
-	if err != nil {
-		log.Fatalln("Open database:", err)
+	// If configured, use S3 for database backups.
+	var s3c *s3.Session
+	if cli.DBS3Endpoint != "" {
+		var err error
+		s3c, err = s3.NewSession(cli.DBS3Endpoint, cli.DBS3Region, cli.DBS3Bucket, cli.DBS3AccessKeyID, cli.DBS3SecretKey)
+		if err != nil {
+			log.Fatalf("Failed to create S3 session: %v", err)
+		}
 	}
+
+	// Start the database.
+	db := newInMemoryStore(cli.DBDir, cli.DBFlushInterval, s3c)
 	main.Add(db)
 
-	// Start any replication senders.
-	var repl replicationMultiplexer
-	for _, dst := range replicationDestinations {
-		rs := newReplicationSender(dst, replCert, allowedReplicationPeers)
-		main.Add(rs)
-		repl = append(repl, rs)
-	}
-
-	// If we have replication configured, start the replication listener.
-	if len(allowedReplicationPeers) > 0 {
-		rl := newReplicationListener(replicationListen, replCert, allowedReplicationPeers, db)
-		main.Add(rl)
+	// If we have an AMQP broker for replication, start that
+	var repl replicator
+	if cli.AMQPAddress != "" {
+		clientID := rand.String(10)
+		kr := newAMQPReplicator(cli.AMQPAddress, clientID, db)
+		main.Add(kr)
+		repl = kr
 	}
 
 	// Start the main API server.
-	qs := newAPISrv(listen, cert, db, repl, useHTTP)
+	qs := newAPISrv(cli.Listen, cert, db, repl, cli.HTTP, cli.Compression)
 	main.Add(qs)
 
 	// If we have a metrics port configured, start a metrics handler.
-	if metricsListen != "" {
+	if cli.MetricsListen != "" {
 		go func() {
 			mux := http.NewServeMux()
 			mux.Handle("/metrics", promhttp.Handler())
-			log.Fatal(http.ListenAndServe(metricsListen, mux))
+			log.Fatal(http.ListenAndServe(cli.MetricsListen, mux))
 		}()
 	}
 
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	// Cancel on signal
+	signalChan := make(chan os.Signal, 1)
+	signal.Notify(signalChan, os.Interrupt)
+	go func() {
+		sig := <-signalChan
+		log.Printf("Received signal %s; shutting down", sig)
+		cancel()
+	}()
+
 	// Engage!
-	main.Serve(context.Background())
+	main.Serve(ctx)
 }

cmd/stdiscosrv/replication.go

@@ -1,324 +0,0 @@
-// 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/.
-
-package main
-
-import (
-	"context"
-	"crypto/tls"
-	"encoding/binary"
-	"fmt"
-	io "io"
-	"log"
-	"net"
-	"time"
-
-	"github.com/syncthing/syncthing/lib/protocol"
-)
-
-const (
-	replicationReadTimeout       = time.Minute
-	replicationWriteTimeout      = 30 * time.Second
-	replicationHeartbeatInterval = time.Second * 30
-)
-
-type replicator interface {
-	send(key string, addrs []DatabaseAddress, seen int64)
-}
-
-// a replicationSender tries to connect to the remote address and provide
-// them with a feed of replication updates.
-type replicationSender struct {
-	dst        string
-	cert       tls.Certificate // our certificate
-	allowedIDs []protocol.DeviceID
-	outbox     chan ReplicationRecord
-}
-
-func newReplicationSender(dst string, cert tls.Certificate, allowedIDs []protocol.DeviceID) *replicationSender {
-	return &replicationSender{
-		dst:        dst,
-		cert:       cert,
-		allowedIDs: allowedIDs,
-		outbox:     make(chan ReplicationRecord, replicationOutboxSize),
-	}
-}
-
-func (s *replicationSender) Serve(ctx context.Context) error {
-	// Sleep a little at startup. Peers often restart at the same time, and
-	// this avoid the service failing and entering backoff state
-	// unnecessarily, while also reducing the reconnect rate to something
-	// reasonable by default.
-	time.Sleep(2 * time.Second)
-
-	tlsCfg := &tls.Config{
-		Certificates:       []tls.Certificate{s.cert},
-		MinVersion:         tls.VersionTLS12,
-		InsecureSkipVerify: true,
-	}
-
-	// Dial the TLS connection.
-	conn, err := tls.Dial("tcp", s.dst, tlsCfg)
-	if err != nil {
-		log.Println("Replication connect:", err)
-		return err
-	}
-	defer func() {
-		conn.SetWriteDeadline(time.Now().Add(time.Second))
-		conn.Close()
-	}()
-
-	// The replication stream is not especially latency sensitive, but it is
-	// quite a lot of data in small writes. Make it more efficient.
-	if tcpc, ok := conn.NetConn().(*net.TCPConn); ok {
-		_ = tcpc.SetNoDelay(false)
-	}
-
-	// Get the other side device ID.
-	remoteID, err := deviceID(conn)
-	if err != nil {
-		log.Println("Replication connect:", err)
-		return err
-	}
-
-	// Verify it's in the set of allowed device IDs.
-	if !deviceIDIn(remoteID, s.allowedIDs) {
-		log.Println("Replication connect: unexpected device ID:", remoteID)
-		return err
-	}
-
-	heartBeatTicker := time.NewTicker(replicationHeartbeatInterval)
-	defer heartBeatTicker.Stop()
-
-	// Send records.
-	buf := make([]byte, 1024)
-	for {
-		select {
-		case <-heartBeatTicker.C:
-			if len(s.outbox) > 0 {
-				// No need to send heartbeats if there are events/prevrious
-				// heartbeats to send, they will keep the connection alive.
-				continue
-			}
-			// Empty replication message is the heartbeat:
-			s.outbox <- ReplicationRecord{}
-
-		case rec := <-s.outbox:
-			// Buffer must hold record plus four bytes for size
-			size := rec.Size()
-			if len(buf) < size+4 {
-				buf = make([]byte, size+4)
-			}
-
-			// Record comes after the four bytes size
-			n, err := rec.MarshalTo(buf[4:])
-			if err != nil {
-				// odd to get an error here, but we haven't sent anything
-				// yet so it's not fatal
-				replicationSendsTotal.WithLabelValues("error").Inc()
-				log.Println("Replication marshal:", err)
-				continue
-			}
-			binary.BigEndian.PutUint32(buf, uint32(n))
-
-			// Send
-			conn.SetWriteDeadline(time.Now().Add(replicationWriteTimeout))
-			if _, err := conn.Write(buf[:4+n]); err != nil {
-				replicationSendsTotal.WithLabelValues("error").Inc()
-				log.Println("Replication write:", err)
-				// Yes, we are losing the replication event here.
-				return err
-			}
-			replicationSendsTotal.WithLabelValues("success").Inc()
-
-		case <-ctx.Done():
-			return nil
-		}
-	}
-}
-
-func (s *replicationSender) String() string {
-	return fmt.Sprintf("replicationSender(%q)", s.dst)
-}
-
-func (s *replicationSender) send(key string, ps []DatabaseAddress, _ int64) {
-	item := ReplicationRecord{
-		Key:       key,
-		Addresses: ps,
-	}
-
-	// The send should never block. The inbox is suitably buffered for at
-	// least a few seconds of stalls, which shouldn't happen in practice.
-	select {
-	case s.outbox <- item:
-	default:
-		replicationSendsTotal.WithLabelValues("drop").Inc()
-	}
-}
-
-// a replicationMultiplexer sends to multiple replicators
-type replicationMultiplexer []replicator
-
-func (m replicationMultiplexer) send(key string, ps []DatabaseAddress, seen int64) {
-	for _, s := range m {
-		// each send is nonblocking
-		s.send(key, ps, seen)
-	}
-}
-
-// replicationListener accepts incoming connections and reads replication
-// items from them. Incoming items are applied to the KV store.
-type replicationListener struct {
-	addr       string
-	cert       tls.Certificate
-	allowedIDs []protocol.DeviceID
-	db         database
-}
-
-func newReplicationListener(addr string, cert tls.Certificate, allowedIDs []protocol.DeviceID, db database) *replicationListener {
-	return &replicationListener{
-		addr:       addr,
-		cert:       cert,
-		allowedIDs: allowedIDs,
-		db:         db,
-	}
-}
-
-func (l *replicationListener) Serve(ctx context.Context) error {
-	tlsCfg := &tls.Config{
-		Certificates:       []tls.Certificate{l.cert},
-		ClientAuth:         tls.RequestClientCert,
-		MinVersion:         tls.VersionTLS12,
-		InsecureSkipVerify: true,
-	}
-
-	lst, err := tls.Listen("tcp", l.addr, tlsCfg)
-	if err != nil {
-		log.Println("Replication listen:", err)
-		return err
-	}
-	defer lst.Close()
-
-	for {
-		select {
-		case <-ctx.Done():
-			return nil
-		default:
-		}
-
-		// Accept a connection
-		conn, err := lst.Accept()
-		if err != nil {
-			log.Println("Replication accept:", err)
-			return err
-		}
-
-		// Figure out the other side device ID
-		remoteID, err := deviceID(conn.(*tls.Conn))
-		if err != nil {
-			log.Println("Replication accept:", err)
-			conn.SetWriteDeadline(time.Now().Add(time.Second))
-			conn.Close()
-			continue
-		}
-
-		// Verify it is in the set of allowed device IDs
-		if !deviceIDIn(remoteID, l.allowedIDs) {
-			log.Println("Replication accept: unexpected device ID:", remoteID)
-			conn.SetWriteDeadline(time.Now().Add(time.Second))
-			conn.Close()
-			continue
-		}
-
-		go l.handle(ctx, conn)
-	}
-}
-
-func (l *replicationListener) String() string {
-	return fmt.Sprintf("replicationListener(%q)", l.addr)
-}
-
-func (l *replicationListener) handle(ctx context.Context, conn net.Conn) {
-	defer func() {
-		conn.SetWriteDeadline(time.Now().Add(time.Second))
-		conn.Close()
-	}()
-
-	buf := make([]byte, 1024)
-
-	for {
-		select {
-		case <-ctx.Done():
-			return
-		default:
-		}
-
-		conn.SetReadDeadline(time.Now().Add(replicationReadTimeout))
-
-		// First four bytes are the size
-		if _, err := io.ReadFull(conn, buf[:4]); err != nil {
-			log.Println("Replication read size:", err)
-			replicationRecvsTotal.WithLabelValues("error").Inc()
-			return
-		}
-
-		// Read the rest of the record
-		size := int(binary.BigEndian.Uint32(buf[:4]))
-		if len(buf) < size {
-			buf = make([]byte, size)
-		}
-
-		if size == 0 {
-			// Heartbeat, ignore
-			continue
-		}
-
-		if _, err := io.ReadFull(conn, buf[:size]); err != nil {
-			log.Println("Replication read record:", err)
-			replicationRecvsTotal.WithLabelValues("error").Inc()
-			return
-		}
-
-		// Unmarshal
-		var rec ReplicationRecord
-		if err := rec.Unmarshal(buf[:size]); err != nil {
-			log.Println("Replication unmarshal:", err)
-			replicationRecvsTotal.WithLabelValues("error").Inc()
-			continue
-		}
-
-		// Store
-		l.db.merge(rec.Key, rec.Addresses, rec.Seen)
-		replicationRecvsTotal.WithLabelValues("success").Inc()
-	}
-}
-
-func deviceID(conn *tls.Conn) (protocol.DeviceID, error) {
-	// Handshake may not be complete on the server side yet, which we need
-	// to get the client certificate.
-	if !conn.ConnectionState().HandshakeComplete {
-		if err := conn.Handshake(); err != nil {
-			return protocol.DeviceID{}, err
-		}
-	}
-
-	// We expect exactly one certificate.
-	certs := conn.ConnectionState().PeerCertificates
-	if len(certs) != 1 {
-		return protocol.DeviceID{}, fmt.Errorf("unexpected number of certificates (%d != 1)", len(certs))
-	}
-
-	return protocol.NewDeviceID(certs[0].Raw), nil
-}
-
-func deviceIDIn(id protocol.DeviceID, ids []protocol.DeviceID) bool {
-	for _, candidate := range ids {
-		if id == candidate {
-			return true
-		}
-	}
-	return false
-}

cmd/stdiscosrv/stats.go

@@ -7,10 +7,7 @@
 package main
 
 import (
-	"os"
-
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/client_golang/prometheus/collectors"
 )
 
 var (
@@ -99,13 +96,28 @@ var (
 			Objectives: map[float64]float64{0.5: 0.05, 0.9: 0.01, 0.99: 0.001},
 		}, []string{"operation"})
 
-	retryAfterHistogram = prometheus.NewHistogram(prometheus.HistogramOpts{
-		Namespace: "syncthing",
-		Subsystem: "discovery",
-		Name:      "retry_after_seconds",
-		Help:      "Retry-After header value in seconds.",
-		Buckets:   prometheus.ExponentialBuckets(60, 2, 7), // 60, 120, 240, 480, 960, 1920, 3840
-	})
+	databaseWriteSeconds = prometheus.NewGauge(
+		prometheus.GaugeOpts{
+			Namespace: "syncthing",
+			Subsystem: "discovery",
+			Name:      "database_write_seconds",
+			Help:      "Time spent writing the database.",
+		})
+	databaseLastWritten = prometheus.NewGauge(
+		prometheus.GaugeOpts{
+			Namespace: "syncthing",
+			Subsystem: "discovery",
+			Name:      "database_last_written",
+			Help:      "Timestamp of the last successful database write.",
+		})
+
+	retryAfterLevel = prometheus.NewGaugeVec(
+		prometheus.GaugeOpts{
+			Namespace: "syncthing",
+			Subsystem: "discovery",
+			Name:      "retry_after_seconds",
+			Help:      "Retry-After header value in seconds.",
+		}, []string{"name"})
 )
 
 const (
@@ -126,16 +138,6 @@ func init() {
 		replicationSendsTotal, replicationRecvsTotal,
 		databaseKeys, databaseStatisticsSeconds,
 		databaseOperations, databaseOperationSeconds,
-		retryAfterHistogram)
-
-	processCollectorOpts := collectors.ProcessCollectorOpts{
-		Namespace: "syncthing_discovery",
-		PidFn: func() (int, error) {
-			return os.Getpid(), nil
-		},
-	}
-
-	prometheus.MustRegister(
-		collectors.NewProcessCollector(processCollectorOpts),
-	)
+		databaseWriteSeconds, databaseLastWritten,
+		retryAfterLevel)
 }

cmd/stupgrades/main.go

@@ -1,149 +0,0 @@
-// Copyright (C) 2019 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/.
-
-package main
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io"
-	"log"
-	"net/http"
-	"os"
-	"sort"
-	"strings"
-	"time"
-
-	"github.com/alecthomas/kong"
-	_ "github.com/syncthing/syncthing/lib/automaxprocs"
-	"github.com/syncthing/syncthing/lib/httpcache"
-	"github.com/syncthing/syncthing/lib/upgrade"
-)
-
-type cli struct {
-	Listen    string        `default:":8080" help:"Listen address"`
-	URL       string        `short:"u" default:"https://api.github.com/repos/syncthing/syncthing/releases?per_page=25" help:"GitHub releases url"`
-	Forward   []string      `short:"f" help:"Forwarded pages, format: /path->https://example/com/url"`
-	CacheTime time.Duration `default:"15m" help:"Cache time"`
-}
-
-func main() {
-	var params cli
-	kong.Parse(&params)
-	if err := server(&params); err != nil {
-		fmt.Printf("Error: %v\n", err)
-		os.Exit(1)
-	}
-}
-
-func server(params *cli) error {
-	http.Handle("/meta.json", httpcache.SinglePath(&githubReleases{url: params.URL}, params.CacheTime))
-
-	for _, fwd := range params.Forward {
-		path, url, ok := strings.Cut(fwd, "->")
-		if !ok {
-			return fmt.Errorf("invalid forward: %q", fwd)
-		}
-		http.Handle(path, httpcache.SinglePath(&proxy{url: url}, params.CacheTime))
-	}
-
-	return http.ListenAndServe(params.Listen, nil)
-}
-
-type githubReleases struct {
-	url string
-}
-
-func (p *githubReleases) ServeHTTP(w http.ResponseWriter, _ *http.Request) {
-	log.Println("Fetching", p.url)
-	rels := upgrade.FetchLatestReleases(p.url, "")
-	if rels == nil {
-		http.Error(w, "no releases", http.StatusInternalServerError)
-		return
-	}
-
-	sort.Sort(upgrade.SortByRelease(rels))
-	rels = filterForLatest(rels)
-
-	// Move the URL used for browser downloads to the URL field, and remove
-	// the browser URL field. This avoids going via the GitHub API for
-	// downloads, since Syncthing uses the URL field.
-	for _, rel := range rels {
-		for j, asset := range rel.Assets {
-			rel.Assets[j].URL = asset.BrowserURL
-			rel.Assets[j].BrowserURL = ""
-		}
-	}
-
-	buf := new(bytes.Buffer)
-	_ = json.NewEncoder(buf).Encode(rels)
-
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	w.Header().Set("Access-Control-Allow-Origin", "*")
-	w.Header().Set("Access-Control-Allow-Methods", "GET")
-	w.Write(buf.Bytes())
-}
-
-type proxy struct {
-	url string
-}
-
-func (p *proxy) ServeHTTP(w http.ResponseWriter, req *http.Request) {
-	log.Println("Fetching", p.url)
-	req, err := http.NewRequestWithContext(req.Context(), http.MethodGet, p.url, nil)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-	resp, err := http.DefaultClient.Do(req)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-	defer resp.Body.Close()
-
-	ct := resp.Header.Get("Content-Type")
-	w.Header().Set("Content-Type", ct)
-	if resp.StatusCode == http.StatusOK {
-		w.Header().Set("Cache-Control", "public, max-age=900")
-		w.Header().Set("Access-Control-Allow-Origin", "*")
-		w.Header().Set("Access-Control-Allow-Methods", "GET")
-	}
-	w.WriteHeader(resp.StatusCode)
-	if strings.HasPrefix(ct, "application/json") {
-		// Special JSON handling; clean it up a bit.
-		var v interface{}
-		if err := json.NewDecoder(resp.Body).Decode(&v); err != nil {
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-			return
-		}
-		_ = json.NewEncoder(w).Encode(v)
-	} else {
-		_, _ = io.Copy(w, resp.Body)
-	}
-}
-
-// filterForLatest returns the latest stable and prerelease only. If the
-// stable version is newer (comes first in the list) there is no need to go
-// looking for a prerelease at all.
-func filterForLatest(rels []upgrade.Release) []upgrade.Release {
-	var filtered []upgrade.Release
-	var havePre bool
-	for _, rel := range rels {
-		if !rel.Prerelease {
-			// We found a stable version, we're good now.
-			filtered = append(filtered, rel)
-			break
-		}
-		if rel.Prerelease && !havePre {
-			// We remember the first prerelease we find.
-			filtered = append(filtered, rel)
-			havePre = true
-		}
-	}
-	return filtered
-}

cmd/syncthing/cli/main.go

@@ -12,7 +12,7 @@ import (
 	"os"
 
 	"github.com/alecthomas/kong"
-	"github.com/flynn-archive/go-shlex"
+	"github.com/kballard/go-shellquote"
 
 	"github.com/syncthing/syncthing/cmd/syncthing/cmdutil"
 	"github.com/syncthing/syncthing/lib/config"
@@ -67,7 +67,7 @@ func (*stdinCommand) Run() error {
 	fmt.Println("Reading commands from stdin...", args)
 	scanner := bufio.NewScanner(os.Stdin)
 	for scanner.Scan() {
-		input, err := shlex.Split(scanner.Text())
+		input, err := shellquote.Split(scanner.Text())
 		if err != nil {
 			return fmt.Errorf("parsing input: %w", err)
 		}

cmd/syncthing/crash_reporting.go

@@ -9,6 +9,7 @@ package main
 import (
 	"bytes"
 	"context"
+	"crypto/sha256"
 	"fmt"
 	"net/http"
 	"os"
@@ -16,8 +17,6 @@ import (
 	"sort"
 	"strings"
 	"time"
-
-	"github.com/syncthing/syncthing/lib/sha256"
 )
 
 const (

cmd/syncthing/main.go

@@ -92,11 +92,6 @@ above.
  STLOCKTHRESHOLD   Used for debugging internal deadlocks; sets debug
                    sensitivity.  Use only under direction of a developer.
 
- STHASHING         Select the SHA256 hashing package to use. Possible values
-                   are "standard" for the Go standard library implementation,
-                   "minio" for the github.com/minio/sha256-simd implementation,
-                   and blank (the default) for auto detection.
-
  STVERSIONEXTRA    Add extra information to the version string in logs and the
                    version line in the GUI. Can be set to the name of a wrapper
                    or tool controlling syncthing to communicate this to the end

cmd/syncthing/monitor.go

@@ -241,22 +241,6 @@ func copyStderr(stderr io.Reader, dst io.Writer) {
 		if panicFd == nil {
 			dst.Write([]byte(line))
 
-			if strings.Contains(line, "SIGILL") {
-				l.Warnln(`
-*******************************************************************************
-* Crash due to illegal instruction detected. This is most likely due to a CPU *
-* incompatibility with the high performance hashing package. Switching to the *
-* standard hashing package instead. Please report this issue at:              *
-*                                                                             *
-*   https://github.com/syncthing/syncthing/issues                             *
-*                                                                             *
-* Include the details of your CPU.                                            *
-*******************************************************************************
-`)
-				os.Setenv("STHASHING", "standard")
-				return
-			}
-
 			if strings.HasPrefix(line, "panic:") || strings.HasPrefix(line, "fatal error:") {
 				panicFd, err = os.Create(locations.GetTimestamped(locations.PanicLog))
 				if err != nil {

cmd/ursrv/aggregate/aggregate.go

@@ -1,226 +0,0 @@
-// 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/.
-
-package aggregate
-
-import (
-	"database/sql"
-	"fmt"
-	"log"
-	"os"
-	"time"
-
-	_ "github.com/lib/pq"
-)
-
-type CLI struct {
-	DBConn string `env:"UR_DB_URL" default:"postgres://user:password@localhost/ur?sslmode=disable"`
-}
-
-func (cli *CLI) Run() error {
-	log.SetFlags(log.Ltime | log.Ldate)
-	log.SetOutput(os.Stdout)
-
-	db, err := sql.Open("postgres", cli.DBConn)
-	if err != nil {
-		return fmt.Errorf("database: %w", err)
-	}
-	err = setupDB(db)
-	if err != nil {
-		return fmt.Errorf("database: %w", err)
-	}
-
-	for {
-		runAggregation(db)
-		// Sleep until one minute past next midnight
-		sleepUntilNext(24*time.Hour, 1*time.Minute)
-	}
-}
-
-func runAggregation(db *sql.DB) {
-	since := maxIndexedDay(db, "VersionSummary")
-	log.Println("Aggregating VersionSummary data since", since)
-	rows, err := aggregateVersionSummary(db, since.Add(24*time.Hour))
-	if err != nil {
-		log.Println("aggregate:", err)
-	}
-	log.Println("Inserted", rows, "rows")
-
-	since = maxIndexedDay(db, "Performance")
-	log.Println("Aggregating Performance data since", since)
-	rows, err = aggregatePerformance(db, since.Add(24*time.Hour))
-	if err != nil {
-		log.Println("aggregate:", err)
-	}
-	log.Println("Inserted", rows, "rows")
-
-	since = maxIndexedDay(db, "BlockStats")
-	log.Println("Aggregating BlockStats data since", since)
-	rows, err = aggregateBlockStats(db, since.Add(24*time.Hour))
-	if err != nil {
-		log.Println("aggregate:", err)
-	}
-	log.Println("Inserted", rows, "rows")
-}
-
-func sleepUntilNext(intv, margin time.Duration) {
-	now := time.Now().UTC()
-	next := now.Truncate(intv).Add(intv).Add(margin)
-	log.Println("Sleeping until", next)
-	time.Sleep(next.Sub(now))
-}
-
-func setupDB(db *sql.DB) error {
-	_, err := db.Exec(`CREATE TABLE IF NOT EXISTS VersionSummary (
-		Day TIMESTAMP NOT NULL,
-		Version VARCHAR(8) NOT NULL,
-		Count INTEGER NOT NULL
-	)`)
-	if err != nil {
-		return err
-	}
-
-	_, err = db.Exec(`CREATE TABLE IF NOT EXISTS Performance (
-		Day TIMESTAMP NOT NULL,
-		TotFiles INTEGER NOT NULL,
-		TotMiB INTEGER NOT NULL,
-		SHA256Perf DOUBLE PRECISION NOT NULL,
-		MemorySize INTEGER NOT NULL,
-		MemoryUsageMiB INTEGER NOT NULL
-	)`)
-	if err != nil {
-		return err
-	}
-
-	_, err = db.Exec(`CREATE TABLE IF NOT EXISTS BlockStats (
-		Day TIMESTAMP NOT NULL,
-		Reports INTEGER NOT NULL,
-		Total BIGINT NOT NULL,
-		Renamed BIGINT NOT NULL,
-		Reused BIGINT NOT NULL,
-		Pulled BIGINT NOT NULL,
-		CopyOrigin BIGINT NOT NULL,
-		CopyOriginShifted BIGINT NOT NULL,
-		CopyElsewhere BIGINT NOT NULL
-	)`)
-	if err != nil {
-		return err
-	}
-
-	var t string
-
-	row := db.QueryRow(`SELECT 'UniqueDayVersionIndex'::regclass`)
-	if err := row.Scan(&t); err != nil {
-		_, _ = db.Exec(`CREATE UNIQUE INDEX UniqueDayVersionIndex ON VersionSummary (Day, Version)`)
-	}
-
-	row = db.QueryRow(`SELECT 'VersionDayIndex'::regclass`)
-	if err := row.Scan(&t); err != nil {
-		_, _ = db.Exec(`CREATE INDEX VersionDayIndex ON VersionSummary (Day)`)
-	}
-
-	row = db.QueryRow(`SELECT 'PerformanceDayIndex'::regclass`)
-	if err := row.Scan(&t); err != nil {
-		_, _ = db.Exec(`CREATE INDEX PerformanceDayIndex ON Performance (Day)`)
-	}
-
-	row = db.QueryRow(`SELECT 'BlockStatsDayIndex'::regclass`)
-	if err := row.Scan(&t); err != nil {
-		_, _ = db.Exec(`CREATE INDEX BlockStatsDayIndex ON BlockStats (Day)`)
-	}
-
-	return nil
-}
-
-func maxIndexedDay(db *sql.DB, table string) time.Time {
-	var t time.Time
-	row := db.QueryRow("SELECT MAX(DATE_TRUNC('day', Day)) FROM " + table)
-	err := row.Scan(&t)
-	if err != nil {
-		return time.Time{}
-	}
-	return t
-}
-
-func aggregateVersionSummary(db *sql.DB, since time.Time) (int64, error) {
-	res, err := db.Exec(`INSERT INTO VersionSummary (
-	SELECT
-		DATE_TRUNC('day', Received) AS Day,
-		SUBSTRING(Report->>'version' FROM '^v\d.\d+') AS Ver,
-		COUNT(*) AS Count
-		FROM ReportsJson
-		WHERE
-			Received > $1
-			AND Received < DATE_TRUNC('day', NOW())
-			AND Report->>'version' like 'v_.%'
-		GROUP BY Day, Ver
-		);
-	`, since)
-	if err != nil {
-		return 0, err
-	}
-
-	return res.RowsAffected()
-}
-
-func aggregatePerformance(db *sql.DB, since time.Time) (int64, error) {
-	res, err := db.Exec(`INSERT INTO Performance (
-	SELECT
-		DATE_TRUNC('day', Received) AS Day,
-		AVG((Report->>'totFiles')::numeric) As TotFiles,
-		AVG((Report->>'totMiB')::numeric) As TotMiB,
-		AVG((Report->>'sha256Perf')::numeric) As SHA256Perf,
-		AVG((Report->>'memorySize')::numeric) As MemorySize,
-		AVG((Report->>'memoryUsageMiB')::numeric) As MemoryUsageMiB
-		FROM ReportsJson
-		WHERE
-			Received > $1
-			AND Received < DATE_TRUNC('day', NOW())
-			AND Report->>'version' like 'v_.%'
-			/* Some custom implementation reported bytes when we expect megabytes, cap at petabyte */
-			AND (Report->>'memorySize')::numeric < 1073741824
-		GROUP BY Day
-		);
-	`, since)
-	if err != nil {
-		return 0, err
-	}
-
-	return res.RowsAffected()
-}
-
-func aggregateBlockStats(db *sql.DB, since time.Time) (int64, error) {
-	// Filter out anything prior 0.14.41 as that has sum aggregations which
-	// made no sense.
-	res, err := db.Exec(`INSERT INTO BlockStats (
-	SELECT
-		DATE_TRUNC('day', Received) AS Day,
-		COUNT(1) As Reports,
-		SUM((Report->'blockStats'->>'total')::numeric)::bigint AS Total,
-		SUM((Report->'blockStats'->>'renamed')::numeric)::bigint AS Renamed,
-		SUM((Report->'blockStats'->>'reused')::numeric)::bigint AS Reused,
-		SUM((Report->'blockStats'->>'pulled')::numeric)::bigint AS Pulled,
-		SUM((Report->'blockStats'->>'copyOrigin')::numeric)::bigint AS CopyOrigin,
-		SUM((Report->'blockStats'->>'copyOriginShifted')::numeric)::bigint AS CopyOriginShifted,
-		SUM((Report->'blockStats'->>'copyElsewhere')::numeric)::bigint AS CopyElsewhere
-		FROM ReportsJson
-		WHERE
-			Received > $1
-			AND Received < DATE_TRUNC('day', NOW())
-			AND (Report->>'urVersion')::numeric >= 3
-			AND Report->>'version' like 'v_.%'
-			AND Report->>'version' NOT LIKE 'v0.14.40%'
-			AND Report->>'version' NOT LIKE 'v0.14.39%'
-			AND Report->>'version' NOT LIKE 'v0.14.38%'
-		GROUP BY Day
-	);
-	`, since)
-	if err != nil {
-		return 0, err
-	}
-
-	return res.RowsAffected()
-}

cmd/ursrv/serve/analytics.go

@@ -1,276 +0,0 @@
-// 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/.
-
-package serve
-
-import (
-	"regexp"
-	"sort"
-	"strconv"
-	"strings"
-)
-
-type analytic struct {
-	Key        string
-	Count      int
-	Percentage float64
-	Items      []analytic `json:",omitempty"`
-}
-
-type analyticList []analytic
-
-func (l analyticList) Less(a, b int) bool {
-	if l[a].Key == "Others" {
-		return false
-	}
-	if l[b].Key == "Others" {
-		return true
-	}
-	return l[b].Count < l[a].Count // inverse
-}
-
-func (l analyticList) Swap(a, b int) {
-	l[a], l[b] = l[b], l[a]
-}
-
-func (l analyticList) Len() int {
-	return len(l)
-}
-
-// Returns a list of frequency analytics for a given list of strings.
-func analyticsFor(ss []string, cutoff int) []analytic {
-	m := make(map[string]int)
-	t := 0
-	for _, s := range ss {
-		m[s]++
-		t++
-	}
-
-	l := make([]analytic, 0, len(m))
-	for k, c := range m {
-		l = append(l, analytic{
-			Key:        k,
-			Count:      c,
-			Percentage: 100 * float64(c) / float64(t),
-		})
-	}
-
-	sort.Sort(analyticList(l))
-
-	if cutoff > 0 && len(l) > cutoff {
-		c := 0
-		for _, i := range l[cutoff:] {
-			c += i.Count
-		}
-		l = append(l[:cutoff], analytic{
-			Key:        "Others",
-			Count:      c,
-			Percentage: 100 * float64(c) / float64(t),
-		})
-	}
-
-	return l
-}
-
-// Find the points at which certain penetration levels are met
-func penetrationLevels(as []analytic, points []float64) []analytic {
-	sort.Slice(as, func(a, b int) bool {
-		return versionLess(as[b].Key, as[a].Key)
-	})
-
-	var res []analytic
-
-	idx := 0
-	sum := 0.0
-	for _, a := range as {
-		sum += a.Percentage
-		if sum >= points[idx] {
-			a.Count = int(points[idx])
-			a.Percentage = sum
-			res = append(res, a)
-			idx++
-			if idx == len(points) {
-				break
-			}
-		}
-	}
-	return res
-}
-
-func statsForInts(data []int) [4]float64 {
-	var res [4]float64
-	if len(data) == 0 {
-		return res
-	}
-
-	sort.Ints(data)
-	res[0] = float64(data[int(float64(len(data))*0.05)])
-	res[1] = float64(data[len(data)/2])
-	res[2] = float64(data[int(float64(len(data))*0.95)])
-	res[3] = float64(data[len(data)-1])
-	return res
-}
-
-func statsForInt64s(data []int64) [4]float64 {
-	var res [4]float64
-	if len(data) == 0 {
-		return res
-	}
-
-	sort.Slice(data, func(a, b int) bool {
-		return data[a] < data[b]
-	})
-
-	res[0] = float64(data[int(float64(len(data))*0.05)])
-	res[1] = float64(data[len(data)/2])
-	res[2] = float64(data[int(float64(len(data))*0.95)])
-	res[3] = float64(data[len(data)-1])
-	return res
-}
-
-func statsForFloats(data []float64) [4]float64 {
-	var res [4]float64
-	if len(data) == 0 {
-		return res
-	}
-
-	sort.Float64s(data)
-	res[0] = data[int(float64(len(data))*0.05)]
-	res[1] = data[len(data)/2]
-	res[2] = data[int(float64(len(data))*0.95)]
-	res[3] = data[len(data)-1]
-	return res
-}
-
-func group(by func(string) string, as []analytic, perGroup int, otherPct float64) []analytic {
-	var res []analytic
-
-next:
-	for _, a := range as {
-		group := by(a.Key)
-		for i := range res {
-			if res[i].Key == group {
-				res[i].Count += a.Count
-				res[i].Percentage += a.Percentage
-				if len(res[i].Items) < perGroup {
-					res[i].Items = append(res[i].Items, a)
-				}
-				continue next
-			}
-		}
-		res = append(res, analytic{
-			Key:        group,
-			Count:      a.Count,
-			Percentage: a.Percentage,
-			Items:      []analytic{a},
-		})
-	}
-
-	sort.Sort(analyticList(res))
-
-	if otherPct > 0 {
-		// Groups with less than otherPCt go into "Other"
-		other := analytic{
-			Key: "Other",
-		}
-		for i := 0; i < len(res); i++ {
-			if res[i].Percentage < otherPct || res[i].Key == "Other" {
-				other.Count += res[i].Count
-				other.Percentage += res[i].Percentage
-				res = append(res[:i], res[i+1:]...)
-				i--
-			}
-		}
-		if other.Count > 0 {
-			res = append(res, other)
-		}
-	}
-
-	return res
-}
-
-func byVersion(s string) string {
-	parts := strings.Split(s, ".")
-	if len(parts) >= 2 {
-		return strings.Join(parts[:2], ".")
-	}
-	return s
-}
-
-func byPlatform(s string) string {
-	parts := strings.Split(s, "-")
-	if len(parts) >= 2 {
-		return parts[0]
-	}
-	return s
-}
-
-var numericGoVersion = regexp.MustCompile(`^go[0-9]\.[0-9]+`)
-
-func byCompiler(s string) string {
-	if m := numericGoVersion.FindString(s); m != "" {
-		return m
-	}
-	return "Other"
-}
-
-func versionLess(a, b string) bool {
-	arel, apre := versionParts(a)
-	brel, bpre := versionParts(b)
-
-	minlen := len(arel)
-	if l := len(brel); l < minlen {
-		minlen = l
-	}
-
-	for i := 0; i < minlen; i++ {
-		if arel[i] != brel[i] {
-			return arel[i] < brel[i]
-		}
-	}
-
-	// Longer version is newer, when the preceding parts are equal
-	if len(arel) != len(brel) {
-		return len(arel) < len(brel)
-	}
-
-	if apre != bpre {
-		// "(+dev)" versions are ahead
-		if apre == plusStr {
-			return false
-		}
-		if bpre == plusStr {
-			return true
-		}
-		return apre < bpre
-	}
-
-	// don't actually care how the prerelease stuff compares for our purposes
-	return false
-}
-
-// Split a version as returned from transformVersion into parts.
-// "1.2.3-beta.2" -> []int{1, 2, 3}, "beta.2"}
-func versionParts(v string) ([]int, string) {
-	parts := strings.SplitN(v[1:], " ", 2) // " (+dev)" versions
-	if len(parts) == 1 {
-		parts = strings.SplitN(parts[0], "-", 2) // "-rc.1" type versions
-	}
-	fields := strings.Split(parts[0], ".")
-
-	release := make([]int, len(fields))
-	for i, s := range fields {
-		v, _ := strconv.Atoi(s)
-		release[i] = v
-	}
-
-	var prerelease string
-	if len(parts) > 1 {
-		prerelease = parts[1]
-	}
-
-	return release, prerelease
-}

cmd/ursrv/serve/formatting.go

@@ -1,131 +0,0 @@
-// 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/.
-
-package serve
-
-import (
-	"bytes"
-	"fmt"
-	"strings"
-)
-
-type NumberType int
-
-const (
-	NumberMetric NumberType = iota
-	NumberBinary
-	NumberDuration
-)
-
-func number(ntype NumberType, v float64) string {
-	switch ntype {
-	case NumberMetric:
-		return metric(v)
-	case NumberDuration:
-		return duration(v)
-	case NumberBinary:
-		return binary(v)
-	default:
-		return metric(v)
-	}
-}
-
-type suffix struct {
-	Suffix     string
-	Multiplier float64
-}
-
-var metricSuffixes = []suffix{
-	{"G", 1e9},
-	{"M", 1e6},
-	{"k", 1e3},
-}
-
-var binarySuffixes = []suffix{
-	{"Gi", 1 << 30},
-	{"Mi", 1 << 20},
-	{"Ki", 1 << 10},
-}
-
-var durationSuffix = []suffix{
-	{"year", 365 * 24 * 60 * 60},
-	{"month", 30 * 24 * 60 * 60},
-	{"day", 24 * 60 * 60},
-	{"hour", 60 * 60},
-	{"minute", 60},
-	{"second", 1},
-}
-
-func metric(v float64) string {
-	return withSuffix(v, metricSuffixes, false)
-}
-
-func binary(v float64) string {
-	return withSuffix(v, binarySuffixes, false)
-}
-
-func duration(v float64) string {
-	return withSuffix(v, durationSuffix, true)
-}
-
-func withSuffix(v float64, ps []suffix, pluralize bool) string {
-	for _, p := range ps {
-		if v >= p.Multiplier {
-			suffix := p.Suffix
-			if pluralize && v/p.Multiplier != 1.0 {
-				suffix += "s"
-			}
-			// If the number only has decimal zeroes, strip em off.
-			num := strings.TrimRight(strings.TrimRight(fmt.Sprintf("%.1f", v/p.Multiplier), "0"), ".")
-			return fmt.Sprintf("%s %s", num, suffix)
-		}
-	}
-	return strings.TrimRight(strings.TrimRight(fmt.Sprintf("%.1f", v), "0"), ".")
-}
-
-// commatize returns a number with sep as thousands separators. Handles
-// integers and plain floats.
-func commatize(sep, s string) string {
-	// If no dot, don't do anything.
-	if !strings.ContainsRune(s, '.') {
-		return s
-	}
-	var b bytes.Buffer
-	fs := strings.SplitN(s, ".", 2)
-
-	l := len(fs[0])
-	for i := range fs[0] {
-		b.Write([]byte{s[i]})
-		if i < l-1 && (l-i)%3 == 1 {
-			b.WriteString(sep)
-		}
-	}
-
-	if len(fs) > 1 && len(fs[1]) > 0 {
-		b.WriteString(".")
-		b.WriteString(fs[1])
-	}
-
-	return b.String()
-}
-
-func proportion(m map[string]int, count int) float64 {
-	total := 0
-	isMax := true
-	for _, n := range m {
-		total += n
-		if n > count {
-			isMax = false
-		}
-	}
-	pct := (100 * float64(count)) / float64(total)
-	// To avoid rounding errors in the template, surpassing 100% and breaking
-	// the progress bars.
-	if isMax && len(m) > 1 && count != total {
-		pct -= 0.01
-	}
-	return pct
-}

cmd/ursrv/serve/metrics.go

@@ -1,26 +0,0 @@
-// Copyright (C) 2023 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/.
-
-package serve
-
-import (
-	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/client_golang/prometheus/promauto"
-)
-
-var metricReportsTotal = promauto.NewCounterVec(prometheus.CounterOpts{
-	Namespace: "syncthing",
-	Subsystem: "ursrv",
-	Name:      "reports_total",
-}, []string{"version"})
-
-func init() {
-	metricReportsTotal.WithLabelValues("fail")
-	metricReportsTotal.WithLabelValues("duplicate")
-	metricReportsTotal.WithLabelValues("v1")
-	metricReportsTotal.WithLabelValues("v2")
-	metricReportsTotal.WithLabelValues("v3")
-}

cmd/ursrv/serve/static/index.html

@@ -1,623 +0,0 @@
-<!DOCTYPE html>
-<!--
-Copyright (C) 2014 Jakob Borg and other contributors. All rights reserved.
-Use of this source code is governed by an MIT-style license that can be
-found in the LICENSE file.
--->
-<html lang="en">
-<head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <meta name="description" content="">
-  <meta name="author" content="">
-  <link rel="shortcut icon" href="static/assets/img/favicon.png">
-
-  <title>Syncthing Usage Reports</title>
-  <link href="static/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-  <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
-  <script type="text/javascript" src="static/bootstrap/js/bootstrap.min.js"></script>
-  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.7/leaflet.css">
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.7/leaflet.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/heatmapjs@2.0.2/heatmap.min.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/leaflet-heatmap@1.0.0/leaflet-heatmap.js"></script>
-
-  <style type="text/css">
-    body {
-      margin: 40px;
-      font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
-    }
-    tr.main td {
-      font-weight: bold;
-    }
-    tr.child td.first {
-      padding-left: 2em;
-    }
-    .progress-bar {
-      overflow:hidden;
-      white-space:nowrap;
-      text-overflow: ellipsis;
-    }
-  </style>
-  <script type="text/javascript"
-          src='https://www.google.com/jsapi?autoload={
-            "modules":[{
-              "name":"visualization",
-              "version":"1",
-              "packages":["corechart"]
-            }]
-          }'></script>
-
-  <script type="text/javascript">
-    google.setOnLoadCallback(drawVersionChart);
-    google.setOnLoadCallback(drawBlockStatsChart);
-    google.setOnLoadCallback(drawPerformanceCharts);
-
-    function drawVersionChart() {
-      // Summary version chart for versions that at some point in the chart
-      // reaches 250 devices. This filters out versions that are old and
-      // uninteresting yet linger forever with like four users.
-      var jsonData = $.ajax({url: "summary.json?min=250", dataType:"json", async: false}).responseText;
-      var rows = JSON.parse(jsonData);
-
-      var data = new google.visualization.DataTable();
-      data.addColumn('date', 'Day');
-      for (var i = 1; i < rows[0].length; i++){
-        data.addColumn('number', rows[0][i]);
-      }
-      for (var i = 1; i < rows.length; i++){
-        rows[i][0] = new Date(rows[i][0]);
-        data.addRow(rows[i]);
-      };
-
-      var options = {
-        legend: { position: 'bottom', alignment: 'center' },
-        isStacked: true,
-        colors: ['rgb(102,194,165)','rgb(252,141,98)','rgb(141,160,203)','rgb(231,138,195)','rgb(166,216,84)','rgb(255,217,47)'],
-        chartArea: {left: 80, top: 20, width: '1020', height: '300'},
-      };
-
-      var chart = new google.visualization.AreaChart(document.getElementById('versionChart'));
-      chart.draw(data, options);
-    }
-
-    function formatGibibytes(gibibytes, decimals) {
-      if(gibibytes == 0) return '0 GiB';
-      var k = 1024,
-        dm = decimals || 2,
-        sizes = ['GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB'],
-        i = Math.floor(Math.log(gibibytes) / Math.log(k));
-      if (i < 0) {
-        sizes = 'MiB';
-      } else {
-        sizes = sizes[i];
-      }
-      return parseFloat((gibibytes / Math.pow(k, i)).toFixed(dm)) + ' ' + sizes;
-    }
-
-
-    function drawBlockStatsChart() {
-      var jsonData = $.ajax({url: "blockstats.json", dataType:"json", async: false}).responseText;
-      var rows = JSON.parse(jsonData);
-
-      var data = new google.visualization.DataTable();
-      data.addColumn('date', 'Day');
-      for (var i = 1; i < rows[0].length; i++){
-        data.addColumn('number', rows[0][i]);
-      }
-
-      var totals = [0, 0, 0, 0, 0, 0];
-      for (var i = 1; i < rows.length; i++){
-        rows[i][0] = new Date(rows[i][0]);
-        for (var j = 2; j < rows[i].length; j++) {
-          totals[j-2] += rows[i][j];
-        }
-        data.addRow(rows[i]);
-      };
-
-      var totalTotals = totals.reduce(function(a, b) { return a + b; }, 0);
-
-      if (totalTotals > 0) {
-        var content = "<table class='table'>\n"
-        for (var j = 2; j < rows[0].length; j++) {
-          content += "<tr><td><b>" + rows[0][j].replace(' (GiB)', '') + "</b></td><td>" + formatGibibytes(totals[j-2].toFixed(2)) + " (" + ((100*totals[j-2])/totalTotals).toFixed(2) +"%)</td></tr>\n";
-        }
-        content += "</table>";
-        document.getElementById("data-to-date").innerHTML = content;
-      } else {
-        // No data, hide it.
-        document.getElementById("block-stats").outerHTML  = "";
-        return;
-      }
-
-      var options = {
-        focusTarget: 'category',
-        vAxes: {0: {}, 1: {}},
-        series: {0: {type: 'line', targetAxisIndex:1}},
-        isStacked: true,
-        legend: {position: 'none'},
-        colors: ['rgb(102,194,165)','rgb(252,141,98)','rgb(141,160,203)','rgb(231,138,195)','rgb(166,216,84)','rgb(255,217,47)'],
-        chartArea: {left: 80, top: 20, width: '1020', height: '300'},
-      };
-
-      var chart = new google.visualization.AreaChart(document.getElementById('blockStatsChart'));
-      chart.draw(data, options);
-    }
-
-    function drawPerformanceCharts() {
-      var jsonData = $.ajax({url: "/performance.json", dataType:"json", async: false}).responseText;
-      var rows = JSON.parse(jsonData);
-      for (var i = 1; i < rows.length; i++){
-        rows[i][0] = new Date(rows[i][0]);
-      }
-
-      drawChart(rows, 1, 'Total Number of Files', 'totFilesChart', 1e6, 1);
-      drawChart(rows, 2, 'Total Folder Size (GiB)', 'totMiBChart', 1e6, 1024);
-      drawChart(rows, 3, 'Hash Performance (MiB/s)', 'hashPerfChart', 1000, 1);
-      drawChart(rows, 4, 'System RAM Size (GiB)', 'memSizeChart', 1e6, 1024);
-      drawChart(rows, 5, 'Memory Usage (MiB)', 'memUsageChart', 250, 1);
-    }
-
-    function drawChart(rows, index, title, id, cutoff, divisor) {
-      var data = new google.visualization.DataTable();
-      data.addColumn('date', 'Day');
-      data.addColumn('number', title);
-
-      var row;
-      for (var i = 1; i < rows.length; i++){
-          row = [rows[i][0], rows[i][index] / divisor];
-        if (row[1] > cutoff) {
-          row[1] = null;
-        }
-        data.addRow(row);
-      }
-
-      var options = {
-        legend: { position: 'bottom', alignment: 'center' },
-        colors: ['rgb(102,194,165)','rgb(252,141,98)','rgb(141,160,203)','rgb(231,138,195)','rgb(166,216,84)','rgb(255,217,47)'],
-        chartArea: {left: 80, top: 20, width: '1020', height: '300'},
-        vAxes: {0: {minValue: 0}},
-      };
-
-      var chart = new google.visualization.LineChart(document.getElementById(id));
-      chart.draw(data, options);
-    }
-
-    var locations = [];
-    {{range $location, $weight := .locations}}
-    locations.push({lat:{{- $location.Latitude -}},lng:{{- $location.Longitude -}},count:Math.min(100, {{- $weight -}})});
-    {{- end}}
-
-    function drawHeatMap() {
-      if (locations.length == 0) {
-        return;
-      }
-      var testData = {
-        data: locations
-      };
-
-      var baseLayer = L.tileLayer(
-        'https://tile.openstreetmap.org/{z}/{x}/{y}.png',{
-          attribution: '...',
-          maxZoom: 18
-        }
-      );
-      var cfg = {
-        "radius": 1,
-        "minOpacity": .25,
-        "maxOpacity": .8,
-        "scaleRadius": true,
-        "useLocalExtrema": true,
-        latField: 'lat',
-        lngField: 'lng',
-        valueField: 'count',
-        gradient: {
-            '.1': 'cyan',
-            '.8': 'blue',
-            '.95': 'red'
-          }
-      };
-      var heatmapLayer = new HeatmapOverlay(cfg);
-
-      var map = new L.Map('map', {
-        center: new L.LatLng(25, 0),
-        zoom: 1,
-        layers: [baseLayer, heatmapLayer]
-      });
-      heatmapLayer.setData(testData);
-    }
-  </script>
-</head>
-
-<body>
-  <div class="container">
-    <div class="row">
-      <div class="col-md-12">
-        <h1>Syncthing Usage Data</h1>
-
-        <h4 id="active-users">Active Users per Day and Version</h4>
-        <p>
-          This is the total number of unique users with reporting enabled, per day. Area color represents the major version.
-        </p>
-        <div class="img-thumbnail" id="versionChart" style="width: 1130px; height: 400px; padding: 10px;"></div>
-
-        <div id="block-stats">
-          <h4>Data Transfers per Day</h4>
-          <p>
-            This is total data transferred per day. Also shows how much data was saved (not transferred) by each of the methods syncthing uses.
-          </p>
-          <div class="img-thumbnail" id="blockStatsChart" style="width: 1130px; height: 400px; padding: 10px;"></div>
-          <h4 id="totals-to-date">Totals to date</h4>
-          <p id="data-to-date">
-            No data
-          </p>
-        </div>
-
-        <h4 id="metrics">Usage Metrics</h4>
-        <p>
-          This is the aggregated usage report data for the last 24 hours. Data based on <b>{{.nodes}}</b> devices that have reported in.
-        </p>
-
-        {{if .locations}}
-        <div class="img-thumbnail" id="map" style="width: 1130px; height: 400px; padding: 10px;"></div>
-        <p class="text-muted">
-         Heatmap max intensity is capped at 100 reports within a location.
-        </p>
-        <div class="panel panel-default">
-          <div class="panel-heading">
-            <h4 class="panel-title">
-              <a data-toggle="collapse" href="#collapseTwo">Break down per country</a>
-            </h4>
-          </div>
-          <div id="collapseTwo" class="panel-collapse collapse">
-            <div class="panel-body">
-              <div class="row">
-                <div class="col-md-6">
-                  <table class="table table-striped">
-                    <tbody>
-                      {{range .countries | slice 2 1}}
-                      <tr>
-                        <td style="width: 45%">{{.Key}}</td>
-                        <td style="width: 5%" class="text-right">{{if ge .Pct 10.0}}{{.Pct | printf "%.0f"}}{{else if ge .Pct 1.0}}{{.Pct | printf "%.01f"}}{{else}}{{.Pct | printf "%.02f"}}{{end}}%</td>
-                        <td style="width: 5%" class="text-right">{{.Count}}</td>
-                        <td>
-                            <div class="progress-bar" role="progressbar" aria-valuenow="{{.Pct | printf "%.02f"}}" aria-valuemin="0" aria-valuemax="100" style="width: {{.Pct | printf "%.02f"}}%; height:20px"></div>
-                        </td>
-                      </tr>
-                      {{end}}
-                    </tbody>
-                  </table>
-                </div>
-                <div class="col-md-6">
-                  <table class="table table-striped">
-                    <tbody>
-                      {{range .countries | slice 2 2}}
-                      <tr>
-                        <td style="width: 45%">{{.Key}}</td>
-                        <td style="width: 5%" class="text-right">{{if ge .Pct 10.0}}{{.Pct | printf "%.0f"}}{{else if ge .Pct 1.0}}{{.Pct | printf "%.01f"}}{{else}}{{.Pct | printf "%.02f"}}{{end}}%</td>
-                        <td style="width: 5%" class="text-right">{{.Count}}</td>
-                        <td>
-                            <div class="progress-bar" role="progressbar" aria-valuenow="{{.Pct | printf "%.02f"}}" aria-valuemin="0" aria-valuemax="100" style="width: {{.Pct | printf "%.02f"}}%; height:20px"></div>
-                        </td>
-                      </tr>
-                      {{end}}
-                    </tbody>
-                  </table>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-        {{end}}
-        <table class="table table-striped">
-          <thead>
-            <tr>
-              <th></th>
-              <th colspan="4" class="text-center">
-                <a href="https://en.wikipedia.org/wiki/Percentile">Percentile</a>
-              </th>
-            </tr>
-            <tr>
-              <th></th>
-              <th class="text-right">5%</th>
-              <th class="text-right">50%</th>
-              <th class="text-right">95%</th>
-              <th class="text-right">100%</th>
-            </tr>
-          </thead>
-          <tbody>
-            {{range .categories}}
-            <tr>
-              <td>{{.Descr}}</td>
-              <td class="text-right">{{index .Values 0 | number .Type | commatize " "}}{{.Unit}}</td>
-              <td class="text-right">{{index .Values 1 | number .Type | commatize " "}}{{.Unit}}</td>
-              <td class="text-right">{{index .Values 2 | number .Type | commatize " "}}{{.Unit}}</td>
-              <td class="text-right">{{index .Values 3 | number .Type | commatize " "}}{{.Unit}}</td>
-            </tr>
-            {{end}}
-          </tbody>
-        </table>
-      </div>
-    </div>
-
-    <div class="row">
-      <div class="col-md-6">
-        <table class="table table-striped">
-          <thead>
-            <tr>
-              <th>Version</th><th class="text-right">Devices</th><th class="text-right">Share</th>
-            </tr>
-          </thead>
-          <tbody>
-            {{range .versions}}
-              {{if gt .Percentage 0.1}}
-                <tr class="main">
-                  <td>{{.Key}}</td>
-                  <td class="text-right">{{.Count}}</td>
-                  <td class="text-right">{{.Percentage | printf "%.01f"}}%</td>
-                </tr>
-                {{range .Items}}
-                  {{if gt .Percentage 0.1}}
-                    <tr class="child">
-                      <td class="first">{{.Key}}</td>
-                      <td class="text-right">{{.Count}}</td>
-                      <td class="text-right">{{.Percentage | printf "%.01f"}}%</td>
-                    </tr>
-                  {{end}}
-                {{end}}
-              {{end}}
-            {{end}}
-          </tbody>
-        </table>
-        <table class="table table-striped">
-          <thead>
-            <tr>
-                <th>Penetration Level</th>
-                <th>Version</th>
-              <th class="text-right">Actual</th>
-            </tr>
-          </thead>
-          <tbody>
-            {{range .versionPenetrations}}
-            <tr>
-                <td>{{.Count}}%</td>
-                <td>&ge; {{.Key}}</td>
-              <td class="text-right">{{.Percentage | printf "%.01f"}}%</td>
-            </tr>
-            {{end}}
-          </tbody>
-        </table>
-      </div>
-
-      <div class="col-md-6">
-        <table class="table table-striped">
-          <thead>
-            <tr>
-              <th>Platform</th>
-              <th class="text-right">Devices</th>
-              <th class="text-right">Share</th>
-            </tr>
-          </thead>
-          <tbody>
-            {{range .platforms}}
-              <tr class="main">
-                <td>{{.Key}}</td>
-                <td class="text-right">{{.Count}}</td>
-                <td class="text-right">{{.Percentage | printf "%.01f"}}%</td>
-              </tr>
-              {{range .Items}}
-                <tr class="child">
-                  <td class="first">{{.Key}}</td>
-                  <td class="text-right">{{.Count}}</td>
-                  <td class="text-right">{{.Percentage | printf "%.01f"}}%</td>
-                </tr>
-              {{end}}
-            {{end}}
-          </tbody>
-        </table>
-      </div>
-
-    </div>
-    <div class="row">
-
-      <div class="col-md-6">
-        <table class="table table-striped">
-          <thead>
-            <tr>
-              <th>Compiler</th>
-              <th class="text-right">Devices</th>
-              <th class="text-right">Share</th>
-            </tr>
-          </thead>
-          <tbody>
-            {{range .compilers}}
-              <tr class="main">
-                <td>{{.Key}}</td>
-                <td class="text-right">{{.Count}}</td>
-                <td class="text-right">{{.Percentage | printf "%.01f"}}%</td>
-              </tr>
-              {{range .Items}}
-                {{if or (gt .Percentage 0.1) (eq .Key "Others")}}
-                  <tr class="child">
-                    <td class="first">{{.Key}}</td>
-                    <td class="text-right">{{.Count}}</td>
-                    <td class="text-right">{{.Percentage | printf "%.01f"}}%</td>
-                  </tr>
-                {{end}}
-              {{end}}
-            {{end}}
-          </tbody>
-        </table>
-      </div>
-
-      <div class="col-md-6">
-        <table class="table table-striped">
-          <thead>
-            <tr>
-              <th>Distribution Channel</th>
-              <th class="text-right">Devices</th>
-              <th class="text-right">Share</th>
-            </tr>
-          </thead>
-          <tbody>
-            {{range .distributions}}
-            <tr>
-              <td>{{.Key}}</td>
-              <td class="text-right">{{.Count}}</td>
-              <td class="text-right">{{.Percentage | printf "%.01f"}}%</td>
-            </tr>
-            {{end}}
-          </tbody>
-        </table>
-      </div>
-
-      <div class="col-md-6">
-        <table class="table table-striped">
-          <thead>
-            <tr>
-              <th>Builder</th>
-              <th class="text-right">Devices</th>
-              <th class="text-right">Share</th>
-            </tr>
-          </thead>
-          <tbody>
-            {{range .builders}}
-            <tr>
-              <td>{{.Key}}</td>
-              <td class="text-right">{{.Count}}</td>
-              <td class="text-right">{{.Percentage | printf "%.01f"}}%</td>
-            </tr>
-            {{end}}
-          </tbody>
-        </table>
-      </div>
-
-    </div>
-
-    <div class="row">
-        <div class="col-md-12">
-            <h4 id="features">Feature Usage</h4>
-            <p>
-                The following lists feature usage. Some features are reported per report, some are per sum of units within report (eg. devices with static addresses among all known devices per report).
-                Currently there are <b>{{.versionNodes.v2}}</b> devices reporting for version 2 and <b>{{.versionNodes.v3}}</b> for version 3.
-            </p>
-        </div>
-    </div>
-
-
-    <div class="row">
-    {{$i := counter}}
-    {{range $featureName := .featureOrder}}
-      {{$featureValues := index $.features $featureName }}
-      {{if $i.DrawTwoDivider}}
-        </div>
-        <div class="row">
-      {{end}}
-      {{ $i.Increment }}
-      <div class="col-md-6">
-          <table class="table table-striped">
-              <thead><tr>
-                  <th>{{$featureName}} Features</th><th colspan="2" class="text-center">Usage</th>
-              </tr></thead>
-              <tbody>
-                  {{range $featureValues}}
-                  <tr>
-                      <td style="width: 50%">{{.Key}} ({{.Version}})</td>
-                      <td style="width: 10%" class="text-right">{{if ge .Pct 10.0}}{{.Pct | printf "%.0f"}}{{else if ge .Pct 1.0}}{{.Pct | printf "%.01f"}}{{else}}{{.Pct | printf "%.02f"}}{{end}}%</td>
-                      <td style="width: 40%" {{if lt .Pct 5.0}}data-toggle="tooltip" title='{{.Count}}'{{end}}>
-                          <div class="progress-bar" role="progressbar" aria-valuenow="{{.Pct | printf "%.02f"}}" aria-valuemin="0" aria-valuemax="100" style="width: {{.Pct | printf "%.02f"}}%; height:20px" {{if ge .Pct 5.0}}data-toggle="tooltip" title='{{.Count}}'{{end}}></div>
-                      </td>
-                  </tr>
-                  {{end}}
-              </tbody>
-          </table>
-      </div>
-    {{end}}
-    </div>
-
-    <div class="row">
-        <div class="col-md-12">
-            <h4 id="features">Feature Group Usage</h4>
-            <p>
-                The following lists feature usage groups, which might include multiple occourances of a feature use per report.
-            </p>
-        </div>
-    </div>
-
-    <div class="row">
-    {{$i := counter}}
-    {{range $featureName := .featureOrder}}
-      {{$featureValues := index $.featureGroups $featureName }}
-      {{if $i.DrawTwoDivider}}
-        </div>
-        <div class="row">
-      {{end}}
-      {{ $i.Increment }}
-      <div class="col-md-6">
-          <table class="table table-striped">
-              <thead><tr>
-                  <th>{{$featureName}} Group Features</th><th colspan="2" class="text-center">Usage</th>
-              </tr></thead>
-              <tbody>
-                  {{range $featureValues}}
-                  {{$counts := .Counts}}
-                  <tr>
-                      <td style="width: 50%">
-                          <div data-toggle="tooltip" title='{{range $key, $value := .Counts}}{{$key}} ({{$value | proportion $counts | printf "%.02f"}}% - {{$value}})</br>{{end}}'>
-                              {{.Key}} ({{.Version}})
-                          </div>
-                      </td>
-                      <td style="width: 50%">
-                          <div class="progress" role="progressbar" style="width: 100%">
-                          {{$j := counter}}
-                          {{range $key, $value := .Counts}}
-                              {{with $valuePct := $value | proportion $counts}}
-                              <div class="progress-bar {{ $j.Current | progressBarClassByIndex }}" style='width: {{$valuePct | printf "%.02f"}}%' data-toggle="tooltip" title='{{$key}} ({{$valuePct | printf "%.02f"}}% - {{$value}})'>
-                                  {{if ge $valuePct 30.0}}{{$key}}{{end}}
-                              </div>
-                              {{end}}
-                              {{ $j.Increment }}
-                          {{end}}
-                          </div>
-                      </td>
-                  </tr>
-                  {{end}}
-              </tbody>
-          </table>
-      </div>
-    {{end}}
-    </div>
-     <div class="row">
-      <div class="col-md-12">
-        <h1 id="performance-charts">Historical Performance Data</h1>
-        <p>These charts are all the average of the corresponding metric, for the entire population of a given day.</p>
-
-        <h4 id="hash-performance">Hash Performance (MiB/s)</h4>
-        <div class="img-thumbnail" id="hashPerfChart" style="width: 1130px; height: 400px; padding: 10px;"></div>
-
-        <h4 id="memory-usage">Memory Usage (MiB)</h4>
-        <div class="img-thumbnail" id="memUsageChart" style="width: 1130px; height: 400px; padding: 10px;"></div>
-
-        <h4 id="total-files">Total Number of Files</h4>
-        <div class="img-thumbnail" id="totFilesChart" style="width: 1130px; height: 400px; padding: 10px;"></div>
-
-        <h4 id="total-size">Total Folder Size (GiB)</h4>
-        <div class="img-thumbnail" id="totMiBChart" style="width: 1130px; height: 400px; padding: 10px;"></div>
-
-        <h4 id="system-ram">System RAM Size (GiB)</h4>
-        <div class="img-thumbnail" id="memSizeChart" style="width: 1130px; height: 400px; padding: 10px;"></div>
-      </div>
-    </div>
-  </div>
-  <hr>
-  <p>
-    <a href="https://github.com/syncthing/syncthing/tree/main/cmd/ursrv">Source code</a>.
-    This product includes GeoLite2 data created by MaxMind, available from
-    <a href="http://www.maxmind.com">http://www.maxmind.com</a>.
-  </p>
-  <script type="text/javascript">
-    $('[data-toggle="tooltip"]').tooltip({html:true});
-    drawHeatMap();
-  </script>
-</body>
-</html>

compat.yaml

@@ -0,0 +1,28 @@
+- runtime: go1.21
+  requirements:
+    # See https://en.wikipedia.org/wiki/MacOS_version_history#Releases
+    #
+    # macOS 10.15 (Catalina) per https://go.dev/doc/go1.22#darwin
+    darwin: "19"
+    # Per https://go.dev/doc/go1.23#linux
+    linux: "2.6.32"
+    # Windows 10's initial release was 10.0.10240.16405, per
+    # https://learn.microsoft.com/en-us/windows/release-health/release-information
+    # and Windows 11's initial release was 10.0.22000.194 per
+    # https://learn.microsoft.com/en-us/windows/release-health/windows11-release-information
+    #
+    # Windows 10/Windows Server 2016 per https://go.dev/doc/go1.21#windows
+    windows: "10.0"
+
+- runtime: go1.22
+  requirements:
+    darwin: "19"
+    linux: "2.6.32"
+    windows: "10.0"
+
+- runtime: go1.23
+  requirements:
+    # macOS 11 (Big Sur) per https://tip.golang.org/doc/go1.23#darwin
+    darwin: "20"
+    linux: "2.6.32"
+    windows: "10.0"

etc/linux-sysctl/30-syncthing.conf

@@ -1,4 +1,4 @@
-# Increase maximum socket buffer sizes to 2.5MiB for QUIC connections
+# Increase maximum socket buffer sizes to 7MiB for QUIC connections
 # see https://github.com/quic-go/quic-go/wiki/UDP-Buffer-Sizes
-net.core.rmem_max = 2621440
-net.core.wmem_max = 2621440
+net.core.rmem_max = 7340032
+net.core.wmem_max = 7340032

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

@@ -1,11 +0,0 @@
-[Unit]
-Description=Restart Syncthing after resume
-Documentation=man:syncthing(1)
-After=sleep.target
-
-[Service]
-Type=oneshot
-ExecStart=-/usr/bin/pkill -HUP -x syncthing
-
-[Install]
-WantedBy=sleep.target

go.mod

@@ -1,92 +1,99 @@
 module github.com/syncthing/syncthing
 
-go 1.21.0
+go 1.22.0
 
 require (
 	github.com/AudriusButkevicius/recli v0.0.7-0.20220911121932-d000ce8fbf0f
-	github.com/alecthomas/kong v0.9.0
+	github.com/alecthomas/kong v1.2.1
+	github.com/aws/aws-sdk-go v1.55.5
 	github.com/calmh/incontainer v1.0.0
-	github.com/calmh/xdr v1.1.0
-	github.com/ccding/go-stun v0.1.4
+	github.com/calmh/xdr v1.2.0
+	github.com/ccding/go-stun v0.1.5
 	github.com/chmduquesne/rollinghash v4.0.0+incompatible
 	github.com/d4l3k/messagediff v1.2.1
-	github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568
 	github.com/getsentry/raven-go v0.2.0
-	github.com/go-ldap/ldap/v3 v3.4.6
+	github.com/go-ldap/ldap/v3 v3.4.8
 	github.com/gobwas/glob v0.2.3
 	github.com/gogo/protobuf v1.3.2
-	github.com/greatroar/blobloom v0.7.2
+	github.com/greatroar/blobloom v0.8.0
 	github.com/hashicorp/golang-lru/v2 v2.0.7
-	github.com/jackpal/gateway v1.0.14
+	github.com/jackpal/gateway v1.0.15
 	github.com/jackpal/go-nat-pmp v1.0.2
 	github.com/julienschmidt/httprouter v1.3.0
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
-	github.com/lib/pq v1.10.9
 	github.com/maruel/panicparse/v2 v2.3.1
 	github.com/maxbrunsfeld/counterfeiter/v6 v6.8.1
-	github.com/minio/sha256-simd v1.0.1
+	github.com/maxmind/geoipupdate/v6 v6.1.0
 	github.com/miscreant/miscreant.go v0.0.0-20200214223636-26d376326b75
-	github.com/oschwald/geoip2-golang v1.9.0
+	github.com/oschwald/geoip2-golang v1.11.0
 	github.com/pierrec/lz4/v4 v4.1.21
-	github.com/prometheus/client_golang v1.19.0
-	github.com/quic-go/quic-go v0.42.0
+	github.com/prometheus/client_golang v1.20.4
+	github.com/puzpuzpuz/xsync/v3 v3.4.0
+	github.com/quic-go/quic-go v0.47.0
+	github.com/rabbitmq/amqp091-go v1.10.0
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475
-	github.com/shirou/gopsutil/v3 v3.24.3
+	github.com/shirou/gopsutil/v4 v4.24.9
 	github.com/syncthing/notify v0.0.0-20210616190510-c6b7342338d2
 	github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d
 	github.com/thejerf/suture/v4 v4.0.5
-	github.com/urfave/cli v1.22.14
+	github.com/urfave/cli v1.22.15
 	github.com/vitrun/qart v0.0.0-20160531060029-bf64b92db6b0
 	github.com/willabides/kongplete v0.4.0
-	go.uber.org/automaxprocs v1.5.3
-	golang.org/x/crypto v0.22.0
-	golang.org/x/net v0.24.0
-	golang.org/x/sys v0.19.0
-	golang.org/x/text v0.14.0
-	golang.org/x/time v0.5.0
-	golang.org/x/tools v0.20.0
-	google.golang.org/protobuf v1.33.0
+	go.uber.org/automaxprocs v1.6.0
+	golang.org/x/crypto v0.27.0
+	golang.org/x/net v0.29.0
+	golang.org/x/sys v0.25.0
+	golang.org/x/text v0.18.0
+	golang.org/x/time v0.6.0
+	golang.org/x/tools v0.25.0
+	google.golang.org/protobuf v1.34.2
+	sigs.k8s.io/yaml v1.4.0
 )
 
 require (
 	github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
-	github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
 	github.com/certifi/gocertifi v0.0.0-20210507211836-431795d63e8d // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/ebitengine/purego v0.8.0 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
-	github.com/go-asn1-ber/asn1-ber v1.5.5 // indirect
+	github.com/go-asn1-ber/asn1-ber v1.5.7 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
-	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
+	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
+	github.com/gofrs/flock v0.12.1 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
-	github.com/google/pprof v0.0.0-20240402174815-29b9bb013b0f // indirect
+	github.com/google/pprof v0.0.0-20241001023024-f4c0cfd0cf1d // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.7 // indirect
-	github.com/kr/text v0.2.0 // indirect
+	github.com/jmespath/go-jmespath v0.4.0 // indirect
+	github.com/klauspost/compress v1.17.10 // indirect
+	github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/nxadm/tail v1.4.11 // indirect
-	github.com/onsi/ginkgo/v2 v2.17.1 // indirect
-	github.com/onsi/gomega v1.31.1 // indirect
-	github.com/oschwald/maxminddb-golang v1.12.0 // indirect
+	github.com/onsi/ginkgo/v2 v2.20.2 // indirect
+	github.com/oschwald/maxminddb-golang v1.13.1 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/posener/complete v1.2.3 // indirect
 	github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.52.2 // indirect
-	github.com/prometheus/procfs v0.13.0 // indirect
+	github.com/prometheus/common v0.60.0 // indirect
+	github.com/prometheus/procfs v0.15.1 // indirect
 	github.com/riywo/loginshell v0.0.0-20200815045211-7d26008be1ab // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/stretchr/testify v1.9.0 // indirect
+	github.com/tklauser/go-sysconf v0.3.14 // indirect
+	github.com/tklauser/numcpus v0.8.0 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	go.uber.org/mock v0.4.0 // indirect
-	golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0 // indirect
-	golang.org/x/mod v0.17.0 // indirect
-	golang.org/x/sync v0.7.0 // indirect
+	golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
+	golang.org/x/mod v0.21.0 // indirect
+	golang.org/x/sync v0.8.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 

go.sum

@@ -3,25 +3,28 @@ github.com/AudriusButkevicius/recli v0.0.7-0.20220911121932-d000ce8fbf0f/go.mod
 github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 h1:mFRzDkZVAjdal+s7s0MwaRv9igoPqLRdzOLzw/8Xvq8=
 github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU=
 github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
-github.com/alecthomas/assert/v2 v2.6.0 h1:o3WJwILtexrEUk3cUVal3oiQY2tfgr/FHWiz/v2n4FU=
-github.com/alecthomas/assert/v2 v2.6.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k=
-github.com/alecthomas/kong v0.9.0 h1:G5diXxc85KvoV2f0ZRVuMsi45IrBgx9zDNGNj165aPA=
-github.com/alecthomas/kong v0.9.0/go.mod h1:Y47y5gKfHp1hDc7CH7OeXgLIpp+Q2m1Ni0L5s3bI8Os=
+github.com/alecthomas/assert/v2 v2.10.0 h1:jjRCHsj6hBJhkmhznrCzoNpbA3zqy0fYiUcYZP/GkPY=
+github.com/alecthomas/assert/v2 v2.10.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k=
+github.com/alecthomas/kong v1.2.1 h1:E8jH4Tsgv6wCRX2nGrdPyHDUCSG83WH2qE4XLACD33Q=
+github.com/alecthomas/kong v1.2.1/go.mod h1:rKTSFhbdp3Ryefn8x5MOEprnRFQ7nlmMC01GKhehhBM=
 github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc=
 github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
-github.com/alexbrainman/sspi v0.0.0-20210105120005-909beea2cc74/go.mod h1:cEWa1LVoE5KvSD9ONXsZrj0z6KqySlCCNKHlLzbqAt4=
 github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa h1:LHTHcTQiSGT7VVbI0o4wBRNQIgn917usHWOd6VAffYI=
 github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa/go.mod h1:cEWa1LVoE5KvSD9ONXsZrj0z6KqySlCCNKHlLzbqAt4=
+github.com/aws/aws-sdk-go v1.55.5 h1:KKUZBfBoyqy5d3swXyiC7Q76ic40rYcbqH7qjh59kzU=
+github.com/aws/aws-sdk-go v1.55.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/calmh/glob v0.0.0-20220615080505-1d823af5017b h1:Fjm4GuJ+TGMgqfGHN42IQArJb77CfD/mAwLbDUoJe6g=
 github.com/calmh/glob v0.0.0-20220615080505-1d823af5017b/go.mod h1:91K7jfEsgJSyfSrX+gmrRfZMtntx6JsHolWubGXDopg=
 github.com/calmh/incontainer v1.0.0 h1:g2cTUtZuFGmMGX8GoykPkN1Judj2uw8/3/aEtq4Z/rg=
 github.com/calmh/incontainer v1.0.0/go.mod h1:eOhqnw15c9X+4RNBe0W3HlUZFfX16O0EDsCOInTndHY=
-github.com/calmh/xdr v1.1.0 h1:U/Dd4CXNLoo8EiQ4ulJUXkgO1/EyQLgDKLgpY1SOoJE=
-github.com/calmh/xdr v1.1.0/go.mod h1:E8sz2ByAdXC8MbANf1LCRYzedSnnc+/sXXJs/PVqoeg=
-github.com/ccding/go-stun v0.1.4 h1:lC0co3Q3vjAuu2Jz098WivVPBPbemYFqbwE1syoka4M=
-github.com/ccding/go-stun v0.1.4/go.mod h1:cCZjJ1J3WFSJV6Wj8Y9Di8JMTsEXh6uv2eNmLzKaUeM=
+github.com/calmh/xdr v1.2.0 h1:GaGSNH4ZDw9kNdYqle6+RcAENiaQ8/611Ok+jQbBEeU=
+github.com/calmh/xdr v1.2.0/go.mod h1:vO5+lCx/8xz7Ekd/ZLf+xuy7c1x6FMO1pBJyjDebwyg=
+github.com/ccding/go-stun v0.1.5 h1:qEM367nnezmj7dv+SdT52prv5x6HUTG3nlrjX5aitlo=
+github.com/ccding/go-stun v0.1.5/go.mod h1:cCZjJ1J3WFSJV6Wj8Y9Di8JMTsEXh6uv2eNmLzKaUeM=
+github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
+github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
 github.com/certifi/gocertifi v0.0.0-20210507211836-431795d63e8d h1:S2NE3iHSwP0XV47EEXL8mWmRdEfGscSJ+7EgePNgt0s=
 github.com/certifi/gocertifi v0.0.0-20210507211836-431795d63e8d/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
@@ -31,17 +34,16 @@ github.com/chmduquesne/rollinghash v4.0.0+incompatible/go.mod h1:Uc2I36RRfTAf7Dg
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
-github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4=
 github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/cpuguy83/go-md2man/v2 v2.0.5 h1:ZtcqGrnekaHpVLArFSe4HK5DoKx1T0rq2DwVB0alcyc=
+github.com/cpuguy83/go-md2man/v2 v2.0.5/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/d4l3k/messagediff v1.2.1 h1:ZcAIMYsUg0EAp9X+tt8/enBE/Q8Yd5kzPynLyKptt9U=
 github.com/d4l3k/messagediff v1.2.1/go.mod h1:Oozbb1TVXFac9FtSIxHBMnBCq2qeH/2KkEQxENCrlLo=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BMXYYRWTLOJKlh+lOBt6nUQgXAfB7oVIQt5cNreqSLI=
-github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:rZfgFAXFS/z/lEd6LJmf9HVZ1LkgYiHx5pHhV5DR16M=
+github.com/ebitengine/purego v0.8.0 h1:JbqvnEzRvPpxhCJzJJ2y0RbiZ8nyjccVUrSM3q+GvvE=
+github.com/ebitengine/purego v0.8.0/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
@@ -50,18 +52,21 @@ github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nos
 github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
 github.com/getsentry/raven-go v0.2.0 h1:no+xWJRb5ZI7eE8TWgIq1jLulQiIoLG0IfYxv5JYMGs=
 github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ=
-github.com/go-asn1-ber/asn1-ber v1.5.5 h1:MNHlNMBDgEKD4TcKr36vQN68BA00aDfjIt3/bD50WnA=
 github.com/go-asn1-ber/asn1-ber v1.5.5/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
-github.com/go-ldap/ldap/v3 v3.4.6 h1:ert95MdbiG7aWo/oPYp9btL3KJlMPKnP58r09rI8T+A=
-github.com/go-ldap/ldap/v3 v3.4.6/go.mod h1:IGMQANNtxpsOzj7uUAMjpGBaOVTC4DYyIy8VsTdxmtc=
-github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
-github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-asn1-ber/asn1-ber v1.5.7 h1:DTX+lbVTWaTw1hQ+PbZPlnDZPEIs0SS/GCZAl535dDk=
+github.com/go-asn1-ber/asn1-ber v1.5.7/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
+github.com/go-ldap/ldap/v3 v3.4.8 h1:loKJyspcRezt2Q3ZRMq2p/0v8iOurlmeXDPw6fikSvQ=
+github.com/go-ldap/ldap/v3 v3.4.8/go.mod h1:qS3Sjlu76eHfHGpUdWkAXQTw4beih+cHsco2jXlIXrk=
+github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
+github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
 github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
-github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
-github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
+github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
+github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
+github.com/gofrs/flock v0.12.1 h1:MTLVXXHf8ekldpJk3AKicLij9MdwOWkZ+a/jHHZby9E=
+github.com/gofrs/flock v0.12.1/go.mod h1:9zxTsyu5xtJ9DK+1tFZyibEV7y3uwDxPPfbxeeHCoD0=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -73,69 +78,89 @@ github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvq
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
-github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20240402174815-29b9bb013b0f h1:f00RU+zOX+B3rLAmMMkzHUF2h1z4DeYR9tTCvEq2REY=
-github.com/google/pprof v0.0.0-20240402174815-29b9bb013b0f/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw=
-github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/pprof v0.0.0-20241001023024-f4c0cfd0cf1d h1:Jaz2JzpQaQXyET0AjLBXShrthbpqMkhGiEfkcQAiAUs=
+github.com/google/pprof v0.0.0-20241001023024-f4c0cfd0cf1d/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/greatroar/blobloom v0.7.2 h1:F30MGLHOcb4zr0pwCPTcKdlTM70rEgkf+LzdUPc5ss8=
-github.com/greatroar/blobloom v0.7.2/go.mod h1:mjMJ1hh1wjGVfr93QIHJ6FfDNVrA0IELv8OvMHJxHKs=
+github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
+github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
+github.com/greatroar/blobloom v0.8.0 h1:I9RlEkfqK9/6f1v9mFmDYegDQ/x0mISCpiNpAm23Pt4=
+github.com/greatroar/blobloom v0.8.0/go.mod h1:mjMJ1hh1wjGVfr93QIHJ6FfDNVrA0IELv8OvMHJxHKs=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
+github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
+github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
 github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
 github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
 github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/jackpal/gateway v1.0.14 h1:6ZfIuFvnvWrS59hHbvZGR/R33ojV2LASBODomt7zlJU=
-github.com/jackpal/gateway v1.0.14/go.mod h1:6c8LjW+FVESFmwxaXySkt7fU98Yv806ADS3OY6Cvh2U=
+github.com/jackpal/gateway v1.0.15 h1:yb4Gltgr8ApHWWnSyybnDL1vURbqw7ooo7IIL5VZSeg=
+github.com/jackpal/gateway v1.0.15/go.mod h1:dbyEDcDhHUh9EmjB9ung81elMUZfG0SoNc2TfTbcj4c=
 github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus=
 github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
+github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8=
+github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs=
+github.com/jcmturner/dnsutils/v2 v2.0.0 h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8c/iPbo=
+github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod h1:b0TnjGOvI/n42bZa+hmXL+kFJZsFT7G4t3HTlQ184QM=
+github.com/jcmturner/gofork v1.7.6 h1:QH0l3hzAU1tfT3rZCnW5zXl+orbkNMMRGJfdJjHVETg=
+github.com/jcmturner/gofork v1.7.6/go.mod h1:1622LH6i/EZqLloHfE7IeZ0uEJwMSUyQ/nDd82IeqRo=
+github.com/jcmturner/goidentity/v6 v6.0.1 h1:VKnZd2oEIMorCTsFBnJWbExfNN7yZr3EhJAxwOkZg6o=
+github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg=
+github.com/jcmturner/gokrb5/v8 v8.4.4 h1:x1Sv4HaTpepFkXbt2IkL29DXRf8sOfZXo8eRKh687T8=
+github.com/jcmturner/gokrb5/v8 v8.4.4/go.mod h1:1btQEpgT6k+unzCwX1KdWMEwPPkkgBtP+F6aCACiMrs=
+github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY=
+github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc=
+github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
+github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
+github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
+github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
 github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM=
-github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
+github.com/klauspost/compress v1.17.10 h1:oXAz+Vh0PMUvJczoi+flxpnBEPxoER1IaAnU/NMPtT0=
+github.com/klauspost/compress v1.17.10/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
-github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
-github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
+github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
+github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
+github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 h1:7UMa6KCCMjZEMDtTVdcGu0B1GmmC7QJKiCCjyTAWQy0=
+github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683/go.mod h1:ilwx/Dta8jXAgpFYFvSWEMwxmbWXyiUHkd5FwyKhb5k=
 github.com/maruel/panicparse/v2 v2.3.1 h1:NtJavmbMn0DyzmmSStE8yUsmPZrZmudPH7kplxBinOA=
 github.com/maruel/panicparse/v2 v2.3.1/go.mod h1:s3UmQB9Fm/n7n/prcD2xBGDkwXD6y2LeZnhbEXvs9Dg=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/maxbrunsfeld/counterfeiter/v6 v6.8.1 h1:NicmruxkeqHjDv03SfSxqmaLuisddudfP3h5wdXFbhM=
 github.com/maxbrunsfeld/counterfeiter/v6 v6.8.1/go.mod h1:eyp4DdUJAKkr9tvxR3jWhw2mDK7CWABMG5r9uyaKC7I=
+github.com/maxmind/geoipupdate/v6 v6.1.0 h1:sdtTHzzQNJlXF5+fd/EoPTucRHyMonYt/Cok8xzzfqA=
+github.com/maxmind/geoipupdate/v6 v6.1.0/go.mod h1:cZYCDzfMzTY4v6dKRdV7KTB6SStxtn3yFkiJ1btTGGc=
 github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
-github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM=
-github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8=
 github.com/miscreant/miscreant.go v0.0.0-20200214223636-26d376326b75 h1:cUVxyR+UfmdEAZGJ8IiKld1O0dbGotEnkMolG5hfMSY=
 github.com/miscreant/miscreant.go v0.0.0-20200214223636-26d376326b75/go.mod h1:pBbZyGwC5i16IBkjVKoy/sznA8jPD/K9iedwe1ESE6w=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
 github.com/nxadm/tail v1.4.11 h1:8feyoE3OzPrcshW5/MJ4sGESc5cqmGkGCWlco4l0bqY=
@@ -146,18 +171,18 @@ github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vv
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
 github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
 github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
-github.com/onsi/ginkgo/v2 v2.17.1 h1:V++EzdbhI4ZV4ev0UTIj0PzhzOcReJFyJaLjtSF55M8=
-github.com/onsi/ginkgo/v2 v2.17.1/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs=
+github.com/onsi/ginkgo/v2 v2.20.2 h1:7NVCeyIWROIAheY21RLS+3j2bb52W0W82tkberYytp4=
+github.com/onsi/ginkgo/v2 v2.20.2/go.mod h1:K9gyxPIlb+aIvnZ8bd9Ak+YP18w3APlR+5coaZoE2ag=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
 github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro=
-github.com/onsi/gomega v1.31.1 h1:KYppCUK+bUgAZwHOu7EXVBKyQA6ILvOESHkn/tgoqvo=
-github.com/onsi/gomega v1.31.1/go.mod h1:y40C95dwAD1Nz36SsEnxvfFe8FFfNxzI5eJ0EYGyAy0=
-github.com/oschwald/geoip2-golang v1.9.0 h1:uvD3O6fXAXs+usU+UGExshpdP13GAqp4GBrzN7IgKZc=
-github.com/oschwald/geoip2-golang v1.9.0/go.mod h1:BHK6TvDyATVQhKNbQBdrj9eAvuwOMi2zSFXizL3K81Y=
-github.com/oschwald/maxminddb-golang v1.12.0 h1:9FnTOD0YOhP7DGxGsq4glzpGy5+w7pq50AS6wALUMYs=
-github.com/oschwald/maxminddb-golang v1.12.0/go.mod h1:q0Nob5lTCqyQ8WT6FYgS1L7PXKVVbgiymefNwIjPzgY=
+github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
+github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=
+github.com/oschwald/geoip2-golang v1.11.0 h1:hNENhCn1Uyzhf9PTmquXENiWS6AlxAEnBII6r8krA3w=
+github.com/oschwald/geoip2-golang v1.11.0/go.mod h1:P9zG+54KPEFOliZ29i7SeYZ/GM6tfEL+rgSn03hYuUo=
+github.com/oschwald/maxminddb-golang v1.13.1 h1:G3wwjdN9JmIK2o/ermkHM+98oX5fS+k5MbwsmL4MRQE=
+github.com/oschwald/maxminddb-golang v1.13.1/go.mod h1:K4pgV9N/GcK694KSTmVSDTODk4IsCNThNdTmnaBZ/F8=
 github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ=
 github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -167,21 +192,24 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/posener/complete v1.2.3 h1:NP0eAhjcjImqslEwo/1hq7gpajME0fTLTezBKDqfXqo=
 github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
-github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
 github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt9k/+g42oCprj/FisM4qX9L3sZB3upGN2ZU=
 github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
 github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
 github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
-github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7kmXYlnfbA6JU=
-github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k=
+github.com/prometheus/client_golang v1.20.4 h1:Tgh3Yr67PaOv/uTqloMsCEdeuFTatm5zIq5+qNN23vI=
+github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
 github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
 github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
-github.com/prometheus/common v0.52.2 h1:LW8Vk7BccEdONfrJBDffQGRtpSzi5CQaRZGtboOO2ck=
-github.com/prometheus/common v0.52.2/go.mod h1:lrWtQx+iDfn2mbH5GUzlH9TSHyfZpHkSiG1W7y3sF2Q=
-github.com/prometheus/procfs v0.13.0 h1:GqzLlQyfsPbaEHaQkO7tbDlriv/4o5Hudv6OXHGKX7o=
-github.com/prometheus/procfs v0.13.0/go.mod h1:cd4PFCR54QLnGKPaKGA6l+cfuNXtht43ZKY6tow0Y1g=
-github.com/quic-go/quic-go v0.42.0 h1:uSfdap0eveIl8KXnipv9K7nlwZ5IqLlYOpJ58u5utpM=
-github.com/quic-go/quic-go v0.42.0/go.mod h1:132kz4kL3F9vxhW3CtQJLDVwcFe5wdWeJXXijhsO57M=
+github.com/prometheus/common v0.60.0 h1:+V9PAREWNvJMAuJ1x1BaWl9dewMW4YrHZQbx0sJNllA=
+github.com/prometheus/common v0.60.0/go.mod h1:h0LYf1R1deLSKtD4Vdg8gy4RuOvENW2J/h19V5NADQw=
+github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
+github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
+github.com/puzpuzpuz/xsync/v3 v3.4.0 h1:DuVBAdXuGFHv8adVXjWWZ63pJq+NRXOWVXlKDBZ+mJ4=
+github.com/puzpuzpuz/xsync/v3 v3.4.0/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA=
+github.com/quic-go/quic-go v0.47.0 h1:yXs3v7r2bm1wmPTYNLKAAJTHMYkPEsfYJmTazXrCZ7Y=
+github.com/quic-go/quic-go v0.47.0/go.mod h1:3bCapYsJvXGZcipOHuu7plYtaV6tnF+z7wIFsU0WK9E=
+github.com/rabbitmq/amqp091-go v1.10.0 h1:STpn5XsHlHGcecLmMFCtg7mqq0RnD+zFr4uzukfVhBw=
+github.com/rabbitmq/amqp091-go v1.10.0/go.mod h1:Hy4jKW5kQART1u+JkDTF9YYOQUHXqMuhrgxOEeS7G4o=
 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM=
 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/riywo/loginshell v0.0.0-20200815045211-7d26008be1ab h1:ZjX6I48eZSFetPb41dHudEyVr5v953N15TsNZXlkcWY=
@@ -192,10 +220,8 @@ github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8=
 github.com/sclevine/spec v1.4.0/go.mod h1:LvpgJaFyvQzRvc1kaDs0bulYwzC70PbiYjC4QnFHkOM=
-github.com/shirou/gopsutil/v3 v3.24.3 h1:eoUGJSmdfLzJ3mxIhmOAhgKEKgQkeOwKpz1NbhVnuPE=
-github.com/shirou/gopsutil/v3 v3.24.3/go.mod h1:JpND7O217xa72ewWz9zN2eIIkPWsDN/3pl0H8Qt0uwg=
-github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
-github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k=
+github.com/shirou/gopsutil/v4 v4.24.9 h1:KIV+/HaHD5ka5f570RZq+2SaeFsb/pq+fp2DGNWYoOI=
+github.com/shirou/gopsutil/v4 v4.24.9/go.mod h1:3fkaHNeYsUFCGZ8+9vZVWtbyM1k2eRnlL+bWO8Bxa/Q=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
@@ -203,10 +229,10 @@ github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
 github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
@@ -216,11 +242,13 @@ github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d h1:vfofYNRScrDd
 github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d/go.mod h1:RRCYJbIwD5jmqPI9XoAFR0OcDxqUctll6zUj/+B4S48=
 github.com/thejerf/suture/v4 v4.0.5 h1:F1E/4FZwXWqvlWDKEUo6/ndLtxGAUzMmNqkrMknZbAA=
 github.com/thejerf/suture/v4 v4.0.5/go.mod h1:gu9Y4dXNUWFrByqRt30Rm9/UZ0wzRSt9AJS6xu/ZGxU=
-github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
-github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY=
+github.com/tklauser/go-sysconf v0.3.14 h1:g5vzr9iPFFz24v2KZXs/pvpvh8/V9Fw6vQK5ZZb78yU=
+github.com/tklauser/go-sysconf v0.3.14/go.mod h1:1ym4lWMLUOhuBOPGtRcJm7tEGX4SCYNEEEtghGG/8uY=
+github.com/tklauser/numcpus v0.8.0 h1:Mx4Wwe/FjZLeQsK/6kt2EOepwwSl7SmJrK5bV/dXYgY=
+github.com/tklauser/numcpus v0.8.0/go.mod h1:ZJZlAY+dmR4eut8epnzf0u/VwodKmryxR8txiloSqBE=
 github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
-github.com/urfave/cli v1.22.14 h1:ebbhrRiGK2i4naQJr+1Xj92HXZCrK7MsyTS/ob3HnAk=
-github.com/urfave/cli v1.22.14/go.mod h1:X0eDS6pD6Exaclxm99NJ3FiCDRED7vIHpx2mDOHLvkA=
+github.com/urfave/cli v1.22.15 h1:nuqt+pdC/KqswQKhETJjo7pvn/k4xMUxgW6liI7XpnM=
+github.com/urfave/cli v1.22.15/go.mod h1:wSan1hmo5zeyLGBjRJbzRTNk8gwoYa2B9n4q9dmRIc0=
 github.com/vitrun/qart v0.0.0-20160531060029-bf64b92db6b0 h1:okhMind4q9H1OxF44gNegWkiP4H/gsTFLalHFa4OOUI=
 github.com/vitrun/qart v0.0.0-20160531060029-bf64b92db6b0/go.mod h1:TTbGUfE+cXXceWtbTHq6lqcTvYPBKLNejBEbnUsQJtU=
 github.com/willabides/kongplete v0.4.0 h1:eivXxkp5ud5+4+NVN9e4goxC5mSh3n1RHov+gsblM2g=
@@ -230,28 +258,33 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
 github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
-go.uber.org/automaxprocs v1.5.3 h1:kWazyxZUrS3Gs4qUpbwo5kEIMGe/DAvi5Z4tl2NW4j8=
-go.uber.org/automaxprocs v1.5.3/go.mod h1:eRbA25aqJrxAbsLO0xy5jVwPt7FQnRgjW+efnwa1WM0=
+go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
+go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
+go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
+go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
 go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
-golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30=
-golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
-golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0 h1:985EYyeCOxTpcgOTJpflJUwOeEz0CQOdPt73OzpE9F8=
-golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI=
+golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
+golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
+golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
+golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
+golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
+golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk=
+golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
-golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=
+golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
@@ -261,17 +294,20 @@ golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su
 golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
-golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
-golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
+golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
+golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
+golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
+golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
-golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
+golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180926160741-c2ed4eda69e7/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -299,27 +335,27 @@ golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
-golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
+golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
-golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
+golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
+golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
-golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
+golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
+golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U=
+golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@@ -327,8 +363,8 @@ golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY=
-golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg=
+golang.org/x/tools v0.25.0 h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE=
+golang.org/x/tools v0.25.0/go.mod h1:/vtpO8WL1N9cQC3FN5zPqb//fRXskFHbLKk4OW1Q7rg=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -342,8 +378,8 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
-google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
+google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
@@ -352,8 +388,12 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkep
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
+sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=

gui/default/assets/css/overrides.css

@@ -304,11 +304,7 @@ a.toggler:hover {
     text-decoration: none;
 }
 
-/**
- * Panel padding decrease
- */
-
-.panel-collapse .panel-body {
+.panel-body.less-padding {
     padding: 5px;
 }
 

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

@@ -15,19 +15,19 @@
     "Add filter entry": "إضافة عامل التصفية",
     "Add ignore patterns": "أضف أنماط التجاهل",
     "Add new folder?": "إضافة مجلد جديد؟",
-    "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.": "بالإضافة إلى ذلك ، سيتم زيادة الفاصل الزمني لإعادة الفحص الكامل (60 مرة، وهو الافتراضي الجديد من 1H). يمكنك أيضًا التحكم بالإعدادات وتعديلها يدويًا لكل مجلد لاحقًا بعد اختيار \"لا\".",
+    "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.": "بالإضافة إلى ذلك ، سيُزاد الفاصل الزمني لإعادة الفحص الكامل (60 مرة، وهو الافتراضي الجديد من 1H). يمكنك أيضًا التحكم بالإعدادات وتعديلها يدويًا لكل مجلد لاحقًا بعد اختيار \"لا\".",
     "Address": "العنوان",
     "Addresses": "العناوين",
     "Advanced": "متقدم",
     "Advanced Configuration": "ضبط متقدم",
     "All Data": "كل البيانات",
     "All Time": "كل الوقت",
-    "All folders shared with this device must be protected by a password, such that all sent data is unreadable without the given password.": "يجب حماية جميع المجلدات التي تمت مشاركتها مع هذا الجهاز بكلمة مرور ، بحيث تكون جميع البيانات المرسلة غير قابلة للقراءة بدون كلمة المرور المقدمة.",
+    "All folders shared with this device must be protected by a password, such that all sent data is unreadable without the given password.": "يجب حماية جميع المجلدات التي شاركتها مع هذا الجهاز بكلمة مرور ، بحيث تكون جميع البيانات المرسلة غير قابلة للقراءة بدون كلمة المرور المقدمة.",
     "Allow Anonymous Usage Reporting?": "السماح بإرسال تقارير الإستخدام المجهولة؟",
     "Allowed Networks": "الشبكات المسموح بها",
     "Alphabetic": "أبجدية",
-    "Altered by ignoring deletes.": "تم التغيير بتجاهل عمليات الحذف.",
-    "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.": "الإصدار يتم معالجته بواسطة أمر خارجي. يجب إزالة الملف من المجلدات المشتركة. إذا كان المسار للتطبيق يحتوي على مسافات، يجب وضعها بين علامتي تنصيص دلالة على الاقتباس.",
+    "Altered by ignoring deletes.": "تغير بتجاهل عمليات الحذف.",
+    "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.": "الإصدار يعالج بواسطة أمر خارجي. يجب إزالة الملف من المجلدات المشتركة. إذا كان المسار للتطبيق يحتوي على مسافات، يجب وضعها بين علامتي تنصيص دلالة على الاقتباس.",
     "Anonymous Usage Reporting": "تقارير الإستخدام المجهولة",
     "Anonymous usage report format has changed. Would you like to move to the new format?": "هل تريد الانتقال الى التصميم الجديد لتقرير الاستخدام المجهول ؟",
     "Applied to LAN": "الشبكة المحلية",
@@ -70,13 +70,13 @@
     "Connection Type": "نوع الاتصال",
     "Connections": "اتصالات",
     "Connections via relays might be rate limited by the relay": "قد يكون معدل التوصيلات عبر المرحلات محدودًا بواسطة المرحل",
-    "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.": "مراقبة الملفات بشكل مستمر متوفر في Syncthing. يتم فحص الملفات التي تم تغييرها في المسار فقط. هذا يساعد على تجنب فحص كامل المسار لأداء اسرع.",
+    "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.": "مراقبة الملفات بشكل مستمر متوفر في Syncthing. تفحص الملفات التي تغيرت في المسار فقط. هذا يساعد على تجنب فحص كامل المسار لأداء اسرع.",
     "Copied from elsewhere": "منسوخ من مكان أخر",
     "Copied from original": "منسوخ من الأصل",
-    "Copied!": "تم النسخ!",
+    "Copied!": "نُسِخَ!",
     "Copy": "نسخ",
     "Copy failed! Try to select and copy manually.": "فشل النسخ! حاول التحديد والنسخ يدويًا.",
-    "Currently Shared With Devices": "حاليًا تم مشاركته مع الأجهزة",
+    "Currently Shared With Devices": "مُشارَك مع الأجهزة حاليا",
     "Custom Range": "نطاق مخصص",
     "Danger!": "خطر!",
     "Database Location": "موقع قاعدة البيانات",
@@ -158,9 +158,9 @@
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "يُتوقع فشل الاتصال بخوادم IPv6، إذا لم يكن IPv6 متاحا.",
     "File Pull Order": "ترتيب استيراد الملفات",
     "File Versioning": "إصدارات الملف",
-    "Files are moved to .stversions directory when replaced or deleted by Syncthing.": "الملفات يتم نقلها إلى مجلد `.stversions` عند الاستبدال أو الحذف بواسطة البرنامج.",
-    "Files are moved to date stamped versions in a .stversions directory 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.": "الملفات محمية من التغييرات التي تم إجراؤها على الأجهزة الأخرى ، ولكن سيتم إرسال التغييرات التي تم إجراؤها على هذا الجهاز إلى بقية الأجهزة.",
+    "Files are moved to .stversions directory when replaced or deleted by Syncthing.": "تنقل الملفات إلى مجلد `.stversions` عند الاستبدال أو الحذف بواسطة البرنامج.",
+    "Files are moved to date stamped versions in a .stversions directory 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.": "الملفات محمية من التغييرات التي أجريت على الأجهزة الأخرى ، ولكن سترسل التغييرات التي أجريت على هذا الجهاز إلى بقية الأجهزة.",
     "Files are synchronized from the cluster, but any changes made locally will not be sent to other devices.": "تُزامَنُ الملفات من العنقود، لكن التغيرات المحلية على هذا الجهاز لاتُطَبَّقُ على غيره من الأجهزة.",
     "Filesystem Watcher Errors": "أخطاء مراقب نظام الملفات",
     "Filter by date": "فلترة بالتاريخ",
@@ -174,7 +174,7 @@
     "Folder type \"{%receiveEncrypted%}\" can only be set when adding a new folder.": "نوع المجلد \"{{receiveEncrypted}}\" لا يمكن إعداده إلا أثناء إنشاء الملف.",
     "Folder type \"{%receiveEncrypted%}\" cannot be changed after adding the folder. You need to remove the folder, delete or decrypt the data on disk, and add the folder again.": "نوع المجلد \"{{receiveEncrypted}}\" لا يمكن إعداده بعد إضافة المجلد. يجب أن تحذف المجلد وأن تفك تشفير البيانات على قرص التخزين أو تحذفها، بعدها تنشئ المجلد مجددا.",
     "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.": "للمجلدات التالية، حدث خطأ قبل بدء مشاهدة التغييرات. ستعاد المحاولة كل دقيقة، نظرًا لذلك قد تختفي الأخطاء قريبًا. لكن إذا استمرت، فحاول حل المشكلة واطلب المساعدة إذا لم تستطع حل المشكلة.",
     "Forever": "للأبد",
     "Full Rescan Interval (s)": "مدة إعادة الفحص الكامل (ثانية)",
     "GUI": "واجهة المستخدم الرسومية",
@@ -182,7 +182,7 @@
     "GUI Authentication Password": "كلمة السر لتوثيق الواجهة",
     "GUI Authentication User": "اسم المستخدم لدخول واجهة الرسومية",
     "GUI Authentication: Set User and Password": "توثيق الواجهة: أنشئ كلمة مرور للمستخدم",
-    "GUI Listen Address": "واجهة الرسومية الاستماع الى العنوان",
+    "GUI Listen Address": "عنوان ترقب الواجهة الرسومية",
     "GUI Override Directory": "مجلد إحلال الواجهة",
     "GUI Theme": "شكل الواجهة",
     "General": "عام",
@@ -193,7 +193,7 @@
     "Help": "مساعدة",
     "Hint: only deny-rules detected while the default is deny. Consider adding \"permit any\" as last rule.": "ملحوظة: إذا كان الإعداد الافتراضي هو الرفض، وحدها قواعد الرفض تُرصد. جرب إضافة \"السماح للكل\" كخيار أخير.",
     "Home page": "الصفحة الرئيسية",
-    "However, your current settings indicate you might not want it enabled. We have disabled automatic crash reporting for you.": "ومع ذلك، تشير إعداداتك الحالية إلى أنك قد لا ترغب في تمكينه. لذلك تم تعطيل الإبلاغ التلقائي عن الأعطال.",
+    "However, your current settings indicate you might not want it enabled. We have disabled automatic crash reporting for you.": "ومع ذلك، تشير إعداداتك الحالية إلى أنك قد لا ترغب في تمكينه. لذلك توقف الإبلاغ التلقائي عن الأعطال.",
     "Identification": "المُعرِّف",
     "If untrusted, enter encryption password": "في حالة الرِّيبة، أدخل كلمة سر التشفير",
     "If you want to prevent other users on this computer from accessing Syncthing and through it your files, consider setting up authentication.": "إذا أردت منع المستخدمين الآخرين على هذا الحاسب من الوصول لملفاتك من خلال Syncthing، يُنصَح بإعداد وثائق الملكية.",
@@ -225,9 +225,9 @@
     "Learn more": "اعرف أكثر",
     "Learn more at {%url%}": "اطلع على المزيد في {{url}}",
     "Limit": "الحد",
-    "Listener Failures": "فشل المستمع",
-    "Listener Status": "حالة المستمع",
-    "Listeners": "المستمعين",
+    "Listener Failures": "أعطال المنصت",
+    "Listener Status": "حالة المنصت",
+    "Listeners": "المنصتين",
     "Loading data...": "تحميل بيانات...",
     "Loading...": "تحميل...",
     "Local Additions": "الإضافات المحلِّيَّة",
@@ -264,7 +264,7 @@
     "Newest First": "الأحدث أولا",
     "No": "لا",
     "No File Versioning": "لا تقسيم لإصدارات الملفات",
-    "No files will be deleted as a result of this operation.": "لن يتم حذف أي ملفات بسبب هذا العملية.",
+    "No files will be deleted as a result of this operation.": "لن يحذف أي ملف بسبب هذه العملية.",
     "No rules set": "لم تحدد قواعد",
     "No upgrades": "لا يوجد ترقيات",
     "Not shared": "لم يُشارَك",
@@ -328,7 +328,7 @@
     "Rescans": "يعيد الفحص",
     "Restart": "إعادة تشغيل",
     "Restart Needed": "مطلوب أعادة تشغيل",
-    "Restarting": "يتم إعادة التشغيل",
+    "Restarting": "يُعاد التشغيل",
     "Restore": "استعادة",
     "Restore Versions": "استعادة إصدارات",
     "Resume": "استرد",
@@ -339,7 +339,7 @@
     "Save": "حفظ",
     "Saving changes": "تُحفَظ التعديلات",
     "Scan Time Remaining": "فحص الوقت المتبقي",
-    "Scanning": "يتم الفحص",
+    "Scanning": "جار الفحص",
     "See external versioning help for supported templated command line parameters.": "راجع تعليمات الإصدارات الخارجية لمعرفة القيم المدعومة في سطر الأوامر.",
     "Select All": "تحديد الكل",
     "Select a version": "اختر إصداراً",
@@ -364,12 +364,12 @@
     "Show ID": "عرض المُعرِّف",
     "Show QR": "اظهار QR",
     "Show detailed discovery status": "اعرض حالة الاكتشاف تفصيليا",
-    "Show detailed listener status": "اعرض حالة الاستماع تفصيليا",
+    "Show detailed listener status": "اعرض حالة الإنصات تفصيليا",
     "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.": "يُعرَض بدلا من المُعرِّف ضمن العناقيد. سيُروَّج للأجهزة الأخرى على أنه اسم أساسي محتمل.",
     "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "يُعرَض بدلا من المُعرِّف ضمن العناقيد. إذا تُرك فارغا، سيُحدَّث إلى الاسم المختار من قِبَل الجهاز.",
     "Shutdown": "إغلاق",
-    "Shutdown Complete": "تم الإغلاق",
+    "Shutdown Complete": "أُغلِق",
     "Simple": "بسيط",
     "Simple File Versioning": "التقسيم البسيط لإصدارات الملفات",
     "Single level wildcard (matches within a directory only)": "المقارنة على مستوى واحد (المقارنة مع الملفات في المجلد الحالي فقط)",
@@ -377,10 +377,10 @@
     "Smallest First": "الأصغر أولا",
     "Some discovery methods could not be established for finding other devices or announcing this device:": "بعض أساليب الاستكشاف يمكن استخدامها للبحث عن أجهزة أخرى أو الإعلان عن هذا الجهاز:",
     "Some items could not be restored:": "بعض العناصر لا يمكن استرجاعها:",
-    "Some listening addresses could not be enabled to accept connections:": "بعض عناوين الاستماع لا يمكن تفعيلها لقبول الاتصالات:",
+    "Some listening addresses could not be enabled to accept connections:": "بعض عناوين الإنصات لا يمكن تفعيلها لقبول الاتصالات:",
     "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.": "الإصدارات المستقرة تأخرت بنحو أسبوعين. خلال هذه الفترة يتم إجراء الاختبارات كإصدارات مرشحة.",
+    "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "الإصدارات المستقرة تأخرت نحو أسبوعين. خلال هذه الفترة نُجري الاختبارات عن طريق الإصدارات المرشحة.",
     "Stable releases only": "الإصدارات المستقرة فقط",
     "Staggered": "مترنِّح",
     "Staggered File Versioning": "تقسمات إصدارات الملف مهترئة",
@@ -396,17 +396,17 @@
     "Sync Ownership": "زامن الملكية",
     "Sync Protocol Listen Addresses": "عناوين بروتوكول استقبال المزامنة",
     "Sync Status": "وضع المزامنة",
-    "Syncing": "يتم التزامن",
+    "Syncing": "يُزامَن",
     "Syncthing device ID for \"{%devicename%}\"": "مُعرِّف Syncthing للجهاز {{devicename}}",
-    "Syncthing has been shut down.": "تم إيقاف Syncthing.",
+    "Syncthing has been shut down.": "أُوقِف Syncthing.",
     "Syncthing includes the following software or portions thereof:": "المزامنة تتضمن البرامج التالية أو أجزائها:",
     "Syncthing is Free and Open Source Software licensed as MPL v2.0.": "Syncthing هو برنامج حر مفتوح المصدر تحت ترخيص MPL v2.0 (ترخيص موزيلا العام النسخة الثانية).",
-    "Syncthing is a continuous file synchronization program. It synchronizes files between two or more computers in real time, safely protected from prying eyes. Your data is your data alone and you deserve to choose where it is stored, whether it is shared with some third party, and how it's transmitted over the internet.": "Syncthing هو تطبيق للمزامنة المستمرة للملفات. يزامن الملفات بين جهازين أو أكثر بشكل لحظي، آمن من الأعين المتربصة. بياناتك ملك لك وحدك، من حقك أن تختار أين تُخَزَّن، وهل يطلع عليها طرف ثالث أم لا، وكيف تتنقل عبر الشبكة.",
+    "Syncthing is a continuous file synchronization program. It synchronizes files between two or more computers in real time, safely protected from prying eyes. Your data is your data alone and you deserve to choose where it is stored, whether it is shared with some third party, and how it's transmitted over the internet.": "Syncthing هو تطبيق للمزامنة المستمرة للملفات. يزامن الملفات بين جهازين أو أكثر بشكل لحظي، آمن من الأعين المتربصة. بياناتك ملك لك وحدك، من حقك أن تختار أين تُخَزَّن، وهل يطلع عليها غيرك أم لا، وكيف تتنقل عبر الشبكة.",
     "Syncthing is listening on the following network addresses for connection attempts from other devices:": "Syncthing يترقب محاولات الاتصال على العنوان التالي:",
     "Syncthing is not listening for connection attempts from other devices on any address.  Only outgoing connections from this device may work.": "Syncthing لا يترقب أي محاولة للاتصال على أي من عناوين الشبكة. الاتصالات الصادرة فقط هي التي يمكن أن تعمل.",
-    "Syncthing is restarting.": "يتم إعادة تشغيل Syncthing.",
+    "Syncthing is restarting.": "يعاد تشغيل Syncthing.",
     "Syncthing is saving changes.": "Syncthing يحفظ التعديلات.",
-    "Syncthing is upgrading.": "يتم تطوير Syncthing.",
+    "Syncthing is upgrading.": "نطور Syncthing.",
     "Syncthing now supports automatically reporting crashes to the developers. This feature is enabled by default.": "Syncthing يدعم إعادة التشغيل التلقائي للمطورين. هذه الخاصية مفعلة بشكل افتراضي.",
     "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing معطل على ما يبدو، ربما يكون العطل في شبكتك. إعادة المحاولة…",
     "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing يواجه مشكلة في معالجة طلبك. إذا استعصت المشكلة، أعد تحميل الصفحة رجاء.",
@@ -418,7 +418,7 @@
     "The Syncthing admin interface is configured to allow remote access without a password.": "واجهة مدير Syncthing معدة للسماح بالوصول بغير كلمة مرور.",
     "The aggregated statistics are publicly available at the URL below.": "الإحصاءات المجمعة متاحة للجميع على العنوان التالي.",
     "The cleanup interval cannot be blank.": "المدة بين عمليات التنظيف لا يمكن تركها فارغة.",
-    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "تم حفظ الإعدادات ولكن لم يتم تفعيلها بعد. يجب أعادة تشغيل Syncthing حتى تم تفعيل الإعدادات.",
+    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "حفظت الإعدادات ولكن لم تفعَّل بعد. يجب أعادة تشغيل Syncthing حتى تفعَّل الإعدادات.",
     "The device ID cannot be blank.": "مُعرِّف الجهاز لا يمكن أن يكون فارغاً.",
     "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).": "يمكنك أن تجد مُعرِّف الجهاز الذي ينبغي استخدامه هنا في قائمة \"الإجراءات > عرض المُعرِّف\" على الجهاز الآخر. المسافات والخطوط الاعتراضية تُتجاهَل.",
     "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.": "تقارير الاستخدام المشفرة ترسل يوميا. تُستخدم هذه التقارير لتتبع المنصات الشائعة، أحجام المجلدات، إصدارات التطبيق. إذا تغيرت بنود هذا التقرير، ستواجَهُ بهذه النافذة مرة أخرى.",
@@ -452,7 +452,7 @@
     "There are no devices to share this folder with.": "لا توجد أجهزة أخرى لتشاركها هذا المجلد.",
     "There are no file versions to restore.": "لا توجد إصدارات يمكن استعادتها لهذا الملف.",
     "There are no folders to share with this device.": "لا توجد مجلدات لمشاركتها مع هذا الجهاز.",
-    "They are retried automatically and will be synced when the error is resolved.": "تتم إعادة المحاولة تلقائيًا وسيتم مزامنتها عند إصلاح الخطأ.",
+    "They are retried automatically and will be synced when the error is resolved.": "تُعاد المحاولة تلقائيًا وستزامن عند إصلاح الخطأ.",
     "This Device": "هذا الجهاز",
     "This Month": "هذا الشهر",
     "This can easily give hackers access to read and change any files on your computer.": "هذا قد يسبب في اختراق جهازك.",
@@ -473,7 +473,7 @@
     "Undecided (will prompt)": "غير محدد ( ستظهر نافذة للتحديد لاحقًا )",
     "Unexpected Items": "المحتويات المفاجِئة",
     "Unexpected items have been found in this folder.": "عُثِر على محتويات غير متوقعة في هذا المجلد.",
-    "Unignore": "لا يتم التجاهل",
+    "Unignore": "لا تتجاهل",
     "Unknown": "غير معرف",
     "Unshared": "غير مشترك",
     "Unshared Devices": "الأجهزة غير المُشَارَكة",
@@ -499,7 +499,7 @@
     "Version": "الإصدار",
     "Versions": "نسخ",
     "Versions Path": "مسار النسخ",
-    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "يتم حذف الإصدارات تلقائيًا إذا تجاوزت العمر الأقصى أو تجاوزت عدد الملفات المسموح بها خلال فاصل زمني محدد.",
+    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "تحذف الإصدارات تلقائيًا إذا تجاوزت العمر الأقصى أو تجاوزت عدد الملفات المسموح بها خلال فاصل زمني محدد.",
     "Waiting to Clean": "في انتظار التنظيف",
     "Waiting to Scan": "في انتظار الفحص",
     "Waiting to Sync": "في انتظار المزامنة",

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

@@ -70,12 +70,28 @@
     "Connection Type": "Тып Падлучэння",
     "Connections": "Падлучэнні",
     "Connections via relays might be rate limited by the relay": "Падлучэнні праз рэтранслятар могуць быць абмежаванымі самім рэтранслятарам",
+    "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.": "Працяглы прагляд змен цяпер даступны без Syncthing. Ён выяўляе змены на дыску і скануе толькі мадыфікаваныя шляхі. Перавага метада ў тым, што змены распаўсюджваюцца хучэй і патарабуецца меньшая колькасць поўных сканаванняў.",
+    "Copied from elsewhere": "Скапіявана з іншага месца",
     "Copied from original": "Скапіявана з арыгіналу",
     "Copied!": "Скапіявана!",
     "Copy": "Скапіяваць",
     "Copy failed! Try to select and copy manually.": "Капіяванне не адбылося! Паспрабуйце вылучыць і скапіяваць уласнаручна.",
+    "Currently Shared With Devices": "Ужо Абагулена З Прыладамі",
+    "Custom Range": "Уласны Дыяпазон",
     "Danger!": "Небязпечна!",
+    "Database Location": "Шлях Да Базы Даных",
+    "Debugging Facilities": "Сродкі Адладкі",
+    "Default": "Стандартныя",
+    "Default Configuration": "Стандартныя Налады",
+    "Default Device": "Стандартная Прылада",
+    "Default Folder": "Стандартная Тэчка",
+    "Default Ignore Patterns": "Шаблоны ігнаравання па змаўчанні",
+    "Defaults": "Па змаўчанні",
     "Delete": "Выдаліць",
+    "Delete Unexpected Items": "Выдаліць Нечаканыя Элементы",
+    "Deleted {%file%}": "Выдалены {{file}}",
+    "Deselect All": "Зняць выбар з усіх",
+    "Device": "Прылада",
     "Device ID": "ID прылады",
     "Device Identification": "Ідэнтыфікацыя прылады",
     "Device Name": "Назва прылады",

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

@@ -14,7 +14,7 @@
     "Add devices from the introducer to our device list, for mutually shared folders.": "Afegiu dispositius de l'introductor a la nostra llista de dispositius, per a carpetes compartides mútuament.",
     "Add filter entry": "Afegeix una entrada de filtre",
     "Add ignore patterns": "Afegiu patrons per ignorar",
-    "Add new folder?": "Vols afegir una carpeta nova?",
+    "Add new folder?": "Voleu afegir una carpeta nova?",
     "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.": "A més, s'augmentarà l'interval de reexploració complet (vegades 60, és a dir, el nou predeterminat d'1 h). També podeu configurar-lo manualment per a cada carpeta més tard després de triar No.",
     "Address": "Adreça",
     "Addresses": "Adreces",
@@ -29,15 +29,17 @@
     "Altered by ignoring deletes.": "S'ha alterat ignorant les supressions.",
     "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.": "Una ordre externa gestiona la versió. Ha d'eliminar el fitxer de la carpeta compartida. Si el camí a l'aplicació conté espais, s'ha de citar.",
     "Anonymous Usage Reporting": "Informe anònim d'ús",
-    "Anonymous usage report format has changed. Would you like to move to the new format?": "El format de l'informe d'ús anònim ha canviat. Vols canviar a aquest nou format?",
+    "Anonymous usage report format has changed. Would you like to move to the new format?": "El format de l'informe d'ús anònim ha canviat. Voleu canviar a aquest nou format?",
+    "Applied to LAN": "Aplicat a LAN",
     "Apply": "Aplica",
     "Are you sure you want to override all remote changes?": "Esteu segur que voleu anul·lar tots els canvis remots?",
-    "Are you sure you want to permanently delete all these files?": "Estàs segur que vols esborrar tots aquests fitxers permanentment?",
-    "Are you sure you want to remove device {%name%}?": "Estàs segur que vols esborrar el dispositiu {{name}}?",
-    "Are you sure you want to remove folder {%label%}?": "Estàs segur que vols esborrar la carpeta {{label}}?",
-    "Are you sure you want to restore {%count%} files?": "Estàs segur que vols restaurar {{count}} fitxers?",
+    "Are you sure you want to permanently delete all these files?": "Segur que voleu esborrar tots aquests fitxers permanentment?",
+    "Are you sure you want to remove device {%name%}?": "Segur que voleu eliminar el dispositiu {{name}}?",
+    "Are you sure you want to remove folder {%label%}?": "Segur que voleu eliminar la carpeta {{label}}?",
+    "Are you sure you want to restore {%count%} files?": "Segur que voleu restaurar {{count}} fitxers?",
     "Are you sure you want to revert all local changes?": "Esteu segur que voleu revertir tots els canvis locals?",
     "Are you sure you want to upgrade?": "Esteu segur que voleu actualitzar?",
+    "Authentication Required": "Autenticació necessària",
     "Authors": "Autors",
     "Auto Accept": "Auto Acceptar",
     "Automatic Crash Reporting": "Informe automàtic d'incidències",
@@ -55,7 +57,7 @@
     "Cleaning Versions": "Netejant versions",
     "Cleanup Interval": "Interval de neteja",
     "Click to see full identification string and QR code.": "Feu clic per veure la cadena d'identificació completa i el codi QR.",
-    "Close": "Tancar",
+    "Close": "Tanca",
     "Command": "Comando",
     "Comment, when used at the start of a line": "Comentari quan és usat al principi d'una línia",
     "Compression": "Compressió",
@@ -64,6 +66,7 @@
     "Configured": "Configurat",
     "Connected (Unused)": "Connectat (no utilitzat)",
     "Connection Error": "Error de connexió",
+    "Connection Management": "Gestió de connexions",
     "Connection Type": "Tipus de connexió",
     "Connections": "Connexions",
     "Connections via relays might be rate limited by the relay": "Les connexions mitjançant relés poden estar limitades pel relé",
@@ -91,11 +94,12 @@
     "Deselect devices to stop sharing this folder with.": "Desseleccioneu els dispositius amb els quals deixar de compartir aquesta carpeta.",
     "Deselect folders to stop sharing with this device.": "Desseleccioneu les carpetes per deixar de compartir-les amb aquest dispositiu.",
     "Device": "Dispositiu",
-    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "El dispositiu \"{{name}}\" ({{device}} a {{address}}) vol connectar-se. Vols afegir un dispositiu nou?",
+    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "El dispositiu «{{name}}⁣» ({{device}}⁣ a {{address}}) vol connectar-se. Voleu afegir un dispositiu nou?",
     "Device Certificate": "Certificat del dispositiu",
     "Device ID": "ID del dispositiu",
     "Device Identification": "Identificació del dispositiu",
     "Device Name": "Nom del dispositiu",
+    "Device Status": "Estat del dispositiu",
     "Device is untrusted, enter encryption password": "El dispositiu no és de confiança, introduïu la contrasenya d'encriptació",
     "Device rate limits": "Límits de velocitat del dispositiu",
     "Device that last modified the item": "Dispositiu que ha modificat el fitxer per última vegada",
@@ -118,13 +122,13 @@
     "Do not add it to the ignore list, so this notification may recur.": "No l'afegiu a la llista d'ignorar, de manera que aquesta notificació pot repetir-se.",
     "Do not restore": "No restaurar",
     "Do not restore all": "No restaurar-ho tot",
-    "Do you want to enable watching for changes for all your folders?": "Vols activar la cerca de canvis a totes les teves carpetes?",
+    "Do you want to enable watching for changes for all your folders?": "Voleu activar el control de canvis a totes les carpetes?",
     "Documentation": "Documentació",
     "Download Rate": "Tasca de descarrega",
     "Downloaded": "Descarregat",
     "Downloading": "Descarregant",
-    "Edit": "Editar",
-    "Edit Device": "Editar dispositiu",
+    "Edit": "Edita",
+    "Edit Device": "Edita el dispositiu",
     "Edit Device Defaults": "Edita els valors predeterminats del dispositiu",
     "Edit Folder": "Modificar carpeta",
     "Edit Folder Defaults": "Edita els valors per defecte de la carpeta",
@@ -165,8 +169,9 @@
     "Folder ID": "ID de carpeta",
     "Folder Label": "Etiqueta de la carpeta",
     "Folder Path": "Camí de carpeta",
+    "Folder Status": "Estat de la carpeta",
     "Folder Type": "Tipus de carpeta",
-    "Folder type \"{%receiveEncrypted%}\" can only be set when adding a new folder.": "El tipus de carpeta \"{{receiveEncrypted}}\" només es pot definir quan s'afegeix una carpeta nova.",
+    "Folder type \"{%receiveEncrypted%}\" can only be set when adding a new folder.": "El tipus de carpeta «⁣{{receiveEncrypted}}» només es pot definir quan s'afegeix una carpeta nova.",
     "Folder type \"{%receiveEncrypted%}\" cannot be changed after adding the folder. You need to remove the folder, delete or decrypt the data on disk, and add the folder again.": "El tipus de carpeta \"{{receiveEncrypted}}\" no es pot canviar després d'afegir la carpeta. Heu d'eliminar la carpeta, suprimir o desxifrar les dades del disc i tornar a afegir la 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.": "A les carpetes següents s'ha produït un error en començar a buscar canvis. Es tornarà a provar cada minut, de manera que els errors poden desaparèixer aviat. Si persisteixen, intenteu solucionar el problema subjacent i demaneu ajuda si no podeu.",
@@ -182,8 +187,8 @@
     "GUI Theme": "Tema de la GUI",
     "General": "General",
     "Generate": "Generar",
-    "Global Discovery": "Descobriment Global",
-    "Global Discovery Servers": "Servidors de Descobriment Global",
+    "Global Discovery": "Descobriment global",
+    "Global Discovery Servers": "Servidors de descobriment global",
     "Global State": "Estat global",
     "Help": "Ajuda",
     "Hint: only deny-rules detected while the default is deny. Consider adding \"permit any\" as last rule.": "Suggeriment: només s'han detectat regles de denegació mentre el valor predeterminat és denegació. Penseu a afegir \"permet qualsevol\" com a darrera regla.",
@@ -202,9 +207,11 @@
     "Included Software": "Programari inclòs",
     "Incoming Rate Limit (KiB/s)": "Límit de velocitat d'entrada (KiB/s)",
     "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Una configuració incorrecta pot malmetre els continguts de la teva carpeta i que Syncthing esdevingui inoperatiu.",
+    "Incorrect user name or password.": "Nom d'usuari o contrasenya incorrecta.",
     "Internally used paths:": "Camins utilitzats internament:",
     "Introduced By": "Introduït per",
     "Introducer": "Introductor",
+    "Introduction": "Introducció",
     "Inversion of the given condition (i.e. do not exclude)": "Inversió del patrò introduït",
     "Keep Versions": "Mantenir Versions",
     "LDAP": "LDAP",
@@ -224,13 +231,18 @@
     "Loading data...": "Carregant dades...",
     "Loading...": "Carregant...",
     "Local Additions": "Addicions locals",
-    "Local Discovery": "Descobriment Local",
+    "Local Discovery": "Descobriment local",
     "Local State": "Estat local",
     "Local State (Total)": "Estat local (Total)",
     "Locally Changed Items": "Elements canviats localment",
     "Log": "Registre",
     "Log File": "Fitxer de registre",
+    "Log In": "Inicia la sessió",
+    "Log Out": "Tanca la sessió",
+    "Log in to see paths information.": "Inicieu sessió per veure la informació dels camins.",
+    "Log in to see version information.": "Inicieu sessió per veure la informació de la versió.",
     "Log tailing paused. Scroll to the bottom to continue.": "S'ha posat en pausa el seguiment del registre. Desplaceu-vos cap a la part inferior per continuar.",
+    "Login failed, see Syncthing logs for details.": "No s'ha pogut iniciar la sessió; consulteu els registres de Syncthing per obtenir més informació.",
     "Logs": "Registres",
     "Major Upgrade": "Actualització major",
     "Mass actions": "Accions massives",
@@ -255,8 +267,9 @@
     "No files will be deleted as a result of this operation.": "No se suprimirà cap fitxer com a resultat d'aquesta operació.",
     "No rules set": "No hi ha regles establertes",
     "No upgrades": "No hi ha actualitzacions",
-    "Not shared": "No compartit",
+    "Not shared": "Sense compartir",
     "Notice": "Avís",
+    "Number of Connections": "Nombre de connexions",
     "OK": "D'acord",
     "Off": "Desactivar",
     "Oldest First": "Més antic primer",
@@ -268,13 +281,14 @@
     "Override": "Sobreescriu",
     "Override Changes": "Sobreescriure Canvis",
     "Ownership": "Propietat",
+    "Password": "Contrasenya",
     "Path": "Ruta",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Ruta de la carpeta a l'equip local. Si no existeix serà creada. El caràcter (~) es pot fer servir com a drecera de",
     "Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).": "Ruta on s'han d'emmagatzemar les versions (deixeu buit per al directori predeterminat .stversions a la carpeta compartida).",
     "Paths": "Rutes",
-    "Pause": "Pausa",
+    "Pause": "Posa-ho en pausa",
     "Pause All": "Posa-ho tot en pausa",
-    "Paused": "Pausat",
+    "Paused": "En pausa",
     "Paused (Unused)": "En pausa (no utilitzat)",
     "Pending changes": "Canvis pendents",
     "Periodic scanning at given interval and disabled watching for changes": "Escaneig periòdic a un interval determinat i vigilància desactivada dels canvis",
@@ -294,8 +308,8 @@
     "QUIC WAN": "Connexió QUIC WAN",
     "Quick guide to supported patterns": "Guia ràpida per als possibles patrons",
     "Random": "Aleatori",
-    "Receive Encrypted": "Rebre xifrat",
-    "Receive Only": "Només rebre",
+    "Receive Encrypted": "Rep xifrat",
+    "Receive Only": "Només rep",
     "Received data is already encrypted": "Les dades rebudes ja estan xifrades",
     "Recent Changes": "Canvis recents",
     "Reduced by ignore patterns": "Reduït per ignorar patrons",
@@ -309,20 +323,21 @@
     "Remove Device": "Elimina el dispositiu",
     "Remove Folder": "Elimina la carpeta",
     "Required identifier for the folder. Must be the same on all cluster devices.": "Identificador obligatori per a la carpeta. Ha de ser el mateix en tots els dispositius del clúster.",
-    "Rescan": "Re-escanejar",
-    "Rescan All": "Re-escanejar tot",
+    "Rescan": "Reescaneja",
+    "Rescan All": "Reescaneja-ho tot",
     "Rescans": "Escaneja de nou",
-    "Restart": "Reiniciar",
-    "Restart Needed": "És Necessari Reiniciar",
-    "Restarting": "Reiniciant",
+    "Restart": "Reinicia",
+    "Restart Needed": "Cal un reinici",
+    "Restarting": "S'està reiniciant",
     "Restore": "Restaura",
     "Restore Versions": "Restaura versions",
-    "Resume": "Reprendre",
-    "Resume All": "Reprèn tot",
+    "Resume": "Reprèn-ho",
+    "Resume All": "Reprèn-ho tot",
     "Reused": "Reutilitzat",
     "Revert": "Reverteix",
     "Revert Local Changes": "Reverteix els canvis locals",
-    "Save": "Guardar",
+    "Save": "Desa",
+    "Saving changes": "S'estan desant els canvis",
     "Scan Time Remaining": "Temps d'escanejat restant",
     "Scanning": "Escanejant",
     "See external versioning help for supported templated command line parameters.": "Consulteu l'ajuda de versions externa per als paràmetres de línia d'ordres de plantilla compatibles.",
@@ -332,28 +347,28 @@
     "Select additional folders to share with this device.": "Seleccioneu carpetes addicionals per compartir amb aquest dispositiu.",
     "Select latest version": "Seleccioneu la darrera versió",
     "Select oldest version": "Seleccioneu la versió més antiga",
-    "Send & Receive": "Enviar i rebre",
+    "Send & Receive": "Envia i rep",
     "Send Extended Attributes": "Envia atributs ampliats",
-    "Send Only": "Només enviar",
+    "Send Only": "Només envia",
     "Send Ownership": "Envia la propietat",
     "Set Ignores on Added Folder": "Estableix filtres per ignorar a la carpeta afegida",
     "Settings": "Preferències",
-    "Share": "Compartir",
-    "Share Folder": "Compartir carpeta",
+    "Share": "Comparteix",
+    "Share Folder": "Comparteix la carpeta",
     "Share by Email": "Comparteix per correu electrònic",
     "Share by SMS": "Comparteix per SMS",
-    "Share this folder?": "Compartir aquesta carpeta?",
+    "Share this folder?": "Voleu compartir la carpeta?",
     "Shared Folders": "Carpetes compartides",
-    "Shared With": "Compartir Amb",
+    "Shared With": "Compartida amb",
     "Sharing": "Compartint",
-    "Show ID": "Mostrar ID",
+    "Show ID": "Mostra l'ID",
     "Show QR": "Mostra QR",
     "Show detailed discovery status": "Mostra l'estat detallat del descobriment",
     "Show detailed listener status": "Mostra l'estat detallat de l'oient",
     "Show diff with previous version": "Mostra la diferència amb la versió anterior",
     "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Mostrat en comptes del ID del Node en l'estat del cluster. Serà advertit als altres dispositius com un nom opcional per defecte.",
     "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Mostrat en comptes del ID del Node en l'estat del cluster. S'actualitzarà al nom del dispositiu si es deixa buit.",
-    "Shutdown": "Apagar",
+    "Shutdown": "Apaga",
     "Shutdown Complete": "Apagat complet",
     "Simple": "Simple",
     "Simple File Versioning": "Versionat de Fitxers Senzill",
@@ -369,8 +384,9 @@
     "Stable releases only": "Només versions estables",
     "Staggered": "Esglaonat",
     "Staggered File Versioning": "Versionat de Fitxers Esglaonat",
-    "Start Browser": "Arrancar Navegador",
+    "Start Browser": "Inicia el navegador",
     "Statistics": "Estadístiques",
+    "Stay logged in": "Mantén la sessió iniciada",
     "Stopped": "Aturat",
     "Stores and syncs only encrypted data. Folders on all connected devices need to be set up with the same password or be of type \"{%receiveEncrypted%}\" too.": "Emmagatzema i sincronitza només dades encriptades. Les carpetes de tots els dispositius connectats s'han de configurar amb la mateixa contrasenya o també ser del tipus \"{{receiveEncrypted}}\".",
     "Subject:": "Assumpte:",
@@ -382,17 +398,18 @@
     "Sync Status": "Estat de sincronització",
     "Syncing": "Synthing",
     "Syncthing device ID for \"{%devicename%}\"": "ID del dispositiu Syncthing amb el nom \"{{devicename}}\"",
-    "Syncthing has been shut down.": "S'ha aturat el synthing.",
+    "Syncthing has been shut down.": "Synthing s'ha aturat.",
     "Syncthing includes the following software or portions thereof:": "Syncthing inclou el següent programari o parts dels mateixos:",
     "Syncthing is Free and Open Source Software licensed as MPL v2.0.": "Syncthing és un programari lliure i de codi obert amb llicència MPL v2.0.",
     "Syncthing is a continuous file synchronization program. It synchronizes files between two or more computers in real time, safely protected from prying eyes. Your data is your data alone and you deserve to choose where it is stored, whether it is shared with some third party, and how it's transmitted over the internet.": "Syncthing és un programa de sincronització contínua de fitxers. Sincronitza fitxers entre dos o més ordinadors en temps real, protegit de manera segura de mirades indiscretes. Les vostres dades són només les vostres i mereixeu triar on s'emmagatzemen, si es comparteixen amb un tercer i com es transmeten per Internet.",
     "Syncthing is listening on the following network addresses for connection attempts from other devices:": "La sincronització està escoltant a les adreces de xarxa següents els intents de connexió des d'altres dispositius:",
     "Syncthing is not listening for connection attempts from other devices on any address.  Only outgoing connections from this device may work.": "La sincronització no és escoltar els intents de connexió d'altres dispositius a cap adreça.  Només poden funcionar les connexions sortints d'aquest dispositiu.",
-    "Syncthing is restarting.": "Reiniciant syncthing.",
+    "Syncthing is restarting.": "Syncthing s'està reiniciant.",
+    "Syncthing is saving changes.": "Syncthing està desant els canvis.",
     "Syncthing is upgrading.": "Actualitzant syncthing.",
     "Syncthing now supports automatically reporting crashes to the developers. This feature is enabled by default.": "Syncthing ara admet la notificació automàtica d'errors als desenvolupadors. Aquesta funció està activada per defecte.",
     "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Sembla que Syncthing no està funcionant o hi ha un problema amb la connexió a Internet. S'està tornant a provar…",
-    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Sembla ser que Syncthing està tinguent problemes per processar la teva petició. Si us plau, refresca la pàgina o reinicia Syncthing si el problema persisteix.",
+    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Sembla que Syncthing està tenint problemes per a processar la petició. Recarregueu la pàgina o reinicieu Syncthing si el problema persisteix.",
     "TCP LAN": "Connexió TCP LAN",
     "TCP WAN": "Connexió TCP WAN",
     "Take me back": "Porta'm enrere",
@@ -401,7 +418,7 @@
     "The Syncthing admin interface is configured to allow remote access without a password.": "La interfície d'administració de Syncthing està configurada per permetre l'accés remot sense contrasenya.",
     "The aggregated statistics are publicly available at the URL below.": "Les estadístiques agregades estan disponibles públicament a l'URL següent.",
     "The cleanup interval cannot be blank.": "L'interval de neteja no pot estar en blanc.",
-    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "La configuració s'ha guardar però no s'ha activat. S'ha de reiniciar el synthing per activar la nova configuració.",
+    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "La configuració s'ha desat, però no s'ha activat. S'ha de reiniciar el Synthing per a activar la configuració nova.",
     "The device ID cannot be blank.": "El ID del dispositiu no pot estar en blanc.",
     "The device ID to enter here can be found in the \"Actions > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "L'identificador del dispositiu que cal introduir aquí es pot trobar al diàleg \"Accions > Mostra l'ID\" de l'altre dispositiu. Els espais i els guions són opcionals (ignorats).",
     "The encrypted usage report is sent daily. It is used to track common platforms, folder sizes, and app versions. If the reported data set is changed you will be prompted with this dialog again.": "L'informe d'ús encriptat s'envia diàriament. Es fa servir per rastrejar plataformes habituals, mides de carpetes i versions de l'aplicació. Si es canvia el conjunt de dades reportades es demanarà amb aquest diàleg de nou.",
@@ -421,11 +438,13 @@
     "The interval, in seconds, for running cleanup in the versions directory. Zero to disable periodic cleaning.": "L'interval, en segons, per executar la neteja al directori de versions. Zero per desactivar la neteja periòdica.",
     "The maximum age must be a number and cannot be blank.": "La màxima antiguitat ha de ser un número i no pot estar en blanc.",
     "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Temps màxim en mantenir una versió (en dies, si es deixa en 0 es mantenen les versions per sempre).",
+    "The number of connections must be a non-negative number.": "El nombre de connexions ha de ser un nombre no negatiu.",
     "The number of days must be a number and cannot be blank.": "El nombre de dies ha de ser un número i no pot estar en blanc.",
     "The number of days to keep files in the trash can. Zero means forever.": "El nombre de dies per guardar els fitxers a la paperera. Zero significa per sempre.",
     "The number of old versions to keep, per file.": "El nombre de versions antigues que es mantenen per fitxer.",
     "The number of versions must be a number and cannot be blank.": "El nombre de versions ha de ser un número i no es pot deixar en blanc.",
     "The path cannot be blank.": "El camí no pot estar en blanc.",
+    "The rate limit is applied to the accumulated traffic of all connections to this device.": "El límit de velocitat s'aplica al trànsit acumulat de totes les connexions a aquest dispositiu.",
     "The rate limit must be a non-negative number (0: no limit)": "El límit de velocitat ha de ser un nombre positiu (0: sense límit)",
     "The remote device has not accepted sharing this folder.": "El dispositiu remot no ha acceptat compartir aquesta carpeta.",
     "The remote device has paused this folder.": "El dispositiu remot ha posat en pausa aquesta carpeta.",
@@ -456,7 +475,7 @@
     "Unexpected items have been found in this folder.": "S'han trobat elements inesperats en aquesta carpeta.",
     "Unignore": "No ignorar",
     "Unknown": "Desconegut",
-    "Unshared": "No compartit",
+    "Unshared": "Sense compartir",
     "Unshared Devices": "Dispositius no compartits",
     "Unshared Folders": "Carpetes no compartides",
     "Untrusted": "No fiable",
@@ -470,8 +489,11 @@
     "Usage reporting is always enabled for candidate releases.": "Els informes d'ús sempre estan activats per a les versions candidates.",
     "Use HTTPS for GUI": "Utilitzar HTTPS pel GUI",
     "Use notifications from the filesystem to detect changed items.": "Utilitzeu les notificacions del sistema de fitxers per detectar elements canviats.",
+    "User": "Usuari",
     "User Home": "Carpeta d'inici de l'usuari",
-    "Username/Password has not been set for the GUI authentication. Please consider setting it up.": "El nom d'usuari/contrasenya no s'ha establert per a l'autenticació de la GUI. Penseu en configurar-lo.",
+    "Username/Password has not been set for the GUI authentication. Please consider setting it up.": "El nom d'usuari/contrasenya no s'ha establert per a l'autenticació de la GUI. Penseu a configurar-lo.",
+    "Using a QUIC connection over LAN": "Utilitzant una connexió QUIC per LAN",
+    "Using a QUIC connection over WAN": "Utilitzant una connexió QUIC a través de WAN",
     "Using a direct TCP connection over LAN": "Utilitzant una connexió TCP directa per LAN",
     "Using a direct TCP connection over WAN": "Utilitzant una connexió TCP directa a través de WAN",
     "Version": "Versió",
@@ -492,6 +514,7 @@
     "Watching for changes discovers most changes without periodic scanning.": "Observant els canvis descobreix la majoria dels canvis sense escanejar periòdicament.",
     "When adding a new device, keep in mind that this device must be added on the other side too.": "Quan s'afegeix un nou dispositiu, recorda que aquest dispositiu tambè s'ha d'afegir a l'altre banda.",
     "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Quan s'afegeix una nova carpeta recorda que el ID d'aquesta s'utilitza per lligar repositoris entre els dispositius. Es distingeix entre majúscules i minúscules i ha de ser exactament iguals entre tots els dispositius.",
+    "When set to more than one on both devices, Syncthing will attempt to establish multiple concurrent connections. If the values differ, the highest will be used. Set to zero to let Syncthing decide.": "Quan s'estableix en més d'un als dos dispositius, Syncthing intentarà establir diverses connexions simultànies. Si els valors són diferents, s'utilitzarà el més alt. Establiu a zero per deixar que Sincronització decideixi.",
     "Yes": "Si",
     "Yesterday": "Ahir",
     "You can also copy and paste the text into a new message manually.": "També podeu copiar i enganxar el text en un missatge nou manualment.",
@@ -499,8 +522,8 @@
     "You can change your choice at any time in the Settings dialog.": "Pots canviar la teva elecció en qualsevol moment al quadre de preferències.",
     "You can read more about the two release channels at the link below.": "Podeu llegir més sobre els dos canals de llançament a l'enllaç següent.",
     "You have no ignored devices.": "No teniu cap dispositiu ignorat.",
-    "You have no ignored folders.": "No tens carpetes compartides.",
-    "You have unsaved changes. Do you really want to discard them?": "Tens canvis no desats. Realment les voleu descartar?",
+    "You have no ignored folders.": "No teniu carpetes ignorades.",
+    "You have unsaved changes. Do you really want to discard them?": "Teniu canvis no desats. Realment els voleu descartar?",
     "You must keep at least one version.": "Has de mantenir com a mínim una versió.",
     "You should never add or change anything locally in a \"{%receiveEncrypted%}\" folder.": "Mai no hauríeu d'afegir ni canviar res localment a una carpeta \"{{receiveEncrypted}}\".",
     "Your SMS app should open to let you choose the recipient and send it from your own number.": "La vostra aplicació SMS s'hauria d'obrir per permetre't triar el destinatari i enviar-lo des del teu propi número.",
@@ -525,6 +548,7 @@
             "light": "Clar"
         }
     },
+    "unknown device": "dispositiu desconegut",
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} vol compartir la carpeta \"{{folder}}\".",
     "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} vol compartir la carpeta \"{{folderlabel}}\" ({{folder}}).",
     "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} podria tornar a introduir aquest dispositiu."

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

@@ -1,5 +1,5 @@
 {
-    "A device with that ID is already added.": "Zařízení s takovým identifikátorem už je přidáno.",
+    "A device with that ID is already added.": "Zařízení s takovým identifikátorem je již přidáno.",
     "A negative number of days doesn't make sense.": "Záporný počet dní nedává smysl.",
     "A new major version may not be compatible with previous versions.": "Nová hlavní verze nemusí být kompatibilní s předchozími verzemi.",
     "API Key": "Klíč k API",
@@ -11,93 +11,95 @@
     "Add Device": "Přidat zařízení",
     "Add Folder": "Přidat složku",
     "Add Remote Device": "Přidat vzdálené zařízení",
-    "Add devices from the introducer to our device list, for mutually shared folders.": "Přidat zařízení z uvaděče do místního seznamu zařízení a získat tak vzájemně sdílené složky.",
-    "Add filter entry": "Přidej filtr",
-    "Add ignore patterns": "Přidat vzory ignorovaného",
+    "Add devices from the introducer to our device list, for mutually shared folders.": "Přidat zařízení od zavaděče do našeho seznamu zařízení pro vzájemné sdílení složek.",
+    "Add filter entry": "Přidat položku filtru",
+    "Add ignore patterns": "Přidat vzory ignorování",
     "Add new folder?": "Přidat novou složku?",
-    "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.": "Dále bude prodloužen interval mezi plnými skeny (60krát, t.j. nová výchozí hodnota 1h). V případě, že nyní zvolíte Ne, stále ještě toto později můžete u každé složky jednotlivě ručně upravit.",
+    "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.": "Kromě toho se prodlouží interval úplného opětovného skenování (60krát, t.j. nová výchozí hodnota 1h). Také to můžete později nastavit ručně pro každou složku, pokud zvolíte Ne.",
     "Address": "Adresa",
     "Addresses": "Adresy",
-    "Advanced": "Pokročilé",
-    "Advanced Configuration": "Pokročilá nastavení",
+    "Advanced": "Rozšířené",
+    "Advanced Configuration": "Rozšířená nastavení",
     "All Data": "Všechna data",
     "All Time": "Celou dobu",
-    "All folders shared with this device must be protected by a password, such that all sent data is unreadable without the given password.": "Všechny složky sdílené s tímto zařízením musí být chráněna heslem, aby byla odesílaná data bez hesla nečitelná.",
+    "All folders shared with this device must be protected by a password, such that all sent data is unreadable without the given password.": "Všechny složky sdílené s tímto zařízením musí být chráněny heslem, aby všechna odesílaná data byla bez zadaného hesla nečitelná.",
     "Allow Anonymous Usage Reporting?": "Povolit anonymní hlášení o používání?",
-    "Allowed Networks": "Sítě, ze kterých je umožněn přístup",
-    "Alphabetic": "Abecední",
-    "Altered by ignoring deletes.": "Změněno pomocí vzorů ignorovaného.",
-    "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.": "Správu verzí obstarává externí příkaz. U toho je třeba, aby neaktuální soubory jím byly odsouvány pryč ze sdílené složky. Pokud popis umístění tohoto příkazu obsahuje mezeru, je třeba popis umístění uzavřít do uvozovek.",
+    "Allowed Networks": "Povolené sítě",
+    "Alphabetic": "Abecedně",
+    "Altered by ignoring deletes.": "Změněno ignorováním odstraněných.",
+    "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.": "Verzování obstarává externí příkaz. Ten musí odebrat soubor ze sdílené složky. Pokud cesta k aplikaci obsahuje mezery, je potřeba ji uvést v uvozovkách.",
     "Anonymous Usage Reporting": "Anonymní hlášení o používání",
-    "Anonymous usage report format has changed. Would you like to move to the new format?": "Formát anonymního hlášení o používání byl změněn. Chcete přejít na nový formát?",
-    "Applied to LAN": "Použité pro místní síť",
-    "Apply": "Aplikovat",
-    "Are you sure you want to override all remote changes?": "Skutečně si přejete přebít všechny vzdálené změny?",
-    "Are you sure you want to permanently delete all these files?": "Skutečně chcete smazat všechny tyto soubory?",
+    "Anonymous usage report format has changed. Would you like to move to the new format?": "Formát anonymního hlášení o používání se změnil. Chcete přejít na nový formát?",
+    "Applied to LAN": "Použité pro LAN",
+    "Apply": "Použít",
+    "Are you sure you want to override all remote changes?": "Opravdu chcete přepsat všechny vzdálené změny?",
+    "Are you sure you want to permanently delete all these files?": "Opravdu chcete trvale odstranit všechny tyto soubory?",
     "Are you sure you want to remove device {%name%}?": "Opravdu chcete odebrat zařízení {{name}}?",
     "Are you sure you want to remove folder {%label%}?": "Opravdu chcete odebrat složku {{label}}?",
     "Are you sure you want to restore {%count%} files?": "Opravdu chcete obnovit {{count}} souborů?",
-    "Are you sure you want to revert all local changes?": "Skutečně si přejete vrátit všechny lokální změny?",
-    "Are you sure you want to upgrade?": "Skutečně chcete provést aktualizaci?",
-    "Authentication Required": "Autentizace vyžadována",
+    "Are you sure you want to revert all local changes?": "Opravdu chcete vrátit všechny místní změny?",
+    "Are you sure you want to upgrade?": "Opravdu chcete provést aktualizaci?",
+    "Authentication Required": "Požadováno ověření",
     "Authors": "Autoři",
     "Auto Accept": "Přijmout automaticky",
     "Automatic Crash Reporting": "Automatické hlášení pádů",
-    "Automatic upgrade now offers the choice between stable releases and release candidates.": "Automatická aktualizace nyní nabízí volbu mezi stabilními vydáními a kandidáty na ně.",
+    "Automatic upgrade now offers the choice between stable releases and release candidates.": "Automatická aktualizace nyní nabízí výběr mezi stabilními vydáními a kandidáty na vydání.",
     "Automatic upgrades": "Automatické aktualizace",
     "Automatic upgrades are always enabled for candidate releases.": "Automatické aktualizace jsou vždy povolené u kandidátů na vydání.",
-    "Automatically create or share folders that this device advertises at the default path.": "Automaticky vytvářet nebo sdílet složky, které toto zařízení propaguje ve výchozím popisu umístění.",
-    "Available debug logging facilities:": "Dostupná logovací zařízení pro ladění:",
+    "Automatically create or share folders that this device advertises at the default path.": "Automaticky vytvářet nebo sdílet složky, které toto zařízení propaguje ve výchozí cestě.",
+    "Available debug logging facilities:": "Dostupné možnosti protokolování ladění:",
     "Be careful!": "Buďte opatrní!",
+    "Body:": "Obsah:",
     "Bugs": "Chyby",
     "Cancel": "Zrušit",
     "Changelog": "Seznam změn",
     "Clean out after": "Vyčistit po",
-    "Cleaning Versions": "Mazání verzí",
-    "Cleanup Interval": "Interval mazání",
-    "Click to see full identification string and QR code.": "Kliknutím zobrazíte úplnou identifikaci a QR kód.",
+    "Cleaning Versions": "Čištění verzí",
+    "Cleanup Interval": "Interval čištění",
+    "Click to see full identification string and QR code.": "Kliknutím zobrazíte celý identifikační řetězec a QR kód.",
     "Close": "Zavřít",
     "Command": "Příkaz",
-    "Comment, when used at the start of a line": "Pokud použito na jeho začátku, je řádek považován za komentář",
+    "Comment, when used at the start of a line": "Považováno za komentář, pokud je použito na začátku řádku",
     "Compression": "Komprese",
-    "Configuration Directory": "Konfigurační složka",
+    "Configuration Directory": "Konfigurační adresář",
     "Configuration File": "Konfigurační soubor",
     "Configured": "Nastaveno",
-    "Connected (Unused)": "Připojeno (nepoužité)",
+    "Connected (Unused)": "Připojeno (nepoužito)",
     "Connection Error": "Chyba připojení",
     "Connection Management": "Správa připojení",
     "Connection Type": "Typ připojení",
-    "Connections": "Spojení",
-    "Connections via relays might be rate limited by the relay": "Připojení přes přenašeč může být přenašečem omezena rychlost",
-    "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.": "Syncthing nyní umožňuje nepřetržité sledování změn. To zachytí změny na úložišti a spustí sken pouze pro umístění, ve kterých se něco změnilo. Výhodami jsou rychlejší propagace změn a méně plných skenů.",
+    "Connections": "Připojení",
+    "Connections via relays might be rate limited by the relay": "Připojení přes relé může být omezeno rychlostí relé",
+    "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.": "Syncthing nyní umožňuje průběžné sledování změn. To zachytí změny na disku a provede skenování pouze změněných cest. Výhodou je rychlejší šíření změn a menší počet úplných skenování.",
     "Copied from elsewhere": "Zkopírováno odjinud",
     "Copied from original": "Zkopírováno z originálu",
     "Copied!": "Zkopírováno!",
     "Copy": "Kopírovat",
-    "Copy failed! Try to select and copy manually.": "Kopírování selhalo! Zkuste vybrat a zkopírovat manuálně.",
+    "Copy failed! Try to select and copy manually.": "Kopírování selhalo! Zkuste vybrat a zkopírovat ručně.",
     "Currently Shared With Devices": "Aktuálně sdíleno se zařízeními",
-    "Custom Range": "Přesný rozsah",
+    "Custom Range": "Vlastní rozsah",
     "Danger!": "Nebezpečí!",
     "Database Location": "Umístění databáze",
     "Debugging Facilities": "Nástroje pro ladění",
     "Default": "Výchozí",
-    "Default Configuration": "Výchozí nastavení",
+    "Default Configuration": "Výchozí konfigurace",
     "Default Device": "Výchozí zařízení",
     "Default Folder": "Výchozí složka",
-    "Default Ignore Patterns": "Výchozí vzory ignorovaného",
+    "Default Ignore Patterns": "Výchozí vzory ignorování",
     "Defaults": "Výchozí hodnoty",
-    "Delete": "Smazat",
-    "Delete Unexpected Items": "Smazat neočekávané položky",
-    "Deleted {%file%}": "Smazáno {{file}}",
+    "Delete": "Odstranit",
+    "Delete Unexpected Items": "Odstranit neočekávané položky",
+    "Deleted {%file%}": "Odstraněn {{file}}",
     "Deselect All": "Zrušit výběr všeho",
-    "Deselect devices to stop sharing this folder with.": "Zrušte výběr zařízení, se kterými již nemá být tato složka sdílena.",
-    "Deselect folders to stop sharing with this device.": "Zrušte výběr složek, které se mají přestat sdílet s tímto zařízením.",
+    "Deselect devices to stop sharing this folder with.": "Zrušením výběru zařízení s ním přestanete tuto složku sdílet.",
+    "Deselect folders to stop sharing with this device.": "Zrušením výběru složek zastavíte sdílení s tímto zařízením.",
     "Device": "Zařízení",
     "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Zařízení „{{name}}“ ({{device}} na {{address}}) se chce připojit. Přidat nové zařízení?",
     "Device Certificate": "Certifikát zařízení",
     "Device ID": "Identifikátor zařízení",
     "Device Identification": "Identifikace zařízení",
     "Device Name": "Název zařízení",
+    "Device Status": "Stav zařízení",
     "Device is untrusted, enter encryption password": "Zařízení nemá důvěru, zadejte šifrovací heslo.",
     "Device rate limits": "Omezení přenosové rychlosti pro zařízení",
     "Device that last modified the item": "Zařízení, které položku změnilo naposledy",
@@ -153,7 +155,7 @@
     "Failed to load file versions.": "Nepodařilo se nahrát verze souboru.",
     "Failed to load ignore patterns.": "Načtení vzorů ignorovaného se nezdařilo.",
     "Failed to setup, retrying": "Nastavování se nezdařilo, zkouší se znovu",
-    "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Je v pořádku, když připojení k IPv6 serverům nezdaří, pokud není k dispozici IPv6 konektivita.",
+    "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Je v pořádku, když se připojení k IPv6 serverům nezdaří, pokud není k dispozici IPv6 konektivita.",
     "File Pull Order": "Pořadí stahování souborů",
     "File Versioning": "Správa verzí souborů",
     "Files are moved to .stversions directory when replaced or deleted by Syncthing.": "Při nahrazování nebo mazání aplikací Syncthing jsou původní soubory přesunuty do složky .stversions.",
@@ -475,8 +477,8 @@
     "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "Varování, tento popis umístění je nadřazenou složkou existující „{{otherFolder}}“.",
     "Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Varování, tento popis umístění je nadřazenou složkou existující „{{otherFolderLabel}}“ ({{otherFolder}}).",
     "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Varování: toto umístění je podsložkou existující „{{otherFolder}}“.",
-    "Warning, this path is a subdirectory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Varování, toto umístění e podsložkou existující „{{otherFolderLabel}}“ ({{otherFolder}}).",
-    "Warning: If you are using an external watcher like {%syncthingInotify%}, you should make sure it is deactivated.": "Pozor: Pokud používáte externí sledování změn jako {{syncthingInotify}}, měly byste se ujistit, že je toto sledování vypnuto.",
+    "Warning, this path is a subdirectory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Varování, toto umístění je podsložkou existující „{{otherFolderLabel}}“ ({{otherFolder}}).",
+    "Warning: If you are using an external watcher like {%syncthingInotify%}, you should make sure it is deactivated.": "Pozor: Pokud používáte externí sledování změn jako {{syncthingInotify}}, měli byste se ujistit, že je toto sledování vypnuto.",
     "Watch for Changes": "Sledovat změny",
     "Watching for Changes": "Sledování změn",
     "Watching for changes discovers most changes without periodic scanning.": "Sledování změn odhalí většinu změn ještě před periodickým skenováním.",
@@ -494,7 +496,9 @@
     "You should never add or change anything locally in a \"{%receiveEncrypted%}\" folder.": "Ve složce typu „{{receiveEncrypted}}“ byste neměli lokálně nic měnit ani vytvářet.",
     "days": "dní",
     "directories": "složky",
+    "file": "soubor",
     "files": "souborů",
+    "folder": "složka",
     "full documentation": "úplná dokumentace",
     "items": "položky",
     "seconds": "sekund",

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

@@ -187,7 +187,7 @@
     "GUI Theme": "GUI-tema",
     "General": "Generelt",
     "Generate": "Opret",
-    "Global Discovery": "Globalt opslag",
+    "Global Discovery": "Globalt opdagelse",
     "Global Discovery Servers": "Globale opslagsservere",
     "Global State": "Global tilstand",
     "Help": "Hjælp",
@@ -386,6 +386,7 @@
     "Staggered File Versioning": "Forskudt filversionering",
     "Start Browser": "Start browser",
     "Statistics": "Statistikker",
+    "Stay logged in": "Forbliv logget ind",
     "Stopped": "Stoppet",
     "Stores and syncs only encrypted data. Folders on all connected devices need to be set up with the same password or be of type \"{%receiveEncrypted%}\" too.": "Gemmer og synkroniserer kun krypterede data. Mapper på alle tilsluttede enheder skal være oprettet med samme adgangskode eller også være af typen \"{{receiveEncrypted}}\".",
     "Subject:": "Emne:",

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

@@ -302,7 +302,7 @@
     "Prefix indicating that the pattern should be matched without case sensitivity": "Prefijo que indica que el patrón debe coincidir sin distinguir mayúsculas de minúsculas",
     "Preparing to Sync": "Preparándose para Sincronizar",
     "Preview": "Vista previa",
-    "Preview Usage Report": "Informe de uso de vista previa",
+    "Preview Usage Report": "Previsualizar el Informe de Uso",
     "QR code": "Código QR",
     "QUIC LAN": "QUIC LAN",
     "QUIC WAN": "QUIC WAN",

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

@@ -0,0 +1,555 @@
+{
+    "A device with that ID is already added.": "Nadagdag na ang device na may ganitong ID.",
+    "A negative number of days doesn't make sense.": "Walang saysay ang negatibong numero ng araw.",
+    "A new major version may not be compatible with previous versions.": "Maaring hindi compatible ang isang bagong major na beryson sa mga kasalukuyang bersyon.",
+    "API Key": "API Key",
+    "About": "Tungkol sa",
+    "Action": "Aksyon",
+    "Actions": "Mga Aksyon",
+    "Active filter rules": "Mga aktibong tuntunin sa pag-filter",
+    "Add": "Magdagdag",
+    "Add Device": "Magdagdag ng Device",
+    "Add Folder": "Magdagdag ng Folder",
+    "Add Remote Device": "Magdagdag ng Remote Device",
+    "Add devices from the introducer to our device list, for mutually shared folders.": "Magdagdag ng mga device mula sa introducer sa aming listahan ng device, para sa mga folder na pinagsasaluhan.",
+    "Add filter entry": "Magdagdag ng filter entry",
+    "Add ignore patterns": "Magdagdag ng mga pattern na huwag pansinin",
+    "Add new folder?": "Magdagdag ng bagong folder?",
+    "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.": "Dagdag pa rito, ang buong agwat ng muling pag-scan ay tataas (mga beses na 60, ibig sabihin, bagong default na 1h). Maaari mo ring i-configure ito nang manu-mano para sa bawat folder sa ibang pagkakataon pagkatapos piliin ang Hindi.",
+    "Address": "Address",
+    "Addresses": "Mga Address",
+    "Advanced": "Advanced",
+    "Advanced Configuration": "Advanced na Pagsasaayos",
+    "All Data": "Lahat ng Data",
+    "All Time": "Lahat ng Oras",
+    "All folders shared with this device must be protected by a password, such that all sent data is unreadable without the given password.": "Dapat protektahan ang lahat ng mga folder sa device na ito sa pamamagitan ng password, upang hindi mabasa ang lahat ng mga data na ipinapadala nang wala ang ibinigay na password.",
+    "Allow Anonymous Usage Reporting?": "Payagan ang Anonymous na Pag-uulat ng Paggamit?",
+    "Allowed Networks": "Mga Pinapayagang Network",
+    "Alphabetic": "Alpabetiko",
+    "Altered by ignoring deletes.": "Binago sa pamamagitan ng hindi pagpansin sa mga pagtanggal.",
+    "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.": "Pinapamahala ng external na command ang file versioning. Kailangan nitong tanggalin ang file mula sa binabahaging folder. Kung may mga space ang path sa application, kailangan itong i-quote.",
+    "Anonymous Usage Reporting": "Anonymous na Pag-uulat ng Paggamit",
+    "Anonymous usage report format has changed. Would you like to move to the new format?": "Nagbago ang pormat ng anonymous na ulat ng paggamit. Gusto mo bang lumipat sa bagong pormat?",
+    "Applied to LAN": "Naka-apply sa LAN",
+    "Apply": "I-apply",
+    "Are you sure you want to override all remote changes?": "Sigurado ka ba gusto mong i-override ang lahat ng mga remote na pagbabago?",
+    "Are you sure you want to permanently delete all these files?": "Sigurado ka bang gusto mong permanenteng burahin ang lahat ng mga file na ito?",
+    "Are you sure you want to remove device {%name%}?": "Sigurado ka bang gusto mong tanggalin ang device na {{name}}?",
+    "Are you sure you want to remove folder {%label%}?": "Sigurado ka bang gusto mong tanggalin ang folder na {{label}}?",
+    "Are you sure you want to restore {%count%} files?": "Sigurado ka bang gusto mong ibalik ang {{count}} mga file?",
+    "Are you sure you want to revert all local changes?": "Sigurado ka bang gusto mong i-revert ang lahat ng mga lokal na pagbabago?",
+    "Are you sure you want to upgrade?": "Sigurado ka bang gusto mong mag-upgrade?",
+    "Authentication Required": "Nangangailangan ng Authentikasyon",
+    "Authors": "Mga Awtor",
+    "Auto Accept": "Awto na Pagtanggap",
+    "Automatic Crash Reporting": "Awtomatikong Pag-ulat ng Crash",
+    "Automatic upgrade now offers the choice between stable releases and release candidates.": "Nag-aalok na ngayon ang awtomatikong pag-upgrade ng pagpipilian sa pagitan ng mga stable na release at release na mga kandidato.",
+    "Automatic upgrades": "Awtomatikong pag-upgrade",
+    "Automatic upgrades are always enabled for candidate releases.": "Palaging naka-enable ang awtomatikong pag-upgrade sa mga kandidato na release.",
+    "Automatically create or share folders that this device advertises at the default path.": "Awtomatikong gumawa o ibahagi ang mga folder na ang device na ito na inaaanunsyo sa default path.",
+    "Available debug logging facilities:": "Mga available na facility ng debug logging:",
+    "Be careful!": "Mag-ingat ka!",
+    "Body:": "Body:",
+    "Bugs": "Mga Bug",
+    "Cancel": "Kanselahin",
+    "Changelog": "Mga Pagbabago",
+    "Clean out after": "Linisin pagkatapos",
+    "Cleaning Versions": "Mga Bersyon ng Paglinis",
+    "Cleanup Interval": "Pagitan ng Paglinis",
+    "Click to see full identification string and QR code.": "I-click upang makita ang buong string ng pagkakakilanlan at QR code.",
+    "Close": "Isara",
+    "Command": "Command",
+    "Comment, when used at the start of a line": "Komento, kapag ginamit sa simula ng linya",
+    "Compression": "Compression",
+    "Configuration Directory": "Direktoryo ng Configuration",
+    "Configuration File": "File ng Configuration",
+    "Configured": "Naka-configure",
+    "Connected (Unused)": "Konektado (Hindi Ginamit)",
+    "Connection Error": "Error sa Pagkonekta",
+    "Connection Management": "Pamahalaan ng Koneksyon",
+    "Connection Type": "Uri ng Koneksyon",
+    "Connections": "Mga Koneksyon",
+    "Connections via relays might be rate limited by the relay": "Ang mga koneksyon sa pamamagitan ng mga relay ay maaaring ma-rate limit ng relay",
+    "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.": "Ang patuloy na panonood ng mga pagbabago ay available na ngayon sa loob ng Syncthing. Matutukoy nito ang mga pagbabago sa disk at maglalabas ng pag-scan sa mga binagong landas lamang. Ang mga benepisyo ay ang mga pagbabago ay pinalaganap nang mas mabilis at ang mas kaunting buong pag-scan ay kinakailangan.",
+    "Copied from elsewhere": "Kinopya mula sa ibang lugar",
+    "Copied from original": "Kinopya mula sa orihinal",
+    "Copied!": "Kinopya!",
+    "Copy": "Kopyahin",
+    "Copy failed! Try to select and copy manually.": "Nabigo ang pagkopya! Subukang manwal na piliin at kopyahin.",
+    "Currently Shared With Devices": "Kasalukuyang Binabahagi Sa Mga Device",
+    "Custom Range": "Custom na Saklaw",
+    "Danger!": "Panganib!",
+    "Database Location": "Lokasyon ng Database",
+    "Debugging Facilities": "Mga Facility ng Pag-debug",
+    "Default": "Default",
+    "Default Configuration": "Default na Configuration",
+    "Default Device": "Default na Device",
+    "Default Folder": "Default na Folder",
+    "Default Ignore Patterns": "Default na mga Ignore Pattern",
+    "Defaults": "Mga Default",
+    "Delete": "Burahin",
+    "Delete Unexpected Items": "Burahin ang mga Hindi Inaasahang Item",
+    "Deleted {%file%}": "Binura ang {{file}}",
+    "Deselect All": "I-deselect Lahat",
+    "Deselect devices to stop sharing this folder with.": "I-deselect ang mga device para itigil ang pagbahagi ng folder na ito sa.",
+    "Deselect folders to stop sharing with this device.": "I-deselect ang mga folder para itigil ang pagbahagi sa device na ito.",
+    "Device": "Device",
+    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Gustong kumonekta ang device na \"{{name}}\" ({{device}} sa {{address}}). Idagdag ang bagong device?",
+    "Device Certificate": "Sertipiko ng Device",
+    "Device ID": "ID ng Device",
+    "Device Identification": "Pagkakilanlan ng Device",
+    "Device Name": "Pangalan ng Device",
+    "Device Status": "Status ng Device",
+    "Device is untrusted, enter encryption password": "Hindi pinagkakatiwalaan ang device, ilagay ang password ng pag-encrypt",
+    "Device rate limits": "Mga rate limit ng device",
+    "Device that last modified the item": "Device na huling binago ang item",
+    "Devices": "Mga Device",
+    "Disable Crash Reporting": "I-disable ang Pag-uulat ng Crash",
+    "Disabled": "Naka-disable",
+    "Disabled periodic scanning and disabled watching for changes": "Na-disable ang pana-panahon na pag-scan at na-disable ang panonood sa mga pagbabago",
+    "Disabled periodic scanning and enabled watching for changes": "Na-disable ang pana-panahon na pag-scan at na-enable ang panonood sa mga pagbabago",
+    "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Na-disable ang pana-panahon na pag-scan at nabigong i-set up ang panonood sa mga pagbabago, susubukang muli kada 1m:",
+    "Disables comparing and syncing file permissions. Useful on systems with nonexistent or custom permissions (e.g. FAT, exFAT, Synology, Android).": "Dini-disable ang pagkumpara at pag-sync ng mga pahintulot ng file. Kapaki-pakinabang sa mga sistema na walang custom na pahintulot (hal. FAT, exFAT, Synology, Android).",
+    "Discard": "I-discard",
+    "Disconnected": "Nadiskonekta",
+    "Disconnected (Inactive)": "Nadiskonekta (Hindi Aktibo)",
+    "Disconnected (Unused)": "Nadiskonekta (Hindi Ginamit)",
+    "Discovered": "Natuklasan",
+    "Discovery": "Pagtuklas",
+    "Discovery Failures": "Mga Pagkabigo sa Pagtuklas",
+    "Discovery Status": "Status ng Pagtuklas",
+    "Dismiss": "I-dismiss",
+    "Do not add it to the ignore list, so this notification may recur.": "Huwag ito i-add sa listahan ng hindi papansinin, kaya baka lumabas muli ang notification na ito.",
+    "Do not restore": "Huwag ibalik",
+    "Do not restore all": "Huwag ibalik lahat",
+    "Do you want to enable watching for changes for all your folders?": "Gusto mo bang i-enable ang panonood sa pagbabago para sa lahat ng iyong mga folder?",
+    "Documentation": "Dokumentasyon",
+    "Download Rate": "Rate ng Pag-download",
+    "Downloaded": "Na-download",
+    "Downloading": "Dina-download",
+    "Edit": "I-edit",
+    "Edit Device": "I-edit ang Device",
+    "Edit Device Defaults": "I-edit ang mga Device Default",
+    "Edit Folder": "I-edit ang Folder",
+    "Edit Folder Defaults": "I-edit ang mga Folder Default",
+    "Editing {%path%}.": "Ine-edit ang {{path}}.",
+    "Enable Crash Reporting": "I-enable ang Pag-uulat ng Crash",
+    "Enable NAT traversal": "I-enable ang NAT traversal",
+    "Enable Relaying": "I-enable ang pag-relay",
+    "Enabled": "Naka-enable",
+    "Enables sending extended attributes to other devices, and applying incoming extended attributes. May require running with elevated privileges.": "Ine-enable ang pagpadala ng napalawak na attribute sa mga ibang device, at pag-apply ng papasok na napalawak na attribute. Maaring nangangailangan ng pagtakbo na may naka-elevate na pribilehiyo.",
+    "Enables sending extended attributes to other devices, but not applying incoming extended attributes. This can have a significant performance impact. Always enabled when \"Sync Extended Attributes\" is enabled.": "Ine-enable ang pagpadala ng mga napalawak na attribute sa mga ibang device, pero hindi ang pag-apply ng papasok na napalawak na attribute. Maaari itong magkaroon ng makabuluhang epekto sa pagganap. Palaging naka-enable kapag naka-enable ang \"I-sync ang mga Napalawak na Attribute\".",
+    "Enables sending ownership information to other devices, and applying incoming ownership information. Typically requires running with elevated privileges.": "Ine-enable ang pagpapadala ng impormasyon ng pagmamay-ari sa iba pang mga device, at paglalapat ng papasok na impormasyon ng pagmamay-ari. Karaniwang nangangailangan ng pagtakbo na may mataas na mga pribilehiyo.",
+    "Enables sending ownership information to other devices, but not applying incoming ownership information. This can have a significant performance impact. Always enabled when \"Sync Ownership\" is enabled.": "Ine-enable ang pagpapadala ng impormasyon ng pagmamay-ari sa iba pang mga device, pero hindi ang paglapat ng papasok na impormasyon ng pagmamay-ari. Maari itong magkaroon ng makabuluhang epekto sa pagganap. Palaging naka-enable kapag naka-enable ang \"I-sync ang Pagmamay-ari\".",
+    "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Maglagay ng hindi negatibong numero (hal, \"2.35\") at pumili ng unit. Ang mga percentage ay bahagi ng kabuuan ng laki ng disk.",
+    "Enter a non-privileged port number (1024 - 65535).": "Maglagay ng hindi pribilehiyong port number (1024 - 65535).",
+    "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Maglagay ng mga address na hinihiwalay ng kuwit (\"tcp://ip:port\", \"tcp://host:port\") o \"dinamiko\" upang gumawa ng awtomatikong pagtuklas ng address.",
+    "Enter ignore patterns, one per line.": "Maglagay ng mga ignore pattern, isa kada-linya.",
+    "Enter up to three octal digits.": "Maglagay ng hanggang tatlong octal digit.",
+    "Error": "Error",
+    "Extended Attributes": "Mga Napalawak na Attribute",
+    "Extended Attributes Filter": "Filter ng Mga Napalawak na Attribute",
+    "External": "Panlabas",
+    "External File Versioning": "Panlabas na File Versioning",
+    "Failed Items": "Mga Nabigong Item",
+    "Failed to load file versions.": "Nabigong i-load ang mga bersyon ng file.",
+    "Failed to load ignore patterns.": "Nabigong i-load ang mga ignore pattern.",
+    "Failed to setup, retrying": "Nabigong i-set up, sinusubukan muli",
+    "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Inaasahan ang pagbigo sa pagkonekta sa mga IPv6 na server kapag walang konektibidad sa IPv6.",
+    "File Pull Order": "Order ng Pagkuha ng File",
+    "File Versioning": "File Versioning",
+    "Files are moved to .stversions directory when replaced or deleted by Syncthing.": "Nilipat ang mga file sa .stversions na direktoryo kapag pinalitan o binura ng Syncthing.",
+    "Files are moved to date stamped versions in a .stversions directory when replaced or deleted by Syncthing.": "Nililipat ang mga file sa mga naka-date stamp na bersyon sa .stversions na direktoryo kapag pinalitan o binura ng 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.": "Pinoprotektahan ang mga file mula sa mga pagbabago sa ibang device, pero ipapadala sa ibang cluster ang mga pagbabago na ginawa sa device na ito.",
+    "Files are synchronized from the cluster, but any changes made locally will not be sent to other devices.": "Sini-synchronize mula sa cluster ang mga file, pero hindi ipapadala sa mga ibang device ang mgaanumang pagbabago.",
+    "Filesystem Watcher Errors": "Mga Error sa Taganood ng Filesystem",
+    "Filter by date": "I-filter ayon sa petsa",
+    "Filter by name": "I-filter ayon sa pangalan",
+    "Folder": "Folder",
+    "Folder ID": "ID ng Folder",
+    "Folder Label": "Label ng Folder",
+    "Folder Path": "Path ng Folder",
+    "Folder Status": "Status ng Folder",
+    "Folder Type": "Uri ng Folder",
+    "Folder type \"{%receiveEncrypted%}\" can only be set when adding a new folder.": "Maari lang itakda ang uri ng folder na \"{{receiveEncrypted}}\" kapag nagdadagdag ng bagong folder.",
+    "Folder type \"{%receiveEncrypted%}\" cannot be changed after adding the folder. You need to remove the folder, delete or decrypt the data on disk, and add the folder again.": "Hindi mababago ang uri ng folder na \"{{receiveEncrypted}}\" pagkatapos idagdag ang folder. Kailangan mong tanggalin ang folder, burahin o i-decrypt ang data sa disk, at idagdag muli ang folder.",
+    "Folders": "Mga Folder",
+    "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.": "Para sa mga sumusunod na folder, may naganap na error habang nagsisimulang manood ng mga pagbabago. Susubukan itong muli bawat minuto, kaya maaaring mawala ang mga error sa lalong madaling panahon. Kung magpapatuloy sila, subukang ayusin ang pinagbabatayan na isyu at humingi ng tulong kung hindi mo kaya.",
+    "Forever": "Magpakailanman",
+    "Full Rescan Interval (s)": "Pagitan ng Punong Rescan (s)",
+    "GUI": "GUI",
+    "GUI / API HTTPS Certificate": "Sertipiko ng HTTPS ng GUI / API",
+    "GUI Authentication Password": "Password ng Authentikasyon sa GUI",
+    "GUI Authentication User": "User ng Authentikasyon sa GUI",
+    "GUI Authentication: Set User and Password": "Authentikasyon sa GUI: Magtakda ng User at Password",
+    "GUI Listen Address": "Listen Address ng GUI",
+    "GUI Override Directory": "Override Directory ng GUI",
+    "GUI Theme": "Tema ng GUI",
+    "General": "General",
+    "Generate": "I-generate",
+    "Global Discovery": "Global na Pagtuklas",
+    "Global Discovery Servers": "Mga Server ng Global na Pagtuklas",
+    "Global State": "Global na Kalagayan",
+    "Help": "Tulong",
+    "Hint: only deny-rules detected while the default is deny. Consider adding \"permit any\" as last rule.": "Hint: deny-rules lang ang nakita habang ang default ay deny. Isaalang-alang ang pagdaragdag ng \"pahintulutan ang alinman\" bilang huling panuntunan.",
+    "Home page": "Pahina ng panimula",
+    "However, your current settings indicate you might not want it enabled. We have disabled automatic crash reporting for you.": "Gayunpaman, ang iyong kasalukuyang mga setting ay nagpapahiwatig na maaaring hindi mo ito gustong paganahin. Hindi namin pinagana ang awtomatikong pag-uulat ng pag-crash para sa iyo.",
+    "Identification": "Pagkakakilanlan",
+    "If untrusted, enter encryption password": "Kapag hindi pinagkakatiwalaan, ilagay ang password ng pag-encrypt",
+    "If you want to prevent other users on this computer from accessing Syncthing and through it your files, consider setting up authentication.": "Kung gusto mong iwasan ang ibang mga user sa computer na ito na i-access ang Syncthing at sa iyong mga file, isaalang-alang na mag-set up ng authentikasyon.",
+    "Ignore": "Huwag Pansinin",
+    "Ignore Patterns": "Mga Ignore Pattern",
+    "Ignore Permissions": "Huwag Pansinin ang mga Pahintulot",
+    "Ignore patterns can only be added after the folder is created. If checked, an input field to enter ignore patterns will be presented after saving.": "Madadagdag lang ang mga ignore pattern pagkatapos gawin ang folder. Kung nilagyan ng check, ang isang input field para ipasok ang mga ignore pattern ay ipapakita pagkatapos i-save.",
+    "Ignored Devices": "Mga Hindi Pinapansin na Device",
+    "Ignored Folders": "Mga Hindi Pinapansin na Folder",
+    "Ignored at": "Hindi pinansin noong",
+    "Included Software": "Mga Kasamang Software",
+    "Incoming Rate Limit (KiB/s)": "Rate Limit ng Papasok (KiB/s)",
+    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Maaring sirain ng maling pagsasaayos ang nilalaman ng iyong mga folder at gawing inoperable ang Syncthing.",
+    "Incorrect user name or password.": "Maling user name o password.",
+    "Internally used paths:": "Mga internal na ginamit na path:",
+    "Introduced By": "Ipinakilala Ni/Ng",
+    "Introducer": "Tagapagpakilala",
+    "Introduction": "Panimula",
+    "Inversion of the given condition (i.e. do not exclude)": "Pabaliktad ng ibinigay na kundisyon (hal. huwag ibukod)",
+    "Keep Versions": "Panatilihin ang mga Bersyon",
+    "LDAP": "LDAP",
+    "Largest First": "Pinakamalaki Muna",
+    "Last 30 Days": "Huling 30 Araw",
+    "Last 7 Days": "Huling 7 Araw",
+    "Last Month": "Huling Buwan",
+    "Last Scan": "Huling Scan",
+    "Last seen": "Huling nakita",
+    "Latest Change": "Pinakabagong Pagbabago",
+    "Learn more": "Matuto pa",
+    "Learn more at {%url%}": "Matuto pa sa {{url}}",
+    "Limit": "Limitasyon",
+    "Listener Failures": "Mga Pagbibigo ng Listener",
+    "Listener Status": "Status ng Listener",
+    "Listeners": "Mga Listener",
+    "Loading data...": "Nilo-load ang mga data...",
+    "Loading...": "Naglo-load...",
+    "Local Additions": "Mga Lokal na Pagdagdag",
+    "Local Discovery": "Lokal na Pagtuklas",
+    "Local State": "Lokal na Kalagayan",
+    "Local State (Total)": "Lokal na Kalagayan (Kabuuan)",
+    "Locally Changed Items": "Mga Lokal na Binago na Item",
+    "Log": "Tala",
+    "Log File": "File ng Tala",
+    "Log In": "Mag-Log In",
+    "Log Out": "Mag-Log Out",
+    "Log in to see paths information.": "Mag-log in upang makita ang impormasyon ng mga path.",
+    "Log in to see version information.": "Mag-log in upang makita ang impormasyon ng bersyon.",
+    "Log tailing paused. Scroll to the bottom to continue.": "Na-pause ang tailing ng tala. Mag-scroll pababa para magpatuloy.",
+    "Login failed, see Syncthing logs for details.": "Nabigo ang pag-login, tignan ang mga tala ng Syncthing para sa mga detalye.",
+    "Logs": "Mga Tala",
+    "Major Upgrade": "Major na Upgrade",
+    "Mass actions": "Mga maramihang aksyon",
+    "Maximum Age": "Pinakamataas na Edad",
+    "Maximum single entry size": "Pinakamataas na laki ng isang entry",
+    "Maximum total size": "Pinakamataas na kabuuang laki",
+    "Metadata Only": "Metadata Lamang",
+    "Minimum Free Disk Space": "Pinakamababang Bakanteng Espasyo ng Disk",
+    "Mod. Device": "Device na Binago",
+    "Mod. Time": "Oras na Binago",
+    "More than a month ago": "Mahigit isang buwan na ang nakalipas",
+    "More than a week ago": "Mahigit isang linggo na ang nakalipas",
+    "More than a year ago": "Mahigit isang taon na ang nakalipas",
+    "Move to top of queue": "Ilipat sa taas ng queue",
+    "Multi level wildcard (matches multiple directory levels)": "Multi level wildcard (tumutugma sa maraming level ng direktoryo)",
+    "Never": "Hindi Kailanman",
+    "New Device": "Bagong Device",
+    "New Folder": "Bagong Folder",
+    "Newest First": "Pinakabago Muna",
+    "No": "Hindi",
+    "No File Versioning": "Walang File Versioning",
+    "No files will be deleted as a result of this operation.": "Walang mga file na buburahin bilang resulta ng operasyong ito.",
+    "No rules set": "Walang mga tinakda na tuntunin",
+    "No upgrades": "Walang mga upgrade",
+    "Not shared": "Hindi binabahagi",
+    "Notice": "Paunawa",
+    "Number of Connections": "Numero ng Mga Koneksyon",
+    "OK": "OK",
+    "Off": "Nakapatay",
+    "Oldest First": "Pinakaluma Muna",
+    "Optional descriptive label for the folder. Can be different on each device.": "Opsyonal na mapaglarawang label para sa folder. Maaaring magkaiba sa bawat device.",
+    "Options": "Mga Opsyon",
+    "Out of Sync": "Wala sa Sync",
+    "Out of Sync Items": "Mga Item na Wala sa Sync",
+    "Outgoing Rate Limit (KiB/s)": "Rate Limit ng Palabas (KiB/s)",
+    "Override": "I-override",
+    "Override Changes": "I-override ang mga Pagbabago",
+    "Ownership": "Pagmamay-ari",
+    "Password": "Password",
+    "Path": "Path",
+    "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Path papunta sa folder sa computer na ito. Gagawin kapag hindi umiiral. Maaring gamitin ang tilde na character (~) bilang shortcut sa",
+    "Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).": "Path kung saan ilalagay ang mga bersyon (iwanang walang laman para sa default .stversions na direktoryo sa binabahaging folder).",
+    "Paths": "Mga Path",
+    "Pause": "I-pause",
+    "Pause All": "I-pause Lahat",
+    "Paused": "Naka-pause",
+    "Paused (Unused)": "Naka-pause (Hindi Ginamit)",
+    "Pending changes": "Mga nakabinbin na pagbabago",
+    "Periodic scanning at given interval and disabled watching for changes": "Ang pana-panahon na pag-scan sa ibinigay na pagitan at naka-disable ang panonood sa mga pagbabago",
+    "Periodic scanning at given interval and enabled watching for changes": "Ang pana-panahon na pag-scan sa ibinigay na pagitan at naka-enable ang panonood sa mga pagbabago",
+    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Ang pana-panahon na pag-scan sa ibinigay na pagitan at nabigo ang panonood sa mga pagbabago, susubukan muli bawat 1m:",
+    "Permanently add it to the ignore list, suppressing further notifications.": "Permanenteng idagdag ito sa listahan ng huwag pansinin, pinipigilan ang mga karagdagang notification.",
+    "Please consult the release notes before performing a major upgrade.": "Mangyaring kumonsulta sa mga tala sa release bago magsagawa ng malaking pag-upgrade.",
+    "Please set a GUI Authentication User and Password in the Settings dialog.": "Mangyaring magtakda ng Authentikasyon ng GUI na User at Password sa dialog ng Mga Setting.",
+    "Please wait": "Mangyaring maghintay",
+    "Prefix indicating that the file can be deleted if preventing directory removal": "Prefix na nagsasaad na ang file ay maaaring burahin kung pinipigilan ang pagbura ng direktoryo",
+    "Prefix indicating that the pattern should be matched without case sensitivity": "Prefix na nagsasaad na ang pattern ay tutugma nang walang case sensitivity",
+    "Preparing to Sync": "Naghahandang Mag-Sync",
+    "Preview": "Preview",
+    "Preview Usage Report": "I-preview ang Ulat ng Paggamit",
+    "QR code": "QR code",
+    "QUIC LAN": "QUIC LAN",
+    "QUIC WAN": "QUIC WAN",
+    "Quick guide to supported patterns": "Mabilisang gabay para sa mga sinusuportahang pattern",
+    "Random": "Random",
+    "Receive Encrypted": "Makatanggap Naka-Encrypt",
+    "Receive Only": "Makatanggap Lamang",
+    "Received data is already encrypted": "Naka-encrypt na ang natanggap na data",
+    "Recent Changes": "Mga Kamakilang Pagbabago",
+    "Reduced by ignore patterns": "Binabawasan ng mga ignore pattern",
+    "Relay LAN": "Relay na LAN",
+    "Relay WAN": "Relay na WAN",
+    "Release Notes": "Mga Talaan ng Release",
+    "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Naglalaman ng mga kandidatong release ng mga pinakabagong feature at kaayusan. Ang mga ito ay katulad ng tradisyonal na bi-weekly Syncthing release.",
+    "Remote Devices": "Mga Remote Device",
+    "Remote GUI": "Remote GUI",
+    "Remove": "Tanggalin",
+    "Remove Device": "Tanggalin ang Device",
+    "Remove Folder": "Tanggalin ang Folder",
+    "Required identifier for the folder. Must be the same on all cluster devices.": "Kinakailangang pagkakilanlan para sa folder. Kailangang magkatulad sa lahat ng mga cluster device.",
+    "Rescan": "I-rescan",
+    "Rescan All": "I-rescan Lahat",
+    "Rescans": "Mga Rescan",
+    "Restart": "I-restart",
+    "Restart Needed": "Kinakailangan ng Restart",
+    "Restarting": "Nagre-restart",
+    "Restore": "I-restore",
+    "Restore Versions": "I-restore ang Mga Bersyon",
+    "Resume": "I-resume",
+    "Resume All": "I-resume Lahat",
+    "Reused": "Ginamit muli",
+    "Revert": "Ibalik",
+    "Revert Local Changes": "Ibalik ang mga Lokal na Pagbabago",
+    "Save": "I-save",
+    "Saving changes": "Sine-save ang mga pagbabago",
+    "Scan Time Remaining": "Natitirang Oras sa Pag-scan",
+    "Scanning": "Sina-scan",
+    "See external versioning help for supported templated command line parameters.": "Tingnan ang tulong sa external na pag-bersyon para sa mga sinusuportahang naka-template na parameter ng command line.",
+    "Select All": "Piliin Lahat",
+    "Select a version": "Pumili ng bersyon",
+    "Select additional devices to share this folder with.": "Pumili ng mga karagdagang device para ibagagi ang folder na ito.",
+    "Select additional folders to share with this device.": "Pumili ng mga karagdagang folder para ibagagi sa device na ito.",
+    "Select latest version": "Piliin ang pinakabagong bersyon",
+    "Select oldest version": "Piliin ang pinakalumang bersyon",
+    "Send & Receive": "Magpadala at Makatanggap",
+    "Send Extended Attributes": "Magpadala ng mga Pinalawak na Attribute",
+    "Send Only": "Magpadala Lamang",
+    "Send Ownership": "Ipadala ang Pagmamay-ari",
+    "Set Ignores on Added Folder": "Itakda ang mga Ignore sa Dinagdag na Folder",
+    "Settings": "Mga Setting",
+    "Share": "Ibahagi",
+    "Share Folder": "Ibahagi ang Folder",
+    "Share by Email": "Ibahagi sa Pamamagitan ng Email",
+    "Share by SMS": "Ipadala sa Pamamagitan ng SMS",
+    "Share this folder?": "Ibahagi ang folder na ito?",
+    "Shared Folders": "Mga Ibinahaging Folder",
+    "Shared With": "Ibinabahagi Sa",
+    "Sharing": "Binabahagi",
+    "Show ID": "Ipakita ang ID",
+    "Show QR": "Ipakita ang QR",
+    "Show detailed discovery status": "Magpakita ng detalyadong status sa pagtuklas",
+    "Show detailed listener status": "Ipakita ang detalyadong status sa listener",
+    "Show diff with previous version": "Ipakita ang diff sa nakaraang bersyon",
+    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Ipinapakita sa halip na Device ID sa status ng cluster. Ia-advertise sa iba pang mga device bilang opsyonal na default na pangalan.",
+    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Ipinapakita sa halip na Device ID sa status ng cluster. Ia-update sa pangalan na ina-advertise ng device kung iiwanang walang laman.",
+    "Shutdown": "I-shutdown",
+    "Shutdown Complete": "Tapos na ang Shutdown",
+    "Simple": "Simple",
+    "Simple File Versioning": "Simpleng File Versioning",
+    "Single level wildcard (matches within a directory only)": "Single level na wildcard (tumutugma sa loob lamang ng isang direktoryo)",
+    "Size": "Laki",
+    "Smallest First": "Pinakamaliit muna",
+    "Some discovery methods could not be established for finding other devices or announcing this device:": "Ang ilang paraan ng pagtuklas ay hindi maitatag para sa paghahanap ng iba pang mga device o pag-anunsyo ng device na ito:",
+    "Some items could not be restored:": "Hindi ma-restore ang ilang mga file:",
+    "Some listening addresses could not be enabled to accept connections:": "Hindi ma-enable ng ilang mga listening address para makatanggap ng koneksyon:",
+    "Source Code": "Source Code",
+    "Stable releases and release candidates": "Mga stable na release at kandidatong release",
+    "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "Ang mga matatag na release ay naantala ng humigit-kumulang dalawang linggo. Sa panahong ito dumaan sila sa pagsubok bilang mga kandidatong release.",
+    "Stable releases only": "Mga stable na release lamang",
+    "Staggered": "Naka-stagger",
+    "Staggered File Versioning": "Naka-stagger na File Versioning",
+    "Start Browser": "Simulan ang Browser",
+    "Statistics": "Mga Istatistika",
+    "Stay logged in": "Manatiling naka-log in",
+    "Stopped": "Nakatigil",
+    "Stores and syncs only encrypted data. Folders on all connected devices need to be set up with the same password or be of type \"{%receiveEncrypted%}\" too.": "Iniimbak at sini-sync lamang ang naka-encrypt na data. Ang mga folder sa lahat ng mga nakakonektang device ay kailangangang i-set up gamit ang katulad na password o na sa uri na \"{{receiveEncrypted}}\" din.",
+    "Subject:": "Paksa:",
+    "Support": "Support",
+    "Support Bundle": "Bundle ng Suporta",
+    "Sync Extended Attributes": "I-sync ang Mga Pinalawak na Attribute",
+    "Sync Ownership": "I-sync ang Pagmamay-ari",
+    "Sync Protocol Listen Addresses": "Mga Listen Address ng Sync Protocol",
+    "Sync Status": "Status ng Sync",
+    "Syncing": "Nagsi-sync",
+    "Syncthing device ID for \"{%devicename%}\"": "Syncthing device ID para sa \"{{devicename}}\"",
+    "Syncthing has been shut down.": "Nag-shut down na ang Syncthing.",
+    "Syncthing includes the following software or portions thereof:": "Kasama sa Syncthing ang sumusunod na software o mga bahagi nito:",
+    "Syncthing is Free and Open Source Software licensed as MPL v2.0.": "Ang Syncthing ay Libre at Open Source na Software na nakalisensya sa MPL v2.0.",
+    "Syncthing is a continuous file synchronization program. It synchronizes files between two or more computers in real time, safely protected from prying eyes. Your data is your data alone and you deserve to choose where it is stored, whether it is shared with some third party, and how it's transmitted over the internet.": "Ang Syncthing ay isang continuous na file synchronization na program. Sini-synchronize nito ang mga file sa pagitan ng dalawa o higit pang mga computer sa totoong oras, ligtas na protektado mula sa prying na mata. Ang iyong data ay iyong data at nararapat kang pumili kung saan sila ilalagay, kung binabahagi ito sa third party, at kung paano ito pinapadala sa Internet.",
+    "Syncthing is listening on the following network addresses for connection attempts from other devices:": "Nakikinig ang Syncthing sa mga sumusunod na network address para sa mga tangka sa koneksyon mula sa ibang device:",
+    "Syncthing is not listening for connection attempts from other devices on any address.  Only outgoing connections from this device may work.": "Hindi nakikinig ang Syncthing sa mga tangka sa koneksyon mula sa ibang mga device sa anumang address.  Ang mga palabas na koneksyon lamang ay maaring gumana.",
+    "Syncthing is restarting.": "Nagre-restart ang Syncthing.",
+    "Syncthing is saving changes.": "Nagse-save ng mga pagbabago ang Syncthing.",
+    "Syncthing is upgrading.": "Naga-upgrade ang Syncthing.",
+    "Syncthing now supports automatically reporting crashes to the developers. This feature is enabled by default.": "Sinusuportahan na ng Syncthing ang pag-ulat ng mga crash sa mga developer. Naka-enable ang feature na ito bilang default.",
+    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Mukhang down ang Syncthing, o may problema sa iyong koneksyon sa Internet. Sinusubukan muli…",
+    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Mukhang nagkakaroon ng problema ang Syncthing sa pagproseso ng iyong hiling. Paki-refresh ang page o i-restart ang Syncthing kapag nagpapatuloy ang problema.",
+    "TCP LAN": "TCP LAN",
+    "TCP WAN": "TCP WAN",
+    "Take me back": "Ibalik mo ako",
+    "The GUI address is overridden by startup options. Changes here will not take effect while the override is in place.": "Ang GUI address ay na-override ng mga opsyon sa pagsisimula. Ang mga pagbabago dito ay hindi magkakabisa habang ang pag-override ay nasa lugar.",
+    "The Syncthing Authors": "Ang Mga Awtor ng Syncthing",
+    "The Syncthing admin interface is configured to allow remote access without a password.": "Naka-configure ang Syncthing admin interface na payagan ang remote access nang walang password.",
+    "The aggregated statistics are publicly available at the URL below.": "Available nang publiko ang pinagsama-samang istatistika sa URL sa ibaba.",
+    "The cleanup interval cannot be blank.": "Hindi maaring walang laman ang pagitan ng paglinis.",
+    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Na-save na ang configuration ngunit hindi naka-activate. Kailangang mag-restart ang Syncthing para i-activate ang bagong configuration.",
+    "The device ID cannot be blank.": "Hindi maaring walang laman ang Device ID.",
+    "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).": "Mahahanap ang device ID na ilalagay dito sa \"Mga Aksyon > Ipakita ang ID\" na dialog sa isa pang device. Opsyonal ang mga puwang at gitling (hindi pinapansin).",
+    "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.": "Araw-araw na pinapadala ang naka-encrypt na ulat sa paggamit. Ginagamit ito sa pag-track ng mga karaniwang platform, laki ng folder, at bersyon ng app. Kapag nabago ang tinakdang data ng ulat ipo-prompt kang muli ng dialog na ito.",
+    "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.": "Mukhang hindi angkop ang inilagay na device ID. Dapat itong 52 o 56 na character na string na binubuo ng mga titik at numero, na may mga puwang at gitling bilang opsyonal.",
+    "The folder ID cannot be blank.": "Hindi maaring walang laman ang folder ID.",
+    "The folder ID must be unique.": "Kailangang kakaiba ang folder ID.",
+    "The folder content on other devices will be overwritten to become identical with this device. Files not present here will be deleted on other devices.": "Io-overwrite ang nilalaman ng folder sa mga ibang device para maging magkapareho sa device na ito. Ang mga file na hindi nandito ay buburahin sa mga ibang device.",
+    "The folder content on this device will be overwritten to become identical with other devices. Files newly added here will be deleted.": "Io-overwrite ang nilalaman ng folder sa mga ibang device para maging magkapareho sa device na ito. Ang mga file na kamakilang dinagdag dito ay buburahin sa mga ibang device.",
+    "The folder path cannot be blank.": "Hindi maaring walang laman ang path ng folder.",
+    "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.": "Ang mga sumusunod na pagitan ay ginagamit: sa unang oras ang isang bersyon ay pinapanatili bawat 30 segundo, sa unang araw ang isang bersyon ay pinapanatili bawat oras, sa unang 30 araw ang isang bersyon ay pinapanatili bawat araw, hanggang sa pinakamataas na edad ang isang bersyon ay pinapanatili bawat linggo.",
+    "The following items could not be synchronized.": "Hindi ma-synchronize ang mga sumusunod na item.",
+    "The following items were changed locally.": "Binago ng lokal ang mga sumusunod na item.",
+    "The following methods are used to discover other devices on the network and announce this device to be found by others:": "Ang mga sumusunod na paraan ay ginagamit upang tumuklas ng mga ibang device sa network at ipahayag ang device na ito na mahanap ng iba:",
+    "The following text will automatically be inserted into a new message.": "Awtomatikong ilalagay ang sumusunod na text sa bagong mensahe.",
+    "The following unexpected items were found.": "Nahanap ang mga sumusunod na hindi inaasahang item.",
+    "The interval must be a positive number of seconds.": "Dapat positibong numero ng segundo ang pagitan.",
+    "The interval, in seconds, for running cleanup in the versions directory. Zero to disable periodic cleaning.": "Ang pagitan, bilang segundo, para sa pagtakbo ng paglinis sa versions na direktoryo. Sero para i-disable ang periodical na paglinis.",
+    "The maximum age must be a number and cannot be blank.": "Dapat numero ang pinakamataas na edad at hindi maaring walang laman.",
+    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Ang pinakamataas na oras para panatilihin ang bersyon (bilang araw, itakda sa 0 para panatilihin ang mga bersyon magpakailanman).",
+    "The number of connections must be a non-negative number.": "Dapat hindi negatibong numero ang bilang ng mga koneksyon.",
+    "The number of days must be a number and cannot be blank.": "Dapat numero ang bilang ng araw at hindi maaring walang laman.",
+    "The number of days to keep files in the trash can. Zero means forever.": "Ang bilang ng araw para panatilihin ang mga file sa basurahan. Ang sero ay ibig sabihin ay magpakailanman.",
+    "The number of old versions to keep, per file.": "Ang bilang ng mga lumang bersyon na dapat panatilihin, bawat file.",
+    "The number of versions must be a number and cannot be blank.": "Dapat numero ang bilang ng mga bersyon at hindi maaring walang laman.",
+    "The path cannot be blank.": "Hindi maaring walang laman ang path.",
+    "The rate limit is applied to the accumulated traffic of all connections to this device.": "Ina-apply ang rate limit sa naipon na traffic ng lahat ng mga koneksyon sa device na ito.",
+    "The rate limit must be a non-negative number (0: no limit)": "Dapat hindi negatibong numero ang rate limit (0: walang limitasyon)",
+    "The remote device has not accepted sharing this folder.": "Hindi tinanggap ng remote device ang pagbahagi ng folder na ito.",
+    "The remote device has paused this folder.": "Na-pause ng remote device ang folder na ito.",
+    "The rescan interval must be a non-negative number of seconds.": "Dapat hindi negatibong bilang ng segundo ang pagitan ng rescan.",
+    "There are no devices to share this folder with.": "Walang mga device para ibahagi ang folder na ito sa.",
+    "There are no file versions to restore.": "Walang mga file version na ibabalik.",
+    "There are no folders to share with this device.": "Walang mga folder na ibabahagi sa device na ito.",
+    "They are retried automatically and will be synced when the error is resolved.": "Awtomatikong sinusubok muli ang mga ito at isi-sync kapag nalutas ang error.",
+    "This Device": "Itong Device",
+    "This Month": "Itong Buwan",
+    "This can easily give hackers access to read and change any files on your computer.": "Madali nitong mabibigyan ang mga hacker ng access na basahin at baguhin ang anumang mga file sa iyong computer.",
+    "This device cannot automatically discover other devices or announce its own address to be found by others.  Only devices with statically configured addresses can connect.": "Hindi awtomatikong tutuklasin ng device na ito ng mga ibang device o i-annouce ang sarili nitong address para mahanap ng iba.  Makakakonekta lamang ang mga device na may static na naka-configure na address.",
+    "This is a major version upgrade.": "Ito ay isang upgrade sa major na bersyon.",
+    "This setting controls the free space required on the home (i.e., index database) disk.": "Kinokontrol ng setting na ito ang kinakailangan na bakanteng espasyo sa home (hal., index database) disk.",
+    "Time": "Oras",
+    "Time the item was last modified": "Oras na huling binago ang file",
+    "To connect with the Syncthing device named \"{%devicename%}\", add a new remote device on your end with this ID:": "Para kumonekta sa Syncthing device na nakapangalan na \"{{devicename}}\", magdagdag ng bagong remote device sa iyong dulo gamit ang ID na ito:",
+    "To permit a rule, have the checkbox checked. To deny a rule, leave it unchecked.": "Upang payagan ang isang panuntunan, lagyan ng check ang checkbox. Upang tanggihan ang isang panuntunan, iwanan itong walang check.",
+    "Today": "Ngayon",
+    "Trash Can": "Basurahan",
+    "Trash Can File Versioning": "Basurahan na File Versioning",
+    "Type": "Uri",
+    "UNIX Permissions": "Mga Pahintulot na UNIX",
+    "Unavailable": "Hindi Available",
+    "Unavailable/Disabled by administrator or maintainer": "Hindi Available/Na-disable ng tagapangasiwa",
+    "Undecided (will prompt)": "Undecided (magbibigay ng prompt)",
+    "Unexpected Items": "Mga Hindi Inaasahang Item",
+    "Unexpected items have been found in this folder.": "Nakahanap ng mga hindi inaasahang item sa folder na ito.",
+    "Unignore": "I-unignore",
+    "Unknown": "Hindi Alam",
+    "Unshared": "Hindi Binahagi",
+    "Unshared Devices": "Mga Hindi Binahaging Device",
+    "Unshared Folders": "Mga Hindi Binahaging Folder",
+    "Untrusted": "Hindi Pinagkakatiwalaan",
+    "Up to Date": "Napapanahon",
+    "Updated {%file%}": "Binago ang {{file}}",
+    "Upgrade": "Mag-upgrade",
+    "Upgrade To {%version%}": "Mag-upgrade Sa {{version}}",
+    "Upgrading": "Naga-upgrade",
+    "Upload Rate": "Rate ng Pag-upload",
+    "Uptime": "Uptime",
+    "Usage reporting is always enabled for candidate releases.": "Palaging naka-enable ang pag-uulat ng paggamit sa mga kandidatong release.",
+    "Use HTTPS for GUI": "Gumamit ng HTTPS para sa GUI",
+    "Use notifications from the filesystem to detect changed items.": "Gumamit ng mga notification mula sa filesystem para mag-detect ng mga nabagong item.",
+    "User": "Gumagamit",
+    "User Home": "Home ng User",
+    "Username/Password has not been set for the GUI authentication. Please consider setting it up.": "Hindi nakatakda ang Username/Password para sa authentikasyon sa GUI. Isaalang-alang na i-set up.",
+    "Using a QUIC connection over LAN": "Gumagamit ng QUIC na koneksyon mula sa LAN",
+    "Using a QUIC connection over WAN": "Gumagamit ng QUIC na koneksyon mula sa WAN",
+    "Using a direct TCP connection over LAN": "Gumagamit ng direktang TCP na koneksyon mula sa LAN",
+    "Using a direct TCP connection over WAN": "Gumagamit ng direktang TCP na koneksyon mula sa WAN",
+    "Version": "Bersyon",
+    "Versions": "Mga Bersyon",
+    "Versions Path": "Path ng Mga Bersyon",
+    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Awtomatikong buburahin ang mgs bersyon kapag mas matanda sila kaysa sa pinakamataas na edad o lumalagpas sa numero ng mga file na pinapayagan sa pagitan.",
+    "Waiting to Clean": "Naghihintay para Linisin",
+    "Waiting to Scan": "Naghihintay para Mag-scan",
+    "Waiting to Sync": "Naghihintay para Mag-sync",
+    "Warning": "Babala",
+    "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "Babala, ang path na ito ay parent directory ng umiiral na folder na \"{{otherFolder}}\".",
+    "Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Babala, ang path na ito ay parent directory ng umiiral na folder na \"{{otherFolderLabel}}\" ({{otherFolder}}).",
+    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Babala, ang path na ito ay isang subdirectory ng umiiral na folder na \"{{otherFolder}}\".",
+    "Warning, this path is a subdirectory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Babala, ang path na ito ay isang subdirectory ng umiiral na folder na \"{{otherFolderLabel}}\" ({{otherFolder}}).",
+    "Warning: If you are using an external watcher like {%syncthingInotify%}, you should make sure it is deactivated.": "Babala: Kapag gumagamit ka ng panlabas na watcher tulad ng {{syncthingInotify}}, dapag siguraduhin mo na naka-deactivate iyan.",
+    "Watch for Changes": "Manood para sa Mga Pagbabago",
+    "Watching for Changes": "Nanonood para sa Mga Pagbabago",
+    "Watching for changes discovers most changes without periodic scanning.": "Ang panonood para sa mga pagbabago ay tumutuklas ng mga karamihang pagbabago nang walang periodic na pag-scan.",
+    "When adding a new device, keep in mind that this device must be added on the other side too.": "Kapag nagdaragdag ng bagong device, tandaan na dapat ding idagdag ang device na ito sa kabilang panig.",
+    "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.": "Kapag nagdaragdag ng bagong folder, tandaan na ang Folder ID ay ginagamit para iugnay ang mga folder sa pagitan ng mga device. Case senitive sila at dapat eksaktong tumugma sa pagitan ng mga device.",
+    "When set to more than one on both devices, Syncthing will attempt to establish multiple concurrent connections. If the values differ, the highest will be used. Set to zero to let Syncthing decide.": "Kapag nakatakda sa higit sa isa sa parehong device, susubukan ng Syncthing na magtatag ng maraming magkakasabay na koneksyon. Kung magkaiba ang mga halaga, ang pinakamataas ang gagamitin. Itakda sa zero upang hayaan ang Syncthing na magpasya.",
+    "Yes": "Oo",
+    "Yesterday": "Kahapon",
+    "You can also copy and paste the text into a new message manually.": "Maari mo ring kopyahin at i-paste ang text sa isang bagong mensahe nang manwal.",
+    "You can also select one of these nearby devices:": "Maari mo ring piliin ang isa sa mga malapit na device:",
+    "You can change your choice at any time in the Settings dialog.": "Pwede mong palitan ang iyong kagustuhan sa anumang oras sa dialog ng Mga Setting.",
+    "You can read more about the two release channels at the link below.": "Maaari kang magbasa nang higit pa tungkol sa dalawang release channel sa link sa ibaba.",
+    "You have no ignored devices.": "Wala kang mga hindi pinapansin na device.",
+    "You have no ignored folders.": "Wala kang mga hindi pinapansin na folder.",
+    "You have unsaved changes. Do you really want to discard them?": "Mayroon kang mga hindi na-save na pagbabago. Gusto mo ba talagang i-discard ang mga ito?",
+    "You must keep at least one version.": "Kailangan mong magpanatili ng kahit isang bersyon.",
+    "You should never add or change anything locally in a \"{%receiveEncrypted%}\" folder.": "Hindi ka dapat magdagdag o magpalit ng anumang lokal sa folder na \"{{receiveEncrypted}}\".",
+    "Your SMS app should open to let you choose the recipient and send it from your own number.": "Magbubukas ang iyong SMS app para hayaan kang pumili ng tatanggap at ipadala ito mula sa sarili mong numero.",
+    "Your email app should open to let you choose the recipient and send it from your own address.": "Magbubukas ang iyong email app para hayaan kang pumili ng tatanggap at ipadala mula sa sarili mong address.",
+    "days": "araw",
+    "deleted": "binura",
+    "deny": "tanggihan",
+    "directories": "mga direktoryo",
+    "file": "file",
+    "files": "mga file",
+    "folder": "folder",
+    "full documentation": "punong dokumentasyon",
+    "items": "mga item",
+    "modified": "binago",
+    "permit": "payagan",
+    "seconds": "segundo",
+    "theme": {
+        "name": {
+            "black": "Itim",
+            "dark": "Madilim",
+            "default": "Default",
+            "light": "Maliwanag"
+        }
+    },
+    "unknown device": "hindi alam na device",
+    "{%device%} wants to share folder \"{%folder%}\".": "Gustong ibahagi ng {{device}} ang folder na \"{{folder}}\".",
+    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "Gustong ibahagi ng {{device}} ang folder na \"{{folderlabel}}\" ({{folder}}).",
+    "{%reintroducer%} might reintroduce this device.": "Maaring ipakilala muli ng {{reintroducer}} ang device na ito."
+}

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

@@ -0,0 +1,555 @@
+{
+    "A device with that ID is already added.": "Tá gléas leis an aitheantas sin curtha leis cheana féin.",
+    "A negative number of days doesn't make sense.": "Níl ciall le líon diúltach laethanta.",
+    "A new major version may not be compatible with previous versions.": "B'fhéidir nach bhfuil mórleagan nua comhoiriúnach le leaganacha roimhe seo.",
+    "API Key": "Eochair API",
+    "About": "Maidir",
+    "Action": "Gníomh",
+    "Actions": "Gníomhartha",
+    "Active filter rules": "Rialacha gníomhacha scagaire",
+    "Add": "Cuir Leis",
+    "Add Device": "Cuir Gléas Leis",
+    "Add Folder": "Cuir Fillteán Leis",
+    "Add Remote Device": "Cuir Cianghléas Leis",
+    "Add devices from the introducer to our device list, for mutually shared folders.": "Cuir gléasanna ón introducer lenár liosta gléasanna, le haghaidh fillteáin a roinntear go frithpháirteach.",
+    "Add filter entry": "Cuir iontráil scagaire leis",
+    "Add ignore patterns": "Cuir patrúin neamhairde leis",
+    "Add new folder?": "Cuir fillteán nua leis?",
+    "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.": "Ina theannta sin méadófar an t-eatramh iomlán athscanta (amanna 60, i.e. mainneachtain nua 1h). Is féidir leat é a chumrú de láimh do gach fillteán níos déanaí tar éis Uimh.",
+    "Address": "Seoladh",
+    "Addresses": "Seoltaí",
+    "Advanced": "Ardrang",
+    "Advanced Configuration": "Ardchumraíocht",
+    "All Data": "Na Sonraí Go Léir",
+    "All Time": "Gach Am",
+    "All folders shared with this device must be protected by a password, such that all sent data is unreadable without the given password.": "Ní mór gach fillteán a roinntear leis an ngléas seo a chosaint le pasfhocal, ionas nach féidir na sonraí go léir a sheoltar a léamh gan an pasfhocal tugtha.",
+    "Allow Anonymous Usage Reporting?": "Ceadaigh Tuairisciú Úsáide Gan Ainm?",
+    "Allowed Networks": "Líonraí Ceadaithe",
+    "Alphabetic": "Aibítreach",
+    "Altered by ignoring deletes.": "Athraithe trí neamhaird a dhéanamh ar scriosadh.",
+    "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.": "Láimhseálann ordú seachtrach an leagan. Caithfidh sé an comhad a bhaint den fhillteán comhroinnte. Má tá spásanna sa chosán chuig an bhfeidhmchlár, ba chóir é a lua.",
+    "Anonymous Usage Reporting": "Tuairisciú Úsáide Gan Ainm",
+    "Anonymous usage report format has changed. Would you like to move to the new format?": "Tá athrú tagtha ar fhormáid na tuarascála úsáide gan ainm. Ar mhaith leat bogadh go dtí an fhormáid nua?",
+    "Applied to LAN": "Curtha i bhfeidhm ar LAN",
+    "Apply": "Iarratas a dhéanamh",
+    "Are you sure you want to override all remote changes?": "An bhfuil tú cinnte go bhfuil fonn ort gach athrú iargúlta a shárú?",
+    "Are you sure you want to permanently delete all these files?": "An bhfuil tú cinnte go bhfuil fonn ort na comhaid seo go léir a scriosadh go buan?",
+    "Are you sure you want to remove device {%name%}?": "An bhfuil tú cinnte go bhfuil fonn ort an gléas {{name}}a bhaint?",
+    "Are you sure you want to remove folder {%label%}?": "An bhfuil tú cinnte go bhfuil fonn ort fillteán {{label}}a bhaint?",
+    "Are you sure you want to restore {%count%} files?": "An bhfuil tú cinnte go bhfuil fonn ort comhaid {{count}} a aischur?",
+    "Are you sure you want to revert all local changes?": "An bhfuil tú cinnte go bhfuil fonn ort na hathruithe áitiúla go léir a chur ar ais?",
+    "Are you sure you want to upgrade?": "An bhfuil tú cinnte go bhfuil fonn ort uasghrádú a dhéanamh?",
+    "Authentication Required": "Fíordheimhniú de dhíth",
+    "Authors": "Údair",
+    "Auto Accept": "Glac go hUathoibríoch",
+    "Automatic Crash Reporting": "Tuairisciú Uathoibríoch Tuairteála",
+    "Automatic upgrade now offers the choice between stable releases and release candidates.": "Cuireann uasghrádú uathoibríoch anois an rogha idir eisiúintí cobhsaí agus iarrthóirí scaoilte.",
+    "Automatic upgrades": "Uasghrádú uathoibríoch",
+    "Automatic upgrades are always enabled for candidate releases.": "Cumasaítear uasghrádú uathoibríoch i gcónaí le haghaidh eisiúintí iarrthóra.",
+    "Automatically create or share folders that this device advertises at the default path.": "Cruthaigh nó comhroinn fillteáin go huathoibríoch a fhógraíonn an gléas seo ag an gcosán réamhshocraithe.",
+    "Available debug logging facilities:": "Áiseanna logála dífhabhtaithe atá ar fáil:",
+    "Be careful!": "Bí cúramach!",
+    "Body:": "Comhlacht:",
+    "Bugs": "Fabhtanna",
+    "Cancel": "Cuir ar ceal",
+    "Changelog": "ChangelogName",
+    "Clean out after": "Glan amach tar éis",
+    "Cleaning Versions": "Leaganacha Glantacháin",
+    "Cleanup Interval": "Eatramh Glanta",
+    "Click to see full identification string and QR code.": "Cliceáil chun teaghrán aitheantais iomlán agus cód QR a fheiceáil.",
+    "Close": "Dún",
+    "Command": "Ordú",
+    "Comment, when used at the start of a line": "Trácht a dhéanamh, nuair a úsáidtear é ag tús líne",
+    "Compression": "Comhbhrú",
+    "Configuration Directory": "Comhadlann Cumraíochta",
+    "Configuration File": "Comhad Cumraíochta",
+    "Configured": "Cumraithe",
+    "Connected (Unused)": "Ceangailte (Neamhúsáidte)",
+    "Connection Error": "Earráid naisc",
+    "Connection Management": "Bainistíocht Ceangail",
+    "Connection Type": "Cineál Ceangail",
+    "Connections": "Naisc",
+    "Connections via relays might be rate limited by the relay": "D'fhéadfadh naisc trí athsheachadáin a bheith ráta teoranta ag an sealaíochta",
+    "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.": "Tá faire leanúnach le haghaidh athruithe ar fáil anois laistigh de Syncthing. Braithfidh sé seo athruithe ar an diosca agus eiseoidh sé scanadh ar na cosáin mhodhnaithe amháin. Is iad na buntáistí ná go ndéantar athruithe a iomadú níos tapúla agus go bhfuil gá le scanadh níos lú iomlán.",
+    "Copied from elsewhere": "Cóipeáladh ó áiteanna eile",
+    "Copied from original": "Cóipeáladh ón mbunleagan",
+    "Copied!": "Cóipeáladh!",
+    "Copy": "Cóipeáil",
+    "Copy failed! Try to select and copy manually.": "Theip ar chóip! Déan iarracht a roghnú agus a chóipeáil de láimh.",
+    "Currently Shared With Devices": "Comhroinnte faoi láthair le gléasanna",
+    "Custom Range": "Raon Saincheaptha",
+    "Danger!": "Contúirt!",
+    "Database Location": "Suíomh an Bhunachair Sonraí",
+    "Debugging Facilities": "Áiseanna Dífhabhtaithe",
+    "Default": "Réamhshocrú",
+    "Default Configuration": "Cumraíocht Réamhshocraithe",
+    "Default Device": "Gléas Réamhshocraithe",
+    "Default Folder": "Fillteán Réamhshocraithe",
+    "Default Ignore Patterns": "Patrúin Neamhairde Réamhshocraithe",
+    "Defaults": "Réamhshocruithe",
+    "Delete": "Scrios",
+    "Delete Unexpected Items": "Scrios Míreanna Gan Choinne",
+    "Deleted {%file%}": "Scriosta {{file}}",
+    "Deselect All": "Díroghnaigh Gach Rud",
+    "Deselect devices to stop sharing this folder with.": "Díroghnaigh gléasanna chun stop a chur le comhroinnt an fhillteáin seo.",
+    "Deselect folders to stop sharing with this device.": "Díroghnaigh fillteáin chun stop a chur le comhroinnt leis an ngléas seo.",
+    "Device": "Gléas",
+    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Device \"{{name}}\" ({{device}} at {{address}}) ag iarraidh ceangal. Cuir gléas nua leis?",
+    "Device Certificate": "Teastas Gléis",
+    "Device ID": "Aitheantas gléis",
+    "Device Identification": "Aitheantas gléis",
+    "Device Name": "Ainm an Ghléis",
+    "Device Status": "Stádas an Ghléis",
+    "Device is untrusted, enter encryption password": "Tá an gléas neamhiontaofa, iontráil focal faire criptithe",
+    "Device rate limits": "Teorainneacha ráta gléis",
+    "Device that last modified the item": "Gléas a d'athraigh an mhír go deireanach",
+    "Devices": "Gléasanna",
+    "Disable Crash Reporting": "Díchumasaigh Tuairisciú Tuairteála",
+    "Disabled": "Díchumasaithe",
+    "Disabled periodic scanning and disabled watching for changes": "Scanadh tréimhsiúil díchumasaithe agus daoine faoi mhíchumas ag faire ar athruithe",
+    "Disabled periodic scanning and enabled watching for changes": "Scanadh tréimhsiúil díchumasaithe agus cumasaíodh faire le haghaidh athruithe",
+    "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Scanadh tréimhsiúil díchumasaithe agus theip ar shocrú faire le haghaidh athruithe, ag triail gach 1m:",
+    "Disables comparing and syncing file permissions. Useful on systems with nonexistent or custom permissions (e.g. FAT, exFAT, Synology, Android).": "Díchumasaigh comparáid agus sioncronú ceadanna comhaid. Úsáideach ar chórais le ceadanna nonexistent nó saincheaptha (m.sh. FAT, exFAT, Synology, Android).",
+    "Discard": "Ná Sábháil",
+    "Disconnected": "Dícheangailte",
+    "Disconnected (Inactive)": "Dícheangailte (Neamhghníomhach)",
+    "Disconnected (Unused)": "Dícheangailte (Neamhúsáidte)",
+    "Discovered": "Aimsíodh",
+    "Discovery": "Fionnachtain",
+    "Discovery Failures": "Teipeanna Fionnachtana",
+    "Discovery Status": "Stádas Fionnachtana",
+    "Dismiss": "Ruaig",
+    "Do not add it to the ignore list, so this notification may recur.": "Ná cuir leis an liosta neamhairde é, mar sin d'fhéadfadh an fógra seo tarlú arís.",
+    "Do not restore": "Ná hathchóirigh",
+    "Do not restore all": "Ná cuir gach rud ar ais",
+    "Do you want to enable watching for changes for all your folders?": "An bhfuil fonn ort féachaint ar athruithe do d'fhillteáin go léir?",
+    "Documentation": "Doiciméadú",
+    "Download Rate": "Ráta Íosluchtaithe",
+    "Downloaded": "Íoslódáilte",
+    "Downloading": "Á Íosluchtú",
+    "Edit": "Cuir in eagar",
+    "Edit Device": "Cuir Gléas in Eagar",
+    "Edit Device Defaults": "Cuir Réamhshocruithe gléis in Eagar",
+    "Edit Folder": "Cuir Fillteán in Eagar",
+    "Edit Folder Defaults": "Cuir Réamhshocruithe an Fhillteáin in Eagar",
+    "Editing {%path%}.": "Eagarthóireacht {{path}}.",
+    "Enable Crash Reporting": "Cumasaigh Tuairisciú Tuairteanna",
+    "Enable NAT traversal": "Cumasaigh traversal NAT",
+    "Enable Relaying": "Cumasaigh Athsheachadadh",
+    "Enabled": "Cumasaithe",
+    "Enables sending extended attributes to other devices, and applying incoming extended attributes. May require running with elevated privileges.": "Cumasaigh tréithe leathnaithe a sheoladh chuig gléasanna eile, agus tréithe sínte isteach a chur i bhfeidhm. D'fhéadfadh sé go mbeadh gá le rith le pribhléidí ardaithe.",
+    "Enables sending extended attributes to other devices, but not applying incoming extended attributes. This can have a significant performance impact. Always enabled when \"Sync Extended Attributes\" is enabled.": "Cumasaigh tréithe leathnaithe a sheoladh chuig gléasanna eile, ach gan tréithe leathnaithe ag teacht isteach a chur i bhfeidhm. D'fhéadfadh tionchar suntasach feidhmíochta a bheith aige seo. Cumasaíodh i gcónaí nuair a chumasaítear \"Sync Extended Attributes\".",
+    "Enables sending ownership information to other devices, and applying incoming ownership information. Typically requires running with elevated privileges.": "Cumasaíonn sé faisnéis úinéireachta a sheoladh chuig gléasanna eile, agus faisnéis úinéireachta isteach a chur i bhfeidhm. De ghnáth éilíonn rith le pribhléidí ardaithe.",
+    "Enables sending ownership information to other devices, but not applying incoming ownership information. This can have a significant performance impact. Always enabled when \"Sync Ownership\" is enabled.": "Cumasaíonn sé faisnéis úinéireachta a sheoladh chuig gléasanna eile, ach gan faisnéis úinéireachta isteach a chur i bhfeidhm. D'fhéadfadh tionchar suntasach feidhmíochta a bheith aige seo. Cumasaíodh i gcónaí nuair a chumasaítear \"Úinéireacht Shioncronaithe\".",
+    "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Iontráil uimhir neamh-dhiúltach (m.sh., \"2.35\") agus roghnaigh aonad. Tá céatadáin mar chuid de mhéid iomlán an diosca.",
+    "Enter a non-privileged port number (1024 - 65535).": "Cuir isteach uimhir phoirt neamhphribhléid (1024 - 65535).",
+    "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Cuir isteach camóg scartha (\"tcp://ip:port\", \"tcp://host:port\") seoltaí nó \"dinimiciúil\" chun fionnachtain uathoibríoch an tseolta a dhéanamh.",
+    "Enter ignore patterns, one per line.": "Iontráil patrúin neamhaird, ceann in aghaidh an líne.",
+    "Enter up to three octal digits.": "Iontráil suas le trí dhigit ochtach.",
+    "Error": "Earráid",
+    "Extended Attributes": "Tréithe Breisithe",
+    "Extended Attributes Filter": "Scagaire Tréithe Breisithe",
+    "External": "Seachtrach",
+    "External File Versioning": "Leagan Comhad Seachtrach",
+    "Failed Items": "Míreanna Teipthe",
+    "Failed to load file versions.": "Theip ar luchtú leaganacha comhaid.",
+    "Failed to load ignore patterns.": "Theip ar phatrúin neamhairde a luchtú.",
+    "Failed to setup, retrying": "Theip ar thus, ag triail arís",
+    "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Táthar ag súil le mainneachtain ceangal le freastalaithe IPv6 mura bhfuil nascacht IPv6 ann.",
+    "File Pull Order": "Ordú Tarraingthe Comhad",
+    "File Versioning": "Leagan Comhaid",
+    "Files are moved to .stversions directory when replaced or deleted by Syncthing.": "Bogtar comhaid go comhadlann .stversions nuair a chuirtear sioncronú ina n-ionad nó nuair a scriostar iad.",
+    "Files are moved to date stamped versions in a .stversions directory when replaced or deleted by Syncthing.": "Bogtar comhaid go dtí seo leaganacha stampáilte i gcomhadlann .stversions nuair a chuirtear sioncronú ina n-ionad nó nuair a scriostar iad.",
+    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Cosnaítear comhaid ó athruithe a dhéantar ar ghléasanna eile, ach seolfar athruithe a dhéantar ar an ngléas seo chuig an gcuid eile den bhraisle.",
+    "Files are synchronized from the cluster, but any changes made locally will not be sent to other devices.": "Déantar comhaid a shioncrónú ón mbraisle, ach ní sheolfar aon athruithe a dhéantar go háitiúil chuig gléasanna eile.",
+    "Filesystem Watcher Errors": "Earráidí Faireoir an Chórais Comhad",
+    "Filter by date": "Scag de réir dáta",
+    "Filter by name": "Scag de réir ainm",
+    "Folder": "Fillteán",
+    "Folder ID": "Aitheantas an fhillteáin",
+    "Folder Label": "Lipéad Fillteáin",
+    "Folder Path": "Conair an Fhillteáin",
+    "Folder Status": "Stádas an Fhillteáin",
+    "Folder Type": "Cineál Fillteáin",
+    "Folder type \"{%receiveEncrypted%}\" can only be set when adding a new folder.": "Ní féidir cineál fillteáin \"{{receiveEncrypted}}\" a shocrú ach amháin nuair a chuirtear fillteán nua leis.",
+    "Folder type \"{%receiveEncrypted%}\" cannot be changed after adding the folder. You need to remove the folder, delete or decrypt the data on disk, and add the folder again.": "Ní féidir cineál fillteáin \"{{receiveEncrypted}}\" a athrú tar éis an fillteán a chur leis. Ní mór duit an fillteán a bhaint, na sonraí ar an diosca a scriosadh nó a dhíchriptiú, agus an fillteán a chur leis arís.",
+    "Folders": "Fillteáin",
+    "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.": "Maidir leis na fillteáin seo a leanas, tharla earráid agus tú ag tosú ag faire ar athruithe. Beidh sé a retried gach nóiméad, mar sin d'fhéadfadh na hearráidí dul amach go luath. Má leanann siad ar aghaidh, déan iarracht an bhuncheist a shocrú agus cabhair a iarraidh mura féidir leat.",
+    "Forever": "Go brách",
+    "Full Rescan Interval (s)": "Eatramh Rescan Iomlán (í)",
+    "GUI": "Comhéadan Grafach",
+    "GUI / API HTTPS Certificate": "Teastas GUI / API HTTPS",
+    "GUI Authentication Password": "Pasfhocal Fíordheimhnithe GUI",
+    "GUI Authentication User": "Úsáideoir Fíordheimhnithe GUI",
+    "GUI Authentication: Set User and Password": "Fíordheimhniú Grafach: Socraigh Úsáideoir agus Pasfhocal",
+    "GUI Listen Address": "Seoladh Éisteachta GUI",
+    "GUI Override Directory": "Comhadlann Sáraithe GUI",
+    "GUI Theme": "Téama grafach",
+    "General": "Ginearálta",
+    "Generate": "Gin",
+    "Global Discovery": "Fionnachtain Dhomhanda",
+    "Global Discovery Servers": "Freastalaithe Fionnachtana Domhanda",
+    "Global State": "Stát Domhanda",
+    "Help": "Cabhair",
+    "Hint: only deny-rules detected while the default is deny. Consider adding \"permit any\" as last rule.": "Leid: níor aimsíodh ach rialacha diúltaithe agus an réamhshocrú á séanadh. Smaoinigh ar \"cead ar bith\" a chur leis mar riail dheireanach.",
+    "Home page": "Leathanach baile",
+    "However, your current settings indicate you might not want it enabled. We have disabled automatic crash reporting for you.": "Mar sin féin, léiríonn do shocruithe reatha go mb'fhéidir nár mhaith leat é a chumasú. Tá tuairisciú uathoibríoch tuairteála díchumasaithe againn duit.",
+    "Identification": "Aitheantas",
+    "If untrusted, enter encryption password": "Mura bhfuil muinín agat as, iontráil focal faire criptithe",
+    "If you want to prevent other users on this computer from accessing Syncthing and through it your files, consider setting up authentication.": "Más mian leat cosc a chur ar úsáideoirí eile ar an ríomhaire seo rochtain a fháil ar Syncthing agus trí do chuid comhad, smaoinigh ar fhíordheimhniú a bhunú.",
+    "Ignore": "Déan neamhaird de",
+    "Ignore Patterns": "Déan neamhaird de Phatrúin",
+    "Ignore Permissions": "Déan neamhaird de cheadanna",
+    "Ignore patterns can only be added after the folder is created. If checked, an input field to enter ignore patterns will be presented after saving.": "Ní féidir patrúin neamhaird a chur leis ach amháin tar éis an fillteán a chruthú. Má sheiceáil, beidh réimse ionchur chun dul isteach patrúin neamhaird a chur i láthair tar éis a shábháil.",
+    "Ignored Devices": "Gléasanna Neamhaird",
+    "Ignored Folders": "Fillteáin Neamhaird",
+    "Ignored at": "Neamhaird déanta air ag",
+    "Included Software": "Bogearraí san áireamh",
+    "Incoming Rate Limit (KiB/s)": "Teorainn Ráta Isteach (KiB/s)",
+    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "D'fhéadfadh cumraíocht mhícheart dochar a dhéanamh d'inneachar d'fhillteáin agus sioncronú a dhéanamh do-oibrithe.",
+    "Incorrect user name or password.": "Ainm úsáideora nó pasfhocal mícheart.",
+    "Internally used paths:": "Cosáin a úsáidtear go hinmheánach:",
+    "Introduced By": "Tugtha isteach ag",
+    "Introducer": "Réamhrá",
+    "Introduction": "Réamhrá",
+    "Inversion of the given condition (i.e. do not exclude)": "Inbhéartú an choinníll áirithe (i.e. ná cuir as an áireamh)",
+    "Keep Versions": "Coinnigh Leaganacha",
+    "LDAP": "LDAPName",
+    "Largest First": "An Chéad Cheann is Mó",
+    "Last 30 Days": "Laethanta 30 seo caite",
+    "Last 7 Days": "Laethanta 7 seo caite",
+    "Last Month": "An Mhí Seo Caite",
+    "Last Scan": "An scanadh is déanaí",
+    "Last seen": "Feicthe go deireanach",
+    "Latest Change": "An tAthrú is Déanaí",
+    "Learn more": "Faigh tuilleadh eolais",
+    "Learn more at {%url%}": "Tuilleadh eolais ag {{url}}",
+    "Limit": "Teorainn",
+    "Listener Failures": "Teipeanna an Éisteora",
+    "Listener Status": "Stádas an éisteora",
+    "Listeners": "Éisteoirí",
+    "Loading data...": "Sonraí á luchtú...",
+    "Loading...": "Á Luchtú...",
+    "Local Additions": "Breiseanna Logánta",
+    "Local Discovery": "Fionnachtain Áitiúil",
+    "Local State": "Stát Áitiúil",
+    "Local State (Total)": "Stát Áitiúil (Iomlán)",
+    "Locally Changed Items": "Míreanna Athraithe go hÁitiúil",
+    "Log": "Logáil",
+    "Log File": "Logchomhad",
+    "Log In": "Logáil isteach",
+    "Log Out": "Logáil Amach",
+    "Log in to see paths information.": "Logáil isteach chun faisnéis faoi chosáin a fheiceáil.",
+    "Log in to see version information.": "Logáil isteach chun faisnéis faoin leagan a fheiceáil.",
+    "Log tailing paused. Scroll to the bottom to continue.": "Bhí eireaball loga ar sos. Scrollaigh go bun an leathanaigh chun leanúint ar aghaidh.",
+    "Login failed, see Syncthing logs for details.": "Theip ar logáil isteach, féach logaí sioncronaithe le haghaidh sonraí.",
+    "Logs": "Logchomhaid",
+    "Major Upgrade": "Uasghrádú Mór",
+    "Mass actions": "Gníomhartha Aifrinn",
+    "Maximum Age": "Aois Uasta",
+    "Maximum single entry size": "Uasmhéid iontrála aonair",
+    "Maximum total size": "Uasmhéid iomlán",
+    "Metadata Only": "Meiteashonraí Amháin",
+    "Minimum Free Disk Space": "Íosspás Diosca Saor in Aisce",
+    "Mod. Device": "Mòd. Gléas",
+    "Mod. Time": "Mòd. Am",
+    "More than a month ago": "Níos mó ná mí ó shin",
+    "More than a week ago": "Níos mó ná seachtain ó shin",
+    "More than a year ago": "Níos mó ná bliain ó shin",
+    "Move to top of queue": "Bog go barr na scuaine",
+    "Multi level wildcard (matches multiple directory levels)": "Saoróg il-leibhéil (meaitseálann sé leibhéil eolaire éagsúla)",
+    "Never": "Riamh",
+    "New Device": "Gléas Nua",
+    "New Folder": "Fillteán Nua",
+    "Newest First": "An Chéad Cheann is Nuaí",
+    "No": "Ní hea",
+    "No File Versioning": "Gan Leagan Comhaid",
+    "No files will be deleted as a result of this operation.": "Ní scriosfar aon chomhaid mar thoradh ar an oibríocht seo.",
+    "No rules set": "Níl aon rialacha leagtha síos",
+    "No upgrades": "Gan uasghrádú",
+    "Not shared": "Gan roinnt",
+    "Notice": "Fógra",
+    "Number of Connections": "Líon na nasc",
+    "OK": "Ceart go leor",
+    "Off": "As",
+    "Oldest First": "An Chéad duine is sine",
+    "Optional descriptive label for the folder. Can be different on each device.": "Lipéad tuairisciúil roghnach don fhillteán. Is féidir a bheith difriúil ar gach gléas.",
+    "Options": "Roghanna",
+    "Out of Sync": "As Sioncronú",
+    "Out of Sync Items": "As Míreanna Sioncronaithe",
+    "Outgoing Rate Limit (KiB/s)": "Teorainn Ráta Amach (KiB/s)",
+    "Override": "Sáraigh",
+    "Override Changes": "Sáraigh Athruithe",
+    "Ownership": "Úinéireacht",
+    "Password": "Pasfhocal",
+    "Path": "Conair",
+    "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": "Conair chuig an bhfillteán ar an ríomhaire logánta. Cruthófar é mura bhfuil sé ann. Is féidir an carachtar tilde (~) a úsáid mar aicearra le haghaidh",
+    "Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).": "Conair inar chóir leaganacha a stóráil (fág folamh don chomhadlann réamhshocraithe .stversions san fhillteán comhroinnte).",
+    "Paths": "Cosáin",
+    "Pause": "ginideach: Dhún na nGall",
+    "Pause All": "Cuir Gach Rud ar Sos",
+    "Paused": "Curtha ar sos",
+    "Paused (Unused)": "Sosanna (ligthe i ndearmad)",
+    "Pending changes": "Athruithe ar feitheamh",
+    "Periodic scanning at given interval and disabled watching for changes": "Scanadh tréimhsiúil ag eatramh áirithe agus daoine faoi mhíchumas ag faire ar athruithe",
+    "Periodic scanning at given interval and enabled watching for changes": "Scanadh tréimhsiúil ag eatramh áirithe agus cumasaíodh faire le haghaidh athruithe",
+    "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Scanadh tréimhsiúil ag eatramh áirithe agus theip ar shocrú faire le haghaidh athruithe, ag triail gach 1m:",
+    "Permanently add it to the ignore list, suppressing further notifications.": "Cuir go buan é leis an liosta neamhairde, ag cur fógraí breise faoi chois.",
+    "Please consult the release notes before performing a major upgrade.": "Féach ar na nótaí scaoilte sula ndéanfaidh tú uasghrádú mór.",
+    "Please set a GUI Authentication User and Password in the Settings dialog.": "Socraigh Úsáideoir Fíordheimhnithe GUI agus Pasfhocal sa dialóg Socruithe.",
+    "Please wait": "Fan, le do thoil",
+    "Prefix indicating that the file can be deleted if preventing directory removal": "Réimír a léiríonn gur féidir an comhad a scriosadh má chuirtear cosc ar bhaint eolaire",
+    "Prefix indicating that the pattern should be matched without case sensitivity": "Réimír a léiríonn gur chóir an patrún a mheaitseáil gan íogaireacht cáis",
+    "Preparing to Sync": "Ag ullmhú le sioncronú",
+    "Preview": "Réamhamharc",
+    "Preview Usage Report": "Tuairisc ar Úsáid Réamhamhairc",
+    "QR code": "Cód QR",
+    "QUIC LAN": "LAN QUIC",
+    "QUIC WAN": "WAN QUIC",
+    "Quick guide to supported patterns": "Treoir thapa maidir le patrúin tacaithe",
+    "Random": "Randamach",
+    "Receive Encrypted": "Faigh Criptithe",
+    "Receive Only": "Faigh Amháin",
+    "Received data is already encrypted": "Tá sonraí a fuarthas criptithe cheana féin",
+    "Recent Changes": "Athruithe le Déanaí",
+    "Reduced by ignore patterns": "Laghdaithe ag patrúin neamhaird",
+    "Relay LAN": "Athsheachadán LAN",
+    "Relay WAN": "Athsheachadán WAN",
+    "Release Notes": "Nótaí Eisiúna",
+    "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Tá na gnéithe agus na socruithe is déanaí ag iarrthóirí scaoilte. Tá siad cosúil leis na heisiúintí traidisiúnta sioncronaithe dé-sheachtainiúla.",
+    "Remote Devices": "Gléasanna Cianda",
+    "Remote GUI": "Comhéadan Grafach cianda",
+    "Remove": "Bain",
+    "Remove Device": "Bain Gléas",
+    "Remove Folder": "Bain Fillteán",
+    "Required identifier for the folder. Must be the same on all cluster devices.": "Aitheantóir riachtanach don fhillteán. Ní mór a bheith mar an gcéanna ar gach gléas braisle.",
+    "Rescan": "Cealaigh",
+    "Rescan All": "Cealaigh Gach Rud",
+    "Rescans": "Athscannáin",
+    "Restart": "Atosaigh",
+    "Restart Needed": "Atosaigh de Dhíth",
+    "Restarting": "Ag atosú",
+    "Restore": "Athchóirigh",
+    "Restore Versions": "Athchóirigh Leaganacha",
+    "Resume": "Athdhúisigh",
+    "Resume All": "Atosaigh Gach Rud",
+    "Reused": "Athúsáid",
+    "Revert": "Fill",
+    "Revert Local Changes": "Fill athruithe logánta",
+    "Save": "Sábháil",
+    "Saving changes": "Athruithe á sábháil",
+    "Scan Time Remaining": "Scan an t-am atá fágtha",
+    "Scanning": "Scanadh",
+    "See external versioning help for supported templated command line parameters.": "Féach cabhair leagan seachtrach le haghaidh paraiméadair líne ordaithe teimpléadaithe tacaithe.",
+    "Select All": "Roghnaigh Gach Rud",
+    "Select a version": "Roghnaigh leagan",
+    "Select additional devices to share this folder with.": "Roghnaigh gléasanna breise chun an fillteán seo a chomhroinnt leis.",
+    "Select additional folders to share with this device.": "Roghnaigh fillteáin bhreise le comhroinnt leis an ngléas seo.",
+    "Select latest version": "Roghnaigh an leagan is déanaí",
+    "Select oldest version": "Roghnaigh an leagan is sine",
+    "Send & Receive": "Seol & Faigh",
+    "Send Extended Attributes": "Seol Tréithe Breisithe",
+    "Send Only": "Seol Amháin",
+    "Send Ownership": "Seol Úinéireacht",
+    "Set Ignores on Added Folder": "Socraigh neamhaird ar fhillteán breise",
+    "Settings": "Socruithe",
+    "Share": "Roinn",
+    "Share Folder": "Comhroinn Fillteán",
+    "Share by Email": "Comhroinn trí Ríomhphost",
+    "Share by SMS": "Comhroinn de réir SMS",
+    "Share this folder?": "Comhroinn an fillteán seo?",
+    "Shared Folders": "Fillteáin Chomhroinnte",
+    "Shared With": "Roinnte le",
+    "Sharing": "Comhroinnt",
+    "Show ID": "Taispeáin Aitheantas",
+    "Show QR": "Taispeáin QR",
+    "Show detailed discovery status": "Taispeáin stádas mionsonraithe aimsithe",
+    "Show detailed listener status": "Taispeáin stádas mionsonraithe an éisteora",
+    "Show diff with previous version": "Taispeáin diff leis an leagan roimhe seo",
+    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Taispeántar é in ionad ID gléis i stádas na braisle. Fógrófar é do ghléasanna eile mar ainm réamhshocraithe roghnach.",
+    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Taispeántar é in ionad ID gléis i stádas na braisle. Déanfar é a nuashonrú go dtí an t-ainm a fhógraíonn an gléas má fhágtar folamh é.",
+    "Shutdown": "Múchadh",
+    "Shutdown Complete": "Múchadh Críochnaithe",
+    "Simple": "Simplí",
+    "Simple File Versioning": "Leagan Simplí Comhad",
+    "Single level wildcard (matches within a directory only)": "Saoróg leibhéal aonair (meaitseálann sé laistigh d'eolaire amháin)",
+    "Size": "Méid",
+    "Smallest First": "An Chéad Cheann is Lú",
+    "Some discovery methods could not be established for finding other devices or announcing this device:": "Níorbh fhéidir roinnt modhanna aimsithe a bhunú chun gléasanna eile a aimsiú nó chun an gléas seo a fhógairt:",
+    "Some items could not be restored:": "Níorbh fhéidir roinnt míreanna a aischur:",
+    "Some listening addresses could not be enabled to accept connections:": "Níorbh fhéidir roinnt seoltaí éisteachta a chumasú chun glacadh le naisc:",
+    "Source Code": "Cód Foinseach",
+    "Stable releases and release candidates": "Eisiúintí cobhsaí agus iarrthóirí scaoilte",
+    "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "Tá moill thart ar choicís ar scaoileadh cobhsaí. Le linn an ama seo téann siad trí thástáil mar iarrthóirí scaoilte.",
+    "Stable releases only": "Eisiúintí cobhsaí amháin",
+    "Staggered": "Tuislithe",
+    "Staggered File Versioning": "Leagan Comhad Staggered",
+    "Start Browser": "Tosaigh Brabhsálaí",
+    "Statistics": "Staitisticí",
+    "Stay logged in": "Fan logáilte isteach",
+    "Stopped": "Stoptha",
+    "Stores and syncs only encrypted data. Folders on all connected devices need to be set up with the same password or be of type \"{%receiveEncrypted%}\" too.": "Ní dhéanann siopaí agus sioncronaithe ach sonraí criptithe. Ní mór fillteáin ar gach gléas nasctha a chur ar bun leis an bpasfhocal céanna nó a bheith de chineál \"{{receiveEncrypted}}\" freisin.",
+    "Subject:": "Ábhar:",
+    "Support": "Tacaíocht",
+    "Support Bundle": "Beart Tacaíochta",
+    "Sync Extended Attributes": "Sioncrónaigh Tréithe Breisithe",
+    "Sync Ownership": "Sioncrónaigh Úinéireacht",
+    "Sync Protocol Listen Addresses": "Sioncrónaigh Seoltaí Éisteachta an Phrótacail",
+    "Sync Status": "Stádas sioncronaithe",
+    "Syncing": "Sioncronú",
+    "Syncthing device ID for \"{%devicename%}\"": "Aitheantas gléis á shioncronú le haghaidh \"{{devicename}}\"",
+    "Syncthing has been shut down.": "Tá an sioncronú múchta.",
+    "Syncthing includes the following software or portions thereof:": "Áirítear leis an sioncronú na bogearraí seo a leanas nó codanna díobh:",
+    "Syncthing is Free and Open Source Software licensed as MPL v2.0.": "Tá Syncthing Free and Open Source Software ceadúnaithe mar MPL v2.0.",
+    "Syncthing is a continuous file synchronization program. It synchronizes files between two or more computers in real time, safely protected from prying eyes. Your data is your data alone and you deserve to choose where it is stored, whether it is shared with some third party, and how it's transmitted over the internet.": "Is clár leanúnach sioncronaithe comhad é sioncronú. Sioncrónaíonn sé comhaid idir dhá ríomhaire nó níos mó i bhfíor-am, cosanta go sábháilte ó shúile prying. Is é do chuid sonraí amháin do chuid sonraí agus is fiú duit a roghnú cá stóráiltear iad, cibé an roinntear iad le tríú páirtí éigin, agus conas a tharchuirtear iad ar an idirlíon.",
+    "Syncthing is listening on the following network addresses for connection attempts from other devices:": "Tá sioncronú ag éisteacht ar na seoltaí líonra seo a leanas le haghaidh iarrachtaí ceangail ó ghléasanna eile:",
+    "Syncthing is not listening for connection attempts from other devices on any address.  Only outgoing connections from this device may work.": "Níl sioncronú ag éisteacht le hiarrachtaí ceangail ó ghléasanna eile ar aon seoladh.  Ní féidir ach naisc amach ón ngléas seo a bheith ag obair.",
+    "Syncthing is restarting.": "Tá sioncronú ag atosú.",
+    "Syncthing is saving changes.": "Tá athruithe á sábháil ag sioncronú.",
+    "Syncthing is upgrading.": "Tá uasghrádú á dhéanamh ar shioncronú.",
+    "Syncthing now supports automatically reporting crashes to the developers. This feature is enabled by default.": "Tacaíonn sioncronú anois le tuairteanna a thuairisciú go huathoibríoch do na forbróirí. Cumasaítear an ghné seo de réir réamhshocraithe.",
+    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Is cosúil go bhfuil sioncronú síos, nó tá fadhb le do nasc Idirlín. Ag baint triail as…",
+    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Is cosúil go bhfuil fadhb ag sioncronú d'iarratas a phróiseáil. Athnuaigh an leathanach nó atosaigh Sioncronú má leanann an fhadhb ar aghaidh.",
+    "TCP LAN": "LAN TCP",
+    "TCP WAN": "WAN TCP",
+    "Take me back": "Tóg ar ais mé",
+    "The GUI address is overridden by startup options. Changes here will not take effect while the override is in place.": "Tá an seoladh GUI sáraithe ag roghanna tosaithe. Ní thiocfaidh athruithe anseo i bhfeidhm fad is atá an sárú i bhfeidhm.",
+    "The Syncthing Authors": "Na húdair sioncronaithe",
+    "The Syncthing admin interface is configured to allow remote access without a password.": "Tá an comhéadan riaracháin Syncthing cumraithe chun cianrochtain a cheadú gan phasfhocal.",
+    "The aggregated statistics are publicly available at the URL below.": "Tá na staitisticí comhiomlánaithe ar fáil go poiblí ag an URL thíos.",
+    "The cleanup interval cannot be blank.": "Ní féidir leis an eatramh glanta a bheith bán.",
+    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Sábháladh an chumraíocht ach níor cuireadh i ngníomh í. Ní mór sioncronú a atosú chun an chumraíocht nua a ghníomhachtú.",
+    "The device ID cannot be blank.": "Ní féidir aitheantas an ghléis a bheith bán.",
+    "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).": "Is féidir ID an ghléis atá le cur isteach anseo a fháil sa dialóg \"Gníomhartha > Taispeáin ID\" ar an ngléas eile. Tá spásanna agus daiseanna roghnach (neamhaird).",
+    "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.": "Seoltar an tuarascáil úsáide criptithe gach lá. Úsáidtear é chun ardáin choitianta, méideanna fillteáin agus leaganacha feidhmchláir a rianú. Má athraítear an tacar sonraí tuairiscithe, spreagfar thú leis an dialóg seo arís.",
+    "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.": "Níl cuma bhailí ar aitheantas an ghléis iontráilte. Ba chóir go mbeadh sé ina teaghrán carachtar 52 nó 56 comhdhéanta de litreacha agus uimhreacha, le spásanna agus dashes a bheith roghnach.",
+    "The folder ID cannot be blank.": "Ní féidir aitheantas an fhillteáin a bheith bán.",
+    "The folder ID must be unique.": "Caithfidh aitheantas an fhillteáin a bheith uathúil.",
+    "The folder content on other devices will be overwritten to become identical with this device. Files not present here will be deleted on other devices.": "Déanfar inneachar an fhillteáin ar ghléasanna eile a fhorscríobh le bheith comhionann leis an ngléas seo. Scriosfar comhaid nach bhfuil i láthair anseo ar ghléasanna eile.",
+    "The folder content on this device will be overwritten to become identical with other devices. Files newly added here will be deleted.": "Déanfar inneachar an fhillteáin ar an ngléas seo a fhorscríobh le bheith comhionann le gléasanna eile. Scriosfar comhaid nua a cuireadh leis anseo.",
+    "The folder path cannot be blank.": "Ní féidir le cosán an fhillteáin a bheith bán.",
+    "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.": "Úsáidtear na heatraimh seo a leanas: don chéad uair an chloig coinnítear leagan gach 30 soicind, don chéad lá coinnítear leagan gach uair an chloig, don chéad 30 lá coinnítear leagan gach lá, go dtí an aois uasta a choinnítear leagan gach seachtain.",
+    "The following items could not be synchronized.": "Níorbh fhéidir na míreanna seo a leanas a shioncrónú.",
+    "The following items were changed locally.": "Athraíodh na míreanna seo a leanas go háitiúil.",
+    "The following methods are used to discover other devices on the network and announce this device to be found by others:": "Úsáidtear na modhanna seo a leanas chun gléasanna eile ar an líonra a aimsiú agus chun an gléas seo a fhógairt le haimsiú ag daoine eile:",
+    "The following text will automatically be inserted into a new message.": "Cuirfear an téacs seo a leanas isteach i dteachtaireacht nua go huathoibríoch.",
+    "The following unexpected items were found.": "Aimsíodh na míreanna gan choinne seo a leanas.",
+    "The interval must be a positive number of seconds.": "Caithfidh an t-eatramh a bheith ina líon dearfach soicind.",
+    "The interval, in seconds, for running cleanup in the versions directory. Zero to disable periodic cleaning.": "An t-eatramh, i soicindí, le haghaidh glanadh a reáchtáil san eolaire leaganacha. Nialas chun glanadh tréimhsiúil a dhíchumasú.",
+    "The maximum age must be a number and cannot be blank.": "Caithfidh an aois uasta a bheith ina uimhir agus ní féidir léi a bheith bán.",
+    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "An t-uasmhéid ama chun leagan a choinneáil (i laethanta, socraithe go 0 chun leaganacha a choinneáil go deo).",
+    "The number of connections must be a non-negative number.": "Ní mór líon na nasc a bheith ina uimhir neamh-dhiúltach.",
+    "The number of days must be a number and cannot be blank.": "Caithfidh líon na laethanta a bheith ina uimhir agus ní féidir leo a bheith bán.",
+    "The number of days to keep files in the trash can. Zero means forever.": "Líon na laethanta chun comhaid a choinneáil sa bhruscar. Ciallaíonn nialas go deo.",
+    "The number of old versions to keep, per file.": "Líon na seanleaganacha le coinneáil, in aghaidh an chomhaid.",
+    "The number of versions must be a number and cannot be blank.": "Caithfidh líon na leaganacha a bheith ina uimhir agus ní féidir leo a bheith bán.",
+    "The path cannot be blank.": "Ní féidir leis an gcosán a bheith bán.",
+    "The rate limit is applied to the accumulated traffic of all connections to this device.": "Cuirtear an teorainn ráta i bhfeidhm ar thrácht carntha gach nasc leis an ngléas seo.",
+    "The rate limit must be a non-negative number (0: no limit)": "Ní mór an teorainn ráta a bheith ina uimhir neamh-dhiúltach (0: gan teorainn)",
+    "The remote device has not accepted sharing this folder.": "Níor ghlac an gléas cianda leis an bhfillteán seo a chomhroinnt.",
+    "The remote device has paused this folder.": "Chuir an gléas cianda an fillteán seo ar sos.",
+    "The rescan interval must be a non-negative number of seconds.": "Ní mór an t-eatramh rescan a bheith ina líon neamh-diúltach soicind.",
+    "There are no devices to share this folder with.": "Níl aon ghléas ann chun an fillteán seo a roinnt leis.",
+    "There are no file versions to restore.": "Níl aon leaganacha comhaid le cur ar ais.",
+    "There are no folders to share with this device.": "Níl aon fhillteáin le roinnt leis an ngléas seo.",
+    "They are retried automatically and will be synced when the error is resolved.": "Déantar iad a aisghabháil go huathoibríoch agus déanfar iad a shioncronú nuair a réitítear an earráid.",
+    "This Device": "An Gléas seo",
+    "This Month": "An mhí seo",
+    "This can easily give hackers access to read and change any files on your computer.": "Is féidir é seo a thabhairt go héasca hackers rochtain a léamh agus aon chomhaid ar do ríomhaire a athrú.",
+    "This device cannot automatically discover other devices or announce its own address to be found by others.  Only devices with statically configured addresses can connect.": "Ní féidir leis an ngléas seo gléasanna eile a aimsiú go huathoibríoch ná a sheoladh féin a fhógairt le haimsiú ag daoine eile.  Ní féidir ach le gléasanna le seoltaí atá cumraithe go statically ceangal.",
+    "This is a major version upgrade.": "Is uasghrádú mór leagan é seo.",
+    "This setting controls the free space required on the home (i.e., index database) disk.": "Rialaíonn an socrú seo an spás saor in aisce a theastaíonn ar an diosca baile (i.e., bunachar sonraí innéacs).",
+    "Time": "Am",
+    "Time the item was last modified": "Am a athraíodh an mhír go deireanach",
+    "To connect with the Syncthing device named \"{%devicename%}\", add a new remote device on your end with this ID:": "Chun ceangal a dhéanamh leis an ngléas Sioncronaithe darb ainm \"{{devicename}}\", cuir gléas cianda nua ar do dheireadh leis an ID seo:",
+    "To permit a rule, have the checkbox checked. To deny a rule, leave it unchecked.": "Chun riail a cheadú, seiceáil an ticbhosca. To deny a rule, é a fhágáil gan seiceáil.",
+    "Today": "Inniu",
+    "Trash Can": "Is féidir le bruscar",
+    "Trash Can File Versioning": "Is féidir le bruscar leagan comhaid",
+    "Type": "Cineál",
+    "UNIX Permissions": "Ceadanna UNIX",
+    "Unavailable": "Níl sé ar fáil",
+    "Unavailable/Disabled by administrator or maintainer": "Níl sé ar fáil/Díchumasaithe ag riarthóir nó cothaitheoir",
+    "Undecided (will prompt)": "Neamhdhearbhaithe (tabharfaidh sé leid)",
+    "Unexpected Items": "Míreanna Gan Choinne",
+    "Unexpected items have been found in this folder.": "Aimsíodh míreanna gan choinne san fhillteán seo.",
+    "Unignore": "Gan Neamhaird",
+    "Unknown": "Neamhaithnid",
+    "Unshared": "Neamhroinnte",
+    "Unshared Devices": "Gléasanna Neamhroinnte",
+    "Unshared Folders": "Fillteáin Neamhroinnte",
+    "Untrusted": "Neamhiontaofa",
+    "Up to Date": "Cothrom le dáta",
+    "Updated {%file%}": "Nuashonraithe {{file}}",
+    "Upgrade": "Uasghrádú",
+    "Upgrade To {%version%}": "Uasghrádú go {{version}}",
+    "Upgrading": "Uasghrádú",
+    "Upload Rate": "Ráta Uasluchtaithe",
+    "Uptime": "Aga fónaimh",
+    "Usage reporting is always enabled for candidate releases.": "Cumasaítear tuairisciú úsáide i gcónaí le haghaidh eisiúintí iarrthóra.",
+    "Use HTTPS for GUI": "Úsáid HTTPS le haghaidh GUI",
+    "Use notifications from the filesystem to detect changed items.": "Bain úsáid as fógraí ón gcóras comhad chun míreanna athraithe a bhrath.",
+    "User": "Úsáideoir",
+    "User Home": "Baile Úsáideora",
+    "Username/Password has not been set for the GUI authentication. Please consider setting it up.": "Níor socraíodh ainm úsáideora/pasfhocal le haghaidh fíordheimhniú an GUI. Smaoinigh, le do thoil, ar é a chur ar bun.",
+    "Using a QUIC connection over LAN": "Ag baint úsáide as nasc QUIC thar LAN",
+    "Using a QUIC connection over WAN": "Ag baint úsáide as nasc QUIC thar WAN",
+    "Using a direct TCP connection over LAN": "Ag baint úsáide as nasc TCP díreach thar LAN",
+    "Using a direct TCP connection over WAN": "Ag baint úsáide as nasc TCP díreach thar WAN",
+    "Version": "Leagan",
+    "Versions": "Leaganacha",
+    "Versions Path": "Conair na Leaganacha",
+    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Scriostar leaganacha go huathoibríoch má tá siad níos sine ná an aois uasta nó má sháraíonn siad líon na gcomhad a cheadaítear in eatramh.",
+    "Waiting to Clean": "Ag Fanacht le Glanadh",
+    "Waiting to Scan": "Ag fanacht le Scanadh",
+    "Waiting to Sync": "Ag fanacht le sioncronú",
+    "Warning": "Rabhadh",
+    "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "Rabhadh, is máthairchomhadlann é an cosán seo d'fhillteán atá ann cheana féin \"{{otherFolder}}\".",
+    "Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Rabhadh, is máthairchomhadlann é an cosán seo d'fhillteán atá ann cheana féin \"{{otherFolderLabel}}\" ({{otherFolder}}).",
+    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Rabhadh, is fochomhadlann é an cosán seo d'fhillteán atá ann cheana féin \"{{otherFolder}}\".",
+    "Warning, this path is a subdirectory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Rabhadh, is fochomhadlann é an cosán seo d'fhillteán atá ann cheana féin \"{{otherFolderLabel}}\" ({{otherFolder}}).",
+    "Warning: If you are using an external watcher like {%syncthingInotify%}, you should make sure it is deactivated.": "Rabhadh: Má tá uaireadóir seachtrach á úsáid agat mar {{syncthingInotify}}, ba chóir duit a chinntiú go bhfuil sé díghníomhachtaithe.",
+    "Watch for Changes": "Bí ag faire ar athruithe",
+    "Watching for Changes": "Ag Faire ar Athruithe",
+    "Watching for changes discovers most changes without periodic scanning.": "Má bhreathnaíonn tú ar athruithe, faightear amach an chuid is mó de na hathruithe gan scanadh tréimhsiúil.",
+    "When adding a new device, keep in mind that this device must be added on the other side too.": "Agus gléas nua á chur leis, coinnigh i gcuimhne go gcaithfear an gléas seo a chur leis ar an taobh eile freisin.",
+    "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.": "Agus fillteán nua á chur leis, coinnigh i gcuimhne go n-úsáidtear ID an Fhillteáin chun fillteáin a cheangal le chéile idir gléasanna. Tá siad cásíogair agus ní mór iad a mheaitseáil go díreach idir gach feiste.",
+    "When set to more than one on both devices, Syncthing will attempt to establish multiple concurrent connections. If the values differ, the highest will be used. Set to zero to let Syncthing decide.": "Nuair a shocraítear níos mó ná ceann amháin ar an dá ghléas, déanfaidh Syncthing iarracht naisc chomhthráthacha iolracha a bhunú. Má tá na luachanna difriúil, úsáidfear an ceann is airde. Socraigh go nialas chun ligean do Syncthing cinneadh a dhéanamh.",
+    "Yes": "Tá",
+    "Yesterday": "Inné",
+    "You can also copy and paste the text into a new message manually.": "Is féidir leat an téacs a chóipeáil agus a ghreamú isteach i dteachtaireacht nua de láimh.",
+    "You can also select one of these nearby devices:": "Is féidir leat ceann de na gléasanna in aice láimhe seo a roghnú freisin:",
+    "You can change your choice at any time in the Settings dialog.": "Is féidir leat do rogha a athrú ag am ar bith sa dialóg Socruithe.",
+    "You can read more about the two release channels at the link below.": "Is féidir leat tuilleadh a léamh faoin dá chainéal scaoilte ag an nasc thíos.",
+    "You have no ignored devices.": "Níl aon ghléasanna neamhairde agat.",
+    "You have no ignored folders.": "Níl aon fhillteáin neamhairde agat.",
+    "You have unsaved changes. Do you really want to discard them?": "Tá athruithe gan sábháil agat. An bhfuil tú cinnte gur mian leat iad a chaitheamh i leataobh?",
+    "You must keep at least one version.": "Ní mór duit leagan amháin ar a laghad a choinneáil.",
+    "You should never add or change anything locally in a \"{%receiveEncrypted%}\" folder.": "Níor chóir duit aon rud a chur leis nó a athrú go háitiúil i bhfillteán \"{{receiveEncrypted}}\".",
+    "Your SMS app should open to let you choose the recipient and send it from your own number.": "Ba chóir go mbeadh d'aip SMS oscailte chun ligean duit an faighteoir a roghnú agus é a sheoladh ó d'uimhir féin.",
+    "Your email app should open to let you choose the recipient and send it from your own address.": "Ba cheart d'aip ríomhphoist a oscailt chun ligean duit an faighteoir a roghnú agus é a sheoladh ó do sheoladh féin.",
+    "days": "laethanta",
+    "deleted": "scriosta",
+    "deny": "diúltú",
+    "directories": "Eolairí",
+    "file": "comhad",
+    "files": "comhaid",
+    "folder": "fillteán",
+    "full documentation": "doiciméadú iomlán",
+    "items": "míreanna",
+    "modified": "modhnaithe",
+    "permit": "cead",
+    "seconds": "soicind",
+    "theme": {
+        "name": {
+            "black": "Dubh",
+            "dark": "Dorcha",
+            "default": "Réamhshocrú",
+            "light": "Solas"
+        }
+    },
+    "unknown device": "gléas anaithnid",
+    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} ag iarraidh fillteán a roinnt \"{{folder}}\".",
+    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} ag iarraidh fillteán a roinnt \"{{folderlabel}}\" ({{folder}}).",
+    "{%reintroducer%} might reintroduce this device.": "D'fhéadfadh {{reintroducer}} an gléas seo a athbhunú."
+}

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

@@ -10,17 +10,457 @@
     "Add Device": "Engadir dispositivo",
     "Add Folder": "Engadir cartafol",
     "Add Remote Device": "Engadir dispositivo remoto",
-    "Add devices from the introducer to our device list, for mutually shared folders.": "Engadir dispositivos desde o enviador ao noso dispositivo, para cartafoles mutuamente compartidos.",
+    "Add devices from the introducer to our device list, for mutually shared folders.": "Engadir dispositivos desde o enviador ao noso dispositivo, para cartafois mutuamente compartidos.",
+    "Add filter entry": "Engadir unha entrada ao filtro",
+    "Add ignore patterns": "Engadir patróns a ignorar",
     "Add new folder?": "Engadir novo cartafol?",
+    "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.": "Ademais, aumentarase o lapso de reescaneo completo (60 veces, é dicir, novo por defecto dunha hora). Tamén pode configuralo de xeito manual para cada cartafol logo de escoller No.",
     "Address": "Enderezo",
     "Addresses": "Enderezos",
     "Advanced": "Avanzado",
     "Advanced Configuration": "Configuración avanzada",
     "All Data": "Todos os datos",
+    "All Time": "Todo o tempo",
+    "All folders shared with this device must be protected by a password, such that all sent data is unreadable without the given password.": "Todos os cartafois compartidos con este dispositivo teñen que estar protexidos por un contrasinal, de modo que os datos enviados sexan ilexibles sen o constrasinal indicado.",
     "Allow Anonymous Usage Reporting?": "Permitir o informe de uso anónimo?",
     "Allowed Networks": "Redes permitidas",
     "Alphabetic": "Alfabética",
     "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.": "Un comando externo xestiona as versións. Ten que eliminar o ficheiro do cartafol compartido. Si a ruta ao aplicativo contén espazos, deberían ir acotados.",
     "Anonymous Usage Reporting": "Informe anónimo de uso",
-    "LDAP": "LDAP"
+    "Anonymous usage report format has changed. Would you like to move to the new format?": "O formato do informe de uso anónimo cambiou. Quere usar o novo formato?",
+    "Applied to LAN": "Aplicado a LAN",
+    "Apply": "Aplicar",
+    "Are you sure you want to override all remote changes?": "Está seguro de que desexa sobrecribir todos os cambios remotos?",
+    "Are you sure you want to permanently delete all these files?": "Está seguro de que desexa eliminar permanentemente todos estes ficheiros?",
+    "Are you sure you want to remove device {%name%}?": "Está seguro de que desexa eliminar o dispositivo {{name}}?",
+    "Are you sure you want to remove folder {%label%}?": "Está seguro de que desexa eliminar o cartafol {{label}}?",
+    "Are you sure you want to restore {%count%} files?": "Está seguro de que desexa restaurar {{count}} ficheiros?",
+    "Are you sure you want to revert all local changes?": "Está seguro de que quere reverter todos os cambios locais?",
+    "Are you sure you want to upgrade?": "Está seguro de que desexa actualizar?",
+    "Authors": "Autores",
+    "Auto Accept": "Aceptar automaticamente",
+    "Automatic Crash Reporting": "Informe Automático de Erros",
+    "Automatic upgrade now offers the choice between stable releases and release candidates.": "Agora a actualización automática permite escoller entre versións estables e versións candidatas.",
+    "Automatic upgrades": "Actualizacións automáticas",
+    "Automatic upgrades are always enabled for candidate releases.": "As actualizacións automáticas sempre están activadas para versións candidatas.",
+    "Be careful!": "Teña coidado!",
+    "Body:": "Corpo:",
+    "Bugs": "Erros",
+    "Cancel": "Cancelar",
+    "Changelog": "Rexistro de cambios",
+    "Cleaning Versions": "Limpando Versións",
+    "Cleanup Interval": "Intervalo de Limpeza",
+    "Click to see full identification string and QR code.": "Faga clic para ver a cadea de identificación completa e o código QR.",
+    "Close": "Pechar",
+    "Comment, when used at the start of a line": "Comentar, cando se usa ao inicio dunha liña",
+    "Compression": "Compresión",
+    "Configuration Directory": "Directorio de Configuración",
+    "Configuration File": "Ficheiro de Configuración",
+    "Configured": "Configurado",
+    "Connected (Unused)": "Conectado (Sen uso)",
+    "Connection Error": "Erro de Conexión",
+    "Connection Management": "Xestión de Conexións",
+    "Connection Type": "Tipo de Conexión",
+    "Connections": "Conexións",
+    "Connections via relays might be rate limited by the relay": "As conexións a través de relevos poden estar limitados polo relevo",
+    "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.": "Agora está dispoñible o control de cambios continuo en Syncthing. Esto detectará cambios no disco e fará un escaneo só nas rutas modificadas. Os beneficios son que os cambios propaganse máis rapido e fan falta menos escaneos completos.",
+    "Copied from elsewhere": "Copiado doutro sitio",
+    "Copied from original": "Copiado do orixinal",
+    "Copied!": "Copiado!",
+    "Copy": "Copiar",
+    "Copy failed! Try to select and copy manually.": "Fallou a copia! Probe a seleccionar e copiar manualmente.",
+    "Danger!": "Perigo!",
+    "Database Location": "Localización da Base de Datos",
+    "Default": "Predeterminado",
+    "Default Configuration": "Configuración Predeterminada",
+    "Default Device": "Dispositivo Predeterminado",
+    "Default Folder": "Cartafol Predeterminado",
+    "Default Ignore Patterns": "Patróns de Ignorado Predeterminados",
+    "Delete": "Eliminar",
+    "Delete Unexpected Items": "Eliminar os Ítems Inesperados",
+    "Deleted {%file%}": "Eliminado {{file}}",
+    "Deselect All": "Deseleccionar Todo",
+    "Deselect devices to stop sharing this folder with.": "Deleccionar os dispositivos cos que deixar de compartir este cartafol.",
+    "Deselect folders to stop sharing with this device.": "Deseleccionar os cartafois que deixar de compartir con este dispositivo.",
+    "Device": "Dispositivo",
+    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "O dispositivo \"{{name}}\" ({{device}} en {{address}}) quere conectarse. Engadir o dispositivo?",
+    "Device Certificate": "Certificado do Dispositivo",
+    "Device ID": "ID do dispositivo",
+    "Device Identification": "Identificación do dispositivo",
+    "Device Name": "Nome do dispositivo",
+    "Device Status": "Estado do dispositivo",
+    "Device that last modified the item": "Dispositivo que modificou o elemento por última vez",
+    "Devices": "Dispositivos",
+    "Disable Crash Reporting": "Desactivar o Informe de Erros",
+    "Disabled": "Deshabilitado",
+    "Discard": "Descartar",
+    "Disconnected": "Desconectado",
+    "Disconnected (Inactive)": "Desconectado (Inactivo)",
+    "Disconnected (Unused)": "Desconectado (Sen uso)",
+    "Discovered": "Descuberto",
+    "Discovery": "Descubrimento",
+    "Discovery Failures": "Erros de Descubrimento",
+    "Discovery Status": "Estado do Descubrimento",
+    "Dismiss": "Descartar",
+    "Do not restore": "Non restaurar",
+    "Do you want to enable watching for changes for all your folders?": "Quere habilitar o control de cambios para todos os seus cartafois?",
+    "Documentation": "Documentación",
+    "Download Rate": "Velocidade de Descarga",
+    "Downloaded": "Descargado",
+    "Downloading": "Descargando",
+    "Edit": "Editar",
+    "Edit Device": "Editar o Dispositivo",
+    "Edit Folder": "Editar o Cartafol",
+    "Editing {%path%}.": "Editando {{path}}.",
+    "Enable NAT traversal": "Habilitar o NAT traversal",
+    "Enable Relaying": "Habilitar Relevos",
+    "Enabled": "Habilitado",
+    "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Introduza un número non negativo (por exemplo, \"2.35\") e seleccione unha unidade. As porcentaxes son como partes totais do tamaño do disco.",
+    "Enter a non-privileged port number (1024 - 65535).": "Introduza un número de porto non privilexiado (1024-65535).",
+    "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Introduza direccións separadas por comas (\"tcp://ip:porto\", \"tcp://host:porto\") ou \"dynamic\" para realizar o descubrimento automático da dirección.",
+    "Enter ignore patterns, one per line.": "Introduza patróns a ignorar, un por liña.",
+    "Enter up to three octal digits.": "Introduza ata tres díxitos octais.",
+    "Error": "Erro",
+    "Extended Attributes": "Atributos Estendidos",
+    "Extended Attributes Filter": "Filtro de Atributos Estendidos",
+    "External": "Externo",
+    "External File Versioning": "Versionado de Fichiro Externo",
+    "File Pull Order": "Orde de Obtención de Arquivos",
+    "File Versioning": "Versionado de Ficheiros",
+    "Filter by date": "FIltrar por data",
+    "Filter by name": "Filtrar por nome",
+    "Folder": "Cartafol",
+    "Folder ID": "ID do Cartafol",
+    "Folder Label": "Etiqueta do Cartafol",
+    "Folder Path": "Ruta do Cartafol",
+    "Folder Status": "Estado do Cartafol",
+    "Folder Type": "Tipo do Cartafol",
+    "Folder type \"{%receiveEncrypted%}\" can only be set when adding a new folder.": "O tipo de cartafol \"{{receiveEncrypted}}\" so pode ser establecido ao engadir un cartafol novo.",
+    "Folder type \"{%receiveEncrypted%}\" cannot be changed after adding the folder. You need to remove the folder, delete or decrypt the data on disk, and add the folder again.": "O tipo de cartafol \"{{receiveEncrypted}}\" non se pode cambiar despois de engadir o cartafol. Ten que eliminar o cartafol, eliminar ou desencriptar os datos do disco e volver a engadirlo.",
+    "Folders": "Cartafois",
+    "Forever": "Para sempre",
+    "Full Rescan Interval (s)": "Intervalo de Escaneamento Completo (s)",
+    "GUI": "GUI",
+    "GUI / API HTTPS Certificate": "Certificado HTTPS GUI/API",
+    "GUI Authentication Password": "Contrasinal de Autenticación da GUI",
+    "GUI Authentication User": "Usuario de Autenticación da GUI",
+    "GUI Authentication: Set User and Password": "Autenticación da GUI: Establecer o Usuario e o Contrasinal",
+    "GUI Listen Address": "Dirección de Escoita da GUI",
+    "GUI Theme": "Tema da GUI",
+    "General": "Xeral",
+    "Generate": "Xerar",
+    "Global Discovery": "Descubrimento Global",
+    "Global Discovery Servers": "Servidores de Descubrimento Global",
+    "Global State": "Estado Global",
+    "Help": "Axuda",
+    "Home page": "Páxina de inicio",
+    "Identification": "Identificación",
+    "Incoming Rate Limit (KiB/s)": "Límite de Descaga (KiB/s)",
+    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Unha configuración incorrecta pode danar os contidos do teu cartafol e deixar Syncthing inutilizable.",
+    "Incorrect user name or password.": "Nome de usuario ou contrasinal incorrecto.",
+    "Inversion of the given condition (i.e. do not exclude)": "Inversión da condición dada (por exemplo, non excluír)",
+    "Keep Versions": "Manter Versións",
+    "LDAP": "LDAP",
+    "Largest First": "Máis Grande Primeiros",
+    "Last 30 Days": "Últimos 30 Días",
+    "Last 7 Days": "Últimos 7 Días",
+    "Last Month": "Último mes",
+    "Last Scan": "Último escaneamento",
+    "Last seen": "Visto por última vez",
+    "Latest Change": "Último cambio",
+    "Limit": "Límite",
+    "Loading data...": "Cargando datos...",
+    "Loading...": "Cargando...",
+    "Local Additions": "Adicións\tlocais",
+    "Local Discovery": "Descubrimento Local",
+    "Local State": "Estado Local",
+    "Local State (Total)": "Estado Local (Total)",
+    "Locally Changed Items": "Ítems Modificados Localmente",
+    "Log": "Rexistro",
+    "Log File": "Ficheiro de Rexistro",
+    "Log In": "Iniciar Sesión",
+    "Log Out": "Pechar Sesión",
+    "Log in to see paths information.": "Inicia sesión para ver información das rutas.",
+    "Log in to see version information.": "Inicia sesión para ver información da versión.",
+    "Login failed, see Syncthing logs for details.": "Fallou o inicio de sesión, vexa os rexistros de Syngthing para máis detalles.",
+    "Logs": "Rexistros",
+    "Major Upgrade": "Actualización Maior",
+    "Mass actions": "Accións en masa",
+    "Maximum Age": "Idade Máxima",
+    "Maximum total size": "Tamaño máximo total",
+    "Metadata Only": "Só Metadatos",
+    "Minimum Free Disk Space": "Espacio Mínimo Libre no Disco",
+    "More than a month ago": "Fai máis dun mes",
+    "More than a week ago": "Fai máis dunha semana",
+    "More than a year ago": "Fai máis dun ano",
+    "Move to top of queue": "Mover a enriba da cola",
+    "Never": "Nunca",
+    "New Device": "Dispositivo Novo",
+    "New Folder": "Cartafol Novo",
+    "Newest First": "Máis Novo Primeiro",
+    "No": "Non",
+    "No File Versioning": "Sen Versionado de Ficheiros",
+    "No files will be deleted as a result of this operation.": "Non se eliminará ningún ficheiro como resultado desta operación.",
+    "No rules set": "Sen regras",
+    "No upgrades": "Sen actualizacións",
+    "Not shared": "Non compartido",
+    "Number of Connections": "Número de Conexións",
+    "Oldest First": "Máis Vellos Primeiro",
+    "Optional descriptive label for the folder. Can be different on each device.": "Etiqueta descritiva opcional para o cartafol. Pode ser distinta en cada dispositivo",
+    "Options": "Opcións",
+    "Outgoing Rate Limit (KiB/s)": "Límite de Saída (KiB/s)",
+    "Override": "Sobrescribir",
+    "Override Changes": "Sobrescribir os Cambios",
+    "Ownership": "Propiedade",
+    "Password": "Contrasinal",
+    "Path": "Ruta",
+    "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Ruta ao cartafol no computador local. Crearase de non existir. A tilde (~) pode usarse como atallo para<",
+    "Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).": "Ruta onde deben gardarse as versión (deixar baleiro para o directorio .stversions por defecto no cartafol compartido).",
+    "Paths": "Rutas",
+    "Pause": "Parar",
+    "Pause All": "Parar Todas",
+    "Paused": "Parada",
+    "Paused (Unused)": "Parada (Sen uso)",
+    "Pending changes": "Cambios pendentes",
+    "Permanently add it to the ignore list, suppressing further notifications.": "Engadilo permanentemente á lista de ignorados, suprimindo notificacións futuras.",
+    "Please consult the release notes before performing a major upgrade.": "Por favor consulte as notas de lanzamento antes de realizar unha actualización maior.",
+    "Please set a GUI Authentication User and Password in the Settings dialog.": "Por favor configure un Usuario e Contrasinal de Autenticación para a GUI no diálogo de Configuración.",
+    "Please wait": "Por favor espere",
+    "Prefix indicating that the pattern should be matched without case sensitivity": "Prefixo que indica que o patrón debe coincidir sen distinguir maiúsculas e minúsculas",
+    "Preparing to Sync": "Preparandose para Sincronizar",
+    "Preview": "Vista previa",
+    "Preview Usage Report": "Vista Previa do Informe de Uso",
+    "QR code": "Código QR",
+    "QUIC LAN": "QUIC LAN",
+    "QUIC WAN": "QUIC WAN",
+    "Quick guide to supported patterns": "Guía rápida dos patróns soportados",
+    "Random": "Aleatorio",
+    "Receive Only": "Só Recibir",
+    "Received data is already encrypted": "Os datos recibidos xa están encriptados",
+    "Recent Changes": "Cambios Recentes",
+    "Reduced by ignore patterns": "Reducido por patróns de ignorar",
+    "Relay LAN": "Relevo LAN",
+    "Relay WAN": "Relevo WAN",
+    "Release Notes": "Notas de Lanzamento",
+    "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Os candidatos de lanzamento conteñen as últimas versións e arranxos. Son parecidas aos lanzamentos bisemanais tradicionais de Syncthing.",
+    "Remote Devices": "Dispositivos Remotos",
+    "Remote GUI": "GUI Remota",
+    "Remove": "Quitar",
+    "Remove Device": "Quitar o Dispositivo",
+    "Remove Folder": "Quitar o Cartafol",
+    "Required identifier for the folder. Must be the same on all cluster devices.": "Identificador requirido para o cartafol. Debe de ser o mesmo en todos os dispositivos do clúster.",
+    "Rescan": "Reescanear",
+    "Rescan All": "Reescanear Todo",
+    "Rescans": "Reescaneos",
+    "Restart": "Reiniciar",
+    "Restart Needed": "Reinicio Requirido",
+    "Restarting": "Reiniciando",
+    "Restore": "Restablecer",
+    "Restore Versions": "Restablecer Versións",
+    "Resume": "Continuar",
+    "Resume All": "Continuar Todo",
+    "Reused": "Reutilizado",
+    "Revert": "Desfacer",
+    "Revert Local Changes": "Desfacer os Cambios Locais",
+    "Save": "Gardar",
+    "Saving changes": "Gardando os cambios",
+    "Scan Time Remaining": "Tempo Restante de Reescaneo",
+    "Scanning": "Escaneando",
+    "Select All": "Seleccionar Todo",
+    "Select a version": "Seleccionar unha versión",
+    "Select additional devices to share this folder with.": "Seleccione dispositivos adicionais cos que compartir este cartafol.",
+    "Select additional folders to share with this device.": "Seleccione cartafois adicionais para compatir con este dispositivo.",
+    "Select latest version": "Seleccionar a última versión",
+    "Select oldest version": "Seleccionar a versión máis vella",
+    "Send & Receive": "Enviar e Recibir",
+    "Send Extended Attributes": "Enviar Atributos Extensos",
+    "Send Only": "Só Enviar",
+    "Send Ownership": "Enviar Propiedade",
+    "Settings": "Configuración",
+    "Share": "Compartir",
+    "Share Folder": "Compartir Cartafol",
+    "Share by Email": "Compartir por Correo Electrónico",
+    "Share by SMS": "Compartir por SMS",
+    "Share this folder?": "Compartir este cartafol?",
+    "Shared Folders": "Cartafois Compartidos",
+    "Shared With": "Compartido Con",
+    "Sharing": "Compartindo",
+    "Show ID": "Mostrar ID",
+    "Show QR": "Mostrar QR",
+    "Show detailed discovery status": "Mostrar estado detallado do descubrimento",
+    "Show detailed listener status": "Mostrar estado detallado da escoita",
+    "Show diff with previous version": "Mostrar a diferencia coa versión anterior",
+    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Mostrado en lugar do ID de Dispositivo no estado do clúster. Anunciarase a outros dispositivos como nome por defecto opcional.",
+    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Mostrado en lugar do ID de Dispositivo no estado do clúster. Actualizarase ao nome que anuncia o dispositivo de se deixar baleiro.",
+    "Shutdown": "Apagar",
+    "Shutdown Complete": "Apagado Completado",
+    "Simple": "Simple",
+    "Simple File Versioning": "Versionado de Ficheiros Sinxelo",
+    "Single level wildcard (matches within a directory only)": "Comodín de primeiro nivel (só coincide ao nivel do directorio)",
+    "Size": "Tamaño",
+    "Smallest First": "Os máis pequenos primeiro",
+    "Some discovery methods could not be established for finding other devices or announcing this device:": "Algúns métodos de descubrimento non se puideron establecer para descubrir outros dispositivo ou anunciarse:",
+    "Some items could not be restored:": "Non se puideron recuperar algúns ítems:",
+    "Some listening addresses could not be enabled to accept connections:": "Algunhas direccións de escoita non se puideron habilitar para aceptar conexións:",
+    "Source Code": "Código Fonte",
+    "Stable releases and release candidates": "Versións estables e candidatos de lanzamento",
+    "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "As versións estables retrásanse ao redor de dúas semanas. Durante este tempo próbanse como candidatas de lanzamento.",
+    "Stable releases only": "Só versións estables",
+    "Start Browser": "Iniciar o Buscador",
+    "Statistics": "Estadísticas",
+    "Stay logged in": "Manter a sesión",
+    "Stopped": "Parado",
+    "Stores and syncs only encrypted data. Folders on all connected devices need to be set up with the same password or be of type \"{%receiveEncrypted%}\" too.": "Só almacena e sincroniza datos encriptados. Os cartafois en todos os dispositivos conectados necesitan configuarse co mesmo constrasinal ou ser do tipo \"{{receiveEncrypted}}\" tamén.",
+    "Subject:": "Asunto:",
+    "Sync Extended Attributes": "Sincronizar os Atributos Extendidos",
+    "Sync Ownership": "Sincronizar Propiedade",
+    "Sync Protocol Listen Addresses": "Direccións de Escoita do Protocolo de Sincronización",
+    "Sync Status": "Estado da Sincronización",
+    "Syncing": "Sincronizando",
+    "Syncthing device ID for \"{%devicename%}\"": "Sincronizando o ID de dispositivo para \"{{devicename}}\"",
+    "Syncthing has been shut down.": "Apagouse Syncthing.",
+    "Syncthing includes the following software or portions thereof:": "Syncthing inclúe todo o seguinte software ou porcións dos mesmos:",
+    "Syncthing is Free and Open Source Software licensed as MPL v2.0.": "Syncthing e Software Libre licenciado baixo a MPL v2.0.",
+    "Syncthing is a continuous file synchronization program. It synchronizes files between two or more computers in real time, safely protected from prying eyes. Your data is your data alone and you deserve to choose where it is stored, whether it is shared with some third party, and how it's transmitted over the internet.": "Syncthing e un programa de sincronización de ficheiros continua. Sincroniza ficheiros entre dous ou máis computadores en tempo real, de maneira segura protexida de miradas indiscretas. Os teus datos son só teus e mereces elixir onde se gardan, se é cunha terceira parte, e como se transmiten pola rede.",
+    "Syncthing is listening on the following network addresses for connection attempts from other devices:": "Syncthing está escoitando nas seguintes direccións de rede intentos de conexión doutros dispositivos:",
+    "Syncthing is not listening for connection attempts from other devices on any address.  Only outgoing connections from this device may work.": "Syncthing non está escoitando intentos de conexión doutros dispositivos en ningunha dirección. Só funcionarán as conexións saíntes deste dispositivo.",
+    "Syncthing is restarting.": "Syncthing estase a reiniciar.",
+    "Syncthing is saving changes.": "Syncthing esta a gardar os cambios.",
+    "Syncthing is upgrading.": "Syncthing estase a actualizar.",
+    "Syncthing now supports automatically reporting crashes to the developers. This feature is enabled by default.": "Syncthing agora pode reportar faios de xeito automático aos desenvolvedores. Esta característica está habilitada por defecto.",
+    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing parece estar apagado, ou hai un problema coa túa conexión de rede. Volvendo a intentalo…",
+    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Parece que Syncthing está a sufrir un problema procesando a túa petición. Por favor refresque a páxina ou reinicie Synthing se o problema perdura.",
+    "TCP LAN": "LAN TCP",
+    "TCP WAN": "WAN TCP",
+    "Take me back": "Léveme de volta",
+    "The GUI address is overridden by startup options. Changes here will not take effect while the override is in place.": "A dirección da GUI sobrescríbese polas opcións de arranque. Os cambios aquí non terán efecto mentres que a invalidación estea activa.",
+    "The Syncthing Authors": "Os Autores de Syncthing",
+    "The Syncthing admin interface is configured to allow remote access without a password.": "A inteface de aministración de Syncthing está configurada para permitir o acceso remoto sen ningún contrasinal.",
+    "The aggregated statistics are publicly available at the URL below.": "As estatísticas agregadas son públicas na URL de debaixo.",
+    "The cleanup interval cannot be blank.": "O intervalo de limpeza non pode estar en branco.",
+    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Gardouse a configuración pero non se activou. Ten que reiniciar Syncthing para activar a configuración nova.",
+    "The device ID cannot be blank.": "O ID de dispositivo non pode estar en branco.",
+    "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.": "O informe de uso encriptado envíase diariamente. Úsase para seguir plataformas comús, tamaños de cartafois e versións da aplicación. Se os datos que se envían cambian, preguntaráselle con este diálogo outra vez.",
+    "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.": "O ID de dispositivo introducido non parece válido. Ten que ser unha cadea de 52 ou 56 caracteres consistente de letras e números, sendo opcionais os espacios e guións.",
+    "The folder ID cannot be blank.": "O ID de cartafol non pode estar en branco.",
+    "The folder ID must be unique.": "O ID de cartafol ten que ser único.",
+    "The folder content on other devices will be overwritten to become identical with this device. Files not present here will be deleted on other devices.": "O contenido do cartafol en outros dispositivos será sobrescrito para volverse identico con este dispositivo. Os ficheiros que non estean aquí eliminaranse nos outros dispositivos.",
+    "The folder content on this device will be overwritten to become identical with other devices. Files newly added here will be deleted.": "O contenido do cartafol neste dispositivo será sobrescrito para volverse idéntico aos outros dispositivos. Os ficheiros novos serán eliminados.",
+    "The folder path cannot be blank.": "A ruta do cartafol non pode estar en branco.",
+    "The following items could not be synchronized.": "Non se puido sincronizar os seguintes ítems.",
+    "The following items were changed locally.": "Cambiáronse localmente os seguintes ítems.",
+    "The following methods are used to discover other devices on the network and announce this device to be found by others:": "Os seguintes métodos úsanse para descubrir outros dispositivos na rede e anunciar este dispositivo para que o encontren outros:",
+    "The following text will automatically be inserted into a new message.": "O seguinte texto insertarse automaticamente nunha nova mensaxe.",
+    "The following unexpected items were found.": "Atopáronse os seguintes ítems inesperados.",
+    "The interval must be a positive number of seconds.": "O intervalo ten que ser un número positivo de segundos.",
+    "The interval, in seconds, for running cleanup in the versions directory. Zero to disable periodic cleaning.": "O intervalo, en segundos, para executar a limpeza no directorio de versions. Cero para deshabilitar a limpeza periódica.",
+    "The maximum age must be a number and cannot be blank.": "A idade máxima ten que ser un número e non pode estar en branco.",
+    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Tempo máximo para manter unha versión (en días, poñer a 0 para manter as versión para sempre).",
+    "The number of connections must be a non-negative number.": "O número de conexións ten que ser un número non negativo.",
+    "The number of days must be a number and cannot be blank.": "O número de días ten que ser un número e non pode estar en branco.",
+    "The number of days to keep files in the trash can. Zero means forever.": "O número de días que manter os ficheiros no lixo. Cero é para sempre.",
+    "The number of old versions to keep, per file.": "O número de versión vellas a manter, por ficheiro.",
+    "The number of versions must be a number and cannot be blank.": "O número de versións ten que ser un número e non pode estar en branco.",
+    "The path cannot be blank.": "A ruta non pode estar en branco.",
+    "The rate limit is applied to the accumulated traffic of all connections to this device.": "O límite aplícase ao tráfico acumulado de todas as conexións deste dispositivo.",
+    "The rate limit must be a non-negative number (0: no limit)": "O límite ten que ser un número non negativo (0: sen límite)",
+    "The remote device has not accepted sharing this folder.": "O dispositivo remoto non aceptou a compartir este cartafol.",
+    "The remote device has paused this folder.": "O dispositivo remoto parou este cartafol.",
+    "The rescan interval must be a non-negative number of seconds.": "O intervalo de reescaneo ten que ser un número non negativo de segundos.",
+    "There are no devices to share this folder with.": "Non hai dispositivos cos que compartir este cartafol.",
+    "There are no file versions to restore.": "Non hai versións de ficheriso para restaurar.",
+    "There are no folders to share with this device.": "Non hai cartafois que compartir con este dispositivo.",
+    "This Device": "Este Dispositivo",
+    "This Month": "Este Mes",
+    "This can easily give hackers access to read and change any files on your computer.": "Esto pode dar acceso fácil a hackers para ler e cambiar ficheiros no teu compturador.",
+    "This device cannot automatically discover other devices or announce its own address to be found by others.  Only devices with statically configured addresses can connect.": "Este dispositivo non pode descubrir outros dispositivos automaticamente ou anunciar a súa dirección a outros. So se poden contectar dispositivos con direccións estáticas configuradas.",
+    "This is a major version upgrade.": "Esta é unha actualización maior.",
+    "This setting controls the free space required on the home (i.e., index database) disk.": "Este axuste controla o espacio en disco dispoñible necesario no disco principal (p.ej. índice da base de datos).",
+    "Time": "Hora",
+    "Time the item was last modified": "Hora na que se modificou o ficheiro por última vez",
+    "To connect with the Syncthing device named \"{%devicename%}\", add a new remote device on your end with this ID:": "Para conectar co dispositivo de Syncthing chamado \"{{devicename}}\", engada un dispositivo remoto novo con este ID:",
+    "To permit a rule, have the checkbox checked. To deny a rule, leave it unchecked.": "Para permitir una regra, marque esta caixa. Para negar una gregra, deixea sen marcar.",
+    "Today": "Hoxe",
+    "Trash Can": "Cubo do Lixo",
+    "Trash Can File Versioning": "Vesionado de Ficheiros co Lixo",
+    "Type": "Tipo",
+    "UNIX Permissions": "Permisos UNIX",
+    "Unavailable": "Non dispoñible",
+    "Unavailable/Disabled by administrator or maintainer": "Non dispoñible/Deshabilitado por un administrador ou mantedor",
+    "Undecided (will prompt)": "Sen decidir (preguntará)",
+    "Unexpected Items": "Ítems non espeardos",
+    "Unexpected items have been found in this folder.": "Atopáronse ítems non esperados neste cartafol.",
+    "Unignore": "Des-ignorar",
+    "Unknown": "Descoñecido",
+    "Unshared": "Des-compartido",
+    "Unshared Devices": "Dispositivos des-compartidos",
+    "Unshared Folders": "Cartafois des-compartidos",
+    "Untrusted": "Sen confiar",
+    "Up to Date": "Ao día",
+    "Updated {%file%}": "Actualizouse {{file}}",
+    "Upgrade": "Actualizar",
+    "Upgrade To {%version%}": "Actualizar A {{version}}",
+    "Upgrading": "Actualizando",
+    "Upload Rate": "Velocidade de Subida",
+    "Uptime": "Tempo de funcionamento",
+    "Usage reporting is always enabled for candidate releases.": "O informe de uso sempre está activado para as versións candidatas.",
+    "Use HTTPS for GUI": "Utilizar HTTPS para a GUI",
+    "Use notifications from the filesystem to detect changed items.": "Utilizar notificacións do sistema de ficheiros para detectar os ficheiros cambiados.",
+    "User": "Usuario",
+    "User Home": "Inicio do Usuario",
+    "Username/Password has not been set for the GUI authentication. Please consider setting it up.": "Non se configuraron o usuario e contrasinal para a autenticación da GUI. Por favor considere configuralo.",
+    "Using a QUIC connection over LAN": "Utilizando unha conexión QUIC en LAN",
+    "Using a QUIC connection over WAN": "Utilizando unha conexión QUIC en WAN",
+    "Using a direct TCP connection over LAN": "Utilizando unha conexión TCP directa en LAN",
+    "Using a direct TCP connection over WAN": "Utilizando unha conexión TCP directa en WAN",
+    "Version": "Versión",
+    "Versions": "Versións",
+    "Versions Path": "Ruta das Versións",
+    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "As versións elimínanse automaticamente se son máis vellas que a idade máxima ou sobrepasan o número de ficheiros permitidos nun intervalo.",
+    "Waiting to Clean": "Esperando para Limpar",
+    "Waiting to Scan": "Esperando para Escanear",
+    "Waiting to Sync": "Esperando para Sincronizar",
+    "Warning": "Aviso",
+    "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "Aviso, esta ruta é un directorio pai para outro cartafol existente \"{{otherFolder}}\".",
+    "Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Aviso, esta ruta e un directorio pai dun cartafol existente \"{{otherFolderLabel}}\" ({{otherFolder}}).",
+    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Aviso, esta ruta é un subdirectorio dun cartafol existente \"{{otherFolder}}\".",
+    "Warning, this path is a subdirectory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Aviso, esta ruta é un subdirectorio de un cartafol existente \"{{otherFolderLabel}}\" ({{otherFolder}}).",
+    "When adding a new device, keep in mind that this device must be added on the other side too.": "Ao engadir un dispositivo novo, teña en mente que tamén debe engadir o dispositivo do outro lado.",
+    "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.": "Ao engadir un cartafol novo, teña en mete que o ID de Cartafol úsase para enlazar os cartafois entre dispositivos. Son sensíbles a maiúsculas e teñen que coincidir exactamente entre dispositivos.",
+    "Yes": "Sí",
+    "Yesterday": "Onte",
+    "You can also copy and paste the text into a new message manually.": "Tamén pode copiar e pegar o texto nunha mensaxe de xeito manual.",
+    "You can also select one of these nearby devices:": "Tamén pode seleccionar un destes dispositivos cercanos:",
+    "You can change your choice at any time in the Settings dialog.": "Tamén pode cambiar a súa decisión en calqueira momento no diálogo de Opcións.",
+    "You can read more about the two release channels at the link below.": "Pode ler máis sobre as dúas canles de lanzamentos na ligazón de debaixo.",
+    "You have no ignored devices.": "Non ten dispositivos ignorados.",
+    "You have no ignored folders.": "Non ten cartafois ignorados.",
+    "You have unsaved changes. Do you really want to discard them?": "Ten cambios sen gardar. Realmente quere descartalos?",
+    "You must keep at least one version.": "Ten que manter ao menos unha versión.",
+    "You should never add or change anything locally in a \"{%receiveEncrypted%}\" folder.": "Nunca debe engadir nen cambiar nada localmente nun cartafol \"{{receiveEncrypted}}\".",
+    "Your SMS app should open to let you choose the recipient and send it from your own number.": "A súa aplicación SMS debe abrirse para deixarlle escoller un destinatario e envialo desde o seu propio número.",
+    "Your email app should open to let you choose the recipient and send it from your own address.": "A súa amplicación de correo debe abrirse para deixarlle escoller un destinatario e envialo desde a súa propia dirección.",
+    "days": "días",
+    "deleted": "eliminado",
+    "deny": "denegar",
+    "directories": "directorios",
+    "file": "ficheiro",
+    "files": "ficheiros",
+    "folder": "cartafol",
+    "full documentation": "documentación completa",
+    "items": "ítems",
+    "modified": "modificado",
+    "permit": "permitir",
+    "seconds": "segundos",
+    "theme": {
+        "name": {
+            "black": "Negro",
+            "dark": "Escuro",
+            "default": "Predeterminado",
+            "light": "Claro"
+        }
+    },
+    "unknown device": "dispositivo descoñecido",
+    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} quere compartir o cartafol \"{{cartafol}}\".",
+    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} quere compartir o cartafol \"{{folderlabel}}\" ({{folder}})."
 }

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

@@ -0,0 +1,555 @@
+{
+    "A device with that ID is already added.": "उस ID वाला उपकरण पहले से ही जुड़ा है।",
+    "A negative number of days doesn't make sense.": "दिनों की नकारात्मक संख्या का कोई मतलब नहीं है।",
+    "A new major version may not be compatible with previous versions.": "नया प्रमुख संस्करण पिछले संस्करणों के साथ संगत नहीं हो सकता है।",
+    "API Key": "API कुंजी",
+    "About": "हमारे बारे में",
+    "Action": "कार्रवाई",
+    "Actions": "कार्रवाइयां",
+    "Active filter rules": "सक्रिय फिल्टर नियम",
+    "Add": "जोड़ें",
+    "Add Device": "उपकरण जोड़ें",
+    "Add Folder": "फोल्डर जोड़ें",
+    "Add Remote Device": "रिमोट उपकरण जोड़ें",
+    "Add devices from the introducer to our device list, for mutually shared folders.": "पारस्परिक रूप से साझा किए गए फोल्डरों के लिए, परिचयकर्ता से हमारी उपकरण सूची में उपकरण जोड़ें।",
+    "Add filter entry": "फिल्टर प्रविष्टि जोड़ें",
+    "Add ignore patterns": "नजरअंदाज प्रतिमान जोड़ें",
+    "Add new folder?": "नया फोल्डर जोड़ें?",
+    "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.": "इसके अतिरिक्त पूर्ण पुन: स्कैन अंतराल बढ़ाया जाएगा (60 गुना, यानी 1घं का नया तयशुदा अंतराल)। आप नंबर चुनने के बाद में इसे प्रत्येक फोल्डर के लिए मैन्युअल रूप से विन्यस्त भी कर सकते हैं।",
+    "Address": "पता",
+    "Addresses": "पते",
+    "Advanced": "उन्नत",
+    "Advanced Configuration": "उन्नत विन्यास",
+    "All Data": "सभी डेटा",
+    "All Time": "हर समय",
+    "All folders shared with this device must be protected by a password, such that all sent data is unreadable without the given password.": "इस उपकरण के साथ साझा किए गए सभी फोल्डरों को पासवर्ड द्वारा संरक्षित किया जाना चाहिए, जैसे कि दिए गए पासवर्ड के बिना भेजा गया सभी डेटा अपठनीय हो।",
+    "Allow Anonymous Usage Reporting?": "अज्ञात उपयोग रिपोर्टिंग की अनुमति दें?",
+    "Allowed Networks": "अनुमत नेटवर्क",
+    "Alphabetic": "वर्णानुक्रमक",
+    "Altered by ignoring deletes.": "मिटाए गए को अनदेखा करके बदला गया।",
+    "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.": "एक बाहरी कमांड संस्करणीकरण को संभालता है। इसे साझा फोल्डर से फाइल को हटाना होगा। यदि अनुप्रयोग के पथ में रिक्त स्थान हैं, तो उसे उद्धृत किया जाना चाहिए।",
+    "Anonymous Usage Reporting": "अनाम उपयोग रिपोर्टिंग",
+    "Anonymous usage report format has changed. Would you like to move to the new format?": "अनाम उपयोग रिपोर्ट प्रारूप बदल गया है। क्या आप नए प्रारूप में जाना चाहेंगे?",
+    "Applied to LAN": "LAN पर लागू किया गया",
+    "Apply": "लागू करें",
+    "Are you sure you want to override all remote changes?": "क्या आप वाकई सभी रिमोट परिवर्तनों का अध्यारोहण करना चाहते हैं?",
+    "Are you sure you want to permanently delete all these files?": "क्या आप वाकई इन सभी फाइलों को स्थायी रूप से मिटाना चाहते हैं?",
+    "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}} फाइलें पुनर्स्थापित करना चाहते हैं?",
+    "Are you sure you want to revert all local changes?": "क्या आप वाकई सभी स्थानीय परिवर्तन पूर्ववत करना चाहते हैं?",
+    "Are you sure you want to upgrade?": "क्या आप वाकई उन्नयन करना चाहते हैं?",
+    "Authentication Required": "प्रमाणीकरण आवश्यक",
+    "Authors": "रचयिता",
+    "Auto Accept": "स्वतः स्वीकारें",
+    "Automatic Crash Reporting": "स्वचालित क्रैश रिपोर्टिंग",
+    "Automatic upgrade now offers the choice between stable releases and release candidates.": "स्वचालित उन्नयन अब स्थिर रिलीज़ और रिलीज़ उम्मीदवारों के बीच विकल्प प्रदान करता है।",
+    "Automatic upgrades": "स्वचालित उन्नयन",
+    "Automatic upgrades are always enabled for candidate releases.": "उम्मीदवार रिलीज़ के लिए स्वचालित उन्नयन हमेशा सक्षम होते हैं।",
+    "Automatically create or share folders that this device advertises at the default path.": "स्वचालित रूप से वे फोल्डर बनाएं या साझा करें जिन्हें यह उपकरण तयशुदा पथ पर विज्ञापित करता है।",
+    "Available debug logging facilities:": "उपलब्ध डिबग लॉगिंग सुविधाएं:",
+    "Be careful!": "ध्यान से!",
+    "Body:": "ढांचा:",
+    "Bugs": "बग",
+    "Cancel": "रद्द करें",
+    "Changelog": "चेंजलॉग",
+    "Clean out after": "इतने समय के बाद साफ़ करें",
+    "Cleaning Versions": "सफाई संस्करण",
+    "Cleanup Interval": "सफाई अंतराल",
+    "Click to see full identification string and QR code.": "पूर्ण पहचान स्ट्रिंग और QR कोड देखने के लिए क्लिक करें।",
+    "Close": "बंद करें",
+    "Command": "कमांड",
+    "Comment, when used at the start of a line": "टिप्पणी, जब किसी पंक्ति के आरंभ में उपयोग किया जाता है",
+    "Compression": "संपीड़न",
+    "Configuration Directory": "विन्यास निर्देशिका",
+    "Configuration File": "विन्यास फाइल",
+    "Configured": "विन्यस्त",
+    "Connected (Unused)": "जुड़े हुए (अप्रयुक्त)",
+    "Connection Error": "कनेक्शन त्रुटि",
+    "Connection Management": "कनेक्शन प्रबंधन",
+    "Connection Type": "कनेक्शन प्रकार",
+    "Connections": "कनेक्शन",
+    "Connections via relays might be rate limited by the relay": "रिले के माध्यम से कनेक्शन की दर रिले द्वारा सीमित हो सकती है",
+    "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.": "परिवर्तनों पर लगातार नजर रखना अब Syncthing के भीतर उपलब्ध है। यह डिस्क पर परिवर्तनों का पता लगाएगा और केवल संशोधित पथों पर स्कैन जारी करेगा। लाभ यह है कि परिवर्तन तेजी से प्रसारित होते हैं और कम पूर्ण स्कैन की आवश्यकता होती है।",
+    "Copied from elsewhere": "अन्यत्र से कॉपी किया गया",
+    "Copied from original": "मूल से कॉपी किया गया",
+    "Copied!": "कॉपी किया गया!",
+    "Copy": "कॉपी करें",
+    "Copy failed! Try to select and copy manually.": "कॉपी विफल! मैन्युअल रूप से चयन करने और कॉपी करने का प्रयास करें।",
+    "Currently Shared With Devices": "वर्तमान में उपकरणों के साथ साझा किया गया",
+    "Custom Range": "तदनुकूल दायरा",
+    "Danger!": "खतरा!",
+    "Database Location": "डेटाबेस स्थान",
+    "Debugging Facilities": "डिबगिंग सुविधाएं",
+    "Default": "तयशुदा",
+    "Default Configuration": "तयशुदा विन्यास",
+    "Default Device": "तयशुदा उपकरण",
+    "Default Folder": "तयशुदा फोल्डर",
+    "Default Ignore Patterns": "तयशुदा नजरअंदाज प्रतिमान",
+    "Defaults": "तयशुदा मान",
+    "Delete": "मिटाएं",
+    "Delete Unexpected Items": "अप्रत्याशित वस्तुएं मिटाएं",
+    "Deleted {%file%}": "{{file}} मिटाई गई",
+    "Deselect All": "सभी अचयनित करें",
+    "Deselect devices to stop sharing this folder with.": "इस फोल्डर को साझा करना बंद करने के लिए उपकरण का चयन रद्द करें।",
+    "Deselect folders to stop sharing with this device.": "इस उपकरण के साथ साझा करना बंद करने के लिए फोल्डरों का चयन रद्द करें।",
+    "Device": "उपकरण",
+    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "उपकरण \"{{name}}\" ({{device}} {{address}} पर) जुड़ना चाहता है। नया उपकरण जोड़ें?",
+    "Device Certificate": "उपकरण प्रमाणपत्र",
+    "Device ID": "उपकरण ID",
+    "Device Identification": "उपकरण पहचान",
+    "Device Name": "उपकरण का नाम",
+    "Device Status": "उपकरण की स्थिति",
+    "Device is untrusted, enter encryption password": "उपकरण अविश्वसनीय है, कूटलेखन पासवर्ड दर्ज करें",
+    "Device rate limits": "उपकरण दर सीमा",
+    "Device that last modified the item": "वह उपकरण जिसने अंतिम बार वस्तु को संशोधित किया था",
+    "Devices": "उपकरण",
+    "Disable Crash Reporting": "क्रैश रिपोर्टिंग अक्षम करें",
+    "Disabled": "अक्षम",
+    "Disabled periodic scanning and disabled watching for changes": "आवधिक स्कैनिंग और परिवर्तनों को देखना अक्षम किया गया",
+    "Disabled periodic scanning and enabled watching for changes": "आवधिक स्कैनिंग अक्षम की गई और परिवर्तनों को देखना सक्षम किया गया",
+    "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "आवधिक स्कैनिंग अक्षम और परिवर्तनों को देखने के लिए स्थापना विफल, हर 1मि में पुन: प्रयास:",
+    "Disables comparing and syncing file permissions. Useful on systems with nonexistent or custom permissions (e.g. FAT, exFAT, Synology, Android).": "फाइल अनुमतियों की तुलना और समन्वयन अक्षम करता है। अस्तित्वहीन या तदनुकूल अनुमतियों (जैसे FAT, exFAT, Synology, Android) वाले सिस्टम पर उपयोगी।",
+    "Discard": "त्यागें",
+    "Disconnected": "वियोजीत",
+    "Disconnected (Inactive)": "वियोजीत (निष्क्रिय)",
+    "Disconnected (Unused)": "वियोजीत (अप्रयुक्त)",
+    "Discovered": "खोजे गए",
+    "Discovery": "खोज",
+    "Discovery Failures": "खोज विफलताएं",
+    "Discovery Status": "खोज स्थिति",
+    "Dismiss": "खारिज करें",
+    "Do not add it to the ignore list, so this notification may recur.": "इसे अनदेखा सूची में न जोड़ें, ताकि यह अधिसूचना दोबारा आ सके।",
+    "Do not restore": "पुनर्स्थापित न करें",
+    "Do not restore all": "सभी को पुनर्स्थापित न करें",
+    "Do you want to enable watching for changes for all your folders?": "क्या आप अपने सभी फोल्डरों के लिए परिवर्तनों को देखना सक्षम करना चाहते हैं?",
+    "Documentation": "दस्तावेज़ीकरण",
+    "Download Rate": "डाउनलोड दर",
+    "Downloaded": "डाउनलोड किए गए",
+    "Downloading": "डाउनलोड किया जा रहा है",
+    "Edit": "संपादित करें",
+    "Edit Device": "उपकरण संपादित करें",
+    "Edit Device Defaults": "उपकरण तयशुदा संपादित करें",
+    "Edit Folder": "फोल्डर संपादित करें",
+    "Edit Folder Defaults": "फोल्डर तयशुदा संपादित करें",
+    "Editing {%path%}.": "{{path}} का संपादन।",
+    "Enable Crash Reporting": "क्रैश रिपोर्टिंग सक्षम करें",
+    "Enable NAT traversal": "NAT ट्रैवर्सल सक्षम करें",
+    "Enable Relaying": "रिले करना सक्षम करें",
+    "Enabled": "सक्षम",
+    "Enables sending extended attributes to other devices, and applying incoming extended attributes. May require running with elevated privileges.": "अन्य उपकरणों पर विस्तारित विशेषताएं भेजने और आने वाली विस्तारित विशेषताएं लागू करने में सक्षम बनाता है। उन्नत विशेषाधिकारों के साथ चलने की आवश्यकता हो सकती है।",
+    "Enables sending extended attributes to other devices, but not applying incoming extended attributes. This can have a significant performance impact. Always enabled when \"Sync Extended Attributes\" is enabled.": "अन्य उपकरणों पर विस्तारित विशेषताएं भेजने में सक्षम बनाता है, लेकिन आने वाली विस्तारित विशेषताओं को लागू नहीं करता है। इससे प्रदर्शन पर महत्वपूर्ण प्रभाव पड़ सकता है। \"विस्तारित विशेषताएं समन्वयित करें\" सक्षम होने पर हमेशा सक्षम होता है।",
+    "Enables sending ownership information to other devices, and applying incoming ownership information. Typically requires running with elevated privileges.": "अन्य उपकरणों पर स्वामित्व जानकारी भेजने और आने वाली स्वामित्व जानकारी लागू करने में सक्षम बनाता है। आमतौर पर उन्नत विशेषाधिकारों के साथ चलने की आवश्यकता होती है।",
+    "Enables sending ownership information to other devices, but not applying incoming ownership information. This can have a significant performance impact. Always enabled when \"Sync Ownership\" is enabled.": "अन्य उपकरणों पर स्वामित्व जानकारी भेजने में सक्षम बनाता है, लेकिन आने वाली स्वामित्व जानकारी को लागू नहीं करता है। इससे प्रदर्शन पर महत्वपूर्ण प्रभाव पड़ सकता है। \"स्वामित्व समन्वयित करें\" सक्षम होने पर हमेशा सक्षम रहें।",
+    "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "एक गैर-नकारात्मक संख्या दर्ज करें (उदाहरण के लिए, \"2.35\") और एक इकाई का चयन करें। प्रतिशत कुल डिस्क आकार के भाग के रूप में हैं।",
+    "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\" दर्ज करें।",
+    "Enter ignore patterns, one per line.": "नजरअंदाज प्रतिमान दर्ज करें, प्रति पंक्ति एक।",
+    "Enter up to three octal digits.": "तीन अष्टक अंक तक दर्ज करें।",
+    "Error": "त्रुटि",
+    "Extended Attributes": "विस्तारित विशेषताएं",
+    "Extended Attributes Filter": "विस्तारित विशेषताएं फिल्टर",
+    "External": "बाहरी",
+    "External File Versioning": "बाहरी फाइल संस्करणीकरण",
+    "Failed Items": "विफल वस्तुएं",
+    "Failed to load file versions.": "फाइल संस्करण लोड करने में विफल।",
+    "Failed to load ignore patterns.": "नजरअंदाज प्रतिमान लोड करने में विफल।",
+    "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": "फाइल संस्करणीकरण",
+    "Files are moved to .stversions directory when replaced or deleted by Syncthing.": "Syncthing द्वारा प्रतिस्थापित या हटाए जाने पर फाइलों को .stversions निर्देशिका में ले जाया जाता है।",
+    "Files are moved to date stamped versions in a .stversions directory 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.": "फाइलें अन्य उपकरण पर किए गए परिवर्तनों से सुरक्षित रहती हैं, लेकिन इस उपकरण पर किए गए परिवर्तन शेष समूह में भेजे जाएंगे।",
+    "Files are synchronized from the cluster, but any changes made locally will not be sent to other devices.": "फाइलें समूह से समन्वयित की जाती हैं, लेकिन स्थानीय रूप से किया गया कोई भी परिवर्तन अन्य उपकरणों पर नहीं भेजा जाएगा।",
+    "Filesystem Watcher Errors": "फाइलसिस्टम वॉचर त्रुटियां",
+    "Filter by date": "दिनांक अनुसार फिल्टर करें",
+    "Filter by name": "नाम अनुसार फिल्टर करें",
+    "Folder": "फोल्डर",
+    "Folder ID": "फोल्डर ID",
+    "Folder Label": "फोल्डर लेबल",
+    "Folder Path": "फोल्डर पथ",
+    "Folder Status": "फोल्डर स्थिति",
+    "Folder Type": "फोल्डर प्रकार",
+    "Folder type \"{%receiveEncrypted%}\" can only be set when adding a new folder.": "फोल्डर प्रकार \"{{receiveEncrypted}}\" केवल नया फोल्डर जोड़ते समय ही निर्धारित किया जा सकता है।",
+    "Folder type \"{%receiveEncrypted%}\" cannot be changed after adding the folder. You need to remove the folder, delete or decrypt the data on disk, and add the folder again.": "फोल्डर जोड़ने के बाद फोल्डर प्रकार \"{{receiveEncrypted}}\" को बदला नहीं जा सकता। आपको फोल्डर को हटाना होगा, डिस्क पर डेटा को मिटाना या विकोड करना होगा और फोल्डर को फिर से जोड़ना होगा।",
+    "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.": "निम्नलिखित फोल्डरों के लिए परिवर्तनों को देखना प्रारंभ करते समय एक त्रुटि उत्पन्न हुई। इसे हर मिनट पुनः प्रयास किया जाएगा, इसलिए त्रुटियां जल्द ही दूर हो सकती हैं। यदि वे बने रहते हैं, तो अंतर्निहित समस्या को ठीक करने का प्रयास करें और यदि आप नहीं कर सकते तो मदद मांगें।",
+    "Forever": "सदैव",
+    "Full Rescan Interval (s)": "पूर्ण पुनःस्कैन अंतराल (से)",
+    "GUI": "GUI",
+    "GUI / API HTTPS Certificate": "GUI / API HTTPS प्रमाणपत्र",
+    "GUI Authentication Password": "GUI प्रमाणीकरण पासवर्ड",
+    "GUI Authentication User": "GUI प्रमाणीकरण उपयोक्ता",
+    "GUI Authentication: Set User and Password": "जीयूआई प्रमाणीकरण: उपयोक्ता और पासवर्ड निर्धारित करें",
+    "GUI Listen Address": "GUI सुनने का पता",
+    "GUI Override Directory": "GUI अध्यारोहण निर्देशिका",
+    "GUI Theme": "GUI थीम",
+    "General": "सामान्य",
+    "Generate": "उत्पन्न करें",
+    "Global Discovery": "वैश्विक खोज",
+    "Global Discovery Servers": "वैश्विक खोज सर्वर",
+    "Global State": "वैश्विक स्थिति",
+    "Help": "सहायता",
+    "Hint: only deny-rules detected while the default is deny. Consider adding \"permit any\" as last rule.": "संकेत: केवल deny-rules का पता चला है जबकि तयशुदा deny है। अंतिम नियम के रूप में \"permit any\" जोड़ने पर विचार करें।",
+    "Home page": "घर पृष्ठ",
+    "However, your current settings indicate you might not want it enabled. We have disabled automatic crash reporting for you.": "हालांकि, आपकी वर्तमान सेटिंग्स इंगित करती हैं कि आप शायद इसे सक्षम नहीं करना चाहेंगे। हमने आपके लिए स्वचालित क्रैश रिपोर्टिंग अक्षम कर दी है।",
+    "Identification": "पहचान",
+    "If untrusted, enter encryption password": "यदि अविश्वसनीय है, तो कूटलेखन पासवर्ड दर्ज करें",
+    "If you want to prevent other users on this computer from accessing Syncthing and through it your files, consider setting up authentication.": "यदि आप इस कंप्यूटर पर अन्य उपयोक्ताओं को Syncthing और इसके माध्यम से अपनी फाइलों तक पहुँचने से रोकना चाहते हैं, तो प्रमाणीकरण स्थापित करने पर विचार करें।",
+    "Ignore": "नजरअंदाज करें",
+    "Ignore Patterns": "नजरअंदाज प्रतिमान",
+    "Ignore Permissions": "अनुमतियां नजरअंदाज करें",
+    "Ignore patterns can only be added after the folder is created. If checked, an input field to enter ignore patterns will be presented after saving.": "फोल्डर बनने के बाद ही नजरअंदाज प्रतिमान जोड़े जा सकते हैं। यदि जांच की जाती है, तो सहेजने के बाद नजरअंदाज प्रतिमान दर्ज करने के लिए एक आगत क्षेत्र प्रस्तुत किया जाएगा।",
+    "Ignored Devices": "नजरअंदाज उपकरण",
+    "Ignored Folders": "नजरअंदाज किये फोल्डर",
+    "Ignored at": "यहां पर नजरअंदाज",
+    "Included Software": "सम्मिलित सॉफ्टवेयर",
+    "Incoming Rate Limit (KiB/s)": "आवक दर सीमा (KiB/s)",
+    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "गलत विन्यास आपके फोल्डर की सामग्री को नुकसान पहुंचा सकता है और Syncthing को निष्क्रिय कर सकता है।",
+    "Incorrect user name or password.": "गलत उपयोक्ता नाम या पासवर्ड।",
+    "Internally used paths:": "आंतरिक प्रयुक्त पथ:",
+    "Introduced By": "इनके द्वारा परिचय",
+    "Introducer": "परिचयकर्ता",
+    "Introduction": "परिचय",
+    "Inversion of the given condition (i.e. do not exclude)": "दी गई शर्त का व्युत्क्रमण (अर्थात् बहिष्कृत न करें)",
+    "Keep Versions": "संस्करण रखें",
+    "LDAP": "LDAP",
+    "Largest First": "सबसे बड़ा प्रथम",
+    "Last 30 Days": "पिछले 30 दिन",
+    "Last 7 Days": "पिछले 7 दिन",
+    "Last Month": "पिछला महीना",
+    "Last Scan": "अंतिम स्कैन",
+    "Last seen": "अंतिम बार देखा गया",
+    "Latest Change": "नवीनतम परिवर्तन",
+    "Learn more": "अधिक जानें",
+    "Learn more at {%url%}": "{{url}} पर और जानें",
+    "Limit": "सीमा",
+    "Listener Failures": "श्रोता की विफलता",
+    "Listener Status": "श्रोता स्थिति",
+    "Listeners": "श्रोता",
+    "Loading data...": "डेटा लोड हो रहा है..।",
+    "Loading...": "लोड हो रहा है..।",
+    "Local Additions": "स्थानीय परिवर्धन",
+    "Local Discovery": "स्थानीय खोज",
+    "Local State": "स्थानिक स्थिति",
+    "Local State (Total)": "स्थानिक स्थिति (कुल)",
+    "Locally Changed Items": "स्थानीय रूप से परिवर्तित वस्तुएं",
+    "Log": "लॉग",
+    "Log File": "लॉग फाइल",
+    "Log In": "लॉगिन",
+    "Log Out": "लॉग आउट",
+    "Log in to see paths information.": "पथ जानकारी देखने के लिए लॉगिन करें।",
+    "Log in to see version information.": "संस्करण जानकारी देखने के लिए लॉगिन करें।",
+    "Log tailing paused. Scroll to the bottom to continue.": "लॉग ट्रैकिंग रोक दी गई है। जारी रखने के लिए नीचे स्क्रॉल करें।",
+    "Login failed, see Syncthing logs for details.": "लॉगिन विफल, विवरण के लिए Syncthing लॉग देखें।",
+    "Logs": "लॉग",
+    "Major Upgrade": "प्रमुख उन्नयन",
+    "Mass actions": "सामूहिक कार्रवाई",
+    "Maximum Age": "अधिकतम आयु",
+    "Maximum single entry size": "अधिकतम एकल प्रविष्टि आकार",
+    "Maximum total size": "अधिकतम कुल आकार",
+    "Metadata Only": "केवल मेटाडेटा",
+    "Minimum Free Disk Space": "न्यूनतम मुक्त डिस्क स्थान",
+    "Mod. Device": "संशोधित उपकरण",
+    "Mod. Time": "संशोधन समय",
+    "More than a month ago": "एक महीने से भी पहले",
+    "More than a week ago": "एक सप्ताह से भी पहले",
+    "More than a year ago": "एक साल से भी पहले",
+    "Move to top of queue": "कतार के शीर्ष पर जाएं",
+    "Multi level wildcard (matches multiple directory levels)": "बहुस्तरीय वाइल्डकार्ड (एकाधिक निर्देशिका स्तरों से मेल खाता है)",
+    "Never": "कभी नहीं",
+    "New Device": "नया उपकरण",
+    "New Folder": "नया फोल्डर",
+    "Newest First": "नवीनतम पहले",
+    "No": "नहीं",
+    "No File Versioning": "कोई फाइल संस्करण नहीं",
+    "No files will be deleted as a result of this operation.": "इस अभियान के परिणामस्वरूप कोई भी फाइल मिटाई नहीं जाएगी।",
+    "No rules set": "कोई नियम निर्धारित नहीं",
+    "No upgrades": "कोई उन्नयन नहीं",
+    "Not shared": "साझा नहीं किया गया",
+    "Notice": "सूचना",
+    "Number of Connections": "कनेक्शनों की संख्या",
+    "OK": "ठीक है",
+    "Off": "बंद",
+    "Oldest First": "पुराना पहले",
+    "Optional descriptive label for the folder. Can be different on each device.": "फोल्डर के लिए वैकल्पिक वर्णनात्मक लेबल। प्रत्येक उपकरण पर भिन्न हो सकता है।",
+    "Options": "विकल्प",
+    "Out of Sync": "समन्वयन से बाहर",
+    "Out of Sync Items": "समन्वयन से बाहर वस्तुएं",
+    "Outgoing Rate Limit (KiB/s)": "जावक दर सीमा (KiB/s)",
+    "Override": "अध्यारोहण",
+    "Override Changes": "परिवर्तनों का अध्यारोहण",
+    "Ownership": "स्वामित्व",
+    "Password": "पासवर्ड",
+    "Path": "पथ",
+    "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "स्थानीय कंप्यूटर पर फोल्डर का पथ। अगर यह मौजूद नहीं है तो इसे बनाया जाएगा। टिल्ड वर्ण (~) का उपयोग शॉर्टकट के रूप में किया जा सकता है",
+    "Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).": "पथ जहां संस्करण संग्रहीत किए जाने चाहिए (साझा फोल्डर में तयशुदा .stversions निर्देशिका के लिए खाली छोड़ दें)।",
+    "Paths": "पथ",
+    "Pause": "विराम",
+    "Pause All": "सभी विराम करें",
+    "Paused": "विरामित",
+    "Paused (Unused)": "विरामित (अप्रयुक्त)",
+    "Pending 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 failed setting up watching for changes, retrying every 1m:": "दिए गए अंतराल पर आवधिक स्कैनिंग और परिवर्तनों को देखने के लिए स्थापना विफल, हर 1मि में पुन: प्रयास:",
+    "Permanently add it to the ignore list, suppressing further notifications.": "आगे की सूचनाओं को दबाते हुए, इसे स्थायी रूप से अनदेखा सूची में जोड़ें।",
+    "Please consult the release notes before performing a major upgrade.": "कृपया कोई बड़ा उन्नयन करने से पहले रिलीज़ नोट्स से परामर्श लें।",
+    "Please set a GUI Authentication User and Password in the Settings dialog.": "कृपया सेटिंग्स संवाद में एक GUI प्रमाणीकरण उपयोक्ता और पासवर्ड निर्धारित करें।",
+    "Please wait": "कृपया प्रतीक्षा करें",
+    "Prefix indicating that the file can be deleted if preventing directory removal": "उपसर्ग यह दर्शाता है कि निर्देशिका हटाने से रोकने पर फाइल को मिटाया जा सकता है",
+    "Prefix indicating that the pattern should be matched without case sensitivity": "उपसर्ग यह दर्शाता है कि प्रतिमान को केस संवेदनशीलता के बिना मिलान किया जाना चाहिए",
+    "Preparing to Sync": "समन्वयन की तैयारी",
+    "Preview": "पूर्वावलोकन",
+    "Preview Usage Report": "उपयोग रिपोर्ट का पूर्वावलोकन करें",
+    "QR code": "QR कोड",
+    "QUIC LAN": "QUIC LAN",
+    "QUIC WAN": "QUIC WAN",
+    "Quick guide to supported patterns": "समर्थित प्रतिमान के लिए त्वरित मार्गदर्शिका",
+    "Random": "यादृच्छिक",
+    "Receive Encrypted": "कूटलेखित प्राप्त करें",
+    "Receive Only": "केवल प्राप्त करें",
+    "Received data is already encrypted": "प्राप्त डेटा पहले से ही कूटलेखित है",
+    "Recent Changes": "हालिया परिवर्तन",
+    "Reduced by ignore patterns": "नजरअंदाज प्रतिमान से कम किया गया",
+    "Relay LAN": "रिले LAN",
+    "Relay WAN": "रिले WAN",
+    "Release Notes": "रिलीज नोट्स",
+    "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "रिलीज़ उम्मीदवारों में नवीनतम सुविधाएं और सुधार शामिल हैं। वे पारंपरिक द्वि-साप्ताहिक Syncthing रिलीज़ के समान हैं।",
+    "Remote Devices": "रिमोट उपकरण",
+    "Remote GUI": "रिमोट GUI",
+    "Remove": "हटाएं",
+    "Remove Device": "उपकरण हटाएं",
+    "Remove Folder": "फोल्डर हटाएं",
+    "Required identifier for the folder. Must be the same on all cluster devices.": "फोल्डर के लिए आवश्यक पहचानकर्ता। समूह के सभी उपकरणों पर समान होना चाहिए।",
+    "Rescan": "पुनः स्कैन करें",
+    "Rescan All": "सभी पुनः स्कैन करें",
+    "Rescans": "पुनः स्कैन करता है",
+    "Restart": "पुनः प्रारंभ करें",
+    "Restart Needed": "पुनरारंभ की आवश्यकता है",
+    "Restarting": "पुनः प्रारंभ हो रहा है",
+    "Restore": "पुनर्स्थापित करें",
+    "Restore Versions": "संस्करण पुनर्स्थापित करें",
+    "Resume": "पुनः आरम्भ करें",
+    "Resume All": "सभी पुनः आरंभ करें",
+    "Reused": "पुन:प्रयुक्त",
+    "Revert": "पूर्ववत करें",
+    "Revert Local Changes": "स्थानीय परिवर्तन पूर्ववत करें",
+    "Save": "सहेजें",
+    "Saving changes": "परिवर्तन सहेजे जा रहे हैं",
+    "Scan Time Remaining": "स्कैन समय शेष",
+    "Scanning": "स्कैनिंग",
+    "See external versioning help for supported templated command line parameters.": "समर्थित खाका कमांड लाइन पैरामीटर के लिए बाहरी संस्करण सहायता देखें।",
+    "Select All": "सभी चुनें",
+    "Select a version": "एक संस्करण चुनें",
+    "Select additional devices to share this folder with.": "इस फोल्डर को साझा करने के लिए अतिरिक्त उपकरणों का चयन करें।",
+    "Select additional folders to share with this device.": "इस उपकरण के साथ साझा करने के लिए अतिरिक्त फोल्डर चुनें।",
+    "Select latest version": "नवीनतम संस्करण चुनें",
+    "Select oldest version": "सबसे पुराना संस्करण चुनें",
+    "Send & Receive": "भेजें एवं प्राप्त करें",
+    "Send Extended Attributes": "विस्तारित विशेषताएं भेजें",
+    "Send Only": "केवल भेजें",
+    "Send Ownership": "स्वामित्व भेजें",
+    "Set Ignores on Added Folder": "नए फोल्डर के लिए नजरअंदाज प्रतिमान निर्धारित करें",
+    "Settings": "सेटिंग्स",
+    "Share": "साझा करें",
+    "Share Folder": "फोल्डर साझा करें",
+    "Share by Email": "ईमेल द्वारा साझा करें",
+    "Share by SMS": "SMS द्वारा साझा करें",
+    "Share this folder?": "यह फोल्डर साझा करें?",
+    "Shared Folders": "सांझे फोल्डर",
+    "Shared With": "इसके साथ साझा",
+    "Sharing": "साझाकरण",
+    "Show ID": "ID दिखाएं",
+    "Show QR": "QR दिखाएं",
+    "Show detailed discovery status": "विस्तृत खोज स्थिति दिखाएं",
+    "Show detailed listener status": "विस्तृत श्रोता स्थिति दिखाएं",
+    "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.": "समूह स्थिति में उपकरण ID के बजाय दिखाया गया। वैकल्पिक तयशुदा नाम के रूप में अन्य उपकरणों पर विज्ञापित किया जाएगा।",
+    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "समूह स्थिति में उपकरण ID के बजाय दिखाया गया। खाली छोड़े जाने पर उपकरण द्वारा विज्ञापित नाम में अद्यतित कर दिया जाएगा।",
+    "Shutdown": "शटडाउन",
+    "Shutdown Complete": "शटडाउन पूर्ण",
+    "Simple": "सरल",
+    "Simple File Versioning": "सरल फाइल संस्करण",
+    "Single level wildcard (matches within a directory only)": "एकल स्तरीय वाइल्डकार्ड (केवल एक निर्देशिका के भीतर मेल खाता है)",
+    "Size": "आकार",
+    "Smallest First": "सबसे छोटा पहले",
+    "Some discovery methods could not be established for finding other devices or announcing this device:": "अन्य उपकरणों को खोजने या इस उपकरण की घोषणा करने के लिए कुछ खोज विधियां स्थापित नहीं की जा सकीं:",
+    "Some items could not be restored:": "कुछ वस्तुएं पुनर्स्थापित नहीं किए जा सके:",
+    "Some listening addresses could not be enabled to accept connections:": "कुछ श्रवण पते कनेक्शन स्वीकार करने के लिए सक्षम नहीं किए जा सके:",
+    "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.": "स्थिर रिलीज़ में लगभग दो सप्ताह की देरी हो रही है। इस दौरान वे रिलीज़ उम्मीदवारों के रूप में परीक्षण से गुजरते हैं।",
+    "Stable releases only": "केवल स्थिर रिलीज़",
+    "Staggered": "विचलता",
+    "Staggered File Versioning": "विचलता फाइल संस्करण",
+    "Start Browser": "ब्राउज़र प्रारंभ करें",
+    "Statistics": "आंकडे",
+    "Stay logged in": "लॉगिन रहें",
+    "Stopped": "रुका हुआ",
+    "Stores and syncs only encrypted data. Folders on all connected devices need to be set up with the same password or be of type \"{%receiveEncrypted%}\" too.": "केवल कूटलेखित डेटा को स्टोर और समन्वयित करें। सभी जुड़ें उपकरणों पर फोल्डरों को एक ही पासवर्ड के साथ स्थापित किया जाना चाहिए या \"{{receiveEncrypted}}\" प्रकार का भी होना चाहिए।",
+    "Subject:": "विषय:",
+    "Support": "समर्थन",
+    "Support Bundle": "समर्थन बंडल",
+    "Sync Extended Attributes": "विस्तारित विशेषताएं समन्वयित करें",
+    "Sync Ownership": "स्वामित्व समन्वयित करें",
+    "Sync Protocol Listen Addresses": "समन्वयन प्रोटोकॉल का श्रवण पता",
+    "Sync Status": "समन्वयन स्थिति",
+    "Syncing": "समन्वयित हो रहा है",
+    "Syncthing device ID for \"{%devicename%}\"": "\"{{devicename}}\" के लिए Syncthing उपकरण ID",
+    "Syncthing has been shut down.": "Syncthing बंद कर दिया गया है।",
+    "Syncthing includes the following software or portions thereof:": "Syncthing में निम्नलिखित सॉफ़्टवेयर या उसके भाग शामिल हैं:",
+    "Syncthing is Free and Open Source Software licensed as MPL v2.0.": "Syncthing मुक्त और खुले-स्त्रोत सॉफ़्टवेयर है जिसे MPL v2.0 के रूप में लाइसेंस प्राप्त है।",
+    "Syncthing is a continuous file synchronization program. It synchronizes files between two or more computers in real time, safely protected from prying eyes. Your data is your data alone and you deserve to choose where it is stored, whether it is shared with some third party, and how it's transmitted over the internet.": "Syncthing एक सतत फाइल समन्वयन प्रोग्राम है। यह वास्तविक समय में दो या दो से अधिक कंप्यूटरों के बीच फाइलों को समन्वयित करता है, जो कि लोगों की नज़रों से सुरक्षित रूप से सुरक्षित रहता है। आपका डेटा केवल आपका डेटा है और आप यह चुनने के हकदार हैं कि इसे कहाँ संग्रहीत किया जाता है, क्या इसे किसी तीसरे पक्ष के साथ साझा किया जाता है, और इसे इंटरनेट पर कैसे प्रसारित किया जाता है।",
+    "Syncthing is listening on the following network addresses for connection attempts from other devices:": "अन्य उपकरणों से कनेक्शन प्रयासों के लिए Syncthing निम्नलिखित नेटवर्क पतों पर सुन रहा है:",
+    "Syncthing is not listening for connection attempts from other devices on any address.  Only outgoing connections from this device may work.": "Syncthing किसी भी पते पर अन्य उपकरणों से कनेक्शन प्रयासों को नहीं सुन रहा है। इस उपकरण से केवल जावक कनेक्शन ही काम कर सकते हैं।",
+    "Syncthing is restarting.": "Syncthing पुनः प्रारंभ हो रहा है।",
+    "Syncthing is saving changes.": "Syncthing परिवर्तनों को सहेज रहा है।",
+    "Syncthing is upgrading.": "Syncthing उन्नयन हो रहा है।",
+    "Syncthing now supports automatically reporting crashes to the developers. This feature is enabled by default.": "Syncthing अब विकासकर्ता को क्रैश की स्वचालित रूप से रिपोर्ट करने का समर्थन करता है। यह सुविधा तयशुदा रूप से सक्षम है।",
+    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "ऐसा लगता है कि Syncthing बंद है, या आपके इंटरनेट कनेक्शन में कोई समस्या है। पुनः प्रयास किया जा रहा है…",
+    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "ऐसा लगता है कि Syncthing को आपके अनुरोध को संसाधित करने में समस्या आ रही है। यदि समस्या बनी रहती है तो कृपया पृष्ठ को ताज़ा करें या Syncthing को पुनरारंभ करें।",
+    "TCP LAN": "TCP LAN",
+    "TCP WAN": "TCP WAN",
+    "Take me back": "मुझे वापस ले जाएं",
+    "The GUI address is overridden by startup options. Changes here will not take effect while the override is in place.": "GUI पता स्टार्टअप विकल्पों द्वारा अध्यारोहण किया गया है। अध्यारोहण लागू होने तक यहां परिवर्तन प्रभावी नहीं होंगे।",
+    "The Syncthing Authors": "Syncthing के रचयिता",
+    "The Syncthing admin interface is configured to allow remote access without a password.": "Syncthing व्यवस्थापक इंटरफ़ेस को पासवर्ड के बिना रिमोट पहुंच की अनुमति देने के लिए विन्यस्त किया गया है।",
+    "The aggregated statistics are publicly available at the URL below.": "एकत्रित आंकड़े नीचे दिए गए URL पर सार्वजनिक रूप से उपलब्ध हैं।",
+    "The cleanup interval cannot be blank.": "सफाई अंतराल रिक्त नहीं हो सकता।",
+    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "विन्यास सहेजा गया है लेकिन सक्रिय नहीं किया गया है। नए विन्यास को सक्रिय करने के लिए Syncthing को पुनरारंभ करना होगा।",
+    "The device ID cannot be blank.": "उपकरण ID रिक्त नहीं हो सकती।",
+    "The device ID to enter here can be found in the \"Actions > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "यहां दर्ज की जाने वाली उपकरण ID अन्य उपकरण पर \"कार्रवाइयां > ID3 दिखाएं\" संवाद में पाई जा सकती है। रिक्त स्थान और डैश वैकल्पिक हैं (अनदेखा)।",
+    "The encrypted usage report is sent daily. It is used to track common platforms, folder sizes, and app versions. If the reported data set is changed you will be prompted with this dialog again.": "कूटलेखित उपयोग रिपोर्ट प्रतिदिन भेजी जाती है। इसका उपयोग सामान्य प्लेटफ़ॉर्म, फोल्डर आकार और ऐप संस्करणों को ट्रैक करने के लिए किया जाता है। यदि रिपोर्ट किया गया डेटा सेट बदल दिया गया है तो आपको इस संवाद के साथ फिर से संकेत दिया जाएगा।",
+    "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.": "दर्ज की गई उपकरण ID वैध नहीं लगती। यह 52 या 56 वर्णमाला होनी चाहिए जिसमें अक्षर और संख्याएं हों, रिक्त स्थान और डैश वैकल्पिक हों।",
+    "The folder ID cannot be blank.": "फोल्डर ID रिक्त नहीं हो सकती।",
+    "The folder ID must be unique.": "फोल्डर ID अद्वितीय होनी चाहिए।",
+    "The folder content on other devices will be overwritten to become identical with this device. Files not present here will be deleted on other devices.": "इस उपकरण के समान बनने के लिए अन्य उपकरण पर फोल्डर सामग्री को अधिलेखित कर दिया जाएगा। यहां मौजूद नहीं होने वाली फाइलें अन्य उपकरण पर मिटा दी जाएंगी।",
+    "The folder content on this device will be overwritten to become identical with other devices. Files newly added here will be deleted.": "इस उपकरण पर फोल्डर सामग्री को अन्य उपकरण के समान बनाने के लिए अधिलेखित कर दिया जाएगा। यहां नई जोड़ी गई फाइलें मिटा दी जाएंगी।",
+    "The folder path cannot be blank.": "फोल्डर पथ रिक्त नहीं हो सकता।",
+    "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "निम्नलिखित अंतरालों का उपयोग किया जाता है: पहले घंटे के लिए हर 30 सेकंड में एक संस्करण रखा जाता है, पहले दिन के लिए हर घंटे एक संस्करण रखा जाता है, पहले 30 दिनों के लिए हर दिन एक संस्करण रखा जाता है, अधिकतम आयु तक हर एक संस्करण रखा जाता है सप्ताह।",
+    "The following items could not be synchronized.": "निम्नलिखित वस्तुएं समन्वयित नहीं किए जा सके।",
+    "The following items were changed locally.": "निम्नलिखित वस्तुएं स्थानीय रूप से बदले गए थे।",
+    "The following methods are used to discover other devices on the network and announce this device to be found by others:": "नेटवर्क पर अन्य उपकरणों को खोजने और इस उपकरण को दूसरों द्वारा पाए जाने की घोषणा करने के लिए निम्नलिखित विधियों का उपयोग किया जाता है:",
+    "The following text will automatically be inserted into a new message.": "निम्नलिखित पाठ स्वचालित रूप से एक नए संदेश में डाला जाएगा।",
+    "The following unexpected items were found.": "निम्नलिखित अप्रत्याशित वस्तुएं मिलीं।",
+    "The interval must be a positive number of seconds.": "अंतराल सेकंड की सकारात्मक संख्या होनी चाहिए।",
+    "The interval, in seconds, for running cleanup in the versions directory. Zero to disable periodic cleaning.": "संस्करण निर्देशिका में सफाई करने की अंतराल, सेकंड में। आवधिक सफाई को अक्षम करने के लिए शून्य।",
+    "The maximum age must be a number and cannot be blank.": "अधिकतम आयु एक संख्या होनी चाहिए और रिक्त नहीं हो सकती।",
+    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "किसी संस्करण को रखने का अधिकतम समय (दिनों में, संस्करणों को हमेशा के लिए रखने के लिए 0 पर निर्धारित करें)।",
+    "The number of connections must be a non-negative number.": "कनेक्शन की संख्या एक गैर-नकारात्मक संख्या होनी चाहिए।",
+    "The number of days must be a number and cannot be blank.": "दिनों की संख्या एक संख्या होनी चाहिए और रिक्त नहीं हो सकती।",
+    "The number of days to keep files in the trash can. Zero means forever.": "फाइलों को रद्दी में रखने के दिनों की संख्या। शून्य का अर्थ है सदैव।",
+    "The number of old versions to keep, per file.": "प्रति फाइल रखने के लिए पुराने संस्करणों की संख्या।",
+    "The number of versions must be a number and cannot be blank.": "संस्करणों की संख्या एक संख्या होनी चाहिए और रिक्त नहीं हो सकती।",
+    "The path cannot be blank.": "पथ रिक्त नहीं हो सकता।",
+    "The rate limit is applied to the accumulated traffic of all connections to this device.": "दर सीमा इस उपकरण के सभी कनेक्शनों के संचित ट्रैफिक पर लागू होती है।",
+    "The rate limit must be a non-negative number (0: no limit)": "दर सीमा एक गैर-ऋणात्मक संख्या होनी चाहिए (0: कोई सीमा नहीं)",
+    "The remote device has not accepted sharing this folder.": "रिमोट उपकरण ने इस फोल्डर को साझा करना स्वीकार नहीं किया है।",
+    "The remote device has paused this folder.": "रिमोट उपकरण ने इस फोल्डर को रोक दिया है।",
+    "The rescan interval must be a non-negative number of seconds.": "पुन: स्कैन अंतराल सेकंड की गैर-नकारात्मक संख्या होनी चाहिए।",
+    "There are no devices to share this folder with.": "इस फोल्डर को साझा करने के लिए कोई उपकरण नहीं है।",
+    "There are no file versions to restore.": "पुनर्स्थापित करने के लिए कोई फाइल संस्करण नहीं हैं।",
+    "There are no folders to share with this device.": "इस उपकरण के साथ साझा करने के लिए कोई फोल्डर नहीं हैं।",
+    "They are retried automatically and will be synced when the error is resolved.": "वे स्वचालित रूप से पुनः प्रयास किए जाते हैं और त्रुटि हल होने पर समन्वयित हो जाएंगे।",
+    "This Device": "यह उपकरण",
+    "This Month": "इस महीने",
+    "This can easily give hackers access to read and change any files on your computer.": "इससे हैकर्स को आसानी से आपके कंप्यूटर पर किसी भी फाइल को पढ़ने और बदलने की सुविधा मिल सकती है।",
+    "This device cannot automatically discover other devices or announce its own address to be found by others.  Only devices with statically configured addresses can connect.": "यह उपकरण स्वचालित रूप से अन्य उपकरणों की खोज नहीं कर सकता है या दूसरों द्वारा ढूंढे जाने के लिए अपने स्वयं के पते की घोषणा नहीं कर सकता है। केवल स्थिर रूप से विन्यस्त पते वाले उपकरण ही जुड़ सकते हैं।",
+    "This is a major version upgrade.": "यह प्रमुख संस्करण उन्नयन है।",
+    "This setting controls the free space required on the home (i.e., index database) disk.": "यह सेटिंग होम (यानी, अनुक्रमणिका डेटाबेस) डिस्क पर आवश्यक खाली स्थान को नियंत्रित करती है।",
+    "Time": "समय",
+    "Time the item was last modified": "वस्तु को अंतिम बार संशोधित करने का समय",
+    "To connect with the Syncthing device named \"{%devicename%}\", add a new remote device on your end with this ID:": "\"{{devicename}}\" नामक Syncthing उपकरण से जुड़ने के लिए, इस ID के साथ अपनी ओर से एक नया रिमोट उपकरण जोड़ें:",
+    "To permit a rule, have the checkbox checked. To deny a rule, leave it unchecked.": "किसी नियम की अनुमति देने के लिए, चेकबॉक्स चेक करें। किसी नियम को अस्वीकार करने के लिए उसे अनियंत्रित छोड़ दें।",
+    "Today": "आज",
+    "Trash Can": "रद्दी",
+    "Trash Can File Versioning": "रद्दी फाइल संस्करण",
+    "Type": "प्रकार",
+    "UNIX Permissions": "UNIX अनुमतियां",
+    "Unavailable": "अनुपलब्ध",
+    "Unavailable/Disabled by administrator or maintainer": "व्यवस्थापक या अनुरक्षक द्वारा अनुपलब्ध/अक्षम",
+    "Undecided (will prompt)": "अनिर्णीत (संकेत देगा)",
+    "Unexpected Items": "अप्रत्याशित वस्तुएं",
+    "Unexpected items have been found in this folder.": "इस फोल्डर में अप्रत्याशित वस्तुएं मिली हैं।",
+    "Unignore": "अनदेखा न करें",
+    "Unknown": "अज्ञात",
+    "Unshared": "अनसाझा",
+    "Unshared Devices": "अनसाझा उपकरण",
+    "Unshared Folders": "अनसाझा फोल्डर",
+    "Untrusted": "अविश्वस्त",
+    "Up to Date": "अद्यतित है",
+    "Updated {%file%}": "{{file}} अद्यतित",
+    "Upgrade": "उन्नयन",
+    "Upgrade To {%version%}": "{{version}} पर उन्नयन करें",
+    "Upgrading": "उन्नयन किया जा रहा है",
+    "Upload Rate": "अपलोड दर",
+    "Uptime": "सक्रिय-अवधि",
+    "Usage reporting is always enabled for candidate releases.": "उम्मीदवार की रिलीज़ के लिए उपयोग रिपोर्टिंग हमेशा सक्षम होती है।",
+    "Use HTTPS for GUI": "GUI के लिए HTTPS का उपयोग करें",
+    "Use notifications from the filesystem to detect changed items.": "परिवर्तित वस्तुओं का पता लगाने के लिए फाइल सिस्टम से सूचनाओं का उपयोग करें।",
+    "User": "उपयोक्ता",
+    "User Home": "उपयोक्ता होम",
+    "Username/Password has not been set for the GUI authentication. Please consider setting it up.": "GUI प्रमाणीकरण के लिए उपयोक्तानाम/पासवर्ड निर्धारित नहीं किया गया है। कृपया इसे स्थापित करने पर विचार करें।",
+    "Using a QUIC connection over LAN": "LAN पर QUIC कनेक्शन का उपयोग किया जा रहा है",
+    "Using a QUIC connection over WAN": "WAN पर QUIC कनेक्शन का उपयोग किया जा रहा है",
+    "Using a direct TCP connection over LAN": "LAN पर सीधे TCP कनेक्शन का उपयोग किया जा रहा है",
+    "Using a direct TCP connection over WAN": "WAN पर सीधे TCP कनेक्शन का उपयोग किया जा रहा है",
+    "Version": "संस्करण",
+    "Versions": "संस्करण",
+    "Versions Path": "संस्करण पथ",
+    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "यदि संस्करण अधिकतम आयु से अधिक पुराने हैं या किसी अंतराल में अनुमत फाइलों की संख्या से अधिक हैं तो वे स्वचालित रूप से मिटा दिए जाते हैं।",
+    "Waiting to Clean": "सफाई की प्रतीक्षा में",
+    "Waiting to Scan": "स्कैन की प्रतीक्षा में",
+    "Waiting to Sync": "समन्वयन की प्रतीक्षा में",
+    "Warning": "चेतावनी",
+    "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "चेतावनी, यह पथ मौजूदा फोल्डर \"{{otherFolder}}\" की मूल निर्देशिका है।",
+    "Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "चेतावनी, यह पथ मौजूदा फोल्डर \"{{otherFolderLabel}}\" ({{otherFolder}}) की मूल निर्देशिका है।",
+    "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.": "चेतावनी: यदि आप {{syncthingInotify}} जैसे बाहरी वॉचर का उपयोग कर रहे हैं, तो आपको यह सुनिश्चित करना चाहिए कि यह निष्क्रिय है।",
+    "Watch for Changes": "परिवर्तनों पर नजर रखें",
+    "Watching for Changes": "परिवर्तनों पर नजर रख रहे हैं",
+    "Watching for changes discovers most changes without periodic scanning.": "परिवर्तनों पर नज़र रखने से समय-समय पर स्कैनिंग के बिना अधिकांश परिवर्तनों का पता चलता है।",
+    "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 का उपयोग उपकरणों के बीच फोल्डरों को एक साथ जोड़ने के लिए किया जाता है। वे केस संवेदनशील हैं और सभी उपकरणों के बीच बिल्कुल मेल खाना चाहिए।",
+    "When set to more than one on both devices, Syncthing will attempt to establish multiple concurrent connections. If the values differ, the highest will be used. Set to zero to let Syncthing decide.": "जब दोनों उपकरणों पर एक से अधिक पर तय किया जाता है, तो Syncthing एकाधिक समवर्ती कनेक्शन स्थापित करने का प्रयास करेगा। यदि मान भिन्न हैं, तो उच्चतम का उपयोग किया जाएगा। Syncthing को निर्णय लेने देने के लिए शून्य पर निर्धारित करें।",
+    "Yes": "हां",
+    "Yesterday": "बिता कल",
+    "You can also copy and paste the text into a new message manually.": "आप पाठ को मैन्युअल रूप से नए संदेश में कॉपी और पेस्ट भी कर सकते हैं।",
+    "You can also select one of these nearby devices:": "आप इन निकटवर्ती उपकरणों में से एक का चयन भी कर सकते हैं:",
+    "You can change your choice at any time in the Settings dialog.": "आप सेटिंग संवाद में किसी भी समय अपनी पसंद बदल सकते हैं।",
+    "You can read more about the two release channels at the link below.": "आप नीचे दिए गए लिंक पर दो रिलीज़ चैनलों के बारे में अधिक पढ़ सकते हैं।",
+    "You have no ignored devices.": "आपके पास कोई उपेक्षित उपकरण नहीं है।",
+    "You have no ignored folders.": "आपके पास कोई उपेक्षित फोल्डर नहीं है।",
+    "You have unsaved changes. Do you really want to discard them?": "आपके पास सहेजे नहीं गए परिवर्तन हैं। क्या आप सचमुच उन्हें त्यागना चाहते हैं?",
+    "You must keep at least one version.": "आपको कम से कम एक संस्करण रखना होगा।",
+    "You should never add or change anything locally in a \"{%receiveEncrypted%}\" folder.": "आपको \"{{receiveEncrypted}}\" फोल्डर में कभी भी स्थानीय रूप से कुछ भी जोड़ना या बदलना नहीं चाहिए।",
+    "Your SMS app should open to let you choose the recipient and send it from your own number.": "आपका SMS ऐप खुल जाना चाहिए ताकि आप प्राप्तकर्ता का चयन कर सकें और इसे अपने नंबर से भेज सकें।",
+    "Your email app should open to let you choose the recipient and send it from your own address.": "आपका ईमेल ऐप खुल जाना चाहिए ताकि आप प्राप्तकर्ता का चयन कर सकें और इसे अपने पते से भेज सकें।",
+    "days": "दिन",
+    "deleted": "मिटाया गया",
+    "deny": "अस्वीकारें",
+    "directories": "निर्देशिकाएं",
+    "file": "फाइल",
+    "files": "फाइलें",
+    "folder": "फोल्डर",
+    "full documentation": "पूर्ण दस्तावेज़ीकरण",
+    "items": "वस्तुएं",
+    "modified": "संशोधित",
+    "permit": "अनुमति",
+    "seconds": "सेकंड",
+    "theme": {
+        "name": {
+            "black": "काली",
+            "dark": "गहरी",
+            "default": "तयशुदा",
+            "light": "हल्की"
+        }
+    },
+    "unknown device": "अज्ञात उपकरण",
+    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} फोल्डर \"{{folder}}\" साझा करना चाहता है।",
+    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} फोल्डर \"{{folderlabel}}\" ({{folder}}) साझा करना चाहता है।",
+    "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} इस उपकरण को दोबारा पेश कर सकता है।"
+}

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

@@ -30,6 +30,7 @@
     "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.": "Perintah eksternal menangani pemversian. Ia harus menghapus berkas dari folder yang dibagi. Jika lokasi aplikasi terdapat spasi, itu harus dikutip.",
     "Anonymous Usage Reporting": "Pelaporan Penggunaan Anonim",
     "Anonymous usage report format has changed. Would you like to move to the new format?": "Format pelaporan penggunaan anonim telah berubah. Maukah anda pindah menggunakan format yang baru?",
+    "Applied to LAN": "Digunakan di LAN",
     "Apply": "Terapkan",
     "Are you sure you want to override all remote changes?": "Apakah anda yakin ingin menimpa semua perubahan jarak jauh?",
     "Are you sure you want to permanently delete all these files?": "Apakah anda yakin ingin menghapus semua berkas berikut secara permanen?",
@@ -38,6 +39,7 @@
     "Are you sure you want to restore {%count%} files?": "Apakah anda yakin ingin memulihkan {{count}} berkas?",
     "Are you sure you want to revert all local changes?": "Apakah anda yakin ingin mengembalikan semua perubahan lokal?",
     "Are you sure you want to upgrade?": "Apakah anda yakin ingin meningkatkan?",
+    "Authentication Required": "Otentikasi diperlukan",
     "Authors": "Penulis",
     "Auto Accept": "Terima Otomatis",
     "Automatic Crash Reporting": "Pelaporan Crash Otomatis",
@@ -48,6 +50,7 @@
     "Available debug logging facilities:": "Fasilitas log debug yang ada:",
     "Be careful!": "Harap hati-hati!",
     "Body:": "Badan:",
+    "Bugs": "Bugs",
     "Cancel": "Batal",
     "Changelog": "Log Perubahan",
     "Clean out after": "Bersihkan setelah",
@@ -63,6 +66,7 @@
     "Configured": "Terkonfigurasi",
     "Connected (Unused)": "Terkoneksi (Tidak Digunakan)",
     "Connection Error": "Koneksi Galat",
+    "Connection Management": "Pengaturan Koneksi",
     "Connection Type": "Tipe Koneksi",
     "Connections": "Koneksi",
     "Connections via relays might be rate limited by the relay": "Koneksi melalui relai mungkin dibatasi oleh relai",
@@ -77,6 +81,7 @@
     "Danger!": "Bahaya!",
     "Database Location": "Lokasi Database",
     "Debugging Facilities": "Fasilitas Debug",
+    "Default": "Default",
     "Default Configuration": "Konfigurasi Bawaan",
     "Default Device": "Perangkat Bawaan",
     "Default Folder": "Folder Bawaan",

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

@@ -294,8 +294,8 @@
     "Rescan All": "Nuskaityti visus aplankus",
     "Rescans": "Nuskaitymai",
     "Restart": "Paleisti iš naujo",
-    "Restart Needed": "Reikalingas perleidimas",
-    "Restarting": "Persileidžia",
+    "Restart Needed": "Reikia paleisti iš naujo",
+    "Restarting": "Paleidžiama iš naujo",
     "Restore": "Atkurti",
     "Restore Versions": "Atkurti versijas",
     "Resume": "Pratęsti",
@@ -360,12 +360,12 @@
     "Syncthing includes the following software or portions thereof:": "Syncthing naudoja šias programas ar jų dalis:",
     "Syncthing is Free and Open Source Software licensed as MPL v2.0.": "Syncthing yra laisva ir atvirojo kodo programinė įranga, licencijuota pagal MPL v2.0.",
     "Syncthing is a continuous file synchronization program. It synchronizes files between two or more computers in real time, safely protected from prying eyes. Your data is your data alone and you deserve to choose where it is stored, whether it is shared with some third party, and how it's transmitted over the internet.": "Syncthing yra pastovaus failų sinchronizavimo programa. Ji realiu laiku sinchronizuoja failus tarp dviejų ar daugiau kompiuterių, saugiai apsaugodama juos nuo smalsių akių. Jūsų duomenys yra tik jūsų duomenys ir jūs turite teisę rinktis, kur juos laikyti, su kuo juos bendrinti ir kaip juos persiuntinėti.",
-    "Syncthing is restarting.": "Syncthing perleidžiamas",
+    "Syncthing is restarting.": "Syncthing paleidžiama iš naujo.",
     "Syncthing is saving changes.": "Syncthing įrašo pakeitimus.",
     "Syncthing is upgrading.": "Syncthing atsinaujina.",
     "Syncthing now supports automatically reporting crashes to the developers. This feature is enabled by default.": "Dabar, Syncthing palaiko ir automatiškai plėtotojams siunčia ataskaitas apie strigtis. Pagal numatymą, ši ypatybė yra įjungta.",
     "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Atrodo, kad Syncthing išjungta arba yra problemų su interneto ryšiu. Bandoma iš naujo…",
-    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Atrodo, kad Syncthing, vykdydamas jūsų užklausą, susidūrė su problemomis. Prašome iš naujo įkelti puslapį, arba jei problema išlieka, iš naujo paleisti Syncthing.",
+    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Atrodo, kad Syncthing, vykdydama jūsų užklausą, susidūrė su problemomis. Prašome įkelti puslapį iš naujo arba, jei problema išlieka, iš naujo paleisti Syncthing.",
     "TCP LAN": "TCP LAN (vietinis tinklas)",
     "TCP WAN": "TCP WAN (platusis tinklas)",
     "Take me back": "Sugrąžinkite mane",

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

@@ -6,11 +6,14 @@
     "About": "Om",
     "Action": "Handling",
     "Actions": "Handlinger",
+    "Active filter rules": "Regler for aktive filtre",
     "Add": "Legg til",
     "Add Device": "Legg til enhet",
     "Add Folder": "Legg til mappe",
     "Add Remote Device": "Legg til ekstern enhet",
     "Add devices from the introducer to our device list, for mutually shared folders.": "Legg til enheter fra introdusøren til vår enhetsliste, for innbyrdes delte mapper.",
+    "Add filter entry": "Legge til filteroppføring",
+    "Add ignore patterns": "Legg til ignorerte mønstre",
     "Add new folder?": "Legg til ny mappe?",
     "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.": "I tillegg vil omskanningsintervallen bli økt (ganger 60. altså nytt forvalg på 1t). Du kan også sette den opp manuelt for hver mappe senere etter å ha valgt \"Nei\".",
     "Address": "Adresse",
@@ -18,15 +21,26 @@
     "Advanced": "Avansert",
     "Advanced Configuration": "Avanserte innstillinger",
     "All Data": "Alle data",
+    "All Time": "All tid",
+    "All folders shared with this device must be protected by a password, such that all sent data is unreadable without the given password.": "Alle mapper som deles med denne enheten må beskyttes av et passord, slik at alle sendte data er uleselige uten det oppgitte passordet.",
     "Allow Anonymous Usage Reporting?": "Tillat anonym innsamling av brukerdata?",
     "Allowed Networks": "Tillatte nettverk",
     "Alphabetic": "Alfabetisk",
+    "Altered by ignoring deletes.": "Endret ved å ignorere slettinger.",
     "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.": "En ekstern kommando tar hånd om versjoneringen. Den må fjerne filen fra den delte mappen. Hvis stien til programmet inneholder mellomrom, må den siteres.",
     "Anonymous Usage Reporting": "Anonym innsamling av brukerdata",
     "Anonymous usage report format has changed. Would you like to move to the new format?": "Det anonyme bruksrapportformatet har endret seg. Ønsker du å gå over til det nye formatet?",
+    "Applied to LAN": "Gjelder LAN",
+    "Apply": "Bruk",
+    "Are you sure you want to override all remote changes?": "Er du sikker på at du vil overstyre alle eksterne endringer?",
+    "Are you sure you want to permanently delete all these files?": "Er du sikker på at du vil slette alle disse filene permanent?",
     "Are you sure you want to remove device {%name%}?": "Er du sikker på at du ønsker å fjerne enheten {{name}}?",
     "Are you sure you want to remove folder {%label%}?": "Er du sikker på at du ønsker å fjerne mappen {{label}}?",
     "Are you sure you want to restore {%count%} files?": "Er du sikker på at du ønsker å gjenopprette {{count}} filer?",
+    "Are you sure you want to revert all local changes?": "Er du sikker på at du vil tilbakestille alle lokale endringer?",
+    "Are you sure you want to upgrade?": "Er du sikker på at du vil oppgradere?",
+    "Authentication Required": "Autentisering kreves",
+    "Authors": "Forfattere",
     "Auto Accept": "Godta automatisk",
     "Automatic Crash Reporting": "Automatisk krasjrapportering",
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "Automatisk oppgradering lar deg nå få valget mellom ferdige utgaver og utgivelseskandidater.",
@@ -35,29 +49,58 @@
     "Automatically create or share folders that this device advertises at the default path.": "Opprett eller del mapper automatisk i mapper som denne enheten melder som forvalgt mappe.",
     "Available debug logging facilities:": "Tilgjengelige funksjoner for logging i feilrettingsøyemed:",
     "Be careful!": "Vær forsiktig!",
+    "Body:": "Kropp:",
     "Bugs": "Programfeil",
+    "Cancel": "Avbryt",
     "Changelog": "Endringslogg",
     "Clean out after": "Tøm etter",
+    "Cleaning Versions": "Tømme versjoner",
+    "Cleanup Interval": "Tømme intervall",
+    "Click to see full identification string and QR code.": "Klikk for å se hele identifikasjonsstrengen og QR-koden.",
     "Close": "Lukk",
     "Command": "Kommando",
-    "Comment, when used at the start of a line": "Kommentar, når det blir brukt i starten av en linje.",
+    "Comment, when used at the start of a line": "Kommentar, når det blir brukt i starten av en linje",
     "Compression": "Komprimering",
+    "Configuration Directory": "Konfigurasjonskatalog",
+    "Configuration File": "Konfigurasjonsfil",
     "Configured": "Oppsatt",
+    "Connected (Unused)": "Tilkoblet (ubrukt)",
     "Connection Error": "Tilkoblingsfeil",
+    "Connection Management": "Tilkoblingsadministrasjon",
     "Connection Type": "Tilkoblingstype",
     "Connections": "Tilkoblinger",
+    "Connections via relays might be rate limited by the relay": "Tilkoblinger via releer kan være hastighetsbegrenset av reléet",
     "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.": "Kontinuerlig oppsyn med endringer er nå tilgjengelig i Syncthing. Dette vil oppdage endringer på disk, og utstede full skanning bare for endrede deler. Fordelen er at endringer sprer seg raskere, og at færre fulle skanninger kreves.",
     "Copied from elsewhere": "Kopiert fra et annet sted",
     "Copied from original": "Kopiert fra original",
+    "Copied!": "Kopiert!",
+    "Copy": "Kopier",
+    "Copy failed! Try to select and copy manually.": "Kopiering mislyktes! Prøv å merke og kopiere manuelt.",
+    "Currently Shared With Devices": "Deles for øyeblikket med enheter",
+    "Custom Range": "Tilpasset område",
     "Danger!": "Fare!",
+    "Database Location": "Database plassering",
     "Debugging Facilities": "Feilrettingsverktøy",
+    "Default": "Standard",
+    "Default Configuration": "Standard konfigurasjon",
+    "Default Device": "Standard enhet",
+    "Default Folder": "Standard mappe",
+    "Default Ignore Patterns": "Standard ignoreringsmønstre",
+    "Defaults": "Standarder",
     "Delete": "Slett",
+    "Delete Unexpected Items": "Slett uventede elementer",
+    "Deleted {%file%}": "Slettet {{file}}",
     "Deselect All": "Fjern alle markeringer",
+    "Deselect devices to stop sharing this folder with.": "Fjern merkingen av enheter for å slutte å dele denne mappen med dem.",
+    "Deselect folders to stop sharing with this device.": "Fjern merkingen av mapper for å slutte å dele med denne enheten.",
     "Device": "Enhet",
     "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Enhet \"{{name}}\" ({{device}} på {{address}}) ønsker å koble til. Legge til ny enhet?",
+    "Device Certificate": "Enhetssertifikat",
     "Device ID": "Enhets-ID",
-    "Device Identification": "Enhetskjennemerke",
+    "Device Identification": "Enhetsidentifikasjon",
     "Device Name": "Navn på enhet",
+    "Device Status": "Enhetsstatus",
+    "Device is untrusted, enter encryption password": "Enheten er ikke godkjent, angi krypteringspassord",
     "Device rate limits": "enhetshastighetsgrense",
     "Device that last modified the item": "Enheten som sist endret elementet",
     "Devices": "Enheter",
@@ -66,30 +109,42 @@
     "Disabled periodic scanning and disabled watching for changes": "Skrudde av både periodisk skanning og oppsyn med endringer",
     "Disabled periodic scanning and enabled watching for changes": "Skrudde av periodisk skanning og skrudde på oppsyn med endringer",
     "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Skrudde av periodisk skanning og mislyktes i oppsett av oppsyn med endringer, prøver igjen hvert minutt:",
+    "Disables comparing and syncing file permissions. Useful on systems with nonexistent or custom permissions (e.g. FAT, exFAT, Synology, Android).": "Deaktiverer sammenligning og synkronisering av filtillatelser. Nyttig på systemer med ikke-eksisterende eller tilpassede tillatelser (f.eks. FAT, exFAT, Synology, Android).",
     "Discard": "Kasser",
     "Disconnected": "Frakoblet",
+    "Disconnected (Inactive)": "Frakoblet (inaktiv)",
+    "Disconnected (Unused)": "Frakoblet (ubrukt)",
     "Discovered": "Oppdaget",
-    "Discovery": "Oppslag",
+    "Discovery": "Oppdagelse",
     "Discovery Failures": "Oppslagsfeil",
+    "Discovery Status": "Oppdagelses status",
+    "Dismiss": "Avvis",
+    "Do not add it to the ignore list, so this notification may recur.": "Ikke legg den til i ignoreringslisten, så dette varselet kan gjentas.",
     "Do not restore": "Ikke gjenopprett",
     "Do not restore all": "Ikke gjenopprett alle",
     "Do you want to enable watching for changes for all your folders?": "Ønsker du å skru på oppsyn med endringer for alle dine mapper?",
     "Documentation": "Dokumentasjon",
-    "Download Rate": "Nedlastingsrate",
+    "Download Rate": "Nedlastingshastighet",
     "Downloaded": "Lastet ned",
     "Downloading": "Laster ned",
     "Edit": "Rediger",
     "Edit Device": "Rediger enhet",
+    "Edit Device Defaults": "Endre enhetens standardverdier",
     "Edit Folder": "Rediger mappe",
+    "Edit Folder Defaults": "Endre mappens standardverdier",
     "Editing {%path%}.": "Redigerer {{path}}.",
     "Enable Crash Reporting": "Skru på krasjrapportering",
     "Enable NAT traversal": "Slå på NAT-traversering",
     "Enable Relaying": "Aktiver reléforsendelse",
     "Enabled": "Påskrudd",
+    "Enables sending extended attributes to other devices, and applying incoming extended attributes. May require running with elevated privileges.": "Gjør det mulig å sende utvidede attributter til andre enheter og bruke innkommende utvidede attributter. Kan kreve kjøring med utvidede rettigheter.",
     "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Skriv inn et ikke-negativt nummer (f.eks. \"2.35\") og velg en enhet. Prosenter er deler av total diskstørrelse.",
     "Enter a non-privileged port number (1024 - 65535).": "Skriv inn et ikke-priviligert portnummer (1024-65535).",
     "Enter ignore patterns, one per line.": "Skriv inn mønster som skal utelates, ett per linje.",
     "Error": "Feilmelding",
+    "Extended Attributes": "Utvidede attributter",
+    "Extended Attributes Filter": "Utvidede attributters filter",
+    "External": "Ekstern",
     "External File Versioning": "Ekstern versjonskontroll",
     "Failed Items": "Elementsynkronisering som har mislyktes",
     "Failed to setup, retrying": "Klarte ikke å utføre oppsett, prøver igjen",
@@ -106,6 +161,7 @@
     "Folder ID": "Mappe-ID",
     "Folder Label": "Merkelapp for mappe",
     "Folder Path": "Mappeplassering",
+    "Folder Status": "Mappe status",
     "Folder Type": "Mappetype",
     "Folders": "Mapper",
     "Full Rescan Interval (s)": "Intervall for fullstendig omskanning (s)",
@@ -116,25 +172,32 @@
     "GUI Theme": "GUI-tema",
     "General": "Hovedinnstillinger",
     "Generate": "Generer",
-    "Global Discovery": "Globalt oppslag",
-    "Global Discovery Servers": "Globale oppslagstjenere",
+    "Global Discovery": "Global oppdagelse",
+    "Global Discovery Servers": "Globale oppdagelses servere",
     "Global State": "Global tilstand",
     "Help": "Hjelp",
     "Home page": "Hjemmeside",
+    "Identification": "Identifikasjon",
     "Ignore": "Ignorer",
     "Ignore Patterns": "Utelatelsesmønster",
     "Ignore Permissions": "Ignorer rettigheter",
     "Ignored Devices": "Ignorerte enheter",
     "Ignored Folders": "Utelatte mapper",
     "Ignored at": "Ignorert i",
+    "Included Software": "Inkludert programvare",
     "Incoming Rate Limit (KiB/s)": "Innkommende hastighetsbegrensning (KiB/s)",
     "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Feilaktige innstillinger kan skade innholdet i dine delte mapper og hindre Syncthing i å fungere.",
+    "Incorrect user name or password.": "Feil brukernavn eller passord.",
     "Introduced By": "Introdusert av",
     "Introducer": "Introduktør",
+    "Introduction": "Introduksjon",
     "Inversion of the given condition (i.e. do not exclude)": "Invers av den gitte tilstanden (dvs. ekskluder ikke)",
     "Keep Versions": "Behold versjoner",
     "LDAP": "LDAP",
     "Largest First": "Største fil først",
+    "Last 30 Days": "Siste 30 dager",
+    "Last 7 Days": "Siste 7 dager",
+    "Last Month": "Sist måned",
     "Last Scan": "Siste gjennomsøking",
     "Last seen": "Sist sett",
     "Latest Change": "Sist endret",
@@ -143,11 +206,14 @@
     "Listeners": "Lyttere",
     "Loading data...": "Laster inn data…",
     "Loading...": "Laster…",
-    "Local Discovery": "Lokalt oppslag",
+    "Local Discovery": "Lokal oppdagelse",
     "Local State": "Lokal tilstand",
     "Local State (Total)": "Lokal tilstand (total)",
     "Locally Changed Items": "Lokalt endrede elementer",
     "Log": "Logg",
+    "Log File": "Loggfil",
+    "Log In": "Logg inn",
+    "Log Out": "Logg ut",
     "Logs": "Logger",
     "Major Upgrade": "Storoppgradering",
     "Mass actions": "Massehandlinger",
@@ -156,6 +222,9 @@
     "Minimum Free Disk Space": "Nødvendig ledig diskplass",
     "Mod. Device": "Endringsenhet",
     "Mod. Time": "Endringstid",
+    "More than a month ago": "Mer enn en måned siden",
+    "More than a week ago": "Mer enn en uke siden",
+    "More than a year ago": "Mer enn et år siden",
     "Move to top of queue": "Flytt fremst i køen",
     "Multi level wildcard (matches multiple directory levels)": "Multinivåsøk (søker på flere mappenivå)",
     "Never": "Aldri",
@@ -166,15 +235,19 @@
     "No File Versioning": "Ingen versjonskontroll",
     "No files will be deleted as a result of this operation.": "Ingen filer vil bli slettet som følge av denne operasjonen.",
     "No upgrades": "Ingen oppgraderinger",
+    "Not shared": "Ikke delt",
     "Notice": "Merknader",
+    "OK": "OK",
     "Off": "Av",
     "Oldest First": "Den eldste først",
-    "Optional descriptive label for the folder. Can be different on each device.": "Valgfri merkelapp på mappa. Denne kan være ulik på forskjellige enheter",
+    "Optional descriptive label for the folder. Can be different on each device.": "Valgfri merkelapp på mappa. Denne kan være ulik på forskjellige enheter.",
     "Options": "Valg",
     "Out of Sync": "Ikke synkronisert",
     "Out of Sync Items": "Usynkroniserte elementer",
     "Outgoing Rate Limit (KiB/s)": "Utgående hastighetsbegrensning (KiB/s)",
     "Override Changes": "Overstyr endringer",
+    "Ownership": "Eierskap",
+    "Password": "Passord",
     "Path": "Sti",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Plasseringen av mappen på datamaskinen. Denne vil bli opprettet dersom den ikke finnes. Krøllstrektegnet (~) kan brukes som forkortelse for",
     "Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).": "Plasseringen for lagrede versjoner (la denne være tom for å bruke den forvalgte .stversions-mappa i den delte mappa).",
@@ -192,20 +265,22 @@
     "Prefix indicating that the pattern should be matched without case sensitivity": "Prefiks som indikerer at mønsteret skal samsvare uten versalsensitivitet",
     "Preview": "Forhåndsvisning",
     "Preview Usage Report": "Forhåndsvisning av datainnsamling",
+    "QR code": "QR kode",
     "Quick guide to supported patterns": "Kjapp innføring i godkjente mønstre",
     "Random": "Tilfeldig",
+    "Receive Encrypted": "Motta kryptert",
     "Receive Only": "Bare motta",
     "Recent Changes": "Nylige endringer",
     "Reduced by ignore patterns": "Reduser med utelatelsesmønster",
-    "Release Notes": "Utgivelsesnotat",
+    "Release Notes": "Utgivelsesnotater",
     "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Utgivelseskandidater inneholder de seneste problemfiksene og funksjonene. De ligner på de tradisjonelle Syncthing-utgivelsene som kom hver andre uke.",
     "Remote Devices": "Andre enheter",
     "Remove": "Fjern",
     "Remove Device": "Fjern enhet",
     "Remove Folder": "Fjern mappe",
     "Required identifier for the folder. Must be the same on all cluster devices.": "Påkrevd identifikator for mappa. Denne må være lik på alle enheter i samme klynge.",
-    "Rescan": "Gjennomsøk på nytt",
-    "Rescan All": "Gjennomsøk alt på nytt",
+    "Rescan": "Gjennomsøk",
+    "Rescan All": "Gjennomsøk alt",
     "Rescans": "Omskanninger",
     "Restart": "Omstart",
     "Restart Needed": "Omstart kreves",
@@ -217,6 +292,7 @@
     "Reused": "Gjenbrukt",
     "Revert Local Changes": "Tilbakestill lokale endringer",
     "Save": "Lagre",
+    "Saving changes": "Lagrer endringer",
     "Scan Time Remaining": "Gjenstående tid for gjennomsøking",
     "Scanning": "Gjennomsøker",
     "See external versioning help for supported templated command line parameters.": "Se ekstern versjoneringshjelp for støttede mal-baserte kommandolinjeparameter.",
@@ -226,10 +302,14 @@
     "Select oldest version": "Velg eldste versjon",
     "Send & Receive": "Sende og motta",
     "Send Only": "Bare send",
+    "Send Ownership": "Send eierskap",
     "Settings": "Innstillinger",
     "Share": "Del",
     "Share Folder": "Del mappe",
+    "Share by Email": "Del via epost",
+    "Share by SMS": "Del via SMS",
     "Share this folder?": "Del denne mappa?",
+    "Shared Folders": "Delte mapper",
     "Shared With": "Delt med",
     "Sharing": "Deling",
     "Show ID": "Vis ID",
@@ -239,6 +319,7 @@
     "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Vist i stedet for mappe-ID i gruppestatus. Vil bli oppdatert til navnet enheten kringkaster dersom tomt.",
     "Shutdown": "Avslutt",
     "Shutdown Complete": "Avslutning fullført",
+    "Simple": "Enkel",
     "Simple File Versioning": "Enkel versjonskontroll",
     "Single level wildcard (matches within a directory only)": "Enkeltnivåsøk (søker kun i en mappe)",
     "Size": "Størrelse",
@@ -251,32 +332,39 @@
     "Staggered File Versioning": "Forskjøvet versjonskontroll",
     "Start Browser": "Start nettleser",
     "Statistics": "Statistikk",
+    "Stay logged in": "Forbli innlogget",
     "Stopped": "Stoppet",
     "Support": "Brukerstøtte",
     "Support Bundle": "Støttebunt",
+    "Sync Extended Attributes": "Synkroniser utvidede attributter",
+    "Sync Ownership": "Synkroniser eierskap",
     "Sync Protocol Listen Addresses": "Lytteadresse for synkroniseringsprotokoll",
+    "Sync Status": "Synkroniser status",
     "Syncing": "Synkroniserer",
     "Syncthing has been shut down.": "Syncthing har blitt slått av.",
     "Syncthing includes the following software or portions thereof:": "Syncthing inkluderer helt eller delvis følgende programvare:",
     "Syncthing is Free and Open Source Software licensed as MPL v2.0.": "Syncthing er fri programvare med MPL v2.0-lisens.",
     "Syncthing is restarting.": "Syncthing starter på ny.",
+    "Syncthing is saving changes.": "Syncthing lagrer endringer.",
     "Syncthing is upgrading.": "Syncthing oppgraderer.",
     "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing ser ut til å være nede, eller så er det et problem med nettforbindelsen din. Prøver på ny …",
     "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing ser ut til å ha støtt på et problem under behandling av din forespørsel. Gjenoppfrisk nettleseren eller start Syncthing på nytt dersom problemet vedvarer.",
     "Take me back": "Gå tilbake",
+    "The Syncthing Authors": "Syncthings forfattere",
     "The Syncthing admin interface is configured to allow remote access without a password.": "Grensesnittet for administrering av Syncthing er satt til å tillate ekstern tilgang uten et passord.",
     "The aggregated statistics are publicly available at the URL below.": "Innsamlet statistikk er åpent tilgjengelig via nettadressen angitt nedenfor.",
     "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Innstillingene har blitt lagret men ikke aktivert. Syncthing må starte på ny for å aktivere de nye innstillingene.",
     "The device ID cannot be blank.": "Enhets-ID kan ikke være tom.",
-    "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).": "Enhets-ID som skal skrives her kan du finne i menyen \"Handlinger\" > \"Vis ID\" på den andre enheten. Mellomrom og strek er valgfritt (ignoreres)",
+    "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).": "Enhets-ID som skal skrives her kan du finne i menyen \"Handlinger\" > \"Vis ID\" på den andre enheten. Mellomrom og strek er valgfritt (ignoreres).",
     "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.": "Kryptert informasjon om bruken av programmet blir gjort daglig. Dette blir brukt til å følge med på vanlig brukte systemoppsett, størrelser på mapper, og versjoner av programmet. Om datasettet endrer seg vil denne dialogboksen dukke opp og du vil bli bedt om å godkjenne dette.",
     "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.": "ID-en for denne enheten er ikke godkjent. Det bør være 52 eller 56 tegn bestående av bokstaver og tall, valgfritt med mellomrom og bindestrek.",
     "The folder ID cannot be blank.": "Mappe-ID kan ikke være tom.",
     "The folder ID must be unique.": "Mappe-ID må være unik.",
-    "The folder path cannot be blank.": "Mappeplasseringen kan ikke være tom.",
+    "The folder path cannot be blank.": "Mappe-stien kan ikke være tom.",
     "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.": "Følgende intervall blir brukt: Den første timen blir en versjon lagret hvert 30. sekund, den første dagen blir en versjon lagret hver time, de første 30 dagene blir en versjon lagret hver dag, og inntil maksimal levetid blir en versjon lagret hver uke.",
     "The following items could not be synchronized.": "Følgende filer kunne ikke synkroniseres.",
     "The following items were changed locally.": "Følgende elementer ble endret lokalt.",
+    "The following text will automatically be inserted into a new message.": "Den følgende teksten vil automatisk bli lagt til i en ny melding.",
     "The maximum age must be a number and cannot be blank.": "Maksimal levetid må være et tall og kan ikke være tomt.",
     "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Maksimal tid å beholde en versjon (i dager, sett til 0 for å beholde versjoner på ubegrenset tid).",
     "The number of days must be a number and cannot be blank.": "Antall dager må være et tall og kan ikke være tomt.",
@@ -286,34 +374,46 @@
     "The path cannot be blank.": "Plasseringen kan ikke være tom.",
     "The rate limit must be a non-negative number (0: no limit)": "Hastighetsbegrensningen kan ikke være et negativt tall (0: ingen begrensing)",
     "The rescan interval must be a non-negative number of seconds.": "Antall sekund for intervallet kan ikke være negativt.",
+    "There are no file versions to restore.": "Det er ingen filversjoner å gjenopprette.",
+    "There are no folders to share with this device.": "Det er ingen mapper å dele med denne enheten.",
     "They are retried automatically and will be synced when the error is resolved.": "Disse hentes automatisk og vil synkroniseres når feilen er blitt utbedret.",
     "This Device": "Denne enheten",
+    "This Month": "Denne måned",
     "This can easily give hackers access to read and change any files on your computer.": "Dette kan lett gi hackere tilgang til å lese og endre alle filer på datamaskinen din.",
-    "This is a major version upgrade.": "Dette er en storoppgradering",
+    "This is a major version upgrade.": "Dette er en stor versjonsoppgradering.",
     "This setting controls the free space required on the home (i.e., index database) disk.": "Denne innstillingen kontrollerer ledig diskplass krevd på hjemme- (f.eks. indekseringsdatabase-) disken.",
     "Time": "Klokkeslett",
     "Time the item was last modified": "Tidspunktet elementet sist ble endret",
+    "Today": "I dag",
     "Trash Can File Versioning": "Papirkurv versjonskontroll",
+    "UNIX Permissions": "UNIX tillatelser",
     "Unavailable": "Utilgjengelig",
     "Unavailable/Disabled by administrator or maintainer": "Utilgjengelig/avskrudd av administrator eller vedlikeholder",
     "Undecided (will prompt)": "Ikke bestemt (vil spørre)",
     "Unignore": "Ikke ignorer",
     "Unknown": "Ukjent",
     "Unshared": "Ikke delt",
+    "Unshared Devices": "Udelte enheter",
+    "Unshared Folders": "Udelte mapper",
     "Up to Date": "Oppdatert",
+    "Updated {%file%}": "Oppdatert {{file}}",
     "Upgrade": "Oppgradere",
     "Upgrade To {%version%}": "Oppgrader til {{version}}",
     "Upgrading": "Oppgraderer",
     "Upload Rate": "Opplastingsrate",
     "Uptime": "Oppetid",
-    "Usage reporting is always enabled for candidate releases.": "Bruksrapportering er alltid påslått for utgivelseskandidater",
+    "Usage reporting is always enabled for candidate releases.": "Bruksrapportering er alltid påslått for utgivelseskandidater.",
     "Use HTTPS for GUI": "Bruk HTTPS for GUI",
     "Use notifications from the filesystem to detect changed items.": "Bruk varslinger fra filsystemet for å oppdage endrede elementer.",
+    "User": "Bruker",
     "Version": "Versjon",
     "Versions": "Versjoner",
     "Versions Path": "Plassering av versjoner",
     "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Versjoner blir automatisk slettet når maksimal levetid er nådd eller når antall filer er oversteget.",
+    "Waiting to Clean": "Venter på å rydde opp",
     "Waiting to Scan": "Venter på å starte gjennomsøkning",
+    "Waiting to Sync": "Venter på å synkronisere",
+    "Warning": "Advarsel",
     "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "Advarsel, denne stien er en foreldremappe for en eksisterende mappe \"{{otherFolder}}\".",
     "Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Advarsel, denne stien er en foreldremappe for en eksisterende mappe \"{{otherFolderLabel}}\" ({{otherFolder}}).",
     "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Advarsel, denne stien er en undermappe i en eksisterende mappe \"{{otherFolder}}\".",
@@ -324,18 +424,39 @@
     "When adding a new device, keep in mind that this device must be added on the other side too.": "Når du legger til en ny enhet, husk at enheten må legges til på andre siden også.",
     "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 en ny mappe blir lagt til, husk at Mappe-ID blir brukt til å binde sammen mapper mellom enheter. Det er forskjell på store og små bokstaver, så IDene må være identiske på alle enhetene.",
     "Yes": "Ja",
+    "Yesterday": "I går",
+    "You can also copy and paste the text into a new message manually.": "Du kan også kopiere og lime inn teksten i en ny melding manuelt.",
     "You can also select one of these nearby devices:": "Du kan også velge en av disse enhetene i nærheten:",
     "You can change your choice at any time in the Settings dialog.": "Du kan endre ditt valg når som helst i innstillingene.",
     "You can read more about the two release channels at the link below.": "Du kan lese mer om de to nye utgivelseskanalene i lenken nedenfor.",
     "You have no ignored devices.": "Du har ingen ignorerte enheter.",
     "You have no ignored folders.": "Du har ingen ignorerte mapper.",
-    "You must keep at least one version.": "Du må beholde minst én versjon",
+    "You have unsaved changes. Do you really want to discard them?": "Du har ulagrede endringer. Vil du virkelig forkaste dem?",
+    "You must keep at least one version.": "Du må beholde minst én versjon.",
+    "You should never add or change anything locally in a \"{%receiveEncrypted%}\" folder.": "Du bør aldri legge til eller endre noe lokalt i en \"{{receiveEncrypted}}\" mappe.",
+    "Your SMS app should open to let you choose the recipient and send it from your own number.": "SMS-appen din vil åpnes slik at du kan velge mottaker og sende den fra ditt eget nummer.",
+    "Your email app should open to let you choose the recipient and send it from your own address.": "E-postappen din vil åpnes slik at du kan velge mottaker og sende den fra din egen adresse.",
     "days": "dager",
+    "deleted": "slettet",
+    "deny": "avvis",
     "directories": "mapper",
+    "file": "fil",
     "files": "filer",
-    "full documentation": "all dokumentasjon",
+    "folder": "mappe",
+    "full documentation": "full dokumentasjon",
     "items": "elementer",
+    "modified": "endret",
+    "permit": "tillat",
     "seconds": "sekunder",
+    "theme": {
+        "name": {
+            "black": "Sort",
+            "dark": "Mørk",
+            "default": "Standard",
+            "light": "Lys"
+        }
+    },
+    "unknown device": "ukjent enhet",
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} ønsker å dele mappa \"{{folder}}\".",
     "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} ønsker å dele mappa \"{{folderlabel}}\" ({{folder}})."
 }

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

@@ -35,7 +35,7 @@
     "Are you sure you want to override all remote changes?": "Tem a certeza que quer sobrepor todas as alterações remotas?",
     "Are you sure you want to permanently delete all these files?": "Deseja realmente excluir todos estes arquivos permanentemente?",
     "Are you sure you want to remove device {%name%}?": "Deseja mesmo remover o dispositivo {{name}}?",
-    "Are you sure you want to remove folder {%label%}?": "Deseja mesmo remover a pasta {{name}}?",
+    "Are you sure you want to remove folder {%label%}?": "Deseja mesmo remover a pasta {{label}}?",
     "Are you sure you want to restore {%count%} files?": "Deseja mesmo restaurar {{count}} arquivo(s)?",
     "Are you sure you want to revert all local changes?": "Tem a certeza que quer reverter todas as alterações locais?",
     "Are you sure you want to upgrade?": "Deseja mesmo fazer a atualização?",
@@ -69,7 +69,7 @@
     "Connection Management": "Gerenciamento de Conexões",
     "Connection Type": "Tipo da conexão",
     "Connections": "Conexões",
-    "Connections via relays might be rate limited by the relay": "Conexões que usam retransmissão podem podem ter velocidade limitada pelo retransmissor",
+    "Connections via relays might be rate limited by the relay": "Conexões que usam retransmissão podem ter a velocidade limitada pelo retransmissor",
     "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.": "Observar continuamente as alterações agora está disponível no Syncthing. Isso detectará mudanças no disco e fará uma varredura apenas nos caminhos modificados. Os benefícios são que as alterações são propagadas mais rapidamente e menos verificações completas são necessárias.",
     "Copied from elsewhere": "Copiado de outro lugar",
     "Copied from original": "Copiado do original",
@@ -99,6 +99,7 @@
     "Device ID": "ID do dispositivo",
     "Device Identification": "Identificação do dispositivo",
     "Device Name": "Nome do dispositivo",
+    "Device Status": "Status do Dispositivo",
     "Device is untrusted, enter encryption password": "O dispositivo não é confiável, digite a senha de criptografia",
     "Device rate limits": "Limites de velocidade do dispositivo",
     "Device that last modified the item": "Dispositivo que modificou o item pela última vez",
@@ -168,6 +169,7 @@
     "Folder ID": "ID da pasta",
     "Folder Label": "Rótulo da pasta",
     "Folder Path": "Caminho da pasta",
+    "Folder Status": "Status da Pasta",
     "Folder Type": "Tipo da pasta",
     "Folder type \"{%receiveEncrypted%}\" can only be set when adding a new folder.": "O tipo de pasta \"{{receiveEncrypted}}\" só pode ser definido ao adicionar uma nova pasta.",
     "Folder type \"{%receiveEncrypted%}\" cannot be changed after adding the folder. You need to remove the folder, delete or decrypt the data on disk, and add the folder again.": "O tipo de pasta \"{{receiveEncrypted}}\" não pode ser alterado após adicionar a pasta. Você precisa remover a pasta, excluir ou descriptografar os dados do disco e adicionar a pasta novamente.",
@@ -237,6 +239,8 @@
     "Log File": "Arquivo de registro",
     "Log In": "Entrar",
     "Log Out": "Sair",
+    "Log in to see paths information.": "Faça Log In para ver informações de caminhos.",
+    "Log in to see version information.": "Faça Log In para ver informações de versão.",
     "Log tailing paused. Scroll to the bottom to continue.": "Log tailing pausado. Role até o final para continuar.",
     "Login failed, see Syncthing logs for details.": "Falha no login. Veja os logs do Syncthing para mais detalhes.",
     "Logs": "Registros",
@@ -382,6 +386,7 @@
     "Staggered File Versioning": "Escalonado",
     "Start Browser": "Iniciar navegador",
     "Statistics": "Estatísticas",
+    "Stay logged in": "Ficar conectado",
     "Stopped": "Parado",
     "Stores and syncs only encrypted data. Folders on all connected devices need to be set up with the same password or be of type \"{%receiveEncrypted%}\" too.": "Armazena e sincroniza apenas dados criptografados. As pastas em todos os dispositivos conectados precisam ser configuradas com a mesma senha ou ser do tipo \"{{receiveEncrypted}}\" também.",
     "Subject:": "Assunto:",
@@ -543,6 +548,7 @@
             "light": "Claro"
         }
     },
+    "unknown device": "dispositivo desconhecido",
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} quer compartilhar a pasta \"{{folder}}\".",
     "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} quer compartilhar a pasta \"{{folderlabel}}\" ({{folder}}).",
     "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} pode reintroduzir este dispositivo."

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

@@ -1,6 +1,6 @@
 {
     "A device with that ID is already added.": "Устройство с таким ID уже добавлено.",
-    "A negative number of days doesn't make sense.": "Отрицательное число дней не имеет значения.",
+    "A negative number of days doesn't make sense.": "Число дней не может быть отрицательным.",
     "A new major version may not be compatible with previous versions.": "Новое обновление основной версии может быть несовместимо с предыдущими версиями.",
     "API Key": "Ключ API",
     "About": "О программе",

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

@@ -21,7 +21,7 @@
     "Advanced": "Avancerat",
     "Advanced Configuration": "Avancerad konfiguration",
     "All Data": "Alla data",
-    "All Time": "All tid",
+    "All Time": "Någonsin",
     "All folders shared with this device must be protected by a password, such that all sent data is unreadable without the given password.": "Alla mappar som delas med denna enhet måste skyddas av ett lösenord, så att alla skickade data är oläsliga utan det angivna lösenordet.",
     "Allow Anonymous Usage Reporting?": "Tillåt anonym användarstatistiksrapportering?",
     "Allowed Networks": "Tillåtna nätverk",

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

@@ -386,7 +386,7 @@
     "Staggered File Versioning": "Aşamalı Dosya Sürümlendirme",
     "Start Browser": "Tarayıcıyı başlat",
     "Statistics": "İstatistikler",
-    "Stay logged in": "Oturum açık kal",
+    "Stay logged in": "Oturum açık kalsın",
     "Stopped": "Durduruldu",
     "Stores and syncs only encrypted data. Folders on all connected devices need to be set up with the same password or be of type \"{%receiveEncrypted%}\" too.": "Yalnızca şifrelenmiş verileri depolar ve eşitler. Tüm bağlı cihazlardaki klasörlerin de aynı parola ile ayarlanması veya \"{{receiveEncrypted}}\" türünde olması gerekir.",
     "Subject:": "Konu:",

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

@@ -1,18 +1,20 @@
 {
-    "A device with that ID is already added.": "Пристрій з таким ID вже додано раніше.",
+    "A device with that ID is already added.": "Пристрій з таким ID вже додано.",
     "A negative number of days doesn't make sense.": "Від'ємна кількість днів немає сенсу.",
-    "A new major version may not be compatible with previous versions.": "Нова мажорна версія може бути несумісною із попередніми версіями.",
+    "A new major version may not be compatible with previous versions.": "Нова версія з великими змінвми може бути несумісною із попередніми версіями.",
     "API Key": "API ключ",
     "About": "Про програму",
     "Action": "Дія",
     "Actions": "Дії",
+    "Active filter rules": "Діючі правила фільтрування",
     "Add": "Додати",
     "Add Device": "Додати пристрій",
-    "Add Folder": "Додати директорію",
+    "Add Folder": "Додати папку",
     "Add Remote Device": "Додати віддалений пристрій",
-    "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 filter entry": "Додати правило фільтру",
     "Add ignore patterns": "Додати шаблони ігнорування",
-    "Add new folder?": "Додати нову директорію?",
+    "Add new folder?": "Додати нову папку?",
     "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.": "Крім того, буде збільшений інтервал повного сканування (у 60 разів, тобто нове значення за замовчанням - 1 година). Ви також можете налаштувати його вручну для кожної папки пізніше після вибору \"Ні\".",
     "Address": "Адреса",
     "Addresses": "Адреси",
@@ -23,11 +25,12 @@
     "All folders shared with this device must be protected by a password, such that all sent data is unreadable without the given password.": "Ті папки, якими поділилися з цим пристроєм, мають бути захищені паролем, щоб усі надіслані дані неможливо було прочитати без вказаного пароля.",
     "Allow Anonymous Usage Reporting?": "Дозволити програмі збирати анонімну статистику використання?",
     "Allowed Networks": "Дозволені мережі",
-    "Alphabetic": "За алфавітом",
+    "Alphabetic": "За абеткою",
     "Altered by ignoring deletes.": "Змінено шляхом ігнорування видалень.",
     "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.": "Зовнішня команда для керування версіями. Вона має видалити файл зі спільної папки. Якщо шлях до програми містить пробіли, його слід взяти в лапки.",
-    "Anonymous Usage Reporting": "Анонімна статистика використання",
+    "Anonymous Usage Reporting": "Анонімізована статистика використання",
     "Anonymous usage report format has changed. Would you like to move to the new format?": "Змінився формат анонімного звіту про користування. Бажаєте перейти на новий формат?",
+    "Applied to LAN": "Застосовано до LAN",
     "Apply": "Застосувати",
     "Are you sure you want to override all remote changes?": "Ви впевнені, що бажаєте відхилити всі зміни у віддалених папках?",
     "Are you sure you want to permanently delete all these files?": "Ви впевнені, що бажаєте остаточно видалити всі ці файли?",
@@ -35,12 +38,13 @@
     "Are you sure you want to remove folder {%label%}?": "Ви впевнені, що хочете видалити папку {{label}}?",
     "Are you sure you want to restore {%count%} files?": "Чи ви впевнені в необхідності відновити наступну к-сть файлів: {{count}} ?",
     "Are you sure you want to revert all local changes?": "Ви впевнені, що бажаєте відкинути всі локальні зміни?",
-    "Are you sure you want to upgrade?": "Впевнені, що хочете оновитися?",
+    "Are you sure you want to upgrade?": "Напевно хочете оновити?",
+    "Authentication Required": "Потрібна авторизація",
     "Authors": "Автори",
     "Auto Accept": "Автоприймання",
     "Automatic Crash Reporting": "Автоматичне звітування про збої",
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "Автоматиче оновлення зараз дозволяє обирати між стабільними випусками та реліз-кандидатами.",
-    "Automatic upgrades": "Автоматичні оновлення",
+    "Automatic upgrades": "Автоматичне оновлення",
     "Automatic upgrades are always enabled for candidate releases.": "Автоматичні оновлення завжди увімкнені для реліз-кандидатів.",
     "Automatically create or share folders that this device advertises at the default path.": "Автоматично створювати або поширювати каталоги, які цей пристрій декларує як створені по замовчанню.",
     "Available debug logging facilities:": "Доступні засоби журналу для відладки:",
@@ -62,6 +66,7 @@
     "Configured": "Налаштовано",
     "Connected (Unused)": "Під'єднано (не використовується)",
     "Connection Error": "Помилка з’єднання",
+    "Connection Management": "Керування з'єднанням",
     "Connection Type": "Тип з'єднання",
     "Connections": "З'єднання",
     "Connections via relays might be rate limited by the relay": "Швидкість з’єднання через реле може бути обмежена ним",
@@ -73,9 +78,10 @@
     "Copy failed! Try to select and copy manually.": "Помилка копіювання! Спробуйте вибрати та скопіювати вручну.",
     "Currently Shared With Devices": "На даний момент є спільний доступ пристроїв",
     "Custom Range": "Вибрати діапазон",
-    "Danger!": "Небезпечно!",
+    "Danger!": "Небезпека!",
     "Database Location": "Місцезнаходження бази даних",
     "Debugging Facilities": "Засоби відладки",
+    "Default": "За замовчанням",
     "Default Configuration": "Конфігурація за замовчуванням",
     "Default Device": "Пристрій за замовчуванням",
     "Default Folder": "Папка за замовчуванням",
@@ -93,6 +99,7 @@
     "Device ID": "ID пристрою",
     "Device Identification": "Ідентифікатор пристрою",
     "Device Name": "Назва пристрою",
+    "Device Status": "Статус пристрою",
     "Device is untrusted, enter encryption password": "Пристрій ненадійний, введіть пароль для шифрування",
     "Device rate limits": "Обмеження пристрою",
     "Device that last modified the item": "Пристрій, що останнім змінив елемент",
@@ -103,7 +110,7 @@
     "Disabled periodic scanning and enabled watching for changes": "Відключено періодичне сканування та увімкнене стеження за змінами",
     "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Відключено періодичне сканування та не вдається налаштувати перегляд змін, повторення кожну 1 хв:",
     "Disables comparing and syncing file permissions. Useful on systems with nonexistent or custom permissions (e.g. FAT, exFAT, Synology, Android).": "Вимикає порівняння та синхронізацію дозволів на файли. Корисно для систем з відсутніми або особливими дозволами (наприклад: FAT, exFAT, Synology, Android).",
-    "Discard": "Відхилити",
+    "Discard": "Відхили",
     "Disconnected": "З’єднання відсутнє",
     "Disconnected (Inactive)": "Від'єднаний (неактивний)",
     "Disconnected (Unused)": "Від'єднано (не використовується)",
@@ -119,8 +126,8 @@
     "Documentation": "Документація",
     "Download Rate": "Швидкість завантаження",
     "Downloaded": "Завантажено",
-    "Downloading": "Завантаження",
-    "Edit": "Редагувати",
+    "Downloading": "Завантажується",
+    "Edit": "Редагуй",
     "Edit Device": "Налаштування пристрою",
     "Edit Device Defaults": "Редагувати параметри пристрою за замовчуванням",
     "Edit Folder": "Налаштування папки",
@@ -141,6 +148,7 @@
     "Enter up to three octal digits.": "Введіть до трьох вісімкових цифр.",
     "Error": "Помилка",
     "Extended Attributes": "Розширені атрибути",
+    "Extended Attributes Filter": "Фільтр за розширеними атрибутами",
     "External": "Зовнішній",
     "External File Versioning": "Зовнішне керування версіями",
     "Failed Items": "Невдалі",
@@ -161,6 +169,7 @@
     "Folder ID": "ID папки",
     "Folder Label": "Назва папки",
     "Folder Path": "Шлях до папки",
+    "Folder Status": "Статус папки",
     "Folder Type": "Тип папки",
     "Folder type \"{%receiveEncrypted%}\" can only be set when adding a new folder.": "Тип папки \"{{receiveEncrypted}}\" можна встановити лише під час додавання нової папки.",
     "Folder type \"{%receiveEncrypted%}\" cannot be changed after adding the folder. You need to remove the folder, delete or decrypt the data on disk, and add the folder again.": "Тип папки \"{{receiveEncrypted}}\" не можна змінити після її додавання. Потрібно видалити її спочатку, далі видалити або розшифрувати дані на диску, а потім додати папку знову.",
@@ -182,6 +191,7 @@
     "Global Discovery Servers": "Сервери глобального виявлення",
     "Global State": "Глобальний статус",
     "Help": "Допомога",
+    "Hint: only deny-rules detected while the default is deny. Consider adding \"permit any\" as last rule.": "Підказка: додано лише забороняючі правила при тому, що \"заборонити\" дія за замовченням. Розважте додавання \"дозволити будь-яке\" як останнє правило.",
     "Home page": "Домашня сторінка",
     "However, your current settings indicate you might not want it enabled. We have disabled automatic crash reporting for you.": "Однак ваші поточні налаштування вказують, що ви, можливо, не хочете, щоб це було ввімкнено. Ми вимкнули автоматичне повідомлення про аварійне завершення роботи.",
     "Identification": "Ідентифікатор",
@@ -197,9 +207,11 @@
     "Included Software": "Включене ПЗ",
     "Incoming Rate Limit (KiB/s)": "Ліміт швидкості завантаження (КіБ/с)",
     "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Невірна конфігурація може пошкодити вміст вашої папки та зробити Syncthing недієздатним.",
+    "Incorrect user name or password.": "Невірний логін або пароль.",
     "Internally used paths:": "Шляхи, що використовуються внутрішньо:",
     "Introduced By": "Рекомендовано",
     "Introducer": "Рекомендувач",
+    "Introduction": "Введення",
     "Inversion of the given condition (i.e. do not exclude)": "Інверсія поточної умови (тобто не виключає)",
     "Keep Versions": "Зберігати версії",
     "LDAP": "LDAP",
@@ -225,11 +237,18 @@
     "Locally Changed Items": "Локально змінені об'єкти",
     "Log": "Журнал",
     "Log File": "Файл журналу",
+    "Log In": "Увійти",
+    "Log Out": "Вийти",
+    "Log in to see paths information.": "Увійдіть щоб отримати інформацію о шляхах.",
+    "Log in to see version information.": "Увійдіть щоб отримати інформацію про версії.",
     "Log tailing paused. Scroll to the bottom to continue.": "Промотування журналу призупинене. Прокрутіть нижче, щоби продовжити.",
+    "Login failed, see Syncthing logs for details.": "Вхід не завершено, перевірьте деталі у логах Syncthing.",
     "Logs": "Журнали",
     "Major Upgrade": "Мажорне оновлення",
     "Mass actions": "Масові операції",
     "Maximum Age": "Максимальний вік",
+    "Maximum single entry size": "Максимальний розмір одного запису",
+    "Maximum total size": "Максимальний загальний розмір",
     "Metadata Only": "Тільки метадані",
     "Minimum Free Disk Space": "Мінімальний вільний простір на диску",
     "Mod. Device": "Модифікований пристрій:",
@@ -241,14 +260,16 @@
     "Multi level wildcard (matches multiple directory levels)": "Багаторівнева маска (пошук збігів в усіх піддиректоріях) ",
     "Never": "Ніколи",
     "New Device": "Новий пристрій",
-    "New Folder": "Нова директорія",
+    "New Folder": "Нова папка",
     "Newest First": "Спершу новіші",
     "No": "Ні",
     "No File Versioning": "Версіювання вимкнено",
     "No files will be deleted as a result of this operation.": "В результаті цієї операції не було видалено жодного файлу.",
+    "No rules set": "Не вказано правила",
     "No upgrades": "Немає оновлень",
     "Not shared": "Не розповсюджується",
     "Notice": "Зауваження",
+    "Number of Connections": "Кількість З'єднань",
     "OK": "Гаразд",
     "Off": "Вимкнути",
     "Oldest First": "Спершу старіші",
@@ -260,6 +281,7 @@
     "Override": "Перевизначити",
     "Override Changes": "Розіслати мою версію",
     "Ownership": "Права власності",
+    "Password": "Пароль",
     "Path": "Шлях",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Шлях до папки на локальному комп’ютері. Буде створений, якщо не існує. Символ тильди (~) може бути використаний як ярлик для",
     "Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).": "Шлях, де повинні зберігатися версії (залиште порожнім для зберігання в .stversions усередині директорії)",
@@ -293,11 +315,11 @@
     "Reduced by ignore patterns": "Зменшено шаблонами ігнорування",
     "Relay LAN": "LAN реле",
     "Relay WAN": "WAN реле",
-    "Release Notes": "Примітки до випуску",
+    "Release Notes": "Перелік Змін",
     "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Реліз-кандидати містять найостанніші функції та виправлення. Вони схожі на традиційні щодвотижневі випуски Syncthing.",
     "Remote Devices": "Віддалені пристрої",
     "Remote GUI": "Віддалена панель керування",
-    "Remove": "Видалити",
+    "Remove": "Видали",
     "Remove Device": "Видалити пристрій",
     "Remove Folder": "Видалити папку",
     "Required identifier for the folder. Must be the same on all cluster devices.": "Обов'язковий унікальний ідентифікатор папки. Має бути однаковим на усіх пристроях кластеру.",
@@ -314,7 +336,8 @@
     "Reused": "Використано вдруге",
     "Revert": "Повернути",
     "Revert Local Changes": "Інвертувати локальні зміни",
-    "Save": "Зберегти",
+    "Save": "Збережи",
+    "Saving changes": "Збереження змін",
     "Scan Time Remaining": "Час до кінця сканування",
     "Scanning": "Сканування",
     "See external versioning help for supported templated command line parameters.": "Дивіться допомогу по зовнішньому версіюванню, щоб дізнатися підтримувані шаблони для параметрів командного рядка.",
@@ -363,6 +386,7 @@
     "Staggered File Versioning": "Поступове версіювання",
     "Start Browser": "Запустити браузер",
     "Statistics": "Статистика",
+    "Stay logged in": "Не виходити",
     "Stopped": "Зупинено",
     "Stores and syncs only encrypted data. Folders on all connected devices need to be set up with the same password or be of type \"{%receiveEncrypted%}\" too.": "Зберігає та синхронізує лише зашифровані дані. Папки на всіх під’єднаних пристроях мають бути налаштовані з однаковим паролем або ще мати тип \"{{receiveEncrypted}}\".",
     "Subject:": "Тема:",
@@ -381,6 +405,7 @@
     "Syncthing is listening on the following network addresses for connection attempts from other devices:": "Syncthing прослуховує такі мережеві адреси на предмет спроб підключення з інших пристроїв:",
     "Syncthing is not listening for connection attempts from other devices on any address.  Only outgoing connections from this device may work.": "Syncthing не прослуховує спроби підключення від інших пристроїв із жодних адрес. Можуть працювати лише вихідні з’єднання з цього пристрою.",
     "Syncthing is restarting.": "Syncthing перезавантажується.",
+    "Syncthing is saving changes.": "Syncthing записує зміни.",
     "Syncthing is upgrading.": "Syncthing оновлюється.",
     "Syncthing now supports automatically reporting crashes to the developers. This feature is enabled by default.": "Syncthing тепер підтримує автоматичне звітування розобникам про збої. Ця функція увімкнена за умовчанням.",
     "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Схоже на те, що Syncthing закритий, або виникла проблема із Інтернет-з’єднанням. Проводиться повторна спроба з’єднання…",
@@ -413,11 +438,13 @@
     "The interval, in seconds, for running cleanup in the versions directory. Zero to disable periodic cleaning.": "Інтервал в секундах, для запуску очищення в директорії версій. Нуль вимикає періодичну очистку.",
     "The maximum age must be a number and cannot be blank.": "Максимальний термін повинен бути числом та не може бути пустим.",
     "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Максимальний термін зберігання версії (у днях; впишіть 0, щоб зберігати версії без обмежень).",
+    "The number of connections must be a non-negative number.": "Кількість з'єднань має бути додатнім числом.",
     "The number of days must be a number and cannot be blank.": "Кількість днів має бути числом і не може бути порожнім.",
     "The number of days to keep files in the trash can. Zero means forever.": "Кількість днів зберігання файлів у кошику. Нуль означає назавжди.",
     "The number of old versions to keep, per file.": "Кількість старих версій, яку необхідно зберігати для кожного файлу.",
     "The number of versions must be a number and cannot be blank.": "Кількість версій повинна бути цифрою та не може бути порожньою.",
     "The path cannot be blank.": "Шлях не може бути порожнім.",
+    "The rate limit is applied to the accumulated traffic of all connections to this device.": "Обмеження швидкості накладається на сумарний трафік всіх під'єднань до цього пристрою.",
     "The rate limit must be a non-negative number (0: no limit)": "Швидкість має бути додатнім числом.",
     "The remote device has not accepted sharing this folder.": "Віддалений пристрій не прийняв спільний доступ до цієї папки.",
     "The remote device has paused this folder.": "Віддалений пристрій призупинив синхронізацію цієї папки.",
@@ -435,6 +462,7 @@
     "Time": "Час",
     "Time the item was last modified": "Час останньої зміни елемента:",
     "To connect with the Syncthing device named \"{%devicename%}\", add a new remote device on your end with this ID:": "Щоб підключитися до пристрою Syncthing з назвою \"{{devicename}}\", додайте новий віддалений пристрій із свого боку за цим ID:",
+    "To permit a rule, have the checkbox checked. To deny a rule, leave it unchecked.": "Аби застосувати правило, зазначте поле. Аби відмінити правило, залишить поле порожнім.",
     "Today": "Сьогодні",
     "Trash Can": "Смітник",
     "Trash Can File Versioning": "Версіювання файлів у кошику",
@@ -461,8 +489,11 @@
     "Usage reporting is always enabled for candidate releases.": "Звіти про користування завжди увімкнені для реліз-кандидатів.",
     "Use HTTPS for GUI": "Використовувати HTTPS для доступу до панелі керування",
     "Use notifications from the filesystem to detect changed items.": "Використовувати сповіщення від файлової системи для виявлення змінених об'єктів.",
+    "User": "Користувач",
     "User Home": "Домашня директорія користувача",
     "Username/Password has not been set for the GUI authentication. Please consider setting it up.": "Логін/пароль не встановлені для автентифікації в панелі керування. Будь ласка, налаштуйте їх.",
+    "Using a QUIC connection over LAN": "З використанням QUICK з'єднання у LAN",
+    "Using a QUIC connection over WAN": "З використанням QUICK з'єднання у WAN",
     "Using a direct TCP connection over LAN": "Використовується пряме TCP-з'єднання через локальну мережу",
     "Using a direct TCP connection over WAN": "Використовується пряме TCP-з'єднання через глобальну мережу",
     "Version": "Версія",
@@ -483,6 +514,7 @@
     "Watching for changes discovers most changes without periodic scanning.": "Моніторинг виявляє більшість змін без періодичного сканування.",
     "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 дозволяє зв’язувати папки разом на різних пристроях. Назви повинні точно збігатися між усіма пристроями, а регістр символів має значення.",
+    "When set to more than one on both devices, Syncthing will attempt to establish multiple concurrent connections. If the values differ, the highest will be used. Set to zero to let Syncthing decide.": "Коли вказано більше ніш одне на обох пристроях, Syncthing спробує встановити паралельні з'єднання. Якщо значення різняться, буде використано найбільше. Вкажіть 0 аби Syncthing обрав .",
     "Yes": "Так",
     "Yesterday": "Вчора",
     "You can also copy and paste the text into a new message manually.": "Ви також можете скопіювати та вставити текст у нове повідомлення вручну.",
@@ -498,6 +530,7 @@
     "Your email app should open to let you choose the recipient and send it from your own address.": "Ваш додаток електронної пошти має відкритися, щоб ви могли вибрати одержувача та надіслати його зі своєї власної адреси.",
     "days": "днів",
     "deleted": "видалено",
+    "deny": "заборонити",
     "directories": "директорії",
     "file": "файл",
     "files": "файли",
@@ -505,6 +538,7 @@
     "full documentation": "повна документація",
     "items": "елементи",
     "modified": "змінено",
+    "permit": "дозволь",
     "seconds": "секунд",
     "theme": {
         "name": {
@@ -514,6 +548,7 @@
             "light": "Світла"
         }
     },
+    "unknown device": "невідомий пристрій",
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} хоче поділитися папкою \"{{folder}}\".",
     "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} хоче поділитися папкою \"{{folderLabel}}\" ({{folder}}).",
     "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} може повторно порекомендувати цей пристрій."

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

@@ -1,62 +1,62 @@
 {
-    "A device with that ID is already added.": "您已添加过相同 ID 的设备。",
+    "A device with that ID is already added.": "已添加过相同 ID 的设备。",
     "A negative number of days doesn't make sense.": "天数不能为负。",
-    "A new major version may not be compatible with previous versions.": "新的大版本可能与之前的版本之间无法兼容。",
+    "A new major version may not be compatible with previous versions.": "新的主要版本可能与以前的版本不兼容。",
     "API Key": "API 密钥",
     "About": "关于",
     "Action": "操作",
     "Actions": "操作",
-    "Active filter rules": "活跃的过滤器规则",
+    "Active filter rules": "活动的筛选规则",
     "Add": "添加",
     "Add Device": "添加设备",
     "Add Folder": "添加文件夹",
     "Add Remote Device": "添加远程设备",
-    "Add devices from the introducer to our device list, for mutually shared folders.": "将这个设备上那些，跟本机有着共同文件夹的“远程设备”，都添加到本机的“远程设备”列表。",
-    "Add filter entry": "添加过滤器条目",
-    "Add ignore patterns": "增加忽略模式",
+    "Add devices from the introducer to our device list, for mutually shared folders.": "将中介中的设备添加到我们的设备列表中，用于相互共享的文件夹。",
+    "Add filter entry": "添加筛选器条目",
+    "Add ignore patterns": "添加忽略模式",
     "Add new folder?": "添加新文件夹？",
-    "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.": "另外，完整重新扫描的间隔将增大（乘以 60，例如默认值将变为 1 小时）。你也可以在选择“否”后手动配置每个文件夹的时间。",
+    "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.": "另外，完全重新扫描的间隔将增加（乘以 60，例如默认值将变为 1 小时）。您也可以在选择“否”后手动配置每个文件夹。",
     "Address": "地址",
-    "Addresses": "地址列表",
+    "Addresses": "地址",
     "Advanced": "高级",
     "Advanced Configuration": "高级配置",
     "All Data": "所有数据",
     "All Time": "所有时间",
     "All folders shared with this device must be protected by a password, such that all sent data is unreadable without the given password.": "与此设备共享的所有文件夹都必须有密码保护，这样所有发送的数据在没有密码的情况下是不可读的。",
-    "Allow Anonymous Usage Reporting?": "允许匿名使用报告?",
+    "Allow Anonymous Usage Reporting?": "允许发送匿名使用报告吗？",
     "Allowed Networks": "允许的网络",
     "Alphabetic": "字母顺序",
-    "Altered by ignoring deletes.": "被“忽略删除”修改。",
-    "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.": "外部命令接管了版本控制。该外部命令必须自行从共享文件夹中删除该文件。如果此应用程序的路径包含空格，应该用半角引号括起来。",
+    "Altered by ignoring deletes.": "通过忽略删除进行更改。",
+    "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.": "外部命令处理版本控制。必须从共享文件夹中移除文件。如果应用程序的路径包含空格，应用半角引号括起来。",
     "Anonymous Usage Reporting": "匿名使用报告",
-    "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?": "匿名使用报告格式已更改。是否要切换到新格式？",
     "Applied to LAN": "已应用到局域网",
     "Apply": "应用",
-    "Are you sure you want to override all remote changes?": "您确定要覆盖所有远程更改吗?",
-    "Are you sure you want to permanently delete all these files?": "确认要永久删除这些文件吗？",
-    "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}} 个文件吗？",
-    "Are you sure you want to revert all local changes?": "您确定要撤销所有本地更改吗?",
-    "Are you sure you want to upgrade?": "你确定要升级吗？",
+    "Are you sure you want to override all remote changes?": "是否确定要覆盖所有远程更改？",
+    "Are you sure you want to permanently delete all these files?": "是否确定要永久删除所有这些文件？",
+    "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}} 个文件？",
+    "Are you sure you want to revert all local changes?": "是否确定要还原所有本地更改？",
+    "Are you sure you want to upgrade?": "是否确定要升级？",
     "Authentication Required": "需要身份验证",
     "Authors": "作者",
     "Auto Accept": "自动接受",
     "Automatic Crash Reporting": "自动发送崩溃报告",
     "Automatic upgrade now offers the choice between stable releases and release candidates.": "自动升级现在提供了稳定版本和候选发布版的选项。",
     "Automatic upgrades": "自动升级",
-    "Automatic upgrades are always enabled for candidate releases.": "候选发布版会一直启用自动升级。",
-    "Automatically create or share folders that this device advertises at the default path.": "在本机默认文件夹中，自动地创建或共享这个设备共享出来的所有文件夹。",
+    "Automatic upgrades are always enabled for candidate releases.": "候选版本始终启用自动升级。",
+    "Automatically create or share folders that this device advertises at the default path.": "自动创建或共享此设备在默认路径上显示的文件夹。",
     "Available debug logging facilities:": "可用的调试日志功能：",
     "Be careful!": "小心！",
     "Body:": "正文：",
-    "Bugs": "问题回报",
+    "Bugs": "问题反馈",
     "Cancel": "取消",
     "Changelog": "更新日志",
     "Clean out after": "在该时间后清除",
-    "Cleaning Versions": "清除版本",
+    "Cleaning Versions": "清理版本中",
     "Cleanup Interval": "清除间隔",
-    "Click to see full identification string and QR code.": "点击查看完整的识别字符串和二维码。",
+    "Click to see full identification string and QR code.": "单击查看完整的标识字符串和二维码。",
     "Close": "关闭",
     "Command": "命令",
     "Comment, when used at the start of a line": "注释，在行首使用",
@@ -65,17 +65,17 @@
     "Configuration File": "配置文件",
     "Configured": "已配置",
     "Connected (Unused)": "已连接（未使用）",
-    "Connection Error": "连接出错",
+    "Connection Error": "连接错误",
     "Connection Management": "连接管理",
     "Connection Type": "连接类型",
     "Connections": "连接",
-    "Connections via relays might be rate limited by the relay": "经由中继的连接可能会被中继限制速率",
-    "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.": "Syncthing 现在可以持续监视更改了。这将检测磁盘上的更改，然后对有修改的路径发起扫描。这样的好处是更改可以更快地传播，且需要的完整扫描会更少。",
-    "Copied from elsewhere": "从其它设备复制",
+    "Connections via relays might be rate limited by the relay": "通过中继的连接可能受中继的速率限制",
+    "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.": "现在，Syncthing 中提供了持续监视更改的功能。这将检测磁盘上的更改，并仅对修改后的路径进行扫描。好处是更改传播得更快，所需的完全扫描更少。",
+    "Copied from elsewhere": "从其他设备复制",
     "Copied from original": "从源复制",
     "Copied!": "已复制！",
     "Copy": "复制",
-    "Copy failed! Try to select and copy manually.": "复制失败！尝试手动选择并复制。",
+    "Copy failed! Try to select and copy manually.": "复制失败！尝试手动选择和复制。",
     "Currently Shared With Devices": "当前设备已共享",
     "Custom Range": "自定义范围",
     "Danger!": "危险！",
@@ -86,48 +86,48 @@
     "Default Device": "默认设备",
     "Default Folder": "默认文件夹",
     "Default Ignore Patterns": "默认忽略模式",
-    "Defaults": "默认值",
+    "Defaults": "默认",
     "Delete": "删除",
-    "Delete Unexpected Items": "删除特殊项目",
-    "Deleted {%file%}": "{{file}} 已删除",
+    "Delete Unexpected Items": "删除意外项目",
+    "Deleted {%file%}": "删除了 {{file}}",
     "Deselect All": "取消全选",
-    "Deselect devices to stop sharing this folder with.": "取消选择设备以停止共享此文件夹。",
+    "Deselect devices to stop sharing this folder with.": "取消选择要停止与之共享此文件夹的设备。",
     "Deselect folders to stop sharing with this device.": "取消选择文件夹以停止与此设备共享。",
     "Device": "设备",
-    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "设备 \"{{name}}\"（位于 {{address}} 的 {{device}}）请求连接。是否添加新设备？",
+    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "设备“{{name}}”（{{address}} 处的 {{device}}）想要连接。添加新设备？",
     "Device Certificate": "设备证书",
     "Device ID": "设备 ID",
     "Device Identification": "设备标识",
     "Device Name": "设备名",
     "Device Status": "设备状态",
-    "Device is untrusted, enter encryption password": "设备不可信，请输入加密密码",
+    "Device is untrusted, enter encryption password": "设备不受信任，请输入加密密码",
     "Device rate limits": "设备速率限制",
-    "Device that last modified the item": "最近修改该项的设备",
+    "Device that last modified the item": "最近修改项目的设备",
     "Devices": "设备",
-    "Disable Crash Reporting": "禁用自动发送崩溃报告",
+    "Disable Crash Reporting": "禁用崩溃报告",
     "Disabled": "已禁用",
     "Disabled periodic scanning and disabled watching for changes": "已禁用定期扫描和更改监视",
     "Disabled periodic scanning and enabled watching for changes": "已禁用定期扫描并启用更改监视",
-    "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "已禁用定期扫描但设置更改监视失败，正在以每 1m 一次重试：",
-    "Disables comparing and syncing file permissions. Useful on systems with nonexistent or custom permissions (e.g. FAT, exFAT, Synology, Android).": "禁用比较和同步文件权限。 适用于不存在或自定义权限的系统（例如FAT，exFAT，Synology，Android）。",
-    "Discard": "丢弃",
-    "Disconnected": "连接已断开",
-    "Disconnected (Inactive)": "断开连接（不活跃）",
-    "Disconnected (Unused)": "断开连接（未使用）",
+    "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "已禁用定期扫描但设置更改监视失败，每分钟重试一次：",
+    "Disables comparing and syncing file permissions. Useful on systems with nonexistent or custom permissions (e.g. FAT, exFAT, Synology, Android).": "禁用比较和同步文件权限。 适用于不存在或自定义权限的系统（例如 FAT、exFAT、Synology、Android）。",
+    "Discard": "已丢弃",
+    "Disconnected": "已断开连接",
+    "Disconnected (Inactive)": "已断开连接（不活跃）",
+    "Disconnected (Unused)": "已断开连接（未使用）",
     "Discovered": "已发现",
     "Discovery": "设备发现",
-    "Discovery Failures": "设备发现错误",
+    "Discovery Failures": "设备发现失败",
     "Discovery Status": "设备发现状态",
-    "Dismiss": "忽略一次",
-    "Do not add it to the ignore list, so this notification may recur.": "不要将其加入忽视列表，因此这条通知可能会再度出现。",
+    "Dismiss": "忽略",
+    "Do not add it to the ignore list, so this notification may recur.": "不要将其添加到忽略列表中，因此此通知可能会再次出现。",
     "Do not restore": "不要恢复",
     "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": "文档",
-    "Download Rate": "下载速度",
+    "Download Rate": "下载速率",
     "Downloaded": "已下载",
     "Downloading": "下载中",
-    "Edit": "选项",
+    "Edit": "编辑",
     "Edit Device": "编辑设备",
     "Edit Device Defaults": "编辑设备默认值",
     "Edit Folder": "编辑文件夹",
@@ -137,31 +137,31 @@
     "Enable NAT traversal": "启用 NAT 穿透",
     "Enable Relaying": "启用中继",
     "Enabled": "已启用",
-    "Enables sending extended attributes to other devices, and applying incoming extended attributes. May require running with elevated privileges.": "启用发送扩展属性至其他设备，并应用传入的扩展属性。可能需要管理员权限。",
-    "Enables sending extended attributes to other devices, but not applying incoming extended attributes. This can have a significant performance impact. Always enabled when \"Sync Extended Attributes\" is enabled.": "启用发送扩展属性至其他设备，但不应用传入的扩展属性。这可能造成性能上的影响。“同步扩展属性”启用时此选项总是启用。",
-    "Enables sending ownership information to other devices, and applying incoming ownership information. Typically requires running with elevated privileges.": "启用发送所有权信息至其他设备，并应用传入的所有权信息。通常情况下需要管理员权限。",
-    "Enables sending ownership information to other devices, but not applying incoming ownership information. This can have a significant performance impact. Always enabled when \"Sync Ownership\" is enabled.": "启用发送所有权信息至其他设备，但不应用传入的所有权信息。此选项可能造成显著的性能影响。“同步所有权”启用时此选项总是启用。",
-    "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "输入一个非负数（例如“2.35”）并选择单位。%表示占磁盘总容量的百分比。",
-    "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”以自动发现设备地址。",
+    "Enables sending extended attributes to other devices, and applying incoming extended attributes. May require running with elevated privileges.": "启用发送扩展属性至其他设备，并应用传入的扩展属性。可能需要以更高的权限运行。",
+    "Enables sending extended attributes to other devices, but not applying incoming extended attributes. This can have a significant performance impact. Always enabled when \"Sync Extended Attributes\" is enabled.": "启用发送扩展属性至其他设备，但不应用传入的扩展属性。这可能会对性能产生重大影响。启用“同步扩展属性”时始终启用。",
+    "Enables sending ownership information to other devices, and applying incoming ownership information. Typically requires running with elevated privileges.": "启用发送所有权信息至其他设备，并应用传入的所有权信息。通常需要以更高的权限运行。",
+    "Enables sending ownership information to other devices, but not applying incoming ownership information. This can have a significant performance impact. Always enabled when \"Sync Ownership\" is enabled.": "启用发送所有权信息至其他设备，但不应用传入的所有权信息。这可能会对性能产生重大影响。启用“同步所有权”时始终启用。",
+    "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "输入一个非负数（例如“2.35”）并选择单位。% 表示占磁盘总容量的百分比。",
+    "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”以自动发现设备地址。",
     "Enter ignore patterns, one per line.": "请输入忽略模式，每行一条。",
-    "Enter up to three octal digits.": "输入最多三个8进制数字。",
+    "Enter up to three octal digits.": "输入最多三个八进制数字。",
     "Error": "错误",
     "Extended Attributes": "扩展属性",
-    "Extended Attributes Filter": "扩展的属性过滤器",
+    "Extended Attributes Filter": "扩展属性筛选器",
     "External": "外部",
-    "External File Versioning": "外部版本控制",
+    "External File Versioning": "外部文件版本控制",
     "Failed Items": "失败的项目",
     "Failed to load file versions.": "加载文件版本失败。",
     "Failed to load ignore patterns.": "加载忽略模式失败。",
     "Failed to setup, retrying": "设置失败，正在重试",
-    "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "如果本机没有配置IPv6，则无法连接IPv6服务器是正常的。",
+    "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "如果本机没有配置 IPv6，则无法连接 IPv6 服务器是正常的。",
     "File Pull Order": "文件拉取顺序",
-    "File Versioning": "版本控制",
-    "Files are moved to .stversions directory when replaced or deleted by Syncthing.": "当文件被 Syncthing 替换或删除时，将被移动到 .stversions 目录。",
-    "Files are moved to date stamped versions in a .stversions directory 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.": "在其它设备中对该文件夹内文件的修改并不会被同步到本机，但是在本机上对其的修改，则会被同步到集群中的其它设备。",
-    "Files are synchronized from the cluster, but any changes made locally will not be sent to other devices.": "文件将从集群同步，但本地所作的任何更改都不会被发送到其他设备。",
+    "File Versioning": "文件版本控制",
+    "Files are moved to .stversions directory when replaced or deleted by Syncthing.": "当 Syncthing 替换或删除文件时，文件将移动到 .stversions 目录。",
+    "Files are moved to date stamped versions in a .stversions directory 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.": "文件受到保护，不会在其他设备上进行更改，但在此设备上所做的更改将发送到集群的其他设备。",
+    "Files are synchronized from the cluster, but any changes made locally will not be sent to other devices.": "文件从集群同步，但本地所做的任何更改都不会发送到其他设备。",
     "Filesystem Watcher Errors": "文件系统监视器错误",
     "Filter by date": "按日期筛选",
     "Filter by name": "按名称筛选",
@@ -172,18 +172,18 @@
     "Folder Status": "文件夹状态",
     "Folder Type": "文件夹类型",
     "Folder type \"{%receiveEncrypted%}\" can only be set when adding a new folder.": "只能在添加新文件夹时设置文件夹类型“{{receiveEncrypted}}”。",
-    "Folder type \"{%receiveEncrypted%}\" cannot be changed after adding the folder. You need to remove the folder, delete or decrypt the data on disk, and add the folder again.": "添加文件夹后，无法更改文件夹类型“ {{receiveEncrypted}}”。您需要删除该文件夹，删除或解密磁盘上的数据，然后再次添加该文件夹。",
+    "Folder type \"{%receiveEncrypted%}\" cannot be changed after adding the folder. You need to remove the folder, delete or decrypt the data on disk, and add the folder again.": "添加文件夹后，无法更改文件夹类型“{{receiveEncrypted}}”。您需要移除文件夹，删除或解密磁盘上的数据，然后重新添加文件夹。",
     "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.": "开始监视下列文件夹时发生错误。由于每分钟都会重试，所以错误可能很快就消失。如果它们仍存在，请试着修复潜在问题，如不会则请求帮助。",
-    "Forever": "永久",
-    "Full Rescan Interval (s)": "完整扫描间隔（秒）",
-    "GUI": "图形用户界面",
-    "GUI / API HTTPS Certificate": "GUI / API HTTPS证书",
-    "GUI Authentication Password": "图形管理界面密码",
-    "GUI Authentication User": "图形管理界面用户名",
-    "GUI Authentication: Set User and Password": "GUI身份验证：设置用户和密码",
+    "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.": "对于以下文件夹，在开始监视更改时出错。它将每分钟重试一次，因此错误可能很快就会消失。如果它们持续存在，请尝试解决根本问题，如果不能，请寻求帮助。",
+    "Forever": "永远",
+    "Full Rescan Interval (s)": "完全重新扫描间隔（秒）",
+    "GUI": "GUI",
+    "GUI / API HTTPS Certificate": "GUI/API HTTPS 证书",
+    "GUI Authentication Password": "GUI 身份验证密码",
+    "GUI Authentication User": "GUI 身份验证用户",
+    "GUI Authentication: Set User and Password": "GUI 身份验证：设置用户和密码",
     "GUI Listen Address": "GUI 监听地址",
-    "GUI Override Directory": "GUI覆盖目录",
+    "GUI Override Directory": "GUI 覆盖目录",
     "GUI Theme": "GUI 主题",
     "General": "常规",
     "Generate": "生成",
@@ -193,31 +193,31 @@
     "Help": "帮助",
     "Hint: only deny-rules detected while the default is deny. Consider adding \"permit any\" as last rule.": "提示：默认拒绝时，仅检测拒绝规则。考虑添加“允许任何”为最后规则。",
     "Home page": "主页",
-    "However, your current settings indicate you might not want it enabled. We have disabled automatic crash reporting for you.": "我们已经为您关闭了自动崩溃报告发送功能，因为您当前的设置显示您可能并不想启用该功能。",
-    "Identification": "识别",
-    "If untrusted, enter encryption password": "如想更安全，请输入加密密码",
-    "If you want to prevent other users on this computer from accessing Syncthing and through it your files, consider setting up authentication.": "如果要阻止此计算机上的其他用户访问Syncthing并通过它访问文件，请考虑设置身份验证。",
+    "However, your current settings indicate you might not want it enabled. We have disabled automatic crash reporting for you.": "我们已经为您禁用了自动发送崩溃报告，因为您当前的设置表明您可能并不想启用该选项。",
+    "Identification": "标识",
+    "If untrusted, enter encryption password": "如果不受信任，请输入加密密码",
+    "If you want to prevent other users on this computer from accessing Syncthing and through it your files, consider setting up authentication.": "如果要阻止此计算机上的其他用户访问 Syncthing 并通过它访问文件，请考虑设置身份验证。",
     "Ignore": "忽略",
     "Ignore Patterns": "忽略模式",
-    "Ignore Permissions": "忽略文件权限",
-    "Ignore patterns can only be added after the folder is created. If checked, an input field to enter ignore patterns will be presented after saving.": "只有在文件夹创建后，才能对其增加忽略模式。勾选后，会在保存后提供一个设置忽略模式的输入框。",
-    "Ignored Devices": "已忽略的设备",
-    "Ignored Folders": "已忽略的文件夹",
+    "Ignore Permissions": "忽略权限",
+    "Ignore patterns can only be added after the folder is created. If checked, an input field to enter ignore patterns will be presented after saving.": "只有在创建文件夹后才能添加忽略模式。勾选后，在保存后将显示用于设置忽略模式的输入框。",
+    "Ignored Devices": "忽略的设备",
+    "Ignored Folders": "忽略的文件夹",
     "Ignored at": "已忽略于",
-    "Included Software": "包含软件",
-    "Incoming Rate Limit (KiB/s)": "下载速率限制 (KiB/s)",
-    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "错误的配置可能损坏您文件夹内的内容，使得 Syncthing 无法工作。",
+    "Included Software": "包含的软件",
+    "Incoming Rate Limit (KiB/s)": "传入速率限制（KiB/s）",
+    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "不正确的配置可能会损坏您的文件夹内容，并导致 Syncthing 无法运行。",
     "Incorrect user name or password.": "用户名或密码不正确。",
     "Internally used paths:": "内部使用的路径：",
     "Introduced By": "介绍自",
     "Introducer": "作为中介",
     "Introduction": "介绍",
-    "Inversion of the given condition (i.e. do not exclude)": "反转本条件（即：不排除）",
+    "Inversion of the given condition (i.e. do not exclude)": "给定条件的反转（即不排除）",
     "Keep Versions": "保留版本数量",
     "LDAP": "LDAP",
-    "Largest First": "大文件优先",
-    "Last 30 Days": "最近30天",
-    "Last 7 Days": "最近7天",
+    "Largest First": "最大优先",
+    "Last 30 Days": "最近 30 天",
+    "Last 7 Days": "最近 7 天",
     "Last Month": "上个月",
     "Last Scan": "最后扫描",
     "Last seen": "最后可见",
@@ -225,12 +225,12 @@
     "Learn more": "了解更多",
     "Learn more at {%url%}": "了解更多请访问 {{url}}",
     "Limit": "限制",
-    "Listener Failures": "侦听器失败",
-    "Listener Status": "侦听器状态",
-    "Listeners": "侦听程序",
+    "Listener Failures": "监听程序失败",
+    "Listener Status": "监听程序状态",
+    "Listeners": "监听程序",
     "Loading data...": "正在载入数据…",
     "Loading...": "正在载入…",
-    "Local Additions": "从本地添加",
+    "Local Additions": "本地添加",
     "Local Discovery": "本地发现",
     "Local State": "本地状态",
     "Local State (Total)": "本地状态汇总",
@@ -238,11 +238,11 @@
     "Log": "日志",
     "Log File": "日志文件",
     "Log In": "登录",
-    "Log Out": "注销",
+    "Log Out": "登出",
     "Log in to see paths information.": "登录查看路径信息。",
-    "Log in to see version information.": "登陆查看版本信息。",
-    "Log tailing paused. Scroll to the bottom to continue.": "已暂停日志跟踪。滚动到底部以继续。",
-    "Login failed, see Syncthing logs for details.": "登录失败，详情见 Syncthing 日志。",
+    "Log in to see version information.": "登录查看版本信息。",
+    "Log tailing paused. Scroll to the bottom to continue.": "日志跟踪已暂停。滚动到底部继续。",
+    "Login failed, see Syncthing logs for details.": "登录失败，有关详细信息，请参阅 Syncthing 日志。",
     "Logs": "日志",
     "Major Upgrade": "重大更新",
     "Mass actions": "批量操作",
@@ -256,14 +256,14 @@
     "More than a month ago": "一个月前",
     "More than a week ago": "一周前",
     "More than a year ago": "一年前",
-    "Move to top of queue": "移动到队列顶端",
+    "Move to top of queue": "移至队列顶部",
     "Multi level wildcard (matches multiple directory levels)": "多级通配符（用以匹配多层文件夹）",
     "Never": "从未",
     "New Device": "新设备",
     "New Folder": "新文件夹",
-    "Newest First": "新文件优先",
+    "Newest First": "最新优先",
     "No": "否",
-    "No File Versioning": "不启用版本控制",
+    "No File Versioning": "不启用文件版本控制",
     "No files will be deleted as a result of this operation.": "此操作结果不会删除任何文件。",
     "No rules set": "未设置规则",
     "No upgrades": "无更新",
@@ -272,14 +272,14 @@
     "Number of Connections": "连接数",
     "OK": "确定",
     "Off": "关闭",
-    "Oldest First": "旧文件优先",
-    "Optional descriptive label for the folder. Can be different on each device.": "可选的文件夹说明性标签。在不同设备上可以不一致。",
+    "Oldest First": "最旧优先",
+    "Optional descriptive label for the folder. Can be different on each device.": "文件夹的可选描述性标签。每个设备上可能不同。",
     "Options": "选项",
-    "Out of Sync": "失去同步",
+    "Out of Sync": "未同步",
     "Out of Sync Items": "未同步的项目",
-    "Outgoing Rate Limit (KiB/s)": "上传速度限制 (KiB/s)",
+    "Outgoing Rate Limit (KiB/s)": "传出速率限制（KiB/s）",
     "Override": "覆盖",
-    "Override Changes": "撤销改变",
+    "Override Changes": "覆盖更改",
     "Ownership": "所有权",
     "Password": "密码",
     "Path": "路径",
@@ -287,247 +287,247 @@
     "Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).": "历史版本储存路径（留空则会默认存储在共享文件夹中的 .stversions 目录）。",
     "Paths": "路径",
     "Pause": "暂停",
-    "Pause All": "全部暂停",
+    "Pause All": "暂停全部",
     "Paused": "已暂停",
     "Paused (Unused)": "已暂停（未使用）",
-    "Pending 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 failed setting up watching for changes, retrying every 1m:": "正以给定的间隔定期扫描但设置更改监视失败，正在以每分钟一次重试：",
-    "Permanently add it to the ignore list, suppressing further notifications.": "将其永久添加到忽略列表中，禁止进一步通知。",
+    "Pending 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 failed setting up watching for changes, retrying every 1m:": "正在以给定间隔进行定期扫描，但设置更改监视失败，正在每分钟重试一次：",
+    "Permanently add it to the ignore list, suppressing further notifications.": "将其永久添加到忽略列表中，以抑制进一步的通知。",
     "Please consult the release notes before performing a major upgrade.": "请在进行重大更新前查看发布说明。",
-    "Please set a GUI Authentication User and Password in the Settings dialog.": "请在设置对话框中设置 GUI 验证用户及其密码。",
+    "Please set a GUI Authentication User and Password in the Settings dialog.": "请在设置对话框中设置 GUI 身份验证用户和密码。",
     "Please wait": "请稍候",
     "Prefix indicating that the file can be deleted if preventing directory removal": "此前缀表示，如果文件阻止删除目录则文件可被删除",
     "Prefix indicating that the pattern should be matched without case sensitivity": "此前缀表示，后面的模式在匹配时不区分大小写",
-    "Preparing to Sync": "准备同步",
+    "Preparing to Sync": "正在准备同步",
     "Preview": "预览",
     "Preview Usage Report": "预览使用报告",
     "QR code": "二维码",
     "QUIC LAN": "QUIC 局域网",
     "QUIC WAN": "QUIC 广域网",
-    "Quick guide to supported patterns": "支持的通配符的简单教程",
-    "Random": "随机顺序",
+    "Quick guide to supported patterns": "支持模式的快速指南",
+    "Random": "随机",
     "Receive Encrypted": "加密接收",
     "Receive Only": "仅接收",
-    "Received data is already encrypted": "已加密接收到的数据",
+    "Received data is already encrypted": "接收到的数据已加密",
     "Recent Changes": "最近更改",
-    "Reduced by ignore patterns": "已由忽略模式缩减",
+    "Reduced by ignore patterns": "通过忽略模式减少",
     "Relay LAN": "中继局域网",
     "Relay WAN": "中继广域网",
     "Release Notes": "发布说明",
-    "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "发布候选版包含最新的特性和修复。它们跟传统的 Syncthing 双周发布版类似。",
+    "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "候选版本包含最新功能和修复程序。它们类似于传统的每两周一次的 Syncthing 发布。",
     "Remote Devices": "远程设备",
-    "Remote GUI": "远程GUI",
+    "Remote GUI": "远程 GUI",
     "Remove": "移除",
     "Remove Device": "移除设备",
     "Remove Folder": "移除文件夹",
-    "Required identifier for the folder. Must be the same on all cluster devices.": "必需的文件夹唯一标识。同一个文件夹在集群中的所有设备上ID必须相同。",
+    "Required identifier for the folder. Must be the same on all cluster devices.": "文件夹所需的标识符。所有集群设备上必须相同。",
     "Rescan": "重新扫描",
     "Rescan All": "全部重新扫描",
     "Rescans": "重新扫描",
-    "Restart": "重启 Syncthing",
-    "Restart Needed": "需要重启 Syncthing",
-    "Restarting": "重启中",
+    "Restart": "重启",
+    "Restart Needed": "需要重启",
+    "Restarting": "正在重启",
     "Restore": "恢复",
     "Restore Versions": "恢复历史版本",
     "Resume": "恢复",
     "Resume All": "全部恢复",
     "Reused": "复用",
     "Revert": "还原",
-    "Revert Local Changes": "恢复本地更改",
+    "Revert Local Changes": "还原本地更改",
     "Save": "保存",
     "Saving changes": "保存更改中",
-    "Scan Time Remaining": "扫描剩余时间",
+    "Scan Time Remaining": "剩余扫描时间",
     "Scanning": "扫描中",
     "See external versioning help for supported templated command line parameters.": "有关受支持的模板命令行参数，请参阅外部版本控制帮助。",
     "Select All": "全选",
     "Select a version": "选择版本",
-    "Select additional devices to share this folder with.": "选择其他共享此文件夹的设备。",
-    "Select additional folders to share with this device.": "选择要与此设备共享的其它文件夹。",
+    "Select additional devices to share this folder with.": "选择要与之共享此文件夹的其他设备。",
+    "Select additional folders to share with this device.": "选择要与此设备共享的其他文件夹。",
     "Select latest version": "选择最新的版本",
     "Select oldest version": "选择最旧的版本",
-    "Send & Receive": "发送与接收",
+    "Send & Receive": "发送和接收",
     "Send Extended Attributes": "发送扩展属性",
     "Send Only": "仅发送",
     "Send Ownership": "发送所有权",
-    "Set Ignores on Added Folder": "在增加的文件夹中设置忽略项",
+    "Set Ignores on Added Folder": "在添加的文件夹中设置忽略",
     "Settings": "设置",
     "Share": "共享",
     "Share Folder": "共享文件夹",
     "Share by Email": "通过电子邮件分享",
     "Share by SMS": "通过短信分享",
-    "Share this folder?": "是否共享该文件夹？",
+    "Share this folder?": "共享此文件夹？",
     "Shared Folders": "共享文件夹",
     "Shared With": "共享给",
     "Sharing": "共享",
     "Show ID": "显示 ID",
-    "Show QR": "显示 QR 码",
+    "Show QR": "显示二维码",
     "Show detailed discovery status": "显示详细的发现状态",
-    "Show detailed listener status": "显示详细的侦听器状态",
-    "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.": "在集群状态中显示该名称，而不是设备 ID。将会作为当前设备的可选的默认名称，报告给所有其他设备。",
-    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "在集群状态中显示该名称，而不是设备 ID。如果设置为空，则会使用目标设备自报的默认名称。",
-    "Shutdown": "关闭 Syncthing",
+    "Show detailed listener status": "显示详细的监听程序状态",
+    "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.": "在集群状态中显示该名称，而不是设备 ID。将作为可选的默认名称向其他设备通告。",
+    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "在集群状态中显示该名称，而不是设备 ID。如果留空，将更新为设备通告的名称。",
+    "Shutdown": "关闭",
     "Shutdown Complete": "关闭完成",
     "Simple": "简单",
-    "Simple File Versioning": "简易版本控制",
+    "Simple File Versioning": "简单文件版本控制",
     "Single level wildcard (matches within a directory only)": "单级通配符（仅匹配单层文件夹）",
     "Size": "大小",
-    "Smallest First": "小文件优先",
-    "Some discovery methods could not be established for finding other devices or announcing this device:": "有些探索方法无法用于发现其它设备或广播该设备:",
-    "Some items could not be restored:": "有些项目无法被恢复：",
-    "Some listening addresses could not be enabled to accept connections:": "某些监听地址无法接受连接:",
+    "Smallest First": "最小优先",
+    "Some discovery methods could not be established for finding other devices or announcing this device:": "无法建立某些发现方法来查找其他设备或宣布此设备：",
+    "Some items could not be restored:": "某些项目无法恢复：",
+    "Some listening addresses could not be enabled to accept connections:": "无法启用某些监听地址以接受连接：",
     "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.": "稳定版本约延迟两个星期。这段时间它们将作为发布候选版来测试。",
+    "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "稳定版本推迟了大约两周。在此期间，它们作为发布候选版进行测试。",
     "Stable releases only": "仅稳定版本",
-    "Staggered": "交错",
-    "Staggered File Versioning": "阶段版本控制",
+    "Staggered": "阶段",
+    "Staggered File Versioning": "阶段文件版本控制",
     "Start Browser": "启动浏览器",
     "Statistics": "统计",
     "Stay logged in": "保持登录",
     "Stopped": "已停止",
-    "Stores and syncs only encrypted data. Folders on all connected devices need to be set up with the same password or be of type \"{%receiveEncrypted%}\" too.": "仅存储和同步加密的数据。所有连接的设备上的文件夹也需要使用相同的密码设置，或者也必须设置为“ {{receiveEncrypted}}”类型。",
+    "Stores and syncs only encrypted data. Folders on all connected devices need to be set up with the same password or be of type \"{%receiveEncrypted%}\" too.": "仅存储和同步加密数据。所有连接设备上的文件夹都需要使用相同的密码设置，或者也需要设置为“{{receiveEncrypted}}”类型。",
     "Subject:": "主题：",
     "Support": "支持",
     "Support Bundle": "支持捆绑包",
     "Sync Extended Attributes": "同步扩展属性",
     "Sync Ownership": "同步所有权",
-    "Sync Protocol Listen Addresses": "协议监听地址",
+    "Sync Protocol Listen Addresses": "同步协议监听地址",
     "Sync Status": "同步状态",
     "Syncing": "同步中",
-    "Syncthing device ID for \"{%devicename%}\"": "\"{{devicename}}\" 的 Syncthing 设备 ID",
+    "Syncthing device ID for \"{%devicename%}\"": "“{{devicename}}”的 Syncthing 设备 ID",
     "Syncthing has been shut down.": "Syncthing 已关闭。",
     "Syncthing includes the following software or portions thereof:": "Syncthing 使用了下列软件或其中的一部分：",
-    "Syncthing is Free and Open Source Software licensed as MPL v2.0.": "Syncthing 是个以 MPL v2.0 授权的免费开源软件。",
-    "Syncthing is a continuous file synchronization program. It synchronizes files between two or more computers in real time, safely protected from prying eyes. Your data is your data alone and you deserve to choose where it is stored, whether it is shared with some third party, and how it's transmitted over the internet.": "Syncthing 是一个持续的文件同步程序。它在两台或更多的计算机之间实时同步文件，安全地保护它们不被窥视。你的数据是私有的，你有权选择它被储存在哪里，是否与一些第三方共享，以及如何在互联网上传输它。",
-    "Syncthing is listening on the following network addresses for connection attempts from other devices:": "Syncthing正在监听以下网络地址，以获取来自其他设备的连接尝试:",
-    "Syncthing is not listening for connection attempts from other devices on any address.  Only outgoing connections from this device may work.": "Syncthing 不会在任何地址上侦听来自其他设备的连接尝试。只有来自该设备的传出连接可能有效。",
+    "Syncthing is Free and Open Source Software licensed as MPL v2.0.": "Syncthing 是自由开源软件，许可证为 MPL v2.0。",
+    "Syncthing is a continuous file synchronization program. It synchronizes files between two or more computers in real time, safely protected from prying eyes. Your data is your data alone and you deserve to choose where it is stored, whether it is shared with some third party, and how it's transmitted over the internet.": "Syncthing 是连续的文件同步程序。它在两台或多台计算机之间实时同步文件，安全地保护它们防止窥视。您的数据是私有的，您有权选择其存储位置、是否与第三方共享以及如何通过互联网传输。",
+    "Syncthing is listening on the following network addresses for connection attempts from other devices:": "Syncthing 正在以下网络地址监听来自其他设备的连接尝试：",
+    "Syncthing is not listening for connection attempts from other devices on any address.  Only outgoing connections from this device may work.": "Syncthing 不监听任何地址上其他设备的连接尝试。只有来自此设备的传出连接才能工作。",
     "Syncthing is restarting.": "Syncthing 正在重启。",
     "Syncthing is saving changes.": "Syncthing 正保存更改。",
     "Syncthing is upgrading.": "Syncthing 正在升级。",
-    "Syncthing now supports automatically reporting crashes to the developers. This feature is enabled by default.": "Syncthing 现在已经支持将崩溃报告自动发送给开发者。该功能默认开启。",
-    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing 似乎关闭了，或者您的网络连接存在故障。重试中…",
-    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing 在处理您的请求时似乎遇到了问题。如果问题持续，请刷新页面，或重启 Syncthing。",
-    "TCP LAN": "局域网TCP",
-    "TCP WAN": "广域网TCP",
-    "Take me back": "带我回去",
+    "Syncthing now supports automatically reporting crashes to the developers. This feature is enabled by default.": "Syncthing 现在支持自动向开发人员发送崩溃报告。默认情况下启用此功能。",
+    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing 似乎已关闭，或者您的互联网连接有问题。正在重试…",
+    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing 在处理您的请求时似乎遇到问题。如果问题仍然存在，请刷新页面或重启 Syncthing。",
+    "TCP LAN": "TCP 局域网",
+    "TCP WAN": "TCP 广域网",
+    "Take me back": "返回",
     "The GUI address is overridden by startup options. Changes here will not take effect while the override is in place.": "GUI 地址已被启动选项覆盖。当覆盖存在时，此处的更改就不会生效。",
-    "The Syncthing Authors": "Syncthing的作者",
-    "The Syncthing admin interface is configured to allow remote access without a password.": "当前配置允许在不使用密码的情况下远程访问 Syncthing 管理界面。",
-    "The aggregated statistics are publicly available at the URL below.": "全局统计数据公布于以下 URL。",
-    "The cleanup interval cannot be blank.": "清理间隔不能为空。",
-    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "设置已经保存，但是还未生效。Syncthing 需要重启以启用新的设置。",
+    "The Syncthing Authors": "Syncthing 作者",
+    "The Syncthing admin interface is configured to allow remote access without a password.": "Syncthing 管理界面配置为允许无密码远程访问。",
+    "The aggregated statistics are publicly available at the URL below.": "汇总统计可在以下 URL 公开获取。",
+    "The cleanup interval cannot be blank.": "清除间隔不能为空。",
+    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "配置已保存但未激活。Syncthing 必须重启才能激活新配置。",
     "The device ID cannot be blank.": "设备 ID 不能为空。",
-    "The device ID to enter here can be found in the \"Actions > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "在这里所需要输入的设备 ID，可以在目标设备的“操作->显示 ID”中看到。空格和横线可选（将会被忽略）。",
-    "The encrypted usage report is sent daily. It is used to track common platforms, folder sizes, and app versions. If the reported data set is changed you will be prompted with this dialog again.": "经过加密的使用报告会每天发送。它用来跟踪统计使用本软件的平台，文件夹大小，以及本软件的版本。如果报告的内容有任何变化，本对话框会再次弹出提示您。",
-    "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.": "输入的设备 ID 似乎无效。设备 ID 包含字母和数字，长度为 52 或 56，空格和横线不计在内。",
+    "The device ID to enter here can be found in the \"Actions > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "在此处输入的设备 ID 可以在另一台设备的“操作 > 显示 ID”对话框中找到。空格和破折号是可选的（忽略）。",
+    "The encrypted usage report is sent daily. It is used to track common platforms, folder sizes, and app versions. If the reported data set is changed you will be prompted with this dialog again.": "加密的使用情况报告每天发送一次。它用于跟踪常见平台、文件夹大小和应用版本。如果报告的数据集发生更改，系统将再次弹出此对话框提示您。",
+    "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.": "输入的设备 ID 似乎无效。设备 ID 包含字母和数字，长度为 52 或 56，空格和破折号是可选的。",
     "The folder ID cannot be blank.": "文件夹 ID 不能为空。",
     "The folder ID must be unique.": "文件夹 ID 不得重复。",
-    "The folder content on other devices will be overwritten to become identical with this device. Files not present here will be deleted on other devices.": "其它设备上的文件夹内容将被覆盖，以与此设备相同。此处不存在的文件将在其他设备上删除。",
-    "The folder content on this device will be overwritten to become identical with other devices. Files newly added here will be deleted.": "该设备上的文件夹内容将被覆盖，使其与其他设备相同。在此处新添加的文件将被删除。",
+    "The folder content on other devices will be overwritten to become identical with this device. Files not present here will be deleted on other devices.": "其他设备上的文件夹内容将会覆盖，与此设备完全相同。此处不存在的文件将在其他设备上删除。",
+    "The folder content on this device will be overwritten to become identical with other devices. Files newly added here will be deleted.": "此设备上的文件夹内容将会覆盖，与其他设备相同。此处新添加的文件将会删除。",
     "The folder path cannot be blank.": "文件夹路径不能为空。",
-    "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "保留的历史版本会遵循以下条件：最近一小时内的历史版本，更新间隔小于三十秒的仅保留一份。最近一天内的历史版本，更新间隔小于一小时的仅保留一份。最近一个月内的历史版本，更新间隔小于一天的仅保留一份。距离现在超过一个月且小于最长保留时间的，更新间隔小于一周的仅保留一份。",
-    "The following items could not be synchronized.": "下列项目无法被同步。",
-    "The following items were changed locally.": "下列项目存在本地更改。",
-    "The following methods are used to discover other devices on the network and announce this device to be found by others:": "以下方法用于发现网络上的其他设备并通知其他人发现该设备：",
-    "The following text will automatically be inserted into a new message.": "以下文字将自动插入新消息中。",
-    "The following unexpected items were found.": "找到了以下特殊项。",
+    "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "使用以下间隔：最近一小时内的历史版本，更新间隔小于三十秒的仅保留一份。最近一天内的历史版本，更新间隔小于一小时的仅保留一份。最近一个月内的历史版本，更新间隔小于一天的仅保留一份。距离现在超过一个月且小于最长保留时间的，更新间隔小于一周的仅保留一份。",
+    "The following items could not be synchronized.": "以下项目无法同步。",
+    "The following items were changed locally.": "以下项目已在本地更改。",
+    "The following methods are used to discover other devices on the network and announce this device to be found by others:": "以下方法用于发现网络上的其他设备，并通知其他人发现此设备：",
+    "The following text will automatically be inserted into a new message.": "以下文本将自动插入到新消息中。",
+    "The following unexpected items were found.": "发现以下意外项目。",
     "The interval must be a positive number of seconds.": "间隔必须为正数秒。",
-    "The interval, in seconds, for running cleanup in the versions directory. Zero to disable periodic cleaning.": "在版本目录中运行清理的间隔（秒）。0表示禁用定期清除。",
+    "The interval, in seconds, for running cleanup in the versions directory. Zero to disable periodic cleaning.": "在版本目录中运行清理的间隔（秒）。0 表示禁用定期清理。",
     "The maximum age must be a number and cannot be blank.": "最长保留时间必须为数字，且不能为空。",
     "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "历史版本保留的最长天数，0 为永久保存。",
     "The number of connections must be a non-negative number.": "连接数必须是非负数。",
     "The number of days must be a number and cannot be blank.": "天数必须为数字，且不能为空。",
-    "The number of days to keep files in the trash can. Zero means forever.": "文件保存在回收站的天数。零表示永久。",
-    "The number of old versions to keep, per file.": "每个文件保留的版本数量上限。",
+    "The number of days to keep files in the trash can. Zero means forever.": "文件保存在回收站的天数。0 表示永久。",
+    "The number of old versions to keep, per file.": "每个文件要保留的旧版本数。",
     "The number of versions must be a number and cannot be blank.": "保留版本数量必须为数字，且不能为空。",
     "The path cannot be blank.": "路径不能为空。",
-    "The rate limit is applied to the accumulated traffic of all connections to this device.": "到这台设备所有连接的累计流量被实施了速率限制。",
-    "The rate limit must be a non-negative number (0: no limit)": "传输速度限制为非负整数（0 表示不限制）",
-    "The remote device has not accepted sharing this folder.": "远程设备尚未允许分享此文件夹。",
-    "The remote device has paused this folder.": "远程设备已停用此文件夹。",
-    "The rescan interval must be a non-negative number of seconds.": "扫描间隔单位为秒，且不能为负数。",
-    "There are no devices to share this folder with.": "没有共享此文件夹的设备。",
+    "The rate limit is applied to the accumulated traffic of all connections to this device.": "速率限制适用于到此设备的所有连接的累积流量。",
+    "The rate limit must be a non-negative number (0: no limit)": "速率限制必须是非负数（0：无限制）",
+    "The remote device has not accepted sharing this folder.": "远程设备尚未接受共享此文件夹。",
+    "The remote device has paused this folder.": "远程设备已暂停此文件夹。",
+    "The rescan interval must be a non-negative number of seconds.": "重新扫描间隔必须为非负数秒。",
+    "There are no devices to share this folder with.": "没有可与之共享此文件夹的设备。",
     "There are no file versions to restore.": "没有可供恢复的文件版本。",
-    "There are no folders to share with this device.": "没有文件夹与此设备共享。",
-    "They are retried automatically and will be synced when the error is resolved.": "系统将会自动重试，当错误被解决时，它们将会被同步。",
-    "This Device": "当前设备",
+    "There are no folders to share with this device.": "没有可与此设备共享的文件夹。",
+    "They are retried automatically and will be synced when the error is resolved.": "系统将会自动重试，并在错误解决后同步。",
+    "This Device": "此设备",
     "This Month": "本月",
     "This can easily give hackers access to read and change any files on your computer.": "这会让骇客能够轻而易举地访问及修改您的文件。",
-    "This device cannot automatically discover other devices or announce its own address to be found by others.  Only devices with statically configured addresses can connect.": "此设备无法自动发现其它设备或广播自己的地址被其他人发现。只有具有静态配置地址的设备才能连接。",
-    "This is a major version upgrade.": "这是一个重大版本更新。",
-    "This setting controls the free space required on the home (i.e., index database) disk.": "此设置控制主（例如索引数据库）磁盘上需要的可用空间。",
+    "This device cannot automatically discover other devices or announce its own address to be found by others.  Only devices with statically configured addresses can connect.": "此设备无法自动发现其他设备，也无法向其他人宣布自己的地址。只有具有静态配置地址的设备才能连接。",
+    "This is a major version upgrade.": "这是一次重大版本升级。",
+    "This setting controls the free space required on the home (i.e., index database) disk.": "此设置控制主磁盘（即索引数据库）上所需的可用空间。",
     "Time": "时间",
-    "Time the item was last modified": "该项最近修改的时间",
-    "To connect with the Syncthing device named \"{%devicename%}\", add a new remote device on your end with this ID:": "要与名为\"{{devicename}}\"的Syncthing设备连接，请在你的终端上用这个ID添加一个新的远程设备：",
-    "To permit a rule, have the checkbox checked. To deny a rule, leave it unchecked.": "要允许一条规则，请勾选复选框。要拒绝一条规则，不勾选即可。",
+    "Time the item was last modified": "最近修改项目的时间",
+    "To connect with the Syncthing device named \"{%devicename%}\", add a new remote device on your end with this ID:": "要连接名为“{{devicename}}”的 Syncthing 设备，请在您的终端添加具有此 ID 的新远程设备：",
+    "To permit a rule, have the checkbox checked. To deny a rule, leave it unchecked.": "要允许某条规则，请选中复选框。要拒绝某条规则，请将其保留为未选中状态。",
     "Today": "今天",
     "Trash Can": "回收站",
-    "Trash Can File Versioning": "回收站式版本控制",
+    "Trash Can File Versioning": "回收站文件版本控制",
     "Type": "类型",
-    "UNIX Permissions": "UNIX权限",
+    "UNIX Permissions": "UNIX 权限",
     "Unavailable": "无效",
     "Unavailable/Disabled by administrator or maintainer": "无效/禁用（由管理员或维护者）",
-    "Undecided (will prompt)": "待定（将提示）",
-    "Unexpected Items": "特殊项目",
-    "Unexpected items have been found in this folder.": "在此文件夹中发现了意外的项目。",
-    "Unignore": "解除忽略",
+    "Undecided (will prompt)": "未决定（将提示）",
+    "Unexpected Items": "意外项目",
+    "Unexpected items have been found in this folder.": "在此文件夹中发现了意外项目。",
+    "Unignore": "取消忽略",
     "Unknown": "未知",
     "Unshared": "非共享",
     "Unshared Devices": "非共享设备",
     "Unshared Folders": "非共享文件夹",
-    "Untrusted": "不可信的",
-    "Up to Date": "同步完成",
-    "Updated {%file%}": "{{file}} 已更新",
+    "Untrusted": "不受信任",
+    "Up to Date": "最新",
+    "Updated {%file%}": "已更新 {{file}}",
     "Upgrade": "更新",
     "Upgrade To {%version%}": "升级至版本 {{version}}",
     "Upgrading": "升级中",
-    "Upload Rate": "上传速度",
-    "Uptime": "已启动",
-    "Usage reporting is always enabled for candidate releases.": "发布候选版总是会启用使用报告。",
-    "Use HTTPS for GUI": "使用加密连接到图形管理页面",
-    "Use notifications from the filesystem to detect changed items.": "使用文件系统的通知来检测更改的项目。",
-    "User": "用户名",
+    "Upload Rate": "上传速率",
+    "Uptime": "启动时间",
+    "Usage reporting is always enabled for candidate releases.": "发布候选版始终启用使用报告。",
+    "Use HTTPS for GUI": "使用 HTTPS 连接到 GUI",
+    "Use notifications from the filesystem to detect changed items.": "使用来自文件系统的通知来检测更改的项目。",
+    "User": "用户",
     "User Home": "用户主目录",
-    "Username/Password has not been set for the GUI authentication. Please consider setting it up.": "尚未为GUI身份验证设置用户名/密码。 请考虑进行设置。",
-    "Using a QUIC connection over LAN": "正使用局域网 QUIC 连接",
-    "Using a QUIC connection over WAN": "正使用广域网 QUIC 连接",
-    "Using a direct TCP connection over LAN": "通过局域网使用直接TCP连接",
-    "Using a direct TCP connection over WAN": "通过广域网使用直接TCP连接",
+    "Username/Password has not been set for the GUI authentication. Please consider setting it up.": "尚未为 GUI 身份验证设置用户名/密码。请考虑设置。",
+    "Using a QUIC connection over LAN": "正在通过局域网使用 QUIC 连接",
+    "Using a QUIC connection over WAN": "正在通过广域网使用 QUIC 连接",
+    "Using a direct TCP connection over LAN": "正在通过局域网使用直接 TCP 连接",
+    "Using a direct TCP connection over WAN": "正在通过广域网使用直接 TCP 连接",
     "Version": "版本",
     "Versions": "历史版本",
     "Versions Path": "历史版本路径",
-    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "超过最长保留时间，或者不满足下列条件的历史版本，将会被删除。",
-    "Waiting to Clean": "等待清除",
-    "Waiting to Scan": "等待扫描",
-    "Waiting to Sync": "等待同步",
+    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "超过最长保留时间，或者不满足下列条件的历史版本，则会自动删除。",
+    "Waiting to Clean": "正在等待清理",
+    "Waiting to Scan": "正在等待扫描",
+    "Waiting to Sync": "正在等待同步",
     "Warning": "警告",
-    "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "警告，该路径是已有文件夹\"{{otherFolder}}\"的上级目录。",
-    "Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "警告，该路径是已有文件夹\"{{otherFolderLabel}}\" ({{otherFolder}})的上级目录。",
-    "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.": "警告：如果你在使用外部的监视器如 {{syncthingInotify}}，你应该确保它已经取消激活。",
+    "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "警告，此路径是现有文件夹“{{otherFolder}}”的上级目录。",
+    "Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "警告，此路径是现有文件夹“{{otherFolderLabel}}”（{{otherFolder}}）的上级目录。",
+    "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.": "警告：如果您使用的是 {{syncthingInotify}} 等外部监视程序，则应确保其已停用。",
     "Watch for Changes": "监视更改",
     "Watching for Changes": "正在监视更改",
-    "Watching for changes discovers most changes without periodic scanning.": "对更改的监视无需定期扫描就可以发现大多数更改。",
+    "Watching for changes discovers most changes without periodic scanning.": "监视更改无需定期扫描即可发现大多数更改。",
     "When adding a new device, keep in mind that this device must be added on the other side too.": "若您在本机添加新设备，记住您也必须在这个新设备上添加本机。",
-    "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "若你添加了新文件夹，记住文件夹 ID 是用以在不同设备间建立联系的。在不同设备间拥有相同 ID 的文件夹将会被同步。且文件夹 ID 区分大小写。",
+    "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 用于在不同设备之间建立联系。它们区分大小写，必须在所有设备之间完全匹配。",
     "When set to more than one on both devices, Syncthing will attempt to establish multiple concurrent connections. If the values differ, the highest will be used. Set to zero to let Syncthing decide.": "当两台设备上的连接数均被设为大于 1 时，Syncthing 会尝试建立多个并行连接。如果两台设备上的设置的连接数不同，则会使用最大的连接数。设为 0 表示让 Syncthing 自行决定。",
     "Yes": "是",
     "Yesterday": "昨天",
-    "You can also copy and paste the text into a new message manually.": "你也可以手动将文本复制并粘贴到新消息中。",
-    "You can also select one of these nearby devices:": "您也可以从这些附近的设备中选择：",
-    "You can change your choice at any time in the Settings dialog.": "您可以在任何时候在设置对话框中更改选择。",
-    "You can read more about the two release channels at the link below.": "您可以从以下链接读取更多关于两个发行渠道的信息。",
-    "You have no ignored devices.": "你没有已忽略的设备。",
-    "You have no ignored folders.": "你没有已忽略的文件夹。",
-    "You have unsaved changes. Do you really want to discard them?": "你有未保存的更改。你真的要丢弃它们吗？",
+    "You can also copy and paste the text into a new message manually.": "您还可以手动将文本复制并粘贴到新消息中。",
+    "You can also select one of these nearby devices:": "您还可以选择以下附近的设备之一：",
+    "You can change your choice at any time in the Settings dialog.": "您可以在设置对话框中随时更改您的选择。",
+    "You can read more about the two release channels at the link below.": "您可以在下面的链接中阅读有关这两个发布渠道的更多信息。",
+    "You have no ignored devices.": "您没有忽略的设备。",
+    "You have no ignored folders.": "您没有忽略的文件夹。",
+    "You have unsaved changes. Do you really want to discard them?": "您有未保存的更改。是否确定要丢弃它们？",
     "You must keep at least one version.": "您必须保留至少一个版本。",
-    "You should never add or change anything locally in a \"{%receiveEncrypted%}\" folder.": "您绝对不应在“ {{receiveEncrypted}}”文件夹中添加或更改任何本地内容。",
-    "Your SMS app should open to let you choose the recipient and send it from your own number.": "你的短信应用程序应该打开，让你选择收件人并从你自己的号码发送。",
-    "Your email app should open to let you choose the recipient and send it from your own address.": "你的电子邮件应用程序应该打开，让你选择收件人并从你自己的地址发送。",
+    "You should never add or change anything locally in a \"{%receiveEncrypted%}\" folder.": "您永远不应该在本地添加或更改“{{receiveEncrypted}}”文件夹中的任何内容。",
+    "Your SMS app should open to let you choose the recipient and send it from your own number.": "您的短信应用应该打开，让您选择接收者并从自己的号码发送。",
+    "Your email app should open to let you choose the recipient and send it from your own address.": "您的电子邮件应用应该打开，让您选择收件人并从自己的地址发送。",
     "days": "天",
     "deleted": "已删除",
     "deny": "拒绝",
@@ -549,7 +549,7 @@
         }
     },
     "unknown device": "未知设备",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} 想将 “{{folder}}” 文件夹共享给您。",
-    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} 想要共享 \"{{folderlabel}}\" ({{folder}}) 文件夹给您。",
-    "{%reintroducer%} might reintroduce this device.": "{{reintroducer}}可能会重新引入此设备。"
+    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} 想要共享文件夹“{{folder}}”。",
+    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} 想要共享文件夹“{{folderlabel}}”（{{folder}}）。",
+    "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} 可能会重新引入此设备。"
 }