diff --git a/src/authentic2/idp/saml/templates/idp/saml/unknown_provider.html b/src/authentic2/idp/saml/templates/idp/saml/unknown_provider.html
index 1134936b4..3db35c127 100644
--- a/src/authentic2/idp/saml/templates/idp/saml/unknown_provider.html
+++ b/src/authentic2/idp/saml/templates/idp/saml/unknown_provider.html
@@ -3,9 +3,9 @@
 
 {% block content %}
   <p>
-    {% blocktrans %}We were unable to load provider <tt>{{ entity_id }}</tt>.{% endblocktrans %}
+    {% blocktrans trimmed %}We were unable to load provider <tt>{{ entity_id }}</tt>.{% endblocktrans %}
     {% if request.user.is_staff %}
-      {% blocktrans %}
+      {% blocktrans trimmed %}
         You can <a href="{{ add_url }}">add</a> it now or <a href="">retry</a>.
       {% endblocktrans %}
     {% endif %}
diff --git a/src/authentic2/templates/authentic2/account_delete_notification_body.html b/src/authentic2/templates/authentic2/account_delete_notification_body.html
index 6d0649665..364b877ad 100644
--- a/src/authentic2/templates/authentic2/account_delete_notification_body.html
+++ b/src/authentic2/templates/authentic2/account_delete_notification_body.html
@@ -1,9 +1,9 @@
 {% load i18n %}
 <html>
   <body style="max-width: 90ex">
-    <p>{% blocktrans %}{{ full_name }},{% endblocktrans %}</p>
+    <p>{% blocktrans trimmed %}{{ full_name }},{% endblocktrans %}</p>
     <p>
-      {% blocktrans %}
+      {% blocktrans trimmed %}
         Your account on {{ site }} has been deleted.
         All related data will be deleted today.
         You cannot log in with it anymore.
diff --git a/src/authentic2/templates/authentic2/account_deletion_code_body.html b/src/authentic2/templates/authentic2/account_deletion_code_body.html
index c2ee2a94b..be2ebf563 100644
--- a/src/authentic2/templates/authentic2/account_deletion_code_body.html
+++ b/src/authentic2/templates/authentic2/account_deletion_code_body.html
@@ -1,9 +1,9 @@
 {% load i18n %}
 <html>
   <body style="max-width: 90ex">
-    <p>{% blocktrans %}{{ full_name }},{% endblocktrans %}</p>
+    <p>{% blocktrans trimmed %}{{ full_name }},{% endblocktrans %}</p>
     <p>
-      {% blocktrans %}
+      {% blocktrans trimmed %}
         Please click on {{ deletion_url }}
         if you want to validate your account deletion request on
         {{ site }}.
diff --git a/src/authentic2/templates/authentic2/accounts_delete_validation.html b/src/authentic2/templates/authentic2/accounts_delete_validation.html
index cf750256c..2d0f472d7 100644
--- a/src/authentic2/templates/authentic2/accounts_delete_validation.html
+++ b/src/authentic2/templates/authentic2/accounts_delete_validation.html
@@ -16,7 +16,7 @@
   <form method="post">
     {% csrf_token %}
     <p>
-      {% blocktrans %}
+      {% blocktrans trimmed %}
         You are about to delete the account of <strong>{{ user }}</strong>.
         This will remove all related personal data and you won't be able to log in with this account anymore.
       {% endblocktrans %}
diff --git a/src/authentic2/templates/authentic2/change_email.html b/src/authentic2/templates/authentic2/change_email.html
index c9199beeb..f4b63d180 100644
--- a/src/authentic2/templates/authentic2/change_email.html
+++ b/src/authentic2/templates/authentic2/change_email.html
@@ -12,7 +12,7 @@
 {% endblock %}
 
 {% block content %}
-  <p>{% blocktrans with email=user.email %}Your current email is {{ email }}.
+  <p>{% blocktrans trimmed with email=user.email %}Your current email is {{ email }}.
     An email will be sent to validate the new one.{% endblocktrans %}</p>
   <form method="post" class="pk-mark-optional-fields">
     {% csrf_token %}
diff --git a/src/authentic2/templates/interaction/consent_federation.html b/src/authentic2/templates/interaction/consent_federation.html
index a7f7ca7df..53c49d57f 100644
--- a/src/authentic2/templates/interaction/consent_federation.html
+++ b/src/authentic2/templates/interaction/consent_federation.html
@@ -10,7 +10,7 @@
   <div id="consent">
     <p>
       {% if provider_id %}
-        {% blocktrans with provider_id=provider_id %}
+        {% blocktrans trimmed with provider_id=provider_id %}
           Do you accept to federate your account with <strong>{{ provider_id }}</strong>?
         {% endblocktrans %}
       {% else %}
diff --git a/src/authentic2/templates/registration/password_change_form.html b/src/authentic2/templates/registration/password_change_form.html
index add6f93a3..68853fbd5 100644
--- a/src/authentic2/templates/registration/password_change_form.html
+++ b/src/authentic2/templates/registration/password_change_form.html
@@ -14,11 +14,11 @@
 {% block content %}
   <form method="post" action="." class="pk-mark-optional-fields">
     {% if user.has_usable_password %}
-      <p>{% blocktrans %}To change your password you must provide your current password, then provide
+      <p>{% blocktrans trimmed %}To change your password you must provide your current password, then provide
         the new password and confirm it.
       {% endblocktrans %}</p>
     {% else %}
-      <p>{% blocktrans %}You are going to define your account password.{% endblocktrans %}</p>
+      <p>{% blocktrans trimmed %}You are going to define your account password.{% endblocktrans %}</p>
     {% endif %}
     {% csrf_token %}
     {{ form|with_template }}
diff --git a/src/authentic2/templates/registration/password_reset_email.html b/src/authentic2/templates/registration/password_reset_email.html
index b33ae9965..50b466c18 100644
--- a/src/authentic2/templates/registration/password_reset_email.html
+++ b/src/authentic2/templates/registration/password_reset_email.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-{% blocktrans with hostname=request.get_host %}You requested reset of your password on {{ hostname }}, to proceed please
+{% blocktrans trimmed with hostname=request.get_host %}You requested reset of your password on {{ hostname }}, to proceed please
   click on the following link{% endblocktrans %}:
 {% block reset_link %}
   {{ reset_url }}
diff --git a/src/authentic2/templates/registration/password_reset_instructions.html b/src/authentic2/templates/registration/password_reset_instructions.html
index 19a3c1494..d92d34d05 100644
--- a/src/authentic2/templates/registration/password_reset_instructions.html
+++ b/src/authentic2/templates/registration/password_reset_instructions.html
@@ -11,24 +11,24 @@
   {% else %}
     <p>
       <strong>
-        {% blocktrans with email=request.session.reset_email %}
+        {% blocktrans trimmed with email=request.session.reset_email %}
           An email has been sent to {{ email }}.
         {% endblocktrans %}
       </strong></p>
     <p><strong>
-      {% blocktrans %}
+      {% blocktrans trimmed %}
         Follow the instructions in this email in order to choose a new password.
       {% endblocktrans %}
     </strong></p>
     {% block advice %}
       <p>
-        {% blocktrans %}
+        {% blocktrans trimmed %}
           The email may take several minutes to be received. It can also be
           considered as spam: please look in your "junk mail" folder.
         {% endblocktrans %}
       </p>
       <p>
-        {% blocktrans %}
+        {% blocktrans trimmed %}
           If you still have not received the instructions, add "{{from_email_address}}"
           to your address book or authorized sender list, and then repeat the
           password reset process.
diff --git a/src/authentic2/templates/registration/registration_complete.html b/src/authentic2/templates/registration/registration_complete.html
index 0e25f4183..2d812bba3 100644
--- a/src/authentic2/templates/registration/registration_complete.html
+++ b/src/authentic2/templates/registration/registration_complete.html
@@ -11,25 +11,25 @@
   {% else %}
     {% block instructions %}
       <p><strong>
-        {% blocktrans with email=request.session.registered_email %}
+        {% blocktrans trimmed with email=request.session.registered_email %}
           An email was sent to {{ email }}.
         {% endblocktrans %}
       </strong></p>
       <p><strong>
-        {% blocktrans %}
+        {% blocktrans trimmed %}
           Follow the instructions in that email to continue your registration.
         {% endblocktrans %}
       </strong></p>
     {% endblock %}
     {% block advice %}
       <p>
-        {% blocktrans %}
+        {% blocktrans trimmed %}
           The email may take several minutes to be received. It can also be
           considered as spam: please look in your "junk mail" folder.
         {% endblocktrans %}
       </p>
       <p>
-        {% blocktrans with from_email=from_email %}
+        {% blocktrans trimmed with from_email=from_email %}
           If you still have not received the instructions, add "{{from_email_address}}"
           to your address book or authorized sender list, and then repeat the
           registration process.
diff --git a/src/authentic2/templates/registration/registration_completion_choose.html b/src/authentic2/templates/registration/registration_completion_choose.html
index 16923b46a..98c348c6c 100644
--- a/src/authentic2/templates/registration/registration_completion_choose.html
+++ b/src/authentic2/templates/registration/registration_completion_choose.html
@@ -8,7 +8,7 @@
 {% block content %}
   <h2>{% trans "Login" %}</h2>
   <p>
-    {% blocktrans count accounts_number=accounts|length %}An account already exists for this email. Please click on the account name to log in with.{% plural %}More accounts are associated to this email.  Please choose the account you want to log in with:{% endblocktrans %}
+    {% blocktrans trimmed count accounts_number=accounts|length %}An account already exists for this email. Please click on the account name to log in with.{% plural %}More accounts are associated to this email.  Please choose the account you want to log in with:{% endblocktrans %}
   </p>
 
   <ul>
@@ -18,13 +18,13 @@
           {% csrf_token %}
           <input type="hidden" name="uid" value="{{ user.id }}">
           <a href="#" onclick="document.forms['user-{{ user.id }}'].submit()">
-            {% blocktrans with c=forloop.counter %}Account #{{ c }}: {{ user }}{% endblocktrans %}
+            {% blocktrans trimmed with c=forloop.counter %}Account #{{ c }}: {{ user }}{% endblocktrans %}
           </a>
           <div>
-            {% blocktrans with creation_date=user.date_joined|date:'SHORT_DATETIME_FORMAT'%}created on {{ creation_date }}
+            {% blocktrans trimmed with creation_date=user.date_joined|date:'SHORT_DATETIME_FORMAT'%}created on {{ creation_date }}
             {% endblocktrans %}
             {% if user.last_login %}
-              {% blocktrans with login_date=user.last_login|date:'SHORT_DATETIME_FORMAT' %}last login on {{ login_date }}{% endblocktrans %}
+              {% blocktrans trimmed with login_date=user.last_login|date:'SHORT_DATETIME_FORMAT' %}last login on {{ login_date }}{% endblocktrans %}
             {% endif %}
           </div>
         </form>
diff --git a/src/authentic2_auth_fc/templates/authentic2_auth_fc/explanation.html b/src/authentic2_auth_fc/templates/authentic2_auth_fc/explanation.html
index 291398ede..6cb263009 100644
--- a/src/authentic2_auth_fc/templates/authentic2_auth_fc/explanation.html
+++ b/src/authentic2_auth_fc/templates/authentic2_auth_fc/explanation.html
@@ -4,7 +4,7 @@
     <p>
       <a href="{{ about_url }}" target="_blank" rel="noopener" title="{% trans "opens in new window" %}">{% trans "What is FranceConnect?" %}</a>
     </p>
-    <p>{% blocktrans %}
+    <p>{% blocktrans trimmed %}
       FranceConnect is the solution proposed by the French state to secure and
       streamline logging in to online services.
     {% endblocktrans %}</p>
diff --git a/src/authentic2_auth_fc/templates/authentic2_auth_fc/unlink.html b/src/authentic2_auth_fc/templates/authentic2_auth_fc/unlink.html
index f321490f4..eb832ff2a 100644
--- a/src/authentic2_auth_fc/templates/authentic2_auth_fc/unlink.html
+++ b/src/authentic2_auth_fc/templates/authentic2_auth_fc/unlink.html
@@ -4,12 +4,12 @@
 
 {% block content %}
   <p>
-    {% blocktrans %}
+    {% blocktrans trimmed %}
       You're about to delete the link between your user account and FranceConnect.
     {% endblocktrans %}
   </p>
   <p>
-    {% blocktrans %}
+    {% blocktrans trimmed %}
       Deleting this link won't delete your user account. However, once the link with
       FranceConnect is deleted, it is no more possible to use FranceConnect to automatically log
       in to your user account. It is still possible to link your user account again, using the
@@ -18,7 +18,7 @@
   </p>
   {% if no_password %}
     <p>
-      {% blocktrans %}
+      {% blocktrans trimmed %}
         On your next authentications, you will have to type in a password. Clicking the “Unlink”
         button here will prompt you to pick this new password. For obvious security reasons, please
         pick a different one than the password(s) on your FranceConnect providers.
