From 9be07de7c6466cbb6d59f7d3ef230087874bd612 Mon Sep 17 00:00:00 2001 From: tomasz1986 Date: Sat, 13 Feb 2021 02:32:25 +0900 Subject: [PATCH 01/15] gui: Disable Cleanup Interval with External File Versioning as unsupported (#7360) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As for right now, the External File Versioning does not support Cleanup Interval. Therefore, the option should no be available at all when using it. Ref: https://forum.syncthing.net/t/16346 Signed-off-by: Tomasz Wilczyński --- gui/default/syncthing/folder/editFolderModalView.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/default/syncthing/folder/editFolderModalView.html b/gui/default/syncthing/folder/editFolderModalView.html index 087b7ad6f..3ed21392b 100644 --- a/gui/default/syncthing/folder/editFolderModalView.html +++ b/gui/default/syncthing/folder/editFolderModalView.html @@ -146,7 +146,7 @@ The path cannot be blank.

-
+
From f5590c33459a24e4eb8448ae2d6aa648126e8543 Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Fri, 12 Feb 2021 20:30:51 +0100 Subject: [PATCH 02/15] lib/versioner: Improve error messages (fixes #7354) (#7357) --- lib/api/api.go | 10 +++++++++- lib/api/mocked_model_test.go | 2 +- lib/model/model.go | 8 ++++---- lib/model/model_test.go | 3 ++- lib/versioner/external.go | 10 +++++++--- lib/versioner/util.go | 4 ++-- lib/versioner/versioner.go | 34 +++++++++++++++++++++++++++++++++- 7 files changed, 58 insertions(+), 13 deletions(-) diff --git a/lib/api/api.go b/lib/api/api.go index 7565d0e14..4313d7702 100644 --- a/lib/api/api.go +++ b/lib/api/api.go @@ -1545,7 +1545,7 @@ func (s *service) postFolderVersionsRestore(w http.ResponseWriter, r *http.Reque http.Error(w, err.Error(), 500) return } - sendJSON(w, ferr) + sendJSON(w, errorStringMap(ferr)) } func (s *service) getFolderErrors(w http.ResponseWriter, r *http.Request) { @@ -1839,6 +1839,14 @@ func shouldRegenerateCertificate(cert tls.Certificate) error { return nil } +func errorStringMap(errs map[string]error) map[string]*string { + out := make(map[string]*string, len(errs)) + for s, e := range errs { + out[s] = errorString(e) + } + return out +} + func errorString(err error) *string { if err != nil { msg := err.Error() diff --git a/lib/api/mocked_model_test.go b/lib/api/mocked_model_test.go index f38f16f76..6048aaadf 100644 --- a/lib/api/mocked_model_test.go +++ b/lib/api/mocked_model_test.go @@ -96,7 +96,7 @@ func (m *mockedModel) GetFolderVersions(folder string) (map[string][]versioner.F return nil, nil } -func (m *mockedModel) RestoreFolderVersions(folder string, versions map[string]time.Time) (map[string]string, error) { +func (m *mockedModel) RestoreFolderVersions(folder string, versions map[string]time.Time) (map[string]error, error) { return nil, nil } diff --git a/lib/model/model.go b/lib/model/model.go index 2d61ff313..694f7588a 100644 --- a/lib/model/model.go +++ b/lib/model/model.go @@ -88,7 +88,7 @@ type Model interface { SetIgnores(folder string, content []string) error GetFolderVersions(folder string) (map[string][]versioner.FileVersion, error) - RestoreFolderVersions(folder string, versions map[string]time.Time) (map[string]string, error) + RestoreFolderVersions(folder string, versions map[string]time.Time) (map[string]error, error) DBSnapshot(folder string) (*db.Snapshot, error) NeedFolderFiles(folder string, page, perpage int) ([]db.FileInfoTruncated, []db.FileInfoTruncated, []db.FileInfoTruncated, error) @@ -2624,7 +2624,7 @@ func (m *model) GetFolderVersions(folder string) (map[string][]versioner.FileVer return ver.GetVersions() } -func (m *model) RestoreFolderVersions(folder string, versions map[string]time.Time) (map[string]string, error) { +func (m *model) RestoreFolderVersions(folder string, versions map[string]time.Time) (map[string]error, error) { m.fmut.RLock() err := m.checkFolderRunningLocked(folder) fcfg := m.folderCfgs[folder] @@ -2637,11 +2637,11 @@ func (m *model) RestoreFolderVersions(folder string, versions map[string]time.Ti return nil, errNoVersioner } - restoreErrors := make(map[string]string) + restoreErrors := make(map[string]error) for file, version := range versions { if err := ver.Restore(file, version); err != nil { - restoreErrors[file] = err.Error() + restoreErrors[file] = err } } diff --git a/lib/model/model_test.go b/lib/model/model_test.go index 2e6cde6c0..b7f3c830e 100644 --- a/lib/model/model_test.go +++ b/lib/model/model_test.go @@ -26,6 +26,7 @@ import ( "testing" "time" + "github.com/pkg/errors" "github.com/syncthing/syncthing/lib/config" "github.com/syncthing/syncthing/lib/db" "github.com/syncthing/syncthing/lib/db/backend" @@ -2859,7 +2860,7 @@ func TestVersionRestore(t *testing.T) { ferr, err := m.RestoreFolderVersions("default", restore) must(t, err) - if err, ok := ferr["something"]; len(ferr) > 1 || !ok || err != "cannot restore on top of a directory" { + if err, ok := ferr["something"]; len(ferr) > 1 || !ok || !errors.Is(err, versioner.ErrDirectory) { t.Fatalf("incorrect error or count: %d %s", len(ferr), ferr) } diff --git a/lib/versioner/external.go b/lib/versioner/external.go index f786f7e40..58a7ecbf9 100644 --- a/lib/versioner/external.go +++ b/lib/versioner/external.go @@ -9,6 +9,7 @@ package versioner import ( "context" "errors" + "fmt" "os" "os/exec" "runtime" @@ -64,12 +65,12 @@ func (v external) Archive(filePath string) error { l.Debugln("archiving", filePath) if v.command == "" { - return errors.New("Versioner: command is empty, please enter a valid command") + return errors.New("command is empty, please enter a valid command") } words, err := shellquote.Split(v.command) if err != nil { - return errors.New("Versioner: command is invalid: " + err.Error()) + return fmt.Errorf("command is invalid: %w", err) } context := map[string]string{ @@ -99,6 +100,9 @@ func (v external) Archive(filePath string) error { combinedOutput, err := cmd.CombinedOutput() l.Debugln("external command output:", string(combinedOutput)) if err != nil { + if eerr, ok := err.(*exec.ExitError); ok && len(eerr.Stderr) > 0 { + return fmt.Errorf("%v: %v", err, string(eerr.Stderr)) + } return err } @@ -106,7 +110,7 @@ func (v external) Archive(filePath string) error { if _, err = v.filesystem.Lstat(filePath); fs.IsNotExist(err) { return nil } - return errors.New("Versioner: file was not removed by external script") + return errors.New("file was not removed by external script") } func (v external) GetVersions() (map[string][]FileVersion, error) { diff --git a/lib/versioner/util.go b/lib/versioner/util.go index 3dc7cbec5..a3e9e601d 100644 --- a/lib/versioner/util.go +++ b/lib/versioner/util.go @@ -23,7 +23,7 @@ import ( ) var ( - errDirectory = errors.New("cannot restore on top of a directory") + ErrDirectory = errors.New("cannot restore on top of a directory") errNotFound = errors.New("version not found") errFileAlreadyExists = errors.New("file already exists") ) @@ -196,7 +196,7 @@ func restoreFile(method fs.CopyRangeMethod, src, dst fs.Filesystem, filePath str if info, err := dst.Lstat(filePath); err == nil { switch { case info.IsDir(): - return errDirectory + return ErrDirectory case info.IsSymlink(): // Remove existing symlinks (as we don't want to archive them) if err := dst.Remove(filePath); err != nil { diff --git a/lib/versioner/versioner.go b/lib/versioner/versioner.go index 372488294..5c96c3803 100644 --- a/lib/versioner/versioner.go +++ b/lib/versioner/versioner.go @@ -47,5 +47,37 @@ func New(cfg config.FolderConfiguration) (Versioner, error) { return nil, fmt.Errorf("requested versioning type %q does not exist", cfg.Type) } - return fac(cfg), nil + return &versionerWithErrorContext{ + Versioner: fac(cfg), + vtype: cfg.Versioning.Type, + }, nil +} + +type versionerWithErrorContext struct { + Versioner + vtype string +} + +func (v *versionerWithErrorContext) wrapError(err error, op string) error { + if err != nil { + return fmt.Errorf("%s versioner: %v: %w", v.vtype, op, err) + } + return nil +} + +func (v *versionerWithErrorContext) Archive(filePath string) error { + return v.wrapError(v.Versioner.Archive(filePath), "archive") +} + +func (v *versionerWithErrorContext) GetVersions() (map[string][]FileVersion, error) { + versions, err := v.Versioner.GetVersions() + return versions, v.wrapError(err, "get versions") +} + +func (v *versionerWithErrorContext) Restore(filePath string, versionTime time.Time) error { + return v.wrapError(v.Versioner.Restore(filePath, versionTime), "restore") +} + +func (v *versionerWithErrorContext) Clean(ctx context.Context) error { + return v.wrapError(v.Versioner.Clean(ctx), "clean") } From 82f190285a02510600cbb7eeb2674e43f18e9173 Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Sun, 14 Feb 2021 09:54:49 +0100 Subject: [PATCH 03/15] gui: Fix setting external versioning command (fixes #7361) (#7362) --- gui/default/syncthing/core/syncthingController.js | 2 +- gui/default/syncthing/folder/editFolderModalView.html | 2 +- gui/default/untrusted/syncthing/core/syncthingController.js | 2 +- gui/default/untrusted/syncthing/folder/editFolderModalView.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gui/default/syncthing/core/syncthingController.js b/gui/default/syncthing/core/syncthingController.js index 7dbd09a1e..135d6dcc5 100755 --- a/gui/default/syncthing/core/syncthingController.js +++ b/gui/default/syncthing/core/syncthingController.js @@ -1916,7 +1916,7 @@ angular.module('syncthing.core') break; case "external": $scope.currentFolder._guiVersioning.selector = "external"; - $scope.currentFolder.externalCommand = currentVersioning.params.command; + $scope.currentFolder._guiVersioning.externalCommand = currentVersioning.params.command; break; } }; diff --git a/gui/default/syncthing/folder/editFolderModalView.html b/gui/default/syncthing/folder/editFolderModalView.html index 3ed21392b..560574fd9 100644 --- a/gui/default/syncthing/folder/editFolderModalView.html +++ b/gui/default/syncthing/folder/editFolderModalView.html @@ -140,7 +140,7 @@

An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.

- +

See external versioning help for supported templated command line parameters. The path cannot be blank. diff --git a/gui/default/untrusted/syncthing/core/syncthingController.js b/gui/default/untrusted/syncthing/core/syncthingController.js index cf1756602..1f57e5db9 100755 --- a/gui/default/untrusted/syncthing/core/syncthingController.js +++ b/gui/default/untrusted/syncthing/core/syncthingController.js @@ -1933,7 +1933,7 @@ angular.module('syncthing.core') break; case "external": $scope.currentFolder._guiVersioning.selector = "external"; - $scope.currentFolder.externalCommand = currentVersioning.params.command; + $scope.currentFolder._guiVersioning.externalCommand = currentVersioning.params.command; break; } }; diff --git a/gui/default/untrusted/syncthing/folder/editFolderModalView.html b/gui/default/untrusted/syncthing/folder/editFolderModalView.html index 1aca62c8e..440171d78 100644 --- a/gui/default/untrusted/syncthing/folder/editFolderModalView.html +++ b/gui/default/untrusted/syncthing/folder/editFolderModalView.html @@ -128,7 +128,7 @@

An external command handles the versioning. It has to remove the file from the shared folder. If the path to the application contains spaces, it should be quoted.

- +

See external versioning help for supported templated command line parameters. The path cannot be blank. From 8bd67f72dd26831cbeca2572a53bf16ce672d955 Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Wed, 17 Feb 2021 07:45:43 +0100 Subject: [PATCH 04/15] gui, man, authors: Update docs, translations, and contributors --- AUTHORS | 1 + gui/default/assets/lang/lang-bg.json | 6 + gui/default/assets/lang/lang-ca@valencia.json | 6 + gui/default/assets/lang/lang-cs.json | 6 + gui/default/assets/lang/lang-da.json | 6 + gui/default/assets/lang/lang-de.json | 6 + gui/default/assets/lang/lang-el.json | 6 + gui/default/assets/lang/lang-en-AU.json | 6 + gui/default/assets/lang/lang-en-GB.json | 6 + gui/default/assets/lang/lang-eo.json | 6 + gui/default/assets/lang/lang-es-ES.json | 110 +++++----- gui/default/assets/lang/lang-es.json | 146 +++++++------ gui/default/assets/lang/lang-eu.json | 6 + gui/default/assets/lang/lang-fi.json | 6 + gui/default/assets/lang/lang-fr.json | 8 +- gui/default/assets/lang/lang-fy.json | 6 + gui/default/assets/lang/lang-hu.json | 6 + gui/default/assets/lang/lang-it.json | 6 + gui/default/assets/lang/lang-ja.json | 6 + gui/default/assets/lang/lang-ko-KR.json | 6 + gui/default/assets/lang/lang-lt.json | 6 + gui/default/assets/lang/lang-nb.json | 6 + gui/default/assets/lang/lang-nl.json | 6 + gui/default/assets/lang/lang-pl.json | 6 + gui/default/assets/lang/lang-pt-BR.json | 6 + gui/default/assets/lang/lang-pt-PT.json | 6 + gui/default/assets/lang/lang-ru.json | 6 + gui/default/assets/lang/lang-sk.json | 6 + gui/default/assets/lang/lang-sv.json | 6 + gui/default/assets/lang/lang-tr.json | 6 + gui/default/assets/lang/lang-uk.json | 6 + gui/default/assets/lang/lang-zh-CN.json | 6 + gui/default/assets/lang/lang-zh-HK.json | 6 + gui/default/assets/lang/lang-zh-TW.json | 204 +++++++++--------- .../syncthing/core/aboutModalView.html | 2 +- man/stdiscosrv.1 | 2 +- man/strelaysrv.1 | 2 +- man/syncthing-bep.7 | 2 +- man/syncthing-config.5 | 10 +- 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 | 27 +-- man/syncthing.1 | 2 +- 51 files changed, 460 insertions(+), 250 deletions(-) diff --git a/AUTHORS b/AUTHORS index 81f1114c8..21fe9f863 100644 --- a/AUTHORS +++ b/AUTHORS @@ -128,6 +128,7 @@ Jaya Chithra (jayachithra) jelle van der Waa Jens Diemer (jedie) Jerry Jacobs (xor-gate) +Jesse Lucas Jochen Voss (seehuhn) Johan Andersson Johan Vromans (sciurius) diff --git a/gui/default/assets/lang/lang-bg.json b/gui/default/assets/lang/lang-bg.json index e2ccabab4..894a4a67f 100644 --- a/gui/default/assets/lang/lang-bg.json +++ b/gui/default/assets/lang/lang-bg.json @@ -61,7 +61,11 @@ "Currently Shared With Devices": "Currently Shared With Devices", "Danger!": "Опасност!", "Debugging Facilities": "Дебъг функционалност", + "Default Configuration": "Default Configuration", + "Default Device": "Default Device", + "Default Folder": "Default Folder", "Default Folder Path": "Път до папка по подразбиране", + "Defaults": "Defaults", "Delete Unexpected Items": "Delete Unexpected Items", "Deleted": "Изтрито", "Deselect All": "Никое", @@ -97,7 +101,9 @@ "Downloading": "Изтегляне", "Edit": "Промени", "Edit Device": "Edit Device", + "Edit Device Defaults": "Edit Device Defaults", "Edit Folder": "Edit Folder", + "Edit Folder Defaults": "Edit Folder Defaults", "Editing {%path%}.": "Променяне на {{path}}.", "Enable Crash Reporting": "Enable Crash Reporting", "Enable NAT traversal": "Разреши NAT traversal", diff --git a/gui/default/assets/lang/lang-ca@valencia.json b/gui/default/assets/lang/lang-ca@valencia.json index 4b3423442..0c31d25a0 100644 --- a/gui/default/assets/lang/lang-ca@valencia.json +++ b/gui/default/assets/lang/lang-ca@valencia.json @@ -61,7 +61,11 @@ "Currently Shared With Devices": "Currently Shared With Devices", "Danger!": "Perill!", "Debugging Facilities": "Utilitats de Depuració", + "Default Configuration": "Default Configuration", + "Default Device": "Default Device", + "Default Folder": "Default Folder", "Default Folder Path": "Carpeta de la Ruta per Defecte", + "Defaults": "Defaults", "Delete Unexpected Items": "Delete Unexpected Items", "Deleted": "Esborrat", "Deselect All": "Anul·lar tota la selecció", @@ -97,7 +101,9 @@ "Downloading": "Descarregant", "Edit": "Editar", "Edit Device": "Edit Device", + "Edit Device Defaults": "Edit Device Defaults", "Edit Folder": "Edit Folder", + "Edit Folder Defaults": "Edit Folder Defaults", "Editing {%path%}.": "Editant {{path}}.", "Enable Crash Reporting": "Enable Crash Reporting", "Enable NAT traversal": "Permetre NAT transversal", diff --git a/gui/default/assets/lang/lang-cs.json b/gui/default/assets/lang/lang-cs.json index 0049dcf95..b0c060c11 100644 --- a/gui/default/assets/lang/lang-cs.json +++ b/gui/default/assets/lang/lang-cs.json @@ -61,7 +61,11 @@ "Currently Shared With Devices": "Aktuálně sdíleno se zařízeními", "Danger!": "Nebezpečí!", "Debugging Facilities": "Nástroje pro ladění", + "Default Configuration": "Default Configuration", + "Default Device": "Default Device", + "Default Folder": "Default Folder", "Default Folder Path": "Popis umístění výchozí složky", + "Defaults": "Defaults", "Delete Unexpected Items": "Delete Unexpected Items", "Deleted": "Smazáno", "Deselect All": "Zrušit výběr všeho", @@ -97,7 +101,9 @@ "Downloading": "Stahuje se", "Edit": "Upravit", "Edit Device": "Upravit zařízení", + "Edit Device Defaults": "Edit Device Defaults", "Edit Folder": "Upravit složku", + "Edit Folder Defaults": "Edit Folder Defaults", "Editing {%path%}.": "Upravuje se {{path}}.", "Enable Crash Reporting": "Povolit hlášení pádů", "Enable NAT traversal": "Povolit průchod skrze NAT překlad", diff --git a/gui/default/assets/lang/lang-da.json b/gui/default/assets/lang/lang-da.json index 817c3b02e..172f6cd04 100644 --- a/gui/default/assets/lang/lang-da.json +++ b/gui/default/assets/lang/lang-da.json @@ -61,7 +61,11 @@ "Currently Shared With Devices": "i øjeblikket delt med enheder", "Danger!": "Fare!", "Debugging Facilities": "Faciliteter til fejlretning", + "Default Configuration": "Default Configuration", + "Default Device": "Default Device", + "Default Folder": "Default Folder", "Default Folder Path": "Standardmappesti", + "Defaults": "Defaults", "Delete Unexpected Items": "Slet ikke forventede elementer ", "Deleted": "Slettet", "Deselect All": "Fravælg alle", @@ -97,7 +101,9 @@ "Downloading": "Downloader", "Edit": "Redigér", "Edit Device": "Redigere enhed", + "Edit Device Defaults": "Edit Device Defaults", "Edit Folder": "Redigere mappe", + "Edit Folder Defaults": "Edit Folder Defaults", "Editing {%path%}.": "Redigerer {{path}}.", "Enable Crash Reporting": "Aktivere nedbrud rapportering", "Enable NAT traversal": "Aktivér NAT-traversering", diff --git a/gui/default/assets/lang/lang-de.json b/gui/default/assets/lang/lang-de.json index a3fd4920c..6ad58f1e2 100644 --- a/gui/default/assets/lang/lang-de.json +++ b/gui/default/assets/lang/lang-de.json @@ -61,7 +61,11 @@ "Currently Shared With Devices": "Derzeit mit Geräten geteilt", "Danger!": "Achtung!", "Debugging Facilities": "Debugging-Möglichkeiten", + "Default Configuration": "Default Configuration", + "Default Device": "Default Device", + "Default Folder": "Default Folder", "Default Folder Path": "Standardmäßiger Ordnerpfad", + "Defaults": "Defaults", "Delete Unexpected Items": "Unerwartete Elemente löschen", "Deleted": "Gelöscht", "Deselect All": "Alle abwählen", @@ -97,7 +101,9 @@ "Downloading": "Lädt herunter", "Edit": "Bearbeiten", "Edit Device": "Gerät bearbeiten", + "Edit Device Defaults": "Edit Device Defaults", "Edit Folder": "Ordner bearbeiten", + "Edit Folder Defaults": "Edit Folder Defaults", "Editing {%path%}.": "Bearbeite {{path}}.", "Enable Crash Reporting": "Absturzmeldung aktivieren", "Enable NAT traversal": "NAT-Durchdringung aktivieren", diff --git a/gui/default/assets/lang/lang-el.json b/gui/default/assets/lang/lang-el.json index d20d758c0..9de2f0a54 100644 --- a/gui/default/assets/lang/lang-el.json +++ b/gui/default/assets/lang/lang-el.json @@ -61,7 +61,11 @@ "Currently Shared With Devices": "Διαμοιράζεται με αυτές τις συσκευές", "Danger!": "Προσοχή!", "Debugging Facilities": "Εργαλεία αποσφαλμάτωσης", + "Default Configuration": "Default Configuration", + "Default Device": "Default Device", + "Default Folder": "Default Folder", "Default Folder Path": "Προκαθορισμένη διαδρομή φακέλων", + "Defaults": "Defaults", "Delete Unexpected Items": "Delete Unexpected Items", "Deleted": "Διαγραμμένα", "Deselect All": "Αποεπιλογή όλων", @@ -97,7 +101,9 @@ "Downloading": "Λήψη", "Edit": "Επεξεργασία", "Edit Device": "Επεξεργασία συσκευής", + "Edit Device Defaults": "Edit Device Defaults", "Edit Folder": "Επεξεργασία φακέλου", + "Edit Folder Defaults": "Edit Folder Defaults", "Editing {%path%}.": "Επεξεργασία του {{path}}.", "Enable Crash Reporting": "Ενεργοποίηση αναφοράς σφαλμάτων", "Enable NAT traversal": "Ενεργοποίηση διάσχισης NAT", diff --git a/gui/default/assets/lang/lang-en-AU.json b/gui/default/assets/lang/lang-en-AU.json index 7da2c09a0..804ef130f 100644 --- a/gui/default/assets/lang/lang-en-AU.json +++ b/gui/default/assets/lang/lang-en-AU.json @@ -61,7 +61,11 @@ "Currently Shared With Devices": "Currently Shared With Devices", "Danger!": "Danger!", "Debugging Facilities": "Debugging Facilities", + "Default Configuration": "Default Configuration", + "Default Device": "Default Device", + "Default Folder": "Default Folder", "Default Folder Path": "Default Folder Path", + "Defaults": "Defaults", "Delete Unexpected Items": "Delete Unexpected Items", "Deleted": "Deleted", "Deselect All": "Deselect All", @@ -97,7 +101,9 @@ "Downloading": "Downloading", "Edit": "Edit", "Edit Device": "Edit Device", + "Edit Device Defaults": "Edit Device Defaults", "Edit Folder": "Edit Folder", + "Edit Folder Defaults": "Edit Folder Defaults", "Editing {%path%}.": "Editing {{path}}.", "Enable Crash Reporting": "Enable Crash Reporting", "Enable NAT traversal": "Enable NAT traversal", diff --git a/gui/default/assets/lang/lang-en-GB.json b/gui/default/assets/lang/lang-en-GB.json index 47b6a125e..f1887e68f 100644 --- a/gui/default/assets/lang/lang-en-GB.json +++ b/gui/default/assets/lang/lang-en-GB.json @@ -61,7 +61,11 @@ "Currently Shared With Devices": "Currently Shared With Devices", "Danger!": "Danger!", "Debugging Facilities": "Debugging Facilities", + "Default Configuration": "Default Configuration", + "Default Device": "Default Device", + "Default Folder": "Default Folder", "Default Folder Path": "Default Folder Path", + "Defaults": "Defaults", "Delete Unexpected Items": "Delete Unexpected Items", "Deleted": "Deleted", "Deselect All": "Deselect All", @@ -97,7 +101,9 @@ "Downloading": "Downloading", "Edit": "Edit", "Edit Device": "Edit Device", + "Edit Device Defaults": "Edit Device Defaults", "Edit Folder": "Edit Folder", + "Edit Folder Defaults": "Edit Folder Defaults", "Editing {%path%}.": "Editing {{path}}.", "Enable Crash Reporting": "Enable Crash Reporting", "Enable NAT traversal": "Enable NAT traversal", diff --git a/gui/default/assets/lang/lang-eo.json b/gui/default/assets/lang/lang-eo.json index 5e4aef1d0..acf71d09f 100644 --- a/gui/default/assets/lang/lang-eo.json +++ b/gui/default/assets/lang/lang-eo.json @@ -61,7 +61,11 @@ "Currently Shared With Devices": "Nune komunigita kun aparatoj", "Danger!": "Danĝero!", "Debugging Facilities": "Elpurigadiloj", + "Default Configuration": "Default Configuration", + "Default Device": "Default Device", + "Default Folder": "Default Folder", "Default Folder Path": "Defaŭlta Dosieruja Vojo", + "Defaults": "Defaults", "Delete Unexpected Items": "Delete Unexpected Items", "Deleted": "Forigita", "Deselect All": "Malelekti Ĉiujn", @@ -97,7 +101,9 @@ "Downloading": "Elŝutado", "Edit": "Redakti", "Edit Device": "Edit Device", + "Edit Device Defaults": "Edit Device Defaults", "Edit Folder": "Edit Folder", + "Edit Folder Defaults": "Edit Folder Defaults", "Editing {%path%}.": "Redaktado de {{path}}.", "Enable Crash Reporting": "Ŝalti raportadon de kraŝoj", "Enable NAT traversal": "Ŝaltu trairan NAT", diff --git a/gui/default/assets/lang/lang-es-ES.json b/gui/default/assets/lang/lang-es-ES.json index eb8474966..a520c1cf7 100644 --- a/gui/default/assets/lang/lang-es-ES.json +++ b/gui/default/assets/lang/lang-es-ES.json @@ -18,18 +18,18 @@ "Advanced": "Avanzado", "Advanced Configuration": "Configuración Avanzada", "All Data": "Todos los datos", - "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.": "Todos las carpetas compartidas con este equipo deben ser protegidas con una contraseña, de manera que todos los datos enviados sean ilegibles sin la contraseña dada.", "Allow Anonymous Usage Reporting?": "¿Deseas permitir el envío anónimo de informes de uso?", "Allowed Networks": "Redes permitidas", "Alphabetic": "Alfabético", "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 permanently delete all these files?": "Are you sure you want to permanently delete all these files?", + "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 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 upgrade?": "Are you sure you want to upgrade?", + "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", "Automatic upgrade now offers the choice between stable releases and release candidates.": "Ahora la actualización automática permite elegir entre versiones estables o versiones candidatas.", @@ -41,15 +41,15 @@ "Bugs": "Errores", "Changelog": "Registro de cambios", "Clean out after": "Limpiar tras", - "Cleaning Versions": "Cleaning Versions", - "Cleanup Interval": "Cleanup Interval", + "Cleaning Versions": "Limpiando Versiones", + "Cleanup Interval": "Intervalo de Limpieza", "Click to see discovery failures": "Clica para ver fallos de descubrimiento.", "Close": "Cerrar", "Command": "Acción", "Comment, when used at the start of a line": "Comentar, cuando se usa al comienzo de una línea", "Compression": "Compresión", "Configured": "Configurado", - "Connected (Unused)": "Connected (Unused)", + "Connected (Unused)": "Conectado (Sin uso)", "Connection Error": "Error de conexión", "Connection Type": "Tipo de conexión", "Connections": "Conexiones", @@ -58,21 +58,25 @@ "Copied from original": "Copiado del original", "Copyright © 2014-2019 the following Contributors:": "Copyright © 2014-2019 los siguientes Colaboradores:", "Creating ignore patterns, overwriting an existing file at {%path%}.": "Crear patrones a ignorar, sobreescribiendo un fichero existente en {{path}}.", - "Currently Shared With Devices": "Currently Shared With Devices", + "Currently Shared With Devices": "Actualmente Compartida Con Los Equipos", "Danger!": "¡Peligro!", "Debugging Facilities": "Ayudas a la depuración", + "Default Configuration": "Configuración Por Defecto", + "Default Device": "Equipo Por Defecto", + "Default Folder": "Carpeta Por Defecto", "Default Folder Path": "Ruta de la carpeta por defecto", - "Delete Unexpected Items": "Delete Unexpected Items", + "Defaults": "Valores Por Defecto", + "Delete Unexpected Items": "Borrar Elementos Inesperados", "Deleted": "Eliminado", "Deselect All": "Deseleccionar Todo", - "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.": "Deseleccione los equipos con los cuales dejar de compartir esta carpeta.", + "Deselect folders to stop sharing with this device.": "Deseleccione las carpetas para dejar de compartir con este equipo.", "Device": "Dispositivo", "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "El dispositivo \"{{name}}\" ({{device}} en la dirección {{address}}) quiere conectarse. Añadir nuevo dispositivo?", "Device ID": "ID del Dispositivo", "Device Identification": "Identificación del Dispositivo", "Device Name": "Nombre del Dispositivo", - "Device is untrusted, enter encryption password": "Device is untrusted, enter encryption password", + "Device is untrusted, enter encryption password": "Se desconfía del equipo, ingrese la contraseña de cifrado.", "Device rate limits": "Límites de la tasa del dispositivo", "Device that last modified the item": "Último dispositivo que cambió el objeto", "Devices": "Dispositivos", @@ -81,10 +85,10 @@ "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).": "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).": "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).", "Discard": "Descartar", "Disconnected": "Desconectado", - "Disconnected (Unused)": "Disconnected (Unused)", + "Disconnected (Unused)": "Desconectado (Sin uso)", "Discovered": "Descubierto", "Discovery": "Descubrimiento", "Discovery Failures": "Fallos de Descubrimiento", @@ -96,8 +100,10 @@ "Downloaded": "Descargado", "Downloading": "Descargando", "Edit": "Editar", - "Edit Device": "Edit Device", - "Edit Folder": "Edit Folder", + "Edit Device": "Editar Equipo", + "Edit Device Defaults": "Editar Valores Por Defecto del Equipo", + "Edit Folder": "Editar Carpeta", + "Edit Folder Defaults": "Editar Valores Por Defecto de la Carpeta", "Editing {%path%}.": "Editando {{path}}.", "Enable Crash Reporting": "Permitir informe de errores", "Enable NAT traversal": "Permitir NAT transversal", @@ -107,7 +113,7 @@ "Enter a non-privileged port number (1024 - 65535).": "Introduce un puerto sin privilegios (1024 - 65535).", "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Introducir direcciones separadas por coma (\"tcp://ip:port\", \"tcp://host:port\") o dinámicas para realizar el descubrimiento automático de la dirección.", "Enter ignore patterns, one per line.": "Introducir patrones a ignorar, uno por línea.", - "Enter up to three octal digits.": "Enter up to three octal digits.", + "Enter up to three octal digits.": "Ingrese hasta tres dígitos octales.", "Error": "Error", "External File Versioning": "Versionado externo de fichero", "Failed Items": "Elementos fallidos", @@ -127,14 +133,14 @@ "Folder Label": "Etiqueta de la Carpeta", "Folder Path": "Ruta de la carpeta", "Folder Type": "Tipo de 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.": "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%}\" 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.", "Full Rescan Interval (s)": "Intervalo para el reescaneo completo (s)", "GUI": "GUI", "GUI Authentication Password": "Password de la Interfaz Gráfica de Usuario (GUI)", "GUI Authentication User": "Autentificación de usuario de la Interfaz Gráfica de Usuario (GUI)", - "GUI Authentication: Set User and Password": "GUI Authentication: Set User and Password", + "GUI Authentication: Set User and Password": "Autenticación de la GUI: Establezca el Usuario y la Contraseña.", "GUI Listen Address": "Dirección de Escucha del GUI.", "GUI Theme": "Tema GUI", "General": "General", @@ -145,8 +151,8 @@ "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.", - "If untrusted, enter encryption password": "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": "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.", "Ignore": "Ignorar", "Ignore Patterns": "Patrones a ignorar", "Ignore Permissions": "Permisos a ignorar", @@ -169,7 +175,7 @@ "Listeners": "Oyentes", "Loading data...": "Cargando datos...", "Loading...": "Cargando...", - "Local Additions": "Local Additions", + "Local Additions": "Adiciones Locales", "Local Discovery": "Descubrimiento local", "Local State": "Estado local", "Local State (Total)": "Estado Local (Total)", @@ -194,7 +200,7 @@ "No File Versioning": "Sin versionado de fichero", "No files will be deleted as a result of this operation.": "No se borraron ficheros como resultado de esta operación", "No upgrades": "Sin actualizaciones", - "Not shared": "Not shared", + "Not shared": "No compartida", "Notice": "Aviso", "OK": "OK", "Off": "Desconectar", @@ -212,7 +218,7 @@ "Pause": "Pausar", "Pause All": "Pausar todo", "Paused": "Pausado", - "Paused (Unused)": "Paused (Unused)", + "Paused (Unused)": "Pausado(a) (Sin uso)", "Pending changes": "Cambios pendientes", "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", @@ -223,20 +229,20 @@ "Please wait": "Por favor, espere", "Prefix indicating that the file can be deleted if preventing directory removal": "El prefijo indica que el fichero puede ser borrado si se previene la eliminación de directorios", "Prefix indicating that the pattern should be matched without case sensitivity": "El prefijo indica que el patrón se comparará sin tener en cuenta las mayúsculas", - "Preparing to Sync": "Preparing to Sync", + "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": "Receive Encrypted", + "Receive Encrypted": "Recibir Cifrado", "Receive Only": "Solo recibir", - "Received data is already encrypted": "Received data is already encrypted", + "Received data is already encrypted": "Los datos recibidos ya están cifrados", "Recent Changes": "Cambios recientes", "Reduced by ignore patterns": "Reducido por patrones de ignorar", "Release Notes": "Notas de la versión", "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Las versiones candidatas contienen las últimas funcionalidades y correcciones. Son similares a las tradicionales versiones bisemanales de Syncthing.", "Remote Devices": "Otros dispositivos", - "Remote GUI": "Remote GUI", + "Remote GUI": "GUI Remota", "Remove": "Eliminar", "Remove Device": "Quitar dispositivo", "Remove Folder": "Quitar carpeta", @@ -259,8 +265,8 @@ "See external versioning help for supported templated command line parameters.": "Consultar la ayuda externa del versionado para ver las plantillas de los parámetros de línea de comandos", "Select All": "Seleccionar Todo", "Select a version": "Selecciona una versión", - "Select additional devices to share this folder with.": "Select additional devices to share this folder with.", - "Select additional folders to share with this device.": "Select additional folders to share with this device.", + "Select additional devices to share this folder with.": "Seleccione equipos adicionales con los cuales compartir esta carpeta", + "Select additional folders to share with this device.": "Seleccione carpetas adicionales para compartir con este equipo.", "Select latest version": "Selecciona la última versión", "Select oldest version": "Selecciona la versión más antigua", "Select the folders to share with this device.": "Selecciona las carpetas para compartir con este dispositivo.", @@ -271,7 +277,7 @@ "Share Folder": "Compartir carpeta", "Share Folders With Device": "Compartir carpetas con dispositivo", "Share this folder?": "¿Deseas compartir esta carpeta?", - "Shared Folders": "Shared Folders", + "Shared Folders": "Carpetas Compartidas", "Shared With": "Compartir con", "Sharing": "Compartiendo", "Show ID": "Mostrar ID", @@ -294,7 +300,7 @@ "Start Browser": "Iniciar el navegador", "Statistics": "Estadísticas", "Stopped": "Detenido", - "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.": "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.", + "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.": "Solo almacena y sincroniza datos cifrados. Las carpetas de todos los equipos conectados tienen que ser configuradas con la misma contraseña o ser del tipo \"{{receiveEncrypted}}\" también.", "Support": "Forum", "Support Bundle": "Lote de Soporte", "Sync Protocol Listen Addresses": "Direcciones de escucha del protocolo de sincronización", @@ -309,10 +315,10 @@ "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing tiene problemas para procesar tu solicitud. Por favor, actualiza la página o reinicia Syncthing si el problema persiste.", "Take me back": "Llévame atrás", "The GUI address is overridden by startup options. Changes here will not take effect while the override is in place.": "La dirección del GUI es sobreescrita por las opciones de arranque. Los cambios de aquí no tendrán efecto mientras la sobreescritura esté activa.", - "The Syncthing Authors": "The Syncthing Authors", + "The Syncthing Authors": "Los Autores de Syncthing", "The Syncthing admin interface is configured to allow remote access without a password.": "El panel de administración de Syncthing está configurado para permitir el acceso remoto sin contraseña.", "The aggregated statistics are publicly available at the URL below.": "Las estadísticas agragadas están disponibles públicamente en la URL de abajo.", - "The cleanup interval cannot be blank.": "The cleanup interval cannot be blank.", + "The cleanup interval cannot be blank.": "El intervalo de limpieza no puede ser nulo.", "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "La configuración ha sido grabada pero no activada. Syncthing debe reiniciarse para activar la nueva configuración.", "The device ID cannot be blank.": "La ID del dispositivo no puede estar vacía.", "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).": "El ID del dispositivo que hay que introducir aquí se puede encontrar en el diálogo \"Acciones > Mostrar ID\" en el otro dispositivo. Los espacios y las barras son opcionales (ignorados).", @@ -324,9 +330,9 @@ "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 unexpected items were found.": "The following unexpected items were found.", - "The interval must be a positive number of seconds.": "The interval must be a positive number of seconds.", - "The interval, in seconds, for running cleanup in the versions directory. Zero to disable periodic cleaning.": "The interval, in seconds, for running cleanup in the versions directory. Zero to disable periodic cleaning.", + "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.", "The maximum age must be a number and cannot be blank.": "La edad máxima debe ser un número y no puede estar vacía.", "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "El tiempo máximo para mantener una versión en días (introducir 0 para mantener las versiones indefinidamente).", "The number of days must be a number and cannot be blank.": "El número de días debe ser un número y no puede estar en blanco.", @@ -336,8 +342,8 @@ "The path cannot be blank.": "La ruta no puede estar vacía.", "The rate limit must be a non-negative number (0: no limit)": "El límite de velocidad debe ser un número no negativo (0: sin límite)", "The rescan interval must be a non-negative number of seconds.": "El intervalo de actualización debe ser un número positivo de segundos.", - "There are no devices to share this folder with.": "There are no devices to share this folder with.", - "There are no folders to share with this device.": "There are no folders to share with this device.", + "There are no devices to share this folder with.": "No hay equipos con los cuales compartir esta carpeta.", + "There are no folders to share with this device.": "No hay carpetas para compartir con este equipo.", "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.", @@ -347,18 +353,18 @@ "Time the item was last modified": "Tiempo en el que se modificó el ítem por última vez", "Trash Can File Versioning": "Versionado de archivos de la papelera", "Type": "Tipo", - "UNIX Permissions": "UNIX Permissions", + "UNIX Permissions": "Permisos de UNIX", "Unavailable": "No disponible", "Unavailable/Disabled by administrator or maintainer": "No disponible/Desactivado por el administrador o el mantenedor", "Undecided (will prompt)": "Aún no decidido (se preguntará al usuario)", - "Unexpected Items": "Unexpected Items", - "Unexpected items have been found in this folder.": "Unexpected items have been found in this folder.", + "Unexpected Items": "Elementos Inesperados", + "Unexpected items have been found in this folder.": "Se han encontrado Elementos Inesperados en esta carpeta.", "Unignore": "Designorar", "Unknown": "Desconocido", "Unshared": "No compartido", - "Unshared Devices": "Unshared Devices", - "Unshared Folders": "Unshared Folders", - "Untrusted": "Untrusted", + "Unshared Devices": "Equipos no Compartidos", + "Unshared Folders": "Carpetas no Compartidas", + "Untrusted": "No Confiable", "Up to Date": "Actualizado", "Updated": "Actualizado", "Upgrade": "Actualizar", @@ -368,14 +374,14 @@ "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)", - "Username/Password has not been set for the GUI authentication. Please consider setting it up.": "Username/Password has not been set for the GUI authentication. Please consider setting it up.", + "Username/Password has not been set for the GUI authentication. Please consider setting it up.": "Usuario/Contraseña no establecida para la autenticación de la GUI. Por favor, considere establecerla.", "Version": "Versión", "Versions": "Versiones", "Versions Path": "Ruta de las versiones", "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Las versiones se borran automáticamente si son más antiguas que la edad máxima o exceden el número de ficheros permitidos en un intervalo.", - "Waiting to Clean": "Waiting to Clean", - "Waiting to Scan": "Waiting to Scan", - "Waiting to Sync": "Waiting to Sync", + "Waiting to Clean": "Esperando para Limpiar", + "Waiting to Scan": "Esperando para Escanear", + "Waiting to Sync": "Esperando para Sincronizar", "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}}\".", @@ -394,14 +400,14 @@ "You have no ignored folders.": "No tienes carpetas ignoradas.", "You have unsaved changes. Do you really want to discard them?": "Tienes cambios sin guardar. ¿Quieres descartarlos?", "You must keep at least one version.": "Debes mantener al menos una versión.", - "You should never add or change anything locally in a \"{%receiveEncrypted%}\" folder.": "You should never add or change anything locally in a \"{{receiveEncrypted}}\" folder.", + "You should never add or change anything locally in a \"{%receiveEncrypted%}\" folder.": "Nunca debe agregar o cambiar nada localmente en una carpeta \"{{receiveEncrypted}}\".", "days": "días", - "directories": "directories", + "directories": "directorios", "files": "archivos", "full documentation": "Documentación completa", "items": "Elementos", - "seconds": "seconds", + "seconds": "segundos", "{%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}} might reintroduce this device." + "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} puede reintroducir este equipo." } \ No newline at end of file diff --git a/gui/default/assets/lang/lang-es.json b/gui/default/assets/lang/lang-es.json index 8f8a41d85..f5de62f2f 100644 --- a/gui/default/assets/lang/lang-es.json +++ b/gui/default/assets/lang/lang-es.json @@ -18,73 +18,77 @@ "Advanced": "Avanzado", "Advanced Configuration": "Configuración Avanzada", "All Data": "Todos los datos", - "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.": "Todas las carpetas compartidas con este dispositivo deben estar protegidas por una contraseña, de forma que todos los datos enviados sean ilegibles sin la contraseña indicada.", "Allow Anonymous Usage Reporting?": "¿Deseas permitir el envío anónimo de informes de uso?", "Allowed Networks": "Redes permitidas", "Alphabetic": "Alfabético", "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 permanently delete all these files?": "Are you sure you want to permanently delete all these files?", + "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 upgrade?": "Are you sure you want to upgrade?", + "Are you sure you want to upgrade?": "¿Está seguro(a) de que desea actualizar?", "Auto Accept": "Aceptar automáticamente", - "Automatic Crash Reporting": "Automatic Crash Reporting", + "Automatic Crash Reporting": "Informe Automático de Fallos", "Automatic upgrade now offers the choice between stable releases and release candidates.": "Ahora la actualización automática permite elegir entre versiones estables o versiones candidatas.", "Automatic upgrades": "Actualizaciones automáticas", - "Automatic upgrades are always enabled for candidate releases.": "Automatic upgrades are always enabled for candidate releases.", + "Automatic upgrades are always enabled for candidate releases.": "Las actualizaciones automáticas siempre están activadas para las versiones candidatas.", "Automatically create or share folders that this device advertises at the default path.": "Crear o compartir automáticamente carpetas que este dispositivo anuncia en la ruta por defecto.", "Available debug logging facilities:": "Funciones de registro de depuración disponibles:", "Be careful!": "¡Ten cuidado!", "Bugs": "Errores", "Changelog": "Registro de cambios", "Clean out after": "Limpiar tras", - "Cleaning Versions": "Cleaning Versions", - "Cleanup Interval": "Cleanup Interval", + "Cleaning Versions": "Limpiando Versiones", + "Cleanup Interval": "Intervalo de Limpieza", "Click to see discovery failures": "Clica para ver fallos de descubrimiento.", "Close": "Cerrar", "Command": "Acción", "Comment, when used at the start of a line": "Comentar, cuando se usa al comienzo de una línea", "Compression": "Compresión", "Configured": "Configurado", - "Connected (Unused)": "Connected (Unused)", + "Connected (Unused)": "Conectado (Sin Uso)", "Connection Error": "Error de conexión", "Connection Type": "Tipo de conexión", "Connections": "Conexiones", - "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.": "Ahora está disponible en Syncthing la búsqueda continua de cambios. Se detectarán los cambios en disco y se hará un escaneado sólo en las rutas modificadas. Los beneficios son que los cambios se propagan más rápido y que se requieren menos escaneos completos.", + "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.": "Ahora está disponible en Syncthing el control de cambios continuo. Se detectarán los cambios en disco y se hará un escaneado sólo en las rutas modificadas. Los beneficios son que los cambios se propagan más rápido y que se requieren menos escaneos completos.", "Copied from elsewhere": "Copiado de otro sitio", "Copied from original": "Copiado del original", - "Copyright © 2014-2019 the following Contributors:": "Copyright © 2014-2019 the following Contributors:", + "Copyright © 2014-2019 the following Contributors:": "Derechos de Autor © 2014-2019 los siguientes colaboradores:", "Creating ignore patterns, overwriting an existing file at {%path%}.": "Crear patrones a ignorar, sobreescribiendo un fichero existente en {{path}}.", - "Currently Shared With Devices": "Currently Shared With Devices", + "Currently Shared With Devices": "Actualmente Compartida con los Dispositivos", "Danger!": "¡Peligro!", "Debugging Facilities": "Servicios de depuración", + "Default Configuration": "Configuración Predeterminada", + "Default Device": "Dispositivo Predeterminado", + "Default Folder": "Carpeta Predeterminada", "Default Folder Path": "Ruta de la carpeta por defecto", - "Delete Unexpected Items": "Delete Unexpected Items", + "Defaults": "Valores Predeterminados", + "Delete Unexpected Items": "Borrar Elementos Inesperados", "Deleted": "Eliminado", - "Deselect All": "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 All": "Deseleccionar Todo", + "Deselect devices to stop sharing this folder with.": "Deseleccionar dispositivos con los cuales dejar de compartir esta carpeta.", + "Deselect folders to stop sharing with this device.": "Deseleccionar carpetas para dejar de compartir con este dispositivo.", "Device": "Dispositivo", "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "El dispositivo \"{{name}}\" ({{device}} en la dirección {{address}}) quiere conectarse. Añadir nuevo dispositivo?", "Device ID": "ID del Dispositivo", "Device Identification": "Identificación del Dispositivo", "Device Name": "Nombre del Dispositivo", - "Device is untrusted, enter encryption password": "Device is untrusted, enter encryption password", + "Device is untrusted, enter encryption password": "El dispositivo no es de confianza, introduzca la contraseña de cifrado", "Device rate limits": "Límites de velocidad del dispositivo", "Device that last modified the item": "Dispositivo que modificó por última vez el ítem", "Devices": "Dispositivos", - "Disable Crash Reporting": "Disable Crash Reporting", + "Disable Crash Reporting": "Desactivar Informes de Fallos", "Disabled": "Deshabilitado", "Disabled periodic scanning and disabled watching for changes": "Se desactivó el escaneo periódico y se desactivó el control de cambios", "Disabled periodic scanning and enabled watching for changes": "Se desactivó el escaneo periódico y se activó el control de cambios", "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Se desactivó el escaneo periódico y falló la configuración para detectar cambios, volviendo a intentarlo cada 1 m:", - "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).", + "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).", "Discard": "Descartar", "Disconnected": "Desconectado", - "Disconnected (Unused)": "Disconnected (Unused)", + "Disconnected (Unused)": "Desconectado (Sin Uso)", "Discovered": "Descubierto", "Discovery": "Descubrimiento", "Discovery Failures": "Fallos de Descubrimiento", @@ -96,18 +100,20 @@ "Downloaded": "Descargado", "Downloading": "Descargando", "Edit": "Editar", - "Edit Device": "Edit Device", - "Edit Folder": "Edit Folder", + "Edit Device": "Editar Dispositivo", + "Edit Device Defaults": "Editar Valores Predeterminados del Dispositivo", + "Edit Folder": "Editar Carpeta", + "Edit Folder Defaults": "Editar Valores Predeterminados de la Carpeta", "Editing {%path%}.": "Editando {{path}}.", - "Enable Crash Reporting": "Enable Crash Reporting", + "Enable Crash Reporting": "Activar Informes de Fallos", "Enable NAT traversal": "Permitir NAT transversal", "Enable Relaying": "Habilitar Retransmisión", "Enabled": "Activado", "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Introduce un número no negativo (por ejemplo, \"2.35\") y selecciona una unidad. Los porcentajes son como parte del tamaño total del disco.", "Enter a non-privileged port number (1024 - 65535).": "Introduce un puerto sin privilegios (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 comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Introduzca direcciones separadas por comas (\"tcp://ip:port\", \"tcp://host:port\") o \"dynamic\" para realizar el descubrimiento automático de la dirección.", "Enter ignore patterns, one per line.": "Introducir patrones a ignorar, uno por línea.", - "Enter up to three octal digits.": "Enter up to three octal digits.", + "Enter up to three octal digits.": "Introduzca hasta tres dígitos octales.", "Error": "Error", "External File Versioning": "Versionado externo de fichero", "Failed Items": "Elementos fallidos", @@ -127,14 +133,14 @@ "Folder Label": "Etiqueta de la Carpeta", "Folder Path": "Ruta de la carpeta", "Folder Type": "Tipo de 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.": "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%}\" 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.", "Full Rescan Interval (s)": "Intervalo de rescaneo completo (s)", "GUI": "GUI", - "GUI Authentication Password": "Password de la Interfaz Gráfica de Usuario (GUI)", + "GUI Authentication Password": "Contraseña de la Interfaz Gráfica de Usuario (GUI)", "GUI Authentication User": "Autentificación de usuario de la Interfaz Gráfica de Usuario (GUI)", - "GUI Authentication: Set User and Password": "GUI Authentication: Set User and Password", + "GUI Authentication: Set User and Password": "Autenticación de la GUI: Establezca el Usuario y Contraseña", "GUI Listen Address": "Dirección de Escucha del GUI.", "GUI Theme": "Tema GUI", "General": "General", @@ -144,9 +150,9 @@ "Global State": "Estado global", "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.": "However, your current settings indicate you might not want it enabled. We have disabled automatic crash reporting for you.", - "If untrusted, enter encryption password": "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.", + "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.", + "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", @@ -165,17 +171,17 @@ "Last seen": "Visto por última vez", "Latest Change": "Último Cambio", "Learn more": "Saber más", - "Limit": "Limit", + "Limit": "Límite", "Listeners": "Oyentes", "Loading data...": "Cargando datos...", "Loading...": "Cargando...", - "Local Additions": "Local Additions", + "Local Additions": "Adiciones Locales", "Local Discovery": "Descubrimiento local", "Local State": "Estado local", "Local State (Total)": "Estado Local (Total)", - "Locally Changed Items": "Locally Changed Items", + "Locally Changed Items": "Elementos Cambiados Localmente", "Log": "Registro", - "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.": "Seguimiento del registro pausado. Desplácese hasta el final para continuar.", "Logs": "Registros", "Major Upgrade": "Actualización importante", "Mass actions": "Acción masiva", @@ -194,7 +200,7 @@ "No File Versioning": "Sin versionado de fichero", "No files will be deleted as a result of this operation.": "Ningún archivo será eliminado como resultado de esta operación.", "No upgrades": "Sin actualizaciones", - "Not shared": "Not shared", + "Not shared": "No Compartido(a)", "Notice": "Aviso", "OK": "OK", "Off": "Desconectar", @@ -212,7 +218,7 @@ "Pause": "Pausar", "Pause All": "Pausar todo", "Paused": "Pausado", - "Paused (Unused)": "Paused (Unused)", + "Paused (Unused)": "Pausado(a) (Sin Uso)", "Pending changes": "Cambios pendientes", "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", @@ -223,20 +229,20 @@ "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 pattern should be matched without case sensitivity": "Prefix indicating that the pattern should be matched without case sensitivity", - "Preparing to Sync": "Preparing to Sync", + "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": "Receive Encrypted", + "Receive Encrypted": "Recibir Encriptado(s)", "Receive Only": "Solo Recibir", - "Received data is already encrypted": "Received data is already encrypted", + "Received data is already encrypted": "Los datos recibidos ya están cifrados", "Recent Changes": "Cambios recientes", "Reduced by ignore patterns": "Reducido por patrones de ignorar", "Release Notes": "Notas de la versión", "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Las versiones candidatas contienen las últimas funcionalidades y correcciones. Son similares a las tradicionales versiones bisemanales de Syncthing.", "Remote Devices": "Otros dispositivos", - "Remote GUI": "Remote GUI", + "Remote GUI": "GUI Remota", "Remove": "Eliminar", "Remove Device": "Eliminar dispositivo", "Remove Folder": "Remover carpeta", @@ -257,10 +263,10 @@ "Scan Time Remaining": "Tiempo Restante de Escaneo", "Scanning": "Analizando", "See external versioning help for supported templated command line parameters.": "Vea la ayuda del gestor de versiones externo para los parámetros de linea de comandos que usan una plantilla.", - "Select All": "Select All", + "Select All": "Seleccionar Todo", "Select a version": "Seleccione una versión", - "Select additional devices to share this folder with.": "Select additional devices to share this folder with.", - "Select additional folders to share with this device.": "Select additional folders to share with this device.", + "Select additional devices to share this folder with.": "Seleccionar dispositivos adicionales con los cuales compartir esta carpeta.", + "Select additional folders to share with this device.": "Seleccionar carpetas adicionales para compartir con este dispositivo.", "Select latest version": "Seleccione la última versión", "Select oldest version": "Seleccione la versión más antigua", "Select the folders to share with this device.": "Selecciona las carpetas para compartir con este dispositivo.", @@ -271,7 +277,7 @@ "Share Folder": "Compartir carpeta", "Share Folders With Device": "Compartir carpetas con dispositivo", "Share this folder?": "¿Deseas compartir esta carpeta?", - "Shared Folders": "Shared Folders", + "Shared Folders": "Carpetas Compartidas", "Shared With": "Compartir con", "Sharing": "Compartiendo", "Show ID": "Mostrar ID", @@ -294,25 +300,25 @@ "Start Browser": "Iniciar el navegador", "Statistics": "Estadísticas", "Stopped": "Detenido", - "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.": "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.", + "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.": "Almacena y sincroniza sólo los datos cifrados. Las carpetas de todos los dispositivos conectados deben estar configuradas con la misma contraseña o ser también del tipo \"{{receiveEncrypted}}\".", "Support": "Forum", "Support Bundle": "Paquete de Soporte", "Sync Protocol Listen Addresses": "Direcciones de escucha del protocolo de sincronización", "Syncing": "Sincronizando", "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 is Free and Open Source Software licensed as MPL v2.0.", + "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 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 now supports automatically reporting crashes to the developers. This feature is enabled by default.", + "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.", "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing parece no estar activo o hay un problema con tu conexión de internet. Reintentando...", "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing tiene problemas para procesar tu solicitud. Por favor, actualiza la página o reinicia Syncthing si el problema persiste.", "Take me back": "Llévame de vuelta", "The GUI address is overridden by startup options. Changes here will not take effect while the override is in place.": "La dirección de la Interfaz Gráfica de Ususario (GUI) está sobreescrita por las opciones de inicio. Los cambios aquí no tendrán efecto mientras la sobreescritura esté activa.", - "The Syncthing Authors": "The Syncthing Authors", + "The Syncthing Authors": "Los Autores de Syncthing", "The Syncthing admin interface is configured to allow remote access without a password.": "El panel de administración de Syncthing está configurado para permitir el acceso remoto sin contraseña.", "The aggregated statistics are publicly available at the URL below.": "Las estadísticas agragadas están disponibles públicamente en la URL de abajo.", - "The cleanup interval cannot be blank.": "The cleanup interval cannot be blank.", + "The cleanup interval cannot be blank.": "El intervalo de limpieza no puede ser nulo.", "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "La configuración ha sido grabada pero no activada. Syncthing debe reiniciarse para activar la nueva configuración.", "The device ID cannot be blank.": "La ID del dispositivo no puede estar vacía.", "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).": "El ID del dispositivo que hay que introducir aquí se puede encontrar en el diálogo \"Acciones > Mostrar ID\" en el otro dispositivo. Los espacios y las barras son opcionales (ignorados).", @@ -323,10 +329,10 @@ "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.": "The following items were changed locally.", - "The following unexpected items were found.": "The following unexpected items were found.", - "The interval must be a positive number of seconds.": "The interval must be a positive number of seconds.", - "The interval, in seconds, for running cleanup in the versions directory. Zero to disable periodic cleaning.": "The interval, in seconds, for running cleanup in the versions directory. Zero to disable periodic cleaning.", + "The following items were changed locally.": "Los siguientes elementos fueron cambiados localmente.", + "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.", "The maximum age must be a number and cannot be blank.": "La edad máxima debe ser un número y no puede estar vacía.", "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "El tiempo máximo para mantener una versión en días (introducir 0 para mantener las versiones indefinidamente).", "The number of days must be a number and cannot be blank.": "El número de días debe ser un número y no puede estar en blanco.", @@ -336,8 +342,8 @@ "The path cannot be blank.": "La ruta no puede estar vacía.", "The rate limit must be a non-negative number (0: no limit)": "El límite de velocidad debe ser un número no negativo (0: sin límite)", "The rescan interval must be a non-negative number of seconds.": "El intervalo de actualización debe ser un número positivo de segundos.", - "There are no devices to share this folder with.": "There are no devices to share this folder with.", - "There are no folders to share with this device.": "There are no folders to share with this device.", + "There are no devices to share this folder with.": "No hay dispositivos con los cuales compartir esta carpeta.", + "There are no folders to share with this device.": "No hay carpetas para compartir con este dispositivo.", "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.", @@ -347,18 +353,18 @@ "Time the item was last modified": "Hora en que el ítem fue modificado por última vez", "Trash Can File Versioning": "Versionado de archivos de la papelera", "Type": "Tipo", - "UNIX Permissions": "UNIX Permissions", + "UNIX Permissions": "Permisos de UNIX", "Unavailable": "No disponible", "Unavailable/Disabled by administrator or maintainer": "No disponible/Deshabilitado por el administrador o mantenedor", "Undecided (will prompt)": "No decidido (se preguntará)", - "Unexpected Items": "Unexpected Items", - "Unexpected items have been found in this folder.": "Unexpected items have been found in this folder.", + "Unexpected Items": "Elementos Inesperados", + "Unexpected items have been found in this folder.": "Se han encontrado Elementos Inesperados en esta carpeta.", "Unignore": "Dejar de ignorar", "Unknown": "Desconocido", "Unshared": "No compartido", - "Unshared Devices": "Unshared Devices", - "Unshared Folders": "Unshared Folders", - "Untrusted": "Untrusted", + "Unshared Devices": "Dispositivos no Enlazados", + "Unshared Folders": "Carpetas no Compartidas", + "Untrusted": "No Confiable", "Up to Date": "Actualizado", "Updated": "Actualizado", "Upgrade": "Actualizar", @@ -368,14 +374,14 @@ "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)", - "Username/Password has not been set for the GUI authentication. Please consider setting it up.": "Username/Password has not been set for the GUI authentication. Please consider setting it up.", + "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", "Versions Path": "Ruta de las versiones", "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Las versiones se borran automáticamente si son más antiguas que la edad máxima o exceden el número de ficheros permitidos en un intervalo.", - "Waiting to Clean": "Waiting to Clean", - "Waiting to Scan": "Waiting to Scan", - "Waiting to Sync": "Waiting to Sync", + "Waiting to Clean": "Esperando para Limpiar", + "Waiting to Scan": "Esperando para Escanear", + "Waiting to Sync": "Esperando para Sincronizar", "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}}\".", @@ -383,7 +389,7 @@ "Warning: If you are using an external watcher like {%syncthingInotify%}, you should make sure it is deactivated.": "Advertencia: Si estás utilizando un observador externo como {{syncthingInotify}}, debes asegurarte de que está desactivado.", "Watch for Changes": "Vigila los cambios", "Watching for Changes": "Vigilando los cambios", - "Watching for changes discovers most changes without periodic scanning.": "Watching for changes discovers most changes without periodic scanning.", + "Watching for changes discovers most changes without periodic scanning.": "El control de cambios descubre la mayoría de cambios sin el escaneo periódico.", "When adding a new device, keep in mind that this device must be added on the other side too.": "Cuando añada un nuevo dispositivo, tenga en cuenta que este debe añadirse también en el otro lado.", "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Cuando añada una nueva carpeta, tenga en cuenta que su ID se usa para unir carpetas entre dispositivos. Son sensibles a las mayúsculas y deben coincidir exactamente entre todos los dispositivos.", "Yes": "Si", @@ -394,14 +400,14 @@ "You have no ignored folders.": "No tienes carpetas ignoradas", "You have unsaved changes. Do you really want to discard them?": "Tienes cambios sin guardar. ¿Quieres descartarlos realmente?", "You must keep at least one version.": "Debes mantener al menos una versión.", - "You should never add or change anything locally in a \"{%receiveEncrypted%}\" folder.": "You should never add or change anything locally in a \"{{receiveEncrypted}}\" folder.", + "You should never add or change anything locally in a \"{%receiveEncrypted%}\" folder.": "Nunca debe agregar o cambiar nada localmente en una carpeta \"{{receiveEncrypted}}\".", "days": "días", - "directories": "directories", + "directories": "directorios", "files": "archivos", "full documentation": "Documentación completa", "items": "Elementos", - "seconds": "seconds", + "seconds": "segundos", "{%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}} might reintroduce this device." + "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} puede reintroducir este dispositivo." } \ No newline at end of file diff --git a/gui/default/assets/lang/lang-eu.json b/gui/default/assets/lang/lang-eu.json index 40ebb6493..e6a46b368 100644 --- a/gui/default/assets/lang/lang-eu.json +++ b/gui/default/assets/lang/lang-eu.json @@ -61,7 +61,11 @@ "Currently Shared With Devices": "Gaur egun tresnekin partekatua", "Danger!": "Lanjera !", "Debugging Facilities": "Arazketa zerbitzuak", + "Default Configuration": "Konfigurazio lehenetsia", + "Default Device": "Gailu lehenetsia", + "Default Folder": "Karpeta lehenetsia", "Default Folder Path": "Partekatzearen sustrai bide lehenetsia", + "Defaults": "Lehenetsiak", "Delete Unexpected Items": "Ezabatu ustekabeko elementuak", "Deleted": "Kendua", "Deselect All": "Hautaketa guztia kendu", @@ -97,7 +101,9 @@ "Downloading": "Deskargatzea", "Edit": "Aldatu", "Edit Device": "Tresna aldatzea", + "Edit Device Defaults": "Editatu gailu lehenetsiak", "Edit Folder": "Editatu karpeta", + "Edit Folder Defaults": "Editatu karpeta lehenetsiak", "Editing {%path%}.": "Muntatzea {{path}}", "Enable Crash Reporting": "Aktibatu blokeatzeko txosten automatikoen bidalketa", "Enable NAT traversal": "NAT translazioa aktibatu", diff --git a/gui/default/assets/lang/lang-fi.json b/gui/default/assets/lang/lang-fi.json index 87de02704..de9b0b45b 100644 --- a/gui/default/assets/lang/lang-fi.json +++ b/gui/default/assets/lang/lang-fi.json @@ -61,7 +61,11 @@ "Currently Shared With Devices": "Currently Shared With Devices", "Danger!": "Vaara!", "Debugging Facilities": "Debug -luokat", + "Default Configuration": "Default Configuration", + "Default Device": "Default Device", + "Default Folder": "Default Folder", "Default Folder Path": "Oletuspolku kansioille", + "Defaults": "Defaults", "Delete Unexpected Items": "Delete Unexpected Items", "Deleted": "Poistettu", "Deselect All": "Poista valinnat", @@ -97,7 +101,9 @@ "Downloading": "Ladataan", "Edit": "Muokkaa", "Edit Device": "Edit Device", + "Edit Device Defaults": "Edit Device Defaults", "Edit Folder": "Edit Folder", + "Edit Folder Defaults": "Edit Folder Defaults", "Editing {%path%}.": "Muokkaa {{path}}.", "Enable Crash Reporting": "Ota kaatumisraportointi käyttöön", "Enable NAT traversal": "Aktivoi osoitteenmuunnoksen kierto", diff --git a/gui/default/assets/lang/lang-fr.json b/gui/default/assets/lang/lang-fr.json index c7b15a07a..c319d1409 100644 --- a/gui/default/assets/lang/lang-fr.json +++ b/gui/default/assets/lang/lang-fr.json @@ -61,7 +61,11 @@ "Currently Shared With Devices": "Appareils membres actuels de ce partage :", "Danger!": "Attention !", "Debugging Facilities": "Outils de débogage", + "Default Configuration": "Personnalisation des créations", + "Default Device": "Définir comme référence pour les réglages", + "Default Folder": "Définir comme référence pour les réglages", "Default Folder Path": "Chemin parent par défaut pour les nouveaux partages", + "Defaults": "Personnalisation", "Delete Unexpected Items": "Supprimer les éléments inattendus", "Deleted": "Supprimé", "Deselect All": "Tout déselectionner", @@ -97,7 +101,9 @@ "Downloading": "Réception", "Edit": "Gérer...", "Edit Device": "Gérer l'appareil", + "Edit Device Defaults": "Pour les nouveaux appareils", "Edit Folder": "Gérer le partage", + "Edit Folder Defaults": "Pour les nouveaux partages", "Editing {%path%}.": "Modification de {{path}}.", "Enable Crash Reporting": "Activer l'envoi des rapports de plantage automatiques", "Enable NAT traversal": "Activer la translation d'adresses (NAT)", @@ -206,7 +212,7 @@ "Outgoing Rate Limit (KiB/s)": "Limite du débit d'envoi (Kio/s)", "Override Changes": "Écraser les changements", "Path": "Chemin", - "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": "Chemin vers le répertoire à partager dans l'appareil local. Il sera créé s'il n'existe pas. Vous pouvez entrer un chemin absolu (p.ex \"/home/moi/Sync/Exemple\") ou relatif à celui du programme (p.ex \"..\\Partages\\Exemple\" - utile pour installation portable). Le caractère tilde (~, ou ~+Espace sous Windows XP+Azerty) peut être utilisé comme raccourci vers", + "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": "Chemin vers le répertoire à partager dans l'appareil local. Il sera créé s'il n'existe pas. Vous pouvez entrer un chemin absolu (p.ex \"/home/moi/Sync/Exemple\") ou relatif à celui du programme (p.ex \"..\\Partages\\Exemple\" - utile pour installation portable). Le caractère tilde (~, ou ~+Espace sous Windows) peut être utilisé comme raccourci vers\nDans l'écran de \"Personnalisation\" des valeurs par défaut, ce champ indique le chemin dans lequel les partages acceptés automatiquement seront créés, ainsi que chemin de base suggéré lors de l'enregistrement des nouveaux partages. Le caractère tilde (~) est un raccourci pour {{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%}.": "Chemin dans lequel les partages acceptés automatiquement seront créés, ainsi que chemin suggéré lors de l'enregistrement des nouveaux partages via cette interface graphique. Le caractère tilde (~) est un raccourci pour {{tilde}}.", "Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).": "Chemin où les versions seront conservées (laisser vide pour le chemin par défaut de .stversions (caché) dans le partage).\nChemin relatif ou absolu (recommandé), mais dans un répertoire non synchronisé (par masque ou hors du chemin du partage).\nSur la même partition ou système de fichiers (recommandé).", "Pause": "Pause", diff --git a/gui/default/assets/lang/lang-fy.json b/gui/default/assets/lang/lang-fy.json index bfcdf662a..9d11b09f1 100644 --- a/gui/default/assets/lang/lang-fy.json +++ b/gui/default/assets/lang/lang-fy.json @@ -61,7 +61,11 @@ "Currently Shared With Devices": "Op dit stuit Dielt mei Apparaten", "Danger!": "Gefaar!", "Debugging Facilities": "Debug-foarsjennings", + "Default Configuration": "Default Configuration", + "Default Device": "Default Device", + "Default Folder": "Default Folder", "Default Folder Path": "Standert Map-paad", + "Defaults": "Defaults", "Delete Unexpected Items": "Delete Unexpected Items", "Deleted": "Fuortsmiten", "Deselect All": "Alles Deselektearje", @@ -97,7 +101,9 @@ "Downloading": "Oan it downloaden", "Edit": "Bewurkje", "Edit Device": "Edit Device", + "Edit Device Defaults": "Edit Device Defaults", "Edit Folder": "Edit Folder", + "Edit Folder Defaults": "Edit Folder Defaults", "Editing {%path%}.": "{{path}} wurd bewurke.", "Enable Crash Reporting": "Automatyske Rapportaazje fan Fêstrinners Oansette", "Enable NAT traversal": "NAT-trochkruse ynskeakelje", diff --git a/gui/default/assets/lang/lang-hu.json b/gui/default/assets/lang/lang-hu.json index d9e394838..a62e064cd 100644 --- a/gui/default/assets/lang/lang-hu.json +++ b/gui/default/assets/lang/lang-hu.json @@ -61,7 +61,11 @@ "Currently Shared With Devices": "Eszközök, melyekkel jelenleg meg van osztva", "Danger!": "Veszély!", "Debugging Facilities": "Hibakeresési képességek", + "Default Configuration": "Alapértelmezett beállítások", + "Default Device": "Alapértelmezett eszköz", + "Default Folder": "Alapértelmezett mappa", "Default Folder Path": "Alapértelmezett mappa útvonala", + "Defaults": "Alapértelmezések", "Delete Unexpected Items": "Váratlan elemek törlése", "Deleted": "Törölve", "Deselect All": "Kijelölés megszüntetése", @@ -97,7 +101,9 @@ "Downloading": "Letöltés", "Edit": "Szerkesztés", "Edit Device": "Eszköz szerkesztése", + "Edit Device Defaults": "Eszköz alapértelmezéseinek szerkesztése", "Edit Folder": "Mappa szerkesztése", + "Edit Folder Defaults": "Mappa alapértelmezéseinek szerkesztése", "Editing {%path%}.": "{{path}} szerkesztése.", "Enable Crash Reporting": "Összeomlás-jelentés engedélyezése", "Enable NAT traversal": "NAT bejárás engedélyezése", diff --git a/gui/default/assets/lang/lang-it.json b/gui/default/assets/lang/lang-it.json index e8990040b..887bc18cc 100644 --- a/gui/default/assets/lang/lang-it.json +++ b/gui/default/assets/lang/lang-it.json @@ -61,7 +61,11 @@ "Currently Shared With Devices": "Attualmente Condiviso Con Dispositivi", "Danger!": "Pericolo!", "Debugging Facilities": "Servizi di Debug", + "Default Configuration": "Default Configuration", + "Default Device": "Default Device", + "Default Folder": "Default Folder", "Default Folder Path": "Percorso Cartella di Default", + "Defaults": "Defaults", "Delete Unexpected Items": "Elimina elementi imprevisti", "Deleted": "Cancellato", "Deselect All": "Deseleziona tutto", @@ -97,7 +101,9 @@ "Downloading": "Scaricamento in corso", "Edit": "Modifica", "Edit Device": "Modifica Dispositivo", + "Edit Device Defaults": "Edit Device Defaults", "Edit Folder": "Modifica Cartella", + "Edit Folder Defaults": "Edit Folder Defaults", "Editing {%path%}.": "Modifica di {{path}}.", "Enable Crash Reporting": "Attiva la Segnalazione degli arresti anomali", "Enable NAT traversal": "Abilita NAT traversal", diff --git a/gui/default/assets/lang/lang-ja.json b/gui/default/assets/lang/lang-ja.json index c374cfd12..40823a160 100644 --- a/gui/default/assets/lang/lang-ja.json +++ b/gui/default/assets/lang/lang-ja.json @@ -61,7 +61,11 @@ "Currently Shared With Devices": "現在共有中のデバイス", "Danger!": "危険！", "Debugging Facilities": "デバッグ機能", + "Default Configuration": "Default Configuration", + "Default Device": "Default Device", + "Default Folder": "Default Folder", "Default Folder Path": "デフォルトのフォルダーパス", + "Defaults": "Defaults", "Delete Unexpected Items": "Delete Unexpected Items", "Deleted": "削除", "Deselect All": "すべて選択解除", @@ -97,7 +101,9 @@ "Downloading": "ダウンロード中", "Edit": "編集", "Edit Device": "Edit Device", + "Edit Device Defaults": "Edit Device Defaults", "Edit Folder": "Edit Folder", + "Edit Folder Defaults": "Edit Folder Defaults", "Editing {%path%}.": "{{path}} を編集中", "Enable Crash Reporting": "クラッシュレポートを有効にする", "Enable NAT traversal": "NATトラバーサルを有効にする", diff --git a/gui/default/assets/lang/lang-ko-KR.json b/gui/default/assets/lang/lang-ko-KR.json index 367d6ae71..bb727ac29 100644 --- a/gui/default/assets/lang/lang-ko-KR.json +++ b/gui/default/assets/lang/lang-ko-KR.json @@ -61,7 +61,11 @@ "Currently Shared With Devices": "현재 공유된 기기들", "Danger!": "경고!", "Debugging Facilities": "디버깅 기능", + "Default Configuration": "Default Configuration", + "Default Device": "Default Device", + "Default Folder": "Default Folder", "Default Folder Path": "기본 폴더 경로", + "Defaults": "Defaults", "Delete Unexpected Items": "Delete Unexpected Items", "Deleted": "삭제됨", "Deselect All": "Deselect All", @@ -97,7 +101,9 @@ "Downloading": "다운로드 중", "Edit": "편집", "Edit Device": "기기 수정", + "Edit Device Defaults": "Edit Device Defaults", "Edit Folder": "폴더 수정", + "Edit Folder Defaults": "Edit Folder Defaults", "Editing {%path%}.": "{{path}} 수정하기.", "Enable Crash Reporting": "충돌 보고 활성화", "Enable NAT traversal": "NAT traversal 활성화", diff --git a/gui/default/assets/lang/lang-lt.json b/gui/default/assets/lang/lang-lt.json index b7418aa8f..7a0b0b173 100644 --- a/gui/default/assets/lang/lang-lt.json +++ b/gui/default/assets/lang/lang-lt.json @@ -61,7 +61,11 @@ "Currently Shared With Devices": "Šiuo metu bendrinama su įrenginiais", "Danger!": "Pavojus!", "Debugging Facilities": "Derinimo priemonės", + "Default Configuration": "Default Configuration", + "Default Device": "Default Device", + "Default Folder": "Default Folder", "Default Folder Path": "Numatytojo aplanko kelias", + "Defaults": "Defaults", "Delete Unexpected Items": "Delete Unexpected Items", "Deleted": "Ištrinta", "Deselect All": "Nuimti žymėjimą nuo visų", @@ -97,7 +101,9 @@ "Downloading": "Siunčiama", "Edit": "Redaguoti", "Edit Device": "Taisyti įrenginį", + "Edit Device Defaults": "Edit Device Defaults", "Edit Folder": "Taisyti aplanką", + "Edit Folder Defaults": "Edit Folder Defaults", "Editing {%path%}.": "Redaguojama {{path}}.", "Enable Crash Reporting": "Įjungti automatines ataskaitas apie strigtis", "Enable NAT traversal": "Leisti kirsti NAT", diff --git a/gui/default/assets/lang/lang-nb.json b/gui/default/assets/lang/lang-nb.json index c72b529ef..6b92a27e9 100644 --- a/gui/default/assets/lang/lang-nb.json +++ b/gui/default/assets/lang/lang-nb.json @@ -61,7 +61,11 @@ "Currently Shared With Devices": "Currently Shared With Devices", "Danger!": "Fare!", "Debugging Facilities": "Feilrettingsverktøy", + "Default Configuration": "Default Configuration", + "Default Device": "Default Device", + "Default Folder": "Default Folder", "Default Folder Path": "Forvalgt mappeplassering", + "Defaults": "Defaults", "Delete Unexpected Items": "Delete Unexpected Items", "Deleted": "Slettet", "Deselect All": "Fjern alle markeringer", @@ -97,7 +101,9 @@ "Downloading": "Laster ned", "Edit": "Rediger", "Edit Device": "Edit Device", + "Edit Device Defaults": "Edit Device Defaults", "Edit Folder": "Edit Folder", + "Edit Folder Defaults": "Edit Folder Defaults", "Editing {%path%}.": "Redigerer {{path}}.", "Enable Crash Reporting": "Skru på krasjrapportering", "Enable NAT traversal": "Slå på NAT-traversering", diff --git a/gui/default/assets/lang/lang-nl.json b/gui/default/assets/lang/lang-nl.json index 9d86086d6..d02a9ce6f 100644 --- a/gui/default/assets/lang/lang-nl.json +++ b/gui/default/assets/lang/lang-nl.json @@ -61,7 +61,11 @@ "Currently Shared With Devices": "Momenteel gedeeld met apparaten", "Danger!": "Let op!", "Debugging Facilities": "Debugmogelijkheden", + "Default Configuration": "Standaardconfiguratie", + "Default Device": "Standaardapparaat", + "Default Folder": "Standaardmap", "Default Folder Path": "Standaardmaplocatie", + "Defaults": "Standaardwaarden", "Delete Unexpected Items": "Onverwachte items verwijderen", "Deleted": "Verwijderd", "Deselect All": "Alles deselecteren", @@ -97,7 +101,9 @@ "Downloading": "Downloaden", "Edit": "Bewerken", "Edit Device": "Apparaat bewerken", + "Edit Device Defaults": "Standaardwaarden van apparaat bewerken", "Edit Folder": "Map bewerken", + "Edit Folder Defaults": "Standaardwaarden van map bewerken", "Editing {%path%}.": "{{path}} bewerken.", "Enable Crash Reporting": "Crashrapportage inschakelen", "Enable NAT traversal": "NAT traversal inschakelen", diff --git a/gui/default/assets/lang/lang-pl.json b/gui/default/assets/lang/lang-pl.json index f016ff8ff..9489a0579 100644 --- a/gui/default/assets/lang/lang-pl.json +++ b/gui/default/assets/lang/lang-pl.json @@ -61,7 +61,11 @@ "Currently Shared With Devices": "Aktualnie udostępniane między urządzeniami", "Danger!": "Niebezpieczne!", "Debugging Facilities": "Odpluskwianie", + "Default Configuration": "Default Configuration", + "Default Device": "Default Device", + "Default Folder": "Default Folder", "Default Folder Path": "Domyślna ścieżka folderu", + "Defaults": "Defaults", "Delete Unexpected Items": "Delete Unexpected Items", "Deleted": "Usunięto", "Deselect All": "Odznacz wszystko", @@ -97,7 +101,9 @@ "Downloading": "Pobieranie", "Edit": "Edytuj", "Edit Device": "Edytuj urządzenie", + "Edit Device Defaults": "Edit Device Defaults", "Edit Folder": "Edytuj folder", + "Edit Folder Defaults": "Edit Folder Defaults", "Editing {%path%}.": "Edytowanie {{path}}.", "Enable Crash Reporting": "Włącz raportowanie błędów", "Enable NAT traversal": "Włącz trawersowanie NAT", diff --git a/gui/default/assets/lang/lang-pt-BR.json b/gui/default/assets/lang/lang-pt-BR.json index e11939b05..069ac1baf 100644 --- a/gui/default/assets/lang/lang-pt-BR.json +++ b/gui/default/assets/lang/lang-pt-BR.json @@ -61,7 +61,11 @@ "Currently Shared With Devices": "Compartilhado com outros dispositivos", "Danger!": "Perigo!", "Debugging Facilities": "Facilidades de depuração", + "Default Configuration": "Default Configuration", + "Default Device": "Default Device", + "Default Folder": "Default Folder", "Default Folder Path": "Caminho padrão da pasta", + "Defaults": "Defaults", "Delete Unexpected Items": "Delete Unexpected Items", "Deleted": "Apagado", "Deselect All": "Deselect All", @@ -97,7 +101,9 @@ "Downloading": "Recebendo", "Edit": "Editar", "Edit Device": "Edit Device", + "Edit Device Defaults": "Edit Device Defaults", "Edit Folder": "Edit Folder", + "Edit Folder Defaults": "Edit Folder Defaults", "Editing {%path%}.": "Editando {{path}}.", "Enable Crash Reporting": "Habilitar relatório de falhas", "Enable NAT traversal": "Habilitar NAT", diff --git a/gui/default/assets/lang/lang-pt-PT.json b/gui/default/assets/lang/lang-pt-PT.json index 5d6170f98..429103dac 100644 --- a/gui/default/assets/lang/lang-pt-PT.json +++ b/gui/default/assets/lang/lang-pt-PT.json @@ -61,7 +61,11 @@ "Currently Shared With Devices": "Dispositivos com os quais está partilhada", "Danger!": "Perigo!", "Debugging Facilities": "Recursos de depuração", + "Default Configuration": "Configuração predefinida", + "Default Device": "Dispositivo predefinido", + "Default Folder": "Pasta predefinida", "Default Folder Path": "Caminho da pasta predefinida", + "Defaults": "Predefinições", "Delete Unexpected Items": "Eliminar itens inesperados", "Deleted": "Eliminado", "Deselect All": "Retirar todas as selecções", @@ -97,7 +101,9 @@ "Downloading": "Recebendo", "Edit": "Editar", "Edit Device": "Editar dispositivo", + "Edit Device Defaults": "Editar as predefinições do dispositivo", "Edit Folder": "Editar pasta", + "Edit Folder Defaults": "Editar as predefinições da pasta", "Editing {%path%}.": "Editando {{path}}.", "Enable Crash Reporting": "Activar Relatório de Estouro", "Enable NAT traversal": "Activar travessia de NAT", diff --git a/gui/default/assets/lang/lang-ru.json b/gui/default/assets/lang/lang-ru.json index 00f50df51..652e58f8a 100644 --- a/gui/default/assets/lang/lang-ru.json +++ b/gui/default/assets/lang/lang-ru.json @@ -61,7 +61,11 @@ "Currently Shared With Devices": "В настоящее время используется совместно с устройствами", "Danger!": "Опасно!", "Debugging Facilities": "Средства отладки", + "Default Configuration": "Default Configuration", + "Default Device": "Default Device", + "Default Folder": "Default Folder", "Default Folder Path": "Путь для папок", + "Defaults": "Defaults", "Delete Unexpected Items": "Delete Unexpected Items", "Deleted": "Удалено", "Deselect All": "Снять выделение", @@ -97,7 +101,9 @@ "Downloading": "Загрузка", "Edit": "Редактировать", "Edit Device": "Edit Device", + "Edit Device Defaults": "Edit Device Defaults", "Edit Folder": "Edit Folder", + "Edit Folder Defaults": "Edit Folder Defaults", "Editing {%path%}.": "Правка {{path}}.", "Enable Crash Reporting": "Включить отчёты о сбоях", "Enable NAT traversal": "Включить NAT traversal", diff --git a/gui/default/assets/lang/lang-sk.json b/gui/default/assets/lang/lang-sk.json index 393991a6d..4f5ed80ec 100644 --- a/gui/default/assets/lang/lang-sk.json +++ b/gui/default/assets/lang/lang-sk.json @@ -61,7 +61,11 @@ "Currently Shared With Devices": "Currently Shared With Devices", "Danger!": "Pozor!", "Debugging Facilities": "Debugging Facilities", + "Default Configuration": "Default Configuration", + "Default Device": "Default Device", + "Default Folder": "Default Folder", "Default Folder Path": "Predvolená adresárová cesta", + "Defaults": "Defaults", "Delete Unexpected Items": "Delete Unexpected Items", "Deleted": "Zmazané", "Deselect All": "Odznačiť všetko", @@ -97,7 +101,9 @@ "Downloading": "Sťahovanie", "Edit": "Upraviť", "Edit Device": "Upraviť zariadenie", + "Edit Device Defaults": "Edit Device Defaults", "Edit Folder": "Upraviť priečinok", + "Edit Folder Defaults": "Edit Folder Defaults", "Editing {%path%}.": "Úprava {{path}}.", "Enable Crash Reporting": "Zapnúť hlásenie chýb", "Enable NAT traversal": "Povoliť priechod NAT", diff --git a/gui/default/assets/lang/lang-sv.json b/gui/default/assets/lang/lang-sv.json index 5ecc622d0..3964b9835 100644 --- a/gui/default/assets/lang/lang-sv.json +++ b/gui/default/assets/lang/lang-sv.json @@ -61,7 +61,11 @@ "Currently Shared With Devices": "För närvarande delas med enheter", "Danger!": "Fara!", "Debugging Facilities": "Felsökningsfunktioner", + "Default Configuration": "Standardkonfiguration", + "Default Device": "Standardenhet", + "Default Folder": "Standardmapp", "Default Folder Path": "Standardmappsökväg", + "Defaults": "Standard", "Delete Unexpected Items": "Ta bort oväntade objekt", "Deleted": "Borttagna", "Deselect All": "Avmarkera alla", @@ -97,7 +101,9 @@ "Downloading": "Hämtar", "Edit": "Redigera", "Edit Device": "Redigera enhet", + "Edit Device Defaults": "Redigera enhetsstandard", "Edit Folder": "Redigera mapp", + "Edit Folder Defaults": "Redigera mappstandard", "Editing {%path%}.": "Redigerar {{path}}.", "Enable Crash Reporting": "Aktivera kraschrapportering", "Enable NAT traversal": "Aktivera NAT-genompassering", diff --git a/gui/default/assets/lang/lang-tr.json b/gui/default/assets/lang/lang-tr.json index 4b425876c..a143383c4 100644 --- a/gui/default/assets/lang/lang-tr.json +++ b/gui/default/assets/lang/lang-tr.json @@ -61,7 +61,11 @@ "Currently Shared With Devices": "Şu Anda Paylaşıldığı Cihazlar", "Danger!": "Tehlike!", "Debugging Facilities": "Hata Ayıklama Olanakları", + "Default Configuration": "Varsayılan Yapılandırma", + "Default Device": "Varsayılan Cihaz", + "Default Folder": "Varsayılan Klasör", "Default Folder Path": "Varsayılan Klasör Yolu", + "Defaults": "Varsayılanlar", "Delete Unexpected Items": "Beklenmeyen Öğeleri Sil", "Deleted": "Silinen", "Deselect All": "Tüm Seçimi Kaldır", @@ -97,7 +101,9 @@ "Downloading": "İndiriliyor", "Edit": "Düzenle", "Edit Device": "Düzenlenen Cihaz", + "Edit Device Defaults": "Cihaz Varsayılanlarını Düzenle", "Edit Folder": "Düzenlenen Klasör", + "Edit Folder Defaults": "Klasör Varsayılanlarını Düzenle", "Editing {%path%}.": "Düzenlenen {{path}}.", "Enable Crash Reporting": "Çökme Bildirmeyi etkinleştir", "Enable NAT traversal": "NAT geçişini etkinleştir", diff --git a/gui/default/assets/lang/lang-uk.json b/gui/default/assets/lang/lang-uk.json index d2ce6bb4b..47d591451 100644 --- a/gui/default/assets/lang/lang-uk.json +++ b/gui/default/assets/lang/lang-uk.json @@ -61,7 +61,11 @@ "Currently Shared With Devices": "На даний момент є спільний доступ пристроїв", "Danger!": "Небезпечно!", "Debugging Facilities": "Засоби відладки", + "Default Configuration": "Default Configuration", + "Default Device": "Default Device", + "Default Folder": "Default Folder", "Default Folder Path": "Шлях до директорії по замовчанню", + "Defaults": "Defaults", "Delete Unexpected Items": "Delete Unexpected Items", "Deleted": "Видалене", "Deselect All": "Зняти вибір з усіх", @@ -97,7 +101,9 @@ "Downloading": "Завантаження", "Edit": "Редагувати", "Edit Device": "Налаштування пристрою", + "Edit Device Defaults": "Edit Device Defaults", "Edit Folder": "Налаштування директорії", + "Edit Folder Defaults": "Edit Folder Defaults", "Editing {%path%}.": "Редагування {{path}}.", "Enable Crash Reporting": "Увімкнути звітування про збої", "Enable NAT traversal": "Увімкнути NAT traversal", diff --git a/gui/default/assets/lang/lang-zh-CN.json b/gui/default/assets/lang/lang-zh-CN.json index 8b81c5d66..99b42f145 100644 --- a/gui/default/assets/lang/lang-zh-CN.json +++ b/gui/default/assets/lang/lang-zh-CN.json @@ -61,7 +61,11 @@ "Currently Shared With Devices": "当前设备已共享", "Danger!": "危险！", "Debugging Facilities": "调试功能", + "Default Configuration": "Default Configuration", + "Default Device": "Default Device", + "Default Folder": "Default Folder", "Default Folder Path": "默认文件夹路径", + "Defaults": "Defaults", "Delete Unexpected Items": "Delete Unexpected Items", "Deleted": "已删除", "Deselect All": "取消全选", @@ -97,7 +101,9 @@ "Downloading": "下载中", "Edit": "选项", "Edit Device": "编辑设备", + "Edit Device Defaults": "Edit Device Defaults", "Edit Folder": "编辑文件夹", + "Edit Folder Defaults": "Edit Folder Defaults", "Editing {%path%}.": "正在编辑 {{path}}。", "Enable Crash Reporting": "启用自动发送崩溃报告", "Enable NAT traversal": "启用 NAT 遍历", diff --git a/gui/default/assets/lang/lang-zh-HK.json b/gui/default/assets/lang/lang-zh-HK.json index b3d191421..9991edb36 100644 --- a/gui/default/assets/lang/lang-zh-HK.json +++ b/gui/default/assets/lang/lang-zh-HK.json @@ -61,7 +61,11 @@ "Currently Shared With Devices": "當前設備已共享", "Danger!": "危險！", "Debugging Facilities": "調試功能", + "Default Configuration": "Default Configuration", + "Default Device": "Default Device", + "Default Folder": "Default Folder", "Default Folder Path": "默認文件夾路徑", + "Defaults": "Defaults", "Delete Unexpected Items": "刪除不需要項目", "Deleted": "已刪除", "Deselect All": "取消全選", @@ -97,7 +101,9 @@ "Downloading": "下載中", "Edit": "選項", "Edit Device": "編輯設備", + "Edit Device Defaults": "Edit Device Defaults", "Edit Folder": "編輯文件夾", + "Edit Folder Defaults": "Edit Folder Defaults", "Editing {%path%}.": "正在編輯 {{path}}。", "Enable Crash Reporting": "啟用自動發送崩潰報告", "Enable NAT traversal": "啟用 NAT 遍歷", diff --git a/gui/default/assets/lang/lang-zh-TW.json b/gui/default/assets/lang/lang-zh-TW.json index 77caeca5f..90e4caa0b 100644 --- a/gui/default/assets/lang/lang-zh-TW.json +++ b/gui/default/assets/lang/lang-zh-TW.json @@ -1,48 +1,48 @@ { "A device with that ID is already added.": "該裝置識別碼已被新增。", "A negative number of days doesn't make sense.": "一個負的天數並不合理。", - "A new major version may not be compatible with previous versions.": "新的主要版本可能與以前的版本不相容。", + "A new major version may not be compatible with previous versions.": "新的主要版本可能與先前的版本不相容。", "API Key": "API 金鑰", "About": "關於", - "Action": "動作", + "Action": "操作", "Actions": "操作", - "Add": "增加", - "Add Device": "增加裝置", - "Add Folder": "增加資料夾", + "Add": "新增", + "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.": "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.", + "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 小時）。您也可以在選擇「否」後，手動配置每個資料夾的時間間隔。", "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.", - "Allow Anonymous Usage Reporting?": "允許匿名的使用資訊回報?", + "All folders shared with this device must be protected by a password, such that all sent data is unreadable without the given password.": "所有與此裝置分享的資料夾必須使用密碼保護起來，如此一來，沒有提供密碼將無法閱覽資料。", + "Allow Anonymous Usage Reporting?": "允許回報匿名數據？", "Allowed Networks": "允許的網路", "Alphabetic": "字母順序", "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?": "匿名的使用資訊回報格式已經改變，你想要移至新格式嗎？", - "Are you sure you want to permanently delete all these files?": "Are you sure you want to permanently delete all these files?", + "Anonymous Usage Reporting": "匿名數據回報", + "Anonymous usage report format has changed. Would you like to move to the new format?": "匿名數據回報格式已經變更，想要移至新格式嗎？", + "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 upgrade?": "Are you sure you want to upgrade?", + "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.": "Automatic upgrades are always enabled for candidate releases.", + "Automatic Crash Reporting": "自動回傳當機報告", + "Automatic upgrade now offers the choice between stable releases and release candidates.": "自動更新目前提供選項有穩定版及候選發行版。", + "Automatic upgrades": "自動更新", + "Automatic upgrades are always enabled for candidate releases.": "候選發行版永遠啟用自動更新。", "Automatically create or share folders that this device advertises at the default path.": "自動在預設資料夾路徑建立或分享該裝置推薦的資料夾。", "Available debug logging facilities:": "可用的除錯日誌工具：", "Be careful!": "請小心！", "Bugs": "程式錯誤", "Changelog": "更新日誌", "Clean out after": "於之後清空", - "Cleaning Versions": "Cleaning Versions", - "Cleanup Interval": "Cleanup Interval", + "Cleaning Versions": "正在清除歷史版本", + "Cleanup Interval": "清除間隔", "Click to see discovery failures": "點擊以查閱失敗的探索", "Close": "關閉", "Command": "指令", @@ -53,35 +53,39 @@ "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 下列貢獻者：", "Creating ignore patterns, overwriting an existing file at {%path%}.": "建立忽略樣式，覆蓋已存在的 {{path}}。", - "Currently Shared With Devices": "Currently Shared With Devices", + "Currently Shared With Devices": "目前與裝置共享", "Danger!": "危險！", "Debugging Facilities": "除錯工具", + "Default Configuration": "預設配置", + "Default Device": "預設裝置", + "Default Folder": "預設資料夾", "Default Folder Path": "預設資料夾路徑", - "Delete Unexpected Items": "Delete Unexpected Items", + "Defaults": "預設", + "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 \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "裝置 \"{{name}}\" ({{device}} 位於 {{address}}) 想要連線。要添加新裝置嗎？", "Device ID": "裝置識別碼", "Device Identification": "裝置識別", "Device Name": "裝置名稱", - "Device is untrusted, enter encryption password": "Device is untrusted, enter encryption password", + "Device is untrusted, enter encryption password": "裝置不受信任，輸入加密密碼", "Device rate limits": "裝置速率限制", "Device that last modified the item": "前次修改裝置", "Devices": "裝置", - "Disable Crash Reporting": "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:": "已停用定期掃描，無法設定觀察變動，每 1 分鐘重試：", - "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).", + "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)": "斷線（未使用）", @@ -96,29 +100,31 @@ "Downloaded": "已下載", "Downloading": "正在下載", "Edit": "編輯", - "Edit Device": "Edit Device", - "Edit Folder": "Edit Folder", + "Edit Device": "編輯裝置", + "Edit Device Defaults": "編輯裝置 預設", + "Edit Folder": "編輯資料夾", + "Edit Folder Defaults": "編輯資料夾 預設", "Editing {%path%}.": "正在編輯 {{path}} 。", - "Enable Crash Reporting": "Enable Crash Reporting", + "Enable Crash Reporting": "啟用回傳當機報告", "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-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 up to three octal digits.": "Enter up to three octal digits.", + "Enter up to three octal digits.": "輸入最多三位八進位數字。", "Error": "錯誤", "External File Versioning": "外部的檔案版本控制", "Failed Items": "失敗的項目", "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 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": "以名稱篩選", @@ -127,14 +133,14 @@ "Folder Label": "資料夾標籤", "Folder Path": "資料夾路徑", "Folder Type": "資料夾類型", - "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}}\" 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%}\" 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)": "完全重新掃描間隔 (秒)", "GUI": "GUI", - "GUI Authentication Password": "GUI 認證密碼", - "GUI Authentication User": "GUI 使用者認證名稱", - "GUI Authentication: Set User and Password": "GUI Authentication: Set User and Password", + "GUI Authentication Password": "GUI 驗證密碼", + "GUI Authentication User": "GUI 驗證使用者名稱", + "GUI Authentication: Set User and Password": "GUI 驗證：設定使用者名稱與密碼", "GUI Listen Address": "GUI 監聽位址", "GUI Theme": "主題", "General": "一般", @@ -144,9 +150,9 @@ "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.", - "If untrusted, enter encryption password": "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.", + "However, your current settings indicate you might not want it enabled. We have disabled automatic crash reporting for you.": "但是，當前設定表明您可能不希望啟用它。我們為您停用了當機自動回報。", + "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": "忽略權限", @@ -175,7 +181,7 @@ "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": "大量操作", @@ -194,7 +200,7 @@ "No File Versioning": "無檔案版本控制", "No files will be deleted as a result of this operation.": "此操作將不會移除您的檔案。", "No upgrades": "不更新", - "Not shared": "Not shared", + "Not shared": "未共享", "Notice": "注意", "OK": "確定", "Off": "關閉", @@ -208,7 +214,7 @@ "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%}.": "新自動接受的資料夾將會建立在此路徑下，從 UI 加入資料夾時也將預設推薦此路徑。波浪符字元 (~) 將被展開為 {{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": "暫停", @@ -218,25 +224,25 @@ "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 分鐘重試：", "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 consult the release notes before performing a major upgrade.": "執行重大更新前請先參閱版本資訊。", + "Please set a GUI Authentication User and Password in the Settings dialog.": "請在設定對話框內設置 GUI 驗證使用者名稱及密碼。", "Please wait": "請稍候", "Prefix indicating that the file can be deleted if preventing directory removal": "前綴表示當此檔案阻礙了資料夾刪除時，可一併刪除此檔", "Prefix indicating that the pattern should be matched without case sensitivity": "前綴表示此樣式不區分大小寫", - "Preparing to Sync": "Preparing to Sync", + "Preparing to Sync": "正在準備同步", "Preview": "預覽", - "Preview Usage Report": "預覽使用資訊報告", + "Preview Usage Report": "預覽數據報告", "Quick guide to supported patterns": "可支援樣式的快速指南", "Random": "隨機", - "Receive Encrypted": "Receive Encrypted", + "Receive Encrypted": "接收已加密", "Receive Only": "僅接收", - "Received data is already encrypted": "Received data is already encrypted", + "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.": "發行候選版包含最新的功能及修補。與傳統 Syncthing 雙週發行版相似。", + "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "候選發行版包含最新的功能及修補。與傳統 Syncthing 雙週發行版相似。", "Remote Devices": "遠端裝置", - "Remote GUI": "Remote GUI", + "Remote GUI": "遠端 GUI", "Remove": "移除", "Remove Device": "移除裝置", "Remove Folder": "移除資料夾", @@ -252,28 +258,28 @@ "Resume": "繼續", "Resume All": "全部繼續", "Reused": "重用", - "Revert Local Changes": "Revert Local Changes", + "Revert Local Changes": "撤銷本機變更", "Save": "儲存", "Scan Time Remaining": "剩餘掃描時間", "Scanning": "正在掃描", "See external versioning help for supported templated command line parameters.": "查看關於命令列模板參數請參閱外部版本管理說明。", - "Select All": "Select All", + "Select All": "選擇全部", "Select a version": "選擇一個版本", - "Select additional devices to share this folder with.": "Select additional devices to share this folder with.", - "Select additional folders to share with this device.": "Select additional folders to share with this device.", + "Select additional devices to share this folder with.": "選擇額外裝置與其共享此資料夾。", + "Select additional folders to share with this device.": "選擇額外資料夾以共享至此裝置。", "Select latest version": "選擇最新的版本", "Select oldest version": "選擇最舊的版本", "Select the folders to share with this device.": "選擇要共享這個資料夾的裝置。", "Send & Receive": "傳送及接收", "Send Only": "僅傳送", "Settings": "設定", - "Share": "分享", - "Share Folder": "分享資料夾", + "Share": "共享", + "Share Folder": "共享資料夾", "Share Folders With Device": "與裝置共享資料夾", - "Share this folder?": "分享此資料夾?", - "Shared Folders": "Shared Folders", + "Share this folder?": "共享此資料夾？", + "Shared Folders": "已共享的資料夾", "Shared With": "與誰共享", - "Sharing": "Sharing", + "Sharing": "正在共享", "Show ID": "顯示識別碼", "Show QR": "顯示 QR 碼", "Show diff with previous version": "顯示與前一個版本的差異", @@ -287,8 +293,8 @@ "Smallest First": "最小的優先", "Some items could not be restored:": "有些項目無法被還原：", "Source Code": "原始碼", - "Stable releases and release candidates": "穩定發行版及發行候選版", - "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "穩定發行版大約延遲兩週發佈。這段期間將作為發行候選版來測試。", + "Stable releases and release candidates": "穩定版及候選發行版", + "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "穩定版大約延遲兩週發佈。這段期間將作為候選發行版來測試。", "Stable releases only": "僅穩定發行版", "Staggered File Versioning": "變動式檔案版本控制", "Start Browser": "啟動瀏覽器", @@ -296,37 +302,37 @@ "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.": "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.", "Support": "支援", - "Support Bundle": "Support Bundle", + "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 is Free and Open Source Software licensed as MPL v2.0.", + "Syncthing is Free and Open Source Software licensed as MPL v2.0.": "Syncthing 為自由且開源授權條款為 MPL v2.0。", "Syncthing is restarting.": "Syncthing 正在重新啟動。", "Syncthing is upgrading.": "Syncthing 正在進行升級。", - "Syncthing now supports automatically reporting crashes to the developers. This feature is enabled by default.": "Syncthing now supports automatically reporting crashes to the developers. This feature is enabled by default.", + "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": "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.", - "The Syncthing Authors": "The Syncthing Authors", + "The Syncthing Authors": "Syncthing 作者們", "The Syncthing admin interface is configured to allow remote access without a password.": "Syncthing 管理介面被設定允許無密碼的遠端存取。", "The aggregated statistics are publicly available at the URL below.": "匯總統計資訊可於下方網址取得。", - "The cleanup interval cannot be blank.": "The cleanup interval cannot be blank.", + "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.": "裝置識別碼不能為空白。", "The device ID to enter here can be found in the \"Actions > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "其它裝置的裝置識別碼可在它們的 \"操作 > 顯示識別碼\" 對話框找到。空白及連接符號可省略。", - "The encrypted usage report is sent daily. It is used to track common platforms, folder sizes and app versions. If the reported data set is changed you will be prompted with this dialog again.": "經過加密的使用資訊報告會每天傳送。報告是用來追蹤常用的平台、資料夾大小以及應用程式版本。若傳送的資料集有異動，您會再次看到這個對話框。", + "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.": "輸入的裝置識別碼似乎無效。它應該為一串長度為 52 或 56 個字元長的半形英文字母及數字，並可能會含有額外的空白或連接符號。", "The folder ID cannot be blank.": "資料夾識別碼不能為空白。", "The folder ID must be unique.": "資料夾識別碼必須為獨一無二的。", "The folder path cannot be blank.": "資料夾路徑不能空白。", "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "使用下列的間隔：在第一個小時內每 30 秒保留一個版本，在第一天內每小時保留一個版本，在第 30 天內每一天保留一個版本，在達到最長保留時間前每一星期保留一個版本。", "The following items could not be synchronized.": "無法同步以下項目。", - "The following items were changed locally.": "The following items were changed locally.", - "The following unexpected items were found.": "The following unexpected items were found.", - "The interval must be a positive number of seconds.": "The interval must be a positive number of seconds.", - "The interval, in seconds, for running cleanup in the versions directory. Zero to disable periodic cleaning.": "The interval, in seconds, for running cleanup in the versions directory. Zero to disable periodic cleaning.", + "The following items were changed locally.": "以下項目在本機進行了變更。", + "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.": "天數必須必須為一個數字且不得為空。", @@ -336,8 +342,8 @@ "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.": "重新掃描間隔必須為一個非負數的秒數。", - "There are no devices to share this folder with.": "There are no devices to share this folder with.", - "There are no folders to share with this device.": "There are no folders to share with this device.", + "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.": "解決問題後，將會自動重試和同步。", "This Device": "本機", "This can easily give hackers access to read and change any files on your computer.": "這能給駭客輕易的來讀取、變更電腦中的任何檔案。", @@ -347,35 +353,35 @@ "Time the item was last modified": "前次修改時間", "Trash Can File Versioning": "垃圾筒式檔案版本控制", "Type": "類型", - "UNIX Permissions": "UNIX Permissions", + "UNIX Permissions": "UNIX 權限", "Unavailable": "無法使用", "Unavailable/Disabled by administrator or maintainer": "無法使用 / 被系統管理員或維護者停用", "Undecided (will prompt)": "未決定（將會提示）", - "Unexpected Items": "Unexpected Items", - "Unexpected items have been found in this folder.": "Unexpected items have been found in this folder.", - "Unignore": "Unignore", + "Unexpected Items": "不預期的項目", + "Unexpected items have been found in this folder.": "在此資料夾中發現不預期項目。", + "Unignore": "未忽略", "Unknown": "未知", "Unshared": "未共享", - "Unshared Devices": "Unshared Devices", - "Unshared Folders": "Unshared Folders", - "Untrusted": "Untrusted", + "Unshared Devices": "未共享的裝置", + "Unshared Folders": "未共享的資料夾", + "Untrusted": "不信任", "Up to Date": "最新", "Updated": "已更新", - "Upgrade": "升級", - "Upgrade To {%version%}": "升級至 {{version}}", + "Upgrade": "更新", + "Upgrade To {%version%}": "更新至 {{version}}", "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", - "Username/Password has not been set for the GUI authentication. Please consider setting it up.": "Username/Password has not been set for the GUI authentication. Please consider setting it up.", + "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.": "當檔案歷史版本的存留時間大於設定的最大值，或是其數量在一段時間內超出允許值時，則會被刪除。", - "Waiting to Clean": "Waiting to Clean", - "Waiting to Scan": "Waiting to Scan", - "Waiting to Sync": "Waiting to Sync", + "Waiting to Clean": "正在等待清除", + "Waiting to Scan": "正在等待掃描", + "Waiting to Sync": "正在等待同步", "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}}\" 的下級目錄。", @@ -383,7 +389,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.", + "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.": "當新增一個資料夾時，請記住，資料夾識別碼是用來將裝置之間的資料夾綁定在一起的。它們有區分大小寫，且必須在所有裝置之間完全相同。", "Yes": "是", @@ -392,16 +398,16 @@ "You can read more about the two release channels at the link below.": "您可於下方連結閱讀更多關於發行頻道的說明。", "You have no ignored devices.": "您沒有已忽略的裝置。\n", "You have no ignored folders.": "您沒有已忽略的資料夾。\n", - "You have unsaved changes. Do you really want to discard them?": "You have unsaved changes. Do you really want to discard them?", + "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.": "You should never add or change anything locally in a \"{{receiveEncrypted}}\" folder.", + "You should never add or change anything locally in a \"{%receiveEncrypted%}\" folder.": "您不應該在 \"{{receiveEncrypted}}\" 資料夾中新增或變更任何內容。", "days": "日", - "directories": "directories", + "directories": "目錄", "files": "個檔案", "full documentation": "完整說明文件", "items": "個項目", - "seconds": "seconds", - "{%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." + "seconds": "秒", + "{%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/syncthing/core/aboutModalView.html b/gui/default/syncthing/core/aboutModalView.html index 2ade3d6c0..507a44cd5 100644 --- a/gui/default/syncthing/core/aboutModalView.html +++ b/gui/default/syncthing/core/aboutModalView.html @@ -19,7 +19,7 @@

The Syncthing Authors

-Jakob Borg, Audrius Butkevicius, Simon Frei, Alexander Graf, Alexandre Viau, Anderson Mesquita, André Colomb, Antony Male, Ben Schulz, Caleb Callaway, Daniel Harte, Evgeny Kuznetsov, Lars K.W. Gohlke, Lode Hoste, Michael Ploujnikov, Nate Morrison, Philippe Schommers, Ryan Sullivan, Sergey Mishin, Stefan Tatschner, Tomasz Wilczyński, Wulf Weich, dependabot-preview[bot], greatroar, Aaron Bieber, Adam Piggott, Adel Qalieh, Alan Pope, Alberto Donato, Alessandro G., Alex Lindeman, Alex Xu, Aman Gupta, Andrew Dunham, Andrew Rabert, Andrey D, Anjan Momi, Antoine Lamielle, Aranjedeath, Arkadiusz Tymiński, Arthur Axel fREW Schmidt, Artur Zubilewicz, Aurélien Rainone, BAHADIR YILMAZ, Bart De Vries, Ben Curthoys, Ben Shepherd, Ben Sidhom, Benedikt Heine, Benedikt Morbach, Benno Fünfstück, Benny Ng, Boqin Qin, Boris Rybalkin, Brandon Philips, Brendan Long, Brian R. Becker, Carsten Hagemann, Cathryne Linenweaver, Cedric Staniewski, Choongkyu, Chris Howie, Chris Joel, Chris Tonkinson, Christian Prescott, Colin Kennedy, Cromefire_, Cyprien Devillez, Dale Visser, Dan, Daniel Bergmann, Daniel Martí, Darshil Chanpura, David Rimmer, Denis A., Dennis Wilson, Dmitry Saveliev, Domenic Horner, Dominik Heidler, Elias Jarlebring, Elliot Huffman, Emil Hessman, Eric Lesiuta, Erik Meitner, Federico Castagnini, Felix Ableitner, Felix Lampe, Felix Unterpaintner, Francois-Xavier Gsell, Frank Isemann, Gilli Sigurdsson, Gleb Sinyavskiy, Graham Miln, Han Boetes, HansK-p, Harrison Jones, Heiko Zuerker, Hugo Locurcio, Iain Barnett, Ian Johnson, Ilya Brin, Iskander Sharipov, Jaakko Hannikainen, Jacek Szafarkiewicz, Jack Croft, Jacob, Jake Peterson, James Patterson, Jaroslav Lichtblau, Jaroslav Malec, Jaya Chithra, Jens Diemer, Jerry Jacobs, Jochen Voss, Johan Andersson, Johan Vromans, John Rinehart, Jonas Thelemann, Jonathan, Jonathan Cross, Jose Manuel Delicado, Jörg Thalheim, Jędrzej Kula, Kalle Laine, Karol Różycki, Keith Turner, Kelong Cong, Ken'ichi Kamada, Kevin Allen, Kevin Bushiri, Kevin White, Jr., Kurt Fitzner, Laurent Arnoud, Laurent Etiemble, Leo Arias, Liu Siyuan, Lord Landon Agahnim, Lukas Lihotzki, Majed Abdulaziz, Marc Laporte, Marc Pujol, Marcin Dziadus, Marcus Legendre, Mario Majila, Mark Pulford, Mateusz Naściszewski, Mateusz Ż, Matic Potočnik, Matt Burke, Matt Robenolt, Matteo Ruina, Maurizio Tomasi, Max Schulze, MaximAL, Maxime Thirouin, Michael Jephcote, Michael Rienstra, Michael Tilli, Mike Boone, MikeLund, MikolajTwarog, Mingxuan Lin, Nicholas Rishel, Nico Stapelbroek, Nicolas Braud-Santoni, Nicolas Perraut, Niels Peter Roest, Nils Jakobi, NinoM4ster, Nitroretro, NoLooseEnds, Oliver Freyermuth, Otiel, Oyebanji Jacob Mayowa, Pablo, Pascal Jungblut, Paul Brit, Pawel Palenica, Paweł Rozlach, Peter Badida, Peter Dave Hello, Peter Hoeg, Peter Marquardt, Phani Rithvij, Phil Davis, Phill Luby, Pier Paolo Ramon, Piotr Bejda, Pramodh KP, Quentin Hibon, Rahmi Pruitt, Richard Hartmann, Robert Carosi, Roberto Santalla, Robin Schoonover, Roman Zaynetdinov, Ross Smith II, Ruslan Yevdokymov, Sacheendra Talluri, Scott Klupfel, Shaarad Dalvi, Simon Mwepu, Sly_tom_cat, Stefan Kuntz, Suhas Gundimeda, Taylor Khan, Thomas Hipp, Tim Abell, Tim Howes, Tobias Klauser, Tobias Nygren, Tobias Tom, Tom Jakubowski, Tommy Thorn, Tully Robinson, Tyler Brazier, Tyler Kropp, Unrud, Veeti Paananen, Victor Buinsky, Vil Brekin, Vladimir Rusinov, William A. Kennington III, Xavier O., Yannic A., andresvia, andyleap, boomsquared, chenrui, chucic, dependabot[bot], derekriemer, desbma, georgespatton, ghjklw, janost, jaseg, jelle van der Waa, klemens, marco-m, mv1005, otbutz, perewa, rubenbe, wangguoliang, xarx00, xjtdy888, 佛跳墙 +Jakob Borg, Audrius Butkevicius, Jesse Lucas, Simon Frei, Alexander Graf, Alexandre Viau, Anderson Mesquita, André Colomb, Antony Male, Ben Schulz, Caleb Callaway, Daniel Harte, Evgeny Kuznetsov, Lars K.W. Gohlke, Lode Hoste, Michael Ploujnikov, Nate Morrison, Philippe Schommers, Ryan Sullivan, Sergey Mishin, Stefan Tatschner, Tomasz Wilczyński, Wulf Weich, dependabot-preview[bot], greatroar, Aaron Bieber, Adam Piggott, Adel Qalieh, Alan Pope, Alberto Donato, Alessandro G., Alex Lindeman, Alex Xu, Aman Gupta, Andrew Dunham, Andrew Rabert, Andrey D, Anjan Momi, Antoine Lamielle, Aranjedeath, Arkadiusz Tymiński, Arthur Axel fREW Schmidt, Artur Zubilewicz, Aurélien Rainone, BAHADIR YILMAZ, Bart De Vries, Ben Curthoys, Ben Shepherd, Ben Sidhom, Benedikt Heine, Benedikt Morbach, Benno Fünfstück, Benny Ng, Boqin Qin, Boris Rybalkin, Brandon Philips, Brendan Long, Brian R. Becker, Carsten Hagemann, Cathryne Linenweaver, Cedric Staniewski, Choongkyu, Chris Howie, Chris Joel, Chris Tonkinson, Christian Prescott, Colin Kennedy, Cromefire_, Cyprien Devillez, Dale Visser, Dan, Daniel Bergmann, Daniel Martí, Darshil Chanpura, David Rimmer, Denis A., Dennis Wilson, Dmitry Saveliev, Domenic Horner, Dominik Heidler, Elias Jarlebring, Elliot Huffman, Emil Hessman, Eric Lesiuta, Erik Meitner, Federico Castagnini, Felix Ableitner, Felix Lampe, Felix Unterpaintner, Francois-Xavier Gsell, Frank Isemann, Gilli Sigurdsson, Gleb Sinyavskiy, Graham Miln, Han Boetes, HansK-p, Harrison Jones, Heiko Zuerker, Hugo Locurcio, Iain Barnett, Ian Johnson, Ilya Brin, Iskander Sharipov, Jaakko Hannikainen, Jacek Szafarkiewicz, Jack Croft, Jacob, Jake Peterson, James Patterson, Jaroslav Lichtblau, Jaroslav Malec, Jaya Chithra, Jens Diemer, Jerry Jacobs, Jochen Voss, Johan Andersson, Johan Vromans, John Rinehart, Jonas Thelemann, Jonathan, Jonathan Cross, Jose Manuel Delicado, Jörg Thalheim, Jędrzej Kula, Kalle Laine, Karol Różycki, Keith Turner, Kelong Cong, Ken'ichi Kamada, Kevin Allen, Kevin Bushiri, Kevin White, Jr., Kurt Fitzner, Laurent Arnoud, Laurent Etiemble, Leo Arias, Liu Siyuan, Lord Landon Agahnim, Lukas Lihotzki, Majed Abdulaziz, Marc Laporte, Marc Pujol, Marcin Dziadus, Marcus Legendre, Mario Majila, Mark Pulford, Mateusz Naściszewski, Mateusz Ż, Matic Potočnik, Matt Burke, Matt Robenolt, Matteo Ruina, Maurizio Tomasi, Max Schulze, MaximAL, Maxime Thirouin, Michael Jephcote, Michael Rienstra, Michael Tilli, Mike Boone, MikeLund, MikolajTwarog, Mingxuan Lin, Nicholas Rishel, Nico Stapelbroek, Nicolas Braud-Santoni, Nicolas Perraut, Niels Peter Roest, Nils Jakobi, NinoM4ster, Nitroretro, NoLooseEnds, Oliver Freyermuth, Otiel, Oyebanji Jacob Mayowa, Pablo, Pascal Jungblut, Paul Brit, Pawel Palenica, Paweł Rozlach, Peter Badida, Peter Dave Hello, Peter Hoeg, Peter Marquardt, Phani Rithvij, Phil Davis, Phill Luby, Pier Paolo Ramon, Piotr Bejda, Pramodh KP, Quentin Hibon, Rahmi Pruitt, Richard Hartmann, Robert Carosi, Roberto Santalla, Robin Schoonover, Roman Zaynetdinov, Ross Smith II, Ruslan Yevdokymov, Sacheendra Talluri, Scott Klupfel, Shaarad Dalvi, Simon Mwepu, Sly_tom_cat, Stefan Kuntz, Suhas Gundimeda, Taylor Khan, Thomas Hipp, Tim Abell, Tim Howes, Tobias Klauser, Tobias Nygren, Tobias Tom, Tom Jakubowski, Tommy Thorn, Tully Robinson, Tyler Brazier, Tyler Kropp, Unrud, Veeti Paananen, Victor Buinsky, Vil Brekin, Vladimir Rusinov, William A. Kennington III, Xavier O., Yannic A., andresvia, andyleap, boomsquared, chenrui, chucic, dependabot[bot], derekriemer, desbma, georgespatton, ghjklw, janost, jaseg, jelle van der Waa, klemens, marco-m, mv1005, otbutz, perewa, rubenbe, wangguoliang, xarx00, xjtdy888, 佛跳墙
diff --git a/man/stdiscosrv.1 b/man/stdiscosrv.1 index b931cfdbd..9ddb21f6b 100644 --- a/man/stdiscosrv.1 +++ b/man/stdiscosrv.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "STDISCOSRV" "1" "Feb 08, 2021" "v1" "Syncthing" +.TH "STDISCOSRV" "1" "Feb 17, 2021" "v1" "Syncthing" .SH NAME stdiscosrv \- Syncthing Discovery Server . diff --git a/man/strelaysrv.1 b/man/strelaysrv.1 index eea0e645b..6b688083a 100644 --- a/man/strelaysrv.1 +++ b/man/strelaysrv.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "STRELAYSRV" "1" "Feb 08, 2021" "v1" "Syncthing" +.TH "STRELAYSRV" "1" "Feb 17, 2021" "v1" "Syncthing" .SH NAME strelaysrv \- Syncthing Relay Server . diff --git a/man/syncthing-bep.7 b/man/syncthing-bep.7 index ba2809b5e..d0902b354 100644 --- a/man/syncthing-bep.7 +++ b/man/syncthing-bep.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-BEP" "7" "Feb 08, 2021" "v1" "Syncthing" +.TH "SYNCTHING-BEP" "7" "Feb 17, 2021" "v1" "Syncthing" .SH NAME syncthing-bep \- Block Exchange Protocol v1 . diff --git a/man/syncthing-config.5 b/man/syncthing-config.5 index 79dc423a7..9eac633e0 100644 --- a/man/syncthing-config.5 +++ b/man/syncthing-config.5 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-CONFIG" "5" "Feb 08, 2021" "v1" "Syncthing" +.TH "SYNCTHING-CONFIG" "5" "Feb 17, 2021" "v1" "Syncthing" .SH NAME syncthing-config \- Syncthing Configuration . @@ -397,6 +397,14 @@ a 1 GB file even if there is 1 KB file available on the source device until the 1 KB becomes known to the pulling device. .TP .B ignoreDelete +. +\fBWARNING:\fP +.INDENT 7.0 +.INDENT 3.5 +Enabling this is highly not recommended \- use at your own risk. +.UNINDENT +.UNINDENT +.sp When set to true, this device will pretend not to see instructions to delete files from other devices. .TP diff --git a/man/syncthing-device-ids.7 b/man/syncthing-device-ids.7 index 84a4a26a0..a9bd8e03a 100644 --- a/man/syncthing-device-ids.7 +++ b/man/syncthing-device-ids.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-DEVICE-IDS" "7" "Feb 08, 2021" "v1" "Syncthing" +.TH "SYNCTHING-DEVICE-IDS" "7" "Feb 17, 2021" "v1" "Syncthing" .SH NAME syncthing-device-ids \- Understanding Device IDs . diff --git a/man/syncthing-event-api.7 b/man/syncthing-event-api.7 index cb55f523a..c58063baa 100644 --- a/man/syncthing-event-api.7 +++ b/man/syncthing-event-api.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-EVENT-API" "7" "Feb 08, 2021" "v1" "Syncthing" +.TH "SYNCTHING-EVENT-API" "7" "Feb 17, 2021" "v1" "Syncthing" .SH NAME syncthing-event-api \- Event API . diff --git a/man/syncthing-faq.7 b/man/syncthing-faq.7 index dd726fe62..3b603fe0a 100644 --- a/man/syncthing-faq.7 +++ b/man/syncthing-faq.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-FAQ" "7" "Feb 08, 2021" "v1" "Syncthing" +.TH "SYNCTHING-FAQ" "7" "Feb 17, 2021" "v1" "Syncthing" .SH NAME syncthing-faq \- Frequently Asked Questions . diff --git a/man/syncthing-globaldisco.7 b/man/syncthing-globaldisco.7 index 52409d2cd..9d777c002 100644 --- a/man/syncthing-globaldisco.7 +++ b/man/syncthing-globaldisco.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-GLOBALDISCO" "7" "Feb 08, 2021" "v1" "Syncthing" +.TH "SYNCTHING-GLOBALDISCO" "7" "Feb 17, 2021" "v1" "Syncthing" .SH NAME syncthing-globaldisco \- Global Discovery Protocol v3 . diff --git a/man/syncthing-localdisco.7 b/man/syncthing-localdisco.7 index dad91d7f9..7fd468513 100644 --- a/man/syncthing-localdisco.7 +++ b/man/syncthing-localdisco.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-LOCALDISCO" "7" "Feb 08, 2021" "v1" "Syncthing" +.TH "SYNCTHING-LOCALDISCO" "7" "Feb 17, 2021" "v1" "Syncthing" .SH NAME syncthing-localdisco \- Local Discovery Protocol v4 . diff --git a/man/syncthing-networking.7 b/man/syncthing-networking.7 index da69c8abb..cc2c49265 100644 --- a/man/syncthing-networking.7 +++ b/man/syncthing-networking.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-NETWORKING" "7" "Feb 08, 2021" "v1" "Syncthing" +.TH "SYNCTHING-NETWORKING" "7" "Feb 17, 2021" "v1" "Syncthing" .SH NAME syncthing-networking \- Firewall Setup . diff --git a/man/syncthing-relay.7 b/man/syncthing-relay.7 index 68d195f4a..5e670194a 100644 --- a/man/syncthing-relay.7 +++ b/man/syncthing-relay.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-RELAY" "7" "Feb 08, 2021" "v1" "Syncthing" +.TH "SYNCTHING-RELAY" "7" "Feb 17, 2021" "v1" "Syncthing" .SH NAME syncthing-relay \- Relay Protocol v1 . diff --git a/man/syncthing-rest-api.7 b/man/syncthing-rest-api.7 index 3773384fe..12d2c89e9 100644 --- a/man/syncthing-rest-api.7 +++ b/man/syncthing-rest-api.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-REST-API" "7" "Feb 08, 2021" "v1" "Syncthing" +.TH "SYNCTHING-REST-API" "7" "Feb 17, 2021" "v1" "Syncthing" .SH NAME syncthing-rest-api \- REST API . diff --git a/man/syncthing-security.7 b/man/syncthing-security.7 index de825165b..a2b855656 100644 --- a/man/syncthing-security.7 +++ b/man/syncthing-security.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-SECURITY" "7" "Feb 08, 2021" "v1" "Syncthing" +.TH "SYNCTHING-SECURITY" "7" "Feb 17, 2021" "v1" "Syncthing" .SH NAME syncthing-security \- Security Principles . diff --git a/man/syncthing-stignore.5 b/man/syncthing-stignore.5 index 96d2548c3..4e7665abe 100644 --- a/man/syncthing-stignore.5 +++ b/man/syncthing-stignore.5 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-STIGNORE" "5" "Feb 08, 2021" "v1" "Syncthing" +.TH "SYNCTHING-STIGNORE" "5" "Feb 17, 2021" "v1" "Syncthing" .SH NAME syncthing-stignore \- Prevent files from being synchronized to other nodes . diff --git a/man/syncthing-versioning.7 b/man/syncthing-versioning.7 index 36f34673c..7f67d9a49 100644 --- a/man/syncthing-versioning.7 +++ b/man/syncthing-versioning.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-VERSIONING" "7" "Feb 08, 2021" "v1" "Syncthing" +.TH "SYNCTHING-VERSIONING" "7" "Feb 17, 2021" "v1" "Syncthing" .SH NAME syncthing-versioning \- Keep automatic backups of deleted files by other nodes . @@ -50,7 +50,7 @@ not and can not archive the old version. .SH TRASH CAN FILE VERSIONING .sp This versioning strategy emulates the common “trash can” approach. When a file -is deleted or replaced due to a change on a remote device, it is a moved to +is deleted or replaced due to a change on a remote device, it is moved to the trash can in the \fB\&.stversions\fP folder. If a file with the same name was already in the trash can it is replaced. .sp @@ -182,21 +182,24 @@ behavior as mentioned above. I created the following script and saved it as .ft C @echo off -:: We need command extensions for mkdir to create intermediate folders in one go +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 -:: Where I want my versions stored -set VERSIONS_PATH=%USERPROFILE%\e.trashcan +rem Where I want my versions stored +set "VERSIONS_PATH=%USERPROFILE%\e.trashcan" -:: The parameters we get from Syncthing, \(aq~\(aq removes quotes if any -set FOLDER_PATH=%~1 -set FILE_PATH=%~2 +rem The parameters we get from Syncthing, \(aq~\(aq removes quotes if any +set "FOLDER_PATH=%~1" +set "FILE_PATH=%~2" -:: 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%" mkdir "%OUTPUT_PATH%" || exit /B +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 -:: Finally move the file, overwrite existing file if any +rem Finally move the file, overwrite existing file if any move /Y "%FOLDER_PATH%\e%FILE_PATH%" "%VERSIONS_PATH%\e%FILE_PATH%" .ft P .fi diff --git a/man/syncthing.1 b/man/syncthing.1 index f06fdddda..8b6effcd9 100644 --- a/man/syncthing.1 +++ b/man/syncthing.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING" "1" "Feb 08, 2021" "v1" "Syncthing" +.TH "SYNCTHING" "1" "Feb 17, 2021" "v1" "Syncthing" .SH NAME syncthing \- Syncthing . From 2a0775da03024aeaa6d2f59767f4a3bd17709de3 Mon Sep 17 00:00:00 2001 From: tomasz1986 Date: Wed, 17 Feb 2021 16:29:25 +0900 Subject: [PATCH 05/15] gui: Hide non-functional Versions button when using External Versioning (#7365) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The button does nothing when the External Versioning is being used, so it should not be displayed at all to avoid confusing the users. Signed-off-by: Tomasz Wilczyński --- gui/default/index.html | 2 +- gui/default/untrusted/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gui/default/index.html b/gui/default/index.html index 300951fcb..25b7c66ae 100644 --- a/gui/default/index.html +++ b/gui/default/index.html @@ -548,7 +548,7 @@ - - - -
-
- - +
+ +

Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).

diff --git a/gui/default/untrusted/syncthing/core/syncthingController.js b/gui/default/untrusted/syncthing/core/syncthingController.js index 1f57e5db9..335d96f50 100755 --- a/gui/default/untrusted/syncthing/core/syncthingController.js +++ b/gui/default/untrusted/syncthing/core/syncthingController.js @@ -71,7 +71,7 @@ angular.module('syncthing.core') simpleKeep: 5, staggeredMaxAge: 365, staggeredCleanInterval: 3600, - staggeredVersionsPath: "", + versionsPath: "", externalCommand: "", }; @@ -1919,17 +1919,19 @@ angular.module('syncthing.core') case "trashcan": $scope.currentFolder._guiVersioning.selector = "trashcan"; $scope.currentFolder._guiVersioning.trashcanClean = +currentVersioning.params.cleanoutDays; + $scope.currentFolder._guiVersioning.versionsPath = currentVersioning.params.versionsPath; break; case "simple": $scope.currentFolder._guiVersioning.selector = "simple"; $scope.currentFolder._guiVersioning.simpleKeep = +currentVersioning.params.keep; $scope.currentFolder._guiVersioning.trashcanClean = +currentVersioning.params.cleanoutDays; + $scope.currentFolder._guiVersioning.versionsPath = currentVersioning.params.versionsPath; break; case "staggered": $scope.currentFolder._guiVersioning.selector = "staggered"; $scope.currentFolder._guiVersioning.staggeredMaxAge = Math.floor(+currentVersioning.params.maxAge / 86400); $scope.currentFolder._guiVersioning.staggeredCleanInterval = +currentVersioning.params.cleanInterval; - $scope.currentFolder._guiVersioning.staggeredVersionsPath = currentVersioning.params.versionsPath; + $scope.currentFolder._guiVersioning.versionsPath = currentVersioning.params.versionsPath; break; case "external": $scope.currentFolder._guiVersioning.selector = "external"; @@ -2060,7 +2062,8 @@ angular.module('syncthing.core') folderCfg.versioning = { 'type': 'trashcan', 'params': { - 'cleanoutDays': '' + folderCfg._guiVersioning.trashcanClean + 'cleanoutDays': '' + folderCfg._guiVersioning.trashcanClean, + 'versionsPath': '' + folderCfg._guiVersioning.versionsPath }, 'cleanupIntervalS': folderCfg._guiVersioning.cleanupIntervalS }; @@ -2070,7 +2073,8 @@ angular.module('syncthing.core') 'type': 'simple', 'params': { 'keep': '' + folderCfg._guiVersioning.simpleKeep, - 'cleanoutDays': '' + folderCfg._guiVersioning.trashcanClean + 'cleanoutDays': '' + folderCfg._guiVersioning.trashcanClean, + 'versionsPath': '' + folderCfg._guiVersioning.versionsPath }, 'cleanupIntervalS': folderCfg._guiVersioning.cleanupIntervalS }; @@ -2081,7 +2085,7 @@ angular.module('syncthing.core') 'params': { 'maxAge': '' + (folderCfg._guiVersioning.staggeredMaxAge * 86400), 'cleanInterval': '' + folderCfg._guiVersioning.staggeredCleanInterval, - 'versionsPath': '' + folderCfg._guiVersioning.staggeredVersionsPath + 'versionsPath': '' + folderCfg._guiVersioning.versionsPath }, 'cleanupIntervalS': folderCfg._guiVersioning.cleanupIntervalS }; diff --git a/gui/default/untrusted/syncthing/folder/editFolderModalView.html b/gui/default/untrusted/syncthing/folder/editFolderModalView.html index 440171d78..5e299e592 100644 --- a/gui/default/untrusted/syncthing/folder/editFolderModalView.html +++ b/gui/default/untrusted/syncthing/folder/editFolderModalView.html @@ -120,9 +120,9 @@ A negative number of days doesn't make sense.

-
- - +
+ +

Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).

From edaff81c0a4b4992df209b0aa0daa73a60b53ca0 Mon Sep 17 00:00:00 2001 From: tomasz1986 Date: Sat, 20 Feb 2021 01:49:56 +0900 Subject: [PATCH 12/15] gui: Remove cleanupIntervalS leftovers from External Versioning (ref #7360) (#7378) --- gui/default/syncthing/core/syncthingController.js | 1 - gui/default/untrusted/syncthing/core/syncthingController.js | 1 - gui/default/untrusted/syncthing/folder/editFolderModalView.html | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/gui/default/syncthing/core/syncthingController.js b/gui/default/syncthing/core/syncthingController.js index 4fd6fb723..95850b3ff 100755 --- a/gui/default/syncthing/core/syncthingController.js +++ b/gui/default/syncthing/core/syncthingController.js @@ -2077,7 +2077,6 @@ angular.module('syncthing.core') 'params': { 'command': '' + folderCfg._guiVersioning.externalCommand }, - 'cleanupIntervalS': folderCfg._guiVersioning.cleanupIntervalS }; break; default: diff --git a/gui/default/untrusted/syncthing/core/syncthingController.js b/gui/default/untrusted/syncthing/core/syncthingController.js index 335d96f50..b299c07bb 100755 --- a/gui/default/untrusted/syncthing/core/syncthingController.js +++ b/gui/default/untrusted/syncthing/core/syncthingController.js @@ -2096,7 +2096,6 @@ angular.module('syncthing.core') 'params': { 'command': '' + folderCfg._guiVersioning.externalCommand }, - 'cleanupIntervalS': folderCfg._guiVersioning.cleanupIntervalS }; break; default: diff --git a/gui/default/untrusted/syncthing/folder/editFolderModalView.html b/gui/default/untrusted/syncthing/folder/editFolderModalView.html index 5e299e592..bd1ecb188 100644 --- a/gui/default/untrusted/syncthing/folder/editFolderModalView.html +++ b/gui/default/untrusted/syncthing/folder/editFolderModalView.html @@ -134,7 +134,7 @@ The path cannot be blank.

-
+
From cd17aa2cab8242a372409af444ba64599d2f9a5d Mon Sep 17 00:00:00 2001 From: tomasz1986 Date: Sat, 20 Feb 2021 19:26:34 +0900 Subject: [PATCH 13/15] gui: Show "Last seen" at the top when device is disconnected (ref #7166) (#7373) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move the "Last seen" field to the very top in the device information. This way, if a device has disconnected unexpectly, we can quickly check the time when it was last available. Right now, due to the very long address field, it is usually necessary to scroll down in order to view the "Last seen" field. Signed-off-by: Tomasz Wilczyński --- gui/default/index.html | 10 +++++----- gui/default/untrusted/index.html | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gui/default/index.html b/gui/default/index.html index 84dc0f97f..e68e83f65 100644 --- a/gui/default/index.html +++ b/gui/default/index.html @@ -708,6 +708,11 @@
+ + + + + - - - - - diff --git a/gui/default/untrusted/index.html b/gui/default/untrusted/index.html index f0dd1d4e4..e30fe7837 100644 --- a/gui/default/untrusted/index.html +++ b/gui/default/untrusted/index.html @@ -720,6 +720,11 @@
 Last seenNever{{deviceStats[deviceCfg.deviceID].lastSeen | date:"yyyy-MM-dd HH:mm:ss"}}
 Download Rate @@ -793,11 +798,6 @@  Version {{connections[deviceCfg.deviceID].clientVersion}}
 Last seenNever{{deviceStats[deviceCfg.deviceID].lastSeen | date:"yyyy-MM-dd HH:mm:ss"}}
 Folders {{deviceFolders(deviceCfg).map(folderLabel).join(", ")}}
+ + + + + - - - - - From 8d290eb05505183bf03bcd42d171d8bdbf7657e9 Mon Sep 17 00:00:00 2001 From: tomasz1986 Date: Sat, 20 Feb 2021 19:28:08 +0900 Subject: [PATCH 14/15] gui: Handle info labels that are longer than available space (fixes #944) (#7386) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Apply to table headers the same code as already used for table data. This way, the headers will be either pushed to the next line, or cut with an ellipsis if the single word is too long. Signed-off-by: Tomasz Wilczyński --- gui/default/assets/css/overrides.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gui/default/assets/css/overrides.css b/gui/default/assets/css/overrides.css index 7930d73b8..e449ab879 100644 --- a/gui/default/assets/css/overrides.css +++ b/gui/default/assets/css/overrides.css @@ -120,7 +120,8 @@ table.table-dynamic { word-break: break-all; } -table.table-condensed td { +table.table-condensed td, +table.table-condensed th { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; @@ -363,7 +364,8 @@ ul.three-columns li, ul.two-columns li { overflow-y: scroll; } - table.table-condensed td { + table.table-condensed td, + table.table-condensed th { /* for mobile phones to allow linebreaks in long repro folder/shared with * columns. */ white-space: normal; From 60c218efdbb109821ddb574e8e30fa73a9cd819b Mon Sep 17 00:00:00 2001 From: tomasz1986 Date: Sat, 20 Feb 2021 22:56:45 +0900 Subject: [PATCH 15/15] all: Fix Microsoft documentation links in code comments (#7387) --- lib/fs/basicfs_copy_range_duplicateextents.go | 2 +- lib/fs/basicfs_lstat_windows.go | 2 +- lib/fs/debug_symlink_windows.go | 4 ++-- lib/fs/util.go | 2 +- lib/osutil/lowprio_windows.go | 2 +- lib/syncthing/superuser_windows.go | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/fs/basicfs_copy_range_duplicateextents.go b/lib/fs/basicfs_copy_range_duplicateextents.go index 58dacd324..bdef5d39a 100644 --- a/lib/fs/basicfs_copy_range_duplicateextents.go +++ b/lib/fs/basicfs_copy_range_duplicateextents.go @@ -121,7 +121,7 @@ func wrapError(err error) error { } // call FSCTL_DUPLICATE_EXTENTS_TO_FILE IOCTL -// see https://docs.microsoft.com/en-us/windows/win32/api/winioctl/ni-winioctl-fsctl_duplicate_extents_to_file +// see https://docs.microsoft.com/windows/win32/api/winioctl/ni-winioctl-fsctl_duplicate_extents_to_file // // memo: Overflow (cloneRegionSize is greater than file ends) is safe and just ignored by windows. func callDuplicateExtentsToFile(src, dst uintptr, srcOffset, dstOffset int64, cloneRegionSize int64) error { diff --git a/lib/fs/basicfs_lstat_windows.go b/lib/fs/basicfs_lstat_windows.go index ccf113814..0522e6845 100644 --- a/lib/fs/basicfs_lstat_windows.go +++ b/lib/fs/basicfs_lstat_windows.go @@ -29,7 +29,7 @@ func isDirectoryJunction(path string) (bool, error) { } defer syscall.CloseHandle(h) - //https://docs.microsoft.com/en-us/windows/win32/api/winbase/ns-winbase-file_attribute_tag_info + //https://docs.microsoft.com/windows/win32/api/winbase/ns-winbase-file_attribute_tag_info const fileAttributeTagInfo = 9 type FILE_ATTRIBUTE_TAG_INFO struct { FileAttributes uint32 diff --git a/lib/fs/debug_symlink_windows.go b/lib/fs/debug_symlink_windows.go index c21989d30..14e1b0031 100644 --- a/lib/fs/debug_symlink_windows.go +++ b/lib/fs/debug_symlink_windows.go @@ -66,7 +66,7 @@ func DebugSymlinkForTestsOnly(oldFs, newFS Filesystem, oldname, newname string) // or contains .. elements), or is short enough, fixLongPath returns // path unmodified. // -// See https://msdn.microsoft.com/en-us/library/windows/desktop/aa365247(v=vs.85).aspx#maxpath +// See https://docs.microsoft.com/windows/win32/fileio/naming-a-file#maximum-path-length-limitation func fixLongPath(path string) string { // Do nothing (and don't allocate) if the path is "short". // Empirically (at least on the Windows Server 2013 builder), @@ -77,7 +77,7 @@ func fixLongPath(path string) string { // name (that is, the directory name cannot exceed MAX_PATH // minus 12)." Since MAX_PATH is 260, 260 - 12 = 248. // - // The MSDN docs appear to say that a normal path that is 248 bytes long + // The MS docs appear to say that a normal path that is 248 bytes long // will work; empirically the path must be less than 248 bytes long. if len(path) < 248 { // Don't fix. (This is how Go 1.7 and earlier worked, diff --git a/lib/fs/util.go b/lib/fs/util.go index 7a9f05d12..ee9969e18 100644 --- a/lib/fs/util.go +++ b/lib/fs/util.go @@ -63,7 +63,7 @@ func WindowsInvalidFilename(name string) error { // None of the path components should end in space or period, or be a // reserved name. COM0 and LPT0 are missing from the Microsoft docs, // but Windows Explorer treats them as invalid too. - // (https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file) + // (https://docs.microsoft.com/windows/win32/fileio/naming-a-file) for _, part := range strings.Split(name, `\`) { if len(part) == 0 { continue diff --git a/lib/osutil/lowprio_windows.go b/lib/osutil/lowprio_windows.go index 75609ec13..2402e369e 100644 --- a/lib/osutil/lowprio_windows.go +++ b/lib/osutil/lowprio_windows.go @@ -13,7 +13,7 @@ import ( ) const ( - // https://msdn.microsoft.com/en-us/library/windows/desktop/ms686219(v=vs.85).aspx + // https://docs.microsoft.com/windows/win32/api/processthreadsapi/nf-processthreadsapi-setpriorityclass aboveNormalPriorityClass = 0x00008000 belowNormalPriorityClass = 0x00004000 highPriorityClass = 0x00000080 diff --git a/lib/syncthing/superuser_windows.go b/lib/syncthing/superuser_windows.go index 42de5a6b4..96ef3e44d 100644 --- a/lib/syncthing/superuser_windows.go +++ b/lib/syncthing/superuser_windows.go @@ -8,7 +8,7 @@ package syncthing import "syscall" -// https://msdn.microsoft.com/en-us/library/windows/desktop/aa379649(v=vs.85).aspx +// https://docs.microsoft.com/windows/win32/secauthz/well-known-sids const securityLocalSystemRID = "S-1-5-18" func isSuperUser() bool {
 Last seenNever{{deviceStats[deviceCfg.deviceID].lastSeen | date:"yyyy-MM-dd HH:mm:ss"}}
 Download Rate @@ -805,11 +810,6 @@  Version {{connections[deviceCfg.deviceID].clientVersion}}
 Last seenNever{{deviceStats[deviceCfg.deviceID].lastSeen | date:"yyyy-MM-dd HH:mm:ss"}}
 Folders {{deviceFolders(deviceCfg).map(folderLabel).join(", ")}}