Fixing newline issues
Merge branch 'weblate'