Locale file update!
Fixing new merge conflicts.