Move more strings to intl