From c1a96d490015532053a1a1db7ebd73d15cd50683 Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Sun, 12 Jun 2016 16:17:02 +0200 Subject: [PATCH] gui, man: Update docs & translations --- NICKS | 1 + gui/default/assets/lang/lang-bg.json | 41 +++++++------- gui/default/assets/lang/lang-ca.json | 1 + gui/default/assets/lang/lang-ca@valencia.json | 1 + gui/default/assets/lang/lang-cs.json | 1 + gui/default/assets/lang/lang-da.json | 1 + gui/default/assets/lang/lang-de.json | 7 ++- gui/default/assets/lang/lang-el.json | 1 + gui/default/assets/lang/lang-en-GB.json | 1 + gui/default/assets/lang/lang-es-ES.json | 1 + gui/default/assets/lang/lang-es.json | 1 + gui/default/assets/lang/lang-fi.json | 1 + gui/default/assets/lang/lang-fr-CA.json | 1 + gui/default/assets/lang/lang-fr.json | 1 + gui/default/assets/lang/lang-fy.json | 1 + gui/default/assets/lang/lang-hu.json | 5 +- gui/default/assets/lang/lang-id.json | 1 + gui/default/assets/lang/lang-it.json | 3 +- gui/default/assets/lang/lang-ja.json | 3 +- gui/default/assets/lang/lang-ko-KR.json | 1 + gui/default/assets/lang/lang-lt.json | 9 +-- gui/default/assets/lang/lang-nb.json | 3 +- gui/default/assets/lang/lang-nl.json | 1 + gui/default/assets/lang/lang-nn.json | 1 + gui/default/assets/lang/lang-pl.json | 1 + gui/default/assets/lang/lang-pt-BR.json | 1 + gui/default/assets/lang/lang-pt-PT.json | 1 + gui/default/assets/lang/lang-ru.json | 1 + gui/default/assets/lang/lang-sv.json | 3 +- gui/default/assets/lang/lang-tr.json | 1 + gui/default/assets/lang/lang-uk.json | 1 + gui/default/assets/lang/lang-vi.json | 1 + gui/default/assets/lang/lang-zh-CN.json | 3 +- gui/default/assets/lang/lang-zh-TW.json | 1 + .../syncthing/core/aboutModalView.html | 4 +- man/syncthing-bep.7 | 2 +- man/syncthing-config.5 | 2 +- man/syncthing-device-ids.7 | 2 +- man/syncthing-event-api.7 | 2 +- man/syncthing-faq.7 | 2 +- man/syncthing-globaldisco.7 | 2 +- man/syncthing-localdisco.7 | 2 +- man/syncthing-networking.7 | 2 +- man/syncthing-relay.7 | 2 +- man/syncthing-rest-api.7 | 56 ++++++++++++++----- man/syncthing-security.7 | 2 +- man/syncthing-stignore.5 | 4 +- man/syncthing-versioning.7 | 2 +- man/syncthing.1 | 13 +++-- 49 files changed, 133 insertions(+), 68 deletions(-) diff --git a/NICKS b/NICKS index af6a10c9..9502877c 100644 --- a/NICKS +++ b/NICKS @@ -89,6 +89,7 @@ Rewt0r Rewt0r rumpelsepp rumpelsepp +scienmind sciurius seehuhn simplypeachy diff --git a/gui/default/assets/lang/lang-bg.json b/gui/default/assets/lang/lang-bg.json index a9cb55a2..c043b9dc 100644 --- a/gui/default/assets/lang/lang-bg.json +++ b/gui/default/assets/lang/lang-bg.json @@ -4,11 +4,11 @@ "A new major version may not be compatible with previous versions.": "Нова основна версия, която може да не е съвмеситима с предишни версии.", "API Key": "API Ключ", "About": "За програмата", - "Actions": "Действия", + "Actions": "Меню", "Add": "Добави", "Add Device": "Добави устройство", "Add Folder": "Добави папка", - "Add Remote Device": "Добави отдалечено устройство", + "Add Remote Device": "Добави ново устройство", "Add new folder?": "Добави нова папка?", "Address": "Адрес", "Addresses": "Адреси", @@ -20,11 +20,11 @@ "Alphabetic": "Азбучен ред", "An external command handles the versioning. It has to remove the file from the synced folder.": "Друга команда се занимава с версиите. Тази команда трябва да премахни файла от синхронизираната папка.", "Anonymous Usage Reporting": "Анонимен доклад", - "Any devices configured on an introducer device will be added to this device as well.": "Устройства настроени на introducer компютъра също ще бъдат добавени към този компютър.", + "Any devices configured on an introducer device will be added to this device as well.": "Устройства настроени да представят други устройства също ще бъдат добавени към това устройство.", "Automatic upgrades": "Автоматично обновяване", "Be careful!": "Внимание!", "Bugs": "Бъгове", - "CPU Utilization": "Процесор в употреба", + "CPU Utilization": "Използван процесор", "Changelog": "Списък с промени", "Clean out after": "Изчисти след", "Close": "Затвори", @@ -43,7 +43,7 @@ "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Устройство \"{{name}}\" ({{device}}) на {{address}} желае да се свърже. Добави ново устройство?", "Device ID": "Идентификатор на устройство", "Device Identification": "Идентификатор на устройство", - "Device Name": "Име на устройство", + "Device Name": "Име на устройството", "Device {%device%} ({%address%}) wants to connect. Add new device?": "Устройство {{device}} ({{address}}) желае да се свърже. Добави ново устройство?", "Devices": "Устройства", "Disconnected": "Не е свързано", @@ -78,8 +78,8 @@ "Folder Type": "Вид папка", "Folders": "Папки", "GUI": "Потребителски интерфейс", - "GUI Authentication Password": "Парола за потребителския интерфейс", - "GUI Authentication User": "Потребител за потребителския интерфейс", + "GUI Authentication Password": "Парола за интерфейса", + "GUI Authentication User": "Потребителско име за интерфейса", "GUI Listen Addresses": "Адрес за свързване с потребителския интерфейс", "Generate": "Генерирай", "Global Discovery": "Глобално откриване", @@ -93,17 +93,18 @@ "Ignore Permissions": "Игнорирай правата за достъп", "Incoming Rate Limit (KiB/s)": "Лимит на скоростта за сваляне (KiB/s)", "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Неправилни настройки могат да повредят файловете и да попречат на синхронизирането.", - "Introducer": "Introducer", + "Introducer": "Може да предлага други устройства", "Inversion of the given condition (i.e. do not exclude)": "Обратното на даденото условие (пр. не изключвай)", "Keep Versions": "Пази версии", "Largest First": " Първо най-големите", "Last File Received": "Последния получен файл", - "Last seen": "Последно видян", + "Last Scan": "Последно сканиран", + "Last seen": "Последно видяно", "Later": "По-късно", - "Listeners": "Слушащи", + "Listeners": "Синхронизиращи устройства", "Local Discovery": "Локално откриване", "Local State": "Локално състояние", - "Local State (Total)": "Локално състояние (Общо)", + "Local State (Total)": "Локално състояние (общо)", "Major Upgrade": "Основно Обновяване", "Master": "Главен", "Maximum Age": "Максимална възраст", @@ -111,7 +112,7 @@ "Minimum Free Disk Space": "Минимално свободно дисково пространство", "Move to top of queue": "Премести в началото на опашката", "Multi level wildcard (matches multiple directory levels)": "Маска на много нива (покрива папки с много нива)", - "Never": "Никога", + "Never": "никога", "New Device": "Ново устройство", "New Folder": "Нова папка", "Newest First": "Първо най-новите", @@ -124,7 +125,7 @@ "Oldest First": "Първо най-старите", "Optional descriptive label for the folder. Can be different on each device.": "Допълнително разяснеие за етикета на папката. Може да бъде различно всяко устройство.", "Options": "Настройки", - "Out of Sync": "Несинхронизирано", + "Out of Sync": "Несинхронизирана", "Out of Sync Items": "Несинхронизирани елементи", "Outgoing Rate Limit (KiB/s)": "Лимит на скорост за качване (KiB/s)", "Override Changes": "Наложи локалните промени", @@ -138,17 +139,17 @@ "Preview": "Преглед", "Preview Usage Report": "Разгледай доклада за използване", "Quick guide to supported patterns": "Бърз наръчник към поддържаните шаблони", - "RAM Utilization": "RAM в употреба", + "RAM Utilization": "Използван RAM", "Random": "Произволен", "Relay Servers": "Препращащи сървъри", "Relayed via": "Препратено през", "Relays": "Препращачи", "Release Notes": "Бележки по обновяването", - "Remote Devices": "Отделечени устройства", + "Remote Devices": "Чужди устройства", "Remove": "Премахни", "Required identifier for the folder. Must be the same on all cluster devices.": "Задължителен идентификатор за тази папка. Трябва да бъде един и същ на всички устройства.", - "Rescan": "Сканирай повторно", - "Rescan All": "Сканирай повторно всички", + "Rescan": "Сканирай", + "Rescan All": "Сканирай всички", "Rescan Interval": "Интервал за повторно сканиране", "Restart": "Рестартирай", "Restart Needed": "Изисква се рестартиране", @@ -186,7 +187,7 @@ "Sync Protocol Listen Addresses": "Адрес за слушане на синхронизиращия протокол", "Syncing": "Синхронизиране", "Syncthing has been shut down.": "Syncthing е спрян.", - "Syncthing includes the following software or portions thereof:": "Syncthing включва следният софтуер пълно или частично:", + "Syncthing includes the following software or portions thereof:": "Syncthing уползотворява частично или изцяло следните софтуерни продукти:", "Syncthing is restarting.": "Syncthing се рестартира", "Syncthing is upgrading.": "Syncthing се обновява.", "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing изглежда не е включен, или има проблем с интерент връзката. Повторен опит...", @@ -218,14 +219,14 @@ "The rate limit must be a non-negative number (0: no limit)": "Ограничението на скоростта трябва да бъде положително число (0: неограничено)", "The rescan interval must be a non-negative number of seconds.": "Интервала на сканиране трябва да бъде не отрицателно число в секунди.", "They are retried automatically and will be synced when the error is resolved.": "Ще бъдат спрени и автоматично синхронизирани, когато грешката бъде оправена.", - "This Device": "Това устройство", + "This Device": "Вашето устройство", "This can easily give hackers access to read and change any files on your computer.": "Това дава лесен достъп на хакери да разглеждат и променят всякакви файлове на компютъра Ви.", "This is a major version upgrade.": "Това е нова основна версия.", "Trash Can File Versioning": "Само на файловете в кошчето", "Unknown": "Неясно", "Unshared": "Несподелена", "Unused": "Неизползван", - "Up to Date": "Синхронизирано", + "Up to Date": "Синхронизирана", "Updated": "Обновено", "Upgrade": "Обнови", "Upgrade To {%version%}": "Обновен до {{version}}", diff --git a/gui/default/assets/lang/lang-ca.json b/gui/default/assets/lang/lang-ca.json index f6271494..354925b1 100644 --- a/gui/default/assets/lang/lang-ca.json +++ b/gui/default/assets/lang/lang-ca.json @@ -98,6 +98,7 @@ "Keep Versions": "Mantenir Versions", "Largest First": "Més gran primer", "Last File Received": "Últim fitxer rebut", + "Last Scan": "Last Scan", "Last seen": "Vist per última vegada", "Later": "Després", "Listeners": "Listeners", diff --git a/gui/default/assets/lang/lang-ca@valencia.json b/gui/default/assets/lang/lang-ca@valencia.json index 4df65250..f8588026 100644 --- a/gui/default/assets/lang/lang-ca@valencia.json +++ b/gui/default/assets/lang/lang-ca@valencia.json @@ -98,6 +98,7 @@ "Keep Versions": "Mantindre versions", "Largest First": "El més gran primer", "Last File Received": "Darrer fitxer rebut", + "Last Scan": "Last Scan", "Last seen": "Vist per última vegada", "Later": "Més tard", "Listeners": "Listeners", diff --git a/gui/default/assets/lang/lang-cs.json b/gui/default/assets/lang/lang-cs.json index fa0cf867..2ee9ca5c 100644 --- a/gui/default/assets/lang/lang-cs.json +++ b/gui/default/assets/lang/lang-cs.json @@ -98,6 +98,7 @@ "Keep Versions": "Ponechat verze", "Largest First": "Od největšího", "Last File Received": "Poslední přijatý soubor", + "Last Scan": "Poslední sken", "Last seen": "Naposledy spatřen", "Later": "Později", "Listeners": "Naslouchající", diff --git a/gui/default/assets/lang/lang-da.json b/gui/default/assets/lang/lang-da.json index f5494954..6d703cf2 100644 --- a/gui/default/assets/lang/lang-da.json +++ b/gui/default/assets/lang/lang-da.json @@ -98,6 +98,7 @@ "Keep Versions": "Behold versioner", "Largest First": "Største først", "Last File Received": "Sidste modtaget fil", + "Last Scan": "Last Scan", "Last seen": "Sidst set", "Later": "Senere", "Listeners": "Listeners", diff --git a/gui/default/assets/lang/lang-de.json b/gui/default/assets/lang/lang-de.json index 64088185..0b545c00 100644 --- a/gui/default/assets/lang/lang-de.json +++ b/gui/default/assets/lang/lang-de.json @@ -75,7 +75,7 @@ "Folder Label": "Verzeichnisbezeichnung", "Folder Master": "Master Verzeichnis - schreibgeschützt", "Folder Path": "Verzeichnispfad", - "Folder Type": "Ordnertyp", + "Folder Type": "Verzeichnistyp", "Folders": "Verzeichnisse", "GUI": "GUI", "GUI Authentication Password": "Passwort für Zugang zur Benutzeroberfläche", @@ -98,6 +98,7 @@ "Keep Versions": "Versionen erhalten", "Largest First": "Größte zuerst", "Last File Received": "Letzte Änderung", + "Last Scan": "Letzter Scan", "Last seen": "Zuletzt online", "Later": "Später", "Listeners": "Zuhörer", @@ -192,7 +193,7 @@ "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing scheint nicht erreichbar zu sein oder es gibt ein Problem mit Deiner Internetverbindung. Versuche erneut...", "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing scheint ein Problem mit der Verarbeitung Deiner Eingabe zu haben. Bitte lade die Seite neu oder führe einen Neustart durch, falls das Problem weiterhin besteht.", "The Syncthing admin interface is configured to allow remote access without a password.": "Die Syncthing-Oberfläche erlaubt mit den jetzigen Einstellungen einen Zugriff ohne Passwort.", - "The aggregated statistics are publicly available at the URL below.": "Die gesammelten Statistiken sind öffentlich verfügbar unter der untenstehenden URL.", + "The aggregated statistics are publicly available at the URL below.": "Die gesammelten Statistiken sind öffentlich unter der nachfolgenden URL verfügbar.", "The aggregated statistics are publicly available at {%url%}.": "Die gesammelten Statistiken sind öffentlich verfügbar unter {{url}}.", "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Die Konfiguration wurde gespeichert, aber noch nicht aktiviert. Syncthing muss neugestartet werden, um die neue Konfiguration zu übernehmen.", "The device ID cannot be blank.": "Die Geräte ID darf nicht leer sein.", @@ -246,5 +247,5 @@ "items": "Objekte", "{%device%} wants to share folder \"{%folder%}\".": "{{device}} möchte das Verzeichnis \"{{folder}}\" teilen.", "{%device%} wants to share folder \"{%folderLabel%}\" ({%folder%}).": "{{device}} möchte das Verzeichnis \"{{folderLabel}}\" ({{folder}}) teilen.", - "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} möchte den Ordner \"{{folderLabel}}\" ({{folder}}) teilen." + "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} möchte das Verzeichnis \"{{folderLabel}}\" ({{folder}}) teilen." } \ No newline at end of file diff --git a/gui/default/assets/lang/lang-el.json b/gui/default/assets/lang/lang-el.json index 1e1a603d..b9ffa2e6 100644 --- a/gui/default/assets/lang/lang-el.json +++ b/gui/default/assets/lang/lang-el.json @@ -98,6 +98,7 @@ "Keep Versions": "Διατήρηση εκδόσεων", "Largest First": "Το μεγαλύτερο πρώτα", "Last File Received": "Πιο πρόσφατο αρχείο", + "Last Scan": "Last Scan", "Last seen": "Τελευταία φορά συνδεδεμένος", "Later": "Αργότερα", "Listeners": "Listeners", diff --git a/gui/default/assets/lang/lang-en-GB.json b/gui/default/assets/lang/lang-en-GB.json index 6df101ba..f79ec78e 100644 --- a/gui/default/assets/lang/lang-en-GB.json +++ b/gui/default/assets/lang/lang-en-GB.json @@ -98,6 +98,7 @@ "Keep Versions": "Keep Versions", "Largest First": "Largest First", "Last File Received": "Last File Received", + "Last Scan": "Last Scan", "Last seen": "Last seen", "Later": "Later", "Listeners": "Listeners", diff --git a/gui/default/assets/lang/lang-es-ES.json b/gui/default/assets/lang/lang-es-ES.json index cc038bba..f28814f3 100644 --- a/gui/default/assets/lang/lang-es-ES.json +++ b/gui/default/assets/lang/lang-es-ES.json @@ -98,6 +98,7 @@ "Keep Versions": "Mantener versiones", "Largest First": "Más grande primero", "Last File Received": "Último fichero recibido", + "Last Scan": "Last Scan", "Last seen": "Visto por última vez", "Later": "Más tarde", "Listeners": "Listeners", diff --git a/gui/default/assets/lang/lang-es.json b/gui/default/assets/lang/lang-es.json index 60bd8cb8..de4e3c76 100644 --- a/gui/default/assets/lang/lang-es.json +++ b/gui/default/assets/lang/lang-es.json @@ -98,6 +98,7 @@ "Keep Versions": "Conservar versiones", "Largest First": "Más grande primero", "Last File Received": "Último archivo recibido", + "Last Scan": "Last Scan", "Last seen": "Visto por ultima vez", "Later": "Más tarde", "Listeners": "Listeners", diff --git a/gui/default/assets/lang/lang-fi.json b/gui/default/assets/lang/lang-fi.json index 8b9942db..49b1fa4f 100644 --- a/gui/default/assets/lang/lang-fi.json +++ b/gui/default/assets/lang/lang-fi.json @@ -98,6 +98,7 @@ "Keep Versions": "Säilytä versiot", "Largest First": "Suurin ensin", "Last File Received": "Viimeksi vastaanotettu tiedosto", + "Last Scan": "Last Scan", "Last seen": "Nähty viimeksi", "Later": "Myöhemmin", "Listeners": "Listeners", diff --git a/gui/default/assets/lang/lang-fr-CA.json b/gui/default/assets/lang/lang-fr-CA.json index 9c4de7fe..da6cdf31 100644 --- a/gui/default/assets/lang/lang-fr-CA.json +++ b/gui/default/assets/lang/lang-fr-CA.json @@ -98,6 +98,7 @@ "Keep Versions": "Conserver les versions", "Largest First": "Les plus volumineux en premier", "Last File Received": "Dernier fichier reçu", + "Last Scan": "Last Scan", "Last seen": "Dernière apparition", "Later": "Plus tard", "Listeners": "Listeners", diff --git a/gui/default/assets/lang/lang-fr.json b/gui/default/assets/lang/lang-fr.json index 54577de9..6eb2d0a8 100644 --- a/gui/default/assets/lang/lang-fr.json +++ b/gui/default/assets/lang/lang-fr.json @@ -98,6 +98,7 @@ "Keep Versions": "Conserver les versions", "Largest First": "Les plus volumineux en premier", "Last File Received": "Dernier fichier reçu", + "Last Scan": "Dernière analyse", "Last seen": "Dernière apparition", "Later": "Plus tard", "Listeners": "Systèmes en écoute", diff --git a/gui/default/assets/lang/lang-fy.json b/gui/default/assets/lang/lang-fy.json index 2d5eceee..e1a46c58 100644 --- a/gui/default/assets/lang/lang-fy.json +++ b/gui/default/assets/lang/lang-fy.json @@ -98,6 +98,7 @@ "Keep Versions": "Ferzjes bewarje", "Largest First": "Grutste earst", "Last File Received": "Leste triem ûntfongen", + "Last Scan": "Lêst Skent", "Last seen": "Lêst sjoen", "Later": "Letter", "Listeners": "Harkers", diff --git a/gui/default/assets/lang/lang-hu.json b/gui/default/assets/lang/lang-hu.json index 43b408ff..ff9f88d3 100644 --- a/gui/default/assets/lang/lang-hu.json +++ b/gui/default/assets/lang/lang-hu.json @@ -17,7 +17,7 @@ "Advanced settings": "Haladó beállítások", "All Data": "Minden adat", "Allow Anonymous Usage Reporting?": "Engedélyezed a névtelen felhasználási adatok küldését?", - "Alphabetic": "ABC rendben", + "Alphabetic": "ABC sorrendben", "An external command handles the versioning. It has to remove the file from the synced folder.": "Külső program kezeli a fájl verziókövetést. A fájlt el kell távolítania a szinkronizált mappából.", "Anonymous Usage Reporting": "Névtelen felhasználási adatok küldése", "Any devices configured on an introducer device will be added to this device as well.": "A bevezető eszközön beállított minden eszköz hozzá lesz adva ehhez az eszközhöz is.", @@ -98,6 +98,7 @@ "Keep Versions": "Megtartott verziók", "Largest First": "Nagyobb először", "Last File Received": "Utolsó beérkezett fájl", + "Last Scan": "Utolsó vizsgálat", "Last seen": "Utoljára látva", "Later": "Később", "Listeners": "Kapcsolatok", @@ -176,7 +177,7 @@ "Shutdown Complete": "Leállítás kész", "Simple File Versioning": "Egyszerű fájl verziókövetés", "Single level wildcard (matches within a directory only)": "Egyszintű helyettesítő karakter (csak egy mappára érvényes)", - "Smallest First": "Kisebb előbb", + "Smallest First": "Kisebb először", "Source Code": "Forráskód", "Staggered File Versioning": "Többszintű fájl verziókövetés", "Start Browser": "Böngésző indítása", diff --git a/gui/default/assets/lang/lang-id.json b/gui/default/assets/lang/lang-id.json index 76194490..6a9c5327 100644 --- a/gui/default/assets/lang/lang-id.json +++ b/gui/default/assets/lang/lang-id.json @@ -98,6 +98,7 @@ "Keep Versions": "Keep Versions", "Largest First": "Largest First", "Last File Received": "Last File Received", + "Last Scan": "Last Scan", "Last seen": "Last seen", "Later": "Later", "Listeners": "Listeners", diff --git a/gui/default/assets/lang/lang-it.json b/gui/default/assets/lang/lang-it.json index f8828b5f..11c6f3f8 100644 --- a/gui/default/assets/lang/lang-it.json +++ b/gui/default/assets/lang/lang-it.json @@ -98,6 +98,7 @@ "Keep Versions": "Versioni Mantenute", "Largest First": "Prima il più grande", "Last File Received": "Ultimo File Ricevuto", + "Last Scan": "Ultima scansione", "Last seen": "Ultima connessione", "Later": "Più Tardi", "Listeners": "In ascolto", @@ -192,7 +193,7 @@ "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing sembra inattivo, oppure c'è un problema con la tua connessione a Internet. Nuovo tentativo…", "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Sembra che Syncthing non sia in grado di elaborare il tuo comando. Se il problema persiste prova a ricaricare la pagina nel tuo navigatore oppure prova a riavviare Syncthing.", "The Syncthing admin interface is configured to allow remote access without a password.": "L'interfaccia di amministrazione di Syncthing è configurata in modo da permettere l'accesso senza password.", - "The aggregated statistics are publicly available at the URL below.": "The aggregated statistics are publicly available at the URL below.", + "The aggregated statistics are publicly available at the URL below.": "Le statistiche aggregate sono disponibili pubblicamente all'URL seguente.", "The aggregated statistics are publicly available at {%url%}.": "Le statistiche aggregate sono disponibili pubblicamente su {{url}}.", "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "La configurazione è stata salvata ma non attivata. Devi riavviare Syncthing per attivare la nuova configurazione.", "The device ID cannot be blank.": "L'ID del dispositivo non può essere vuoto.", diff --git a/gui/default/assets/lang/lang-ja.json b/gui/default/assets/lang/lang-ja.json index 188fdf1c..4c050498 100644 --- a/gui/default/assets/lang/lang-ja.json +++ b/gui/default/assets/lang/lang-ja.json @@ -98,6 +98,7 @@ "Keep Versions": "保存するバージョンの数", "Largest First": "大きい順", "Last File Received": "最後に受信したファイル", + "Last Scan": "最終スキャン時刻", "Last seen": "最終接続日時", "Later": "後で設定", "Listeners": "待ち受けポート", @@ -111,7 +112,7 @@ "Minimum Free Disk Space": "同期を停止する最小空きディスク容量", "Move to top of queue": "最優先にする", "Multi level wildcard (matches multiple directory levels)": "多階層ワイルドカード (複数のディレクトリ階層にマッチします)", - "Never": "接続記録なし", + "Never": "記録なし", "New Device": "新規デバイス", "New Folder": "新規フォルダー", "Newest First": "新しい順", diff --git a/gui/default/assets/lang/lang-ko-KR.json b/gui/default/assets/lang/lang-ko-KR.json index 78b448bf..19ac2f2f 100644 --- a/gui/default/assets/lang/lang-ko-KR.json +++ b/gui/default/assets/lang/lang-ko-KR.json @@ -98,6 +98,7 @@ "Keep Versions": "버전 보관", "Largest First": "큰 파일 순", "Last File Received": "마지막으로 받은 파일", + "Last Scan": "Last Scan", "Last seen": "마지막 접속", "Later": "나중에", "Listeners": "수신자", diff --git a/gui/default/assets/lang/lang-lt.json b/gui/default/assets/lang/lang-lt.json index ea24fb04..573d81b5 100644 --- a/gui/default/assets/lang/lang-lt.json +++ b/gui/default/assets/lang/lang-lt.json @@ -98,14 +98,15 @@ "Keep Versions": "Saugojamų versijų kiekis", "Largest First": "Didžiausi pirmiau", "Last File Received": "Paskutinis priimtas failas", + "Last Scan": "Paskutinis nuskaitymas", "Last seen": "Paskutinį kartą matytas", "Later": "Vėliau", - "Listeners": "Listeners", + "Listeners": "Klausytojai", "Local Discovery": "Vietinis matomumas", "Local State": "Vietinė būsena", "Local State (Total)": "Vietinė būsena (Bendrai)", "Major Upgrade": "Stambus atnaujinimas", - "Master": "Master", + "Master": "Pagrindinis", "Maximum Age": "Maksimalus amžius", "Metadata Only": "Metaduomenims", "Minimum Free Disk Space": "Minimum laisvos vietos diske", @@ -117,7 +118,7 @@ "Newest First": "Naujausi pirmiau", "No": "Ne", "No File Versioning": "Nėra versijų valdymo", - "Normal": "Normal", + "Normal": "Normalus", "Notice": "Įspėjimas", "OK": "Gerai", "Off": "Netaikoma", @@ -218,7 +219,7 @@ "The rate limit must be a non-negative number (0: no limit)": "Srauto maksimalus greitis privalo būti ne neigiamas skaičius (0: nėra apribojimo)", "The rescan interval must be a non-negative number of seconds.": "Nuskaitymo dažnis negali būti neigiamas skaičius.", "They are retried automatically and will be synced when the error is resolved.": "Failus bus automatiškai bandoma parsiųsti dar kartą kai išspręsite klaidas", - "This Device": "This Device", + "This Device": "Šis įrenginys", "This can easily give hackers access to read and change any files on your computer.": "Tai gali suteikti programišiams lengvą prieigą skaityti ir keisti bet kokius failus jūsų kompiuteryje.", "This is a major version upgrade.": "Tai yra stambus atnaujinimas.", "Trash Can File Versioning": "Šiukšliadėžės versijų valdymas", diff --git a/gui/default/assets/lang/lang-nb.json b/gui/default/assets/lang/lang-nb.json index 3e6f452f..3277b352 100644 --- a/gui/default/assets/lang/lang-nb.json +++ b/gui/default/assets/lang/lang-nb.json @@ -97,7 +97,8 @@ "Inversion of the given condition (i.e. do not exclude)": "Invers av den gitte tilstanden (t.d. ikke ekskluder)", "Keep Versions": "Behold Versjoner", "Largest First": "Største fil", - "Last File Received": "Sist Mottatte Fil", + "Last File Received": "Siste mottatte fil", + "Last Scan": "Siste gjennomsøking", "Last seen": "Sist sett", "Later": "Senere", "Listeners": "Lyttere", diff --git a/gui/default/assets/lang/lang-nl.json b/gui/default/assets/lang/lang-nl.json index 8333b992..52cabc13 100644 --- a/gui/default/assets/lang/lang-nl.json +++ b/gui/default/assets/lang/lang-nl.json @@ -98,6 +98,7 @@ "Keep Versions": "Versies behouden", "Largest First": "Grootste eerst", "Last File Received": "Laatst ontvangen bestand", + "Last Scan": "Last Scan", "Last seen": "Laatst gezien op", "Later": "Later", "Listeners": "Luisteraars", diff --git a/gui/default/assets/lang/lang-nn.json b/gui/default/assets/lang/lang-nn.json index 48b96dde..fd2979b5 100644 --- a/gui/default/assets/lang/lang-nn.json +++ b/gui/default/assets/lang/lang-nn.json @@ -98,6 +98,7 @@ "Keep Versions": "Behald Versjonar", "Largest First": "Største fyrst", "Last File Received": "Siste mottatte fila", + "Last Scan": "Last Scan", "Last seen": "Sist sett", "Later": "Seinare", "Listeners": "Listeners", diff --git a/gui/default/assets/lang/lang-pl.json b/gui/default/assets/lang/lang-pl.json index b553236e..fabb60f7 100644 --- a/gui/default/assets/lang/lang-pl.json +++ b/gui/default/assets/lang/lang-pl.json @@ -98,6 +98,7 @@ "Keep Versions": "Zachowuj wersje", "Largest First": "Największe na początku", "Last File Received": "Ostatni otrzymany plik", + "Last Scan": "Last Scan", "Last seen": "Ostatnio widziany", "Later": "Później", "Listeners": "Nasłuchujący", diff --git a/gui/default/assets/lang/lang-pt-BR.json b/gui/default/assets/lang/lang-pt-BR.json index a5c17a2b..89af86fb 100644 --- a/gui/default/assets/lang/lang-pt-BR.json +++ b/gui/default/assets/lang/lang-pt-BR.json @@ -98,6 +98,7 @@ "Keep Versions": "Manter versões", "Largest First": "Maior primeiro", "Last File Received": "Último arquivo recebido", + "Last Scan": "Última verificação", "Last seen": "Visto por último em", "Later": "Depois", "Listeners": "Escutadores", diff --git a/gui/default/assets/lang/lang-pt-PT.json b/gui/default/assets/lang/lang-pt-PT.json index 1d0083f0..34179fc1 100644 --- a/gui/default/assets/lang/lang-pt-PT.json +++ b/gui/default/assets/lang/lang-pt-PT.json @@ -98,6 +98,7 @@ "Keep Versions": "Manter versões", "Largest First": "Primeiro os maiores", "Last File Received": "Último ficheiro recebido", + "Last Scan": "Última verificação", "Last seen": "Última vez que foi verificado", "Later": "Mais tarde", "Listeners": "Auscultadores", diff --git a/gui/default/assets/lang/lang-ru.json b/gui/default/assets/lang/lang-ru.json index f74dc21a..1d0af74e 100644 --- a/gui/default/assets/lang/lang-ru.json +++ b/gui/default/assets/lang/lang-ru.json @@ -98,6 +98,7 @@ "Keep Versions": "Количество хранимых версий", "Largest First": "Сначала большие", "Last File Received": "Последний полученный файл", + "Last Scan": "Last Scan", "Last seen": "Был доступен", "Later": "Позже", "Listeners": "Прослушиватель", diff --git a/gui/default/assets/lang/lang-sv.json b/gui/default/assets/lang/lang-sv.json index 0299a0b9..e5f0c539 100644 --- a/gui/default/assets/lang/lang-sv.json +++ b/gui/default/assets/lang/lang-sv.json @@ -98,6 +98,7 @@ "Keep Versions": "Behåll versioner", "Largest First": "Störst först", "Last File Received": "Senast Mottagna Fil", + "Last Scan": "Senast skanning", "Last seen": "Senast online", "Later": "Senare", "Listeners": "Lyssnare", @@ -192,7 +193,7 @@ "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing verkar avstängd, eller finns det problem med din Internetanslutning. Försöker igen...", "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing verkar ha drabbats av ett problem. Uppdatera sidan eller starta om Syncthing om problemet kvarstår.", "The Syncthing admin interface is configured to allow remote access without a password.": "Syncthing administratör gränssnittet är konfigurerat för att tillåta fjärrtillträde utan ett lösenord.", - "The aggregated statistics are publicly available at the URL below.": "The aggregated statistics are publicly available at the URL below.", + "The aggregated statistics are publicly available at the URL below.": "Den aggregerade statistiken är offentligt tillgängliga på webbadressen nedan.", "The aggregated statistics are publicly available at {%url%}.": "Sammanställd statistik finns publikt tillgänglig på {{url}}.", "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Konfigurationen har sparats men inte aktiverats. Syncthing måste startas om för att aktivera den nya konfigurationen.", "The device ID cannot be blank.": "Enhets-ID kan inte vara tomt.", diff --git a/gui/default/assets/lang/lang-tr.json b/gui/default/assets/lang/lang-tr.json index 3739ccc0..3d2b824e 100644 --- a/gui/default/assets/lang/lang-tr.json +++ b/gui/default/assets/lang/lang-tr.json @@ -98,6 +98,7 @@ "Keep Versions": "Sürümleri Tut", "Largest First": "En büyük olan önce", "Last File Received": "Alınan Son Dosya", + "Last Scan": "Last Scan", "Last seen": "Son Görülen", "Later": "Sonra", "Listeners": "Listeners", diff --git a/gui/default/assets/lang/lang-uk.json b/gui/default/assets/lang/lang-uk.json index 84adb855..6609e145 100644 --- a/gui/default/assets/lang/lang-uk.json +++ b/gui/default/assets/lang/lang-uk.json @@ -98,6 +98,7 @@ "Keep Versions": "Зберігати версії", "Largest First": "Спершу найбільші", "Last File Received": "Останній завантажений файл", + "Last Scan": "Last Scan", "Last seen": "З’являвся останній раз", "Later": "Пізніше", "Listeners": "Приймачі (TCP & Relay)", diff --git a/gui/default/assets/lang/lang-vi.json b/gui/default/assets/lang/lang-vi.json index abd7c7e6..9827f0ce 100644 --- a/gui/default/assets/lang/lang-vi.json +++ b/gui/default/assets/lang/lang-vi.json @@ -98,6 +98,7 @@ "Keep Versions": "Giữ các ph.bản", "Largest First": "Lớn nhất đầu tiên", "Last File Received": "T.tin nhận được gần đây", + "Last Scan": "Last Scan", "Last seen": "Thấy lần cuối", "Later": "Để sau", "Listeners": "Listeners", diff --git a/gui/default/assets/lang/lang-zh-CN.json b/gui/default/assets/lang/lang-zh-CN.json index 85db961c..c12e41ec 100644 --- a/gui/default/assets/lang/lang-zh-CN.json +++ b/gui/default/assets/lang/lang-zh-CN.json @@ -98,6 +98,7 @@ "Keep Versions": "保留历史版本数量", "Largest First": "大文件优先", "Last File Received": "最后接收的文件", + "Last Scan": "最后扫描", "Last seen": "最后可见", "Later": "稍后", "Listeners": "侦听程序", @@ -192,7 +193,7 @@ "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。", "The Syncthing admin interface is configured to allow remote access without a password.": "当前配置允许在不使用密码的情况下远程访问 Syncthing 管理界面", - "The aggregated statistics are publicly available at the URL below.": "The aggregated statistics are publicly available at the URL below.", + "The aggregated statistics are publicly available at the URL below.": "全局统计数据公布于以下 URL。", "The aggregated statistics are publicly available at {%url%}.": "全局统计公布于 {{url}}", "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "设置已经保存，但是还未生效。Syncthing 需要重启以启用新的设置。", "The device ID cannot be blank.": "设备标识不能为空", diff --git a/gui/default/assets/lang/lang-zh-TW.json b/gui/default/assets/lang/lang-zh-TW.json index 92a873bb..82d3e8f8 100644 --- a/gui/default/assets/lang/lang-zh-TW.json +++ b/gui/default/assets/lang/lang-zh-TW.json @@ -98,6 +98,7 @@ "Keep Versions": "保留歷史版本數", "Largest First": "最大的優先", "Last File Received": "最後接收的檔案", + "Last Scan": "Last Scan", "Last seen": "最後發現時間", "Later": "稍後", "Listeners": "Listeners", diff --git a/gui/default/syncthing/core/aboutModalView.html b/gui/default/syncthing/core/aboutModalView.html index 5e1695d4..fe597dee 100644 --- a/gui/default/syncthing/core/aboutModalView.html +++ b/gui/default/syncthing/core/aboutModalView.html @@ -12,8 +12,8 @@

Copyright © 2014-2016 the following Contributors:

-Jakob Borg, Audrius Butkevicius, Alexander Graf, Anderson Mesquita, Antony Male, Ben Schulz, Caleb Callaway, Daniel Harte, Lars K.W. Gohlke, Lode Hoste, Michael Ploujnikov, Philippe Schommers, Ryan Sullivan, Sergey Mishin, Stefan Tatschner, Aaron Bieber, Adam Piggott, Alessandro G., Alexandre Viau, Andrew Dunham, Arthur Axel fREW Schmidt, Bart De Vries, Ben Curthoys, Ben Sidhom, Benny Ng, Brandon Philips, Brendan Long, Brian R. Becker, Carsten Hagemann, Cathryne Linenweaver, Chris Howie, Chris Joel, Colin Kennedy, Daniel Bergmann, Daniel Martí, David Rimmer, Denis A., Dennis Wilson, Dominik Heidler, Elias Jarlebring, Emil Hessman, Erik Meitner, Federico Castagnini, Felix Ableitner, Felix Unterpaintner, Francois-Xavier Gsell, Frank Isemann, Gilli Sigurdsson, Jaakko Hannikainen, Jacek Szafarkiewicz, Jake Peterson, James Patterson, Jaroslav Malec, Jens Diemer, Jochen Voss, Johan Vromans, Karol Różycki, Kelong Cong, Ken'ichi Kamada, Kevin Allen, Laurent Etiemble, Lord Landon Agahnim, Majed Abdulaziz, Marc Laporte, Marc Pujol, Marcin Dziadus, Mateusz Naściszewski, Matt Burke, Max Schulze, Michael Jephcote, Michael Tilli, Nate Morrison, Pascal Jungblut, Peter Hoeg, Phill Luby, Piotr Bejda, Scott Klupfel, Stefan Kuntz, Tim Abell, Tobias Nygren, Tomas Cerveny, Tully Robinson, Tyler Brazier, Veeti Paananen, Victor Buinsky, Vil Brekin, William A. Kennington III, Wulf Weich, Yannic A. -
+Jakob Borg, Audrius Butkevicius, Alexander Graf, Anderson Mesquita, Antony Male, Ben Schulz, Caleb Callaway, Daniel Harte, Lars K.W. Gohlke, Lode Hoste, Michael Ploujnikov, Philippe Schommers, Ryan Sullivan, Sergey Mishin, Stefan Tatschner, Aaron Bieber, Adam Piggott, Alessandro G., Alexandre Viau, Andrew Dunham, Andrey D, Arthur Axel fREW Schmidt, Bart De Vries, Ben Curthoys, Ben Sidhom, Benny Ng, Brandon Philips, Brendan Long, Brian R. Becker, Carsten Hagemann, Cathryne Linenweaver, Chris Howie, Chris Joel, Colin Kennedy, Daniel Bergmann, Daniel Martí, David Rimmer, Denis A., Dennis Wilson, Dominik Heidler, Elias Jarlebring, Emil Hessman, Erik Meitner, Federico Castagnini, Felix Ableitner, Felix Unterpaintner, Francois-Xavier Gsell, Frank Isemann, Gilli Sigurdsson, Jaakko Hannikainen, Jacek Szafarkiewicz, Jake Peterson, James Patterson, Jaroslav Malec, Jens Diemer, Jochen Voss, Johan Vromans, Karol Różycki, Kelong Cong, Ken'ichi Kamada, Kevin Allen, Laurent Etiemble, Lord Landon Agahnim, Majed Abdulaziz, Marc Laporte, Marc Pujol, Marcin Dziadus, Mateusz Naściszewski, Matt Burke, Max Schulze, Michael Jephcote, Michael Tilli, Nate Morrison, Pascal Jungblut, Peter Hoeg, Phill Luby, Piotr Bejda, Scott Klupfel, Stefan Kuntz, Tim Abell, Tobias Nygren, Tomas Cerveny, Tully Robinson, Tyler Brazier, Veeti Paananen, Victor Buinsky, Vil Brekin, William A. Kennington III, Wulf Weich, Yannic A. +
diff --git a/man/syncthing-bep.7 b/man/syncthing-bep.7 index 51e61fdc..612a6129 100644 --- a/man/syncthing-bep.7 +++ b/man/syncthing-bep.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-BEP" "7" "June 03, 2016" "v0.12" "Syncthing" +.TH "SYNCTHING-BEP" "7" "June 08, 2016" "v0.12" "Syncthing" .SH NAME syncthing-bep \- Block Exchange Protocol v1 . diff --git a/man/syncthing-config.5 b/man/syncthing-config.5 index 2233e56d..349b90b2 100644 --- a/man/syncthing-config.5 +++ b/man/syncthing-config.5 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-CONFIG" "5" "June 03, 2016" "v0.12" "Syncthing" +.TH "SYNCTHING-CONFIG" "5" "June 08, 2016" "v0.12" "Syncthing" .SH NAME syncthing-config \- Syncthing Configuration . diff --git a/man/syncthing-device-ids.7 b/man/syncthing-device-ids.7 index 51059967..26ccc8c8 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" "June 03, 2016" "v0.12" "Syncthing" +.TH "SYNCTHING-DEVICE-IDS" "7" "June 08, 2016" "v0.12" "Syncthing" .SH NAME syncthing-device-ids \- Understanding Device IDs . diff --git a/man/syncthing-event-api.7 b/man/syncthing-event-api.7 index e987f7b5..e77eca5d 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" "June 03, 2016" "v0.12" "Syncthing" +.TH "SYNCTHING-EVENT-API" "7" "June 08, 2016" "v0.12" "Syncthing" .SH NAME syncthing-event-api \- Event API . diff --git a/man/syncthing-faq.7 b/man/syncthing-faq.7 index 2d45b240..ef3a5da3 100644 --- a/man/syncthing-faq.7 +++ b/man/syncthing-faq.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-FAQ" "7" "June 03, 2016" "v0.12" "Syncthing" +.TH "SYNCTHING-FAQ" "7" "June 08, 2016" "v0.12" "Syncthing" .SH NAME syncthing-faq \- Frequently Asked Questions . diff --git a/man/syncthing-globaldisco.7 b/man/syncthing-globaldisco.7 index 3e92a1c3..08a21439 100644 --- a/man/syncthing-globaldisco.7 +++ b/man/syncthing-globaldisco.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-GLOBALDISCO" "7" "June 03, 2016" "v0.12" "Syncthing" +.TH "SYNCTHING-GLOBALDISCO" "7" "June 08, 2016" "v0.12" "Syncthing" .SH NAME syncthing-globaldisco \- Global Discovery Protocol v3 . diff --git a/man/syncthing-localdisco.7 b/man/syncthing-localdisco.7 index 57cc3ecc..cd9d3495 100644 --- a/man/syncthing-localdisco.7 +++ b/man/syncthing-localdisco.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-LOCALDISCO" "7" "June 03, 2016" "v0.12" "Syncthing" +.TH "SYNCTHING-LOCALDISCO" "7" "June 08, 2016" "v0.12" "Syncthing" .SH NAME syncthing-localdisco \- Local Discovery Protocol v3 . diff --git a/man/syncthing-networking.7 b/man/syncthing-networking.7 index adf42b73..6fd8adf1 100644 --- a/man/syncthing-networking.7 +++ b/man/syncthing-networking.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-NETWORKING" "7" "June 03, 2016" "v0.12" "Syncthing" +.TH "SYNCTHING-NETWORKING" "7" "June 08, 2016" "v0.12" "Syncthing" .SH NAME syncthing-networking \- Firewall Setup . diff --git a/man/syncthing-relay.7 b/man/syncthing-relay.7 index 67962cee..485310d3 100644 --- a/man/syncthing-relay.7 +++ b/man/syncthing-relay.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-RELAY" "7" "June 03, 2016" "v0.12" "Syncthing" +.TH "SYNCTHING-RELAY" "7" "June 08, 2016" "v0.12" "Syncthing" .SH NAME syncthing-relay \- Relay Protocol v1 . diff --git a/man/syncthing-rest-api.7 b/man/syncthing-rest-api.7 index 8702ea75..d1f397d8 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" "June 03, 2016" "v0.12" "Syncthing" +.TH "SYNCTHING-REST-API" "7" "June 08, 2016" "v0.12" "Syncthing" .SH NAME syncthing-rest-api \- REST API . @@ -458,16 +458,46 @@ Returns information about current system status and resource usage. .ft C { "alloc": 30618136, - "cpuPercent": 0.006944836512046966, - "extAnnounceOK": { - "udp4://announce.syncthing.net:22026": true, - "udp6://announce\-v6.syncthing.net:22026": true + "connectionServiceStatus": { + "dynamic+https://relays.syncthing.net/endpoint": { + "lanAddresses": [ + "relay://23.92.71.120:443/?id=53STGR7\-YBM6FCX\-PAZ2RHM\-YPY6OEJ\-WYHVZO7\-PCKQRCK\-PZLTP7T\-434XCAD&pingInterval=1m0s&networkTimeout=2m0s&sessionLimitBps=0&globalLimitBps=0&statusAddr=:22070&providedBy=canton7" + ], + "wanAddresses": [ + "relay://23.92.71.120:443/?id=53STGR7\-YBM6FCX\-PAZ2RHM\-YPY6OEJ\-WYHVZO7\-PCKQRCK\-PZLTP7T\-434XCAD&pingInterval=1m0s&networkTimeout=2m0s&sessionLimitBps=0&globalLimitBps=0&statusAddr=:22070&providedBy=canton7" + ] + }, + "tcp://0.0.0.0:22000": { + "lanAddresses": [ + "tcp://0.0.0.0:22000" + ], + "wanAddresses": [ + "tcp://0.0.0.0:22000" + ] + } }, + "cpuPercent": 0.006944836512046966, + "discoveryEnabled": true, + "discoveryErrors": { + "global@https://discovery\-v4\-1.syncthing.net/v2/": "500 Internal Server Error", + "global@https://discovery\-v4\-2.syncthing.net/v2/": "Post https://discovery\-v4\-2.syncthing.net/v2/: net/http: request canceled while waiting for connection (Client.Timeout exceeded while awaiting headers)", + "global@https://discovery\-v4\-3.syncthing.net/v2/": "Post https://discovery\-v4\-3.syncthing.net/v2/: net/http: request canceled while waiting for connection (Client.Timeout exceeded while awaiting headers)", + "global@https://discovery\-v6\-1.syncthing.net/v2/": "Post https://discovery\-v6\-1.syncthing.net/v2/: dial tcp [2001:470:28:4d6::5]:443: connect: no route to host", + "global@https://discovery\-v6\-2.syncthing.net/v2/": "Post https://discovery\-v6\-2.syncthing.net/v2/: dial tcp [2604:a880:800:10::182:a001]:443: connect: no route to host", + "global@https://discovery\-v6\-3.syncthing.net/v2/": "Post https://discovery\-v6\-3.syncthing.net/v2/: dial tcp [2400:6180:0:d0::d9:d001]:443: connect: no route to host" + }, + "discoveryMethods": 8, "goroutines": 49, "myID": "P56IOI7\-MZJNU2Y\-IQGDREY\-DM2MGTI\-MGL3BXN\-PQ6W5BM\-TBBZ4TJ\-XZWICQ2", "pathSeparator": "/", + "startTime": "2016\-06\-06T19:41:43.039284753+02:00", "sys": 42092792, - "tilde": "/Users/jb" + "themes": [ + "default", + "dark" + ], + "tilde": "/Users/jb", + "uptime": 2635 } .ft P .fi @@ -644,10 +674,8 @@ availability. Takes \fBfolder\fP and \fBfile\fP parameters. .SS GET /rest/db/ignores .sp Takes one parameter, \fBfolder\fP, and returns the content of the -\fB\&.stignore\fP as the \fBignore\fP field. A second field, \fBpatterns\fP, -provides a compiled version of all included ignore patterns in the form -of regular expressions. Excluded items in the \fBpatterns\fP field have a -nonstandard \fB(?exclude)\fP marker in front of the regular expression. +\fB\&.stignore\fP as the \fBignore\fP field. A second field, \fBexpanded\fP, +provides a list of strings which represent globbing patterns described by gobwas/glob (based on standard wildcards) that match the patterns in \fB\&.stignore\fP and all the includes. If appropriate these globs are prepended by the following modifiers: \fB!\fP to negate the glob, \fB(?i)\fP to do case insensitive matching and \fB(?d)\fP to enable removing of ignored files in an otherwise empty directory. .INDENT 0.0 .INDENT 3.5 .sp @@ -655,11 +683,11 @@ nonstandard \fB(?exclude)\fP marker in front of the regular expression. .ft C { "ignore": [ - "/Backups" + "(?i)/Backups" ], - "patterns": [ - "(?i)^Backups$", - "(?i)^Backups/.*$" + "expanded": [ + "(?i)Backups", + "(?i)Backups/**" ] } .ft P diff --git a/man/syncthing-security.7 b/man/syncthing-security.7 index 73e535a8..4ae04ece 100644 --- a/man/syncthing-security.7 +++ b/man/syncthing-security.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-SECURITY" "7" "June 03, 2016" "v0.12" "Syncthing" +.TH "SYNCTHING-SECURITY" "7" "June 08, 2016" "v0.12" "Syncthing" .SH NAME syncthing-security \- Security Principles . diff --git a/man/syncthing-stignore.5 b/man/syncthing-stignore.5 index 6d5f6e7f..95984308 100644 --- a/man/syncthing-stignore.5 +++ b/man/syncthing-stignore.5 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-STIGNORE" "5" "June 03, 2016" "v0.12" "Syncthing" +.TH "SYNCTHING-STIGNORE" "5" "June 08, 2016" "v0.12" "Syncthing" .SH NAME syncthing-stignore \- Prevent files from being synchronized to other nodes . @@ -127,6 +127,7 @@ Given a directory layout: .sp .nf .ft C +\&.DS_Store foo foofoo bar/ @@ -167,6 +168,7 @@ all files and directories called "foo", ending in a "2" or starting with .sp .nf .ft C +(?d).DS_Store # ignored, will be deleted if gets in the way of parent directory removal foo # ignored, matches "foo" foofoo # synced, does not match "foo" but would match "foo*" or "*foo" bar/ # synced diff --git a/man/syncthing-versioning.7 b/man/syncthing-versioning.7 index b320c236..bc8bc427 100644 --- a/man/syncthing-versioning.7 +++ b/man/syncthing-versioning.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "TODO" "7" "June 03, 2016" "v0.12" "Syncthing" +.TH "TODO" "7" "June 08, 2016" "v0.12" "Syncthing" .SH NAME Todo \- Keep automatic backups of deleted files by other nodes . diff --git a/man/syncthing.1 b/man/syncthing.1 index 865da6ea..6dae7299 100644 --- a/man/syncthing.1 +++ b/man/syncthing.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING" "1" "June 03, 2016" "v0.12" "Syncthing" +.TH "SYNCTHING" "1" "June 08, 2016" "v0.12" "Syncthing" .SH NAME syncthing \- Syncthing . @@ -70,11 +70,6 @@ Override GUI address. .UNINDENT .INDENT 0.0 .TP -.B \-gui\-apikey= -Override GUI API key. -.UNINDENT -.INDENT 0.0 -.TP .B \-home= Set configuration directory. The default configuration directory is: \fB$HOME/.config/syncthing\fP\&. @@ -156,6 +151,12 @@ Print verbose log output. .B \-version Show version. .UNINDENT +.SH DEPRECATED OPTIONS +.INDENT 0.0 +.TP +.B \-gui\-apikey= +Override GUI API key (deprecated as of v0.13, to be removed in the future \- do not use). +.UNINDENT .SH EXIT CODES .INDENT 0.0 .TP