improve translation & fix some issues

Merged Philip Müller requested to merge Jacobtey:patch-4 into master

Created by: Jacobtey

Merge request reports