VIVO-636 update the language files
Merge branch 'maint-rel-1.6' into develop