lib/model: Fix config deadlock when deleting a paused folder (#7854)

AUTHORS

@@ -144,6 +144,7 @@ Jonathan <artback@protonmail.com>
 Jonathan Cross <jcross@gmail.com>
 Jonta <359397+Jonta@users.noreply.github.com>
 Jose Manuel Delicado (jmdaweb) <jmdaweb@hotmail.com> <jmdaweb@users.noreply.github.com>
+jtagcat <git-514635f7@jtag.cat>
 Jörg Thalheim <Mic92@users.noreply.github.com>
 Jędrzej Kula <kula.jedrek@gmail.com>
 Kalle Laine <pahakalle@protonmail.com>

cmd/stcrashreceiver/main.go

@@ -89,7 +89,8 @@ func handleFailureFn(dsn string) func(w http.ResponseWriter, req *http.Request)
 			pkt.Extra = raven.Extra{
 				"count": r.Count,
 			}
-			pkt.Fingerprint = []string{r.Description}
+			message := sanitizeMessageLDB(r.Description)
+			pkt.Fingerprint = []string{message}
 
 			if err := sendReport(dsn, pkt, userIDFor(req)); err != nil {
 				log.Println("Failed to send failure report:", err)

cmd/stcrashreceiver/sentry.go

@@ -143,15 +143,20 @@ var (
 	ldbPathRe        = regexp.MustCompile(`(open|write|read) .+[\\/].+[\\/]index[^\\/]+[\\/][^\\/]+: `)
 )
 
-func crashReportFingerprint(message string) []string {
-	// Do not fingerprint on the stack in case of db corruption or fatal
-	// db io error - where it occurs doesn't matter.
-	orig := message
+func sanitizeMessageLDB(message string) string {
 	message = ldbPosRe.ReplaceAllString(message, "${1}x)")
 	message = ldbFileRe.ReplaceAllString(message, "${1}x${3}")
 	message = ldbChecksumRe.ReplaceAllString(message, "${1}X${3}X")
 	message = ldbInternalKeyRe.ReplaceAllString(message, "${1}x${2}x")
 	message = ldbPathRe.ReplaceAllString(message, "$1 x: ")
+	return message
+}
+
+func crashReportFingerprint(message string) []string {
+	// Do not fingerprint on the stack in case of db corruption or fatal
+	// db io error - where it occurs doesn't matter.
+	orig := message
+	message = sanitizeMessageLDB(message)
 	if message != orig {
 		return []string{message}
 	}

gui/default/assets/lang/lang-bg.json

@@ -2,7 +2,7 @@
     "A device with that ID is already added.": "Устройство с този идентификатор е вече добавено.",
     "A negative number of days doesn't make sense.": "Няма логика в задаването на отрицателен брой дни.",
     "A new major version may not be compatible with previous versions.": "Нова основна версия, която може да не е съвместима с предишни версии.",
-    "API Key": "API Ключ",
+    "API Key": "Ключ за ППИ",
     "About": "За програмата",
     "Action": "Действие",
     "Actions": "Меню",
@@ -10,21 +10,21 @@
     "Add Device": "Добави устройство",
     "Add Folder": "Добави папка",
     "Add Remote Device": "Ново отдалечено устройство",
-    "Add devices from the introducer to our device list, for mutually shared folders.": "Добавяне на устройства през устройства предлагащи други устройства, за взаимно споделени папки.",
+    "Add devices from the introducer to our device list, for mutually shared folders.": "Добавяйте устройства през поръчителите за взаимно споделени папки.",
     "Add new folder?": "Добавяне на папка?",
     "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.": "Също така интервалът за повторно сканиране ще бъде увеличен (60 пъти, пр. новият интервал бъде 1ч). Освен това може да го зададете и ръчно за всяка папка след като изберете Не.",
     "Address": "Адрес",
     "Addresses": "Адреси",
     "Advanced": "Допълнителни",
-    "Advanced Configuration": "Допълнителни настройки",
+    "Advanced Configuration": "Разширени настройки",
     "All Data": "Всички данни",
-    "All folders shared with this device must be protected by a password, such that all sent data is unreadable without the given password.": "All folders shared with this device must be protected by a password, such that all sent data is unreadable without the given password.",
-    "Allow Anonymous Usage Reporting?": "Разрешаване изпращането на анонимни статистически данни?",
+    "All folders shared with this device must be protected by a password, such that all sent data is unreadable without the given password.": "Всички, споделени с това устройство папки трябва да бъдат защитени с парола, за да може данните да са недосстъпни без нея.",
+    "Allow Anonymous Usage Reporting?": "Разрешаване на анонимното отчитане на употребата?",
     "Allowed Networks": "Разрешени мрежи",
     "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?": "Форматът на анонимния доклад е променен. Желаете ли да преминете към новия формат?",
+    "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 permanently delete all these files?",
     "Are you sure you want to remove device {%name%}?": "Сигурни ли сте, че искате да премахнете устройството {{name}}?",
@@ -32,20 +32,20 @@
     "Are you sure you want to restore {%count%} files?": "Сигурни ли сте, че искате да възстановите файла {{count}}?",
     "Are you sure you want to upgrade?": "Are you sure you want to upgrade?",
     "Auto Accept": "Автоматично приемане",
-    "Automatic Crash Reporting": "Automatic Crash Reporting",
-    "Automatic upgrade now offers the choice between stable releases and release candidates.": "Автоматичното обновяване вече предлага избор между стабилни версии и кандидат версии.",
+    "Automatic Crash Reporting": "Автоматично изпращане на доклад за срив",
+    "Automatic upgrade now offers the choice between stable releases and release candidates.": "Автоматичното обновяване вече предлага избор между стабилни и предварителни издания.",
     "Automatic upgrades": "Автоматично обновяване",
-    "Automatic upgrades are always enabled for candidate releases.": "Automatic upgrades are always enabled for candidate releases.",
+    "Automatic upgrades are always enabled for candidate releases.": "Автоматичното обновяване е винаги включено за предварителните издания.",
     "Automatically create or share folders that this device advertises at the default path.": "Автоматично създаване или споделяне на папки, които това устройство предлага в пътя по подразбиране.",
-    "Available debug logging facilities:": "Дебъгинг функционалност на разположение:",
+    "Available debug logging facilities:": "Available debug logging facilities:",
     "Be careful!": "Внимание!",
-    "Bugs": "Бъгове",
+    "Bugs": "Дефекти",
     "Changelog": "Списък с промени",
-    "Clean out after": "Изчисти след",
+    "Clean out after": "Clean out after",
     "Cleaning Versions": "Cleaning Versions",
     "Cleanup Interval": "Cleanup Interval",
     "Click to see discovery failures": "Натиснете, за да видите грешки при откриването",
-    "Click to see full identification string and QR code.": "Click to see full identification string and QR code.",
+    "Click to see full identification string and QR code.": "Щракнете, за да видите целия идентификатор и код за QR.",
     "Close": "Затваряне",
     "Command": "Команда",
     "Comment, when used at the start of a line": "Коментар, използван в началото на реда",
@@ -55,14 +55,14 @@
     "Connection Error": "Грешка при свързването",
     "Connection Type": "Вид връзка",
     "Connections": "Връзки",
-    "Continuously watching for changes is now available within Syncthing. This will detect changes on disk and issue a scan on only the modified paths. The benefits are that changes are propagated quicker and that less full scans are required.": "Постоянния мониторинг за промени вече е част от Syncthing. При промени по файловете се стартира сканиране само за променените папки. Ползите са, че промените биват синхронизирани по-бързо, без да се изисква цялостно сканирания на папките.",
+    "Continuously watching for changes is now available within Syncthing. This will detect changes on disk and issue a scan on only the modified paths. The benefits are that changes are propagated quicker and that less full scans are required.": "Syncthing вече разполага с постоянно наблюдение за промени. Така се забелязват промените на дисковото устройство и се обхождат само променените папки. Ползите са, че промените се разпространяват по-бързо и с по-малко на брой пълни обхождания.",
     "Copied from elsewhere": "Копиране от някъде другаде",
     "Copied from original": "Копиран от оригинала",
     "Copyright © 2014-2019 the following Contributors:": "Copyright © 2014-2019 the following Contributors:",
-    "Creating ignore patterns, overwriting an existing file at {%path%}.": "Създаване на шаблони за игнориране, презаписване на съществуващ файл в {{path}}.",
-    "Currently Shared With Devices": "Currently Shared With Devices",
+    "Creating ignore patterns, overwriting an existing file at {%path%}.": "При създаване на шаблони за отхвърляне, съществуващият файл „{{path}}“ ще бъде презаписан.",
+    "Currently Shared With Devices": "Устройства, с които е споделена",
     "Danger!": "Опасност!",
-    "Debugging Facilities": "Дебъг функционалност",
+    "Debugging Facilities": "Debugging Facilities",
     "Default Configuration": "Default Configuration",
     "Default Device": "Default Device",
     "Default Folder": "Default Folder",
@@ -71,15 +71,15 @@
     "Delete Unexpected Items": "Delete Unexpected Items",
     "Deleted": "Изтрито",
     "Deselect All": "Никое",
-    "Deselect devices to stop sharing this folder with.": "Deselect devices to stop sharing this folder with.",
+    "Deselect devices to stop sharing this folder with.": "Махнете отметката от устройство, за да спрете споделяне с него.",
     "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": "Идентификатор на устройство",
-    "Device Identification": "Идентификатор на устройството",
+    "Device Identification": "Идентификатор на устройство",
     "Device Name": "Име на устройството",
     "Device is untrusted, enter encryption password": "Device is untrusted, enter encryption password",
-    "Device rate limits": "Ограничения на скоростта",
+    "Device rate limits": "Ограничаване на скоростта",
     "Device that last modified the item": "Устройство, което последно промени обекта",
     "Devices": "Устройства",
     "Disable Crash Reporting": "Disable Crash Reporting",
@@ -87,7 +87,7 @@
     "Disabled periodic scanning and disabled watching for changes": "Периодичните сканирания и наблюденията за промяна са деактивирани.",
     "Disabled periodic scanning and enabled watching for changes": "Периодичните сканирания са деактивирани , а наблюденията за промяна са активирани.",
     "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Периодичните сканирания са деактивирани и задаването на наблюдение за промени е неуспешно, ще опита пак след 1мин:",
-    "Disables comparing and syncing file permissions. Useful on systems with nonexistent or custom permissions (e.g. FAT, exFAT, Synology, Android).": "Disables comparing and syncing file permissions. Useful on systems with nonexistent or custom permissions (e.g. FAT, exFAT, Synology, Android).",
+    "Disables comparing and syncing file permissions. Useful on systems with nonexistent or custom permissions (e.g. FAT, exFAT, Synology, Android).": "Изключва сравняването и синхронизацията не правата на файловете. Полезно за системи с липсващи или специфични права (като FAT, exFAT, Synology, Android).",
     "Discard": "Discard",
     "Disconnected": "Не е свързано",
     "Disconnected (Unused)": "Disconnected (Unused)",
@@ -97,8 +97,8 @@
     "Dismiss": "Dismiss",
     "Do not add it to the ignore list, so this notification may recur.": "Do not add it to the ignore list, so this notification may recur.",
     "Do not add it to the ignore list, so this notification may recurr.": "Do not add it to the ignore list, so this notification may recurr.",
-    "Do not restore": "Не възстановявай",
-    "Do not restore all": "Не възстановявай всички",
+    "Do not restore": "Без възстановяване",
+    "Do not restore all": "Без възстановяване всички",
     "Do you want to enable watching for changes for all your folders?": "Желаете ли да активирате наблюдението за промени на всички папки?",
     "Documentation": "Документация",
     "Download Rate": "Скорост на сваляне",
@@ -106,9 +106,9 @@
     "Downloading": "Изтегляне",
     "Edit": "Редактиране",
     "Edit Device": "Промяна на устройството",
-    "Edit Device Defaults": "Edit Device Defaults",
+    "Edit Device Defaults": "Подразбирани настройки на устройство",
     "Edit Folder": "Промяна на папката",
-    "Edit Folder Defaults": "Edit Folder Defaults",
+    "Edit Folder Defaults": "Подразбирани настройки на папка",
     "Editing {%path%}.": "Променяне на {{path}}.",
     "Enable Crash Reporting": "Enable Crash Reporting",
     "Enable NAT traversal": "Разреши NAT traversal",
@@ -120,9 +120,9 @@
     "Enter ignore patterns, one per line.": "Добавете шаблони за игнориране, по един на ред.",
     "Enter up to three octal digits.": "Enter up to three octal digits.",
     "Error": "Грешка",
-    "External File Versioning": "Външно управление на версиите",
+    "External File Versioning": "Външно управление на версии",
     "Failed Items": "Неуспешни",
-    "Failed to setup, retrying": "Неуспешно конфигуриране, правенe на повторен опит",
+    "Failed to setup, retrying": "Грешка при настройване, извършва се повторен опит",
     "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Неуспешна връзка към IPv6 сървъри може да се очаква ако няма IPv6 свързаност.",
     "File Pull Order": "Ред на сваляне",
     "File Versioning": "Версии на файловете",
@@ -137,17 +137,17 @@
     "Folder ID": "Идентификатор на папката",
     "Folder Label": "Име на папката",
     "Folder Path": "Път до папката",
-    "Folder Type": "Вид папка",
-    "Folder type \"{%receiveEncrypted%}\" can only be set when adding a new folder.": "Folder type \"{{receiveEncrypted}}\" can only be set when adding a new folder.",
+    "Folder Type": "Вид на папката",
+    "Folder type \"{%receiveEncrypted%}\" can only be set when adding a new folder.": "Вида „{{receiveEncrypted}}“ може да бъде избран само при добавяне на папка.",
     "Folder type \"{%receiveEncrypted%}\" cannot be changed after adding the folder. You need to remove the folder, delete or decrypt the data on disk, and add the folder again.": "Folder type \"{{receiveEncrypted}}\" cannot be changed after adding the folder. You need to remove the folder, delete or decrypt the data on disk, and add the folder again.",
     "Folders": "Папки",
     "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.",
-    "Full Rescan Interval (s)": "Интервал(и) за периодичното сканиране",
+    "Full Rescan Interval (s)": "Интервал на пълно обхождане (секунди)",
     "GUI": "Потребителски интерфейс",
     "GUI Authentication Password": "Парола за интерфейса",
     "GUI Authentication User": "Потребител за интерфейса",
     "GUI Authentication: Set User and Password": "GUI Authentication: Set User and Password",
-    "GUI Listen Address": "Адрес на слушане на GUI-то",
+    "GUI Listen Address": "Адрес на слушане",
     "GUI Theme": "Тема за потребителския интерфейс",
     "General": "Общи",
     "Generate": "Генерирай",
@@ -155,21 +155,21 @@
     "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.": "However, your current settings indicate you might not want it enabled. We have disabled automatic crash reporting for you.",
-    "Identification": "Identification",
-    "If untrusted, enter encryption password": "If untrusted, enter encryption password",
+    "Identification": "Идентификация",
+    "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.": "If you want to prevent other users on this computer from accessing Syncthing and through it your files, consider setting up authentication.",
     "Ignore": "Игнорирай",
     "Ignore Patterns": "Шаблони за игнориране",
-    "Ignore Permissions": "Игнорирай правата за достъп",
+    "Ignore Permissions": "Незачитане на права",
     "Ignored Devices": "Игнорирани устройства",
     "Ignored Folders": "Игнорирани папки",
     "Ignored at": "Ignored at",
     "Incoming Rate Limit (KiB/s)": "При изтегляне (KiB/s)",
     "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Неправилни настройки могат да повредят файлове и да попречат на синхронизирането.",
     "Introduced By": "Предложено от",
-    "Introducer": "Може да предлага други устройства",
+    "Introducer": "Поръчител",
     "Inversion of the given condition (i.e. do not exclude)": "Обратното на даденото условие (пр. не изключвай)",
     "Keep Versions": "Пази версии",
     "LDAP": "LDAP",
@@ -178,18 +178,18 @@
     "Last seen": "Последно видяно",
     "Latest Change": "Последна промяна",
     "Learn more": "Научете повече",
-    "Limit": "Limit",
-    "Listeners": "Синхронизиращи устройства",
+    "Limit": "Ограничение",
+    "Listeners": "Listeners",
     "Loading data...": "Зареждане на информация...",
     "Loading...": "Зареждане...",
     "Local Additions": "Local Additions",
-    "Local Discovery": "Локално откриване",
-    "Local State": "Локално състояние",
-    "Local State (Total)": "Локално състояние (общо)",
+    "Local Discovery": "Local Discovery",
+    "Local State": "Local State",
+    "Local State (Total)": "Local State (Total)",
     "Locally Changed Items": "Locally Changed Items",
-    "Log": "Доклад",
-    "Log tailing paused. Scroll to the bottom to continue.": "Log tailing paused. Scroll to the bottom to continue.",
-    "Logs": "Доклади",
+    "Log": "Дневник",
+    "Log tailing paused. Scroll to the bottom to continue.": "Добавяне на редове към дневника е спряно. Плъзнете най-долу за да продължи.",
+    "Logs": "Дневници",
     "Major Upgrade": "Основно Обновяване",
     "Mass actions": "Действия за всички",
     "Maximum Age": "Максимална възраст",
@@ -221,44 +221,44 @@
     "Path": "Път",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Път до папката на това устройство. Ако не съществува ще бъде създадена. Символът тилда (~) може да бъде използван като заместител на",
     "Path where new auto accepted folders will be created, as well as the default suggested path when adding new folders via the UI. Tilde character (~) expands to {%tilde%}.": "Къде да бъдат създавани, автоматично приети папки, както и предложението за път, при добавяне на нови папки от потребителският интерфейс. Символът тилда (~) ще бъде заменян с {{tilde}}.",
-    "Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).": "Пътят, където версиите да бъдат складирани (оставете празно за папката .stversions).",
+    "Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).": "Папка, в която да бъдат съхранявани версиите (оставете празно за подразбираната директория .stversions в споделената папка).",
     "Pause": "Пауза",
     "Pause All": "Пауза на всички",
     "Paused": "На пауза",
     "Paused (Unused)": "Paused (Unused)",
     "Pending changes": "Pending 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 failed setting up watching for changes, retrying every 1m:": "Периодично сканиране, през определен интервал, мониторинга за промени не може да стартира. Всяка минута минута се прави опит за стартиране:",
+    "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 failed setting up watching for changes, retrying every 1m:": "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:",
     "Permanently add it to the ignore list, suppressing further notifications.": "Permanently add it to the ignore list, suppressing further notifications.",
-    "Permissions": "Права за достъп",
-    "Please consult the release notes before performing a major upgrade.": "Моля прочети бележките по обновяването преди да започнеш.",
-    "Please set a GUI Authentication User and Password in the Settings dialog.": "Моля задайте потребителско име и парола за потребителския интерфейс в секцията Настройки.",
+    "Permissions": "Права",
+    "Please consult the release notes before performing a major upgrade.": "Please consult the release notes before performing a major upgrade.",
+    "Please set a GUI Authentication User and Password in the Settings dialog.": "Задайте потребителско име и парола за потребителския интерфейс в настройките.",
     "Please wait": "Моля изчакайте",
-    "Prefix indicating that the file can be deleted if preventing directory removal": "Представка, която индикира, че файлът може да бъде изтрит ако пречи на премахването на папка",
-    "Prefix indicating that the pattern should be matched without case sensitivity": "Представка, която индикира, че шаблона няма да прави разлика между главни/малки букви",
+    "Prefix indicating that the file can be deleted if preventing directory removal": "Представка, указваща че файлът може да бъде изтрит ако пречи на премахването на папка",
+    "Prefix indicating that the pattern should be matched without case sensitivity": "Представка, указваща че шаблонът не прави разлика в регистъра на буквите",
     "Preparing to Sync": "Preparing to Sync",
     "Preview": "Преглед",
-    "Preview Usage Report": "Преглед на статистиката",
-    "Quick guide to supported patterns": "Бърз наръчник към поддържаните шаблони",
+    "Preview Usage Report": "Преглед на отчета за употребата",
+    "Quick guide to supported patterns": "Кратък наръчник на поддържаните шаблони",
     "Random": "Произволен",
     "Receive Encrypted": "Receive Encrypted",
     "Receive Only": "Само получаване",
     "Received data is already encrypted": "Received data is already encrypted",
     "Recent Changes": "Последни промени",
-    "Reduced by ignore patterns": "Намалено посредством шаблон за игнориране",
-    "Release Notes": "Бележки по обновяването",
+    "Reduced by ignore patterns": "Намалено посредством шаблон за отхвърляне",
+    "Release Notes": "Бележки по изданието",
     "Release candidates contain the latest features and fixes. They are similar to the traditional bi-weekly Syncthing releases.": "Кандидат версиите съдържат най-новата функционалност и поправки. Те са близки до традиционните дву-седмични Synchthing обновления.",
-    "Remote Devices": "Устройства",
-    "Remote GUI": "Remote GUI",
-    "Remove": "Премахни",
+    "Remote Devices": "Отдалачени устройства",
+    "Remote GUI": "Отдалечен ГПИ",
+    "Remove": "Премахване",
     "Remove Device": "Премахване на устройство",
     "Remove Folder": "Премахване на папка",
-    "Required identifier for the folder. Must be the same on all cluster devices.": "Задължителен идентификатор за папката. Трябва да бъде един и същ на всяко устройство.",
+    "Required identifier for the folder. Must be the same on all cluster devices.": "Задължителен идентификатор на папката. Трябва е еднакъв на всички устройства.",
     "Rescan": "Сканирай",
     "Rescan All": "Сканирай всички",
     "Rescans": "Повторни сканирания",
-    "Restart": "Рестартирай",
+    "Restart": "Рестартиране",
     "Restart Needed": "Изисква се рестартиране",
     "Restarting": "Рестартиране",
     "Restore": "Възстановяване",
@@ -268,34 +268,34 @@
     "Reused": "Повторно използван",
     "Revert Local Changes": "Revert Local Changes",
     "Save": "Запазване",
-    "Scan Time Remaining": "Оставащо време за сканиране",
-    "Scanning": "Сканиране",
-    "See external versioning help for supported templated command line parameters.": "Прегледайте външната документацията за поддържаните командни параметри. ",
+    "Scan Time Remaining": "Оставащо време до обхождане",
+    "Scanning": "Обхождане",
+    "See external versioning help for supported templated command line parameters.": "Прочетете ръководството за външно управление на версии, за да се запознаете с шаблонните параметри.",
     "Select All": "Всички",
     "Select a version": "Изберете версия",
-    "Select additional devices to share this folder with.": "Select additional devices to share this folder with.",
-    "Select additional folders to share with this device.": "Select additional folders to share with this device.",
+    "Select additional devices to share this folder with.": "Изберете други устройства, с които да споделите с папката.",
+    "Select additional folders to share with this device.": "Изберете други папки, които да споделите с устройството.",
     "Select latest version": "Избор на най-новата версия",
     "Select oldest version": "Избор на най-старата версия",
-    "Select the folders to share with this device.": "Изберете папките за споделяне с това устройство.",
+    "Select the folders to share with this device.": "Изберете папките, които да споделите с устройството.",
     "Send & Receive": "Изпращане и получаване",
     "Send Only": "Само изпращане",
     "Settings": "Настройки",
-    "Share": "Сподели",
-    "Share Folder": "Сподели папка",
+    "Share": "Споделяне",
+    "Share Folder": "Споделяне на папка",
     "Share Folders With Device": "Споделяне на папки с устройството",
     "Share this folder?": "Сподели тази папка?",
-    "Shared Folders": "Shared Folders",
+    "Shared Folders": "Споделени папки",
     "Shared With": "Споделена с",
     "Sharing": "Споделяне",
     "Show ID": "Покажи идентификатора",
-    "Show QR": "Покажи QR",
+    "Show QR": "Преглед на QR",
     "Show detailed discovery status": "Show detailed discovery status",
     "Show detailed listener status": "Show detailed listener status",
-    "Show diff with previous version": "Показване на разликите спрямо предната версия",
-    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Показва се вместо идентификатора на устройството в статуса на клъстъра. Ще се ползва за представяне пред останалите устройства.",
-    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Показва се вместо идентификатора на устройството в статуса на клъстъра. Ще бъде попълнено с името, с което се е представило устройството, ако оставите полето празно.",
-    "Shutdown": "Спри програмата",
+    "Show diff with previous version": "Показване на разликите с предходната версия",
+    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.",
+    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.",
+    "Shutdown": "Изключване",
     "Shutdown Complete": "Спирането завършено",
     "Simple File Versioning": "Опростени версии",
     "Single level wildcard (matches within a directory only)": "Маска на едно ниво (покрива само в папка)",
@@ -305,14 +305,14 @@
     "Some items could not be restored:": "Някои елементи не могат да бъдат възстановени:",
     "Some listening addresses could not be enabled to accept connections:": "Some listening addresses could not be enabled to accept connections:",
     "Source Code": "Сорс код",
-    "Stable releases and release candidates": "Стабилни версии и кандидати за стабилни версии",
-    "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "Стабилните версии са забавени с две седмици. През това време те преминават през тестване като бъдат кандидат версии.",
+    "Stable releases and release candidates": "Стабилни и предварителни издания",
+    "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "Стабилните издания биват забавяни с две седмици. През този период те преминават през изпитване като предварителни издания.",
     "Stable releases only": "Само стабилни версии",
     "Staggered File Versioning": "Наслагващи се версии",
     "Start Browser": "Стартирай браузъра",
     "Statistics": "Статистика",
     "Stopped": "Не се синхронизира",
-    "Stores and syncs only encrypted data. Folders on all connected devices need to be set up with the same password or be of type \"{%receiveEncrypted%}\" too.": "Stores and syncs only encrypted data. Folders on all connected devices need to be set up with the same password or be of type \"{{receiveEncrypted}}\" too.",
+    "Stores and syncs only encrypted data. Folders on all connected devices need to be set up with the same password or be of type \"{%receiveEncrypted%}\" too.": "Съхранява и синхронизира само шифровани данни. Папките на всички свързани устройства трябва да бъдат настроени със същата парола или също да са от вида „{{receiveEncrypted}}“.",
     "Support": "Помощ",
     "Support Bundle": "Support Bundle",
     "Sync Protocol Listen Addresses": "Адрес за слушане на синхронизиращия протокол",
@@ -325,18 +325,18 @@
     "Syncthing is restarting.": "Syncthing се рестартира",
     "Syncthing is upgrading.": "Syncthing се обновява.",
     "Syncthing now supports automatically reporting crashes to the developers. This feature is enabled by default.": "Syncthing now supports automatically reporting crashes to the developers. This feature is enabled by default.",
-    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Изглежда, че Syncthing не е включен, или има проблем с връзката с Интернет. Повторен опит...",
+    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Изглежда, че Syncthing не работи или няма достъп до интернет. Извършва се повторен опит…",
     "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing има проблем при обработването на заявката. Моля, презаредете браузъра или рестартирайте Syncthing ако проблемът продължи.",
     "Take me back": "Take me back",
     "The GUI address is overridden by startup options. Changes here will not take effect while the override is in place.": "The GUI address is overridden by startup options. Changes here will not take effect while the override is in place.",
     "The Syncthing Authors": "The Syncthing Authors",
     "The Syncthing admin interface is configured to allow remote access without a password.": "Администраторският панел на Syncthing разрешава дистанционен достъп без да изисква парола.",
-    "The aggregated statistics are publicly available at the URL below.": "Обобщение на събраните статистически ще намерите на долния URL адрес.",
+    "The aggregated statistics are publicly available at the URL below.": "Обобщение на събраните статистически данни ще намерите на адреса по-долу.",
     "The cleanup interval cannot be blank.": "The cleanup interval cannot be blank.",
     "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Конфигурацията е запазена, но не е активирана. Syncthing трябва да рестартира, за да се активира новата конфигурация.",
     "The device ID cannot be blank.": "Полето идентификатор на устройство не може да бъде празно.",
-    "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).": "Идентификатор на устройство за въвеждане тук, може да бъде намерен в \"Промени > Покажи идентификатора\" на другото устройство. Интервалите и тиретата са пожелание (биват прескачани).",
-    "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.": "Криптиран статистически доклад ще се изпраща ежедневно. Ползва се, за отичане на ползваните платформи, размер на папки и версии на приложението. При промяна в събираните данни, ще бъдете информирани от подобен на този прозорец.",
+    "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).": "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).",
+    "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.": "Шифрованият отчет за употреба се изпраща ежедневно. Използваме го за отчитане на най-често срещаните платформи, размери на папки и издания на приложението. При промяна в събираните данни отново ще бъде поискано вашето съгласие.",
     "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.": "Идентификаторът на папката трябва да бъде уникален.",
@@ -358,7 +358,7 @@
     "The number of versions must be a number and cannot be blank.": "Броят версии трябва да бъде число и не може да бъде празно.",
     "The path cannot be blank.": "Пътят не може да бъде празен.",
     "The rate limit must be a non-negative number (0: no limit)": "Ограничението на скоростта трябва да бъде положително число (0: неограничено)",
-    "The rescan interval must be a non-negative number of seconds.": "Интервала на сканиране трябва да бъде не отрицателно число в секунди.",
+    "The rescan interval must be a non-negative number of seconds.": "Интервалът на обхождане трябва да е неотрицателен брой на секунди.",
     "There are no devices to share this folder with.": "There are no devices to share this folder with.",
     "There are no folders to share with this device.": "There are no folders to share with this device.",
     "They are retried automatically and will be synced when the error is resolved.": "Ще бъдат спрени и автоматично синхронизирани, когато грешката бъде оправена.",
@@ -380,18 +380,18 @@
     "Unignore": "Unignore",
     "Unknown": "Неясно",
     "Unshared": "Несподелена",
-    "Unshared Devices": "Unshared Devices",
-    "Unshared Folders": "Unshared Folders",
-    "Untrusted": "Untrusted",
+    "Unshared Devices": "Устройства, с които не е споделено",
+    "Unshared Folders": "Несподелени папки",
+    "Untrusted": "Недоверено",
     "Up to Date": "Синхронизирано",
     "Updated": "Обновено",
-    "Upgrade": "Обнови",
-    "Upgrade To {%version%}": "Обновен до {{version}}",
+    "Upgrade": "Обновяване",
+    "Upgrade To {%version%}": "Обновено до {{version}}",
     "Upgrading": "Обновяване",
     "Upload Rate": "Скорост на качване",
     "Uptime": "Работи от",
-    "Usage reporting is always enabled for candidate releases.": "Докладът за ползването е винаги включен за кандидат нови версии.",
-    "Use HTTPS for GUI": "Използвай HTTPS за потребителския интерфейс",
+    "Usage reporting is always enabled for candidate releases.": "Отчитането на употребата винаги е включено за предварителните издания.",
+    "Use HTTPS for GUI": "Потребителският интерфейс работи под HTTPS",
     "Username/Password has not been set for the GUI authentication. Please consider setting it up.": "Username/Password has not been set for the GUI authentication. Please consider setting it up.",
     "Version": "Версия",
     "Versions": "Версии",
@@ -405,12 +405,12 @@
     "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: If you are using an external watcher like {%syncthingInotify%}, you should make sure it is deactivated.": "Предупреждение: Ако използвате външно приложение за наблюдение като {{syncthingInotify}}, трябва да го спрете.",
     "Watch for Changes": "Watch for Changes",
     "Watching for Changes": "Watching for Changes",
     "Watching for changes discovers most changes without periodic scanning.": "Watching for changes discovers most changes without periodic scanning.",
     "When adding a new device, keep in mind that this device must be added on the other side too.": "Когато добавяте ново устройство имайте предвид, че това устройство също трябва да бъде добавено от другата страна.",
-    "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Когато добавяте нов идентификатор на папка имайте предвид, че той се използва за свързване на папките между отделните устройства. Идентификатора разграничава главни/малки букви.",
+    "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "Като добавяте папката имайте предвид, че той се използва за еднозначно указване на папката между устройствата. Има разлика в регистъра на знаците и трябва изцяло да съвпада между всички устройства.",
     "Yes": "Да",
     "You can also select one of these nearby devices:": "Също така може да изберете едно от устройствата, които намират се наблизо:",
     "You can change your choice at any time in the Settings dialog.": "Може да промените решението си по всяко време в прозореца Настройки.",
@@ -418,15 +418,15 @@
     "You have no ignored devices.": "Няма игнорирани устройства.",
     "You have no ignored folders.": "Няма игнорирани папки.",
     "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.": "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.",
     "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."
+    "{%reintroducer%} might reintroduce this device.": "Поръчителят {{reintroducer}} може отново да предложи това устройство."
 }

gui/default/assets/lang/lang-en.json

@@ -94,9 +94,9 @@
    "Discovered": "Discovered",
    "Discovery": "Discovery",
    "Discovery Failures": "Discovery Failures",
+   "Discovery Status": "Discovery Status",
    "Dismiss": "Dismiss",
    "Do not add it to the ignore list, so this notification may recur.": "Do not add it to the ignore list, so this notification may recur.",
-   "Do not add it to the ignore list, so this notification may recurr.": "Do not add it to the ignore list, so this notification may recurr.",
    "Do not restore": "Do not restore",
    "Do not restore all": "Do not restore all",
    "Do you want to enable watching for changes for all your folders?": "Do you want to enable watching for changes for all your folders?",
@@ -122,6 +122,7 @@
    "Error": "Error",
    "External File Versioning": "External File Versioning",
    "Failed Items": "Failed Items",
+   "Failed to load ignore patterns.": "Failed to load ignore patterns.",
    "Failed to setup, retrying": "Failed to setup, retrying",
    "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.",
    "File Pull Order": "File Pull Order",
@@ -179,6 +180,8 @@
    "Latest Change": "Latest Change",
    "Learn more": "Learn more",
    "Limit": "Limit",
+   "Listener Failures": "Listener Failures",
+   "Listener Status": "Listener Status",
    "Listeners": "Listeners",
    "Loading data...": "Loading data...",
    "Loading...": "Loading...",
@@ -217,6 +220,7 @@
    "Out of Sync": "Out of Sync",
    "Out of Sync Items": "Out of Sync Items",
    "Outgoing Rate Limit (KiB/s)": "Outgoing Rate Limit (KiB/s)",
+   "Override": "Override",
    "Override Changes": "Override Changes",
    "Path": "Path",
    "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for",
@@ -266,6 +270,7 @@
    "Resume": "Resume",
    "Resume All": "Resume All",
    "Reused": "Reused",
+   "Revert": "Revert",
    "Revert Local Changes": "Revert Local Changes",
    "Save": "Save",
    "Scan Time Remaining": "Scan Time Remaining",
@@ -392,6 +397,7 @@
    "Uptime": "Uptime",
    "Usage reporting is always enabled for candidate releases.": "Usage reporting is always enabled for candidate releases.",
    "Use HTTPS for GUI": "Use HTTPS for GUI",
+   "Use notifications from the filesystem to detect changed items.": "Use notifications from the filesystem to detect changed items.",
    "Username/Password has not been set for the GUI authentication. Please consider setting it up.": "Username/Password has not been set for the GUI authentication. Please consider setting it up.",
    "Version": "Version",
    "Versions": "Versions",

gui/default/assets/lang/lang-ko-KR.json

@@ -45,7 +45,7 @@
     "Cleaning Versions": "버전 정리 중",
     "Cleanup Interval": "정리 간격",
     "Click to see discovery failures": "탐색 실패 보기",
-    "Click to see full identification string and QR code.": "Click to see full identification string and QR code.",
+    "Click to see full identification string and QR code.": "클릭해서 기기 식별자와 QR 코드 보기.",
     "Close": "닫기",
     "Command": "커맨드",
     "Comment, when used at the start of a line": "명령행에서 시작을 할수 있어요.",
@@ -157,7 +157,7 @@
     "Help": "도움말",
     "Home page": "홈페이지",
     "However, your current settings indicate you might not want it enabled. We have disabled automatic crash reporting for you.": "However, your current settings indicate you might not want it enabled. We have disabled automatic crash reporting for you.",
-    "Identification": "Identification",
+    "Identification": "식별자",
     "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.": "If you want to prevent other users on this computer from accessing Syncthing and through it your files, consider setting up authentication.",
     "Ignore": "무시",

gui/default/assets/lang/lang-pl.json

@@ -95,8 +95,8 @@
     "Discovery": "Odnajdywanie",
     "Discovery Failures": "Błędy odnajdywania",
     "Dismiss": "Odrzuć",
-    "Do not add it to the ignore list, so this notification may recur.": "Do not add it to the ignore list, so this notification may recur.",
-    "Do not add it to the ignore list, so this notification may recurr.": "Do not add it to the ignore list, so this notification may recurr.",
+    "Do not add it to the ignore list, so this notification may recur.": "Nie dodaje do listy ignorowanych, więc powiadomienie to może się powtórzyć.",
+    "Do not add it to the ignore list, so this notification may recurr.": "Nie dodaje do listy ignorowanych, więc powiadomienie to może się powtórzyć.",
     "Do not restore": "Nie przywracaj",
     "Do not restore all": "Nie przywracaj wszystkich",
     "Do you want to enable watching for changes for all your folders?": "Czy chcesz włączyć obserwowanie zmian we wszystkich folderach?",
@@ -230,7 +230,7 @@
     "Periodic scanning at given interval and disabled watching for changes": "Okresowe skanowanie w podanym przedziale czasowym i wyłączone obserwowanie zmian",
     "Periodic scanning at given interval and enabled watching for changes": "Okresowe skanowanie w podanym przedziale czasowym i włączone obserwowanie zmian",
     "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Okresowe skanowanie w podanym przedziale czasowym i nieudane ustawienie obserwowania zmian, ponawiam co minutę:",
-    "Permanently add it to the ignore list, suppressing further notifications.": "Permanently add it to the ignore list, suppressing further notifications.",
+    "Permanently add it to the ignore list, suppressing further notifications.": "Dodaje na stałe od listy ignorowanych, wyciszając kolejne powiadomienia.",
     "Permissions": "Uprawnienia",
     "Please consult the release notes before performing a major upgrade.": "Zapoznaj się z informacjami o wersji przed przeprowadzeniem dużej aktualizacji.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Ustaw użytkownika i hasło do uwierzytelniania GUI w oknie Ustawień.",
@@ -301,9 +301,9 @@
     "Single level wildcard (matches within a directory only)": "Wieloznacznik jednopoziomowy (wyszukuje tylko wewnątrz katalogu)",
     "Size": "Rozmiar",
     "Smallest First": "Najmniejsze na początku",
-    "Some discovery methods could not be established for finding other devices or announcing this device:": "Some discovery methods could not be established for finding other devices or announcing this device:",
+    "Some discovery methods could not be established for finding other devices or announcing this device:": "Nie udało się ustawić niektórych metod odnajdywania w celu szukania innych urządzeń oraz ogłaszania tego urządzenia:",
     "Some items could not be restored:": "Niektórych elementów nie udało się przywrócić:",
-    "Some listening addresses could not be enabled to accept connections:": "Some listening addresses could not be enabled to accept connections:",
+    "Some listening addresses could not be enabled to accept connections:": "Nie udało się włączyć niektórych adresów nasłuchujących w celu przyjmowania połączeń:",
     "Source Code": "Kod źródłowy",
     "Stable releases and release candidates": "Wydania stabilne i wydania kandydujące",
     "Stable releases are delayed by about two weeks. During this time they go through testing as release candidates.": "Wydania stabilne są opóźnione o ok. dwa tygodnie. W tym czasie są one testowane jako wydania kandydujące.",
@@ -320,8 +320,8 @@
     "Syncthing has been shut down.": "Syncthing został wyłączony.",
     "Syncthing includes the following software or portions thereof:": "Syncthing zawiera następujące oprogramowanie lub ich części:",
     "Syncthing is Free and Open Source Software licensed as MPL v2.0.": "Syncthing to wolne i otwarte oprogramowanie na licencji MPL 2.0.",
-    "Syncthing is listening on the following network addresses for connection attempts from other devices:": "Syncthing is listening on the following network addresses for connection attempts from other devices:",
-    "Syncthing is not listening for connection attempts from other devices on any address.  Only outgoing connections from this device may work.": "Syncthing is not listening for connection attempts from other devices on any address.  Only outgoing connections from this device may work.",
+    "Syncthing is listening on the following network addresses for connection attempts from other devices:": "Syncthing nasłuchuje prób połączeń z innych urządzeń pod następującymi adresami sieciowymi:",
+    "Syncthing is not listening for connection attempts from other devices on any address.  Only outgoing connections from this device may work.": "Syncthing nie nasłuchuje prób połączeń z innych urządzeń pod żadnym adresem. Tylko połączenia wychodzące z tego urządzenia są w stanie działać.",
     "Syncthing is restarting.": "Syncthing jest uruchamiany ponownie.",
     "Syncthing is upgrading.": "Syncthing jest aktualizowany.",
     "Syncthing now supports automatically reporting crashes to the developers. This feature is enabled by default.": "Syncthing zawiera teraz automatyczne zgłaszanie awarii do autorów. Ta funkcja jest domyślnie włączona.",
@@ -346,7 +346,7 @@
     "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.": "Używane są następujące przedziały czasowe: w pierwszej godzinie wersja zachowywana jest co 30 sekund, w pierwszym dniu co godzinę, w pierwszych 30 dniach codziennie, a do czasu osiągnięcia maksymalnego wieku co tydzień.",
     "The following items could not be synchronized.": "Następujące elementy nie mogły zostać zsynchronizowane.",
     "The following items were changed locally.": "Następujące elementy zostały zmienione lokalnie.",
-    "The following methods are used to discover other devices on the network and announce this device to be found by others:": "The following methods are used to discover other devices on the network and announce this device to be found by others:",
+    "The following methods are used to discover other devices on the network and announce this device to be found by others:": "Poniższe metody są używane do odnajdywania innych urządzeń w sieci oraz ogłaszania tego urządzenia, aby mogło ono zostać znalezione przez nie:",
     "The following unexpected items were found.": "Znaleziono następujące elementy nieoczekiwane.",
     "The interval must be a positive number of seconds.": "Przedział czasowy musi być dodatnią liczbą sekund.",
     "The interval, in seconds, for running cleanup in the versions directory. Zero to disable periodic cleaning.": "Przedział czasowy, w sekundach, w którym nastąpi czyszczenie katalogu wersjonowania. Ustaw na zero, aby wyłączyć czyszczenie okresowe.",
@@ -364,7 +364,7 @@
     "They are retried automatically and will be synced when the error is resolved.": "Ponowne próby zachodzą automatycznie. Synchronizacja nastąpi po usunięciu błędu.",
     "This Device": "To urządzenie",
     "This can easily give hackers access to read and change any files on your computer.": "Może to umożliwić hakerom dostęp do odczytu i zmian dowolnych plików na tym komputerze.",
-    "This device cannot automatically discover other devices or announce its own address to be found by others.  Only devices with statically configured addresses can connect.": "This device cannot automatically discover other devices or announce its own address to be found by others.  Only devices with statically configured addresses can connect.",
+    "This device cannot automatically discover other devices or announce its own address to be found by others.  Only devices with statically configured addresses can connect.": "To urządzenie nie jest w stanie automatycznie odnajdować innych urządzeń oraz ogłaszać swojego adresu, aby mogło ono zostać znalezione przez nie. Tylko urządzenia z adresem ustawionym statycznie są w stanie się połączyć.",
     "This is a major version upgrade.": "To jest duża aktualizacja.",
     "This setting controls the free space required on the home (i.e., index database) disk.": "To ustawienie kontroluje ilość wolnej przestrzeni na dysku domowym (np. do indeksowania bazy danych).",
     "Time": "Czas",

gui/default/assets/lang/lang-pt-PT.json

@@ -94,9 +94,9 @@
     "Discovered": "Descoberto",
     "Discovery": "Pesquisa",
     "Discovery Failures": "Falhas da pesquisa",
-    "Dismiss": "Dispensar",
+    "Dismiss": "Descartar",
     "Do not add it to the ignore list, so this notification may recur.": "Não adicionar à lista dos ignorados, para que esta notificação volte a aparecer.",
-    "Do not add it to the ignore list, so this notification may recurr.": "Não adicionar à lista de ignorados, por forma a que esta notificação possa reaparecer.",
+    "Do not add it to the ignore list, so this notification may recurr.": "Não adicionar à lista dos ignorados, para que esta notificação volte a aparecer.",
     "Do not restore": "Não restaurar",
     "Do not restore all": "Não restaurar nenhum",
     "Do you want to enable watching for changes for all your folders?": "Quer activar a vigilância de alterações para todas as suas pastas?",
@@ -230,7 +230,7 @@
     "Periodic scanning at given interval and disabled watching for changes": "Verificação periódica no intervalo dado e desactivada a vigilância de alterações",
     "Periodic scanning at given interval and enabled watching for changes": "Verificação periódica no intervalo dado e activada a vigilância de alterações",
     "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Verificação periódica no intervalo dado e falha ao preparar a vigilância de alterações, tentando novamente a cada minuto:",
-    "Permanently add it to the ignore list, suppressing further notifications.": "Adicionar permanentemente à lista de ignorados, eliminando novas notificações.",
+    "Permanently add it to the ignore list, suppressing further notifications.": "Adicionar permanentemente à lista de ignorados, inibindo novas notificações.",
     "Permissions": "Permissões",
     "Please consult the release notes before performing a major upgrade.": "Consulte as notas de lançamento antes de fazer uma actualização importante.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Por favor, defina um utilizador e senha de autenticação para a interface gráfica, nas configurações.",
@@ -301,7 +301,7 @@
     "Single level wildcard (matches within a directory only)": "Símbolo polivalente de um só nível (faz corresponder apenas dentro de uma pasta)",
     "Size": "Tamanho",
     "Smallest First": "Primeiro os menores",
-    "Some discovery methods could not be established for finding other devices or announcing this device:": "Alguns métodos de pesquisa não podem ser estabelecidos para encontrar outros dispositivos ou anunciar este dispositivo:",
+    "Some discovery methods could not be established for finding other devices or announcing this device:": "Não foi possível estabelecer alguns dos métodos de pesquisa para encontrar outros dispositivos ou anunciar este dispositivo:",
     "Some items could not be restored:": "Não foi possível restaurar alguns dos itens:",
     "Some listening addresses could not be enabled to accept connections:": "Alguns endereços de auscultação não puderam ser activados para aceitar ligações:",
     "Source Code": "Código fonte",
@@ -321,7 +321,7 @@
     "Syncthing includes the following software or portions thereof:": "O Syncthing inclui as seguintes aplicações ou partes delas:",
     "Syncthing is Free and Open Source Software licensed as MPL v2.0.": "Syncthing é Software Livre e de Código Aberto licenciado como MPL v2.0.",
     "Syncthing is listening on the following network addresses for connection attempts from other devices:": "O Syncthing está à escuta de tentativas de ligação por parte de outros dispositivos nos seguintes endereços de rede:",
-    "Syncthing is not listening for connection attempts from other devices on any address.  Only outgoing connections from this device may work.": "O Syncthing não está à escuta de tentativas de ligação por parte de outros dispositivos em nenhum endereço. Apenas poderão funcionar ligações de dentro para fora deste dispositivo.",
+    "Syncthing is not listening for connection attempts from other devices on any address.  Only outgoing connections from this device may work.": "O Syncthing não está à escuta de tentativas de ligação por parte de outros dispositivos em nenhum endereço. Apenas poderão funcionar ligações deste dispositivo para fora.",
     "Syncthing is restarting.": "O Syncthing está a reiniciar.",
     "Syncthing is upgrading.": "O Syncthing está a actualizar-se.",
     "Syncthing now supports automatically reporting crashes to the developers. This feature is enabled by default.": "O Syncthing agora suporta o envio automático de relatórios de estouro para os programadores. Esta funcionalidade vem inicialmente activada.",

gui/default/assets/lang/lang-ru.json

@@ -188,7 +188,7 @@
     "Local State (Total)": "Локальное состояние (всего)",
     "Locally Changed Items": "Объекты, изменённые на этом компьютере",
     "Log": "Журнал",
-    "Log tailing paused. Scroll to the bottom to continue.": "Вывод журнала приостановлен. Чтобы продолжить, прокрутите до журнал конца.",
+    "Log tailing paused. Scroll to the bottom to continue.": "Вывод журнала приостановлен. Чтобы продолжить, прокрутите до конца журнала.",
     "Logs": "Журналы",
     "Major Upgrade": "Обновление основной версии",
     "Mass actions": "Массовые действия",
@@ -379,9 +379,9 @@
     "Unexpected items have been found in this folder.": "В папке найдены неожиданные элементы.",
     "Unignore": "Не игнорировать",
     "Unknown": "Неизвестно",
-    "Unshared": "Необщедоступно",
+    "Unshared": "Не общедоступно",
     "Unshared Devices": "Устройства без общего доступа",
-    "Unshared Folders": "Необщедоступные папки",
+    "Unshared Folders": "Не общедоступные папки",
     "Untrusted": "Ненадёжный",
     "Up to Date": "В актуальном состоянии",
     "Updated": "Обновлено",

gui/default/index.html

@@ -253,7 +253,7 @@
                 </div>
                 <div class="panel-footer clearfix">
                   <div class="pull-right">
-                    <button type="button" class="btn btn-sm btn-default" ng-click="dismissPendingFolder(folderID, deviceID)" tooltip data-original-title="{{'Do not add it to the ignore list, so this notification may recurr.' | translate}}">
+                    <button type="button" class="btn btn-sm btn-default" ng-click="dismissPendingFolder(folderID, deviceID)" tooltip data-original-title="{{'Do not add it to the ignore list, so this notification may recur.' | translate}}">
                       <span class="far fa-clock"></span>&nbsp;<span translate>Dismiss</span>
                     </button>
                     <button type="button" class="btn btn-sm btn-success" ng-click="addFolderAndShare(folderID, pendingFolder, deviceID)" ng-if="!folders[folderID]">

gui/default/syncthing/core/aboutModalView.html

@@ -19,7 +19,7 @@
     <h4 class="text-center" translate>The Syncthing Authors</h4>
     <div class="row">
       <div class="col-md-12" id="contributor-list">
-Jakob Borg, Audrius Butkevicius, Jesse Lucas, Simon Frei, Alexander Graf, Alexandre Viau, Anderson Mesquita, André Colomb, Antony Male, Ben Schulz, Caleb Callaway, Daniel Harte, Evgeny Kuznetsov, Lars K.W. Gohlke, Lode Hoste, Michael Ploujnikov, Nate Morrison, Philippe Schommers, Ryan Sullivan, Sergey Mishin, Stefan Tatschner, Tomasz Wilczyński, Wulf Weich, dependabot-preview[bot], greatroar, Aaron Bieber, Adam Piggott, Adel Qalieh, Alan Pope, Alberto Donato, Alessandro G., Alex Lindeman, Alex Xu, Aman Gupta, Andrew Dunham, Andrew Rabert, Andrey D, Anjan Momi, Antoine Lamielle, Anur, Aranjedeath, Arkadiusz Tymiński, Arthur Axel fREW Schmidt, Artur Zubilewicz, Aurélien Rainone, BAHADIR YILMAZ, Bart De Vries, Ben Curthoys, Ben Shepherd, Ben Sidhom, Benedikt Heine, Benedikt Morbach, Benno Fünfstück, Benny Ng, Boqin Qin, Boris Rybalkin, Brandon Philips, Brendan Long, Brian R. Becker, Carsten Hagemann, Cathryne Linenweaver, Cedric Staniewski, Chih-Hsuan Yen, Choongkyu, Chris Howie, Chris Joel, Chris Tonkinson, Christian Prescott, Colin Kennedy, Cromefire_, Cyprien Devillez, Dale Visser, Dan, Daniel Bergmann, Daniel Martí, Darshil Chanpura, David Rimmer, Denis A., Dennis Wilson, Dmitry Saveliev, Domenic Horner, Dominik Heidler, Elias Jarlebring, Elliot Huffman, Emil Hessman, Eric Lesiuta, Erik Meitner, Federico Castagnini, Felix Ableitner, Felix Lampe, Felix Unterpaintner, Francois-Xavier Gsell, Frank Isemann, Gahl Saraf, Gilli Sigurdsson, Gleb Sinyavskiy, Graham Miln, Han Boetes, HansK-p, Harrison Jones, Heiko Zuerker, Hugo Locurcio, Iain Barnett, Ian Johnson, Ikko Ashimine, Ilya Brin, Iskander Sharipov, Jaakko Hannikainen, Jacek Szafarkiewicz, Jack Croft, Jacob, Jake Peterson, James Patterson, Jaroslav Lichtblau, Jaroslav Malec, Jaya Chithra, Jens Diemer, Jerry Jacobs, Jochen Voss, Johan Andersson, Johan Vromans, John Rinehart, Jonas Thelemann, Jonathan, Jonathan Cross, Jonta, Jose Manuel Delicado, Jörg Thalheim, Jędrzej Kula, Kalle Laine, Karol Różycki, Keith Turner, Kelong Cong, Ken'ichi Kamada, Kevin Allen, Kevin Bushiri, Kevin White, Jr., Kurt Fitzner, Lars Lehtonen, Laurent Arnoud, Laurent Etiemble, Leo Arias, Liu Siyuan, Lord Landon Agahnim, Lukas Lihotzki, Majed Abdulaziz, Marc Laporte, Marc Pujol, Marcin Dziadus, Marcus Legendre, Mario Majila, Mark Pulford, Mateusz Naściszewski, Mateusz Ż, Matic Potočnik, Matt Burke, Matt Robenolt, Matteo Ruina, Maurizio Tomasi, Max Schulze, MaximAL, Maxime Thirouin, MichaIng, Michael Jephcote, Michael Rienstra, Michael Tilli, Mike Boone, MikeLund, MikolajTwarog, Mingxuan Lin, Nicholas Rishel, Nico Stapelbroek, Nicolas Braud-Santoni, Nicolas Perraut, Niels Peter Roest, Nils Jakobi, NinoM4ster, Nitroretro, NoLooseEnds, Oliver Freyermuth, Otiel, Oyebanji Jacob Mayowa, Pablo, Pascal Jungblut, Paul Brit, Pawel Palenica, Paweł Rozlach, Peter Badida, Peter Dave Hello, Peter Hoeg, Peter Marquardt, Phani Rithvij, Phil Davis, Phill Luby, Pier Paolo Ramon, Piotr Bejda, Pramodh KP, Quentin Hibon, Rahmi Pruitt, Richard Hartmann, Robert Carosi, Roberto Santalla, Robin Schoonover, Roman Zaynetdinov, Ross Smith II, Ruslan Yevdokymov, Sacheendra Talluri, Scott Klupfel, Shaarad Dalvi, Simon Mwepu, Sly_tom_cat, Stefan Kuntz, Steven Eckhoff, Suhas Gundimeda, Taylor Khan, Thomas Hipp, Tim Abell, Tim Howes, Tobias Klauser, Tobias Nygren, Tobias Tom, Tom Jakubowski, Tommy Thorn, Tully Robinson, Tyler Brazier, Tyler Kropp, Unrud, Veeti Paananen, Victor Buinsky, Vil Brekin, Vladimir Rusinov, William A. Kennington III, Xavier O., Yannic A., andresvia, andyleap, boomsquared, bt90, chenrui, chucic, deepsource-autofix[bot], dependabot[bot], derekriemer, desbma, georgespatton, ghjklw, janost, jaseg, jelle van der Waa, klemens, marco-m, mclang, mv1005, otbutz, overkill, perewa, rubenbe, wangguoliang, wouter bolsterlee, xarx00, xjtdy888, 佛跳墙
+Jakob Borg, Audrius Butkevicius, Jesse Lucas, Simon Frei, Alexander Graf, Alexandre Viau, Anderson Mesquita, André Colomb, Antony Male, Ben Schulz, Caleb Callaway, Daniel Harte, Evgeny Kuznetsov, Lars K.W. Gohlke, Lode Hoste, Michael Ploujnikov, Nate Morrison, Philippe Schommers, Ryan Sullivan, Sergey Mishin, Stefan Tatschner, Tomasz Wilczyński, Wulf Weich, dependabot-preview[bot], greatroar, Aaron Bieber, Adam Piggott, Adel Qalieh, Alan Pope, Alberto Donato, Alessandro G., Alex Lindeman, Alex Xu, Aman Gupta, Andrew Dunham, Andrew Rabert, Andrey D, Anjan Momi, Antoine Lamielle, Anur, Aranjedeath, Arkadiusz Tymiński, Arthur Axel fREW Schmidt, Artur Zubilewicz, Aurélien Rainone, BAHADIR YILMAZ, Bart De Vries, Ben Curthoys, Ben Shepherd, Ben Sidhom, Benedikt Heine, Benedikt Morbach, Benno Fünfstück, Benny Ng, Boqin Qin, Boris Rybalkin, Brandon Philips, Brendan Long, Brian R. Becker, Carsten Hagemann, Cathryne Linenweaver, Cedric Staniewski, Chih-Hsuan Yen, Choongkyu, Chris Howie, Chris Joel, Chris Tonkinson, Christian Prescott, Colin Kennedy, Cromefire_, Cyprien Devillez, Dale Visser, Dan, Daniel Bergmann, Daniel Martí, Darshil Chanpura, David Rimmer, Denis A., Dennis Wilson, Dmitry Saveliev, Domenic Horner, Dominik Heidler, Elias Jarlebring, Elliot Huffman, Emil Hessman, Eric Lesiuta, Erik Meitner, Federico Castagnini, Felix Ableitner, Felix Lampe, Felix Unterpaintner, Francois-Xavier Gsell, Frank Isemann, Gahl Saraf, Gilli Sigurdsson, Gleb Sinyavskiy, Graham Miln, Han Boetes, HansK-p, Harrison Jones, Heiko Zuerker, Hugo Locurcio, Iain Barnett, Ian Johnson, Ikko Ashimine, Ilya Brin, Iskander Sharipov, Jaakko Hannikainen, Jacek Szafarkiewicz, Jack Croft, Jacob, Jake Peterson, James Patterson, Jaroslav Lichtblau, Jaroslav Malec, Jaya Chithra, Jens Diemer, Jerry Jacobs, Jochen Voss, Johan Andersson, Johan Vromans, John Rinehart, Jonas Thelemann, Jonathan, Jonathan Cross, Jonta, Jose Manuel Delicado, Jörg Thalheim, Jędrzej Kula, Kalle Laine, Karol Różycki, Keith Turner, Kelong Cong, Ken'ichi Kamada, Kevin Allen, Kevin Bushiri, Kevin White, Jr., Kurt Fitzner, Lars Lehtonen, Laurent Arnoud, Laurent Etiemble, Leo Arias, Liu Siyuan, Lord Landon Agahnim, Lukas Lihotzki, Majed Abdulaziz, Marc Laporte, Marc Pujol, Marcin Dziadus, Marcus Legendre, Mario Majila, Mark Pulford, Mateusz Naściszewski, Mateusz Ż, Matic Potočnik, Matt Burke, Matt Robenolt, Matteo Ruina, Maurizio Tomasi, Max Schulze, MaximAL, Maxime Thirouin, MichaIng, Michael Jephcote, Michael Rienstra, Michael Tilli, Mike Boone, MikeLund, MikolajTwarog, Mingxuan Lin, Nicholas Rishel, Nico Stapelbroek, Nicolas Braud-Santoni, Nicolas Perraut, Niels Peter Roest, Nils Jakobi, NinoM4ster, Nitroretro, NoLooseEnds, Oliver Freyermuth, Otiel, Oyebanji Jacob Mayowa, Pablo, Pascal Jungblut, Paul Brit, Pawel Palenica, Paweł Rozlach, Peter Badida, Peter Dave Hello, Peter Hoeg, Peter Marquardt, Phani Rithvij, Phil Davis, Phill Luby, Pier Paolo Ramon, Piotr Bejda, Pramodh KP, Quentin Hibon, Rahmi Pruitt, Richard Hartmann, Robert Carosi, Roberto Santalla, Robin Schoonover, Roman Zaynetdinov, Ross Smith II, Ruslan Yevdokymov, Sacheendra Talluri, Scott Klupfel, Shaarad Dalvi, Simon Mwepu, Sly_tom_cat, Stefan Kuntz, Steven Eckhoff, Suhas Gundimeda, Taylor Khan, Thomas Hipp, Tim Abell, Tim Howes, Tobias Klauser, Tobias Nygren, Tobias Tom, Tom Jakubowski, Tommy Thorn, Tully Robinson, Tyler Brazier, Tyler Kropp, Unrud, Veeti Paananen, Victor Buinsky, Vil Brekin, Vladimir Rusinov, William A. Kennington III, Xavier O., Yannic A., andresvia, andyleap, boomsquared, bt90, chenrui, chucic, deepsource-autofix[bot], dependabot[bot], derekriemer, desbma, georgespatton, ghjklw, janost, jaseg, jelle van der Waa, jtagcat, klemens, marco-m, mclang, mv1005, otbutz, overkill, perewa, rubenbe, wangguoliang, wouter bolsterlee, xarx00, xjtdy888, 佛跳墙
     </div>
     </div>
     <hr />

gui/default/syncthing/folder/editFolderModalView.html

@@ -128,7 +128,7 @@
           <div class="form-group" ng-if="currentFolder._guiVersioning.selector=='external'" ng-class="{'has-error': folderEditor.externalCommand.$invalid && folderEditor.externalCommand.$dirty}">
             <p translate class="help-block">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.</p>
             <label translate for="externalCommand">Command</label>
-            <textarea name="externalCommand" id="externalCommand" class="form-control" rows="1" ng-model="currentFolder._guiVersioning.externalCommand" required="" aria-required="true" />
+            <textarea name="externalCommand" id="externalCommand" class="form-control" rows="1" ng-model="currentFolder._guiVersioning.externalCommand" required="" aria-required="true"></textarea>
             <p class="help-block">
               <span translate ng-if="folderEditor.externalCommand.$valid || folderEditor.externalCommand.$pristine">See external versioning help for supported templated command line parameters.</span>
               <span translate ng-if="folderEditor.externalCommand.$error.required && folderEditor.externalCommand.$dirty">The path cannot be blank.</span>

gui/default/syncthing/settings/advancedSettingsModalView.html

@@ -9,10 +9,10 @@
     <div class="panel-group" id="advancedAccordion" role="tablist" aria-multiselectable="true">
 
       <div class="panel panel-default">
-        <div class="panel-heading" role="tab" id="guiHeading" data-toggle="collapse" data-parent="#advancedAccordion" href="#guiConfig" aria-expanded="true" aria-controls="guiConfig" style="cursor: pointer;">
+        <div class="panel-heading" role="tab" id="guiHeading" data-toggle="collapse" data-parent="#advancedAccordion" href="#guiConfig" aria-expanded="false" aria-controls="guiConfig" style="cursor: pointer;">
           <h4 class="panel-title" translate tabindex="0">GUI</h4>
         </div>
-        <div id="guiConfig" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="guiHeading">
+        <div id="guiConfig" class="panel-collapse collapse" role="tabpanel" aria-labelledby="guiHeading">
           <div class="panel-body">
             <form class="form-horizontal" role="form">
               <div ng-repeat="(key, value) in advancedConfig.gui" ng-init="type = inputTypeFor(key, value)" ng-if="type != 'skip'" class="form-group">

lib/model/folder_recvonly.go

@@ -112,7 +112,10 @@ func (f *receiveOnlyFolder) revert() error {
 			// The global file is our own. A revert then means to delete it.
 			// We'll delete files directly, directories get queued and
 			// handled below.
-
+			if fi.Deleted {
+				fi.Version = protocol.Vector{} // if this file ever resurfaces anywhere we want our delete to be strictly older
+				break
+			}
 			handled, err := delQueue.handle(fi, snap)
 			if err != nil {
 				l.Infof("Revert: deleting %s: %v\n", fi.Name, err)

lib/model/indexhandler.go

@@ -111,20 +111,47 @@ func newIndexHandler(conn protocol.Connection, downloads *deviceDownloadState, f
 	}
 }
 
+// waitForFileset waits for the handler to resume and fetches the current fileset.
+func (s *indexHandler) waitForFileset(ctx context.Context) (*db.FileSet, error) {
+	s.cond.L.Lock()
+	defer s.cond.L.Unlock()
+
+	for s.paused {
+		select {
+		case <-ctx.Done():
+			return nil, ctx.Err()
+		default:
+			s.cond.Wait()
+		}
+	}
+
+	return s.fset, nil
+}
+
 func (s *indexHandler) Serve(ctx context.Context) (err error) {
 	l.Debugf("Starting index handler for %s to %s at %s (slv=%d)", s.folder, s.conn.ID(), s.conn, s.prevSequence)
+	stop := make(chan struct{})
+
 	defer func() {
 		err = svcutil.NoRestartErr(err)
 		l.Debugf("Exiting index handler for %s to %s at %s: %v", s.folder, s.conn.ID(), s.conn, err)
+		close(stop)
+	}()
+
+	// Broadcast the pause cond when the context quits
+	go func() {
+		select {
+		case <-ctx.Done():
+			s.cond.Broadcast()
+		case <-stop:
+		}
 	}()
 
 	// We need to send one index, regardless of whether there is something to send or not
-	s.cond.L.Lock()
-	for s.paused {
-		s.cond.Wait()
+	fset, err := s.waitForFileset(ctx)
+	if err != nil {
+		return err
 	}
-	fset := s.fset
-	s.cond.L.Unlock()
 	err = s.sendIndexTo(ctx, fset)
 
 	// Subscribe to LocalIndexUpdated (we have new information to send) and
@@ -138,12 +165,10 @@ func (s *indexHandler) Serve(ctx context.Context) (err error) {
 	defer ticker.Stop()
 
 	for err == nil {
-		s.cond.L.Lock()
-		for s.paused {
-			s.cond.Wait()
+		fset, err = s.waitForFileset(ctx)
+		if err != nil {
+			return err
 		}
-		fset := s.fset
-		s.cond.L.Unlock()
 
 		// While we have sent a sequence at least equal to the one
 		// currently in the database, wait for the local index to update. The
@@ -181,6 +206,7 @@ func (s *indexHandler) resume(fset *db.FileSet, runner service) {
 	s.paused = false
 	s.fset = fset
 	s.runner = runner
+	s.cond.Broadcast()
 	s.cond.L.Unlock()
 }
 
@@ -192,6 +218,7 @@ func (s *indexHandler) pause() {
 	s.paused = true
 	s.fset = nil
 	s.runner = nil
+	s.cond.Broadcast()
 	s.cond.L.Unlock()
 }
 

lib/model/model.go

@@ -1343,12 +1343,14 @@ func (m *model) ccHandleFolders(folders []protocol.Folder, deviceCfg config.Devi
 
 		if err := m.ccCheckEncryption(cfg, folderDevice, ccDeviceInfos[folder.ID], deviceCfg.Untrusted); err != nil {
 			sameError := false
+			m.fmut.Lock()
 			if devs, ok := m.folderEncryptionFailures[folder.ID]; ok {
 				sameError = devs[deviceID] == err
 			} else {
 				m.folderEncryptionFailures[folder.ID] = make(map[protocol.DeviceID]error)
 			}
 			m.folderEncryptionFailures[folder.ID][deviceID] = err
+			m.fmut.Unlock()
 			msg := fmt.Sprintf("Failure checking encryption consistency with device %v for folder %v: %v", deviceID, cfg.Description(), err)
 			if sameError {
 				l.Debugln(msg)
@@ -1361,6 +1363,7 @@ func (m *model) ccHandleFolders(folders []protocol.Folder, deviceCfg config.Devi
 			}
 			return tempIndexFolders, paused, err
 		}
+		m.fmut.Lock()
 		if devErrs, ok := m.folderEncryptionFailures[folder.ID]; ok {
 			if len(devErrs) == 1 {
 				delete(m.folderEncryptionFailures, folder.ID)
@@ -1368,6 +1371,7 @@ func (m *model) ccHandleFolders(folders []protocol.Folder, deviceCfg config.Devi
 				delete(m.folderEncryptionFailures[folder.ID], deviceID)
 			}
 		}
+		m.fmut.Unlock()
 
 		// Handle indexes
 

lib/relay/client/client.go

@@ -11,58 +11,43 @@ import (
 
 	"github.com/syncthing/syncthing/lib/relay/protocol"
 	"github.com/syncthing/syncthing/lib/svcutil"
-	"github.com/syncthing/syncthing/lib/sync"
 
 	"github.com/thejerf/suture/v4"
 )
 
-type relayClientFactory func(uri *url.URL, certs []tls.Certificate, invitations chan protocol.SessionInvitation, timeout time.Duration) RelayClient
-
-var (
-	supportedSchemes = map[string]relayClientFactory{
-		"relay":         newStaticClient,
-		"dynamic+http":  newDynamicClient,
-		"dynamic+https": newDynamicClient,
-	}
-)
-
 type RelayClient interface {
 	suture.Service
 	Error() error
-	Latency() time.Duration
 	String() string
-	Invitations() chan protocol.SessionInvitation
+	Invitations() <-chan protocol.SessionInvitation
 	URI() *url.URL
 }
 
 func NewClient(uri *url.URL, certs []tls.Certificate, timeout time.Duration) (RelayClient, error) {
-	factory, ok := supportedSchemes[uri.Scheme]
-	if !ok {
+	invitations := make(chan protocol.SessionInvitation)
+
+	switch uri.Scheme {
+	case "relay":
+		return newStaticClient(uri, certs, invitations, timeout), nil
+	case "dynamic+http", "dynamic+https":
+		return newDynamicClient(uri, certs, invitations, timeout), nil
+	default:
 		return nil, fmt.Errorf("unsupported scheme: %s", uri.Scheme)
 	}
-
-	invitations := make(chan protocol.SessionInvitation)
-	return factory(uri, certs, invitations, timeout), nil
 }
 
 type commonClient struct {
 	svcutil.ServiceWithError
-
 	invitations chan protocol.SessionInvitation
-	mut         sync.RWMutex
 }
 
 func newCommonClient(invitations chan protocol.SessionInvitation, serve func(context.Context) error, creator string) commonClient {
-	c := commonClient{
-		invitations: invitations,
-		mut:         sync.NewRWMutex(),
+	return commonClient{
+		ServiceWithError: svcutil.AsService(serve, creator),
+		invitations:      invitations,
 	}
-	c.ServiceWithError = svcutil.AsService(serve, creator)
-	return c
 }
 
-func (c *commonClient) Invitations() chan protocol.SessionInvitation {
-	c.mut.RLock()
-	defer c.mut.RUnlock()
+func (c *commonClient) Invitations() <-chan protocol.SessionInvitation {
 	return c.invitations
 }

lib/relay/client/dynamic.go

@@ -11,6 +11,7 @@ import (
 	"net/http"
 	"net/url"
 	"sort"
+	"sync"
 	"time"
 
 	"github.com/syncthing/syncthing/lib/osutil"
@@ -25,10 +26,11 @@ type dynamicClient struct {
 	certs    []tls.Certificate
 	timeout  time.Duration
 
-	client RelayClient
+	mut    sync.RWMutex // Protects client.
+	client *staticClient
 }
 
-func newDynamicClient(uri *url.URL, certs []tls.Certificate, invitations chan protocol.SessionInvitation, timeout time.Duration) RelayClient {
+func newDynamicClient(uri *url.URL, certs []tls.Certificate, invitations chan protocol.SessionInvitation, timeout time.Duration) *dynamicClient {
 	c := &dynamicClient{
 		pooladdr: uri,
 		certs:    certs,
@@ -114,15 +116,6 @@ func (c *dynamicClient) Error() error {
 	return c.client.Error()
 }
 
-func (c *dynamicClient) Latency() time.Duration {
-	c.mut.RLock()
-	defer c.mut.RUnlock()
-	if c.client == nil {
-		return time.Hour
-	}
-	return c.client.Latency()
-}
-
 func (c *dynamicClient) String() string {
 	return fmt.Sprintf("DynamicClient:%p:%s@%s", c, c.URI(), c.pooladdr)
 }

lib/relay/client/static.go

@@ -28,12 +28,9 @@ type staticClient struct {
 	connectTimeout time.Duration
 
 	conn *tls.Conn
-
-	connected bool
-	latency   time.Duration
 }
 
-func newStaticClient(uri *url.URL, certs []tls.Certificate, invitations chan protocol.SessionInvitation, timeout time.Duration) RelayClient {
+func newStaticClient(uri *url.URL, certs []tls.Certificate, invitations chan protocol.SessionInvitation, timeout time.Duration) *staticClient {
 	c := &staticClient{
 		uri: uri,
 
@@ -67,10 +64,6 @@ func (c *staticClient) serve(ctx context.Context) error {
 
 	l.Infof("Joined relay %s://%s", c.uri.Scheme, c.uri.Host)
 
-	c.mut.Lock()
-	c.connected = true
-	c.mut.Unlock()
-
 	messages := make(chan interface{})
 	errorsc := make(chan error, 1)
 
@@ -128,20 +121,6 @@ func (c *staticClient) serve(ctx context.Context) error {
 	}
 }
 
-func (c *staticClient) StatusOK() bool {
-	c.mut.RLock()
-	con := c.connected
-	c.mut.RUnlock()
-	return con
-}
-
-func (c *staticClient) Latency() time.Duration {
-	c.mut.RLock()
-	lat := c.latency
-	c.mut.RUnlock()
-	return lat
-}
-
 func (c *staticClient) String() string {
 	return fmt.Sprintf("StaticClient:%p@%s", c, c.URI())
 }
@@ -155,7 +134,6 @@ func (c *staticClient) connect(ctx context.Context) error {
 		return fmt.Errorf("unsupported relay scheme: %v", c.uri.Scheme)
 	}
 
-	t0 := time.Now()
 	timeoutCtx, cancel := context.WithTimeout(ctx, c.connectTimeout)
 	defer cancel()
 	tcpConn, err := dialer.DialContext(timeoutCtx, "tcp", c.uri.Host)
@@ -163,10 +141,6 @@ func (c *staticClient) connect(ctx context.Context) error {
 		return err
 	}
 
-	c.mut.Lock()
-	c.latency = time.Since(t0)
-	c.mut.Unlock()
-
 	conn := tls.Client(tcpConn, c.config)
 
 	if err := conn.SetDeadline(time.Now().Add(c.connectTimeout)); err != nil {
@@ -185,10 +159,6 @@ func (c *staticClient) connect(ctx context.Context) error {
 
 func (c *staticClient) disconnect() {
 	l.Debugln(c, "disconnecting")
-	c.mut.Lock()
-	c.connected = false
-	c.mut.Unlock()
-
 	c.conn.Close()
 }
 

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" "Jun 30, 2021" "v1" "Syncthing"
+.TH "STDISCOSRV" "1" "Jul 17, 2021" "v1" "Syncthing"
 .SH NAME
 stdiscosrv \- Syncthing Discovery Server
 .SH SYNOPSIS

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" "Jun 30, 2021" "v1" "Syncthing"
+.TH "STRELAYSRV" "1" "Jul 17, 2021" "v1" "Syncthing"
 .SH NAME
 strelaysrv \- Syncthing Relay Server
 .SH SYNOPSIS

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" "Jun 30, 2021" "v1" "Syncthing"
+.TH "SYNCTHING-BEP" "7" "Jul 17, 2021" "v1" "Syncthing"
 .SH NAME
 syncthing-bep \- Block Exchange Protocol v1
 .SH INTRODUCTION AND DEFINITIONS

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" "Jun 30, 2021" "v1" "Syncthing"
+.TH "SYNCTHING-CONFIG" "5" "Jul 17, 2021" "v1" "Syncthing"
 .SH NAME
 syncthing-config \- Syncthing Configuration
 .SH SYNOPSIS

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" "Jun 30, 2021" "v1" "Syncthing"
+.TH "SYNCTHING-DEVICE-IDS" "7" "Jul 17, 2021" "v1" "Syncthing"
 .SH NAME
 syncthing-device-ids \- Understanding Device IDs
 .sp

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" "Jun 30, 2021" "v1" "Syncthing"
+.TH "SYNCTHING-EVENT-API" "7" "Jul 17, 2021" "v1" "Syncthing"
 .SH NAME
 syncthing-event-api \- Event API
 .SH DESCRIPTION
@@ -98,11 +98,14 @@ itself.
     "type": "ConfigSaved",
     "time": "2014\-12\-13T00:09:13.5166486Z",
     "data": {
-        "Version": 7,
-        "Options": {"..."},
-        "GUI": {"..."},
-        "Devices": [{"..."}],
-        "Folders": [{"..."}]
+        "version": 7,
+        "folders": [{"..."}],
+        "devices": [{"..."}],
+        "gui": {"..."},
+        "ldap": {"..."},
+        "options": {"..."},
+        "remoteIgnoredDevices": [{"..."}],
+        "defaults": {"..."}
     }
 }
 .ft P

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" "Jun 30, 2021" "v1" "Syncthing"
+.TH "SYNCTHING-FAQ" "7" "Jul 17, 2021" "v1" "Syncthing"
 .SH NAME
 syncthing-faq \- Frequently Asked Questions
 .INDENT 0.0

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" "Jun 30, 2021" "v1" "Syncthing"
+.TH "SYNCTHING-GLOBALDISCO" "7" "Jul 17, 2021" "v1" "Syncthing"
 .SH NAME
 syncthing-globaldisco \- Global Discovery Protocol v3
 .SH ANNOUNCEMENTS

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" "Jun 30, 2021" "v1" "Syncthing"
+.TH "SYNCTHING-LOCALDISCO" "7" "Jul 17, 2021" "v1" "Syncthing"
 .SH NAME
 syncthing-localdisco \- Local Discovery Protocol v4
 .SH MODE OF OPERATION

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" "Jun 30, 2021" "v1" "Syncthing"
+.TH "SYNCTHING-NETWORKING" "7" "Jul 17, 2021" "v1" "Syncthing"
 .SH NAME
 syncthing-networking \- Firewall Setup
 .SH ROUTER SETUP

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" "Jun 30, 2021" "v1" "Syncthing"
+.TH "SYNCTHING-RELAY" "7" "Jul 17, 2021" "v1" "Syncthing"
 .SH NAME
 syncthing-relay \- Relay Protocol v1
 .SH WHAT IS A RELAY?

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" "Jun 30, 2021" "v1" "Syncthing"
+.TH "SYNCTHING-REST-API" "7" "Jul 17, 2021" "v1" "Syncthing"
 .SH NAME
 syncthing-rest-api \- REST API
 .sp

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" "Jun 30, 2021" "v1" "Syncthing"
+.TH "SYNCTHING-SECURITY" "7" "Jul 17, 2021" "v1" "Syncthing"
 .SH NAME
 syncthing-security \- Security Principles
 .sp

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" "Jun 30, 2021" "v1" "Syncthing"
+.TH "SYNCTHING-STIGNORE" "5" "Jul 17, 2021" "v1" "Syncthing"
 .SH NAME
 syncthing-stignore \- Prevent files from being synchronized to other nodes
 .SH SYNOPSIS

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" "Jun 30, 2021" "v1" "Syncthing"
+.TH "SYNCTHING-VERSIONING" "7" "Jul 17, 2021" "v1" "Syncthing"
 .SH NAME
 syncthing-versioning \- Keep automatic backups of deleted files by other nodes
 .sp

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" "Jun 30, 2021" "v1" "Syncthing"
+.TH "SYNCTHING" "1" "Jul 17, 2021" "v1" "Syncthing"
 .SH NAME
 syncthing \- Syncthing
 .SH SYNOPSIS

script/translate.go

@@ -9,6 +9,7 @@
 package main
 
 import (
+	"bufio"
 	"encoding/json"
 	"log"
 	"os"
@@ -20,12 +21,13 @@ import (
 )
 
 var trans = make(map[string]string)
-var attrRe = regexp.MustCompile(`\{\{'([^']+)'\s+\|\s+translate\}\}`)
-var attrReCond = regexp.MustCompile(`\{\{.+\s+\?\s+'([^']+)'\s+:\s+'([^']+)'\s+\|\s+translate\}\}`)
+var attrRe = regexp.MustCompile(`\{\{\s*'([^']+)'\s+\|\s+translate\s*\}\}`)
+var attrReCond = regexp.MustCompile(`\{\{.+\s+\?\s+'([^']+)'\s+:\s+'([^']+)'\s+\|\s+translate\s*\}\}`)
+var jsRe = regexp.MustCompile(`\$translate.instant\("([^"]+)"\)`)
 
 // exceptions to the untranslated text warning
 var noStringRe = regexp.MustCompile(
-	`^((\W*\{\{.*?\}\} ?.?\/?.?(bps)?\W*)+(\.stignore)?|[^a-zA-Z]+.?[^a-zA-Z]*|[kMGT]?B|Twitter|JS\W?|DEV|https?://\S+)$`)
+	`^((\W*\{\{.*?\}\} ?.?\/?.?(bps)?\W*)+(\.stignore)?|[^a-zA-Z]+.?[^a-zA-Z]*|[kMGT]?B|Twitter|JS\W?|DEV|https?://\S+|TechUi)$`)
 
 // exceptions to the untranslated text warning specific to aboutModalView.html
 var aboutRe = regexp.MustCompile(`^([^/]+/[^/]+|(The Go Pro|Font Awesome ).+|Build \{\{.+\}\}|Copyright .+ the Syncthing Authors\.)$`)
@@ -108,17 +110,27 @@ func walkerFor(basePath string) filepath.WalkFunc {
 			return err
 		}
 
-		if filepath.Ext(name) == ".html" && info.Mode().IsRegular() {
-			fd, err := os.Open(name)
-			if err != nil {
-				log.Fatal(err)
-			}
+		if !info.Mode().IsRegular() {
+			return nil
+		}
+		fd, err := os.Open(name)
+		if err != nil {
+			log.Fatal(err)
+		}
+		defer fd.Close()
+		switch filepath.Ext(name) {
+		case ".html":
 			doc, err := html.Parse(fd)
 			if err != nil {
 				log.Fatal(err)
 			}
-			fd.Close()
 			generalNode(doc, filepath.Base(name))
+		case ".js":
+			for s := bufio.NewScanner(fd); s.Scan(); {
+				for _, matches := range jsRe.FindAllStringSubmatch(s.Text(), -1) {
+					translation(matches[1])
+				}
+			}
 		}
 
 		return nil