Implemented new format for mapping.json and updated code to work with it (implemented partly). Added new strings for translation.