diff --git a/gui/default/assets/lang/lang-cs.json b/gui/default/assets/lang/lang-cs.json index 09d2f175f..120e74768 100644 --- a/gui/default/assets/lang/lang-cs.json +++ b/gui/default/assets/lang/lang-cs.json @@ -328,8 +328,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.": "Zadaný identifikátor zařízení není platný. Měl by mít 52 nebo 56 znaků a měl by obsahovat písmena a číslice. Mezery a pomlčky jsou nepovinné.", "The folder ID cannot be blank.": "Identifikátor složky nemůže zůstat nevyplněný.", "The folder ID must be unique.": "Je třeba, aby se identifikátor složky neopakoval.", - "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.": "Obsah složky na ostatních zařízeních bude přepsán, aby se stal identickým s tímto zařízením. Soubory, které zde chybí, budou smazány na ostatních zařízeních.", + "The folder content on this device will be overwritten to become identical with other devices. Files newly added here will be deleted.": "Obsah složky na tomto zařízení bude přepsán, aby se stal identickým s ostatními zařízeními. Lokálně přidané soubory budou smazány.", "The folder path cannot be blank.": "Popis umístění složky nemůže zůstat nevyplněný.", "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.": "Jsou použity následující intervaly: za první hodinu jsou ponechány verze pro každých 30 sekund, za první den jsou ponechány verze pro každou hodinu, za prvních 30 dní jsou ponechány verze pro každý den a do nejvyššího nastaveného stáří jsou ponechány verze pro každý týden.", "The following items could not be synchronized.": "Následující položky nemohly být synchronizovány.", @@ -386,7 +386,7 @@ "Waiting to Clean": "Čeká se na čistění", "Waiting to Scan": "Čekání na skenování", "Waiting to Sync": "Čekání na synchronizaci", - "Warning": "Warning", + "Warning": "Varování", "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "Varování, tento popis umístění je nadřazenou složkou existující „{{otherFolder}}“.", "Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "Varování, tento popis umístění je nadřazenou složkou existující „{{otherFolderLabel}}“ ({{otherFolder}}).", "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Varování: toto umístění je podsložkou existující „{{otherFolder}}“.", diff --git a/gui/default/assets/lang/lang-ru.json b/gui/default/assets/lang/lang-ru.json index 2f9a3a153..c261940a4 100644 --- a/gui/default/assets/lang/lang-ru.json +++ b/gui/default/assets/lang/lang-ru.json @@ -24,13 +24,13 @@ "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.": "Для версионирования используется внешняя программа. Ей нужно удалить файл из общей папки. Если путь к приложению содержит пробелы, его нужно взять в кавычки.", "Anonymous Usage Reporting": "Анонимный отчет об использовании", - "Anonymous usage report format has changed. Would you like to move to the new format?": "Формат анонимных отчётов изменился. Вы хотите переключиться на новый формат?", - "Are you sure you want to continue?": "Are you sure you want to continue?", - "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?": "Вы уверены, что хотите обновить?", + "Anonymous usage report format has changed. Would you like to move to the new format?": "Формат анонимных отчётов изменился. Хотите переключиться на новый формат?", + "Are you sure you want to continue?": "Уверены, что хотите продолжить?", + "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?": "Уверены, что хотите обновить?", "Auto Accept": "Автопринятие", "Automatic Crash Reporting": "Автоматическая отправка отчётов о сбоях", "Automatic upgrade now offers the choice between stable releases and release candidates.": "Автоматическое обновление теперь предлагает выбор между стабильными выпусками и кандидатами в релизы.", @@ -43,7 +43,7 @@ "Changelog": "Журнал изменений", "Clean out after": "Очистить после", "Cleaning Versions": "Cleaning Versions", - "Cleanup Interval": "Cleanup Interval", + "Cleanup Interval": "Интервал очистки", "Click to see discovery failures": "Щёлкните, чтобы посмотреть ошибки", "Close": "Закрыть", "Command": "Команда", @@ -62,16 +62,16 @@ "Currently Shared With Devices": "В настоящее время используется совместно с устройствами", "Danger!": "Опасно!", "Debugging Facilities": "Средства отладки", - "Default Configuration": "Default Configuration", + "Default Configuration": "Настройки по умолчанию", "Default Device": "Стандартное Устройство", "Default Folder": "Стандартная папка", "Default Folder Path": "Путь для папок", "Defaults": "Стандартные параметры", - "Delete Unexpected Items": "Delete Unexpected Items", + "Delete Unexpected Items": "Удалить неожиданные элементы", "Deleted": "Удалено", "Deselect All": "Снять выделение", "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 folders to stop sharing with this device.": "Отмените выбор папок, чтобы прекратить совместное использование с этим устройством.", "Device": "Устройство", "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Устройство «{{name}}» ({{device}} на {{address}}) хочет подключиться. Добавить новое устройство?", "Device ID": "ID устройства", @@ -151,7 +151,7 @@ "Global Discovery Servers": "Серверы глобального обнаружения", "Global State": "Глобальное состояние", "Help": "Помощь", - "Home page": "Домашняя страница", + "Home page": "Сайт", "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.": "Если вы хотите запретить другим пользователям на этом компьютере доступ к Syncthing и через него к вашим файлам, подумайте о настройке аутентификации.", @@ -361,13 +361,13 @@ "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.", + "Unexpected Items": "Неожиданные элементы", + "Unexpected items have been found in this folder.": "В папке найдены неожиданные элементы.", "Unignore": "Не игнорировать", "Unknown": "Неизвестно", "Unshared": "Необщедоступно", "Unshared Devices": "Устройства без общего доступа", - "Unshared Folders": "Unshared Folders", + "Unshared Folders": "Необщедоступные папки", "Untrusted": "Untrusted", "Up to Date": "В актуальном состоянии", "Updated": "Обновлено", @@ -383,10 +383,10 @@ "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 Clean": "Ожидание очистки", "Waiting to Scan": "Ожидание сканирования", "Waiting to Sync": "Ожидание синхронизации", - "Warning": "Warning", + "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}}».", @@ -405,13 +405,13 @@ "You have no ignored folders.": "У вас нет игнорируемых папок.", "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": "папок", "files": "файлов", "full documentation": "полная документация", "items": "элементы", - "seconds": "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." diff --git a/man/stdiscosrv.1 b/man/stdiscosrv.1 index 6d8e02758..8e9995dde 100644 --- a/man/stdiscosrv.1 +++ b/man/stdiscosrv.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "STDISCOSRV" "1" "Apr 04, 2021" "v1" "Syncthing" +.TH "STDISCOSRV" "1" "Apr 13, 2021" "v1" "Syncthing" .SH NAME stdiscosrv \- Syncthing Discovery Server . diff --git a/man/strelaysrv.1 b/man/strelaysrv.1 index 1cd0b9c02..48607d00e 100644 --- a/man/strelaysrv.1 +++ b/man/strelaysrv.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "STRELAYSRV" "1" "Apr 04, 2021" "v1" "Syncthing" +.TH "STRELAYSRV" "1" "Apr 13, 2021" "v1" "Syncthing" .SH NAME strelaysrv \- Syncthing Relay Server . diff --git a/man/syncthing-bep.7 b/man/syncthing-bep.7 index 259a99269..5e5202f61 100644 --- a/man/syncthing-bep.7 +++ b/man/syncthing-bep.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-BEP" "7" "Apr 04, 2021" "v1" "Syncthing" +.TH "SYNCTHING-BEP" "7" "Apr 13, 2021" "v1" "Syncthing" .SH NAME syncthing-bep \- Block Exchange Protocol v1 . diff --git a/man/syncthing-config.5 b/man/syncthing-config.5 index e46c2e580..d9e38d846 100644 --- a/man/syncthing-config.5 +++ b/man/syncthing-config.5 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-CONFIG" "5" "Apr 04, 2021" "v1" "Syncthing" +.TH "SYNCTHING-CONFIG" "5" "Apr 13, 2021" "v1" "Syncthing" .SH NAME syncthing-config \- Syncthing Configuration . diff --git a/man/syncthing-device-ids.7 b/man/syncthing-device-ids.7 index c8bb9aadc..3f83967d3 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" "Apr 04, 2021" "v1" "Syncthing" +.TH "SYNCTHING-DEVICE-IDS" "7" "Apr 13, 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 3a2c70373..1997ff909 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" "Apr 04, 2021" "v1" "Syncthing" +.TH "SYNCTHING-EVENT-API" "7" "Apr 13, 2021" "v1" "Syncthing" .SH NAME syncthing-event-api \- Event API . @@ -713,7 +713,9 @@ changes during a scan. .sp When authentication is enabled for the GUI, this event is emitted on every login attempt. If either the username or password are incorrect, \fBsuccess\fP -is false and in any case the given username is returned. +is false and in any case the given username is returned. The included +remote address concerns the immediate connecting host, which may not be the +origin of the request, but e.g. a reverse proxy. .INDENT 0.0 .INDENT 3.5 .sp @@ -723,6 +725,7 @@ is false and in any case the given username is returned. "id" : 187, "time" : "2017\-03\-07T00:19:24.420386143+01:00", "data" : { + "remoteAddress" : "127.0.0.1:55530", "username" : "somename", "success" : false }, diff --git a/man/syncthing-faq.7 b/man/syncthing-faq.7 index 287787790..69431e69e 100644 --- a/man/syncthing-faq.7 +++ b/man/syncthing-faq.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-FAQ" "7" "Apr 04, 2021" "v1" "Syncthing" +.TH "SYNCTHING-FAQ" "7" "Apr 13, 2021" "v1" "Syncthing" .SH NAME syncthing-faq \- Frequently Asked Questions . diff --git a/man/syncthing-globaldisco.7 b/man/syncthing-globaldisco.7 index bb7362f9e..e669ee1bd 100644 --- a/man/syncthing-globaldisco.7 +++ b/man/syncthing-globaldisco.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-GLOBALDISCO" "7" "Apr 04, 2021" "v1" "Syncthing" +.TH "SYNCTHING-GLOBALDISCO" "7" "Apr 13, 2021" "v1" "Syncthing" .SH NAME syncthing-globaldisco \- Global Discovery Protocol v3 . diff --git a/man/syncthing-localdisco.7 b/man/syncthing-localdisco.7 index 380daec90..ac0196fdb 100644 --- a/man/syncthing-localdisco.7 +++ b/man/syncthing-localdisco.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-LOCALDISCO" "7" "Apr 04, 2021" "v1" "Syncthing" +.TH "SYNCTHING-LOCALDISCO" "7" "Apr 13, 2021" "v1" "Syncthing" .SH NAME syncthing-localdisco \- Local Discovery Protocol v4 . diff --git a/man/syncthing-networking.7 b/man/syncthing-networking.7 index 0119983ba..f0f3f880a 100644 --- a/man/syncthing-networking.7 +++ b/man/syncthing-networking.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-NETWORKING" "7" "Apr 04, 2021" "v1" "Syncthing" +.TH "SYNCTHING-NETWORKING" "7" "Apr 13, 2021" "v1" "Syncthing" .SH NAME syncthing-networking \- Firewall Setup . diff --git a/man/syncthing-relay.7 b/man/syncthing-relay.7 index c6f17680d..8ef75dda1 100644 --- a/man/syncthing-relay.7 +++ b/man/syncthing-relay.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-RELAY" "7" "Apr 04, 2021" "v1" "Syncthing" +.TH "SYNCTHING-RELAY" "7" "Apr 13, 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 16b4e158a..03c9be6d6 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" "Apr 04, 2021" "v1" "Syncthing" +.TH "SYNCTHING-REST-API" "7" "Apr 13, 2021" "v1" "Syncthing" .SH NAME syncthing-rest-api \- REST API . diff --git a/man/syncthing-security.7 b/man/syncthing-security.7 index 18169f404..b6422c409 100644 --- a/man/syncthing-security.7 +++ b/man/syncthing-security.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-SECURITY" "7" "Apr 04, 2021" "v1" "Syncthing" +.TH "SYNCTHING-SECURITY" "7" "Apr 13, 2021" "v1" "Syncthing" .SH NAME syncthing-security \- Security Principles . diff --git a/man/syncthing-stignore.5 b/man/syncthing-stignore.5 index 5e6a729fb..d3d2b972d 100644 --- a/man/syncthing-stignore.5 +++ b/man/syncthing-stignore.5 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-STIGNORE" "5" "Apr 04, 2021" "v1" "Syncthing" +.TH "SYNCTHING-STIGNORE" "5" "Apr 13, 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 dba12c6aa..a2a67de40 100644 --- a/man/syncthing-versioning.7 +++ b/man/syncthing-versioning.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-VERSIONING" "7" "Apr 04, 2021" "v1" "Syncthing" +.TH "SYNCTHING-VERSIONING" "7" "Apr 13, 2021" "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 b583ec642..4c83cb9d6 100644 --- a/man/syncthing.1 +++ b/man/syncthing.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING" "1" "Apr 04, 2021" "v1" "Syncthing" +.TH "SYNCTHING" "1" "Apr 13, 2021" "v1" "Syncthing" .SH NAME syncthing \- Syncthing .