Fixed a localization that didn't merge correctly.
Fixed line endings