From d3f583c8c9a2a2577f1ce6ccdb3102f2338fadb6 Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Wed, 29 May 2019 07:45:25 +0200 Subject: [PATCH] gui, man, authors: Update docs, translations, and contributors --- gui/default/assets/lang/lang-nb.json | 10 +++++----- gui/default/assets/lang/lang-sk.json | 2 +- gui/default/assets/lang/lang-zh-CN.json | 2 +- 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 | 20 +++++++++++++++++++- 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 | 11 ++++++++++- man/syncthing-versioning.7 | 2 +- man/syncthing.1 | 2 +- 19 files changed, 50 insertions(+), 23 deletions(-) diff --git a/gui/default/assets/lang/lang-nb.json b/gui/default/assets/lang/lang-nb.json index fda2a918..a75f7407 100644 --- a/gui/default/assets/lang/lang-nb.json +++ b/gui/default/assets/lang/lang-nb.json @@ -34,7 +34,7 @@ "Auto Accept": "Godta automatisk", "Automatic upgrade now offers the choice between stable releases and release candidates.": "Automatisk oppgradering lar deg nå få valget mellom ferdige utgaver og utgivelseskandidater.", "Automatic upgrades": "Automatiske oppdateringer", - "Automatic upgrades are always enabled for candidate releases.": "Automatic upgrades are always enabled for candidate releases.", + "Automatic upgrades are always enabled for candidate releases.": "Automatisk oppgradering er alltid påslått for utgivelseskandidater.", "Automatically create or share folders that this device advertises at the default path.": "Opprett eller del mapper automatisk i mapper som denne enheten melder som forvalgt mappe.", "Available debug logging facilities:": "Tilgjengelige funksjoner for logging i feilrettingsøyemed:", "Be careful!": "Vær forsiktig!", @@ -56,7 +56,7 @@ "Copied from original": "Kopiert fra original", "Copyright © 2014-2016 the following Contributors:": "Opphavsrett © 2014-2016 for følgende bidragsytere:", "Copyright © 2014-2017 the following Contributors:": "Opphavsrett © 2014-2017 for følgende bidragsytere:", - "Copyright © 2014-2019 the following Contributors:": "Copyright © 2014-2019 the following Contributors:", + "Copyright © 2014-2019 the following Contributors:": "Opphavrett © 2014-2019 for følgende bidragsytere:", "Creating ignore patterns, overwriting an existing file at {%path%}.": "Oppretter ignoreringsmønster, overskriver eksisterende fil i {{path}}.", "Danger!": "Fare!", "Debugging Facilities": "Feilrettingsverktøy", @@ -75,7 +75,7 @@ "Disabled periodic scanning and disabled watching for changes": "Skrudde av både periodisk skanning og oppsyn med endringer", "Disabled periodic scanning and enabled watching for changes": "Skrudde av periodisk skanning og skrudde på oppsyn med endringer", "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Skrudde av periodisk skanning og mislyktes i oppsett av oppsyn med endringer, prøver igjen hvert minutt:", - "Discard": "Discard", + "Discard": "Kasser", "Disconnected": "Frakoblet", "Discovered": "Oppdaget", "Discovery": "Oppslag", @@ -145,7 +145,7 @@ "Ignore Patterns": "Utelatelsesmønster", "Ignore Permissions": "Ignorer rettigheter", "Ignored Devices": "Ignored Devices", - "Ignored Folders": "Ignored Folders", + "Ignored Folders": "Utelatte mapper", "Ignored at": "Ignored at", "Incoming Rate Limit (KiB/s)": "Innkommende hastighetsbegrensning (KiB/s)", "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Feilaktige innstillinger kan skade innholdet i dine delte mapper og hindre Syncthing i å fungere.", @@ -359,7 +359,7 @@ "Versions": "Versjoner", "Versions Path": "Plassering av versjoner", "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Versjoner blir automatisk slettet når maksimal levetid er nådd eller når antall filer er oversteget.", - "Waiting to scan": "Waiting to scan", + "Waiting to scan": "Venter på å starte gjennomsøkning", "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "Advarsel, denne stien er en foreldremappe for en eksisterende mappe \"{{otherFolder}}\".", "Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Advarsel, denne stien er en foreldremappe for en eksisterende mappe \"{{otherFolderLabel}}\" ({{otherFolder}}).", "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Advarsel, denne stien er en undermappe i en eksisterende mappe \"{{otherFolder}}\".", diff --git a/gui/default/assets/lang/lang-sk.json b/gui/default/assets/lang/lang-sk.json index 3bb4a856..ec73bcfb 100644 --- a/gui/default/assets/lang/lang-sk.json +++ b/gui/default/assets/lang/lang-sk.json @@ -12,7 +12,7 @@ "Add Remote Device": "Pridať vzdialené zariadenie", "Add devices from the introducer to our device list, for mutually shared folders.": "Pre vzájomne zdieľané adresáre pridaj zariadenie od zavádzača do svojho zoznamu zariadení.", "Add new folder?": "Pridať nový adresár?", - "Additionally the full rescan interval will be increased (times 60, i.e. new default of 1h). You can also configure it manually for every folder later after choosing No.": "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.": "Naviac interval plného skenovania bude navýšený (60krát, t.j. nová výchozia hodnota 1h). Môžete to nastaviť aj manuálne pre každý adresár ak zvolíte Nie.", "Address": "Adresa", "Addresses": "Adresy", "Advanced": "Pokročilé", diff --git a/gui/default/assets/lang/lang-zh-CN.json b/gui/default/assets/lang/lang-zh-CN.json index 4255f508..4b7047e7 100644 --- a/gui/default/assets/lang/lang-zh-CN.json +++ b/gui/default/assets/lang/lang-zh-CN.json @@ -171,7 +171,7 @@ "Log": "日志", "Log tailing paused. Click here to continue.": "已暂停日志跟踪。点击此处以继续。", "Log tailing paused. Scroll to bottom continue.": "已暂停日志跟踪。滚动到底部以继续。", - "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": "批量操作", diff --git a/man/stdiscosrv.1 b/man/stdiscosrv.1 index c0f90783..717b2591 100644 --- a/man/stdiscosrv.1 +++ b/man/stdiscosrv.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "STDISCOSRV" "1" "May 17, 2019" "v1" "Syncthing" +.TH "STDISCOSRV" "1" "May 23, 2019" "v1" "Syncthing" .SH NAME stdiscosrv \- Syncthing Discovery Server . diff --git a/man/strelaysrv.1 b/man/strelaysrv.1 index 6029122e..74354536 100644 --- a/man/strelaysrv.1 +++ b/man/strelaysrv.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "STRELAYSRV" "1" "May 17, 2019" "v1" "Syncthing" +.TH "STRELAYSRV" "1" "May 23, 2019" "v1" "Syncthing" .SH NAME strelaysrv \- Syncthing Relay Server . diff --git a/man/syncthing-bep.7 b/man/syncthing-bep.7 index 784037de..a0141445 100644 --- a/man/syncthing-bep.7 +++ b/man/syncthing-bep.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-BEP" "7" "May 17, 2019" "v1" "Syncthing" +.TH "SYNCTHING-BEP" "7" "May 23, 2019" "v1" "Syncthing" .SH NAME syncthing-bep \- Block Exchange Protocol v1 . diff --git a/man/syncthing-config.5 b/man/syncthing-config.5 index 6f53ef70..ec60289a 100644 --- a/man/syncthing-config.5 +++ b/man/syncthing-config.5 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-CONFIG" "5" "May 17, 2019" "v1" "Syncthing" +.TH "SYNCTHING-CONFIG" "5" "May 23, 2019" "v1" "Syncthing" .SH NAME syncthing-config \- Syncthing Configuration . diff --git a/man/syncthing-device-ids.7 b/man/syncthing-device-ids.7 index 932d232b..903a8489 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" "May 17, 2019" "v1" "Syncthing" +.TH "SYNCTHING-DEVICE-IDS" "7" "May 23, 2019" "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 466fbfb9..aa204320 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" "May 17, 2019" "v1" "Syncthing" +.TH "SYNCTHING-EVENT-API" "7" "May 23, 2019" "v1" "Syncthing" .SH NAME syncthing-event-api \- Event API . diff --git a/man/syncthing-faq.7 b/man/syncthing-faq.7 index 20e6259e..dd05a22f 100644 --- a/man/syncthing-faq.7 +++ b/man/syncthing-faq.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-FAQ" "7" "May 17, 2019" "v1" "Syncthing" +.TH "SYNCTHING-FAQ" "7" "May 23, 2019" "v1" "Syncthing" .SH NAME syncthing-faq \- Frequently Asked Questions . @@ -552,6 +552,24 @@ sudo sh \-c \(aqecho 204800 > /proc/sys/fs/inotify/max_user_watches\(aq .fi .UNINDENT .UNINDENT +.SH HOW DO I RESET THE GUI PASSWORD? +.sp +If you’ve forgotten/lost the GUI password, you can remove it by deleting the \fB\fP and \fB\fP XML tags from the \fB\fP block in file \fBconfig.xml\fP\&. This should be done while Syncthing is not running. The location of the file depends on OS and is described in the configuration documentation. +.sp +For example the two lines \fBin bold\fP below would be removed from the file. +.nf + +.in +2 +
127.0.0.1:8384
+\fBsyncguy\fP +\fB$2a$10$s9wWHOQetp46Cq7GPye69.KqKantdUrbHCeLnZ9A6VlzkEPPYHDAC\fP +9RCKohqCAyrj5RjpyZdR2wXmQ9PyQFeN +default +.in -2 + + +.fi +.sp .SH AUTHOR The Syncthing Authors .SH COPYRIGHT diff --git a/man/syncthing-globaldisco.7 b/man/syncthing-globaldisco.7 index 31eecf46..92448ea7 100644 --- a/man/syncthing-globaldisco.7 +++ b/man/syncthing-globaldisco.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-GLOBALDISCO" "7" "May 17, 2019" "v1" "Syncthing" +.TH "SYNCTHING-GLOBALDISCO" "7" "May 23, 2019" "v1" "Syncthing" .SH NAME syncthing-globaldisco \- Global Discovery Protocol v3 . diff --git a/man/syncthing-localdisco.7 b/man/syncthing-localdisco.7 index 555d30e5..c190dbba 100644 --- a/man/syncthing-localdisco.7 +++ b/man/syncthing-localdisco.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-LOCALDISCO" "7" "May 17, 2019" "v1" "Syncthing" +.TH "SYNCTHING-LOCALDISCO" "7" "May 23, 2019" "v1" "Syncthing" .SH NAME syncthing-localdisco \- Local Discovery Protocol v4 . diff --git a/man/syncthing-networking.7 b/man/syncthing-networking.7 index bd8bc157..2c7d4d60 100644 --- a/man/syncthing-networking.7 +++ b/man/syncthing-networking.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-NETWORKING" "7" "May 17, 2019" "v1" "Syncthing" +.TH "SYNCTHING-NETWORKING" "7" "May 23, 2019" "v1" "Syncthing" .SH NAME syncthing-networking \- Firewall Setup . diff --git a/man/syncthing-relay.7 b/man/syncthing-relay.7 index 1b3a88a6..587e0290 100644 --- a/man/syncthing-relay.7 +++ b/man/syncthing-relay.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-RELAY" "7" "May 17, 2019" "v1" "Syncthing" +.TH "SYNCTHING-RELAY" "7" "May 23, 2019" "v1" "Syncthing" .SH NAME syncthing-relay \- Relay Protocol v1 . diff --git a/man/syncthing-rest-api.7 b/man/syncthing-rest-api.7 index f0b0449a..a5422761 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" "May 17, 2019" "v1" "Syncthing" +.TH "SYNCTHING-REST-API" "7" "May 23, 2019" "v1" "Syncthing" .SH NAME syncthing-rest-api \- REST API . diff --git a/man/syncthing-security.7 b/man/syncthing-security.7 index 7887e2b2..d76aa974 100644 --- a/man/syncthing-security.7 +++ b/man/syncthing-security.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-SECURITY" "7" "May 17, 2019" "v1" "Syncthing" +.TH "SYNCTHING-SECURITY" "7" "May 23, 2019" "v1" "Syncthing" .SH NAME syncthing-security \- Security Principles . diff --git a/man/syncthing-stignore.5 b/man/syncthing-stignore.5 index 96a15803..f47a800a 100644 --- a/man/syncthing-stignore.5 +++ b/man/syncthing-stignore.5 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-STIGNORE" "5" "May 17, 2019" "v1" "Syncthing" +.TH "SYNCTHING-STIGNORE" "5" "May 23, 2019" "v1" "Syncthing" .SH NAME syncthing-stignore \- Prevent files from being synchronized to other nodes . @@ -117,6 +117,15 @@ Prefixes can be specified in any order (e.g. “(?d)(?i)”), but cannot be in a single pair of parentheses (not “(?di)”). .UNINDENT .UNINDENT +.sp +\fBNOTE:\fP +.INDENT 0.0 +.INDENT 3.5 +Include patterns (that begin with \fB!\fP) cause Syncthing to traverse and +watch the entire directory tree regardless of other +ignore patterns. +.UNINDENT +.UNINDENT .SH EXAMPLE .sp Given a directory layout: diff --git a/man/syncthing-versioning.7 b/man/syncthing-versioning.7 index 633dd286..97494f43 100644 --- a/man/syncthing-versioning.7 +++ b/man/syncthing-versioning.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-VERSIONING" "7" "May 17, 2019" "v1" "Syncthing" +.TH "SYNCTHING-VERSIONING" "7" "May 23, 2019" "v1" "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 c6e96c05..23032852 100644 --- a/man/syncthing.1 +++ b/man/syncthing.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING" "1" "May 17, 2019" "v1" "Syncthing" +.TH "SYNCTHING" "1" "May 23, 2019" "v1" "Syncthing" .SH NAME syncthing \- Syncthing .