Fixed bugs with some i18n from #793; copied new i18n tags over.