Implement localization and fix existing localization to match changes