Fix translation issues

Merge translating of images into translating of fields in template
functions