Fix formatting and localization for #1805