merge Typos and format fix from l10n wiki