Merge remote-tracking branch 'upstream/main' into coauthors

* upstream/main:
  lib/fs: Watching is unsupported on android/amd64 (fixes syncthing#8709) (syncthing#8710)
  lib/model: Only log at info level if setting change time fails (syncthing#8725)
  lib/model: Don't lower rescan interval from default on auto accepted enc folder (fixes syncthing#8572) (syncthing#8573)
  gui, man, authors: Update docs, translations, and contributors
  gui: Remove unmaintained language variant nl-BE (syncthing#8722)
  gui, script: Fix indentation in lang-en.json to match others (syncthing#8721)
  docker: Ensure entrypoint is executable (syncthing#8719)
  Go 1.19.4
  Update dependencies (syncthing#8717)
  gui, man, authors: Update docs, translations, and contributors

.github/workflows/build-syncthing.yaml

@@ -6,7 +6,7 @@ on:
 
 env:
   # The go version to use for builds.
-  GO_VERSION: "1.19.3"
+  GO_VERSION: "1.19.4"
 
   # Optimize compatibility on the slow archictures.
   GO386: softfloat

AUTHORS

@@ -139,6 +139,7 @@ Jack Croft <jccroft1@users.noreply.github.com>
 Jacob <jyundt@gmail.com>
 Jake Peterson (acogdev) <jake@acogdev.com>
 Jakob Borg (calmh) <jakob@nym.se> <jakob@kastelo.net>
+James O'Beirne <wild-github@au92.org>
 James Patterson (jpjp) <jamespatterson@operamail.com> <jpjp@users.noreply.github.com>
 janost <janost@tuta.io>
 Jaroslav Lichtblau <svetlemodry@users.noreply.github.com>

Dockerfile

@@ -26,4 +26,5 @@ HEALTHCHECK --interval=1m --timeout=10s \
   CMD curl -fkLsS -m 2 127.0.0.1:8384/rest/noauth/health | grep -o --color=never OK || exit 1
 
 ENV STGUIADDRESS=0.0.0.0:8384
+RUN chmod 755 /bin/entrypoint.sh
 ENTRYPOINT ["/bin/entrypoint.sh", "/bin/syncthing", "-home", "/var/syncthing/config"]

go.mod

@@ -27,9 +27,9 @@ require (
 	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/klauspost/cpuid/v2 v2.2.1 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.2 // indirect
 	github.com/lib/pq v1.10.7
-	github.com/lucas-clemente/quic-go v0.31.0
+	github.com/lucas-clemente/quic-go v0.31.1
 	github.com/maruel/panicparse/v2 v2.3.1
 	github.com/maxbrunsfeld/counterfeiter/v6 v6.5.0
 	github.com/minio/sha256-simd v1.0.0
@@ -38,7 +38,7 @@ require (
 	github.com/pierrec/lz4/v4 v4.1.17
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_golang v1.14.0
-	github.com/prometheus/common v0.37.0 // indirect
+	github.com/prometheus/common v0.38.0 // indirect
 	github.com/prometheus/procfs v0.8.0 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475
 	github.com/sasha-s/go-deadlock v0.3.1
@@ -48,13 +48,13 @@ require (
 	github.com/thejerf/suture/v4 v4.0.2
 	github.com/urfave/cli v1.22.10
 	github.com/vitrun/qart v0.0.0-20160531060029-bf64b92db6b0
-	golang.org/x/crypto v0.3.0
+	golang.org/x/crypto v0.4.0
 	golang.org/x/mod v0.7.0 // indirect
-	golang.org/x/net v0.3.0
+	golang.org/x/net v0.4.0
 	golang.org/x/sys v0.3.0
 	golang.org/x/text v0.5.0
 	golang.org/x/time v0.3.0
-	golang.org/x/tools v0.3.0
+	golang.org/x/tools v0.4.0
 	google.golang.org/protobuf v1.28.1
 )
 
@@ -69,14 +69,14 @@ require (
 	github.com/marten-seemann/qtls-go1-18 v0.1.3 // indirect
 	github.com/marten-seemann/qtls-go1-19 v0.1.1 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
-	github.com/onsi/ginkgo/v2 v2.5.1 // indirect
+	github.com/onsi/ginkgo/v2 v2.6.0 // indirect
 	github.com/oschwald/maxminddb-golang v1.10.0 // indirect
 	github.com/petermattis/goid v0.0.0-20221202122410-a449aaf35945 // indirect
 	github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
 	github.com/prometheus/client_model v0.3.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
-	golang.org/x/exp v0.0.0-20221205204356-47842c84f3db // indirect
+	golang.org/x/exp v0.0.0-20221211140036-ad323defaf05 // indirect
 )
 
 // https://github.com/gobwas/glob/pull/55

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

@@ -282,7 +282,8 @@
     "Preview": "Преглед",
     "Preview Usage Report": "Преглед на отчет за употреба",
     "QR code": "Код за QR",
-    "QUIC": "QUIC",
+    "QUIC LAN": "QUIC LAN",
+    "QUIC WAN": "QUIC WAN",
     "QUIC connections are in most cases considered suboptimal": "В повечето случаи връзките през протокола QUIC се считат за неоптимални",
     "Quick guide to supported patterns": "Кратък наръчник на поддържаните шаблони",
     "Random": "Произволен",
@@ -291,7 +292,8 @@
     "Received data is already encrypted": "Получените данни вече са шифровани",
     "Recent Changes": "Последни промени",
     "Reduced by ignore patterns": "Наложени са шаблони за пренебрегване",
-    "Relay": "Препращане",
+    "Relay LAN": "Relay LAN",
+    "Relay WAN": "Relay WAN",
     "Release Notes": "Бележки по изданието",
     "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Предварителните издания съдържат най-новите възможности и поправки. Те са близки до традиционните, два пъти в седмицата, издания на Synchthing.",
     "Remote Devices": "Отдалечени устройства",

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

@@ -282,7 +282,8 @@
     "Preview": "Vista prèvia",
     "Preview Usage Report": "Informe d'ús de vista prèvia",
     "QR code": "Codi QR",
-    "QUIC": "QUIC",
+    "QUIC LAN": "QUIC LAN",
+    "QUIC WAN": "QUIC WAN",
     "QUIC connections are in most cases considered suboptimal": "QUIC connections are in most cases considered suboptimal",
     "Quick guide to supported patterns": "Guía ràpida de patrons suportats",
     "Random": "Aleatori",
@@ -291,7 +292,8 @@
     "Received data is already encrypted": "Les dades rebudes ja estan xifrades",
     "Recent Changes": "Canvis Recents",
     "Reduced by ignore patterns": "Reduït ignorant patrons",
-    "Relay": "Relay",
+    "Relay LAN": "Relay LAN",
+    "Relay WAN": "Relay WAN",
     "Release Notes": "Notes de la versió",
     "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Les versions candidates (Release Candidates) contenen les darreres característiques i arreglos. Són paregudes a les versions tradicionals bi-semanals de Syncthing. ",
     "Remote Devices": "Dispositius Remots",

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

@@ -282,7 +282,8 @@
     "Preview": "Náhled",
     "Preview Usage Report": "Náhled hlášení o využívání",
     "QR code": "QR kód",
-    "QUIC": "QUIC",
+    "QUIC LAN": "QUIC LAN",
+    "QUIC WAN": "QUIC WAN",
     "QUIC connections are in most cases considered suboptimal": "QUIC connections are in most cases considered suboptimal",
     "Quick guide to supported patterns": "Rychlá nápověda k podporovaným vzorům",
     "Random": "Náhodné",
@@ -291,7 +292,8 @@
     "Received data is already encrypted": "Přijatá data jsou již zašifrována",
     "Recent Changes": "Nedávné změny",
     "Reduced by ignore patterns": "Redukováno o ignorované vzory",
-    "Relay": "Relay",
+    "Relay LAN": "Relay LAN",
+    "Relay WAN": "Relay WAN",
     "Release Notes": "Poznámky k vydání",
     "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Kandidáti na vydání obsahují nejnovější změny a opravy. Podobají se tradičním dvoutýdenním vydáním Syncthing.",
     "Remote Devices": "Vzdálená zařízení",

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

@@ -282,7 +282,8 @@
     "Preview": "Forhåndsvisning",
     "Preview Usage Report": "Forhåndsvisning af forbrugsrapport",
     "QR code": "QR code",
-    "QUIC": "QUIC",
+    "QUIC LAN": "QUIC LAN",
+    "QUIC WAN": "QUIC WAN",
     "QUIC connections are in most cases considered suboptimal": "QUIC connections are in most cases considered suboptimal",
     "Quick guide to supported patterns": "Kvikguide til understøttede mønstre",
     "Random": "Tilfældig",
@@ -291,7 +292,8 @@
     "Received data is already encrypted": "Modtaget data er allerede krypteret",
     "Recent Changes": "Nylige ændringer",
     "Reduced by ignore patterns": "Reduceret af ignoreringsmønstre",
-    "Relay": "Relay",
+    "Relay LAN": "Relay LAN",
+    "Relay WAN": "Relay WAN",
     "Release Notes": "Udgivelsesnoter",
     "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Udgivelseskandidater indeholder alle de nyeste funktioner og rettelser. De er det samme som de traditionelle tougers-udgivelser af Syncthing.",
     "Remote Devices": "Fjernenheder ",

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

@@ -282,7 +282,8 @@
     "Preview": "Vorschau",
     "Preview Usage Report": "Vorschau des Nutzungsberichts",
     "QR code": "QR-Code",
-    "QUIC": "QUIC",
+    "QUIC LAN": "QUIC LAN",
+    "QUIC WAN": "QUIC WAN",
     "QUIC connections are in most cases considered suboptimal": "QUIC-Verbindungen sind in den meisten Fällen suboptimal",
     "Quick guide to supported patterns": "Schnellanleitung zu den unterstützten Mustern",
     "Random": "Zufall",
@@ -291,7 +292,8 @@
     "Received data is already encrypted": "Empfangene Daten sind bereits verschlüsselt",
     "Recent Changes": "Letzte Änderungen",
     "Reduced by ignore patterns": "Durch Ignoriermuster reduziert",
-    "Relay": "Weiterleitung",
+    "Relay LAN": "Weiterleitung LAN",
+    "Relay WAN": "Weiterleitung WAN",
     "Release Notes": "Veröffentlichungshinweise",
     "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Veröffentlichungskandidaten enthalten die neuesten Funktionen und Verbesserungen. Sie gleichen den üblichen zweiwöchentlichen Syncthing-Veröffentlichungen.",
     "Remote Devices": "Externe Geräte",

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

@@ -282,7 +282,8 @@
     "Preview": "Preview",
     "Preview Usage Report": "Preview Usage Report",
     "QR code": "QR code",
-    "QUIC": "QUIC",
+    "QUIC LAN": "QUIC LAN",
+    "QUIC WAN": "QUIC WAN",
     "QUIC connections are in most cases considered suboptimal": "QUIC connections are in most cases considered suboptimal",
     "Quick guide to supported patterns": "Quick guide to supported patterns",
     "Random": "Random",
@@ -291,7 +292,8 @@
     "Received data is already encrypted": "Received data is already encrypted",
     "Recent Changes": "Recent Changes",
     "Reduced by ignore patterns": "Reduced by ignore patterns",
-    "Relay": "Relay",
+    "Relay LAN": "Relay LAN",
+    "Relay WAN": "Relay WAN",
     "Release Notes": "Release Notes",
     "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.",
     "Remote Devices": "Remote Devices",

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

@@ -282,7 +282,8 @@
     "Preview": "Preview",
     "Preview Usage Report": "Preview Usage Report",
     "QR code": "QR code",
-    "QUIC": "QUIC",
+    "QUIC LAN": "QUIC LAN",
+    "QUIC WAN": "QUIC WAN",
     "QUIC connections are in most cases considered suboptimal": "QUIC connections are in most cases considered suboptimal",
     "Quick guide to supported patterns": "Quick guide to supported patterns",
     "Random": "Random",
@@ -291,7 +292,8 @@
     "Received data is already encrypted": "Received data is already encrypted",
     "Recent Changes": "Recent Changes",
     "Reduced by ignore patterns": "Reduced by ignore patterns",
-    "Relay": "Relay",
+    "Relay LAN": "Relay LAN",
+    "Relay WAN": "Relay WAN",
     "Release Notes": "Release Notes",
     "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Release candidates contain the latest features and fixes. They are similar to the traditional fortnightly Syncthing releases.",
     "Remote Devices": "Remote Devices",