diff --git a/gui/default/assets/lang/lang-de.json b/gui/default/assets/lang/lang-de.json index bf25f5b7a..db52f23b5 100644 --- a/gui/default/assets/lang/lang-de.json +++ b/gui/default/assets/lang/lang-de.json @@ -7,9 +7,9 @@ "Actions": "Aktionen", "Add": "Hinzufügen", "Add Device": "Gerät hinzufügen", - "Add Folder": "Verzeichnis hinzufügen", + "Add Folder": "Ordner hinzufügen", "Add Remote Device": "Fern-Gerät hinzufügen", - "Add new folder?": "Neues Verzeichnis hinzufügen?", + "Add new folder?": "Neuen Ordner hinzufügen?", "Address": "Adresse", "Addresses": "Adressen", "Advanced": "Erweitert", @@ -18,7 +18,7 @@ "All Data": "Alle Daten", "Allow Anonymous Usage Reporting?": "Übertragung von anonymen Nutzungsberichten erlauben?", "Alphabetic": "Alphabetisch", - "An external command handles the versioning. It has to remove the file from the synced folder.": "Ein externer Programmaufruf handhabt die Versionierung. Es muss die Datei aus dem zu synchronisierendem Verzeichnis entfernen.", + "An external command handles the versioning. It has to remove the file from the synced folder.": "Ein externer Programmaufruf handhabt die Versionierung. Es muss die Datei aus dem zu synchronisierendem Ordner entfernen.", "Anonymous Usage Reporting": "Anonymer Nutzungsbericht", "Any devices configured on an introducer device will be added to this device as well.": "Alle Geräte, die beim Verteiler eingetragen sind, werden auch bei diesem Gerät eingetragen", "Automatic upgrades": "Automatische Updates aktivieren", @@ -52,8 +52,8 @@ "Downloaded": "Heruntergeladen", "Downloading": "Lädt herunter", "Edit": "Bearbeiten", - "Edit Device": "Edit Device", - "Edit Folder": "Edit Folder", + "Edit Device": "Gerät bearbeiten", + "Edit Folder": "Ordner bearbeiten", "Editing": "Bearbeitet", "Enable NAT traversal": "NAT-Durchdringung aktivieren", "Enable Relaying": "Weiterleitung aktivieren", @@ -65,15 +65,15 @@ "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 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 moved to .stversions folder when replaced or deleted by Syncthing.": "Wenn Syncthing Dateien ersetzt oder löscht, werden sie in den Ordner .stversions 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 den Ordner .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", - "Folder ID": "Verzeichniskennung", - "Folder Label": "Verzeichnisbezeichnung", - "Folder Path": "Verzeichnispfad", - "Folder Type": "Verzeichnistyp", - "Folders": "Verzeichnisse", + "Folder": "Ordner", + "Folder ID": "Ordnerkennung", + "Folder Label": "Ordnerbezeichnung", + "Folder Path": "Ordnerpfad", + "Folder Type": "Ordnertyp", + "Folders": "Ordner", "GUI": "GUI", "GUI Authentication Password": "Passwort für Zugang zur Benutzeroberfläche", "GUI Authentication User": "Nutzername für Zugang zur Benutzeroberfläche", @@ -88,7 +88,7 @@ "Ignore Patterns": "Ignoriermuster", "Ignore Permissions": "Berechtigungen ignorieren", "Incoming Rate Limit (KiB/s)": "Limit Datenrate (eingehend) (KB/s)", - "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Eine falsche Konfiguration kann den Verzeichnisinhalt beschädigen und Syncthing in einen unausführbaren Zustand versetzen.", + "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Eine falsche Konfiguration kann den Ordnerinhalt beschädigen und Syncthing in einen unausführbaren Zustand versetzen.", "Introducer": "Verteilergerät", "Inversion of the given condition (i.e. do not exclude)": "Umkehrung der angegebenen Bedingung (z.B. schließe nicht aus)", "Keep Versions": "Versionen erhalten", @@ -108,10 +108,10 @@ "Metadata Only": "Nur Metadaten", "Minimum Free Disk Space": "Minimal freier Festplattenspeicher", "Move to top of queue": "An den Anfang der Warteschlange setzen", - "Multi level wildcard (matches multiple directory levels)": "Verschachteltes Maskenzeichen (wird für verschachtelte Verzeichnisse verwendet)", + "Multi level wildcard (matches multiple directory levels)": "Verschachteltes Maskenzeichen (wird für verschachtelte Ordner verwendet)", "Never": "Nie", "New Device": "Neues Gerät", - "New Folder": "Neues Verzeichnis", + "New Folder": "Neuer Ordner", "Newest First": "Neueste zuerst", "No": "Nein", "No File Versioning": "Keine Dateiversionierung", @@ -120,14 +120,14 @@ "OK": "OK", "Off": "Aus", "Oldest First": "Älteste zuerst", - "Optional descriptive label for the folder. Can be different on each device.": "Optionale beschreibende Bezeichnung des Verzeichnisses. Kann auf jedem Gerät unterschiedlich sein.", + "Optional descriptive label for the folder. Can be different on each device.": "Optionale beschreibende Bezeichnung des Ordners. Kann auf jedem Gerät unterschiedlich sein.", "Options": "Optionen", "Out of Sync": "Nicht synchronisiert", "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. 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).", + "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 Ordner auf dem lokalen Gerät. Ordner wird erzeugt, wenn er 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 der Ordner .stversions im Ordner verwendet).", "Pause": "Pause", "Paused": "Pausiert", "Please consult the release notes before performing a major upgrade.": "Bitte lesen Sie die Veröffentlichungsnotizen bevor Sie eine neue Hauptversion installieren.", @@ -142,7 +142,7 @@ "Release Notes": "Veröffentlichungsnotizen", "Remote Devices": "Fern-Geräte", "Remove": "Entfernen", - "Required identifier for the folder. Must be the same on all cluster devices.": "Erforderlicher Bezeichner für das Verzeichnis. Muss auf allen Verbund-Geräten gleich sein.", + "Required identifier for the folder. Must be the same on all cluster devices.": "Erforderlicher Bezeichner für den Ordner. Muss auf allen Verbund-Geräten gleich sein.", "Rescan": "Neu scannen", "Rescan All": "Alle neu scannen", "Rescan Interval": "Scanintervall", @@ -154,16 +154,16 @@ "Save": "Speichern", "Scan Time Remaining": "Zeit für Scan verbleibend", "Scanning": "Scannen", - "Select the devices to share this folder with.": "Wähle die Geräte aus, mit denen Du dieses Verzeichnis teilen willst.", - "Select the folders to share with this device.": "Wähle die Verzeichnisse aus, die du mit diesem Gerät teilen möchtest", + "Select the devices to share this folder with.": "Wähle die Geräte aus, mit denen Du diesen Ordner teilen willst.", + "Select the folders to share with this device.": "Wähle die Ordner aus, die Du mit diesem Gerät teilen möchtest", "Send & Receive": "Senden & empfangen", "Send Only": "Nur senden", "Settings": "Einstellungen", "Share": "Teilen", - "Share Folder": "Teile Verzeichnis", - "Share Folders With Device": "Teile Verzeichnisse mit diesem Gerät", + "Share Folder": "Ordner teilen", + "Share Folders With Device": "Ordner mit diesem Gerät teilen", "Share With Devices": "Teile mit diesen Geräten", - "Share this folder?": "Dieses Verzeichnis teilen?", + "Share this folder?": "Diesen Ordner teilen?", "Shared With": "Geteilt mit", "Show ID": "Kennung anzeigen", "Show QR": "Zeige QR Code", @@ -172,7 +172,7 @@ "Shutdown": "Herunterfahren", "Shutdown Complete": "Vollständig Heruntergefahren", "Simple File Versioning": "Einfache Dateiversionierung", - "Single level wildcard (matches within a directory only)": "Einzelnes Maskenzeichen (wird für ein einzelnes Verzeichnis verwendet)", + "Single level wildcard (matches within a directory only)": "Einzelnes Maskenzeichen (wird für einen einzelnen Ordner verwendet)", "Smallest First": "Kleinstes zuerst", "Source Code": "Quellcode", "Staggered File Versioning": "Stufenweise Dateiversionierung", @@ -193,12 +193,12 @@ "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Die Konfiguration wurde gespeichert, aber noch nicht aktiviert. Syncthing muss neugestartet werden, um die neue Konfiguration zu übernehmen.", "The device ID cannot be blank.": "Die Gerätekennung darf nicht leer sein.", "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).": "Die hier einzutragende Gerätekennung kann im Dialog \"Aktionen > Kennung anzeigen\" auf dem anderen Gerät gefunden werden. Leerzeichen und Bindestriche sind optional (werden ignoriert).", - "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.": "Der verschlüsselte Nutzungsbericht wird täglich gesendet. Er wird verwendet, um Statistiken über verwendete Betriebssysteme, Verzeichnis-Größen und Programm-Versionen zu erstellen. Sollte der Bericht in Zukunft weitere Daten erfassen, wird dieses Fenster erneut angezeigt.", + "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.": "Der verschlüsselte Nutzungsbericht wird täglich gesendet. Er wird verwendet, um Statistiken über verwendete Betriebssysteme, Ordnergrößen und Programmversionen zu erstellen. Sollte der Bericht in Zukunft weitere Daten erfassen, wird dieses Fenster erneut angezeigt.", "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.": "Die eingegebene Gerätekennung scheint nicht gültig zu sein. Es sollte eine 52 oder 56 stellige Zeichenkette aus Buchstaben und Nummern sein. Leerzeichen und Bindestriche sind optional.", - "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "Der erste Kommandozeilenparameter ist der Verzeichnis-Pfad und der zweite Parameter ist der relative Pfad in diesem Verzeichnis.", - "The folder ID cannot be blank.": "Die Verzeichniskennung darf nicht leer sein.", - "The folder ID must be unique.": "Die Verzeichniskennung muss eindeutig sein.", - "The folder path cannot be blank.": "Der Verzeichnispfad darf nicht leer sein.", + "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "Der erste Kommandozeilenparameter ist der Ordnerpfad und der zweite Parameter ist der relative Pfad in diesem Ordner.", + "The folder ID cannot be blank.": "Die Ordnerkennung darf nicht leer sein.", + "The folder ID must be unique.": "Die Ordnerkennung muss eindeutig sein.", + "The folder path cannot be blank.": "Der Ordnerpfad darf nicht leer sein.", "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "Es wird in folgenden Abständen versioniert: In der ersten Stunde wird alle 30 Sekunden eine Version behalten, am ersten Tag eine jede Stunde, in den ersten 30 Tagen eine jeden Tag. Danach wird bis zum angegebenen Höchstalter eine Version pro Woche behalten.", "The following items could not be synchronized.": "Die folgenden Objekte konnten nicht synchronisiert werden.", "The maximum age must be a number and cannot be blank.": "Das Höchstalter muss angegeben werden und eine Zahl sein.", @@ -230,16 +230,16 @@ "Version": "Version", "Versions Path": "Versionierungspfad", "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Alte Dateiversionen werden automatisch gelöscht, wenn sie älter als das angegebene Höchstalter sind oder die angegebene Höchstzahl an Dateien erreicht ist.", - "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Warnung, dieser Pfad ist ein Unterverzeichnis des existierenden Verzeichnisses \"{{otherFolder}}\".", + "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Warnung, dieser Pfad ist ein Unterordner des existierenden Ordners \"{{otherFolder}}\".", "When adding a new device, keep in mind that this device must be added on the other side too.": "Beachte beim Hinzufügen eines neuen Gerätes, dass dieses Gerät auch auf den anderen Geräten hinzugefügt werden muss.", - "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.": "Beachte bitte beim Hinzufügen eines neuen Verzeichnisses, dass die Verzeichniskennung dazu verwendet wird, Verzeichnisse zwischen Geräten zu verbinden. Die Kennung muss also auf allen Geräten gleich sein, die Groß- und Kleinschreibung muss dabei beachtet werden.", + "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.": "Beachte bitte beim Hinzufügen eines neuen Ordners, dass die Ordnerkennung dazu verwendet wird, Ordner zwischen Geräten zu verbinden. Die Kennung muss also auf allen Geräten gleich sein, die Groß- und Kleinschreibung muss dabei beachtet werden.", "Yes": "Ja", "You must keep at least one version.": "Du musst mindestens eine Version behalten.", "days": "Tage", - "directories": "Verzeichnisse", + "directories": "Ordner", "files": "Dateien", "full documentation": "Komplette Dokumentation", "items": "Objekte", - "{%device%} wants to share folder \"{%folder%}\".": "{{device}} möchte das Verzeichnis \"{{folder}}\" teilen.", - "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} möchte das Verzeichnis \"{{folderlabel}}\" ({{folder}}) teilen." + "{%device%} wants to share folder \"{%folder%}\".": "{{device}} möchte den Ordner \"{{folder}}\" teilen.", + "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} möchte den Ordner \"{{folderlabel}}\" ({{folder}}) teilen." } \ 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 d1b580baf..0f16392f8 100644 --- a/gui/default/assets/lang/lang-sv.json +++ b/gui/default/assets/lang/lang-sv.json @@ -97,7 +97,7 @@ "Last Scan": "Senaste skanning", "Last seen": "Senast sedd", "Later": "Senare", - "Latest Change": "Senast ändrad", + "Latest Change": "Senaste ändring", "Listeners": "Lyssnare", "Local Discovery": "Lokal annonsering", "Local State": "Lokal status", diff --git a/gui/default/assets/lang/lang-tr.json b/gui/default/assets/lang/lang-tr.json index 0754ec9b5..d04b039c6 100644 --- a/gui/default/assets/lang/lang-tr.json +++ b/gui/default/assets/lang/lang-tr.json @@ -31,7 +31,7 @@ "Command": "Komut", "Comment, when used at the start of a line": "Satır başında kullanıldığında açıklama özelliği taşır", "Compression": "Sıkıştırma", - "Configured": "Configured", + "Configured": "Yapılandırıldı", "Connection Error": "Bağlantı hatası", "Connection Type": "Bağlantı Türü", "Copied from elsewhere": "Başka bir yerden kopyalanmış", @@ -52,8 +52,8 @@ "Downloaded": "İndirilmiş", "Downloading": "İndiriliyor", "Edit": "Düzenle", - "Edit Device": "Edit Device", - "Edit Folder": "Edit Folder", + "Edit Device": "Aygıtı Düzenle", + "Edit Folder": "Klasörü Düzenle", "Editing": "Düzenleniyor", "Enable NAT traversal": "Enable NAT traversal", "Enable Relaying": "Enable Relaying", @@ -97,7 +97,7 @@ "Last Scan": "Son Tarama", "Last seen": "Son görülme", "Later": "Sonra", - "Latest Change": "Latest Change", + "Latest Change": "Son Değişim", "Listeners": "Dinleyiciler", "Local Discovery": "Yerel Discovery", "Local State": "Yerel Durum", @@ -142,7 +142,7 @@ "Release Notes": "Sürüm Notları", "Remote Devices": "Uzak Aygıtlar", "Remove": "Kaldır", - "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.": "Klasör için tanımlayıcı gereklidir. Tüm küme cihazlarda aynı olmalıdır.", "Rescan": "Tekrar Tara", "Rescan All": "Tümünü Tekrar Tara", "Rescan Interval": "Tarama Aralığı", @@ -156,8 +156,8 @@ "Scanning": "Taranıyor", "Select the devices to share this folder with.": "Bu klasörü paylaşacağın aygıtları seç.", "Select the folders to share with this device.": "Bu aygıtla paylaşılacak klasörleri seç.", - "Send & Receive": "Send & Receive", - "Send Only": "Send Only", + "Send & Receive": "Gönder & Al", + "Send Only": "Yalnızca Gönder", "Settings": "Ayarlar", "Share": "Paylaş", "Share Folder": "Paylaşım Klasörü", @@ -189,7 +189,7 @@ "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing uygulaması çökmüş olabilir, veya internet bağlantınızda bir sorun var. Tekrar deniyor....", "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing isteminizi işleme alırken bir sorunla karşılaştı. Lütfen sayfanızı yenileyin veya sorun devam ediyorsa Syncthing'i yeniden başlatın.", "The Syncthing admin interface is configured to allow remote access without a password.": "Syncthing yönetici arayüzü parolasız olarak uzaktan erişime izin verilecek şekilde yapılandırıldı.", - "The aggregated statistics are publicly available at the URL below.": "The aggregated statistics are publicly available at the URL below.", + "The aggregated statistics are publicly available at the URL below.": "Toplanan istatistikler halka açık biçimde aşağıdaki adrestedir.", "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Yapılandırma kaydedildi ancak etkinleştirilmedi. Etkinleştirmek için Syncthing yeniden başlatılmalı.", "The device ID cannot be blank.": "Aygıt ID boş olamaz.", "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).": "Buraya girilecek olan aygıt ID'si diğer aygıtlarda, \"Eylemler > ID Göster\" penceresinde bulunabilir. Boşluklar ve çizgiler isteğe bağlıdır (yoksayılmış).", diff --git a/gui/default/syncthing/core/aboutModalView.html b/gui/default/syncthing/core/aboutModalView.html index 83cf636ca..c2b86f472 100644 --- a/gui/default/syncthing/core/aboutModalView.html +++ b/gui/default/syncthing/core/aboutModalView.html @@ -12,7 +12,7 @@

Copyright © 2014-2016 the following Contributors:

-Jakob Borg, Audrius Butkevicius, Alexander Graf, Anderson Mesquita, Antony Male, Ben Schulz, Caleb Callaway, Daniel Harte, Lars K.W. Gohlke, Lode Hoste, Michael Ploujnikov, Philippe Schommers, Ryan Sullivan, Sergey Mishin, Stefan Tatschner, Aaron Bieber, Adam Piggott, Alessandro G., Alexandre Viau, Andrew Dunham, Andrey D, Antoine Lamielle, Arthur Axel fREW Schmidt, Bart De Vries, Ben Curthoys, Ben Sidhom, Benny Ng, Brandon Philips, Brendan Long, Brian R. Becker, Carsten Hagemann, Cathryne Linenweaver, Cedric Staniewski, Chris Howie, Chris Joel, Colin Kennedy, Daniel Bergmann, Daniel Martí, David Rimmer, Denis A., Dennis Wilson, Dominik Heidler, Elias Jarlebring, Emil Hessman, Erik Meitner, Federico Castagnini, Felix Ableitner, Felix Unterpaintner, Francois-Xavier Gsell, Frank Isemann, Gilli Sigurdsson, Jaakko Hannikainen, Jacek Szafarkiewicz, Jake Peterson, James Patterson, Jaroslav Malec, Jens Diemer, Jochen Voss, Johan Vromans, Karol Różycki, Kelong Cong, Ken'ichi Kamada, Kevin Allen, Kevin White, Jr., Laurent Etiemble, Leo Arias, Lord Landon Agahnim, Majed Abdulaziz, Marc Laporte, Marc Pujol, Marcin Dziadus, Mateusz Naściszewski, Matt Burke, Max Schulze, Michael Jephcote, Michael Tilli, Nate Morrison, Pascal Jungblut, Peter Hoeg, Phill Luby, Piotr Bejda, Roman Zaynetdinov, Scott Klupfel, Simon Frei, Stefan Kuntz, Tim Abell, Tim Howes, Tobias Nygren, Tomas Cerveny, Tully Robinson, Tyler Brazier, Unrud, Veeti Paananen, Victor Buinsky, Vil Brekin, William A. Kennington III, Wulf Weich, Xavier O., Yannic A. +Jakob Borg, Audrius Butkevicius, Alexander Graf, Anderson Mesquita, Antony Male, Ben Schulz, Caleb Callaway, Daniel Harte, Lars K.W. Gohlke, Lode Hoste, Michael Ploujnikov, Philippe Schommers, Ryan Sullivan, Sergey Mishin, Stefan Tatschner, Aaron Bieber, Adam Piggott, Alessandro G., Alexandre Viau, Andrew Dunham, Andrey D, Antoine Lamielle, Arthur Axel fREW Schmidt, Bart De Vries, Ben Curthoys, Ben Sidhom, Benny Ng, Brandon Philips, Brendan Long, Brian R. Becker, Carsten Hagemann, Cathryne Linenweaver, Cedric Staniewski, Chris Howie, Chris Joel, Colin Kennedy, Daniel Bergmann, Daniel Martí, David Rimmer, Denis A., Dennis Wilson, Dominik Heidler, Elias Jarlebring, Emil Hessman, Erik Meitner, Federico Castagnini, Felix Ableitner, Felix Unterpaintner, Francois-Xavier Gsell, Frank Isemann, Gilli Sigurdsson, Heiko Zuerker, 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, Kevin White, Jr., Laurent Etiemble, Leo Arias, Lord Landon Agahnim, Majed Abdulaziz, Marc Laporte, Marc Pujol, Marcin Dziadus, Mateusz Naściszewski, Matt Burke, Max Schulze, Michael Jephcote, Michael Tilli, Nate Morrison, Pascal Jungblut, Peter Hoeg, Phill Luby, Piotr Bejda, Roman Zaynetdinov, Scott Klupfel, Simon Frei, Stefan Kuntz, Tim Abell, Tim Howes, Tobias Nygren, Tomas Cerveny, Tully Robinson, Tyler Brazier, Unrud, Veeti Paananen, Victor Buinsky, Vil Brekin, William A. Kennington III, Wulf Weich, Xavier O., Yannic A.

diff --git a/man/stdiscosrv.1 b/man/stdiscosrv.1 index f90492363..1a921ea3a 100644 --- a/man/stdiscosrv.1 +++ b/man/stdiscosrv.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "STDISCOSRV" "1" "December 17, 2016" "v0.14" "Syncthing" +.TH "STDISCOSRV" "1" "December 22, 2016" "v0.14" "Syncthing" .SH NAME stdiscosrv \- Syncthing Discovery Server . @@ -245,7 +245,7 @@ ssl_verify_client optional_no_ca; .UNINDENT .sp The following is a complete example Nginx configuration file. With this setup, -clients can use \fI\%https://discovery.mydomain.com\fP as the discovery server URL in +clients can use \fI\%https://discovery.example.com\fP as the discovery server URL in the Syncthing settings. .INDENT 0.0 .INDENT 3.5 @@ -262,18 +262,18 @@ proxy_set_header X\-Real\-IP $remote_addr; proxy_set_header X\-Forwarded\-For $proxy_add_x_forwarded_for; proxy_set_header X\-Forwarded\-Proto $proxy_x_forwarded_proto; proxy_set_header X\-SSL\-Cert $ssl_client_cert; -upstream discovery.mydomain.com { +upstream discovery.example.com { # Local IP address:port for discovery server - server 172.17.0.6:8443; + server 192.0.2.1:8443; } server { - server_name discovery.mydomain.com; + server_name discovery.example.com; listen 80; access_log /var/log/nginx/access.log vhost; return 301 https://$host$request_uri; } server { - server_name discovery.mydomain.com; + server_name discovery.example.com; listen 443 ssl http2; access_log /var/log/nginx/access.log vhost; ssl_protocols TLSv1 TLSv1.1 TLSv1.2; @@ -281,13 +281,13 @@ server { ssl_prefer_server_ciphers on; ssl_session_timeout 5m; ssl_session_cache shared:SSL:50m; - ssl_certificate /etc/nginx/certs/discovery.mydomain.com.crt; - ssl_certificate_key /etc/nginx/certs/discovery.mydomain.com.key; - ssl_dhparam /etc/nginx/certs/discovery.mydomain.com.dhparam.pem; + ssl_certificate /etc/nginx/certs/discovery.example.com.crt; + ssl_certificate_key /etc/nginx/certs/discovery.example.com.key; + ssl_dhparam /etc/nginx/certs/discovery.example.com.dhparam.pem; add_header Strict\-Transport\-Security "max\-age=31536000"; ssl_verify_client optional_no_ca; location / { - proxy_pass http://discovery.mydomain.com; + proxy_pass http://discovery.example.com; } } .ft P diff --git a/man/strelaysrv.1 b/man/strelaysrv.1 index a7547f785..55b5a0638 100644 --- a/man/strelaysrv.1 +++ b/man/strelaysrv.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "STRELAYSRV" "1" "December 17, 2016" "v0.14" "Syncthing" +.TH "STRELAYSRV" "1" "December 22, 2016" "v0.14" "Syncthing" .SH NAME strelaysrv \- Syncthing Relay Server . @@ -48,7 +48,7 @@ strelaysrv [\-debug] [\-ext\-address=
] [\-global\-rate=] [\-ke Syncthing relies on a network of community\-contributed relay servers. Anyone can run a relay server, and it will automatically join the relay pool and be available to Syncthing users. The current list of relays can be found at -\fI\%https://relays.syncthing.net\fP\&. +\fI\%http://relays.syncthing.net/\fP\&. .SH OPTIONS .INDENT 0.0 .TP @@ -105,7 +105,7 @@ How often pings are sent (default 1m0s). .TP .B \-pools= Comma separated list of relay pool addresses to join (default -"\fI\%https://relays.syncthing.net/endpoint\fP"). Blank to disable announcement to +"\fI\%http://relays.syncthing.net/endpoint\fP"). Blank to disable announcement to a pool, thereby remaining a private relay. .UNINDENT .INDENT 0.0 @@ -196,7 +196,7 @@ although your milage may vary. .SH FIREWALL CONSIDERATIONS .sp The relay server listens on two ports by default. One for data connections and the other -for providing public statistics at \fI\%https://relays.syncthing.net\fP\&. The firewall, such as +for providing public statistics at \fI\%http://relays.syncthing.net/\fP\&. The firewall, such as \fBiptables\fP, must permit incoming TCP connetions to the following ports: .INDENT 0.0 .IP \(bu 2 diff --git a/man/syncthing-bep.7 b/man/syncthing-bep.7 index ef071d8c8..d847632a9 100644 --- a/man/syncthing-bep.7 +++ b/man/syncthing-bep.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-BEP" "7" "December 17, 2016" "v0.14" "Syncthing" +.TH "SYNCTHING-BEP" "7" "December 22, 2016" "v0.14" "Syncthing" .SH NAME syncthing-bep \- Block Exchange Protocol v1 . diff --git a/man/syncthing-config.5 b/man/syncthing-config.5 index 0a0b18b5c..1384e1b6f 100644 --- a/man/syncthing-config.5 +++ b/man/syncthing-config.5 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-CONFIG" "5" "December 17, 2016" "v0.14" "Syncthing" +.TH "SYNCTHING-CONFIG" "5" "December 22, 2016" "v0.14" "Syncthing" .SH NAME syncthing-config \- Syncthing Configuration . diff --git a/man/syncthing-device-ids.7 b/man/syncthing-device-ids.7 index 1c2975a9f..ffae816e3 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" "December 17, 2016" "v0.14" "Syncthing" +.TH "SYNCTHING-DEVICE-IDS" "7" "December 22, 2016" "v0.14" "Syncthing" .SH NAME syncthing-device-ids \- Understanding Device IDs . @@ -123,7 +123,7 @@ MFZWI3DBONSGYYLTMRWGC43ENRQXGZDMMFZWI3DBONSGYYLTMRWA==== .sp The padding (\fB====\fP) is stripped away, the device ID split into four groups, and \fI\%check -digits\fP <\fBhttps://forum.syncthing.net/t/v0-9-0-new-device-id-format/478\fP> +digits\fP <\fBhttps://forum.syncthing.net/t/v0-9-0-new-node-id-format/478\fP> are added for each group. For presentation purposes the device ID is grouped with dashes, resulting in the final value: .INDENT 0.0 diff --git a/man/syncthing-event-api.7 b/man/syncthing-event-api.7 index 9e7487e85..6ef1a140b 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" "December 17, 2016" "v0.14" "Syncthing" +.TH "SYNCTHING-EVENT-API" "7" "December 22, 2016" "v0.14" "Syncthing" .SH NAME syncthing-event-api \- Event API . @@ -113,12 +113,12 @@ itself. "id": 50, "type": "ConfigSaved", "time": "2014\-12\-13T00:09:13.5166486Z", - "data":{ + "data": { "Version": 7, - "Options": { ... }, - "GUI": { ... }, - "Devices": [ ... ], - "Folders": [ ... ] + "Options": {"..."}, + "GUI": {"..."}, + "Devices": [{"..."}], + "Folders": [{"..."}] } } .ft P diff --git a/man/syncthing-faq.7 b/man/syncthing-faq.7 index 0edd3cfb1..d68cbc9ae 100644 --- a/man/syncthing-faq.7 +++ b/man/syncthing-faq.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-FAQ" "7" "December 17, 2016" "v0.14" "Syncthing" +.TH "SYNCTHING-FAQ" "7" "December 22, 2016" "v0.14" "Syncthing" .SH NAME syncthing-faq \- Frequently Asked Questions . @@ -56,10 +56,10 @@ Phone, Amazon Kindle Fire and BSD. [1] Syncthing is an open source file synchronization tool. .sp Syncthing uses an open and documented protocol, and likewise the security -mechanisms in use are well defined and visible in the source code. BitTorrent +mechanisms in use are well defined and visible in the source code. Resilio Sync uses an undocumented, closed protocol with unknown security properties. .IP [1] 5 -\fI\%http://en.wikipedia.org/wiki/BitTorrent_Sync\fP +\fI\%https://en.wikipedia.org/wiki/Resilio_Sync\fP .SH USAGE .SS What things are synced? .sp diff --git a/man/syncthing-globaldisco.7 b/man/syncthing-globaldisco.7 index 2292e7285..3a44ff54c 100644 --- a/man/syncthing-globaldisco.7 +++ b/man/syncthing-globaldisco.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-GLOBALDISCO" "7" "December 17, 2016" "v0.14" "Syncthing" +.TH "SYNCTHING-GLOBALDISCO" "7" "December 22, 2016" "v0.14" "Syncthing" .SH NAME syncthing-globaldisco \- Global Discovery Protocol v3 . diff --git a/man/syncthing-localdisco.7 b/man/syncthing-localdisco.7 index c836d4909..01130f7b8 100644 --- a/man/syncthing-localdisco.7 +++ b/man/syncthing-localdisco.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-LOCALDISCO" "7" "December 17, 2016" "v0.14" "Syncthing" +.TH "SYNCTHING-LOCALDISCO" "7" "December 22, 2016" "v0.14" "Syncthing" .SH NAME syncthing-localdisco \- Local Discovery Protocol v4 . diff --git a/man/syncthing-networking.7 b/man/syncthing-networking.7 index ed80e286b..a8a7a122e 100644 --- a/man/syncthing-networking.7 +++ b/man/syncthing-networking.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-NETWORKING" "7" "December 17, 2016" "v0.14" "Syncthing" +.TH "SYNCTHING-NETWORKING" "7" "December 22, 2016" "v0.14" "Syncthing" .SH NAME syncthing-networking \- Firewall Setup . diff --git a/man/syncthing-relay.7 b/man/syncthing-relay.7 index 1eef531f3..e020fe018 100644 --- a/man/syncthing-relay.7 +++ b/man/syncthing-relay.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-RELAY" "7" "December 17, 2016" "v0.14" "Syncthing" +.TH "SYNCTHING-RELAY" "7" "December 22, 2016" "v0.14" "Syncthing" .SH NAME syncthing-relay \- Relay Protocol v1 . diff --git a/man/syncthing-rest-api.7 b/man/syncthing-rest-api.7 index 32b33f7a8..d6d23b166 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" "December 17, 2016" "v0.14" "Syncthing" +.TH "SYNCTHING-REST-API" "7" "December 22, 2016" "v0.14" "Syncthing" .SH NAME syncthing-rest-api \- REST API . diff --git a/man/syncthing-security.7 b/man/syncthing-security.7 index d0033ac05..a012a18b7 100644 --- a/man/syncthing-security.7 +++ b/man/syncthing-security.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-SECURITY" "7" "December 17, 2016" "v0.14" "Syncthing" +.TH "SYNCTHING-SECURITY" "7" "December 22, 2016" "v0.14" "Syncthing" .SH NAME syncthing-security \- Security Principles . @@ -46,7 +46,7 @@ Incoming requests for file data are verified to the extent that the requested file name must exist in the local index and the global model. .sp For information about ensuring you are running the code you think you are and -for reporting security vulnerabilities, please see the official \fI\%security page\fP <\fBhttp://syncthing.net/security.html\fP>\&. +for reporting security vulnerabilities, please see the official \fI\%security page\fP <\fBhttps://syncthing.net/security.html\fP>\&. .SH INFORMATION LEAKAGE .SS Global Discovery .sp diff --git a/man/syncthing-stignore.5 b/man/syncthing-stignore.5 index ae4c8db12..bb3462926 100644 --- a/man/syncthing-stignore.5 +++ b/man/syncthing-stignore.5 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-STIGNORE" "5" "December 17, 2016" "v0.14" "Syncthing" +.TH "SYNCTHING-STIGNORE" "5" "December 22, 2016" "v0.14" "Syncthing" .SH NAME syncthing-stignore \- Prevent files from being synchronized to other nodes . diff --git a/man/syncthing-versioning.7 b/man/syncthing-versioning.7 index 279d5151f..0e98f28ae 100644 --- a/man/syncthing-versioning.7 +++ b/man/syncthing-versioning.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-VERSIONING" "7" "December 17, 2016" "v0.14" "Syncthing" +.TH "SYNCTHING-VERSIONING" "7" "December 22, 2016" "v0.14" "Syncthing" .SH NAME syncthing-versioning \- Keep automatic backups of deleted files by other nodes . diff --git a/man/syncthing.1 b/man/syncthing.1 index f366e2a82..a0862753a 100644 --- a/man/syncthing.1 +++ b/man/syncthing.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING" "1" "December 17, 2016" "v0.14" "Syncthing" +.TH "SYNCTHING" "1" "December 22, 2016" "v0.14" "Syncthing" .SH NAME syncthing \- Syncthing .