Extracted strings of new layout for translation
Removed some unnecessary translations from old layout but not all yet
Merge branch 'feature/translation' into develop