Merge "Remove trailing spaces from some language files"