A few last fixes for HTML-escaped strings
Comment can be None apparently
Update the i18n.rst docs with the latest advice