Revert "Merge branch 'dev-lang' into develop"
due to removed some needed strings by a mistake

This reverts commit c171d1ee10b4ed6c3230369bcc551c0ad9ac0af9, reversing
changes made to 5ed07122eaa2fcaeaa0d869f23ff4d82a52ff0b5.