some fixes for #224 and translation update

Signed-off-by: Werner Macho <werner.macho@gmail.com>
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	docs/source/training/socialisation/run_basic_inasafe.rst