From 296cc1bca2bd6095e91a634ace5603e436e21860 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Wilczy=C5=84ski?= Date: Thu, 30 Sep 2021 19:19:18 +0900 Subject: [PATCH 001/220] lib/model: Limit the number of default hashers on Android (ref #2220) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Like Windows and Mac, Android is also an interactive operating system. On top of that, it usually runs on much slower hardware than the other two. Because of that, it makes sense to limit the number of hashes used by default there too. Signed-off-by: Tomasz Wilczyński --- lib/model/model.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/model/model.go b/lib/model/model.go index 2218bd8020d..c1b3ddaa810 100644 --- a/lib/model/model.go +++ b/lib/model/model.go @@ -2403,7 +2403,7 @@ func (m *model) numHashers(folder string) int { return folderCfg.Hashers } - if runtime.GOOS == "windows" || runtime.GOOS == "darwin" { + if runtime.GOOS == "windows" || runtime.GOOS == "darwin" || runtime.GOOS == "android" { // Interactive operating systems; don't load the system too heavily by // default. return 1 From 807a6b10221ea0a01dfedab0ce26473f20266761 Mon Sep 17 00:00:00 2001 From: greatroar <61184462+greatroar@users.noreply.github.com> Date: Fri, 29 Oct 2021 20:20:46 +0200 Subject: [PATCH 002/220] lib/model: Optimize jobQueue performance and memory use (#8023) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit By truncating time.Time to an int64 nanosecond count, we lose the ability to precisely order timestamps before 1678 or after 2262, but we gain (linux/amd64, Go 1.17.1): name old time/op new time/op delta JobQueuePushPopDone10k-8 2.85ms ± 5% 2.29ms ± 2% -19.80% (p=0.000 n=20+18) JobQueueBump-8 34.0µs ± 1% 29.8µs ± 1% -12.35% (p=0.000 n=19+19) name old alloc/op new alloc/op delta JobQueuePushPopDone10k-8 2.56MB ± 0% 1.76MB ± 0% -31.31% (p=0.000 n=18+13) name old allocs/op new allocs/op delta JobQueuePushPopDone10k-8 23.0 ± 0% 23.0 ± 0% ~ (all equal) Results for BenchmarkJobQueueBump are with the fixed version, which no longer depends on b.N for the amount of work performed. rand.Rand.Intn is cheap at ~10ns per iteration. --- lib/model/queue.go | 7 ++++--- lib/model/queue_test.go | 8 ++++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/model/queue.go b/lib/model/queue.go index 28070a9a47f..16ac83c9434 100644 --- a/lib/model/queue.go +++ b/lib/model/queue.go @@ -23,7 +23,7 @@ type jobQueue struct { type jobQueueEntry struct { name string size int64 - modified time.Time + modified int64 } func newJobQueue() *jobQueue { @@ -34,7 +34,8 @@ func newJobQueue() *jobQueue { func (q *jobQueue) Push(file string, size int64, modified time.Time) { q.mut.Lock() - q.queued = append(q.queued, jobQueueEntry{file, size, modified}) + // The range of UnixNano covers a range of reasonable timestamps. + q.queued = append(q.queued, jobQueueEntry{file, size, modified.UnixNano()}) q.mut.Unlock() } @@ -191,5 +192,5 @@ func (q smallestFirst) Swap(a, b int) { q[a], q[b] = q[b], q[a] } type oldestFirst []jobQueueEntry func (q oldestFirst) Len() int { return len(q) } -func (q oldestFirst) Less(a, b int) bool { return q[a].modified.Before(q[b].modified) } +func (q oldestFirst) Less(a, b int) bool { return q[a].modified < q[b].modified } func (q oldestFirst) Swap(a, b int) { q[a], q[b] = q[b], q[a] } diff --git a/lib/model/queue_test.go b/lib/model/queue_test.go index 677c056dd72..9f49a683b2e 100644 --- a/lib/model/queue_test.go +++ b/lib/model/queue_test.go @@ -8,6 +8,7 @@ package model import ( "fmt" + "math/rand" "testing" "time" @@ -251,16 +252,19 @@ func TestSortByAge(t *testing.T) { } func BenchmarkJobQueueBump(b *testing.B) { - files := genFiles(b.N) + files := genFiles(10000) q := newJobQueue() for _, f := range files { q.Push(f.Name, 0, time.Time{}) } + rng := rand.New(rand.NewSource(int64(b.N))) + b.ResetTimer() for i := 0; i < b.N; i++ { - q.BringToFront(files[i].Name) + r := rng.Intn(len(files)) + q.BringToFront(files[r].Name) } } From 28ff033da65292868bd8e8f82d3083da2c338ff2 Mon Sep 17 00:00:00 2001 From: greatroar <61184462+greatroar@users.noreply.github.com> Date: Fri, 29 Oct 2021 20:21:50 +0200 Subject: [PATCH 003/220] cmd/syncthing/cli: indexDumpSize doesn't need a heap (#8024) --- cmd/syncthing/cli/index_dumpsize.go | 46 ++++++++++------------------- 1 file changed, 15 insertions(+), 31 deletions(-) diff --git a/cmd/syncthing/cli/index_dumpsize.go b/cmd/syncthing/cli/index_dumpsize.go index 35e095cd80a..79c399d9838 100644 --- a/cmd/syncthing/cli/index_dumpsize.go +++ b/cmd/syncthing/cli/index_dumpsize.go @@ -7,53 +7,35 @@ package cli import ( - "container/heap" "encoding/binary" "fmt" + "sort" "github.com/urfave/cli" "github.com/syncthing/syncthing/lib/db" ) -type SizedElement struct { - key string - size int -} - -type ElementHeap []SizedElement - -func (h ElementHeap) Len() int { return len(h) } -func (h ElementHeap) Less(i, j int) bool { return h[i].size > h[j].size } -func (h ElementHeap) Swap(i, j int) { h[i], h[j] = h[j], h[i] } - -func (h *ElementHeap) Push(x interface{}) { - *h = append(*h, x.(SizedElement)) -} - -func (h *ElementHeap) Pop() interface{} { - old := *h - n := len(old) - x := old[n-1] - *h = old[0 : n-1] - return x -} - func indexDumpSize(*cli.Context) error { + type sizedElement struct { + key string + size int + } + ldb, err := getDB() if err != nil { return err } - h := &ElementHeap{} - heap.Init(h) - it, err := ldb.NewPrefixIterator(nil) if err != nil { return err } - var ele SizedElement + + var elems []sizedElement for it.Next() { + var ele sizedElement + key := it.Key() switch key[0] { case db.KeyTypeDevice: @@ -94,11 +76,13 @@ func indexDumpSize(*cli.Context) error { ele.key = fmt.Sprintf("UNKNOWN:%x", key) } ele.size = len(it.Value()) - heap.Push(h, ele) + elems = append(elems, ele) } - for h.Len() > 0 { - ele = heap.Pop(h).(SizedElement) + sort.Slice(elems, func(i, j int) bool { + return elems[i].size > elems[j].size + }) + for _, ele := range elems { fmt.Println(ele.key, ele.size) } From 1c2e96a5ca470773bdfd176a9e84e54b168e4d09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Colomb?= Date: Fri, 29 Oct 2021 20:23:41 +0200 Subject: [PATCH 004/220] gui: Display identicons for discovered device IDs. (#8022) --- gui/default/syncthing/device/editDeviceModalView.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gui/default/syncthing/device/editDeviceModalView.html b/gui/default/syncthing/device/editDeviceModalView.html index 38fb995c41b..0b772c4373f 100644 --- a/gui/default/syncthing/device/editDeviceModalView.html +++ b/gui/default/syncthing/device/editDeviceModalView.html @@ -25,7 +25,11 @@

You can also select one of these nearby devices:

From 41bfb7a3302ea7e751fb40a6b8b5a021a0634f2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Colomb?= Date: Thu, 4 Nov 2021 08:42:55 +0100 Subject: [PATCH 005/220] Normalize CLI options to always use two dashes. (#8037) Consistently use double dashes and fix typos -conf, -data-dir and -verify. Applies also to tests running the syncthing binary for consistency. * Fix mismatched option name --conf in cli subcommand. According to the source code comments, the cli option flags should mirror those from the serve subcommand where applicable. That one is actually called --config though. * cli: Fix help text option placeholders. The urfave/cli package uses the Value field of StringFlag to provide a default value, not to name the placeholder. That is instead done with backticks around some part of the Usage field. * cli: Add missing --data flag in subcommand help text. The urfave/cli based option parsing uses a fake flags collection to generate help texts matching the used global options. But the --data option was omitted from it, although it is definitely required when using --config as well. Note that it cannot just be ignored, as some debug stuff actually uses the DB: syncthing cli --data=/bar --config=/foo debug index dump --- cmd/syncthing/cli/main.go | 18 +++++++++--------- cmd/syncthing/cmdutil/util.go | 4 ++-- cmd/syncthing/decrypt/decrypt.go | 2 +- cmd/syncthing/main.go | 4 ++-- lib/locations/locations.go | 6 +++--- lib/syncthing/utils.go | 2 +- test/cli_test.go | 8 ++++---- test/override_test.go | 4 ++-- test/util.go | 2 +- 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/cmd/syncthing/cli/main.go b/cmd/syncthing/cli/main.go index f1ef9e4a4d2..8e08b92ef5a 100644 --- a/cmd/syncthing/cli/main.go +++ b/cmd/syncthing/cli/main.go @@ -61,23 +61,23 @@ func Run() error { fakeFlags := []cli.Flag{ cli.StringFlag{ Name: "gui-address", - Value: "URL", - Usage: "Override GUI address (e.g. \"http://192.0.2.42:8443\")", + Usage: "Override GUI address to `URL` (e.g. \"http://192.0.2.42:8443\")", }, cli.StringFlag{ Name: "gui-apikey", - Value: "API-KEY", - Usage: "Override GUI API key", + Usage: "Override GUI API key to `API-KEY`", }, cli.StringFlag{ Name: "home", - Value: "PATH", - Usage: "Set configuration and data directory", + Usage: "Set configuration and data directory to `PATH`", }, cli.StringFlag{ - Name: "conf", - Value: "PATH", - Usage: "Set configuration directory (config and keys)", + Name: "config", + Usage: "Set configuration directory (config and keys) to `PATH`", + }, + cli.StringFlag{ + Name: "data", + Usage: "Set data directory (database and logs) to `PATH`", }, } diff --git a/cmd/syncthing/cmdutil/util.go b/cmd/syncthing/cmdutil/util.go index 7c15f299513..6a44456b095 100644 --- a/cmd/syncthing/cmdutil/util.go +++ b/cmd/syncthing/cmdutil/util.go @@ -18,9 +18,9 @@ func SetConfigDataLocationsFromFlags(homeDir, confDir, dataDir string) error { dataSet := dataDir != "" switch { case dataSet != confSet: - return errors.New("either both or none of -conf and -data must be given, use -home to set both at once") + return errors.New("either both or none of --config and --data must be given, use --home to set both at once") case homeSet && dataSet: - return errors.New("-home must not be used together with -conf and -data") + return errors.New("--home must not be used together with --config and --data") case homeSet: confDir = homeDir dataDir = homeDir diff --git a/cmd/syncthing/decrypt/decrypt.go b/cmd/syncthing/decrypt/decrypt.go index 0247bb20f01..119583dbd70 100644 --- a/cmd/syncthing/decrypt/decrypt.go +++ b/cmd/syncthing/decrypt/decrypt.go @@ -45,7 +45,7 @@ func (c *CLI) Run() error { log.SetFlags(0) if c.To == "" && !c.VerifyOnly { - return fmt.Errorf("must set --to or --verify") + return fmt.Errorf("must set --to or --verify-only") } if c.TokenPath == "" { diff --git a/cmd/syncthing/main.go b/cmd/syncthing/main.go index 00e2eef5d95..b21273ab69b 100644 --- a/cmd/syncthing/main.go +++ b/cmd/syncthing/main.go @@ -76,9 +76,9 @@ above). The value 0 is used to disable all of the above. The default is to show time only (2). Logging always happens to the command line (stdout) and optionally to the -file at the path specified by -logfile=path. In addition to an path, the special +file at the path specified by --logfile=path. In addition to an path, the special values "default" and "-" may be used. The former logs to DATADIR/syncthing.log -(see -data-dir), which is the default on Windows, and the latter only to stdout, +(see --data), which is the default on Windows, and the latter only to stdout, no file, which is the default anywhere else. diff --git a/lib/locations/locations.go b/lib/locations/locations.go index 3df0b877f0a..12077471ad2 100644 --- a/lib/locations/locations.go +++ b/lib/locations/locations.go @@ -40,10 +40,10 @@ const ( type BaseDirEnum string const ( - // Overridden by -home flag + // Overridden by --home flag ConfigBaseDir BaseDirEnum = "config" DataBaseDir BaseDirEnum = "data" - // User's home directory, *not* -home flag + // User's home directory, *not* --home flag UserHomeBaseDir BaseDirEnum = "userHome" LevelDBDir = "index-v0.14.0.db" @@ -98,7 +98,7 @@ var locationTemplates = map[LocationEnum]string{ HTTPSCertFile: "${config}/https-cert.pem", HTTPSKeyFile: "${config}/https-key.pem", Database: "${data}/" + LevelDBDir, - LogFile: "${data}/syncthing.log", // -logfile on Windows + LogFile: "${data}/syncthing.log", // --logfile on Windows CsrfTokens: "${data}/csrftokens.txt", PanicLog: "${data}/panic-${timestamp}.log", AuditLog: "${data}/audit-${timestamp}.log", diff --git a/lib/syncthing/utils.go b/lib/syncthing/utils.go index 3ddd6e56994..660f856d118 100644 --- a/lib/syncthing/utils.go +++ b/lib/syncthing/utils.go @@ -90,7 +90,7 @@ func LoadConfigAtStartup(path string, cert tls.Certificate, evLogger events.Logg l.Infof("Now, THAT's what we call a config from the future! Don't worry. As long as you hit that wire with the connecting hook at precisely eighty-eight miles per hour the instant the lightning strikes the tower... everything will be fine.") } if originalVersion > config.CurrentVersion && !allowNewerConfig { - return nil, fmt.Errorf("config file version (%d) is newer than supported version (%d). If this is expected, use -allow-newer-config to override.", originalVersion, config.CurrentVersion) + return nil, fmt.Errorf("config file version (%d) is newer than supported version (%d). If this is expected, use --allow-newer-config to override.", originalVersion, config.CurrentVersion) } err = archiveAndSaveConfig(cfg, originalVersion) if err != nil { diff --git a/test/cli_test.go b/test/cli_test.go index f8e783893c1..c19d4383124 100644 --- a/test/cli_test.go +++ b/test/cli_test.go @@ -31,7 +31,7 @@ func TestCLIReset(t *testing.T) { // Run reset to clean up - cmd := exec.Command("../bin/syncthing", "-no-browser", "-home", "h1", "-reset-database") + cmd := exec.Command("../bin/syncthing", "--no-browser", "--home", "h1", "--reset-database") cmd.Stdout = os.Stdout cmd.Stderr = os.Stdout err := cmd.Run() @@ -63,9 +63,9 @@ func TestCLIGenerate(t *testing.T) { t.Fatal(err) } - // -generate should create a bunch of stuff + // --generate should create a bunch of stuff - cmd := exec.Command("../bin/syncthing", "-no-browser", "-generate", "home.out") + cmd := exec.Command("../bin/syncthing", "--no-browser", "--generate", "home.out") cmd.Stdout = os.Stdout cmd.Stderr = os.Stdout err = cmd.Run() @@ -91,7 +91,7 @@ func TestCLIFirstStartup(t *testing.T) { // First startup should create config, BEP certificate, and HTTP certificate. - cmd := exec.Command("../bin/syncthing", "-no-browser", "-home", "home.out") + cmd := exec.Command("../bin/syncthing", "--no-browser", "--home", "home.out") cmd.Env = append(os.Environ(), "STNORESTART=1") cmd.Stdout = os.Stdout cmd.Stderr = os.Stdout diff --git a/test/override_test.go b/test/override_test.go index a4af61bf576..b2fa14f11cd 100644 --- a/test/override_test.go +++ b/test/override_test.go @@ -199,7 +199,7 @@ func TestOverrideIgnores(t *testing.T) { log.Println("Starting sendOnly...") sendOnly := syncthingProcess{ // id1 instance: "1", - argv: []string{"-home", "h1"}, + argv: []string{"--home", "h1"}, port: 8081, apiKey: apiKey, } @@ -212,7 +212,7 @@ func TestOverrideIgnores(t *testing.T) { log.Println("Starting sendRecv...") sendRecv := syncthingProcess{ // id2 instance: "2", - argv: []string{"-home", "h2"}, + argv: []string{"--home", "h2"}, port: 8082, apiKey: apiKey, } diff --git a/test/util.go b/test/util.go index 38b00a5a704..8f69dacdaa1 100644 --- a/test/util.go +++ b/test/util.go @@ -542,7 +542,7 @@ func startInstance(t *testing.T, i int) *rc.Process { p := rc.NewProcess(addr) p.LogTo(log) - if err := p.Start("../bin/syncthing", "-home", fmt.Sprintf("h%d", i), "-no-browser"); err != nil { + if err := p.Start("../bin/syncthing", "--home", fmt.Sprintf("h%d", i), "--no-browser"); err != nil { t.Fatal(err) } p.AwaitStartup() From db15e5274346e4d3ba343c12a00bc7d1744f1b75 Mon Sep 17 00:00:00 2001 From: greatroar <61184462+greatroar@users.noreply.github.com> Date: Sat, 6 Nov 2021 12:38:08 +0100 Subject: [PATCH 006/220] lib/api: http.Request.BasicAuth instead of custom code (#8039) --- lib/api/api_auth.go | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/lib/api/api_auth.go b/lib/api/api_auth.go index 5a009c5db00..d7d7d5a2509 100644 --- a/lib/api/api_auth.go +++ b/lib/api/api_auth.go @@ -7,9 +7,7 @@ package api import ( - "bytes" "crypto/tls" - "encoding/base64" "fmt" "net" "net/http" @@ -66,28 +64,12 @@ func basicAuthAndSessionMiddleware(cookieName string, guiCfg config.GUIConfigura http.Error(w, "Not Authorized", http.StatusUnauthorized) } - hdr := r.Header.Get("Authorization") - if !strings.HasPrefix(hdr, "Basic ") { + username, password, ok := r.BasicAuth() + if !ok { error() return } - hdr = hdr[6:] - bs, err := base64.StdEncoding.DecodeString(hdr) - if err != nil { - error() - return - } - - fields := bytes.SplitN(bs, []byte(":"), 2) - if len(fields) != 2 { - error() - return - } - - username := string(fields[0]) - password := string(fields[1]) - authOk := auth(username, password, guiCfg, ldapCfg) if !authOk { usernameIso := string(iso88591ToUTF8([]byte(username))) From ec8a748514e93f41e94478b59679afe67eb1d3a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Colomb?= Date: Sun, 7 Nov 2021 23:59:48 +0100 Subject: [PATCH 007/220] lib/syncthing: Clean up / refactor LoadOrGenerateCertificate() utility function. (#8025) LoadOrGenerateCertificate() takes two file path arguments, but then uses the locations package to determine the actual path. Fix that with a minimally invasive change, by using the arguments instead. Factor out GenerateCertificate(). The only caller of this function is cmd/syncthing, which passes the same values, so this is technically a no-op. * lib/tlsutil: Make storing generated certificate optional. Avoid temporary cert and key files in tests, keep cert in memory. --- cmd/syncthing/main.go | 7 ++-- lib/api/api_test.go | 12 ++----- lib/connections/connections_test.go | 16 +-------- lib/discover/global_test.go | 14 ++------ lib/syncthing/syncthing_test.go | 9 +----- lib/syncthing/utils.go | 18 ++++------- lib/tlsutil/tlsutil.go | 50 +++++++++++++++++++---------- 7 files changed, 49 insertions(+), 77 deletions(-) diff --git a/cmd/syncthing/main.go b/cmd/syncthing/main.go index b21273ab69b..21a8fbe6bc5 100644 --- a/cmd/syncthing/main.go +++ b/cmd/syncthing/main.go @@ -49,16 +49,13 @@ import ( "github.com/syncthing/syncthing/lib/protocol" "github.com/syncthing/syncthing/lib/svcutil" "github.com/syncthing/syncthing/lib/syncthing" - "github.com/syncthing/syncthing/lib/tlsutil" "github.com/syncthing/syncthing/lib/upgrade" "github.com/pkg/errors" ) const ( - tlsDefaultCommonName = "syncthing" - deviceCertLifetimeDays = 20 * 365 - sigTerm = syscall.Signal(15) + sigTerm = syscall.Signal(15) ) const ( @@ -442,7 +439,7 @@ func generate(generateDir string, noDefaultFolder bool) error { if err == nil { l.Warnln("Key exists; will not overwrite.") } else { - cert, err = tlsutil.NewCertificate(certFile, keyFile, tlsDefaultCommonName, deviceCertLifetimeDays) + cert, err = syncthing.GenerateCertificate(certFile, keyFile) if err != nil { return errors.Wrap(err, "create certificate") } diff --git a/lib/api/api_test.go b/lib/api/api_test.go index 951776d7eac..f9ecc15c5cc 100644 --- a/lib/api/api_test.go +++ b/lib/api/api_test.go @@ -1209,15 +1209,9 @@ func TestPrefixMatch(t *testing.T) { } func TestShouldRegenerateCertificate(t *testing.T) { - dir, err := ioutil.TempDir("", "syncthing-test") - if err != nil { - t.Fatal(err) - } - defer os.RemoveAll(dir) - // Self signed certificates expiring in less than a month are errored so we // can regenerate in time. - crt, err := tlsutil.NewCertificate(filepath.Join(dir, "crt"), filepath.Join(dir, "key"), "foo.example.com", 29) + crt, err := tlsutil.NewCertificateInMemory("foo.example.com", 29) if err != nil { t.Fatal(err) } @@ -1226,7 +1220,7 @@ func TestShouldRegenerateCertificate(t *testing.T) { } // Certificates with at least 31 days of life left are fine. - crt, err = tlsutil.NewCertificate(filepath.Join(dir, "crt"), filepath.Join(dir, "key"), "foo.example.com", 31) + crt, err = tlsutil.NewCertificateInMemory("foo.example.com", 31) if err != nil { t.Fatal(err) } @@ -1236,7 +1230,7 @@ func TestShouldRegenerateCertificate(t *testing.T) { if runtime.GOOS == "darwin" { // Certificates with too long an expiry time are not allowed on macOS - crt, err = tlsutil.NewCertificate(filepath.Join(dir, "crt"), filepath.Join(dir, "key"), "foo.example.com", 1000) + crt, err = tlsutil.NewCertificateInMemory("foo.example.com", 1000) if err != nil { t.Fatal(err) } diff --git a/lib/connections/connections_test.go b/lib/connections/connections_test.go index b9a10d5caa5..a7d4caf1939 100644 --- a/lib/connections/connections_test.go +++ b/lib/connections/connections_test.go @@ -11,11 +11,9 @@ import ( "crypto/tls" "errors" "fmt" - "io/ioutil" "math/rand" "net" "net/url" - "os" "strings" "testing" "time" @@ -470,21 +468,9 @@ func withConnectionPair(b *testing.B, connUri string, h func(client, server inte } func mustGetCert(b *testing.B) tls.Certificate { - f1, err := ioutil.TempFile("", "") + cert, err := tlsutil.NewCertificateInMemory("bench", 10) if err != nil { b.Fatal(err) } - f1.Close() - f2, err := ioutil.TempFile("", "") - if err != nil { - b.Fatal(err) - } - f2.Close() - cert, err := tlsutil.NewCertificate(f1.Name(), f2.Name(), "bench", 10) - if err != nil { - b.Fatal(err) - } - _ = os.Remove(f1.Name()) - _ = os.Remove(f2.Name()) return cert } diff --git a/lib/discover/global_test.go b/lib/discover/global_test.go index 8ebbc7c4d3e..8a9761782ed 100644 --- a/lib/discover/global_test.go +++ b/lib/discover/global_test.go @@ -107,13 +107,8 @@ func TestGlobalOverHTTP(t *testing.T) { } func TestGlobalOverHTTPS(t *testing.T) { - dir, err := ioutil.TempDir("", "syncthing") - if err != nil { - t.Fatal(err) - } - // Generate a server certificate. - cert, err := tlsutil.NewCertificate(dir+"/cert.pem", dir+"/key.pem", "syncthing", 30) + cert, err := tlsutil.NewCertificateInMemory("syncthing", 30) if err != nil { t.Fatal(err) } @@ -172,13 +167,8 @@ func TestGlobalOverHTTPS(t *testing.T) { } func TestGlobalAnnounce(t *testing.T) { - dir, err := ioutil.TempDir("", "syncthing") - if err != nil { - t.Fatal(err) - } - // Generate a server certificate. - cert, err := tlsutil.NewCertificate(dir+"/cert.pem", dir+"/key.pem", "syncthing", 30) + cert, err := tlsutil.NewCertificateInMemory("syncthing", 30) if err != nil { t.Fatal(err) } diff --git a/lib/syncthing/syncthing_test.go b/lib/syncthing/syncthing_test.go index 5c6d6278cf1..8add69ee821 100644 --- a/lib/syncthing/syncthing_test.go +++ b/lib/syncthing/syncthing_test.go @@ -9,7 +9,6 @@ package syncthing import ( "io/ioutil" "os" - "path/filepath" "testing" "time" @@ -57,13 +56,7 @@ func TestShortIDCheck(t *testing.T) { } func TestStartupFail(t *testing.T) { - tmpDir, err := ioutil.TempDir("", "syncthing-TestStartupFail-") - if err != nil { - t.Fatal(err) - } - defer os.RemoveAll(tmpDir) - - cert, err := tlsutil.NewCertificate(filepath.Join(tmpDir, "cert"), filepath.Join(tmpDir, "key"), "syncthing", 365) + cert, err := tlsutil.NewCertificateInMemory("syncthing", 365) if err != nil { t.Fatal(err) } diff --git a/lib/syncthing/utils.go b/lib/syncthing/utils.go index 660f856d118..468e94a045a 100644 --- a/lib/syncthing/utils.go +++ b/lib/syncthing/utils.go @@ -25,22 +25,18 @@ import ( ) func LoadOrGenerateCertificate(certFile, keyFile string) (tls.Certificate, error) { - cert, err := tls.LoadX509KeyPair( - locations.Get(locations.CertFile), - locations.Get(locations.KeyFile), - ) + cert, err := tls.LoadX509KeyPair(certFile, keyFile) if err != nil { - l.Infof("Generating ECDSA key and certificate for %s...", tlsDefaultCommonName) - return tlsutil.NewCertificate( - locations.Get(locations.CertFile), - locations.Get(locations.KeyFile), - tlsDefaultCommonName, - deviceCertLifetimeDays, - ) + return GenerateCertificate(certFile, keyFile) } return cert, nil } +func GenerateCertificate(certFile, keyFile string) (tls.Certificate, error) { + l.Infof("Generating ECDSA key and certificate for %s...", tlsDefaultCommonName) + return tlsutil.NewCertificate(certFile, keyFile, tlsDefaultCommonName, deviceCertLifetimeDays) +} + func DefaultConfig(path string, myID protocol.DeviceID, evLogger events.Logger, noDefaultFolder bool) (config.Wrapper, error) { newCfg, err := config.NewWithFreePorts(myID) if err != nil { diff --git a/lib/tlsutil/tlsutil.go b/lib/tlsutil/tlsutil.go index 146e6d96c01..7ef22d5c73a 100644 --- a/lib/tlsutil/tlsutil.go +++ b/lib/tlsutil/tlsutil.go @@ -86,11 +86,11 @@ func SecureDefaultWithTLS12() *tls.Config { } } -// NewCertificate generates and returns a new TLS certificate. -func NewCertificate(certFile, keyFile, commonName string, lifetimeDays int) (tls.Certificate, error) { +// generateCertificate generates a PEM formatted key pair and self-signed certificate in memory. +func generateCertificate(commonName string, lifetimeDays int) (*pem.Block, *pem.Block, error) { priv, err := ecdsa.GenerateKey(elliptic.P384(), rand.Reader) if err != nil { - return tls.Certificate{}, errors.Wrap(err, "generate key") + return nil, nil, errors.Wrap(err, "generate key") } notBefore := time.Now().Truncate(24 * time.Hour) @@ -117,19 +117,33 @@ func NewCertificate(certFile, keyFile, commonName string, lifetimeDays int) (tls derBytes, err := x509.CreateCertificate(rand.Reader, &template, &template, publicKey(priv), priv) if err != nil { - return tls.Certificate{}, errors.Wrap(err, "create cert") + return nil, nil, errors.Wrap(err, "create cert") + } + + certBlock := &pem.Block{Type: "CERTIFICATE", Bytes: derBytes} + keyBlock, err := pemBlockForKey(priv) + if err != nil { + return nil, nil, errors.Wrap(err, "save key") + } + + return certBlock, keyBlock, nil +} + +// NewCertificate generates and returns a new TLS certificate, saved to the given PEM files. +func NewCertificate(certFile, keyFile string, commonName string, lifetimeDays int) (tls.Certificate, error) { + certBlock, keyBlock, err := generateCertificate(commonName, lifetimeDays) + if err != nil { + return tls.Certificate{}, err } certOut, err := os.Create(certFile) if err != nil { return tls.Certificate{}, errors.Wrap(err, "save cert") } - err = pem.Encode(certOut, &pem.Block{Type: "CERTIFICATE", Bytes: derBytes}) - if err != nil { + if err = pem.Encode(certOut, certBlock); err != nil { return tls.Certificate{}, errors.Wrap(err, "save cert") } - err = certOut.Close() - if err != nil { + if err = certOut.Close(); err != nil { return tls.Certificate{}, errors.Wrap(err, "save cert") } @@ -137,22 +151,24 @@ func NewCertificate(certFile, keyFile, commonName string, lifetimeDays int) (tls if err != nil { return tls.Certificate{}, errors.Wrap(err, "save key") } - - block, err := pemBlockForKey(priv) - if err != nil { + if err = pem.Encode(keyOut, keyBlock); err != nil { return tls.Certificate{}, errors.Wrap(err, "save key") } - - err = pem.Encode(keyOut, block) - if err != nil { + if err = keyOut.Close(); err != nil { return tls.Certificate{}, errors.Wrap(err, "save key") } - err = keyOut.Close() + + return tls.X509KeyPair(pem.EncodeToMemory(certBlock), pem.EncodeToMemory(keyBlock)) +} + +// NewCertificateInMemory generates and returns a new TLS certificate, kept only in memory. +func NewCertificateInMemory(commonName string, lifetimeDays int) (tls.Certificate, error) { + certBlock, keyBlock, err := generateCertificate(commonName, lifetimeDays) if err != nil { - return tls.Certificate{}, errors.Wrap(err, "save key") + return tls.Certificate{}, err } - return tls.LoadX509KeyPair(certFile, keyFile) + return tls.X509KeyPair(pem.EncodeToMemory(certBlock), pem.EncodeToMemory(keyBlock)) } type DowngradingListener struct { From dec6f80d2bc9067347d80cba692da49c38cbdfde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Colomb?= Date: Mon, 8 Nov 2021 13:32:04 +0100 Subject: [PATCH 008/220] lib/config: Move the bcrypt password hashing to GUIConfiguration (#8028) What hash is used to store the password should ideally be an implementation detail, so that every user of the GUIConfiguration object automatically agrees on how to handle it. That is currently distribututed over the confighandler.go and api_auth.go files, plus tests. Add the SetHasedPassword() / CompareHashedPassword() API to keep the hashing method encapsulated. Add a separate test for it and adjust other users and tests. Remove all deprecated imports of the bcrypt package. --- lib/api/api_auth.go | 9 +++------ lib/api/api_auth_test.go | 13 +++++++------ lib/api/confighandler.go | 33 ++++++++++++++------------------- lib/config/config_test.go | 21 +++++++++++++++++++++ lib/config/guiconfiguration.go | 19 +++++++++++++++++++ 5 files changed, 64 insertions(+), 31 deletions(-) diff --git a/lib/api/api_auth.go b/lib/api/api_auth.go index d7d7d5a2509..70add9a9541 100644 --- a/lib/api/api_auth.go +++ b/lib/api/api_auth.go @@ -19,7 +19,6 @@ import ( "github.com/syncthing/syncthing/lib/events" "github.com/syncthing/syncthing/lib/rand" "github.com/syncthing/syncthing/lib/sync" - "golang.org/x/crypto/bcrypt" ) var ( @@ -117,14 +116,12 @@ func auth(username string, password string, guiCfg config.GUIConfiguration, ldap if guiCfg.AuthMode == config.AuthModeLDAP { return authLDAP(username, password, ldapCfg) } else { - return authStatic(username, password, guiCfg.User, guiCfg.Password) + return authStatic(username, password, guiCfg) } } -func authStatic(username string, password string, configUser string, configPassword string) bool { - configPasswordBytes := []byte(configPassword) - passwordBytes := []byte(password) - return bcrypt.CompareHashAndPassword(configPasswordBytes, passwordBytes) == nil && username == configUser +func authStatic(username string, password string, guiCfg config.GUIConfiguration) bool { + return guiCfg.CompareHashedPassword(password) == nil && username == guiCfg.User } func authLDAP(username string, password string, cfg config.LDAPConfiguration) bool { diff --git a/lib/api/api_auth_test.go b/lib/api/api_auth_test.go index 4735378a5bf..046b06a0771 100644 --- a/lib/api/api_auth_test.go +++ b/lib/api/api_auth_test.go @@ -9,19 +9,20 @@ package api import ( "testing" - "golang.org/x/crypto/bcrypt" + "github.com/syncthing/syncthing/lib/config" ) -var passwordHashBytes []byte +var guiCfg config.GUIConfiguration func init() { - passwordHashBytes, _ = bcrypt.GenerateFromPassword([]byte("pass"), 0) + guiCfg.User = "user" + guiCfg.HashAndSetPassword("pass") } func TestStaticAuthOK(t *testing.T) { t.Parallel() - ok := authStatic("user", "pass", "user", string(passwordHashBytes)) + ok := authStatic("user", "pass", guiCfg) if !ok { t.Fatalf("should pass auth") } @@ -30,7 +31,7 @@ func TestStaticAuthOK(t *testing.T) { func TestSimpleAuthUsernameFail(t *testing.T) { t.Parallel() - ok := authStatic("userWRONG", "pass", "user", string(passwordHashBytes)) + ok := authStatic("userWRONG", "pass", guiCfg) if ok { t.Fatalf("should fail auth") } @@ -39,7 +40,7 @@ func TestSimpleAuthUsernameFail(t *testing.T) { func TestStaticAuthPasswordFail(t *testing.T) { t.Parallel() - ok := authStatic("user", "passWRONG", "user", string(passwordHashBytes)) + ok := authStatic("user", "passWRONG", guiCfg) if ok { t.Fatalf("should fail auth") } diff --git a/lib/api/confighandler.go b/lib/api/confighandler.go index 8f03acfdff5..24e6b118c16 100644 --- a/lib/api/confighandler.go +++ b/lib/api/confighandler.go @@ -13,7 +13,6 @@ import ( "net/http" "github.com/julienschmidt/httprouter" - "golang.org/x/crypto/bcrypt" "github.com/syncthing/syncthing/lib/config" "github.com/syncthing/syncthing/lib/protocol" @@ -290,11 +289,13 @@ func (c *configMuxBuilder) adjustConfig(w http.ResponseWriter, r *http.Request) var errMsg string var status int waiter, err := c.cfg.Modify(func(cfg *config.Configuration) { - if to.GUI.Password, err = checkGUIPassword(cfg.GUI.Password, to.GUI.Password); err != nil { - l.Warnln("bcrypting password:", err) - errMsg = err.Error() - status = http.StatusInternalServerError - return + if to.GUI.Password != cfg.GUI.Password { + if err := to.GUI.HashAndSetPassword(to.GUI.Password); err != nil { + l.Warnln("hashing password:", err) + errMsg = err.Error() + status = http.StatusInternalServerError + return + } } *cfg = to }) @@ -370,11 +371,13 @@ func (c *configMuxBuilder) adjustGUI(w http.ResponseWriter, r *http.Request, gui var errMsg string var status int waiter, err := c.cfg.Modify(func(cfg *config.Configuration) { - if gui.Password, err = checkGUIPassword(oldPassword, gui.Password); err != nil { - l.Warnln("bcrypting password:", err) - errMsg = err.Error() - status = http.StatusInternalServerError - return + if gui.Password != oldPassword { + if err := gui.HashAndSetPassword(gui.Password); err != nil { + l.Warnln("hashing password:", err) + errMsg = err.Error() + status = http.StatusInternalServerError + return + } } cfg.GUI = gui }) @@ -418,14 +421,6 @@ func unmarshalToRawMessages(body io.ReadCloser) ([]json.RawMessage, error) { return data, err } -func checkGUIPassword(oldPassword, newPassword string) (string, error) { - if newPassword == oldPassword { - return newPassword, nil - } - hash, err := bcrypt.GenerateFromPassword([]byte(newPassword), 0) - return string(hash), err -} - func (c *configMuxBuilder) finish(w http.ResponseWriter, waiter config.Waiter) { waiter.Wait() if err := c.cfg.Save(); err != nil { diff --git a/lib/config/config_test.go b/lib/config/config_test.go index e49aa977604..5da13207c9c 100644 --- a/lib/config/config_test.go +++ b/lib/config/config_test.go @@ -739,6 +739,27 @@ func TestGUIConfigURL(t *testing.T) { } } +func TestGUIPasswordHash(t *testing.T) { + var c GUIConfiguration + + testPass := "pass" + if err := c.HashAndSetPassword(testPass); err != nil { + t.Fatal(err) + } + if c.Password == testPass { + t.Error("Password hashing resulted in plaintext") + } + + if err := c.CompareHashedPassword(testPass); err != nil { + t.Errorf("No match on same password: %v", err) + } + + failPass := "different" + if err := c.CompareHashedPassword(failPass); err == nil { + t.Errorf("Match on different password: %v", err) + } +} + func TestDuplicateDevices(t *testing.T) { // Duplicate devices should be removed diff --git a/lib/config/guiconfiguration.go b/lib/config/guiconfiguration.go index 7b9830b30a9..147ed9fdc36 100644 --- a/lib/config/guiconfiguration.go +++ b/lib/config/guiconfiguration.go @@ -12,6 +12,8 @@ import ( "strconv" "strings" + "golang.org/x/crypto/bcrypt" + "github.com/syncthing/syncthing/lib/rand" ) @@ -113,6 +115,23 @@ func (c GUIConfiguration) URL() string { return u.String() } +// SetHashedPassword hashes the given plaintext password and stores the new hash. +func (c *GUIConfiguration) HashAndSetPassword(password string) error { + hash, err := bcrypt.GenerateFromPassword([]byte(password), 0) + if err != nil { + return err + } + c.Password = string(hash) + return nil +} + +// CompareHashedPassword returns nil when the given plaintext password matches the stored hash. +func (c GUIConfiguration) CompareHashedPassword(password string) error { + configPasswordBytes := []byte(c.Password) + passwordBytes := []byte(password) + return bcrypt.CompareHashAndPassword(configPasswordBytes, passwordBytes) +} + // IsValidAPIKey returns true when the given API key is valid, including both // the value in config and any overrides func (c GUIConfiguration) IsValidAPIKey(apiKey string) bool { From 591e4d8af1a60768a573dbb5409016d30d6b18b1 Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Wed, 10 Nov 2021 09:46:21 +0100 Subject: [PATCH 009/220] gui, lib: Fix tracking deleted locally-changed on encrypted (fixes #7715) (#7726) --- gui/default/index.html | 6 - .../syncthing/core/syncthingController.js | 23 +--- lib/db/lowlevel.go | 117 ++++++++++++++---- lib/db/set.go | 16 +++ lib/model/fakeconns_test.go | 1 + lib/model/folder.go | 84 ++++++++----- lib/model/folder_recvonly_test.go | 37 ++---- lib/model/folder_sendrecv_test.go | 16 ++- lib/model/model.go | 4 +- lib/model/model_test.go | 74 ++++++++--- lib/model/requests_test.go | 20 +-- lib/model/testutils_test.go | 15 +++ 12 files changed, 271 insertions(+), 142 deletions(-) diff --git a/gui/default/index.html b/gui/default/index.html index 07cd90d6946..43ae81434db 100644 --- a/gui/default/index.html +++ b/gui/default/index.html @@ -455,12 +455,6 @@

{{model[folder.id].receiveOnlyTotalItems | alwaysNumber | localeNumber}} items, ~{{model[folder.id].receiveOnlyChangedBytes | binary}}B - -  Locally Changed Items - - {{receiveEncryptedItemsCount(folder) | alwaysNumber | localeNumber}} items, ~{{model[folder.id].receiveOnlyChangedBytes | binary}}B - -  Folder Type diff --git a/gui/default/syncthing/core/syncthingController.js b/gui/default/syncthing/core/syncthingController.js index 8e91fda4190..fa565b8b8d3 100755 --- a/gui/default/syncthing/core/syncthingController.js +++ b/gui/default/syncthing/core/syncthingController.js @@ -931,9 +931,9 @@ angular.module('syncthing.core') return 'faileditems'; } if ($scope.hasReceiveOnlyChanged(folderCfg)) { - return 'localadditions'; - } - if ($scope.hasReceiveEncryptedItems(folderCfg)) { + if (folderCfg.type === "receiveonly") { + return 'localadditions'; + } return 'localunencrypted'; } if (folderCfg.devices.length <= 1) { @@ -2609,28 +2609,13 @@ angular.module('syncthing.core') }; $scope.hasReceiveOnlyChanged = function (folderCfg) { - if (!folderCfg || folderCfg.type !== "receiveonly") { + if (!folderCfg || folderCfg.type !== ["receiveonly", "receiveencrypted"].indexOf(folderCfg.type) === -1) { return false; } var counts = $scope.model[folderCfg.id]; return counts && counts.receiveOnlyTotalItems > 0; }; - $scope.hasReceiveEncryptedItems = function (folderCfg) { - if (!folderCfg || folderCfg.type !== "receiveencrypted") { - return false; - } - return $scope.receiveEncryptedItemsCount(folderCfg) > 0; - }; - - $scope.receiveEncryptedItemsCount = function (folderCfg) { - var counts = $scope.model[folderCfg.id]; - if (!counts) { - return 0; - } - return counts.receiveOnlyTotalItems - counts.receiveOnlyChangedDeletes; - } - $scope.revertOverride = function () { $http.post( urlbase + "/db/" + $scope.revertOverrideParams.operation +"?folder=" diff --git a/lib/db/lowlevel.go b/lib/db/lowlevel.go index 7f4916da488..88792a36d56 100644 --- a/lib/db/lowlevel.go +++ b/lib/db/lowlevel.go @@ -223,35 +223,10 @@ func (db *Lowlevel) updateLocalFiles(folder []byte, fs []protocol.FileInfo, meta blocksHashSame := ok && bytes.Equal(ef.BlocksHash, f.BlocksHash) if ok { - if len(ef.Blocks) != 0 && !ef.IsInvalid() && ef.Size > 0 { - for _, block := range ef.Blocks { - keyBuf, err = db.keyer.GenerateBlockMapKey(keyBuf, folder, block.Hash, name) - if err != nil { - return err - } - if err := t.Delete(keyBuf); err != nil { - return err - } - } - if !blocksHashSame { - keyBuf, err := db.keyer.GenerateBlockListMapKey(keyBuf, folder, ef.BlocksHash, name) - if err != nil { - return err - } - if err = t.Delete(keyBuf); err != nil { - return err - } - } - } - - keyBuf, err = db.keyer.GenerateSequenceKey(keyBuf, folder, ef.SequenceNo()) + keyBuf, err = db.removeLocalBlockAndSequenceInfo(keyBuf, folder, name, ef, !blocksHashSame, &t) if err != nil { return err } - if err := t.Delete(keyBuf); err != nil { - return err - } - l.Debugf("removing sequence; folder=%q sequence=%v %v", folder, ef.SequenceNo(), ef.FileName()) } f.Sequence = meta.nextLocalSeq() @@ -314,6 +289,96 @@ func (db *Lowlevel) updateLocalFiles(folder []byte, fs []protocol.FileInfo, meta return t.Commit() } +func (db *Lowlevel) removeLocalFiles(folder []byte, nameStrs []string, meta *metadataTracker) error { + db.gcMut.RLock() + defer db.gcMut.RUnlock() + + t, err := db.newReadWriteTransaction(meta.CommitHook(folder)) + if err != nil { + return err + } + defer t.close() + + var dk, gk, buf []byte + for _, nameStr := range nameStrs { + name := []byte(nameStr) + dk, err = db.keyer.GenerateDeviceFileKey(dk, folder, protocol.LocalDeviceID[:], name) + if err != nil { + return err + } + + ef, ok, err := t.getFileByKey(dk) + if err != nil { + return err + } + if !ok { + l.Debugf("remove (local); folder=%q %v: file doesn't exist", folder, nameStr) + continue + } + + buf, err = db.removeLocalBlockAndSequenceInfo(buf, folder, name, ef, true, &t) + if err != nil { + return err + } + + meta.removeFile(protocol.LocalDeviceID, ef) + + gk, err = db.keyer.GenerateGlobalVersionKey(gk, folder, name) + if err != nil { + return err + } + buf, err = t.removeFromGlobal(gk, buf, folder, protocol.LocalDeviceID[:], name, meta) + if err != nil { + return err + } + + err = t.Delete(dk) + if err != nil { + return err + } + + if err := t.Checkpoint(); err != nil { + return err + } + } + + return t.Commit() +} + +func (db *Lowlevel) removeLocalBlockAndSequenceInfo(keyBuf, folder, name []byte, ef protocol.FileInfo, removeFromBlockListMap bool, t *readWriteTransaction) ([]byte, error) { + var err error + if len(ef.Blocks) != 0 && !ef.IsInvalid() && ef.Size > 0 { + for _, block := range ef.Blocks { + keyBuf, err = db.keyer.GenerateBlockMapKey(keyBuf, folder, block.Hash, name) + if err != nil { + return nil, err + } + if err := t.Delete(keyBuf); err != nil { + return nil, err + } + } + if removeFromBlockListMap { + keyBuf, err := db.keyer.GenerateBlockListMapKey(keyBuf, folder, ef.BlocksHash, name) + if err != nil { + return nil, err + } + if err = t.Delete(keyBuf); err != nil { + return nil, err + } + } + } + + keyBuf, err = db.keyer.GenerateSequenceKey(keyBuf, folder, ef.SequenceNo()) + if err != nil { + return nil, err + } + if err := t.Delete(keyBuf); err != nil { + return nil, err + } + l.Debugf("removing sequence; folder=%q sequence=%v %v", folder, ef.SequenceNo(), ef.FileName()) + return keyBuf, nil +} + func (db *Lowlevel) dropFolder(folder []byte) error { db.gcMut.RLock() defer db.gcMut.RUnlock() diff --git a/lib/db/set.go b/lib/db/set.go index a1c0cb64962..12a7083cb8f 100644 --- a/lib/db/set.go +++ b/lib/db/set.go @@ -144,6 +144,22 @@ func (s *FileSet) Update(device protocol.DeviceID, fs []protocol.FileInfo) { } } +func (s *FileSet) RemoveLocalItems(items []string) { + opStr := fmt.Sprintf("%s RemoveLocalItems([%d])", s.folder, len(items)) + l.Debugf(opStr) + + s.updateMutex.Lock() + defer s.updateMutex.Unlock() + + for i := range items { + items[i] = osutil.NormalizedFilename(items[i]) + } + + if err := s.db.removeLocalFiles([]byte(s.folder), items, s.meta); err != nil && !backend.IsClosed(err) { + fatalError(err, opStr, s.db) + } +} + type Snapshot struct { folder string t readOnlyTransaction diff --git a/lib/model/fakeconns_test.go b/lib/model/fakeconns_test.go index 79b4e85520e..9b5495b5f17 100644 --- a/lib/model/fakeconns_test.go +++ b/lib/model/fakeconns_test.go @@ -162,6 +162,7 @@ func (f *fakeConnection) sendIndexUpdate() { func addFakeConn(m *testModel, dev protocol.DeviceID, folderID string) *fakeConnection { fc := newFakeConnection(dev, m) + fc.folder = folderID m.AddConnection(fc, protocol.Hello{}) m.ClusterConfig(dev, protocol.ClusterConfig{ diff --git a/lib/model/folder.go b/lib/model/folder.go index 18ef41a0657..41b9fe98067 100644 --- a/lib/model/folder.go +++ b/lib/model/folder.go @@ -532,16 +532,20 @@ func (f *folder) scanSubdirs(subDirs []string) error { return nil } +const maxToRemove = 1000 + type scanBatch struct { - *db.FileInfoBatch - f *folder + f *folder + updateBatch *db.FileInfoBatch + toRemove []string } func (f *folder) newScanBatch() *scanBatch { b := &scanBatch{ - f: f, + f: f, + toRemove: make([]string, 0, maxToRemove), } - b.FileInfoBatch = db.NewFileInfoBatch(func(fs []protocol.FileInfo) error { + b.updateBatch = db.NewFileInfoBatch(func(fs []protocol.FileInfo) error { if err := b.f.getHealthErrorWithoutIgnores(); err != nil { l.Debugf("Stopping scan of folder %s due to: %s", b.f.Description(), err) return err @@ -552,9 +556,32 @@ func (f *folder) newScanBatch() *scanBatch { return b } -// Append adds the fileinfo to the batch for updating, and does a few checks. +func (b *scanBatch) Remove(item string) { + b.toRemove = append(b.toRemove, item) +} + +func (b *scanBatch) flushToRemove() { + if len(b.toRemove) > 0 { + b.f.fset.RemoveLocalItems(b.toRemove) + b.toRemove = b.toRemove[:0] + } +} + +func (b *scanBatch) Flush() error { + b.flushToRemove() + return b.updateBatch.Flush() +} + +func (b *scanBatch) FlushIfFull() error { + if len(b.toRemove) >= maxToRemove { + b.flushToRemove() + } + return b.updateBatch.FlushIfFull() +} + +// Update adds the fileinfo to the batch for updating, and does a few checks. // It returns false if the checks result in the file not going to be updated or removed. -func (b *scanBatch) Append(fi protocol.FileInfo, snap *db.Snapshot) bool { +func (b *scanBatch) Update(fi protocol.FileInfo, snap *db.Snapshot) bool { // Check for a "virtual" parent directory of encrypted files. We don't track // it, but check if anything still exists within and delete it otherwise. if b.f.Type == config.FolderTypeReceiveEncrypted && fi.IsDirectory() && protocol.IsEncryptedParent(fs.PathComponents(fi.Name)) { @@ -565,20 +592,21 @@ func (b *scanBatch) Append(fi protocol.FileInfo, snap *db.Snapshot) bool { } // Resolve receive-only items which are identical with the global state or // the global item is our own receive-only item. - // Except if they are in a receive-encrypted folder and are locally added. - // Those must never be sent in index updates and thus must retain the flag. switch gf, ok := snap.GetGlobal(fi.Name); { case !ok: case gf.IsReceiveOnlyChanged(): - if b.f.Type == config.FolderTypeReceiveOnly && fi.Deleted { - l.Debugf("%v scanning: Marking deleted item as not locally changed", b.f, fi) - fi.LocalFlags &^= protocol.FlagLocalReceiveOnly + if fi.IsDeleted() { + // Our item is deleted and the global item is our own receive only + // file. No point in keeping track of that. + b.Remove(fi.Name) + return true } case gf.IsEquivalentOptional(fi, b.f.modTimeWindow, false, false, protocol.FlagLocalReceiveOnly): - l.Debugf("%v scanning: Replacing scanned file info with global as it's equivalent", b.f, fi) + // What we have locally is equivalent to the global file. + l.Debugf("%v scanning: Merging identical locally changed item with global", b.f, fi) fi = gf } - b.FileInfoBatch.Append(fi) + b.updateBatch.Append(fi) return true } @@ -634,7 +662,7 @@ func (f *folder) scanSubdirsChangedAndNew(subDirs []string, batch *scanBatch) (i return changes, err } - if batch.Append(res.File, snap) { + if batch.Update(res.File, snap) { changes++ } @@ -642,7 +670,7 @@ func (f *folder) scanSubdirsChangedAndNew(subDirs []string, batch *scanBatch) (i case config.FolderTypeReceiveOnly, config.FolderTypeReceiveEncrypted: default: if nf, ok := f.findRename(snap, res.File, alreadyUsedOrExisting); ok { - if batch.Append(nf, snap) { + if batch.Update(nf, snap) { changes++ } } @@ -683,7 +711,7 @@ func (f *folder) scanSubdirsDeletedAndIgnored(subDirs []string, batch *scanBatch for _, file := range toIgnore { l.Debugln("marking file as ignored", file) nf := file.ConvertToIgnoredFileInfo() - if batch.Append(nf, snap) { + if batch.Update(nf, snap) { changes++ } if err := batch.FlushIfFull(); err != nil { @@ -713,7 +741,7 @@ func (f *folder) scanSubdirsDeletedAndIgnored(subDirs []string, batch *scanBatch l.Debugln("marking file as ignored", file) nf := file.ConvertToIgnoredFileInfo() - if batch.Append(nf, snap) { + if batch.Update(nf, snap) { changes++ } @@ -743,24 +771,24 @@ func (f *folder) scanSubdirsDeletedAndIgnored(subDirs []string, batch *scanBatch nf.Version = protocol.Vector{} } l.Debugln("marking file as deleted", nf) - if batch.Append(nf, snap) { + if batch.Update(nf, snap) { changes++ } case file.IsDeleted() && file.IsReceiveOnlyChanged(): switch f.Type { case config.FolderTypeReceiveOnly, config.FolderTypeReceiveEncrypted: - if gf, _ := snap.GetGlobal(file.Name); gf.IsDeleted() { + switch gf, ok := snap.GetGlobal(file.Name); { + case !ok: + case gf.IsReceiveOnlyChanged(): + l.Debugln("removing deleted, receive-only item that is globally receive-only from db", file) + batch.Remove(file.Name) + changes++ + case gf.IsDeleted(): // Our item is deleted and the global item is deleted too. We just // pretend it is a normal deleted file (nobody cares about that). - // Except if this is a receive-encrypted folder and it - // is a locally added file. Those must never be sent - // in index updates and thus must retain the flag. - if f.Type == config.FolderTypeReceiveEncrypted && gf.IsReceiveOnlyChanged() { - return true - } l.Debugf("%v scanning: Marking globally deleted item as not locally changed: %v", f, file.Name) file.LocalFlags &^= protocol.FlagLocalReceiveOnly - if batch.Append(file.ConvertDeletedToFileInfo(), snap) { + if batch.Update(file.ConvertDeletedToFileInfo(), snap) { changes++ } } @@ -769,7 +797,7 @@ func (f *folder) scanSubdirsDeletedAndIgnored(subDirs []string, batch *scanBatch // deleted and just the folder type/local flags changed. file.LocalFlags &^= protocol.FlagLocalReceiveOnly l.Debugln("removing receive-only flag on deleted item", file) - if batch.Append(file.ConvertDeletedToFileInfo(), snap) { + if batch.Update(file.ConvertDeletedToFileInfo(), snap) { changes++ } } @@ -788,7 +816,7 @@ func (f *folder) scanSubdirsDeletedAndIgnored(subDirs []string, batch *scanBatch for _, file := range toIgnore { l.Debugln("marking file as ignored", f) nf := file.ConvertToIgnoredFileInfo() - if batch.Append(nf, snap) { + if batch.Update(nf, snap) { changes++ } if iterError = batch.FlushIfFull(); iterError != nil { diff --git a/lib/model/folder_recvonly_test.go b/lib/model/folder_recvonly_test.go index 9a48c78f23c..740a31202c1 100644 --- a/lib/model/folder_recvonly_test.go +++ b/lib/model/folder_recvonly_test.go @@ -37,9 +37,9 @@ func TestRecvOnlyRevertDeletes(t *testing.T) { for _, dir := range []string{".stfolder", "ignDir", "unknownDir"} { must(t, ffs.MkdirAll(dir, 0755)) } - must(t, writeFile(ffs, "ignDir/ignFile", []byte("hello\n"), 0644)) - must(t, writeFile(ffs, "unknownDir/unknownFile", []byte("hello\n"), 0644)) - must(t, writeFile(ffs, ".stignore", []byte("ignDir\n"), 0644)) + writeFilePerm(t, ffs, "ignDir/ignFile", []byte("hello\n"), 0644) + writeFilePerm(t, ffs, "unknownDir/unknownFile", []byte("hello\n"), 0644) + writeFilePerm(t, ffs, ".stignore", []byte("ignDir\n"), 0644) knownFiles := setupKnownFiles(t, ffs, []byte("hello\n")) @@ -151,7 +151,7 @@ func TestRecvOnlyRevertNeeds(t *testing.T) { // Update the file. newData := []byte("totally different data\n") - must(t, writeFile(ffs, "knownDir/knownFile", newData, 0644)) + writeFilePerm(t, ffs, "knownDir/knownFile", newData, 0644) // Rescan. @@ -241,8 +241,8 @@ func TestRecvOnlyUndoChanges(t *testing.T) { // Create a file and modify another const file = "foo" - must(t, writeFile(ffs, file, []byte("hello\n"), 0644)) - must(t, writeFile(ffs, "knownDir/knownFile", []byte("bye\n"), 0644)) + writeFilePerm(t, ffs, file, []byte("hello\n"), 0644) + writeFilePerm(t, ffs, "knownDir/knownFile", []byte("bye\n"), 0644) must(t, m.ScanFolder("ro")) @@ -254,7 +254,7 @@ func TestRecvOnlyUndoChanges(t *testing.T) { // Remove the file again and undo the modification must(t, ffs.Remove(file)) - must(t, writeFile(ffs, "knownDir/knownFile", oldData, 0644)) + writeFilePerm(t, ffs, "knownDir/knownFile", oldData, 0644) must(t, ffs.Chtimes("knownDir/knownFile", knownFiles[1].ModTime(), knownFiles[1].ModTime())) must(t, m.ScanFolder("ro")) @@ -377,8 +377,8 @@ func TestRecvOnlyRemoteUndoChanges(t *testing.T) { const file = "foo" knownFile := filepath.Join("knownDir", "knownFile") - must(t, writeFile(ffs, file, []byte("hello\n"), 0644)) - must(t, writeFile(ffs, knownFile, []byte("bye\n"), 0644)) + writeFilePerm(t, ffs, file, []byte("hello\n"), 0644) + writeFilePerm(t, ffs, knownFile, []byte("bye\n"), 0644) must(t, m.ScanFolder("ro")) @@ -434,7 +434,7 @@ func TestRecvOnlyRevertOwnID(t *testing.T) { must(t, ffs.MkdirAll(".stfolder", 0755)) data := []byte("hello\n") name := "foo" - must(t, writeFile(ffs, name, data, 0644)) + writeFilePerm(t, ffs, name, data, 0644) // Make sure the file is scanned and locally changed must(t, m.ScanFolder("ro")) @@ -484,7 +484,7 @@ func setupKnownFiles(t *testing.T, ffs fs.Filesystem, data []byte) []protocol.Fi t.Helper() must(t, ffs.MkdirAll("knownDir", 0755)) - must(t, writeFile(ffs, "knownDir/knownFile", data, 0644)) + writeFilePerm(t, ffs, "knownDir/knownFile", data, 0644) t0 := time.Now().Add(-1 * time.Minute) must(t, ffs.Chtimes("knownDir/knownFile", t0, t0)) @@ -541,18 +541,3 @@ func setupROFolder(t *testing.T) (*testModel, *receiveOnlyFolder, context.Cancel return m, f, cancel } - -func writeFile(fs fs.Filesystem, filename string, data []byte, perm fs.FileMode) error { - fd, err := fs.Create(filename) - if err != nil { - return err - } - _, err = fd.Write(data) - if err != nil { - return err - } - if err := fd.Close(); err != nil { - return err - } - return fs.Chmod(filename, perm) -} diff --git a/lib/model/folder_sendrecv_test.go b/lib/model/folder_sendrecv_test.go index 2894fe14f59..06bf7d6d79d 100644 --- a/lib/model/folder_sendrecv_test.go +++ b/lib/model/folder_sendrecv_test.go @@ -77,12 +77,10 @@ func setupFile(filename string, blockNumbers []int) protocol.FileInfo { } } -func createFile(t *testing.T, name string, fs fs.Filesystem) protocol.FileInfo { +func createEmptyFileInfo(t *testing.T, name string, fs fs.Filesystem) protocol.FileInfo { t.Helper() - f, err := fs.Create(name) - must(t, err) - f.Close() + writeFile(t, fs, name, nil) fi, err := fs.Stat(name) must(t, err) file, err := scanner.CreateFileInfo(fi, name, fs) @@ -913,7 +911,7 @@ func TestSRConflictReplaceFileByDir(t *testing.T) { name := "foo" // create local file - file := createFile(t, name, ffs) + file := createEmptyFileInfo(t, name, ffs) file.Version = protocol.Vector{}.Update(myID.Short()) f.updateLocalsFromScanning([]protocol.FileInfo{file}) @@ -945,7 +943,7 @@ func TestSRConflictReplaceFileByLink(t *testing.T) { name := "foo" // create local file - file := createFile(t, name, ffs) + file := createEmptyFileInfo(t, name, ffs) file.Version = protocol.Vector{}.Update(myID.Short()) f.updateLocalsFromScanning([]protocol.FileInfo{file}) @@ -983,7 +981,7 @@ func TestDeleteBehindSymlink(t *testing.T) { file := filepath.Join(link, "file") must(t, ffs.MkdirAll(link, 0755)) - fi := createFile(t, file, ffs) + fi := createEmptyFileInfo(t, file, ffs) f.updateLocalsFromScanning([]protocol.FileInfo{fi}) must(t, osutil.RenameOrCopy(fs.CopyRangeMethodStandard, ffs, destFs, file, "file")) must(t, ffs.RemoveAll(link)) @@ -1099,7 +1097,7 @@ func TestPullCaseOnlyPerformFinish(t *testing.T) { name := "foo" contents := []byte("contents") - must(t, writeFile(ffs, name, contents, 0644)) + writeFile(t, ffs, name, contents) must(t, f.scanSubdirs(nil)) var cur protocol.FileInfo @@ -1122,7 +1120,7 @@ func TestPullCaseOnlyPerformFinish(t *testing.T) { remote.Version = protocol.Vector{}.Update(device1.Short()) remote.Name = strings.ToUpper(cur.Name) temp := fs.TempName(remote.Name) - must(t, writeFile(ffs, temp, contents, 0644)) + writeFile(t, ffs, temp, contents) scanChan := make(chan string, 1) dbUpdateChan := make(chan dbUpdateJob, 1) diff --git a/lib/model/model.go b/lib/model/model.go index c1b3ddaa810..28a3a5469e8 100644 --- a/lib/model/model.go +++ b/lib/model/model.go @@ -1053,7 +1053,6 @@ func (m *model) RemoteNeedFolderFiles(folder string, device protocol.DeviceID, p func (m *model) LocalChangedFolderFiles(folder string, page, perpage int) ([]db.FileInfoTruncated, error) { m.fmut.RLock() rf, ok := m.folderFiles[folder] - cfg := m.folderCfgs[folder] m.fmut.RUnlock() if !ok { @@ -1071,11 +1070,10 @@ func (m *model) LocalChangedFolderFiles(folder string, page, perpage int) ([]db. } p := newPager(page, perpage) - recvEnc := cfg.Type == config.FolderTypeReceiveEncrypted files := make([]db.FileInfoTruncated, 0, perpage) snap.WithHaveTruncated(protocol.LocalDeviceID, func(f protocol.FileIntf) bool { - if !f.IsReceiveOnlyChanged() || (recvEnc && f.IsDeleted()) { + if !f.IsReceiveOnlyChanged() { return true } if p.skip() { diff --git a/lib/model/model_test.go b/lib/model/model_test.go index b665abc01d7..121bcdffeec 100644 --- a/lib/model/model_test.go +++ b/lib/model/model_test.go @@ -299,7 +299,7 @@ func BenchmarkRequestInSingleFile(b *testing.B) { mustRemove(b, defaultFs.RemoveAll("request")) defer func() { mustRemove(b, defaultFs.RemoveAll("request")) }() must(b, defaultFs.MkdirAll("request/for/a/file/in/a/couple/of/dirs", 0755)) - writeFile(defaultFs, "request/for/a/file/in/a/couple/of/dirs/128k", buf, 0644) + writeFile(b, defaultFs, "request/for/a/file/in/a/couple/of/dirs/128k", buf) b.ResetTimer() @@ -1489,7 +1489,7 @@ func TestIgnores(t *testing.T) { // Assure a clean start state mustRemove(t, defaultFs.RemoveAll(config.DefaultMarkerName)) mustRemove(t, defaultFs.MkdirAll(config.DefaultMarkerName, 0644)) - writeFile(defaultFs, ".stignore", []byte(".*\nquux\n"), 0644) + writeFile(t, defaultFs, ".stignore", []byte(".*\nquux\n")) m := setupModel(t, defaultCfgWrapper) defer cleanupModel(m) @@ -2030,8 +2030,8 @@ func benchmarkTree(b *testing.B, n1, n2 int) { func TestIssue3028(t *testing.T) { // Create two files that we'll delete, one with a name that is a prefix of the other. - must(t, writeFile(defaultFs, "testrm", []byte("Hello"), 0644)) - must(t, writeFile(defaultFs, "testrm2", []byte("Hello"), 0644)) + writeFile(t, defaultFs, "testrm", []byte("Hello")) + writeFile(t, defaultFs, "testrm2", []byte("Hello")) defer func() { mustRemove(t, defaultFs.Remove("testrm")) mustRemove(t, defaultFs.Remove("testrm2")) @@ -3403,7 +3403,7 @@ func TestRenameSequenceOrder(t *testing.T) { ffs := fcfg.Filesystem() for i := 0; i < numFiles; i++ { v := fmt.Sprintf("%d", i) - must(t, writeFile(ffs, v, []byte(v), 0644)) + writeFile(t, ffs, v, []byte(v)) } m.ScanFolders() @@ -3426,7 +3426,7 @@ func TestRenameSequenceOrder(t *testing.T) { continue } v := fmt.Sprintf("%d", i) - must(t, writeFile(ffs, v, []byte(v+"-new"), 0644)) + writeFile(t, ffs, v, []byte(v+"-new")) } // Rename must(t, ffs.Rename("3", "17")) @@ -3470,7 +3470,7 @@ func TestRenameSameFile(t *testing.T) { defer cleanupModel(m) ffs := fcfg.Filesystem() - must(t, writeFile(ffs, "file", []byte("file"), 0644)) + writeFile(t, ffs, "file", []byte("file")) m.ScanFolders() @@ -3522,8 +3522,8 @@ func TestRenameEmptyFile(t *testing.T) { ffs := fcfg.Filesystem() - must(t, writeFile(ffs, "file", []byte("data"), 0644)) - must(t, writeFile(ffs, "empty", nil, 0644)) + writeFile(t, ffs, "file", []byte("data")) + writeFile(t, ffs, "empty", nil) m.ScanFolders() @@ -3598,11 +3598,11 @@ func TestBlockListMap(t *testing.T) { defer cleanupModel(m) ffs := fcfg.Filesystem() - must(t, writeFile(ffs, "one", []byte("content"), 0644)) - must(t, writeFile(ffs, "two", []byte("content"), 0644)) - must(t, writeFile(ffs, "three", []byte("content"), 0644)) - must(t, writeFile(ffs, "four", []byte("content"), 0644)) - must(t, writeFile(ffs, "five", []byte("content"), 0644)) + writeFile(t, ffs, "one", []byte("content")) + writeFile(t, ffs, "two", []byte("content")) + writeFile(t, ffs, "three", []byte("content")) + writeFile(t, ffs, "four", []byte("content")) + writeFile(t, ffs, "five", []byte("content")) m.ScanFolders() @@ -3631,7 +3631,7 @@ func TestBlockListMap(t *testing.T) { // Modify must(t, ffs.Remove("two")) - must(t, writeFile(ffs, "two", []byte("mew-content"), 0644)) + writeFile(t, ffs, "two", []byte("mew-content")) // Rename must(t, ffs.Rename("three", "new-three")) @@ -3667,7 +3667,7 @@ func TestScanRenameCaseOnly(t *testing.T) { ffs := fcfg.Filesystem() name := "foo" - must(t, writeFile(ffs, name, []byte("contents"), 0644)) + writeFile(t, ffs, name, []byte("contents")) m.ScanFolders() @@ -3791,7 +3791,7 @@ func TestScanDeletedROChangedOnSR(t *testing.T) { name := "foo" - must(t, writeFile(ffs, name, []byte(name), 0644)) + writeFile(t, ffs, name, []byte(name)) m.ScanFolders() file, ok := m.testCurrentFolderFile(fcfg.ID, name) @@ -4255,6 +4255,46 @@ func TestPendingFolder(t *testing.T) { } } +func TestDeletedNotLocallyChangedReceiveOnly(t *testing.T) { + deletedNotLocallyChanged(t, config.FolderTypeReceiveOnly) +} + +func TestDeletedNotLocallyChangedReceiveEncrypted(t *testing.T) { + deletedNotLocallyChanged(t, config.FolderTypeReceiveEncrypted) +} + +func deletedNotLocallyChanged(t *testing.T, ft config.FolderType) { + w, fcfg, wCancel := tmpDefaultWrapper() + tfs := fcfg.Filesystem() + fcfg.Type = ft + setFolder(t, w, fcfg) + defer wCancel() + m := setupModel(t, w) + defer cleanupModelAndRemoveDir(m, tfs.URI()) + + name := "foo" + writeFile(t, tfs, name, nil) + must(t, m.ScanFolder(fcfg.ID)) + + fi, ok, err := m.CurrentFolderFile(fcfg.ID, name) + must(t, err) + if !ok { + t.Fatal("File hasn't been added") + } + if !fi.IsReceiveOnlyChanged() { + t.Fatal("File isn't receive-only-changed") + } + + must(t, tfs.Remove(name)) + must(t, m.ScanFolder(fcfg.ID)) + + _, ok, err = m.CurrentFolderFile(fcfg.ID, name) + must(t, err) + if ok { + t.Error("Expected file to be removed from db") + } +} + func equalStringsInAnyOrder(a, b []string) bool { if len(a) != len(b) { return false diff --git a/lib/model/requests_test.go b/lib/model/requests_test.go index a0c491d71b6..35df4fdd9e9 100644 --- a/lib/model/requests_test.go +++ b/lib/model/requests_test.go @@ -330,9 +330,7 @@ func pullInvalidIgnored(t *testing.T, ft config.FolderType) { fc.deleteFile(invDel) fc.addFile(ign, 0644, protocol.FileInfoTypeFile, contents) fc.addFile(ignExisting, 0644, protocol.FileInfoTypeFile, contents) - if err := writeFile(fss, ignExisting, otherContents, 0644); err != nil { - panic(err) - } + writeFile(t, fss, ignExisting, otherContents) done := make(chan struct{}) fc.setIndexFn(func(_ context.Context, folder string, fs []protocol.FileInfo) error { @@ -486,7 +484,7 @@ func TestRescanIfHaveInvalidContent(t *testing.T) { payload := []byte("hello") - must(t, writeFile(tfs, "foo", payload, 0777)) + writeFile(t, tfs, "foo", payload) received := make(chan []protocol.FileInfo) fc.setIndexFn(func(_ context.Context, _ string, fs []protocol.FileInfo) error { @@ -526,7 +524,7 @@ func TestRescanIfHaveInvalidContent(t *testing.T) { payload = []byte("bye") buf = make([]byte, len(payload)) - must(t, writeFile(tfs, "foo", payload, 0777)) + writeFile(t, tfs, "foo", payload) _, err = m.Request(device1, "default", "foo", 0, int32(len(payload)), 0, f.Blocks[0].Hash, f.Blocks[0].WeakHash, false) if err == nil { @@ -1066,9 +1064,7 @@ func TestIgnoreDeleteUnignore(t *testing.T) { return nil }) - if err := writeFile(fss, file, contents, 0644); err != nil { - panic(err) - } + writeFile(t, fss, file, contents) m.ScanFolders() select { @@ -1430,6 +1426,14 @@ func TestRequestReceiveEncrypted(t *testing.T) { // Simulate request from device that is untrusted too, i.e. with non-empty, but garbage hash _, err := m.Request(device1, fcfg.ID, name, 0, 1064, 0, []byte("garbage"), 0, false) must(t, err) + + changed, err := m.LocalChangedFolderFiles(fcfg.ID, 1, 10) + must(t, err) + if l := len(changed); l != 1 { + t.Errorf("Expected one locally changed file, got %v", l) + } else if changed[0].Name != files[0].Name { + t.Errorf("Expected %v, got %v", files[0].Name, changed[0].Name) + } } func TestRequestGlobalInvalidToValid(t *testing.T) { diff --git a/lib/model/testutils_test.go b/lib/model/testutils_test.go index 6c2a29071e6..4ee390f5d8e 100644 --- a/lib/model/testutils_test.go +++ b/lib/model/testutils_test.go @@ -435,3 +435,18 @@ func addDevice2(t testing.TB, w config.Wrapper, fcfg config.FolderConfiguration) must(t, err) waiter.Wait() } + +func writeFile(t testing.TB, filesystem fs.Filesystem, name string, data []byte) { + t.Helper() + fd, err := filesystem.Create(name) + must(t, err) + defer fd.Close() + _, err = fd.Write(data) + must(t, err) +} + +func writeFilePerm(t testing.TB, filesystem fs.Filesystem, name string, data []byte, perm fs.FileMode) { + t.Helper() + writeFile(t, filesystem, name, data) + must(t, filesystem.Chmod(name, perm)) +} From f1bf4d899a0853aefc1ec869df07ecbc54b49f01 Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Wed, 17 Nov 2021 11:42:20 +0100 Subject: [PATCH 010/220] lib/model: Correct handling of fakefs cache We looked under one cache key, then stored under another... --- lib/fs/fakefs.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/fs/fakefs.go b/lib/fs/fakefs.go index 4d75ab0f100..7bc356d98da 100644 --- a/lib/fs/fakefs.go +++ b/lib/fs/fakefs.go @@ -89,11 +89,9 @@ func newFakeFilesystem(rootURI string, _ ...Option) *fakeFS { fakeFSMut.Lock() defer fakeFSMut.Unlock() - root := rootURI var params url.Values uri, err := url.Parse(rootURI) if err == nil { - root = uri.Path params = uri.Query() } @@ -157,7 +155,7 @@ func newFakeFilesystem(rootURI string, _ ...Option) *fakeFS { // the filesystem initially. fs.latency, _ = time.ParseDuration(params.Get("latency")) - fakeFSCache[root] = fs + fakeFSCache[rootURI] = fs return fs } From 12fb7f2a0a58d720718df8d67bb959090d1e9ec2 Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Wed, 17 Nov 2021 12:10:06 +0100 Subject: [PATCH 011/220] lib/model: Correct "reverting folder" log entry --- lib/model/folder_recvonly.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/model/folder_recvonly.go b/lib/model/folder_recvonly.go index ee6f0c99a1f..827fbe5d863 100644 --- a/lib/model/folder_recvonly.go +++ b/lib/model/folder_recvonly.go @@ -68,7 +68,7 @@ func (f *receiveOnlyFolder) Revert() { } func (f *receiveOnlyFolder) revert() error { - l.Infof("Reverting folder %v", f.Description) + l.Infof("Reverting folder %v", f.Description()) f.setState(FolderScanning) defer f.setState(FolderIdle) From 100870e14232985962f2fcb73ad531f0e6eb9512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Colomb?= Date: Thu, 18 Nov 2021 22:57:59 +0100 Subject: [PATCH 012/220] cmd/syncthing: Implement generate as a subcommand with optional API credential setting (fixes #8021) (#8043) Accept a subcommand as an alternative to the --generate option. It accepts a custom config directory through either the --home or --config options, using the default location if neither is given. Add the options --gui-user and --gui-password to "generate", but not the "serve --generate" option form. If either is given, an existing config will not abort the command, but rather load, modify and save it with the new credentials. The password can be read from standard input by passing only a single dash as argument. Config modification is skipped if the value matches what's already in the config. * cmd/syncthing: Utilize lib/locations package in generate(). Instead of manually joining paths with "magic" file names, get them from the centralized locations helper lib. * cmd/syncthing: Simplify logging for --generate option. Visible change: No more timestamp prefixes. --- cmd/syncthing/cmdutil/options_common.go | 15 ++ cmd/syncthing/{ => cmdutil}/options_others.go | 4 +- .../{ => cmdutil}/options_windows.go | 4 +- cmd/syncthing/generate/generate.go | 144 ++++++++++++++++++ cmd/syncthing/main.go | 86 ++--------- lib/syncthing/utils.go | 23 +++ 6 files changed, 197 insertions(+), 79 deletions(-) create mode 100644 cmd/syncthing/cmdutil/options_common.go rename cmd/syncthing/{ => cmdutil}/options_others.go (86%) rename cmd/syncthing/{ => cmdutil}/options_windows.go (86%) create mode 100644 cmd/syncthing/generate/generate.go diff --git a/cmd/syncthing/cmdutil/options_common.go b/cmd/syncthing/cmdutil/options_common.go new file mode 100644 index 00000000000..34485e6a563 --- /dev/null +++ b/cmd/syncthing/cmdutil/options_common.go @@ -0,0 +1,15 @@ +// Copyright (C) 2021 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 cmdutil + +// CommonOptions are reused among several subcommands +type CommonOptions struct { + buildCommonOptions + ConfDir string `name:"config" placeholder:"PATH" help:"Set configuration directory (config and keys)"` + HomeDir string `name:"home" placeholder:"PATH" help:"Set configuration and data directory"` + NoDefaultFolder bool `env:"STNODEFAULTFOLDER" help:"Don't create the \"default\" folder on first startup"` +} diff --git a/cmd/syncthing/options_others.go b/cmd/syncthing/cmdutil/options_others.go similarity index 86% rename from cmd/syncthing/options_others.go rename to cmd/syncthing/cmdutil/options_others.go index b1f4764cadf..e299ba48cf9 100644 --- a/cmd/syncthing/options_others.go +++ b/cmd/syncthing/cmdutil/options_others.go @@ -7,8 +7,8 @@ //go:build !windows // +build !windows -package main +package cmdutil -type buildServeOptions struct { +type buildCommonOptions struct { HideConsole bool `hidden:""` } diff --git a/cmd/syncthing/options_windows.go b/cmd/syncthing/cmdutil/options_windows.go similarity index 86% rename from cmd/syncthing/options_windows.go rename to cmd/syncthing/cmdutil/options_windows.go index 38d26a22a1e..99fb50d5b96 100644 --- a/cmd/syncthing/options_windows.go +++ b/cmd/syncthing/cmdutil/options_windows.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/. -package main +package cmdutil -type buildServeOptions struct { +type buildCommonOptions struct { HideConsole bool `name:"no-console" help:"Hide console window"` } diff --git a/cmd/syncthing/generate/generate.go b/cmd/syncthing/generate/generate.go new file mode 100644 index 00000000000..8c5bd1323fe --- /dev/null +++ b/cmd/syncthing/generate/generate.go @@ -0,0 +1,144 @@ +// Copyright (C) 2021 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 generate implements the `syncthing generate` subcommand. +package generate + +import ( + "bufio" + "context" + "crypto/tls" + "fmt" + "log" + "os" + + "github.com/syncthing/syncthing/cmd/syncthing/cmdutil" + "github.com/syncthing/syncthing/lib/config" + "github.com/syncthing/syncthing/lib/events" + "github.com/syncthing/syncthing/lib/fs" + "github.com/syncthing/syncthing/lib/locations" + "github.com/syncthing/syncthing/lib/osutil" + "github.com/syncthing/syncthing/lib/protocol" + "github.com/syncthing/syncthing/lib/syncthing" +) + +type CLI struct { + cmdutil.CommonOptions + GUIUser string `placeholder:"STRING" help:"Specify new GUI authentication user name"` + GUIPassword string `placeholder:"STRING" help:"Specify new GUI authentication password (use - to read from standard input)"` +} + +func (c *CLI) Run() error { + log.SetFlags(0) + + if c.HideConsole { + osutil.HideConsole() + } + + if c.HomeDir != "" { + if c.ConfDir != "" { + return fmt.Errorf("--home must not be used together with --config") + } + c.ConfDir = c.HomeDir + } + if c.ConfDir == "" { + c.ConfDir = locations.GetBaseDir(locations.ConfigBaseDir) + } + + // Support reading the password from a pipe or similar + if c.GUIPassword == "-" { + reader := bufio.NewReader(os.Stdin) + password, _, err := reader.ReadLine() + if err != nil { + return fmt.Errorf("Failed reading GUI password: %w", err) + } + c.GUIPassword = string(password) + } + + if err := Generate(c.ConfDir, c.GUIUser, c.GUIPassword, c.NoDefaultFolder); err != nil { + return fmt.Errorf("Failed to generate config and keys: %w", err) + } + return nil +} + +func Generate(confDir, guiUser, guiPassword string, noDefaultFolder bool) error { + dir, err := fs.ExpandTilde(confDir) + if err != nil { + return err + } + + if err := syncthing.EnsureDir(dir, 0700); err != nil { + return err + } + locations.SetBaseDir(locations.ConfigBaseDir, dir) + + var myID protocol.DeviceID + certFile, keyFile := locations.Get(locations.CertFile), locations.Get(locations.KeyFile) + cert, err := tls.LoadX509KeyPair(certFile, keyFile) + if err == nil { + log.Println("WARNING: Key exists; will not overwrite.") + } else { + cert, err = syncthing.GenerateCertificate(certFile, keyFile) + if err != nil { + return fmt.Errorf("create certificate: %w", err) + } + } + myID = protocol.NewDeviceID(cert.Certificate[0]) + log.Println("Device ID:", myID) + + cfgFile := locations.Get(locations.ConfigFile) + var cfg config.Wrapper + if _, err := os.Stat(cfgFile); err == nil { + if guiUser == "" && guiPassword == "" { + log.Println("WARNING: Config exists; will not overwrite.") + return nil + } + + if cfg, _, err = config.Load(cfgFile, myID, events.NoopLogger); err != nil { + return fmt.Errorf("load config: %w", err) + } + } else { + if cfg, err = syncthing.DefaultConfig(cfgFile, myID, events.NoopLogger, noDefaultFolder); err != nil { + return fmt.Errorf("create config: %w", err) + } + } + + ctx, cancel := context.WithCancel(context.Background()) + go cfg.Serve(ctx) + defer cancel() + + var updateErr error + waiter, err := cfg.Modify(func(cfg *config.Configuration) { + updateErr = updateGUIAuthentication(&cfg.GUI, guiUser, guiPassword) + }) + if err != nil { + return fmt.Errorf("modify config: %w", err) + } + + waiter.Wait() + if updateErr != nil { + return updateErr + } + if err := cfg.Save(); err != nil { + return fmt.Errorf("save config: %w", err) + } + return nil +} + +func updateGUIAuthentication(guiCfg *config.GUIConfiguration, guiUser, guiPassword string) error { + if guiUser != "" && guiCfg.User != guiUser { + guiCfg.User = guiUser + log.Println("Updated GUI authentication user name:", guiUser) + } + + if guiPassword != "" && guiCfg.Password != guiPassword { + if err := guiCfg.HashAndSetPassword(guiPassword); err != nil { + return fmt.Errorf("Failed to set GUI authentication password: %w", err) + } + log.Println("Updated GUI authentication password.") + } + return nil +} diff --git a/cmd/syncthing/main.go b/cmd/syncthing/main.go index 21a8fbe6bc5..127fcc54ff5 100644 --- a/cmd/syncthing/main.go +++ b/cmd/syncthing/main.go @@ -36,6 +36,7 @@ import ( "github.com/syncthing/syncthing/cmd/syncthing/cli" "github.com/syncthing/syncthing/cmd/syncthing/cmdutil" "github.com/syncthing/syncthing/cmd/syncthing/decrypt" + "github.com/syncthing/syncthing/cmd/syncthing/generate" "github.com/syncthing/syncthing/lib/build" "github.com/syncthing/syncthing/lib/config" "github.com/syncthing/syncthing/lib/db" @@ -132,32 +133,30 @@ var ( // commands and options here are top level commands to syncthing. // Cli is just a placeholder for the help text (see main). var entrypoint struct { - Serve serveOptions `cmd:"" help:"Run Syncthing"` - Decrypt decrypt.CLI `cmd:"" help:"Decrypt or verify an encrypted folder"` - Cli struct{} `cmd:"" help:"Command line interface for Syncthing"` + Serve serveOptions `cmd:"" help:"Run Syncthing"` + Generate generate.CLI `cmd:"" help:"Generate key and config, then exit"` + Decrypt decrypt.CLI `cmd:"" help:"Decrypt or verify an encrypted folder"` + Cli struct{} `cmd:"" help:"Command line interface for Syncthing"` } // serveOptions are the options for the `syncthing serve` command. type serveOptions struct { - buildServeOptions + cmdutil.CommonOptions AllowNewerConfig bool `help:"Allow loading newer than current config version"` Audit bool `help:"Write events to audit file"` AuditFile string `name:"auditfile" placeholder:"PATH" help:"Specify audit file (use \"-\" for stdout, \"--\" for stderr)"` BrowserOnly bool `help:"Open GUI in browser"` - ConfDir string `name:"config" placeholder:"PATH" help:"Set configuration directory (config and keys)"` DataDir string `name:"data" placeholder:"PATH" help:"Set data directory (database and logs)"` DeviceID bool `help:"Show the device ID"` - GenerateDir string `name:"generate" placeholder:"PATH" help:"Generate key and config in specified dir, then exit"` + GenerateDir string `name:"generate" placeholder:"PATH" help:"Generate key and config in specified dir, then exit"` //DEPRECATED: replaced by subcommand! GUIAddress string `name:"gui-address" placeholder:"URL" help:"Override GUI address (e.g. \"http://192.0.2.42:8443\")"` GUIAPIKey string `name:"gui-apikey" placeholder:"API-KEY" help:"Override GUI API key"` - HomeDir string `name:"home" placeholder:"PATH" help:"Set configuration and data directory"` LogFile string `name:"logfile" default:"${logFile}" placeholder:"PATH" help:"Log file name (see below)"` LogFlags int `name:"logflags" default:"${logFlags}" placeholder:"BITS" help:"Select information in log line prefix (see below)"` LogMaxFiles int `placeholder:"N" default:"${logMaxFiles}" name:"log-max-old-files" help:"Number of old files to keep (zero to keep only current)"` LogMaxSize int `placeholder:"BYTES" default:"${logMaxSize}" help:"Maximum size of any file (zero to disable log rotation)"` NoBrowser bool `help:"Do not start browser"` NoRestart bool `env:"STNORESTART" help:"Do not restart Syncthing when exiting due to API/GUI command, upgrade, or crash"` - NoDefaultFolder bool `env:"STNODEFAULTFOLDER" help:"Don't create the \"default\" folder on first startup"` NoUpgrade bool `env:"STNOUPGRADE" help:"Disable automatic upgrades"` Paths bool `help:"Show configuration paths"` Paused bool `help:"Start with all devices and folders paused"` @@ -339,7 +338,7 @@ func (options serveOptions) Run() error { } if options.GenerateDir != "" { - if err := generate(options.GenerateDir, options.NoDefaultFolder); err != nil { + if err := generate.Generate(options.GenerateDir, "", "", options.NoDefaultFolder); err != nil { l.Warnln("Failed to generate config and keys:", err) os.Exit(svcutil.ExitError.AsInt()) } @@ -347,7 +346,7 @@ func (options serveOptions) Run() error { } // Ensure that our home directory exists. - if err := ensureDir(locations.GetBaseDir(locations.ConfigBaseDir), 0700); err != nil { + if err := syncthing.EnsureDir(locations.GetBaseDir(locations.ConfigBaseDir), 0700); err != nil { l.Warnln("Failure on home directory:", err) os.Exit(svcutil.ExitError.AsInt()) } @@ -413,8 +412,8 @@ func openGUI(myID protocol.DeviceID) error { if err != nil { return err } - if cfg.GUI().Enabled { - if err := openURL(cfg.GUI().URL()); err != nil { + if guiCfg := cfg.GUI(); guiCfg.Enabled { + if err := openURL(guiCfg.URL()); err != nil { return err } } else { @@ -423,46 +422,6 @@ func openGUI(myID protocol.DeviceID) error { return nil } -func generate(generateDir string, noDefaultFolder bool) error { - dir, err := fs.ExpandTilde(generateDir) - if err != nil { - return err - } - - if err := ensureDir(dir, 0700); err != nil { - return err - } - - var myID protocol.DeviceID - certFile, keyFile := filepath.Join(dir, "cert.pem"), filepath.Join(dir, "key.pem") - cert, err := tls.LoadX509KeyPair(certFile, keyFile) - if err == nil { - l.Warnln("Key exists; will not overwrite.") - } else { - cert, err = syncthing.GenerateCertificate(certFile, keyFile) - if err != nil { - return errors.Wrap(err, "create certificate") - } - } - myID = protocol.NewDeviceID(cert.Certificate[0]) - l.Infoln("Device ID:", myID) - - cfgFile := filepath.Join(dir, "config.xml") - if _, err := os.Stat(cfgFile); err == nil { - l.Warnln("Config exists; will not overwrite.") - return nil - } - cfg, err := syncthing.DefaultConfig(cfgFile, myID, events.NoopLogger, noDefaultFolder) - if err != nil { - return err - } - err = cfg.Save() - if err != nil { - return errors.Wrap(err, "save config") - } - return nil -} - func debugFacilities() string { facilities := l.Facilities() @@ -800,29 +759,6 @@ func resetDB() error { return os.RemoveAll(locations.Get(locations.Database)) } -func ensureDir(dir string, mode fs.FileMode) error { - fs := fs.NewFilesystem(fs.FilesystemTypeBasic, dir) - err := fs.MkdirAll(".", mode) - if err != nil { - return err - } - - if fi, err := fs.Stat("."); err == nil { - // Apprently the stat may fail even though the mkdirall passed. If it - // does, we'll just assume things are in order and let other things - // fail (like loading or creating the config...). - currentMode := fi.Mode() & 0777 - if currentMode != mode { - err := fs.Chmod(".", mode) - // This can fail on crappy filesystems, nothing we can do about it. - if err != nil { - l.Warnln(err) - } - } - } - return nil -} - func standbyMonitor(app *syncthing.App, cfg config.Wrapper) { restartDelay := 60 * time.Second now := time.Now() diff --git a/lib/syncthing/utils.go b/lib/syncthing/utils.go index 468e94a045a..eecb563942f 100644 --- a/lib/syncthing/utils.go +++ b/lib/syncthing/utils.go @@ -24,6 +24,29 @@ import ( "github.com/syncthing/syncthing/lib/tlsutil" ) +func EnsureDir(dir string, mode fs.FileMode) error { + fs := fs.NewFilesystem(fs.FilesystemTypeBasic, dir) + err := fs.MkdirAll(".", mode) + if err != nil { + return err + } + + if fi, err := fs.Stat("."); err == nil { + // Apprently the stat may fail even though the mkdirall passed. If it + // does, we'll just assume things are in order and let other things + // fail (like loading or creating the config...). + currentMode := fi.Mode() & 0777 + if currentMode != mode { + err := fs.Chmod(".", mode) + // This can fail on crappy filesystems, nothing we can do about it. + if err != nil { + l.Warnln(err) + } + } + } + return nil +} + func LoadOrGenerateCertificate(certFile, keyFile string) (tls.Certificate, error) { cert, err := tls.LoadX509KeyPair(certFile, keyFile) if err != nil { From 8265dac1272b3690529bb2b532f82cda4fc43cc8 Mon Sep 17 00:00:00 2001 From: greatroar <61184462+greatroar@users.noreply.github.com> Date: Mon, 22 Nov 2021 08:29:44 +0100 Subject: [PATCH 013/220] lib/nat: Fix race condition in Mapping (#8042) The locking protocol in nat.Mapping was racy: * Mapping.addressMap RLock'd, but then returned a map shared between caller and Mapping, so the lock didn't do anything. * Operations inside Service.{verifyExistingMappings,acquireNewMappings} would lock the map for every update, but that means callers to Mapping.ExternalAddresses can be looping over the map while the Service methods are concurrently modifying it. When the Go runtime detects that happening, it panics. * Mapping.expires was read and updated without locking. The Service methods now lock the map once and release the lock only when done. Also, subscribers no longer get the added and removed addresses, because none of them were using the information. This was changed for a previous attempt to retain the fine-grained locking and not reverted because it simplifies the code. --- cmd/strelaysrv/main.go | 2 +- lib/connections/tcp_listen.go | 2 +- lib/nat/service.go | 66 ++++++++++++++++------------------- lib/nat/structs.go | 34 ++++++------------ 4 files changed, 43 insertions(+), 61 deletions(-) diff --git a/cmd/strelaysrv/main.go b/cmd/strelaysrv/main.go index fea34ccd440..507b3e6c01b 100644 --- a/cmd/strelaysrv/main.go +++ b/cmd/strelaysrv/main.go @@ -200,7 +200,7 @@ func main() { go natSvc.Serve(ctx) defer cancel() found := make(chan struct{}) - mapping.OnChanged(func(_ *nat.Mapping, _, _ []nat.Address) { + mapping.OnChanged(func() { select { case found <- struct{}{}: default: diff --git a/lib/connections/tcp_listen.go b/lib/connections/tcp_listen.go index 54b833a7723..13a0713343b 100644 --- a/lib/connections/tcp_listen.go +++ b/lib/connections/tcp_listen.go @@ -76,7 +76,7 @@ func (t *tcpListener) serve(ctx context.Context) error { defer l.Infof("TCP listener (%v) shutting down", tcaddr) mapping := t.natService.NewMapping(nat.TCP, tcaddr.IP, tcaddr.Port) - mapping.OnChanged(func(_ *nat.Mapping, _, _ []nat.Address) { + mapping.OnChanged(func() { t.notifyAddressesChanged(t) }) // Should be called after t.mapping is nil'ed out. diff --git a/lib/nat/service.go b/lib/nat/service.go index 4c0269c48ec..0785879616a 100644 --- a/lib/nat/service.go +++ b/lib/nat/service.go @@ -125,11 +125,15 @@ func (s *Service) process(ctx context.Context) (int, time.Duration) { s.mut.RLock() for _, mapping := range s.mappings { - if mapping.expires.Before(time.Now()) { + mapping.mut.RLock() + expires := mapping.expires + mapping.mut.RUnlock() + + if expires.Before(time.Now()) { toRenew = append(toRenew, mapping) } else { toUpdate = append(toUpdate, mapping) - mappingRenewIn := time.Until(mapping.expires) + mappingRenewIn := time.Until(expires) if mappingRenewIn < renewIn { renewIn = mappingRenewIn } @@ -206,41 +210,36 @@ func (s *Service) RemoveMapping(mapping *Mapping) { // Optionally takes renew flag which indicates whether or not we should renew // mappings with existing natds func (s *Service) updateMapping(ctx context.Context, mapping *Mapping, nats map[string]Device, renew bool) { - var added, removed []Address - renewalTime := time.Duration(s.cfg.Options().NATRenewalM) * time.Minute - mapping.expires = time.Now().Add(renewalTime) - newAdded, newRemoved := s.verifyExistingMappings(ctx, mapping, nats, renew) - added = append(added, newAdded...) - removed = append(removed, newRemoved...) + mapping.mut.Lock() - newAdded, newRemoved = s.acquireNewMappings(ctx, mapping, nats) - added = append(added, newAdded...) - removed = append(removed, newRemoved...) + mapping.expires = time.Now().Add(renewalTime) + change := s.verifyExistingLocked(ctx, mapping, nats, renew) + add := s.acquireNewLocked(ctx, mapping, nats) - if len(added) > 0 || len(removed) > 0 { - mapping.notify(added, removed) + mapping.mut.Unlock() + + if change || add { + mapping.notify() } } -func (s *Service) verifyExistingMappings(ctx context.Context, mapping *Mapping, nats map[string]Device, renew bool) ([]Address, []Address) { - var added, removed []Address - +func (s *Service) verifyExistingLocked(ctx context.Context, mapping *Mapping, nats map[string]Device, renew bool) (change bool) { leaseTime := time.Duration(s.cfg.Options().NATLeaseM) * time.Minute - for id, address := range mapping.addressMap() { + for id, address := range mapping.extAddresses { select { case <-ctx.Done(): - return nil, nil + return false default: } // Delete addresses for NATDevice's that do not exist anymore nat, ok := nats[id] if !ok { - mapping.removeAddress(id) - removed = append(removed, address) + mapping.removeAddressLocked(id) + change = true continue } else if renew { // Only perform renewals on the nat's that have the right local IP @@ -256,35 +255,32 @@ func (s *Service) verifyExistingMappings(ctx context.Context, mapping *Mapping, addr, err := s.tryNATDevice(ctx, nat, mapping.address.Port, address.Port, leaseTime) if err != nil { l.Debugf("Failed to renew %s -> mapping on %s", mapping, address, id) - mapping.removeAddress(id) - removed = append(removed, address) + mapping.removeAddressLocked(id) + change = true continue } l.Debugf("Renewed %s -> %s mapping on %s", mapping, address, id) if !addr.Equal(address) { - mapping.removeAddress(id) - mapping.setAddress(id, addr) - removed = append(removed, address) - added = append(added, address) + mapping.removeAddressLocked(id) + mapping.setAddressLocked(id, addr) + change = true } } } - return added, removed + return change } -func (s *Service) acquireNewMappings(ctx context.Context, mapping *Mapping, nats map[string]Device) ([]Address, []Address) { - var added, removed []Address - +func (s *Service) acquireNewLocked(ctx context.Context, mapping *Mapping, nats map[string]Device) (change bool) { leaseTime := time.Duration(s.cfg.Options().NATLeaseM) * time.Minute - addrMap := mapping.addressMap() + addrMap := mapping.extAddresses for id, nat := range nats { select { case <-ctx.Done(): - return nil, nil + return false default: } @@ -310,11 +306,11 @@ func (s *Service) acquireNewMappings(ctx context.Context, mapping *Mapping, nats l.Debugf("Acquired %s -> %s mapping on %s", mapping, addr, id) - mapping.setAddress(id, addr) - added = append(added, addr) + mapping.setAddressLocked(id, addr) + change = true } - return added, removed + return change } // tryNATDevice tries to acquire a port mapping for the given internal address to diff --git a/lib/nat/structs.go b/lib/nat/structs.go index 32dae4a5f2c..29be5b8d154 100644 --- a/lib/nat/structs.go +++ b/lib/nat/structs.go @@ -14,7 +14,7 @@ import ( "github.com/syncthing/syncthing/lib/sync" ) -type MappingChangeSubscriber func(*Mapping, []Address, []Address) +type MappingChangeSubscriber func() type Mapping struct { protocol Protocol @@ -26,55 +26,41 @@ type Mapping struct { mut sync.RWMutex } -func (m *Mapping) setAddress(id string, address Address) { - m.mut.Lock() - if existing, ok := m.extAddresses[id]; !ok || !existing.Equal(address) { - l.Infof("New NAT port mapping: external %s address %s to local address %s.", m.protocol, address, m.address) - m.extAddresses[id] = address - } - m.mut.Unlock() +func (m *Mapping) setAddressLocked(id string, address Address) { + l.Infof("New NAT port mapping: external %s address %s to local address %s.", m.protocol, address, m.address) + m.extAddresses[id] = address } -func (m *Mapping) removeAddress(id string) { - m.mut.Lock() +func (m *Mapping) removeAddressLocked(id string) { addr, ok := m.extAddresses[id] if ok { l.Infof("Removing NAT port mapping: external %s address %s, NAT %s is no longer available.", m.protocol, addr, id) delete(m.extAddresses, id) } - m.mut.Unlock() } func (m *Mapping) clearAddresses() { m.mut.Lock() - var removed []Address + change := len(m.extAddresses) > 0 for id, addr := range m.extAddresses { l.Debugf("Clearing mapping %s: ID: %s Address: %s", m, id, addr) - removed = append(removed, addr) delete(m.extAddresses, id) } m.expires = time.Time{} m.mut.Unlock() - if len(removed) > 0 { - m.notify(nil, removed) + if change { + m.notify() } } -func (m *Mapping) notify(added, removed []Address) { +func (m *Mapping) notify() { m.mut.RLock() for _, subscriber := range m.subscribers { - subscriber(m, added, removed) + subscriber() } m.mut.RUnlock() } -func (m *Mapping) addressMap() map[string]Address { - m.mut.RLock() - addrMap := m.extAddresses - m.mut.RUnlock() - return addrMap -} - func (m *Mapping) Protocol() Protocol { return m.protocol } From e2288fe441820794c983c3036829fd52c37ae1ea Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Mon, 22 Nov 2021 08:31:03 +0100 Subject: [PATCH 014/220] lib/relay: Send SNI when the address is a host name (fixes #8014) (#8015) --- lib/relay/client/static.go | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/relay/client/static.go b/lib/relay/client/static.go index 1f5cdb18547..a49768b84e9 100644 --- a/lib/relay/client/static.go +++ b/lib/relay/client/static.go @@ -141,7 +141,17 @@ func (c *staticClient) connect(ctx context.Context) error { return err } - conn := tls.Client(tcpConn, c.config) + // Copy the TLS config and set the server name we're connecting to. In + // many cases this will be an IP address, in which case it's a no-op. In + // other cases it will be a hostname, which will cause the TLS stack to + // send SNI. + cfg := c.config + if host, _, err := net.SplitHostPort(c.uri.Host); err == nil { + cfg = cfg.Clone() + cfg.ServerName = host + } + + conn := tls.Client(tcpConn, cfg) if err := conn.SetDeadline(time.Now().Add(c.connectTimeout)); err != nil { conn.Close() From bf89bffb0b844cfafc8a38467870157e52e6f198 Mon Sep 17 00:00:00 2001 From: greatroar <61184462+greatroar@users.noreply.github.com> Date: Mon, 22 Nov 2021 08:45:29 +0100 Subject: [PATCH 015/220] lib/config: Decouple VerifyConfiguration from Committer (#7939) ... and remove 8/10 implementations, which were no-ops. This saves code and time copying configurations. --- lib/api/api.go | 2 ++ lib/config/wrapper.go | 23 ++++++++++++++++------- lib/connections/limiter.go | 4 ---- lib/connections/service.go | 4 ---- lib/discover/manager.go | 4 ---- lib/model/model.go | 2 ++ lib/model/progressemitter.go | 5 ----- lib/nat/service.go | 4 ---- lib/ur/failurereporting.go | 4 ---- lib/ur/usage_report.go | 4 ---- lib/watchaggregator/aggregator.go | 4 ---- 11 files changed, 20 insertions(+), 40 deletions(-) diff --git a/lib/api/api.go b/lib/api/api.go index 360e94212c6..6ba4235f347 100644 --- a/lib/api/api.go +++ b/lib/api/api.go @@ -94,6 +94,8 @@ type service struct { systemLog logger.Recorder } +var _ config.Verifier = &service{} + type Service interface { suture.Service config.Committer diff --git a/lib/config/wrapper.go b/lib/config/wrapper.go index 3482b135a81..4d5c8f93ccf 100644 --- a/lib/config/wrapper.go +++ b/lib/config/wrapper.go @@ -31,14 +31,14 @@ const ( var errTooManyModifications = errors.New("too many concurrent config modifications") -// The Committer interface is implemented by objects that need to know about -// or have a say in configuration changes. +// The Committer and Verifier interfaces are implemented by objects +// that need to know about or have a say in configuration changes. // // When the configuration is about to be changed, VerifyConfiguration() is -// called for each subscribing object, with the old and new configuration. A -// nil error is returned if the new configuration is acceptable (i.e. does not -// contain any errors that would prevent it from being a valid config). -// Otherwise an error describing the problem is returned. +// called for each subscribing object that implements it, with copies of the +// old and new configuration. A nil error is returned if the new configuration +// is acceptable (i.e., does not contain any errors that would prevent it from +// being a valid config). Otherwise an error describing the problem is returned. // // If any subscriber returns an error from VerifyConfiguration(), the // configuration change is not committed and an error is returned to whoever @@ -55,11 +55,16 @@ var errTooManyModifications = errors.New("too many concurrent config modificatio // configuration (e.g. calling Wrapper.SetFolder), that are also acquired in any // methods of the Committer interface. type Committer interface { - VerifyConfiguration(from, to Configuration) error CommitConfiguration(from, to Configuration) (handled bool) String() string } +// A Verifier can determine if a new configuration is acceptable. +// See the description for Committer, above. +type Verifier interface { + VerifyConfiguration(from, to Configuration) error +} + // Waiter allows to wait for the given config operation to complete. type Waiter interface { Wait() @@ -300,6 +305,10 @@ func (w *wrapper) replaceLocked(to Configuration) (Waiter, error) { } for _, sub := range w.subs { + sub, ok := sub.(Verifier) + if !ok { + continue + } l.Debugln(sub, "verifying configuration") if err := sub.VerifyConfiguration(from.Copy(), to.Copy()); err != nil { l.Debugln(sub, "rejected config:", err) diff --git a/lib/connections/limiter.go b/lib/connections/limiter.go index eac63d70e1b..66331c221f7 100644 --- a/lib/connections/limiter.go +++ b/lib/connections/limiter.go @@ -122,10 +122,6 @@ func (lim *limiter) processDevicesConfigurationLocked(from, to config.Configurat } } -func (lim *limiter) VerifyConfiguration(from, to config.Configuration) error { - return nil -} - func (lim *limiter) CommitConfiguration(from, to config.Configuration) bool { // to ensure atomic update of configuration lim.mu.Lock() diff --git a/lib/connections/service.go b/lib/connections/service.go index 3848b261685..24a6f142045 100644 --- a/lib/connections/service.go +++ b/lib/connections/service.go @@ -706,10 +706,6 @@ func (s *service) logListenAddressesChangedEvent(l ListenerAddresses) { }) } -func (s *service) VerifyConfiguration(from, to config.Configuration) error { - return nil -} - func (s *service) CommitConfiguration(from, to config.Configuration) bool { newDevices := make(map[protocol.DeviceID]bool, len(to.Devices)) for _, dev := range to.Devices { diff --git a/lib/discover/manager.go b/lib/discover/manager.go index ec43e889cbd..686d673104c 100644 --- a/lib/discover/manager.go +++ b/lib/discover/manager.go @@ -227,10 +227,6 @@ func (m *manager) Cache() map[protocol.DeviceID]CacheEntry { return res } -func (m *manager) VerifyConfiguration(_, _ config.Configuration) error { - return nil -} - func (m *manager) CommitConfiguration(_, to config.Configuration) (handled bool) { m.mut.Lock() defer m.mut.Unlock() diff --git a/lib/model/model.go b/lib/model/model.go index 28a3a5469e8..e722a90cc19 100644 --- a/lib/model/model.go +++ b/lib/model/model.go @@ -168,6 +168,8 @@ type model struct { foldersRunning int32 } +var _ config.Verifier = &model{} + type folderFactory func(*model, *db.FileSet, *ignore.Matcher, config.FolderConfiguration, versioner.Versioner, events.Logger, *util.Semaphore) service var ( diff --git a/lib/model/progressemitter.go b/lib/model/progressemitter.go index 56bf92e27ce..fab9e72c96a 100644 --- a/lib/model/progressemitter.go +++ b/lib/model/progressemitter.go @@ -212,11 +212,6 @@ func (t *ProgressEmitter) computeProgressUpdates() []progressUpdate { return progressUpdates } -// VerifyConfiguration implements the config.Committer interface -func (t *ProgressEmitter) VerifyConfiguration(from, to config.Configuration) error { - return nil -} - // CommitConfiguration implements the config.Committer interface func (t *ProgressEmitter) CommitConfiguration(_, to config.Configuration) bool { t.mut.Lock() diff --git a/lib/nat/service.go b/lib/nat/service.go index 0785879616a..5e2f1c704e1 100644 --- a/lib/nat/service.go +++ b/lib/nat/service.go @@ -45,10 +45,6 @@ func NewService(id protocol.DeviceID, cfg config.Wrapper) *Service { return s } -func (s *Service) VerifyConfiguration(from, to config.Configuration) error { - return nil -} - func (s *Service) CommitConfiguration(from, to config.Configuration) bool { s.mut.Lock() if !s.enabled && to.Options.NATEnabled { diff --git a/lib/ur/failurereporting.go b/lib/ur/failurereporting.go index 899bd0e303c..f8d4d88507b 100644 --- a/lib/ur/failurereporting.go +++ b/lib/ur/failurereporting.go @@ -188,10 +188,6 @@ func (h *failureHandler) addReport(data FailureData, evTime time.Time) { } } -func (h *failureHandler) VerifyConfiguration(_, _ config.Configuration) error { - return nil -} - func (h *failureHandler) CommitConfiguration(from, to config.Configuration) bool { if from.Options.CREnabled != to.Options.CREnabled || from.Options.CRURL != to.Options.CRURL { h.optsChan <- to.Options diff --git a/lib/ur/usage_report.go b/lib/ur/usage_report.go index a2d2b0923a5..f6537f20f8a 100644 --- a/lib/ur/usage_report.go +++ b/lib/ur/usage_report.go @@ -390,10 +390,6 @@ func (s *Service) Serve(ctx context.Context) error { } } -func (s *Service) VerifyConfiguration(from, to config.Configuration) error { - return nil -} - func (s *Service) CommitConfiguration(from, to config.Configuration) bool { if from.Options.URAccepted != to.Options.URAccepted || from.Options.URUniqueID != to.Options.URUniqueID || from.Options.URURL != to.Options.URURL { select { diff --git a/lib/watchaggregator/aggregator.go b/lib/watchaggregator/aggregator.go index 93a38c4bad4..5c176fde8c5 100644 --- a/lib/watchaggregator/aggregator.go +++ b/lib/watchaggregator/aggregator.go @@ -419,10 +419,6 @@ func (a *aggregator) String() string { return fmt.Sprintf("aggregator/%s:", a.folderCfg.Description()) } -func (a *aggregator) VerifyConfiguration(from, to config.Configuration) error { - return nil -} - func (a *aggregator) CommitConfiguration(from, to config.Configuration) bool { for _, folderCfg := range to.Folders { if folderCfg.ID == a.folderID { From 4b750b6dc3dc9904c6046d1c6370b57e1710cb4b Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Mon, 22 Nov 2021 08:59:47 +0100 Subject: [PATCH 016/220] all: Remove usage of deprecated io/ioutil (#7971) As of Go 1.16 io/ioutil is deprecated. This replaces usage with the corresponding functions in package os and package io. --- build.go | 13 +++++------ cmd/stcrashreceiver/main.go | 3 +-- cmd/stcrashreceiver/sentry.go | 4 ++-- cmd/stcrashreceiver/sentry_test.go | 4 ++-- cmd/stcrashreceiver/sourcecodeloader.go | 4 ++-- cmd/stcrashreceiver/stcrashreceiver.go | 5 ++-- cmd/stcrashreceiver/util.go | 4 ++-- cmd/strelaypoolsrv/main.go | 7 +++--- cmd/strelaysrv/pool.go | 4 ++-- cmd/stsigtool/main.go | 7 +++--- cmd/syncthing/cli/main.go | 4 ++-- cmd/syncthing/cli/utils.go | 4 ++-- cmd/syncthing/crash_reporting.go | 3 +-- cmd/syncthing/decrypt/decrypt.go | 4 ++-- cmd/syncthing/main.go | 3 +-- cmd/syncthing/monitor_test.go | 7 +++--- cmd/ursrv/main.go | 5 ++-- lib/api/api.go | 15 ++++++------ lib/api/api_test.go | 13 +++++------ lib/api/auto/auto_test.go | 4 ++-- lib/api/confighandler.go | 3 +-- lib/assets/assets_test.go | 5 ++-- lib/config/config.go | 3 +-- lib/config/config_test.go | 9 ++++--- lib/discover/global.go | 3 +-- lib/discover/global_test.go | 4 ++-- lib/fs/basicfs_test.go | 3 +-- lib/fs/basicfs_watch_test.go | 3 +-- lib/fs/fakefs.go | 3 +-- lib/fs/fakefs_test.go | 13 +++++------ lib/fs/filesystem_copy_range_test.go | 5 ++-- lib/fs/mtimefs_test.go | 17 +++++++------- lib/ignore/ignore_test.go | 13 +++++------ lib/logger/logger.go | 3 +-- lib/logger/logger_test.go | 6 ++--- lib/model/folder_sendrecv_test.go | 5 ++-- lib/model/model_test.go | 9 ++++--- lib/model/requests_test.go | 5 ++-- lib/model/testutils_test.go | 5 ++-- lib/nat/structs_test.go | 3 +-- lib/osutil/atomic.go | 2 +- lib/osutil/atomic_test.go | 11 ++++----- lib/osutil/atomic_unix_test.go | 3 +-- lib/osutil/osutil_test.go | 8 +++---- lib/osutil/traversessymlink_test.go | 5 ++-- lib/protocol/protocol_test.go | 6 ++--- lib/rc/rc.go | 3 +-- lib/scanner/walk_test.go | 7 +++--- lib/syncthing/syncthing_test.go | 3 +-- lib/syncthing/utils.go | 5 ++-- lib/upgrade/upgrade_supported.go | 7 +++--- lib/upnp/upnp.go | 4 ++-- lib/versioner/external_test.go | 3 +-- lib/versioner/simple_test.go | 4 ++-- lib/versioner/staggered_test.go | 6 ++--- lib/versioner/trashcan_test.go | 9 +++---- lib/versioner/versioner_test.go | 3 +-- lib/weakhash/weakhash_test.go | 3 +-- script/authors.go | 6 ++--- script/commit-msg.go | 3 +-- script/genassets.go | 3 +-- script/prune_mocks.go | 3 +-- script/transifexdl.go | 4 ++-- test/conflict_test.go | 31 ++++++++++++------------- test/delay_scan_test.go | 4 ++-- test/http_test.go | 9 +++---- test/ignore_test.go | 5 ++-- test/override_test.go | 16 ++++++------- test/parallell_scan_test.go | 4 ++-- test/reset_test.go | 3 +-- test/util.go | 5 ++-- 71 files changed, 190 insertions(+), 235 deletions(-) diff --git a/build.go b/build.go index 791ca9a41e1..2a480a5464d 100644 --- a/build.go +++ b/build.go @@ -20,7 +20,6 @@ import ( "flag" "fmt" "io" - "io/ioutil" "log" "os" "os/exec" @@ -723,7 +722,7 @@ func shouldBuildSyso(dir string) (string, error) { } jsonPath := filepath.Join(dir, "versioninfo.json") - err = ioutil.WriteFile(jsonPath, bs, 0644) + err = os.WriteFile(jsonPath, bs, 0644) if err != nil { return "", errors.New("failed to create " + jsonPath + ": " + err.Error()) } @@ -762,12 +761,12 @@ func shouldCleanupSyso(sysoFilePath string) { // exists. The permission bits are copied as well. If dst already exists and // the contents are identical to src the modification time is not updated. func copyFile(src, dst string, perm os.FileMode) error { - in, err := ioutil.ReadFile(src) + in, err := os.ReadFile(src) if err != nil { return err } - out, err := ioutil.ReadFile(dst) + out, err := os.ReadFile(dst) if err != nil { // The destination probably doesn't exist, we should create // it. @@ -783,7 +782,7 @@ func copyFile(src, dst string, perm os.FileMode) error { copy: os.MkdirAll(filepath.Dir(dst), 0777) - if err := ioutil.WriteFile(dst, in, perm); err != nil { + if err := os.WriteFile(dst, in, perm); err != nil { return err } @@ -958,7 +957,7 @@ func rmr(paths ...string) { } func getReleaseVersion() (string, error) { - bs, err := ioutil.ReadFile("RELEASE") + bs, err := os.ReadFile("RELEASE") if err != nil { return "", err } @@ -1290,7 +1289,7 @@ func zipFile(out string, files []archiveFile) { if strings.HasSuffix(f.dst, ".txt") { // Text file. Read it and convert line endings. - bs, err := ioutil.ReadAll(sf) + bs, err := io.ReadAll(sf) if err != nil { log.Fatal(err) } diff --git a/cmd/stcrashreceiver/main.go b/cmd/stcrashreceiver/main.go index 31ee52ae654..c6a1871614f 100644 --- a/cmd/stcrashreceiver/main.go +++ b/cmd/stcrashreceiver/main.go @@ -17,7 +17,6 @@ import ( "flag" "fmt" "io" - "io/ioutil" "log" "net/http" "os" @@ -58,7 +57,7 @@ func main() { func handleFailureFn(dsn, failureDir string) func(w http.ResponseWriter, req *http.Request) { return func(w http.ResponseWriter, req *http.Request) { lr := io.LimitReader(req.Body, maxRequestSize) - bs, err := ioutil.ReadAll(lr) + bs, err := io.ReadAll(lr) req.Body.Close() if err != nil { http.Error(w, err.Error(), 500) diff --git a/cmd/stcrashreceiver/sentry.go b/cmd/stcrashreceiver/sentry.go index 5aa8a7c28d3..e49eba88824 100644 --- a/cmd/stcrashreceiver/sentry.go +++ b/cmd/stcrashreceiver/sentry.go @@ -9,7 +9,7 @@ package main import ( "bytes" "errors" - "io/ioutil" + "io" "regexp" "strings" "sync" @@ -93,7 +93,7 @@ func parseCrashReport(path string, report []byte) (*raven.Packet, error) { } r := bytes.NewReader(report) - ctx, err := stack.ParseDump(r, ioutil.Discard, false) + ctx, err := stack.ParseDump(r, io.Discard, false) if err != nil { return nil, err } diff --git a/cmd/stcrashreceiver/sentry_test.go b/cmd/stcrashreceiver/sentry_test.go index fbfd2c42132..e052197c913 100644 --- a/cmd/stcrashreceiver/sentry_test.go +++ b/cmd/stcrashreceiver/sentry_test.go @@ -8,7 +8,7 @@ package main import ( "fmt" - "io/ioutil" + "os" "testing" ) @@ -59,7 +59,7 @@ func TestParseVersion(t *testing.T) { } func TestParseReport(t *testing.T) { - bs, err := ioutil.ReadFile("_testdata/panic.log") + bs, err := os.ReadFile("_testdata/panic.log") if err != nil { t.Fatal(err) } diff --git a/cmd/stcrashreceiver/sourcecodeloader.go b/cmd/stcrashreceiver/sourcecodeloader.go index 1da310d3ce5..e51d8335bc6 100644 --- a/cmd/stcrashreceiver/sourcecodeloader.go +++ b/cmd/stcrashreceiver/sourcecodeloader.go @@ -9,7 +9,7 @@ package main import ( "bytes" "fmt" - "io/ioutil" + "io" "net/http" "path/filepath" "strings" @@ -80,7 +80,7 @@ func (l *githubSourceCodeLoader) Load(filename string, line, context int) ([][]b fmt.Println("Loading source:", resp.Status) return nil, 0 } - data, err := ioutil.ReadAll(resp.Body) + data, err := io.ReadAll(resp.Body) _ = resp.Body.Close() if err != nil { fmt.Println("Loading source:", err.Error()) diff --git a/cmd/stcrashreceiver/stcrashreceiver.go b/cmd/stcrashreceiver/stcrashreceiver.go index 9a39296c12e..f6f988f3e08 100644 --- a/cmd/stcrashreceiver/stcrashreceiver.go +++ b/cmd/stcrashreceiver/stcrashreceiver.go @@ -10,7 +10,6 @@ import ( "bytes" "compress/gzip" "io" - "io/ioutil" "log" "net/http" "os" @@ -96,7 +95,7 @@ func (r *crashReceiver) servePut(reportID, fullPath string, w http.ResponseWrite // Read at most maxRequestSize of report data. log.Println("Receiving report", reportID) lr := io.LimitReader(req.Body, maxRequestSize) - bs, err := ioutil.ReadAll(lr) + bs, err := io.ReadAll(lr) if err != nil { log.Println("Reading report:", err) http.Error(w, "Internal server error", http.StatusInternalServerError) @@ -110,7 +109,7 @@ func (r *crashReceiver) servePut(reportID, fullPath string, w http.ResponseWrite gw.Close() // Create an output file with the compressed report - err = ioutil.WriteFile(fullPath, buf.Bytes(), 0644) + err = os.WriteFile(fullPath, buf.Bytes(), 0644) if err != nil { log.Println("Saving report:", err) http.Error(w, "Internal server error", http.StatusInternalServerError) diff --git a/cmd/stcrashreceiver/util.go b/cmd/stcrashreceiver/util.go index ac164a1c611..ecd0fde914f 100644 --- a/cmd/stcrashreceiver/util.go +++ b/cmd/stcrashreceiver/util.go @@ -10,9 +10,9 @@ import ( "bytes" "compress/gzip" "fmt" - "io/ioutil" "net" "net/http" + "os" "path/filepath" "time" @@ -53,5 +53,5 @@ func compressAndWrite(bs []byte, fullPath string) error { gw.Close() // Create an output file with the compressed report - return ioutil.WriteFile(fullPath, buf.Bytes(), 0644) + return os.WriteFile(fullPath, buf.Bytes(), 0644) } diff --git a/cmd/strelaypoolsrv/main.go b/cmd/strelaypoolsrv/main.go index a409b3c686e..a0364a81c55 100644 --- a/cmd/strelaypoolsrv/main.go +++ b/cmd/strelaypoolsrv/main.go @@ -11,7 +11,6 @@ import ( "flag" "fmt" "io" - "io/ioutil" "log" "net" "net/http" @@ -560,7 +559,7 @@ func limit(addr string, cache *lru.Cache, lock sync.Mutex, intv time.Duration, b } func loadRelays(file string) []*relay { - content, err := ioutil.ReadFile(file) + content, err := os.ReadFile(file) if err != nil { log.Println("Failed to load relays: " + err.Error()) return nil @@ -598,11 +597,11 @@ func saveRelays(file string, relays []*relay) error { for _, relay := range relays { content += relay.uri.String() + "\n" } - return ioutil.WriteFile(file, []byte(content), 0777) + return os.WriteFile(file, []byte(content), 0777) } func createTestCertificate() tls.Certificate { - tmpDir, err := ioutil.TempDir("", "relaypoolsrv") + tmpDir, err := os.MkdirTemp("", "relaypoolsrv") if err != nil { log.Fatal(err) } diff --git a/cmd/strelaysrv/pool.go b/cmd/strelaysrv/pool.go index 9ddde16c58d..8aa48c935b7 100644 --- a/cmd/strelaysrv/pool.go +++ b/cmd/strelaysrv/pool.go @@ -6,7 +6,7 @@ import ( "bytes" "crypto/tls" "encoding/json" - "io/ioutil" + "io" "log" "net/http" "net/url" @@ -56,7 +56,7 @@ func poolHandler(pool string, uri *url.URL, mapping mapping, ownCert tls.Certifi continue } - bs, err := ioutil.ReadAll(resp.Body) + bs, err := io.ReadAll(resp.Body) resp.Body.Close() if err != nil { log.Printf("Error joining pool %v: reading response: %v", pool, err) diff --git a/cmd/stsigtool/main.go b/cmd/stsigtool/main.go index 0217f17e801..ab4c46b3e83 100644 --- a/cmd/stsigtool/main.go +++ b/cmd/stsigtool/main.go @@ -9,7 +9,6 @@ package main import ( "flag" "io" - "io/ioutil" "log" "os" @@ -69,7 +68,7 @@ func gen() { } func sign(keyname, dataname string) { - privkey, err := ioutil.ReadFile(keyname) + privkey, err := os.ReadFile(keyname) if err != nil { log.Fatal(err) } @@ -95,7 +94,7 @@ func sign(keyname, dataname string) { } func verifyWithFile(signame, dataname, keyname string) { - pubkey, err := ioutil.ReadFile(keyname) + pubkey, err := os.ReadFile(keyname) if err != nil { log.Fatal(err) } @@ -103,7 +102,7 @@ func verifyWithFile(signame, dataname, keyname string) { } func verifyWithKey(signame, dataname string, pubkey []byte) { - sig, err := ioutil.ReadFile(signame) + sig, err := os.ReadFile(signame) if err != nil { log.Fatal(err) } diff --git a/cmd/syncthing/cli/main.go b/cmd/syncthing/cli/main.go index 8e08b92ef5a..b6599c893b1 100644 --- a/cmd/syncthing/cli/main.go +++ b/cmd/syncthing/cli/main.go @@ -9,7 +9,7 @@ package cli import ( "bufio" "fmt" - "io/ioutil" + "io" "os" "strings" @@ -151,7 +151,7 @@ func parseFlags(c *preCli) error { } } // We don't want kong to print anything nor os.Exit (e.g. on -h) - parser, err := kong.New(c, kong.Writers(ioutil.Discard, ioutil.Discard), kong.Exit(func(int) {})) + parser, err := kong.New(c, kong.Writers(io.Discard, io.Discard), kong.Exit(func(int) {})) if err != nil { return err } diff --git a/cmd/syncthing/cli/utils.go b/cmd/syncthing/cli/utils.go index 17bde14379c..c495458e10c 100644 --- a/cmd/syncthing/cli/utils.go +++ b/cmd/syncthing/cli/utils.go @@ -10,7 +10,7 @@ import ( "encoding/json" "errors" "fmt" - "io/ioutil" + "io" "mime" "net/http" "os" @@ -23,7 +23,7 @@ import ( ) func responseToBArray(response *http.Response) ([]byte, error) { - bytes, err := ioutil.ReadAll(response.Body) + bytes, err := io.ReadAll(response.Body) if err != nil { return nil, err } diff --git a/cmd/syncthing/crash_reporting.go b/cmd/syncthing/crash_reporting.go index 828695f1aad..27896ff8a61 100644 --- a/cmd/syncthing/crash_reporting.go +++ b/cmd/syncthing/crash_reporting.go @@ -10,7 +10,6 @@ import ( "bytes" "context" "fmt" - "io/ioutil" "net/http" "os" "path/filepath" @@ -62,7 +61,7 @@ func uploadPanicLogs(ctx context.Context, urlBase, dir string) { // the log contents. A HEAD request is made to see if the log has already // been reported. If not, a PUT is made with the log contents. func uploadPanicLog(ctx context.Context, urlBase, file string) error { - data, err := ioutil.ReadFile(file) + data, err := os.ReadFile(file) if err != nil { return err } diff --git a/cmd/syncthing/decrypt/decrypt.go b/cmd/syncthing/decrypt/decrypt.go index 119583dbd70..bb7651e7257 100644 --- a/cmd/syncthing/decrypt/decrypt.go +++ b/cmd/syncthing/decrypt/decrypt.go @@ -12,8 +12,8 @@ import ( "encoding/json" "fmt" "io" - "io/ioutil" "log" + "os" "path/filepath" "github.com/syncthing/syncthing/lib/config" @@ -112,7 +112,7 @@ func (c *CLI) withContinue(err error) error { // error. func (c *CLI) getFolderID() (string, error) { tokenPath := filepath.Join(c.Path, c.TokenPath) - bs, err := ioutil.ReadFile(tokenPath) + bs, err := os.ReadFile(tokenPath) if err != nil { return "", fmt.Errorf("reading folder token: %w", err) } diff --git a/cmd/syncthing/main.go b/cmd/syncthing/main.go index 127fcc54ff5..3e3604d60a8 100644 --- a/cmd/syncthing/main.go +++ b/cmd/syncthing/main.go @@ -12,7 +12,6 @@ import ( "crypto/tls" "fmt" "io" - "io/ioutil" "log" "net/http" _ "net/http/pprof" // Need to import this to support STPROFILER. @@ -500,7 +499,7 @@ func upgradeViaRest() error { return err } if resp.StatusCode != 200 { - bs, err := ioutil.ReadAll(resp.Body) + bs, err := io.ReadAll(resp.Body) defer resp.Body.Close() if err != nil { return err diff --git a/cmd/syncthing/monitor_test.go b/cmd/syncthing/monitor_test.go index 345a9a06ceb..6ad8e4ee2d1 100644 --- a/cmd/syncthing/monitor_test.go +++ b/cmd/syncthing/monitor_test.go @@ -8,7 +8,6 @@ package main import ( "io" - "io/ioutil" "os" "path/filepath" "testing" @@ -18,7 +17,7 @@ import ( func TestRotatedFile(t *testing.T) { // Verify that log rotation happens. - dir, err := ioutil.TempDir("", "syncthing") + dir, err := os.MkdirTemp("", "syncthing") if err != nil { t.Fatal(err) } @@ -179,7 +178,7 @@ func TestAutoClosedFile(t *testing.T) { } // The file should have both writes in it. - bs, err := ioutil.ReadFile(file) + bs, err := os.ReadFile(file) if err != nil { t.Fatal(err) } @@ -199,7 +198,7 @@ func TestAutoClosedFile(t *testing.T) { } // It should now contain three writes, as the file is always opened for appending - bs, err = ioutil.ReadFile(file) + bs, err = os.ReadFile(file) if err != nil { t.Fatal(err) } diff --git a/cmd/ursrv/main.go b/cmd/ursrv/main.go index 6cbf4429932..0d24ee1be94 100644 --- a/cmd/ursrv/main.go +++ b/cmd/ursrv/main.go @@ -13,7 +13,6 @@ import ( "encoding/json" "html/template" "io" - "io/ioutil" "log" "net" "net/http" @@ -162,7 +161,7 @@ func main() { if err != nil { log.Fatalln("template:", err) } - bs, err := ioutil.ReadAll(fd) + bs, err := io.ReadAll(fd) if err != nil { log.Fatalln("template:", err) } @@ -324,7 +323,7 @@ func newDataHandler(db *sql.DB, w http.ResponseWriter, r *http.Request) { rep.Address = addr lr := &io.LimitedReader{R: r.Body, N: 40 * 1024} - bs, _ := ioutil.ReadAll(lr) + bs, _ := io.ReadAll(lr) if err := json.Unmarshal(bs, &rep); err != nil { log.Println("decode:", err) if debug { diff --git a/lib/api/api.go b/lib/api/api.go index 6ba4235f347..1e8c4747b85 100644 --- a/lib/api/api.go +++ b/lib/api/api.go @@ -15,7 +15,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "log" "net" "net/http" @@ -382,7 +381,7 @@ func (s *service) Serve(ctx context.Context) error { ReadTimeout: 15 * time.Second, // Prevent the HTTP server from logging stuff on its own. The things we // care about we log ourselves from the handlers. - ErrorLog: log.New(ioutil.Discard, "", 0), + ErrorLog: log.New(io.Discard, "", 0), } l.Infoln("GUI and API listening on", listener.Addr()) @@ -1098,7 +1097,7 @@ func (s *service) getSystemError(w http.ResponseWriter, r *http.Request) { } func (s *service) postSystemError(w http.ResponseWriter, r *http.Request) { - bs, _ := ioutil.ReadAll(r.Body) + bs, _ := io.ReadAll(r.Body) r.Body.Close() l.Warnln(string(bs)) } @@ -1165,7 +1164,7 @@ func (s *service) getSupportBundle(w http.ResponseWriter, r *http.Request) { // Panic files if panicFiles, err := filepath.Glob(filepath.Join(locations.GetBaseDir(locations.ConfigBaseDir), "panic*")); err == nil { for _, f := range panicFiles { - if panicFile, err := ioutil.ReadFile(f); err != nil { + if panicFile, err := os.ReadFile(f); err != nil { l.Warnf("Support bundle: failed to load %s: %s", filepath.Base(f), err) } else { files = append(files, fileEntry{name: filepath.Base(f), data: panicFile}) @@ -1174,7 +1173,7 @@ func (s *service) getSupportBundle(w http.ResponseWriter, r *http.Request) { } // Archived log (default on Windows) - if logFile, err := ioutil.ReadFile(locations.Get(locations.LogFile)); err == nil { + if logFile, err := os.ReadFile(locations.Get(locations.LogFile)); err == nil { files = append(files, fileEntry{name: "log-ondisk.txt", data: logFile}) } @@ -1233,7 +1232,7 @@ func (s *service) getSupportBundle(w http.ResponseWriter, r *http.Request) { zipFilePath := filepath.Join(locations.GetBaseDir(locations.ConfigBaseDir), zipFileName) // Write buffer zip to local zip file (back up) - if err := ioutil.WriteFile(zipFilePath, zipFilesBuffer.Bytes(), 0600); err != nil { + if err := os.WriteFile(zipFilePath, zipFilesBuffer.Bytes(), 0600); err != nil { l.Warnln("Support bundle: support bundle zip could not be created:", err) } @@ -1323,7 +1322,7 @@ func (s *service) getDBIgnores(w http.ResponseWriter, r *http.Request) { func (s *service) postDBIgnores(w http.ResponseWriter, r *http.Request) { qs := r.URL.Query() - bs, err := ioutil.ReadAll(r.Body) + bs, err := io.ReadAll(r.Body) r.Body.Close() if err != nil { http.Error(w, err.Error(), 500) @@ -1614,7 +1613,7 @@ func (s *service) getFolderVersions(w http.ResponseWriter, r *http.Request) { func (s *service) postFolderVersionsRestore(w http.ResponseWriter, r *http.Request) { qs := r.URL.Query() - bs, err := ioutil.ReadAll(r.Body) + bs, err := io.ReadAll(r.Body) r.Body.Close() if err != nil { http.Error(w, err.Error(), 500) diff --git a/lib/api/api_test.go b/lib/api/api_test.go index f9ecc15c5cc..1bfe5df0839 100644 --- a/lib/api/api_test.go +++ b/lib/api/api_test.go @@ -13,7 +13,6 @@ import ( "encoding/json" "fmt" "io" - "io/ioutil" "net" "net/http" "net/http/httptest" @@ -223,7 +222,7 @@ func expectURLToContain(t *testing.T, url, exp string) { return } - data, err := ioutil.ReadAll(res.Body) + data, err := io.ReadAll(res.Body) res.Body.Close() if err != nil { t.Error(err) @@ -508,7 +507,7 @@ func testHTTPRequest(t *testing.T, baseURL string, tc httpTestCase, apikey strin return } - data, err := ioutil.ReadAll(resp.Body) + data, err := io.ReadAll(resp.Body) if err != nil { t.Errorf("Unexpected error reading %s: %v", tc.URL, err) return @@ -1137,7 +1136,7 @@ func TestBrowse(t *testing.T) { pathSep := string(os.PathSeparator) - tmpDir, err := ioutil.TempDir("", "syncthing") + tmpDir, err := os.MkdirTemp("", "syncthing") if err != nil { t.Fatal(err) } @@ -1146,7 +1145,7 @@ func TestBrowse(t *testing.T) { if err := os.Mkdir(filepath.Join(tmpDir, "dir"), 0755); err != nil { t.Fatal(err) } - if err := ioutil.WriteFile(filepath.Join(tmpDir, "file"), []byte("hello"), 0644); err != nil { + if err := os.WriteFile(filepath.Join(tmpDir, "file"), []byte("hello"), 0644); err != nil { t.Fatal(err) } if err := os.Mkdir(filepath.Join(tmpDir, "MiXEDCase"), 0755); err != nil { @@ -1251,7 +1250,7 @@ func TestConfigChanges(t *testing.T) { APIKey: testAPIKey, }, } - tmpFile, err := ioutil.TempFile("", "syncthing-testConfig-") + tmpFile, err := os.CreateTemp("", "syncthing-testConfig-") if err != nil { panic(err) } @@ -1393,7 +1392,7 @@ func runningInContainer() bool { return false } - bs, err := ioutil.ReadFile("/proc/1/cgroup") + bs, err := os.ReadFile("/proc/1/cgroup") if err != nil { return false } diff --git a/lib/api/auto/auto_test.go b/lib/api/auto/auto_test.go index 2e997d5e3a3..db7e276f954 100644 --- a/lib/api/auto/auto_test.go +++ b/lib/api/auto/auto_test.go @@ -9,7 +9,7 @@ package auto_test import ( "bytes" "compress/gzip" - "io/ioutil" + "io" "strings" "testing" @@ -28,7 +28,7 @@ func TestAssets(t *testing.T) { var gr *gzip.Reader gr, _ = gzip.NewReader(strings.NewReader(idx.Content)) - html, _ := ioutil.ReadAll(gr) + html, _ := io.ReadAll(gr) if !bytes.Contains(html, []byte(" 0 { lr := io.LimitReader(f.rng, diff) - io.Copy(ioutil.Discard, lr) + io.Copy(io.Discard, lr) } f.offset = offs diff --git a/lib/fs/fakefs_test.go b/lib/fs/fakefs_test.go index 1b095f88128..63cae9d40fa 100644 --- a/lib/fs/fakefs_test.go +++ b/lib/fs/fakefs_test.go @@ -10,7 +10,6 @@ import ( "bytes" "fmt" "io" - "io/ioutil" "os" "path" "path/filepath" @@ -88,7 +87,7 @@ func TestFakeFS(t *testing.T) { } // Read - bs0, err := ioutil.ReadAll(fd) + bs0, err := io.ReadAll(fd) if err != nil { t.Fatal(err) } @@ -101,7 +100,7 @@ func TestFakeFS(t *testing.T) { if err != nil { t.Fatal(err) } - bs1, err := ioutil.ReadAll(fd) + bs1, err := io.ReadAll(fd) if err != nil { t.Fatal(err) } @@ -139,7 +138,7 @@ func testFakeFSRead(t *testing.T, fs Filesystem) { // Read fd.Seek(0, io.SeekStart) - bs0, err := ioutil.ReadAll(fd) + bs0, err := io.ReadAll(fd) if err != nil { t.Fatal(err) } @@ -154,7 +153,7 @@ func testFakeFSRead(t *testing.T, fs Filesystem) { if n != len(buf0) { t.Fatal("short read") } - buf1, err := ioutil.ReadAll(fd) + buf1, err := io.ReadAll(fd) if err != nil { t.Fatal(err) } @@ -252,7 +251,7 @@ func TestFakeFSCaseInsensitive(t *testing.T) { func createTestDir(t *testing.T) (string, bool) { t.Helper() - testDir, err := ioutil.TempDir("", "") + testDir, err := os.MkdirTemp("", "") if err != nil { t.Fatalf("could not create temporary dir for testing: %s", err) } @@ -328,7 +327,7 @@ func testFakeFSCaseInsensitive(t *testing.T, fs Filesystem) { t.Fatal(err) } - bs2, err := ioutil.ReadAll(fd2) + bs2, err := io.ReadAll(fd2) if err != nil { t.Fatal(err) } diff --git a/lib/fs/filesystem_copy_range_test.go b/lib/fs/filesystem_copy_range_test.go index e2db04fb928..5831753df7a 100644 --- a/lib/fs/filesystem_copy_range_test.go +++ b/lib/fs/filesystem_copy_range_test.go @@ -9,7 +9,6 @@ package fs import ( "bytes" "io" - "io/ioutil" "math/rand" "os" "path/filepath" @@ -257,7 +256,7 @@ func TestCopyRange(tttt *testing.T) { paths = []string{""} } for _, path := range paths { - testPath, err := ioutil.TempDir(path, "") + testPath, err := os.MkdirTemp(path, "") if err != nil { tttt.Fatal(err) } @@ -273,7 +272,7 @@ func TestCopyRange(tttt *testing.T) { tt.Run(testCase.name, func(t *testing.T) { srcBuf := make([]byte, testCase.srcSize) dstBuf := make([]byte, testCase.dstSize) - td, err := ioutil.TempDir(testPath, "") + td, err := os.MkdirTemp(testPath, "") if err != nil { t.Fatal(err) } diff --git a/lib/fs/mtimefs_test.go b/lib/fs/mtimefs_test.go index 3f7dc6c0704..bf14f514ef2 100644 --- a/lib/fs/mtimefs_test.go +++ b/lib/fs/mtimefs_test.go @@ -8,7 +8,6 @@ package fs import ( "errors" - "io/ioutil" "os" "path/filepath" "runtime" @@ -20,9 +19,9 @@ func TestMtimeFS(t *testing.T) { os.RemoveAll("testdata") defer os.RemoveAll("testdata") os.Mkdir("testdata", 0755) - ioutil.WriteFile("testdata/exists0", []byte("hello"), 0644) - ioutil.WriteFile("testdata/exists1", []byte("hello"), 0644) - ioutil.WriteFile("testdata/exists2", []byte("hello"), 0644) + os.WriteFile("testdata/exists0", []byte("hello"), 0644) + os.WriteFile("testdata/exists1", []byte("hello"), 0644) + os.WriteFile("testdata/exists2", []byte("hello"), 0644) // a random time with nanosecond precision testTime := time.Unix(1234567890, 123456789) @@ -83,7 +82,7 @@ func TestMtimeFS(t *testing.T) { } func TestMtimeFSWalk(t *testing.T) { - dir, err := ioutil.TempDir("", "") + dir, err := os.MkdirTemp("", "") if err != nil { t.Fatal(err) } @@ -93,7 +92,7 @@ func TestMtimeFSWalk(t *testing.T) { mtimefs := newMtimeFS(underlying, make(mapStore)) mtimefs.chtimes = failChtimes - if err := ioutil.WriteFile(filepath.Join(dir, "file"), []byte("hello"), 0644); err != nil { + if err := os.WriteFile(filepath.Join(dir, "file"), []byte("hello"), 0644); err != nil { t.Fatal(err) } @@ -137,7 +136,7 @@ func TestMtimeFSWalk(t *testing.T) { } func TestMtimeFSOpen(t *testing.T) { - dir, err := ioutil.TempDir("", "") + dir, err := os.MkdirTemp("", "") if err != nil { t.Fatal(err) } @@ -147,7 +146,7 @@ func TestMtimeFSOpen(t *testing.T) { mtimefs := newMtimeFS(underlying, make(mapStore)) mtimefs.chtimes = failChtimes - if err := ioutil.WriteFile(filepath.Join(dir, "file"), []byte("hello"), 0644); err != nil { + if err := os.WriteFile(filepath.Join(dir, "file"), []byte("hello"), 0644); err != nil { t.Fatal(err) } @@ -200,7 +199,7 @@ func TestMtimeFSInsensitive(t *testing.T) { os.RemoveAll("testdata") defer os.RemoveAll("testdata") os.Mkdir("testdata", 0755) - ioutil.WriteFile("testdata/FiLe", []byte("hello"), 0644) + os.WriteFile("testdata/FiLe", []byte("hello"), 0644) // a random time with nanosecond precision testTime := time.Unix(1234567890, 123456789) diff --git a/lib/ignore/ignore_test.go b/lib/ignore/ignore_test.go index d9564ec6634..9781cbdfafc 100644 --- a/lib/ignore/ignore_test.go +++ b/lib/ignore/ignore_test.go @@ -10,7 +10,6 @@ import ( "bytes" "fmt" "io" - "io/ioutil" "os" "path/filepath" "runtime" @@ -232,7 +231,7 @@ func TestCaseSensitivity(t *testing.T) { } func TestCaching(t *testing.T) { - dir, err := ioutil.TempDir("", "") + dir, err := os.MkdirTemp("", "") if err != nil { t.Fatal(err) } @@ -425,7 +424,7 @@ flamingo *.crow ` // Caches per file, hence write the patterns to a file. - dir, err := ioutil.TempDir("", "") + dir, err := os.MkdirTemp("", "") if err != nil { b.Fatal(err) } @@ -466,7 +465,7 @@ flamingo } func TestCacheReload(t *testing.T) { - dir, err := ioutil.TempDir("", "") + dir, err := os.MkdirTemp("", "") if err != nil { t.Fatal(err) } @@ -989,7 +988,7 @@ func TestIssue4689(t *testing.T) { } func TestIssue4901(t *testing.T) { - dir, err := ioutil.TempDir("", "") + dir, err := os.MkdirTemp("", "") if err != nil { t.Fatal(err) } @@ -1001,7 +1000,7 @@ func TestIssue4901(t *testing.T) { puppy ` - if err := ioutil.WriteFile(filepath.Join(dir, ".stignore"), []byte(stignore), 0777); err != nil { + if err := os.WriteFile(filepath.Join(dir, ".stignore"), []byte(stignore), 0777); err != nil { t.Fatalf(err.Error()) } @@ -1020,7 +1019,7 @@ func TestIssue4901(t *testing.T) { } } - if err := ioutil.WriteFile(filepath.Join(dir, "unicorn-lazor-death"), []byte(" "), 0777); err != nil { + if err := os.WriteFile(filepath.Join(dir, "unicorn-lazor-death"), []byte(" "), 0777); err != nil { t.Fatalf(err.Error()) } diff --git a/lib/logger/logger.go b/lib/logger/logger.go index cd3e3f23777..731be426b09 100644 --- a/lib/logger/logger.go +++ b/lib/logger/logger.go @@ -10,7 +10,6 @@ package logger import ( "fmt" "io" - "io/ioutil" "log" "os" "strings" @@ -75,7 +74,7 @@ func New() Logger { if os.Getenv("LOGGER_DISCARD") != "" { // Hack to completely disable logging, for example when running // benchmarks. - return newLogger(ioutil.Discard) + return newLogger(io.Discard) } return newLogger(controlStripper{os.Stdout}) } diff --git a/lib/logger/logger_test.go b/lib/logger/logger_test.go index 1937aa646db..cc3b72e67a0 100644 --- a/lib/logger/logger_test.go +++ b/lib/logger/logger_test.go @@ -6,7 +6,7 @@ package logger import ( "bytes" "fmt" - "io/ioutil" + "io" "log" "strings" "testing" @@ -186,12 +186,12 @@ func TestControlStripper(t *testing.T) { } func BenchmarkLog(b *testing.B) { - l := newLogger(controlStripper{ioutil.Discard}) + l := newLogger(controlStripper{io.Discard}) benchmarkLogger(b, l) } func BenchmarkLogNoStripper(b *testing.B) { - l := newLogger(ioutil.Discard) + l := newLogger(io.Discard) benchmarkLogger(b, l) } diff --git a/lib/model/folder_sendrecv_test.go b/lib/model/folder_sendrecv_test.go index 06bf7d6d79d..c3a76424286 100644 --- a/lib/model/folder_sendrecv_test.go +++ b/lib/model/folder_sendrecv_test.go @@ -13,7 +13,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "os" "path/filepath" "runtime" @@ -680,8 +679,8 @@ func TestIssue3164(t *testing.T) { ignDir := filepath.Join("issue3164", "oktodelete") subDir := filepath.Join(ignDir, "foobar") must(t, ffs.MkdirAll(subDir, 0777)) - must(t, ioutil.WriteFile(filepath.Join(tmpDir, subDir, "file"), []byte("Hello"), 0644)) - must(t, ioutil.WriteFile(filepath.Join(tmpDir, ignDir, "file"), []byte("Hello"), 0644)) + must(t, os.WriteFile(filepath.Join(tmpDir, subDir, "file"), []byte("Hello"), 0644)) + must(t, os.WriteFile(filepath.Join(tmpDir, ignDir, "file"), []byte("Hello"), 0644)) file := protocol.FileInfo{ Name: "issue3164", } diff --git a/lib/model/model_test.go b/lib/model/model_test.go index 121bcdffeec..78fa8e9f9af 100644 --- a/lib/model/model_test.go +++ b/lib/model/model_test.go @@ -12,7 +12,6 @@ import ( "encoding/json" "fmt" "io" - "io/ioutil" "math/rand" "os" "path/filepath" @@ -2152,7 +2151,7 @@ func TestIssue2782(t *testing.T) { if err := os.MkdirAll(testDir+"/syncdir", 0755); err != nil { t.Skip(err) } - if err := ioutil.WriteFile(testDir+"/syncdir/file", []byte("hello, world\n"), 0644); err != nil { + if err := os.WriteFile(testDir+"/syncdir/file", []byte("hello, world\n"), 0644); err != nil { t.Skip(err) } if err := os.Symlink("syncdir", testDir+"/synclink"); err != nil { @@ -2763,7 +2762,7 @@ func TestVersionRestore(t *testing.T) { // In each file, we write the filename as the content // We verify that the content matches at the expected filenames // after the restore operation. - dir, err := ioutil.TempDir("", "") + dir, err := os.MkdirTemp("", "") must(t, err) defer os.RemoveAll(dir) @@ -2900,7 +2899,7 @@ func TestVersionRestore(t *testing.T) { } defer fd.Close() - content, err := ioutil.ReadAll(fd) + content, err := io.ReadAll(fd) if err != nil { t.Error(err) } @@ -2930,7 +2929,7 @@ func TestVersionRestore(t *testing.T) { must(t, err) defer fd.Close() - content, err := ioutil.ReadAll(fd) + content, err := io.ReadAll(fd) if err != nil { t.Error(err) } diff --git a/lib/model/requests_test.go b/lib/model/requests_test.go index 35df4fdd9e9..76868748a2f 100644 --- a/lib/model/requests_test.go +++ b/lib/model/requests_test.go @@ -10,7 +10,6 @@ import ( "bytes" "context" "errors" - "io/ioutil" "os" "path/filepath" "runtime" @@ -236,7 +235,7 @@ func TestRequestVersioningSymlinkAttack(t *testing.T) { // Create a temporary directory that we will use as target to see if // we can escape to it - tmpdir, err := ioutil.TempDir("", "syncthing-test") + tmpdir, err := os.MkdirTemp("", "syncthing-test") if err != nil { t.Fatal(err) } @@ -681,7 +680,7 @@ func TestRequestSymlinkWindows(t *testing.T) { } func equalContents(path string, contents []byte) error { - if bs, err := ioutil.ReadFile(path); err != nil { + if bs, err := os.ReadFile(path); err != nil { return err } else if !bytes.Equal(bs, contents) { return errors.New("incorrect data") diff --git a/lib/model/testutils_test.go b/lib/model/testutils_test.go index 4ee390f5d8e..a31e57fdd32 100644 --- a/lib/model/testutils_test.go +++ b/lib/model/testutils_test.go @@ -8,7 +8,6 @@ package model import ( "context" - "io/ioutil" "os" "testing" "time" @@ -76,7 +75,7 @@ func init() { } func createTmpWrapper(cfg config.Configuration) (config.Wrapper, context.CancelFunc) { - tmpFile, err := ioutil.TempFile("", "syncthing-testConfig-") + tmpFile, err := os.CreateTemp("", "syncthing-testConfig-") if err != nil { panic(err) } @@ -215,7 +214,7 @@ func cleanupModelAndRemoveDir(m *testModel, dir string) { } func createTmpDir() string { - tmpDir, err := ioutil.TempDir("", "syncthing_testFolder-") + tmpDir, err := os.MkdirTemp("", "syncthing_testFolder-") if err != nil { panic("Failed to create temporary testing dir") } diff --git a/lib/nat/structs_test.go b/lib/nat/structs_test.go index 661a552f856..b43e52e08cf 100644 --- a/lib/nat/structs_test.go +++ b/lib/nat/structs_test.go @@ -7,7 +7,6 @@ package nat import ( - "io/ioutil" "net" "os" "testing" @@ -60,7 +59,7 @@ func TestMappingValidGateway(t *testing.T) { } func TestMappingClearAddresses(t *testing.T) { - tmpFile, err := ioutil.TempFile("", "syncthing-testConfig-") + tmpFile, err := os.CreateTemp("", "syncthing-testConfig-") if err != nil { t.Fatal(err) } diff --git a/lib/osutil/atomic.go b/lib/osutil/atomic.go index c2f6dd6e942..bf9730daf94 100644 --- a/lib/osutil/atomic.go +++ b/lib/osutil/atomic.go @@ -43,7 +43,7 @@ func CreateAtomic(path string) (*AtomicWriter, error) { // permissions. func CreateAtomicFilesystem(filesystem fs.Filesystem, path string) (*AtomicWriter, error) { // The security of this depends on the tempfile having secure - // permissions, 0600, from the beginning. This is what ioutil.TempFile + // permissions, 0600, from the beginning. This is what os.CreateTemp // does. We have a test that verifies that that is the case, should this // ever change in the standard library in the future. fd, err := TempFile(filesystem, filepath.Dir(path), TempPrefix) diff --git a/lib/osutil/atomic_test.go b/lib/osutil/atomic_test.go index 70c5b90d6ab..c9737784ad7 100644 --- a/lib/osutil/atomic_test.go +++ b/lib/osutil/atomic_test.go @@ -8,7 +8,6 @@ package osutil import ( "bytes" - "io/ioutil" "os" "path/filepath" "testing" @@ -35,7 +34,7 @@ func TestCreateAtomicCreate(t *testing.T) { t.Fatal("written bytes", n, "!= 5") } - if _, err := ioutil.ReadFile("testdata/file"); err == nil { + if _, err := os.ReadFile("testdata/file"); err == nil { t.Fatal("file should not exist") } @@ -43,7 +42,7 @@ func TestCreateAtomicCreate(t *testing.T) { t.Fatal(err) } - bs, err := ioutil.ReadFile("testdata/file") + bs, err := os.ReadFile("testdata/file") if err != nil { t.Fatal(err) } @@ -62,7 +61,7 @@ func TestCreateAtomicReplaceReadOnly(t *testing.T) { func testCreateAtomicReplace(t *testing.T, oldPerms os.FileMode) { t.Helper() - testdir, err := ioutil.TempDir("", "syncthing") + testdir, err := os.MkdirTemp("", "syncthing") if err != nil { t.Fatal(err) } @@ -75,7 +74,7 @@ func testCreateAtomicReplace(t *testing.T, oldPerms os.FileMode) { t.Fatal(err) } - if err := ioutil.WriteFile(testfile, []byte("some old data"), oldPerms); err != nil { + if err := os.WriteFile(testfile, []byte("some old data"), oldPerms); err != nil { t.Fatal(err) } @@ -103,7 +102,7 @@ func testCreateAtomicReplace(t *testing.T, oldPerms os.FileMode) { t.Fatal(err) } - bs, err := ioutil.ReadFile(testfile) + bs, err := os.ReadFile(testfile) if err != nil { t.Fatal(err) } diff --git a/lib/osutil/atomic_unix_test.go b/lib/osutil/atomic_unix_test.go index ec4f8e68e65..1d2e17da152 100644 --- a/lib/osutil/atomic_unix_test.go +++ b/lib/osutil/atomic_unix_test.go @@ -12,7 +12,6 @@ package osutil import ( - "io/ioutil" "os" "syscall" "testing" @@ -24,7 +23,7 @@ func TestTempFilePermissions(t *testing.T) { oldMask := syscall.Umask(0) defer syscall.Umask(oldMask) - fd, err := ioutil.TempFile("", "test") + fd, err := os.CreateTemp("", "test") if err != nil { t.Fatal(err) } diff --git a/lib/osutil/osutil_test.go b/lib/osutil/osutil_test.go index 772097e53a5..db1e608fddc 100644 --- a/lib/osutil/osutil_test.go +++ b/lib/osutil/osutil_test.go @@ -7,7 +7,7 @@ package osutil_test import ( - "io/ioutil" + "io" "os" "path/filepath" "runtime" @@ -83,7 +83,7 @@ func TestIsDeleted(t *testing.T) { func TestRenameOrCopy(t *testing.T) { mustTempDir := func() string { t.Helper() - tmpDir, err := ioutil.TempDir("", "") + tmpDir, err := os.MkdirTemp("", "") if err != nil { t.Fatal(err) } @@ -131,7 +131,7 @@ func TestRenameOrCopy(t *testing.T) { if err != nil { t.Fatal(err) } - buf, err := ioutil.ReadAll(fd) + buf, err := io.ReadAll(fd) if err != nil { t.Fatal(err) } @@ -147,7 +147,7 @@ func TestRenameOrCopy(t *testing.T) { if fd, err := test.dst.Open("new"); err != nil { t.Fatal(err) } else { - if buf, err := ioutil.ReadAll(fd); err != nil { + if buf, err := io.ReadAll(fd); err != nil { t.Fatal(err) } else if string(buf) != content { t.Fatalf("expected %s got %s", content, string(buf)) diff --git a/lib/osutil/traversessymlink_test.go b/lib/osutil/traversessymlink_test.go index 5bf6e7b59f4..374c471fd58 100644 --- a/lib/osutil/traversessymlink_test.go +++ b/lib/osutil/traversessymlink_test.go @@ -7,7 +7,6 @@ package osutil_test import ( - "io/ioutil" "os" "path/filepath" "runtime" @@ -18,7 +17,7 @@ import ( ) func TestTraversesSymlink(t *testing.T) { - tmpDir, err := ioutil.TempDir(".", ".test-TraversesSymlink-") + tmpDir, err := os.MkdirTemp(".", ".test-TraversesSymlink-") if err != nil { panic("Failed to create temporary testing dir") } @@ -71,7 +70,7 @@ func TestTraversesSymlink(t *testing.T) { } func TestIssue4875(t *testing.T) { - tmpDir, err := ioutil.TempDir("", ".test-Issue4875-") + tmpDir, err := os.MkdirTemp("", ".test-Issue4875-") if err != nil { panic("Failed to create temporary testing dir") } diff --git a/lib/protocol/protocol_test.go b/lib/protocol/protocol_test.go index 1c1d617f75f..81a74bb9f9a 100644 --- a/lib/protocol/protocol_test.go +++ b/lib/protocol/protocol_test.go @@ -10,7 +10,7 @@ import ( "encoding/json" "errors" "io" - "io/ioutil" + "os" "runtime" "sync" "testing" @@ -432,8 +432,8 @@ func testMarshal(t *testing.T, prefix string, m1, m2 message) bool { bs1, _ := json.MarshalIndent(m1, "", " ") bs2, _ := json.MarshalIndent(m2, "", " ") if !bytes.Equal(bs1, bs2) { - ioutil.WriteFile(prefix+"-1.txt", bs1, 0644) - ioutil.WriteFile(prefix+"-2.txt", bs2, 0644) + os.WriteFile(prefix+"-1.txt", bs1, 0644) + os.WriteFile(prefix+"-2.txt", bs2, 0644) return false } diff --git a/lib/rc/rc.go b/lib/rc/rc.go index f21d0e31df7..875ee849e7c 100644 --- a/lib/rc/rc.go +++ b/lib/rc/rc.go @@ -14,7 +14,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "log" "net/http" "net/url" @@ -393,7 +392,7 @@ func (p *Process) Model(folder string) (Model, error) { } func (p *Process) readResponse(resp *http.Response) ([]byte, error) { - bs, err := ioutil.ReadAll(resp.Body) + bs, err := io.ReadAll(resp.Body) resp.Body.Close() if err != nil { return bs, err diff --git a/lib/scanner/walk_test.go b/lib/scanner/walk_test.go index ba7e9a33138..4edad2b4778 100644 --- a/lib/scanner/walk_test.go +++ b/lib/scanner/walk_test.go @@ -13,7 +13,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "os" "path/filepath" "runtime" @@ -376,7 +375,7 @@ func TestWalkSymlinkWindows(t *testing.T) { func TestWalkRootSymlink(t *testing.T) { // Create a folder with a symlink in it - tmp, err := ioutil.TempDir("", "") + tmp, err := os.MkdirTemp("", "") if err != nil { t.Fatal(err) } @@ -709,7 +708,7 @@ func TestStopWalk(t *testing.T) { } func TestIssue4799(t *testing.T) { - tmp, err := ioutil.TempDir("", "") + tmp, err := os.MkdirTemp("", "") if err != nil { t.Fatal(err) } @@ -771,7 +770,7 @@ func TestRecurseInclude(t *testing.T) { } func TestIssue4841(t *testing.T) { - tmp, err := ioutil.TempDir("", "") + tmp, err := os.MkdirTemp("", "") if err != nil { t.Fatal(err) } diff --git a/lib/syncthing/syncthing_test.go b/lib/syncthing/syncthing_test.go index 8add69ee821..e9feedf4487 100644 --- a/lib/syncthing/syncthing_test.go +++ b/lib/syncthing/syncthing_test.go @@ -7,7 +7,6 @@ package syncthing import ( - "io/ioutil" "os" "testing" "time" @@ -22,7 +21,7 @@ import ( func tempCfgFilename(t *testing.T) string { t.Helper() - f, err := ioutil.TempFile("", "syncthing-testConfig-") + f, err := os.CreateTemp("", "syncthing-testConfig-") if err != nil { t.Fatal(err) } diff --git a/lib/syncthing/utils.go b/lib/syncthing/utils.go index eecb563942f..5f59af2b64c 100644 --- a/lib/syncthing/utils.go +++ b/lib/syncthing/utils.go @@ -10,7 +10,6 @@ import ( "crypto/tls" "fmt" "io" - "io/ioutil" "os" "github.com/pkg/errors" @@ -133,12 +132,12 @@ func archiveAndSaveConfig(cfg config.Wrapper, originalVersion int) error { } func copyFile(src, dst string) error { - bs, err := ioutil.ReadFile(src) + bs, err := os.ReadFile(src) if err != nil { return err } - if err := ioutil.WriteFile(dst, bs, 0600); err != nil { + if err := os.WriteFile(dst, bs, 0600); err != nil { // Attempt to clean up os.Remove(dst) return err diff --git a/lib/upgrade/upgrade_supported.go b/lib/upgrade/upgrade_supported.go index 45eeaf426ce..80312a6facd 100644 --- a/lib/upgrade/upgrade_supported.go +++ b/lib/upgrade/upgrade_supported.go @@ -19,7 +19,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "net/http" "os" "path" @@ -284,7 +283,7 @@ func readTarGz(archiveName, dir string, r io.Reader) (string, error) { } func readZip(archiveName, dir string, r io.Reader) (string, error) { - body, err := ioutil.ReadAll(r) + body, err := io.ReadAll(r) if err != nil { return "", err } @@ -357,7 +356,7 @@ func archiveFileVisitor(dir string, tempFile *string, signature *[]byte, archive case "release.sig": l.Debugf("found signature %s", archivePath) - *signature, err = ioutil.ReadAll(io.LimitReader(filedata, maxSignatureSize)) + *signature, err = io.ReadAll(io.LimitReader(filedata, maxSignatureSize)) if err != nil { return err } @@ -407,7 +406,7 @@ func verifyUpgrade(archiveName, tempName string, sig []byte) error { func writeBinary(dir string, inFile io.Reader) (filename string, err error) { // Write the binary to a temporary file. - outFile, err := ioutil.TempFile(dir, "syncthing") + outFile, err := os.CreateTemp(dir, "syncthing") if err != nil { return "", err } diff --git a/lib/upnp/upnp.go b/lib/upnp/upnp.go index 72fc22fedc9..9cf3b5afb42 100644 --- a/lib/upnp/upnp.go +++ b/lib/upnp/upnp.go @@ -38,7 +38,7 @@ import ( "context" "encoding/xml" "fmt" - "io/ioutil" + "io" "net" "net/http" "net/url" @@ -467,7 +467,7 @@ func soapRequest(ctx context.Context, url, service, function, message string) ([ return resp, err } - resp, _ = ioutil.ReadAll(r.Body) + resp, _ = io.ReadAll(r.Body) l.Debugf("SOAP Response: %s\n\n%s\n\n", r.Status, resp) r.Body.Close() diff --git a/lib/versioner/external_test.go b/lib/versioner/external_test.go index 5979d5e7659..e4283fa3e97 100644 --- a/lib/versioner/external_test.go +++ b/lib/versioner/external_test.go @@ -7,7 +7,6 @@ package versioner import ( - "io/ioutil" "os" "path/filepath" "runtime" @@ -85,7 +84,7 @@ func prepForRemoval(t *testing.T, file string) { if err := os.MkdirAll(filepath.Dir(file), 0755); err != nil { t.Fatal(err) } - if err := ioutil.WriteFile(file, []byte("hello\n"), 0644); err != nil { + if err := os.WriteFile(file, []byte("hello\n"), 0644); err != nil { t.Fatal(err) } } diff --git a/lib/versioner/simple_test.go b/lib/versioner/simple_test.go index 21949213806..12dc2c81ac2 100644 --- a/lib/versioner/simple_test.go +++ b/lib/versioner/simple_test.go @@ -7,8 +7,8 @@ package versioner import ( - "io/ioutil" "math" + "os" "path/filepath" "testing" "time" @@ -55,7 +55,7 @@ func TestSimpleVersioningVersionCount(t *testing.T) { t.Skip("Test takes some time, skipping.") } - dir, err := ioutil.TempDir("", "") + dir, err := os.MkdirTemp("", "") //defer os.RemoveAll(dir) if err != nil { t.Error(err) diff --git a/lib/versioner/staggered_test.go b/lib/versioner/staggered_test.go index fbf78d4dfe0..360c29ceb06 100644 --- a/lib/versioner/staggered_test.go +++ b/lib/versioner/staggered_test.go @@ -7,7 +7,7 @@ package versioner import ( - "io/ioutil" + "os" "path/filepath" "sort" "strconv" @@ -133,11 +133,11 @@ func TestCreateVersionPath(t *testing.T) { ) // Create a test dir and file - tmpDir, err := ioutil.TempDir("", "") + tmpDir, err := os.MkdirTemp("", "") if err != nil { t.Fatal(err) } - if err := ioutil.WriteFile(filepath.Join(tmpDir, archiveFile), []byte("sup"), 0644); err != nil { + if err := os.WriteFile(filepath.Join(tmpDir, archiveFile), []byte("sup"), 0644); err != nil { t.Fatal(err) } diff --git a/lib/versioner/trashcan_test.go b/lib/versioner/trashcan_test.go index eb59f0954ad..891c64ecf3f 100644 --- a/lib/versioner/trashcan_test.go +++ b/lib/versioner/trashcan_test.go @@ -7,7 +7,8 @@ package versioner import ( - "io/ioutil" + "io" + "os" "testing" "time" @@ -19,12 +20,12 @@ func TestTrashcanArchiveRestoreSwitcharoo(t *testing.T) { // This tests that trashcan versioner restoration correctly archives existing file, because trashcan versioner // files are untagged, archiving existing file to replace with a restored version technically should collide in // in names. - tmpDir1, err := ioutil.TempDir("", "") + tmpDir1, err := os.MkdirTemp("", "") if err != nil { t.Fatal(err) } - tmpDir2, err := ioutil.TempDir("", "") + tmpDir2, err := os.MkdirTemp("", "") if err != nil { t.Fatal(err) } @@ -105,7 +106,7 @@ func readFile(t *testing.T, filesystem fs.Filesystem, name string) string { t.Fatal(err) } defer fd.Close() - buf, err := ioutil.ReadAll(fd) + buf, err := io.ReadAll(fd) if err != nil { t.Fatal(err) } diff --git a/lib/versioner/versioner_test.go b/lib/versioner/versioner_test.go index 4dfaaf32225..4ba73c36c6a 100644 --- a/lib/versioner/versioner_test.go +++ b/lib/versioner/versioner_test.go @@ -9,7 +9,6 @@ package versioner import ( "context" "fmt" - "io/ioutil" "os" "path/filepath" "testing" @@ -56,7 +55,7 @@ func TestVersionerCleanOut(t *testing.T) { oldTime := time.Now().Add(-8 * 24 * time.Hour) for file, shouldRemove := range testcases { os.MkdirAll(filepath.Dir(file), 0777) - if err := ioutil.WriteFile(file, []byte("data"), 0644); err != nil { + if err := os.WriteFile(file, []byte("data"), 0644); err != nil { t.Fatal(err) } if shouldRemove { diff --git a/lib/weakhash/weakhash_test.go b/lib/weakhash/weakhash_test.go index 0d9ca91c295..78c2d3906dc 100644 --- a/lib/weakhash/weakhash_test.go +++ b/lib/weakhash/weakhash_test.go @@ -13,7 +13,6 @@ import ( "bytes" "context" "io" - "io/ioutil" "os" "reflect" "testing" @@ -22,7 +21,7 @@ import ( var payload = []byte("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz") func TestFinder(t *testing.T) { - f, err := ioutil.TempFile("", "") + f, err := os.CreateTemp("", "") if err != nil { t.Error(err) } diff --git a/script/authors.go b/script/authors.go index 3068aebd56b..37fa76bbedc 100644 --- a/script/authors.go +++ b/script/authors.go @@ -15,7 +15,7 @@ package main import ( "bytes" "fmt" - "io/ioutil" + "io" "log" "math" "os" @@ -108,7 +108,7 @@ func main() { bs := readAll(htmlFile) bs = authorsRe.ReplaceAll(bs, []byte("id=\"contributor-list\">\n"+replacement+"\n ")) - if err := ioutil.WriteFile(htmlFile, bs, 0644); err != nil { + if err := os.WriteFile(htmlFile, bs, 0644); err != nil { log.Fatal(err) } @@ -173,7 +173,7 @@ func readAll(path string) []byte { } defer fd.Close() - bs, err := ioutil.ReadAll(fd) + bs, err := io.ReadAll(fd) if err != nil { log.Fatal(err) } diff --git a/script/commit-msg.go b/script/commit-msg.go index c5e178dea42..fa1a13d167f 100644 --- a/script/commit-msg.go +++ b/script/commit-msg.go @@ -12,7 +12,6 @@ package main import ( "bytes" "fmt" - "io/ioutil" "os" "path/filepath" "regexp" @@ -31,7 +30,7 @@ func main() { os.Exit(exitError) } - bs, err := ioutil.ReadFile(os.Args[1]) + bs, err := os.ReadFile(os.Args[1]) if err != nil { fmt.Println("Reading input:", err) os.Exit(exitError) diff --git a/script/genassets.go b/script/genassets.go index 71f965ab941..4d1b636f62d 100644 --- a/script/genassets.go +++ b/script/genassets.go @@ -16,7 +16,6 @@ import ( "fmt" "go/format" "io" - "io/ioutil" "os" "path/filepath" "strconv" @@ -74,7 +73,7 @@ func walkerFor(basePath string) filepath.WalkFunc { } if info.Mode().IsRegular() { - data, err := ioutil.ReadFile(name) + data, err := os.ReadFile(name) if err != nil { return err } diff --git a/script/prune_mocks.go b/script/prune_mocks.go index ba924102778..ab56c3e08a9 100644 --- a/script/prune_mocks.go +++ b/script/prune_mocks.go @@ -12,7 +12,6 @@ package main import ( "bufio" "flag" - "io/ioutil" "log" "os" "os/exec" @@ -51,7 +50,7 @@ func pruneInterfaceCheck(path string, size int64) error { } defer fd.Close() - tmp, err := ioutil.TempFile(".", "") + tmp, err := os.CreateTemp(".", "") if err != nil { return err } diff --git a/script/transifexdl.go b/script/transifexdl.go index 321bdab6fc8..abb5291cfc1 100644 --- a/script/transifexdl.go +++ b/script/transifexdl.go @@ -12,7 +12,7 @@ package main import ( "encoding/json" "fmt" - "io/ioutil" + "io" "log" "net/http" "os" @@ -140,7 +140,7 @@ func loadValidLangs() []string { log.Fatal(err) } defer fd.Close() - bs, err := ioutil.ReadAll(fd) + bs, err := io.ReadAll(fd) if err != nil { log.Fatal(err) } diff --git a/test/conflict_test.go b/test/conflict_test.go index c163dbb561f..de93fe3542a 100644 --- a/test/conflict_test.go +++ b/test/conflict_test.go @@ -11,7 +11,6 @@ package integration import ( "bytes" - "io/ioutil" "log" "os" "path/filepath" @@ -189,7 +188,7 @@ func TestConflictsDefault(t *testing.T) { if len(files) != 1 { t.Errorf("Expected 1 conflicted files instead of %d", len(files)) } - bs, err := ioutil.ReadFile("s1/testfile.txt") + bs, err := os.ReadFile("s1/testfile.txt") if err != nil { t.Error("reading file:", err) } @@ -216,26 +215,26 @@ func TestConflictsInitialMerge(t *testing.T) { // File 1 is a conflict - err = ioutil.WriteFile("s1/file1", []byte("hello\n"), 0644) + err = os.WriteFile("s1/file1", []byte("hello\n"), 0644) if err != nil { t.Fatal(err) } - err = ioutil.WriteFile("s2/file1", []byte("goodbye\n"), 0644) + err = os.WriteFile("s2/file1", []byte("goodbye\n"), 0644) if err != nil { t.Fatal(err) } // File 2 exists on s1 only - err = ioutil.WriteFile("s1/file2", []byte("hello\n"), 0644) + err = os.WriteFile("s1/file2", []byte("hello\n"), 0644) if err != nil { t.Fatal(err) } // File 3 exists on s2 only - err = ioutil.WriteFile("s2/file3", []byte("goodbye\n"), 0644) + err = os.WriteFile("s2/file3", []byte("goodbye\n"), 0644) if err != nil { t.Fatal(err) } @@ -315,15 +314,15 @@ func TestConflictsIndexReset(t *testing.T) { // Three files on s1 - err = ioutil.WriteFile("s1/file1", []byte("hello\n"), 0644) + err = os.WriteFile("s1/file1", []byte("hello\n"), 0644) if err != nil { t.Fatal(err) } - err = ioutil.WriteFile("s1/file2", []byte("hello\n"), 0644) + err = os.WriteFile("s1/file2", []byte("hello\n"), 0644) if err != nil { t.Fatal(err) } - err = ioutil.WriteFile("s2/file3", []byte("hello\n"), 0644) + err = os.WriteFile("s2/file3", []byte("hello\n"), 0644) if err != nil { t.Fatal(err) } @@ -371,7 +370,7 @@ func TestConflictsIndexReset(t *testing.T) { // locally after we rest the index, unless we have a fix for that. for i := 0; i < 5; i++ { - err = ioutil.WriteFile("s2/file2", []byte("hello1\n"), 0644) + err = os.WriteFile("s2/file2", []byte("hello1\n"), 0644) if err != nil { t.Fatal(err) } @@ -393,7 +392,7 @@ func TestConflictsIndexReset(t *testing.T) { // s1/file1 (remote) changes while receiver is down - err = ioutil.WriteFile("s1/file1", []byte("goodbye\n"), 0644) + err = os.WriteFile("s1/file1", []byte("goodbye\n"), 0644) if err != nil { t.Fatal(err) } @@ -406,7 +405,7 @@ func TestConflictsIndexReset(t *testing.T) { // s2/file2 (local) changes while receiver is down - err = ioutil.WriteFile("s2/file2", []byte("goodbye\n"), 0644) + err = os.WriteFile("s2/file2", []byte("goodbye\n"), 0644) if err != nil { t.Fatal(err) } @@ -468,22 +467,22 @@ func TestConflictsSameContent(t *testing.T) { // Two files on s1 - err = ioutil.WriteFile("s1/file1", []byte("hello\n"), 0644) + err = os.WriteFile("s1/file1", []byte("hello\n"), 0644) if err != nil { t.Fatal(err) } - err = ioutil.WriteFile("s1/file2", []byte("hello\n"), 0644) + err = os.WriteFile("s1/file2", []byte("hello\n"), 0644) if err != nil { t.Fatal(err) } // Two files on s2, content differs in file1 only, timestamps differ on both. - err = ioutil.WriteFile("s2/file1", []byte("goodbye\n"), 0644) + err = os.WriteFile("s2/file1", []byte("goodbye\n"), 0644) if err != nil { t.Fatal(err) } - err = ioutil.WriteFile("s2/file2", []byte("hello\n"), 0644) + err = os.WriteFile("s2/file2", []byte("hello\n"), 0644) if err != nil { t.Fatal(err) } diff --git a/test/delay_scan_test.go b/test/delay_scan_test.go index 8b451c9824e..1cb90e2c179 100644 --- a/test/delay_scan_test.go +++ b/test/delay_scan_test.go @@ -10,8 +10,8 @@ package integration import ( - "io/ioutil" "log" + "os" "sync" "testing" "time" @@ -31,7 +31,7 @@ func TestRescanWithDelay(t *testing.T) { } log.Println("Generating .stignore...") - err = ioutil.WriteFile("s1/.stignore", []byte("some ignore data\n"), 0644) + err = os.WriteFile("s1/.stignore", []byte("some ignore data\n"), 0644) if err != nil { t.Fatal(err) } diff --git a/test/http_test.go b/test/http_test.go index a00bdb7d2ef..4541c75b472 100644 --- a/test/http_test.go +++ b/test/http_test.go @@ -11,8 +11,9 @@ package integration import ( "bytes" - "io/ioutil" + "io" "net/http" + "os" "strings" "testing" @@ -33,7 +34,7 @@ func TestHTTPGetIndex(t *testing.T) { if res.StatusCode != 200 { t.Errorf("Status %d != 200", res.StatusCode) } - bs, err := ioutil.ReadAll(res.Body) + bs, err := io.ReadAll(res.Body) if err != nil { t.Fatal(err) } @@ -57,7 +58,7 @@ func TestHTTPGetIndex(t *testing.T) { if res.StatusCode != 200 { t.Errorf("Status %d != 200", res.StatusCode) } - bs, err = ioutil.ReadAll(res.Body) + bs, err = io.ReadAll(res.Body) if err != nil { t.Fatal(err) } @@ -222,7 +223,7 @@ func setupAPIBench() *rc.Process { panic(err) } - err = ioutil.WriteFile("s1/knownfile", []byte("somedatahere"), 0644) + err = os.WriteFile("s1/knownfile", []byte("somedatahere"), 0644) if err != nil { panic(err) } diff --git a/test/ignore_test.go b/test/ignore_test.go index 5022026c0be..abc2faab419 100644 --- a/test/ignore_test.go +++ b/test/ignore_test.go @@ -10,7 +10,6 @@ package integration import ( - "io/ioutil" "log" "os" "path/filepath" @@ -67,7 +66,7 @@ func TestIgnores(t *testing.T) { // Add some of them to an ignore file - err = ioutil.WriteFile("s1/.stignore", + err = os.WriteFile("s1/.stignore", []byte("f1*\nf2\nd1*\nd2\ns1*\ns2\n(?i)*.txt"), // [fds][34] only non-ignored items 0644) if err != nil { @@ -92,7 +91,7 @@ func TestIgnores(t *testing.T) { // Change the pattern to include some of the files and dirs previously ignored time.Sleep(1100 * time.Millisecond) - err = ioutil.WriteFile("s1/.stignore", []byte("f2\nd2\ns2\n"), 0644) + err = os.WriteFile("s1/.stignore", []byte("f2\nd2\ns2\n"), 0644) // Rescan and verify that we see them diff --git a/test/override_test.go b/test/override_test.go index b2fa14f11cd..5851dfbe0db 100644 --- a/test/override_test.go +++ b/test/override_test.go @@ -10,7 +10,7 @@ package integration import ( - "io/ioutil" + "io" "log" "os" "strings" @@ -127,7 +127,7 @@ func TestOverride(t *testing.T) { if err != nil { t.Fatal(err) } - bs, err := ioutil.ReadAll(fd) + bs, err := io.ReadAll(fd) if err != nil { t.Fatal(err) } @@ -141,7 +141,7 @@ func TestOverride(t *testing.T) { if err != nil { t.Fatal(err) } - bs, err = ioutil.ReadAll(fd) + bs, err = io.ReadAll(fd) if err != nil { t.Fatal(err) } @@ -295,7 +295,7 @@ func TestOverrideIgnores(t *testing.T) { if err != nil { t.Fatal(err) } - bs, err := ioutil.ReadAll(fd) + bs, err := io.ReadAll(fd) if err != nil { t.Fatal(err) } @@ -309,7 +309,7 @@ func TestOverrideIgnores(t *testing.T) { if err != nil { t.Fatal(err) } - bs, err = ioutil.ReadAll(fd) + bs, err = io.ReadAll(fd) if err != nil { t.Fatal(err) } @@ -337,7 +337,7 @@ func TestOverrideIgnores(t *testing.T) { if err != nil { t.Fatal(err) } - bs, err = ioutil.ReadAll(fd) + bs, err = io.ReadAll(fd) if err != nil { t.Fatal(err) } @@ -388,7 +388,7 @@ func TestOverrideIgnores(t *testing.T) { if err != nil { t.Fatal(err) } - bs, err = ioutil.ReadAll(fd) + bs, err = io.ReadAll(fd) if err != nil { t.Fatal(err) } @@ -423,7 +423,7 @@ func TestOverrideIgnores(t *testing.T) { if err != nil { t.Fatal(err) } - bs, err = ioutil.ReadAll(fd) + bs, err = io.ReadAll(fd) if err != nil { t.Fatal(err) } diff --git a/test/parallell_scan_test.go b/test/parallell_scan_test.go index e3f35f2b710..13a07d5b639 100644 --- a/test/parallell_scan_test.go +++ b/test/parallell_scan_test.go @@ -10,8 +10,8 @@ package integration import ( - "io/ioutil" "log" + "os" "sync" "testing" "time" @@ -31,7 +31,7 @@ func TestRescanInParallel(t *testing.T) { } log.Println("Generating .stignore...") - err = ioutil.WriteFile("s1/.stignore", []byte("some ignore data\n"), 0644) + err = os.WriteFile("s1/.stignore", []byte("some ignore data\n"), 0644) if err != nil { t.Fatal(err) } diff --git a/test/reset_test.go b/test/reset_test.go index 1e781c7e385..35d471571ef 100644 --- a/test/reset_test.go +++ b/test/reset_test.go @@ -13,7 +13,6 @@ import ( "bytes" "fmt" "io" - "io/ioutil" "log" "os" "path/filepath" @@ -147,7 +146,7 @@ func createFiles(t *testing.T) int { const n = 8 for i := 0; i < n; i++ { file := fmt.Sprintf("f%d", i) - if err := ioutil.WriteFile(filepath.Join("s1", file), []byte("data"), 0644); err != nil { + if err := os.WriteFile(filepath.Join("s1", file), []byte("data"), 0644); err != nil { t.Fatal(err) } } diff --git a/test/util.go b/test/util.go index 8f69dacdaa1..99a0f73861a 100644 --- a/test/util.go +++ b/test/util.go @@ -14,7 +14,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "log" "math/rand" "os" @@ -206,7 +205,7 @@ func alterFiles(dir string) error { return err } d1 := []byte("I used to be a dir: " + path) - err := ioutil.WriteFile(path, d1, 0644) + err := os.WriteFile(path, d1, 0644) if err != nil { return err } @@ -551,7 +550,7 @@ func startInstance(t *testing.T, i int) *rc.Process { } func symlinksSupported() bool { - tmp, err := ioutil.TempDir("", "symlink-test") + tmp, err := os.MkdirTemp("", "symlink-test") if err != nil { return false } From 1754c933706792c3945009d87d1e560cead1ade1 Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Mon, 22 Nov 2021 09:38:24 +0100 Subject: [PATCH 017/220] lib/config, lib/ignore: Write Windows line endings (fixes #7115) (#8052) --- build.go | 2 +- lib/config/config_test.go | 35 +++++++++++++++++++++++++++++++ lib/config/wrapper.go | 2 +- lib/ignore/ignore.go | 3 ++- lib/ignore/ignore_test.go | 39 +++++++++++++++++++++++++++++++++++ lib/osutil/replacingwriter.go | 14 +++++++++++++ 6 files changed, 92 insertions(+), 3 deletions(-) diff --git a/build.go b/build.go index 2a480a5464d..c2e10593982 100644 --- a/build.go +++ b/build.go @@ -1293,7 +1293,7 @@ func zipFile(out string, files []archiveFile) { if err != nil { log.Fatal(err) } - bs = bytes.Replace(bs, []byte{'\n'}, []byte{'\n', '\r'}, -1) + bs = bytes.Replace(bs, []byte{'\n'}, []byte{'\r', '\n'}, -1) fh.UncompressedSize = uint32(len(bs)) fh.UncompressedSize64 = uint64(len(bs)) diff --git a/lib/config/config_test.go b/lib/config/config_test.go index ec7db576304..861c5783980 100644 --- a/lib/config/config_test.go +++ b/lib/config/config_test.go @@ -594,6 +594,41 @@ func TestNewSaveLoad(t *testing.T) { } } +func TestWindowsLineEndings(t *testing.T) { + if runtime.GOOS != "windows" { + t.Skip("Windows specific") + } + + dir, err := os.MkdirTemp("", "syncthing-test") + if err != nil { + t.Fatal(err) + } + defer os.RemoveAll(dir) + + path := filepath.Join(dir, "config.xml") + os.Remove(path) + defer os.Remove(path) + + intCfg := New(device1) + cfg := wrap(path, intCfg, device1) + defer cfg.stop() + + if err := cfg.Save(); err != nil { + t.Error(err) + } + + bs, err := os.ReadFile(path) + if err != nil { + t.Error(err) + } + + unixLineEndings := bytes.Count(bs, []byte("\n")) + windowsLineEndings := bytes.Count(bs, []byte("\r\n")) + if unixLineEndings == 0 || windowsLineEndings != unixLineEndings { + t.Error("expected there to be a non-zero number of Windows line endings") + } +} + func TestPrepare(t *testing.T) { var cfg Configuration diff --git a/lib/config/wrapper.go b/lib/config/wrapper.go index 4d5c8f93ccf..4c52b0ce069 100644 --- a/lib/config/wrapper.go +++ b/lib/config/wrapper.go @@ -502,7 +502,7 @@ func (w *wrapper) Save() error { return err } - if err := w.cfg.WriteXML(fd); err != nil { + if err := w.cfg.WriteXML(osutil.LineEndingsWriter(fd)); err != nil { l.Debugln("WriteXML:", err) fd.Close() return err diff --git a/lib/ignore/ignore.go b/lib/ignore/ignore.go index 9b13c1e6315..243f178d925 100644 --- a/lib/ignore/ignore.go +++ b/lib/ignore/ignore.go @@ -595,8 +595,9 @@ func WriteIgnores(filesystem fs.Filesystem, path string, content []string) error return err } + wr := osutil.LineEndingsWriter(fd) for _, line := range content { - fmt.Fprintln(fd, line) + fmt.Fprintln(wr, line) } if err := fd.Close(); err != nil { diff --git a/lib/ignore/ignore_test.go b/lib/ignore/ignore_test.go index 9781cbdfafc..b1f19c5a99d 100644 --- a/lib/ignore/ignore_test.go +++ b/lib/ignore/ignore_test.go @@ -1192,3 +1192,42 @@ func TestEmptyPatterns(t *testing.T) { } } } + +func TestWindowsLineEndings(t *testing.T) { + if runtime.GOOS != "windows" { + t.Skip("Windows specific") + } + + lines := "foo\nbar\nbaz\n" + + dir, err := os.MkdirTemp("", "syncthing-test") + if err != nil { + t.Fatal(err) + } + defer os.RemoveAll(dir) + + ffs := fs.NewFilesystem(fs.FilesystemTypeBasic, dir) + m := New(ffs) + if err := m.Parse(strings.NewReader(lines), ".stignore"); err != nil { + t.Fatal(err) + } + if err := WriteIgnores(ffs, ".stignore", m.Lines()); err != nil { + t.Fatal(err) + } + + fd, err := ffs.Open(".stignore") + if err != nil { + t.Fatal(err) + } + bs, err := io.ReadAll(fd) + fd.Close() + if err != nil { + t.Fatal(err) + } + + unixLineEndings := bytes.Count(bs, []byte("\n")) + windowsLineEndings := bytes.Count(bs, []byte("\r\n")) + if unixLineEndings == 0 || windowsLineEndings != unixLineEndings { + t.Error("expected there to be a non-zero number of Windows line endings") + } +} diff --git a/lib/osutil/replacingwriter.go b/lib/osutil/replacingwriter.go index 71e86fd631d..18be86f3eb1 100644 --- a/lib/osutil/replacingwriter.go +++ b/lib/osutil/replacingwriter.go @@ -9,6 +9,7 @@ package osutil import ( "bytes" "io" + "runtime" ) type ReplacingWriter struct { @@ -46,3 +47,16 @@ func (w ReplacingWriter) Write(bs []byte) (int, error) { return written, err } + +// LineEndingsWriter returns a writer that writes platform-appropriate line +// endings. (This is a no-op on non-Windows platforms.) +func LineEndingsWriter(w io.Writer) io.Writer { + if runtime.GOOS != "windows" { + return w + } + return &ReplacingWriter{ + Writer: w, + From: '\n', + To: []byte{'\r', '\n'}, + } +} From 7161a99b04b1370aeed3e7fb39c8d7f370e4307b Mon Sep 17 00:00:00 2001 From: tomasz1986 Date: Mon, 22 Nov 2021 17:41:43 +0900 Subject: [PATCH 018/220] gui: Allow text wrapping in remove folder/device modals (#7976) Remove the embedded CSS that prevents the lines from wrapping, resulting in device and folder names being hidden on small screens. --- gui/default/syncthing/device/removeDeviceDialogView.html | 8 +++++--- gui/default/syncthing/folder/removeFolderDialogView.html | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/gui/default/syncthing/device/removeDeviceDialogView.html b/gui/default/syncthing/device/removeDeviceDialogView.html index bc9f20292c5..c8197d3ce24 100644 --- a/gui/default/syncthing/device/removeDeviceDialogView.html +++ b/gui/default/syncthing/device/removeDeviceDialogView.html @@ -1,9 +1,11 @@
-

- Are you sure you want to remove device {%name%}? +

+ Are you sure you want to remove device {%name%}? +

+

+ {%reintroducer%} might reintroduce this device.

-

{%reintroducer%} might reintroduce this device.

-
+
@@ -172,7 +172,7 @@ -
+
diff --git a/gui/default/syncthing/folder/editFolderModalView.html b/gui/default/syncthing/folder/editFolderModalView.html index 5fd8bc8e382..2c0c3559750 100644 --- a/gui/default/syncthing/folder/editFolderModalView.html +++ b/gui/default/syncthing/folder/editFolderModalView.html @@ -2,44 +2,44 @@
-
+

Optional descriptive label for the folder. Can be different on each device.

-
+
- +

Required identifier for the folder. Must be the same on all cluster devices. The folder ID must be unique. The folder ID cannot be blank. - 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. + 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.

-
+
- +

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 {{system.tilde}}.
 - The folder path cannot be blank. + The folder path cannot be blank. Warning, this path is a subdirectory of an existing folder "{%otherFolder%}". Warning, this path is a subdirectory of an existing folder "{%otherFolderLabel%}" ({%otherFolder%}). - + Warning, this path is a parent directory of an existing folder "{%otherFolder%}". Warning, this path is a parent directory of an existing folder "{%otherFolderLabel%}" ({%otherFolder%}). @@ -148,33 +148,42 @@

-
-

Enter ignore patterns, one per line.

-
- -

- {{ignores.error}} -

+
+
+ +

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.

+
+
+

Enter ignore patterns, one per line.

+
+ +

+ {{ignores.error}} +

+
+
+

Quick guide to supported patterns (full documentation):

+
+
(?d)
+
Prefix indicating that the file can be deleted if preventing directory removal
+
(?i)
+
Prefix indicating that the pattern should be matched without case sensitivity
+
!
+
Inversion of the given condition (i.e. do not exclude)
+
*
+
Single level wildcard (matches within a directory only)
+
**
+
Multi level wildcard (matches multiple directory levels)
+
//
+
Comment, when used at the start of a line
+
+
+
+ Editing {%path%}. +
-
-

Quick guide to supported patterns (full documentation):

-
-
(?d)
-
Prefix indicating that the file can be deleted if preventing directory removal
-
(?i)
-
Prefix indicating that the pattern should be matched without case sensitivity
-
!
-
Inversion of the given condition (i.e. do not exclude)
-
*
-
Single level wildcard (matches within a directory only)
-
**
-
Multi level wildcard (matches multiple directory levels)
-
//
-
Comment, when used at the start of a line
-
-
- Editing {%path%}. - Creating ignore patterns, overwriting an existing file at {%path%}.
@@ -205,17 +214,17 @@
  Help - - +

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.

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.

-

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.

-

Folder type "{%receiveEncrypted%}" can only be set when adding a new 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.

+

Folder type "{%receiveEncrypted%}" can only be set when adding a new folder.

@@ -274,7 +283,7 @@ -
diff --git a/lib/api/api.go b/lib/api/api.go index 1e8c4747b85..7a4f96ed8d6 100644 --- a/lib/api/api.go +++ b/lib/api/api.go @@ -313,6 +313,7 @@ func (s *service) Serve(ctx context.Context) error { configBuilder.registerDevice("/rest/config/devices/:id") configBuilder.registerDefaultFolder("/rest/config/defaults/folder") configBuilder.registerDefaultDevice("/rest/config/defaults/device") + configBuilder.registerDefaultIgnores("/rest/config/defaults/ignores") configBuilder.registerOptions("/rest/config/options") configBuilder.registerLDAP("/rest/config/ldap") configBuilder.registerGUI("/rest/config/gui") diff --git a/lib/api/confighandler.go b/lib/api/confighandler.go index 96578b6712a..8e06354a9b8 100644 --- a/lib/api/confighandler.go +++ b/lib/api/confighandler.go @@ -229,6 +229,28 @@ func (c *configMuxBuilder) registerDefaultDevice(path string) { }) } +func (c *configMuxBuilder) registerDefaultIgnores(path string) { + c.HandlerFunc(http.MethodGet, path, func(w http.ResponseWriter, _ *http.Request) { + sendJSON(w, c.cfg.DefaultIgnores()) + }) + + c.HandlerFunc(http.MethodPut, path, func(w http.ResponseWriter, r *http.Request) { + var ignores config.Ignores + if err := unmarshalTo(r.Body, &ignores); err != nil { + http.Error(w, err.Error(), http.StatusBadRequest) + return + } + waiter, err := c.cfg.Modify(func(cfg *config.Configuration) { + cfg.Defaults.Ignores = ignores + }) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + c.finish(w, waiter) + }) +} + func (c *configMuxBuilder) registerOptions(path string) { c.HandlerFunc(http.MethodGet, path, func(w http.ResponseWriter, _ *http.Request) { sendJSON(w, c.cfg.Options()) diff --git a/lib/config/config.go b/lib/config/config.go index 302cc760c2b..1ad68304dca 100644 --- a/lib/config/config.go +++ b/lib/config/config.go @@ -621,3 +621,9 @@ func ensureZeroForNodefault(empty interface{}, target interface{}) { return len(v) > 0 }) } + +func (i Ignores) Copy() Ignores { + out := Ignores{Lines: make([]string, len(i.Lines))} + copy(out.Lines, i.Lines) + return out +} diff --git a/lib/config/config.pb.go b/lib/config/config.pb.go index 6b722c10088..12a65df0d58 100644 --- a/lib/config/config.pb.go +++ b/lib/config/config.pb.go @@ -69,8 +69,9 @@ func (m *Configuration) XXX_DiscardUnknown() { var xxx_messageInfo_Configuration proto.InternalMessageInfo type Defaults struct { - Folder FolderConfiguration `protobuf:"bytes,1,opt,name=folder,proto3" json:"folder" xml:"folder"` - Device DeviceConfiguration `protobuf:"bytes,2,opt,name=device,proto3" json:"device" xml:"device"` + Folder FolderConfiguration `protobuf:"bytes,1,opt,name=folder,proto3" json:"folder" xml:"folder"` + Device DeviceConfiguration `protobuf:"bytes,2,opt,name=device,proto3" json:"device" xml:"device"` + Ignores Ignores `protobuf:"bytes,3,opt,name=ignores,proto3" json:"ignores" xml:"ignores"` } func (m *Defaults) Reset() { *m = Defaults{} } @@ -106,56 +107,98 @@ func (m *Defaults) XXX_DiscardUnknown() { var xxx_messageInfo_Defaults proto.InternalMessageInfo +type Ignores struct { + Lines []string `protobuf:"bytes,1,rep,name=lines,proto3" json:"lines" xml:"line"` +} + +func (m *Ignores) Reset() { *m = Ignores{} } +func (m *Ignores) String() string { return proto.CompactTextString(m) } +func (*Ignores) ProtoMessage() {} +func (*Ignores) Descriptor() ([]byte, []int) { + return fileDescriptor_baadf209193dc627, []int{2} +} +func (m *Ignores) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Ignores) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Ignores.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Ignores) XXX_Merge(src proto.Message) { + xxx_messageInfo_Ignores.Merge(m, src) +} +func (m *Ignores) XXX_Size() int { + return m.ProtoSize() +} +func (m *Ignores) XXX_DiscardUnknown() { + xxx_messageInfo_Ignores.DiscardUnknown(m) +} + +var xxx_messageInfo_Ignores proto.InternalMessageInfo + func init() { proto.RegisterType((*Configuration)(nil), "config.Configuration") proto.RegisterType((*Defaults)(nil), "config.Defaults") + proto.RegisterType((*Ignores)(nil), "config.Ignores") } func init() { proto.RegisterFile("lib/config/config.proto", fileDescriptor_baadf209193dc627) } var fileDescriptor_baadf209193dc627 = []byte{ - // 654 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x94, 0xcd, 0x6e, 0xd3, 0x40, - 0x10, 0xc7, 0xed, 0xa6, 0x4d, 0xda, 0xed, 0x17, 0x32, 0x08, 0x5c, 0x3e, 0xbc, 0x61, 0x15, 0x50, - 0x41, 0xa5, 0x95, 0xca, 0x05, 0x71, 0x23, 0x44, 0x94, 0x0a, 0x24, 0x2a, 0xa3, 0x22, 0xe0, 0x82, - 0x92, 0x78, 0xeb, 0xae, 0x94, 0xd8, 0x96, 0xbd, 0xae, 0xda, 0x47, 0xe0, 0x86, 0x78, 0x02, 0x4e, - 0x48, 0xdc, 0x79, 0x88, 0xdc, 0x92, 0x23, 0xa7, 0x95, 0x9a, 0xdc, 0x7c, 0xf4, 0x91, 0x13, 0xda, - 0x0f, 0xbb, 0xb6, 0x6a, 0xe0, 0x64, 0xcf, 0xfc, 0xff, 0xf3, 0x9b, 0xd5, 0x78, 0xc7, 0xe0, 0xc6, - 0x80, 0xf4, 0x76, 0xfa, 0xbe, 0x77, 0x44, 0x5c, 0xf5, 0xd8, 0x0e, 0x42, 0x9f, 0xfa, 0x46, 0x5d, - 0x46, 0x37, 0x5b, 0x05, 0xc3, 0x91, 0x3f, 0x70, 0x70, 0x28, 0x83, 0x38, 0xec, 0x52, 0xe2, 0x7b, - 0xd2, 0x5d, 0x72, 0x39, 0xf8, 0x84, 0xf4, 0x71, 0x95, 0xeb, 0x6e, 0xc1, 0xe5, 0xc6, 0xa4, 0xca, - 0x82, 0x0a, 0x96, 0x81, 0xd3, 0x0d, 0xaa, 0x3c, 0xf7, 0x0a, 0x1e, 0x3f, 0xe0, 0x42, 0x54, 0x65, - 0xdb, 0x28, 0xda, 0x7a, 0x11, 0x0e, 0x4f, 0xb0, 0xa3, 0xa4, 0x25, 0x7c, 0x4a, 0xe5, 0x2b, 0xfa, - 0xde, 0x00, 0xab, 0xcf, 0x8b, 0xd5, 0x86, 0x0d, 0x1a, 0x27, 0x38, 0x8c, 0x88, 0xef, 0x99, 0x7a, - 0x53, 0xdf, 0x5c, 0x68, 0x3f, 0x49, 0x18, 0xcc, 0x52, 0x29, 0x83, 0xc6, 0xe9, 0x70, 0xf0, 0x14, - 0xa9, 0x78, 0xab, 0x4b, 0x69, 0x88, 0x7e, 0x33, 0x58, 0x23, 0x1e, 0x4d, 0xc6, 0xad, 0x95, 0x62, - 0xde, 0xce, 0xaa, 0x8c, 0x77, 0xa0, 0x21, 0x87, 0x17, 0x99, 0x73, 0xcd, 0xda, 0xe6, 0xf2, 0xee, - 0xad, 0x6d, 0x35, 0xed, 0x17, 0x22, 0x5d, 0x3a, 0x41, 0x1b, 0x8e, 0x18, 0xd4, 0x78, 0x53, 0x55, - 0x93, 0x32, 0xb8, 0x22, 0x9a, 0xca, 0x18, 0xd9, 0x99, 0xc0, 0xb9, 0x72, 0xdc, 0x91, 0x59, 0x2b, - 0x73, 0x3b, 0x22, 0xfd, 0x17, 0xae, 0xaa, 0xc9, 0xb9, 0x32, 0x46, 0x76, 0x26, 0x18, 0x36, 0xa8, - 0xb9, 0x31, 0x31, 0xe7, 0x9b, 0xfa, 0xe6, 0xf2, 0xae, 0x99, 0x31, 0xf7, 0x0e, 0xf7, 0xcb, 0xc0, - 0xfb, 0x1c, 0x38, 0x65, 0xb0, 0xb6, 0x77, 0xb8, 0x9f, 0x30, 0xc8, 0x6b, 0x52, 0x06, 0x97, 0x04, - 0xd3, 0x8d, 0x09, 0xfa, 0x3a, 0x69, 0x71, 0xc9, 0xe6, 0x82, 0xf1, 0x01, 0xcc, 0xf3, 0x2f, 0x6a, - 0x2e, 0x08, 0xe8, 0x46, 0x06, 0x7d, 0xdd, 0x79, 0x76, 0x50, 0xa6, 0x3e, 0x54, 0xd4, 0x79, 0x2e, - 0x25, 0x0c, 0x8a, 0xb2, 0x94, 0x41, 0x20, 0xb8, 0x3c, 0xe0, 0x60, 0xa1, 0xda, 0x42, 0x33, 0xde, - 0x83, 0x86, 0xba, 0x08, 0x66, 0x5d, 0xd0, 0x6f, 0x67, 0xf4, 0x37, 0x32, 0x5d, 0x6e, 0xd0, 0xcc, - 0xe6, 0xa0, 0x8a, 0x52, 0x06, 0x57, 0x05, 0x5b, 0xc5, 0xc8, 0xce, 0x14, 0xe3, 0x87, 0x0e, 0xd6, - 0x89, 0xeb, 0xf9, 0x21, 0x76, 0x3e, 0x65, 0x93, 0x6e, 0x88, 0x49, 0x5f, 0xcf, 0x5b, 0xa8, 0xbb, - 0x25, 0x27, 0xde, 0x3e, 0x56, 0xf0, 0x6b, 0x21, 0x1e, 0xfa, 0x14, 0xef, 0xcb, 0xe2, 0x4e, 0x3e, - 0xf1, 0x0d, 0xd1, 0xa9, 0x42, 0x44, 0xc9, 0xb8, 0x75, 0xb5, 0x22, 0x9f, 0x8e, 0x5b, 0x95, 0x2c, - 0x7b, 0x8d, 0x94, 0x62, 0xe3, 0xb3, 0x0e, 0xd6, 0x03, 0xec, 0x39, 0xc4, 0x73, 0xf3, 0xb3, 0x2e, - 0xfe, 0xf3, 0xac, 0x2f, 0xd5, 0xa4, 0xcd, 0x0e, 0x0e, 0x42, 0xdc, 0xef, 0x52, 0xec, 0x1c, 0x48, - 0x80, 0x62, 0x26, 0x0c, 0xea, 0x8f, 0x52, 0x06, 0xef, 0x88, 0x43, 0x07, 0x45, 0x6d, 0xcb, 0x1f, - 0x12, 0x8a, 0x87, 0x01, 0x3d, 0x43, 0xa6, 0x6e, 0xaf, 0x95, 0xb4, 0xc8, 0x38, 0x00, 0x8b, 0x0e, - 0x3e, 0xea, 0xc6, 0x03, 0x1a, 0x99, 0x4b, 0xe2, 0x93, 0x5c, 0xb9, 0xb8, 0x99, 0x32, 0xdf, 0x46, - 0x6a, 0x52, 0xb9, 0x33, 0x65, 0x70, 0x4d, 0xdd, 0x47, 0x99, 0x40, 0x76, 0xae, 0xa1, 0x9f, 0x3a, - 0x58, 0xcc, 0x4a, 0x8d, 0xb7, 0xa0, 0x2e, 0x57, 0x40, 0xac, 0xe8, 0x7f, 0xd6, 0xc9, 0x52, 0x7d, - 0x54, 0xc9, 0xa5, 0x6d, 0x52, 0x79, 0x0e, 0x95, 0x63, 0x33, 0xe7, 0xca, 0xd0, 0xaa, 0x5d, 0xca, - 0xa1, 0xb2, 0xe4, 0xd2, 0x2a, 0xa9, 0x7c, 0xfb, 0xd5, 0xe8, 0xdc, 0xd2, 0x26, 0xe7, 0x96, 0x36, - 0x9a, 0x5a, 0xfa, 0x64, 0x6a, 0xe9, 0x5f, 0x66, 0x96, 0xf6, 0x6d, 0x66, 0xe9, 0x93, 0x99, 0xa5, - 0xfd, 0x9a, 0x59, 0xda, 0xc7, 0x07, 0x2e, 0xa1, 0xc7, 0x71, 0x6f, 0xbb, 0xef, 0x0f, 0x77, 0xa2, - 0x33, 0xaf, 0x4f, 0x8f, 0x89, 0xe7, 0x16, 0xde, 0x2e, 0x7e, 0x63, 0xbd, 0xba, 0xf8, 0x67, 0x3d, - 0xfe, 0x13, 0x00, 0x00, 0xff, 0xff, 0x50, 0xe9, 0xd5, 0x50, 0xb6, 0x05, 0x00, 0x00, + // 709 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x94, 0x4b, 0x6f, 0xd3, 0x40, + 0x10, 0xc7, 0xe3, 0xa6, 0x8d, 0x9b, 0xed, 0x0b, 0x19, 0x44, 0x5d, 0x1e, 0xde, 0xb0, 0x0a, 0x28, + 0xa0, 0x3e, 0xa4, 0x72, 0xa9, 0xb8, 0x11, 0x22, 0x4a, 0x55, 0x24, 0x2a, 0xa3, 0x22, 0xe0, 0x82, + 0x92, 0x78, 0xeb, 0xae, 0x94, 0xd8, 0x96, 0xed, 0x54, 0xed, 0x91, 0x23, 0x37, 0xc4, 0x27, 0xe0, + 0x84, 0xc4, 0x37, 0xe9, 0xad, 0x39, 0x72, 0x5a, 0xa9, 0xcd, 0xcd, 0x47, 0x1f, 0x39, 0xa1, 0x7d, + 0x39, 0xb6, 0x6a, 0xe0, 0x94, 0xcc, 0xfc, 0xff, 0xf3, 0xdb, 0xd5, 0xec, 0x8c, 0xc1, 0xea, 0x80, + 0xf4, 0xb6, 0xfa, 0xbe, 0x77, 0x44, 0x5c, 0xf9, 0xb3, 0x19, 0x84, 0x7e, 0xec, 0x1b, 0x35, 0x11, + 0xdd, 0x69, 0xe6, 0x0c, 0x47, 0xfe, 0xc0, 0xc1, 0xa1, 0x08, 0x46, 0x61, 0x37, 0x26, 0xbe, 0x27, + 0xdc, 0x05, 0x97, 0x83, 0x4f, 0x48, 0x1f, 0x97, 0xb9, 0x1e, 0xe4, 0x5c, 0xee, 0x88, 0x94, 0x59, + 0x50, 0xce, 0x32, 0x70, 0xba, 0x41, 0x99, 0xe7, 0x61, 0xce, 0xe3, 0x07, 0x4c, 0x88, 0xca, 0x6c, + 0x6b, 0x79, 0x5b, 0x2f, 0xc2, 0xe1, 0x09, 0x76, 0xa4, 0x54, 0xc7, 0xa7, 0xb1, 0xf8, 0x8b, 0x7e, + 0xe8, 0x60, 0xe9, 0x45, 0xbe, 0xda, 0xb0, 0x81, 0x7e, 0x82, 0xc3, 0x88, 0xf8, 0x9e, 0xa9, 0x35, + 0xb4, 0xd6, 0x5c, 0x7b, 0x27, 0xa1, 0x50, 0xa5, 0x52, 0x0a, 0x8d, 0xd3, 0xe1, 0xe0, 0x19, 0x92, + 0xf1, 0x7a, 0x37, 0x8e, 0x43, 0xf4, 0x9b, 0xc2, 0x2a, 0xf1, 0xe2, 0xe4, 0xa2, 0xb9, 0x98, 0xcf, + 0xdb, 0xaa, 0xca, 0x78, 0x07, 0x74, 0xd1, 0xbc, 0xc8, 0x9c, 0x69, 0x54, 0x5b, 0x0b, 0xdb, 0x77, + 0x37, 0x65, 0xb7, 0x5f, 0xf2, 0x74, 0xe1, 0x06, 0x6d, 0x78, 0x4e, 0x61, 0x85, 0x1d, 0x2a, 0x6b, + 0x52, 0x0a, 0x17, 0xf9, 0xa1, 0x22, 0x46, 0xb6, 0x12, 0x18, 0x57, 0xb4, 0x3b, 0x32, 0xab, 0x45, + 0x6e, 0x87, 0xa7, 0xff, 0xc2, 0x95, 0x35, 0x19, 0x57, 0xc4, 0xc8, 0x56, 0x82, 0x61, 0x83, 0xaa, + 0x3b, 0x22, 0xe6, 0x6c, 0x43, 0x6b, 0x2d, 0x6c, 0x9b, 0x8a, 0xb9, 0x7b, 0xb8, 0x57, 0x04, 0x3e, + 0x62, 0xc0, 0x2b, 0x0a, 0xab, 0xbb, 0x87, 0x7b, 0x09, 0x85, 0xac, 0x26, 0xa5, 0xb0, 0xce, 0x99, + 0xee, 0x88, 0xa0, 0x6f, 0xe3, 0x26, 0x93, 0x6c, 0x26, 0x18, 0x1f, 0xc0, 0x2c, 0x7b, 0x51, 0x73, + 0x8e, 0x43, 0xd7, 0x14, 0xf4, 0x75, 0xe7, 0xf9, 0x41, 0x91, 0xfa, 0x44, 0x52, 0x67, 0x99, 0x94, + 0x50, 0xc8, 0xcb, 0x52, 0x0a, 0x01, 0xe7, 0xb2, 0x80, 0x81, 0xb9, 0x6a, 0x73, 0xcd, 0x78, 0x0f, + 0x74, 0x39, 0x08, 0x66, 0x8d, 0xd3, 0xef, 0x29, 0xfa, 0x1b, 0x91, 0x2e, 0x1e, 0xd0, 0x50, 0x7d, + 0x90, 0x45, 0x29, 0x85, 0x4b, 0x9c, 0x2d, 0x63, 0x64, 0x2b, 0xc5, 0xf8, 0xa9, 0x81, 0x15, 0xe2, + 0x7a, 0x7e, 0x88, 0x9d, 0x4f, 0xaa, 0xd3, 0x3a, 0xef, 0xf4, 0xed, 0xec, 0x08, 0x39, 0x5b, 0xa2, + 0xe3, 0xed, 0x63, 0x09, 0xbf, 0x15, 0xe2, 0xa1, 0x1f, 0xe3, 0x3d, 0x51, 0xdc, 0xc9, 0x3a, 0xbe, + 0xc6, 0x4f, 0x2a, 0x11, 0x51, 0x72, 0xd1, 0xbc, 0x59, 0x92, 0x4f, 0x2f, 0x9a, 0xa5, 0x2c, 0x7b, + 0x99, 0x14, 0x62, 0xe3, 0x8b, 0x06, 0x56, 0x02, 0xec, 0x39, 0xc4, 0x73, 0xb3, 0xbb, 0xce, 0xff, + 0xf3, 0xae, 0xaf, 0x64, 0xa7, 0xcd, 0x0e, 0x0e, 0x42, 0xdc, 0xef, 0xc6, 0xd8, 0x39, 0x10, 0x00, + 0xc9, 0x4c, 0x28, 0xd4, 0x36, 0x52, 0x0a, 0xef, 0xf3, 0x4b, 0x07, 0x79, 0x6d, 0xdd, 0x1f, 0x92, + 0x18, 0x0f, 0x83, 0xf8, 0x0c, 0x99, 0x9a, 0xbd, 0x5c, 0xd0, 0x22, 0xe3, 0x00, 0xcc, 0x3b, 0xf8, + 0xa8, 0x3b, 0x1a, 0xc4, 0x91, 0x59, 0xe7, 0x4f, 0x72, 0x63, 0x3a, 0x99, 0x22, 0xdf, 0x46, 0xb2, + 0x53, 0x99, 0x33, 0xa5, 0x70, 0x59, 0xce, 0xa3, 0x48, 0x20, 0x3b, 0xd3, 0xd0, 0xe7, 0x19, 0x30, + 0xaf, 0x4a, 0x8d, 0xb7, 0xa0, 0x26, 0x56, 0x80, 0xaf, 0xe8, 0x7f, 0xd6, 0xc9, 0x92, 0xe7, 0xc8, + 0x92, 0x6b, 0xdb, 0x24, 0xf3, 0x0c, 0x2a, 0xda, 0x66, 0xce, 0x14, 0xa1, 0x65, 0xbb, 0x94, 0x41, + 0x45, 0xc9, 0xb5, 0x55, 0x92, 0x79, 0x63, 0x1f, 0xe8, 0xe2, 0x99, 0xd8, 0x86, 0x32, 0xea, 0x8a, + 0xa2, 0x8a, 0xd7, 0x8c, 0xa6, 0xd3, 0x28, 0x7d, 0xd9, 0x34, 0xca, 0x18, 0xd9, 0x4a, 0x41, 0x3b, + 0x40, 0x97, 0x55, 0xc6, 0x06, 0x98, 0x1b, 0x10, 0x0f, 0x47, 0xa6, 0xd6, 0xa8, 0xb6, 0xea, 0xed, + 0xd5, 0x84, 0x42, 0x91, 0x98, 0x2e, 0x0a, 0xf1, 0x30, 0xb2, 0x45, 0xb2, 0xbd, 0x7f, 0x7e, 0x69, + 0x55, 0xc6, 0x97, 0x56, 0xe5, 0xfc, 0xca, 0xd2, 0xc6, 0x57, 0x96, 0xf6, 0x75, 0x62, 0x55, 0xbe, + 0x4f, 0x2c, 0x6d, 0x3c, 0xb1, 0x2a, 0xbf, 0x26, 0x56, 0xe5, 0xe3, 0x63, 0x97, 0xc4, 0xc7, 0xa3, + 0xde, 0x66, 0xdf, 0x1f, 0x6e, 0x45, 0x67, 0x5e, 0x3f, 0x3e, 0x26, 0x9e, 0x9b, 0xfb, 0x37, 0xfd, + 0x9a, 0xf6, 0x6a, 0xfc, 0xd3, 0xf9, 0xf4, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x77, 0x7d, 0xcb, + 0x2a, 0x3d, 0x06, 0x00, 0x00, } func (m *Configuration) Marshal() (dAtA []byte, err error) { @@ -302,6 +345,16 @@ func (m *Defaults) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + { + size, err := m.Ignores.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintConfig(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a { size, err := m.Device.MarshalToSizedBuffer(dAtA[:i]) if err != nil { @@ -325,6 +378,38 @@ func (m *Defaults) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *Ignores) Marshal() (dAtA []byte, err error) { + size := m.ProtoSize() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *Ignores) MarshalTo(dAtA []byte) (int, error) { + size := m.ProtoSize() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Ignores) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Lines) > 0 { + for iNdEx := len(m.Lines) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.Lines[iNdEx]) + copy(dAtA[i:], m.Lines[iNdEx]) + i = encodeVarintConfig(dAtA, i, uint64(len(m.Lines[iNdEx]))) + i-- + dAtA[i] = 0xa + } + } + return len(dAtA) - i, nil +} + func encodeVarintConfig(dAtA []byte, offset int, v uint64) int { offset -= sovConfig(v) base := offset @@ -390,6 +475,23 @@ func (m *Defaults) ProtoSize() (n int) { n += 1 + l + sovConfig(uint64(l)) l = m.Device.ProtoSize() n += 1 + l + sovConfig(uint64(l)) + l = m.Ignores.ProtoSize() + n += 1 + l + sovConfig(uint64(l)) + return n +} + +func (m *Ignores) ProtoSize() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.Lines) > 0 { + for _, s := range m.Lines { + l = len(s) + n += 1 + l + sovConfig(uint64(l)) + } + } return n } @@ -831,6 +933,124 @@ func (m *Defaults) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Ignores", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthConfig + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthConfig + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.Ignores.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipConfig(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthConfig + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthConfig + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *Ignores) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: Ignores: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: Ignores: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Lines", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthConfig + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthConfig + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Lines = append(m.Lines, string(dAtA[iNdEx:postIndex])) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipConfig(dAtA[iNdEx:]) diff --git a/lib/config/config_test.go b/lib/config/config_test.go index 861c5783980..a029dce0e74 100644 --- a/lib/config/config_test.go +++ b/lib/config/config_test.go @@ -113,6 +113,9 @@ func TestDefaultValues(t *testing.T) { Compression: protocol.CompressionMetadata, IgnoredFolders: []ObservedFolder{}, }, + Ignores: Ignores{ + Lines: []string{}, + }, }, IgnoredDevices: []ObservedDevice{}, } diff --git a/lib/config/mocks/mocked_wrapper.go b/lib/config/mocks/mocked_wrapper.go index 8cc4029ad1a..28dadba415e 100644 --- a/lib/config/mocks/mocked_wrapper.go +++ b/lib/config/mocks/mocked_wrapper.go @@ -40,6 +40,16 @@ type Wrapper struct { defaultFolderReturnsOnCall map[int]struct { result1 config.FolderConfiguration } + DefaultIgnoresStub func() config.Ignores + defaultIgnoresMutex sync.RWMutex + defaultIgnoresArgsForCall []struct { + } + defaultIgnoresReturns struct { + result1 config.Ignores + } + defaultIgnoresReturnsOnCall map[int]struct { + result1 config.Ignores + } DeviceStub func(protocol.DeviceID) (config.DeviceConfiguration, bool) deviceMutex sync.RWMutex deviceArgsForCall []struct { @@ -449,6 +459,59 @@ func (fake *Wrapper) DefaultFolderReturnsOnCall(i int, result1 config.FolderConf }{result1} } +func (fake *Wrapper) DefaultIgnores() config.Ignores { + fake.defaultIgnoresMutex.Lock() + ret, specificReturn := fake.defaultIgnoresReturnsOnCall[len(fake.defaultIgnoresArgsForCall)] + fake.defaultIgnoresArgsForCall = append(fake.defaultIgnoresArgsForCall, struct { + }{}) + stub := fake.DefaultIgnoresStub + fakeReturns := fake.defaultIgnoresReturns + fake.recordInvocation("DefaultIgnores", []interface{}{}) + fake.defaultIgnoresMutex.Unlock() + if stub != nil { + return stub() + } + if specificReturn { + return ret.result1 + } + return fakeReturns.result1 +} + +func (fake *Wrapper) DefaultIgnoresCallCount() int { + fake.defaultIgnoresMutex.RLock() + defer fake.defaultIgnoresMutex.RUnlock() + return len(fake.defaultIgnoresArgsForCall) +} + +func (fake *Wrapper) DefaultIgnoresCalls(stub func() config.Ignores) { + fake.defaultIgnoresMutex.Lock() + defer fake.defaultIgnoresMutex.Unlock() + fake.DefaultIgnoresStub = stub +} + +func (fake *Wrapper) DefaultIgnoresReturns(result1 config.Ignores) { + fake.defaultIgnoresMutex.Lock() + defer fake.defaultIgnoresMutex.Unlock() + fake.DefaultIgnoresStub = nil + fake.defaultIgnoresReturns = struct { + result1 config.Ignores + }{result1} +} + +func (fake *Wrapper) DefaultIgnoresReturnsOnCall(i int, result1 config.Ignores) { + fake.defaultIgnoresMutex.Lock() + defer fake.defaultIgnoresMutex.Unlock() + fake.DefaultIgnoresStub = nil + if fake.defaultIgnoresReturnsOnCall == nil { + fake.defaultIgnoresReturnsOnCall = make(map[int]struct { + result1 config.Ignores + }) + } + fake.defaultIgnoresReturnsOnCall[i] = struct { + result1 config.Ignores + }{result1} +} + func (fake *Wrapper) Device(arg1 protocol.DeviceID) (config.DeviceConfiguration, bool) { fake.deviceMutex.Lock() ret, specificReturn := fake.deviceReturnsOnCall[len(fake.deviceArgsForCall)] @@ -1752,6 +1815,8 @@ func (fake *Wrapper) Invocations() map[string][][]interface{} { defer fake.defaultDeviceMutex.RUnlock() fake.defaultFolderMutex.RLock() defer fake.defaultFolderMutex.RUnlock() + fake.defaultIgnoresMutex.RLock() + defer fake.defaultIgnoresMutex.RUnlock() fake.deviceMutex.RLock() defer fake.deviceMutex.RUnlock() fake.deviceListMutex.RLock() diff --git a/lib/config/wrapper.go b/lib/config/wrapper.go index 4c52b0ce069..fb3ce6f762a 100644 --- a/lib/config/wrapper.go +++ b/lib/config/wrapper.go @@ -100,6 +100,7 @@ type Wrapper interface { GUI() GUIConfiguration LDAP() LDAPConfiguration Options() OptionsConfiguration + DefaultIgnores() Ignores Folder(id string) (FolderConfiguration, bool) Folders() map[string]FolderConfiguration @@ -437,6 +438,13 @@ func (w *wrapper) GUI() GUIConfiguration { return w.cfg.GUI.Copy() } +// DefaultIgnores returns the list of ignore patterns to be used by default on folders. +func (w *wrapper) DefaultIgnores() Ignores { + w.mut.Lock() + defer w.mut.Unlock() + return w.cfg.Defaults.Ignores.Copy() +} + // IgnoredDevice returns whether or not connection attempts from the given // device should be silently ignored. func (w *wrapper) IgnoredDevice(id protocol.DeviceID) bool { diff --git a/lib/model/model.go b/lib/model/model.go index 4bcfb1c1a9f..12168178704 100644 --- a/lib/model/model.go +++ b/lib/model/model.go @@ -1651,6 +1651,11 @@ func (m *model) handleAutoAccepts(deviceID protocol.DeviceID, folder protocol.Fo if len(ccDeviceInfos.remote.EncryptionPasswordToken) > 0 || len(ccDeviceInfos.local.EncryptionPasswordToken) > 0 { fcfg.Type = config.FolderTypeReceiveEncrypted + } else { + ignores := m.cfg.DefaultIgnores() + if err := m.setIgnores(fcfg, ignores.Lines); err != nil { + l.Warnf("Failed to apply default ignores to auto-accepted folder %s at path %s: %v", folder.Description(), fcfg.Path, err) + } } l.Infof("Auto-accepted %s folder %s at path %s", deviceID, folder.Description(), fcfg.Path) @@ -2035,11 +2040,6 @@ func (m *model) LoadIgnores(folder string) ([]string, []string, error) { return nil, nil, nil } - // On creation a new folder with ignore patterns validly has no marker yet. - if err := cfg.CheckPath(); err != nil && err != config.ErrMarkerMissing { - return nil, nil, err - } - if !ignoresOk { ignores = ignore.New(cfg.Filesystem()) } @@ -2081,7 +2081,10 @@ func (m *model) SetIgnores(folder string, content []string) error { if !ok { return fmt.Errorf("folder %s does not exist", cfg.Description()) } + return m.setIgnores(cfg, content) +} +func (m *model) setIgnores(cfg config.FolderConfiguration, content []string) error { err := cfg.CheckPath() if err == config.ErrPathMissing { if err = cfg.CreateRoot(); err != nil { @@ -2099,7 +2102,7 @@ func (m *model) SetIgnores(folder string, content []string) error { } m.fmut.RLock() - runner, ok := m.folderRunners[folder] + runner, ok := m.folderRunners[cfg.ID] m.fmut.RUnlock() if ok { runner.ScheduleScan() diff --git a/lib/model/model_test.go b/lib/model/model_test.go index 78fa8e9f9af..03ead535558 100644 --- a/lib/model/model_test.go +++ b/lib/model/model_test.go @@ -1515,7 +1515,7 @@ func TestIgnores(t *testing.T) { t.Error("No error") } - // Invalid path, marker should be missing, hence returns an error. + // Invalid path, treated like no patterns at all. fcfg := config.FolderConfiguration{ID: "fresh", Path: "XXX"} ignores := ignore.New(fcfg.Filesystem(), ignore.WithCache(m.cfg.Options().CacheIgnoredFiles)) m.fmut.Lock() @@ -1524,8 +1524,8 @@ func TestIgnores(t *testing.T) { m.fmut.Unlock() _, _, err = m.LoadIgnores("fresh") - if err == nil { - t.Error("No error") + if err != nil { + t.Error("Got error for inexistent folder path") } // Repeat tests with paused folder diff --git a/proto/lib/config/config.proto b/proto/lib/config/config.proto index 3f252f7bc6c..6f447bb2052 100644 --- a/proto/lib/config/config.proto +++ b/proto/lib/config/config.proto @@ -24,6 +24,11 @@ message Configuration { } message Defaults { - FolderConfiguration folder = 1; - DeviceConfiguration device = 2; + FolderConfiguration folder = 1; + DeviceConfiguration device = 2; + Ignores ignores = 3; +} + +message Ignores { + repeated string lines = 1; } From b2996eee877acd7fae0d1ea4c4ca6f0c262443d0 Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Sun, 16 Jan 2022 18:07:33 +0100 Subject: [PATCH 045/220] gui: Handle folder missing in model on error event (#8120) --- gui/default/syncthing/core/syncthingController.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gui/default/syncthing/core/syncthingController.js b/gui/default/syncthing/core/syncthingController.js index 1e6e20ef05d..e35ad1d129c 100755 --- a/gui/default/syncthing/core/syncthingController.js +++ b/gui/default/syncthing/core/syncthingController.js @@ -399,6 +399,10 @@ angular.module('syncthing.core') }); $scope.$on(Events.FOLDER_ERRORS, function (event, arg) { + if (!$scope.model[arg.data.folder]) { + console.log("Dropping folder errors event for unknown folder", arg.data.folder) + return; + } $scope.model[arg.data.folder].errors = arg.data.errors.length; }); From 45d145a2811cab9ce85ad71d515a17f3b568ef20 Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Sun, 16 Jan 2022 19:06:50 +0100 Subject: [PATCH 046/220] gui: Fix bug saving settings (fixes #8116) (#8117) --- gui/default/syncthing/core/syncthingController.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/default/syncthing/core/syncthingController.js b/gui/default/syncthing/core/syncthingController.js index e35ad1d129c..51fd73b9e52 100755 --- a/gui/default/syncthing/core/syncthingController.js +++ b/gui/default/syncthing/core/syncthingController.js @@ -1517,7 +1517,7 @@ angular.module('syncthing.core') // here as well... $scope.devices = deviceMap($scope.config.devices); - $scope.saveConfig.then(function () { + $scope.saveConfig().then(function () { if (themeChanged) { document.location.reload(true); } From e700ef3208c6518fb23d12d66e6ff5410cba9777 Mon Sep 17 00:00:00 2001 From: Syncthing Release Automation Date: Mon, 17 Jan 2022 03:47:43 +0000 Subject: [PATCH 047/220] gui, man, authors: Update docs, translations, and contributors --- gui/default/assets/lang/lang-bg.json | 1 + gui/default/assets/lang/lang-ca@valencia.json | 1 + gui/default/assets/lang/lang-cs.json | 1 + gui/default/assets/lang/lang-da.json | 1 + gui/default/assets/lang/lang-de.json | 1 + gui/default/assets/lang/lang-el.json | 1 + gui/default/assets/lang/lang-en-AU.json | 1 + gui/default/assets/lang/lang-en-GB.json | 1 + gui/default/assets/lang/lang-en.json | 3 + gui/default/assets/lang/lang-eo.json | 7 +- gui/default/assets/lang/lang-es-ES.json | 1 + gui/default/assets/lang/lang-es.json | 1 + gui/default/assets/lang/lang-eu.json | 1 + gui/default/assets/lang/lang-fi.json | 1 + gui/default/assets/lang/lang-fr.json | 1 + gui/default/assets/lang/lang-fy.json | 1 + gui/default/assets/lang/lang-hu.json | 1 + gui/default/assets/lang/lang-id.json | 1 + gui/default/assets/lang/lang-it.json | 1 + gui/default/assets/lang/lang-ja.json | 1 + gui/default/assets/lang/lang-ko-KR.json | 85 ++++++++++--------- gui/default/assets/lang/lang-lt.json | 1 + gui/default/assets/lang/lang-nb.json | 1 + gui/default/assets/lang/lang-nl.json | 1 + gui/default/assets/lang/lang-pl.json | 1 + gui/default/assets/lang/lang-pt-BR.json | 1 + gui/default/assets/lang/lang-pt-PT.json | 1 + gui/default/assets/lang/lang-ro-RO.json | 1 + gui/default/assets/lang/lang-ru.json | 1 + gui/default/assets/lang/lang-sk.json | 1 + gui/default/assets/lang/lang-sl.json | 1 + gui/default/assets/lang/lang-sv.json | 1 + gui/default/assets/lang/lang-tr.json | 1 + gui/default/assets/lang/lang-uk.json | 1 + gui/default/assets/lang/lang-zh-CN.json | 1 + gui/default/assets/lang/lang-zh-HK.json | 1 + gui/default/assets/lang/lang-zh-TW.json | 1 + man/stdiscosrv.1 | 2 +- man/strelaysrv.1 | 2 +- man/syncthing-bep.7 | 2 +- man/syncthing-config.5 | 2 +- man/syncthing-device-ids.7 | 2 +- man/syncthing-event-api.7 | 2 +- man/syncthing-faq.7 | 2 +- man/syncthing-globaldisco.7 | 2 +- man/syncthing-localdisco.7 | 2 +- man/syncthing-networking.7 | 2 +- man/syncthing-relay.7 | 2 +- man/syncthing-rest-api.7 | 2 +- man/syncthing-security.7 | 2 +- man/syncthing-stignore.5 | 2 +- man/syncthing-versioning.7 | 2 +- man/syncthing.1 | 2 +- 53 files changed, 100 insertions(+), 61 deletions(-) diff --git a/gui/default/assets/lang/lang-bg.json b/gui/default/assets/lang/lang-bg.json index 176addd48f2..d6a412fc487 100644 --- a/gui/default/assets/lang/lang-bg.json +++ b/gui/default/assets/lang/lang-bg.json @@ -22,6 +22,7 @@ "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?": "Форматът на данните за анонимно отчитане на употреба е променен. Желаете ли да използвате него вместо стария?", diff --git a/gui/default/assets/lang/lang-ca@valencia.json b/gui/default/assets/lang/lang-ca@valencia.json index 657473820f8..1aee85a8c71 100644 --- a/gui/default/assets/lang/lang-ca@valencia.json +++ b/gui/default/assets/lang/lang-ca@valencia.json @@ -22,6 +22,7 @@ "Allow Anonymous Usage Reporting?": "Permetre informes d'ús anònim?", "Allowed Networks": "Xarxes permeses", "Alphabetic": "Alfabètic", + "Altered by ignoring deletes.": "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.": "Un comandament extern maneja el versionat. És necessari eliminar el fitxer de la carpeta compartida. Si la ruta a l'aplicació conté espais, hi ha que ficar-los entre cometes.", "Anonymous Usage Reporting": "Informe d'ús anònim", "Anonymous usage report format has changed. Would you like to move to the new format?": "El format del informe anònim d'ús ha canviat. Vols canviar al nou format?", diff --git a/gui/default/assets/lang/lang-cs.json b/gui/default/assets/lang/lang-cs.json index a62d0928647..9d82eb3747d 100644 --- a/gui/default/assets/lang/lang-cs.json +++ b/gui/default/assets/lang/lang-cs.json @@ -22,6 +22,7 @@ "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.": "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.": "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.", "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?", diff --git a/gui/default/assets/lang/lang-da.json b/gui/default/assets/lang/lang-da.json index 98224c49f66..d83ad6450ac 100644 --- a/gui/default/assets/lang/lang-da.json +++ b/gui/default/assets/lang/lang-da.json @@ -22,6 +22,7 @@ "Allow Anonymous Usage Reporting?": "Tillad anonym brugerstatistik?", "Allowed Networks": "Tilladte netværk", "Alphabetic": "Alfabetisk", + "Altered by ignoring deletes.": "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.": "En ekstern kommando styrer versioneringen. Den skal fjerne filen fra den delte mappe. Hvis stien til programmet indeholder mellemrum, bør den sættes i anførselstegn.", "Anonymous Usage Reporting": "Anonym brugerstatistik", "Anonymous usage report format has changed. Would you like to move to the new format?": "Formatet for anonym brugerstatistik er ændret. Vil du flytte til det nye format?", diff --git a/gui/default/assets/lang/lang-de.json b/gui/default/assets/lang/lang-de.json index 7a2f1064970..9580e71f65d 100644 --- a/gui/default/assets/lang/lang-de.json +++ b/gui/default/assets/lang/lang-de.json @@ -22,6 +22,7 @@ "Allow Anonymous Usage Reporting?": "Übertragung von anonymen Nutzungsberichten erlauben?", "Allowed Networks": "Erlaubte Netzwerke", "Alphabetic": "Alphabetisch", + "Altered by ignoring deletes.": "Weicht ab, weil Löschungen ignoriert werden.", "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.": "Ein externer Befehl behandelt die Versionierung. Die Datei aus dem freigegebenen Ordner muss entfernen werden. Wenn der Pfad der Anwendung Leerzeichen enthält, sollte dieser in Anführungszeichen stehen.", "Anonymous Usage Reporting": "Anonymer Nutzungsbericht", "Anonymous usage report format has changed. Would you like to move to the new format?": "Das Format des anonymen Nutzungsberichts hat sich geändert. Möchten Sie auf das neue Format umsteigen?", diff --git a/gui/default/assets/lang/lang-el.json b/gui/default/assets/lang/lang-el.json index 4b000e6577a..2d07dbb38aa 100644 --- a/gui/default/assets/lang/lang-el.json +++ b/gui/default/assets/lang/lang-el.json @@ -22,6 +22,7 @@ "Allow Anonymous Usage Reporting?": "Να επιτρέπεται η αποστολή ανώνυμων στοιχείων χρήσης;", "Allowed Networks": "Επιτρεπόμενα δίκτυα", "Alphabetic": "Αλφαβητικά", + "Altered by ignoring deletes.": "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?": "Η μορφή της αναφοράς ανώνυμων στοιχείων χρήσης έχει αλλάξει. Επιθυμείτε να μεταβείτε στη νέα μορφή;", diff --git a/gui/default/assets/lang/lang-en-AU.json b/gui/default/assets/lang/lang-en-AU.json index 45b9c3dd2b7..69608c06eb0 100644 --- a/gui/default/assets/lang/lang-en-AU.json +++ b/gui/default/assets/lang/lang-en-AU.json @@ -22,6 +22,7 @@ "Allow Anonymous Usage Reporting?": "Allow Anonymous Usage Reporting?", "Allowed Networks": "Allowed Networks", "Alphabetic": "Alphabetic", + "Altered by ignoring deletes.": "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.": "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?": "Anonymous usage report format has changed. Would you like to move to the new format?", diff --git a/gui/default/assets/lang/lang-en-GB.json b/gui/default/assets/lang/lang-en-GB.json index 460a0572b1e..599ddb56823 100644 --- a/gui/default/assets/lang/lang-en-GB.json +++ b/gui/default/assets/lang/lang-en-GB.json @@ -22,6 +22,7 @@ "Allow Anonymous Usage Reporting?": "Allow Anonymous Usage Reporting?", "Allowed Networks": "Allowed Networks", "Alphabetic": "Alphabetic", + "Altered by ignoring deletes.": "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.": "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?": "Anonymous usage report format has changed. Would you like to move to the new format?", diff --git a/gui/default/assets/lang/lang-en.json b/gui/default/assets/lang/lang-en.json index 43842ec9640..43144e43dce 100644 --- a/gui/default/assets/lang/lang-en.json +++ b/gui/default/assets/lang/lang-en.json @@ -11,6 +11,7 @@ "Add Folder": "Add Folder", "Add Remote Device": "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 ignore patterns": "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.": "Additionally the full rescan interval will be increased (times 60, i.e. new default of 1h). You can also configure it manually for every folder later after choosing No.", "Address": "Address", @@ -169,6 +170,7 @@ "Ignore": "Ignore", "Ignore Patterns": "Ignore Patterns", "Ignore Permissions": "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.": "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 Devices", "Ignored Folders": "Ignored Folders", "Ignored at": "Ignored at", @@ -290,6 +292,7 @@ "Select the folders to share with this device.": "Select the folders to share with this device.", "Send \u0026 Receive": "Send \u0026 Receive", "Send Only": "Send Only", + "Set Ignores on Added Folder": "Set Ignores on Added Folder", "Settings": "Settings", "Share": "Share", "Share Folder": "Share Folder", diff --git a/gui/default/assets/lang/lang-eo.json b/gui/default/assets/lang/lang-eo.json index 5bfbb712315..74fa5caa573 100644 --- a/gui/default/assets/lang/lang-eo.json +++ b/gui/default/assets/lang/lang-eo.json @@ -22,6 +22,7 @@ "Allow Anonymous Usage Reporting?": "Permesi Anoniman Raporton de Uzado?", "Allowed Networks": "Permesitaj Retoj", "Alphabetic": "Alfabeta", + "Altered by ignoring deletes.": "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.": "Ekstera komando manipulas la version. Ĝi devas forigi la dosieron el la komunigita dosierujo. Se la vojo al la apliko elhavas blankoj, ĝi devas esti inter citiloj.", "Anonymous Usage Reporting": "Anonima Raporto de Uzado", "Anonymous usage report format has changed. Would you like to move to the new format?": "Formato de anonima raporto de uzado ŝanĝis. Ĉu vi ŝatus transiri al la nova formato?", @@ -48,7 +49,7 @@ "Cleaning Versions": "Cleaning Versions", "Cleanup Interval": "Cleanup Interval", "Click to see discovery failures": "Alklaku por vidi malsukcesajn malkovrojn", - "Click to see full identification string and QR code.": "Click to see full identification string and QR code.", + "Click to see full identification string and QR code.": "Alklaku por vidi la plenan identigan signovicon kaj QR-kodo", "Close": "Fermi", "Command": "Komando", "Comment, when used at the start of a line": "Komento, kiam uzita ĉe la komenco de lineo", @@ -71,7 +72,7 @@ "Default Folder": "Defaŭlta Dosierujo", "Default Folder Path": "Defaŭlta Dosieruja Vojo", "Defaults": "Defaults", - "Delete": "Delete", + "Delete": "Forigu", "Delete Unexpected Items": "Delete Unexpected Items", "Deleted": "Forigita", "Deselect All": "Malelekti Ĉiujn", @@ -82,7 +83,7 @@ "Device ID": "Aparato ID", "Device Identification": "Identigo de Aparato", "Device Name": "Nomo de Aparato", - "Device is untrusted, enter encryption password": "Device is untrusted, enter encryption password", + "Device is untrusted, enter encryption password": "Aparato ne estas fidinda, entajpu pasvorto por ĉifrado", "Device rate limits": "Limoj de rapideco de aparato", "Device that last modified the item": "Aparato kiu laste modifis la eron", "Devices": "Aparatoj", diff --git a/gui/default/assets/lang/lang-es-ES.json b/gui/default/assets/lang/lang-es-ES.json index e839abdf07f..b404d91d1d5 100644 --- a/gui/default/assets/lang/lang-es-ES.json +++ b/gui/default/assets/lang/lang-es-ES.json @@ -22,6 +22,7 @@ "Allow Anonymous Usage Reporting?": "¿Deseas permitir el envío anónimo de informes de uso?", "Allowed Networks": "Redes permitidas", "Alphabetic": "Alfabético", + "Altered by ignoring deletes.": "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.": "Un comando externo maneja el versionado. Tiene que eliminar el fichero de la carpeta compartida. Si la ruta a la aplicación contiene espacios, hay que escribirla entre comillas.", "Anonymous Usage Reporting": "Informe anónimo de uso", "Anonymous usage report format has changed. Would you like to move to the new format?": "El formato del informe anónimo de uso ha cambiado. ¿Quieres cambiar al nuevo formato?", diff --git a/gui/default/assets/lang/lang-es.json b/gui/default/assets/lang/lang-es.json index 8340e2aadfd..6a56201a08a 100644 --- a/gui/default/assets/lang/lang-es.json +++ b/gui/default/assets/lang/lang-es.json @@ -22,6 +22,7 @@ "Allow Anonymous Usage Reporting?": "¿Deseas permitir el envío anónimo de informes de uso?", "Allowed Networks": "Redes permitidas", "Alphabetic": "Alfabético", + "Altered by ignoring deletes.": "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.": "Un comando externo maneja las versiones. Tienes que eliminar el archivo de la carpeta compartida. Si la ruta a la aplicación contiene espacios, ésta debe estar entre comillas.", "Anonymous Usage Reporting": "Informe anónimo de uso", "Anonymous usage report format has changed. Would you like to move to the new format?": "El formato del informe de uso anónimo a cambiado. ¿Desearía usar el nuevo formato?", diff --git a/gui/default/assets/lang/lang-eu.json b/gui/default/assets/lang/lang-eu.json index 6908460c1f4..688ba224aa9 100644 --- a/gui/default/assets/lang/lang-eu.json +++ b/gui/default/assets/lang/lang-eu.json @@ -22,6 +22,7 @@ "Allow Anonymous Usage Reporting?": "Izenik gabeko erabiltze erreportak baimendu?", "Allowed Networks": "Sare baimenduak", "Alphabetic": "Alfabetikoa", + "Altered by ignoring deletes.": "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.": "Kanpoko kontrolagailu batek fitxategien bertsioak kudeatzen ditu. Fitxategiak kendu behar ditu errepertorio sinkronizatuan. Aplikaziorako ibilbideak espazioak baditu, komatxo artean egon behar du.", "Anonymous Usage Reporting": "Izenik gabeko erabiltze erreportak", "Anonymous usage report format has changed. Would you like to move to the new format?": "Erabilera anonimoko txostenaren formatua aldatu egin da. Formatu berria erabili nahi duzu?", diff --git a/gui/default/assets/lang/lang-fi.json b/gui/default/assets/lang/lang-fi.json index 09eb9d2e98a..2ee6485a047 100644 --- a/gui/default/assets/lang/lang-fi.json +++ b/gui/default/assets/lang/lang-fi.json @@ -22,6 +22,7 @@ "Allow Anonymous Usage Reporting?": "Salli anonyymi käyttöraportointi?", "Allowed Networks": "Sallitut verkot", "Alphabetic": "Aakkosellinen", + "Altered by ignoring deletes.": "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.": "Ulkoinen komento hallitsee versionnin. Sen täytyy poistaa tiedosto synkronoidusta kansiosta. Mikäli ohjelman polussa on välilyöntejä se on laitettava lainausmerkkeihin.", "Anonymous Usage Reporting": "Anonyymi käyttöraportointi", "Anonymous usage report format has changed. Would you like to move to the new format?": "Anonyymi käyttöraportti on muuttunut. Haluatko vaihtaa uuteen muotoon?", diff --git a/gui/default/assets/lang/lang-fr.json b/gui/default/assets/lang/lang-fr.json index a184734776f..b3b4ccbe5b4 100644 --- a/gui/default/assets/lang/lang-fr.json +++ b/gui/default/assets/lang/lang-fr.json @@ -22,6 +22,7 @@ "Allow Anonymous Usage Reporting?": "Autoriser l'envoi de statistiques d'utilisation anonymisées ?", "Allowed Networks": "Réseaux autorisés", "Alphabetic": "Alphabétique", + "Altered by ignoring deletes.": "Altéré par \"Ignore Delete\".", "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.": "Une commande externe gère les versions de fichiers. Il lui incombe de supprimer les fichiers du répertoire partagé. Si le chemin contient des espaces, il doit être spécifié entre guillemets.", "Anonymous Usage Reporting": "Rapport anonyme de statistiques d'utilisation", "Anonymous usage report format has changed. Would you like to move to the new format?": "Le format du rapport anonyme d'utilisation a changé. Voulez-vous passer au nouveau format ?", diff --git a/gui/default/assets/lang/lang-fy.json b/gui/default/assets/lang/lang-fy.json index f1d7f2598b8..f8b118126f9 100644 --- a/gui/default/assets/lang/lang-fy.json +++ b/gui/default/assets/lang/lang-fy.json @@ -22,6 +22,7 @@ "Allow Anonymous Usage Reporting?": "Anonime brûkensrapportaazje tastean?", "Allowed Networks": "Tasteane Netwurken", "Alphabetic": "Alfabetysk", + "Altered by ignoring deletes.": "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.": "In ekstern kommando soarget foar it ferzjebehear. It moat de triem út de dielde map fuortsmite. As it paad nei de applikaasje romtes hat, moat it tusken oanheltekens sette wurden.", "Anonymous Usage Reporting": "Anonym brûkensrapportaazje", "Anonymous usage report format has changed. Would you like to move to the new format?": "It formaat fan de rapportaazje fan anonime gebrûksynformaasje is feroare. Wolle jo op dit nije formaat oerstappe?", diff --git a/gui/default/assets/lang/lang-hu.json b/gui/default/assets/lang/lang-hu.json index e9fa1e04fd2..80cbfada891 100644 --- a/gui/default/assets/lang/lang-hu.json +++ b/gui/default/assets/lang/lang-hu.json @@ -22,6 +22,7 @@ "Allow Anonymous Usage Reporting?": "A névtelen felhasználási adatok elküldhetők?", "Allowed Networks": "Engedélyezett hálózatok", "Alphabetic": "ABC sorrendben", + "Altered by ignoring deletes.": "Módosítva a törlések figyelmen kívül hagyásával.", "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.": "Külső program kezeli a fájlverzió-követést. Az távolítja el a fájlt a megosztott mappából. Ha az alkalmazás útvonala szóközöket tartalmaz, zárójelezni szükséges az útvonalat.", "Anonymous Usage Reporting": "Névtelen felhasználási adatok küldése", "Anonymous usage report format has changed. Would you like to move to the new format?": "A névtelen használati jelentés formátuma megváltozott. Szeretnél áttérni az új formátumra?", diff --git a/gui/default/assets/lang/lang-id.json b/gui/default/assets/lang/lang-id.json index 22136311351..2715057cdf8 100644 --- a/gui/default/assets/lang/lang-id.json +++ b/gui/default/assets/lang/lang-id.json @@ -22,6 +22,7 @@ "Allow Anonymous Usage Reporting?": "Izinkan Laporan Penggunaan Anonim?", "Allowed Networks": "Jaringan Terizinkan", "Alphabetic": "Alfabet", + "Altered by ignoring deletes.": "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.": "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?", diff --git a/gui/default/assets/lang/lang-it.json b/gui/default/assets/lang/lang-it.json index f5cde47b6a0..8cb6bc00d12 100644 --- a/gui/default/assets/lang/lang-it.json +++ b/gui/default/assets/lang/lang-it.json @@ -22,6 +22,7 @@ "Allow Anonymous Usage Reporting?": "Abilitare Statistiche Anonime di Utilizzo?", "Allowed Networks": "Reti Consentite.", "Alphabetic": "Alfabetico", + "Altered by ignoring deletes.": "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.": "Il controllo versione è gestito da un comando esterno. Quest'ultimo deve rimuovere il file dalla cartella condivisa. Se il percorso dell'applicazione contiene spazi, deve essere indicato tra virgolette.", "Anonymous Usage Reporting": "Statistiche Anonime di Utilizzo", "Anonymous usage report format has changed. Would you like to move to the new format?": "Il formato delle statistiche anonime di utilizzo è cambiato. Vuoi passare al nuovo formato?", diff --git a/gui/default/assets/lang/lang-ja.json b/gui/default/assets/lang/lang-ja.json index 07bc2b62d99..6b93a369a01 100644 --- a/gui/default/assets/lang/lang-ja.json +++ b/gui/default/assets/lang/lang-ja.json @@ -22,6 +22,7 @@ "Allow Anonymous Usage Reporting?": "匿名で使用状況をレポートすることを許可しますか？", "Allowed Networks": "許可されているネットワーク", "Alphabetic": "アルファベット順", + "Altered by ignoring deletes.": "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.": "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?": "匿名での使用状況レポートのフォーマットが変わりました。新形式でのレポートに移行しますか？", diff --git a/gui/default/assets/lang/lang-ko-KR.json b/gui/default/assets/lang/lang-ko-KR.json index c64a11ac939..f1f2447dd82 100644 --- a/gui/default/assets/lang/lang-ko-KR.json +++ b/gui/default/assets/lang/lang-ko-KR.json @@ -19,22 +19,23 @@ "Advanced Configuration": "고급 설정", "All Data": "전체 데이터", "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?": "익명 사용 보고서를 보내시겠습니까?", + "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?": "익명 사용 보고서의 형식이 변경되었습니다. 새 형식으로 이동하시겠습니까?", + "Anonymous Usage Reporting": "익명 사용 보고", + "Anonymous usage report format has changed. Would you like to move to the new format?": "익명 사용 보고의 형식이 변경되었습니다. 새 형식으로 설정하시겠습니까?", "Are you sure you want to continue?": "계속하시겠습니까?", "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 revert all local changes?": "현재 기기의 모든 변경 항목을 되돌리시겠습니까?", "Are you sure you want to upgrade?": "업데이트를 하시겠습니까?", "Auto Accept": "자동 수락", - "Automatic Crash Reporting": "자동 충돌 보고서", + "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.": "출시 후보는 자동 업데이트가 항상 활성화되어 있습니다.", @@ -44,7 +45,7 @@ "Bugs": "버그", "Cancel": "취소", "Changelog": "바뀐 점", - "Clean out after": "삭제 후", + "Clean out after": "보관 기간", "Cleaning Versions": "버전 정리", "Cleanup Interval": "정리 간격", "Click to see discovery failures": "탐지 실패 보기", @@ -58,11 +59,11 @@ "Connection Error": "연결 오류", "Connection Type": "연결 유형", "Connections": "연결", - "Continuously watching for changes is now available within Syncthing. This will detect changes on disk and issue a scan on only the modified paths. The benefits are that changes are propagated quicker and that less full scans are required.": "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": "원본에서 복사됨", "Copyright © 2014-2019 the following Contributors:": "Copyright © 2014-2019 the following Contributors:", - "Creating ignore patterns, overwriting an existing file at {%path%}.": "무시 패턴 생성 중, {{path}}에 존재하는 파일을 덮어씁니다.", + "Creating ignore patterns, overwriting an existing file at {%path%}.": "무시 양식 생성 중, {{path}}에 존재하는 파일을 덮어씁니다.", "Currently Shared With Devices": "현재 공유된 기기", "Danger!": "위험!", "Debugging Facilities": "디버깅 기능", @@ -86,12 +87,12 @@ "Device rate limits": "기기 속도 제한", "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:": "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).": "Disables comparing and syncing file permissions. Useful on systems with nonexistent or custom permissions (e.g. FAT, exFAT, Synology, Android).", + "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 (Unused)": "연결 끊김 (미사용)", @@ -114,19 +115,19 @@ "Edit Folder": "폴더 편집", "Edit Folder Defaults": "폴더 기본 설정 편집", "Editing {%path%}.": "{{path}} 편집 중", - "Enable Crash Reporting": "충돌 보고서 활성화", + "Enable Crash Reporting": "충돌 보고 활성화", "Enable NAT traversal": "NAT traversal 활성화", "Enable Relaying": "Relaying 활성화", "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.": "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.", - "Enter ignore patterns, one per line.": "무시할 패턴을 한 줄에 하나씩 입력하십시오.", + "Enter ignore patterns, one per line.": "무시할 양식을 한 줄에 하나씩 입력하십시오.", "Enter up to three octal digits.": "최대 3자리의 8진수를 입력하세요.", "Error": "오류", "External File Versioning": "외부 파일 버전 관리", "Failed Items": "실패 항목", - "Failed to load ignore patterns.": "무시 패턴 불러오기에 실패했습니다.", + "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": "파일 수신 순서", @@ -134,7 +135,7 @@ "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.": "Files are synchronized from the cluster, but any changes made locally will not be sent to other devices.", + "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": "이름별 정렬", @@ -166,17 +167,17 @@ "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.": "If you want to prevent other users on this computer from accessing Syncthing and through it your files, consider setting up authentication.", "Ignore": "무시", - "Ignore Patterns": "무시 패턴", + "Ignore Patterns": "무시 양식", "Ignore Permissions": "권한 무시", "Ignored Devices": "무시된 기기", "Ignored Folders": "무시된 폴더", - "Ignored at": "Ignored at", + "Ignored at": "무시된 기기", "Incoming Rate Limit (KiB/s)": "수신 속도 제한 (KiB/s)", "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "잘못된 설정은 폴더의 컨텐츠를 훼손하거나 Syncthing의 오작동을 일으킬 수 있습니다.", - "Introduced By": "Introduced By", + "Introduced By": "유도한 기기", "Introducer": "유도자", "Inversion of the given condition (i.e. do not exclude)": "특정한 조건의 반대 (즉 배제하지 않음)", - "Keep Versions": "버전 보관", + "Keep Versions": "버전 수", "LDAP": "LDAP", "Largest First": "큰 파일 순", "Last Scan": "마지막 탐색", @@ -198,8 +199,8 @@ "Log tailing paused. Scroll to the bottom to continue.": "Log tailing paused. Scroll to the bottom to continue.", "Logs": "기록", "Major Upgrade": "주요 업데이트", - "Mass actions": "Mass actions", - "Maximum Age": "최대 보존 기간", + "Mass actions": "다중 동작", + "Maximum Age": "최대 보관 기간", "Metadata Only": "메타데이터만", "Minimum Free Disk Space": "최소 여유 디스크 용량", "Mod. Device": "수정된 기기", @@ -212,7 +213,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 files will be deleted as a result of this operation.": "이 작업으로 인해서는 아무 파일도 삭제되지 않습니다.", "No upgrades": "업데이트 안함", "Not shared": "공유되지 않음", "Notice": "공지", @@ -229,32 +230,32 @@ "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 new auto accepted folders will be created, as well as the default suggested path when adding new folders via the UI. Tilde character (~) expands to {%tilde%}.": "Path where new auto accepted folders will be created, as well as the default suggested path when adding new folders via the UI. Tilde character (~) expands to {{tilde}}.", - "Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).": "버전을 보관할 경로입니다. 공유된 폴더 안의 기본값 .stversions 폴더로 지정하려면 비워 두십시오.", + "Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).": "버전을 보관할 경로입니다. 공유된 폴더 안의 기본값 .stversions 폴더로 사용하려면 비워 두십시오.", "Pause": "일시 중지", "Pause All": "모두 일시 중지", "Paused": "일시 중지됨", "Paused (Unused)": "일시 중지됨 (미사용)", - "Pending changes": "Pending changes", - "Periodic scanning at given interval and disabled watching for changes": "Periodic scanning at given interval and disabled watching for changes", - "Periodic scanning at given interval and enabled watching for changes": "Periodic scanning at given interval and enabled watching for changes", - "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:", + "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.": "Permanently add it to the ignore list, suppressing further notifications.", "Permissions": "권한", "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": "대소 문자 구분 없이 패턴을 적용시켜야 함을 나타내는 접두사", + "Prefix indicating that the pattern should be matched without case sensitivity": "대소 문자 구분 없이 양식을 적용함을 나타내는 접두사", "Preparing to Sync": "동기화 준비", "Preview": "미리 보기", "Preview Usage Report": "사용 보고서 미리 보기", - "Quick guide to supported patterns": "지원하는 패턴에 대한 빠른 도움말", + "Quick guide to supported patterns": "지원하는 양식에 대한 빠른 도움말", "Random": "무작위", "Receive Encrypted": "암호화 수신", "Receive Only": "수신 전용", "Received data is already encrypted": "수신된 데이터는 이미 암호화되어 있습니다", "Recent Changes": "최근 변경 항목", - "Reduced by ignore patterns": "무시 패턴으로 축소", + "Reduced by ignore patterns": "무시 양식으로 축소됨", "Release Notes": "릴리즈 노트", "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "출시 후보는 최신 기능과 버그 픽스를 포함 하고 있습니다. 이 버전은 예전 방식인 2주 주기 Syncthing 출시와 비슷합니다.", "Remote Devices": "다른 기기", @@ -275,7 +276,7 @@ "Resume All": "모두 재개", "Reused": "재사용", "Revert": "되돌리기", - "Revert Local Changes": "본 기기의 변경 항목 되돌리기", + "Revert Local Changes": "현재 기기의 변경 항목 되돌리기", "Save": "저장", "Scan Time Remaining": "탐색 남은 시간", "Scanning": "탐색", @@ -333,7 +334,7 @@ "Syncthing is not listening for connection attempts from other devices on any address. Only outgoing connections from this device may work.": "Syncthing is not listening for connection attempts from other devices on any address. Only outgoing connections from this device may work.", "Syncthing is restarting.": "Syncthing이 재시작 중입니다.", "Syncthing is upgrading.": "Syncthing이 업데이트 중입니다.", - "Syncthing now supports automatically reporting crashes to the developers. This feature is enabled by default.": "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을 재시작해 보세요.", "Take me back": "취소", @@ -345,21 +346,21 @@ "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 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 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 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초마다, 첫 하루 동안은 1시간마다, 첫 30일 동안은 1일마다, 그리고 최대 보존 기간까지는 1주일마다 버전이 보관됩니다.", + "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초마다, 첫 하루 동안은 1시간마다, 첫 30일 동안은 1일마다, 그리고 최대 보관 기간까지는 1주일마다 버전이 보관됩니다.", "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 methods are used to discover other devices on the network and announce this device to be found by others:", "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 maximum age must be a number and cannot be blank.": "최대 보존 기간은 숫자여야 하며 비워 둘 수 없습니다.", + "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 days must be a number and cannot be blank.": "날짜는 숫자여야 하며 비워 둘 수 없습니다.", "The number of days to keep files in the trash can. Zero means forever.": "휴지통에서 파일을 보관할 일수입니다. 0은 무제한을 의미합니다.", @@ -399,14 +400,14 @@ "Upgrading": "업데이트 중", "Upload Rate": "송신 속도", "Uptime": "가동 시간", - "Usage reporting is always enabled for candidate releases.": "출시 후보 버전에서는 사용 보고서가 항상 활성화 됩니다.", + "Usage reporting is always enabled for candidate releases.": "출시 후보 버전에서는 사용 보고가 항상 활성화되어 있습니다.", "Use HTTPS for GUI": "GUI에서 HTTPS 프로토콜 사용", "Use notifications from the filesystem to detect changed items.": "Use notifications from the filesystem to detect changed items.", "Username/Password has not been set for the GUI authentication. Please consider setting it up.": "GUI 인증을 위한 사용자 이름과 비밀번호가 설정되지 않았습니다.", "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 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": "동기화 대기", @@ -418,7 +419,7 @@ "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를 사용해야 합니다.", "Yes": "예", diff --git a/gui/default/assets/lang/lang-lt.json b/gui/default/assets/lang/lang-lt.json index 2f1e7da50ad..bb68cca5531 100644 --- a/gui/default/assets/lang/lang-lt.json +++ b/gui/default/assets/lang/lang-lt.json @@ -22,6 +22,7 @@ "Allow Anonymous Usage Reporting?": "Siųsti anoniminę naudojimo ataskaitą?", "Allowed Networks": "Leidžiami tinklai", "Alphabetic": "Abėcėlės tvarka", + "Altered by ignoring deletes.": "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.": "Išorinė komanda apdoroja versijų valdymą. Ji turi pašalinti failą iš bendrinamo aplanko. Jei kelyje į programą yra tarpų, jie turėtų būti imami į kabutes.", "Anonymous Usage Reporting": "Anoniminė naudojimo ataskaita", "Anonymous usage report format has changed. Would you like to move to the new format?": "Anoniminės naudojimo ataskaitos formatas pasikeitė. Ar norėtumėte pereiti prie naujojo formato?", diff --git a/gui/default/assets/lang/lang-nb.json b/gui/default/assets/lang/lang-nb.json index c337329f98e..436aed450f9 100644 --- a/gui/default/assets/lang/lang-nb.json +++ b/gui/default/assets/lang/lang-nb.json @@ -22,6 +22,7 @@ "Allow Anonymous Usage Reporting?": "Tillat anonym innsamling av brukerdata?", "Allowed Networks": "Tillatte nettverk", "Alphabetic": "Alfabetisk", + "Altered by ignoring deletes.": "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.": "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?", diff --git a/gui/default/assets/lang/lang-nl.json b/gui/default/assets/lang/lang-nl.json index 3814bf4d62a..ecc2ea25e25 100644 --- a/gui/default/assets/lang/lang-nl.json +++ b/gui/default/assets/lang/lang-nl.json @@ -22,6 +22,7 @@ "Allow Anonymous Usage Reporting?": "Versturen van anonieme gebruikersstatistieken toestaan?", "Allowed Networks": "Toegestane netwerken", "Alphabetic": "Alfabetisch", + "Altered by ignoring deletes.": "Veranderd door het negeren van verwijderingen.", "An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.": "Een externe opdracht regelt het versiebeheer. Hij moet het bestand verwijderen uit de gedeelde map. Als het pad naar de toepassing spaties bevat, moet dit tussen aanhalingstekens geplaatst worden.", "Anonymous Usage Reporting": "Anonieme gebruikersstatistieken", "Anonymous usage report format has changed. Would you like to move to the new format?": "Het formaat voor anonieme gebruikersrapporten is gewijzigd. Wilt u naar het nieuwe formaat overschakelen?", diff --git a/gui/default/assets/lang/lang-pl.json b/gui/default/assets/lang/lang-pl.json index 76c5bf38046..cdda2e9621c 100644 --- a/gui/default/assets/lang/lang-pl.json +++ b/gui/default/assets/lang/lang-pl.json @@ -22,6 +22,7 @@ "Allow Anonymous Usage Reporting?": "Czy chcesz zezwolić na anonimowe statystyki użycia?", "Allowed Networks": "Dozwolone sieci", "Alphabetic": "Alfabetycznie", + "Altered by ignoring deletes.": "Zmieniono przez ignorowanie usuniętych.", "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.": "Zewnętrzne polecenie odpowiedzialne jest za wersjonowanie. Musi ono usunąć plik ze współdzielonego folderu. Jeśli ścieżka do aplikacji zawiera spacje, powinna ona być zamknięta w cudzysłowie.", "Anonymous Usage Reporting": "Anonimowe statystyki użycia", "Anonymous usage report format has changed. Would you like to move to the new format?": "Format anonimowych statystyk użycia uległ zmianie. Czy chcesz przejść na nowy format?", diff --git a/gui/default/assets/lang/lang-pt-BR.json b/gui/default/assets/lang/lang-pt-BR.json index 24a8ea82114..b7df778e62e 100644 --- a/gui/default/assets/lang/lang-pt-BR.json +++ b/gui/default/assets/lang/lang-pt-BR.json @@ -22,6 +22,7 @@ "Allow Anonymous Usage Reporting?": "Permitir envio de relatórios anônimos de uso?", "Allowed Networks": "Redes permitidas", "Alphabetic": "Alfabética", + "Altered by ignoring deletes.": "Alterado ignorando exclusões.", "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.": "Um comando externo controla o controle de versão. Tem que remover o arquivo da pasta compartilhada. Se o caminho para o aplicativo contiver espaços, ele deve ser colocado entre aspas.", "Anonymous Usage Reporting": "Relatórios anônimos de uso", "Anonymous usage report format has changed. Would you like to move to the new format?": "O formato do relatório anônimo de uso mudou. Gostaria de usar o formato novo?", diff --git a/gui/default/assets/lang/lang-pt-PT.json b/gui/default/assets/lang/lang-pt-PT.json index 580e924533f..7816e905de5 100644 --- a/gui/default/assets/lang/lang-pt-PT.json +++ b/gui/default/assets/lang/lang-pt-PT.json @@ -22,6 +22,7 @@ "Allow Anonymous Usage Reporting?": "Permitir envio de relatórios anónimos de utilização?", "Allowed Networks": "Redes permitidas", "Alphabetic": "Alfabética", + "Altered by ignoring deletes.": "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.": "Um comando externo controla as versões. Esse comando tem que remover o ficheiro da pasta partilhada. Se o caminho para a aplicação contiver espaços, então terá de o escrever entre aspas.", "Anonymous Usage Reporting": "Enviar relatórios anónimos de utilização", "Anonymous usage report format has changed. Would you like to move to the new format?": "O formato do relatório anónimo de utilização foi alterado. Gostaria de mudar para o novo formato?", diff --git a/gui/default/assets/lang/lang-ro-RO.json b/gui/default/assets/lang/lang-ro-RO.json index 22f48028323..553a4b1a74f 100644 --- a/gui/default/assets/lang/lang-ro-RO.json +++ b/gui/default/assets/lang/lang-ro-RO.json @@ -22,6 +22,7 @@ "Allow Anonymous Usage Reporting?": "Permiteţi raportarea anonimă de folosire a aplicaţiei?", "Allowed Networks": "Rețele permise", "Alphabetic": "Alfabetic", + "Altered by ignoring deletes.": "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.": "O comandă externă gestionează versiunea. Trebuie să elimine fișierul din folderul partajat. Dacă calea către aplicație conține spații, ar trebui să fie pusă între ghilimele.", "Anonymous Usage Reporting": "Raport Anonim despre Folosirea Aplicației", "Anonymous usage report format has changed. Would you like to move to the new format?": "Formatul raportului de utilizare anonim s-a schimbat. Doriți să vă mutați în noul format?", diff --git a/gui/default/assets/lang/lang-ru.json b/gui/default/assets/lang/lang-ru.json index ff0b4711b56..c21ddeca6ef 100644 --- a/gui/default/assets/lang/lang-ru.json +++ b/gui/default/assets/lang/lang-ru.json @@ -22,6 +22,7 @@ "Allow Anonymous Usage Reporting?": "Разрешить анонимный отчет об использовании?", "Allowed Networks": "Разрешённые сети", "Alphabetic": "По алфавиту", + "Altered by ignoring deletes.": "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?": "Формат анонимных отчётов изменился. Хотите переключиться на новый формат?", diff --git a/gui/default/assets/lang/lang-sk.json b/gui/default/assets/lang/lang-sk.json index 43103f71354..7f43c8b9528 100644 --- a/gui/default/assets/lang/lang-sk.json +++ b/gui/default/assets/lang/lang-sk.json @@ -22,6 +22,7 @@ "Allow Anonymous Usage Reporting?": "Povoliť anoynmné hlásenia o použivaní?", "Allowed Networks": "Povolené siete", "Alphabetic": "Abecedne", + "Altered by ignoring deletes.": "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.": "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": "Anonymné hlásenie o používaní", "Anonymous usage report format has changed. Would you like to move to the new format?": "Formát anonymného hlásenia o používaní sa zmenil. Chcete prejsť na nový formát?", diff --git a/gui/default/assets/lang/lang-sl.json b/gui/default/assets/lang/lang-sl.json index 0774c31a937..1bcaf2b11e4 100644 --- a/gui/default/assets/lang/lang-sl.json +++ b/gui/default/assets/lang/lang-sl.json @@ -22,6 +22,7 @@ "Allow Anonymous Usage Reporting?": "Ali naj se dovoli brezimno poročanje o uporabi?", "Allowed Networks": "Dovoljena omrežja", "Alphabetic": "Po abecedi", + "Altered by ignoring deletes.": "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.": "Zunanji ukaz upravlja z različicami. To mora odstraniti datoteko od deljene mape. Če pot do aplikacije vsebuje presledke, jo postavite v dvojne narekovaje.", "Anonymous Usage Reporting": "Brezimno poročanje o uporabi", "Anonymous usage report format has changed. Would you like to move to the new format?": "Format anonimnega poročanja uporabe se je spremenil. Ali želite se premakniti na novi format?", diff --git a/gui/default/assets/lang/lang-sv.json b/gui/default/assets/lang/lang-sv.json index 5d2e20c55db..cde37fec1b5 100644 --- a/gui/default/assets/lang/lang-sv.json +++ b/gui/default/assets/lang/lang-sv.json @@ -22,6 +22,7 @@ "Allow Anonymous Usage Reporting?": "Tillåt anonym användarstatistiksrapportering?", "Allowed Networks": "Tillåtna nätverk", "Alphabetic": "Alfabetisk", + "Altered by ignoring deletes.": "Ändrad genom att ignorera borttagningar.", "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.": "Ett externt kommando hanterar versionen. Det måste ta bort filen från den delade mappen. Om sökvägen till applikationen innehåller mellanslag bör den citeras.", "Anonymous Usage Reporting": "Anonym användarstatistiksrapportering", "Anonymous usage report format has changed. Would you like to move to the new format?": "Anonymt användningsrapportformat har ändrats. Vill du flytta till det nya formatet?", diff --git a/gui/default/assets/lang/lang-tr.json b/gui/default/assets/lang/lang-tr.json index be14fa36b37..e3e80a49f72 100644 --- a/gui/default/assets/lang/lang-tr.json +++ b/gui/default/assets/lang/lang-tr.json @@ -22,6 +22,7 @@ "Allow Anonymous Usage Reporting?": "İsimsiz Kullanım Bildirmeye İzin Verilsin Mi?", "Allowed Networks": "İzin Verilen Ağlar", "Alphabetic": "Alfabetik", + "Altered by ignoring deletes.": "Silmeler yoksayılarak değiştirildi.", "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.": "Harici bir komut sürümlendirmeyi gerçekleştirir. Dosyayı paylaşılan klasörden kaldırmak zorundadır. Eğer uygulama yolu boşluklar içeriyorsa, tırnak içine alınmalıdır.", "Anonymous Usage Reporting": "İsimsiz Kullanım Bildirme", "Anonymous usage report format has changed. Would you like to move to the new format?": "İsimsiz kullanım raporu biçimi değişti. Yeni biçime geçmek ister misiniz?", diff --git a/gui/default/assets/lang/lang-uk.json b/gui/default/assets/lang/lang-uk.json index 1eb9e42ce4d..309cb994f4a 100644 --- a/gui/default/assets/lang/lang-uk.json +++ b/gui/default/assets/lang/lang-uk.json @@ -22,6 +22,7 @@ "Allow Anonymous Usage Reporting?": "Дозволити програмі збирати анонімну статистику використання?", "Allowed Networks": "Дозволені мережі", "Alphabetic": "За алфавітом", + "Altered by ignoring deletes.": "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?": "Змінився формат анонімного звіту про користування. Бажаєте перейти на новий формат?", diff --git a/gui/default/assets/lang/lang-zh-CN.json b/gui/default/assets/lang/lang-zh-CN.json index 2e26dc0e14d..73830318fa5 100644 --- a/gui/default/assets/lang/lang-zh-CN.json +++ b/gui/default/assets/lang/lang-zh-CN.json @@ -22,6 +22,7 @@ "Allow Anonymous Usage Reporting?": "允许匿名使用报告?", "Allowed Networks": "允许的网络", "Alphabetic": "字母顺序", + "Altered by ignoring deletes.": "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?": "匿名使用情况的报告格式已经变更。是否要迁移到新的格式？", diff --git a/gui/default/assets/lang/lang-zh-HK.json b/gui/default/assets/lang/lang-zh-HK.json index ecf39bf58ac..2a704c07808 100644 --- a/gui/default/assets/lang/lang-zh-HK.json +++ b/gui/default/assets/lang/lang-zh-HK.json @@ -22,6 +22,7 @@ "Allow Anonymous Usage Reporting?": "允許匿名使用報告?", "Allowed Networks": "允許的網絡", "Alphabetic": "字母順序", + "Altered by ignoring deletes.": "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?": "匿名使用情況的報告格式已經變更。是否要遷移到新的格式？", diff --git a/gui/default/assets/lang/lang-zh-TW.json b/gui/default/assets/lang/lang-zh-TW.json index 7c29312e851..9252a590caa 100644 --- a/gui/default/assets/lang/lang-zh-TW.json +++ b/gui/default/assets/lang/lang-zh-TW.json @@ -22,6 +22,7 @@ "Allow Anonymous Usage Reporting?": "允許回報匿名數據？", "Allowed Networks": "允許的網路", "Alphabetic": "字母順序", + "Altered by ignoring deletes.": "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?": "匿名數據回報格式已經變更，想要移至新格式嗎？", diff --git a/man/stdiscosrv.1 b/man/stdiscosrv.1 index a3738b138a9..a55ad1be22a 100644 --- a/man/stdiscosrv.1 +++ b/man/stdiscosrv.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "STDISCOSRV" "1" "Jan 10, 2022" "v1" "Syncthing" +.TH "STDISCOSRV" "1" "Jan 12, 2022" "v1" "Syncthing" .SH NAME stdiscosrv \- Syncthing Discovery Server .SH SYNOPSIS diff --git a/man/strelaysrv.1 b/man/strelaysrv.1 index 23c3c47c3aa..2475c758342 100644 --- a/man/strelaysrv.1 +++ b/man/strelaysrv.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "STRELAYSRV" "1" "Jan 10, 2022" "v1" "Syncthing" +.TH "STRELAYSRV" "1" "Jan 12, 2022" "v1" "Syncthing" .SH NAME strelaysrv \- Syncthing Relay Server .SH SYNOPSIS diff --git a/man/syncthing-bep.7 b/man/syncthing-bep.7 index 1ec8f74f725..85e0f82f1f7 100644 --- a/man/syncthing-bep.7 +++ b/man/syncthing-bep.7 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SYNCTHING-BEP" "7" "Jan 10, 2022" "v1" "Syncthing" +.TH "SYNCTHING-BEP" "7" "Jan 12, 2022" "v1" "Syncthing" .SH NAME syncthing-bep \- Block Exchange Protocol v1 .SH INTRODUCTION AND DEFINITIONS diff --git a/man/syncthing-config.5 b/man/syncthing-config.5 index 6394e97e8b1..c00791d0a6e 100644 --- a/man/syncthing-config.5 +++ b/man/syncthing-config.5 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SYNCTHING-CONFIG" "5" "Jan 10, 2022" "v1" "Syncthing" +.TH "SYNCTHING-CONFIG" "5" "Jan 12, 2022" "v1" "Syncthing" .SH NAME syncthing-config \- Syncthing Configuration .SH SYNOPSIS diff --git a/man/syncthing-device-ids.7 b/man/syncthing-device-ids.7 index 02df255866d..7261f251af0 100644 --- a/man/syncthing-device-ids.7 +++ b/man/syncthing-device-ids.7 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SYNCTHING-DEVICE-IDS" "7" "Jan 10, 2022" "v1" "Syncthing" +.TH "SYNCTHING-DEVICE-IDS" "7" "Jan 12, 2022" "v1" "Syncthing" .SH NAME syncthing-device-ids \- Understanding Device IDs .sp diff --git a/man/syncthing-event-api.7 b/man/syncthing-event-api.7 index d0e658459f1..2aca4df9e91 100644 --- a/man/syncthing-event-api.7 +++ b/man/syncthing-event-api.7 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SYNCTHING-EVENT-API" "7" "Jan 10, 2022" "v1" "Syncthing" +.TH "SYNCTHING-EVENT-API" "7" "Jan 12, 2022" "v1" "Syncthing" .SH NAME syncthing-event-api \- Event API .SH DESCRIPTION diff --git a/man/syncthing-faq.7 b/man/syncthing-faq.7 index 6bef9ba459e..676393fab14 100644 --- a/man/syncthing-faq.7 +++ b/man/syncthing-faq.7 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SYNCTHING-FAQ" "7" "Jan 10, 2022" "v1" "Syncthing" +.TH "SYNCTHING-FAQ" "7" "Jan 12, 2022" "v1" "Syncthing" .SH NAME syncthing-faq \- Frequently Asked Questions .INDENT 0.0 diff --git a/man/syncthing-globaldisco.7 b/man/syncthing-globaldisco.7 index f7c77d9637f..9443a7b90b8 100644 --- a/man/syncthing-globaldisco.7 +++ b/man/syncthing-globaldisco.7 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SYNCTHING-GLOBALDISCO" "7" "Jan 10, 2022" "v1" "Syncthing" +.TH "SYNCTHING-GLOBALDISCO" "7" "Jan 12, 2022" "v1" "Syncthing" .SH NAME syncthing-globaldisco \- Global Discovery Protocol v3 .SH ANNOUNCEMENTS diff --git a/man/syncthing-localdisco.7 b/man/syncthing-localdisco.7 index e6ba5daa960..22222e9bef4 100644 --- a/man/syncthing-localdisco.7 +++ b/man/syncthing-localdisco.7 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SYNCTHING-LOCALDISCO" "7" "Jan 10, 2022" "v1" "Syncthing" +.TH "SYNCTHING-LOCALDISCO" "7" "Jan 12, 2022" "v1" "Syncthing" .SH NAME syncthing-localdisco \- Local Discovery Protocol v4 .SH MODE OF OPERATION diff --git a/man/syncthing-networking.7 b/man/syncthing-networking.7 index 83ffc79b97d..668a971e6cc 100644 --- a/man/syncthing-networking.7 +++ b/man/syncthing-networking.7 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SYNCTHING-NETWORKING" "7" "Jan 10, 2022" "v1" "Syncthing" +.TH "SYNCTHING-NETWORKING" "7" "Jan 12, 2022" "v1" "Syncthing" .SH NAME syncthing-networking \- Firewall Setup .SH ROUTER SETUP diff --git a/man/syncthing-relay.7 b/man/syncthing-relay.7 index 60baadd8920..9d35cebf622 100644 --- a/man/syncthing-relay.7 +++ b/man/syncthing-relay.7 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SYNCTHING-RELAY" "7" "Jan 10, 2022" "v1" "Syncthing" +.TH "SYNCTHING-RELAY" "7" "Jan 12, 2022" "v1" "Syncthing" .SH NAME syncthing-relay \- Relay Protocol v1 .SH WHAT IS A RELAY? diff --git a/man/syncthing-rest-api.7 b/man/syncthing-rest-api.7 index a5ff0127390..68c66a84437 100644 --- a/man/syncthing-rest-api.7 +++ b/man/syncthing-rest-api.7 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SYNCTHING-REST-API" "7" "Jan 10, 2022" "v1" "Syncthing" +.TH "SYNCTHING-REST-API" "7" "Jan 12, 2022" "v1" "Syncthing" .SH NAME syncthing-rest-api \- REST API .sp diff --git a/man/syncthing-security.7 b/man/syncthing-security.7 index 0d67c974cd8..21e427e2f9e 100644 --- a/man/syncthing-security.7 +++ b/man/syncthing-security.7 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SYNCTHING-SECURITY" "7" "Jan 10, 2022" "v1" "Syncthing" +.TH "SYNCTHING-SECURITY" "7" "Jan 12, 2022" "v1" "Syncthing" .SH NAME syncthing-security \- Security Principles .sp diff --git a/man/syncthing-stignore.5 b/man/syncthing-stignore.5 index 2825446cfe0..2c3f0d6671d 100644 --- a/man/syncthing-stignore.5 +++ b/man/syncthing-stignore.5 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SYNCTHING-STIGNORE" "5" "Jan 10, 2022" "v1" "Syncthing" +.TH "SYNCTHING-STIGNORE" "5" "Jan 12, 2022" "v1" "Syncthing" .SH NAME syncthing-stignore \- Prevent files from being synchronized to other nodes .SH SYNOPSIS diff --git a/man/syncthing-versioning.7 b/man/syncthing-versioning.7 index 95b3e0d0746..cd988c05caf 100644 --- a/man/syncthing-versioning.7 +++ b/man/syncthing-versioning.7 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SYNCTHING-VERSIONING" "7" "Jan 10, 2022" "v1" "Syncthing" +.TH "SYNCTHING-VERSIONING" "7" "Jan 12, 2022" "v1" "Syncthing" .SH NAME syncthing-versioning \- Keep automatic backups of deleted files by other nodes .sp diff --git a/man/syncthing.1 b/man/syncthing.1 index 56b8957361f..406a3efa76b 100644 --- a/man/syncthing.1 +++ b/man/syncthing.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SYNCTHING" "1" "Jan 10, 2022" "v1" "Syncthing" +.TH "SYNCTHING" "1" "Jan 12, 2022" "v1" "Syncthing" .SH NAME syncthing \- Syncthing .SH SYNOPSIS From b6d1e16b4ea4dfbe562a12a9399167c62d6eeb3d Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Mon, 17 Jan 2022 18:52:43 +0100 Subject: [PATCH 048/220] lib/protocol: Switch to a newer lz4 package (#8122) --- go.mod | 2 +- go.sum | 4 +-- .../syncthing/core/aboutModalView.html | 2 +- lib/protocol/protocol.go | 32 +++++++++-------- lib/protocol/protocol_test.go | 34 +++++++++++++++++-- 5 files changed, 53 insertions(+), 21 deletions(-) diff --git a/go.mod b/go.mod index b40c10ac008..23bb4dc8367 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,6 @@ require ( github.com/AudriusButkevicius/pfilter v0.0.10 github.com/AudriusButkevicius/recli v0.0.6 github.com/alecthomas/kong v0.2.17 - github.com/bkaradzic/go-lz4 v0.0.0-20160924222819-7224d8d8f27e github.com/calmh/xdr v1.1.0 github.com/ccding/go-stun v0.1.3 github.com/certifi/gocertifi v0.0.0-20210507211836-431795d63e8d // indirect @@ -36,6 +35,7 @@ require ( github.com/minio/sha256-simd v1.0.0 github.com/miscreant/miscreant.go v0.0.0-20200214223636-26d376326b75 github.com/oschwald/geoip2-golang v1.5.0 + github.com/pierrec/lz4/v4 v4.1.12 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.11.0 github.com/prometheus/common v0.30.0 // indirect diff --git a/go.sum b/go.sum index 7d28a9f4f78..0b74c3e2ea4 100644 --- a/go.sum +++ b/go.sum @@ -60,8 +60,6 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= 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/bkaradzic/go-lz4 v0.0.0-20160924222819-7224d8d8f27e h1:2augTYh6E+XoNrrivZJBadpThP/dsvYKj0nzqfQ8tM4= -github.com/bkaradzic/go-lz4 v0.0.0-20160924222819-7224d8d8f27e/go.mod h1:0YdlkowM3VswSROI7qDxhRvJ3sLhlFrRRwjwegp5jy4= github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g= github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= github.com/calmh/xdr v1.1.0 h1:U/Dd4CXNLoo8EiQ4ulJUXkgO1/EyQLgDKLgpY1SOoJE= @@ -299,6 +297,8 @@ github.com/oschwald/maxminddb-golang v1.8.0 h1:Uh/DSnGoxsyp/KYbY1AuP0tYEwfs0sCph github.com/oschwald/maxminddb-golang v1.8.0/go.mod h1:RXZtst0N6+FY/3qCNmZMBApR19cdQj43/NM9VkrNAis= github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 h1:q2e307iGHPdTGp0hoxKjt1H5pDo6utceo3dQVK3I5XQ= github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o= +github.com/pierrec/lz4/v4 v4.1.12 h1:44l88ehTZAUGW4VlO1QC4zkilL99M6Y9MXNwEs0uzP8= +github.com/pierrec/lz4/v4 v4.1.12/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= diff --git a/gui/default/syncthing/core/aboutModalView.html b/gui/default/syncthing/core/aboutModalView.html index b2623a0ceb6..2a6fc1136e3 100644 --- a/gui/default/syncthing/core/aboutModalView.html +++ b/gui/default/syncthing/core/aboutModalView.html @@ -37,7 +37,7 @@

The Syncthing Authors

  • AudriusButkevicius/go-nat-pmp, Copyright © 2013 John Howard Palevich.
  • AudriusButkevicius/recli, Copyright © 2019 Audrius Butkevicius.
  • beorn7/perks, Copyright © 2013 Blake Mizerany.
    • -
  • bkaradzic/go-lz4, Copyright © 2011-2012 Branimir Karadzic, 2013 Damian Gryski.
    • +
  • pierrec/lz4, Copyright © 2015 Pierre Curto.
  • calmh/du, Public domain.
  • calmh/xdr, Copyright © 2014 Jakob Borg.
  • chmduquesne/rollinghash, Copyright © 2015 Christophe-Marie Duquesne.
    • diff --git a/lib/protocol/protocol.go b/lib/protocol/protocol.go index 7afca5a1e22..bed05c3a94b 100644 --- a/lib/protocol/protocol.go +++ b/lib/protocol/protocol.go @@ -23,7 +23,7 @@ import ( "sync" "time" - lz4 "github.com/bkaradzic/go-lz4" + lz4 "github.com/pierrec/lz4/v4" "github.com/pkg/errors" ) @@ -63,6 +63,10 @@ var sha256OfEmptyBlock = map[int][sha256.Size]byte{ 16 << MiB: {0x8, 0xa, 0xcf, 0x35, 0xa5, 0x7, 0xac, 0x98, 0x49, 0xcf, 0xcb, 0xa4, 0x7d, 0xc2, 0xad, 0x83, 0xe0, 0x1b, 0x75, 0x66, 0x3a, 0x51, 0x62, 0x79, 0xc8, 0xb9, 0xd2, 0x43, 0xb7, 0x19, 0x64, 0x3e}, } +var ( + errNotCompressible = errors.New("not compressible") +) + func init() { for blockSize := MinBlockSize; blockSize <= MaxBlockSize; blockSize *= 2 { BlockSizes = append(BlockSizes, blockSize) @@ -800,7 +804,7 @@ func (c *rawConnection) writeCompressedMessage(msg message, marshaled []byte, ov } cOverhead := 2 + hdrSize + 4 - maxCompressed := cOverhead + lz4.CompressBound(len(marshaled)) + maxCompressed := cOverhead + lz4.CompressBlockBound(len(marshaled)) buf := BufferPool.Get(maxCompressed) defer BufferPool.Put(buf) @@ -1010,32 +1014,30 @@ func (c *rawConnection) Statistics() Statistics { } func lz4Compress(src, buf []byte) (int, error) { - compressed, err := lz4.Encode(buf, src) + // The compressed block is prefixed by the size of the uncompressed data. + binary.BigEndian.PutUint32(buf, uint32(len(src))) + + n, err := lz4.CompressBlock(src, buf[4:], nil) if err != nil { return -1, err - } - if &compressed[0] != &buf[0] { - panic("bug: lz4.Compress allocated, which it must not (should use buffer pool)") + } else if len(src) > 0 && n == 0 { + return -1, errNotCompressible } - binary.BigEndian.PutUint32(compressed, binary.LittleEndian.Uint32(compressed)) - return len(compressed), nil + return n + 4, nil } func lz4Decompress(src []byte) ([]byte, error) { size := binary.BigEndian.Uint32(src) - binary.LittleEndian.PutUint32(src, size) - var err error buf := BufferPool.Get(int(size)) - decoded, err := lz4.Decode(buf, src) + + n, err := lz4.UncompressBlock(src[4:], buf) if err != nil { BufferPool.Put(buf) return nil, err } - if &decoded[0] != &buf[0] { - panic("bug: lz4.Decode allocated, which it must not (should use buffer pool)") - } - return decoded, nil + + return buf[:n], nil } func newProtocolError(err error, msgContext string) error { diff --git a/lib/protocol/protocol_test.go b/lib/protocol/protocol_test.go index 81a74bb9f9a..85e73011e11 100644 --- a/lib/protocol/protocol_test.go +++ b/lib/protocol/protocol_test.go @@ -17,7 +17,7 @@ import ( "testing/quick" "time" - lz4 "github.com/bkaradzic/go-lz4" + lz4 "github.com/pierrec/lz4/v4" "github.com/syncthing/syncthing/lib/rand" "github.com/syncthing/syncthing/lib/testutils" ) @@ -484,7 +484,7 @@ func TestLZ4Compression(t *testing.T) { t.Fatal(err) } - comp := make([]byte, lz4.CompressBound(dataLen)) + comp := make([]byte, lz4.CompressBlockBound(dataLen)) compLen, err := lz4Compress(data, comp) if err != nil { t.Errorf("compressing %d bytes: %v", dataLen, err) @@ -506,6 +506,36 @@ func TestLZ4Compression(t *testing.T) { } } +func TestLZ4CompressionUpdate(t *testing.T) { + uncompressed := []byte("this is some arbitrary yet fairly compressible data") + + // Compressed, as created by the LZ4 implementation in Syncthing 1.18.6 and earlier. + oldCompressed, _ := hex.DecodeString("00000033f0247468697320697320736f6d65206172626974726172792079657420666169726c7920636f6d707265737369626c652064617461") + + // Verify that we can decompress + + res, err := lz4Decompress(oldCompressed) + if err != nil { + t.Fatal(err) + } + if !bytes.Equal(uncompressed, res) { + t.Fatal("result does not match") + } + + // Verify that our current compression is equivalent + + buf := make([]byte, 128) + n, err := lz4Compress(uncompressed, buf) + if err != nil { + t.Fatal(err) + } + if !bytes.Equal(oldCompressed, buf[:n]) { + t.Logf("%x", oldCompressed) + t.Logf("%x", buf[:n]) + t.Fatal("compression does not match") + } +} + func TestCheckFilename(t *testing.T) { cases := []struct { name string From e40289ce7a8d33b2c9933d363fab6e17f5abbe5f Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Fri, 21 Jan 2022 14:54:42 +0100 Subject: [PATCH 049/220] build: Bump quic to v0.25.0 for Go1.18 support (#8134) --- go.mod | 2 +- go.sum | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 23bb4dc8367..e43c32b2c76 100644 --- a/go.mod +++ b/go.mod @@ -29,7 +29,7 @@ require ( github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 github.com/klauspost/cpuid/v2 v2.0.9 // indirect github.com/lib/pq v1.10.3 - github.com/lucas-clemente/quic-go v0.24.0 + github.com/lucas-clemente/quic-go v0.25.0 github.com/maruel/panicparse v1.6.1 github.com/maxbrunsfeld/counterfeiter/v6 v6.3.0 github.com/minio/sha256-simd v1.0.0 diff --git a/go.sum b/go.sum index 0b74c3e2ea4..3e6734f1a8c 100644 --- a/go.sum +++ b/go.sum @@ -240,8 +240,8 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/lib/pq v1.10.3 h1:v9QZf2Sn6AmjXtQeFpdoq/eaNtYP6IN+7lcrygsIAtg= github.com/lib/pq v1.10.3/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lucas-clemente/quic-go v0.22.0/go.mod h1:vF5M1XqhBAHgbjKcJOXY3JZz3GP0T3FQhz/uyOUS38Q= -github.com/lucas-clemente/quic-go v0.24.0 h1:ToR7SIIEdrgOhgVTHvPgdVRJfgVy+N0wQAagH7L4d5g= -github.com/lucas-clemente/quic-go v0.24.0/go.mod h1:paZuzjXCE5mj6sikVLMvqXk8lJV2AsqtJ6bDhjEfxx0= +github.com/lucas-clemente/quic-go v0.25.0 h1:K+X9Gvd7JXsOHtU0N2icZ2Nw3rx82uBej3mP4CLgibc= +github.com/lucas-clemente/quic-go v0.25.0/go.mod h1:YtzP8bxRVCBlO77yRanE264+fY/T2U9ZlW1AaHOsMOg= github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc= @@ -252,6 +252,8 @@ github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZE github.com/marten-seemann/qtls-go1-17 v0.1.0-rc.1/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8= github.com/marten-seemann/qtls-go1-17 v0.1.0 h1:P9ggrs5xtwiqXv/FHNwntmuLMNq3KaSIG93AtAZ48xk= github.com/marten-seemann/qtls-go1-17 v0.1.0/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8= +github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1 h1:EnzzN9fPUkUck/1CuY1FlzBaIYMoiBsdwTNmNGkwUUM= +github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1/go.mod h1:PUhIQk19LoFt2174H4+an8TYvWOGjb/hHwphBeaDHwI= github.com/maruel/panicparse v1.6.1 h1:803MjBzGcUgE1vYgg3UMNq3G1oyYeKkMu3t6hBS97x0= github.com/maruel/panicparse v1.6.1/go.mod h1:uoxI4w9gJL6XahaYPMq/z9uadrdr1SyHuQwV2q80Mm0= github.com/maruel/panicparse/v2 v2.1.1/go.mod h1:AeTWdCE4lcq8OKsLb6cHSj1RWHVSnV9HBCk7sKLF4Jg= From f0d5dc56961274d33d0c5f061d9a330d24722820 Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Fri, 21 Jan 2022 17:24:11 +0100 Subject: [PATCH 050/220] gui: Fix loading default ignores (#8135) --- .../syncthing/core/syncthingController.js | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/gui/default/syncthing/core/syncthingController.js b/gui/default/syncthing/core/syncthingController.js index 51fd73b9e52..659e71421f3 100755 --- a/gui/default/syncthing/core/syncthingController.js +++ b/gui/default/syncthing/core/syncthingController.js @@ -2090,7 +2090,12 @@ angular.module('syncthing.core') function editFolderLoadIgnores() { editFolderLoadingIgnores(); - return editFolderGetIgnores().then(editFolderInitIgnores, $scope.emitHTTPError); + return editFolderGetIgnores().then(function(data) { + if (!data) { + return; + } + editFolderInitIgnores(data.ignore, data.error); + }, $scope.emitHTTPError); } $scope.editFolderDefaults = function() { @@ -2109,10 +2114,10 @@ angular.module('syncthing.core') }); } - function editFolderInitIgnores(data) { - $scope.ignores.originalLines = data.ignore || []; - setIgnoresText(data.ignore); - $scope.ignores.error = data.error; + function editFolderInitIgnores(lines, error) { + $scope.ignores.originalLines = lines || []; + setIgnoresText(lines); + $scope.ignores.error = error; $scope.ignores.disabled = false; } @@ -2288,7 +2293,7 @@ angular.module('syncthing.core') return; } if ((data.ignore && data.ignore.length > 0) || data.error) { - editFolderInitIgnores(data); + editFolderInitIgnores(data.ignore, data.error); } else { getDefaultIgnores().then(function(lines) { setIgnoresText(lines); From a78aedec7edf01de3fee25ae36a2ac959212ccf7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 22 Jan 2022 08:32:03 +0100 Subject: [PATCH 051/220] build(deps): bump github.com/alecthomas/kong from 0.2.17 to 0.3.0 (#8126) Bumps [github.com/alecthomas/kong](https://github.com/alecthomas/kong) from 0.2.17 to 0.3.0. - [Release notes](https://github.com/alecthomas/kong/releases) - [Commits](https://github.com/alecthomas/kong/compare/v0.2.17...v0.3.0) --- updated-dependencies: - dependency-name: github.com/alecthomas/kong dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index e43c32b2c76..71d2aac2a08 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/syncthing/syncthing require ( github.com/AudriusButkevicius/pfilter v0.0.10 github.com/AudriusButkevicius/recli v0.0.6 - github.com/alecthomas/kong v0.2.17 + github.com/alecthomas/kong v0.3.0 github.com/calmh/xdr v1.1.0 github.com/ccding/go-stun v0.1.3 github.com/certifi/gocertifi v0.0.0-20210507211836-431795d63e8d // indirect diff --git a/go.sum b/go.sum index 3e6734f1a8c..390f7cd90ee 100644 --- a/go.sum +++ b/go.sum @@ -48,8 +48,10 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/StackExchange/wmi v1.2.1 h1:VIkavFPXSjcnS+O8yTq7NI32k0R5Aj+v39y29VYDOSA= github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8= -github.com/alecthomas/kong v0.2.17 h1:URDISCI96MIgcIlQyoCAlhOmrSw6pZScBNkctg8r0W0= -github.com/alecthomas/kong v0.2.17/go.mod h1:ka3VZ8GZNPXv9Ov+j4YNLkI8mTuhXyr/0ktSlqIydQQ= +github.com/alecthomas/kong v0.3.0 h1:qOLFzu0dGPNz8z5TiXGzgW3gb3RXfWVJKeAxcghVW88= +github.com/alecthomas/kong v0.3.0/go.mod h1:uzxf/HUh0tj43x1AyJROl3JT7SgsZ5m+icOv1csRhc0= +github.com/alecthomas/repr v0.0.0-20210801044451-80ca428c5142 h1:8Uy0oSf5co/NZXje7U1z8Mpep++QJOldL2hs/sBQf48= +github.com/alecthomas/repr v0.0.0-20210801044451-80ca428c5142/go.mod h1:2kn6fqh/zIyPLmm3ugklbEi5hg5wS435eygvNfaDQL8= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= From 4329ba316f79c85e5c64ebcdcdf6d43257f98bdd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 22 Jan 2022 08:46:03 +0100 Subject: [PATCH 052/220] build(deps): bump github.com/shirou/gopsutil/v3 from 3.21.8 to 3.21.12 (#8123) Bumps [github.com/shirou/gopsutil/v3](https://github.com/shirou/gopsutil) from 3.21.8 to 3.21.12. - [Release notes](https://github.com/shirou/gopsutil/releases) - [Commits](https://github.com/shirou/gopsutil/compare/v3.21.8...v3.21.12) --- updated-dependencies: - dependency-name: github.com/shirou/gopsutil/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 5 ++--- go.sum | 24 ++++++++++++++---------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/go.mod b/go.mod index 71d2aac2a08..4da03404fae 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,6 @@ require ( github.com/getsentry/raven-go v0.2.0 github.com/go-asn1-ber/asn1-ber v1.5.3 // indirect github.com/go-ldap/ldap/v3 v3.4.1 - github.com/go-ole/go-ole v1.2.6-0.20210915003542-8b1f7f90f6b1 // indirect github.com/gobwas/glob v0.2.3 github.com/gogo/protobuf v1.3.2 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da @@ -42,7 +41,7 @@ require ( github.com/prometheus/procfs v0.7.3 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 github.com/sasha-s/go-deadlock v0.3.1 - github.com/shirou/gopsutil/v3 v3.21.8 + github.com/shirou/gopsutil/v3 v3.21.12 github.com/syncthing/notify v0.0.0-20210616190510-c6b7342338d2 github.com/syndtr/goleveldb v1.0.1-0.20200815071216-d9e9293bd0f7 github.com/thejerf/suture/v4 v4.0.1 @@ -51,7 +50,7 @@ require ( golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 golang.org/x/mod v0.5.1 // indirect golang.org/x/net v0.0.0-20210924151903-3ad01bbaa167 - golang.org/x/sys v0.0.0-20210925032602-92d5a993a665 + golang.org/x/sys v0.0.0-20211013075003-97ac67df715c golang.org/x/text v0.3.7 golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac golang.org/x/tools v0.1.6 diff --git a/go.sum b/go.sum index 390f7cd90ee..e10f2ba7244 100644 --- a/go.sum +++ b/go.sum @@ -46,8 +46,6 @@ github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c h1:/IBSNwUN8+eKzU github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/StackExchange/wmi v1.2.1 h1:VIkavFPXSjcnS+O8yTq7NI32k0R5Aj+v39y29VYDOSA= -github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8= github.com/alecthomas/kong v0.3.0 h1:qOLFzu0dGPNz8z5TiXGzgW3gb3RXfWVJKeAxcghVW88= github.com/alecthomas/kong v0.3.0/go.mod h1:uzxf/HUh0tj43x1AyJROl3JT7SgsZ5m+icOv1csRhc0= github.com/alecthomas/repr v0.0.0-20210801044451-80ca428c5142 h1:8Uy0oSf5co/NZXje7U1z8Mpep++QJOldL2hs/sBQf48= @@ -124,9 +122,8 @@ github.com/go-ldap/ldap/v3 v3.4.1/go.mod h1:iYS1MdmrmceOJ1QOTnRXrIs7i3kloqtmGQjR github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= -github.com/go-ole/go-ole v1.2.6-0.20210915003542-8b1f7f90f6b1 h1:4dntyT+x6QTOSCIrgczbQ+ockAEha0cfxD5Wi0iCzjY= -github.com/go-ole/go-ole v1.2.6-0.20210915003542-8b1f7f90f6b1/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= +github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= +github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= @@ -181,8 +178,9 @@ github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= +github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -244,6 +242,7 @@ github.com/lib/pq v1.10.3/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lucas-clemente/quic-go v0.22.0/go.mod h1:vF5M1XqhBAHgbjKcJOXY3JZz3GP0T3FQhz/uyOUS38Q= github.com/lucas-clemente/quic-go v0.25.0 h1:K+X9Gvd7JXsOHtU0N2icZ2Nw3rx82uBej3mP4CLgibc= github.com/lucas-clemente/quic-go v0.25.0/go.mod h1:YtzP8bxRVCBlO77yRanE264+fY/T2U9ZlW1AaHOsMOg= +github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc= @@ -309,6 +308,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw= +github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= @@ -346,8 +347,8 @@ github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZj github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8= github.com/sclevine/spec v1.4.0/go.mod h1:LvpgJaFyvQzRvc1kaDs0bulYwzC70PbiYjC4QnFHkOM= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= -github.com/shirou/gopsutil/v3 v3.21.8 h1:nKct+uP0TV8DjjNiHanKf8SAuub+GNsbrOtM9Nl9biA= -github.com/shirou/gopsutil/v3 v3.21.8/go.mod h1:YWp/H8Qs5fVmf17v7JNZzA0mPJ+mS2e9JdiUF9LlKzQ= +github.com/shirou/gopsutil/v3 v3.21.12 h1:VoGxEW2hpmz0Vt3wUvHIl9fquzYLNpVpgNNB7pGJimA= +github.com/shirou/gopsutil/v3 v3.21.12/go.mod h1:BToYZVTlSVlfazpDDYFnsVZLaoRG+g8ufT6fPQLdJzA= github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod h1:XhFIlyj5a1fBNx5aJTbKoIq0mNaPvOagO+HjB3EtxrY= github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod h1:5u70Mqkb5O5cxEA8nxTsgrgLehJeAw6Oc4Ab1c/P1HM= github.com/shurcooL/github_flavored_markdown v0.0.0-20181002035957-2122de532470/go.mod h1:2dOwnU2uBioM+SGy2aZoq1f/Sd1l9OkAeAUvjSyvgU0= @@ -407,6 +408,8 @@ github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg= +github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= @@ -573,6 +576,7 @@ golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -583,8 +587,8 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210925032602-92d5a993a665 h1:QOQNt6vCjMpXE7JSK5VvAzJC1byuN3FgTNSBwf+CJgI= -golang.org/x/sys v0.0.0-20210925032602-92d5a993a665/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211013075003-97ac67df715c h1:taxlMj0D/1sOAuv/CbSD+MMDof2vbyPTqz5FNYKpXt8= +golang.org/x/sys v0.0.0-20211013075003-97ac67df715c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= From 99f96c5cb79fb933323ec2e950392886430b4a9c Mon Sep 17 00:00:00 2001 From: Syncthing Release Automation Date: Mon, 24 Jan 2022 03:45:54 +0000 Subject: [PATCH 053/220] gui, man, authors: Update docs, translations, and contributors --- gui/default/assets/lang/lang-bg.json | 3 + gui/default/assets/lang/lang-ca@valencia.json | 3 + gui/default/assets/lang/lang-cs.json | 13 +- gui/default/assets/lang/lang-da.json | 3 + gui/default/assets/lang/lang-de.json | 5 +- gui/default/assets/lang/lang-el.json | 3 + gui/default/assets/lang/lang-en-AU.json | 3 + gui/default/assets/lang/lang-en-GB.json | 3 + gui/default/assets/lang/lang-eo.json | 3 + gui/default/assets/lang/lang-es-ES.json | 73 ++-- gui/default/assets/lang/lang-es.json | 75 ++-- gui/default/assets/lang/lang-eu.json | 3 + gui/default/assets/lang/lang-fi.json | 3 + gui/default/assets/lang/lang-fr.json | 5 +- gui/default/assets/lang/lang-fy.json | 3 + gui/default/assets/lang/lang-hu.json | 3 + gui/default/assets/lang/lang-id.json | 7 +- gui/default/assets/lang/lang-it.json | 3 + gui/default/assets/lang/lang-ja.json | 3 + gui/default/assets/lang/lang-ko-KR.json | 339 +++++++++--------- gui/default/assets/lang/lang-lt.json | 3 + gui/default/assets/lang/lang-nb.json | 3 + gui/default/assets/lang/lang-nl.json | 3 + gui/default/assets/lang/lang-pl.json | 123 +++---- gui/default/assets/lang/lang-pt-BR.json | 3 + gui/default/assets/lang/lang-pt-PT.json | 5 +- gui/default/assets/lang/lang-ro-RO.json | 3 + gui/default/assets/lang/lang-ru.json | 3 + gui/default/assets/lang/lang-sk.json | 3 + gui/default/assets/lang/lang-sl.json | 3 + gui/default/assets/lang/lang-sv.json | 3 + gui/default/assets/lang/lang-tr.json | 5 +- gui/default/assets/lang/lang-uk.json | 3 + gui/default/assets/lang/lang-zh-CN.json | 3 + gui/default/assets/lang/lang-zh-HK.json | 3 + gui/default/assets/lang/lang-zh-TW.json | 3 + man/stdiscosrv.1 | 2 +- man/strelaysrv.1 | 2 +- man/syncthing-bep.7 | 2 +- man/syncthing-config.5 | 2 +- man/syncthing-device-ids.7 | 2 +- man/syncthing-event-api.7 | 2 +- man/syncthing-faq.7 | 11 +- man/syncthing-globaldisco.7 | 2 +- man/syncthing-localdisco.7 | 2 +- man/syncthing-networking.7 | 2 +- man/syncthing-relay.7 | 2 +- man/syncthing-rest-api.7 | 2 +- man/syncthing-security.7 | 2 +- man/syncthing-stignore.5 | 19 +- man/syncthing-versioning.7 | 16 +- man/syncthing.1 | 2 +- 52 files changed, 462 insertions(+), 338 deletions(-) diff --git a/gui/default/assets/lang/lang-bg.json b/gui/default/assets/lang/lang-bg.json index d6a412fc487..38377105cab 100644 --- a/gui/default/assets/lang/lang-bg.json +++ b/gui/default/assets/lang/lang-bg.json @@ -11,6 +11,7 @@ "Add Folder": "Добавяне на папка", "Add Remote Device": "Добавяне на устройство", "Add devices from the introducer to our device list, for mutually shared folders.": "Добавяйте устройства през поръчителите за взаимно споделени папки.", + "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": "Адрес", @@ -169,6 +170,7 @@ "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.": "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": "Пренебрегнато на", @@ -290,6 +292,7 @@ "Select the folders to share with this device.": "Изберете папките, които да споделите с устройството.", "Send & Receive": "Изпраща и получава", "Send Only": "Само изпраща", + "Set Ignores on Added Folder": "Set Ignores on Added Folder", "Settings": "Настройки", "Share": "Споделяне", "Share Folder": "Споделяне на папка", diff --git a/gui/default/assets/lang/lang-ca@valencia.json b/gui/default/assets/lang/lang-ca@valencia.json index 1aee85a8c71..71caf0353d1 100644 --- a/gui/default/assets/lang/lang-ca@valencia.json +++ b/gui/default/assets/lang/lang-ca@valencia.json @@ -11,6 +11,7 @@ "Add Folder": "Afegir carpeta", "Add Remote Device": "Afegir Dispositiu Remot.", "Add devices from the introducer to our device list, for mutually shared folders.": "Afegir dispositius des-de l'introductor a la nostra llista de dispositius, per a tindre carpetes compartides mútuament", + "Add ignore patterns": "Add ignore patterns", "Add new folder?": "Afegir nova carpeta?", "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.": "Adicionalment s'augmentarà l'interval d'escaneig complet (times 60, per exemple, ficarà el nou temps per defecte a 1 hora). També pots configurar-ho manualment per a cada carpeta més tard elegint No.", "Address": "Direcció", @@ -169,6 +170,7 @@ "Ignore": "Ignorar", "Ignore Patterns": "Patrons a ignorar", "Ignore Permissions": "Permisos a ignorar", + "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.": "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": "Dispositius Ignorats", "Ignored Folders": "Carpetes Ignorades", "Ignored at": "Ignorat en", @@ -290,6 +292,7 @@ "Select the folders to share with this device.": "Selecciona les carpetes per a compartir amb aquest dispositiu.", "Send & Receive": "Enviar i Rebre", "Send Only": "Enviar Solament", + "Set Ignores on Added Folder": "Set Ignores on Added Folder", "Settings": "Ajustos", "Share": "Compartir", "Share Folder": "Compartir carpeta", diff --git a/gui/default/assets/lang/lang-cs.json b/gui/default/assets/lang/lang-cs.json index 9d82eb3747d..fa44da13cd0 100644 --- a/gui/default/assets/lang/lang-cs.json +++ b/gui/default/assets/lang/lang-cs.json @@ -11,6 +11,7 @@ "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 ignore patterns": "Přidat vzory ignorovaného", "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.", "Address": "Adresa", @@ -22,7 +23,7 @@ "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.": "Altered by ignoring deletes.", + "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.", "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?", @@ -169,6 +170,7 @@ "Ignore": "Ignorovat", "Ignore Patterns": "Vzory ignorovaného", "Ignore Permissions": "Ignorovat oprávnění", + "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.": "Vzory ignorovaného lze přidat až po vytvoření složky. Pokud je zatrženo, budete vyzváni k zadání vzoru po uložení.", "Ignored Devices": "Ignorovaná zařízení", "Ignored Folders": "Ignorované složky", "Ignored at": "Ignorováno v", @@ -290,6 +292,7 @@ "Select the folders to share with this device.": "Vybrat složky ke sdílení s tímto zařízením.", "Send & Receive": "Odesílací a přijímací", "Send Only": "Pouze odesílací", + "Set Ignores on Added Folder": "Promítnout ignorování do přidané složky.", "Settings": "Nastavení", "Share": "Sdílet", "Share Folder": "Sdílet složku", @@ -437,10 +440,10 @@ "full documentation": "úplná dokumentace", "items": "položky", "seconds": "sekund", - "theme-name-black": "Black", - "theme-name-dark": "Dark", - "theme-name-default": "Default", - "theme-name-light": "Light", + "theme-name-black": "Černý", + "theme-name-dark": "Tmavý", + "theme-name-default": "Výchozí", + "theme-name-light": "Světlý", "{%device%} wants to share folder \"{%folder%}\".": "{{device}} chce sdílet složku „{{folder}}“.", "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} chce sdílet složku „{{folderlabel}}“ ({{folder}}).", "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} může toto zařízení znovu uvést." diff --git a/gui/default/assets/lang/lang-da.json b/gui/default/assets/lang/lang-da.json index d83ad6450ac..3e22494bcea 100644 --- a/gui/default/assets/lang/lang-da.json +++ b/gui/default/assets/lang/lang-da.json @@ -11,6 +11,7 @@ "Add Folder": "Tilføj mappe", "Add Remote Device": "Tilføj fjernenhed", "Add devices from the introducer to our device list, for mutually shared folders.": "Tilføj enheder fra den introducerende enhed til vores enhedsliste for gensidigt delte mapper.", + "Add ignore patterns": "Add ignore patterns", "Add new folder?": "Tilføj 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.": "Derudover vil intervallet for den komplette genskan blive forøget (60 gange, dvs. ny standard er 1 time). Du kan også konfigurere det manuelt for hver mappe senere efter at have valgt Nej.", "Address": "Adresse", @@ -169,6 +170,7 @@ "Ignore": "Ignorér", "Ignore Patterns": "Ignoreringsmønstre", "Ignore Permissions": "Ignorér rettigheder", + "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.": "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": "Ignorerede enheder", "Ignored Folders": "Ignorerede mapper", "Ignored at": "Ignoreret på", @@ -290,6 +292,7 @@ "Select the folders to share with this device.": "Vælg hvilke mapper du vil dele med denne enhed.", "Send & Receive": "Send og modtag", "Send Only": "Send kun", + "Set Ignores on Added Folder": "Set Ignores on Added Folder", "Settings": "Indstillinger", "Share": "Del", "Share Folder": "Del mappe", diff --git a/gui/default/assets/lang/lang-de.json b/gui/default/assets/lang/lang-de.json index 9580e71f65d..46dd3037192 100644 --- a/gui/default/assets/lang/lang-de.json +++ b/gui/default/assets/lang/lang-de.json @@ -11,6 +11,7 @@ "Add Folder": "Ordner hinzufügen", "Add Remote Device": "Gerät hinzufügen", "Add devices from the introducer to our device list, for mutually shared folders.": "Fügt Geräte vom Verteilergerät zu der eigenen Geräteliste hinzu, um gegenseitig geteilte Ordner zu ermöglichen.", + "Add ignore patterns": "Ignoriermuster hinzufügen", "Add new folder?": "Neuen Ordner hinzufügen?", "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.": "Zusätzlich wird das Scaninterval erhöht (um Faktor 60, also 1 Stunde als neuer Standard). Es kann auch manuell für jeden Ordner gesetzt werden, wenn Nein geklickt wird.", "Address": "Adresse", @@ -169,9 +170,10 @@ "Ignore": "Ignorieren", "Ignore Patterns": "Ignoriermuster", "Ignore Permissions": "Berechtigungen ignorieren", + "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.": "Ignoriermuster können erst hinzugefügt werden, nachdem der Ordner erstellt wurde. Bei Auswahl erscheint nach dem Speichern ein Eingabefeld zum setzen der Ignoriermuster.", "Ignored Devices": "Ignorierte Geräte", "Ignored Folders": "Ignorierte Ordner", - "Ignored at": "Ignoriert bei/von", + "Ignored at": "Ignoriert am", "Incoming Rate Limit (KiB/s)": "Eingehendes Datenratelimit (KiB/s)", "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Eine falsche Konfiguration kann den Ordnerinhalt beschädigen und Syncthing in einen unausführbaren Zustand versetzen.", "Introduced By": "Verteilt von", @@ -290,6 +292,7 @@ "Select the folders to share with this device.": "Wähle Sie die Ordner aus, die Sie mit diesem Gerät teilen möchten.", "Send & Receive": "Senden & Empfangen", "Send Only": "Nur senden", + "Set Ignores on Added Folder": "Ignoriermuster für neuen Ordner setzen", "Settings": "Einstellungen", "Share": "Teilen", "Share Folder": "Ordner teilen", diff --git a/gui/default/assets/lang/lang-el.json b/gui/default/assets/lang/lang-el.json index 2d07dbb38aa..b97374a1afd 100644 --- a/gui/default/assets/lang/lang-el.json +++ b/gui/default/assets/lang/lang-el.json @@ -11,6 +11,7 @@ "Add Folder": "Προσθήκη φακέλου", "Add Remote Device": "Προσθήκη Απομακρυσμένης Συσκευής", "Add devices from the introducer to our device list, for mutually shared folders.": "Προσθήκη συσκευών από το Βασικό κόμβο στη λίστα συσκευών μας, για όσους κοινούς φακέλους υπάρχουν μεταξύ τους.", + "Add ignore patterns": "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": "Διεύθυνση", @@ -169,6 +170,7 @@ "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.": "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": "Αγνοήθηκε στην", @@ -290,6 +292,7 @@ "Select the folders to share with this device.": "Διάλεξε ποιοι φάκελοι θα διαμοιράζονται προς αυτή τη συσκευή.", "Send & Receive": "Αποστολή και λήψη", "Send Only": "Μόνο αποστολή", + "Set Ignores on Added Folder": "Set Ignores on Added Folder", "Settings": "Ρυθμίσεις", "Share": "Διαμοίραση", "Share Folder": "Διαμοίραση φακέλου", diff --git a/gui/default/assets/lang/lang-en-AU.json b/gui/default/assets/lang/lang-en-AU.json index 69608c06eb0..45e7bb37569 100644 --- a/gui/default/assets/lang/lang-en-AU.json +++ b/gui/default/assets/lang/lang-en-AU.json @@ -11,6 +11,7 @@ "Add Folder": "Add Folder", "Add Remote Device": "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 ignore patterns": "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.": "Additionally the full rescan interval will be increased (times 60, i.e. new default of 1h). You can also configure it manually for every folder later after choosing No.", "Address": "Address", @@ -169,6 +170,7 @@ "Ignore": "Ignore", "Ignore Patterns": "Ignore Patterns", "Ignore Permissions": "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.": "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 Devices", "Ignored Folders": "Ignored Folders", "Ignored at": "Ignored at", @@ -290,6 +292,7 @@ "Select the folders to share with this device.": "Select the folders to share with this device.", "Send & Receive": "Send & Receive", "Send Only": "Send Only", + "Set Ignores on Added Folder": "Set Ignores on Added Folder", "Settings": "Settings", "Share": "Share", "Share Folder": "Share Folder", diff --git a/gui/default/assets/lang/lang-en-GB.json b/gui/default/assets/lang/lang-en-GB.json index 599ddb56823..bba451930d8 100644 --- a/gui/default/assets/lang/lang-en-GB.json +++ b/gui/default/assets/lang/lang-en-GB.json @@ -11,6 +11,7 @@ "Add Folder": "Add Folder", "Add Remote Device": "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 ignore patterns": "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.": "Additionally the full rescan interval will be increased (times 60, i.e. new default of 1h). You can also configure it manually for every folder later after choosing No.", "Address": "Address", @@ -169,6 +170,7 @@ "Ignore": "Ignore", "Ignore Patterns": "Ignore Patterns", "Ignore Permissions": "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.": "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 Devices", "Ignored Folders": "Ignored Folders", "Ignored at": "Ignored at", @@ -290,6 +292,7 @@ "Select the folders to share with this device.": "Select the folders to share with this device.", "Send & Receive": "Send & Receive", "Send Only": "Send Only", + "Set Ignores on Added Folder": "Set Ignores on Added Folder", "Settings": "Settings", "Share": "Share", "Share Folder": "Share Folder", diff --git a/gui/default/assets/lang/lang-eo.json b/gui/default/assets/lang/lang-eo.json index 74fa5caa573..bcacab8b4d3 100644 --- a/gui/default/assets/lang/lang-eo.json +++ b/gui/default/assets/lang/lang-eo.json @@ -11,6 +11,7 @@ "Add Folder": "Aldoni dosierujon", "Add Remote Device": "Aldoni foran aparaton", "Add devices from the introducer to our device list, for mutually shared folders.": "Aldoni aparatojn de la enkondukanto ĝis nia aparatlisto, por reciproke komunigitaj dosierujoj.", + "Add ignore patterns": "Add ignore patterns", "Add new folder?": "Ĉu aldoni novan dosierujon ?", "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.": "Aldone, plena reskana intervalo estos pliigita (60-oble, t.e. nova defaŭlto estas 1h). Vi povas ankaŭ agordi ĝin permane por ĉiu dosierujo poste post elekto de Ne.", "Address": "Adreso", @@ -169,6 +170,7 @@ "Ignore": "Ignoru", "Ignore Patterns": "Ignorantaj Ŝablonoj", "Ignore Permissions": "Ignori Permesojn", + "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.": "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": "Ignoritaj Aparatoj", "Ignored Folders": "Ignoritaj Dosierujoj", "Ignored at": "Ignorita ĉe", @@ -290,6 +292,7 @@ "Select the folders to share with this device.": "Elekti la dosierujojn por komunigi kun ĉi tiu aparato.", "Send & Receive": "Sendi kaj Ricevi", "Send Only": "Nur Sendi", + "Set Ignores on Added Folder": "Set Ignores on Added Folder", "Settings": "Agordoj", "Share": "Komunigi", "Share Folder": "Komunigu Dosierujon", diff --git a/gui/default/assets/lang/lang-es-ES.json b/gui/default/assets/lang/lang-es-ES.json index b404d91d1d5..ad7e5602ae0 100644 --- a/gui/default/assets/lang/lang-es-ES.json +++ b/gui/default/assets/lang/lang-es-ES.json @@ -11,6 +11,7 @@ "Add Folder": "Agregar Carpeta", "Add Remote Device": "Añadir un dispositivo", "Add devices from the introducer to our device list, for mutually shared folders.": "Añadir dispositivos desde el introductor a nuestra lista de dispositivos, para las carpetas compartidas mutuamente.", + "Add ignore patterns": "Agregar patrones a ignorar", "Add new folder?": "¿Agregar una carpeta nueva?", "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.": "De manera adicional, el intervalo de escaneo será incrementado (por ejemplo, times 60, establece un nuevo intervalo por defecto de una hora). También puedes configurarlo manualmente para cada carpeta tras elegir el número.", "Address": "Dirección", @@ -22,17 +23,17 @@ "Allow Anonymous Usage Reporting?": "¿Deseas permitir el envío anónimo de informes de uso?", "Allowed Networks": "Redes permitidas", "Alphabetic": "Alfabético", - "Altered by ignoring deletes.": "Altered by ignoring deletes.", + "Altered by ignoring deletes.": "Alterado al ignorar eliminaciones.", "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 maneja el versionado. Tiene que eliminar el fichero de la carpeta compartida. Si la ruta a la aplicación contiene espacios, hay que escribirla entre comillas.", "Anonymous Usage Reporting": "Informe anónimo de uso", "Anonymous usage report format has changed. Would you like to move to the new format?": "El formato del informe anónimo de uso ha cambiado. ¿Quieres cambiar al nuevo formato?", - "Are you sure you want to continue?": "Are you sure you want to continue?", - "Are you sure you want to override all remote changes?": "Are you sure you want to override all remote changes?", - "Are you sure you want to permanently delete all these files?": "¿Esta seguro(a) de que desea eliminar permanentemente todos estos archivos?", + "Are you sure you want to continue?": "¿Está seguro(a) de que desea continuar?", + "Are you sure you want to override all remote changes?": "¿Está seguro(a) de que desea sobreescribir todos los cambios remotos?", + "Are you sure you want to permanently delete all these files?": "¿Estás seguro(a) de que quieres eliminar permanentemente todos estos ficheros?", "Are you sure you want to remove device {%name%}?": "¿Estás seguro de que quieres quitar el dispositivo {{name}}?", "Are you sure you want to remove folder {%label%}?": "¿Estás seguro de que quieres quitar la carpeta {{label}}?", "Are you sure you want to restore {%count%} files?": "¿Estás seguro de que quieres restaurar {{count}} ficheros?", - "Are you sure you want to revert all local changes?": "Are you sure you want to revert all local changes?", + "Are you sure you want to revert all local changes?": "¿Está seguro(a) de que desea revertir todos los cambios locales?", "Are you sure you want to upgrade?": "¿Está seguro(a) de que desea actualizar?", "Auto Accept": "Auto aceptar", "Automatic Crash Reporting": "Informe automático de errores", @@ -43,13 +44,13 @@ "Available debug logging facilities:": "Ayudas disponibles para la depuración del registro:", "Be careful!": "¡Ten cuidado!", "Bugs": "Errores", - "Cancel": "Cancel", + "Cancel": "Cancelar", "Changelog": "Registro de cambios", "Clean out after": "Limpiar tras", "Cleaning Versions": "Limpiando Versiones", "Cleanup Interval": "Intervalo de Limpieza", "Click to see discovery failures": "Clica para ver fallos de descubrimiento.", - "Click to see full identification string and QR code.": "Click to see full identification string and QR code.", + "Click to see full identification string and QR code.": "Haga clic para ver la cadena de identificación completa y su código QR.", "Close": "Cerrar", "Command": "Acción", "Comment, when used at the start of a line": "Comentar, cuando se usa al comienzo de una línea", @@ -92,16 +93,16 @@ "Disabled periodic scanning and disabled watching for changes": "Desactivados el escaneo periódico y la vigilancia de cambios", "Disabled periodic scanning and enabled watching for changes": "Desactivado el escaneo periódico y activada la vigilancia de cambios", "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Desactivado el escaneo periódico y falló la activación de la vigilancia de cambios, reintentando cada 1 minuto:", - "Disables comparing and syncing file permissions. Useful on systems with nonexistent or custom permissions (e.g. FAT, exFAT, Synology, Android).": "Desactiva la comparación y sincronización de los permisos de los archivos. Útil en sistemas con permisos inexistentes o personalizados (por ejemplo, FAT, exFAT, Synology, Android).", + "Disables comparing and syncing file permissions. Useful on systems with nonexistent or custom permissions (e.g. FAT, exFAT, Synology, Android).": "Desactiva la comparación y sincronización de los permisos de los ficheros. Útil en sistemas con permisos inexistentes o personalizados (por ejemplo, FAT, exFAT, Synology, Android).", "Discard": "Descartar", "Disconnected": "Desconectado", "Disconnected (Unused)": "Desconectado (Sin uso)", "Discovered": "Descubierto", "Discovery": "Descubrimiento", "Discovery Failures": "Fallos de Descubrimiento", - "Discovery Status": "Discovery Status", - "Dismiss": "Dismiss", - "Do not add it to the ignore list, so this notification may recur.": "Do not add it to the ignore list, so this notification may recur.", + "Discovery Status": "Estado de Descubrimiento", + "Dismiss": "Descartar", + "Do not add it to the ignore list, so this notification may recur.": "No agregarlo a la lista de ignorados, de modo que esta notificación sea recurrente.", "Do not restore": "No restaurar", "Do not restore all": "No restaurar todo", "Do you want to enable watching for changes for all your folders?": "Quieres activar la vigilancia de cambios para todas tus carpetas?", @@ -127,7 +128,7 @@ "Error": "Error", "External File Versioning": "Versionado externo de fichero", "Failed Items": "Elementos fallidos", - "Failed to load ignore patterns.": "Failed to load ignore patterns.", + "Failed to load ignore patterns.": "Fallo al cargar patrones a ignorar", "Failed to setup, retrying": "Fallo al configurar, reintentando", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Se espera un fallo al conectar a los servidores IPv6 si no hay conectividad IPv6.", "File Pull Order": "Orden de obtención de los ficheros", @@ -144,7 +145,7 @@ "Folder Label": "Etiqueta de la Carpeta", "Folder Path": "Ruta de la carpeta", "Folder Type": "Tipo de carpeta", - "Folder type \"{%receiveEncrypted%}\" can only be set when adding a new folder.": "Folder type \"{{receiveEncrypted}}\" can only be set when adding a new folder.", + "Folder type \"{%receiveEncrypted%}\" can only be set when adding a new folder.": "El tipo de carpeta \"{{receiveEncrypted}}\" solo puede ser establecido al agregar una nueva carpeta.", "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 tipo de carpeta \"{{receiveEncrypted}}\" no se puede cambiar después de añadir la carpeta. Es necesario eliminar la carpeta, borrar o descifrar los datos en el disco y volver a añadir la carpeta.", "Folders": "Carpetas", "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "Para las siguientes carpetas ocurrió un error cuando se empezó a vigilar los cambios. Se reintentará cada minuto, así que puede ser que los errores desaparezcan pronto. Si persisten, intenta solucionar el problema subyacente y pide ayuda en el caso de que no puedas.", @@ -163,12 +164,13 @@ "Help": "Ayuda", "Home page": "Página de inicio", "However, your current settings indicate you might not want it enabled. We have disabled automatic crash reporting for you.": "Sin embargo, su configuración actual indica que puede no querer habilitarlo. Hemos deshabilitado el informe automático de errores por usted.", - "Identification": "Identification", + "Identification": "Identificación", "If untrusted, enter encryption password": "Si no es de confianza, ingrese la contraseña de cifrado.", - "If you want to prevent other users on this computer from accessing Syncthing and through it your files, consider setting up authentication.": "Si quiere impedirle a otros usuarios de esta computadora acceder a Syncthing y, a través de este, a sus archivos, considere establecer la autenticación.", + "If you want to prevent other users on this computer from accessing Syncthing and through it your files, consider setting up authentication.": "Si quiere impedirle a otros usuarios de esta computadora acceder a Syncthing y, a través de este, a sus ficheros, considere establecer la autenticación.", "Ignore": "Ignorar", "Ignore Patterns": "Patrones a ignorar", "Ignore Permissions": "Permisos a ignorar", + "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.": "Los patrones a ignorar solo se pueden agregar luego de que la carpeta sea creada. Cuando se marca, se presentará un campo de entrada para introducir los patrones a ignorar después de guardar.", "Ignored Devices": "Dispositivos Ignorados", "Ignored Folders": "Carpetas Ignoradas", "Ignored at": "Ignorado En", @@ -185,8 +187,8 @@ "Latest Change": "Último Cambio", "Learn more": "Saber más", "Limit": "Límite", - "Listener Failures": "Listener Failures", - "Listener Status": "Listener Status", + "Listener Failures": "Fallos de Oyente", + "Listener Status": "Estado de Oyente", "Listeners": "Oyentes", "Loading data...": "Cargando datos...", "Loading...": "Cargando...", @@ -225,7 +227,7 @@ "Out of Sync": "No sincronizado", "Out of Sync Items": "Elementos no sincronizados", "Outgoing Rate Limit (KiB/s)": "Límite de subida (KiB/s)", - "Override": "Override", + "Override": "Sobreescribir", "Override Changes": "Anular cambios", "Path": "Parche", "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 a la carpeta en la máquina local. Se creará si no existe. El carácter de la tilde (~) puede usarse como atajo.", @@ -239,7 +241,7 @@ "Periodic scanning at given interval and disabled watching for changes": "Escaneo periódico en un intervalo determinado y desactivada la vigilancia de cambios", "Periodic scanning at given interval and enabled watching for changes": "Escaneo periódico en un intervalo determinado y activada la vigilancia de cambios", "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Escaneo periódico en un intervalo determinado y falló la configuración de la vigilancia de cambios, se reintentará cada 1 minuto:", - "Permanently add it to the ignore list, suppressing further notifications.": "Permanently add it to the ignore list, suppressing further notifications.", + "Permanently add it to the ignore list, suppressing further notifications.": "Agregarlo permanentemente a la lista de ignorados, suprimiendo futuras notificaciones.", "Permissions": "Permisos", "Please consult the release notes before performing a major upgrade.": "Por favor, consultar las notas de la versión antes de realizar una actualización importante.", "Please set a GUI Authentication User and Password in the Settings dialog.": "Por favor, introduzca un Usuario y Contraseña para la Autenticación de la Interfaz de Usuario en el panel de Ajustes.", @@ -275,7 +277,7 @@ "Resume": "Continuar", "Resume All": "Continuar todo", "Reused": "Reutilizado", - "Revert": "Revert", + "Revert": "Revertir", "Revert Local Changes": "Revertir los cambios locales", "Save": "Guardar", "Scan Time Remaining": "Tiempo Restante de Escaneo", @@ -290,6 +292,7 @@ "Select the folders to share with this device.": "Selecciona las carpetas para compartir con este dispositivo.", "Send & Receive": "Enviar y Recibir", "Send Only": "Solo Enviar", + "Set Ignores on Added Folder": "Establecer Ignorados en Carpeta Agregada", "Settings": "Ajustes", "Share": "Compartir", "Share Folder": "Compartir carpeta", @@ -300,8 +303,8 @@ "Sharing": "Compartiendo", "Show ID": "Mostrar ID", "Show QR": "Mostrar QR", - "Show detailed discovery status": "Show detailed discovery status", - "Show detailed listener status": "Show detailed listener status", + "Show detailed discovery status": "Mostrar estado de descubrimiento detallado", + "Show detailed listener status": "Mostrar estado de oyente detallado", "Show diff with previous version": "Muestra las diferencias con la versión previa", "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Se muestra en lugar del ID del dispositivo en el estado del grupo (cluster). Se notificará a los otros dispositivos como nombre opcional por defecto.", "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Se muestra en lugar del ID del dispositivo en el estado del grupo (cluster). Se actualizará al nombre que el dispositivo anuncia si se deja vacío.", @@ -311,9 +314,9 @@ "Single level wildcard (matches within a directory only)": "Comodín de nivel único (coincide solamente dentro de un directorio)", "Size": "Tamaño", "Smallest First": "El más pequeño primero", - "Some discovery methods could not be established for finding other devices or announcing this device:": "Some discovery methods could not be established for finding other devices or announcing this device:", + "Some discovery methods could not be established for finding other devices or announcing this device:": "No se han podido establecer algunos métodos de descubrimiento para encontrar otros dispositivos o para anunciar este dispositivo:", "Some items could not be restored:": "Algunos ítems no se pudieron restaurar:", - "Some listening addresses could not be enabled to accept connections:": "Some listening addresses could not be enabled to accept connections:", + "Some listening addresses could not be enabled to accept connections:": "Algunas direcciones de escucha no pudieron ser activadas para aceptar conexiones:", "Source Code": "Código fuente", "Stable releases and release candidates": "Versiones estables y versiones candidatas", "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "Las versiones estables son publicadas cada dos semanas. Durante este tiempo son probadas como versiones candidatas.", @@ -330,8 +333,8 @@ "Syncthing has been shut down.": "Syncthing se ha detenido.", "Syncthing includes the following software or portions thereof:": "Syncthing incluye el siguiente software o partes de él:", "Syncthing is Free and Open Source Software licensed as MPL v2.0.": "Syncthing es Software Gratuito y Open Source Software licenciado como MPL v2.0.", - "Syncthing is listening on the following network addresses for connection attempts from other devices:": "Syncthing is listening on the following network addresses for connection attempts from other devices:", - "Syncthing is not listening for connection attempts from other devices on any address. Only outgoing connections from this device may work.": "Syncthing is not listening for connection attempts from other devices on any address. Only outgoing connections from this device may work.", + "Syncthing is listening on the following network addresses for connection attempts from other devices:": "Syncthing está a la escucha en las siguientes direcciones de red en busca de intentos de conexión de otros dispositivos:", + "Syncthing is not listening for connection attempts from other devices on any address. Only outgoing connections from this device may work.": "Syncthing no está a la escucha de intentos de conexión de otros dispositivos en ninguna dirección. Solo pueden funcionar las conexiones salientes de este dispositivo.", "Syncthing is restarting.": "Syncthing se está reiniciando.", "Syncthing is upgrading.": "Syncthing se está actualizando.", "Syncthing now supports automatically reporting crashes to the developers. This feature is enabled by default.": "Syncthing ahora permite el informe automático de errores a los desarrolladores. Esta característica está activada por defecto.", @@ -350,13 +353,13 @@ "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.": "La ID del dispositivo introducida no parece válida. Debe ser una cadena de 52 ó 56 caracteres formada por letras y números, con espacios y guiones opcionales.", "The folder ID cannot be blank.": "La ID de la carpeta no puede estar vacía.", "The folder ID must be unique.": "La ID de la carpeta debe ser única.", - "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 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 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.": "El contenido de las carpetas de otros dispositivos será sobreescritos para que sea idéntico al de este dispositivo. Ficheros no presentes aquí serán eliminados de otros dispositivos.", + "The folder content on this device will be overwritten to become identical with other devices. Files newly added here will be deleted.": "El contenido de las carpetas en este dispositivo será sobreescrito para ser idéntico al de otros dispositivos. Los ficheros que se agreguen aquí se eliminarán.", "The folder path cannot be blank.": "La ruta de la carpeta no puede estar en blanco.", "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.": "Se utilizan los siguientes intervalos: para la primera hora se mantiene una versión cada 30 segundos, para el primer día se mantiene una versión cada hora, para los primeros 30 días se mantiene una versión diaria hasta la edad máxima de una semana.", "The following items could not be synchronized.": "Los siguientes elementos no pueden ser sincronizados.", "The following items were changed locally.": "Los siguientes ítems fueron cambiados localmente.", - "The following methods are used to discover other devices on the network and announce this device to be found by others:": "The following methods are used to discover other devices on the network and announce this device to be found by others:", + "The following methods are used to discover other devices on the network and announce this device to be found by others:": "Los siguientes métodos son usados para descubrir otros dispositivos en la red y anunciar este dispositivo para que sea encontrado por otros:", "The following unexpected items were found.": "Los siguientes elementos inesperados fueron encontrados.", "The interval must be a positive number of seconds.": "El intervalo debe ser un número positivo de segundos.", "The interval, in seconds, for running cleanup in the versions directory. Zero to disable periodic cleaning.": "El intervalo, en segundos, para realizar la limpieza del directorio de versiones. Cero para desactivar la limpieza periódica.", @@ -374,7 +377,7 @@ "They are retried automatically and will be synced when the error is resolved.": "Se reintentarán de forma automática y se sincronizarán cuando se resuelva el error.", "This Device": "Este Dispositivo", "This can easily give hackers access to read and change any files on your computer.": "Esto podría permitir fácilmente el acceso a hackers para leer y modificar cualquier fichero de tu equipo.", - "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 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 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 no puede descubrir automáticamente a otros dispositivos o anunciar su propia dirección para que sea encontrado con otros. Solo dispositivos con direcciones configuradas como estáticas pueden conectarse.", "This is a major version upgrade.": "Hay una actualización importante.", "This setting controls the free space required on the home (i.e., index database) disk.": "Este ajuste controla el espacio libre necesario en el disco principal (por ejemplo, el índice de la base de datos).", "Time": "Hora", @@ -411,7 +414,7 @@ "Waiting to Clean": "Esperando para Limpiar", "Waiting to Scan": "Esperando para Escanear", "Waiting to Sync": "Esperando para Sincronizar", - "Warning": "Warning", + "Warning": "Advertencia", "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "¡Peligro! Esta ruta es un directorio principal de la carpeta ya existente \"{{otherFolder}}\".", "Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "'Peligro! Esta ruta es un subdirectorio de la carpeta ya existente \"{{otherFolderLabel}}\" ({{otherFolder}}).", "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Peligro! Esta ruta es un subdirectorio de una carpeta ya existente llamada \"{{otherFolder}}\".", @@ -437,10 +440,10 @@ "full documentation": "Documentación completa", "items": "Elementos", "seconds": "segundos", - "theme-name-black": "Black", - "theme-name-dark": "Dark", - "theme-name-default": "Default", - "theme-name-light": "Light", + "theme-name-black": "Negro", + "theme-name-dark": "Oscuro", + "theme-name-default": "Por Defecto", + "theme-name-light": "Claro", "{%device%} wants to share folder \"{%folder%}\".": "{{device}} quiere compartir la carpeta \"{{folder}}\".", "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} quiere compartir la carpeta \"{{folderlabel}}\" ({{folder}}).", "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} puede reintroducir este equipo." diff --git a/gui/default/assets/lang/lang-es.json b/gui/default/assets/lang/lang-es.json index 6a56201a08a..f3b0bbf416e 100644 --- a/gui/default/assets/lang/lang-es.json +++ b/gui/default/assets/lang/lang-es.json @@ -11,6 +11,7 @@ "Add Folder": "Agregar Carpeta", "Add Remote Device": "Añadir un dispositivo", "Add devices from the introducer to our device list, for mutually shared folders.": "Añadir dispositivos desde el introductor a nuestra lista de dispositivos, para las carpetas compartidas mutuamente.", + "Add ignore patterns": "Agregar patrones a ignorar", "Add new folder?": "¿Agregar una carpeta nueva?", "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.": "Además, el intervalo de reexploración completo se incrementará (60 veces, es decir, nuevo valor predeterminado de 1h). También puedes configurarlo manualmente para cada carpeta más adelante después de seleccionar No", "Address": "Dirección", @@ -22,17 +23,17 @@ "Allow Anonymous Usage Reporting?": "¿Deseas permitir el envío anónimo de informes de uso?", "Allowed Networks": "Redes permitidas", "Alphabetic": "Alfabético", - "Altered by ignoring deletes.": "Altered by ignoring deletes.", + "Altered by ignoring deletes.": "Alterado al ignorar eliminaciones.", "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 maneja las versiones. Tienes que eliminar el archivo de la carpeta compartida. Si la ruta a la aplicación contiene espacios, ésta debe estar entre comillas.", "Anonymous Usage Reporting": "Informe anónimo de uso", "Anonymous usage report format has changed. Would you like to move to the new format?": "El formato del informe de uso anónimo a cambiado. ¿Desearía usar el nuevo formato?", - "Are you sure you want to continue?": "Are you sure you want to continue?", - "Are you sure you want to override all remote changes?": "Are you sure you want to override all remote changes?", + "Are you sure you want to continue?": "¿Está seguro(a) de que desea continuar?", + "Are you sure you want to override all remote changes?": "¿Está seguro(a) de que desea sobreescribir todos los cambios remotos?", "Are you sure you want to permanently delete all these files?": "¿Está seguro de que desea eliminar permanente todos estos archivos?", "Are you sure you want to remove device {%name%}?": "¿Está seguro que desea eliminar el dispositivo {{name}}?", "Are you sure you want to remove folder {%label%}?": "¿Está seguro que desea eliminar la carpeta {{label}}?", "Are you sure you want to restore {%count%} files?": "¿Está seguro que desea restaurar {{count}} archivos?", - "Are you sure you want to revert all local changes?": "Are you sure you want to revert all local changes?", + "Are you sure you want to revert all local changes?": "¿Está seguro(a) de que desea revertir todos los cambios locales?", "Are you sure you want to upgrade?": "¿Está seguro(a) de que desea actualizar?", "Auto Accept": "Aceptar automáticamente", "Automatic Crash Reporting": "Informe Automático de Fallos", @@ -43,13 +44,13 @@ "Available debug logging facilities:": "Funciones de registro de depuración disponibles:", "Be careful!": "¡Ten cuidado!", "Bugs": "Errores", - "Cancel": "Cancel", + "Cancel": "Cancelar", "Changelog": "Registro de cambios", "Clean out after": "Limpiar tras", "Cleaning Versions": "Limpiando Versiones", "Cleanup Interval": "Intervalo de Limpieza", "Click to see discovery failures": "Clica para ver fallos de descubrimiento.", - "Click to see full identification string and QR code.": "Click to see full identification string and QR code.", + "Click to see full identification string and QR code.": "Haga clic para ver la cadena de identificación completa y su código QR.", "Close": "Cerrar", "Command": "Acción", "Comment, when used at the start of a line": "Comentar, cuando se usa al comienzo de una línea", @@ -72,7 +73,7 @@ "Default Folder": "Carpeta Predeterminada", "Default Folder Path": "Ruta de la carpeta por defecto", "Defaults": "Valores Predeterminados", - "Delete": "Suprimir", + "Delete": "Eliminar", "Delete Unexpected Items": "Borrar Elementos Inesperados", "Deleted": "Eliminado", "Deselect All": "Deseleccionar Todo", @@ -99,9 +100,9 @@ "Discovered": "Descubierto", "Discovery": "Descubrimiento", "Discovery Failures": "Fallos de Descubrimiento", - "Discovery Status": "Discovery Status", - "Dismiss": "Dismiss", - "Do not add it to the ignore list, so this notification may recur.": "Do not add it to the ignore list, so this notification may recur.", + "Discovery Status": "Estado de Descubrimiento", + "Dismiss": "Descartar", + "Do not add it to the ignore list, so this notification may recur.": "No agregarlo a la lista de ignorados, de modo que esta notificación sea recurrente.", "Do not restore": "No restaurar", "Do not restore all": "No restaurar todos", "Do you want to enable watching for changes for all your folders?": "¿Deseas activar el control de cambios en todas tus carpetas?", @@ -127,7 +128,7 @@ "Error": "Error", "External File Versioning": "Versionado externo de fichero", "Failed Items": "Elementos fallidos", - "Failed to load ignore patterns.": "Failed to load ignore patterns.", + "Failed to load ignore patterns.": "Fallo al cargar patrones a ignorar", "Failed to setup, retrying": "Fallo en la configuración, reintentando", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Se espera un fallo al conectar a los servidores IPv6 si no hay conectividad IPv6.", "File Pull Order": "Orden de Obtención de los Archivos", @@ -144,7 +145,7 @@ "Folder Label": "Etiqueta de la Carpeta", "Folder Path": "Ruta de la carpeta", "Folder Type": "Tipo de carpeta", - "Folder type \"{%receiveEncrypted%}\" can only be set when adding a new folder.": "Folder type \"{{receiveEncrypted}}\" can only be set when adding a new folder.", + "Folder type \"{%receiveEncrypted%}\" can only be set when adding a new folder.": "El tipo de carpeta \"{{receiveEncrypted}}\" solo puede ser establecido al agregar una nueva carpeta.", "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 tipo de carpeta \"{{receiveEncrypted}}\" no se puede cambiar después de añadir la carpeta. Es necesario eliminar la carpeta, borrar o descifrar los datos en el disco y volver a añadir la carpeta.", "Folders": "Carpetas", "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "En las siguientes carpetas se ha producido un error al empezar a buscar cambios. Se volverá a intentar cada minuto, por lo que los errores podrían solucionarse pronto. Si persisten, trata de arreglar el problema subyacente y pide ayuda si no puedes.", @@ -163,12 +164,13 @@ "Help": "Ayuda", "Home page": "Página de inicio", "However, your current settings indicate you might not want it enabled. We have disabled automatic crash reporting for you.": "Sin embargo, su configuración actual indica que puede no quererla activa. Hemos desactivado los informes automáticos de fallos por usted.", - "Identification": "Identification", + "Identification": "Identificación", "If untrusted, enter encryption password": "Si no es de confianza, introduzca la contraseña de cifrado", "If you want to prevent other users on this computer from accessing Syncthing and through it your files, consider setting up authentication.": "Si desea evitar que otros usuarios de esta computadora accedan a Syncthing y, a través de él, a sus archivos, considere establecer la autenticación.", "Ignore": "Ignorar", "Ignore Patterns": "Patrones a ignorar", "Ignore Permissions": "Permisos a ignorar", + "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.": "Los patrones a ignorar solo se pueden agregar luego de que la carpeta sea creada. Cuando se marca, se presentará un campo de entrada para introducir los patrones a ignorar después de guardar.", "Ignored Devices": "Dispositivos ignorados", "Ignored Folders": "Carpetas ignoradas", "Ignored at": "Ignorados en", @@ -185,8 +187,8 @@ "Latest Change": "Último Cambio", "Learn more": "Saber más", "Limit": "Límite", - "Listener Failures": "Listener Failures", - "Listener Status": "Listener Status", + "Listener Failures": "Fallos de Oyente", + "Listener Status": "Estado de Oyente", "Listeners": "Oyentes", "Loading data...": "Cargando datos...", "Loading...": "Cargando...", @@ -225,7 +227,7 @@ "Out of Sync": "No sincronizado", "Out of Sync Items": "Elementos no sincronizados", "Outgoing Rate Limit (KiB/s)": "Límite de subida (KiB/s)", - "Override": "Override", + "Override": "Sobreescribir", "Override Changes": "Anular cambios", "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 a la carpeta en la máquina local. Se creará si no existe. El carácter de la tilde (~) puede usarse como atajo.", @@ -239,19 +241,19 @@ "Periodic scanning at given interval and disabled watching for changes": "Escaneando periódicamente a un intervalo dado y detección de cambios desactivada", "Periodic scanning at given interval and enabled watching for changes": "Escaneando periódicamente a un intervalo dado y detección de cambios activada", "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Escaneando periódicamente a un intervalo dado y falló la configuración para detectar cambios, volviendo a intentarlo cada 1 m:", - "Permanently add it to the ignore list, suppressing further notifications.": "Permanently add it to the ignore list, suppressing further notifications.", + "Permanently add it to the ignore list, suppressing further notifications.": "Agregarlo permanentemente a la lista de ignorados, suprimiendo futuras notificaciones.", "Permissions": "Permisos", "Please consult the release notes before performing a major upgrade.": "Por favor, consultar las notas de la versión antes de realizar una actualización importante.", "Please set a GUI Authentication User and Password in the Settings dialog.": "Por favor, introduzca un Usuario y Contraseña para la Autenticación de la Interfaz de Usuario en el panel de Ajustes.", "Please wait": "Por favor, espere", - "Prefix indicating that the file can be deleted if preventing directory removal": "Prefix indicating that the file can be deleted if preventing directory removal", + "Prefix indicating that the file can be deleted if preventing directory removal": "Prefijo que indica que el archivo puede ser eliminado si se impide el borrado del directorio", "Prefix indicating that the pattern should be matched without case sensitivity": "Prefix indicating that the pattern should be matched without case sensitivity", "Preparing to Sync": "Preparándose para Sincronizar", "Preview": "Vista previa", "Preview Usage Report": "Informe de uso de vista previa", "Quick guide to supported patterns": "Guía rápida de patrones soportados", "Random": "Aleatorio", - "Receive Encrypted": "Recibir Encriptado(s)", + "Receive Encrypted": "Recibir Encriptado", "Receive Only": "Solo Recibir", "Received data is already encrypted": "Los datos recibidos ya están cifrados", "Recent Changes": "Cambios recientes", @@ -275,7 +277,7 @@ "Resume": "Continuar", "Resume All": "Continuar todo", "Reused": "Reutilizado", - "Revert": "Revert", + "Revert": "Revertir", "Revert Local Changes": "Revertir Cambios Locales", "Save": "Guardar", "Scan Time Remaining": "Tiempo Restante de Escaneo", @@ -290,6 +292,7 @@ "Select the folders to share with this device.": "Selecciona las carpetas para compartir con este dispositivo.", "Send & Receive": "Enviar y Recibir", "Send Only": "Solo Enviar", + "Set Ignores on Added Folder": "Establecer Ignorados en Carpeta Agregada", "Settings": "Ajustes", "Share": "Compartir", "Share Folder": "Compartir carpeta", @@ -300,8 +303,8 @@ "Sharing": "Compartiendo", "Show ID": "Mostrar ID", "Show QR": "Mostrar QR", - "Show detailed discovery status": "Show detailed discovery status", - "Show detailed listener status": "Show detailed listener status", + "Show detailed discovery status": "Mostrar estado de descubrimiento detallado", + "Show detailed listener status": "Mostrar estado de oyente detallado", "Show diff with previous version": "Mostrar la diferencia con la versión anterior", "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Se muestra en lugar del ID del dispositivo en el estado del grupo (cluster). Se notificará a los otros dispositivos como nombre opcional por defecto.", "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Se muestra en lugar del ID del dispositivo en el estado del grupo (cluster). Se actualizará al nombre que el dispositivo anuncia si se deja vacío.", @@ -311,9 +314,9 @@ "Single level wildcard (matches within a directory only)": "Comodín de nivel único (coincide solamente dentro de un directorio)", "Size": "Tamaño", "Smallest First": "El más pequeño primero", - "Some discovery methods could not be established for finding other devices or announcing this device:": "Some discovery methods could not be established for finding other devices or announcing this device:", + "Some discovery methods could not be established for finding other devices or announcing this device:": "No se han podido establecer algunos métodos de descubrimiento para encontrar otros dispositivos o para anunciar este dispositivo:", "Some items could not be restored:": "Algunos ítemes no pudieron ser restaurados:", - "Some listening addresses could not be enabled to accept connections:": "Some listening addresses could not be enabled to accept connections:", + "Some listening addresses could not be enabled to accept connections:": "Algunas direcciones de escucha no pudieron ser activadas para aceptar conexiones:", "Source Code": "Código fuente", "Stable releases and release candidates": "Versiones estables y versiones candidatas", "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "Las versiones estables son publicadas cada dos semanas. Durante este tiempo son probadas como versiones candidatas.", @@ -330,8 +333,8 @@ "Syncthing has been shut down.": "Syncthing se ha detenido.", "Syncthing includes the following software or portions thereof:": "Syncthing incluye el siguiente software o partes de él:", "Syncthing is Free and Open Source Software licensed as MPL v2.0.": "Syncthing es Software Libre y de Código Abierto con licencia MPL v2.0.", - "Syncthing is listening on the following network addresses for connection attempts from other devices:": "Syncthing is listening on the following network addresses for connection attempts from other devices:", - "Syncthing is not listening for connection attempts from other devices on any address. Only outgoing connections from this device may work.": "Syncthing is not listening for connection attempts from other devices on any address. Only outgoing connections from this device may work.", + "Syncthing is listening on the following network addresses for connection attempts from other devices:": "Syncthing está a la escucha en las siguientes direcciones de red en busca de intentos de conexión de otros dispositivos:", + "Syncthing is not listening for connection attempts from other devices on any address. Only outgoing connections from this device may work.": "Syncthing no está a la escucha de intentos de conexión de otros dispositivos en ninguna dirección. Solo pueden funcionar las conexiones salientes de este dispositivo.", "Syncthing is restarting.": "Syncthing se está reiniciando.", "Syncthing is upgrading.": "Syncthing se está actualizando.", "Syncthing now supports automatically reporting crashes to the developers. This feature is enabled by default.": "Syncthing ahora soporta el reportar automáticamente las fallas a los desarrolladores. Esta característica está habilitada por defecto.", @@ -350,13 +353,13 @@ "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.": "La ID del dispositivo introducida no parece válida. Debe ser una cadena de 52 ó 56 caracteres formada por letras y números, con espacios y guiones opcionales.", "The folder ID cannot be blank.": "La ID de la carpeta no puede estar vacía.", "The folder ID must be unique.": "La ID de la carpeta debe ser única.", - "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 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 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.": "El contenido de las carpetas de otros dispositivos será sobreescritos para que sea idéntico al de este dispositivo. Archivos no presentes aquí serán eliminados de otros dispositivos.", + "The folder content on this device will be overwritten to become identical with other devices. Files newly added here will be deleted.": "El contenido de las carpetas en este dispositivo será sobreescrito para ser idéntico al de otros dispositivos. Los archivos que se agreguen aquí se eliminarán.", "The folder path cannot be blank.": "La ruta de la carpeta no puede estar en blanco.", "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.": "Se utilizan los siguientes intervalos: para la primera hora se mantiene una versión cada 30 segundos, para el primer día se mantiene una versión cada hora, para los primeros 30 días se mantiene una versión diaria hasta la edad máxima de una semana.", "The following items could not be synchronized.": "Los siguientes elementos no pueden ser sincronizados.", "The following items were changed locally.": "Los siguientes elementos fueron cambiados localmente.", - "The following methods are used to discover other devices on the network and announce this device to be found by others:": "The following methods are used to discover other devices on the network and announce this device to be found by others:", + "The following methods are used to discover other devices on the network and announce this device to be found by others:": "Los siguientes métodos son usados para descubrir otros dispositivos en la red y anunciar este dispositivo para que sea encontrado por otros:", "The following unexpected items were found.": "Los siguientes elementos inesperados fueron encontrados.", "The interval must be a positive number of seconds.": "El intervalo debe ser un número de segundos positivo.", "The interval, in seconds, for running cleanup in the versions directory. Zero to disable periodic cleaning.": "El intervalo, en segundos, para ejecutar la limpieza del directorio de versiones. Cero para desactivar la limpieza periódica.", @@ -374,7 +377,7 @@ "They are retried automatically and will be synced when the error is resolved.": "Se reintentarán de forma automática y se sincronizarán cuando se resuelva el error.", "This Device": "Este Dispositivo", "This can easily give hackers access to read and change any files on your computer.": "Esto podría permitir fácilmente el acceso a hackers para leer y modificar cualquier fichero de tu equipo.", - "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 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 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 no puede descubrir automáticamente a otros dispositivos o anunciar su propia dirección para que sea encontrado con otros. Solo dispositivos con direcciones configuradas como estáticas pueden conectarse.", "This is a major version upgrade.": "Hay una actualización importante.", "This setting controls the free space required on the home (i.e., index database) disk.": "Este ajuste controla el espacio libre necesario en el disco principal (por ejemplo, el índice de la base de datos).", "Time": "Hora", @@ -402,7 +405,7 @@ "Uptime": "Tiempo de funcionamiento", "Usage reporting is always enabled for candidate releases.": "El informe de uso está siempre habilitado en las versiones candidatas.", "Use HTTPS for GUI": "Usar HTTPS para la Interfaz Gráfica de Usuario (GUI)", - "Use notifications from the filesystem to detect changed items.": "Use notifications from the filesystem to detect changed items.", + "Use notifications from the filesystem to detect changed items.": "Usar notificaciones del sistema de archivos para detectar elementos cambiados.", "Username/Password has not been set for the GUI authentication. Please consider setting it up.": "No se ha configurado el nombre de usuario/la contraseña para la autenticación de la GUI. Por favor, considere configurarlos.", "Version": "Versión", "Versions": "Versiones", @@ -411,7 +414,7 @@ "Waiting to Clean": "Esperando para Limpiar", "Waiting to Scan": "Esperando para Escanear", "Waiting to Sync": "Esperando para Sincronizar", - "Warning": "Warning", + "Warning": "Advertencia", "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "¡Peligro! Esta ruta es un directorio principal de la carpeta ya existente \"{{otherFolder}}\".", "Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "'Peligro! Esta ruta es un subdirectorio de la carpeta ya existente \"{{otherFolderLabel}}\" ({{otherFolder}}).", "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Peligro! Esta ruta es un subdirectorio de una carpeta ya existente llamada \"{{otherFolder}}\".", @@ -437,10 +440,10 @@ "full documentation": "Documentación completa", "items": "Elementos", "seconds": "segundos", - "theme-name-black": "Black", - "theme-name-dark": "Dark", - "theme-name-default": "Default", - "theme-name-light": "Light", + "theme-name-black": "Negro", + "theme-name-dark": "Oscuro", + "theme-name-default": "Por Defecto", + "theme-name-light": "Claro", "{%device%} wants to share folder \"{%folder%}\".": "{{device}} quiere compartir la carpeta \"{{folder}}\".", "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} quiere compartir la carpeta \"{{folderlabel}}\" ({{folder}}).", "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} puede reintroducir este dispositivo." diff --git a/gui/default/assets/lang/lang-eu.json b/gui/default/assets/lang/lang-eu.json index 688ba224aa9..869daa653c2 100644 --- a/gui/default/assets/lang/lang-eu.json +++ b/gui/default/assets/lang/lang-eu.json @@ -11,6 +11,7 @@ "Add Folder": "Karpeta gehitu", "Add Remote Device": "Urrundikako tresna bat gehitu", "Add devices from the introducer to our device list, for mutually shared folders.": "Gure tresna zerrendan tresnak gehitzea baimendu, partekatzeetan.", + "Add ignore patterns": "Add ignore patterns", "Add new folder?": "Karpeta berria gehitu?", "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.": "Gainera, berresplorazio osoaren tartea handitu egingo da (60 aldiz, hau da, lehenetsitako balio berria, 1 ordukoa). Halaber, eskuz konfigura dezakezu karpeta bakoitzerako, Ez hautatu ondoren.", "Address": "Helbidea", @@ -169,6 +170,7 @@ "Ignore": "Kontuan ez hartu", "Ignore Patterns": "Baztertzeak", "Ignore Permissions": "Baimenak kontuan ez hartu", + "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.": "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": "Bazter utzitako tresnak", "Ignored Folders": "Bazter utzitako karpetak", "Ignored at": "Hemen baztertuak", @@ -290,6 +292,7 @@ "Select the folders to share with this device.": "Tresna honek erabiltzen dituen partekatzeak hauta itzazu", "Send & Receive": "Igorri eta errezibitu", "Send Only": "Igorrri bakarrik", + "Set Ignores on Added Folder": "Set Ignores on Added Folder", "Settings": "Konfigurazioa", "Share": "Partekatu", "Share Folder": "Partekatzea", diff --git a/gui/default/assets/lang/lang-fi.json b/gui/default/assets/lang/lang-fi.json index 2ee6485a047..bbe1f4c0212 100644 --- a/gui/default/assets/lang/lang-fi.json +++ b/gui/default/assets/lang/lang-fi.json @@ -11,6 +11,7 @@ "Add Folder": "Lisää kansio", "Add Remote Device": "Lisää laite", "Add devices from the introducer to our device list, for mutually shared folders.": "Lisää laitteet esittelijältä tämän koneen laitelistaan yhteisiksi jaetuiksi kansioiksi.", + "Add ignore patterns": "Add ignore patterns", "Add new folder?": "Lisää uusi kansio?", "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.": "Lisäksi täysi kansioiden skannausväli kasvaa (60-kertaiseksi, uusi oletus on siis yksi tunti). Voit kuitenkin asettaa skannausvälin kansiokohtaisesti myöhemmin vaikka valitset nyt \"ei\".", "Address": "Osoite", @@ -169,6 +170,7 @@ "Ignore": "Ohita", "Ignore Patterns": "Ohituslausekkeet", "Ignore Permissions": "Jätä oikeudet huomiotta", + "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.": "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": "Ohitetut laitteet", "Ignored Folders": "Ohitetut kansiot", "Ignored at": "Ohitettu (laitteessa)", @@ -290,6 +292,7 @@ "Select the folders to share with this device.": "Valitse kansiot jaettavaksi tämän laitteen kanssa.", "Send & Receive": "Lähetä & vastaanota", "Send Only": "Vain lähetys", + "Set Ignores on Added Folder": "Set Ignores on Added Folder", "Settings": "Asetukset", "Share": "Jaa", "Share Folder": "Jaa kansio", diff --git a/gui/default/assets/lang/lang-fr.json b/gui/default/assets/lang/lang-fr.json index b3b4ccbe5b4..c6c5969f014 100644 --- a/gui/default/assets/lang/lang-fr.json +++ b/gui/default/assets/lang/lang-fr.json @@ -11,6 +11,7 @@ "Add Folder": "Ajouter un partage...", "Add Remote Device": "Ajouter un appareil...", "Add devices from the introducer to our device list, for mutually shared folders.": "ATTENTION !!! Lui permettre d'ajouter et enlever des membres à toutes mes listes de membres des partages dont il fait (ou fera !) partie (ceci permet de créer automatiquement toutes les liaisons point à point possibles en complétant mes listes par les siennes, meilleur débit de réception par cumul des débits d'envoi, indépendance vis à vis de l'introducteur, etc).", + "Add ignore patterns": "Ajouter des masques d'exclusion", "Add new folder?": "Ajouter ce partage ?", "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.": "Dans ce cas, l'intervalle de réanalyse complète sera augmenté (60 fois, c.-à-d. une nouvelle valeur par défaut de 1h). Vous pouvez également la configurer manuellement plus tard, pour chaque partage, après avoir choisi Non.", "Address": "Adresse", @@ -169,6 +170,7 @@ "Ignore": "Refuser", "Ignore Patterns": "Exclusions...", "Ignore Permissions": "Ignorer les 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.": "L'ajout de masques d'exclusion ne peut se faire qu'après la création du partage. En cochant cette case il vous sera proposé de saisir (ou si vous avez déjà défini des valeurs par défaut, de compléter) une liste d'exclusions après l'enregistrement. ", "Ignored Devices": "Appareils refusés", "Ignored Folders": "Partages refusés", "Ignored at": "Refusé le", @@ -290,6 +292,7 @@ "Select the folders to share with this device.": "Choisir les partages auxquels cet appareil doit participer :", "Send & Receive": "Envoi & réception", "Send Only": "Envoi (lecture seule)", + "Set Ignores on Added Folder": "Définir des exclusions pour le nouveau partage", "Settings": "Configuration", "Share": "Partager", "Share Folder": "Partager", @@ -434,7 +437,7 @@ "days": "Jours", "directories": "répertoires", "files": "Fichiers", - "full documentation": "Documentation complète ici", + "full documentation": "Documentation complète ici (en anglais)", "items": "élément(s)", "seconds": "secondes", "theme-name-black": "Noir", diff --git a/gui/default/assets/lang/lang-fy.json b/gui/default/assets/lang/lang-fy.json index f8b118126f9..036ad571a04 100644 --- a/gui/default/assets/lang/lang-fy.json +++ b/gui/default/assets/lang/lang-fy.json @@ -11,6 +11,7 @@ "Add Folder": "Map taheakje", "Add Remote Device": "Apparaat op Ofstân Taheakje", "Add devices from the introducer to our device list, for mutually shared folders.": "Heakje apparaten fan de yntrodusearders ta oan ús apparatenlyst, foar mei-inoar dielde mappen.", + "Add ignore patterns": "Add ignore patterns", "Add new folder?": "Nije map taheakje?", "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.": "Boppedat wurd it ynterfal foar in folledige wer-sken omheech brocht (kear 60 minuten, dit is in nije standert fan 1 oere). Jo kinne dit ek letter foar elke map hânmjittich ynstelle nei it kiezen fan Nee.", "Address": "Adres", @@ -169,6 +170,7 @@ "Ignore": "Negearje", "Ignore Patterns": "Negear-patroanen", "Ignore Permissions": "Negear-rjochten", + "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.": "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": "Negearde Apparaten", "Ignored Folders": "Negearde Mappen", "Ignored at": "Negeard op ", @@ -290,6 +292,7 @@ "Select the folders to share with this device.": "Sykje de mappen út om mei dit apparaat te dielen.", "Send & Receive": "Stjoere & Untfange", "Send Only": "Allinnich Stjoere", + "Set Ignores on Added Folder": "Set Ignores on Added Folder", "Settings": "Ynstellings", "Share": "Diele", "Share Folder": "Map diele", diff --git a/gui/default/assets/lang/lang-hu.json b/gui/default/assets/lang/lang-hu.json index 80cbfada891..5d7668c89e3 100644 --- a/gui/default/assets/lang/lang-hu.json +++ b/gui/default/assets/lang/lang-hu.json @@ -11,6 +11,7 @@ "Add Folder": "Mappa hozzáadása", "Add Remote Device": "Távoli eszköz hozzáadása", "Add devices from the introducer to our device list, for mutually shared folders.": "Eszközök hozzáadása a bevezetőről az eszköz listához, a közösen megosztott mappákhoz.", + "Add ignore patterns": "Mellőzési minták hozzáadása", "Add new folder?": "Hozzáadható az új mappa?", "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.": "Ezzel együtt a teljes átnézési intervallum jóval meg fog nőni (60-szoros értékre, vagyis 1 óra az új alapértelmezett érték). A „Nem” kiválasztásával később kézzel is módosítható ez az érték minden egyes mappára külön-külön.", "Address": "Cím", @@ -169,6 +170,7 @@ "Ignore": "Mellőzés", "Ignore Patterns": "Mellőzési minták", "Ignore Permissions": "Jogosultságok mellőzése", + "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.": "Mellőzési minták csak a mappa létrehozása után adhatók hozzá. Bejelölve egy beviteli mező fog megjelenni mentés után a mellőzési minták számára.", "Ignored Devices": "Mellőzött eszközök", "Ignored Folders": "Mellőzött mappák", "Ignored at": "Mellőzve:", @@ -290,6 +292,7 @@ "Select the folders to share with this device.": "Mappák, amelyek megosztandók ezzel az eszközzel.", "Send & Receive": "Küldés és fogadás", "Send Only": "Csak küldés", + "Set Ignores on Added Folder": "Mellőzések beállítása a hozzáadott mappán", "Settings": "Beállítások", "Share": "Megosztás", "Share Folder": "Mappa megosztása", diff --git a/gui/default/assets/lang/lang-id.json b/gui/default/assets/lang/lang-id.json index 2715057cdf8..76aab425070 100644 --- a/gui/default/assets/lang/lang-id.json +++ b/gui/default/assets/lang/lang-id.json @@ -11,6 +11,7 @@ "Add Folder": "Tambah Folder", "Add Remote Device": "Tambah Perangkat Jarak Jauh", "Add devices from the introducer to our device list, for mutually shared folders.": "Tambahkan perangkat dari pengenal ke daftar perangkat kita, untuk folder yang saling terbagi.", + "Add ignore patterns": "Tambahkan pola pengabaian", "Add new folder?": "Tambah folder baru?", "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.": "Selain itu, interval pindai ulang secara penuh akan ditambah (kali 60, yaitu bawaan baru selama 1 jam). Anda juga dapat mengkonfigurasi secara manual untuk setiap folder setelah memilih Tidak.", "Address": "Alamat", @@ -22,7 +23,7 @@ "Allow Anonymous Usage Reporting?": "Izinkan Laporan Penggunaan Anonim?", "Allowed Networks": "Jaringan Terizinkan", "Alphabetic": "Alfabet", - "Altered by ignoring deletes.": "Altered by ignoring deletes.", + "Altered by ignoring deletes.": "Diubah dengan mengabaikan penghapusan.", "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?", @@ -169,6 +170,7 @@ "Ignore": "Abaikan", "Ignore Patterns": "Pola Pengabaian", "Ignore Permissions": "Abaikan Izin Berkas", + "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.": "Pola pengabaian hanya dapat ditambahkan setelah folder dibuat. Jika dicek, sebuah bidang input untuk memasukkan pola pengabaian akan ditunjukkan setelah disimpan.", "Ignored Devices": "Perangkat yang Diabaikan", "Ignored Folders": "Folder yang Diabaikan", "Ignored at": "Diabaikan di", @@ -207,7 +209,7 @@ "Mod. Time": "Waktu Diubah", "Move to top of queue": "Pindah ke daftar tunggu teratas", "Multi level wildcard (matches multiple directory levels)": "Wildcard multi tingkat (cocok dalam tingkat direktori apapun)", - "Never": "Never", + "Never": "Tidak Pernah", "New Device": "Perangkat Baru", "New Folder": "Folder Baru", "Newest First": "Terbaru Dahulu", @@ -290,6 +292,7 @@ "Select the folders to share with this device.": "Pilih folder yang akan dibagi dengan perangkat ini.", "Send & Receive": "Kirim & Terima", "Send Only": "Hanya Kirim", + "Set Ignores on Added Folder": "Atur Pengabaian dalam Folder yang Ditambahkan", "Settings": "Pengaturan", "Share": "Bagi", "Share Folder": "Bagi Folder", diff --git a/gui/default/assets/lang/lang-it.json b/gui/default/assets/lang/lang-it.json index 8cb6bc00d12..14887f1f488 100644 --- a/gui/default/assets/lang/lang-it.json +++ b/gui/default/assets/lang/lang-it.json @@ -11,6 +11,7 @@ "Add Folder": "Aggiungi Cartella", "Add Remote Device": "Aggiungi Dispositivo Remoto", "Add devices from the introducer to our device list, for mutually shared folders.": "Aggiungi dispositivi dall'introduttore all'elenco dei dispositivi, per cartelle condivise reciprocamente.", + "Add ignore patterns": "Add ignore patterns", "Add new folder?": "Aggiungere una nuova cartella?", "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.": "Inoltre, verrà incrementato l'intervallo di scansione completo (60 volte, vale a dire un nuovo default di 1h). Puoi anche configurarlo manualmente per ogni cartella dopo aver scelto No.", "Address": "Indirizzo", @@ -169,6 +170,7 @@ "Ignore": "Ignora", "Ignore Patterns": "Schemi Esclusione File", "Ignore Permissions": "Ignora Permessi", + "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.": "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": "Dispositivi ignorati", "Ignored Folders": "Cartelle ignorate", "Ignored at": "Ignorato a", @@ -290,6 +292,7 @@ "Select the folders to share with this device.": "Seleziona le cartelle da condividere con questo dispositivo.", "Send & Receive": "Invia & Ricevi", "Send Only": "Invia Soltanto", + "Set Ignores on Added Folder": "Set Ignores on Added Folder", "Settings": "Impostazioni", "Share": "Condividi", "Share Folder": "Condividi la Cartella", diff --git a/gui/default/assets/lang/lang-ja.json b/gui/default/assets/lang/lang-ja.json index 6b93a369a01..6ee5ba9f1aa 100644 --- a/gui/default/assets/lang/lang-ja.json +++ b/gui/default/assets/lang/lang-ja.json @@ -11,6 +11,7 @@ "Add Folder": "フォルダーを追加", "Add Remote Device": "接続先デバイスを追加", "Add devices from the introducer to our device list, for mutually shared folders.": "紹介者デバイスから紹介されたデバイスは、相互に共有しているフォルダーがある場合、このデバイス上にも追加されます。", + "Add ignore patterns": "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.": "Additionally the full rescan interval will be increased (times 60, i.e. new default of 1h). You can also configure it manually for every folder later after choosing No.", "Address": "アドレス", @@ -169,6 +170,7 @@ "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.": "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": "無視指定日時", @@ -290,6 +292,7 @@ "Select the folders to share with this device.": "このデバイスと共有するフォルダーを選択してください。", "Send & Receive": "送受信", "Send Only": "送信のみ", + "Set Ignores on Added Folder": "Set Ignores on Added Folder", "Settings": "設定", "Share": "共有", "Share Folder": "フォルダーを共有する", diff --git a/gui/default/assets/lang/lang-ko-KR.json b/gui/default/assets/lang/lang-ko-KR.json index f1f2447dd82..c68cd645ebc 100644 --- a/gui/default/assets/lang/lang-ko-KR.json +++ b/gui/default/assets/lang/lang-ko-KR.json @@ -1,7 +1,7 @@ { - "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 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": "동작", @@ -10,63 +10,64 @@ "Add Device": "기기 추가", "Add Folder": "폴더 추가", "Add Remote Device": "다른 기기 추가", - "Add devices from the introducer to our device list, for mutually shared folders.": "상호 공유 폴더에 대해 유도자의 기기를 내 기기 목록에 추가합니다.", - "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 시간). 아니요를 선택한 후에 모든 폴더에 대해 직접 설정도 가능합니다.", + "Add devices from the introducer to our device list, for mutually shared folders.": "상호 공유 폴더에 대해 중계자의 기기가 현재 기기 목록에 추가됩니다.", + "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 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.", + "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": "허가된 네트워크", + "Allowed Networks": "허가된 망", "Alphabetic": "가나다순", - "Altered by ignoring deletes.": "삭제 항목 무시로 변경됨", + "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?": "익명 사용 보고의 형식이 변경되었습니다. 새 형식으로 설정을 변경하시겠습니까?", "Are you sure you want to continue?": "계속하시겠습니까?", - "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 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 restore {%count%} files?": "{{count}} 개의 파일을 복구하시겠습니까?", + "Are you sure you want to revert all local changes?": "현재 기기의 변경 항목 모두를 되돌리시겠습니까?", "Are you sure you want to upgrade?": "업데이트를 하시겠습니까?", "Auto Accept": "자동 수락", "Automatic Crash Reporting": "자동 충돌 보고", - "Automatic upgrade now offers the choice between stable releases and release candidates.": "자동 업데이트가 안정 버전과 출시 후보 중 선택할 수 있게 바뀌었습니다.", + "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:": "사용 가능한 디버그 로깅 기능:", + "Available debug logging facilities:": "사용 가능한 디버그 기록 기능:", "Be careful!": "주의하십시오!", "Bugs": "버그", "Cancel": "취소", - "Changelog": "바뀐 점", + "Changelog": "변경 기록", "Clean out after": "보관 기간", "Cleaning Versions": "버전 정리", "Cleanup Interval": "정리 간격", "Click to see discovery failures": "탐지 실패 보기", - "Click to see full identification string and QR code.": "기기 식별자 및 QR 코드 보기", + "Click to see full identification string and QR code.": "기기 식별자 전체 및 QR 코드 보기", "Close": "닫기", "Command": "명령", - "Comment, when used at the start of a line": "주석 (줄 앞에 사용할 때)", + "Comment, when used at the start of a line": "주석(줄 앞에 사용할 때)", "Compression": "압축", "Configured": "설정됨", "Connected (Unused)": "연결됨 (미사용)", "Connection Error": "연결 오류", "Connection Type": "연결 유형", "Connections": "연결", - "Continuously watching for changes is now available within Syncthing. This will detect changes on disk and issue a scan on only the modified paths. The benefits are that changes are propagated quicker and that less full scans are required.": "지속적 변경 항목 감시 기능이 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": "원본에서 복사됨", - "Copyright © 2014-2019 the following Contributors:": "Copyright © 2014-2019 the following Contributors:", - "Creating ignore patterns, overwriting an existing file at {%path%}.": "무시 양식 생성 중, {{path}}에 존재하는 파일을 덮어씁니다.", + "Copyright © 2014-2019 the following Contributors:": "Copyright © 2014-2019 하위 기여자들:", + "Creating ignore patterns, overwriting an existing file at {%path%}.": "무시 양식 생성 중; {{path}} 경로의 기존 파일을 덮어씁니다.", "Currently Shared With Devices": "현재 공유된 기기", "Danger!": "위험!", - "Debugging Facilities": "디버깅 기능", + "Debugging Facilities": "디버그 기능", "Default Configuration": "기본 설정", "Default Device": "기본 기기", "Default Folder": "기본 폴더", @@ -76,22 +77,22 @@ "Delete Unexpected Items": "예기치 못한 항목 삭제", "Deleted": "삭제됨", "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.": "Deselect folders to stop sharing with this device.", + "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 ID": "기기 ID", + "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "\"{{name}}\" ({{device}} 기기가 {{address}}) 주소에서 접속을 요청했습니다. 새 기기를 추가하시겠습니까?", + "Device ID": "기기 ID 번호", "Device Identification": "기기 식별자", "Device Name": "기기명", - "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": "충돌 보고 비활성화", "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분마다 재시도 중:", + "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": "연결 끊김", @@ -101,9 +102,9 @@ "Discovery Failures": "탐지 실패", "Discovery Status": "탐지 현황", "Dismiss": "나중에", - "Do not add it to the ignore list, so this notification may recur.": "Do not add it to the ignore list, so this notification may recur.", - "Do not restore": "복구 하지 않기", - "Do not restore all": "모두 복구 하지 않기", + "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": "수신 속도", @@ -114,46 +115,46 @@ "Edit Device Defaults": "기기 기본 설정 편집", "Edit Folder": "폴더 편집", "Edit Folder Defaults": "폴더 기본 설정 편집", - "Editing {%path%}.": "{{path}} 편집 중", + "Editing {%path%}.": "{{path}} 경로 편집 중", "Enable Crash Reporting": "충돌 보고 활성화", - "Enable NAT traversal": "NAT traversal 활성화", - "Enable Relaying": "Relaying 활성화", + "Enable NAT traversal": "NAT 통과 활성화", + "Enable Relaying": "중계 활성화", "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.": "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.", + "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.": "최대 3자리의 8진수를 입력하세요.", + "Enter up to three octal digits.": "최대 3자리의 8진수를 입력하십시오.", "Error": "오류", "External File Versioning": "외부 파일 버전 관리", "Failed Items": "실패 항목", "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.": "파일이 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.": "다른 기기로부터 파일을 동기화하지만 현재 기기에서 변경된 항목은 다른 기기로 전송되지 않습니다.", + "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": "이름별 정렬", + "Filter by date": "날짜별 보기", + "Filter by name": "이름별 보기", "Folder": "폴더", - "Folder ID": "폴더 ID", + "Folder ID": "폴더 ID 번호", "Folder Label": "폴더명", "Folder Path": "폴더 경로", "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.": "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.", - "Full Rescan Interval (s)": "전체 재탐색 간격 (초)", + "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.": "다음 폴더에서 변경 항목 감시를 실행하는 과정에서 오류가 발생했습니다. 1분마다 재시도할 예정이므로 오류는 곧 사라질 수 있습니다. 만일 사라지지 않으면 문제의 원인을 해결 시도하거나 스스로 해결하지 못할 경우에는 도움을 요청하십시오.", + "Full Rescan Interval (s)": "완전 재탐색 간격(초)", "GUI": "GUI", "GUI Authentication Password": "GUI 인증 비밀번호", "GUI Authentication User": "GUI 인증 사용자", "GUI Authentication: Set User and Password": "GUI 인증: 사용자 이름과 비밀번호를 설정하십시오", - "GUI Listen Address": "GUI 수신 주소", + "GUI Listen Address": "GUI 대기 주소", "GUI Theme": "GUI 테마", "General": "일반", "Generate": "생성", @@ -162,51 +163,52 @@ "Global State": "전체 기기 상태", "Help": "도움말", "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.", + "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.": "If you want to prevent other users on this computer from accessing Syncthing and through it your files, consider setting up authentication.", + "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": "권한 무시", - "Ignored Devices": "무시된 기기", - "Ignored Folders": "무시된 폴더", + "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": "무시된 기기", - "Incoming Rate Limit (KiB/s)": "수신 속도 제한 (KiB/s)", - "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "잘못된 설정은 폴더의 컨텐츠를 훼손하거나 Syncthing의 오작동을 일으킬 수 있습니다.", + "Incoming Rate Limit (KiB/s)": "수신 속도 제한(KiB/s)", + "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "잘못된 설정은 폴더의 내용을 훼손하거나 Syncthing을 작동하지 못하게 할 수 있습니다.", "Introduced By": "유도한 기기", "Introducer": "유도자", - "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 Scan": "마지막 탐색", - "Last seen": "마지막 접속", + "Last Scan": "최근 탐색", + "Last seen": "최근 접속", "Latest Change": "최신 변경 항목", "Learn more": "더 알아보기", "Limit": "제한", - "Listener Failures": "수신자 실패", - "Listener Status": "수신자 현황", - "Listeners": "수신자", + "Listener Failures": "대기자 실패", + "Listener Status": "대기자 현황", + "Listeners": "대기자", "Loading data...": "데이터를 불러오는 중...", "Loading...": "불러오는 중...", "Local Additions": "현재 기기 추가 항목", "Local Discovery": "로컬 탐지", "Local State": "현재 기기 상태", - "Local State (Total)": "현재 기기 상태 (합계)", + "Local State (Total)": "현재 기기 상태(합계)", "Locally Changed Items": "현재 기기 변경 항목", "Log": "기록", - "Log tailing paused. Scroll to the bottom to continue.": "Log tailing paused. Scroll to the bottom to continue.", + "Log tailing paused. Scroll to the bottom to continue.": "기록의 자동 새로고침이 비활성화되었습니다. 재개하려면 창 밑으로 내려가십시오.", "Logs": "기록", "Major Upgrade": "주요 업데이트", "Mass actions": "다중 동작", "Maximum Age": "최대 보관 기간", "Metadata Only": "메타데이터만", - "Minimum Free Disk Space": "최소 여유 디스크 용량", - "Mod. Device": "수정된 기기", - "Mod. Time": "수정된 시간", + "Minimum Free Disk Space": "저장 장치 최소 여유 공간", + "Mod. Device": "수정 기기", + "Mod. Time": "수정 시간", "Move to top of queue": "대기열 상단으로 이동", - "Multi level wildcard (matches multiple directory levels)": "다중 레벨 와일드카드 (여러 단계의 디렉토리에서 적용됨)", + "Multi level wildcard (matches multiple directory levels)": "다중 수준 와일드카드(여러 단계의 디렉토리에서 적용됨)", "Never": "사용 안 함", "New Device": "새 기기", "New Folder": "새 폴더", @@ -214,13 +216,13 @@ "No": "아니요", "No File Versioning": "파일 버전 관리 안 함", "No files will be deleted as a result of this operation.": "이 작업으로 인해서는 아무 파일도 삭제되지 않습니다.", - "No upgrades": "업데이트 안함", + "No upgrades": "업데이트 안 함", "Not shared": "공유되지 않음", "Notice": "공지", "OK": "확인", "Off": "꺼짐", "Oldest First": "오래된 파일 순", - "Optional descriptive label for the folder. Can be different on each device.": "폴더 라벨은 편의를 위한 것입니다. 기기마다 다르게 설정할 수 있습니다.", + "Optional descriptive label for the folder. Can be different on each device.": "폴더를 묘사하는 선택적 이름입니다. 기기마다 달리 설정해도 됩니다.", "Options": "옵션", "Out of Sync": "동기화 실패", "Out of Sync Items": "동기화 실패 항목", @@ -228,24 +230,24 @@ "Override": "덮어쓰기", "Override Changes": "변경 항목 덮어쓰기", "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 new auto accepted folders will be created, as well as the default suggested path when adding new folders via the UI. Tilde character (~) expands to {%tilde%}.": "Path where new auto accepted folders will be created, as well as the default suggested path when adding new folders via the UI. Tilde character (~) expands to {{tilde}}.", - "Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).": "버전을 보관할 경로입니다. 공유된 폴더 안의 기본값 .stversions 폴더로 사용하려면 비워 두십시오.", + "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 new auto accepted folders will be created, as well as the default suggested path when adding new folders via the UI. Tilde character (~) expands to {%tilde%}.": "자동 수락한 폴더가 생성되는 경로이며, UI를 통해 폴더를 추가할 때 자동 완성되는 기본값 경로입니다. 물결표(~)는 {{tilde}}로 확장됩니다.", + "Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).": "버전을 보관할 경로입니다. 공유된 폴더 안의 기본값 .stversions 폴더를 사용하려면 비워 두십시오.", "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.": "Permanently add it to the ignore list, suppressing further notifications.", + "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.": "무시 목록에 영구 추가되어 앞으로의 알림을 방지합니다.", "Permissions": "권한", - "Please consult the release notes before performing a major upgrade.": "메이저 업데이트를 하기 전에 먼저 릴리즈 노트를 살펴보세요.", + "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": "대소 문자 구분 없이 양식을 적용함을 나타내는 접두사", + "Prefix indicating that the pattern should be matched without case sensitivity": "대소문자 구분 없이 양식을 적용함을 나타내는 접두사", "Preparing to Sync": "동기화 준비", "Preview": "미리 보기", "Preview Usage Report": "사용 보고서 미리 보기", @@ -256,16 +258,16 @@ "Received data is already encrypted": "수신된 데이터는 이미 암호화되어 있습니다", "Recent Changes": "최근 변경 항목", "Reduced by ignore patterns": "무시 양식으로 축소됨", - "Release Notes": "릴리즈 노트", - "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "출시 후보는 최신 기능과 버그 픽스를 포함 하고 있습니다. 이 버전은 예전 방식인 2주 주기 Syncthing 출시와 비슷합니다.", + "Release Notes": "출시 버전의 기록 정보", + "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "출시 후보는 최신 기능과 버그 수정을 포함하고 있습니다. 2주마다 출시되던 예전의 Syncthing 버전과 유사합니다.", "Remote Devices": "다른 기기", "Remote GUI": "원격 GUI", "Remove": "제거", "Remove Device": "기기 제거", "Remove Folder": "폴더 제거", - "Required identifier for the folder. Must be the same on all cluster devices.": "폴더 식별자가 필요합니다. 모든 기기에서 동일해야 합니다.", + "Required identifier for the folder. Must be the same on all cluster devices.": "필수로 필요한 폴더의 식별자입니다. 모든 기기에서 동일해야 합니다.", "Rescan": "재탐색", - "Rescan All": "전체 재탐색", + "Rescan All": "모두 재탐색", "Rescans": "재탐색", "Restart": "재시작", "Restart Needed": "재시작 필요", @@ -274,119 +276,120 @@ "Restore Versions": "버전 복구", "Resume": "재개", "Resume All": "모두 재개", - "Reused": "재사용", + "Reused": "재사용됨", "Revert": "되돌리기", - "Revert Local Changes": "현재 기기의 변경 항목 되돌리기", + "Revert Local Changes": "현재 기기 변경 항목 되돌리기", "Save": "저장", - "Scan Time Remaining": "탐색 남은 시간", + "Scan Time Remaining": "남은 탐색 시간", "Scanning": "탐색", - "See external versioning help for supported templated command line parameters.": "지원하는 견본 명령 매개 변수에 대해서는 외부 버전 도움말을 참조하십시오.", + "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": "가장 오래된 버전 선택하십시오.", + "Select latest version": "가장 최신 버전 선택", + "Select oldest version": "가장 오랜 버전 선택", "Select the folders to share with this device.": "이 기기와 공유할 폴더를 선택하십시오.", "Send & Receive": "송수신", "Send Only": "송신 전용", + "Set Ignores on Added Folder": "추가된 폴더에 무시 양식을 설정하십시오", "Settings": "설정", "Share": "공유", "Share Folder": "폴더 공유", "Share Folders With Device": "폴더를 공유할 기기", "Share this folder?": "이 폴더를 공유하시겠습니까?", - "Shared Folders": "공유 폴더", + "Shared Folders": "공유된 폴더", "Shared With": "공유된 기기", "Sharing": "공유", - "Show ID": "기기 ID 보기", + "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 대신에 기기 목록에서 나타납니다. 비워 둘 경우 다른 기기에서 통보한 이름으로 갱신됩니다.", + "Show detailed listener status": "대기자 현황 상세 보기", + "Show diff with previous version": "이전 버전과의 diff 보기", + "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "기기 ID 번호를 대신해 기기 목록에서 나타납니다. 다른 기기에 선택적 기본값 이름으로 통보됩니다.", + "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "기기 ID 번호를 대신해 기기 목록에서 나타납니다. 비워 둘 경우 다른 기기에서 통보한 이름으로 갱신됩니다.", "Shutdown": "종료", "Shutdown Complete": "종료 완료", "Simple File Versioning": "간단한 파일 버전 관리", - "Single level wildcard (matches within a directory only)": "단일 레벨 와일드카드 (하나의 디렉토리 내에서만 적용됨)", + "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 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:", + "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.": "안정 버전은 약 2주 정도 지연되어 출시됩니다. 그 기간 동안 출시 후보에 대한 테스트를 거칩니다.", + "Stable releases and release candidates": "안정 버전 및 출시 후보", + "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "안정 버전은 약 2주 정도 지연되어 출시됩니다. 그 기간 동안 출시 후보로서 실험이 진행됩니다.", "Stable releases only": "안정 버전만", "Staggered File Versioning": "시차제 파일 버전 관리", "Start Browser": "브라우저 열기", "Statistics": "통계", "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}}\" 폴더 유형이어야 합니다.", "Support": "지원", - "Support Bundle": "Support Bundle", - "Sync Protocol Listen Addresses": "동기화 프로토콜 수신 주소", + "Support Bundle": "지원 묶음", + "Sync Protocol Listen Addresses": "동기화 규약 대기 주소", "Syncing": "동기화", "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 listening on the following network addresses for connection attempts from other devices:": "Syncthing is listening on the following network addresses for connection attempts from other devices:", - "Syncthing is not listening for connection attempts from other devices on any address. Only outgoing connections from this device may work.": "Syncthing is not listening for connection attempts from other devices on any address. Only outgoing connections from this device may work.", + "Syncthing is Free and Open Source Software licensed as MPL v2.0.": "Syncthing은 MPL v2.0으로 허가된 자유-오픈 소스 소프트웨어입니다.", + "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 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을 재시작해 보세요.", - "Take me back": "취소", - "The GUI address is overridden by startup options. Changes here will not take effect while the override is in place.": "The GUI address is overridden by startup options. Changes here will not take effect while the override is in place.", + "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을 재시작해 보십시오.", + "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": "The Syncthing Authors", - "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 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 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가 올바르지 않습니다. 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 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 this device will be overwritten to become identical with other devices. Files newly added here will be deleted.", + "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 번호가 올바르지 않습니다. 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초마다, 첫 하루 동안은 1시간마다, 첫 30일 동안은 1일마다, 그리고 최대 보관 기간까지는 1주일마다 버전이 보관됩니다.", - "The following items could not be synchronized.": "이 항목들은 동기화 할 수 없습니다.", + "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 methods are used to discover other devices on the network and announce this device to be found by others:", - "The following unexpected items were found.": "예기치 못한 항목이 발견되었습니다.", - "The interval must be a positive number of seconds.": "간격은 초 단위의 자연수여야 합니다.", + "The following methods are used to discover other devices on the network and announce this device to be found by others:": "망 내의 다른 기기 탐지 및 현재 기기 통보를 위한 다음 방식이 실행 중입니다:", + "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 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 days 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 days must be a number and cannot be blank.": "일수는 숫자여야 하며 비워 둘 수 없습니다.", "The number of days to keep files in the trash can. Zero means forever.": "휴지통에서 파일을 보관할 일수입니다. 0은 무제한을 의미합니다.", - "The number of old versions to keep, per file.": "각 파일별로 유지할 이전 버전의 개수를 지정합니다.", + "The number of old versions to keep, per file.": "파일별로 유지할 이전 버전의 개수입니다.", "The number of versions must be a number and cannot be blank.": "버전 개수는 숫자여야 하며 비워 둘 수 없습니다.", "The path cannot be blank.": "경로는 비워 둘 수 없습니다.", - "The rate limit must be a non-negative number (0: no limit)": "대역폭 제한 설정은 반드시 양수로 입력해야 합니다 (0: 무제한)", - "The rescan interval must be a non-negative number of seconds.": "재탐색 간격은 초단위이며 양수로 입력해야 합니다.", + "The rate limit must be a non-negative number (0: no limit)": "속도 제한은 양수여야 합니다(0: 무제한)", + "The rescan interval must be a non-negative number of seconds.": "재탐색 간격은 초 단위의 양수여야 합니다.", "There are no devices to share this folder with.": "이 폴더를 공유할 기기가 없습니다.", "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 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 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 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": "항목이 마지막으로 수정 된 시간", + "Time the item was last modified": "항목 최근 변경 시간", "Trash Can File Versioning": "휴지통을 통한 파일 버전 관리", "Type": "유형", "UNIX Permissions": "UNIX 권한", - "Unavailable": "불가능", - "Unavailable/Disabled by administrator or maintainer": "운영자 또는 관리자에 의해 불가능/비활성화 됨", - "Undecided (will prompt)": "Undecided (will prompt)", + "Unavailable": "변경 불가", + "Unavailable/Disabled by administrator or maintainer": "운영 관리자에 의해 변경 불가 또는 비활성화됨", + "Undecided (will prompt)": "미정(재알림 예정)", "Unexpected Items": "예기치 못한 항목", - "Unexpected items have been found in this folder.": "이 폴더에 예기치 못한 항목이 발견되었습니다.", + "Unexpected items have been found in this folder.": "이 폴더에서 예기치 못한 항목이 발견되었습니다.", "Unignore": "무시 취소", "Unknown": "알 수 없음", "Unshared": "공유되지 않음", @@ -401,9 +404,9 @@ "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.": "Use notifications from the filesystem to detect changed items.", - "Username/Password has not been set for the GUI authentication. Please consider setting it up.": "GUI 인증을 위한 사용자 이름과 비밀번호가 설정되지 않았습니다.", + "Use HTTPS for GUI": "GUI에서 HTTPS 규약 사용", + "Use notifications from the filesystem to detect changed items.": "파일 시스템 알림을 사용하여 변경 항목을 감시합니다.", + "Username/Password has not been set for the GUI authentication. Please consider setting it up.": "GUI 인증을 위한 사용자 이름과 비밀번호가 설정되지 않았습니다. 이들을 설정하는 것을 고려해 보십시오.", "Version": "버전", "Versions": "버전", "Versions Path": "보관 경로", @@ -412,25 +415,25 @@ "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.": "변경 항목 감시는 주기적으로 탐색하지 않아도 대부분의 변경 항목을 탐지합니다.", - "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를 사용해야 합니다.", + "When adding a new device, keep in mind that this device must be added on the other side too.": "새 기기를 추가할 때 추가한 기기에서도 현재 기기를 추가해야 합니다.", + "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "새 폴더를 추가할 때 폴더 ID 번호는 기기 간에 폴더를 묶어줍니다. 대소문자가 구분되며 모든 기기에서 동일해야 합니다.", "Yes": "예", - "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 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}}\" 폴더 내에서는 아무것도 추가 또는 변경하여서는 안 됩니다.", + "You should never add or change anything locally in a \"{%receiveEncrypted%}\" folder.": "\"{{receiveEncrypted}}\" 유형의 폴더는 현재 기기에서 아무것도 추가 또는 변경해서는 안 됩니다.", "days": "일", "directories": "폴더", "files": "파일", @@ -441,7 +444,7 @@ "theme-name-dark": "어두운 색", "theme-name-default": "기본 색", "theme-name-light": "밝은 색", - "{%device%} wants to share folder \"{%folder%}\".": "{{device}}에서 \"{{folder}}\" 폴더를 공유하길 원합니다.", - "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}}에서 \"{{folderlabel}}\"({{folder}}) 폴더를 공유하길 원합니다.", - "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} might reintroduce this 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}} 기기에서 이 기기를 다시 유도할 수 있습니다." } \ No newline at end of file diff --git a/gui/default/assets/lang/lang-lt.json b/gui/default/assets/lang/lang-lt.json index bb68cca5531..9cd233fad6c 100644 --- a/gui/default/assets/lang/lang-lt.json +++ b/gui/default/assets/lang/lang-lt.json @@ -11,6 +11,7 @@ "Add Folder": "Pridėti aplanką", "Add Remote Device": "Pridėti nuotolinį įrenginį", "Add devices from the introducer to our device list, for mutually shared folders.": "Pridėti įrenginius iš supažindintojo į mūsų įrenginių sąrašą, siekiant abipusiškai bendrinti aplankus.", + "Add ignore patterns": "Add ignore patterns", "Add new folder?": "Pridėti naują aplanką?", "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.": "Pilnas nuskaitymo iš naujo intervalas bus papildomai padidintas (60 kartų, t.y. nauja numatytoji 1 val. reikšmė). Taip pat vėliau, pasirinkę Ne, galite jį konfigūruoti rankiniu būdu kiekvienam atskiram aplankui.", "Address": "Adresas", @@ -169,6 +170,7 @@ "Ignore": "Nepaisyti", "Ignore Patterns": "Nepaisyti šablonų", "Ignore Permissions": "Nepaisyti failų prieigos leidimų", + "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.": "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": "Nepaisomi įrenginiai", "Ignored Folders": "Nepaisomi aplankai", "Ignored at": "Nepaisoma ties", @@ -290,6 +292,7 @@ "Select the folders to share with this device.": "Pasirinkite aplankus kuriais norite dalintis su šiuo įrenginiu.", "Send & Receive": "Siųsti ir gauti", "Send Only": "Tik siųsti", + "Set Ignores on Added Folder": "Set Ignores on Added Folder", "Settings": "Nustatymai", "Share": "Dalintis", "Share Folder": "Dalintis aplanku", diff --git a/gui/default/assets/lang/lang-nb.json b/gui/default/assets/lang/lang-nb.json index 436aed450f9..ac22108039a 100644 --- a/gui/default/assets/lang/lang-nb.json +++ b/gui/default/assets/lang/lang-nb.json @@ -11,6 +11,7 @@ "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 ignore patterns": "Add ignore patterns", "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", @@ -169,6 +170,7 @@ "Ignore": "Ignorer", "Ignore Patterns": "Utelatelsesmønster", "Ignore Permissions": "Ignorer rettigheter", + "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.": "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": "Ignorerte enheter", "Ignored Folders": "Utelatte mapper", "Ignored at": "Ignorert i", @@ -290,6 +292,7 @@ "Select the folders to share with this device.": "Velg hvilke mapper som skal deles med denne enheten.", "Send & Receive": "Sende og motta", "Send Only": "Bare send", + "Set Ignores on Added Folder": "Set Ignores on Added Folder", "Settings": "Innstillinger", "Share": "Del", "Share Folder": "Del mappe", diff --git a/gui/default/assets/lang/lang-nl.json b/gui/default/assets/lang/lang-nl.json index ecc2ea25e25..1a728ad728c 100644 --- a/gui/default/assets/lang/lang-nl.json +++ b/gui/default/assets/lang/lang-nl.json @@ -11,6 +11,7 @@ "Add Folder": "Map toevoegen", "Add Remote Device": "Extern apparaat toevoegen", "Add devices from the introducer to our device list, for mutually shared folders.": "Apparaten van het introductie-apparaat aan onze lijst met apparaten toevoegen, voor gemeenschappelijk gedeelde mappen.", + "Add ignore patterns": "Negeerpatronen toevoegen", "Add new folder?": "Nieuwe map toevoegen?", "Additionally the full rescan interval will be increased (times 60, i.e. new default of 1h). You can also configure it manually for every folder later after choosing No.": "Het interval van volledige scan zal daarbij ook vergroot worden (maal 60, dit is een nieuwe standaardwaarde van 1 uur). U kunt het later voor elke map manueel configureren nadat u nee kiest.", "Address": "Adres", @@ -169,6 +170,7 @@ "Ignore": "Negeren", "Ignore Patterns": "Negeerpatronen", "Ignore Permissions": "Machtigingen negeren", + "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.": "Negeerpatronen kunnen alleen worden toegevoegd nadat de map is aangemaakt. Indien aangevinkt, zal na het opslaan een invoerveld voor negeerpatronen worden getoond.", "Ignored Devices": "Genegeerde apparaten", "Ignored Folders": "Genegeerde mappen", "Ignored at": "Genegeerd op", @@ -290,6 +292,7 @@ "Select the folders to share with this device.": "Selecteer de mappen om te delen met dit apparaat.", "Send & Receive": "Verzenden en ontvangen", "Send Only": "Alleen verzenden", + "Set Ignores on Added Folder": "Negeringen instellen op map \"toegevoegd\"", "Settings": "Instellingen", "Share": "Delen", "Share Folder": "Map delen", diff --git a/gui/default/assets/lang/lang-pl.json b/gui/default/assets/lang/lang-pl.json index cdda2e9621c..80df4f96c3e 100644 --- a/gui/default/assets/lang/lang-pl.json +++ b/gui/default/assets/lang/lang-pl.json @@ -1,9 +1,9 @@ { - "A device with that ID is already added.": "Urządzenie o tym ID już istnieje.", + "A device with that ID is already added.": "Urządzenie o tym numerze ID już istnieje.", "A negative number of days doesn't make sense.": "Ujemna liczba dni nie ma sensu.", "A new major version may not be compatible with previous versions.": "Nowa duża wersja może nie być kompatybilna z poprzednimi wersjami.", "API Key": "Klucz API", - "About": "O Syncthing", + "About": "Informacje", "Action": "Działanie", "Actions": "Działania", "Add": "Dodaj", @@ -11,8 +11,9 @@ "Add Folder": "Dodaj folder", "Add Remote Device": "Dodaj urządzenie zdalne", "Add devices from the introducer to our device list, for mutually shared folders.": "Dodaj urządzenia od wprowadzającego do własnej listy urządzeń dla folderów współdzielonych obustronnie.", + "Add ignore patterns": "Dodaj wzorce ignorowania", "Add new folder?": "Czy chcesz dodać nowy 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.": "Dodatkowo, czas przedziału pełnego ponownego skanowania zostanie zwiększony (o 60 razy, tj. do nowej domyślnej wartości \"1h\"). Możesz również ustawić go później ręcznie dla każdego folderu wybierając \"Nie\".", + "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.": "Dodatkowo czas przedziału pełnego ponownego skanowania zostanie zwiększony (o 60 razy, tj. do nowej domyślnej wartości \"1h\"). Można również ustawić go później ręcznie dla każdego folderu wybierając \"Nie\".", "Address": "Adres", "Addresses": "Adresy", "Advanced": "Zaawansowane", @@ -23,7 +24,7 @@ "Allowed Networks": "Dozwolone sieci", "Alphabetic": "Alfabetycznie", "Altered by ignoring deletes.": "Zmieniono przez ignorowanie usuniętych.", - "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.": "Zewnętrzne polecenie odpowiedzialne jest za wersjonowanie. Musi ono usunąć plik ze współdzielonego folderu. Jeśli ścieżka do aplikacji zawiera spacje, powinna ona być zamknięta w cudzysłowie.", + "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.": "Zewnętrzne polecenie odpowiedzialne jest za wersjonowanie. Musi ono usunąć plik ze współdzielonego folderu. Jeżeli ścieżka do aplikacji zawiera spacje, to powinna ona być zamknięta w cudzysłowie.", "Anonymous Usage Reporting": "Anonimowe statystyki użycia", "Anonymous usage report format has changed. Would you like to move to the new format?": "Format anonimowych statystyk użycia uległ zmianie. Czy chcesz przejść na nowy format?", "Are you sure you want to continue?": "Czy na pewno chcesz kontynuować?", @@ -39,7 +40,7 @@ "Automatic upgrade now offers the choice between stable releases and release candidates.": "Automatycznie aktualizacje pozwalają teraz na wybór pomiędzy wydaniami stabilnymi oraz wydaniami kandydującymi.", "Automatic upgrades": "Automatyczne aktualizacje", "Automatic upgrades are always enabled for candidate releases.": "Automatyczne aktualizacje są zawsze włączone dla wydań kandydujących.", - "Automatically create or share folders that this device advertises at the default path.": "Automatycznie współdziel lub utwórz w domyślnej ścieżce foldery wysyłane przez to urządzenie.", + "Automatically create or share folders that this device advertises at the default path.": "Automatycznie współdziel lub utwórz w domyślnej ścieżce foldery anonsowane przez to urządzenie.", "Available debug logging facilities:": "Dostępne narzędzia logujące do debugowania:", "Be careful!": "Ostrożnie!", "Bugs": "Błędy", @@ -59,11 +60,11 @@ "Connection Error": "Błąd połączenia", "Connection Type": "Rodzaj połączenia", "Connections": "Połączenia", - "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.": "Ciągłe obserwowanie zmian jest już dostępne w Syncthingu. Będzie ono wykrywać zmiany na dysku i uruchamiać skanowanie tylko w zmodyfikowanych ścieżkach. Zalety tego są takie, że zmiany rozsyłane są znacznie szybciej oraz że wymagana jest mniejsza liczba pełnych skanowań.", + "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.": "Ciągłe obserwowanie zmian jest już dostępne w programie Syncthing. Będzie ono wykrywać zmiany na dysku i uruchamiać skanowanie tylko w zmodyfikowanych ścieżkach. Zalety tego rozwiązania są takie, że zmiany rozsyłane są szybciej oraz że wymagane jest mniej pełnych skanowań.", "Copied from elsewhere": "Skopiowane z innego miejsca ", "Copied from original": "Skopiowane z oryginału", - "Copyright © 2014-2019 the following Contributors:": "Wszelkie prawa zastrzeżone © 2014-2019 dla współtwórców:", - "Creating ignore patterns, overwriting an existing file at {%path%}.": "Tworzenie wzorów ignorowania, nadpisze istniejący plik w {{path}}.", + "Copyright © 2014-2019 the following Contributors:": "Wszelkie prawa zastrzeżone © 2014-2019 dla następujących współtwórców:", + "Creating ignore patterns, overwriting an existing file at {%path%}.": "Tworzenie wzorców ignorowania; nadpisuje istniejący plik w {{path}}.", "Currently Shared With Devices": "Obecnie współdzielony z urządzeniami", "Danger!": "Niebezpieczeństwo!", "Debugging Facilities": "Narzędzia do debugowania", @@ -79,11 +80,11 @@ "Deselect devices to stop sharing this folder with.": "Odznacz urządzenia, z którymi chcesz przestać współdzielić ten folder.", "Deselect folders to stop sharing with this device.": "Odznacz foldery, które chcesz przestać współdzielić z tym urządzeniem.", "Device": "Urządzenie", - "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Urządzenie \"{{name}}\" {{device}} pod ({{address}}) chce się połączyć. Dodać nowe urządzenie?", - "Device ID": "ID urządzenia", + "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Urządzenie o nazwie \"{{name}}\" {{device}} pod adresem ({{address}}) chce się połączyć. Czy dodać nowe urządzenie?", + "Device ID": "Numer ID urządzenia", "Device Identification": "Identyfikator urządzenia", "Device Name": "Nazwa urządzenia", - "Device is untrusted, enter encryption password": "Urządzenie jest niezaufane. Wprowadź szyfrujące hasło.", + "Device is untrusted, enter encryption password": "Urządzenie jest niezaufane; wprowadź szyfrujące hasło.", "Device rate limits": "Ograniczenia prędkości urządzenia", "Device that last modified the item": "Urządzenie, które jako ostatnie zmodyfikowało ten element", "Devices": "Urządzenia", @@ -91,7 +92,7 @@ "Disabled": "Wyłączone", "Disabled periodic scanning and disabled watching for changes": "Wyłączone okresowe skanowanie i wyłączone obserwowanie zmian", "Disabled periodic scanning and enabled watching for changes": "Wyłączone okresowe skanowanie i włączone obserwowanie zmian", - "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Wyłączone okresowe skanowanie i nieudane ustawienie obserwowania zmian, ponawiam co minutę:", + "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Wyłączone okresowe skanowanie i nieudane ustawienie obserwowania zmian; ponawiam co minutę:", "Disables comparing and syncing file permissions. Useful on systems with nonexistent or custom permissions (e.g. FAT, exFAT, Synology, Android).": "Wyłącza porównywanie i synchronizację uprawnień plików. Przydatne w systemach, w których uprawnienia nie istnieją bądź są one niestandardowe (np. FAT, exFAT, Synology, Android).", "Discard": "Odrzuć", "Disconnected": "Rozłączony", @@ -114,61 +115,62 @@ "Edit Device Defaults": "Edytuj domyślne ustawienia urządzeń", "Edit Folder": "Edytuj folder", "Edit Folder Defaults": "Edytuj domyślne ustawienia folderów", - "Editing {%path%}.": "Edytowanie {{path}}.", + "Editing {%path%}.": "Edytowanie ścieżki {{path}}.", "Enable Crash Reporting": "Włącz zgłaszanie awarii", "Enable NAT traversal": "Włącz trawersowanie NAT", "Enable Relaying": "Włącz przekazywanie", "Enabled": "Włączone", "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Wprowadź nieujemną liczbę (np. \"2.35\") oraz wybierz jednostkę. Procenty odnoszą się do rozmiaru całego dysku.", "Enter a non-privileged port number (1024 - 65535).": "Wprowadź nieuprzywilejowany numer portu (1024-65535).", - "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Wprowadź adresy oddzielone przecinkiem (\"tcp://ip:port\", \"tcp://host:port\") lub \"dynamic\" w celu automatycznego odnajdywania adresu.", + "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Wprowadź oddzielone przecinkiem adresy (\"tcp://ip:port\", \"tcp://host:port\") lub \"dynamic\" w celu automatycznego odnajdywania adresu.", "Enter ignore patterns, one per line.": "Wprowadź wzorce ignorowania, po jednym w każdej linii.", "Enter up to three octal digits.": "Wprowadź maksymalnie trzy cyfry ósemkowe.", "Error": "Błąd", "External File Versioning": "Zewnętrzne wersjonowanie plików", "Failed Items": "Elementy zakończone niepowodzeniem", "Failed to load ignore patterns.": "Nie udało się załadować wzorców ignorowania.", - "Failed to setup, retrying": "Nie udało się ustawić, ponawiam", + "Failed to setup, retrying": "Nie udało się ustawić; ponawiam próbę", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Błąd połączenia do serwerów IPv6 może wystąpić, gdy w ogóle nie ma połączenia po IPv6.", "File Pull Order": "Kolejność pobierania plików", "File Versioning": "Wersjonowanie plików", "Files are moved to .stversions directory when replaced or deleted by Syncthing.": "Pliki zmienione lub usunięte przez Syncthing są przenoszone do katalogu .stversions.", "Files are moved to date stamped versions in a .stversions directory when replaced or deleted by Syncthing.": "Pliki zmienione lub usunięte przez Syncthing są datowane i przenoszone do katalogu .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.": "Pliki są zabezpieczone przed zmianami dokonanymi na innych urządzeniach, ale zmiany dokonane na tym urządzeniu będą wysyłane do pozostałych urządzeń.", - "Files are synchronized from the cluster, but any changes made locally will not be sent to other devices.": "Pliki są synchronizowane z pozostałych urządzeń, ale jakiekolwiek zmiany dokonane lokalnie nie będą wysyłanie do innych urządzeń.", + "Files are synchronized from the cluster, but any changes made locally will not be sent to other devices.": "Pliki są synchronizowane z pozostałych urządzeń, ale wszelkie zmiany dokonane lokalnie nie będą wysyłanie do innych urządzeń.", "Filesystem Watcher Errors": "Błędy obserwatora plików", "Filter by date": "Filtruj według daty", "Filter by name": "Filtruj według nazwy", "Folder": "Folder", - "Folder ID": "ID folderu", + "Folder ID": "Numer ID folderu", "Folder Label": "Etykieta folderu", "Folder Path": "Ścieżka folderu", "Folder Type": "Rodzaj folderu", "Folder type \"{%receiveEncrypted%}\" can only be set when adding a new folder.": "Rodzaj folderu \"{{receiveEncrypted}}\" może być ustawiony tylko przy dodawaniu nowego folderu.", "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.": "Rodzaj folderu \"{{receiveEncrypted}}\" nie może być zmieniony po dodaniu folderu. Musisz najpierw usunąć folder, skasować bądź też odszyfrować dane na dysku, a następnie dodać folder ponownie.", "Folders": "Foldery", - "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "Wystąpił błąd podczas rozpoczynania obserwowania zmian w następujących folderach. Akcja będzie ponawiana co minutę, więc błędy mogą niebawem zniknąć. Jeżeli nie uda pozbyć się błędów, spróbuj naprawić ukryty problem lub poproś o pomoc, jeżeli nie będziesz w stanie tego zrobić.", + "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.": "Wystąpił błąd podczas włączania obserwowania zmian w następujących folderach. Akcja będzie ponawiana co minutę, więc te błędy mogą niebawem zniknąć. Jeżeli nie uda pozbyć się błędów, spróbuj naprawić odpowiedzialny za to problem lub poproś o pomoc, jeżeli nie będziesz sam w stanie tego zrobić.", "Full Rescan Interval (s)": "Przedział czasowy pełnego skanowania (s)", "GUI": "GUI", "GUI Authentication Password": "Hasło uwierzytelniające GUI", "GUI Authentication User": "Użytkownik uwierzytelniający GUI", - "GUI Authentication: Set User and Password": "Uwierzytelnianie GUI: ustaw użytkownika i hasło", + "GUI Authentication: Set User and Password": "Uwierzytelnianie GUI: ustaw nazwę użytkownika i hasło", "GUI Listen Address": "Adres nasłuchu GUI", "GUI Theme": "Motyw GUI", "General": "Ogólne", - "Generate": "Generuj", + "Generate": "Wygeneruj", "Global Discovery": "Odnajdywanie globalne", "Global Discovery Servers": "Serwery odnajdywania globalnego", "Global State": "Stan globalny", "Help": "Pomoc", "Home page": "Strona domowa", - "However, your current settings indicate you might not want it enabled. We have disabled automatic crash reporting for you.": "Niemniej jednak, obecne ustawienia wskazują, że możesz nie chcieć włączać tej funkcji. Automatyczne zgłaszanie awarii zostało wyłączone na tym urządzeniu.", + "However, your current settings indicate you might not want it enabled. We have disabled automatic crash reporting for you.": "Niemniej jednak, obecne ustawienia wskazują, że możesz nie chcieć włączać tej funkcji. Automatyczne zgłaszanie awarii zostało więc wyłączone na tym urządzeniu.", "Identification": "Identyfikator", "If untrusted, enter encryption password": "Jeżeli folder jest niezaufany, wprowadź szyfrujące hasło", - "If you want to prevent other users on this computer from accessing Syncthing and through it your files, consider setting up authentication.": "Jeżeli chcesz zakazać innym użytkownikom tego komputera dostępu do Syncthinga, a przez niego do swoich plików, zastanów się nad włączeniem uwierzytelniania.", + "If you want to prevent other users on this computer from accessing Syncthing and through it your files, consider setting up authentication.": "Jeżeli chcesz zakazać innym użytkownikom tego komputera dostępu do programu Syncthing, a przez niego do swoich plików, zastanów się nad ustawieniem uwierzytelniania.", "Ignore": "Ignoruj", "Ignore Patterns": "Wzorce ignorowania", "Ignore Permissions": "Ignorowanie uprawnień", + "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.": "Wzorce ignorowania można dodać dopiero po utworzeniu folderu. Jeżeli zaznaczysz to pole, to po zapisaniu zmian pojawi się nowe okienko, gdzie będziesz mógł wpisać wzorce ignorowania.", "Ignored Devices": "Ignorowane urządzenia", "Ignored Folders": "Ignorowane foldery", "Ignored at": "Ignorowane od", @@ -179,7 +181,7 @@ "Inversion of the given condition (i.e. do not exclude)": "Odwrotność danego warunku (np. nie wykluczaj)", "Keep Versions": "Zachowuj wersje", "LDAP": "LDAP", - "Largest First": "Największe na początku", + "Largest First": "Od największych", "Last Scan": "Ostatnie skanowanie", "Last seen": "Ostatnio widziany", "Latest Change": "Ostatnia zmiana", @@ -210,17 +212,17 @@ "Never": "Nigdy", "New Device": "Nowe urządzenie", "New Folder": "Nowy folder", - "Newest First": "Najnowsze na początku", + "Newest First": "Od najnowszych", "No": "Nie", "No File Versioning": "Bez wersjonowania plików", - "No files will be deleted as a result of this operation.": "Żadne pliki nie zostaną usunięte w wyniki tego działania.", + "No files will be deleted as a result of this operation.": "Żadne pliki nie zostaną usunięte w wyniku tego działania.", "No upgrades": "Brak aktualizacji", "Not shared": "Niewspółdzielony", "Notice": "Wskazówka", "OK": "OK", "Off": "Wyłączona", - "Oldest First": "Najstarsze na początku", - "Optional descriptive label for the folder. Can be different on each device.": "Opcjonalna opisowa etykieta dla folderu. Może być różna na każdym urządzeniu.", + "Oldest First": "Od najstarszych", + "Optional descriptive label for the folder. Can be different on each device.": "Opcjonalna opisowa etykieta dla folderu. Może być inna na każdym urządzeniu.", "Options": "Opcje", "Out of Sync": "Niezsynchronizowane", "Out of Sync Items": "Elementy niezsynchronizowane", @@ -238,15 +240,15 @@ "Pending changes": "Oczekujące zmiany", "Periodic scanning at given interval and disabled watching for changes": "Okresowe skanowanie w podanym przedziale czasowym i wyłączone obserwowanie zmian", "Periodic scanning at given interval and enabled watching for changes": "Okresowe skanowanie w podanym przedziale czasowym i włączone obserwowanie zmian", - "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Okresowe skanowanie w podanym przedziale czasowym i nieudane ustawienie obserwowania zmian, ponawiam co minutę:", - "Permanently add it to the ignore list, suppressing further notifications.": "Dodaje na stałe od listy ignorowanych, wyciszając kolejne powiadomienia.", + "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Okresowe skanowanie w podanym przedziale czasowym i nieudane ustawienie obserwowania zmian; ponawiam co minutę:", + "Permanently add it to the ignore list, suppressing further notifications.": "Dodaje na stałe od listy ignorowanych wyciszając kolejne powiadomienia.", "Permissions": "Uprawnienia", - "Please consult the release notes before performing a major upgrade.": "Zapoznaj się z informacjami o wersji przed przeprowadzeniem dużej aktualizacji.", - "Please set a GUI Authentication User and Password in the Settings dialog.": "Ustaw użytkownika i hasło do uwierzytelniania GUI w oknie Ustawień.", + "Please consult the release notes before performing a major upgrade.": "Prosimy zapoznać się z informacjami o wersji przed przeprowadzeniem dużej aktualizacji.", + "Please set a GUI Authentication User and Password in the Settings dialog.": "Ustaw nazwę użytkownika i hasło do uwierzytelniania GUI w oknie Ustawień.", "Please wait": "Proszę czekać", - "Prefix indicating that the file can be deleted if preventing directory removal": "Prefiks wskazujący, że plik może zostać usunięty, gdy blokuje on usunięcie katalogu", - "Prefix indicating that the pattern should be matched without case sensitivity": "Prefiks wskazujący, że wzorzec ma być wyszukiwany bez rozróżniania wielkości liter", - "Preparing to Sync": "Przygotowywanie do synchronizacji", + "Prefix indicating that the file can be deleted if preventing directory removal": "Przedrostek wskazujący, że plik może zostać usunięty, gdy blokuje on usunięcie katalogu", + "Prefix indicating that the pattern should be matched without case sensitivity": "Przedrostek wskazujący, że wzorzec ma być wyszukiwany bez rozróżniania wielkości liter", + "Preparing to Sync": "Przygotowanie do synchronizacji", "Preview": "Podgląd", "Preview Usage Report": "Podgląd statystyk użycia", "Quick guide to supported patterns": "Krótki przewodnik po obsługiwanych wzorcach", @@ -257,7 +259,7 @@ "Recent Changes": "Ostatnie zmiany", "Reduced by ignore patterns": "Ograniczono przez wzorce ignorowania", "Release Notes": "Informacje o wersji", - "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Wydania kandydujące zawierają najnowsze funkcje oraz poprawki błędów. Są one podobne do tradycyjnych codwutygodniowych wydań Syncthinga.", + "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Wydania kandydujące zawierają najnowsze funkcje oraz poprawki błędów. Są one podobne do tradycyjnych codwutygodniowych wydań programu Syncthing.", "Remote Devices": "Urządzenia zdalne", "Remote GUI": "Zdalne GUI", "Remove": "Usuń", @@ -290,6 +292,7 @@ "Select the folders to share with this device.": "Zaznacz foldery, które chcesz współdzielić z tym urządzeniem.", "Send & Receive": "Wyślij i odbierz", "Send Only": "Tylko wyślij", + "Set Ignores on Added Folder": "Ustaw wzorce ignorowania dla dodanego folderu", "Settings": "Ustawienia", "Share": "Współdziel", "Share Folder": "Współdziel folder", @@ -298,25 +301,25 @@ "Shared Folders": "Współdzielone foldery", "Shared With": "Współdzielony z", "Sharing": "Współdzielenie", - "Show ID": "Pokaż ID", + "Show ID": "Pokaż numer ID", "Show QR": "Pokaż kod QR", "Show detailed discovery status": "Pokaż szczegółowy stan odnajdywania", "Show detailed listener status": "Pokaż szczegółowy stan nasłuchujących", - "Show diff with previous version": "Pokaż różnice z poprzednią wersją", - "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Widoczna na liście urządzeń zamiast ID urządzenia. Zostanie wysłana do innych urządzeń jako opcjonalna nazwa domyślna.", - "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Widoczna na liście urządzeń zamiast ID urządzenia. Zostanie zaktualizowana do nazwy wysłanej przez urządzenie, jeżeli pozostanie pusta.", + "Show diff with previous version": "Pokaż diff z poprzednią wersją", + "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Widoczna na liście urządzeń zamiast numeru ID urządzenia. Będzie anonsowana do innych urządzeń jako opcjonalna nazwa domyślna.", + "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Widoczna na liście urządzeń zamiast numeru ID urządzenia. Będzie zaktualizowana do nazwy anonsowanej przez urządzenie, jeżeli pozostanie pusta.", "Shutdown": "Wyłącz", "Shutdown Complete": "Wyłączanie ukończone", "Simple File Versioning": "Proste wersjonowanie plików", "Single level wildcard (matches within a directory only)": "Wieloznacznik jednopoziomowy (wyszukuje tylko wewnątrz katalogu)", "Size": "Rozmiar", - "Smallest First": "Najmniejsze na początku", - "Some discovery methods could not be established for finding other devices or announcing this device:": "Nie udało się ustawić niektórych metod odnajdywania w celu szukania innych urządzeń oraz ogłaszania tego urządzenia:", + "Smallest First": "Od najmniejszych", + "Some discovery methods could not be established for finding other devices or announcing this device:": "Nie udało się uruchomić niektórych metod odnajdywania w celu szukania innych urządzeń oraz ogłaszania tego urządzenia:", "Some items could not be restored:": "Niektórych elementów nie udało się przywrócić:", "Some listening addresses could not be enabled to accept connections:": "Nie udało się włączyć niektórych adresów nasłuchujących w celu przyjmowania połączeń:", "Source Code": "Kod źródłowy", "Stable releases and release candidates": "Wydania stabilne i wydania kandydujące", - "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "Wydania stabilne są opóźnione o ok. dwa tygodnie. W tym czasie są one testowane jako wydania kandydujące.", + "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "Wydania stabilne są opóźnione o około dwa tygodnie. W tym czasie są one testowane jako wydania kandydujące.", "Stable releases only": "Tylko wydania stabilne", "Staggered File Versioning": "Rozbudowane wersjonowanie plików", "Start Browser": "Uruchom przeglądarkę", @@ -340,16 +343,16 @@ "Take me back": "Powrót", "The GUI address is overridden by startup options. Changes here will not take effect while the override is in place.": "Adres GUI jest nadpisywany przez opcje uruchamiania. Zmiany dokonane tutaj nie będą obowiązywać, dopóki nadpisywanie jest w użyciu.", "The Syncthing Authors": "The Syncthing Authors", - "The Syncthing admin interface is configured to allow remote access without a password.": "Ustawienia interfejsu administracyjnego Syncthinga zezwalają na zdalny dostęp bez hasła.", + "The Syncthing admin interface is configured to allow remote access without a password.": "Ustawienia interfejsu administracyjnego programu Syncthing zezwalają na zdalny dostęp bez hasła.", "The aggregated statistics are publicly available at the URL below.": "Zebrane statystyki są publicznie dostępne pod poniższym adresem.", "The cleanup interval cannot be blank.": "Przedział czasowy czyszczenia nie może być pusty.", "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Ustawienia zostały zapisane, ale nie są jeszcze aktywne. Syncthing musi zostać uruchomiony ponownie, aby aktywować nowe ustawienia.", - "The device ID cannot be blank.": "ID urządzenia nie może być puste.", - "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 urządzenia do wpisania tutaj można znaleźć w oknie \"Działania > Pokaż ID\" na innym urządzeniu. Spacje i myślniki są opcjonalne (ignorowane).", + "The device ID cannot be blank.": "Numer ID urządzenia nie może być puste.", + "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).": "Numer ID urządzenia do wpisania tutaj można znaleźć w oknie \"Działania > Pokaż numer ID\" na innym urządzeniu. Spacje i myślniki są opcjonalne (ignorowane).", "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.": "Zaszyfrowane statystyki użycia są wysyłane codziennie. Używane są one do śledzenia popularności systemów, rozmiarów folderów oraz wersji programu. Jeżeli wysyłane statystyki ulegną zmianie, zostaniesz poproszony o ponowne udzielenie zgody w tym oknie.", - "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.": "Wprowadzone ID urządzenia wygląda na niepoprawne. Musi ono zawierać 52 lub 56 znaków składających się z liter i cyfr. Spacje i myślniki są opcjonalne.", - "The folder ID cannot be blank.": "ID folderu nie może być puste.", - "The folder ID must be unique.": "ID folderu musi być unikatowe.", + "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.": "Wprowadzony numer ID urządzenia wygląda na niepoprawny. Musi ono zawierać 52 lub 56 znaków składających się z liter i cyfr. Spacje i myślniki są opcjonalne.", + "The folder ID cannot be blank.": "Numer ID folderu nie może być pusty.", + "The folder ID must be unique.": "Numer ID folderu musi być niepowtarzalny.", "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.": "Zawartość folderu na innych urządzeniach zostanie nadpisana tak, aby upodobnić się do tego urządzenia. Pliki nieobecne tutaj zostaną usunięte na innych urządzeniach.", "The folder content on this device will be overwritten to become identical with other devices. Files newly added here will be deleted.": "Zawartość folderu na tym urządzeniu zostanie nadpisana tak, aby upodobnić się do innych urządzeń. Pliki nowo dodane tutaj zostaną usunięte.", "The folder path cannot be blank.": "Ścieżka folderu nie może być pusta.", @@ -360,18 +363,18 @@ "The following unexpected items were found.": "Znaleziono następujące elementy nieoczekiwane.", "The interval must be a positive number of seconds.": "Przedział czasowy musi być dodatnią liczbą sekund.", "The interval, in seconds, for running cleanup in the versions directory. Zero to disable periodic cleaning.": "Przedział czasowy, w sekundach, w którym nastąpi czyszczenie katalogu wersjonowania. Ustaw na zero, aby wyłączyć czyszczenie okresowe.", - "The maximum age must be a number and cannot be blank.": "Maksymalny wiek musi być liczbą oraz nie może być pusty.", - "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Maksymalny czas zachowania wersji (w dniach, ustaw na 0, aby zachować na zawsze).", + "The maximum age must be a number and cannot be blank.": "Maksymalny wiek musi być wartością liczbową oraz nie może być pusty.", + "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Maksymalny czas zachowania wersji (w dniach; ustaw na 0, aby zachować na zawsze).", "The number of days must be a number and cannot be blank.": "Liczba dni musi być wartością liczbową oraz nie może być pusta.", "The number of days to keep files in the trash can. Zero means forever.": "Liczba dni, przez które pliki trzymane będą w koszu. Zero oznacza nieskończoność.", "The number of old versions to keep, per file.": "Liczba starszych wersji do zachowania, dla pojedynczego pliku.", "The number of versions must be a number and cannot be blank.": "Liczba wersji musi być wartością liczbową oraz nie może być pusta.", "The path cannot be blank.": "Ścieżka nie może być pusta.", - "The rate limit must be a non-negative number (0: no limit)": "Ograniczenie prędkości musi być nieujemną liczbą (0: brak ograniczeń)", + "The rate limit must be a non-negative number (0: no limit)": "Ograniczenie prędkości musi być nieujemną wartością liczbową (0: brak ograniczeń)", "The rescan interval must be a non-negative number of seconds.": "Przedział czasowy ponownego skanowania musi być nieujemną liczbą sekund.", - "There are no devices to share this folder with.": "Brak urządzeń, z którymi możesz współdzielić ten folder.", - "There are no folders to share with this device.": "Brak folderów, które możesz współdzielić z tym urządzeniem.", - "They are retried automatically and will be synced when the error is resolved.": "Ponowne próby zachodzą automatycznie. Synchronizacja nastąpi po usunięciu błędu.", + "There are no devices to share this folder with.": "Brak urządzeń, z którymi można współdzielić ten folder.", + "There are no folders to share with this device.": "Brak folderów, które można współdzielić z tym urządzeniem.", + "They are retried automatically and will be synced when the error is resolved.": "Ponowne próby zachodzą automatycznie, a synchronizacja nastąpi po usunięciu błędu.", "This Device": "To urządzenie", "This can easily give hackers access to read and change any files on your computer.": "Może to umożliwić hakerom dostęp do odczytu i zmian dowolnych plików na tym komputerze.", "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.": "To urządzenie nie jest w stanie automatycznie odnajdować innych urządzeń oraz ogłaszać swojego adresu, aby mogło ono zostać znalezione przez nie. Tylko urządzenia z adresem ustawionym statycznie są w stanie się połączyć.", @@ -403,7 +406,7 @@ "Usage reporting is always enabled for candidate releases.": "Statystyki użycia są zawsze włączone dla wydań kandydujących.", "Use HTTPS for GUI": "Użyj HTTPS dla GUI", "Use notifications from the filesystem to detect changed items.": "Używaj powiadomień systemu plików do wykrywania zmienionych elementów.", - "Username/Password has not been set for the GUI authentication. Please consider setting it up.": "Użytkownik i hasło do uwierzytelniania GUI nie zostały skonfigurowane. Zastanów się nad ich ustawieniem.", + "Username/Password has not been set for the GUI authentication. Please consider setting it up.": "Nazwa użytkownika i hasło do uwierzytelniania GUI nie zostały skonfigurowane. Zastanów się nad ich ustawieniem.", "Version": "Wersja", "Versions": "Wersje", "Versions Path": "Ścieżka wersji", @@ -420,8 +423,8 @@ "Watch for Changes": "Obserwuj zmiany", "Watching for Changes": "Obserwowanie zmian", "Watching for changes discovers most changes without periodic scanning.": "Obserwowanie wykrywa większość zmian bez potrzeby okresowego skanowania.", - "When adding a new device, keep in mind that this device must be added on the other side too.": "Gdy dodajesz nowe urządzenie pamiętaj, że to urządzenie musi zostać dodane także po drugiej stronie.", - "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.": "Dodając nowy folder pamiętaj, że ID folderu używane jest do parowania folderów pomiędzy urządzeniami. Wielkość liter ma znaczenie i musi ono być identyczne na wszystkich urządzeniach.", + "When adding a new device, keep in mind that this device must be added on the other side too.": "Dodając nowe urządzenie pamiętaj, że musi ono zostać dodane także po drugiej stronie.", + "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.": "Dodając nowy folder pamiętaj, że numer ID jest używany do parowania folderów pomiędzy urządzeniami. Wielkość liter ma znaczenie i musi on być identyczny na wszystkich urządzeniach.", "Yes": "Tak", "You can also select one of these nearby devices:": "Możesz również wybrać jedno z pobliskich urządzeń:", "You can change your choice at any time in the Settings dialog.": "Możesz zmienić swój wybór w dowolnej chwili w oknie Ustawień.", @@ -441,7 +444,7 @@ "theme-name-dark": "Ciemny", "theme-name-default": "Domyślny", "theme-name-light": "Jasny", - "{%device%} wants to share folder \"{%folder%}\".": "{{device}} chce współdzielić folder \"{{folder}}\"", - "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} chce współdzielić folder \"{{folderlabel}}\" ({{folder}}).", - "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} może ponownie wprowadzić to urządzenie." + "{%device%} wants to share folder \"{%folder%}\".": "Urządzenie {{device}} chce współdzielić folder \"{{folder}}\"", + "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "Urządzenie {{device}} chce współdzielić folder \"{{folderlabel}}\" ({{folder}}).", + "{%reintroducer%} might reintroduce this device.": "Urządzenie {{reintroducer}} może ponownie wprowadzić to urządzenie." } \ No newline at end of file diff --git a/gui/default/assets/lang/lang-pt-BR.json b/gui/default/assets/lang/lang-pt-BR.json index b7df778e62e..d862846236b 100644 --- a/gui/default/assets/lang/lang-pt-BR.json +++ b/gui/default/assets/lang/lang-pt-BR.json @@ -11,6 +11,7 @@ "Add Folder": "Adicionar pasta", "Add Remote Device": "Adicionar dispositivo remoto", "Add devices from the introducer to our device list, for mutually shared folders.": "Adicionar dispositivos do introdutor à sua lista de dispositivos para pastas compartilhadas mutualmente.", + "Add ignore patterns": "Adicionar padrões de exclusão", "Add new folder?": "Adicionar nova pasta?", "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.": "Além disso, o intervalo de nova verificação será aumentado (vezes 60, ou seja, novo padrão de 1h). Você também pode configurá-lo manualmente para cada pasta depois de escolher Não.", "Address": "Endereço", @@ -169,6 +170,7 @@ "Ignore": "Ignorar", "Ignore Patterns": "Filtros", "Ignore Permissions": "Ignorar permissões", + "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.": "Padrões de exclusão só podem ser adicionados depois de criar a pasta. Se esta opção estiver marcada, depois de gravar será apresentado um campo para escrever os padrões de exclusão.", "Ignored Devices": "Dispositivos ignorados", "Ignored Folders": "Pastas ignoradas", "Ignored at": "Ignorada em", @@ -290,6 +292,7 @@ "Select the folders to share with this device.": "Selecione as pastas a serem compartilhadas com este dispositivo.", "Send & Receive": "Envia e recebe", "Send Only": "Somente envia", + "Set Ignores on Added Folder": "Definir padrões de exclusão na pasta adicionada", "Settings": "Configurações", "Share": "Compartilhar", "Share Folder": "Compartilhar pasta", diff --git a/gui/default/assets/lang/lang-pt-PT.json b/gui/default/assets/lang/lang-pt-PT.json index 7816e905de5..f08f31cf52f 100644 --- a/gui/default/assets/lang/lang-pt-PT.json +++ b/gui/default/assets/lang/lang-pt-PT.json @@ -11,6 +11,7 @@ "Add Folder": "Adicionar pasta", "Add Remote Device": "Adicionar dispositivo remoto", "Add devices from the introducer to our device list, for mutually shared folders.": "Adicione dispositivos do apresentador à nossa lista de dispositivos para ter pastas mutuamente partilhadas.", + "Add ignore patterns": "Adicionar padrões de exclusão", "Add new folder?": "Adicionar nova pasta?", "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.": "Para além disso o intervalo entre verificações completas irá ser aumentado (vezes 60, ou seja, um novo valor predefinido de 1h). Também o pode configurar manualmente para cada pasta, posteriormente, depois de seleccionar Não.", "Address": "Endereço", @@ -22,7 +23,7 @@ "Allow Anonymous Usage Reporting?": "Permitir envio de relatórios anónimos de utilização?", "Allowed Networks": "Redes permitidas", "Alphabetic": "Alfabética", - "Altered by ignoring deletes.": "Altered by ignoring deletes.", + "Altered by ignoring deletes.": "Alterado por terem sido ignoradas as eliminações.", "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.": "Um comando externo controla as versões. Esse comando tem que remover o ficheiro da pasta partilhada. Se o caminho para a aplicação contiver espaços, então terá de o escrever entre aspas.", "Anonymous Usage Reporting": "Enviar relatórios anónimos de utilização", "Anonymous usage report format has changed. Would you like to move to the new format?": "O formato do relatório anónimo de utilização foi alterado. Gostaria de mudar para o novo formato?", @@ -169,6 +170,7 @@ "Ignore": "Ignorar", "Ignore Patterns": "Padrões de exclusão", "Ignore Permissions": "Ignorar permissões", + "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.": "Padrões de exclusão só podem ser adicionados depois de criar a pasta. Se esta opção estiver marcada, depois de gravar será apresentado um campo para escrever os padrões de exclusão.", "Ignored Devices": "Dispositivos ignorados", "Ignored Folders": "Pastas ignoradas", "Ignored at": "Ignorado em", @@ -290,6 +292,7 @@ "Select the folders to share with this device.": "Seleccione as pastas a partilhar com este dispositivo.", "Send & Receive": "envia e recebe", "Send Only": "envia apenas", + "Set Ignores on Added Folder": "Definir padrões de exclusão na pasta adicionada", "Settings": "Configurações", "Share": "Partilhar", "Share Folder": "Partilhar pasta", diff --git a/gui/default/assets/lang/lang-ro-RO.json b/gui/default/assets/lang/lang-ro-RO.json index 553a4b1a74f..832a9de7556 100644 --- a/gui/default/assets/lang/lang-ro-RO.json +++ b/gui/default/assets/lang/lang-ro-RO.json @@ -11,6 +11,7 @@ "Add Folder": "Adaugă Mapă", "Add Remote Device": "Adaugă dispozitiv la distanță", "Add devices from the introducer to our device list, for mutually shared folders.": "Adăugați dispozitive de la introductor la lista dispozitivelor noastre, pentru folderele partajate reciproc.", + "Add ignore patterns": "Add ignore patterns", "Add new folder?": "Adauga o mapă nouă?", "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.": "În plus, intervalul complet de rescanare va fi mărit (de 60 de ori, adică noul implict de 1 oră). Puteți, de asemenea, să o configurați manual pentru fiecare dosar mai târziu după alegerea nr.", "Address": "Adresă", @@ -169,6 +170,7 @@ "Ignore": "Ignoră", "Ignore Patterns": "Reguli de excludere", "Ignore Permissions": "Ignoră Permisiuni", + "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.": "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 Devices", "Ignored Folders": "Ignored Folders", "Ignored at": "Ignored at", @@ -290,6 +292,7 @@ "Select the folders to share with this device.": "Alege mapele pe care vrei sa le imparți cu acest dispozitiv.", "Send & Receive": "Send & Receive", "Send Only": "Send Only", + "Set Ignores on Added Folder": "Set Ignores on Added Folder", "Settings": "Setări", "Share": "Împarte", "Share Folder": "Împarte Mapa", diff --git a/gui/default/assets/lang/lang-ru.json b/gui/default/assets/lang/lang-ru.json index c21ddeca6ef..00b685535aa 100644 --- a/gui/default/assets/lang/lang-ru.json +++ b/gui/default/assets/lang/lang-ru.json @@ -11,6 +11,7 @@ "Add Folder": "Добавить папку", "Add Remote Device": "Добавить удалённое устройство", "Add devices from the introducer to our device list, for mutually shared folders.": "Добавлять устройства, известные рекомендателю, в список устройств, если есть общие с ними папки.", + "Add ignore patterns": "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": "Адрес", @@ -169,6 +170,7 @@ "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.": "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": "Добавлено", @@ -290,6 +292,7 @@ "Select the folders to share with this device.": "Выберите папки, которые будут доступны этому устройству.", "Send & Receive": "Отправить и получить", "Send Only": "Только отправить", + "Set Ignores on Added Folder": "Set Ignores on Added Folder", "Settings": "Настройки", "Share": "Предоставить доступ", "Share Folder": "Предоставить доступ к папке", diff --git a/gui/default/assets/lang/lang-sk.json b/gui/default/assets/lang/lang-sk.json index 7f43c8b9528..de57507c612 100644 --- a/gui/default/assets/lang/lang-sk.json +++ b/gui/default/assets/lang/lang-sk.json @@ -11,6 +11,7 @@ "Add Folder": "Pridať adresár", "Add Remote Device": "Pridať vzdialené zariadenie", "Add devices from the introducer to our device list, for mutually shared folders.": "Pre vzájomne zdieľané adresáre pridaj zariadenie od zavádzača do svojho zoznamu zariadení.", + "Add ignore patterns": "Add ignore patterns", "Add new folder?": "Pridať nový adresár?", "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.": "Navyše, interval plného skenovania bude navýšený (60krát, t.j. nová výchozia hodnota 1h). Môžete to nastaviť aj manuálne pre každý adresár ak zvolíte Nie.", "Address": "Adresa", @@ -169,6 +170,7 @@ "Ignore": "Ignorovať", "Ignore Patterns": "Ignorované vzory", "Ignore Permissions": "Ignorované práva", + "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.": "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": "Ignorované zariadenia", "Ignored Folders": "Ingorované priečinky", "Ignored at": "Ignorované na", @@ -290,6 +292,7 @@ "Select the folders to share with this device.": "Vyberte adresáre ktoré chcete zdieľať s týmto zariadením.", "Send & Receive": "Prijímať a odosielať", "Send Only": "Iba odosielať", + "Set Ignores on Added Folder": "Set Ignores on Added Folder", "Settings": "Nastavenia", "Share": "Zdieľať", "Share Folder": "Zdieľať adresár", diff --git a/gui/default/assets/lang/lang-sl.json b/gui/default/assets/lang/lang-sl.json index 1bcaf2b11e4..ebbb00f6d7f 100644 --- a/gui/default/assets/lang/lang-sl.json +++ b/gui/default/assets/lang/lang-sl.json @@ -11,6 +11,7 @@ "Add Folder": "Dodaj mapo", "Add Remote Device": "Dodaj oddaljeno napravo", "Add devices from the introducer to our device list, for mutually shared folders.": "Dodajte naprave od uvajalca na naš seznam naprav, za vzajemno deljenje map.", + "Add ignore patterns": "Add ignore patterns", "Add new folder?": "Dodaj novo mapo", "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.": "Poleg tega bo celoten interval ponovnega skeniranja se povečal (60 krat, torej nova privzeta vrednost 1 ure). Ti lahko tudi nastaviš si to ročno za vsako mapo pozneje, če ste prej izbrali Ne.", "Address": "Naslov", @@ -169,6 +170,7 @@ "Ignore": "Prezri", "Ignore Patterns": "Vzorec preziranja", "Ignore Permissions": "Prezri dovoljenja", + "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.": "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": "Prezrte naprave", "Ignored Folders": "Prezrte mape", "Ignored at": "Prezrt pri", @@ -290,6 +292,7 @@ "Select the folders to share with this device.": "Izberi mapo za deljenje z to napravo.", "Send & Receive": "Pošlji in Prejmi", "Send Only": "Samo pošiljanje", + "Set Ignores on Added Folder": "Set Ignores on Added Folder", "Settings": "Nastavitve", "Share": "Deli", "Share Folder": "Deli mapo", diff --git a/gui/default/assets/lang/lang-sv.json b/gui/default/assets/lang/lang-sv.json index cde37fec1b5..040a03bcb34 100644 --- a/gui/default/assets/lang/lang-sv.json +++ b/gui/default/assets/lang/lang-sv.json @@ -11,6 +11,7 @@ "Add Folder": "Lägg till mapp", "Add Remote Device": "Lägg till fjärrenhet", "Add devices from the introducer to our device list, for mutually shared folders.": "Lägg till enheter från introduktören till vår enhetslista för ömsesidigt delade mappar.", + "Add ignore patterns": "Lägg till ignoreringsmönster", "Add new folder?": "Lägg till ny mapp?", "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.": "Dessutom kommer det fullständiga återkommande skanningsintervallet att höjas (60 gånger, d.v.s. ny standard på 1h). Du kan också konfigurera den manuellt för varje mapp senare efter att du har valt Nej.", "Address": "Adress", @@ -169,6 +170,7 @@ "Ignore": "Ignorera", "Ignore Patterns": "Ignorera mönster", "Ignore Permissions": "Ignorera rättigheter", + "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.": "Ignoreringsmönster kan bara läggas till efter att mappen har skapats. Om markerad kommer ett inmatningsfält för att ställa in ignoreringsmönster att visas efter att du har sparat.", "Ignored Devices": "Ignorerade enheter", "Ignored Folders": "Ignorerade mappar", "Ignored at": "Ignorerad vid", @@ -290,6 +292,7 @@ "Select the folders to share with this device.": "Välj mapparna som ska delas med denna enhet.", "Send & Receive": "Skicka & ta emot", "Send Only": "Skicka endast", + "Set Ignores on Added Folder": "Ställ in ignoreringar för tillagd mapp", "Settings": "Inställningar", "Share": "Dela", "Share Folder": "Dela mapp", diff --git a/gui/default/assets/lang/lang-tr.json b/gui/default/assets/lang/lang-tr.json index e3e80a49f72..a6173e82107 100644 --- a/gui/default/assets/lang/lang-tr.json +++ b/gui/default/assets/lang/lang-tr.json @@ -11,6 +11,7 @@ "Add Folder": "Klasör Ekle", "Add Remote Device": "Uzak Cihaz Ekle", "Add devices from the introducer to our device list, for mutually shared folders.": "Karşılıklı olarak paylaşılan klasörler için tanıtıcıdan cihaz listemize cihazlar ekleyin.", + "Add ignore patterns": "Yoksayma şekilleri ekle", "Add new folder?": "Yeni klasör eklensin mi?", "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.": "Ek olarak, tam yeniden tarama aralığı artacaktır (60 defa, yani 1 saat yeni varsayılan). Ayrıca, Hayır'ı seçtikten daha sonra her klasör için el ile de yapılandırabilirsiniz.", "Address": "Adres", @@ -144,7 +145,7 @@ "Folder Label": "Klasör Etiketi", "Folder Path": "Klasör Yolu", "Folder Type": "Klasör Türü", - "Folder type \"{%receiveEncrypted%}\" can only be set when adding a new folder.": "Klasör türü \"{{receiveEncrypted}}\" sadece yeni bir klasör eklerken ayarlanabilir.", + "Folder type \"{%receiveEncrypted%}\" can only be set when adding a new folder.": "Klasör türü \"{{receiveEncrypted}}\" yalnızca yeni bir klasör eklerken ayarlanabilir.", "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.": "Klasör türü \"{{receiveEncrypted}}\", klasör eklendikten sonra değiştirilemez. Klasörü kaldırmanız, diskteki verileri silmeniz veya şifresini çözmeniz ve klasörü tekrar eklemeniz gerekir.", "Folders": "Klasörler", "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şağıdaki klasörler için değişiklikleri izlemeye başlarken bir hata meydana geldi. Her dakika yeniden denenecektir, böylece hatalar kısa süre içinde ortadan kalkabilir. Devam ederse, altta yatan sorunu düzeltmeye çalışın ve yapamazsanız yardım isteyin.", @@ -169,6 +170,7 @@ "Ignore": "Yoksay", "Ignore Patterns": "Yoksayma Şekilleri", "Ignore Permissions": "İzinleri Yoksay", + "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.": "Yoksayma şekilleri yalnızca klasör oluşturulduktan sonra eklenebilir. Eğer işaretlendiyse, kaydettikten sonra yoksayma şekillerini girmek için bir giriş alanı sunulacaktır.", "Ignored Devices": "Yoksayılan Cihazlar", "Ignored Folders": "Yoksayılan Klasörler", "Ignored at": "Yoksayılma", @@ -290,6 +292,7 @@ "Select the folders to share with this device.": "Bu cihazla paylaşılacak klasörleri seçin.", "Send & Receive": "Gönder ve Al", "Send Only": "Yalnızca Gönder", + "Set Ignores on Added Folder": "Eklenen Klasörde Yoksayılanları Ayarla", "Settings": "Ayarlar", "Share": "Paylaş", "Share Folder": "Paylaşım Klasörü", diff --git a/gui/default/assets/lang/lang-uk.json b/gui/default/assets/lang/lang-uk.json index 309cb994f4a..8489b618199 100644 --- a/gui/default/assets/lang/lang-uk.json +++ b/gui/default/assets/lang/lang-uk.json @@ -11,6 +11,7 @@ "Add Folder": "Додати директорію", "Add Remote Device": "Додати віддалений пристрій", "Add devices from the introducer to our device list, for mutually shared folders.": "Додати пристрої від пристрою-рекомендувача до нашого списку пристроїв для спільно розділених директорій.", + "Add ignore patterns": "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": "Адреса", @@ -169,6 +170,7 @@ "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.": "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": "Ігноруються в", @@ -290,6 +292,7 @@ "Select the folders to share with this device.": "Оберіть директорії до яких матиме доступ цей пристрій.", "Send & Receive": "Відправити та отримати", "Send Only": "Лише відправити", + "Set Ignores on Added Folder": "Set Ignores on Added Folder", "Settings": "Налаштування", "Share": "Розповсюдити ", "Share Folder": "Розповсюдити каталог", diff --git a/gui/default/assets/lang/lang-zh-CN.json b/gui/default/assets/lang/lang-zh-CN.json index 73830318fa5..b680eb50ea9 100644 --- a/gui/default/assets/lang/lang-zh-CN.json +++ b/gui/default/assets/lang/lang-zh-CN.json @@ -11,6 +11,7 @@ "Add Folder": "添加文件夹", "Add Remote Device": "添加远程设备", "Add devices from the introducer to our device list, for mutually shared folders.": "将这个设备上那些，跟本机有着共同文件夹的“远程设备”，都添加到本机的“远程设备”列表。", + "Add ignore patterns": "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": "地址", @@ -169,6 +170,7 @@ "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.": "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": "已忽略于", @@ -290,6 +292,7 @@ "Select the folders to share with this device.": "选择与该设备共享的文件夹。", "Send & Receive": "发送与接收", "Send Only": "仅发送", + "Set Ignores on Added Folder": "Set Ignores on Added Folder", "Settings": "设置", "Share": "共享", "Share Folder": "共享文件夹", diff --git a/gui/default/assets/lang/lang-zh-HK.json b/gui/default/assets/lang/lang-zh-HK.json index 2a704c07808..fb695470576 100644 --- a/gui/default/assets/lang/lang-zh-HK.json +++ b/gui/default/assets/lang/lang-zh-HK.json @@ -11,6 +11,7 @@ "Add Folder": "新增資料夾", "Add Remote Device": "新增遠程設備", "Add devices from the introducer to our device list, for mutually shared folders.": "將這個設備上那些，跟本機有著共同文件夾的「遠程設備」，都添加到本機的「遠程設備」列表。", + "Add ignore patterns": "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": "地址", @@ -169,6 +170,7 @@ "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.": "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": "已忽略於", @@ -290,6 +292,7 @@ "Select the folders to share with this device.": "選擇與該設備共享的文件夾。", "Send & Receive": "發送與接收", "Send Only": "僅發送", + "Set Ignores on Added Folder": "Set Ignores on Added Folder", "Settings": "設置", "Share": "共享", "Share Folder": "共享文件夾", diff --git a/gui/default/assets/lang/lang-zh-TW.json b/gui/default/assets/lang/lang-zh-TW.json index 9252a590caa..57264a6b3f6 100644 --- a/gui/default/assets/lang/lang-zh-TW.json +++ b/gui/default/assets/lang/lang-zh-TW.json @@ -11,6 +11,7 @@ "Add Folder": "添加資料夾", "Add Remote Device": "新增遠端裝置", "Add devices from the introducer to our device list, for mutually shared folders.": "對於共享的資料夾，匯入引入者的裝置清單。", + "Add ignore patterns": "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": "位址", @@ -169,6 +170,7 @@ "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.": "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": "忽略時間", @@ -290,6 +292,7 @@ "Select the folders to share with this device.": "選擇要共享這個資料夾的裝置。", "Send & Receive": "傳送及接收", "Send Only": "僅傳送", + "Set Ignores on Added Folder": "Set Ignores on Added Folder", "Settings": "設定", "Share": "共享", "Share Folder": "共享資料夾", diff --git a/man/stdiscosrv.1 b/man/stdiscosrv.1 index a55ad1be22a..cfbaed8b270 100644 --- a/man/stdiscosrv.1 +++ b/man/stdiscosrv.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "STDISCOSRV" "1" "Jan 12, 2022" "v1" "Syncthing" +.TH "STDISCOSRV" "1" "Jan 22, 2022" "v1" "Syncthing" .SH NAME stdiscosrv \- Syncthing Discovery Server .SH SYNOPSIS diff --git a/man/strelaysrv.1 b/man/strelaysrv.1 index 2475c758342..acde8a32885 100644 --- a/man/strelaysrv.1 +++ b/man/strelaysrv.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "STRELAYSRV" "1" "Jan 12, 2022" "v1" "Syncthing" +.TH "STRELAYSRV" "1" "Jan 22, 2022" "v1" "Syncthing" .SH NAME strelaysrv \- Syncthing Relay Server .SH SYNOPSIS diff --git a/man/syncthing-bep.7 b/man/syncthing-bep.7 index 85e0f82f1f7..641ffc61b59 100644 --- a/man/syncthing-bep.7 +++ b/man/syncthing-bep.7 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SYNCTHING-BEP" "7" "Jan 12, 2022" "v1" "Syncthing" +.TH "SYNCTHING-BEP" "7" "Jan 22, 2022" "v1" "Syncthing" .SH NAME syncthing-bep \- Block Exchange Protocol v1 .SH INTRODUCTION AND DEFINITIONS diff --git a/man/syncthing-config.5 b/man/syncthing-config.5 index c00791d0a6e..c2445b6d682 100644 --- a/man/syncthing-config.5 +++ b/man/syncthing-config.5 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SYNCTHING-CONFIG" "5" "Jan 12, 2022" "v1" "Syncthing" +.TH "SYNCTHING-CONFIG" "5" "Jan 22, 2022" "v1" "Syncthing" .SH NAME syncthing-config \- Syncthing Configuration .SH SYNOPSIS diff --git a/man/syncthing-device-ids.7 b/man/syncthing-device-ids.7 index 7261f251af0..142740423f7 100644 --- a/man/syncthing-device-ids.7 +++ b/man/syncthing-device-ids.7 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SYNCTHING-DEVICE-IDS" "7" "Jan 12, 2022" "v1" "Syncthing" +.TH "SYNCTHING-DEVICE-IDS" "7" "Jan 22, 2022" "v1" "Syncthing" .SH NAME syncthing-device-ids \- Understanding Device IDs .sp diff --git a/man/syncthing-event-api.7 b/man/syncthing-event-api.7 index 2aca4df9e91..acf00c756e8 100644 --- a/man/syncthing-event-api.7 +++ b/man/syncthing-event-api.7 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SYNCTHING-EVENT-API" "7" "Jan 12, 2022" "v1" "Syncthing" +.TH "SYNCTHING-EVENT-API" "7" "Jan 22, 2022" "v1" "Syncthing" .SH NAME syncthing-event-api \- Event API .SH DESCRIPTION diff --git a/man/syncthing-faq.7 b/man/syncthing-faq.7 index 676393fab14..d3551b8ebc3 100644 --- a/man/syncthing-faq.7 +++ b/man/syncthing-faq.7 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SYNCTHING-FAQ" "7" "Jan 12, 2022" "v1" "Syncthing" +.TH "SYNCTHING-FAQ" "7" "Jan 22, 2022" "v1" "Syncthing" .SH NAME syncthing-faq \- Frequently Asked Questions .INDENT 0.0 @@ -155,7 +155,10 @@ File or directory owners and Groups (not preserved) .IP \(bu 2 Directory modification times (not preserved) .IP \(bu 2 -Hard links and Windows directory junctions (followed, not preserved) +Hard links (followed, not preserved) +.IP \(bu 2 +Windows junctions (synced as ordinary directories; require enabling +in the configuration on a per\-folder basis) .IP \(bu 2 Extended attributes, resource forks (not preserved) .IP \(bu 2 @@ -536,8 +539,8 @@ $ ssh \-N \-L 9090:127.0.0.1:8384 user@othercomputer.example.com If only your remote computer is Unix\-like, you can still access it with ssh from Windows. .sp -Under Windows 10 (64 bit) you can use the same ssh command if you install -the \fI\%Windows Subsystem for Linux\fP <\fBhttps://docs.microsoft.com/windows/wsl/install-win10\fP>\&. +Under Windows 10 or later (64\-bit only) you can use the same ssh command +if you install the \fI\%Windows Subsystem for Linux\fP <\fBhttps://docs.microsoft.com/windows/wsl/install\fP>\&. .sp Another Windows way to run ssh is to install \fI\%gow (Gnu On Windows)\fP <\fBhttps://github.com/bmatzelle/gow\fP>\&. The easiest way to install gow is with the \fI\%chocolatey\fP <\fBhttps://chocolatey.org/\fP> package manager. .SS I don’t like the GUI or the theme. Can it be changed? diff --git a/man/syncthing-globaldisco.7 b/man/syncthing-globaldisco.7 index 9443a7b90b8..9154934ba9c 100644 --- a/man/syncthing-globaldisco.7 +++ b/man/syncthing-globaldisco.7 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SYNCTHING-GLOBALDISCO" "7" "Jan 12, 2022" "v1" "Syncthing" +.TH "SYNCTHING-GLOBALDISCO" "7" "Jan 22, 2022" "v1" "Syncthing" .SH NAME syncthing-globaldisco \- Global Discovery Protocol v3 .SH ANNOUNCEMENTS diff --git a/man/syncthing-localdisco.7 b/man/syncthing-localdisco.7 index 22222e9bef4..35778734fef 100644 --- a/man/syncthing-localdisco.7 +++ b/man/syncthing-localdisco.7 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SYNCTHING-LOCALDISCO" "7" "Jan 12, 2022" "v1" "Syncthing" +.TH "SYNCTHING-LOCALDISCO" "7" "Jan 22, 2022" "v1" "Syncthing" .SH NAME syncthing-localdisco \- Local Discovery Protocol v4 .SH MODE OF OPERATION diff --git a/man/syncthing-networking.7 b/man/syncthing-networking.7 index 668a971e6cc..5c706d124ad 100644 --- a/man/syncthing-networking.7 +++ b/man/syncthing-networking.7 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SYNCTHING-NETWORKING" "7" "Jan 12, 2022" "v1" "Syncthing" +.TH "SYNCTHING-NETWORKING" "7" "Jan 22, 2022" "v1" "Syncthing" .SH NAME syncthing-networking \- Firewall Setup .SH ROUTER SETUP diff --git a/man/syncthing-relay.7 b/man/syncthing-relay.7 index 9d35cebf622..50b767ecb36 100644 --- a/man/syncthing-relay.7 +++ b/man/syncthing-relay.7 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SYNCTHING-RELAY" "7" "Jan 12, 2022" "v1" "Syncthing" +.TH "SYNCTHING-RELAY" "7" "Jan 22, 2022" "v1" "Syncthing" .SH NAME syncthing-relay \- Relay Protocol v1 .SH WHAT IS A RELAY? diff --git a/man/syncthing-rest-api.7 b/man/syncthing-rest-api.7 index 68c66a84437..2b6a2eec15b 100644 --- a/man/syncthing-rest-api.7 +++ b/man/syncthing-rest-api.7 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SYNCTHING-REST-API" "7" "Jan 12, 2022" "v1" "Syncthing" +.TH "SYNCTHING-REST-API" "7" "Jan 22, 2022" "v1" "Syncthing" .SH NAME syncthing-rest-api \- REST API .sp diff --git a/man/syncthing-security.7 b/man/syncthing-security.7 index 21e427e2f9e..1fa1b40c44d 100644 --- a/man/syncthing-security.7 +++ b/man/syncthing-security.7 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SYNCTHING-SECURITY" "7" "Jan 12, 2022" "v1" "Syncthing" +.TH "SYNCTHING-SECURITY" "7" "Jan 22, 2022" "v1" "Syncthing" .SH NAME syncthing-security \- Security Principles .sp diff --git a/man/syncthing-stignore.5 b/man/syncthing-stignore.5 index 2c3f0d6671d..74ab5b87aa6 100644 --- a/man/syncthing-stignore.5 +++ b/man/syncthing-stignore.5 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SYNCTHING-STIGNORE" "5" "Jan 12, 2022" "v1" "Syncthing" +.TH "SYNCTHING-STIGNORE" "5" "Jan 22, 2022" "v1" "Syncthing" .SH NAME syncthing-stignore \- Prevent files from being synchronized to other nodes .SH SYNOPSIS @@ -89,8 +89,21 @@ any lower case character. .IP \(bu 2 \fBBackslash\fP (\fB\e\fP) “escapes” a special character so that it loses its special meaning. For example, \fB\e{banana\e}\fP matches \fB{banana}\fP exactly -and does not denote a set of alternatives as above. \fIEscaped characters -are not supported on Windows.\fP +and does not denote a set of alternatives as above. +.UNINDENT +.sp +\fBNOTE:\fP +.INDENT 0.0 +.INDENT 3.5 +Escaped characters are not supported on Windows, where \fB\e\fP is the +path separator. If you still need to match files that have square or +curly brackets in their names, one possible workaround is to replace +them with \fB?\fP, which will then match any character. For example, +you can type \fB?banana?\fP to match both \fB[banana]\fP and +\fB{banana}\fP, and so on. +.UNINDENT +.UNINDENT +.INDENT 0.0 .IP \(bu 2 A pattern beginning with \fB/\fP matches in the root of the folder only. \fB/foo\fP matches \fBfoo\fP but not \fBsubdir/foo\fP\&. diff --git a/man/syncthing-versioning.7 b/man/syncthing-versioning.7 index cd988c05caf..3493f86b1b0 100644 --- a/man/syncthing-versioning.7 +++ b/man/syncthing-versioning.7 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SYNCTHING-VERSIONING" "7" "Jan 12, 2022" "v1" "Syncthing" +.TH "SYNCTHING-VERSIONING" "7" "Jan 22, 2022" "v1" "Syncthing" .SH NAME syncthing-versioning \- Keep automatic backups of deleted files by other nodes .sp @@ -205,21 +205,21 @@ rem Enable UTF\-8 encoding to deal with multilingual folder and file names chcp 65001 rem We need command extensions for md to create intermediate folders in one go -setlocal EnableExtensions +setlocal enableextensions rem Where I want my versions stored -set "VERSIONS_PATH=%USERPROFILE%\e.trashcan" +set "versions_path=%USERPROFILE%\e.trashcan" rem The parameters we get from Syncthing, \(aq~\(aq removes quotes if any -set "FOLDER_PATH=%~1" -set "FILE_PATH=%~2" +set "folder_path=%~1" +set "file_path=%~2" rem First ensure the dir where we need to store the file exists -for %%F in ("%VERSIONS_PATH%\e%FILE_PATH%") do set "OUTPUT_PATH=%%~dpF" -if not exist "%OUTPUT_PATH%" md "%OUTPUT_PATH%" || exit /B +for %%f in ("%versions_path%\e%file_path%") do set "output_path=%%~dpf" +if not exist "%output_path%" md "%output_path%" || exit /b rem Finally move the file, overwrite existing file if any -move /Y "%FOLDER_PATH%\e%FILE_PATH%" "%VERSIONS_PATH%\e%FILE_PATH%" +move /y "%folder_path%\e%file_path%" "%versions_path%\e%file_path%" .ft P .fi .UNINDENT diff --git a/man/syncthing.1 b/man/syncthing.1 index 406a3efa76b..fe8a6c33865 100644 --- a/man/syncthing.1 +++ b/man/syncthing.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SYNCTHING" "1" "Jan 12, 2022" "v1" "Syncthing" +.TH "SYNCTHING" "1" "Jan 22, 2022" "v1" "Syncthing" .SH NAME syncthing \- Syncthing .SH SYNOPSIS From 1af87577e1f56bc7d579dd28f43493cbbc40c1bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Colomb?= Date: Mon, 24 Jan 2022 19:36:11 +0100 Subject: [PATCH 054/220] gui: Generate version-specific documentation link URLs (#8108) Replace all HTML references to https://docs.syncthing.net with a function call to return a version-specific URL. --- gui/default/index.html | 6 ++-- gui/default/syncthing/core/notifications.html | 10 +++---- .../syncthing/core/syncthingController.js | 28 +++++++++++++++++++ .../syncthing/folder/editFolderModalView.html | 8 +++--- .../syncthing/settings/settingsModalView.html | 6 ++-- 5 files changed, 43 insertions(+), 15 deletions(-) diff --git a/gui/default/index.html b/gui/default/index.html index 4c1a2fb6d34..85868c8bab0 100644 --- a/gui/default/index.html +++ b/gui/default/index.html @@ -89,7 +89,7 @@

  • - + @@ -108,7 +108,7 @@

  •  Restart
  • - +  Help
    • @@ -432,7 +432,7 @@

    Altered by ignoring deletes.
    -  Help +  Help

    • diff --git a/gui/default/syncthing/core/notifications.html b/gui/default/syncthing/core/notifications.html index 0af0bef7de9..b7b7d4de6cf 100644 --- a/gui/default/syncthing/core/notifications.html +++ b/gui/default/syncthing/core/notifications.html @@ -28,7 +28,7 @@

     A You can read more about the two release channels at the link below.

    You can change your choice at any time in the Settings dialog.

    -

     Learn more

    +

     Learn more

    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.

    -

     Learn more

    +

     Learn more

    Do you want to enable watching for changes for all your folders?
    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. @@ -77,7 +77,7 @@

     A

    Syncthing now supports automatically reporting crashes to the developers. This feature is enabled by default.

    -

     Learn more

    +

     Learn more

    @@ -101,7 +101,7 @@

     A

    Syncthing now supports automatically reporting crashes to the developers. This feature is enabled by default.

    However, your current settings indicate you might not want it enabled. We have disabled automatic crash reporting for you.

    -

     Learn more

    +

     Learn more

    @@ -140,4 +140,4 @@

     G

    - \ No newline at end of file + diff --git a/gui/default/syncthing/core/syncthingController.js b/gui/default/syncthing/core/syncthingController.js index 659e71421f3..d786da04c69 100755 --- a/gui/default/syncthing/core/syncthingController.js +++ b/gui/default/syncthing/core/syncthingController.js @@ -2892,6 +2892,34 @@ angular.module('syncthing.core') return $scope.version.version + ', ' + os + ' (' + arch + ')'; }; + $scope.versionBase = function () { + if (!$scope.version.version) { + return ''; + } + var version = $scope.version.version; + var pos = version.indexOf('-'); + if (pos > 0) { + version = version.slice(0, pos); + } + return version; + }; + + $scope.docsURL = function (path) { + var url = 'https://docs.syncthing.net'; + if (path) { + var hash = path.indexOf('#'); + if (hash != -1) { + url += '/' + path.slice(0, hash); + url += '?version=' + $scope.versionBase(); + url += path.slice(hash); + } else { + url += '/' + path; + url += '?version=' + $scope.versionBase(); + } + } + return url; + }; + $scope.inputTypeFor = function (key, value) { if (key.substr(0, 1) === '_') { return 'skip'; diff --git a/gui/default/syncthing/folder/editFolderModalView.html b/gui/default/syncthing/folder/editFolderModalView.html index 2c0c3559750..cce101696d2 100644 --- a/gui/default/syncthing/folder/editFolderModalView.html +++ b/gui/default/syncthing/folder/editFolderModalView.html @@ -77,7 +77,7 @@
    -   Help +   Help diff --git a/gui/default/syncthing/settings/settingsModalView.html b/gui/default/syncthing/settings/settingsModalView.html index d83cbc94a8a..60da9b9ac71 100644 --- a/gui/default/syncthing/settings/settingsModalView.html +++ b/gui/default/syncthing/settings/settingsModalView.html @@ -85,7 +85,7 @@
    -   Help +   Help
    From a0fd619df35e87ae56c43e607c5bf75e774ebd64 Mon Sep 17 00:00:00 2001 From: greatroar <61184462+greatroar@users.noreply.github.com> Date: Mon, 24 Jan 2022 19:36:58 +0100 Subject: [PATCH 055/220] lib/protocol: Require at least 3.125% savings from compression (#8133) * lib/protocol: Require at least 3.125% savings from compression The new lz4 library doesn't need its output buffer to be the maximum size, unlike the old one (which would allocate if it weren't). It can take a buffer that is of a smaller size and will report if compressed data can fit inside the buffer (with a small chance of reporting a false negative). Use that property to our advantage by requiring compressed data to be at most n-n/32 = .96875*n bytes long for n input bytes. * lib/protocol: Remove unused receivers To make DeepSource happy. * lib/protocol: Micro-optimize lz4Compress Only write the length if compression was successful. This is a memory write, so the compiler can't reorder it. Only check the return value of lz4.CompressBlock. Length-zero inputs are always expanded by LZ4 compression (the library documents this), so the check on len(src) isn't needed. --- lib/protocol/protocol.go | 31 +++++++++++++++++-------------- lib/protocol/protocol_test.go | 2 +- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/lib/protocol/protocol.go b/lib/protocol/protocol.go index bed05c3a94b..57a2661edc0 100644 --- a/lib/protocol/protocol.go +++ b/lib/protocol/protocol.go @@ -540,7 +540,7 @@ func (c *rawConnection) readMessageAfterHeader(hdr Header, fourByteBuf []byte) ( // ... and is then unmarshalled - msg, err := c.newMessage(hdr.Type) + msg, err := newMessage(hdr.Type) if err != nil { BufferPool.Put(buf) return nil, err @@ -747,7 +747,7 @@ func (c *rawConnection) writeMessage(msg message) error { size := msg.ProtoSize() hdr := Header{ - Type: c.typeOf(msg), + Type: typeOf(msg), } hdrSize := hdr.ProtoSize() if hdrSize > 1<<16-1 { @@ -765,7 +765,7 @@ func (c *rawConnection) writeMessage(msg message) error { } if c.shouldCompressMessage(msg) { - ok, err := c.writeCompressedMessage(msg, buf[overhead:], overhead) + ok, err := c.writeCompressedMessage(msg, buf[overhead:]) if ok { return err } @@ -789,13 +789,13 @@ func (c *rawConnection) writeMessage(msg message) error { return nil } -// Write msg out compressed, given its uncompressed marshaled payload and overhead. +// Write msg out compressed, given its uncompressed marshaled payload. // // The first return value indicates whether compression succeeded. // If not, the caller should retry without compression. -func (c *rawConnection) writeCompressedMessage(msg message, marshaled []byte, overhead int) (ok bool, err error) { +func (c *rawConnection) writeCompressedMessage(msg message, marshaled []byte) (ok bool, err error) { hdr := Header{ - Type: c.typeOf(msg), + Type: typeOf(msg), Compression: MessageCompressionLZ4, } hdrSize := hdr.ProtoSize() @@ -804,13 +804,16 @@ func (c *rawConnection) writeCompressedMessage(msg message, marshaled []byte, ov } cOverhead := 2 + hdrSize + 4 - maxCompressed := cOverhead + lz4.CompressBlockBound(len(marshaled)) + // The compressed size may be at most n-n/32 = .96875*n bytes, + // I.e., if we can't save at least 3.125% bandwidth, we forgo compression. + // This number is arbitrary but cheap to compute. + maxCompressed := cOverhead + len(marshaled) - len(marshaled)/32 buf := BufferPool.Get(maxCompressed) defer BufferPool.Put(buf) compressedSize, err := lz4Compress(marshaled, buf[cOverhead:]) totSize := compressedSize + cOverhead - if err != nil || totSize >= len(marshaled)+overhead { + if err != nil { return false, nil } @@ -831,7 +834,7 @@ func (c *rawConnection) writeCompressedMessage(msg message, marshaled []byte, ov return true, nil } -func (c *rawConnection) typeOf(msg message) MessageType { +func typeOf(msg message) MessageType { switch msg.(type) { case *ClusterConfig: return MessageTypeClusterConfig @@ -854,7 +857,7 @@ func (c *rawConnection) typeOf(msg message) MessageType { } } -func (c *rawConnection) newMessage(t MessageType) (message, error) { +func newMessage(t MessageType) (message, error) { switch t { case MessageTypeClusterConfig: return new(ClusterConfig), nil @@ -1014,16 +1017,16 @@ func (c *rawConnection) Statistics() Statistics { } func lz4Compress(src, buf []byte) (int, error) { - // The compressed block is prefixed by the size of the uncompressed data. - binary.BigEndian.PutUint32(buf, uint32(len(src))) - n, err := lz4.CompressBlock(src, buf[4:], nil) if err != nil { return -1, err - } else if len(src) > 0 && n == 0 { + } else if n == 0 { return -1, errNotCompressible } + // The compressed block is prefixed by the size of the uncompressed data. + binary.BigEndian.PutUint32(buf, uint32(len(src))) + return n + 4, nil } diff --git a/lib/protocol/protocol_test.go b/lib/protocol/protocol_test.go index 85e73011e11..54e3ec70e45 100644 --- a/lib/protocol/protocol_test.go +++ b/lib/protocol/protocol_test.go @@ -466,7 +466,7 @@ func TestWriteCompressed(t *testing.T) { t.Error("received the wrong message") } - hdr := Header{Type: c.typeOf(msg)} + hdr := Header{Type: typeOf(msg)} size := int64(2 + hdr.ProtoSize() + 4 + msg.ProtoSize()) if c.cr.tot > size { t.Errorf("compression enlarged message from %d to %d", From 9efac0f0678890cc0a67a8c603ec4bb1d540d89f Mon Sep 17 00:00:00 2001 From: tomasz1986 Date: Tue, 25 Jan 2022 23:08:27 +0100 Subject: [PATCH 056/220] gui: Tweak the Restore Versions modal for better usability (#7972) --- gui/black/assets/css/theme.css | 9 +- gui/dark/assets/css/theme.css | 9 +- gui/default/assets/css/overrides.css | 74 +- gui/default/assets/css/tree.css | 58 + gui/default/index.html | 2 +- .../syncthing/core/syncthingController.js | 24 +- .../folder/restoreVersionsMassActions.html | 2 +- .../folder/restoreVersionsModalView.html | 24 +- .../restoreVersionsVersionSelector.html | 2 +- gui/default/vendor/daterangepicker/LICENSE | 4 +- .../daterangepicker/daterangepicker.css | 164 +- .../vendor/daterangepicker/daterangepicker.js | 207 +- gui/default/vendor/fancytree/LICENSE.txt | 4 +- .../vendor/fancytree/css/ui.fancytree.css | 706 - .../fancytree/jquery.fancytree-all-deps.js | 21861 ++++++++-------- .../vendor/fancytree/skin-lion/icons.gif | Bin 5937 -> 0 bytes .../vendor/fancytree/skin-lion/loading.gif | Bin 1849 -> 0 bytes .../vendor/fancytree/skin-lion/vline.gif | Bin 852 -> 0 bytes gui/light/assets/css/theme.css | 11 +- 19 files changed, 11890 insertions(+), 11271 deletions(-) create mode 100644 gui/default/assets/css/tree.css delete mode 100644 gui/default/vendor/fancytree/css/ui.fancytree.css delete mode 100644 gui/default/vendor/fancytree/skin-lion/icons.gif delete mode 100644 gui/default/vendor/fancytree/skin-lion/loading.gif delete mode 100644 gui/default/vendor/fancytree/skin-lion/vline.gif diff --git a/gui/black/assets/css/theme.css b/gui/black/assets/css/theme.css index f6cdb51f7ec..622a22a5895 100644 --- a/gui/black/assets/css/theme.css +++ b/gui/black/assets/css/theme.css @@ -265,6 +265,11 @@ code.ng-binding{ color: #222; } -.fancytree-title { - color: #aaa !important; +/* + * Fancytree tweaks + */ + +.fancytree-container tr:hover, +.fancytree-focused { + background-color: #222; } diff --git a/gui/dark/assets/css/theme.css b/gui/dark/assets/css/theme.css index d2aafed9687..f554bb8a8af 100644 --- a/gui/dark/assets/css/theme.css +++ b/gui/dark/assets/css/theme.css @@ -277,6 +277,11 @@ code.ng-binding{ color: #3fa9f0; } -.fancytree-title { - color: #aaa !important; +/* + * Fancytree tweaks + */ + +.fancytree-container tr:hover, +.fancytree-focused { + background-color: #424242; } diff --git a/gui/default/assets/css/overrides.css b/gui/default/assets/css/overrides.css index aa4a1e7b1e3..410e597339b 100644 --- a/gui/default/assets/css/overrides.css +++ b/gui/default/assets/css/overrides.css @@ -301,6 +301,62 @@ ul.three-columns li, ul.two-columns li { z-index: 980; } +/* + * Restore Versions tweaks + */ + +#restoreTree-container { + overflow-y: scroll; + resize: vertical; + /* Limit height to prevent vertical screen overflow. */ + max-height: calc(100vh - 390px); + /* Always fit at least one folder with dropdown open. */ + min-height: 136px; +} +@media (min-width: 768px) { + #restoreTree-container { + max-height: calc(100vh - 401px); + } +} +@media (min-width: 992px) { + #restoreTree-container { + max-height: calc(100vh - 333px); + } +} + +/* Ignore fixed height when manually resized. */ +#restoreTree-container[style*="height"] { + max-height: none; +} + +/* Remove table outline as rows have own focus style already. */ +#restoreTree:focus { + outline: 0; +} + +/* Align dropdown with title first line. */ +#restoreTree td + td { + padding-top: 4px; + vertical-align: top; +} + +/* Reduce space between toggle and menu on mobile. */ +#restoreTree .dropdown-toggle { + margin-bottom: 0; +} + +/* Change direction to remain on screen on mobile. */ +#restoreTree .dropdown-menu { + left: auto; + right: 0; +} + +/* Ensure maximum space for filtering and date range. */ +#restoreVersions .form-group, +#restoreVersions .form-control { + width: 100%; +} + /** Footer nav on small devices **/ @media (max-width: 1199px) { /* Stay at the end of the page, with space reserved for the footer @@ -396,10 +452,6 @@ ul.three-columns li, ul.two-columns li { padding-top: 10px; } -.fancytree-ext-table { - width: 100% !important; -} - @media (max-width: 419px) { /* the selectors are build to target only the content of folder and device panels as it would "destroy" e.g. out of sync or recent changes listings */ @@ -420,12 +472,18 @@ ul.three-columns li, ul.two-columns li { width: 100%; } - /* all buttons, except panel headings, get bottom margin, as they won't fit - beside each other anymore */ + /* All buttons, except panel headings, get bottom margin, as they + won't fit beside each other anymore. Reduce footer padding to + compensate for the margin. */ .btn:not(.panel-heading), - /* this "+"-selector is needed to override some bootstrap defaults */ .btn:not(.panel-heading) + .btn:not(.panel-heading) { - margin-bottom: 1rem; + margin-bottom: 10px; + } + .panel-footer { + padding-bottom: 0; + } + .modal-footer { + padding-bottom: 5px; } } diff --git a/gui/default/assets/css/tree.css b/gui/default/assets/css/tree.css new file mode 100644 index 00000000000..b55488f4140 --- /dev/null +++ b/gui/default/assets/css/tree.css @@ -0,0 +1,58 @@ +/* +// Copyright (C) 2021 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/. + +*/ + +.fancytree-container { + cursor: pointer; + width: 100%; +} + +.fancytree-hide { + visibility: collapse; +} + +/* Node needs to be block, and expander, icon and title + inline-block to properly wrap unbreakable text. */ +.fancytree-node { + display: block; + white-space: nowrap; + /* expander 16px + icon 16px + title padding 8px */ + padding-right: 40px; +} +.fancytree-expander, +.fancytree-icon, +.fancytree-title { + display: inline-block; +} + +.fancytree-expander, +.fancytree-icon { + margin-top: 4px; + vertical-align: top; + width: 16px; +} + +.fancytree-childcounter { + background: #777; + border-radius: 10px; + border: 1px solid gray; + color: #fff; + font-size: 13px; + opacity: .75; + padding: 2px 3px; + position: relative; + right: 8px; + top: -9px; + user-select: none; +} + +.fancytree-title { + padding-left: 8px; + white-space: normal; + word-break: break-all; +} diff --git a/gui/default/index.html b/gui/default/index.html index 85868c8bab0..0f9af35d30e 100644 --- a/gui/default/index.html +++ b/gui/default/index.html @@ -23,9 +23,9 @@ + - diff --git a/gui/default/syncthing/core/syncthingController.js b/gui/default/syncthing/core/syncthingController.js index d786da04c69..ff4143fca86 100755 --- a/gui/default/syncthing/core/syncthingController.js +++ b/gui/default/syncthing/core/syncthingController.js @@ -2509,23 +2509,22 @@ angular.module('syncthing.core') } $scope.restoreVersions.tree = $("#restoreTree").fancytree({ - extensions: ["table", "filter"], + extensions: ["table", "filter", "glyph"], quicksearch: true, filter: { - autoApply: true, - counter: true, - hideExpandedCounter: true, hideExpanders: true, - highlight: true, - leavesOnly: false, - nodata: true, mode: "hide" }, + glyph: { + preset: "awesome5", + }, table: { - indentation: 20, - nodeColumnIdx: 0, + indentation: 24, }, - debugLevel: 2, + // Set to '1' to silence errors after pressing arrow keys on file nodes. + // Happens on the official option cofiguration from the developer's site + // too, so probably a bug? + debugLevel: 1, source: buildTree($scope.restoreVersions.versions), renderColumns: function (event, data) { // Case insensitive sort with folders on top. @@ -2540,9 +2539,9 @@ angular.module('syncthing.core') $tdList = $(node.tr).find(">td"), template; if (node.folder) { - template = '
    '; + template = '
    '; } else { - template = '
    '; + template = '
    '; } var scope = $rootScope.$new(true); @@ -2601,7 +2600,6 @@ angular.module('syncthing.core') timePicker: true, timePicker24Hour: true, timePickerSeconds: true, - autoUpdateInput: true, opens: "left", drops: "up", startDate: minDate, diff --git a/gui/default/syncthing/folder/restoreVersionsMassActions.html b/gui/default/syncthing/folder/restoreVersionsMassActions.html index 4dfba00f93a..eecc313daef 100644 --- a/gui/default/syncthing/folder/restoreVersionsMassActions.html +++ b/gui/default/syncthing/folder/restoreVersionsMassActions.html @@ -1,4 +1,4 @@ -
    +