Added locale handling and fixing l10n strings