From 916182bc739c98d067a778da8d16224255388742 Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Wed, 29 Aug 2018 07:45:24 +0200 Subject: [PATCH] gui, man, authors: Update docs, translations, and contributors --- gui/default/assets/lang/lang-en.json | 10 ++++++ gui/default/assets/lang/lang-sv.json | 8 ++--- man/stdiscosrv.1 | 2 +- man/strelaysrv.1 | 2 +- man/syncthing-bep.7 | 2 +- man/syncthing-config.5 | 2 +- man/syncthing-device-ids.7 | 2 +- man/syncthing-event-api.7 | 2 +- man/syncthing-faq.7 | 2 +- man/syncthing-globaldisco.7 | 2 +- man/syncthing-localdisco.7 | 2 +- man/syncthing-networking.7 | 2 +- man/syncthing-relay.7 | 2 +- man/syncthing-rest-api.7 | 46 ++++++++++++++++------------ man/syncthing-security.7 | 2 +- man/syncthing-stignore.5 | 2 +- man/syncthing-versioning.7 | 2 +- man/syncthing.1 | 2 +- 18 files changed, 56 insertions(+), 38 deletions(-) diff --git a/gui/default/assets/lang/lang-en.json b/gui/default/assets/lang/lang-en.json index a8e9339d..0fe5f37e 100644 --- a/gui/default/assets/lang/lang-en.json +++ b/gui/default/assets/lang/lang-en.json @@ -72,6 +72,7 @@ "Disabled periodic scanning and disabled watching for changes": "Disabled periodic scanning and disabled watching for changes", "Disabled periodic scanning and enabled watching for changes": "Disabled periodic scanning and enabled watching for changes", "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:", + "Discard": "Discard", "Disconnected": "Disconnected", "Discovered": "Discovered", "Discovery": "Discovery", @@ -139,6 +140,9 @@ "Ignore": "Ignore", "Ignore Patterns": "Ignore Patterns", "Ignore Permissions": "Ignore Permissions", + "Ignored Devices": "Ignored Devices", + "Ignored Folders": "Ignored Folders", + "Ignored at": "Ignored at", "Incoming Rate Limit (KiB/s)": "Incoming Rate Limit (KiB/s)", "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Incorrect configuration may damage your folder contents and render Syncthing inoperable.", "Introduced By": "Introduced By", @@ -199,6 +203,7 @@ "Pause": "Pause", "Pause All": "Pause All", "Paused": "Paused", + "Pending changes": "Pending changes", "Periodic scanning at given interval and disabled watching for changes": "Periodic scanning at given interval and disabled watching for changes", "Periodic scanning at given interval and enabled watching for changes": "Periodic scanning at given interval and enabled watching for changes", "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:", @@ -286,6 +291,7 @@ "Syncthing is upgrading.": "Syncthing is upgrading.", "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…", "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.", + "Take me back": "Take me back", "The Syncthing admin interface is configured to allow remote access without a password.": "The Syncthing admin interface is configured to allow remote access without a password.", "The aggregated statistics are publicly available at the URL below.": "The aggregated statistics are publicly available at the URL below.", "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.", @@ -321,6 +327,7 @@ "Unavailable": "Unavailable", "Unavailable/Disabled by administrator or maintainer": "Unavailable/Disabled by administrator or maintainer", "Undecided (will prompt)": "Undecided (will prompt)", + "Unignore": "Unignore", "Unknown": "Unknown", "Unshared": "Unshared", "Unused": "Unused", @@ -350,6 +357,9 @@ "You can also select one of these nearby devices:": "You can also select one of these nearby devices:", "You can change your choice at any time in the Settings dialog.": "You can change your choice at any time in the Settings dialog.", "You can read more about the two release channels at the link below.": "You can read more about the two release channels at the link below.", + "You have no ignored devices.": "You have no ignored devices.", + "You have no ignored folders.": "You have no ignored folders.", + "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 must keep at least one version.", "days": "days", "directories": "directories", diff --git a/gui/default/assets/lang/lang-sv.json b/gui/default/assets/lang/lang-sv.json index 8f8d8846..1d70856d 100644 --- a/gui/default/assets/lang/lang-sv.json +++ b/gui/default/assets/lang/lang-sv.json @@ -62,7 +62,7 @@ "Deleted": "Tog bort", "Device": "Enhet", "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Enhet \"{{name}}\" ({{device}} på {{address}}) vill ansluta. Lägg till ny enhet?", - "Device ID": "Enhetens ID", + "Device ID": "Enhet-ID", "Device Identification": "Enhetens identifikation", "Device Name": "Enhetsnamn", "Device rate limits": "Enhetshastighetsgränser", @@ -289,10 +289,10 @@ "The Syncthing admin interface is configured to allow remote access without a password.": "Syncthing administratör gränssnittet är konfigurerat för att tillåta fjärrtillträde utan ett lösenord.", "The aggregated statistics are publicly available at the URL below.": "Den aggregerade statistiken är offentligt tillgänglig på webbadressen nedan.", "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Konfigurationen har sparats men inte aktiverats. Syncthing måste startas om för att aktivera den nya konfigurationen.", - "The device ID cannot be blank.": "Enhetens ID kan inte vara tomt.", - "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).": "Enhetens ID som behövs här kan du hitta i \"Åtgärder > Visa ID\"-dialogrutan på den andra enheten. Mellanrum och bindestreck är valfria (ignoreras).", + "The device ID cannot be blank.": "Enhets-ID kan inte vara tomt.", + "The device ID to enter here can be found in the \"Actions > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "Enhets-ID som behövs här kan du hitta i \"Åtgärder > Visa ID\"-dialogrutan på den andra enheten. Mellanrum och bindestreck är valfria (ignoreras).", "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.": "Den krypterade användarstatistiken skickas dagligen. Den används för att spåra vanliga plattformar, mappstorlekar och versioner. Om datat som rapporteras ändras så kommer du att bli tillfrågad igen.", - "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.": "Det inmatade enhetens ID verkar inte vara korrekt. Det ska vara en 52 eller 56 teckensträng bestående av siffror och bokstäver, eventuellt med mellanrum och bindestreck.", + "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.": "Det inmatade enhets-ID:t verkar inte vara korrekt. Det ska vara en 52 eller 56 teckensträng bestående av siffror och bokstäver, eventuellt med mellanrum och bindestreck.", "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "Den första kommandoparametern är sökvägen till mappen och den andra parametern är den relativa sökvägen i katalogen.", "The folder ID cannot be blank.": "Mappens ID får inte vara tomt.", "The folder ID must be unique.": "Mappens ID måste vara unik.", diff --git a/man/stdiscosrv.1 b/man/stdiscosrv.1 index 58f81dfa..dffa14ca 100644 --- a/man/stdiscosrv.1 +++ b/man/stdiscosrv.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "STDISCOSRV" "1" "Aug 21, 2018" "v0.14" "Syncthing" +.TH "STDISCOSRV" "1" "Aug 28, 2018" "v0.14" "Syncthing" .SH NAME stdiscosrv \- Syncthing Discovery Server . diff --git a/man/strelaysrv.1 b/man/strelaysrv.1 index 58bab3fa..6dcbdd27 100644 --- a/man/strelaysrv.1 +++ b/man/strelaysrv.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "STRELAYSRV" "1" "Aug 21, 2018" "v0.14" "Syncthing" +.TH "STRELAYSRV" "1" "Aug 28, 2018" "v0.14" "Syncthing" .SH NAME strelaysrv \- Syncthing Relay Server . diff --git a/man/syncthing-bep.7 b/man/syncthing-bep.7 index c5cfa253..e7e38721 100644 --- a/man/syncthing-bep.7 +++ b/man/syncthing-bep.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-BEP" "7" "Aug 21, 2018" "v0.14" "Syncthing" +.TH "SYNCTHING-BEP" "7" "Aug 28, 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 cbfed64e..e4eecfdb 100644 --- a/man/syncthing-config.5 +++ b/man/syncthing-config.5 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-CONFIG" "5" "Aug 21, 2018" "v0.14" "Syncthing" +.TH "SYNCTHING-CONFIG" "5" "Aug 28, 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 43382e90..6d7e3489 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" "Aug 21, 2018" "v0.14" "Syncthing" +.TH "SYNCTHING-DEVICE-IDS" "7" "Aug 28, 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 5f1ab6f7..51a586da 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" "Aug 21, 2018" "v0.14" "Syncthing" +.TH "SYNCTHING-EVENT-API" "7" "Aug 28, 2018" "v0.14" "Syncthing" .SH NAME syncthing-event-api \- Event API . diff --git a/man/syncthing-faq.7 b/man/syncthing-faq.7 index e2b3ad9a..72d66100 100644 --- a/man/syncthing-faq.7 +++ b/man/syncthing-faq.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-FAQ" "7" "Aug 21, 2018" "v0.14" "Syncthing" +.TH "SYNCTHING-FAQ" "7" "Aug 28, 2018" "v0.14" "Syncthing" .SH NAME syncthing-faq \- Frequently Asked Questions . diff --git a/man/syncthing-globaldisco.7 b/man/syncthing-globaldisco.7 index 8897e575..fea4d423 100644 --- a/man/syncthing-globaldisco.7 +++ b/man/syncthing-globaldisco.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-GLOBALDISCO" "7" "Aug 21, 2018" "v0.14" "Syncthing" +.TH "SYNCTHING-GLOBALDISCO" "7" "Aug 28, 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 caf1cb25..6a71ffef 100644 --- a/man/syncthing-localdisco.7 +++ b/man/syncthing-localdisco.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-LOCALDISCO" "7" "Aug 21, 2018" "v0.14" "Syncthing" +.TH "SYNCTHING-LOCALDISCO" "7" "Aug 28, 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 9f50ee4f..92c413a8 100644 --- a/man/syncthing-networking.7 +++ b/man/syncthing-networking.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-NETWORKING" "7" "Aug 21, 2018" "v0.14" "Syncthing" +.TH "SYNCTHING-NETWORKING" "7" "Aug 28, 2018" "v0.14" "Syncthing" .SH NAME syncthing-networking \- Firewall Setup . diff --git a/man/syncthing-relay.7 b/man/syncthing-relay.7 index bcaaed71..3b2815a4 100644 --- a/man/syncthing-relay.7 +++ b/man/syncthing-relay.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-RELAY" "7" "Aug 21, 2018" "v0.14" "Syncthing" +.TH "SYNCTHING-RELAY" "7" "Aug 28, 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 e337c33b..52b1a15e 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" "Aug 21, 2018" "v0.14" "Syncthing" +.TH "SYNCTHING-REST-API" "7" "Aug 28, 2018" "v0.14" "Syncthing" .SH NAME syncthing-rest-api \- REST API . @@ -699,40 +699,48 @@ availability. Takes \fBfolder\fP and \fBfile\fP parameters. .nf .ft C { - "availability": [{ - "id": "I6KAH76\-66SLLLB\-5PFXSOA\-UFJCDZC\-YAOMLEK\-CP2GB32\-BV5RQST\-3PSROAU", - "fromTemporary": false - }], + "availability": [ + { + "id": "ITZRNXE\-YNROGBZ\-HXTH5P7\-VK5NYE5\-QHRQGE2\-7JQ6VNJ\-KZUEDIU\-5PPR5AM", + "fromTemporary": false + } + ], "global": { "deleted": false, + "ignored": false, "invalid": false, - "flags": "0644", - "sequence": 3, - "modified": "2015\-04\-20T22:20:45+09:00", - "modifiedBy": "I6KAH76", + "localFlags": 0, + "modified": "2018\-08\-18T12:21:13.836784059+02:00", + "modifiedBy": "SYNO4VL", + "mustRescan": false, + "name": "testfile", "noPermissions": false, - "name": "util.go", "numBlocks": 1, - "size": 9642, + "permissions": "0755", + "sequence": 107499, + "size": 1234, "type": 0, "version": [ - "I6KAH76:1" + "SYNO4VL:1" ] }, "local": { "deleted": false, + "ignored": false, "invalid": false, - "flags": "0644", - "sequence": 4, - "modified": "2015\-04\-20T22:20:45+09:00", - "modifiedBy": "I6KAH76", + "localFlags": 0, + "modified": "2018\-08\-18T12:21:13.836784059+02:00", + "modifiedBy": "SYNO4VL", + "mustRescan": false, + "name": "testfile", "noPermissions": false, - "name": "util.go", "numBlocks": 1, - "size": 9642, + "permissions": "0755", + "sequence": 111038, + "size": 1234, "type": 0, "version": [ - "I6KAH76:1" + "SYNO4VL:1" ] } } diff --git a/man/syncthing-security.7 b/man/syncthing-security.7 index 5c7e9123..b9a6b3d8 100644 --- a/man/syncthing-security.7 +++ b/man/syncthing-security.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-SECURITY" "7" "Aug 21, 2018" "v0.14" "Syncthing" +.TH "SYNCTHING-SECURITY" "7" "Aug 28, 2018" "v0.14" "Syncthing" .SH NAME syncthing-security \- Security Principles . diff --git a/man/syncthing-stignore.5 b/man/syncthing-stignore.5 index 77a4fcdf..12e775ad 100644 --- a/man/syncthing-stignore.5 +++ b/man/syncthing-stignore.5 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-STIGNORE" "5" "Aug 21, 2018" "v0.14" "Syncthing" +.TH "SYNCTHING-STIGNORE" "5" "Aug 28, 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 8e30ef16..67df98f8 100644 --- a/man/syncthing-versioning.7 +++ b/man/syncthing-versioning.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-VERSIONING" "7" "Aug 21, 2018" "v0.14" "Syncthing" +.TH "SYNCTHING-VERSIONING" "7" "Aug 28, 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 5472d630..d719d2e0 100644 --- a/man/syncthing.1 +++ b/man/syncthing.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING" "1" "Aug 21, 2018" "v0.14" "Syncthing" +.TH "SYNCTHING" "1" "Aug 28, 2018" "v0.14" "Syncthing" .SH NAME syncthing \- Syncthing .