Fix use of translation helper
Merge branch 'distribution-plugin' into cirandas