Merge pull request #1856 from rarila/master

Cleanup and translation in _relations.twig