Update locale definitions and make rule descriptors consistent