Merge remote-tracking branch 'syncthing/pr/1553'

* syncthing/pr/1553:
  Add dzarda
  Added an "n", typo in a GUI string

AUTHORS

@@ -24,6 +24,7 @@ Felix Unterpaintner <[email protected]>
 Gilli Sigurdsson <[email protected]>
 Jakob Borg <[email protected]>
 James Patterson <[email protected]> <[email protected]>
+Jaroslav Malec <[email protected]>
 Jens Diemer <[email protected]> <[email protected]>
 Jochen Voss <[email protected]>
 Johan Vromans <[email protected]>

NICKS

@@ -18,6 +18,7 @@ calmh		<[email protected]>
 cdata		<[email protected]>
 ceh		<[email protected]>
 cqcallaw	<[email protected]>
+dzarda		<[email protected]>
 facastagnini	<[email protected]>
 filoozoom	<[email protected]>
 frioux		<[email protected]> <[email protected]>

gui/index.html

@@ -654,7 +654,7 @@
                   <p translate class="help-block">Path where versions should be stored (leave empty for the default .stversions folder in the folder).</p>
                 </div>
                 <div class="form-group" ng-if="currentFolder.fileVersioningSelector=='external'" ng-class="{'has-error': folderEditor.externalCommand.$invalid && folderEditor.externalCommand.$dirty}">
-                  <p translate class="help-block">A external command handles the versioning. It has to remove the file from the synced folder.</p>
+                  <p translate class="help-block">An external command handles the versioning. It has to remove the file from the synced folder.</p>
                   <label translate for="externalCommand">Command</label>
                   <input name="externalCommand" id="externalCommand" class="form-control" type="text" ng-model="currentFolder.externalCommand" required></input>
                   <p class="help-block">