Clean up and reorganize i18n strings [finishes #84]