Translation context changes

I'll have to revisit this class to fix the concatenated string...