Only check specified paths in check-authors.go

(to indicate it is a master directory)

AUTHORS

@@ -57,6 +57,7 @@ Marc Pujol <kilburn@la3.org>
 Marcin Dziadus <dziadus.marcin@gmail.com>
 Mateusz Naściszewski <matin1111@wp.pl>
 Matt Burke <mburke@amplify.com> <burkemw3@gmail.com>
+Max Schulze <max.schulze@online.de> <kralo@users.noreply.github.com>
 Michael Jephcote <rewt0r@gmx.com> <Rewt0r@users.noreply.github.com>
 Michael Ploujnikov <ploujj@gmail.com>
 Michael Tilli <pyfisch@gmail.com>

NICKS

@@ -41,6 +41,7 @@ KayoticSully	<kayoticsully@gmail.com>
 kilburn		<kilburn@la3.org>
 kluppy	<kluppy@going2blue.com>
 kozec		<kozec@kozec.com>
+kralo	<max.schulze@online.de>
 krozycki	<rozycki.karol@gmail.com>
 letiemble	<laurent.etiemble@gmail.com> <laurent.etiemble@monobjc.net>
 LordLandon	<lordlandon@gmail.com>

build.go

@@ -188,7 +188,18 @@ func setup() {
 
 func test(pkg string) {
 	setBuildEnv()
-	runPrint("go", "test", "-short", "-race", "-timeout", "60s", pkg)
+	useRace := runtime.GOARCH == "amd64"
+	switch runtime.GOOS {
+	case "darwin", "linux", "freebsd", "windows":
+	default:
+		useRace = false
+	}
+
+	if useRace {
+		runPrint("go", "test", "-short", "-race", "-timeout", "60s", pkg)
+	} else {
+		runPrint("go", "test", "-short", "-timeout", "60s", pkg)
+	}
 }
 
 func bench(pkg string) {

cmd/syncthing/gui.go

@@ -236,12 +236,12 @@ func (s *apiService) Serve() {
 
 	guiCfg := s.cfg.GUI()
 
+	// Add the CORS handling
+	handler := corsMiddleware(mux)
+
 	// Wrap everything in CSRF protection. The /rest prefix should be
 	// protected, other requests will grant cookies.
-	handler := csrfMiddleware(s.id.String()[:5], "/rest", guiCfg.APIKey(), mux)
-
-	// Add the CORS handling
-	handler = corsMiddleware(handler)
+	handler = csrfMiddleware(s.id.String()[:5], "/rest", guiCfg, handler)
 
 	// Add our version and ID as a header to responses
 	handler = withDetailsMiddleware(s.id, handler)
@@ -382,6 +382,10 @@ func corsMiddleware(next http.Handler) http.Handler {
 	// Handle CORS headers and CORS OPTIONS request.
 	// CORS OPTIONS request are typically sent by browser during AJAX preflight
 	// when the browser initiate a POST request.
+	//
+	// As the OPTIONS request is unauthorized, this handler must be the first
+	// of the chain.
+	//
 	// See https://www.w3.org/TR/cors/ for details.
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		// Add a generous access-control-allow-origin header since we may be
@@ -615,8 +619,14 @@ func (s *apiService) getDBFile(w http.ResponseWriter, r *http.Request) {
 	qs := r.URL.Query()
 	folder := qs.Get("folder")
 	file := qs.Get("file")
-	gf, _ := s.model.CurrentGlobalFile(folder, file)
-	lf, _ := s.model.CurrentFolderFile(folder, file)
+	gf, gfOk := s.model.CurrentGlobalFile(folder, file)
+	lf, lfOk := s.model.CurrentFolderFile(folder, file)
+
+	if !(gfOk || lfOk) {
+		// This file for sure does not exist.
+		http.Error(w, "No such object in the index", http.StatusNotFound)
+		return
+	}
 
 	av := s.model.Availability(folder, file)
 	sendJSON(w, map[string]interface{}{
@@ -893,8 +903,10 @@ func (s *apiService) getEvents(w http.ResponseWriter, r *http.Request) {
 
 	s.fss.gotEventRequest()
 
-	// Flush before blocking, to indicate that we've received the request
-	// and that it should not be retried.
+	// Flush before blocking, to indicate that we've received the request and
+	// that it should not be retried. Must set Content-Type header before
+	// flushing.
+	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	f := w.(http.Flusher)
 	f.Flush()
 

cmd/syncthing/gui_auth.go

@@ -33,9 +33,8 @@ func emitLoginAttempt(success bool, username string) {
 }
 
 func basicAuthAndSessionMiddleware(cookieName string, cfg config.GUIConfiguration, next http.Handler) http.Handler {
-	apiKey := cfg.APIKey()
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if apiKey != "" && r.Header.Get("X-API-Key") == apiKey {
+		if cfg.IsValidAPIKey(r.Header.Get("X-API-Key")) {
 			next.ServeHTTP(w, r)
 			return
 		}

cmd/syncthing/gui_csrf.go

@@ -13,6 +13,7 @@ import (
 	"os"
 	"strings"
 
+	"github.com/syncthing/syncthing/lib/config"
 	"github.com/syncthing/syncthing/lib/osutil"
 	"github.com/syncthing/syncthing/lib/sync"
 )
@@ -30,11 +31,11 @@ const maxCsrfTokens = 25
 // Check for CSRF token on /rest/ URLs. If a correct one is not given, reject
 // the request with 403. For / and /index.html, set a new CSRF cookie if none
 // is currently set.
-func csrfMiddleware(unique, prefix, apiKey string, next http.Handler) http.Handler {
+func csrfMiddleware(unique string, prefix string, cfg config.GUIConfiguration, next http.Handler) http.Handler {
 	loadCsrfTokens()
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		// Allow requests carrying a valid API key
-		if apiKey != "" && r.Header.Get("X-API-Key") == apiKey {
+		if cfg.IsValidAPIKey(r.Header.Get("X-API-Key")) {
 			next.ServeHTTP(w, r)
 			return
 		}

cmd/syncthing/main.go

@@ -122,11 +122,6 @@ var (
 const (
 	usage      = "syncthing [options]"
 	extraUsage = `
-The default configuration directory is:
-
-  %s
-
-
 The -logflags value is a sum of the following:
 
    1  Date
@@ -199,6 +194,7 @@ type RuntimeOptions struct {
 	confDir        string
 	reset          bool
 	showVersion    bool
+	showPaths      bool
 	doUpgrade      bool
 	doUpgradeCheck bool
 	upgradeTo      string
@@ -260,6 +256,7 @@ func parseCommandLineOptions() RuntimeOptions {
 	flag.BoolVar(&options.doUpgrade, "upgrade", false, "Perform upgrade")
 	flag.BoolVar(&options.doUpgradeCheck, "upgrade-check", false, "Check for available upgrade")
 	flag.BoolVar(&options.showVersion, "version", false, "Show version")
+	flag.BoolVar(&options.showPaths, "paths", false, "Show configuration paths")
 	flag.StringVar(&options.upgradeTo, "upgrade-to", options.upgradeTo, "Force upgrade directly from specified URL")
 	flag.BoolVar(&options.auditEnabled, "audit", false, "Write events to audit file")
 	flag.BoolVar(&options.verbose, "verbose", false, "Print verbose log output")
@@ -270,7 +267,7 @@ func parseCommandLineOptions() RuntimeOptions {
 		flag.BoolVar(&options.hideConsole, "no-console", false, "Hide console window")
 	}
 
-	longUsage := fmt.Sprintf(extraUsage, baseDirs["config"], debugFacilities())
+	longUsage := fmt.Sprintf(extraUsage, debugFacilities())
 	flag.Usage = usageFor(flag.CommandLine, usage, longUsage)
 	flag.Parse()
 
@@ -320,6 +317,11 @@ func main() {
 		return
 	}
 
+	if options.showPaths {
+		showPaths()
+		return
+	}
+
 	if options.browserOnly {
 		openGUI()
 		return
@@ -478,7 +480,7 @@ func upgradeViaRest() error {
 	cfg, _ := loadConfig()
 	target := cfg.GUI().URL()
 	r, _ := http.NewRequest("POST", target+"/rest/system/upgrade", nil)
-	r.Header.Set("X-API-Key", cfg.GUI().APIKey())
+	r.Header.Set("X-API-Key", cfg.GUI().APIKey)
 
 	tr := &http.Transport{
 		Dial:            dialer.Dial,
@@ -1216,3 +1218,13 @@ func checkShortIDs(cfg *config.Wrapper) error {
 	}
 	return nil
 }
+
+func showPaths() {
+	fmt.Printf("Configuration file:\n\t%s\n\n", locations[locConfigFile])
+	fmt.Printf("Database directory:\n\t%s\n\n", locations[locDatabase])
+	fmt.Printf("Device private key & certificate files:\n\t%s\n\t%s\n\n", locations[locKeyFile], locations[locCertFile])
+	fmt.Printf("HTTPS private key & certificate files:\n\t%s\n\t%s\n\n", locations[locHTTPSKeyFile], locations[locHTTPSCertFile])
+	fmt.Printf("Log file:\n\t%s\n\n", locations[locLogFile])
+	fmt.Printf("GUI override directory:\n\t%s\n\n", locations[locGUIAssets])
+	fmt.Printf("Default sync folder directory:\n\t%s\n\n", locations[locDefFolder])
+}

cmd/syncthing/usage_report.go

@@ -121,10 +121,14 @@ func reportData(cfg *config.Wrapper, m *model.Model) map[string]interface{} {
 
 	var rescanIntvs []int
 	folderUses := map[string]int{
-		"readonly":      0,
-		"ignorePerms":   0,
-		"ignoreDelete":  0,
-		"autoNormalize": 0,
+		"readonly":            0,
+		"ignorePerms":         0,
+		"ignoreDelete":        0,
+		"autoNormalize":       0,
+		"simpleVersioning":    0,
+		"externalVersioning":  0,
+		"staggeredVersioning": 0,
+		"trashcanVersioning":  0,
 	}
 	for _, cfg := range cfg.Folders() {
 		rescanIntvs = append(rescanIntvs, cfg.RescanIntervalS)
@@ -141,6 +145,9 @@ func reportData(cfg *config.Wrapper, m *model.Model) map[string]interface{} {
 		if cfg.AutoNormalize {
 			folderUses["autoNormalize"]++
 		}
+		if cfg.Versioning.Type != "" {
+			folderUses[cfg.Versioning.Type+"Versioning"]++
+		}
 	}
 	sort.Ints(rescanIntvs)
 	res["rescanIntvs"] = rescanIntvs

debian/control

@@ -1,8 +1,16 @@
 Package: syncthing
+Version: {{.version}}
+Priority: optional
+Section: net
 Architecture: {{.arch}}
 Depends: libc6, procps
-Version: {{.version}}
+Homepage: https://syncthing.net/
 Maintainer: Syncthing Release Management <release@syncthing.net>
 Description: Open Source Continuous File Synchronization
-	Syncthing does bidirectional synchronization of files between two or
-	more computers.
+ Syncthing is an application that lets you synchronize your files across
+ multiple devices. This means the creation, modification or deletion of files
+ on one machine will automatically be replicated to your other devices. We
+ believe your data is your data alone and you deserve to choose where it is
+ stored. Therefore Syncthing does not upload your data to the cloud but
+ exchanges your data across your machines as soon as they are online at the
+ same time.

etc/linux-systemd/system/syncthing-resume.service

@@ -0,0 +1,10 @@
+[Unit]
+Description=Restart Syncthing after resume
+After=suspend.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/pkill -HUP -x syncthing
+
+[Install]
+WantedBy=suspend.target

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

@@ -181,7 +181,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).",
+    "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 \"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 χαρακτήρες (γράμματα και αριθμοί). Τα κενά και οι παύλες είναι προαιρετικά (αδιάφορα).",
@@ -194,16 +194,16 @@
     "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).": "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).",
+    "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.": "Πόσες παλιότερες εκδόσεις θα διατηρούνται, ανά αρχείο.",
     "The number of versions must be a number and cannot be blank.": "Ο αριθμός εκδόσεων πρέπει να είναι αριθμός και σίγουρα όχι κενό.",
     "The path cannot be blank.": "Το μονοπάτι δεν μπορεί να είναι κενό.",
-    "The rate limit must be a non-negative number (0: no limit)": "The rate limit must be a non-negative number (0: no limit)",
+    "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 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.": "Αυτό μπορεί εύκολα να δώσει πρόσβαση ανάγνωσης και επεξεργασίας αρχείων του υπολογιστή σας σε χάκερς.",
     "This is a major version upgrade.": "Αυτή είναι μιας σημαντική αναβάθμιση.",
     "Trash Can File Versioning": "Ο κάδος μπορεί να τηρεί εκδόσεις",
     "Unknown": "Άγνωστο",

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

@@ -76,7 +76,7 @@
     "Generate": "Generoi",
     "Global Discovery": "Globaali etsintä",
     "Global Discovery Server": "Globaali etsintäpalvelin",
-    "Global Discovery Servers": "Global Discovery Servers",
+    "Global Discovery Servers": "Globaalit etsintäpalvelimet",
     "Global State": "Globaali tila",
     "Help": "Apua",
     "Home page": "Kotisivu",

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

@@ -18,7 +18,7 @@
     "Alphabetic": "Alphabétique",
     "An external command handles the versioning. It has to remove the file from the synced folder.": "Une commande externe gère les versions de fichiers. Elle supprime les fichiers dans le dossier synchronisé.",
     "Anonymous Usage Reporting": "Rapport anonyme de statistiques d'utilisation",
-    "Any devices configured on an introducer device will be added to this device as well.": "Toute machine ajoutée depuis une machine introductrice sera aussi ajoutée sur cette machine.",
+    "Any devices configured on an introducer device will be added to this device as well.": "Toute machine ajoutée depuis une machine initiatrice sera aussi ajoutée sur cette machine.",
     "Automatic upgrades": "Mises à jour automatiques",
     "Be careful!": "Faites attention !",
     "Bugs": "Bugs",
@@ -44,7 +44,7 @@
     "Disconnected": "Déconnecté",
     "Discovery": "Découverte",
     "Documentation": "Documentation",
-    "Download Rate": "Débit de réception",
+    "Download Rate": "Vitesse de réception",
     "Downloaded": "Téléchargé",
     "Downloading": "En cours de téléchargement",
     "Edit": "Éditer",
@@ -83,7 +83,7 @@
     "Ignore": "Ignorer",
     "Ignore Patterns": "Modèles à éviter",
     "Ignore Permissions": "Ignorer les permissions",
-    "Incoming Rate Limit (KiB/s)": "Limite du débit entrant (KiB/s)",
+    "Incoming Rate Limit (KiB/s)": "Limite du débit de réception (Ko/s)",
     "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Une configuration incorrecte peut créer des dommages dans vos dossiers et mettre hors-service Syncthing",
     "Introducer": "Initiateur",
     "Inversion of the given condition (i.e. do not exclude)": "Inverser la condition donnée (i.e. ne pas exclure)",
@@ -114,7 +114,7 @@
     "Options": "Options",
     "Out of Sync": "Désynchronisé",
     "Out of Sync Items": "Fichiers non synchronisés",
-    "Outgoing Rate Limit (KiB/s)": "Limite du débit sortant (KiB/s)",
+    "Outgoing Rate Limit (KiB/s)": "Limite du débit d'émission (Ko/s)",
     "Override Changes": "Écraser les changements",
     "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": "Le chemin du dossier sur l'ordinateur local sera créé si il n'existe pas. Le caractère tilde (~) peut être utilisé comme raccourci vers",
     "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Chemin où les versions doivent être conservées (laisser vide pour le chemin par défaut de .stversions dans le répertoire)",
@@ -214,7 +214,7 @@
     "Upgrade": "Mettre à jour",
     "Upgrade To {%version%}": "Mettre à jour vers {{version}}",
     "Upgrading": "Mise à jour de Syncthing",
-    "Upload Rate": "Débit d'envoi",
+    "Upload Rate": "Vitesse d'émission",
     "Uptime": "Durée de fonctionnement",
     "Use HTTPS for GUI": "Utiliser l'HTTPS pour le GUI",
     "Version": "Version",

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

@@ -169,7 +169,7 @@
     "Statistics": "Statistiken",
     "Stopped": "Stoppe",
     "Support": "Understeuning",
-    "Sync Protocol Listen Addresses": "Sync-protokol harkadres",
+    "Sync Protocol Listen Addresses": "Sync-protokolharkadressen",
     "Syncing": "Oan it Syncen",
     "Syncthing has been shut down.": "Syncthing is útsetten",
     "Syncthing includes the following software or portions thereof:": "Syncthing befettet de folgende sêftguod of parten dêrfan:",

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

@@ -12,7 +12,7 @@
     "Address": "Adresas",
     "Addresses": "Adresai",
     "Advanced": "Pažangus",
-    "Advanced Configuration": "Pažangus nustatymai",
+    "Advanced Configuration": "Išplėstinė konfigūracija",
     "All Data": "Visiems duomenims",
     "Allow Anonymous Usage Reporting?": "Siųsti anonimišką vartojimo ataskaitą?",
     "Alphabetic": "Abėcėlės tvarka",
@@ -34,7 +34,7 @@
     "Copied from original": "Nukopijuota iš originalo",
     "Copyright © 2015 the following Contributors:": "Visos teisės saugomos © 2015 šių bendraautorių:",
     "Danger!": "Pavojus!",
-    "Delete": "Trinti",
+    "Delete": "Ištrinti",
     "Deleted": "Ištrinta",
     "Device ID": "Įrenginio ID",
     "Device Identification": "Įrenginio identifikacija",
@@ -111,15 +111,15 @@
     "OK": "Gerai",
     "Off": "Netaikoma",
     "Oldest First": "Seniausi pirmiau",
-    "Options": "Nustatymai",
+    "Options": "Parametrai",
     "Out of Sync": "Išsisinchronizavę",
     "Out of Sync Items": "Nesutikrinta",
     "Outgoing Rate Limit (KiB/s)": "Išeinančio srauto maksimalus greitis (KiB/s)",
     "Override Changes": "Perrašyti pakeitimus",
     "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": "Kelias iki aplanko šiame kompiuteryje. Bus sukurtas, jei neegzistuoja. Tildės simbolis (~) gali būti naudojamas kaip trumpinys",
     "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Kelias, kur bus saugomos versijos (palikite tuščią numatytam .stversions aplankui).",
-    "Pause": "Sustabdyti",
-    "Paused": "Sustabdyta",
+    "Pause": "Pristabdyti",
+    "Paused": "Pristabdyta",
     "Please consult the release notes before performing a major upgrade.": "Peržvelkite laidos informaciją prieš atlikdami stambų atnaujinimą.",
     "Please set a GUI Authentication User and Password in the Settings dialog.": "Prašome nustatymų dialoge nustatyti valdymo skydelio vartotojo vardą ir slaptažodį.",
     "Please wait": "Prašome palaukti",

gui/default/assets/lang/lang-pl.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.": "Urządzenie o tym ID jest już dodane.",
     "A negative number of days doesn't make sense.": "Ujemna ilość dni nie ma sensu.",
     "A new major version may not be compatible with previous versions.": "Nowa wersja może być niekompatybilna z poprzednimi wersjami.",
     "API Key": "Klucz API",
@@ -33,7 +33,7 @@
     "Copied from elsewhere": "Skopiowane z innego miejsca ",
     "Copied from original": "Skopiowane z oryginału",
     "Copyright © 2015 the following Contributors:": "Copyright © 2015: ",
-    "Danger!": "Danger!",
+    "Danger!": "Niebezpieczne!",
     "Delete": "Usuń",
     "Deleted": "Usunięto",
     "Device ID": "ID urządzenia",
@@ -51,7 +51,7 @@
     "Edit Device": "Edytuj urządzenie",
     "Edit Folder": "Edytuj folder",
     "Editing": "Edytowanie",
-    "Enable Relaying": "Enable Relaying",
+    "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.",
     "Enter ignore patterns, one per line.": "Wprowadź wzorce ignorowania, jeden w każdej linii.",
@@ -76,7 +76,7 @@
     "Generate": "Generuj",
     "Global Discovery": "Globalne odnajdywanie",
     "Global Discovery Server": "Globalny serwer rozgłoszeniowy",
-    "Global Discovery Servers": "Global Discovery Servers",
+    "Global Discovery Servers": "Globalne serwery odkrywania",
     "Global State": "Status globalny",
     "Help": "Pomoc",
     "Home page": "Strona domowa",
@@ -121,14 +121,14 @@
     "Pause": "Zatrzymaj",
     "Paused": "Zatrzymany",
     "Please consult the release notes before performing a major upgrade.": "Zaleca się przeanalizowanie \"release notes\" przed przeprowadzeniem znaczącej aktualizacji.",
-    "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.": "Ustaw proszę użytkownika i hasło dostępowe do GUI w Ustawieniach",
     "Please wait": "Proszę czekać",
     "Preview": "Podgląd",
     "Preview Usage Report": "Podgląd raportu użycia.",
     "Quick guide to supported patterns": "Krótki przewodnik po obsługiwanych wzorcach",
     "RAM Utilization": "Użycie pamięci RAM",
     "Random": "Losowo",
-    "Relay Servers": "Relay Servers",
+    "Relay Servers": "Serwery przekazywania",
     "Relayed via": "Przekazane przez",
     "Relays": "Przekaźniki",
     "Release Notes": "Informacje o wydaniu",
@@ -142,7 +142,7 @@
     "Resume": "Wznów",
     "Reused": "Ponownie użyte",
     "Save": "Zapisz",
-    "Scan Time Remaining": "Scan Time Remaining",
+    "Scan Time Remaining": "Pozostały czas skanowania",
     "Scanning": "Skanowanie",
     "Select the devices to share this folder with.": "Wybierz urządzenie, któremu udostępnić folder.",
     "Select the folders to share with this device.": "Wybierz foldery do współdzielenia z tym urządzeniem.",
@@ -155,7 +155,7 @@
     "Shared With": "Współdzielony z",
     "Short identifier for the folder. Must be the same on all cluster devices.": "Krótki identyfikator folderu. Musi być taki sam na wszystkich urządzeniach.",
     "Show ID": "Pokaż ID",
-    "Show QR": "Show QR",
+    "Show QR": "Pokaż kod QR",
     "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Pokazane w statusie zamiast ID urządzenia.Zostanie wysłane do innych urządzeń jako opcjonalna domyślna nazwa.",
     "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Pokazane w statusie zamiast ID urządzenia. Zostanie zaktualizowane do nazwy urządzenia jeżeli pozostanie puste.",
     "Shutdown": "Wyłącz",
@@ -177,11 +177,11 @@
     "Syncthing is upgrading.": "Aktualizowanie Syncthing",
     "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing wydaje się być wyłączony lub jest problem z twoim połączeniem internetowym. Próbuje ponownie...",
     "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing nie może przetworzyć twojego zapytania. Proszę przeładuj stronę lub zrestartuj Syncthing, jeśli problem pozostanie.",
-    "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.": "Interfejs administracyjny Syncthing jest skonfigurowany w sposób pozwalający na zdalny dostęp bez hasła.",
     "The aggregated statistics are publicly available at {%url%}.": "Zebrane statystyki są publicznie dostępne pod adresem {{url}}.",
     "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Konfiguracja została zapisana lecz nie jest aktywna. Syncthing musi zostać zrestartowany aby aktywować nową konfiguracje.",
     "The device ID cannot be blank.": "ID urządzenia nie może być puste.",
-    "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).": "ID urządzenia może być znalezione w \"Akcja > Pokaż ID\" na innym urządzeniu. Spacje i myślniki są opcjonalne (są one ignorowane).",
     "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).": "ID urządzenia można znaleźć w \"Edytuj -> Pokaż ID\" na zdalnym urządzeniu.\nOdstępy i myślniki są opcjonalne (ignorowane)",
     "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.": "Zaszyfrowane raporty użycia są wysyłane codziennie. Są one używane w celach statystycznych platform, rozmiarów katalogów i wersji programu. Jeżeli zgłaszane dane ulegną zmianie, ponownie wyświetli się ta informacja.",
     "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.": "Wprowadzone ID urządzenia wygląda na niepoprawne. Musi zawierać 52 lub 56 znaków składających się z liter i cyfr. Odstępy i myślniki są opcjonalne.",
@@ -203,7 +203,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 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.": "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",
     "Unknown": "Nieznany",

gui/default/assets/lang/lang-sv.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.": "En enhet med det ID är redan tillagt.",
     "A negative number of days doesn't make sense.": "Negativt antal dagar är inte troligt.",
     "A new major version may not be compatible with previous versions.": "En ny huvudversion kan eventuellt vara inkompatibel med tidigare versioner.",
     "API Key": "API-nyckel",
@@ -33,7 +33,7 @@
     "Copied from elsewhere": "Kopierat utifrån",
     "Copied from original": "Oförändrat",
     "Copyright © 2015 the following Contributors:": "Copyright © 2015 följande medverkande:",
-    "Danger!": "Danger!",
+    "Danger!": "Fara!",
     "Delete": "Radera",
     "Deleted": "Borttaget",
     "Device ID": "Enhets-ID",
@@ -142,7 +142,7 @@
     "Resume": "Återuppta",
     "Reused": "Återanvänt",
     "Save": "Spara",
-    "Scan Time Remaining": "Scan Time Remaining",
+    "Scan Time Remaining": "Skanna Återstående Tid",
     "Scanning": "Uppdaterar",
     "Select the devices to share this folder with.": "Ange enheterna att dela den här katalogen med.",
     "Select the folders to share with this device.": "Välj kataloger att dela med den här enheten.",
@@ -155,7 +155,7 @@
     "Shared With": "Delad med",
     "Short identifier for the folder. Must be the same on all cluster devices.": "Kort identifieringssträng för katalogen. Måste vara samma på alla enheter i klustret.",
     "Show ID": "Visa ID",
-    "Show QR": "Show QR",
+    "Show QR": "Visa QR",
     "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Visas i stället för enhets-ID. Skickas till andra enheter som namn på denna enhet.",
     "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Visas i stället för enhets-ID. Sätts till namnet på den andra enheten vid första anslutning om det lämnas tomt.",
     "Shutdown": "Stäng av",
@@ -177,11 +177,11 @@
     "Syncthing is upgrading.": "Syncthing uppgraderas.",
     "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing verkar avstängd, eller finns det problem med din Internetanslutning. Försöker igen...",
     "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing verkar ha drabbats av ett problem. Uppdatera sidan eller starta om Syncthing om problemet kvarstår.",
-    "The Syncthing admin interface is configured to allow remote access without a password.": "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.": "Syncthing administratör gränssnittet är konfigurerat för att tillåta fjärrtillträde utan ett lösenord.",
     "The aggregated statistics are publicly available at {%url%}.": "Sammanställd statistik finns publikt tillgänglig på {{url}}.",
     "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Konfigurationen har sparats men inte aktiverats. Syncthing måste startas om för att aktivera den nya konfigurationen.",
     "The device ID cannot be blank.": "Enhets-ID kan inte vara tomt.",
-    "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).": "Enhets-ID som behövs här kan du hitta i \"Redigera > Visa ID\"-dialogen på den andra enheten. Mellanrum och bindestreck är valfria (ignoreras).",
     "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).": "Enhets-ID som behövs här kan du hitta i \"Redigera > Visa ID\"-dialogen på den andra enheten. Mellanrum och bindestreck är valfria (ignoreras).",
     "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 krypterade användarstatistiken skickas dagligen. Den används för att spåra vanliga plattformar, katalogstorlekar och versioner. Om datan som rapporteras ändras så kommer du att bli tillfrågad 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 inmatade enhets-ID:t verkar inte korrekt. Det ska vara en 52 eller 56 teckens sträng bestående av siffror och bokstäver, eventuellt med mellanrum och bindestreck.",

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

@@ -181,7 +181,7 @@
     "The aggregated statistics are publicly available at {%url%}.": "Toplanan halka açık istatistiklere ulaşabileceğiniz adres {{url}}.",
     "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.": "Cihaz 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).": "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).": "Buraya girilecek olan aygıt ID'si diğer cihazlarda, \"Eylemler > ID Göster\" penceresinde bulunabilir. Boşluklar ve çizgiler isteğe bağlıdır (yoksayılmış).",
     "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).": "Buraya girilecek cihaz ID'si diğer düğümde \"Düzenle > ID Göster\" menüsünden bulunabilir. Boşluk ve kısa çizginin olup olmaması önemli değildir. (İhmal edilir)",
     "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.": "Şifrelenmiş kullanım bilgisi günlük olarak gönderilir. Platform, klasör büyüklüğü ve uygulama sürümü hakkında bilgi toplanır. Toplanan bilgi çeşidi değişecek olursa, sizden tekrar onay istenecek.",
     "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.": "Girilen cihaz ID'si geçerli gibi gözükmüyor. 52 ya da 56 karakter uzunluğunda, harf ve rakamlardan oluşmalı. Boşlukların ve kısa çizgilerin olup olmaması önemli değildir.",

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

@@ -1,5 +1,5 @@
 {
-    "A device with that ID is already added.": "Пристрій з таким ID вже додано.",
+    "A device with that ID is already added.": "Пристрій з таким ID вже додано раніше.",
     "A negative number of days doesn't make sense.": "Від'ємна кількість днів немає сенсу.",
     "A new major version may not be compatible with previous versions.": "Нова мажорна версія може бути несумісною із попередніми версіями.",
     "API Key": "API ключ",
@@ -42,7 +42,7 @@
     "Device {%device%} ({%address%}) wants to connect. Add new device?": "Пристрій {{device}} ({{address}}) намагається під’єднатися. Додати новий пристрій?",
     "Devices": "Пристрої",
     "Disconnected": "З’єднання відсутнє",
-    "Discovery": "Виявлення",
+    "Discovery": "Сервери обходу NAT",
     "Documentation": "Документація",
     "Download Rate": "Швидкість завантаження",
     "Downloaded": "Завантажено",
@@ -51,7 +51,7 @@
     "Edit Device": "Редагувати пристрій",
     "Edit Folder": "Редагувати директорію",
     "Editing": "Редагування",
-    "Enable Relaying": "Enable Relaying",
+    "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\" для автоматичного визначення адреси.",
     "Enter ignore patterns, one per line.": "Введіть шаблони ігнорування, по одному на рядок.",
@@ -63,10 +63,10 @@
     "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.": "Файли захищено від змін зроблених на інших пристроях, але зміни зроблені на цьому пристрої будуть надіслані решті кластеру.",
+    "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": "ID директорії",
-    "Folder Master": "Центральна директорія",
+    "Folder Master": "Вважати за оригінал",
     "Folder Path": "Шлях до директорії",
     "Folders": "Директорії",
     "GUI": "Графічний інтерфейс",
@@ -74,14 +74,14 @@
     "GUI Authentication User": "Логін користувача для доступу до панелі управління",
     "GUI Listen Addresses": "Адреса доступу до панелі управління",
     "Generate": "Згенерувати",
-    "Global Discovery": "Глобальне виявлення",
+    "Global Discovery": "Глобальне виявлення (internet)",
     "Global Discovery Server": "Сервер для глобального виявлення",
-    "Global Discovery Servers": "Global Discovery Servers",
+    "Global Discovery Servers": "Сервери глобального виявлення \n(координації обходу NAT)",
     "Global State": "Глобальний статус",
     "Help": "Допомога",
     "Home page": "Домашня сторінка",
     "Ignore": "Ігнорувати",
-    "Ignore Patterns": "Ігнорувати шаблони",
+    "Ignore Patterns": "Шаблони винятків",
     "Ignore Permissions": "Ігнорувати права доступу до файлів",
     "Incoming Rate Limit (KiB/s)": "Ліміт швидкості завантаження (КіБ/с)",
     "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Невірна конфігурація може пошкодити вміст вашої директорії та зробити Syncthing недієздатним.",
@@ -92,7 +92,7 @@
     "Last File Received": "Останній завантажений файл",
     "Last seen": "З’являвся останній раз",
     "Later": "Пізніше",
-    "Local Discovery": "Локальне виявлення",
+    "Local Discovery": "Локальне виявлення (LAN)",
     "Local State": "Локальний статус",
     "Local State (Total)": "Локальний статус (загалом)",
     "Major Upgrade": "Мажорне оновлення",
@@ -115,7 +115,7 @@
     "Out of Sync": "Не синхронізовано",
     "Out of Sync Items": "Не синхронізовані елементи",
     "Outgoing Rate Limit (KiB/s)": "Ліміт швидкості віддачі (КіБ/с)",
-    "Override Changes": "Перезаписати зміни",
+    "Override Changes": "Розіслати мою версію",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Шлях до директорії на локальному комп’ютері. Буде створений, якщо такий не існує. Символ тильди (~) може бути використаний як ярлик для",
     "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Шлях, де повинні зберігатися версії (залиште порожнім для зберігання в .stversions в середині директорії)",
     "Pause": "Пауза",
@@ -128,9 +128,9 @@
     "Quick guide to supported patterns": "Швидкий посібник по шаблонам, що підтримуються",
     "RAM Utilization": "Використання RAM",
     "Random": "Випадково",
-    "Relay Servers": "Relay Servers",
+    "Relay Servers": "Сервери ретрансляції",
     "Relayed via": "Ретранслювати через",
-    "Relays": "Ретрансляція",
+    "Relays": "Ретранслятори",
     "Release Notes": "Примітки до випуску",
     "Remove": "Видалити",
     "Rescan": "Пересканувати",
@@ -169,7 +169,7 @@
     "Statistics": "Статистика",
     "Stopped": "Зупинено",
     "Support": "Підтримка",
-    "Sync Protocol Listen Addresses": "Адреса панелі управління",
+    "Sync Protocol Listen Addresses": "Адреса і вхідний порт протоколу синхронізації",
     "Syncing": "Синхронізація",
     "Syncthing has been shut down.": "Syncthing вимкнено (закрито).",
     "Syncthing includes the following software or portions thereof:": "Syncthing містить наступне програмне забезпечення (або його частини):",
@@ -181,7 +181,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.": "ID пристрою не може бути порожнім.",
-    "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).": "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).": "ID пристрою, який необхідно додати. Може бути знайдений у вікні \"Редагувати > Показати ID\" на іншому пристрої. Пробіли та тире опціональні (вони ігноруються програмою).",
     "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.": "Введений ID пристрою невалідний. Ідентифікатор має вигляд строки довжиною 52 або 56 символів, що містить цифри та літери, із опціональними пробілами та тире.",
@@ -220,7 +220,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.": "Версії автоматично видаляються, якщо вони старше, ніж максимальний вік, або перевищують допустиму кількість файлів за інтервал.",
-    "When adding a new device, keep in mind that this device must be added on the other side too.": "Коли додаєте новий пристрій, пам’ятайте, що цей пристрій повинен бути доданий і на іншій стороні.",
+    "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.": "Коли додаєте нову директорію, пам’ятайте, що ID цієї директорії використовується для того, щоб зв’язувати директорії разом між вузлами. Назви є чутливими до регістра та повинні співпадати точно між усіма вузлами.",
     "Yes": "Так",
     "You must keep at least one version.": "Ви повинні зберігати щонайменше одну версію.",

gui/default/index.html

@@ -222,7 +222,7 @@
               <div class="panel-progress" ng-show="folderStatus(folder) == 'syncing'" ng-attr-style="width: {{syncPercentage(folder.id)}}%"></div>
               <div class="panel-progress" ng-show="folderStatus(folder) == 'scanning' && scanProgress[folder.id] != undefined" ng-attr-style="width: {{scanPercentage(folder.id)}}%"></div>
               <h3 class="panel-title">
-                <span class="fa fa-folder hidden-xs"></span>{{folder.id}}
+                <span class="fa hidden-xs fa-fw" ng-class="[folder.readOnly ? 'fa-lock' : 'fa-folder']"></span>{{folder.id}}
                 <span class="pull-right text-{{folderClass(folder)}}" ng-switch="folderStatus(folder)">
                   <span ng-switch-when="unknown"><span class="hidden-xs" translate>Unknown</span><span class="visible-xs">&#9724;</span></span>
                   <span ng-switch-when="unshared"><span class="hidden-xs" translate>Unshared</span><span class="visible-xs">&#9724;</span></span>
@@ -249,7 +249,7 @@
                   <tbody>
                     <tr>
                       <th><span class="fa fa-fw fa-folder-open"></span>&nbsp;<span translate>Folder Path</span></th>
-                      <td class="text-right">{{folder.path}}</td>
+                      <td class="text-right" title="{{folder.path}}">{{folder.path}}</td>
                     </tr>
                     <tr ng-if="model[folder.id].invalid || model[folder.id].error">
                       <th><span class="fa fa-fw fa-exclamation-triangle"></span>&nbsp;<span translate>Error</span></th>
@@ -442,7 +442,7 @@
                   </tr>
                   <tr>
                     <th><span class="fa fa-fw fa-tag"></span>&nbsp;<span translate>Version</span></th>
-                    <td class="text-right">{{versionString()}}</td>
+                    <td class="text-right" title="{{versionString()}}">{{versionString()}}</td>
                   </tr>
                 </tbody>
               </table>

gui/default/syncthing/core/aboutModalView.html

@@ -69,6 +69,7 @@
         <li class="auto-generated">Marcin Dziadus</li>
         <li class="auto-generated">Mateusz Naściszewski</li>
         <li class="auto-generated">Matt Burke</li>
+        <li class="auto-generated">Max Schulze</li>
         <li class="auto-generated">Michael Jephcote</li>
         <li class="auto-generated">Michael Ploujnikov</li>
         <li class="auto-generated">Michael Tilli</li>

lib/config/config.go

@@ -229,8 +229,8 @@ func (cfg *Configuration) prepare(myID protocol.DeviceID) {
 		cfg.Options.ReconnectIntervalS = 5
 	}
 
-	if cfg.GUI.RawAPIKey == "" {
-		cfg.GUI.RawAPIKey = randomString(32)
+	if cfg.GUI.APIKey == "" {
+		cfg.GUI.APIKey = randomString(32)
 	}
 }
 

lib/config/config_test.go

@@ -485,7 +485,7 @@ func TestCopy(t *testing.T) {
 	cfg.Devices[0].Addresses[0] = "wrong"
 	cfg.Folders[0].Devices[0].DeviceID = protocol.DeviceID{0, 1, 2, 3}
 	cfg.Options.ListenAddress[0] = "wrong"
-	cfg.GUI.RawAPIKey = "wrong"
+	cfg.GUI.APIKey = "wrong"
 
 	bsChanged, err := json.MarshalIndent(cfg, "", "  ")
 	if err != nil {

lib/config/guiconfiguration.go

@@ -18,7 +18,7 @@ type GUIConfiguration struct {
 	User                string `xml:"user,omitempty" json:"user"`
 	Password            string `xml:"password,omitempty" json:"password"`
 	RawUseTLS           bool   `xml:"tls,attr" json:"useTLS"`
-	RawAPIKey           string `xml:"apikey,omitempty" json:"apiKey"`
+	APIKey              string `xml:"apikey,omitempty" json:"apiKey"`
 	InsecureAdminAccess bool   `xml:"insecureAdminAccess,omitempty" json:"insecureAdminAccess"`
 	Theme               string `xml:"theme" json:"theme" default:"default"`
 }
@@ -76,9 +76,17 @@ func (c GUIConfiguration) URL() string {
 	return u.String()
 }
 
-func (c GUIConfiguration) APIKey() string {
-	if override := os.Getenv("STGUIAPIKEY"); override != "" {
-		return override
+// IsValidAPIKey returns true when the given API key is valid, including both
+// the value in config and any overrides
+func (c GUIConfiguration) IsValidAPIKey(apiKey string) bool {
+	switch apiKey {
+	case "":
+		return false
+
+	case c.APIKey, os.Getenv("STGUIAPIKEY"):
+		return true
+
+	default:
+		return false
 	}
-	return c.RawAPIKey
 }

lib/protocol/protocol.go

@@ -430,36 +430,20 @@ func (c *rawConnection) readMessage() (hdr header, msg encodable, err error) {
 		}
 	}
 
-	// We check each returned error for the XDRError.IsEOF() method.
-	// IsEOF()==true here means that the message contained fewer fields than
-	// expected. It does not signify an EOF on the socket, because we've
-	// successfully read a size value and that many bytes already. New fields
-	// we expected but the other peer didn't send should be interpreted as
-	// zero/nil, and if that's not valid we'll verify it somewhere else.
-
 	switch hdr.msgType {
 	case messageTypeIndex, messageTypeIndexUpdate:
 		var idx IndexMessage
 		err = idx.UnmarshalXDR(msgBuf)
-		if xdrErr, ok := err.(isEofer); ok && xdrErr.IsEOF() {
-			err = nil
-		}
 		msg = idx
 
 	case messageTypeRequest:
 		var req RequestMessage
 		err = req.UnmarshalXDR(msgBuf)
-		if xdrErr, ok := err.(isEofer); ok && xdrErr.IsEOF() {
-			err = nil
-		}
 		msg = req
 
 	case messageTypeResponse:
 		var resp ResponseMessage
 		err = resp.UnmarshalXDR(msgBuf)
-		if xdrErr, ok := err.(isEofer); ok && xdrErr.IsEOF() {
-			err = nil
-		}
 		msg = resp
 
 	case messageTypePing:
@@ -468,23 +452,28 @@ func (c *rawConnection) readMessage() (hdr header, msg encodable, err error) {
 	case messageTypeClusterConfig:
 		var cc ClusterConfigMessage
 		err = cc.UnmarshalXDR(msgBuf)
-		if xdrErr, ok := err.(isEofer); ok && xdrErr.IsEOF() {
-			err = nil
-		}
 		msg = cc
 
 	case messageTypeClose:
 		var cm CloseMessage
 		err = cm.UnmarshalXDR(msgBuf)
-		if xdrErr, ok := err.(isEofer); ok && xdrErr.IsEOF() {
-			err = nil
-		}
 		msg = cm
 
 	default:
 		err = fmt.Errorf("protocol error: %s: unknown message type %#x", c.id, hdr.msgType)
 	}
 
+	// We check the returned error for the XDRError.IsEOF() method.
+	// IsEOF()==true here means that the message contained fewer fields than
+	// expected. It does not signify an EOF on the socket, because we've
+	// successfully read a size value and then that many bytes from the wire.
+	// New fields we expected but the other peer didn't send should be
+	// interpreted as zero/nil, and if that's not valid we'll verify it
+	// somewhere else.
+	if xdrErr, ok := err.(isEofer); ok && xdrErr.IsEOF() {
+		err = nil
+	}
+
 	return
 }
 

man/syncthing-bep.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-BEP" "7" "January 30, 2016" "v0.12" "Syncthing"
+.TH "SYNCTHING-BEP" "7" "March 04, 2016" "v0.12" "Syncthing"
 .SH NAME
 syncthing-bep \- Block Exchange Protocol v1
 .
@@ -56,7 +56,7 @@ level protocols providing encryption and authentication.
 .sp
 .nf
 .ft C
-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-|
++\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+
 |   Block Exchange Protocol   |
 |\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-|
 | Encryption & Auth (TLS 1.2) |
@@ -498,14 +498,14 @@ struct ClusterConfigMessage {
     string ClientVersion<64>;
     Folder Folders<1000000>;
     Option Options<64>;
-}
+};
 
 struct Folder {
     string ID<256>;
     Device Devices<1000000>;
     unsigned int Flags;
     Option Options<64>;
-}
+};
 
 struct Device {
     opaque ID<32>;
@@ -516,12 +516,12 @@ struct Device {
     hyper MaxLocalVersion;
     unsigned int Flags;
     Option Options<64>;
-}
+};
 
 struct Option {
     string Key<64>;
     string Value<1024>;
-}
+};
 .ft P
 .fi
 .UNINDENT
@@ -750,7 +750,7 @@ struct IndexMessage {
     FileInfo Files<1000000>;
     unsigned int Flags;
     Option Options<64>;
-}
+};
 
 struct FileInfo {
     string Name<8192>;
@@ -758,22 +758,22 @@ struct FileInfo {
     hyper Modified;
     Vector Version;
     hyper LocalVersion;
-    BlockInfo Blocks<1000000>;
-}
+    BlockInfo Blocks<10000000>;
+};
 
 struct Vector {
-    Counter Counters<>
-}
+    Counter Counters<>;
+};
 
 struct Counter {
-    unsigned hyper ID
-    unsigned hyper Value
-}
+    unsigned hyper ID;
+    unsigned hyper Value;
+};
 
 struct BlockInfo {
     unsigned int Size;
     opaque Hash<64>;
-}
+};
 .ft P
 .fi
 .UNINDENT
@@ -858,7 +858,7 @@ struct RequestMessage {
     opaque Hash<64>;
     unsigned int Flags;
     Option Options<64>;
-}
+};
 .ft P
 .fi
 .UNINDENT
@@ -1054,7 +1054,7 @@ T{
 T}	T{
 Total length
 T}	T{
-64 MiB
+512 MiB
 T}
 _
 T{
@@ -1098,7 +1098,7 @@ T{
 T}	T{
 Number of Blocks
 T}	T{
-1.000.000
+10.000.000
 T}
 _
 T{
@@ -1214,6 +1214,10 @@ T}	T{
 T}
 _
 .TE
+.sp
+The currently defined values allow maximum file size of 1220 GiB
+(10.000.000 x 128 KiB). The maximum message size covers an Index message
+for the maximum file.
 .SH EXAMPLE EXCHANGE
 .TS
 center;

man/syncthing-config.5

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-CONFIG" "5" "January 30, 2016" "v0.12" "Syncthing"
+.TH "SYNCTHING-CONFIG" "5" "March 04, 2016" "v0.12" "Syncthing"
 .SH NAME
 syncthing-config \- Syncthing Configuration
 .
@@ -284,6 +284,9 @@ conflict copies altogether.
 <device id="5SYI2FS\-LW6YAXI\-JJDYETS\-NDBBPIO\-256MWBO\-XDPXWVG\-24QPUM4\-PDW4UQU" name="syno" compression="metadata" introducer="false">
     <address>dynamic</address>
 </device>
+<device id="2CYF2WQ\-AKZO2QZ\-JAKWLYD\-AGHMQUM\-BGXUOIS\-GYILW34\-HJG3DUK\-LRRYQAR" name="syno local" compression="metadata" introducer="false">
+    <address>tcp://192.0.2.1:22001</address>
+</device>
 .ft P
 .fi
 .UNINDENT
@@ -327,25 +330,32 @@ should copy their list of devices per folder when connecting.
 .UNINDENT
 .sp
 In addition, one or more \fBaddress\fP child elements must be present. Each
-contains an address to use when attempting to connect to this device and will
-be tried in order. Accepted formats are:
+contains an address or host name to use when attempting to connect to this device and will
+be tried in order. Entries other than \fBdynamic\fP must be prefixed with \fBtcp://\fP\&. Accepted formats are:
 .INDENT 0.0
 .TP
-.B IPv4 address (\fB192.0.2.42\fP)
+.B IPv4 address (\fBtcp://192.0.2.42\fP)
 The default port (22000) is used.
 .TP
-.B IPv4 address and port (\fB192.0.2.42:12345\fP)
+.B IPv4 address and port (\fBtcp://192.0.2.42:12345\fP)
 The address and port is used as given.
 .TP
-.B IPv6 address (\fB2001:db8::23:42\fP)
-The default port (22000) is used.
+.B IPv6 address (\fBtcp://[2001:db8::23:42]\fP)
+The default port (22000) is used. The address must be enclosed in
+square brackets.
 .TP
-.B IPv6 address and port (\fB[2001:db8::23:42]:12345\fP)
+.B IPv6 address and port (\fBtcp://[2001:db8::23:42]:12345\fP)
 The address and port is used as given. The address must be enclosed in
 square brackets.
 .TP
+.B Host name (\fBtcp://fileserver\fP)
+The host name will be used on the default port (22000) and connections will be attempted via both IPv4 and IPv6, depending on name resolution.
+.TP
+.B Host name and port (\fBtcp://fileserver:12345\fP)
+The host name will be used on the given port and connections will be attempted via both IPv4 and IPv6, depending on name resolution.
+.TP
 .B \fBdynamic\fP
-The word \fBdynamic\fP means to use local and global discovery to find the
+The word \fBdynamic\fP (without \fBtcp://\fP prefix) means to use local and global discovery to find the
 device.
 .UNINDENT
 .SH IGNOREDDEVICE ELEMENT

man/syncthing-device-ids.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-DEVICE-IDS" "7" "January 30, 2016" "v0.12" "Syncthing"
+.TH "SYNCTHING-DEVICE-IDS" "7" "March 04, 2016" "v0.12" "Syncthing"
 .SH NAME
 syncthing-device-ids \- Understanding Device IDs
 .

man/syncthing-event-api.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-EVENT-API" "7" "January 30, 2016" "v0.12" "Syncthing"
+.TH "SYNCTHING-EVENT-API" "7" "March 04, 2016" "v0.12" "Syncthing"
 .SH NAME
 syncthing-event-api \- Event API
 .

man/syncthing-faq.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-FAQ" "7" "January 30, 2016" "v0.12" "Syncthing"
+.TH "SYNCTHING-FAQ" "7" "March 04, 2016" "v0.12" "Syncthing"
 .SH NAME
 syncthing-faq \- Frequently Asked Questions
 .
@@ -156,6 +156,9 @@ causes a conflict on change you\(aqll end up with \fBsync\-conflict\-...sync\-co
 .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).
+.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.
 .SS Is Syncthing my ideal backup application?
 .sp
 No, Syncthing is not a backup application because all changes to your files

man/syncthing-globaldisco.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-GLOBALDISCO" "7" "January 30, 2016" "v0.12" "Syncthing"
+.TH "SYNCTHING-GLOBALDISCO" "7" "March 04, 2016" "v0.12" "Syncthing"
 .SH NAME
 syncthing-globaldisco \- Global Discovery Protocol v3
 .

man/syncthing-localdisco.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-LOCALDISCO" "7" "January 30, 2016" "v0.12" "Syncthing"
+.TH "SYNCTHING-LOCALDISCO" "7" "March 04, 2016" "v0.12" "Syncthing"
 .SH NAME
 syncthing-localdisco \- Local Discovery Protocol v3
 .

man/syncthing-networking.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-NETWORKING" "7" "January 30, 2016" "v0.12" "Syncthing"
+.TH "SYNCTHING-NETWORKING" "7" "March 04, 2016" "v0.12" "Syncthing"
 .SH NAME
 syncthing-networking \- Firewall Setup
 .

man/syncthing-relay.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-RELAY" "7" "January 30, 2016" "v0.12" "Syncthing"
+.TH "SYNCTHING-RELAY" "7" "March 04, 2016" "v0.12" "Syncthing"
 .SH NAME
 syncthing-relay \- Relay Protocol v1
 .

man/syncthing-rest-api.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-REST-API" "7" "January 30, 2016" "v0.12" "Syncthing"
+.TH "SYNCTHING-REST-API" "7" "March 04, 2016" "v0.12" "Syncthing"
 .SH NAME
 syncthing-rest-api \- REST API
 .

man/syncthing-security.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-SECURITY" "7" "January 30, 2016" "v0.12" "Syncthing"
+.TH "SYNCTHING-SECURITY" "7" "March 04, 2016" "v0.12" "Syncthing"
 .SH NAME
 syncthing-security \- Security Principles
 .

man/syncthing-stignore.5

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING-STIGNORE" "5" "January 30, 2016" "v0.12" "Syncthing"
+.TH "SYNCTHING-STIGNORE" "5" "March 04, 2016" "v0.12" "Syncthing"
 .SH NAME
 syncthing-stignore \- Prevent files from being synchronized to other nodes
 .

man/syncthing-versioning.7

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "TODO" "7" "January 30, 2016" "v0.12" "Syncthing"
+.TH "TODO" "7" "March 04, 2016" "v0.12" "Syncthing"
 .SH NAME
 Todo \- Keep automatic backups of deleted files by other nodes
 .

man/syncthing.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SYNCTHING" "1" "January 30, 2016" "v0.12" "Syncthing"
+.TH "SYNCTHING" "1" "March 04, 2016" "v0.12" "Syncthing"
 .SH NAME
 syncthing \- Syncthing
 .
@@ -38,7 +38,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .ft C
 syncthing [\-audit] [\-generate=<dir>] [\-gui\-address=<address>] [\-gui\-apikey=<key>]
           [\-home=<dir>] [\-logfile=<filename>] [\-logflags=<flags>] [\-no\-browser]
-          [\-no\-console] [\-no\-restart] [\-reset] [\-upgrade] [\-upgrade\-check]
+          [\-no\-console] [\-no\-restart] [\-paths] [\-reset] [\-upgrade] [\-upgrade\-check]
           [\-upgrade\-to=<url>] [\-verbose] [\-version]
 .ft P
 .fi
@@ -123,6 +123,11 @@ Do not restart; just exit.
 .UNINDENT
 .INDENT 0.0
 .TP
+.B \-paths
+Print the paths used for configuration, keys, database, GUI overrides, default sync folder and the log file.
+.UNINDENT
+.INDENT 0.0
+.TP
 .B \-reset
 Reset the database.
 .UNINDENT

protocol/README.md

@@ -1,2 +0,0 @@
-Syncthing uses the protocols defined in
-https://github.com/syncthing/specs/.

script/check-authors.go

@@ -42,7 +42,7 @@ func init() {
 }
 
 func main() {
-	actual := actualAuthorEmails()
+	actual := actualAuthorEmails("cmd/", "lib/", "gui/", "test/", "script/")
 	listed := listedAuthorEmails()
 	missing := actual.except(listed)
 	if len(missing) > 0 {
@@ -56,8 +56,9 @@ func main() {
 
 // actualAuthorEmails returns the set of author emails found in the actual git
 // commit log, except those in excluded commits.
-func actualAuthorEmails() stringSet {
-	cmd := exec.Command("git", "log", "--format=%H %ae")
+func actualAuthorEmails(paths ...string) stringSet {
+	args := append([]string{"log", "--format=%H %ae"}, paths...)
+	cmd := exec.Command("git", args...)
 	bs, err := cmd.Output()
 	if err != nil {
 		log.Fatal("authorEmails:", err)