Languages updated
manual merge