Merge pull request #12726 from JosJuice/i18n-2024-04-20 i18n: Add comments and improve source strings
