Merge branch 'master' into '581-icons-logo-should-be-uploaded-to-public'

# Conflicts:
#   CHANGELOG.rst

CHANGELOG.rst

@@ -18,6 +18,7 @@ Fixed
 ~~~~~
 
 * Correctly update theme colours on change again
+* Imprint is now called "Imprint" and not "Impress".
 * Logo files weren't uploaded to public namespace.
 
 `2.3.1`_ – 2021-12-17

aleksis/core/templates/core/base.html

@@ -180,7 +180,7 @@
         <span id="doit"></span>
         {% if request.site.preferences.footer__imprint_url %}
           <a class="blue-text text-lighten-4" href="{{ request.site.preferences.footer__imprint_url }}">
-            {% trans "Impress" %}
+            {% trans "Imprint" %}
           </a>
         {% endif %}
         {% if request.site.preferences.footer__privacy_url and request.site.preferences.footer__imprint_url %}