nothing: Dummy commit

2016-05-14 08:02:02 +02:00
987 changed files with 17533 additions and 670504 deletions
@@ -6,4 +6,3 @@ vendor/**   -text=auto

 # Diffs on these files are meaningless
 *.svg           -diff
-*.pb.go         -diff
@@ -1,7 +1,8 @@
-/syncthing
-/stdiscosrv
+syncthing
+!gui/syncthing
+!debian/syncthing
+!Godeps/_workspace/src/github.com/syncthing
 syncthing.exe
-stdiscosrv.exe
 *.tar.gz
 *.zip
 *.asc
@@ -1,99 +1,89 @@
 # This is the official list of Syncthing authors for copyright purposes.
-# The format is:
-#
-#    Name Name Name (nickname) <email1@example.com> <email2@example.com>
-#
-# The NICKS list is auto generated from this file.

-Aaron Bieber (qbit) <qbit@deftly.net>
-Adam Piggott (simplypeachy) <aD@simplypeachy.co.uk> <simplypeachy@users.noreply.github.com>
-Alessandro G. (alessandro.g89) <alessandro.g89@gmail.com>
-Alexander Graf (alex2108) <register-github@alex-graf.de>
-Alexandre Viau (aviau) <alexandre@alexandreviau.net> <aviau@debian.org>
-Anderson Mesquita (andersonvom) <andersonvom@gmail.com>
-Andrew Dunham (andrew-d) <andrew@du.nham.ca>
-Andrey D (scienmind) <scintertech@cryptolab.net>
-Antoine Lamielle (0x010C) <antoine.lamielle@0x010c.fr> <gh@0x010c.fr>
-Antony Male (canton7) <antony.male@gmail.com>
-Arthur Axel fREW Schmidt (frioux) <frew@afoolishmanifesto.com> <frioux@gmail.com>
-Audrius Butkevicius (AudriusButkevicius) <audrius.butkevicius@gmail.com>
-Bart De Vries (mogwa1) <devriesb@gmail.com>
-Ben Curthoys (bencurthoys) <ben@bencurthoys.com>
-Ben Schulz (uok) <ueomkail@gmail.com> <uok@users.noreply.github.com>
-Ben Sidhom (bsidhom) <bsidhom@gmail.com>
-Benny Ng (tpng) <benny.tpng@gmail.com>
-Brandon Philips (philips) <brandon@ifup.org>
-Brendan Long (brendanlong) <self@brendanlong.com>
-Brian R. Becker (brbecker) <brbecker@gmail.com>
-Caleb Callaway (cqcallaw) <enlightened.despot@gmail.com>
-Carsten Hagemann (Moter8) <moter8@gmail.com>
-Cathryne Linenweaver (Cathryne) <cathryne.linenweaver@gmail.com> <Cathryne@users.noreply.github.com>
-Cedric Staniewski (xduugu) <cedric@gmx.ca>
-Chris Howie (cdhowie) <me@chrishowie.com>
-Chris Joel (cdata) <chris@scriptolo.gy>
-Colin Kennedy (moshen) <moshen.colin@gmail.com>
-Daniel Bergmann (brgmnn) <dan.arne.bergmann@gmail.com> <brgmnn@users.noreply.github.com>
-Daniel Harte (norgeous) <daniel@harte.me> <daniel@danielharte.co.uk> <norgeous@users.noreply.github.com>
-Daniel Martí (mvdan) <mvdan@mvdan.cc>
-David Rimmer (dinosore) <dinosore@dbrsoftware.co.uk>
-Denis A. (dva) <denisva@gmail.com>
-Dennis Wilson (snnd) <dw@risu.io>
-Dominik Heidler (asdil12) <dominik@heidler.eu>
-Elias Jarlebring (jarlebring) <jarlebring@gmail.com>
-Emil Hessman (ceh) <emil@hessman.se>
-Erik Meitner (WSGCSysadmin) <e.meitner@willystreet.coop>
-Federico Castagnini (facastagnini) <federico.castagnini@gmail.com>
-Felix Ableitner (Nutomic) <me@nutomic.com>
-Felix Unterpaintner (bigbear2nd) <bigbear2nd@gmail.com>
-Francois-Xavier Gsell (zukoo) <fxgsell@gmail.com>
-Frank Isemann (fti7) <frank@isemann.name>
-Gilli Sigurdsson (gillisig) <gilli@vx.is>
-Jaakko Hannikainen (jgke) <jgke@jgke.fi>
-Jacek Szafarkiewicz (hadogenes) <szafar@linux.pl>
-Jake Peterson (acogdev) <jake@acogdev.com>
-Jakob Borg (calmh) <jakob@nym.se> <jakob@kastelo.net>
-James Patterson (jpjp) <jamespatterson@operamail.com> <jpjp@users.noreply.github.com>
-Jaroslav Malec (dzarda) <dzardacz@gmail.com>
-Jens Diemer (jedie) <github.com@jensdiemer.de> <git@jensdiemer.de>
-Jochen Voss (seehuhn) <voss@seehuhn.de>
-Johan Vromans (sciurius) <jvromans@squirrel.nl>
-Karol Różycki (krozycki) <rozycki.karol@gmail.com>
-Kelong Cong (kc1212) <kc04bc@gmx.com> <kc1212@users.noreply.github.com>
-Ken'ichi Kamada (kamadak) <kamada@nanohz.org>
-Kevin Allen (ironmig) <kma1660@gmail.com>
-Lars K.W. Gohlke (lkwg82) <lkwg82@gmx.de>
-Laurent Etiemble (letiemble) <laurent.etiemble@gmail.com> <laurent.etiemble@monobjc.net>
-Lode Hoste (Zillode) <zillode@zillode.be>
-Lord Landon Agahnim (LordLandon) <lordlandon@gmail.com>
-Majed Abdulaziz (majedev) <majed.alhajry@gmail.com>
-Marc Laporte (marclaporte) <marc@marclaporte.com> <marc@laporte.name>
-Marc Pujol (kilburn) <kilburn@la3.org>
-Marcin Dziadus (marcindziadus) <dziadus.marcin@gmail.com>
-Mateusz Naściszewski (mateon1) <matin1111@wp.pl>
-Matt Burke (burkemw3) <mburke@amplify.com> <burkemw3@gmail.com>
-Max Schulze (kralo) <max.schulze@online.de> <kralo@users.noreply.github.com>
-Michael Jephcote (Rewt0r) <rewt0r@gmx.com> <Rewt0r@users.noreply.github.com>
-Michael Ploujnikov (plouj) <ploujj@gmail.com>
-Michael Tilli (pyfisch) <pyfisch@gmail.com>
-Nate Morrison (nrm21) <natemorrison@gmail.com>
-Pascal Jungblut (pascalj) <github@pascalj.com> <mail@pascal-jungblut.com>
-Peter Hoeg (peterhoeg) <peter@speartail.com>
-Philippe Schommers (filoozoom) <philippe@schommers.be>
-Phill Luby (pluby) <phill.luby@newredo.com>
-Piotr Bejda (piobpl) <piotrb10@gmail.com>
-Ryan Sullivan (KayoticSully) <kayoticsully@gmail.com>
-Scott Klupfel (kluppy) <kluppy@going2blue.com>
-Sergey Mishin (ralder) <ralder@yandex.ru>
-Stefan Kuntz (Stefan-Code) <stefan.github@gmail.com> <Stefan.github@gmail.com>
-Stefan Tatschner (rumpelsepp) <stefan@sevenbyte.org> <rumpelsepp@sevenbyte.org>
-Tim Abell (timabell) <tim@timwise.co.uk>
-Tobias Nygren (tnn2) <tnn@nygren.pp.se>
-Tomas Cerveny (kozec) <kozec@kozec.com>
-Tully Robinson (tojrobinson) <tully@tojr.org>
-Tyler Brazier (tylerbrazier) <tyler@tylerbrazier.com>
-Veeti Paananen (veeti) <veeti.paananen@rojekti.fi>
-Victor Buinsky (buinsky) <vix_booja@tut.by>
-Vil Brekin (Vilbrekin) <vilbrekin@gmail.com>
-William A. Kennington III (wkennington) <william@wkennington.com>
-Wulf Weich (wweich) <wweich@users.noreply.github.com> <wweich@gmx.de>
-Yannic A. (eipiminus1) <eipiminusone+github@gmail.com> <eipiminus1@users.noreply.github.com>
+Aaron Bieber <qbit@deftly.net>
+Adam Piggott <aD@simplypeachy.co.uk> <simplypeachy@users.noreply.github.com>
+Alessandro G. <alessandro.g89@gmail.com>
+Alexander Graf <register-github@alex-graf.de>
+Anderson Mesquita <andersonvom@gmail.com>
+Andrew Dunham <andrew@du.nham.ca>
+Antony Male <antony.male@gmail.com>
+Arthur Axel fREW Schmidt <frew@afoolishmanifesto.com> <frioux@gmail.com>
+Audrius Butkevicius <audrius.butkevicius@gmail.com>
+Bart De Vries <devriesb@gmail.com>
+Ben Curthoys <ben@bencurthoys.com>
+Ben Schulz <ueomkail@gmail.com> <uok@users.noreply.github.com>
+Ben Sidhom <bsidhom@gmail.com>
+Benny Ng <benny.tpng@gmail.com>
+Brandon Philips <brandon@ifup.org>
+Brendan Long <self@brendanlong.com>
+Brian R. Becker <brbecker@gmail.com>
+Caleb Callaway <enlightened.despot@gmail.com>
+Carsten Hagemann <moter8@gmail.com>
+Cathryne Linenweaver <cathryne.linenweaver@gmail.com> <Cathryne@users.noreply.github.com>
+Chris Howie <me@chrishowie.com>
+Chris Joel <chris@scriptolo.gy>
+Colin Kennedy <moshen.colin@gmail.com>
+Daniel Bergmann <dan.arne.bergmann@gmail.com> <brgmnn@users.noreply.github.com>
+Daniel Harte <daniel@harte.me> <daniel@danielharte.co.uk> <norgeous@users.noreply.github.com>
+Daniel Martí <mvdan@mvdan.cc>
+David Rimmer <dinosore@dbrsoftware.co.uk>
+Denis A. <denisva@gmail.com>
+Dennis Wilson <dw@risu.io>
+Dominik Heidler <dominik@heidler.eu>
+Elias Jarlebring <jarlebring@gmail.com>
+Emil Hessman <emil@hessman.se>
+Erik Meitner <e.meitner@willystreet.coop>
+Federico Castagnini <federico.castagnini@gmail.com>
+Felix Ableitner <me@nutomic.com>
+Felix Unterpaintner <bigbear2nd@gmail.com>
+Francois-Xavier Gsell <fxgsell@gmail.com>
+Frank Isemann <frank@isemann.name>
+Gilli Sigurdsson <gilli@vx.is>
+Jaakko Hannikainen <jgke@jgke.fi>
+Jacek Szafarkiewicz <szafar@linux.pl>
+Jake Peterson <jake@acogdev.com>
+Jakob Borg <jakob@nym.se>
+James Patterson <jamespatterson@operamail.com> <jpjp@users.noreply.github.com>
+Jaroslav Malec <dzardacz@gmail.com>
+Jens Diemer <github.com@jensdiemer.de> <git@jensdiemer.de>
+Jochen Voss <voss@seehuhn.de>
+Johan Vromans <jvromans@squirrel.nl>
+Karol Różycki <rozycki.karol@gmail.com>
+Kelong Cong <kc04bc@gmx.com> <kc1212@users.noreply.github.com>
+Ken'ichi Kamada <kamada@nanohz.org>
+Kevin Allen <kma1660@gmail.com>
+Lars K.W. Gohlke <lkwg82@gmx.de>
+Laurent Etiemble <laurent.etiemble@gmail.com> <laurent.etiemble@monobjc.net>
+Lode Hoste <zillode@zillode.be>
+Lord Landon Agahnim <lordlandon@gmail.com>
+Marc Laporte <marc@marclaporte.com> <marc@laporte.name>
+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>
+Nate Morrison <natemorrison@gmail.com>
+Pascal Jungblut <github@pascalj.com> <mail@pascal-jungblut.com>
+Peter Hoeg <peter@speartail.com>
+Philippe Schommers <philippe@schommers.be>
+Phill Luby <phill.luby@newredo.com>
+Piotr Bejda <piotrb10@gmail.com>
+Ryan Sullivan <kayoticsully@gmail.com>
+Scott Klupfel <kluppy@going2blue.com>
+Sergey Mishin <ralder@yandex.ru>
+Stefan Kuntz <stefan.github@gmail.com> <Stefan.github@gmail.com>
+Stefan Tatschner <stefan@sevenbyte.org> <rumpelsepp@sevenbyte.org>
+Tim Abell <tim@timwise.co.uk>
+Tobias Nygren <tnn@nygren.pp.se>
+Tomas Cerveny <kozec@kozec.com>
+Tully Robinson <tully@tojr.org>
+Tyler Brazier <tyler@tylerbrazier.com>
+Veeti Paananen <veeti.paananen@rojekti.fi>
+Victor Buinsky <vix_booja@tut.by>
+Vil Brekin <vilbrekin@gmail.com>
+William A. Kennington III <william@wkennington.com>
+Wulf Weich <wweich@users.noreply.github.com> <wweich@gmx.de>
+Yannic A. <eipiminusone+github@gmail.com> <eipiminus1@users.noreply.github.com>
@@ -44,20 +44,9 @@ repository](https://github.com/syncthing/docs).

 ## Licensing

-All contributions are made available under the same license as the already
-existing material being contributed to. For most of the project and unless
-otherwise stated this means MPLv2, but there are exceptions:
-
- Certain commands (under cmd/...) may have a separate license, indicated by
-  the presence of a LICENSE file in the corresponding directory.
-
- The documentation (man/...) is licensed under the Creative Commons
-  Attribution 4.0 International License.
-
- Projects under vendor/... are copyright by and licensed from their
-  respective original authors. Contributions should be made to the original
-  project, not here.
-
-Regardless of the license in effect, you retain the copyright to your
-contribution.
+All contributions are made under the same MPLv2 license as the rest of
+the project, except documentation, user interface text and translation
+strings which are licensed under the Creative Commons Attribution 4.0
+International License. You retain the copyright to code you have
+written.

@@ -1,11 +1,7 @@
-Do not report security issues in this bug tracker. Instead, contact
-security@syncthing.net directly - see https://syncthing.net/security.html
-for more information.
-
 If your issue is a support request ("How do I get my devices to connect?"
 or similar), please use the support forum at https://forum.syncthing.net/
 where a large number of helpful people hang out. This issue tracker is for
-reporting bugs or feature requests directly to the developers.
+reporting bugs or feature requests directly to the developers. 

 If your issue is a bug report, replace this boilerplate with a description
 of the problem, being sure to include at least:
@@ -1,118 +1,88 @@
 # This file maps email addresses used in commits to nicks used the changelog.
-# It is auto generated from the AUTHORS file by script/authors.go.

-0x010C <antoine.lamielle@0x010c.fr>
-0x010C <gh@0x010c.fr>
-acogdev <jake@acogdev.com>
-alessandro.g89 <alessandro.g89@gmail.com>
-alex2108 <register-github@alex-graf.de>
-andersonvom <andersonvom@gmail.com>
-andrew-d <andrew@du.nham.ca>
-asdil12 <dominik@heidler.eu>
-AudriusButkevicius <audrius.butkevicius@gmail.com>
-aviau <alexandre@alexandreviau.net>
-aviau <aviau@debian.org>
-bencurthoys <ben@bencurthoys.com>
-bigbear2nd <bigbear2nd@gmail.com>
-brbecker <brbecker@gmail.com>
-brendanlong <self@brendanlong.com>
-brgmnn <dan.arne.bergmann@gmail.com>
-brgmnn <brgmnn@users.noreply.github.com>
-bsidhom <bsidhom@gmail.com>
-buinsky <vix_booja@tut.by>
-burkemw3 <mburke@amplify.com>
-burkemw3 <burkemw3@gmail.com>
-calmh <jakob@nym.se>
-calmh <jakob@kastelo.net>
-canton7 <antony.male@gmail.com>
-Cathryne <cathryne.linenweaver@gmail.com>
-Cathryne <Cathryne@users.noreply.github.com>
-cdata <chris@scriptolo.gy>
-cdhowie <me@chrishowie.com>
-ceh <emil@hessman.se>
-cqcallaw <enlightened.despot@gmail.com>
-dinosore <dinosore@dbrsoftware.co.uk>
-dva <denisva@gmail.com>
-dzarda <dzardacz@gmail.com>
-eipiminus1 <eipiminusone+github@gmail.com>
-eipiminus1 <eipiminus1@users.noreply.github.com>
-facastagnini <federico.castagnini@gmail.com>
-filoozoom <philippe@schommers.be>
-frioux <frew@afoolishmanifesto.com>
-frioux <frioux@gmail.com>
-fti7 <frank@isemann.name>
-gillisig <gilli@vx.is>
-hadogenes <szafar@linux.pl>
-ironmig <kma1660@gmail.com>
-jarlebring <jarlebring@gmail.com>
-jedie <github.com@jensdiemer.de>
-jedie <git@jensdiemer.de>
-jgke <jgke@jgke.fi>
-jpjp <jamespatterson@operamail.com>
-jpjp <jpjp@users.noreply.github.com>
-kamadak <kamada@nanohz.org>
-KayoticSully <kayoticsully@gmail.com>
-kc1212 <kc04bc@gmx.com>
-kc1212 <kc1212@users.noreply.github.com>
-kilburn <kilburn@la3.org>
-kluppy <kluppy@going2blue.com>
-kozec <kozec@kozec.com>
-kralo <max.schulze@online.de>
-kralo <kralo@users.noreply.github.com>
-krozycki <rozycki.karol@gmail.com>
-letiemble <laurent.etiemble@gmail.com>
-letiemble <laurent.etiemble@monobjc.net>
-lkwg82 <lkwg82@gmx.de>
-LordLandon <lordlandon@gmail.com>
-majedev <majed.alhajry@gmail.com>
-marcindziadus <dziadus.marcin@gmail.com>
+acogdev		<jake@acogdev.com>
+alex2108	<register-github@alex-graf.de>
+alessandro.g89	<alessandro.g89@gmail.com>
+andersonvom	<andersonvom@gmail.com>
+andrew-d	<andrew@du.nham.ca>
+asdil12		<dominik@heidler.eu>
+AudriusButkevicius	<audrius.butkevicius@gmail.com>
+bencurthoys	<ben@bencurthoys.com>
+bigbear2nd	<bigbear2nd@gmail.com>
+brbecker	<brbecker@gmail.com>
+brendanlong	<self@brendanlong.com>
+brgmnn      <dan.arne.bergmann@gmail.com> <brgmnn@users.noreply.github.com>
+bsidhom		<bsidhom@gmail.com>
+buinsky	<vix_booja@tut.by>
+burkemw3	<mburke@amplify.com> <burkemw3@gmail.com>
+calmh		<jakob@nym.se>
+canton7	<antony.male@gmail.com>
+Cathryne	<cathryne.linenweaver@gmail.com> <Cathryne@users.noreply.github.com>
+cdata		<chris@scriptolo.gy>
+cdhowie	<me@chrishowie.com>
+ceh		<emil@hessman.se>
+cqcallaw	<enlightened.despot@gmail.com>
+dinosore	<dinosore@dbrsoftware.co.uk>
+dva	<denisva@gmail.com>
+dzarda		<dzardacz@gmail.com>
+eipiminus1	<eipiminusone+github@gmail.com> <eipiminus1@users.noreply.github.com>
+facastagnini	<federico.castagnini@gmail.com>
+filoozoom	<philippe@schommers.be>
+frioux		<frew@afoolishmanifesto.com> <frioux@gmail.com>
+fti7	<frank@isemann.name>
+gillisig	<gilli@vx.is>
+hadogenes	<szafar@linux.pl>
+ironmig	<kma1660@gmail.com>
+jarlebring	<jarlebring@gmail.com>
+jedie		<github.com@jensdiemer.de> <git@jensdiemer.de>
+jgke	<jgke@jgke.fi>
+jpjp		<jamespatterson@operamail.com> <jpjp@users.noreply.github.com>
+kamadak		<kamada@nanohz.org>
+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>
+lkwg82	<lkwg82@gmx.de>
+marcindziadus	<dziadus.marcin@gmail.com>
 marclaporte <marc@marclaporte.com>
-marclaporte <marc@laporte.name>
-mateon1 <matin1111@wp.pl>
-mogwa1 <devriesb@gmail.com>
-moshen <moshen.colin@gmail.com>
-Moter8 <moter8@gmail.com>
-mvdan <mvdan@mvdan.cc>
-norgeous <daniel@harte.me>
-norgeous <daniel@danielharte.co.uk>
-norgeous <norgeous@users.noreply.github.com>
-nrm21 <natemorrison@gmail.com>
-Nutomic <me@nutomic.com>
-pascalj <github@pascalj.com>
-pascalj <mail@pascal-jungblut.com>
-peterhoeg <peter@speartail.com>
-philips <brandon@ifup.org>
-piobpl <piotrb10@gmail.com>
-plouj <ploujj@gmail.com>
-pluby <phill.luby@newredo.com>
-pyfisch <pyfisch@gmail.com>
-qbit <qbit@deftly.net>
-ralder <ralder@yandex.ru>
-Rewt0r <rewt0r@gmx.com>
-Rewt0r <Rewt0r@users.noreply.github.com>
-rumpelsepp <stefan@sevenbyte.org>
-rumpelsepp <rumpelsepp@sevenbyte.org>
-scienmind <scintertech@cryptolab.net>
-sciurius <jvromans@squirrel.nl>
-seehuhn <voss@seehuhn.de>
-simplypeachy <aD@simplypeachy.co.uk>
-simplypeachy <simplypeachy@users.noreply.github.com>
-snnd <dw@risu.io>
-Stefan-Code <stefan.github@gmail.com>
-Stefan-Code <Stefan.github@gmail.com>
-timabell <tim@timwise.co.uk>
-tnn2 <tnn@nygren.pp.se>
-tojrobinson <tully@tojr.org>
-tpng <benny.tpng@gmail.com>
-tylerbrazier <tyler@tylerbrazier.com>
-uok <ueomkail@gmail.com>
-uok <uok@users.noreply.github.com>
-veeti <veeti.paananen@rojekti.fi>
-Vilbrekin <vilbrekin@gmail.com>
-wkennington <william@wkennington.com>
-WSGCSysadmin <e.meitner@willystreet.coop>
-wweich <wweich@users.noreply.github.com>
-wweich <wweich@gmx.de>
-xduugu <cedric@gmx.ca>
-Zillode <zillode@zillode.be>
-zukoo <fxgsell@gmail.com>
+mateon1	<matin1111@wp.pl>
+mogwa1	<devriesb@gmail.com>
+moshen		<moshen.colin@gmail.com>
+Moter8		<moter8@gmail.com>
+mvdan		<mvdan@mvdan.cc>
+norgeous	<daniel@harte.me> <daniel@danielharte.co.uk> <norgeous@users.noreply.github.com>
+nrm21	<natemorrison@gmail.com>
+Nutomic		<me@nutomic.com>
+pascalj		<github@pascalj.com> <mail@pascal-jungblut.com>
+peterhoeg	<peter@speartail.com>
+philips		<brandon@ifup.org>
+piobpl		<piotrb10@gmail.com>
+plouj	<ploujj@gmail.com>
+pluby		<phill.luby@newredo.com>
+pyfisch		<pyfisch@gmail.com>
+qbit		<qbit@deftly.net>
+ralder		<ralder@yandex.ru>
+Rewt0r		<rewt0r@gmx.com> <Rewt0r@users.noreply.github.com>
+rumpelsepp	<stefan@sevenbyte.org> <rumpelsepp@sevenbyte.org>
+sciurius	<jvromans@squirrel.nl>
+seehuhn		<voss@seehuhn.de>
+simplypeachy	<aD@simplypeachy.co.uk> <simplypeachy@users.noreply.github.com>
+snnd		<dw@risu.io>
+Stefan-Code	<stefan.github@gmail.com> <Stefan.github@gmail.com>
+timabell	<tim@timwise.co.uk>
+tnn2		<tnn@nygren.pp.se>
+tojrobinson	<tully@tojr.org>
+tpng		<benny.tpng@gmail.com>
+tylerbrazier	<tyler@tylerbrazier.com>
+uok		<ueomkail@gmail.com> <uok@users.noreply.github.com>
+veeti		<veeti.paananen@rojekti.fi>
+Vilbrekin	<vilbrekin@gmail.com>
+wkennington	<william@wkennington.com>
+wsgcsysadmin	<e.meitner@willystreet.coo>
+wweich	<wweich@users.noreply.github.com> <wweich@gmx.de>
+Zillode		<zillode@zillode.be>
+zukoo		<fxgsell@gmail.com>
@@ -27,11 +27,6 @@ There are a few examples for keeping Syncthing running in the background
 on your system in [the etc directory][3]. There are also several [GUI
 implementations][11] for Windows, Mac and Linux.

-## Vote on features/bugs
-
-We'd like to encourage you to [vote][12] on issues that matter to you.
-This helps the team understand what are the biggest pain points for our users, and could potentially influence what is being worked on next.
-
 ## Getting in Touch

 The first and best point of contact is the [Forum][8]. There is also an IRC
@@ -71,4 +66,3 @@ All code is licensed under the [MPLv2 License][7].
 [9]: https://kiwiirc.com/client/irc.freenode.net/#syncthing
 [10]: https://github.com/syncthing/syncthing/issues
 [11]: http://docs.syncthing.net/users/contrib.html#gui-wrappers
-[12]: https://www.bountysource.com/teams/syncthing/issues
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
-    <defs>
-        <linearGradient id="grad" gradientUnits="userSpaceOnUse" x1="8" y1="0" x2="8" y2="16">
-            <stop offset="0" style="stop-color:#26B6DB"/>
-            <stop offset="1" style="stop-color:#0882C8"/>
-        </linearGradient>
-    </defs>
-    <g id="syncthing-logo">
-        <circle id="outer" cx="8" cy="8" r="8" style="fill:url(#grad)"/>
-        <circle id="inner" cx="8" cy="7.9727402" r="5.9557071" style="fill:none;stroke:#ffffff;stroke-width:0.81771719"/>
-        <line id="arm-l" x1="9.1993189" y1="8.776825" x2="2.262351" y2="9.4173737" style="stroke:#ffffff;stroke-width:0.81771719"/>
-        <line id="arm-tr" x1="9.1993189" y1="8.776825" x2="13.301533" y2="5.3696747" style="stroke:#ffffff;stroke-width:0.81771719"/>
-        <line id="arm-br" x1="9.1993189" y1="8.776825" x2="11.788756" y2="12.51107" style="stroke:#ffffff;stroke-width:0.81771719"/>
-        <circle id="node-c" cx="9.1993189" cy="8.776825" r="1.22" style="fill:#ffffff"/>
-        <circle id="node-l" cx="2.262351" cy="9.4173737" r="1.22" style="fill:#ffffff"/>
-        <circle id="node-tr" cx="13.301533" cy="5.3696747" r="1.22" style="fill:#ffffff"/>
-        <circle id="node-br" cx="11.788756" cy="12.51107" r="1.22" style="fill:#ffffff"/>
-    </g>
-</svg>
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
-    <defs>
-        <linearGradient id="grad" gradientUnits="userSpaceOnUse" x1="8" y1="0" x2="8" y2="16">
-            <stop offset="0" style="stop-color:#26B6DB"/>
-            <stop offset="1" style="stop-color:#0882C8"/>
-        </linearGradient>
-        <mask id="bitemask" maskUnits="userSpaceOnUse">
-            <g>
-                <rect id="mask-bg" x="0" y="0" width="16" height="16" style="fill:#ffffff"/>
-                <circle id="mask-subtract" cx="11.5" cy="11.5" r="5.5" style="fill:#000000"/>
-            </g>
-        </mask>
-    </defs>
-    <g id="syncthing-logo" mask="url(#bitemask)">
-        <circle id="outer" cx="8" cy="8" r="8" style="fill:url(#grad)"/>
-        <circle id="inner" cx="8" cy="7.9727402" r="5.9557071" style="fill:none;stroke:#ffffff;stroke-width:0.81771719"/>
-        <line id="arm-l" x1="9.1993189" y1="8.776825" x2="2.262351" y2="9.4173737" style="stroke:#ffffff;stroke-width:0.81771719"/>
-        <line id="arm-tr" x1="9.1993189" y1="8.776825" x2="13.301533" y2="5.3696747" style="stroke:#ffffff;stroke-width:0.81771719"/>
-        <line id="arm-br" x1="9.1993189" y1="8.776825" x2="11.788756" y2="12.51107" style="stroke:#ffffff;stroke-width:0.81771719"/>
-        <circle id="node-c" cx="9.1993189" cy="8.776825" r="1.22" style="fill:#ffffff"/>
-        <circle id="node-l" cx="2.262351" cy="9.4173737" r="1.22" style="fill:#ffffff"/>
-        <circle id="node-tr" cx="13.301533" cy="5.3696747" r="1.22" style="fill:#ffffff"/>
-        <circle id="node-br" cx="11.788756" cy="12.51107" r="1.22" style="fill:#ffffff"/>
-    </g>
-    <circle id="bubble" cx="11.5" cy="11.5" r="4.5" style="fill:#000000"/>
-    <g id="exclaim">
-        <rect id="exclaim-top" x="11" y="9" width="1" height="3" style="fill:#ffffff"/>
-        <rect id="exclaim-bottom" x="11" y="13" width="1" height="1" style="fill:#ffffff"/>
-    </g>
-</svg>
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
-    <defs>
-        <linearGradient id="grad" gradientUnits="userSpaceOnUse" x1="8" y1="0" x2="8" y2="16">
-            <stop offset="0" style="stop-color:#26B6DB"/>
-            <stop offset="1" style="stop-color:#0882C8"/>
-        </linearGradient>
-        <mask id="bitemask" maskUnits="userSpaceOnUse">
-            <g>
-                <rect id="mask-bg" x="0" y="0" width="16" height="16" style="fill:#ffffff"/>
-                <circle id="mask-subtract" cx="11.5" cy="11.5" r="5.5" style="fill:#000000"/>
-            </g>
-        </mask>
-    </defs>
-    <g id="syncthing-logo" mask="url(#bitemask)">
-        <circle id="outer" cx="8" cy="8" r="8" style="fill:url(#grad)"/>
-        <circle id="inner" cx="8" cy="7.9727402" r="5.9557071" style="fill:none;stroke:#ffffff;stroke-width:0.81771719"/>
-        <line id="arm-l" x1="9.1993189" y1="8.776825" x2="2.262351" y2="9.4173737" style="stroke:#ffffff;stroke-width:0.81771719"/>
-        <line id="arm-tr" x1="9.1993189" y1="8.776825" x2="13.301533" y2="5.3696747" style="stroke:#ffffff;stroke-width:0.81771719"/>
-        <line id="arm-br" x1="9.1993189" y1="8.776825" x2="11.788756" y2="12.51107" style="stroke:#ffffff;stroke-width:0.81771719"/>
-        <circle id="node-c" cx="9.1993189" cy="8.776825" r="1.22" style="fill:#ffffff"/>
-        <circle id="node-l" cx="2.262351" cy="9.4173737" r="1.22" style="fill:#ffffff"/>
-        <circle id="node-tr" cx="13.301533" cy="5.3696747" r="1.22" style="fill:#ffffff"/>
-        <circle id="node-br" cx="11.788756" cy="12.51107" r="1.22" style="fill:#ffffff"/>
-    </g>
-    <circle id="bubble" cx="11.5" cy="11.5" r="4.5" style="fill:#000000"/>
-    <g id="pause">
-        <rect id="pause-leftbar" x="10" y="9" width="1" height="5" style="fill:#ffffff"/>
-        <rect id="pause-rightbar" x="12" y="9" width="1" height="5" style="fill:#ffffff"/>
-    </g>
-</svg>
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
-    <defs>
-        <linearGradient id="grad" gradientUnits="userSpaceOnUse" x1="8" y1="0" x2="8" y2="16">
-            <stop offset="0" style="stop-color:#26B6DB"/>
-            <stop offset="1" style="stop-color:#0882C8"/>
-        </linearGradient>
-        <mask id="bitemask" maskUnits="userSpaceOnUse">
-            <g>
-                <rect id="mask-bg" x="0" y="0" width="16" height="16" style="fill:#ffffff"/>
-                <circle id="mask-subtract" cx="11.5" cy="11.5" r="5.5" style="fill:#000000"/>
-            </g>
-        </mask>
-    </defs>
-    <g id="syncthing-logo" mask="url(#bitemask)">
-        <circle id="outer" cx="8" cy="8" r="8" style="fill:url(#grad)"/>
-        <circle id="inner" cx="8" cy="7.9727402" r="5.9557071" style="fill:none;stroke:#ffffff;stroke-width:0.81771719"/>
-        <line id="arm-l" x1="9.1993189" y1="8.776825" x2="2.262351" y2="9.4173737" style="stroke:#ffffff;stroke-width:0.81771719"/>
-        <line id="arm-tr" x1="9.1993189" y1="8.776825" x2="13.301533" y2="5.3696747" style="stroke:#ffffff;stroke-width:0.81771719"/>
-        <line id="arm-br" x1="9.1993189" y1="8.776825" x2="11.788756" y2="12.51107" style="stroke:#ffffff;stroke-width:0.81771719"/>
-        <circle id="node-c" cx="9.1993189" cy="8.776825" r="1.22" style="fill:#ffffff"/>
-        <circle id="node-l" cx="2.262351" cy="9.4173737" r="1.22" style="fill:#ffffff"/>
-        <circle id="node-tr" cx="13.301533" cy="5.3696747" r="1.22" style="fill:#ffffff"/>
-        <circle id="node-br" cx="11.788756" cy="12.51107" r="1.22" style="fill:#ffffff"/>
-    </g>
-    <circle id="bubble" cx="11.5" cy="11.5" r="4.5" style="fill:#000000"/>
-    <g id="arrows" transform="rotate(0 11.5 11.5)">
-        <path id="arrow-left" d="m 11.5,14 0,-1 c -1.5,0 -1.5,0 -1.5,-2 l 1,0 -1.5,-2 -1.5,2 1,0 c 0,3 0,3 2.5,3 z" style="fill:#ffffff" />
-        <path id="arrow-right" d="m 11.5,9 0,1 c 1.5,0 1.5,0 1.5,2 l -1,0 1.5,2 1.5,-2 -1,0 C 14,9 14,9 11.5,9 Z" style="fill:#ffffff" />
-    </g>
-</svg>
@@ -39,7 +39,6 @@ var (
 	version   string
 	goVersion float64
 	race      bool
-	debug     = os.Getenv("BUILDDEBUG") != ""
 )

 type target struct {
@@ -48,7 +47,6 @@ type target struct {
 	binaryName   string
 	archiveFiles []archiveFile
 	debianFiles  []archiveFile
-	tags         []string
 }

 type archiveFile struct {
@@ -62,7 +60,6 @@ var targets = map[string]target{
 		// Only valid for the "build" and "install" commands as it lacks all
 		// the archive creation stuff.
 		buildPkg: "./cmd/...",
-		tags:     []string{"purego"},
 	},
 	"syncthing": {
 		// The default target for "build", "install", "tar", "zip", "deb", etc.
@@ -96,60 +93,6 @@ var targets = map[string]target{
 			{src: "etc/linux-systemd/user/syncthing.service", dst: "deb/usr/lib/systemd/user/syncthing.service", perm: 0644},
 		},
 	},
-	"stdiscosrv": {
-		name:       "stdiscosrv",
-		buildPkg:   "./cmd/stdiscosrv",
-		binaryName: "stdiscosrv", // .exe will be added automatically for Windows builds
-		archiveFiles: []archiveFile{
-			{src: "{{binary}}", dst: "{{binary}}", perm: 0755},
-			{src: "cmd/stdiscosrv/README.md", dst: "README.txt", perm: 0644},
-			{src: "cmd/stdiscosrv/LICENSE", dst: "LICENSE.txt", perm: 0644},
-			{src: "AUTHORS", dst: "AUTHORS.txt", perm: 0644},
-		},
-		debianFiles: []archiveFile{
-			{src: "{{binary}}", dst: "deb/usr/bin/{{binary}}", perm: 0755},
-			{src: "cmd/stdiscosrv/README.md", dst: "deb/usr/share/doc/stdiscosrv/README.txt", perm: 0644},
-			{src: "cmd/stdiscosrv/LICENSE", dst: "deb/usr/share/doc/stdiscosrv/LICENSE.txt", perm: 0644},
-			{src: "AUTHORS", dst: "deb/usr/share/doc/stdiscosrv/AUTHORS.txt", perm: 0644},
-			{src: "man/stdiscosrv.1", dst: "deb/usr/share/man/man1/stdiscosrv.1", perm: 0644},
-		},
-		tags: []string{"purego"},
-	},
-	"strelaysrv": {
-		name:       "strelaysrv",
-		buildPkg:   "./cmd/strelaysrv",
-		binaryName: "strelaysrv", // .exe will be added automatically for Windows builds
-		archiveFiles: []archiveFile{
-			{src: "{{binary}}", dst: "{{binary}}", perm: 0755},
-			{src: "cmd/strelaysrv/README.md", dst: "README.txt", perm: 0644},
-			{src: "cmd/strelaysrv/LICENSE", dst: "LICENSE.txt", perm: 0644},
-			{src: "AUTHORS", dst: "AUTHORS.txt", perm: 0644},
-		},
-		debianFiles: []archiveFile{
-			{src: "{{binary}}", dst: "deb/usr/bin/{{binary}}", perm: 0755},
-			{src: "cmd/strelaysrv/README.md", dst: "deb/usr/share/doc/strelaysrv/README.txt", perm: 0644},
-			{src: "cmd/strelaysrv/LICENSE", dst: "deb/usr/share/doc/strelaysrv/LICENSE.txt", perm: 0644},
-			{src: "AUTHORS", dst: "deb/usr/share/doc/strelaysrv/AUTHORS.txt", perm: 0644},
-			{src: "man/strelaysrv.1", dst: "deb/usr/share/man/man1/strelaysrv.1", perm: 0644},
-		},
-	},
-	"strelaypoolsrv": {
-		name:       "strelaypoolsrv",
-		buildPkg:   "./cmd/strelaypoolsrv",
-		binaryName: "strelaypoolsrv", // .exe will be added automatically for Windows builds
-		archiveFiles: []archiveFile{
-			{src: "{{binary}}", dst: "{{binary}}", perm: 0755},
-			{src: "cmd/strelaypoolsrv/README.md", dst: "README.txt", perm: 0644},
-			{src: "cmd/strelaypoolsrv/LICENSE", dst: "LICENSE.txt", perm: 0644},
-			{src: "AUTHORS", dst: "AUTHORS.txt", perm: 0644},
-		},
-		debianFiles: []archiveFile{
-			{src: "{{binary}}", dst: "deb/usr/bin/{{binary}}", perm: 0755},
-			{src: "cmd/strelaypoolsrv/README.md", dst: "deb/usr/share/doc/relaysrv/README.txt", perm: 0644},
-			{src: "cmd/strelaypoolsrv/LICENSE", dst: "deb/usr/share/doc/relaysrv/LICENSE.txt", perm: 0644},
-			{src: "AUTHORS", dst: "deb/usr/share/doc/relaysrv/AUTHORS.txt", perm: 0644},
-		},
-	},
 }

 func init() {
@@ -168,21 +111,22 @@ func init() {
 	targets["syncthing"] = syncthingPkg
 }

-const minGoVersion = 1.5
+const minGoVersion = 1.3

 func main() {
 	log.SetOutput(os.Stdout)
 	log.SetFlags(0)

-	if debug {
-		t0 := time.Now()
-		defer func() {
-			log.Println("... build completed in", time.Since(t0))
-		}()
-	}
-
+	// If GOPATH isn't set, set it correctly with the assumption that we are
+	// in $GOPATH/src/github.com/syncthing/syncthing.
 	if os.Getenv("GOPATH") == "" {
-		setGoPath()
+		cwd, err := os.Getwd()
+		if err != nil {
+			log.Fatal(err)
+		}
+		gopath := filepath.Clean(filepath.Join(cwd, "../../../../"))
+		log.Println("GOPATH is", gopath)
+		os.Setenv("GOPATH", gopath)
 	}

 	// We use Go 1.5+ vendoring.
@@ -192,44 +136,51 @@ func main() {
 	// might have installed during "build.go setup".
 	os.Setenv("PATH", fmt.Sprintf("%s%cbin%c%s", os.Getenv("GOPATH"), os.PathSeparator, os.PathListSeparator, os.Getenv("PATH")))

-	parseFlags()
+	flag.StringVar(&goarch, "goarch", runtime.GOARCH, "GOARCH")
+	flag.StringVar(&goos, "goos", runtime.GOOS, "GOOS")
+	flag.BoolVar(&noupgrade, "no-upgrade", noupgrade, "Disable upgrade functionality")
+	flag.StringVar(&version, "version", getVersion(), "Set compiled in version string")
+	flag.BoolVar(&race, "race", race, "Use race detector")
+	flag.Parse()

-	checkArchitecture()
-	goVersion, _ = checkRequiredGoVersion()
-
-	// Invoking build.go with no parameters at all builds everything (incrementally),
-	// which is what you want for maximum error checking during development.
-	if flag.NArg() == 0 {
-		runCommand("install", targets["all"])
-		runCommand("vet", target{})
-		runCommand("lint", target{})
-	} else {
-		// with any command given but not a target, the target is
-		// "syncthing". So "go run build.go install" is "go run build.go install
-		// syncthing" etc.
-		targetName := "syncthing"
-		if flag.NArg() > 1 {
-			targetName = flag.Arg(1)
-		}
-		target, ok := targets[targetName]
-		if !ok {
-			log.Fatalln("Unknown target", target)
-		}
-
-		runCommand(flag.Arg(0), target)
-	}
-}
-
-func checkArchitecture() {
 	switch goarch {
 	case "386", "amd64", "arm", "arm64", "ppc64", "ppc64le":
 		break
 	default:
 		log.Printf("Unknown goarch %q; proceed with caution!", goarch)
 	}
-}

-func runCommand(cmd string, target target) {
+	goVersion, _ = checkRequiredGoVersion()
+
+	// Invoking build.go with no parameters at all is equivalent to "go run
+	// build.go install all" as that builds everything (incrementally),
+	// which is what you want for maximum error checking during development.
+	if flag.NArg() == 0 {
+		var tags []string
+		if noupgrade {
+			tags = []string{"noupgrade"}
+		}
+		install(targets["all"], tags)
+
+		vet("cmd", "lib")
+		lint("./cmd/...")
+		lint("./lib/...")
+		return
+	}
+
+	// Otherwise, with any command given but not a target, the target is
+	// "syncthing". So "go run build.go install" is "go run build.go install
+	// syncthing" etc.
+	targetName := "syncthing"
+	if flag.NArg() > 1 {
+		targetName = flag.Arg(1)
+	}
+	target, ok := targets[targetName]
+	if !ok {
+		log.Fatalln("Unknown target", target)
+	}
+
+	cmd := flag.Arg(0)
 	switch cmd {
 	case "setup":
 		setup()
@@ -257,8 +208,8 @@ func runCommand(cmd string, target target) {
 	case "assets":
 		rebuildAssets()

-	case "proto":
-		proto()
+	case "xdr":
+		xdr()

 	case "translate":
 		translate()
@@ -279,51 +230,17 @@ func runCommand(cmd string, target target) {
 		clean()

 	case "vet":
-		vet("build.go")
 		vet("cmd", "lib")

 	case "lint":
-		lint(".")
 		lint("./cmd/...")
 		lint("./lib/...")

-	case "metalint":
-		if isGometalinterInstalled() {
-			dirs := []string{".", "./cmd/...", "./lib/..."}
-			ok := gometalinter("deadcode", dirs, "test/util.go")
-			ok = gometalinter("structcheck", dirs) && ok
-			ok = gometalinter("varcheck", dirs) && ok
-			if !ok {
-				os.Exit(1)
-			}
-		}
-
 	default:
 		log.Fatalf("Unknown command %q", cmd)
 	}
 }

-// setGoPath sets GOPATH correctly with the assumption that we are
-// in $GOPATH/src/github.com/syncthing/syncthing.
-func setGoPath() {
-	cwd, err := os.Getwd()
-	if err != nil {
-		log.Fatal(err)
-	}
-	gopath := filepath.Clean(filepath.Join(cwd, "../../../../"))
-	log.Println("GOPATH is", gopath)
-	os.Setenv("GOPATH", gopath)
-}
-
-func parseFlags() {
-	flag.StringVar(&goarch, "goarch", runtime.GOARCH, "GOARCH")
-	flag.StringVar(&goos, "goos", runtime.GOOS, "GOOS")
-	flag.BoolVar(&noupgrade, "no-upgrade", noupgrade, "Disable upgrade functionality")
-	flag.StringVar(&version, "version", getVersion(), "Set compiled in version string")
-	flag.BoolVar(&race, "race", race, "Use race detector")
-	flag.Parse()
-}
-
 func checkRequiredGoVersion() (float64, bool) {
 	re := regexp.MustCompile(`go(\d+\.\d+)`)
 	ver := runtime.Version()
@@ -348,15 +265,12 @@ func checkRequiredGoVersion() (float64, bool) {
 }

 func setup() {
-	runPrint("go", "get", "-v", "github.com/golang/lint/golint")
 	runPrint("go", "get", "-v", "golang.org/x/tools/cmd/cover")
 	runPrint("go", "get", "-v", "golang.org/x/net/html")
 	runPrint("go", "get", "-v", "github.com/FiloSottile/gvt")
 	runPrint("go", "get", "-v", "github.com/axw/gocov/gocov")
 	runPrint("go", "get", "-v", "github.com/AlekSi/gocov-xml")
 	runPrint("go", "get", "-v", "bitbucket.org/tebeka/go2xunit")
-	runPrint("go", "get", "-v", "github.com/alecthomas/gometalinter")
-	runPrint("go", "get", "-v", "github.com/mitchellh/go-wordwrap")
 }

 func test(pkgs ...string) {
@@ -370,9 +284,9 @@ func test(pkgs ...string) {
 	}

 	if useRace {
-		runPrint("go", append([]string{"test", "-short", "-race", "-timeout", "60s", "-tags", "purego"}, pkgs...)...)
+		runPrint("go", append([]string{"test", "-short", "-race", "-timeout", "60s"}, pkgs...)...)
 	} else {
-		runPrint("go", append([]string{"test", "-short", "-timeout", "60s", "-tags", "purego"}, pkgs...)...)
+		runPrint("go", append([]string{"test", "-short", "-timeout", "60s"}, pkgs...)...)
 	}
 }

@@ -384,8 +298,6 @@ func bench(pkgs ...string) {
 func install(target target, tags []string) {
 	lazyRebuildAssets()

-	tags = append(target.tags, tags...)
-
 	cwd, err := os.Getwd()
 	if err != nil {
 		log.Fatal(err)
@@ -393,7 +305,7 @@ func install(target target, tags []string) {
 	os.Setenv("GOBIN", filepath.Join(cwd, "bin"))
 	args := []string{"install", "-v", "-ldflags", ldflags()}
 	if len(tags) > 0 {
-		args = append(args, "-tags", strings.Join(tags, " "))
+		args = append(args, "-tags", strings.Join(tags, ","))
 	}
 	if race {
 		args = append(args, "-race")
@@ -408,12 +320,10 @@ func install(target target, tags []string) {
 func build(target target, tags []string) {
 	lazyRebuildAssets()

-	tags = append(target.tags, tags...)
-
 	rmr(target.binaryName)
 	args := []string{"build", "-i", "-v", "-ldflags", ldflags()}
 	if len(tags) > 0 {
-		args = append(args, "-tags", strings.Join(tags, " "))
+		args = append(args, "-tags", strings.Join(tags, ","))
 	}
 	if race {
 		args = append(args, "-race")
@@ -511,7 +421,7 @@ func buildDeb(target target) {
 		"date":    time.Now().Format(time.RFC1123),
 	}

-	debTemplateFiles := append(listFiles("debtpl/common"), listFiles("debtpl/"+target.name)...)
+	debTemplateFiles := append(listFiles("debian/common"), listFiles("debian/"+target.name)...)
 	for _, file := range debTemplateFiles {
 		tpl, err := template.New(filepath.Base(file)).ParseFiles(file)
 		if err != nil {
@@ -566,17 +476,16 @@ func listFiles(dir string) []string {

 func rebuildAssets() {
 	runPipe("lib/auto/gui.files.go", "go", "run", "script/genassets.go", "gui")
-	runPipe("cmd/strelaypoolsrv/auto/gui.go", "go", "run", "script/genassets.go", "cmd/strelaypoolsrv/gui")
 }

 func lazyRebuildAssets() {
-	if shouldRebuildAssets("lib/auto/gui.files.go", "gui") || shouldRebuildAssets("cmd/strelaypoolsrv/auto/gui.go", "cmd/strelaypoolsrv/auto/gui") {
+	if shouldRebuildAssets() {
 		rebuildAssets()
 	}
 }

-func shouldRebuildAssets(target, srcdir string) bool {
-	info, err := os.Stat(target)
+func shouldRebuildAssets() bool {
+	info, err := os.Stat("lib/auto/gui.files.go")
 	if err != nil {
 		// If the file doesn't exist, we must rebuild it
 		return true
@@ -586,7 +495,7 @@ func shouldRebuildAssets(target, srcdir string) bool {
 	// so we should rebuild it.
 	currentBuild := info.ModTime()
 	assetsAreNewer := false
-	filepath.Walk(srcdir, func(path string, info os.FileInfo, err error) error {
+	filepath.Walk("gui", func(path string, info os.FileInfo, err error) error {
 		if err != nil {
 			return err
 		}
@@ -600,8 +509,8 @@ func shouldRebuildAssets(target, srcdir string) bool {
 	return assetsAreNewer
 }

-func proto() {
-	runPrint("go", "generate", "./lib/...")
+func xdr() {
+	runPrint("go", "generate", "./lib/discover", "./lib/db", "./lib/protocol", "./lib/relay/protocol")
 }

 func translate() {
@@ -741,27 +650,15 @@ func getBranchSuffix() string {
 }

 func buildStamp() int64 {
-	// If SOURCE_DATE_EPOCH is set, use that.
-	if s, _ := strconv.ParseInt(os.Getenv("SOURCE_DATE_EPOCH"), 10, 64); s > 0 {
-		return s
-	}
-
-	// Try to get the timestamp of the latest commit.
 	bs, err := runError("git", "show", "-s", "--format=%ct")
 	if err != nil {
-		// Fall back to "now".
 		return time.Now().Unix()
 	}
-
 	s, _ := strconv.ParseInt(string(bs), 10, 64)
 	return s
 }

 func buildUser() string {
-	if v := os.Getenv("BUILD_USER"); v != "" {
-		return v
-	}
-
 	u, err := user.Current()
 	if err != nil {
 		return "unknown-user"
@@ -770,10 +667,6 @@ func buildUser() string {
 }

 func buildHost() string {
-	if v := os.Getenv("BUILD_HOST"); v != "" {
-		return v
-	}
-
 	h, err := os.Hostname()
 	if err != nil {
 		return "unknown-host"
@@ -794,26 +687,13 @@ func archiveName(target target) string {
 }

 func runError(cmd string, args ...string) ([]byte, error) {
-	if debug {
-		t0 := time.Now()
-		log.Println("runError:", cmd, strings.Join(args, " "))
-		defer func() {
-			log.Println("... in", time.Since(t0))
-		}()
-	}
 	ecmd := exec.Command(cmd, args...)
 	bs, err := ecmd.CombinedOutput()
 	return bytes.TrimSpace(bs), err
 }

 func runPrint(cmd string, args ...string) {
-	if debug {
-		t0 := time.Now()
-		log.Println("runPrint:", cmd, strings.Join(args, " "))
-		defer func() {
-			log.Println("... in", time.Since(t0))
-		}()
-	}
+	log.Println(cmd, strings.Join(args, " "))
 	ecmd := exec.Command(cmd, args...)
 	ecmd.Stdout = os.Stdout
 	ecmd.Stderr = os.Stderr
@@ -824,13 +704,7 @@ func runPrint(cmd string, args ...string) {
 }

 func runPipe(file, cmd string, args ...string) {
-	if debug {
-		t0 := time.Now()
-		log.Println("runPipe:", cmd, strings.Join(args, " "))
-		defer func() {
-			log.Println("... in", time.Since(t0))
-		}()
-	}
+	log.Println(cmd, strings.Join(args, " "), ">", file)
 	fd, err := os.Create(file)
 	if err != nil {
 		log.Fatal(err)
@@ -919,7 +793,7 @@ func zipFile(out string, files []archiveFile) {
 		if err != nil {
 			log.Fatal(err)
 		}
-		fh.Name = filepath.ToSlash(f.dst)
+		fh.Name = f.dst
 		fh.Method = zip.Deflate

 		if strings.HasSuffix(f.dst, ".txt") {
@@ -978,6 +852,7 @@ func vet(dirs ...string) {
 		// A genuine error exit from the vet tool.
 		log.Fatal(err)
 	}
+
 }

 func lint(pkg string) {
@@ -988,17 +863,13 @@ func lint(pkg string) {
 	}

 	analCommentPolicy := regexp.MustCompile(`exported (function|method|const|type|var) [^\s]+ should have comment`)
-	for _, line := range strings.Split(string(bs), "\n") {
-		if line == "" {
+	for _, line := range bytes.Split(bs, []byte("\n")) {
+		if analCommentPolicy.Match(line) {
 			continue
 		}
-		if analCommentPolicy.MatchString(line) {
-			continue
+		if len(line) > 0 {
+			log.Printf("%s", line)
 		}
-		if strings.Contains(line, ".pb.go:") {
-			continue
-		}
-		log.Println(line)
 	}
 }

@@ -1030,41 +901,3 @@ func exitStatus(err error) int {

 	return -1
 }
-
-func isGometalinterInstalled() bool {
-	if _, err := runError("gometalinter", "--disable-all"); err != nil {
-		log.Println("gometalinter is not installed")
-		return false
-	}
-	return true
-}
-
-func gometalinter(linter string, dirs []string, excludes ...string) bool {
-	params := []string{"--disable-all"}
-	params = append(params, fmt.Sprintf("--deadline=%ds", 60))
-	params = append(params, "--enable="+linter)
-
-	for _, exclude := range excludes {
-		params = append(params, "--exclude="+exclude)
-	}
-
-	for _, dir := range dirs {
-		params = append(params, dir)
-	}
-
-	bs, _ := runError("gometalinter", params...)
-
-	nerr := 0
-	for _, line := range strings.Split(string(bs), "\n") {
-		if line == "" {
-			continue
-		}
-		if strings.Contains(line, ".pb.go:") {
-			continue
-		}
-		log.Println(line)
-		nerr++
-	}
-
-	return nerr == 0
-}
@@ -104,7 +104,7 @@ case "${1:-default}" in
 		# For every package in the repo
 		for dir in $(go list ./lib/... ./cmd/...) ; do
 			# run the tests
-			GOPATH="$(pwd)/Godeps/_workspace:$GOPATH" go test -coverprofile=profile.out $dir
+			GOPATH="$(pwd)/Godeps/_workspace:$GOPATH" go test -race -coverprofile=profile.out $dir
 			if [ -f profile.out ] ; then
 				# and if there was test output, append it to coverage.out
 				grep -v "mode: " profile.out >> coverage.out
@@ -112,11 +112,6 @@ case "${1:-default}" in
 			fi
 		done

-		notCovered=$(egrep -c '\s0$' coverage.out)
-		total=$(wc -l coverage.out | awk '{print $1}')
-		coverPct=$(awk "BEGIN{print (1 - $notCovered / $total) * 100}")
-		echo "Total coverage is $coverPct%"
-
 		gocov convert coverage.out | gocov-xml > coverage.xml

 		# This is usually run from within Jenkins. If it is, we need to
@@ -136,6 +131,55 @@ case "${1:-default}" in
 		go2xunit -output tests.xml -fail < tests.out
 		;;

+	docker-all)
+		img=${DOCKERIMG:-syncthing/build:latest}
+		docker run --rm -h syncthing-builder -u $(id -u) -t \
+			-v $(pwd):/go/src/github.com/syncthing/syncthing \
+			-w /go/src/github.com/syncthing/syncthing \
+			-e "STTRACE=$STTRACE" \
+			"$img" \
+			sh -c './build.sh clean \
+				&& ./build.sh test-cov \
+				&& ./build.sh bench \
+				&& ./build.sh all'
+		;;
+
+	docker-test)
+		img=${DOCKERIMG:-syncthing/build:latest}
+		docker run --rm -h syncthing-builder -u $(id -u) -t \
+			-v $(pwd):/go/src/github.com/syncthing/syncthing \
+			-w /go/src/github.com/syncthing/syncthing \
+			-e "STTRACE=$STTRACE" \
+			"$img" \
+			sh -euxc './build.sh clean \
+				&& go run build.go -race \
+				&& export GOPATH=$(pwd)/Godeps/_workspace:$GOPATH \
+				&& cd test \
+				&& go test -tags integration -v -timeout 90m -short \
+				&& git clean -fxd .'
+		;;
+
+	docker-lint)
+		img=${DOCKERIMG:-syncthing/build:latest}
+		docker run --rm -h syncthing-builder -u $(id -u) -t \
+			-v $(pwd):/go/src/github.com/syncthing/syncthing \
+			-w /go/src/github.com/syncthing/syncthing \
+			-e "STTRACE=$STTRACE" \
+			"$img" \
+			sh -euxc 'go run build.go lint'
+		;;
+
+
+	docker-vet)
+		img=${DOCKERIMG:-syncthing/build:latest}
+		docker run --rm -h syncthing-builder -u $(id -u) -t \
+			-v $(pwd):/go/src/github.com/syncthing/syncthing \
+			-w /go/src/github.com/syncthing/syncthing \
+			-e "STTRACE=$STTRACE" \
+			"$img" \
+			sh -euxc 'go run build.go vet'
+		;;
+
 	*)
 		echo "Unknown build command $1"
 		;;
@@ -9,7 +9,6 @@ package main
 import (
 	"bytes"
 	"crypto/rand"
-	"encoding/binary"
 	"flag"
 	"log"
 	"strings"
@@ -67,25 +66,24 @@ func recv(bc beacon.Interface) {
 	seen := make(map[string]bool)
 	for {
 		data, src := bc.Recv()
-		if m := binary.BigEndian.Uint32(data); m != discover.Magic {
-			log.Printf("Incorrect magic %x in announcement from %v", m, src)
-			continue
-		}
-
 		var ann discover.Announce
-		ann.Unmarshal(data[4:])
+		ann.UnmarshalXDR(data)

-		if bytes.Equal(ann.ID, myID) {
+		if bytes.Equal(ann.This.ID, myID) {
 			// This is one of our own fake packets, don't print it.
 			continue
 		}

 		// Print announcement details for the first packet from a given
 		// device ID and source address, or if -all was given.
-		key := string(ann.ID) + src.String()
+		key := string(ann.This.ID) + src.String()
 		if all || !seen[key] {
 			log.Printf("Announcement from %v\n", src)
-			log.Printf(" %v at %s\n", protocol.DeviceIDFromBytes(ann.ID), strings.Join(ann.Addresses, ", "))
+			log.Printf(" %v at %s\n", protocol.DeviceIDFromBytes(ann.This.ID), strings.Join(addrStrs(ann.This), ", "))
+
+			for _, dev := range ann.Extra {
+				log.Printf(" %v at %s\n", protocol.DeviceIDFromBytes(dev.ID), strings.Join(addrStrs(dev), ", "))
+			}
 			seen[key] = true
 		}
 	}
@@ -94,10 +92,15 @@ func recv(bc beacon.Interface) {
 // sends fake discovery announcements once every second
 func send(bc beacon.Interface) {
 	ann := discover.Announce{
-		ID:        myID,
-		Addresses: []string{"tcp://fake.example.com:12345"},
+		Magic: discover.AnnouncementMagic,
+		This: discover.Device{
+			ID: myID,
+			Addresses: []discover.Address{
+				{URL: "tcp://fake.example.com:12345"},
+			},
+		},
 	}
-	bs, _ := ann.Marshal()
+	bs, _ := ann.MarshalXDR()

 	for {
 		bc.Send(bs)
@@ -105,6 +108,15 @@ func send(bc beacon.Interface) {
 	}
 }

+// returns the list of address URLs
+func addrStrs(dev discover.Device) []string {
+	ss := make([]string, len(dev.Addresses))
+	for i, addr := range dev.Addresses {
+		ss[i] = addr.URL
+	}
+	return ss
+}
+
 // returns a random but recognizable device ID
 func randomDeviceID() []byte {
 	var id [32]byte
@@ -1,19 +0,0 @@
-Copyright (C) 2014-2015 The Discosrv Authors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
@@ -1,40 +0,0 @@
-stdiscosrv
-==========
-
-[![Latest Build](http://img.shields.io/jenkins/s/http/build.syncthing.net/stdiscosrv.svg?style=flat-square)](http://build.syncthing.net/job/stdiscosrv/lastBuild/)
-
-This is the global discovery server for the `syncthing` project.
-
-To get it, run `go get github.com/syncthing/stdiscosrv` or download the
-[latest build](http://build.syncthing.net/job/stdiscosrv/lastSuccessfulBuild/artifact/)
-from the build server.
-
-Usage
-----
-
-The discovery server supports `ql` and `postgres` backends.
-Specify the backend via `-db-backend` and the database DSN via `-db-dsn`.
-
-By default it will use in-memory `ql` backend. If you wish to persist the
-information on disk between restarts in `ql`, specify a file DSN:
-
-```bash
-$ stdiscosrv -db-dsn="file:///var/run/stdiscosrv.db"
-```
-
-For `postgres`, you will need to create a database and a user with permissions
-to create tables in it, then start the stdiscosrv as follows:
-
-```bash
-$ export STDISCOSRV_DB_DSN="postgres://user:password@localhost/databasename"
-$ stdiscosrv -db-backend="postgres"
-```
-
-You can pass the DSN as command line option, but the value what you pass in will
-be visible in most process managers, potentially exposing the database password
-to other users.
-
-In all cases, the appropriate tables and indexes will be created at first
-startup. If it doesn't exit with an error, you're fine.
-
-See `stdiscosrv -help` for other options.
@@ -1,75 +0,0 @@
-// Copyright (C) 2014-2015 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-
-package main
-
-import (
-	"database/sql"
-	"log"
-	"time"
-)
-
-type cleansrv struct {
-	intv time.Duration
-	db   *sql.DB
-	prep map[string]*sql.Stmt
-}
-
-func (s *cleansrv) Serve() {
-	for {
-		time.Sleep(next(s.intv))
-
-		err := s.cleanOldEntries()
-		if err != nil {
-			log.Println("Clean:", err)
-		}
-	}
-}
-
-func (s *cleansrv) Stop() {
-	panic("stop unimplemented")
-}
-
-func (s *cleansrv) cleanOldEntries() (err error) {
-	var tx *sql.Tx
-	tx, err = s.db.Begin()
-	if err != nil {
-		return err
-	}
-
-	defer func() {
-		if err == nil {
-			err = tx.Commit()
-		} else {
-			tx.Rollback()
-		}
-	}()
-
-	res, err := tx.Stmt(s.prep["cleanAddress"]).Exec()
-	if err != nil {
-		return err
-	}
-	if rows, _ := res.RowsAffected(); rows > 0 {
-		log.Printf("Clean: %d old addresses", rows)
-	}
-
-	res, err = tx.Stmt(s.prep["cleanDevice"]).Exec()
-	if err != nil {
-		return err
-	}
-	if rows, _ := res.RowsAffected(); rows > 0 {
-		log.Printf("Clean: %d old devices", rows)
-	}
-
-	var devs, addrs int
-	row := tx.Stmt(s.prep["countDevice"]).QueryRow()
-	if err = row.Scan(&devs); err != nil {
-		return err
-	}
-	row = tx.Stmt(s.prep["countAddress"]).QueryRow()
-	if err = row.Scan(&addrs); err != nil {
-		return err
-	}
-
-	log.Printf("Database: %d devices, %d addresses", devs, addrs)
-	return nil
-}
@@ -1,32 +0,0 @@
-// Copyright (C) 2014-2015 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-
-package main
-
-import (
-	"database/sql"
-	"fmt"
-)
-
-type setupFunc func(db *sql.DB) error
-type compileFunc func(db *sql.DB) (map[string]*sql.Stmt, error)
-
-var (
-	setupFuncs   = make(map[string]setupFunc)
-	compileFuncs = make(map[string]compileFunc)
-)
-
-func register(name string, setup setupFunc, compile compileFunc) {
-	setupFuncs[name] = setup
-	compileFuncs[name] = compile
-}
-
-func setup(backend string, db *sql.DB) (map[string]*sql.Stmt, error) {
-	setup, ok := setupFuncs[backend]
-	if !ok {
-		return nil, fmt.Errorf("Unsupported backend")
-	}
-	if err := setup(db); err != nil {
-		return nil, err
-	}
-	return compileFuncs[backend](db)
-}
@@ -1,146 +0,0 @@
-// Copyright (C) 2014-2015 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-
-package main
-
-import (
-	"crypto/tls"
-	"database/sql"
-	"flag"
-	"fmt"
-	"log"
-	"os"
-	"runtime"
-	"strconv"
-	"time"
-
-	"github.com/syncthing/syncthing/lib/protocol"
-	"github.com/syncthing/syncthing/lib/tlsutil"
-	"github.com/thejerf/suture"
-)
-
-const (
-	minNegCache  = 60        // seconds
-	maxNegCache  = 3600      // seconds
-	maxDeviceAge = 7 * 86400 // one week, in seconds
-)
-
-var (
-	Version    string
-	BuildStamp string
-	BuildUser  string
-	BuildHost  string
-
-	BuildDate   time.Time
-	LongVersion string
-)
-
-func init() {
-	stamp, _ := strconv.Atoi(BuildStamp)
-	BuildDate = time.Unix(int64(stamp), 0)
-
-	date := BuildDate.UTC().Format("2006-01-02 15:04:05 MST")
-	LongVersion = fmt.Sprintf(`stdiscosrv %s (%s %s-%s) %s@%s %s`, Version, runtime.Version(), runtime.GOOS, runtime.GOARCH, BuildUser, BuildHost, date)
-}
-
-var (
-	lruSize     = 10240
-	limitAvg    = 5
-	limitBurst  = 20
-	globalStats stats
-	statsFile   string
-	backend     = "ql"
-	dsn         = getEnvDefault("STDISCOSRV_DB_DSN", "memory://stdiscosrv")
-	certFile    = "cert.pem"
-	keyFile     = "key.pem"
-	debug       = false
-	useHTTP     = false
-)
-
-func main() {
-	const (
-		cleanIntv = 1 * time.Hour
-		statsIntv = 5 * time.Minute
-	)
-
-	var listen string
-
-	log.SetOutput(os.Stdout)
-	log.SetFlags(0)
-
-	flag.StringVar(&listen, "listen", ":8443", "Listen address")
-	flag.IntVar(&lruSize, "limit-cache", lruSize, "Limiter cache entries")
-	flag.IntVar(&limitAvg, "limit-avg", limitAvg, "Allowed average package rate, per 10 s")
-	flag.IntVar(&limitBurst, "limit-burst", limitBurst, "Allowed burst size, packets")
-	flag.StringVar(&statsFile, "stats-file", statsFile, "File to write periodic operation stats to")
-	flag.StringVar(&backend, "db-backend", backend, "Database backend to use")
-	flag.StringVar(&dsn, "db-dsn", dsn, "Database DSN")
-	flag.StringVar(&certFile, "cert", certFile, "Certificate file")
-	flag.StringVar(&keyFile, "key", keyFile, "Key file")
-	flag.BoolVar(&debug, "debug", debug, "Debug")
-	flag.BoolVar(&useHTTP, "http", useHTTP, "Listen on HTTP (behind an HTTPS proxy)")
-	flag.Parse()
-
-	log.Println(LongVersion)
-
-	var cert tls.Certificate
-	var err error
-	if !useHTTP {
-		cert, err = tls.LoadX509KeyPair(certFile, keyFile)
-		if err != nil {
-			log.Println("Failed to load keypair. Generating one, this might take a while...")
-			cert, err = tlsutil.NewCertificate(certFile, keyFile, "stdiscosrv", 3072)
-			if err != nil {
-				log.Fatalln("Failed to generate X509 key pair:", err)
-			}
-		}
-
-		devID := protocol.NewDeviceID(cert.Certificate[0])
-		log.Println("Server device ID is", devID)
-	}
-
-	db, err := sql.Open(backend, dsn)
-	if err != nil {
-		log.Fatalln("sql.Open:", err)
-	}
-	prep, err := setup(backend, db)
-	if err != nil {
-		log.Fatalln("Setup:", err)
-	}
-
-	main := suture.NewSimple("main")
-
-	main.Add(&querysrv{
-		addr: listen,
-		cert: cert,
-		db:   db,
-		prep: prep,
-	})
-
-	main.Add(&cleansrv{
-		intv: cleanIntv,
-		db:   db,
-		prep: prep,
-	})
-
-	main.Add(&statssrv{
-		intv: statsIntv,
-		file: statsFile,
-		db:   db,
-	})
-
-	globalStats.Reset()
-	main.Serve()
-}
-
-func getEnvDefault(key, def string) string {
-	if val := os.Getenv(key); val != "" {
-		return val
-	}
-	return def
-}
-
-func next(intv time.Duration) time.Duration {
-	t0 := time.Now()
-	t1 := t0.Add(intv).Truncate(intv)
-	return t1.Sub(t0)
-}
@@ -1,98 +0,0 @@
-// Copyright (C) 2014-2015 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-
-package main
-
-import (
-	"database/sql"
-	"fmt"
-
-	_ "github.com/lib/pq"
-)
-
-func init() {
-	register("postgres", postgresSetup, postgresCompile)
-}
-
-func postgresSetup(db *sql.DB) error {
-	var err error
-
-	db.SetMaxIdleConns(4)
-	db.SetMaxOpenConns(8)
-
-	_, err = db.Exec(`CREATE TABLE IF NOT EXISTS Devices (
-		DeviceID CHAR(63) NOT NULL PRIMARY KEY,
-		Seen TIMESTAMP NOT NULL
-	)`)
-	if err != nil {
-		return err
-	}
-
-	var tmp string
-	row := db.QueryRow(`SELECT 'DevicesDeviceIDIndex'::regclass`)
-	if err = row.Scan(&tmp); err != nil {
-		_, err = db.Exec(`CREATE INDEX DevicesDeviceIDIndex ON Devices (DeviceID)`)
-	}
-	if err != nil {
-		return err
-	}
-
-	row = db.QueryRow(`SELECT 'DevicesSeenIndex'::regclass`)
-	if err = row.Scan(&tmp); err != nil {
-		_, err = db.Exec(`CREATE INDEX DevicesSeenIndex ON Devices (Seen)`)
-	}
-	if err != nil {
-		return err
-	}
-
-	_, err = db.Exec(`CREATE TABLE IF NOT EXISTS Addresses (
-		DeviceID CHAR(63) NOT NULL,
-		Seen TIMESTAMP NOT NULL,
-		Address VARCHAR(2048) NOT NULL
-	)`)
-	if err != nil {
-		return err
-	}
-
-	row = db.QueryRow(`SELECT 'AddressesDeviceIDSeenIndex'::regclass`)
-	if err = row.Scan(&tmp); err != nil {
-		_, err = db.Exec(`CREATE INDEX AddressesDeviceIDSeenIndex ON Addresses (DeviceID, Seen)`)
-	}
-	if err != nil {
-		return err
-	}
-
-	row = db.QueryRow(`SELECT 'AddressesDeviceIDAddressIndex'::regclass`)
-	if err = row.Scan(&tmp); err != nil {
-		_, err = db.Exec(`CREATE INDEX AddressesDeviceIDAddressIndex ON Addresses (DeviceID, Address)`)
-	}
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func postgresCompile(db *sql.DB) (map[string]*sql.Stmt, error) {
-	stmts := map[string]string{
-		"cleanAddress":  "DELETE FROM Addresses WHERE Seen < now() - '2 hour'::INTERVAL",
-		"cleanDevice":   fmt.Sprintf("DELETE FROM Devices WHERE Seen < now() - '%d hour'::INTERVAL", maxDeviceAge/3600),
-		"countAddress":  "SELECT count(*) FROM Addresses",
-		"countDevice":   "SELECT count(*) FROM Devices",
-		"insertAddress": "INSERT INTO Addresses (DeviceID, Seen, Address) VALUES ($1, now(), $2)",
-		"insertDevice":  "INSERT INTO Devices (DeviceID, Seen) VALUES ($1, now())",
-		"selectAddress": "SELECT Address FROM Addresses WHERE DeviceID=$1 AND Seen > now() - '1 hour'::INTERVAL ORDER BY random() LIMIT 16",
-		"selectDevice":  "SELECT Seen FROM Devices WHERE DeviceID=$1",
-		"updateAddress": "UPDATE Addresses SET Seen=now() WHERE DeviceID=$1 AND Address=$2",
-		"updateDevice":  "UPDATE Devices SET Seen=now() WHERE DeviceID=$1",
-	}
-
-	res := make(map[string]*sql.Stmt, len(stmts))
-	for key, stmt := range stmts {
-		prep, err := db.Prepare(stmt)
-		if err != nil {
-			return nil, err
-		}
-		res[key] = prep
-	}
-	return res, nil
-}
@@ -1,81 +0,0 @@
-// Copyright (C) 2015 Audrius Butkevicius and Contributors (see the CONTRIBUTORS file).
-
-package main
-
-import (
-	"database/sql"
-	"fmt"
-	"log"
-
-	"github.com/cznic/ql"
-)
-
-func init() {
-	ql.RegisterDriver()
-	register("ql", qlSetup, qlCompile)
-}
-
-func qlSetup(db *sql.DB) (err error) {
-	tx, err := db.Begin()
-	if err != nil {
-		return
-	}
-
-	defer func() {
-		if err == nil {
-			err = tx.Commit()
-		} else {
-			tx.Rollback()
-		}
-	}()
-
-	_, err = tx.Exec(`CREATE TABLE IF NOT EXISTS Devices (
-		DeviceID STRING NOT NULL,
-		Seen TIME NOT NULL
-	)`)
-	if err != nil {
-		return
-	}
-
-	if _, err = tx.Exec(`CREATE INDEX IF NOT EXISTS DevicesDeviceIDIndex ON Devices (DeviceID)`); err != nil {
-		return
-	}
-
-	_, err = tx.Exec(`CREATE TABLE IF NOT EXISTS Addresses (
-		DeviceID STRING NOT NULL,
-		Seen TIME NOT NULL,
-		Address STRING NOT NULL,
-	)`)
-	if err != nil {
-		return
-	}
-
-	_, err = tx.Exec(`CREATE INDEX IF NOT EXISTS AddressesDeviceIDAddressIndex ON Addresses (DeviceID, Address)`)
-	return
-}
-
-func qlCompile(db *sql.DB) (map[string]*sql.Stmt, error) {
-	stmts := map[string]string{
-		"cleanAddress":  `DELETE FROM Addresses WHERE Seen < now() - duration("2h")`,
-		"cleanDevice":   fmt.Sprintf(`DELETE FROM Devices WHERE Seen < now() - duration("%dh")`, maxDeviceAge/3600),
-		"countAddress":  "SELECT count(*) FROM Addresses",
-		"countDevice":   "SELECT count(*) FROM Devices",
-		"insertAddress": "INSERT INTO Addresses (DeviceID, Seen, Address) VALUES ($1, now(), $2)",
-		"insertDevice":  "INSERT INTO Devices (DeviceID, Seen) VALUES ($1, now())",
-		"selectAddress": `SELECT Address from Addresses WHERE DeviceID==$1 AND Seen > now() - duration("1h") LIMIT 16`,
-		"selectDevice":  "SELECT Seen FROM Devices WHERE DeviceID==$1",
-		"updateAddress": "UPDATE Addresses Seen=now() WHERE DeviceID==$1 AND Address==$2",
-		"updateDevice":  "UPDATE Devices Seen=now() WHERE DeviceID==$1",
-	}
-
-	res := make(map[string]*sql.Stmt, len(stmts))
-	for key, stmt := range stmts {
-		prep, err := db.Prepare(stmt)
-		if err != nil {
-			log.Println("Failed to compile", stmt)
-			return nil, err
-		}
-		res[key] = prep
-	}
-	return res, nil
-}
@@ -1,488 +0,0 @@
-// Copyright (C) 2014-2015 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-
-package main
-
-import (
-	"bytes"
-	"crypto/tls"
-	"database/sql"
-	"encoding/json"
-	"encoding/pem"
-	"fmt"
-	"log"
-	"math/rand"
-	"net"
-	"net/http"
-	"net/url"
-	"strconv"
-	"sync"
-	"time"
-
-	"github.com/golang/groupcache/lru"
-	"github.com/juju/ratelimit"
-	"github.com/syncthing/syncthing/lib/protocol"
-	"golang.org/x/net/context"
-)
-
-type querysrv struct {
-	addr     string
-	db       *sql.DB
-	prep     map[string]*sql.Stmt
-	limiter  *safeCache
-	cert     tls.Certificate
-	listener net.Listener
-}
-
-type announcement struct {
-	Seen      time.Time `json:"seen"`
-	Addresses []string  `json:"addresses"`
-}
-
-type safeCache struct {
-	*lru.Cache
-	mut sync.Mutex
-}
-
-func (s *safeCache) Get(key string) (val interface{}, ok bool) {
-	s.mut.Lock()
-	val, ok = s.Cache.Get(key)
-	s.mut.Unlock()
-	return
-}
-
-func (s *safeCache) Add(key string, val interface{}) {
-	s.mut.Lock()
-	s.Cache.Add(key, val)
-	s.mut.Unlock()
-}
-
-type requestID int64
-
-func (i requestID) String() string {
-	return fmt.Sprintf("%016x", int64(i))
-}
-
-func negCacheFor(lastSeen time.Time) int {
-	since := time.Since(lastSeen).Seconds()
-	if since >= maxDeviceAge {
-		return maxNegCache
-	}
-	if since < 0 {
-		// That's weird
-		return minNegCache
-	}
-
-	// Return a value linearly scaled from minNegCache (at zero seconds ago)
-	// to maxNegCache (at maxDeviceAge seconds ago).
-	r := since / maxDeviceAge
-	return int(minNegCache + r*(maxNegCache-minNegCache))
-}
-
-func (s *querysrv) Serve() {
-	s.limiter = &safeCache{
-		Cache: lru.New(lruSize),
-	}
-
-	if useHTTP {
-		listener, err := net.Listen("tcp", s.addr)
-		if err != nil {
-			log.Println("Listen:", err)
-			return
-		}
-		s.listener = listener
-	} else {
-		tlsCfg := &tls.Config{
-			Certificates:           []tls.Certificate{s.cert},
-			ClientAuth:             tls.RequestClientCert,
-			SessionTicketsDisabled: true,
-			MinVersion:             tls.VersionTLS12,
-			CipherSuites: []uint16{
-				tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
-				tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
-				tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
-				tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
-				tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
-				tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
-			},
-		}
-
-		tlsListener, err := tls.Listen("tcp", s.addr, tlsCfg)
-		if err != nil {
-			log.Println("Listen:", err)
-			return
-		}
-		s.listener = tlsListener
-	}
-
-	http.HandleFunc("/v2/", s.handler)
-	http.HandleFunc("/ping", handlePing)
-
-	srv := &http.Server{
-		ReadTimeout:    5 * time.Second,
-		WriteTimeout:   5 * time.Second,
-		MaxHeaderBytes: 1 << 10,
-	}
-
-	if err := srv.Serve(s.listener); err != nil {
-		log.Println("Serve:", err)
-	}
-}
-
-var topCtx = context.Background()
-
-func (s *querysrv) handler(w http.ResponseWriter, req *http.Request) {
-	reqID := requestID(rand.Int63())
-	ctx := context.WithValue(topCtx, "id", reqID)
-
-	if debug {
-		log.Println(reqID, req.Method, req.URL)
-	}
-
-	t0 := time.Now()
-	defer func() {
-		diff := time.Since(t0)
-		var comment string
-		if diff > time.Second {
-			comment = "(very slow request)"
-		} else if diff > 100*time.Millisecond {
-			comment = "(slow request)"
-		}
-		if comment != "" || debug {
-			log.Println(reqID, req.Method, req.URL, "completed in", diff, comment)
-		}
-	}()
-
-	var remoteIP net.IP
-	if useHTTP {
-		remoteIP = net.ParseIP(req.Header.Get("X-Forwarded-For"))
-	} else {
-		addr, err := net.ResolveTCPAddr("tcp", req.RemoteAddr)
-		if err != nil {
-			log.Println("remoteAddr:", err)
-			http.Error(w, "Internal Server Error", http.StatusInternalServerError)
-			return
-		}
-		remoteIP = addr.IP
-	}
-
-	if s.limit(remoteIP) {
-		if debug {
-			log.Println(remoteIP, "is limited")
-		}
-		w.Header().Set("Retry-After", "60")
-		http.Error(w, "Too Many Requests", 429)
-		return
-	}
-
-	switch req.Method {
-	case "GET":
-		s.handleGET(ctx, w, req)
-	case "POST":
-		s.handlePOST(ctx, remoteIP, w, req)
-	default:
-		globalStats.Error()
-		http.Error(w, "Method Not Allowed", http.StatusMethodNotAllowed)
-	}
-}
-
-func (s *querysrv) handleGET(ctx context.Context, w http.ResponseWriter, req *http.Request) {
-	reqID := ctx.Value("id").(requestID)
-
-	deviceID, err := protocol.DeviceIDFromString(req.URL.Query().Get("device"))
-	if err != nil {
-		if debug {
-			log.Println(reqID, "bad device param")
-		}
-		globalStats.Error()
-		http.Error(w, "Bad Request", http.StatusBadRequest)
-		return
-	}
-
-	var ann announcement
-
-	ann.Seen, err = s.getDeviceSeen(deviceID)
-	negCache := strconv.Itoa(negCacheFor(ann.Seen))
-	w.Header().Set("Retry-After", negCache)
-	w.Header().Set("Cache-Control", "public, max-age="+negCache)
-
-	if err != nil {
-		// The device is not in the database.
-		globalStats.Query()
-		http.Error(w, "Not Found", http.StatusNotFound)
-		return
-	}
-
-	t0 := time.Now()
-	ann.Addresses, err = s.getAddresses(ctx, deviceID)
-	if err != nil {
-		log.Println(reqID, "getAddresses:", err)
-		globalStats.Error()
-		http.Error(w, "Internal Server Error", http.StatusInternalServerError)
-		return
-	}
-	if debug {
-		log.Println(reqID, "getAddresses in", time.Since(t0))
-	}
-
-	globalStats.Query()
-
-	if len(ann.Addresses) == 0 {
-		http.Error(w, "Not Found", http.StatusNotFound)
-		return
-	}
-
-	globalStats.Answer()
-
-	w.Header().Set("Content-Type", "application/json")
-	json.NewEncoder(w).Encode(ann)
-}
-
-func (s *querysrv) handlePOST(ctx context.Context, remoteIP net.IP, w http.ResponseWriter, req *http.Request) {
-	reqID := ctx.Value("id").(requestID)
-
-	rawCert := certificateBytes(req)
-	if rawCert == nil {
-		if debug {
-			log.Println(reqID, "no certificates")
-		}
-		globalStats.Error()
-		http.Error(w, "Forbidden", http.StatusForbidden)
-		return
-	}
-
-	var ann announcement
-	if err := json.NewDecoder(req.Body).Decode(&ann); err != nil {
-		if debug {
-			log.Println(reqID, "decode:", err)
-		}
-		globalStats.Error()
-		http.Error(w, "Bad Request", http.StatusBadRequest)
-		return
-	}
-
-	deviceID := protocol.NewDeviceID(rawCert)
-
-	// handleAnnounce returns *two* errors. The first indicates a problem with
-	// something the client posted to us. We should return a 400 Bad Request
-	// and not worry about it. The second indicates that the request was fine,
-	// but something internal messed up. We should log it and respond with a
-	// more apologetic 500 Internal Server Error.
-	userErr, internalErr := s.handleAnnounce(ctx, remoteIP, deviceID, ann.Addresses)
-	if userErr != nil {
-		if debug {
-			log.Println(reqID, "handleAnnounce:", userErr)
-		}
-		globalStats.Error()
-		http.Error(w, "Bad Request", http.StatusBadRequest)
-		return
-	}
-	if internalErr != nil {
-		log.Println(reqID, "handleAnnounce:", internalErr)
-		globalStats.Error()
-		http.Error(w, "Internal Server Error", http.StatusInternalServerError)
-		return
-	}
-
-	globalStats.Announce()
-
-	// TODO: Slowly increase this for stable clients
-	w.Header().Set("Reannounce-After", "1800")
-
-	// We could return the lookup result here, but it's kind of unnecessarily
-	// expensive to go query the database again so we let the client decide to
-	// do a lookup if they really care.
-	w.WriteHeader(http.StatusNoContent)
-}
-
-func (s *querysrv) Stop() {
-	s.listener.Close()
-}
-
-func (s *querysrv) handleAnnounce(ctx context.Context, remote net.IP, deviceID protocol.DeviceID, addresses []string) (userErr, internalErr error) {
-	reqID := ctx.Value("id").(requestID)
-
-	tx, err := s.db.Begin()
-	if err != nil {
-		internalErr = err
-		return
-	}
-
-	defer func() {
-		// Since we return from a bunch of different places, we handle
-		// rollback in the defer.
-		if internalErr != nil || userErr != nil {
-			tx.Rollback()
-		}
-	}()
-
-	for _, annAddr := range addresses {
-		uri, err := url.Parse(annAddr)
-		if err != nil {
-			userErr = err
-			return
-		}
-
-		host, port, err := net.SplitHostPort(uri.Host)
-		if err != nil {
-			userErr = err
-			return
-		}
-
-		ip := net.ParseIP(host)
-		if host == "" || ip.IsUnspecified() {
-			// Do not use IPv6 remote address if requested scheme is tcp4
-			if uri.Scheme == "tcp4" && remote.To4() == nil {
-				continue
-			}
-
-			// Do not use IPv4 remote address if requested scheme is tcp6
-			if uri.Scheme == "tcp6" && remote.To4() != nil {
-				continue
-			}
-
-			host = remote.String()
-		}
-
-		uri.Host = net.JoinHostPort(host, port)
-
-		if err := s.updateAddress(ctx, tx, deviceID, uri.String()); err != nil {
-			internalErr = err
-			return
-		}
-	}
-
-	if err := s.updateDevice(ctx, tx, deviceID); err != nil {
-		internalErr = err
-		return
-	}
-
-	t0 := time.Now()
-	internalErr = tx.Commit()
-	if debug {
-		log.Println(reqID, "commit in", time.Since(t0))
-	}
-	return
-}
-
-func (s *querysrv) limit(remote net.IP) bool {
-	key := remote.String()
-
-	bkt, ok := s.limiter.Get(key)
-	if ok {
-		bkt := bkt.(*ratelimit.Bucket)
-		if bkt.TakeAvailable(1) != 1 {
-			// Rate limit exceeded; ignore packet
-			return true
-		}
-	} else {
-		// One packet per ten seconds average rate, burst ten packets
-		s.limiter.Add(key, ratelimit.NewBucket(10*time.Second/time.Duration(limitAvg), int64(limitBurst)))
-	}
-
-	return false
-}
-
-func (s *querysrv) updateDevice(ctx context.Context, tx *sql.Tx, device protocol.DeviceID) error {
-	reqID := ctx.Value("id").(requestID)
-	t0 := time.Now()
-	res, err := tx.Stmt(s.prep["updateDevice"]).Exec(device.String())
-	if err != nil {
-		return err
-	}
-	if debug {
-		log.Println(reqID, "updateDevice in", time.Since(t0))
-	}
-
-	if rows, _ := res.RowsAffected(); rows == 0 {
-		t0 = time.Now()
-		_, err := tx.Stmt(s.prep["insertDevice"]).Exec(device.String())
-		if err != nil {
-			return err
-		}
-		if debug {
-			log.Println(reqID, "insertDevice in", time.Since(t0))
-		}
-	}
-
-	return nil
-}
-
-func (s *querysrv) updateAddress(ctx context.Context, tx *sql.Tx, device protocol.DeviceID, uri string) error {
-	res, err := tx.Stmt(s.prep["updateAddress"]).Exec(device.String(), uri)
-	if err != nil {
-		return err
-	}
-
-	if rows, _ := res.RowsAffected(); rows == 0 {
-		_, err := tx.Stmt(s.prep["insertAddress"]).Exec(device.String(), uri)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (s *querysrv) getAddresses(ctx context.Context, device protocol.DeviceID) ([]string, error) {
-	rows, err := s.prep["selectAddress"].Query(device.String())
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-
-	var res []string
-	for rows.Next() {
-		var addr string
-
-		err := rows.Scan(&addr)
-		if err != nil {
-			log.Println("Scan:", err)
-			continue
-		}
-		res = append(res, addr)
-	}
-
-	return res, nil
-}
-
-func (s *querysrv) getDeviceSeen(device protocol.DeviceID) (time.Time, error) {
-	row := s.prep["selectDevice"].QueryRow(device.String())
-	var seen time.Time
-	if err := row.Scan(&seen); err != nil {
-		return time.Time{}, err
-	}
-	return seen.In(time.UTC), nil
-}
-
-func handlePing(w http.ResponseWriter, r *http.Request) {
-	w.WriteHeader(204)
-}
-
-func certificateBytes(req *http.Request) []byte {
-	if req.TLS != nil && len(req.TLS.PeerCertificates) > 0 {
-		return req.TLS.PeerCertificates[0].Raw
-	}
-
-	if hdr := req.Header.Get("X-SSL-Cert"); hdr != "" {
-		bs := []byte(hdr)
-		// The certificate is in PEM format but with spaces for newlines. We
-		// need to reinstate the newlines for the PEM decoder. But we need to
-		// leave the spaces in the BEGIN and END lines - the first and last
-		// space - alone.
-		firstSpace := bytes.Index(bs, []byte(" "))
-		lastSpace := bytes.LastIndex(bs, []byte(" "))
-		for i := firstSpace + 1; i < lastSpace; i++ {
-			if bs[i] == ' ' {
-				bs[i] = '\n'
-			}
-		}
-		block, _ := pem.Decode(bs)
-		if block == nil {
-			// Decoding failed
-			return nil
-		}
-		return block.Bytes
-	}
-
-	return nil
-}
@@ -1,141 +0,0 @@
-// Copyright (C) 2014-2015 Jakob Borg and Contributors (see the CONTRIBUTORS file).
-
-package main
-
-import (
-	"bytes"
-	"database/sql"
-	"fmt"
-	"io/ioutil"
-	"log"
-	"os"
-	"sync/atomic"
-	"time"
-)
-
-type stats struct {
-	// Incremented atomically
-	announces int64
-	queries   int64
-	answers   int64
-	errors    int64
-}
-
-func (s *stats) Announce() {
-	atomic.AddInt64(&s.announces, 1)
-}
-
-func (s *stats) Query() {
-	atomic.AddInt64(&s.queries, 1)
-}
-
-func (s *stats) Answer() {
-	atomic.AddInt64(&s.answers, 1)
-}
-
-func (s *stats) Error() {
-	atomic.AddInt64(&s.errors, 1)
-}
-
-// Reset returns a copy of the current stats and resets the counters to
-// zero.
-func (s *stats) Reset() stats {
-	// Create a copy of the stats using atomic reads
-	copy := stats{
-		announces: atomic.LoadInt64(&s.announces),
-		queries:   atomic.LoadInt64(&s.queries),
-		answers:   atomic.LoadInt64(&s.answers),
-		errors:    atomic.LoadInt64(&s.errors),
-	}
-
-	// Reset the stats by subtracting the values that we copied
-	atomic.AddInt64(&s.announces, -copy.announces)
-	atomic.AddInt64(&s.queries, -copy.queries)
-	atomic.AddInt64(&s.answers, -copy.answers)
-	atomic.AddInt64(&s.errors, -copy.errors)
-
-	return copy
-}
-
-type statssrv struct {
-	intv time.Duration
-	file string
-	db   *sql.DB
-}
-
-func (s *statssrv) Serve() {
-	lastReset := time.Now()
-	for {
-		time.Sleep(next(s.intv))
-
-		stats := globalStats.Reset()
-		d := time.Since(lastReset).Seconds()
-		lastReset = time.Now()
-
-		log.Printf("Stats: %.02f announces/s, %.02f queries/s, %.02f answers/s, %.02f errors/s",
-			float64(stats.announces)/d, float64(stats.queries)/d, float64(stats.answers)/d, float64(stats.errors)/d)
-
-		if s.file != "" {
-			s.writeToFile(stats, d)
-		}
-	}
-}
-
-func (s *statssrv) Stop() {
-	panic("stop unimplemented")
-}
-
-func (s *statssrv) writeToFile(stats stats, secs float64) {
-	newLine := []byte("\n")
-
-	var addrs int
-	row := s.db.QueryRow("SELECT COUNT(*) FROM Addresses")
-	if err := row.Scan(&addrs); err != nil {
-		log.Println("stats query:", err)
-		return
-	}
-
-	fd, err := os.OpenFile(s.file, os.O_RDWR|os.O_CREATE, 0666)
-	if err != nil {
-		log.Println("stats file:", err)
-		return
-	}
-	defer func() {
-		err = fd.Close()
-		if err != nil {
-			log.Println("stats file:", err)
-		}
-	}()
-
-	bs, err := ioutil.ReadAll(fd)
-	if err != nil {
-		log.Println("stats file:", err)
-		return
-	}
-	lines := bytes.Split(bytes.TrimSpace(bs), newLine)
-	if len(lines) > 12 {
-		lines = lines[len(lines)-12:]
-	}
-
-	latest := fmt.Sprintf("%v: %6d addresses, %8.02f announces/s, %8.02f queries/s, %8.02f answers/s, %8.02f errors/s\n",
-		time.Now().UTC().Format(time.RFC3339), addrs,
-		float64(stats.announces)/secs, float64(stats.queries)/secs, float64(stats.answers)/secs, float64(stats.errors)/secs)
-	lines = append(lines, []byte(latest))
-
-	_, err = fd.Seek(0, 0)
-	if err != nil {
-		log.Println("stats file:", err)
-		return
-	}
-	err = fd.Truncate(0)
-	if err != nil {
-		log.Println("stats file:", err)
-		return
-	}
-
-	_, err = fd.Write(bytes.Join(lines, newLine))
-	if err != nil {
-		log.Println("stats file:", err)
-		return
-	}
-}
@@ -40,8 +40,7 @@ func main() {
 	log.Println("Lstat:")
 	log.Printf("  Size: %d bytes", fi.Size())
 	log.Printf("  Mode: 0%o", fi.Mode())
-	log.Printf("  Time: %v", fi.ModTime())
-	log.Printf("        %d.%09d", fi.ModTime().Unix(), fi.ModTime().Nanosecond())
+	log.Printf("  Time: %v (%d)", fi.ModTime(), fi.ModTime().Unix())
 	log.Println()

 	if !fi.Mode().IsDir() && !fi.Mode().IsRegular() {
@@ -53,8 +52,7 @@ func main() {
 		log.Println("Stat:")
 		log.Printf("  Size: %d bytes", fi.Size())
 		log.Printf("  Mode: 0%o", fi.Mode())
-		log.Printf("  Time: %v", fi.ModTime())
-		log.Printf("        %d.%09d", fi.ModTime().Unix(), fi.ModTime().Nanosecond())
+		log.Printf("  Time: %v (%d)", fi.ModTime(), fi.ModTime().Unix())
 		log.Println()
 	}

@@ -66,7 +66,7 @@ func checkServers(deviceID protocol.DeviceID, servers ...string) {
 		}()
 	}

-	for range servers {
+	for _ = range servers {
 		res := <-resc

 		u, _ := url.Parse(res.server)
@@ -10,71 +10,51 @@ import (
 	"encoding/binary"
 	"fmt"
 	"log"
-	"time"

 	"github.com/syncthing/syncthing/lib/db"
 	"github.com/syncthing/syncthing/lib/protocol"
+	"github.com/syndtr/goleveldb/leveldb"
 )

-func dump(ldb *db.Instance) {
+func dump(ldb *leveldb.DB) {
 	it := ldb.NewIterator(nil, nil)
+	var dev protocol.DeviceID
 	for it.Next() {
 		key := it.Key()
 		switch key[0] {
 		case db.KeyTypeDevice:
-			folder := binary.BigEndian.Uint32(key[1:])
-			device := binary.BigEndian.Uint32(key[1+4:])
-			name := nulString(key[1+4+4:])
-			fmt.Printf("[device] F:%d D:%d N:%q", folder, device, name)
+			folder := nulString(key[1 : 1+64])
+			devBytes := key[1+64 : 1+64+32]
+			name := nulString(key[1+64+32:])
+			copy(dev[:], devBytes)
+			fmt.Printf("[device] F:%q N:%q D:%v\n", folder, name, dev)

 			var f protocol.FileInfo
-			err := f.Unmarshal(it.Value())
+			err := f.UnmarshalXDR(it.Value())
 			if err != nil {
 				log.Fatal(err)
 			}
-			fmt.Printf(" V:%v\n", f)
+			fmt.Printf("  N:%q\n  F:%#o\n  M:%d\n  V:%v\n  S:%d\n  B:%d\n", f.Name, f.Flags, f.Modified, f.Version, f.Size(), len(f.Blocks))

 		case db.KeyTypeGlobal:
-			folder := binary.BigEndian.Uint32(key[1:])
-			name := nulString(key[1+4:])
-			var flv db.VersionList
-			flv.Unmarshal(it.Value())
-			fmt.Printf("[global] F:%d N:%q V:%s\n", folder, name, flv)
+			folder := nulString(key[1 : 1+64])
+			name := nulString(key[1+64:])
+			fmt.Printf("[global] F:%q N:%q V:%x\n", folder, name, it.Value())

 		case db.KeyTypeBlock:
-			folder := binary.BigEndian.Uint32(key[1:])
-			hash := key[1+4 : 1+4+32]
-			name := nulString(key[1+4+32:])
-			fmt.Printf("[block] F:%d H:%x N:%q I:%d\n", folder, hash, name, binary.BigEndian.Uint32(it.Value()))
+			folder := nulString(key[1 : 1+64])
+			hash := key[1+64 : 1+64+32]
+			name := nulString(key[1+64+32:])
+			fmt.Printf("[block] F:%q H:%x N:%q I:%d\n", folder, hash, name, binary.BigEndian.Uint32(it.Value()))

 		case db.KeyTypeDeviceStatistic:
-			fmt.Printf("[dstat] K:%x V:%x\n", it.Key(), it.Value())
+			fmt.Printf("[dstat]\n  %x\n  %x\n", it.Key(), it.Value())

 		case db.KeyTypeFolderStatistic:
-			fmt.Printf("[fstat] K:%x V:%x\n", it.Key(), it.Value())
+			fmt.Printf("[fstat]\n  %x\n  %x\n", it.Key(), it.Value())

 		case db.KeyTypeVirtualMtime:
-			folder := binary.BigEndian.Uint32(key[1:])
-			name := nulString(key[1+4:])
-			val := it.Value()
-			var real, virt time.Time
-			real.UnmarshalBinary(val[:len(val)/2])
-			virt.UnmarshalBinary(val[len(val)/2:])
-			fmt.Printf("[mtime] F:%d N:%q R:%v V:%v\n", folder, name, real, virt)
-
-		case db.KeyTypeFolderIdx:
-			key := binary.BigEndian.Uint32(it.Key()[1:])
-			fmt.Printf("[folderidx] K:%d V:%q\n", key, it.Value())
-
-		case db.KeyTypeDeviceIdx:
-			key := binary.BigEndian.Uint32(it.Key()[1:])
-			val := it.Value()
-			if len(val) == 0 {
-				fmt.Printf("[deviceidx] K:%d V:<nil>\n", key)
-			} else {
-				dev := protocol.DeviceIDFromBytes(val)
-				fmt.Printf("[deviceidx] K:%d V:%s\n", key, dev)
-			}
+			fmt.Printf("[mtime]\n  %x\n  %x\n", it.Key(), it.Value())

 		default:
 			fmt.Printf("[???]\n  %x\n  %x\n", it.Key(), it.Value())
@@ -8,10 +8,11 @@ package main

 import (
 	"container/heap"
-	"encoding/binary"
 	"fmt"

 	"github.com/syncthing/syncthing/lib/db"
+	"github.com/syncthing/syncthing/lib/protocol"
+	"github.com/syndtr/goleveldb/leveldb"
 )

 type SizedElement struct {
@@ -37,31 +38,33 @@ func (h *ElementHeap) Pop() interface{} {
 	return x
 }

-func dumpsize(ldb *db.Instance) {
+func dumpsize(ldb *leveldb.DB) {
 	h := &ElementHeap{}
 	heap.Init(h)

 	it := ldb.NewIterator(nil, nil)
+	var dev protocol.DeviceID
 	var ele SizedElement
 	for it.Next() {
 		key := it.Key()
 		switch key[0] {
 		case db.KeyTypeDevice:
-			folder := binary.BigEndian.Uint32(key[1:])
-			device := binary.BigEndian.Uint32(key[1+4:])
-			name := nulString(key[1+4+4:])
-			ele.key = fmt.Sprintf("DEVICE:%d:%d:%s", folder, device, name)
+			folder := nulString(key[1 : 1+64])
+			devBytes := key[1+64 : 1+64+32]
+			name := nulString(key[1+64+32:])
+			copy(dev[:], devBytes)
+			ele.key = fmt.Sprintf("DEVICE:%s:%s:%s", dev, folder, name)

 		case db.KeyTypeGlobal:
-			folder := binary.BigEndian.Uint32(key[1:])
-			name := nulString(key[1+4:])
-			ele.key = fmt.Sprintf("GLOBAL:%d:%s", folder, name)
+			folder := nulString(key[1 : 1+64])
+			name := nulString(key[1+64:])
+			ele.key = fmt.Sprintf("GLOBAL:%s:%s", folder, name)

 		case db.KeyTypeBlock:
-			folder := binary.BigEndian.Uint32(key[1:])
-			hash := key[1+4 : 1+4+32]
-			name := nulString(key[1+4+32:])
-			ele.key = fmt.Sprintf("BLOCK:%d:%x:%s", folder, hash, name)
+			folder := nulString(key[1 : 1+64])
+			hash := key[1+64 : 1+64+32]
+			name := nulString(key[1+64+32:])
+			ele.key = fmt.Sprintf("BLOCK:%s:%x:%s", folder, hash, name)

 		case db.KeyTypeDeviceStatistic:
 			ele.key = fmt.Sprintf("DEVICESTATS:%s", key[1:])
@@ -72,14 +75,6 @@ func dumpsize(ldb *db.Instance) {
 		case db.KeyTypeVirtualMtime:
 			ele.key = fmt.Sprintf("MTIME:%s", key[1:])

-		case db.KeyTypeFolderIdx:
-			id := binary.BigEndian.Uint32(key[1:])
-			ele.key = fmt.Sprintf("FOLDERIDX:%d", id)
-
-		case db.KeyTypeDeviceIdx:
-			id := binary.BigEndian.Uint32(key[1:])
-			ele.key = fmt.Sprintf("DEVICEIDX:%d", id)
-
 		default:
 			ele.key = fmt.Sprintf("UNKNOWN:%x", key)
 		}
@@ -13,7 +13,8 @@ import (
 	"os"
 	"path/filepath"

-	"github.com/syncthing/syncthing/lib/db"
+	"github.com/syndtr/goleveldb/leveldb"
+	"github.com/syndtr/goleveldb/leveldb/opt"
 )

 func main() {
@@ -27,12 +28,16 @@ func main() {

 	path := flag.Arg(0)
 	if path == "" {
-		path = filepath.Join(defaultConfigDir(), "index-v0.14.0.db")
+		path = filepath.Join(defaultConfigDir(), "index-v0.11.0.db")
 	}

 	fmt.Println("Path:", path)

-	ldb, err := db.Open(path)
+	ldb, err := leveldb.OpenFile(path, &opt.Options{
+		ErrorIfMissing:         true,
+		Strict:                 opt.StrictAll,
+		OpenFilesCacheCapacity: 100,
+	})
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -1,22 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 The Syncthing Project
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
@@ -1,15 +0,0 @@
-# relaypoolsrv
-
-[![Latest Build](http://img.shields.io/jenkins/s/http/build.syncthing.net/relaypoolsrv.svg?style=flat-square)](http://build.syncthing.net/job/relaypoolsrv/lastBuild/)
-
-This is the relay pool server for the `syncthing` project, which allows community hosted [relaysrv](https://github.com/syncthing/relaysrv)'s to join the public pool.
-
-Servers that join the pool are then advertised to users of `syncthing` as potential connection points for those who are unable to connect directly due to NAT or firewall issues.
-
-There is very little reason why you'd want to run this yourself, as `relaypoolsrv` is just used for announcement and lookup of public relay servers. If you are looking to setup a private or a public relay, please check the documentation for [relaysrv](https://github.com/syncthing/relaysrv), which also explains how to join the default public pool.
-
-If you still want to run it, you can run `go get github.com/syncthing/relaypoolsrv` download it or download the
-[latest build](http://build.syncthing.net/job/relaypoolsrv/lastSuccessfulBuild/artifact/)
-from the build server.
-
-See `relaypoolsrv -help` for configuration options.
@@ -1 +0,0 @@
-gui.go
@@ -1,395 +0,0 @@
-<!DOCTYPE html>
-
-<html lang="en" ng-app="syncthing" ng-controller="relayDataController">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="">
-    <meta name="author" content="">
-
-    <title>Relay stats</title>
-    <link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" rel="stylesheet">
-    <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.6.1/css/font-awesome.min.css">
-
-    <style>
-      #map {
-        height: 600px;
-      }
-      .ng-cloak {
-        display: none;
-      }
-      table {
-        font-size: 11px !important;
-        width: 100%;
-        border: 1px;
-
-      }
-      td {
-        padding: 0px !important;
-      }
-      tfoot td {
-        font-weight: bold;
-      }
-    </style>
-  </head>
-
-  <body class="ng-cloak">
-    <div class="container">
-      <h1>Relay Pool Data</h2>
-      <div ng-if="relays === undefined" class="text-center">
-        <img src="//cdnjs.cloudflare.com/ajax/libs/galleriffic/2.0.1/css/loader.gif"/>
-        <p>Please wait while we gather data</p>
-      </div>
-      <div>
-        <div ng-show="relays !== undefined" class="ng-hide">
-          <p>
-            Currently {{ relays.length }} relays online ({{ totals.goMaxProcs }} cores in total).
-          </p>
-        </div>
-        <div id="map"></div> <!-- Can't hide the map, otherwise it freaks out -->
-        <p>The circle size represents how much bytes the relay transfered relative to other relays</p>
-      </div>
-      <div>
-        <table class="table table-striped table-condensed table">
-          <thead>
-            <tr>
-              <th rowspan="2">Address</td>
-              <th rowspan="2">
-                <a ng-click="sortType = 'status.numActiveSessions || -1'; sortReverse = !sortReverse">
-                  Sessions
-                  <span ng-show="sortType == 'status.numActiveSessions || -1' && !sortReverse" class="fa fa-caret-down"></span>
-                  <span ng-show="sortType == 'status.numActiveSessions || -1' && sortReverse" class="fa fa-caret-up"></span>
-                </a>
-              </th>
-              <th rowspan="2">
-                <a ng-click="sortType = 'status.numConnections || -1'; sortReverse = !sortReverse">
-                  Connections
-                  <span ng-show="sortType == 'status.numConnections || -1' && !sortReverse" class="fa fa-caret-down"></span>
-                  <span ng-show="sortType == 'status.numConnections || -1' && sortReverse" class="fa fa-caret-up"></span>
-                </a>
-              </th>
-              <th rowspan="2">
-                <a ng-click="sortType = 'status.bytesProxied || -1'; sortReverse = !sortReverse">
-                  Data relayed
-                  <span ng-show="sortType == 'status.bytesProxied || -1' && !sortReverse" class="fa fa-caret-down"></span>
-                  <span ng-show="sortType == 'status.bytesProxied || -1' && sortReverse" class="fa fa-caret-up"></span>
-                </a>
-              </th>
-              <th colspan="6" class="text-center">Transfer rate in the last period</th>
-              <th rowspan="2">
-                <a ng-click="sortType = 'status.uptimeSeconds || -1'; sortReverse = !sortReverse">
-                  Uptime hours
-                  <span ng-show="sortType == 'status.uptimeSeconds || -1' && !sortReverse" class="fa fa-caret-down"></span>
-                  <span ng-show="sortType == 'status.uptimeSeconds || -1' && sortReverse" class="fa fa-caret-up"></span>
-                </a>
-              </th>
-              <th rowspan="2">
-                <a ng-click="sortType = 'status.options[\'provided-by\'] || \'\''; sortReverse = !sortReverse">
-                  Provided by
-                  <span ng-show="sortType == 'status.options[\'provided-by\'] || \'\'' && !sortReverse" class="fa fa-caret-down"></span>
-                  <span ng-show="sortType == 'status.options[\'provided-by\'] || \'\'' && sortReverse" class="fa fa-caret-up"></span>
-                </a>
-              </th>
-            </tr>
-            <tr>
-              <th>
-                <a ng-click="sortType = 'status.kbps10s1m5m15m30m60m[0] || -1'; sortReverse = !sortReverse">
-                  10s
-                  <span ng-show="sortType == 'status.kbps10s1m5m15m30m60m[0] || -1' && !sortReverse" class="fa fa-caret-down"></span>
-                  <span ng-show="sortType == 'status.kbps10s1m5m15m30m60m[0] || -1' && sortReverse" class="fa fa-caret-up"></span>
-                </a>
-              </th>
-              <th>
-                <a ng-click="sortType = 'status.kbps10s1m5m15m30m60m[1] || -1'; sortReverse = !sortReverse">
-                  1m
-                  <span ng-show="sortType == 'status.kbps10s1m5m15m30m60m[1] || -1' && !sortReverse" class="fa fa-caret-down"></span>
-                  <span ng-show="sortType == 'status.kbps10s1m5m15m30m60m[1] || -1' && sortReverse" class="fa fa-caret-up"></span>
-                </a>
-              </th>
-              <th>
-                <a ng-click="sortType = 'status.kbps10s1m5m15m30m60m[2] || -1'; sortReverse = !sortReverse">
-                  5m
-                  <span ng-show="sortType == 'status.kbps10s1m5m15m30m60m[2] || -1' && !sortReverse" class="fa fa-caret-down"></span>
-                  <span ng-show="sortType == 'status.kbps10s1m5m15m30m60m[2] || -1' && sortReverse" class="fa fa-caret-up"></span>
-                </a>
-              </th>
-              <th>
-                <a ng-click="sortType = 'status.kbps10s1m5m15m30m60m[3] || -1'; sortReverse = !sortReverse">
-                  15m
-                  <span ng-show="sortType == 'status.kbps10s1m5m15m30m60m[3] || -1' && !sortReverse" class="fa fa-caret-down"></span>
-                  <span ng-show="sortType == 'status.kbps10s1m5m15m30m60m[3] || -1' && sortReverse" class="fa fa-caret-up"></span>
-                </a>
-              </th>
-              <th>
-                <a ng-click="sortType = 'status.kbps10s1m5m15m30m60m[4] || -1'; sortReverse = !sortReverse">
-                  30m
-                  <span ng-show="sortType == 'status.kbps10s1m5m15m30m60m[4] || -1' && !sortReverse" class="fa fa-caret-down"></span>
-                  <span ng-show="sortType == 'status.kbps10s1m5m15m30m60m[4] || -1' && sortReverse" class="fa fa-caret-up"></span>
-                </a>
-              </th>
-              <th>
-                <a ng-click="sortType = 'status.kbps10s1m5m15m30m60m[5] || -1'; sortReverse = !sortReverse">
-                  60m
-                  <span ng-show="sortType == 'status.kbps10s1m5m15m30m60m[5] || -1' && !sortReverse" class="fa fa-caret-down"></span>
-                  <span ng-show="sortType == 'status.kbps10s1m5m15m30m60m[5] || -1' && sortReverse" class="fa fa-caret-up"></span>
-                </a>
-              </th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr ng-repeat="relay in relays | orderBy:sortType:sortReverse ">
-              <td>{{ relay.address }}</td>
-              <td ng-if="relay.status === undefined" colspan="11" class="text-center">Looking up...</td>
-              <td ng-if-start="relay.status !== undefined">{{ relay.status.numActiveSessions }}</td>
-              <td>{{ relay.status.numConnections }}</td>
-              <td>{{ relay.status.bytesProxied | bytes }}</td>
-              <td>{{ relay.status.kbps10s1m5m15m30m60m[0] * 128 | bytes }}/s</td>
-              <td>{{ relay.status.kbps10s1m5m15m30m60m[1] * 128 | bytes }}/s</td>
-              <td>{{ relay.status.kbps10s1m5m15m30m60m[2] * 128 | bytes }}/s</td>
-              <td>{{ relay.status.kbps10s1m5m15m30m60m[3] * 128 | bytes }}/s</td>
-              <td>{{ relay.status.kbps10s1m5m15m30m60m[4] * 128 | bytes }}/s</td>
-              <td>{{ relay.status.kbps10s1m5m15m30m60m[5] * 128 | bytes }}/s</td>
-              <td ng-if="relay.status.uptimeSeconds != undefined">{{ relay.status.uptimeSeconds/60/60 | number:0 }}</td>
-              <td ng-if="relay.status.uptimeSeconds == undefined"></td>
-              <td title="{{ relay.status.options['provided-by'] || '' }}" ng-if-end>
-                {{ relay.status.options['provided-by'] || '' | limitTo:50 }}
-                <span ng-if="(relay.status.options['provided-by'] || '').length > 50">&hellip;
-              </td>
-            </tr>
-          </tbody>
-          <tfoot>
-            <tr>
-              <td>Totals</td>
-              <td>{{ totals.numActiveSessions }}</td>
-              <td>{{ totals.numConnections }}</td>
-              <td>{{ totals.bytesProxied | bytes }}</td>
-              <td>{{ totals.kbps10s1m5m15m30m60m[0] * 128 | bytes }}/s</td>
-              <td>{{ totals.kbps10s1m5m15m30m60m[1] * 128 | bytes }}/s</td>
-              <td>{{ totals.kbps10s1m5m15m30m60m[2] * 128 | bytes }}/s</td>
-              <td>{{ totals.kbps10s1m5m15m30m60m[3] * 128 | bytes }}/s</td>
-              <td>{{ totals.kbps10s1m5m15m30m60m[4] * 128 | bytes }}/s</td>
-              <td>{{ totals.kbps10s1m5m15m30m60m[5] * 128 | bytes }}/s</td>
-              <td>{{ totals.uptimeSeconds/60/60 | number:0 }} hours</td>
-              <td>{{ relays.length }} relays</td>
-            </tr>
-          </tfoor>
-        </table>
-      </div>
-      <hr>
-      <p>
-        This product includes GeoLite2 data created by MaxMind, available from
-        <a href="http://www.maxmind.com">http://www.maxmind.com</a>.
-      </p>
-    </div>
-
-
-    <script src="//code.jquery.com/jquery-2.1.4.min.js"></script>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.4.7/angular.min.js"></script>
-    <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
-    <script src="//maps.googleapis.com/maps/api/js"></script>
-  </body>
-
-  <script>
-  angular.module('syncthing', [
-  ])
-  .config(function($httpProvider) {
-    $httpProvider.defaults.timeout = 5000;
-  })
-  .filter('bytes', function() {
-    return function(bytes, precision) {
-      if (isNaN(parseFloat(bytes)) || !isFinite(bytes)) return '-';
-      if (typeof precision === 'undefined') precision = 1;
-
-      var units = ['bytes', 'kB', 'MB', 'GB', 'TB', 'PB'],
-          number = Math.floor(Math.log(bytes) / Math.log(1024));
-
-      var value = (bytes / Math.pow(1000, Math.floor(number)));
-      if (!isFinite(value)) {
-        value = 0;
-        precision = 0;
-      }
-      if (!isFinite(number)) {
-        units = 'bytes';
-      } else {
-        units = units[number];
-      }
-      return value.toFixed(precision) + ' ' + units;
-    }
-  })
-  .controller('relayDataController', ['$scope', '$rootScope', '$http', '$q', '$compile', '$timeout', function($scope, $rootScope, $http, $q, $compile, $timeout) {
-    $scope.totals = {
-      bytesProxied: 0,
-      goMaxProcs: 0,
-      kbps10s1m5m15m30m60m: [0, 0, 0, 0, 0, 0],
-      numActiveSessions: 0,
-      numConnections: 0,
-      numPendingSessionKeys: 0,
-      numProxies: 0,
-      uptimeSeconds: 0,
-    };
-    $scope.map = new google.maps.Map(document.getElementById('map'), {
-      zoom: 1,
-      mapTypeId: google.maps.MapTypeId.ROADMAP
-    });
-    $scope.mapBounds = new google.maps.LatLngBounds();
-    $scope.tooltipTemplate = $('#infoTemplate').html();
-    $scope.usedLocations = {};
-    $scope.sortType = 'status.numActiveSessions || -1';
-    $scope.sortReverse = true;
-
-    $http.get("/endpoint").then(function(response) {
-      $scope.relays = response.data.relays;
-      var promises = [];
-      angular.forEach($scope.relays, function(relay) {
-
-        relay.uri = constructURI(relay.url);
-        relay.address = relay.url.split('/')[2];
-
-        addMarkerToMap(relay);
-
-        promises.push(getRelayStatus(relay));
-      });
-
-      // Can only add circles once we know the totals for transfers, which means
-      // we need to resolve all statuses.
-      $q.all(promises).then(function() {
-        angular.forEach($scope.relays, function(relay) {
-          if (relay.status) {
-            addCircleToMap(relay);
-          }
-        });
-      });
-
-      $scope.map.fitBounds($scope.mapBounds);
-      if ($scope.relays.length == 1) {
-        $scope.map.setZoom(13);
-      }
-    });
-
-    function addMarkerToMap(relay) {
-        var loc = relay.location.latitude + "," + relay.location.longitude;
-
-        // Deal with overlapping markers
-        while (loc in $scope.usedLocations) {
-          var locParts = loc.split(',');
-          locParts = [parseFloat(locParts[0]), parseFloat(locParts[1])];
-          locParts[Math.round(Math.random())] += 0.5 * (Math.random() >= 0.5 ? 1 : -1);
-          loc = locParts.join(',');
-        }
-
-        $scope.usedLocations[loc] = true;
-
-        var locParts = loc.split(',');
-
-        relay.marker = new google.maps.Marker({
-          map: $scope.map,
-          position: new google.maps.LatLng(locParts[0], locParts[1]),
-          title: relay.url,
-        });
-
-        var scope = $rootScope.$new(true);
-        scope.relay = relay;
-
-        relay.marker.info = new google.maps.InfoWindow({
-          content: $compile($scope.tooltipTemplate)(scope)[0],
-        });
-
-        relay.marker.addListener('mouseover', function() {
-          relay.marker.info.open($scope.map, relay.marker);
-        });
-
-        relay.marker.addListener('mouseout', function() {
-          relay.marker.info.close();
-        });
-
-        $scope.mapBounds.extend(relay.marker.position);
-    }
-
-    function addCircleToMap(relay) {
-      relay.marker.circle = new google.maps.Circle({
-        strokeColor: '#FF0000',
-        strokeOpacity: 0.8,
-        strokeWeight: 2,
-        fillColor: '#FF0000',
-        fillOpacity: 0.35,
-        map: $scope.map,
-        center: relay.marker.position,
-        radius: ((relay.status.bytesProxied * 100) / $scope.totals.bytesProxied) * 10000
-      });
-    }
-
-    function getRelayStatus(relay) {
-      // Normal timeout doesn't deal with relays which accept the TCP connection
-      // but don't respond (some firewalls do that), so deal with it this way.
-      var timeoutRequest = $q.defer();
-      var resolveStatus = $q.defer();
-
-      $http.get("http://" + relay.uri.hostname + (relay.uri.args.statusAddr || ":22070") + "/status", { timeout: timeoutRequest.promise }).then(function (response) {
-        relay.status = response.data;
-        resolveStatus.resolve();
-        angular.forEach($scope.totals, function(value, key) {
-          if (typeof $scope.totals[key] == 'number') {
-            $scope.totals[key] += response.data[key];
-          } else if (typeof $scope.totals[key] == 'object' && $scope.totals[key] instanceof Array) {
-            angular.forEach($scope.totals[key], function(value, index) {
-              $scope.totals[key][index] += response.data[key][index];
-            });
-          }
-        });
-      }, function() {
-        relay.status = null;
-        resolveStatus.resolve();
-      });
-
-      $timeout(function() {
-        timeoutRequest.resolve();
-      }, 5000);
-
-      return resolveStatus.promise;
-    }
-
-    function constructURI(url) {
-      var uri = document.createElement('a');
-
-      // HAX, otherwise doesn't work
-      uri.href = url.replace('relay://', 'http://');
-
-      // Convert query string to object
-      uri.args = {};
-      angular.forEach(uri.search.replace(/^\?/, '').split('&'), function(query) {
-          var split = query.split('=');
-          uri.args[split[0]] = split[1];
-      });
-
-      return uri;
-    }
-  }]);
-  </script>
-
-  <script type="text/template" id="infoTemplate">
-    <div>
-      <p><b>{{ relay.uri.hostname }}</b> <span ng-if="relay.status.options['provided-by']">provided by <u>{{ relay.status.options['provided-by'] }}</u></span></p>
-      <div ng-if="relay.status">
-        <span ng-if="relay.status.startTime">Start time: {{ relay.status.startTime | date:"medium" }}</br></span>
-        <span ng-if="relay.status.bytesProxied != undefined">Proxied: {{ relay.status.bytesProxied | bytes }}</br></span>
-        <span ng-if="relay.status.numActiveSessions != undefined">Sessions: {{ relay.status.numActiveSessions }}</br></span>
-        <span ng-if="relay.status.numConnections != undefined">Clients: {{ relay.status.numConnections }}</br></span>
-        <span ng-if="relay.status.options.pools">Pools: {{ relay.status.options.pools.join(', ') }}</br></span>
-        <span ng-if="relay.status.options['global-rate'] != undefined">
-          <span ng-if="relay.status.options['global-rate'] > 0">Global rate limit: {{ relay.status.options['global-rate'] | bytes }}/s</span>
-          <span ng-if="relay.status.options['global-rate'] == 0">Global rate limit: unlimited</span>
-          </br>
-        </span>
-        <span ng-if="relay.status.options['per-session-rate'] != undefined">
-          <span ng-if="relay.status.options['per-session-rate'] > 0">Session rate limit: {{ relay.status.options['per-session-rate'] | bytes }}/s</span>
-          <span ng-if="relay.status.options['per-session-rate'] == 0">Session rate limit: unlimited</span>
-          </br>
-        </span>
-      </div>
-      <div ng-if="!relay.status">
-        Data unavailable.
-      <div>
-    </div>
-  </script>
-</html>
@@ -1,538 +0,0 @@
-// Copyright (C) 2015 Audrius Butkevicius and Contributors (see the CONTRIBUTORS file).
-
-//go:generate go run genassets.go gui auto/gui.go
-
-package main
-
-import (
-	"bytes"
-	"compress/gzip"
-	"crypto/tls"
-	"encoding/json"
-	"flag"
-	"fmt"
-	"io/ioutil"
-	"log"
-	"math/rand"
-	"mime"
-	"net"
-	"net/http"
-	"net/url"
-	"path/filepath"
-	"strings"
-	"time"
-
-	"github.com/golang/groupcache/lru"
-	"github.com/juju/ratelimit"
-
-	"github.com/oschwald/geoip2-golang"
-
-	"github.com/syncthing/syncthing/cmd/strelaypoolsrv/auto"
-	"github.com/syncthing/syncthing/lib/relay/client"
-	"github.com/syncthing/syncthing/lib/sync"
-	"github.com/syncthing/syncthing/lib/tlsutil"
-)
-
-type location struct {
-	Latitude  float64 `json:"latitude"`
-	Longitude float64 `json:"longitude"`
-}
-
-type relay struct {
-	URL      string   `json:"url"`
-	Location location `json:"location"`
-	uri      *url.URL
-}
-
-func (r relay) String() string {
-	return r.URL
-}
-
-type request struct {
-	relay  relay
-	uri    *url.URL
-	result chan result
-}
-
-type result struct {
-	err      error
-	eviction time.Duration
-}
-
-var (
-	testCert       tls.Certificate
-	listen         = ":80"
-	dir            string
-	evictionTime   = time.Hour
-	debug          bool
-	getLRUSize           = 10 << 10
-	getLimitBurst  int64 = 10
-	getLimitAvg          = 1
-	postLRUSize          = 1 << 10
-	postLimitBurst int64 = 2
-	postLimitAvg         = 1
-	getLimit       time.Duration
-	postLimit      time.Duration
-	permRelaysFile string
-	ipHeader       string
-	geoipPath      string
-	proto          string
-
-	getMut      = sync.NewRWMutex()
-	getLRUCache *lru.Cache
-
-	postMut      = sync.NewRWMutex()
-	postLRUCache *lru.Cache
-
-	requests = make(chan request, 10)
-
-	mut             = sync.NewRWMutex()
-	knownRelays     = make([]relay, 0)
-	permanentRelays = make([]relay, 0)
-	evictionTimers  = make(map[string]*time.Timer)
-)
-
-func main() {
-	flag.StringVar(&listen, "listen", listen, "Listen address")
-	flag.StringVar(&dir, "keys", dir, "Directory where http-cert.pem and http-key.pem is stored for TLS listening")
-	flag.BoolVar(&debug, "debug", debug, "Enable debug output")
-	flag.DurationVar(&evictionTime, "eviction", evictionTime, "After how long the relay is evicted")
-	flag.IntVar(&getLRUSize, "get-limit-cache", getLRUSize, "Get request limiter cache size")
-	flag.IntVar(&getLimitAvg, "get-limit-avg", 2, "Allowed average get request rate, per 10 s")
-	flag.Int64Var(&getLimitBurst, "get-limit-burst", getLimitBurst, "Allowed burst get requests")
-	flag.IntVar(&postLRUSize, "post-limit-cache", postLRUSize, "Post request limiter cache size")
-	flag.IntVar(&postLimitAvg, "post-limit-avg", 2, "Allowed average post request rate, per minute")
-	flag.Int64Var(&postLimitBurst, "post-limit-burst", postLimitBurst, "Allowed burst post requests")
-	flag.StringVar(&permRelaysFile, "perm-relays", "", "Path to list of permanent relays")
-	flag.StringVar(&ipHeader, "ip-header", "", "Name of header which holds clients ip:port. Only meaningful when running behind a reverse proxy.")
-	flag.StringVar(&geoipPath, "geoip", "GeoLite2-City.mmdb", "Path to GeoLite2-City database")
-	flag.StringVar(&proto, "protocol", "tcp", "Protocol used for listening. 'tcp' for IPv4 and IPv6, 'tcp4' for IPv4, 'tcp6' for IPv6")
-
-	flag.Parse()
-
-	getLimit = 10 * time.Second / time.Duration(getLimitAvg)
-	postLimit = time.Minute / time.Duration(postLimitAvg)
-
-	getLRUCache = lru.New(getLRUSize)
-	postLRUCache = lru.New(postLRUSize)
-
-	var listener net.Listener
-	var err error
-
-	if permRelaysFile != "" {
-		loadPermanentRelays(permRelaysFile)
-	}
-
-	testCert = createTestCertificate()
-
-	go requestProcessor()
-
-	if dir != "" {
-		if debug {
-			log.Println("Starting TLS listener on", listen)
-		}
-		certFile, keyFile := filepath.Join(dir, "http-cert.pem"), filepath.Join(dir, "http-key.pem")
-		var cert tls.Certificate
-		cert, err = tls.LoadX509KeyPair(certFile, keyFile)
-		if err != nil {
-			log.Fatalln("Failed to load HTTP X509 key pair:", err)
-		}
-
-		tlsCfg := &tls.Config{
-			Certificates: []tls.Certificate{cert},
-			MinVersion:   tls.VersionTLS10, // No SSLv3
-			CipherSuites: []uint16{
-				// No RC4
-				tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
-				tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
-				tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
-				tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
-				tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
-				tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
-				tls.TLS_RSA_WITH_AES_128_CBC_SHA,
-				tls.TLS_RSA_WITH_AES_256_CBC_SHA,
-				tls.TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA,
-				tls.TLS_RSA_WITH_3DES_EDE_CBC_SHA,
-			},
-		}
-
-		listener, err = tls.Listen(proto, listen, tlsCfg)
-	} else {
-		if debug {
-			log.Println("Starting plain listener on", listen)
-		}
-		listener, err = net.Listen(proto, listen)
-	}
-
-	if err != nil {
-		log.Fatalln("listen:", err)
-	}
-
-	handler := http.NewServeMux()
-	handler.HandleFunc("/", handleAssets)
-	handler.HandleFunc("/endpoint", handleRequest)
-
-	srv := http.Server{
-		Handler:     handler,
-		ReadTimeout: 10 * time.Second,
-	}
-
-	err = srv.Serve(listener)
-	if err != nil {
-		log.Fatalln("serve:", err)
-	}
-}
-
-func handleAssets(w http.ResponseWriter, r *http.Request) {
-	assets := auto.Assets()
-	path := r.URL.Path[1:]
-	if path == "" {
-		path = "index.html"
-	}
-
-	bs, ok := assets[path]
-	if !ok {
-		w.WriteHeader(http.StatusNotFound)
-		return
-	}
-
-	mtype := mimeTypeForFile(path)
-	if len(mtype) != 0 {
-		w.Header().Set("Content-Type", mtype)
-	}
-
-	if strings.Contains(r.Header.Get("Accept-Encoding"), "gzip") {
-		w.Header().Set("Content-Encoding", "gzip")
-	} else {
-		// ungzip if browser not send gzip accepted header
-		var gr *gzip.Reader
-		gr, _ = gzip.NewReader(bytes.NewReader(bs))
-		bs, _ = ioutil.ReadAll(gr)
-		gr.Close()
-	}
-	w.Header().Set("Content-Length", fmt.Sprintf("%d", len(bs)))
-
-	w.Write(bs)
-}
-
-func mimeTypeForFile(file string) string {
-	// We use a built in table of the common types since the system
-	// TypeByExtension might be unreliable. But if we don't know, we delegate
-	// to the system.
-	ext := filepath.Ext(file)
-	switch ext {
-	case ".htm", ".html":
-		return "text/html"
-	case ".css":
-		return "text/css"
-	case ".js":
-		return "application/javascript"
-	case ".json":
-		return "application/json"
-	case ".png":
-		return "image/png"
-	case ".ttf":
-		return "application/x-font-ttf"
-	case ".woff":
-		return "application/x-font-woff"
-	case ".svg":
-		return "image/svg+xml"
-	default:
-		return mime.TypeByExtension(ext)
-	}
-}
-
-func handleRequest(w http.ResponseWriter, r *http.Request) {
-	if ipHeader != "" {
-		r.RemoteAddr = r.Header.Get(ipHeader)
-	}
-	w.Header().Set("Access-Control-Allow-Origin", "*")
-	switch r.Method {
-	case "GET":
-		if limit(r.RemoteAddr, getLRUCache, getMut, getLimit, int64(getLimitBurst)) {
-			w.WriteHeader(429)
-			return
-		}
-		handleGetRequest(w, r)
-	case "POST":
-		if limit(r.RemoteAddr, postLRUCache, postMut, postLimit, int64(postLimitBurst)) {
-			w.WriteHeader(429)
-			return
-		}
-		handlePostRequest(w, r)
-	default:
-		if debug {
-			log.Println("Unhandled HTTP method", r.Method)
-		}
-		http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
-	}
-}
-
-func handleGetRequest(w http.ResponseWriter, r *http.Request) {
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	mut.RLock()
-	relays := append(permanentRelays, knownRelays...)
-	mut.RUnlock()
-
-	// Shuffle
-	for i := range relays {
-		j := rand.Intn(i + 1)
-		relays[i], relays[j] = relays[j], relays[i]
-	}
-
-	json.NewEncoder(w).Encode(map[string][]relay{
-		"relays": relays,
-	})
-}
-
-func handlePostRequest(w http.ResponseWriter, r *http.Request) {
-	var newRelay relay
-	err := json.NewDecoder(r.Body).Decode(&newRelay)
-	r.Body.Close()
-
-	if err != nil {
-		if debug {
-			log.Println("Failed to parse payload")
-		}
-		http.Error(w, err.Error(), 500)
-		return
-	}
-
-	uri, err := url.Parse(newRelay.URL)
-	if err != nil {
-		if debug {
-			log.Println("Failed to parse URI", newRelay.URL)
-		}
-		http.Error(w, err.Error(), 500)
-		return
-	}
-
-	host, port, err := net.SplitHostPort(uri.Host)
-	if err != nil {
-		if debug {
-			log.Println("Failed to split URI", newRelay.URL)
-		}
-		http.Error(w, err.Error(), 500)
-		return
-	}
-
-	// Get the IP address of the client
-	rhost, _, err := net.SplitHostPort(r.RemoteAddr)
-	if err != nil {
-		if debug {
-			log.Println("Failed to split remote address", r.RemoteAddr)
-		}
-		http.Error(w, err.Error(), 500)
-		return
-	}
-
-	// The client did not provide an IP address, use the IP address of the client.
-	if host == "" {
-		uri.Host = net.JoinHostPort(rhost, port)
-		newRelay.URL = uri.String()
-	} else if host != rhost {
-		if debug {
-			log.Println("IP address advertised does not match client IP address", r.RemoteAddr, uri)
-		}
-		http.Error(w, "IP address does not match client IP", http.StatusUnauthorized)
-		return
-	}
-	newRelay.uri = uri
-	newRelay.Location = getLocation(uri.Host)
-
-	for _, current := range permanentRelays {
-		if current.uri.Host == newRelay.uri.Host {
-			if debug {
-				log.Println("Asked to add a relay", newRelay, "which exists in permanent list")
-			}
-			http.Error(w, "Invalid request", 500)
-			return
-		}
-	}
-
-	reschan := make(chan result)
-
-	select {
-	case requests <- request{newRelay, uri, reschan}:
-		result := <-reschan
-		if result.err != nil {
-			http.Error(w, result.err.Error(), 500)
-			return
-		}
-		w.Header().Set("Content-Type", "application/json; charset=utf-8")
-		json.NewEncoder(w).Encode(map[string]time.Duration{
-			"evictionIn": result.eviction,
-		})
-
-	default:
-		if debug {
-			log.Println("Dropping request")
-		}
-		w.WriteHeader(429)
-	}
-}
-
-func requestProcessor() {
-	for request := range requests {
-		if debug {
-			log.Println("Request for", request.relay)
-		}
-		if !client.TestRelay(request.uri, []tls.Certificate{testCert}, time.Second, 2*time.Second, 3) {
-			if debug {
-				log.Println("Test for relay", request.relay, "failed")
-			}
-			request.result <- result{fmt.Errorf("test failed"), 0}
-			continue
-		}
-
-		mut.Lock()
-		timer, ok := evictionTimers[request.relay.uri.Host]
-		if ok {
-			if debug {
-				log.Println("Stopping existing timer for", request.relay)
-			}
-			timer.Stop()
-		}
-
-		for i, current := range knownRelays {
-			if current.uri.Host == request.relay.uri.Host {
-				if debug {
-					log.Println("Relay", request.relay, "already exists")
-				}
-
-				// Evict the old entry anyway, as configuration might have changed.
-				last := len(knownRelays) - 1
-				knownRelays[i] = knownRelays[last]
-				knownRelays = knownRelays[:last]
-
-				goto found
-			}
-		}
-
-		if debug {
-			log.Println("Adding new relay", request.relay)
-		}
-
-	found:
-
-		knownRelays = append(knownRelays, request.relay)
-
-		evictionTimers[request.relay.uri.Host] = time.AfterFunc(evictionTime, evict(request.relay))
-		mut.Unlock()
-		request.result <- result{nil, evictionTime}
-	}
-
-}
-
-func evict(relay relay) func() {
-	return func() {
-		mut.Lock()
-		defer mut.Unlock()
-		if debug {
-			log.Println("Evicting", relay)
-		}
-		for i, current := range knownRelays {
-			if current.uri.Host == relay.uri.Host {
-				if debug {
-					log.Println("Evicted", relay)
-				}
-				last := len(knownRelays) - 1
-				knownRelays[i] = knownRelays[last]
-				knownRelays = knownRelays[:last]
-			}
-		}
-		delete(evictionTimers, relay.uri.Host)
-	}
-}
-
-func limit(addr string, cache *lru.Cache, lock sync.RWMutex, rate time.Duration, burst int64) bool {
-	host, _, err := net.SplitHostPort(addr)
-	if err != nil {
-		return false
-	}
-
-	lock.RLock()
-	bkt, ok := cache.Get(host)
-	lock.RUnlock()
-	if ok {
-		bkt := bkt.(*ratelimit.Bucket)
-		if bkt.TakeAvailable(1) != 1 {
-			// Rate limit
-			return true
-		}
-	} else {
-		lock.Lock()
-		cache.Add(host, ratelimit.NewBucket(rate, burst))
-		lock.Unlock()
-	}
-	return false
-}
-
-func loadPermanentRelays(file string) {
-	content, err := ioutil.ReadFile(file)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	for _, line := range strings.Split(string(content), "\n") {
-		if len(line) == 0 {
-			continue
-		}
-
-		uri, err := url.Parse(line)
-		if err != nil {
-			if debug {
-				log.Println("Skipping permanent relay", line, "due to parse error", err)
-			}
-			continue
-
-		}
-
-		permanentRelays = append(permanentRelays, relay{
-			URL:      line,
-			Location: getLocation(uri.Host),
-			uri:      uri,
-		})
-		if debug {
-			log.Println("Adding permanent relay", line)
-		}
-	}
-}
-
-func createTestCertificate() tls.Certificate {
-	tmpDir, err := ioutil.TempDir("", "relaypoolsrv")
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	certFile, keyFile := filepath.Join(tmpDir, "cert.pem"), filepath.Join(tmpDir, "key.pem")
-	cert, err := tlsutil.NewCertificate(certFile, keyFile, "relaypoolsrv", 3072)
-	if err != nil {
-		log.Fatalln("Failed to create test X509 key pair:", err)
-	}
-
-	return cert
-}
-
-func getLocation(host string) location {
-	db, err := geoip2.Open(geoipPath)
-	if err != nil {
-		return location{}
-	}
-	defer db.Close()
-
-	addr, err := net.ResolveTCPAddr("tcp", host)
-	if err != nil {
-		return location{}
-	}
-
-	city, err := db.City(addr.IP)
-	if err != nil {
-		return location{}
-	}
-
-	return location{
-		Latitude:  city.Location.Latitude,
-		Longitude: city.Location.Longitude,
-	}
-}
@@ -1,22 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 The Syncthing Project
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
@@ -1,141 +0,0 @@
-strelaysrv
-==========
-
-[![Latest Build](http://img.shields.io/jenkins/s/http/build.syncthing.net/strelaysrv.svg?style=flat-square)](http://build.syncthing.net/job/strelaysrv/lastBuild/)
-
-This is the relay server for the `syncthing` project.
-
-To get it, run `go get github.com/syncthing/strelaysrv` or download the
-[latest build](http://build.syncthing.net/job/strelaysrv/lastSuccessfulBuild/artifact/)
-from the build server.
-
-:exclamation:Warnings:exclamation: - Read or regret
-----
-
-By default, all relay servers will join the default public relay pool, which means that the relay server will be availble for public use, and **will consume your bandwidth** helping others to connect.
-
-If you wish to disable this behaviour, please specify `-pools=""` argument.
-
-Please note that `strelaysrv` is only usable by `syncthing` **version v0.12 and onwards**.
-
-To run `strelaysrv` you need to have port 22067 available to the internet, which means you might need to allow it through your firewall if you **have a public IP, or setup a port-forwarding** (22067 to 22067) if you are behind a router.
-
-Furthermore, **by default strelaysrv will also expose a /status HTTP endpoint on port 22070**, which is used by the pool servers to peek at metrics of the strelaysrv, such as what are the current transfer rates, how many clients are connected, etc, etc. If you wish this information to be available, similarlly you might want to allow it through your firewall, or port-forward it (22070 to 22070) on your NAT device.
-
-This is **not mandatory** for the strelaysrv to function, and is used only to gather metrics and present them in the overview page of the pool server, displaying stats about the specific relay.
-
-At the point of writing the endpoint output looks as follows:
-
-```
-{
-    "bytesProxied": 0,
-    "goArch": "amd64",
-    "goMaxProcs": 1,
-    "goNumRoutine": 13,
-    "goOS": "linux",
-    "goVersion": "go1.6",
-    "kbps10s1m5m15m30m60m": [
-        0,
-        0,
-        0,
-        0,
-        0,
-        0
-    ],
-    "numActiveSessions": 0,
-    "numConnections": 0,
-    "numPendingSessionKeys": 2,
-    "numProxies": 0,
-    "options": {
-        "global-rate": 0,
-        "message-timeout": 60,
-        "network-timeout": 120,
-        "per-session-rate": 0,
-        "ping-interval": 60,
-        "pools": [
-            "https://relays.syncthing.net/endpoint"
-        ],
-        "provided-by": ""
-    },
-    "startTime": "2016-03-06T12:53:07.090847749-05:00",
-    "uptimeSeconds": 17
-}
-```
-
-If you wish to disable the /status endpoint, provide `-status-srv=""` as one of the arguments when starting the strelaysrv.
-
-Running for public use
----
-Make sure you have a public IP with port 22067 open, or make sure you have port-forwarding (22067 to 22067) if you are behind a router.
-
-Run the `strelaysrv` with no arguments (or `-debug` if you want more output), and that should be enough for the server to join the public relay pool.
-You should see a message saying:
-```
-2015/09/21 22:45:46 pool.go:60: Joined https://relays.syncthing.net/endpoint rejoining in 48m0s
-```
-
-See `strelaysrv -help` for other options, such as rate limits, timeout intervals, etc.
-
-Running for private use
-----
-
-Once you've started the `strelaysrv`, it will generate a key pair and print an URI:
-```bash
-relay://:22067/?id=EZQOIDM-6DDD4ZI-DJ65NSM-4OQWRAT-EIKSMJO-OZ552BO-WQZEGYY-STS5RQM&pingInterval=1m0s&networkTimeout=2m0s&sessionLimitBps=0&globalLimitBps=0&statusAddr=:22070
-```
-
-This URI contains partial address of the relay server, as well as it's options which in the future may be taken into account when choosing the best suitable relay out of multiple available.
-
-Because `-listen` option was not used, the `strelaysrv` does not know it's external IP, therefore you should replace the host part of the URI with your public IP address on which the `strelaysrv` will be available:
-
-```bash
-relay://123.123.123.123:22067/?id=EZQOIDM-6DDD4ZI-DJ65NSM-4OQWRAT-EIKSMJO-OZ552BO-WQZEGYY-STS5RQM&pingInterval=1m0s&networkTimeout=2m0s&sessionLimitBps=0&globalLimitBps=0&statusAddr=:22070
-```
-
-If you do not care about certificate pinning (improved security) or do not care about passing verbose settings to the clients, you can shorten the URL to just the host part:
-
-```bash
-relay://123.123.123.123:22067
-```
-
-This URI can then be used in `syncthing` as one of the relay servers.
-
-See `strelaysrv -help` for other options, such as rate limits, timeout intervals, etc.
-
-Other items available in this repo
----
-##### testutil
-A test utility which can be used to test connectivity of a relay server.
-You need to generate two x509 key pairs (key.pem and cert.pem), one for the client, another one for the server, in separate directories.
-Afterwards, start the client:
-```bash
-./testutil -relay="relay://uri.of.relay" -keys=certs/client/ -join
-```
-
-This prints out the client ID:
-```
-2015/09/21 23:00:52 main.go:42: ID: BG2C5ZA-W7XPFDO-LH222Z6-65F3HJX-ADFTGRT-3SBFIGM-KV26O2Q-E5RMRQ2
-```
-
-In the other terminal run the following:
-
-```bash
- ./testutil -relay="relay://uri.of.relay" -keys=certs/server/ -connect=BG2C5ZA-W7XPFDO-LH222Z6-65F3HJX-ADFTGRT-3SBFIGM-KV26O2Q-E5RMRQ2
-```
-
-Which should then give you an interactive prompt, where you can type things in one terminal, and they get relayed to the other terminal.
-
-Relay related libraries used by this repo
----
-##### Relay protocol definition.
-
-[Available here](https://github.com/syncthing/syncthing/tree/master/lib/relay/protocol)
-
-
-##### Relay client
-
-Only used by the testutil.
-
-[Available here](https://github.com/syncthing/syncthing/tree/master/lib/relay/client)
-
-
@@ -1,17 +0,0 @@
-[Unit]
-Description=Syncthing relay server
-After=network.target
-
-[Service]
-User=strelaysrv
-Group=strelaysrv
-ExecStart=/usr/bin/strelaysrv
-WorkingDirectory=/var/lib/strelaysrv
-
-PrivateTmp=true
-ProtectSystem=full
-ProtectHome=true
-NoNewPrivileges=true
-
-[Install]
-WantedBy=multi-user.target
@@ -1,351 +0,0 @@
-// Copyright (C) 2015 Audrius Butkevicius and Contributors.
-
-package main
-
-import (
-	"crypto/tls"
-	"encoding/hex"
-	"log"
-	"net"
-	"sync"
-	"sync/atomic"
-	"time"
-
-	syncthingprotocol "github.com/syncthing/syncthing/lib/protocol"
-	"github.com/syncthing/syncthing/lib/tlsutil"
-
-	"github.com/syncthing/syncthing/lib/relay/protocol"
-)
-
-var (
-	outboxesMut    = sync.RWMutex{}
-	outboxes       = make(map[syncthingprotocol.DeviceID]chan interface{})
-	numConnections int64
-)
-
-func listener(proto, addr string, config *tls.Config) {
-	tcpListener, err := net.Listen("tcp", addr)
-	if err != nil {
-		log.Fatalln(err)
-	}
-
-	listener := tlsutil.DowngradingListener{
-		Listener: tcpListener,
-	}
-
-	for {
-		conn, isTLS, err := listener.AcceptNoWrapTLS()
-		if err != nil {
-			if debug {
-				log.Println("Listener failed to accept connection from", conn.RemoteAddr(), ". Possibly a TCP Ping.")
-			}
-			continue
-		}
-
-		setTCPOptions(conn)
-
-		if debug {
-			log.Println("Listener accepted connection from", conn.RemoteAddr(), "tls", isTLS)
-		}
-
-		if isTLS {
-			go protocolConnectionHandler(conn, config)
-		} else {
-			go sessionConnectionHandler(conn)
-		}
-
-	}
-}
-
-func protocolConnectionHandler(tcpConn net.Conn, config *tls.Config) {
-	conn := tls.Server(tcpConn, config)
-	err := conn.Handshake()
-	if err != nil {
-		if debug {
-			log.Println("Protocol connection TLS handshake:", conn.RemoteAddr(), err)
-		}
-		conn.Close()
-		return
-	}
-
-	state := conn.ConnectionState()
-	if (!state.NegotiatedProtocolIsMutual || state.NegotiatedProtocol != protocol.ProtocolName) && debug {
-		log.Println("Protocol negotiation error")
-	}
-
-	certs := state.PeerCertificates
-	if len(certs) != 1 {
-		if debug {
-			log.Println("Certificate list error")
-		}
-		conn.Close()
-		return
-	}
-
-	id := syncthingprotocol.NewDeviceID(certs[0].Raw)
-
-	messages := make(chan interface{})
-	errors := make(chan error, 1)
-	outbox := make(chan interface{})
-
-	// Read messages from the connection and send them on the messages
-	// channel. When there is an error, send it on the error channel and
-	// return. Applies also when the connection gets closed, so the pattern
-	// below is to close the connection on error, then wait for the error
-	// signal from messageReader to exit.
-	go messageReader(conn, messages, errors)
-
-	pingTicker := time.NewTicker(pingInterval)
-	timeoutTicker := time.NewTimer(networkTimeout)
-	joined := false
-
-	for {
-		select {
-		case message := <-messages:
-			timeoutTicker.Reset(networkTimeout)
-			if debug {
-				log.Printf("Message %T from %s", message, id)
-			}
-
-			switch msg := message.(type) {
-			case protocol.JoinRelayRequest:
-				if atomic.LoadInt32(&overLimit) > 0 {
-					protocol.WriteMessage(conn, protocol.RelayFull{})
-					if debug {
-						log.Println("Refusing join request from", id, "due to being over limits")
-					}
-					conn.Close()
-					limitCheckTimer.Reset(time.Second)
-					continue
-				}
-
-				outboxesMut.RLock()
-				_, ok := outboxes[id]
-				outboxesMut.RUnlock()
-				if ok {
-					protocol.WriteMessage(conn, protocol.ResponseAlreadyConnected)
-					if debug {
-						log.Println("Already have a peer with the same ID", id, conn.RemoteAddr())
-					}
-					conn.Close()
-					continue
-				}
-
-				outboxesMut.Lock()
-				outboxes[id] = outbox
-				outboxesMut.Unlock()
-				joined = true
-
-				protocol.WriteMessage(conn, protocol.ResponseSuccess)
-
-			case protocol.ConnectRequest:
-				requestedPeer := syncthingprotocol.DeviceIDFromBytes(msg.ID)
-				outboxesMut.RLock()
-				peerOutbox, ok := outboxes[requestedPeer]
-				outboxesMut.RUnlock()
-				if !ok {
-					if debug {
-						log.Println(id, "is looking for", requestedPeer, "which does not exist")
-					}
-					protocol.WriteMessage(conn, protocol.ResponseNotFound)
-					conn.Close()
-					continue
-				}
-				// requestedPeer is the server, id is the client
-				ses := newSession(requestedPeer, id, sessionLimiter, globalLimiter)
-
-				go ses.Serve()
-
-				clientInvitation := ses.GetClientInvitationMessage()
-				serverInvitation := ses.GetServerInvitationMessage()
-
-				if err := protocol.WriteMessage(conn, clientInvitation); err != nil {
-					if debug {
-						log.Printf("Error sending invitation from %s to client: %s", id, err)
-					}
-					conn.Close()
-					continue
-				}
-
-				select {
-				case peerOutbox <- serverInvitation:
-					if debug {
-						log.Println("Sent invitation from", id, "to", requestedPeer)
-					}
-				default:
-					if debug {
-						log.Println("Could not send invitation from", id, "to", requestedPeer, "as peer disconnected")
-					}
-
-				}
-				conn.Close()
-
-			case protocol.Ping:
-				if err := protocol.WriteMessage(conn, protocol.Pong{}); err != nil {
-					if debug {
-						log.Println("Error writing pong:", err)
-					}
-					conn.Close()
-					continue
-				}
-
-			case protocol.Pong:
-				// Nothing
-
-			default:
-				if debug {
-					log.Printf("Unknown message %s: %T", id, message)
-				}
-				protocol.WriteMessage(conn, protocol.ResponseUnexpectedMessage)
-				conn.Close()
-			}
-
-		case err := <-errors:
-			if debug {
-				log.Printf("Closing connection %s: %s", id, err)
-			}
-			close(outbox)
-
-			// Potentially closing a second time.
-			conn.Close()
-
-			if joined {
-				// Only delete the outbox if the client is joined, as it might be
-				// a lookup request coming from the same client.
-				outboxesMut.Lock()
-				delete(outboxes, id)
-				outboxesMut.Unlock()
-				// Also, kill all sessions related to this node, as it probably
-				// went offline. This is for the other end to realize the client
-				// is no longer there faster. This also helps resolve
-				// 'already connected' errors when one of the sides is
-				// restarting, and connecting to the other peer before the other
-				// peer even realised that the node has gone away.
-				dropSessions(id)
-			}
-			return
-
-		case <-pingTicker.C:
-			if !joined {
-				if debug {
-					log.Println(id, "didn't join within", pingInterval)
-				}
-				conn.Close()
-				continue
-			}
-
-			if err := protocol.WriteMessage(conn, protocol.Ping{}); err != nil {
-				if debug {
-					log.Println(id, err)
-				}
-				conn.Close()
-			}
-
-			if atomic.LoadInt32(&overLimit) > 0 && !hasSessions(id) {
-				if debug {
-					log.Println("Dropping", id, "as it has no sessions and we are over our limits")
-				}
-				protocol.WriteMessage(conn, protocol.RelayFull{})
-				conn.Close()
-
-				limitCheckTimer.Reset(time.Second)
-			}
-
-		case <-timeoutTicker.C:
-			// We should receive a error from the reader loop, which will cause
-			// us to quit this loop.
-			if debug {
-				log.Printf("%s timed out", id)
-			}
-			conn.Close()
-
-		case msg := <-outbox:
-			if msg == nil {
-				conn.Close()
-				return
-			}
-			if debug {
-				log.Printf("Sending message %T to %s", msg, id)
-			}
-			if err := protocol.WriteMessage(conn, msg); err != nil {
-				if debug {
-					log.Println(id, err)
-				}
-				conn.Close()
-			}
-		}
-	}
-}
-
-func sessionConnectionHandler(conn net.Conn) {
-	if err := conn.SetDeadline(time.Now().Add(messageTimeout)); err != nil {
-		if debug {
-			log.Println("Weird error setting deadline:", err, "on", conn.RemoteAddr())
-		}
-		return
-	}
-
-	message, err := protocol.ReadMessage(conn)
-	if err != nil {
-		return
-	}
-
-	switch msg := message.(type) {
-	case protocol.JoinSessionRequest:
-		ses := findSession(string(msg.Key))
-		if debug {
-			log.Println(conn.RemoteAddr(), "session lookup", ses, hex.EncodeToString(msg.Key)[:5])
-		}
-
-		if ses == nil {
-			protocol.WriteMessage(conn, protocol.ResponseNotFound)
-			conn.Close()
-			return
-		}
-
-		if !ses.AddConnection(conn) {
-			if debug {
-				log.Println("Failed to add", conn.RemoteAddr(), "to session", ses)
-			}
-			protocol.WriteMessage(conn, protocol.ResponseAlreadyConnected)
-			conn.Close()
-			return
-		}
-
-		if err := protocol.WriteMessage(conn, protocol.ResponseSuccess); err != nil {
-			if debug {
-				log.Println("Failed to send session join response to ", conn.RemoteAddr(), "for", ses)
-			}
-			return
-		}
-
-		if err := conn.SetDeadline(time.Time{}); err != nil {
-			if debug {
-				log.Println("Weird error setting deadline:", err, "on", conn.RemoteAddr())
-			}
-			conn.Close()
-			return
-		}
-
-	default:
-		if debug {
-			log.Println("Unexpected message from", conn.RemoteAddr(), message)
-		}
-		protocol.WriteMessage(conn, protocol.ResponseUnexpectedMessage)
-		conn.Close()
-	}
-}
-
-func messageReader(conn net.Conn, messages chan<- interface{}, errors chan<- error) {
-	atomic.AddInt64(&numConnections, 1)
-	defer atomic.AddInt64(&numConnections, -1)
-
-	for {
-		msg, err := protocol.ReadMessage(conn)
-		if err != nil {
-			errors <- err
-			return
-		}
-		messages <- msg
-	}
-}
@@ -1,286 +0,0 @@
-// Copyright (C) 2015 Audrius Butkevicius and Contributors.
-
-package main
-
-import (
-	"crypto/tls"
-	"flag"
-	"fmt"
-	"log"
-	"net"
-	"net/url"
-	"os"
-	"os/signal"
-	"path/filepath"
-	"runtime"
-	"strconv"
-	"strings"
-	"sync/atomic"
-	"syscall"
-	"time"
-
-	"github.com/juju/ratelimit"
-	"github.com/syncthing/syncthing/lib/osutil"
-	"github.com/syncthing/syncthing/lib/relay/protocol"
-	"github.com/syncthing/syncthing/lib/tlsutil"
-
-	"github.com/syncthing/syncthing/lib/config"
-	"github.com/syncthing/syncthing/lib/nat"
-	_ "github.com/syncthing/syncthing/lib/pmp"
-	_ "github.com/syncthing/syncthing/lib/upnp"
-
-	syncthingprotocol "github.com/syncthing/syncthing/lib/protocol"
-)
-
-var (
-	Version    string
-	BuildStamp string
-	BuildUser  string
-	BuildHost  string
-
-	BuildDate   time.Time
-	LongVersion string
-)
-
-func init() {
-	stamp, _ := strconv.Atoi(BuildStamp)
-	BuildDate = time.Unix(int64(stamp), 0)
-
-	date := BuildDate.UTC().Format("2006-01-02 15:04:05 MST")
-	LongVersion = fmt.Sprintf(`strelaysrv %s (%s %s-%s) %s@%s %s`, Version, runtime.Version(), runtime.GOOS, runtime.GOARCH, BuildUser, BuildHost, date)
-}
-
-var (
-	listen string
-	debug  bool
-	proto  string
-
-	sessionAddress []byte
-	sessionPort    uint16
-
-	networkTimeout = 2 * time.Minute
-	pingInterval   = time.Minute
-	messageTimeout = time.Minute
-
-	limitCheckTimer *time.Timer
-
-	sessionLimitBps int
-	globalLimitBps  int
-	overLimit       int32
-	descriptorLimit int64
-	sessionLimiter  *ratelimit.Bucket
-	globalLimiter   *ratelimit.Bucket
-
-	statusAddr       string
-	poolAddrs        string
-	pools            []string
-	providedBy       string
-	defaultPoolAddrs = "https://relays.syncthing.net/endpoint"
-
-	natEnabled bool
-	natLease   int
-	natRenewal int
-	natTimeout int
-)
-
-func main() {
-	log.SetFlags(log.Lshortfile | log.LstdFlags)
-
-	var dir, extAddress, proto string
-
-	flag.StringVar(&listen, "listen", ":22067", "Protocol listen address")
-	flag.StringVar(&dir, "keys", ".", "Directory where cert.pem and key.pem is stored")
-	flag.DurationVar(&networkTimeout, "network-timeout", networkTimeout, "Timeout for network operations between the client and the relay.\n\tIf no data is received between the client and the relay in this period of time, the connection is terminated.\n\tFurthermore, if no data is sent between either clients being relayed within this period of time, the session is also terminated.")
-	flag.DurationVar(&pingInterval, "ping-interval", pingInterval, "How often pings are sent")
-	flag.DurationVar(&messageTimeout, "message-timeout", messageTimeout, "Maximum amount of time we wait for relevant messages to arrive")
-	flag.IntVar(&sessionLimitBps, "per-session-rate", sessionLimitBps, "Per session rate limit, in bytes/s")
-	flag.IntVar(&globalLimitBps, "global-rate", globalLimitBps, "Global rate limit, in bytes/s")
-	flag.BoolVar(&debug, "debug", debug, "Enable debug output")
-	flag.StringVar(&statusAddr, "status-srv", ":22070", "Listen address for status service (blank to disable)")
-	flag.StringVar(&poolAddrs, "pools", defaultPoolAddrs, "Comma separated list of relay pool addresses to join")
-	flag.StringVar(&providedBy, "provided-by", "", "An optional description about who provides the relay")
-	flag.StringVar(&extAddress, "ext-address", "", "An optional address to advertise as being available on.\n\tAllows listening on an unprivileged port with port forwarding from e.g. 443, and be connected to on port 443.")
-	flag.StringVar(&proto, "protocol", "tcp", "Protocol used for listening. 'tcp' for IPv4 and IPv6, 'tcp4' for IPv4, 'tcp6' for IPv6")
-	flag.BoolVar(&natEnabled, "nat", false, "Use UPnP/NAT-PMP to acquire external port mapping")
-	flag.IntVar(&natLease, "nat-lease", 60, "NAT lease length in minutes")
-	flag.IntVar(&natRenewal, "nat-renewal", 30, "NAT renewal frequency in minutes")
-	flag.IntVar(&natTimeout, "nat-timeout", 10, "NAT discovery timeout in seconds")
-	flag.Parse()
-
-	if extAddress == "" {
-		extAddress = listen
-	}
-
-	if len(providedBy) > 30 {
-		log.Fatal("Provided-by cannot be longer than 30 characters")
-	}
-
-	addr, err := net.ResolveTCPAddr(proto, extAddress)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	log.Println(LongVersion)
-
-	maxDescriptors, err := osutil.MaximizeOpenFileLimit()
-	if maxDescriptors > 0 {
-		// Assume that 20% of FD's are leaked/unaccounted for.
-		descriptorLimit = int64(maxDescriptors*80) / 100
-		log.Println("Connection limit", descriptorLimit)
-
-		go monitorLimits()
-	} else if err != nil && runtime.GOOS != "windows" {
-		log.Println("Assuming no connection limit, due to error retrieving rlimits:", err)
-	}
-
-	sessionAddress = addr.IP[:]
-	sessionPort = uint16(addr.Port)
-
-	certFile, keyFile := filepath.Join(dir, "cert.pem"), filepath.Join(dir, "key.pem")
-	cert, err := tls.LoadX509KeyPair(certFile, keyFile)
-	if err != nil {
-		log.Println("Failed to load keypair. Generating one, this might take a while...")
-		cert, err = tlsutil.NewCertificate(certFile, keyFile, "strelaysrv", 3072)
-		if err != nil {
-			log.Fatalln("Failed to generate X509 key pair:", err)
-		}
-	}
-
-	tlsCfg := &tls.Config{
-		Certificates:           []tls.Certificate{cert},
-		NextProtos:             []string{protocol.ProtocolName},
-		ClientAuth:             tls.RequestClientCert,
-		SessionTicketsDisabled: true,
-		InsecureSkipVerify:     true,
-		MinVersion:             tls.VersionTLS12,
-		CipherSuites: []uint16{
-			tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
-			tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
-			tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
-			tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
-			tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
-			tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
-		},
-	}
-
-	id := syncthingprotocol.NewDeviceID(cert.Certificate[0])
-	if debug {
-		log.Println("ID:", id)
-	}
-
-	wrapper := config.Wrap("config", config.New(id))
-	wrapper.SetOptions(config.OptionsConfiguration{
-		NATLeaseM:   natLease,
-		NATRenewalM: natRenewal,
-		NATTimeoutS: natTimeout,
-	})
-	natSvc := nat.NewService(id, wrapper)
-	mapping := mapping{natSvc.NewMapping(nat.TCP, addr.IP, addr.Port)}
-
-	if natEnabled {
-		go natSvc.Serve()
-		found := make(chan struct{})
-		mapping.OnChanged(func(_ *nat.Mapping, _, _ []nat.Address) {
-			select {
-			case found <- struct{}{}:
-			default:
-			}
-		})
-
-		// Need to wait a few extra seconds, since NAT library waits exactly natTimeout seconds on all interfaces.
-		timeout := time.Duration(natTimeout+2) * time.Second
-		log.Printf("Waiting %s to acquire NAT mapping", timeout)
-
-		select {
-		case <-found:
-			log.Printf("Found NAT mapping: %s", mapping.ExternalAddresses())
-		case <-time.After(timeout):
-			log.Println("Timeout out waiting for NAT mapping.")
-		}
-	}
-
-	if sessionLimitBps > 0 {
-		sessionLimiter = ratelimit.NewBucketWithRate(float64(sessionLimitBps), int64(2*sessionLimitBps))
-	}
-	if globalLimitBps > 0 {
-		globalLimiter = ratelimit.NewBucketWithRate(float64(globalLimitBps), int64(2*globalLimitBps))
-	}
-
-	if statusAddr != "" {
-		go statusService(statusAddr)
-	}
-
-	uri, err := url.Parse(fmt.Sprintf("relay://%s/?id=%s&pingInterval=%s&networkTimeout=%s&sessionLimitBps=%d&globalLimitBps=%d&statusAddr=%s&providedBy=%s", mapping.Address(), id, pingInterval, networkTimeout, sessionLimitBps, globalLimitBps, statusAddr, providedBy))
-	if err != nil {
-		log.Fatalln("Failed to construct URI", err)
-	}
-
-	log.Println("URI:", uri.String())
-
-	if poolAddrs == defaultPoolAddrs {
-		log.Println("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!")
-		log.Println("!!  Joining default relay pools, this relay will be available for public use. !!")
-		log.Println(`!!      Use the -pools="" command line option to make the relay private.      !!`)
-		log.Println("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!")
-	}
-
-	pools = strings.Split(poolAddrs, ",")
-	for _, pool := range pools {
-		pool = strings.TrimSpace(pool)
-		if len(pool) > 0 {
-			go poolHandler(pool, uri, mapping)
-		}
-	}
-
-	go listener(proto, listen, tlsCfg)
-
-	sigs := make(chan os.Signal, 1)
-	signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
-	<-sigs
-
-	// Gracefully close all connections, hoping that clients will be faster
-	// to realize that the relay is now gone.
-
-	sessionMut.RLock()
-	for _, session := range activeSessions {
-		session.CloseConns()
-	}
-
-	for _, session := range pendingSessions {
-		session.CloseConns()
-	}
-	sessionMut.RUnlock()
-
-	outboxesMut.RLock()
-	for _, outbox := range outboxes {
-		close(outbox)
-	}
-	outboxesMut.RUnlock()
-
-	time.Sleep(500 * time.Millisecond)
-}
-
-func monitorLimits() {
-	limitCheckTimer = time.NewTimer(time.Minute)
-	for range limitCheckTimer.C {
-		if atomic.LoadInt64(&numConnections)+atomic.LoadInt64(&numProxies) > descriptorLimit {
-			atomic.StoreInt32(&overLimit, 1)
-			log.Println("Gone past our connection limits. Starting to refuse new/drop idle connections.")
-		} else if atomic.CompareAndSwapInt32(&overLimit, 1, 0) {
-			log.Println("Dropped below our connection limits. Accepting new connections.")
-		}
-		limitCheckTimer.Reset(time.Minute)
-	}
-}
-
-type mapping struct {
-	*nat.Mapping
-}
-
-func (m *mapping) Address() nat.Address {
-	ext := m.ExternalAddresses()
-	if len(ext) > 0 {
-		return ext[0]
-	}
-	return m.Mapping.Address()
-}
@@ -1,66 +0,0 @@
-// Copyright (C) 2015 Audrius Butkevicius and Contributors.
-
-package main
-
-import (
-	"bytes"
-	"encoding/json"
-	"io/ioutil"
-	"log"
-	"net/http"
-	"net/url"
-	"time"
-)
-
-func poolHandler(pool string, uri *url.URL, mapping mapping) {
-	if debug {
-		log.Println("Joining", pool)
-	}
-	for {
-		uriCopy := *uri
-		uriCopy.Host = mapping.Address().String()
-
-		var b bytes.Buffer
-		json.NewEncoder(&b).Encode(struct {
-			URL string `json:"url"`
-		}{
-			uriCopy.String(),
-		})
-
-		resp, err := http.Post(pool, "application/json", &b)
-		if err != nil {
-			log.Println("Error joining pool", pool, err)
-		} else if resp.StatusCode == 500 {
-			bs, err := ioutil.ReadAll(resp.Body)
-			if err != nil {
-				log.Println("Failed to join", pool, "due to an internal server error. Could not read response:", err)
-			} else {
-				log.Println("Failed to join", pool, "due to an internal server error:", string(bs))
-			}
-			resp.Body.Close()
-		} else if resp.StatusCode == 429 {
-			log.Println(pool, "under load, will retry in a minute")
-			time.Sleep(time.Minute)
-			continue
-		} else if resp.StatusCode == 401 {
-			log.Println(pool, "failed to join due to IP address not matching external address. Aborting")
-			return
-		} else if resp.StatusCode == 200 {
-			var x struct {
-				EvictionIn time.Duration `json:"evictionIn"`
-			}
-			err := json.NewDecoder(resp.Body).Decode(&x)
-			if err == nil {
-				rejoin := x.EvictionIn - (x.EvictionIn / 5)
-				log.Println("Joined", pool, "rejoining in", rejoin)
-				time.Sleep(rejoin)
-				continue
-			} else {
-				log.Println("Failed to deserialize response", err)
-			}
-		} else {
-			log.Println(pool, "unknown response type from server", resp.StatusCode)
-		}
-		time.Sleep(time.Hour)
-	}
-}
@@ -1,326 +0,0 @@
-// Copyright (C) 2015 Audrius Butkevicius and Contributors.
-
-package main
-
-import (
-	"crypto/rand"
-	"encoding/hex"
-	"fmt"
-	"log"
-	"net"
-	"sync"
-	"sync/atomic"
-	"time"
-
-	"github.com/juju/ratelimit"
-	"github.com/syncthing/syncthing/lib/relay/protocol"
-
-	syncthingprotocol "github.com/syncthing/syncthing/lib/protocol"
-)
-
-var (
-	sessionMut      = sync.RWMutex{}
-	activeSessions  = make([]*session, 0)
-	pendingSessions = make(map[string]*session, 0)
-	numProxies      int64
-	bytesProxied    int64
-)
-
-func newSession(serverid, clientid syncthingprotocol.DeviceID, sessionRateLimit, globalRateLimit *ratelimit.Bucket) *session {
-	serverkey := make([]byte, 32)
-	_, err := rand.Read(serverkey)
-	if err != nil {
-		return nil
-	}
-
-	clientkey := make([]byte, 32)
-	_, err = rand.Read(clientkey)
-	if err != nil {
-		return nil
-	}
-
-	ses := &session{
-		serverkey: serverkey,
-		serverid:  serverid,
-		clientkey: clientkey,
-		clientid:  clientid,
-		rateLimit: makeRateLimitFunc(sessionRateLimit, globalRateLimit),
-		connsChan: make(chan net.Conn),
-		conns:     make([]net.Conn, 0, 2),
-	}
-
-	if debug {
-		log.Println("New session", ses)
-	}
-
-	sessionMut.Lock()
-	pendingSessions[string(ses.serverkey)] = ses
-	pendingSessions[string(ses.clientkey)] = ses
-	sessionMut.Unlock()
-
-	return ses
-}
-
-func findSession(key string) *session {
-	sessionMut.Lock()
-	defer sessionMut.Unlock()
-	ses, ok := pendingSessions[key]
-	if !ok {
-		return nil
-
-	}
-	delete(pendingSessions, key)
-	return ses
-}
-
-func dropSessions(id syncthingprotocol.DeviceID) {
-	sessionMut.RLock()
-	for _, session := range activeSessions {
-		if session.HasParticipant(id) {
-			if debug {
-				log.Println("Dropping session", session, "involving", id)
-			}
-			session.CloseConns()
-		}
-	}
-	sessionMut.RUnlock()
-}
-
-func hasSessions(id syncthingprotocol.DeviceID) bool {
-	sessionMut.RLock()
-	has := false
-	for _, session := range activeSessions {
-		if session.HasParticipant(id) {
-			has = true
-			break
-		}
-	}
-	sessionMut.RUnlock()
-	return has
-}
-
-type session struct {
-	mut sync.Mutex
-
-	serverkey []byte
-	serverid  syncthingprotocol.DeviceID
-
-	clientkey []byte
-	clientid  syncthingprotocol.DeviceID
-
-	rateLimit func(bytes int64)
-
-	connsChan chan net.Conn
-	conns     []net.Conn
-}
-
-func (s *session) AddConnection(conn net.Conn) bool {
-	if debug {
-		log.Println("New connection for", s, "from", conn.RemoteAddr())
-	}
-
-	select {
-	case s.connsChan <- conn:
-		return true
-	default:
-	}
-	return false
-}
-
-func (s *session) Serve() {
-	timedout := time.After(messageTimeout)
-
-	if debug {
-		log.Println("Session", s, "serving")
-	}
-
-	for {
-		select {
-		case conn := <-s.connsChan:
-			s.mut.Lock()
-			s.conns = append(s.conns, conn)
-			s.mut.Unlock()
-			// We're the only ones mutating s.conns, hence we are free to read it.
-			if len(s.conns) < 2 {
-				continue
-			}
-
-			close(s.connsChan)
-
-			if debug {
-				log.Println("Session", s, "starting between", s.conns[0].RemoteAddr(), "and", s.conns[1].RemoteAddr())
-			}
-
-			wg := sync.WaitGroup{}
-			wg.Add(2)
-
-			var err0 error
-			go func() {
-				err0 = s.proxy(s.conns[0], s.conns[1])
-				wg.Done()
-			}()
-
-			var err1 error
-			go func() {
-				err1 = s.proxy(s.conns[1], s.conns[0])
-				wg.Done()
-			}()
-
-			sessionMut.Lock()
-			activeSessions = append(activeSessions, s)
-			sessionMut.Unlock()
-
-			wg.Wait()
-
-			if debug {
-				log.Println("Session", s, "ended, outcomes:", err0, "and", err1)
-			}
-			goto done
-
-		case <-timedout:
-			if debug {
-				log.Println("Session", s, "timed out")
-			}
-			goto done
-		}
-	}
-done:
-	// We can end up here in 3 cases:
-	// 1. Timeout joining, in which case there are potentially entries in pendingSessions
-	// 2. General session end/timeout, in which case there are entries in activeSessions
-	// 3. Protocol handler calls dropSession as one of it's clients disconnects.
-
-	sessionMut.Lock()
-	delete(pendingSessions, string(s.serverkey))
-	delete(pendingSessions, string(s.clientkey))
-
-	for i, session := range activeSessions {
-		if session == s {
-			l := len(activeSessions) - 1
-			activeSessions[i] = activeSessions[l]
-			activeSessions[l] = nil
-			activeSessions = activeSessions[:l]
-		}
-	}
-	sessionMut.Unlock()
-
-	// If we are here because of case 2 or 3, we are potentially closing some or
-	// all connections a second time.
-	s.CloseConns()
-
-	if debug {
-		log.Println("Session", s, "stopping")
-	}
-}
-
-func (s *session) GetClientInvitationMessage() protocol.SessionInvitation {
-	return protocol.SessionInvitation{
-		From:         s.serverid[:],
-		Key:          []byte(s.clientkey),
-		Address:      sessionAddress,
-		Port:         sessionPort,
-		ServerSocket: false,
-	}
-}
-
-func (s *session) GetServerInvitationMessage() protocol.SessionInvitation {
-	return protocol.SessionInvitation{
-		From:         s.clientid[:],
-		Key:          []byte(s.serverkey),
-		Address:      sessionAddress,
-		Port:         sessionPort,
-		ServerSocket: true,
-	}
-}
-
-func (s *session) HasParticipant(id syncthingprotocol.DeviceID) bool {
-	return s.clientid == id || s.serverid == id
-}
-
-func (s *session) CloseConns() {
-	s.mut.Lock()
-	for _, conn := range s.conns {
-		conn.Close()
-	}
-	s.mut.Unlock()
-}
-
-func (s *session) proxy(c1, c2 net.Conn) error {
-	if debug {
-		log.Println("Proxy", c1.RemoteAddr(), "->", c2.RemoteAddr())
-	}
-
-	atomic.AddInt64(&numProxies, 1)
-	defer atomic.AddInt64(&numProxies, -1)
-
-	buf := make([]byte, 65536)
-	for {
-		c1.SetReadDeadline(time.Now().Add(networkTimeout))
-		n, err := c1.Read(buf)
-		if err != nil {
-			return err
-		}
-
-		atomic.AddInt64(&bytesProxied, int64(n))
-
-		if debug {
-			log.Printf("%d bytes from %s to %s", n, c1.RemoteAddr(), c2.RemoteAddr())
-		}
-
-		if s.rateLimit != nil {
-			s.rateLimit(int64(n))
-		}
-
-		c2.SetWriteDeadline(time.Now().Add(networkTimeout))
-		_, err = c2.Write(buf[:n])
-		if err != nil {
-			return err
-		}
-	}
-}
-
-func (s *session) String() string {
-	return fmt.Sprintf("<%s/%s>", hex.EncodeToString(s.clientkey)[:5], hex.EncodeToString(s.serverkey)[:5])
-}
-
-func makeRateLimitFunc(sessionRateLimit, globalRateLimit *ratelimit.Bucket) func(int64) {
-	// This may be a case of super duper premature optimization... We build an
-	// optimized function to do the rate limiting here based on what we need
-	// to do and then use it in the loop.
-
-	if sessionRateLimit == nil && globalRateLimit == nil {
-		// No limiting needed. We could equally well return a func(int64){} and
-		// not do a nil check were we use it, but I think the nil check there
-		// makes it clear that there will be no limiting if none is
-		// configured...
-		return nil
-	}
-
-	if sessionRateLimit == nil {
-		// We only have a global limiter
-		return func(bytes int64) {
-			globalRateLimit.Wait(bytes)
-		}
-	}
-
-	if globalRateLimit == nil {
-		// We only have a session limiter
-		return func(bytes int64) {
-			sessionRateLimit.Wait(bytes)
-		}
-	}
-
-	// We have both. Queue the bytes on both the global and session specific
-	// rate limiters. Wait for both in parallell, so that the actual send
-	// happens when both conditions are satisfied. In practice this just means
-	// wait the longer of the two times.
-	return func(bytes int64) {
-		t0 := sessionRateLimit.Take(bytes)
-		t1 := globalRateLimit.Take(bytes)
-		if t0 > t1 {
-			time.Sleep(t0)
-		} else {
-			time.Sleep(t1)
-		}
-	}
-}
@@ -1,111 +0,0 @@
-// Copyright (C) 2015 Audrius Butkevicius and Contributors.
-
-package main
-
-import (
-	"encoding/json"
-	"log"
-	"net/http"
-	"runtime"
-	"sync/atomic"
-	"time"
-)
-
-var rc *rateCalculator
-
-func statusService(addr string) {
-	rc = newRateCalculator(360, 10*time.Second, &bytesProxied)
-
-	http.HandleFunc("/status", getStatus)
-	if err := http.ListenAndServe(addr, nil); err != nil {
-		log.Fatal(err)
-	}
-}
-
-func getStatus(w http.ResponseWriter, r *http.Request) {
-	w.Header().Set("Access-Control-Allow-Origin", "*")
-	status := make(map[string]interface{})
-
-	sessionMut.Lock()
-	// This can potentially be double the number of pending sessions, as each session has two keys, one for each side.
-	status["startTime"] = rc.startTime
-	status["uptimeSeconds"] = time.Since(rc.startTime) / time.Second
-	status["numPendingSessionKeys"] = len(pendingSessions)
-	status["numActiveSessions"] = len(activeSessions)
-	sessionMut.Unlock()
-	status["numConnections"] = atomic.LoadInt64(&numConnections)
-	status["numProxies"] = atomic.LoadInt64(&numProxies)
-	status["bytesProxied"] = atomic.LoadInt64(&bytesProxied)
-	status["goVersion"] = runtime.Version()
-	status["goOS"] = runtime.GOOS
-	status["goArch"] = runtime.GOARCH
-	status["goMaxProcs"] = runtime.GOMAXPROCS(-1)
-	status["goNumRoutine"] = runtime.NumGoroutine()
-	status["kbps10s1m5m15m30m60m"] = []int64{
-		rc.rate(10/10) * 8 / 1000,
-		rc.rate(60/10) * 8 / 1000,
-		rc.rate(5*60/10) * 8 / 1000,
-		rc.rate(15*60/10) * 8 / 1000,
-		rc.rate(30*60/10) * 8 / 1000,
-		rc.rate(60*60/10) * 8 / 1000,
-	}
-	status["options"] = map[string]interface{}{
-		"network-timeout":  networkTimeout / time.Second,
-		"ping-interval":    pingInterval / time.Second,
-		"message-timeout":  messageTimeout / time.Second,
-		"per-session-rate": sessionLimitBps,
-		"global-rate":      globalLimitBps,
-		"pools":            pools,
-		"provided-by":      providedBy,
-	}
-
-	bs, err := json.MarshalIndent(status, "", "    ")
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-
-	w.Header().Set("Content-Type", "application/json")
-	w.Write(bs)
-}
-
-type rateCalculator struct {
-	rates     []int64
-	prev      int64
-	counter   *int64
-	startTime time.Time
-}
-
-func newRateCalculator(keepIntervals int, interval time.Duration, counter *int64) *rateCalculator {
-	r := &rateCalculator{
-		rates:     make([]int64, keepIntervals),
-		counter:   counter,
-		startTime: time.Now(),
-	}
-
-	go r.updateRates(interval)
-
-	return r
-}
-
-func (r *rateCalculator) updateRates(interval time.Duration) {
-	for {
-		now := time.Now()
-		next := now.Truncate(interval).Add(interval)
-		time.Sleep(next.Sub(now))
-
-		cur := atomic.LoadInt64(r.counter)
-		rate := int64(float64(cur-r.prev) / interval.Seconds())
-		copy(r.rates[1:], r.rates)
-		r.rates[0] = rate
-		r.prev = cur
-	}
-}
-
-func (r *rateCalculator) rate(periods int) int64 {
-	var tot int64
-	for i := 0; i < periods; i++ {
-		tot += r.rates[i]
-	}
-	return tot / int64(periods)
-}
@@ -1,152 +0,0 @@
-// Copyright (C) 2015 Audrius Butkevicius and Contributors (see the CONTRIBUTORS file).
-
-package main
-
-import (
-	"bufio"
-	"crypto/tls"
-	"flag"
-	"log"
-	"net"
-	"net/url"
-	"os"
-	"path/filepath"
-	"time"
-
-	syncthingprotocol "github.com/syncthing/syncthing/lib/protocol"
-	"github.com/syncthing/syncthing/lib/relay/client"
-	"github.com/syncthing/syncthing/lib/relay/protocol"
-)
-
-func main() {
-	log.SetOutput(os.Stdout)
-	log.SetFlags(log.LstdFlags | log.Lshortfile)
-
-	var connect, relay, dir string
-	var join, test bool
-
-	flag.StringVar(&connect, "connect", "", "Device ID to which to connect to")
-	flag.BoolVar(&join, "join", false, "Join relay")
-	flag.BoolVar(&test, "test", false, "Generic relay test")
-	flag.StringVar(&relay, "relay", "relay://127.0.0.1:22067", "Relay address")
-	flag.StringVar(&dir, "keys", ".", "Directory where cert.pem and key.pem is stored")
-
-	flag.Parse()
-
-	certFile, keyFile := filepath.Join(dir, "cert.pem"), filepath.Join(dir, "key.pem")
-	cert, err := tls.LoadX509KeyPair(certFile, keyFile)
-	if err != nil {
-		log.Fatalln("Failed to load X509 key pair:", err)
-	}
-
-	id := syncthingprotocol.NewDeviceID(cert.Certificate[0])
-	log.Println("ID:", id)
-
-	uri, err := url.Parse(relay)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	stdin := make(chan string)
-
-	go stdinReader(stdin)
-
-	if join {
-		log.Println("Creating client")
-		relay, err := client.NewClient(uri, []tls.Certificate{cert}, nil, 10*time.Second)
-		if err != nil {
-			log.Fatal(err)
-		}
-		log.Println("Created client")
-
-		go relay.Serve()
-
-		recv := make(chan protocol.SessionInvitation)
-
-		go func() {
-			log.Println("Starting invitation receiver")
-			for invite := range relay.Invitations() {
-				select {
-				case recv <- invite:
-					log.Println("Received invitation", invite)
-				default:
-					log.Println("Discarding invitation", invite)
-				}
-			}
-		}()
-
-		for {
-			conn, err := client.JoinSession(<-recv)
-			if err != nil {
-				log.Fatalln("Failed to join", err)
-			}
-			log.Println("Joined", conn.RemoteAddr(), conn.LocalAddr())
-			connectToStdio(stdin, conn)
-			log.Println("Finished", conn.RemoteAddr(), conn.LocalAddr())
-		}
-	} else if connect != "" {
-		id, err := syncthingprotocol.DeviceIDFromString(connect)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		invite, err := client.GetInvitationFromRelay(uri, id, []tls.Certificate{cert}, 10*time.Second)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		log.Println("Received invitation", invite)
-		conn, err := client.JoinSession(invite)
-		if err != nil {
-			log.Fatalln("Failed to join", err)
-		}
-		log.Println("Joined", conn.RemoteAddr(), conn.LocalAddr())
-		connectToStdio(stdin, conn)
-		log.Println("Finished", conn.RemoteAddr(), conn.LocalAddr())
-	} else if test {
-		if client.TestRelay(uri, []tls.Certificate{cert}, time.Second, 2*time.Second, 4) {
-			log.Println("OK")
-		} else {
-			log.Println("FAIL")
-		}
-	} else {
-		log.Fatal("Requires either join or connect")
-	}
-}
-
-func stdinReader(c chan<- string) {
-	scanner := bufio.NewScanner(os.Stdin)
-	for scanner.Scan() {
-		c <- scanner.Text()
-		c <- "\n"
-	}
-}
-
-func connectToStdio(stdin <-chan string, conn net.Conn) {
-	go func() {
-
-	}()
-
-	buf := make([]byte, 1024)
-	for {
-		conn.SetReadDeadline(time.Now().Add(time.Millisecond))
-		n, err := conn.Read(buf[0:])
-		if err != nil {
-			nerr, ok := err.(net.Error)
-			if !ok || !nerr.Timeout() {
-				log.Println(err)
-				return
-			}
-		}
-		os.Stdout.Write(buf[:n])
-
-		select {
-		case msg := <-stdin:
-			_, err := conn.Write([]byte(msg))
-			if err != nil {
-				return
-			}
-		default:
-		}
-	}
-}
@@ -1,28 +0,0 @@
-// Copyright (C) 2015 Audrius Butkevicius and Contributors.
-
-package main
-
-import (
-	"errors"
-	"net"
-)
-
-func setTCPOptions(conn net.Conn) error {
-	tcpConn, ok := conn.(*net.TCPConn)
-	if !ok {
-		return errors.New("Not a TCP connection")
-	}
-	if err := tcpConn.SetLinger(0); err != nil {
-		return err
-	}
-	if err := tcpConn.SetNoDelay(true); err != nil {
-		return err
-	}
-	if err := tcpConn.SetKeepAlivePeriod(networkTimeout); err != nil {
-		return err
-	}
-	if err := tcpConn.SetKeepAlive(true); err != nil {
-		return err
-	}
-	return nil
-}
@@ -130,7 +130,7 @@ func printProgress(prefix string, count *int64) {
 	expectedIterations := float64(int(1) << uint(wantBits))
 	fmt.Printf("Want %d bits for prefix %q, about %.2g certs to test (statistically speaking)\n", wantBits, prefix, expectedIterations)

-	for range time.NewTicker(15 * time.Second).C {
+	for _ = range time.NewTicker(15 * time.Second).C {
 		tried := atomic.LoadInt64(count)
 		elapsed := time.Since(started)
 		rate := float64(tried) / elapsed.Seconds()
@@ -7,23 +7,26 @@
 package main

 import (
+	"bytes"
+	"compress/gzip"
 	"crypto/tls"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
+	"mime"
 	"net"
 	"net/http"
 	"os"
 	"path/filepath"
 	"reflect"
 	"runtime"
-	"runtime/pprof"
 	"sort"
 	"strconv"
 	"strings"
 	"time"

 	"github.com/rcrowley/go-metrics"
+	"github.com/syncthing/syncthing/lib/auto"
 	"github.com/syncthing/syncthing/lib/config"
 	"github.com/syncthing/syncthing/lib/db"
 	"github.com/syncthing/syncthing/lib/discover"
@@ -32,17 +35,18 @@ import (
 	"github.com/syncthing/syncthing/lib/model"
 	"github.com/syncthing/syncthing/lib/osutil"
 	"github.com/syncthing/syncthing/lib/protocol"
-	"github.com/syncthing/syncthing/lib/rand"
 	"github.com/syncthing/syncthing/lib/stats"
 	"github.com/syncthing/syncthing/lib/sync"
 	"github.com/syncthing/syncthing/lib/tlsutil"
 	"github.com/syncthing/syncthing/lib/upgrade"
+	"github.com/syncthing/syncthing/lib/util"
 	"github.com/vitrun/qart/qr"
 	"golang.org/x/crypto/bcrypt"
 )

 var (
-	startTime = time.Now()
+	configInSync = true
+	startTime    = time.Now()
 )

 type apiService struct {
@@ -50,7 +54,8 @@ type apiService struct {
 	cfg                configIntf
 	httpsCertFile      string
 	httpsKeyFile       string
-	statics            *staticsServer
+	assetDir           string
+	themes             []string
 	model              modelIntf
 	eventSub           events.BufferedSubscription
 	discoverer         discover.CachingMux
@@ -59,8 +64,10 @@ type apiService struct {
 	systemConfigMut    sync.Mutex    // serializes posts to /rest/system/config
 	stop               chan struct{} // signals intentional stop
 	configChanged      chan struct{} // signals intentional listener close due to config change
-	started            chan string   // signals startup complete by sending the listener address, for testing only
-	startedOnce        bool          // the service has started successfully at least once
+	started            chan struct{} // signals startup complete, for testing only
+
+	listener    net.Listener
+	listenerMut sync.Mutex

 	guiErrors logger.Recorder
 	systemLog logger.Recorder
@@ -68,7 +75,7 @@ type apiService struct {

 type modelIntf interface {
 	GlobalDirectoryTree(folder, prefix string, levels int, dirsonly bool) map[string]interface{}
-	Completion(device protocol.DeviceID, folder string) model.FolderCompletion
+	Completion(device protocol.DeviceID, folder string) float64
 	Override(folder string)
 	NeedFolderFiles(folder string, page, perpage int) ([]db.FileInfoTruncated, []db.FileInfoTruncated, []db.FileInfoTruncated, int)
 	NeedSize(folder string) (nfiles int, bytes int64)
@@ -86,13 +93,13 @@ type modelIntf interface {
 	DelayScan(folder string, next time.Duration)
 	ScanFolder(folder string) error
 	ScanFolders() map[string]error
-	ScanFolderSubdirs(folder string, subs []string) error
+	ScanFolderSubs(folder string, subs []string) error
 	BringToFront(folder, file string)
 	ConnectedTo(deviceID protocol.DeviceID) bool
 	GlobalSize(folder string) (nfiles, deleted int, bytes int64)
 	LocalSize(folder string) (nfiles, deleted int, bytes int64)
-	CurrentSequence(folder string) (int64, bool)
-	RemoteSequence(folder string) (int64, bool)
+	CurrentLocalVersion(folder string) (int64, bool)
+	RemoteLocalVersion(folder string) (int64, bool)
 	State(folder string) (string, time.Time, error)
 }

@@ -100,26 +107,25 @@ type configIntf interface {
 	GUI() config.GUIConfiguration
 	Raw() config.Configuration
 	Options() config.OptionsConfiguration
-	Replace(cfg config.Configuration) error
+	Replace(cfg config.Configuration) config.CommitResponse
 	Subscribe(c config.Committer)
 	Folders() map[string]config.FolderConfiguration
 	Devices() map[protocol.DeviceID]config.DeviceConfiguration
 	Save() error
 	ListenAddresses() []string
-	RequiresRestart() bool
 }

 type connectionsIntf interface {
 	Status() map[string]interface{}
 }

-func newAPIService(id protocol.DeviceID, cfg configIntf, httpsCertFile, httpsKeyFile, assetDir string, m modelIntf, eventSub events.BufferedSubscription, discoverer discover.CachingMux, connectionsService connectionsIntf, errors, systemLog logger.Recorder) *apiService {
+func newAPIService(id protocol.DeviceID, cfg configIntf, httpsCertFile, httpsKeyFile, assetDir string, m modelIntf, eventSub events.BufferedSubscription, discoverer discover.CachingMux, connectionsService connectionsIntf, errors, systemLog logger.Recorder) (*apiService, error) {
 	service := &apiService{
 		id:                 id,
 		cfg:                cfg,
 		httpsCertFile:      httpsCertFile,
 		httpsKeyFile:       httpsKeyFile,
-		statics:            newStaticsServer(cfg.GUI().Theme, assetDir),
+		assetDir:           assetDir,
 		model:              m,
 		eventSub:           eventSub,
 		discoverer:         discoverer,
@@ -127,11 +133,33 @@ func newAPIService(id protocol.DeviceID, cfg configIntf, httpsCertFile, httpsKey
 		systemConfigMut:    sync.NewMutex(),
 		stop:               make(chan struct{}),
 		configChanged:      make(chan struct{}),
+		listenerMut:        sync.NewMutex(),
 		guiErrors:          errors,
 		systemLog:          systemLog,
 	}

-	return service
+	seen := make(map[string]struct{})
+	// Load themes from compiled in assets.
+	for file := range auto.Assets() {
+		theme := strings.Split(file, "/")[0]
+		if _, ok := seen[theme]; !ok {
+			seen[theme] = struct{}{}
+			service.themes = append(service.themes, theme)
+		}
+	}
+	if assetDir != "" {
+		// Load any extra themes from the asset override dir.
+		for _, dir := range dirNames(assetDir) {
+			if _, ok := seen[dir]; !ok {
+				seen[dir] = struct{}{}
+				service.themes = append(service.themes, dir)
+			}
+		}
+	}
+
+	var err error
+	service.listener, err = service.getListener(cfg.GUI())
+	return service, err
 }

 func (s *apiService) getListener(guiCfg config.GUIConfiguration) (net.Listener, error) {
@@ -198,22 +226,9 @@ func sendJSON(w http.ResponseWriter, jsonObject interface{}) {
 }

 func (s *apiService) Serve() {
-	listener, err := s.getListener(s.cfg.GUI())
-	if err != nil {
-		if !s.startedOnce {
-			// This is during initialization. A failure here should be fatal
-			// as there will be no way for the user to communicate with us
-			// otherwise anyway.
-			l.Fatalln("Starting API/GUI:", err)
-		}
-
-		// We let this be a loud user-visible warning as it may be the only
-		// indication they get that the GUI won't be available on startup.
-		l.Warnln("Starting API/GUI:", err)
-		return
-	}
-	s.startedOnce = true
-	defer listener.Close()
+	s.listenerMut.Lock()
+	listener := s.listener
+	s.listenerMut.Unlock()

 	if listener == nil {
 		// Not much we can do here other than exit quickly. The supervisor
@@ -235,7 +250,6 @@ func (s *apiService) Serve() {
 	getRestMux.HandleFunc("/rest/svc/deviceid", s.getDeviceID)                   // id
 	getRestMux.HandleFunc("/rest/svc/lang", s.getLang)                           // -
 	getRestMux.HandleFunc("/rest/svc/report", s.getReport)                       // -
-	getRestMux.HandleFunc("/rest/svc/random/string", s.getRandomString)          // [length]
 	getRestMux.HandleFunc("/rest/system/browse", s.getSystemBrowse)              // current
 	getRestMux.HandleFunc("/rest/system/config", s.getSystemConfig)              // -
 	getRestMux.HandleFunc("/rest/system/config/insync", s.getSystemConfigInsync) // -
@@ -269,12 +283,8 @@ func (s *apiService) Serve() {
 	postRestMux.HandleFunc("/rest/system/debug", s.postSystemDebug)            // [enable] [disable]

 	// Debug endpoints, not for general use
-	debugMux := http.NewServeMux()
-	debugMux.HandleFunc("/rest/debug/peerCompletion", s.getPeerCompletion)
-	debugMux.HandleFunc("/rest/debug/httpmetrics", s.getSystemHTTPMetrics)
-	debugMux.HandleFunc("/rest/debug/cpuprof", s.getCPUProf) // duration
-	debugMux.HandleFunc("/rest/debug/heapprof", s.getHeapProf)
-	getRestMux.Handle("/rest/debug/", s.whenDebugging(debugMux))
+	getRestMux.HandleFunc("/rest/debug/peerCompletion", s.getPeerCompletion)
+	getRestMux.HandleFunc("/rest/debug/httpmetrics", s.getSystemHTTPMetrics)

 	// A handler that splits requests between the two above and disables
 	// caching
@@ -286,10 +296,16 @@ func (s *apiService) Serve() {
 	mux.HandleFunc("/qr/", s.getQR)

 	// Serve compiled in assets unless an asset directory was set (for development)
-	mux.Handle("/", s.statics)
+	assets := &embeddedStatic{
+		theme:        s.cfg.GUI().Theme,
+		lastModified: time.Now(),
+		mut:          sync.NewRWMutex(),
+		assetDir:     s.assetDir,
+		assets:       auto.Assets(),
+	}
+	mux.Handle("/", assets)

-	// Handle the special meta.js path
-	mux.HandleFunc("/meta.js", s.getJSMetadata)
+	s.cfg.Subscribe(assets)

 	guiCfg := s.cfg.GUI()

@@ -328,33 +344,33 @@ func (s *apiService) Serve() {
 	l.Infoln("Access the GUI via the following URL:", guiCfg.URL())
 	if s.started != nil {
 		// only set when run by the tests
-		s.started <- listener.Addr().String()
+		close(s.started)
 	}
+	err := srv.Serve(listener)

-	// Serve in the background
-
-	serveError := make(chan error, 1)
-	go func() {
-		serveError <- srv.Serve(listener)
-	}()
-
-	// Wait for stop, restart or error signals
-
+	// The return could be due to an intentional close. Wait for the stop
+	// signal before returning. IF there is no stop signal within a second, we
+	// assume it was unintentional and log the error before retrying.
 	select {
 	case <-s.stop:
-		// Shutting down permanently
-		l.Debugln("shutting down (stop)")
 	case <-s.configChanged:
-		// Soft restart due to configuration change
-		l.Debugln("restarting (config changed)")
-	case <-serveError:
-		// Restart due to listen/serve failure
-		l.Warnln("GUI/API:", err, "(restarting)")
+	case <-time.After(time.Second):
+		l.Warnln("API:", err)
 	}
 }

 func (s *apiService) Stop() {
+	s.listenerMut.Lock()
+	listener := s.listener
+	s.listenerMut.Unlock()
+
 	close(s.stop)
+
+	// listener may be nil here if we've had a config change to a broken
+	// configuration, in which case we shouldn't try to close it.
+	if listener != nil {
+		listener.Close()
+	}
 }

 func (s *apiService) String() string {
@@ -362,25 +378,35 @@ func (s *apiService) String() string {
 }

 func (s *apiService) VerifyConfiguration(from, to config.Configuration) error {
-	if _, err := net.ResolveTCPAddr("tcp", to.GUI.Address()); err != nil {
-		return err
-	}
 	return nil
 }

 func (s *apiService) CommitConfiguration(from, to config.Configuration) bool {
-	// No action required when this changes, so mask the fact that it changed at all.
-	from.GUI.Debugging = to.GUI.Debugging
-
 	if to.GUI == from.GUI {
 		return true
 	}

-	if to.GUI.Theme != from.GUI.Theme {
-		s.statics.setTheme(to.GUI.Theme)
+	// Order here is important. We must close the listener to stop Serve(). We
+	// must create a new listener before Serve() starts again. We can't create
+	// a new listener on the same port before the previous listener is closed.
+	// To assist in this little dance the Serve() method will wait for a
+	// signal on the configChanged channel after the listener has closed.
+
+	s.listenerMut.Lock()
+	defer s.listenerMut.Unlock()
+
+	s.listener.Close()
+
+	var err error
+	s.listener, err = s.getListener(to.GUI)
+	if err != nil {
+		// Ideally this should be a verification error, but we check it by
+		// creating a new listener which requires shutting down the previous
+		// one first, which is too destructive for the VerifyConfiguration
+		// method.
+		return false
 	}

-	// Tell the serve loop to restart
 	s.configChanged <- struct{}{}

 	return true
@@ -435,6 +461,10 @@ func corsMiddleware(next http.Handler) http.Handler {
 	//
 	// 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
+		// redirecting REST requests over protocols
+		w.Header().Add("Access-Control-Allow-Origin", "*")
+
 		// Process OPTIONS requests
 		if r.Method == "OPTIONS" {
 			// Only GET/POST Methods are supported
@@ -495,30 +525,10 @@ func withDetailsMiddleware(id protocol.DeviceID, h http.Handler) http.Handler {
 	})
 }

-func (s *apiService) whenDebugging(h http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if s.cfg.GUI().Debugging {
-			h.ServeHTTP(w, r)
-			return
-		}
-
-		http.Error(w, "Debugging disabled", http.StatusBadRequest)
-		return
-	})
-}
-
 func (s *apiService) restPing(w http.ResponseWriter, r *http.Request) {
 	sendJSON(w, map[string]string{"ping": "pong"})
 }

-func (s *apiService) getJSMetadata(w http.ResponseWriter, r *http.Request) {
-	meta, _ := json.Marshal(map[string]string{
-		"deviceID": s.id.String(),
-	})
-	w.Header().Set("Content-Type", "application/javascript")
-	fmt.Fprintf(w, "var metadata = %s;\n", meta)
-}
-
 func (s *apiService) getSystemVersion(w http.ResponseWriter, r *http.Request) {
 	sendJSON(w, map[string]string{
 		"version":     Version,
@@ -583,11 +593,8 @@ func (s *apiService) getDBCompletion(w http.ResponseWriter, r *http.Request) {
 		return
 	}

-	comp := s.model.Completion(device, folder)
-	sendJSON(w, map[string]interface{}{
-		"completion":  comp.CompletionPct,
-		"needBytes":   comp.NeedBytes,
-		"globalBytes": comp.GlobalBytes,
+	sendJSON(w, map[string]float64{
+		"completion": s.model.Completion(device, folder),
 	})
 }

@@ -600,7 +607,7 @@ func (s *apiService) getDBStatus(w http.ResponseWriter, r *http.Request) {
 func folderSummary(cfg configIntf, m modelIntf, folder string) map[string]interface{} {
 	var res = make(map[string]interface{})

-	res["invalid"] = "" // Deprecated, retains external API for now
+	res["invalid"] = cfg.Folders()[folder].Invalid

 	globalFiles, globalDeleted, globalBytes := m.GlobalSize(folder)
 	res["globalFiles"], res["globalDeleted"], res["globalBytes"] = globalFiles, globalDeleted, globalBytes
@@ -619,11 +626,10 @@ func folderSummary(cfg configIntf, m modelIntf, folder string) map[string]interf
 		res["error"] = err.Error()
 	}

-	ourSeq, _ := m.CurrentSequence(folder)
-	remoteSeq, _ := m.RemoteSequence(folder)
+	lv, _ := m.CurrentLocalVersion(folder)
+	rv, _ := m.RemoteLocalVersion(folder)

-	res["version"] = ourSeq + remoteSeq  // legacy
-	res["sequence"] = ourSeq + remoteSeq // new name
+	res["version"] = lv + rv

 	ignorePatterns, _, _ := m.GetIgnores(folder)
 	res["ignorePatterns"] = false
@@ -714,7 +720,7 @@ func (s *apiService) postSystemConfig(w http.ResponseWriter, r *http.Request) {
 	to, err := config.ReadJSON(r.Body, myID)
 	r.Body.Close()
 	if err != nil {
-		l.Warnln("Decoding posted config:", err)
+		l.Warnln("decoding posted config:", err)
 		http.Error(w, err.Error(), http.StatusBadRequest)
 		return
 	}
@@ -737,7 +743,7 @@ func (s *apiService) postSystemConfig(w http.ResponseWriter, r *http.Request) {
 	if curAcc := s.cfg.Options().URAccepted; to.Options.URAccepted > curAcc {
 		// UR was enabled
 		to.Options.URAccepted = usageReportVersion
-		to.Options.URUniqueID = rand.String(8)
+		to.Options.URUniqueID = util.RandomString(8)
 	} else if to.Options.URAccepted < curAcc {
 		// UR was disabled
 		to.Options.URAccepted = -1
@@ -746,19 +752,13 @@ func (s *apiService) postSystemConfig(w http.ResponseWriter, r *http.Request) {

 	// Activate and save

-	if err := s.cfg.Replace(to); err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-
-	if err := s.cfg.Save(); err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
+	resp := s.cfg.Replace(to)
+	configInSync = !resp.RequiresRestart
+	s.cfg.Save()
 }

 func (s *apiService) getSystemConfigInsync(w http.ResponseWriter, r *http.Request) {
-	sendJSON(w, map[string]bool{"configInSync": !s.cfg.RequiresRestart()})
+	sendJSON(w, map[string]bool{"configInSync": configInSync})
 }

 func (s *apiService) postSystemRestart(w http.ResponseWriter, r *http.Request) {
@@ -843,6 +843,7 @@ func (s *apiService) getSystemStatus(w http.ResponseWriter, r *http.Request) {
 	res["pathSeparator"] = string(filepath.Separator)
 	res["uptime"] = int(time.Since(startTime).Seconds())
 	res["startTime"] = startTime
+	res["themes"] = s.themes

 	sendJSON(w, res)
 }
@@ -922,16 +923,6 @@ func (s *apiService) getReport(w http.ResponseWriter, r *http.Request) {
 	sendJSON(w, reportData(s.cfg, s.model))
 }

-func (s *apiService) getRandomString(w http.ResponseWriter, r *http.Request) {
-	length := 32
-	if val, _ := strconv.Atoi(r.URL.Query().Get("length")); val > 0 {
-		length = val
-	}
-	str := rand.String(length)
-
-	sendJSON(w, map[string]string{"random": str})
-}
-
 func (s *apiService) getDBIgnores(w http.ResponseWriter, r *http.Request) {
 	qs := r.URL.Query()

@@ -1101,7 +1092,7 @@ func (s *apiService) postDBScan(w http.ResponseWriter, r *http.Request) {
 		}

 		subs := qs["sub"]
-		err = s.model.ScanFolderSubdirs(folder, subs)
+		err = s.model.ScanFolderSubs(folder, subs)
 		if err != nil {
 			http.Error(w, err.Error(), 500)
 			return
@@ -1145,7 +1136,7 @@ func (s *apiService) getPeerCompletion(w http.ResponseWriter, r *http.Request) {
 		for _, device := range folder.DeviceIDs() {
 			deviceStr := device.String()
 			if s.model.ConnectedTo(device) {
-				tot[deviceStr] += s.model.Completion(device, folder.ID).CompletionPct
+				tot[deviceStr] += s.model.Completion(device, folder.ID)
 			} else {
 				tot[deviceStr] = 0
 			}
@@ -1164,55 +1155,150 @@ func (s *apiService) getPeerCompletion(w http.ResponseWriter, r *http.Request) {
 func (s *apiService) getSystemBrowse(w http.ResponseWriter, r *http.Request) {
 	qs := r.URL.Query()
 	current := qs.Get("current")
-	if current == "" {
-		if roots, err := osutil.GetFilesystemRoots(); err == nil {
-			sendJSON(w, roots)
-		} else {
-			http.Error(w, err.Error(), 500)
-		}
-		return
-	}
 	search, _ := osutil.ExpandTilde(current)
 	pathSeparator := string(os.PathSeparator)
 	if strings.HasSuffix(current, pathSeparator) && !strings.HasSuffix(search, pathSeparator) {
 		search = search + pathSeparator
 	}
 	subdirectories, _ := osutil.Glob(search + "*")
-	ret := make([]string, 0, len(subdirectories))
+	ret := make([]string, 0, 10)
 	for _, subdirectory := range subdirectories {
 		info, err := os.Stat(subdirectory)
 		if err == nil && info.IsDir() {
 			ret = append(ret, subdirectory+pathSeparator)
+			if len(ret) > 9 {
+				break
+			}
 		}
 	}

 	sendJSON(w, ret)
 }

-func (s *apiService) getCPUProf(w http.ResponseWriter, r *http.Request) {
-	duration, err := time.ParseDuration(r.FormValue("duration"))
-	if err != nil {
-		duration = 30 * time.Second
-	}
-
-	filename := fmt.Sprintf("syncthing-cpu-%s-%s-%s-%s.pprof", runtime.GOOS, runtime.GOARCH, Version, time.Now().Format("150405")) // hhmmss
-
-	w.Header().Set("Content-Type", "application/octet-stream")
-	w.Header().Set("Content-Disposition", "attachment; filename="+filename)
-
-	pprof.StartCPUProfile(w)
-	time.Sleep(duration)
-	pprof.StopCPUProfile()
+type embeddedStatic struct {
+	theme        string
+	lastModified time.Time
+	mut          sync.RWMutex
+	assetDir     string
+	assets       map[string][]byte
 }

-func (s *apiService) getHeapProf(w http.ResponseWriter, r *http.Request) {
-	filename := fmt.Sprintf("syncthing-heap-%s-%s-%s-%s.pprof", runtime.GOOS, runtime.GOARCH, Version, time.Now().Format("150405")) // hhmmss
+func (s embeddedStatic) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	file := r.URL.Path

-	w.Header().Set("Content-Type", "application/octet-stream")
-	w.Header().Set("Content-Disposition", "attachment; filename="+filename)
+	if file[0] == '/' {
+		file = file[1:]
+	}

-	runtime.GC()
-	pprof.WriteHeapProfile(w)
+	if len(file) == 0 {
+		file = "index.html"
+	}
+
+	s.mut.RLock()
+	theme := s.theme
+	modified := s.lastModified
+	s.mut.RUnlock()
+
+	// Check for an override for the current theme.
+	if s.assetDir != "" {
+		p := filepath.Join(s.assetDir, s.theme, filepath.FromSlash(file))
+		if _, err := os.Stat(p); err == nil {
+			http.ServeFile(w, r, p)
+			return
+		}
+	}
+
+	// Check for a compiled in asset for the current theme.
+	bs, ok := s.assets[theme+"/"+file]
+	if !ok {
+		// Check for an overridden default asset.
+		if s.assetDir != "" {
+			p := filepath.Join(s.assetDir, config.DefaultTheme, filepath.FromSlash(file))
+			if _, err := os.Stat(p); err == nil {
+				http.ServeFile(w, r, p)
+				return
+			}
+		}
+
+		// Check for a compiled in default asset.
+		bs, ok = s.assets[config.DefaultTheme+"/"+file]
+		if !ok {
+			http.NotFound(w, r)
+			return
+		}
+	}
+
+	if modifiedSince, err := time.Parse(r.Header.Get("If-Modified-Since"), http.TimeFormat); err == nil && modified.Before(modifiedSince) {
+		w.WriteHeader(http.StatusNotModified)
+		return
+	}
+
+	mtype := s.mimeTypeForFile(file)
+	if len(mtype) != 0 {
+		w.Header().Set("Content-Type", mtype)
+	}
+	if strings.Contains(r.Header.Get("Accept-Encoding"), "gzip") {
+		w.Header().Set("Content-Encoding", "gzip")
+	} else {
+		// ungzip if browser not send gzip accepted header
+		var gr *gzip.Reader
+		gr, _ = gzip.NewReader(bytes.NewReader(bs))
+		bs, _ = ioutil.ReadAll(gr)
+		gr.Close()
+	}
+	w.Header().Set("Content-Length", fmt.Sprintf("%d", len(bs)))
+	w.Header().Set("Last-Modified", modified.Format(http.TimeFormat))
+	w.Header().Set("Cache-Control", "public")
+
+	w.Write(bs)
+}
+
+func (s embeddedStatic) mimeTypeForFile(file string) string {
+	// We use a built in table of the common types since the system
+	// TypeByExtension might be unreliable. But if we don't know, we delegate
+	// to the system.
+	ext := filepath.Ext(file)
+	switch ext {
+	case ".htm", ".html":
+		return "text/html"
+	case ".css":
+		return "text/css"
+	case ".js":
+		return "application/javascript"
+	case ".json":
+		return "application/json"
+	case ".png":
+		return "image/png"
+	case ".ttf":
+		return "application/x-font-ttf"
+	case ".woff":
+		return "application/x-font-woff"
+	case ".svg":
+		return "image/svg+xml"
+	default:
+		return mime.TypeByExtension(ext)
+	}
+}
+
+// VerifyConfiguration implements the config.Committer interface
+func (s *embeddedStatic) VerifyConfiguration(from, to config.Configuration) error {
+	return nil
+}
+
+// CommitConfiguration implements the config.Committer interface
+func (s *embeddedStatic) CommitConfiguration(from, to config.Configuration) bool {
+	s.mut.Lock()
+	if s.theme != to.GUI.Theme {
+		s.theme = to.GUI.Theme
+		s.lastModified = time.Now()
+	}
+	s.mut.Unlock()
+
+	return true
+}
+
+func (s *embeddedStatic) String() string {
+	return fmt.Sprintf("embeddedStatic@%p", s)
 }

 func (s *apiService) toNeedSlice(fs []db.FileInfoTruncated) []jsonDBFileInfo {
@@ -1229,17 +1315,13 @@ type jsonFileInfo protocol.FileInfo

 func (f jsonFileInfo) MarshalJSON() ([]byte, error) {
 	return json.Marshal(map[string]interface{}{
-		"name":          f.Name,
-		"type":          f.Type,
-		"size":          f.Size,
-		"permissions":   fmt.Sprintf("%#o", f.Permissions),
-		"deleted":       f.Deleted,
-		"invalid":       f.Invalid,
-		"noPermissions": f.NoPermissions,
-		"modified":      protocol.FileInfo(f).ModTime(),
-		"sequence":      f.Sequence,
-		"numBlocks":     len(f.Blocks),
-		"version":       jsonVersionVector(f.Version),
+		"name":         f.Name,
+		"size":         protocol.FileInfo(f).Size(),
+		"flags":        fmt.Sprintf("%#o", f.Flags),
+		"modified":     time.Unix(f.Modified, 0),
+		"localVersion": f.LocalVersion,
+		"numBlocks":    len(f.Blocks),
+		"version":      jsonVersionVector(f.Version),
 	})
 }

@@ -1247,23 +1329,20 @@ type jsonDBFileInfo db.FileInfoTruncated

 func (f jsonDBFileInfo) MarshalJSON() ([]byte, error) {
 	return json.Marshal(map[string]interface{}{
-		"name":          f.Name,
-		"type":          f.Type,
-		"size":          f.Size,
-		"permissions":   fmt.Sprintf("%#o", f.Permissions),
-		"deleted":       f.Deleted,
-		"invalid":       f.Invalid,
-		"noPermissions": f.NoPermissions,
-		"modified":      db.FileInfoTruncated(f).ModTime(),
-		"sequence":      f.Sequence,
+		"name":         f.Name,
+		"size":         db.FileInfoTruncated(f).Size(),
+		"flags":        fmt.Sprintf("%#o", f.Flags),
+		"modified":     time.Unix(f.Modified, 0),
+		"localVersion": f.LocalVersion,
+		"version":      jsonVersionVector(f.Version),
 	})
 }

 type jsonVersionVector protocol.Vector

 func (v jsonVersionVector) MarshalJSON() ([]byte, error) {
-	res := make([]string, len(v.Counters))
-	for i, c := range v.Counters {
+	res := make([]string, len(v))
+	for i, c := range v {
 		res[i] = fmt.Sprintf("%v:%d", c.ID, c.Value)
 	}
 	return json.Marshal(res)
@@ -9,14 +9,15 @@ package main
 import (
 	"bytes"
 	"encoding/base64"
+	"math/rand"
 	"net/http"
 	"strings"
 	"time"

 	"github.com/syncthing/syncthing/lib/config"
 	"github.com/syncthing/syncthing/lib/events"
-	"github.com/syncthing/syncthing/lib/rand"
 	"github.com/syncthing/syncthing/lib/sync"
+	"github.com/syncthing/syncthing/lib/util"
 	"golang.org/x/crypto/bcrypt"
 )

@@ -113,7 +114,7 @@ func basicAuthAndSessionMiddleware(cookieName string, cfg config.GUIConfiguratio
 		return

 	passwordOK:
-		sessionid := rand.String(32)
+		sessionid := util.RandomString(32)
 		sessionsMut.Lock()
 		sessions[sessionid] = true
 		sessionsMut.Unlock()
@@ -15,8 +15,8 @@ import (

 	"github.com/syncthing/syncthing/lib/config"
 	"github.com/syncthing/syncthing/lib/osutil"
-	"github.com/syncthing/syncthing/lib/rand"
 	"github.com/syncthing/syncthing/lib/sync"
+	"github.com/syncthing/syncthing/lib/util"
 )

 // csrfTokens is a list of valid tokens. It is sorted so that the most
@@ -41,15 +41,7 @@ func csrfMiddleware(unique string, prefix string, cfg config.GUIConfiguration, n
 			return
 		}

-		if strings.HasPrefix(r.URL.Path, "/rest/debug") {
-			// Debugging functions are only available when explicitly
-			// enabled, and can be accessed without a CSRF token
-			next.ServeHTTP(w, r)
-			return
-		}
-
-		// Allow requests for anything not under the protected path prefix,
-		// and set a CSRF cookie if there isn't already a valid one.
+		// Allow requests for the front page, and set a CSRF cookie if there isn't already a valid one.
 		if !strings.HasPrefix(r.URL.Path, prefix) {
 			cookie, err := r.Cookie("CSRF-Token-" + unique)
 			if err != nil || !validCsrfToken(cookie.Value) {
@@ -64,6 +56,18 @@ func csrfMiddleware(unique string, prefix string, cfg config.GUIConfiguration, n
 			return
 		}

+		if r.Method == "GET" {
+			// Allow GET requests unconditionally, but if we got the CSRF
+			// token cookie do the verification anyway so we keep the
+			// csrfTokens list sorted by recent usage. We don't care about the
+			// outcome of the validity check.
+			if cookie, err := r.Cookie("CSRF-Token-" + unique); err == nil {
+				validCsrfToken(cookie.Value)
+			}
+			next.ServeHTTP(w, r)
+			return
+		}
+
 		// Verify the CSRF token
 		token := r.Header.Get("X-CSRF-Token-" + unique)
 		if !validCsrfToken(token) {
@@ -94,7 +98,7 @@ func validCsrfToken(token string) bool {
 }

 func newCsrfToken() string {
-	token := rand.String(32)
+	token := util.RandomString(32)

 	csrfMut.Lock()
 	csrfTokens = append([]string{token}, csrfTokens...)
@@ -78,7 +78,7 @@ func trackCPUUsage() {
 	var prevTime = time.Now().UnixNano()
 	var rusage prusage_t
 	var pid = os.Getpid()
-	for range time.NewTicker(time.Second).C {
+	for _ = range time.NewTicker(time.Second).C {
 		err := solarisPrusage(pid, &rusage)
 		if err != nil {
 			l.Warnln("getting prusage:", err)
@@ -1,176 +0,0 @@
-// Copyright (C) 2014 The Syncthing Authors.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at http://mozilla.org/MPL/2.0/.
-
-package main
-
-import (
-	"bytes"
-	"compress/gzip"
-	"fmt"
-	"io/ioutil"
-	"mime"
-	"net/http"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/syncthing/syncthing/lib/auto"
-	"github.com/syncthing/syncthing/lib/config"
-	"github.com/syncthing/syncthing/lib/sync"
-)
-
-type staticsServer struct {
-	assetDir        string
-	assets          map[string][]byte
-	availableThemes []string
-
-	mut   sync.RWMutex
-	theme string
-}
-
-func newStaticsServer(theme, assetDir string) *staticsServer {
-	s := &staticsServer{
-		assetDir: assetDir,
-		assets:   auto.Assets(),
-		mut:      sync.NewRWMutex(),
-		theme:    theme,
-	}
-
-	seen := make(map[string]struct{})
-	// Load themes from compiled in assets.
-	for file := range auto.Assets() {
-		theme := strings.Split(file, "/")[0]
-		if _, ok := seen[theme]; !ok {
-			seen[theme] = struct{}{}
-			s.availableThemes = append(s.availableThemes, theme)
-		}
-	}
-	if assetDir != "" {
-		// Load any extra themes from the asset override dir.
-		for _, dir := range dirNames(assetDir) {
-			if _, ok := seen[dir]; !ok {
-				seen[dir] = struct{}{}
-				s.availableThemes = append(s.availableThemes, dir)
-			}
-		}
-	}
-
-	return s
-}
-
-func (s *staticsServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	switch r.URL.Path {
-	case "/themes.json":
-		s.serveThemes(w, r)
-	default:
-		s.serveAsset(w, r)
-	}
-}
-
-func (s *staticsServer) serveAsset(w http.ResponseWriter, r *http.Request) {
-	file := r.URL.Path
-
-	if file[0] == '/' {
-		file = file[1:]
-	}
-
-	if len(file) == 0 {
-		file = "index.html"
-	}
-
-	s.mut.RLock()
-	theme := s.theme
-	s.mut.RUnlock()
-
-	// Check for an override for the current theme.
-	if s.assetDir != "" {
-		p := filepath.Join(s.assetDir, theme, filepath.FromSlash(file))
-		if _, err := os.Stat(p); err == nil {
-			http.ServeFile(w, r, p)
-			return
-		}
-	}
-
-	// Check for a compiled in asset for the current theme.
-	bs, ok := s.assets[theme+"/"+file]
-	if !ok {
-		// Check for an overridden default asset.
-		if s.assetDir != "" {
-			p := filepath.Join(s.assetDir, config.DefaultTheme, filepath.FromSlash(file))
-			if _, err := os.Stat(p); err == nil {
-				http.ServeFile(w, r, p)
-				return
-			}
-		}
-
-		// Check for a compiled in default asset.
-		bs, ok = s.assets[config.DefaultTheme+"/"+file]
-		if !ok {
-			http.NotFound(w, r)
-			return
-		}
-	}
-
-	mtype := s.mimeTypeForFile(file)
-	if len(mtype) != 0 {
-		w.Header().Set("Content-Type", mtype)
-	}
-	if strings.Contains(r.Header.Get("Accept-Encoding"), "gzip") {
-		w.Header().Set("Content-Encoding", "gzip")
-	} else {
-		// ungzip if browser not send gzip accepted header
-		var gr *gzip.Reader
-		gr, _ = gzip.NewReader(bytes.NewReader(bs))
-		bs, _ = ioutil.ReadAll(gr)
-		gr.Close()
-	}
-	w.Header().Set("Content-Length", fmt.Sprintf("%d", len(bs)))
-
-	w.Write(bs)
-}
-
-func (s *staticsServer) serveThemes(w http.ResponseWriter, r *http.Request) {
-	sendJSON(w, map[string][]string{
-		"themes": s.availableThemes,
-	})
-}
-
-func (s *staticsServer) mimeTypeForFile(file string) string {
-	// We use a built in table of the common types since the system
-	// TypeByExtension might be unreliable. But if we don't know, we delegate
-	// to the system.
-	ext := filepath.Ext(file)
-	switch ext {
-	case ".htm", ".html":
-		return "text/html"
-	case ".css":
-		return "text/css"
-	case ".js":
-		return "application/javascript"
-	case ".json":
-		return "application/json"
-	case ".png":
-		return "image/png"
-	case ".ttf":
-		return "application/x-font-ttf"
-	case ".woff":
-		return "application/x-font-woff"
-	case ".svg":
-		return "image/svg+xml"
-	default:
-		return mime.TypeByExtension(ext)
-	}
-}
-
-func (s *staticsServer) setTheme(theme string) {
-	s.mut.Lock()
-	s.theme = theme
-	s.mut.Unlock()
-}
-
-func (s *staticsServer) String() string {
-	return fmt.Sprintf("staticsServer@%p", s)
-}
@@ -9,9 +9,7 @@ package main
 import (
 	"bytes"
 	"compress/gzip"
-	"encoding/json"
 	"fmt"
-	"io"
 	"io/ioutil"
 	"net"
 	"net/http"
@@ -69,8 +67,11 @@ func TestStopAfterBrokenConfig(t *testing.T) {
 	}
 	w := config.Wrap("/dev/null", cfg)

-	srv := newAPIService(protocol.LocalDeviceID, w, "../../test/h1/https-cert.pem", "../../test/h1/https-key.pem", "", nil, nil, nil, nil, nil, nil)
-	srv.started = make(chan string)
+	srv, err := newAPIService(protocol.LocalDeviceID, w, "../../test/h1/https-cert.pem", "../../test/h1/https-key.pem", "", nil, nil, nil, nil, nil, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	srv.started = make(chan struct{})

 	sup := suture.NewSimple("test")
 	sup.Add(srv)
@@ -88,8 +89,8 @@ func TestStopAfterBrokenConfig(t *testing.T) {
 			RawUseTLS:  false,
 		},
 	}
-	if err := srv.VerifyConfiguration(cfg, newCfg); err == nil {
-		t.Fatal("Verify config should have failed")
+	if srv.CommitConfiguration(cfg, newCfg) {
+		t.Fatal("Config commit should have failed")
 	}

 	// Nonetheless, it should be fine to Stop() it without panic.
@@ -117,7 +118,7 @@ func TestAssetsDir(t *testing.T) {
 	gw.Close()
 	foo := buf.Bytes()

-	e := &staticsServer{
+	e := embeddedStatic{
 		theme:    "foo",
 		mut:      sync.NewRWMutex(),
 		assetDir: "testdata",
@@ -188,9 +189,7 @@ type httpTestCase struct {
 }

 func TestAPIServiceRequests(t *testing.T) {
-	const testAPIKey = "foobarbaz"
 	cfg := new(mockedConfig)
-	cfg.gui.APIKey = testAPIKey
 	baseURL, err := startHTTP(cfg)
 	if err != nil {
 		t.Fatal(err)
@@ -345,13 +344,13 @@ func TestAPIServiceRequests(t *testing.T) {

 	for _, tc := range cases {
 		t.Log("Testing", tc.URL, "...")
-		testHTTPRequest(t, baseURL, tc, testAPIKey)
+		testHTTPRequest(t, baseURL, tc)
 	}
 }

 // testHTTPRequest tries the given test case, comparing the result code,
 // content type, and result prefix.
-func testHTTPRequest(t *testing.T, baseURL string, tc httpTestCase, apikey string) {
+func testHTTPRequest(t *testing.T, baseURL string, tc httpTestCase) {
 	timeout := time.Second
 	if tc.Timeout > 0 {
 		timeout = tc.Timeout
@@ -360,14 +359,7 @@ func testHTTPRequest(t *testing.T, baseURL string, tc httpTestCase, apikey strin
 		Timeout: timeout,
 	}

-	req, err := http.NewRequest("GET", baseURL+tc.URL, nil)
-	if err != nil {
-		t.Errorf("Unexpected error requesting %s: %v", tc.URL, err)
-		return
-	}
-	req.Header.Set("X-API-Key", apikey)
-
-	resp, err := cli.Do(req)
+	resp, err := cli.Get(baseURL + tc.URL)
 	if err != nil {
 		t.Errorf("Unexpected error requesting %s: %v", tc.URL, err)
 		return
@@ -408,7 +400,7 @@ func TestHTTPLogin(t *testing.T) {

 	// Verify rejection when not using authorization

-	req, _ := http.NewRequest("GET", baseURL, nil)
+	req, _ := http.NewRequest("GET", baseURL+"/rest/system/status", nil)
 	resp, err := http.DefaultClient.Do(req)
 	if err != nil {
 		t.Fatal(err)
@@ -473,196 +465,29 @@ func startHTTP(cfg *mockedConfig) (string, error) {
 	connections := new(mockedConnections)
 	errorLog := new(mockedLoggerRecorder)
 	systemLog := new(mockedLoggerRecorder)
-	addrChan := make(chan string)

 	// Instantiate the API service
-	svc := newAPIService(protocol.LocalDeviceID, cfg, httpsCertFile, httpsKeyFile, assetDir, model,
+	svc, err := newAPIService(protocol.LocalDeviceID, cfg, httpsCertFile, httpsKeyFile, assetDir, model,
 		eventSub, discoverer, connections, errorLog, systemLog)
-	svc.started = addrChan
+	if err != nil {
+		return "", err
+	}
+
+	// Make sure the API service is listening, and get the URL to use.
+	addr := svc.listener.Addr()
+	if addr == nil {
+		return "", fmt.Errorf("Nil listening address from API service")
+	}
+	tcpAddr, err := net.ResolveTCPAddr("tcp", addr.String())
+	if err != nil {
+		return "", fmt.Errorf("Weird address from API service: %v", err)
+	}
+	baseURL := fmt.Sprintf("http://127.0.0.1:%d", tcpAddr.Port)

 	// Actually start the API service
 	supervisor := suture.NewSimple("API test")
 	supervisor.Add(svc)
 	supervisor.ServeBackground()

-	// Make sure the API service is listening, and get the URL to use.
-	addr := <-addrChan
-	tcpAddr, err := net.ResolveTCPAddr("tcp", addr)
-	if err != nil {
-		return "", fmt.Errorf("Weird address from API service: %v", err)
-	}
-	baseURL := fmt.Sprintf("http://127.0.0.1:%d", tcpAddr.Port)
-
 	return baseURL, nil
 }
-
-func TestCSRFRequired(t *testing.T) {
-	const testAPIKey = "foobarbaz"
-	cfg := new(mockedConfig)
-	cfg.gui.APIKey = testAPIKey
-	baseURL, err := startHTTP(cfg)
-
-	cli := &http.Client{
-		Timeout: time.Second,
-	}
-
-	// Getting the base URL (i.e. "/") should succeed.
-
-	resp, err := cli.Get(baseURL)
-	if err != nil {
-		t.Fatal("Unexpected error from getting base URL:", err)
-	}
-	resp.Body.Close()
-	if resp.StatusCode != http.StatusOK {
-		t.Fatal("Getting base URL should succeed, not", resp.Status)
-	}
-
-	// Find the returned CSRF token for future use
-
-	var csrfTokenName, csrfTokenValue string
-	for _, cookie := range resp.Cookies() {
-		if strings.HasPrefix(cookie.Name, "CSRF-Token") {
-			csrfTokenName = cookie.Name
-			csrfTokenValue = cookie.Value
-			break
-		}
-	}
-
-	// Calling on /rest without a token should fail
-
-	resp, err = cli.Get(baseURL + "/rest/system/config")
-	if err != nil {
-		t.Fatal("Unexpected error from getting /rest/system/config:", err)
-	}
-	resp.Body.Close()
-	if resp.StatusCode != http.StatusForbidden {
-		t.Fatal("Getting /rest/system/config without CSRF token should fail, not", resp.Status)
-	}
-
-	// Calling on /rest with a token should succeed
-
-	req, _ := http.NewRequest("GET", baseURL+"/rest/system/config", nil)
-	req.Header.Set("X-"+csrfTokenName, csrfTokenValue)
-	resp, err = cli.Do(req)
-	if err != nil {
-		t.Fatal("Unexpected error from getting /rest/system/config:", err)
-	}
-	resp.Body.Close()
-	if resp.StatusCode != http.StatusOK {
-		t.Fatal("Getting /rest/system/config with CSRF token should succeed, not", resp.Status)
-	}
-
-	// Calling on /rest with the API key should succeed
-
-	req, _ = http.NewRequest("GET", baseURL+"/rest/system/config", nil)
-	req.Header.Set("X-API-Key", testAPIKey)
-	resp, err = cli.Do(req)
-	if err != nil {
-		t.Fatal("Unexpected error from getting /rest/system/config:", err)
-	}
-	resp.Body.Close()
-	if resp.StatusCode != http.StatusOK {
-		t.Fatal("Getting /rest/system/config with API key should succeed, not", resp.Status)
-	}
-}
-
-func TestRandomString(t *testing.T) {
-	const testAPIKey = "foobarbaz"
-	cfg := new(mockedConfig)
-	cfg.gui.APIKey = testAPIKey
-	baseURL, err := startHTTP(cfg)
-	if err != nil {
-		t.Fatal(err)
-	}
-	cli := &http.Client{
-		Timeout: time.Second,
-	}
-
-	// The default should be to return a 32 character random string
-
-	for _, url := range []string{"/rest/svc/random/string", "/rest/svc/random/string?length=-1", "/rest/svc/random/string?length=yo"} {
-		req, _ := http.NewRequest("GET", baseURL+url, nil)
-		req.Header.Set("X-API-Key", testAPIKey)
-		resp, err := cli.Do(req)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		var res map[string]string
-		if err := json.NewDecoder(resp.Body).Decode(&res); err != nil {
-			t.Fatal(err)
-		}
-		if len(res["random"]) != 32 {
-			t.Errorf("Expected 32 random characters, got %q of length %d", res["random"], len(res["random"]))
-		}
-	}
-
-	// We can ask for a different length if we like
-
-	req, _ := http.NewRequest("GET", baseURL+"/rest/svc/random/string?length=27", nil)
-	req.Header.Set("X-API-Key", testAPIKey)
-	resp, err := cli.Do(req)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	var res map[string]string
-	if err := json.NewDecoder(resp.Body).Decode(&res); err != nil {
-		t.Fatal(err)
-	}
-	if len(res["random"]) != 27 {
-		t.Errorf("Expected 27 random characters, got %q of length %d", res["random"], len(res["random"]))
-	}
-}
-
-func TestConfigPostOK(t *testing.T) {
-	cfg := bytes.NewBuffer([]byte(`{
-		"version": 15,
-		"folders": [
-			{"id": "foo"}
-		]
-	}`))
-
-	resp, err := testConfigPost(cfg)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if resp.StatusCode != http.StatusOK {
-		t.Error("Expected 200 OK, not", resp.Status)
-	}
-}
-
-func TestConfigPostDupFolder(t *testing.T) {
-	cfg := bytes.NewBuffer([]byte(`{
-		"version": 15,
-		"folders": [
-			{"id": "foo"},
-			{"id": "foo"}
-		]
-	}`))
-
-	resp, err := testConfigPost(cfg)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if resp.StatusCode != http.StatusBadRequest {
-		t.Error("Expected 400 Bad Request, not", resp.Status)
-	}
-}
-
-func testConfigPost(data io.Reader) (*http.Response, error) {
-	const testAPIKey = "foobarbaz"
-	cfg := new(mockedConfig)
-	cfg.gui.APIKey = testAPIKey
-	baseURL, err := startHTTP(cfg)
-	if err != nil {
-		return nil, err
-	}
-	cli := &http.Client{
-		Timeout: time.Second,
-	}
-
-	req, _ := http.NewRequest("POST", baseURL+"/rest/system/config", data)
-	req.Header.Set("X-API-Key", testAPIKey)
-	return cli.Do(req)
-}
@@ -21,7 +21,7 @@ func trackCPUUsage() {
 	var prevUsage int64
 	var prevTime = time.Now().UnixNano()
 	var rusage syscall.Rusage
-	for range time.NewTicker(time.Second).C {
+	for _ = range time.NewTicker(time.Second).C {
 		syscall.Getrusage(syscall.RUSAGE_SELF, &rusage)
 		curTime := time.Now().UnixNano()
 		timeDiff := curTime - prevTime
@@ -34,7 +34,7 @@ func trackCPUUsage() {
 	prevTime := ctime.Nanoseconds()
 	prevUsage := ktime.Nanoseconds() + utime.Nanoseconds() // Always overflows

-	for range time.NewTicker(time.Second).C {
+	for _ = range time.NewTicker(time.Second).C {
 		err := syscall.GetProcessTimes(handle, &ctime, &etime, &ktime, &utime)
 		if err != nil {
 			continue
@@ -48,7 +48,7 @@ var locations = map[locationEnum]string{
 	locKeyFile:       "${config}/key.pem",
 	locHTTPSCertFile: "${config}/https-cert.pem",
 	locHTTPSKeyFile:  "${config}/https-key.pem",
-	locDatabase:      "${config}/index-v0.14.0.db",
+	locDatabase:      "${config}/index-v0.13.0.db",
 	locLogFile:       "${config}/syncthing.log", // -logfile on Windows
 	locCsrfTokens:    "${config}/csrftokens.txt",
 	locPanicLog:      "${config}/panic-${timestamp}.log",
@@ -16,10 +16,9 @@ import (
 	"log"
 	"net"
 	"net/http"
-	"net/url"
+	_ "net/http/pprof"
 	"os"
 	"os/signal"
-	"path"
 	"path/filepath"
 	"regexp"
 	"runtime"
@@ -40,17 +39,17 @@ import (
 	"github.com/syncthing/syncthing/lib/model"
 	"github.com/syncthing/syncthing/lib/osutil"
 	"github.com/syncthing/syncthing/lib/protocol"
-	"github.com/syncthing/syncthing/lib/rand"
 	"github.com/syncthing/syncthing/lib/symlinks"
 	"github.com/syncthing/syncthing/lib/tlsutil"
 	"github.com/syncthing/syncthing/lib/upgrade"
+	"github.com/syncthing/syncthing/lib/util"

 	"github.com/thejerf/suture"
 )

 var (
 	Version           = "unknown-dev"
-	Codename          = "Dysprosium Dragonfly"
+	Codename          = "Copper Cockroach"
 	BuildStamp        = "0"
 	BuildDate         time.Time
 	BuildHost         = "unknown"
@@ -477,13 +476,8 @@ func performUpgrade(release upgrade.Release) {

 func upgradeViaRest() error {
 	cfg, _ := loadConfig()
-	u, err := url.Parse(cfg.GUI().URL())
-	if err != nil {
-		return err
-	}
-	u.Path = path.Join(u.Path, "rest/system/upgrade")
-	target := u.String()
-	r, _ := http.NewRequest("POST", target, nil)
+	target := cfg.GUI().URL()
+	r, _ := http.NewRequest("POST", target+"/rest/system/upgrade", nil)
 	r.Header.Set("X-API-Key", cfg.GUI().APIKey)

 	tr := &http.Transport{
@@ -538,10 +532,8 @@ func syncthingMain(runtimeOptions RuntimeOptions) {
 	errors := logger.NewRecorder(l, logger.LevelWarn, maxSystemErrors, 0)
 	systemLog := logger.NewRecorder(l, logger.LevelDebug, maxSystemLog, initialSystemLog)

-	// Event subscription for the API; must start early to catch the early
-	// events. The LocalChangeDetected event might overwhelm the event
-	// receiver in some situations so we will not subscribe to it here.
-	apiSub := events.NewBufferedSubscription(events.Default.Subscribe(events.AllEvents&^events.LocalChangeDetected), 1000)
+	// Event subscription for the API; must start early to catch the early events.
+	apiSub := events.NewBufferedSubscription(events.Default.Subscribe(events.AllEvents), 1000)

 	if len(os.Getenv("GOMAXPROCS")) == 0 {
 		runtime.GOMAXPROCS(runtime.NumCPU())
@@ -663,14 +655,8 @@ func syncthingMain(runtimeOptions RuntimeOptions) {
 		}
 	}

-	if cfg.Raw().OriginalVersion == 15 {
-		// The config version 15->16 migration is about handling ignores and
-		// delta indexes and requires that we drop existing indexes that
-		// have been incorrectly ignore filtered.
-		ldb.DropDeltaIndexIDs()
-	}
-
 	m := model.NewModel(cfg, myID, myDeviceName(cfg), "syncthing", Version, ldb, protectedFiles)
+	cfg.Subscribe(m)

 	if t := os.Getenv("STDEADLOCKTIMEOUT"); len(t) > 0 {
 		it, err := strconv.Atoi(t)
@@ -687,9 +673,17 @@ func syncthingMain(runtimeOptions RuntimeOptions) {
 		}
 	}

-	// Add and start folders
+	// Clear out old indexes for other devices. Otherwise we'll start up and
+	// start needing a bunch of files which are nowhere to be found. This
+	// needs to be changed when we correctly do persistent indexes.
 	for _, folderCfg := range cfg.Folders() {
 		m.AddFolder(folderCfg)
+		for _, device := range folderCfg.DeviceIDs() {
+			if device == myID {
+				continue
+			}
+			m.Index(device, folderCfg.ID, nil, 0, nil)
+		}
 		m.StartFolder(folderCfg.ID)
 	}

@@ -766,7 +760,7 @@ func syncthingMain(runtimeOptions RuntimeOptions) {
 		if opts.URUniqueID == "" {
 			// Previously the ID was generated from the node ID. We now need
 			// to generate a new one.
-			opts.URUniqueID = rand.String(8)
+			opts.URUniqueID = util.RandomString(8)
 			cfg.SetOptions(opts)
 			cfg.Save()
 		}
@@ -784,8 +778,10 @@ func syncthingMain(runtimeOptions RuntimeOptions) {
 	if opts.AutoUpgradeIntervalH > 0 {
 		if noUpgrade {
 			l.Infof("No automatic upgrades; STNOUPGRADE environment variable defined.")
-		} else {
+		} else if IsRelease {
 			go autoUpgrade(cfg)
+		} else {
+			l.Infof("No automatic upgrades; %s is not a release version.", Version)
 		}
 	}

@@ -861,6 +857,7 @@ func loadConfig() (*config.Wrapper, error) {
 	cfg, err := config.Load(cfgFile, myID)

 	if err != nil {
+		l.Infoln("Error loading config file; using defaults for now")
 		myName, _ := os.Hostname()
 		newCfg := defaultConfig(myName)
 		cfg = config.Wrap(cfgFile, newCfg)
@@ -930,7 +927,10 @@ func setupGUI(mainService *suture.Supervisor, cfg *config.Wrapper, m *model.Mode
 		l.Warnln("Insecure admin access is enabled.")
 	}

-	api := newAPIService(myID, cfg, locations[locHTTPSCertFile], locations[locHTTPSKeyFile], runtimeOptions.assetDir, m, apiSub, discoverer, connectionsService, errors, systemLog)
+	api, err := newAPIService(myID, cfg, locations[locHTTPSCertFile], locations[locHTTPSKeyFile], runtimeOptions.assetDir, m, apiSub, discoverer, connectionsService, errors, systemLog)
+	if err != nil {
+		l.Fatalln("Cannot start GUI:", err)
+	}
 	cfg.Subscribe(api)
 	mainService.Add(api)

@@ -946,7 +946,7 @@ func defaultConfig(myName string) config.Configuration {

 	if !noDefaultFolder {
 		l.Infoln("Default folder created and/or linked to new config")
-		folderID := strings.ToLower(rand.String(5) + "-" + rand.String(5))
+		folderID := util.RandomString(5) + "-" + util.RandomString(5)
 		defaultFolder = config.NewFolderConfiguration(folderID, locations[locDefFolder])
 		defaultFolder.Label = "Default Folder (" + folderID + ")"
 		defaultFolder.RescanIntervalS = 60
@@ -1124,16 +1124,13 @@ func autoUpgrade(cfg *config.Wrapper) {
 // suitable time after they have gone out of fashion.
 func cleanConfigDirectory() {
 	patterns := map[string]time.Duration{
-		"panic-*.log":        7 * 24 * time.Hour,  // keep panic logs for a week
-		"audit-*.log":        7 * 24 * time.Hour,  // keep audit logs for a week
-		"index":              14 * 24 * time.Hour, // keep old index format for two weeks
-		"index-v0.11.0.db":   14 * 24 * time.Hour, // keep old index format for two weeks
-		"index-v0.13.0.db":   14 * 24 * time.Hour, // keep old index format for two weeks
-		"index*.converted":   14 * 24 * time.Hour, // keep old converted indexes for two weeks
-		"config.xml.v*":      30 * 24 * time.Hour, // old config versions for a month
-		"*.idx.gz":           30 * 24 * time.Hour, // these should for sure no longer exist
-		"backup-of-v0.8":     30 * 24 * time.Hour, // these neither
-		"tmp-index-sorter.*": time.Minute,         // these should never exist on startup
+		"panic-*.log":      7 * 24 * time.Hour,  // keep panic logs for a week
+		"audit-*.log":      7 * 24 * time.Hour,  // keep audit logs for a week
+		"index":            14 * 24 * time.Hour, // keep old index format for two weeks
+		"index*.converted": 14 * 24 * time.Hour, // keep old converted indexes for two weeks
+		"config.xml.v*":    30 * 24 * time.Hour, // old config versions for a month
+		"*.idx.gz":         30 * 24 * time.Hour, // these should for sure no longer exist
+		"backup-of-v0.8":   30 * 24 * time.Hour, // these neither
 	}

 	for pat, dur := range patterns {
@@ -7,12 +7,151 @@
 package main

 import (
+	"os"
 	"testing"

 	"github.com/syncthing/syncthing/lib/config"
+	"github.com/syncthing/syncthing/lib/db"
+	"github.com/syncthing/syncthing/lib/model"
 	"github.com/syncthing/syncthing/lib/protocol"
 )

+func TestFolderErrors(t *testing.T) {
+	// This test intentionally avoids starting the folders. If they are
+	// started, they will perform an initial scan, which will create missing
+	// folder markers and race with the stuff we do in the test.
+
+	fcfg := config.FolderConfiguration{
+		ID:      "folder",
+		RawPath: "testdata/testfolder",
+	}
+	cfg := config.Wrap("/tmp/test", config.Configuration{
+		Folders: []config.FolderConfiguration{fcfg},
+	})
+
+	for _, file := range []string{".stfolder", "testfolder/.stfolder", "testfolder"} {
+		if err := os.Remove("testdata/" + file); err != nil && !os.IsNotExist(err) {
+			t.Fatal(err)
+		}
+	}
+
+	ldb := db.OpenMemory()
+
+	// Case 1 - new folder, directory and marker created
+
+	m := model.NewModel(cfg, protocol.LocalDeviceID, "device", "syncthing", "dev", ldb, nil)
+	m.AddFolder(fcfg)
+
+	if err := m.CheckFolderHealth("folder"); err != nil {
+		t.Error("Unexpected error", cfg.Folders()["folder"].Invalid)
+	}
+
+	s, err := os.Stat("testdata/testfolder")
+	if err != nil || !s.IsDir() {
+		t.Error(err)
+	}
+
+	_, err = os.Stat("testdata/testfolder/.stfolder")
+	if err != nil {
+		t.Error(err)
+	}
+
+	if err := os.Remove("testdata/testfolder/.stfolder"); err != nil {
+		t.Fatal(err)
+	}
+	if err := os.Remove("testdata/testfolder/"); err != nil {
+		t.Fatal(err)
+	}
+
+	// Case 2 - new folder, marker created
+
+	fcfg.RawPath = "testdata/"
+	cfg = config.Wrap("/tmp/test", config.Configuration{
+		Folders: []config.FolderConfiguration{fcfg},
+	})
+
+	m = model.NewModel(cfg, protocol.LocalDeviceID, "device", "syncthing", "dev", ldb, nil)
+	m.AddFolder(fcfg)
+
+	if err := m.CheckFolderHealth("folder"); err != nil {
+		t.Error("Unexpected error", cfg.Folders()["folder"].Invalid)
+	}
+
+	_, err = os.Stat("testdata/.stfolder")
+	if err != nil {
+		t.Error(err)
+	}
+
+	if err := os.Remove("testdata/.stfolder"); err != nil {
+		t.Fatal(err)
+	}
+
+	// Case 3 - Folder marker missing
+
+	set := db.NewFileSet("folder", ldb)
+	set.Update(protocol.LocalDeviceID, []protocol.FileInfo{
+		{Name: "dummyfile"},
+	})
+
+	m = model.NewModel(cfg, protocol.LocalDeviceID, "device", "syncthing", "dev", ldb, nil)
+	m.AddFolder(fcfg)
+
+	if err := m.CheckFolderHealth("folder"); err == nil || err.Error() != "folder marker missing" {
+		t.Error("Incorrect error: Folder marker missing !=", m.CheckFolderHealth("folder"))
+	}
+
+	// Case 3.1 - recover after folder marker missing
+
+	if err = fcfg.CreateMarker(); err != nil {
+		t.Error(err)
+	}
+
+	if err := m.CheckFolderHealth("folder"); err != nil {
+		t.Error("Unexpected error", cfg.Folders()["folder"].Invalid)
+	}
+
+	// Case 4 - Folder path missing
+
+	if err := os.Remove("testdata/testfolder/.stfolder"); err != nil && !os.IsNotExist(err) {
+		t.Fatal(err)
+	}
+	if err := os.Remove("testdata/testfolder"); err != nil && !os.IsNotExist(err) {
+		t.Fatal(err)
+	}
+
+	fcfg.RawPath = "testdata/testfolder"
+	cfg = config.Wrap("testdata/subfolder", config.Configuration{
+		Folders: []config.FolderConfiguration{fcfg},
+	})
+
+	m = model.NewModel(cfg, protocol.LocalDeviceID, "device", "syncthing", "dev", ldb, nil)
+	m.AddFolder(fcfg)
+
+	if err := m.CheckFolderHealth("folder"); err == nil || err.Error() != "folder path missing" {
+		t.Error("Incorrect error: Folder path missing !=", m.CheckFolderHealth("folder"))
+	}
+
+	// Case 4.1 - recover after folder path missing
+
+	if err := os.Mkdir("testdata/testfolder", 0700); err != nil {
+		t.Fatal(err)
+	}
+
+	if err := m.CheckFolderHealth("folder"); err == nil || err.Error() != "folder marker missing" {
+		t.Error("Incorrect error: Folder marker missing !=", m.CheckFolderHealth("folder"))
+	}
+
+	// Case 4.2 - recover after missing marker
+
+	if err = fcfg.CreateMarker(); err != nil {
+		t.Error(err)
+	}
+
+	if err := m.CheckFolderHealth("folder"); err != nil {
+		t.Error("Unexpected error", cfg.Folders()["folder"].Invalid)
+	}
+}
+
 func TestShortIDCheck(t *testing.T) {
 	cfg := config.Wrap("/tmp/test", config.Configuration{
 		Devices: []config.DeviceConfiguration{
@@ -20,8 +20,9 @@ var (
 func memorySize() (int64, error) {
 	var memoryStatusEx [64]byte
 	binary.LittleEndian.PutUint32(memoryStatusEx[:], 64)
+	p := uintptr(unsafe.Pointer(&memoryStatusEx[0]))

-	ret, _, callErr := syscall.Syscall(uintptr(globalMemoryStatusEx), 1, uintptr(unsafe.Pointer(&memoryStatusEx[0])), 0, 0)
+	ret, _, callErr := syscall.Syscall(uintptr(globalMemoryStatusEx), 1, p, 0, 0)
 	if ret == 0 {
 		return 0, callErr
 	}
@@ -31,8 +31,8 @@ func (c *mockedConfig) Options() config.OptionsConfiguration {
 	return config.OptionsConfiguration{}
 }

-func (c *mockedConfig) Replace(cfg config.Configuration) error {
-	return nil
+func (c *mockedConfig) Replace(cfg config.Configuration) config.CommitResponse {
+	return config.CommitResponse{}
 }

 func (c *mockedConfig) Subscribe(cm config.Committer) {}
@@ -48,7 +48,3 @@ func (c *mockedConfig) Devices() map[protocol.DeviceID]config.DeviceConfiguratio
 func (c *mockedConfig) Save() error {
 	return nil
 }
-
-func (c *mockedConfig) RequiresRestart() bool {
-	return false
-}
@@ -21,8 +21,8 @@ func (m *mockedModel) GlobalDirectoryTree(folder, prefix string, levels int, dir
 	return nil
 }

-func (m *mockedModel) Completion(device protocol.DeviceID, folder string) model.FolderCompletion {
-	return model.FolderCompletion{}
+func (m *mockedModel) Completion(device protocol.DeviceID, folder string) float64 {
+	return 0
 }

 func (m *mockedModel) Override(folder string) {}
@@ -85,7 +85,7 @@ func (m *mockedModel) ScanFolders() map[string]error {
 	return nil
 }

-func (m *mockedModel) ScanFolderSubdirs(folder string, subs []string) error {
+func (m *mockedModel) ScanFolderSubs(folder string, subs []string) error {
 	return nil
 }

@@ -103,11 +103,11 @@ func (m *mockedModel) LocalSize(folder string) (nfiles, deleted int, bytes int64
 	return 0, 0, 0
 }

-func (m *mockedModel) CurrentSequence(folder string) (int64, bool) {
+func (m *mockedModel) CurrentLocalVersion(folder string) (int64, bool) {
 	return 0, false
 }

-func (m *mockedModel) RemoteSequence(folder string) (int64, bool) {
+func (m *mockedModel) RemoteLocalVersion(folder string) (int64, bool) {
 	return 0, false
 }

@@ -10,7 +10,6 @@ import (
 	"time"

 	"github.com/syncthing/syncthing/lib/events"
-	"github.com/syncthing/syncthing/lib/protocol"
 	"github.com/syncthing/syncthing/lib/sync"
 	"github.com/thejerf/suture"
 )
@@ -60,7 +59,7 @@ func (c *folderSummaryService) Stop() {
 // listenForUpdates subscribes to the event bus and makes note of folders that
 // need their data recalculated.
 func (c *folderSummaryService) listenForUpdates() {
-	sub := events.Default.Subscribe(events.LocalIndexUpdated | events.RemoteIndexUpdated | events.StateChanged | events.RemoteDownloadProgress | events.DeviceConnected)
+	sub := events.Default.Subscribe(events.LocalIndexUpdated | events.RemoteIndexUpdated | events.StateChanged)
 	defer events.Default.Unsubscribe(sub)

 	for {
@@ -68,31 +67,8 @@ func (c *folderSummaryService) listenForUpdates() {

 		select {
 		case ev := <-sub.C():
-			if ev.Type == events.DeviceConnected {
-				// When a device connects we schedule a refresh of all
-				// folders shared with that device.
-
-				data := ev.Data.(map[string]string)
-				deviceID, _ := protocol.DeviceIDFromString(data["id"])
-
-				c.foldersMut.Lock()
-			nextFolder:
-				for _, folder := range c.cfg.Folders() {
-					for _, dev := range folder.Devices {
-						if dev.DeviceID == deviceID {
-							c.folders[folder.ID] = struct{}{}
-							continue nextFolder
-						}
-					}
-				}
-				c.foldersMut.Unlock()
-
-				continue
-			}
-
-			// The other events all have a "folder" attribute that they
-			// affect. Whenever the local or remote index is updated for a
-			// given folder we make a note of it.
+			// Whenever the local or remote index is updated for a given
+			// folder we make a note of it.

 			data := ev.Data.(map[string]interface{})
 			folder := data["folder"].(string)
@@ -207,11 +183,9 @@ func (c *folderSummaryService) sendSummary(folder string) {
 		// remote device.
 		comp := c.model.Completion(devCfg.DeviceID, folder)
 		events.Default.Log(events.FolderCompletion, map[string]interface{}{
-			"folder":      folder,
-			"device":      devCfg.DeviceID.String(),
-			"completion":  comp.CompletionPct,
-			"needBytes":   comp.NeedBytes,
-			"globalBytes": comp.GlobalBytes,
+			"folder":     folder,
+			"device":     devCfg.DeviceID.String(),
+			"completion": comp,
 		})
 	}
 }
@@ -72,18 +72,15 @@ func (s *verboseService) formatEvent(ev events.Event) string {

 	case events.Starting:
 		return fmt.Sprintf("Starting up (%s)", ev.Data.(map[string]string)["home"])
-
 	case events.StartupComplete:
 		return "Startup complete"

 	case events.DeviceDiscovered:
 		data := ev.Data.(map[string]interface{})
 		return fmt.Sprintf("Discovered device %v at %v", data["device"], data["addrs"])
-
 	case events.DeviceConnected:
 		data := ev.Data.(map[string]string)
 		return fmt.Sprintf("Connected to device %v at %v (type %s)", data["id"], data["addr"], data["type"])
-
 	case events.DeviceDisconnected:
 		data := ev.Data.(map[string]string)
 		return fmt.Sprintf("Disconnected from device %v", data["id"])
@@ -92,11 +89,6 @@ func (s *verboseService) formatEvent(ev events.Event) string {
 		data := ev.Data.(map[string]interface{})
 		return fmt.Sprintf("Folder %q is now %v", data["folder"], data["to"])

-	case events.LocalChangeDetected:
-		data := ev.Data.(map[string]string)
-		// Local change detected in folder "foo": modified file /Users/jb/whatever
-		return fmt.Sprintf("Local change detected in folder %q: %s %s %s", data["folder"], data["action"], data["type"], data["path"])
-
 	case events.RemoteIndexUpdated:
 		data := ev.Data.(map[string]interface{})
 		return fmt.Sprintf("Device %v sent an index update for %q with %d items", data["device"], data["folder"], data["items"])
@@ -104,7 +96,6 @@ func (s *verboseService) formatEvent(ev events.Event) string {
 	case events.DeviceRejected:
 		data := ev.Data.(map[string]interface{})
 		return fmt.Sprintf("Rejected connection from device %v at %v", data["device"], data["address"])
-
 	case events.FolderRejected:
 		data := ev.Data.(map[string]string)
 		return fmt.Sprintf("Rejected unshared folder %q from device %v", data["folder"], data["device"])
@@ -112,7 +103,6 @@ func (s *verboseService) formatEvent(ev events.Event) string {
 	case events.ItemStarted:
 		data := ev.Data.(map[string]string)
 		return fmt.Sprintf("Started syncing %q / %q (%v %v)", data["folder"], data["item"], data["action"], data["type"])
-
 	case events.ItemFinished:
 		data := ev.Data.(map[string]interface{})
 		if err, ok := data["error"].(*string); ok && err != nil {
@@ -129,18 +119,13 @@ func (s *verboseService) formatEvent(ev events.Event) string {
 	case events.FolderCompletion:
 		data := ev.Data.(map[string]interface{})
 		return fmt.Sprintf("Completion for folder %q on device %v is %v%%", data["folder"], data["device"], data["completion"])
-
 	case events.FolderSummary:
 		data := ev.Data.(map[string]interface{})
-		sum := make(map[string]interface{})
-		for k, v := range data["summary"].(map[string]interface{}) {
-			if k == "invalid" || k == "ignorePatterns" || k == "stateChanged" {
-				continue
-			}
-			sum[k] = v
-		}
-		return fmt.Sprintf("Summary for folder %q is %v", data["folder"], sum)
-
+		sum := data["summary"].(map[string]interface{})
+		delete(sum, "invalid")
+		delete(sum, "ignorePatterns")
+		delete(sum, "stateChanged")
+		return fmt.Sprintf("Summary for folder %q is %v", data["folder"], data["summary"])
 	case events.FolderScanProgress:
 		data := ev.Data.(map[string]interface{})
 		folder := data["folder"].(string)
@@ -157,19 +142,16 @@ func (s *verboseService) formatEvent(ev events.Event) string {
 		data := ev.Data.(map[string]string)
 		device := data["device"]
 		return fmt.Sprintf("Device %v was paused", device)
-
 	case events.DeviceResumed:
 		data := ev.Data.(map[string]string)
 		device := data["device"]
 		return fmt.Sprintf("Device %v was resumed", device)
-
 	case events.ListenAddressesChanged:
 		data := ev.Data.(map[string]interface{})
 		address := data["address"]
 		lan := data["lan"]
 		wan := data["wan"]
 		return fmt.Sprintf("Listen address %s resolution has changed: lan addresses: %s wan addresses: %s", address, lan, wan)
-
 	case events.LoginAttempt:
 		data := ev.Data.(map[string]interface{})
 		username := data["username"].(string)
@@ -180,6 +162,7 @@ func (s *verboseService) formatEvent(ev events.Event) string {
 			success = "failed"
 		}
 		return fmt.Sprintf("Login %s for username %s.", success, username)
+
 	}

 	return fmt.Sprintf("%s %#v", ev.Type, ev)
@@ -1,6 +1,5 @@
 [Unit]
 Description=Restart Syncthing after resume
-Documentation=man:syncthing(1)
 After=suspend.target

 [Service]
@@ -71,18 +71,11 @@ li.hidden-xs:hover, .navbar-link:hover, .navbar-link:focus {
    border-color: #222 !important;
 }

-.panel-default > .panel-heading {
+.panel-default>.panel-heading {
    color: #aaa !important;
    border-color: #222 !important;
    background-color: #222 !important;
 }
-.panel-warning > .panel-heading {
-    color: #222 !important;
-}
-
-.panel-progress {
-    background: #3498db;
-}

 .panel-footer {
    background-color: #111 !important;
@@ -97,19 +90,10 @@ li.hidden-xs:hover, .navbar-link:hover, .navbar-link:focus {
    border-top: 1px solid #222 !important;
 }

-.identicon rect {
-    fill: #aaa;
+.identicon>rect {
+    fill: #aaa !important;
 }

-.panel-warning .identicon rect {
-    fill: #222;
-}
-
-.panel-heading:hover, .panel-heading:focus {
-    text-decoration: none;
-}
-
-
 /* buttons */
 .btn {
    border-radius: 3px !important;
@@ -156,26 +140,10 @@ li.hidden-xs:hover, .navbar-link:hover, .navbar-link:focus {

 /* modal dialogs */
 .modal-header {
-    border-bottom-color: #222 !important;
-}
-
-.modal-header:not(.alert) {
+    border-color: #222 !important;
    background-color: #222;
 }

-.alert-info {
-    color: #222 !important;
-}
-
-.alert-warning {
-    color: #222 !important;
-}
-
-.alert-danger {
-    color: #222 !important;
-    background-color: #d62c1a !important;
-}
-
 .modal-content {
    border-color: #666 !important;
    border-width: 2px !important;
@@ -187,6 +155,14 @@ li.hidden-xs:hover, .navbar-link:hover, .navbar-link:focus {
    background-color: #111 !important;
 }

+.alert-warning {
+    background-color: #c29d0b !important;
+}
+
+.alert-danger {
+    background-color: #d62c1a !important;
+}
+
 .help-block {
    color: #aaa !important;
 }
@@ -238,8 +214,4 @@ code.ng-binding{

 .progress-bar-danger {
    background-color: #d62c1a !important;
-}
-
-.progress .frontal {
-    color: #222;
-}
+}
@@ -1,4 +1,5 @@
 .dev-top-bar{
+    display: none;
    background-color: yellow;
 }

@@ -33,6 +33,29 @@ ul+h5 {
    display: block;
 }

+.panel-title {
+    position: relative;
+    text-overflow: ellipsis;
+    overflow: hidden;
+}
+.panel-title a:hover {
+    text-decoration: none;
+}
+
+identicon {
+    display: inline-block;
+    position: relative;
+    width: 1em;
+    height: 1em;
+    line-height: 1;
+    margin-right: 5px;
+}
+
+.identicon {
+    width: 1em;
+    height: 1em;
+}
+
 .checkbox {
    margin-top: 0px;
 }
@@ -50,6 +73,15 @@ ul+h5 {
    word-wrap:break-word;
 }

+.panel-heading .fa, .modal-header .fa {
+    margin-right: 10px;
+}
+
+.panel-heading {
+    position: relative;
+    overflow: hidden;
+}
+
 .text-monospace {
    font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
 }
@@ -93,7 +125,7 @@ ul+h5 {
 }

 .table td {
-    /*padding-left: 20px !important;*/
+    padding-left: 20px !important;
 }

 .table td.small-data {
@@ -131,27 +163,12 @@ table.table-condensed td.no-overflow-ellipse {
    display: none;
 }

-*[language-select] > .dropdown-menu {
-    width: 450px;
-}
-
-*[language-select] > .dropdown-menu > li {
-    float: left;
-    width: 50%;
-}
-
-*[language-select] > .dropdown-menu > li > a {
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-
 .nav>li{
    float: left;
 }
 .navbar-right {
    /* to align with panel */
    padding-right: 15px;
-    float: right;
 }

 .panel-body .table-condensed {
@@ -166,56 +183,6 @@ table.table-condensed td.no-overflow-ellipse {
    margin-left: 60px;
 }

-/**
- * Panel, Model and Accordion Title bars
- */
-
-.panel-icon {
-    float: left;
-    margin-right: 15px;
-    margin-top: 0.125em;
-    margin-bottom: 0.125em;
-    line-height: 1;
-}
-
-.modal-title .panel-icon {
-    margin-top: 0.25em;
-    margin-bottom: 0.25em;
-}
-
-button.panel-heading {
-    display: block;
-    position: relative;
-    width: 100%;
-    text-align: left;
-    border-top-width: 0;
-    border-left-width: 0;
-    border-right-width: 0;
-    border-radius: 0 !important;
-}
-
-.panel-heading .panel-title-text {
-    text-overflow: ellipsis;
-    overflow: hidden;
-    white-space: nowrap;
-}
-
-.panel-heading .panel-status {
-    margin-left:15px;
-}
-
-identicon {
-    width: 1em;
-    height: 1em;
-    line-height: 1;
-}
-
-.identicon {
-    width: 1em;
-    height: 1em;
-}
-
-
 /**
 * Progress bars with centered text
 */
@@ -276,37 +243,12 @@ ul.three-columns li, ul.two-columns li {
        padding-bottom: 0px;
    }

-    .navbar-brand {
-        margin: 3.25px -15px;
-    }
-
    .navbar-fixed-bottom {
        position: relative;
    }

-    .navbar-nav .open .dropdown-menu {
-        position: absolute;
-        left: auto;
-        right: 0;
-        background-color: #ffffff;
-        border: 1px solid #cccccc;
-        border: 1px solid rgba(0, 0, 0, 0.15);
-        -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
-        box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
-        border-radius: 2px;
-    }
-
-    *[language-select] {
-        position: static !important;
-    }
-
-    *[language-select] > .dropdown-menu {
-        margin-left: 15px;
-        margin-right: 15px;
-        margin-top: -12px !important;
-        max-width: 450px;
-        height: 265px;
-        overflow-y: scroll;
+    .nav>li {
+        float:right;
    }

    table.table-condensed td {
@@ -316,17 +258,47 @@ ul.three-columns li, ul.two-columns li {
    }
 }

+@media (min-width:650px) {
+    *[language-select] > .dropdown-menu > li {
+        width: 50%;
+        float: left;
+    }
+    *[language-select] > .dropdown-menu {
+        width: 440px;
+    }
+}
+
+/**
+ * Menu for select language
+ */
+@media (min-width:480px) and (max-width:649px) {
+    *[language-select] > .dropdown-menu {
+        width: 230px;
+    }
+}
+
@media (max-width:479px) {
+    .dropdown-menu {
+        padding-top: 55px;
+    }

    nav .dropdown-toggle {
        font-size: 1em;
    }

+    .dropdown-toggle {
+        float: left;
+    }
+
+    .logo{
+        margin:auto;
+    }
+
    .navbar-nav .open .dropdown-menu > li > a {
        padding: 12px 15px 12px 25px;
    }

-    .navbar-fixed-bottom li {
-         width: 100%;
-    }
+    .navbar-fixed-bottom li{
+         width:100%;
+     }
 }
@@ -15,15 +15,7 @@
    fill: #333;
 }

-.panel-warning .identicon rect {
-    fill: #fff;
-}
-
 .li-column {
    background-color: rgb(236, 240, 241);
    border-radius: 3px;
-}
-
-.panel-heading:hover, .panel-heading:focus {
-    text-decoration: none;
-}
+}
@@ -4,11 +4,11 @@
    "A new major version may not be compatible with previous versions.": "Нова основна версия, която може да не е съвмеситима с предишни версии.",
    "API Key": "API Ключ",
    "About": "За програмата",
-    "Actions": "Меню",
+    "Actions": "Действия",
    "Add": "Добави",
    "Add Device": "Добави устройство",
    "Add Folder": "Добави папка",
-    "Add Remote Device": "Добави ново устройство",
+    "Add Remote Device": "Добави отдалечено устройство",
    "Add new folder?": "Добави нова папка?",
    "Address": "Адрес",
    "Addresses": "Адреси",
@@ -20,11 +20,11 @@
    "Alphabetic": "Азбучен ред",
    "An external command handles the versioning. It has to remove the file from the synced folder.": "Друга команда се занимава с версиите. Тази команда трябва да премахни файла от синхронизираната папка.",
    "Anonymous Usage Reporting": "Анонимен доклад",
-    "Any devices configured on an introducer device will be added to this device as well.": "Устройства настроени да представят други устройства също ще бъдат добавени към това устройство.",
+    "Any devices configured on an introducer device will be added to this device as well.": "Устройства настроени на introducer компютъра също ще бъдат добавени към този компютър.",
    "Automatic upgrades": "Автоматично обновяване",
    "Be careful!": "Внимание!",
    "Bugs": "Бъгове",
-    "CPU Utilization": "Използван процесор",
+    "CPU Utilization": "Процесор в употреба",
    "Changelog": "Списък с промени",
    "Clean out after": "Изчисти след",
    "Close": "Затвори",
@@ -32,7 +32,6 @@
    "Comment, when used at the start of a line": "Коментар, използван в началото на реда",
    "Compression": "Компресиране",
    "Connection Error": "Грешка при свързването",
-    "Connection Type": "Вид връзка",
    "Copied from elsewhere": "Копиране от някъде другаде",
    "Copied from original": "Копиран от оригинала",
    "Copyright © 2014-2016 the following Contributors:": "Всички правата запазени © 2014-2016 Сътрудници:",
@@ -43,7 +42,7 @@
    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Устройство \"{{name}}\" ({{device}}) на {{address}} желае да се свърже. Добави ново устройство?",
    "Device ID": "Идентификатор на устройство",
    "Device Identification": "Идентификатор на устройство",
-    "Device Name": "Име на устройството",
+    "Device Name": "Име на устройство",
    "Device {%device%} ({%address%}) wants to connect. Add new device?": "Устройство {{device}} ({{address}}) желае да се свърже. Добави ново устройство?",
    "Devices": "Устройства",
    "Disconnected": "Не е свързано",
@@ -75,11 +74,10 @@
    "Folder Label": "Етикет на папката",
    "Folder Master": "Главна папка",
    "Folder Path": "Път до папката",
-    "Folder Type": "Вид папка",
    "Folders": "Папки",
    "GUI": "Потребителски интерфейс",
-    "GUI Authentication Password": "Парола за интерфейса",
-    "GUI Authentication User": "Потребителско име за интерфейса",
+    "GUI Authentication Password": "Парола за потребителския интерфейс",
+    "GUI Authentication User": "Потребител за потребителския интерфейс",
    "GUI Listen Addresses": "Адрес за свързване с потребителския интерфейс",
    "Generate": "Генерирай",
    "Global Discovery": "Глобално откриване",
@@ -93,39 +91,35 @@
    "Ignore Permissions": "Игнорирай правата за достъп",
    "Incoming Rate Limit (KiB/s)": "Лимит на скоростта за сваляне (KiB/s)",
    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Неправилни настройки могат да повредят файловете и да попречат на синхронизирането.",
-    "Introducer": "Може да предлага други устройства",
+    "Introducer": "Introducer",
    "Inversion of the given condition (i.e. do not exclude)": "Обратното на даденото условие (пр. не изключвай)",
    "Keep Versions": "Пази версии",
    "Largest First": " Първо най-големите",
    "Last File Received": "Последния получен файл",
-    "Last Scan": "Последно сканиран",
-    "Last seen": "Последно видяно",
+    "Last seen": "Последно видян",
    "Later": "По-късно",
-    "Listeners": "Синхронизиращи устройства",
    "Local Discovery": "Локално откриване",
    "Local State": "Локално състояние",
-    "Local State (Total)": "Локално състояние (общо)",
+    "Local State (Total)": "Локално състояние (Общо)",
    "Major Upgrade": "Основно Обновяване",
-    "Master": "Главен",
    "Maximum Age": "Максимална възраст",
    "Metadata Only": "Само мета информация",
    "Minimum Free Disk Space": "Минимално свободно дисково пространство",
    "Move to top of queue": "Премести в началото на опашката",
    "Multi level wildcard (matches multiple directory levels)": "Маска на много нива (покрива папки с много нива)",
-    "Never": "никога",
+    "Never": "Никога",
    "New Device": "Ново устройство",
    "New Folder": "Нова папка",
    "Newest First": "Първо най-новите",
    "No": "Не",
    "No File Versioning": "Без версии",
-    "Normal": "Нормален",
    "Notice": "Известие",
    "OK": "ОК",
    "Off": "Изключено",
    "Oldest First": "Първо най-старите",
    "Optional descriptive label for the folder. Can be different on each device.": "Допълнително разяснеие за етикета на папката. Може да бъде различно всяко устройство.",
    "Options": "Настройки",
-    "Out of Sync": "Несинхронизирана",
+    "Out of Sync": "Несинхронизирано",
    "Out of Sync Items": "Несинхронизирани елементи",
    "Outgoing Rate Limit (KiB/s)": "Лимит на скорост за качване (KiB/s)",
    "Override Changes": "Наложи локалните промени",
@@ -139,17 +133,17 @@
    "Preview": "Преглед",
    "Preview Usage Report": "Разгледай доклада за използване",
    "Quick guide to supported patterns": "Бърз наръчник към поддържаните шаблони",
-    "RAM Utilization": "Използван RAM",
+    "RAM Utilization": "RAM в употреба",
    "Random": "Произволен",
    "Relay Servers": "Препращащи сървъри",
    "Relayed via": "Препратено през",
    "Relays": "Препращачи",
    "Release Notes": "Бележки по обновяването",
-    "Remote Devices": "Чужди устройства",
+    "Remote Devices": "Отделечени устройства",
    "Remove": "Премахни",
    "Required identifier for the folder. Must be the same on all cluster devices.": "Задължителен идентификатор за тази папка. Трябва да бъде един и същ на всички устройства.",
-    "Rescan": "Сканирай",
-    "Rescan All": "Сканирай всички",
+    "Rescan": "Сканирай повторно",
+    "Rescan All": "Сканирай повторно всички",
    "Rescan Interval": "Интервал за повторно сканиране",
    "Restart": "Рестартирай",
    "Restart Needed": "Изисква се рестартиране",
@@ -187,13 +181,12 @@
    "Sync Protocol Listen Addresses": "Адрес за слушане на синхронизиращия протокол",
    "Syncing": "Синхронизиране",
    "Syncthing has been shut down.": "Syncthing е спрян.",
-    "Syncthing includes the following software or portions thereof:": "Syncthing уползотворява частично или изцяло следните софтуерни продукти:",
+    "Syncthing includes the following software or portions thereof:": "Syncthing включва следният софтуер пълно или частично:",
    "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 има проблем при обработването на заявката. Моля, презаредете браузъра или рестартирайте Syncthing ако проблемът продължи.",
    "The Syncthing admin interface is configured to allow remote access without a password.": "Администраторския панел на Syncthing е настроен да приема дистанционни връзки без парола.",
-    "The aggregated statistics are publicly available at the URL below.": "Сумарната статистика е публично достъпна на посочения по-долу адрес.",
    "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.": "Полето идентификатор на устройство не може да бъде празно.",
@@ -219,14 +212,14 @@
    "The rate limit must be a non-negative number (0: no limit)": "Ограничението на скоростта трябва да бъде положително число (0: неограничено)",
    "The rescan interval must be a non-negative number of seconds.": "Интервала на сканиране трябва да бъде не отрицателно число в секунди.",
    "They are retried automatically and will be synced when the error is resolved.": "Ще бъдат спрени и автоматично синхронизирани, когато грешката бъде оправена.",
-    "This Device": "Вашето устройство",
+    "This Device": "Това устройство",
    "This 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": "Неясно",
    "Unshared": "Несподелена",
    "Unused": "Неизползван",
-    "Up to Date": "Синхронизирана",
+    "Up to Date": "Синхронизирано",
    "Updated": "Обновено",
    "Upgrade": "Обнови",
    "Upgrade To {%version%}": "Обновен до {{version}}",
@@ -32,7 +32,6 @@
    "Comment, when used at the start of a line": "Comentari quan és usat al principi d'una línia",
    "Compression": "Compressió",
    "Connection Error": "Error de connexió",
-    "Connection Type": "Connection Type",
    "Copied from elsewhere": "Copiat d'un altre lloc",
    "Copied from original": "Copiat de l'original",
    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 the following Contributors:",
@@ -75,7 +74,6 @@
    "Folder Label": "Folder Label",
    "Folder Master": "Carpeta mestra",
    "Folder Path": "Camí de carpeta",
-    "Folder Type": "Folder Type",
    "Folders": "Carpetes",
    "GUI": "GUI",
    "GUI Authentication Password": "Contrasenya d'autenticació GUI",
@@ -98,15 +96,12 @@
    "Keep Versions": "Mantenir Versions",
    "Largest First": "Més gran primer",
    "Last File Received": "Últim fitxer rebut",
-    "Last Scan": "Last Scan",
    "Last seen": "Vist per última vegada",
    "Later": "Després",
-    "Listeners": "Listeners",
    "Local Discovery": "Descobriment Local",
    "Local State": "Estat local",
    "Local State (Total)": "Estat local (Total)",
    "Major Upgrade": "Actualització major",
-    "Master": "Master",
    "Maximum Age": "Antiguitat Màxima",
    "Metadata Only": "Només metadades",
    "Minimum Free Disk Space": "Espai de disc lliure mínim",
@@ -118,7 +113,6 @@
    "Newest First": "Més nou primer",
    "No": "No",
    "No File Versioning": "Sense Versionat de Fitxer",
-    "Normal": "Normal",
    "Notice": "Avís",
    "OK": "OK",
    "Off": "Desactivar",
@@ -193,7 +187,6 @@
    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Synthing sembla parat, o hi ha algun problema amb la connexió a Internet. Reintentant...",
    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Sembla ser que Syncthing està tinguent problemes per processar la teva petició. Si us plau, refresca la pàgina o reinicia Syncthing si el problema persisteix.",
    "The Syncthing admin interface is configured to allow remote access without a password.": "La interfície d'administració de Syncthing està configurada per permetre l'accés remot sense contrasenya.",
-    "The aggregated statistics are publicly available at the URL below.": "The aggregated statistics are publicly available at the URL below.",
    "The aggregated statistics are publicly available at {%url%}.": "Les estadístiques agregades estan públicament disponibles a {{url}}.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "La configuració s'ha guardar però no s'ha activat. S'ha de reiniciar el synthing per activar la nova configuració.",
    "The device ID cannot be blank.": "El ID del dispositiu no pot estar en blanc.",
@@ -32,7 +32,6 @@
    "Comment, when used at the start of a line": "Comentar, quant s'utilitza al principi d'una línia",
    "Compression": "Compresió",
    "Connection Error": "Error de connexió",
-    "Connection Type": "Tipus de connexió",
    "Copied from elsewhere": "Copiat de qualsevol lloc",
    "Copied from original": "Copiat de l'original",
    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 els següents Col·laboradors:",
@@ -75,7 +74,6 @@
    "Folder Label": "Etiqueta de la Carpeta",
    "Folder Master": "Carpeta principal",
    "Folder Path": "Ruta de la carpeta",
-    "Folder Type": "Tipus de carpeta",
    "Folders": "Carpetes",
    "GUI": "IGU (Interfície Gràfica d'Usuari)",
    "GUI Authentication Password": "Password d'autenticació de l'Interfície Gràfica d'Usuari (GUI)",
@@ -98,15 +96,12 @@
    "Keep Versions": "Mantindre versions",
    "Largest First": "El més gran primer",
    "Last File Received": "Darrer fitxer rebut",
-    "Last Scan": "Últim escaneig",
    "Last seen": "Vist per última vegada",
    "Later": "Més tard",
-    "Listeners": "Escoltants",
    "Local Discovery": "Descobriment local",
    "Local State": "Estat local",
    "Local State (Total)": "Estat Local (Total)",
    "Major Upgrade": "Actualització important",
-    "Master": "Mestre",
    "Maximum Age": "Edat màxima",
    "Metadata Only": "Sols metadades",
    "Minimum Free Disk Space": "Espai minim de disc lliure",
@@ -118,7 +113,6 @@
    "Newest First": "El més nou primer",
    "No": "No",
    "No File Versioning": "Sense versionat de fitxer",
-    "Normal": "Normal",
    "Notice": "Avís",
    "OK": "OK",
    "Off": "Off",
@@ -193,7 +187,6 @@
    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing pareix apagat o hi ha un problema amb la connexió a Internet. Tornant a intentar...",
    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing pareix que té un problema processant la seua sol·licitud. Per favor, refresque la pàgina o reinicie Syncthing si el problema persistix.",
    "The Syncthing admin interface is configured to allow remote access without a password.": "L'interfície d'administració de Syncthing està configurat per a permetre l'accés remot sense una contrasenya.",
-    "The aggregated statistics are publicly available at the URL below.": "Les estadístiques agregades estàn disponibles en la URL que figura a continuació.",
    "The aggregated statistics are publicly available at {%url%}.": "Les estadístiques agregades estan disponibles públicament en {{url}}.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "La configuració ha sigut gravada però no activada. Syncthing deu reiniciar per tal d'activar la nova configuració.",
    "The device ID cannot be blank.": "L'ID del dispositiu no pot estar buida.",
@@ -32,7 +32,6 @@
    "Comment, when used at the start of a line": "Komentář, pokud použito na začátku řádku",
    "Compression": "Komprese",
    "Connection Error": "Chyba připojení",
-    "Connection Type": "Typ připojení",
    "Copied from elsewhere": "Zkopírováno odjinud",
    "Copied from original": "Zkopírováno z originálu",
    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 následující přispěvatelé:",
@@ -75,7 +74,6 @@
    "Folder Label": "Jmenovka adresáře",
    "Folder Master": "Master adresář",
    "Folder Path": "Cesta k adresáři",
-    "Folder Type": "Typ adresáře",
    "Folders": "Adresáře",
    "GUI": "GUI",
    "GUI Authentication Password": "Přihlašovací heslo pro GUI",
@@ -98,15 +96,12 @@
    "Keep Versions": "Ponechat verze",
    "Largest First": "Od největšího",
    "Last File Received": "Poslední přijatý soubor",
-    "Last Scan": "Poslední sken",
    "Last seen": "Naposledy spatřen",
    "Later": "Později",
-    "Listeners": "Naslouchající",
    "Local Discovery": "Místní oznamování",
    "Local State": "Místní status",
    "Local State (Total)": "Místní status (Celkem)",
    "Major Upgrade": "Důležitá aktualizace",
-    "Master": "Master",
    "Maximum Age": "Maximální časový limit",
    "Metadata Only": "Pouze metadata",
    "Minimum Free Disk Space": "Minimální velikost volného místa na disku",
@@ -118,7 +113,6 @@
    "Newest First": "Od nejnovějšího",
    "No": "Ne",
    "No File Versioning": "Bez verzování souborů",
-    "Normal": "Normální",
    "Notice": "Oznámení",
    "OK": "OK",
    "Off": "Vypnuta",
@@ -193,7 +187,6 @@
    "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á, obnovte stránku v prohlížeči nebo restartujte Syncthing.",
    "The Syncthing admin interface is configured to allow remote access without a password.": "V nastavení aplikace Syncthing je povoleno vzdálené připojení k administrátorskému rozhraní bez zadání hesla.",
-    "The aggregated statistics are publicly available at the URL below.": "Souhrnné statistiky jsou veřejně dostupné na níže uvedené URL.",
    "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é.",
@@ -32,7 +32,6 @@
    "Comment, when used at the start of a line": "Kommentering som bruges i starten af en linje",
    "Compression": "Anvend komprimering",
    "Connection Error": "Tilslutnings fejl",
-    "Connection Type": "Connection Type",
    "Copied from elsewhere": "Kopieret fra et andet sted",
    "Copied from original": "Kopieret fra originalen",
    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 the following Contributors:",
@@ -75,7 +74,6 @@
    "Folder Label": "Folder Label",
    "Folder Master": "Mastermappe",
    "Folder Path": "Mappesti",
-    "Folder Type": "Folder Type",
    "Folders": "Mapper",
    "GUI": "GUI",
    "GUI Authentication Password": "GUI-kodeord",
@@ -98,15 +96,12 @@
    "Keep Versions": "Behold versioner",
    "Largest First": "Største først",
    "Last File Received": "Sidste modtaget fil",
-    "Last Scan": "Last Scan",
    "Last seen": "Sidst set",
    "Later": "Senere",
-    "Listeners": "Listeners",
    "Local Discovery": "Lokal opslag",
    "Local State": "Lokal tilstand",
    "Local State (Total)": "Lokal tilstand (total)",
    "Major Upgrade": "Ny version",
-    "Master": "Master",
    "Maximum Age": "Maks alder",
    "Metadata Only": "Kun metadata",
    "Minimum Free Disk Space": "Mindst ledig diskplads",
@@ -118,7 +113,6 @@
    "Newest First": "Nyeste først",
    "No": "Nej",
    "No File Versioning": "Ingen filversion",
-    "Normal": "Normal",
    "Notice": "OBS",
    "OK": "OK",
    "Off": "Slå fra",
@@ -193,7 +187,6 @@
    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing ser ud til at være stoppet eller oplever problemer med din internetforbindels. Prøver igen...",
    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Det ser ud til at Syncthiing har problemer med at udføre opgaven. Prøv at genopfriske siden eller genstarte Synching hvis problemet vedbliver.",
    "The Syncthing admin interface is configured to allow remote access without a password.": "Syncthing administationsdelen er konfigureret til at blive fjernstyret uden kodeord.",
-    "The aggregated statistics are publicly available at the URL below.": "The aggregated statistics are publicly available at the URL below.",
    "The aggregated statistics are publicly available at {%url%}.": "Samlet statistik er offentligt tilgængelig på {{url}}.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Konfigurationen er gemt, men ikke aktiveret. Syncthing skal genstarte for at aktivere den nye konfiguration.",
    "The device ID cannot be blank.": "Enhedens ID må ikke være tom.",
@@ -21,18 +21,17 @@
    "An external command handles the versioning. It has to remove the file from the synced folder.": "Ein externer Programmaufruf handhabt die Versionierung. Es muss die Datei aus dem zu synchronisierendem Verzeichnis entfernen.",
    "Anonymous Usage Reporting": "Anonymer Nutzungsbericht",
    "Any devices configured on an introducer device will be added to this device as well.": "Alle Geräte, die beim Verteiler eingetragen sind, werden auch bei diesem Gerät eingetragen",
-    "Automatic upgrades": "Automatische Updates aktivieren",
+    "Automatic upgrades": "automatische Updates",
    "Be careful!": "Vorsicht!",
    "Bugs": "Fehler",
    "CPU Utilization": "Prozessorauslastung",
    "Changelog": "Änderungsprotokoll",
    "Clean out after": "Löschen nach",
    "Close": "Schließen",
-    "Command": "Befehl",
+    "Command": "Kommando",
    "Comment, when used at the start of a line": "Kommentar, wenn am Anfang der Zeile benutzt.",
    "Compression": "Komprimierung",
    "Connection Error": "Verbindungsfehler",
-    "Connection Type": "Verbindungstyp",
    "Copied from elsewhere": "Von anderer Quelle kopiert",
    "Copied from original": "Vom Original kopiert",
    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 der folgenden Unterstützer:",
@@ -56,7 +55,7 @@
    "Edit Device": "Gerät bearbeiten",
    "Edit Folder": "Verzeichnis bearbeiten",
    "Editing": "Bearbeitet",
-    "Enable NAT traversal": "NAT-Durchdringung aktivieren",
+    "Enable NAT traversal": "NAT-Traversal aktivieren",
    "Enable Relaying": "Weiterleitung aktivieren",
    "Enable UPnP": "UPnP aktivieren",
    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Kommagetrennte Adressen (\"tcp://ip:port\", \"tcp://host:port\") oder \"dynamic\" eingeben, um die Adresse automatisch zu ermitteln.",
@@ -75,7 +74,6 @@
    "Folder Label": "Verzeichnisbezeichnung",
    "Folder Master": "Master Verzeichnis - schreibgeschützt",
    "Folder Path": "Verzeichnispfad",
-    "Folder Type": "Verzeichnistyp",
    "Folders": "Verzeichnisse",
    "GUI": "GUI",
    "GUI Authentication Password": "Passwort für Zugang zur Benutzeroberfläche",
@@ -98,15 +96,12 @@
    "Keep Versions": "Versionen erhalten",
    "Largest First": "Größte zuerst",
    "Last File Received": "Letzte Änderung",
-    "Last Scan": "Letzter Scan",
    "Last seen": "Zuletzt online",
    "Later": "Später",
-    "Listeners": "Zuhörer",
    "Local Discovery": "Lokale Gerätesuche",
    "Local State": "Lokaler Status",
    "Local State (Total)": "Lokaler Status (Gesamt)",
    "Major Upgrade": "Hauptversionsupgrade",
-    "Master": "Master",
    "Maximum Age": "Höchstalter",
    "Metadata Only": "Nur Metadaten",
    "Minimum Free Disk Space": "Minimal freier Festplattenspeicher",
@@ -118,7 +113,6 @@
    "Newest First": "Neueste zuerst",
    "No": "Nein",
    "No File Versioning": "Keine Dateiversionierung",
-    "Normal": "Normal",
    "Notice": "Hinweis",
    "OK": "OK",
    "Off": "Aus",
@@ -193,7 +187,6 @@
    "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.": "Syncthing scheint ein Problem mit der Verarbeitung Deiner Eingabe zu haben. Bitte lade die Seite neu oder führe einen Neustart durch, falls das Problem weiterhin besteht.",
    "The Syncthing admin interface is configured to allow remote access without a password.": "Die Syncthing-Oberfläche erlaubt mit den jetzigen Einstellungen einen Zugriff ohne Passwort.",
-    "The aggregated statistics are publicly available at the URL below.": "Die gesammelten Statistiken sind öffentlich unter der nachfolgenden URL verfügbar.",
    "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 noch nicht aktiviert. Syncthing muss neugestartet werden, um die neue Konfiguration zu übernehmen.",
    "The device ID cannot be blank.": "Die Geräte ID darf nicht leer sein.",
@@ -8,13 +8,13 @@
    "Add": "Προσθήκη",
    "Add Device": "Προσθήκη συσκευής",
    "Add Folder": "Προσθήκη φακέλου",
-    "Add Remote Device": "Προσθήκη Απομακρυσμένης Συσκευής",
+    "Add Remote Device": "Add Remote Device",
    "Add new folder?": "Προσθήκη νέου φακέλου;",
    "Address": "Διεύθυνση",
    "Addresses": "Διευθύνσεις",
    "Advanced": "Προχωρημένες",
    "Advanced Configuration": "Προχωρημένες ρυθμίσεις",
-    "Advanced settings": "Προχωρημένες ρυθμίσεις",
+    "Advanced settings": "Advanced settings",
    "All Data": "Όλα τα δεδομένα",
    "Allow Anonymous Usage Reporting?": "Να επιτρέπεται η αποστολή ανώνυμων στοιχείων χρήσης;",
    "Alphabetic": "Αλφαβητικά",
@@ -32,15 +32,14 @@
    "Comment, when used at the start of a line": "Σχόλιο, όταν χρησιμοποιείται στην αρχή μιας γραμμής",
    "Compression": "Συμπίεση",
    "Connection Error": "Σφάλμα σύνδεσης",
-    "Connection Type": "Τύπος Σύνδεσης",
    "Copied from elsewhere": "Έχει αντιγραφεί από κάπου αλλού",
    "Copied from original": "Έχει αντιγραφεί από το πρωτότυπο",
-    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 οι παρακάτω Συνεισφέροντες:",
+    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 the following Contributors:",
    "Copyright © 2015 the following Contributors:": "Copyright © 2015 από τους παρακάτω συνεισφορείς:",
    "Danger!": "Προσοχή!",
    "Delete": "Διαγραφή",
    "Deleted": "Διαγραμμένα",
-    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Η συσκευή \"{{name}}\" ({{device}} στη {{address}}) επιθυμεί να συνδεθεί. Προσθήκη της νέας συσκευής?",
+    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Device \"{{name}}\" ({{device}} at {{address}}) wants to connect. Add new device?",
    "Device ID": "Ταυτότητα συσκευής",
    "Device Identification": "Ταυτότητα συσκευής",
    "Device Name": "Όνομα συσκευής",
@@ -75,7 +74,6 @@
    "Folder Label": "Folder Label",
    "Folder Master": "Να μην επιτρέπονται αλλαγές",
    "Folder Path": "Μονοπάτι φακέλου",
-    "Folder Type": "Folder Type",
    "Folders": "Φάκελοι",
    "GUI": "Γραφικό περιβάλλον",
    "GUI Authentication Password": "Κωδικός για την πρόσβαση στη διεπαφή",
@@ -98,15 +96,12 @@
    "Keep Versions": "Διατήρηση εκδόσεων",
    "Largest First": "Το μεγαλύτερο πρώτα",
    "Last File Received": "Πιο πρόσφατο αρχείο",
-    "Last Scan": "Τελευταία Σάρωση",
    "Last seen": "Τελευταία φορά συνδεδεμένος",
    "Later": "Αργότερα",
-    "Listeners": "Listeners",
    "Local Discovery": "Τοπική ανεύρεση",
    "Local State": "Τοπική κατάσταση",
    "Local State (Total)": "Τοπική κατάσταση (συνολικά)",
    "Major Upgrade": "Σημαντική αναβάθμιση",
-    "Master": "Master",
    "Maximum Age": "Μέγιστη ηλικία",
    "Metadata Only": "Μόνο μεταδεδομένα",
    "Minimum Free Disk Space": "Ελάχιστος ελεύθερος αποθηκευτικός χώρος",
@@ -118,7 +113,6 @@
    "Newest First": "Το νεότερο πρώτα",
    "No": "Όχι",
    "No File Versioning": "Να μην τηρούνται εκδόσεις",
-    "Normal": "Normal",
    "Notice": "Σημείωση",
    "OK": "OK",
    "Off": "Απενεργοποιημένο",
@@ -193,7 +187,6 @@
    "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 φαίνεται να αντιμετωπίζει ένα πρόβλημα με την επεξεργασία του αιτήματός σου. Παρακαλούμε, αν το πρόβλημα συνεχίζει, ανανέωσε την σελίδα ή επανεκκίνησε το Syncthing.",
    "The Syncthing admin interface is configured to allow remote access without a password.": "Η διεπαφή διαχείρισης του Syncthing είναι ρυθμισμένη να επιτρέπει την πρόσβαση χωρίς κωδικό.",
-    "The aggregated statistics are publicly available at the URL below.": "Τα στατιστικά που έχουν συλλεγεί είναι δημόσια διαθέσιμα στη παρακάτω διεύθυνση.",
    "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.": "Η ταυτότητα της συσκευής δεν μπορεί να είναι κενή",
@@ -32,7 +32,6 @@
    "Comment, when used at the start of a line": "Comment, when used at the start of a line",
    "Compression": "Compression",
    "Connection Error": "Connection Error",
-    "Connection Type": "Connection Type",
    "Copied from elsewhere": "Copied from elsewhere",
    "Copied from original": "Copied from original",
    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 the following Contributors:",
@@ -75,7 +74,6 @@
    "Folder Label": "Folder Label",
    "Folder Master": "Folder Master",
    "Folder Path": "Folder Path",
-    "Folder Type": "Folder Type",
    "Folders": "Folders",
    "GUI": "GUI",
    "GUI Authentication Password": "GUI Authentication Password",
@@ -98,15 +96,12 @@
    "Keep Versions": "Keep Versions",
    "Largest First": "Largest First",
    "Last File Received": "Last File Received",
-    "Last Scan": "Last Scan",
    "Last seen": "Last seen",
    "Later": "Later",
-    "Listeners": "Listeners",
    "Local Discovery": "Local Discovery",
    "Local State": "Local State",
    "Local State (Total)": "Local State (Total)",
    "Major Upgrade": "Major Upgrade",
-    "Master": "Master",
    "Maximum Age": "Maximum Age",
    "Metadata Only": "Metadata Only",
    "Minimum Free Disk Space": "Minimum Free Disk Space",
@@ -118,7 +113,6 @@
    "Newest First": "Newest First",
    "No": "No",
    "No File Versioning": "No File Versioning",
-    "Normal": "Normal",
    "Notice": "Notice",
    "OK": "OK",
    "Off": "Off",
@@ -193,7 +187,6 @@
    "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 refresh the page or restart Syncthing if the problem persists.",
    "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 aggregated statistics are publicly available at the URL below.": "The aggregated statistics are publicly available at the URL below.",
    "The aggregated statistics are publicly available at {%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.",
@@ -32,7 +32,6 @@
   "Comment, when used at the start of a line": "Comment, when used at the start of a line",
   "Compression": "Compression",
   "Connection Error": "Connection Error",
-   "Connection Type": "Connection Type",
   "Copied from elsewhere": "Copied from elsewhere",
   "Copied from original": "Copied from original",
   "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 the following Contributors:",
@@ -75,7 +74,6 @@
   "Folder Label": "Folder Label",
   "Folder Master": "Folder Master",
   "Folder Path": "Folder Path",
-   "Folder Type": "Folder Type",
   "Folders": "Folders",
   "GUI": "GUI",
   "GUI Authentication Password": "GUI Authentication Password",
@@ -98,15 +96,12 @@
   "Keep Versions": "Keep Versions",
   "Largest First": "Largest First",
   "Last File Received": "Last File Received",
-   "Last Scan": "Last Scan",
   "Last seen": "Last seen",
   "Later": "Later",
-   "Listeners": "Listeners",
   "Local Discovery": "Local Discovery",
   "Local State": "Local State",
   "Local State (Total)": "Local State (Total)",
   "Major Upgrade": "Major Upgrade",
-   "Master": "Master",
   "Maximum Age": "Maximum Age",
   "Metadata Only": "Metadata Only",
   "Minimum Free Disk Space": "Minimum Free Disk Space",
@@ -118,7 +113,6 @@
   "Newest First": "Newest First",
   "No": "No",
   "No File Versioning": "No File Versioning",
-   "Normal": "Normal",
   "Notice": "Notice",
   "OK": "OK",
   "Off": "Off",
@@ -193,7 +187,6 @@
   "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 refresh the page or restart Syncthing if the problem persists.",
   "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 aggregated statistics are publicly available at the URL below.": "The aggregated statistics are publicly available at the URL below.",
   "The aggregated statistics are publicly available at {%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.",
@@ -32,7 +32,6 @@
    "Comment, when used at the start of a line": "Comentar, cuando se usa al comienzo de una línea",
    "Compression": "Compresión",
    "Connection Error": "Error de conexión",
-    "Connection Type": "Connection Type",
    "Copied from elsewhere": "Copiado de otro sitio",
    "Copied from original": "Copiado del original",
    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 los siguientes Colaboradores:",
@@ -75,7 +74,6 @@
    "Folder Label": "Etiqueta de la Carpeta",
    "Folder Master": "Carpeta principal",
    "Folder Path": "Ruta de la carpeta",
-    "Folder Type": "Folder Type",
    "Folders": "Carpetas",
    "GUI": "GUI",
    "GUI Authentication Password": "Password de la Interfaz Gráfica de Usuario (GUI)",
@@ -98,15 +96,12 @@
    "Keep Versions": "Mantener versiones",
    "Largest First": "Más grande primero",
    "Last File Received": "Último fichero recibido",
-    "Last Scan": "Last Scan",
    "Last seen": "Visto por última vez",
    "Later": "Más tarde",
-    "Listeners": "Listeners",
    "Local Discovery": "Descubrimiento local",
    "Local State": "Estado local",
    "Local State (Total)": "Estado Local (Total)",
    "Major Upgrade": "Actualización importante",
-    "Master": "Master",
    "Maximum Age": "Edad máxima",
    "Metadata Only": "Sólo metadatos",
    "Minimum Free Disk Space": "Espacio mínimo libre en disco",
@@ -118,7 +113,6 @@
    "Newest First": "El más nuevo primero",
    "No": "No",
    "No File Versioning": "Sin versionado de fichero",
-    "Normal": "Normal",
    "Notice": "Aviso",
    "OK": "OK",
    "Off": "Desconectar",
@@ -193,7 +187,6 @@
    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing parece no estar activo o hay un problema con tu conexión de internet. Reintentando...",
    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing tiene problemas para procesar tu solicitud. Por favor, actualiza la página o reinicia Syncthing si el problema persiste.",
    "The Syncthing admin interface is configured to allow remote access without a password.": "El panel de administración de Syncthing está configurado para permitir el acceso remoto sin contraseña.",
-    "The aggregated statistics are publicly available at the URL below.": "The aggregated statistics are publicly available at the URL below.",
    "The aggregated statistics are publicly available at {%url%}.": "Las estadísticas agregadas están disponibles públicamente en {{url}}.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "La configuración ha sido grabada pero no activada. Syncthing debe reiniciarse para activar la nueva configuración.",
    "The device ID cannot be blank.": "La ID del dispositivo no puede estar vacía.",
@@ -32,7 +32,6 @@
    "Comment, when used at the start of a line": "Comentario, cuando es utilizado al inicio de una línea.",
    "Compression": "Compresión",
    "Connection Error": "Error de conexión",
-    "Connection Type": "Tipo de conexión",
    "Copied from elsewhere": "Copiado desde otra parte.",
    "Copied from original": "Copiado del original",
    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 los siguientes contribuidores:",
@@ -40,7 +39,7 @@
    "Danger!": "Peligro!",
    "Delete": "Suprimir",
    "Deleted": "Suprimido",
-    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Dispositivo \"{{name}}\" ({{device}} en {{address}}) quiere conectar. ¿Añadir nuevo dispositivo?",
+    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Device \"{{name}}\" ({{device}} at {{address}}) wants to connect. Add new device?",
    "Device ID": "ID del dispositivo",
    "Device Identification": "Identificación del dispositivo",
    "Device Name": "Nombre del dispositivo",
@@ -56,10 +55,10 @@
    "Edit Device": "Editar dispositivo",
    "Edit Folder": "Editar repositorio",
    "Editing": "Editando",
-    "Enable NAT traversal": "Habilitar NAT trasversal",
-    "Enable Relaying": "Habilitar Retransmisión",
+    "Enable NAT traversal": "Enable NAT traversal",
+    "Enable Relaying": "Enable Relaying",
    "Enable UPnP": "Permitir UPnP",
-    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Introduce las direcciones (\"tcp://ip:port\", \"tcp://host:port\") separadas por comas o \"dynamic\" para ejecutar un descubrimiento automático de la dirección. ",
+    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.",
    "Enter ignore patterns, one per line.": "Añadir patrones de exclusión, uno por línea.",
    "Error": "Error",
    "External File Versioning": "Control de versiones externo",
@@ -72,10 +71,9 @@
    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Los archivos están protegidos frente a los cambios realizados en otros dispositivos, peros los cambios realizados en este dispositivo serán envíados al resto del grupo",
    "Folder": "Carpeta",
    "Folder ID": "ID del repositorio",
-    "Folder Label": "Etiqueta de Carpeta",
+    "Folder Label": "Folder Label",
    "Folder Master": "Repositorio maestro",
    "Folder Path": "Ruta del repositorio",
-    "Folder Type": "Tipo de Carpeta",
    "Folders": "Repositorios",
    "GUI": "GUI",
    "GUI Authentication Password": "Contraseña de autenticación de la GUI",
@@ -84,7 +82,7 @@
    "Generate": "Generar",
    "Global Discovery": "Búsqueda en internet",
    "Global Discovery Server": "Servidor global de identificación",
-    "Global Discovery Servers": "Servidores globales de identificación",
+    "Global Discovery Servers": "Global Discovery Servers",
    "Global State": "Estado global",
    "Help": "Ayuda",
    "Home page": "Pagina de inicio",
@@ -98,15 +96,12 @@
    "Keep Versions": "Conservar versiones",
    "Largest First": "Más grande primero",
    "Last File Received": "Último archivo recibido",
-    "Last Scan": "Último escaneo",
    "Last seen": "Visto por ultima vez",
    "Later": "Más tarde",
-    "Listeners": "Receptor",
    "Local Discovery": "Búsqueda en red local",
    "Local State": "Estado local",
    "Local State (Total)": "Estado local (total)",
    "Major Upgrade": "Actualización mayor",
-    "Master": "Maestro",
    "Maximum Age": "Edad máxima",
    "Metadata Only": "Sólo metadatos",
    "Minimum Free Disk Space": "Espacio mínimo libre en disco",
@@ -118,12 +113,11 @@
    "Newest First": "Nuevo primero",
    "No": "No",
    "No File Versioning": "Sin control de versiones de archivos",
-    "Normal": "Normal",
    "Notice": "Aviso",
    "OK": "OK",
    "Off": "Apagado",
    "Oldest First": "Antiguo primero",
-    "Optional descriptive label for the folder. Can be different on each device.": "Etiqueta descriptiva opcional para la carpeta. Puede ser diferente en cada dispositivo.",
+    "Optional descriptive label for the folder. Can be different on each device.": "Optional descriptive label for the folder. Can be different on each device.",
    "Options": "Opciones",
    "Out of Sync": "Fuera de sincronización",
    "Out of Sync Items": "Ítems no sincronizados",
@@ -134,20 +128,20 @@
    "Pause": "Pausa",
    "Paused": "En pausa",
    "Please consult the release notes before performing a major upgrade.": "Por favor consulta las notas de lanzamiento antes de realizar una actualizacón mayor.",
-    "Please set a GUI Authentication User and Password in the Settings dialog.": "Por favor, establece un Usuario y Contraseña de Autenticación en la GUI en el diálogo de Configuración",
+    "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 wait": "Aguarde por favor",
    "Preview": "Vista previa",
    "Preview Usage Report": "Ver reporte de uso",
    "Quick guide to supported patterns": "Guía rápida sobre los patrones soportados",
    "RAM Utilization": "Utilización de RAM",
    "Random": "Aleatorio",
-    "Relay Servers": "Servidores de Retransmisión",
+    "Relay Servers": "Relay Servers",
    "Relayed via": "retransmitida vía",
    "Relays": "Retransmisores",
    "Release Notes": "Notas de lanzamiento",
    "Remote Devices": "Dispositivos Remotos",
    "Remove": "Eliminar",
-    "Required identifier for the folder. Must be the same on all cluster devices.": "Identificación requerida para la carpeta. Debe ser la misma en todos los dispositivos del grupo.",
+    "Required identifier for the folder. Must be the same on all cluster devices.": "Required identifier for the folder. Must be the same on all cluster devices.",
    "Rescan": "Reescanear",
    "Rescan All": "Reescanear todo",
    "Rescan Interval": "Intervalo de reescaneo",
@@ -193,11 +187,10 @@
    "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...",
    "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 Syncthing admin interface is configured to allow remote access without a password.": "La interfaz administrativa del Syncthing está configurada para permitir acceso remoto sin una contraseña.",
-    "The aggregated statistics are publicly available at the URL below.": "Las estadísticas agregadas están disponibles públicamente en la dirección de abajo.",
    "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.": "La ID del dispositivo no puede estar en blanco.",
-    "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).": "La ID de dispositivo a introducir ser puede encontrar en el menú \"Acciones > Mostrar ID\" en el otro dispositivo. Espacios y guiones son opcionales (ignorados). ",
+    "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).": "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.",
@@ -210,7 +203,7 @@
    "The following items could not be synchronized.": "Los siguientes artículos no pueden ser sincronizados.",
    "The maximum age must be a number and cannot be blank.": "La edad máxima debe ser un número y no puede estar en blanco.",
    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "El tiempo máximo para mantener una versión (en días, establece en 0 para mantener versiones para siempre).",
-    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "El porcentaje de espacio libre en disco mínimo debe ser un número no negativo entre 0 y 100 (incluidos).",
+    "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 number of days must be a number and cannot be blank.": "El número de días debe ser un número y no puede estar vacío.",
    "The number of days to keep files in the trash can. Zero means forever.": "El tiempo máximo para mantener un archivo en el cubo de basura (en días, establece en 0 para mantener versiones para siempre).",
    "The number of old versions to keep, per file.": "El numero de versiones anteriores a conservar, por archivo.",
@@ -247,5 +240,5 @@
    "items": "ítems",
    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} quiere compartir repositorio \"{{folder}}\".",
    "{%device%} wants to share folder \"{%folderLabel%}\" ({%folder%}).": "{{device}} qiuere compartir el repositorio \"{{folderLabel}}\" ({{folder}}).",
-    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} quiere compartir la carpeta \"{{folderlabel}}\" ({{folder}})."
+    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} wants to share folder \"{{folderlabel}}\" ({{folder}})."
 }
@@ -32,7 +32,6 @@
    "Comment, when used at the start of a line": "Kommentti, käytettäessä rivin alussa",
    "Compression": "Pakkaus",
    "Connection Error": "Yhteysvirhe",
-    "Connection Type": "Connection Type",
    "Copied from elsewhere": "Kopioitu muualta",
    "Copied from original": "Kopioitu alkuperäisestä lähteestä",
    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 the following Contributors:",
@@ -75,7 +74,6 @@
    "Folder Label": "Folder Label",
    "Folder Master": "Hallitsijakansio",
    "Folder Path": "Kansion polku",
-    "Folder Type": "Folder Type",
    "Folders": "Kansiot",
    "GUI": "GUI",
    "GUI Authentication Password": "GUI:n salasana",
@@ -98,15 +96,12 @@
    "Keep Versions": "Säilytä versiot",
    "Largest First": "Suurin ensin",
    "Last File Received": "Viimeksi vastaanotettu tiedosto",
-    "Last Scan": "Last Scan",
    "Last seen": "Nähty viimeksi",
    "Later": "Myöhemmin",
-    "Listeners": "Listeners",
    "Local Discovery": "Paikallinen etsintä",
    "Local State": "Paikallinen tila",
    "Local State (Total)": "Paikallinen tila (Yhteensä)",
    "Major Upgrade": "Pääversion päivitys.",
-    "Master": "Master",
    "Maximum Age": "Maksimi-ikä",
    "Metadata Only": "Vain metadata",
    "Minimum Free Disk Space": "Vapaan levytilan vähimmäismäärä",
@@ -118,7 +113,6 @@
    "Newest First": "Uusin ensin",
    "No": "Ei",
    "No File Versioning": "Ei tiedostoversiointia",
-    "Normal": "Normal",
    "Notice": "Huomautus",
    "OK": "OK",
    "Off": "Pois",
@@ -193,7 +187,6 @@
    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing näyttää olevan alhaalla tai internetyhteydessä on ongelma. Yritetään uudelleen...",
    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing ei pysty käsittelemään pyyntöäsi. Ole hyvä ja päivitä sivu tai käynnistä Syncthing uudelleen, jos ongelma jatkuu.",
    "The Syncthing admin interface is configured to allow remote access without a password.": "Syncthingin hallintakäyttöliittymä on asetettu sallimaan ulkoiset yhteydet ilman salasanaa.",
-    "The aggregated statistics are publicly available at the URL below.": "The aggregated statistics are publicly available at the URL below.",
    "The aggregated statistics are publicly available at {%url%}.": "Yhdistetyt tilastot ovat julkisesti saatavilla osoitteessa {{url}}.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Asetukset on tallennettu, mutta niitä ei ole otettu käyttöön. Syncthingin täytyy käynnistyä uudelleen, jotta uudet asetukset saadaan käyttöön.",
    "The device ID cannot be blank.": "Laitteen ID ei voi olla tyhjä.",
@@ -1,63 +1,62 @@
 {
-    "A device with that ID is already added.": "L'appareil portant cette ID est déjà présent.",
-    "A negative number of days doesn't make sense.": "Ce champ n'accepte qu'un entier positif ou nul.",
+    "A device with that ID is already added.": "A device with that ID is already added.",
+    "A negative number of days doesn't make sense.": "Un nombre négatif de jours n'a pas de sens.",
    "A new major version may not be compatible with previous versions.": "Une nouvelle version majeure peut présenter des incompatibilités avec les versions antérieures.",
    "API Key": "Clé API",
    "About": "À propos",
    "Actions": "Actions",
    "Add": "Ajouter",
-    "Add Device": "Ajouter un appareil",
-    "Add Folder": "Ajouter un partage",
-    "Add Remote Device": "Ajouter un appareil distant",
-    "Add new folder?": "Ajouter un nouveau partage ?",
+    "Add Device": "Ajouter un périphérique",
+    "Add Folder": "Ajouter un répertoire",
+    "Add Remote Device": "Add Remote Device",
+    "Add new folder?": "Ajouter un nouveau dossier ?",
    "Address": "Adresse",
    "Addresses": "Adresses",
    "Advanced": "Avancé",
    "Advanced Configuration": "Configuration avancée",
-    "Advanced settings": "Réglages experts",
+    "Advanced settings": "Advanced settings",
    "All Data": "Toutes les données",
-    "Allow Anonymous Usage Reporting?": "Autoriser l'envoi de statistiques d'utilisation anonymisées ?",
+    "Allow Anonymous Usage Reporting?": "Autoriser le rapport anonyme de statistiques d'utilisation ?",
    "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 répertoire synchronisé.",
+    "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.": "Tout appareil ajouté depuis un appareil introducteur sera aussi ajouté sur votre appareil.",
+    "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.",
    "Automatic upgrades": "Mises à jour automatiques",
    "Be careful!": "Faites attention !",
    "Bugs": "Bugs",
    "CPU Utilization": "Utilisation du CPU",
    "Changelog": "Historique des changements",
-    "Clean out after": "Purger après :",
+    "Clean out after": "Nettoyer après",
    "Close": "Fermer",
    "Command": "Commande",
    "Comment, when used at the start of a line": "Commentaire lorsque utilisé en début de ligne",
    "Compression": "Compression",
    "Connection Error": "Erreur de connexion",
-    "Connection Type": "Type de connexion",
    "Copied from elsewhere": "Copié d'ailleurs",
    "Copied from original": "Copié depuis l'original",
-    "Copyright © 2014-2016 the following Contributors:": "Les contributeurs suivants, Copyright © 2014-2016 :",
+    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 the following Contributors:",
    "Copyright © 2015 the following Contributors:": "Copyright © 2015 Les contributeurs suivants:",
-    "Danger!": "Attention !",
+    "Danger!": "Danger!",
    "Delete": "Supprimer",
    "Deleted": "Supprimé",
-    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "L'appareil \"{{name}}\" ({{device}} à l'IP {{address}}) souhaite se connecter. L'acceptez-vous ?",
-    "Device ID": "ID de l'appareil",
+    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Device \"{{name}}\" ({{device}} at {{address}}) wants to connect. Add new device?",
+    "Device ID": "ID du périphérique",
    "Device Identification": "Identification de l'appareil",
-    "Device Name": "Nom de l'appareil",
+    "Device Name": "Nom du périphérique",
    "Device {%device%} ({%address%}) wants to connect. Add new device?": "L'appareil {{device}} ({{address}}) veut se connecter. Voulez-vous ajouter cette appareil ?",
    "Devices": "Appareil",
    "Disconnected": "Déconnecté",
-    "Discovery": "Découverte",
+    "Discovery": "Discovery",
    "Documentation": "Documentation",
    "Download Rate": "Débit de réception",
    "Downloaded": "Téléchargé",
    "Downloading": "En cours de téléchargement",
-    "Edit": "Modifier",
-    "Edit Device": "Modifier l'appareil",
-    "Edit Folder": "Modifier le partage",
+    "Edit": "Éditer",
+    "Edit Device": "Éditer le périphérique",
+    "Edit Folder": "Éditer le répertoire",
    "Editing": "Édition",
-    "Enable NAT traversal": "Activer transfert d'adresses NAT",
-    "Enable Relaying": "Activer le relayage",
+    "Enable NAT traversal": "Enable NAT traversal",
+    "Enable Relaying": "Enable Relaying",
    "Enable UPnP": "Activer l'UPnP",
    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Entrer les adresses (\"tcp://ip:port\" ou \"tcp://host:port\") séparées par une virgule ou \"dynamic\" afin d'activer la recherche automatique de l'adresse.",
    "Enter ignore patterns, one per line.": "Entrer les masques de filtrage, un par ligne.",
@@ -67,16 +66,15 @@
    "File Pull Order": "Ordre de récupération de fichier",
    "File Versioning": "Versions de fichier",
    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Les bits de permission de fichier sont ignorés lors de la recherche de changements. Utilisé sur les systèmes de fichiers FAT.",
-    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Les fichiers sont déplacés vers le répertoire .stversions quand ils sont remplacés ou effacés par Syncthing.",
-    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Les fichiers sont déplacés, avec horodatage, dans le répertoire .stversions quand ils sont remplacés ou supprimés par Syncthing.",
+    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Les fichiers sont déplacés vers le dossier .stversions quand ils sont remplacés ou effacés par Syncthing.",
+    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Les fichiers sont déplacés, avec horodatage, dans le dossier .stversions quand ils sont remplacés ou supprimés par Syncthing.",
    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Les fichiers sont protégés des changements réalisés sur les autres appareils, mais les changements réalisés sur cet appareil seront transférés aux autres appareils.",
-    "Folder": "Partage",
-    "Folder ID": "ID du partage",
-    "Folder Label": "Étiquette du partage",
-    "Folder Master": "Partage maître",
-    "Folder Path": "Chemin racine du partage",
-    "Folder Type": "Type de partage",
-    "Folders": "Partages",
+    "Folder": "Dossier",
+    "Folder ID": "ID du répertoire",
+    "Folder Label": "Folder Label",
+    "Folder Master": "Répertoire maître",
+    "Folder Path": "Chemin du répertoire",
+    "Folders": "Dossiers",
    "GUI": "GUI",
    "GUI Authentication Password": "Mot de passe d'authentification GUI",
    "GUI Authentication User": "Utilisateur autorisé GUI",
@@ -84,29 +82,26 @@
    "Generate": "Générer",
    "Global Discovery": "Recherche globale",
    "Global Discovery Server": "Serveur global de recherche",
-    "Global Discovery Servers": "Serveurs de découverte globale",
+    "Global Discovery Servers": "Global Discovery Servers",
    "Global State": "État global",
    "Help": "Aide",
    "Home page": "Page d'accueil",
    "Ignore": "Ignorer",
-    "Ignore Patterns": "Règles d'exclusion",
+    "Ignore Patterns": "Modèles à éviter",
    "Ignore Permissions": "Ignorer les permissions",
    "Incoming Rate Limit (KiB/s)": "Limite du débit entrant (KiB/s)",
-    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Une configuration incorrecte peut créer des dommages dans vos répertoires et mettre Syncthing hors-service.",
-    "Introducer": "Introducteur",
+    "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)",
    "Keep Versions": "Conserver les versions",
    "Largest First": "Les plus volumineux en premier",
    "Last File Received": "Dernier fichier reçu",
-    "Last Scan": "Dernière analyse",
    "Last seen": "Dernière apparition",
    "Later": "Plus tard",
-    "Listeners": "Systèmes à l'écoute",
    "Local Discovery": "Recherche locale",
    "Local State": "État local",
    "Local State (Total)": "État local (Total)",
    "Major Upgrade": "Mise à jour majeure",
-    "Master": "Maître",
    "Maximum Age": "Ancienneté maximum",
    "Metadata Only": "Métadonnées uniquement",
    "Minimum Free Disk Space": "Espace disque libre minimum",
@@ -114,72 +109,71 @@
    "Multi level wildcard (matches multiple directory levels)": "Astérisque à plusieurs niveaux (correspond aux répertoires et sous-répertoires)",
    "Never": "Jamais",
    "New Device": "Nouvel appareil",
-    "New Folder": "Nouveau partage",
+    "New Folder": "Nouveau dossier",
    "Newest First": "Les plus récents en premier",
    "No": "Non",
-    "No File Versioning": "Pas de préservation",
-    "Normal": "Normal",
+    "No File Versioning": "Pas de version de fichier",
    "Notice": "Notification",
    "OK": "OK",
    "Off": "Éteint",
    "Oldest First": "Les plus anciens en premier",
-    "Optional descriptive label for the folder. Can be different on each device.": "Étiquette conviviale pour le partage. Elle peut être différente sur chaque appareil.",
+    "Optional descriptive label for the folder. Can be different on each device.": "Optional descriptive label for the folder. Can be different on each device.",
    "Options": "Options",
    "Out of Sync": "Désynchronisé",
    "Out of Sync Items": "Objets non synchronisés",
    "Outgoing Rate Limit (KiB/s)": "Limite du débit sortant (KiB/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 répertoire sur l'ordinateur local sera créé si il n'existe pas. Le caractère tilde (~) peut être utilisé comme raccourci vers",
+    "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)",
    "Pause": "Pause",
    "Paused": "En pause",
    "Please consult the release notes before performing a major upgrade.": "Veuillez consulter les notes de version avant de réaliser une mise à jour majeure.",
-    "Please set a GUI Authentication User and Password in the Settings dialog.": "Veuillez définir un nom d'utilisateur et un mot de passe dans les réglages.",
+    "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 wait": "Merci de patienter",
    "Preview": "Aperçu",
    "Preview Usage Report": "Aperçu du rapport de statistiques d'utilisation",
    "Quick guide to supported patterns": "Guide rapide des masques supportés",
    "RAM Utilization": "Utilisation de la RAM",
    "Random": "Aléatoire",
-    "Relay Servers": "Serveurs relais",
+    "Relay Servers": "Relay Servers",
    "Relayed via": "Relayée par",
    "Relays": "Relais",
    "Release Notes": "Notes de version",
-    "Remote Devices": "Appareils distants",
+    "Remote Devices": "Remote Devices",
    "Remove": "Enlever",
-    "Required identifier for the folder. Must be the same on all cluster devices.": "Identifiant obligatoire du partage. Il doit être identique chez chaque participant.",
-    "Rescan": "Réanalyser",
+    "Required identifier for the folder. Must be the same on all cluster devices.": "Required identifier for the folder. Must be the same on all cluster devices.",
+    "Rescan": "Rescanner",
    "Rescan All": "Réanalyser tout",
-    "Rescan Interval": "Intervalle d'analyse",
+    "Rescan Interval": "Intervalle de scan",
    "Restart": "Redémarrer",
    "Restart Needed": "Redémarrage nécessaire",
    "Restarting": "Redémarrage",
-    "Resume": "Reprise",
+    "Resume": "Résumer",
    "Reused": "Réutilisé",
    "Save": "Sauver",
-    "Scan Time Remaining": "Temps d'analyse restant",
-    "Scanning": "Analyse en cours",
-    "Select the devices to share this folder with.": "Synchroniser avec :",
-    "Select the folders to share with this device.": "Sélectionner les partages auxquels participe cet appareil.",
+    "Scan Time Remaining": "Scan Time Remaining",
+    "Scanning": "En cours de scan",
+    "Select the devices to share this folder with.": "Sélectionner les appareils avec qui partager ce dossier.",
+    "Select the folders to share with this device.": "Sélectionner les dossiers à partager avec cet appareil.",
    "Settings": "Configuration",
    "Share": "Partager",
-    "Share Folder": "Partager",
-    "Share Folders With Device": "Partages avec cet appareil",
-    "Share With Devices": "Synchroniser avec des appareils",
-    "Share this folder?": "Acceptez-vous ce partage ?",
-    "Shared With": "Synchronisé avec",
-    "Short identifier for the folder. Must be the same on all cluster devices.": "Identifiant court du partage. Il sera le même sur l'ensemble des appareils du groupe.",
-    "Show ID": "Afficher mon ID",
-    "Show QR": "Afficher l'image QR",
+    "Share Folder": "Partager le dossier",
+    "Share Folders With Device": "Partager des dossiers avec des appareils",
+    "Share With Devices": "Partage avec des appareils",
+    "Share this folder?": "Voulez-vous partager ce dossier ?",
+    "Shared With": "Partagé avec",
+    "Short identifier for the folder. Must be the same on all cluster devices.": "Identifiant court du dossier. Il doit être le même sur l'ensemble des appareils du groupe.",
+    "Show ID": "Montrer l'ID",
+    "Show QR": "Show QR",
    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Affiché à la place de l'ID de l'appareil dans le groupe. Sera proposé aux autres appareils comme nom optionnel par défaut.",
    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Affiché à la place de l'ID de l'appareil dans le groupe. Si laissé vide, il sera mis à jour par le nom proposé par l'appareil distant.",
-    "Shutdown": "Arrêter",
-    "Shutdown Complete": "Arrêté !",
-    "Simple File Versioning": "Suivi simple des versions de fichiers",
-    "Single level wildcard (matches within a directory only)": "Astérisque à un seul niveau (correspond uniquement à l’intérieur du répertoire)",
+    "Shutdown": "Éteindre",
+    "Shutdown Complete": "Extinction terminée",
+    "Simple File Versioning": "Suivi simple des versions de fichier",
+    "Single level wildcard (matches within a directory only)": "Astérisque à un seul niveau (correspond uniquement à l’intérieur du dossier)",
    "Smallest First": "Les plus petits en premier",
    "Source Code": "Code source",
-    "Staggered File Versioning": "Versions échelonnées de fichiers",
+    "Staggered File Versioning": "Versions échelonnées de fichier",
    "Start Browser": "Démarrer le navigateur web",
    "Statistics": "Statistiques",
    "Stopped": "Arrêté",
@@ -192,20 +186,19 @@
    "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 avoir un problème pour traiter votre demande. S'il vous plait, rafraichissez la page ou redémarrer Syncthing si le problème persiste.",
-    "The Syncthing admin interface is configured to allow remote access without a password.": "L'interface d'administration de Syncthing est configuré pour accepter l'accès distant sans mot de passe !",
-    "The aggregated statistics are publicly available at the URL below.": "Les statistiques aggrégées sont publiquement disponibles à l'adresse ci-dessous.",
+    "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 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é enregistré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.",
-    "The device ID to enter here can be found in the \"Actions > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "L'ID d'appareil à saisir ici se trouve dans le menu \"Actions > Afficher mon ID\" sur l'appareil distant. Les tirets et espaces sont optionnels (et ignorés).",
-    "The device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "L'ID de machine à saisir ici se trouve dans le menu \"Actions > Afficher mon ID\" de l'appareil distant. Les tirets et espaces sont optionnels (et ignorés).",
-    "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.": "Le rapport d'utilisation chiffré est envoyé quotidiennement. Il sert à répertorier les plateformes utilisées, la taille des partages et les versions de l'application. Si les données rapportées sont modifiées cette boite de dialogue vous redemandera votre confirmation.",
+    "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).": "L'ID de l'appareil à entrer peut être trouvé dans le menu \"Éditer > Montrer l'ID\" des autres appareils. Les espaces et les tirets sont optionnels (ils seront ignorés).",
+    "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.": "Le rapport d'utilisation chiffré est envoyé quotidiennement. Il sert à répertorier les plateformes utilisées, la taille des dossiers et les versions de l'application. Si les données rapportées sont modifiées cette boite de dialogue vous redemandera votre confirmation.",
    "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.": "L'ID de l'appareil inséré ne semble pas être valide. Il devrait ressembler à une chaîne de 52 ou 56 caractères comprenant des lettres, des chiffres et potentiellement des espaces et des traits d'union.",
-    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "Le premier paramètre de ligne de commande est le chemin du répertoire partagé, et le second est le chemin relatif dans le répertoire.",
-    "The folder ID cannot be blank.": "L'identifiant du partage ne peut être vide.",
-    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "L'ID du partage doit être un identifiant court (64 caractères ou moins) comprenant uniquement des lettres, chiffre, points (.), traits d'union (-) et tirets bas (_).",
-    "The folder ID must be unique.": "L'ID du partage doit être unique.",
-    "The folder path cannot be blank.": "Le chemin vers le répertoire ne peut pas être vide.",
+    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "Le premier paramètre de ligne de commande est le chemin du dossier, et le second est le chemin relatif dans le dossier.",
+    "The folder ID cannot be blank.": "L'identifiant (ID) du dossier ne peut être vide.",
+    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "L'ID du dossier doit être un identifiant court (64 caractères ou moins) comprenant uniquement des lettres, chiffre, points (.), traits d'union (-) et tirets bas (_).",
+    "The folder ID must be unique.": "L'ID du répertoire doit être unique.",
+    "The folder path cannot be blank.": "Le chemin du répertoire ne peut pas être vide.",
    "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "Les intervalles suivant sont utilisés: la première heure une version est conservée chaque 30 secondes, le premier jour une version est conservée chaque heure, les premiers 30 jours une version est conservée chaque jour, jusqu'à la limite d'âge maximum une version est conservée chaque semaine.",
    "The following items could not be synchronized.": "Les éléments suivants ne peuvent pas être synchronisés.",
    "The maximum age must be a number and cannot be blank.": "L'âge maximum doit être un nombre et ne peut être vide.",
@@ -219,10 +212,10 @@
    "The rate limit must be a non-negative number (0: no limit)": "La limite de débit ne doit pas être négative (0: Aucune limite)",
    "The rescan interval must be a non-negative number of seconds.": "L'intervalle d'analyse ne doit pas être un nombre négatif de secondes.",
    "They are retried automatically and will be synced when the error is resolved.": "Ils seront réessayés automatiquement et synchronisés quand l'erreur sera résolue.",
-    "This Device": "Cet appareil",
-    "This can easily give hackers access to read and change any files on your computer.": "Ceci peut aisément permettre à un intrus de lire et modifier n'importe quel fichier de votre ordinateur.  ",
+    "This Device": "This Device",
+    "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.": "Ceci est une mise à jour majeure.",
-    "Trash Can File Versioning": "Style poubelle.",
+    "Trash Can File Versioning": "Gestion des versions de fichier style poubelle.",
    "Unknown": "Inconnu",
    "Unshared": "Non partagé",
    "Unused": "Non utilisé",
@@ -237,15 +230,15 @@
    "Version": "Version",
    "Versions Path": "Emplacement des versions",
    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Les versions seront supprimées automatiquement, si elles dépassent la durée maximum de conservation, ou si leur nombre est supérieur à la valeur autorisée dans l'intervalle.",
-    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Attention, ce chemin est un sous-répertoire du partage existant \"{{otherFolder}}\". Ceci peut causer des problèmes tels que duplications de fichiers ou suppressions intempestives sur les autres machines.",
+    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Warning, this path is a subdirectory of an existing folder \"{{otherFolder}}\".",
    "When adding a new device, keep in mind that this device must be added on the other side too.": "Lorsqu'un appareil est ajouté, gardez à l'esprit que cet appareil doit aussi être ajouté de l'autre coté.",
-    "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.": "Lorsqu'un nouveau partage est ajouté, gardez à l'esprit que son ID est utilisée pour lier les répertoires à travers les appareils. L'ID est sensible à la casse et sera forcément la même sur toutes les appareils participant à ce partage.",
+    "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.": "Lorsqu'un nouveau répertoire est ajouté, gardez à l'esprit que son ID est utilisé pour lier les répertoires à travers les appareils. Les ID sont sensibles à la casse et doivent être identiques à travers tous les nœuds.",
    "Yes": "Oui",
    "You must keep at least one version.": "Vous devez garder au minimum une version.",
    "days": "Jours",
    "full documentation": "documentation complète",
    "items": "éléments",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} vous invite au partage \"{{folderLabel}}\".",
-    "{%device%} wants to share folder \"{%folderLabel%}\" ({%folder%}).": "{{device}} vous invite au partage \"{{folderLabel}}\" ({{folder}}).",
-    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} vous invite au partage \"{{folderLabel}}\" ({{folder}})."
+    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} veut partager le dossier \"{{folder}}\".",
+    "{%device%} wants to share folder \"{%folderLabel%}\" ({%folder%}).": "{{device}} wants to share folder \"{{folderLabel}}\" ({{folder}}).",
+    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} wants to share folder \"{{folderlabel}}\" ({{folder}})."
 }
@@ -1,38 +1,37 @@
 {
-    "A device with that ID is already added.": "L'appareil portant cette ID est déjà présent.",
-    "A negative number of days doesn't make sense.": "Ce champ n'accepte qu'un entier positif ou nul.",
+    "A device with that ID is already added.": "Une machine avec cet ID a déjà été ajoutée.",
+    "A negative number of days doesn't make sense.": "Un nombre négatif de jours n'a pas de sens.",
    "A new major version may not be compatible with previous versions.": "Une nouvelle version majeure peut présenter des incompatibilités avec les versions antérieures.",
    "API Key": "Clé API",
    "About": "À propos",
    "Actions": "Actions",
    "Add": "Ajouter",
-    "Add Device": "Ajouter un appareil",
-    "Add Folder": "Ajouter un partage",
-    "Add Remote Device": "Ajouter un appareil distant",
-    "Add new folder?": "Ajouter un nouveau partage ?",
+    "Add Device": "Ajouter une machine",
+    "Add Folder": "Ajouter un dossier",
+    "Add Remote Device": "Ajouter une machine distante",
+    "Add new folder?": "Ajouter un nouveau dossier ?",
    "Address": "Adresse",
    "Addresses": "Adresses",
    "Advanced": "Avancé",
    "Advanced Configuration": "Configuration avancée",
    "Advanced settings": "Configuration avancée",
    "All Data": "Toutes les données",
-    "Allow Anonymous Usage Reporting?": "Autoriser l'envoi de statistiques d'utilisation anonymisées ?",
+    "Allow Anonymous Usage Reporting?": "Autoriser le rapport anonyme de statistiques d'utilisation ?",
    "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 répertoire synchronisé.",
+    "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.": "Tout appareil ajouté depuis un appareil introducteur sera aussi ajouté sur cet appareil.",
+    "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",
    "CPU Utilization": "Utilisation du CPU",
    "Changelog": "Historique des changements",
-    "Clean out after": "Purger après :",
+    "Clean out after": "Nettoyer après",
    "Close": "Fermer",
    "Command": "Commande",
    "Comment, when used at the start of a line": "Commentaire lorsque utilisé en début de ligne",
    "Compression": "Compression",
    "Connection Error": "Erreur de connexion",
-    "Connection Type": "Type de connexion",
    "Copied from elsewhere": "Copié d'ailleurs",
    "Copied from original": "Copié depuis l'original",
    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016, les contributeurs suivants:",
@@ -40,101 +39,96 @@
    "Danger!": "Attention !",
    "Delete": "Supprimer",
    "Deleted": "Supprimé",
-    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "L'appareil \"{{name}}\" ({{device}} à {{address}}) veut se connecter. L'acceptez-vous ?",
-    "Device ID": "ID de l'appareil",
-    "Device Identification": "Identifiant de l'appareil",
-    "Device Name": "Nom de l'appareil",
-    "Device {%device%} ({%address%}) wants to connect. Add new device?": "L'appareil {{device}} ({{address}}) veut se connecter. Voulez-vous l'ajouter ?",
-    "Devices": "Appareils",
+    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "La machine \"{{name}}\" ({{device}} sur {{address}}) veut se connecter. Ajouter cette nouvelle machine ?",
+    "Device ID": "ID de la machine",
+    "Device Identification": "Identifiant de la machine",
+    "Device Name": "Nom de la machine",
+    "Device {%device%} ({%address%}) wants to connect. Add new device?": "La machine {{device}} ({{address}}) veut se connecter. Voulez-vous ajouter cette machine ?",
+    "Devices": "Machines",
    "Disconnected": "Déconnecté",
    "Discovery": "Découverte",
    "Documentation": "Documentation",
    "Download Rate": "Vitesse de réception",
    "Downloaded": "Téléchargé",
    "Downloading": "En cours de téléchargement",
-    "Edit": "Modifier",
-    "Edit Device": "Modifier l'appareil",
-    "Edit Folder": "Modifier le partage",
-    "Editing": "Modifications",
-    "Enable NAT traversal": "Activer la translation d'adresses (NAT)",
-    "Enable Relaying": "Relayage possible",
-    "Enable UPnP": "Activer UPnP",
+    "Edit": "Éditer",
+    "Edit Device": "Éditer la machine",
+    "Edit Folder": "Éditer le dossier",
+    "Editing": "Édition",
+    "Enable NAT traversal": "Activer le transfert NAT",
+    "Enable Relaying": "Activer le relayage",
+    "Enable UPnP": "Activer l'UPnP",
    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Entrer les adresses (\"tcp://ip:port\" ou \"tcp://host:port\") séparées par une virgule ou \"dynamic\" afin d'activer la recherche automatique de l'adresse.",
-    "Enter ignore patterns, one per line.": "Entrez les masques d'exclusion, un par ligne.",
+    "Enter ignore patterns, one per line.": "Entrer les masques de filtrage, un par ligne.",
    "Error": "Erreur",
    "External File Versioning": "Gestion externe des versions de fichiers",
    "Failed Items": "Fichiers en échec",
    "File Pull Order": "Ordre de récupération des fichiers",
-    "File Versioning": "Méthode de préservation des fichiers",
+    "File Versioning": "Versions de fichier",
    "File permission bits are ignored when looking for changes. Use on FAT file systems.": "Les bits de permission de fichier sont ignorés lors de la recherche de changements. Utilisé sur les systèmes de fichiers FAT.",
-    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Les fichiers sont déplacés dans le sous-répertoire .stversions quand ils sont remplacés ou supprimés par Syncthing.",
-    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Les fichiers sont déplacés et horodatés dans le sous-répertoire .stversions quand ils sont remplacés ou supprimés par Syncthing.",
-    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Les fichiers sont protégés des changements réalisés sur les autres appareils, mais les changements réalisés sur celui-ci seront transférés aux autres.",
-    "Folder": "Partage",
-    "Folder ID": "ID du partage",
-    "Folder Label": "Étiquette du partage",
-    "Folder Master": "Partage maître",
-    "Folder Path": "Chemin racine du partage",
-    "Folder Type": "Type de partage",
-    "Folders": "Partages",
+    "Files are moved to .stversions folder when replaced or deleted by Syncthing.": "Les fichiers sont déplacés vers le dossier .stversions quand ils sont remplacés ou effacés par Syncthing.",
+    "Files are moved to date stamped versions in a .stversions folder when replaced or deleted by Syncthing.": "Les fichiers sont déplacés, avec horodatage, dans le dossier .stversions quand ils sont remplacés ou supprimés par Syncthing.",
+    "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "Les fichiers sont protégés des changements réalisés sur les autres machines, mais les changements réalisés sur celle-ci seront transférés aux autres machines.",
+    "Folder": "Dossier",
+    "Folder ID": "ID du dossier",
+    "Folder Label": "Étiquette du dossier",
+    "Folder Master": "Dossier maître",
+    "Folder Path": "Chemin du dossier",
+    "Folders": "Dossiers",
    "GUI": "GUI",
    "GUI Authentication Password": "Mot de passe d'authentification GUI",
    "GUI Authentication User": "Utilisateur autorisé GUI",
    "GUI Listen Addresses": "Adresse du GUI",
    "Generate": "Générer",
    "Global Discovery": "Recherche globale",
-    "Global Discovery Server": "Serveur de découverte globale",
+    "Global Discovery Server": "Serveur global de recherche",
    "Global Discovery Servers": "Serveurs de découverte globale",
    "Global State": "État global",
    "Help": "Aide",
    "Home page": "Page d'accueil",
    "Ignore": "Ignorer",
-    "Ignore Patterns": "Exclusions ...",
+    "Ignore Patterns": "Modèles à éviter",
    "Ignore Permissions": "Ignorer les permissions",
    "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 répertoires et mettre Syncthing hors-service.",
-    "Introducer": "introducteur",
+    "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)",
    "Keep Versions": "Conserver les versions",
    "Largest First": "Les plus volumineux en premier",
    "Last File Received": "Dernier fichier reçu",
-    "Last Scan": "Dernière analyse",
    "Last seen": "Dernière apparition",
    "Later": "Plus tard",
-    "Listeners": "Systèmes en écoute",
-    "Local Discovery": "Découverte locale",
+    "Local Discovery": "Recherche locale",
    "Local State": "État local",
    "Local State (Total)": "État local (Total)",
    "Major Upgrade": "Mise à jour majeure",
-    "Master": "Maître",
    "Maximum Age": "Ancienneté maximum",
    "Metadata Only": "Métadonnées uniquement",
    "Minimum Free Disk Space": "Espace disque libre minimum",
    "Move to top of queue": "Déplacer en haut de la file",
    "Multi level wildcard (matches multiple directory levels)": "Astérisque à plusieurs niveaux (correspond aux répertoires et sous-répertoires)",
    "Never": "Jamais",
-    "New Device": "Nouvel appareil",
-    "New Folder": "Nouveau partage",
+    "New Device": "Nouvelle machine",
+    "New Folder": "Nouveau dossier",
    "Newest First": "Les plus récents en premier",
    "No": "Non",
-    "No File Versioning": "Pas de préservation",
-    "Normal": "Normal",
+    "No File Versioning": "Pas de version de fichier",
    "Notice": "Notification",
    "OK": "OK",
-    "Off": "Désactivé(e)",
+    "Off": "Éteint",
    "Oldest First": "Les plus anciens en premier",
-    "Optional descriptive label for the folder. Can be different on each device.": "Étiquette optionnelle pour le partage. Peut être différente sur chaque appareil.",
+    "Optional descriptive label for the folder. Can be different on each device.": "Étiquette optionnelle pour le dossier. Peut être différente pour chaque machine.",
    "Options": "Options",
    "Out of Sync": "Désynchronisé",
    "Out of Sync Items": "Fichiers non synchronisé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": "Chemin vers le répertoire dans l'appareil local. Il sera créé s'il n'existe pas. Le caractère tilde (~, ou ~+Espace sous Windows+Azerty) 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 copies doivent être conservées (laisser vide pour le chemin par défaut de .stversions dans le répertoire)",
+    "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)",
    "Pause": "Pause",
    "Paused": "En pause",
    "Please consult the release notes before performing a major upgrade.": "Veuillez consulter les notes de version avant de réaliser une mise à jour majeure.",
-    "Please set a GUI Authentication User and Password in the Settings dialog.": "Veuillez définir un nom d'utilisateur et un mot de passe dans la fenêtre de Configuration.",
+    "Please set a GUI Authentication User and Password in the Settings dialog.": "SVP, mettez un nom d'utilisateur et un mot de passe dans la fenêtre de paramétrage.",
    "Please wait": "Merci de patienter",
    "Preview": "Aperçu",
    "Preview Usage Report": "Aperçu du rapport de statistiques d'utilisation",
@@ -145,67 +139,66 @@
    "Relayed via": "Relayée par",
    "Relays": "Relais",
    "Release Notes": "Notes de version",
-    "Remote Devices": "Appareils distants",
+    "Remote Devices": "Machines distantes",
    "Remove": "Enlever",
-    "Required identifier for the folder. Must be the same on all cluster devices.": "Identifiant du partage. Doit être le même sur l'ensemble des appareils concernés.",
-    "Rescan": "Réanalyser",
+    "Required identifier for the folder. Must be the same on all cluster devices.": "Identifiant pour le dossier. Doit être le même sur l'ensemble des machines du cluster.",
+    "Rescan": "Réanalyse",
    "Rescan All": "Réanalyser tout",
    "Rescan Interval": "Intervalle d'analyse",
    "Restart": "Redémarrer",
    "Restart Needed": "Redémarrage nécessaire",
    "Restarting": "Redémarrage",
-    "Resume": "Reprise",
+    "Resume": "Résumer",
    "Reused": "Réutilisé",
-    "Save": "Enregistrer",
-    "Scan Time Remaining": "Temps d'analyse restant",
-    "Scanning": "Analyse en cours",
-    "Select the devices to share this folder with.": "Synchroniser avec :",
-    "Select the folders to share with this device.": "Sélectionner les partages auxquels participe cet appareil.",
+    "Save": "Sauver",
+    "Scan Time Remaining": "Intervalle entre chaque analyse",
+    "Scanning": "En cours d'analyse",
+    "Select the devices to share this folder with.": "Sélectionner les machines avec qui partager ce dossier.",
+    "Select the folders to share with this device.": "Sélectionner les dossiers à partager avec cette machine.",
    "Settings": "Configuration",
    "Share": "Partager",
-    "Share Folder": "Partager",
-    "Share Folders With Device": "Partages avec cet appareil",
-    "Share With Devices": "Synchroniser avec des appareils",
-    "Share this folder?": "Acceptez-vous ce partage ?",
-    "Shared With": "Synchronisé avec",
-    "Short identifier for the folder. Must be the same on all cluster devices.": "Identifiant court du partage. Il sera le même sur l'ensemble des appareils du groupe.",
-    "Show ID": "Afficher mon ID",
+    "Share Folder": "Partager le dossier",
+    "Share Folders With Device": "Partager des dossiers avec des machines",
+    "Share With Devices": "Partage avec des appareils",
+    "Share this folder?": "Voulez-vous partager ce dossier ?",
+    "Shared With": "Partagé avec",
+    "Short identifier for the folder. Must be the same on all cluster devices.": "Identifiant court du dossier. Il doit être le même sur l'ensemble des machines du groupe.",
+    "Show ID": "Afficher l'ID",
    "Show QR": "Afficher le QR",
-    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Affiché à la place de l'ID de l'appareil dans le groupe. Sera proposé aux autres appareils comme nom convivial par défaut.",
-    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Affiché à la place de l'ID de l'appareil dans le groupe. Si laissé vide, il sera mis à jour par le nom proposé par l'appareil distant.",
-    "Shutdown": "Arrêter",
-    "Shutdown Complete": "Arrêté !",
-    "Simple File Versioning": "Suivi simple des versions de fichiers",
-    "Single level wildcard (matches within a directory only)": "Astérisque à un seul niveau (correspond uniquement à l’intérieur du répertoire)",
+    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Affiché à la place de l'ID de la machine dans le groupe. Sera proposé aux autres machines comme nom optionnel par défaut.",
+    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Affiché à la place de l'ID de la machine dans le groupe. Si laissé vide, il sera mis à jour par le nom proposé par la machine distante.",
+    "Shutdown": "Éteindre",
+    "Shutdown Complete": "Extinction terminée",
+    "Simple File Versioning": "Suivi simple des versions de fichier",
+    "Single level wildcard (matches within a directory only)": "Astérisque à un seul niveau (correspond uniquement à l’intérieur du dossier)",
    "Smallest First": "Les plus petits en premier",
    "Source Code": "Code source",
-    "Staggered File Versioning": "Versions échelonnées de fichiers",
+    "Staggered File Versioning": "Versions échelonnées de fichier",
    "Start Browser": "Démarrer le navigateur web",
    "Statistics": "Statistiques",
    "Stopped": "Arrêté",
    "Support": "Aide",
    "Sync Protocol Listen Addresses": "Adresse d'écoute du protocole de synchronisation",
-    "Syncing": "Synchronisation en cours",
-    "Syncthing has been shut down.": "Syncthing a été arrêté.",
+    "Syncing": "En cours de synchronisation",
+    "Syncthing has been shut down.": "Syncthing a été éteint.",
    "Syncthing includes the following software or portions thereof:": "Syncthing intègre les logiciels suivants (ou des éléments provenant de ces logiciels) :",
    "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 arrêté, 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 avoir un problème pour traiter votre demande. S'il vous plaît, rafraichissez la page ou redémarrez Syncthing si le problème persiste.",
-    "The Syncthing admin interface is configured to allow remote access without a password.": "L'interface d'administration de Syncthing est paramétrée pour autoriser les accès à distance sans mot de passe !!!",
-    "The aggregated statistics are publicly available at the URL below.": "Les statistiques agrégées sont disponibles publiquement à l'adresse ci-dessous.",
+    "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 avoir un problème pour traiter votre demande. S'il vous plait, rafraichissez la page ou redémarrer Syncthing si le problème persiste.",
+    "The Syncthing admin interface is configured to allow remote access without a password.": "L'interface d'administration de Syncthing est paramétrée pour autoriser les accès à distance sans mot de passe.",
    "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é enregistré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.",
-    "The device ID to enter here can be found in the \"Actions > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "L'ID d'appareil à saisir ici se trouve dans le menu \"Actions > Afficher mon ID\" de l'appareil distant. Espaces et tirets sont optionnels (ignorés).",
-    "The device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "L'ID d'appareil à saisir ici se trouve dans le menu \"Modifications > Afficher mon ID\" de l'appareil distant. Les espaces et les tirets sont optionnels (ils seront ignorés).",
-    "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.": "Le rapport d'utilisation chiffré est envoyé quotidiennement. Il sert à répertorier les plateformes utilisées, la taille des partages et les versions de l'application. Si le jeu de données rapportées devait être changé, il vous sera demandé de le valider de nouveau via ce message.",
-    "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.": "L'ID de l'appareil inséré ne semble pas être valide. Il devrait ressembler à une chaîne de 52 ou 56 caractères comprenant des lettres, des chiffres et potentiellement des espaces et des traits d'union.",
-    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "Le premier paramètre de ligne de commande est le chemin du répertoire partagé, et le second est le chemin relatif dans le répertoire.",
-    "The folder ID cannot be blank.": "L'ID du partage ne peut être vide.",
-    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "L'ID du partage doit être un identifiant court (64 caractères ou moins), constitué de lettres, chiffres, points (.), tirets milieu (-) et tirets bas (_) seulement.",
-    "The folder ID must be unique.": "L'ID du partage doit être unique.",
-    "The folder path cannot be blank.": "Le chemin vers le répertoire ne peut pas être vide.",
+    "The device ID cannot be blank.": "L'ID de la machine ne peut être vide.",
+    "The device ID to enter here can be found in the \"Actions > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "L'ID de la machine à indiquer ici se trouve dans \"Actions > Afficher ID\" sur l'autre machine. Espaces et tirets sont optionnels (ignorés).",
+    "The device ID to enter here can be found in the \"Edit > Show ID\" dialog on the other device. Spaces and dashes are optional (ignored).": "L'ID de la machine à entrer peut être trouvé dans le menu \"Éditer > Montrer l'ID\" des autres machines. Les espaces et les tirets sont optionnels (ils seront ignorés).",
+    "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.": "Le rapport d'utilisation chiffré est envoyé quotidiennement. Il sert à répertorier les plateformes utilisées, la taille des dossiers et les versions de l'application. Si les données rapportées sont modifiées cette boite de dialogue vous redemandera votre confirmation.",
+    "The entered device ID does not look valid. It should be a 52 or 56 character string consisting of letters and numbers, with spaces and dashes being optional.": "L'ID de la machine inséré ne semble pas être valide. Il devrait ressembler à une chaîne de 52 ou 56 caractères comprenant des lettres, des chiffres et potentiellement des espaces et des traits d'union.",
+    "The first command line parameter is the folder path and the second parameter is the relative path in the folder.": "Le premier paramètre de ligne de commande est le chemin du dossier, et le second est le chemin relatif dans le dossier.",
+    "The folder ID cannot be blank.": "L'identifiant (ID) du dossier ne peut être vide.",
+    "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "L'ID du dossier doit être un identifiant court (64 caractères ou moins) comprenant uniquement des lettres, chiffre, points (.), traits d'union (-) et tirets bas (_).",
+    "The folder ID must be unique.": "L'ID du dossier doit être unique.",
+    "The folder path cannot be blank.": "Le chemin du dossier ne peut pas être vide.",
    "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "Les intervalles suivant sont utilisés: la première heure une version est conservée chaque 30 secondes, le premier jour une version est conservée chaque heure, les premiers 30 jours une version est conservée chaque jour, jusqu'à la limite d'âge maximum une version est conservée chaque semaine.",
    "The following items could not be synchronized.": "Les fichiers suivants ne peuvent pas être synchronisés.",
    "The maximum age must be a number and cannot be blank.": "L'âge maximum doit être un nombre et ne peut être vide.",
@@ -219,10 +212,10 @@
    "The rate limit must be a non-negative number (0: no limit)": "La limite de débit ne doit pas être négative (0: Aucune limite)",
    "The rescan interval must be a non-negative number of seconds.": "L'intervalle d'analyse ne doit pas être un nombre négatif de secondes.",
    "They are retried automatically and will be synced when the error is resolved.": "Ils seront réessayés automatiquement et synchronisés quand l'erreur sera résolue.",
-    "This Device": "Cet appareil",
-    "This can easily give hackers access to read and change any files on your computer.": "Ceci peut aisément permettre à un intrus de lire et modifier n'importe quel fichier de votre ordinateur.",
+    "This Device": "Cette machine",
+    "This can easily give hackers access to read and change any files on your computer.": "Cela permet facilement aux pirates de lire et modifier n'importe quel fichier de votre machine.",
    "This is a major version upgrade.": "Ceci est une mise à jour majeure.",
-    "Trash Can File Versioning": "Style poubelle",
+    "Trash Can File Versioning": "Gestion des versions de fichier style poubelle.",
    "Unknown": "Inconnu",
    "Unshared": "Non partagé",
    "Unused": "Non utilisé",
@@ -237,15 +230,15 @@
    "Version": "Version",
    "Versions Path": "Emplacement des versions",
    "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "Les versions seront supprimées automatiquement, si elles dépassent la durée maximum de conservation, ou si leur nombre est supérieur à la valeur autorisée dans l'intervalle.",
-    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Attention, ce chemin est un sous-répertoire du partage existant \"{{otherFolder}}\". Ceci peut causer des problèmes tels que duplications de fichiers ou suppressions intempestives sur les autres appareils.",
-    "When adding a new device, keep in mind that this device must be added on the other side too.": "Lorsqu'un appareil est ajouté, gardez à l'esprit que votre appareil doit aussi être ajoutée de l'autre coté.",
-    "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.": "Lorsqu'un nouveau partage est ajouté, gardez à l'esprit que son ID est utilisée pour lier les répertoires à travers les appareils. L'ID est sensible à la casse et sera forcément la même sur toutes les appareils participant à ce partage.",
+    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "Attention, ce chemin est un sous-répertoire du dossier existant \"{{otherFolder}}\".",
+    "When adding a new device, keep in mind that this device must be added on the other side too.": "Lorsqu'une machine est ajoutée, gardez à l'esprit que cette machine doit aussi être ajoutée de l'autre coté.",
+    "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.": "Lorsqu'un nouveau dossier est ajouté, gardez à l'esprit que son ID est utilisé pour lier les dossiers à travers les machines. Les ID sont sensibles à la casse et doivent être identiques à travers tous les nœuds.",
    "Yes": "Oui",
    "You must keep at least one version.": "Vous devez garder au minimum une version.",
    "days": "Jours",
    "full documentation": "documentation complète",
-    "items": "éléments",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} vous invite au partage \"{{folderLabel}}\".",
-    "{%device%} wants to share folder \"{%folderLabel%}\" ({%folder%}).": "{{device}} vous invite au partage \"{{folderLabel}}\" ({{folder}}).",
-    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} vous invite au partage \"{{folderLabel}}\" ({{folder}})."
+    "items": "fichiers",
+    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} veut partager le dossier \"{{folder}}\".",
+    "{%device%} wants to share folder \"{%folderLabel%}\" ({%folder%}).": "{{device}} veut partager le dossier \"{{folderLabel}}\" ({{folder}}).",
+    "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} veut partager le dossier \"{{folderLabel}}\" ({{folder}})."
 }
@@ -32,7 +32,6 @@
    "Comment, when used at the start of a line": "Kommentaar, wannear as brûkt by it begjin fan in rige",
    "Compression": "Kompresje",
    "Connection Error": "Ferbiningsflater",
-    "Connection Type": "Ferbiningstype",
    "Copied from elsewhere": "Oernommen fan earne oars",
    "Copied from original": "Oernommen fan orizjineel",
    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 de folgende bydragers:",
@@ -56,7 +55,7 @@
    "Edit Device": "Apparaat bewurkje",
    "Edit Folder": "Map bewurkje",
    "Editing": "Bewurkjen",
-    "Enable NAT traversal": "NAT-trochkruse ynskeakelje",
+    "Enable NAT traversal": "Enable NAT traversal",
    "Enable Relaying": "Trochjaan tastean",
    "Enable UPnP": "UPnP oansette",
    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Fier troch komma's skieden (\"tcp://ip:port\", \"tcp://host:port\") adressen yn of \"dynamic\" om automatyske ûntdekking fan it adres út te fieren.",
@@ -75,7 +74,6 @@
    "Folder Label": "Map-opskrift",
    "Folder Master": "Map-master",
    "Folder Path": "Map-paad",
-    "Folder Type": "Maptype",
    "Folders": "Mappen",
    "GUI": "GUI",
    "GUI Authentication Password": "Wachtwurd foar ferifikaasje yn GUI",
@@ -98,15 +96,12 @@
    "Keep Versions": "Ferzjes bewarje",
    "Largest First": "Grutste earst",
    "Last File Received": "Leste triem ûntfongen",
-    "Last Scan": "Lêst Skent",
    "Last seen": "Lêst sjoen",
    "Later": "Letter",
-    "Listeners": "Harkers",
    "Local Discovery": "Lokale ûntdekking",
    "Local State": "Lokale tastân",
    "Local State (Total)": "Lokale tastân (Folledich)",
    "Major Upgrade": "Wichtige fernijing",
-    "Master": "Master",
    "Maximum Age": "Maksimale âldens",
    "Metadata Only": "Allinnich metadata",
    "Minimum Free Disk Space": "Minimale frije skiifromte",
@@ -118,7 +113,6 @@
    "Newest First": "Nijste earst",
    "No": "Nee",
    "No File Versioning": "Gjin triemferzjebehear",
-    "Normal": "Normaal",
    "Notice": "Notysje",
    "OK": "Okee",
    "Off": "Ut",
@@ -193,7 +187,6 @@
    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "It liket dêrop dat Syncthing op dit stuit net rint, of der is in swierrichheid mei jo ynternetferbining. Wurd no opnij besocht...",
    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "It liket dêrop dat Syncthing swierrichheden ûnderfynt mei it ferwurkjen fan jo fersyk. Graach de stee ferfarskje of Syncthing werstarte as it probleem der bliuwt.",
    "The Syncthing admin interface is configured to allow remote access without a password.": "De Syncthing haadbrûker-ynterfaasje is sa ynstelt dat tagong fan ôfstân sûnder wachtwurd tastean is.",
-    "The aggregated statistics are publicly available at the URL below.": "De fersammele statistiken binnen yn it publyk beskikber fia ûndersteande keppeling.",
    "The aggregated statistics are publicly available at {%url%}.": "De fersammele statistiken binnen yn it publyk beskikber op {{url}}.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "De konfiguraasje is bewarre mar noch net aktivearre.  Syncthing moat werstarte om de nije konfiguraasje te aktivearren.",
    "The device ID cannot be blank.": "It apparaat-ID kin net leech wêze.",
@@ -17,7 +17,7 @@
    "Advanced settings": "Haladó beállítások",
    "All Data": "Minden adat",
    "Allow Anonymous Usage Reporting?": "Engedélyezed a névtelen felhasználási adatok küldését?",
-    "Alphabetic": "ABC sorrendben",
+    "Alphabetic": "ABC rendben",
    "An external command handles the versioning. It has to remove the file from the synced folder.": "Külső program kezeli a fájl verziókövetést. A fájlt  el kell távolítania a szinkronizált mappából.",
    "Anonymous Usage Reporting": "Névtelen felhasználási adatok küldése",
    "Any devices configured on an introducer device will be added to this device as well.": "A bevezető eszközön beállított minden eszköz hozzá lesz adva ehhez az eszközhöz is.",
@@ -32,9 +32,8 @@
    "Comment, when used at the start of a line": "Megjegyzés, a sor elején használva",
    "Compression": "Tömörítés",
    "Connection Error": "Kapcsolódási hiba",
-    "Connection Type": "Kapcsolat típus",
-    "Copied from elsewhere": "Máshonnan másolva",
-    "Copied from original": "Eredetiről másolva",
+    "Copied from elsewhere": "Másolva máshonnan",
+    "Copied from original": "Másolva az eredetiről",
    "Copyright © 2014-2016 the following Contributors:": "Szerzői jog © 2014-2016 az alábbi közreműködők:",
    "Copyright © 2015 the following Contributors:": "Copyright © 2015 az alábbi közreműködők:",
    "Danger!": "Veszély!",
@@ -75,7 +74,6 @@
    "Folder Label": "Mappa címke",
    "Folder Master": "Központi mappa",
    "Folder Path": "Mappa elérési útja",
-    "Folder Type": "Mappa típus",
    "Folders": "Mappák",
    "GUI": "Grafikus felület",
    "GUI Authentication Password": "Grafikus felület jelszava",
@@ -98,15 +96,12 @@
    "Keep Versions": "Megtartott verziók",
    "Largest First": "Nagyobb először",
    "Last File Received": "Utolsó beérkezett fájl",
-    "Last Scan": "Utolsó vizsgálat",
    "Last seen": "Utoljára látva",
    "Later": "Később",
-    "Listeners": "Kapcsolatok",
    "Local Discovery": "Helyi felfedezés",
    "Local State": "Helyi állapot",
    "Local State (Total)": "Helyi állapot (Teljes)",
    "Major Upgrade": "Főverzió frissítés",
-    "Master": "Központi",
    "Maximum Age": "Maximális kor",
    "Metadata Only": "Csak metaadatok",
    "Minimum Free Disk Space": "Minimális szabad lemezterület",
@@ -118,7 +113,6 @@
    "Newest First": "Újabb először",
    "No": "Nem",
    "No File Versioning": "Nincs fájl verziókövetés",
-    "Normal": "Normál",
    "Notice": "Megjegyzés",
    "OK": "Rendben",
    "Off": "Kikapcsolva",
@@ -177,7 +171,7 @@
    "Shutdown Complete": "Leállítás kész",
    "Simple File Versioning": "Egyszerű fájl verziókövetés",
    "Single level wildcard (matches within a directory only)": "Egyszintű helyettesítő karakter (csak egy mappára érvényes)",
-    "Smallest First": "Kisebb először",
+    "Smallest First": "Kisebb előbb",
    "Source Code": "Forráskód",
    "Staggered File Versioning": "Többszintű fájl verziókövetés",
    "Start Browser": "Böngésző indítása",
@@ -193,7 +187,6 @@
    "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 a hálózati kapcsolattal. Újra próbálom...",
    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Úgy tűnik, hogy a Syncthing problémába ütközött a kérés feldolgozása során. Ha a probléma továbbra is fennáll, akkor frissíteni kell az oldalt, vagy újra kell indítani a Syncthinget.",
    "The Syncthing admin interface is configured to allow remote access without a password.": "A Syncthing adminisztrációs felületének távoli elérése be van kapcsolva jelszó nélkül.",
-    "The aggregated statistics are publicly available at the URL below.": "Az összesített statisztikák elérhetők az alábbi címen.",
    "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.",
@@ -210,7 +203,7 @@
    "The following items could not be synchronized.": "A következő elemek nem szinkronizálhatóak.",
    "The maximum age must be a number and cannot be blank.": "A maximális kornak számnak kell lenni és nem lehet üres",
    "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "A verziók megtartásának maximális ideje (napokban, ha 0-t adsz meg örökre megmaradnak).",
-    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "A minimális szabad terület százalékos, nem-negatív értéke 0 és 100 között",
+    "The minimum free disk space percentage must be a non-negative number between 0 and 100 (inclusive).": "A minimális szabad terület százalékos. nem-negatív érték 0 és 100 között",
    "The number of days must be a number and cannot be blank.": "A napok száma szám kell legyen és nem lehet üres.",
    "The number of days to keep files in the trash can. Zero means forever.": "A napok száma ameddig a fájlok meg lesznek tartva a szemetesben. A 0 azt jelenti örökre.",
    "The number of old versions to keep, per file.": "A megtartott régi verziók száma, fájlonként.",
@@ -220,7 +213,7 @@
    "The rescan interval must be a non-negative number of seconds.": "Az átnézési intervallum nullánál nagyobb másodperc érték kell legyen",
    "They are retried automatically and will be synced when the error is resolved.": "A hiba javítása után automatikusan újra megpróbálja a szinkronizálást.",
    "This Device": "Ez az eszköz",
-    "This can easily give hackers access to read and change any files on your computer.": "Így a hekkerek könnyedén hozzáférést szerezhetnek a gépeden tárolt fájlok olvasásához és módosításához.",
+    "This can easily give hackers access to read and change any files on your computer.": "Így a hekkerek könnyedén hozzáférhetnek a számítógépen található fájlokhoz. ",
    "This is a major version upgrade.": "Ez egy főverzió frissítés.",
    "Trash Can File Versioning": "Szemetes fájl verziókövetés",
    "Unknown": "Ismeretlen",
@@ -241,7 +234,7 @@
    "When adding a new device, keep in mind that this device must be added on the other side too.": "Amikor új eszközt adsz hozzá, tartsd észben, hogy a másik oldalon ezt az eszközt is hozzá kell adni.",
    "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.": "Amikor új mappát adsz hozzá, tartsd észben, hogy a mappa azonosító arra való hogy összekösd a mappákat az eszközeiden. Az azonosító kisbetű-nagybetű érzékeny és pontosan egyeznie kell az eszközökön.",
    "Yes": "Igen",
-    "You must keep at least one version.": "Legalább egy verziót meg kell tartanod.",
+    "You must keep at least one version.": "Legalább egy verziót meg kell tartanod",
    "days": "nap",
    "full documentation": "teljes dokumentáció",
    "items": "elem",
@@ -32,7 +32,6 @@
    "Comment, when used at the start of a line": "Komentar, digunakan saat awal baris",
    "Compression": "Kompresi",
    "Connection Error": "Koneksi Galat",
-    "Connection Type": "Connection Type",
    "Copied from elsewhere": "Tersalin dari tempat lain",
    "Copied from original": "Tersalin dari asal",
    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 the following Contributors:",
@@ -75,7 +74,6 @@
    "Folder Label": "Folder Label",
    "Folder Master": "Master Folder",
    "Folder Path": "Path Folder",
-    "Folder Type": "Folder Type",
    "Folders": "Folder",
    "GUI": "GUI",
    "GUI Authentication Password": "Sandi Otentikasi GUI",
@@ -98,15 +96,12 @@
    "Keep Versions": "Keep Versions",
    "Largest First": "Largest First",
    "Last File Received": "Last File Received",
-    "Last Scan": "Last Scan",
    "Last seen": "Last seen",
    "Later": "Later",
-    "Listeners": "Listeners",
    "Local Discovery": "Local Discovery",
    "Local State": "Local State",
    "Local State (Total)": "Local State (Total)",
    "Major Upgrade": "Major Upgrade",
-    "Master": "Master",
    "Maximum Age": "Maximum Age",
    "Metadata Only": "Metadata Only",
    "Minimum Free Disk Space": "Minimum Free Disk Space",
@@ -118,7 +113,6 @@
    "Newest First": "Newest First",
    "No": "No",
    "No File Versioning": "No File Versioning",
-    "Normal": "Normal",
    "Notice": "Notice",
    "OK": "OK",
    "Off": "Off",
@@ -193,7 +187,6 @@
    "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 refresh the page or restart Syncthing if the problem persists.",
    "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 aggregated statistics are publicly available at the URL below.": "The aggregated statistics are publicly available at the URL below.",
    "The aggregated statistics are publicly available at {%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/Show More
+++ b/Show More