8 Commits (fix_translation)