Merge pull request #4406 from JosJuice/debug-i18n-comments Add debug i18n comments and revise existing i18n comments
