updated locale file to fix a missed merge conflict