Changed i18n.csv encoding to UTF-8 (with BOM) to improve compatibility with Microsoft products for editing purposes.
Resolved merge conflict.