Translation update

Update key ID for signed releases in README (fixes #1180 )
The predictableRandom test can only run once successfully (fixes #1184 )
2026-01-19 19:28:51 -05:00 · 2015-01-06 23:12:40 +01:00 · 2015-01-06 23:06:16 +01:00 · 2015-01-06 23:03:35 +01:00 · 2015-01-06 21:54:13 +00:00 · 2015-01-06 22:54:08 +01:00
38 changed files with 317 additions and 163 deletions
--- a/2
+++ b/2
@@ -8,6 +8,7 @@ Arthur Axel fREW Schmidt <frew@afoolishmanifesto.com> <frioux@gmail.com>
 Ben Schulz <ueomkail@gmail.com> <uok@users.noreply.github.com>
 Ben Sidhom <bsidhom@gmail.com>
 Brandon Philips <brandon@ifup.org>
+Brendan Long <self@brendanlong.com>
 Caleb Callaway <enlightened.despot@gmail.com>
 Cathryne Linenweaver <cathryne.linenweaver@gmail.com> <Cathryne@users.noreply.github.com>
 Chris Joel <chris@scriptolo.gy>
@@ -25,6 +26,7 @@ Jochen Voss <voss@seehuhn.de>
 Lode Hoste <zillode@zillode.be>
 Marcin Dziadus <dziadus.marcin@gmail.com>
 Michael Tilli <pyfisch@gmail.com>
+Peter Hoeg <peter@speartail.com>
 Philippe Schommers <philippe@schommers.be>
 Phill Luby <phill.luby@newredo.com>
 Piotr Bejda <piotrb10@gmail.com>
--- a/2
+++ b/2
@@ -10,6 +10,7 @@ alex2108	<register-github@alex-graf.de>
 andrew-d	<andrew@du.nham.ca>
 asdil12		<dominik@heidler.eu>
 bigbear2nd	<bigbear2nd@gmail.com>
+brendanlong	<self@brendanlong.com>
 bsidhom		<bsidhom@gmail.com>
 calmh		<jakob@nym.se>
 cdata		<chris@scriptolo.gy>
@@ -23,6 +24,7 @@ jpjp		<jamespatterson@operamail.com> <jpjp@users.noreply.github.com>
 kozec		<kozec@kozec.com>
 marcindziadus	<dziadus.marcin@gmail.com>
 mvdan		<mvdan@mvdan.cc>
+peterhoeg	<peter@speartail.com>
 philips		<brandon@ifup.org>
 piobpl		<piotrb10@gmail.com>
 pluby		<phill.luby@newredo.com>
--- a/README.md
+++ b/README.md
@@ -44,10 +44,10 @@ that describes it for both Unix and Windows.
 Signed Releases
 ---------------

-As of v0.7.0 and onwards, git tags and release binaries are GPG signed with
-the key BCE524C7 (http://nym.se/gpg.txt). For release binaries, MD5 and
-SHA1 checksums are calculated and signed, available in the
-md5sum.txt.asc and sha1sum.txt.asc files.
+As of v0.10.15 and onwards, git tags and release binaries are GPG signed
+with the key D26E6ED000654A3E (see http://syncthing.net/security.html).
+For release binaries, MD5 and SHA1 checksums are calculated and signed,
+available in the md5sum.txt.asc and sha1sum.txt.asc files.

 Documentation
 =============
--- a/cmd/syncthing/gui.go
+++ b/cmd/syncthing/gui.go
@@ -571,6 +571,10 @@ func restGetEvents(w http.ResponseWriter, r *http.Request) {
 }

 func restGetUpgrade(w http.ResponseWriter, r *http.Request) {
+	if noUpgrade {
+		http.Error(w, upgrade.ErrUpgradeUnsupported.Error(), 500)
+		return
+	}
 	rel, err := upgrade.LatestRelease(strings.Contains(Version, "-beta"))
 	if err != nil {
 		http.Error(w, err.Error(), 500)
--- a/cmd/syncthing/random_test.go
+++ b/cmd/syncthing/random_test.go
@@ -15,14 +15,21 @@

 package main

-import "testing"
+import (
+	"sync"
+	"testing"
+)
+
+var predictableRandomTest sync.Once

 func TestPredictableRandom(t *testing.T) {
-	// predictable random sequence is predictable
-	e := 3440579354231278675
-	if v := predictableRandom.Int(); v != e {
-		t.Errorf("Unexpected random value %d != %d", v, e)
-	}
+	predictableRandomTest.Do(func() {
+		// predictable random sequence is predictable
+		e := 3440579354231278675
+		if v := predictableRandom.Int(); v != e {
+			t.Errorf("Unexpected random value %d != %d", v, e)
+		}
+	})
 }

 func TestSeedFromBytes(t *testing.T) {
--- a/etc/linux-systemd/README.md
+++ b/etc/linux-systemd/README.md
@@ -0,0 +1,27 @@
+This directory contains a configuration for running syncthing under the
+"systemd" service manager on Linux both under either a systemd system service or
+systemd user service.
+
+ 1. Install systemd.
+
+ 2. If you are running this as a system level service:
+
+   1. Create the user you will be running the service as (foo in this example).
+
+   2. Copy the syncthing@.service files to /etc/systemd/system
+
+   3. Enable and start the service
+      systemctl enable syncthing@foo.service
+      systemctl start syncthing@foo.service
+
+ 3. If you are running this as a user level service:
+
+   1. Log in as the user you will be running the service as
+
+   2. Copy the syncthing.service files to /etc/systemd/user
+
+   3. Enable and start the service
+      systemctl --user enable syncthing.service
+      systemctl --user start syncthing.service
+
+Log output is sent to the journal.
--- a/etc/linux-systemd/system/syncthing@.service
+++ b/etc/linux-systemd/system/syncthing@.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Syncthing service for %i
+After=network.target
+
+[Service]
+User=%i
+Environment=STARGS=
+EnvironmentFile=-/etc/default/syncthing
+Environment=STNORESTART=yes
+ExecStart=/usr/bin/syncthing ${STARGS}
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
--- a/etc/linux-systemd/user/syncthing.service
+++ b/etc/linux-systemd/user/syncthing.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Syncthing service
+
+[Service]
+Environment=STARGS=
+EnvironmentFile=-%h/.config/syncthing/environment
+Environment=STNORESTART=yes
+ExecStart=/usr/bin/syncthing ${STARGS}
+Restart=on-failure
+
+[Install]
+WantedBy=cmdline.target
--- a/gui/assets/lang/lang-be.json
+++ b/gui/assets/lang/lang-be.json
@@ -125,6 +125,7 @@
    "Syncthing is restarting.": "Syncthing is restarting.",
    "Syncthing is upgrading.": "Syncthing is upgrading.",
    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…",
+    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing seems to be experiencing a problem processing your request. Please reload your browser or restart Syncthing if the problem persists.",
    "The aggregated statistics are publicly available at {%url%}.": "The aggregated statistics are publicly available at {{url}}.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.",
    "The device ID cannot be blank.": "The device ID cannot be blank.",
--- a/gui/assets/lang/lang-bg.json
+++ b/gui/assets/lang/lang-bg.json
@@ -125,6 +125,7 @@
    "Syncthing is restarting.": "Syncthing се рестартирва",
    "Syncthing is upgrading.": "Syncthing се обновява.",
    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing изглежда не е включен, или има проблем с интерент връзката. Повторен опит...",
+    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing seems to be experiencing a problem processing your request. Please reload your browser or restart Syncthing if the problem persists.",
    "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.": "Полето идентификатор на устройство не може да бъде празно.",
--- a/gui/assets/lang/lang-cs.json
+++ b/gui/assets/lang/lang-cs.json
@@ -125,6 +125,7 @@
    "Syncthing is restarting.": "Syncthing se restartuje.",
    "Syncthing is upgrading.": "Syncthing se aktualizuje.",
    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing se zdá být nefunkční, nebo je problém s připojením k Internetu. Opakuji...",
+    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing má nejspíše problém s provedením vašeho požadavku. Pokud problém přetrvává, načtěte znovu data v prohlížeči nebo restartujte Syncthing.",
    "The aggregated statistics are publicly available at {%url%}.": "Souhrnné statistiky jsou veřejně dostupné na {{url}}.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Konfigurace byla uložena, ale není aktivována. Pro aktivaci nové konfigurace je třeba restartovat Syncthing.",
    "The device ID cannot be blank.": "ID přístroje nemůže být prázdné.",
--- a/gui/assets/lang/lang-de.json
+++ b/gui/assets/lang/lang-de.json
@@ -74,7 +74,7 @@
    "New Folder": "Neues Verzeichnis",
    "No": "Nein",
    "No File Versioning": "Keine Dateiversionierung",
-    "Notice": "Benachrichtigung",
+    "Notice": "Hinweis",
    "OK": "Ok",
    "Offline": "Offline",
    "Online": "Online",
@@ -101,7 +101,7 @@
    "Settings": "Einstellungen",
    "Share": "Teilen",
    "Share Folder": "Teile Verzeichnis",
-    "Share Folders With Device": "Teile Verzeichnisse mit Gerät",
+    "Share Folders With Device": "Teile Verzeichnisse mit diesem Gerät",
    "Share With Devices": "Teile mit diesen Geräten",
    "Share this folder?": "Dieses Verzeichnis teilen?",
    "Shared With": "Geteilt mit",
@@ -125,6 +125,7 @@
    "Syncthing is restarting.": "Syncthing wird neu gestartet",
    "Syncthing is upgrading.": "Syncthing wird aktualisiert",
    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing scheint nicht erreichbar zu sein oder es gibt ein Problem mit Deiner Internetverbindung. Versuche erneut...",
+    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Es scheint als ob Syncthing ein Problem mit der Verarbeitung ihrer Eingabe hat. Bitte laden sie die Seite neu oder führen sie einen Neustart von Syncthing durch, falls das Problem weiterhin besteht.",
    "The aggregated statistics are publicly available at {%url%}.": "Die gesammelten Statistiken sind öffentlich verfügbar unter {{url}}.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Die Konfiguration wurde gespeichert, aber nicht aktiviert. Syncthing muss neugestartet werden um die neue Konfiguration zu aktivieren.",
    "The device ID cannot be blank.": "Die Geräte ID darf nicht leer sein.",
--- a/gui/assets/lang/lang-en.json
+++ b/gui/assets/lang/lang-en.json
@@ -125,6 +125,7 @@
   "Syncthing is restarting.": "Syncthing is restarting.",
   "Syncthing is upgrading.": "Syncthing is upgrading.",
   "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…",
+   "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing seems to be experiencing a problem processing your request. Please reload your browser or restart Syncthing if the problem persists.",
   "The aggregated statistics are publicly available at {%url%}.": "The aggregated statistics are publicly available at {{url}}.",
   "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.",
   "The device ID cannot be blank.": "The device ID cannot be blank.",
--- a/gui/assets/lang/lang-es.json
+++ b/gui/assets/lang/lang-es.json
@@ -1,10 +1,10 @@
 {
    "API Key": "Clave API",
    "About": "Acerca de",
-    "Add": "Add",
+    "Add": "Agregar",
    "Add Device": "Agregar dispositivo",
    "Add Folder": "Agregar repositorio",
-    "Add new folder?": "Add new folder?",
+    "Add new folder?": "¿Agregar nuevo repositorio?",
    "Address": "Dirección",
    "Addresses": "Direcciones",
    "Allow Anonymous Usage Reporting?": "Permitir reporte anónimo de uso?",
@@ -17,14 +17,14 @@
    "Comment, when used at the start of a line": "Comentario, cuando es utilizado al inicio de una línea.",
    "Compression is recommended in most setups.": "La compresión de datos es recomendada para la mayoría de las configuraciones.",
    "Connection Error": "Error de conexión",
-    "Copied from elsewhere": "Copied from elsewhere",
-    "Copied from original": "Copied from original",
+    "Copied from elsewhere": "Copiado de otra parte.",
+    "Copied from original": "Copiado del original",
    "Copyright © 2014 Jakob Borg and the following Contributors:": "Derechos de autor © 2014 Jakob Borg y los siguientes  colaboradores:",
    "Delete": "Suprimir",
    "Device ID": "ID del dispositivo",
    "Device Identification": "Identificación del dispositivo",
    "Device Name": "Nombre del dispositivo",
-    "Device {%device%} ({%address%}) wants to connect. Add new device?": "Device {{device}} ({{address}}) wants to connect. Add new device?",
+    "Device {%device%} ({%address%}) wants to connect. Add new device?": "El dispositivo {{device}} ({{address}}) se quiere conectar. ¿Agregar nuevo dispositivo?",
    "Disconnected": "Desconectado",
    "Documentation": "Documentación",
    "Download Rate": "Tasa de descarga",
@@ -54,7 +54,7 @@
    "Global Discovery Server": "Servidor global de identificación",
    "Global State": "Estado Global",
    "Idle": "Inactivo",
-    "Ignore": "Ignore",
+    "Ignore": "Ignorar",
    "Ignore Patterns": "Patrones de exclusión",
    "Ignore Permissions": "Ignorar permisos",
    "Incoming Rate Limit (KiB/s)": "Límite de velocidad de entrada (KiB/s)",
@@ -63,15 +63,15 @@
    "Keep Versions": "Conservar versiones",
    "Last File Synced": "Último archivo sincronizado.",
    "Last seen": "Visto por ultima vez",
-    "Later": "Later",
+    "Later": "Más tarde",
    "Latest Release": "Última versión",
    "Local Discovery": "Búsqueda en red local",
    "Local State": "Estado Local",
    "Maximum Age": "Edad máxima",
    "Multi level wildcard (matches multiple directory levels)": "Multi level wildcard (matches multiple directory levels)",
    "Never": "Nunca",
-    "New Device": "New Device",
-    "New Folder": "New Folder",
+    "New Device": "Nuevo dispositivo",
+    "New Folder": "Nuevo repositorio",
    "No": "No",
    "No File Versioning": "Sin control de versiones de archivos",
    "Notice": "Aviso",
@@ -93,22 +93,22 @@
    "Restart": "Reiniciar",
    "Restart Needed": "Es necesario reiniciar",
    "Restarting": "Reiniciando",
-    "Reused": "Reused",
+    "Reused": "Reutilizado",
    "Save": "Guardar",
    "Scanning": "Actualización",
    "Select the devices to share this folder with.": "Seleccione los dispositivos con los cuales compartir este repositorio.",
    "Select the folders to share with this device.": "Seleccione los repositorios para compartir con este dispositivo.",
    "Settings": "Configuración",
-    "Share": "Share",
-    "Share Folder": "Share Folder",
+    "Share": "Compartir",
+    "Share Folder": "Compartir repositorio",
    "Share Folders With Device": "Compartir repositorios con dispositivo",
    "Share With Devices": "Compartir con los dispositivos",
-    "Share this folder?": "Share this folder?",
+    "Share this folder?": "¿Compartir este repositorio?",
    "Shared With": "Compartido con",
    "Short identifier for the folder. Must be the same on all cluster devices.": "Identificador corto para el repositorio. Debe ser el mismo en todos los dispositivos del grupo.",
    "Show ID": "Mostrar ID",
-    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.",
-    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Mostrado en vez del ID del dispositivo en el estado del grupo. Si dejado en blanco, será usado el nombre sugerido por el dispositivo.",
+    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Mostrado en lugar de la ID del dispositivo en el estado del grupo. Será sugerido a otros dispositivos como nombre predeterminado opcional.",
+    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Mostrado en lugar de la ID del dispositivo en el estado del grupo. Si se deja en blanco, será usado el nombre sugerido por el dispositivo.",
    "Shutdown": "Apagar",
    "Simple File Versioning": "Versiones simple de archivos",
    "Single level wildcard (matches within a directory only)": "Single level wildcard (matches within a directory only)",
@@ -125,9 +125,10 @@
    "Syncthing is restarting.": "Syncthing está reiniciando.",
    "Syncthing is upgrading.": "Syncthing se está actualizando.",
    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing parece estar apagado, o hay un problema con su conexión de Internet. Reintentando...",
-    "The aggregated statistics are publicly available at {%url%}.": "Las estadísticas acumuladas están públicamente disponibles en {{url}}.",
+    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing parece estar experimentando un problema al procesar su solicitud. Por favor, recargue el navegador o reinicie Syncthing si el problema persiste.",
+    "The aggregated statistics are publicly available at {%url%}.": "Las estadísticas acumuladas están disponibles públicamente en {{url}}.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "La configuración ha sido guardada pero no activada.\nSyncthing debe reiniciarse para activar la nueva configuración.",
-    "The device ID cannot be blank.": "El ID del dispositivo no puede estar en blanco.",
+    "The device ID cannot be blank.": "La ID del dispositivo no puede estar en blanco.",
    "The device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "La ID del dispositivo a introducir se puede encontrar en la opción de menú \"Edición > Mostrar ID\" en el otro dispositivo. Espacios y guiones son opcionales (ignorados).",
    "The encrypted usage report is sent daily. It is used to track common platforms, folder sizes and app versions. If the reported data set is changed you will be prompted with this dialog again.": "El informe de uso se envía encriptado diariamente. Se utiliza para hacer un seguimiento de plataformas comunes, tamaño de repositorios y versiones de la aplicación. Si el conjunto de datos cambia será notificado mediante este dialogo nuevamente.",
    "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.": "La ID del dispositivo introducida no es válida. Debe ser una cadena de 52 o 56 caracteres consistente en letras y números, con espacios y guiones opcionales.",
@@ -144,7 +145,7 @@
    "The rescan interval must be at least 5 seconds.": "El intervalo de reescaneo debe ser al menos de 5 segundos.",
    "Unknown": "Desconocido",
    "Unshared": "No compartido",
-    "Unused": "Unused",
+    "Unused": "No utilizado",
    "Up to Date": "Actualizado",
    "Upgrade To {%version%}": "Actualizar a {{version}}",
    "Upgrading": "Actualizando",
@@ -160,5 +161,5 @@
    "You must keep at least one version.": "Debe mantener al menos una versión",
    "full documentation": "documentación completa",
    "items": "Artículos",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} wants to share folder \"{{folder}}\"."
+    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} quiere compartir repositorio \"{{folder}}\"."
 }
--- a/gui/assets/lang/lang-fr.json
+++ b/gui/assets/lang/lang-fr.json
@@ -1,10 +1,10 @@
 {
    "API Key": "Clé API",
    "About": "À propos",
-    "Add": "Add",
+    "Add": "Ajouter",
    "Add Device": "Ajouter un périphérique",
    "Add Folder": "Ajouter un répertoire",
-    "Add new folder?": "Add new folder?",
+    "Add new folder?": "Ajouter un nouveau répertoire ?",
    "Address": "Adresse",
    "Addresses": "Adresses",
    "Allow Anonymous Usage Reporting?": "Autoriser le rapport anonyme de statistiques d'utilisation ?",
@@ -24,7 +24,7 @@
    "Device ID": "ID du périphérique",
    "Device Identification": "Identification de l'appareil",
    "Device Name": "Nom du périphérique",
-    "Device {%device%} ({%address%}) wants to connect. Add new device?": "Device {{device}} ({{address}}) wants to connect. Add new device?",
+    "Device {%device%} ({%address%}) wants to connect. Add new device?": "La machine {{device}} ({{address}}) veut se connecter. Voulez-vous ajouter cette machine ?",
    "Disconnected": "Déconnecté",
    "Documentation": "Documentation",
    "Download Rate": "Débit de réception",
@@ -45,7 +45,7 @@
    "Folder ID": "ID du répertoire",
    "Folder Master": "Répertoire maître",
    "Folder Path": "Chemin du répertoire",
-    "Folders": "Dossiers",
+    "Folders": "Répertoires",
    "GUI Authentication Password": "Mot de passe d'authentification GUI",
    "GUI Authentication User": "Utilistateur autorisé GUI",
    "GUI Listen Addresses": "Adresse du GUI",
@@ -54,7 +54,7 @@
    "Global Discovery Server": "Serveur global de recherche",
    "Global State": "État global",
    "Idle": "Au repos",
-    "Ignore": "Ignore",
+    "Ignore": "Ignorer",
    "Ignore Patterns": "Modèles à éviter",
    "Ignore Permissions": "Ignorer les permissions",
    "Incoming Rate Limit (KiB/s)": "Limite du débit entrant (KiB/s)",
@@ -63,15 +63,15 @@
    "Keep Versions": "Conserver les versions",
    "Last File Synced": "Dernier fichier synchronisé",
    "Last seen": "Dernière apparition",
-    "Later": "Later",
+    "Later": "Plus tard",
    "Latest Release": "Dernière version",
    "Local Discovery": "Recherche locale",
    "Local State": "État local",
    "Maximum Age": "Ancienneté maximum",
    "Multi level wildcard (matches multiple directory levels)": "Astérisque à plusieurs niveaux (correspond aux répertoires et sous-répertoires)",
    "Never": "Jamais",
-    "New Device": "New Device",
-    "New Folder": "New Folder",
+    "New Device": "Nouvelle machine",
+    "New Folder": "Nouveau répertoire",
    "No": "Non",
    "No File Versioning": "Pas de version de fichier",
    "Notice": "Notification",
@@ -97,13 +97,13 @@
    "Save": "Sauver",
    "Scanning": "En cours de scan",
    "Select the devices to share this folder with.": "Sélectionner les machines avec qui partager ce répertoire.",
-    "Select the folders to share with this device.": "Sélectionner les dossiers à partager avec cette machine.",
+    "Select the folders to share with this device.": "Sélectionner les répertoires à partager avec cette machine.",
    "Settings": "Configuration",
-    "Share": "Share",
-    "Share Folder": "Share Folder",
-    "Share Folders With Device": "Partage du dossier avec les machines",
+    "Share": "Partager",
+    "Share Folder": "Partager le répertoire",
+    "Share Folders With Device": "Partager des répertoires avec des machines",
    "Share With Devices": "Partager avec les machines",
-    "Share this folder?": "Share this folder?",
+    "Share this folder?": "Voulez-vous partager ce répertoire ?",
    "Shared With": "Partagé avec",
    "Short identifier for the folder. Must be the same on all cluster devices.": "Court identifiant du répertoire. Il doit être le même sur l'ensemble des machines du groupe.",
    "Show ID": "Montrer l'ID",
@@ -125,6 +125,7 @@
    "Syncthing is restarting.": "Syncthing est cours de redémarrage.",
    "Syncthing is upgrading.": "Syncthing est cours de mise à jour.",
    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing semble être éteint, ou il y a un problème avec votre connexion Internet. Nouvelle tentative ...",
+    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing semble éprouver des difficultés à appliquer votre requête. Si le problème persiste, veuillez rafraîchir votre navigateur ou redémarrer Syncthing.",
    "The aggregated statistics are publicly available at {%url%}.": "Les statistiques agrégées sont disponibles publiquement à l'adresse {{url}}.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "La configuration a été sauvée mais pas activée. Syncthing doit redémarrer afin d'activer la nouvelle configuration.",
    "The device ID cannot be blank.": "L'ID de l'appareil ne peut être vide.",
@@ -160,5 +161,5 @@
    "You must keep at least one version.": "Vous devez garder au minimum une version.",
    "full documentation": "documentation complète",
    "items": "éléments",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} wants to share folder \"{{folder}}\"."
+    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} veut partager le répertoire \"{{folder}}\"."
 }
--- a/gui/assets/lang/lang-hu.json
+++ b/gui/assets/lang/lang-hu.json
@@ -125,6 +125,7 @@
    "Syncthing is restarting.": "Syncthing újraindul",
    "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.": "Syncthing seems to be experiencing a problem processing your request. Please reload your browser or restart Syncthing if the problem persists.",
    "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.",
--- a/gui/assets/lang/lang-it.json
+++ b/gui/assets/lang/lang-it.json
@@ -125,6 +125,7 @@
    "Syncthing is restarting.": "Riavvio di Syncthing in corso.",
    "Syncthing is upgrading.": "Aggiornamento di Syncthing in corso.",
    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing sembra inattivo, oppure c'è un problema con la tua connessione a Internet. Nuovo tentativo…",
+    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing seems to be experiencing a problem processing your request. Please reload your browser or restart Syncthing if the problem persists.",
    "The aggregated statistics are publicly available at {%url%}.": "Le statistiche aggregate sono disponibili pubblicamente su {{url}}.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "La configurazione è stata salvata ma non attivata. Devi riavviare Syncthing per attivare la nuova configurazione.",
    "The device ID cannot be blank.": "L'ID del dispositivo non può essere vuoto.",
--- a/gui/assets/lang/lang-lt.json
+++ b/gui/assets/lang/lang-lt.json
@@ -125,6 +125,7 @@
    "Syncthing is restarting.": "Syncthing perleidžiamas",
    "Syncthing is upgrading.": "Syncthing atsinaujina.",
    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing  išjungta arba problemos su Interneto ryšių. Bandoma iš naujo...",
+    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing seems to be experiencing a problem processing your request. Please reload your browser or restart Syncthing if the problem persists.",
    "The aggregated statistics are publicly available at {%url%}.": "Naudojimosi ataskaitą galite peržiūrėti adresu: {{url}}.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Nauji nustatymai išsaugoti, bet neaktyvuoti. Perleiskite Syncthing programą iš naujo norėdami įgalinti naujus nustatymus.",
    "The device ID cannot be blank.": "Įrenginio ID negali būti tuščias.",
--- a/gui/assets/lang/lang-nb.json
+++ b/gui/assets/lang/lang-nb.json
@@ -125,6 +125,7 @@
    "Syncthing is restarting.": "Syncthing starter på ny.",
    "Syncthing is upgrading.": "Syncthing oppgraderer.",
    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing ser ut til å være nede, eller så er det et problem med nettforbindelsen din. Prøver på ny …",
+    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing seems to be experiencing a problem processing your request. Please reload your browser or restart Syncthing if the problem persists.",
    "The aggregated statistics are publicly available at {%url%}.": "Samlet statistikk er åpent tilgjengelig på {{url}}.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Innstillingene har blitt lagret men ikke aktivert. Syncthing må starte på ny for å aktivere de nye innstillingene.",
    "The device ID cannot be blank.": "Enhets-ID kan ikke være tom.",
--- a/gui/assets/lang/lang-nl.json
+++ b/gui/assets/lang/lang-nl.json
@@ -1,10 +1,10 @@
 {
    "API Key": "API-sleutel",
    "About": "Over",
-    "Add": "Add",
+    "Add": "Toevoegen",
    "Add Device": "Toestel toevoegen",
    "Add Folder": "Folder toevoegen",
-    "Add new folder?": "Add new folder?",
+    "Add new folder?": "Nieuwe folder toevoegen?",
    "Address": "Adres",
    "Addresses": "Adressen",
    "Allow Anonymous Usage Reporting?": "Bijhouden van anonieme gebruikers statistieken toestaan?",
@@ -17,19 +17,19 @@
    "Comment, when used at the start of a line": "Commentaar, indien gebruikt aan het begin van de lijn",
    "Compression is recommended in most setups.": "Gegevenscompressie is aan te raden in de meeste situaties.",
    "Connection Error": "Verbindingsfout",
-    "Copied from elsewhere": "Copied from elsewhere",
-    "Copied from original": "Copied from original",
+    "Copied from elsewhere": "Van elders gekopieerd",
+    "Copied from original": "Gekopieerd van het origineel",
    "Copyright © 2014 Jakob Borg and the following Contributors:": "Copyright © 2014 Jakob Borg en de onderstaande bijdragers:",
    "Delete": "Verwijderen",
    "Device ID": "Toestel ID",
    "Device Identification": "Toestel identificatie",
    "Device Name": "Naam toestel",
-    "Device {%device%} ({%address%}) wants to connect. Add new device?": "Device {{device}} ({{address}}) wants to connect. Add new device?",
+    "Device {%device%} ({%address%}) wants to connect. Add new device?": "Het toestel {{device}} ({{address}}) wenst te verbinden. Dit toestel toevoegen?",
    "Disconnected": "Niet Verbonden",
    "Documentation": "Documentatie",
    "Download Rate": "Downloadsnelheid",
-    "Downloaded": "Downloaded",
-    "Downloading": "Downloading",
+    "Downloaded": "Gedownload",
+    "Downloading": "Bezig met downloaden",
    "Edit": "Bewerk",
    "Edit Device": "Toestel aanpassen",
    "Edit Folder": "Folder aanpassen",
@@ -54,14 +54,14 @@
    "Global Discovery Server": "Globale zoekserver",
    "Global State": "Globale status",
    "Idle": "Inactief",
-    "Ignore": "Ignore",
+    "Ignore": "Negeren",
    "Ignore Patterns": "Te negeren patronen",
    "Ignore Permissions": "Rechten negeren",
    "Incoming Rate Limit (KiB/s)": "Download snelheidslimiet (KiB/s)",
    "Introducer": "Introductietoestel",
    "Inversion of the given condition (i.e. do not exclude)": "Inversie van de gegeven voorwaarde (bv. niet uitsluiten)",
    "Keep Versions": "Versies behouden",
-    "Last File Synced": "Last File Synced",
+    "Last File Synced": "Laatste Gesynchroniseerde Bestand",
    "Last seen": "Laatst gezien op",
    "Later": "Later",
    "Latest Release": "Laatste uitgave",
@@ -70,8 +70,8 @@
    "Maximum Age": "Maximum leeftijd",
    "Multi level wildcard (matches multiple directory levels)": "Wildcard op meerder niveaus (toepasbaar op meerdere niveaus van folders)",
    "Never": "Nooit",
-    "New Device": "New Device",
-    "New Folder": "New Folder",
+    "New Device": "Nieuw Toestel",
+    "New Folder": "Nieuwe Folder",
    "No": "Nee",
    "No File Versioning": "Geen versiebeheer",
    "Notice": "Notificatie",
@@ -93,17 +93,17 @@
    "Restart": "Herstart",
    "Restart Needed": "Herstart nodig",
    "Restarting": "Herstarten",
-    "Reused": "Reused",
+    "Reused": "Hergebruikt",
    "Save": "Bewaar",
    "Scanning": "Aan het zoeken",
    "Select the devices to share this folder with.": "Selecteer de toestellen om deze folder mee te delen.",
-    "Select the folders to share with this device.": "Select the folders to share with this device.",
+    "Select the folders to share with this device.": "Selecteer de folders om met dit toestel te delen.",
    "Settings": "Instellingen",
-    "Share": "Share",
-    "Share Folder": "Share Folder",
-    "Share Folders With Device": "Share Folders With Device",
+    "Share": "Delen",
+    "Share Folder": "Folder Delen",
+    "Share Folders With Device": "Folders delen met toestellen",
    "Share With Devices": "Delen met toestellen",
-    "Share this folder?": "Share this folder?",
+    "Share this folder?": "Deze folder delen?",
    "Shared With": "Gedeeld met",
    "Short identifier for the folder. Must be the same on all cluster devices.": "Korte aanduiding voor deze folder. Moet dezelfde zijn op alle toestellen in de cluster.",
    "Show ID": "Toon ID",
@@ -125,6 +125,7 @@
    "Syncthing is restarting.": "Syncthing is aan het herstarten.",
    "Syncthing is upgrading.": "Syncthing is aan het upgraden.",
    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing lijkt afgesloten te zijn, of er is een verbindingsprobleem met het internet. Nieuwe poging....",
+    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing heeft problemen bij het verwerken van je vraag. Gelieve de pagina opnieuw te laden of Syncthing te herstarten wanneer het probleem blijft opduiken.",
    "The aggregated statistics are publicly available at {%url%}.": "The verzamelde statistieken zijn publiek beschikbaar op {{url}}",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "De configuratie is opslagen maar nog niet actief. Syncthing moet opnieuw opgestart worden om de nieuwe configuratie te activeren.",
    "The device ID cannot be blank.": "Het toestel ID mag niet leeg zijn.",
@@ -143,8 +144,8 @@
    "The rescan interval must be a non-negative number of seconds.": "De scanfrequentie moet een positief getal in seconden zijn.",
    "The rescan interval must be at least 5 seconds.": "De scanfrequentie moet minimaal 5 seconden zijn.",
    "Unknown": "Onbekend",
-    "Unshared": "Unshared",
-    "Unused": "Unused",
+    "Unshared": "Niet gedeeld",
+    "Unused": "Ongebruikt",
    "Up to Date": "Gesynchroniseerd",
    "Upgrade To {%version%}": "Upgrade naar {{version}}",
    "Upgrading": "Bezig met upgrade",
@@ -160,5 +161,5 @@
    "You must keep at least one version.": "Minstens 1 versie moet bewaard blijven.",
    "full documentation": "volledige documentatie",
    "items": "objecten",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} wants to share folder \"{{folder}}\"."
+    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} wil de folder \"{{folder}}\" delen."
 }
--- a/gui/assets/lang/lang-nn.json
+++ b/gui/assets/lang/lang-nn.json
@@ -125,6 +125,7 @@
    "Syncthing is restarting.": "Syncthing startar på ny.",
    "Syncthing is upgrading.": "Syncthing oppgraderer.",
    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing ser ut til å vera nede, eller så er det eit problem med nettilkoplinga di. Prøvar på ny …",
+    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing seems to be experiencing a problem processing your request. Please reload your browser or restart Syncthing if the problem persists.",
    "The aggregated statistics are publicly available at {%url%}.": "Samla statistikk er opent tilgjengeleg på {{url}}.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Instillingane har blitt lagra men ikkje aktivert. Syncthing må starta på ny for å aktivera dei nye instillingane.",
    "The device ID cannot be blank.": "Eining ID kan ikkje vera tom.",
--- a/gui/assets/lang/lang-pl.json
+++ b/gui/assets/lang/lang-pl.json
@@ -125,6 +125,7 @@
    "Syncthing is restarting.": "Restart Syncthing",
    "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 seems to be experiencing a problem processing your request. Please reload your browser or restart Syncthing if the problem persists.",
    "The aggregated statistics are publicly available at {%url%}.": "Zebrane statystyki są publicznie dostępna 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.",
--- a/gui/assets/lang/lang-pt-PT.json
+++ b/gui/assets/lang/lang-pt-PT.json
@@ -1,10 +1,10 @@
 {
    "API Key": "Chave da API",
    "About": "Acerca da aplicação",
-    "Add": "Add",
+    "Add": "Adicionar",
    "Add Device": "Adicionar dispositivo",
    "Add Folder": "Adicionar pasta",
-    "Add new folder?": "Add new folder?",
+    "Add new folder?": "Adicionar nova pasta?",
    "Address": "Endereço",
    "Addresses": "Endereços",
    "Allow Anonymous Usage Reporting?": "Permitir envio de relatórios anónimos de utilização?",
@@ -24,7 +24,7 @@
    "Device ID": "ID do dispositivo",
    "Device Identification": "Identificação do dispositivo",
    "Device Name": "Nome do dispositivo",
-    "Device {%device%} ({%address%}) wants to connect. Add new device?": "Device {{device}} ({{address}}) wants to connect. Add new device?",
+    "Device {%device%} ({%address%}) wants to connect. Add new device?": "O dispositivo {{device}} ({{address}}) quer conectar-se. Adiciono este novo dispositivo?",
    "Disconnected": "Desconectado",
    "Documentation": "Documentação",
    "Download Rate": "Velocidade de recepção",
@@ -54,7 +54,7 @@
    "Global Discovery Server": "Servidor da busca global",
    "Global State": "Estado global",
    "Idle": "Em espera",
-    "Ignore": "Ignore",
+    "Ignore": "Ignorar",
    "Ignore Patterns": "Padrões de exclusão",
    "Ignore Permissions": "Ignorar permissões",
    "Incoming Rate Limit (KiB/s)": "Limite de velocidade de recepção (KiB/s)",
@@ -63,15 +63,15 @@
    "Keep Versions": "Manter versões",
    "Last File Synced": "Último ficheiro sincronizado",
    "Last seen": "Última vez que foi verificado",
-    "Later": "Later",
+    "Later": "Mais tarde",
    "Latest Release": "Última versão",
    "Local Discovery": "Busca local",
    "Local State": "Estado local",
    "Maximum Age": "Idade máxima",
    "Multi level wildcard (matches multiple directory levels)": "Caractere polivalente multi-nível (faz corresponder a vários níveis de pastas)",
    "Never": "Nunca",
-    "New Device": "New Device",
-    "New Folder": "New Folder",
+    "New Device": "Novo dispositivo",
+    "New Folder": "Nova pasta",
    "No": "Não",
    "No File Versioning": "Sem gestão de versões de ficheiros",
    "Notice": "Avisos",
@@ -99,11 +99,11 @@
    "Select the devices to share this folder with.": "Seleccione os dispositivos com os quais vai partilhar esta pasta.",
    "Select the folders to share with this device.": "Seleccione as pastas a partilhar com este dispositivo.",
    "Settings": "Configurações",
-    "Share": "Share",
-    "Share Folder": "Share Folder",
+    "Share": "Partilhar",
+    "Share Folder": "Partilhar pasta",
    "Share Folders With Device": "Partilhar pastas com dispositivo",
    "Share With Devices": "Partilhar com os dispositivos",
-    "Share this folder?": "Share this folder?",
+    "Share this folder?": "Partilhar esta pasta?",
    "Shared With": "Partilhado com",
    "Short identifier for the folder. Must be the same on all cluster devices.": "Identificador curto para a pasta. Tem que ser igual em todos os dispositivos do grupo.",
    "Show ID": "Mostrar ID",
@@ -125,6 +125,7 @@
    "Syncthing is restarting.": "O Syncthing está a reiniciar.",
    "Syncthing is upgrading.": "O Syncthing está a actualizar-se.",
    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "O Syncthing parece estar em baixo, ou então existe um problema com a sua ligação à Internet. Tentando novamente...",
+    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing seems to be experiencing a problem processing your request. Please reload your browser or restart Syncthing if the problem persists.",
    "The aggregated statistics are publicly available at {%url%}.": "As estatísticas agrupadas estão disponíveis publicamente em {{url}}.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "A configuração foi gravada mas não activada. O Syncthing tem que reiniciar para activar a nova configuração.",
    "The device ID cannot be blank.": "O ID do dispositivo não pode estar vazio.",
@@ -160,5 +161,5 @@
    "You must keep at least one version.": "Tem que manter pelo menos uma versão.",
    "full documentation": "documentação completa",
    "items": "itens",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} wants to share folder \"{{folder}}\"."
+    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} quer partilhar a pasta \"{{folder}}\"."
 }
--- a/gui/assets/lang/lang-ru.json
+++ b/gui/assets/lang/lang-ru.json
@@ -125,6 +125,7 @@
    "Syncthing is restarting.": "Перезапуск Syncthing",
    "Syncthing is upgrading.": "Обновление Syncthing ",
    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Кажется, Syncthing не запущен или есть проблемы с подключением к Интернету. Переподключаюсь...",
+    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing seems to be experiencing a problem processing your request. Please reload your browser or restart Syncthing if the problem persists.",
    "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 устройства не может быть пустым.",
--- a/gui/assets/lang/lang-sv.json
+++ b/gui/assets/lang/lang-sv.json
@@ -125,6 +125,7 @@
    "Syncthing is restarting.": "Syncthing startar om.",
    "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 så är där ett 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 seems to be experiencing a problem processing your request. Please reload your browser or restart Syncthing if the problem persists.",
    "The aggregated statistics are publicly available at {%url%}.": "Aggregerad 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 blankt.",
--- a/gui/assets/lang/lang-zh-CN.json
+++ b/gui/assets/lang/lang-zh-CN.json
@@ -125,6 +125,7 @@
    "Syncthing is restarting.": "Syncthing正在重启",
    "Syncthing is upgrading.": "Syncthing正在升级",
    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing似乎关闭了，或者您的网络连接存在故障。重试中...",
+    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing seems to be experiencing a problem processing your request. Please reload your browser or restart Syncthing if the problem persists.",
    "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不能为空",
--- a/gui/assets/lang/lang-zh-TW.json
+++ b/gui/assets/lang/lang-zh-TW.json
@@ -125,6 +125,7 @@
    "Syncthing is restarting.": "Syncthing 正在重新啟動。",
    "Syncthing is upgrading.": "Syncthing 正在進行升級。",
    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing 似乎下線了，或者您的網際網路連線出現問題。正在重試...",
+    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing seems to be experiencing a problem processing your request. Please reload your browser or restart Syncthing if the problem persists.",
    "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.": "裝置識別碼不能為空白。",
--- a/gui/index.html
+++ b/gui/index.html
@@ -416,6 +416,14 @@
    </p>
  </modal>

+  <!-- HTTP error modal -->
+
+  <modal id="httpError" status="danger" icon="exclamation-sign" title="{{'Connection Error' | translate}}">
+    <p translate>
+      Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.
+    </p>
+  </modal>
+
  <!-- Restarting modal -->

  <modal id="restarting" icon="refresh" title="{{'Restarting' | translate}}" status="info">
@@ -922,6 +930,7 @@
          <li>Ben Schulz</li>
          <li>Ben Sidhom</li>
          <li>Brandon Philips</li>
+          <li>Brendan Long</li>
          <li>Caleb Callaway</li>
          <li>Cathryne Linenweaver</li>
          <li>Chris Joel</li>
@@ -938,6 +947,7 @@
          <li>Lode Hoste</li>
          <li>Marcin Dziadus</li>
          <li>Michael Tilli</li>
+          <li>Peter Hoeg</li>
          <li>Philippe Schommers</li>
          <li>Phill Luby</li>
          <li>Piotr Bejda</li>
--- a/gui/scripts/syncthing/core/controllers/syncthingController.js
+++ b/gui/scripts/syncthing/core/controllers/syncthingController.js
@@ -10,7 +10,6 @@ angular.module('syncthing.core')
        var restarting = false;

        function initController() {
-
            LocaleService.autoConfigLocale();

            refreshSystem();
@@ -21,11 +20,11 @@ angular.module('syncthing.core')

            $http.get(urlbase + '/version').success(function (data) {
                $scope.version = data.version;
-            });
+            }).error($scope.emitHTTPError);

            $http.get(urlbase + '/report').success(function (data) {
                $scope.reportData = data;
-            });
+            }).error($scope.emitHTTPError);

            $http.get(urlbase + '/upgrade').success(function (data) {
                $scope.upgradeInfo = data;
@@ -106,6 +105,30 @@ angular.module('syncthing.core')
            }
        });

+        $scope.$on('HTTPError', function (event, arg) {
+            // Emitted when a HTTP call fails. We use the status code to try
+            // to figure out what's wrong.
+
+            if (navigatingAway || !online) {
+                return;
+            }
+
+            console.log('HTTPError', arg);
+            online = false;
+            if (!restarting) {
+                if (arg.status === 0) {
+                    // A network error, not an HTTP error
+                    $scope.$emit('UIOffline');
+                } else if (arg.status >= 400 && arg.status <= 599) {
+                    // A genuine HTTP error
+                    $('#networkError').modal('hide');
+                    $('#restarting').modal('hide');
+                    $('#shutdown').modal('hide');
+                    $('#httpError').modal();
+                }
+            }
+        });
+
        $scope.$on('StateChanged', function (event, arg) {
            var data = arg.data;
            if ($scope.model[data.folder]) {
@@ -183,7 +206,7 @@ angular.module('syncthing.core')

            $http.get(urlbase + '/config/sync').success(function (data) {
                $scope.configInSync = data.configInSync;
-            });
+            }).error($scope.emitHTTPError);
        });

        $scope.$on('DownloadProgress', function (event, arg) {
@@ -233,6 +256,10 @@ angular.module('syncthing.core')
            console.log("DownloadProgress", $scope.progress);
        });

+        $scope.emitHTTPError = function (data, status, headers, config) {
+            $scope.$emit('HTTPError', {data: data, status: status, headers: headers, config: config});
+        };
+
        var debouncedFuncs = {};

        function refreshFolder(folder) {
@@ -242,7 +269,7 @@ angular.module('syncthing.core')
                    $http.get(urlbase + '/model?folder=' + encodeURIComponent(folder)).success(function (data) {
                        $scope.model[folder] = data;
                        console.log("refreshFolder", folder, data);
-                    });
+                    }).error($scope.emitHTTPError);
                }, 1000, true);
            }
            debouncedFuncs[key]();
@@ -289,7 +316,7 @@ angular.module('syncthing.core')
                }
                $scope.announceServersFailed = failed;
                console.log("refreshSystem", data);
-            });
+            }).error($scope.emitHTTPError);
        }

        function refreshCompletion(device, folder) {
@@ -318,7 +345,7 @@ angular.module('syncthing.core')
                        $scope.completion[device]._total = tot / cnt;

                        console.log("refreshCompletion", device, folder, $scope.completion[device]);
-                    });
+                    }).error($scope.emitHTTPError);
                }, 1000, true);
            }
            debouncedFuncs[key]();
@@ -345,25 +372,25 @@ angular.module('syncthing.core')
                }
                $scope.connections = data;
                console.log("refreshConnections", data);
-            });
+            }).error($scope.emitHTTPError);
        }

        function refreshErrors() {
            $http.get(urlbase + '/errors').success(function (data) {
                $scope.errors = data.errors;
                console.log("refreshErrors", data);
-            });
+            }).error($scope.emitHTTPError);
        }

        function refreshConfig() {
            $http.get(urlbase + '/config').success(function (data) {
                updateLocalConfig(data);
                console.log("refreshConfig", data);
-            });
+            }).error($scope.emitHTTPError);

            $http.get(urlbase + '/config/sync').success(function (data) {
                $scope.configInSync = data.configInSync;
-            });
+            }).error($scope.emitHTTPError);
        }

        function refreshNeed(folder) {
@@ -372,7 +399,7 @@ angular.module('syncthing.core')
                    console.log("refreshNeed", folder, data);
                    $scope.needed = data;
                }
-            });
+            }).error($scope.emitHTTPError);
        }

        var refreshDeviceStats = debounce(function () {
@@ -383,7 +410,7 @@ angular.module('syncthing.core')
                    $scope.deviceStats[device].LastSeenDays = (new Date() - $scope.deviceStats[device].LastSeen) / 1000 / 86400;
                }
                console.log("refreshDeviceStats", data);
-            });
+            }).error($scope.emitHTTPError);
        }, 500);

        var refreshFolderStats = debounce(function () {
@@ -395,7 +422,7 @@ angular.module('syncthing.core')
                    }
                }
                console.log("refreshfolderStats", data);
-            });
+            }).error($scope.emitHTTPError);
        }, 500);

        $scope.refresh = function () {
@@ -576,7 +603,7 @@ angular.module('syncthing.core')
                $http.get(urlbase + '/config/sync').success(function (data) {
                    $scope.configInSync = data.configInSync;
                });
-            });
+            }).error($scope.emitHTTPError);
        };

        $scope.saveSettings = function () {
@@ -656,7 +683,7 @@ angular.module('syncthing.core')
            restarting = true;
            $http.post(urlbase + '/shutdown').success(function () {
                $('#shutdown').modal();
-            });
+            }).error($scope.emitHTTPError);
            $scope.configInSync = true;
        };

@@ -857,7 +884,7 @@ angular.module('syncthing.core')
                params: { current: newvalue }
            }).success(function (data) {
                $scope.directoryList = data;
-            });
+            }).error($scope.emitHTTPError);
        });

        $scope.editFolder = function (folderCfg) {
@@ -1137,7 +1164,7 @@ angular.module('syncthing.core')
                    console.log("bumpFile", folder, data);
                    $scope.needed = data;
                }
-            });
+            }).error($scope.emitHTTPError);
        };

        // pseudo main. called on all definitions assigned
--- a/internal/auto/gui.files.go
+++ b/internal/auto/gui.files.go
--- a/internal/files/leveldb.go
+++ b/internal/files/leveldb.go
@@ -594,11 +594,11 @@ func ldbWithAllFolderTruncated(db *leveldb.DB, folder []byte, fn func(device []b
 	}
 }

-func ldbGet(db *leveldb.DB, folder, device, file []byte) protocol.FileInfo {
+func ldbGet(db *leveldb.DB, folder, device, file []byte) (protocol.FileInfo, bool) {
 	nk := deviceKey(folder, device, file)
 	bs, err := db.Get(nk, nil)
 	if err == leveldb.ErrNotFound {
-		return protocol.FileInfo{}
+		return protocol.FileInfo{}, false
 	}
 	if err != nil {
 		panic(err)
@@ -609,10 +609,10 @@ func ldbGet(db *leveldb.DB, folder, device, file []byte) protocol.FileInfo {
 	if err != nil {
 		panic(err)
 	}
-	return f
+	return f, true
 }

-func ldbGetGlobal(db *leveldb.DB, folder, file []byte) protocol.FileInfo {
+func ldbGetGlobal(db *leveldb.DB, folder, file []byte) (protocol.FileInfo, bool) {
 	k := globalKey(folder, file)
 	snap, err := db.GetSnapshot()
 	if err != nil {
@@ -633,7 +633,7 @@ func ldbGetGlobal(db *leveldb.DB, folder, file []byte) protocol.FileInfo {
 	}
 	bs, err := snap.Get(k, nil)
 	if err == leveldb.ErrNotFound {
-		return protocol.FileInfo{}
+		return protocol.FileInfo{}, false
 	}
 	if err != nil {
 		panic(err)
@@ -663,7 +663,7 @@ func ldbGetGlobal(db *leveldb.DB, folder, file []byte) protocol.FileInfo {
 	if err != nil {
 		panic(err)
 	}
-	return f
+	return f, true
 }

 func ldbWithGlobal(db *leveldb.DB, folder []byte, truncate bool, fn fileIterator) {
--- a/internal/files/set.go
+++ b/internal/files/set.go
@@ -118,8 +118,8 @@ func (s *Set) Update(device protocol.DeviceID, fs []protocol.FileInfo) {
 		discards := make([]protocol.FileInfo, 0, len(fs))
 		updates := make([]protocol.FileInfo, 0, len(fs))
 		for _, newFile := range fs {
-			existingFile := ldbGet(s.db, []byte(s.folder), device[:], []byte(newFile.Name))
-			if existingFile.Version <= newFile.Version {
+			existingFile, ok := ldbGet(s.db, []byte(s.folder), device[:], []byte(newFile.Name))
+			if !ok || existingFile.Version <= newFile.Version {
 				discards = append(discards, existingFile)
 				updates = append(updates, newFile)
 			}
@@ -174,16 +174,16 @@ func (s *Set) WithGlobalTruncated(fn fileIterator) {
 	ldbWithGlobal(s.db, []byte(s.folder), true, nativeFileIterator(fn))
 }

-func (s *Set) Get(device protocol.DeviceID, file string) protocol.FileInfo {
-	f := ldbGet(s.db, []byte(s.folder), device[:], []byte(osutil.NormalizedFilename(file)))
+func (s *Set) Get(device protocol.DeviceID, file string) (protocol.FileInfo, bool) {
+	f, ok := ldbGet(s.db, []byte(s.folder), device[:], []byte(osutil.NormalizedFilename(file)))
 	f.Name = osutil.NativeFilename(f.Name)
-	return f
+	return f, ok
 }

-func (s *Set) GetGlobal(file string) protocol.FileInfo {
-	f := ldbGetGlobal(s.db, []byte(s.folder), []byte(osutil.NormalizedFilename(file)))
+func (s *Set) GetGlobal(file string) (protocol.FileInfo, bool) {
+	f, ok := ldbGetGlobal(s.db, []byte(s.folder), []byte(osutil.NormalizedFilename(file)))
 	f.Name = osutil.NativeFilename(f.Name)
-	return f
+	return f, ok
 }

 func (s *Set) Availability(file string) []protocol.DeviceID {
--- a/internal/files/set_test.go
+++ b/internal/files/set_test.go
@@ -209,27 +209,42 @@ func TestGlobalSet(t *testing.T) {
 		t.Errorf("Need incorrect;\n A: %v !=\n E: %v", n, expectedRemoteNeed)
 	}

-	f := m.Get(protocol.LocalDeviceID, "b")
+	f, ok := m.Get(protocol.LocalDeviceID, "b")
+	if !ok {
+		t.Error("Unexpectedly not OK")
+	}
 	if fmt.Sprint(f) != fmt.Sprint(localTot[1]) {
 		t.Errorf("Get incorrect;\n A: %v !=\n E: %v", f, localTot[1])
 	}

-	f = m.Get(remoteDevice0, "b")
+	f, ok = m.Get(remoteDevice0, "b")
+	if !ok {
+		t.Error("Unexpectedly not OK")
+	}
 	if fmt.Sprint(f) != fmt.Sprint(remote1[0]) {
 		t.Errorf("Get incorrect;\n A: %v !=\n E: %v", f, remote1[0])
 	}

-	f = m.GetGlobal("b")
+	f, ok = m.GetGlobal("b")
+	if !ok {
+		t.Error("Unexpectedly not OK")
+	}
 	if fmt.Sprint(f) != fmt.Sprint(remote1[0]) {
 		t.Errorf("GetGlobal incorrect;\n A: %v !=\n E: %v", f, remote1[0])
 	}

-	f = m.Get(protocol.LocalDeviceID, "zz")
+	f, ok = m.Get(protocol.LocalDeviceID, "zz")
+	if ok {
+		t.Error("Unexpectedly OK")
+	}
 	if f.Name != "" {
 		t.Errorf("Get incorrect;\n A: %v !=\n E: %v", f, protocol.FileInfo{})
 	}

-	f = m.GetGlobal("zz")
+	f, ok = m.GetGlobal("zz")
+	if ok {
+		t.Error("Unexpectedly OK")
+	}
 	if f.Name != "" {
 		t.Errorf("GetGlobal incorrect;\n A: %v !=\n E: %v", f, protocol.FileInfo{})
 	}
--- a/internal/model/model.go
+++ b/internal/model/model.go
@@ -440,13 +440,17 @@ func (m *Model) NeedFolderFiles(folder string, max int) ([]protocol.FileInfoTrun
 			seen = make(map[string]bool, len(progressNames)+len(queuedNames))

 			for i, name := range progressNames {
-				progress[i] = rf.GetGlobal(name).ToTruncated() /// XXX: Should implement GetGlobalTruncated directly
-				seen[name] = true
+				if f, ok := rf.GetGlobal(name); ok {
+					progress[i] = f.ToTruncated() /// XXX: Should implement GetGlobalTruncated directly
+					seen[name] = true
+				}
 			}

 			for i, name := range queuedNames {
-				queued[i] = rf.GetGlobal(name).ToTruncated() /// XXX: Should implement GetGlobalTruncated directly
-				seen[name] = true
+				if f, ok := rf.GetGlobal(name); ok {
+					queued[i] = f.ToTruncated() /// XXX: Should implement GetGlobalTruncated directly
+					seen[name] = true
+				}
 			}
 		}
 		left := max - len(progress) - len(queued)
@@ -704,7 +708,11 @@ func (m *Model) Request(deviceID protocol.DeviceID, folder, name string, offset
 		return nil, ErrNoSuchFile
 	}

-	lf := r.Get(protocol.LocalDeviceID, name)
+	lf, ok := r.Get(protocol.LocalDeviceID, name)
+	if !ok {
+		return nil, ErrNoSuchFile
+	}
+
 	if lf.IsInvalid() || lf.IsDeleted() {
 		if debug {
 			l.Debugf("%v REQ(in): %s: %q / %q o=%d s=%d; invalid: %v", m, deviceID, folder, name, offset, size, lf)
@@ -759,18 +767,18 @@ func (m *Model) ReplaceLocal(folder string, fs []protocol.FileInfo) {
 	m.fmut.RUnlock()
 }

-func (m *Model) CurrentFolderFile(folder string, file string) protocol.FileInfo {
+func (m *Model) CurrentFolderFile(folder string, file string) (protocol.FileInfo, bool) {
 	m.fmut.RLock()
-	f := m.folderFiles[folder].Get(protocol.LocalDeviceID, file)
+	f, ok := m.folderFiles[folder].Get(protocol.LocalDeviceID, file)
 	m.fmut.RUnlock()
-	return f
+	return f, ok
 }

-func (m *Model) CurrentGlobalFile(folder string, file string) protocol.FileInfo {
+func (m *Model) CurrentGlobalFile(folder string, file string) (protocol.FileInfo, bool) {
 	m.fmut.RLock()
-	f := m.folderFiles[folder].GetGlobal(file)
+	f, ok := m.folderFiles[folder].GetGlobal(file)
 	m.fmut.RUnlock()
-	return f
+	return f, ok
 }

 type cFiler struct {
@@ -779,7 +787,7 @@ type cFiler struct {
 }

 // Implements scanner.CurrentFiler
-func (cf cFiler) CurrentFile(file string) protocol.FileInfo {
+func (cf cFiler) CurrentFile(file string) (protocol.FileInfo, bool) {
 	return cf.m.CurrentFolderFile(cf.r, file)
 }

@@ -1309,8 +1317,8 @@ func (m *Model) Override(folder string) {
 			batch = batch[:0]
 		}

-		have := fs.Get(protocol.LocalDeviceID, need.Name)
-		if have.Name != need.Name {
+		have, ok := fs.Get(protocol.LocalDeviceID, need.Name)
+		if !ok || have.Name != need.Name {
 			// We are missing the file
 			need.Flags |= protocol.FlagDeleted
 			need.Blocks = nil
--- a/internal/model/puller.go
+++ b/internal/model/puller.go
@@ -348,8 +348,12 @@ func (p *Puller) pullerIteration(ignores *ignore.Matcher) int {
 		if !ok {
 			break
 		}
-		f := p.model.CurrentGlobalFile(p.folder, fileName)
-		p.handleFile(f, copyChan, finisherChan)
+		if f, ok := p.model.CurrentGlobalFile(p.folder, fileName); ok {
+			p.handleFile(f, copyChan, finisherChan)
+		} else {
+			// File is no longer in the index. Mark it as done and drop it.
+			p.queue.Done(fileName)
+		}
 	}

 	// Signal copy and puller routines that we are done with the in data for
@@ -386,7 +390,7 @@ func (p *Puller) handleDir(file protocol.FileInfo) {
 	}

 	if debug {
-		curFile := p.model.CurrentFolderFile(p.folder, file.Name)
+		curFile, _ := p.model.CurrentFolderFile(p.folder, file.Name)
 		l.Debugf("need dir\n\t%v\n\t%v", file, curFile)
 	}

@@ -480,9 +484,9 @@ func (p *Puller) deleteFile(file protocol.FileInfo) {
 // handleFile queues the copies and pulls as necessary for a single new or
 // changed file.
 func (p *Puller) handleFile(file protocol.FileInfo, copyChan chan<- copyBlocksState, finisherChan chan<- *sharedPullerState) {
-	curFile := p.model.CurrentFolderFile(p.folder, file.Name)
+	curFile, ok := p.model.CurrentFolderFile(p.folder, file.Name)

-	if len(curFile.Blocks) == len(file.Blocks) && scanner.BlocksEqual(curFile.Blocks, file.Blocks) {
+	if ok && len(curFile.Blocks) == len(file.Blocks) && scanner.BlocksEqual(curFile.Blocks, file.Blocks) {
 		// We are supposed to copy the entire file, and then fetch nothing. We
 		// are only updating metadata, so we don't actually *need* to make the
 		// copy.
--- a/internal/model/queue_test.go
+++ b/internal/model/queue_test.go
@@ -191,7 +191,7 @@ func BenchmarkJobQueuePushPopDone10k(b *testing.B) {
 		for _, f := range files {
 			q.Push(f.Name)
 		}
-		for range files {
+		for _ = range files {
 			n, _ := q.Pop()
 			q.Done(n)
 		}
--- a/internal/osutil/osutil.go
+++ b/internal/osutil/osutil.go
@@ -43,8 +43,8 @@ func Rename(from, to string) error {

 	// Make sure the destination directory is writeable
 	toDir := filepath.Dir(to)
-	if info, err := os.Stat(toDir); err == nil {
-		os.Chmod(toDir, 0777)
+	if info, err := os.Stat(toDir); err == nil && info.IsDir() && info.Mode()&0200 == 0 {
+		os.Chmod(toDir, 0755)
 		defer os.Chmod(toDir, info.Mode())
 	}

--- a/internal/scanner/walk.go
+++ b/internal/scanner/walk.go
@@ -60,7 +60,7 @@ type TempNamer interface {

 type CurrentFiler interface {
 	// CurrentFile returns the file as seen at last scan.
-	CurrentFile(name string) protocol.FileInfo
+	CurrentFile(name string) (protocol.FileInfo, bool)
 }

 // Walk returns the list of files found in the local folder by scanning the
@@ -183,13 +183,14 @@ func (w *Walker) walkAndHashFiles(fchan chan protocol.FileInfo) filepath.WalkFun

 			if w.CurrentFiler != nil {
 				// A symlink is "unchanged", if
+				//  - it exists
 				//  - it wasn't deleted (because it isn't now)
 				//  - it was a symlink
 				//  - it wasn't invalid
 				//  - the symlink type (file/dir) was the same
 				//  - the block list (i.e. hash of target) was the same
-				cf := w.CurrentFiler.CurrentFile(rn)
-				if !cf.IsDeleted() && cf.IsSymlink() && !cf.IsInvalid() && SymlinkTypeEqual(flags, cf.Flags) && BlocksEqual(cf.Blocks, blocks) {
+				cf, ok := w.CurrentFiler.CurrentFile(rn)
+				if ok && !cf.IsDeleted() && cf.IsSymlink() && !cf.IsInvalid() && SymlinkTypeEqual(flags, cf.Flags) && BlocksEqual(cf.Blocks, blocks) {
 					return rval
 				}
 			}
@@ -214,14 +215,15 @@ func (w *Walker) walkAndHashFiles(fchan chan protocol.FileInfo) filepath.WalkFun
 		if info.Mode().IsDir() {
 			if w.CurrentFiler != nil {
 				// A directory is "unchanged", if it
+				//  - exists
 				//  - has the same permissions as previously, unless we are ignoring permissions
 				//  - was not marked deleted (since it apparently exists now)
 				//  - was a directory previously (not a file or something else)
 				//  - was not a symlink (since it's a directory now)
 				//  - was not invalid (since it looks valid now)
-				cf := w.CurrentFiler.CurrentFile(rn)
+				cf, ok := w.CurrentFiler.CurrentFile(rn)
 				permUnchanged := w.IgnorePerms || !cf.HasPermissionBits() || PermsEqual(cf.Flags, uint32(info.Mode()))
-				if permUnchanged && !cf.IsDeleted() && cf.IsDirectory() && !cf.IsSymlink() && !cf.IsInvalid() {
+				if ok && permUnchanged && !cf.IsDeleted() && cf.IsDirectory() && !cf.IsSymlink() && !cf.IsInvalid() {
 					return nil
 				}
 			}
@@ -248,6 +250,7 @@ func (w *Walker) walkAndHashFiles(fchan chan protocol.FileInfo) filepath.WalkFun
 		if info.Mode().IsRegular() {
 			if w.CurrentFiler != nil {
 				// A file is "unchanged", if it
+				//  - exists
 				//  - has the same permissions as previously, unless we are ignoring permissions
 				//  - was not marked deleted (since it apparently exists now)
 				//  - had the same modification time as it has now
@@ -255,9 +258,9 @@ func (w *Walker) walkAndHashFiles(fchan chan protocol.FileInfo) filepath.WalkFun
 				//  - was not a symlink (since it's a file now)
 				//  - was not invalid (since it looks valid now)
 				//  - has the same size as previously
-				cf := w.CurrentFiler.CurrentFile(rn)
+				cf, ok := w.CurrentFiler.CurrentFile(rn)
 				permUnchanged := w.IgnorePerms || !cf.HasPermissionBits() || PermsEqual(cf.Flags, uint32(info.Mode()))
-				if permUnchanged && !cf.IsDeleted() && cf.Modified == info.ModTime().Unix() && !cf.IsDirectory() &&
+				if ok && permUnchanged && !cf.IsDeleted() && cf.Modified == info.ModTime().Unix() && !cf.IsDirectory() &&
 					!cf.IsSymlink() && !cf.IsInvalid() && cf.Size() == info.Size() {
 					return nil
 				}
Author	SHA1	Message	Date
Jakob Borg	d68ce2d68c	Translation update	2015-01-06 23:12:40 +01:00
Jakob Borg	8e02c040eb	Update key ID for signed releases in README (fixes #1180 )	2015-01-06 23:06:16 +01:00
Jakob Borg	a7a317c284	The predictableRandom test can only run once successfully (fixes #1184 )	2015-01-06 23:03:35 +01:00
Audrius Butkevicius	9d6ef24660	Merge pull request #1194 from syncthing/fix-1186 Use comma-ok idiom to signal files missing in database (fixes #1186)	2015-01-06 21:54:13 +00:00
Jakob Borg	14014408fb	Merge pull request #1181 from kozec/stnoupgrade-disable-button Return HTTP/500 from /rest/upgrade if STNOUPGRADE is defined	2015-01-06 22:54:08 +01:00
kozec	b933e9666a	/rest/upgrade returns HTTP/500 if STNOUPGRADE is defined	2015-01-06 22:50:56 +01:00
Jakob Borg	7aff59bcce	Add brendanlong	2015-01-06 22:48:01 +01:00
Jakob Borg	8e2760cb3d	Merge pull request #1183 from brendanlong/fix-tests-on-go-1.3 Don't use Go 1.4 range syntax in queue_test.go	2015-01-06 22:47:23 +01:00
Brendan Long	7a9fc6dbd3	Don't use Go 1.4 range syntax in queue_test.go, since the listed requirement is Go 1.3.	2015-01-06 15:45:58 -06:00
Jakob Borg	75d0dc251e	Use comma-ok idiom to signal files missing in database (fixes #1186 ) Prevents us from doing stupid things to the folder root (empty file path) when nodes disconnect...	2015-01-06 22:40:20 +01:00
Jakob Borg	9a50c4d93f	Don't unnecessarily chmod directories when renaming	2015-01-06 22:10:44 +01:00
Audrius Butkevicius	010d5a0192	Merge pull request #1179 from syncthing/httperror Handle HTTP errors on non-event requests (fixes #1120)	2015-01-05 17:45:18 +00:00
Jakob Borg	cf1594829a	Handle HTTP errors on non-event requests (fixes #1120 , fixes #807 )	2015-01-05 16:03:00 +01:00
Jakob Borg	854d720ce0	Merge pr/988 * commit 'b9817ac': add README on-failure instead of always as we cannot otherwise kill the service systemd units for system/user	2015-01-05 15:14:33 +01:00
Jakob Borg	2f43c74ece	Add peterhoeg	2015-01-05 15:14:22 +01:00
Peter Hoeg	b9817ac6b4	add README	2015-01-05 18:29:13 +08:00
Peter Hoeg	1e8da0d494	on-failure instead of always as we cannot otherwise kill the service	2015-01-05 18:29:13 +08:00
Peter Hoeg	c47be7b415	systemd units for system/user	2015-01-05 18:29:13 +08:00