latest translations and merge from master