implemented issue https://github.com/globaleaks/GlobaLeaks/issues/319
fixed a wrong english sentence
Merge branch 'master' of ssh://github.com/globaleaks/GLClient

Conflicts:
	app/scripts/translations.js
	app/views/admin/receivers.html
	app/views/receiver/preferences.html