diff --git a/gui/default/assets/lang/lang-de.json b/gui/default/assets/lang/lang-de.json index f357450b2..c94eb5d95 100644 --- a/gui/default/assets/lang/lang-de.json +++ b/gui/default/assets/lang/lang-de.json @@ -65,7 +65,7 @@ "Device ID": "Gerätekennung", "Device Identification": "Geräteidentifikation", "Device Name": "Gerätename", - "Device rate limits": "Device rate limits", + "Device rate limits": "Teilnehmerbegrenzung", "Device that last modified the item": "Gerät, das das Element zuletzt geändert hat", "Devices": "Geräte", "Disabled": "Deaktiviert", @@ -109,9 +109,9 @@ "Files are moved to date stamped versions in a .stversions directory when replaced or deleted by Syncthing.": "Dateien werden mit Datumsstempel versioniert und in den .stversions Ordner verschoben, wenn sie von Syncthing ersetzt oder gelöscht werden.", "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Dateien werden mit Datumsstempel versioniert und in den .stversions Ordner verschoben, wenn sie von Syncthing ersetzt oder gelöscht werden.", "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Dateien sind auf diesem Gerät schreibgeschützt. Auf diesem Gerät durchgeführte Veränderungen werden aber auf den Rest des Verbunds übertragen.", - "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.": "Dateien werden vom Cluster synchronisiert, aber lokal vorgenommene Änderungen werden nicht an andere Geräte gesendet.", "Filesystem Notifications": "Dateisystembenachrichtigungen", - "Filesystem Watcher Errors": "Filesystem Watcher Errors", + "Filesystem Watcher Errors": "Fehler im Dateisystembeobachter", "Filter by date": "Nach Datum sortieren", "Filter by name": "Nach Name sortieren", "Folder": "Ordner", @@ -120,7 +120,7 @@ "Folder Path": "Ordnerpfad", "Folder Type": "Ordnertyp", "Folders": "Ordner", - "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.": "For the following folders an error occurred while starting to watch for changes. It will be retried every minute, so the errors might go away soon. If they persist, try to fix the underlying issue and ask for help if you can't.", + "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.": "Bei den folgenden Ordnern ist ein Fehler aufgetreten, während Sie nach Änderungen suchten. Es wird jede Minute erneut gesucht, damit die Fehler bald verschwinden. Falls die Fehler bestehen bleiben, versuchen Sie, das zugrunde liegende Problem zu beheben, und fragen Sie evtl. nach Hilfe.", "Full Rescan Interval (s)": "Vollständiger Suchintervall (s)", "GUI": "GUI", "GUI Authentication Password": "Passwort für Zugang zur Benutzeroberfläche", @@ -160,7 +160,7 @@ "Local State (Total)": "Lokaler Status (Gesamt)", "Log": "Protokoll", "Log tailing paused. Click here to continue.": "Protokollaufzeichnungen sind pausiert. Klicken Sie hier um fortzufahren.", - "Log tailing paused. Scroll to bottom continue.": "Log tailing paused. Scroll to bottom continue.", + "Log tailing paused. Scroll to bottom continue.": "Protokoll-Tailing pausieren.\nScrolle nach unten zum fortfahren.", "Logs": "Protokolle", "Major Upgrade": "Hauptversionsaktualisierung", "Mass actions": "Massenaktionen", @@ -213,12 +213,12 @@ "Quick guide to supported patterns": "Schnellanleitung zu den unterstützten Mustern", "RAM Utilization": "RAM-Auslastung", "Random": "Zufall", - "Receive Only": "Receive Only", + "Receive Only": "Nur empfangen", "Recent Changes": "Letzte Änderungen", "Reduced by ignore patterns": "Durch Ignoriermuster reduziert", "Release Notes": "Veröffentlichungshinweise", "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Veröffentlichungskandidaten enthalten die neuesten Funktionen und Verbesserungen. Sie gleichen den üblichen zweiwöchentlichen Syncthing-Veröffentlichungen.", - "Remote Devices": "Fern-Geräte", + "Remote Devices": "Externe Geräte", "Remove": "Entfernen", "Remove Device": "Gerät entfernen", "Remove Folder": "Ordner entfernen", @@ -235,7 +235,7 @@ "Resume": "Fortsetzen", "Resume All": "Alles fortsetzen", "Reused": "Erneut benutzt", - "Revert Local Changes": "Revert Local Changes", + "Revert Local Changes": "Lokale Änderungen zurücksetzen", "Running": "Läuft gerade", "Save": "Speichern", "Scan Time Remaining": "Zeit für Scan verbleibend", @@ -256,7 +256,7 @@ "Share With Devices": "Teile mit diesen Geräten", "Share this folder?": "Diesen Ordner teilen?", "Shared With": "Geteilt mit", - "Sharing": "Sharing", + "Sharing": "Teilen", "Show ID": "Eigene Kennung", "Show QR": "Zeige QR Code", "Show diff with previous version": "Unterschied zur vorherigen Version anzeigen", diff --git a/gui/default/assets/lang/lang-sv.json b/gui/default/assets/lang/lang-sv.json index 8441ab101..44e85703e 100644 --- a/gui/default/assets/lang/lang-sv.json +++ b/gui/default/assets/lang/lang-sv.json @@ -109,7 +109,7 @@ "Files are moved to date stamped versions in a .stversions directory when replaced or deleted by Syncthing.": "Filer flyttas till datumstämplade versioner i en .stversions-mapp när de ersätts eller tas bort av Syncthing.", "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Filer flyttas till datummärkta versioner i en .stversions mapp när de ersätts eller tas bort av Syncthing.", "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Filer skyddas från ändringar gjorda på andra enheter, men ändringar som görs på den här noden skickas till de andra klustermedlemmarna.", - "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.": "Filer synkroniseras från klustret, men alla ändringar som görs lokalt skickas inte till andra enheter.", "Filesystem Notifications": "filsystemsnotifieringar", "Filesystem Watcher Errors": "Filsystem bevakarfel", "Filter by date": "Filtrera efter datum", @@ -213,7 +213,7 @@ "Quick guide to supported patterns": "Snabb handledning till mönster som stöds", "RAM Utilization": "RAM användning", "Random": "Slumpmässig", - "Receive Only": "Receive Only", + "Receive Only": "Ta emot endast", "Recent Changes": "Senaste ändringar", "Reduced by ignore patterns": "Minskas med ignorera mönster", "Release Notes": "Versionsanteckningar", @@ -235,7 +235,7 @@ "Resume": "Återuppta", "Resume All": "Återuppta alla", "Reused": "Återanvänds", - "Revert Local Changes": "Revert Local Changes", + "Revert Local Changes": "Återställ lokala ändringar", "Running": "Körs", "Save": "Spara", "Scan Time Remaining": "Återstående skanningstid", @@ -260,8 +260,8 @@ "Show ID": "Visa ID", "Show QR": "Visa QR", "Show diff with previous version": "Visa skillnad med tidigare version", - "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Visas istället för enhet-ID i klusterstatusen. Skickas till andra enheter som ett alternativt förvalt namn.", - "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Visas i stället för enhet-ID i klusterstatusen. Kommer att uppdateras till namnet enheten annonserar om det lämnas tomt.", + "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Visas istället för enhets-ID i klusterstatusen. Skickas till andra enheter som ett alternativt förvalt namn.", + "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Visas i stället för enhets-ID i klusterstatusen. Kommer att uppdateras till namnet enheten annonserar om det lämnas tomt.", "Shutdown": "Stäng av", "Shutdown Complete": "Avstängning klar", "Simple File Versioning": "Enkel filversionshantering", diff --git a/man/stdiscosrv.1 b/man/stdiscosrv.1 index 844b6cd9e..fb0d7c3d1 100644 --- a/man/stdiscosrv.1 +++ b/man/stdiscosrv.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "STDISCOSRV" "1" "Jul 28, 2018" "v0.14" "Syncthing" +.TH "STDISCOSRV" "1" "Aug 08, 2018" "v0.14" "Syncthing" .SH NAME stdiscosrv \- Syncthing Discovery Server . diff --git a/man/strelaysrv.1 b/man/strelaysrv.1 index 60921a5a8..4ff523415 100644 --- a/man/strelaysrv.1 +++ b/man/strelaysrv.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "STRELAYSRV" "1" "Jul 28, 2018" "v0.14" "Syncthing" +.TH "STRELAYSRV" "1" "Aug 08, 2018" "v0.14" "Syncthing" .SH NAME strelaysrv \- Syncthing Relay Server . diff --git a/man/syncthing-bep.7 b/man/syncthing-bep.7 index 2b29ea4a8..64c9bc1e0 100644 --- a/man/syncthing-bep.7 +++ b/man/syncthing-bep.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-BEP" "7" "Jul 28, 2018" "v0.14" "Syncthing" +.TH "SYNCTHING-BEP" "7" "Aug 08, 2018" "v0.14" "Syncthing" .SH NAME syncthing-bep \- Block Exchange Protocol v1 . diff --git a/man/syncthing-config.5 b/man/syncthing-config.5 index fa024f29c..d4c7e1efc 100644 --- a/man/syncthing-config.5 +++ b/man/syncthing-config.5 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-CONFIG" "5" "Jul 28, 2018" "v0.14" "Syncthing" +.TH "SYNCTHING-CONFIG" "5" "Aug 08, 2018" "v0.14" "Syncthing" .SH NAME syncthing-config \- Syncthing Configuration . diff --git a/man/syncthing-device-ids.7 b/man/syncthing-device-ids.7 index 6353d9202..3993a2241 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" "Jul 28, 2018" "v0.14" "Syncthing" +.TH "SYNCTHING-DEVICE-IDS" "7" "Aug 08, 2018" "v0.14" "Syncthing" .SH NAME syncthing-device-ids \- Understanding Device IDs . diff --git a/man/syncthing-event-api.7 b/man/syncthing-event-api.7 index 24890273b..fb9538229 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" "Jul 28, 2018" "v0.14" "Syncthing" +.TH "SYNCTHING-EVENT-API" "7" "Aug 08, 2018" "v0.14" "Syncthing" .SH NAME syncthing-event-api \- Event API . diff --git a/man/syncthing-faq.7 b/man/syncthing-faq.7 index f4a3ef584..ae70e4e94 100644 --- a/man/syncthing-faq.7 +++ b/man/syncthing-faq.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-FAQ" "7" "Jul 28, 2018" "v0.14" "Syncthing" +.TH "SYNCTHING-FAQ" "7" "Aug 08, 2018" "v0.14" "Syncthing" .SH NAME syncthing-faq \- Frequently Asked Questions . diff --git a/man/syncthing-globaldisco.7 b/man/syncthing-globaldisco.7 index e95dec519..9e965b45d 100644 --- a/man/syncthing-globaldisco.7 +++ b/man/syncthing-globaldisco.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-GLOBALDISCO" "7" "Jul 28, 2018" "v0.14" "Syncthing" +.TH "SYNCTHING-GLOBALDISCO" "7" "Aug 08, 2018" "v0.14" "Syncthing" .SH NAME syncthing-globaldisco \- Global Discovery Protocol v3 . diff --git a/man/syncthing-localdisco.7 b/man/syncthing-localdisco.7 index 9f646abac..5ce02f7ad 100644 --- a/man/syncthing-localdisco.7 +++ b/man/syncthing-localdisco.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-LOCALDISCO" "7" "Jul 28, 2018" "v0.14" "Syncthing" +.TH "SYNCTHING-LOCALDISCO" "7" "Aug 08, 2018" "v0.14" "Syncthing" .SH NAME syncthing-localdisco \- Local Discovery Protocol v4 . diff --git a/man/syncthing-networking.7 b/man/syncthing-networking.7 index 2bda65e92..011bcd8c0 100644 --- a/man/syncthing-networking.7 +++ b/man/syncthing-networking.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-NETWORKING" "7" "Jul 28, 2018" "v0.14" "Syncthing" +.TH "SYNCTHING-NETWORKING" "7" "Aug 08, 2018" "v0.14" "Syncthing" .SH NAME syncthing-networking \- Firewall Setup . diff --git a/man/syncthing-relay.7 b/man/syncthing-relay.7 index f46d690f3..bae540395 100644 --- a/man/syncthing-relay.7 +++ b/man/syncthing-relay.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-RELAY" "7" "Jul 28, 2018" "v0.14" "Syncthing" +.TH "SYNCTHING-RELAY" "7" "Aug 08, 2018" "v0.14" "Syncthing" .SH NAME syncthing-relay \- Relay Protocol v1 . diff --git a/man/syncthing-rest-api.7 b/man/syncthing-rest-api.7 index 4ee42db88..29fd59b5f 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" "Jul 28, 2018" "v0.14" "Syncthing" +.TH "SYNCTHING-REST-API" "7" "Aug 08, 2018" "v0.14" "Syncthing" .SH NAME syncthing-rest-api \- REST API . @@ -841,14 +841,17 @@ This is an expensive call, increasing CPU and RAM usage on the device. Use spari .UNINDENT .SS POST /rest/db/override .sp -Request override of a send only folder. +Request override of a send only folder. Override means to make the local +version latest, overriding changes made on other devices. This API call does +nothing if the folder is not a send only folder. +.sp Takes the mandatory parameter \fIfolder\fP (folder ID). .INDENT 0.0 .INDENT 3.5 .sp .nf .ft C -curl \-X POST http://127.0.0.1:8384/rest/db/override?folder=default +curl \-X POST \-H X\-API\-key:... http://127.0.0.1:8384/rest/db/override?folder=default .ft P .fi .UNINDENT @@ -868,6 +871,26 @@ curl \-X POST http://127.0.0.1:8384/rest/db/prio?folder=default&file=foo/bar .UNINDENT .sp Response contains the same output as \fBGET /rest/db/need\fP +.SS POST /rest/db/revert +.sp +New in version 0.14.50. + +.sp +Request revert of a receive only folder. Reverting a folder means to undo +all local changes. This API call does nothing if the folder is not a receive +only folder. +.sp +Takes the mandatory parameter \fIfolder\fP (folder ID). +.INDENT 0.0 +.INDENT 3.5 +.sp +.nf +.ft C +curl \-X POST \-H X\-API\-Key:... http://127.0.0.1:8384/rest/db/revert?folder=default +.ft P +.fi +.UNINDENT +.UNINDENT .SS POST /rest/db/scan .sp Request immediate scan. Takes the optional parameters \fBfolder\fP (folder ID), @@ -904,32 +927,78 @@ Parameters: \fBfolder\fP, the ID of a folder. .nf .ft C { - # latest version according to cluster: - "globalBytes": 13173473780, - "globalDeleted": 1847, - "globalFiles": 42106, - # what we have locally: - "localBytes": 13173473780, - "localDeleted": 1847, - "localFiles": 42106, - # which part of what we have locally is the latest cluster version: - "inSyncBytes": 13173473780, - "inSyncFiles": 42106, - # which part of what we have locally should be fetched from the cluster: - "needBytes": 0, - "needFiles": 0, - # various other metadata - "ignorePatterns": true, + "globalBytes": 0, + "globalDeleted": 0, + "globalDirectories": 0, + "globalFiles": 0, + "globalSymlinks": 0, + "ignorePatterns": false, + "inSyncBytes": 0, + "inSyncFiles": 0, "invalid": "", + "localBytes": 0, + "localDeleted": 0, + "localDirectories": 0, + "localFiles": 0, + "localSymlinks": 0, + "needBytes": 0, + "needDeletes": 0, + "needDirectories": 0, + "needFiles": 0, + "needSymlinks": 0, + "pullErrors": 0, + "receiveOnlyChangedBytes": 0, + "receiveOnlyChangedDeletes": 0, + "receiveOnlyChangedDirectories": 0, + "receiveOnlyChangedFiles": 0, + "receiveOnlyChangedSymlinks": 0, + "sequence": 0, "state": "idle", - "stateChanged": "2015\-03\-16T21:47:28.750853241+01:00", - "version": 71989 + "stateChanged": "2018\-08\-08T07:04:57.301064781+02:00", + "version": 0 } .ft P .fi .UNINDENT .UNINDENT .sp +The various fields have the following meaning: +.INDENT 0.0 +.TP +.B global*: +Data in the cluster latest version. +.TP +.B inSync*: +Data that is locally the same as the cluster latest version. +.TP +.B local*: +Data that is locally present, regardless of whether it’s the same or different version as the cluster latest version. +.TP +.B need*: +Data that is needed to become up to date with the cluster latest version (i.e., data that is out of sync). +.TP +.B receiveOnlyChanged*: +Data that has changed locally in a receive only folder, and thus not been sent to the cluster. +.TP +.B invalid: +Deprecated, always empty. +.TP +.B pullErrors: +The number of files that failed to sync during the last sync operations. +.TP +.B sequence: +The current folder sequence number. +.TP +.B state: +The current folder state. +.TP +.B stateChanged: +When the folder state last changed. +.TP +.B version: +Deprecated, equivalent to the sequence number. +.UNINDENT +.sp \fBNOTE:\fP .INDENT 0.0 .INDENT 3.5 diff --git a/man/syncthing-security.7 b/man/syncthing-security.7 index f0beb6721..a179e51eb 100644 --- a/man/syncthing-security.7 +++ b/man/syncthing-security.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-SECURITY" "7" "Jul 28, 2018" "v0.14" "Syncthing" +.TH "SYNCTHING-SECURITY" "7" "Aug 08, 2018" "v0.14" "Syncthing" .SH NAME syncthing-security \- Security Principles . diff --git a/man/syncthing-stignore.5 b/man/syncthing-stignore.5 index 9fde30b10..487ac308b 100644 --- a/man/syncthing-stignore.5 +++ b/man/syncthing-stignore.5 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-STIGNORE" "5" "Jul 28, 2018" "v0.14" "Syncthing" +.TH "SYNCTHING-STIGNORE" "5" "Aug 08, 2018" "v0.14" "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 101ea0d4a..816809cf3 100644 --- a/man/syncthing-versioning.7 +++ b/man/syncthing-versioning.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-VERSIONING" "7" "Jul 28, 2018" "v0.14" "Syncthing" +.TH "SYNCTHING-VERSIONING" "7" "Aug 08, 2018" "v0.14" "Syncthing" .SH NAME syncthing-versioning \- Keep automatic backups of deleted files by other nodes . diff --git a/man/syncthing.1 b/man/syncthing.1 index 7148632e2..22d77e2d1 100644 --- a/man/syncthing.1 +++ b/man/syncthing.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING" "1" "Jul 28, 2018" "v0.14" "Syncthing" +.TH "SYNCTHING" "1" "Aug 08, 2018" "v0.14" "Syncthing" .SH NAME syncthing \- Syncthing .