Updating language files for 2.7.2.
Merging upstream and resolving conflicts