Merge "Rename language+country resources to just language"