mahmoud-adam85 and naira-cliqz Localization fixes