Update translations and make them more consistent