diff --git a/gui/default/assets/lang/lang-bg.json b/gui/default/assets/lang/lang-bg.json index 599efdddc..f66636ea7 100644 --- a/gui/default/assets/lang/lang-bg.json +++ b/gui/default/assets/lang/lang-bg.json @@ -8,13 +8,13 @@ "Add": "Добави", "Add Device": "Добави устройство", "Add Folder": "Добави папка", - "Add Remote Device": "Add Remote Device", + "Add Remote Device": "Добави отдалечено устройство", "Add new folder?": "Добави нова папка?", "Address": "Адрес", "Addresses": "Адреси", "Advanced": "Допълнителни", "Advanced Configuration": "Допълнителни настройки", - "Advanced settings": "Advanced settings", + "Advanced settings": "Допълнителни настройки", "All Data": "Всички данни", "Allow Anonymous Usage Reporting?": "Разреши анонимно докладване за употребата на програмата?", "Alphabetic": "Азбучен ред", @@ -34,12 +34,12 @@ "Connection Error": "Грешка при свързването", "Copied from elsewhere": "Копиране от някъде другаде", "Copied from original": "Копиран от оригинала", - "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 the following Contributors:", + "Copyright © 2014-2016 the following Contributors:": "Всички правата запазени © 2014-2016 Сътрудници:", "Copyright © 2015 the following Contributors:": "Всички правата запазени © 2015 Сътрудници:", "Danger!": "Опасност!", "Delete": "Изтрий", "Deleted": "Изтрито", - "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Device \"{{name}}\" ({{device}} at {{address}}) wants to connect. Add new device?", + "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Устройство \"{{name}}\" ({{device}}) на {{address}} желае да се свърже. Добави ново устройство?", "Device ID": "Идентификатор на устройство", "Device Identification": "Идентификатор на устройство", "Device Name": "Име на устройство", @@ -55,6 +55,7 @@ "Edit Device": "Промени устройство", "Edit Folder": "Промени папка", "Editing": "Променяне", + "Enable NAT traversal": "Разреши NAT traversal", "Enable Relaying": "Разреши препращане", "Enable UPnP": "Включи UPnP", "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Въведете адреси разделени със запетая (\"tcp://ip:port\", \"tcp://host:port\") или \"dynamic\", за да автоматично откриване на наличните адреси.", @@ -70,7 +71,7 @@ "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Защитава файловете от промени направени на други устройства, но промените направени на това устройство ще бъдат синхронизирани с останалите устройства.", "Folder": "Папка", "Folder ID": "Идентификатор на папката", - "Folder Label": "Folder Label", + "Folder Label": "Етикет на папката", "Folder Master": "Главна папка", "Folder Path": "Път до папката", "Folders": "Папки", @@ -116,7 +117,7 @@ "OK": "ОК", "Off": "Изключено", "Oldest First": "Първо най-старите", - "Optional descriptive label for the folder. Can be different on each device.": "Optional descriptive label for the folder. Can be different on each device.", + "Optional descriptive label for the folder. Can be different on each device.": "Допълнително разяснеие за етикета на папката. Може да бъде различно всяко устройство.", "Options": "Настройки", "Out of Sync": "Несинхронизирано", "Out of Sync Items": "Несинхронизирани елементи", @@ -138,9 +139,9 @@ "Relayed via": "Препратено през", "Relays": "Препращачи", "Release Notes": "Бележки по обновяването", - "Remote Devices": "Remote Devices", + "Remote Devices": "Отделечени устройства", "Remove": "Премахни", - "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.", + "Required identifier for the folder. Must be the same on all cluster devices.": "Задължителен идентификатор за тази папка. Трябва да бъде един и същ на всички устройства.", "Rescan": "Сканирай повторно", "Rescan All": "Сканирай повторно всички", "Rescan Interval": "Интервал за повторно сканиране", @@ -211,7 +212,7 @@ "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 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": "Само на файловете в кошчето", @@ -229,7 +230,7 @@ "Version": "Версия", "Versions Path": "Път до версиите", "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Версиите биват изтривани автоматично, когато са по-стари от максималната възраст или надминават броя файлове разрешени в даден интервал.", - "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Warning, this path is a subdirectory of an existing folder \"{{otherFolder}}\".", + "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Внимание, това е вътрешна папка на вече съществуваща папка \"{{otherFolder}}\".", "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.": "Когато добавяш нов идентификатор на папка помни, че той се използва за свързване на папките на различни устройства. Главни/малки букви са от значение и трябва да са еднакви на всички устройства.", "Yes": "Да", @@ -238,6 +239,6 @@ "full documentation": "пълна документация", "items": "елемента", "{%device%} wants to share folder \"{%folder%}\".": "{{device}} желае да сподели папка \"{{folder}}\".", - "{%device%} wants to share folder \"{%folderLabel%}\" ({%folder%}).": "{{device}} wants to share folder \"{{folderLabel}}\" ({{folder}}).", - "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} wants to share folder \"{{folderlabel}}\" ({{folder}})." + "{%device%} wants to share folder \"{%folderLabel%}\" ({%folder%}).": "{{device}} желае е да сподели папка \"{{folderLabel}}\" ({{folder}}).", + "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} желае да сподели папка \"{{folderlabel}}\" ({{folder}})." } \ No newline at end of file diff --git a/gui/default/assets/lang/lang-ca.json b/gui/default/assets/lang/lang-ca.json index 2a69d57c1..52977dc6f 100644 --- a/gui/default/assets/lang/lang-ca.json +++ b/gui/default/assets/lang/lang-ca.json @@ -55,6 +55,7 @@ "Edit Device": "Modificar dispositiu", "Edit Folder": "Modificar carpeta", "Editing": "Modificant", + "Enable NAT traversal": "Enable NAT traversal", "Enable Relaying": "Enable Relaying", "Enable UPnP": "Habilitat UPnP", "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Introdueix adreces separades per comes (\"tcp://ip:port\", \"tcp://host:port\") o \"dinàmic\" per realitzar descobriments automàtics de l'adreça.", diff --git a/gui/default/assets/lang/lang-ca@valencia.json b/gui/default/assets/lang/lang-ca@valencia.json index 253b461f3..1858bf123 100644 --- a/gui/default/assets/lang/lang-ca@valencia.json +++ b/gui/default/assets/lang/lang-ca@valencia.json @@ -1,5 +1,5 @@ { - "A device with that ID is already added.": "A device with that ID is already added.", + "A device with that ID is already added.": "Un dispositiu amb eixa ID ja s'ha afegit.", "A negative number of days doesn't make sense.": "Un nombre negatiu de dies no té sentit.", "A new major version may not be compatible with previous versions.": "Una nova versión amb canvis importants pot no ser compatible amb versions prèvies.", "API Key": "Clau API", @@ -8,13 +8,13 @@ "Add": "Afegir", "Add Device": "Afegir dispositiu", "Add Folder": "Afegir carpeta", - "Add Remote Device": "Add Remote Device", + "Add Remote Device": "Afegir Dispositiu Remot.", "Add new folder?": "Afegir nova carpeta?", "Address": "Direcció", "Addresses": "Direccions", "Advanced": "Avançat", "Advanced Configuration": "Configuració avançada", - "Advanced settings": "Advanced settings", + "Advanced settings": "Ajustos avançats.", "All Data": "Totes les dades", "Allow Anonymous Usage Reporting?": "Permetre informes d'ús anònim?", "Alphabetic": "Alfabètic", @@ -34,12 +34,12 @@ "Connection Error": "Error de connexió", "Copied from elsewhere": "Copiat de qualsevol lloc", "Copied from original": "Copiat de l'original", - "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 the following Contributors:", + "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 els següents Col·laboradors:", "Copyright © 2015 the following Contributors:": "Copyright © 2015 els següents Col·laboradors:", "Danger!": "Perill!", "Delete": "Esborrar", "Deleted": "Esborrat", - "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Device \"{{name}}\" ({{device}} at {{address}}) wants to connect. Add new device?", + "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Dispositiu \"{{name}}\" ({{device}} a l'adreça {{address}}) vol connectar. Afegir nou dispositiu?", "Device ID": "ID del dispositiu", "Device Identification": "Identificació del dispositiu", "Device Name": "Nom del dispositiu", @@ -55,7 +55,8 @@ "Edit Device": "Editar dispositiu", "Edit Folder": "Editar carpeta", "Editing": "Editant", - "Enable Relaying": "Enable Relaying", + "Enable NAT traversal": "Permetre NAT transversal", + "Enable Relaying": "Permetre Transmissions", "Enable UPnP": "Activar UPnp", "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Introdueix adreces separades per coma (\"tcp://ip:port\", \"tcp://host:port\") o \"dynamic\" per a realitzar el descobriment automàtic de l'adreça.", "Enter ignore patterns, one per line.": "Introduïr patrons a ignorar, un per línia.", @@ -70,7 +71,7 @@ "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Els fitxers són protegits dels canvis fets en altres dispositius, però els canvis fets en aquest dispositiu seràn enviats a la resta del grup (cluster).", "Folder": "Carpeta", "Folder ID": "ID de carpeta", - "Folder Label": "Folder Label", + "Folder Label": "Etiqueta de la Carpeta", "Folder Master": "Carpeta principal", "Folder Path": "Ruta de la carpeta", "Folders": "Carpetes", @@ -80,8 +81,8 @@ "GUI Listen Addresses": "Direcció d'escolta de l'Interfície Gràfica d'Usuari (GUI)", "Generate": "Generar", "Global Discovery": "Descobriment global", - "Global Discovery Server": "Servidor de descobriment global", - "Global Discovery Servers": "Global Discovery Servers", + "Global Discovery Server": "Servidor de Descobriment Global", + "Global Discovery Servers": "Servidors de Descobriment Global", "Global State": "Estat global", "Help": "Ajuda", "Home page": "Pàgina inicial", @@ -116,7 +117,7 @@ "OK": "OK", "Off": "Off", "Oldest First": "El més vell primer", - "Optional descriptive label for the folder. Can be different on each device.": "Optional descriptive label for the folder. Can be different on each device.", + "Optional descriptive label for the folder. Can be different on each device.": "Etiqueta descriptiva opcional per la carpeta. Pot ser diferent en cada dispositiu.", "Options": "Opcions", "Out of Sync": "Sense sincronització", "Out of Sync Items": "Dispositius sense sincronitzar", @@ -134,13 +135,13 @@ "Quick guide to supported patterns": "Guía ràpida de patrons suportats", "RAM Utilization": "Utilització de la RAM", "Random": "Aleatori", - "Relay Servers": "Relay Servers", + "Relay Servers": "Servidors de Transmissió", "Relayed via": "Transmitit via", "Relays": "Transmissions", "Release Notes": "Notes de la versió", - "Remote Devices": "Remote Devices", + "Remote Devices": "Dispositius Remots", "Remove": "Eliminar", - "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.", + "Required identifier for the folder. Must be the same on all cluster devices.": "Identificador necessari per la carpeta. Deu ser el mateix en tots els dispositius del cluster.", "Rescan": "Tornar a buscar", "Rescan All": "Tornar a buscar tot", "Rescan Interval": "Interval de nova busca", @@ -163,7 +164,7 @@ "Shared With": "Compartit amb", "Short identifier for the folder. Must be the same on all cluster devices.": "Identificador curt per a la carpeta. Deu ser el mateix en tots els dispositius del grup (cluster).", "Show ID": "Mostrar ID", - "Show QR": "Show QR", + "Show QR": "Mostrar QR", "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Mostrat en lloc de l'ID del dispositiu en l'estat del grup (cluster). S'anunciarà als altres dispositius com el nom opcional per defecte.", "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Mostrat en lloc de l'ID del dispositiu en l'estat del grup (cluster). S'actualitzarà al nom que el dispositiu anuncia si es deixa buit.", "Shutdown": "Apagar", @@ -189,7 +190,7 @@ "The aggregated statistics are publicly available at {%url%}.": "Les estadístiques agregades estan disponibles públicament en {{url}}.", "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "La configuració ha sigut gravada però no activada. Syncthing deu reiniciar per tal d'activar la nova configuració.", "The device ID cannot be blank.": "L'ID del dispositiu no pot estar buida.", - "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 device ID to enter here can be found in the \"Actions > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "L'ID del dispositiu que hi ha que introduïr ací es pot trobar en el menú \"Accions > Mostrar ID\" en l'altre dispositiu. Els espais i les barres son opcionals (ignorats).", "The device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "L'ID del dispositiu que hi ha que introduïr ací es pot trobar en el menú \"Editar > Mostrar ID\" en l'altre dispositiu. Els espais i les barres son opcionals (ignorats).", "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.": "L'informe encriptat d'ús s'envia diariament. S'utilitza per a rastrejar plataformes comuns, tamanys de carpetes i versions de l'aplicació. Si el conjunt de dades enviat a l'informe es canvia, se li demanarà a vosté l'autorització altra vegada.\n", "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.": "L'ID del dispositiu introduïda no pareix vàlida. Deuria ser una cadena de 52 o 56 caracters consistents en lletres i nombre, amb espais i barres opcionals.", @@ -211,7 +212,7 @@ "The rate limit must be a non-negative number (0: no limit)": "El llímit del ritme deu ser un nombre no negatiu (0: sense llímit)", "The rescan interval must be a non-negative number of seconds.": "L'interval de reescaneig deu ser un nombre positiu de segons.", "They are retried automatically and will be synced when the error is resolved.": "Es reintenta automàticament i es sincronitzaràn quant el resolga l'error.", - "This Device": "This Device", + "This Device": "Aquest Dispositiu", "This can easily give hackers access to read and change any files on your computer.": "Açò pot donar accés fàcilment als hackers per a llegir i canviar qualsevol fitxer al teu ordinador.", "This is a major version upgrade.": "Aquesta és una actualització important de la versió.", "Trash Can File Versioning": "Versionat d'arxius de la paperera", @@ -229,7 +230,7 @@ "Version": "Versió", "Versions Path": "Ruta de les versions", "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Les versions s'esborren automàticament si són més antigues que l'edat màxima o excedixen el nombre de fitxer permesos en un interval.", - "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Warning, this path is a subdirectory of an existing folder \"{{otherFolder}}\".", + "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Perill! Aquesta ruta és un subdirectori d'una carpeta que ja existeix nomenada \"{{otherFolder}}\".", "When adding a new device, keep in mind that this device must be added on the other side too.": "Quant s'afig un nou dispositiu, hi ha que tindre en compte que aquest dispositiu deu ser afegit també en l'altre costat.", "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.": "Quant s'afig una nova carpeta, hi ha que tindre en compte que l'ID de la carpeta s'utilitza per a juntar les carpetes entre dispositius. Són sensibles a les majúscules i deuen coincidir exactament entre tots els dispositius.", "Yes": "Sí", @@ -238,6 +239,6 @@ "full documentation": "Documentació completa", "items": "Elements", "{%device%} wants to share folder \"{%folder%}\".": "{{device}} vol compartit la carpeta \"{{folder}}\".", - "{%device%} wants to share folder \"{%folderLabel%}\" ({%folder%}).": "{{device}} wants to share folder \"{{folderLabel}}\" ({{folder}}).", - "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} wants to share folder \"{{folderlabel}}\" ({{folder}})." + "{%device%} wants to share folder \"{%folderLabel%}\" ({%folder%}).": "{{device}} vol compartir la carpeta \"{{folderLabel}}\" ({{folder}}).", + "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} vol compartir la carpeta \"{{folderlabel}}\" ({{folder}})." } \ No newline at end of file diff --git a/gui/default/assets/lang/lang-cs.json b/gui/default/assets/lang/lang-cs.json index 025c5ea1a..2a3d87869 100644 --- a/gui/default/assets/lang/lang-cs.json +++ b/gui/default/assets/lang/lang-cs.json @@ -55,6 +55,7 @@ "Edit Device": "Upravit přístroj", "Edit Folder": "Upravit adresář", "Editing": "Upravuje se", + "Enable NAT traversal": "Povolit NAT přenos", "Enable Relaying": "Povolit přenašeče", "Enable UPnP": "Povolit UPnP", "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Zadejte adresy oddělené čárkou (\"tcp://ip:port\", \"tcp://host:port\") nebo \"dynamic\" pro automatické zjišťování adres.", @@ -116,7 +117,7 @@ "OK": "OK", "Off": "Vypnuta", "Oldest First": "Od nejstaršího", - "Optional descriptive label for the folder. Can be different on each device.": "Toto zařízení", + "Optional descriptive label for the folder. Can be different on each device.": "Volitelný popisek adresáře. Může být rozdílný na každém zařízení.", "Options": "Nastavení", "Out of Sync": "Nesesynchronizováno", "Out of Sync Items": "Nesesynchronizované položky", @@ -239,5 +240,5 @@ "items": "položky", "{%device%} wants to share folder \"{%folder%}\".": "{{device}} chce sdílet adresář \"{{folder}}\".", "{%device%} wants to share folder \"{%folderLabel%}\" ({%folder%}).": "{{device}} chce sdílet adresář \"{{folderLabel}}\" ({{folder}}).", - "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} wants to share folder \"{{folderlabel}}\" ({{folder}})." + "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} chce sdílet adresář \"{{folderlabel}}\" ({{folder}})." } \ No newline at end of file diff --git a/gui/default/assets/lang/lang-da.json b/gui/default/assets/lang/lang-da.json index 8eb90efcd..2911bd2db 100644 --- a/gui/default/assets/lang/lang-da.json +++ b/gui/default/assets/lang/lang-da.json @@ -55,6 +55,7 @@ "Edit Device": "Rediger enhed", "Edit Folder": "Rediger mappe", "Editing": "Redigerer", + "Enable NAT traversal": "Enable NAT traversal", "Enable Relaying": "Enable Relaying", "Enable UPnP": "Anvend UPnP", "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Angiv kommaseparerede adresser (\"tcp://ip:port\", \"tcp://host:port\") eller \"dynamic\" for at benytte automatisk opdagelse af adressen.", diff --git a/gui/default/assets/lang/lang-de.json b/gui/default/assets/lang/lang-de.json index 57a511f00..583f7a699 100644 --- a/gui/default/assets/lang/lang-de.json +++ b/gui/default/assets/lang/lang-de.json @@ -55,6 +55,7 @@ "Edit Device": "Gerät bearbeiten", "Edit Folder": "Verzeichnis bearbeiten", "Editing": "Bearbeitet", + "Enable NAT traversal": "NAT-Traversal aktivieren", "Enable Relaying": "Weiterleitung aktivieren", "Enable UPnP": "UPnP aktivieren", "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Kommagetrennte Adressen (\"tcp://ip:port\", \"tcp://host:port\") oder \"dynamic\" eingeben, um die Adresse automatisch zu ermitteln.", @@ -65,7 +66,7 @@ "File Pull Order": "Dateiübertragungsreihenfolge", "File Versioning": "Dateiversionierung", "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Dateizugriffsrechte beim Suchen nach Veränderungen ignorieren. Bei FAT-Dateisystemen zu verwenden.", - "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Wenn Dateien von Syncthing ersetzt oder gelöscht werden sollen, werden sie vorher in den .stversions Ordner verschoben.", + "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Wenn Syncthing Dateien ersetzt oder löscht, werden sie in das .stversions Verzeichnis verschoben.", "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Dateien werden, bevor Syncthing sie löscht oder ersetzt, datiert in das Verzeichnis .stversions verschoben.", "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Dateien sind auf diesem Gerät schreibgeschützt. Auf diesem Gerät durchgeführte Veränderungen werden aber auf den Rest des Verbunds übertragen.", "Folder": "Verzeichnis", @@ -122,7 +123,7 @@ "Out of Sync Items": "Nicht synchronisierte Objekte", "Outgoing Rate Limit (KiB/s)": "Limit Datenrate (ausgehend) (KB/s)", "Override Changes": "Änderungen überschreiben", - "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": "Pfad zum Verzeichnis auf dem lokalen Gerät. Ordner werden erzeugt, wenn sie nicht existieren. Das Tilden-Zeichen (~) kann als Abkürzung benutzt werden für", + "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": "Pfad zum Verzeichnis auf dem lokalen Gerät. Verzeichnis wird erzeugt, wenn es nicht existiert. Das Tilden-Zeichen (~) kann als Abkürzung benutzt werden für", "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Pfad in dem alte Dateiversionen gespeichert werden sollen (ohne Angabe wird das Verzeichnis .stversions im Verzeichnis verwendet).", "Pause": "Pause", "Paused": "Pausiert", diff --git a/gui/default/assets/lang/lang-el.json b/gui/default/assets/lang/lang-el.json index 9cf52ee31..c7a4437c5 100644 --- a/gui/default/assets/lang/lang-el.json +++ b/gui/default/assets/lang/lang-el.json @@ -55,6 +55,7 @@ "Edit Device": "Επεξεργασία συσκευής", "Edit Folder": "Επεξεργασία φακέλου", "Editing": "Επεξεργασία σε εξέλιξη", + "Enable NAT traversal": "Enable NAT traversal", "Enable Relaying": "Ενεργοποίηση αναμετάδοσης", "Enable UPnP": "Ενεργοποίηση UPnP", "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.", diff --git a/gui/default/assets/lang/lang-en-GB.json b/gui/default/assets/lang/lang-en-GB.json index 5345c8a06..b7cee2c60 100644 --- a/gui/default/assets/lang/lang-en-GB.json +++ b/gui/default/assets/lang/lang-en-GB.json @@ -55,6 +55,7 @@ "Edit Device": "Edit Device", "Edit Folder": "Edit Folder", "Editing": "Editing", + "Enable NAT traversal": "Enable NAT traversal", "Enable Relaying": "Enable Relaying", "Enable UPnP": "Enable UPnP", "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.", diff --git a/gui/default/assets/lang/lang-es-ES.json b/gui/default/assets/lang/lang-es-ES.json index ae206d43b..e3c7e5cd4 100644 --- a/gui/default/assets/lang/lang-es-ES.json +++ b/gui/default/assets/lang/lang-es-ES.json @@ -8,13 +8,13 @@ "Add": "Agregar", "Add Device": "Agregar Dispositivo", "Add Folder": "Agregar Carpeta", - "Add Remote Device": "Add Remote Device", + "Add Remote Device": "Añadir Dispositivo Remoto", "Add new folder?": "¿Agregar una carpeta nueva?", "Address": "Dirección", "Addresses": "Direcciones", "Advanced": "Avanzado", "Advanced Configuration": "Configuración Avanzada", - "Advanced settings": "Advanced settings", + "Advanced settings": "Ajustes avanzados", "All Data": "Todos los datos", "Allow Anonymous Usage Reporting?": "¿Deseas permitir el envío anónimo de informes de uso?", "Alphabetic": "Alfabético", @@ -34,12 +34,12 @@ "Connection Error": "Error de conexión", "Copied from elsewhere": "Copiado de otro sitio", "Copied from original": "Copiado del original", - "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 the following Contributors:", + "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 los siguientes Colaboradores:", "Copyright © 2015 the following Contributors:": "Copyright © 2015 los siguientes Colaboradores:", "Danger!": "¡Peligro!", "Delete": "Eliminar", "Deleted": "Eliminado", - "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Device \"{{name}}\" ({{device}} at {{address}}) wants to connect. Add new device?", + "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "El dispositivo \"{{name}}\" ({{device}} en la dirección {{address}}) quiere conectarse. Añadir nuevo dispositivo?", "Device ID": "ID del Dispositivo", "Device Identification": "Identificación del Dispositivo", "Device Name": "Nombre del Dispositivo", @@ -55,6 +55,7 @@ "Edit Device": "Editar dispositivo", "Edit Folder": "Editar repositorio", "Editing": "Editando", + "Enable NAT traversal": "Permitir NAT transversal", "Enable Relaying": "Habilitar Retransmisión", "Enable UPnP": "Habilitar UPnP", "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Introduzca las direcciones, separadas por comas (\"tcp://ip:port\", \"tcp://host:port\"), o \"dynamic\" para llevar a cabo el descubrimiento automático de la dirección.", @@ -70,7 +71,7 @@ "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Los ficheros son protegidos por los cambios hechos en otros dispositivos, pero los cambios hechos en este dispositivo serán enviados al resto del grupo (cluster).", "Folder": "Carpeta", "Folder ID": "ID de carpeta", - "Folder Label": "Folder Label", + "Folder Label": "Etiqueta de la Carpeta", "Folder Master": "Carpeta principal", "Folder Path": "Ruta de la carpeta", "Folders": "Carpetas", @@ -116,7 +117,7 @@ "OK": "OK", "Off": "Desconectar", "Oldest First": "El más antiguo primero", - "Optional descriptive label for the folder. Can be different on each device.": "Optional descriptive label for the folder. Can be different on each device.", + "Optional descriptive label for the folder. Can be different on each device.": "Etiqueta descriptiva opcional para la carpeta. Puede ser diferente en cada dispositivo.", "Options": "Opciones", "Out of Sync": "No sincronizado", "Out of Sync Items": "Elementos no sincronizados", @@ -138,9 +139,9 @@ "Relayed via": "Respaldada a través", "Relays": "Respaldos", "Release Notes": "Notas de la versión", - "Remote Devices": "Remote Devices", + "Remote Devices": "Dispositivos Remotos", "Remove": "Eliminar", - "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.", + "Required identifier for the folder. Must be the same on all cluster devices.": "Identificador requerido para la carpeta. Debe ser el mismo en todos los dispositivos del clúster.", "Rescan": "Volver a analizar", "Rescan All": "Volver a analizar Todo", "Rescan Interval": "Intervalo de análisis", @@ -189,7 +190,7 @@ "The aggregated statistics are publicly available at {%url%}.": "Las estadísticas agregadas están disponibles públicamente en {{url}}.", "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "La configuración ha sido grabada pero no activada. Syncthing debe reiniciarse para activar la nueva configuración.", "The device ID cannot be blank.": "La ID del dispositivo no puede estar vacía.", - "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 device ID to enter here can be found in the \"Actions > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "El ID del dispositivo que hay que introducir aquí se puede encontrar en el diálogo \"Acciones > Mostrar ID\" en el otro dispositivo. Los espacios y las barras son opcionales (ignorados).", "The device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "La ID del dispositivo que hay que introducir aquí puede encontrarse en el menú \"Editar > Mostrar ID\" en el otro dispositivo. Los espacios y barras son opcionales (ignorados).", "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.": "El informe encriptado de uso se envía diariamente. Se usa para rastrear plataformas comunes, tamaños de carpetas y versiones de la aplicación. Si el conjunto de datos enviados en el informes se cambia, se le pedirá a usted autorización de nuevo.", "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.": "La ID del dispositivo introducida no parece válida. Debe ser una cadena de 52 ó 56 caracteres formada por letras y números, con espacios y guiones opcionales.", @@ -211,7 +212,7 @@ "The rate limit must be a non-negative number (0: no limit)": "El límite de velocidad debe ser un número no negativo (0: sin límite)", "The rescan interval must be a non-negative number of seconds.": "El intervalo de actualización debe ser un número positivo de segundos.", "They are retried automatically and will be synced when the error is resolved.": "Se reintentarán de forma automática y se sincronizarán cuando se resuelva el error.", - "This Device": "This Device", + "This Device": "Este Dispositivo", "This can easily give hackers access to read and change any files on your computer.": "Esto podría permitir fácilmente el acceso a hackers para leer y modificar cualquier fichero de tu equipo.", "This is a major version upgrade.": "Hay una actualización importante.", "Trash Can File Versioning": "Versionado de archivos de la papelera", @@ -229,7 +230,7 @@ "Version": "Versión", "Versions Path": "Ruta de las versiones", "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Las versiones se borran automáticamente si son más antiguas que la edad máxima o exceden el número de ficheros permitidos en un intervalo.", - "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Warning, this path is a subdirectory of an existing folder \"{{otherFolder}}\".", + "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Peligro! Esta ruta es un subdirectorio de una carpeta ya existente llamada \"{{otherFolder}}\".", "When adding a new device, keep in mind that this device must be added on the other side too.": "Cuando añada un nuevo dispositivo, tenga en cuenta que este debe añadirse también en el otro lado.", "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.": "Cuando añada una nueva carpeta, tenga en cuenta que su ID se usa para unir carpetas entre dispositivos. Son sensibles a las mayúsculas y deben coincidir exactamente entre todos los dispositivos.", "Yes": "Si", @@ -238,6 +239,6 @@ "full documentation": "Documentación completa", "items": "Elementos", "{%device%} wants to share folder \"{%folder%}\".": "{{device}} quiere compartir la carpeta \"{{folder}}\".", - "{%device%} wants to share folder \"{%folderLabel%}\" ({%folder%}).": "{{device}} wants to share folder \"{{folderLabel}}\" ({{folder}}).", - "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} wants to share folder \"{{folderlabel}}\" ({{folder}})." + "{%device%} wants to share folder \"{%folderLabel%}\" ({%folder%}).": "{{device}} quiere compartir la carpeta \"{{folderLabel}}\" ({{folder}}).", + "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} quiere compartir la carpeta \"{{folderlabel}}\" ({{folder}})." } \ No newline at end of file diff --git a/gui/default/assets/lang/lang-es.json b/gui/default/assets/lang/lang-es.json index 0d0784618..2fd740f74 100644 --- a/gui/default/assets/lang/lang-es.json +++ b/gui/default/assets/lang/lang-es.json @@ -55,6 +55,7 @@ "Edit Device": "Editar dispositivo", "Edit Folder": "Editar repositorio", "Editing": "Editando", + "Enable NAT traversal": "Enable NAT traversal", "Enable Relaying": "Enable Relaying", "Enable UPnP": "Permitir UPnP", "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.", diff --git a/gui/default/assets/lang/lang-fi.json b/gui/default/assets/lang/lang-fi.json index 86616551f..eaeabc581 100644 --- a/gui/default/assets/lang/lang-fi.json +++ b/gui/default/assets/lang/lang-fi.json @@ -55,6 +55,7 @@ "Edit Device": "Muokkaa laitetta", "Edit Folder": "Muokkaa kansiota", "Editing": "Muokkaus", + "Enable NAT traversal": "Enable NAT traversal", "Enable Relaying": "Enable Relaying", "Enable UPnP": "Ota UPnP käyttöön", "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Syötä osoitteet pilkuilla erotettuina (\"tcp://ip:portti, tcp://nimi:portti\") tai \"dynamic\" käyttääksesi osoitteen automaattista selvitystä.", diff --git a/gui/default/assets/lang/lang-fr-CA.json b/gui/default/assets/lang/lang-fr-CA.json index 87b9f2c85..67d662a80 100644 --- a/gui/default/assets/lang/lang-fr-CA.json +++ b/gui/default/assets/lang/lang-fr-CA.json @@ -55,6 +55,7 @@ "Edit Device": "Éditer le périphérique", "Edit Folder": "Éditer le répertoire", "Editing": "Édition", + "Enable NAT traversal": "Enable NAT traversal", "Enable Relaying": "Enable Relaying", "Enable UPnP": "Activer l'UPnP", "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Entrer les adresses (\"tcp://ip:port\" ou \"tcp://host:port\") séparées par une virgule ou \"dynamic\" afin d'activer la recherche automatique de l'adresse.", diff --git a/gui/default/assets/lang/lang-fr.json b/gui/default/assets/lang/lang-fr.json index ce1929eee..0b44e04ef 100644 --- a/gui/default/assets/lang/lang-fr.json +++ b/gui/default/assets/lang/lang-fr.json @@ -55,6 +55,7 @@ "Edit Device": "Éditer la machine", "Edit Folder": "Éditer le dossier", "Editing": "Édition", + "Enable NAT traversal": "Activer le transfert NAT", "Enable Relaying": "Activer le relayage", "Enable UPnP": "Activer l'UPnP", "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Entrer les adresses (\"tcp://ip:port\" ou \"tcp://host:port\") séparées par une virgule ou \"dynamic\" afin d'activer la recherche automatique de l'adresse.", diff --git a/gui/default/assets/lang/lang-fy.json b/gui/default/assets/lang/lang-fy.json index c4c79a491..f5dfde4aa 100644 --- a/gui/default/assets/lang/lang-fy.json +++ b/gui/default/assets/lang/lang-fy.json @@ -55,6 +55,7 @@ "Edit Device": "Apparaat bewurkje", "Edit Folder": "Map bewurkje", "Editing": "Bewurkjen", + "Enable NAT traversal": "Enable NAT traversal", "Enable Relaying": "Trochjaan tastean", "Enable UPnP": "UPnP oansette", "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Fier troch komma's skieden (\"tcp://ip:port\", \"tcp://host:port\") adressen yn of \"dynamic\" om automatyske ûntdekking fan it adres út te fieren.", diff --git a/gui/default/assets/lang/lang-hu.json b/gui/default/assets/lang/lang-hu.json index d01011930..677820bee 100644 --- a/gui/default/assets/lang/lang-hu.json +++ b/gui/default/assets/lang/lang-hu.json @@ -21,7 +21,7 @@ "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.", - "Automatic upgrades": "Automatikus frissítés", + "Automatic upgrades": "Automatikus frissítések", "Be careful!": "Légy óvatos!", "Bugs": "Hibák", "CPU Utilization": "Processzor használat", @@ -55,6 +55,7 @@ "Edit Device": "Eszköz szerkesztése", "Edit Folder": "Mappa szerkesztése", "Editing": "Szerkesztés", + "Enable NAT traversal": "NAT bejárás engedélyezése", "Enable Relaying": "Közvetítés engedélyezése", "Enable UPnP": "UPnP engedélyezése", "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Vesszővel elválasztva több cím is bevihető (\"tcp://ip:port\", \"tcp://host:port\"), az automatikus felderítéshez a 'dynamic' kulcsszó használatos. ", diff --git a/gui/default/assets/lang/lang-id.json b/gui/default/assets/lang/lang-id.json index 76409bfb4..8d80e169d 100644 --- a/gui/default/assets/lang/lang-id.json +++ b/gui/default/assets/lang/lang-id.json @@ -55,6 +55,7 @@ "Edit Device": "Sunting Perangkat", "Edit Folder": "Sunting Folder", "Editing": "Menyunting", + "Enable NAT traversal": "Enable NAT traversal", "Enable Relaying": "Aktifkan Relay", "Enable UPnP": "Aktifkan UPnP", "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Masukkan alamat, pisahkan dengan koma (\"tcp://ip:port\", \"tcp://host:port\") atau \"dynamic\" untuk menjalankan penemuan otomatis alamat tersebut.", diff --git a/gui/default/assets/lang/lang-it.json b/gui/default/assets/lang/lang-it.json index b1e302e6d..1d1b1d3ee 100644 --- a/gui/default/assets/lang/lang-it.json +++ b/gui/default/assets/lang/lang-it.json @@ -55,6 +55,7 @@ "Edit Device": "Modifica Dispositivo", "Edit Folder": "Modifica Cartella", "Editing": "Modifica di", + "Enable NAT traversal": "Abilita NAT trasversale", "Enable Relaying": "Abilita relaying", "Enable UPnP": "Attiva UPnP", "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Inserisci indirizzi separati da virgola (\"tcp://ip:porta\", \"tcp://host:porta\") oppure \"dynamic\" per effettuare il rilevamento automatico dell'indirizzo.", diff --git a/gui/default/assets/lang/lang-ja.json b/gui/default/assets/lang/lang-ja.json index 560ca7aaa..ad63c08da 100644 --- a/gui/default/assets/lang/lang-ja.json +++ b/gui/default/assets/lang/lang-ja.json @@ -55,6 +55,7 @@ "Edit Device": "デバイスの編集", "Edit Folder": "フォルダーの編集", "Editing": "編集中", + "Enable NAT traversal": "NATトラバーサルを有効にする", "Enable Relaying": "中継サーバー経由の通信を有効にする", "Enable UPnP": "UPnPを有効にする", "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "アドレスを指定する場合は「tcp://IPアドレス:ポート」または「tcp://ホスト名:ポート」をコンマで区切って入力してください。自動探索を行う場合は「dynamic」と入力してください。", diff --git a/gui/default/assets/lang/lang-ko-KR.json b/gui/default/assets/lang/lang-ko-KR.json index 37eccdd8f..c5ad8c434 100644 --- a/gui/default/assets/lang/lang-ko-KR.json +++ b/gui/default/assets/lang/lang-ko-KR.json @@ -55,6 +55,7 @@ "Edit Device": "기기 편집", "Edit Folder": "폴더 편집", "Editing": "편집", + "Enable NAT traversal": "Enable NAT traversal", "Enable Relaying": "Enable Relaying", "Enable UPnP": "UPnP 활성화", "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.", diff --git a/gui/default/assets/lang/lang-lt.json b/gui/default/assets/lang/lang-lt.json index ff4ec9785..57086f5b7 100644 --- a/gui/default/assets/lang/lang-lt.json +++ b/gui/default/assets/lang/lang-lt.json @@ -16,10 +16,10 @@ "Advanced Configuration": "Išplėstinė konfigūracija", "Advanced settings": "Išplėstiniai nustatymai", "All Data": "Visiems duomenims", - "Allow Anonymous Usage Reporting?": "Siųsti anonimišką vartojimo ataskaitą?", + "Allow Anonymous Usage Reporting?": "Siųsti anoniminę naudojimo ataskaitą?", "Alphabetic": "Abėcėlės tvarka", "An external command handles the versioning. It has to remove the file from the synced folder.": "Išorinė komanda apdoroja versijų valdymą. Ji turi pašalinti failą iš sinchronizuoto aplanko.", - "Anonymous Usage Reporting": "Anoniminė vartojimo ataskaita", + "Anonymous Usage Reporting": "Anoniminė naudojimo ataskaita", "Any devices configured on an introducer device will be added to this device as well.": "Visi supažindintojo įrenginiai bus pridėti prie jūsų įrenginių sąrašo.", "Automatic upgrades": "Automatiniai atnaujinimai", "Be careful!": "Būkite atsargūs!", @@ -27,7 +27,7 @@ "CPU Utilization": "Procesoriaus panaudojimas", "Changelog": "Pasikeitimai", "Clean out after": "Išvalyti po", - "Close": "Uždaryti", + "Close": "Užverti", "Command": "Komanda", "Comment, when used at the start of a line": "Komentaras naudojamas naujoje eilutėje", "Compression": "Kompresija", @@ -55,6 +55,7 @@ "Edit Device": "Keisti įrenginį", "Edit Folder": "Keisti aplanką", "Editing": "Redagavimas", + "Enable NAT traversal": "Leisti kirsti NAT", "Enable Relaying": "Įjungti retransliavimą", "Enable UPnP": "Įjungti UPnP", "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Įveskite kableliais atskirtus (\"tcp://ip:prievadas\", \"tcp://serveris:prievadas\") adresus arba \"dynamic\", kad atliktumėte automatinį adresų aptikimą.", diff --git a/gui/default/assets/lang/lang-nb.json b/gui/default/assets/lang/lang-nb.json index 9afac5400..9db851c10 100644 --- a/gui/default/assets/lang/lang-nb.json +++ b/gui/default/assets/lang/lang-nb.json @@ -55,6 +55,7 @@ "Edit Device": "Rediger Enhet", "Edit Folder": "Rediger Mappe", "Editing": "Redigerer", + "Enable NAT traversal": "Enable NAT traversal", "Enable Relaying": "Aktiver relésending", "Enable UPnP": "Aktiver UPnP", "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Skriv inn kommaseparerte (\"tcp://ip:port\", \"tcp://host:port\") adresser, eller ordet \"dynamic\" for å gjøre automatisk oppslag for adressen.", diff --git a/gui/default/assets/lang/lang-nl.json b/gui/default/assets/lang/lang-nl.json index 1c1249de3..f97bdbfa0 100644 --- a/gui/default/assets/lang/lang-nl.json +++ b/gui/default/assets/lang/lang-nl.json @@ -8,13 +8,13 @@ "Add": "Toevoegen", "Add Device": "Apparaat toevoegen", "Add Folder": "Map toevoegen", - "Add Remote Device": "Add Remote Device", + "Add Remote Device": "Voeg extern apparaat toe", "Add new folder?": "Voeg nieuwe map toe?", "Address": "Adres", "Addresses": "Adressen", "Advanced": "Geavanceerd", "Advanced Configuration": "Geavanceerde configuratie", - "Advanced settings": "Advanced settings", + "Advanced settings": "Geavanceerde instellingen", "All Data": "Alle gegevens", "Allow Anonymous Usage Reporting?": "Versturen van anonieme gebruikersstatistieken toestaan?", "Alphabetic": "Alfabetisch", @@ -34,12 +34,12 @@ "Connection Error": "Verbindingsfout", "Copied from elsewhere": "Gekopieerd vanaf elders", "Copied from original": "Gekopieerd van het origineel", - "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 the following Contributors:", + "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 voor de volgende contributanten:", "Copyright © 2015 the following Contributors:": "Copyright © 2015 de volgende Bijdragers:", - "Danger!": "Gevaar!", + "Danger!": "Let op!", "Delete": "Verwijderen", "Deleted": "Verwijderd", - "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Device \"{{name}}\" ({{device}} at {{address}}) wants to connect. Add new device?", + "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Apparaat \"{{name}}\" ({{device}} at {{address}}) wil verbinden. Wil je dit toestaan?", "Device ID": "Apparaat-ID", "Device Identification": "Apparaat-identificatie", "Device Name": "Naam apparaat", @@ -55,6 +55,7 @@ "Edit Device": "Bewerk apparaat", "Edit Folder": "Bewerk map", "Editing": "Bezig met bewerken", + "Enable NAT traversal": "Activeer NAT traversal", "Enable Relaying": "Activeer doorsturen", "Enable UPnP": "UPnP gebruiken", "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Voer door komma's gescheiden (\"tcp://ip:port\", \"tcp://host:port\") adressen in of voer \"dynamisch\" in om automatische ontdekking van het adres uit te voeren.", @@ -70,7 +71,7 @@ "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Bestanden zijn beschermt tegen aanpassingen die gemaakt zijn door andere apparaten, maar aanpassingen op dit apparaat worden doorgestuurd naar de rest van het cluster.", "Folder": "Map", "Folder ID": "Map-ID", - "Folder Label": "Folder Label", + "Folder Label": "Map label", "Folder Master": "Hoofdmap", "Folder Path": "Maplocatie", "Folders": "Mappen", @@ -116,7 +117,7 @@ "OK": "OK", "Off": "Uit", "Oldest First": "Oudste eerst", - "Optional descriptive label for the folder. Can be different on each device.": "Optional descriptive label for the folder. Can be different on each device.", + "Optional descriptive label for the folder. Can be different on each device.": "Optioneel label met een beschrijving voor de map. Kan verschillend zijn op elk apparaat.", "Options": "Opties", "Out of Sync": "Niet gesynchroniseerd", "Out of Sync Items": "Niet-gesynchroniseerde items", @@ -138,9 +139,9 @@ "Relayed via": "Doorgestuurd via", "Relays": "Relais", "Release Notes": "Release notes", - "Remote Devices": "Remote Devices", + "Remote Devices": "Externe apparaten", "Remove": "Verwijderen", - "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.", + "Required identifier for the folder. Must be the same on all cluster devices.": "De identifier voor de map is verplicht. Dit moet hetzelfde zijn op alle apparaten in het cluster. ", "Rescan": "Opnieuw scannen", "Rescan All": "Scan alles opnieuw", "Rescan Interval": "Scanfrequentie", @@ -211,7 +212,7 @@ "The rate limit must be a non-negative number (0: no limit)": "De snelheidslimiet moet een positief nummer zijn (0: geen limiet)", "The rescan interval must be a non-negative number of seconds.": "De scanfrequentie moet een positief getal in seconden zijn.", "They are retried automatically and will be synced when the error is resolved.": "Het wordt automatisch opnieuw geprobeerd. Bestanden worden gesynchroniseerd als de fout is hersteld.", - "This Device": "This Device", + "This Device": "Dit apparaat", "This can easily give hackers access to read and change any files on your computer.": "Dit kan kwaadwilligen eenvoudig toegang geven tot het lezen en wijzigen van bestanden op jouw computer.", "This is a major version upgrade.": "Dit is een grote update.", "Trash Can File Versioning": "Versiebeheer bestanden prullenbak", @@ -229,7 +230,7 @@ "Version": "Versie", "Versions Path": "Bestandspad versies", "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Versies worden automatisch verwijderd als deze ouder zijn dan de maximale leeftijd of als ze het maximaal aantal toegestane bestanden per interval overschrijden. ", - "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Warning, this path is a subdirectory of an existing folder \"{{otherFolder}}\".", + "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Let op, dit bestandspad is een submap van een bestaande map \"{{otherFolder}}\".", "When adding a new device, keep in mind that this device must be added on the other side too.": "Wanneer een nieuw toestel wordt toegevoegd, houd er dan rekening mee dat dit toestel ook aan de andere kant moet worden toegevoegd.", "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.": "Houd er bij het toevoegen van nieuwe mappen rekening mee dat het map-ID gebruikt wordt om mappen tussen apparaten te verbinden. Dit ID is hoofdlettergevoelig en moet identiek zijn op andere apparaten.", "Yes": "Ja", @@ -238,6 +239,6 @@ "full documentation": "volledige documentatie", "items": "objecten", "{%device%} wants to share folder \"{%folder%}\".": "{{device}} wil de map \"{{folder}}\" delen.", - "{%device%} wants to share folder \"{%folderLabel%}\" ({%folder%}).": "{{device}} wants to share folder \"{{folderLabel}}\" ({{folder}}).", - "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} wants to share folder \"{{folderlabel}}\" ({{folder}})." + "{%device%} wants to share folder \"{%folderLabel%}\" ({%folder%}).": "{{device}} wil de map \"{{folderLabel}}\" ({{folder}}) delen.", + "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} wil de map \"{{folderlabel}}\" ({{folder}}) delen." } \ No newline at end of file diff --git a/gui/default/assets/lang/lang-nn.json b/gui/default/assets/lang/lang-nn.json index f8dd578e8..8f845aee9 100644 --- a/gui/default/assets/lang/lang-nn.json +++ b/gui/default/assets/lang/lang-nn.json @@ -55,6 +55,7 @@ "Edit Device": "Rediger Eining", "Edit Folder": "Rediger Mappe", "Editing": "Redigerer", + "Enable NAT traversal": "Enable NAT traversal", "Enable Relaying": "Aktiver Reléer", "Enable UPnP": "Aktiver UPnP", "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Skriv inn adresser med komma mellom kvar adresse (\"tcp://ip:port\", \"tcp://host:port\"), eller \"dynamic\" for å automatisk søkja opp adressa.", diff --git a/gui/default/assets/lang/lang-pl.json b/gui/default/assets/lang/lang-pl.json index 6ea7dfd66..5c0557594 100644 --- a/gui/default/assets/lang/lang-pl.json +++ b/gui/default/assets/lang/lang-pl.json @@ -8,13 +8,13 @@ "Add": "Dodaj", "Add Device": "Dodaj urządzenie", "Add Folder": "Dodaj folder", - "Add Remote Device": "Add Remote Device", + "Add Remote Device": "Dodaj urządzenie zdalne", "Add new folder?": "Dodać nowy folder?", "Address": "Adres", "Addresses": "Adresy", "Advanced": "Zaawansowane", "Advanced Configuration": "Konfiguracja zaawansowana", - "Advanced settings": "Advanced settings", + "Advanced settings": "Ustawienia zaawansowane", "All Data": "Wszystkie dane", "Allow Anonymous Usage Reporting?": "Zezwalaj na anonimowe statystyki użycia?", "Alphabetic": "Alfabetycznie", @@ -34,12 +34,12 @@ "Connection Error": "Błąd połączenia", "Copied from elsewhere": "Skopiowane z innego miejsca ", "Copied from original": "Skopiowane z oryginału", - "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 the following Contributors:", + "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016: ", "Copyright © 2015 the following Contributors:": "Copyright © 2015: ", "Danger!": "Niebezpieczne!", "Delete": "Usuń", "Deleted": "Usunięto", - "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Device \"{{name}}\" ({{device}} at {{address}}) wants to connect. Add new device?", + "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Urządzenie \"{{name}}\" {{device}} ({{address}}) chce się połączyć. Dodać urządzenie?", "Device ID": "ID urządzenia", "Device Identification": "Identyfikator urządzenia", "Device Name": "Nazwa urządzenia", @@ -55,6 +55,7 @@ "Edit Device": "Edytuj urządzenie", "Edit Folder": "Edytuj folder", "Editing": "Edytowanie", + "Enable NAT traversal": "Enable NAT traversal", "Enable Relaying": "Włącz przekazywanie", "Enable UPnP": "Włącz UPnP", "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Wpisz oddzielone przecinkiem adresy (\"tcp://ip:port\", \"tcp://host:port\") lub \"dynamic\" by przeprowadzić automatyczne odnalezienie adresu.", @@ -70,7 +71,7 @@ "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Pliki są zabezpieczone przed zmianami na innym urządzeniu, jednak zmiany w tym urządzeniu będą wysłane do reszty.", "Folder": "Folder", "Folder ID": "ID folderu", - "Folder Label": "Folder Label", + "Folder Label": "Etykieta folderu", "Folder Master": "Główny folder", "Folder Path": "Ścieżka folderu", "Folders": "Foldery", @@ -116,7 +117,7 @@ "OK": "OK", "Off": "Wyłącz", "Oldest First": "Najstarsze na początku", - "Optional descriptive label for the folder. Can be different on each device.": "Optional descriptive label for the folder. Can be different on each device.", + "Optional descriptive label for the folder. Can be different on each device.": "Opcjonalna opisowa etykieta dla folderu. Może być różna na każdym urządzeniu.", "Options": "Opcje", "Out of Sync": "Niezsynchronizowane", "Out of Sync Items": "Niezsynchronizowane pliki", @@ -138,9 +139,9 @@ "Relayed via": "Przekazane przez", "Relays": "Przekaźniki", "Release Notes": "Informacje o wydaniu", - "Remote Devices": "Remote Devices", + "Remote Devices": "Urządzenia zdalne", "Remove": "Usuń", - "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.", + "Required identifier for the folder. Must be the same on all cluster devices.": "Wymagany identyfikator dla folderu. Musi być taki sam dla wszystkich urządzeń.", "Rescan": "Skanuj ponownie", "Rescan All": "Skanuj wszystko ponownie", "Rescan Interval": "Interwał skanowania", @@ -211,7 +212,7 @@ "The rate limit must be a non-negative number (0: no limit)": "Ograniczenie prędkości powinno być nieujemną liczbą całkowitą (0: brak ograniczeń)", "The rescan interval must be a non-negative number of seconds.": "Interwał skanowania musi być niezerową liczbą sekund.", "They are retried automatically and will be synced when the error is resolved.": "Ponowne próby zachodzą automatycznie, synchronizacja nastąpi po usunięciu usterki.", - "This Device": "This Device", + "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ć osobom trzecim dostęp do odczytu i zmian dowolnych plików na urządzeniu.", "This is a major version upgrade.": "To jest ważna aktualizacja", "Trash Can File Versioning": "Kontrola werjsi plików w koszu", @@ -229,7 +230,7 @@ "Version": "Wersja", "Versions Path": "Ścieżka wersji", "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Wersje zostają automatycznie usunięte jeżeli są starsze niż maksymalny wiek lub przekraczają liczbę dopuszczalnych wersji.", - "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Warning, this path is a subdirectory of an existing folder \"{{otherFolder}}\".", + "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Ostrzerzenie, ta ścieżka to podkatalog istniejącego folderu \"{{otherFolder}}\".", "When adding a new device, keep in mind that this device must be added on the other side too.": "Gdy dodajesz nowe urządzenie, pamiętaj że urządzenie musi zostać dodane także po drugiej stronie.", "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.": "Przy dodawaniu nowego folderu, pamiętaj, że ID użyte jest do łączenia folderów pomiędzy urządzeniami. Wielkość liter ciągu ma znaczenie musi zgadzać się na wszystkich urządzeniach.", "Yes": "Tak", @@ -238,6 +239,6 @@ "full documentation": "pełna dokumentacja", "items": "pozycji", "{%device%} wants to share folder \"{%folder%}\".": "{{device}} chce udostępnić folder \"{{folder}}\"", - "{%device%} wants to share folder \"{%folderLabel%}\" ({%folder%}).": "{{device}} wants to share folder \"{{folderLabel}}\" ({{folder}}).", - "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} wants to share folder \"{{folderlabel}}\" ({{folder}})." + "{%device%} wants to share folder \"{%folderLabel%}\" ({%folder%}).": "{{device}} chce udostępnić folder \"{{folderLabel}}\" ({{folder}}).", + "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} chce udostępnić folder \"{{folderlabel}}\" ({{folder}})." } \ No newline at end of file diff --git a/gui/default/assets/lang/lang-pt-BR.json b/gui/default/assets/lang/lang-pt-BR.json index 5979a7a84..8dd1c8d4b 100644 --- a/gui/default/assets/lang/lang-pt-BR.json +++ b/gui/default/assets/lang/lang-pt-BR.json @@ -55,6 +55,7 @@ "Edit Device": "Editar dispositivo", "Edit Folder": "Editar pasta", "Editing": "Editando", + "Enable NAT traversal": "Habilitar NAT", "Enable Relaying": "Habilitar retransmissão", "Enable UPnP": "Habilitar UPnP", "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Insira endereços (\"tcp://ip:porta\", \"tcp://host:porta\") separados por vírgula ou \"dynamic\" para executar a descoberta automática do endereço.", diff --git a/gui/default/assets/lang/lang-pt-PT.json b/gui/default/assets/lang/lang-pt-PT.json index 9a0ad1816..6adb9ef30 100644 --- a/gui/default/assets/lang/lang-pt-PT.json +++ b/gui/default/assets/lang/lang-pt-PT.json @@ -55,6 +55,7 @@ "Edit Device": "Editar dispositivo", "Edit Folder": "Editar pasta", "Editing": "Editando", + "Enable NAT traversal": "Activar travessia de NAT", "Enable Relaying": "Permitir retransmissão", "Enable UPnP": "Activar UPnP", "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Introduza endereços separados por vírgulas (\"tcp://ip:porto\", \"tcp://máquina:porto\") ou \"dynamic\" para detectar automaticamente os endereços.", diff --git a/gui/default/assets/lang/lang-ru.json b/gui/default/assets/lang/lang-ru.json index b4506f53d..c46ab1cf3 100644 --- a/gui/default/assets/lang/lang-ru.json +++ b/gui/default/assets/lang/lang-ru.json @@ -55,6 +55,7 @@ "Edit Device": "Изменить устройство", "Edit Folder": "Изменить папку", "Editing": "Редактирование", + "Enable NAT traversal": "Включить NAT traversal", "Enable Relaying": "Включить релеи", "Enable UPnP": "Включить UPnP", "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Введите адреса через запятую (\"tcp://ip:port\", \"tcp://host:port\") или \"dynamic\" для автоматического поиска адресов.", @@ -239,5 +240,5 @@ "items": "элементы", "{%device%} wants to share folder \"{%folder%}\".": "{{device}} хочет поделиться папкой \"{{folder}}\".", "{%device%} wants to share folder \"{%folderLabel%}\" ({%folder%}).": "{{device}} хочет поделиться папкой «{{folderLabel}}» ({{folder}}).", - "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} wants to share folder \"{{folderlabel}}\" ({{folder}})." + "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} хочет поделиться папкой «{{folderlabel}}» ({{folder}})." } \ No newline at end of file diff --git a/gui/default/assets/lang/lang-sv.json b/gui/default/assets/lang/lang-sv.json index 2d84ce14c..8b6973eb9 100644 --- a/gui/default/assets/lang/lang-sv.json +++ b/gui/default/assets/lang/lang-sv.json @@ -55,6 +55,7 @@ "Edit Device": "Redigera enhet", "Edit Folder": "Redigera katalog", "Editing": "Redigerar", + "Enable NAT traversal": "Aktivera NAT traversering", "Enable Relaying": "Aktivera reläa", "Enable UPnP": "Använd UPnP", "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Ange kommaseparerade (\"tcp://ip:port\", \"tcp://host:port\")-adresser eller ordet \"dynamic\" för att använda automatisk uppslagning.", diff --git a/gui/default/assets/lang/lang-tr.json b/gui/default/assets/lang/lang-tr.json index 84d0f3ab6..d112f5923 100644 --- a/gui/default/assets/lang/lang-tr.json +++ b/gui/default/assets/lang/lang-tr.json @@ -55,6 +55,7 @@ "Edit Device": "Cihaz Düzenle", "Edit Folder": "Klasör Düzenle", "Editing": "Düzenleniyor", + "Enable NAT traversal": "Enable NAT traversal", "Enable Relaying": "Enable Relaying", "Enable UPnP": "UPnP Etkinleştir", "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Adreslerin keşfinin otomatik olarak gerçekleştirilmesi için ya adresleri virgülle ayırarak (\"tcp://ip:port\", \"tcp://host:port\") girin, ya da \"dynamic\" kelimesini girin.", diff --git a/gui/default/assets/lang/lang-uk.json b/gui/default/assets/lang/lang-uk.json index ce341bf40..c5ba314ba 100644 --- a/gui/default/assets/lang/lang-uk.json +++ b/gui/default/assets/lang/lang-uk.json @@ -55,6 +55,7 @@ "Edit Device": "Налаштування пристрою", "Edit Folder": "Налаштування директорії", "Editing": "Редагування", + "Enable NAT traversal": "Увімкнути NAT traversal", "Enable Relaying": "Увімкнути ретрансляцію (relaying)", "Enable UPnP": "Увімкнути UPnP", "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Введіть розділені комою (\"tcp://ip:port\", \"tcp://host:port\") адреси або \"dynamic\" для автоматичного визначення адреси.", diff --git a/gui/default/assets/lang/lang-vi.json b/gui/default/assets/lang/lang-vi.json index 57bbb24fc..1c9c0c838 100644 --- a/gui/default/assets/lang/lang-vi.json +++ b/gui/default/assets/lang/lang-vi.json @@ -55,6 +55,7 @@ "Edit Device": "Ch.sửa thiết bị", "Edit Folder": "Ch.sửa thư mục", "Editing": "Đang ch.sửa", + "Enable NAT traversal": "Enable NAT traversal", "Enable Relaying": "Bật chế độ ch.tiếp", "Enable UPnP": "Bật UPnP", "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Nhập các địa chỉ ngăn cách bởi dấu phẩy (\"tcp://ip:port\", \"tcp://host:port\") hoặc \"dynamic\" để tiến hành dò tìm địa chỉ tự động.", diff --git a/gui/default/assets/lang/lang-zh-CN.json b/gui/default/assets/lang/lang-zh-CN.json index 58a805f7f..10f54ecf2 100644 --- a/gui/default/assets/lang/lang-zh-CN.json +++ b/gui/default/assets/lang/lang-zh-CN.json @@ -13,12 +13,12 @@ "Address": "地址", "Addresses": "地址列表", "Advanced": "高级", - "Advanced Configuration": "高级设置", + "Advanced Configuration": "高级配置", "Advanced settings": "高级设置", "All Data": "所有数据", "Allow Anonymous Usage Reporting?": "允许匿名使用报告?", "Alphabetic": "字母顺序", - "An external command handles the versioning. It has to remove the file from the synced folder.": "使用外部命令接管版本控制。当文件在其他设备被删除时，本机的 Syncthing 会调用该外部命令，并将文件路径以参数形式传递给该命令。该命令必须自行从同步文件夹中删除该文件。", + "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.": "在介绍人设备上被添加的其它设备，也将会被添加到本机。", "Automatic upgrades": "自动升级", @@ -34,12 +34,12 @@ "Connection Error": "连接出错", "Copied from elsewhere": "从其他设备复制", "Copied from original": "从源复制", - "Copyright © 2014-2016 the following Contributors:": "版权所有© 2014-2016 以下贡献者:", + "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 以下贡献者：", "Copyright © 2015 the following Contributors:": "版权 ©2015 由下列贡献者所有：", "Danger!": "危险！", "Delete": "删除", "Deleted": "已删除", - "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "设备 \"{{name}}\" (位于 {{address}} 的 {{device}}) 请求连接。是否添加新设备？", + "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "设备 \"{{name}}\"（位于 {{address}} 的 {{device}}）请求连接。是否添加新设备？", "Device ID": "设备标识", "Device Identification": "设备标识", "Device Name": "设备名", @@ -55,6 +55,7 @@ "Edit Device": "编辑设备选项", "Edit Folder": "编辑文件夹选项", "Editing": "正在编辑", + "Enable NAT traversal": "启用 NAT 遍历", "Enable Relaying": "开启中继", "Enable UPnP": "开启UPnP", "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "输入以半角逗号分隔的 (\"tcp://ip:port\", \"tcp://host:port\") 设置可用地址列表，或者输入 \"dynamic\" 表示自动寻找地址。", @@ -64,7 +65,7 @@ "Failed Items": "失败的项目", "File Pull Order": "文件拉取顺序", "File Versioning": "版本控制", - "File permission bits are ignored when looking for changes. Use on FAT file systems.": "当寻找文件变更时，忽略文件权限。用于FAT文件系统。", + "File permission bits are ignored when looking for changes. Use on FAT file systems.": "当查找文件更改时，忽略文件权限位。用在 FAT文件系统上。", "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "当文件被 Syncthing 替换或删时，将会被移动到 .stversions 文件夹", "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "当某个文件在其他设备被替换或删除时，本设备将会在 .stversions 文件夹中保留该文件的备份，并在文件名中加入时间戳信息。", "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "在其它设备中对该文件夹内文件的修改并不会被同步到本机，但是在本机上对其的修改，则会被同步到其它设备中。", @@ -74,7 +75,7 @@ "Folder Master": "主文件夹", "Folder Path": "文件夹路径", "Folders": "文件夹", - "GUI": "图形界面", + "GUI": "图形用户界面", "GUI Authentication Password": "图形管理界面密码", "GUI Authentication User": "图形管理界面用户名", "GUI Listen Addresses": "图形管理界面监听地址", @@ -103,7 +104,7 @@ "Major Upgrade": "重大更新", "Maximum Age": "历史版本最长保留时间", "Metadata Only": "仅元数据", - "Minimum Free Disk Space": "最低空闲磁盘空间", + "Minimum Free Disk Space": "最低可用磁盘空间", "Move to top of queue": "移动到队列顶端", "Multi level wildcard (matches multiple directory levels)": "多级通配符（用以匹配多层文件夹）", "Never": "从未", @@ -116,7 +117,7 @@ "OK": "确定", "Off": "关闭", "Oldest First": "旧文件优先", - "Optional descriptive label for the folder. Can be different on each device.": "可选的文件夹表述标签。在不同设备上可以不一致。", + "Optional descriptive label for the folder. Can be different on each device.": "可选的文件夹说明性标签。在不同设备上可以不一致。", "Options": "选项", "Out of Sync": "未同步", "Out of Sync Items": "未同步的项目", @@ -163,9 +164,9 @@ "Shared With": "共享给", "Short identifier for the folder. Must be the same on all cluster devices.": "文件夹的别名。必须在所有设备上保持一致。", "Show ID": "显示设备标识", - "Show QR": "显示二维码", - "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.": "在设备丛中，将会显示本名称，而不是设备标识。如果设置为空，则会使用目标设备提供的默认名称。", + "Show QR": "显示 QR 码", + "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "在设备丛中，显示该名称，而不是设备 ID。亦会作为一个可选的默认名称被发送到其他设备。", + "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "在设备丛中，将会显示本名称，而不是设备 ID。如果设置为空，则会使用目标设备提供的默认名称。", "Shutdown": "关闭 Syncthing", "Shutdown Complete": "关闭完成", "Simple File Versioning": "简易版本控制", @@ -189,7 +190,7 @@ "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.": "设备标识不能为空", - "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).": "在这里所需要输入的设备 ID，可以在目标设备的“操作->显示 ID”中看到。空格和横线可选（将会被忽略）。", "The device ID to enter here can be found in the \"Edit > 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的字母和数字，空格和横线不算在内。", @@ -202,7 +203,7 @@ "The following items could not be synchronized.": "下列项目无法被同步。", "The maximum age must be a number and cannot be blank.": "最长保留时间必须为数字，且不能为空。", "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "历史版本保留的最长天数，0为永久保存", - "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "最低空间磁盘空间的数值必须介于 0-100 的正整数", + "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "最低可用磁盘空间的数值必须介于 0-100 的正整数", "The number of days must be a number and cannot be blank.": "天数必须为数字，且不能为空。", "The number of days to keep files in the trash can. Zero means forever.": "文件保存在回收站的天数。零表示永久。", "The number of old versions to keep, per file.": "每个文件保留的版本数量上限。", @@ -231,7 +232,7 @@ "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "超过最长保留时间，或者不满足下列条件的历史版本，将会被删除。", "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "警告, 该路径是一个已经存在文件夹\"{{otherFolder}}\"的子文件夹.", "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.": "若你添加了新文件夹，记住文件夹 ID 是用以在不同设备间建立联系的。在不同设备间拥有相同 ID 的文件夹将会被同步。且文件夹 ID 区分大小写。", "Yes": "是", "You must keep at least one version.": "您必须保留至少一个版本", "days": "天", diff --git a/gui/default/assets/lang/lang-zh-TW.json b/gui/default/assets/lang/lang-zh-TW.json index 03c0d3c29..9b21a7922 100644 --- a/gui/default/assets/lang/lang-zh-TW.json +++ b/gui/default/assets/lang/lang-zh-TW.json @@ -55,6 +55,7 @@ "Edit Device": "編輯裝置", "Edit Folder": "編輯資料夾", "Editing": "正在編輯", + "Enable NAT traversal": "Enable NAT traversal", "Enable Relaying": "啟用中繼", "Enable UPnP": "啟用 UPnP", "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Enter comma separated (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.", diff --git a/gui/default/syncthing/core/aboutModalView.html b/gui/default/syncthing/core/aboutModalView.html index 2b34f518b..438ca306b 100644 --- a/gui/default/syncthing/core/aboutModalView.html +++ b/gui/default/syncthing/core/aboutModalView.html @@ -11,7 +11,7 @@

Copyright © 2014-2016 the following Contributors:

-Jakob Borg, Audrius Butkevicius, Alexander Graf, Anderson Mesquita, Ben Schulz, Caleb Callaway, Lode Hoste, Michael Ploujnikov, Philippe Schommers, Ryan Sullivan, Sergey Mishin, Stefan Tatschner, Aaron Bieber, Adam Piggott, Alessandro G., Andrew Dunham, Antony Male, 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 Harte, 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, Lars K.W. Gohlke, Laurent Etiemble, Lord Landon Agahnim, 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, Ben Schulz, Caleb Callaway, Lars K.W. Gohlke, Lode Hoste, Michael Ploujnikov, Philippe Schommers, Ryan Sullivan, Sergey Mishin, Stefan Tatschner, Aaron Bieber, Adam Piggott, Alessandro G., Andrew Dunham, Antony Male, 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 Harte, 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, 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 62cf67ef9..4d0daa8e5 100644 --- a/man/syncthing-bep.7 +++ b/man/syncthing-bep.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-BEP" "7" "April 14, 2016" "v0.12" "Syncthing" +.TH "SYNCTHING-BEP" "7" "May 01, 2016" "v0.12" "Syncthing" .SH NAME syncthing-bep \- Block Exchange Protocol v1 . @@ -90,8 +90,91 @@ as noted per message type \- any message type may be sent at any time and the sender need not await a response to one message before sending another. .sp -The underlying transport protocol MUST be TCP. -.SH MESSAGES +The underlying transport protocol MUST guarantee reliable packet delivery. +.SH PRE-AUTHENTICATION MESSAGES +.sp +AFTER establishing a connection, but BEFORE performing any authentication, +\fIdevices\fP MUST exchange Hello messages. +.sp +Hello messages are used to carry additional information about the peer, which +might be of interest to the user even if the peer is not permitted to +communicate due to failing authentication. +.sp +Hello messages MUST be prefixed with a magic number \fB0x9F79BC40\fP +represented in network byte order (BE), followed by 4 bytes representing the +size of the message in network byte order (BE), followed by the content of +the Hello message itself. The size of the contents of Hello message MUST be +less or equal to 1024 bytes. +.INDENT 0.0 +.INDENT 3.5 +.sp +.nf +.ft C +Prefix Structure: + + 0 1 2 3 + 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 ++\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+ +| Magic | ++\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+ +| Length | ++\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+ +/ / +\e Content of HelloMessage \e +/ / ++\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+ + +HelloMessage Structure: + + 0 1 2 3 + 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 ++\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+ +/ / +\e Device Name (length + padded data) \e +/ / ++\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+ +/ / +\e Client Name (length + padded data) \e +/ / ++\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+ +/ / +\e Client Version (length + padded data) \e +/ / ++\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+ +.ft P +.fi +.UNINDENT +.UNINDENT +.SS Fields (HelloMessage) +.sp +The \fBDevice Name\fP is a human readable (configured or auto detected) device +name or host name, for the remote device. +.sp +The \fBClient Name\fP and \fBClient Version\fP identifies the implementation. The +values SHOULD be simple strings identifying the implementation name, as a +user would expect to see it, and the version string in the same manner. An +example Client Name is "syncthing" and an example Client Version is "v0.7.2". +The Client Version field SHOULD follow the patterns laid out in the \fI\%Semantic +Versioning\fP <\fBhttp://semver.org/\fP> standard. +.SS XDR +.INDENT 0.0 +.INDENT 3.5 +.sp +.nf +.ft C +struct HelloMessage { + string DeviceName<64>; + string ClientName<64>; + string ClientVersion<64>; +}; +.ft P +.fi +.UNINDENT +.UNINDENT +.sp +Immediately after exchanging Hello messages, the connection should be +dropped if device does not pass authentication. +.SH POST-AUTHENTICATION MESSAGES .sp Every message starts with one 32 bit word indicating the message version, type and ID, followed by the length of the message. The header is in network byte @@ -199,24 +282,6 @@ ClusterConfigMessage Structure: 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 +\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+ -| Length of Device Name | -+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+ -/ / -\e Device Name (variable length) \e -/ / -+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+ -| Length of Client Name | -+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+ -/ / -\e Client Name (variable length) \e -/ / -+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+ -| Length of Client Version | -+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+ -/ / -\e Client Version (variable length) \e -/ / -+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+ | Number of Folders | +\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+ / / @@ -329,16 +394,6 @@ Option Structure: .UNINDENT .SS Fields (ClusterConfigMessage) .sp -The \fBDevice Name\fP is a human readable (configured or auto detected) device -name or host name, for the sending device. -.sp -The \fBClient Name\fP and \fBClient Version\fP identifies the implementation. The -values SHOULD be simple strings identifying the implementation name, as a -user would expect to see it, and the version string in the same manner. An -example Client Name is "syncthing" and an example Client Version is "v0.7.2". -The Client Version field SHOULD follow the patterns laid out in the \fI\%Semantic -Versioning\fP <\fBhttp://semver.org/\fP> standard. -.sp The \fBFolders\fP field contains the list of folders that will be synchronized over the current connection. .sp @@ -372,7 +427,7 @@ folder Flags field contains the following single bit flags: 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 +\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+ -| Reserved |D|P|R| +| Reserved |T|D|P|R| +\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+ .ft P .fi @@ -390,6 +445,15 @@ permissions for. .TP .B Bit 29 ("D", Ignore Deletes) is set for folders that the device will ignore deletes for. +.TP +.B Bit 28 ("T", Disable Temporary Indexes) +is set for folders that will not dispatch and do not wish to receive +progress updates about partially downloaded files via DownloadProgress +.INDENT 7.0 +.INDENT 3.5 +messages. +.UNINDENT +.UNINDENT .UNINDENT .sp The \fBOptions\fP field contains a list of options that apply to the folder. @@ -464,7 +528,7 @@ cluster introducers. .B Bits 16 through 28 are reserved and MUST be set to zero. .TP -.B Bits 14\-15 ("Pri) +.B Bits 14\-15 ("Pri", Priority) indicate the device\(aqs upload priority for this folder. Possible values are: .INDENT 7.0 @@ -499,9 +563,6 @@ The \fBOptions\fP field contains a list of options that apply to the device. .nf .ft C struct ClusterConfigMessage { - string DeviceName<64>; - string ClientName<64>; - string ClientVersion<64>; Folder Folders<1000000>; Option Options<64>; }; @@ -852,8 +913,35 @@ that the transmitted block matches the requested hash. The other device MAY reuse a block from a different file and offset having the same size and hash, if one exists. .sp -The Flags field is reserved for future use and MUST currently be set to -zero. The Options list is implementation defined and as described in the +The \fBFlags\fP field is made up of the following single bit flags: +.INDENT 0.0 +.INDENT 3.5 +.sp +.nf +.ft C + 0 1 2 3 + 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 ++\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+ +| Reserved |T| ++\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+ +.ft P +.fi +.UNINDENT +.UNINDENT +.INDENT 0.0 +.TP +.B Bit 31 ("T", Temporary) +is set to indicate that the read should be performed +from the temporary file (converting Name to it\(aqs temporary form) and falling +back to the non temporary file if any error occurs. Knowledge of content +.INDENT 7.0 +.INDENT 3.5 +inside temporary files comes from DownloadProgress messages. +.UNINDENT +.UNINDENT +.UNINDENT +.sp +The Options list is implementation defined and as described in the ClusterConfig message section. .SS XDR .INDENT 0.0 @@ -939,6 +1027,159 @@ struct ResponseMessage { .fi .UNINDENT .UNINDENT +.SS DownloadProgress (Type = 8) +.sp +The DownloadProgress message is used to notify remote devices about partial +availability of files. By default, these messages are sent every 5 seconds, +and only in the cases where progress or state changes have been detected. +Each DownloadProgress message is addressed to a specific folder and MUST +contain zero or more FileDownloadProgressUpdate structures. +.SS Graphical Representation +.INDENT 0.0 +.INDENT 3.5 +.sp +.nf +.ft C +DownloadProgressMessage Structure: + + 0 1 2 3 + 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 ++\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+ +/ / +\e Folder (length + padded data) \e +/ / ++\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+ +| Number of Updates | ++\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+ +/ / +\e Zero or more FileDownloadProgressUpdate Structures \e +/ / ++\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+ +| Flags | ++\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+ +| Number of Options | ++\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+ +/ / +\e Zero or more Option Structures \e +/ / ++\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+ + +FileDownloadProgressUpdate Structure: + + 0 1 2 3 + 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 ++\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+ +| Update Type | ++\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+ +/ / +\e Name (length + padded data) \e +/ / ++\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+ +/ / +\e Version Structure \e +/ / ++\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+ +| Number of Block Indexes | ++\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+ +/ / +| Block Indexes (n items) | +/ / ++\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+ +.ft P +.fi +.UNINDENT +.UNINDENT +.sp +Each +.SS Fields (DownloadProgress Message) +.sp +\fBFolder\fP represents the ID of the folder for which the update is being +provided. +.sp +The \fBFlags\fP field is reserved for future use and MUST currently be set to +zero. The \fBOptions\fP field contains a list of options that apply to the update. +.SS Fields (FileDownloadProgressUpdate Structure) +.sp +The \fBUpdate Type\fP field is made up of the following single bit flags: +.INDENT 0.0 +.INDENT 3.5 +.sp +.nf +.ft C + 0 1 2 3 + 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 ++\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+ +| Reserved |F| ++\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+\-+ +.ft P +.fi +.UNINDENT +.UNINDENT +.INDENT 0.0 +.TP +.B Bit 31 ("F", Forget) +is set to notify that the file that was previously +advertised is no longer available (at least as a temporary file). +.UNINDENT +.sp +The \fBName\fP field defines the file name from the global index for which this +update is being sent. +.sp +The \fBVersion\fP structure defines the version of the file for which this update +is being sent. +.sp +\fBBlock Indexes\fP is a list of positive integers, where each integer represents +the index of the block in the FileInfo structure Blocks array that has become +available for download. +For example an integer with with value 3 represents that the data defined in the +fourth BlockInfo structure of the FileInfo structure of that file is now available. +Please note that matching should be done on \fBName\fP AND \fBVersion\fP\&. +Furthermore, each update received is incremental, for example the initial update +structure might contain indexes 0, 1, 2, an update 5 seconds later might contain +indexes 3, 4, 5 which should be appended to the original list, which implies +that blocks 0\-5 are currently available. +.sp +Block indexes MAY be added in any order. +An implementation MUST NOT assume that block indexes are added in any specific +order. +.sp +\fBForget\fP bit being set implies that the file that was previously advertised +is no longer available, therefore the list of block indexes should be truncated. +.sp +Messages with \fBForget\fP bit set MUST NOT have any block indexes. +.sp +Any update message which is being sent for a different \fBVersion\fP of the same +file name must be preceeded with an update message for the old version of that +file with the \fBForget\fP bit set. +.sp +As a safeguard on the receiving side, value of \fBVersion\fP changing between +update messages implies that the file has changed, and that any indexes +previously advertised are no longer available. The list of available block +indexes MUST be replaced (rather than appended) with the indexes specified in +this message. +.SS XDR +.INDENT 0.0 +.INDENT 3.5 +.sp +.nf +.ft C +struct DownloadProgressMessage { + string Folder<64>; + FileDownloadProgressUpdate Updates<1000000>; + unsigned int Flags; + Option Options<64>; +} + +struct FileDownloadProgressUpdate { + unsigned int UpdateType; + string Name<8192>; + Vector Version; + int BlockIndexes<1000000>; +} +.ft P +.fi +.UNINDENT +.UNINDENT .SS Ping (Type = 4) .sp The Ping message is used to determine that a connection is alive, and to keep @@ -1224,6 +1465,50 @@ T} T{ 1024 bytes T} _ +T{ +\fBDownload Progress Messages\fP +T} +_ +T{ +.nf + +.fi +T} T{ +Folder +T} T{ +64 bytes +T} +_ +T{ +.nf + +.fi +T} T{ +Number of Updates +T} T{ +1.000.000 +T} +_ +T{ +.nf + +.fi +T} T{ +Name +T} T{ +8192 bytes +T} +_ +T{ +.nf + +.fi +T} T{ +Number of Indexes +T} T{ +1.000.000 +T} +_ .TE .sp The currently defined values allow maximum file size of 1220 GiB diff --git a/man/syncthing-config.5 b/man/syncthing-config.5 index bbaf3097f..abe7071e6 100644 --- a/man/syncthing-config.5 +++ b/man/syncthing-config.5 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-CONFIG" "5" "April 14, 2016" "v0.12" "Syncthing" +.TH "SYNCTHING-CONFIG" "5" "May 01, 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 c74f38078..35045c30f 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" "April 14, 2016" "v0.12" "Syncthing" +.TH "SYNCTHING-DEVICE-IDS" "7" "May 01, 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 301ed27fb..3c0f4b208 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" "April 14, 2016" "v0.12" "Syncthing" +.TH "SYNCTHING-EVENT-API" "7" "May 01, 2016" "v0.12" "Syncthing" .SH NAME syncthing-event-api \- Event API . diff --git a/man/syncthing-faq.7 b/man/syncthing-faq.7 index ca9a0ef97..21f031bc7 100644 --- a/man/syncthing-faq.7 +++ b/man/syncthing-faq.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-FAQ" "7" "April 14, 2016" "v0.12" "Syncthing" +.TH "SYNCTHING-FAQ" "7" "May 01, 2016" "v0.12" "Syncthing" .SH NAME syncthing-faq \- Frequently Asked Questions . @@ -116,6 +116,54 @@ Temporary files are used to store partial data downloaded from other devices. They are automatically removed whenever a file transfer has been completed or after the configured amount of time which is set in the configuration file (24 hours by default). +.SS Why is the sync so slow? +.sp +When troubleshooting a slow sync, there are a number of things to check. +.sp +First of all, verify that you are not connected via a relay. In the "Remove +Devices" list on the right side of the GUI, double check that you see +"Address: " and \fInot\fP "Relay: ". +[image] +.sp +If you are connected via a relay, this is because a direct connection could +not be established. Double check and follow the suggestions in +firewall\-setup to enable direct connections. +.sp +Second, if one of the devices is a very low powered machine (a Raspberry Pi, +or a phone, or a NAS, or similar) you are likely constrained by the CPU on +that device. See the next question for reasons Syncthing likes a faster CPU. +You can verify this by looking at the CPU utilization in the GUI. If it is +constantly at or close to 100%, you are limited by the CPU speed. In some +cases a lower CPU usage number can also indicate being limited by the CPU \- +for example constant 25% usage on a four core CPU likely means that +Syncthing is doing something that is not parallellizable and thus limited to +a single CPU core. +.sp +Third, verify that the network connection is OK. Tools such as iperf or just +an Internet speed test can be used to verify the performance here. +.SS Why does it use so much CPU? +.INDENT 0.0 +.IP 1. 3 +When new or changed files are detected, or Syncthing starts for the +first time, your files are hashed using SHA\-256. +.IP 2. 3 +Data that is sent over the network is (optionally) compressed and +encrypted using AES\-128. When receiving data, it must be decrypted. +.IP 3. 3 +There is a certain amount of housekeeping that must be done to track the +current and available versions of each file in the index database. +.UNINDENT +.sp +Hashing, compression and encryption cost CPU time. Also, using the GUI +causes a certain amount of extra CPU usage to calculate the summary data it +presents. Note however that once things are \fIin sync\fP CPU usage should be +negligible. +.sp +To limit the amount of CPU used when syncing and scanning, set the +environment variable \fBGOMAXPROCS\fP to the maximum number of CPU cores +Syncthing should use at any given moment. For example, \fBGOMAXPROCS=2\fP on a +machine with four cores will limit Syncthing to no more than half the +system\(aqs CPU power. .SS Should I keep my device IDs secret? .sp No. The IDs are not sensitive. Given a device ID it\(aqs possible to find the IP @@ -155,55 +203,50 @@ causes a conflict on change you\(aqll end up with \fBsync\-conflict\-...sync\-co .SS How to configure multiple users on a single machine? .sp Each user should run their own Syncthing instance. Be aware that you might need -to configure ports such that they do not overlap (see the config.xml). +to configure listening ports such that they do not overlap (see config). .SS Does Syncthing support syncing between folders on the same system? .sp -Syncthing is not designed to sync locally and the overhead involved in doing so will waste resources. There are better programs to achieve this such as rsync or Unison. +No. Syncthing is not designed to sync locally and the overhead involved in +doing so using Syncthing\(aqs method would be wasteful. There are better +programs to achieve this such as rsync or Unison. .SS Is Syncthing my ideal backup application? .sp -No, Syncthing is not a backup application because all changes to your files -(modification, deletion, etc) will be propagated to all your devices. You can -enable versioning, but we encourage the use of other tools to keep your data -safe from your (or our) mistakes. +No. Syncthing is not a great backup application because all changes to your +files (modifications, deletions, etc) will be propagated to all your +devices. You can enable versioning, but we encourage the use of other tools +to keep your data safe from your (or our) mistakes. .SS Why is there no iOS client? .sp -An alternative implementation of Syncthing (using the Syncthing protocol) is being -developed at this point in time to enable iOS support. Additionally, it seems -that the next version of Go will support the darwin\-arm architecture such that -we can compile the mainstream code for the iOS platform. -.SS Why does it use so much CPU? -.INDENT 0.0 -.IP 1. 3 -When new or changed files are detected, or Syncthing starts for the -first time, your files are hashed using SHA\-256. -.IP 2. 3 -Data that is sent over the network is first compressed and then -encrypted using AES\-128. When receiving data, it must be decrypted -and decompressed. -.UNINDENT -.sp -Hashing, compression and encryption cost CPU time. Also, using the GUI causes a -certain amount of CPU usage. Note however that once things are \fIin sync\fP CPU -usage should be negligible. +There is an alternative implementation of Syncthing (using the same network +protocol) called \fBfsync()\fP\&. There are no plans by the current Syncthing +team to support iOS in the foreseeable future, as the code required to do so +would be quite different from what Syncthing is today. .SS How can I exclude files with brackets (\fB[]\fP) in the name? .sp -The patterns in .stignore are glob patterns, where brackets are used to denote -character ranges. That is, the pattern \fBq[abc]x\fP will match the files \fBqax\fP, -\fBqbx\fP and \fBqcx\fP\&. +The patterns in .stignore are glob patterns, where brackets are used to +denote character ranges. That is, the pattern \fBq[abc]x\fP will match the +files \fBqax\fP, \fBqbx\fP and \fBqcx\fP\&. .sp -To match an actual file \fIcalled\fP \fBq[abc]x\fP the pattern needs to "escape" the -brackets, like so: \fBq\e[abc\e]x\fP\&. +To match an actual file \fIcalled\fP \fBq[abc]x\fP the pattern needs to "escape" +the brackets, like so: \fBq\e[abc\e]x\fP\&. +.sp +On Windows, escaping special characters is not supported as the \fB\e\fP +character is used as a path separator. On the other hand, special characters +such as \fB[\fP and \fB?\fP are not allowed in file names on Windows. .SS Why is the setup more complicated than BTSync? .sp -Security over convenience. In Syncthing you have to setup both sides to connect -two nodes. An attacker can\(aqt do much with a stolen node ID, because you have to -add the node on the other side too. You have better control where your files are -transferred. +Security over convenience. In Syncthing you have to setup both sides to +connect two nodes. An attacker can\(aqt do much with a stolen node ID, because +you have to add the node on the other side too. You have better control +where your files are transferred. +.sp +This is an area that we are working to improve in the long term. .SS How do I access the web GUI from another computer? .sp -The default listening address is 127.0.0.1:8384, so you can only access the GUI -from the same machine. Change the \fBGUI listen address\fP through the web UI from -\fB127.0.0.1:8384\fP to \fB0.0.0.0:8384\fP or change the config.xml: +The default listening address is 127.0.0.1:8384, so you can only access the +GUI from the same machine. This is for security reasons. Change the \fBGUI +listen address\fP through the web UI from \fB127.0.0.1:8384\fP to +\fB0.0.0.0:8384\fP or change the config.xml: .INDENT 0.0 .INDENT 3.5 .sp @@ -229,11 +272,12 @@ to .UNINDENT .UNINDENT .sp -Then the GUI is accessible from everywhere. You should most likely set a -password and enable HTTPS now. You can do this from inside the GUI. +Then the GUI is accessible from everywhere. You should set a password and +enable HTTPS with this configuration. You can do this from inside the GUI. .sp -If both your computers are Unixy (Linux, Mac, etc) You can also leave the GUI -settings at default and use an ssh port forward to access it. For example, +If both your computers are Unixy (Linux, Mac, etc) You can also leave the +GUI settings at default and use an ssh port forward to access it. For +example, .INDENT 0.0 .INDENT 3.5 .sp @@ -245,48 +289,48 @@ $ ssh \-L 9090:127.0.0.1:8384 user@othercomputer.example.com .UNINDENT .UNINDENT .sp -will log you into othercomputer.example.com, and present the \fIremote\fP Syncthing -GUI on \fI\%http://localhost:9090\fP on your \fIlocal\fP computer. You should not open more -than one Syncthing GUI in a single browser due to conflicting X\-CSRFTokens. Any -modification will be rejected. See \fI\%issue #720\fP <\fBhttps://github.com/syncthing/syncthing/issues/720\fP> to work around this limitation. -.sp -The CSRF tokens are stored using cookies. Therefore, if you get the message -\fBSyncthing seems to be experiencing a problem processing your request\fP, you -should verify the cookie settings of your browser. +will log you into othercomputer.example.com, and present the \fIremote\fP +Syncthing GUI on \fI\%http://localhost:9090\fP on your \fIlocal\fP computer. .SS Why do I see Syncthing twice in task manager? .sp -One process manages the other, to capture logs and manage restarts. This makes -it easier to handle upgrades from within Syncthing itself, and also ensures that -we get a nice log file to help us narrow down the cause for crashes and other -bugs. +One process manages the other, to capture logs and manage restarts. This +makes it easier to handle upgrades from within Syncthing itself, and also +ensures that we get a nice log file to help us narrow down the cause for +crashes and other bugs. .SS Where do Syncthing logs go to? .sp Syncthing logs to stdout by default. On Windows Syncthing by default also -creates \fBsyncthing.log\fP in Syncthing\(aqs home directory (check \fB\-help\fP to see -where that is). Command line option \fB\-logfile\fP can be used to specify a user\-defined logfile. +creates \fBsyncthing.log\fP in Syncthing\(aqs home directory (run \fBsyncthing +\-paths\fP to see where that is). Command line option \fB\-logfile\fP can be used +to specify a user\-defined logfile. .SS How do I upgrade Syncthing? +.sp +If you use a package manager such as Debian\(aqs apt\-get, you should upgrade +using the package manager. If you use the binary packages linked from +Syncthing.net, you can use Syncthing built in automatic upgrades. .INDENT 0.0 .IP \(bu 2 If automatic upgrades is enabled (which is the default), Syncthing will upgrade itself automatically within 24 hours of a new release. .IP \(bu 2 -The upgrade button appears in the web GUI when a new version has been released. -Pressing it will perform an upgrade. +The upgrade button appears in the web GUI when a new version has been +released. Pressing it will perform an upgrade. .IP \(bu 2 To force an upgrade from the command line, run \fBsyncthing \-upgrade\fP\&. .UNINDENT .sp -Note that your system should have CA certificates installed which allow a secure -connection to GitHub (e.g. FreeBSD requires \fBsudo pkg install ca_root_nss\fP). -If \fBcurl\fP or \fBwget\fP works with normal HTTPS sites, then so should Syncthing. +Note that your system should have CA certificates installed which allow a +secure connection to GitHub (e.g. FreeBSD requires \fBsudo pkg install +ca_root_nss\fP). If \fBcurl\fP or \fBwget\fP works with normal HTTPS sites, then +so should Syncthing. .SS Where do I find the latest release? .sp -We release new versions through GitHub. The latest release is always found \fI\%on -the release page\fP <\fBhttps://github.com/syncthing/syncthing/releases/latest\fP>\&. -Unfortunately GitHub does not provide a single URL to automatically download the -latest version. We suggest to use the GitHub API at -\fI\%https://api.github.com/repos/syncthing/syncthing/releases/latest\fP and parsing the -JSON response. +We release new versions through GitHub. The latest release is always found +\fI\%on the release page\fP <\fBhttps://github.com/syncthing/syncthing/releases/latest\fP>\&. Unfortunately +GitHub does not provide a single URL to automatically download the latest +version. We suggest to use the GitHub API at +\fI\%https://api.github.com/repos/syncthing/syncthing/releases/latest\fP and parsing +the JSON response. .SH AUTHOR The Syncthing Authors .SH COPYRIGHT diff --git a/man/syncthing-globaldisco.7 b/man/syncthing-globaldisco.7 index 5b3a04de8..4a2d680d2 100644 --- a/man/syncthing-globaldisco.7 +++ b/man/syncthing-globaldisco.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-GLOBALDISCO" "7" "April 14, 2016" "v0.12" "Syncthing" +.TH "SYNCTHING-GLOBALDISCO" "7" "May 01, 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 6913347b4..c8975fb3a 100644 --- a/man/syncthing-localdisco.7 +++ b/man/syncthing-localdisco.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-LOCALDISCO" "7" "April 14, 2016" "v0.12" "Syncthing" +.TH "SYNCTHING-LOCALDISCO" "7" "May 01, 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 b8d89cd2e..b76d92da0 100644 --- a/man/syncthing-networking.7 +++ b/man/syncthing-networking.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-NETWORKING" "7" "April 14, 2016" "v0.12" "Syncthing" +.TH "SYNCTHING-NETWORKING" "7" "May 01, 2016" "v0.12" "Syncthing" .SH NAME syncthing-networking \- Firewall Setup . @@ -95,6 +95,9 @@ ssh \-L 9999:localhost:8384 machine This will bind to your local port 9999 and forward all connections from there to port 8384 on the target machine. This still works even if Syncthing is bound to listen on localhost only. +.SH VIA A PROXY +.sp +Syncthing can use a SOCKS5 proxy for outbound connections. Please see proxying\&. .SH AUTHOR The Syncthing Authors .SH COPYRIGHT diff --git a/man/syncthing-relay.7 b/man/syncthing-relay.7 index 33c9ecef2..ee8dad349 100644 --- a/man/syncthing-relay.7 +++ b/man/syncthing-relay.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-RELAY" "7" "April 14, 2016" "v0.12" "Syncthing" +.TH "SYNCTHING-RELAY" "7" "May 01, 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 f9839e5a1..0469e35c5 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" "April 14, 2016" "v0.12" "Syncthing" +.TH "SYNCTHING-REST-API" "7" "May 01, 2016" "v0.12" "Syncthing" .SH NAME syncthing-rest-api \- REST API . diff --git a/man/syncthing-security.7 b/man/syncthing-security.7 index a6122c576..944b9fd01 100644 --- a/man/syncthing-security.7 +++ b/man/syncthing-security.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-SECURITY" "7" "April 14, 2016" "v0.12" "Syncthing" +.TH "SYNCTHING-SECURITY" "7" "May 01, 2016" "v0.12" "Syncthing" .SH NAME syncthing-security \- Security Principles . diff --git a/man/syncthing-stignore.5 b/man/syncthing-stignore.5 index a7581bfba..d0d22424e 100644 --- a/man/syncthing-stignore.5 +++ b/man/syncthing-stignore.5 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-STIGNORE" "5" "April 14, 2016" "v0.12" "Syncthing" +.TH "SYNCTHING-STIGNORE" "5" "May 01, 2016" "v0.12" "Syncthing" .SH NAME syncthing-stignore \- Prevent files from being synchronized to other nodes . @@ -49,6 +49,14 @@ If some files should not be synchronized to other nodes, a file called \fB\&.stignore\fP file itself will never be synced to other nodes, although it can \fB#include\fP files that \fIare\fP synchronized between nodes. All patterns are relative to the repository root. +.sp +\fBNOTE:\fP +.INDENT 0.0 +.INDENT 3.5 +Note that ignored files can block removal of an otherwise empty directory. +See below for the (?d) prefix to allow deletion of ignored files. +.UNINDENT +.UNINDENT .SH PATTERNS .sp The \fB\&.stignore\fP file contains a list of file or path patterns. The @@ -83,25 +91,34 @@ patterns from a file in a subdirectory, the patterns themselves are still relative to the repository \fIroot\fP\&. Example: \fB#include more\-patterns.txt\fP\&. .IP \(bu 2 -A pattern beginning with \fB!\fP negates the pattern: matching files +A pattern beginning with a \fB!\fP prefix negates the pattern: matching files are \fIincluded\fP (that is, \fInot\fP ignored). This can be used to override more general patterns that follow. Note that files in ignored directories can not be re\-included this way. This is due to the fact that Syncthing stops scanning when it reaches an ignored directory, so doesn\(aqt know what files it might contain. .IP \(bu 2 -A pattern beginning with \fB(?i)\fP enables case\-insensitive pattern +A pattern beginning with a \fB(?i)\fP prefix enables case\-insensitive pattern matching. \fB(?i)test\fP matches \fBtest\fP, \fBTEST\fP and \fBtEsT\fP\&. The \fB(?i)\fP prefix can be combined with other patterns, for example the pattern \fB(?i)!picture*.png\fP indicates that \fBPicture1.PNG\fP should -be synchronized. Note that case\-insensitive patterns must start with -\fB(?i)\fP when combined with other flags. On Mac OS and Windows, -patterns are always case\-insensitive. +be synchronized. On Mac OS and Windows, patterns are always case\-insensitive. +.IP \(bu 2 +A pattern beginning with a \fB(?d)\fP prefix enables removal of these files if +they are preventing directory deletion. This prefix should be used by any OS +generated files which you are happy to be removed. .IP \(bu 2 A line beginning with \fB//\fP is a comment and has no effect. .IP \(bu 2 Windows does not support escaping \fB\e[foo \- bar\e]\fP\&. .UNINDENT +.sp +\fBNOTE:\fP +.INDENT 0.0 +.INDENT 3.5 +Prefixes can be specified in any order. +.UNINDENT +.UNINDENT .SH EXAMPLE .sp Given a directory layout: diff --git a/man/syncthing-versioning.7 b/man/syncthing-versioning.7 index 1eb799633..7f7a623e1 100644 --- a/man/syncthing-versioning.7 +++ b/man/syncthing-versioning.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "TODO" "7" "April 14, 2016" "v0.12" "Syncthing" +.TH "TODO" "7" "May 01, 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 69ce32331..a07ab4137 100644 --- a/man/syncthing.1 +++ b/man/syncthing.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING" "1" "April 14, 2016" "v0.12" "Syncthing" +.TH "SYNCTHING" "1" "May 01, 2016" "v0.12" "Syncthing" .SH NAME syncthing \- Syncthing .