Fix translation

As well as links.
Merge branch 'ticket/120' into develop