Trim trailing spaces, remove unneeded keys, fix some translation