Update i18n strings

Might as well get the i18n strings up to date.  Includes the changes from #524 .