diff --git a/AUTHORS b/AUTHORS index 18c0b7e02..b10da7a28 100644 --- a/AUTHORS +++ b/AUTHORS @@ -145,7 +145,7 @@ Jonathan Jonathan Cross Jonta <359397+Jonta@users.noreply.github.com> Jose Manuel Delicado (jmdaweb) -jtagcat +jtagcat Jörg Thalheim Jędrzej Kula Kalle Laine diff --git a/gui/default/assets/lang/lang-bg.json b/gui/default/assets/lang/lang-bg.json index 3ea4f7e76..d415b67fd 100644 --- a/gui/default/assets/lang/lang-bg.json +++ b/gui/default/assets/lang/lang-bg.json @@ -30,8 +30,8 @@ "Are you sure you want to permanently delete all these files?": "Сигурни ли сте, че желаете всички тези файлове да бъдат безвъзвратно премахнати?", "Are you sure you want to remove device {%name%}?": "Сигурни ли сте, че желаете устройството {{name}} да бъде премахнато?", "Are you sure you want to remove folder {%label%}?": "Сигурни ли сте, че желаете папката {{label}} да бъде премахната?", - "Are you sure you want to restore {%count%} files?": "Сигурни ли сте, че желаете {{count}} файла да бъде възстановени?", - "Are you sure you want to revert all local changes?": "Are you sure you want to revert all local changes?", + "Are you sure you want to restore {%count%} files?": "Сигурни ли сте, че желаете {{count}} файла да бъдат възстановени?", + "Are you sure you want to revert all local changes?": "Сигурни ли сте, че желаете всички местни промени да бъдат отменени?", "Are you sure you want to upgrade?": "Желаете ли приложението да бъде обновено?", "Auto Accept": "Автоматично приемане", "Automatic Crash Reporting": "Автоматично изпращане на доклад за срив", @@ -349,8 +349,8 @@ "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 content on other devices will be overwritten to become identical with this device. Files not present here will be deleted on other devices.": "The folder content on other devices will be overwritten to become identical with this device. Files not present here will be deleted on other devices.", - "The folder content on this device will be overwritten to become identical with other devices. Files newly added here will be deleted.": "The folder content on this device will be overwritten to become identical with other devices. Files newly added here will be deleted.", + "The folder content on other devices will be overwritten to become identical with this device. Files not present here will be deleted on other devices.": "Съдържанието на папката в другите устройства ще бъде презаписано, за да стане еднакво със съдържанието на това устройство. Файловете, които ги няма тук, но съществуват на другите устройства ще бъдат премахнати.", + "The folder content on this device will be overwritten to become identical with other devices. Files newly added here will be deleted.": "Съдържанието на папката в това устройство ще бъде презаписано, за да стане еднакво със съдържанието на другите устройства. Добавените файлове ще бъдат премахнати.", "The folder path cannot be blank.": "Пътят до папката не може да бъде празен.", "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "Използват се следните интервали: за първия час се пази версия на всеки 30 секунди, за първия ден - на всеки час, за първите 30 дена - всеки ден, до максимума се пази една версия всяка седмица.", "The following items could not be synchronized.": "Следните елементи не могат да бъдат синхронизирани.", @@ -410,12 +410,12 @@ "Waiting to Clean": "Waiting to Clean", "Waiting to Scan": "Waiting to Scan", "Waiting to Sync": "Waiting to Sync", - "Warning": "Предупреждение", - "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "Предупреждение, този път е родителска папка съществуващата „{{otherFolder}}“.", - "Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Предупреждение, този път е родителска папка съществуващата „{{otherFolderLabel}}“ ({{otherFolder}}).", - "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Предупреждение, този път е подпапка съществуващата „{{otherFolder}}“.", - "Warning, this path is a subdirectory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Предупреждение, този път е подпапка на съществуващата „{{otherFolderLabel}}“ ({{otherFolder}}).", - "Warning: If you are using an external watcher like {%syncthingInotify%}, you should make sure it is deactivated.": "Предупреждение: Ако използвате външно приложение за наблюдение като {{syncthingInotify}}, трябва да го спрете.", + "Warning": "Внимание", + "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "Внимание, този път е родителска папка съществуващата „{{otherFolder}}“.", + "Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Внимание, този път е родителска папка съществуващата „{{otherFolderLabel}}“ ({{otherFolder}}).", + "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Внимание, този път е подпапка съществуващата „{{otherFolder}}“.", + "Warning, this path is a subdirectory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Внимание, този път е подпапка на съществуващата „{{otherFolderLabel}}“ ({{otherFolder}}).", + "Warning: If you are using an external watcher like {%syncthingInotify%}, you should make sure it is deactivated.": "Внимание: Ако използвате външно приложение за наблюдение като {{syncthingInotify}}, трябва да го спрете.", "Watch for Changes": "Наблюдаване за промени", "Watching for Changes": "Наблюдаване за промени", "Watching for changes discovers most changes without periodic scanning.": "Наблюдението за промени открива повечето изменения без периодични обхождания.", diff --git a/gui/default/assets/lang/lang-da.json b/gui/default/assets/lang/lang-da.json index bebb14659..6faea6360 100644 --- a/gui/default/assets/lang/lang-da.json +++ b/gui/default/assets/lang/lang-da.json @@ -26,12 +26,12 @@ "Anonymous Usage Reporting": "Anonym brugerstatistik", "Anonymous usage report format has changed. Would you like to move to the new format?": "Formatet for anonym brugerstatistik er ændret. Vil du flytte til det nye format?", "Are you sure you want to continue?": "Fortsætte?", - "Are you sure you want to override all remote changes?": "Are you sure you want to override all remote changes?", + "Are you sure you want to override all remote changes?": "Tilsidesæt alle eksterne ændringer?", "Are you sure you want to permanently delete all these files?": "Slette valgte filer permanent?", "Are you sure you want to remove device {%name%}?": "Er du sikker på, at du vil fjerne enheden {{name}}?", "Are you sure you want to remove folder {%label%}?": "Er du sikker på, at du vil fjerne mappen {{label}}?", "Are you sure you want to restore {%count%} files?": "Er du sikker på, at du vil genskabe {{count}} filer?", - "Are you sure you want to revert all local changes?": "Are you sure you want to revert all local changes?", + "Are you sure you want to revert all local changes?": "Fortryde alle lokale ændringer?", "Are you sure you want to upgrade?": "Opgradere?", "Auto Accept": "Autoacceptér", "Automatic Crash Reporting": "Automatisk nedbrud rapportering", @@ -42,7 +42,7 @@ "Available debug logging facilities:": "Tilgængelige faciliteter for fejlretningslogning:", "Be careful!": "Vær forsigtig!", "Bugs": "Fejl", - "Cancel": "Cancel", + "Cancel": "Annullere", "Changelog": "Udgivelsesnoter", "Clean out after": "Rens efter", "Cleaning Versions": "Rydder op i versioner", diff --git a/man/stdiscosrv.1 b/man/stdiscosrv.1 index 108c96279..f5ae5314e 100644 --- a/man/stdiscosrv.1 +++ b/man/stdiscosrv.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "STDISCOSRV" "1" "Aug 17, 2021" "v1" "Syncthing" +.TH "STDISCOSRV" "1" "Sep 01, 2021" "v1" "Syncthing" .SH NAME stdiscosrv \- Syncthing Discovery Server .SH SYNOPSIS diff --git a/man/strelaysrv.1 b/man/strelaysrv.1 index 18be1d97d..a71a17de7 100644 --- a/man/strelaysrv.1 +++ b/man/strelaysrv.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "STRELAYSRV" "1" "Aug 17, 2021" "v1" "Syncthing" +.TH "STRELAYSRV" "1" "Sep 01, 2021" "v1" "Syncthing" .SH NAME strelaysrv \- Syncthing Relay Server .SH SYNOPSIS diff --git a/man/syncthing-bep.7 b/man/syncthing-bep.7 index 2c6bbb1c9..b8bad4aca 100644 --- a/man/syncthing-bep.7 +++ b/man/syncthing-bep.7 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SYNCTHING-BEP" "7" "Aug 17, 2021" "v1" "Syncthing" +.TH "SYNCTHING-BEP" "7" "Sep 01, 2021" "v1" "Syncthing" .SH NAME syncthing-bep \- Block Exchange Protocol v1 .SH INTRODUCTION AND DEFINITIONS diff --git a/man/syncthing-config.5 b/man/syncthing-config.5 index ddf0b79f6..5746397bb 100644 --- a/man/syncthing-config.5 +++ b/man/syncthing-config.5 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SYNCTHING-CONFIG" "5" "Aug 17, 2021" "v1" "Syncthing" +.TH "SYNCTHING-CONFIG" "5" "Sep 01, 2021" "v1" "Syncthing" .SH NAME syncthing-config \- Syncthing Configuration .SH SYNOPSIS diff --git a/man/syncthing-device-ids.7 b/man/syncthing-device-ids.7 index fbc5fa793..da8781c91 100644 --- a/man/syncthing-device-ids.7 +++ b/man/syncthing-device-ids.7 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SYNCTHING-DEVICE-IDS" "7" "Aug 17, 2021" "v1" "Syncthing" +.TH "SYNCTHING-DEVICE-IDS" "7" "Sep 01, 2021" "v1" "Syncthing" .SH NAME syncthing-device-ids \- Understanding Device IDs .sp diff --git a/man/syncthing-event-api.7 b/man/syncthing-event-api.7 index 2d3afd441..4378b82b3 100644 --- a/man/syncthing-event-api.7 +++ b/man/syncthing-event-api.7 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SYNCTHING-EVENT-API" "7" "Aug 17, 2021" "v1" "Syncthing" +.TH "SYNCTHING-EVENT-API" "7" "Sep 01, 2021" "v1" "Syncthing" .SH NAME syncthing-event-api \- Event API .SH DESCRIPTION diff --git a/man/syncthing-faq.7 b/man/syncthing-faq.7 index 554a08830..7401eab93 100644 --- a/man/syncthing-faq.7 +++ b/man/syncthing-faq.7 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SYNCTHING-FAQ" "7" "Aug 17, 2021" "v1" "Syncthing" +.TH "SYNCTHING-FAQ" "7" "Sep 01, 2021" "v1" "Syncthing" .SH NAME syncthing-faq \- Frequently Asked Questions .INDENT 0.0 diff --git a/man/syncthing-globaldisco.7 b/man/syncthing-globaldisco.7 index 96bc09d81..1354622bb 100644 --- a/man/syncthing-globaldisco.7 +++ b/man/syncthing-globaldisco.7 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SYNCTHING-GLOBALDISCO" "7" "Aug 17, 2021" "v1" "Syncthing" +.TH "SYNCTHING-GLOBALDISCO" "7" "Sep 01, 2021" "v1" "Syncthing" .SH NAME syncthing-globaldisco \- Global Discovery Protocol v3 .SH ANNOUNCEMENTS diff --git a/man/syncthing-localdisco.7 b/man/syncthing-localdisco.7 index d9ef6f60e..afd746e44 100644 --- a/man/syncthing-localdisco.7 +++ b/man/syncthing-localdisco.7 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SYNCTHING-LOCALDISCO" "7" "Aug 17, 2021" "v1" "Syncthing" +.TH "SYNCTHING-LOCALDISCO" "7" "Sep 01, 2021" "v1" "Syncthing" .SH NAME syncthing-localdisco \- Local Discovery Protocol v4 .SH MODE OF OPERATION diff --git a/man/syncthing-networking.7 b/man/syncthing-networking.7 index 33dc8fcf6..a856255de 100644 --- a/man/syncthing-networking.7 +++ b/man/syncthing-networking.7 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SYNCTHING-NETWORKING" "7" "Aug 17, 2021" "v1" "Syncthing" +.TH "SYNCTHING-NETWORKING" "7" "Sep 01, 2021" "v1" "Syncthing" .SH NAME syncthing-networking \- Firewall Setup .SH ROUTER SETUP diff --git a/man/syncthing-relay.7 b/man/syncthing-relay.7 index e333acd23..0f64effac 100644 --- a/man/syncthing-relay.7 +++ b/man/syncthing-relay.7 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SYNCTHING-RELAY" "7" "Aug 17, 2021" "v1" "Syncthing" +.TH "SYNCTHING-RELAY" "7" "Sep 01, 2021" "v1" "Syncthing" .SH NAME syncthing-relay \- Relay Protocol v1 .SH WHAT IS A RELAY? diff --git a/man/syncthing-rest-api.7 b/man/syncthing-rest-api.7 index 8e72c907b..a20556559 100644 --- a/man/syncthing-rest-api.7 +++ b/man/syncthing-rest-api.7 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SYNCTHING-REST-API" "7" "Aug 17, 2021" "v1" "Syncthing" +.TH "SYNCTHING-REST-API" "7" "Sep 01, 2021" "v1" "Syncthing" .SH NAME syncthing-rest-api \- REST API .sp diff --git a/man/syncthing-security.7 b/man/syncthing-security.7 index 6729dfcc9..11d66ba94 100644 --- a/man/syncthing-security.7 +++ b/man/syncthing-security.7 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SYNCTHING-SECURITY" "7" "Aug 17, 2021" "v1" "Syncthing" +.TH "SYNCTHING-SECURITY" "7" "Sep 01, 2021" "v1" "Syncthing" .SH NAME syncthing-security \- Security Principles .sp diff --git a/man/syncthing-stignore.5 b/man/syncthing-stignore.5 index 7e1b7fc1e..2edc544f9 100644 --- a/man/syncthing-stignore.5 +++ b/man/syncthing-stignore.5 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SYNCTHING-STIGNORE" "5" "Aug 17, 2021" "v1" "Syncthing" +.TH "SYNCTHING-STIGNORE" "5" "Sep 01, 2021" "v1" "Syncthing" .SH NAME syncthing-stignore \- Prevent files from being synchronized to other nodes .SH SYNOPSIS @@ -130,12 +130,13 @@ single pair of parentheses (not “(?di)”). \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. +Include patterns (that begin with \fB!\fP) cause Syncthing to traverse +the entire directory tree regardless of other ignore patterns. +If the watcher is enabled, the entire directory +tree will be watched as well. .sp Top\-level include patterns are treated as special cases and will not force Syncthing to -scan the entire directory tree. For example: \fB!/foo\fP is a top\-level include +scan (or watch) the entire directory tree. For example: \fB!/foo\fP is a top\-level include pattern, while \fB!/foo/bar\fP is not. .UNINDENT .UNINDENT diff --git a/man/syncthing-versioning.7 b/man/syncthing-versioning.7 index 3c721f387..e7b1e7992 100644 --- a/man/syncthing-versioning.7 +++ b/man/syncthing-versioning.7 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SYNCTHING-VERSIONING" "7" "Aug 17, 2021" "v1" "Syncthing" +.TH "SYNCTHING-VERSIONING" "7" "Sep 01, 2021" "v1" "Syncthing" .SH NAME syncthing-versioning \- Keep automatic backups of deleted files by other nodes .sp diff --git a/man/syncthing.1 b/man/syncthing.1 index 6840b4763..8f1885a94 100644 --- a/man/syncthing.1 +++ b/man/syncthing.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SYNCTHING" "1" "Aug 17, 2021" "v1" "Syncthing" +.TH "SYNCTHING" "1" "Sep 01, 2021" "v1" "Syncthing" .SH NAME syncthing \- Syncthing .SH SYNOPSIS