Heri | #3531 & #3532 | Adding some translations