Translate fields in forms
Merge branch 'translate-fields'