More complete translation and dots consistency