diff --git a/allianceauth/authentication/templates/registration/password_reset_email.html b/allianceauth/authentication/templates/registration/password_reset_email.html
index 1b3d2c05..6d66e74f 100644
--- a/allianceauth/authentication/templates/registration/password_reset_email.html
+++ b/allianceauth/authentication/templates/registration/password_reset_email.html
@@ -1,5 +1,5 @@
 {% load i18n %}{% autoescape off %}
-    {% blocktrans %}You're receiving this email because you requested a password reset for your
+    {% blocktrans trimmed %}You're receiving this email because you requested a password reset for your
         user account.{% endblocktrans %}
 
     {% trans "Please go to the following page and choose a new password:" %}
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html
index 98d8c01c..ad389ca4 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html
@@ -16,7 +16,7 @@
             {% endif %}
         </h1>
         <h2>
-            {% blocktrans count links=n_fats %}
+            {% blocktrans count links=n_fats trimmed %}
                 {{ user }} has collected one link this month.
             {% plural %}
                 {{ user }} has collected {{ links }} links this month.
@@ -36,7 +36,7 @@
         </table>
         {%  if created_fats %}
         <h2>
-            {% blocktrans count links=n_created_fats %}
+            {% blocktrans count links=n_created_fats trimmed  %}
                 {{ user }} has created one link this month.
             {% plural %}
                 {{ user }} has created {{ links }} links this month.
diff --git a/allianceauth/srp/templates/srp/data.html b/allianceauth/srp/templates/srp/data.html
index 074f4b0f..4ef0d8ae 100644
--- a/allianceauth/srp/templates/srp/data.html
+++ b/allianceauth/srp/templates/srp/data.html
@@ -90,10 +90,9 @@
                                 <th class="text-center">{% trans "Ship Type" %}</th>
                                 <th class="text-center">{% trans "Killboard Loss Amt" %}</th>
                                 <th class="text-center">{% trans "SRP ISK Cost" %}
-                                {% blocktrans %}<i class="glyphicon glyphicon-question-sign" rel="tooltip" title="Click value to edit
-        Enter to save&next
-        ESC to cancel"
-                                id="blah"></i></th>{% endblocktrans %}
+                                <i class="glyphicon glyphicon-question-sign" rel="tooltip" title="{% blocktrans trimmed %}Click value to edit
+Enter to save & next
+ESC to cancel{% endblocktrans %}"id="blah"></i></th>
                                 <th class="text-center">{% trans "Post Time" %}</th>
                                 <th class="text-center">{% trans "Status" %}</th>
                                 {% if perms.auth.srp_management %}