manual merge in of spanish translation