Merge latest locale changes from 4.0