Update docs & translations

Fix STTRACE=http (it should use the http debug logger)
Response with Bad Request to bad config posts, not Internal Server Errors
2026-01-03 19:39:20 -05:00 · 2015-12-06 13:09:22 +01:00 · 2015-12-05 15:59:35 +01:00 · 2015-12-05 15:56:10 +01:00 · 2015-12-04 12:05:28 +00:00 · 2015-12-04 12:01:01 +00:00
33 changed files with 358 additions and 67 deletions
--- a/2
+++ b/2
@@ -54,6 +54,7 @@ Matt Burke <mburke@amplify.com> <burkemw3@gmail.com>
 Michael Jephcote <rewt0r@gmx.com> <Rewt0r@users.noreply.github.com>
 Michael Ploujnikov <ploujj@gmail.com>
 Michael Tilli <pyfisch@gmail.com>
+Nate Morrison <natemorrison@gmail.com>
 Pascal Jungblut <github@pascalj.com> <mail@pascal-jungblut.com>
 Peter Hoeg <peter@speartail.com>
 Philippe Schommers <philippe@schommers.be>
@@ -71,4 +72,5 @@ Tully Robinson <tully@tojr.org>
 Tyler Brazier <tyler@tylerbrazier.com>
 Veeti Paananen <veeti.paananen@rojekti.fi>
 Vil Brekin <vilbrekin@gmail.com>
+Victor Buinsky <vix_booja@tut.by>
 Yannic A. <eipiminusone+github@gmail.com> <eipiminus1@users.noreply.github.com>
--- a/2
+++ b/2
@@ -20,6 +20,7 @@ brbecker	<brbecker@gmail.com>
 brendanlong	<self@brendanlong.com>
 brgmnn      <dan.arne.bergmann@gmail.com> <brgmnn@users.noreply.github.com>
 bsidhom		<bsidhom@gmail.com>
+buinsky	<vix_booja@tut.by>
 burkemw3	<mburke@amplify.com> <burkemw3@gmail.com>
 calmh		<jakob@nym.se>
 canton7	<antony.male@gmail.com>
@@ -50,6 +51,7 @@ mateon1	<matin1111@wp.pl>
 mogwa1	<devriesb@gmail.com>
 moshen		<moshen.colin@gmail.com>
 mvdan		<mvdan@mvdan.cc>
+nrm21	<natemorrison@gmail.com>
 pascalj		<github@pascalj.com> <mail@pascal-jungblut.com>
 peterhoeg	<peter@speartail.com>
 philips		<brandon@ifup.org>
--- a/cmd/syncthing/gui.go
+++ b/cmd/syncthing/gui.go
@@ -317,7 +317,7 @@ func debugMiddleware(h http.Handler) http.Handler {
 					written = rf.Int()
 				}
 			}
-			l.Debugf("http: %s %q: status %d, %d bytes in %.02f ms", r.Method, r.URL.String(), status, written, ms)
+			httpl.Debugf("http: %s %q: status %d, %d bytes in %.02f ms", r.Method, r.URL.String(), status, written, ms)
 		}
 	})
 }
@@ -578,7 +578,7 @@ func (s *apiSvc) postSystemConfig(w http.ResponseWriter, r *http.Request) {
 	to, err := config.ReadJSON(r.Body, myID)
 	if err != nil {
 		l.Warnln("decoding posted config:", err)
-		http.Error(w, err.Error(), 500)
+		http.Error(w, err.Error(), http.StatusBadRequest)
 		return
 	}

@@ -587,7 +587,7 @@ func (s *apiSvc) postSystemConfig(w http.ResponseWriter, r *http.Request) {
 			hash, err := bcrypt.GenerateFromPassword([]byte(to.GUI.Password), 0)
 			if err != nil {
 				l.Warnln("bcrypting password:", err)
-				http.Error(w, err.Error(), 500)
+				http.Error(w, err.Error(), http.StatusInternalServerError)
 				return
 			}

--- a/gui/assets/lang/lang-da.json
+++ b/gui/assets/lang/lang-da.json
@@ -0,0 +1,225 @@
+{
+    "A negative number of days doesn't make sense.": "Et negativt antal dage giver ikke mening.",
+    "A new major version may not be compatible with previous versions.": "En ny versionsudgivelse er måske ikke kompatibel med tidligere versioner.",
+    "API Key": "API-nøgle",
+    "About": "Om",
+    "Actions": "Handlinger.",
+    "Add": "Tilføj",
+    "Add Device": "Tilføj enhed",
+    "Add Folder": "Tilføj mappe",
+    "Add new folder?": "Tilføj ny mappe",
+    "Address": "Adresse",
+    "Addresses": "Adresser",
+    "Advanced": "Avanceret",
+    "Advanced Configuration": "Avanceret konfiguration",
+    "All Data": "Alt data",
+    "Allow Anonymous Usage Reporting?": "Tillad anonym brugerstatistik?",
+    "Alphabetic": "Alfabetisk",
+    "An external command handles the versioning. It has to remove the file from the synced folder.": " ",
+    "Anonymous Usage Reporting": "Anonym brugerstatistik",
+    "Any devices configured on an introducer device will be added to this device as well.": "Alle enheder som er konfigueret som en introducerende enhed, vil også blive tilføjet til denne enhed.",
+    "Automatic upgrades": "Automatisk opdatering",
+    "Be careful!": "Vær forsigtig!",
+    "Bugs": "Fejl",
+    "CPU Utilization": "CPU-forbrug",
+    "Changelog": "Udgivelsesnoter",
+    "Clean out after": "Rens efter",
+    "Close": "Luk",
+    "Command": "Kommando",
+    "Comment, when used at the start of a line": "Kommentering som bruges i starten af en linje",
+    "Compression": "Anvend komprimering",
+    "Connection Error": "Tilslutnings fejl",
+    "Copied from elsewhere": "Kopieret fra et andet sted",
+    "Copied from original": "Kopieret fra originalen",
+    "Copyright © 2015 the following Contributors:": "Copyright © 2015 alle bidragsydere:",
+    "Danger!": "Fare!",
+    "Delete": "Slet",
+    "Deleted": "Slettet",
+    "Device ID": "Enheds-ID",
+    "Device Identification": "Enhedsidentifikation",
+    "Device Name": "Enhedsnavn",
+    "Device {%device%} ({%address%}) wants to connect. Add new device?": "Enheden {{device}} ({{address}}) ønsker at forbinde. Tilføj denne enhed?",
+    "Devices": "Enheder",
+    "Disconnected": "Ikke tilsluttet",
+    "Discovery": "Opslag",
+    "Documentation": "Dokumentation",
+    "Download Rate": "Downloadhastighed",
+    "Downloaded": "Downloadet",
+    "Downloading": "Downloader",
+    "Edit": "Rediger",
+    "Edit Device": "Rediger enhed",
+    "Edit Folder": "Rediger mappe",
+    "Editing": "Redigerer",
+    "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.",
+    "Enter ignore patterns, one per line.": "Vælg ignorer maske, én per linje.",
+    "Error": "Fejl",
+    "External File Versioning": "Ekstern fil-versionskontrol",
+    "Failed Items": "Mislykkede filer",
+    "File Pull Order": "Filhentnings rækkefølge",
+    "File Versioning": "Filversionering",
+    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Filtilladelses bits ignoreres når der søges efter ændringer. Bruges på FAT filsystemer.  ",
+    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Filer flyttes til .stversions mappen når de erstattes eller slettes af Syncthing.",
+    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Filer flyttes til data-stemplede versioner i en .stversions mappe når de erstattes eller slettes af Syncthing.",
+    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Filer er beskyttet fra ændringer foretaget på andre enheder, men ændringerne på denne enhed vil blive sendt til alle andre tilknyttede enheder.",
+    "Folder": "Mappe",
+    "Folder ID": "Mappe-ID",
+    "Folder Master": "Mastermappe",
+    "Folder Path": "Mappesti",
+    "Folders": "Mapper",
+    "GUI": "GUI",
+    "GUI Authentication Password": "GUI-kodeord",
+    "GUI Authentication User": "GUI-brugernavn",
+    "GUI Listen Addresses": "GUI-lytteadresse",
+    "Generate": "Opret",
+    "Global Discovery": "Globalt opslag",
+    "Global Discovery Server": "Global opslagsserver",
+    "Global State": "Global tilstand",
+    "Help": "Hjælp",
+    "Home page": "Hjem",
+    "Ignore": "Ignorer",
+    "Ignore Patterns": "Ignoreringsmaske",
+    "Ignore Permissions": "Ignorér filrettigheder",
+    "Incoming Rate Limit (KiB/s)": "Indgående hastighedsbegrænsning (KiB/s)",
+    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Ukorrekt opsætning kan skade dine data og gøre Syncthing ude af stand til at fungere.",
+    "Introducer": "Introducerende enhed",
+    "Inversion of the given condition (i.e. do not exclude)": "Det omvendte (dvs. undlad ikke)",
+    "Keep Versions": "Behold versioner",
+    "Largest First": "Største først",
+    "Last File Received": "Sidste modtaget fil",
+    "Last seen": "Sidst set",
+    "Later": "Senere",
+    "Local Discovery": "Lokal opslag",
+    "Local State": "Lokal tilstand",
+    "Local State (Total)": "Lokal tilstand (total)",
+    "Major Upgrade": "Ny version",
+    "Maximum Age": "Maks alder",
+    "Metadata Only": "Kun metadata",
+    "Minimum Free Disk Space": "Mindst ledig diskplads",
+    "Move to top of queue": "Flyt til toppen af køen",
+    "Multi level wildcard (matches multiple directory levels)": "Flerniveau wildcard (matcher flere biblioteksniveauer)",
+    "Never": "Aldrig",
+    "New Device": "Ny enhed",
+    "New Folder": "Ny mappe",
+    "Newest First": "Nyeste først",
+    "No": "Nej",
+    "No File Versioning": "Ingen filversion",
+    "Notice": "OBS",
+    "OK": "OK",
+    "Off": "Slå fra",
+    "Oldest First": "Ældste først",
+    "Options": "Indstillinger",
+    "Out of Sync": "Ikke synkroniseret",
+    "Out of Sync Items": "Endnu ikke synkroniserede filer",
+    "Outgoing Rate Limit (KiB/s)": "Udgående hastighedsbegrænsning (KiB/s)",
+    "Override Changes": "Overskriv ændringer",
+    "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": "Sti til den lokale mappe. Vil blive oprettet hvis den ikke findes. Tilde tegnet (~) kan bruges som en forkortelse for",
+    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Sti hvor versioner skal gemmes (efterlad tom for default .stversions mappe)",
+    "Pause": "Pause",
+    "Paused": "Pauset",
+    "Please consult the release notes before performing a major upgrade.": "Tjek venligst udgivelsesnoterne før opgradering til en ny version.",
+    "Please set a GUI Authentication User and Password in the Settings dialog.": "Sæt vensligt en GUI bruger og kodeord i opsætningsdialogen.",
+    "Please wait": "Vent venligst",
+    "Preview": "Forhåndsvisning",
+    "Preview Usage Report": "Forhåndsvisning af forbrugsrapport",
+    "Quick guide to supported patterns": "Hurtig guide til supporteret mønstre",
+    "RAM Utilization": "RAM-forbrug",
+    "Random": "Tilfældig",
+    "Relayed via": "Passeret gennem",
+    "Relays": "Passager",
+    "Release Notes": "Udgivelsesnoter",
+    "Remove": "Fjern",
+    "Rescan": "Skan igen",
+    "Rescan All": "Skan alt igen",
+    "Rescan Interval": "Genskannings interval",
+    "Restart": "Genstart",
+    "Restart Needed": "Programmet kræver genstart",
+    "Restarting": "Genstarter",
+    "Resume": "Genoptag",
+    "Reused": "Genbrugt",
+    "Save": "Gem",
+    "Scan Time Remaining": "Tid tilbage af skanningen",
+    "Scanning": "Opdaterer",
+    "Select the devices to share this folder with.": "Vælg hvilke enheder du vil dele denne mappe med",
+    "Select the folders to share with this device.": "Vælg hvilke mapper du vil dele med denne enhed.",
+    "Settings": "Indstillinger",
+    "Share": "Del",
+    "Share Folder": "Delt mappe",
+    "Share Folders With Device": "Del mappe med enhed",
+    "Share With Devices": "Del med enhed",
+    "Share this folder?": "Del denne mappe",
+    "Shared With": "Delt med",
+    "Short identifier for the folder. Must be the same on all cluster devices.": "Kort navn for mappen. Skal være det samme på alle tilknyttede enheder.",
+    "Show ID": "Vis ID",
+    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Vist istedet for Enheds ID i klynge status. Vil blive vist på andre enheder som valgfrit standard navn.",
+    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Vist istedet for Enheds ID i klynge status. Vil blive opdateret til det navn som enheden viser, hvis det ikke er udfyldt.",
+    "Shutdown": "Luk ned",
+    "Shutdown Complete": "Nedlukning fuldført",
+    "Simple File Versioning": "Simpel fil versioner",
+    "Single level wildcard (matches within a directory only)": "Enkeltnivau wildcard (matcher kun inden for en mapp)",
+    "Smallest First": "Mindste først",
+    "Source Code": "Kildekode",
+    "Staggered File Versioning": "Forskudte filversioner",
+    "Start Browser": "Start browser",
+    "Statistics": "Statistikker",
+    "Stopped": "Stoppet",
+    "Support": "Support",
+    "Sync Protocol Listen Addresses": "Lytteadresser for indgående forbindelser",
+    "Syncing": "Synkroniserer",
+    "Syncthing has been shut down.": "Syncthing er blevet lukket ned.",
+    "Syncthing includes the following software or portions thereof:": "Syncthing indeholder følgende software eller dele heraf:",
+    "Syncthing is restarting.": "Syncthing genstarter",
+    "Syncthing is upgrading.": "Syncthing opgraderer",
+    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing ser ud til at være stoppet eller oplever problemer med din internetforbindels. Prøver igen...",
+    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Det ser ud til at Syncthiing har problemer med at udføre opgaven. Prøv at genopfriske siden eller genstarte Synching hvis problemet vedbliver.",
+    "The Syncthing admin interface is configured to allow remote access without a password.": "Syncthing administationsdelen er konfigureret til at blive fjernstyret uden kodeord.",
+    "The aggregated statistics are publicly available at {%url%}.": "Samlet statistik er offentligt tilgængelig på {{url}}.",
+    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Konfigurationen er gemt, men ikke aktiveret. Syncthing skal genstarte for at aktivere den nye konfiguration.",
+    "The device ID cannot be blank.": "Enhedens ID må ikke være tom.",
+    "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).": "Enheds ID som som skal bruges her, kan du finde i \"Rediger > Vis ID\"-dialogen på den anden enhed. Mellemrum og bindestreg er valgfri (ignoreres).",
+    "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.": "Den krypterede forbrugsrapport sendes dagligt. Den benyttes til at spore anvendte platforme, mappestørrelser og versioner. Hvis det typen af opsamlet data ændres på et senere tidspunkt, vil du blive spurgt om tilladelse igen.",
+    "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.": "Det indtastede node ID ser ikke gyldigt ud. Det skal være en 52 eller 56 tegn streng, bestående af tal og bogstaver, eventuelt med mellemrum og bindestreger.",
+    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "Den første kommandolinjeparameter er mappestien og den anden parameter er den relative sti til mappen.",
+    "The folder ID cannot be blank.": "Mappe-ID må ikke være tom",
+    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "Mappe-ID skal være en kort identificierende streng (64 karakterer eller mindre) bestående af bogstav-, tal-, punktum- (.), bindestreg- (-) og understregskarakteren (_).",
+    "The folder ID must be unique.": "Mappe-ID skal være unik",
+    "The folder path cannot be blank.": "Mappestien må ikke være tom",
+    "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.": "De følgende intervaller er brugt: i den første time, er en version gemt hvert 30. sekund, for første da er en version gemt hver time,  for de første 30 dage er en version gemt hver dag og indtil den maksimale periode er en version hver uge gemt.",
+    "The following items could not be synchronized.": "Følgende filer kunne ikke synkroniseres.",
+    "The maximum age must be a number and cannot be blank.": "Maks alder skal være et nummer og må ikke være tom",
+    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "Maks tid gamle udgaver skal gemmes (i dage, sæt lig med 0 for at beholde gamle versioner for altid)",
+    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "Procentsatsen på den mindste ledige diskplads må ikke være negative og skal være mellem 0 og 100 (inklusiv).",
+    "The number of days must be a number and cannot be blank.": "Antallet af dage skal være et nummer og feltet må ikke være tomt",
+    "The number of days to keep files in the trash can. Zero means forever.": "Antal dage filer gemmes i skraldespanden. Nul betyder for evigt.",
+    "The number of old versions to keep, per file.": "Antallet af gamle versioner som gemmes, per fil.",
+    "The number of versions must be a number and cannot be blank.": "Antallet af versioner skal være et tal, og kan ikke være blankt.",
+    "The path cannot be blank.": "Stien må ikke være tom",
+    "The rate limit must be a non-negative number (0: no limit)": "Ratebegrænsningen må ikke være negative tal (0: ingen begrænsning)",
+    "The rescan interval must be a non-negative number of seconds.": "Genskanningsintervallet skal være et ikke-negativt antal sekunder",
+    "They are retried automatically and will be synced when the error is resolved.": "De prøves igen automatisk og vil blive synkroniseret når fejlen er løst.",
+    "This can easily give hackers access to read and change any files on your computer.": "Dette gør det nemt for hackere at få adgang til at læse og ændre filer på din computer.",
+    "This is a major version upgrade.": "Dette er en ny version",
+    "Trash Can File Versioning": "Skraldespand fil versioner",
+    "Unknown": "Ukendt",
+    "Unshared": "Ikke delt",
+    "Unused": "Ubrugt",
+    "Up to Date": "Fuldt opdateret",
+    "Updated": "Opdateret",
+    "Upgrade": "Upgradér",
+    "Upgrade To {%version%}": "Opgradér til {{version}}",
+    "Upgrading": "Opgradere",
+    "Upload Rate": "Uploadhastighed",
+    "Uptime": "Oppetid",
+    "Use HTTPS for GUI": "Anvend HTTPS til GUI adgang",
+    "Version": "Version",
+    "Versions Path": "Versions-sti",
+    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Versioner slettes automatisk, hvis de er ældre end den satte maksimum alder eller overstiger det tilladte antal filer i et interval.",
+    "When adding a new device, keep in mind that this device must be added on the other side too.": "Når der tilføjes en ny enhed, vær da opmærksom på, at denne enhed også skal tilføjes på den anden side.",
+    "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.": "Når der tilføjes en ny enhed, vær da opmærksom på at samme ID bruges til at forbinde mapperne på de forskellige enheder. Der er forskel på store og små bogstaver, og ID skal være fuldstændig identisk på alle enheder.",
+    "Yes": "Ja",
+    "You must keep at least one version.": "Du skal beholde mindst én version.",
+    "days": "dage",
+    "full documentation": "Fuld dokumentation",
+    "items": "poster",
+    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} ønsker at dele mappen \"{{folder}}\". "
+}
--- a/gui/assets/lang/lang-fy.json
+++ b/gui/assets/lang/lang-fy.json
@@ -68,9 +68,9 @@
    "Folder Path": "Map-paad",
    "Folders": "Mappen",
    "GUI": "GUI",
-    "GUI Authentication Password": "GUI-wachtwurd foar ferifikaasje",
-    "GUI Authentication User": "GUI-brûker foar ferifikaasje",
-    "GUI Listen Addresses": "GUI-harkadres",
+    "GUI Authentication Password": "Wachtwurd foar ferifikaasje yn GUI",
+    "GUI Authentication User": "Brûkers-ID foar ferifikaasje yn GUI",
+    "GUI Listen Addresses": "Harkadres foar GUI",
    "Generate": "Generearje",
    "Global Discovery": "Wrâldwide ûntdekking",
    "Global Discovery Server": "Wrâldwide ûntdekkingstsjinner",
@@ -152,7 +152,7 @@
    "Short identifier for the folder. Must be the same on all cluster devices.": "Koart opskrift foar de map. Moat op alle apparaten itselde wêze.",
    "Show ID": "ID sjen litte",
    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Wurd ynstee fan apparaat-ID sjen litten by de bondeltastân. Wurd nei oare apparaten advertearre as in mooglike standertnamme.",
-    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Wurd ynstee fan apparaat-ID sjen litten by de bondeltastân. As it leech litten wurd, wurd it fernijt nei de namme die it apparaat advertearret.",
+    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Wurd yn de bondel-tastân sjen litten ynstee fan apparaat-ID. Wannear't leech litten wurd, wurd it fernijt nei de namme die it apparaat útstjoert.",
    "Shutdown": "Ofslute",
    "Shutdown Complete": "Ofsluten klear",
    "Simple File Versioning": "Ienfâldich triemferzjebehear",
@@ -160,7 +160,7 @@
    "Smallest First": "Lytste earst",
    "Source Code": "Boarnekoade",
    "Staggered File Versioning": "Sprieden triemferzjebehear",
-    "Start Browser": "Browser starte",
+    "Start Browser": "Browser iepenje wannear't Syncthing start",
    "Statistics": "Statistiken",
    "Stopped": "Stoppe",
    "Support": "Understeuning",
--- a/gui/assets/lang/lang-hu.json
+++ b/gui/assets/lang/lang-hu.json
@@ -15,7 +15,7 @@
    "All Data": "Minden adat",
    "Allow Anonymous Usage Reporting?": "Engedélyezed a névtelen felhasználási adatok küldését?",
    "Alphabetic": "ABC rendben",
-    "An external command handles the versioning. It has to remove the file from the synced folder.": "Egy külső program kezeli a fájl verziózást. El kell távolítsa a fájlt a szinkronizált mappából.",
+    "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.": "Minden eszköz ami a bevezető eszközön lett beállítva hozzá lesz adva ehhez az eszközhöz is.",
    "Automatic upgrades": "Automatikus frissítés",
@@ -32,7 +32,7 @@
    "Copied from elsewhere": "Másolva máshonnan",
    "Copied from original": "Másolva az eredetiről",
    "Copyright © 2015 the following Contributors:": "Copyright © 2015 az alábbi Közreműködők:",
-    "Danger!": "Danger!",
+    "Danger!": "Veszély!",
    "Delete": "Törlés",
    "Deleted": "Törölve",
    "Device ID": "Eszköz azonosító",
@@ -54,10 +54,10 @@
    "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. ",
    "Enter ignore patterns, one per line.": "Figyelmen kívül hagyáshoz ide írhatod a mintákat, soronként egyet",
    "Error": "Hiba",
-    "External File Versioning": "Külső fájl verziózás",
+    "External File Versioning": "Külső fájl verziókövetés",
    "Failed Items": "Hibás elemek",
    "File Pull Order": "Fájl küldési sorrend",
-    "File Versioning": "Fájl verziózás",
+    "File Versioning": "Fájl verziókövetés",
    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Fájl jogosultságok figyelmen kívül hagyása változások keresésekor. FAT fájlrendszerek használatakor.",
    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Ha a Syncthing áthelyezi vagy törli a fájlokat, akkor azok a .stversions mappába lesznek áthelyezve.",
    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Ha a Syncthing felülírja vagy törli a fájlokat, akkor azok a .stversions mappába lesznek áthelyezve, időbélyegzővel ellátva.",
@@ -103,7 +103,7 @@
    "New Folder": "Új mappa",
    "Newest First": "Újabb először",
    "No": "Nem",
-    "No File Versioning": "Nincs fájl verziózás",
+    "No File Versioning": "Nincs fájl verziókövetés",
    "Notice": "Megjegyzés",
    "OK": "Rendben",
    "Off": "Kikapcsolva",
@@ -118,7 +118,7 @@
    "Pause": "Szünet",
    "Paused": "Szünetel",
    "Please consult the release notes before performing a major upgrade.": "Nagyobb frissítés előtt ellenőrizni kell a kiadási megjegyzéseket.",
-    "Please set a GUI Authentication User and Password in the Settings dialog.": "Please set a GUI Authentication User and Password in the Settings dialog.",
+    "Please set a GUI Authentication User and Password in the Settings dialog.": "Kérlek állítsd be a grafikus felület felhasználónevét és jelszavát a Beállítások ablakban",
    "Please wait": "Kérlek, várj",
    "Preview": "Előnézet",
    "Preview Usage Report": "Felhasználási adatok átnézése",
@@ -138,7 +138,7 @@
    "Resume": "Folytatás",
    "Reused": "Újrafelhasználva",
    "Save": "Mentés",
-    "Scan Time Remaining": "Scan Time Remaining",
+    "Scan Time Remaining": "Fennmaradó átnézési idő",
    "Scanning": "Átnézés",
    "Select the devices to share this folder with.": "Válaszd ki az eszközöket amelyekkel meg szeretnéd osztani a mappát",
    "Select the folders to share with this device.": "Válaszd ki a mappákat amiket meg szeretnél osztani ezzel az eszközzel",
@@ -172,7 +172,7 @@
    "Syncthing is upgrading.": "Syncthing frissül",
    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Úgy tűnik, hogy a Syncthing nem működik, vagy valami probléma van az hálózati kapcsolattal. Újra próbálom...",
    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Úgy tűnik, hogy a Syncthing problémába ütközött a kérés feldolgozása során. Ha a probléma továbbra is fennáll, akkor frissíteni kell az oldalt, vagy újra kell indítani a Syncthinget.",
-    "The Syncthing admin interface is configured to allow remote access without a password.": "The Syncthing admin interface is configured to allow remote access without a password.",
+    "The Syncthing admin interface is configured to allow remote access without a password.": "A Syncthing adminisztrációs felületének távoli elérése be van kapcsolva jelszó nélkül.",
    "The aggregated statistics are publicly available at {%url%}.": "Az összevont statisztikák nyilvánosan elérhetők a {{url}} címen.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "A beállítások elmentésre kerültek, de nem lettek aktiválva. Indítsd újra a Syncthing-et, hogy aktiváld őket.",
    "The device ID cannot be blank.": "Az eszköz azonosító nem lehet üres.",
@@ -197,9 +197,9 @@
    "The rate limit must be a non-negative number (0: no limit)": "Az arány limitnek pozitív számnak kell lennie (0: nincs limit)",
    "The rescan interval must be a non-negative number of seconds.": "Az átnézési intervallum nullánál nagyobb másodperc érték kell legyen",
    "They are retried automatically and will be synced when the error is resolved.": "A hiba javítása után automatikusan újra megpróbálja a szinkronizálást.",
-    "This can easily give hackers access to read and change any files on your computer.": "This can easily give hackers access to read and change any files on your computer.",
+    "This can easily give hackers access to read and change any files on your computer.": "Így a hekkerek könnyedén hozzáférhetnek a számítógépen található fájlokhoz. ",
    "This is a major version upgrade.": "Ez egy főverzió frissítés.",
-    "Trash Can File Versioning": "Szemetes fájl verziózás",
+    "Trash Can File Versioning": "Szemetes fájl verziókövetés",
    "Unknown": "Ismeretlen",
    "Unshared": "Nincs megosztva",
    "Unused": "Nincs használatban",
--- a/gui/assets/lang/prettyprint.js
+++ b/gui/assets/lang/prettyprint.js
@@ -1 +1 @@
-var langPrettyprint = {"bg":"Bulgarian","ca":"Catalan","ca@valencia":"Catalan (Valencian)","cs":"Czech","de":"German","el":"Greek","en":"English","en-GB":"English (United Kingdom)","es":"Spanish","es-ES":"Spanish (Spain)","fi":"Finnish","fr":"French","fr-CA":"French (Canada)","fy":"Western Frisian","hu":"Hungarian","it":"Italian","ja":"Japanese","ko-KR":"Korean (Korea)","lt":"Lithuanian","nb":"Norwegian Bokmål","nl":"Dutch","nn":"Norwegian Nynorsk","pl":"Polish","pt-BR":"Portuguese (Brazil)","pt-PT":"Portuguese (Portugal)","ro-RO":"Romanian (Romania)","ru":"Russian","sv":"Swedish","uk":"Ukrainian","zh-CN":"Chinese (China)","zh-TW":"Chinese (Taiwan)"}
+var langPrettyprint = {"bg":"Bulgarian","ca":"Catalan","ca@valencia":"Catalan (Valencian)","cs":"Czech","da":"Danish","de":"German","el":"Greek","en":"English","en-GB":"English (United Kingdom)","es":"Spanish","es-ES":"Spanish (Spain)","fi":"Finnish","fr":"French","fr-CA":"French (Canada)","fy":"Western Frisian","hu":"Hungarian","it":"Italian","ja":"Japanese","ko-KR":"Korean (Korea)","lt":"Lithuanian","nb":"Norwegian Bokmål","nl":"Dutch","nn":"Norwegian Nynorsk","pl":"Polish","pt-BR":"Portuguese (Brazil)","pt-PT":"Portuguese (Portugal)","ro-RO":"Romanian (Romania)","ru":"Russian","sv":"Swedish","uk":"Ukrainian","zh-CN":"Chinese (China)","zh-TW":"Chinese (Taiwan)"}
--- a/gui/assets/lang/valid-langs.js
+++ b/gui/assets/lang/valid-langs.js
@@ -1 +1 @@
-var validLangs = ["bg","ca","ca@valencia","cs","de","el","en","en-GB","es","es-ES","fi","fr","fr-CA","fy","hu","it","ja","ko-KR","lt","nb","nl","nn","pl","pt-BR","pt-PT","ro-RO","ru","sv","uk","zh-CN","zh-TW"]
+var validLangs = ["bg","ca","ca@valencia","cs","da","de","el","en","en-GB","es","es-ES","fi","fr","fr-CA","fy","hu","it","ja","ko-KR","lt","nb","nl","nn","pl","pt-BR","pt-PT","ro-RO","ru","sv","uk","zh-CN","zh-TW"]
--- a/gui/syncthing/core/aboutModalView.html
+++ b/gui/syncthing/core/aboutModalView.html
@@ -66,6 +66,7 @@
        <li class="auto-generated">Michael Jephcote</li>
        <li class="auto-generated">Michael Ploujnikov</li>
        <li class="auto-generated">Michael Tilli</li>
+        <li class="auto-generated">Nate Morrison</li>
        <li class="auto-generated">Pascal Jungblut</li>
        <li class="auto-generated">Peter Hoeg</li>
        <li class="auto-generated">Philippe Schommers</li>
@@ -82,6 +83,7 @@
        <li class="auto-generated">Tully Robinson</li>
        <li class="auto-generated">Tyler Brazier</li>
        <li class="auto-generated">Veeti Paananen</li>
+        <li class="auto-generated">Victor Buinsky</li>
        <li class="auto-generated">Vil Brekin</li>
        <li class="auto-generated">Yannic A.</li>
      </ul>
--- a/gui/syncthing/core/syncthingController.js
+++ b/gui/syncthing/core/syncthingController.js
@@ -1414,10 +1414,13 @@ angular.module('syncthing.core')
        };

        $scope.showURPreview = function () {
-            $('#settings').modal('hide');
-            $('#urPreview').modal().on('hidden.bs.modal', function () {
-                $('#settings').modal();
-            });
+            $('#settings').modal('hide')
+                .one('hidden.bs.modal', function() {
+                    $('#urPreview').modal()
+                        .one('hidden.bs.modal', function () {
+                            $('#settings').modal();
+                        });
+                });
        };

        $scope.acceptUR = function () {
--- a/lib/auto/gui.files.go
+++ b/lib/auto/gui.files.go
--- a/lib/config/config.go
+++ b/lib/config/config.go
@@ -36,14 +36,14 @@ var (
 	DefaultDiscoveryServersV4 = []string{
 		"https://discovery-v4-1.syncthing.net/?id=SR7AARM-TCBUZ5O-VFAXY4D-CECGSDE-3Q6IZ4G-XG7AH75-OBIXJQV-QJ6NLQA", // 194.126.249.5, Sweden
 		"https://discovery-v4-2.syncthing.net/?id=DVU36WY-H3LVZHW-E6LLFRE-YAFN5EL-HILWRYP-OC2M47J-Z4PE62Y-ADIBDQC", // 45.55.230.38, USA
-		"https://discovery-v4-3.syncthing.net/?id=7WT2BVR-FX62ZOW-TNVVW25-6AHFJGD-XEXQSBW-VO3MPL2-JBTLL4T-P4572Q4", // 128.199.95.124, Singapore
+		"https://discovery-v4-3.syncthing.net/?id=VK6HNJ3-VVMM66S-HRVWSCR-IXEHL2H-U4AQ4MW-UCPQBWX-J2L2UBK-NVZRDQZ", // 128.199.95.124, Singapore
 	}
 	// DefaultDiscoveryServersV6 should be substituted when the configuration
 	// contains <globalAnnounceServer>default-v6</globalAnnounceServer>.
 	DefaultDiscoveryServersV6 = []string{
 		"https://discovery-v6-1.syncthing.net/?id=SR7AARM-TCBUZ5O-VFAXY4D-CECGSDE-3Q6IZ4G-XG7AH75-OBIXJQV-QJ6NLQA", // 2001:470:28:4d6::5, Sweden
 		"https://discovery-v6-2.syncthing.net/?id=DVU36WY-H3LVZHW-E6LLFRE-YAFN5EL-HILWRYP-OC2M47J-Z4PE62Y-ADIBDQC", // 2604:a880:800:10::182:a001, USA
-		"https://discovery-v6-3.syncthing.net/?id=7WT2BVR-FX62ZOW-TNVVW25-6AHFJGD-XEXQSBW-VO3MPL2-JBTLL4T-P4572Q4", // 2400:6180:0:d0::d9:d001, Singapore
+		"https://discovery-v6-3.syncthing.net/?id=VK6HNJ3-VVMM66S-HRVWSCR-IXEHL2H-U4AQ4MW-UCPQBWX-J2L2UBK-NVZRDQZ", // 2400:6180:0:d0::d9:d001, Singapore
 	}
 	// DefaultDiscoveryServers should be substituted when the configuration
 	// contains <globalAnnounceServer>default</globalAnnounceServer>.
@@ -54,10 +54,10 @@ var (
 	DefaultDiscoveryServersIP = []string{
 		"https://194.126.249.5/?id=SR7AARM-TCBUZ5O-VFAXY4D-CECGSDE-3Q6IZ4G-XG7AH75-OBIXJQV-QJ6NLQA",
 		"https://45.55.230.38/?id=AQEHEO2-XOS7QRA-X2COH5K-PO6OPVA-EWOSEGO-KZFMD32-XJ4ZV46-CUUVKAS",
-		"https://128.199.95.124/?id=7WT2BVR-FX62ZOW-TNVVW25-6AHFJGD-XEXQSBW-VO3MPL2-JBTLL4T-P4572Q4",
+		"https://128.199.95.124/?id=VK6HNJ3-VVMM66S-HRVWSCR-IXEHL2H-U4AQ4MW-UCPQBWX-J2L2UBK-NVZRDQZ",
 		"https://[2001:470:28:4d6::5]/?id=SR7AARM-TCBUZ5O-VFAXY4D-CECGSDE-3Q6IZ4G-XG7AH75-OBIXJQV-QJ6NLQA",
 		"https://[2604:a880:800:10::182:a001]/?id=AQEHEO2-XOS7QRA-X2COH5K-PO6OPVA-EWOSEGO-KZFMD32-XJ4ZV46-CUUVKAS",
-		"https://[2400:6180:0:d0::d9:d001]/?id=7WT2BVR-FX62ZOW-TNVVW25-6AHFJGD-XEXQSBW-VO3MPL2-JBTLL4T-P4572Q4",
+		"https://[2400:6180:0:d0::d9:d001]/?id=VK6HNJ3-VVMM66S-HRVWSCR-IXEHL2H-U4AQ4MW-UCPQBWX-J2L2UBK-NVZRDQZ",
 	}
 )

--- a/lib/discover/cache.go
+++ b/lib/discover/cache.go
@@ -44,6 +44,13 @@ type prioritizedAddress struct {
 	addr     string
 }

+// An error may implement cachedError, in which case it will be interrogated
+// to see how long we should cache the error. This overrides the default
+// negative cache time.
+type cachedError interface {
+	CacheFor() time.Duration
+}
+
 func NewCachingMux() *CachingMux {
 	return &CachingMux{
 		Supervisor: suture.NewSimple("discover.cachingMux"),
@@ -84,10 +91,11 @@ func (m *CachingMux) Lookup(deviceID protocol.DeviceID) (direct []string, relays
 				continue
 			}

-			if !cacheEntry.found && time.Since(cacheEntry.when) < finder.negCacheTime {
+			valid := time.Now().Before(cacheEntry.validUntil) || time.Since(cacheEntry.when) < finder.negCacheTime
+			if !cacheEntry.found && valid {
 				// It's a negative, valid entry. We should not make another
 				// attempt right now.
-				l.Debugln("negative cache entry for", deviceID, "at", finder)
+				l.Debugln("negative cache entry for", deviceID, "at", finder, "valid until", cacheEntry.when.Add(finder.negCacheTime), "or", cacheEntry.validUntil)
 				continue
 			}

@@ -111,10 +119,14 @@ func (m *CachingMux) Lookup(deviceID protocol.DeviceID) (direct []string, relays
 			})
 		} else {
 			// Lookup returned error, add a negative cache entry.
-			m.caches[i].Set(deviceID, CacheEntry{
+			entry := CacheEntry{
 				when:  time.Now(),
 				found: false,
-			})
+			}
+			if err, ok := err.(cachedError); ok {
+				entry.validUntil = time.Now().Add(err.CacheFor())
+			}
+			m.caches[i].Set(deviceID, entry)
 		}
 	}
 	m.mut.Unlock()
--- a/lib/discover/discover.go
+++ b/lib/discover/discover.go
@@ -22,10 +22,11 @@ type Finder interface {
 }

 type CacheEntry struct {
-	Direct []string  `json:"direct"`
-	Relays []Relay   `json:"relays"`
-	when   time.Time // When did we get the result
-	found  bool      // Is it a success (cacheTime applies) or a failure (negCacheTime applies)?
+	Direct     []string  `json:"direct"`
+	Relays     []Relay   `json:"relays"`
+	when       time.Time // When did we get the result
+	found      bool      // Is it a success (cacheTime applies) or a failure (negCacheTime applies)?
+	validUntil time.Time // Validity time, overrides normal calculation
 }

 // A FinderService is a Finder that has background activity and must be run as
--- a/lib/discover/global.go
+++ b/lib/discover/global.go
@@ -56,6 +56,16 @@ type serverOptions struct {
 	id         string // expected server device ID
 }

+// A lookupError is any other error but with a cache validity time attached.
+type lookupError struct {
+	error
+	cacheFor time.Duration
+}
+
+func (e lookupError) CacheFor() time.Duration {
+	return e.cacheFor
+}
+
 func NewGlobal(server string, cert tls.Certificate, addrList AddressLister, relayStat RelayStatusProvider) (FinderService, error) {
 	server, opts, err := parseOptions(server)
 	if err != nil {
@@ -138,11 +148,16 @@ func (c *globalClient) Lookup(device protocol.DeviceID) (direct []string, relays
 	if resp.StatusCode != 200 {
 		resp.Body.Close()
 		l.Debugln("globalClient.Lookup", qURL, resp.Status)
-		return nil, nil, errors.New(resp.Status)
+		err := errors.New(resp.Status)
+		if secs, atoiErr := strconv.Atoi(resp.Header.Get("Retry-After")); atoiErr == nil && secs > 0 {
+			err = lookupError{
+				error:    err,
+				cacheFor: time.Duration(secs) * time.Second,
+			}
+		}
+		return nil, nil, err
 	}

-	// TODO: Handle 429 and Retry-After?
-
 	var ann announcement
 	err = json.NewDecoder(resp.Body).Decode(&ann)
 	resp.Body.Close()
--- a/lib/model/model.go
+++ b/lib/model/model.go
@@ -1128,10 +1128,16 @@ func (m *Model) updateLocals(folder string, fs []protocol.FileInfo) {
 	m.fmut.RUnlock()
 	files.Update(protocol.LocalDeviceID, fs)

+	filenames := make([]string, len(fs))
+	for i, file := range fs {
+		filenames[i] = file.Name
+	}
+
 	events.Default.Log(events.LocalIndexUpdated, map[string]interface{}{
-		"folder":  folder,
-		"items":   len(fs),
-		"version": files.LocalVersion(protocol.LocalDeviceID),
+		"folder":    folder,
+		"items":     len(fs),
+		"filenames": filenames,
+		"version":   files.LocalVersion(protocol.LocalDeviceID),
 	})
 }

--- a/lib/model/rwfolder.go
+++ b/lib/model/rwfolder.go
@@ -716,6 +716,7 @@ func (p *rwFolder) deleteDir(file protocol.FileInfo) {
 				osutil.InWritableDir(osutil.Remove, filepath.Join(realName, file))
 			}
 		}
+		dir.Close()
 	}

 	err = osutil.InWritableDir(osutil.Remove, realName)
--- a/lib/relay/client/static.go
+++ b/lib/relay/client/static.go
@@ -200,9 +200,6 @@ func (c *staticClient) connect() error {
 	c.mut.Unlock()

 	conn := tls.Client(tcpConn, c.config)
-	if err = conn.Handshake(); err != nil {
-		return err
-	}

 	if err := conn.SetDeadline(time.Now().Add(c.connectTimeout)); err != nil {
 		conn.Close()
--- a/man/refresh.sh
+++ b/man/refresh.sh
@@ -15,6 +15,7 @@ pages=(
 	syncthing-bep.7
 	syncthing-localdisco.7
 	syncthing-globaldisco.7
+	syncthing-relay.7
 )

 for page in "${pages[@]}" ; do
--- a/man/syncthing-bep.7
+++ b/man/syncthing-bep.7
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-BEP" "7" "November 28, 2015" "v0.12" "Syncthing"
+.TH "SYNCTHING-BEP" "7" "December 01, 2015" "v0.12" "Syncthing"
 .SH NAME
 syncthing-bep \- Block Exchange Protocol v1
 .
--- a/man/syncthing-config.5
+++ b/man/syncthing-config.5
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-CONFIG" "5" "November 28, 2015" "v0.12" "Syncthing"
+.TH "SYNCTHING-CONFIG" "5" "December 01, 2015" "v0.12" "Syncthing"
 .SH NAME
 syncthing-config \- Syncthing Configuration
 .
--- 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" "November 28, 2015" "v0.12" "Syncthing"
+.TH "SYNCTHING-DEVICE-IDS" "7" "December 01, 2015" "v0.12" "Syncthing"
 .SH NAME
 syncthing-device-ids \- Understanding Device IDs
 .
--- 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" "November 28, 2015" "v0.12" "Syncthing"
+.TH "SYNCTHING-EVENT-API" "7" "December 01, 2015" "v0.12" "Syncthing"
 .SH NAME
 syncthing-event-api \- Event API
 .
--- a/man/syncthing-faq.7
+++ b/man/syncthing-faq.7
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-FAQ" "7" "November 28, 2015" "v0.12" "Syncthing"
+.TH "SYNCTHING-FAQ" "7" "December 01, 2015" "v0.12" "Syncthing"
 .SH NAME
 syncthing-faq \- Frequently Asked Questions
 .
--- a/man/syncthing-globaldisco.7
+++ b/man/syncthing-globaldisco.7
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-GLOBALDISCO" "7" "November 28, 2015" "v0.12" "Syncthing"
+.TH "SYNCTHING-GLOBALDISCO" "7" "December 01, 2015" "v0.12" "Syncthing"
 .SH NAME
 syncthing-globaldisco \- Global Discovery Protocol v3
 .
--- a/man/syncthing-localdisco.7
+++ b/man/syncthing-localdisco.7
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-LOCALDISCO" "7" "November 28, 2015" "v0.12" "Syncthing"
+.TH "SYNCTHING-LOCALDISCO" "7" "December 01, 2015" "v0.12" "Syncthing"
 .SH NAME
 syncthing-localdisco \- Local Discovery Protocol v3
 .
--- a/man/syncthing-networking.7
+++ b/man/syncthing-networking.7
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-NETWORKING" "7" "November 28, 2015" "v0.12" "Syncthing"
+.TH "SYNCTHING-NETWORKING" "7" "December 01, 2015" "v0.12" "Syncthing"
 .SH NAME
 syncthing-networking \- Firewall Setup
 .
--- a/man/syncthing-relay.7
+++ b/man/syncthing-relay.7
@@ -0,0 +1,7 @@
+<html>
+<head><title>404 Not Found</title></head>
+<body bgcolor="white">
+<center><h1>404 Not Found</h1></center>
+<hr><center>nginx/1.7.4</center>
+</body>
+</html>
--- 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" "November 28, 2015" "v0.12" "Syncthing"
+.TH "SYNCTHING-REST-API" "7" "December 01, 2015" "v0.12" "Syncthing"
 .SH NAME
 syncthing-rest-api \- REST API
 .
@@ -199,7 +199,7 @@ for config and db:
 .sp
 .nf
 .ft C
-$ curl \-H X\-API\-Key:abc123 \-X POST \(aqhttp://localhost:8385/rest/system/debug?disable=beacon,discovery&enable=config,db\(aq
+$ curl \-H X\-API\-Key:abc123 \-X POST \(aqhttp://localhost:8384/rest/system/debug?disable=beacon,discovery&enable=config,db\(aq
 .ft P
 .fi
 .UNINDENT
--- a/man/syncthing-security.7
+++ b/man/syncthing-security.7
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-SECURITY" "7" "November 28, 2015" "v0.12" "Syncthing"
+.TH "SYNCTHING-SECURITY" "7" "December 01, 2015" "v0.12" "Syncthing"
 .SH NAME
 syncthing-security \- Security Principles
 .
@@ -132,6 +132,22 @@ NSA or someone else) will be able to see that you use Syncthing, and your device
 ID\(aqs \fI\%are OK to share anyway\fP <\fBhttp://docs.syncthing.net/users/faq.html#should-i-keep-my-device-ids-secret\fP>,
 but the actual transmitted data is protected as well as we can. Knowing your
 device ID can expose your IP address, using global discovery.
+.SH PROTECTING YOUR SYNCTHING KEYS AND IDENTITY
+.sp
+Anyone who can access the Syncthing TLS keys and config file on your device can
+impersonate your device, connect to your peers, and then have access to your
+synced files. Here are some general principles to protect your files:
+.INDENT 0.0
+.IP 1. 3
+If a device of yours is lost, make sure to revoke its access from your other
+devices.
+.UNINDENT
+.INDENT 0.0
+.IP 2. 3
+If you\(aqre syncing confidential data on an encrypted disk to guard against
+device theft, put the Syncthing config folder on the same encrypted disk to
+avoid leaking keys and metadata. Or, use whole disk encryption.
+.UNINDENT
 .SH AUTHOR
 The Syncthing Authors
 .SH COPYRIGHT
--- a/man/syncthing-stignore.5
+++ b/man/syncthing-stignore.5
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-STIGNORE" "5" "November 28, 2015" "v0.12" "Syncthing"
+.TH "SYNCTHING-STIGNORE" "5" "December 01, 2015" "v0.12" "Syncthing"
 .SH NAME
 syncthing-stignore \- Prevent files from being synchronized to other nodes
 .
--- a/man/syncthing-versioning.7
+++ b/man/syncthing-versioning.7
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "TODO" "7" "November 28, 2015" "v0.12" "Syncthing"
+.TH "TODO" "7" "December 01, 2015" "v0.12" "Syncthing"
 .SH NAME
 Todo \- Keep automatic backups of deleted files by other nodes
 .
--- a/man/syncthing.1
+++ b/man/syncthing.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING" "1" "November 28, 2015" "v0.12" "Syncthing"
+.TH "SYNCTHING" "1" "December 01, 2015" "v0.12" "Syncthing"
 .SH NAME
 syncthing \- Syncthing
 .
Author	SHA1	Message	Date
Jakob Borg	1b6e4645b1	Update docs & translations	2015-12-06 13:09:22 +01:00
Jakob Borg	a6a573f5dc	Fix STTRACE=http (it should use the http debug logger)	2015-12-05 15:59:35 +01:00
Jakob Borg	415415b5b2	Response with Bad Request to bad config posts, not Internal Server Errors The error is the clients fault, or so we think, so we should not accept the blame.	2015-12-05 15:56:10 +01:00
Audrius Butkevicius	38e9b92c42	Merge pull request #2550 from canton7/feature/deadline staticClient.connect(): don't handshake twice (fixes #2547, #2548)	2015-12-04 12:05:28 +00:00
Antony Male	345d727936	staticClient.connect(): don't handshake twice (fixes #2547 , #2548 ) The first handshake occurred before setting the Deadline, which could cause an unintended hang.	2015-12-04 12:01:01 +00:00
Nate Morrison	86e8e5199e	Filenames added to audit log in the LocalIndexUpdated event (fixes #2549 )	2015-12-04 08:42:00 +01:00
Jakob Borg	739979a116	Add nrm21	2015-12-04 08:38:45 +01:00
Jakob Borg	7cbc81adca	Merge pull request #2545 from rumpelsepp/master Add syncthing-relay(7)	2015-12-01 15:54:10 +01:00
Stefan Tatschner	737d0fa23c	Add syncthing-relay(7)	2015-12-01 15:34:58 +01:00
Jakob Borg	ab1962934d	Docs & translations update	2015-12-01 11:24:30 +01:00
Jakob Borg	192455702d	Repair AUTHORS	2015-12-01 11:23:35 +01:00
Jakob Borg	cb0d739daf	New key for discovery-*-3	2015-12-01 11:20:16 +01:00
Jakob Borg	a937fcc477	Lol shadowing :(	2015-12-01 11:20:16 +01:00
Audrius Butkevicius	9503e60444	Merge pull request #2544 from calmh/negcache2 Accept Retry-After header on discovery lookup failures	2015-12-01 10:14:32 +00:00
Jakob Borg	9f2dc4554d	Accept Retry-After header on discovery lookup failures	2015-12-01 11:10:03 +01:00
Jakob Borg	3008dc76d3	Add buinsky	2015-11-30 18:30:36 +01:00
Audrius Butkevicius	596c4b77e8	Merge pull request #2539 from buinsky/master Fix deleting folders on WinXP (fixes #2522)	2015-11-30 16:21:46 +00:00
buinsky	05a31c2686	Fix deleting folders on WinXP (fixes #2522 )	2015-11-30 19:09:36 +03:00
Audrius Butkevicius	45535c0f5a	Merge pull request #2538 from canton7/feature/issue-2537 Allow #urPreview to scroll in the browser (fixes #2537)	2015-11-30 13:36:28 +00:00
Antony Male	4bd0dd2123	Allow #urPreview to scroll in the browser (fixes #2537 ) This is the same issue as #2014/#2062. Bootstrap doesn't like having two dialogs open at once: it marks the body has having no dialogs open when the first dialog is closed, regardless of whether the second dialog is still open. This means that scrolling doesn't happen properly, and the user cannot scroll to the dialog's 'close' button. Work around this by making sure the first dialog (the settings page) is fully closed before the second dialog (usage preview) is opened.	2015-11-30 13:27:07 +00:00