Completed i18n for #255