octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-11-17 10:35:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* syncthing/pr/1553:
  Add dzarda
  Added an "n", typo in a GUI string
This commit is contained in:
Jakob Borg 2015-04-04 23:20:48 +02:00
commit 6d3003716c
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -24,6 +24,7 @@ Felix Unterpaintner <bigbear2nd@gmail.com>
Gilli Sigurdsson <gilli@vx.is> Gilli Sigurdsson <gilli@vx.is>
Jakob Borg <jakob@nym.se> Jakob Borg <jakob@nym.se>
James Patterson <jamespatterson@operamail.com> <jpjp@users.noreply.github.com> James Patterson <jamespatterson@operamail.com> <jpjp@users.noreply.github.com>
Jaroslav Malec <dzardacz@gmail.com>
Jens Diemer <github.com@jensdiemer.de> <git@jensdiemer.de> Jens Diemer <github.com@jensdiemer.de> <git@jensdiemer.de>
Jochen Voss <voss@seehuhn.de> Jochen Voss <voss@seehuhn.de>
Johan Vromans <jvromans@squirrel.nl> Johan Vromans <jvromans@squirrel.nl>

1
NICKS
View File

@ -18,6 +18,7 @@ calmh <jakob@nym.se>
cdata <chris@scriptolo.gy> cdata <chris@scriptolo.gy>
ceh <emil@hessman.se> ceh <emil@hessman.se>
cqcallaw <enlightened.despot@gmail.com> cqcallaw <enlightened.despot@gmail.com>
dzarda <dzardacz@gmail.com>
facastagnini <federico.castagnini@gmail.com> facastagnini <federico.castagnini@gmail.com>
filoozoom <philippe@schommers.be> filoozoom <philippe@schommers.be>
frioux <frew@afoolishmanifesto.com> <frioux@gmail.com> frioux <frew@afoolishmanifesto.com> <frioux@gmail.com>

2
gui/index.html
View File

@ -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> <p translate class="help-block">Path where versions should be stored (leave empty for the default .stversions folder in the folder).</p>
</div> </div>
<div class="form-group" ng-if="currentFolder.fileVersioningSelector=='external'" ng-class="{'has-error': folderEditor.externalCommand.$invalid && folderEditor.externalCommand.$dirty}"> <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> <label translate for="externalCommand">Command</label>
<input name="externalCommand" id="externalCommand" class="form-control" type="text" ng-model="currentFolder.externalCommand" required></input> <input name="externalCommand" id="externalCommand" class="form-control" type="text" ng-model="currentFolder.externalCommand" required></input>
<p class="help-block"> <p class="help-block">