Tidying up internationalization Take 2

[skip ci]