Move more words into the locale file where they probably belong