Merge pull request openedx#20600 from edx/nedbat/fix-trademark-notice

Correct the trademark notices

cms/templates/widgets/footer.html

@@ -1,10 +1,13 @@
+## mako
+<%page expression_filter="h"/>
 <%!
 from django.utils.translation import ugettext as _
 from django.urls import reverse
 from datetime import datetime
 from django.conf import settings
 import pytz
 from cms.djangoapps.contentstore.config.waffle import waffle, ENABLE_ACCESSIBILITY_POLICY_PAGE
+from openedx.core.djangolib.markup import HTML, Text
 %>
 
 <div class="wrapper-footer wrapper">
@@ -43,10 +46,10 @@
       <div class="footer-about-copyright">
         ## Site operators: Please do not remove this paragraph! This attributes back to edX and makes your acknowledgement of edX's trademarks clear.
         <p>
-          ## Translators: 'EdX', 'edX', 'Studio', and 'Open edX' are trademarks of 'edX Inc.'. Please do not translate any of these trademarks and company names.
-          ${_("EdX, Open edX, Studio, and the edX and Open edX logos are registered trademarks or trademarks of {link_start}edX Inc.{link_end}").format(
-            link_start=u"<a data-rel='edx.org' href='https://www.edx.org/'>",
-            link_end=u"</a>"
+          ## Translators: 'edX' and 'Open edX' are trademarks of 'edX Inc.'. Please do not translate any of these trademarks and company names.
+          ${Text(_("edX, Open edX, and the edX and Open edX logos are registered trademarks of {link_start}edX Inc.{link_end}")).format(
+            link_start=HTML(u"<a data-rel='edx.org' href='https://www.edx.org/'>"),
+            link_end=HTML(u"</a>")
           )}
         </p>
       </div>