Correct template namespace for translations, updated translations
Fixed globalisation for field list
Merge remote-tracking branch 'upstream/master'